diff --git a/src/android/android_main.cpp b/src/android/android_main.cpp
index 03b06beecf..e60ec49765 100644
--- a/src/android/android_main.cpp
+++ b/src/android/android_main.cpp
@@ -1,159 +1,236 @@
-#include <base/detect.h>
-
-#ifdef CONF_PLATFORM_ANDROID
-#include <sys/stat.h>
-#include <unistd.h>
+#include "android_main.h"
 
 #include <SDL.h>
 
 #include <base/hash.h>
+#include <base/log.h>
 #include <base/system.h>
+
 #include <engine/shared/linereader.h>
+
 #include <string>
 #include <vector>
 
-extern "C" __attribute__((visibility("default"))) void InitAndroid();
-
-static int gs_AndroidStarted = false;
-
-void InitAndroid()
+static bool UnpackAsset(const char *pFilename)
 {
-	if(gs_AndroidStarted)
+	char aAssetFilename[IO_MAX_PATH_LENGTH];
+	str_copy(aAssetFilename, "asset_integrity_files/");
+	str_append(aAssetFilename, pFilename);
+
+	// This uses SDL_RWFromFile because it can read Android assets,
+	// which are files stored in the app's APK file. All data files
+	// are stored as assets and unpacked to the external storage.
+	SDL_RWops *pAssetFile = SDL_RWFromFile(aAssetFilename, "rb");
+	if(!pAssetFile)
 	{
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "DDNet", "The app was started, but not closed properly, this causes bugs. Please restart or manually delete this task.", SDL_GL_GetCurrentWindow());
-		std::exit(0);
+		log_error("android", "Failed to open asset '%s' for reading", pFilename);
+		return false;
 	}
 
-	gs_AndroidStarted = true;
+	const long int FileLength = SDL_RWsize(pAssetFile);
+	if(FileLength < 0)
+	{
+		SDL_RWclose(pAssetFile);
+		log_error("android", "Failed to determine length of asset '%s'", pFilename);
+		return false;
+	}
 
-	// change current path to a writable directory
-	const char *pPath = SDL_AndroidGetExternalStoragePath();
-	chdir(pPath);
-	dbg_msg("client", "changed path to %s", pPath);
+	char *pData = static_cast<char *>(malloc(FileLength));
+	const size_t ReadLength = SDL_RWread(pAssetFile, pData, 1, FileLength);
+	SDL_RWclose(pAssetFile);
 
-	// copy integrity files
+	if(ReadLength != (size_t)FileLength)
 	{
-		SDL_RWops *pF = SDL_RWFromFile("asset_integrity_files/integrity.txt", "rb");
-		if(!pF)
-		{
-			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "DDNet", "integrity.txt not found, consider reinstalling", SDL_GL_GetCurrentWindow());
-			std::exit(0);
-		}
+		free(pData);
+		log_error("android", "Failed to read asset '%s' (read %" PRIzu ", wanted %ld)", pFilename, ReadLength, FileLength);
+		return false;
+	}
+
+	IOHANDLE TargetFile = io_open(pFilename, IOFLAG_WRITE);
+	if(!TargetFile)
+	{
+		free(pData);
+		log_error("android", "Failed to open '%s' for writing", pFilename);
+		return false;
+	}
 
-		long int length;
-		SDL_RWseek(pF, 0, RW_SEEK_END);
-		length = SDL_RWtell(pF);
-		SDL_RWseek(pF, 0, RW_SEEK_SET);
+	const size_t WriteLength = io_write(TargetFile, pData, FileLength);
+	io_close(TargetFile);
+	free(pData);
+
+	if(WriteLength != (size_t)FileLength)
+	{
+		log_error("android", "Failed to write data to '%s' (wrote %" PRIzu ", wanted %ld)", pFilename, WriteLength, FileLength);
+		return false;
+	}
 
-		char *pAl = (char *)malloc(length);
-		SDL_RWread(pF, pAl, 1, length);
+	return true;
+}
 
-		SDL_RWclose(pF);
+constexpr const char *INTEGRITY_INDEX = "integrity.txt";
+constexpr const char *INTEGRITY_INDEX_SAVE = "integrity_save.txt";
 
-		mkdir("data", 0755);
+// The first line of each integrity file contains the combined hash for all files,
+// if the hashes match then we assume that the unpacked data folder is up-to-date.
+static bool EqualIntegrityFiles(const char *pAssetFilename, const char *pStorageFilename)
+{
+	IOHANDLE StorageFile = io_open(pStorageFilename, IOFLAG_READ);
+	if(!StorageFile)
+	{
+		return false;
+	}
 
-		dbg_msg("integrity", "copying integrity.txt with size: %ld", length);
+	char aStorageMainSha256[SHA256_MAXSTRSIZE];
+	const size_t StorageReadLength = io_read(StorageFile, aStorageMainSha256, sizeof(aStorageMainSha256) - 1);
+	io_close(StorageFile);
+	if(StorageReadLength != sizeof(aStorageMainSha256) - 1)
+	{
+		return false;
+	}
+	aStorageMainSha256[sizeof(aStorageMainSha256) - 1] = '\0';
 
-		IOHANDLE pIO = io_open("integrity.txt", IOFLAG_WRITE);
-		io_write(pIO, pAl, length);
-		io_close(pIO);
+	char aAssetFilename[IO_MAX_PATH_LENGTH];
+	str_copy(aAssetFilename, "asset_integrity_files/");
+	str_append(aAssetFilename, pAssetFilename);
 
-		free(pAl);
+	SDL_RWops *pAssetFile = SDL_RWFromFile(aAssetFilename, "rb");
+	if(!pAssetFile)
+	{
+		return false;
 	}
 
-	IOHANDLE pIO = io_open("integrity.txt", IOFLAG_READ);
-	CLineReader LineReader;
-	LineReader.Init(pIO);
-	const char *pReadLine = NULL;
-	std::vector<std::string> vLines;
-	while((pReadLine = LineReader.Get()))
+	char aAssetMainSha256[SHA256_MAXSTRSIZE];
+	const size_t AssetReadLength = SDL_RWread(pAssetFile, aAssetMainSha256, 1, sizeof(aAssetMainSha256) - 1);
+	SDL_RWclose(pAssetFile);
+	if(AssetReadLength != sizeof(aAssetMainSha256) - 1)
 	{
-		vLines.push_back(pReadLine);
+		return false;
 	}
-	io_close(pIO);
+	aAssetMainSha256[sizeof(aAssetMainSha256) - 1] = '\0';
+
+	return str_comp(aStorageMainSha256, aAssetMainSha256) == 0;
+}
+
+class CIntegrityFileLine
+{
+public:
+	char m_aFilename[IO_MAX_PATH_LENGTH];
+	SHA256_DIGEST m_Sha256;
+};
 
-	// first line is the whole hash
-	std::string AllAsOne;
-	for(size_t i = 1; i < vLines.size(); ++i)
+static std::vector<CIntegrityFileLine> ReadIntegrityFile(const char *pFilename)
+{
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(io_open(pFilename, IOFLAG_READ)))
 	{
-		AllAsOne.append(vLines[i]);
-		AllAsOne.append("\n");
+		return {};
 	}
-	SHA256_DIGEST ShaAll;
-	bool GotSHA = false;
+
+	std::vector<CIntegrityFileLine> vLines;
+	while(const char *pReadLine = LineReader.Get())
 	{
-		IOHANDLE pIOR = io_open("integrity_save.txt", IOFLAG_READ);
-		if(pIOR != NULL)
+		const char *pSpaceInLine = str_rchr(pReadLine, ' ');
+		CIntegrityFileLine Line;
+		char aSha256[SHA256_MAXSTRSIZE];
+		if(pSpaceInLine == nullptr)
 		{
-			CLineReader LineReader;
-			LineReader.Init(pIOR);
-			const char *pLine = LineReader.Get();
-			if(pLine != NULL)
+			if(!vLines.empty())
 			{
-				sha256_from_str(&ShaAll, pLine);
-				GotSHA = true;
+				// Only the first line is allowed to not contain a filename
+				log_error("android", "Failed to parse line %" PRIzu " of '%s': line does not contain space", vLines.size() + 1, pFilename);
+				return {};
 			}
+			Line.m_aFilename[0] = '\0';
+			str_copy(aSha256, pReadLine);
 		}
+		else
+		{
+			str_truncate(Line.m_aFilename, sizeof(Line.m_aFilename), pReadLine, pSpaceInLine - pReadLine);
+			str_copy(aSha256, pSpaceInLine + 1);
+		}
+		if(sha256_from_str(&Line.m_Sha256, aSha256) != 0)
+		{
+			log_error("android", "Failed to parse line %" PRIzu " of '%s': invalid SHA256 string", vLines.size() + 1, pFilename);
+			return {};
+		}
+		vLines.emplace_back(std::move(Line));
 	}
 
-	SHA256_DIGEST ShaAllFile;
-	sha256_from_str(&ShaAllFile, vLines[0].c_str());
+	return vLines;
+}
 
-	// TODO: check files individually
-	if(!GotSHA || ShaAllFile != ShaAll)
+const char *InitAndroid()
+{
+	// Change current working directory to our external storage location
+	const char *pPath = SDL_AndroidGetExternalStoragePath();
+	if(pPath == nullptr)
 	{
-		// then the files
-		for(size_t i = 1; i < vLines.size(); ++i)
-		{
-			std::string FileName, Hash;
-			std::string::size_type n = 0;
-			std::string::size_type c = 0;
-			while((c = vLines[i].find(' ', n)) != std::string::npos)
-				n = c + 1;
-			FileName = vLines[i].substr(0, n - 1);
-			Hash = vLines[i].substr(n + 1);
-
-			std::string AssetFileName = std::string("asset_integrity_files/") + FileName;
-			SDL_RWops *pF = SDL_RWFromFile(AssetFileName.c_str(), "rb");
-
-			dbg_msg("Integrity", "Copying from assets: %s", FileName.c_str());
-
-			std::string FileNamePath = FileName;
-			std::string FileNamePathSub;
-			c = 0;
-			while((c = FileNamePath.find('/', c)) != std::string::npos)
-			{
-				FileNamePathSub = FileNamePath.substr(0, c);
-				fs_makedir(FileNamePathSub.c_str());
-				++c;
-			}
+		return "The external storage is not available.";
+	}
+	if(fs_chdir(pPath) != 0)
+	{
+		return "Failed to change current directory to external storage.";
+	}
+	log_info("android", "Changed current directory to '%s'", pPath);
+
+	if(fs_makedir("data") != 0 || fs_makedir("user") != 0)
+	{
+		return "Failed to create 'data' and 'user' directories in external storage.";
+	}
 
-			long int length;
-			SDL_RWseek(pF, 0, RW_SEEK_END);
-			length = SDL_RWtell(pF);
-			SDL_RWseek(pF, 0, RW_SEEK_SET);
+	if(EqualIntegrityFiles(INTEGRITY_INDEX, INTEGRITY_INDEX_SAVE))
+	{
+		return nullptr;
+	}
+
+	if(!UnpackAsset(INTEGRITY_INDEX))
+	{
+		return "Failed to unpack the integrity index file. Consider reinstalling the app.";
+	}
 
-			char *pAl = (char *)malloc(length);
-			SDL_RWread(pF, pAl, 1, length);
+	std::vector<CIntegrityFileLine> vIntegrityLines = ReadIntegrityFile(INTEGRITY_INDEX);
+	if(vIntegrityLines.empty())
+	{
+		return "Failed to load the integrity index file. Consider reinstalling the app.";
+	}
 
-			SDL_RWclose(pF);
+	std::vector<CIntegrityFileLine> vIntegritySaveLines = ReadIntegrityFile(INTEGRITY_INDEX_SAVE);
 
-			IOHANDLE pIO = io_open(FileName.c_str(), IOFLAG_WRITE);
-			io_write(pIO, pAl, length);
-			io_close(pIO);
+	// The remaining lines of each integrity file list all assets and their hashes
+	for(size_t i = 1; i < vIntegrityLines.size(); ++i)
+	{
+		const CIntegrityFileLine &IntegrityLine = vIntegrityLines[i];
 
-			free(pAl);
+		// Check if the asset is unchanged from the last unpacking
+		const auto IntegritySaveLine = std::find_if(vIntegritySaveLines.begin(), vIntegritySaveLines.end(), [&](const CIntegrityFileLine &Line) {
+			return str_comp(Line.m_aFilename, IntegrityLine.m_aFilename) == 0;
+		});
+		if(IntegritySaveLine != vIntegritySaveLines.end() && IntegritySaveLine->m_Sha256 == IntegrityLine.m_Sha256)
+		{
+			continue;
 		}
 
-		IOHANDLE pIOR = io_open("integrity_save.txt", IOFLAG_WRITE);
-		if(pIOR != NULL)
+		if(fs_makedir_rec_for(IntegrityLine.m_aFilename) != 0 || !UnpackAsset(IntegrityLine.m_aFilename))
 		{
-			char aFileSHA[SHA256_MAXSTRSIZE];
-			sha256_str(ShaAllFile, aFileSHA, sizeof(aFileSHA));
-			io_write(pIOR, aFileSHA, str_length(aFileSHA));
-			io_close(pIOR);
+			return "Failed to unpack game assets, consider reinstalling the app.";
 		}
 	}
+
+	// The integrity file will be unpacked every time when launching,
+	// so we can simply rename it to update the saved integrity file.
+	if((fs_is_file(INTEGRITY_INDEX_SAVE) && fs_remove(INTEGRITY_INDEX_SAVE) != 0) || fs_rename(INTEGRITY_INDEX, INTEGRITY_INDEX_SAVE) != 0)
+	{
+		return "Failed to update the saved integrity index file.";
+	}
+
+	return nullptr;
 }
 
-#endif
+// See NativeMain.java
+constexpr uint32_t COMMAND_USER = 0x8000;
+constexpr uint32_t COMMAND_RESTART_APP = COMMAND_USER + 1;
+
+void RestartAndroidApp()
+{
+	SDL_AndroidSendMessage(COMMAND_RESTART_APP, 0);
+}
diff --git a/src/android/android_main.h b/src/android/android_main.h
new file mode 100644
index 0000000000..c7e3a3e88d
--- /dev/null
+++ b/src/android/android_main.h
@@ -0,0 +1,31 @@
+#ifndef ANDROID_ANDROID_MAIN_H
+#define ANDROID_ANDROID_MAIN_H
+
+#include <base/detect.h>
+#if !defined(CONF_PLATFORM_ANDROID)
+#error "This header should only be included when compiling for Android"
+#endif
+
+/**
+ * Initializes the Android storage. Must be called on Android-systems
+ * before using any of the I/O and storage functions.
+ *
+ * This will change the current working directory to the app specific external
+ * storage location and unpack the assets from the APK file to the `data` folder.
+ * The folder `user` is created in the external storage to store the user data.
+ *
+ * Failure must be handled by exiting the app.
+ *
+ * @return `nullptr` on success, error message on failure.
+ */
+const char *InitAndroid();
+
+/**
+ * Sends an intent to the Android system to restart the app.
+ *
+ * This will restart the main activity in a new task. The current process
+ * must immediately terminate after this function is called.
+ */
+void RestartAndroidApp();
+
+#endif // ANDROID_ANDROID_MAIN_H
diff --git a/src/antibot/antibot_data.h b/src/antibot/antibot_data.h
index f65f626287..5751db6163 100644
--- a/src/antibot/antibot_data.h
+++ b/src/antibot/antibot_data.h
@@ -87,10 +87,10 @@ struct CAntibotData
 
 	int64_t m_Now;
 	int64_t m_Freq;
-	void (*m_pfnKick)(int ClientID, const char *pMessage, void *pUser);
+	void (*m_pfnKick)(int ClientId, const char *pMessage, void *pUser);
 	void (*m_pfnLog)(const char *pMessage, void *pUser);
-	void (*m_pfnReport)(int ClientID, const char *pMessage, void *pUser);
-	void (*m_pfnSend)(int ClientID, const void *pData, int DataSize, int Flags, void *pUser);
+	void (*m_pfnReport)(int ClientId, const char *pMessage, void *pUser);
+	void (*m_pfnSend)(int ClientId, const void *pData, int DataSize, int Flags, void *pUser);
 	void (*m_pfnTeehistorian)(const void *pData, int DataSize, void *pUser);
 	void *m_pUser;
 };
diff --git a/src/antibot/antibot_interface.h b/src/antibot/antibot_interface.h
index a982802c9e..e98e7cd636 100644
--- a/src/antibot/antibot_interface.h
+++ b/src/antibot/antibot_interface.h
@@ -17,23 +17,23 @@ ANTIBOTAPI void AntibotRoundEnd(void);
 ANTIBOTAPI void AntibotUpdateData(void);
 ANTIBOTAPI void AntibotDestroy(void);
 ANTIBOTAPI void AntibotConsoleCommand(const char *pCommand);
-ANTIBOTAPI void AntibotOnPlayerInit(int ClientID);
-ANTIBOTAPI void AntibotOnPlayerDestroy(int ClientID);
-ANTIBOTAPI void AntibotOnSpawn(int ClientID);
-ANTIBOTAPI void AntibotOnHammerFireReloading(int ClientID);
-ANTIBOTAPI void AntibotOnHammerFire(int ClientID);
-ANTIBOTAPI void AntibotOnHammerHit(int ClientID, int TargetID);
-ANTIBOTAPI void AntibotOnDirectInput(int ClientID);
-ANTIBOTAPI void AntibotOnCharacterTick(int ClientID);
-ANTIBOTAPI void AntibotOnHookAttach(int ClientID, bool Player);
+ANTIBOTAPI void AntibotOnPlayerInit(int ClientId);
+ANTIBOTAPI void AntibotOnPlayerDestroy(int ClientId);
+ANTIBOTAPI void AntibotOnSpawn(int ClientId);
+ANTIBOTAPI void AntibotOnHammerFireReloading(int ClientId);
+ANTIBOTAPI void AntibotOnHammerFire(int ClientId);
+ANTIBOTAPI void AntibotOnHammerHit(int ClientId, int TargetId);
+ANTIBOTAPI void AntibotOnDirectInput(int ClientId);
+ANTIBOTAPI void AntibotOnCharacterTick(int ClientId);
+ANTIBOTAPI void AntibotOnHookAttach(int ClientId, bool Player);
 ANTIBOTAPI void AntibotOnEngineTick(void);
-ANTIBOTAPI void AntibotOnEngineClientJoin(int ClientID, bool Sixup);
-ANTIBOTAPI void AntibotOnEngineClientDrop(int ClientID, const char *pReason);
+ANTIBOTAPI void AntibotOnEngineClientJoin(int ClientId, bool Sixup);
+ANTIBOTAPI void AntibotOnEngineClientDrop(int ClientId, const char *pReason);
 // Returns true if the message shouldn't be processed by the server.
-ANTIBOTAPI bool AntibotOnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags);
-ANTIBOTAPI bool AntibotOnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags);
+ANTIBOTAPI bool AntibotOnEngineClientMessage(int ClientId, const void *pData, int Size, int Flags);
+ANTIBOTAPI bool AntibotOnEngineServerMessage(int ClientId, const void *pData, int Size, int Flags);
 // Returns true if the server should simulate receiving a client message.
-ANTIBOTAPI bool AntibotOnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags);
+ANTIBOTAPI bool AntibotOnEngineSimulateClientMessage(int *pClientId, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags);
 }
 
 #endif // ANTIBOT_ANTIBOT_INTERFACE_H
diff --git a/src/antibot/antibot_null.cpp b/src/antibot/antibot_null.cpp
index 6a70c0387a..2db022c097 100644
--- a/src/antibot/antibot_null.cpp
+++ b/src/antibot/antibot_null.cpp
@@ -32,19 +32,19 @@ void AntibotConsoleCommand(const char *pCommand)
 		g_pData->m_pfnLog("unknown command", g_pData->m_pUser);
 	}
 }
-void AntibotOnPlayerInit(int /*ClientID*/) {}
-void AntibotOnPlayerDestroy(int /*ClientID*/) {}
-void AntibotOnSpawn(int /*ClientID*/) {}
-void AntibotOnHammerFireReloading(int /*ClientID*/) {}
-void AntibotOnHammerFire(int /*ClientID*/) {}
-void AntibotOnHammerHit(int /*ClientID*/, int /*TargetID*/) {}
-void AntibotOnDirectInput(int /*ClientID*/) {}
-void AntibotOnCharacterTick(int /*ClientID*/) {}
-void AntibotOnHookAttach(int /*ClientID*/, bool /*Player*/) {}
+void AntibotOnPlayerInit(int /*ClientId*/) {}
+void AntibotOnPlayerDestroy(int /*ClientId*/) {}
+void AntibotOnSpawn(int /*ClientId*/) {}
+void AntibotOnHammerFireReloading(int /*ClientId*/) {}
+void AntibotOnHammerFire(int /*ClientId*/) {}
+void AntibotOnHammerHit(int /*ClientId*/, int /*TargetId*/) {}
+void AntibotOnDirectInput(int /*ClientId*/) {}
+void AntibotOnCharacterTick(int /*ClientId*/) {}
+void AntibotOnHookAttach(int /*ClientId*/, bool /*Player*/) {}
 void AntibotOnEngineTick(void) {}
-void AntibotOnEngineClientJoin(int /*ClientID*/, bool /*Sixup*/) {}
-void AntibotOnEngineClientDrop(int /*ClientID*/, const char * /*pReason*/) {}
-bool AntibotOnEngineClientMessage(int /*ClientID*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
-bool AntibotOnEngineServerMessage(int /*ClientID*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
-bool AntibotOnEngineSimulateClientMessage(int * /*pClientID*/, void * /*pBuffer*/, int /*BufferSize*/, int * /*pOutSize*/, int * /*pFlags*/) { return false; }
+void AntibotOnEngineClientJoin(int /*ClientId*/, bool /*Sixup*/) {}
+void AntibotOnEngineClientDrop(int /*ClientId*/, const char * /*pReason*/) {}
+bool AntibotOnEngineClientMessage(int /*ClientId*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
+bool AntibotOnEngineServerMessage(int /*ClientId*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
+bool AntibotOnEngineSimulateClientMessage(int * /*pClientId*/, void * /*pBuffer*/, int /*BufferSize*/, int * /*pOutSize*/, int * /*pFlags*/) { return false; }
 }
diff --git a/src/base/.clang-tidy b/src/base/.clang-tidy
new file mode 100644
index 0000000000..6d6f9e5d52
--- /dev/null
+++ b/src/base/.clang-tidy
@@ -0,0 +1 @@
+Checks: '-readability-identifier-naming'
diff --git a/src/base/Cargo.toml b/src/base/Cargo.toml
index 709a35c8e3..c72aa91b3a 100644
--- a/src/base/Cargo.toml
+++ b/src/base/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ddnet-base"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
diff --git a/src/base/color.h b/src/base/color.h
index 4e84645f43..0480183069 100644
--- a/src/base/color.h
+++ b/src/base/color.h
@@ -137,6 +137,16 @@ class color4_base
 		return col;
 	}
 
+	DerivedT Multiply(const DerivedT &Other) const
+	{
+		DerivedT Color(static_cast<const DerivedT &>(*this));
+		Color.x *= Other.x;
+		Color.y *= Other.y;
+		Color.z *= Other.z;
+		Color.a *= Other.a;
+		return Color;
+	}
+
 	template<typename UnpackT>
 	static UnpackT UnpackAlphaLast(unsigned Color, bool Alpha = true)
 	{
@@ -166,8 +176,9 @@ class ColorHSLA : public color4_base<ColorHSLA>
 	ColorHSLA(){};
 
 	constexpr static const float DARKEST_LGT = 0.5f;
+	constexpr static const float DARKEST_LGT7 = 61.0f / 255.0f;
 
-	ColorHSLA UnclampLighting(float Darkest = DARKEST_LGT) const
+	ColorHSLA UnclampLighting(float Darkest) const
 	{
 		ColorHSLA col = *this;
 		col.l = Darkest + col.l * (1.0f - Darkest);
diff --git a/src/base/detect.h b/src/base/detect.h
index 8bceed0861..28b9982cb7 100644
--- a/src/base/detect.h
+++ b/src/base/detect.h
@@ -163,19 +163,19 @@
 #define CONF_ARCH_ARM 1
 #define CONF_ARCH_STRING "arm"
 #define CONF_ARCH_ENDIAN_BIG 1
-#endif
-
-#if defined(__ARMEL__)
+#elif defined(__ARMEL__)
 #define CONF_ARCH_ARM 1
 #define CONF_ARCH_STRING "arm"
 #define CONF_ARCH_ENDIAN_LITTLE 1
-#endif
-
-#if defined(__aarch64__) || defined(__arm64__)
+#elif defined(__aarch64__) || defined(__arm64__) || defined(__ARM_ARCH_ISA_A64)
 #define CONF_ARCH_ARM64 1
 #define CONF_ARCH_STRING "arm64"
+#if defined(__ARM_BIG_ENDIAN)
+#define CONF_ARCH_ENDIAN_BIG 1
+#else
 #define CONF_ARCH_ENDIAN_LITTLE 1
 #endif
+#endif
 
 #ifndef CONF_FAMILY_STRING
 #define CONF_FAMILY_STRING "unknown"
diff --git a/src/base/log.cpp b/src/base/log.cpp
index b0b167c68f..989238007b 100644
--- a/src/base/log.cpp
+++ b/src/base/log.cpp
@@ -8,9 +8,8 @@
 #include <memory>
 
 #if defined(CONF_FAMILY_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501 /* required for mingw to get getaddrinfo to work */
+#include <fcntl.h>
+#include <io.h>
 #include <windows.h>
 #else
 #include <unistd.h>
@@ -49,7 +48,10 @@ void log_set_global_logger_default()
 #else
 	logger = log_logger_stdout();
 #endif
-	log_set_global_logger(logger.release());
+	if(logger)
+	{
+		log_set_global_logger(logger.release());
+	}
 }
 
 ILogger *log_get_scope_logger()
@@ -233,19 +235,16 @@ class CLoggerAsync : public ILogger
 			return;
 		}
 		aio_lock(m_pAio);
-		if(m_AnsiTruecolor)
+		if(m_AnsiTruecolor && pMessage->m_HaveColor)
 		{
 			// https://en.wikipedia.org/w/index.php?title=ANSI_escape_code&oldid=1077146479#24-bit
 			char aAnsi[32];
-			if(pMessage->m_HaveColor)
-			{
-				str_format(aAnsi, sizeof(aAnsi),
-					"\x1b[38;2;%d;%d;%dm",
-					pMessage->m_Color.r,
-					pMessage->m_Color.g,
-					pMessage->m_Color.b);
-				aio_write_unlocked(m_pAio, aAnsi, str_length(aAnsi));
-			}
+			str_format(aAnsi, sizeof(aAnsi),
+				"\x1b[38;2;%d;%d;%dm",
+				pMessage->m_Color.r,
+				pMessage->m_Color.g,
+				pMessage->m_Color.b);
+			aio_write_unlocked(m_pAio, aAnsi, str_length(aAnsi));
 		}
 		aio_write_unlocked(m_pAio, pMessage->m_aLine, pMessage->m_LineLength);
 		if(m_AnsiTruecolor && pMessage->m_HaveColor)
@@ -317,14 +316,16 @@ static int color_hsv_to_windows_console_color(const ColorHSVA &Hsv)
 class CWindowsConsoleLogger : public ILogger
 {
 	HANDLE m_pConsole;
+	bool m_EnableColor;
 	int m_BackgroundColor;
 	int m_ForegroundColor;
 	CLock m_OutputLock;
 	bool m_Finished = false;
 
 public:
-	CWindowsConsoleLogger(HANDLE pConsole) :
-		m_pConsole(pConsole)
+	CWindowsConsoleLogger(HANDLE pConsole, bool EnableColor) :
+		m_pConsole(pConsole),
+		m_EnableColor(EnableColor)
 	{
 		CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo;
 		if(GetConsoleScreenBufferInfo(pConsole, &ConsoleInfo))
@@ -344,15 +345,12 @@ class CWindowsConsoleLogger : public ILogger
 		{
 			return;
 		}
-		const std::wstring WideMessage = windows_utf8_to_wide(pMessage->m_aLine) + L"\r\n";
+		const std::wstring WideMessage = windows_utf8_to_wide(pMessage->m_aLine);
 
 		int Color = m_BackgroundColor;
-		if(pMessage->m_HaveColor)
+		if(m_EnableColor && pMessage->m_HaveColor)
 		{
-			ColorRGBA Rgba(1.0, 1.0, 1.0, 1.0);
-			Rgba.r = pMessage->m_Color.r / 255.0;
-			Rgba.g = pMessage->m_Color.g / 255.0;
-			Rgba.b = pMessage->m_Color.b / 255.0;
+			const ColorRGBA Rgba(pMessage->m_Color.r / 255.0f, pMessage->m_Color.g / 255.0f, pMessage->m_Color.b / 255.0f);
 			Color |= color_hsv_to_windows_console_color(color_cast<ColorHSVA>(Rgba));
 		}
 		else
@@ -362,7 +360,8 @@ class CWindowsConsoleLogger : public ILogger
 		if(!m_Finished)
 		{
 			SetConsoleTextAttribute(m_pConsole, Color);
-			WriteConsoleW(m_pConsole, WideMessage.c_str(), WideMessage.length(), NULL, NULL);
+			WriteConsoleW(m_pConsole, WideMessage.c_str(), WideMessage.length(), nullptr, nullptr);
+			WriteConsoleW(m_pConsole, L"\r\n", 2, nullptr, nullptr);
 		}
 	}
 	void GlobalFinish() override REQUIRES(!m_OutputLock)
@@ -373,28 +372,15 @@ class CWindowsConsoleLogger : public ILogger
 		m_Finished = true;
 	}
 };
-class CWindowsFileLogger : public ILogger
-{
-	HANDLE m_pFile;
-	CLock m_OutputLock;
 
-public:
-	CWindowsFileLogger(HANDLE pFile) :
-		m_pFile(pFile)
-	{
-	}
-	void Log(const CLogMessage *pMessage) override REQUIRES(!m_OutputLock)
-	{
-		if(m_Filter.Filters(pMessage))
-		{
-			return;
-		}
-		const CLockScope LockScope(m_OutputLock);
-		DWORD Written; // we don't care about the value, but Windows 7 crashes if we pass NULL
-		WriteFile(m_pFile, pMessage->m_aLine, pMessage->m_LineLength, &Written, NULL);
-		WriteFile(m_pFile, "\r\n", 2, &Written, NULL);
-	}
-};
+static IOHANDLE ConvertWindowsHandle(HANDLE pHandle, int OpenFlags)
+{
+	int FileDescriptor = _open_osfhandle(reinterpret_cast<intptr_t>(pHandle), OpenFlags);
+	dbg_assert(FileDescriptor != -1, "_open_osfhandle failure");
+	IOHANDLE FileStream = _wfdopen(FileDescriptor, L"w");
+	dbg_assert(FileStream != nullptr, "_wfdopen failure");
+	return FileStream;
+}
 #endif
 
 std::unique_ptr<ILogger> log_logger_stdout()
@@ -402,18 +388,71 @@ std::unique_ptr<ILogger> log_logger_stdout()
 #if !defined(CONF_FAMILY_WINDOWS)
 	// TODO: Only enable true color when COLORTERM contains "truecolor".
 	// https://github.com/termstandard/colors/tree/65bf0cd1ece7c15fa33a17c17528b02c99f1ae0b#checking-for-colorterm
-	const bool colors = getenv("NO_COLOR") == nullptr && isatty(STDOUT_FILENO);
-	return std::make_unique<CLoggerAsync>(io_stdout(), colors, false);
+	const bool Colors = getenv("NO_COLOR") == nullptr && isatty(STDOUT_FILENO);
+	return std::make_unique<CLoggerAsync>(io_stdout(), Colors, false);
 #else
+	// If we currently have no stdout (console, file, pipe),
+	// try to attach to the console of the parent process.
 	if(GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)) == FILE_TYPE_UNKNOWN)
+	{
 		AttachConsole(ATTACH_PARENT_PROCESS);
+	}
+
 	HANDLE pOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-	switch(GetFileType(pOutput))
+	if(pOutput == nullptr)
 	{
-	case FILE_TYPE_CHAR: return std::make_unique<CWindowsConsoleLogger>(pOutput);
-	case FILE_TYPE_PIPE: [[fallthrough]]; // writing to pipe works the same as writing to a file
-	case FILE_TYPE_DISK: return std::make_unique<CWindowsFileLogger>(pOutput);
-	default: return std::make_unique<CLoggerAsync>(io_stdout(), false, false);
+		// There is no console, file or pipe that we can output to.
+		return nullptr;
+	}
+	dbg_assert(pOutput != INVALID_HANDLE_VALUE, "GetStdHandle failure");
+
+	const DWORD OutputType = GetFileType(pOutput);
+	if(OutputType == FILE_TYPE_CHAR)
+	{
+		DWORD OldConsoleMode = 0;
+		if(!GetConsoleMode(pOutput, &OldConsoleMode))
+		{
+			// GetConsoleMode can fail with ERROR_INVALID_HANDLE when redirecting output to "nul",
+			// which is considered a character file but cannot be used as a console.
+			dbg_assert(GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failure");
+			return nullptr;
+		}
+
+		const bool Colors = _wgetenv(L"NO_COLOR") == nullptr;
+
+		// Try to enable virtual terminal processing in the Windows console.
+		// See https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
+		if(!SetConsoleMode(pOutput, OldConsoleMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN))
+		{
+			// Try to downgrade mode gracefully when failing to set both.
+			if(!SetConsoleMode(pOutput, OldConsoleMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING))
+			{
+				// Fallback to old, slower Windows logging API, when failing to enable virtual terminal processing.
+				return std::make_unique<CWindowsConsoleLogger>(pOutput, Colors);
+			}
+		}
+
+		// Virtual terminal processing was enabled successfully. We can
+		// use the async logger with ANSI escape codes for colors now.
+		// We need to set the output encoding to UTF-8 manually and
+		// convert the HANDLE to an IOHANDLE to use the async logger.
+		// We assume UTF-8 is available when virtual terminal processing is.
+		dbg_assert(SetConsoleOutputCP(CP_UTF8) != 0, "SetConsoleOutputCP failure");
+		return std::make_unique<CLoggerAsync>(ConvertWindowsHandle(pOutput, _O_TEXT), Colors, false);
+	}
+	else if(OutputType == FILE_TYPE_DISK || OutputType == FILE_TYPE_PIPE)
+	{
+		// Writing to a pipe works the same as writing to a file.
+		// We can use the async logger to write to files and pipes
+		// by converting the HANDLE to an IOHANDLE.
+		// For pipes there does not seem to be any way to determine
+		// whether the console supports ANSI escape codes.
+		return std::make_unique<CLoggerAsync>(ConvertWindowsHandle(pOutput, _O_APPEND), false, false);
+	}
+	else
+	{
+		dbg_assert(false, "GetFileType failure");
+		dbg_break();
 	}
 #endif
 }
@@ -444,6 +483,19 @@ std::unique_ptr<ILogger> log_logger_windows_debugger()
 }
 #endif
 
+class CLoggerNoOp : public ILogger
+{
+public:
+	void Log(const CLogMessage *pMessage) override
+	{
+		// no-op
+	}
+};
+std::unique_ptr<ILogger> log_logger_noop()
+{
+	return std::make_unique<CLoggerNoOp>();
+}
+
 void CFutureLogger::Set(std::shared_ptr<ILogger> pLogger)
 {
 	const CLockScope LockScope(m_PendingLock);
diff --git a/src/base/logger.h b/src/base/logger.h
index cc6575b49a..b43d0468c0 100644
--- a/src/base/logger.h
+++ b/src/base/logger.h
@@ -210,6 +210,13 @@ std::unique_ptr<ILogger> log_logger_stdout();
  */
 std::unique_ptr<ILogger> log_logger_windows_debugger();
 
+/**
+ * @ingroup Log
+ *
+ * Logger which discards all logs.
+ */
+std::unique_ptr<ILogger> log_logger_noop();
+
 /**
  * @ingroup Log
  *
diff --git a/src/base/system.cpp b/src/base/system.cpp
index 4255afa228..f42341453c 100644
--- a/src/base/system.cpp
+++ b/src/base/system.cpp
@@ -9,7 +9,9 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstring>
+#include <iomanip> // std::get_time
 #include <iterator> // std::size
+#include <sstream> // std::istringstream
 #include <string_view>
 
 #include "lock.h"
@@ -60,11 +62,6 @@
 #endif
 
 #elif defined(CONF_FAMILY_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#undef _WIN32_WINNT
-// 0x0501 (Windows XP) is required for mingw to get getaddrinfo to work
-// 0x0600 (Windows Vista) is required to use RegGetValueW and RegDeleteTreeW
-#define _WIN32_WINNT 0x0600
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -87,58 +84,6 @@
 #include <sys/filio.h>
 #endif
 
-IOHANDLE io_stdin()
-{
-	return stdin;
-}
-
-IOHANDLE io_stdout()
-{
-	return stdout;
-}
-
-IOHANDLE io_stderr()
-{
-	return stderr;
-}
-
-IOHANDLE io_current_exe()
-{
-	// From https://stackoverflow.com/a/1024937.
-#if defined(CONF_FAMILY_WINDOWS)
-	wchar_t wide_path[IO_MAX_PATH_LENGTH];
-	if(GetModuleFileNameW(NULL, wide_path, std::size(wide_path)) == 0 || GetLastError() != ERROR_SUCCESS)
-	{
-		return 0;
-	}
-	const std::optional<std::string> path = windows_wide_to_utf8(wide_path);
-	return path.has_value() ? io_open(path.value().c_str(), IOFLAG_READ) : 0;
-#elif defined(CONF_PLATFORM_MACOS)
-	char path[IO_MAX_PATH_LENGTH];
-	uint32_t path_size = sizeof(path);
-	if(_NSGetExecutablePath(path, &path_size))
-	{
-		return 0;
-	}
-	return io_open(path, IOFLAG_READ);
-#else
-	static const char *NAMES[] = {
-		"/proc/self/exe", // Linux, Android
-		"/proc/curproc/exe", // NetBSD
-		"/proc/curproc/file", // DragonFly
-	};
-	for(auto &name : NAMES)
-	{
-		IOHANDLE result = io_open(name, IOFLAG_READ);
-		if(result)
-		{
-			return result;
-		}
-	}
-	return 0;
-#endif
-}
-
 static NETSTATS network_stats = {0};
 
 #define VLEN 128
@@ -254,9 +199,9 @@ bool mem_has_null(const void *block, size_t size)
 	return false;
 }
 
-IOHANDLE io_open_impl(const char *filename, int flags)
+IOHANDLE io_open(const char *filename, int flags)
 {
-	dbg_assert(flags == (IOFLAG_READ | IOFLAG_SKIP_BOM) || flags == IOFLAG_READ || flags == IOFLAG_WRITE || flags == IOFLAG_APPEND, "flags must be read, read+skipbom, write or append");
+	dbg_assert(flags == IOFLAG_READ || flags == IOFLAG_WRITE || flags == IOFLAG_APPEND, "flags must be read, write or append");
 #if defined(CONF_FAMILY_WINDOWS)
 	const std::wstring wide_filename = windows_utf8_to_wide(filename);
 	DWORD desired_access;
@@ -271,7 +216,7 @@ IOHANDLE io_open_impl(const char *filename, int flags)
 	else if(flags == IOFLAG_WRITE)
 	{
 		desired_access = FILE_WRITE_DATA;
-		creation_disposition = OPEN_ALWAYS;
+		creation_disposition = CREATE_ALWAYS;
 		open_mode = "wb";
 	}
 	else if(flags == IOFLAG_APPEND)
@@ -316,21 +261,6 @@ IOHANDLE io_open_impl(const char *filename, int flags)
 #endif
 }
 
-IOHANDLE io_open(const char *filename, int flags)
-{
-	IOHANDLE result = io_open_impl(filename, flags);
-	unsigned char buf[3];
-	if((flags & IOFLAG_SKIP_BOM) == 0 || !result)
-	{
-		return result;
-	}
-	if(io_read(result, buf, sizeof(buf)) != 3 || buf[0] != 0xef || buf[1] != 0xbb || buf[2] != 0xbf)
-	{
-		io_seek(result, 0, IOSEEK_START);
-	}
-	return result;
-}
-
 unsigned io_read(IOHANDLE io, void *buffer, unsigned size)
 {
 	return fread(buffer, 1, size, (FILE *)io);
@@ -421,11 +351,6 @@ long int io_length(IOHANDLE io)
 	return length;
 }
 
-int io_error(IOHANDLE io)
-{
-	return ferror((FILE *)io);
-}
-
 unsigned io_write(IOHANDLE io, const void *buffer, unsigned size)
 {
 	return fwrite(buffer, 1, size, (FILE *)io);
@@ -463,6 +388,63 @@ int io_sync(IOHANDLE io)
 #endif
 }
 
+int io_error(IOHANDLE io)
+{
+	return ferror((FILE *)io);
+}
+
+IOHANDLE io_stdin()
+{
+	return stdin;
+}
+
+IOHANDLE io_stdout()
+{
+	return stdout;
+}
+
+IOHANDLE io_stderr()
+{
+	return stderr;
+}
+
+IOHANDLE io_current_exe()
+{
+	// From https://stackoverflow.com/a/1024937.
+#if defined(CONF_FAMILY_WINDOWS)
+	wchar_t wide_path[IO_MAX_PATH_LENGTH];
+	if(GetModuleFileNameW(NULL, wide_path, std::size(wide_path)) == 0 || GetLastError() != ERROR_SUCCESS)
+	{
+		return 0;
+	}
+	const std::optional<std::string> path = windows_wide_to_utf8(wide_path);
+	return path.has_value() ? io_open(path.value().c_str(), IOFLAG_READ) : 0;
+#elif defined(CONF_PLATFORM_MACOS)
+	char path[IO_MAX_PATH_LENGTH];
+	uint32_t path_size = sizeof(path);
+	if(_NSGetExecutablePath(path, &path_size))
+	{
+		return 0;
+	}
+	return io_open(path, IOFLAG_READ);
+#else
+	static const char *NAMES[] = {
+		"/proc/self/exe", // Linux, Android
+		"/proc/curproc/exe", // NetBSD
+		"/proc/curproc/file", // DragonFly
+	};
+	for(auto &name : NAMES)
+	{
+		IOHANDLE result = io_open(name, IOFLAG_READ);
+		if(result)
+		{
+			return result;
+		}
+	}
+	return 0;
+#endif
+}
+
 #define ASYNC_BUFSIZE (8 * 1024)
 #define ASYNC_LOCAL_BUFSIZE (64 * 1024)
 
@@ -737,17 +719,6 @@ int aio_error(ASYNCIO *aio)
 	return aio->error;
 }
 
-void aio_free(ASYNCIO *aio)
-{
-	aio->lock.lock();
-	if(aio->thread)
-	{
-		thread_detach(aio->thread);
-		aio->thread = 0;
-	}
-	aio_handle_free_and_unlock(aio);
-}
-
 void aio_close(ASYNCIO *aio)
 {
 	{
@@ -773,6 +744,17 @@ void aio_wait(ASYNCIO *aio)
 	thread_wait(thread);
 }
 
+void aio_free(ASYNCIO *aio)
+{
+	aio->lock.lock();
+	if(aio->thread)
+	{
+		thread_detach(aio->thread);
+		aio->thread = 0;
+	}
+	aio_handle_free_and_unlock(aio);
+}
+
 struct THREAD_RUN
 {
 	void (*threadfunc)(void *);
@@ -805,12 +787,12 @@ void *thread_init(void (*threadfunc)(void *), void *u, const char *name)
 	data->u = u;
 #if defined(CONF_FAMILY_UNIX)
 	{
-		pthread_t id;
 		pthread_attr_t attr;
-		pthread_attr_init(&attr);
+		dbg_assert(pthread_attr_init(&attr) == 0, "pthread_attr_init failure");
 #if defined(CONF_PLATFORM_MACOS) && defined(__MAC_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10
-		pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0);
+		dbg_assert(pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0) == 0, "pthread_attr_set_qos_class_np failure");
 #endif
+		pthread_t id;
 		dbg_assert(pthread_create(&id, &attr, thread_run, data) == 0, "pthread_create failure");
 		return (void *)id;
 	}
@@ -827,12 +809,10 @@ void *thread_init(void (*threadfunc)(void *), void *u, const char *name)
 void thread_wait(void *thread)
 {
 #if defined(CONF_FAMILY_UNIX)
-	int result = pthread_join((pthread_t)thread, NULL);
-	if(result != 0)
-		dbg_msg("thread", "!! %d", result);
+	dbg_assert(pthread_join((pthread_t)thread, nullptr) == 0, "pthread_join failure");
 #elif defined(CONF_FAMILY_WINDOWS)
-	WaitForSingleObject((HANDLE)thread, INFINITE);
-	CloseHandle(thread);
+	dbg_assert(WaitForSingleObject((HANDLE)thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failure");
+	dbg_assert(CloseHandle(thread), "CloseHandle failure");
 #else
 #error not implemented
 #endif
@@ -841,9 +821,7 @@ void thread_wait(void *thread)
 void thread_yield()
 {
 #if defined(CONF_FAMILY_UNIX)
-	int result = sched_yield();
-	if(result != 0)
-		dbg_msg("thread", "yield failed: %d", errno);
+	dbg_assert(sched_yield() == 0, "sched_yield failure");
 #elif defined(CONF_FAMILY_WINDOWS)
 	Sleep(0);
 #else
@@ -854,76 +832,92 @@ void thread_yield()
 void thread_detach(void *thread)
 {
 #if defined(CONF_FAMILY_UNIX)
-	int result = pthread_detach((pthread_t)(thread));
-	if(result != 0)
-		dbg_msg("thread", "detach failed: %d", result);
+	dbg_assert(pthread_detach((pthread_t)thread) == 0, "pthread_detach failure");
 #elif defined(CONF_FAMILY_WINDOWS)
-	CloseHandle(thread);
+	dbg_assert(CloseHandle(thread), "CloseHandle failure");
 #else
 #error not implemented
 #endif
 }
 
-bool thread_init_and_detach(void (*threadfunc)(void *), void *u, const char *name)
+void thread_init_and_detach(void (*threadfunc)(void *), void *u, const char *name)
 {
 	void *thread = thread_init(threadfunc, u, name);
-	if(thread)
-		thread_detach(thread);
-	return thread != nullptr;
+	thread_detach(thread);
 }
 
 #if defined(CONF_FAMILY_WINDOWS)
 void sphore_init(SEMAPHORE *sem)
 {
-	*sem = CreateSemaphore(0, 0, 10000, 0);
+	*sem = CreateSemaphoreW(nullptr, 0, std::numeric_limits<LONG>::max(), nullptr);
+	dbg_assert(*sem != nullptr, "CreateSemaphoreW failure");
+}
+void sphore_wait(SEMAPHORE *sem)
+{
+	dbg_assert(WaitForSingleObject((HANDLE)*sem, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failure");
+}
+void sphore_signal(SEMAPHORE *sem)
+{
+	dbg_assert(ReleaseSemaphore((HANDLE)*sem, 1, nullptr), "ReleaseSemaphore failure");
+}
+void sphore_destroy(SEMAPHORE *sem)
+{
+	dbg_assert(CloseHandle((HANDLE)*sem), "CloseHandle failure");
 }
-void sphore_wait(SEMAPHORE *sem) { WaitForSingleObject((HANDLE)*sem, INFINITE); }
-void sphore_signal(SEMAPHORE *sem) { ReleaseSemaphore((HANDLE)*sem, 1, NULL); }
-void sphore_destroy(SEMAPHORE *sem) { CloseHandle((HANDLE)*sem); }
 #elif defined(CONF_PLATFORM_MACOS)
 void sphore_init(SEMAPHORE *sem)
 {
 	char aBuf[64];
-	str_format(aBuf, sizeof(aBuf), "%p", (void *)sem);
+	str_format(aBuf, sizeof(aBuf), "/%d.%p", pid(), (void *)sem);
 	*sem = sem_open(aBuf, O_CREAT | O_EXCL, S_IRWXU | S_IRWXG, 0);
 	if(*sem == SEM_FAILED)
-		dbg_msg("sphore", "init failed: %d", errno);
+	{
+		char aError[128];
+		str_format(aError, sizeof(aError), "sem_open failure, errno=%d, name='%s'", errno, aBuf);
+		dbg_assert(false, aError);
+	}
+}
+void sphore_wait(SEMAPHORE *sem)
+{
+	while(true)
+	{
+		if(sem_wait(*sem) == 0)
+			break;
+		dbg_assert(errno == EINTR, "sem_wait failure");
+	}
+}
+void sphore_signal(SEMAPHORE *sem)
+{
+	dbg_assert(sem_post(*sem) == 0, "sem_post failure");
 }
-void sphore_wait(SEMAPHORE *sem) { sem_wait(*sem); }
-void sphore_signal(SEMAPHORE *sem) { sem_post(*sem); }
 void sphore_destroy(SEMAPHORE *sem)
 {
+	dbg_assert(sem_close(*sem) == 0, "sem_close failure");
 	char aBuf[64];
-	sem_close(*sem);
-	str_format(aBuf, sizeof(aBuf), "%p", (void *)sem);
-	sem_unlink(aBuf);
+	str_format(aBuf, sizeof(aBuf), "/%d.%p", pid(), (void *)sem);
+	dbg_assert(sem_unlink(aBuf) == 0, "sem_unlink failure");
 }
 #elif defined(CONF_FAMILY_UNIX)
 void sphore_init(SEMAPHORE *sem)
 {
-	if(sem_init(sem, 0, 0) != 0)
-		dbg_msg("sphore", "init failed: %d", errno);
+	dbg_assert(sem_init(sem, 0, 0) == 0, "sem_init failure");
 }
-
 void sphore_wait(SEMAPHORE *sem)
 {
-	do
+	while(true)
 	{
-		errno = 0;
-		if(sem_wait(sem) != 0)
-			dbg_msg("sphore", "wait failed: %d", errno);
-	} while(errno == EINTR);
+		if(sem_wait(sem) == 0)
+			break;
+		dbg_assert(errno == EINTR, "sem_wait failure");
+	}
 }
-
 void sphore_signal(SEMAPHORE *sem)
 {
-	if(sem_post(sem) != 0)
-		dbg_msg("sphore", "post failed: %d", errno);
+	dbg_assert(sem_post(sem) == 0, "sem_post failure");
 }
 void sphore_destroy(SEMAPHORE *sem)
 {
-	if(sem_destroy(sem) != 0)
-		dbg_msg("sphore", "destroy failed: %d", errno);
+	dbg_assert(sem_destroy(sem) == 0, "sem_destroy failure");
 }
 #endif
 
@@ -969,7 +963,7 @@ const NETADDR NETADDR_ZEROED = {NETTYPE_INVALID, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 static void netaddr_to_sockaddr_in(const NETADDR *src, struct sockaddr_in *dest)
 {
 	mem_zero(dest, sizeof(struct sockaddr_in));
-	if(src->type != NETTYPE_IPV4 && src->type != NETTYPE_WEBSOCKET_IPV4)
+	if(!(src->type & NETTYPE_IPV4) && !(src->type & NETTYPE_WEBSOCKET_IPV4))
 	{
 		dbg_msg("system", "couldn't convert NETADDR of type %d to ipv4", src->type);
 		return;
@@ -983,9 +977,9 @@ static void netaddr_to_sockaddr_in(const NETADDR *src, struct sockaddr_in *dest)
 static void netaddr_to_sockaddr_in6(const NETADDR *src, struct sockaddr_in6 *dest)
 {
 	mem_zero(dest, sizeof(struct sockaddr_in6));
-	if(src->type != NETTYPE_IPV6)
+	if(!(src->type & NETTYPE_IPV6))
 	{
-		dbg_msg("system", "couldn't not convert NETADDR of type %d to ipv6", src->type);
+		dbg_msg("system", "couldn't convert NETADDR of type %d to ipv6", src->type);
 		return;
 	}
 
@@ -1109,16 +1103,16 @@ void net_addr_str_v6(const unsigned short ip[8], int port, char *buffer, int buf
 	}
 }
 
-void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port)
+bool net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port)
 {
-	if(addr->type == NETTYPE_IPV4 || addr->type == NETTYPE_WEBSOCKET_IPV4)
+	if(addr->type & NETTYPE_IPV4 || addr->type & NETTYPE_WEBSOCKET_IPV4)
 	{
 		if(add_port != 0)
 			str_format(string, max_length, "%d.%d.%d.%d:%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3], addr->port);
 		else
 			str_format(string, max_length, "%d.%d.%d.%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
 	}
-	else if(addr->type == NETTYPE_IPV6)
+	else if(addr->type & NETTYPE_IPV6)
 	{
 		int port = -1;
 		unsigned short ip[8];
@@ -1134,7 +1128,11 @@ void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_por
 		net_addr_str_v6(ip, port, string, max_length);
 	}
 	else
+	{
 		str_format(string, max_length, "unknown type %d", addr->type);
+		return false;
+	}
+	return true;
 }
 
 static int priv_net_extract(const char *hostname, char *host, int max_host, int *port)
@@ -1233,7 +1231,7 @@ static int parse_int(int *out, const char **str)
 {
 	int i = 0;
 	*out = 0;
-	if(**str < '0' || **str > '9')
+	if(!str_isnum(**str))
 		return -1;
 
 	i = **str - '0';
@@ -1241,7 +1239,7 @@ static int parse_int(int *out, const char **str)
 
 	while(true)
 	{
-		if(**str < '0' || **str > '9')
+		if(!str_isnum(**str))
 		{
 			*out = i;
 			return 0;
@@ -1286,19 +1284,20 @@ static int parse_uint16(unsigned short *out, const char **str)
 
 int net_addr_from_url(NETADDR *addr, const char *string, char *host_buf, size_t host_buf_size)
 {
-	char host[128];
-	int length;
-	int start = 0;
-	int end;
-	int failure;
+	bool sixup = false;
+	mem_zero(addr, sizeof(*addr));
 	const char *str = str_startswith(string, "tw-0.6+udp://");
+	if(!str && (str = str_startswith(string, "tw-0.7+udp://")))
+	{
+		addr->type |= NETTYPE_TW7;
+		sixup = true;
+	}
 	if(!str)
 		return 1;
 
-	mem_zero(addr, sizeof(*addr));
-
-	length = str_length(str);
-	end = length;
+	int length = str_length(str);
+	int start = 0;
+	int end = length;
 	for(int i = 0; i < length; i++)
 	{
 		if(str[i] == '@')
@@ -1316,13 +1315,19 @@ int net_addr_from_url(NETADDR *addr, const char *string, char *host_buf, size_t
 			break;
 		}
 	}
+
+	char host[128];
 	str_truncate(host, sizeof(host), str + start, end - start);
 	if(host_buf)
 		str_copy(host_buf, host, host_buf_size);
 
-	if((failure = net_addr_from_str(addr, host)))
+	int failure = net_addr_from_str(addr, host);
+	if(failure)
 		return failure;
 
+	if(sixup)
+		addr->type |= NETTYPE_TW7;
+
 	return failure;
 }
 
@@ -1532,47 +1537,45 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
 {
 	NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
 	*sock = invalid_socket;
-	NETADDR tmpbindaddr = bindaddr;
-	int broadcast = 1;
-	int socket = -1;
 
 	if(bindaddr.type & NETTYPE_IPV4)
 	{
 		struct sockaddr_in addr;
-
-		/* bind, we should check for error */
+		NETADDR tmpbindaddr = bindaddr;
 		tmpbindaddr.type = NETTYPE_IPV4;
 		netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
-		socket = priv_net_create_socket(AF_INET, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
+		int socket = priv_net_create_socket(AF_INET, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
 		if(socket >= 0)
 		{
 			sock->type |= NETTYPE_IPV4;
 			sock->ipv4sock = socket;
 
 			/* set broadcast */
+			int broadcast = 1;
 			if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
-				dbg_msg("socket", "Setting BROADCAST on ipv4 failed: %d", errno);
+			{
+				dbg_msg("socket", "Setting BROADCAST on ipv4 failed: %d", net_errno());
+			}
 
 			{
 				/* set DSCP/TOS */
 				int iptos = 0x10 /* IPTOS_LOWDELAY */;
-				//int iptos = 46; /* High Priority */
 				if(setsockopt(socket, IPPROTO_IP, IP_TOS, (char *)&iptos, sizeof(iptos)) != 0)
-					dbg_msg("socket", "Setting TOS on ipv4 failed: %d", errno);
+				{
+					dbg_msg("socket", "Setting TOS on ipv4 failed: %d", net_errno());
+				}
 			}
 		}
 	}
+
 #if defined(CONF_WEBSOCKETS)
 	if(bindaddr.type & NETTYPE_WEBSOCKET_IPV4)
 	{
 		char addr_str[NETADDR_MAXSTRSIZE];
-
-		/* bind, we should check for error */
+		NETADDR tmpbindaddr = bindaddr;
 		tmpbindaddr.type = NETTYPE_WEBSOCKET_IPV4;
-
 		net_addr_str(&tmpbindaddr, addr_str, sizeof(addr_str), 0);
-		socket = websocket_create(addr_str, tmpbindaddr.port);
-
+		int socket = websocket_create(addr_str, tmpbindaddr.port);
 		if(socket >= 0)
 		{
 			sock->type |= NETTYPE_WEBSOCKET_IPV4;
@@ -1584,44 +1587,47 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
 	if(bindaddr.type & NETTYPE_IPV6)
 	{
 		struct sockaddr_in6 addr;
-
-		/* bind, we should check for error */
+		NETADDR tmpbindaddr = bindaddr;
 		tmpbindaddr.type = NETTYPE_IPV6;
 		netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
-		socket = priv_net_create_socket(AF_INET6, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
+		int socket = priv_net_create_socket(AF_INET6, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
 		if(socket >= 0)
 		{
 			sock->type |= NETTYPE_IPV6;
 			sock->ipv6sock = socket;
 
 			/* set broadcast */
+			int broadcast = 1;
 			if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
-				dbg_msg("socket", "Setting BROADCAST on ipv6 failed: %d", errno);
+			{
+				dbg_msg("socket", "Setting BROADCAST on ipv6 failed: %d", net_errno());
+			}
 
+			// TODO: setting IP_TOS on ipv6 with setsockopt is not supported on Windows, see https://github.com/ddnet/ddnet/issues/7605
+#if !defined(CONF_FAMILY_WINDOWS)
 			{
 				/* set DSCP/TOS */
 				int iptos = 0x10 /* IPTOS_LOWDELAY */;
-				//int iptos = 46; /* High Priority */
 				if(setsockopt(socket, IPPROTO_IP, IP_TOS, (char *)&iptos, sizeof(iptos)) != 0)
-					dbg_msg("socket", "Setting TOS on ipv6 failed: %d", errno);
+				{
+					dbg_msg("socket", "Setting TOS on ipv6 failed: %d", net_errno());
+				}
 			}
+#endif
 		}
 	}
 
-	if(socket < 0)
+	if(sock->type == NETTYPE_INVALID)
 	{
 		free(sock);
 		sock = nullptr;
 	}
 	else
 	{
-		/* set non-blocking */
 		net_set_non_blocking(sock);
-
 		net_buffer_init(&sock->buffer);
 	}
 
-	/* return */
 	return sock;
 }
 
@@ -1837,46 +1843,41 @@ NETSOCKET net_tcp_create(NETADDR bindaddr)
 {
 	NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
 	*sock = invalid_socket;
-	NETADDR tmpbindaddr = bindaddr;
-	int socket = -1;
 
 	if(bindaddr.type & NETTYPE_IPV4)
 	{
 		struct sockaddr_in addr;
-
-		/* bind, we should check for error */
+		NETADDR tmpbindaddr = bindaddr;
 		tmpbindaddr.type = NETTYPE_IPV4;
 		netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
-		socket = priv_net_create_socket(AF_INET, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
-		if(socket >= 0)
+		int socket4 = priv_net_create_socket(AF_INET, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket4 >= 0)
 		{
 			sock->type |= NETTYPE_IPV4;
-			sock->ipv4sock = socket;
+			sock->ipv4sock = socket4;
 		}
 	}
 
 	if(bindaddr.type & NETTYPE_IPV6)
 	{
 		struct sockaddr_in6 addr;
-
-		/* bind, we should check for error */
+		NETADDR tmpbindaddr = bindaddr;
 		tmpbindaddr.type = NETTYPE_IPV6;
 		netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
-		socket = priv_net_create_socket(AF_INET6, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
-		if(socket >= 0)
+		int socket6 = priv_net_create_socket(AF_INET6, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket6 >= 0)
 		{
 			sock->type |= NETTYPE_IPV6;
-			sock->ipv6sock = socket;
+			sock->ipv6sock = socket6;
 		}
 	}
 
-	if(socket < 0)
+	if(sock->type == NETTYPE_INVALID)
 	{
 		free(sock);
 		sock = nullptr;
 	}
 
-	/* return */
 	return sock;
 }
 
@@ -1978,6 +1979,8 @@ int net_tcp_connect(NETSOCKET sock, const NETADDR *a)
 	{
 		struct sockaddr_in addr;
 		netaddr_to_sockaddr_in(a, &addr);
+		if(sock->ipv4sock < 0)
+			return -2;
 		return connect(sock->ipv4sock, (struct sockaddr *)&addr, sizeof(addr));
 	}
 
@@ -1985,6 +1988,8 @@ int net_tcp_connect(NETSOCKET sock, const NETADDR *a)
 	{
 		struct sockaddr_in6 addr;
 		netaddr_to_sockaddr_in6(a, &addr);
+		if(sock->ipv6sock < 0)
+			return -2;
 		return connect(sock->ipv6sock, (struct sockaddr *)&addr, sizeof(addr));
 	}
 
@@ -2285,17 +2290,20 @@ int fs_storage_path(const char *appname, char *path, int max)
 
 int fs_makedir_rec_for(const char *path)
 {
-	char buffer[1024 * 2];
-	char *p;
+	char buffer[IO_MAX_PATH_LENGTH];
 	str_copy(buffer, path);
-	for(p = buffer + 1; *p != '\0'; p++)
+	for(int index = 1; buffer[index] != '\0'; ++index)
 	{
-		if(*p == '/' && *(p + 1) != '\0')
+		// Do not try to create folder for drive letters on Windows,
+		// as this is not necessary and may fail for system drives.
+		if((buffer[index] == '/' || buffer[index] == '\\') && buffer[index + 1] != '\0' && buffer[index - 1] != ':')
 		{
-			*p = '\0';
+			buffer[index] = '\0';
 			if(fs_makedir(buffer) < 0)
+			{
 				return -1;
-			*p = '/';
+			}
+			buffer[index] = '/';
 		}
 	}
 	return 0;
@@ -2378,17 +2386,12 @@ int fs_is_relative_path(const char *path)
 
 int fs_chdir(const char *path)
 {
-	if(fs_is_dir(path))
-	{
 #if defined(CONF_FAMILY_WINDOWS)
-		const std::wstring wide_path = windows_utf8_to_wide(path);
-		return SetCurrentDirectoryW(wide_path.c_str()) != 0 ? 0 : 1;
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	return SetCurrentDirectoryW(wide_path.c_str()) != 0 ? 0 : 1;
 #else
-		return chdir(path) ? 1 : 0;
+	return chdir(path) ? 1 : 0;
 #endif
-	}
-	else
-		return 1;
 }
 
 char *fs_getcwd(char *buffer, int buffer_size)
@@ -2396,15 +2399,7 @@ char *fs_getcwd(char *buffer, int buffer_size)
 #if defined(CONF_FAMILY_WINDOWS)
 	const DWORD size_needed = GetCurrentDirectoryW(0, nullptr);
 	std::wstring wide_current_dir(size_needed, L'0');
-	DWORD result = GetCurrentDirectoryW(size_needed, wide_current_dir.data());
-	if(result == 0)
-	{
-		const DWORD LastError = GetLastError();
-		const std::string ErrorMsg = windows_format_system_message(LastError);
-		dbg_msg("filesystem", "GetCurrentDirectoryW failed: %ld %s", LastError, ErrorMsg.c_str());
-		buffer[0] = '\0';
-		return nullptr;
-	}
+	dbg_assert(GetCurrentDirectoryW(size_needed, wide_current_dir.data()) == size_needed - 1, "GetCurrentDirectoryW failure");
 	const std::optional<std::string> current_dir = windows_wide_to_utf8(wide_current_dir.c_str());
 	if(!current_dir.has_value())
 	{
@@ -2602,18 +2597,29 @@ int net_socket_read_wait(NETSOCKET sock, int time)
 	return 0;
 }
 
-int time_timestamp()
+int64_t time_timestamp()
 {
 	return time(0);
 }
 
+static struct tm *time_localtime_threadlocal(time_t *time_data)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	// The result of localtime is thread-local on Windows
+	// https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/localtime-localtime32-localtime64
+	return localtime(time_data);
+#else
+	// Thread-local buffer for the result of localtime_r
+	thread_local struct tm time_info_buf;
+	return localtime_r(time_data, &time_info_buf);
+#endif
+}
+
 int time_houroftheday()
 {
 	time_t time_data;
-	struct tm *time_info;
-
 	time(&time_data);
-	time_info = localtime(&time_data);
+	struct tm *time_info = time_localtime_threadlocal(&time_data);
 	return time_info->tm_hour;
 }
 
@@ -2640,7 +2646,7 @@ static bool time_iseasterday(time_t time_data, struct tm *time_info)
 	for(int day_offset = -1; day_offset <= 2; day_offset++)
 	{
 		time_data = time_data + day_offset * 60 * 60 * 24;
-		time_info = localtime(&time_data);
+		time_info = time_localtime_threadlocal(&time_data);
 		if(time_info->tm_mon == month - 1 && time_info->tm_mday == day)
 			return true;
 	}
@@ -2651,7 +2657,7 @@ ETimeSeason time_season()
 {
 	time_t time_data;
 	time(&time_data);
-	struct tm *time_info = localtime(&time_data);
+	struct tm *time_info = time_localtime_threadlocal(&time_data);
 
 	if((time_info->tm_mon == 11 && time_info->tm_mday == 31) || (time_info->tm_mon == 0 && time_info->tm_mday == 1))
 	{
@@ -2762,6 +2768,15 @@ int str_format_v(char *buffer, int buffer_size, const char *format, va_list args
 	return str_utf8_fix_truncation(buffer);
 }
 
+int str_format_int(char *buffer, size_t buffer_size, int value)
+{
+	buffer[0] = '\0'; // Fix false positive clang-analyzer-core.UndefinedBinaryOperatorResult when using result
+	auto result = std::to_chars(buffer, buffer + buffer_size - 1, value);
+	result.ptr[0] = '\0';
+	return result.ptr - buffer;
+}
+
+#undef str_format
 int str_format(char *buffer, int buffer_size, const char *format, ...)
 {
 	va_list args;
@@ -2770,6 +2785,9 @@ int str_format(char *buffer, int buffer_size, const char *format, ...)
 	va_end(args);
 	return length;
 }
+#if !defined(CONF_DEBUG)
+#define str_format str_format_opt
+#endif
 
 const char *str_trim_words(const char *str, int words)
 {
@@ -2928,7 +2946,7 @@ int str_comp_filenames(const char *a, const char *b)
 
 	for(; *a && *b; ++a, ++b)
 	{
-		if(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9')
+		if(str_isnum(*a) && str_isnum(*b))
 		{
 			result = 0;
 			do
@@ -2937,11 +2955,11 @@ int str_comp_filenames(const char *a, const char *b)
 					result = *a - *b;
 				++a;
 				++b;
-			} while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9');
+			} while(str_isnum(*a) && str_isnum(*b));
 
-			if(*a >= '0' && *a <= '9')
+			if(str_isnum(*a))
 				return 1;
-			else if(*b >= '0' && *b <= '9')
+			else if(str_isnum(*b))
 				return -1;
 			else if(result || *a == '\0' || *b == '\0')
 				return result;
@@ -3144,6 +3162,38 @@ const char *str_find(const char *haystack, const char *needle)
 	return 0;
 }
 
+bool str_delimiters_around_offset(const char *haystack, const char *delim, int offset, int *start, int *end)
+{
+	bool found = true;
+	const char *search = haystack;
+	const int delim_len = str_length(delim);
+	*start = 0;
+	while(str_find(search, delim))
+	{
+		const char *test = str_find(search, delim) + delim_len;
+		int distance = test - haystack;
+		if(distance > offset)
+			break;
+
+		*start = distance;
+		search = test;
+	}
+	if(search == haystack)
+		found = false;
+
+	if(str_find(search, delim))
+	{
+		*end = str_find(search, delim) - haystack;
+	}
+	else
+	{
+		*end = str_length(haystack);
+		found = false;
+	}
+
+	return found;
+}
+
 const char *str_rchr(const char *haystack, char needle)
 {
 	return strrchr(haystack, needle);
@@ -3420,8 +3470,7 @@ int str_base64_decode(void *dst_raw, int dst_size, const char *data)
 #endif
 void str_timestamp_ex(time_t time_data, char *buffer, int buffer_size, const char *format)
 {
-	struct tm *time_info;
-	time_info = localtime(&time_data);
+	struct tm *time_info = time_localtime_threadlocal(&time_data);
 	strftime(buffer, buffer_size, format, time_info);
 	buffer[buffer_size - 1] = 0; /* assure null termination */
 }
@@ -3437,6 +3486,22 @@ void str_timestamp(char *buffer, int buffer_size)
 {
 	str_timestamp_format(buffer, buffer_size, FORMAT_NOSPACE);
 }
+
+bool timestamp_from_str(const char *string, const char *format, time_t *timestamp)
+{
+	std::tm tm{};
+	std::istringstream ss(string);
+	ss >> std::get_time(&tm, format);
+	if(ss.fail() || !ss.eof())
+		return false;
+
+	time_t result = mktime(&tm);
+	if(result < 0)
+		return false;
+
+	*timestamp = result;
+	return true;
+}
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
@@ -3526,11 +3591,16 @@ char str_uppercase(char c)
 	return c;
 }
 
+bool str_isnum(char c)
+{
+	return c >= '0' && c <= '9';
+}
+
 int str_isallnum(const char *str)
 {
 	while(*str)
 	{
-		if(!(*str >= '0' && *str <= '9'))
+		if(!str_isnum(*str))
 			return 0;
 		str++;
 	}
@@ -3541,7 +3611,7 @@ int str_isallnum_hex(const char *str)
 {
 	while(*str)
 	{
-		if(!(*str >= '0' && *str <= '9') && !(*str >= 'a' && *str <= 'f') && !(*str >= 'A' && *str <= 'F'))
+		if(!str_isnum(*str) && !(*str >= 'a' && *str <= 'f') && !(*str >= 'A' && *str <= 'F'))
 			return 0;
 		str++;
 	}
@@ -3553,6 +3623,18 @@ int str_toint(const char *str)
 	return str_toint_base(str, 10);
 }
 
+bool str_toint(const char *str, int *out)
+{
+	// returns true if conversion was successful
+	char *end;
+	int value = strtol(str, &end, 10);
+	if(*end != '\0')
+		return false;
+	if(out != nullptr)
+		*out = value;
+	return true;
+}
+
 int str_toint_base(const char *str, int base)
 {
 	return strtol(str, nullptr, base);
@@ -3573,11 +3655,16 @@ float str_tofloat(const char *str)
 	return strtod(str, nullptr);
 }
 
-void str_from_int(int value, char *buffer, size_t buffer_size)
+bool str_tofloat(const char *str, float *out)
 {
-	buffer[0] = '\0'; // Fix false positive clang-analyzer-core.UndefinedBinaryOperatorResult when using result
-	auto result = std::to_chars(buffer, buffer + buffer_size - 1, value);
-	result.ptr[0] = '\0';
+	// returns true if conversion was successful
+	char *end;
+	float value = strtod(str, &end);
+	if(*end != '\0')
+		return false;
+	if(out != nullptr)
+		*out = value;
+	return true;
 }
 
 int str_utf8_comp_nocase(const char *a, const char *b)
@@ -3873,6 +3960,24 @@ int str_utf8_check(const char *str)
 	return 1;
 }
 
+void str_utf8_copy_num(char *dst, const char *src, int dst_size, int num)
+{
+	int new_cursor;
+	int cursor = 0;
+
+	while(src[cursor] && num > 0)
+	{
+		new_cursor = str_utf8_forward(src, cursor);
+		if(new_cursor >= dst_size) // reserve 1 byte for the null termination
+			break;
+		else
+			cursor = new_cursor;
+		--num;
+	}
+
+	str_copy(dst, src, cursor < dst_size ? cursor + 1 : dst_size);
+}
+
 void str_utf8_stats(const char *str, size_t max_size, size_t max_count, size_t *size, size_t *count)
 {
 	const char *cursor = str;
@@ -4045,7 +4150,8 @@ void cmdline_free(int argc, const char **argv)
 #endif
 }
 
-PROCESS shell_execute(const char *file)
+#if !defined(CONF_PLATFORM_ANDROID)
+PROCESS shell_execute(const char *file, EShellExecuteWindowState window_state)
 {
 #if defined(CONF_FAMILY_WINDOWS)
 	const std::wstring wide_file = windows_utf8_to_wide(file);
@@ -4055,7 +4161,18 @@ PROCESS shell_execute(const char *file)
 	info.cbSize = sizeof(SHELLEXECUTEINFOW);
 	info.lpVerb = L"open";
 	info.lpFile = wide_file.c_str();
-	info.nShow = SW_SHOWMINNOACTIVE;
+	switch(window_state)
+	{
+	case EShellExecuteWindowState::FOREGROUND:
+		info.nShow = SW_SHOW;
+		break;
+	case EShellExecuteWindowState::BACKGROUND:
+		info.nShow = SW_SHOWMINNOACTIVE;
+		break;
+	default:
+		dbg_assert(false, "window_state invalid");
+		dbg_break();
+	}
 	info.fMask = SEE_MASK_NOCLOSEPROCESS;
 	// Save and restore the FPU control word because ShellExecute might change it
 	fenv_t floating_point_environment;
@@ -4177,6 +4294,7 @@ int open_file(const char *path)
 	return open_link(buf);
 #endif
 }
+#endif // !defined(CONF_PLATFORM_ANDROID)
 
 struct SECURE_RANDOM_DATA
 {
@@ -4474,7 +4592,7 @@ void os_locale_str(char *locale, size_t length)
 		{
 			locale[i] = '-';
 		}
-		else if(locale[i] != '-' && !(locale[i] >= 'a' && locale[i] <= 'z') && !(locale[i] >= 'A' && locale[i] <= 'Z') && !(locale[i] >= '0' && locale[i] <= '9'))
+		else if(locale[i] != '-' && !(locale[i] >= 'a' && locale[i] <= 'z') && !(locale[i] >= 'A' && locale[i] <= 'Z') && !(str_isnum(locale[i])))
 		{
 			locale[i] = '\0';
 			break;
diff --git a/src/base/system.h b/src/base/system.h
index c575949e62..cf75ce3092 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -219,13 +219,42 @@ bool mem_has_null(const void *block, size_t size);
  */
 enum
 {
+	/**
+	 * Open file for reading.
+	 *
+	 * @see io_open
+	 */
 	IOFLAG_READ = 1,
+	/**
+	 * Open file for writing.
+	 *
+	 * @see io_open
+	 */
 	IOFLAG_WRITE = 2,
+	/**
+	 * Open file for appending at the end.
+	 *
+	 * @see io_open
+	 */
 	IOFLAG_APPEND = 4,
-	IOFLAG_SKIP_BOM = 8,
 
+	/**
+	 * Start seeking from the beginning of the file.
+	 *
+	 * @see io_seek
+	 */
 	IOSEEK_START = 0,
+	/**
+	 * Start seeking from the current position.
+	 *
+	 * @see io_seek
+	 */
 	IOSEEK_CUR = 1,
+	/**
+	 * Start seeking from the end of the file.
+	 *
+	 * @see io_seek
+	 */
 	IOSEEK_END = 2,
 };
 
@@ -237,10 +266,9 @@ enum
  * @param File to open.
  * @param flags A set of IOFLAG flags.
  *
- * @sa IOFLAG_READ, IOFLAG_WRITE, IOFLAG_APPEND, IOFLAG_SKIP_BOM.
- *
- * @return A handle to the file on success and 0 on failure.
+ * @see IOFLAG_READ, IOFLAG_WRITE, IOFLAG_APPEND.
  *
+ * @return A handle to the file on success, or `nullptr` on failure.
  */
 IOHANDLE io_open(const char *filename, int flags);
 
@@ -254,7 +282,6 @@ IOHANDLE io_open(const char *filename, int flags);
  * @param size Number of bytes to read from the file.
  *
  * @return Number of bytes read.
- *
  */
 unsigned io_read(IOHANDLE io, void *buffer, unsigned size);
 
@@ -280,7 +307,7 @@ void io_read_all(IOHANDLE io, void **result, unsigned *result_len);
  *
  * @param io Handle to the file to read data from.
  *
- * @return The file's remaining contents or null on failure.
+ * @return The file's remaining contents, or `nullptr` on failure.
  *
  * @remark Guarantees that there are no internal null bytes.
  * @remark Guarantees that result will contain zero-termination.
@@ -301,63 +328,63 @@ char *io_read_all_str(IOHANDLE io);
 int io_skip(IOHANDLE io, int size);
 
 /**
- * Writes data from a buffer to file.
+ * Seeks to a specified offset in the file.
  *
  * @ingroup File-IO
  *
  * @param io Handle to the file.
- * @param buffer Pointer to the data that should be written.
- * @param size Number of bytes to write.
+ * @param offset Offset from position to search.
+ * @param origin Position to start searching from.
  *
- * @return Number of bytes written.
+ * @return `0` on success.
  */
-unsigned io_write(IOHANDLE io, const void *buffer, unsigned size);
+int io_seek(IOHANDLE io, int offset, int origin);
 
 /**
- * Writes a platform dependent newline to file.
+ * Gets the current position in the file.
  *
  * @ingroup File-IO
  *
  * @param io Handle to the file.
  *
- * @return true on success, false on failure.
+ * @return The current position, or `-1` on failure.
  */
-bool io_write_newline(IOHANDLE io);
+long int io_tell(IOHANDLE io);
 
 /**
- * Seeks to a specified offset in the file.
+ * Gets the total length of the file. Resets cursor to the beginning.
  *
  * @ingroup File-IO
  *
  * @param io Handle to the file.
- * @param offset Offset from pos to stop.
- * @param origin Position to start searching from.
  *
- * @return 0 on success.
+ * @return The total size, or `-1` on failure.
  */
-int io_seek(IOHANDLE io, int offset, int origin);
+long int io_length(IOHANDLE io);
 
 /**
- * Gets the current position in the file.
+ * Writes data from a buffer to a file.
  *
  * @ingroup File-IO
  *
  * @param io Handle to the file.
+ * @param buffer Pointer to the data that should be written.
+ * @param size Number of bytes to write.
  *
- * @return The current position. @c -1L if an error occurred.
+ * @return Number of bytes written.
  */
-long int io_tell(IOHANDLE io);
+unsigned io_write(IOHANDLE io, const void *buffer, unsigned size);
 
 /**
- * Gets the total length of the file. Resetting cursor to the beginning
+ * Writes a platform dependent newline to a file.
  *
  * @ingroup File-IO
  *
  * @param io Handle to the file.
  *
- * @return The total size. @c -1L if an error occurred.
+ * @return `true` on success, `false` on failure.
  */
-long int io_length(IOHANDLE io);
+bool io_write_newline(IOHANDLE io);
 
 /**
  * Closes a file.
@@ -366,7 +393,7 @@ long int io_length(IOHANDLE io);
  *
  * @param io Handle to the file.
  *
- * @return 0 on success.
+ * @return `0` on success.
  */
 int io_close(IOHANDLE io);
 
@@ -377,7 +404,7 @@ int io_close(IOHANDLE io);
  *
  * @param io Handle to the file.
  *
- * @return 0 on success.
+ * @return `0` on success.
  */
 int io_flush(IOHANDLE io);
 
@@ -388,7 +415,7 @@ int io_flush(IOHANDLE io);
  *
  * @param io Handle to the file.
  *
- * @return 0 on success.
+ * @return `0` on success.
  */
 int io_sync(IOHANDLE io);
 
@@ -399,34 +426,57 @@ int io_sync(IOHANDLE io);
  *
  * @param io Handle to the file.
  *
- * @return nonzero on error, 0 otherwise.
+ * @return `0` on success, or non-`0` on error.
  */
 int io_error(IOHANDLE io);
 
 /**
  * @ingroup File-IO
- * @return An <IOHANDLE> to the standard input.
+ *
+ * Returns a handle for the standard input.
+ *
+ * @return An @link IOHANDLE @endlink for the standard input.
+ *
+ * @remark The handle must not be closed.
  */
 IOHANDLE io_stdin();
 
 /**
  * @ingroup File-IO
- * @return An <IOHANDLE> to the standard output.
+ *
+ * Returns a handle for the standard output.
+ *
+ * @return An @link IOHANDLE @endlink for the standard output.
+ *
+ * @remark The handle must not be closed.
  */
 IOHANDLE io_stdout();
 
 /**
  * @ingroup File-IO
- * @return An <IOHANDLE> to the standard error.
+ *
+ * Returns a handle for the standard error.
+ *
+ * @return An @link IOHANDLE @endlink for the standard error.
+ *
+ * @remark The handle must not be closed.
  */
 IOHANDLE io_stderr();
 
 /**
  * @ingroup File-IO
- * @return An <IOHANDLE> to the current executable.
+ *
+ * Returns a handle for the current executable.
+ *
+ * @return An @link IOHANDLE @endlink for the current executable.
  */
 IOHANDLE io_current_exe();
 
+/**
+ * Wrapper for asynchronously writing to an @link IOHANDLE @endlink.
+ *
+ * @ingroup File-IO
+ */
 typedef struct ASYNCIO ASYNCIO;
 
 /**
@@ -437,12 +487,11 @@ typedef struct ASYNCIO ASYNCIO;
  * @param io Handle to the file.
  *
  * @return The handle for asynchronous writing.
- *
  */
 ASYNCIO *aio_new(IOHANDLE io);
 
 /**
- * Locks the ASYNCIO structure so it can't be written into by
+ * Locks the `ASYNCIO` structure so it can't be written into by
  * other threads.
  *
  * @ingroup File-IO
@@ -452,7 +501,7 @@ ASYNCIO *aio_new(IOHANDLE io);
 void aio_lock(ASYNCIO *aio);
 
 /**
- * Unlocks the ASYNCIO structure after finishing the contiguous
+ * Unlocks the `ASYNCIO` structure after finishing the contiguous
  * write.
  *
  * @ingroup File-IO
@@ -478,12 +527,11 @@ void aio_write(ASYNCIO *aio, const void *buffer, unsigned size);
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
- *
  */
 void aio_write_newline(ASYNCIO *aio);
 
 /**
- * Queues a chunk of data for writing. The ASYNCIO struct must be
+ * Queues a chunk of data for writing. The `ASYNCIO` struct must be
  * locked using @link aio_lock @endlink first.
  *
  * @ingroup File-IO
@@ -491,18 +539,16 @@ void aio_write_newline(ASYNCIO *aio);
  * @param aio Handle to the file.
  * @param buffer Pointer to the data that should be written.
  * @param size Number of bytes to write.
- *
  */
 void aio_write_unlocked(ASYNCIO *aio, const void *buffer, unsigned size);
 
 /**
- * Queues a newline for writing. The ASYNCIO struct must be locked
+ * Queues a newline for writing. The `ASYNCIO` struct must be locked
  * using @link aio_lock @endlink first.
  *
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
- *
  */
 void aio_write_newline_unlocked(ASYNCIO *aio);
 
@@ -510,16 +556,15 @@ void aio_write_newline_unlocked(ASYNCIO *aio);
  * Checks whether errors have occurred during the asynchronous
  * writing.
  *
- * Call this function regularly to see if there are errors. Call
- * this function after <aio_wait> to see if the process of writing
+ * Call this function regularly to see if there are errors. Call this
+ * function after @link aio_wait @endlink to see if the process of writing
  * to the file succeeded.
  *
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
  *
- * @eturn 0 if no error occurred, and nonzero on error.
- *
+ * @return `0` on success, or non-`0` on error.
  */
 int aio_error(ASYNCIO *aio);
 
@@ -529,7 +574,6 @@ int aio_error(ASYNCIO *aio);
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
- *
  */
 void aio_close(ASYNCIO *aio);
 
@@ -539,17 +583,15 @@ void aio_close(ASYNCIO *aio);
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
- *
  */
 void aio_wait(ASYNCIO *aio);
 
 /**
- * Frees the resources associated to the asynchronous file handle.
+ * Frees the resources associated with the asynchronous file handle.
  *
  * @ingroup File-IO
  *
  * @param aio Handle to the file.
- *
  */
 void aio_free(ASYNCIO *aio);
 
@@ -558,6 +600,7 @@ void aio_free(ASYNCIO *aio);
  * Threading related functions.
  *
  * @see Locks
+ * @see Semaphore
  */
 
 /**
@@ -567,7 +610,9 @@ void aio_free(ASYNCIO *aio);
  *
  * @param threadfunc Entry point for the new thread.
  * @param user Pointer to pass to the thread.
- * @param name name describing the use of the thread
+ * @param name Name describing the use of the thread.
+ *
+ * @return Handle for the new thread.
  */
 void *thread_init(void (*threadfunc)(void *), void *user, const char *name);
 
@@ -581,35 +626,33 @@ void *thread_init(void (*threadfunc)(void *), void *user, const char *name);
 void thread_wait(void *thread);
 
 /**
- * Yield the current threads execution slice.
+ * Yield the current thread's execution slice.
  *
  * @ingroup Threads
  */
 void thread_yield();
 
 /**
- * Puts the thread in the detached thread, guaranteeing that
+ * Puts the thread in the detached state, guaranteeing that
  * resources of the thread will be freed immediately when the
  * thread terminates.
  *
  * @ingroup Threads
  *
- * @param thread Thread to detach
+ * @param thread Thread to detach.
  */
 void thread_detach(void *thread);
 
 /**
- * Creates a new thread and if it succeeded detaches it.
+ * Creates a new thread and detaches it.
  *
  * @ingroup Threads
  *
  * @param threadfunc Entry point for the new thread.
  * @param user Pointer to pass to the thread.
- * @param name Name describing the use of the thread
- *
- * @return true on success, false on failure.
+ * @param name Name describing the use of the thread.
  */
-bool thread_init_and_detach(void (*threadfunc)(void *), void *user, const char *name);
+void thread_init_and_detach(void (*threadfunc)(void *), void *user, const char *name);
 
 /**
  * @defgroup Semaphore
@@ -697,7 +740,7 @@ int64_t time_freq();
  *
  * @return The time as a UNIX timestamp
  */
-int time_timestamp();
+int64_t time_timestamp();
 
 /**
  * Retrieves the hours since midnight (0..23)
@@ -812,9 +855,11 @@ int net_addr_comp_noport(const NETADDR *a, const NETADDR *b);
  * @param max_length Maximum size of the string.
  * @param add_port add port to string or not
  *
+ * @return true on success
+ *
  * @remark The string will always be zero terminated
  */
-void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port);
+bool net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port);
 
 /**
  * Turns url string into a network address struct.
@@ -1228,6 +1273,32 @@ int str_format_v(char *buffer, int buffer_size, const char *format, va_list args
 int str_format(char *buffer, int buffer_size, const char *format, ...)
 	GNUC_ATTRIBUTE((format(printf, 3, 4)));
 
+#if !defined(CONF_DEBUG)
+int str_format_int(char *buffer, size_t buffer_size, int value);
+
+template<typename... Args>
+int str_format_opt(char *buffer, int buffer_size, const char *format, Args... args)
+{
+	static_assert(sizeof...(args) > 0, "Use str_copy instead of str_format without format arguments");
+	return str_format(buffer, buffer_size, format, args...);
+}
+
+template<>
+inline int str_format_opt(char *buffer, int buffer_size, const char *format, int val)
+{
+	if(strcmp(format, "%d") == 0)
+	{
+		return str_format_int(buffer, buffer_size, val);
+	}
+	else
+	{
+		return str_format(buffer, buffer_size, format, val);
+	}
+}
+
+#define str_format str_format_opt
+#endif
+
 /**
  * Trims specific number of words at the start of a string.
  *
@@ -1580,6 +1651,22 @@ const char *str_find_nocase(const char *haystack, const char *needle);
 */
 const char *str_find(const char *haystack, const char *needle);
 
+/**
+ * @ingroup Strings
+ *
+ * @param haystack String to search in
+ * @param delim String to search for
+ * @param offset Number of characters into the haystack
+ * @param start Will be set to the first delimiter on the left side of the offset (or haystack start)
+ * @param end Will be set to the first delimiter on the right side of the offset (or haystack end)
+ *
+ * @return `true` if both delimiters were found
+ * @return 'false' if a delimiter is missing (it uses haystack start and end as fallback)
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+bool str_delimiters_around_offset(const char *haystay, const char *delim, int offset, int *start, int *end);
+
 /**
  * Finds the last occurrence of a character
  *
@@ -1711,6 +1798,21 @@ void str_timestamp_format(char *buffer, int buffer_size, const char *format)
 void str_timestamp_ex(time_t time, char *buffer, int buffer_size, const char *format)
 	GNUC_ATTRIBUTE((format(strftime, 4, 0)));
 
+/**
+ * Parses a string into a timestamp following a specified format.
+ *
+ * @ingroup Timestamp
+ *
+ * @param string Pointer to the string to parse
+ * @param format The time format to use (for example FORMAT_NOSPACE below)
+ * @param timestamp Pointer to the timestamp result
+ *
+ * @return true on success, false if the string could not be parsed with the specified format
+ *
+ */
+bool timestamp_from_str(const char *string, const char *format, time_t *timestamp)
+	GNUC_ATTRIBUTE((format(strftime, 2, 0)));
+
 #define FORMAT_TIME "%H:%M:%S"
 #define FORMAT_SPACE "%Y-%m-%d %H:%M:%S"
 #define FORMAT_NOSPACE "%Y-%m-%d_%H-%M-%S"
@@ -1823,11 +1925,11 @@ int fs_makedir(const char *path);
 int fs_removedir(const char *path);
 
 /**
- * Recursively create directories for a file.
+ * Recursively creates parent directories for a file or directory.
  *
  * @ingroup Filesystem
  *
- * @param path - File for which to create directories.
+ * @param path File or directory for which to create parent directories.
  *
  * @return 0 on success. Negative value on failure.
  *
@@ -2053,36 +2155,6 @@ int net_would_block();
 
 int net_socket_read_wait(NETSOCKET sock, int time);
 
-/*
-	Function: open_link
-		Opens a link in the browser.
-
-	Parameters:
-		link - The link to open in a browser.
-
-	Returns:
-		Returns 1 on success, 0 on failure.
-
-	Remarks:
-		This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
-*/
-int open_link(const char *link);
-
-/*
-	Function: open_file
-		Opens a file or directory with default program.
-
-	Parameters:
-		path - The path to open.
-
-	Returns:
-		Returns 1 on success, 0 on failure.
-
-	Remarks:
-		This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
-*/
-int open_file(const char *path);
-
 /**
  * Swaps the endianness of data. Each element is swapped individually by reversing its bytes.
  *
@@ -2105,18 +2177,12 @@ typedef struct
 void net_stats(NETSTATS *stats);
 
 int str_toint(const char *str);
+bool str_toint(const char *str, int *out);
 int str_toint_base(const char *str, int base);
 unsigned long str_toulong_base(const char *str, int base);
 int64_t str_toint64_base(const char *str, int base = 10);
 float str_tofloat(const char *str);
-
-void str_from_int(int value, char *buffer, size_t buffer_size);
-
-template<size_t N>
-void str_from_int(int value, char (&dst)[N])
-{
-	str_from_int(value, dst, N);
-}
+bool str_tofloat(const char *str, float *out);
 
 /**
  * Determines whether a character is whitespace.
@@ -2133,6 +2199,8 @@ int str_isspace(char c);
 
 char str_uppercase(char c);
 
+bool str_isnum(char c);
+
 int str_isallnum(const char *str);
 
 int str_isallnum_hex(const char *str);
@@ -2354,6 +2422,22 @@ int str_utf8_encode(char *ptr, int chr);
 */
 int str_utf8_check(const char *str);
 
+/*
+	Function: str_utf8_copy_num
+		Copies a number of utf8 characters from one string to another.
+
+	Parameters:
+		dst - Pointer to a buffer that shall receive the string.
+		src - String to be copied.
+		dst_size - Size of the buffer dst.
+		num - maximum number of utf8 characters to be copied.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+		- Garantees that dst string will contain zero-termination.
+*/
+void str_utf8_copy_num(char *dst, const char *src, int dst_size, int num);
+
 /*
 	Function: str_utf8_stats
 		Determines the byte size and utf8 character count of a utf8 string.
@@ -2457,162 +2541,247 @@ unsigned bytes_be_to_uint(const unsigned char *bytes);
  */
 void uint_to_bytes_be(unsigned char *bytes, unsigned value);
 
-/*
-	Function: pid
-		Returns the pid of the current process.
+/**
+ * @defgroup Shell
+ * Shell, process management, OS specific functionality.
+ */
 
-	Returns:
-		pid of the current process
-*/
+/**
+ * Returns the ID of the current process.
+ *
+ * @ingroup Shell
+ *
+ * @return PID of the current process.
+ */
 int pid();
 
-/*
-	Function: cmdline_fix
-		Fixes the command line arguments to be encoded in UTF-8 on all
-		systems.
-
-	Parameters:
-		argc - A pointer to the argc parameter that was passed to the main function.
-		argv - A pointer to the argv parameter that was passed to the main function.
-
-	Remarks:
-		- You need to call cmdline_free once you're no longer using the
-		results.
-*/
+/**
+ * Fixes the command line arguments to be encoded in UTF-8 on all systems.
+ *
+ * @ingroup Shell
+ *
+ * @param argc A pointer to the argc parameter that was passed to the main function.
+ * @param argv A pointer to the argv parameter that was passed to the main function.
+ *
+ * @remark You need to call @link cmdline_free @endlink once you're no longer using the results.
+ */
 void cmdline_fix(int *argc, const char ***argv);
 
-/*
-	Function: cmdline_free
-		Frees memory that was allocated by cmdline_fix.
-
-	Parameters:
-		argc - The argc obtained from cmdline_fix.
-		argv - The argv obtained from cmdline_fix.
-
-*/
+/**
+ * Frees memory that was allocated by @link cmdline_fix @endlink.
+ *
+ * @ingroup Shell
+ *
+ * @param argc The argc obtained from `cmdline_fix`.
+ * @param argv The argv obtained from `cmdline_fix`.
+ */
 void cmdline_free(int argc, const char **argv);
 
 #if defined(CONF_FAMILY_WINDOWS)
+/**
+ * A handle for a process.
+ *
+ * @ingroup Shell
+ */
 typedef void *PROCESS;
+/**
+ * A handle that denotes an invalid process.
+ *
+ * @ingroup Shell
+ */
 constexpr PROCESS INVALID_PROCESS = nullptr;
 #else
+/**
+ * A handle for a process.
+ *
+ * @ingroup Shell
+ */
 typedef pid_t PROCESS;
+/**
+ * A handle that denotes an invalid process.
+ *
+ * @ingroup Shell
+ */
 constexpr PROCESS INVALID_PROCESS = 0;
 #endif
+#if !defined(CONF_PLATFORM_ANDROID)
+/**
+ * Determines the initial window state when using @link shell_execute @endlink
+ * to execute a process.
+ *
+ * @ingroup Shell
+ *
+ * @remark Currently only supported on Windows.
+ */
+enum class EShellExecuteWindowState
+{
+	/**
+	 * The process window is opened in the foreground and activated.
+	 */
+	FOREGROUND,
+
+	/**
+	 * The process window is opened in the background without focus.
+	 */
+	BACKGROUND,
+};
 
-/*
-	Function: shell_execute
-		Executes a given file.
-
-	Returns:
-		handle/pid of the new process
-*/
-PROCESS shell_execute(const char *file);
-
-/*
-	Function: kill_process
-		Sends kill signal to a process.
-
-	Parameters:
-		process - handle/pid of the process
+/**
+ * Executes a given file.
+ *
+ * @ingroup Shell
+ *
+ * @param file The file to execute.
+ * @param window_state The window state how the process window should be shown.
+ *
+ * @return Handle of the new process, or @link INVALID_PROCESS @endlink on error.
+ */
+PROCESS shell_execute(const char *file, EShellExecuteWindowState window_state);
 
-	Returns:
-		0 - Error
-		1 - Success
-*/
+/**
+ * Sends kill signal to a process.
+ *
+ * @ingroup Shell
+ *
+ * @param process Handle of the process to kill.
+ *
+ * @return `1` on success, `0` on error.
+ */
 int kill_process(PROCESS process);
 
 /**
  * Checks if a process is alive.
- * 
+ *
+ * @ingroup Shell
+ *
  * @param process Handle/PID of the process.
- * 
- * @return bool Returns true if the process is currently running, false if the process is not running (dead).
+ *
+ * @return `true` if the process is currently running,
+ * `false` if the process is not running (dead).
  */
 bool is_process_alive(PROCESS process);
 
-/*
-	Function: generate_password
-		Generates a null-terminated password of length `2 *
-		random_length`.
+/**
+ * Opens a link in the browser.
+ *
+ * @ingroup Shell
+ *
+ * @param link The link to open in a browser.
+ *
+ * @return `1` on success, `0` on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+ */
+int open_link(const char *link);
 
-	Parameters:
-		buffer - Pointer to the start of the output buffer.
-		length - Length of the buffer.
-		random - Pointer to a randomly-initialized array of shorts.
-		random_length - Length of the short array.
-*/
-void generate_password(char *buffer, unsigned length, const unsigned short *random, unsigned random_length);
+/**
+ * Opens a file or directory with the default program.
+ *
+ * @ingroup Shell
+ *
+ * @param path The file or folder to open with the default program.
+ *
+ * @return `1` on success, `0` on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+ */
+int open_file(const char *path);
+#endif // !defined(CONF_PLATFORM_ANDROID)
 
-/*
-	Function: secure_random_init
-		Initializes the secure random module.
-		You *MUST* check the return value of this function.
+/**
+ * @defgroup Secure-Random
+ * Secure random number generation.
+ */
 
-	Returns:
-		0 - Initialization succeeded.
-		1 - Initialization failed.
-*/
-int secure_random_init();
+/**
+ * Generates a null-terminated password of length `2 * random_length`.
+ *
+ * @ingroup Secure-Random
+ *
+ * @param buffer Pointer to the start of the output buffer.
+ * @param length Length of the buffer.
+ * @param random Pointer to a randomly-initialized array of shorts.
+ * @param random_length Length of the short array.
+ */
+void generate_password(char *buffer, unsigned length, const unsigned short *random, unsigned random_length);
 
-/*
-	Function: secure_random_uninit
-		Uninitializes the secure random module.
+/**
+ * Initializes the secure random module.
+ * You *MUST* check the return value of this function.
+ *
+ * @ingroup Secure-Random
+ *
+ * @return `0` on success.
+ */
+[[nodiscard]] int secure_random_init();
 
-	Returns:
-		0 - Uninitialization succeeded.
-		1 - Uninitialization failed.
-*/
+/**
+ * Uninitializes the secure random module.
+ *
+ * @ingroup Secure-Random
+ *
+ * @return `0` on success.
+ */
 int secure_random_uninit();
 
-/*
-	Function: secure_random_password
-		Fills the buffer with the specified amount of random password
-		characters.
-
-		The desired password length must be greater or equal to 6, even
-		and smaller or equal to 128.
-
-	Parameters:
-		buffer - Pointer to the start of the buffer.
-		length - Length of the buffer.
-		pw_length - Length of the desired password.
-*/
+/**
+ * Fills the buffer with the specified amount of random password characters.
+ *
+ * @ingroup Secure-Random
+ *
+ * @param buffer Pointer to the start of the buffer.
+ * @param length Length of the buffer.
+ * @param pw_length Length of the desired password.
+ *
+ * @remark The desired password length must be greater or equal to 6,
+ * even and smaller or equal to 128.
+ */
 void secure_random_password(char *buffer, unsigned length, unsigned pw_length);
 
-/*
-	Function: secure_random_fill
-		Fills the buffer with the specified amount of random bytes.
-
-	Parameters:
-		buffer - Pointer to the start of the buffer.
-		length - Length of the buffer.
-*/
+/**
+ * Fills the buffer with the specified amount of random bytes.
+ *
+ * @ingroup Secure-Random
+ *
+ * @param buffer Pointer to the start of the buffer.
+ * @param length Length of the buffer.
+ */
 void secure_random_fill(void *bytes, unsigned length);
 
-/*
-	Function: secure_rand
-		Returns random int (replacement for rand()).
-*/
+/**
+ * Returns random `int`.
+ *
+ * @ingroup Secure-Random
+ *
+ * @return Random int.
+ *
+ * @remark Can be used as a replacement for the `rand` function.
+ */
 int secure_rand();
 
-/*
-	Function: secure_rand_below
-		Returns a random nonnegative integer below the given number,
-		with a uniform distribution.
-
-	Parameters:
-		below - Upper limit (exclusive) of integers to return.
-*/
+/**
+ * Returns a random nonnegative integer below the given number,
+ * with a uniform distribution.
+ *
+ * @ingroup Secure-Random
+ *
+ * @param below Upper limit (exclusive) of integers to return.
+ *
+ * @return Random nonnegative below the given number.
+ */
 int secure_rand_below(int below);
 
 /**
  * Returns a human-readable version string of the operating system.
  *
+ * @ingroup Shell
+ *
  * @param version Buffer to use for the output.
  * @param length Length of the output buffer.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  */
 bool os_version_str(char *version, size_t length);
 
@@ -2623,6 +2792,8 @@ bool os_version_str(char *version, size_t length);
  * If the preferred locale could not be determined this function
  * falls back to the locale `"en-US"`.
  *
+ * @ingroup Shell
+ *
  * @param locale Buffer to use for the output.
  * @param length Length of the output buffer.
  *
@@ -2631,7 +2802,25 @@ bool os_version_str(char *version, size_t length);
 void os_locale_str(char *locale, size_t length);
 
 #if defined(CONF_EXCEPTION_HANDLING)
+/**
+ * @defgroup Exception-Handling
+ * Exception handling (crash logging).
+ */
+
+/**
+ * Initializes the exception handling module.
+ *
+ * @ingroup Exception-Handling
+ */
 void init_exception_handler();
+
+/**
+ * Sets the filename for writing the crash log.
+ *
+ * @ingroup Exception-Handling
+ *
+ * @param log_file_path Absolute path to which crash log file should be written.
+ */
 void set_exception_handler_log_file(const char *log_file_path);
 #endif
 
@@ -2648,7 +2837,9 @@ int net_socket_read_wait(NETSOCKET sock, std::chrono::nanoseconds nanoseconds);
 
 /**
  * Fixes the command line arguments to be encoded in UTF-8 on all systems.
- * This is a RAII wrapper for cmdline_fix and cmdline_free.
+ * This is a RAII wrapper for @link cmdline_fix @endlink and @link cmdline_free @endlink.
+ *
+ * @ingroup Shell
  */
 class CCmdlineFix
 {
@@ -2670,25 +2861,29 @@ class CCmdlineFix
 
 #if defined(CONF_FAMILY_WINDOWS)
 /**
- * Converts a utf8 encoded string to a wide character string
+ * Converts a UTF-8 encoded string to a wide character string
  * for use with the Windows API.
  *
- * @param str The utf8 encoded string to convert.
+ * @ingroup Shell
+ *
+ * @param str The UTF-8 encoded string to convert.
  *
  * @return The argument as a wide character string.
  *
  * @remark The argument string must be zero-terminated.
- * @remark Fails with assertion error if passed utf8 is invalid.
+ * @remark Fails with assertion error if passed UTF-8 is invalid.
  */
 std::wstring windows_utf8_to_wide(const char *str);
 
 /**
  * Converts a wide character string obtained from the Windows API
- * to a utf8 encoded string.
+ * to a UTF-8 encoded string.
+ *
+ * @ingroup Shell
  *
  * @param wide_str The wide character string to convert.
  *
- * @return The argument as a utf8 encoded string, wrapped in an optional.
+ * @return The argument as a UTF-8 encoded string, wrapped in an optional.
  * The optional is empty, if the wide string contains invalid codepoints.
  *
  * @remark The argument string must be zero-terminated.
@@ -2697,10 +2892,13 @@ std::optional<std::string> windows_wide_to_utf8(const wchar_t *wide_str);
 
 /**
  * This is a RAII wrapper to initialize/uninitialize the Windows COM library,
- * which may be necessary for using the open_file and open_link functions.
+ * which may be necessary for using the @link open_file @endlink and
+ * @link open_link @endlink functions.
  * Must be used on every thread. It's automatically used on threads created
- * with thread_init. Pass true to the constructor on threads that own a
- * window (i.e. pump a message queue).
+ * with @link thread_init @endlink. Pass `true` to the constructor on threads
+ * that own a window (i.e. pump a message queue).
+ *
+ * @ingroup Shell
  */
 class CWindowsComLifecycle
 {
@@ -2716,11 +2914,11 @@ class CWindowsComLifecycle
  *
  * @param protocol_name The name of the protocol.
  * @param executable The absolute path of the executable that will be associated with the protocol.
- * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ * @param updated Pointer to a variable that will be set to `true`, iff the shell needs to be updated.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  *
- * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ * @remark The caller must later call @link shell_update @endlink, iff the shell needs to be updated.
  */
 bool shell_register_protocol(const char *protocol_name, const char *executable, bool *updated);
 
@@ -2733,11 +2931,11 @@ bool shell_register_protocol(const char *protocol_name, const char *executable,
  * @param description A readable description for the file extension.
  * @param executable_name A unique name that will used to describe the application.
  * @param executable The absolute path of the executable that will be associated with the file extension.
- * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ * @param updated Pointer to a variable that will be set to `true`, iff the shell needs to be updated.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  *
- * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ * @remark The caller must later call @link shell_update @endlink, iff the shell needs to be updated.
  */
 bool shell_register_extension(const char *extension, const char *description, const char *executable_name, const char *executable, bool *updated);
 
@@ -2748,11 +2946,11 @@ bool shell_register_extension(const char *extension, const char *description, co
  *
  * @param name Readable name of the application.
  * @param executable The absolute path of the executable being registered.
- * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ * @param updated Pointer to a variable that will be set to `true`, iff the shell needs to be updated.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  *
- * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ * @remark The caller must later call @link shell_update @endlink, iff the shell needs to be updated.
  */
 bool shell_register_application(const char *name, const char *executable, bool *updated);
 
@@ -2764,11 +2962,11 @@ bool shell_register_application(const char *name, const char *executable, bool *
  * @param shell_class The shell class to delete.
  * For protocols this is the name of the protocol.
  * For file extensions this is the program ID associated with the file extension.
- * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ * @param updated Pointer to a variable that will be set to `true`, iff the shell needs to be updated.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  *
- * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ * @remark The caller must later call @link shell_update @endlink, iff the shell needs to be updated.
  */
 bool shell_unregister_class(const char *shell_class, bool *updated);
 
@@ -2778,11 +2976,11 @@ bool shell_unregister_class(const char *shell_class, bool *updated);
  * @ingroup Shell
  *
  * @param executable The absolute path of the executable being unregistered.
- * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ * @param updated Pointer to a variable that will be set to `true`, iff the shell needs to be updated.
  *
- * @return true on success, false on failure.
+ * @return `true` on success, `false` on failure.
  *
- * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ * @remark The caller must later call @link shell_update @endlink, iff the shell needs to be updated.
  */
 bool shell_unregister_application(const char *executable, bool *updated);
 
diff --git a/src/base/types.h b/src/base/types.h
index ffa1b47ed2..b1d5af051c 100644
--- a/src/base/types.h
+++ b/src/base/types.h
@@ -10,6 +10,11 @@ enum class TRISTATE
 	ALL,
 };
 
+/**
+ * Handle for input/output files/streams.
+ *
+ * @ingroup File-IO
+ */
 typedef void *IOHANDLE;
 
 typedef int (*FS_LISTDIR_CALLBACK)(const char *name, int is_dir, int dir_type, void *user);
@@ -45,9 +50,14 @@ enum
 	NETTYPE_IPV4 = 1,
 	NETTYPE_IPV6 = 2,
 	NETTYPE_WEBSOCKET_IPV4 = 8,
+	/**
+	 * 0.7 address. This is a flag in NETADDR to avoid introducing a parameter to every networking function
+	 * to differenciate between 0.6 and 0.7 connections.
+	 */
+	NETTYPE_TW7 = 16,
 
 	NETTYPE_ALL = NETTYPE_IPV4 | NETTYPE_IPV6 | NETTYPE_WEBSOCKET_IPV4,
-	NETTYPE_MASK = NETTYPE_ALL | NETTYPE_LINK_BROADCAST,
+	NETTYPE_MASK = NETTYPE_ALL | NETTYPE_LINK_BROADCAST | NETTYPE_TW7,
 };
 
 /**
diff --git a/src/engine/Cargo.toml b/src/engine/Cargo.toml
index b6d484cd01..48eab28c4e 100644
--- a/src/engine/Cargo.toml
+++ b/src/engine/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ddnet-engine"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
diff --git a/src/engine/antibot.h b/src/engine/antibot.h
index 0b432bb78b..22ab05fddd 100644
--- a/src/engine/antibot.h
+++ b/src/engine/antibot.h
@@ -11,15 +11,15 @@ class IAntibot : public IInterface
 	virtual void RoundEnd() = 0;
 
 	// Hooks
-	virtual void OnPlayerInit(int ClientID) = 0;
-	virtual void OnPlayerDestroy(int ClientID) = 0;
-	virtual void OnSpawn(int ClientID) = 0;
-	virtual void OnHammerFireReloading(int ClientID) = 0;
-	virtual void OnHammerFire(int ClientID) = 0;
-	virtual void OnHammerHit(int ClientID, int TargetID) = 0;
-	virtual void OnDirectInput(int ClientID) = 0;
-	virtual void OnCharacterTick(int ClientID) = 0;
-	virtual void OnHookAttach(int ClientID, bool Player) = 0;
+	virtual void OnPlayerInit(int ClientId) = 0;
+	virtual void OnPlayerDestroy(int ClientId) = 0;
+	virtual void OnSpawn(int ClientId) = 0;
+	virtual void OnHammerFireReloading(int ClientId) = 0;
+	virtual void OnHammerFire(int ClientId) = 0;
+	virtual void OnHammerHit(int ClientId, int TargetId) = 0;
+	virtual void OnDirectInput(int ClientId) = 0;
+	virtual void OnCharacterTick(int ClientId) = 0;
+	virtual void OnHookAttach(int ClientId, bool Player) = 0;
 
 	// Commands
 	virtual void ConsoleCommand(const char *pCommand) = 0;
@@ -35,11 +35,11 @@ class IEngineAntibot : public IAntibot
 
 	// Hooks
 	virtual void OnEngineTick() = 0;
-	virtual void OnEngineClientJoin(int ClientID, bool Sixup) = 0;
-	virtual void OnEngineClientDrop(int ClientID, const char *pReason) = 0;
-	virtual bool OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) = 0;
-	virtual bool OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) = 0;
-	virtual bool OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) = 0;
+	virtual void OnEngineClientJoin(int ClientId, bool Sixup) = 0;
+	virtual void OnEngineClientDrop(int ClientId, const char *pReason) = 0;
+	virtual bool OnEngineClientMessage(int ClientId, const void *pData, int Size, int Flags) = 0;
+	virtual bool OnEngineServerMessage(int ClientId, const void *pData, int Size, int Flags) = 0;
+	virtual bool OnEngineSimulateClientMessage(int *pClientId, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) = 0;
 
 	virtual ~IEngineAntibot(){};
 };
diff --git a/src/engine/client.h b/src/engine/client.h
index d4c9f3fd43..a9599f89b4 100644
--- a/src/engine/client.h
+++ b/src/engine/client.h
@@ -8,11 +8,16 @@
 #include "message.h"
 #include <base/hash.h>
 
+#include <engine/shared/translation_context.h>
+
 #include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
 
 #include <engine/friends.h>
 #include <functional>
 
+#include <engine/client/enums.h>
+
 struct SWarning;
 
 enum
@@ -22,8 +27,6 @@ enum
 	RECORDER_RACE = 2,
 	RECORDER_REPLAYS = 3,
 	RECORDER_MAX = 4,
-
-	NUM_DUMMIES = 2,
 };
 
 typedef bool (*CLIENTFUNC_FILTER)(const void *pData, int DataSize, void *pUser);
@@ -61,11 +64,18 @@ class IClient : public IInterface
 	{
 		LOADING_STATE_DETAIL_INITIAL,
 		LOADING_STATE_DETAIL_LOADING_MAP,
+		LOADING_STATE_DETAIL_LOADING_DEMO,
 		LOADING_STATE_DETAIL_SENDING_READY,
 		LOADING_STATE_DETAIL_GETTING_READY,
 	};
 
-	typedef std::function<void()> TMapLoadingCallbackFunc;
+	enum ELoadingCallbackDetail
+	{
+		LOADING_CALLBACK_DETAIL_MAP,
+		LOADING_CALLBACK_DETAIL_DEMO,
+	};
+	typedef std::function<void(ELoadingCallbackDetail Detail)> TLoadingCallback;
+	CTranslationContext m_TranslationContext;
 
 protected:
 	// quick access to state of the client
@@ -88,7 +98,7 @@ class IClient : public IInterface
 	float m_RenderFrameTime = 0.0001f;
 	float m_FrameTimeAvg = 0.0001f;
 
-	TMapLoadingCallbackFunc m_MapLoadingCBFunc = nullptr;
+	TLoadingCallback m_LoadingCallback = nullptr;
 
 	char m_aNews[3000] = "";
 	int m_Points = -1;
@@ -99,7 +109,8 @@ class IClient : public IInterface
 	{
 	public:
 		int m_Type;
-		int m_ID;
+		int m_Id;
+		const void *m_pData;
 		int m_DataSize;
 	};
 
@@ -128,7 +139,7 @@ class IClient : public IInterface
 	inline int64_t StateStartTime() const { return m_StateStartTime; }
 	void SetLoadingStateDetail(ELoadingStateDetail LoadingStateDetail) { m_LoadingStateDetail = LoadingStateDetail; }
 
-	void SetMapLoadingCBFunc(TMapLoadingCallbackFunc &&Func) { m_MapLoadingCBFunc = std::move(Func); }
+	void SetLoadingCallback(TLoadingCallback &&Func) { m_LoadingCallback = std::move(Func); }
 
 	// tick time access
 	inline int PrevGameTick(int Conn) const { return m_aPrevGameTick[Conn]; }
@@ -153,9 +164,10 @@ class IClient : public IInterface
 	// dummy
 	virtual void DummyDisconnect(const char *pReason) = 0;
 	virtual void DummyConnect() = 0;
-	virtual bool DummyConnected() = 0;
-	virtual bool DummyConnecting() = 0;
-	virtual bool DummyAllowed() = 0;
+	virtual bool DummyConnected() const = 0;
+	virtual bool DummyConnecting() const = 0;
+	virtual bool DummyConnectingDelayed() const = 0;
+	virtual bool DummyAllowed() const = 0;
 
 	virtual void Restart() = 0;
 	virtual void Quit() = 0;
@@ -165,7 +177,7 @@ class IClient : public IInterface
 #endif
 	virtual void DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int Recorder, bool Verbose = false) = 0;
 	virtual void DemoRecorder_HandleAutoStart() = 0;
-	virtual void DemoRecorder_Stop(int Recorder, bool RemoveFile = false) = 0;
+	virtual void DemoRecorder_UpdateReplayRecorder() = 0;
 	virtual class IDemoRecorder *DemoRecorder(int Recorder) = 0;
 	virtual void AutoScreenshot_Start() = 0;
 	virtual void AutoStatScreenshot_Start() = 0;
@@ -174,7 +186,7 @@ class IClient : public IInterface
 
 	// gfx
 	virtual void SwitchWindowScreen(int Index) = 0;
-	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless) = 0;
 	virtual void ToggleWindowVSync() = 0;
 	virtual void Notify(const char *pTitle, const char *pMessage) = 0;
 	virtual void OnWindowResize() = 0;
@@ -200,9 +212,12 @@ class IClient : public IInterface
 	virtual bool RconAuthed() const = 0;
 	virtual bool UseTempRconCommands() const = 0;
 	virtual void Rcon(const char *pLine) = 0;
+	virtual bool ReceivingRconCommands() const = 0;
+	virtual float GotRconCommandsPercentage() const = 0;
 
 	// server info
 	virtual void GetServerInfo(class CServerInfo *pServerInfo) const = 0;
+	virtual bool ServerCapAnyPlayerFlag() const = 0;
 
 	virtual int GetPredictionTime() = 0;
 
@@ -216,34 +231,41 @@ class IClient : public IInterface
 	};
 
 	// TODO: Refactor: should redo this a bit i think, too many virtual calls
-	virtual int SnapNumItems(int SnapID) const = 0;
-	virtual const void *SnapFindItem(int SnapID, int Type, int ID) const = 0;
-	virtual void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const = 0;
-	virtual int SnapItemSize(int SnapID, int Index) const = 0;
+	virtual int SnapNumItems(int SnapId) const = 0;
+	virtual const void *SnapFindItem(int SnapId, int Type, int Id) const = 0;
+	virtual CSnapItem SnapGetItem(int SnapId, int Index) const = 0;
 
 	virtual void SnapSetStaticsize(int ItemType, int Size) = 0;
+	virtual void SnapSetStaticsize7(int ItemType, int Size) = 0;
 
 	virtual int SendMsg(int Conn, CMsgPacker *pMsg, int Flags) = 0;
 	virtual int SendMsgActive(CMsgPacker *pMsg, int Flags) = 0;
 
 	template<class T>
-	int SendPackMsgActive(T *pMsg, int Flags)
+	int SendPackMsgActive(T *pMsg, int Flags, bool NoTranslate = false)
 	{
-		CMsgPacker Packer(T::ms_MsgID, false);
+		CMsgPacker Packer(T::ms_MsgId, false, NoTranslate);
 		if(pMsg->Pack(&Packer))
 			return -1;
 		return SendMsgActive(&Packer, Flags);
 	}
 
+	template<class T>
+	int SendPackMsg(int Conn, T *pMsg, int Flags, bool NoTranslate = false)
+	{
+		CMsgPacker Packer(T::ms_MsgId, false, NoTranslate);
+		if(pMsg->Pack(&Packer))
+			return -1;
+		return SendMsg(Conn, &Packer, Flags);
+	}
+
 	//
 	virtual const char *PlayerName() const = 0;
-	virtual const char *DummyName() const = 0;
+	virtual const char *DummyName() = 0;
 	virtual const char *ErrorString() const = 0;
 	virtual const char *LatestVersion() const = 0;
 	virtual bool ConnectionProblems() const = 0;
 
-	virtual bool SoundInitFailed() const = 0;
-
 	virtual IGraphics::CTextureHandle GetDebugFont() const = 0; // TODO: remove this function
 
 	//DDRace
@@ -257,6 +279,9 @@ class IClient : public IInterface
 	int Points() const { return m_Points; }
 	int64_t ReconnectTime() const { return m_ReconnectTime; }
 	void SetReconnectTime(int64_t ReconnectTime) { m_ReconnectTime = ReconnectTime; }
+
+	virtual bool IsSixup() const = 0;
+
 	virtual int GetCurrentRaceTime() = 0;
 
 	virtual void RaceRecord_Start(const char *pFilename) = 0;
@@ -280,9 +305,29 @@ class IClient : public IInterface
 	virtual SWarning *GetCurWarning() = 0;
 
 	virtual CChecksumData *ChecksumData() = 0;
-	virtual bool InfoTaskRunning() = 0;
 	virtual int UdpConnectivity(int NetType) = 0;
 
+	/**
+	 * Opens a link in the browser.
+	 *
+	 * @param pLink The link to open in a browser.
+	 *
+	 * @return `true` on success, `false` on failure.
+	 *
+	 * @remark This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+	 */
+	virtual bool ViewLink(const char *pLink) = 0;
+	/**
+	 * Opens a file or directory with the default program.
+	 *
+	 * @param pFilename The file or folder to open with the default program.
+	 *
+	 * @return `true` on success, `false` on failure.
+	 *
+	 * @remark This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+	 */
+	virtual bool ViewFile(const char *pFilename) = 0;
+
 #if defined(CONF_FAMILY_WINDOWS)
 	virtual void ShellRegister() = 0;
 	virtual void ShellUnregister() = 0;
@@ -295,7 +340,7 @@ class IClient : public IInterface
 		MESSAGE_BOX_TYPE_INFO,
 	};
 	virtual void ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type = MESSAGE_BOX_TYPE_ERROR) = 0;
-	virtual void GetGPUInfoString(char (&aGPUInfo)[256]) = 0;
+	virtual void GetGpuInfoString(char (&aGpuInfo)[256]) = 0;
 };
 
 class IGameClient : public IInterface
@@ -316,7 +361,7 @@ class IGameClient : public IInterface
 	virtual void OnUpdate() = 0;
 	virtual void OnStateChange(int NewState, int OldState) = 0;
 	virtual void OnConnected() = 0;
-	virtual void OnMessage(int MsgID, CUnpacker *pUnpacker, int Conn, bool Dummy) = 0;
+	virtual void OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dummy) = 0;
 	virtual void OnPredict() = 0;
 	virtual void OnActivateEditor() = 0;
 	virtual void OnWindowResize() = 0;
@@ -329,19 +374,28 @@ class IGameClient : public IInterface
 	virtual const char *GetItemName(int Type) const = 0;
 	virtual const char *Version() const = 0;
 	virtual const char *NetVersion() const = 0;
+	virtual const char *NetVersion7() const = 0;
 	virtual int DDNetVersion() const = 0;
 	virtual const char *DDNetVersionStr() const = 0;
 
 	virtual void OnDummyDisconnect() = 0;
 	virtual void DummyResetInput() = 0;
 	virtual void Echo(const char *pString) = 0;
+
 	virtual bool CanDisplayWarning() const = 0;
-	virtual bool IsDisplayingWarning() const = 0;
+	virtual void RenderShutdownMessage() = 0;
 
 	virtual CNetObjHandler *GetNetObjHandler() = 0;
+	virtual protocol7::CNetObjHandler *GetNetObjHandler7() = 0;
+
+	virtual int ClientVersion7() const = 0;
+
+	virtual void ApplySkin7InfoFromSnapObj(const protocol7::CNetObj_De_ClientInfo *pObj, int ClientId) = 0;
+	virtual int OnDemoRecSnap7(class CSnapshot *pFrom, class CSnapshot *pTo, int Conn) = 0;
+	virtual int TranslateSnap(class CSnapshot *pSnapDstSix, class CSnapshot *pSnapSrcSeven, int Conn, bool Dummy) = 0;
 };
 
-void SnapshotRemoveExtraProjectileInfo(unsigned char *pData);
+void SnapshotRemoveExtraProjectileInfo(class CSnapshot *pSnap);
 
 extern IGameClient *CreateGameClient();
 #endif
diff --git a/src/engine/client/backend/backend_base.cpp b/src/engine/client/backend/backend_base.cpp
index 168598064f..37d3b31784 100644
--- a/src/engine/client/backend/backend_base.cpp
+++ b/src/engine/client/backend/backend_base.cpp
@@ -1,13 +1,7 @@
 #include "backend_base.h"
 #include <base/system.h>
-#include <engine/gfx/image_manipulation.h>
 
-void *CCommandProcessorFragment_GLBase::Resize(const unsigned char *pData, int Width, int Height, int NewWidth, int NewHeight, int BPP)
-{
-	return ResizeImage((const uint8_t *)pData, Width, Height, NewWidth, NewHeight, BPP);
-}
-
-bool CCommandProcessorFragment_GLBase::Texture2DTo3D(void *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, void *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight)
+bool CCommandProcessorFragment_GLBase::Texture2DTo3D(uint8_t *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, uint8_t *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight)
 {
 	Target3DImageWidth = ImageWidth / SplitCountWidth;
 	Target3DImageHeight = ImageHeight / SplitCountHeight;
@@ -23,10 +17,10 @@ bool CCommandProcessorFragment_GLBase::Texture2DTo3D(void *pImageBuffer, int Ima
 				int DepthIndex = X + Y * SplitCountWidth;
 
 				size_t TargetImageFullWidth = (size_t)Target3DImageWidth * PixelSize;
-				size_t TargetImageFullSize = (size_t)TargetImageFullWidth * Target3DImageHeight;
+				size_t TargetImageFullSize = TargetImageFullWidth * Target3DImageHeight;
 				ptrdiff_t ImageOffset = (ptrdiff_t)(((size_t)Y * FullImageWidth * (size_t)Target3DImageHeight) + ((size_t)Y3D * FullImageWidth) + ((size_t)X * TargetImageFullWidth));
 				ptrdiff_t TargetImageOffset = (ptrdiff_t)(TargetImageFullSize * (size_t)DepthIndex + ((size_t)Y3D * TargetImageFullWidth));
-				mem_copy(((uint8_t *)pTarget3DImageData) + TargetImageOffset, ((uint8_t *)pImageBuffer) + (ptrdiff_t)(ImageOffset), TargetImageFullWidth);
+				mem_copy(pTarget3DImageData + TargetImageOffset, pImageBuffer + ImageOffset, TargetImageFullWidth);
 			}
 		}
 	}
diff --git a/src/engine/client/backend/backend_base.h b/src/engine/client/backend/backend_base.h
index 19b7eba6f2..516fb91df1 100644
--- a/src/engine/client/backend/backend_base.h
+++ b/src/engine/client/backend/backend_base.h
@@ -84,9 +84,7 @@ class CCommandProcessorFragment_GLBase
 	SGfxErrorContainer m_Error;
 	SGfxWarningContainer m_Warning;
 
-	static void *Resize(const unsigned char *pData, int Width, int Height, int NewWidth, int NewHeight, int BPP);
-
-	static bool Texture2DTo3D(void *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, void *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight);
+	static bool Texture2DTo3D(uint8_t *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, uint8_t *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight);
 
 	virtual bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) = 0;
 
@@ -123,7 +121,7 @@ class CCommandProcessorFragment_GLBase
 		char *m_pVersionString;
 		char *m_pRendererString;
 
-		TTWGraphicsGPUList *m_pGPUList;
+		TTwGraphicsGpuList *m_pGpuList;
 	};
 
 	struct SCommand_Init : public CCommandBuffer::SCommand
@@ -141,7 +139,7 @@ class CCommandProcessorFragment_GLBase
 		std::atomic<uint64_t> *m_pStreamMemoryUsage;
 		std::atomic<uint64_t> *m_pStagingMemoryUsage;
 
-		TTWGraphicsGPUList *m_pGPUList;
+		TTwGraphicsGpuList *m_pGpuList;
 
 		TGLBackendReadPresentedImageData *m_pReadPresentedImageDataFunc;
 
diff --git a/src/engine/client/backend/opengl/backend_opengl.cpp b/src/engine/client/backend/opengl/backend_opengl.cpp
index a599a99037..3ca11ff59e 100644
--- a/src/engine/client/backend/opengl/backend_opengl.cpp
+++ b/src/engine/client/backend/opengl/backend_opengl.cpp
@@ -5,6 +5,7 @@
 #include <engine/client/backend_sdl.h>
 
 #include <base/detect.h>
+#include <base/system.h>
 
 #if defined(BACKEND_AS_OPENGL_ES) || !defined(CONF_BACKEND_OPENGL_ES)
 
@@ -42,13 +43,6 @@ void CCommandProcessorFragment_OpenGL::Cmd_Update_Viewport(const CCommandBuffer:
 	glViewport(pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height);
 }
 
-int CCommandProcessorFragment_OpenGL::TexFormatToOpenGLFormat(int TexFormat)
-{
-	if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
-		return GL_RGBA;
-	return GL_RGBA;
-}
-
 size_t CCommandProcessorFragment_OpenGL::GLFormatToPixelSize(int GLFormat)
 {
 	switch(GLFormat)
@@ -194,7 +188,7 @@ static void ParseVersionString(EBackendType BackendType, const char *pStr, int &
 		bool LastWasNumber = false;
 		while(*pStr && TotalNumbersPassed < 3)
 		{
-			if(*pStr >= '0' && *pStr <= '9')
+			if(str_isnum(*pStr))
 			{
 				aCurNumberStr[CurNumberStrLen++] = (char)*pStr;
 				LastWasNumber = true;
@@ -313,8 +307,9 @@ bool CCommandProcessorFragment_OpenGL::InitOpenGL(const SCommand_Init *pCommand)
 {
 	m_IsOpenGLES = pCommand->m_RequestedBackend == BACKEND_TYPE_OPENGL_ES;
 
-	TGLBackendReadPresentedImageData &ReadPresentedImgDataFunc = *pCommand->m_pReadPresentedImageDataFunc;
-	ReadPresentedImgDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) { return GetPresentedImageData(Width, Height, Format, vDstData); };
+	*pCommand->m_pReadPresentedImageDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) {
+		return GetPresentedImageData(Width, Height, Format, vDstData);
+	};
 
 	const char *pVendorString = (const char *)glGetString(GL_VENDOR);
 	dbg_msg("opengl", "Vendor string: %s", pVendorString);
@@ -325,9 +320,9 @@ bool CCommandProcessorFragment_OpenGL::InitOpenGL(const SCommand_Init *pCommand)
 
 	const char *pRendererString = (const char *)glGetString(GL_RENDERER);
 
-	str_copy(pCommand->m_pVendorString, pVendorString, gs_GPUInfoStringSize);
-	str_copy(pCommand->m_pVersionString, pVersionString, gs_GPUInfoStringSize);
-	str_copy(pCommand->m_pRendererString, pRendererString, gs_GPUInfoStringSize);
+	str_copy(pCommand->m_pVendorString, pVendorString, gs_GpuInfoStringSize);
+	str_copy(pCommand->m_pVersionString, pVersionString, gs_GpuInfoStringSize);
+	str_copy(pCommand->m_pRendererString, pRendererString, gs_GpuInfoStringSize);
 
 	// parse version string
 	ParseVersionString(pCommand->m_RequestedBackend, pVersionString, pCommand->m_pCapabilities->m_ContextMajor, pCommand->m_pCapabilities->m_ContextMinor, pCommand->m_pCapabilities->m_ContextPatch);
@@ -617,7 +612,7 @@ bool CCommandProcessorFragment_OpenGL::Cmd_Init(const SCommand_Init *pCommand)
 	return true;
 }
 
-void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData)
+void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, uint8_t *pTexData)
 {
 	glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
 
@@ -630,7 +625,7 @@ void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int
 			int ResizedW = (int)(Width * ResizeW);
 			int ResizedH = (int)(Height * ResizeH);
 
-			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, ResizedW, ResizedH, GLFormatToPixelSize(GLFormat));
+			uint8_t *pTmpData = ResizeImage(pTexData, Width, Height, ResizedW, ResizedH, GLFormatToPixelSize(GLFormat));
 			free(pTexData);
 			pTexData = pTmpData;
 
@@ -652,7 +647,7 @@ void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int
 			Y /= 2;
 		}
 
-		void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
+		uint8_t *pTmpData = ResizeImage(pTexData, OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
 		free(pTexData);
 		pTexData = pTmpData;
 	}
@@ -661,11 +656,6 @@ void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int
 	free(pTexData);
 }
 
-void CCommandProcessorFragment_OpenGL::Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
-{
-	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), pCommand->m_pData);
-}
-
 void CCommandProcessorFragment_OpenGL::DestroyTexture(int Slot)
 {
 	m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) - m_vTextures[Slot].m_MemSize, std::memory_order_relaxed);
@@ -704,7 +694,7 @@ void CCommandProcessorFragment_OpenGL::Cmd_Texture_Destroy(const CCommandBuffer:
 	DestroyTexture(pCommand->m_Slot);
 }
 
-void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData)
+void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, uint8_t *pTexData)
 {
 #ifndef BACKEND_GL_MODERN_API
 
@@ -727,7 +717,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 		int PowerOfTwoHeight = HighestBit(Height);
 		if(Width != PowerOfTwoWidth || Height != PowerOfTwoHeight)
 		{
-			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, PowerOfTwoWidth, PowerOfTwoHeight, GLFormatToPixelSize(GLFormat));
+			uint8_t *pTmpData = ResizeImage(pTexData, Width, Height, PowerOfTwoWidth, PowerOfTwoHeight, GLFormatToPixelSize(GLFormat));
 			free(pTexData);
 			pTexData = pTmpData;
 
@@ -759,7 +749,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 
 		if(NeedsResize)
 		{
-			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
+			uint8_t *pTmpData = ResizeImage(pTexData, OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
 			free(pTexData);
 			pTexData = pTmpData;
 		}
@@ -866,9 +856,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 				glBindSampler(0, 0);
 			}
 
-			uint8_t *p3DImageData = NULL;
-
-			p3DImageData = (uint8_t *)malloc((size_t)Width * Height * PixelSize);
+			uint8_t *p3DImageData = static_cast<uint8_t *>(malloc((size_t)Width * Height * PixelSize));
 			int Image3DWidth, Image3DHeight;
 
 			int ConvertWidth = Width;
@@ -879,7 +867,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 				dbg_msg("gfx", "3D/2D array texture was resized");
 				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
 				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
-				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
+				uint8_t *pNewTexData = ResizeImage(pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
 
 				ConvertWidth = NewWidth;
 				ConvertHeight = NewHeight;
@@ -888,7 +876,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 				pTexData = pNewTexData;
 			}
 
-			if((Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight)))
+			if(Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight))
 			{
 				glTexImage3D(Target, 0, GLStoreFormat, Image3DWidth, Image3DHeight, 256, 0, GLFormat, GL_UNSIGNED_BYTE, p3DImageData);
 			}
@@ -916,7 +904,7 @@ void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int He
 
 void CCommandProcessorFragment_OpenGL::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
 {
-	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), TexFormatToOpenGLFormat(pCommand->m_StoreFormat), pCommand->m_Flags, pCommand->m_pData);
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, GL_RGBA, GL_RGBA, pCommand->m_Flags, pCommand->m_pData);
 }
 
 void CCommandProcessorFragment_OpenGL::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
@@ -983,10 +971,27 @@ void CCommandProcessorFragment_OpenGL::Cmd_Render(const CCommandBuffer::SCommand
 #endif
 }
 
-void CCommandProcessorFragment_OpenGL::Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand)
+void CCommandProcessorFragment_OpenGL::Cmd_ReadPixel(const CCommandBuffer::SCommand_TrySwapAndReadPixel *pCommand)
 {
-	*pCommand->m_pSwapped = false;
+	// get size of viewport
+	GLint aViewport[4] = {0, 0, 0, 0};
+	glGetIntegerv(GL_VIEWPORT, aViewport);
+	const int h = aViewport[3];
 
+	// fetch the pixel
+	uint8_t aPixelData[3];
+	GLint Alignment;
+	glGetIntegerv(GL_PACK_ALIGNMENT, &Alignment);
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+	glReadPixels(pCommand->m_Position.x, h - 1 - pCommand->m_Position.y, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, aPixelData);
+	glPixelStorei(GL_PACK_ALIGNMENT, Alignment);
+
+	// fill in the information
+	*pCommand->m_pColor = ColorRGBA(aPixelData[0] / 255.0f, aPixelData[1] / 255.0f, aPixelData[2] / 255.0f, 1.0f);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand)
+{
 	// fetch image data
 	GLint aViewport[4] = {0, 0, 0, 0};
 	glGetIntegerv(GL_VIEWPORT, aViewport);
@@ -1047,9 +1052,6 @@ ERunCommandReturnTypes CCommandProcessorFragment_OpenGL::RunCommand(const CComma
 	case CCommandBuffer::CMD_TEXTURE_DESTROY:
 		Cmd_Texture_Destroy(static_cast<const CCommandBuffer::SCommand_Texture_Destroy *>(pBaseCommand));
 		break;
-	case CCommandBuffer::CMD_TEXTURE_UPDATE:
-		Cmd_Texture_Update(static_cast<const CCommandBuffer::SCommand_Texture_Update *>(pBaseCommand));
-		break;
 	case CCommandBuffer::CMD_TEXT_TEXTURES_CREATE:
 		Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand));
 		break;
@@ -1068,6 +1070,9 @@ ERunCommandReturnTypes CCommandProcessorFragment_OpenGL::RunCommand(const CComma
 	case CCommandBuffer::CMD_RENDER_TEX3D:
 		Cmd_RenderTex3D(static_cast<const CCommandBuffer::SCommand_RenderTex3D *>(pBaseCommand));
 		break;
+	case CCommandBuffer::CMD_TRY_SWAP_AND_READ_PIXEL:
+		Cmd_ReadPixel(static_cast<const CCommandBuffer::SCommand_TrySwapAndReadPixel *>(pBaseCommand));
+		break;
 	case CCommandBuffer::CMD_TRY_SWAP_AND_SCREENSHOT:
 		Cmd_Screenshot(static_cast<const CCommandBuffer::SCommand_TrySwapAndScreenshot *>(pBaseCommand));
 		break;
@@ -1643,7 +1648,7 @@ bool CCommandProcessorFragment_OpenGL2::Cmd_Init(const SCommand_Init *pCommand)
 				m_pTileProgram->AddShader(&VertexShader);
 				m_pTileProgram->AddShader(&FragmentShader);
 
-				glBindAttribLocation(m_pTileProgram->GetProgramID(), 0, "inVertex");
+				glBindAttribLocation(m_pTileProgram->GetProgramId(), 0, "inVertex");
 
 				m_pTileProgram->LinkProgram();
 
@@ -1670,8 +1675,8 @@ bool CCommandProcessorFragment_OpenGL2::Cmd_Init(const SCommand_Init *pCommand)
 				m_pTileProgramTextured->AddShader(&VertexShader);
 				m_pTileProgramTextured->AddShader(&FragmentShader);
 
-				glBindAttribLocation(m_pTileProgram->GetProgramID(), 0, "inVertex");
-				glBindAttribLocation(m_pTileProgram->GetProgramID(), 1, "inVertexTexCoord");
+				glBindAttribLocation(m_pTileProgram->GetProgramId(), 0, "inVertex");
+				glBindAttribLocation(m_pTileProgram->GetProgramId(), 1, "inVertexTexCoord");
 
 				m_pTileProgramTextured->LinkProgram();
 
@@ -1696,7 +1701,7 @@ bool CCommandProcessorFragment_OpenGL2::Cmd_Init(const SCommand_Init *pCommand)
 				m_pBorderTileProgram->AddShader(&VertexShader);
 				m_pBorderTileProgram->AddShader(&FragmentShader);
 
-				glBindAttribLocation(m_pBorderTileProgram->GetProgramID(), 0, "inVertex");
+				glBindAttribLocation(m_pBorderTileProgram->GetProgramId(), 0, "inVertex");
 
 				m_pBorderTileProgram->LinkProgram();
 
@@ -1725,8 +1730,8 @@ bool CCommandProcessorFragment_OpenGL2::Cmd_Init(const SCommand_Init *pCommand)
 				m_pBorderTileProgramTextured->AddShader(&VertexShader);
 				m_pBorderTileProgramTextured->AddShader(&FragmentShader);
 
-				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramID(), 0, "inVertex");
-				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramID(), 1, "inVertexTexCoord");
+				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramId(), 0, "inVertex");
+				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramId(), 1, "inVertexTexCoord");
 
 				m_pBorderTileProgramTextured->LinkProgram();
 
@@ -1843,17 +1848,17 @@ void CCommandProcessorFragment_OpenGL2::Cmd_CreateBufferObject(const CCommandBuf
 		}
 	}
 
-	GLuint VertBufferID = 0;
+	GLuint VertBufferId = 0;
 
-	glGenBuffers(1, &VertBufferID);
-	glBindBuffer(GL_ARRAY_BUFFER, VertBufferID);
+	glGenBuffers(1, &VertBufferId);
+	glBindBuffer(GL_ARRAY_BUFFER, VertBufferId);
 	glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
-	BufferObject.m_BufferObjectID = VertBufferID;
+	BufferObject.m_BufferObjectId = VertBufferId;
 	BufferObject.m_DataSize = pCommand->m_DataSize;
-	BufferObject.m_pData = malloc(pCommand->m_DataSize);
+	BufferObject.m_pData = static_cast<uint8_t *>(malloc(pCommand->m_DataSize));
 	if(pUploadData)
 		mem_copy(BufferObject.m_pData, pUploadData, pCommand->m_DataSize);
 
@@ -1867,13 +1872,13 @@ void CCommandProcessorFragment_OpenGL2::Cmd_RecreateBufferObject(const CCommandB
 	int Index = pCommand->m_BufferIndex;
 	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
 
-	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectId);
 	glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	BufferObject.m_DataSize = pCommand->m_DataSize;
 	free(BufferObject.m_pData);
-	BufferObject.m_pData = malloc(pCommand->m_DataSize);
+	BufferObject.m_pData = static_cast<uint8_t *>(malloc(pCommand->m_DataSize));
 	if(pUploadData)
 		mem_copy(BufferObject.m_pData, pUploadData, pCommand->m_DataSize);
 
@@ -1887,12 +1892,12 @@ void CCommandProcessorFragment_OpenGL2::Cmd_UpdateBufferObject(const CCommandBuf
 	int Index = pCommand->m_BufferIndex;
 	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
 
-	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectId);
 	glBufferSubData(GL_ARRAY_BUFFER, (GLintptr)(pCommand->m_pOffset), (GLsizeiptr)(pCommand->m_DataSize), pUploadData);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	if(pUploadData)
-		mem_copy(((uint8_t *)BufferObject.m_pData) + (ptrdiff_t)pCommand->m_pOffset, pUploadData, pCommand->m_DataSize);
+		mem_copy(BufferObject.m_pData + (ptrdiff_t)pCommand->m_pOffset, pUploadData, pCommand->m_DataSize);
 
 	if(pCommand->m_DeletePointer)
 		free(pUploadData);
@@ -1906,10 +1911,10 @@ void CCommandProcessorFragment_OpenGL2::Cmd_CopyBufferObject(const CCommandBuffe
 	SBufferObject &ReadBufferObject = m_vBufferObjectIndices[ReadIndex];
 	SBufferObject &WriteBufferObject = m_vBufferObjectIndices[WriteIndex];
 
-	mem_copy(((uint8_t *)WriteBufferObject.m_pData) + (ptrdiff_t)pCommand->m_WriteOffset, ((uint8_t *)ReadBufferObject.m_pData) + (ptrdiff_t)pCommand->m_ReadOffset, pCommand->m_CopySize);
+	mem_copy(WriteBufferObject.m_pData + (ptrdiff_t)pCommand->m_WriteOffset, ReadBufferObject.m_pData + (ptrdiff_t)pCommand->m_ReadOffset, pCommand->m_CopySize);
 
-	glBindBuffer(GL_ARRAY_BUFFER, WriteBufferObject.m_BufferObjectID);
-	glBufferSubData(GL_ARRAY_BUFFER, (GLintptr)(pCommand->m_WriteOffset), (GLsizeiptr)(pCommand->m_CopySize), ((uint8_t *)WriteBufferObject.m_pData) + (ptrdiff_t)pCommand->m_WriteOffset);
+	glBindBuffer(GL_ARRAY_BUFFER, WriteBufferObject.m_BufferObjectId);
+	glBufferSubData(GL_ARRAY_BUFFER, (GLintptr)(pCommand->m_WriteOffset), (GLsizeiptr)(pCommand->m_CopySize), WriteBufferObject.m_pData + (ptrdiff_t)pCommand->m_WriteOffset);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
@@ -1918,7 +1923,7 @@ void CCommandProcessorFragment_OpenGL2::Cmd_DeleteBufferObject(const CCommandBuf
 	int Index = pCommand->m_BufferIndex;
 	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
 
-	glDeleteBuffers(1, &BufferObject.m_BufferObjectID);
+	glDeleteBuffers(1, &BufferObject.m_BufferObjectId);
 
 	free(BufferObject.m_pData);
 	BufferObject.m_pData = NULL;
@@ -1971,13 +1976,13 @@ void CCommandProcessorFragment_OpenGL2::Cmd_DeleteBufferContainer(const CCommand
 
 	if(pCommand->m_DestroyAllBO)
 	{
-		int VertBufferID = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
-		if(VertBufferID != -1)
+		int VertBufferId = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
+		if(VertBufferId != -1)
 		{
-			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferID].m_BufferObjectID);
+			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferId].m_BufferObjectId);
 
-			free(m_vBufferObjectIndices[VertBufferID].m_pData);
-			m_vBufferObjectIndices[VertBufferID].m_pData = NULL;
+			free(m_vBufferObjectIndices[VertBufferId].m_pData);
+			m_vBufferObjectIndices[VertBufferId].m_pData = NULL;
 		}
 	}
 
@@ -2014,7 +2019,7 @@ void CCommandProcessorFragment_OpenGL2::Cmd_RenderBorderTile(const CCommandBuffe
 
 	SBufferObject &BufferObject = m_vBufferObjectIndices[(size_t)BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex];
 
-	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectId);
 
 	glEnableVertexAttribArray(0);
 	glVertexAttribPointer(0, 2, GL_FLOAT, false, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[0].m_pOffset);
@@ -2066,7 +2071,7 @@ void CCommandProcessorFragment_OpenGL2::Cmd_RenderTileLayer(const CCommandBuffer
 
 	SBufferObject &BufferObject = m_vBufferObjectIndices[(size_t)BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex];
 
-	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectId);
 
 	glEnableVertexAttribArray(0);
 	glVertexAttribPointer(0, 2, GL_FLOAT, false, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[0].m_pOffset);
diff --git a/src/engine/client/backend/opengl/backend_opengl.h b/src/engine/client/backend/opengl/backend_opengl.h
index 2d339c0fdb..f0d833cc48 100644
--- a/src/engine/client/backend/opengl/backend_opengl.h
+++ b/src/engine/client/backend/opengl/backend_opengl.h
@@ -82,15 +82,13 @@ class CCommandProcessorFragment_OpenGL : public CCommandProcessorFragment_GLBase
 
 	bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) override;
 
-	static int TexFormatToOpenGLFormat(int TexFormat);
 	static size_t GLFormatToPixelSize(int GLFormat);
 
-	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData);
-	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData);
+	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, uint8_t *pTexData);
+	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, uint8_t *pTexData);
 
 	virtual bool Cmd_Init(const SCommand_Init *pCommand);
 	virtual void Cmd_Shutdown(const SCommand_Shutdown *pCommand) {}
-	virtual void Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand);
 	virtual void Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand);
 	virtual void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand);
 	virtual void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand);
@@ -99,6 +97,7 @@ class CCommandProcessorFragment_OpenGL : public CCommandProcessorFragment_GLBase
 	virtual void Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand);
 	virtual void Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand);
 	virtual void Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderTex3D"); }
+	virtual void Cmd_ReadPixel(const CCommandBuffer::SCommand_TrySwapAndReadPixel *pCommand);
 	virtual void Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand);
 
 	virtual void Cmd_Update_Viewport(const CCommandBuffer::SCommand_Update_Viewport *pCommand);
@@ -143,14 +142,14 @@ class CCommandProcessorFragment_OpenGL2 : public CCommandProcessorFragment_OpenG
 
 	struct SBufferObject
 	{
-		SBufferObject(TWGLuint BufferObjectID) :
-			m_BufferObjectID(BufferObjectID)
+		SBufferObject(TWGLuint BufferObjectId) :
+			m_BufferObjectId(BufferObjectId)
 		{
 			m_pData = NULL;
 			m_DataSize = 0;
 		}
-		TWGLuint m_BufferObjectID;
-		void *m_pData;
+		TWGLuint m_BufferObjectId;
+		uint8_t *m_pData;
 		size_t m_DataSize;
 	};
 
diff --git a/src/engine/client/backend/opengl/backend_opengl3.cpp b/src/engine/client/backend/opengl/backend_opengl3.cpp
index 315dd887d7..95dbf3d366 100644
--- a/src/engine/client/backend/opengl/backend_opengl3.cpp
+++ b/src/engine/client/backend/opengl/backend_opengl3.cpp
@@ -30,19 +30,12 @@ static constexpr GLenum BUFFER_INIT_VERTEX_TARGET = GL_COPY_WRITE_BUFFER;
 #endif
 
 // ------------ CCommandProcessorFragment_OpenGL3_3
-int CCommandProcessorFragment_OpenGL3_3::TexFormatToNewOpenGLFormat(int TexFormat)
-{
-	if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
-		return GL_RGBA;
-	return GL_RGBA;
-}
-
 void CCommandProcessorFragment_OpenGL3_3::UseProgram(CGLSLTWProgram *pProgram)
 {
-	if(m_LastProgramID != pProgram->GetProgramID())
+	if(m_LastProgramId != pProgram->GetProgramId())
 	{
 		pProgram->UseProgram();
-		m_LastProgramID = pProgram->GetProgramID();
+		m_LastProgramId = pProgram->GetProgramId();
 	}
 }
 
@@ -114,7 +107,7 @@ bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand
 	m_pPrimitiveExProgramRotationless = new CGLSLPrimitiveExProgram;
 	m_pPrimitiveExProgramTexturedRotationless = new CGLSLPrimitiveExProgram;
 	m_pSpriteProgramMultiple = new CGLSLSpriteMultipleProgram;
-	m_LastProgramID = 0;
+	m_LastProgramId = 0;
 
 	CGLSLCompiler ShaderCompiler(g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, m_IsOpenGLES, m_OpenGLTextureLodBIAS / 1000.0f);
 
@@ -366,15 +359,15 @@ bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand
 
 	m_LastStreamBuffer = 0;
 
-	glGenBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferID);
-	glGenVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexID);
-	glGenBuffers(1, &m_PrimitiveDrawBufferIDTex3D);
-	glGenVertexArrays(1, &m_PrimitiveDrawVertexIDTex3D);
+	glGenBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferId);
+	glGenVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexId);
+	glGenBuffers(1, &m_PrimitiveDrawBufferIdTex3D);
+	glGenVertexArrays(1, &m_PrimitiveDrawVertexIdTex3D);
 
 	for(int i = 0; i < MAX_STREAM_BUFFER_COUNT; ++i)
 	{
-		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferID[i]);
-		glBindVertexArray(m_aPrimitiveDrawVertexID[i]);
+		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferId[i]);
+		glBindVertexArray(m_aPrimitiveDrawVertexId[i]);
 		glEnableVertexAttribArray(0);
 		glEnableVertexAttribArray(1);
 		glEnableVertexAttribArray(2);
@@ -386,8 +379,8 @@ bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand
 		m_aLastIndexBufferBound[i] = 0;
 	}
 
-	glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIDTex3D);
-	glBindVertexArray(m_PrimitiveDrawVertexIDTex3D);
+	glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIdTex3D);
+	glBindVertexArray(m_PrimitiveDrawVertexIdTex3D);
 	glEnableVertexAttribArray(0);
 	glEnableVertexAttribArray(1);
 	glEnableVertexAttribArray(2);
@@ -400,8 +393,8 @@ bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand
 	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_MaxTexSize);
 
 	glBindVertexArray(0);
-	glGenBuffers(1, &m_QuadDrawIndexBufferID);
-	glBindBuffer(BUFFER_INIT_INDEX_TARGET, m_QuadDrawIndexBufferID);
+	glGenBuffers(1, &m_QuadDrawIndexBufferId);
+	glBindBuffer(BUFFER_INIT_INDEX_TARGET, m_QuadDrawIndexBufferId);
 
 	unsigned int aIndices[CCommandBuffer::MAX_VERTICES / 4 * 6];
 	int Primq = 0;
@@ -469,11 +462,11 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Shutdown(const SCommand_Shutdown *
 	delete m_pSpriteProgramMultiple;
 
 	glBindVertexArray(0);
-	glDeleteBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferID);
-	glDeleteBuffers(1, &m_QuadDrawIndexBufferID);
-	glDeleteVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexID);
-	glDeleteBuffers(1, &m_PrimitiveDrawBufferIDTex3D);
-	glDeleteVertexArrays(1, &m_PrimitiveDrawVertexIDTex3D);
+	glDeleteBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferId);
+	glDeleteBuffers(1, &m_QuadDrawIndexBufferId);
+	glDeleteVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexId);
+	glDeleteBuffers(1, &m_PrimitiveDrawBufferIdTex3D);
+	glDeleteVertexArrays(1, &m_PrimitiveDrawVertexIdTex3D);
 
 	for(int i = 0; i < (int)m_vTextures.size(); ++i)
 	{
@@ -488,7 +481,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Shutdown(const SCommand_Shutdown *
 	m_vBufferContainers.clear();
 }
 
-void CCommandProcessorFragment_OpenGL3_3::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData)
+void CCommandProcessorFragment_OpenGL3_3::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, uint8_t *pTexData)
 {
 	glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
 
@@ -503,7 +496,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureUpdate(int Slot, int X, int Y,
 			Y /= 2;
 		}
 
-		void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
+		uint8_t *pTmpData = ResizeImage(pTexData, Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
 		free(pTexData);
 		pTexData = pTmpData;
 	}
@@ -512,11 +505,6 @@ void CCommandProcessorFragment_OpenGL3_3::TextureUpdate(int Slot, int X, int Y,
 	free(pTexData);
 }
 
-void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
-{
-	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), pCommand->m_pData);
-}
-
 void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand)
 {
 	int Slot = 0;
@@ -525,7 +513,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Destroy(const CCommandBuff
 	DestroyTexture(pCommand->m_Slot);
 }
 
-void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData)
+void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, uint8_t *pTexData)
 {
 	while(Slot >= (int)m_vTextures.size())
 		m_vTextures.resize(m_vTextures.size() * 2);
@@ -543,7 +531,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int
 				++RescaleCount;
 			} while(Width > m_MaxTexSize || Height > m_MaxTexSize);
 
-			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
+			uint8_t *pTmpData = ResizeImage(pTexData, Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
 			free(pTexData);
 			pTexData = pTmpData;
 		}
@@ -618,9 +606,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int
 				glSamplerParameterf(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
 #endif
 
-			uint8_t *p3DImageData = NULL;
-
-			p3DImageData = (uint8_t *)malloc((size_t)Width * Height * PixelSize);
+			uint8_t *p3DImageData = static_cast<uint8_t *>(malloc((size_t)Width * Height * PixelSize));
 			int Image3DWidth, Image3DHeight;
 
 			int ConvertWidth = Width;
@@ -631,7 +617,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int
 				dbg_msg("gfx", "3D/2D array texture was resized");
 				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
 				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
-				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
+				uint8_t *pNewTexData = ResizeImage(pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
 
 				ConvertWidth = NewWidth;
 				ConvertHeight = NewHeight;
@@ -640,7 +626,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int
 				pTexData = pNewTexData;
 			}
 
-			if((Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight)))
+			if(Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight))
 			{
 				glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GLStoreFormat, Image3DWidth, Image3DHeight, 256, 0, GLFormat, GL_UNSIGNED_BYTE, p3DImageData);
 				glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
@@ -668,7 +654,7 @@ void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int
 
 void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
 {
-	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), TexFormatToOpenGLFormat(pCommand->m_StoreFormat), pCommand->m_Flags, pCommand->m_pData);
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, GL_RGBA, GL_RGBA, pCommand->m_Flags, pCommand->m_pData);
 }
 
 void CCommandProcessorFragment_OpenGL3_3::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
@@ -727,9 +713,9 @@ void CCommandProcessorFragment_OpenGL3_3::UploadStreamBufferData(unsigned int Pr
 	};
 
 	if(AsTex3D)
-		glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIDTex3D);
+		glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIdTex3D);
 	else
-		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferID[m_LastStreamBuffer]);
+		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferId[m_LastStreamBuffer]);
 
 	glBufferData(GL_ARRAY_BUFFER, VertSize * Count, pVertices, GL_STREAM_DRAW);
 }
@@ -744,7 +730,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Render(const CCommandBuffer::SComm
 
 	UploadStreamBufferData(pCommand->m_PrimType, pCommand->m_pVertices, sizeof(CCommandBuffer::SVertex), pCommand->m_PrimCount);
 
-	glBindVertexArray(m_aPrimitiveDrawVertexID[m_LastStreamBuffer]);
+	glBindVertexArray(m_aPrimitiveDrawVertexId[m_LastStreamBuffer]);
 
 	switch(pCommand->m_PrimType)
 	{
@@ -756,10 +742,10 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Render(const CCommandBuffer::SComm
 		glDrawArrays(GL_TRIANGLES, 0, pCommand->m_PrimCount * 3);
 		break;
 	case CCommandBuffer::PRIMTYPE_QUADS:
-		if(m_aLastIndexBufferBound[m_LastStreamBuffer] != m_QuadDrawIndexBufferID)
+		if(m_aLastIndexBufferBound[m_LastStreamBuffer] != m_QuadDrawIndexBufferId)
 		{
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-			m_aLastIndexBufferBound[m_LastStreamBuffer] = m_QuadDrawIndexBufferID;
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+			m_aLastIndexBufferBound[m_LastStreamBuffer] = m_QuadDrawIndexBufferId;
 		}
 		glDrawElements(GL_TRIANGLES, pCommand->m_PrimCount * 6, GL_UNSIGNED_INT, 0);
 		break;
@@ -780,7 +766,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTex3D(const CCommandBuffer::
 
 	UploadStreamBufferData(pCommand->m_PrimType, pCommand->m_pVertices, sizeof(CCommandBuffer::SVertexTex3DStream), pCommand->m_PrimCount, true);
 
-	glBindVertexArray(m_PrimitiveDrawVertexIDTex3D);
+	glBindVertexArray(m_PrimitiveDrawVertexIdTex3D);
 
 	switch(pCommand->m_PrimType)
 	{
@@ -789,7 +775,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTex3D(const CCommandBuffer::
 		glDrawArrays(GL_LINES, 0, pCommand->m_PrimCount * 2);
 		break;
 	case CCommandBuffer::PRIMTYPE_QUADS:
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
 		glDrawElements(GL_TRIANGLES, pCommand->m_PrimCount * 6, GL_UNSIGNED_INT, 0);
 		break;
 	default:
@@ -800,16 +786,16 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTex3D(const CCommandBuffer::
 void CCommandProcessorFragment_OpenGL3_3::DestroyBufferContainer(int Index, bool DeleteBOs)
 {
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID != 0)
-		glDeleteVertexArrays(1, &BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_VertArrayId != 0)
+		glDeleteVertexArrays(1, &BufferContainer.m_VertArrayId);
 
 	// all buffer objects can deleted automatically, so the program doesn't need to deal with them (e.g. causing crashes because of driver bugs)
 	if(DeleteBOs)
 	{
-		int VertBufferID = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
-		if(VertBufferID != -1)
+		int VertBufferId = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
+		if(VertBufferId != -1)
 		{
-			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferID]);
+			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferId]);
 		}
 	}
 
@@ -835,10 +821,10 @@ void CCommandProcessorFragment_OpenGL3_3::AppendIndices(unsigned int NewIndicesC
 		Primq += 4;
 	}
 
-	glBindBuffer(GL_COPY_READ_BUFFER, m_QuadDrawIndexBufferID);
-	GLuint NewIndexBufferID;
-	glGenBuffers(1, &NewIndexBufferID);
-	glBindBuffer(BUFFER_INIT_INDEX_TARGET, NewIndexBufferID);
+	glBindBuffer(GL_COPY_READ_BUFFER, m_QuadDrawIndexBufferId);
+	GLuint NewIndexBufferId;
+	glGenBuffers(1, &NewIndexBufferId);
+	glBindBuffer(BUFFER_INIT_INDEX_TARGET, NewIndexBufferId);
 	GLsizeiptr size = sizeof(unsigned int);
 	glBufferData(BUFFER_INIT_INDEX_TARGET, (GLsizeiptr)NewIndicesCount * size, NULL, GL_STATIC_DRAW);
 	glCopyBufferSubData(GL_COPY_READ_BUFFER, BUFFER_INIT_INDEX_TARGET, 0, 0, (GLsizeiptr)m_CurrentIndicesInBuffer * size);
@@ -846,8 +832,8 @@ void CCommandProcessorFragment_OpenGL3_3::AppendIndices(unsigned int NewIndicesC
 	glBindBuffer(BUFFER_INIT_INDEX_TARGET, 0);
 	glBindBuffer(GL_COPY_READ_BUFFER, 0);
 
-	glDeleteBuffers(1, &m_QuadDrawIndexBufferID);
-	m_QuadDrawIndexBufferID = NewIndexBufferID;
+	glDeleteBuffers(1, &m_QuadDrawIndexBufferId);
+	m_QuadDrawIndexBufferId = NewIndexBufferId;
 
 	for(unsigned int &i : m_aLastIndexBufferBound)
 		i = 0;
@@ -873,13 +859,13 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_CreateBufferObject(const CCommandB
 		}
 	}
 
-	GLuint VertBufferID = 0;
+	GLuint VertBufferId = 0;
 
-	glGenBuffers(1, &VertBufferID);
-	glBindBuffer(BUFFER_INIT_VERTEX_TARGET, VertBufferID);
+	glGenBuffers(1, &VertBufferId);
+	glBindBuffer(BUFFER_INIT_VERTEX_TARGET, VertBufferId);
 	glBufferData(BUFFER_INIT_VERTEX_TARGET, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
 
-	m_vBufferObjectIndices[Index] = VertBufferID;
+	m_vBufferObjectIndices[Index] = VertBufferId;
 
 	if(pCommand->m_DeletePointer)
 		free(pUploadData);
@@ -942,8 +928,8 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_CreateBufferContainer(const CComma
 	}
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	glGenVertexArrays(1, &BufferContainer.m_VertArrayID);
-	glBindVertexArray(BufferContainer.m_VertArrayID);
+	glGenVertexArrays(1, &BufferContainer.m_VertArrayId);
+	glBindVertexArray(BufferContainer.m_VertArrayId);
 
 	BufferContainer.m_LastIndexBufferBound = 0;
 
@@ -971,7 +957,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_UpdateBufferContainer(const CComma
 {
 	SBufferContainer &BufferContainer = m_vBufferContainers[pCommand->m_BufferContainerIndex];
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
+	glBindVertexArray(BufferContainer.m_VertArrayId);
 
 	// disable all old attributes
 	for(size_t i = 0; i < BufferContainer.m_ContainerInfo.m_vAttributes.size(); ++i)
@@ -1017,7 +1003,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderBorderTile(const CCommandBuf
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
 	CGLSLTileProgram *pProgram = NULL;
@@ -1033,11 +1019,11 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderBorderTile(const CCommandBuf
 	pProgram->SetUniformVec2(pProgram->m_LocOffset, 1, (float *)&pCommand->m_Offset);
 	pProgram->SetUniformVec2(pProgram->m_LocScale, 1, (float *)&pCommand->m_Scale);
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 	glDrawElements(GL_TRIANGLES, pCommand->m_DrawNum * 6, GL_UNSIGNED_INT, pCommand->m_pIndicesOffset);
 }
@@ -1050,7 +1036,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTileLayer(const CCommandBuff
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
 	if(pCommand->m_IndicesDrawNum == 0)
@@ -1071,11 +1057,11 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTileLayer(const CCommandBuff
 	SetState(pCommand->m_State, pProgram, true);
 	pProgram->SetUniformVec4(pProgram->m_LocColor, 1, (float *)&pCommand->m_Color);
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 	for(int i = 0; i < pCommand->m_IndicesDrawNum; ++i)
 	{
@@ -1091,7 +1077,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadLayer(const CCommandBuff
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
 	if(pCommand->m_QuadNum == 0)
@@ -1110,11 +1096,11 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadLayer(const CCommandBuff
 	UseProgram(pProgram);
 	SetState(pCommand->m_State, pProgram);
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 
 	int QuadsLeft = pCommand->m_QuadNum;
@@ -1209,14 +1195,14 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderText(const CCommandBuffer::S
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 
 	RenderText(pCommand->m_State, pCommand->m_DrawNum, pCommand->m_TextTextureIndex, pCommand->m_TextOutlineTextureIndex, pCommand->m_TextureSize, pCommand->m_TextColor, pCommand->m_TextOutlineColor);
@@ -1235,14 +1221,14 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainer(const CCommand
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 
 	CGLSLTWProgram *pProgram = m_pPrimitiveProgram;
@@ -1267,14 +1253,14 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainerEx(const CComma
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 
 	CGLSLPrimitiveExProgram *pProgram = m_pPrimitiveExProgramRotationless;
@@ -1328,14 +1314,14 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainerAsSpriteMultipl
 		return;
 
 	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
-	if(BufferContainer.m_VertArrayID == 0)
+	if(BufferContainer.m_VertArrayId == 0)
 		return;
 
-	glBindVertexArray(BufferContainer.m_VertArrayID);
-	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	glBindVertexArray(BufferContainer.m_VertArrayId);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferId)
 	{
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
-		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferId);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferId;
 	}
 
 	UseProgram(m_pSpriteProgramMultiple);
diff --git a/src/engine/client/backend/opengl/backend_opengl3.h b/src/engine/client/backend/opengl/backend_opengl3.h
index 5b3b883605..7b68d813d0 100644
--- a/src/engine/client/backend/opengl/backend_opengl3.h
+++ b/src/engine/client/backend/opengl/backend_opengl3.h
@@ -37,18 +37,18 @@ class CCommandProcessorFragment_OpenGL3_3 : public CCommandProcessorFragment_Ope
 	CGLSLPrimitiveExProgram *m_pPrimitiveExProgramTexturedRotationless;
 	CGLSLSpriteMultipleProgram *m_pSpriteProgramMultiple;
 
-	TWGLuint m_LastProgramID;
+	TWGLuint m_LastProgramId;
 
-	TWGLuint m_aPrimitiveDrawVertexID[MAX_STREAM_BUFFER_COUNT];
-	TWGLuint m_PrimitiveDrawVertexIDTex3D;
-	TWGLuint m_aPrimitiveDrawBufferID[MAX_STREAM_BUFFER_COUNT];
-	TWGLuint m_PrimitiveDrawBufferIDTex3D;
+	TWGLuint m_aPrimitiveDrawVertexId[MAX_STREAM_BUFFER_COUNT];
+	TWGLuint m_PrimitiveDrawVertexIdTex3D;
+	TWGLuint m_aPrimitiveDrawBufferId[MAX_STREAM_BUFFER_COUNT];
+	TWGLuint m_PrimitiveDrawBufferIdTex3D;
 
 	TWGLuint m_aLastIndexBufferBound[MAX_STREAM_BUFFER_COUNT];
 
 	int m_LastStreamBuffer;
 
-	TWGLuint m_QuadDrawIndexBufferID;
+	TWGLuint m_QuadDrawIndexBufferId;
 	unsigned int m_CurrentIndicesInBuffer;
 
 	void DestroyBufferContainer(int Index, bool DeleteBOs = true);
@@ -58,8 +58,8 @@ class CCommandProcessorFragment_OpenGL3_3 : public CCommandProcessorFragment_Ope
 	struct SBufferContainer
 	{
 		SBufferContainer() :
-			m_VertArrayID(0), m_LastIndexBufferBound(0) {}
-		TWGLuint m_VertArrayID;
+			m_VertArrayId(0), m_LastIndexBufferBound(0) {}
+		TWGLuint m_VertArrayId;
 		TWGLuint m_LastIndexBufferBound;
 		SBufferContainerInfo m_ContainerInfo;
 	};
@@ -71,19 +71,17 @@ class CCommandProcessorFragment_OpenGL3_3 : public CCommandProcessorFragment_Ope
 
 	void InitPrimExProgram(CGLSLPrimitiveExProgram *pProgram, class CGLSLCompiler *pCompiler, class IStorage *pStorage, bool Textured, bool Rotationless);
 
-	static int TexFormatToNewOpenGLFormat(int TexFormat);
 	bool IsNewApi() override { return true; }
 
 	void UseProgram(CGLSLTWProgram *pProgram);
 	void UploadStreamBufferData(unsigned int PrimitiveType, const void *pVertices, size_t VertSize, unsigned int PrimitiveCount, bool AsTex3D = false);
 	void RenderText(const CCommandBuffer::SState &State, int DrawNum, int TextTextureIndex, int TextOutlineTextureIndex, int TextureSize, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor);
 
-	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData);
-	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData);
+	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, uint8_t *pTexData);
+	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, uint8_t *pTexData);
 
 	bool Cmd_Init(const SCommand_Init *pCommand) override;
 	void Cmd_Shutdown(const SCommand_Shutdown *pCommand) override;
-	void Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand) override;
 	void Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand) override;
 	void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand) override;
 	void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand) override;
diff --git a/src/engine/client/backend/opengl/opengl_sl.cpp b/src/engine/client/backend/opengl/opengl_sl.cpp
index 046e4168d7..a8b16c6af5 100644
--- a/src/engine/client/backend/opengl/opengl_sl.cpp
+++ b/src/engine/client/backend/opengl/opengl_sl.cpp
@@ -23,10 +23,10 @@ bool CGLSL::LoadShader(CGLSLCompiler *pCompiler, IStorage *pStorage, const char
 {
 	if(m_IsLoaded)
 		return true;
-	IOHANDLE f = pStorage->OpenFile(pFile, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
 
+	CLineReader LineReader;
 	std::vector<std::string> vLines;
-	if(f)
+	if(LineReader.OpenFile(pStorage->OpenFile(pFile, IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
 		EBackendType BackendType = pCompiler->m_IsOpenGLES ? BACKEND_TYPE_OPENGL_ES : BACKEND_TYPE_OPENGL;
 		bool IsNewOpenGL = (BackendType == BACKEND_TYPE_OPENGL ? (pCompiler->m_OpenGLVersionMajor >= 4 || (pCompiler->m_OpenGLVersionMajor == 3 && pCompiler->m_OpenGLVersionMinor == 3)) : pCompiler->m_OpenGLVersionMajor >= 3);
@@ -81,17 +81,13 @@ bool CGLSL::LoadShader(CGLSLCompiler *pCompiler, IStorage *pStorage, const char
 			vLines.emplace_back("#extension GL_EXT_texture_array : enable\r\n");
 		}
 
-		CLineReader LineReader;
-		LineReader.Init(f);
-		char *pReadLine = NULL;
-		while((pReadLine = LineReader.Get()))
+		while(const char *pReadLine = LineReader.Get())
 		{
 			std::string Line;
 			pCompiler->ParseLine(Line, pReadLine, Type == GL_FRAGMENT_SHADER ? GLSL_SHADER_COMPILER_TYPE_FRAGMENT : GLSL_SHADER_COMPILER_TYPE_VERTEX);
 			Line.append("\r\n");
 			vLines.push_back(Line);
 		}
-		io_close(f);
 
 		const char **ShaderCode = new const char *[vLines.size()];
 
@@ -126,7 +122,7 @@ bool CGLSL::LoadShader(CGLSLCompiler *pCompiler, IStorage *pStorage, const char
 		m_Type = Type;
 		m_IsLoaded = true;
 
-		m_ShaderID = shader;
+		m_ShaderId = shader;
 
 		return true;
 	}
@@ -139,7 +135,7 @@ void CGLSL::DeleteShader()
 	if(!IsLoaded())
 		return;
 	m_IsLoaded = false;
-	glDeleteShader(m_ShaderID);
+	glDeleteShader(m_ShaderId);
 }
 
 bool CGLSL::IsLoaded() const
@@ -147,9 +143,9 @@ bool CGLSL::IsLoaded() const
 	return m_IsLoaded;
 }
 
-TWGLuint CGLSL::GetShaderID() const
+TWGLuint CGLSL::GetShaderId() const
 {
-	return m_ShaderID;
+	return m_ShaderId;
 }
 
 CGLSL::CGLSL()
diff --git a/src/engine/client/backend/opengl/opengl_sl.h b/src/engine/client/backend/opengl/opengl_sl.h
index 3c2a640023..79024af8ee 100644
--- a/src/engine/client/backend/opengl/opengl_sl.h
+++ b/src/engine/client/backend/opengl/opengl_sl.h
@@ -21,13 +21,13 @@ class CGLSL
 	void DeleteShader();
 
 	bool IsLoaded() const;
-	TWGLuint GetShaderID() const;
+	TWGLuint GetShaderId() const;
 
 	CGLSL();
 	virtual ~CGLSL();
 
 private:
-	TWGLuint m_ShaderID;
+	TWGLuint m_ShaderId;
 	int m_Type;
 	bool m_IsLoaded;
 };
diff --git a/src/engine/client/backend/opengl/opengl_sl_program.cpp b/src/engine/client/backend/opengl/opengl_sl_program.cpp
index 2ba94325b1..0ad2e2ed37 100644
--- a/src/engine/client/backend/opengl/opengl_sl_program.cpp
+++ b/src/engine/client/backend/opengl/opengl_sl_program.cpp
@@ -14,7 +14,7 @@
 
 void CGLSLProgram::CreateProgram()
 {
-	m_ProgramID = glCreateProgram();
+	m_ProgramId = glCreateProgram();
 }
 
 void CGLSLProgram::DeleteProgram()
@@ -22,14 +22,14 @@ void CGLSLProgram::DeleteProgram()
 	if(!m_IsLinked)
 		return;
 	m_IsLinked = false;
-	glDeleteProgram(m_ProgramID);
+	glDeleteProgram(m_ProgramId);
 }
 
 bool CGLSLProgram::AddShader(CGLSL *pShader) const
 {
 	if(pShader->IsLoaded())
 	{
-		glAttachShader(m_ProgramID, pShader->GetShaderID());
+		glAttachShader(m_ProgramId, pShader->GetShaderId());
 		return true;
 	}
 	return false;
@@ -39,27 +39,27 @@ void CGLSLProgram::DetachShader(CGLSL *pShader) const
 {
 	if(pShader->IsLoaded())
 	{
-		DetachShaderByID(pShader->GetShaderID());
+		DetachShaderById(pShader->GetShaderId());
 	}
 }
 
-void CGLSLProgram::DetachShaderByID(TWGLuint ShaderID) const
+void CGLSLProgram::DetachShaderById(TWGLuint ShaderId) const
 {
-	glDetachShader(m_ProgramID, ShaderID);
+	glDetachShader(m_ProgramId, ShaderId);
 }
 
 void CGLSLProgram::LinkProgram()
 {
-	glLinkProgram(m_ProgramID);
+	glLinkProgram(m_ProgramId);
 	int LinkStatus;
-	glGetProgramiv(m_ProgramID, GL_LINK_STATUS, &LinkStatus);
+	glGetProgramiv(m_ProgramId, GL_LINK_STATUS, &LinkStatus);
 	m_IsLinked = LinkStatus == GL_TRUE;
 	if(!m_IsLinked)
 	{
 		char aInfoLog[1024];
 		char aFinalMessage[1536];
-		int iLogLength;
-		glGetProgramInfoLog(m_ProgramID, 1024, &iLogLength, aInfoLog);
+		int LogLength;
+		glGetProgramInfoLog(m_ProgramId, 1024, &LogLength, aInfoLog);
 		str_format(aFinalMessage, sizeof(aFinalMessage), "Error! Shader program wasn't linked! The linker returned:\n\n%s", aInfoLog);
 		dbg_msg("glslprogram", "%s", aFinalMessage);
 	}
@@ -74,13 +74,13 @@ void CGLSLProgram::DetachAllShaders() const
 	GLsizei ReturnedCount = 0;
 	while(true)
 	{
-		glGetAttachedShaders(m_ProgramID, 100, &ReturnedCount, aShaders);
+		glGetAttachedShaders(m_ProgramId, 100, &ReturnedCount, aShaders);
 
 		if(ReturnedCount > 0)
 		{
 			for(GLsizei i = 0; i < ReturnedCount; ++i)
 			{
-				DetachShaderByID(aShaders[i]);
+				DetachShaderById(aShaders[i]);
 			}
 		}
 
@@ -121,18 +121,18 @@ void CGLSLProgram::SetUniform(int Loc, const bool Value)
 
 int CGLSLProgram::GetUniformLoc(const char *pName) const
 {
-	return glGetUniformLocation(m_ProgramID, pName);
+	return glGetUniformLocation(m_ProgramId, pName);
 }
 
 void CGLSLProgram::UseProgram() const
 {
 	if(m_IsLinked)
-		glUseProgram(m_ProgramID);
+		glUseProgram(m_ProgramId);
 }
 
-TWGLuint CGLSLProgram::GetProgramID() const
+TWGLuint CGLSLProgram::GetProgramId() const
 {
-	return m_ProgramID;
+	return m_ProgramId;
 }
 
 CGLSLProgram::CGLSLProgram()
diff --git a/src/engine/client/backend/opengl/opengl_sl_program.h b/src/engine/client/backend/opengl/opengl_sl_program.h
index f278731c86..404c7a6f08 100644
--- a/src/engine/client/backend/opengl/opengl_sl_program.h
+++ b/src/engine/client/backend/opengl/opengl_sl_program.h
@@ -26,10 +26,10 @@ class CGLSLProgram
 
 	void LinkProgram();
 	void UseProgram() const;
-	TWGLuint GetProgramID() const;
+	TWGLuint GetProgramId() const;
 
 	void DetachShader(CGLSL *pShader) const;
-	void DetachShaderByID(TWGLuint ShaderID) const;
+	void DetachShaderById(TWGLuint ShaderId) const;
 	void DetachAllShaders() const;
 
 	//Support various types
@@ -47,7 +47,7 @@ class CGLSLProgram
 	virtual ~CGLSLProgram();
 
 protected:
-	TWGLuint m_ProgramID;
+	TWGLuint m_ProgramId;
 	bool m_IsLinked;
 };
 
diff --git a/src/engine/client/backend/vulkan/backend_vulkan.cpp b/src/engine/client/backend/vulkan/backend_vulkan.cpp
index 84a8b48d86..f49025d86e 100644
--- a/src/engine/client/backend/vulkan/backend_vulkan.cpp
+++ b/src/engine/client/backend/vulkan/backend_vulkan.cpp
@@ -15,26 +15,23 @@
 #include <base/math.h>
 #include <base/system.h>
 
-#include <array>
-#include <map>
-#include <set>
-#include <vector>
-
 #include <algorithm>
-
+#include <array>
+#include <condition_variable>
 #include <cstddef>
+#include <cstdlib>
 #include <functional>
 #include <limits>
+#include <map>
 #include <memory>
-#include <string>
-
-#include <condition_variable>
 #include <mutex>
+#include <optional>
+#include <set>
+#include <string>
 #include <thread>
-
-#include <cstdlib>
-
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include <SDL_video.h>
 #include <SDL_vulkan.h>
@@ -116,10 +113,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	* STRUCT DEFINITIONS
 	************************/
 
-	static constexpr size_t s_StagingBufferCacheID = 0;
-	static constexpr size_t s_StagingBufferImageCacheID = 1;
-	static constexpr size_t s_VertexBufferCacheID = 2;
-	static constexpr size_t s_ImageBufferCacheID = 3;
+	static constexpr size_t s_StagingBufferCacheId = 0;
+	static constexpr size_t s_StagingBufferImageCacheId = 1;
+	static constexpr size_t s_VertexBufferCacheId = 2;
+	static constexpr size_t s_ImageBufferCacheId = 3;
 
 	struct SDeviceMemoryBlock
 	{
@@ -164,6 +161,20 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			size_t m_OffsetToAlign;
 			SMemoryHeapElement *m_pElementInHeap;
 			[[nodiscard]] bool operator>(const SMemoryHeapQueueElement &Other) const { return m_AllocationSize > Other.m_AllocationSize; }
+			struct SMemoryHeapQueueElementFind
+			{
+				// respects alignment requirements
+				constexpr bool operator()(const SMemoryHeapQueueElement &Val, const std::pair<size_t, size_t> &Other) const
+				{
+					auto AllocSize = Other.first;
+					auto AllocAlignment = Other.second;
+					size_t ExtraSizeAlign = Val.m_OffsetInHeap % AllocAlignment;
+					if(ExtraSizeAlign != 0)
+						ExtraSizeAlign = AllocAlignment - ExtraSizeAlign;
+					size_t RealAllocSize = AllocSize + ExtraSizeAlign;
+					return Val.m_AllocationSize < RealAllocSize;
+				}
+			};
 		};
 
 		typedef std::multiset<SMemoryHeapQueueElement, std::greater<>> TMemoryHeapQueue;
@@ -206,24 +217,32 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 			else
 			{
-				// calculate the alignment
-				size_t ExtraSizeAlign = m_Elements.begin()->m_OffsetInHeap % AllocAlignment;
-				if(ExtraSizeAlign != 0)
-					ExtraSizeAlign = AllocAlignment - ExtraSizeAlign;
-				size_t RealAllocSize = AllocSize + ExtraSizeAlign;
-
 				// check if there is enough space in this instance
-				if(m_Elements.begin()->m_AllocationSize < RealAllocSize)
+				if(SMemoryHeapQueueElement::SMemoryHeapQueueElementFind{}(*m_Elements.begin(), std::make_pair(AllocSize, AllocAlignment)))
 				{
 					return false;
 				}
 				else
 				{
-					auto TopEl = *m_Elements.begin();
+					// see SMemoryHeapQueueElement::operator>
+					SMemoryHeapQueueElement FindAllocSize;
+					FindAllocSize.m_AllocationSize = AllocSize;
+					// find upper bound for a allocation size
+					auto Upper = m_Elements.upper_bound(FindAllocSize);
+					// then find the first entry that respects alignment, this is a linear search!
+					auto FoundEl = std::lower_bound(std::make_reverse_iterator(Upper), m_Elements.rend(), std::make_pair(AllocSize, AllocAlignment), SMemoryHeapQueueElement::SMemoryHeapQueueElementFind{});
+
+					auto TopEl = *FoundEl;
 					m_Elements.erase(TopEl.m_pElementInHeap->m_InQueue);
 
 					TopEl.m_pElementInHeap->m_InUse = true;
 
+					// calculate the real alloc size + alignment offset
+					size_t ExtraSizeAlign = TopEl.m_OffsetInHeap % AllocAlignment;
+					if(ExtraSizeAlign != 0)
+						ExtraSizeAlign = AllocAlignment - ExtraSizeAlign;
+					size_t RealAllocSize = AllocSize + ExtraSizeAlign;
+
 					// the heap element gets children
 					TopEl.m_pElementInHeap->m_pLeft = std::make_unique<SMemoryHeapElement>();
 					TopEl.m_pElementInHeap->m_pLeft->m_AllocationSize = RealAllocSize;
@@ -306,7 +325,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 	};
 
-	template<size_t ID>
+	template<size_t Id>
 	struct SMemoryBlock
 	{
 		SMemoryHeap::SMemoryHeapQueueElement m_HeapData;
@@ -323,13 +342,13 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		SMemoryHeap *m_pHeap;
 	};
 
-	template<size_t ID>
-	struct SMemoryImageBlock : public SMemoryBlock<ID>
+	template<size_t Id>
+	struct SMemoryImageBlock : public SMemoryBlock<Id>
 	{
 		uint32_t m_ImageMemoryBits;
 	};
 
-	template<size_t ID>
+	template<size_t Id>
 	struct SMemoryBlockCache
 	{
 		struct SMemoryCacheType
@@ -345,7 +364,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			std::vector<SMemoryCacheHeap *> m_vpMemoryHeaps;
 		};
 		SMemoryCacheType m_MemoryCaches;
-		std::vector<std::vector<SMemoryBlock<ID>>> m_vvFrameDelayedCachedBufferCleanup;
+		std::vector<std::vector<SMemoryBlock<Id>>> m_vvFrameDelayedCachedBufferCleanup;
 
 		bool m_CanShrink = false;
 
@@ -392,7 +411,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			m_vvFrameDelayedCachedBufferCleanup[ImgIndex].clear();
 		}
 
-		void FreeMemBlock(SMemoryBlock<ID> &Block, size_t ImgIndex)
+		void FreeMemBlock(SMemoryBlock<Id> &Block, size_t ImgIndex)
 		{
 			m_vvFrameDelayedCachedBufferCleanup[ImgIndex].push_back(Block);
 		}
@@ -436,12 +455,12 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	struct CTexture
 	{
 		VkImage m_Img = VK_NULL_HANDLE;
-		SMemoryImageBlock<s_ImageBufferCacheID> m_ImgMem;
+		SMemoryImageBlock<s_ImageBufferCacheId> m_ImgMem;
 		VkImageView m_ImgView = VK_NULL_HANDLE;
 		VkSampler m_aSamplers[2] = {VK_NULL_HANDLE, VK_NULL_HANDLE};
 
 		VkImage m_Img3D = VK_NULL_HANDLE;
-		SMemoryImageBlock<s_ImageBufferCacheID> m_Img3DMem;
+		SMemoryImageBlock<s_ImageBufferCacheId> m_Img3DMem;
 		VkImageView m_Img3DView = VK_NULL_HANDLE;
 		VkSampler m_Sampler3D = VK_NULL_HANDLE;
 
@@ -458,7 +477,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	struct SBufferObject
 	{
-		SMemoryBlock<s_VertexBufferCacheID> m_Mem;
+		SMemoryBlock<s_VertexBufferCacheId> m_Mem;
 	};
 
 	struct SBufferObjectFrame
@@ -483,9 +502,9 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		size_t m_OffsetInBuffer = 0;
 		size_t m_Size;
 		size_t m_UsedSize;
-		void *m_pMappedBufferData;
+		uint8_t *m_pMappedBufferData;
 
-		SFrameBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, void *pMappedBufferData) :
+		SFrameBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, uint8_t *pMappedBufferData) :
 			m_Buffer(Buffer), m_BufferMem(BufferMem), m_OffsetInBuffer(OffsetInBuffer), m_Size(Size), m_UsedSize(UsedSize), m_pMappedBufferData(pMappedBufferData)
 		{
 		}
@@ -495,7 +514,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	{
 		std::array<SDeviceDescriptorSet, 2> m_aUniformSets;
 
-		SFrameUniformBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, void *pMappedBufferData) :
+		SFrameUniformBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, uint8_t *pMappedBufferData) :
 			SFrameBuffers(Buffer, BufferMem, OffsetInBuffer, Size, UsedSize, pMappedBufferData) {}
 	};
 
@@ -846,7 +865,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	struct SSwapChainMultiSampleImage
 	{
 		VkImage m_Image = VK_NULL_HANDLE;
-		SMemoryImageBlock<s_ImageBufferCacheID> m_ImgMem;
+		SMemoryImageBlock<s_ImageBufferCacheId> m_ImgMem;
 		VkImageView m_ImgView = VK_NULL_HANDLE;
 	};
 
@@ -856,10 +875,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	std::unordered_map<std::string, SShaderFileCache> m_ShaderFiles;
 
-	SMemoryBlockCache<s_StagingBufferCacheID> m_StagingBufferCache;
-	SMemoryBlockCache<s_StagingBufferImageCacheID> m_StagingBufferCacheImage;
-	SMemoryBlockCache<s_VertexBufferCacheID> m_VertexBufferCache;
-	std::map<uint32_t, SMemoryBlockCache<s_ImageBufferCacheID>> m_ImageBufferCaches;
+	SMemoryBlockCache<s_StagingBufferCacheId> m_StagingBufferCache;
+	SMemoryBlockCache<s_StagingBufferImageCacheId> m_StagingBufferCacheImage;
+	SMemoryBlockCache<s_VertexBufferCacheId> m_VertexBufferCache;
+	std::map<uint32_t, SMemoryBlockCache<s_ImageBufferCacheId>> m_ImageBufferCaches;
 
 	std::vector<VkMappedMemoryRange> m_vNonFlushedStagingBufferRange;
 
@@ -870,7 +889,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	std::atomic<uint64_t> *m_pStreamMemoryUsage;
 	std::atomic<uint64_t> *m_pStagingMemoryUsage;
 
-	TTWGraphicsGPUList *m_pGPUList;
+	TTwGraphicsGpuList *m_pGpuList;
 
 	int m_GlobalTextureLodBIAS;
 	uint32_t m_MultiSamplingCount = 1;
@@ -904,6 +923,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	uint32_t m_MinUniformAlign;
 
+	std::vector<uint8_t> m_vReadPixelHelper;
 	std::vector<uint8_t> m_vScreenshotHelper;
 
 	SDeviceMemoryBlock m_GetPresentedImgDataHelperMem;
@@ -966,8 +986,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	std::vector<VkSemaphore> m_vWaitSemaphores;
 	std::vector<VkSemaphore> m_vSigSemaphores;
 
-	std::vector<VkSemaphore> m_vMemorySemaphores;
-
 	std::vector<VkFence> m_vFrameFences;
 	std::vector<VkFence> m_vImagesFences;
 
@@ -1033,7 +1051,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	std::vector<SStreamMemory<SFrameBuffers>> m_vStreamedVertexBuffers;
 	std::vector<SStreamMemory<SFrameUniformBuffers>> m_vStreamedUniformBuffers;
 
-	uint32_t m_CurFrames = 0;
+	uint32_t m_CurFrameSyncObject = 0;
 	uint32_t m_CurImageIndex = 0;
 
 	uint32_t m_CanvasWidth;
@@ -1245,7 +1263,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	{
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_CREATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Create(static_cast<const CCommandBuffer::SCommand_Texture_Create *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_DESTROY)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Destroy(static_cast<const CCommandBuffer::SCommand_Texture_Destroy *>(pBaseCommand)); }};
-		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_UPDATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Update(static_cast<const CCommandBuffer::SCommand_Texture_Update *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURES_CREATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURES_DESTROY)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTextures_Destroy(static_cast<const CCommandBuffer::SCommand_TextTextures_Destroy *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURE_UPDATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTexture_Update(static_cast<const CCommandBuffer::SCommand_TextTexture_Update *>(pBaseCommand)); }};
@@ -1278,6 +1295,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_VSYNC)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_VSync(static_cast<const CCommandBuffer::SCommand_VSync *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_MULTISAMPLING)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_MultiSampling(static_cast<const CCommandBuffer::SCommand_MultiSampling *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TRY_SWAP_AND_READ_PIXEL)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_ReadPixel(static_cast<const CCommandBuffer::SCommand_TrySwapAndReadPixel *>(pBaseCommand)); }};
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TRY_SWAP_AND_SCREENSHOT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Screenshot(static_cast<const CCommandBuffer::SCommand_TrySwapAndScreenshot *>(pBaseCommand)); }};
 
 		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_UPDATE_VIEWPORT)] = {false, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_Update_Viewport_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_Update_Viewport *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Update_Viewport(static_cast<const CCommandBuffer::SCommand_Update_Viewport *>(pBaseCommand)); }};
@@ -1378,15 +1396,29 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 	}
 
-	[[nodiscard]] bool GetPresentedImageDataImpl(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData, bool FlipImgData, bool ResetAlpha)
+	[[nodiscard]] bool GetPresentedImageDataImpl(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData, bool ResetAlpha, std::optional<ivec2> PixelOffset)
 	{
 		bool IsB8G8R8A8 = m_VKSurfFormat.format == VK_FORMAT_B8G8R8A8_UNORM;
 		bool UsesRGBALikeFormat = m_VKSurfFormat.format == VK_FORMAT_R8G8B8A8_UNORM || IsB8G8R8A8;
 		if(UsesRGBALikeFormat && m_LastPresentedSwapChainImageIndex != std::numeric_limits<decltype(m_LastPresentedSwapChainImageIndex)>::max())
 		{
 			auto Viewport = m_VKSwapImgAndViewportExtent.GetPresentedImageViewport();
-			Width = Viewport.width;
-			Height = Viewport.height;
+			VkOffset3D SrcOffset;
+			if(PixelOffset.has_value())
+			{
+				SrcOffset.x = PixelOffset.value().x;
+				SrcOffset.y = PixelOffset.value().y;
+				Width = 1;
+				Height = 1;
+			}
+			else
+			{
+				SrcOffset.x = 0;
+				SrcOffset.y = 0;
+				Width = Viewport.width;
+				Height = Viewport.height;
+			}
+			SrcOffset.z = 0;
 			Format = CImageInfo::FORMAT_RGBA;
 
 			const size_t ImageTotalSize = (size_t)Width * Height * CImageInfo::PixelSize(Format);
@@ -1400,17 +1432,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				return false;
 			VkCommandBuffer &CommandBuffer = *pCommandBuffer;
 
-			VkBufferImageCopy Region{};
-			Region.bufferOffset = 0;
-			Region.bufferRowLength = 0;
-			Region.bufferImageHeight = 0;
-			Region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-			Region.imageSubresource.mipLevel = 0;
-			Region.imageSubresource.baseArrayLayer = 0;
-			Region.imageSubresource.layerCount = 1;
-			Region.imageOffset = {0, 0, 0};
-			Region.imageExtent = {Viewport.width, Viewport.height, 1};
-
 			auto &SwapImg = m_vSwapChainImages[m_LastPresentedSwapChainImageIndex];
 
 			if(!ImageBarrier(m_GetPresentedImgDataHelperImage, 0, 1, 0, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL))
@@ -1425,10 +1446,12 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				BlitSize.x = Width;
 				BlitSize.y = Height;
 				BlitSize.z = 1;
+
 				VkImageBlit ImageBlitRegion{};
 				ImageBlitRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 				ImageBlitRegion.srcSubresource.layerCount = 1;
-				ImageBlitRegion.srcOffsets[1] = BlitSize;
+				ImageBlitRegion.srcOffsets[0] = SrcOffset;
+				ImageBlitRegion.srcOffsets[1] = {SrcOffset.x + BlitSize.x, SrcOffset.y + BlitSize.y, SrcOffset.z + BlitSize.z};
 				ImageBlitRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 				ImageBlitRegion.dstSubresource.layerCount = 1;
 				ImageBlitRegion.dstOffsets[1] = BlitSize;
@@ -1447,6 +1470,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				VkImageCopy ImageCopyRegion{};
 				ImageCopyRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 				ImageCopyRegion.srcSubresource.layerCount = 1;
+				ImageCopyRegion.srcOffset = SrcOffset;
 				ImageCopyRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 				ImageCopyRegion.dstSubresource.layerCount = 1;
 				ImageCopyRegion.extent.width = Width;
@@ -1469,7 +1493,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 			VkSubmitInfo SubmitInfo{};
 			SubmitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-
 			SubmitInfo.commandBufferCount = 1;
 			SubmitInfo.pCommandBuffers = &CommandBuffer;
 
@@ -1485,8 +1508,9 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			vkInvalidateMappedMemoryRanges(m_VKDevice, 1, &MemRange);
 
 			size_t RealFullImageSize = maximum(ImageTotalSize, (size_t)(Height * m_GetPresentedImgDataHelperMappedLayoutPitch));
-			if(vDstData.size() < RealFullImageSize + (Width * 4))
-				vDstData.resize(RealFullImageSize + (Width * 4)); // extra space for flipping
+			size_t ExtraRowSize = Width * 4;
+			if(vDstData.size() < RealFullImageSize + ExtraRowSize)
+				vDstData.resize(RealFullImageSize + ExtraRowSize);
 
 			mem_copy(vDstData.data(), pResImageData, RealFullImageSize);
 
@@ -1497,7 +1521,8 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				{
 					size_t OffsetImagePacked = (Y * Width * 4);
 					size_t OffsetImageUnpacked = (Y * m_GetPresentedImgDataHelperMappedLayoutPitch);
-					mem_copy(vDstData.data() + OffsetImagePacked, vDstData.data() + OffsetImageUnpacked, Width * 4);
+					mem_copy(vDstData.data() + RealFullImageSize, vDstData.data() + OffsetImageUnpacked, Width * 4);
+					mem_copy(vDstData.data() + OffsetImagePacked, vDstData.data() + RealFullImageSize, Width * 4);
 				}
 			}
 
@@ -1518,17 +1543,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				}
 			}
 
-			if(FlipImgData)
-			{
-				uint8_t *pTempRow = vDstData.data() + Width * Height * 4;
-				for(uint32_t Y = 0; Y < Height / 2; ++Y)
-				{
-					mem_copy(pTempRow, vDstData.data() + Y * Width * 4, Width * 4);
-					mem_copy(vDstData.data() + Y * Width * 4, vDstData.data() + ((Height - Y) - 1) * Width * 4, Width * 4);
-					mem_copy(vDstData.data() + ((Height - Y) - 1) * Width * 4, pTempRow, Width * 4);
-				}
-			}
-
 			return true;
 		}
 		else
@@ -1547,7 +1561,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	[[nodiscard]] bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) override
 	{
-		return GetPresentedImageDataImpl(Width, Height, Format, vDstData, false, false);
+		return GetPresentedImageDataImpl(Width, Height, Format, vDstData, false, {});
 	}
 
 	/************************
@@ -1585,10 +1599,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return CreateBuffer(RequiredSize, MemUsage, BufferUsage, BufferProperties, Buffer, BufferMemory);
 	}
 
-	template<size_t ID,
+	template<size_t Id,
 		int64_t MemoryBlockSize, size_t BlockCount,
 		bool RequiresMapping>
-	[[nodiscard]] bool GetBufferBlockImpl(SMemoryBlock<ID> &RetBlock, SMemoryBlockCache<ID> &MemoryCache, VkBufferUsageFlags BufferUsage, VkMemoryPropertyFlags BufferProperties, const void *pBufferData, VkDeviceSize RequiredSize, VkDeviceSize TargetAlignment)
+	[[nodiscard]] bool GetBufferBlockImpl(SMemoryBlock<Id> &RetBlock, SMemoryBlockCache<Id> &MemoryCache, VkBufferUsageFlags BufferUsage, VkMemoryPropertyFlags BufferProperties, const void *pBufferData, VkDeviceSize RequiredSize, VkDeviceSize TargetAlignment)
 	{
 		bool Res = true;
 
@@ -1596,7 +1610,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			bool FoundAllocation = false;
 			SMemoryHeap::SMemoryHeapQueueElement AllocatedMem;
 			SDeviceMemoryBlock TmpBufferMemory;
-			typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
+			typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
 			auto &Heaps = MemoryCache.m_MemoryCaches.m_vpMemoryHeaps;
 			for(size_t i = 0; i < Heaps.size(); ++i)
 			{
@@ -1611,7 +1625,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 			if(!FoundAllocation)
 			{
-				typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap();
+				typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap();
 
 				VkBuffer TmpBuffer;
 				if(!GetBufferImpl(MemoryBlockSize * BlockCount, RequiresMapping ? MEMORY_BLOCK_USAGE_STAGING : MEMORY_BLOCK_USAGE_BUFFER, TmpBuffer, TmpBufferMemory, BufferUsage, BufferProperties))
@@ -1697,18 +1711,18 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return Res;
 	}
 
-	[[nodiscard]] bool GetStagingBuffer(SMemoryBlock<s_StagingBufferCacheID> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
+	[[nodiscard]] bool GetStagingBuffer(SMemoryBlock<s_StagingBufferCacheId> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
 	{
-		return GetBufferBlockImpl<s_StagingBufferCacheID, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCache, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16));
+		return GetBufferBlockImpl<s_StagingBufferCacheId, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCache, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16));
 	}
 
-	[[nodiscard]] bool GetStagingBufferImage(SMemoryBlock<s_StagingBufferImageCacheID> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
+	[[nodiscard]] bool GetStagingBufferImage(SMemoryBlock<s_StagingBufferImageCacheId> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
 	{
-		return GetBufferBlockImpl<s_StagingBufferImageCacheID, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCacheImage, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_OptimalImageCopyMemAlignment, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16)));
+		return GetBufferBlockImpl<s_StagingBufferImageCacheId, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCacheImage, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_OptimalImageCopyMemAlignment, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16)));
 	}
 
-	template<size_t ID>
-	void PrepareStagingMemRange(SMemoryBlock<ID> &Block)
+	template<size_t Id>
+	void PrepareStagingMemRange(SMemoryBlock<Id> &Block)
 	{
 		VkMappedMemoryRange UploadRange{};
 		UploadRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
@@ -1727,7 +1741,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		m_vNonFlushedStagingBufferRange.push_back(UploadRange);
 	}
 
-	void UploadAndFreeStagingMemBlock(SMemoryBlock<s_StagingBufferCacheID> &Block)
+	void UploadAndFreeStagingMemBlock(SMemoryBlock<s_StagingBufferCacheId> &Block)
 	{
 		PrepareStagingMemRange(Block);
 		if(!Block.m_IsCached)
@@ -1740,7 +1754,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 	}
 
-	void UploadAndFreeStagingImageMemBlock(SMemoryBlock<s_StagingBufferImageCacheID> &Block)
+	void UploadAndFreeStagingImageMemBlock(SMemoryBlock<s_StagingBufferImageCacheId> &Block)
 	{
 		PrepareStagingMemRange(Block);
 		if(!Block.m_IsCached)
@@ -1753,12 +1767,12 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 	}
 
-	[[nodiscard]] bool GetVertexBuffer(SMemoryBlock<s_VertexBufferCacheID> &ResBlock, VkDeviceSize RequiredSize)
+	[[nodiscard]] bool GetVertexBuffer(SMemoryBlock<s_VertexBufferCacheId> &ResBlock, VkDeviceSize RequiredSize)
 	{
-		return GetBufferBlockImpl<s_VertexBufferCacheID, 8 * 1024 * 1024, 3, false>(ResBlock, m_VertexBufferCache, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, nullptr, RequiredSize, 16);
+		return GetBufferBlockImpl<s_VertexBufferCacheId, 8 * 1024 * 1024, 3, false>(ResBlock, m_VertexBufferCache, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, nullptr, RequiredSize, 16);
 	}
 
-	void FreeVertexMemBlock(SMemoryBlock<s_VertexBufferCacheID> &Block)
+	void FreeVertexMemBlock(SMemoryBlock<s_VertexBufferCacheId> &Block)
 	{
 		if(!Block.m_IsCached)
 		{
@@ -1810,15 +1824,15 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
-	template<size_t ID,
+	template<size_t Id,
 		int64_t MemoryBlockSize, size_t BlockCount>
-	[[nodiscard]] bool GetImageMemoryBlockImpl(SMemoryImageBlock<ID> &RetBlock, SMemoryBlockCache<ID> &MemoryCache, VkMemoryPropertyFlags BufferProperties, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
+	[[nodiscard]] bool GetImageMemoryBlockImpl(SMemoryImageBlock<Id> &RetBlock, SMemoryBlockCache<Id> &MemoryCache, VkMemoryPropertyFlags BufferProperties, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
 	{
 		auto &&CreateCacheBlock = [&]() -> bool {
 			bool FoundAllocation = false;
 			SMemoryHeap::SMemoryHeapQueueElement AllocatedMem;
 			SDeviceMemoryBlock TmpBufferMemory;
-			typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
+			typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
 			for(size_t i = 0; i < MemoryCache.m_MemoryCaches.m_vpMemoryHeaps.size(); ++i)
 			{
 				auto *pHeap = MemoryCache.m_MemoryCaches.m_vpMemoryHeaps[i];
@@ -1832,7 +1846,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 			if(!FoundAllocation)
 			{
-				typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap();
+				typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<Id>::SMemoryCacheType::SMemoryCacheHeap();
 
 				if(!GetImageMemoryImpl(MemoryBlockSize * BlockCount, RequiredMemoryTypeBits, TmpBufferMemory, BufferProperties))
 				{
@@ -1892,7 +1906,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
-	[[nodiscard]] bool GetImageMemory(SMemoryImageBlock<s_ImageBufferCacheID> &RetBlock, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
+	[[nodiscard]] bool GetImageMemory(SMemoryImageBlock<s_ImageBufferCacheId> &RetBlock, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
 	{
 		auto it = m_ImageBufferCaches.find(RequiredMemoryTypeBits);
 		if(it == m_ImageBufferCaches.end())
@@ -1901,10 +1915,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 			it->second.Init(m_SwapChainImageCount);
 		}
-		return GetImageMemoryBlockImpl<s_ImageBufferCacheID, s_1024x1024ImgSize, 2>(RetBlock, it->second, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, RequiredSize, RequiredAlignment, RequiredMemoryTypeBits);
+		return GetImageMemoryBlockImpl<s_ImageBufferCacheId, s_1024x1024ImgSize, 2>(RetBlock, it->second, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, RequiredSize, RequiredAlignment, RequiredMemoryTypeBits);
 	}
 
-	void FreeImageMemBlock(SMemoryImageBlock<s_ImageBufferCacheID> &Block)
+	void FreeImageMemBlock(SMemoryImageBlock<s_ImageBufferCacheId> &Block)
 	{
 		if(!Block.m_IsCached)
 		{
@@ -1971,7 +1985,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 			if(IsVerbose())
 			{
-				VerboseDeallocatedMemory(BufferMem.m_Size, (size_t)ImageIndex, BufferMem.m_UsageType);
+				VerboseDeallocatedMemory(BufferMem.m_Size, ImageIndex, BufferMem.m_UsageType);
 			}
 
 			BufferMem.m_Mem = VK_NULL_HANDLE;
@@ -2068,7 +2082,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			m_pStagingMemoryUsage->store(m_pStagingMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
 			if(IsVerbose())
 			{
-				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (staging buffer)", (size_t)FreeedMemory);
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (staging buffer)", FreeedMemory);
 			}
 		}
 		FreeedMemory = 0;
@@ -2078,7 +2092,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			m_pBufferMemoryUsage->store(m_pBufferMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
 			if(IsVerbose())
 			{
-				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (buffer)", (size_t)FreeedMemory);
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (buffer)", FreeedMemory);
 			}
 		}
 		FreeedMemory = 0;
@@ -2089,7 +2103,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
 			if(IsVerbose())
 			{
-				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (texture)", (size_t)FreeedMemory);
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (texture)", FreeedMemory);
 			}
 		}
 	}
@@ -2260,7 +2274,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			return false;
 		}
 
-		VkSemaphore WaitSemaphore = m_vWaitSemaphores[m_CurFrames];
+		VkSemaphore WaitSemaphore = m_vWaitSemaphores[m_CurFrameSyncObject];
 
 		VkSubmitInfo SubmitInfo{};
 		SubmitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
@@ -2289,13 +2303,13 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		SubmitInfo.pWaitSemaphores = aWaitSemaphores.data();
 		SubmitInfo.pWaitDstStageMask = aWaitStages.data();
 
-		std::array<VkSemaphore, 1> aSignalSemaphores = {m_vSigSemaphores[m_CurFrames]};
+		std::array<VkSemaphore, 1> aSignalSemaphores = {m_vSigSemaphores[m_CurFrameSyncObject]};
 		SubmitInfo.signalSemaphoreCount = aSignalSemaphores.size();
 		SubmitInfo.pSignalSemaphores = aSignalSemaphores.data();
 
-		vkResetFences(m_VKDevice, 1, &m_vFrameFences[m_CurFrames]);
+		vkResetFences(m_VKDevice, 1, &m_vFrameFences[m_CurFrameSyncObject]);
 
-		VkResult QueueSubmitRes = vkQueueSubmit(m_VKGraphicsQueue, 1, &SubmitInfo, m_vFrameFences[m_CurFrames]);
+		VkResult QueueSubmitRes = vkQueueSubmit(m_VKGraphicsQueue, 1, &SubmitInfo, m_vFrameFences[m_CurFrameSyncObject]);
 		if(QueueSubmitRes != VK_SUCCESS)
 		{
 			const char *pCritErrorMsg = CheckVulkanCriticalError(QueueSubmitRes);
@@ -2306,7 +2320,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 		}
 
-		std::swap(m_vWaitSemaphores[m_CurFrames], m_vSigSemaphores[m_CurFrames]);
+		std::swap(m_vWaitSemaphores[m_CurFrameSyncObject], m_vSigSemaphores[m_CurFrameSyncObject]);
 
 		VkPresentInfoKHR PresentInfo{};
 		PresentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
@@ -2333,7 +2347,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 		}
 
-		m_CurFrames = (m_CurFrames + 1) % m_SwapChainImageCount;
+		m_CurFrameSyncObject = (m_CurFrameSyncObject + 1) % m_vWaitSemaphores.size();
 		return true;
 	}
 
@@ -2349,7 +2363,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			RecreateSwapChain();
 		}
 
-		auto AcqResult = vkAcquireNextImageKHR(m_VKDevice, m_VKSwapChain, std::numeric_limits<uint64_t>::max(), m_vSigSemaphores[m_CurFrames], VK_NULL_HANDLE, &m_CurImageIndex);
+		auto AcqResult = vkAcquireNextImageKHR(m_VKDevice, m_VKSwapChain, std::numeric_limits<uint64_t>::max(), m_vSigSemaphores[m_CurFrameSyncObject], VK_NULL_HANDLE, &m_CurImageIndex);
 		if(AcqResult != VK_SUCCESS)
 		{
 			if(AcqResult == VK_ERROR_OUT_OF_DATE_KHR || m_RecreateSwapChain)
@@ -2380,13 +2394,13 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				}
 			}
 		}
-		std::swap(m_vWaitSemaphores[m_CurFrames], m_vSigSemaphores[m_CurFrames]);
+		std::swap(m_vWaitSemaphores[m_CurFrameSyncObject], m_vSigSemaphores[m_CurFrameSyncObject]);
 
 		if(m_vImagesFences[m_CurImageIndex] != VK_NULL_HANDLE)
 		{
 			vkWaitForFences(m_VKDevice, 1, &m_vImagesFences[m_CurImageIndex], VK_TRUE, std::numeric_limits<uint64_t>::max());
 		}
-		m_vImagesFences[m_CurImageIndex] = m_vFrameFences[m_CurFrames];
+		m_vImagesFences[m_CurImageIndex] = m_vFrameFences[m_CurFrameSyncObject];
 
 		// next frame
 		m_CurFrame++;
@@ -2513,10 +2527,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return 4;
 	}
 
-	[[nodiscard]] bool UpdateTexture(size_t TextureSlot, VkFormat Format, void *&pData, int64_t XOff, int64_t YOff, size_t Width, size_t Height)
+	[[nodiscard]] bool UpdateTexture(size_t TextureSlot, VkFormat Format, uint8_t *&pData, int64_t XOff, int64_t YOff, size_t Width, size_t Height)
 	{
 		const size_t ImageSize = Width * Height * VulkanFormatToPixelSize(Format);
-		SMemoryBlock<s_StagingBufferImageCacheID> StagingBuffer;
+		SMemoryBlock<s_StagingBufferImageCacheId> StagingBuffer;
 		if(!GetStagingBufferImage(StagingBuffer, pData, ImageSize))
 			return false;
 
@@ -2533,7 +2547,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				YOff /= 2;
 			}
 
-			void *pTmpData = Resize((const uint8_t *)pData, Width, Height, Width, Height, VulkanFormatToPixelSize(Format));
+			uint8_t *pTmpData = ResizeImage(pData, Width, Height, Width, Height, VulkanFormatToPixelSize(Format));
 			free(pData);
 			pData = pTmpData;
 		}
@@ -2566,7 +2580,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		VkFormat Format,
 		VkFormat StoreFormat,
 		int Flags,
-		void *&pData)
+		uint8_t *&pData)
 	{
 		size_t ImageIndex = (size_t)Slot;
 		const size_t PixelSize = VulkanFormatToPixelSize(Format);
@@ -2587,7 +2601,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				++RescaleCount;
 			} while((size_t)Width > m_MaxTextureSize || (size_t)Height > m_MaxTextureSize);
 
-			void *pTmpData = Resize((const uint8_t *)(pData), Width, Height, Width, Height, PixelSize);
+			uint8_t *pTmpData = ResizeImage(pData, Width, Height, Width, Height, PixelSize);
 			free(pData);
 			pData = pTmpData;
 		}
@@ -2642,7 +2656,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				dbg_msg("vulkan", "3D/2D array texture was resized");
 				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
 				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
-				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, PixelSize);
+				uint8_t *pNewTexData = ResizeImage(pData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, PixelSize);
 
 				ConvertWidth = NewWidth;
 				ConvertHeight = NewHeight;
@@ -2652,7 +2666,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 
 			bool Needs3DTexDel = false;
-			void *p3DTexData = malloc((size_t)PixelSize * ConvertWidth * ConvertHeight);
+			uint8_t *p3DTexData = static_cast<uint8_t *>(malloc((size_t)PixelSize * ConvertWidth * ConvertHeight));
 			if(!Texture2DTo3D(pData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DTexData, Image3DWidth, Image3DHeight))
 			{
 				free(p3DTexData);
@@ -2689,13 +2703,6 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
-	VkFormat TextureFormatToVulkanFormat(int TexFormat)
-	{
-		if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
-			return VK_FORMAT_R8G8B8A8_UNORM;
-		return VK_FORMAT_R8G8B8A8_UNORM;
-	}
-
 	[[nodiscard]] bool BuildMipmaps(VkImage Image, VkFormat ImageFormat, size_t Width, size_t Height, size_t Depth, size_t MipMapLevelCount)
 	{
 		VkCommandBuffer *pMemCommandBuffer;
@@ -2778,11 +2785,11 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
-	[[nodiscard]] bool CreateTextureImage(size_t ImageIndex, VkImage &NewImage, SMemoryImageBlock<s_ImageBufferCacheID> &NewImgMem, const void *pData, VkFormat Format, size_t Width, size_t Height, size_t Depth, size_t PixelSize, size_t MipMapLevelCount)
+	[[nodiscard]] bool CreateTextureImage(size_t ImageIndex, VkImage &NewImage, SMemoryImageBlock<s_ImageBufferCacheId> &NewImgMem, const uint8_t *pData, VkFormat Format, size_t Width, size_t Height, size_t Depth, size_t PixelSize, size_t MipMapLevelCount)
 	{
-		int ImageSize = Width * Height * Depth * PixelSize;
+		VkDeviceSize ImageSize = Width * Height * Depth * PixelSize;
 
-		SMemoryBlock<s_StagingBufferImageCacheID> StagingBuffer;
+		SMemoryBlock<s_StagingBufferImageCacheId> StagingBuffer;
 		if(!GetStagingBufferImage(StagingBuffer, pData, ImageSize))
 			return false;
 
@@ -2888,7 +2895,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return ImageView;
 	}
 
-	[[nodiscard]] bool CreateImage(uint32_t Width, uint32_t Height, uint32_t Depth, size_t MipMapLevelCount, VkFormat Format, VkImageTiling Tiling, VkImage &Image, SMemoryImageBlock<s_ImageBufferCacheID> &ImageMemory, VkImageUsageFlags ImageUsage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT)
+	[[nodiscard]] bool CreateImage(uint32_t Width, uint32_t Height, uint32_t Depth, size_t MipMapLevelCount, VkFormat Format, VkImageTiling Tiling, VkImage &Image, SMemoryImageBlock<s_ImageBufferCacheId> &ImageMemory, VkImageUsageFlags ImageUsage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT)
 	{
 		VkImageCreateInfo ImageInfo{};
 		ImageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -3073,11 +3080,11 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		size_t BufferOffset = 0;
 		if(!IsOneFrameBuffer)
 		{
-			SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+			SMemoryBlock<s_StagingBufferCacheId> StagingBuffer;
 			if(!GetStagingBuffer(StagingBuffer, pUploadData, BufferDataSize))
 				return false;
 
-			SMemoryBlock<s_VertexBufferCacheID> Mem;
+			SMemoryBlock<s_VertexBufferCacheId> Mem;
 			if(!GetVertexBuffer(Mem, BufferDataSize))
 				return false;
 
@@ -3279,7 +3286,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			else
 			{
 				Scissor.offset = {0, 0};
-				Scissor.extent = {(uint32_t)ScissorViewport.width, (uint32_t)ScissorViewport.height};
+				Scissor.extent = {ScissorViewport.width, ScissorViewport.height};
 			}
 
 			// if there is a dynamic viewport make sure the scissor data is scaled down to that
@@ -3395,7 +3402,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, VertexPushConstantSize, &VertexPushConstants);
 		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformTileGPosBorder) + sizeof(SUniformTileGVertColorAlign), FragPushConstantSize, &FragPushConstants);
 
-		size_t DrawCount = (size_t)IndicesDrawNum;
+		size_t DrawCount = IndicesDrawNum;
 		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
 		for(size_t i = 0; i < DrawCount; ++i)
 		{
@@ -3567,6 +3574,22 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
+	bool IsGpuDenied(uint32_t Vendor, uint32_t DriverVersion, uint32_t ApiMajor, uint32_t ApiMinor, uint32_t ApiPatch)
+	{
+#ifdef CONF_FAMILY_WINDOWS
+		// AMD
+		if(0x1002 == Vendor)
+		{
+			auto Major = (DriverVersion >> 22);
+			auto Minor = (DriverVersion >> 12) & 0x3ff;
+			auto Patch = DriverVersion & 0xfff;
+
+			return Major == 2 && Minor == 0 && Patch > 116 && Patch < 220 && ((ApiMajor <= 1 && ApiMinor < 3) || (ApiMajor <= 1 && ApiMinor == 3 && ApiPatch < 206));
+		}
+#endif
+		return false;
+	}
+
 	[[nodiscard]] bool CreateVulkanInstance(const std::vector<std::string> &vVKLayers, const std::vector<std::string> &vVKExtensions, bool TryDebugExtensions)
 	{
 		std::vector<const char *> vLayersCStr;
@@ -3638,25 +3661,25 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return true;
 	}
 
-	STWGraphicGPU::ETWGraphicsGPUType VKGPUTypeToGraphicsGPUType(VkPhysicalDeviceType VKGPUType)
+	STWGraphicGpu::ETWGraphicsGpuType VKGPUTypeToGraphicsGpuType(VkPhysicalDeviceType VKGPUType)
 	{
 		if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU)
-			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_DISCRETE;
+			return STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_DISCRETE;
 		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)
-			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INTEGRATED;
+			return STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INTEGRATED;
 		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU)
-			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_VIRTUAL;
+			return STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_VIRTUAL;
 		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_CPU)
-			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_CPU;
+			return STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_CPU;
 
-		return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_CPU;
+		return STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_CPU;
 	}
 
 	// from: https://github.com/SaschaWillems/vulkan.gpuinfo.org/blob/5c3986798afc39d736b825bf8a5fbf92b8d9ed49/includes/functions.php#L364
-	const char *GetDriverVerson(char (&aBuff)[256], uint32_t DriverVersion, uint32_t VendorID)
+	const char *GetDriverVerson(char (&aBuff)[256], uint32_t DriverVersion, uint32_t VendorId)
 	{
 		// NVIDIA
-		if(VendorID == 4318)
+		if(VendorId == 4318)
 		{
 			str_format(aBuff, std::size(aBuff), "%d.%d.%d.%d",
 				(DriverVersion >> 22) & 0x3ff,
@@ -3666,7 +3689,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 #ifdef CONF_FAMILY_WINDOWS
 		// windows only
-		else if(VendorID == 0x8086)
+		else if(VendorId == 0x8086)
 		{
 			str_format(aBuff, std::size(aBuff),
 				"%d.%d",
@@ -3687,7 +3710,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return aBuff;
 	}
 
-	[[nodiscard]] bool SelectGPU(char *pRendererName, char *pVendorName, char *pVersionName)
+	[[nodiscard]] bool SelectGpu(char *pRendererName, char *pVendorName, char *pVersionName)
 	{
 		uint32_t DevicesCount = 0;
 		auto Res = vkEnumeratePhysicalDevices(m_VKInstance, &DevicesCount, nullptr);
@@ -3721,59 +3744,72 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 		size_t Index = 0;
 		std::vector<VkPhysicalDeviceProperties> vDevicePropList(vDeviceList.size());
-		m_pGPUList->m_vGPUs.reserve(vDeviceList.size());
+		m_pGpuList->m_vGpus.reserve(vDeviceList.size());
 
 		size_t FoundDeviceIndex = 0;
-		size_t FoundGPUType = STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INVALID;
 
-		STWGraphicGPU::ETWGraphicsGPUType AutoGPUType = STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INVALID;
+		STWGraphicGpu::ETWGraphicsGpuType AutoGpuType = STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INVALID;
 
-		bool IsAutoGPU = str_comp(g_Config.m_GfxGPUName, "auto") == 0;
+		bool IsAutoGpu = str_comp(g_Config.m_GfxGpuName, "auto") == 0;
 
+		bool UserSelectedGpuChosen = false;
 		for(auto &CurDevice : vDeviceList)
 		{
 			vkGetPhysicalDeviceProperties(CurDevice, &(vDevicePropList[Index]));
 
 			auto &DeviceProp = vDevicePropList[Index];
 
-			STWGraphicGPU::ETWGraphicsGPUType GPUType = VKGPUTypeToGraphicsGPUType(DeviceProp.deviceType);
-
-			STWGraphicGPU::STWGraphicGPUItem NewGPU;
-			str_copy(NewGPU.m_aName, DeviceProp.deviceName);
-			NewGPU.m_GPUType = GPUType;
-			m_pGPUList->m_vGPUs.push_back(NewGPU);
-
-			Index++;
+			STWGraphicGpu::ETWGraphicsGpuType GPUType = VKGPUTypeToGraphicsGpuType(DeviceProp.deviceType);
 
-			int DevAPIMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
-			int DevAPIMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
+			int DevApiMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
+			int DevApiMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
+			int DevApiPatch = (int)VK_API_VERSION_PATCH(DeviceProp.apiVersion);
 
-			if(GPUType < AutoGPUType && (DevAPIMajor > gs_BackendVulkanMajor || (DevAPIMajor == gs_BackendVulkanMajor && DevAPIMinor >= gs_BackendVulkanMinor)))
+			auto IsDenied = CCommandProcessorFragment_Vulkan::IsGpuDenied(DeviceProp.vendorID, DeviceProp.driverVersion, DevApiMajor, DevApiMinor, DevApiPatch);
+			if((DevApiMajor > gs_BackendVulkanMajor || (DevApiMajor == gs_BackendVulkanMajor && DevApiMinor >= gs_BackendVulkanMinor)) && !IsDenied)
 			{
-				str_copy(m_pGPUList->m_AutoGPU.m_aName, DeviceProp.deviceName);
-				m_pGPUList->m_AutoGPU.m_GPUType = GPUType;
+				STWGraphicGpu::STWGraphicGpuItem NewGpu;
+				str_copy(NewGpu.m_aName, DeviceProp.deviceName);
+				NewGpu.m_GpuType = GPUType;
+				m_pGpuList->m_vGpus.push_back(NewGpu);
 
-				AutoGPUType = GPUType;
-			}
+				// We always decide what the 'auto' GPU would be, even if user is forcing a GPU by name in config
+				// Reminder: A worse GPU enumeration has a higher value than a better GPU enumeration, thus the '>'
+				if(AutoGpuType > STWGraphicGpu::ETWGraphicsGpuType::GRAPHICS_GPU_TYPE_INTEGRATED)
+				{
+					str_copy(m_pGpuList->m_AutoGpu.m_aName, DeviceProp.deviceName);
+					m_pGpuList->m_AutoGpu.m_GpuType = GPUType;
 
-			if(((IsAutoGPU && (FoundGPUType > STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INTEGRATED && GPUType < FoundGPUType)) || str_comp(DeviceProp.deviceName, g_Config.m_GfxGPUName) == 0) && (DevAPIMajor > gs_BackendVulkanMajor || (DevAPIMajor == gs_BackendVulkanMajor && DevAPIMinor >= gs_BackendVulkanMinor)))
-			{
-				FoundDeviceIndex = Index;
-				FoundGPUType = GPUType;
+					AutoGpuType = GPUType;
+
+					if(IsAutoGpu)
+						FoundDeviceIndex = Index;
+				}
+				// We only select the first GPU that matches, because it comes first in the enumeration array, it's preferred by the system
+				// Reminder: We can't break the cycle here if the name matches because we need to choose the best GPU for 'auto' mode
+				if(!IsAutoGpu && !UserSelectedGpuChosen && str_comp(DeviceProp.deviceName, g_Config.m_GfxGpuName) == 0)
+				{
+					FoundDeviceIndex = Index;
+					UserSelectedGpuChosen = true;
+				}
 			}
+			Index++;
 		}
 
-		if(FoundDeviceIndex == 0)
-			FoundDeviceIndex = 1;
+		if(m_pGpuList->m_vGpus.empty())
+		{
+			dbg_msg("vulkan", "no devices with required vulkan version found.");
+			return false;
+		}
 
 		{
-			auto &DeviceProp = vDevicePropList[FoundDeviceIndex - 1];
+			auto &DeviceProp = vDevicePropList[FoundDeviceIndex];
 
-			int DevAPIMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
-			int DevAPIMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
-			int DevAPIPatch = (int)VK_API_VERSION_PATCH(DeviceProp.apiVersion);
+			int DevApiMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
+			int DevApiMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
+			int DevApiPatch = (int)VK_API_VERSION_PATCH(DeviceProp.apiVersion);
 
-			str_copy(pRendererName, DeviceProp.deviceName, gs_GPUInfoStringSize);
+			str_copy(pRendererName, DeviceProp.deviceName, gs_GpuInfoStringSize);
 			const char *pVendorNameStr = NULL;
 			switch(DeviceProp.vendorID)
 			{
@@ -3808,8 +3844,8 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 
 			char aBuff[256];
-			str_copy(pVendorName, pVendorNameStr, gs_GPUInfoStringSize);
-			str_format(pVersionName, gs_GPUInfoStringSize, "Vulkan %d.%d.%d (driver: %s)", DevAPIMajor, DevAPIMinor, DevAPIPatch, GetDriverVerson(aBuff, DeviceProp.driverVersion, DeviceProp.vendorID));
+			str_copy(pVendorName, pVendorNameStr, gs_GpuInfoStringSize);
+			str_format(pVersionName, gs_GpuInfoStringSize, "Vulkan %d.%d.%d (driver: %s)", DevApiMajor, DevApiMinor, DevApiPatch, GetDriverVerson(aBuff, DeviceProp.driverVersion, DeviceProp.vendorID));
 
 			// get important device limits
 			m_NonCoherentMemAlignment = DeviceProp.limits.nonCoherentAtomSize;
@@ -3827,7 +3863,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 		}
 
-		VkPhysicalDevice CurDevice = vDeviceList[FoundDeviceIndex - 1];
+		VkPhysicalDevice CurDevice = vDeviceList[FoundDeviceIndex];
 
 		uint32_t FamQueueCount = 0;
 		vkGetPhysicalDeviceQueueFamilyProperties(CurDevice, &FamQueueCount, nullptr);
@@ -5318,12 +5354,12 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	[[nodiscard]] bool CreateSyncObjects()
 	{
-		m_vWaitSemaphores.resize(m_SwapChainImageCount);
-		m_vSigSemaphores.resize(m_SwapChainImageCount);
+		// Create one more sync object than there are frames in flight
+		auto SyncObjectCount = m_SwapChainImageCount + 1;
+		m_vWaitSemaphores.resize(SyncObjectCount);
+		m_vSigSemaphores.resize(SyncObjectCount);
 
-		m_vMemorySemaphores.resize(m_SwapChainImageCount);
-
-		m_vFrameFences.resize(m_SwapChainImageCount);
+		m_vFrameFences.resize(SyncObjectCount);
 		m_vImagesFences.resize(m_SwapChainImageCount, VK_NULL_HANDLE);
 
 		VkSemaphoreCreateInfo CreateSemaphoreInfo{};
@@ -5333,11 +5369,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		FenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
 		FenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
 
-		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		for(size_t i = 0; i < SyncObjectCount; i++)
 		{
 			if(vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vWaitSemaphores[i]) != VK_SUCCESS ||
 				vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vSigSemaphores[i]) != VK_SUCCESS ||
-				vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vMemorySemaphores[i]) != VK_SUCCESS ||
 				vkCreateFence(m_VKDevice, &FenceInfo, nullptr, &m_vFrameFences[i]) != VK_SUCCESS)
 			{
 				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating swap chain sync objects(fences, semaphores) failed.");
@@ -5350,21 +5385,20 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	void DestroySyncObjects()
 	{
-		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		for(size_t i = 0; i < m_vWaitSemaphores.size(); i++)
 		{
 			vkDestroySemaphore(m_VKDevice, m_vWaitSemaphores[i], nullptr);
 			vkDestroySemaphore(m_VKDevice, m_vSigSemaphores[i], nullptr);
-			vkDestroySemaphore(m_VKDevice, m_vMemorySemaphores[i], nullptr);
 			vkDestroyFence(m_VKDevice, m_vFrameFences[i], nullptr);
 		}
 
 		m_vWaitSemaphores.clear();
 		m_vSigSemaphores.clear();
 
-		m_vMemorySemaphores.clear();
-
 		m_vFrameFences.clear();
 		m_vImagesFences.clear();
+
+		m_CurFrameSyncObject = 0;
 	}
 
 	void DestroyBufferOfFrame(size_t ImageIndex, SFrameBuffers &Buffer)
@@ -5418,7 +5452,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	}
 
 	template<bool IsLastCleanup>
-	void CleanupVulkan()
+	void CleanupVulkan(size_t SwapchainCount)
 	{
 		if(IsLastCleanup)
 		{
@@ -5456,7 +5490,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		m_vStreamedVertexBuffers.clear();
 		m_vStreamedUniformBuffers.clear();
 
-		for(size_t i = 0; i < m_SwapChainImageCount; ++i)
+		for(size_t i = 0; i < SwapchainCount; ++i)
 		{
 			ClearFrameData(i);
 		}
@@ -5465,11 +5499,11 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		m_vvFrameDelayedTextureCleanup.clear();
 		m_vvFrameDelayedTextTexturesCleanup.clear();
 
-		m_StagingBufferCache.DestroyFrameData(m_SwapChainImageCount);
-		m_StagingBufferCacheImage.DestroyFrameData(m_SwapChainImageCount);
-		m_VertexBufferCache.DestroyFrameData(m_SwapChainImageCount);
+		m_StagingBufferCache.DestroyFrameData(SwapchainCount);
+		m_StagingBufferCacheImage.DestroyFrameData(SwapchainCount);
+		m_VertexBufferCache.DestroyFrameData(SwapchainCount);
 		for(auto &ImageBufferCache : m_ImageBufferCaches)
-			ImageBufferCache.second.DestroyFrameData(m_SwapChainImageCount);
+			ImageBufferCache.second.DestroyFrameData(SwapchainCount);
 
 		if(IsLastCleanup)
 		{
@@ -5547,7 +5581,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 		if(OldSwapChainImageCount != m_SwapChainImageCount)
 		{
-			CleanupVulkan<false>();
+			CleanupVulkan<false>(OldSwapChainImageCount);
 			InitVulkan<false>();
 		}
 
@@ -5591,7 +5625,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			}
 		}
 
-		if(!SelectGPU(pRendererString, pVendorString, pVersionString))
+		if(!SelectGpu(pRendererString, pVendorString, pVersionString))
 			return -1;
 
 		if(!CreateLogicalDevice(vVKLayers))
@@ -6101,20 +6135,20 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	template<bool IsFirstInitialization>
 	int InitVulkan()
 	{
-		if(!CreateDescriptorSetLayouts())
-			return -1;
+		if(IsFirstInitialization)
+		{
+			if(!CreateDescriptorSetLayouts())
+				return -1;
 
-		if(!CreateTextDescriptorSetLayout())
-			return -1;
+			if(!CreateTextDescriptorSetLayout())
+				return -1;
 
-		if(!CreateSpriteMultiUniformDescriptorSetLayout())
-			return -1;
+			if(!CreateSpriteMultiUniformDescriptorSetLayout())
+				return -1;
 
-		if(!CreateQuadUniformDescriptorSetLayout())
-			return -1;
+			if(!CreateQuadUniformDescriptorSetLayout())
+				return -1;
 
-		if(IsFirstInitialization)
-		{
 			VkSwapchainKHR OldSwapChain = VK_NULL_HANDLE;
 			if(InitVulkanSwapChain(OldSwapChain) != 0)
 				return -1;
@@ -6288,7 +6322,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 				BufferMem = BufferOfFrame.m_BufferMem;
 				Offset = BufferOfFrame.m_UsedSize;
 				BufferOfFrame.m_UsedSize += DataSize;
-				pMem = (uint8_t *)BufferOfFrame.m_pMappedBufferData;
+				pMem = BufferOfFrame.m_pMappedBufferData;
 				pBufferMem = &BufferOfFrame;
 				break;
 			}
@@ -6321,7 +6355,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 			BufferMem = StreamBufferMemory;
 
 			pBufferMem = &NewStreamBuffer;
-			pMem = (uint8_t *)NewStreamBuffer.m_pMappedBufferData;
+			pMem = NewStreamBuffer.m_pMappedBufferData;
 			Offset = NewStreamBuffer.m_OffsetInBuffer;
 			NewStreamBuffer.m_UsedSize += DataSize;
 
@@ -6329,7 +6363,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		}
 
 		{
-			mem_copy(pMem + Offset, pData, (size_t)DataSize);
+			mem_copy(pMem + Offset, pData, DataSize);
 		}
 
 		NewBuffer = Buffer;
@@ -6378,7 +6412,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	{
 		VkDeviceSize BufferDataSize = DataSize;
 
-		SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+		SMemoryBlock<s_StagingBufferCacheId> StagingBuffer;
 		if(!GetStagingBuffer(StagingBuffer, pData, DataSize))
 			return false;
 
@@ -6545,8 +6579,9 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 		m_MultiSamplingCount = (g_Config.m_GfxFsaaSamples & 0xFFFFFFFE); // ignore the uneven bit, only even multi sampling works
 
-		TGLBackendReadPresentedImageData &ReadPresentedImgDataFunc = *pCommand->m_pReadPresentedImageDataFunc;
-		ReadPresentedImgDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) { return GetPresentedImageData(Width, Height, Format, vDstData); };
+		*pCommand->m_pReadPresentedImageDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) {
+			return GetPresentedImageData(Width, Height, Format, vDstData);
+		};
 
 		m_pWindow = pCommand->m_pWindow;
 
@@ -6610,21 +6645,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		DestroyIndexBuffer(m_IndexBuffer, m_IndexBufferMemory);
 		DestroyIndexBuffer(m_RenderIndexBuffer, m_RenderIndexBufferMemory);
 
-		CleanupVulkan<true>();
-
-		return true;
-	}
-
-	[[nodiscard]] bool Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
-	{
-		size_t IndexTex = pCommand->m_Slot;
-
-		void *pData = pCommand->m_pData;
-
-		if(!UpdateTexture(IndexTex, VK_FORMAT_B8G8R8A8_UNORM, pData, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height))
-			return false;
-
-		free(pData);
+		CleanupVulkan<true>(m_SwapChainImageCount);
 
 		return true;
 	}
@@ -6646,12 +6667,10 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		int Slot = pCommand->m_Slot;
 		int Width = pCommand->m_Width;
 		int Height = pCommand->m_Height;
-		int Format = pCommand->m_Format;
-		int StoreFormat = pCommand->m_StoreFormat;
 		int Flags = pCommand->m_Flags;
-		void *pData = pCommand->m_pData;
+		uint8_t *pData = pCommand->m_pData;
 
-		if(!CreateTextureCMD(Slot, Width, Height, TextureFormatToVulkanFormat(Format), TextureFormatToVulkanFormat(StoreFormat), Flags, pData))
+		if(!CreateTextureCMD(Slot, Width, Height, VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, Flags, pData))
 			return false;
 
 		free(pData);
@@ -6666,8 +6685,8 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		int Width = pCommand->m_Width;
 		int Height = pCommand->m_Height;
 
-		void *pTmpData = pCommand->m_pTextData;
-		void *pTmpData2 = pCommand->m_pTextOutlineData;
+		uint8_t *pTmpData = pCommand->m_pTextData;
+		uint8_t *pTmpData2 = pCommand->m_pTextOutlineData;
 
 		if(!CreateTextureCMD(Slot, Width, Height, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, CCommandBuffer::TEXFLAG_NOMIPMAPS, pTmpData))
 			return false;
@@ -6701,8 +6720,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	[[nodiscard]] bool Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
 	{
 		size_t IndexTex = pCommand->m_Slot;
-
-		void *pData = pCommand->m_pData;
+		uint8_t *pData = pCommand->m_pData;
 
 		if(!UpdateTexture(IndexTex, VK_FORMAT_R8_UNORM, pData, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height))
 			return false;
@@ -6770,19 +6788,40 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		return RenderStandard<CCommandBuffer::SVertex, false>(ExecBuffer, pCommand->m_State, pCommand->m_PrimType, pCommand->m_pVertices, pCommand->m_PrimCount);
 	}
 
+	[[nodiscard]] bool Cmd_ReadPixel(const CCommandBuffer::SCommand_TrySwapAndReadPixel *pCommand)
+	{
+		if(!*pCommand->m_pSwapped && !NextFrame())
+			return false;
+		*pCommand->m_pSwapped = true;
+
+		uint32_t Width;
+		uint32_t Height;
+		CImageInfo::EImageFormat Format;
+		if(GetPresentedImageDataImpl(Width, Height, Format, m_vReadPixelHelper, false, pCommand->m_Position))
+		{
+			*pCommand->m_pColor = ColorRGBA(m_vReadPixelHelper[0] / 255.0f, m_vReadPixelHelper[1] / 255.0f, m_vReadPixelHelper[2] / 255.0f, 1.0f);
+		}
+		else
+		{
+			*pCommand->m_pColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+
+		return true;
+	}
+
 	[[nodiscard]] bool Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand)
 	{
-		if(!NextFrame())
+		if(!*pCommand->m_pSwapped && !NextFrame())
 			return false;
 		*pCommand->m_pSwapped = true;
 
 		uint32_t Width;
 		uint32_t Height;
 		CImageInfo::EImageFormat Format;
-		if(GetPresentedImageDataImpl(Width, Height, Format, m_vScreenshotHelper, false, true))
+		if(GetPresentedImageDataImpl(Width, Height, Format, m_vScreenshotHelper, true, {}))
 		{
-			size_t ImgSize = (size_t)Width * (size_t)Height * (size_t)4;
-			pCommand->m_pImage->m_pData = malloc(ImgSize);
+			const size_t ImgSize = (size_t)Width * (size_t)Height * CImageInfo::PixelSize(Format);
+			pCommand->m_pImage->m_pData = static_cast<uint8_t *>(malloc(ImgSize));
 			mem_copy(pCommand->m_pImage->m_pData, m_vScreenshotHelper.data(), ImgSize);
 		}
 		else
@@ -6908,7 +6947,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 		void *pUploadData = pCommand->m_pUploadData;
 		VkDeviceSize DataSize = (VkDeviceSize)pCommand->m_DataSize;
 
-		SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+		SMemoryBlock<s_StagingBufferCacheId> StagingBuffer;
 		if(!GetStagingBuffer(StagingBuffer, pUploadData, DataSize))
 			return false;
 
@@ -7453,7 +7492,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 	[[nodiscard]] bool Cmd_WindowCreateNtf(const CCommandBuffer::SCommand_WindowCreateNtf *pCommand)
 	{
 		log_debug("vulkan", "creating new surface.");
-		m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowID);
+		m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowId);
 		if(m_RenderingPaused)
 		{
 #ifdef CONF_PLATFORM_ANDROID
@@ -7490,7 +7529,7 @@ class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
 
 	[[nodiscard]] bool Cmd_PreInit(const CCommandProcessorFragment_GLBase::SCommand_PreInit *pCommand)
 	{
-		m_pGPUList = pCommand->m_pGPUList;
+		m_pGpuList = pCommand->m_pGpuList;
 		if(InitVulkanSDL(pCommand->m_pWindow, pCommand->m_Width, pCommand->m_Height, pCommand->m_pRendererString, pCommand->m_pVendorString, pCommand->m_pVersionString) != 0)
 		{
 			m_VKInstance = VK_NULL_HANDLE;
diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
index ab5c402d95..cb42a1cfcf 100644
--- a/src/engine/client/backend_sdl.cpp
+++ b/src/engine/client/backend_sdl.cpp
@@ -226,7 +226,7 @@ void CCommandProcessorFragment_SDL::Cmd_VSync(const CCommandBuffer::SCommand_VSy
 
 void CCommandProcessorFragment_SDL::Cmd_WindowCreateNtf(const CCommandBuffer::SCommand_WindowCreateNtf *pCommand)
 {
-	m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowID);
+	m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowId);
 	// Android destroys windows when they are not visible, so we get the new one and work with that
 	// The graphic context does not need to be recreated, just unbound see @see SCommand_WindowDestroyNtf
 #ifdef CONF_PLATFORM_ANDROID
@@ -423,7 +423,7 @@ const SGfxErrorContainer &CCommandProcessor_SDL_GL::GetError() const
 
 void CCommandProcessor_SDL_GL::ErroneousCleanup()
 {
-	return m_pGLBackend->ErroneousCleanup();
+	m_pGLBackend->ErroneousCleanup();
 }
 
 const SGfxWarningContainer &CCommandProcessor_SDL_GL::GetWarning() const
@@ -443,7 +443,9 @@ static bool BackendInitGlew(EBackendType BackendType, int &GlewMajor, int &GlewM
 #ifdef CONF_GLEW_HAS_CONTEXT_INIT
 		if(GLEW_OK != glewContextInit())
 #else
-		if(GLEW_OK != glewInit())
+		GLenum InitResult = glewInit();
+		const char *pVideoDriver = SDL_GetCurrentVideoDriver();
+		if(GLEW_OK != InitResult && pVideoDriver && !str_comp(pVideoDriver, "wayland") && GLEW_ERROR_NO_GLX_DISPLAY != InitResult)
 #endif
 			return false;
 
@@ -900,18 +902,17 @@ static void DisplayToVideoMode(CVideoMode *pVMode, SDL_DisplayMode *pMode, int H
 	pVMode->m_Format = pMode->format;
 }
 
-void CGraphicsBackend_SDL_GL::GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID)
+void CGraphicsBackend_SDL_GL::GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenId)
 {
 	SDL_DisplayMode DesktopMode;
-	int maxModes = SDL_GetNumDisplayModes(ScreenID);
-	int numModes = 0;
+	int MaxModesAvailable = SDL_GetNumDisplayModes(ScreenId);
 
 	// Only collect fullscreen modes when requested, that makes sure in windowed mode no refresh rates are shown that aren't supported without
 	// fullscreen anyway(except fullscreen desktop)
 	bool IsFullscreenDestkop = m_pWindow != NULL && (((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) || g_Config.m_GfxFullscreen == 3);
 	bool CollectFullscreenModes = m_pWindow == NULL || ((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN) != 0 && !IsFullscreenDestkop);
 
-	if(SDL_GetDesktopDisplayMode(ScreenID, &DesktopMode) < 0)
+	if(SDL_GetDesktopDisplayMode(ScreenId, &DesktopMode) < 0)
 	{
 		dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
 	}
@@ -919,65 +920,66 @@ void CGraphicsBackend_SDL_GL::GetVideoModes(CVideoMode *pModes, int MaxModes, in
 	constexpr int ModeCount = 256;
 	SDL_DisplayMode aModes[ModeCount];
 	int NumModes = 0;
-	for(int i = 0; i < maxModes && NumModes < ModeCount; i++)
+	for(int i = 0; i < MaxModesAvailable && NumModes < ModeCount; i++)
 	{
-		SDL_DisplayMode mode;
-		if(SDL_GetDisplayMode(ScreenID, i, &mode) < 0)
+		SDL_DisplayMode Mode;
+		if(SDL_GetDisplayMode(ScreenId, i, &Mode) < 0)
 		{
 			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
 			continue;
 		}
 
-		aModes[NumModes] = mode;
+		aModes[NumModes] = Mode;
 		++NumModes;
 	}
 
-	auto &&ModeInsert = [&](SDL_DisplayMode &mode) {
-		if(numModes < MaxModes)
+	int NumModesInserted = 0;
+	auto &&ModeInsert = [&](SDL_DisplayMode &Mode) {
+		if(NumModesInserted < MaxModes)
 		{
 			// if last mode was equal, ignore this one --- in fullscreen this can really only happen if the screen
 			// supports different color modes
 			// in non fullscren these are the modes that show different refresh rate, but are basically the same
-			if(numModes > 0 && pModes[numModes - 1].m_WindowWidth == mode.w && pModes[numModes - 1].m_WindowHeight == mode.h && (pModes[numModes - 1].m_RefreshRate == mode.refresh_rate || (mode.refresh_rate != DesktopMode.refresh_rate && !CollectFullscreenModes)))
+			if(NumModesInserted > 0 && pModes[NumModesInserted - 1].m_WindowWidth == Mode.w && pModes[NumModesInserted - 1].m_WindowHeight == Mode.h && (pModes[NumModesInserted - 1].m_RefreshRate == Mode.refresh_rate || (Mode.refresh_rate != DesktopMode.refresh_rate && !CollectFullscreenModes)))
 				return;
 
-			DisplayToVideoMode(&pModes[numModes], &mode, HiDPIScale, !CollectFullscreenModes ? DesktopMode.refresh_rate : mode.refresh_rate);
-			numModes++;
+			DisplayToVideoMode(&pModes[NumModesInserted], &Mode, HiDPIScale, !CollectFullscreenModes ? DesktopMode.refresh_rate : Mode.refresh_rate);
+			NumModesInserted++;
 		}
 	};
 
 	for(int i = 0; i < NumModes; i++)
 	{
-		SDL_DisplayMode &mode = aModes[i];
+		SDL_DisplayMode &Mode = aModes[i];
 
-		if(mode.w > MaxWindowWidth || mode.h > MaxWindowHeight)
+		if(Mode.w > MaxWindowWidth || Mode.h > MaxWindowHeight)
 			continue;
 
-		ModeInsert(mode);
+		ModeInsert(Mode);
 
 		if(IsFullscreenDestkop)
 			break;
 
-		if(numModes >= MaxModes)
+		if(NumModesInserted >= MaxModes)
 			break;
 	}
-	*pNumModes = numModes;
+	*pNumModes = NumModesInserted;
 }
 
-void CGraphicsBackend_SDL_GL::GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID)
+void CGraphicsBackend_SDL_GL::GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenId)
 {
-	SDL_DisplayMode DPMode;
+	SDL_DisplayMode DpMode;
 	// if "real" fullscreen, obtain the video mode for that
 	if((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN)
 	{
-		if(SDL_GetCurrentDisplayMode(ScreenID, &DPMode))
+		if(SDL_GetCurrentDisplayMode(ScreenId, &DpMode))
 		{
 			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
 		}
 	}
 	else
 	{
-		if(SDL_GetDesktopDisplayMode(ScreenID, &DPMode) < 0)
+		if(SDL_GetDesktopDisplayMode(ScreenId, &DpMode) < 0)
 		{
 			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
 		}
@@ -986,11 +988,11 @@ void CGraphicsBackend_SDL_GL::GetCurrentVideoMode(CVideoMode &CurMode, int HiDPI
 			int Width = 0;
 			int Height = 0;
 			SDL_GL_GetDrawableSize(m_pWindow, &Width, &Height);
-			DPMode.w = Width;
-			DPMode.h = Height;
+			DpMode.w = Width;
+			DpMode.h = Height;
 		}
 	}
-	DisplayToVideoMode(&CurMode, &DPMode, HiDPIScale, DPMode.refresh_rate);
+	DisplayToVideoMode(&CurMode, &DpMode, HiDPIScale, DpMode.refresh_rate);
 }
 
 CGraphicsBackend_SDL_GL::CGraphicsBackend_SDL_GL(TTranslateFunc &&TranslateFunc) :
@@ -1019,6 +1021,13 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 		SDL_GetVersion(&Linked);
 		dbg_msg("sdl", "SDL version %d.%d.%d (compiled = %d.%d.%d)", Linked.major, Linked.minor, Linked.patch,
 			Compiled.major, Compiled.minor, Compiled.patch);
+
+#if CONF_PLATFORM_LINUX && SDL_VERSION_ATLEAST(2, 0, 22)
+		// needed to workaround SDL from forcing exclusively X11 if linking against the GLX flavour of GLEW instead of the EGL one
+		// w/o this on Wayland systems (no XWayland support) SDL's Video subsystem will fail to load (starting from SDL2.30+)
+		if(Linked.major == 2 && Linked.minor >= 30)
+			SDL_SetHint(SDL_HINT_VIDEODRIVER, "x11,wayland");
+#endif
 	}
 
 	if(!SDL_WasInit(SDL_INIT_VIDEO))
@@ -1275,7 +1284,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 	CmdPre.m_pVendorString = m_aVendorString;
 	CmdPre.m_pVersionString = m_aVersionString;
 	CmdPre.m_pRendererString = m_aRendererString;
-	CmdPre.m_pGPUList = &m_GPUList;
+	CmdPre.m_pGpuList = &m_GpuList;
 	CmdBuffer.AddCommandUnsafe(CmdPre);
 	RunBufferSingleThreadedUnsafe(&CmdBuffer);
 	CmdBuffer.Reset();
@@ -1299,7 +1308,7 @@ int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth,
 		CmdGL.m_pBufferMemoryUsage = &m_BufferMemoryUsage;
 		CmdGL.m_pStreamMemoryUsage = &m_StreamMemoryUsage;
 		CmdGL.m_pStagingMemoryUsage = &m_StagingMemoryUsage;
-		CmdGL.m_pGPUList = &m_GPUList;
+		CmdGL.m_pGpuList = &m_GpuList;
 		CmdGL.m_pReadPresentedImageDataFunc = &m_ReadPresentedImageDataFunc;
 		CmdGL.m_pStorage = pStorage;
 		CmdGL.m_pCapabilities = &m_Capabilites;
@@ -1444,9 +1453,9 @@ uint64_t CGraphicsBackend_SDL_GL::StagingMemoryUsage() const
 	return m_StagingMemoryUsage;
 }
 
-const TTWGraphicsGPUList &CGraphicsBackend_SDL_GL::GetGPUs() const
+const TTwGraphicsGpuList &CGraphicsBackend_SDL_GL::GetGpus() const
 {
-	return m_GPUList;
+	return m_GpuList;
 }
 
 void CGraphicsBackend_SDL_GL::Minimize()
@@ -1459,7 +1468,7 @@ void CGraphicsBackend_SDL_GL::Maximize()
 	// TODO: SDL
 }
 
-void CGraphicsBackend_SDL_GL::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+void CGraphicsBackend_SDL_GL::SetWindowParams(int FullscreenMode, bool IsBorderless)
 {
 	if(FullscreenMode > 0)
 	{
@@ -1488,14 +1497,14 @@ void CGraphicsBackend_SDL_GL::SetWindowParams(int FullscreenMode, bool IsBorderl
 			SDL_SetWindowFullscreen(m_pWindow, 0);
 			SDL_SetWindowBordered(m_pWindow, SDL_TRUE);
 			SDL_SetWindowResizable(m_pWindow, SDL_FALSE);
-			SDL_DisplayMode DPMode;
-			if(SDL_GetDesktopDisplayMode(g_Config.m_GfxScreen, &DPMode) < 0)
+			SDL_DisplayMode DpMode;
+			if(SDL_GetDesktopDisplayMode(g_Config.m_GfxScreen, &DpMode) < 0)
 			{
 				dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
 			}
 			else
 			{
-				ResizeWindow(DPMode.w, DPMode.h, DPMode.refresh_rate);
+				ResizeWindow(DpMode.w, DpMode.h, DpMode.refresh_rate);
 				SDL_SetWindowPosition(m_pWindow, SDL_WINDOWPOS_CENTERED_DISPLAY(g_Config.m_GfxScreen), SDL_WINDOWPOS_CENTERED_DISPLAY(g_Config.m_GfxScreen));
 			}
 		}
@@ -1520,6 +1529,8 @@ bool CGraphicsBackend_SDL_GL::SetWindowScreen(int Index)
 	{
 		return false;
 	}
+	// Todo SDL: remove this when fixed (changing screen when in fullscreen is bugged)
+	SDL_SetWindowBordered(m_pWindow, SDL_TRUE); //fixing primary monitor goes black when switch screen (borderless OpenGL)
 
 	SDL_SetWindowPosition(m_pWindow,
 		SDL_WINDOWPOS_CENTERED_DISPLAY(Index),
@@ -1537,6 +1548,7 @@ bool CGraphicsBackend_SDL_GL::UpdateDisplayMode(int Index)
 		return false;
 	}
 
+	g_Config.m_GfxScreen = Index;
 	g_Config.m_GfxDesktopWidth = DisplayMode.w;
 	g_Config.m_GfxDesktopHeight = DisplayMode.h;
 
@@ -1574,7 +1586,7 @@ bool CGraphicsBackend_SDL_GL::ResizeWindow(int w, int h, int RefreshRate)
 	{
 #ifdef CONF_FAMILY_WINDOWS
 		// in windows make the window windowed mode first, this prevents strange window glitches (other games probably do something similar)
-		SetWindowParams(0, true, true);
+		SetWindowParams(0, true);
 #endif
 		SDL_DisplayMode SetMode = {};
 		SDL_DisplayMode ClosestMode = {};
@@ -1586,7 +1598,7 @@ bool CGraphicsBackend_SDL_GL::ResizeWindow(int w, int h, int RefreshRate)
 #ifdef CONF_FAMILY_WINDOWS
 		// now change it back to fullscreen, this will restore the above set state, bcs SDL saves fullscreen modes apart from other video modes (as of SDL 2.0.16)
 		// see implementation of SDL_SetWindowDisplayMode
-		SetWindowParams(1, false, true);
+		SetWindowParams(1, false);
 #endif
 		return true;
 	}
@@ -1618,13 +1630,13 @@ void CGraphicsBackend_SDL_GL::NotifyWindow()
 #endif
 }
 
-void CGraphicsBackend_SDL_GL::WindowDestroyNtf(uint32_t WindowID)
+void CGraphicsBackend_SDL_GL::WindowDestroyNtf(uint32_t WindowId)
 {
 }
 
-void CGraphicsBackend_SDL_GL::WindowCreateNtf(uint32_t WindowID)
+void CGraphicsBackend_SDL_GL::WindowCreateNtf(uint32_t WindowId)
 {
-	m_pWindow = SDL_GetWindowFromID(WindowID);
+	m_pWindow = SDL_GetWindowFromID(WindowId);
 }
 
 TGLBackendReadPresentedImageData &CGraphicsBackend_SDL_GL::GetReadPresentedImageDataFuncUnsafe()
diff --git a/src/engine/client/backend_sdl.h b/src/engine/client/backend_sdl.h
index 952ba052c9..de04f7e593 100644
--- a/src/engine/client/backend_sdl.h
+++ b/src/engine/client/backend_sdl.h
@@ -198,7 +198,7 @@ class CCommandProcessor_SDL_GL : public CGraphicsBackend_Threaded::ICommandProce
 	void HandleWarning();
 };
 
-static constexpr size_t gs_GPUInfoStringSize = 256;
+static constexpr size_t gs_GpuInfoStringSize = 256;
 
 // graphics backend implemented with SDL and the graphics library @see EBackendType
 class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
@@ -211,7 +211,7 @@ class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
 	std::atomic<uint64_t> m_StreamMemoryUsage{0};
 	std::atomic<uint64_t> m_StagingMemoryUsage{0};
 
-	TTWGraphicsGPUList m_GPUList;
+	TTwGraphicsGpuList m_GpuList;
 
 	TGLBackendReadPresentedImageData m_ReadPresentedImageDataFunc;
 
@@ -219,9 +219,9 @@ class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
 
 	SBackendCapabilites m_Capabilites;
 
-	char m_aVendorString[gs_GPUInfoStringSize] = {};
-	char m_aVersionString[gs_GPUInfoStringSize] = {};
-	char m_aRendererString[gs_GPUInfoStringSize] = {};
+	char m_aVendorString[gs_GpuInfoStringSize] = {};
+	char m_aVersionString[gs_GpuInfoStringSize] = {};
+	char m_aRendererString[gs_GpuInfoStringSize] = {};
 
 	EBackendType m_BackendType = BACKEND_TYPE_AUTO;
 
@@ -240,17 +240,17 @@ class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
 	uint64_t StreamedMemoryUsage() const override;
 	uint64_t StagingMemoryUsage() const override;
 
-	const TTWGraphicsGPUList &GetGPUs() const override;
+	const TTwGraphicsGpuList &GetGpus() const override;
 
 	int GetNumScreens() const override { return m_NumScreens; }
 	const char *GetScreenName(int Screen) const override;
 
-	void GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID) override;
-	void GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID) override;
+	void GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenId) override;
+	void GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenId) override;
 
 	void Minimize() override;
 	void Maximize() override;
-	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless) override;
 	bool SetWindowScreen(int Index) override;
 	bool UpdateDisplayMode(int Index) override;
 	int GetWindowScreen() override;
@@ -261,8 +261,8 @@ class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
 	void GetViewportSize(int &w, int &h) override;
 	void NotifyWindow() override;
 
-	void WindowDestroyNtf(uint32_t WindowID) override;
-	void WindowCreateNtf(uint32_t WindowID) override;
+	void WindowDestroyNtf(uint32_t WindowId) override;
+	void WindowCreateNtf(uint32_t WindowId) override;
 
 	bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) override;
 	bool IsConfigModernAPI() override { return IsModernAPI(m_BackendType); }
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index ef40081005..731227b151 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1,10 +1,9 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
-#define _WIN32_WINNT 0x0501
-
 #include <base/hash.h>
 #include <base/hash_ctxt.h>
+#include <base/log.h>
 #include <base/logger.h>
 #include <base/math.h>
 #include <base/system.h>
@@ -38,12 +37,18 @@
 #include <engine/shared/network.h>
 #include <engine/shared/packer.h>
 #include <engine/shared/protocol.h>
+#include <engine/shared/protocol7.h>
 #include <engine/shared/protocol_ex.h>
 #include <engine/shared/rust_version.h>
 #include <engine/shared/snapshot.h>
 #include <engine/shared/uuid_manager.h>
 
 #include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
+
+#include <engine/shared/protocolglue.h>
+
 #include <game/localization.h>
 #include <game/version.h>
 
@@ -57,13 +62,17 @@
 #include "video.h"
 #endif
 
+#if defined(CONF_PLATFORM_ANDROID)
+#include <android/android_main.h>
+#endif
+
 #include "SDL.h"
 #ifdef main
 #undef main
 #endif
 
 #include <chrono>
-#include <climits>
+#include <limits>
 #include <new>
 #include <stack>
 #include <thread>
@@ -75,13 +84,15 @@ static const ColorRGBA gs_ClientNetworkPrintColor{0.7f, 1, 0.7f, 1.0f};
 static const ColorRGBA gs_ClientNetworkErrPrintColor{1.0f, 0.25f, 0.25f, 1.0f};
 
 CClient::CClient() :
-	m_DemoPlayer(&m_SnapshotDelta, true, [&]() { UpdateDemoIntraTimers(); })
+	m_DemoPlayer(&m_SnapshotDelta, true, [&]() { UpdateDemoIntraTimers(); }),
+	m_InputtimeMarginGraph(128),
+	m_GametimeMarginGraph(128),
+	m_FpsGraph(4096)
 {
 	m_StateStartTime = time_get();
 	for(auto &DemoRecorder : m_aDemoRecorder)
 		DemoRecorder = CDemoRecorder(&m_SnapshotDelta);
 	m_LastRenderTime = time_get();
-	IStorage::FormatTmpPath(m_aDDNetInfoTmp, sizeof(m_aDDNetInfoTmp), DDNET_INFO_FILE);
 	mem_zero(m_aInputs, sizeof(m_aInputs));
 	mem_zero(m_aapSnapshots, sizeof(m_aapSnapshots));
 	for(auto &SnapshotStorage : m_aSnapshotStorage)
@@ -92,20 +103,64 @@ CClient::CClient() :
 	for(auto &GameTime : m_aGameTime)
 		GameTime.Init(0);
 	m_PredictedTime.Init(0);
+
+	m_Sixup = false;
 }
 
 // ----- send functions -----
-static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer)
+static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer, bool Sixup)
 {
+	int MsgId = pMsg->m_MsgId;
 	Packer.Reset();
-	if(pMsg->m_MsgID < OFFSET_UUID)
+
+	if(Sixup && !pMsg->m_NoTranslate)
+	{
+		if(pMsg->m_System)
+		{
+			if(MsgId >= OFFSET_UUID)
+				;
+			else if(MsgId == NETMSG_INFO || MsgId == NETMSG_REQUEST_MAP_DATA)
+				;
+			else if(MsgId == NETMSG_READY)
+				MsgId = protocol7::NETMSG_READY;
+			else if(MsgId == NETMSG_RCON_CMD)
+				MsgId = protocol7::NETMSG_RCON_CMD;
+			else if(MsgId == NETMSG_ENTERGAME)
+				MsgId = protocol7::NETMSG_ENTERGAME;
+			else if(MsgId == NETMSG_INPUT)
+				MsgId = protocol7::NETMSG_INPUT;
+			else if(MsgId == NETMSG_RCON_AUTH)
+				MsgId = protocol7::NETMSG_RCON_AUTH;
+			else if(MsgId == NETMSGTYPE_CL_SETTEAM)
+				MsgId = protocol7::NETMSGTYPE_CL_SETTEAM;
+			else if(MsgId == NETMSGTYPE_CL_VOTE)
+				MsgId = protocol7::NETMSGTYPE_CL_VOTE;
+			else if(MsgId == NETMSG_PING)
+				MsgId = protocol7::NETMSG_PING;
+			else
+			{
+				dbg_msg("net", "0.7 DROP send sys %d", MsgId);
+				return true;
+			}
+		}
+		else
+		{
+			if(MsgId >= 0 && MsgId < OFFSET_UUID)
+				MsgId = Msg_SixToSeven(MsgId);
+
+			if(MsgId < 0)
+				return true;
+		}
+	}
+
+	if(pMsg->m_MsgId < OFFSET_UUID)
 	{
-		Packer.AddInt((pMsg->m_MsgID << 1) | (pMsg->m_System ? 1 : 0));
+		Packer.AddInt((MsgId << 1) | (pMsg->m_System ? 1 : 0));
 	}
 	else
 	{
 		Packer.AddInt(pMsg->m_System ? 1 : 0); // NETMSG_EX, NETMSGTYPE_EX
-		g_UuidManager.PackUuid(pMsg->m_MsgID, &Packer);
+		g_UuidManager.PackUuid(pMsg->m_MsgId, &Packer);
 	}
 	Packer.AddRaw(pMsg->Data(), pMsg->Size());
 
@@ -121,11 +176,11 @@ int CClient::SendMsg(int Conn, CMsgPacker *pMsg, int Flags)
 
 	// repack message (inefficient)
 	CPacker Pack;
-	if(RepackMsg(pMsg, Pack))
+	if(RepackMsg(pMsg, Pack, IsSixup()))
 		return 0;
 
 	mem_zero(&Packet, sizeof(CNetChunk));
-	Packet.m_ClientID = 0;
+	Packet.m_ClientId = 0;
 	Packet.m_pData = Pack.Data();
 	Packet.m_DataSize = Pack.Size();
 
@@ -154,30 +209,24 @@ int CClient::SendMsgActive(CMsgPacker *pMsg, int Flags)
 	return SendMsg(g_Config.m_ClDummy, pMsg, Flags);
 }
 
-void CClient::SendStA(bool Dummy)
-{
-	CMsgPacker Msg(NETMSG_IAMSTA, true);
-	Msg.AddInt(GAME_STA_VERSION);
-	Msg.AddString(
-		"StA " STA_VERSION
-		" (Teeworlds " GAME_VERSION
-		", DDNet " GAME_VERSION
-		", built on " STA_BUILD_DATE
-		")",
-		0);
-	Msg.AddInt(Dummy);
-	SendMsg(Dummy, &Msg, MSGFLAG_VITAL);
-}
-
 void CClient::SendInfo(int Conn)
 {
-	SendStA(false);
 	CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
-	MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
+	MsgVer.AddRaw(&m_ConnectionId, sizeof(m_ConnectionId));
 	MsgVer.AddInt(GameClient()->DDNetVersion());
 	MsgVer.AddString(GameClient()->DDNetVersionStr());
 	SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
 
+	if(IsSixup())
+	{
+		CMsgPacker Msg(NETMSG_INFO, true);
+		Msg.AddString(GAME_NETVERSION7, 128);
+		Msg.AddString(Config()->m_Password);
+		Msg.AddInt(GameClient()->ClientVersion7());
+		SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+		return;
+	}
+
 	CMsgPacker Msg(NETMSG_INFO, true);
 	Msg.AddString(GameClient()->NetVersion());
 	Msg.AddString(m_aPassword);
@@ -198,15 +247,19 @@ void CClient::SendReady(int Conn)
 
 void CClient::SendMapRequest()
 {
-	if(m_MapdownloadFileTemp)
+	dbg_assert(!m_MapdownloadFileTemp, "Map download already in progress");
+	m_MapdownloadFileTemp = Storage()->OpenFile(m_aMapdownloadFilenameTemp, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(IsSixup())
 	{
-		io_close(m_MapdownloadFileTemp);
-		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+		CMsgPacker MsgP(protocol7::NETMSG_REQUEST_MAP_DATA, true, true);
+		SendMsg(CONN_MAIN, &MsgP, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+	}
+	else
+	{
+		CMsgPacker Msg(NETMSG_REQUEST_MAP_DATA, true);
+		Msg.AddInt(m_MapdownloadChunk);
+		SendMsg(CONN_MAIN, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
 	}
-	m_MapdownloadFileTemp = Storage()->OpenFile(m_aMapdownloadFilenameTemp, IOFLAG_WRITE, IStorage::TYPE_SAVE);
-	CMsgPacker Msg(NETMSG_REQUEST_MAP_DATA, true);
-	Msg.AddInt(m_MapdownloadChunk);
-	SendMsg(CONN_MAIN, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
 }
 
 void CClient::RconAuth(const char *pName, const char *pPassword)
@@ -219,6 +272,14 @@ void CClient::RconAuth(const char *pName, const char *pPassword)
 	if(pPassword != m_aRconPassword)
 		str_copy(m_aRconPassword, pPassword);
 
+	if(IsSixup())
+	{
+		CMsgPacker Msg7(protocol7::NETMSG_RCON_AUTH, true, true);
+		Msg7.AddString(pPassword);
+		SendMsgActive(&Msg7, MSGFLAG_VITAL);
+		return;
+	}
+
 	CMsgPacker Msg(NETMSG_RCON_AUTH, true);
 	Msg.AddString(pName);
 	Msg.AddString(pPassword);
@@ -233,22 +294,19 @@ void CClient::Rcon(const char *pCmd)
 	SendMsgActive(&Msg, MSGFLAG_VITAL);
 }
 
-bool CClient::ConnectionProblems() const
+float CClient::GotRconCommandsPercentage() const
 {
-	return m_aNetClient[g_Config.m_ClDummy].GotProblems(MaxLatencyTicks() * time_freq() / GameTickSpeed()) != 0;
+	if(m_ExpectedRconCommands < 1)
+		return -1.0f;
+	if(m_GotRconCommands > m_ExpectedRconCommands)
+		return -1.0f;
+
+	return (float)m_GotRconCommands / (float)m_ExpectedRconCommands;
 }
 
-void CClient::DirectInput(int *pInput, int Size)
+bool CClient::ConnectionProblems() const
 {
-	CMsgPacker Msg(NETMSG_INPUT, true);
-	Msg.AddInt(m_aAckGameTick[g_Config.m_ClDummy]);
-	Msg.AddInt(m_aPredTick[g_Config.m_ClDummy]);
-	Msg.AddInt(Size);
-
-	for(int i = 0; i < Size / 4; i++)
-		Msg.AddInt(pInput[i]);
-
-	SendMsgActive(&Msg, 0);
+	return m_aNetClient[g_Config.m_ClDummy].GotProblems(MaxLatencyTicks() * time_freq() / GameTickSpeed()) != 0;
 }
 
 void CClient::SendInput()
@@ -262,7 +320,7 @@ void CClient::SendInput()
 	// fetch input
 	for(int Dummy = 0; Dummy < NUM_DUMMIES; Dummy++)
 	{
-		if(!m_DummyConnected && Dummy != 0)
+		if(!DummyConnected() && Dummy != 0)
 		{
 			break;
 		}
@@ -284,7 +342,18 @@ void CClient::SendInput()
 
 			// pack it
 			for(int k = 0; k < Size / 4; k++)
-				Msg.AddInt(m_aInputs[i][m_aCurrentInput[i]].m_aData[k]);
+			{
+				static const int FlagsOffset = offsetof(CNetObj_PlayerInput, m_PlayerFlags) / sizeof(int);
+				if(k == FlagsOffset && IsSixup())
+				{
+					int PlayerFlags = m_aInputs[i][m_aCurrentInput[i]].m_aData[k];
+					Msg.AddInt(PlayerFlags_SixToSeven(PlayerFlags));
+				}
+				else
+				{
+					Msg.AddInt(m_aInputs[i][m_aCurrentInput[i]].m_aData[k]);
+				}
+			}
 
 			m_aCurrentInput[i]++;
 			m_aCurrentInput[i] %= 200;
@@ -311,7 +380,7 @@ int *CClient::GetInput(int Tick, int IsDummy) const
 	const int d = IsDummy ^ g_Config.m_ClDummy;
 	for(int i = 0; i < 200; i++)
 	{
-		if(m_aInputs[d][i].m_Tick <= Tick && (Best == -1 || m_aInputs[d][Best].m_Tick < m_aInputs[d][i].m_Tick))
+		if(m_aInputs[d][i].m_Tick != -1 && m_aInputs[d][i].m_Tick <= Tick && (Best == -1 || m_aInputs[d][Best].m_Tick < m_aInputs[d][i].m_Tick))
 			Best = i;
 	}
 
@@ -321,44 +390,44 @@ int *CClient::GetInput(int Tick, int IsDummy) const
 }
 
 // ------ state handling -----
-void CClient::SetState(EClientState s)
+void CClient::SetState(EClientState State)
 {
 	if(m_State == IClient::STATE_QUITTING || m_State == IClient::STATE_RESTARTING)
 		return;
+	if(m_State == State)
+		return;
 
-	int Old = m_State;
 	if(g_Config.m_Debug)
 	{
-		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "state change. last=%d current=%d", m_State, s);
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "state change. last=%d current=%d", m_State, State);
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", aBuf);
 	}
-	m_State = s;
-	if(Old != s)
-	{
-		m_StateStartTime = time_get();
-		GameClient()->OnStateChange(m_State, Old);
 
-		if(s == IClient::STATE_OFFLINE && m_ReconnectTime == 0)
-		{
-			if(g_Config.m_ClReconnectFull > 0 && (str_find_nocase(ErrorString(), "full") || str_find_nocase(ErrorString(), "reserved")))
-				m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectFull;
-			else if(g_Config.m_ClReconnectTimeout > 0 && (str_find_nocase(ErrorString(), "Timeout") || str_find_nocase(ErrorString(), "Too weak connection")))
-				m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectTimeout;
-		}
+	const EClientState OldState = m_State;
+	m_State = State;
 
-		if(s == IClient::STATE_ONLINE)
-		{
-			const bool AnnounceAddr = m_ServerBrowser.IsRegistered(ServerAddress());
-			Discord()->Start();
-			Discord()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr, "Playing", "greenline", "");
-			Steam()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr);
-		}
-		else if(Old == IClient::STATE_ONLINE)
-		{
-			Discord()->ClearGameInfo();
-			Steam()->ClearGameInfo();
-		}
+	m_StateStartTime = time_get();
+	GameClient()->OnStateChange(m_State, OldState);
+
+	if(State == IClient::STATE_OFFLINE && m_ReconnectTime == 0)
+	{
+		if(g_Config.m_ClReconnectFull > 0 && (str_find_nocase(ErrorString(), "full") || str_find_nocase(ErrorString(), "reserved")))
+			m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectFull;
+		else if(g_Config.m_ClReconnectTimeout > 0 && (str_find_nocase(ErrorString(), "Timeout") || str_find_nocase(ErrorString(), "Too weak connection")))
+			m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectTimeout;
+	}
+
+	if(State == IClient::STATE_ONLINE)
+	{
+		const bool AnnounceAddr = m_ServerBrowser.IsRegistered(ServerAddress());
+		Discord()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr);
+		Steam()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr);
+	}
+	else if(OldState == IClient::STATE_ONLINE)
+	{
+		Discord()->ClearGameInfo();
+		Steam()->ClearGameInfo();
 	}
 }
 
@@ -373,22 +442,32 @@ void CClient::OnEnterGame(bool Dummy)
 	m_aCurrentInput[Dummy] = 0;
 
 	// reset snapshots
-	m_aapSnapshots[Dummy][SNAP_CURRENT] = 0;
-	m_aapSnapshots[Dummy][SNAP_PREV] = 0;
+	m_aapSnapshots[Dummy][SNAP_CURRENT] = nullptr;
+	m_aapSnapshots[Dummy][SNAP_PREV] = nullptr;
 	m_aSnapshotStorage[Dummy].PurgeAll();
-	// Also make gameclient aware that snapshots have been purged
-	GameClient()->InvalidateSnapshot();
 	m_aReceivedSnapshots[Dummy] = 0;
 	m_aSnapshotParts[Dummy] = 0;
-	m_aPredTick[Dummy] = 0;
+	m_aSnapshotIncomingDataSize[Dummy] = 0;
+	m_SnapCrcErrors = 0;
+	// Also make gameclient aware that snapshots have been purged
+	GameClient()->InvalidateSnapshot();
+
+	// reset times
 	m_aAckGameTick[Dummy] = -1;
 	m_aCurrentRecvTick[Dummy] = 0;
-	m_aCurGameTick[Dummy] = 0;
 	m_aPrevGameTick[Dummy] = 0;
+	m_aCurGameTick[Dummy] = 0;
+	m_aGameIntraTick[Dummy] = 0.0f;
+	m_aGameTickTime[Dummy] = 0.0f;
+	m_aGameIntraTickSincePrev[Dummy] = 0.0f;
+	m_aPredTick[Dummy] = 0;
+	m_aPredIntraTick[Dummy] = 0.0f;
+	m_aGameTime[Dummy].Init(0);
+	m_PredictedTime.Init(0);
 
-	if(Dummy == 0)
+	if(!Dummy)
 	{
-		m_LastDummyConnectTime = 0;
+		m_LastDummyConnectTime = 0.0f;
 	}
 
 	GameClient()->OnEnterGame();
@@ -455,28 +534,31 @@ void CClient::GenerateTimeoutCodes(const NETADDR *pAddrs, int NumAddrs)
 
 void CClient::Connect(const char *pAddress, const char *pPassword)
 {
+	// Disconnect will not change the state if we are already quitting/restarting
+	if(m_State == IClient::STATE_QUITTING || m_State == IClient::STATE_RESTARTING)
+		return;
 	Disconnect();
+	dbg_assert(m_State == IClient::STATE_OFFLINE, "Disconnect must ensure that client is offline");
 
-	m_ConnectionID = RandomUuid();
 	if(pAddress != m_aConnectAddressStr)
 		str_copy(m_aConnectAddressStr, pAddress);
 
 	char aMsg[512];
-	str_format(aMsg, sizeof(aMsg), "Joining... '%s'", m_aConnectAddressStr);
+	str_format(aMsg, sizeof(aMsg), "connecting to '%s'", m_aConnectAddressStr);
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aMsg, gs_ClientNetworkPrintColor);
 
-	ServerInfoRequest();
-
 	int NumConnectAddrs = 0;
 	NETADDR aConnectAddrs[MAX_SERVER_ADDRESSES];
 	mem_zero(aConnectAddrs, sizeof(aConnectAddrs));
 	const char *pNextAddr = pAddress;
 	char aBuffer[128];
+	bool OnlySixup = true;
 	while((pNextAddr = str_next_token(pNextAddr, ",", aBuffer, sizeof(aBuffer))))
 	{
 		NETADDR NextAddr;
 		char aHost[128];
 		int url = net_addr_from_url(&NextAddr, aBuffer, aHost, sizeof(aHost));
+		bool Sixup = NextAddr.type & NETTYPE_TW7;
 		if(url > 0)
 			str_copy(aHost, aBuffer);
 
@@ -495,6 +577,10 @@ void CClient::Connect(const char *pAddress, const char *pPassword)
 			NextAddr.port = 8303;
 		}
 		char aNextAddr[NETADDR_MAXSTRSIZE];
+		if(Sixup)
+			NextAddr.type |= NETTYPE_TW7;
+		else
+			OnlySixup = false;
 		net_addr_str(&NextAddr, aNextAddr, sizeof(aNextAddr), true);
 		log_debug("client", "resolved connect address '%s' to %s", aBuffer, aNextAddr);
 		aConnectAddrs[NumConnectAddrs] = NextAddr;
@@ -503,11 +589,18 @@ void CClient::Connect(const char *pAddress, const char *pPassword)
 
 	if(NumConnectAddrs == 0)
 	{
-		log_error("client", "could not find any connect address, defaulting to localhost for whatever reason...");
-		net_host_lookup("localhost", &aConnectAddrs[0], m_aNetClient[CONN_MAIN].NetType());
-		NumConnectAddrs = 1;
+		log_error("client", "could not find any connect address");
+		char aWarning[256];
+		str_format(aWarning, sizeof(aWarning), Localize("Could not resolve connect address '%s'. See local console for details."), m_aConnectAddressStr);
+		SWarning Warning(Localize("Connect address error"), aWarning);
+		Warning.m_AutoHide = false;
+		AddWarning(Warning);
+		return;
 	}
 
+	m_ConnectionId = RandomUuid();
+	ServerInfoRequest();
+
 	if(m_SendPassword)
 	{
 		str_copy(m_aPassword, g_Config.m_Password);
@@ -519,20 +612,18 @@ void CClient::Connect(const char *pAddress, const char *pPassword)
 		str_copy(m_aPassword, pPassword);
 
 	m_CanReceiveServerCapabilities = true;
-	// Deregister Rcon commands from last connected server, might not have called
-	// DisconnectWithReason if the server was shut down
-	m_aRconAuthed[0] = 0;
-	m_UseTempRconCommands = 0;
-	m_pConsole->DeregisterTempAll();
 
-	m_aNetClient[CONN_MAIN].Connect(aConnectAddrs, NumConnectAddrs);
+	m_Sixup = OnlySixup;
+	if(m_Sixup)
+	{
+		m_aNetClient[CONN_MAIN].Connect7(aConnectAddrs, NumConnectAddrs);
+	}
+	else
+		m_aNetClient[CONN_MAIN].Connect(aConnectAddrs, NumConnectAddrs);
+
 	m_aNetClient[CONN_MAIN].RefreshStun();
 	SetState(IClient::STATE_CONNECTING);
 
-	for(int i = 0; i < RECORDER_MAX; i++)
-		if(m_aDemoRecorder[i].IsRecording())
-			DemoRecorder_Stop(i);
-
 	m_InputtimeMarginGraph.Init(-150.0f, 150.0f);
 	m_GametimeMarginGraph.Init(-150.0f, 150.0f);
 
@@ -551,16 +642,21 @@ void CClient::DisconnectWithReason(const char *pReason)
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkPrintColor);
 
 	// stop demo playback and recorder
+	// make sure to remove replay tmp demo
 	m_DemoPlayer.Stop();
-	for(int i = 0; i < RECORDER_MAX; i++)
-		DemoRecorder_Stop(i);
+	for(int Recorder = 0; Recorder < RECORDER_MAX; Recorder++)
+	{
+		DemoRecorder(Recorder)->Stop(Recorder == RECORDER_REPLAYS ? IDemoRecorder::EStopMode::REMOVE_FILE : IDemoRecorder::EStopMode::KEEP_FILE);
+	}
 
-	//
 	m_aRconAuthed[0] = 0;
 	mem_zero(m_aRconUsername, sizeof(m_aRconUsername));
 	mem_zero(m_aRconPassword, sizeof(m_aRconPassword));
+	m_MapDetailsPresent = false;
 	m_ServerSentCapabilities = false;
 	m_UseTempRconCommands = 0;
+	m_ExpectedRconCommands = -1;
+	m_GotRconCommands = 0;
 	m_pConsole->DeregisterTempAll();
 	m_aNetClient[CONN_MAIN].Disconnect(pReason);
 	SetState(IClient::STATE_OFFLINE);
@@ -572,22 +668,7 @@ void CClient::DisconnectWithReason(const char *pReason)
 	m_CurrentServerCurrentPingTime = -1;
 	m_CurrentServerNextPingTime = -1;
 
-	// disable all downloads
-	m_MapdownloadChunk = 0;
-	if(m_pMapdownloadTask)
-		m_pMapdownloadTask->Abort();
-	if(m_MapdownloadFileTemp)
-	{
-		io_close(m_MapdownloadFileTemp);
-		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
-	}
-	m_MapdownloadFileTemp = 0;
-	m_MapdownloadSha256Present = false;
-	m_MapdownloadSha256 = SHA256_ZEROED;
-	m_MapdownloadCrc = 0;
-	m_MapdownloadTotalsize = -1;
-	m_MapdownloadAmount = 0;
-	m_MapDetailsPresent = false;
+	ResetMapDownload(true);
 
 	// clear the current server info
 	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
@@ -596,60 +677,77 @@ void CClient::DisconnectWithReason(const char *pReason)
 	m_aapSnapshots[0][SNAP_CURRENT] = 0;
 	m_aapSnapshots[0][SNAP_PREV] = 0;
 	m_aReceivedSnapshots[0] = 0;
+	m_LastDummy = false;
+
+	// 0.7
+	m_TranslationContext.Reset();
+	m_Sixup = false;
 }
 
 void CClient::Disconnect()
 {
-	m_ButtonRender = false;
 	if(m_State != IClient::STATE_OFFLINE)
-		DisconnectWithReason(0);
-
-	// make sure to remove replay tmp demo
-	if(g_Config.m_ClReplays)
 	{
-		DemoRecorder_Stop(RECORDER_REPLAYS, true);
+		DisconnectWithReason(nullptr);
 	}
 }
 
-bool CClient::DummyConnected()
+bool CClient::DummyConnected() const
 {
 	return m_DummyConnected;
 }
 
-bool CClient::DummyConnecting()
+bool CClient::DummyConnecting() const
 {
-	return !m_DummyConnected && m_LastDummyConnectTime > 0 && m_LastDummyConnectTime + GameTickSpeed() * 5 > GameTick(g_Config.m_ClDummy);
+	return m_DummyConnecting;
 }
 
-void CClient::DummyConnect()
+bool CClient::DummyConnectingDelayed() const
 {
-	if(m_LastDummyConnectTime > 0 && m_LastDummyConnectTime + GameTickSpeed() * 5 > GameTick(g_Config.m_ClDummy))
-		return;
+	return !DummyConnected() && !DummyConnecting() && m_LastDummyConnectTime > 0.0f && m_LastDummyConnectTime + 5.0f > GlobalTime();
+}
 
+void CClient::DummyConnect()
+{
 	if(m_aNetClient[CONN_MAIN].State() != NETSTATE_ONLINE)
+	{
+		log_info("client", "Not online.");
 		return;
+	}
 
-	if(m_DummyConnected || !DummyAllowed())
+	if(!DummyAllowed())
+	{
+		log_info("client", "Dummy is not allowed on this server.");
 		return;
+	}
+	if(DummyConnected() || DummyConnecting())
+	{
+		log_info("client", "Dummy is already connected/connecting.");
+		return;
+	}
+	if(DummyConnectingDelayed())
+	{
+		log_info("client", "Wait before connecting dummy again.");
+		return;
+	}
 
-	m_LastDummyConnectTime = GameTick(g_Config.m_ClDummy);
-
+	m_LastDummyConnectTime = GlobalTime();
 	m_aRconAuthed[1] = 0;
-
 	m_DummySendConnInfo = true;
 
 	g_Config.m_ClDummyCopyMoves = 0;
 	g_Config.m_ClDummyHammer = 0;
 
+	m_DummyConnecting = true;
 	// connect to the server
-	m_aNetClient[CONN_DUMMY].Connect(m_aNetClient[CONN_MAIN].ServerAddress(), 1);
+	if(IsSixup())
+		m_aNetClient[CONN_DUMMY].Connect7(m_aNetClient[CONN_MAIN].ServerAddress(), 1);
+	else
+		m_aNetClient[CONN_DUMMY].Connect(m_aNetClient[CONN_MAIN].ServerAddress(), 1);
 }
 
 void CClient::DummyDisconnect(const char *pReason)
 {
-	if(!m_DummyConnected)
-		return;
-
 	m_aNetClient[CONN_DUMMY].Disconnect(pReason);
 	g_Config.m_ClDummy = 0;
 
@@ -663,10 +761,13 @@ void CClient::DummyDisconnect(const char *pReason)
 	m_aapSnapshots[1][SNAP_PREV] = 0;
 	m_aReceivedSnapshots[1] = 0;
 	m_DummyConnected = false;
+	m_DummyConnecting = false;
+	m_DummyReconnectOnReload = false;
+	m_DummyDeactivateOnReconnect = false;
 	GameClient()->OnDummyDisconnect();
 }
 
-bool CClient::DummyAllowed()
+bool CClient::DummyAllowed() const
 {
 	return m_ServerCapabilities.m_AllowDummy;
 }
@@ -681,9 +782,6 @@ int CClient::GetCurrentRaceTime()
 void CClient::GetServerInfo(CServerInfo *pServerInfo) const
 {
 	mem_copy(pServerInfo, &m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
-
-	if(m_DemoPlayer.IsPlaying() && g_Config.m_ClDemoAssumeRace)
-		str_copy(pServerInfo->m_aGameType, "DDraceNetwork");
 }
 
 void CClient::ServerInfoRequest()
@@ -699,37 +797,33 @@ void CClient::LoadDebugFont()
 
 // ---
 
-void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const
+IClient::CSnapItem CClient::SnapGetItem(int SnapId, int Index) const
 {
-	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
-	const CSnapshot *pSnapshot = m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap;
+	dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId");
+	const CSnapshot *pSnapshot = m_aapSnapshots[g_Config.m_ClDummy][SnapId]->m_pAltSnap;
 	const CSnapshotItem *pSnapshotItem = pSnapshot->GetItem(Index);
-	pItem->m_DataSize = pSnapshot->GetItemSize(Index);
-	pItem->m_Type = pSnapshot->GetItemType(Index);
-	pItem->m_ID = pSnapshotItem->ID();
-	return (void *)pSnapshotItem->Data();
+	CSnapItem Item;
+	Item.m_Type = pSnapshot->GetItemType(Index);
+	Item.m_Id = pSnapshotItem->Id();
+	Item.m_pData = pSnapshotItem->Data();
+	Item.m_DataSize = pSnapshot->GetItemSize(Index);
+	return Item;
 }
 
-int CClient::SnapItemSize(int SnapID, int Index) const
+const void *CClient::SnapFindItem(int SnapId, int Type, int Id) const
 {
-	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
-	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->GetItemSize(Index);
-}
-
-const void *CClient::SnapFindItem(int SnapID, int Type, int ID) const
-{
-	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapID])
+	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapId])
 		return nullptr;
 
-	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->FindItem(Type, ID);
+	return m_aapSnapshots[g_Config.m_ClDummy][SnapId]->m_pAltSnap->FindItem(Type, Id);
 }
 
-int CClient::SnapNumItems(int SnapID) const
+int CClient::SnapNumItems(int SnapId) const
 {
-	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
-	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapID])
+	dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId");
+	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapId])
 		return 0;
-	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->NumItems();
+	return m_aapSnapshots[g_Config.m_ClDummy][SnapId]->m_pAltSnap->NumItems();
 }
 
 void CClient::SnapSetStaticsize(int ItemType, int Size)
@@ -737,6 +831,11 @@ void CClient::SnapSetStaticsize(int ItemType, int Size)
 	m_SnapshotDelta.SetStaticsize(ItemType, Size);
 }
 
+void CClient::SnapSetStaticsize7(int ItemType, int Size)
+{
+	m_SnapshotDelta.SetStaticsize7(ItemType, Size);
+}
+
 void CClient::DebugRender()
 {
 	if(!g_Config.m_Debug)
@@ -765,7 +864,7 @@ void CClient::DebugRender()
 		total = 42
 	*/
 	s_FrameTimeAvg = s_FrameTimeAvg * 0.9f + m_RenderFrameTime * 0.1f;
-	str_format(aBuffer, sizeof(aBuffer), "ticks: %8d %8d gfx mem(tex/buff/stream/staging): (%" PRIu64 "k/%" PRIu64 "k/%" PRIu64 "k/%" PRIu64 "k) fps: %3d",
+	str_format(aBuffer, sizeof(aBuffer), "ticks: %8d %8d gfx mem(tex/buff/stream/staging): (%" PRIu64 " KiB/%" PRIu64 " KiB/%" PRIu64 " KiB/%" PRIu64 " KiB) fps: %3d",
 		m_aCurGameTick[g_Config.m_ClDummy], m_aPredTick[g_Config.m_ClDummy],
 		(Graphics()->TextureMemoryUsage() / 1024),
 		(Graphics()->BufferMemoryUsage() / 1024),
@@ -786,7 +885,7 @@ void CClient::DebugRender()
 			SendPackets++;
 		if(!RecvPackets)
 			RecvPackets++;
-		str_format(aBuffer, sizeof(aBuffer), "send: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " kbps) avg: %5" PRIu64 "\nrecv: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " kbps) avg: %5" PRIu64,
+		str_format(aBuffer, sizeof(aBuffer), "send: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " Kibit/s) avg: %5" PRIu64 "\nrecv: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " Kibit/s) avg: %5" PRIu64,
 			SendPackets, SendBytes, SendPackets * 42, SendTotal, (SendTotal * 8) / 1024, SendBytes / SendPackets,
 			RecvPackets, RecvBytes, RecvPackets * 42, RecvTotal, (RecvTotal * 8) / 1024, RecvBytes / RecvPackets);
 		Graphics()->QuadsText(2, 14, 16, aBuffer);
@@ -843,11 +942,11 @@ void CClient::DebugRender()
 		float sp = Graphics()->ScreenWidth() / 100.0f;
 		float x = Graphics()->ScreenWidth() - w - sp;
 
-		m_FpsGraph.Scale();
+		m_FpsGraph.Scale(time_freq());
 		m_FpsGraph.Render(Graphics(), TextRender(), x, sp * 5, w, h, "FPS");
-		m_InputtimeMarginGraph.Scale();
+		m_InputtimeMarginGraph.Scale(5 * time_freq());
 		m_InputtimeMarginGraph.Render(Graphics(), TextRender(), x, sp * 6 + h, w, h, "Prediction Margin");
-		m_GametimeMarginGraph.Scale();
+		m_GametimeMarginGraph.Scale(5 * time_freq());
 		m_GametimeMarginGraph.Render(Graphics(), TextRender(), x, sp * 7 + h * 2, w, h, "Gametime Margin");
 	}
 }
@@ -875,7 +974,7 @@ const char *CClient::PlayerName() const
 	return "nameless tee";
 }
 
-const char *CClient::DummyName() const
+const char *CClient::DummyName()
 {
 	if(g_Config.m_ClDummyName[0])
 	{
@@ -892,9 +991,8 @@ const char *CClient::DummyName() const
 	}
 	if(pBase)
 	{
-		static char aDummyNameBuf[16];
-		str_format(aDummyNameBuf, sizeof(aDummyNameBuf), "[D] %s", pBase);
-		return aDummyNameBuf;
+		str_format(m_aAutomaticDummyName, sizeof(m_aAutomaticDummyName), "[D] %s", pBase);
+		return m_aAutomaticDummyName;
 	}
 	return "brainless tee";
 }
@@ -933,9 +1031,8 @@ const char *CClient::LoadMap(const char *pName, const char *pFilename, SHA256_DI
 
 	SetState(IClient::STATE_LOADING);
 	SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_LOADING_MAP);
-
-	if((bool)m_MapLoadingCBFunc)
-		m_MapLoadingCBFunc();
+	if((bool)m_LoadingCallback)
+		m_LoadingCallback(IClient::LOADING_CALLBACK_DETAIL_MAP);
 
 	if(!m_pMap->Load(pFilename))
 	{
@@ -965,13 +1062,14 @@ const char *CClient::LoadMap(const char *pName, const char *pFilename, SHA256_DI
 	}
 
 	// stop demo recording if we loaded a new map
-	for(int i = 0; i < RECORDER_MAX; i++)
-		DemoRecorder_Stop(i, i == RECORDER_REPLAYS);
+	for(int Recorder = 0; Recorder < RECORDER_MAX; Recorder++)
+	{
+		DemoRecorder(Recorder)->Stop(Recorder == RECORDER_REPLAYS ? IDemoRecorder::EStopMode::REMOVE_FILE : IDemoRecorder::EStopMode::KEEP_FILE);
+	}
 
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "loaded map '%s'", pFilename);
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
-	m_aReceivedSnapshots[g_Config.m_ClDummy] = 0;
 
 	str_copy(m_aCurrentMap, pName);
 	str_copy(m_aCurrentMapPath, pFilename);
@@ -1016,8 +1114,6 @@ const char *CClient::LoadMapSearch(const char *pMapName, SHA256_DIGEST *pWantedS
 	}
 	str_format(aBuf, sizeof(aBuf), "loading map, map=%s wanted %scrc=%08x", pMapName, aWanted, WantedCrc);
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
-	SetState(IClient::STATE_LOADING);
-	SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_LOADING_MAP);
 
 	// try the normal maps folder
 	str_format(aBuf, sizeof(aBuf), "maps/%s.map", pMapName);
@@ -1280,7 +1376,7 @@ void CClient::ProcessServerInfo(int RawType, NETADDR *pFrom, const void *pData,
 #undef GET_INT
 }
 
-static CServerCapabilities GetServerCapabilities(int Version, int Flags)
+static CServerCapabilities GetServerCapabilities(int Version, int Flags, bool Sixup)
 {
 	CServerCapabilities Result;
 	bool DDNet = false;
@@ -1289,7 +1385,7 @@ static CServerCapabilities GetServerCapabilities(int Version, int Flags)
 		DDNet = Flags & SERVERCAPFLAG_DDNET;
 	}
 	Result.m_ChatTimeoutCode = DDNet;
-	Result.m_AnyPlayerFlag = DDNet;
+	Result.m_AnyPlayerFlag = !Sixup;
 	Result.m_PingEx = false;
 	Result.m_AllowDummy = true;
 	Result.m_SyncWeaponInput = false;
@@ -1327,7 +1423,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 	bool Sys;
 	CUuid Uuid;
 
-	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	int Result = UnpackMessageId(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
 	if(Result == UNPACKMESSAGE_ERROR)
 	{
 		return;
@@ -1337,6 +1433,20 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 		SendMsg(Conn, &Packer, MSGFLAG_VITAL);
 	}
 
+	// allocates the memory for the translated data
+	CPacker Packer6;
+	if(IsSixup())
+	{
+		bool IsExMsg = false;
+		int Success = !TranslateSysMsg(&Msg, Sys, &Unpacker, &Packer6, pPacket, &IsExMsg);
+		if(Msg < 0)
+			return;
+		if(Success && !IsExMsg)
+		{
+			Unpacker.Reset(Packer6.Data(), Packer6.Size());
+		}
+	}
+
 	if(Sys)
 	{
 		// system message
@@ -1376,7 +1486,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			{
 				return;
 			}
-			m_ServerCapabilities = GetServerCapabilities(Version, Flags);
+			m_ServerCapabilities = GetServerCapabilities(Version, Flags, IsSixup());
 			m_CanReceiveServerCapabilities = false;
 			m_ServerSentCapabilities = true;
 		}
@@ -1384,7 +1494,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 		{
 			if(m_CanReceiveServerCapabilities)
 			{
-				m_ServerCapabilities = GetServerCapabilities(0, 0);
+				m_ServerCapabilities = GetServerCapabilities(0, 0, IsSixup());
 				m_CanReceiveServerCapabilities = false;
 			}
 			bool MapDetailsWerePresent = m_MapDetailsPresent;
@@ -1393,24 +1503,32 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			const char *pMap = Unpacker.GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES);
 			int MapCrc = Unpacker.GetInt();
 			int MapSize = Unpacker.GetInt();
-			if(Unpacker.Error() || MapSize < 0)
+			if(Unpacker.Error())
 			{
 				return;
 			}
+			if(MapSize < 0 || MapSize > 1024 * 1024 * 1024) // 1 GiB
+			{
+				DisconnectWithReason("invalid map size");
+				return;
+			}
 
 			for(int i = 0; pMap[i]; i++) // protect the player from nasty map names
 			{
 				if(pMap[i] == '/' || pMap[i] == '\\')
 				{
+					DisconnectWithReason("strange character in map name");
 					return;
 				}
 			}
 
-			if(m_DummyConnected)
+			if(m_DummyConnected && !m_DummyReconnectOnReload)
 			{
 				DummyDisconnect(0);
 			}
 
+			ResetMapDownload(true);
+
 			SHA256_DIGEST *pMapSha256 = nullptr;
 			const char *pMapUrl = nullptr;
 			if(MapDetailsWerePresent && str_comp(m_aMapDetailsName, pMap) == 0 && m_MapDetailsCrc == MapCrc)
@@ -1427,12 +1545,6 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			}
 			else
 			{
-				if(m_MapdownloadFileTemp)
-				{
-					io_close(m_MapdownloadFileTemp);
-					Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
-				}
-
 				// start map download
 				FormatMapDownloadFilename(pMap, pMapSha256, MapCrc, false, m_aMapdownloadFilename, sizeof(m_aMapdownloadFilename));
 				FormatMapDownloadFilename(pMap, pMapSha256, MapCrc, true, m_aMapdownloadFilenameTemp, sizeof(m_aMapdownloadFilenameTemp));
@@ -1441,16 +1553,11 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				str_format(aBuf, sizeof(aBuf), "starting to download map to '%s'", m_aMapdownloadFilenameTemp);
 				m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", aBuf);
 
-				m_MapdownloadChunk = 0;
 				str_copy(m_aMapdownloadName, pMap);
-
 				m_MapdownloadSha256Present = (bool)pMapSha256;
 				m_MapdownloadSha256 = pMapSha256 ? *pMapSha256 : SHA256_ZEROED;
 				m_MapdownloadCrc = MapCrc;
 				m_MapdownloadTotalsize = MapSize;
-				m_MapdownloadAmount = 0;
-
-				ResetMapDownload();
 
 				if(pMapSha256)
 				{
@@ -1462,9 +1569,9 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 					m_pMapdownloadTask = HttpGetFile(pMapUrl ? pMapUrl : aUrl, Storage(), m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
 					m_pMapdownloadTask->Timeout(CTimeout{g_Config.m_ClMapDownloadConnectTimeoutMs, 0, g_Config.m_ClMapDownloadLowSpeedLimit, g_Config.m_ClMapDownloadLowSpeedTime});
-					m_pMapdownloadTask->MaxResponseSize(1024 * 1024 * 1024); // 1 GiB
+					m_pMapdownloadTask->MaxResponseSize(MapSize);
 					m_pMapdownloadTask->ExpectSha256(*pMapSha256);
-					Engine()->AddJob(m_pMapdownloadTask);
+					Http()->Run(m_pMapdownloadTask);
 				}
 				else
 				{
@@ -1474,12 +1581,31 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 		}
 		else if(Conn == CONN_MAIN && Msg == NETMSG_MAP_DATA)
 		{
-			int Last = Unpacker.GetInt();
-			int MapCRC = Unpacker.GetInt();
-			int Chunk = Unpacker.GetInt();
-			int Size = Unpacker.GetInt();
+			if(!m_MapdownloadFileTemp)
+			{
+				return;
+			}
+			int Last = -1;
+			int MapCRC = -1;
+			int Chunk = -1;
+			int Size = -1;
+
+			if(IsSixup())
+			{
+				MapCRC = m_MapdownloadCrc;
+				Chunk = m_MapdownloadChunk;
+				Size = minimum(m_TranslationContext.m_MapDownloadChunkSize, m_TranslationContext.m_MapdownloadTotalsize - m_MapdownloadAmount);
+			}
+			else
+			{
+				Last = Unpacker.GetInt();
+				MapCRC = Unpacker.GetInt();
+				Chunk = Unpacker.GetInt();
+				Size = Unpacker.GetInt();
+			}
+
 			const unsigned char *pData = Unpacker.GetRaw(Size);
-			if(Unpacker.Error() || Size <= 0 || MapCRC != m_MapdownloadCrc || Chunk != m_MapdownloadChunk || !m_MapdownloadFileTemp)
+			if(Unpacker.Error() || Size <= 0 || MapCRC != m_MapdownloadCrc || Chunk != m_MapdownloadChunk)
 			{
 				return;
 			}
@@ -1488,6 +1614,9 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 			m_MapdownloadAmount += Size;
 
+			if(IsSixup())
+				Last = m_MapdownloadAmount == m_TranslationContext.m_MapdownloadTotalsize;
+
 			if(Last)
 			{
 				if(m_MapdownloadFileTemp)
@@ -1502,9 +1631,17 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				// request new chunk
 				m_MapdownloadChunk++;
 
-				CMsgPacker MsgP(NETMSG_REQUEST_MAP_DATA, true);
-				MsgP.AddInt(m_MapdownloadChunk);
-				SendMsg(CONN_MAIN, &MsgP, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+				if(IsSixup() && (m_MapdownloadChunk % m_TranslationContext.m_MapDownloadChunksPerRequest == 0))
+				{
+					CMsgPacker MsgP(protocol7::NETMSG_REQUEST_MAP_DATA, true, true);
+					SendMsg(CONN_MAIN, &MsgP, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+				}
+				else
+				{
+					CMsgPacker MsgP(NETMSG_REQUEST_MAP_DATA, true);
+					MsgP.AddInt(m_MapdownloadChunk);
+					SendMsg(CONN_MAIN, &MsgP, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+				}
 
 				if(g_Config.m_Debug)
 				{
@@ -1514,42 +1651,61 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				}
 			}
 		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_MAP_RELOAD)
+		{
+			if(m_DummyConnected)
+			{
+				m_DummyReconnectOnReload = true;
+				m_DummyDeactivateOnReconnect = g_Config.m_ClDummy == 0;
+				g_Config.m_ClDummy = 0;
+			}
+			else
+				m_DummyDeactivateOnReconnect = false;
+		}
 		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_CON_READY)
 		{
 			GameClient()->OnConnected();
+			if(m_DummyReconnectOnReload)
+			{
+				m_DummySendConnInfo = true;
+				m_DummyReconnectOnReload = false;
+			}
 		}
 		else if(Conn == CONN_DUMMY && Msg == NETMSG_CON_READY)
 		{
 			m_DummyConnected = true;
+			m_DummyConnecting = false;
 			g_Config.m_ClDummy = 1;
 			Rcon("crashmeplx");
-			if(m_aRconAuthed[0])
+			if(m_aRconAuthed[0] && !m_aRconAuthed[1])
 				RconAuth(m_aRconUsername, m_aRconPassword);
 		}
 		else if(Msg == NETMSG_PING)
 		{
 			CMsgPacker MsgP(NETMSG_PING_REPLY, true);
-			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH);
+			int Vital = (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 ? MSGFLAG_VITAL : 0;
+			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH | Vital);
 		}
 		else if(Msg == NETMSG_PINGEX)
 		{
-			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			CUuid *pId = (CUuid *)Unpacker.GetRaw(sizeof(*pId));
 			if(Unpacker.Error())
 			{
 				return;
 			}
 			CMsgPacker MsgP(NETMSG_PONGEX, true);
-			MsgP.AddRaw(pID, sizeof(*pID));
-			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH);
+			MsgP.AddRaw(pId, sizeof(*pId));
+			int Vital = (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 ? MSGFLAG_VITAL : 0;
+			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH | Vital);
 		}
 		else if(Conn == CONN_MAIN && Msg == NETMSG_PONGEX)
 		{
-			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			CUuid *pId = (CUuid *)Unpacker.GetRaw(sizeof(*pId));
 			if(Unpacker.Error())
 			{
 				return;
 			}
-			if(m_ServerCapabilities.m_PingEx && m_CurrentServerCurrentPingTime >= 0 && *pID == m_CurrentServerPingUuid)
+			if(m_ServerCapabilities.m_PingEx && m_CurrentServerCurrentPingTime >= 0 && *pId == m_CurrentServerPingUuid)
 			{
 				int LatencyMs = (time_get() - m_CurrentServerCurrentPingTime) * 1000 / time_freq();
 				m_ServerBrowser.SetCurrentServerPing(ServerAddress(), LatencyMs);
@@ -1583,11 +1739,10 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			{
 				return;
 			}
-			char aAddr[128];
-			char aIP[64];
+			char aAddr[NETADDR_MAXSTRSIZE];
 			NETADDR ServerAddr = ServerAddress();
-			net_addr_str(&ServerAddr, aIP, sizeof(aIP), 0);
-			str_format(aAddr, sizeof(aAddr), "%s:%d", aIP, RedirectPort);
+			ServerAddr.port = RedirectPort;
+			net_addr_str(&ServerAddr, aAddr, sizeof(aAddr), true);
 			Connect(aAddr);
 		}
 		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_ADD)
@@ -1599,6 +1754,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			{
 				m_pConsole->RegisterTemp(pName, pParams, CFGFLAG_SERVER, pHelp);
 			}
+			m_GotRconCommands++;
 		}
 		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_REM)
 		{
@@ -1626,6 +1782,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				if(Old != 0 && m_UseTempRconCommands == 0)
 				{
 					m_pConsole->DeregisterTempAll();
+					m_ExpectedRconCommands = -1;
 				}
 			}
 		}
@@ -1671,12 +1828,6 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 		}
 		else if(Msg == NETMSG_SNAP || Msg == NETMSG_SNAPSINGLE || Msg == NETMSG_SNAPEMPTY)
 		{
-			// only allow packets from the server we actually want
-			if(net_addr_comp(&pPacket->m_Address, &ServerAddress()))
-			{
-				return;
-			}
-
 			// we are not allowed to process snapshot yet
 			if(State() < IClient::STATE_LOADING)
 			{
@@ -1774,7 +1925,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 					}
 
 					// unpack delta
-					const int SnapSize = m_SnapshotDelta.UnpackDelta(pDeltaShot, pTmpBuffer3, pDeltaData, DeltaSize);
+					const int SnapSize = m_SnapshotDelta.UnpackDelta(pDeltaShot, pTmpBuffer3, pDeltaData, DeltaSize, IsSixup());
 					if(SnapSize < 0)
 					{
 						dbg_msg("client", "delta unpack failed. error=%d", SnapSize);
@@ -1788,13 +1939,8 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 
 					if(Msg != NETMSG_SNAPEMPTY && pTmpBuffer3->Crc() != Crc)
 					{
-						if(g_Config.m_Debug)
-						{
-							char aBuf[256];
-							str_format(aBuf, sizeof(aBuf), "snapshot crc error #%d - tick=%d wantedcrc=%d gotcrc=%d compressed_size=%d delta_tick=%d",
-								m_SnapCrcErrors, GameTick, Crc, pTmpBuffer3->Crc(), m_aSnapshotIncomingDataSize[Conn], DeltaTick);
-							m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", aBuf);
-						}
+						log_error("client", "snapshot crc error #%d - tick=%d wantedcrc=%d gotcrc=%d compressed_size=%d delta_tick=%d",
+							m_SnapCrcErrors, GameTick, Crc, pTmpBuffer3->Crc(), m_aSnapshotIncomingDataSize[Conn], DeltaTick);
 
 						m_SnapCrcErrors++;
 						if(m_SnapCrcErrors > 10)
@@ -1821,9 +1967,22 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 					m_aSnapshotStorage[Conn].PurgeUntil(PurgeTick);
 
 					// create a verified and unpacked snapshot
+					int AltSnapSize = -1;
 					unsigned char aAltSnapBuffer[CSnapshot::MAX_SIZE];
 					CSnapshot *pAltSnapBuffer = (CSnapshot *)aAltSnapBuffer;
-					const int AltSnapSize = UnpackAndValidateSnapshot(pTmpBuffer3, pAltSnapBuffer);
+
+					if(IsSixup())
+					{
+						unsigned char aTmpTransSnapBuffer[CSnapshot::MAX_SIZE];
+						CSnapshot *pTmpTransSnapBuffer = (CSnapshot *)aTmpTransSnapBuffer;
+						mem_copy(pTmpTransSnapBuffer, pTmpBuffer3, CSnapshot::MAX_SIZE);
+						AltSnapSize = GameClient()->TranslateSnap(pAltSnapBuffer, pTmpTransSnapBuffer, Conn, Dummy);
+					}
+					else
+					{
+						AltSnapSize = UnpackAndValidateSnapshot(pTmpBuffer3, pAltSnapBuffer);
+					}
+
 					if(AltSnapSize < 0)
 					{
 						dbg_msg("client", "unpack snapshot and validate failed. error=%d", AltSnapSize);
@@ -1836,17 +1995,30 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 					if(!Dummy)
 					{
 						// for antiping: if the projectile netobjects from the server contains extra data, this is removed and the original content restored before recording demo
-						unsigned char aExtraInfoRemoved[CSnapshot::MAX_SIZE];
-						mem_copy(aExtraInfoRemoved, pTmpBuffer3, SnapSize);
-						SnapshotRemoveExtraProjectileInfo(aExtraInfoRemoved);
+						SnapshotRemoveExtraProjectileInfo(pTmpBuffer3);
 
-						// add snapshot to demo
-						for(auto &DemoRecorder : m_aDemoRecorder)
+						unsigned char aSnapSeven[CSnapshot::MAX_SIZE];
+						CSnapshot *pSnapSeven = (CSnapshot *)aSnapSeven;
+						int DemoSnapSize = SnapSize;
+						if(IsSixup())
 						{
-							if(DemoRecorder.IsRecording())
+							DemoSnapSize = GameClient()->OnDemoRecSnap7(pTmpBuffer3, pSnapSeven, Conn);
+							if(DemoSnapSize < 0)
 							{
-								// write snapshot
-								DemoRecorder.RecordSnapshot(GameTick, aExtraInfoRemoved, SnapSize);
+								dbg_msg("sixup", "demo snapshot failed. error=%d", DemoSnapSize);
+							}
+						}
+
+						if(DemoSnapSize >= 0)
+						{
+							// add snapshot to demo
+							for(auto &DemoRecorder : m_aDemoRecorder)
+							{
+								if(DemoRecorder.IsRecording())
+								{
+									// write snapshot
+									DemoRecorder.RecordSnapshot(GameTick, IsSixup() ? pSnapSeven : pTmpBuffer3, DemoSnapSize);
+								}
 							}
 						}
 					}
@@ -1867,6 +2039,8 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 						m_aGameTime[Conn].Init((GameTick - 1) * time_freq() / GameTickSpeed());
 						m_aapSnapshots[Conn][SNAP_PREV] = m_aSnapshotStorage[Conn].m_pFirst;
 						m_aapSnapshots[Conn][SNAP_CURRENT] = m_aSnapshotStorage[Conn].m_pLast;
+						m_aPrevGameTick[Conn] = m_aapSnapshots[Conn][SNAP_PREV]->m_Tick;
+						m_aCurGameTick[Conn] = m_aapSnapshots[Conn][SNAP_CURRENT]->m_Tick;
 						if(!Dummy)
 						{
 							m_LocalStartTime = time_get();
@@ -1895,8 +2069,6 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 					{
 						if(m_ServerCapabilities.m_ChatTimeoutCode)
 						{
-							CNetMsg_Cl_Say MsgP;
-							MsgP.m_Team = 0;
 							char aBuf[128];
 							char aBufMsg[256];
 							if(!g_Config.m_ClRunOnJoin[0] && !g_Config.m_ClDummyDefaultEyes && !g_Config.m_ClPlayerDefaultEyes)
@@ -1940,10 +2112,23 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 									str_append(aBufMsg, aBuf);
 								}
 							}
-							MsgP.m_pMessage = aBufMsg;
-							CMsgPacker PackerTimeout(&MsgP);
-							MsgP.Pack(&PackerTimeout);
-							SendMsg(Conn, &PackerTimeout, MSGFLAG_VITAL);
+							if(IsSixup())
+							{
+								protocol7::CNetMsg_Cl_Say Msg7;
+								Msg7.m_Mode = protocol7::CHAT_ALL;
+								Msg7.m_Target = -1;
+								Msg7.m_pMessage = aBufMsg;
+								SendPackMsg(Conn, &Msg7, MSGFLAG_VITAL, true);
+							}
+							else
+							{
+								CNetMsg_Cl_Say MsgP;
+								MsgP.m_Team = 0;
+								MsgP.m_pMessage = aBufMsg;
+								CMsgPacker PackerTimeout(&MsgP);
+								MsgP.Pack(&PackerTimeout);
+								SendMsg(Conn, &PackerTimeout, MSGFLAG_VITAL);
+							}
 						}
 						m_aCodeRunAfterJoin[Conn] = true;
 					}
@@ -1961,6 +2146,19 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				GameClient()->OnRconType(UsernameReq);
 			}
 		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_GROUP_START)
+		{
+			int ExpectedRconCommands = Unpacker.GetInt();
+			if(Unpacker.Error())
+				return;
+
+			m_ExpectedRconCommands = ExpectedRconCommands;
+			m_GotRconCommands = 0;
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_GROUP_END)
+		{
+			m_ExpectedRconCommands = -1;
+		}
 	}
 	else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0)
 	{
@@ -2005,7 +2203,7 @@ int CClient::UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo)
 		}
 		const int ItemSize = pNetObjHandler->GetUnpackedObjSize(ItemType);
 
-		void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+		void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->Id(), ItemSize);
 		if(!pObj)
 			return -4;
 
@@ -2015,24 +2213,44 @@ int CClient::UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo)
 	return Builder.Finish(pTo);
 }
 
-void CClient::ResetMapDownload()
+void CClient::ResetMapDownload(bool ResetActive)
 {
 	if(m_pMapdownloadTask)
 	{
 		m_pMapdownloadTask->Abort();
-		m_pMapdownloadTask = NULL;
+		m_pMapdownloadTask = nullptr;
+	}
+
+	if(m_MapdownloadFileTemp)
+	{
+		io_close(m_MapdownloadFileTemp);
+		m_MapdownloadFileTemp = 0;
+	}
+
+	if(Storage()->FileExists(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE))
+	{
+		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+	}
+
+	if(ResetActive)
+	{
+		m_MapdownloadChunk = 0;
+		m_MapdownloadSha256Present = false;
+		m_MapdownloadSha256 = SHA256_ZEROED;
+		m_MapdownloadCrc = 0;
+		m_MapdownloadTotalsize = -1;
+		m_MapdownloadAmount = 0;
+		m_aMapdownloadFilename[0] = '\0';
+		m_aMapdownloadFilenameTemp[0] = '\0';
+		m_aMapdownloadName[0] = '\0';
 	}
-	m_MapdownloadFileTemp = 0;
-	m_MapdownloadAmount = 0;
 }
 
 void CClient::FinishMapDownload()
 {
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "download complete, loading map");
 
-	int Prev = m_MapdownloadTotalsize;
-	m_MapdownloadTotalsize = -1;
-	SHA256_DIGEST *pSha256 = m_MapdownloadSha256Present ? &m_MapdownloadSha256 : 0;
+	SHA256_DIGEST *pSha256 = m_MapdownloadSha256Present ? &m_MapdownloadSha256 : nullptr;
 
 	bool FileSuccess = true;
 	if(Storage()->FileExists(m_aMapdownloadFilename, IStorage::TYPE_SAVE))
@@ -2040,41 +2258,31 @@ void CClient::FinishMapDownload()
 	FileSuccess &= Storage()->RenameFile(m_aMapdownloadFilenameTemp, m_aMapdownloadFilename, IStorage::TYPE_SAVE);
 	if(!FileSuccess)
 	{
-		ResetMapDownload();
 		char aError[128 + IO_MAX_PATH_LENGTH];
 		str_format(aError, sizeof(aError), Localize("Could not save downloaded map. Try manually deleting this file: %s"), m_aMapdownloadFilename);
 		DisconnectWithReason(aError);
 		return;
 	}
 
-	// load map
 	const char *pError = LoadMap(m_aMapdownloadName, m_aMapdownloadFilename, pSha256, m_MapdownloadCrc);
 	if(!pError)
 	{
-		ResetMapDownload();
+		ResetMapDownload(true);
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
 		SendReady(CONN_MAIN);
 	}
 	else if(m_pMapdownloadTask) // fallback
 	{
-		ResetMapDownload();
-		m_MapdownloadTotalsize = Prev;
+		ResetMapDownload(false);
 		SendMapRequest();
 	}
 	else
 	{
-		if(m_MapdownloadFileTemp)
-		{
-			io_close(m_MapdownloadFileTemp);
-			m_MapdownloadFileTemp = 0;
-			Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
-		}
-		ResetMapDownload();
 		DisconnectWithReason(pError);
 	}
 }
 
-void CClient::ResetDDNetInfo()
+void CClient::ResetDDNetInfoTask()
 {
 	if(m_pDDNetInfoTask)
 	{
@@ -2083,56 +2291,49 @@ void CClient::ResetDDNetInfo()
 	}
 }
 
-bool CClient::IsDDNetInfoChanged()
+void CClient::FinishDDNetInfo()
 {
-	IOHANDLE OldFile = m_pStorage->OpenFile(DDNET_INFO_FILE, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_SAVE);
-
-	if(!OldFile)
-		return true;
-
-	IOHANDLE NewFile = m_pStorage->OpenFile(m_aDDNetInfoTmp, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_SAVE);
-
-	if(NewFile)
+	if(m_ServerBrowser.DDNetInfoSha256() == m_pDDNetInfoTask->ResultSha256())
 	{
-		char aOldData[4096];
-		char aNewData[4096];
-		unsigned OldBytes;
-		unsigned NewBytes;
-
-		do
-		{
-			OldBytes = io_read(OldFile, aOldData, sizeof(aOldData));
-			NewBytes = io_read(NewFile, aNewData, sizeof(aNewData));
-
-			if(OldBytes != NewBytes || mem_comp(aOldData, aNewData, OldBytes) != 0)
-			{
-				io_close(NewFile);
-				io_close(OldFile);
-				return true;
-			}
-		} while(OldBytes > 0);
+		log_debug("client/info", "DDNet info already up-to-date");
+		return;
+	}
 
-		io_close(NewFile);
+	char aTempFilename[IO_MAX_PATH_LENGTH];
+	IStorage::FormatTmpPath(aTempFilename, sizeof(aTempFilename), DDNET_INFO_FILE);
+	IOHANDLE File = Storage()->OpenFile(aTempFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!File)
+	{
+		log_error("client/info", "Failed to open temporary DDNet info '%s' for writing", aTempFilename);
+		return;
 	}
 
-	io_close(OldFile);
-	return false;
-}
+	unsigned char *pResult;
+	size_t ResultLength;
+	m_pDDNetInfoTask->Result(&pResult, &ResultLength);
+	bool Error = io_write(File, pResult, ResultLength) != ResultLength;
+	Error |= io_close(File) != 0;
+	if(Error)
+	{
+		log_error("client/info", "Error writing temporary DDNet info to file '%s'", aTempFilename);
+		return;
+	}
 
-void CClient::FinishDDNetInfo()
-{
-	ResetDDNetInfo();
-	if(IsDDNetInfoChanged())
+	if(Storage()->FileExists(DDNET_INFO_FILE, IStorage::TYPE_SAVE) && !Storage()->RemoveFile(DDNET_INFO_FILE, IStorage::TYPE_SAVE))
 	{
-		m_pStorage->RenameFile(m_aDDNetInfoTmp, DDNET_INFO_FILE, IStorage::TYPE_SAVE);
-		LoadDDNetInfo();
-		if(m_ServerBrowser.GetCurrentType() == IServerBrowser::TYPE_INTERNET || m_ServerBrowser.GetCurrentType() == IServerBrowser::TYPE_FAVORITES)
-			m_ServerBrowser.Refresh(m_ServerBrowser.GetCurrentType());
+		log_error("client/info", "Failed to remove old DDNet info '%s'", DDNET_INFO_FILE);
+		Storage()->RemoveFile(aTempFilename, IStorage::TYPE_SAVE);
+		return;
 	}
-	else
+	if(!Storage()->RenameFile(aTempFilename, DDNET_INFO_FILE, IStorage::TYPE_SAVE))
 	{
-		m_pStorage->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+		log_error("client/info", "Failed to rename temporary DDNet info '%s' to '%s'", aTempFilename, DDNET_INFO_FILE);
+		Storage()->RemoveFile(aTempFilename, IStorage::TYPE_SAVE);
+		return;
 	}
+
+	log_debug("client/info", "Loading new DDNet info");
+	LoadDDNetInfo();
 }
 
 typedef std::tuple<int, int, int> TVersion;
@@ -2212,7 +2413,7 @@ void CClient::LoadDDNetInfo()
 		NETADDR Addr;
 		if(!net_addr_from_str(&Addr, StunServersIpv6[0]))
 		{
-			m_aNetClient->FeedStunServer(Addr);
+			m_aNetClient[CONN_MAIN].FeedStunServer(Addr);
 		}
 	}
 	const json_value &StunServersIpv4 = DDNetInfo["stun-servers-ipv4"];
@@ -2221,7 +2422,7 @@ void CClient::LoadDDNetInfo()
 		NETADDR Addr;
 		if(!net_addr_from_str(&Addr, StunServersIpv4[0]))
 		{
-			m_aNetClient->FeedStunServer(Addr);
+			m_aNetClient[CONN_MAIN].FeedStunServer(Addr);
 		}
 	}
 	const json_value &ConnectingIp = DDNetInfo["connecting-ip"];
@@ -2261,25 +2462,33 @@ void CClient::PumpNetwork()
 
 	if(State() != IClient::STATE_DEMOPLAYBACK)
 	{
-		// check for errors
-		if(State() != IClient::STATE_OFFLINE && State() < IClient::STATE_QUITTING && m_aNetClient[CONN_MAIN].State() == NETSTATE_OFFLINE)
-		{
-			Disconnect();
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "offline error='%s'", m_aNetClient[CONN_MAIN].ErrorString());
-			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
-		}
-
-		if(State() != IClient::STATE_OFFLINE && State() < IClient::STATE_QUITTING && m_DummyConnected &&
-			m_aNetClient[CONN_DUMMY].State() == NETSTATE_OFFLINE)
+		// check for errors of main and dummy
+		if(State() != IClient::STATE_OFFLINE && State() < IClient::STATE_QUITTING)
 		{
-			DummyDisconnect(0);
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "offline dummy error='%s'", m_aNetClient[CONN_DUMMY].ErrorString());
-			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
+			if(m_aNetClient[CONN_MAIN].State() == NETSTATE_OFFLINE)
+			{
+				// This will also disconnect the dummy, so the branch below is an `else if`
+				Disconnect();
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "offline error='%s'", m_aNetClient[CONN_MAIN].ErrorString());
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
+			}
+			else if((DummyConnecting() || DummyConnected()) && m_aNetClient[CONN_DUMMY].State() == NETSTATE_OFFLINE)
+			{
+				const bool WasConnecting = DummyConnecting();
+				DummyDisconnect(nullptr);
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "offline dummy error='%s'", m_aNetClient[CONN_DUMMY].ErrorString());
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
+				if(WasConnecting)
+				{
+					str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Could not connect dummy"), m_aNetClient[CONN_DUMMY].ErrorString());
+					GameClient()->Echo(aBuf);
+				}
+			}
 		}
 
-		//
+		// check if main was connected
 		if(State() == IClient::STATE_CONNECTING && m_aNetClient[CONN_MAIN].State() == NETSTATE_ONLINE)
 		{
 			// we switched to online
@@ -2292,20 +2501,20 @@ void CClient::PumpNetwork()
 
 	// process packets
 	CNetChunk Packet;
-	for(int i = 0; i < NUM_CONNS; i++)
+	SECURITY_TOKEN ResponseToken;
+	for(int Conn = 0; Conn < NUM_CONNS; Conn++)
 	{
-		while(m_aNetClient[i].Recv(&Packet))
+		while(m_aNetClient[Conn].Recv(&Packet, &ResponseToken, IsSixup()))
 		{
-			if(Packet.m_ClientID == -1)
+			if(Packet.m_ClientId == -1)
 			{
 				ProcessConnlessPacket(&Packet);
 				continue;
 			}
-			if(i > 1)
+			if(Conn == CONN_MAIN || Conn == CONN_DUMMY)
 			{
-				continue;
+				ProcessServerPacket(&Packet, Conn, g_Config.m_ClDummy ^ Conn);
 			}
-			ProcessServerPacket(&Packet, i, g_Config.m_ClDummy ^ i);
 		}
 	}
 }
@@ -2314,23 +2523,37 @@ void CClient::OnDemoPlayerSnapshot(void *pData, int Size)
 {
 	// update ticks, they could have changed
 	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
-	m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
-	m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
+	m_aCurGameTick[0] = pInfo->m_Info.m_CurrentTick;
+	m_aPrevGameTick[0] = pInfo->m_PreviousTick;
 
 	// create a verified and unpacked snapshot
 	unsigned char aAltSnapBuffer[CSnapshot::MAX_SIZE];
 	CSnapshot *pAltSnapBuffer = (CSnapshot *)aAltSnapBuffer;
-	const int AltSnapSize = UnpackAndValidateSnapshot((CSnapshot *)pData, pAltSnapBuffer);
-	if(AltSnapSize < 0)
+	int AltSnapSize;
+
+	if(IsSixup())
 	{
-		dbg_msg("client", "unpack snapshot and validate failed. error=%d", AltSnapSize);
-		return;
+		AltSnapSize = GameClient()->TranslateSnap(pAltSnapBuffer, (CSnapshot *)pData, CONN_MAIN, false);
+		if(AltSnapSize < 0)
+		{
+			dbg_msg("sixup", "failed to translate snapshot. error=%d", AltSnapSize);
+			return;
+		}
+	}
+	else
+	{
+		AltSnapSize = UnpackAndValidateSnapshot((CSnapshot *)pData, pAltSnapBuffer);
+		if(AltSnapSize < 0)
+		{
+			dbg_msg("client", "unpack snapshot and validate failed. error=%d", AltSnapSize);
+			return;
+		}
 	}
 
 	// handle snapshots after validation
-	std::swap(m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV], m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]);
-	mem_copy(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pSnap, pData, Size);
-	mem_copy(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
+	std::swap(m_aapSnapshots[0][SNAP_PREV], m_aapSnapshots[0][SNAP_CURRENT]);
+	mem_copy(m_aapSnapshots[0][SNAP_CURRENT]->m_pSnap, pData, Size);
+	mem_copy(m_aapSnapshots[0][SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
 
 	GameClient()->OnNewSnapshot();
 }
@@ -2346,7 +2569,7 @@ void CClient::OnDemoPlayerMessage(void *pData, int Size)
 	bool Sys;
 	CUuid Uuid;
 
-	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	int Result = UnpackMessageId(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
 	if(Result == UNPACKMESSAGE_ERROR)
 	{
 		return;
@@ -2360,43 +2583,44 @@ void CClient::UpdateDemoIntraTimers()
 {
 	// update timers
 	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
-	m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
-	m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
-	m_aGameIntraTick[g_Config.m_ClDummy] = pInfo->m_IntraTick;
-	m_aGameTickTime[g_Config.m_ClDummy] = pInfo->m_TickTime;
-	m_aGameIntraTickSincePrev[g_Config.m_ClDummy] = pInfo->m_IntraTickSincePrev;
+	m_aCurGameTick[0] = pInfo->m_Info.m_CurrentTick;
+	m_aPrevGameTick[0] = pInfo->m_PreviousTick;
+	m_aGameIntraTick[0] = pInfo->m_IntraTick;
+	m_aGameTickTime[0] = pInfo->m_TickTime;
+	m_aGameIntraTickSincePrev[0] = pInfo->m_IntraTickSincePrev;
 };
 
 void CClient::Update()
 {
+	PumpNetwork();
+
 	if(State() == IClient::STATE_DEMOPLAYBACK)
 	{
-#if defined(CONF_VIDEORECORDER)
-		if(m_DemoPlayer.IsPlaying() && IVideo::Current())
+		if(m_DemoPlayer.IsPlaying())
 		{
-			IVideo::Current()->NextVideoFrame();
-			IVideo::Current()->NextAudioFrameTimeline([this](short *pFinalOut, unsigned Frames) {
-				Sound()->Mix(pFinalOut, Frames);
-			});
-		}
-		else if(m_ButtonRender)
-			Disconnect();
+#if defined(CONF_VIDEORECORDER)
+			if(IVideo::Current())
+			{
+				IVideo::Current()->NextVideoFrame();
+				IVideo::Current()->NextAudioFrameTimeline([this](short *pFinalOut, unsigned Frames) {
+					Sound()->Mix(pFinalOut, Frames);
+				});
+			}
 #endif
 
-		m_DemoPlayer.Update();
+			m_DemoPlayer.Update();
 
-		if(m_DemoPlayer.IsPlaying())
-		{
 			// update timers
 			const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
-			m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
-			m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
-			m_aGameIntraTick[g_Config.m_ClDummy] = pInfo->m_IntraTick;
-			m_aGameTickTime[g_Config.m_ClDummy] = pInfo->m_TickTime;
+			m_aCurGameTick[0] = pInfo->m_Info.m_CurrentTick;
+			m_aPrevGameTick[0] = pInfo->m_PreviousTick;
+			m_aGameIntraTick[0] = pInfo->m_IntraTick;
+			m_aGameTickTime[0] = pInfo->m_TickTime;
 		}
 		else
 		{
-			// disconnect on error
+			// Disconnect when demo playback stopped, either due to playback error
+			// or because the end of the demo was reached when rendering it.
 			DisconnectWithReason(m_DemoPlayer.ErrorMessage());
 			if(m_DemoPlayer.ErrorMessage()[0] != '\0')
 			{
@@ -2415,43 +2639,35 @@ void CClient::Update()
 			GameClient()->OnDummySwap();
 		}
 
-		if(m_aReceivedSnapshots[!g_Config.m_ClDummy] >= 3)
+		if(m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT])
 		{
 			// switch dummy snapshot
 			int64_t Now = m_aGameTime[!g_Config.m_ClDummy].Get(time_get());
 			while(true)
 			{
-				CSnapshotStorage::CHolder *pCur = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT];
-				int64_t TickStart = (pCur->m_Tick) * time_freq() / GameTickSpeed();
+				if(!m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext)
+					break;
+				int64_t TickStart = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick * time_freq() / GameTickSpeed();
+				if(TickStart >= Now)
+					break;
 
-				if(TickStart < Now)
-				{
-					CSnapshotStorage::CHolder *pNext = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
-					if(pNext)
-					{
-						m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT];
-						m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT] = pNext;
+				m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT];
+				m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
 
-						// set ticks
-						m_aCurGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
-						m_aPrevGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
-					}
-					else
-						break;
-				}
-				else
-					break;
+				// set ticks
+				m_aCurGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
+				m_aPrevGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
 			}
 		}
 
-		if(m_aReceivedSnapshots[g_Config.m_ClDummy] >= 3)
+		if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT])
 		{
 			// switch snapshot
 			bool Repredict = false;
 			int64_t Now = m_aGameTime[g_Config.m_ClDummy].Get(time_get());
 			int64_t PredNow = m_PredictedTime.Get(time_get());
 
-			if(m_LastDummy != (bool)g_Config.m_ClDummy && m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
+			if(m_LastDummy != (bool)g_Config.m_ClDummy && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
 			{
 				// Load snapshot for m_ClDummy
 				GameClient()->OnNewSnapshot();
@@ -2460,35 +2676,24 @@ void CClient::Update()
 
 			while(true)
 			{
-				CSnapshotStorage::CHolder *pCur = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT];
-				int64_t TickStart = (pCur->m_Tick) * time_freq() / GameTickSpeed();
+				if(!m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext)
+					break;
+				int64_t TickStart = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick * time_freq() / GameTickSpeed();
+				if(TickStart >= Now)
+					break;
 
-				if(TickStart < Now)
-				{
-					CSnapshotStorage::CHolder *pNext = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
-					if(pNext)
-					{
-						m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT];
-						m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] = pNext;
+				m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT];
+				m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
 
-						// set ticks
-						m_aCurGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
-						m_aPrevGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
+				// set ticks
+				m_aCurGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
+				m_aPrevGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
 
-						if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
-						{
-							GameClient()->OnNewSnapshot();
-							Repredict = true;
-						}
-					}
-					else
-						break;
-				}
-				else
-					break;
+				GameClient()->OnNewSnapshot();
+				Repredict = true;
 			}
 
-			if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
+			if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
 			{
 				int64_t CurTickStart = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick * time_freq() / GameTickSpeed();
 				int64_t PrevTickStart = m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick * time_freq() / GameTickSpeed();
@@ -2527,8 +2732,7 @@ void CClient::Update()
 			}
 
 			// fetch server info if we don't have it
-			if(State() >= IClient::STATE_LOADING &&
-				m_CurrentServerInfoRequestTime >= 0 &&
+			if(m_CurrentServerInfoRequestTime >= 0 &&
 				time_get() > m_CurrentServerInfoRequestTime)
 			{
 				m_ServerBrowser.RequestCurrentServer(ServerAddress());
@@ -2536,8 +2740,7 @@ void CClient::Update()
 			}
 
 			// periodically ping server
-			if(State() == IClient::STATE_ONLINE &&
-				m_CurrentServerNextPingTime >= 0 &&
+			if(m_CurrentServerNextPingTime >= 0 &&
 				time_get() > m_CurrentServerNextPingTime)
 			{
 				int64_t NowPing = time_get();
@@ -2563,6 +2766,16 @@ void CClient::Update()
 			}
 		}
 
+		if(m_DummyDeactivateOnReconnect && g_Config.m_ClDummy == 1)
+		{
+			m_DummyDeactivateOnReconnect = false;
+			g_Config.m_ClDummy = 0;
+		}
+		else if(!m_DummyConnected && m_DummyDeactivateOnReconnect)
+		{
+			m_DummyDeactivateOnReconnect = false;
+		}
+
 		m_LastDummy = (bool)g_Config.m_ClDummy;
 	}
 
@@ -2570,57 +2783,51 @@ void CClient::Update()
 #ifdef CONF_DEBUG
 	if(g_Config.m_DbgStress)
 	{
-		static int64_t ActionTaken = 0;
+		static int64_t s_ActionTaken = 0;
 		int64_t Now = time_get();
 		if(State() == IClient::STATE_OFFLINE)
 		{
-			if(Now > ActionTaken + time_freq() * 2)
+			if(Now > s_ActionTaken + time_freq() * 2)
 			{
 				m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "stress", "reconnecting!");
 				Connect(g_Config.m_DbgStressServer);
-				ActionTaken = Now;
+				s_ActionTaken = Now;
 			}
 		}
 		else
 		{
-			if(Now > ActionTaken + time_freq() * (10 + g_Config.m_DbgStress))
+			if(Now > s_ActionTaken + time_freq() * (10 + g_Config.m_DbgStress))
 			{
 				m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "stress", "disconnecting!");
 				Disconnect();
-				ActionTaken = Now;
+				s_ActionTaken = Now;
 			}
 		}
 	}
 #endif
 
-	// pump the network
-	PumpNetwork();
-
 	if(m_pMapdownloadTask)
 	{
-		if(m_pMapdownloadTask->State() == HTTP_DONE)
+		if(m_pMapdownloadTask->State() == EHttpState::DONE)
 			FinishMapDownload();
-		else if(m_pMapdownloadTask->State() == HTTP_ERROR || m_pMapdownloadTask->State() == HTTP_ABORTED)
+		else if(m_pMapdownloadTask->State() == EHttpState::ERROR || m_pMapdownloadTask->State() == EHttpState::ABORTED)
 		{
 			dbg_msg("webdl", "http failed, falling back to gameserver");
-			ResetMapDownload();
+			ResetMapDownload(false);
 			SendMapRequest();
 		}
 	}
 
 	if(m_pDDNetInfoTask)
 	{
-		if(m_pDDNetInfoTask->State() == HTTP_DONE)
-			FinishDDNetInfo();
-		else if(m_pDDNetInfoTask->State() == HTTP_ERROR)
+		if(m_pDDNetInfoTask->State() == EHttpState::DONE)
 		{
-			Storage()->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
-			ResetDDNetInfo();
+			FinishDDNetInfo();
+			ResetDDNetInfoTask();
 		}
-		else if(m_pDDNetInfoTask->State() == HTTP_ABORTED)
+		else if(m_pDDNetInfoTask->State() == EHttpState::ERROR || m_pDDNetInfoTask->State() == EHttpState::ABORTED)
 		{
-			Storage()->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
-			m_pDDNetInfoTask = NULL;
+			ResetDDNetInfoTask();
 		}
 	}
 
@@ -2629,14 +2836,23 @@ void CClient::Update()
 		if(!m_EditJobs.empty())
 		{
 			std::shared_ptr<CDemoEdit> pJob = m_EditJobs.front();
-			if(pJob->Status() == IJob::STATE_DONE)
+			if(pJob->State() == IJob::STATE_DONE)
 			{
 				char aBuf[IO_MAX_PATH_LENGTH + 64];
-				str_format(aBuf, sizeof(aBuf), "Successfully saved the replay to %s!", pJob->Destination());
-				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", aBuf);
+				if(pJob->Success())
+				{
+					str_format(aBuf, sizeof(aBuf), "Successfully saved the replay to '%s'!", pJob->Destination());
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", aBuf);
 
-				GameClient()->Echo(Localize("Successfully saved the replay!"));
+					GameClient()->Echo(Localize("Successfully saved the replay!"));
+				}
+				else
+				{
+					str_format(aBuf, sizeof(aBuf), "Failed saving the replay to '%s'...", pJob->Destination());
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", aBuf);
 
+					GameClient()->Echo(Localize("Failed saving the replay!"));
+				}
 				m_EditJobs.pop_front();
 			}
 		}
@@ -2681,6 +2897,7 @@ void CClient::RegisterInterfaces()
 #endif
 	Kernel()->RegisterInterface(static_cast<IFriends *>(&m_Friends), false);
 	Kernel()->ReregisterInterface(static_cast<IFriends *>(&m_Foes));
+	Kernel()->RegisterInterface(static_cast<IHttp *>(&m_Http), false);
 }
 
 void CClient::InitInterfaces()
@@ -2703,14 +2920,12 @@ void CClient::InitInterfaces()
 	m_pNotifications = Kernel()->RequestInterface<INotifications>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 
-	m_DemoEditor.Init(m_pGameClient->NetVersion(), &m_SnapshotDelta, m_pConsole, m_pStorage);
+	m_DemoEditor.Init(&m_SnapshotDelta, m_pConsole, m_pStorage);
 
 	m_ServerBrowser.SetBaseInfo(&m_aNetClient[CONN_CONTACT], m_pGameClient->NetVersion());
 
-	HttpInit(m_pStorage);
-
 #if defined(CONF_AUTOUPDATE)
-	m_Updater.Init();
+	m_Updater.Init(&m_Http);
 #endif
 
 	m_pConfigManager->RegisterCallback(IFavorites::ConfigSaveCallback, m_pFavorites);
@@ -2744,13 +2959,31 @@ void CClient::Run()
 		g_UuidManager.DebugDump();
 	}
 
+#ifndef CONF_WEBASM
+	char aNetworkError[256];
+	if(!InitNetworkClient(aNetworkError, sizeof(aNetworkError)))
+	{
+		log_error("client", "%s", aNetworkError);
+		ShowMessageBox("Network Error", aNetworkError);
+		return;
+	}
+#endif
+
+	if(!m_Http.Init(std::chrono::seconds{1}))
+	{
+		const char *pErrorMessage = "Failed to initialize the HTTP client.";
+		log_error("client", "%s", pErrorMessage);
+		ShowMessageBox("HTTP Error", pErrorMessage);
+		return;
+	}
+
 	// init graphics
 	m_pGraphics = CreateEngineGraphicsThreaded();
 	Kernel()->RegisterInterface(m_pGraphics); // IEngineGraphics
 	Kernel()->RegisterInterface(static_cast<IGraphics *>(m_pGraphics), false);
 	if(m_pGraphics->Init() != 0)
 	{
-		dbg_msg("client", "couldn't init graphics");
+		log_error("client", "couldn't init graphics");
 		ShowMessageBox("Graphics Error", "The graphics could not be initialized.");
 		return;
 	}
@@ -2760,23 +2993,13 @@ void CClient::Run()
 	Graphics()->Swap();
 
 	// init sound, allowed to fail
-	m_SoundInitFailed = Sound()->Init() != 0;
+	const bool SoundInitFailed = Sound()->Init() != 0;
 
 #if defined(CONF_VIDEORECORDER)
 	// init video recorder aka ffmpeg
 	CVideo::Init();
 #endif
 
-#ifndef CONF_WEBASM
-	char aNetworkError[256];
-	if(!InitNetworkClient(aNetworkError, sizeof(aNetworkError)))
-	{
-		dbg_msg("client", "%s", aNetworkError);
-		ShowMessageBox("Network Error", aNetworkError);
-		return;
-	}
-#endif
-
 	// init text render
 	m_pTextRender = Kernel()->RequestInterface<IEngineTextRender>();
 	m_pTextRender->Init();
@@ -2830,6 +3053,13 @@ void CClient::Run()
 	else
 		RequestDDNetInfo();
 
+	if(SoundInitFailed)
+	{
+		SWarning Warning(Localize("Sound error"), Localize("The audio device couldn't be initialised."));
+		Warning.m_AutoHide = false;
+		m_vWarnings.emplace_back(Warning);
+	}
+
 	bool LastD = false;
 	bool LastE = false;
 	bool LastG = false;
@@ -2854,7 +3084,7 @@ void CClient::Run()
 		{
 			const char *pError = DemoPlayer_Play(m_aCmdPlayDemo, IStorage::TYPE_ALL_OR_ABSOLUTE);
 			if(pError)
-				dbg_msg("demo_player", "playing passed demo file '%s' failed: %s", m_aCmdPlayDemo, pError);
+				log_error("demo_player", "playing passed demo file '%s' failed: %s", m_aCmdPlayDemo, pError);
 			m_aCmdPlayDemo[0] = 0;
 		}
 
@@ -2865,12 +3095,12 @@ void CClient::Run()
 			if(Result)
 				g_Config.m_ClEditor = true;
 			else
-				dbg_msg("editor", "editing passed map file '%s' failed", m_aCmdEditMap);
+				log_error("editor", "editing passed map file '%s' failed", m_aCmdEditMap);
 			m_aCmdEditMap[0] = 0;
 		}
 
-		// progress on dummy connect if security token handshake skipped/passed
-		if(m_DummySendConnInfo && !m_aNetClient[CONN_DUMMY].SecurityTokenUnknown())
+		// progress on dummy connect when the connection is online
+		if(m_DummySendConnInfo && m_aNetClient[CONN_DUMMY].State() == NETSTATE_ONLINE)
 		{
 			m_DummySendConnInfo = false;
 			SendInfo(CONN_DUMMY);
@@ -3006,29 +3236,11 @@ void CClient::Run()
 		AutoStatScreenshot_Cleanup();
 		AutoCSV_Cleanup();
 
-		// check conditions
-		if(State() == IClient::STATE_QUITTING || State() == IClient::STATE_RESTARTING)
-		{
-			static bool s_SavedConfig = false;
-			if(!s_SavedConfig)
-			{
-				// write down the config and quit
-				if(!m_pConfigManager->Save())
-					m_vWarnings.emplace_back(Localize("Saving ddnet-settings.cfg failed"));
-				s_SavedConfig = true;
-			}
-
-			if(m_pStorage->FileExists(m_aDDNetInfoTmp, IStorage::TYPE_SAVE))
-			{
-				m_pStorage->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
-			}
-
-			if(m_vWarnings.empty() && !GameClient()->IsDisplayingWarning())
-				break;
-		}
-
 		m_Fifo.Update();
 
+		if(State() == IClient::STATE_QUITTING || State() == IClient::STATE_RESTARTING)
+			break;
+
 		// beNice
 		auto Now = time_get_nanoseconds();
 		decltype(Now) SleepTimeInNanoSeconds{0};
@@ -3076,17 +3288,28 @@ void CClient::Run()
 		m_GlobalTime = (time_get() - m_GlobalStartTime) / (float)time_freq();
 	}
 
+	GameClient()->RenderShutdownMessage();
+	Disconnect();
+
+	if(!m_pConfigManager->Save())
+	{
+		char aError[128];
+		str_format(aError, sizeof(aError), Localize("Saving settings to '%s' failed"), CONFIG_FILE);
+		m_vQuittingWarnings.emplace_back(Localize("Error saving settings"), aError);
+	}
+
 	m_Fifo.Shutdown();
+	m_Http.Shutdown();
+	Engine()->ShutdownJobs();
 
+	GameClient()->RenderShutdownMessage();
 	GameClient()->OnShutdown();
-	Disconnect();
+	delete m_pEditor;
 
-	// close socket
+	// close sockets
 	for(unsigned int i = 0; i < std::size(m_aNetClient); i++)
 		m_aNetClient[i].Close();
 
-	delete m_pEditor;
-
 	// shutdown text render while graphics are still available
 	m_pTextRender->Shutdown();
 }
@@ -3123,7 +3346,7 @@ bool CClient::InitNetworkClient(char *pError, size_t ErrorSize)
 					if(g_Config.m_Bindaddr[0])
 						str_format(pError, ErrorSize, "Could not open the network client, try changing or unsetting the bindaddr '%s'.", g_Config.m_Bindaddr);
 					else
-						str_format(pError, ErrorSize, "Could not open the network client.");
+						str_copy(pError, "Could not open the network client.", ErrorSize);
 					return false;
 				}
 			}
@@ -3167,7 +3390,7 @@ void CClient::Con_DummyConnect(IConsole::IResult *pResult, void *pUserData)
 void CClient::Con_DummyDisconnect(IConsole::IResult *pResult, void *pUserData)
 {
 	CClient *pSelf = (CClient *)pUserData;
-	pSelf->DummyDisconnect(0);
+	pSelf->DummyDisconnect(nullptr);
 }
 
 void CClient::Con_DummyResetInput(IConsole::IResult *pResult, void *pUserData)
@@ -3279,57 +3502,73 @@ void CClient::Con_Screenshot(IConsole::IResult *pResult, void *pUserData)
 
 void CClient::Con_StartVideo(IConsole::IResult *pResult, void *pUserData)
 {
-	CClient *pSelf = (CClient *)pUserData;
+	CClient *pSelf = static_cast<CClient *>(pUserData);
 
-	if(pSelf->State() != IClient::STATE_DEMOPLAYBACK)
+	if(pResult->NumArguments())
 	{
-		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Can not start videorecorder outside of demoplayer.");
-		return;
+		pSelf->StartVideo(pResult->GetString(0), false);
 	}
-
-	if(!IVideo::Current())
+	else
 	{
-		// wait for idle, so there is no data race
-		pSelf->Graphics()->WaitForIdle();
-		// pause the sound device while creating the video instance
-		pSelf->Sound()->PauseAudioDevice();
-		new CVideo((CGraphics_Threaded *)pSelf->m_pGraphics, pSelf->Sound(), pSelf->Storage(), pSelf->Graphics()->ScreenWidth(), pSelf->Graphics()->ScreenHeight(), "");
-		pSelf->Sound()->UnpauseAudioDevice();
-		IVideo::Current()->Start();
-		bool paused = pSelf->m_DemoPlayer.Info()->m_Info.m_Paused;
-		if(paused)
-			IVideo::Current()->Pause(true);
+		pSelf->StartVideo("video", true);
 	}
-	else
-		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Videorecorder already running.");
 }
 
-void CClient::StartVideo(IConsole::IResult *pResult, void *pUserData, const char *pVideoName)
+void CClient::StartVideo(const char *pFilename, bool WithTimestamp)
 {
-	CClient *pSelf = (CClient *)pUserData;
+	if(State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		log_error("videorecorder", "Video can only be recorded in demo player.");
+		return;
+	}
 
-	if(pSelf->State() != IClient::STATE_DEMOPLAYBACK)
-		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Can not start videorecorder outside of demoplayer.");
+	if(IVideo::Current())
+	{
+		log_error("videorecorder", "Already recording.");
+		return;
+	}
 
-	pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "demo_render", pVideoName);
-	if(!IVideo::Current())
+	char aFilename[IO_MAX_PATH_LENGTH];
+	if(WithTimestamp)
 	{
-		// wait for idle, so there is no data race
-		pSelf->Graphics()->WaitForIdle();
-		// pause the sound device while creating the video instance
-		pSelf->Sound()->PauseAudioDevice();
-		new CVideo((CGraphics_Threaded *)pSelf->m_pGraphics, pSelf->Sound(), pSelf->Storage(), pSelf->Graphics()->ScreenWidth(), pSelf->Graphics()->ScreenHeight(), pVideoName);
-		pSelf->Sound()->UnpauseAudioDevice();
-		IVideo::Current()->Start();
+		char aTimestamp[20];
+		str_timestamp(aTimestamp, sizeof(aTimestamp));
+		str_format(aFilename, sizeof(aFilename), "videos/%s_%s.mp4", pFilename, aTimestamp);
 	}
 	else
-		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Videorecorder already running.");
+	{
+		str_format(aFilename, sizeof(aFilename), "videos/%s.mp4", pFilename);
+	}
+
+	// wait for idle, so there is no data race
+	Graphics()->WaitForIdle();
+	// pause the sound device while creating the video instance
+	Sound()->PauseAudioDevice();
+	new CVideo(Graphics(), Sound(), Storage(), Graphics()->ScreenWidth(), Graphics()->ScreenHeight(), aFilename);
+	Sound()->UnpauseAudioDevice();
+	if(!IVideo::Current()->Start())
+	{
+		log_error("videorecorder", "Failed to start recording to '%s'", aFilename);
+		m_DemoPlayer.Stop("Failed to start video recording. See local console for details.");
+		return;
+	}
+	if(m_DemoPlayer.Info()->m_Info.m_Paused)
+	{
+		IVideo::Current()->Pause(true);
+	}
+	log_info("videorecorder", "Recording to '%s'", aFilename);
 }
 
 void CClient::Con_StopVideo(IConsole::IResult *pResult, void *pUserData)
 {
-	if(IVideo::Current())
-		IVideo::Current()->Stop();
+	if(!IVideo::Current())
+	{
+		log_error("videorecorder", "Not recording.");
+		return;
+	}
+
+	IVideo::Current()->Stop();
+	log_info("videorecorder", "Stopped recording.");
 }
 
 #endif
@@ -3486,26 +3725,40 @@ void CClient::SaveReplay(const int Length, const char *pFilename)
 	}
 
 	if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording())
+	{
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: demorecorder isn't recording. Try to rejoin to fix that.");
+	}
 	else if(DemoRecorder(RECORDER_REPLAYS)->Length() < 1)
+	{
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: demorecorder isn't recording for at least 1 second.");
+	}
 	else
 	{
-		// First we stop the recorder to slice correctly the demo after
-		DemoRecorder_Stop(RECORDER_REPLAYS);
-
-		char aDate[64];
-		str_timestamp(aDate, sizeof(aDate));
-
 		char aFilename[IO_MAX_PATH_LENGTH];
-		if(str_comp(pFilename, "") == 0)
-			str_format(aFilename, sizeof(aFilename), "demos/replays/%s_%s (replay).demo", m_aCurrentMap, aDate);
+		if(pFilename[0] == '\0')
+		{
+			char aTimestamp[20];
+			str_timestamp(aTimestamp, sizeof(aTimestamp));
+			str_format(aFilename, sizeof(aFilename), "demos/replays/%s_%s_(replay).demo", m_aCurrentMap, aTimestamp);
+		}
 		else
+		{
 			str_format(aFilename, sizeof(aFilename), "demos/replays/%s.demo", pFilename);
+			IOHANDLE Handle = m_pStorage->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+			if(!Handle)
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: invalid filename. Try a different one!");
+				return;
+			}
+			io_close(Handle);
+			m_pStorage->RemoveFile(aFilename, IStorage::TYPE_SAVE);
+		}
 
-		char *pSrc = m_aDemoRecorder[RECORDER_REPLAYS].GetCurrentFilename();
+		// Stop the recorder to correctly slice the demo after
+		DemoRecorder(RECORDER_REPLAYS)->Stop(IDemoRecorder::EStopMode::KEEP_FILE);
 
 		// Slice the demo to get only the last cl_replay_length seconds
+		const char *pSrc = m_aDemoRecorder[RECORDER_REPLAYS].CurrentFilename();
 		const int EndTick = GameTick(g_Config.m_ClDummy);
 		const int StartTick = EndTick - Length * GameTickSpeed();
 
@@ -3517,7 +3770,7 @@ void CClient::SaveReplay(const int Length, const char *pFilename)
 		m_EditJobs.push_back(pDemoEditTask);
 
 		// And we restart the recorder
-		DemoRecorder_StartReplayRecorder();
+		DemoRecorder_UpdateReplayRecorder();
 	}
 }
 
@@ -3538,10 +3791,20 @@ const char *CClient::DemoPlayer_Play(const char *pFilename, int StorageType)
 	Disconnect();
 	m_aNetClient[CONN_MAIN].ResetErrorString();
 
+	SetState(IClient::STATE_LOADING);
+	SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_LOADING_DEMO);
+	if((bool)m_LoadingCallback)
+		m_LoadingCallback(IClient::LOADING_CALLBACK_DETAIL_DEMO);
+
 	// try to start playback
 	m_DemoPlayer.SetListener(this);
 	if(m_DemoPlayer.Load(Storage(), m_pConsole, pFilename, StorageType))
+	{
+		DisconnectWithReason(m_DemoPlayer.ErrorMessage());
 		return m_DemoPlayer.ErrorMessage();
+	}
+
+	m_Sixup = m_DemoPlayer.IsSixup();
 
 	// load map
 	const CMapInfo *pMapInfo = m_DemoPlayer.GetMapInfo();
@@ -3565,7 +3828,8 @@ const char *CClient::DemoPlayer_Play(const char *pFilename, int StorageType)
 		}
 	}
 
-	// setup current info
+	// setup current server info
+	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
 	str_copy(m_CurrentServerInfo.m_aMap, pMapInfo->m_aName);
 	m_CurrentServerInfo.m_MapCrc = pMapInfo->m_Crc;
 	m_CurrentServerInfo.m_MapSize = pMapInfo->m_Size;
@@ -3577,12 +3841,12 @@ const char *CClient::DemoPlayer_Play(const char *pFilename, int StorageType)
 
 	for(int SnapshotType = 0; SnapshotType < NUM_SNAPSHOT_TYPES; SnapshotType++)
 	{
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType] = &m_aDemorecSnapshotHolders[SnapshotType];
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][0];
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][1];
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_SnapSize = 0;
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_AltSnapSize = 0;
-		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_Tick = -1;
+		m_aapSnapshots[0][SnapshotType] = &m_aDemorecSnapshotHolders[SnapshotType];
+		m_aapSnapshots[0][SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][0];
+		m_aapSnapshots[0][SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][1];
+		m_aapSnapshots[0][SnapshotType]->m_SnapSize = 0;
+		m_aapSnapshots[0][SnapshotType]->m_AltSnapSize = 0;
+		m_aapSnapshots[0][SnapshotType]->m_Tick = -1;
 	}
 
 	// enter demo playback state
@@ -3600,10 +3864,8 @@ const char *CClient::DemoPlayer_Render(const char *pFilename, int StorageType, c
 	const char *pError = DemoPlayer_Play(pFilename, StorageType);
 	if(pError)
 		return pError;
-	m_ButtonRender = true;
 
-	this->CClient::StartVideo(NULL, this, pVideoName);
-	m_DemoPlayer.Play();
+	StartVideo(pVideoName, false);
 	m_DemoPlayer.SetSpeedIndex(SpeedIndex);
 	if(StartPaused)
 	{
@@ -3646,21 +3908,38 @@ void CClient::DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int
 	if(State() != IClient::STATE_ONLINE)
 	{
 		if(Verbose)
+		{
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demorec/record", "client is not online");
+		}
 	}
 	else
 	{
 		char aFilename[IO_MAX_PATH_LENGTH];
 		if(WithTimestamp)
 		{
-			char aDate[20];
-			str_timestamp(aDate, sizeof(aDate));
-			str_format(aFilename, sizeof(aFilename), "demos/%s_%s.demo", pFilename, aDate);
+			char aTimestamp[20];
+			str_timestamp(aTimestamp, sizeof(aTimestamp));
+			str_format(aFilename, sizeof(aFilename), "demos/%s_%s.demo", pFilename, aTimestamp);
 		}
 		else
+		{
 			str_format(aFilename, sizeof(aFilename), "demos/%s.demo", pFilename);
+		}
 
-		m_aDemoRecorder[Recorder].Start(Storage(), m_pConsole, aFilename, GameClient()->NetVersion(), m_aCurrentMap, m_pMap->Sha256(), m_pMap->Crc(), "client", m_pMap->MapSize(), 0, m_pMap->File());
+		m_aDemoRecorder[Recorder].Start(
+			Storage(),
+			m_pConsole,
+			aFilename,
+			IsSixup() ? GameClient()->NetVersion7() : GameClient()->NetVersion(),
+			m_aCurrentMap,
+			m_pMap->Sha256(),
+			m_pMap->Crc(),
+			"client",
+			m_pMap->MapSize(),
+			0,
+			m_pMap->File(),
+			nullptr,
+			nullptr);
 	}
 }
 
@@ -3668,10 +3947,12 @@ void CClient::DemoRecorder_HandleAutoStart()
 {
 	if(g_Config.m_ClAutoDemoRecord)
 	{
-		DemoRecorder_Stop(RECORDER_AUTO);
-		char aBuf[512];
-		str_format(aBuf, sizeof(aBuf), "auto/%s", m_aCurrentMap);
-		DemoRecorder_Start(aBuf, true, RECORDER_AUTO);
+		DemoRecorder(RECORDER_AUTO)->Stop(IDemoRecorder::EStopMode::KEEP_FILE);
+
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "auto/%s", m_aCurrentMap);
+		DemoRecorder_Start(aFilename, true, RECORDER_AUTO);
+
 		if(g_Config.m_ClAutoDemoMax)
 		{
 			// clean up auto recorded demos
@@ -3679,34 +3960,22 @@ void CClient::DemoRecorder_HandleAutoStart()
 			AutoDemos.Init(Storage(), "demos/auto", "" /* empty for wild card */, ".demo", g_Config.m_ClAutoDemoMax);
 		}
 	}
-	if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording())
-	{
-		DemoRecorder_StartReplayRecorder();
-	}
+
+	DemoRecorder_UpdateReplayRecorder();
 }
 
-void CClient::DemoRecorder_StartReplayRecorder()
+void CClient::DemoRecorder_UpdateReplayRecorder()
 {
-	if(g_Config.m_ClReplays)
+	if(!g_Config.m_ClReplays && DemoRecorder(RECORDER_REPLAYS)->IsRecording())
 	{
-		DemoRecorder_Stop(RECORDER_REPLAYS);
-		char aBuf[512];
-		str_format(aBuf, sizeof(aBuf), "replays/replay_tmp-%s", m_aCurrentMap);
-		DemoRecorder_Start(aBuf, true, RECORDER_REPLAYS);
+		DemoRecorder(RECORDER_REPLAYS)->Stop(IDemoRecorder::EStopMode::REMOVE_FILE);
 	}
-}
 
-void CClient::DemoRecorder_Stop(int Recorder, bool RemoveFile)
-{
-	m_aDemoRecorder[Recorder].Stop();
-	if(RemoveFile)
+	if(g_Config.m_ClReplays && !DemoRecorder(RECORDER_REPLAYS)->IsRecording())
 	{
-		const char *pFilename = m_aDemoRecorder[Recorder].GetCurrentFilename();
-		if(pFilename[0] != '\0')
-		{
-			Storage()->RemoveFile(pFilename, IStorage::TYPE_SAVE);
-			m_aDemoRecorder[Recorder].ClearCurrentFilename();
-		}
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "replays/replay_tmp_%s", m_aCurrentMap);
+		DemoRecorder_Start(aFilename, true, RECORDER_REPLAYS);
 	}
 }
 
@@ -3739,7 +4008,7 @@ void CClient::Con_Record(IConsole::IResult *pResult, void *pUserData)
 void CClient::Con_StopRecord(IConsole::IResult *pResult, void *pUserData)
 {
 	CClient *pSelf = (CClient *)pUserData;
-	pSelf->DemoRecorder_Stop(RECORDER_MANUAL);
+	pSelf->DemoRecorder(RECORDER_MANUAL)->Stop(IDemoRecorder::EStopMode::KEEP_FILE);
 }
 
 void CClient::Con_AddDemoMarker(IConsole::IResult *pResult, void *pUserData)
@@ -3769,6 +4038,7 @@ void CClient::UpdateAndSwap()
 	Input()->Update();
 	Graphics()->Swap();
 	Graphics()->Clear(0, 0, 0);
+	m_GlobalTime = (time_get() - m_GlobalStartTime) / (float)time_freq();
 }
 
 void CClient::ServerBrowserUpdate()
@@ -3816,7 +4086,7 @@ int CClient::HandleChecksum(int Conn, CUuid Uuid, CUnpacker *pUnpacker)
 	{
 		return 1;
 	}
-	if(Start < 0 || Length < 0 || Start > INT_MAX - Length)
+	if(Start < 0 || Length < 0 || Start > std::numeric_limits<int>::max() - Length)
 	{
 		return 2;
 	}
@@ -3908,19 +4178,29 @@ int CClient::HandleChecksum(int Conn, CUuid Uuid, CUnpacker *pUnpacker)
 
 void CClient::SwitchWindowScreen(int Index)
 {
-	// Todo SDL: remove this when fixed (changing screen when in fullscreen is bugged)
-	if(g_Config.m_GfxFullscreen)
-	{
-		SetWindowParams(0, g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
-		if(Graphics()->SetWindowScreen(Index))
-			g_Config.m_GfxScreen = Index;
-		SetWindowParams(g_Config.m_GfxFullscreen, g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
-	}
-	else
+	//Tested on windows 11 64 bit (gtx 1660 super, intel UHD 630 opengl 1.2.0, 3.3.0 and vulkan 1.1.0)
+	int IsFullscreen = g_Config.m_GfxFullscreen;
+	int IsBorderless = g_Config.m_GfxBorderless;
+
+	if(!Graphics()->SetWindowScreen(Index))
 	{
-		if(Graphics()->SetWindowScreen(Index))
-			g_Config.m_GfxScreen = Index;
+		return;
 	}
+
+	SetWindowParams(3, false); // prevent DDNet to get stretch on monitors
+
+	CVideoMode CurMode;
+	Graphics()->GetCurrentVideoMode(CurMode, Index);
+
+	const int Depth = CurMode.m_Red + CurMode.m_Green + CurMode.m_Blue > 16 ? 24 : 16;
+	g_Config.m_GfxColorDepth = Depth;
+	g_Config.m_GfxScreenWidth = CurMode.m_WindowWidth;
+	g_Config.m_GfxScreenHeight = CurMode.m_WindowHeight;
+	g_Config.m_GfxScreenRefreshRate = CurMode.m_RefreshRate;
+
+	Graphics()->ResizeToScreen();
+
+	SetWindowParams(IsFullscreen, IsBorderless);
 }
 
 void CClient::ConchainWindowScreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
@@ -3935,11 +4215,11 @@ void CClient::ConchainWindowScreen(IConsole::IResult *pResult, void *pUserData,
 		pfnCallback(pResult, pCallbackUserData);
 }
 
-void CClient::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+void CClient::SetWindowParams(int FullscreenMode, bool IsBorderless)
 {
 	g_Config.m_GfxFullscreen = clamp(FullscreenMode, 0, 3);
 	g_Config.m_GfxBorderless = (int)IsBorderless;
-	Graphics()->SetWindowParams(FullscreenMode, IsBorderless, AllowResizing);
+	Graphics()->SetWindowParams(FullscreenMode, IsBorderless);
 }
 
 void CClient::ConchainFullscreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
@@ -3948,7 +4228,7 @@ void CClient::ConchainFullscreen(IConsole::IResult *pResult, void *pUserData, IC
 	if(pSelf->Graphics() && pResult->NumArguments())
 	{
 		if(g_Config.m_GfxFullscreen != pResult->GetInteger(0))
-			pSelf->SetWindowParams(pResult->GetInteger(0), g_Config.m_GfxBorderless, pResult->GetInteger(0) != 3);
+			pSelf->SetWindowParams(pResult->GetInteger(0), g_Config.m_GfxBorderless);
 	}
 	else
 		pfnCallback(pResult, pCallbackUserData);
@@ -3960,7 +4240,7 @@ void CClient::ConchainWindowBordered(IConsole::IResult *pResult, void *pUserData
 	if(pSelf->Graphics() && pResult->NumArguments())
 	{
 		if(!g_Config.m_GfxFullscreen && (g_Config.m_GfxBorderless != pResult->GetInteger(0)))
-			pSelf->SetWindowParams(g_Config.m_GfxFullscreen, !g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
+			pSelf->SetWindowParams(g_Config.m_GfxFullscreen, !g_Config.m_GfxBorderless);
 	}
 	else
 		pfnCallback(pResult, pCallbackUserData);
@@ -4007,7 +4287,7 @@ void CClient::ConchainWindowResize(IConsole::IResult *pResult, void *pUserData,
 	pfnCallback(pResult, pCallbackUserData);
 	if(pSelf->Graphics() && pResult->NumArguments())
 	{
-		pSelf->Graphics()->Resize(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+		pSelf->Graphics()->ResizeToScreen();
 	}
 }
 
@@ -4033,17 +4313,7 @@ void CClient::ConchainReplays(IConsole::IResult *pResult, void *pUserData, ICons
 	pfnCallback(pResult, pCallbackUserData);
 	if(pResult->NumArguments())
 	{
-		int Status = pResult->GetInteger(0);
-		if(Status == 0)
-		{
-			// stop recording and remove the tmp demo file
-			pSelf->DemoRecorder_Stop(RECORDER_REPLAYS, true);
-		}
-		else
-		{
-			// start recording
-			pSelf->DemoRecorder_HandleAutoStart();
-		}
+		pSelf->DemoRecorder_UpdateReplayRecorder();
 	}
 }
 
@@ -4070,16 +4340,6 @@ void CClient::ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserD
 void CClient::RegisterCommands()
 {
 	m_pConsole = Kernel()->RequestInterface<IConsole>();
-	// register server dummy commands for tab completion
-	m_pConsole->Register("kick", "i[id] ?r[reason]", CFGFLAG_SERVER, 0, 0, "Kick player with specified id for any reason");
-	m_pConsole->Register("ban", "s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER, 0, 0, "Ban player with ip/id for x minutes for any reason");
-	m_pConsole->Register("unban", "r[ip]", CFGFLAG_SERVER, 0, 0, "Unban ip");
-	m_pConsole->Register("bans", "?i[page]", CFGFLAG_SERVER, 0, 0, "Show banlist (page 0 by default, 20 entries per page)");
-	m_pConsole->Register("status", "?r[name]", CFGFLAG_SERVER, 0, 0, "List players containing name or all players");
-	m_pConsole->Register("shutdown", "", CFGFLAG_SERVER, 0, 0, "Shut down");
-	m_pConsole->Register("record", "r[file]", CFGFLAG_SERVER, 0, 0, "Record to a file");
-	m_pConsole->Register("stoprecord", "", CFGFLAG_SERVER, 0, 0, "Stop recording");
-	m_pConsole->Register("reload", "", CFGFLAG_SERVER, 0, 0, "Reload the map");
 
 	m_pConsole->Register("dummy_connect", "", CFGFLAG_CLIENT, Con_DummyConnect, this, "Connect dummy");
 	m_pConsole->Register("dummy_disconnect", "", CFGFLAG_CLIENT, Con_DummyDisconnect, this, "Disconnect dummy");
@@ -4095,25 +4355,25 @@ void CClient::RegisterCommands()
 	m_pConsole->Register("screenshot", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Screenshot, this, "Take a screenshot");
 
 #if defined(CONF_VIDEORECORDER)
-	m_pConsole->Register("start_video", "", CFGFLAG_CLIENT, Con_StartVideo, this, "Start recording a video");
+	m_pConsole->Register("start_video", "?r[file]", CFGFLAG_CLIENT, Con_StartVideo, this, "Start recording a video");
 	m_pConsole->Register("stop_video", "", CFGFLAG_CLIENT, Con_StopVideo, this, "Stop recording a video");
 #endif
 
 	m_pConsole->Register("rcon", "r[rcon-command]", CFGFLAG_CLIENT, Con_Rcon, this, "Send specified command to rcon");
 	m_pConsole->Register("rcon_auth", "r[password]", CFGFLAG_CLIENT, Con_RconAuth, this, "Authenticate to rcon");
 	m_pConsole->Register("rcon_login", "s[username] r[password]", CFGFLAG_CLIENT, Con_RconLogin, this, "Authenticate to rcon with a username");
-	m_pConsole->Register("play", "r[file]", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Play, this, "Play the file specified");
-	m_pConsole->Register("record", "?r[file]", CFGFLAG_CLIENT, Con_Record, this, "Record to the file");
-	m_pConsole->Register("stoprecord", "", CFGFLAG_CLIENT, Con_StopRecord, this, "Stop recording");
+	m_pConsole->Register("play", "r[file]", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Play, this, "Play back a demo");
+	m_pConsole->Register("record", "?r[file]", CFGFLAG_CLIENT, Con_Record, this, "Start recording a demo");
+	m_pConsole->Register("stoprecord", "", CFGFLAG_CLIENT, Con_StopRecord, this, "Stop recording a demo");
 	m_pConsole->Register("add_demomarker", "", CFGFLAG_CLIENT, Con_AddDemoMarker, this, "Add demo timeline marker");
 	m_pConsole->Register("begin_favorite_group", "", CFGFLAG_CLIENT, Con_BeginFavoriteGroup, this, "Use this before `add_favorite` to group favorites. End with `end_favorite_group`");
 	m_pConsole->Register("end_favorite_group", "", CFGFLAG_CLIENT, Con_EndFavoriteGroup, this, "Use this after `add_favorite` to group favorites. Start with `begin_favorite_group`");
 	m_pConsole->Register("add_favorite", "s[host|ip] ?s['allow_ping']", CFGFLAG_CLIENT, Con_AddFavorite, this, "Add a server as a favorite");
 	m_pConsole->Register("remove_favorite", "r[host|ip]", CFGFLAG_CLIENT, Con_RemoveFavorite, this, "Remove a server from favorites");
-	m_pConsole->Register("demo_slice_start", "", CFGFLAG_CLIENT, Con_DemoSliceBegin, this, "Mark the beginning of a cut");
-	m_pConsole->Register("demo_slice_end", "", CFGFLAG_CLIENT, Con_DemoSliceEnd, this, "Mark the end of a cut");
-	m_pConsole->Register("demo_play", "", CFGFLAG_CLIENT, Con_DemoPlay, this, "Play demo");
-	m_pConsole->Register("demo_speed", "i[speed]", CFGFLAG_CLIENT, Con_DemoSpeed, this, "Set demo speed");
+	m_pConsole->Register("demo_slice_start", "", CFGFLAG_CLIENT, Con_DemoSliceBegin, this, "Mark the beginning of a demo cut");
+	m_pConsole->Register("demo_slice_end", "", CFGFLAG_CLIENT, Con_DemoSliceEnd, this, "Mark the end of a demo cut");
+	m_pConsole->Register("demo_play", "", CFGFLAG_CLIENT, Con_DemoPlay, this, "Play/pause the current demo");
+	m_pConsole->Register("demo_speed", "i[speed]", CFGFLAG_CLIENT, Con_DemoSpeed, this, "Set current demo speed");
 
 	m_pConsole->Register("save_replay", "?i[length] ?r[filename]", CFGFLAG_CLIENT, Con_SaveReplay, this, "Save a replay of the last defined amount of seconds");
 	m_pConsole->Register("benchmark_quit", "i[seconds] r[file]", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_BenchmarkQuit, this, "Benchmark frame times for number of seconds to file, then quit");
@@ -4127,8 +4387,20 @@ void CClient::RegisterCommands()
 
 	// used for server browser update
 	m_pConsole->Chain("br_filter_string", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_exclude_string", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_full", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_empty", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_spectators", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_friends", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_country", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_country_index", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_pw", ConchainServerBrowserUpdate, this);
 	m_pConsole->Chain("br_filter_gametype", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_gametype_strict", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_connecting_players", ConchainServerBrowserUpdate, this);
 	m_pConsole->Chain("br_filter_serveraddress", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_unfinished_map", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_login", ConchainServerBrowserUpdate, this);
 	m_pConsole->Chain("add_favorite", ConchainServerBrowserUpdate, this);
 	m_pConsole->Chain("remove_favorite", ConchainServerBrowserUpdate, this);
 	m_pConsole->Chain("end_favorite_group", ConchainServerBrowserUpdate, this);
@@ -4143,12 +4415,6 @@ void CClient::RegisterCommands()
 
 	m_pConsole->Chain("loglevel", ConchainLoglevel, this);
 	m_pConsole->Chain("stdout_output_level", ConchainStdoutOutputLevel, this);
-
-	// DDRace
-
-#define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, 0, 0, help);
-#include <game/ddracecommands.h>
-#undef CONSOLE_COMMAND
 }
 
 static CClient *CreateClient()
@@ -4215,6 +4481,26 @@ static bool SaveUnknownCommandCallback(const char *pCommand, void *pUser)
 	return true;
 }
 
+static Uint32 GetSdlMessageBoxFlags(IClient::EMessageBoxType Type)
+{
+	switch(Type)
+	{
+	case IClient::MESSAGE_BOX_TYPE_ERROR:
+		return SDL_MESSAGEBOX_ERROR;
+	case IClient::MESSAGE_BOX_TYPE_WARNING:
+		return SDL_MESSAGEBOX_WARNING;
+	case IClient::MESSAGE_BOX_TYPE_INFO:
+		return SDL_MESSAGEBOX_INFORMATION;
+	}
+	dbg_assert(false, "Type invalid");
+	return 0;
+}
+
+static void ShowMessageBox(const char *pTitle, const char *pMessage, IClient::EMessageBoxType Type = IClient::MESSAGE_BOX_TYPE_ERROR)
+{
+	SDL_ShowSimpleMessageBox(GetSdlMessageBoxFlags(Type), pTitle, pMessage, nullptr);
+}
+
 /*
 	Server Time
 	Client Mirror Time
@@ -4230,35 +4516,30 @@ static bool SaveUnknownCommandCallback(const char *pCommand, void *pUser)
 #if defined(CONF_PLATFORM_MACOS)
 extern "C" int TWMain(int argc, const char **argv)
 #elif defined(CONF_PLATFORM_ANDROID)
+static int gs_AndroidStarted = false;
 extern "C" __attribute__((visibility("default"))) int SDL_main(int argc, char *argv[]);
-extern "C" void InitAndroid();
-
 int SDL_main(int argc, char *argv2[])
 #else
 int main(int argc, const char **argv)
 #endif
 {
+	const int64_t MainStart = time_get();
+
 #if defined(CONF_PLATFORM_ANDROID)
 	const char **argv = const_cast<const char **>(argv2);
+	// Android might not unload the library from memory, causing globals like gs_AndroidStarted
+	// not to be initialized correctly when starting the app again.
+	if(gs_AndroidStarted)
+	{
+		::ShowMessageBox("Android Error", "The app was started, but not closed properly, this causes bugs. Please restart or manually close this task.");
+		std::exit(0);
+	}
+	gs_AndroidStarted = true;
 #elif defined(CONF_FAMILY_WINDOWS)
 	CWindowsComLifecycle WindowsComLifecycle(true);
 #endif
 	CCmdlineFix CmdlineFix(&argc, &argv);
 
-	bool Silent = false;
-
-	for(int i = 1; i < argc; i++)
-	{
-		if(str_comp("-s", argv[i]) == 0 || str_comp("--silent", argv[i]) == 0)
-		{
-			Silent = true;
-		}
-	}
-
-#if defined(CONF_PLATFORM_ANDROID)
-	InitAndroid();
-#endif
-
 #if defined(CONF_EXCEPTION_HANDLING)
 	init_exception_handler();
 #endif
@@ -4268,6 +4549,14 @@ int main(int argc, const char **argv)
 #if defined(CONF_PLATFORM_ANDROID)
 	pStdoutLogger = std::shared_ptr<ILogger>(log_logger_android());
 #else
+	bool Silent = false;
+	for(int i = 1; i < argc; i++)
+	{
+		if(str_comp("-s", argv[i]) == 0 || str_comp("--silent", argv[i]) == 0)
+		{
+			Silent = true;
+		}
+	}
 	if(!Silent)
 	{
 		pStdoutLogger = std::shared_ptr<ILogger>(log_logger_stdout());
@@ -4285,6 +4574,17 @@ int main(int argc, const char **argv)
 	vpLoggers.push_back(pFutureAssertionLogger);
 	log_set_global_logger(log_logger_collection(std::move(vpLoggers)).release());
 
+#if defined(CONF_PLATFORM_ANDROID)
+	// Initialize Android after logger is available
+	const char *pAndroidInitError = InitAndroid();
+	if(pAndroidInitError != nullptr)
+	{
+		log_error("android", "%s", pAndroidInitError);
+		::ShowMessageBox("Android Error", pAndroidInitError);
+		std::exit(0);
+	}
+#endif
+
 	std::stack<std::function<void()>> CleanerFunctions;
 	std::function<void()> PerformCleanup = [&CleanerFunctions]() mutable {
 		while(!CleanerFunctions.empty())
@@ -4295,7 +4595,17 @@ int main(int argc, const char **argv)
 	};
 	std::function<void()> PerformFinalCleanup = []() {
 #ifdef CONF_PLATFORM_ANDROID
-		// properly close this native thread, so globals are destructed
+		// Forcefully terminate the entire process, to ensure that static variables
+		// will be initialized correctly when the app is started again after quitting.
+		// Returning from the main function is not enough, as this only results in the
+		// native thread terminating, but the Java thread will continue. Java does not
+		// support unloading libraries once they have been loaded, so all static
+		// variables will not have their expected initial values anymore when the app
+		// is started again after quitting. The variable gs_AndroidStarted above is
+		// used to check that static variables have been initialized properly.
+		// TODO: This is not the correct way to close an activity on Android, as it
+		//       ignores the activity lifecycle entirely, which may cause issues if
+		//       we ever used any global resources like the camera.
 		std::exit(0);
 #endif
 	};
@@ -4320,6 +4630,8 @@ int main(int argc, const char **argv)
 	pKernel->RegisterInterface(pClient, false);
 	pClient->RegisterInterfaces();
 	CleanerFunctions.emplace([pKernel, pClient]() {
+		// Ensure that the assert handler doesn't use the client/graphics after they've been destroyed
+		dbg_assert_set_handler(nullptr);
 		pKernel->Shutdown();
 		delete pKernel;
 		delete pClient;
@@ -4332,8 +4644,8 @@ int main(int argc, const char **argv)
 		char aVersionStr[128];
 		if(!os_version_str(aVersionStr, sizeof(aVersionStr)))
 			str_copy(aVersionStr, "unknown");
-		char aGPUInfo[256];
-		pClient->GetGPUInfoString(aGPUInfo);
+		char aGpuInfo[256];
+		pClient->GetGpuInfoString(aGpuInfo);
 		char aMessage[768];
 		str_format(aMessage, sizeof(aMessage),
 			"An assertion error occurred. Please write down or take a screenshot of the following information and report this error.\n"
@@ -4344,7 +4656,7 @@ int main(int argc, const char **argv)
 			"OS version: %s\n\n"
 			"%s", // GPU info
 			pMsg, CONF_PLATFORM_STRING, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH != nullptr ? GIT_SHORTREV_HASH : "", aVersionStr,
-			aGPUInfo);
+			aGpuInfo);
 		pClient->ShowMessageBox("Assertion Error", aMessage);
 		// Client will crash due to assertion, don't call PerformAllCleanup in this inconsistent state
 	});
@@ -4357,7 +4669,7 @@ int main(int argc, const char **argv)
 		delete pEngine;
 	});
 
-	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_CLIENT, argc, (const char **)argv);
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_CLIENT, argc, argv);
 	pKernel->RegisterInterface(pStorage);
 
 	pFutureAssertionLogger->Set(CreateAssertionLogger(pStorage, GAME_NAME));
@@ -4375,7 +4687,7 @@ int main(int argc, const char **argv)
 	if(RandInitFailed)
 	{
 		const char *pError = "Failed to initialize the secure RNG.";
-		dbg_msg("secure", "%s", pError);
+		log_error("secure", "%s", pError);
 		pClient->ShowMessageBox("Secure RNG Error", pError);
 		PerformAllCleanup();
 		return -1;
@@ -4436,7 +4748,7 @@ int main(int argc, const char **argv)
 		if(!pConsole->ExecuteFile(CONFIG_FILE))
 		{
 			const char *pError = "Failed to load config from '" CONFIG_FILE "'.";
-			dbg_msg("client", "%s", pError);
+			log_error("client", "%s", pError);
 			pClient->ShowMessageBox("Config File Error", pError);
 			PerformAllCleanup();
 			return -1;
@@ -4467,7 +4779,7 @@ int main(int argc, const char **argv)
 
 	// parse the command line arguments
 	pConsole->SetUnknownCommandCallback(UnknownArgumentCallback, pClient);
-	pConsole->ParseArguments(argc - 1, (const char **)&argv[1]);
+	pConsole->ParseArguments(argc - 1, &argv[1]);
 	pConsole->SetUnknownCommandCallback(IConsole::EmptyUnknownCommandCallback, nullptr);
 
 	if(pSteam->GetConnectAddress())
@@ -4476,9 +4788,9 @@ int main(int argc, const char **argv)
 		pSteam->ClearConnectAddress();
 	}
 
-	const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
 	if(g_Config.m_Logfile[0])
 	{
+		const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
 		IOHANDLE Logfile = pStorage->OpenFile(g_Config.m_Logfile, Mode, IStorage::TYPE_SAVE_OR_ABSOLUTE);
 		if(Logfile)
 		{
@@ -4486,15 +4798,29 @@ int main(int argc, const char **argv)
 		}
 		else
 		{
-			dbg_msg("client", "failed to open '%s' for logging", g_Config.m_Logfile);
+			log_error("client", "failed to open '%s' for logging", g_Config.m_Logfile);
+			pFutureFileLogger->Set(log_logger_noop());
 		}
 	}
+	else
+	{
+		pFutureFileLogger->Set(log_logger_noop());
+	}
 
 	// Register protocol and file extensions
 #if defined(CONF_FAMILY_WINDOWS)
 	pClient->ShellRegister();
 #endif
 
+	// Do not automatically translate touch events to mouse events and vice versa.
+	SDL_SetHint("SDL_TOUCH_MOUSE_EVENTS", "0");
+	SDL_SetHint("SDL_MOUSE_TOUCH_EVENTS", "0");
+
+	// Support longer IME composition strings (enables SDL_TEXTEDITING_EXT).
+#if SDL_VERSION_ATLEAST(2, 0, 22)
+	SDL_SetHint(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, "1");
+#endif
+
 #if defined(CONF_PLATFORM_MACOS)
 	// Hints will not be set if there is an existing override hint or environment variable that takes precedence.
 	// So this respects cli environment overrides.
@@ -4507,33 +4833,54 @@ int main(int argc, const char **argv)
 	SDL_SetHint("SDL_IME_SHOW_UI", "1");
 #endif
 
+#if defined(CONF_PLATFORM_ANDROID)
+	// Trap the Android back button so it can be handled in our code reliably
+	// instead of letting the system handle it.
+	SDL_SetHint("SDL_ANDROID_TRAP_BACK_BUTTON", "1");
+	// Force landscape screen orientation.
+	SDL_SetHint("SDL_IOS_ORIENTATIONS", "LandscapeLeft LandscapeRight");
+#endif
+
 	// init SDL
 	if(SDL_Init(0) < 0)
 	{
 		char aError[256];
 		str_format(aError, sizeof(aError), "Unable to initialize SDL base: %s", SDL_GetError());
-		dbg_msg("client", "%s", aError);
+		log_error("client", "%s", aError);
 		pClient->ShowMessageBox("SDL Error", aError);
 		PerformAllCleanup();
 		return -1;
 	}
 
 	// run the client
-	dbg_msg("client", "starting...");
+	log_trace("client", "initialization finished after %.2fms, starting...", (time_get() - MainStart) * 1000.0f / (float)time_freq());
 	pClient->Run();
 
 	const bool Restarting = pClient->State() == CClient::STATE_RESTARTING;
+#if !defined(CONF_PLATFORM_ANDROID)
 	char aRestartBinaryPath[IO_MAX_PATH_LENGTH];
 	if(Restarting)
 	{
 		pStorage->GetBinaryPath(PLAT_CLIENT_EXEC, aRestartBinaryPath, sizeof(aRestartBinaryPath));
 	}
+#endif
+
+	std::vector<SWarning> vQuittingWarnings = pClient->QuittingWarnings();
 
 	PerformCleanup();
 
+	for(const SWarning &Warning : vQuittingWarnings)
+	{
+		::ShowMessageBox(Warning.m_aWarningTitle, Warning.m_aWarningMsg);
+	}
+
 	if(Restarting)
 	{
-		shell_execute(aRestartBinaryPath);
+#if defined(CONF_PLATFORM_ANDROID)
+		RestartAndroidApp();
+#else
+		shell_execute(aRestartBinaryPath, EShellExecuteWindowState::FOREGROUND);
+#endif
 	}
 
 	PerformFinalCleanup();
@@ -4568,13 +4915,28 @@ void CClient::RaceRecord_Start(const char *pFilename)
 	if(State() != IClient::STATE_ONLINE)
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demorec/record", "client is not online");
 	else
-		m_aDemoRecorder[RECORDER_RACE].Start(Storage(), m_pConsole, pFilename, GameClient()->NetVersion(), m_aCurrentMap, m_pMap->Sha256(), m_pMap->Crc(), "client", m_pMap->MapSize(), 0, m_pMap->File());
+		m_aDemoRecorder[RECORDER_RACE].Start(
+			Storage(),
+			m_pConsole,
+			pFilename,
+			IsSixup() ? GameClient()->NetVersion7() : GameClient()->NetVersion(),
+			m_aCurrentMap,
+			m_pMap->Sha256(),
+			m_pMap->Crc(),
+			"client",
+			m_pMap->MapSize(),
+			0,
+			m_pMap->File(),
+			nullptr,
+			nullptr);
 }
 
 void CClient::RaceRecord_Stop()
 {
 	if(m_aDemoRecorder[RECORDER_RACE].IsRecording())
-		m_aDemoRecorder[RECORDER_RACE].Stop();
+	{
+		m_aDemoRecorder[RECORDER_RACE].Stop(IDemoRecorder::EStopMode::KEEP_FILE);
+	}
 }
 
 bool CClient::RaceRecord_IsRecording()
@@ -4584,6 +4946,9 @@ bool CClient::RaceRecord_IsRecording()
 
 void CClient::RequestDDNetInfo()
 {
+	if(m_pDDNetInfoTask && !m_pDDNetInfoTask->Done())
+		return;
+
 	char aUrl[256];
 	str_copy(aUrl, DDNET_INFO_URL);
 
@@ -4596,10 +4961,10 @@ void CClient::RequestDDNetInfo()
 	}
 
 	// Use ipv4 so we can know the ingame ip addresses of players before they join game servers
-	m_pDDNetInfoTask = HttpGetFile(aUrl, Storage(), m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+	m_pDDNetInfoTask = HttpGet(aUrl);
 	m_pDDNetInfoTask->Timeout(CTimeout{10000, 0, 500, 10});
 	m_pDDNetInfoTask->IpResolve(IPRESOLVE::V4);
-	Engine()->AddJob(m_pDDNetInfoTask);
+	Http()->Run(m_pDDNetInfoTask);
 }
 
 int CClient::GetPredictionTime()
@@ -4694,6 +5059,51 @@ int CClient::UdpConnectivity(int NetType)
 	return Connectivity;
 }
 
+bool CClient::ViewLink(const char *pLink)
+{
+#if defined(CONF_PLATFORM_ANDROID)
+	if(SDL_OpenURL(pLink) == 0)
+	{
+		return true;
+	}
+	log_error("client", "Failed to open link '%s' (%s)", pLink, SDL_GetError());
+	return false;
+#else
+	if(open_link(pLink))
+	{
+		return true;
+	}
+	log_error("client", "Failed to open link '%s'", pLink);
+	return false;
+#endif
+}
+
+bool CClient::ViewFile(const char *pFilename)
+{
+#if defined(CONF_PLATFORM_MACOS)
+	return ViewLink(pFilename);
+#else
+	// Create a file link so the path can contain forward and
+	// backward slashes. But the file link must be absolute.
+	char aWorkingDir[IO_MAX_PATH_LENGTH];
+	if(fs_is_relative_path(pFilename))
+	{
+		if(!fs_getcwd(aWorkingDir, sizeof(aWorkingDir)))
+		{
+			log_error("client", "Failed to open file '%s' (failed to get working directory)", pFilename);
+			return false;
+		}
+		str_append(aWorkingDir, "/");
+	}
+	else
+		aWorkingDir[0] = '\0';
+
+	char aFileLink[IO_MAX_PATH_LENGTH];
+	str_format(aFileLink, sizeof(aFileLink), "file://%s%s", aWorkingDir, pFilename);
+	return ViewLink(aFileLink);
+#endif
+}
+
 #if defined(CONF_FAMILY_WINDOWS)
 void CClient::ShellRegister()
 {
@@ -4701,19 +5111,19 @@ void CClient::ShellRegister()
 	Storage()->GetBinaryPathAbsolute(PLAT_CLIENT_EXEC, aFullPath, sizeof(aFullPath));
 	if(!aFullPath[0])
 	{
-		dbg_msg("client", "Failed to register protocol and file extensions: could not determine absolute path");
+		log_error("client", "Failed to register protocol and file extensions: could not determine absolute path");
 		return;
 	}
 
 	bool Updated = false;
 	if(!shell_register_protocol("ddnet", aFullPath, &Updated))
-		dbg_msg("client", "Failed to register ddnet protocol");
+		log_error("client", "Failed to register ddnet protocol");
 	if(!shell_register_extension(".map", "Map File", GAME_NAME, aFullPath, &Updated))
-		dbg_msg("client", "Failed to register .map file extension");
+		log_error("client", "Failed to register .map file extension");
 	if(!shell_register_extension(".demo", "Demo File", GAME_NAME, aFullPath, &Updated))
-		dbg_msg("client", "Failed to register .demo file extension");
+		log_error("client", "Failed to register .demo file extension");
 	if(!shell_register_application(GAME_NAME, aFullPath, &Updated))
-		dbg_msg("client", "Failed to register application");
+		log_error("client", "Failed to register application");
 	if(Updated)
 		shell_update();
 }
@@ -4724,54 +5134,39 @@ void CClient::ShellUnregister()
 	Storage()->GetBinaryPathAbsolute(PLAT_CLIENT_EXEC, aFullPath, sizeof(aFullPath));
 	if(!aFullPath[0])
 	{
-		dbg_msg("client", "Failed to unregister protocol and file extensions: could not determine absolute path");
+		log_error("client", "Failed to unregister protocol and file extensions: could not determine absolute path");
 		return;
 	}
 
 	bool Updated = false;
 	if(!shell_unregister_class("ddnet", &Updated))
-		dbg_msg("client", "Failed to unregister ddnet protocol");
+		log_error("client", "Failed to unregister ddnet protocol");
 	if(!shell_unregister_class(GAME_NAME ".map", &Updated))
-		dbg_msg("client", "Failed to unregister .map file extension");
+		log_error("client", "Failed to unregister .map file extension");
 	if(!shell_unregister_class(GAME_NAME ".demo", &Updated))
-		dbg_msg("client", "Failed to unregister .demo file extension");
+		log_error("client", "Failed to unregister .demo file extension");
 	if(!shell_unregister_application(aFullPath, &Updated))
-		dbg_msg("client", "Failed to unregister application");
+		log_error("client", "Failed to unregister application");
 	if(Updated)
 		shell_update();
 }
 #endif
 
-static Uint32 GetSdlMessageBoxFlags(IClient::EMessageBoxType Type)
-{
-	switch(Type)
-	{
-	case IClient::MESSAGE_BOX_TYPE_ERROR:
-		return SDL_MESSAGEBOX_ERROR;
-	case IClient::MESSAGE_BOX_TYPE_WARNING:
-		return SDL_MESSAGEBOX_WARNING;
-	case IClient::MESSAGE_BOX_TYPE_INFO:
-		return SDL_MESSAGEBOX_INFORMATION;
-	}
-	dbg_assert(false, "Type invalid");
-	return 0;
-}
-
 void CClient::ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type)
 {
 	if(m_pGraphics == nullptr || !m_pGraphics->ShowMessageBox(GetSdlMessageBoxFlags(Type), pTitle, pMessage))
-		SDL_ShowSimpleMessageBox(GetSdlMessageBoxFlags(Type), pTitle, pMessage, nullptr);
+		::ShowMessageBox(pTitle, pMessage, Type);
 }
 
-void CClient::GetGPUInfoString(char (&aGPUInfo)[256])
+void CClient::GetGpuInfoString(char (&aGpuInfo)[256])
 {
 	if(m_pGraphics != nullptr && m_pGraphics->IsBackendInitialized())
 	{
-		str_format(aGPUInfo, std::size(aGPUInfo), "GPU: %s - %s - %s", m_pGraphics->GetVendorString(), m_pGraphics->GetRendererString(), m_pGraphics->GetVersionString());
+		str_format(aGpuInfo, std::size(aGpuInfo), "GPU: %s - %s - %s", m_pGraphics->GetVendorString(), m_pGraphics->GetRendererString(), m_pGraphics->GetVersionString());
 	}
 	else
 	{
-		str_copy(aGPUInfo, "Graphics backend was not yet initialized.");
+		str_copy(aGpuInfo, "Graphics backend was not yet initialized.");
 	}
 }
 
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 7317ff52df..6113c4acf6 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -21,6 +21,7 @@
 #include <engine/shared/fifo.h>
 #include <engine/shared/http.h>
 #include <engine/shared/network.h>
+#include <engine/textrender.h>
 #include <engine/warning.h>
 
 #include "graph.h"
@@ -76,6 +77,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	IStorage *m_pStorage = nullptr;
 	IEngineTextRender *m_pTextRender = nullptr;
 	IUpdater *m_pUpdater = nullptr;
+	CHttp m_Http;
 
 	CNetClient m_aNetClient[NUM_CONNS];
 	CDemoPlayer m_DemoPlayer;
@@ -90,7 +92,8 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	char m_aConnectAddressStr[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE] = "";
 
-	CUuid m_ConnectionID = UUID_ZEROED;
+	CUuid m_ConnectionId = UUID_ZEROED;
+	bool m_Sixup;
 
 	bool m_HaveGlobalTcpAddr = false;
 	NETADDR m_GlobalTcpAddr = NETADDR_ZEROED;
@@ -108,7 +111,6 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	bool m_AutoStatScreenshotRecycle = false;
 	bool m_AutoCSVRecycle = false;
 	bool m_EditorActive = false;
-	bool m_SoundInitFailed = false;
 
 	int m_aAckGameTick[NUM_DUMMIES] = {-1, -1};
 	int m_aCurrentRecvTick[NUM_DUMMIES] = {0, 0};
@@ -116,9 +118,10 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	char m_aRconUsername[32] = "";
 	char m_aRconPassword[sizeof(g_Config.m_SvRconPassword)] = "";
 	int m_UseTempRconCommands = 0;
+	int m_ExpectedRconCommands = -1;
+	int m_GotRconCommands = 0;
 	char m_aPassword[sizeof(g_Config.m_Password)] = "";
 	bool m_SendPassword = false;
-	bool m_ButtonRender = false;
 
 	// version-checking
 	char m_aVersionStr[10] = "0";
@@ -157,7 +160,6 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	SHA256_DIGEST m_MapDetailsSha256 = SHA256_ZEROED;
 	char m_aMapDetailsUrl[256] = "";
 
-	char m_aDDNetInfoTmp[64];
 	std::shared_ptr<CHttpRequest> m_pDDNetInfoTask = nullptr;
 
 	// time
@@ -177,8 +179,11 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	int m_aCurrentInput[NUM_DUMMIES] = {0, 0};
 	bool m_LastDummy = false;
 	bool m_DummySendConnInfo = false;
+	bool m_DummyConnecting = false;
 	bool m_DummyConnected = false;
-	int m_LastDummyConnectTime = 0;
+	float m_LastDummyConnectTime = 0.0f;
+	bool m_DummyReconnectOnReload = false;
+	bool m_DummyDeactivateOnReconnect = false;
 
 	// graphs
 	CGraph m_InputtimeMarginGraph;
@@ -205,6 +210,8 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	bool m_ServerSentCapabilities = false;
 	CServerCapabilities m_ServerCapabilities;
 
+	bool ServerCapAnyPlayerFlag() const override { return m_ServerCapabilities.m_AnyPlayerFlag; }
+
 	CServerInfo m_CurrentServerInfo;
 	int64_t m_CurrentServerInfoRequestTime = -1; // >= 0 should request, == -1 got info
 
@@ -229,6 +236,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	} m_VersionInfo;
 
 	std::vector<SWarning> m_vWarnings;
+	std::vector<SWarning> m_vQuittingWarnings;
 
 	CFifo m_Fifo;
 
@@ -252,6 +260,9 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	std::shared_ptr<ILogger> m_pFileLogger = nullptr;
 	std::shared_ptr<ILogger> m_pStdoutLogger = nullptr;
 
+	// For DummyName function
+	char m_aAutomaticDummyName[MAX_NAME_LENGTH];
+
 public:
 	IConfigManager *ConfigManager() { return m_pConfigManager; }
 	CConfig *Config() { return m_pConfig; }
@@ -266,6 +277,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	IStorage *Storage() { return m_pStorage; }
 	IEngineTextRender *TextRender() { return m_pTextRender; }
 	IUpdater *Updater() { return m_pUpdater; }
+	IHttp *Http() { return &m_Http; }
 
 	CClient();
 
@@ -273,7 +285,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	int SendMsg(int Conn, CMsgPacker *pMsg, int Flags) override;
 	// Send via the currently active client (main/dummy)
 	int SendMsgActive(CMsgPacker *pMsg, int Flags) override;
-	void SendStA(bool Dummy);
+
 	void SendInfo(int Conn);
 	void SendEnterGame(int Conn);
 	void SendReady(int Conn);
@@ -283,14 +295,13 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	bool UseTempRconCommands() const override { return m_UseTempRconCommands != 0; }
 	void RconAuth(const char *pName, const char *pPassword) override;
 	void Rcon(const char *pCmd) override;
+	bool ReceivingRconCommands() const override { return m_ExpectedRconCommands > 0; }
+	float GotRconCommandsPercentage() const override;
 
 	bool ConnectionProblems() const override;
 
-	bool SoundInitFailed() const override { return m_SoundInitFailed; }
-
 	IGraphics::CTextureHandle GetDebugFont() const override { return m_DebugFont; }
 
-	void DirectInput(int *pInput, int Size);
 	void SendInput();
 
 	// TODO: OPT: do this a lot smarter!
@@ -299,7 +310,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	const char *LatestVersion() const override;
 
 	// ------ state handling -----
-	void SetState(EClientState s);
+	void SetState(EClientState State);
 
 	// called when the map is loaded and we should init for a new round
 	void OnEnterGame(bool Dummy);
@@ -311,9 +322,10 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	void DummyDisconnect(const char *pReason) override;
 	void DummyConnect() override;
-	bool DummyConnected() override;
-	bool DummyConnecting() override;
-	bool DummyAllowed() override;
+	bool DummyConnected() const override;
+	bool DummyConnecting() const override;
+	bool DummyConnectingDelayed() const override;
+	bool DummyAllowed() const override;
 
 	void GetServerInfo(CServerInfo *pServerInfo) const override;
 	void ServerInfoRequest();
@@ -323,11 +335,11 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	// ---
 
 	int GetPredictionTime() override;
-	void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const override;
-	int SnapItemSize(int SnapID, int Index) const override;
-	const void *SnapFindItem(int SnapID, int Type, int ID) const override;
-	int SnapNumItems(int SnapID) const override;
+	CSnapItem SnapGetItem(int SnapId, int Index) const override;
+	const void *SnapFindItem(int SnapId, int Type, int Id) const override;
+	int SnapNumItems(int SnapId) const override;
 	void SnapSetStaticsize(int ItemType, int Size) override;
+	void SnapSetStaticsize7(int ItemType, int Size) override;
 
 	void Render();
 	void DebugRender();
@@ -336,27 +348,30 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	void Quit() override;
 
 	const char *PlayerName() const override;
-	const char *DummyName() const override;
+	const char *DummyName() override;
 	const char *ErrorString() const override;
 
 	const char *LoadMap(const char *pName, const char *pFilename, SHA256_DIGEST *pWantedSha256, unsigned WantedCrc);
 	const char *LoadMapSearch(const char *pMapName, SHA256_DIGEST *pWantedSha256, int WantedCrc);
 
+	int TranslateSysMsg(int *pMsgId, bool System, CUnpacker *pUnpacker, CPacker *pPacker, CNetChunk *pPacket, bool *pIsExMsg);
+
 	void ProcessConnlessPacket(CNetChunk *pPacket);
 	void ProcessServerInfo(int Type, NETADDR *pFrom, const void *pData, int DataSize);
 	void ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy);
 
 	int UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo);
 
-	void ResetMapDownload();
+	void ResetMapDownload(bool ResetActive);
 	void FinishMapDownload();
 
 	void RequestDDNetInfo() override;
-	void ResetDDNetInfo();
-	bool IsDDNetInfoChanged();
+	void ResetDDNetInfoTask();
 	void FinishDDNetInfo();
 	void LoadDDNetInfo();
 
+	bool IsSixup() const override { return m_Sixup; }
+
 	const NETADDR &ServerAddress() const override { return *m_aNetClient[CONN_MAIN].ServerAddress(); }
 	int ConnectNetTypes() const override;
 	const char *ConnectAddressString() const override { return m_aConnectAddressStr; }
@@ -395,7 +410,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	static void Con_Screenshot(IConsole::IResult *pResult, void *pUserData);
 
 #if defined(CONF_VIDEORECORDER)
-	static void StartVideo(IConsole::IResult *pResult, void *pUserData, const char *pVideoName);
+	void StartVideo(const char *pFilename, bool WithTimestamp);
 	static void Con_StartVideo(IConsole::IResult *pResult, void *pUserData);
 	static void Con_StopVideo(IConsole::IResult *pResult, void *pUserData);
 	const char *DemoPlayer_Render(const char *pFilename, int StorageType, const char *pVideoName, int SpeedIndex, bool StartPaused = false) override;
@@ -435,8 +450,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	const char *DemoPlayer_Play(const char *pFilename, int StorageType) override;
 	void DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int Recorder, bool Verbose = false) override;
 	void DemoRecorder_HandleAutoStart() override;
-	void DemoRecorder_StartReplayRecorder();
-	void DemoRecorder_Stop(int Recorder, bool RemoveFile = false) override;
+	void DemoRecorder_UpdateReplayRecorder() override;
 	void DemoRecorder_AddDemoMarker(int Recorder);
 	IDemoRecorder *DemoRecorder(int Recorder) override;
 
@@ -460,7 +474,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	// gfx
 	void SwitchWindowScreen(int Index) override;
-	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless) override;
 	void ToggleWindowVSync() override;
 	void Notify(const char *pTitle, const char *pMessage) override;
 	void OnWindowResize() override;
@@ -497,18 +511,21 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	void AddWarning(const SWarning &Warning) override;
 	SWarning *GetCurWarning() override;
+	std::vector<SWarning> &&QuittingWarnings() { return std::move(m_vQuittingWarnings); }
 
 	CChecksumData *ChecksumData() override { return &m_Checksum.m_Data; }
-	bool InfoTaskRunning() override { return m_pDDNetInfoTask != nullptr; }
 	int UdpConnectivity(int NetType) override;
 
+	bool ViewLink(const char *pLink) override;
+	bool ViewFile(const char *pFilename) override;
+
 #if defined(CONF_FAMILY_WINDOWS)
 	void ShellRegister() override;
 	void ShellUnregister() override;
 #endif
 
 	void ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type = MESSAGE_BOX_TYPE_ERROR) override;
-	void GetGPUInfoString(char (&aGPUInfo)[256]) override;
+	void GetGpuInfoString(char (&aGpuInfo)[256]) override;
 	void SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger);
 };
 
diff --git a/src/engine/client/demoedit.cpp b/src/engine/client/demoedit.cpp
index 2872fa31f4..410331e8a1 100644
--- a/src/engine/client/demoedit.cpp
+++ b/src/engine/client/demoedit.cpp
@@ -14,13 +14,14 @@ CDemoEdit::CDemoEdit(const char *pNetVersion, class CSnapshotDelta *pSnapshotDel
 	m_EndTick = EndTick;
 
 	// Init the demoeditor
-	m_DemoEditor.Init(pNetVersion, &m_SnapshotDelta, NULL, pStorage);
+	m_DemoEditor.Init(&m_SnapshotDelta, NULL, pStorage);
 }
 
 void CDemoEdit::Run()
 {
 	// Slice the current demo
-	m_DemoEditor.Slice(m_aDemo, m_aDst, m_StartTick, m_EndTick, NULL, 0);
-	// We remove the temporary demo file
-	m_pStorage->RemoveFile(m_aDemo, IStorage::TYPE_SAVE);
+	m_Success = m_DemoEditor.Slice(m_aDemo, m_aDst, m_StartTick, m_EndTick, NULL, 0);
+	// We remove the temporary demo file if slicing is successful
+	if(m_Success)
+		m_pStorage->RemoveFile(m_aDemo, IStorage::TYPE_SAVE);
 }
diff --git a/src/engine/client/demoedit.h b/src/engine/client/demoedit.h
index a186fc249b..d6b2640253 100644
--- a/src/engine/client/demoedit.h
+++ b/src/engine/client/demoedit.h
@@ -18,10 +18,12 @@ class CDemoEdit : public IJob
 	char m_aDst[256];
 	int m_StartTick;
 	int m_EndTick;
+	bool m_Success;
 
 public:
 	CDemoEdit(const char *pNetVersion, CSnapshotDelta *pSnapshotDelta, IStorage *pStorage, const char *pDemo, const char *pDst, int StartTick, int EndTick);
 	void Run() override;
 	char *Destination() { return m_aDst; }
+	bool Success() { return m_Success; }
 };
 #endif
diff --git a/src/engine/client/discord.cpp b/src/engine/client/discord.cpp
index a65c38d258..cef226d85a 100644
--- a/src/engine/client/discord.cpp
+++ b/src/engine/client/discord.cpp
@@ -1,9 +1,7 @@
 #include <base/system.h>
 #include <engine/discord.h>
-// Hack for universal binary builds on macOS: Ignore arm64 until Discord
-// releases a native arm64 SDK for macOS.
-#include "game/client/component.h"
-#if defined(CONF_DISCORD) && !(defined(CONF_ARCH_ARM64) && defined(CONF_PLATFORM_MACOS))
+
+#if defined(CONF_DISCORD)
 #include <discord_game_sdk.h>
 
 typedef enum EDiscordResult DISCORD_API (*FDiscordCreate)(DiscordVersion, struct DiscordCreateParams *, struct IDiscordCore **);
@@ -32,8 +30,6 @@ class CDiscord : public IDiscord
 	IDiscordActivityEvents m_ActivityEvents;
 	IDiscordActivityManager *m_pActivityManager;
 
-	int m_StartTime;
-
 public:
 	bool Init(FDiscordCreate pfnDiscordCreate)
 	{
@@ -44,7 +40,7 @@ class CDiscord : public IDiscord
 		DiscordCreateParams Params;
 		DiscordCreateParamsSetDefault(&Params);
 
-		Params.client_id = 1089816029913436171; // DDNet
+		Params.client_id = 752165779117441075; // DDNet
 		Params.flags = EDiscordCreateFlags::DiscordCreateFlags_NoRequireDiscord;
 		Params.event_data = this;
 		Params.activity_events = &m_ActivityEvents;
@@ -56,112 +52,33 @@ class CDiscord : public IDiscord
 		}
 
 		m_pActivityManager = m_pCore->get_activity_manager(m_pCore);
-		m_StartTime = time_timestamp();
+		ClearGameInfo();
 		return false;
 	}
 	void Update() override
 	{
 		m_pCore->run_callbacks(m_pCore);
 	}
-	void Start() override
-	{
-		m_StartTime = time_timestamp();
-	}
-
 	void ClearGameInfo() override
 	{
-		m_pActivityManager->clear_activity(m_pActivityManager, 0, 0);
+		DiscordActivity Activity;
+		mem_zero(&Activity, sizeof(DiscordActivity));
+		str_copy(Activity.assets.large_image, "ddnet_logo", sizeof(Activity.assets.large_image));
+		str_copy(Activity.assets.large_text, "DDNet logo", sizeof(Activity.assets.large_text));
+		Activity.timestamps.start = time_timestamp();
+		str_copy(Activity.details, "Offline", sizeof(Activity.details));
+		m_pActivityManager->update_activity(m_pActivityManager, &Activity, 0, 0);
 	}
-
-	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) override
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) override
 	{
 		DiscordActivity Activity;
-
 		mem_zero(&Activity, sizeof(DiscordActivity));
-		/*
-		 if(strcmp(pMapName, "Stronghold") == 0)
-		{
-			str_copy(Activity.assets.large_image, "stronghold1",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Multeasymap") == 0)
-		{
-			str_copy(Activity.assets.large_image, "multeasy",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Multeasymap") == 0)
-		{
-			str_copy(Activity.assets.large_image, "multeasy",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Copy Love Box 2s") == 0)
-		{
-			str_copy(Activity.assets.large_image, "CLB2s",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Copy Love Box") == 0)
-		{
-			str_copy(Activity.assets.large_image, "CLB",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Tutorial") == 0)
-		{
-			str_copy(Activity.assets.large_image, "tutorial",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Simple Down") == 0)
-		{
-			str_copy(Activity.assets.large_image, "simpledown",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Baby Aim 1.0") == 0)
-		{
-			str_copy(Activity.assets.large_image, "babyaim1",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Baby Aim 2.0") == 0)
-		{
-			str_copy(Activity.assets.large_image, "babyaim2",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Baby Aim 3.0") == 0)
-		{
-			str_copy(Activity.assets.large_image, "babyaim3",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Back in Time 3") == 0)
-		{
-			str_copy(Activity.assets.large_image, "bit3",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Back in Time 3") == 0)
-		{
-			str_copy(Activity.assets.large_image, "bit3",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Grandma") == 0)
-		{
-			str_copy(Activity.assets.large_image, "grandma",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Luxis") == 0)
-		{
-			str_copy(Activity.assets.large_image, "luxis",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Stronghold 2") == 0)
-		{
-			str_copy(Activity.assets.large_image, "stronghold2",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Stronghold 3") == 0)
-		{
-			str_copy(Activity.assets.large_image, "stronghold3",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Stronghold 4[Final]") == 0)
-		{
-			str_copy(Activity.assets.large_image, "strongholdF",sizeof(Activity.assets.large_image));
-		}
-		if(strcmp(pMapName, "Grandma") == 0)
-		{
-			str_copy(Activity.assets.large_image, "grandma",sizeof(Activity.assets.large_image));
-		}
-		fuck off */
-		str_copy(Activity.assets.large_text, "StA-Client", sizeof(Activity.assets.large_text));
-		str_copy(Activity.assets.small_image, pImage, sizeof(Activity.assets.large_image));
-		str_copy(Activity.assets.small_text, pText, sizeof(Activity.assets.large_text));
-		Activity.timestamps.start = m_StartTime;
-		str_copy(Activity.assets.large_image, "150e4e96-9c83-4309-b692-b212c08e1934",sizeof(Activity.assets.large_image));
-		str_copy(Activity.state, pPlayerName);
+		str_copy(Activity.assets.large_image, "ddnet_logo", sizeof(Activity.assets.large_image));
+		str_copy(Activity.assets.large_text, "DDNet logo", sizeof(Activity.assets.large_text));
+		Activity.timestamps.start = time_timestamp();
+		str_copy(Activity.details, "Online", sizeof(Activity.details));
 		str_copy(Activity.state, pMapName, sizeof(Activity.state));
 		m_pActivityManager->update_activity(m_pActivityManager, &Activity, 0, 0);
-
-
 	}
 };
 
@@ -189,10 +106,9 @@ IDiscord *CreateDiscordImpl()
 
 class CDiscordStub : public IDiscord
 {
-	void Start() override {}
 	void Update() override {}
 	void ClearGameInfo() override {}
-	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) override {}
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) override {}
 };
 
 IDiscord *CreateDiscord()
@@ -203,4 +119,4 @@ IDiscord *CreateDiscord()
 		return pDiscord;
 	}
 	return new CDiscordStub();
-}
\ No newline at end of file
+}
diff --git a/src/engine/client/enums.h b/src/engine/client/enums.h
new file mode 100644
index 0000000000..45a475fa12
--- /dev/null
+++ b/src/engine/client/enums.h
@@ -0,0 +1,11 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_ENUMS_H
+#define ENGINE_CLIENT_ENUMS_H
+
+enum
+{
+	NUM_DUMMIES = 2,
+};
+
+#endif
diff --git a/src/engine/client/graph.cpp b/src/engine/client/graph.cpp
index 95f62ed8e5..59ab25e684 100644
--- a/src/engine/client/graph.cpp
+++ b/src/engine/client/graph.cpp
@@ -6,13 +6,15 @@
 
 #include "graph.h"
 
+CGraph::CGraph(int MaxEntries) :
+	m_Entries(MaxEntries * (sizeof(SEntry) + 2 * CRingBufferBase::ITEM_SIZE), CRingBufferBase::FLAG_RECYCLE)
+{
+}
+
 void CGraph::Init(float Min, float Max)
 {
 	SetMin(Min);
 	SetMax(Max);
-	m_Index = 0;
-	for(auto &Entry : m_aEntries)
-		Entry.m_Initialized = false;
 }
 
 void CGraph::SetMin(float Min)
@@ -25,34 +27,103 @@ void CGraph::SetMax(float Max)
 	m_MaxRange = m_Max = Max;
 }
 
-void CGraph::Scale()
+void CGraph::Scale(int64_t WantedTotalTime)
 {
+	// Scale X axis for wanted total time
+	if(m_Entries.First() != nullptr)
+	{
+		const int64_t EndTime = m_Entries.Last()->m_Time;
+		bool ScaleTotalTime = false;
+		m_pFirstScaled = nullptr;
+
+		if(m_Entries.First()->m_Time >= EndTime - WantedTotalTime)
+		{
+			m_pFirstScaled = m_Entries.First();
+		}
+		else
+		{
+			m_pFirstScaled = m_Entries.Last();
+			while(m_pFirstScaled)
+			{
+				SEntry *pPrev = m_Entries.Prev(m_pFirstScaled);
+				if(pPrev == nullptr)
+					break;
+				if(pPrev->m_Time < EndTime - WantedTotalTime)
+				{
+					// Scale based on actual total time instead of based on wanted total time,
+					// to avoid flickering last segment due to rounding errors.
+					ScaleTotalTime = true;
+					break;
+				}
+				m_pFirstScaled = pPrev;
+			}
+		}
+
+		m_RenderedTotalTime = ScaleTotalTime ? (EndTime - m_pFirstScaled->m_Time) : WantedTotalTime;
+
+		// Ensure that color is applied to first line segment
+		if(m_pFirstScaled)
+		{
+			m_pFirstScaled->m_ApplyColor = true;
+			SEntry *pNext = m_Entries.Next(m_pFirstScaled);
+			if(pNext != nullptr)
+			{
+				pNext->m_ApplyColor = true;
+			}
+		}
+	}
+	else
+	{
+		m_pFirstScaled = nullptr;
+		m_RenderedTotalTime = 0;
+	}
+
+	// Scale Y axis
 	m_Min = m_MinRange;
 	m_Max = m_MaxRange;
-	for(auto &Entry : m_aEntries)
+	for(SEntry *pEntry = m_pFirstScaled; pEntry != nullptr; pEntry = m_Entries.Next(pEntry))
 	{
-		if(Entry.m_Value > m_Max)
-			m_Max = Entry.m_Value;
-		else if(Entry.m_Value < m_Min)
-			m_Min = Entry.m_Value;
+		if(pEntry->m_Value > m_Max)
+			m_Max = pEntry->m_Value;
+		else if(pEntry->m_Value < m_Min)
+			m_Min = pEntry->m_Value;
 	}
 }
 
 void CGraph::Add(float Value, ColorRGBA Color)
 {
-	InsertAt(m_Index, Value, Color);
-	m_Index = (m_Index + 1) % MAX_VALUES;
+	InsertAt(time_get(), Value, Color);
 }
 
-void CGraph::InsertAt(size_t Index, float Value, ColorRGBA Color)
+void CGraph::InsertAt(int64_t Time, float Value, ColorRGBA Color)
 {
-	dbg_assert(Index < MAX_VALUES, "Index out of bounds");
-	m_aEntries[Index].m_Initialized = true;
-	m_aEntries[Index].m_Value = Value;
-	m_aEntries[Index].m_Color = Color;
+	SEntry *pEntry = m_Entries.Allocate(sizeof(SEntry));
+	pEntry->m_Time = Time;
+	pEntry->m_Value = Value;
+	pEntry->m_Color = Color;
+
+	// Determine whether the line (pPrev, pEntry) has different
+	// vertex colors than the line (pPrevPrev, pPrev).
+	SEntry *pPrev = m_Entries.Prev(pEntry);
+	if(pPrev == nullptr)
+	{
+		pEntry->m_ApplyColor = true;
+	}
+	else
+	{
+		SEntry *pPrevPrev = m_Entries.Prev(pPrev);
+		if(pPrevPrev == nullptr)
+		{
+			pEntry->m_ApplyColor = true;
+		}
+		else
+		{
+			pEntry->m_ApplyColor = Color != pPrev->m_Color || pPrev->m_Color != pPrevPrev->m_Color;
+		}
+	}
 }
 
-void CGraph::Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription) const
+void CGraph::Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription)
 {
 	pGraphics->TextureClear();
 
@@ -66,28 +137,61 @@ void CGraph::Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, flo
 	pGraphics->SetColor(0.95f, 0.95f, 0.95f, 1.0f);
 	IGraphics::CLineItem LineItem(x, y + h / 2, x + w, y + h / 2);
 	pGraphics->LinesDraw(&LineItem, 1);
+
 	pGraphics->SetColor(0.5f, 0.5f, 0.5f, 0.75f);
 	IGraphics::CLineItem aLineItems[2] = {
 		IGraphics::CLineItem(x, y + (h * 3) / 4, x + w, y + (h * 3) / 4),
 		IGraphics::CLineItem(x, y + h / 4, x + w, y + h / 4)};
 	pGraphics->LinesDraw(aLineItems, std::size(aLineItems));
-	for(int i = 1; i < MAX_VALUES; i++)
+
+	if(m_pFirstScaled != nullptr)
 	{
-		const auto &Entry0 = m_aEntries[(m_Index + i - 1) % MAX_VALUES];
-		const auto &Entry1 = m_aEntries[(m_Index + i) % MAX_VALUES];
-		if(!Entry0.m_Initialized || !Entry1.m_Initialized)
-			continue;
-		float a0 = (i - 1) / (float)(MAX_VALUES - 1);
-		float a1 = i / (float)(MAX_VALUES - 1);
-		float v0 = (Entry0.m_Value - m_Min) / (m_Max - m_Min);
-		float v1 = (Entry1.m_Value - m_Min) / (m_Max - m_Min);
-
-		IGraphics::CColorVertex aColorVertices[2] = {
-			IGraphics::CColorVertex(0, Entry0.m_Color.r, Entry0.m_Color.g, Entry0.m_Color.b, Entry0.m_Color.a),
-			IGraphics::CColorVertex(1, Entry1.m_Color.r, Entry1.m_Color.g, Entry1.m_Color.b, Entry1.m_Color.a)};
-		pGraphics->SetColorVertex(aColorVertices, std::size(aColorVertices));
-		IGraphics::CLineItem LineItem2(x + a0 * w, y + h - v0 * h, x + a1 * w, y + h - v1 * h);
-		pGraphics->LinesDraw(&LineItem2, 1);
+		IGraphics::CLineItem aValueLineItems[128];
+		size_t NumValueLineItems = 0;
+
+		const int64_t StartTime = m_pFirstScaled->m_Time;
+
+		SEntry *pEntry0 = m_pFirstScaled;
+		int a0 = round_to_int((pEntry0->m_Time - StartTime) * w / m_RenderedTotalTime);
+		int v0 = round_to_int((pEntry0->m_Value - m_Min) * h / (m_Max - m_Min));
+		while(pEntry0 != nullptr)
+		{
+			SEntry *pEntry1 = m_Entries.Next(pEntry0);
+			if(pEntry1 == nullptr)
+				break;
+
+			const int a1 = round_to_int((pEntry1->m_Time - StartTime) * w / m_RenderedTotalTime);
+			const int v1 = round_to_int((pEntry1->m_Value - m_Min) * h / (m_Max - m_Min));
+
+			if(pEntry1->m_ApplyColor)
+			{
+				if(NumValueLineItems)
+				{
+					pGraphics->LinesDraw(aValueLineItems, NumValueLineItems);
+					NumValueLineItems = 0;
+				}
+
+				IGraphics::CColorVertex aColorVertices[2] = {
+					IGraphics::CColorVertex(0, pEntry0->m_Color.r, pEntry0->m_Color.g, pEntry0->m_Color.b, pEntry0->m_Color.a),
+					IGraphics::CColorVertex(1, pEntry1->m_Color.r, pEntry1->m_Color.g, pEntry1->m_Color.b, pEntry1->m_Color.a)};
+				pGraphics->SetColorVertex(aColorVertices, std::size(aColorVertices));
+			}
+			if(NumValueLineItems == std::size(aValueLineItems))
+			{
+				pGraphics->LinesDraw(aValueLineItems, NumValueLineItems);
+				NumValueLineItems = 0;
+			}
+			aValueLineItems[NumValueLineItems] = IGraphics::CLineItem(x + a0, y + h - v0, x + a1, y + h - v1);
+			++NumValueLineItems;
+
+			pEntry0 = pEntry1;
+			a0 = a1;
+			v0 = v1;
+		}
+		if(NumValueLineItems)
+		{
+			pGraphics->LinesDraw(aValueLineItems, NumValueLineItems);
+		}
 	}
 	pGraphics->LinesEnd();
 
diff --git a/src/engine/client/graph.h b/src/engine/client/graph.h
index 296c6ff9aa..090d506faf 100644
--- a/src/engine/client/graph.h
+++ b/src/engine/client/graph.h
@@ -6,6 +6,8 @@
 
 #include <base/color.h>
 
+#include <engine/shared/ringbuffer.h>
+
 #include <cstddef>
 
 class IGraphics;
@@ -13,33 +15,31 @@ class ITextRender;
 
 class CGraph
 {
-public:
-	enum
-	{
-		MAX_VALUES = 128,
-	};
-
 private:
 	struct SEntry
 	{
-		bool m_Initialized;
+		int64_t m_Time;
 		float m_Value;
 		ColorRGBA m_Color;
+		bool m_ApplyColor;
 	};
+	SEntry *m_pFirstScaled = nullptr;
+	int64_t m_RenderedTotalTime = 0;
 	float m_Min, m_Max;
 	float m_MinRange, m_MaxRange;
-	SEntry m_aEntries[MAX_VALUES];
-	size_t m_Index;
+	CDynamicRingBuffer<SEntry> m_Entries;
 
 public:
+	CGraph(int MaxEntries);
+
 	void Init(float Min, float Max);
 	void SetMin(float Min);
 	void SetMax(float Max);
 
-	void Scale();
+	void Scale(int64_t WantedTotalTime);
 	void Add(float Value, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f));
-	void InsertAt(size_t Index, float Value, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f));
-	void Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription) const;
+	void InsertAt(int64_t Time, float Value, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f));
+	void Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription);
 };
 
 #endif
diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp
index ab22ddeebd..8dc82c34ae 100644
--- a/src/engine/client/graphics_threaded.cpp
+++ b/src/engine/client/graphics_threaded.cpp
@@ -208,9 +208,9 @@ uint64_t CGraphics_Threaded::StagingMemoryUsage() const
 	return m_pBackend->StagingMemoryUsage();
 }
 
-const TTWGraphicsGPUList &CGraphics_Threaded::GetGPUs() const
+const TTwGraphicsGpuList &CGraphics_Threaded::GetGpus() const
 {
-	return m_pBackend->GetGPUs();
+	return m_pBackend->GetGpus();
 }
 
 void CGraphics_Threaded::MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY)
@@ -288,106 +288,41 @@ void CGraphics_Threaded::FreeTextureIndex(CTextureHandle *pIndex)
 	pIndex->Invalidate();
 }
 
-int CGraphics_Threaded::UnloadTexture(CTextureHandle *pIndex)
+void CGraphics_Threaded::UnloadTexture(CTextureHandle *pIndex)
 {
-	if(pIndex->Id() == m_NullTexture.Id())
-		return 0;
-
-	if(!pIndex->IsValid())
-		return 0;
+	if(pIndex->IsNullTexture() || !pIndex->IsValid())
+		return;
 
 	CCommandBuffer::SCommand_Texture_Destroy Cmd;
 	Cmd.m_Slot = pIndex->Id();
 	AddCmd(Cmd);
 
 	FreeTextureIndex(pIndex);
-	return 0;
-}
-
-static bool ConvertToRGBA(uint8_t *pDest, const uint8_t *pSrc, size_t SrcWidth, size_t SrcHeight, CImageInfo::EImageFormat SrcFormat)
-{
-	if(SrcFormat == CImageInfo::FORMAT_RGBA)
-	{
-		mem_copy(pDest, pSrc, SrcWidth * SrcHeight * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA));
-		return true;
-	}
-	else
-	{
-		const size_t SrcChannelCount = CImageInfo::PixelSize(SrcFormat);
-		const size_t DstChannelCount = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
-		for(size_t Y = 0; Y < SrcHeight; ++Y)
-		{
-			for(size_t X = 0; X < SrcWidth; ++X)
-			{
-				size_t ImgOffsetSrc = (Y * SrcWidth * SrcChannelCount) + (X * SrcChannelCount);
-				size_t ImgOffsetDest = (Y * SrcWidth * DstChannelCount) + (X * DstChannelCount);
-				size_t CopySize = SrcChannelCount;
-				if(SrcFormat == CImageInfo::FORMAT_RGB)
-				{
-					mem_copy(&pDest[ImgOffsetDest], &pSrc[ImgOffsetSrc], CopySize);
-					pDest[ImgOffsetDest + 3] = 255;
-				}
-				else if(SrcFormat == CImageInfo::FORMAT_SINGLE_COMPONENT)
-				{
-					pDest[ImgOffsetDest + 0] = 255;
-					pDest[ImgOffsetDest + 1] = 255;
-					pDest[ImgOffsetDest + 2] = 255;
-					pDest[ImgOffsetDest + 3] = pSrc[ImgOffsetSrc];
-				}
-			}
-		}
-		return false;
-	}
 }
 
-int CGraphics_Threaded::LoadTextureRawSub(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData)
+IGraphics::CTextureHandle CGraphics_Threaded::LoadSpriteTexture(const CImageInfo &FromImageInfo, const CDataSprite *pSprite)
 {
-	dbg_assert(TextureID.IsValid(), "Invalid texture handle used with LoadTextureRawSub.");
+	int ImageGridX = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
+	int ImageGridY = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
+	int x = pSprite->m_X * ImageGridX;
+	int y = pSprite->m_Y * ImageGridY;
+	int w = pSprite->m_W * ImageGridX;
+	int h = pSprite->m_H * ImageGridY;
 
-	CCommandBuffer::SCommand_Texture_Update Cmd;
-	Cmd.m_Slot = TextureID.Id();
-	Cmd.m_X = x;
-	Cmd.m_Y = y;
-	Cmd.m_Width = Width;
-	Cmd.m_Height = Height;
-	Cmd.m_Format = CCommandBuffer::TEXFORMAT_RGBA;
-
-	// calculate memory usage
-	const size_t MemSize = Width * Height * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
-
-	// copy texture data
-	void *pTmpData = malloc(MemSize);
-	ConvertToRGBA((uint8_t *)pTmpData, (const uint8_t *)pData, Width, Height, Format);
-	Cmd.m_pData = pTmpData;
-	AddCmd(Cmd);
-
-	return 0;
-}
-
-IGraphics::CTextureHandle CGraphics_Threaded::LoadSpriteTextureImpl(CImageInfo &FromImageInfo, int x, int y, size_t w, size_t h)
-{
-	const size_t PixelSize = FromImageInfo.PixelSize();
-	m_vSpriteHelper.resize(w * h * PixelSize);
-	CopyTextureFromTextureBufferSub(m_vSpriteHelper.data(), w, h, (uint8_t *)FromImageInfo.m_pData, FromImageInfo.m_Width, FromImageInfo.m_Height, PixelSize, x, y, w, h);
-	return LoadTextureRaw(w, h, FromImageInfo.m_Format, m_vSpriteHelper.data(), 0);
+	CImageInfo SpriteInfo;
+	SpriteInfo.m_Width = w;
+	SpriteInfo.m_Height = h;
+	SpriteInfo.m_Format = FromImageInfo.m_Format;
+	SpriteInfo.m_pData = static_cast<uint8_t *>(malloc(SpriteInfo.DataSize()));
+	SpriteInfo.CopyRectFrom(FromImageInfo, x, y, w, h, 0, 0);
+	return LoadTextureRawMove(SpriteInfo, 0, pSprite->m_pName);
 }
 
-IGraphics::CTextureHandle CGraphics_Threaded::LoadSpriteTexture(CImageInfo &FromImageInfo, CDataSprite *pSprite)
+bool CGraphics_Threaded::IsImageSubFullyTransparent(const CImageInfo &FromImageInfo, int x, int y, int w, int h)
 {
-	int imggx = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
-	int imggy = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
-	int x = pSprite->m_X * imggx;
-	int y = pSprite->m_Y * imggy;
-	int w = pSprite->m_W * imggx;
-	int h = pSprite->m_H * imggy;
-	return LoadSpriteTextureImpl(FromImageInfo, x, y, w, h);
-}
-
-bool CGraphics_Threaded::IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h)
-{
-	if(FromImageInfo.m_Format == CImageInfo::FORMAT_SINGLE_COMPONENT || FromImageInfo.m_Format == CImageInfo::FORMAT_RGBA)
+	if(FromImageInfo.m_Format == CImageInfo::FORMAT_R || FromImageInfo.m_Format == CImageInfo::FORMAT_RA || FromImageInfo.m_Format == CImageInfo::FORMAT_RGBA)
 	{
-		uint8_t *pImgData = (uint8_t *)FromImageInfo.m_pData;
+		const uint8_t *pImgData = FromImageInfo.m_pData;
 		const size_t PixelSize = FromImageInfo.PixelSize();
 		for(int iy = 0; iy < h; ++iy)
 		{
@@ -404,19 +339,18 @@ bool CGraphics_Threaded::IsImageSubFullyTransparent(CImageInfo &FromImageInfo, i
 	return false;
 }
 
-bool CGraphics_Threaded::IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, CDataSprite *pSprite)
+bool CGraphics_Threaded::IsSpriteTextureFullyTransparent(const CImageInfo &FromImageInfo, const CDataSprite *pSprite)
 {
-	int imggx = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
-	int imggy = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
-	int x = pSprite->m_X * imggx;
-	int y = pSprite->m_Y * imggy;
-	int w = pSprite->m_W * imggx;
-	int h = pSprite->m_H * imggy;
-
+	int ImageGridX = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
+	int ImageGridY = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
+	int x = pSprite->m_X * ImageGridX;
+	int y = pSprite->m_Y * ImageGridY;
+	int w = pSprite->m_W * ImageGridX;
+	int h = pSprite->m_H * ImageGridY;
 	return IsImageSubFullyTransparent(FromImageInfo, x, y, w, h);
 }
 
-IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName)
+static void LoadTextureAddWarning(size_t Width, size_t Height, int Flags, const char *pTexName, std::vector<SWarning> &vWarnings)
 {
 	if((Flags & IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE) != 0 || (Flags & IGraphics::TEXLOAD_TO_3D_TEXTURE) != 0)
 	{
@@ -424,33 +358,21 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(size_t Width, size_
 		{
 			SWarning NewWarning;
 			char aText[128];
-			aText[0] = '\0';
-			if(pTexName)
-			{
-				str_format(aText, sizeof(aText), "\"%s\"", pTexName);
-			}
+			str_format(aText, sizeof(aText), "\"%s\"", pTexName ? pTexName : "(no name)");
 			str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), aText, 16, 16);
-
-			m_vWarnings.emplace_back(NewWarning);
+			vWarnings.emplace_back(NewWarning);
 		}
 	}
+}
 
-	if(Width == 0 || Height == 0)
-		return IGraphics::CTextureHandle();
-
-	IGraphics::CTextureHandle TextureHandle = FindFreeTextureIndex();
-
+static CCommandBuffer::SCommand_Texture_Create LoadTextureCreateCommand(int TextureId, size_t Width, size_t Height, int Flags)
+{
 	CCommandBuffer::SCommand_Texture_Create Cmd;
-	Cmd.m_Slot = TextureHandle.Id();
+	Cmd.m_Slot = TextureId;
 	Cmd.m_Width = Width;
 	Cmd.m_Height = Height;
-	Cmd.m_Format = CCommandBuffer::TEXFORMAT_RGBA;
-	Cmd.m_StoreFormat = CCommandBuffer::TEXFORMAT_RGBA;
 
-	// flags
 	Cmd.m_Flags = 0;
-	if(Flags & IGraphics::TEXLOAD_NOMIPMAPS)
-		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_NOMIPMAPS;
 	if((Flags & IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE) != 0)
 		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_TO_2D_ARRAY_TEXTURE;
 	if((Flags & IGraphics::TEXLOAD_TO_3D_TEXTURE) != 0)
@@ -458,46 +380,77 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(size_t Width, size_
 	if((Flags & IGraphics::TEXLOAD_NO_2D_TEXTURE) != 0)
 		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_NO_2D_TEXTURE;
 
-	// copy texture data
-	const size_t MemSize = Width * Height * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
-	void *pTmpData = malloc(MemSize);
-	if(!ConvertToRGBA((uint8_t *)pTmpData, (const uint8_t *)pData, Width, Height, Format))
+	return Cmd;
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(const CImageInfo &Image, int Flags, const char *pTexName)
+{
+	LoadTextureAddWarning(Image.m_Width, Image.m_Height, Flags, pTexName, m_vWarnings);
+
+	if(Image.m_Width == 0 || Image.m_Height == 0)
+		return IGraphics::CTextureHandle();
+
+	IGraphics::CTextureHandle TextureHandle = FindFreeTextureIndex();
+	CCommandBuffer::SCommand_Texture_Create Cmd = LoadTextureCreateCommand(TextureHandle.Id(), Image.m_Width, Image.m_Height, Flags);
+
+	// Copy texture data and convert if necessary
+	uint8_t *pTmpData;
+	if(!ConvertToRgbaAlloc(pTmpData, Image))
 	{
-		dbg_msg("graphics", "converted image %s to RGBA, consider making its file format RGBA", pTexName ? pTexName : "(no name)");
+		dbg_msg("graphics", "converted image '%s' to RGBA, consider making its file format RGBA", pTexName ? pTexName : "(no name)");
 	}
 	Cmd.m_pData = pTmpData;
+
+	AddCmd(Cmd);
+
+	return TextureHandle;
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRawMove(CImageInfo &Image, int Flags, const char *pTexName)
+{
+	if(Image.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		// Moving not possible, texture needs to be converted
+		IGraphics::CTextureHandle TextureHandle = LoadTextureRaw(Image, Flags, pTexName);
+		Image.Free();
+		return TextureHandle;
+	}
+
+	LoadTextureAddWarning(Image.m_Width, Image.m_Height, Flags, pTexName, m_vWarnings);
+
+	if(Image.m_Width == 0 || Image.m_Height == 0)
+		return IGraphics::CTextureHandle();
+
+	IGraphics::CTextureHandle TextureHandle = FindFreeTextureIndex();
+	CCommandBuffer::SCommand_Texture_Create Cmd = LoadTextureCreateCommand(TextureHandle.Id(), Image.m_Width, Image.m_Height, Flags);
+	Cmd.m_pData = Image.m_pData;
+	Image.m_pData = nullptr;
+	Image.Free();
 	AddCmd(Cmd);
 
 	return TextureHandle;
 }
 
-// simple uncompressed RGBA loaders
 IGraphics::CTextureHandle CGraphics_Threaded::LoadTexture(const char *pFilename, int StorageType, int Flags)
 {
 	dbg_assert(pFilename[0] != '\0', "Cannot load texture from file with empty filename"); // would cause Valgrind to crash otherwise
 
-	CImageInfo Img;
-	if(LoadPNG(&Img, pFilename, StorageType))
+	CImageInfo Image;
+	if(LoadPng(Image, pFilename, StorageType))
 	{
-		CTextureHandle ID = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, Flags, pFilename);
-		FreePNG(&Img);
-		if(ID.IsValid())
+		CTextureHandle Id = LoadTextureRawMove(Image, Flags, pFilename);
+		if(Id.IsValid())
 		{
 			if(g_Config.m_Debug)
 				dbg_msg("graphics/texture", "loaded %s", pFilename);
-			return ID;
+			return Id;
 		}
 	}
 
 	return m_NullTexture;
 }
 
-IGraphics::CTextureHandle CGraphics_Threaded::NullTexture() const
-{
-	return m_NullTexture;
-}
-
-bool CGraphics_Threaded::LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData)
+bool CGraphics_Threaded::LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, uint8_t *pTextData, uint8_t *pTextOutlineData)
 {
 	if(Width == 0 || Height == 0)
 		return false;
@@ -531,20 +484,17 @@ bool CGraphics_Threaded::UnloadTextTextures(CTextureHandle &TextTexture, CTextur
 	return true;
 }
 
-bool CGraphics_Threaded::UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData)
+bool CGraphics_Threaded::UpdateTextTexture(CTextureHandle TextureId, int x, int y, size_t Width, size_t Height, const uint8_t *pData)
 {
 	CCommandBuffer::SCommand_TextTexture_Update Cmd;
-	Cmd.m_Slot = TextureID.Id();
+	Cmd.m_Slot = TextureId.Id();
 	Cmd.m_X = x;
 	Cmd.m_Y = y;
 	Cmd.m_Width = Width;
 	Cmd.m_Height = Height;
 
-	// calculate memory usage
 	const size_t MemSize = Width * Height;
-
-	// copy texture data
-	void *pTmpData = malloc(MemSize);
+	uint8_t *pTmpData = static_cast<uint8_t *>(malloc(MemSize));
 	mem_copy(pTmpData, pData, MemSize);
 	Cmd.m_pData = pTmpData;
 	AddCmd(Cmd);
@@ -552,168 +502,114 @@ bool CGraphics_Threaded::UpdateTextTexture(CTextureHandle TextureID, int x, int
 	return true;
 }
 
-bool CGraphics_Threaded::LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType)
+static SWarning FormatPngliteIncompatibilityWarning(int PngliteIncompatible, const char *pContextName)
 {
-	char aCompleteFilename[IO_MAX_PATH_LENGTH];
-	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType, aCompleteFilename, sizeof(aCompleteFilename));
-	if(File)
-	{
-		io_seek(File, 0, IOSEEK_END);
-		unsigned int FileSize = io_tell(File);
-		io_seek(File, 0, IOSEEK_START);
-
-		TImageByteBuffer ByteBuffer;
-		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-		ByteBuffer.resize(FileSize);
-		io_read(File, &ByteBuffer.front(), FileSize);
-
-		io_close(File);
+	SWarning Warning;
+	str_format(Warning.m_aWarningMsg, sizeof(Warning.m_aWarningMsg), Localize("\"%s\" is not compatible with pnglite and cannot be loaded by old DDNet versions: "), pContextName);
+	static const int FLAGS[] = {CImageLoader::PNGLITE_COLOR_TYPE, CImageLoader::PNGLITE_BIT_DEPTH, CImageLoader::PNGLITE_INTERLACE_TYPE, CImageLoader::PNGLITE_COMPRESSION_TYPE, CImageLoader::PNGLITE_FILTER_TYPE};
+	static const char *const EXPLANATION[] = {"color type", "bit depth", "interlace type", "compression type", "filter type"};
 
-		uint8_t *pImgBuffer = NULL;
-		EImageFormat ImageFormat;
-		int PngliteIncompatible;
-		if(::LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
+	bool First = true;
+	for(size_t i = 0; i < std::size(FLAGS); ++i)
+	{
+		if((PngliteIncompatible & FLAGS[i]) != 0)
 		{
-			if(ImageFormat == IMAGE_FORMAT_RGB)
-				pImg->m_Format = CImageInfo::FORMAT_RGB;
-			else if(ImageFormat == IMAGE_FORMAT_RGBA)
-				pImg->m_Format = CImageInfo::FORMAT_RGBA;
-			else
+			if(!First)
 			{
-				free(pImgBuffer);
-				log_error("game/png", "image had unsupported image format. filename='%s' format='%d'", pFilename, (int)ImageFormat);
-				return false;
+				str_append(Warning.m_aWarningMsg, ", ");
 			}
-			pImg->m_pData = pImgBuffer;
-
-			if(m_WarnPngliteIncompatibleImages && PngliteIncompatible != 0)
-			{
-				SWarning Warning;
-				str_format(Warning.m_aWarningMsg, sizeof(Warning.m_aWarningMsg), Localize("\"%s\" is not compatible with pnglite and cannot be loaded by old DDNet versions: "), pFilename);
-				static const int FLAGS[] = {PNGLITE_COLOR_TYPE, PNGLITE_BIT_DEPTH, PNGLITE_INTERLACE_TYPE, PNGLITE_COMPRESSION_TYPE, PNGLITE_FILTER_TYPE};
-				static const char *EXPLANATION[] = {"color type", "bit depth", "interlace type", "compression type", "filter type"};
-
-				bool First = true;
-				for(size_t i = 0; i < std::size(FLAGS); ++i)
-				{
-					if((PngliteIncompatible & FLAGS[i]) != 0)
-					{
-						if(!First)
-						{
-							str_append(Warning.m_aWarningMsg, ", ");
-						}
-						str_append(Warning.m_aWarningMsg, EXPLANATION[i]);
-						First = false;
-					}
-				}
-				str_append(Warning.m_aWarningMsg, " unsupported");
-				m_vWarnings.emplace_back(Warning);
-			}
-		}
-		else
-		{
-			log_error("game/png", "failed to load file. filename='%s'", pFilename);
-			return false;
+			str_append(Warning.m_aWarningMsg, EXPLANATION[i]);
+			First = false;
 		}
 	}
-	else
-	{
-		log_error("game/png", "failed to open file. filename='%s'", pFilename);
+	str_append(Warning.m_aWarningMsg, " unsupported");
+	return Warning;
+}
+
+bool CGraphics_Threaded::LoadPng(CImageInfo &Image, const char *pFilename, int StorageType)
+{
+	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType);
+
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(File, pFilename, Image, PngliteIncompatible))
 		return false;
+
+	if(m_WarnPngliteIncompatibleImages && PngliteIncompatible != 0)
+	{
+		m_vWarnings.emplace_back(FormatPngliteIncompatibilityWarning(PngliteIncompatible, pFilename));
 	}
 
 	return true;
 }
 
-void CGraphics_Threaded::FreePNG(CImageInfo *pImg)
+bool CGraphics_Threaded::LoadPng(CImageInfo &Image, const uint8_t *pData, size_t DataSize, const char *pContextName)
 {
-	free(pImg->m_pData);
-	pImg->m_pData = NULL;
+	CByteBufferReader Reader(pData, DataSize);
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(Reader, pContextName, Image, PngliteIncompatible))
+		return false;
+
+	if(m_WarnPngliteIncompatibleImages && PngliteIncompatible != 0)
+	{
+		m_vWarnings.emplace_back(FormatPngliteIncompatibilityWarning(PngliteIncompatible, pContextName));
+	}
+
+	return true;
 }
 
-bool CGraphics_Threaded::CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize)
+bool CGraphics_Threaded::CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize)
 {
 	dbg_assert(DivX != 0 && DivY != 0, "Passing 0 to this function is not allowed.");
 	bool ImageIsValid = true;
-	bool WidthBroken = Img.m_Width == 0 || (Img.m_Width % DivX) != 0;
-	bool HeightBroken = Img.m_Height == 0 || (Img.m_Height % DivY) != 0;
+	bool WidthBroken = Image.m_Width == 0 || (Image.m_Width % DivX) != 0;
+	bool HeightBroken = Image.m_Height == 0 || (Image.m_Height % DivY) != 0;
 	if(WidthBroken || HeightBroken)
 	{
 		SWarning NewWarning;
-		str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), pFileName, DivX, DivY);
-
+		char aContextNameQuoted[128];
+		str_format(aContextNameQuoted, sizeof(aContextNameQuoted), "\"%s\"", pContextName);
+		str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg),
+			Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), aContextNameQuoted, DivX, DivY);
 		m_vWarnings.emplace_back(NewWarning);
-
 		ImageIsValid = false;
 	}
 
-	if(AllowResize && !ImageIsValid && Img.m_Width > 0 && Img.m_Height > 0)
+	if(AllowResize && !ImageIsValid && Image.m_Width > 0 && Image.m_Height > 0)
 	{
 		int NewWidth = DivX;
 		int NewHeight = DivY;
 		if(WidthBroken)
 		{
-			NewWidth = maximum<int>(HighestBit(Img.m_Width), DivX);
+			NewWidth = maximum<int>(HighestBit(Image.m_Width), DivX);
 			NewHeight = (NewWidth / DivX) * DivY;
 		}
 		else
 		{
-			NewHeight = maximum<int>(HighestBit(Img.m_Height), DivY);
+			NewHeight = maximum<int>(HighestBit(Image.m_Height), DivY);
 			NewWidth = (NewHeight / DivY) * DivX;
 		}
-
-		uint8_t *pNewImg = ResizeImage((uint8_t *)Img.m_pData, Img.m_Width, Img.m_Height, NewWidth, NewHeight, Img.PixelSize());
-		free(Img.m_pData);
-		Img.m_pData = pNewImg;
-		Img.m_Width = NewWidth;
-		Img.m_Height = NewHeight;
+		ResizeImage(Image, NewWidth, NewHeight);
 		ImageIsValid = true;
 	}
 
 	return ImageIsValid;
 }
 
-bool CGraphics_Threaded::IsImageFormatRGBA(const char *pFileName, CImageInfo &Img)
+bool CGraphics_Threaded::IsImageFormatRgba(const char *pContextName, const CImageInfo &Image)
 {
-	if(Img.m_Format != CImageInfo::FORMAT_RGBA)
+	if(Image.m_Format != CImageInfo::FORMAT_RGBA)
 	{
 		SWarning NewWarning;
-		char aText[128];
-		aText[0] = '\0';
-		if(pFileName)
-		{
-			str_format(aText, sizeof(aText), "\"%s\"", pFileName);
-		}
+		char aContextNameQuoted[128];
+		str_format(aContextNameQuoted, sizeof(aContextNameQuoted), "\"%s\"", pContextName);
 		str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg),
-			Localize("The format of texture %s is not RGBA which will cause visual bugs."), aText);
+			Localize("The format of texture %s is not RGBA which will cause visual bugs."), aContextNameQuoted);
 		m_vWarnings.emplace_back(NewWarning);
 		return false;
 	}
 	return true;
 }
 
-void CGraphics_Threaded::CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight)
-{
-	for(size_t Y = 0; Y < SubCopyHeight; ++Y)
-	{
-		const size_t ImgOffset = ((SubOffsetY + Y) * FullWidth * PixelSize) + (SubOffsetX * PixelSize);
-		const size_t CopySize = SubCopyWidth * PixelSize;
-		mem_copy(&pDestBuffer[ImgOffset], &pSourceBuffer[ImgOffset], CopySize);
-	}
-}
-
-void CGraphics_Threaded::CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight)
-{
-	for(size_t Y = 0; Y < SrcSubCopyHeight; ++Y)
-	{
-		const size_t SrcImgOffset = ((SrcSubOffsetY + Y) * SrcWidth * PixelSize) + (SrcSubOffsetX * PixelSize);
-		const size_t DstImgOffset = (Y * DestWidth * PixelSize);
-		const size_t CopySize = SrcSubCopyWidth * PixelSize;
-		mem_copy(&pDestBuffer[DstImgOffset], &pSourceBuffer[SrcImgOffset], CopySize);
-	}
-}
-
 void CGraphics_Threaded::KickCommandBuffer()
 {
 	m_pBackend->RunBuffer(m_pCommandBuffer);
@@ -740,24 +636,14 @@ class CScreenshotSaveJob : public IJob
 	IStorage *m_pStorage;
 	IConsole *m_pConsole;
 	char m_aName[IO_MAX_PATH_LENGTH];
-	int m_Width;
-	int m_Height;
-	void *m_pData;
+	CImageInfo m_Image;
 
 	void Run() override
 	{
 		char aWholePath[IO_MAX_PATH_LENGTH];
 		char aBuf[64 + IO_MAX_PATH_LENGTH];
-		IOHANDLE File = m_pStorage->OpenFile(m_aName, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath));
-		if(File)
+		if(CImageLoader::SavePng(m_pStorage->OpenFile(m_aName, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath)), m_aName, m_Image))
 		{
-			TImageByteBuffer ByteBuffer;
-			SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-			if(SavePNG(IMAGE_FORMAT_RGBA, (const uint8_t *)m_pData, ImageByteBuffer, m_Width, m_Height))
-				io_write(File, &ByteBuffer.front(), ByteBuffer.size());
-			io_close(File);
-
 			str_format(aBuf, sizeof(aBuf), "saved screenshot to '%s'", aWholePath);
 		}
 		else
@@ -768,51 +654,49 @@ class CScreenshotSaveJob : public IJob
 	}
 
 public:
-	CScreenshotSaveJob(IStorage *pStorage, IConsole *pConsole, const char *pName, int Width, int Height, void *pData) :
+	CScreenshotSaveJob(IStorage *pStorage, IConsole *pConsole, const char *pName, CImageInfo Image) :
 		m_pStorage(pStorage),
 		m_pConsole(pConsole),
-		m_Width(Width),
-		m_Height(Height),
-		m_pData(pData)
+		m_Image(Image)
 	{
 		str_copy(m_aName, pName);
 	}
 
 	~CScreenshotSaveJob() override
 	{
-		free(m_pData);
+		m_Image.Free();
 	}
 };
 
-bool CGraphics_Threaded::ScreenshotDirect()
+void CGraphics_Threaded::ScreenshotDirect(bool *pSwapped)
 {
-	// add swap command
-	CImageInfo Image;
+	if(!m_DoScreenshot)
+		return;
+	m_DoScreenshot = false;
+	if(!WindowActive())
+		return;
 
-	bool DidSwap = false;
+	CImageInfo Image;
 
 	CCommandBuffer::SCommand_TrySwapAndScreenshot Cmd;
 	Cmd.m_pImage = &Image;
-	Cmd.m_pSwapped = &DidSwap;
+	Cmd.m_pSwapped = pSwapped;
 	AddCmd(Cmd);
 
-	// kick the buffer and wait for the result
 	KickCommandBuffer();
 	WaitForIdle();
 
 	if(Image.m_pData)
 	{
-		m_pEngine->AddJob(std::make_shared<CScreenshotSaveJob>(m_pStorage, m_pConsole, m_aScreenshotName, Image.m_Width, Image.m_Height, Image.m_pData));
+		m_pEngine->AddJob(std::make_shared<CScreenshotSaveJob>(m_pStorage, m_pConsole, m_aScreenshotName, Image));
 	}
-
-	return DidSwap;
 }
 
-void CGraphics_Threaded::TextureSet(CTextureHandle TextureID)
+void CGraphics_Threaded::TextureSet(CTextureHandle TextureId)
 {
 	dbg_assert(m_Drawing == 0, "called Graphics()->TextureSet within begin");
-	dbg_assert(!TextureID.IsValid() || m_vTextureIndices[TextureID.Id()] == -1, "Texture handle was not invalid, but also did not correlate to an existing texture.");
-	m_State.m_Texture = TextureID.Id();
+	dbg_assert(!TextureId.IsValid() || m_vTextureIndices[TextureId.Id()] == -1, "Texture handle was not invalid, but also did not correlate to an existing texture.");
+	m_State.m_Texture = TextureId.Id();
 }
 
 void CGraphics_Threaded::Clear(float r, float g, float b, bool ForceClearNow)
@@ -891,49 +775,36 @@ void CGraphics_Threaded::QuadsSetRotation(float Angle)
 	m_Rotation = Angle;
 }
 
-inline void clampf(float &Value, float Min, float Max)
+static unsigned char NormalizeColorComponent(float ColorComponent)
 {
-	if(Value > Max)
-		Value = Max;
-	else if(Value < Min)
-		Value = Min;
+	return (unsigned char)(clamp(ColorComponent, 0.0f, 1.0f) * 255.0f + 0.5f); // +0.5f to round to nearest
 }
 
-void CGraphics_Threaded::SetColorVertex(const CColorVertex *pArray, int Num)
+void CGraphics_Threaded::SetColorVertex(const CColorVertex *pArray, size_t Num)
 {
 	dbg_assert(m_Drawing != 0, "called Graphics()->SetColorVertex without begin");
 
-	for(int i = 0; i < Num; ++i)
+	for(size_t i = 0; i < Num; ++i)
 	{
-		float r = pArray[i].m_R, g = pArray[i].m_G, b = pArray[i].m_B, a = pArray[i].m_A;
-		clampf(r, 0.f, 1.f);
-		clampf(g, 0.f, 1.f);
-		clampf(b, 0.f, 1.f);
-		clampf(a, 0.f, 1.f);
-		m_aColor[pArray[i].m_Index].r = (unsigned char)(r * 255.f);
-		m_aColor[pArray[i].m_Index].g = (unsigned char)(g * 255.f);
-		m_aColor[pArray[i].m_Index].b = (unsigned char)(b * 255.f);
-		m_aColor[pArray[i].m_Index].a = (unsigned char)(a * 255.f);
+		const CColorVertex &Vertex = pArray[i];
+		CCommandBuffer::SColor &Color = m_aColor[Vertex.m_Index];
+		Color.r = NormalizeColorComponent(Vertex.m_R);
+		Color.g = NormalizeColorComponent(Vertex.m_G);
+		Color.b = NormalizeColorComponent(Vertex.m_B);
+		Color.a = NormalizeColorComponent(Vertex.m_A);
 	}
 }
 
 void CGraphics_Threaded::SetColor(float r, float g, float b, float a)
 {
-	clampf(r, 0.f, 1.f);
-	clampf(g, 0.f, 1.f);
-	clampf(b, 0.f, 1.f);
-	clampf(a, 0.f, 1.f);
-	r *= 255.f;
-	g *= 255.f;
-	b *= 255.f;
-	a *= 255.f;
-
-	for(auto &Color : m_aColor)
+	CCommandBuffer::SColor NewColor;
+	NewColor.r = NormalizeColorComponent(r);
+	NewColor.g = NormalizeColorComponent(g);
+	NewColor.b = NormalizeColorComponent(b);
+	NewColor.a = NormalizeColorComponent(a);
+	for(CCommandBuffer::SColor &Color : m_aColor)
 	{
-		Color.r = (unsigned char)(r);
-		Color.g = (unsigned char)(g);
-		Color.b = (unsigned char)(b);
-		Color.a = (unsigned char)(a);
+		Color = NewColor;
 	}
 }
 
@@ -944,25 +815,20 @@ void CGraphics_Threaded::SetColor(ColorRGBA Color)
 
 void CGraphics_Threaded::SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight)
 {
-	dbg_assert(m_Drawing != 0, "called Graphics()->SetColor without begin");
-	CColorVertex Array[4] = {
-		CColorVertex(0, TopLeft.r, TopLeft.g, TopLeft.b, TopLeft.a),
-		CColorVertex(1, TopRight.r, TopRight.g, TopRight.b, TopRight.a),
-		CColorVertex(2, BottomRight.r, BottomRight.g, BottomRight.b, BottomRight.a),
-		CColorVertex(3, BottomLeft.r, BottomLeft.g, BottomLeft.b, BottomLeft.a)};
-	SetColorVertex(Array, 4);
+	CColorVertex aArray[] = {
+		CColorVertex(0, TopLeft),
+		CColorVertex(1, TopRight),
+		CColorVertex(2, BottomRight),
+		CColorVertex(3, BottomLeft)};
+	SetColorVertex(aArray, std::size(aArray));
 }
 
 void CGraphics_Threaded::ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a)
 {
-	clampf(r, 0.f, 1.f);
-	clampf(g, 0.f, 1.f);
-	clampf(b, 0.f, 1.f);
-	clampf(a, 0.f, 1.f);
-	m_aColor[0].r = (unsigned char)(r * 255.f);
-	m_aColor[0].g = (unsigned char)(g * 255.f);
-	m_aColor[0].b = (unsigned char)(b * 255.f);
-	m_aColor[0].a = (unsigned char)(a * 255.f);
+	m_aColor[0].r = NormalizeColorComponent(r);
+	m_aColor[0].g = NormalizeColorComponent(g);
+	m_aColor[0].b = NormalizeColorComponent(b);
+	m_aColor[0].a = NormalizeColorComponent(a);
 
 	for(int i = 0; i < m_NumVertices; ++i)
 	{
@@ -970,61 +836,13 @@ void CGraphics_Threaded::ChangeColorOfCurrentQuadVertices(float r, float g, floa
 	}
 }
 
-void CGraphics_Threaded::ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+void CGraphics_Threaded::ChangeColorOfQuadVertices(size_t QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 {
-	if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
+	const CCommandBuffer::SColor Color(r, g, b, a);
+	const size_t VertNum = g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad ? 6 : 4;
+	for(size_t i = 0; i < VertNum; ++i)
 	{
-		m_aVertices[QuadOffset * 6].m_Color.r = r;
-		m_aVertices[QuadOffset * 6].m_Color.g = g;
-		m_aVertices[QuadOffset * 6].m_Color.b = b;
-		m_aVertices[QuadOffset * 6].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 6 + 1].m_Color.r = r;
-		m_aVertices[QuadOffset * 6 + 1].m_Color.g = g;
-		m_aVertices[QuadOffset * 6 + 1].m_Color.b = b;
-		m_aVertices[QuadOffset * 6 + 1].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 6 + 2].m_Color.r = r;
-		m_aVertices[QuadOffset * 6 + 2].m_Color.g = g;
-		m_aVertices[QuadOffset * 6 + 2].m_Color.b = b;
-		m_aVertices[QuadOffset * 6 + 2].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 6 + 3].m_Color.r = r;
-		m_aVertices[QuadOffset * 6 + 3].m_Color.g = g;
-		m_aVertices[QuadOffset * 6 + 3].m_Color.b = b;
-		m_aVertices[QuadOffset * 6 + 3].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 6 + 4].m_Color.r = r;
-		m_aVertices[QuadOffset * 6 + 4].m_Color.g = g;
-		m_aVertices[QuadOffset * 6 + 4].m_Color.b = b;
-		m_aVertices[QuadOffset * 6 + 4].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 6 + 5].m_Color.r = r;
-		m_aVertices[QuadOffset * 6 + 5].m_Color.g = g;
-		m_aVertices[QuadOffset * 6 + 5].m_Color.b = b;
-		m_aVertices[QuadOffset * 6 + 5].m_Color.a = a;
-	}
-	else
-	{
-		m_aVertices[QuadOffset * 4].m_Color.r = r;
-		m_aVertices[QuadOffset * 4].m_Color.g = g;
-		m_aVertices[QuadOffset * 4].m_Color.b = b;
-		m_aVertices[QuadOffset * 4].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 4 + 1].m_Color.r = r;
-		m_aVertices[QuadOffset * 4 + 1].m_Color.g = g;
-		m_aVertices[QuadOffset * 4 + 1].m_Color.b = b;
-		m_aVertices[QuadOffset * 4 + 1].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 4 + 2].m_Color.r = r;
-		m_aVertices[QuadOffset * 4 + 2].m_Color.g = g;
-		m_aVertices[QuadOffset * 4 + 2].m_Color.b = b;
-		m_aVertices[QuadOffset * 4 + 2].m_Color.a = a;
-
-		m_aVertices[QuadOffset * 4 + 3].m_Color.r = r;
-		m_aVertices[QuadOffset * 4 + 3].m_Color.g = g;
-		m_aVertices[QuadOffset * 4 + 3].m_Color.b = b;
-		m_aVertices[QuadOffset * 4 + 3].m_Color.a = a;
+		m_aVertices[QuadOffset * VertNum + i].m_Color = Color;
 	}
 }
 
@@ -1074,26 +892,14 @@ void CGraphics_Threaded::QuadsDrawTL(const CQuadItem *pArray, int Num)
 
 void CGraphics_Threaded::QuadsTex3DDrawTL(const CQuadItem *pArray, int Num)
 {
-	int CurNumVert = m_NumVertices;
-
-	int VertNum = 0;
-	if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
-	{
-		VertNum = 6;
-	}
-	else
-	{
-		VertNum = 4;
-	}
+	const int VertNum = g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad ? 6 : 4;
+	const float CurIndex = Uses2DTextureArrays() ? m_CurIndex : (m_CurIndex + 0.5f) / 256.0f;
 
 	for(int i = 0; i < Num; ++i)
 	{
 		for(int n = 0; n < VertNum; ++n)
 		{
-			if(Uses2DTextureArrays())
-				m_aVerticesTex3D[CurNumVert + VertNum * i + n].m_Tex.w = (float)m_CurIndex;
-			else
-				m_aVerticesTex3D[CurNumVert + VertNum * i + n].m_Tex.w = ((float)m_CurIndex + 0.5f) / 256.f;
+			m_aVerticesTex3D[m_NumVertices + VertNum * i + n].m_Tex.w = CurIndex;
 		}
 	}
 
@@ -2082,7 +1888,7 @@ void *CGraphics_Threaded::AllocCommandBufferData(size_t AllocSize)
 		if(pData == nullptr)
 		{
 			char aError[256];
-			str_format(aError, sizeof(aError), "graphics: failed to allocate data (size %" PRIzu ") for command buffer", (size_t)AllocSize);
+			str_format(aError, sizeof(aError), "graphics: failed to allocate data (size %" PRIzu ") for command buffer", AllocSize);
 			dbg_assert(false, aError);
 		}
 	}
@@ -2360,7 +2166,7 @@ int CGraphics_Threaded::IssueInit()
 	if(g_Config.m_GfxHighdpi)
 		Flags |= IGraphicsBackend::INITFLAG_HIGHDPI;
 
-	int r = m_pBackend->Init("StormA Client", &g_Config.m_GfxScreen, &g_Config.m_GfxScreenWidth, &g_Config.m_GfxScreenHeight, &g_Config.m_GfxScreenRefreshRate, &g_Config.m_GfxFsaaSamples, Flags, &g_Config.m_GfxDesktopWidth, &g_Config.m_GfxDesktopHeight, &m_ScreenWidth, &m_ScreenHeight, m_pStorage);
+	int r = m_pBackend->Init("DDNet Client", &g_Config.m_GfxScreen, &g_Config.m_GfxScreenWidth, &g_Config.m_GfxScreenHeight, &g_Config.m_GfxScreenRefreshRate, &g_Config.m_GfxFsaaSamples, Flags, &g_Config.m_GfxDesktopWidth, &g_Config.m_GfxDesktopHeight, &m_ScreenWidth, &m_ScreenHeight, m_pStorage);
 	AddBackEndWarningIfExists();
 	if(r == 0)
 	{
@@ -2604,9 +2410,14 @@ int CGraphics_Threaded::Init()
 				mem_copy(&aNullTextureData[(y * NullTextureDimension + x) * PixelSize], pColor, PixelSize);
 			}
 		}
+		CImageInfo NullTextureInfo;
+		NullTextureInfo.m_Width = NullTextureDimension;
+		NullTextureInfo.m_Height = NullTextureDimension;
+		NullTextureInfo.m_Format = CImageInfo::FORMAT_RGBA;
+		NullTextureInfo.m_pData = aNullTextureData;
 		const int TextureLoadFlags = Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
 		m_NullTexture.Invalidate();
-		m_NullTexture = LoadTextureRaw(NullTextureDimension, NullTextureDimension, CImageInfo::FORMAT_RGBA, aNullTextureData, TextureLoadFlags);
+		m_NullTexture = LoadTextureRaw(NullTextureInfo, TextureLoadFlags, "null-texture");
 		dbg_assert(m_NullTexture.IsNullTexture(), "Null texture invalid");
 	}
 
@@ -2671,9 +2482,9 @@ void CGraphics_Threaded::WarnPngliteIncompatibleImages(bool Warn)
 	m_WarnPngliteIncompatibleImages = Warn;
 }
 
-void CGraphics_Threaded::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+void CGraphics_Threaded::SetWindowParams(int FullscreenMode, bool IsBorderless)
 {
-	m_pBackend->SetWindowParams(FullscreenMode, IsBorderless, AllowResizing);
+	m_pBackend->SetWindowParams(FullscreenMode, IsBorderless);
 	CVideoMode CurMode;
 	m_pBackend->GetCurrentVideoMode(CurMode, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, g_Config.m_GfxScreen);
 	GotResized(CurMode.m_WindowWidth, CurMode.m_WindowHeight, CurMode.m_RefreshRate);
@@ -2694,6 +2505,7 @@ bool CGraphics_Threaded::SetWindowScreen(int Index)
 
 	for(auto &PropChangedListener : m_vPropChangeListeners)
 		PropChangedListener();
+
 	return true;
 }
 
@@ -2715,15 +2527,15 @@ void CGraphics_Threaded::Move(int x, int y)
 		PropChangedListener();
 }
 
-void CGraphics_Threaded::Resize(int w, int h, int RefreshRate)
+bool CGraphics_Threaded::Resize(int w, int h, int RefreshRate)
 {
 #if defined(CONF_VIDEORECORDER)
 	if(IVideo::Current() && IVideo::Current()->IsRecording())
-		return;
+		return false;
 #endif
 
 	if(WindowWidth() == w && WindowHeight() == h && RefreshRate == m_ScreenRefreshRate)
-		return;
+		return false;
 
 	// if the size is changed manually, only set the window resize, a window size changed event is triggered anyway
 	if(m_pBackend->ResizeWindow(w, h, RefreshRate))
@@ -2731,7 +2543,20 @@ void CGraphics_Threaded::Resize(int w, int h, int RefreshRate)
 		CVideoMode CurMode;
 		m_pBackend->GetCurrentVideoMode(CurMode, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, g_Config.m_GfxScreen);
 		GotResized(w, h, RefreshRate);
+		return true;
 	}
+	return false;
+}
+
+void CGraphics_Threaded::ResizeToScreen()
+{
+	if(Resize(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate))
+		return;
+
+	// Revert config variables if the change was not accepted
+	g_Config.m_GfxScreenWidth = ScreenWidth();
+	g_Config.m_GfxScreenHeight = ScreenHeight();
+	g_Config.m_GfxScreenRefreshRate = m_ScreenRefreshRate;
 }
 
 void CGraphics_Threaded::GotResized(int w, int h, int RefreshRate)
@@ -2787,12 +2612,12 @@ int CGraphics_Threaded::GetWindowScreen()
 	return m_pBackend->GetWindowScreen();
 }
 
-void CGraphics_Threaded::WindowDestroyNtf(uint32_t WindowID)
+void CGraphics_Threaded::WindowDestroyNtf(uint32_t WindowId)
 {
-	m_pBackend->WindowDestroyNtf(WindowID);
+	m_pBackend->WindowDestroyNtf(WindowId);
 
 	CCommandBuffer::SCommand_WindowDestroyNtf Cmd;
-	Cmd.m_WindowID = WindowID;
+	Cmd.m_WindowId = WindowId;
 	AddCmd(Cmd);
 
 	// wait
@@ -2800,12 +2625,12 @@ void CGraphics_Threaded::WindowDestroyNtf(uint32_t WindowID)
 	WaitForIdle();
 }
 
-void CGraphics_Threaded::WindowCreateNtf(uint32_t WindowID)
+void CGraphics_Threaded::WindowCreateNtf(uint32_t WindowId)
 {
-	m_pBackend->WindowCreateNtf(WindowID);
+	m_pBackend->WindowCreateNtf(WindowId);
 
 	CCommandBuffer::SCommand_WindowCreateNtf Cmd;
-	Cmd.m_WindowID = WindowID;
+	Cmd.m_WindowId = WindowId;
 	AddCmd(Cmd);
 
 	// wait
@@ -2825,12 +2650,38 @@ int CGraphics_Threaded::WindowOpen()
 
 void CGraphics_Threaded::SetWindowGrab(bool Grab)
 {
-	return m_pBackend->SetWindowGrab(Grab);
+	m_pBackend->SetWindowGrab(Grab);
 }
 
 void CGraphics_Threaded::NotifyWindow()
 {
-	return m_pBackend->NotifyWindow();
+	m_pBackend->NotifyWindow();
+}
+
+void CGraphics_Threaded::ReadPixel(ivec2 Position, ColorRGBA *pColor)
+{
+	dbg_assert(Position.x >= 0 && Position.x < ScreenWidth(), "ReadPixel position x out of range");
+	dbg_assert(Position.y >= 0 && Position.y < ScreenHeight(), "ReadPixel position y out of range");
+
+	m_ReadPixelPosition = Position;
+	m_pReadPixelColor = pColor;
+}
+
+void CGraphics_Threaded::ReadPixelDirect(bool *pSwapped)
+{
+	if(m_pReadPixelColor == nullptr)
+		return;
+
+	CCommandBuffer::SCommand_TrySwapAndReadPixel Cmd;
+	Cmd.m_Position = m_ReadPixelPosition;
+	Cmd.m_pColor = m_pReadPixelColor;
+	Cmd.m_pSwapped = pSwapped;
+	AddCmd(Cmd);
+
+	KickCommandBuffer();
+	WaitForIdle();
+
+	m_pReadPixelColor = nullptr;
 }
 
 void CGraphics_Threaded::TakeScreenshot(const char *pFilename)
@@ -2859,23 +2710,16 @@ void CGraphics_Threaded::Swap()
 		}
 	}
 
-	bool TookScreenshotAndSwapped = false;
+	bool Swapped = false;
+	ScreenshotDirect(&Swapped);
+	ReadPixelDirect(&Swapped);
 
-	if(m_DoScreenshot)
+	if(!Swapped)
 	{
-		if(WindowActive())
-			TookScreenshotAndSwapped = ScreenshotDirect();
-		m_DoScreenshot = false;
-	}
-
-	if(!TookScreenshotAndSwapped)
-	{
-		// add swap command
 		CCommandBuffer::SCommand_Swap Cmd;
 		AddCmd(Cmd);
 	}
 
-	// kick the command buffer
 	KickCommandBuffer();
 	// TODO: Remove when https://github.com/libsdl-org/SDL/issues/5203 is fixed
 #ifdef CONF_PLATFORM_MACOS
@@ -2997,6 +2841,11 @@ int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes, int Scre
 	return NumModes;
 }
 
+void CGraphics_Threaded::GetCurrentVideoMode(CVideoMode &CurMode, int Screen)
+{
+	m_pBackend->GetCurrentVideoMode(CurMode, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, Screen);
+}
+
 extern IEngineGraphics *CreateEngineGraphicsThreaded()
 {
 	return new CGraphics_Threaded();
diff --git a/src/engine/client/graphics_threaded.h b/src/engine/client/graphics_threaded.h
index eaf0570d66..01774d58fc 100644
--- a/src/engine/client/graphics_threaded.h
+++ b/src/engine/client/graphics_threaded.h
@@ -93,7 +93,6 @@ class CCommandBuffer
 		// texture commands
 		CMD_TEXTURE_CREATE,
 		CMD_TEXTURE_DESTROY,
-		CMD_TEXTURE_UPDATE,
 		CMD_TEXT_TEXTURES_CREATE,
 		CMD_TEXT_TEXTURES_DESTROY,
 		CMD_TEXT_TEXTURE_UPDATE,
@@ -130,6 +129,7 @@ class CCommandBuffer
 		// misc
 		CMD_MULTISAMPLING,
 		CMD_VSYNC,
+		CMD_TRY_SWAP_AND_READ_PIXEL,
 		CMD_TRY_SWAP_AND_SCREENSHOT,
 		CMD_UPDATE_VIEWPORT,
 
@@ -462,12 +462,21 @@ class CCommandBuffer
 		void *m_pOffset;
 	};
 
+	struct SCommand_TrySwapAndReadPixel : public SCommand
+	{
+		SCommand_TrySwapAndReadPixel() :
+			SCommand(CMD_TRY_SWAP_AND_READ_PIXEL) {}
+		ivec2 m_Position;
+		SColorf *m_pColor; // processor will fill this out
+		bool *m_pSwapped; // processor may set this to true, must be initialized to false by the caller
+	};
+
 	struct SCommand_TrySwapAndScreenshot : public SCommand
 	{
 		SCommand_TrySwapAndScreenshot() :
 			SCommand(CMD_TRY_SWAP_AND_SCREENSHOT) {}
 		CImageInfo *m_pImage; // processor will fill this out, the one who adds this command must free the data as well
-		bool *m_pSwapped;
+		bool *m_pSwapped; // processor may set this to true, must be initialized to false by the caller
 	};
 
 	struct SCommand_Swap : public SCommand
@@ -517,26 +526,9 @@ class CCommandBuffer
 
 		size_t m_Width;
 		size_t m_Height;
-		int m_Format;
-		int m_StoreFormat;
 		int m_Flags;
-		void *m_pData; // will be freed by the command processor
-	};
-
-	struct SCommand_Texture_Update : public SCommand
-	{
-		SCommand_Texture_Update() :
-			SCommand(CMD_TEXTURE_UPDATE) {}
-
-		// texture information
-		int m_Slot;
-
-		int m_X;
-		int m_Y;
-		size_t m_Width;
-		size_t m_Height;
-		int m_Format;
-		void *m_pData; // will be freed by the command processor
+		// data must be in RGBA format
+		uint8_t *m_pData; // will be freed by the command processor
 	};
 
 	struct SCommand_Texture_Destroy : public SCommand
@@ -560,8 +552,8 @@ class CCommandBuffer
 		size_t m_Width;
 		size_t m_Height;
 
-		void *m_pTextData;
-		void *m_pTextOutlineData;
+		uint8_t *m_pTextData; // will be freed by the command processor
+		uint8_t *m_pTextOutlineData; // will be freed by the command processor
 	};
 
 	struct SCommand_TextTextures_Destroy : public SCommand
@@ -586,7 +578,7 @@ class CCommandBuffer
 		int m_Y;
 		size_t m_Width;
 		size_t m_Height;
-		void *m_pData; // will be freed by the command processor
+		uint8_t *m_pData; // will be freed by the command processor
 	};
 
 	struct SCommand_WindowCreateNtf : public CCommandBuffer::SCommand
@@ -594,7 +586,7 @@ class CCommandBuffer
 		SCommand_WindowCreateNtf() :
 			SCommand(CMD_WINDOW_CREATE_NTF) {}
 
-		uint32_t m_WindowID;
+		uint32_t m_WindowId;
 	};
 
 	struct SCommand_WindowDestroyNtf : public CCommandBuffer::SCommand
@@ -602,7 +594,7 @@ class CCommandBuffer
 		SCommand_WindowDestroyNtf() :
 			SCommand(CMD_WINDOW_DESTROY_NTF) {}
 
-		uint32_t m_WindowID;
+		uint32_t m_WindowId;
 	};
 
 	//
@@ -699,7 +691,7 @@ class IGraphicsBackend
 	virtual uint64_t StreamedMemoryUsage() const = 0;
 	virtual uint64_t StagingMemoryUsage() const = 0;
 
-	virtual const TTWGraphicsGPUList &GetGPUs() const = 0;
+	virtual const TTwGraphicsGpuList &GetGpus() const = 0;
 
 	virtual void GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int Screen) = 0;
 	virtual void GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int Screen) = 0;
@@ -709,7 +701,7 @@ class IGraphicsBackend
 
 	virtual void Minimize() = 0;
 	virtual void Maximize() = 0;
-	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless) = 0;
 	virtual bool SetWindowScreen(int Index) = 0;
 	virtual bool UpdateDisplayMode(int Index) = 0;
 	virtual int GetWindowScreen() = 0;
@@ -721,8 +713,8 @@ class IGraphicsBackend
 	virtual void GetViewportSize(int &w, int &h) = 0;
 	virtual void NotifyWindow() = 0;
 
-	virtual void WindowDestroyNtf(uint32_t WindowID) = 0;
-	virtual void WindowCreateNtf(uint32_t WindowID) = 0;
+	virtual void WindowDestroyNtf(uint32_t WindowId) = 0;
+	virtual void WindowCreateNtf(uint32_t WindowId) = 0;
 
 	virtual void RunBuffer(CCommandBuffer *pBuffer) = 0;
 	virtual void RunBufferSingleThreadedUnsafe(CCommandBuffer *pBuffer) = 0;
@@ -806,8 +798,6 @@ class CGraphics_Threaded : public IEngineGraphics
 	size_t m_FirstFreeTexture;
 	int m_TextureMemoryUsage;
 
-	std::vector<uint8_t> m_vSpriteHelper;
-
 	bool m_WarnPngliteIncompatibleImages = false;
 
 	std::vector<SWarning> m_vWarnings;
@@ -917,6 +907,11 @@ class CGraphics_Threaded : public IEngineGraphics
 
 	void AdjustViewport(bool SendViewportChangeToBackend);
 
+	ivec2 m_ReadPixelPosition = ivec2(0, 0);
+	ColorRGBA *m_pReadPixelColor = nullptr;
+	void ReadPixelDirect(bool *pSwapped);
+	void ScreenshotDirect(bool *pSwapped);
+
 	int IssueInit();
 	int InitWindow();
 
@@ -938,7 +933,7 @@ class CGraphics_Threaded : public IEngineGraphics
 	uint64_t StreamedMemoryUsage() const override;
 	uint64_t StagingMemoryUsage() const override;
 
-	const TTWGraphicsGPUList &GetGPUs() const override;
+	const TTwGraphicsGpuList &GetGpus() const override;
 
 	void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY) override;
 	void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY) override;
@@ -949,35 +944,28 @@ class CGraphics_Threaded : public IEngineGraphics
 
 	IGraphics::CTextureHandle FindFreeTextureIndex();
 	void FreeTextureIndex(CTextureHandle *pIndex);
-	int UnloadTexture(IGraphics::CTextureHandle *pIndex) override;
-	IGraphics::CTextureHandle LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName = nullptr) override;
-	int LoadTextureRawSub(IGraphics::CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData) override;
-	IGraphics::CTextureHandle NullTexture() const override;
+	void UnloadTexture(IGraphics::CTextureHandle *pIndex) override;
+	IGraphics::CTextureHandle LoadTextureRaw(const CImageInfo &Image, int Flags, const char *pTexName = nullptr) override;
+	IGraphics::CTextureHandle LoadTextureRawMove(CImageInfo &Image, int Flags, const char *pTexName = nullptr) override;
 
-	bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData) override;
+	bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, uint8_t *pTextData, uint8_t *pTextOutlineData) override;
 	bool UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture) override;
-	bool UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData) override;
+	bool UpdateTextTexture(CTextureHandle TextureId, int x, int y, size_t Width, size_t Height, const uint8_t *pData) override;
 
-	CTextureHandle LoadSpriteTextureImpl(CImageInfo &FromImageInfo, int x, int y, size_t w, size_t h);
-	CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) override;
+	CTextureHandle LoadSpriteTexture(const CImageInfo &FromImageInfo, const struct CDataSprite *pSprite) override;
 
-	bool IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h) override;
-	bool IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) override;
+	bool IsImageSubFullyTransparent(const CImageInfo &FromImageInfo, int x, int y, int w, int h) override;
+	bool IsSpriteTextureFullyTransparent(const CImageInfo &FromImageInfo, const struct CDataSprite *pSprite) override;
 
 	// simple uncompressed RGBA loaders
 	IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) override;
-	bool LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) override;
-	void FreePNG(CImageInfo *pImg) override;
-
-	bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) override;
-	bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override;
-
-	void CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override;
-	void CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight) override;
+	bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) override;
+	bool LoadPng(CImageInfo &Image, const uint8_t *pData, size_t DataSize, const char *pContextName) override;
 
-	bool ScreenshotDirect();
+	bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) override;
+	bool IsImageFormatRgba(const char *pContextName, const CImageInfo &Image) override;
 
-	void TextureSet(CTextureHandle TextureID) override;
+	void TextureSet(CTextureHandle TextureId) override;
 
 	void Clear(float r, float g, float b, bool ForceClearNow = false) override;
 
@@ -998,14 +986,14 @@ class CGraphics_Threaded : public IEngineGraphics
 		pVert->m_Color = m_aColor[ColorIndex];
 	}
 
-	void SetColorVertex(const CColorVertex *pArray, int Num) override;
+	void SetColorVertex(const CColorVertex *pArray, size_t Num) override;
 	void SetColor(float r, float g, float b, float a) override;
 	void SetColor(ColorRGBA Color) override;
 	void SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight) override;
 
 	// go through all vertices and change their color (only works for quads)
 	void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) override;
-	void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
+	void ChangeColorOfQuadVertices(size_t QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
 
 	void QuadsSetSubset(float TlU, float TlV, float BrU, float BrV) override;
 	void QuadsSetSubsetFree(
@@ -1221,18 +1209,19 @@ class CGraphics_Threaded : public IEngineGraphics
 	void Minimize() override;
 	void Maximize() override;
 	void WarnPngliteIncompatibleImages(bool Warn) override;
-	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless) override;
 	bool SetWindowScreen(int Index) override;
 	void Move(int x, int y) override;
-	void Resize(int w, int h, int RefreshRate) override;
+	bool Resize(int w, int h, int RefreshRate) override;
+	void ResizeToScreen() override;
 	void GotResized(int w, int h, int RefreshRate) override;
 	void UpdateViewport(int X, int Y, int W, int H, bool ByResize) override;
 	void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc) override;
 	void AddWindowPropChangeListener(WINDOW_PROPS_CHANGED_FUNC pFunc) override;
 	int GetWindowScreen() override;
 
-	void WindowDestroyNtf(uint32_t WindowID) override;
-	void WindowCreateNtf(uint32_t WindowID) override;
+	void WindowDestroyNtf(uint32_t WindowId) override;
+	void WindowCreateNtf(uint32_t WindowId) override;
 
 	int WindowActive() override;
 	int WindowOpen() override;
@@ -1243,6 +1232,7 @@ class CGraphics_Threaded : public IEngineGraphics
 	int Init() override;
 	void Shutdown() override;
 
+	void ReadPixel(ivec2 Position, ColorRGBA *pColor) override;
 	void TakeScreenshot(const char *pFilename) override;
 	void TakeCustomScreenshot(const char *pFilename) override;
 	void Swap() override;
@@ -1250,6 +1240,7 @@ class CGraphics_Threaded : public IEngineGraphics
 	bool SetMultiSampling(uint32_t ReqMultiSamplingCount, uint32_t &MultiSamplingCountBackend) override;
 
 	int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) override;
+	void GetCurrentVideoMode(CVideoMode &CurMode, int Screen) override;
 
 	virtual int GetDesktopScreenWidth() const { return g_Config.m_GfxDesktopWidth; }
 	virtual int GetDesktopScreenHeight() const { return g_Config.m_GfxDesktopHeight; }
diff --git a/src/engine/client/input.cpp b/src/engine/client/input.cpp
index 7de5a9e31d..f590ba8c02 100644
--- a/src/engine/client/input.cpp
+++ b/src/engine/client/input.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #if defined(CONF_FAMILY_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // windows.h must be included before imm.h, but clang-format requires includes to be sorted alphabetically, hence this comment.
 #include <imm.h>
@@ -34,19 +33,25 @@
 // for platform specific features that aren't available or are broken in SDL
 #include <SDL_syswm.h>
 
-void CInput::AddEvent(char *pText, int Key, int Flags)
+void CInput::AddKeyEvent(int Key, int Flags)
 {
-	if(m_NumEvents != INPUT_BUFFER_SIZE)
-	{
-		m_aInputEvents[m_NumEvents].m_Key = Key;
-		m_aInputEvents[m_NumEvents].m_Flags = Flags;
-		if(pText == nullptr)
-			m_aInputEvents[m_NumEvents].m_aText[0] = '\0';
-		else
-			str_copy(m_aInputEvents[m_NumEvents].m_aText, pText);
-		m_aInputEvents[m_NumEvents].m_InputCount = m_InputCounter;
-		m_NumEvents++;
-	}
+	dbg_assert((Flags & (FLAG_PRESS | FLAG_RELEASE)) != 0 && (Flags & ~(FLAG_PRESS | FLAG_RELEASE)) == 0, "Flags invalid");
+	CEvent Event;
+	Event.m_Key = Key;
+	Event.m_Flags = Flags;
+	Event.m_aText[0] = '\0';
+	Event.m_InputCount = m_InputCounter;
+	m_vInputEvents.emplace_back(Event);
+}
+
+void CInput::AddTextEvent(const char *pText)
+{
+	CEvent Event;
+	Event.m_Key = KEY_UNKNOWN;
+	Event.m_Flags = FLAG_TEXT;
+	str_copy(Event.m_aText, pText);
+	Event.m_InputCount = m_InputCounter;
+	m_vInputEvents.emplace_back(Event);
 }
 
 CInput::CInput()
@@ -54,20 +59,15 @@ CInput::CInput()
 	mem_zero(m_aInputCount, sizeof(m_aInputCount));
 	mem_zero(m_aInputState, sizeof(m_aInputState));
 
+	m_vInputEvents.reserve(32);
 	m_LastUpdate = 0;
 	m_UpdateTime = 0.0f;
 
 	m_InputCounter = 1;
 	m_InputGrabbed = false;
 
-	m_MouseDoubleClick = false;
-
-	m_NumEvents = 0;
 	m_MouseFocus = true;
 
-	m_pClipboardText = nullptr;
-
-	m_CompositionLength = COMP_LENGTH_INACTIVE;
 	m_CompositionCursor = 0;
 	m_CandidateSelectedIndex = -1;
 
@@ -80,6 +80,7 @@ void CInput::Init()
 
 	m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
 	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
 
 	MouseModeRelative();
 
@@ -88,7 +89,6 @@ void CInput::Init()
 
 void CInput::Shutdown()
 {
-	SDL_free(m_pClipboardText);
 	CloseJoysticks();
 }
 
@@ -175,7 +175,7 @@ CInput::CJoystick::CJoystick(CInput *pInput, int Index, SDL_Joystick *pDelegate)
 	m_NumHats = SDL_JoystickNumHats(pDelegate);
 	str_copy(m_aName, SDL_JoystickName(pDelegate));
 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(pDelegate), m_aGUID, sizeof(m_aGUID));
-	m_InstanceID = SDL_JoystickInstanceID(pDelegate);
+	m_InstanceId = SDL_JoystickInstanceID(pDelegate);
 }
 
 void CInput::CloseJoysticks()
@@ -217,7 +217,7 @@ void CInput::CJoystick::GetJoystickHatKeys(int Hat, int HatValue, int (&HatKeys)
 
 void CInput::CJoystick::GetHatValue(int Hat, int (&HatKeys)[2])
 {
-	return GetJoystickHatKeys(Hat, SDL_JoystickGetHat(m_pDelegate, Hat), HatKeys);
+	GetJoystickHatKeys(Hat, SDL_JoystickGetHat(m_pDelegate, Hat), HatKeys);
 }
 
 bool CInput::CJoystick::Relative(float *pX, float *pY)
@@ -260,14 +260,7 @@ bool CInput::MouseRelative(float *pX, float *pY)
 		return false;
 
 	ivec2 Relative;
-#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
-	ivec2 CurrentPos;
-	SDL_GetMouseState(&CurrentPos.x, &CurrentPos.y);
-	Relative = CurrentPos - m_LastMousePos;
-	m_LastMousePos = CurrentPos;
-#else
 	SDL_GetRelativeMouseState(&Relative.x, &Relative.y);
-#endif
 
 	*pX = Relative.x;
 	*pY = Relative.y;
@@ -284,40 +277,36 @@ void CInput::MouseModeAbsolute()
 void CInput::MouseModeRelative()
 {
 	m_InputGrabbed = true;
-#if !defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
 	SDL_SetRelativeMouseMode(SDL_TRUE);
-#endif
 	Graphics()->SetWindowGrab(true);
 	// Clear pending relative mouse motion
 	SDL_GetRelativeMouseState(nullptr, nullptr);
 }
 
-void CInput::NativeMousePos(int *pX, int *pY) const
+vec2 CInput::NativeMousePos() const
 {
-	SDL_GetMouseState(pX, pY);
+	ivec2 Position;
+	SDL_GetMouseState(&Position.x, &Position.y);
+	return vec2(Position.x, Position.y);
 }
 
-bool CInput::NativeMousePressed(int Index)
+bool CInput::NativeMousePressed(int Index) const
 {
 	int i = SDL_GetMouseState(nullptr, nullptr);
 	return (i & SDL_BUTTON(Index)) != 0;
 }
 
-bool CInput::MouseDoubleClick()
+const std::vector<IInput::CTouchFingerState> &CInput::TouchFingerStates() const
 {
-	if(m_MouseDoubleClick)
-	{
-		m_MouseDoubleClick = false;
-		return true;
-	}
-	return false;
+	return m_vTouchFingerStates;
 }
 
-const char *CInput::GetClipboardText()
+std::string CInput::GetClipboardText()
 {
-	SDL_free(m_pClipboardText);
-	m_pClipboardText = SDL_GetClipboardText();
-	return m_pClipboardText;
+	char *pClipboardText = SDL_GetClipboardText();
+	std::string ClipboardText = pClipboardText;
+	SDL_free(pClipboardText);
+	return ClipboardText;
 }
 
 void CInput::SetClipboardText(const char *pText)
@@ -337,17 +326,37 @@ void CInput::StopTextInput()
 	SDL_StopTextInput();
 	// disable system messages for performance
 	SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE);
-	m_CompositionLength = COMP_LENGTH_INACTIVE;
+	m_CompositionString = "";
 	m_CompositionCursor = 0;
-	m_aComposition[0] = '\0';
 	m_vCandidates.clear();
 }
 
+void CInput::ConsumeEvents(std::function<void(const CEvent &Event)> Consumer) const
+{
+	for(const CEvent &Event : m_vInputEvents)
+	{
+		// Only propagate valid input events
+		if(Event.m_InputCount == m_InputCounter)
+		{
+			Consumer(Event);
+		}
+	}
+}
+
 void CInput::Clear()
 {
 	mem_zero(m_aInputState, sizeof(m_aInputState));
 	mem_zero(m_aInputCount, sizeof(m_aInputCount));
-	m_NumEvents = 0;
+	m_vInputEvents.clear();
+	for(CTouchFingerState &TouchFingerState : m_vTouchFingerStates)
+	{
+		TouchFingerState.m_Delta = vec2(0.0f, 0.0f);
+	}
+}
+
+float CInput::GetUpdateTime() const
+{
+	return m_UpdateTime;
 }
 
 bool CInput::KeyState(int Key) const
@@ -357,6 +366,26 @@ bool CInput::KeyState(int Key) const
 	return m_aInputState[Key];
 }
 
+int CInput::FindKeyByName(const char *pKeyName) const
+{
+	// check for numeric
+	if(pKeyName[0] == '&')
+	{
+		int Key = str_toint(pKeyName + 1);
+		if(Key > KEY_FIRST && Key < KEY_LAST)
+			return Key; // numeric
+	}
+
+	// search for key
+	for(int Key = KEY_FIRST; Key < KEY_LAST; Key++)
+	{
+		if(str_comp_nocase(pKeyName, KeyName(Key)) == 0)
+			return Key;
+	}
+
+	return KEY_UNKNOWN;
+}
+
 void CInput::UpdateMouseState()
 {
 	const int MouseState = SDL_GetMouseState(nullptr, nullptr);
@@ -412,7 +441,7 @@ void CInput::HandleJoystickAxisMotionEvent(const SDL_JoyAxisEvent &Event)
 	if(!g_Config.m_InpControllerEnable)
 		return;
 	CJoystick *pJoystick = GetActiveJoystick();
-	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+	if(!pJoystick || pJoystick->GetInstanceId() != Event.which)
 		return;
 	if(Event.axis >= NUM_JOYSTICK_AXES)
 		return;
@@ -425,24 +454,24 @@ void CInput::HandleJoystickAxisMotionEvent(const SDL_JoyAxisEvent &Event)
 	{
 		m_aInputState[LeftKey] = true;
 		m_aInputCount[LeftKey] = m_InputCounter;
-		AddEvent(nullptr, LeftKey, IInput::FLAG_PRESS);
+		AddKeyEvent(LeftKey, IInput::FLAG_PRESS);
 	}
 	else if(Event.value > SDL_JOYSTICK_AXIS_MIN * DeadZone && m_aInputState[LeftKey])
 	{
 		m_aInputState[LeftKey] = false;
-		AddEvent(nullptr, LeftKey, IInput::FLAG_RELEASE);
+		AddKeyEvent(LeftKey, IInput::FLAG_RELEASE);
 	}
 
 	if(Event.value >= SDL_JOYSTICK_AXIS_MAX * DeadZone && !m_aInputState[RightKey])
 	{
 		m_aInputState[RightKey] = true;
 		m_aInputCount[RightKey] = m_InputCounter;
-		AddEvent(nullptr, RightKey, IInput::FLAG_PRESS);
+		AddKeyEvent(RightKey, IInput::FLAG_PRESS);
 	}
 	else if(Event.value < SDL_JOYSTICK_AXIS_MAX * DeadZone && m_aInputState[RightKey])
 	{
 		m_aInputState[RightKey] = false;
-		AddEvent(nullptr, RightKey, IInput::FLAG_RELEASE);
+		AddKeyEvent(RightKey, IInput::FLAG_RELEASE);
 	}
 }
 
@@ -451,7 +480,7 @@ void CInput::HandleJoystickButtonEvent(const SDL_JoyButtonEvent &Event)
 	if(!g_Config.m_InpControllerEnable)
 		return;
 	CJoystick *pJoystick = GetActiveJoystick();
-	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+	if(!pJoystick || pJoystick->GetInstanceId() != Event.which)
 		return;
 	if(Event.button >= NUM_JOYSTICK_BUTTONS)
 		return;
@@ -462,12 +491,12 @@ void CInput::HandleJoystickButtonEvent(const SDL_JoyButtonEvent &Event)
 	{
 		m_aInputState[Key] = true;
 		m_aInputCount[Key] = m_InputCounter;
-		AddEvent(nullptr, Key, IInput::FLAG_PRESS);
+		AddKeyEvent(Key, IInput::FLAG_PRESS);
 	}
 	else if(Event.type == SDL_JOYBUTTONUP)
 	{
 		m_aInputState[Key] = false;
-		AddEvent(nullptr, Key, IInput::FLAG_RELEASE);
+		AddKeyEvent(Key, IInput::FLAG_RELEASE);
 	}
 }
 
@@ -476,7 +505,7 @@ void CInput::HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event)
 	if(!g_Config.m_InpControllerEnable)
 		return;
 	CJoystick *pJoystick = GetActiveJoystick();
-	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+	if(!pJoystick || pJoystick->GetInstanceId() != Event.which)
 		return;
 	if(Event.hat >= NUM_JOYSTICK_HATS)
 		return;
@@ -489,7 +518,7 @@ void CInput::HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event)
 		if(Key != HatKeys[0] && Key != HatKeys[1] && m_aInputState[Key])
 		{
 			m_aInputState[Key] = false;
-			AddEvent(nullptr, Key, IInput::FLAG_RELEASE);
+			AddKeyEvent(Key, IInput::FLAG_RELEASE);
 		}
 	}
 
@@ -499,7 +528,7 @@ void CInput::HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event)
 		{
 			m_aInputState[CurrentKey] = true;
 			m_aInputCount[CurrentKey] = m_InputCounter;
-			AddEvent(nullptr, CurrentKey, IInput::FLAG_PRESS);
+			AddKeyEvent(CurrentKey, IInput::FLAG_PRESS);
 		}
 	}
 }
@@ -514,7 +543,7 @@ void CInput::HandleJoystickAddedEvent(const SDL_JoyDeviceEvent &Event)
 
 void CInput::HandleJoystickRemovedEvent(const SDL_JoyDeviceEvent &Event)
 {
-	auto RemovedJoystick = std::find_if(m_vJoysticks.begin(), m_vJoysticks.end(), [Event](const CJoystick &Joystick) -> bool { return Joystick.GetInstanceID() == Event.which; });
+	auto RemovedJoystick = std::find_if(m_vJoysticks.begin(), m_vJoysticks.end(), [Event](const CJoystick &Joystick) -> bool { return Joystick.GetInstanceId() == Event.which; });
 	if(RemovedJoystick != m_vJoysticks.end())
 	{
 		dbg_msg("joystick", "Closed joystick %d '%s'", (*RemovedJoystick).GetIndex(), (*RemovedJoystick).GetName());
@@ -529,6 +558,59 @@ void CInput::HandleJoystickRemovedEvent(const SDL_JoyDeviceEvent &Event)
 	}
 }
 
+void CInput::HandleTouchDownEvent(const SDL_TouchFingerEvent &Event)
+{
+	CTouchFingerState TouchFingerState;
+	TouchFingerState.m_Finger.m_DeviceId = Event.touchId;
+	TouchFingerState.m_Finger.m_FingerId = Event.fingerId;
+	TouchFingerState.m_Position = vec2(Event.x, Event.y);
+	TouchFingerState.m_Delta = vec2(Event.dx, Event.dy);
+	m_vTouchFingerStates.emplace_back(TouchFingerState);
+}
+
+void CInput::HandleTouchUpEvent(const SDL_TouchFingerEvent &Event)
+{
+	auto FoundState = std::find_if(m_vTouchFingerStates.begin(), m_vTouchFingerStates.end(), [Event](const CTouchFingerState &State) {
+		return State.m_Finger.m_DeviceId == Event.touchId && State.m_Finger.m_FingerId == Event.fingerId;
+	});
+	if(FoundState != m_vTouchFingerStates.end())
+	{
+		m_vTouchFingerStates.erase(FoundState);
+	}
+}
+
+void CInput::HandleTouchMotionEvent(const SDL_TouchFingerEvent &Event)
+{
+	auto FoundState = std::find_if(m_vTouchFingerStates.begin(), m_vTouchFingerStates.end(), [Event](const CTouchFingerState &State) {
+		return State.m_Finger.m_DeviceId == Event.touchId && State.m_Finger.m_FingerId == Event.fingerId;
+	});
+	if(FoundState != m_vTouchFingerStates.end())
+	{
+		FoundState->m_Position = vec2(Event.x, Event.y);
+		FoundState->m_Delta += vec2(Event.dx, Event.dy);
+	}
+}
+
+void CInput::HandleTextEditingEvent(const char *pText, int Start, int Length)
+{
+	if(pText[0] != '\0')
+	{
+		m_CompositionString = pText;
+		m_CompositionCursor = 0;
+		for(int i = 0; i < Start; i++)
+		{
+			m_CompositionCursor = str_utf8_forward(m_CompositionString.c_str(), m_CompositionCursor);
+		}
+		// Length is currently unused on Windows and will always be 0, so we don't support selecting composition text
+		AddTextEvent("");
+	}
+	else
+	{
+		m_CompositionString = "";
+		m_CompositionCursor = 0;
+	}
+}
+
 void CInput::SetCompositionWindowPosition(float X, float Y, float H)
 {
 	SDL_Rect Rect;
@@ -539,6 +621,40 @@ void CInput::SetCompositionWindowPosition(float X, float Y, float H)
 	SDL_SetTextInputRect(&Rect);
 }
 
+static int TranslateScancode(const SDL_KeyboardEvent &KeyEvent)
+{
+	// See SDL_Keymod for possible modifiers:
+	// NONE   =     0
+	// LSHIFT =     1
+	// RSHIFT =     2
+	// LCTRL  =    64
+	// RCTRL  =   128
+	// LALT   =   256
+	// RALT   =   512
+	// LGUI   =  1024
+	// RGUI   =  2048
+	// NUM    =  4096
+	// CAPS   =  8192
+	// MODE   = 16384
+	// Sum if you want to ignore multiple modifiers.
+	if(KeyEvent.keysym.mod & g_Config.m_InpIgnoredModifiers)
+	{
+		return 0;
+	}
+
+	int Scancode = g_Config.m_InpTranslatedKeys ? SDL_GetScancodeFromKey(KeyEvent.keysym.sym) : KeyEvent.keysym.scancode;
+
+#if defined(CONF_PLATFORM_ANDROID)
+	// Translate the Android back-button to the escape-key so it can be used to open/close the menu, close popups etc.
+	if(Scancode == KEY_AC_BACK)
+	{
+		Scancode = KEY_ESCAPE;
+	}
+#endif
+
+	return Scancode;
+}
+
 int CInput::Update()
 {
 	const int64_t Now = time_get();
@@ -549,8 +665,8 @@ int CInput::Update()
 	}
 	m_LastUpdate = Now;
 
-	// keep the counter between 1..0xFFFF, 0 means not pressed
-	m_InputCounter = (m_InputCounter % 0xFFFF) + 1;
+	// keep the counter between 1..0xFFFFFFFF, 0 means not pressed
+	m_InputCounter = (m_InputCounter % std::numeric_limits<decltype(m_InputCounter)>::max()) + 1;
 
 	// Ensure that we have the latest keyboard, mouse and joystick state
 	SDL_PumpEvents();
@@ -579,57 +695,29 @@ int CInput::Update()
 			break;
 
 		case SDL_TEXTEDITING:
-		{
-			m_CompositionLength = str_length(Event.edit.text);
-			if(m_CompositionLength)
-			{
-				str_copy(m_aComposition, Event.edit.text);
-				m_CompositionCursor = 0;
-				for(int i = 0; i < Event.edit.start; i++)
-					m_CompositionCursor = str_utf8_forward(m_aComposition, m_CompositionCursor);
-				// Event.edit.length is currently unused on Windows and will always be 0, so we don't support selecting composition text
-				AddEvent(nullptr, KEY_UNKNOWN, IInput::FLAG_TEXT);
-			}
-			else
-			{
-				m_aComposition[0] = '\0';
-				m_CompositionLength = 0;
-				m_CompositionCursor = 0;
-			}
+			HandleTextEditingEvent(Event.edit.text, Event.edit.start, Event.edit.length);
 			break;
-		}
+
+#if SDL_VERSION_ATLEAST(2, 0, 22)
+		case SDL_TEXTEDITING_EXT:
+			HandleTextEditingEvent(Event.editExt.text, Event.editExt.start, Event.editExt.length);
+			SDL_free(Event.editExt.text);
+			break;
+#endif
 
 		case SDL_TEXTINPUT:
-			m_aComposition[0] = '\0';
-			m_CompositionLength = COMP_LENGTH_INACTIVE;
+			m_CompositionString = "";
 			m_CompositionCursor = 0;
-			AddEvent(Event.text.text, KEY_UNKNOWN, IInput::FLAG_TEXT);
+			AddTextEvent(Event.text.text);
 			break;
 
 		// handle keys
 		case SDL_KEYDOWN:
-			// See SDL_Keymod for possible modifiers:
-			// NONE   =     0
-			// LSHIFT =     1
-			// RSHIFT =     2
-			// LCTRL  =    64
-			// RCTRL  =   128
-			// LALT   =   256
-			// RALT   =   512
-			// LGUI   =  1024
-			// RGUI   =  2048
-			// NUM    =  4096
-			// CAPS   =  8192
-			// MODE   = 16384
-			// Sum if you want to ignore multiple modifiers.
-			if(!(Event.key.keysym.mod & g_Config.m_InpIgnoredModifiers))
-			{
-				Scancode = g_Config.m_InpTranslatedKeys ? SDL_GetScancodeFromKey(Event.key.keysym.sym) : Event.key.keysym.scancode;
-			}
+			Scancode = TranslateScancode(Event.key);
 			break;
 		case SDL_KEYUP:
 			Action = IInput::FLAG_RELEASE;
-			Scancode = g_Config.m_InpTranslatedKeys ? SDL_GetScancodeFromKey(Event.key.keysym.sym) : Event.key.keysym.scancode;
+			Scancode = TranslateScancode(Event.key);
 			break;
 
 		// handle the joystick events
@@ -678,13 +766,6 @@ int CInput::Update()
 				Scancode = KEY_MOUSE_8;
 			if(Event.button.button == 9)
 				Scancode = KEY_MOUSE_9;
-			if(Event.button.button == SDL_BUTTON_LEFT)
-			{
-				if(Event.button.clicks % 2 == 0)
-					m_MouseDoubleClick = true;
-				if(Event.button.clicks == 1)
-					m_MouseDoubleClick = false;
-			}
 			break;
 
 		case SDL_MOUSEWHEEL:
@@ -699,6 +780,18 @@ int CInput::Update()
 			Action |= IInput::FLAG_RELEASE;
 			break;
 
+		case SDL_FINGERDOWN:
+			HandleTouchDownEvent(Event.tfinger);
+			break;
+
+		case SDL_FINGERUP:
+			HandleTouchUpEvent(Event.tfinger);
+			break;
+
+		case SDL_FINGERMOTION:
+			HandleTouchMotionEvent(Event.tfinger);
+			break;
+
 		case SDL_WINDOWEVENT:
 			// Ignore keys following a focus gain as they may be part of global
 			// shortcuts
@@ -732,6 +825,9 @@ int CInput::Update()
 				}
 				break;
 			case SDL_WINDOWEVENT_MINIMIZED:
+#if defined(CONF_PLATFORM_ANDROID) // Save the config when minimized on Android.
+				m_pConfigManager->Save();
+#endif
 				Graphics()->WindowDestroyNtf(Event.window.windowID);
 				break;
 
@@ -764,13 +860,10 @@ int CInput::Update()
 				m_aInputState[Scancode] = 1;
 				m_aInputCount[Scancode] = m_InputCounter;
 			}
-			AddEvent(nullptr, Scancode, Action);
+			AddKeyEvent(Scancode, Action);
 		}
 	}
 
-	if(m_CompositionLength == 0)
-		m_CompositionLength = COMP_LENGTH_INACTIVE;
-
 	return 0;
 }
 
diff --git a/src/engine/client/input.h b/src/engine/client/input.h
index b0576b52c4..d0098abf1b 100644
--- a/src/engine/client/input.h
+++ b/src/engine/client/input.h
@@ -5,6 +5,7 @@
 
 #include <SDL_events.h>
 #include <SDL_joystick.h>
+#include <engine/console.h>
 
 #include <engine/input.h>
 #include <engine/keys.h>
@@ -13,6 +14,7 @@
 #include <vector>
 
 class IEngineGraphics;
+class IConfigManager;
 
 class CInput : public IEngineInput
 {
@@ -25,7 +27,7 @@ class CInput : public IEngineInput
 		int m_Index;
 		char m_aName[64];
 		char m_aGUID[34];
-		SDL_JoystickID m_InstanceID;
+		SDL_JoystickID m_InstanceId;
 		int m_NumAxes;
 		int m_NumButtons;
 		int m_NumBalls;
@@ -42,7 +44,7 @@ class CInput : public IEngineInput
 		int GetIndex() const override { return m_Index; }
 		const char *GetName() const override { return m_aName; }
 		const char *GetGUID() const { return m_aGUID; }
-		SDL_JoystickID GetInstanceID() const { return m_InstanceID; }
+		SDL_JoystickID GetInstanceId() const { return m_InstanceId; }
 		int GetNumAxes() const override { return m_NumAxes; }
 		int GetNumButtons() const override { return m_NumButtons; }
 		int GetNumBalls() const override { return m_NumBalls; }
@@ -58,9 +60,10 @@ class CInput : public IEngineInput
 private:
 	IEngineGraphics *m_pGraphics;
 	IConsole *m_pConsole;
+	IConfigManager *m_pConfigManager;
 
-	IEngineGraphics *Graphics() { return m_pGraphics; }
-	IConsole *Console() { return m_pConsole; }
+	IEngineGraphics *Graphics() const { return m_pGraphics; }
+	IConsole *Console() const { return m_pConsole; }
 
 	// joystick
 	std::vector<CJoystick> m_vJoysticks;
@@ -73,29 +76,27 @@ class CInput : public IEngineInput
 	float GetJoystickDeadzone();
 
 	bool m_InputGrabbed;
-	char *m_pClipboardText;
 
 	bool m_MouseFocus;
-	bool m_MouseDoubleClick;
-#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
-	ivec2 m_LastMousePos = ivec2(0, 0);
-#endif
 
 	// IME support
-	char m_aComposition[MAX_COMPOSITION_ARRAY_SIZE];
+	std::string m_CompositionString;
 	int m_CompositionCursor;
-	int m_CompositionLength;
 	std::vector<std::string> m_vCandidates;
 	int m_CandidateSelectedIndex;
 
-	void AddEvent(char *pText, int Key, int Flags);
-	void Clear() override;
-	bool IsEventValid(const CEvent &Event) const override { return Event.m_InputCount == m_InputCounter; }
+	// events
+	std::vector<CEvent> m_vInputEvents;
+	int64_t m_LastUpdate;
+	float m_UpdateTime;
+	void AddKeyEvent(int Key, int Flags);
+	void AddTextEvent(const char *pText);
 
 	// quick access to input
-	unsigned short m_aInputCount[g_MaxKeys]; // tw-KEY
-	unsigned char m_aInputState[g_MaxKeys]; // SDL_SCANCODE
-	int m_InputCounter;
+	uint32_t m_aInputCount[g_MaxKeys];
+	unsigned char m_aInputState[g_MaxKeys];
+	uint32_t m_InputCounter;
+	std::vector<CTouchFingerState> m_vTouchFingerStates;
 
 	void UpdateMouseState();
 	void UpdateJoystickState();
@@ -104,6 +105,10 @@ class CInput : public IEngineInput
 	void HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event);
 	void HandleJoystickAddedEvent(const SDL_JoyDeviceEvent &Event);
 	void HandleJoystickRemovedEvent(const SDL_JoyDeviceEvent &Event);
+	void HandleTouchDownEvent(const SDL_TouchFingerEvent &Event);
+	void HandleTouchUpEvent(const SDL_TouchFingerEvent &Event);
+	void HandleTouchMotionEvent(const SDL_TouchFingerEvent &Event);
+	void HandleTextEditingEvent(const char *pText, int Start, int Length);
 
 	char m_aDropFile[IO_MAX_PATH_LENGTH];
 
@@ -118,11 +123,16 @@ class CInput : public IEngineInput
 	int Update() override;
 	void Shutdown() override;
 
+	void ConsumeEvents(std::function<void(const CEvent &Event)> Consumer) const override;
+	void Clear() override;
+	float GetUpdateTime() const override;
+
 	bool ModifierIsPressed() const override { return KeyState(KEY_LCTRL) || KeyState(KEY_RCTRL) || KeyState(KEY_LGUI) || KeyState(KEY_RGUI); }
 	bool ShiftIsPressed() const override { return KeyState(KEY_LSHIFT) || KeyState(KEY_RSHIFT); }
 	bool AltIsPressed() const override { return KeyState(KEY_LALT) || KeyState(KEY_RALT); }
 	bool KeyIsPressed(int Key) const override { return KeyState(Key); }
 	bool KeyPress(int Key, bool CheckCounter) const override { return CheckCounter ? (m_aInputCount[Key] == m_InputCounter) : m_aInputCount[Key]; }
+	int FindKeyByName(const char *pKeyName) const override;
 
 	size_t NumJoysticks() const override { return m_vJoysticks.size(); }
 	CJoystick *GetJoystick(size_t Index) override { return &m_vJoysticks[Index]; }
@@ -132,19 +142,20 @@ class CInput : public IEngineInput
 	bool MouseRelative(float *pX, float *pY) override;
 	void MouseModeAbsolute() override;
 	void MouseModeRelative() override;
-	void NativeMousePos(int *pX, int *pY) const override;
-	bool NativeMousePressed(int Index) override;
-	bool MouseDoubleClick() override;
+	vec2 NativeMousePos() const override;
+	bool NativeMousePressed(int Index) const override;
+
+	const std::vector<CTouchFingerState> &TouchFingerStates() const override;
 
-	const char *GetClipboardText() override;
+	std::string GetClipboardText() override;
 	void SetClipboardText(const char *pText) override;
 
 	void StartTextInput() override;
 	void StopTextInput() override;
-	const char *GetComposition() const override { return m_aComposition; }
-	bool HasComposition() const override { return m_CompositionLength != COMP_LENGTH_INACTIVE; }
+	const char *GetComposition() const override { return m_CompositionString.c_str(); }
+	bool HasComposition() const override { return !m_CompositionString.empty(); }
 	int GetCompositionCursor() const override { return m_CompositionCursor; }
-	int GetCompositionLength() const override { return m_CompositionLength; }
+	int GetCompositionLength() const override { return m_CompositionString.length(); }
 	const char *GetCandidate(int Index) const override { return m_vCandidates[Index].c_str(); }
 	int GetCandidateCount() const override { return m_vCandidates.size(); }
 	int GetCandidateSelectedIndex() const override { return m_CandidateSelectedIndex; }
diff --git a/src/engine/client/keynames.h b/src/engine/client/keynames.h
index 57005ff873..a41dd9d499 100644
--- a/src/engine/client/keynames.h
+++ b/src/engine/client/keynames.h
@@ -5,517 +5,518 @@
 #endif
 
 const char g_aaKeyStrings[512][20] = // NOLINT(misc-definitions-in-headers)
-	{
-		"unknown",
-		"&1",
-		"&2",
-		"&3",
-		"a",
-		"b",
-		"c",
-		"d",
-		"e",
-		"f",
-		"g",
-		"h",
-		"i",
-		"j",
-		"k",
-		"l",
-		"m",
-		"n",
-		"o",
-		"p",
-		"q",
-		"r",
-		"s",
-		"t",
-		"u",
-		"v",
-		"w",
-		"x",
-		"y",
-		"z",
-		"1",
-		"2",
-		"3",
-		"4",
-		"5",
-		"6",
-		"7",
-		"8",
-		"9",
-		"0",
-		"return",
-		"escape",
-		"backspace",
-		"tab",
-		"space",
-		"minus",
-		"equals",
-		"leftbracket",
-		"rightbracket",
-		"backslash",
-		"nonushash",
-		"semicolon",
-		"apostrophe",
-		"grave",
-		"comma",
-		"period",
-		"slash",
-		"capslock",
-		"f1",
-		"f2",
-		"f3",
-		"f4",
-		"f5",
-		"f6",
-		"f7",
-		"f8",
-		"f9",
-		"f10",
-		"f11",
-		"f12",
-		"printscreen",
-		"scrolllock",
-		"pause",
-		"insert",
-		"home",
-		"pageup",
-		"delete",
-		"end",
-		"pagedown",
-		"right",
-		"left",
-		"down",
-		"up",
-		"numlockclear",
-		"kp_divide",
-		"kp_multiply",
-		"kp_minus",
-		"kp_plus",
-		"kp_enter",
-		"kp_1",
-		"kp_2",
-		"kp_3",
-		"kp_4",
-		"kp_5",
-		"kp_6",
-		"kp_7",
-		"kp_8",
-		"kp_9",
-		"kp_0",
-		"kp_period",
-		"nonusbackslash",
-		"application",
-		"power",
-		"kp_equals",
-		"f13",
-		"f14",
-		"f15",
-		"f16",
-		"f17",
-		"f18",
-		"f19",
-		"f20",
-		"f21",
-		"f22",
-		"f23",
-		"f24",
-		"execute",
-		"help",
-		"menu",
-		"select",
-		"stop",
-		"again",
-		"undo",
-		"cut",
-		"copy",
-		"paste",
-		"find",
-		"mute",
-		"volumeup",
-		"volumedown",
-		"&130",
-		"&131",
-		"&132",
-		"kp_comma",
-		"kp_equalsas400",
-		"international1",
-		"international2",
-		"international3",
-		"international4",
-		"international5",
-		"international6",
-		"international7",
-		"international8",
-		"international9",
-		"lang1",
-		"lang2",
-		"lang3",
-		"lang4",
-		"lang5",
-		"lang6",
-		"lang7",
-		"lang8",
-		"lang9",
-		"alterase",
-		"sysreq",
-		"cancel",
-		"clear",
-		"prior",
-		"return2",
-		"separator",
-		"out",
-		"oper",
-		"clearagain",
-		"crsel",
-		"exsel",
-		"&165",
-		"&166",
-		"&167",
-		"&168",
-		"&169",
-		"&170",
-		"&171",
-		"&172",
-		"&173",
-		"&174",
-		"&175",
-		"kp_00",
-		"kp_000",
-		"thousandsseparator",
-		"decimalseparator",
-		"currencyunit",
-		"currencysubunit",
-		"kp_leftparen",
-		"kp_rightparen",
-		"kp_leftbrace",
-		"kp_rightbrace",
-		"kp_tab",
-		"kp_backspace",
-		"kp_a",
-		"kp_b",
-		"kp_c",
-		"kp_d",
-		"kp_e",
-		"kp_f",
-		"kp_xor",
-		"kp_power",
-		"kp_percent",
-		"kp_less",
-		"kp_greater",
-		"kp_ampersand",
-		"kp_dblampersand",
-		"kp_verticalbar",
-		"kp_dblverticalbar",
-		"kp_colon",
-		"kp_hash",
-		"kp_space",
-		"kp_at",
-		"kp_exclam",
-		"kp_memstore",
-		"kp_memrecall",
-		"kp_memclear",
-		"kp_memadd",
-		"kp_memsubtract",
-		"kp_memmultiply",
-		"kp_memdivide",
-		"kp_plusminus",
-		"kp_clear",
-		"kp_clearentry",
-		"kp_binary",
-		"kp_octal",
-		"kp_decimal",
-		"kp_hexadecimal",
-		"&222",
-		"&223",
-		"lctrl",
-		"lshift",
-		"lalt",
-		"lgui",
-		"rctrl",
-		"rshift",
-		"ralt",
-		"rgui",
-		"&232",
-		"&233",
-		"&234",
-		"&235",
-		"&236",
-		"&237",
-		"&238",
-		"&239",
-		"&240",
-		"&241",
-		"&242",
-		"&243",
-		"&244",
-		"&245",
-		"&246",
-		"&247",
-		"&248",
-		"&249",
-		"&250",
-		"&251",
-		"&252",
-		"&253",
-		"&254",
-		"&255",
-		"&256",
-		"mode",
-		"audionext",
-		"audioprev",
-		"audiostop",
-		"audioplay",
-		"audiomute",
-		"mediaselect",
-		"www",
-		"mail",
-		"calculator",
-		"computer",
-		"ac_search",
-		"ac_home",
-		"ac_back",
-		"ac_forward",
-		"ac_stop",
-		"ac_refresh",
-		"ac_bookmarks",
-		"brightnessdown",
-		"brightnessup",
-		"displayswitch",
-		"kbdillumtoggle",
-		"kbdillumdown",
-		"kbdillumup",
-		"eject",
-		"sleep",
-		"app1",
-		"app2",
-		"audiorewind",
-		"audiofastforward",
-		"softleft",
-		"softright",
-		"call",
-		"endcall",
-		"mouse1",
-		"mouse2",
-		"mouse3",
-		"mouse4",
-		"mouse5",
-		"mouse6",
-		"mouse7",
-		"mouse8",
-		"mouse9",
-		"mousewheelup",
-		"mousewheeldown",
-		"mousewheelleft",
-		"mousewheelright",
-		"joystick0",
-		"joystick1",
-		"joystick2",
-		"joystick3",
-		"joystick4",
-		"joystick5",
-		"joystick6",
-		"joystick7",
-		"joystick8",
-		"joystick9",
-		"joystick10",
-		"joystick11",
-		"joy_hat0_up",
-		"joy_hat0_left",
-		"joy_hat0_right",
-		"joy_hat0_down",
-		"joy_hat1_up",
-		"joy_hat1_left",
-		"joy_hat1_right",
-		"joy_hat1_down",
-		"joy_axis0_left",
-		"joy_axis0_right",
-		"joy_axis1_left",
-		"joy_axis1_right",
-		"joy_axis2_left",
-		"joy_axis2_right",
-		"joy_axis3_left",
-		"joy_axis3_right",
-		"joy_axis4_left",
-		"joy_axis4_right",
-		"joy_axis5_left",
-		"joy_axis5_right",
-		"joy_axis6_left",
-		"joy_axis6_right",
-		"joy_axis7_left",
-		"joy_axis7_right",
-		"joy_axis8_left",
-		"joy_axis8_right",
-		"joy_axis9_left",
-		"joy_axis9_right",
-		"joy_axis10_left",
-		"joy_axis10_right",
-		"joy_axis11_left",
-		"joy_axis11_right",
-		"&348",
-		"&349",
-		"&350",
-		"&351",
-		"&352",
-		"&353",
-		"&354",
-		"&355",
-		"&356",
-		"&357",
-		"&358",
-		"&359",
-		"&360",
-		"&361",
-		"&362",
-		"&363",
-		"&364",
-		"&365",
-		"&366",
-		"&367",
-		"&368",
-		"&369",
-		"&370",
-		"&371",
-		"&372",
-		"&373",
-		"&374",
-		"&375",
-		"&376",
-		"&377",
-		"&378",
-		"&379",
-		"&380",
-		"&381",
-		"&382",
-		"&383",
-		"&384",
-		"&385",
-		"&386",
-		"&387",
-		"&388",
-		"&389",
-		"&390",
-		"&391",
-		"&392",
-		"&393",
-		"&394",
-		"&395",
-		"&396",
-		"&397",
-		"&398",
-		"&399",
-		"&400",
-		"&401",
-		"&402",
-		"&403",
-		"&404",
-		"&405",
-		"&406",
-		"&407",
-		"&408",
-		"&409",
-		"&410",
-		"&411",
-		"&412",
-		"&413",
-		"&414",
-		"&415",
-		"&416",
-		"&417",
-		"&418",
-		"&419",
-		"&420",
-		"&421",
-		"&422",
-		"&423",
-		"&424",
-		"&425",
-		"&426",
-		"&427",
-		"&428",
-		"&429",
-		"&430",
-		"&431",
-		"&432",
-		"&433",
-		"&434",
-		"&435",
-		"&436",
-		"&437",
-		"&438",
-		"&439",
-		"&440",
-		"&441",
-		"&442",
-		"&443",
-		"&444",
-		"&445",
-		"&446",
-		"&447",
-		"&448",
-		"&449",
-		"&450",
-		"&451",
-		"&452",
-		"&453",
-		"&454",
-		"&455",
-		"&456",
-		"&457",
-		"&458",
-		"&459",
-		"&460",
-		"&461",
-		"&462",
-		"&463",
-		"&464",
-		"&465",
-		"&466",
-		"&467",
-		"&468",
-		"&469",
-		"&470",
-		"&471",
-		"&472",
-		"&473",
-		"&474",
-		"&475",
-		"&476",
-		"&477",
-		"&478",
-		"&479",
-		"&480",
-		"&481",
-		"&482",
-		"&483",
-		"&484",
-		"&485",
-		"&486",
-		"&487",
-		"&488",
-		"&489",
-		"&490",
-		"&491",
-		"&492",
-		"&493",
-		"&494",
-		"&495",
-		"&496",
-		"&497",
-		"&498",
-		"&499",
-		"&500",
-		"&501",
-		"&502",
-		"&503",
-		"&504",
-		"&505",
-		"&506",
-		"&507",
-		"&508",
-		"&509",
-		"&510",
-		"&511",
+{
+	"unknown",
+	"&1",
+	"&2",
+	"&3",
+	"a",
+	"b",
+	"c",
+	"d",
+	"e",
+	"f",
+	"g",
+	"h",
+	"i",
+	"j",
+	"k",
+	"l",
+	"m",
+	"n",
+	"o",
+	"p",
+	"q",
+	"r",
+	"s",
+	"t",
+	"u",
+	"v",
+	"w",
+	"x",
+	"y",
+	"z",
+	"1",
+	"2",
+	"3",
+	"4",
+	"5",
+	"6",
+	"7",
+	"8",
+	"9",
+	"0",
+	"return",
+	"escape",
+	"backspace",
+	"tab",
+	"space",
+	"minus",
+	"equals",
+	"leftbracket",
+	"rightbracket",
+	"backslash",
+	"nonushash",
+	"semicolon",
+	"apostrophe",
+	"grave",
+	"comma",
+	"period",
+	"slash",
+	"capslock",
+	"f1",
+	"f2",
+	"f3",
+	"f4",
+	"f5",
+	"f6",
+	"f7",
+	"f8",
+	"f9",
+	"f10",
+	"f11",
+	"f12",
+	"printscreen",
+	"scrolllock",
+	"pause",
+	"insert",
+	"home",
+	"pageup",
+	"delete",
+	"end",
+	"pagedown",
+	"right",
+	"left",
+	"down",
+	"up",
+	"numlockclear",
+	"kp_divide",
+	"kp_multiply",
+	"kp_minus",
+	"kp_plus",
+	"kp_enter",
+	"kp_1",
+	"kp_2",
+	"kp_3",
+	"kp_4",
+	"kp_5",
+	"kp_6",
+	"kp_7",
+	"kp_8",
+	"kp_9",
+	"kp_0",
+	"kp_period",
+	"nonusbackslash",
+	"application",
+	"power",
+	"kp_equals",
+	"f13",
+	"f14",
+	"f15",
+	"f16",
+	"f17",
+	"f18",
+	"f19",
+	"f20",
+	"f21",
+	"f22",
+	"f23",
+	"f24",
+	"execute",
+	"help",
+	"menu",
+	"select",
+	"stop",
+	"again",
+	"undo",
+	"cut",
+	"copy",
+	"paste",
+	"find",
+	"mute",
+	"volumeup",
+	"volumedown",
+	"&130",
+	"&131",
+	"&132",
+	"kp_comma",
+	"kp_equalsas400",
+	"international1",
+	"international2",
+	"international3",
+	"international4",
+	"international5",
+	"international6",
+	"international7",
+	"international8",
+	"international9",
+	"lang1",
+	"lang2",
+	"lang3",
+	"lang4",
+	"lang5",
+	"lang6",
+	"lang7",
+	"lang8",
+	"lang9",
+	"alterase",
+	"sysreq",
+	"cancel",
+	"clear",
+	"prior",
+	"return2",
+	"separator",
+	"out",
+	"oper",
+	"clearagain",
+	"crsel",
+	"exsel",
+	"&165",
+	"&166",
+	"&167",
+	"&168",
+	"&169",
+	"&170",
+	"&171",
+	"&172",
+	"&173",
+	"&174",
+	"&175",
+	"kp_00",
+	"kp_000",
+	"thousandsseparator",
+	"decimalseparator",
+	"currencyunit",
+	"currencysubunit",
+	"kp_leftparen",
+	"kp_rightparen",
+	"kp_leftbrace",
+	"kp_rightbrace",
+	"kp_tab",
+	"kp_backspace",
+	"kp_a",
+	"kp_b",
+	"kp_c",
+	"kp_d",
+	"kp_e",
+	"kp_f",
+	"kp_xor",
+	"kp_power",
+	"kp_percent",
+	"kp_less",
+	"kp_greater",
+	"kp_ampersand",
+	"kp_dblampersand",
+	"kp_verticalbar",
+	"kp_dblverticalbar",
+	"kp_colon",
+	"kp_hash",
+	"kp_space",
+	"kp_at",
+	"kp_exclam",
+	"kp_memstore",
+	"kp_memrecall",
+	"kp_memclear",
+	"kp_memadd",
+	"kp_memsubtract",
+	"kp_memmultiply",
+	"kp_memdivide",
+	"kp_plusminus",
+	"kp_clear",
+	"kp_clearentry",
+	"kp_binary",
+	"kp_octal",
+	"kp_decimal",
+	"kp_hexadecimal",
+	"&222",
+	"&223",
+	"lctrl",
+	"lshift",
+	"lalt",
+	"lgui",
+	"rctrl",
+	"rshift",
+	"ralt",
+	"rgui",
+	"&232",
+	"&233",
+	"&234",
+	"&235",
+	"&236",
+	"&237",
+	"&238",
+	"&239",
+	"&240",
+	"&241",
+	"&242",
+	"&243",
+	"&244",
+	"&245",
+	"&246",
+	"&247",
+	"&248",
+	"&249",
+	"&250",
+	"&251",
+	"&252",
+	"&253",
+	"&254",
+	"&255",
+	"&256",
+	"mode",
+	"audionext",
+	"audioprev",
+	"audiostop",
+	"audioplay",
+	"audiomute",
+	"mediaselect",
+	"www",
+	"mail",
+	"calculator",
+	"computer",
+	"ac_search",
+	"ac_home",
+	"ac_back",
+	"ac_forward",
+	"ac_stop",
+	"ac_refresh",
+	"ac_bookmarks",
+	"brightnessdown",
+	"brightnessup",
+	"displayswitch",
+	"kbdillumtoggle",
+	"kbdillumdown",
+	"kbdillumup",
+	"eject",
+	"sleep",
+	"app1",
+	"app2",
+	"audiorewind",
+	"audiofastforward",
+	"softleft",
+	"softright",
+	"call",
+	"endcall",
+	"mouse1",
+	"mouse2",
+	"mouse3",
+	"mouse4",
+	"mouse5",
+	"mouse6",
+	"mouse7",
+	"mouse8",
+	"mouse9",
+	"mousewheelup",
+	"mousewheeldown",
+	"mousewheelleft",
+	"mousewheelright",
+	"joystick0",
+	"joystick1",
+	"joystick2",
+	"joystick3",
+	"joystick4",
+	"joystick5",
+	"joystick6",
+	"joystick7",
+	"joystick8",
+	"joystick9",
+	"joystick10",
+	"joystick11",
+	"joy_hat0_up",
+	"joy_hat0_left",
+	"joy_hat0_right",
+	"joy_hat0_down",
+	"joy_hat1_up",
+	"joy_hat1_left",
+	"joy_hat1_right",
+	"joy_hat1_down",
+	"joy_axis0_left",
+	"joy_axis0_right",
+	"joy_axis1_left",
+	"joy_axis1_right",
+	"joy_axis2_left",
+	"joy_axis2_right",
+	"joy_axis3_left",
+	"joy_axis3_right",
+	"joy_axis4_left",
+	"joy_axis4_right",
+	"joy_axis5_left",
+	"joy_axis5_right",
+	"joy_axis6_left",
+	"joy_axis6_right",
+	"joy_axis7_left",
+	"joy_axis7_right",
+	"joy_axis8_left",
+	"joy_axis8_right",
+	"joy_axis9_left",
+	"joy_axis9_right",
+	"joy_axis10_left",
+	"joy_axis10_right",
+	"joy_axis11_left",
+	"joy_axis11_right",
+	"&348",
+	"&349",
+	"&350",
+	"&351",
+	"&352",
+	"&353",
+	"&354",
+	"&355",
+	"&356",
+	"&357",
+	"&358",
+	"&359",
+	"&360",
+	"&361",
+	"&362",
+	"&363",
+	"&364",
+	"&365",
+	"&366",
+	"&367",
+	"&368",
+	"&369",
+	"&370",
+	"&371",
+	"&372",
+	"&373",
+	"&374",
+	"&375",
+	"&376",
+	"&377",
+	"&378",
+	"&379",
+	"&380",
+	"&381",
+	"&382",
+	"&383",
+	"&384",
+	"&385",
+	"&386",
+	"&387",
+	"&388",
+	"&389",
+	"&390",
+	"&391",
+	"&392",
+	"&393",
+	"&394",
+	"&395",
+	"&396",
+	"&397",
+	"&398",
+	"&399",
+	"&400",
+	"&401",
+	"&402",
+	"&403",
+	"&404",
+	"&405",
+	"&406",
+	"&407",
+	"&408",
+	"&409",
+	"&410",
+	"&411",
+	"&412",
+	"&413",
+	"&414",
+	"&415",
+	"&416",
+	"&417",
+	"&418",
+	"&419",
+	"&420",
+	"&421",
+	"&422",
+	"&423",
+	"&424",
+	"&425",
+	"&426",
+	"&427",
+	"&428",
+	"&429",
+	"&430",
+	"&431",
+	"&432",
+	"&433",
+	"&434",
+	"&435",
+	"&436",
+	"&437",
+	"&438",
+	"&439",
+	"&440",
+	"&441",
+	"&442",
+	"&443",
+	"&444",
+	"&445",
+	"&446",
+	"&447",
+	"&448",
+	"&449",
+	"&450",
+	"&451",
+	"&452",
+	"&453",
+	"&454",
+	"&455",
+	"&456",
+	"&457",
+	"&458",
+	"&459",
+	"&460",
+	"&461",
+	"&462",
+	"&463",
+	"&464",
+	"&465",
+	"&466",
+	"&467",
+	"&468",
+	"&469",
+	"&470",
+	"&471",
+	"&472",
+	"&473",
+	"&474",
+	"&475",
+	"&476",
+	"&477",
+	"&478",
+	"&479",
+	"&480",
+	"&481",
+	"&482",
+	"&483",
+	"&484",
+	"&485",
+	"&486",
+	"&487",
+	"&488",
+	"&489",
+	"&490",
+	"&491",
+	"&492",
+	"&493",
+	"&494",
+	"&495",
+	"&496",
+	"&497",
+	"&498",
+	"&499",
+	"&500",
+	"&501",
+	"&502",
+	"&503",
+	"&504",
+	"&505",
+	"&506",
+	"&507",
+	"&508",
+	"&509",
+	"&510",
+	"&511",
 };
+
diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
index 22939fe1fa..07cd529da7 100644
--- a/src/engine/client/serverbrowser.cpp
+++ b/src/engine/client/serverbrowser.cpp
@@ -6,7 +6,6 @@
 #include "serverbrowser_ping_cache.h"
 
 #include <algorithm>
-#include <climits>
 #include <unordered_set>
 #include <vector>
 
@@ -25,6 +24,7 @@
 #include <engine/engine.h>
 #include <engine/favorites.h>
 #include <engine/friends.h>
+#include <engine/http.h>
 #include <engine/storage.h>
 
 class CSortWrap
@@ -50,9 +50,9 @@ bool matchesExactly(const char *a, const char *b)
 }
 
 CServerBrowser::CServerBrowser() :
-	m_CommunitiesFilter(g_Config.m_BrFilterExcludeCommunities, sizeof(g_Config.m_BrFilterExcludeCommunities)),
-	m_CountriesFilter(g_Config.m_BrFilterExcludeCountries, sizeof(g_Config.m_BrFilterExcludeCountries)),
-	m_TypesFilter(g_Config.m_BrFilterExcludeTypes, sizeof(g_Config.m_BrFilterExcludeTypes))
+	m_CommunityCache(this),
+	m_CountriesFilter(&m_CommunityCache),
+	m_TypesFilter(&m_CommunityCache)
 {
 	m_ppServerlist = nullptr;
 	m_pSortedServerlist = nullptr;
@@ -67,9 +67,6 @@ CServerBrowser::CServerBrowser() :
 	m_BroadcastTime = 0;
 	secure_random_fill(m_aTokenSeed, sizeof(m_aTokenSeed));
 
-	m_pDDNetInfo = nullptr;
-	m_DDNetInfoUpdateTime = 0;
-
 	CleanUp();
 }
 
@@ -95,6 +92,7 @@ void CServerBrowser::SetBaseInfo(class CNetClient *pClient, const char *pNetVers
 	m_pFavorites = Kernel()->RequestInterface<IFavorites>();
 	m_pFriends = Kernel()->RequestInterface<IFriends>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pHttpClient = Kernel()->RequestInterface<IHttp>();
 	m_pPingCache = CreateServerBrowserPingCache(m_pConsole, m_pStorage);
 
 	RegisterCommands();
@@ -102,17 +100,111 @@ void CServerBrowser::SetBaseInfo(class CNetClient *pClient, const char *pNetVers
 
 void CServerBrowser::OnInit()
 {
-	m_pHttp = CreateServerBrowserHttp(m_pEngine, m_pConsole, m_pStorage, g_Config.m_BrCachedBestServerinfoUrl);
+	m_pHttp = CreateServerBrowserHttp(m_pEngine, m_pStorage, m_pHttpClient, g_Config.m_BrCachedBestServerinfoUrl);
 }
 
 void CServerBrowser::RegisterCommands()
 {
+	m_pConfigManager->RegisterCallback(CServerBrowser::ConfigSaveCallback, this);
+	m_pConsole->Register("add_favorite_community", "s[community_id]", CFGFLAG_CLIENT, Con_AddFavoriteCommunity, this, "Add a community as a favorite");
+	m_pConsole->Register("remove_favorite_community", "s[community_id]", CFGFLAG_CLIENT, Con_RemoveFavoriteCommunity, this, "Remove a community from the favorites");
+	m_pConsole->Register("add_excluded_community", "s[community_id]", CFGFLAG_CLIENT, Con_AddExcludedCommunity, this, "Add a community to the exclusion filter");
+	m_pConsole->Register("remove_excluded_community", "s[community_id]", CFGFLAG_CLIENT, Con_RemoveExcludedCommunity, this, "Remove a community from the exclusion filter");
+	m_pConsole->Register("add_excluded_country", "s[community_id] s[country_code]", CFGFLAG_CLIENT, Con_AddExcludedCountry, this, "Add a country to the exclusion filter for a specific community");
+	m_pConsole->Register("remove_excluded_country", "s[community_id] s[country_code]", CFGFLAG_CLIENT, Con_RemoveExcludedCountry, this, "Remove a country from the exclusion filter for a specific community");
+	m_pConsole->Register("add_excluded_type", "s[community_id] s[type]", CFGFLAG_CLIENT, Con_AddExcludedType, this, "Add a type to the exclusion filter for a specific community");
+	m_pConsole->Register("remove_excluded_type", "s[community_id] s[type]", CFGFLAG_CLIENT, Con_RemoveExcludedType, this, "Remove a type from the exclusion filter for a specific community");
 	m_pConsole->Register("leak_ip_address_to_all_servers", "", CFGFLAG_CLIENT, Con_LeakIpAddress, this, "Leaks your IP address to all servers by pinging each of them, also acquiring the latency in the process");
 }
 
+void CServerBrowser::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	pThis->FavoriteCommunitiesFilter().Save(pConfigManager);
+	pThis->CommunitiesFilter().Save(pConfigManager);
+	pThis->CountriesFilter().Save(pConfigManager);
+	pThis->TypesFilter().Save(pConfigManager);
+}
+
+void CServerBrowser::Con_AddFavoriteCommunity(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	if(!pThis->ValidateCommunityId(pCommunityId))
+		return;
+	pThis->FavoriteCommunitiesFilter().Add(pCommunityId);
+}
+
+void CServerBrowser::Con_RemoveFavoriteCommunity(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	if(!pThis->ValidateCommunityId(pCommunityId))
+		return;
+	pThis->FavoriteCommunitiesFilter().Remove(pCommunityId);
+}
+
+void CServerBrowser::Con_AddExcludedCommunity(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	if(!pThis->ValidateCommunityId(pCommunityId))
+		return;
+	pThis->CommunitiesFilter().Add(pCommunityId);
+}
+
+void CServerBrowser::Con_RemoveExcludedCommunity(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	if(!pThis->ValidateCommunityId(pCommunityId))
+		return;
+	pThis->CommunitiesFilter().Remove(pCommunityId);
+}
+
+void CServerBrowser::Con_AddExcludedCountry(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	const char *pCountryName = pResult->GetString(1);
+	if(!pThis->ValidateCommunityId(pCommunityId) || !pThis->ValidateCountryName(pCountryName))
+		return;
+	pThis->CountriesFilter().Add(pCommunityId, pCountryName);
+}
+
+void CServerBrowser::Con_RemoveExcludedCountry(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	const char *pCountryName = pResult->GetString(1);
+	if(!pThis->ValidateCommunityId(pCommunityId) || !pThis->ValidateCountryName(pCountryName))
+		return;
+	pThis->CountriesFilter().Remove(pCommunityId, pCountryName);
+}
+
+void CServerBrowser::Con_AddExcludedType(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	const char *pTypeName = pResult->GetString(1);
+	if(!pThis->ValidateCommunityId(pCommunityId) || !pThis->ValidateTypeName(pTypeName))
+		return;
+	pThis->TypesFilter().Add(pCommunityId, pTypeName);
+}
+
+void CServerBrowser::Con_RemoveExcludedType(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
+	const char *pCommunityId = pResult->GetString(0);
+	const char *pTypeName = pResult->GetString(1);
+	if(!pThis->ValidateCommunityId(pCommunityId) || !pThis->ValidateTypeName(pTypeName))
+		return;
+	pThis->TypesFilter().Remove(pCommunityId, pTypeName);
+}
+
 void CServerBrowser::Con_LeakIpAddress(IConsole::IResult *pResult, void *pUserData)
 {
-	CServerBrowser *pThis = (CServerBrowser *)pUserData;
+	CServerBrowser *pThis = static_cast<CServerBrowser *>(pUserData);
 
 	// We only consider the first address of every server.
 
@@ -169,6 +261,50 @@ void CServerBrowser::Con_LeakIpAddress(IConsole::IResult *pResult, void *pUserDa
 	}
 }
 
+static bool ValidIdentifier(const char *pId, size_t MaxLength)
+{
+	if(pId[0] == '\0' || (size_t)str_length(pId) >= MaxLength)
+	{
+		return false;
+	}
+
+	for(int i = 0; pId[i] != '\0'; ++i)
+	{
+		if(pId[i] == '"' || pId[i] == '/' || pId[i] == '\\')
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+static bool ValidateIdentifier(const char *pId, size_t MaxLength, const char *pContext, IConsole *pConsole)
+{
+	if(!ValidIdentifier(pId, MaxLength))
+	{
+		char aError[32 + IConsole::CMDLINE_LENGTH];
+		str_format(aError, sizeof(aError), "%s '%s' is not valid", pContext, pId);
+		pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowser", aError);
+		return false;
+	}
+	return true;
+}
+
+bool CServerBrowser::ValidateCommunityId(const char *pCommunityId) const
+{
+	return ValidateIdentifier(pCommunityId, CServerInfo::MAX_COMMUNITY_ID_LENGTH, "Community ID", m_pConsole);
+}
+
+bool CServerBrowser::ValidateCountryName(const char *pCountryName) const
+{
+	return ValidateIdentifier(pCountryName, CServerInfo::MAX_COMMUNITY_COUNTRY_LENGTH, "Country name", m_pConsole);
+}
+
+bool CServerBrowser::ValidateTypeName(const char *pTypeName) const
+{
+	return ValidateIdentifier(pTypeName, CServerInfo::MAX_COMMUNITY_TYPE_LENGTH, "Type name", m_pConsole);
+}
+
 int CServerBrowser::Players(const CServerInfo &Item) const
 {
 	return g_Config.m_BrFilterSpectators ? Item.m_NumPlayers : Item.m_NumClients;
@@ -250,6 +386,17 @@ bool CServerBrowser::SortCompareNumClients(int Index1, int Index2) const
 	return pIndex1->m_Info.m_NumClients > pIndex2->m_Info.m_NumClients;
 }
 
+bool CServerBrowser::SortCompareNumFriends(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+
+	if(pIndex1->m_Info.m_FriendNum == pIndex2->m_Info.m_FriendNum)
+		return pIndex1->m_Info.m_NumFilteredPlayers > pIndex2->m_Info.m_NumFilteredPlayers;
+	else
+		return pIndex1->m_Info.m_FriendNum > pIndex2->m_Info.m_FriendNum;
+}
+
 bool CServerBrowser::SortCompareNumPlayersAndPing(int Index1, int Index2) const
 {
 	CServerEntry *pIndex1 = m_ppServerlist[Index1];
@@ -296,13 +443,22 @@ void CServerBrowser::Filter()
 			Filtered = true;
 		else if(g_Config.m_BrFilterUnfinishedMap && Info.m_HasRank == CServerInfo::RANK_RANKED)
 			Filtered = true;
+		else if(g_Config.m_BrFilterLogin && Info.m_RequiresLogin)
+			Filtered = true;
 		else
 		{
-			if(m_ServerlistType == IServerBrowser::TYPE_INTERNET || m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+			if(!Communities().empty())
 			{
-				Filtered = CommunitiesFilter().Filtered(Info.m_aCommunityId);
-				Filtered = Filtered || CountriesFilter().Filtered(Info.m_aCommunityCountry);
-				Filtered = Filtered || TypesFilter().Filtered(Info.m_aCommunityType);
+				if(m_ServerlistType == IServerBrowser::TYPE_INTERNET || m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+				{
+					Filtered = CommunitiesFilter().Filtered(Info.m_aCommunityId);
+				}
+				if(m_ServerlistType == IServerBrowser::TYPE_INTERNET || m_ServerlistType == IServerBrowser::TYPE_FAVORITES ||
+					(m_ServerlistType >= IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 && m_ServerlistType <= IServerBrowser::TYPE_FAVORITE_COMMUNITY_5))
+				{
+					Filtered = Filtered || CountriesFilter().Filtered(Info.m_aCommunityCountry);
+					Filtered = Filtered || TypesFilter().Filtered(Info.m_aCommunityType);
+				}
 			}
 
 			if(!Filtered && g_Config.m_BrFilterCountry)
@@ -325,22 +481,26 @@ void CServerBrowser::Filter()
 
 				const char *pStr = g_Config.m_BrFilterString;
 				char aFilterStr[sizeof(g_Config.m_BrFilterString)];
+				char aFilterStrTrimmed[sizeof(g_Config.m_BrFilterString)];
 				while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aFilterStr, sizeof(aFilterStr))))
 				{
-					if(aFilterStr[0] == '\0')
+					str_copy(aFilterStrTrimmed, str_utf8_skip_whitespaces(aFilterStr));
+					str_utf8_trim_right(aFilterStrTrimmed);
+
+					if(aFilterStrTrimmed[0] == '\0')
 					{
 						continue;
 					}
 					auto MatchesFn = matchesPart;
-					const int FilterLen = str_length(aFilterStr);
-					if(aFilterStr[0] == '"' && aFilterStr[FilterLen - 1] == '"')
+					const int FilterLen = str_length(aFilterStrTrimmed);
+					if(aFilterStrTrimmed[0] == '"' && aFilterStrTrimmed[FilterLen - 1] == '"')
 					{
-						aFilterStr[FilterLen - 1] = '\0';
+						aFilterStrTrimmed[FilterLen - 1] = '\0';
 						MatchesFn = matchesExactly;
 					}
 
 					// match against server name
-					if(MatchesFn(Info.m_aName, aFilterStr))
+					if(MatchesFn(Info.m_aName, aFilterStrTrimmed))
 					{
 						Info.m_QuickSearchHit |= IServerBrowser::QUICK_SERVERNAME;
 					}
@@ -348,8 +508,8 @@ void CServerBrowser::Filter()
 					// match against players
 					for(int p = 0; p < minimum(Info.m_NumClients, (int)MAX_CLIENTS); p++)
 					{
-						if(MatchesFn(Info.m_aClients[p].m_aName, aFilterStr) ||
-							MatchesFn(Info.m_aClients[p].m_aClan, aFilterStr))
+						if(MatchesFn(Info.m_aClients[p].m_aName, aFilterStrTrimmed) ||
+							MatchesFn(Info.m_aClients[p].m_aClan, aFilterStrTrimmed))
 						{
 							if(g_Config.m_BrFilterConnectingPlayers &&
 								str_comp(Info.m_aClients[p].m_aName, "(connecting)") == 0 &&
@@ -363,7 +523,7 @@ void CServerBrowser::Filter()
 					}
 
 					// match against map
-					if(MatchesFn(Info.m_aMap, aFilterStr))
+					if(MatchesFn(Info.m_aMap, aFilterStrTrimmed))
 					{
 						Info.m_QuickSearchHit |= IServerBrowser::QUICK_MAPNAME;
 					}
@@ -377,36 +537,40 @@ void CServerBrowser::Filter()
 			{
 				const char *pStr = g_Config.m_BrExcludeString;
 				char aExcludeStr[sizeof(g_Config.m_BrExcludeString)];
+				char aExcludeStrTrimmed[sizeof(g_Config.m_BrExcludeString)];
 				while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aExcludeStr, sizeof(aExcludeStr))))
 				{
-					if(aExcludeStr[0] == '\0')
+					str_copy(aExcludeStrTrimmed, str_utf8_skip_whitespaces(aExcludeStr));
+					str_utf8_trim_right(aExcludeStrTrimmed);
+
+					if(aExcludeStrTrimmed[0] == '\0')
 					{
 						continue;
 					}
 					auto MatchesFn = matchesPart;
-					const int FilterLen = str_length(aExcludeStr);
-					if(aExcludeStr[0] == '"' && aExcludeStr[FilterLen - 1] == '"')
+					const int FilterLen = str_length(aExcludeStrTrimmed);
+					if(aExcludeStrTrimmed[0] == '"' && aExcludeStrTrimmed[FilterLen - 1] == '"')
 					{
-						aExcludeStr[FilterLen - 1] = '\0';
+						aExcludeStrTrimmed[FilterLen - 1] = '\0';
 						MatchesFn = matchesExactly;
 					}
 
 					// match against server name
-					if(MatchesFn(Info.m_aName, aExcludeStr))
+					if(MatchesFn(Info.m_aName, aExcludeStrTrimmed))
 					{
 						Filtered = true;
 						break;
 					}
 
 					// match against map
-					if(MatchesFn(Info.m_aMap, aExcludeStr))
+					if(MatchesFn(Info.m_aMap, aExcludeStrTrimmed))
 					{
 						Filtered = true;
 						break;
 					}
 
 					// match against gametype
-					if(MatchesFn(Info.m_aGameType, aExcludeStr))
+					if(MatchesFn(Info.m_aGameType, aExcludeStrTrimmed))
 					{
 						Filtered = true;
 						break;
@@ -441,6 +605,7 @@ int CServerBrowser::SortHash() const
 	i |= g_Config.m_BrFilterUnfinishedMap << 13;
 	i |= g_Config.m_BrFilterCountry << 14;
 	i |= g_Config.m_BrFilterConnectingPlayers << 15;
+	i |= g_Config.m_BrFilterLogin << 16;
 	return i;
 }
 
@@ -464,6 +629,8 @@ void CServerBrowser::Sort()
 		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortComparePing));
 	else if(g_Config.m_BrSort == IServerBrowser::SORT_MAP)
 		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareMap));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_NUMFRIENDS)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareNumFriends));
 	else if(g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS)
 		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareNumPlayers));
 	else if(g_Config.m_BrSort == IServerBrowser::SORT_GAMETYPE)
@@ -534,7 +701,22 @@ void ServerBrowserFormatAddresses(char *pBuffer, int BufferSize, NETADDR *pAddrs
 		{
 			return;
 		}
-		net_addr_str(&pAddrs[i], pBuffer, BufferSize, true);
+		char aIpAddr[512];
+		if(!net_addr_str(&pAddrs[i], aIpAddr, sizeof(aIpAddr), true))
+		{
+			str_copy(pBuffer, aIpAddr, BufferSize);
+			return;
+		}
+		if(pAddrs[i].type & NETTYPE_TW7)
+		{
+			str_format(
+				pBuffer,
+				BufferSize,
+				"tw-0.7+udp://%s",
+				aIpAddr);
+			return;
+		}
+		str_copy(pBuffer, aIpAddr, BufferSize);
 		int Length = str_length(pBuffer);
 		pBuffer += Length;
 		BufferSize -= Length;
@@ -550,12 +732,14 @@ void CServerBrowser::SetInfo(CServerEntry *pEntry, const CServerInfo &Info) cons
 	mem_copy(pEntry->m_Info.m_aAddresses, TmpInfo.m_aAddresses, sizeof(pEntry->m_Info.m_aAddresses));
 	pEntry->m_Info.m_NumAddresses = TmpInfo.m_NumAddresses;
 	ServerBrowserFormatAddresses(pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aAddress), pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
-	UpdateServerCommunity(&pEntry->m_Info);
+	str_copy(pEntry->m_Info.m_aCommunityId, TmpInfo.m_aCommunityId);
+	str_copy(pEntry->m_Info.m_aCommunityCountry, TmpInfo.m_aCommunityCountry);
+	str_copy(pEntry->m_Info.m_aCommunityType, TmpInfo.m_aCommunityType);
 	UpdateServerRank(&pEntry->m_Info);
 
 	if(pEntry->m_Info.m_ClientScoreKind == CServerInfo::CLIENT_SCORE_KIND_UNSPECIFIED)
 	{
-		if((str_find_nocase(pEntry->m_Info.m_aGameType, "race") || str_find_nocase(pEntry->m_Info.m_aGameType, "fastcap")) && g_Config.m_ClDDRaceScoreBoard)
+		if(str_find_nocase(pEntry->m_Info.m_aGameType, "race") || str_find_nocase(pEntry->m_Info.m_aGameType, "fastcap"))
 		{
 			pEntry->m_Info.m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT;
 		}
@@ -567,11 +751,11 @@ void CServerBrowser::SetInfo(CServerEntry *pEntry, const CServerInfo &Info) cons
 
 	class CPlayerScoreNameLess
 	{
-		const int ScoreKind;
+		const int m_ScoreKind;
 
 	public:
 		CPlayerScoreNameLess(int ClientScoreKind) :
-			ScoreKind(ClientScoreKind)
+			m_ScoreKind(ClientScoreKind)
 		{
 		}
 
@@ -586,7 +770,7 @@ void CServerBrowser::SetInfo(CServerEntry *pEntry, const CServerInfo &Info) cons
 			int Score0 = p0.m_Score;
 			int Score1 = p1.m_Score;
 
-			if(ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME || ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT)
+			if(m_ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME || m_ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT)
 			{
 				// Sort unfinished (-9999) and still connecting players (-1) after others
 				if(Score0 < 0 && Score1 >= 0)
@@ -598,7 +782,7 @@ void CServerBrowser::SetInfo(CServerEntry *pEntry, const CServerInfo &Info) cons
 			if(Score0 != Score1)
 			{
 				// Handle the sign change introduced with CLIENT_SCORE_KIND_TIME
-				if(ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME)
+				if(m_ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME)
 					return Score0 < Score1;
 				else
 					return Score0 > Score1;
@@ -662,6 +846,7 @@ CServerBrowser::CServerEntry *CServerBrowser::Add(const NETADDR *pAddrs, int Num
 	pEntry->m_Info.m_Latency = 999;
 	pEntry->m_Info.m_HasRank = CServerInfo::RANK_UNAVAILABLE;
 	ServerBrowserFormatAddresses(pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aAddress), pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
+	UpdateServerCommunity(&pEntry->m_Info);
 	str_copy(pEntry->m_Info.m_aName, pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aName));
 
 	// check if it's a favorite
@@ -767,9 +952,9 @@ void CServerBrowser::OnServerInfoUpdate(const NETADDR &Addr, int Token, const CS
 	RequestResort();
 }
 
-void CServerBrowser::Refresh(int Type)
+void CServerBrowser::Refresh(int Type, bool Force)
 {
-	bool ServerListTypeChanged = m_ServerlistType != Type;
+	bool ServerListTypeChanged = Force || m_ServerlistType != Type;
 	int OldServerListType = m_ServerlistType;
 	m_ServerlistType = Type;
 	secure_random_fill(m_aTokenSeed, sizeof(m_aTokenSeed));
@@ -783,7 +968,7 @@ void CServerBrowser::Refresh(int Type)
 		CNetChunk Packet;
 
 		/* do the broadcast version */
-		Packet.m_ClientID = -1;
+		Packet.m_ClientId = -1;
 		mem_zero(&Packet, sizeof(Packet));
 		Packet.m_Address.type = m_pNetClient->NetType() | NETTYPE_LINK_BROADCAST;
 		Packet.m_Flags = NETSENDFLAG_CONNLESS | NETSENDFLAG_EXTENDED;
@@ -800,16 +985,16 @@ void CServerBrowser::Refresh(int Type)
 
 		m_BroadcastTime = time_get();
 
-		for(int i = 8303; i <= 8310; i++)
+		for(int Port = LAN_PORT_BEGIN; Port <= LAN_PORT_END; Port++)
 		{
-			Packet.m_Address.port = i;
+			Packet.m_Address.port = Port;
 			m_pNetClient->Send(&Packet);
 		}
 
 		if(g_Config.m_Debug)
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "serverbrowser", "broadcasting for servers");
 	}
-	else if(Type == IServerBrowser::TYPE_FAVORITES || Type == IServerBrowser::TYPE_INTERNET)
+	else
 	{
 		m_pHttp->Refresh();
 		m_pPingCache->Load();
@@ -859,7 +1044,7 @@ void CServerBrowser::RequestImpl(const NETADDR &Addr, CServerEntry *pEntry, int
 	aBuffer[sizeof(SERVERBROWSE_GETINFO)] = GetBasicToken(Token);
 
 	CNetChunk Packet;
-	Packet.m_ClientID = -1;
+	Packet.m_ClientId = -1;
 	Packet.m_Address = Addr;
 	Packet.m_Flags = NETSENDFLAG_CONNLESS | NETSENDFLAG_EXTENDED;
 	Packet.m_DataSize = sizeof(aBuffer);
@@ -907,11 +1092,40 @@ void CServerBrowser::UpdateFromHttp()
 	}
 
 	int NumServers = m_pHttp->NumServers();
-	int NumLegacyServers = m_pHttp->NumLegacyServers();
 	std::function<bool(const NETADDR *, int)> Want = [](const NETADDR *pAddrs, int NumAddrs) { return true; };
 	if(m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
 	{
-		Want = [&](const NETADDR *pAddrs, int NumAddrs) -> bool { return m_pFavorites->IsFavorite(pAddrs, NumAddrs) != TRISTATE::NONE; };
+		Want = [this](const NETADDR *pAddrs, int NumAddrs) -> bool {
+			return m_pFavorites->IsFavorite(pAddrs, NumAddrs) != TRISTATE::NONE;
+		};
+	}
+	else if(m_ServerlistType >= IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 && m_ServerlistType <= IServerBrowser::TYPE_FAVORITE_COMMUNITY_5)
+	{
+		const size_t CommunityIndex = m_ServerlistType - IServerBrowser::TYPE_FAVORITE_COMMUNITY_1;
+		std::vector<const CCommunity *> vpFavoriteCommunities = FavoriteCommunities();
+		dbg_assert(CommunityIndex < vpFavoriteCommunities.size(), "Invalid community index");
+		const CCommunity *pWantedCommunity = vpFavoriteCommunities[CommunityIndex];
+		const bool IsNoneCommunity = str_comp(pWantedCommunity->Id(), COMMUNITY_NONE) == 0;
+		Want = [this, pWantedCommunity, IsNoneCommunity](const NETADDR *pAddrs, int NumAddrs) -> bool {
+			for(int AddressIndex = 0; AddressIndex < NumAddrs; AddressIndex++)
+			{
+				const auto CommunityServer = m_CommunityServersByAddr.find(pAddrs[AddressIndex]);
+				if(CommunityServer != m_CommunityServersByAddr.end())
+				{
+					if(IsNoneCommunity)
+					{
+						// Servers with community "none" are not present in m_CommunityServersByAddr, so we ignore
+						// any server that is found in this map to determine only the servers without community.
+						return false;
+					}
+					else if(str_comp(CommunityServer->second.CommunityId(), pWantedCommunity->Id()) == 0)
+					{
+						return true;
+					}
+				}
+			}
+			return IsNoneCommunity;
+		};
 	}
 
 	for(int i = 0; i < NumServers; i++)
@@ -936,16 +1150,6 @@ void CServerBrowser::UpdateFromHttp()
 		pEntry->m_RequestIgnoreInfo = true;
 	}
 
-	for(int i = 0; i < NumLegacyServers; i++)
-	{
-		NETADDR Addr = m_pHttp->LegacyServer(i);
-		if(!Want(&Addr, 1))
-		{
-			continue;
-		}
-		QueueRequest(Add(&Addr, 1));
-	}
-
 	if(m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
 	{
 		const IFavorites::CEntry *pFavorites;
@@ -968,7 +1172,7 @@ void CServerBrowser::UpdateFromHttp()
 			}
 			// (Also add favorites we're not allowed to ping.)
 			CServerEntry *pEntry = Add(pFavorites[i].m_aAddrs, pFavorites[i].m_NumAddrs);
-			if(pFavorites->m_AllowPing)
+			if(pFavorites[i].m_AllowPing)
 			{
 				QueueRequest(pEntry);
 			}
@@ -1094,7 +1298,6 @@ const json_value *CServerBrowser::LoadDDNetInfo()
 		UpdateServerCommunity(&m_ppServerlist[i]->m_Info);
 		UpdateServerRank(&m_ppServerlist[i]->m_Info);
 	}
-	m_DDNetInfoUpdateTime = time_get();
 	return m_pDDNetInfo;
 }
 
@@ -1103,7 +1306,12 @@ void CServerBrowser::LoadDDNetInfoJson()
 	void *pBuf;
 	unsigned Length;
 	if(!m_pStorage->ReadFile(DDNET_INFO_FILE, IStorage::TYPE_SAVE, &pBuf, &Length))
+	{
+		m_DDNetInfoSha256 = SHA256_ZEROED;
 		return;
+	}
+
+	m_DDNetInfoSha256 = sha256(pBuf, Length);
 
 	json_value_free(m_pDDNetInfo);
 	json_settings JsonSettings{};
@@ -1229,14 +1437,12 @@ void CServerBrowser::LoadDDNetServers()
 
 	if(!m_pDDNetInfo)
 	{
-		CleanFilters();
 		return;
 	}
 
 	const json_value &Communities = (*m_pDDNetInfo)["communities"];
 	if(Communities.type != json_array)
 	{
-		CleanFilters();
 		return;
 	}
 
@@ -1258,8 +1464,22 @@ void CServerBrowser::LoadDDNetServers()
 		const json_value &IconSha256 = Icon["sha256"];
 		const json_value &IconUrl = Icon["url"];
 		const json_value &Name = Community["name"];
-		const json_value *pFinishes = &Icon["finishes"];
-		const json_value *pServers = &Icon["servers"];
+		const json_value HasFinishes = Community["has_finishes"];
+		const json_value *pFinishes = &Community["finishes"];
+		const json_value *pServers = &Community["servers"];
+		// We accidentally set finishes/servers to be part of icon in
+		// the past, so support that, too. Can be removed once we make
+		// a breaking change to the whole thing, necessitating a new
+		// endpoint.
+		if(pFinishes->type == json_none)
+		{
+			pServers = &Icon["finishes"];
+		}
+		if(pServers->type == json_none)
+		{
+			pServers = &Icon["servers"];
+		}
+		// Backward compatibility.
 		if(pFinishes->type == json_none)
 		{
 			if(str_comp(Id, COMMUNITY_DDNET) == 0)
@@ -1267,7 +1487,6 @@ void CServerBrowser::LoadDDNetServers()
 				pFinishes = &(*m_pDDNetInfo)["maps"];
 			}
 		}
-		// Backward compatibility.
 		if(pServers->type == json_none)
 		{
 			if(str_comp(Id, COMMUNITY_DDNET) == 0)
@@ -1284,6 +1503,7 @@ void CServerBrowser::LoadDDNetServers()
 			IconSha256.type != json_string ||
 			IconUrl.type != json_string ||
 			Name.type != json_string ||
+			HasFinishes.type != json_boolean ||
 			(pFinishes->type != json_array && pFinishes->type != json_none) ||
 			pServers->type != json_array)
 		{
@@ -1302,8 +1522,8 @@ void CServerBrowser::LoadDDNetServers()
 			log_error("serverbrowser", "invalid community servers (CommunityId=%s)", NewCommunity.Id());
 			continue;
 		}
-		NewCommunity.m_HasFinishes = pFinishes->type == json_array;
-		if(NewCommunity.m_HasFinishes && !ParseCommunityFinishes(&NewCommunity, *pFinishes))
+		NewCommunity.m_HasFinishes = HasFinishes;
+		if(NewCommunity.m_HasFinishes && pFinishes->type == json_array && !ParseCommunityFinishes(&NewCommunity, *pFinishes))
 		{
 			log_error("serverbrowser", "invalid community finishes (CommunityId=%s)", NewCommunity.Id());
 			continue;
@@ -1320,7 +1540,12 @@ void CServerBrowser::LoadDDNetServers()
 	}
 
 	// Add default none community
-	m_vCommunities.emplace_back(COMMUNITY_NONE, "None", SHA256_ZEROED, "");
+	{
+		CCommunity NoneCommunity(COMMUNITY_NONE, "None", SHA256_ZEROED, "");
+		NoneCommunity.m_vCountries.emplace_back(COMMUNITY_COUNTRY_NONE, -1);
+		NoneCommunity.m_vTypes.emplace_back(COMMUNITY_TYPE_NONE);
+		m_vCommunities.push_back(std::move(NoneCommunity));
+	}
 
 	// Remove unknown elements from exclude lists
 	CleanFilters();
@@ -1366,8 +1591,8 @@ void CServerBrowser::UpdateServerCommunity(CServerInfo *pInfo) const
 		}
 	}
 	str_copy(pInfo->m_aCommunityId, COMMUNITY_NONE);
-	str_copy(pInfo->m_aCommunityCountry, "");
-	str_copy(pInfo->m_aCommunityType, "");
+	str_copy(pInfo->m_aCommunityCountry, COMMUNITY_COUNTRY_NONE);
+	str_copy(pInfo->m_aCommunityType, COMMUNITY_TYPE_NONE);
 }
 
 void CServerBrowser::UpdateServerRank(CServerInfo *pInfo) const
@@ -1378,11 +1603,6 @@ void CServerBrowser::UpdateServerRank(CServerInfo *pInfo) const
 
 const char *CServerBrowser::GetTutorialServer()
 {
-	// Use internet tab as default after joining tutorial, also makes sure Find() actually works.
-	// Note that when no server info has been loaded yet, this will not return a result immediately.
-	m_pConfigManager->Reset("ui_page");
-	Refresh(IServerBrowser::TYPE_INTERNET);
-
 	const CCommunity *pCommunity = Community(COMMUNITY_DDNET);
 	if(pCommunity == nullptr)
 		return nullptr;
@@ -1393,10 +1613,10 @@ const char *CServerBrowser::GetTutorialServer()
 	{
 		for(const auto &Server : Country.Servers())
 		{
-			CServerEntry *pEntry = Find(Server.Address());
-			if(!pEntry)
+			if(str_comp(Server.TypeName(), "Tutorial") != 0)
 				continue;
-			if(str_find(pEntry->m_Info.m_aName, "(Tutorial)") == 0)
+			const CServerEntry *pEntry = Find(Server.Address());
+			if(!pEntry)
 				continue;
 			if(pEntry->m_Info.m_NumPlayers > pEntry->m_Info.m_MaxPlayers - 10)
 				continue;
@@ -1429,6 +1649,20 @@ int CServerBrowser::LoadingProgression() const
 	return 100.0f * Loaded / Servers;
 }
 
+bool CCommunity::HasCountry(const char *pCountryName) const
+{
+	return std::find_if(Countries().begin(), Countries().end(), [pCountryName](const auto &Elem) {
+		return str_comp(Elem.Name(), pCountryName) == 0;
+	}) != Countries().end();
+}
+
+bool CCommunity::HasType(const char *pTypeName) const
+{
+	return std::find_if(Types().begin(), Types().end(), [pTypeName](const auto &Elem) {
+		return str_comp(Elem.Name(), pTypeName) == 0;
+	}) != Types().end();
+}
+
 CServerInfo::ERankState CCommunity::HasRank(const char *pMap) const
 {
 	if(!HasRanks())
@@ -1463,147 +1697,604 @@ std::vector<const CCommunity *> CServerBrowser::SelectedCommunities() const
 	return vpSelected;
 }
 
-void CFilterList::Add(const char *pElement)
+std::vector<const CCommunity *> CServerBrowser::FavoriteCommunities() const
 {
-	if(Filtered(pElement))
-		return;
+	// This is done differently than SelectedCommunities because the favorite
+	// communities should be returned in the order specified by the user.
+	std::vector<const CCommunity *> vpFavorites;
+	for(const auto &CommunityId : FavoriteCommunitiesFilter().Entries())
+	{
+		const CCommunity *pCommunity = Community(CommunityId.Id());
+		if(pCommunity)
+		{
+			vpFavorites.push_back(pCommunity);
+		}
+	}
+	return vpFavorites;
+}
 
-	if(m_pFilter[0] != '\0')
-		str_append(m_pFilter, ",", m_FilterSize);
-	str_append(m_pFilter, pElement, m_FilterSize);
+std::vector<const CCommunity *> CServerBrowser::CurrentCommunities() const
+{
+	if(m_ServerlistType == IServerBrowser::TYPE_INTERNET || m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+	{
+		return SelectedCommunities();
+	}
+	else if(m_ServerlistType >= IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 && m_ServerlistType <= IServerBrowser::TYPE_FAVORITE_COMMUNITY_5)
+	{
+		const size_t CommunityIndex = m_ServerlistType - IServerBrowser::TYPE_FAVORITE_COMMUNITY_1;
+		std::vector<const CCommunity *> vpFavoriteCommunities = FavoriteCommunities();
+		dbg_assert(CommunityIndex < vpFavoriteCommunities.size(), "Invalid favorite community serverbrowser type");
+		return {vpFavoriteCommunities[CommunityIndex]};
+	}
+	else
+	{
+		return {};
+	}
+}
+
+unsigned CServerBrowser::CurrentCommunitiesHash() const
+{
+	std::vector<const CCommunity *> vpCommunities = CurrentCommunities();
+	unsigned Hash = 5381;
+	for(const CCommunity *pCommunity : CurrentCommunities())
+	{
+		Hash = (Hash << 5) + Hash + str_quickhash(pCommunity->Id());
+	}
+	return Hash;
 }
 
-void CFilterList::Remove(const char *pElement)
+void CCommunityCache::Update(bool Force)
 {
-	if(!Filtered(pElement))
+	const unsigned CommunitiesHash = m_pServerBrowser->CurrentCommunitiesHash();
+	const bool TypeChanged = m_LastType != m_pServerBrowser->GetCurrentType();
+	const bool CurrentCommunitiesChanged = m_LastType == m_pServerBrowser->GetCurrentType() && m_SelectedCommunitiesHash != CommunitiesHash;
+	if(CurrentCommunitiesChanged && m_pServerBrowser->GetCurrentType() >= IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 && m_pServerBrowser->GetCurrentType() <= IServerBrowser::TYPE_FAVORITE_COMMUNITY_5)
+	{
+		// Favorite community was changed while its type is active,
+		// refresh to get correct serverlist for updated community.
+		m_pServerBrowser->Refresh(m_pServerBrowser->GetCurrentType(), true);
+	}
+
+	if(!Force && m_InfoSha256 == m_pServerBrowser->DDNetInfoSha256() &&
+		!CurrentCommunitiesChanged && !TypeChanged)
+	{
 		return;
+	}
+
+	m_InfoSha256 = m_pServerBrowser->DDNetInfoSha256();
+	m_LastType = m_pServerBrowser->GetCurrentType();
+	m_SelectedCommunitiesHash = CommunitiesHash;
+	m_vpSelectedCommunities = m_pServerBrowser->CurrentCommunities();
+
+	m_vpSelectableCountries.clear();
+	m_vpSelectableTypes.clear();
+	for(const CCommunity *pCommunity : m_vpSelectedCommunities)
+	{
+		for(const auto &Country : pCommunity->Countries())
+		{
+			const auto ExistingCountry = std::find_if(m_vpSelectableCountries.begin(), m_vpSelectableCountries.end(), [&](const CCommunityCountry *pOther) {
+				return str_comp(Country.Name(), pOther->Name()) == 0 && Country.FlagId() == pOther->FlagId();
+			});
+			if(ExistingCountry == m_vpSelectableCountries.end())
+			{
+				m_vpSelectableCountries.push_back(&Country);
+			}
+		}
+		for(const auto &Type : pCommunity->Types())
+		{
+			const auto ExistingType = std::find_if(m_vpSelectableTypes.begin(), m_vpSelectableTypes.end(), [&](const CCommunityType *pOther) {
+				return str_comp(Type.Name(), pOther->Name()) == 0;
+			});
+			if(ExistingType == m_vpSelectableTypes.end())
+			{
+				m_vpSelectableTypes.push_back(&Type);
+			}
+		}
+	}
+
+	m_AnyRanksAvailable = std::any_of(m_vpSelectedCommunities.begin(), m_vpSelectedCommunities.end(), [](const CCommunity *pCommunity) {
+		return pCommunity->HasRanks();
+	});
+
+	// Country/type filters not shown if there are no countries and types, or if only the none-community is selected
+	m_CountryTypesFilterAvailable = (!m_vpSelectableCountries.empty() || !m_vpSelectableTypes.empty()) &&
+					(m_vpSelectedCommunities.size() != 1 || str_comp(m_vpSelectedCommunities[0]->Id(), IServerBrowser::COMMUNITY_NONE) != 0);
+
+	if(m_pServerBrowser->GetCurrentType() >= IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 && m_pServerBrowser->GetCurrentType() <= IServerBrowser::TYPE_FAVORITE_COMMUNITY_5)
+	{
+		const size_t CommunityIndex = m_pServerBrowser->GetCurrentType() - IServerBrowser::TYPE_FAVORITE_COMMUNITY_1;
+		std::vector<const CCommunity *> vpFavoriteCommunities = m_pServerBrowser->FavoriteCommunities();
+		dbg_assert(CommunityIndex < vpFavoriteCommunities.size(), "Invalid favorite community serverbrowser type");
+		m_pCountryTypeFilterKey = vpFavoriteCommunities[CommunityIndex]->Id();
+	}
+	else
+	{
+		m_pCountryTypeFilterKey = IServerBrowser::COMMUNITY_ALL;
+	}
+
+	m_pServerBrowser->CleanFilters();
+}
+
+void CFavoriteCommunityFilterList::Add(const char *pCommunityId)
+{
+	// Remove community if it's already a favorite, so it will be added again at
+	// the end of the list, to allow setting the entire list easier with binds.
+	Remove(pCommunityId);
+
+	// Ensure maximum number of favorite communities, by removing the least-recently
+	// added community from the beginning, when the maximum number of favorite
+	// communities has been reached.
+	constexpr size_t MaxFavoriteCommunities = IServerBrowser::TYPE_FAVORITE_COMMUNITY_5 - IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 + 1;
+	if(m_vEntries.size() >= MaxFavoriteCommunities)
+	{
+		dbg_assert(m_vEntries.size() == MaxFavoriteCommunities, "Maximum number of communities can never be exceeded");
+		m_vEntries.erase(m_vEntries.begin());
+	}
+	m_vEntries.emplace_back(pCommunityId);
+}
+
+void CFavoriteCommunityFilterList::Remove(const char *pCommunityId)
+{
+	auto FoundCommunity = std::find(m_vEntries.begin(), m_vEntries.end(), CCommunityId(pCommunityId));
+	if(FoundCommunity != m_vEntries.end())
+	{
+		m_vEntries.erase(FoundCommunity);
+	}
+}
+
+void CFavoriteCommunityFilterList::Clear()
+{
+	m_vEntries.clear();
+}
+
+bool CFavoriteCommunityFilterList::Filtered(const char *pCommunityId) const
+{
+	return std::find(m_vEntries.begin(), m_vEntries.end(), CCommunityId(pCommunityId)) != m_vEntries.end();
+}
+
+bool CFavoriteCommunityFilterList::Empty() const
+{
+	return m_vEntries.empty();
+}
+
+void CFavoriteCommunityFilterList::Clean(const std::vector<CCommunity> &vAllowedCommunities)
+{
+	auto It = std::remove_if(m_vEntries.begin(), m_vEntries.end(), [&](const auto &Community) {
+		return std::find_if(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const CCommunity &AllowedCommunity) {
+			return str_comp(Community.Id(), AllowedCommunity.Id()) == 0;
+		}) == vAllowedCommunities.end();
+	});
+	m_vEntries.erase(It, m_vEntries.end());
+}
+
+void CFavoriteCommunityFilterList::Save(IConfigManager *pConfigManager) const
+{
+	char aBuf[32 + CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	for(const auto &FavoriteCommunity : m_vEntries)
+	{
+		str_copy(aBuf, "add_favorite_community \"");
+		str_append(aBuf, FavoriteCommunity.Id());
+		str_append(aBuf, "\"");
+		pConfigManager->WriteLine(aBuf);
+	}
+}
+
+const std::vector<CCommunityId> &CFavoriteCommunityFilterList::Entries() const
+{
+	return m_vEntries;
+}
+
+template<typename TNamedElement, typename TElementName>
+static bool IsSubsetEquals(const std::vector<const TNamedElement *> &vpLeft, const std::unordered_set<TElementName> &Right)
+{
+	return vpLeft.size() <= Right.size() && std::all_of(vpLeft.begin(), vpLeft.end(), [&](const TNamedElement *pElem) {
+		return Right.count(TElementName(pElem->Name())) > 0;
+	});
+}
+
+void CExcludedCommunityFilterList::Add(const char *pCommunityId)
+{
+	m_Entries.emplace(pCommunityId);
+}
+
+void CExcludedCommunityFilterList::Remove(const char *pCommunityId)
+{
+	m_Entries.erase(CCommunityId(pCommunityId));
+}
+
+void CExcludedCommunityFilterList::Clear()
+{
+	m_Entries.clear();
+}
 
-	// rewrite exclude/filter list
-	char aBuf[512];
+bool CExcludedCommunityFilterList::Filtered(const char *pCommunityId) const
+{
+	return std::find(m_Entries.begin(), m_Entries.end(), CCommunityId(pCommunityId)) != m_Entries.end();
+}
 
-	str_copy(aBuf, m_pFilter);
-	m_pFilter[0] = '\0';
+bool CExcludedCommunityFilterList::Empty() const
+{
+	return m_Entries.empty();
+}
 
-	char aToken[512];
-	for(const char *pTok = aBuf; (pTok = str_next_token(pTok, ",", aToken, sizeof(aToken)));)
+void CExcludedCommunityFilterList::Clean(const std::vector<CCommunity> &vAllowedCommunities)
+{
+	for(auto It = m_Entries.begin(); It != m_Entries.end();)
 	{
-		if(str_comp_nocase(pElement, aToken) != 0)
+		const bool Found = std::find_if(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const CCommunity &AllowedCommunity) {
+			return str_comp(It->Id(), AllowedCommunity.Id()) == 0;
+		}) != vAllowedCommunities.end();
+		if(Found)
+		{
+			++It;
+		}
+		else
 		{
-			if(m_pFilter[0] != '\0')
-				str_append(m_pFilter, ",", m_FilterSize);
-			str_append(m_pFilter, aToken, m_FilterSize);
+			It = m_Entries.erase(It);
 		}
 	}
+	// Prevent filter that would exclude all allowed communities
+	if(m_Entries.size() == vAllowedCommunities.size())
+	{
+		m_Entries.clear();
+	}
 }
 
-void CFilterList::Clear()
+void CExcludedCommunityFilterList::Save(IConfigManager *pConfigManager) const
 {
-	m_pFilter[0] = '\0';
+	char aBuf[32 + CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	for(const auto &ExcludedCommunity : m_Entries)
+	{
+		str_copy(aBuf, "add_excluded_community \"");
+		str_append(aBuf, ExcludedCommunity.Id());
+		str_append(aBuf, "\"");
+		pConfigManager->WriteLine(aBuf);
+	}
 }
 
-bool CFilterList::Filtered(const char *pElement) const
+void CExcludedCommunityCountryFilterList::Add(const char *pCountryName)
 {
-	// If the needle is not defined, we exclude it if there is any other
-	// exclusion, i.e. we only show those elements when the filter is empty.
-	if(pElement[0] == '\0')
-		return !Empty();
+	// Handle special case that all selectable entries are currently filtered,
+	// where adding more entries to the exclusion list would have no effect.
+	auto CommunityEntry = m_Entries.find(m_pCommunityCache->CountryTypeFilterKey());
+	if(CommunityEntry != m_Entries.end() && IsSubsetEquals(m_pCommunityCache->SelectableCountries(), CommunityEntry->second))
+	{
+		for(const CCommunityCountry *pSelectableCountry : m_pCommunityCache->SelectableCountries())
+		{
+			CommunityEntry->second.erase(pSelectableCountry->Name());
+		}
+	}
 
-	// Special case: "*element" means anything except that element is excluded.
-	// Necessary because the default filter cannot exclude unknown elements,
-	// but we want to select only the DDNet community by default.
-	if(m_pFilter[0] == '*')
-		return str_comp(m_pFilter + 1, pElement) != 0;
+	Add(m_pCommunityCache->CountryTypeFilterKey(), pCountryName);
+}
 
-	// Comma separated list of excluded elements.
-	return str_in_list(m_pFilter, ",", pElement);
+void CExcludedCommunityCountryFilterList::Add(const char *pCommunityId, const char *pCountryName)
+{
+	CCommunityId CommunityId(pCommunityId);
+	if(m_Entries.find(CommunityId) == m_Entries.end())
+	{
+		m_Entries[CommunityId] = {};
+	}
+	m_Entries[CommunityId].emplace(pCountryName);
+}
+
+void CExcludedCommunityCountryFilterList::Remove(const char *pCountryName)
+{
+	Remove(m_pCommunityCache->CountryTypeFilterKey(), pCountryName);
+}
+
+void CExcludedCommunityCountryFilterList::Remove(const char *pCommunityId, const char *pCountryName)
+{
+	auto CommunityEntry = m_Entries.find(CCommunityId(pCommunityId));
+	if(CommunityEntry != m_Entries.end())
+	{
+		CommunityEntry->second.erase(pCountryName);
+	}
+}
+
+void CExcludedCommunityCountryFilterList::Clear()
+{
+	auto CommunityEntry = m_Entries.find(m_pCommunityCache->CountryTypeFilterKey());
+	if(CommunityEntry != m_Entries.end())
+	{
+		CommunityEntry->second.clear();
+	}
 }
 
-bool CFilterList::Empty() const
+bool CExcludedCommunityCountryFilterList::Filtered(const char *pCountryName) const
 {
-	return m_pFilter[0] == '\0';
+	auto CommunityEntry = m_Entries.find(CCommunityId(m_pCommunityCache->CountryTypeFilterKey()));
+	if(CommunityEntry == m_Entries.end())
+		return false;
+
+	const auto &CountryEntries = CommunityEntry->second;
+	return !IsSubsetEquals(m_pCommunityCache->SelectableCountries(), CountryEntries) &&
+	       CountryEntries.find(CCommunityCountryName(pCountryName)) != CountryEntries.end();
 }
 
-void CFilterList::Clean(const std::vector<const char *> &vpAllowedElements)
+bool CExcludedCommunityCountryFilterList::Empty() const
 {
-	size_t NumFiltered = 0;
-	char aNewList[512];
-	aNewList[0] = '\0';
+	auto CommunityEntry = m_Entries.find(CCommunityId(m_pCommunityCache->CountryTypeFilterKey()));
+	return CommunityEntry == m_Entries.end() ||
+	       CommunityEntry->second.empty() ||
+	       IsSubsetEquals(m_pCommunityCache->SelectableCountries(), CommunityEntry->second);
+}
 
-	for(const char *pElement : vpAllowedElements)
+void CExcludedCommunityCountryFilterList::Clean(const std::vector<CCommunity> &vAllowedCommunities)
+{
+	for(auto It = m_Entries.begin(); It != m_Entries.end();)
 	{
-		if(Filtered(pElement))
+		const bool AllEntry = str_comp(It->first.Id(), IServerBrowser::COMMUNITY_ALL) == 0;
+		const bool Found = AllEntry || std::find_if(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const CCommunity &AllowedCommunity) {
+			return str_comp(It->first.Id(), AllowedCommunity.Id()) == 0;
+		}) != vAllowedCommunities.end();
+		if(Found)
+		{
+			++It;
+		}
+		else
 		{
-			if(aNewList[0] != '\0')
-				str_append(aNewList, ",");
-			str_append(aNewList, pElement);
-			++NumFiltered;
+			It = m_Entries.erase(It);
 		}
 	}
 
-	// Prevent filter that would exclude all allowed elements
-	if(NumFiltered == vpAllowedElements.size())
-		m_pFilter[0] = '\0';
-	else
-		str_copy(m_pFilter, aNewList, m_FilterSize);
+	for(const CCommunity &AllowedCommunity : vAllowedCommunities)
+	{
+		auto CommunityEntry = m_Entries.find(CCommunityId(AllowedCommunity.Id()));
+		if(CommunityEntry != m_Entries.end())
+		{
+			auto &CountryEntries = CommunityEntry->second;
+			for(auto It = CountryEntries.begin(); It != CountryEntries.end();)
+			{
+				if(AllowedCommunity.HasCountry(It->Name()))
+				{
+					++It;
+				}
+				else
+				{
+					It = CountryEntries.erase(It);
+				}
+			}
+			// Prevent filter that would exclude all allowed countries
+			if(CountryEntries.size() == AllowedCommunity.Countries().size())
+			{
+				CountryEntries.clear();
+			}
+		}
+	}
+
+	auto AllCommunityEntry = m_Entries.find(CCommunityId(IServerBrowser::COMMUNITY_ALL));
+	if(AllCommunityEntry != m_Entries.end())
+	{
+		auto &CountryEntries = AllCommunityEntry->second;
+		for(auto It = CountryEntries.begin(); It != CountryEntries.end();)
+		{
+			if(std::any_of(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const auto &Community) { return Community.HasCountry(It->Name()); }))
+			{
+				++It;
+			}
+			else
+			{
+				It = CountryEntries.erase(It);
+			}
+		}
+		// Prevent filter that would exclude all allowed countries
+		std::unordered_set<CCommunityCountryName> UniqueCountries;
+		for(const CCommunity &AllowedCommunity : vAllowedCommunities)
+		{
+			for(const CCommunityCountry &Country : AllowedCommunity.Countries())
+			{
+				UniqueCountries.emplace(Country.Name());
+			}
+		}
+		if(CountryEntries.size() == UniqueCountries.size())
+		{
+			CountryEntries.clear();
+		}
+	}
 }
 
-void CServerBrowser::CleanFilters()
+void CExcludedCommunityCountryFilterList::Save(IConfigManager *pConfigManager) const
 {
-	CommunitiesFilterClean();
-	CountriesFilterClean();
-	TypesFilterClean();
+	char aBuf[32 + CServerInfo::MAX_COMMUNITY_ID_LENGTH + CServerInfo::MAX_COMMUNITY_COUNTRY_LENGTH];
+	for(const auto &[Community, Countries] : m_Entries)
+	{
+		for(const auto &Country : Countries)
+		{
+			str_copy(aBuf, "add_excluded_country \"");
+			str_append(aBuf, Community.Id());
+			str_append(aBuf, "\" \"");
+			str_append(aBuf, Country.Name());
+			str_append(aBuf, "\"");
+			pConfigManager->WriteLine(aBuf);
+		}
+	}
 }
 
-void CServerBrowser::CommunitiesFilterClean()
+void CExcludedCommunityTypeFilterList::Add(const char *pTypeName)
 {
-	std::vector<const char *> vpCommunityNames;
-	for(const auto &Community : Communities())
-		vpCommunityNames.push_back(Community.Id());
-	m_CommunitiesFilter.Clean(vpCommunityNames);
+	// Handle special case that all selectable entries are currently filtered,
+	// where adding more entries to the exclusion list would have no effect.
+	auto CommunityEntry = m_Entries.find(m_pCommunityCache->CountryTypeFilterKey());
+	if(CommunityEntry != m_Entries.end() && IsSubsetEquals(m_pCommunityCache->SelectableTypes(), CommunityEntry->second))
+	{
+		for(const CCommunityType *pSelectableType : m_pCommunityCache->SelectableTypes())
+		{
+			CommunityEntry->second.erase(pSelectableType->Name());
+		}
+	}
+
+	Add(m_pCommunityCache->CountryTypeFilterKey(), pTypeName);
 }
 
-void CServerBrowser::CountriesFilterClean()
+void CExcludedCommunityTypeFilterList::Add(const char *pCommunityId, const char *pTypeName)
 {
-	std::vector<const char *> vpCountryNames;
-	for(const auto &Community : Communities())
-		for(const auto &Country : Community.Countries())
-			vpCountryNames.push_back(Country.Name());
-	m_CountriesFilter.Clean(vpCountryNames);
+	CCommunityId CommunityId(pCommunityId);
+	if(m_Entries.find(CommunityId) == m_Entries.end())
+	{
+		m_Entries[CommunityId] = {};
+	}
+	m_Entries[CommunityId].emplace(pTypeName);
 }
 
-void CServerBrowser::TypesFilterClean()
+void CExcludedCommunityTypeFilterList::Remove(const char *pTypeName)
 {
-	std::vector<const char *> vpTypeNames;
-	for(const auto &Community : Communities())
-		for(const auto &Type : Community.Types())
-			vpTypeNames.push_back(Type.Name());
-	m_TypesFilter.Clean(vpTypeNames);
+	Remove(m_pCommunityCache->CountryTypeFilterKey(), pTypeName);
 }
 
-bool CServerBrowser::IsRegistered(const NETADDR &Addr)
+void CExcludedCommunityTypeFilterList::Remove(const char *pCommunityId, const char *pTypeName)
 {
-	const int NumServers = m_pHttp->NumServers();
-	for(int i = 0; i < NumServers; i++)
+	auto CommunityEntry = m_Entries.find(CCommunityId(pCommunityId));
+	if(CommunityEntry != m_Entries.end())
 	{
-		const CServerInfo Info = m_pHttp->Server(i);
-		for(int j = 0; j < Info.m_NumAddresses; j++)
+		CommunityEntry->second.erase(pTypeName);
+	}
+}
+
+void CExcludedCommunityTypeFilterList::Clear()
+{
+	auto CommunityEntry = m_Entries.find(m_pCommunityCache->CountryTypeFilterKey());
+	if(CommunityEntry != m_Entries.end())
+	{
+		CommunityEntry->second.clear();
+	}
+}
+
+bool CExcludedCommunityTypeFilterList::Filtered(const char *pTypeName) const
+{
+	auto CommunityEntry = m_Entries.find(CCommunityId(m_pCommunityCache->CountryTypeFilterKey()));
+	if(CommunityEntry == m_Entries.end())
+		return false;
+
+	const auto &TypeEntries = CommunityEntry->second;
+	return !IsSubsetEquals(m_pCommunityCache->SelectableTypes(), TypeEntries) &&
+	       TypeEntries.find(CCommunityTypeName(pTypeName)) != TypeEntries.end();
+}
+
+bool CExcludedCommunityTypeFilterList::Empty() const
+{
+	auto CommunityEntry = m_Entries.find(CCommunityId(m_pCommunityCache->CountryTypeFilterKey()));
+	return CommunityEntry == m_Entries.end() ||
+	       CommunityEntry->second.empty() ||
+	       IsSubsetEquals(m_pCommunityCache->SelectableTypes(), CommunityEntry->second);
+}
+
+void CExcludedCommunityTypeFilterList::Clean(const std::vector<CCommunity> &vAllowedCommunities)
+{
+	for(auto It = m_Entries.begin(); It != m_Entries.end();)
+	{
+		const bool AllEntry = str_comp(It->first.Id(), IServerBrowser::COMMUNITY_ALL) == 0;
+		const bool Found = AllEntry || std::find_if(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const CCommunity &AllowedCommunity) {
+			return str_comp(It->first.Id(), AllowedCommunity.Id()) == 0;
+		}) != vAllowedCommunities.end();
+		if(Found)
 		{
-			if(net_addr_comp(&Info.m_aAddresses[j], &Addr) == 0)
+			++It;
+		}
+		else
+		{
+			It = m_Entries.erase(It);
+		}
+	}
+
+	for(const CCommunity &AllowedCommunity : vAllowedCommunities)
+	{
+		auto CommunityEntry = m_Entries.find(CCommunityId(AllowedCommunity.Id()));
+		if(CommunityEntry != m_Entries.end())
+		{
+			auto &TypeEntries = CommunityEntry->second;
+			for(auto It = TypeEntries.begin(); It != TypeEntries.end();)
 			{
-				return true;
+				if(AllowedCommunity.HasType(It->Name()))
+				{
+					++It;
+				}
+				else
+				{
+					It = TypeEntries.erase(It);
+				}
+			}
+			// Prevent filter that would exclude all allowed types
+			if(TypeEntries.size() == AllowedCommunity.Types().size())
+			{
+				TypeEntries.clear();
 			}
 		}
 	}
 
-	const int NumLegacyServers = m_pHttp->NumLegacyServers();
-	for(int i = 0; i < NumLegacyServers; i++)
+	auto AllCommunityEntry = m_Entries.find(CCommunityId(IServerBrowser::COMMUNITY_ALL));
+	if(AllCommunityEntry != m_Entries.end())
 	{
-		if(net_addr_comp(&m_pHttp->LegacyServer(i), &Addr) == 0)
+		auto &TypeEntries = AllCommunityEntry->second;
+		for(auto It = TypeEntries.begin(); It != TypeEntries.end();)
+		{
+			if(std::any_of(vAllowedCommunities.begin(), vAllowedCommunities.end(), [&](const auto &Community) { return Community.HasType(It->Name()); }))
+			{
+				++It;
+			}
+			else
+			{
+				It = TypeEntries.erase(It);
+			}
+		}
+		// Prevent filter that would exclude all allowed types
+		std::unordered_set<CCommunityCountryName> UniqueTypes;
+		for(const CCommunity &AllowedCommunity : vAllowedCommunities)
+		{
+			for(const CCommunityType &Type : AllowedCommunity.Types())
+			{
+				UniqueTypes.emplace(Type.Name());
+			}
+		}
+		if(TypeEntries.size() == UniqueTypes.size())
 		{
-			return true;
+			TypeEntries.clear();
 		}
 	}
+}
 
+void CExcludedCommunityTypeFilterList::Save(IConfigManager *pConfigManager) const
+{
+	char aBuf[32 + CServerInfo::MAX_COMMUNITY_ID_LENGTH + CServerInfo::MAX_COMMUNITY_TYPE_LENGTH];
+	for(const auto &[Community, Types] : m_Entries)
+	{
+		for(const auto &Type : Types)
+		{
+			str_copy(aBuf, "add_excluded_type \"");
+			str_append(aBuf, Community.Id());
+			str_append(aBuf, "\" \"");
+			str_append(aBuf, Type.Name());
+			str_append(aBuf, "\"");
+			pConfigManager->WriteLine(aBuf);
+		}
+	}
+}
+
+void CServerBrowser::CleanFilters()
+{
+	// Keep filters if we failed to load any communities
+	if(Communities().empty())
+		return;
+	FavoriteCommunitiesFilter().Clean(Communities());
+	CommunitiesFilter().Clean(Communities());
+	CountriesFilter().Clean(Communities());
+	TypesFilter().Clean(Communities());
+}
+
+bool CServerBrowser::IsRegistered(const NETADDR &Addr)
+{
+	const int NumServers = m_pHttp->NumServers();
+	for(int i = 0; i < NumServers; i++)
+	{
+		const CServerInfo &Info = m_pHttp->Server(i);
+		for(int j = 0; j < Info.m_NumAddresses; j++)
+		{
+			if(net_addr_comp(&Info.m_aAddresses[j], &Addr) == 0)
+			{
+				return true;
+			}
+		}
+	}
 	return false;
 }
 
@@ -1649,16 +2340,3 @@ bool CServerInfo::ParseLocation(int *pResult, const char *pString)
 	}
 	return true;
 }
-
-void CServerInfo::InfoToString(char *pBuffer, int BufferSize) const
-{
-	str_format(
-		pBuffer,
-		BufferSize,
-		"%s\n"
-		"Address: ddnet://%s\n"
-		"My IGN: %s\n",
-		m_aName,
-		m_aAddress,
-		g_Config.m_PlayerName);
-}
diff --git a/src/engine/client/serverbrowser.h b/src/engine/client/serverbrowser.h
index 1920b6c744..e54f2efd66 100644
--- a/src/engine/client/serverbrowser.h
+++ b/src/engine/client/serverbrowser.h
@@ -3,13 +3,16 @@
 #ifndef ENGINE_CLIENT_SERVERBROWSER_H
 #define ENGINE_CLIENT_SERVERBROWSER_H
 
+#include <base/hash.h>
 #include <base/system.h>
 
 #include <engine/console.h>
 #include <engine/serverbrowser.h>
 #include <engine/shared/memheap.h>
 
+#include <functional>
 #include <unordered_map>
+#include <unordered_set>
 
 typedef struct _json_value json_value;
 class CNetClient;
@@ -21,6 +24,88 @@ class IFriends;
 class IServerBrowserHttp;
 class IServerBrowserPingCache;
 class IStorage;
+class IHttp;
+
+class CCommunityId
+{
+	char m_aId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+
+public:
+	CCommunityId(const char *pCommunityId)
+	{
+		str_copy(m_aId, pCommunityId);
+	}
+
+	const char *Id() const { return m_aId; }
+
+	bool operator==(const CCommunityId &Other) const
+	{
+		return str_comp(Id(), Other.Id()) == 0;
+	}
+};
+
+template<>
+struct std::hash<CCommunityId>
+{
+	size_t operator()(const CCommunityId &Elem) const noexcept
+	{
+		return str_quickhash(Elem.Id());
+	}
+};
+
+class CCommunityCountryName
+{
+	char m_aName[CServerInfo::MAX_COMMUNITY_COUNTRY_LENGTH];
+
+public:
+	CCommunityCountryName(const char *pCountryName)
+	{
+		str_copy(m_aName, pCountryName);
+	}
+
+	const char *Name() const { return m_aName; }
+
+	bool operator==(const CCommunityCountryName &Other) const
+	{
+		return str_comp(Name(), Other.Name()) == 0;
+	}
+};
+
+template<>
+struct std::hash<CCommunityCountryName>
+{
+	size_t operator()(const CCommunityCountryName &Elem) const noexcept
+	{
+		return str_quickhash(Elem.Name());
+	}
+};
+
+class CCommunityTypeName
+{
+	char m_aName[CServerInfo::MAX_COMMUNITY_TYPE_LENGTH];
+
+public:
+	CCommunityTypeName(const char *pTypeName)
+	{
+		str_copy(m_aName, pTypeName);
+	}
+
+	const char *Name() const { return m_aName; }
+
+	bool operator==(const CCommunityTypeName &Other) const
+	{
+		return str_comp(Name(), Other.Name()) == 0;
+	}
+};
+
+template<>
+struct std::hash<CCommunityTypeName>
+{
+	size_t operator()(const CCommunityTypeName &Elem) const noexcept
+	{
+		return str_quickhash(Elem.Name());
+	}
+};
 
 class CCommunityServer
 {
@@ -41,45 +126,119 @@ class CCommunityServer
 	const char *TypeName() const { return m_aTypeName; }
 };
 
-class CFilterList : public IFilterList
+class CFavoriteCommunityFilterList : public IFilterList
+{
+public:
+	void Add(const char *pCommunityId) override;
+	void Remove(const char *pCommunityId) override;
+	void Clear() override;
+	bool Filtered(const char *pCommunityId) const override;
+	bool Empty() const override;
+	void Clean(const std::vector<CCommunity> &vAllowedCommunities);
+	void Save(IConfigManager *pConfigManager) const;
+	const std::vector<CCommunityId> &Entries() const;
+
+private:
+	std::vector<CCommunityId> m_vEntries;
+};
+
+class CExcludedCommunityFilterList : public IFilterList
+{
+public:
+	void Add(const char *pCommunityId) override;
+	void Remove(const char *pCommunityId) override;
+	void Clear() override;
+	bool Filtered(const char *pCommunityId) const override;
+	bool Empty() const override;
+	void Clean(const std::vector<CCommunity> &vAllowedCommunities);
+	void Save(IConfigManager *pConfigManager) const;
+
+private:
+	std::unordered_set<CCommunityId> m_Entries;
+};
+
+class CExcludedCommunityCountryFilterList : public IFilterList
 {
-	char *m_pFilter;
-	size_t m_FilterSize;
+public:
+	CExcludedCommunityCountryFilterList(const ICommunityCache *pCommunityCache) :
+		m_pCommunityCache(pCommunityCache)
+	{
+	}
+
+	void Add(const char *pCountryName) override;
+	void Add(const char *pCommunityId, const char *pCountryName);
+	void Remove(const char *pCountryName) override;
+	void Remove(const char *pCommunityId, const char *pCountryName);
+	void Clear() override;
+	bool Filtered(const char *pCountryName) const override;
+	bool Empty() const override;
+	void Clean(const std::vector<CCommunity> &vAllowedCommunities);
+	void Save(IConfigManager *pConfigManager) const;
 
+private:
+	const ICommunityCache *m_pCommunityCache;
+	std::unordered_map<CCommunityId, std::unordered_set<CCommunityCountryName>> m_Entries;
+};
+
+class CExcludedCommunityTypeFilterList : public IFilterList
+{
 public:
-	CFilterList(char *pFilter, size_t FilterSize) :
-		m_pFilter(pFilter), m_FilterSize(FilterSize)
+	CExcludedCommunityTypeFilterList(const ICommunityCache *pCommunityCache) :
+		m_pCommunityCache(pCommunityCache)
 	{
 	}
 
-	void Add(const char *pElement) override;
-	void Remove(const char *pElement) override;
+	void Add(const char *pTypeName) override;
+	void Add(const char *pCommunityId, const char *pTypeName);
+	void Remove(const char *pTypeName) override;
+	void Remove(const char *pCommunityId, const char *pTypeName);
 	void Clear() override;
-	bool Filtered(const char *pElement) const override;
+	bool Filtered(const char *pTypeName) const override;
 	bool Empty() const override;
-	void Clean(const std::vector<const char *> &vpAllowedElements);
+	void Clean(const std::vector<CCommunity> &vAllowedCommunities);
+	void Save(IConfigManager *pConfigManager) const;
+
+private:
+	const ICommunityCache *m_pCommunityCache;
+	std::unordered_map<CCommunityId, std::unordered_set<CCommunityTypeName>> m_Entries;
 };
 
-class CServerBrowser : public IServerBrowser
+class CCommunityCache : public ICommunityCache
 {
+	IServerBrowser *m_pServerBrowser;
+	SHA256_DIGEST m_InfoSha256 = SHA256_ZEROED;
+	int m_LastType = IServerBrowser::NUM_TYPES; // initial value does not appear normally, marking uninitialized cache
+	unsigned m_SelectedCommunitiesHash = 0;
+	std::vector<const CCommunity *> m_vpSelectedCommunities;
+	std::vector<const CCommunityCountry *> m_vpSelectableCountries;
+	std::vector<const CCommunityType *> m_vpSelectableTypes;
+	bool m_AnyRanksAvailable = false;
+	bool m_CountryTypesFilterAvailable = false;
+	const char *m_pCountryTypeFilterKey = IServerBrowser::COMMUNITY_ALL;
+
 public:
-	class CServerEntry
+	CCommunityCache(IServerBrowser *pServerBrowser) :
+		m_pServerBrowser(pServerBrowser)
 	{
-	public:
-		int64_t m_RequestTime;
-		bool m_RequestIgnoreInfo;
-		int m_GotInfo;
-		CServerInfo m_Info;
+	}
 
-		CServerEntry *m_pPrevReq; // request list
-		CServerEntry *m_pNextReq;
-	};
+	void Update(bool Force) override;
+	const std::vector<const CCommunity *> &SelectedCommunities() const override { return m_vpSelectedCommunities; }
+	const std::vector<const CCommunityCountry *> &SelectableCountries() const override { return m_vpSelectableCountries; }
+	const std::vector<const CCommunityType *> &SelectableTypes() const override { return m_vpSelectableTypes; }
+	bool AnyRanksAvailable() const override { return m_AnyRanksAvailable; }
+	bool CountriesTypesFilterAvailable() const override { return m_CountryTypesFilterAvailable; }
+	const char *CountryTypeFilterKey() const override { return m_pCountryTypeFilterKey; }
+};
 
+class CServerBrowser : public IServerBrowser
+{
+public:
 	CServerBrowser();
 	virtual ~CServerBrowser();
 
 	// interface functions
-	void Refresh(int Type) override;
+	void Refresh(int Type, bool Force = false) override;
 	bool IsRefreshing() const override;
 	bool IsGettingServerlist() const override;
 	int LoadingProgression() const override;
@@ -105,20 +264,25 @@ class CServerBrowser : public IServerBrowser
 	const std::vector<CCommunity> &Communities() const override;
 	const CCommunity *Community(const char *pCommunityId) const override;
 	std::vector<const CCommunity *> SelectedCommunities() const override;
-	int64_t DDNetInfoUpdateTime() const override { return m_DDNetInfoUpdateTime; }
-
-	CFilterList &CommunitiesFilter() override { return m_CommunitiesFilter; }
-	CFilterList &CountriesFilter() override { return m_CountriesFilter; }
-	CFilterList &TypesFilter() override { return m_TypesFilter; }
-	const CFilterList &CommunitiesFilter() const override { return m_CommunitiesFilter; }
-	const CFilterList &CountriesFilter() const override { return m_CountriesFilter; }
-	const CFilterList &TypesFilter() const override { return m_TypesFilter; }
+	std::vector<const CCommunity *> FavoriteCommunities() const override;
+	std::vector<const CCommunity *> CurrentCommunities() const override;
+	unsigned CurrentCommunitiesHash() const override;
+
+	bool DDNetInfoAvailable() const override { return m_pDDNetInfo != nullptr; }
+	SHA256_DIGEST DDNetInfoSha256() const override { return m_DDNetInfoSha256; }
+
+	ICommunityCache &CommunityCache() override { return m_CommunityCache; }
+	const ICommunityCache &CommunityCache() const override { return m_CommunityCache; }
+	CFavoriteCommunityFilterList &FavoriteCommunitiesFilter() override { return m_FavoriteCommunitiesFilter; }
+	CExcludedCommunityFilterList &CommunitiesFilter() override { return m_CommunitiesFilter; }
+	CExcludedCommunityCountryFilterList &CountriesFilter() override { return m_CountriesFilter; }
+	CExcludedCommunityTypeFilterList &TypesFilter() override { return m_TypesFilter; }
+	const CFavoriteCommunityFilterList &FavoriteCommunitiesFilter() const override { return m_FavoriteCommunitiesFilter; }
+	const CExcludedCommunityFilterList &CommunitiesFilter() const override { return m_CommunitiesFilter; }
+	const CExcludedCommunityCountryFilterList &CountriesFilter() const override { return m_CountriesFilter; }
+	const CExcludedCommunityTypeFilterList &TypesFilter() const override { return m_TypesFilter; }
 	void CleanFilters() override;
 
-	void CommunitiesFilterClean();
-	void CountriesFilterClean();
-	void TypesFilterClean();
-
 	//
 	void Update();
 	void OnServerInfoUpdate(const NETADDR &Addr, int Token, const CServerInfo *pInfo);
@@ -131,7 +295,7 @@ class CServerBrowser : public IServerBrowser
 	void OnInit();
 
 	void QueueRequest(CServerEntry *pEntry);
-	CServerEntry *Find(const NETADDR &Addr);
+	CServerEntry *Find(const NETADDR &Addr) override;
 	int GetCurrentType() override { return m_ServerlistType; }
 	bool IsRegistered(const NETADDR &Addr);
 
@@ -143,6 +307,7 @@ class CServerBrowser : public IServerBrowser
 	IFriends *m_pFriends = nullptr;
 	IFavorites *m_pFavorites = nullptr;
 	IStorage *m_pStorage = nullptr;
+	IHttp *m_pHttpClient = nullptr;
 	char m_aNetVersion[128];
 
 	bool m_RefreshingHttp = false;
@@ -160,12 +325,14 @@ class CServerBrowser : public IServerBrowser
 
 	int m_OwnLocation = CServerInfo::LOC_UNKNOWN;
 
-	CFilterList m_CommunitiesFilter;
-	CFilterList m_CountriesFilter;
-	CFilterList m_TypesFilter;
+	CCommunityCache m_CommunityCache;
+	CFavoriteCommunityFilterList m_FavoriteCommunitiesFilter;
+	CExcludedCommunityFilterList m_CommunitiesFilter;
+	CExcludedCommunityCountryFilterList m_CountriesFilter;
+	CExcludedCommunityTypeFilterList m_TypesFilter;
 
-	json_value *m_pDDNetInfo;
-	int64_t m_DDNetInfoUpdateTime;
+	json_value *m_pDDNetInfo = nullptr;
+	SHA256_DIGEST m_DDNetInfoSha256 = SHA256_ZEROED;
 
 	CServerEntry *m_pFirstReqServer; // request list
 	CServerEntry *m_pLastReqServer;
@@ -198,6 +365,7 @@ class CServerBrowser : public IServerBrowser
 	bool SortCompareGametype(int Index1, int Index2) const;
 	bool SortCompareNumPlayers(int Index1, int Index2) const;
 	bool SortCompareNumClients(int Index1, int Index2) const;
+	bool SortCompareNumFriends(int Index1, int Index2) const;
 	bool SortCompareNumPlayersAndPing(int Index1, int Index2) const;
 
 	//
@@ -215,8 +383,21 @@ class CServerBrowser : public IServerBrowser
 	void RequestImpl(const NETADDR &Addr, CServerEntry *pEntry, int *pBasicToken, int *pToken, bool RandomToken) const;
 
 	void RegisterCommands();
+	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
+	static void Con_AddFavoriteCommunity(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemoveFavoriteCommunity(IConsole::IResult *pResult, void *pUserData);
+	static void Con_AddExcludedCommunity(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemoveExcludedCommunity(IConsole::IResult *pResult, void *pUserData);
+	static void Con_AddExcludedCountry(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemoveExcludedCountry(IConsole::IResult *pResult, void *pUserData);
+	static void Con_AddExcludedType(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemoveExcludedType(IConsole::IResult *pResult, void *pUserData);
 	static void Con_LeakIpAddress(IConsole::IResult *pResult, void *pUserData);
 
+	bool ValidateCommunityId(const char *pCommunityId) const;
+	bool ValidateCountryName(const char *pCountryName) const;
+	bool ValidateTypeName(const char *pTypeName) const;
+
 	void SetInfo(CServerEntry *pEntry, const CServerInfo &Info) const;
 	void SetLatency(NETADDR Addr, int Latency);
 
diff --git a/src/engine/client/serverbrowser_http.cpp b/src/engine/client/serverbrowser_http.cpp
index df92212920..95dce94981 100644
--- a/src/engine/client/serverbrowser_http.cpp
+++ b/src/engine/client/serverbrowser_http.cpp
@@ -11,6 +11,7 @@
 #include <engine/storage.h>
 
 #include <base/lock.h>
+#include <base/log.h>
 #include <base/system.h>
 
 #include <memory>
@@ -20,6 +21,28 @@
 
 using namespace std::chrono_literals;
 
+static int SanitizeAge(std::optional<int64_t> Age)
+{
+	// A year is of course pi*10**7 seconds.
+	if(!(Age && 0 <= *Age && *Age < 31415927))
+	{
+		return 31415927;
+	}
+	return *Age;
+}
+
+// Classify HTTP responses into buckets, treat 15 seconds as fresh, 1 minute as
+// less fresh, etc. This ensures that differences in the order of seconds do
+// not affect master choice.
+static int ClassifyAge(int AgeSeconds)
+{
+	return 0 //
+	       + (AgeSeconds >= 15) // 15 seconds
+	       + (AgeSeconds >= 60) // 1 minute
+	       + (AgeSeconds >= 300) // 5 minutes
+	       + (AgeSeconds / 3600); // 1 hour
+}
+
 class CChooseMaster
 {
 public:
@@ -29,12 +52,12 @@ class CChooseMaster
 	{
 		MAX_URLS = 16,
 	};
-	CChooseMaster(IEngine *pEngine, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex);
+	CChooseMaster(IEngine *pEngine, IHttp *pHttp, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex);
 	virtual ~CChooseMaster();
 
 	bool GetBestUrl(const char **pBestUrl) const;
 	void Reset();
-	bool IsRefreshing() const { return m_pJob && m_pJob->Status() != IJob::STATE_DONE; }
+	bool IsRefreshing() const { return m_pJob && !m_pJob->Done(); }
 	void Refresh();
 
 private:
@@ -51,26 +74,33 @@ class CChooseMaster
 	};
 	class CJob : public IJob
 	{
+		CChooseMaster *m_pParent;
 		CLock m_Lock;
 		std::shared_ptr<CData> m_pData;
-		std::unique_ptr<CHttpRequest> m_pHead PT_GUARDED_BY(m_Lock);
-		std::unique_ptr<CHttpRequest> m_pGet PT_GUARDED_BY(m_Lock);
+		std::shared_ptr<CHttpRequest> m_pHead;
+		std::shared_ptr<CHttpRequest> m_pGet;
 		void Run() override REQUIRES(!m_Lock);
 
 	public:
-		CJob(std::shared_ptr<CData> pData) :
-			m_pData(std::move(pData)) {}
-		void Abort() REQUIRES(!m_Lock);
+		CJob(CChooseMaster *pParent, std::shared_ptr<CData> pData) :
+			m_pParent(pParent),
+			m_pData(std::move(pData))
+		{
+			Abortable(true);
+		}
+		bool Abort() override REQUIRES(!m_Lock);
 	};
 
 	IEngine *m_pEngine;
+	IHttp *m_pHttp;
 	int m_PreviousBestIndex;
 	std::shared_ptr<CData> m_pData;
 	std::shared_ptr<CJob> m_pJob;
 };
 
-CChooseMaster::CChooseMaster(IEngine *pEngine, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
+CChooseMaster::CChooseMaster(IEngine *pEngine, IHttp *pHttp, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
 	m_pEngine(pEngine),
+	m_pHttp(pHttp),
 	m_PreviousBestIndex(PreviousBestIndex)
 {
 	dbg_assert(NumUrls >= 0, "no master URLs");
@@ -127,12 +157,20 @@ void CChooseMaster::Reset()
 
 void CChooseMaster::Refresh()
 {
-	if(m_pJob == nullptr || m_pJob->Status() == IJob::STATE_DONE)
-		m_pEngine->AddJob(m_pJob = std::make_shared<CJob>(m_pData));
+	if(m_pJob == nullptr || m_pJob->State() == IJob::STATE_DONE)
+	{
+		m_pJob = std::make_shared<CJob>(this, m_pData);
+		m_pEngine->AddJob(m_pJob);
+	}
 }
 
-void CChooseMaster::CJob::Abort()
+bool CChooseMaster::CJob::Abort()
 {
+	if(!IJob::Abort())
+	{
+		return false;
+	}
+
 	CLockScope ls(m_Lock);
 	if(m_pHead != nullptr)
 	{
@@ -143,6 +181,8 @@ void CChooseMaster::CJob::Abort()
 	{
 		m_pGet->Abort();
 	}
+
+	return true;
 }
 
 void CChooseMaster::CJob::Run()
@@ -167,43 +207,51 @@ void CChooseMaster::CJob::Run()
 	// fail.
 	CTimeout Timeout{10000, 0, 8000, 10};
 	int aTimeMs[MAX_URLS];
+	int aAgeS[MAX_URLS];
 	for(int i = 0; i < m_pData->m_NumUrls; i++)
 	{
 		aTimeMs[i] = -1;
+		aAgeS[i] = SanitizeAge({});
 		const char *pUrl = m_pData->m_aaUrls[aRandomized[i]];
-		CHttpRequest *pHead = HttpHead(pUrl).release();
+		std::shared_ptr<CHttpRequest> pHead = HttpHead(pUrl);
 		pHead->Timeout(Timeout);
 		pHead->LogProgress(HTTPLOG::FAILURE);
 		{
 			CLockScope ls(m_Lock);
-			m_pHead = std::unique_ptr<CHttpRequest>(pHead);
+			m_pHead = pHead;
 		}
-		IEngine::RunJobBlocking(pHead);
-		if(pHead->State() == HTTP_ABORTED)
+
+		m_pParent->m_pHttp->Run(pHead);
+		pHead->Wait();
+		if(pHead->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED)
 		{
-			dbg_msg("serverbrowse_http", "master chooser aborted");
+			log_debug("serverbrowser_http", "master chooser aborted");
 			return;
 		}
-		if(pHead->State() != HTTP_DONE)
+		if(pHead->State() != EHttpState::DONE)
 		{
 			continue;
 		}
+
 		auto StartTime = time_get_nanoseconds();
-		CHttpRequest *pGet = HttpGet(pUrl).release();
+		std::shared_ptr<CHttpRequest> pGet = HttpGet(pUrl);
 		pGet->Timeout(Timeout);
 		pGet->LogProgress(HTTPLOG::FAILURE);
 		{
 			CLockScope ls(m_Lock);
-			m_pGet = std::unique_ptr<CHttpRequest>(pGet);
+			m_pGet = pGet;
 		}
-		IEngine::RunJobBlocking(pGet);
+
+		m_pParent->m_pHttp->Run(pGet);
+		pGet->Wait();
+
 		auto Time = std::chrono::duration_cast<std::chrono::milliseconds>(time_get_nanoseconds() - StartTime);
-		if(pHead->State() == HTTP_ABORTED)
+		if(pGet->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED)
 		{
-			dbg_msg("serverbrowse_http", "master chooser aborted");
+			log_debug("serverbrowser_http", "master chooser aborted");
 			return;
 		}
-		if(pGet->State() != HTTP_DONE)
+		if(pGet->State() != EHttpState::DONE)
 		{
 			continue;
 		}
@@ -212,43 +260,51 @@ void CChooseMaster::CJob::Run()
 		{
 			continue;
 		}
+
 		bool ParseFailure = m_pData->m_pfnValidator(pJson);
 		json_value_free(pJson);
 		if(ParseFailure)
 		{
 			continue;
 		}
-		dbg_msg("serverbrowse_http", "found master, url='%s' time=%dms", pUrl, (int)Time.count());
+		int AgeS = SanitizeAge(pGet->ResultAgeSeconds());
+		log_info("serverbrowser_http", "found master, url='%s' time=%dms age=%ds", pUrl, (int)Time.count(), AgeS);
+
 		aTimeMs[i] = Time.count();
+		aAgeS[i] = AgeS;
 	}
+
 	// Determine index of the minimum time.
 	int BestIndex = -1;
 	int BestTime = 0;
+	int BestAge = 0;
 	for(int i = 0; i < m_pData->m_NumUrls; i++)
 	{
 		if(aTimeMs[i] < 0)
 		{
 			continue;
 		}
-		if(BestIndex == -1 || aTimeMs[i] < BestTime)
+		if(BestIndex == -1 || std::tuple(ClassifyAge(aAgeS[i]), aTimeMs[i]) < std::tuple(ClassifyAge(BestAge), BestTime))
 		{
 			BestTime = aTimeMs[i];
+			BestAge = aAgeS[i];
 			BestIndex = aRandomized[i];
 		}
 	}
 	if(BestIndex == -1)
 	{
-		dbg_msg("serverbrowse_http", "WARNING: no usable masters found");
+		log_error("serverbrowser_http", "WARNING: no usable masters found");
 		return;
 	}
-	dbg_msg("serverbrowse_http", "determined best master, url='%s' time=%dms", m_pData->m_aaUrls[BestIndex], BestTime);
+
+	log_info("serverbrowser_http", "determined best master, url='%s' time=%dms age=%ds", m_pData->m_aaUrls[BestIndex], BestTime, BestAge);
 	m_pData->m_BestIndex.store(BestIndex);
 }
 
 class CServerBrowserHttp : public IServerBrowserHttp
 {
 public:
-	CServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, const char **ppUrls, int NumUrls, int PreviousBestIndex);
+	CServerBrowserHttp(IEngine *pEngine, IHttp *pHttp, const char **ppUrls, int NumUrls, int PreviousBestIndex);
 	~CServerBrowserHttp() override;
 	void Update() override;
 	bool IsRefreshing() override { return m_State != STATE_DONE; }
@@ -263,14 +319,6 @@ class CServerBrowserHttp : public IServerBrowserHttp
 	{
 		return m_vServers[Index];
 	}
-	int NumLegacyServers() const override
-	{
-		return m_vLegacyServers.size();
-	}
-	const NETADDR &LegacyServer(int Index) const override
-	{
-		return m_vLegacyServers[Index];
-	}
 
 private:
 	enum
@@ -282,23 +330,20 @@ class CServerBrowserHttp : public IServerBrowserHttp
 	};
 
 	static bool Validate(json_value *pJson);
-	static bool Parse(json_value *pJson, std::vector<CServerInfo> *pvServers, std::vector<NETADDR> *pvLegacyServers);
+	static bool Parse(json_value *pJson, std::vector<CServerInfo> *pvServers);
 
-	IEngine *m_pEngine;
-	IConsole *m_pConsole;
+	IHttp *m_pHttp;
 
 	int m_State = STATE_DONE;
 	std::shared_ptr<CHttpRequest> m_pGetServers;
 	std::unique_ptr<CChooseMaster> m_pChooseMaster;
 
 	std::vector<CServerInfo> m_vServers;
-	std::vector<NETADDR> m_vLegacyServers;
 };
 
-CServerBrowserHttp::CServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
-	m_pEngine(pEngine),
-	m_pConsole(pConsole),
-	m_pChooseMaster(new CChooseMaster(pEngine, Validate, ppUrls, NumUrls, PreviousBestIndex))
+CServerBrowserHttp::CServerBrowserHttp(IEngine *pEngine, IHttp *pHttp, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
+	m_pHttp(pHttp),
+	m_pChooseMaster(new CChooseMaster(pEngine, pHttp, Validate, ppUrls, NumUrls, PreviousBestIndex))
 {
 	m_pChooseMaster->Refresh();
 }
@@ -320,7 +365,7 @@ void CServerBrowserHttp::Update()
 		{
 			if(!m_pChooseMaster->IsRefreshing())
 			{
-				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_http", "no working serverlist URL found");
+				log_error("serverbrowser_http", "no working serverlist URL found");
 				m_State = STATE_NO_MASTER;
 			}
 			return;
@@ -328,12 +373,12 @@ void CServerBrowserHttp::Update()
 		m_pGetServers = HttpGet(pBestUrl);
 		// 10 seconds connection timeout, lower than 8KB/s for 10 seconds to fail.
 		m_pGetServers->Timeout(CTimeout{10000, 0, 8000, 10});
-		m_pEngine->AddJob(m_pGetServers);
+		m_pHttp->Run(m_pGetServers);
 		m_State = STATE_REFRESHING;
 	}
 	else if(m_State == STATE_REFRESHING)
 	{
-		if(m_pGetServers->State() == HTTP_QUEUED || m_pGetServers->State() == HTTP_RUNNING)
+		if(!m_pGetServers->Done())
 		{
 			return;
 		}
@@ -342,16 +387,27 @@ void CServerBrowserHttp::Update()
 		std::swap(m_pGetServers, pGetServers);
 
 		bool Success = true;
-		json_value *pJson = pGetServers->ResultJson();
+		json_value *pJson = pGetServers->State() == EHttpState::DONE ? pGetServers->ResultJson() : nullptr;
 		Success = Success && pJson;
-		Success = Success && !Parse(pJson, &m_vServers, &m_vLegacyServers);
+		Success = Success && !Parse(pJson, &m_vServers);
 		json_value_free(pJson);
 		if(!Success)
 		{
-			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_http", "failed getting serverlist, trying to find best URL");
+			log_error("serverbrowser_http", "failed getting serverlist, trying to find best URL");
 			m_pChooseMaster->Reset();
 			m_pChooseMaster->Refresh();
 		}
+		else
+		{
+			// Try to find new master if the current one returns
+			// results that are 5 minutes old.
+			int Age = SanitizeAge(pGetServers->ResultAgeSeconds());
+			if(Age > 300)
+			{
+				log_info("serverbrowser_http", "got stale serverlist, age=%ds, trying to find best URL", Age);
+				m_pChooseMaster->Refresh();
+			}
+		}
 	}
 }
 void CServerBrowserHttp::Refresh()
@@ -368,23 +424,23 @@ void CServerBrowserHttp::Refresh()
 }
 bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
 {
-	return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
+	int Failure = net_addr_from_url(pOut, pUrl, nullptr, 0);
+	if(Failure || pOut->port == 0)
+		return true;
+	return false;
 }
 bool CServerBrowserHttp::Validate(json_value *pJson)
 {
 	std::vector<CServerInfo> vServers;
-	std::vector<NETADDR> vLegacyServers;
-	return Parse(pJson, &vServers, &vLegacyServers);
+	return Parse(pJson, &vServers);
 }
-bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvServers, std::vector<NETADDR> *pvLegacyServers)
+bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvServers)
 {
 	std::vector<CServerInfo> vServers;
-	std::vector<NETADDR> vLegacyServers;
 
 	const json_value &Json = *pJson;
 	const json_value &Servers = Json["servers"];
-	const json_value &LegacyServers = Json["servers_legacy"];
-	if(Servers.type != json_array || (LegacyServers.type != json_array && LegacyServers.type != json_none))
+	if(Servers.type != json_array)
 	{
 		return true;
 	}
@@ -409,7 +465,7 @@ bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvSe
 		}
 		if(CServerInfo2::FromJson(&ParsedInfo, &Info))
 		{
-			//dbg_msg("dbg/serverbrowser", "skipped due to info, i=%d", i);
+			log_debug("serverbrowser_http", "skipped due to info, i=%d", i);
 			// Only skip the current server on parsing
 			// failure; the server info is "user input" by
 			// the game server and can be set to arbitrary
@@ -419,6 +475,7 @@ bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvSe
 		CServerInfo SetInfo = ParsedInfo;
 		SetInfo.m_Location = ParsedLocation;
 		SetInfo.m_NumAddresses = 0;
+		bool GotVersion6 = false;
 		for(unsigned int a = 0; a < Addresses.u.array.length; a++)
 		{
 			const json_value &Address = Addresses[a];
@@ -426,10 +483,27 @@ bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvSe
 			{
 				return true;
 			}
+			if(str_startswith(Addresses[a], "tw-0.6+udp://"))
+			{
+				GotVersion6 = true;
+				break;
+			}
+		}
+		for(unsigned int a = 0; a < Addresses.u.array.length; a++)
+		{
+			const json_value &Address = Addresses[a];
+			if(Address.type != json_string)
+			{
+				return true;
+			}
+			if(GotVersion6 && str_startswith(Addresses[a], "tw-0.7+udp://"))
+			{
+				continue;
+			}
 			NETADDR ParsedAddr;
 			if(ServerbrowserParseUrl(&ParsedAddr, Addresses[a]))
 			{
-				//dbg_msg("dbg/serverbrowser", "unknown address, i=%d a=%d", i, a);
+				// log_debug("serverbrowser_http", "unknown address, i=%d a=%d", i, a);
 				// Skip unknown addresses.
 				continue;
 			}
@@ -444,21 +518,7 @@ bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvSe
 			vServers.push_back(SetInfo);
 		}
 	}
-	if(LegacyServers.type == json_array)
-	{
-		for(unsigned int i = 0; i < LegacyServers.u.array.length; i++)
-		{
-			const json_value &Address = LegacyServers[i];
-			NETADDR ParsedAddr;
-			if(Address.type != json_string || net_addr_from_str(&ParsedAddr, Address))
-			{
-				return true;
-			}
-			vLegacyServers.push_back(ParsedAddr);
-		}
-	}
 	*pvServers = vServers;
-	*pvLegacyServers = vLegacyServers;
 	return false;
 }
 
@@ -469,21 +529,18 @@ static const char *DEFAULT_SERVERLIST_URLS[] = {
 	"https://master4.ddnet.org/ddnet/15/servers.json",
 };
 
-IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, IStorage *pStorage, const char *pPreviousBestUrl)
+IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IStorage *pStorage, IHttp *pHttp, const char *pPreviousBestUrl)
 {
 	char aaUrls[CChooseMaster::MAX_URLS][256];
 	const char *apUrls[CChooseMaster::MAX_URLS] = {0};
 	const char **ppUrls = apUrls;
 	int NumUrls = 0;
-	IOHANDLE File = pStorage->OpenFile("ddnet-serverlist-urls.cfg", IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(File)
+	CLineReader LineReader;
+	if(LineReader.OpenFile(pStorage->OpenFile("ddnet-serverlist-urls.cfg", IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
-		CLineReader Lines;
-		Lines.Init(File);
-		while(NumUrls < CChooseMaster::MAX_URLS)
+		while(const char *pLine = LineReader.Get())
 		{
-			const char *pLine = Lines.Get();
-			if(!pLine)
+			if(NumUrls == CChooseMaster::MAX_URLS)
 			{
 				break;
 			}
@@ -506,5 +563,5 @@ IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IConsole *pConsole
 			break;
 		}
 	}
-	return new CServerBrowserHttp(pEngine, pConsole, ppUrls, NumUrls, PreviousBestIndex);
+	return new CServerBrowserHttp(pEngine, pHttp, ppUrls, NumUrls, PreviousBestIndex);
 }
diff --git a/src/engine/client/serverbrowser_http.h b/src/engine/client/serverbrowser_http.h
index b6884f869a..18f7a62d68 100644
--- a/src/engine/client/serverbrowser_http.h
+++ b/src/engine/client/serverbrowser_http.h
@@ -3,9 +3,9 @@
 #include <base/types.h>
 
 class CServerInfo;
-class IConsole;
 class IEngine;
 class IStorage;
+class IHttp;
 
 class IServerBrowserHttp
 {
@@ -21,9 +21,7 @@ class IServerBrowserHttp
 
 	virtual int NumServers() const = 0;
 	virtual const CServerInfo &Server(int Index) const = 0;
-	virtual int NumLegacyServers() const = 0;
-	virtual const NETADDR &LegacyServer(int Index) const = 0;
 };
 
-IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, IStorage *pStorage, const char *pPreviousBestUrl);
+IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IStorage *pStorage, IHttp *pHttp, const char *pPreviousBestUrl);
 #endif // ENGINE_CLIENT_SERVERBROWSER_HTTP_H
diff --git a/src/engine/client/sixup_translate_system.cpp b/src/engine/client/sixup_translate_system.cpp
new file mode 100644
index 0000000000..f6398cfcb5
--- /dev/null
+++ b/src/engine/client/sixup_translate_system.cpp
@@ -0,0 +1,114 @@
+#include <engine/client/client.h>
+
+int CClient::TranslateSysMsg(int *pMsgId, bool System, CUnpacker *pUnpacker, CPacker *pPacker, CNetChunk *pPacket, bool *pIsExMsg)
+{
+	*pIsExMsg = false;
+	if(!System)
+		return -1;
+
+	// ddnet ex
+	if(*pMsgId > NETMSG_WHATIS && *pMsgId < NETMSG_RCON_CMD_GROUP_END)
+	{
+		*pIsExMsg = true;
+		return 0;
+	}
+
+	pPacker->Reset();
+
+	if(*pMsgId == protocol7::NETMSG_MAP_CHANGE)
+	{
+		*pMsgId = NETMSG_MAP_CHANGE;
+		const char *pMapName = pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES);
+		int MapCrc = pUnpacker->GetInt();
+		int Size = pUnpacker->GetInt();
+		m_TranslationContext.m_MapDownloadChunksPerRequest = pUnpacker->GetInt();
+		int ChunkSize = pUnpacker->GetInt();
+		// void *pSha256 = pUnpacker->GetRaw(); // probably safe to ignore
+		pPacker->AddString(pMapName, 0);
+		pPacker->AddInt(MapCrc);
+		pPacker->AddInt(Size);
+		m_TranslationContext.m_MapdownloadTotalsize = Size;
+		m_TranslationContext.m_MapDownloadChunkSize = ChunkSize;
+		return 0;
+	}
+	else if(*pMsgId == protocol7::NETMSG_SERVERINFO)
+	{
+		// side effect only
+		// this is a 0.7 only message and not handled in 0.6 code
+		*pMsgId = -1;
+		net_addr_str(&pPacket->m_Address, m_CurrentServerInfo.m_aAddress, sizeof(m_CurrentServerInfo.m_aAddress), true);
+		str_copy(m_CurrentServerInfo.m_aVersion, pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES));
+		str_copy(m_CurrentServerInfo.m_aName, pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES));
+		str_clean_whitespaces(m_CurrentServerInfo.m_aName);
+		pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES); // Hostname
+		str_copy(m_CurrentServerInfo.m_aMap, pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES));
+		str_copy(m_CurrentServerInfo.m_aGameType, pUnpacker->GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES));
+		int Flags = pUnpacker->GetInt();
+		if(Flags & SERVER_FLAG_PASSWORD)
+			m_CurrentServerInfo.m_Flags |= SERVER_FLAG_PASSWORD;
+		// ddnets http master server handles timescore for us already
+		// if(Flags&SERVER_FLAG_TIMESCORE)
+		// 	m_CurrentServerInfo.m_Flags |= SERVER_FLAG_TIMESCORE;
+		pUnpacker->GetInt(); // Server level
+		m_CurrentServerInfo.m_NumPlayers = pUnpacker->GetInt();
+		m_CurrentServerInfo.m_MaxPlayers = pUnpacker->GetInt();
+		m_CurrentServerInfo.m_NumClients = pUnpacker->GetInt();
+		m_CurrentServerInfo.m_MaxClients = pUnpacker->GetInt();
+		return 0;
+	}
+	else if(*pMsgId == protocol7::NETMSG_RCON_AUTH_ON)
+	{
+		*pMsgId = NETMSG_RCON_AUTH_STATUS;
+		pPacker->AddInt(1); // authed
+		pPacker->AddInt(1); // cmdlist
+		return 0;
+	}
+	else if(*pMsgId == protocol7::NETMSG_RCON_AUTH_OFF)
+	{
+		*pMsgId = NETMSG_RCON_AUTH_STATUS;
+		pPacker->AddInt(0); // authed
+		pPacker->AddInt(0); // cmdlist
+		return 0;
+	}
+	else if(*pMsgId == protocol7::NETMSG_MAP_DATA)
+	{
+		// not binary compatible but translation happens on unpack
+		*pMsgId = NETMSG_MAP_DATA;
+	}
+	else if(*pMsgId >= protocol7::NETMSG_CON_READY && *pMsgId <= protocol7::NETMSG_INPUTTIMING)
+	{
+		*pMsgId = *pMsgId - 1;
+	}
+	else if(*pMsgId == protocol7::NETMSG_RCON_LINE)
+	{
+		*pMsgId = NETMSG_RCON_LINE;
+	}
+	else if(*pMsgId == protocol7::NETMSG_RCON_CMD_ADD)
+	{
+		*pMsgId = NETMSG_RCON_CMD_ADD;
+	}
+	else if(*pMsgId == protocol7::NETMSG_RCON_CMD_REM)
+	{
+		*pMsgId = NETMSG_RCON_CMD_REM;
+	}
+	else if(*pMsgId == protocol7::NETMSG_PING_REPLY)
+	{
+		*pMsgId = NETMSG_PING_REPLY;
+	}
+	else if(*pMsgId == protocol7::NETMSG_MAPLIST_ENTRY_ADD || *pMsgId == protocol7::NETMSG_MAPLIST_ENTRY_REM)
+	{
+		// This is just a nice to have so silently dropping that is fine
+		return -1;
+	}
+	else if(*pMsgId >= NETMSG_INFO && *pMsgId <= NETMSG_MAP_DATA)
+	{
+		return -1; // same in 0.6 and 0.7
+	}
+	else if(*pMsgId < OFFSET_UUID)
+	{
+		dbg_msg("sixup", "drop unknown sys msg=%d", *pMsgId);
+		return -1;
+	}
+
+	return -1;
+}
diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
index 8654077305..63df6cdb50 100644
--- a/src/engine/client/sound.cpp
+++ b/src/engine/client/sound.cpp
@@ -21,6 +21,9 @@ extern "C" {
 
 #include <cmath>
 
+static constexpr int SAMPLE_INDEX_USED = -2;
+static constexpr int SAMPLE_INDEX_FULL = -1;
+
 void CSound::Mix(short *pFinalOut, unsigned Frames)
 {
 	Frames = minimum(Frames, m_MaxFrames);
@@ -60,12 +63,10 @@ void CSound::Mix(short *pFinalOut, unsigned Frames)
 		if(Voice.m_Flags & ISound::FLAG_POS && Voice.m_pChannel->m_Pan)
 		{
 			// TODO: we should respect the channel panning value
-			const int dx = Voice.m_X - m_CenterX.load(std::memory_order_relaxed);
-			const int dy = Voice.m_Y - m_CenterY.load(std::memory_order_relaxed);
-			float FalloffX = 0.0f;
-			float FalloffY = 0.0f;
+			const vec2 Delta = Voice.m_Position - vec2(m_ListenerPositionX.load(std::memory_order_relaxed), m_ListenerPositionY.load(std::memory_order_relaxed));
+			vec2 Falloff = vec2(0.0f, 0.0f);
 
-			int RangeX = 0; // for panning
+			float RangeX = 0.0f; // for panning
 			bool InVoiceField = false;
 
 			switch(Voice.m_Shape)
@@ -75,50 +76,34 @@ void CSound::Mix(short *pFinalOut, unsigned Frames)
 				const float Radius = Voice.m_Circle.m_Radius;
 				RangeX = Radius;
 
-				// dx and dy can be larger than 46341 and thus the calculation would go beyond the limits of a integer,
-				// therefore we cast them into float
-				const int Dist = (int)length(vec2(dx, dy));
+				const float Dist = length(Delta);
 				if(Dist < Radius)
 				{
 					InVoiceField = true;
 
 					// falloff
-					int FalloffDistance = Radius * Voice.m_Falloff;
-					if(Dist > FalloffDistance)
-						FalloffX = FalloffY = (Radius - Dist) / (Radius - FalloffDistance);
-					else
-						FalloffX = FalloffY = 1.0f;
+					const float FalloffDistance = Radius * Voice.m_Falloff;
+					Falloff.x = Falloff.y = Dist > FalloffDistance ? (Radius - Dist) / (Radius - FalloffDistance) : 1.0f;
 				}
-				else
-					InVoiceField = false;
-
 				break;
 			}
 
 			case ISound::SHAPE_RECTANGLE:
 			{
-				RangeX = Voice.m_Rectangle.m_Width / 2.0f;
-
-				const int abs_dx = absolute(dx);
-				const int abs_dy = absolute(dy);
+				const vec2 AbsoluteDelta = vec2(absolute(Delta.x), absolute(Delta.y));
+				const float w = Voice.m_Rectangle.m_Width / 2.0f;
+				const float h = Voice.m_Rectangle.m_Height / 2.0f;
+				RangeX = w;
 
-				const int w = Voice.m_Rectangle.m_Width / 2.0f;
-				const int h = Voice.m_Rectangle.m_Height / 2.0f;
-
-				if(abs_dx < w && abs_dy < h)
+				if(AbsoluteDelta.x < w && AbsoluteDelta.y < h)
 				{
 					InVoiceField = true;
 
 					// falloff
-					int fx = Voice.m_Falloff * w;
-					int fy = Voice.m_Falloff * h;
-
-					FalloffX = abs_dx > fx ? (float)(w - abs_dx) / (w - fx) : 1.0f;
-					FalloffY = abs_dy > fy ? (float)(h - abs_dy) / (h - fy) : 1.0f;
+					const vec2 FalloffDistance = vec2(w, h) * Voice.m_Falloff;
+					Falloff.x = AbsoluteDelta.x > FalloffDistance.x ? (w - AbsoluteDelta.x) / (w - FalloffDistance.x) : 1.0f;
+					Falloff.y = AbsoluteDelta.y > FalloffDistance.y ? (h - AbsoluteDelta.y) / (h - FalloffDistance.y) : 1.0f;
 				}
-				else
-					InVoiceField = false;
-
 				break;
 			}
 			};
@@ -128,15 +113,15 @@ void CSound::Mix(short *pFinalOut, unsigned Frames)
 				// panning
 				if(!(Voice.m_Flags & ISound::FLAG_NO_PANNING))
 				{
-					if(dx > 0)
-						VolumeL = ((RangeX - absolute(dx)) * VolumeL) / RangeX;
+					if(Delta.x > 0)
+						VolumeL = ((RangeX - absolute(Delta.x)) * VolumeL) / RangeX;
 					else
-						VolumeR = ((RangeX - absolute(dx)) * VolumeR) / RangeX;
+						VolumeR = ((RangeX - absolute(Delta.x)) * VolumeR) / RangeX;
 				}
 
 				{
-					VolumeL *= FalloffX * FalloffY;
-					VolumeR *= FalloffX * FalloffY;
+					VolumeL *= Falloff.x * Falloff.y;
+					VolumeR *= Falloff.x * Falloff.y;
 				}
 			}
 			else
@@ -204,6 +189,18 @@ int CSound::Init()
 	m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 
+	// Initialize sample indices. We always need them to load sounds in
+	// the editor even if sound is disabled or failed to be enabled.
+	m_FirstFreeSampleIndex = 0;
+	for(size_t i = 0; i < std::size(m_aSamples) - 1; ++i)
+	{
+		m_aSamples[i].m_Index = i;
+		m_aSamples[i].m_NextFreeSampleIndex = i + 1;
+		m_aSamples[i].m_pData = nullptr;
+	}
+	m_aSamples[std::size(m_aSamples) - 1].m_Index = std::size(m_aSamples) - 1;
+	m_aSamples[std::size(m_aSamples) - 1].m_NextFreeSampleIndex = SAMPLE_INDEX_FULL;
+
 	if(!g_Config.m_SndEnable)
 		return 0;
 
@@ -213,10 +210,8 @@ int CSound::Init()
 		return -1;
 	}
 
-	m_MixingRate = g_Config.m_SndRate;
-
 	SDL_AudioSpec Format, FormatOut;
-	Format.freq = m_MixingRate;
+	Format.freq = g_Config.m_SndRate;
 	Format.format = AUDIO_S16;
 	Format.channels = 2;
 	Format.samples = g_Config.m_SndBufferSize;
@@ -224,8 +219,7 @@ int CSound::Init()
 	Format.userdata = this;
 
 	// Open the audio device and start playing sound!
-	m_Device = SDL_OpenAudioDevice(nullptr, 0, &Format, &FormatOut, 0);
-
+	m_Device = SDL_OpenAudioDevice(nullptr, 0, &Format, &FormatOut, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE);
 	if(m_Device == 0)
 	{
 		dbg_msg("sound", "unable to open audio: %s", SDL_GetError());
@@ -234,6 +228,7 @@ int CSound::Init()
 	else
 		dbg_msg("sound", "sound init successful using audio driver '%s'", SDL_GetCurrentAudioDriver());
 
+	m_MixingRate = FormatOut.freq;
 	m_MaxFrames = FormatOut.samples * 2;
 #if defined(CONF_VIDEORECORDER)
 	m_MaxFrames = maximum<uint32_t>(m_MaxFrames, 1024 * 2); // make the buffer bigger just in case
@@ -263,9 +258,9 @@ void CSound::UpdateVolume()
 
 void CSound::Shutdown()
 {
-	for(unsigned SampleID = 0; SampleID < NUM_SAMPLES; SampleID++)
+	for(unsigned SampleId = 0; SampleId < NUM_SAMPLES; SampleId++)
 	{
-		UnloadSample(SampleID);
+		UnloadSample(SampleId);
 	}
 
 	SDL_CloseAudioDevice(m_Device);
@@ -274,22 +269,29 @@ void CSound::Shutdown()
 	m_pMixBuffer = nullptr;
 }
 
-int CSound::AllocID()
+CSample *CSound::AllocSample()
 {
-	// TODO: linear search, get rid of it
-	for(unsigned SampleID = 0; SampleID < NUM_SAMPLES; SampleID++)
+	if(m_FirstFreeSampleIndex == SAMPLE_INDEX_FULL)
+		return nullptr;
+
+	CSample *pSample = &m_aSamples[m_FirstFreeSampleIndex];
+	if(pSample->m_pData != nullptr || pSample->m_NextFreeSampleIndex == SAMPLE_INDEX_USED)
 	{
-		if(m_aSamples[SampleID].m_pData == nullptr)
-			return SampleID;
+		char aError[128];
+		str_format(aError, sizeof(aError), "Sample was not unloaded (index=%d, next=%d, duration=%f, data=%p)",
+			pSample->m_Index, pSample->m_NextFreeSampleIndex, pSample->TotalTime(), pSample->m_pData);
+		dbg_assert(false, aError);
 	}
-
-	return -1;
+	m_FirstFreeSampleIndex = pSample->m_NextFreeSampleIndex;
+	pSample->m_NextFreeSampleIndex = SAMPLE_INDEX_USED;
+	return pSample;
 }
 
 void CSound::RateConvert(CSample &Sample) const
 {
+	dbg_assert(Sample.m_pData != nullptr, "Sample is not loaded");
 	// make sure that we need to convert this sound
-	if(!Sample.m_pData || Sample.m_Rate == m_MixingRate)
+	if(Sample.m_Rate == m_MixingRate)
 		return;
 
 	// allocate new data
@@ -323,29 +325,36 @@ void CSound::RateConvert(CSample &Sample) const
 
 bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) const
 {
-	OggOpusFile *pOpusFile = op_open_memory((const unsigned char *)pData, DataSize, nullptr);
+	int OpusError = 0;
+	OggOpusFile *pOpusFile = op_open_memory((const unsigned char *)pData, DataSize, &OpusError);
 	if(pOpusFile)
 	{
 		const int NumChannels = op_channel_count(pOpusFile, -1);
-		const int NumSamples = op_pcm_total(pOpusFile, -1); // per channel!
-
-		Sample.m_Channels = NumChannels;
-
-		if(Sample.m_Channels > 2)
+		if(NumChannels > 2)
 		{
+			op_free(pOpusFile);
 			dbg_msg("sound/opus", "file is not mono or stereo.");
 			return false;
 		}
 
-		Sample.m_pData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
+		const int NumSamples = op_pcm_total(pOpusFile, -1); // per channel!
+		if(NumSamples < 0)
+		{
+			op_free(pOpusFile);
+			dbg_msg("sound/opus", "failed to get number of samples, error %d", NumSamples);
+			return false;
+		}
+
+		short *pSampleData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
 
 		int Pos = 0;
 		while(Pos < NumSamples)
 		{
-			const int Read = op_read(pOpusFile, Sample.m_pData + Pos * NumChannels, NumSamples * NumChannels, nullptr);
+			const int Read = op_read(pOpusFile, pSampleData + Pos * NumChannels, (NumSamples - Pos) * NumChannels, nullptr);
 			if(Read < 0)
 			{
-				free(Sample.m_pData);
+				free(pSampleData);
+				op_free(pOpusFile);
 				dbg_msg("sound/opus", "op_read error %d at %d", Read, Pos);
 				return false;
 			}
@@ -354,15 +363,19 @@ bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) c
 			Pos += Read;
 		}
 
+		op_free(pOpusFile);
+
+		Sample.m_pData = pSampleData;
 		Sample.m_NumFrames = Pos;
 		Sample.m_Rate = 48000;
+		Sample.m_Channels = NumChannels;
 		Sample.m_LoopStart = -1;
 		Sample.m_LoopEnd = -1;
 		Sample.m_PausedAt = 0;
 	}
 	else
 	{
-		dbg_msg("sound/opus", "failed to decode sample");
+		dbg_msg("sound/opus", "failed to decode sample, error %d", OpusError);
 		return false;
 	}
 
@@ -441,10 +454,7 @@ bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) con
 		const unsigned int SampleRate = WavpackGetSampleRate(pContext);
 		const int NumChannels = WavpackGetNumChannels(pContext);
 
-		Sample.m_Channels = NumChannels;
-		Sample.m_Rate = SampleRate;
-
-		if(Sample.m_Channels > 2)
+		if(NumChannels > 2)
 		{
 			dbg_msg("sound/wv", "file is not mono or stereo.");
 			s_pWVBuffer = nullptr;
@@ -480,6 +490,8 @@ bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) con
 #endif
 
 		Sample.m_NumFrames = NumSamples;
+		Sample.m_Rate = SampleRate;
+		Sample.m_Channels = NumChannels;
 		Sample.m_LoopStart = -1;
 		Sample.m_LoopEnd = -1;
 		Sample.m_PausedAt = 0;
@@ -505,8 +517,8 @@ int CSound::LoadOpus(const char *pFilename, int StorageType)
 	if(!m_pStorage)
 		return -1;
 
-	const int SampleID = AllocID();
-	if(SampleID < 0)
+	CSample *pSample = AllocSample();
+	if(!pSample)
 	{
 		dbg_msg("sound/opus", "failed to allocate sample ID. filename='%s'", pFilename);
 		return -1;
@@ -516,20 +528,24 @@ int CSound::LoadOpus(const char *pFilename, int StorageType)
 	unsigned DataSize;
 	if(!m_pStorage->ReadFile(pFilename, StorageType, &pData, &DataSize))
 	{
+		UnloadSample(pSample->m_Index);
 		dbg_msg("sound/opus", "failed to open file. filename='%s'", pFilename);
 		return -1;
 	}
 
-	const bool DecodeSuccess = DecodeOpus(m_aSamples[SampleID], pData, DataSize);
+	const bool DecodeSuccess = DecodeOpus(*pSample, pData, DataSize);
 	free(pData);
 	if(!DecodeSuccess)
+	{
+		UnloadSample(pSample->m_Index);
 		return -1;
+	}
 
 	if(g_Config.m_Debug)
 		dbg_msg("sound/opus", "loaded %s", pFilename);
 
-	RateConvert(m_aSamples[SampleID]);
-	return SampleID;
+	RateConvert(*pSample);
+	return pSample->m_Index;
 }
 
 int CSound::LoadWV(const char *pFilename, int StorageType)
@@ -541,8 +557,8 @@ int CSound::LoadWV(const char *pFilename, int StorageType)
 	if(!m_pStorage)
 		return -1;
 
-	const int SampleID = AllocID();
-	if(SampleID < 0)
+	CSample *pSample = AllocSample();
+	if(!pSample)
 	{
 		dbg_msg("sound/wv", "failed to allocate sample ID. filename='%s'", pFilename);
 		return -1;
@@ -552,20 +568,24 @@ int CSound::LoadWV(const char *pFilename, int StorageType)
 	unsigned DataSize;
 	if(!m_pStorage->ReadFile(pFilename, StorageType, &pData, &DataSize))
 	{
+		UnloadSample(pSample->m_Index);
 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
 		return -1;
 	}
 
-	const bool DecodeSuccess = DecodeWV(m_aSamples[SampleID], pData, DataSize);
+	const bool DecodeSuccess = DecodeWV(*pSample, pData, DataSize);
 	free(pData);
 	if(!DecodeSuccess)
+	{
+		UnloadSample(pSample->m_Index);
 		return -1;
+	}
 
 	if(g_Config.m_Debug)
 		dbg_msg("sound/wv", "loaded %s", pFilename);
 
-	RateConvert(m_aSamples[SampleID]);
-	return SampleID;
+	RateConvert(*pSample);
+	return pSample->m_Index;
 }
 
 int CSound::LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor = false)
@@ -577,15 +597,18 @@ int CSound::LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEdito
 	if(!pData)
 		return -1;
 
-	const int SampleID = AllocID();
-	if(SampleID < 0)
+	CSample *pSample = AllocSample();
+	if(!pSample)
 		return -1;
 
-	if(!DecodeOpus(m_aSamples[SampleID], pData, DataSize))
+	if(!DecodeOpus(*pSample, pData, DataSize))
+	{
+		UnloadSample(pSample->m_Index);
 		return -1;
+	}
 
-	RateConvert(m_aSamples[SampleID]);
-	return SampleID;
+	RateConvert(*pSample);
+	return pSample->m_Index;
 }
 
 int CSound::LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor = false)
@@ -597,87 +620,95 @@ int CSound::LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor
 	if(!pData)
 		return -1;
 
-	const int SampleID = AllocID();
-	if(SampleID < 0)
+	CSample *pSample = AllocSample();
+	if(!pSample)
 		return -1;
 
-	if(!DecodeWV(m_aSamples[SampleID], pData, DataSize))
+	if(!DecodeWV(*pSample, pData, DataSize))
+	{
+		UnloadSample(pSample->m_Index);
 		return -1;
+	}
 
-	RateConvert(m_aSamples[SampleID]);
-	return SampleID;
+	RateConvert(*pSample);
+	return pSample->m_Index;
 }
 
-void CSound::UnloadSample(int SampleID)
+void CSound::UnloadSample(int SampleId)
 {
-	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+	if(SampleId == -1 || SampleId >= NUM_SAMPLES)
 		return;
 
-	Stop(SampleID);
-	free(m_aSamples[SampleID].m_pData);
-	m_aSamples[SampleID].m_pData = nullptr;
+	Stop(SampleId);
+
+	// Free data
+	CSample &Sample = m_aSamples[SampleId];
+	free(Sample.m_pData);
+	Sample.m_pData = nullptr;
+
+	// Free slot
+	if(Sample.m_NextFreeSampleIndex == SAMPLE_INDEX_USED)
+	{
+		Sample.m_NextFreeSampleIndex = m_FirstFreeSampleIndex;
+		m_FirstFreeSampleIndex = Sample.m_Index;
+	}
 }
 
-float CSound::GetSampleTotalTime(int SampleID)
+float CSound::GetSampleTotalTime(int SampleId)
 {
-	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+	if(SampleId == -1 || SampleId >= NUM_SAMPLES)
 		return 0.0f;
 
-	return (m_aSamples[SampleID].m_NumFrames / (float)m_aSamples[SampleID].m_Rate);
+	return m_aSamples[SampleId].TotalTime();
 }
 
-float CSound::GetSampleCurrentTime(int SampleID)
+float CSound::GetSampleCurrentTime(int SampleId)
 {
-	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+	if(SampleId == -1 || SampleId >= NUM_SAMPLES)
 		return 0.0f;
 
-	CSample *pSample = &m_aSamples[SampleID];
-	if(IsPlaying(SampleID))
+	const CLockScope LockScope(m_SoundLock);
+	CSample *pSample = &m_aSamples[SampleId];
+	for(auto &Voice : m_aVoices)
 	{
-		for(auto &Voice : m_aVoices)
+		if(Voice.m_pSample == pSample)
 		{
-			if(Voice.m_pSample == pSample)
-			{
-				return (Voice.m_Tick / (float)pSample->m_Rate);
-			}
+			return Voice.m_Tick / (float)pSample->m_Rate;
 		}
 	}
 
-	return (pSample->m_PausedAt / (float)pSample->m_Rate);
+	return pSample->m_PausedAt / (float)pSample->m_Rate;
 }
 
-void CSound::SetSampleCurrentTime(int SampleID, float Time)
+void CSound::SetSampleCurrentTime(int SampleId, float Time)
 {
-	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+	if(SampleId == -1 || SampleId >= NUM_SAMPLES)
 		return;
 
-	CSample *pSample = &m_aSamples[SampleID];
-	if(IsPlaying(SampleID))
+	const CLockScope LockScope(m_SoundLock);
+	CSample *pSample = &m_aSamples[SampleId];
+	for(auto &Voice : m_aVoices)
 	{
-		for(auto &Voice : m_aVoices)
+		if(Voice.m_pSample == pSample)
 		{
-			if(Voice.m_pSample == pSample)
-			{
-				Voice.m_Tick = pSample->m_NumFrames * Time;
-			}
+			Voice.m_Tick = pSample->m_NumFrames * Time;
+			return;
 		}
 	}
-	else
-	{
-		pSample->m_PausedAt = pSample->m_NumFrames * Time;
-	}
+
+	pSample->m_PausedAt = pSample->m_NumFrames * Time;
 }
 
-void CSound::SetChannel(int ChannelID, float Vol, float Pan)
+void CSound::SetChannel(int ChannelId, float Vol, float Pan)
 {
-	m_aChannels[ChannelID].m_Vol = (int)(Vol * 255.0f);
-	m_aChannels[ChannelID].m_Pan = (int)(Pan * 255.0f); // TODO: this is only on and off right now
+	m_aChannels[ChannelId].m_Vol = (int)(Vol * 255.0f);
+	m_aChannels[ChannelId].m_Pan = (int)(Pan * 255.0f); // TODO: this is only on and off right now
 }
 
-void CSound::SetListenerPos(float x, float y)
+void CSound::SetListenerPosition(vec2 Position)
 {
-	m_CenterX.store((int)x, std::memory_order_relaxed);
-	m_CenterY.store((int)y, std::memory_order_relaxed);
+	m_ListenerPositionX.store(Position.x, std::memory_order_relaxed);
+	m_ListenerPositionY.store(Position.y, std::memory_order_relaxed);
 }
 
 void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume)
@@ -685,14 +716,14 @@ void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
 	Volume = clamp(Volume, 0.0f, 1.0f);
-	m_aVoices[VoiceID].m_Vol = (int)(Volume * 255.0f);
+	m_aVoices[VoiceId].m_Vol = (int)(Volume * 255.0f);
 }
 
 void CSound::SetVoiceFalloff(CVoiceHandle Voice, float Falloff)
@@ -700,29 +731,28 @@ void CSound::SetVoiceFalloff(CVoiceHandle Voice, float Falloff)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
 	Falloff = clamp(Falloff, 0.0f, 1.0f);
-	m_aVoices[VoiceID].m_Falloff = Falloff;
+	m_aVoices[VoiceId].m_Falloff = Falloff;
 }
 
-void CSound::SetVoiceLocation(CVoiceHandle Voice, float x, float y)
+void CSound::SetVoicePosition(CVoiceHandle Voice, vec2 Position)
 {
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
-	m_aVoices[VoiceID].m_X = x;
-	m_aVoices[VoiceID].m_Y = y;
+	m_aVoices[VoiceId].m_Position = Position;
 }
 
 void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset)
@@ -730,31 +760,31 @@ void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
-	if(!m_aVoices[VoiceID].m_pSample)
+	if(!m_aVoices[VoiceId].m_pSample)
 		return;
 
 	int Tick = 0;
-	bool IsLooping = m_aVoices[VoiceID].m_Flags & ISound::FLAG_LOOP;
-	uint64_t TickOffset = m_aVoices[VoiceID].m_pSample->m_Rate * TimeOffset;
-	if(m_aVoices[VoiceID].m_pSample->m_NumFrames > 0 && IsLooping)
-		Tick = TickOffset % m_aVoices[VoiceID].m_pSample->m_NumFrames;
+	bool IsLooping = m_aVoices[VoiceId].m_Flags & ISound::FLAG_LOOP;
+	uint64_t TickOffset = m_aVoices[VoiceId].m_pSample->m_Rate * TimeOffset;
+	if(m_aVoices[VoiceId].m_pSample->m_NumFrames > 0 && IsLooping)
+		Tick = TickOffset % m_aVoices[VoiceId].m_pSample->m_NumFrames;
 	else
-		Tick = clamp(TickOffset, (uint64_t)0, (uint64_t)m_aVoices[VoiceID].m_pSample->m_NumFrames);
+		Tick = clamp(TickOffset, (uint64_t)0, (uint64_t)m_aVoices[VoiceId].m_pSample->m_NumFrames);
 
 	// at least 200msec off, else depend on buffer size
-	float Threshold = maximum(0.2f * m_aVoices[VoiceID].m_pSample->m_Rate, (float)m_MaxFrames);
-	if(absolute(m_aVoices[VoiceID].m_Tick - Tick) > Threshold)
+	float Threshold = maximum(0.2f * m_aVoices[VoiceId].m_pSample->m_Rate, (float)m_MaxFrames);
+	if(absolute(m_aVoices[VoiceId].m_Tick - Tick) > Threshold)
 	{
 		// take care of looping (modulo!)
-		if(!(IsLooping && (minimum(m_aVoices[VoiceID].m_Tick, Tick) + m_aVoices[VoiceID].m_pSample->m_NumFrames - maximum(m_aVoices[VoiceID].m_Tick, Tick)) <= Threshold))
+		if(!(IsLooping && (minimum(m_aVoices[VoiceId].m_Tick, Tick) + m_aVoices[VoiceId].m_pSample->m_NumFrames - maximum(m_aVoices[VoiceId].m_Tick, Tick)) <= Threshold))
 		{
-			m_aVoices[VoiceID].m_Tick = Tick;
+			m_aVoices[VoiceId].m_Tick = Tick;
 		}
 	}
 }
@@ -764,14 +794,14 @@ void CSound::SetVoiceCircle(CVoiceHandle Voice, float Radius)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
-	m_aVoices[VoiceID].m_Shape = ISound::SHAPE_CIRCLE;
-	m_aVoices[VoiceID].m_Circle.m_Radius = maximum(0.0f, Radius);
+	m_aVoices[VoiceId].m_Shape = ISound::SHAPE_CIRCLE;
+	m_aVoices[VoiceId].m_Circle.m_Radius = maximum(0.0f, Radius);
 }
 
 void CSound::SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height)
@@ -779,81 +809,80 @@ void CSound::SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
-	m_aVoices[VoiceID].m_Shape = ISound::SHAPE_RECTANGLE;
-	m_aVoices[VoiceID].m_Rectangle.m_Width = maximum(0.0f, Width);
-	m_aVoices[VoiceID].m_Rectangle.m_Height = maximum(0.0f, Height);
+	m_aVoices[VoiceId].m_Shape = ISound::SHAPE_RECTANGLE;
+	m_aVoices[VoiceId].m_Rectangle.m_Width = maximum(0.0f, Width);
+	m_aVoices[VoiceId].m_Rectangle.m_Height = maximum(0.0f, Height);
 }
 
-ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
+ISound::CVoiceHandle CSound::Play(int ChannelId, int SampleId, int Flags, float Volume, vec2 Position)
 {
 	const CLockScope LockScope(m_SoundLock);
 
 	// search for voice
-	int VoiceID = -1;
+	int VoiceId = -1;
 	for(int i = 0; i < NUM_VOICES; i++)
 	{
-		int NextID = (m_NextVoice + i) % NUM_VOICES;
-		if(!m_aVoices[NextID].m_pSample)
+		int NextId = (m_NextVoice + i) % NUM_VOICES;
+		if(!m_aVoices[NextId].m_pSample)
 		{
-			VoiceID = NextID;
-			m_NextVoice = NextID + 1;
+			VoiceId = NextId;
+			m_NextVoice = NextId + 1;
 			break;
 		}
 	}
 
 	// voice found, use it
 	int Age = -1;
-	if(VoiceID != -1)
+	if(VoiceId != -1)
 	{
-		m_aVoices[VoiceID].m_pSample = &m_aSamples[SampleID];
-		m_aVoices[VoiceID].m_pChannel = &m_aChannels[ChannelID];
+		m_aVoices[VoiceId].m_pSample = &m_aSamples[SampleId];
+		m_aVoices[VoiceId].m_pChannel = &m_aChannels[ChannelId];
 		if(Flags & FLAG_LOOP)
 		{
-			m_aVoices[VoiceID].m_Tick = m_aSamples[SampleID].m_PausedAt;
+			m_aVoices[VoiceId].m_Tick = m_aSamples[SampleId].m_PausedAt;
 		}
 		else if(Flags & FLAG_PREVIEW)
 		{
-			m_aVoices[VoiceID].m_Tick = m_aSamples[SampleID].m_PausedAt;
-			m_aSamples[SampleID].m_PausedAt = 0;
+			m_aVoices[VoiceId].m_Tick = m_aSamples[SampleId].m_PausedAt;
+			m_aSamples[SampleId].m_PausedAt = 0;
 		}
 		else
 		{
-			m_aVoices[VoiceID].m_Tick = 0;
+			m_aVoices[VoiceId].m_Tick = 0;
 		}
-		m_aVoices[VoiceID].m_Vol = 255;
-		m_aVoices[VoiceID].m_Flags = Flags;
-		m_aVoices[VoiceID].m_X = (int)x;
-		m_aVoices[VoiceID].m_Y = (int)y;
-		m_aVoices[VoiceID].m_Falloff = 0.0f;
-		m_aVoices[VoiceID].m_Shape = ISound::SHAPE_CIRCLE;
-		m_aVoices[VoiceID].m_Circle.m_Radius = 1500;
-		Age = m_aVoices[VoiceID].m_Age;
+		m_aVoices[VoiceId].m_Vol = (int)(clamp(Volume, 0.0f, 1.0f) * 255.0f);
+		m_aVoices[VoiceId].m_Flags = Flags;
+		m_aVoices[VoiceId].m_Position = Position;
+		m_aVoices[VoiceId].m_Falloff = 0.0f;
+		m_aVoices[VoiceId].m_Shape = ISound::SHAPE_CIRCLE;
+		m_aVoices[VoiceId].m_Circle.m_Radius = 1500;
+		Age = m_aVoices[VoiceId].m_Age;
 	}
 
-	return CreateVoiceHandle(VoiceID, Age);
+	return CreateVoiceHandle(VoiceId, Age);
 }
 
-ISound::CVoiceHandle CSound::PlayAt(int ChannelID, int SampleID, int Flags, float x, float y)
+ISound::CVoiceHandle CSound::PlayAt(int ChannelId, int SampleId, int Flags, float Volume, vec2 Position)
 {
-	return Play(ChannelID, SampleID, Flags | ISound::FLAG_POS, x, y);
+	return Play(ChannelId, SampleId, Flags | ISound::FLAG_POS, Volume, Position);
 }
 
-ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags)
+ISound::CVoiceHandle CSound::Play(int ChannelId, int SampleId, int Flags, float Volume)
 {
-	return Play(ChannelID, SampleID, Flags, 0, 0);
+	return Play(ChannelId, SampleId, Flags, Volume, vec2(0.0f, 0.0f));
 }
 
-void CSound::Pause(int SampleID)
+void CSound::Pause(int SampleId)
 {
 	// TODO: a nice fade out
 	const CLockScope LockScope(m_SoundLock);
-	CSample *pSample = &m_aSamples[SampleID];
+	CSample *pSample = &m_aSamples[SampleId];
 	for(auto &Voice : m_aVoices)
 	{
 		if(Voice.m_pSample == pSample)
@@ -864,11 +893,11 @@ void CSound::Pause(int SampleID)
 	}
 }
 
-void CSound::Stop(int SampleID)
+void CSound::Stop(int SampleId)
 {
 	// TODO: a nice fade out
 	const CLockScope LockScope(m_SoundLock);
-	CSample *pSample = &m_aSamples[SampleID];
+	CSample *pSample = &m_aSamples[SampleId];
 	for(auto &Voice : m_aVoices)
 	{
 		if(Voice.m_pSample == pSample)
@@ -904,20 +933,20 @@ void CSound::StopVoice(CVoiceHandle Voice)
 	if(!Voice.IsValid())
 		return;
 
-	int VoiceID = Voice.Id();
+	int VoiceId = Voice.Id();
 
 	const CLockScope LockScope(m_SoundLock);
-	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+	if(m_aVoices[VoiceId].m_Age != Voice.Age())
 		return;
 
-	m_aVoices[VoiceID].m_pSample = nullptr;
-	m_aVoices[VoiceID].m_Age++;
+	m_aVoices[VoiceId].m_pSample = nullptr;
+	m_aVoices[VoiceId].m_Age++;
 }
 
-bool CSound::IsPlaying(int SampleID)
+bool CSound::IsPlaying(int SampleId)
 {
 	const CLockScope LockScope(m_SoundLock);
-	const CSample *pSample = &m_aSamples[SampleID];
+	const CSample *pSample = &m_aSamples[SampleId];
 	return std::any_of(std::begin(m_aVoices), std::end(m_aVoices), [pSample](const auto &Voice) { return Voice.m_pSample == pSample; });
 }
 
diff --git a/src/engine/client/sound.h b/src/engine/client/sound.h
index ea5eb5766f..f7cc4b82cc 100644
--- a/src/engine/client/sound.h
+++ b/src/engine/client/sound.h
@@ -13,6 +13,9 @@
 
 struct CSample
 {
+	int m_Index;
+	int m_NextFreeSampleIndex;
+
 	short *m_pData;
 	int m_NumFrames;
 	int m_Rate;
@@ -20,6 +23,11 @@ struct CSample
 	int m_LoopStart;
 	int m_LoopEnd;
 	int m_PausedAt;
+
+	float TotalTime() const
+	{
+		return m_NumFrames / (float)m_Rate;
+	}
 };
 
 struct CChannel
@@ -36,7 +44,7 @@ struct CVoice
 	int m_Tick;
 	int m_Vol; // 0 - 255
 	int m_Flags;
-	int m_X, m_Y;
+	vec2 m_Position;
 	float m_Falloff; // [0.0, 1.0]
 
 	int m_Shape;
@@ -61,13 +69,17 @@ class CSound : public IEngineSound
 	CLock m_SoundLock;
 
 	CSample m_aSamples[NUM_SAMPLES] = {{0}};
+	int m_FirstFreeSampleIndex = 0;
+
 	CVoice m_aVoices[NUM_VOICES] = {{0}};
 	CChannel m_aChannels[NUM_CHANNELS] = {{255, 0}};
 	int m_NextVoice = 0;
 	uint32_t m_MaxFrames = 0;
 
-	std::atomic<int> m_CenterX = 0;
-	std::atomic<int> m_CenterY = 0;
+	// This is not an std::atomic<vec2> as this would require linking with
+	// libatomic with clang x86 as there is no native support for this.
+	std::atomic<float> m_ListenerPositionX = 0.0f;
+	std::atomic<float> m_ListenerPositionY = 0.0f;
 	std::atomic<int> m_SoundVolume = 100;
 	int m_MixingRate = 48000;
 
@@ -76,7 +88,7 @@ class CSound : public IEngineSound
 
 	int *m_pMixBuffer = nullptr;
 
-	int AllocID();
+	CSample *AllocSample();
 	void RateConvert(CSample &Sample) const;
 
 	bool DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) const;
@@ -91,37 +103,39 @@ class CSound : public IEngineSound
 
 	bool IsSoundEnabled() override { return m_SoundEnabled; }
 
-	int LoadOpus(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override;
-	int LoadWV(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override;
-	int LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor) override;
-	int LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor) override;
-	void UnloadSample(int SampleID) override REQUIRES(!m_SoundLock);
+	int LoadOpus(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override REQUIRES(!m_SoundLock);
+	int LoadWV(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override REQUIRES(!m_SoundLock);
+	int LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor) override REQUIRES(!m_SoundLock);
+	int LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor) override REQUIRES(!m_SoundLock);
+	void UnloadSample(int SampleId) override REQUIRES(!m_SoundLock);
 
-	float GetSampleTotalTime(int SampleID) override; // in s
-	float GetSampleCurrentTime(int SampleID) override REQUIRES(!m_SoundLock); // in s
-	void SetSampleCurrentTime(int SampleID, float Time) override REQUIRES(!m_SoundLock);
+	float GetSampleTotalTime(int SampleId) override; // in s
+	float GetSampleCurrentTime(int SampleId) override REQUIRES(!m_SoundLock); // in s
+	void SetSampleCurrentTime(int SampleId, float Time) override REQUIRES(!m_SoundLock);
 
-	void SetChannel(int ChannelID, float Vol, float Pan) override;
-	void SetListenerPos(float x, float y) override;
+	void SetChannel(int ChannelId, float Vol, float Pan) override;
+	void SetListenerPosition(vec2 Position) override;
 
 	void SetVoiceVolume(CVoiceHandle Voice, float Volume) override REQUIRES(!m_SoundLock);
 	void SetVoiceFalloff(CVoiceHandle Voice, float Falloff) override REQUIRES(!m_SoundLock);
-	void SetVoiceLocation(CVoiceHandle Voice, float x, float y) override REQUIRES(!m_SoundLock);
+	void SetVoicePosition(CVoiceHandle Voice, vec2 Position) override REQUIRES(!m_SoundLock);
 	void SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset) override REQUIRES(!m_SoundLock); // in s
 
 	void SetVoiceCircle(CVoiceHandle Voice, float Radius) override REQUIRES(!m_SoundLock);
 	void SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height) override REQUIRES(!m_SoundLock);
 
-	CVoiceHandle Play(int ChannelID, int SampleID, int Flags, float x, float y) REQUIRES(!m_SoundLock);
-	CVoiceHandle PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) override REQUIRES(!m_SoundLock);
-	CVoiceHandle Play(int ChannelID, int SampleID, int Flags) override REQUIRES(!m_SoundLock);
-	void Pause(int SampleID) override REQUIRES(!m_SoundLock);
-	void Stop(int SampleID) override REQUIRES(!m_SoundLock);
+	CVoiceHandle Play(int ChannelId, int SampleId, int Flags, float Volume, vec2 Position) REQUIRES(!m_SoundLock);
+	CVoiceHandle PlayAt(int ChannelId, int SampleId, int Flags, float Volume, vec2 Position) override REQUIRES(!m_SoundLock);
+	CVoiceHandle Play(int ChannelId, int SampleId, int Flags, float Volume) override REQUIRES(!m_SoundLock);
+	void Pause(int SampleId) override REQUIRES(!m_SoundLock);
+	void Stop(int SampleId) override REQUIRES(!m_SoundLock);
 	void StopAll() override REQUIRES(!m_SoundLock);
 	void StopVoice(CVoiceHandle Voice) override REQUIRES(!m_SoundLock);
-	bool IsPlaying(int SampleID) override REQUIRES(!m_SoundLock);
+	bool IsPlaying(int SampleId) override REQUIRES(!m_SoundLock);
 
+	int MixingRate() const override { return m_MixingRate; }
 	void Mix(short *pFinalOut, unsigned Frames) override REQUIRES(!m_SoundLock);
+
 	void PauseAudioDevice() override;
 	void UnpauseAudioDevice() override;
 };
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp
index 91457099dd..1337d32932 100644
--- a/src/engine/client/text.cpp
+++ b/src/engine/client/text.cpp
@@ -391,8 +391,8 @@ class CGlyphMap
 	void UploadTextures()
 	{
 		const size_t NewTextureSize = m_TextureDimension * m_TextureDimension;
-		void *pTmpTextFillData = malloc(NewTextureSize);
-		void *pTmpTextOutlineData = malloc(NewTextureSize);
+		uint8_t *pTmpTextFillData = static_cast<uint8_t *>(malloc(NewTextureSize));
+		uint8_t *pTmpTextOutlineData = static_cast<uint8_t *>(malloc(NewTextureSize));
 		mem_copy(pTmpTextFillData, m_apTextureData[FONT_TEXTURE_FILL], NewTextureSize);
 		mem_copy(pTmpTextOutlineData, m_apTextureData[FONT_TEXTURE_OUTLINE], NewTextureSize);
 		Graphics()->LoadTextTextures(m_TextureDimension, m_TextureDimension, m_aTextures[FONT_TEXTURE_FILL], m_aTextures[FONT_TEXTURE_OUTLINE], pTmpTextFillData, pTmpTextOutlineData);
@@ -465,8 +465,8 @@ class CGlyphMap
 						if(GetX >= 0 && GetY >= 0 && GetX < w && GetY < h)
 						{
 							int Index = GetY * w + GetX;
-							if(pIn[Index] > c)
-								c = pIn[Index];
+							float Mask = 1.f - clamp(length(vec2(sx, sy)) - OutlineCount, 0.f, 1.f);
+							c = maximum(c, int(pIn[Index] * Mask));
 						}
 					}
 				}
@@ -729,11 +729,12 @@ class CGlyphMap
 		return vec2(0.0f, 0.0f);
 	}
 
-	void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize)
+	void UploadEntityLayerText(const CImageInfo &TextImage, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize)
 	{
 		if(FontSize < 1)
 			return;
 
+		const size_t PixelSize = TextImage.PixelSize();
 		const char *pCurrent = pText;
 		const char *pEnd = pCurrent + Length;
 		int WidthLastChars = 0;
@@ -770,24 +771,23 @@ class CGlyphMap
 				else
 					mem_zero(m_aaGlyphData[FONT_TEXTURE_FILL], GlyphDataSize);
 
-				uint8_t *pImageBuff = (uint8_t *)pTexBuff;
 				for(unsigned OffY = 0; OffY < pBitmap->rows; ++OffY)
 				{
 					for(unsigned OffX = 0; OffX < pBitmap->width; ++OffX)
 					{
 						const int ImgOffX = clamp(x + OffX + WidthLastChars, x, (x + TexSubWidth) - 1);
 						const int ImgOffY = clamp(y + OffY, y, (y + TexSubHeight) - 1);
-						const size_t ImageOffset = ImgOffY * (TexWidth * PixelSize) + ImgOffX * PixelSize;
+						const size_t ImageOffset = ImgOffY * (TextImage.m_Width * PixelSize) + ImgOffX * PixelSize;
 						const size_t GlyphOffset = OffY * pBitmap->width + OffX;
 						for(size_t i = 0; i < PixelSize; ++i)
 						{
 							if(i != PixelSize - 1)
 							{
-								*(pImageBuff + ImageOffset + i) = 255;
+								*(TextImage.m_pData + ImageOffset + i) = 255;
 							}
 							else
 							{
-								*(pImageBuff + ImageOffset + i) = *(m_aaGlyphData[FONT_TEXTURE_FILL] + GlyphOffset);
+								*(TextImage.m_pData + ImageOffset + i) = *(m_aaGlyphData[FONT_TEXTURE_FILL] + GlyphOffset);
 							}
 						}
 					}
@@ -1268,7 +1268,9 @@ class CTextRender : public IEngineTextRender
 		pCursor->m_GlyphCount = 0;
 		pCursor->m_CharCount = 0;
 		pCursor->m_MaxLines = 0;
+
 		pCursor->m_LineSpacing = 0;
+		pCursor->m_AlignedLineSpacing = 0;
 
 		pCursor->m_StartX = x;
 		pCursor->m_StartY = y;
@@ -1307,6 +1309,7 @@ class CTextRender : public IEngineTextRender
 		pCursor->m_X = x;
 		pCursor->m_Y = y;
 	}
+
 	void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) override
 	{
 		CTextCursor Cursor;
@@ -1314,6 +1317,7 @@ class CTextRender : public IEngineTextRender
 		Cursor.m_LineWidth = LineWidth;
 		TextEx(&Cursor, pText, -1);
 	}
+
 	float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, const STextSizeProperties &TextSizeProps = {}) override
 	{
 		CTextCursor Cursor;
@@ -1349,9 +1353,9 @@ class CTextRender : public IEngineTextRender
 		m_Color.a = a;
 	}
 
-	void TextColor(ColorRGBA rgb) override
+	void TextColor(ColorRGBA Color) override
 	{
-		m_Color = rgb;
+		m_Color = Color;
 	}
 
 	void TextOutlineColor(float r, float g, float b, float a) override
@@ -1362,9 +1366,9 @@ class CTextRender : public IEngineTextRender
 		m_OutlineColor.a = a;
 	}
 
-	void TextOutlineColor(ColorRGBA rgb) override
+	void TextOutlineColor(ColorRGBA Color) override
 	{
-		m_OutlineColor = rgb;
+		m_OutlineColor = Color;
 	}
 
 	void TextSelectionColor(float r, float g, float b, float a) override
@@ -1375,9 +1379,9 @@ class CTextRender : public IEngineTextRender
 		m_SelectionColor.a = a;
 	}
 
-	void TextSelectionColor(ColorRGBA rgb) override
+	void TextSelectionColor(ColorRGBA Color) override
 	{
-		m_SelectionColor = rgb;
+		m_SelectionColor = Color;
 	}
 
 	ColorRGBA GetTextColor() const override
@@ -1479,7 +1483,7 @@ class CTextRender : public IEngineTextRender
 		const float CursorY = round_to_int(pCursor->m_Y * FakeToScreen.y) / FakeToScreen.y;
 		const int ActualSize = round_truncate(pCursor->m_FontSize * FakeToScreen.y);
 		pCursor->m_AlignedFontSize = ActualSize / FakeToScreen.y;
-		const float LineSpacing = pCursor->m_LineSpacing;
+		pCursor->m_AlignedLineSpacing = round_truncate(pCursor->m_LineSpacing * FakeToScreen.y) / FakeToScreen.y;
 
 		// string length
 		if(Length < 0)
@@ -1528,6 +1532,7 @@ class CTextRender : public IEngineTextRender
 		const float CursorOuterInnerDiff = (CursorOuterWidth - CursorInnerWidth) / 2;
 
 		std::vector<IGraphics::CQuadItem> vSelectionQuads;
+		int SelectionQuadLine = -1;
 		bool SelectionStarted = false;
 		bool SelectionUsedPress = false;
 		bool SelectionUsedRelease = false;
@@ -1537,38 +1542,34 @@ class CTextRender : public IEngineTextRender
 		const auto &&CheckInsideChar = [&](bool CheckOuter, vec2 CursorPos, float LastCharX, float LastCharWidth, float CharX, float CharWidth, float CharY) -> bool {
 			return (LastCharX - LastCharWidth / 2 <= CursorPos.x &&
 				       CharX + CharWidth / 2 > CursorPos.x &&
-				       CharY - pCursor->m_AlignedFontSize - LineSpacing <= CursorPos.y &&
-				       CharY + LineSpacing > CursorPos.y) ||
+				       CursorPos.y >= CharY - pCursor->m_AlignedFontSize &&
+				       CursorPos.y < CharY + pCursor->m_AlignedLineSpacing) ||
 			       (CheckOuter &&
-				       CharY - pCursor->m_AlignedFontSize + LineSpacing > CursorPos.y);
+				       CursorPos.y <= CharY - pCursor->m_AlignedFontSize);
 		};
 		const auto &&CheckSelectionStart = [&](bool CheckOuter, vec2 CursorPos, int &SelectionChar, bool &SelectionUsedCase, float LastCharX, float LastCharWidth, float CharX, float CharWidth, float CharY) {
-			if(!SelectionStarted && !SelectionUsedCase)
+			if(!SelectionStarted && !SelectionUsedCase &&
+				CheckInsideChar(CheckOuter, CursorPos, LastCharX, LastCharWidth, CharX, CharWidth, CharY))
 			{
-				if(CheckInsideChar(CheckOuter, CursorPos, LastCharX, LastCharWidth, CharX, CharWidth, CharY))
-				{
-					SelectionChar = pCursor->m_GlyphCount;
-					SelectionStarted = !SelectionStarted;
-					SelectionUsedCase = true;
-				}
+				SelectionChar = pCursor->m_GlyphCount;
+				SelectionStarted = !SelectionStarted;
+				SelectionUsedCase = true;
 			}
 		};
 		const auto &&CheckOutsideChar = [&](bool CheckOuter, vec2 CursorPos, float CharX, float CharWidth, float CharY) -> bool {
 			return (CharX + CharWidth / 2 > CursorPos.x &&
-				       CharY - pCursor->m_AlignedFontSize - LineSpacing <= CursorPos.y &&
-				       CharY + LineSpacing > CursorPos.y) ||
+				       CursorPos.y >= CharY - pCursor->m_AlignedFontSize &&
+				       CursorPos.y < CharY + pCursor->m_AlignedLineSpacing) ||
 			       (CheckOuter &&
-				       CharY - LineSpacing <= CursorPos.y);
+				       CursorPos.y >= CharY + pCursor->m_AlignedLineSpacing);
 		};
 		const auto &&CheckSelectionEnd = [&](bool CheckOuter, vec2 CursorPos, int &SelectionChar, bool &SelectionUsedCase, float CharX, float CharWidth, float CharY) {
-			if(SelectionStarted && !SelectionUsedCase)
+			if(SelectionStarted && !SelectionUsedCase &&
+				CheckOutsideChar(CheckOuter, CursorPos, CharX, CharWidth, CharY))
 			{
-				if(CheckOutsideChar(CheckOuter, CursorPos, CharX, CharWidth, CharY))
-				{
-					SelectionChar = pCursor->m_GlyphCount;
-					SelectionStarted = !SelectionStarted;
-					SelectionUsedCase = true;
-				}
+				SelectionChar = pCursor->m_GlyphCount;
+				SelectionStarted = !SelectionStarted;
+				SelectionUsedCase = true;
 			}
 		};
 
@@ -1583,7 +1584,7 @@ class CTextRender : public IEngineTextRender
 				return false;
 
 			DrawX = pCursor->m_StartX;
-			DrawY += pCursor->m_AlignedFontSize + pCursor->m_LineSpacing;
+			DrawY += pCursor->m_AlignedFontSize + pCursor->m_AlignedLineSpacing;
 			if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
 			{
 				DrawX = round_to_int(DrawX * FakeToScreen.x) / FakeToScreen.x; // realign
@@ -1611,7 +1612,6 @@ class CTextRender : public IEngineTextRender
 		bool HasCursor = false;
 
 		const SGlyph *pLastGlyph = nullptr;
-		bool GotNewLine = false;
 		bool GotNewLineLast = false;
 
 		int ColorOption = 0;
@@ -1753,10 +1753,18 @@ class CTextRender : public IEngineTextRender
 					if(ColorOption < (int)pCursor->m_vColorSplits.size())
 					{
 						STextColorSplit &Split = pCursor->m_vColorSplits.at(ColorOption);
-						if(PrevCharCount >= Split.m_CharIndex && PrevCharCount < Split.m_CharIndex + Split.m_Length)
+						if(PrevCharCount >= Split.m_CharIndex && (Split.m_Length == -1 || PrevCharCount < Split.m_CharIndex + Split.m_Length))
 							Color = Split.m_Color;
-						if(PrevCharCount >= (Split.m_CharIndex + Split.m_Length - 1))
+						if(Split.m_Length != -1 && PrevCharCount >= (Split.m_CharIndex + Split.m_Length - 1))
+						{
 							ColorOption++;
+							if(ColorOption < (int)pCursor->m_vColorSplits.size())
+							{ // Handle splits that are
+								Split = pCursor->m_vColorSplits.at(ColorOption);
+								if(PrevCharCount >= Split.m_CharIndex)
+									Color = Split.m_Color;
+							}
+						}
 					}
 
 					// don't add text that isn't drawn, the color overwrite is used for that
@@ -1830,13 +1838,13 @@ class CTextRender : public IEngineTextRender
 					}
 					if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
 					{
-						if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
+						if(pCursor->m_GlyphCount == pCursor->m_SelectionStart)
 						{
 							SelectionStarted = !SelectionStarted;
 							SelectionStartChar = pCursor->m_GlyphCount;
 							SelectionUsedPress = true;
 						}
-						if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
+						if(pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
 						{
 							SelectionStarted = !SelectionStarted;
 							SelectionEndChar = pCursor->m_GlyphCount;
@@ -1846,7 +1854,7 @@ class CTextRender : public IEngineTextRender
 
 					if(pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE)
 					{
-						if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
+						if(pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
 						{
 							HasCursor = true;
 							aCursorQuads[0] = IGraphics::CQuadItem(SelX - CursorOuterInnerDiff, DrawY, CursorOuterWidth, pCursor->m_AlignedFontSize);
@@ -1866,7 +1874,18 @@ class CTextRender : public IEngineTextRender
 
 					if(SelectionStarted && IsRendered)
 					{
-						vSelectionQuads.emplace_back(SelX, DrawY + (1.0f - pCursor->m_SelectionHeightFactor) * pCursor->m_AlignedFontSize, SelWidth, pCursor->m_SelectionHeightFactor * pCursor->m_AlignedFontSize);
+						if(!vSelectionQuads.empty() && SelectionQuadLine == LineCount)
+						{
+							vSelectionQuads.back().m_Width += SelWidth;
+						}
+						else
+						{
+							const float SelectionHeight = pCursor->m_AlignedFontSize + pCursor->m_AlignedLineSpacing;
+							const float SelectionY = DrawY + (1.0f - pCursor->m_SelectionHeightFactor) * SelectionHeight;
+							const float ScaledSelectionHeight = pCursor->m_SelectionHeightFactor * SelectionHeight;
+							vSelectionQuads.emplace_back(SelX, SelectionY, SelWidth, ScaledSelectionHeight);
+							SelectionQuadLine = LineCount;
+						}
 					}
 
 					LastSelX = SelX;
@@ -1882,7 +1901,6 @@ class CTextRender : public IEngineTextRender
 			{
 				if(!StartNewLine())
 					break;
-				GotNewLine = true;
 				GotNewLineLast = true;
 			}
 			else
@@ -1918,13 +1936,13 @@ class CTextRender : public IEngineTextRender
 		}
 		else if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
 		{
-			if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
+			if(pCursor->m_GlyphCount == pCursor->m_SelectionStart)
 			{
 				SelectionStarted = !SelectionStarted;
 				SelectionStartChar = pCursor->m_GlyphCount;
 				SelectionUsedPress = true;
 			}
-			if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
+			if(pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
 			{
 				SelectionStarted = !SelectionStarted;
 				SelectionEndChar = pCursor->m_GlyphCount;
@@ -1939,7 +1957,7 @@ class CTextRender : public IEngineTextRender
 				pCursor->m_CursorCharacter = pCursor->m_GlyphCount;
 			}
 
-			if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
+			if(pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
 			{
 				HasCursor = true;
 				aCursorQuads[0] = IGraphics::CQuadItem((LastSelX + LastSelWidth) - CursorOuterInnerDiff, DrawY, CursorOuterWidth, pCursor->m_AlignedFontSize);
@@ -1955,9 +1973,9 @@ class CTextRender : public IEngineTextRender
 			if(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex == -1)
 				TextContainer.m_StringInfo.m_SelectionQuadContainerIndex = Graphics()->CreateQuadContainer(false);
 			if(HasCursor)
-				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, aCursorQuads, 2);
+				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, aCursorQuads, std::size(aCursorQuads));
 			if(HasSelection)
-				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, vSelectionQuads.data(), (int)vSelectionQuads.size());
+				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, vSelectionQuads.data(), vSelectionQuads.size());
 			Graphics()->QuadContainerUpload(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex);
 
 			TextContainer.m_HasCursor = HasCursor;
@@ -1978,11 +1996,9 @@ class CTextRender : public IEngineTextRender
 
 		// even if no text is drawn the cursor position will be adjusted
 		pCursor->m_X = DrawX;
+		pCursor->m_Y = DrawY;
 		pCursor->m_LineCount = LineCount;
 
-		if(GotNewLine)
-			pCursor->m_Y = DrawY;
-
 		TextContainer.m_BoundingBox = pCursor->BoundingBox();
 	}
 
@@ -2161,9 +2177,9 @@ class CTextRender : public IEngineTextRender
 		return TextContainer.m_BoundingBox;
 	}
 
-	void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) override
+	void UploadEntityLayerText(const CImageInfo &TextImage, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) override
 	{
-		m_pGlyphMap->UploadEntityLayerText(pTexBuff, PixelSize, TexWidth, TexHeight, TexSubWidth, TexSubHeight, pText, Length, x, y, FontSize);
+		m_pGlyphMap->UploadEntityLayerText(TextImage, TexSubWidth, TexSubHeight, pText, Length, x, y, FontSize);
 	}
 
 	int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth) const override
diff --git a/src/engine/client/updater.cpp b/src/engine/client/updater.cpp
index 3a6b6e389b..7829567858 100644
--- a/src/engine/client/updater.cpp
+++ b/src/engine/client/updater.cpp
@@ -1,7 +1,6 @@
-#include "updater.h"
-
 #include <base/system.h>
 
+#include "updater.h"
 #include <engine/client.h>
 #include <engine/engine.h>
 #include <engine/external/json-parser/json.h>
@@ -13,7 +12,6 @@
 
 #include <cstdlib> // system
 
-using std::map;
 using std::string;
 
 class CUpdaterFetchTask : public CHttpRequest
@@ -25,7 +23,7 @@ class CUpdaterFetchTask : public CHttpRequest
 	void OnProgress() override;
 
 protected:
-	int OnCompletion(int State) override;
+	void OnCompletion(EHttpState State) override;
 
 public:
 	CUpdaterFetchTask(CUpdater *pUpdater, const char *pFile, const char *pDestPath);
@@ -57,14 +55,11 @@ CUpdaterFetchTask::CUpdaterFetchTask(CUpdater *pUpdater, const char *pFile, cons
 void CUpdaterFetchTask::OnProgress()
 {
 	CLockScope ls(m_pUpdater->m_Lock);
-	str_copy(m_pUpdater->m_aStatus, Dest());
 	m_pUpdater->m_Percent = Progress();
 }
 
-int CUpdaterFetchTask::OnCompletion(int State)
+void CUpdaterFetchTask::OnCompletion(EHttpState State)
 {
-	State = CHttpRequest::OnCompletion(State);
-
 	const char *pFileName = 0;
 	for(const char *pPath = Dest(); *pPath; pPath++)
 		if(*pPath == '/')
@@ -72,48 +67,44 @@ int CUpdaterFetchTask::OnCompletion(int State)
 	pFileName = pFileName ? pFileName : Dest();
 	if(!str_comp(pFileName, "update.json"))
 	{
-		if(State == HTTP_DONE)
+		if(State == EHttpState::DONE)
 			m_pUpdater->SetCurrentState(IUpdater::GOT_MANIFEST);
-		else if(State == HTTP_ERROR)
+		else if(State == EHttpState::ERROR)
 			m_pUpdater->SetCurrentState(IUpdater::FAIL);
 	}
-	else if(!str_comp(pFileName, m_pUpdater->m_aLastFile))
-	{
-		if(State == HTTP_DONE)
-			m_pUpdater->SetCurrentState(IUpdater::MOVE_FILES);
-		else if(State == HTTP_ERROR)
-			m_pUpdater->SetCurrentState(IUpdater::FAIL);
-	}
-
-	return State;
 }
 
 CUpdater::CUpdater()
 {
-	m_pClient = NULL;
-	m_pStorage = NULL;
-	m_pEngine = NULL;
+	m_pClient = nullptr;
+	m_pStorage = nullptr;
+	m_pEngine = nullptr;
+	m_pHttp = nullptr;
 	m_State = CLEAN;
 	m_Percent = 0;
+	m_pCurrentTask = nullptr;
+
+	m_ClientUpdate = m_ServerUpdate = m_ClientFetched = m_ServerFetched = false;
 
 	IStorage::FormatTmpPath(m_aClientExecTmp, sizeof(m_aClientExecTmp), CLIENT_EXEC);
 	IStorage::FormatTmpPath(m_aServerExecTmp, sizeof(m_aServerExecTmp), SERVER_EXEC);
 }
 
-void CUpdater::Init()
+void CUpdater::Init(CHttp *pHttp)
 {
 	m_pClient = Kernel()->RequestInterface<IClient>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pHttp = pHttp;
 }
 
-void CUpdater::SetCurrentState(int NewState)
+void CUpdater::SetCurrentState(EUpdaterState NewState)
 {
 	CLockScope ls(m_Lock);
 	m_State = NewState;
 }
 
-int CUpdater::GetCurrentState()
+IUpdater::EUpdaterState CUpdater::GetCurrentState()
 {
 	CLockScope ls(m_Lock);
 	return m_State;
@@ -133,7 +124,10 @@ int CUpdater::GetCurrentPercent()
 
 void CUpdater::FetchFile(const char *pFile, const char *pDestPath)
 {
-	m_pEngine->AddJob(std::make_shared<CUpdaterFetchTask>(this, pFile, pDestPath));
+	CLockScope ls(m_Lock);
+	m_pCurrentTask = std::make_shared<CUpdaterFetchTask>(this, pFile, pDestPath);
+	str_copy(m_aStatus, m_pCurrentTask->Dest());
+	m_pHttp->Run(m_pCurrentTask);
 }
 
 bool CUpdater::MoveFile(const char *pFile)
@@ -170,11 +164,14 @@ bool CUpdater::MoveFile(const char *pFile)
 
 void CUpdater::Update()
 {
-	switch(m_State)
+	switch(GetCurrentState())
 	{
 	case IUpdater::GOT_MANIFEST:
 		PerformUpdate();
 		break;
+	case IUpdater::DOWNLOADING:
+		RunningUpdate();
+		break;
 	case IUpdater::MOVE_FILES:
 		CommitUpdate();
 		break;
@@ -185,7 +182,7 @@ void CUpdater::Update()
 
 void CUpdater::AddFileJob(const char *pFile, bool Job)
 {
-	m_FileJobs[string(pFile)] = Job;
+	m_FileJobs.emplace_front(pFile, Job);
 }
 
 bool CUpdater::ReplaceClient()
@@ -274,37 +271,44 @@ void CUpdater::ParseUpdate()
 				break;
 		}
 	}
+	json_value_free(pVersions);
 }
 
 void CUpdater::InitiateUpdate()
 {
-	m_State = GETTING_MANIFEST;
+	SetCurrentState(IUpdater::GETTING_MANIFEST);
 	FetchFile("update.json");
 }
 
 void CUpdater::PerformUpdate()
 {
-	m_State = PARSING_UPDATE;
+	SetCurrentState(IUpdater::PARSING_UPDATE);
 	dbg_msg("updater", "parsing update.json");
 	ParseUpdate();
-	m_State = DOWNLOADING;
+	m_CurrentJob = m_FileJobs.begin();
+	SetCurrentState(IUpdater::DOWNLOADING);
+}
 
-	const char *pLastFile;
-	pLastFile = "";
-	for(map<string, bool>::reverse_iterator it = m_FileJobs.rbegin(); it != m_FileJobs.rend(); ++it)
+void CUpdater::RunningUpdate()
+{
+	if(m_pCurrentTask)
 	{
-		if(it->second)
+		if(!m_pCurrentTask->Done())
+		{
+			return;
+		}
+		else if(m_pCurrentTask->State() == EHttpState::ERROR || m_pCurrentTask->State() == EHttpState::ABORTED)
 		{
-			pLastFile = it->first.c_str();
-			break;
+			SetCurrentState(IUpdater::FAIL);
 		}
 	}
 
-	for(auto &FileJob : m_FileJobs)
+	if(m_CurrentJob != m_FileJobs.end())
 	{
-		if(FileJob.second)
+		auto &Job = *m_CurrentJob;
+		if(Job.second)
 		{
-			const char *pFile = FileJob.first.c_str();
+			const char *pFile = Job.first.c_str();
 			size_t len = str_length(pFile);
 			if(!str_comp_nocase(pFile + len - 4, ".dll"))
 			{
@@ -332,24 +336,32 @@ void CUpdater::PerformUpdate()
 			{
 				FetchFile(pFile);
 			}
-			pLastFile = pFile;
 		}
 		else
-			m_pStorage->RemoveBinaryFile(FileJob.first.c_str());
-	}
+		{
+			m_pStorage->RemoveBinaryFile(Job.first.c_str());
+		}
 
-	if(m_ServerUpdate)
-	{
-		FetchFile(PLAT_SERVER_DOWN, m_aServerExecTmp);
-		pLastFile = m_aServerExecTmp;
+		m_CurrentJob++;
 	}
-	if(m_ClientUpdate)
+	else
 	{
-		FetchFile(PLAT_CLIENT_DOWN, m_aClientExecTmp);
-		pLastFile = m_aClientExecTmp;
-	}
+		if(m_ServerUpdate && !m_ServerFetched)
+		{
+			FetchFile(PLAT_SERVER_DOWN, m_aServerExecTmp);
+			m_ServerFetched = true;
+			return;
+		}
 
-	str_copy(m_aLastFile, pLastFile);
+		if(m_ClientUpdate && !m_ClientFetched)
+		{
+			FetchFile(PLAT_CLIENT_DOWN, m_aClientExecTmp);
+			m_ClientFetched = true;
+			return;
+		}
+
+		SetCurrentState(IUpdater::MOVE_FILES);
+	}
 }
 
 void CUpdater::CommitUpdate()
@@ -365,9 +377,9 @@ void CUpdater::CommitUpdate()
 	if(m_ServerUpdate)
 		Success &= ReplaceServer();
 	if(!Success)
-		m_State = FAIL;
+		SetCurrentState(IUpdater::FAIL);
 	else if(m_pClient->State() == IClient::STATE_ONLINE || m_pClient->EditorHasUnsavedData())
-		m_State = NEED_RESTART;
+		SetCurrentState(IUpdater::NEED_RESTART);
 	else
 	{
 		m_pClient->Restart();
diff --git a/src/engine/client/updater.h b/src/engine/client/updater.h
index 0b5c71c1d5..4127ca5e3c 100644
--- a/src/engine/client/updater.h
+++ b/src/engine/client/updater.h
@@ -1,11 +1,13 @@
 #ifndef ENGINE_CLIENT_UPDATER_H
 #define ENGINE_CLIENT_UPDATER_H
 
+#include <base/detect.h>
 #include <base/lock.h>
 
 #include <engine/updater.h>
 
-#include <map>
+#include <forward_list>
+#include <memory>
 #include <string>
 
 #define CLIENT_EXEC "DDNet"
@@ -24,6 +26,9 @@
 #define PLAT_NAME CONF_PLATFORM_STRING "-unsupported"
 #endif
 #else
+#if defined(AUTOUPDATE)
+#error Compiling with autoupdater on an unsupported platform
+#endif
 #define PLAT_EXT ""
 #define PLAT_NAME "unsupported-unsupported"
 #endif
@@ -34,6 +39,8 @@
 #define PLAT_CLIENT_EXEC CLIENT_EXEC PLAT_EXT
 #define PLAT_SERVER_EXEC SERVER_EXEC PLAT_EXT
 
+class CUpdaterFetchTask;
+
 class CUpdater : public IUpdater
 {
 	friend class CUpdaterFetchTask;
@@ -41,44 +48,50 @@ class CUpdater : public IUpdater
 	class IClient *m_pClient;
 	class IStorage *m_pStorage;
 	class IEngine *m_pEngine;
+	class CHttp *m_pHttp;
 
 	CLock m_Lock;
 
-	int m_State;
+	EUpdaterState m_State GUARDED_BY(m_Lock);
 	char m_aStatus[256] GUARDED_BY(m_Lock);
 	int m_Percent GUARDED_BY(m_Lock);
-	char m_aLastFile[256];
 	char m_aClientExecTmp[64];
 	char m_aServerExecTmp[64];
 
+	std::forward_list<std::pair<std::string, bool>> m_FileJobs;
+	std::shared_ptr<CUpdaterFetchTask> m_pCurrentTask;
+	decltype(m_FileJobs)::iterator m_CurrentJob;
+
 	bool m_ClientUpdate;
 	bool m_ServerUpdate;
 
-	std::map<std::string, bool> m_FileJobs;
+	bool m_ClientFetched;
+	bool m_ServerFetched;
 
 	void AddFileJob(const char *pFile, bool Job);
-	void FetchFile(const char *pFile, const char *pDestPath = nullptr);
+	void FetchFile(const char *pFile, const char *pDestPath = nullptr) REQUIRES(!m_Lock);
 	bool MoveFile(const char *pFile);
 
-	void ParseUpdate();
-	void PerformUpdate();
-	void CommitUpdate();
+	void ParseUpdate() REQUIRES(!m_Lock);
+	void PerformUpdate() REQUIRES(!m_Lock);
+	void RunningUpdate() REQUIRES(!m_Lock);
+	void CommitUpdate() REQUIRES(!m_Lock);
 
 	bool ReplaceClient();
 	bool ReplaceServer();
 
-	void SetCurrentState(int NewState) REQUIRES(!m_Lock);
+	void SetCurrentState(EUpdaterState NewState) REQUIRES(!m_Lock);
 
 public:
 	CUpdater();
 
-	int GetCurrentState() override REQUIRES(!m_Lock);
+	EUpdaterState GetCurrentState() override REQUIRES(!m_Lock);
 	void GetCurrentFile(char *pBuf, int BufSize) override REQUIRES(!m_Lock);
 	int GetCurrentPercent() override REQUIRES(!m_Lock);
 
-	void InitiateUpdate() override;
-	void Init();
-	void Update() override;
+	void InitiateUpdate() REQUIRES(!m_Lock) override;
+	void Init(CHttp *pHttp);
+	void Update() REQUIRES(!m_Lock) override;
 };
 
 #endif
diff --git a/src/engine/client/video.cpp b/src/engine/client/video.cpp
index 62eeaf8598..d5b914fce8 100644
--- a/src/engine/client/video.cpp
+++ b/src/engine/client/video.cpp
@@ -2,7 +2,9 @@
 
 #include "video.h"
 
-#include <engine/client/graphics_threaded.h>
+#include <base/log.h>
+
+#include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/sound.h>
 #include <engine/storage.h>
@@ -34,17 +36,57 @@ using namespace std::chrono_literals;
 const size_t FORMAT_GL_NCHANNELS = 4;
 CLock g_WriteLock;
 
-CVideo::CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName) :
+static LEVEL AvLevelToLogLevel(int Level)
+{
+	switch(Level)
+	{
+	case AV_LOG_PANIC:
+	case AV_LOG_FATAL:
+	case AV_LOG_ERROR:
+		return LEVEL_ERROR;
+	case AV_LOG_WARNING:
+		return LEVEL_WARN;
+	case AV_LOG_INFO:
+		return LEVEL_INFO;
+	case AV_LOG_VERBOSE:
+	case AV_LOG_DEBUG:
+		return LEVEL_DEBUG;
+	case AV_LOG_TRACE:
+		return LEVEL_TRACE;
+	default:
+		dbg_assert(false, "invalid log level");
+		dbg_break();
+	}
+}
+
+void AvLogCallback(void *pUser, int Level, const char *pFormat, va_list VarArgs)
+	GNUC_ATTRIBUTE((format(printf, 3, 0)));
+
+void AvLogCallback(void *pUser, int Level, const char *pFormat, va_list VarArgs)
+{
+	const LEVEL LogLevel = AvLevelToLogLevel(Level);
+	if(LogLevel <= LEVEL_INFO)
+	{
+		log_log_v(LogLevel, "videorecorder/libav", pFormat, VarArgs);
+	}
+}
+
+void CVideo::Init()
+{
+	av_log_set_callback(AvLogCallback);
+}
+
+CVideo::CVideo(IGraphics *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName) :
 	m_pGraphics(pGraphics),
 	m_pStorage(pStorage),
 	m_pSound(pSound)
 {
-	m_pFormatContext = 0;
-	m_pFormat = 0;
-	m_pOptDict = 0;
+	m_pFormatContext = nullptr;
+	m_pFormat = nullptr;
+	m_pOptDict = nullptr;
 
-	m_pVideoCodec = 0;
-	m_pAudioCodec = 0;
+	m_pVideoCodec = nullptr;
+	m_pAudioCodec = nullptr;
 
 	m_Width = Width;
 	m_Height = Height;
@@ -54,12 +96,13 @@ CVideo::CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage
 
 	m_Recording = false;
 	m_Started = false;
+	m_Stopped = false;
 	m_ProcessingVideoFrame = 0;
 	m_ProcessingAudioFrame = 0;
 
-	m_HasAudio = g_Config.m_ClVideoSndEnable;
+	m_HasAudio = m_pSound->IsSoundEnabled() && g_Config.m_ClVideoSndEnable;
 
-	dbg_assert(ms_pCurrentVideo == 0, "ms_pCurrentVideo is NOT set to NULL while creating a new Video.");
+	dbg_assert(ms_pCurrentVideo == nullptr, "ms_pCurrentVideo is NOT set to nullptr while creating a new Video.");
 
 	ms_TickTime = time_freq() / m_FPS;
 	ms_pCurrentVideo = this;
@@ -67,43 +110,38 @@ CVideo::CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage
 
 CVideo::~CVideo()
 {
-	ms_pCurrentVideo = 0;
+	ms_pCurrentVideo = nullptr;
 }
 
-void CVideo::Start()
+bool CVideo::Start()
 {
+	dbg_assert(!m_Started, "Already started");
+
 	// wait for the graphic thread to idle
 	m_pGraphics->WaitForIdle();
 
 	m_AudioStream = {};
 	m_VideoStream = {};
 
-	char aDate[20];
-	str_timestamp(aDate, sizeof(aDate));
-	char aBuf[256];
-	if(str_length(m_aName) != 0)
-		str_format(aBuf, sizeof(aBuf), "videos/%s", m_aName);
-	else
-		str_format(aBuf, sizeof(aBuf), "videos/%s.mp4", aDate);
-
-	char aWholePath[1024];
-	IOHANDLE File = m_pStorage->OpenFile(aBuf, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath));
-
+	char aWholePath[IO_MAX_PATH_LENGTH];
+	IOHANDLE File = m_pStorage->OpenFile(m_aName, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath));
 	if(File)
 	{
 		io_close(File);
 	}
 	else
 	{
-		dbg_msg("video_recorder", "Failed to open file for recoding video.");
-		return;
+		log_error("videorecorder", "Could not open file '%s'", aWholePath);
+		return false;
 	}
-	avformat_alloc_output_context2(&m_pFormatContext, 0, "mp4", aWholePath);
 
-	if(!m_pFormatContext)
+	const int FormatAllocResult = avformat_alloc_output_context2(&m_pFormatContext, nullptr, "mp4", aWholePath);
+	if(FormatAllocResult < 0 || !m_pFormatContext)
 	{
-		dbg_msg("video_recorder", "Failed to create formatcontext for recoding video.");
-		return;
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(FormatAllocResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not create format context: %s", aError);
+		return false;
 	}
 
 	m_pFormat = m_pFormatContext->oformat;
@@ -122,115 +160,118 @@ void CVideo::Start()
 	m_CurAudioThreadIndex = 0;
 
 	size_t GLNVals = FORMAT_GL_NCHANNELS * m_Width * m_Height;
-	m_vPixelHelper.resize(m_VideoThreads);
+	m_vVideoBuffers.resize(m_VideoThreads);
 	for(size_t i = 0; i < m_VideoThreads; ++i)
 	{
-		m_vPixelHelper[i].resize(GLNVals * sizeof(uint8_t));
+		m_vVideoBuffers[i].m_vBuffer.resize(GLNVals * sizeof(uint8_t));
 	}
 
-	m_vBuffer.resize(m_AudioThreads);
+	m_vAudioBuffers.resize(m_AudioThreads);
 
 	/* Add the audio and video streams using the default format codecs
 	 * and initialize the codecs. */
 	if(m_pFormat->video_codec != AV_CODEC_ID_NONE)
 	{
 		if(!AddStream(&m_VideoStream, m_pFormatContext, &m_pVideoCodec, m_pFormat->video_codec))
-			return;
+			return false;
 	}
 	else
 	{
-		dbg_msg("video_recorder", "Failed to add VideoStream for recoding video.");
+		log_error("videorecorder", "Could not determine default video stream codec");
+		return false;
 	}
 
-	if(m_HasAudio && m_pFormat->audio_codec != AV_CODEC_ID_NONE)
-	{
-		if(!AddStream(&m_AudioStream, m_pFormatContext, &m_pAudioCodec, m_pFormat->audio_codec))
-			return;
-	}
-	else
+	if(m_HasAudio)
 	{
-		dbg_msg("video_recorder", "No audio.");
+		if(m_pFormat->audio_codec != AV_CODEC_ID_NONE)
+		{
+			if(!AddStream(&m_AudioStream, m_pFormatContext, &m_pAudioCodec, m_pFormat->audio_codec))
+				return false;
+		}
+		else
+		{
+			log_error("videorecorder", "Could not determine default audio stream codec");
+			return false;
+		}
 	}
 
-	m_vVideoThreads.resize(m_VideoThreads);
+	m_vpVideoThreads.resize(m_VideoThreads);
 	for(size_t i = 0; i < m_VideoThreads; ++i)
 	{
-		m_vVideoThreads[i] = std::make_unique<SVideoRecorderThread>();
+		m_vpVideoThreads[i] = std::make_unique<CVideoRecorderThread>();
 	}
 	for(size_t i = 0; i < m_VideoThreads; ++i)
 	{
-		std::unique_lock<std::mutex> Lock(m_vVideoThreads[i]->m_Mutex);
-		m_vVideoThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunVideoThread(i == 0 ? (m_VideoThreads - 1) : (i - 1), i); });
-		m_vVideoThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vVideoThreads[i]->m_Started; });
+		std::unique_lock<std::mutex> Lock(m_vpVideoThreads[i]->m_Mutex);
+		m_vpVideoThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunVideoThread(i == 0 ? (m_VideoThreads - 1) : (i - 1), i); });
+		m_vpVideoThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vpVideoThreads[i]->m_Started; });
 	}
 
-	m_vAudioThreads.resize(m_AudioThreads);
+	m_vpAudioThreads.resize(m_AudioThreads);
 	for(size_t i = 0; i < m_AudioThreads; ++i)
 	{
-		m_vAudioThreads[i] = std::make_unique<SAudioRecorderThread>();
+		m_vpAudioThreads[i] = std::make_unique<CAudioRecorderThread>();
 	}
 	for(size_t i = 0; i < m_AudioThreads; ++i)
 	{
-		std::unique_lock<std::mutex> Lock(m_vAudioThreads[i]->m_Mutex);
-		m_vAudioThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunAudioThread(i == 0 ? (m_AudioThreads - 1) : (i - 1), i); });
-		m_vAudioThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vAudioThreads[i]->m_Started; });
+		std::unique_lock<std::mutex> Lock(m_vpAudioThreads[i]->m_Mutex);
+		m_vpAudioThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunAudioThread(i == 0 ? (m_AudioThreads - 1) : (i - 1), i); });
+		m_vpAudioThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vpAudioThreads[i]->m_Started; });
 	}
 
 	/* Now that all the parameters are set, we can open the audio and
 	 * video codecs and allocate the necessary encode buffers. */
 	if(!OpenVideo())
-		return;
-
-	if(m_HasAudio)
-		if(!OpenAudio())
-			return;
+		return false;
 
-	// TODO: remove/comment:
-	av_dump_format(m_pFormatContext, 0, aWholePath, 1);
+	if(m_HasAudio && !OpenAudio())
+		return false;
 
 	/* open the output file, if needed */
 	if(!(m_pFormat->flags & AVFMT_NOFILE))
 	{
-		int Ret = avio_open(&m_pFormatContext->pb, aWholePath, AVIO_FLAG_WRITE);
-		if(Ret < 0)
+		const int OpenResult = avio_open(&m_pFormatContext->pb, aWholePath, AVIO_FLAG_WRITE);
+		if(OpenResult < 0)
 		{
 			char aError[AV_ERROR_MAX_STRING_SIZE];
-			av_strerror(Ret, aError, sizeof(aError));
-			dbg_msg("video_recorder", "Could not open '%s': %s", aWholePath, aError);
-			return;
+			av_strerror(OpenResult, aError, sizeof(aError));
+			log_error("videorecorder", "Could not open file '%s': %s", aWholePath, aError);
+			return false;
 		}
 	}
 
-	m_VideoStream.m_vpSwsCtxs.reserve(m_VideoThreads);
+	m_VideoStream.m_vpSwsContexts.reserve(m_VideoThreads);
 
 	for(size_t i = 0; i < m_VideoThreads; ++i)
 	{
-		if(m_VideoStream.m_vpSwsCtxs.size() <= i)
-			m_VideoStream.m_vpSwsCtxs.emplace_back(nullptr);
+		if(m_VideoStream.m_vpSwsContexts.size() <= i)
+			m_VideoStream.m_vpSwsContexts.emplace_back(nullptr);
 
-		if(!m_VideoStream.m_vpSwsCtxs[i])
+		if(!m_VideoStream.m_vpSwsContexts[i])
 		{
-			m_VideoStream.m_vpSwsCtxs[i] = sws_getCachedContext(
-				m_VideoStream.m_vpSwsCtxs[i],
-				m_VideoStream.pEnc->width, m_VideoStream.pEnc->height, AV_PIX_FMT_RGBA,
-				m_VideoStream.pEnc->width, m_VideoStream.pEnc->height, AV_PIX_FMT_YUV420P,
+			m_VideoStream.m_vpSwsContexts[i] = sws_getCachedContext(
+				m_VideoStream.m_vpSwsContexts[i],
+				m_VideoStream.m_pCodecContext->width, m_VideoStream.m_pCodecContext->height, AV_PIX_FMT_RGBA,
+				m_VideoStream.m_pCodecContext->width, m_VideoStream.m_pCodecContext->height, AV_PIX_FMT_YUV420P,
 				0, 0, 0, 0);
 		}
 	}
 
 	/* Write the stream header, if any. */
-	int Ret = avformat_write_header(m_pFormatContext, &m_pOptDict);
-	if(Ret < 0)
+	const int WriteHeaderResult = avformat_write_header(m_pFormatContext, &m_pOptDict);
+	if(WriteHeaderResult < 0)
 	{
 		char aError[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror(Ret, aError, sizeof(aError));
-		dbg_msg("video_recorder", "Error occurred when opening output file: %s", aError);
-		return;
+		av_strerror(WriteHeaderResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not write header: %s", aError);
+		return false;
 	}
+
 	m_Recording = true;
 	m_Started = true;
+	m_Stopped = false;
 	ms_Time = time_get();
-	m_Vframe = 0;
+	return true;
 }
 
 void CVideo::Pause(bool Pause)
@@ -241,31 +282,34 @@ void CVideo::Pause(bool Pause)
 
 void CVideo::Stop()
 {
+	dbg_assert(!m_Stopped, "Already stopped");
+	m_Stopped = true;
+
 	m_pGraphics->WaitForIdle();
 
-	for(size_t i = 0; i < m_VideoThreads; ++i)
+	for(auto &pVideoThread : m_vpVideoThreads)
 	{
 		{
-			std::unique_lock<std::mutex> Lock(m_vVideoThreads[i]->m_Mutex);
-			m_vVideoThreads[i]->m_Finished = true;
-			m_vVideoThreads[i]->m_Cond.notify_all();
+			std::unique_lock<std::mutex> Lock(pVideoThread->m_Mutex);
+			pVideoThread->m_Finished = true;
+			pVideoThread->m_Cond.notify_all();
 		}
 
-		m_vVideoThreads[i]->m_Thread.join();
+		pVideoThread->m_Thread.join();
 	}
-	m_vVideoThreads.clear();
+	m_vpVideoThreads.clear();
 
-	for(size_t i = 0; i < m_AudioThreads; ++i)
+	for(auto &pAudioThread : m_vpAudioThreads)
 	{
 		{
-			std::unique_lock<std::mutex> Lock(m_vAudioThreads[i]->m_Mutex);
-			m_vAudioThreads[i]->m_Finished = true;
-			m_vAudioThreads[i]->m_Cond.notify_all();
+			std::unique_lock<std::mutex> Lock(pAudioThread->m_Mutex);
+			pAudioThread->m_Finished = true;
+			pAudioThread->m_Cond.notify_all();
 		}
 
-		m_vAudioThreads[i]->m_Thread.join();
+		pAudioThread->m_Thread.join();
 	}
-	m_vAudioThreads.clear();
+	m_vpAudioThreads.clear();
 
 	while(m_ProcessingVideoFrame > 0 || m_ProcessingAudioFrame > 0)
 		std::this_thread::sleep_for(10us);
@@ -277,19 +321,21 @@ void CVideo::Stop()
 	if(m_HasAudio)
 		FinishFrames(&m_AudioStream);
 
-	av_write_trailer(m_pFormatContext);
+	if(m_pFormatContext && m_Started)
+		av_write_trailer(m_pFormatContext);
 
 	CloseStream(&m_VideoStream);
 
 	if(m_HasAudio)
 		CloseStream(&m_AudioStream);
-	//fclose(m_dbgfile);
-
-	if(!(m_pFormat->flags & AVFMT_NOFILE))
-		avio_closep(&m_pFormatContext->pb);
 
 	if(m_pFormatContext)
+	{
+		if(!(m_pFormat->flags & AVFMT_NOFILE))
+			avio_closep(&m_pFormatContext->pb);
+
 		avformat_free_context(m_pFormatContext);
+	}
 
 	ISound *volatile pSound = m_pSound;
 
@@ -302,11 +348,8 @@ void CVideo::NextVideoFrameThread()
 {
 	if(m_Recording)
 	{
-		// #ifdef CONF_PLATFORM_MACOS
-		// 	CAutoreleasePool AutoreleasePool;
-		// #endif
-		m_VSeq += 1;
-		if(m_VSeq >= 2)
+		m_VideoFrameIndex += 1;
+		if(m_VideoFrameIndex >= 2)
 		{
 			m_ProcessingVideoFrame.fetch_add(1);
 
@@ -315,9 +358,8 @@ void CVideo::NextVideoFrameThread()
 				NextVideoThreadIndex = 0;
 
 			// always wait for the next video thread too, to prevent a dead lock
-
 			{
-				auto *pVideoThread = m_vVideoThreads[NextVideoThreadIndex].get();
+				auto *pVideoThread = m_vpVideoThreads[NextVideoThreadIndex].get();
 				std::unique_lock<std::mutex> Lock(pVideoThread->m_Mutex);
 
 				if(pVideoThread->m_HasVideoFrame)
@@ -326,11 +368,9 @@ void CVideo::NextVideoFrameThread()
 				}
 			}
 
-			//dbg_msg("video_recorder", "vframe: %d", m_VideoStream.pEnc->FRAME_NUM);
-
 			// after reading the graphic libraries' frame buffer, go threaded
 			{
-				auto *pVideoThread = m_vVideoThreads[m_CurVideoThreadIndex].get();
+				auto *pVideoThread = m_vpVideoThreads[m_CurVideoThreadIndex].get();
 				std::unique_lock<std::mutex> Lock(pVideoThread->m_Mutex);
 
 				if(pVideoThread->m_HasVideoFrame)
@@ -338,12 +378,12 @@ void CVideo::NextVideoFrameThread()
 					pVideoThread->m_Cond.wait(Lock, [&pVideoThread]() -> bool { return !pVideoThread->m_HasVideoFrame; });
 				}
 
-				ReadRGBFromGL(m_CurVideoThreadIndex);
+				UpdateVideoBufferFromGraphics(m_CurVideoThreadIndex);
 
 				pVideoThread->m_HasVideoFrame = true;
 				{
 					std::unique_lock<std::mutex> LockParent(pVideoThread->m_VideoFillMutex);
-					pVideoThread->m_VideoFrameToFill = m_VSeq;
+					pVideoThread->m_VideoFrameToFill = m_VideoFrameIndex;
 				}
 				pVideoThread->m_Cond.notify_all();
 			}
@@ -352,9 +392,6 @@ void CVideo::NextVideoFrameThread()
 			if(m_CurVideoThreadIndex == m_VideoThreads)
 				m_CurVideoThreadIndex = 0;
 		}
-
-		// sync_barrier();
-		// m_Semaphore.signal();
 	}
 }
 
@@ -364,7 +401,6 @@ void CVideo::NextVideoFrame()
 	{
 		ms_Time += ms_TickTime;
 		ms_LocalTime = (ms_Time - ms_LocalStartTime) / (float)time_freq();
-		m_Vframe += 1;
 	}
 }
 
@@ -372,8 +408,7 @@ void CVideo::NextAudioFrameTimeline(ISoundMixFunc Mix)
 {
 	if(m_Recording && m_HasAudio)
 	{
-		//if(m_VideoStream.pEnc->FRAME_NUM * (double)m_AudioStream.pEnc->sample_rate / m_FPS >= (double)m_AudioStream.pEnc->FRAME_NUM * m_AudioStream.pEnc->frame_size)
-		double SamplesPerFrame = (double)m_AudioStream.pEnc->sample_rate / m_FPS;
+		double SamplesPerFrame = (double)m_AudioStream.m_pCodecContext->sample_rate / m_FPS;
 		while(m_AudioStream.m_SamplesFrameCount >= m_AudioStream.m_SamplesCount)
 		{
 			NextAudioFrame(Mix);
@@ -386,7 +421,7 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 {
 	if(m_Recording && m_HasAudio)
 	{
-		m_ASeq += 1;
+		m_AudioFrameIndex += 1;
 
 		m_ProcessingAudioFrame.fetch_add(1);
 
@@ -397,7 +432,7 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 		// always wait for the next Audio thread too, to prevent a dead lock
 
 		{
-			auto *pAudioThread = m_vAudioThreads[NextAudioThreadIndex].get();
+			auto *pAudioThread = m_vpAudioThreads[NextAudioThreadIndex].get();
 			std::unique_lock<std::mutex> Lock(pAudioThread->m_Mutex);
 
 			if(pAudioThread->m_HasAudioFrame)
@@ -408,7 +443,7 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 
 		// after reading the graphic libraries' frame buffer, go threaded
 		{
-			auto *pAudioThread = m_vAudioThreads[m_CurAudioThreadIndex].get();
+			auto *pAudioThread = m_vpAudioThreads[m_CurAudioThreadIndex].get();
 
 			std::unique_lock<std::mutex> Lock(pAudioThread->m_Mutex);
 
@@ -417,13 +452,13 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 				pAudioThread->m_Cond.wait(Lock, [&pAudioThread]() -> bool { return !pAudioThread->m_HasAudioFrame; });
 			}
 
-			Mix(m_vBuffer[m_CurAudioThreadIndex].m_aBuffer, ALEN / 2); // two channels
+			Mix(m_vAudioBuffers[m_CurAudioThreadIndex].m_aBuffer, std::size(m_vAudioBuffers[m_CurAudioThreadIndex].m_aBuffer) / 2 / 2); // two channels
 
 			int64_t DstNbSamples = av_rescale_rnd(
-				swr_get_delay(m_AudioStream.m_vpSwrCtxs[m_CurAudioThreadIndex], m_AudioStream.pEnc->sample_rate) +
+				swr_get_delay(m_AudioStream.m_vpSwrContexts[m_CurAudioThreadIndex], m_AudioStream.m_pCodecContext->sample_rate) +
 					m_AudioStream.m_vpFrames[m_CurAudioThreadIndex]->nb_samples,
-				m_AudioStream.pEnc->sample_rate,
-				m_AudioStream.pEnc->sample_rate, AV_ROUND_UP);
+				m_AudioStream.m_pCodecContext->sample_rate,
+				m_AudioStream.m_pCodecContext->sample_rate, AV_ROUND_UP);
 
 			pAudioThread->m_SampleCountStart = m_AudioStream.m_SamplesCount;
 			m_AudioStream.m_SamplesCount += DstNbSamples;
@@ -431,7 +466,7 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 			pAudioThread->m_HasAudioFrame = true;
 			{
 				std::unique_lock<std::mutex> LockParent(pAudioThread->m_AudioFillMutex);
-				pAudioThread->m_AudioFrameToFill = m_ASeq;
+				pAudioThread->m_AudioFrameToFill = m_AudioFrameIndex;
 			}
 			pAudioThread->m_Cond.notify_all();
 		}
@@ -444,8 +479,8 @@ void CVideo::NextAudioFrame(ISoundMixFunc Mix)
 
 void CVideo::RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex)
 {
-	auto *pThreadData = m_vAudioThreads[ThreadIndex].get();
-	auto *pParentThreadData = m_vAudioThreads[ParentThreadIndex].get();
+	auto *pThreadData = m_vpAudioThreads[ThreadIndex].get();
+	auto *pParentThreadData = m_vpAudioThreads[ParentThreadIndex].get();
 	std::unique_lock<std::mutex> Lock(pThreadData->m_Mutex);
 	pThreadData->m_Started = true;
 	pThreadData->m_Cond.notify_all();
@@ -472,7 +507,7 @@ void CVideo::RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex)
 
 				{
 					CLockScope ls(g_WriteLock);
-					m_AudioStream.m_vpFrames[ThreadIndex]->pts = av_rescale_q(pThreadData->m_SampleCountStart, AVRational{1, m_AudioStream.pEnc->sample_rate}, m_AudioStream.pEnc->time_base);
+					m_AudioStream.m_vpFrames[ThreadIndex]->pts = av_rescale_q(pThreadData->m_SampleCountStart, AVRational{1, m_AudioStream.m_pCodecContext->sample_rate}, m_AudioStream.m_pCodecContext->time_base);
 					WriteFrame(&m_AudioStream, ThreadIndex);
 				}
 
@@ -489,45 +524,52 @@ void CVideo::RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex)
 
 void CVideo::FillAudioFrame(size_t ThreadIndex)
 {
-	av_samples_fill_arrays(
+	const int FillArrayResult = av_samples_fill_arrays(
 		(uint8_t **)m_AudioStream.m_vpTmpFrames[ThreadIndex]->data,
-		0, // pointer to linesize (int*)
-		(const uint8_t *)m_vBuffer[ThreadIndex].m_aBuffer,
+		nullptr, // pointer to linesize (int*)
+		(const uint8_t *)m_vAudioBuffers[ThreadIndex].m_aBuffer,
 		2, // channels
 		m_AudioStream.m_vpTmpFrames[ThreadIndex]->nb_samples,
 		AV_SAMPLE_FMT_S16,
 		0 // align
 	);
+	if(FillArrayResult < 0)
+	{
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(FillArrayResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not fill audio frame: %s", aError);
+		return;
+	}
 
-	// dbg_msg("video_recorder", "DstNbSamples: %d", DstNbSamples);
-	// fwrite(m_aBuffer, sizeof(short), 2048, m_dbgfile);
-
-	int Ret = av_frame_make_writable(m_AudioStream.m_vpFrames[ThreadIndex]);
-	if(Ret < 0)
+	const int MakeWriteableResult = av_frame_make_writable(m_AudioStream.m_vpFrames[ThreadIndex]);
+	if(MakeWriteableResult < 0)
 	{
-		dbg_msg("video_recorder", "Error making frame writable");
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(MakeWriteableResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not make audio frame writeable: %s", aError);
 		return;
 	}
 
 	/* convert to destination format */
-	Ret = swr_convert(
-		m_AudioStream.m_vpSwrCtxs[ThreadIndex],
+	const int ConvertResult = swr_convert(
+		m_AudioStream.m_vpSwrContexts[ThreadIndex],
 		m_AudioStream.m_vpFrames[ThreadIndex]->data,
 		m_AudioStream.m_vpFrames[ThreadIndex]->nb_samples,
 		(const uint8_t **)m_AudioStream.m_vpTmpFrames[ThreadIndex]->data,
 		m_AudioStream.m_vpTmpFrames[ThreadIndex]->nb_samples);
-
-	if(Ret < 0)
+	if(ConvertResult < 0)
 	{
-		dbg_msg("video_recorder", "Error while converting");
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(ConvertResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not convert audio frame: %s", aError);
 		return;
 	}
 }
 
 void CVideo::RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex)
 {
-	auto *pThreadData = m_vVideoThreads[ThreadIndex].get();
-	auto *pParentThreadData = m_vVideoThreads[ParentThreadIndex].get();
+	auto *pThreadData = m_vpVideoThreads[ThreadIndex].get();
+	auto *pParentThreadData = m_vpVideoThreads[ParentThreadIndex].get();
 	std::unique_lock<std::mutex> Lock(pThreadData->m_Mutex);
 	pThreadData->m_Started = true;
 	pThreadData->m_Cond.notify_all();
@@ -553,7 +595,7 @@ void CVideo::RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex)
 				std::unique_lock<std::mutex> LockVideo(pThreadData->m_VideoFillMutex);
 				{
 					CLockScope ls(g_WriteLock);
-					m_VideoStream.m_vpFrames[ThreadIndex]->pts = (int64_t)m_VideoStream.pEnc->FRAME_NUM;
+					m_VideoStream.m_vpFrames[ThreadIndex]->pts = (int64_t)m_VideoStream.m_pCodecContext->FRAME_NUM;
 					WriteFrame(&m_VideoStream, ThreadIndex);
 				}
 
@@ -570,38 +612,42 @@ void CVideo::RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex)
 
 void CVideo::FillVideoFrame(size_t ThreadIndex)
 {
-	const int InLineSize = 4 * m_VideoStream.pEnc->width;
-	auto *pRGBAData = m_vPixelHelper[ThreadIndex].data();
-	sws_scale(m_VideoStream.m_vpSwsCtxs[ThreadIndex], (const uint8_t *const *)&pRGBAData, &InLineSize, 0,
-		m_VideoStream.pEnc->height, m_VideoStream.m_vpFrames[ThreadIndex]->data, m_VideoStream.m_vpFrames[ThreadIndex]->linesize);
+	const int InLineSize = 4 * m_VideoStream.m_pCodecContext->width;
+	auto *pRGBAData = m_vVideoBuffers[ThreadIndex].m_vBuffer.data();
+	sws_scale(m_VideoStream.m_vpSwsContexts[ThreadIndex], (const uint8_t *const *)&pRGBAData, &InLineSize, 0,
+		m_VideoStream.m_pCodecContext->height, m_VideoStream.m_vpFrames[ThreadIndex]->data, m_VideoStream.m_vpFrames[ThreadIndex]->linesize);
 }
 
-void CVideo::ReadRGBFromGL(size_t ThreadIndex)
+void CVideo::UpdateVideoBufferFromGraphics(size_t ThreadIndex)
 {
 	uint32_t Width;
 	uint32_t Height;
 	CImageInfo::EImageFormat Format;
-	m_pGraphics->GetReadPresentedImageDataFuncUnsafe()(Width, Height, Format, m_vPixelHelper[ThreadIndex]);
+	m_pGraphics->GetReadPresentedImageDataFuncUnsafe()(Width, Height, Format, m_vVideoBuffers[ThreadIndex].m_vBuffer);
+	dbg_assert((int)Width == m_Width && (int)Height == m_Height, "Size mismatch between video and graphics");
+	dbg_assert(Format == CImageInfo::FORMAT_RGBA, "Unexpected image format");
 }
 
 AVFrame *CVideo::AllocPicture(enum AVPixelFormat PixFmt, int Width, int Height)
 {
-	AVFrame *pPicture;
-	int Ret;
-
-	pPicture = av_frame_alloc();
+	AVFrame *pPicture = av_frame_alloc();
 	if(!pPicture)
-		return NULL;
+	{
+		log_error("videorecorder", "Could not allocate video frame");
+		return nullptr;
+	}
 
 	pPicture->format = PixFmt;
 	pPicture->width = Width;
 	pPicture->height = Height;
 
 	/* allocate the buffers for the frame data */
-	Ret = av_frame_get_buffer(pPicture, 32);
-	if(Ret < 0)
+	const int FrameBufferAllocResult = av_frame_get_buffer(pPicture, 32);
+	if(FrameBufferAllocResult < 0)
 	{
-		dbg_msg("video_recorder", "Could not allocate frame data.");
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(FrameBufferAllocResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not allocate video frame buffer: %s", aError);
 		return nullptr;
 	}
 
@@ -611,11 +657,9 @@ AVFrame *CVideo::AllocPicture(enum AVPixelFormat PixFmt, int Width, int Height)
 AVFrame *CVideo::AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t ChannelLayout, int SampleRate, int NbSamples)
 {
 	AVFrame *pFrame = av_frame_alloc();
-	int Ret;
-
 	if(!pFrame)
 	{
-		dbg_msg("video_recorder", "Error allocating an audio frame");
+		log_error("videorecorder", "Could not allocate audio frame");
 		return nullptr;
 	}
 
@@ -630,10 +674,12 @@ AVFrame *CVideo::AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t Channel
 
 	if(NbSamples)
 	{
-		Ret = av_frame_get_buffer(pFrame, 0);
-		if(Ret < 0)
+		const int FrameBufferAllocResult = av_frame_get_buffer(pFrame, 0);
+		if(FrameBufferAllocResult < 0)
 		{
-			dbg_msg("video_recorder", "Error allocating an audio buffer");
+			char aError[AV_ERROR_MAX_STRING_SIZE];
+			av_strerror(FrameBufferAllocResult, aError, sizeof(aError));
+			log_error("videorecorder", "Could not allocate audio frame buffer: %s", aError);
 			return nullptr;
 		}
 	}
@@ -643,20 +689,18 @@ AVFrame *CVideo::AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t Channel
 
 bool CVideo::OpenVideo()
 {
-	int Ret;
-	AVCodecContext *pContext = m_VideoStream.pEnc;
-	AVDictionary *pOptions = 0;
-
+	AVCodecContext *pContext = m_VideoStream.m_pCodecContext;
+	AVDictionary *pOptions = nullptr;
 	av_dict_copy(&pOptions, m_pOptDict, 0);
 
 	/* open the codec */
-	Ret = avcodec_open2(pContext, m_pVideoCodec, &pOptions);
+	const int VideoOpenResult = avcodec_open2(pContext, m_pVideoCodec, &pOptions);
 	av_dict_free(&pOptions);
-	if(Ret < 0)
+	if(VideoOpenResult < 0)
 	{
-		char aBuf[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror(Ret, aBuf, sizeof(aBuf));
-		dbg_msg("video_recorder", "Could not open video codec: %s", aBuf);
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(VideoOpenResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not open video codec: %s", aError);
 		return false;
 	}
 
@@ -670,7 +714,6 @@ bool CVideo::OpenVideo()
 		m_VideoStream.m_vpFrames[i] = AllocPicture(pContext->pix_fmt, pContext->width, pContext->height);
 		if(!m_VideoStream.m_vpFrames[i])
 		{
-			dbg_msg("video_recorder", "Could not allocate video frame");
 			return false;
 		}
 	}
@@ -690,45 +733,42 @@ bool CVideo::OpenVideo()
 			m_VideoStream.m_vpTmpFrames[i] = AllocPicture(AV_PIX_FMT_YUV420P, pContext->width, pContext->height);
 			if(!m_VideoStream.m_vpTmpFrames[i])
 			{
-				dbg_msg("video_recorder", "Could not allocate temporary video frame");
 				return false;
 			}
 		}
 	}
 
 	/* copy the stream parameters to the muxer */
-	Ret = avcodec_parameters_from_context(m_VideoStream.pSt->codecpar, pContext);
-	if(Ret < 0)
+	const int AudioStreamCopyResult = avcodec_parameters_from_context(m_VideoStream.m_pStream->codecpar, pContext);
+	if(AudioStreamCopyResult < 0)
 	{
-		dbg_msg("video_recorder", "Could not copy the stream parameters");
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(AudioStreamCopyResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not copy video stream parameters: %s", aError);
 		return false;
 	}
-	m_VSeq = 0;
+	m_VideoFrameIndex = 0;
 	return true;
 }
 
 bool CVideo::OpenAudio()
 {
-	AVCodecContext *pContext;
-	int NbSamples;
-	int Ret;
-	AVDictionary *pOptions = NULL;
-
-	pContext = m_AudioStream.pEnc;
+	AVCodecContext *pContext = m_AudioStream.m_pCodecContext;
+	AVDictionary *pOptions = nullptr;
+	av_dict_copy(&pOptions, m_pOptDict, 0);
 
 	/* open it */
-	//m_dbgfile = fopen("/tmp/pcm_dbg", "wb");
-	av_dict_copy(&pOptions, m_pOptDict, 0);
-	Ret = avcodec_open2(pContext, m_pAudioCodec, &pOptions);
+	const int AudioOpenResult = avcodec_open2(pContext, m_pAudioCodec, &pOptions);
 	av_dict_free(&pOptions);
-	if(Ret < 0)
+	if(AudioOpenResult < 0)
 	{
-		char aBuf[AV_ERROR_MAX_STRING_SIZE];
-		av_strerror(Ret, aBuf, sizeof(aBuf));
-		dbg_msg("video_recorder", "Could not open audio codec: %s", aBuf);
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(AudioOpenResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not open audio codec: %s", aError);
 		return false;
 	}
 
+	int NbSamples;
 	if(pContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
 		NbSamples = 10000;
 	else
@@ -751,91 +791,99 @@ bool CVideo::OpenAudio()
 #endif
 		if(!m_AudioStream.m_vpFrames[i])
 		{
-			dbg_msg("video_recorder", "Could not allocate audio frame");
 			return false;
 		}
 
 		m_AudioStream.m_vpTmpFrames.emplace_back(nullptr);
-		m_AudioStream.m_vpTmpFrames[i] = AllocAudioFrame(AV_SAMPLE_FMT_S16, AV_CH_LAYOUT_STEREO, g_Config.m_SndRate, NbSamples);
+		m_AudioStream.m_vpTmpFrames[i] = AllocAudioFrame(AV_SAMPLE_FMT_S16, AV_CH_LAYOUT_STEREO, m_pSound->MixingRate(), NbSamples);
 		if(!m_AudioStream.m_vpTmpFrames[i])
 		{
-			dbg_msg("video_recorder", "Could not allocate audio frame");
 			return false;
 		}
 	}
 
 	/* copy the stream parameters to the muxer */
-	Ret = avcodec_parameters_from_context(m_AudioStream.pSt->codecpar, pContext);
-	if(Ret < 0)
+	const int AudioStreamCopyResult = avcodec_parameters_from_context(m_AudioStream.m_pStream->codecpar, pContext);
+	if(AudioStreamCopyResult < 0)
 	{
-		dbg_msg("video_recorder", "Could not copy the stream parameters");
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(AudioStreamCopyResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not copy audio stream parameters: %s", aError);
 		return false;
 	}
 
-	/* create resampler context */
-	m_AudioStream.m_vpSwrCtxs.clear();
-	m_AudioStream.m_vpSwrCtxs.resize(m_AudioThreads);
+	/* create resampling context */
+	m_AudioStream.m_vpSwrContexts.clear();
+	m_AudioStream.m_vpSwrContexts.resize(m_AudioThreads);
 	for(size_t i = 0; i < m_AudioThreads; ++i)
 	{
-		m_AudioStream.m_vpSwrCtxs[i] = swr_alloc();
-		if(!m_AudioStream.m_vpSwrCtxs[i])
+		m_AudioStream.m_vpSwrContexts[i] = swr_alloc();
+		if(!m_AudioStream.m_vpSwrContexts[i])
 		{
-			dbg_msg("video_recorder", "Could not allocate resampler context");
+			log_error("videorecorder", "Could not allocate resampling context");
 			return false;
 		}
 
 		/* set options */
-		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "in_channel_count", 2, 0);
-		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "in_sample_rate", g_Config.m_SndRate, 0);
-		av_opt_set_sample_fmt(m_AudioStream.m_vpSwrCtxs[i], "in_sample_fmt", AV_SAMPLE_FMT_S16, 0);
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
-		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_channel_count", pContext->ch_layout.nb_channels, 0);
+		dbg_assert(av_opt_set_chlayout(m_AudioStream.m_vpSwrContexts[i], "in_chlayout", &pContext->ch_layout, 0) == 0, "invalid option");
 #else
-		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_channel_count", pContext->channels, 0);
+		dbg_assert(av_opt_set_int(m_AudioStream.m_vpSwrContexts[i], "in_channel_count", pContext->channels, 0) == 0, "invalid option");
 #endif
-		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_sample_rate", pContext->sample_rate, 0);
-		av_opt_set_sample_fmt(m_AudioStream.m_vpSwrCtxs[i], "out_sample_fmt", pContext->sample_fmt, 0);
+		if(av_opt_set_int(m_AudioStream.m_vpSwrContexts[i], "in_sample_rate", m_pSound->MixingRate(), 0) != 0)
+		{
+			log_error("videorecorder", "Could not set audio sample rate to %d", m_pSound->MixingRate());
+			return false;
+		}
+		dbg_assert(av_opt_set_sample_fmt(m_AudioStream.m_vpSwrContexts[i], "in_sample_fmt", AV_SAMPLE_FMT_S16, 0) == 0, "invalid option");
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+		dbg_assert(av_opt_set_chlayout(m_AudioStream.m_vpSwrContexts[i], "out_chlayout", &pContext->ch_layout, 0) == 0, "invalid option");
+#else
+		dbg_assert(av_opt_set_int(m_AudioStream.m_vpSwrContexts[i], "out_channel_count", pContext->channels, 0) == 0, "invalid option");
+#endif
+		dbg_assert(av_opt_set_int(m_AudioStream.m_vpSwrContexts[i], "out_sample_rate", pContext->sample_rate, 0) == 0, "invalid option");
+		dbg_assert(av_opt_set_sample_fmt(m_AudioStream.m_vpSwrContexts[i], "out_sample_fmt", pContext->sample_fmt, 0) == 0, "invalid option");
 
 		/* initialize the resampling context */
-		if(swr_init(m_AudioStream.m_vpSwrCtxs[i]) < 0)
+		const int ResamplingContextInitResult = swr_init(m_AudioStream.m_vpSwrContexts[i]);
+		if(ResamplingContextInitResult < 0)
 		{
-			dbg_msg("video_recorder", "Failed to initialize the resampling context");
+			char aError[AV_ERROR_MAX_STRING_SIZE];
+			av_strerror(ResamplingContextInitResult, aError, sizeof(aError));
+			log_error("videorecorder", "Could not initialize resampling context: %s", aError);
 			return false;
 		}
 	}
 
-	m_ASeq = 0;
+	m_AudioFrameIndex = 0;
 	return true;
 }
 
 /* Add an output stream. */
-bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCodec **ppCodec, enum AVCodecID CodecId) const
+bool CVideo::AddStream(COutputStream *pStream, AVFormatContext *pFormatContext, const AVCodec **ppCodec, enum AVCodecID CodecId) const
 {
-	AVCodecContext *pContext;
-
 	/* find the encoder */
 	*ppCodec = avcodec_find_encoder(CodecId);
 	if(!(*ppCodec))
 	{
-		dbg_msg("video_recorder", "Could not find encoder for '%s'",
-			avcodec_get_name(CodecId));
+		log_error("videorecorder", "Could not find encoder for codec '%s'", avcodec_get_name(CodecId));
 		return false;
 	}
 
-	pStream->pSt = avformat_new_stream(pOC, NULL);
-	if(!pStream->pSt)
+	pStream->m_pStream = avformat_new_stream(pFormatContext, nullptr);
+	if(!pStream->m_pStream)
 	{
-		dbg_msg("video_recorder", "Could not allocate stream");
+		log_error("videorecorder", "Could not allocate stream");
 		return false;
 	}
-	pStream->pSt->id = pOC->nb_streams - 1;
-	pContext = avcodec_alloc_context3(*ppCodec);
+	pStream->m_pStream->id = pFormatContext->nb_streams - 1;
+	AVCodecContext *pContext = avcodec_alloc_context3(*ppCodec);
 	if(!pContext)
 	{
-		dbg_msg("video_recorder", "Could not alloc an encoding context");
+		log_error("videorecorder", "Could not allocate encoding context");
 		return false;
 	}
-	pStream->pEnc = pContext;
+	pStream->m_pCodecContext = pContext;
 
 #if defined(CONF_ARCH_IA32) || defined(CONF_ARCH_ARM)
 	// use only 1 ffmpeg thread on 32-bit to save memory
@@ -845,21 +893,34 @@ bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCode
 	switch((*ppCodec)->type)
 	{
 	case AVMEDIA_TYPE_AUDIO:
-		pContext->sample_fmt = (*ppCodec)->sample_fmts ? (*ppCodec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
-		pContext->bit_rate = g_Config.m_SndRate * 2 * 16;
-		pContext->sample_rate = g_Config.m_SndRate;
-		if((*ppCodec)->supported_samplerates)
+	{
+		const AVSampleFormat *pSampleFormats = nullptr;
+		const int *pSampleRates = nullptr;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
+		avcodec_get_supported_config(pContext, *ppCodec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void **)&pSampleFormats, nullptr);
+		avcodec_get_supported_config(pContext, *ppCodec, AV_CODEC_CONFIG_SAMPLE_RATE, 0, (const void **)&pSampleRates, nullptr);
+#else
+		pSampleFormats = (*ppCodec)->sample_fmts;
+		pSampleRates = (*ppCodec)->supported_samplerates;
+#endif
+		pContext->sample_fmt = pSampleFormats ? pSampleFormats[0] : AV_SAMPLE_FMT_FLTP;
+		if(pSampleRates)
 		{
-			pContext->sample_rate = (*ppCodec)->supported_samplerates[0];
-			for(int i = 0; (*ppCodec)->supported_samplerates[i]; i++)
+			pContext->sample_rate = pSampleRates[0];
+			for(int i = 0; pSampleRates[i]; i++)
 			{
-				if((*ppCodec)->supported_samplerates[i] == g_Config.m_SndRate)
+				if(pSampleRates[i] == m_pSound->MixingRate())
 				{
-					pContext->sample_rate = g_Config.m_SndRate;
+					pContext->sample_rate = m_pSound->MixingRate();
 					break;
 				}
 			}
 		}
+		else
+		{
+			pContext->sample_rate = m_pSound->MixingRate();
+		}
+		pContext->bit_rate = pContext->sample_rate * 2 * 16;
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
 		dbg_assert(av_channel_layout_from_mask(&pContext->ch_layout, AV_CH_LAYOUT_STEREO) == 0, "Failed to set channel layout");
 #else
@@ -867,9 +928,10 @@ bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCode
 		pContext->channel_layout = AV_CH_LAYOUT_STEREO;
 #endif
 
-		pStream->pSt->time_base.num = 1;
-		pStream->pSt->time_base.den = pContext->sample_rate;
+		pStream->m_pStream->time_base.num = 1;
+		pStream->m_pStream->time_base.den = pContext->sample_rate;
 		break;
+	}
 
 	case AVMEDIA_TYPE_VIDEO:
 		pContext->codec_id = CodecId;
@@ -879,12 +941,12 @@ bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCode
 		pContext->width = m_Width;
 		pContext->height = m_Height % 2 == 0 ? m_Height : m_Height - 1;
 		/* timebase: This is the fundamental unit of time (in seconds) in terms
-			 * of which frame timestamps are represented. For fixed-fps content,
-			 * timebase should be 1/framerate and timestamp increments should be
-			 * identical to 1. */
-		pStream->pSt->time_base.num = 1;
-		pStream->pSt->time_base.den = m_FPS;
-		pContext->time_base = pStream->pSt->time_base;
+		 * of which frame timestamps are represented. For fixed-fps content,
+		 * timebase should be 1/framerate and timestamp increments should be
+		 * identical to 1. */
+		pStream->m_pStream->time_base.num = 1;
+		pStream->m_pStream->time_base.den = m_FPS;
+		pContext->time_base = pStream->m_pStream->time_base;
 
 		pContext->gop_size = 12; /* emit one intra frame every twelve frames at most */
 		pContext->pix_fmt = STREAM_PIX_FMT;
@@ -896,15 +958,16 @@ bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCode
 		if(pContext->codec_id == AV_CODEC_ID_MPEG1VIDEO)
 		{
 			/* Needed to avoid using macroblocks in which some coeffs overflow.
-				 * This does not happen with normal video, it just happens here as
-				 * the motion of the chroma plane does not match the luma plane. */
+			 * This does not happen with normal video, it just happens here as
+			 * the motion of the chroma plane does not match the luma plane. */
 			pContext->mb_decision = 2;
 		}
 		if(CodecId == AV_CODEC_ID_H264)
 		{
 			static const char *s_apPresets[10] = {"ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo"};
-			av_opt_set(pContext->priv_data, "preset", s_apPresets[g_Config.m_ClVideoX264Preset], 0);
-			av_opt_set_int(pContext->priv_data, "crf", g_Config.m_ClVideoX264Crf, 0);
+			dbg_assert(g_Config.m_ClVideoX264Preset < (int)std::size(s_apPresets), "preset index invalid");
+			dbg_assert(av_opt_set(pContext->priv_data, "preset", s_apPresets[g_Config.m_ClVideoX264Preset], 0) == 0, "invalid option");
+			dbg_assert(av_opt_set_int(pContext->priv_data, "crf", g_Config.m_ClVideoX264Crf, 0) == 0, "invalid option");
 		}
 		break;
 
@@ -913,102 +976,109 @@ bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCode
 	}
 
 	/* Some formats want stream headers to be separate. */
-	if(pOC->oformat->flags & AVFMT_GLOBALHEADER)
+	if(pFormatContext->oformat->flags & AVFMT_GLOBALHEADER)
 		pContext->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	return true;
 }
 
-void CVideo::WriteFrame(OutputStream *pStream, size_t ThreadIndex)
+void CVideo::WriteFrame(COutputStream *pStream, size_t ThreadIndex)
 {
-	int RetRecv = 0;
-
 	AVPacket *pPacket = av_packet_alloc();
 	if(pPacket == nullptr)
 	{
-		dbg_msg("video_recorder", "Failed allocating packet");
+		log_error("videorecorder", "Could not allocate packet");
 		return;
 	}
 
 	pPacket->data = 0;
 	pPacket->size = 0;
 
-	avcodec_send_frame(pStream->pEnc, pStream->m_vpFrames[ThreadIndex]);
+	avcodec_send_frame(pStream->m_pCodecContext, pStream->m_vpFrames[ThreadIndex]);
+	int RecvResult = 0;
 	do
 	{
-		RetRecv = avcodec_receive_packet(pStream->pEnc, pPacket);
-		if(!RetRecv)
+		RecvResult = avcodec_receive_packet(pStream->m_pCodecContext, pPacket);
+		if(!RecvResult)
 		{
 			/* rescale output packet timestamp values from codec to stream timebase */
-			av_packet_rescale_ts(pPacket, pStream->pEnc->time_base, pStream->pSt->time_base);
-			pPacket->stream_index = pStream->pSt->index;
+			av_packet_rescale_ts(pPacket, pStream->m_pCodecContext->time_base, pStream->m_pStream->time_base);
+			pPacket->stream_index = pStream->m_pStream->index;
 
-			if(int Ret = av_interleaved_write_frame(m_pFormatContext, pPacket))
+			const int WriteFrameResult = av_interleaved_write_frame(m_pFormatContext, pPacket);
+			if(WriteFrameResult < 0)
 			{
-				char aBuf[AV_ERROR_MAX_STRING_SIZE];
-				av_strerror(Ret, aBuf, sizeof(aBuf));
-				dbg_msg("video_recorder", "Error while writing video frame: %s", aBuf);
+				char aError[AV_ERROR_MAX_STRING_SIZE];
+				av_strerror(WriteFrameResult, aError, sizeof(aError));
+				log_error("videorecorder", "Could not write video frame: %s", aError);
 			}
 		}
 		else
 			break;
 	} while(true);
 
-	if(RetRecv && RetRecv != AVERROR(EAGAIN))
+	if(RecvResult && RecvResult != AVERROR(EAGAIN))
 	{
-		dbg_msg("video_recorder", "Error encoding frame, error: %d", RetRecv);
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(RecvResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not encode video frame: %s", aError);
 	}
 
 	av_packet_free(&pPacket);
 }
 
-void CVideo::FinishFrames(OutputStream *pStream)
+void CVideo::FinishFrames(COutputStream *pStream)
 {
-	dbg_msg("video_recorder", "------------");
-	int RetRecv = 0;
+	if(!pStream->m_pCodecContext || !avcodec_is_open(pStream->m_pCodecContext))
+		return;
 
 	AVPacket *pPacket = av_packet_alloc();
 	if(pPacket == nullptr)
 	{
-		dbg_msg("video_recorder", "Failed allocating packet");
+		log_error("videorecorder", "Could not allocate packet");
 		return;
 	}
 
 	pPacket->data = 0;
 	pPacket->size = 0;
 
-	avcodec_send_frame(pStream->pEnc, 0);
+	avcodec_send_frame(pStream->m_pCodecContext, 0);
+	int RecvResult = 0;
 	do
 	{
-		RetRecv = avcodec_receive_packet(pStream->pEnc, pPacket);
-		if(!RetRecv)
+		RecvResult = avcodec_receive_packet(pStream->m_pCodecContext, pPacket);
+		if(!RecvResult)
 		{
 			/* rescale output packet timestamp values from codec to stream timebase */
-			av_packet_rescale_ts(pPacket, pStream->pEnc->time_base, pStream->pSt->time_base);
-			pPacket->stream_index = pStream->pSt->index;
+			av_packet_rescale_ts(pPacket, pStream->m_pCodecContext->time_base, pStream->m_pStream->time_base);
+			pPacket->stream_index = pStream->m_pStream->index;
 
-			if(int Ret = av_interleaved_write_frame(m_pFormatContext, pPacket))
+			const int WriteFrameResult = av_interleaved_write_frame(m_pFormatContext, pPacket);
+			if(WriteFrameResult < 0)
 			{
-				char aBuf[AV_ERROR_MAX_STRING_SIZE];
-				av_strerror(Ret, aBuf, sizeof(aBuf));
-				dbg_msg("video_recorder", "Error while writing video frame: %s", aBuf);
+				char aError[AV_ERROR_MAX_STRING_SIZE];
+				av_strerror(WriteFrameResult, aError, sizeof(aError));
+				log_error("videorecorder", "Could not write video frame: %s", aError);
 			}
 		}
 		else
 			break;
 	} while(true);
 
-	if(RetRecv && RetRecv != AVERROR_EOF)
+	if(RecvResult && RecvResult != AVERROR_EOF)
 	{
-		dbg_msg("video_recorder", "failed to finish recoding, error: %d", RetRecv);
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(RecvResult, aError, sizeof(aError));
+		log_error("videorecorder", "Could not finish recording: %s", aError);
 	}
 
 	av_packet_free(&pPacket);
 }
 
-void CVideo::CloseStream(OutputStream *pStream)
+void CVideo::CloseStream(COutputStream *pStream)
 {
-	avcodec_free_context(&pStream->pEnc);
+	avcodec_free_context(&pStream->m_pCodecContext);
+
 	for(auto *pFrame : pStream->m_vpFrames)
 		av_frame_free(&pFrame);
 	pStream->m_vpFrames.clear();
@@ -1017,13 +1087,13 @@ void CVideo::CloseStream(OutputStream *pStream)
 		av_frame_free(&pFrame);
 	pStream->m_vpTmpFrames.clear();
 
-	for(auto *pSwsContext : pStream->m_vpSwsCtxs)
+	for(auto *pSwsContext : pStream->m_vpSwsContexts)
 		sws_freeContext(pSwsContext);
-	pStream->m_vpSwsCtxs.clear();
+	pStream->m_vpSwsContexts.clear();
 
-	for(auto *pSwrContext : pStream->m_vpSwrCtxs)
+	for(auto *pSwrContext : pStream->m_vpSwrContexts)
 		swr_free(&pSwrContext);
-	pStream->m_vpSwrCtxs.clear();
+	pStream->m_vpSwrContexts.clear();
 }
 
 #endif
diff --git a/src/engine/client/video.h b/src/engine/client/video.h
index 0575cdee7e..63ddc27e65 100644
--- a/src/engine/client/video.h
+++ b/src/engine/client/video.h
@@ -15,39 +15,38 @@ extern "C" {
 #include <mutex>
 #include <thread>
 #include <vector>
-#define ALEN 2048
 
-class CGraphics_Threaded;
+class IGraphics;
 class ISound;
 class IStorage;
 
 extern CLock g_WriteLock;
 
 // a wrapper around a single output AVStream
-struct OutputStream
+class COutputStream
 {
-	AVStream *pSt = nullptr;
-	AVCodecContext *pEnc = nullptr;
+public:
+	AVStream *m_pStream = nullptr;
+	AVCodecContext *m_pCodecContext = nullptr;
 
 	/* pts of the next frame that will be generated */
-	int64_t NextPts = 0;
 	int64_t m_SamplesCount = 0;
 	int64_t m_SamplesFrameCount = 0;
 
 	std::vector<AVFrame *> m_vpFrames;
 	std::vector<AVFrame *> m_vpTmpFrames;
 
-	std::vector<struct SwsContext *> m_vpSwsCtxs;
-	std::vector<struct SwrContext *> m_vpSwrCtxs;
+	std::vector<struct SwsContext *> m_vpSwsContexts;
+	std::vector<struct SwrContext *> m_vpSwrContexts;
 };
 
 class CVideo : public IVideo
 {
 public:
-	CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName);
+	CVideo(IGraphics *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName);
 	~CVideo();
 
-	void Start() override REQUIRES(!g_WriteLock);
+	bool Start() override REQUIRES(!g_WriteLock);
 	void Stop() override;
 	void Pause(bool Pause) override;
 	bool IsRecording() override { return m_Recording; }
@@ -60,12 +59,12 @@ class CVideo : public IVideo
 
 	static IVideo *Current() { return IVideo::ms_pCurrentVideo; }
 
-	static void Init() { av_log_set_level(AV_LOG_DEBUG); }
+	static void Init();
 
 private:
 	void RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex) REQUIRES(!g_WriteLock);
 	void FillVideoFrame(size_t ThreadIndex) REQUIRES(!g_WriteLock);
-	void ReadRGBFromGL(size_t ThreadIndex);
+	void UpdateVideoBufferFromGraphics(size_t ThreadIndex);
 
 	void RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex) REQUIRES(!g_WriteLock);
 	void FillAudioFrame(size_t ThreadIndex);
@@ -75,27 +74,26 @@ class CVideo : public IVideo
 	AVFrame *AllocPicture(enum AVPixelFormat PixFmt, int Width, int Height);
 	AVFrame *AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t ChannelLayout, int SampleRate, int NbSamples);
 
-	void WriteFrame(OutputStream *pStream, size_t ThreadIndex) REQUIRES(g_WriteLock);
-	void FinishFrames(OutputStream *pStream);
-	void CloseStream(OutputStream *pStream);
+	void WriteFrame(COutputStream *pStream, size_t ThreadIndex) REQUIRES(g_WriteLock);
+	void FinishFrames(COutputStream *pStream);
+	void CloseStream(COutputStream *pStream);
 
-	bool AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCodec **ppCodec, enum AVCodecID CodecId) const;
+	bool AddStream(COutputStream *pStream, AVFormatContext *pFormatContext, const AVCodec **ppCodec, enum AVCodecID CodecId) const;
 
-	CGraphics_Threaded *m_pGraphics;
+	IGraphics *m_pGraphics;
 	IStorage *m_pStorage;
 	ISound *m_pSound;
 
 	int m_Width;
 	int m_Height;
 	char m_aName[256];
-	//FILE *m_dbgfile;
-	uint64_t m_VSeq = 0;
-	uint64_t m_ASeq = 0;
-	uint64_t m_Vframe;
+	uint64_t m_VideoFrameIndex = 0;
+	uint64_t m_AudioFrameIndex = 0;
 
 	int m_FPS;
 
 	bool m_Started;
+	bool m_Stopped;
 	bool m_Recording;
 
 	size_t m_VideoThreads = 2;
@@ -103,8 +101,9 @@ class CVideo : public IVideo
 	size_t m_AudioThreads = 2;
 	size_t m_CurAudioThreadIndex = 0;
 
-	struct SVideoRecorderThread
+	class CVideoRecorderThread
 	{
+	public:
 		std::thread m_Thread;
 		std::mutex m_Mutex;
 		std::condition_variable m_Cond;
@@ -118,10 +117,11 @@ class CVideo : public IVideo
 		uint64_t m_VideoFrameToFill = 0;
 	};
 
-	std::vector<std::unique_ptr<SVideoRecorderThread>> m_vVideoThreads;
+	std::vector<std::unique_ptr<CVideoRecorderThread>> m_vpVideoThreads;
 
-	struct SAudioRecorderThread
+	class CAudioRecorderThread
 	{
+	public:
 		std::thread m_Thread;
 		std::mutex m_Mutex;
 		std::condition_variable m_Cond;
@@ -136,22 +136,28 @@ class CVideo : public IVideo
 		int64_t m_SampleCountStart = 0;
 	};
 
-	std::vector<std::unique_ptr<SAudioRecorderThread>> m_vAudioThreads;
+	std::vector<std::unique_ptr<CAudioRecorderThread>> m_vpAudioThreads;
 
 	std::atomic<int32_t> m_ProcessingVideoFrame;
 	std::atomic<int32_t> m_ProcessingAudioFrame;
 
 	bool m_HasAudio;
 
-	struct SVideoSoundBuffer
+	class CVideoBuffer
+	{
+	public:
+		std::vector<uint8_t> m_vBuffer;
+	};
+	std::vector<CVideoBuffer> m_vVideoBuffers;
+	class CAudioBuffer
 	{
-		int16_t m_aBuffer[ALEN * 2];
+	public:
+		int16_t m_aBuffer[4096];
 	};
-	std::vector<SVideoSoundBuffer> m_vBuffer;
-	std::vector<std::vector<uint8_t>> m_vPixelHelper;
+	std::vector<CAudioBuffer> m_vAudioBuffers;
 
-	OutputStream m_VideoStream;
-	OutputStream m_AudioStream;
+	COutputStream m_VideoStream;
+	COutputStream m_AudioStream;
 
 	const AVCodec *m_pVideoCodec;
 	const AVCodec *m_pAudioCodec;
diff --git a/src/engine/client/warning.cpp b/src/engine/client/warning.cpp
index 0ed4a9daae..b15ed4c1fd 100644
--- a/src/engine/client/warning.cpp
+++ b/src/engine/client/warning.cpp
@@ -4,7 +4,6 @@
 
 SWarning::SWarning(const char *pMsg)
 {
-	str_copy(m_aWarningTitle, "");
 	str_copy(m_aWarningMsg, pMsg);
 }
 SWarning::SWarning(const char *pTitle, const char *pMsg)
diff --git a/src/engine/config.h b/src/engine/config.h
index bccf50437b..4123bad7e2 100644
--- a/src/engine/config.h
+++ b/src/engine/config.h
@@ -10,6 +10,7 @@ class IConfigManager : public IInterface
 	MACRO_INTERFACE("config")
 public:
 	typedef void (*SAVECALLBACKFUNC)(IConfigManager *pConfig, void *pUserData);
+	typedef void (*POSSIBLECFGFUNC)(const struct SConfigVariable *, void *pUserData);
 
 	virtual void Init() = 0;
 	virtual void Reset(const char *pScriptName) = 0;
@@ -23,6 +24,8 @@ class IConfigManager : public IInterface
 	virtual void WriteLine(const char *pLine) = 0;
 
 	virtual void StoreUnknownCommand(const char *pCommand) = 0;
+
+	virtual void PossibleConfigVariables(const char *pStr, int FlagMask, POSSIBLECFGFUNC pfnCallback, void *pUserData) = 0;
 };
 
 extern IConfigManager *CreateConfigManager();
diff --git a/src/engine/console.h b/src/engine/console.h
index 774e063583..23996c95e9 100644
--- a/src/engine/console.h
+++ b/src/engine/console.h
@@ -30,7 +30,7 @@ class IConsole : public IInterface
 		ACCESS_LEVEL_HELPER,
 		ACCESS_LEVEL_USER,
 
-		TEMPCMD_NAME_LENGTH = 32,
+		TEMPCMD_NAME_LENGTH = 64,
 		TEMPCMD_HELP_LENGTH = 192,
 		TEMPCMD_PARAMS_LENGTH = 96,
 
@@ -53,12 +53,12 @@ class IConsole : public IInterface
 		virtual int GetInteger(unsigned Index) const = 0;
 		virtual float GetFloat(unsigned Index) const = 0;
 		virtual const char *GetString(unsigned Index) const = 0;
-		virtual ColorHSLA GetColor(unsigned Index, bool Light) const = 0;
+		virtual std::optional<ColorHSLA> GetColor(unsigned Index, float DarkestLighting) const = 0;
 
 		virtual void RemoveArgument(unsigned Index) = 0;
 
 		int NumArguments() const { return m_NumArgs; }
-		int m_ClientID;
+		int m_ClientId;
 
 		// DDRace
 
@@ -82,7 +82,7 @@ class IConsole : public IInterface
 		int GetAccessLevel() const { return m_AccessLevel; }
 	};
 
-	typedef void (*FTeeHistorianCommandCallback)(int ClientID, int FlagMask, const char *pCmd, IResult *pResult, void *pUser);
+	typedef void (*FTeeHistorianCommandCallback)(int ClientId, int FlagMask, const char *pCmd, IResult *pResult, void *pUser);
 	typedef void (*FPrintCallback)(const char *pStr, void *pUser, ColorRGBA PrintColor);
 	typedef void (*FPossibleCallback)(int Index, const char *pCmd, void *pUser);
 	typedef void (*FCommandCallback)(IResult *pResult, void *pUserData);
@@ -106,10 +106,10 @@ class IConsole : public IInterface
 	virtual void StoreCommands(bool Store) = 0;
 
 	virtual bool LineIsValid(const char *pStr) = 0;
-	virtual void ExecuteLine(const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) = 0;
-	virtual void ExecuteLineFlag(const char *pStr, int FlasgMask, int ClientID = -1, bool InterpretSemicolons = true) = 0;
-	virtual void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) = 0;
-	virtual bool ExecuteFile(const char *pFilename, int ClientID = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) = 0;
+	virtual void ExecuteLine(const char *pStr, int ClientId = -1, bool InterpretSemicolons = true) = 0;
+	virtual void ExecuteLineFlag(const char *pStr, int FlasgMask, int ClientId = -1, bool InterpretSemicolons = true) = 0;
+	virtual void ExecuteLineStroked(int Stroke, const char *pStr, int ClientId = -1, bool InterpretSemicolons = true) = 0;
+	virtual bool ExecuteFile(const char *pFilename, int ClientId = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) = 0;
 
 	virtual char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr) = 0;
 	virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor) const = 0;
diff --git a/src/engine/console.rs b/src/engine/console.rs
index 055c0802fa..624127bc06 100644
--- a/src/engine/console.rs
+++ b/src/engine/console.rs
@@ -177,29 +177,29 @@ mod ffi {
         /// # unsafe { *user.cast_mut::<bool>() = true; }
         /// let result: &IConsole_IResult /* = `command "$f00" $ffa500 $12345 shiny cyan -16777216 $f008 $00ffff80` */;
         /// # result = result_param;
-        /// assert_eq!(result.GetColor(0, false), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 1.0 }); // red
-        /// assert_eq!(result.GetColor(1, false), ColorHSLA { h: 0.10784314, s: 1.0, l: 0.5, a: 1.0 }); // DDNet logo color
-        /// assert_eq!(result.GetColor(2, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // cannot be parsed => black
-        /// assert_eq!(result.GetColor(3, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // unknown color name => black
-        /// assert_eq!(result.GetColor(4, false), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 1.0 }); // cyan
-        /// assert_eq!(result.GetColor(5, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // black
-        /// assert_eq!(result.GetColor(6, false), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 0.53333336 }); // red with alpha specified
-        /// assert_eq!(result.GetColor(7, false), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 0.5019608 }); // cyan with alpha specified
-        /// assert_eq!(result.GetColor(8, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // out of range => black
-        ///
-        /// assert_eq!(result.GetColor(0, true), result.GetColor(0, false));
-        /// assert_eq!(result.GetColor(1, true), result.GetColor(1, false));
-        /// assert_eq!(result.GetColor(2, true), result.GetColor(2, false));
-        /// assert_eq!(result.GetColor(3, true), result.GetColor(3, false));
-        /// assert_eq!(result.GetColor(4, true), result.GetColor(4, false));
-        /// assert_eq!(result.GetColor(5, true), ColorHSLA { h: 0.0, s: 0.0, l: 0.5, a: 1.0 }); // black, but has the `Light` parameter set
-        /// assert_eq!(result.GetColor(6, true), result.GetColor(6, false));
-        /// assert_eq!(result.GetColor(7, true), result.GetColor(7, false));
-        /// assert_eq!(result.GetColor(8, true), result.GetColor(8, false));
+        /// assert_eq!(result.GetColor(0, 0.0), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 1.0 }); // red
+        /// assert_eq!(result.GetColor(1, 0.0), ColorHSLA { h: 0.10784314, s: 1.0, l: 0.5, a: 1.0 }); // DDNet logo color
+        /// assert_eq!(result.GetColor(2, 0.0), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // cannot be parsed => black
+        /// assert_eq!(result.GetColor(3, 0.0), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // unknown color name => black
+        /// assert_eq!(result.GetColor(4, 0.0), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 1.0 }); // cyan
+        /// assert_eq!(result.GetColor(5, 0.0), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // black
+        /// assert_eq!(result.GetColor(6, 0.0), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 0.53333336 }); // red with alpha specified
+        /// assert_eq!(result.GetColor(7, 0.0), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 0.5019608 }); // cyan with alpha specified
+        /// assert_eq!(result.GetColor(8, 0.0), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // out of range => black
+        ///
+        /// assert_eq!(result.GetColor(0, 0.5), result.GetColor(0, 0.0));
+        /// assert_eq!(result.GetColor(1, 0.5), result.GetColor(1, 0.0));
+        /// assert_eq!(result.GetColor(2, 0.5), result.GetColor(2, 0.0));
+        /// assert_eq!(result.GetColor(3, 0.5), result.GetColor(3, 0.0));
+        /// assert_eq!(result.GetColor(4, 0.5), result.GetColor(4, 0.0));
+        /// assert_eq!(result.GetColor(5, 0.5), ColorHSLA { h: 0.0, s: 0.0, l: 0.5, a: 1.0 }); // black, but has the `Light` parameter set
+        /// assert_eq!(result.GetColor(6, 0.5), result.GetColor(6, 0.0));
+        /// assert_eq!(result.GetColor(7, 0.5), result.GetColor(7, 0.0));
+        /// assert_eq!(result.GetColor(8, 0.5), result.GetColor(8, 0.0));
         /// # }
         /// # assert!(executed);
         /// ```
-        pub fn GetColor(self: &IConsole_IResult, Index: u32, Light: bool) -> ColorHSLA;
+        pub fn GetColor(self: &IConsole_IResult, Index: u32, DarkestLighting: f32) -> ColorHSLA;
 
         /// Get the number of parameters passed.
         ///
diff --git a/src/engine/demo.h b/src/engine/demo.h
index f42193e9b0..9a0e74d039 100644
--- a/src/engine/demo.h
+++ b/src/engine/demo.h
@@ -91,6 +91,7 @@ class IDemoPlayer : public IInterface
 	virtual int SetPos(int WantedTick) = 0;
 	virtual void Pause() = 0;
 	virtual void Unpause() = 0;
+	virtual const char *ErrorMessage() const = 0;
 	virtual bool IsPlaying() const = 0;
 	virtual const CInfo *BaseInfo() const = 0;
 	virtual void GetDemoName(char *pBuffer, size_t BufferSize) const = 0;
@@ -101,18 +102,24 @@ class IDemoRecorder : public IInterface
 {
 	MACRO_INTERFACE("demorecorder")
 public:
+	enum class EStopMode
+	{
+		KEEP_FILE,
+		REMOVE_FILE,
+	};
+
 	virtual ~IDemoRecorder() {}
 	virtual bool IsRecording() const = 0;
-	virtual int Stop() = 0;
+	virtual int Stop(IDemoRecorder::EStopMode Mode, const char *pTargetFilename = "") = 0;
 	virtual int Length() const = 0;
-	virtual char *GetCurrentFilename() = 0;
+	virtual const char *CurrentFilename() const = 0;
 };
 
 class IDemoEditor : public IInterface
 {
 	MACRO_INTERFACE("demoeditor")
 public:
-	virtual void Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) = 0;
+	virtual bool Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) = 0;
 };
 
 #endif
diff --git a/src/engine/discord.h b/src/engine/discord.h
index aed8a15f2e..5b5f0a8269 100644
--- a/src/engine/discord.h
+++ b/src/engine/discord.h
@@ -9,12 +9,11 @@ class IDiscord : public IInterface
 	MACRO_INTERFACE("discord")
 public:
 	virtual void Update() = 0;
-	virtual void Start() = 0;
 
 	virtual void ClearGameInfo() = 0;
-	virtual void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) = 0;
+	virtual void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) = 0;
 };
 
 IDiscord *CreateDiscord();
 
-#endif // ENGINE_DISCORD_H
\ No newline at end of file
+#endif // ENGINE_DISCORD_H
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 937a2a2722..c763e7f6ed 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -4,25 +4,24 @@
 #define ENGINE_ENGINE_H
 
 #include "kernel.h"
-#include <engine/shared/jobs.h>
+
+#include <memory>
 
 class CFutureLogger;
+class IJob;
 class ILogger;
 
 class IEngine : public IInterface
 {
 	MACRO_INTERFACE("engine")
 
-protected:
-	class CJobPool m_JobPool;
-
 public:
 	virtual ~IEngine() = default;
 
 	virtual void Init() = 0;
 	virtual void AddJob(std::shared_ptr<IJob> pJob) = 0;
+	virtual void ShutdownJobs() = 0;
 	virtual void SetAdditionalLogger(std::shared_ptr<ILogger> &&pLogger) = 0;
-	static void RunJobBlocking(IJob *pJob);
 };
 
 extern IEngine *CreateEngine(const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs);
diff --git a/src/engine/gfx/image.cpp b/src/engine/gfx/image.cpp
new file mode 100644
index 0000000000..78475aae06
--- /dev/null
+++ b/src/engine/gfx/image.cpp
@@ -0,0 +1,120 @@
+#include <base/system.h>
+
+#include <engine/image.h>
+
+void CImageInfo::Free()
+{
+	m_Width = 0;
+	m_Height = 0;
+	m_Format = FORMAT_UNDEFINED;
+	free(m_pData);
+	m_pData = nullptr;
+}
+
+size_t CImageInfo::PixelSize(EImageFormat Format)
+{
+	dbg_assert(Format != FORMAT_UNDEFINED, "Format undefined");
+	static const size_t s_aSizes[] = {3, 4, 1, 2};
+	return s_aSizes[(int)Format];
+}
+
+const char *CImageInfo::FormatName(EImageFormat Format)
+{
+	static const char *s_apNames[] = {"UNDEFINED", "RGBA", "RGB", "R", "RA"};
+	return s_apNames[(int)Format + 1];
+}
+
+size_t CImageInfo::PixelSize() const
+{
+	return PixelSize(m_Format);
+}
+
+const char *CImageInfo::FormatName() const
+{
+	return FormatName(m_Format);
+}
+
+size_t CImageInfo::DataSize() const
+{
+	return m_Width * m_Height * PixelSize(m_Format);
+}
+
+bool CImageInfo::DataEquals(const CImageInfo &Other) const
+{
+	if(m_Width != Other.m_Width || m_Height != Other.m_Height || m_Format != Other.m_Format)
+		return false;
+	if(m_pData == nullptr && Other.m_pData == nullptr)
+		return true;
+	if(m_pData == nullptr || Other.m_pData == nullptr)
+		return false;
+	return mem_comp(m_pData, Other.m_pData, DataSize()) == 0;
+}
+
+ColorRGBA CImageInfo::PixelColor(size_t x, size_t y) const
+{
+	const size_t PixelStartIndex = (x + m_Width * y) * PixelSize();
+
+	ColorRGBA Color;
+	if(m_Format == FORMAT_R)
+	{
+		Color.r = Color.g = Color.b = 1.0f;
+		Color.a = m_pData[PixelStartIndex] / 255.0f;
+	}
+	else if(m_Format == FORMAT_RA)
+	{
+		Color.r = Color.g = Color.b = m_pData[PixelStartIndex] / 255.0f;
+		Color.a = m_pData[PixelStartIndex + 1] / 255.0f;
+	}
+	else
+	{
+		Color.r = m_pData[PixelStartIndex + 0] / 255.0f;
+		Color.g = m_pData[PixelStartIndex + 1] / 255.0f;
+		Color.b = m_pData[PixelStartIndex + 2] / 255.0f;
+		if(m_Format == FORMAT_RGBA)
+		{
+			Color.a = m_pData[PixelStartIndex + 3] / 255.0f;
+		}
+		else
+		{
+			Color.a = 1.0f;
+		}
+	}
+	return Color;
+}
+
+void CImageInfo::SetPixelColor(size_t x, size_t y, ColorRGBA Color) const
+{
+	const size_t PixelStartIndex = (x + m_Width * y) * PixelSize();
+
+	if(m_Format == FORMAT_R)
+	{
+		m_pData[PixelStartIndex] = round_to_int(Color.a * 255.0f);
+	}
+	else if(m_Format == FORMAT_RA)
+	{
+		m_pData[PixelStartIndex] = round_to_int((Color.r + Color.g + Color.b) / 3.0f * 255.0f);
+		m_pData[PixelStartIndex + 1] = round_to_int(Color.a * 255.0f);
+	}
+	else
+	{
+		m_pData[PixelStartIndex + 0] = round_to_int(Color.r * 255.0f);
+		m_pData[PixelStartIndex + 1] = round_to_int(Color.g * 255.0f);
+		m_pData[PixelStartIndex + 2] = round_to_int(Color.b * 255.0f);
+		if(m_Format == FORMAT_RGBA)
+		{
+			m_pData[PixelStartIndex + 3] = round_to_int(Color.a * 255.0f);
+		}
+	}
+}
+
+void CImageInfo::CopyRectFrom(const CImageInfo &SrcImage, size_t SrcX, size_t SrcY, size_t Width, size_t Height, size_t DestX, size_t DestY) const
+{
+	const size_t PixelSize = SrcImage.PixelSize();
+	const size_t CopySize = Width * PixelSize;
+	for(size_t Y = 0; Y < Height; ++Y)
+	{
+		const size_t SrcOffset = ((SrcY + Y) * SrcImage.m_Width + SrcX) * PixelSize;
+		const size_t DestOffset = ((DestY + Y) * m_Width + DestX) * PixelSize;
+		mem_copy(&m_pData[DestOffset], &SrcImage.m_pData[SrcOffset], CopySize);
+	}
+}
diff --git a/src/engine/gfx/image_loader.cpp b/src/engine/gfx/image_loader.cpp
index eefb597cdb..79d95956d8 100644
--- a/src/engine/gfx/image_loader.cpp
+++ b/src/engine/gfx/image_loader.cpp
@@ -1,89 +1,94 @@
 #include "image_loader.h"
+
 #include <base/log.h>
 #include <base/system.h>
+
 #include <csetjmp>
 #include <cstdlib>
 
 #include <png.h>
 
-struct SLibPNGWarningItem
+bool CByteBufferReader::Read(void *pData, size_t Size)
 {
-	SImageByteBuffer *m_pByteLoader;
-	const char *m_pFileName;
-	std::jmp_buf m_Buf;
-};
+	if(m_Error)
+		return false;
 
-[[noreturn]] static void LibPNGError(png_structp png_ptr, png_const_charp error_msg)
-{
-	SLibPNGWarningItem *pUserStruct = (SLibPNGWarningItem *)png_get_error_ptr(png_ptr);
-	pUserStruct->m_pByteLoader->m_Err = -1;
-	dbg_msg("png", "error for file \"%s\": %s", pUserStruct->m_pFileName, error_msg);
-	std::longjmp(pUserStruct->m_Buf, 1);
+	if(m_ReadOffset + Size <= m_Size)
+	{
+		mem_copy(pData, &m_pData[m_ReadOffset], Size);
+		m_ReadOffset += Size;
+		return true;
+	}
+	else
+	{
+		m_Error = true;
+		return false;
+	}
 }
 
-static void LibPNGWarning(png_structp png_ptr, png_const_charp warning_msg)
+void CByteBufferWriter::Write(const void *pData, size_t Size)
 {
-	SLibPNGWarningItem *pUserStruct = (SLibPNGWarningItem *)png_get_error_ptr(png_ptr);
-	dbg_msg("png", "warning for file \"%s\": %s", pUserStruct->m_pFileName, warning_msg);
-}
+	if(!Size)
+		return;
 
-static bool FileMatchesImageType(SImageByteBuffer &ByteLoader)
-{
-	if(ByteLoader.m_pvLoadedImageBytes->size() >= 8)
-		return png_sig_cmp((png_bytep)ByteLoader.m_pvLoadedImageBytes->data(), 0, 8) == 0;
-	return false;
+	const size_t WriteOffset = m_vBuffer.size();
+	m_vBuffer.resize(WriteOffset + Size);
+	mem_copy(&m_vBuffer[WriteOffset], pData, Size);
 }
 
-static void ReadDataFromLoadedBytes(png_structp pPNGStruct, png_bytep pOutBytes, png_size_t ByteCountToRead)
+class CUserErrorStruct
 {
-	png_voidp pIO_Ptr = png_get_io_ptr(pPNGStruct);
+public:
+	CByteBufferReader *m_pReader;
+	const char *m_pContextName;
+	std::jmp_buf m_JmpBuf;
+};
 
-	SImageByteBuffer *pByteLoader = (SImageByteBuffer *)pIO_Ptr;
+[[noreturn]] static void PngErrorCallback(png_structp pPngStruct, png_const_charp pErrorMessage)
+{
+	CUserErrorStruct *pUserStruct = static_cast<CUserErrorStruct *>(png_get_error_ptr(pPngStruct));
+	log_error("png", "error for file \"%s\": %s", pUserStruct->m_pContextName, pErrorMessage);
+	std::longjmp(pUserStruct->m_JmpBuf, 1);
+}
 
-	if(pByteLoader->m_pvLoadedImageBytes->size() >= pByteLoader->m_LoadOffset + (size_t)ByteCountToRead)
-	{
-		mem_copy(pOutBytes, &(*pByteLoader->m_pvLoadedImageBytes)[pByteLoader->m_LoadOffset], (size_t)ByteCountToRead);
+static void PngWarningCallback(png_structp pPngStruct, png_const_charp pWarningMessage)
+{
+	CUserErrorStruct *pUserStruct = static_cast<CUserErrorStruct *>(png_get_error_ptr(pPngStruct));
+	log_warn("png", "warning for file \"%s\": %s", pUserStruct->m_pContextName, pWarningMessage);
+}
 
-		pByteLoader->m_LoadOffset += (size_t)ByteCountToRead;
-	}
-	else
+static void PngReadDataCallback(png_structp pPngStruct, png_bytep pOutBytes, png_size_t ByteCountToRead)
+{
+	CByteBufferReader *pReader = static_cast<CByteBufferReader *>(png_get_io_ptr(pPngStruct));
+	if(!pReader->Read(pOutBytes, ByteCountToRead))
 	{
-		pByteLoader->m_Err = -1;
-		dbg_msg("png", "could not read bytes, file was too small.");
+		png_error(pPngStruct, "Could not read all bytes, file was too small");
 	}
 }
 
-static EImageFormat LibPNGGetImageFormat(int ColorChannelCount)
+static CImageInfo::EImageFormat ImageFormatFromChannelCount(int ColorChannelCount)
 {
 	switch(ColorChannelCount)
 	{
 	case 1:
-		return IMAGE_FORMAT_R;
+		return CImageInfo::FORMAT_R;
 	case 2:
-		return IMAGE_FORMAT_RA;
+		return CImageInfo::FORMAT_RA;
 	case 3:
-		return IMAGE_FORMAT_RGB;
+		return CImageInfo::FORMAT_RGB;
 	case 4:
-		return IMAGE_FORMAT_RGBA;
+		return CImageInfo::FORMAT_RGBA;
 	default:
 		dbg_assert(false, "ColorChannelCount invalid");
 		dbg_break();
 	}
 }
 
-static void LibPNGDeleteReadStruct(png_structp pPNGStruct, png_infop pPNGInfo)
-{
-	if(pPNGInfo != nullptr)
-		png_destroy_info_struct(pPNGStruct, &pPNGInfo);
-	png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
-}
-
-static int PngliteIncompatibility(png_structp pPNGStruct, png_infop pPNGInfo)
+static int PngliteIncompatibility(png_structp pPngStruct, png_infop pPngInfo)
 {
-	int ColorType = png_get_color_type(pPNGStruct, pPNGInfo);
-	int BitDepth = png_get_bit_depth(pPNGStruct, pPNGInfo);
-	int InterlaceType = png_get_interlace_type(pPNGStruct, pPNGInfo);
 	int Result = 0;
+
+	const int ColorType = png_get_color_type(pPngStruct, pPngInfo);
 	switch(ColorType)
 	{
 	case PNG_COLOR_TYPE_GRAY:
@@ -93,9 +98,10 @@ static int PngliteIncompatibility(png_structp pPNGStruct, png_infop pPNGInfo)
 		break;
 	default:
 		log_debug("png", "color type %d unsupported by pnglite", ColorType);
-		Result |= PNGLITE_COLOR_TYPE;
+		Result |= CImageLoader::PNGLITE_COLOR_TYPE;
 	}
 
+	const int BitDepth = png_get_bit_depth(pPngStruct, pPngInfo);
 	switch(BitDepth)
 	{
 	case 8:
@@ -103,125 +109,137 @@ static int PngliteIncompatibility(png_structp pPNGStruct, png_infop pPNGInfo)
 		break;
 	default:
 		log_debug("png", "bit depth %d unsupported by pnglite", BitDepth);
-		Result |= PNGLITE_BIT_DEPTH;
+		Result |= CImageLoader::PNGLITE_BIT_DEPTH;
 	}
 
+	const int InterlaceType = png_get_interlace_type(pPngStruct, pPngInfo);
 	if(InterlaceType != PNG_INTERLACE_NONE)
 	{
 		log_debug("png", "interlace type %d unsupported by pnglite", InterlaceType);
-		Result |= PNGLITE_INTERLACE_TYPE;
+		Result |= CImageLoader::PNGLITE_INTERLACE_TYPE;
 	}
-	if(png_get_compression_type(pPNGStruct, pPNGInfo) != PNG_COMPRESSION_TYPE_BASE)
+
+	if(png_get_compression_type(pPngStruct, pPngInfo) != PNG_COMPRESSION_TYPE_BASE)
 	{
 		log_debug("png", "non-default compression type unsupported by pnglite");
-		Result |= PNGLITE_COMPRESSION_TYPE;
+		Result |= CImageLoader::PNGLITE_COMPRESSION_TYPE;
 	}
-	if(png_get_filter_type(pPNGStruct, pPNGInfo) != PNG_FILTER_TYPE_BASE)
+
+	if(png_get_filter_type(pPngStruct, pPngInfo) != PNG_FILTER_TYPE_BASE)
 	{
 		log_debug("png", "non-default filter type unsupported by pnglite");
-		Result |= PNGLITE_FILTER_TYPE;
+		Result |= CImageLoader::PNGLITE_FILTER_TYPE;
 	}
+
 	return Result;
 }
 
-bool LoadPNG(SImageByteBuffer &ByteLoader, const char *pFileName, int &PngliteIncompatible, int &Width, int &Height, uint8_t *&pImageBuff, EImageFormat &ImageFormat)
+bool CImageLoader::LoadPng(CByteBufferReader &Reader, const char *pContextName, CImageInfo &Image, int &PngliteIncompatible)
 {
-	SLibPNGWarningItem UserErrorStruct = {&ByteLoader, pFileName, {}};
+	CUserErrorStruct UserErrorStruct = {&Reader, pContextName, {}};
 
-	png_structp pPNGStruct = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-
-	if(pPNGStruct == nullptr)
+	png_structp pPngStruct = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+	if(pPngStruct == nullptr)
 	{
-		dbg_msg("png", "libpng internal failure: png_create_read_struct failed.");
+		log_error("png", "libpng internal failure: png_create_read_struct failed.");
 		return false;
 	}
 
-	png_infop pPNGInfo = nullptr;
+	png_infop pPngInfo = nullptr;
 	png_bytepp pRowPointers = nullptr;
-	Height = 0; // ensure this is not undefined for the error handler
-	if(setjmp(UserErrorStruct.m_Buf))
-	{
+	int Height = 0; // ensure this is not undefined for the Cleanup function
+	const auto &&Cleanup = [&]() {
 		if(pRowPointers != nullptr)
 		{
-			for(int i = 0; i < Height; ++i)
+			for(int y = 0; y < Height; ++y)
 			{
-				delete[] pRowPointers[i];
+				delete[] pRowPointers[y];
 			}
 		}
 		delete[] pRowPointers;
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		if(pPngInfo != nullptr)
+		{
+			png_destroy_info_struct(pPngStruct, &pPngInfo);
+		}
+		png_destroy_read_struct(&pPngStruct, nullptr, nullptr);
+	};
+	if(setjmp(UserErrorStruct.m_JmpBuf))
+	{
+		Cleanup();
 		return false;
 	}
-	png_set_error_fn(pPNGStruct, &UserErrorStruct, LibPNGError, LibPNGWarning);
-
-	pPNGInfo = png_create_info_struct(pPNGStruct);
+	png_set_error_fn(pPngStruct, &UserErrorStruct, PngErrorCallback, PngWarningCallback);
 
-	if(pPNGInfo == nullptr)
+	pPngInfo = png_create_info_struct(pPngStruct);
+	if(pPngInfo == nullptr)
 	{
-		png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
-		dbg_msg("png", "libpng internal failure: png_create_info_struct failed.");
+		Cleanup();
+		log_error("png", "libpng internal failure: png_create_info_struct failed.");
 		return false;
 	}
 
-	if(!FileMatchesImageType(ByteLoader))
+	png_byte aSignature[8];
+	if(!Reader.Read(aSignature, sizeof(aSignature)) || png_sig_cmp(aSignature, 0, sizeof(aSignature)) != 0)
 	{
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
-		dbg_msg("png", "file does not match image type.");
+		Cleanup();
+		log_error("png", "file is not a valid PNG file (signature mismatch).");
 		return false;
 	}
 
-	ByteLoader.m_LoadOffset = 8;
+	png_set_read_fn(pPngStruct, (png_bytep)&Reader, PngReadDataCallback);
+	png_set_sig_bytes(pPngStruct, sizeof(aSignature));
 
-	png_set_read_fn(pPNGStruct, (png_bytep)&ByteLoader, ReadDataFromLoadedBytes);
+	png_read_info(pPngStruct, pPngInfo);
 
-	png_set_sig_bytes(pPNGStruct, 8);
+	if(Reader.Error())
+	{
+		// error already logged
+		Cleanup();
+		return false;
+	}
 
-	png_read_info(pPNGStruct, pPNGInfo);
+	const int Width = png_get_image_width(pPngStruct, pPngInfo);
+	Height = png_get_image_height(pPngStruct, pPngInfo);
+	const png_byte BitDepth = png_get_bit_depth(pPngStruct, pPngInfo);
+	const int ColorType = png_get_color_type(pPngStruct, pPngInfo);
 
-	if(ByteLoader.m_Err != 0)
+	if(Width == 0 || Height == 0)
 	{
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
-		dbg_msg("png", "byte loader error.");
+		log_error("png", "image has width (%d) or height (%d) of 0.", Width, Height);
+		Cleanup();
 		return false;
 	}
 
-	Width = png_get_image_width(pPNGStruct, pPNGInfo);
-	Height = png_get_image_height(pPNGStruct, pPNGInfo);
-	const int ColorType = png_get_color_type(pPNGStruct, pPNGInfo);
-	const png_byte BitDepth = png_get_bit_depth(pPNGStruct, pPNGInfo);
-	PngliteIncompatible = PngliteIncompatibility(pPNGStruct, pPNGInfo);
-
 	if(BitDepth == 16)
 	{
-		png_set_strip_16(pPNGStruct);
+		png_set_strip_16(pPngStruct);
 	}
-	else if(BitDepth > 8)
+	else if(BitDepth > 8 || BitDepth == 0)
 	{
-		dbg_msg("png", "non supported bit depth.");
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		log_error("png", "bit depth %d not supported.", BitDepth);
+		Cleanup();
 		return false;
 	}
 
-	if(Width == 0 || Height == 0 || BitDepth == 0)
+	if(ColorType == PNG_COLOR_TYPE_PALETTE)
 	{
-		dbg_msg("png", "image had width, height or bit depth of 0.");
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
-		return false;
+		png_set_palette_to_rgb(pPngStruct);
 	}
 
-	if(ColorType == PNG_COLOR_TYPE_PALETTE)
-		png_set_palette_to_rgb(pPNGStruct);
-
 	if(ColorType == PNG_COLOR_TYPE_GRAY && BitDepth < 8)
-		png_set_expand_gray_1_2_4_to_8(pPNGStruct);
+	{
+		png_set_expand_gray_1_2_4_to_8(pPngStruct);
+	}
 
-	if(png_get_valid(pPNGStruct, pPNGInfo, PNG_INFO_tRNS))
-		png_set_tRNS_to_alpha(pPNGStruct);
+	if(png_get_valid(pPngStruct, pPngInfo, PNG_INFO_tRNS))
+	{
+		png_set_tRNS_to_alpha(pPngStruct);
+	}
 
-	png_read_update_info(pPNGStruct, pPNGInfo);
+	png_read_update_info(pPngStruct, pPngInfo);
 
-	const int ColorChannelCount = png_get_channels(pPNGStruct, pPNGInfo);
-	const int BytesInRow = png_get_rowbytes(pPNGStruct, pPNGInfo);
+	const int ColorChannelCount = png_get_channels(pPngStruct, pPngInfo);
+	const int BytesInRow = png_get_rowbytes(pPngStruct, pPngInfo);
 	dbg_assert(BytesInRow == Width * ColorChannelCount, "bytes in row incorrect.");
 
 	pRowPointers = new png_bytep[Height];
@@ -230,131 +248,155 @@ bool LoadPNG(SImageByteBuffer &ByteLoader, const char *pFileName, int &PngliteIn
 		pRowPointers[y] = new png_byte[BytesInRow];
 	}
 
-	png_read_image(pPNGStruct, pRowPointers);
-
-	if(ByteLoader.m_Err == 0)
-		pImageBuff = (uint8_t *)malloc((size_t)Height * (size_t)Width * (size_t)ColorChannelCount * sizeof(uint8_t));
+	png_read_image(pPngStruct, pRowPointers);
 
-	for(int i = 0; i < Height; ++i)
+	if(!Reader.Error())
 	{
-		if(ByteLoader.m_Err == 0)
-			mem_copy(&pImageBuff[i * BytesInRow], pRowPointers[i], BytesInRow);
-		delete[] pRowPointers[i];
+		Image.m_Width = Width;
+		Image.m_Height = Height;
+		Image.m_Format = ImageFormatFromChannelCount(ColorChannelCount);
+		Image.m_pData = static_cast<uint8_t *>(malloc(Image.DataSize()));
+		for(int y = 0; y < Height; ++y)
+		{
+			mem_copy(&Image.m_pData[y * BytesInRow], pRowPointers[y], BytesInRow);
+		}
+		PngliteIncompatible = PngliteIncompatibility(pPngStruct, pPngInfo);
 	}
-	delete[] pRowPointers;
-	pRowPointers = nullptr;
 
-	if(ByteLoader.m_Err != 0)
+	Cleanup();
+
+	return !Reader.Error();
+}
+
+bool CImageLoader::LoadPng(IOHANDLE File, const char *pFilename, CImageInfo &Image, int &PngliteIncompatible)
+{
+	if(!File)
 	{
-		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
-		dbg_msg("png", "byte loader error.");
+		log_error("png", "failed to open file for reading. filename='%s'", pFilename);
 		return false;
 	}
 
-	ImageFormat = LibPNGGetImageFormat(ColorChannelCount);
+	void *pFileData;
+	unsigned FileDataSize;
+	io_read_all(File, &pFileData, &FileDataSize);
+	io_close(File);
 
-	png_destroy_info_struct(pPNGStruct, &pPNGInfo);
-	png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
-
-	return true;
-}
+	CByteBufferReader ImageReader(static_cast<const uint8_t *>(pFileData), FileDataSize);
 
-static void WriteDataFromLoadedBytes(png_structp pPNGStruct, png_bytep pOutBytes, png_size_t ByteCountToWrite)
-{
-	if(ByteCountToWrite > 0)
+	const bool LoadResult = CImageLoader::LoadPng(ImageReader, pFilename, Image, PngliteIncompatible);
+	free(pFileData);
+	if(!LoadResult)
 	{
-		png_voidp pIO_Ptr = png_get_io_ptr(pPNGStruct);
+		log_error("png", "failed to load image from file. filename='%s'", pFilename);
+		return false;
+	}
 
-		SImageByteBuffer *pByteLoader = (SImageByteBuffer *)pIO_Ptr;
+	if(Image.m_Format != CImageInfo::FORMAT_RGB && Image.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		log_error("png", "image has unsupported format. filename='%s' format='%s'", pFilename, Image.FormatName());
+		Image.Free();
+		return false;
+	}
 
-		size_t NewSize = pByteLoader->m_LoadOffset + (size_t)ByteCountToWrite;
-		pByteLoader->m_pvLoadedImageBytes->resize(NewSize);
+	return true;
+}
 
-		mem_copy(&(*pByteLoader->m_pvLoadedImageBytes)[pByteLoader->m_LoadOffset], pOutBytes, (size_t)ByteCountToWrite);
-		pByteLoader->m_LoadOffset = NewSize;
-	}
+static void PngWriteDataCallback(png_structp pPngStruct, png_bytep pOutBytes, png_size_t ByteCountToWrite)
+{
+	CByteBufferWriter *pWriter = static_cast<CByteBufferWriter *>(png_get_io_ptr(pPngStruct));
+	pWriter->Write(pOutBytes, ByteCountToWrite);
 }
 
-static void FlushPNGWrite(png_structp png_ptr) {}
+static void PngOutputFlushCallback(png_structp pPngStruct)
+{
+	// no need to flush memory buffer
+}
 
-static int ImageLoaderHelperFormatToColorChannel(EImageFormat Format)
+static int PngColorTypeFromFormat(CImageInfo::EImageFormat Format)
 {
 	switch(Format)
 	{
-	case IMAGE_FORMAT_R:
-		return 1;
-	case IMAGE_FORMAT_RA:
-		return 2;
-	case IMAGE_FORMAT_RGB:
-		return 3;
-	case IMAGE_FORMAT_RGBA:
-		return 4;
+	case CImageInfo::FORMAT_R:
+		return PNG_COLOR_TYPE_GRAY;
+	case CImageInfo::FORMAT_RA:
+		return PNG_COLOR_TYPE_GRAY_ALPHA;
+	case CImageInfo::FORMAT_RGB:
+		return PNG_COLOR_TYPE_RGB;
+	case CImageInfo::FORMAT_RGBA:
+		return PNG_COLOR_TYPE_RGBA;
 	default:
 		dbg_assert(false, "Format invalid");
 		dbg_break();
 	}
 }
 
-bool SavePNG(EImageFormat ImageFormat, const uint8_t *pRawBuffer, SImageByteBuffer &WrittenBytes, int Width, int Height)
+bool CImageLoader::SavePng(CByteBufferWriter &Writer, const CImageInfo &Image)
 {
-	png_structp pPNGStruct = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-
-	if(pPNGStruct == nullptr)
+	png_structp pPngStruct = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+	if(pPngStruct == nullptr)
 	{
-		dbg_msg("png", "libpng internal failure: png_create_write_struct failed.");
+		log_error("png", "libpng internal failure: png_create_write_struct failed.");
 		return false;
 	}
 
-	png_infop pPNGInfo = png_create_info_struct(pPNGStruct);
-
-	if(pPNGInfo == nullptr)
+	png_infop pPngInfo = png_create_info_struct(pPngStruct);
+	if(pPngInfo == nullptr)
 	{
-		png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
-		dbg_msg("png", "libpng internal failure: png_create_info_struct failed.");
+		png_destroy_read_struct(&pPngStruct, nullptr, nullptr);
+		log_error("png", "libpng internal failure: png_create_info_struct failed.");
 		return false;
 	}
 
-	WrittenBytes.m_LoadOffset = 0;
-	WrittenBytes.m_pvLoadedImageBytes->clear();
+	png_set_write_fn(pPngStruct, (png_bytep)&Writer, PngWriteDataCallback, PngOutputFlushCallback);
 
-	png_set_write_fn(pPNGStruct, (png_bytep)&WrittenBytes, WriteDataFromLoadedBytes, FlushPNGWrite);
+	png_set_IHDR(pPngStruct, pPngInfo, Image.m_Width, Image.m_Height, 8, PngColorTypeFromFormat(Image.m_Format), PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+	png_write_info(pPngStruct, pPngInfo);
 
-	int ColorType = PNG_COLOR_TYPE_RGB;
-	int WriteBytesPerPixel = ImageLoaderHelperFormatToColorChannel(ImageFormat);
-	if(ImageFormat == IMAGE_FORMAT_R)
+	png_bytepp pRowPointers = new png_bytep[Image.m_Height];
+	const int WidthBytes = Image.m_Width * Image.PixelSize();
+	ptrdiff_t BufferOffset = 0;
+	for(size_t y = 0; y < Image.m_Height; ++y)
 	{
-		ColorType = PNG_COLOR_TYPE_GRAY;
+		pRowPointers[y] = new png_byte[WidthBytes];
+		mem_copy(pRowPointers[y], Image.m_pData + BufferOffset, WidthBytes);
+		BufferOffset += (ptrdiff_t)WidthBytes;
 	}
-	else if(ImageFormat == IMAGE_FORMAT_RGBA)
+	png_write_image(pPngStruct, pRowPointers);
+	png_write_end(pPngStruct, pPngInfo);
+
+	for(size_t y = 0; y < Image.m_Height; ++y)
 	{
-		ColorType = PNG_COLOR_TYPE_RGBA;
+		delete[] pRowPointers[y];
 	}
+	delete[] pRowPointers;
 
-	png_set_IHDR(pPNGStruct, pPNGInfo, Width, Height, 8, ColorType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+	png_destroy_info_struct(pPngStruct, &pPngInfo);
+	png_destroy_write_struct(&pPngStruct, nullptr);
 
-	png_write_info(pPNGStruct, pPNGInfo);
+	return true;
+}
 
-	png_bytepp pRowPointers = new png_bytep[Height];
-	int WidthBytes = Width * WriteBytesPerPixel;
-	ptrdiff_t BufferOffset = 0;
-	for(int y = 0; y < Height; ++y)
+bool CImageLoader::SavePng(IOHANDLE File, const char *pFilename, const CImageInfo &Image)
+{
+	if(!File)
 	{
-		pRowPointers[y] = new png_byte[WidthBytes];
-		mem_copy(pRowPointers[y], pRawBuffer + BufferOffset, WidthBytes);
-		BufferOffset += (ptrdiff_t)WidthBytes;
+		log_error("png", "failed to open file for writing. filename='%s'", pFilename);
+		return false;
 	}
-	png_write_image(pPNGStruct, pRowPointers);
-
-	png_write_end(pPNGStruct, pPNGInfo);
 
-	for(int y = 0; y < Height; ++y)
+	CByteBufferWriter Writer;
+	if(!CImageLoader::SavePng(Writer, Image))
 	{
-		delete[](pRowPointers[y]);
+		// error already logged
+		io_close(File);
+		return false;
 	}
-	delete[](pRowPointers);
-
-	png_destroy_info_struct(pPNGStruct, &pPNGInfo);
-	png_destroy_write_struct(&pPNGStruct, nullptr);
 
-	return true;
+	const bool WriteSuccess = io_write(File, Writer.Data(), Writer.Size()) == Writer.Size();
+	if(!WriteSuccess)
+	{
+		log_error("png", "failed to write PNG data to file. filename='%s'", pFilename);
+	}
+	io_close(File);
+	return WriteSuccess;
 }
diff --git a/src/engine/gfx/image_loader.h b/src/engine/gfx/image_loader.h
index 0da2474a0f..c2658a6e3c 100644
--- a/src/engine/gfx/image_loader.h
+++ b/src/engine/gfx/image_loader.h
@@ -1,38 +1,57 @@
 #ifndef ENGINE_GFX_IMAGE_LOADER_H
 #define ENGINE_GFX_IMAGE_LOADER_H
 
-#include <cstddef>
-#include <cstdint>
+#include <base/types.h>
+
+#include <engine/image.h>
+
 #include <vector>
 
-enum EImageFormat
+class CByteBufferReader
 {
-	IMAGE_FORMAT_R = 0,
-	IMAGE_FORMAT_RA,
-	IMAGE_FORMAT_RGB,
-	IMAGE_FORMAT_RGBA,
+	const uint8_t *m_pData;
+	size_t m_Size;
+	size_t m_ReadOffset = 0;
+	bool m_Error = false;
+
+public:
+	CByteBufferReader(const uint8_t *pData, size_t Size) :
+		m_pData(pData),
+		m_Size(Size) {}
+
+	bool Read(void *pData, size_t Size);
+	bool Error() const { return m_Error; }
 };
 
-typedef std::vector<uint8_t> TImageByteBuffer;
-struct SImageByteBuffer
+class CByteBufferWriter
 {
-	SImageByteBuffer(std::vector<uint8_t> *pvBuff) :
-		m_LoadOffset(0), m_pvLoadedImageBytes(pvBuff), m_Err(0) {}
-	size_t m_LoadOffset;
-	std::vector<uint8_t> *m_pvLoadedImageBytes;
-	int m_Err;
+	std::vector<uint8_t> m_vBuffer;
+
+public:
+	void Write(const void *pData, size_t Size);
+	const uint8_t *Data() const { return m_vBuffer.data(); }
+	size_t Size() const { return m_vBuffer.size(); }
 };
 
-enum
+class CImageLoader
 {
-	PNGLITE_COLOR_TYPE = 1 << 0,
-	PNGLITE_BIT_DEPTH = 1 << 1,
-	PNGLITE_INTERLACE_TYPE = 1 << 2,
-	PNGLITE_COMPRESSION_TYPE = 1 << 3,
-	PNGLITE_FILTER_TYPE = 1 << 4,
-};
+	CImageLoader() = delete;
+
+public:
+	enum
+	{
+		PNGLITE_COLOR_TYPE = 1 << 0,
+		PNGLITE_BIT_DEPTH = 1 << 1,
+		PNGLITE_INTERLACE_TYPE = 1 << 2,
+		PNGLITE_COMPRESSION_TYPE = 1 << 3,
+		PNGLITE_FILTER_TYPE = 1 << 4,
+	};
 
-bool LoadPNG(SImageByteBuffer &ByteLoader, const char *pFileName, int &PngliteIncompatible, int &Width, int &Height, uint8_t *&pImageBuff, EImageFormat &ImageFormat);
-bool SavePNG(EImageFormat ImageFormat, const uint8_t *pRawBuffer, SImageByteBuffer &WrittenBytes, int Width, int Height);
+	static bool LoadPng(CByteBufferReader &Reader, const char *pContextName, CImageInfo &Image, int &PngliteIncompatible);
+	static bool LoadPng(IOHANDLE File, const char *pFilename, CImageInfo &Image, int &PngliteIncompatible);
+
+	static bool SavePng(CByteBufferWriter &Writer, const CImageInfo &Image);
+	static bool SavePng(IOHANDLE File, const char *pFilename, const CImageInfo &Image);
+};
 
 #endif // ENGINE_GFX_IMAGE_LOADER_H
diff --git a/src/engine/gfx/image_manipulation.cpp b/src/engine/gfx/image_manipulation.cpp
index 992ab7311a..3b7ab1aac8 100644
--- a/src/engine/gfx/image_manipulation.cpp
+++ b/src/engine/gfx/image_manipulation.cpp
@@ -1,39 +1,117 @@
 #include "image_manipulation.h"
+
 #include <base/math.h>
 #include <base/system.h>
 
-#define TW_DILATE_ALPHA_THRESHOLD 10
+bool ConvertToRgba(uint8_t *pDest, const CImageInfo &SourceImage)
+{
+	if(SourceImage.m_Format == CImageInfo::FORMAT_RGBA)
+	{
+		mem_copy(pDest, SourceImage.m_pData, SourceImage.DataSize());
+		return true;
+	}
+	else
+	{
+		const size_t SrcChannelCount = CImageInfo::PixelSize(SourceImage.m_Format);
+		const size_t DstChannelCount = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+		for(size_t Y = 0; Y < SourceImage.m_Height; ++Y)
+		{
+			for(size_t X = 0; X < SourceImage.m_Width; ++X)
+			{
+				size_t ImgOffsetSrc = (Y * SourceImage.m_Width * SrcChannelCount) + (X * SrcChannelCount);
+				size_t ImgOffsetDest = (Y * SourceImage.m_Width * DstChannelCount) + (X * DstChannelCount);
+				if(SourceImage.m_Format == CImageInfo::FORMAT_RGB)
+				{
+					mem_copy(&pDest[ImgOffsetDest], &SourceImage.m_pData[ImgOffsetSrc], SrcChannelCount);
+					pDest[ImgOffsetDest + 3] = 255;
+				}
+				else if(SourceImage.m_Format == CImageInfo::FORMAT_RA)
+				{
+					pDest[ImgOffsetDest + 0] = SourceImage.m_pData[ImgOffsetSrc];
+					pDest[ImgOffsetDest + 1] = SourceImage.m_pData[ImgOffsetSrc];
+					pDest[ImgOffsetDest + 2] = SourceImage.m_pData[ImgOffsetSrc];
+					pDest[ImgOffsetDest + 3] = SourceImage.m_pData[ImgOffsetSrc + 1];
+				}
+				else if(SourceImage.m_Format == CImageInfo::FORMAT_R)
+				{
+					pDest[ImgOffsetDest + 0] = 255;
+					pDest[ImgOffsetDest + 1] = 255;
+					pDest[ImgOffsetDest + 2] = 255;
+					pDest[ImgOffsetDest + 3] = SourceImage.m_pData[ImgOffsetSrc];
+				}
+				else
+				{
+					dbg_assert(false, "SourceImage.m_Format invalid");
+				}
+			}
+		}
+		return false;
+	}
+}
+
+bool ConvertToRgbaAlloc(uint8_t *&pDest, const CImageInfo &SourceImage)
+{
+	pDest = static_cast<uint8_t *>(malloc(SourceImage.m_Width * SourceImage.m_Height * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA)));
+	return ConvertToRgba(pDest, SourceImage);
+}
+
+bool ConvertToRgba(CImageInfo &Image)
+{
+	if(Image.m_Format == CImageInfo::FORMAT_RGBA)
+		return true;
+
+	uint8_t *pRgbaData;
+	ConvertToRgbaAlloc(pRgbaData, Image);
+	free(Image.m_pData);
+	Image.m_pData = pRgbaData;
+	Image.m_Format = CImageInfo::FORMAT_RGBA;
+	return false;
+}
 
-static void Dilate(int w, int h, const unsigned char *pSrc, unsigned char *pDest, unsigned char AlphaThreshold = TW_DILATE_ALPHA_THRESHOLD)
+void ConvertToGrayscale(const CImageInfo &Image)
+{
+	if(Image.m_Format == CImageInfo::FORMAT_R || Image.m_Format == CImageInfo::FORMAT_RA)
+		return;
+
+	const size_t Step = Image.PixelSize();
+	for(size_t i = 0; i < Image.m_Width * Image.m_Height; ++i)
+	{
+		const int Average = (Image.m_pData[i * Step] + Image.m_pData[i * Step + 1] + Image.m_pData[i * Step + 2]) / 3;
+		Image.m_pData[i * Step] = Average;
+		Image.m_pData[i * Step + 1] = Average;
+		Image.m_pData[i * Step + 2] = Average;
+	}
+}
+
+static constexpr int DILATE_BPP = 4; // RGBA assumed
+static constexpr uint8_t DILATE_ALPHA_THRESHOLD = 10;
+
+static void Dilate(int w, int h, const uint8_t *pSrc, uint8_t *pDest)
 {
-	const int BPP = 4; // RGBA assumed
-	int ix, iy;
 	const int aDirX[] = {0, -1, 1, 0};
 	const int aDirY[] = {-1, 0, 0, 1};
 
-	int AlphaCompIndex = BPP - 1;
-
 	int m = 0;
 	for(int y = 0; y < h; y++)
 	{
-		for(int x = 0; x < w; x++, m += BPP)
+		for(int x = 0; x < w; x++, m += DILATE_BPP)
 		{
-			for(int i = 0; i < BPP; ++i)
+			for(int i = 0; i < DILATE_BPP; ++i)
 				pDest[m + i] = pSrc[m + i];
-			if(pSrc[m + AlphaCompIndex] > AlphaThreshold)
+			if(pSrc[m + DILATE_BPP - 1] > DILATE_ALPHA_THRESHOLD)
 				continue;
 
 			int aSumOfOpaque[] = {0, 0, 0};
 			int Counter = 0;
 			for(int c = 0; c < 4; c++)
 			{
-				ix = clamp(x + aDirX[c], 0, w - 1);
-				iy = clamp(y + aDirY[c], 0, h - 1);
-				int k = iy * w * BPP + ix * BPP;
-				if(pSrc[k + AlphaCompIndex] > AlphaThreshold)
+				const int ClampedX = clamp(x + aDirX[c], 0, w - 1);
+				const int ClampedY = clamp(y + aDirY[c], 0, h - 1);
+				const int SrcIndex = ClampedY * w * DILATE_BPP + ClampedX * DILATE_BPP;
+				if(pSrc[SrcIndex + DILATE_BPP - 1] > DILATE_ALPHA_THRESHOLD)
 				{
-					for(int p = 0; p < BPP - 1; ++p)
-						aSumOfOpaque[p] += pSrc[k + p];
+					for(int p = 0; p < DILATE_BPP - 1; ++p)
+						aSumOfOpaque[p] += pSrc[SrcIndex + p];
 					++Counter;
 					break;
 				}
@@ -41,77 +119,80 @@ static void Dilate(int w, int h, const unsigned char *pSrc, unsigned char *pDest
 
 			if(Counter > 0)
 			{
-				for(int i = 0; i < BPP - 1; ++i)
+				for(int i = 0; i < DILATE_BPP - 1; ++i)
 				{
 					aSumOfOpaque[i] /= Counter;
-					pDest[m + i] = (unsigned char)aSumOfOpaque[i];
+					pDest[m + i] = (uint8_t)aSumOfOpaque[i];
 				}
 
-				pDest[m + AlphaCompIndex] = 255;
+				pDest[m + DILATE_BPP - 1] = 255;
 			}
 		}
 	}
 }
 
-static void CopyColorValues(int w, int h, int BPP, const unsigned char *pSrc, unsigned char *pDest)
+static void CopyColorValues(int w, int h, const uint8_t *pSrc, uint8_t *pDest)
 {
 	int m = 0;
 	for(int y = 0; y < h; y++)
 	{
-		for(int x = 0; x < w; x++, m += BPP)
+		for(int x = 0; x < w; x++, m += DILATE_BPP)
 		{
-			for(int i = 0; i < BPP - 1; ++i)
+			if(pDest[m + DILATE_BPP - 1] == 0)
 			{
-				if(pDest[m + 3] == 0)
-					pDest[m + i] = pSrc[m + i];
+				mem_copy(&pDest[m], &pSrc[m], DILATE_BPP - 1);
 			}
 		}
 	}
 }
 
-void DilateImage(unsigned char *pImageBuff, int w, int h)
+void DilateImage(uint8_t *pImageBuff, int w, int h)
 {
 	DilateImageSub(pImageBuff, w, h, 0, 0, w, h);
 }
 
-void DilateImageSub(unsigned char *pImageBuff, int w, int h, int x, int y, int sw, int sh)
+void DilateImage(const CImageInfo &Image)
 {
-	const int BPP = 4; // RGBA assumed
-	unsigned char *apBuffer[2] = {NULL, NULL};
+	dbg_assert(Image.m_Format == CImageInfo::FORMAT_RGBA, "Dilate requires RGBA format");
+	DilateImage(Image.m_pData, Image.m_Width, Image.m_Height);
+}
 
-	apBuffer[0] = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
-	apBuffer[1] = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
-	unsigned char *pBufferOriginal = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
+void DilateImageSub(uint8_t *pImageBuff, int w, int h, int x, int y, int SubWidth, int SubHeight)
+{
+	uint8_t *apBuffer[2] = {nullptr, nullptr};
 
-	unsigned char *pPixelBuff = (unsigned char *)pImageBuff;
+	const size_t ImageSize = (size_t)SubWidth * SubHeight * sizeof(uint8_t) * DILATE_BPP;
+	apBuffer[0] = (uint8_t *)malloc(ImageSize);
+	apBuffer[1] = (uint8_t *)malloc(ImageSize);
+	uint8_t *pBufferOriginal = (uint8_t *)malloc(ImageSize);
 
-	for(int Y = 0; Y < sh; ++Y)
+	for(int Y = 0; Y < SubHeight; ++Y)
 	{
-		int SrcImgOffset = ((y + Y) * w * BPP) + (x * BPP);
-		int DstImgOffset = (Y * sw * BPP);
-		int CopySize = sw * BPP;
-		mem_copy(&pBufferOriginal[DstImgOffset], &pPixelBuff[SrcImgOffset], CopySize);
+		int SrcImgOffset = ((y + Y) * w * DILATE_BPP) + (x * DILATE_BPP);
+		int DstImgOffset = (Y * SubWidth * DILATE_BPP);
+		int CopySize = SubWidth * DILATE_BPP;
+		mem_copy(&pBufferOriginal[DstImgOffset], &pImageBuff[SrcImgOffset], CopySize);
 	}
 
-	Dilate(sw, sh, pBufferOriginal, apBuffer[0]);
+	Dilate(SubWidth, SubHeight, pBufferOriginal, apBuffer[0]);
 
 	for(int i = 0; i < 5; i++)
 	{
-		Dilate(sw, sh, apBuffer[0], apBuffer[1]);
-		Dilate(sw, sh, apBuffer[1], apBuffer[0]);
+		Dilate(SubWidth, SubHeight, apBuffer[0], apBuffer[1]);
+		Dilate(SubWidth, SubHeight, apBuffer[1], apBuffer[0]);
 	}
 
-	CopyColorValues(sw, sh, BPP, apBuffer[0], pBufferOriginal);
+	CopyColorValues(SubWidth, SubHeight, apBuffer[0], pBufferOriginal);
 
 	free(apBuffer[0]);
 	free(apBuffer[1]);
 
-	for(int Y = 0; Y < sh; ++Y)
+	for(int Y = 0; Y < SubHeight; ++Y)
 	{
-		int SrcImgOffset = ((y + Y) * w * BPP) + (x * BPP);
-		int DstImgOffset = (Y * sw * BPP);
-		int CopySize = sw * BPP;
-		mem_copy(&pPixelBuff[SrcImgOffset], &pBufferOriginal[DstImgOffset], CopySize);
+		int SrcImgOffset = ((y + Y) * w * DILATE_BPP) + (x * DILATE_BPP);
+		int DstImgOffset = (Y * SubWidth * DILATE_BPP);
+		int CopySize = SubWidth * DILATE_BPP;
+		mem_copy(&pImageBuff[SrcImgOffset], &pBufferOriginal[DstImgOffset], CopySize);
 	}
 
 	free(pBufferOriginal);
@@ -127,18 +208,15 @@ static float CubicHermite(float A, float B, float C, float D, float t)
 	return (a * t * t * t) + (b * t * t) + (c * t) + d;
 }
 
-static void GetPixelClamped(const uint8_t *pSourceImage, int x, int y, uint32_t W, uint32_t H, size_t BPP, uint8_t aTmp[])
+static void GetPixelClamped(const uint8_t *pSourceImage, int x, int y, uint32_t W, uint32_t H, size_t BPP, uint8_t aSample[4])
 {
 	x = clamp<int>(x, 0, (int)W - 1);
 	y = clamp<int>(y, 0, (int)H - 1);
 
-	for(size_t i = 0; i < BPP; i++)
-	{
-		aTmp[i] = pSourceImage[x * BPP + (W * BPP * y) + i];
-	}
+	mem_copy(aSample, &pSourceImage[x * BPP + (W * BPP * y)], BPP);
 }
 
-static void SampleBicubic(const uint8_t *pSourceImage, float u, float v, uint32_t W, uint32_t H, size_t BPP, uint8_t aSample[])
+static void SampleBicubic(const uint8_t *pSourceImage, float u, float v, uint32_t W, uint32_t H, size_t BPP, uint8_t aSample[4])
 {
 	float X = (u * W) - 0.5f;
 	int xInt = (int)X;
@@ -148,79 +226,37 @@ static void SampleBicubic(const uint8_t *pSourceImage, float u, float v, uint32_
 	int yInt = (int)Y;
 	float yFract = Y - std::floor(Y);
 
-	uint8_t aPX00[4];
-	uint8_t aPX10[4];
-	uint8_t aPX20[4];
-	uint8_t aPX30[4];
-
-	uint8_t aPX01[4];
-	uint8_t aPX11[4];
-	uint8_t aPX21[4];
-	uint8_t aPX31[4];
-
-	uint8_t aPX02[4];
-	uint8_t aPX12[4];
-	uint8_t aPX22[4];
-	uint8_t aPX32[4];
-
-	uint8_t aPX03[4];
-	uint8_t aPX13[4];
-	uint8_t aPX23[4];
-	uint8_t aPX33[4];
-
-	GetPixelClamped(pSourceImage, xInt - 1, yInt - 1, W, H, BPP, aPX00);
-	GetPixelClamped(pSourceImage, xInt + 0, yInt - 1, W, H, BPP, aPX10);
-	GetPixelClamped(pSourceImage, xInt + 1, yInt - 1, W, H, BPP, aPX20);
-	GetPixelClamped(pSourceImage, xInt + 2, yInt - 1, W, H, BPP, aPX30);
-
-	GetPixelClamped(pSourceImage, xInt - 1, yInt + 0, W, H, BPP, aPX01);
-	GetPixelClamped(pSourceImage, xInt + 0, yInt + 0, W, H, BPP, aPX11);
-	GetPixelClamped(pSourceImage, xInt + 1, yInt + 0, W, H, BPP, aPX21);
-	GetPixelClamped(pSourceImage, xInt + 2, yInt + 0, W, H, BPP, aPX31);
-
-	GetPixelClamped(pSourceImage, xInt - 1, yInt + 1, W, H, BPP, aPX02);
-	GetPixelClamped(pSourceImage, xInt + 0, yInt + 1, W, H, BPP, aPX12);
-	GetPixelClamped(pSourceImage, xInt + 1, yInt + 1, W, H, BPP, aPX22);
-	GetPixelClamped(pSourceImage, xInt + 2, yInt + 1, W, H, BPP, aPX32);
-
-	GetPixelClamped(pSourceImage, xInt - 1, yInt + 2, W, H, BPP, aPX03);
-	GetPixelClamped(pSourceImage, xInt + 0, yInt + 2, W, H, BPP, aPX13);
-	GetPixelClamped(pSourceImage, xInt + 1, yInt + 2, W, H, BPP, aPX23);
-	GetPixelClamped(pSourceImage, xInt + 2, yInt + 2, W, H, BPP, aPX33);
+	uint8_t aaaSamples[4][4][4];
+	for(int y = 0; y < 4; ++y)
+	{
+		for(int x = 0; x < 4; ++x)
+		{
+			GetPixelClamped(pSourceImage, xInt + x - 1, yInt + y - 1, W, H, BPP, aaaSamples[x][y]);
+		}
+	}
 
 	for(size_t i = 0; i < BPP; i++)
 	{
-		float Clmn0 = CubicHermite(aPX00[i], aPX10[i], aPX20[i], aPX30[i], xFract);
-		float Clmn1 = CubicHermite(aPX01[i], aPX11[i], aPX21[i], aPX31[i], xFract);
-		float Clmn2 = CubicHermite(aPX02[i], aPX12[i], aPX22[i], aPX32[i], xFract);
-		float Clmn3 = CubicHermite(aPX03[i], aPX13[i], aPX23[i], aPX33[i], xFract);
-
-		float Valuef = CubicHermite(Clmn0, Clmn1, Clmn2, Clmn3, yFract);
-
-		Valuef = clamp<float>(Valuef, 0.0f, 255.0f);
-
-		aSample[i] = (uint8_t)Valuef;
+		float aRows[4];
+		for(int y = 0; y < 4; ++y)
+		{
+			aRows[y] = CubicHermite(aaaSamples[0][y][i], aaaSamples[1][y][i], aaaSamples[2][y][i], aaaSamples[3][y][i], xFract);
+		}
+		aSample[i] = (uint8_t)clamp<float>(CubicHermite(aRows[0], aRows[1], aRows[2], aRows[3], yFract), 0.0f, 255.0f);
 	}
 }
 
 static void ResizeImage(const uint8_t *pSourceImage, uint32_t SW, uint32_t SH, uint8_t *pDestinationImage, uint32_t W, uint32_t H, size_t BPP)
 {
-	uint8_t aSample[4];
-	int y, x;
-
-	for(y = 0; y < (int)H; ++y)
+	for(int y = 0; y < (int)H; ++y)
 	{
 		float v = (float)y / (float)(H - 1);
-
-		for(x = 0; x < (int)W; ++x)
+		for(int x = 0; x < (int)W; ++x)
 		{
 			float u = (float)x / (float)(W - 1);
+			uint8_t aSample[4];
 			SampleBicubic(pSourceImage, u, v, SW, SH, BPP, aSample);
-
-			for(size_t i = 0; i < BPP; ++i)
-			{
-				pDestinationImage[x * BPP + ((W * BPP) * y) + i] = aSample[i];
-			}
+			mem_copy(&pDestinationImage[x * BPP + ((W * BPP) * y)], aSample, BPP);
 		}
 	}
 }
@@ -232,6 +268,15 @@ uint8_t *ResizeImage(const uint8_t *pImageData, int Width, int Height, int NewWi
 	return pTmpData;
 }
 
+void ResizeImage(CImageInfo &Image, int NewWidth, int NewHeight)
+{
+	uint8_t *pNewData = ResizeImage(Image.m_pData, Image.m_Width, Image.m_Height, NewWidth, NewHeight, Image.PixelSize());
+	free(Image.m_pData);
+	Image.m_pData = pNewData;
+	Image.m_Width = NewWidth;
+	Image.m_Height = NewHeight;
+}
+
 int HighestBit(int OfVar)
 {
 	if(!OfVar)
diff --git a/src/engine/gfx/image_manipulation.h b/src/engine/gfx/image_manipulation.h
index 58a1335402..ae39144e24 100644
--- a/src/engine/gfx/image_manipulation.h
+++ b/src/engine/gfx/image_manipulation.h
@@ -1,14 +1,29 @@
 #ifndef ENGINE_GFX_IMAGE_MANIPULATION_H
 #define ENGINE_GFX_IMAGE_MANIPULATION_H
 
+#include <engine/image.h>
+
 #include <cstdint>
 
+// Destination must have appropriate size for RGBA data
+bool ConvertToRgba(uint8_t *pDest, const CImageInfo &SourceImage);
+// Allocates appropriate buffer with malloc, must be freed by caller
+bool ConvertToRgbaAlloc(uint8_t *&pDest, const CImageInfo &SourceImage);
+// Replaces existing image data with RGBA data (unless already RGBA)
+bool ConvertToRgba(CImageInfo &Image);
+
+// Changes the image data (not the format)
+void ConvertToGrayscale(const CImageInfo &Image);
+
 // These functions assume that the image data is 4 bytes per pixel RGBA
-void DilateImage(unsigned char *pImageBuff, int w, int h);
-void DilateImageSub(unsigned char *pImageBuff, int w, int h, int x, int y, int sw, int sh);
+void DilateImage(uint8_t *pImageBuff, int w, int h);
+void DilateImage(const CImageInfo &Image);
+void DilateImageSub(uint8_t *pImageBuff, int w, int h, int x, int y, int SubWidth, int SubHeight);
 
-// returned pointer is allocated with malloc
+// Returned buffer is allocated with malloc, must be freed by caller
 uint8_t *ResizeImage(const uint8_t *pImageData, int Width, int Height, int NewWidth, int NewHeight, int BPP);
+// Replaces existing image data with resized buffer
+void ResizeImage(CImageInfo &Image, int NewWidth, int NewHeight);
 
 int HighestBit(int OfVar);
 
diff --git a/src/engine/graphics.h b/src/engine/graphics.h
index 951748b117..3699c3ea73 100644
--- a/src/engine/graphics.h
+++ b/src/engine/graphics.h
@@ -3,6 +3,7 @@
 #ifndef ENGINE_GRAPHICS_H
 #define ENGINE_GRAPHICS_H
 
+#include "image.h"
 #include "kernel.h"
 #include "warning.h"
 
@@ -64,59 +65,6 @@ struct SGraphicTileTexureCoords
 	ubvec4 m_TexCoordBottomLeft;
 };
 
-class CImageInfo
-{
-public:
-	enum EImageFormat
-	{
-		FORMAT_ERROR = -1,
-		FORMAT_RGB = 0,
-		FORMAT_RGBA = 1,
-		FORMAT_SINGLE_COMPONENT = 2,
-	};
-
-	/**
-	 * Contains the width of the image
-	 */
-	int m_Width = 0;
-
-	/**
-	 * Contains the height of the image
-	 */
-	int m_Height = 0;
-
-	/**
-	 * Contains the format of the image.
-	 *
-	 * @see EImageFormat
-	 */
-	EImageFormat m_Format = FORMAT_ERROR;
-
-	/**
-	 * Pointer to the image data.
-	 */
-	void *m_pData = nullptr;
-
-	static size_t PixelSize(EImageFormat Format)
-	{
-		dbg_assert(Format != FORMAT_ERROR, "Format invalid");
-		static const size_t s_aSizes[] = {3, 4, 1};
-		return s_aSizes[(int)Format];
-	}
-
-	size_t PixelSize() const
-	{
-		return PixelSize(m_Format);
-	}
-
-	static EImageFormat ImageFormatFromInt(int Format)
-	{
-		if(Format < (int)FORMAT_RGB || Format > (int)FORMAT_SINGLE_COMPONENT)
-			return FORMAT_ERROR;
-		return (EImageFormat)Format;
-	}
-};
-
 /*
 	Structure: CVideoMode
 */
@@ -202,9 +150,9 @@ enum EBackendType
 	BACKEND_TYPE_COUNT,
 };
 
-struct STWGraphicGPU
+struct STWGraphicGpu
 {
-	enum ETWGraphicsGPUType
+	enum ETWGraphicsGpuType
 	{
 		GRAPHICS_GPU_TYPE_DISCRETE = 0,
 		GRAPHICS_GPU_TYPE_INTEGRATED,
@@ -215,16 +163,16 @@ struct STWGraphicGPU
 		GRAPHICS_GPU_TYPE_INVALID,
 	};
 
-	struct STWGraphicGPUItem
+	struct STWGraphicGpuItem
 	{
 		char m_aName[256];
-		ETWGraphicsGPUType m_GPUType;
+		ETWGraphicsGpuType m_GpuType;
 	};
-	std::vector<STWGraphicGPUItem> m_vGPUs;
-	STWGraphicGPUItem m_AutoGPU;
+	std::vector<STWGraphicGpuItem> m_vGpus;
+	STWGraphicGpuItem m_AutoGpu;
 };
 
-typedef STWGraphicGPU TTWGraphicsGPUList;
+typedef STWGraphicGpu TTwGraphicsGpuList;
 
 typedef std::function<void()> WINDOW_RESIZE_FUNC;
 typedef std::function<void()> WINDOW_PROPS_CHANGED_FUNC;
@@ -243,11 +191,9 @@ class IGraphics : public IInterface
 public:
 	enum
 	{
-		TEXLOAD_NOMIPMAPS = 1 << 1,
-		TEXLOAD_NO_COMPRESSION = 1 << 2,
-		TEXLOAD_TO_3D_TEXTURE = (1 << 3),
-		TEXLOAD_TO_2D_ARRAY_TEXTURE = (1 << 4),
-		TEXLOAD_NO_2D_TEXTURE = (1 << 5),
+		TEXLOAD_TO_3D_TEXTURE = 1 << 0,
+		TEXLOAD_TO_2D_ARRAY_TEXTURE = 1 << 1,
+		TEXLOAD_NO_2D_TEXTURE = 1 << 2,
 	};
 
 	class CTextureHandle
@@ -275,13 +221,14 @@ class IGraphics : public IInterface
 	int WindowHeight() const { return m_ScreenHeight / m_ScreenHiDPIScale; }
 
 	virtual void WarnPngliteIncompatibleImages(bool Warn) = 0;
-	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless) = 0;
 	virtual bool SetWindowScreen(int Index) = 0;
 	virtual bool SetVSync(bool State) = 0;
 	virtual bool SetMultiSampling(uint32_t ReqMultiSamplingCount, uint32_t &MultiSamplingCountBackend) = 0;
 	virtual int GetWindowScreen() = 0;
 	virtual void Move(int x, int y) = 0;
-	virtual void Resize(int w, int h, int RefreshRate) = 0;
+	virtual bool Resize(int w, int h, int RefreshRate) = 0;
+	virtual void ResizeToScreen() = 0;
 	virtual void GotResized(int w, int h, int RefreshRate) = 0;
 	virtual void UpdateViewport(int X, int Y, int W, int H, bool ByResize) = 0;
 
@@ -295,8 +242,8 @@ class IGraphics : public IInterface
 	*/
 	virtual void AddWindowPropChangeListener(WINDOW_PROPS_CHANGED_FUNC pFunc) = 0;
 
-	virtual void WindowDestroyNtf(uint32_t WindowID) = 0;
-	virtual void WindowCreateNtf(uint32_t WindowID) = 0;
+	virtual void WindowDestroyNtf(uint32_t WindowId) = 0;
+	virtual void WindowCreateNtf(uint32_t WindowId) = 0;
 
 	// ForceClearNow forces the backend to trigger a clear, even at performance cost, else it might be delayed by one frame
 	virtual void Clear(float r, float g, float b, bool ForceClearNow = false) = 0;
@@ -319,37 +266,30 @@ class IGraphics : public IInterface
 	virtual uint64_t StreamedMemoryUsage() const = 0;
 	virtual uint64_t StagingMemoryUsage() const = 0;
 
-	virtual const TTWGraphicsGPUList &GetGPUs() const = 0;
-
-	virtual bool LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) = 0;
-	virtual void FreePNG(CImageInfo *pImg) = 0;
-
-	virtual bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) = 0;
-	virtual bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) = 0;
+	virtual const TTwGraphicsGpuList &GetGpus() const = 0;
 
-	// destination and source buffer require to have the same width and height
-	virtual void CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) = 0;
+	virtual bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) = 0;
+	virtual bool LoadPng(CImageInfo &Image, const uint8_t *pData, size_t DataSize, const char *pContextName) = 0;
 
-	// destination width must be equal to the subwidth of the source
-	virtual void CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight) = 0;
+	virtual bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) = 0;
+	virtual bool IsImageFormatRgba(const char *pContextName, const CImageInfo &Image) = 0;
 
-	virtual int UnloadTexture(CTextureHandle *pIndex) = 0;
-	virtual CTextureHandle LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName = nullptr) = 0;
-	virtual int LoadTextureRawSub(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData) = 0;
+	virtual void UnloadTexture(CTextureHandle *pIndex) = 0;
+	virtual CTextureHandle LoadTextureRaw(const CImageInfo &Image, int Flags, const char *pTexName = nullptr) = 0;
+	virtual CTextureHandle LoadTextureRawMove(CImageInfo &Image, int Flags, const char *pTexName = nullptr) = 0;
 	virtual CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) = 0;
-	virtual CTextureHandle NullTexture() const = 0;
 	virtual void TextureSet(CTextureHandle Texture) = 0;
 	void TextureClear() { TextureSet(CTextureHandle()); }
 
 	// pTextData & pTextOutlineData are automatically free'd
-	virtual bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData) = 0;
+	virtual bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, uint8_t *pTextData, uint8_t *pTextOutlineData) = 0;
 	virtual bool UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture) = 0;
-	virtual bool UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData) = 0;
+	virtual bool UpdateTextTexture(CTextureHandle TextureId, int x, int y, size_t Width, size_t Height, const uint8_t *pData) = 0;
 
-	virtual CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) = 0;
+	virtual CTextureHandle LoadSpriteTexture(const CImageInfo &FromImageInfo, const struct CDataSprite *pSprite) = 0;
 
-	virtual bool IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h) = 0;
-	virtual bool IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) = 0;
+	virtual bool IsImageSubFullyTransparent(const CImageInfo &FromImageInfo, int x, int y, int w, int h) = 0;
+	virtual bool IsSpriteTextureFullyTransparent(const CImageInfo &FromImageInfo, const struct CDataSprite *pSprite) = 0;
 
 	virtual void FlushVertices(bool KeepVertices = false) = 0;
 	virtual void FlushVerticesTex3D() = 0;
@@ -503,18 +443,29 @@ class IGraphics : public IInterface
 		CColorVertex() {}
 		CColorVertex(int i, float r, float g, float b, float a) :
 			m_Index(i), m_R(r), m_G(g), m_B(b), m_A(a) {}
+		CColorVertex(int i, ColorRGBA Color) :
+			m_Index(i), m_R(Color.r), m_G(Color.g), m_B(Color.b), m_A(Color.a) {}
 	};
-	virtual void SetColorVertex(const CColorVertex *pArray, int Num) = 0;
+	virtual void SetColorVertex(const CColorVertex *pArray, size_t Num) = 0;
 	virtual void SetColor(float r, float g, float b, float a) = 0;
 	virtual void SetColor(ColorRGBA Color) = 0;
 	virtual void SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight) = 0;
 	virtual void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) = 0;
-	virtual void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) = 0;
+	virtual void ChangeColorOfQuadVertices(size_t QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) = 0;
 
+	/**
+	 * Reads the color at the specified position from the backbuffer once,
+	 * after the next swap operation.
+	 *
+	 * @param Position The pixel position to read.
+	 * @param pColor Pointer that will receive the read pixel color.
+	 * The pointer must be valid until the next swap operation.
+	 */
+	virtual void ReadPixel(ivec2 Position, ColorRGBA *pColor) = 0;
 	virtual void TakeScreenshot(const char *pFilename) = 0;
 	virtual void TakeCustomScreenshot(const char *pFilename) = 0;
 	virtual int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) = 0;
-
+	virtual void GetCurrentVideoMode(CVideoMode &CurMode, int Screen) = 0;
 	virtual void Swap() = 0;
 	virtual int GetNumScreens() const = 0;
 	virtual const char *GetScreenName(int Screen) const = 0;
diff --git a/src/engine/http.h b/src/engine/http.h
new file mode 100644
index 0000000000..7aac63181c
--- /dev/null
+++ b/src/engine/http.h
@@ -0,0 +1,19 @@
+#ifndef ENGINE_HTTP_H
+#define ENGINE_HTTP_H
+
+#include "kernel.h"
+#include <memory>
+
+class IHttpRequest
+{
+};
+
+class IHttp : public IInterface
+{
+	MACRO_INTERFACE("http")
+
+public:
+	virtual void Run(std::shared_ptr<IHttpRequest> pRequest) = 0;
+};
+
+#endif
diff --git a/src/engine/image.h b/src/engine/image.h
new file mode 100644
index 0000000000..6b794952aa
--- /dev/null
+++ b/src/engine/image.h
@@ -0,0 +1,137 @@
+#ifndef ENGINE_IMAGE_H
+#define ENGINE_IMAGE_H
+
+#include <cstdint>
+
+#include <base/color.h>
+
+/**
+ * Represents an image that has been loaded into main memory.
+ */
+class CImageInfo
+{
+public:
+	/**
+	 * Defines the format of image data.
+	 */
+	enum EImageFormat
+	{
+		FORMAT_UNDEFINED = -1,
+		FORMAT_RGB = 0,
+		FORMAT_RGBA = 1,
+		FORMAT_R = 2,
+		FORMAT_RA = 3,
+	};
+
+	/**
+	 * Width of the image.
+	 */
+	size_t m_Width = 0;
+
+	/**
+	 * Height of the image.
+	 */
+	size_t m_Height = 0;
+
+	/**
+	 * Format of the image.
+	 *
+	 * @see EImageFormat
+	 */
+	EImageFormat m_Format = FORMAT_UNDEFINED;
+
+	/**
+	 * Pointer to the image data.
+	 */
+	uint8_t *m_pData = nullptr;
+
+	/**
+	 * Frees the image data and clears all info.
+	 */
+	void Free();
+
+	/**
+	 * Returns the pixel size in bytes for the given image format.
+	 *
+	 * @param Format Image format, must not be `FORMAT_UNDEFINED`.
+	 *
+	 * @return Size of one pixel with the given image format.
+	 */
+	static size_t PixelSize(EImageFormat Format);
+
+	/**
+	 * Returns a readable name for the given image format.
+	 *
+	 * @param Format Image format.
+	 *
+	 * @return Readable name for the given image format.
+	 */
+	static const char *FormatName(EImageFormat Format);
+
+	/**
+	 * Returns the pixel size in bytes for the format of this image.
+	 *
+	 * @return Size of one pixel with the format of this image.
+	 *
+	 * @remark The format must not be `FORMAT_UNDEFINED`.
+	 */
+	size_t PixelSize() const;
+
+	/**
+	 * Returns a readable name for the format of this image.
+	 *
+	 * @return Readable name for the format of this image.
+	 */
+	const char *FormatName() const;
+
+	/**
+	 * Returns the size of the data, as derived from the width, height and pixel size.
+	 *
+	 * @return Expected size of the image data.
+	 */
+	size_t DataSize() const;
+
+	/**
+	 * Returns whether this image is equal to the given image
+	 * in width, height, format and data.
+	 *
+	 * @param Other The image to compare with.
+	 *
+	 * @return `true` if the images are identical, `false` otherwise.
+	 */
+	bool DataEquals(const CImageInfo &Other) const;
+
+	/**
+	 * Returns the color of the pixel at the specified position.
+	 *
+	 * @param x The x-coordinate to read from.
+	 * @param y The y-coordinate to read from.
+	 *
+	 * @return Pixel color converted to normalized RGBA.
+	 */
+	ColorRGBA PixelColor(size_t x, size_t y) const;
+
+	/**
+	 * Sets the color of the pixel at the specified position.
+	 *
+	 * @param x The x-coordinate to write to.
+	 * @param y The y-coordinate to write to.
+	 * @param Color The normalized RGBA color to write.
+	 */
+	void SetPixelColor(size_t x, size_t y, ColorRGBA Color) const;
+
+	/**
+	 * Copies a rectangle of image data from the given image to this image.
+	 *
+	 * @param SrcImage The image to copy data from.
+	 * @param SrcX The x-offset in the source image.
+	 * @param SrcY The y-offset in the source image.
+	 * @param Width The width of the rectangle to copy.
+	 * @param Height The height of the rectangle to copy.
+	 * @param DestX The x-offset in the destination image (this).
+	 * @param DestY The y-offset in the destination image (this).
+	 */
+	void CopyRectFrom(const CImageInfo &SrcImage, size_t SrcX, size_t SrcY, size_t Width, size_t Height, size_t DestX, size_t DestY) const;
+};
+
+#endif
diff --git a/src/engine/input.h b/src/engine/input.h
index 87740c2fa2..9aa8733582 100644
--- a/src/engine/input.h
+++ b/src/engine/input.h
@@ -4,7 +4,14 @@
 #define ENGINE_INPUT_H
 
 #include "kernel.h"
-#include <base/system.h>
+
+#include <base/types.h>
+#include <base/vmath.h>
+
+#include <cstdint>
+#include <functional>
+#include <string>
+#include <vector>
 
 const int g_MaxKeys = 512;
 extern const char g_aaKeyStrings[g_MaxKeys][20];
@@ -13,33 +20,15 @@ class IInput : public IInterface
 {
 	MACRO_INTERFACE("input")
 public:
-	enum
-	{
-		INPUT_TEXT_SIZE = 32 * UTF8_BYTE_LENGTH + 1,
-	};
-
 	class CEvent
 	{
 	public:
 		int m_Flags;
 		int m_Key;
-		char m_aText[INPUT_TEXT_SIZE];
-		int m_InputCount;
-	};
-
-protected:
-	enum
-	{
-		INPUT_BUFFER_SIZE = 32
+		uint32_t m_InputCount;
+		char m_aText[32]; // SDL_TEXTINPUTEVENT_TEXT_SIZE
 	};
 
-	// quick access to events
-	size_t m_NumEvents;
-	CEvent m_aInputEvents[INPUT_BUFFER_SIZE];
-	int64_t m_LastUpdate;
-	float m_UpdateTime;
-
-public:
 	enum
 	{
 		FLAG_PRESS = 1 << 0,
@@ -52,27 +41,16 @@ class IInput : public IInterface
 		CURSOR_MOUSE,
 		CURSOR_JOYSTICK,
 	};
-	enum
-	{
-		MAX_COMPOSITION_ARRAY_SIZE = 32, // SDL2 limitation
-
-		COMP_LENGTH_INACTIVE = -1,
-	};
 
 	// events
-	size_t NumEvents() const { return m_NumEvents; }
-	virtual bool IsEventValid(const CEvent &Event) const = 0;
-	const CEvent &GetEvent(size_t Index) const
-	{
-		dbg_assert(Index < m_NumEvents, "Index invalid");
-		return m_aInputEvents[Index];
-	}
+	virtual void ConsumeEvents(std::function<void(const CEvent &Event)> Consumer) const = 0;
+	virtual void Clear() = 0;
 
 	/**
 	 * @return Rolling average of the time in seconds between
 	 * calls of the Update function.
 	 */
-	float GetUpdateTime() const { return m_UpdateTime; }
+	virtual float GetUpdateTime() const = 0;
 
 	// keys
 	virtual bool ModifierIsPressed() const = 0;
@@ -81,7 +59,7 @@ class IInput : public IInterface
 	virtual bool KeyIsPressed(int Key) const = 0;
 	virtual bool KeyPress(int Key, bool CheckCounter = false) const = 0;
 	const char *KeyName(int Key) const { return (Key >= 0 && Key < g_MaxKeys) ? g_aaKeyStrings[Key] : g_aaKeyStrings[0]; }
-	virtual void Clear() = 0;
+	virtual int FindKeyByName(const char *pKeyName) const = 0;
 
 	// joystick
 	class IJoystick
@@ -104,15 +82,64 @@ class IInput : public IInterface
 	virtual void SetActiveJoystick(size_t Index) = 0;
 
 	// mouse
-	virtual void NativeMousePos(int *pX, int *pY) const = 0;
-	virtual bool NativeMousePressed(int Index) = 0;
+	virtual vec2 NativeMousePos() const = 0;
+	virtual bool NativeMousePressed(int Index) const = 0;
 	virtual void MouseModeRelative() = 0;
 	virtual void MouseModeAbsolute() = 0;
-	virtual bool MouseDoubleClick() = 0;
 	virtual bool MouseRelative(float *pX, float *pY) = 0;
 
+	// touch
+	/**
+	 * Represents a unique finger for a current touch event. If there are multiple touch input devices, they
+	 * are handled transparently like different fingers. The concrete values of the member variables of this
+	 * class are arbitrary based on the touch device driver and should only be used to uniquely identify touch
+	 * fingers. Note that once a finger has been released, the same finger value may also be reused again.
+	 */
+	class CTouchFinger
+	{
+		friend class CInput;
+
+		int64_t m_DeviceId;
+		int64_t m_FingerId;
+
+	public:
+		bool operator==(const CTouchFinger &Other) const { return m_DeviceId == Other.m_DeviceId && m_FingerId == Other.m_FingerId; }
+		bool operator!=(const CTouchFinger &Other) const { return !(*this == Other); }
+	};
+	/**
+	 * Represents the state of a particular touch finger currently being pressed down on a touch device.
+	 */
+	class CTouchFingerState
+	{
+	public:
+		/**
+		 * The unique finger which this state is associated with.
+		 */
+		CTouchFinger m_Finger;
+		/**
+		 * The current position of the finger. The x- and y-components of the position are normalized to the
+		 * range `0.0f`-`1.0f` representing the absolute position of the finger on the current touch device.
+		 */
+		vec2 m_Position;
+		/**
+		 * The current delta of the finger. The x- and y-components of the delta are normalized to the
+		 * range `0.0f`-`1.0f` representing the absolute delta of the finger on the current touch device.
+		 *
+		 * @remark This is reset to zero at the end of each frame.
+		 */
+		vec2 m_Delta;
+	};
+	/**
+	 * Returns a vector of the states of all touch fingers currently being pressed down on touch devices.
+	 * Note that this only contains fingers which are pressed down, i.e. released fingers are never stored.
+	 * The order of the fingers in this vector is based on the order in which the fingers where pressed.
+	 *
+	 * @return vector of all touch finger states
+	 */
+	virtual const std::vector<CTouchFingerState> &TouchFingerStates() const = 0;
+
 	// clipboard
-	virtual const char *GetClipboardText() = 0;
+	virtual std::string GetClipboardText() = 0;
 	virtual void SetClipboardText(const char *pText) = 0;
 
 	// text editing
diff --git a/src/engine/kernel.h b/src/engine/kernel.h
index 3a2c4362bc..7412142a0d 100644
--- a/src/engine/kernel.h
+++ b/src/engine/kernel.h
@@ -33,8 +33,8 @@ public: \
 class IKernel
 {
 	// hide the implementation
-	virtual bool RegisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface, bool Destroy) = 0;
-	virtual bool ReregisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface) = 0;
+	virtual void RegisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface, bool Destroy) = 0;
+	virtual void ReregisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface) = 0;
 	virtual IInterface *RequestInterfaceImpl(const char *pInterfaceName) = 0;
 
 public:
@@ -44,14 +44,14 @@ class IKernel
 
 	// templated access to handle pointer conversions and interface names
 	template<class TINTERFACE>
-	bool RegisterInterface(TINTERFACE *pInterface, bool Destroy = true)
+	void RegisterInterface(TINTERFACE *pInterface, bool Destroy = true)
 	{
-		return RegisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface, Destroy);
+		RegisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface, Destroy);
 	}
 	template<class TINTERFACE>
-	bool ReregisterInterface(TINTERFACE *pInterface)
+	void ReregisterInterface(TINTERFACE *pInterface)
 	{
-		return ReregisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface);
+		ReregisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface);
 	}
 
 	// Usage example:
diff --git a/src/engine/keys.h b/src/engine/keys.h
index 88db9778ab..246fffff06 100644
--- a/src/engine/keys.h
+++ b/src/engine/keys.h
@@ -1,7 +1,7 @@
 #ifndef ENGINE_KEYS_H
 #define ENGINE_KEYS_H
 #if defined(CONF_FAMILY_WINDOWS)
-#undef KEY_EXECUTE
+   #undef KEY_EXECUTE
 #endif
 /* AUTO GENERATED! DO NOT EDIT MANUALLY! */
 enum
diff --git a/src/engine/map.h b/src/engine/map.h
index 47c2c5ed8a..10a996110e 100644
--- a/src/engine/map.h
+++ b/src/engine/map.h
@@ -24,10 +24,10 @@ class IMap : public IInterface
 	virtual int NumData() const = 0;
 
 	virtual int GetItemSize(int Index) = 0;
-	virtual void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr) = 0;
+	virtual void *GetItem(int Index, int *pType = nullptr, int *pId = nullptr) = 0;
 	virtual void GetType(int Type, int *pStart, int *pNum) = 0;
-	virtual int FindItemIndex(int Type, int ID) = 0;
-	virtual void *FindItem(int Type, int ID) = 0;
+	virtual int FindItemIndex(int Type, int Id) = 0;
+	virtual void *FindItem(int Type, int Id) = 0;
 	virtual int NumItems() const = 0;
 };
 
diff --git a/src/engine/message.h b/src/engine/message.h
index d862b8178b..2a24e3c7c0 100644
--- a/src/engine/message.h
+++ b/src/engine/message.h
@@ -9,18 +9,18 @@
 class CMsgPacker : public CPacker
 {
 public:
-	int m_MsgID;
+	int m_MsgId;
 	bool m_System;
 	bool m_NoTranslate;
 	CMsgPacker(int Type, bool System = false, bool NoTranslate = false) :
-		m_MsgID(Type), m_System(System), m_NoTranslate(NoTranslate)
+		m_MsgId(Type), m_System(System), m_NoTranslate(NoTranslate)
 	{
 		Reset();
 	}
 
 	template<typename T>
 	CMsgPacker(const T *, bool System = false, bool NoTranslate = false) :
-		CMsgPacker(T::ms_MsgID, System, NoTranslate)
+		CMsgPacker(T::ms_MsgId, System, NoTranslate)
 	{
 	}
 };
diff --git a/src/engine/server.h b/src/engine/server.h
index 1e81f77397..42e2463194 100644
--- a/src/engine/server.h
+++ b/src/engine/server.h
@@ -12,6 +12,7 @@
 
 #include "kernel.h"
 #include "message.h"
+#include <engine/shared/jsonwriter.h>
 #include <engine/shared/protocol.h>
 #include <game/generated/protocol.h>
 #include <game/generated/protocol7.h>
@@ -19,7 +20,7 @@
 
 struct CAntibotRoundData;
 
-// When recording a demo on the server, the ClientID -1 is used
+// When recording a demo on the server, the ClientId -1 is used
 enum
 {
 	SERVER_DEMO_CLIENT = -1
@@ -42,7 +43,7 @@ class IServer : public IInterface
 		bool m_GotDDNetVersion;
 		int m_DDNetVersion;
 		const char *m_pDDNetVersionStr;
-		const CUuid *m_pConnectionID;
+		const CUuid *m_pConnectionId;
 	};
 
 	int Tick() const { return m_CurrentGameTick; }
@@ -52,33 +53,34 @@ class IServer : public IInterface
 	virtual int MaxClients() const = 0;
 	virtual int ClientCount() const = 0;
 	virtual int DistinctClientCount() const = 0;
-	virtual const char *ClientName(int ClientID) const = 0;
-	virtual const char *ClientClan(int ClientID) const = 0;
-	virtual int ClientCountry(int ClientID) const = 0;
-	virtual bool ClientIngame(int ClientID) const = 0;
-	virtual bool ClientAuthed(int ClientID) const = 0;
-	virtual bool GetClientInfo(int ClientID, CClientInfo *pInfo) const = 0;
-	virtual void SetClientDDNetVersion(int ClientID, int DDNetVersion) = 0;
-	virtual void GetClientAddr(int ClientID, char *pAddrStr, int Size) const = 0;
+	virtual const char *ClientName(int ClientId) const = 0;
+	virtual const char *ClientClan(int ClientId) const = 0;
+	virtual int ClientCountry(int ClientId) const = 0;
+	virtual bool ClientSlotEmpty(int ClientId) const = 0;
+	virtual bool ClientIngame(int ClientId) const = 0;
+	virtual bool ClientAuthed(int ClientId) const = 0;
+	virtual bool GetClientInfo(int ClientId, CClientInfo *pInfo) const = 0;
+	virtual void SetClientDDNetVersion(int ClientId, int DDNetVersion) = 0;
+	virtual void GetClientAddr(int ClientId, char *pAddrStr, int Size) const = 0;
 
 	/**
 	 * Returns the version of the client with the given client ID.
 	 *
-	 * @param ClientID the client ID, which must be between 0 and
+	 * @param ClientId the client Id, which must be between 0 and
 	 * MAX_CLIENTS - 1, or equal to SERVER_DEMO_CLIENT for server demos.
 	 *
 	 * @return The version of the client with the given client ID.
 	 * For server demos this is always the latest client version.
 	 * On errors, VERSION_NONE is returned.
 	 */
-	virtual int GetClientVersion(int ClientID) const = 0;
-	virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0;
+	virtual int GetClientVersion(int ClientId) const = 0;
+	virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientId) = 0;
 
 	template<class T, typename std::enable_if<!protocol7::is_sixup<T>::value, int>::type = 0>
-	inline int SendPackMsg(const T *pMsg, int Flags, int ClientID)
+	inline int SendPackMsg(const T *pMsg, int Flags, int ClientId)
 	{
 		int Result = 0;
-		if(ClientID == -1)
+		if(ClientId == -1)
 		{
 			for(int i = 0; i < MaxClients(); i++)
 				if(ClientIngame(i))
@@ -86,86 +88,101 @@ class IServer : public IInterface
 		}
 		else
 		{
-			Result = SendPackMsgTranslate(pMsg, Flags, ClientID);
+			Result = SendPackMsgTranslate(pMsg, Flags, ClientId);
 		}
 		return Result;
 	}
 
 	template<class T, typename std::enable_if<protocol7::is_sixup<T>::value, int>::type = 1>
-	inline int SendPackMsg(const T *pMsg, int Flags, int ClientID)
+	inline int SendPackMsg(const T *pMsg, int Flags, int ClientId)
 	{
 		int Result = 0;
-		if(ClientID == -1)
+		if(ClientId == -1)
 		{
 			for(int i = 0; i < MaxClients(); i++)
 				if(ClientIngame(i) && IsSixup(i))
 					Result = SendPackMsgOne(pMsg, Flags, i);
 		}
-		else if(IsSixup(ClientID))
-			Result = SendPackMsgOne(pMsg, Flags, ClientID);
+		else if(IsSixup(ClientId))
+			Result = SendPackMsgOne(pMsg, Flags, ClientId);
 
 		return Result;
 	}
 
 	template<class T>
-	int SendPackMsgTranslate(const T *pMsg, int Flags, int ClientID)
+	int SendPackMsgTranslate(const T *pMsg, int Flags, int ClientId)
 	{
-		return SendPackMsgOne(pMsg, Flags, ClientID);
+		return SendPackMsgOne(pMsg, Flags, ClientId);
 	}
 
-	int SendPackMsgTranslate(const CNetMsg_Sv_Emoticon *pMsg, int Flags, int ClientID)
+	int SendPackMsgTranslate(const CNetMsg_Sv_Emoticon *pMsg, int Flags, int ClientId)
 	{
 		CNetMsg_Sv_Emoticon MsgCopy;
 		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
-		return Translate(MsgCopy.m_ClientID, ClientID) && SendPackMsgOne(&MsgCopy, Flags, ClientID);
+		return Translate(MsgCopy.m_ClientId, ClientId) && SendPackMsgOne(&MsgCopy, Flags, ClientId);
 	}
 
-	int SendPackMsgTranslate(const CNetMsg_Sv_Chat *pMsg, int Flags, int ClientID)
+	int SendPackMsgTranslate(const CNetMsg_Sv_Chat *pMsg, int Flags, int ClientId)
 	{
 		CNetMsg_Sv_Chat MsgCopy;
 		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
 
 		char aBuf[1000];
-		if(MsgCopy.m_ClientID >= 0 && !Translate(MsgCopy.m_ClientID, ClientID))
+		if(MsgCopy.m_ClientId >= 0 && !Translate(MsgCopy.m_ClientId, ClientId))
 		{
-			str_format(aBuf, sizeof(aBuf), "%s: %s", ClientName(MsgCopy.m_ClientID), MsgCopy.m_pMessage);
+			str_format(aBuf, sizeof(aBuf), "%s: %s", ClientName(MsgCopy.m_ClientId), MsgCopy.m_pMessage);
 			MsgCopy.m_pMessage = aBuf;
-			MsgCopy.m_ClientID = VANILLA_MAX_CLIENTS - 1;
+			MsgCopy.m_ClientId = VANILLA_MAX_CLIENTS - 1;
 		}
 
-		if(IsSixup(ClientID))
+		if(IsSixup(ClientId))
 		{
 			protocol7::CNetMsg_Sv_Chat Msg7;
-			Msg7.m_ClientID = MsgCopy.m_ClientID;
+			Msg7.m_ClientId = MsgCopy.m_ClientId;
 			Msg7.m_pMessage = MsgCopy.m_pMessage;
 			Msg7.m_Mode = MsgCopy.m_Team > 0 ? protocol7::CHAT_TEAM : protocol7::CHAT_ALL;
-			Msg7.m_TargetID = -1;
-			return SendPackMsgOne(&Msg7, Flags, ClientID);
+			Msg7.m_TargetId = -1;
+			return SendPackMsgOne(&Msg7, Flags, ClientId);
 		}
 
-		return SendPackMsgOne(&MsgCopy, Flags, ClientID);
+		return SendPackMsgOne(&MsgCopy, Flags, ClientId);
 	}
 
-	int SendPackMsgTranslate(const CNetMsg_Sv_KillMsg *pMsg, int Flags, int ClientID)
+	int SendPackMsgTranslate(const CNetMsg_Sv_KillMsg *pMsg, int Flags, int ClientId)
 	{
 		CNetMsg_Sv_KillMsg MsgCopy;
 		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
-		if(!Translate(MsgCopy.m_Victim, ClientID))
+		if(!Translate(MsgCopy.m_Victim, ClientId))
 			return 0;
-		if(!Translate(MsgCopy.m_Killer, ClientID))
+		if(!Translate(MsgCopy.m_Killer, ClientId))
 			MsgCopy.m_Killer = MsgCopy.m_Victim;
-		return SendPackMsgOne(&MsgCopy, Flags, ClientID);
+		return SendPackMsgOne(&MsgCopy, Flags, ClientId);
+	}
+
+	int SendPackMsgTranslate(const CNetMsg_Sv_RaceFinish *pMsg, int Flags, int ClientId)
+	{
+		if(IsSixup(ClientId))
+		{
+			protocol7::CNetMsg_Sv_RaceFinish Msg7;
+			Msg7.m_ClientId = pMsg->m_ClientId;
+			Msg7.m_Diff = pMsg->m_Diff;
+			Msg7.m_Time = pMsg->m_Time;
+			Msg7.m_RecordPersonal = pMsg->m_RecordPersonal;
+			Msg7.m_RecordServer = pMsg->m_RecordServer;
+			return SendPackMsgOne(&Msg7, Flags, ClientId);
+		}
+		return SendPackMsgOne(pMsg, Flags, ClientId);
 	}
 
 	template<class T>
-	int SendPackMsgOne(const T *pMsg, int Flags, int ClientID)
+	int SendPackMsgOne(const T *pMsg, int Flags, int ClientId)
 	{
-		dbg_assert(ClientID != -1, "SendPackMsgOne called with -1");
-		CMsgPacker Packer(T::ms_MsgID, false, protocol7::is_sixup<T>::value);
+		dbg_assert(ClientId != -1, "SendPackMsgOne called with -1");
+		CMsgPacker Packer(T::ms_MsgId, false, protocol7::is_sixup<T>::value);
 
 		if(pMsg->Pack(&Packer))
 			return -1;
-		return SendMsg(&Packer, Flags, ClientID);
+		return SendMsg(&Packer, Flags, ClientId);
 	}
 
 	bool Translate(int &Target, int Client)
@@ -204,23 +221,23 @@ class IServer : public IInterface
 
 	virtual void GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pSha256, int *pMapCrc) = 0;
 
-	virtual bool WouldClientNameChange(int ClientID, const char *pNameRequest) = 0;
-	virtual bool WouldClientClanChange(int ClientID, const char *pClanRequest) = 0;
-	virtual void SetClientName(int ClientID, const char *pName) = 0;
-	virtual void SetClientClan(int ClientID, const char *pClan) = 0;
-	virtual void SetClientCountry(int ClientID, int Country) = 0;
-	virtual void SetClientScore(int ClientID, std::optional<int> Score) = 0;
-	virtual void SetClientFlags(int ClientID, int Flags) = 0;
+	virtual bool WouldClientNameChange(int ClientId, const char *pNameRequest) = 0;
+	virtual bool WouldClientClanChange(int ClientId, const char *pClanRequest) = 0;
+	virtual void SetClientName(int ClientId, const char *pName) = 0;
+	virtual void SetClientClan(int ClientId, const char *pClan) = 0;
+	virtual void SetClientCountry(int ClientId, int Country) = 0;
+	virtual void SetClientScore(int ClientId, std::optional<int> Score) = 0;
+	virtual void SetClientFlags(int ClientId, int Flags) = 0;
 
-	virtual int SnapNewID() = 0;
-	virtual void SnapFreeID(int ID) = 0;
-	virtual void *SnapNewItem(int Type, int ID, int Size) = 0;
+	virtual int SnapNewId() = 0;
+	virtual void SnapFreeId(int Id) = 0;
+	virtual void *SnapNewItem(int Type, int Id, int Size) = 0;
 
 	template<typename T>
-	T *SnapNewItem(int ID)
+	T *SnapNewItem(int Id)
 	{
-		const int Type = protocol7::is_sixup<T>::value ? -T::ms_MsgID : T::ms_MsgID;
-		return static_cast<T *>(SnapNewItem(Type, ID, sizeof(T)));
+		const int Type = protocol7::is_sixup<T>::value ? -T::ms_MsgId : T::ms_MsgId;
+		return static_cast<T *>(SnapNewItem(Type, Id, sizeof(T)));
 	}
 
 	virtual void SnapSetStaticsize(int ItemType, int Size) = 0;
@@ -230,48 +247,50 @@ class IServer : public IInterface
 		RCON_CID_SERV = -1,
 		RCON_CID_VOTE = -2,
 	};
-	virtual void SetRconCID(int ClientID) = 0;
-	virtual int GetAuthedState(int ClientID) const = 0;
-	virtual const char *GetAuthName(int ClientID) const = 0;
-	virtual void Kick(int ClientID, const char *pReason) = 0;
-	virtual void Ban(int ClientID, int Seconds, const char *pReason) = 0;
-	virtual void RedirectClient(int ClientID, int Port, bool Verbose = false) = 0;
+	virtual void SetRconCid(int ClientId) = 0;
+	virtual int GetAuthedState(int ClientId) const = 0;
+	virtual const char *GetAuthName(int ClientId) const = 0;
+	virtual void Kick(int ClientId, const char *pReason) = 0;
+	virtual void Ban(int ClientId, int Seconds, const char *pReason, bool VerbatimReason) = 0;
+	virtual void RedirectClient(int ClientId, int Port, bool Verbose = false) = 0;
 	virtual void ChangeMap(const char *pMap) = 0;
+	virtual void ReloadMap() = 0;
 
 	virtual void DemoRecorder_HandleAutoStart() = 0;
 
 	// DDRace
 
-	virtual void SaveDemo(int ClientID, float Time) = 0;
-	virtual void StartRecord(int ClientID) = 0;
-	virtual void StopRecord(int ClientID) = 0;
-	virtual bool IsRecording(int ClientID) = 0;
+	virtual void SaveDemo(int ClientId, float Time) = 0;
+	virtual void StartRecord(int ClientId) = 0;
+	virtual void StopRecord(int ClientId) = 0;
+	virtual bool IsRecording(int ClientId) = 0;
 	virtual void StopDemos() = 0;
 
-	virtual void GetClientAddr(int ClientID, NETADDR *pAddr) const = 0;
+	virtual void GetClientAddr(int ClientId, NETADDR *pAddr) const = 0;
 
-	virtual int *GetIdMap(int ClientID) = 0;
+	virtual int *GetIdMap(int ClientId) = 0;
 
-	virtual bool DnsblWhite(int ClientID) = 0;
-	virtual bool DnsblPending(int ClientID) = 0;
-	virtual bool DnsblBlack(int ClientID) = 0;
-	virtual const char *GetAnnouncementLine(const char *pFileName) = 0;
-	virtual bool ClientPrevIngame(int ClientID) = 0;
-	virtual const char *GetNetErrorString(int ClientID) = 0;
-	virtual void ResetNetErrorString(int ClientID) = 0;
-	virtual bool SetTimedOut(int ClientID, int OrigID) = 0;
-	virtual void SetTimeoutProtected(int ClientID) = 0;
+	virtual bool DnsblWhite(int ClientId) = 0;
+	virtual bool DnsblPending(int ClientId) = 0;
+	virtual bool DnsblBlack(int ClientId) = 0;
+	virtual const char *GetAnnouncementLine() = 0;
+	virtual void ReadAnnouncementsFile(const char *pFileName) = 0;
+	virtual bool ClientPrevIngame(int ClientId) = 0;
+	virtual const char *GetNetErrorString(int ClientId) = 0;
+	virtual void ResetNetErrorString(int ClientId) = 0;
+	virtual bool SetTimedOut(int ClientId, int OrigId) = 0;
+	virtual void SetTimeoutProtected(int ClientId) = 0;
 
 	virtual void SetErrorShutdown(const char *pReason) = 0;
 	virtual void ExpireServerInfo() = 0;
 
 	virtual void FillAntibot(CAntibotRoundData *pData) = 0;
 
-	virtual void SendMsgRaw(int ClientID, const void *pData, int Size, int Flags) = 0;
+	virtual void SendMsgRaw(int ClientId, const void *pData, int Size, int Flags) = 0;
 
 	virtual const char *GetMapName() const = 0;
 
-	virtual bool IsSixup(int ClientID) const = 0;
+	virtual bool IsSixup(int ClientId) const = 0;
 };
 
 class IGameServer : public IInterface
@@ -290,10 +309,10 @@ class IGameServer : public IInterface
 
 	virtual void OnTick() = 0;
 	virtual void OnPreSnap() = 0;
-	virtual void OnSnap(int ClientID) = 0;
+	virtual void OnSnap(int ClientId) = 0;
 	virtual void OnPostSnap() = 0;
 
-	virtual void OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) = 0;
+	virtual void OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId) = 0;
 
 	// Called before map reload, for any data that the game wants to
 	// persist to the next map.
@@ -302,24 +321,24 @@ class IGameServer : public IInterface
 	//
 	// Returns whether the game should be supplied with the data when the
 	// client connects for the next map.
-	virtual bool OnClientDataPersist(int ClientID, void *pData) = 0;
+	virtual bool OnClientDataPersist(int ClientId, void *pData) = 0;
 
 	// Called when a client connects.
 	//
 	// If it is reconnecting to the game after a map change, the
 	// `pPersistentData` point is nonnull and contains the data the game
 	// previously stored.
-	virtual void OnClientConnected(int ClientID, void *pPersistentData) = 0;
+	virtual void OnClientConnected(int ClientId, void *pPersistentData) = 0;
 
-	virtual void OnClientEnter(int ClientID) = 0;
-	virtual void OnClientDrop(int ClientID, const char *pReason) = 0;
-	virtual void OnClientPrepareInput(int ClientID, void *pInput) = 0;
-	virtual void OnClientDirectInput(int ClientID, void *pInput) = 0;
-	virtual void OnClientPredictedInput(int ClientID, void *pInput) = 0;
-	virtual void OnClientPredictedEarlyInput(int ClientID, void *pInput) = 0;
+	virtual void OnClientEnter(int ClientId) = 0;
+	virtual void OnClientDrop(int ClientId, const char *pReason) = 0;
+	virtual void OnClientPrepareInput(int ClientId, void *pInput) = 0;
+	virtual void OnClientDirectInput(int ClientId, void *pInput) = 0;
+	virtual void OnClientPredictedInput(int ClientId, void *pInput) = 0;
+	virtual void OnClientPredictedEarlyInput(int ClientId, void *pInput) = 0;
 
-	virtual bool IsClientReady(int ClientID) const = 0;
-	virtual bool IsClientPlayer(int ClientID) const = 0;
+	virtual bool IsClientReady(int ClientId) const = 0;
+	virtual bool IsClientPlayer(int ClientId) const = 0;
 
 	virtual int PersistentDataSize() const = 0;
 	virtual int PersistentClientDataSize() const = 0;
@@ -333,23 +352,26 @@ class IGameServer : public IInterface
 
 	virtual void OnPreTickTeehistorian() = 0;
 
-	virtual void OnSetAuthed(int ClientID, int Level) = 0;
-	virtual bool PlayerExists(int ClientID) const = 0;
+	virtual void OnSetAuthed(int ClientId, int Level) = 0;
+	virtual bool PlayerExists(int ClientId) const = 0;
 
 	virtual void TeehistorianRecordAntibot(const void *pData, int DataSize) = 0;
-	virtual void TeehistorianRecordPlayerJoin(int ClientID, bool Sixup) = 0;
-	virtual void TeehistorianRecordPlayerDrop(int ClientID, const char *pReason) = 0;
-	virtual void TeehistorianRecordPlayerRejoin(int ClientID) = 0;
+	virtual void TeehistorianRecordPlayerJoin(int ClientId, bool Sixup) = 0;
+	virtual void TeehistorianRecordPlayerDrop(int ClientId, const char *pReason) = 0;
+	virtual void TeehistorianRecordPlayerRejoin(int ClientId) = 0;
+	virtual void TeehistorianRecordPlayerName(int ClientId, const char *pName) = 0;
+	virtual void TeehistorianRecordPlayerFinish(int ClientId, int TimeTicks) = 0;
+	virtual void TeehistorianRecordTeamFinish(int TeamId, int TimeTicks) = 0;
 
 	virtual void FillAntibot(CAntibotRoundData *pData) = 0;
 
 	/**
 	 * Used to report custom player info to master servers.
 	 *
-	 * @param aBuf Should be the json key values to add, starting with a ',' beforehand, like: ',"skin": "default", "team": 1'
+	 * @param pJsonWriter A pointer to a CJsonStringWriter which the custom data will be added to.
 	 * @param i The client id.
 	 */
-	virtual void OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID) = 0;
+	virtual void OnUpdatePlayerServerInfo(CJsonStringWriter *pJSonWriter, int Id) = 0;
 };
 
 extern IGameServer *CreateGameServer();
diff --git a/src/engine/server/antibot.cpp b/src/engine/server/antibot.cpp
index 238e8420f5..421235e439 100644
--- a/src/engine/server/antibot.cpp
+++ b/src/engine/server/antibot.cpp
@@ -23,23 +23,23 @@ CAntibot::~CAntibot()
 	if(m_Initialized)
 		AntibotDestroy();
 }
-void CAntibot::Kick(int ClientID, const char *pMessage, void *pUser)
+void CAntibot::Kick(int ClientId, const char *pMessage, void *pUser)
 {
 	CAntibot *pAntibot = (CAntibot *)pUser;
-	pAntibot->Server()->Kick(ClientID, pMessage);
+	pAntibot->Server()->Kick(ClientId, pMessage);
 }
 void CAntibot::Log(const char *pMessage, void *pUser)
 {
 	CAntibot *pAntibot = (CAntibot *)pUser;
 	pAntibot->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "antibot", pMessage);
 }
-void CAntibot::Report(int ClientID, const char *pMessage, void *pUser)
+void CAntibot::Report(int ClientId, const char *pMessage, void *pUser)
 {
 	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "%d: %s", ClientID, pMessage);
+	str_format(aBuf, sizeof(aBuf), "%d: %s", ClientId, pMessage);
 	Log(aBuf, pUser);
 }
-void CAntibot::Send(int ClientID, const void *pData, int Size, int Flags, void *pUser)
+void CAntibot::Send(int ClientId, const void *pData, int Size, int Flags, void *pUser)
 {
 	CAntibot *pAntibot = (CAntibot *)pUser;
 
@@ -52,7 +52,7 @@ void CAntibot::Send(int ClientID, const void *pData, int Size, int Flags, void *
 	{
 		RealFlags |= MSGFLAG_FLUSH;
 	}
-	pAntibot->Server()->SendMsgRaw(ClientID, pData, Size, RealFlags);
+	pAntibot->Server()->SendMsgRaw(ClientId, pData, Size, RealFlags);
 }
 void CAntibot::Teehistorian(const void *pData, int Size, void *pUser)
 {
@@ -115,50 +115,50 @@ void CAntibot::Update()
 	}
 }
 
-void CAntibot::OnPlayerInit(int ClientID)
+void CAntibot::OnPlayerInit(int ClientId)
 {
 	Update();
-	AntibotOnPlayerInit(ClientID);
+	AntibotOnPlayerInit(ClientId);
 }
-void CAntibot::OnPlayerDestroy(int ClientID)
+void CAntibot::OnPlayerDestroy(int ClientId)
 {
 	Update();
-	AntibotOnPlayerDestroy(ClientID);
+	AntibotOnPlayerDestroy(ClientId);
 }
-void CAntibot::OnSpawn(int ClientID)
+void CAntibot::OnSpawn(int ClientId)
 {
 	Update();
-	AntibotOnSpawn(ClientID);
+	AntibotOnSpawn(ClientId);
 }
-void CAntibot::OnHammerFireReloading(int ClientID)
+void CAntibot::OnHammerFireReloading(int ClientId)
 {
 	Update();
-	AntibotOnHammerFireReloading(ClientID);
+	AntibotOnHammerFireReloading(ClientId);
 }
-void CAntibot::OnHammerFire(int ClientID)
+void CAntibot::OnHammerFire(int ClientId)
 {
 	Update();
-	AntibotOnHammerFire(ClientID);
+	AntibotOnHammerFire(ClientId);
 }
-void CAntibot::OnHammerHit(int ClientID, int TargetID)
+void CAntibot::OnHammerHit(int ClientId, int TargetId)
 {
 	Update();
-	AntibotOnHammerHit(ClientID, TargetID);
+	AntibotOnHammerHit(ClientId, TargetId);
 }
-void CAntibot::OnDirectInput(int ClientID)
+void CAntibot::OnDirectInput(int ClientId)
 {
 	Update();
-	AntibotOnDirectInput(ClientID);
+	AntibotOnDirectInput(ClientId);
 }
-void CAntibot::OnCharacterTick(int ClientID)
+void CAntibot::OnCharacterTick(int ClientId)
 {
 	Update();
-	AntibotOnCharacterTick(ClientID);
+	AntibotOnCharacterTick(ClientId);
 }
-void CAntibot::OnHookAttach(int ClientID, bool Player)
+void CAntibot::OnHookAttach(int ClientId, bool Player)
 {
 	Update();
-	AntibotOnHookAttach(ClientID, Player);
+	AntibotOnHookAttach(ClientId, Player);
 }
 
 void CAntibot::OnEngineTick()
@@ -166,17 +166,17 @@ void CAntibot::OnEngineTick()
 	Update();
 	AntibotOnEngineTick();
 }
-void CAntibot::OnEngineClientJoin(int ClientID, bool Sixup)
+void CAntibot::OnEngineClientJoin(int ClientId, bool Sixup)
 {
 	Update();
-	AntibotOnEngineClientJoin(ClientID, Sixup);
+	AntibotOnEngineClientJoin(ClientId, Sixup);
 }
-void CAntibot::OnEngineClientDrop(int ClientID, const char *pReason)
+void CAntibot::OnEngineClientDrop(int ClientId, const char *pReason)
 {
 	Update();
-	AntibotOnEngineClientDrop(ClientID, pReason);
+	AntibotOnEngineClientDrop(ClientId, pReason);
 }
-bool CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags)
+bool CAntibot::OnEngineClientMessage(int ClientId, const void *pData, int Size, int Flags)
 {
 	Update();
 	int AntibotFlags = 0;
@@ -184,9 +184,9 @@ bool CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size,
 	{
 		AntibotFlags |= ANTIBOT_MSGFLAG_NONVITAL;
 	}
-	return AntibotOnEngineClientMessage(ClientID, pData, Size, AntibotFlags);
+	return AntibotOnEngineClientMessage(ClientId, pData, Size, AntibotFlags);
 }
-bool CAntibot::OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags)
+bool CAntibot::OnEngineServerMessage(int ClientId, const void *pData, int Size, int Flags)
 {
 	Update();
 	int AntibotFlags = 0;
@@ -194,12 +194,12 @@ bool CAntibot::OnEngineServerMessage(int ClientID, const void *pData, int Size,
 	{
 		AntibotFlags |= ANTIBOT_MSGFLAG_NONVITAL;
 	}
-	return AntibotOnEngineServerMessage(ClientID, pData, Size, AntibotFlags);
+	return AntibotOnEngineServerMessage(ClientId, pData, Size, AntibotFlags);
 }
-bool CAntibot::OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags)
+bool CAntibot::OnEngineSimulateClientMessage(int *pClientId, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags)
 {
 	int AntibotFlags = 0;
-	bool Result = AntibotOnEngineSimulateClientMessage(pClientID, pBuffer, BufferSize, pOutSize, &AntibotFlags);
+	bool Result = AntibotOnEngineSimulateClientMessage(pClientId, pBuffer, BufferSize, pOutSize, &AntibotFlags);
 	if(Result)
 	{
 		*pFlags = 0;
@@ -245,22 +245,22 @@ void CAntibot::Update()
 {
 }
 
-void CAntibot::OnPlayerInit(int ClientID) {}
-void CAntibot::OnPlayerDestroy(int ClientID) {}
-void CAntibot::OnSpawn(int ClientID) {}
-void CAntibot::OnHammerFireReloading(int ClientID) {}
-void CAntibot::OnHammerFire(int ClientID) {}
-void CAntibot::OnHammerHit(int ClientID, int TargetID) {}
-void CAntibot::OnDirectInput(int ClientID) {}
-void CAntibot::OnCharacterTick(int ClientID) {}
-void CAntibot::OnHookAttach(int ClientID, bool Player) {}
+void CAntibot::OnPlayerInit(int ClientId) {}
+void CAntibot::OnPlayerDestroy(int ClientId) {}
+void CAntibot::OnSpawn(int ClientId) {}
+void CAntibot::OnHammerFireReloading(int ClientId) {}
+void CAntibot::OnHammerFire(int ClientId) {}
+void CAntibot::OnHammerHit(int ClientId, int TargetId) {}
+void CAntibot::OnDirectInput(int ClientId) {}
+void CAntibot::OnCharacterTick(int ClientId) {}
+void CAntibot::OnHookAttach(int ClientId, bool Player) {}
 
 void CAntibot::OnEngineTick() {}
-void CAntibot::OnEngineClientJoin(int ClientID, bool Sixup) {}
-void CAntibot::OnEngineClientDrop(int ClientID, const char *pReason) {}
-bool CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) { return false; }
-bool CAntibot::OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) { return false; }
-bool CAntibot::OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) { return false; }
+void CAntibot::OnEngineClientJoin(int ClientId, bool Sixup) {}
+void CAntibot::OnEngineClientDrop(int ClientId, const char *pReason) {}
+bool CAntibot::OnEngineClientMessage(int ClientId, const void *pData, int Size, int Flags) { return false; }
+bool CAntibot::OnEngineServerMessage(int ClientId, const void *pData, int Size, int Flags) { return false; }
+bool CAntibot::OnEngineSimulateClientMessage(int *pClientId, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) { return false; }
 #endif
 
 IEngineAntibot *CreateEngineAntibot()
diff --git a/src/engine/server/antibot.h b/src/engine/server/antibot.h
index 00af4b0aee..a8a9becf40 100644
--- a/src/engine/server/antibot.h
+++ b/src/engine/server/antibot.h
@@ -19,10 +19,10 @@ class CAntibot : public IEngineAntibot
 	bool m_Initialized;
 
 	void Update();
-	static void Kick(int ClientID, const char *pMessage, void *pUser);
+	static void Kick(int ClientId, const char *pMessage, void *pUser);
 	static void Log(const char *pMessage, void *pUser);
-	static void Report(int ClientID, const char *pMessage, void *pUser);
-	static void Send(int ClientID, const void *pData, int Size, int Flags, void *pUser);
+	static void Report(int ClientId, const char *pMessage, void *pUser);
+	static void Send(int ClientId, const void *pData, int Size, int Flags, void *pUser);
 	static void Teehistorian(const void *pData, int Size, void *pUser);
 
 public:
@@ -33,25 +33,25 @@ class CAntibot : public IEngineAntibot
 	void Init() override;
 
 	void OnEngineTick() override;
-	void OnEngineClientJoin(int ClientID, bool Sixup) override;
-	void OnEngineClientDrop(int ClientID, const char *pReason) override;
-	bool OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) override;
-	bool OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) override;
-	bool OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) override;
+	void OnEngineClientJoin(int ClientId, bool Sixup) override;
+	void OnEngineClientDrop(int ClientId, const char *pReason) override;
+	bool OnEngineClientMessage(int ClientId, const void *pData, int Size, int Flags) override;
+	bool OnEngineServerMessage(int ClientId, const void *pData, int Size, int Flags) override;
+	bool OnEngineSimulateClientMessage(int *pClientId, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) override;
 
 	// Game
 	void RoundStart(class IGameServer *pGameServer) override;
 	void RoundEnd() override;
 
-	void OnPlayerInit(int ClientID) override;
-	void OnPlayerDestroy(int ClientID) override;
-	void OnSpawn(int ClientID) override;
-	void OnHammerFireReloading(int ClientID) override;
-	void OnHammerFire(int ClientID) override;
-	void OnHammerHit(int ClientID, int TargetID) override;
-	void OnDirectInput(int ClientID) override;
-	void OnCharacterTick(int ClientID) override;
-	void OnHookAttach(int ClientID, bool Player) override;
+	void OnPlayerInit(int ClientId) override;
+	void OnPlayerDestroy(int ClientId) override;
+	void OnSpawn(int ClientId) override;
+	void OnHammerFireReloading(int ClientId) override;
+	void OnHammerFire(int ClientId) override;
+	void OnHammerHit(int ClientId, int TargetId) override;
+	void OnDirectInput(int ClientId) override;
+	void OnCharacterTick(int ClientId) override;
+	void OnHookAttach(int ClientId, bool Player) override;
 
 	void ConsoleCommand(const char *pCommand) override;
 };
diff --git a/src/engine/server/databases/connection.cpp b/src/engine/server/databases/connection.cpp
index ac124baa49..3abc416581 100644
--- a/src/engine/server/databases/connection.cpp
+++ b/src/engine/server/databases/connection.cpp
@@ -1,7 +1,5 @@
 #include "connection.h"
 
-#include <engine/shared/protocol.h>
-
 IDbConnection::IDbConnection(const char *pPrefix)
 {
 	str_copy(m_aPrefix, pPrefix);
@@ -25,12 +23,12 @@ void IDbConnection::FormatCreateRace(char *aBuf, unsigned int BufferSize, bool B
 		"  cp19 FLOAT DEFAULT 0, cp20 FLOAT DEFAULT 0, cp21 FLOAT DEFAULT 0, "
 		"  cp22 FLOAT DEFAULT 0, cp23 FLOAT DEFAULT 0, cp24 FLOAT DEFAULT 0, "
 		"  cp25 FLOAT DEFAULT 0, "
-		"  GameID VARCHAR(64), "
+		"  GameId VARCHAR(64), "
 		"  DDNet7 BOOL DEFAULT FALSE, "
 		"  PRIMARY KEY (Map, Name, Time, Timestamp, Server)"
 		")",
 		GetPrefix(), Backup ? "_backup" : "",
-		BinaryCollate(), MAX_NAME_LENGTH, BinaryCollate());
+		BinaryCollate(), MAX_NAME_LENGTH_SQL, BinaryCollate());
 }
 
 void IDbConnection::FormatCreateTeamrace(char *aBuf, unsigned int BufferSize, const char *pIdType, bool Backup) const
@@ -42,12 +40,12 @@ void IDbConnection::FormatCreateTeamrace(char *aBuf, unsigned int BufferSize, co
 		"  Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
 		"  Time FLOAT DEFAULT 0, "
 		"  ID %s NOT NULL, " // VARBINARY(16) for MySQL and BLOB for SQLite
-		"  GameID VARCHAR(64), "
+		"  GameId VARCHAR(64), "
 		"  DDNet7 BOOL DEFAULT FALSE, "
-		"  PRIMARY KEY (ID, Name)"
+		"  PRIMARY KEY (Id, Name)"
 		")",
 		GetPrefix(), Backup ? "_backup" : "",
-		BinaryCollate(), MAX_NAME_LENGTH, BinaryCollate(), pIdType);
+		BinaryCollate(), MAX_NAME_LENGTH_SQL, BinaryCollate(), pIdType);
 }
 
 void IDbConnection::FormatCreateMaps(char *aBuf, unsigned int BufferSize) const
@@ -75,7 +73,7 @@ void IDbConnection::FormatCreateSaves(char *aBuf, unsigned int BufferSize, bool
 		"  Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
 		"  Server CHAR(4), "
 		"  DDNet7 BOOL DEFAULT FALSE, "
-		"  SaveID VARCHAR(36) DEFAULT NULL, "
+		"  SaveId VARCHAR(36) DEFAULT NULL, "
 		"  PRIMARY KEY (Map, Code)"
 		")",
 		GetPrefix(), Backup ? "_backup" : "",
@@ -90,5 +88,5 @@ void IDbConnection::FormatCreatePoints(char *aBuf, unsigned int BufferSize) cons
 		"  Points INT DEFAULT 0, "
 		"  PRIMARY KEY (Name)"
 		")",
-		GetPrefix(), MAX_NAME_LENGTH, BinaryCollate());
+		GetPrefix(), MAX_NAME_LENGTH_SQL, BinaryCollate());
 }
diff --git a/src/engine/server/databases/connection.h b/src/engine/server/databases/connection.h
index a2da8e0daf..c711474747 100644
--- a/src/engine/server/databases/connection.h
+++ b/src/engine/server/databases/connection.h
@@ -3,8 +3,15 @@
 
 #include "connection_pool.h"
 
+#include <engine/shared/protocol.h>
 #include <memory>
 
+enum
+{
+	// MAX_NAME_LENGTH includes the size with \0, which is not necessary in SQL
+	MAX_NAME_LENGTH_SQL = MAX_NAME_LENGTH - 1,
+};
+
 class IConsole;
 
 // can hold one PreparedStatement with Results
@@ -54,6 +61,7 @@ class IDbConnection
 	virtual void BindInt(int Idx, int Value) = 0;
 	virtual void BindInt64(int Idx, int64_t Value) = 0;
 	virtual void BindFloat(int Idx, float Value) = 0;
+	virtual void BindNull(int Idx) = 0;
 
 	// Print expanded sql statement
 	virtual void Print() = 0;
diff --git a/src/engine/server/databases/connection_pool.cpp b/src/engine/server/databases/connection_pool.cpp
index 2ea2e3d9e1..2d8f607d93 100644
--- a/src/engine/server/databases/connection_pool.cpp
+++ b/src/engine/server/databases/connection_pool.cpp
@@ -49,7 +49,7 @@ struct CSqlExecData
 		{
 			CDbConnectionPool::Mode m_Mode;
 			CMysqlConfig m_Config;
-		} m_MySql;
+		} m_Mysql;
 		struct
 		{
 			CDbConnectionPool::Mode m_Mode;
@@ -96,7 +96,7 @@ CSqlExecData::CSqlExecData(
 	m_pName("add sqlite server")
 {
 	m_Ptr.m_Sqlite.m_Mode = m;
-	mem_copy(m_Ptr.m_Sqlite.m_FileName, aFileName, sizeof(m_Ptr.m_Sqlite.m_FileName));
+	str_copy(m_Ptr.m_Sqlite.m_FileName, aFileName);
 }
 CSqlExecData::CSqlExecData(CDbConnectionPool::Mode m,
 	const CMysqlConfig *pMysqlConfig) :
@@ -104,8 +104,8 @@ CSqlExecData::CSqlExecData(CDbConnectionPool::Mode m,
 	m_pThreadData(nullptr),
 	m_pName("add mysql server")
 {
-	m_Ptr.m_MySql.m_Mode = m;
-	mem_copy(&m_Ptr.m_MySql.m_Config, pMysqlConfig, sizeof(m_Ptr.m_MySql.m_Config));
+	m_Ptr.m_Mysql.m_Mode = m;
+	mem_copy(&m_Ptr.m_Mysql.m_Config, pMysqlConfig, sizeof(m_Ptr.m_Mysql.m_Config));
 }
 
 CSqlExecData::CSqlExecData(IConsole *pConsole, CDbConnectionPool::Mode m) :
@@ -352,8 +352,8 @@ void CWorker::ProcessQueries()
 		break;
 		case CSqlExecData::ADD_MYSQL:
 		{
-			auto pMysql = CreateMysqlConnection(pThreadData->m_Ptr.m_MySql.m_Config);
-			switch(pThreadData->m_Ptr.m_MySql.m_Mode)
+			auto pMysql = CreateMysqlConnection(pThreadData->m_Ptr.m_Mysql.m_Config);
+			switch(pThreadData->m_Ptr.m_Mysql.m_Mode)
 			{
 			case CDbConnectionPool::Mode::READ:
 				m_vpReadConnections.push_back(std::move(pMysql));
diff --git a/src/engine/server/databases/mysql.cpp b/src/engine/server/databases/mysql.cpp
index 202fb96871..2479733f03 100644
--- a/src/engine/server/databases/mysql.cpp
+++ b/src/engine/server/databases/mysql.cpp
@@ -89,6 +89,7 @@ class CMysqlConnection : public IDbConnection
 	void BindInt(int Idx, int Value) override;
 	void BindInt64(int Idx, int64_t Value) override;
 	void BindFloat(int Idx, float Value) override;
+	void BindNull(int Idx) override;
 
 	void Print() override {}
 	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
@@ -421,6 +422,22 @@ void CMysqlConnection::BindFloat(int Idx, float Value)
 	pParam->error = nullptr;
 }
 
+void CMysqlConnection::BindNull(int Idx)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_NULL;
+	pParam->buffer = nullptr;
+	pParam->buffer_length = 0;
+	pParam->length = nullptr;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
 bool CMysqlConnection::Step(bool *pEnd, char *pError, int ErrorSize)
 {
 	if(m_NewQuery)
diff --git a/src/engine/server/databases/sqlite.cpp b/src/engine/server/databases/sqlite.cpp
index df2925f6ef..bf483dc761 100644
--- a/src/engine/server/databases/sqlite.cpp
+++ b/src/engine/server/databases/sqlite.cpp
@@ -37,6 +37,7 @@ class CSqliteConnection : public IDbConnection
 	void BindInt(int Idx, int Value) override;
 	void BindInt64(int Idx, int64_t Value) override;
 	void BindFloat(int Idx, float Value) override;
+	void BindNull(int Idx) override;
 
 	void Print() override;
 	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
@@ -241,6 +242,13 @@ void CSqliteConnection::BindFloat(int Idx, float Value)
 	m_Done = false;
 }
 
+void CSqliteConnection::BindNull(int Idx)
+{
+	int Result = sqlite3_bind_null(m_pStmt, Idx);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
 // Keep support for SQLite < 3.14 on older Linux distributions. MinGW does not
 // support __attribute__((weak)): https://sourceware.org/bugzilla/show_bug.cgi?id=9687
 #if defined(__GNUC__) && !defined(__MINGW32__)
diff --git a/src/engine/server/main.cpp b/src/engine/server/main.cpp
index ea19875316..5904b3245c 100644
--- a/src/engine/server/main.cpp
+++ b/src/engine/server/main.cpp
@@ -1,6 +1,3 @@
-
-#define _WIN32_WINNT 0x0501
-
 #include <base/logger.h>
 #include <base/system.h>
 
@@ -23,7 +20,6 @@
 #include <vector>
 
 #if defined(CONF_FAMILY_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
@@ -47,6 +43,8 @@ void HandleSigIntTerm(int Param)
 
 int main(int argc, const char **argv)
 {
+	const int64_t MainStart = time_get();
+
 	CCmdlineFix CmdlineFix(&argc, &argv);
 	bool Silent = false;
 
@@ -90,12 +88,12 @@ int main(int argc, const char **argv)
 
 	if(secure_random_init() != 0)
 	{
-		dbg_msg("secure", "could not initialize secure RNG");
+		log_error("secure", "could not initialize secure RNG");
 		return -1;
 	}
 	if(MysqlInit() != 0)
 	{
-		dbg_msg("mysql", "failed to initialize MySQL library");
+		log_error("mysql", "failed to initialize MySQL library");
 		return -1;
 	}
 
@@ -110,17 +108,17 @@ int main(int argc, const char **argv)
 	pServer->SetLoggers(pFutureFileLogger, std::move(pStdoutLogger));
 
 	IKernel *pKernel = IKernel::Create();
+	pKernel->RegisterInterface(pServer);
 
 	// create the components
 	IEngine *pEngine = CreateEngine(GAME_NAME, pFutureConsoleLogger, 2 * std::thread::hardware_concurrency() + 2);
-	IEngineMap *pEngineMap = CreateEngineMap();
-	IGameServer *pGameServer = CreateGameServer();
-	IConsole *pConsole = CreateConsole(CFGFLAG_SERVER | CFGFLAG_ECON).release();
+	pKernel->RegisterInterface(pEngine);
+
 	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_SERVER, argc, argv);
-	IConfigManager *pConfigManager = CreateConfigManager();
-	IEngineAntibot *pEngineAntibot = CreateEngineAntibot();
+	pKernel->RegisterInterface(pStorage);
 
 	pFutureAssertionLogger->Set(CreateAssertionLogger(pStorage, GAME_NAME));
+
 #if defined(CONF_EXCEPTION_HANDLING)
 	char aBuf[IO_MAX_PATH_LENGTH];
 	char aBufName[IO_MAX_PATH_LENGTH];
@@ -131,26 +129,22 @@ int main(int argc, const char **argv)
 	set_exception_handler_log_file(aBuf);
 #endif
 
-	{
-		bool RegisterFail = false;
-
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pServer);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngine);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngineMap); // register as both
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IMap *>(pEngineMap), false);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pGameServer);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pConsole);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pConfigManager);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngineAntibot);
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IAntibot *>(pEngineAntibot), false);
-
-		if(RegisterFail)
-		{
-			delete pKernel;
-			return -1;
-		}
-	}
+	IConsole *pConsole = CreateConsole(CFGFLAG_SERVER | CFGFLAG_ECON).release();
+	pKernel->RegisterInterface(pConsole);
+
+	IConfigManager *pConfigManager = CreateConfigManager();
+	pKernel->RegisterInterface(pConfigManager);
+
+	IEngineMap *pEngineMap = CreateEngineMap();
+	pKernel->RegisterInterface(pEngineMap); // IEngineMap
+	pKernel->RegisterInterface(static_cast<IMap *>(pEngineMap), false);
+
+	IEngineAntibot *pEngineAntibot = CreateEngineAntibot();
+	pKernel->RegisterInterface(pEngineAntibot); // IEngineAntibot
+	pKernel->RegisterInterface(static_cast<IAntibot *>(pEngineAntibot), false);
+
+	IGameServer *pGameServer = CreateGameServer();
+	pKernel->RegisterInterface(pGameServer);
 
 	pEngine->Init();
 	pConsole->Init();
@@ -173,12 +167,13 @@ int main(int argc, const char **argv)
 	if(argc > 1)
 		pConsole->ParseArguments(argc - 1, &argv[1]);
 
+	pConfigManager->SetReadOnly("sv_max_clients", true);
 	pConfigManager->SetReadOnly("sv_test_cmds", true);
 	pConfigManager->SetReadOnly("sv_rescue", true);
 
-	const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
 	if(g_Config.m_Logfile[0])
 	{
+		const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
 		IOHANDLE Logfile = pStorage->OpenFile(g_Config.m_Logfile, Mode, IStorage::TYPE_SAVE_OR_ABSOLUTE);
 		if(Logfile)
 		{
@@ -186,14 +181,20 @@ int main(int argc, const char **argv)
 		}
 		else
 		{
-			dbg_msg("server", "failed to open '%s' for logging", g_Config.m_Logfile);
+			log_error("server", "failed to open '%s' for logging", g_Config.m_Logfile);
+			pFutureFileLogger->Set(log_logger_noop());
 		}
 	}
+	else
+	{
+		pFutureFileLogger->Set(log_logger_noop());
+	}
+
 	auto pServerLogger = std::make_shared<CServerLogger>(pServer);
 	pEngine->SetAdditionalLogger(pServerLogger);
 
 	// run the server
-	dbg_msg("server", "starting...");
+	log_trace("server", "initialization finished after %.2fms, starting...", (time_get() - MainStart) * 1000.0f / (float)time_freq());
 	int Ret = pServer->Run();
 
 	pServerLogger->OnServerDeletion();
diff --git a/src/engine/server/register.cpp b/src/engine/server/register.cpp
index 34acda919b..3092ea2dc7 100644
--- a/src/engine/server/register.cpp
+++ b/src/engine/server/register.cpp
@@ -21,6 +21,7 @@ class CRegister : public IRegister
 		STATUS_OK,
 		STATUS_NEEDCHALLENGE,
 		STATUS_NEEDINFO,
+		STATUS_ERROR,
 
 		PROTOCOL_TW6_IPV6 = 0,
 		PROTOCOL_TW6_IPV4,
@@ -70,17 +71,19 @@ class CRegister : public IRegister
 			int m_Index;
 			int m_InfoSerial;
 			std::shared_ptr<CShared> m_pShared;
-			std::unique_ptr<CHttpRequest> m_pRegister;
+			std::shared_ptr<CHttpRequest> m_pRegister;
+			IHttp *m_pHttp;
 			void Run() override;
 
 		public:
-			CJob(int Protocol, int ServerPort, int Index, int InfoSerial, std::shared_ptr<CShared> pShared, std::unique_ptr<CHttpRequest> &&pRegister) :
+			CJob(int Protocol, int ServerPort, int Index, int InfoSerial, std::shared_ptr<CShared> pShared, std::shared_ptr<CHttpRequest> &&pRegister, IHttp *pHttp) :
 				m_Protocol(Protocol),
 				m_ServerPort(ServerPort),
 				m_Index(Index),
 				m_InfoSerial(InfoSerial),
 				m_pShared(std::move(pShared)),
-				m_pRegister(std::move(pRegister))
+				m_pRegister(std::move(pRegister)),
+				m_pHttp(pHttp)
 			{
 			}
 			~CJob() override = default;
@@ -110,6 +113,8 @@ class CRegister : public IRegister
 	CConfig *m_pConfig;
 	IConsole *m_pConsole;
 	IEngine *m_pEngine;
+	IHttp *m_pHttp;
+
 	// Don't start sending registers before the server has initialized
 	// completely.
 	bool m_GotFirstUpdateCall = false;
@@ -130,7 +135,7 @@ class CRegister : public IRegister
 	char m_aServerInfo[16384];
 
 public:
-	CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken);
+	CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, IHttp *pHttp, int ServerPort, unsigned SixupSecurityToken);
 	void Update() override;
 	void OnConfigChange() override;
 	bool OnPacket(const CNetChunk *pPacket) override;
@@ -152,6 +157,10 @@ bool CRegister::StatusFromString(int *pResult, const char *pString)
 	{
 		*pResult = STATUS_NEEDINFO;
 	}
+	else if(str_comp(pString, "error") == 0)
+	{
+		*pResult = STATUS_ERROR;
+	}
 	else
 	{
 		*pResult = -1;
@@ -298,6 +307,7 @@ void CRegister::CProtocol::SendRegister()
 	}
 	pRegister->LogProgress(HTTPLOG::FAILURE);
 	pRegister->IpResolve(ProtocolToIpresolve(m_Protocol));
+	pRegister->FailOnErrorStatus(false);
 
 	int RequestIndex;
 	{
@@ -309,7 +319,7 @@ void CRegister::CProtocol::SendRegister()
 		RequestIndex = m_pShared->m_NumTotalRequests;
 		m_pShared->m_NumTotalRequests += 1;
 	}
-	m_pParent->m_pEngine->AddJob(std::make_shared<CJob>(m_Protocol, m_pParent->m_ServerPort, RequestIndex, InfoSerial, m_pShared, std::move(pRegister)));
+	m_pParent->m_pEngine->AddJob(std::make_shared<CJob>(m_Protocol, m_pParent->m_ServerPort, RequestIndex, InfoSerial, m_pShared, std::move(pRegister), m_pParent->m_pHttp));
 	m_NewChallengeToken = false;
 
 	m_PrevRegister = Now;
@@ -332,7 +342,7 @@ void CRegister::CProtocol::SendDeleteIfRegistered(bool Shutdown)
 	char aSecret[UUID_MAXSTRSIZE];
 	FormatUuid(m_pParent->m_Secret, aSecret, sizeof(aSecret));
 
-	std::unique_ptr<CHttpRequest> pDelete = HttpPost(m_pParent->m_pConfig->m_SvRegisterUrl, (const unsigned char *)"", 0);
+	std::shared_ptr<CHttpRequest> pDelete = HttpPost(m_pParent->m_pConfig->m_SvRegisterUrl, (const unsigned char *)"", 0);
 	pDelete->HeaderString("Action", "delete");
 	pDelete->HeaderString("Address", aAddress);
 	pDelete->HeaderString("Secret", aSecret);
@@ -348,7 +358,7 @@ void CRegister::CProtocol::SendDeleteIfRegistered(bool Shutdown)
 		pDelete->Timeout(CTimeout{1000, 1000, 0, 0});
 	}
 	log_info(ProtocolToSystem(m_Protocol), "deleting...");
-	m_pParent->m_pEngine->AddJob(std::move(pDelete));
+	m_pParent->m_pHttp->Run(pDelete);
 }
 
 CRegister::CProtocol::CProtocol(CRegister *pParent, int Protocol) :
@@ -405,12 +415,12 @@ void CRegister::CProtocol::OnToken(const char *pToken)
 
 void CRegister::CProtocol::CJob::Run()
 {
-	IEngine::RunJobBlocking(m_pRegister.get());
-	if(m_pRegister->State() != HTTP_DONE)
+	m_pHttp->Run(m_pRegister);
+	m_pRegister->Wait();
+	if(m_pRegister->State() != EHttpState::DONE)
 	{
-		// TODO: log the error response content from master
 		// TODO: exponential backoff
-		log_error(ProtocolToSystem(m_Protocol), "error response from master");
+		log_error(ProtocolToSystem(m_Protocol), "error sending request to master");
 		return;
 	}
 	json_value *pJson = m_pRegister->ResultJson();
@@ -434,6 +444,25 @@ void CRegister::CProtocol::CJob::Run()
 		json_value_free(pJson);
 		return;
 	}
+	if(Status == STATUS_ERROR)
+	{
+		const json_value &Message = Json["message"];
+		if(Message.type != json_string)
+		{
+			json_value_free(pJson);
+			log_error(ProtocolToSystem(m_Protocol), "invalid JSON error response from master");
+			return;
+		}
+		log_error(ProtocolToSystem(m_Protocol), "error response from master: %d: %s", m_pRegister->StatusCode(), (const char *)Message);
+		json_value_free(pJson);
+		return;
+	}
+	if(m_pRegister->StatusCode() >= 400)
+	{
+		log_error(ProtocolToSystem(m_Protocol), "non-success status code %d from master without error code", m_pRegister->StatusCode());
+		json_value_free(pJson);
+		return;
+	}
 	{
 		CLockScope ls(m_pShared->m_Lock);
 		if(Status != STATUS_OK || Status != m_pShared->m_LatestResponseStatus)
@@ -471,10 +500,11 @@ void CRegister::CProtocol::CJob::Run()
 	}
 }
 
-CRegister::CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken) :
+CRegister::CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, IHttp *pHttp, int ServerPort, unsigned SixupSecurityToken) :
 	m_pConfig(pConfig),
 	m_pConsole(pConsole),
 	m_pEngine(pEngine),
+	m_pHttp(pHttp),
 	m_ServerPort(ServerPort),
 	m_aProtocols{
 		CProtocol(this, PROTOCOL_TW6_IPV6),
@@ -488,10 +518,8 @@ CRegister::CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int
 	FormatUuid(m_ChallengeSecret, m_aVerifyPacketPrefix + HEADER_LEN, sizeof(m_aVerifyPacketPrefix) - HEADER_LEN);
 	m_aVerifyPacketPrefix[HEADER_LEN + UUID_MAXSTRSIZE - 1] = ':';
 
-	// The DDNet code uses the `unsigned` security token in memory byte order.
-	unsigned char aTokenBytes[sizeof(int32_t)];
-	mem_copy(aTokenBytes, &SixupSecurityToken, sizeof(aTokenBytes));
-	str_format(m_aConnlessTokenHex, sizeof(m_aConnlessTokenHex), "%08x", bytes_be_to_uint(aTokenBytes));
+	// The DDNet code uses the `unsigned` security token in big-endian byte order.
+	str_format(m_aConnlessTokenHex, sizeof(m_aConnlessTokenHex), "%08x", SixupSecurityToken);
 
 	m_pConsole->Chain("sv_register", ConchainOnConfigChange, this);
 	m_pConsole->Chain("sv_register_extra", ConchainOnConfigChange, this);
@@ -749,7 +777,7 @@ void CRegister::OnShutdown()
 	}
 }
 
-IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken)
+IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, IHttp *pHttp, int ServerPort, unsigned SixupSecurityToken)
 {
-	return new CRegister(pConfig, pConsole, pEngine, ServerPort, SixupSecurityToken);
+	return new CRegister(pConfig, pConsole, pEngine, pHttp, ServerPort, SixupSecurityToken);
 }
diff --git a/src/engine/server/register.h b/src/engine/server/register.h
index 85bdf7a64c..1fbfc3c567 100644
--- a/src/engine/server/register.h
+++ b/src/engine/server/register.h
@@ -4,6 +4,7 @@
 class CConfig;
 class IConsole;
 class IEngine;
+class IHttp;
 struct CNetChunk;
 
 class IRegister
@@ -23,6 +24,6 @@ class IRegister
 	virtual void OnShutdown() = 0;
 };
 
-IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken);
+IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, IHttp *pHttp, int ServerPort, unsigned SixupSecurityToken);
 
 #endif
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 80cb967261..44a2f99b3e 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -24,6 +24,7 @@
 #include <engine/shared/host_lookup.h>
 #include <engine/shared/http.h>
 #include <engine/shared/json.h>
+#include <engine/shared/jsonwriter.h>
 #include <engine/shared/masterserver.h>
 #include <engine/shared/netban.h>
 #include <engine/shared/network.h>
@@ -47,96 +48,6 @@
 
 extern bool IsInterrupted();
 
-CSnapIDPool::CSnapIDPool()
-{
-	Reset();
-}
-
-void CSnapIDPool::Reset()
-{
-	for(int i = 0; i < MAX_IDS; i++)
-	{
-		m_aIDs[i].m_Next = i + 1;
-		m_aIDs[i].m_State = ID_FREE;
-	}
-
-	m_aIDs[MAX_IDS - 1].m_Next = -1;
-	m_FirstFree = 0;
-	m_FirstTimed = -1;
-	m_LastTimed = -1;
-	m_Usage = 0;
-	m_InUsage = 0;
-}
-
-void CSnapIDPool::RemoveFirstTimeout()
-{
-	int NextTimed = m_aIDs[m_FirstTimed].m_Next;
-
-	// add it to the free list
-	m_aIDs[m_FirstTimed].m_Next = m_FirstFree;
-	m_aIDs[m_FirstTimed].m_State = ID_FREE;
-	m_FirstFree = m_FirstTimed;
-
-	// remove it from the timed list
-	m_FirstTimed = NextTimed;
-	if(m_FirstTimed == -1)
-		m_LastTimed = -1;
-
-	m_Usage--;
-}
-
-int CSnapIDPool::NewID()
-{
-	int64_t Now = time_get();
-
-	// process timed ids
-	while(m_FirstTimed != -1 && m_aIDs[m_FirstTimed].m_Timeout < Now)
-		RemoveFirstTimeout();
-
-	int ID = m_FirstFree;
-	if(ID == -1)
-	{
-		dbg_msg("server", "invalid id");
-		return ID;
-	}
-	m_FirstFree = m_aIDs[m_FirstFree].m_Next;
-	m_aIDs[ID].m_State = ID_ALLOCATED;
-	m_Usage++;
-	m_InUsage++;
-	return ID;
-}
-
-void CSnapIDPool::TimeoutIDs()
-{
-	// process timed ids
-	while(m_FirstTimed != -1)
-		RemoveFirstTimeout();
-}
-
-void CSnapIDPool::FreeID(int ID)
-{
-	if(ID < 0)
-		return;
-	dbg_assert((size_t)ID < std::size(m_aIDs), "id is out of range");
-	dbg_assert(m_aIDs[ID].m_State == ID_ALLOCATED, "id is not allocated");
-
-	m_InUsage--;
-	m_aIDs[ID].m_State = ID_TIMED;
-	m_aIDs[ID].m_Timeout = time_get() + time_freq() * 5;
-	m_aIDs[ID].m_Next = -1;
-
-	if(m_LastTimed != -1)
-	{
-		m_aIDs[m_LastTimed].m_Next = ID;
-		m_LastTimed = ID;
-	}
-	else
-	{
-		m_FirstTimed = ID;
-		m_LastTimed = ID;
-	}
-}
-
 void CServerBan::InitServerBan(IConsole *pConsole, IStorage *pStorage, CServer *pServer)
 {
 	CNetBan::Init(pConsole, pStorage);
@@ -150,13 +61,13 @@ void CServerBan::InitServerBan(IConsole *pConsole, IStorage *pStorage, CServer *
 }
 
 template<class T>
-int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason)
+int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason, bool VerbatimReason)
 {
 	// validate address
-	if(Server()->m_RconClientID >= 0 && Server()->m_RconClientID < MAX_CLIENTS &&
-		Server()->m_aClients[Server()->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	if(Server()->m_RconClientId >= 0 && Server()->m_RconClientId < MAX_CLIENTS &&
+		Server()->m_aClients[Server()->m_RconClientId].m_State != CServer::CClient::STATE_EMPTY)
 	{
-		if(NetMatch(pData, Server()->m_NetServer.ClientAddr(Server()->m_RconClientID)))
+		if(NetMatch(pData, Server()->m_NetServer.ClientAddr(Server()->m_RconClientId)))
 		{
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (you can't ban yourself)");
 			return -1;
@@ -164,7 +75,7 @@ int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seco
 
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
-			if(i == Server()->m_RconClientID || Server()->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY)
+			if(i == Server()->m_RconClientId || Server()->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY)
 				continue;
 
 			if(Server()->m_aClients[i].m_Authed >= Server()->m_RconAuthLevel && NetMatch(pData, Server()->m_NetServer.ClientAddr(i)))
@@ -174,7 +85,7 @@ int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seco
 			}
 		}
 	}
-	else if(Server()->m_RconClientID == IServer::RCON_CID_VOTE)
+	else if(Server()->m_RconClientId == IServer::RCON_CID_VOTE)
 	{
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
@@ -189,7 +100,7 @@ int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seco
 		}
 	}
 
-	int Result = Ban(pBanPool, pData, Seconds, pReason);
+	int Result = Ban(pBanPool, pData, Seconds, pReason, VerbatimReason);
 	if(Result != 0)
 		return Result;
 
@@ -212,15 +123,15 @@ int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seco
 	return Result;
 }
 
-int CServerBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason)
+int CServerBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason, bool VerbatimReason)
 {
-	return BanExt(&m_BanAddrPool, pAddr, Seconds, pReason);
+	return BanExt(&m_BanAddrPool, pAddr, Seconds, pReason, VerbatimReason);
 }
 
 int CServerBan::BanRange(const CNetRange *pRange, int Seconds, const char *pReason)
 {
 	if(pRange->IsValid())
-		return BanExt(&m_BanRangePool, pRange, Seconds, pReason);
+		return BanExt(&m_BanRangePool, pRange, Seconds, pReason, true);
 
 	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (invalid range)");
 	return -1;
@@ -236,11 +147,11 @@ void CServerBan::ConBanExt(IConsole::IResult *pResult, void *pUser)
 
 	if(str_isallnum(pStr))
 	{
-		int ClientID = str_toint(pStr);
-		if(ClientID < 0 || ClientID >= MAX_CLIENTS || pThis->Server()->m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+		int ClientId = str_toint(pStr);
+		if(ClientId < 0 || ClientId >= MAX_CLIENTS || pThis->Server()->m_aClients[ClientId].m_State == CServer::CClient::STATE_EMPTY)
 			pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (invalid client id)");
 		else
-			pThis->BanAddr(pThis->Server()->m_NetServer.ClientAddr(ClientID), Minutes * 60, pReason);
+			pThis->BanAddr(pThis->Server()->m_NetServer.ClientAddr(ClientId), Minutes * 60, pReason, false);
 	}
 	else
 		ConBan(pResult, pUser);
@@ -272,12 +183,12 @@ void CServerBan::ConBanRegionRange(IConsole::IResult *pResult, void *pUser)
 class CRconClientLogger : public ILogger
 {
 	CServer *m_pServer;
-	int m_ClientID;
+	int m_ClientId;
 
 public:
-	CRconClientLogger(CServer *pServer, int ClientID) :
+	CRconClientLogger(CServer *pServer, int ClientId) :
 		m_pServer(pServer),
-		m_ClientID(ClientID)
+		m_ClientId(ClientId)
 	{
 	}
 	void Log(const CLogMessage *pMessage) override;
@@ -289,7 +200,7 @@ void CRconClientLogger::Log(const CLogMessage *pMessage)
 	{
 		return;
 	}
-	m_pServer->SendRconLogLine(m_ClientID, pMessage);
+	m_pServer->SendRconLogLine(m_ClientId, pMessage);
 }
 
 void CServer::CClient::Reset()
@@ -315,7 +226,8 @@ CServer::CServer()
 	m_pConfig = &g_Config;
 	for(int i = 0; i < MAX_CLIENTS; i++)
 		m_aDemoRecorder[i] = CDemoRecorder(&m_SnapshotDelta, true);
-	m_aDemoRecorder[MAX_CLIENTS] = CDemoRecorder(&m_SnapshotDelta, false);
+	m_aDemoRecorder[RECORDER_MANUAL] = CDemoRecorder(&m_SnapshotDelta, false);
+	m_aDemoRecorder[RECORDER_AUTO] = CDemoRecorder(&m_SnapshotDelta, false);
 
 	m_pGameServer = 0;
 
@@ -331,10 +243,11 @@ CServer::CServer()
 	}
 
 	m_MapReload = false;
+	m_SameMapReload = false;
 	m_ReloadedWhenEmpty = false;
 	m_aCurrentMap[0] = '\0';
 
-	m_RconClientID = IServer::RCON_CID_SERV;
+	m_RconClientId = IServer::RCON_CID_SERV;
 	m_RconAuthLevel = AUTHED_ADMIN;
 
 	m_ServerInfoFirstRequest = 0;
@@ -373,7 +286,7 @@ CServer::~CServer()
 	delete m_pConnectionPool;
 }
 
-bool CServer::IsClientNameAvailable(int ClientID, const char *pNameRequest)
+bool CServer::IsClientNameAvailable(int ClientId, const char *pNameRequest)
 {
 	// check for empty names
 	if(!pNameRequest[0])
@@ -387,7 +300,7 @@ bool CServer::IsClientNameAvailable(int ClientID, const char *pNameRequest)
 	// make sure that two clients don't have the same name
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(i != ClientID && m_aClients[i].m_State >= CClient::STATE_READY)
+		if(i != ClientId && m_aClients[i].m_State >= CClient::STATE_READY)
 		{
 			if(str_utf8_comp_confusable(pNameRequest, m_aClients[i].m_aName) == 0)
 				return false;
@@ -397,16 +310,16 @@ bool CServer::IsClientNameAvailable(int ClientID, const char *pNameRequest)
 	return true;
 }
 
-bool CServer::SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set)
+bool CServer::SetClientNameImpl(int ClientId, const char *pNameRequest, bool Set)
 {
-	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid client id");
-	if(m_aClients[ClientID].m_State < CClient::STATE_READY)
+	dbg_assert(0 <= ClientId && ClientId < MAX_CLIENTS, "invalid client id");
+	if(m_aClients[ClientId].m_State < CClient::STATE_READY)
 		return false;
 
 	const CNameBan *pBanned = m_NameBans.IsBanned(pNameRequest);
 	if(pBanned)
 	{
-		if(m_aClients[ClientID].m_State == CClient::STATE_READY && Set)
+		if(m_aClients[ClientId].m_State == CClient::STATE_READY && Set)
 		{
 			char aBuf[256];
 			if(pBanned->m_aReason[0])
@@ -417,7 +330,7 @@ bool CServer::SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set
 			{
 				str_copy(aBuf, "Kicked (your name is banned)");
 			}
-			Kick(ClientID, aBuf);
+			Kick(ClientId, aBuf);
 		}
 		return false;
 	}
@@ -430,38 +343,39 @@ bool CServer::SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set
 	char aNameTry[MAX_NAME_LENGTH];
 	str_copy(aNameTry, aTrimmedName);
 
-	if(!IsClientNameAvailable(ClientID, aNameTry))
+	if(!IsClientNameAvailable(ClientId, aNameTry))
 	{
 		// auto rename
 		for(int i = 1;; i++)
 		{
 			str_format(aNameTry, sizeof(aNameTry), "(%d)%s", i, aTrimmedName);
-			if(IsClientNameAvailable(ClientID, aNameTry))
+			if(IsClientNameAvailable(ClientId, aNameTry))
 				break;
 		}
 	}
 
-	bool Changed = str_comp(m_aClients[ClientID].m_aName, aNameTry) != 0;
+	bool Changed = str_comp(m_aClients[ClientId].m_aName, aNameTry) != 0;
 
-	if(Set)
+	if(Set && Changed)
 	{
 		// set the client name
-		str_copy(m_aClients[ClientID].m_aName, aNameTry);
+		str_copy(m_aClients[ClientId].m_aName, aNameTry);
+		GameServer()->TeehistorianRecordPlayerName(ClientId, m_aClients[ClientId].m_aName);
 	}
 
 	return Changed;
 }
 
-bool CServer::SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set)
+bool CServer::SetClientClanImpl(int ClientId, const char *pClanRequest, bool Set)
 {
-	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid client id");
-	if(m_aClients[ClientID].m_State < CClient::STATE_READY)
+	dbg_assert(0 <= ClientId && ClientId < MAX_CLIENTS, "invalid client id");
+	if(m_aClients[ClientId].m_State < CClient::STATE_READY)
 		return false;
 
 	const CNameBan *pBanned = m_NameBans.IsBanned(pClanRequest);
 	if(pBanned)
 	{
-		if(m_aClients[ClientID].m_State == CClient::STATE_READY && Set)
+		if(m_aClients[ClientId].m_State == CClient::STATE_READY && Set)
 		{
 			char aBuf[256];
 			if(pBanned->m_aReason[0])
@@ -472,7 +386,7 @@ bool CServer::SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set
 			{
 				str_copy(aBuf, "Kicked (your clan is banned)");
 			}
-			Kick(ClientID, aBuf);
+			Kick(ClientId, aBuf);
 		}
 		return false;
 	}
@@ -482,102 +396,102 @@ bool CServer::SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set
 	str_copy(aTrimmedClan, str_utf8_skip_whitespaces(pClanRequest));
 	str_utf8_trim_right(aTrimmedClan);
 
-	bool Changed = str_comp(m_aClients[ClientID].m_aClan, aTrimmedClan) != 0;
+	bool Changed = str_comp(m_aClients[ClientId].m_aClan, aTrimmedClan) != 0;
 
 	if(Set)
 	{
 		// set the client clan
-		str_copy(m_aClients[ClientID].m_aClan, aTrimmedClan);
+		str_copy(m_aClients[ClientId].m_aClan, aTrimmedClan);
 	}
 
 	return Changed;
 }
 
-bool CServer::WouldClientNameChange(int ClientID, const char *pNameRequest)
+bool CServer::WouldClientNameChange(int ClientId, const char *pNameRequest)
 {
-	return SetClientNameImpl(ClientID, pNameRequest, false);
+	return SetClientNameImpl(ClientId, pNameRequest, false);
 }
 
-bool CServer::WouldClientClanChange(int ClientID, const char *pClanRequest)
+bool CServer::WouldClientClanChange(int ClientId, const char *pClanRequest)
 {
-	return SetClientClanImpl(ClientID, pClanRequest, false);
+	return SetClientClanImpl(ClientId, pClanRequest, false);
 }
 
-void CServer::SetClientName(int ClientID, const char *pName)
+void CServer::SetClientName(int ClientId, const char *pName)
 {
-	SetClientNameImpl(ClientID, pName, true);
+	SetClientNameImpl(ClientId, pName, true);
 }
 
-void CServer::SetClientClan(int ClientID, const char *pClan)
+void CServer::SetClientClan(int ClientId, const char *pClan)
 {
-	SetClientClanImpl(ClientID, pClan, true);
+	SetClientClanImpl(ClientId, pClan, true);
 }
 
-void CServer::SetClientCountry(int ClientID, int Country)
+void CServer::SetClientCountry(int ClientId, int Country)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State < CClient::STATE_READY)
 		return;
 
-	m_aClients[ClientID].m_Country = Country;
+	m_aClients[ClientId].m_Country = Country;
 }
 
-void CServer::SetClientScore(int ClientID, std::optional<int> Score)
+void CServer::SetClientScore(int ClientId, std::optional<int> Score)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State < CClient::STATE_READY)
 		return;
 
-	if(m_aClients[ClientID].m_Score != Score)
+	if(m_aClients[ClientId].m_Score != Score)
 		ExpireServerInfo();
 
-	m_aClients[ClientID].m_Score = Score;
+	m_aClients[ClientId].m_Score = Score;
 }
 
-void CServer::SetClientFlags(int ClientID, int Flags)
+void CServer::SetClientFlags(int ClientId, int Flags)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State < CClient::STATE_READY)
 		return;
 
-	m_aClients[ClientID].m_Flags = Flags;
+	m_aClients[ClientId].m_Flags = Flags;
 }
 
-void CServer::Kick(int ClientID, const char *pReason)
+void CServer::Kick(int ClientId, const char *pReason)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State == CClient::STATE_EMPTY)
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "invalid client id to kick");
 		return;
 	}
-	else if(m_RconClientID == ClientID)
+	else if(m_RconClientId == ClientId)
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "you can't kick yourself");
 		return;
 	}
-	else if(m_aClients[ClientID].m_Authed > m_RconAuthLevel)
+	else if(m_aClients[ClientId].m_Authed > m_RconAuthLevel)
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "kick command denied");
 		return;
 	}
 
-	m_NetServer.Drop(ClientID, pReason);
+	m_NetServer.Drop(ClientId, pReason);
 }
 
-void CServer::Ban(int ClientID, int Seconds, const char *pReason)
+void CServer::Ban(int ClientId, int Seconds, const char *pReason, bool VerbatimReason)
 {
 	NETADDR Addr;
-	GetClientAddr(ClientID, &Addr);
-	m_NetServer.NetBan()->BanAddr(&Addr, Seconds, pReason);
+	GetClientAddr(ClientId, &Addr);
+	m_NetServer.NetBan()->BanAddr(&Addr, Seconds, pReason, VerbatimReason);
 }
 
-void CServer::RedirectClient(int ClientID, int Port, bool Verbose)
+void CServer::RedirectClient(int ClientId, int Port, bool Verbose)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS)
 		return;
 
 	char aBuf[512];
-	bool SupportsRedirect = GetClientVersion(ClientID) >= VERSION_DDNET_REDIRECT;
+	bool SupportsRedirect = GetClientVersion(ClientId) >= VERSION_DDNET_REDIRECT;
 	if(Verbose)
 	{
-		str_format(aBuf, sizeof(aBuf), "redirecting '%s' to port %d supported=%d", ClientName(ClientID), Port, SupportsRedirect);
+		str_format(aBuf, sizeof(aBuf), "redirecting '%s' to port %d supported=%d", ClientName(ClientId), Port, SupportsRedirect);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "redirect", aBuf);
 	}
 
@@ -585,16 +499,16 @@ void CServer::RedirectClient(int ClientID, int Port, bool Verbose)
 	{
 		bool SamePort = Port == m_NetServer.Address().port;
 		str_format(aBuf, sizeof(aBuf), "Redirect unsupported: please connect to port %d", Port);
-		Kick(ClientID, SamePort ? "Redirect unsupported: please reconnect" : aBuf);
+		Kick(ClientId, SamePort ? "Redirect unsupported: please reconnect" : aBuf);
 		return;
 	}
 
 	CMsgPacker Msg(NETMSG_REDIRECT, true);
 	Msg.AddInt(Port);
-	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 
-	m_aClients[ClientID].m_RedirectDropTime = time_get() + time_freq() * 10;
-	m_aClients[ClientID].m_State = CClient::STATE_REDIRECTED;
+	m_aClients[ClientId].m_RedirectDropTime = time_get() + time_freq() * 10;
+	m_aClients[ClientId].m_State = CClient::STATE_REDIRECTED;
 }
 
 int64_t CServer::TickStartTime(int Tick)
@@ -623,8 +537,7 @@ int CServer::Init()
 
 	m_CurrentGameTick = MIN_TICK;
 
-	m_AnnouncementLastLine = 0;
-	m_aAnnouncementFile[0] = '\0';
+	m_AnnouncementLastLine = -1;
 	mem_zero(m_aPrevStates, sizeof(m_aPrevStates));
 
 	return 0;
@@ -642,19 +555,19 @@ void CServer::SendLogLine(const CLogMessage *pMessage)
 	}
 }
 
-void CServer::SetRconCID(int ClientID)
+void CServer::SetRconCid(int ClientId)
 {
-	m_RconClientID = ClientID;
+	m_RconClientId = ClientId;
 }
 
-int CServer::GetAuthedState(int ClientID) const
+int CServer::GetAuthedState(int ClientId) const
 {
-	return m_aClients[ClientID].m_Authed;
+	return m_aClients[ClientId].m_Authed;
 }
 
-const char *CServer::GetAuthName(int ClientID) const
+const char *CServer::GetAuthName(int ClientId) const
 {
-	int Key = m_aClients[ClientID].m_AuthKey;
+	int Key = m_aClients[ClientId].m_AuthKey;
 	if(Key == -1)
 	{
 		return 0;
@@ -662,25 +575,25 @@ const char *CServer::GetAuthName(int ClientID) const
 	return m_AuthManager.KeyIdent(Key);
 }
 
-bool CServer::GetClientInfo(int ClientID, CClientInfo *pInfo) const
+bool CServer::GetClientInfo(int ClientId, CClientInfo *pInfo) const
 {
-	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "ClientID is not valid");
+	dbg_assert(ClientId >= 0 && ClientId < MAX_CLIENTS, "ClientId is not valid");
 	dbg_assert(pInfo != nullptr, "pInfo cannot be null");
 
-	if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	if(m_aClients[ClientId].m_State == CClient::STATE_INGAME)
 	{
-		pInfo->m_pName = m_aClients[ClientID].m_aName;
-		pInfo->m_Latency = m_aClients[ClientID].m_Latency;
-		pInfo->m_GotDDNetVersion = m_aClients[ClientID].m_DDNetVersionSettled;
-		pInfo->m_DDNetVersion = m_aClients[ClientID].m_DDNetVersion >= 0 ? m_aClients[ClientID].m_DDNetVersion : VERSION_VANILLA;
-		if(m_aClients[ClientID].m_GotDDNetVersionPacket)
+		pInfo->m_pName = m_aClients[ClientId].m_aName;
+		pInfo->m_Latency = m_aClients[ClientId].m_Latency;
+		pInfo->m_GotDDNetVersion = m_aClients[ClientId].m_DDNetVersionSettled;
+		pInfo->m_DDNetVersion = m_aClients[ClientId].m_DDNetVersion >= 0 ? m_aClients[ClientId].m_DDNetVersion : VERSION_VANILLA;
+		if(m_aClients[ClientId].m_GotDDNetVersionPacket)
 		{
-			pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionID;
-			pInfo->m_pDDNetVersionStr = m_aClients[ClientID].m_aDDNetVersionStr;
+			pInfo->m_pConnectionId = &m_aClients[ClientId].m_ConnectionId;
+			pInfo->m_pDDNetVersionStr = m_aClients[ClientId].m_aDDNetVersionStr;
 		}
 		else
 		{
-			pInfo->m_pConnectionID = nullptr;
+			pInfo->m_pConnectionId = nullptr;
 			pInfo->m_pDDNetVersionStr = nullptr;
 		}
 		return true;
@@ -688,61 +601,66 @@ bool CServer::GetClientInfo(int ClientID, CClientInfo *pInfo) const
 	return false;
 }
 
-void CServer::SetClientDDNetVersion(int ClientID, int DDNetVersion)
+void CServer::SetClientDDNetVersion(int ClientId, int DDNetVersion)
 {
-	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "ClientID is not valid");
+	dbg_assert(ClientId >= 0 && ClientId < MAX_CLIENTS, "ClientId is not valid");
 
-	if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	if(m_aClients[ClientId].m_State == CClient::STATE_INGAME)
 	{
-		m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
-		m_aClients[ClientID].m_DDNetVersionSettled = true;
+		m_aClients[ClientId].m_DDNetVersion = DDNetVersion;
+		m_aClients[ClientId].m_DDNetVersionSettled = true;
 	}
 }
 
-void CServer::GetClientAddr(int ClientID, char *pAddrStr, int Size) const
+void CServer::GetClientAddr(int ClientId, char *pAddrStr, int Size) const
 {
-	if(ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
-		net_addr_str(m_NetServer.ClientAddr(ClientID), pAddrStr, Size, false);
+	if(ClientId >= 0 && ClientId < MAX_CLIENTS && m_aClients[ClientId].m_State == CClient::STATE_INGAME)
+		net_addr_str(m_NetServer.ClientAddr(ClientId), pAddrStr, Size, false);
 }
 
-const char *CServer::ClientName(int ClientID) const
+const char *CServer::ClientName(int ClientId) const
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State == CServer::CClient::STATE_EMPTY)
 		return "(invalid)";
-	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
-		return m_aClients[ClientID].m_aName;
+	if(m_aClients[ClientId].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientId].m_aName;
 	else
 		return "(connecting)";
 }
 
-const char *CServer::ClientClan(int ClientID) const
+const char *CServer::ClientClan(int ClientId) const
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State == CServer::CClient::STATE_EMPTY)
 		return "";
-	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
-		return m_aClients[ClientID].m_aClan;
+	if(m_aClients[ClientId].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientId].m_aClan;
 	else
 		return "";
 }
 
-int CServer::ClientCountry(int ClientID) const
+int CServer::ClientCountry(int ClientId) const
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || m_aClients[ClientId].m_State == CServer::CClient::STATE_EMPTY)
 		return -1;
-	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
-		return m_aClients[ClientID].m_Country;
+	if(m_aClients[ClientId].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientId].m_Country;
 	else
 		return -1;
 }
 
-bool CServer::ClientIngame(int ClientID) const
+bool CServer::ClientSlotEmpty(int ClientId) const
 {
-	return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME;
+	return ClientId >= 0 && ClientId < MAX_CLIENTS && m_aClients[ClientId].m_State == CServer::CClient::STATE_EMPTY;
 }
 
-bool CServer::ClientAuthed(int ClientID) const
+bool CServer::ClientIngame(int ClientId) const
 {
-	return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_Authed;
+	return ClientId >= 0 && ClientId < MAX_CLIENTS && m_aClients[ClientId].m_State == CServer::CClient::STATE_INGAME;
+}
+
+bool CServer::ClientAuthed(int ClientId) const
+{
+	return ClientId >= 0 && ClientId < MAX_CLIENTS && m_aClients[ClientId].m_Authed;
 }
 
 int CServer::Port() const
@@ -801,21 +719,21 @@ int CServer::DistinctClientCount() const
 	return ClientCount;
 }
 
-int CServer::GetClientVersion(int ClientID) const
+int CServer::GetClientVersion(int ClientId) const
 {
 	// Assume latest client version for server demos
-	if(ClientID == SERVER_DEMO_CLIENT)
+	if(ClientId == SERVER_DEMO_CLIENT)
 		return DDNET_VERSION_NUMBER;
 
 	CClientInfo Info;
-	if(GetClientInfo(ClientID, &Info))
+	if(GetClientInfo(ClientId, &Info))
 		return Info.m_DDNetVersion;
 	return VERSION_NONE;
 }
 
 static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer, bool Sixup)
 {
-	int MsgId = pMsg->m_MsgID;
+	int MsgId = pMsg->m_MsgId;
 	Packer.Reset();
 
 	if(Sixup && !pMsg->m_NoTranslate)
@@ -864,7 +782,7 @@ static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer, bool Sixup
 	return false;
 }
 
-int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
+int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientId)
 {
 	CNetChunk Packet;
 	mem_zero(&Packet, sizeof(CNetChunk));
@@ -873,7 +791,7 @@ int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 	if(Flags & MSGFLAG_FLUSH)
 		Packet.m_Flags |= NETSENDFLAG_FLUSH;
 
-	if(ClientID < 0)
+	if(ClientId < 0)
 	{
 		CPacker Pack6, Pack7;
 		if(RepackMsg(pMsg, Pack6, false))
@@ -898,7 +816,7 @@ int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 					CPacker *pPack = m_aClients[i].m_Sixup ? &Pack7 : &Pack6;
 					Packet.m_pData = pPack->Data();
 					Packet.m_DataSize = pPack->Size();
-					Packet.m_ClientID = i;
+					Packet.m_ClientId = i;
 					if(Antibot()->OnEngineServerMessage(i, Packet.m_pData, Packet.m_DataSize, Flags))
 					{
 						continue;
@@ -911,14 +829,14 @@ int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 	else
 	{
 		CPacker Pack;
-		if(RepackMsg(pMsg, Pack, m_aClients[ClientID].m_Sixup))
+		if(RepackMsg(pMsg, Pack, m_aClients[ClientId].m_Sixup))
 			return -1;
 
-		Packet.m_ClientID = ClientID;
+		Packet.m_ClientId = ClientId;
 		Packet.m_pData = Pack.Data();
 		Packet.m_DataSize = Pack.Size();
 
-		if(Antibot()->OnEngineServerMessage(ClientID, Packet.m_pData, Packet.m_DataSize, Flags))
+		if(Antibot()->OnEngineServerMessage(ClientId, Packet.m_pData, Packet.m_DataSize, Flags))
 		{
 			return 0;
 		}
@@ -926,10 +844,12 @@ int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 		// write message to demo recorders
 		if(!(Flags & MSGFLAG_NORECORD))
 		{
-			if(m_aDemoRecorder[ClientID].IsRecording())
-				m_aDemoRecorder[ClientID].RecordMessage(Pack.Data(), Pack.Size());
-			if(m_aDemoRecorder[MAX_CLIENTS].IsRecording())
-				m_aDemoRecorder[MAX_CLIENTS].RecordMessage(Pack.Data(), Pack.Size());
+			if(m_aDemoRecorder[ClientId].IsRecording())
+				m_aDemoRecorder[ClientId].RecordMessage(Pack.Data(), Pack.Size());
+			if(m_aDemoRecorder[RECORDER_MANUAL].IsRecording())
+				m_aDemoRecorder[RECORDER_MANUAL].RecordMessage(Pack.Data(), Pack.Size());
+			if(m_aDemoRecorder[RECORDER_AUTO].IsRecording())
+				m_aDemoRecorder[RECORDER_AUTO].RecordMessage(Pack.Data(), Pack.Size());
 		}
 
 		if(!(Flags & MSGFLAG_NOSEND))
@@ -939,11 +859,11 @@ int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 	return 0;
 }
 
-void CServer::SendMsgRaw(int ClientID, const void *pData, int Size, int Flags)
+void CServer::SendMsgRaw(int ClientId, const void *pData, int Size, int Flags)
 {
 	CNetChunk Packet;
 	mem_zero(&Packet, sizeof(CNetChunk));
-	Packet.m_ClientID = ClientID;
+	Packet.m_ClientId = ClientId;
 	Packet.m_pData = pData;
 	Packet.m_DataSize = Size;
 	Packet.m_Flags = 0;
@@ -962,9 +882,9 @@ void CServer::DoSnapshot()
 {
 	GameServer()->OnPreSnap();
 
-	// create snapshot for demo recording
-	if(m_aDemoRecorder[MAX_CLIENTS].IsRecording())
+	if(m_aDemoRecorder[RECORDER_MANUAL].IsRecording() || m_aDemoRecorder[RECORDER_AUTO].IsRecording())
 	{
+		// create snapshot for demo recording
 		char aData[CSnapshot::MAX_SIZE];
 
 		// build snap and possibly add some messages
@@ -973,7 +893,10 @@ void CServer::DoSnapshot()
 		int SnapshotSize = m_SnapshotBuilder.Finish(aData);
 
 		// write snapshot
-		m_aDemoRecorder[MAX_CLIENTS].RecordSnapshot(Tick(), aData, SnapshotSize);
+		if(m_aDemoRecorder[RECORDER_MANUAL].IsRecording())
+			m_aDemoRecorder[RECORDER_MANUAL].RecordSnapshot(Tick(), aData, SnapshotSize);
+		if(m_aDemoRecorder[RECORDER_AUTO].IsRecording())
+			m_aDemoRecorder[RECORDER_AUTO].RecordSnapshot(Tick(), aData, SnapshotSize);
 	}
 
 	// create snapshots for all clients
@@ -1020,7 +943,7 @@ void CServer::DoSnapshot()
 			int DeltaTick = -1;
 			const CSnapshot *pDeltashot = CSnapshot::EmptySnapshot();
 			{
-				int DeltashotSize = m_aClients[i].m_Snapshots.Get(m_aClients[i].m_LastAckedSnapshot, 0, &pDeltashot, 0);
+				int DeltashotSize = m_aClients[i].m_Snapshots.Get(m_aClients[i].m_LastAckedSnapshot, nullptr, &pDeltashot, nullptr);
 				if(DeltashotSize >= 0)
 					DeltaTick = m_aClients[i].m_LastAckedSnapshot;
 				else
@@ -1088,96 +1011,96 @@ void CServer::DoSnapshot()
 	GameServer()->OnPostSnap();
 }
 
-int CServer::ClientRejoinCallback(int ClientID, void *pUser)
+int CServer::ClientRejoinCallback(int ClientId, void *pUser)
 {
 	CServer *pThis = (CServer *)pUser;
 
-	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
-	pThis->m_aClients[ClientID].m_AuthKey = -1;
-	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
-	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
-	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
-	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
+	pThis->m_aClients[ClientId].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientId].m_AuthKey = -1;
+	pThis->m_aClients[ClientId].m_pRconCmdToSend = nullptr;
+	pThis->m_aClients[ClientId].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientId].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientId].m_DDNetVersionSettled = false;
 
-	pThis->m_aClients[ClientID].Reset();
+	pThis->m_aClients[ClientId].Reset();
 
-	pThis->GameServer()->TeehistorianRecordPlayerRejoin(ClientID);
-	pThis->Antibot()->OnEngineClientDrop(ClientID, "rejoin");
-	pThis->Antibot()->OnEngineClientJoin(ClientID, false);
+	pThis->GameServer()->TeehistorianRecordPlayerRejoin(ClientId);
+	pThis->Antibot()->OnEngineClientDrop(ClientId, "rejoin");
+	pThis->Antibot()->OnEngineClientJoin(ClientId, false);
 
-	pThis->SendMap(ClientID);
+	pThis->SendMap(ClientId);
 
 	return 0;
 }
 
-int CServer::NewClientNoAuthCallback(int ClientID, void *pUser)
+int CServer::NewClientNoAuthCallback(int ClientId, void *pUser)
 {
 	CServer *pThis = (CServer *)pUser;
 
-	pThis->m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_NONE;
-
-	pThis->m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
-	pThis->m_aClients[ClientID].m_aName[0] = 0;
-	pThis->m_aClients[ClientID].m_aClan[0] = 0;
-	pThis->m_aClients[ClientID].m_Country = -1;
-	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
-	pThis->m_aClients[ClientID].m_AuthKey = -1;
-	pThis->m_aClients[ClientID].m_AuthTries = 0;
-	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
-	pThis->m_aClients[ClientID].m_ShowIps = false;
-	pThis->m_aClients[ClientID].m_DebugDummy = false;
-	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
-	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
-	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
-	pThis->m_aClients[ClientID].Reset();
-
-	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientID, false);
-	pThis->Antibot()->OnEngineClientJoin(ClientID, false);
-
-	pThis->SendCapabilities(ClientID);
-	pThis->SendMap(ClientID);
+	pThis->m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_NONE;
+
+	pThis->m_aClients[ClientId].m_State = CClient::STATE_CONNECTING;
+	pThis->m_aClients[ClientId].m_aName[0] = 0;
+	pThis->m_aClients[ClientId].m_aClan[0] = 0;
+	pThis->m_aClients[ClientId].m_Country = -1;
+	pThis->m_aClients[ClientId].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientId].m_AuthKey = -1;
+	pThis->m_aClients[ClientId].m_AuthTries = 0;
+	pThis->m_aClients[ClientId].m_pRconCmdToSend = nullptr;
+	pThis->m_aClients[ClientId].m_ShowIps = false;
+	pThis->m_aClients[ClientId].m_DebugDummy = false;
+	pThis->m_aClients[ClientId].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientId].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientId].m_DDNetVersionSettled = false;
+	pThis->m_aClients[ClientId].Reset();
+
+	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientId, false);
+	pThis->Antibot()->OnEngineClientJoin(ClientId, false);
+
+	pThis->SendCapabilities(ClientId);
+	pThis->SendMap(ClientId);
 #if defined(CONF_FAMILY_UNIX)
-	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientId));
 #endif
 	return 0;
 }
 
-int CServer::NewClientCallback(int ClientID, void *pUser, bool Sixup)
+int CServer::NewClientCallback(int ClientId, void *pUser, bool Sixup)
 {
 	CServer *pThis = (CServer *)pUser;
-	pThis->m_aClients[ClientID].m_State = CClient::STATE_PREAUTH;
-	pThis->m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_NONE;
-	pThis->m_aClients[ClientID].m_aName[0] = 0;
-	pThis->m_aClients[ClientID].m_aClan[0] = 0;
-	pThis->m_aClients[ClientID].m_Country = -1;
-	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
-	pThis->m_aClients[ClientID].m_AuthKey = -1;
-	pThis->m_aClients[ClientID].m_AuthTries = 0;
-	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
-	pThis->m_aClients[ClientID].m_Traffic = 0;
-	pThis->m_aClients[ClientID].m_TrafficSince = 0;
-	pThis->m_aClients[ClientID].m_ShowIps = false;
-	pThis->m_aClients[ClientID].m_DebugDummy = false;
-	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
-	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
-	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
-	mem_zero(&pThis->m_aClients[ClientID].m_Addr, sizeof(NETADDR));
-	pThis->m_aClients[ClientID].Reset();
-
-	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientID, Sixup);
-	pThis->Antibot()->OnEngineClientJoin(ClientID, Sixup);
-
-	pThis->m_aClients[ClientID].m_Sixup = Sixup;
+	pThis->m_aClients[ClientId].m_State = CClient::STATE_PREAUTH;
+	pThis->m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_NONE;
+	pThis->m_aClients[ClientId].m_aName[0] = 0;
+	pThis->m_aClients[ClientId].m_aClan[0] = 0;
+	pThis->m_aClients[ClientId].m_Country = -1;
+	pThis->m_aClients[ClientId].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientId].m_AuthKey = -1;
+	pThis->m_aClients[ClientId].m_AuthTries = 0;
+	pThis->m_aClients[ClientId].m_pRconCmdToSend = nullptr;
+	pThis->m_aClients[ClientId].m_Traffic = 0;
+	pThis->m_aClients[ClientId].m_TrafficSince = 0;
+	pThis->m_aClients[ClientId].m_ShowIps = false;
+	pThis->m_aClients[ClientId].m_DebugDummy = false;
+	pThis->m_aClients[ClientId].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientId].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientId].m_DDNetVersionSettled = false;
+	mem_zero(&pThis->m_aClients[ClientId].m_Addr, sizeof(NETADDR));
+	pThis->m_aClients[ClientId].Reset();
+
+	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientId, Sixup);
+	pThis->Antibot()->OnEngineClientJoin(ClientId, Sixup);
+
+	pThis->m_aClients[ClientId].m_Sixup = Sixup;
 
 #if defined(CONF_FAMILY_UNIX)
-	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientId));
 #endif
 	return 0;
 }
 
-void CServer::InitDnsbl(int ClientID)
+void CServer::InitDnsbl(int ClientId)
 {
-	NETADDR Addr = *m_NetServer.ClientAddr(ClientID);
+	NETADDR Addr = *m_NetServer.ClientAddr(ClientId);
 
 	//TODO: support ipv6
 	if(Addr.type != NETTYPE_IPV4)
@@ -1196,9 +1119,9 @@ void CServer::InitDnsbl(int ClientID)
 		str_format(aBuf, sizeof(aBuf), "%s.%d.%d.%d.%d.%s", Config()->m_SvDnsblKey, Addr.ip[3], Addr.ip[2], Addr.ip[1], Addr.ip[0], Config()->m_SvDnsblHost);
 	}
 
-	IEngine *pEngine = Kernel()->RequestInterface<IEngine>();
-	pEngine->AddJob(m_aClients[ClientID].m_pDnsblLookup = std::make_shared<CHostLookup>(aBuf, NETTYPE_IPV4));
-	m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_PENDING;
+	m_aClients[ClientId].m_pDnsblLookup = std::make_shared<CHostLookup>(aBuf, NETTYPE_IPV4);
+	Engine()->AddJob(m_aClients[ClientId].m_pDnsblLookup);
+	m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_PENDING;
 }
 
 #ifdef CONF_FAMILY_UNIX
@@ -1218,51 +1141,51 @@ void CServer::SendConnLoggingCommand(CONN_LOGGING_CMD Cmd, const NETADDR *pAddr)
 }
 #endif
 
-int CServer::DelClientCallback(int ClientID, const char *pReason, void *pUser)
+int CServer::DelClientCallback(int ClientId, const char *pReason, void *pUser)
 {
 	CServer *pThis = (CServer *)pUser;
 
 	char aAddrStr[NETADDR_MAXSTRSIZE];
-	net_addr_str(pThis->m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+	net_addr_str(pThis->m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
 
 	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=<{%s}> reason='%s'", ClientID, aAddrStr, pReason);
+	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=<{%s}> reason='%s'", ClientId, aAddrStr, pReason);
 	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
 
 	// notify the mod about the drop
-	if(pThis->m_aClients[ClientID].m_State >= CClient::STATE_READY)
-		pThis->GameServer()->OnClientDrop(ClientID, pReason);
-
-	pThis->m_aClients[ClientID].m_State = CClient::STATE_EMPTY;
-	pThis->m_aClients[ClientID].m_aName[0] = 0;
-	pThis->m_aClients[ClientID].m_aClan[0] = 0;
-	pThis->m_aClients[ClientID].m_Country = -1;
-	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
-	pThis->m_aClients[ClientID].m_AuthKey = -1;
-	pThis->m_aClients[ClientID].m_AuthTries = 0;
-	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
-	pThis->m_aClients[ClientID].m_Traffic = 0;
-	pThis->m_aClients[ClientID].m_TrafficSince = 0;
-	pThis->m_aClients[ClientID].m_ShowIps = false;
-	pThis->m_aClients[ClientID].m_DebugDummy = false;
-	pThis->m_aPrevStates[ClientID] = CClient::STATE_EMPTY;
-	pThis->m_aClients[ClientID].m_Snapshots.PurgeAll();
-	pThis->m_aClients[ClientID].m_Sixup = false;
-	pThis->m_aClients[ClientID].m_RedirectDropTime = 0;
-
-	pThis->GameServer()->TeehistorianRecordPlayerDrop(ClientID, pReason);
-	pThis->Antibot()->OnEngineClientDrop(ClientID, pReason);
+	if(pThis->m_aClients[ClientId].m_State >= CClient::STATE_READY)
+		pThis->GameServer()->OnClientDrop(ClientId, pReason);
+
+	pThis->m_aClients[ClientId].m_State = CClient::STATE_EMPTY;
+	pThis->m_aClients[ClientId].m_aName[0] = 0;
+	pThis->m_aClients[ClientId].m_aClan[0] = 0;
+	pThis->m_aClients[ClientId].m_Country = -1;
+	pThis->m_aClients[ClientId].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientId].m_AuthKey = -1;
+	pThis->m_aClients[ClientId].m_AuthTries = 0;
+	pThis->m_aClients[ClientId].m_pRconCmdToSend = nullptr;
+	pThis->m_aClients[ClientId].m_Traffic = 0;
+	pThis->m_aClients[ClientId].m_TrafficSince = 0;
+	pThis->m_aClients[ClientId].m_ShowIps = false;
+	pThis->m_aClients[ClientId].m_DebugDummy = false;
+	pThis->m_aPrevStates[ClientId] = CClient::STATE_EMPTY;
+	pThis->m_aClients[ClientId].m_Snapshots.PurgeAll();
+	pThis->m_aClients[ClientId].m_Sixup = false;
+	pThis->m_aClients[ClientId].m_RedirectDropTime = 0;
+
+	pThis->GameServer()->TeehistorianRecordPlayerDrop(ClientId, pReason);
+	pThis->Antibot()->OnEngineClientDrop(ClientId, pReason);
 #if defined(CONF_FAMILY_UNIX)
-	pThis->SendConnLoggingCommand(CLOSE_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+	pThis->SendConnLoggingCommand(CLOSE_SESSION, pThis->m_NetServer.ClientAddr(ClientId));
 #endif
 	return 0;
 }
 
-void CServer::SendRconType(int ClientID, bool UsernameReq)
+void CServer::SendRconType(int ClientId, bool UsernameReq)
 {
 	CMsgPacker Msg(NETMSG_RCONTYPE, true);
 	Msg.AddInt(UsernameReq);
-	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
 void CServer::GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pMapSha256, int *pMapCrc)
@@ -1273,17 +1196,17 @@ void CServer::GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_
 	*pMapCrc = m_aCurrentMapCrc[MAP_TYPE_SIX];
 }
 
-void CServer::SendCapabilities(int ClientID)
+void CServer::SendCapabilities(int ClientId)
 {
 	CMsgPacker Msg(NETMSG_CAPABILITIES, true);
 	Msg.AddInt(SERVERCAP_CURVERSION); // version
 	Msg.AddInt(SERVERCAPFLAG_DDNET | SERVERCAPFLAG_CHATTIMEOUTCODE | SERVERCAPFLAG_ANYPLAYERFLAG | SERVERCAPFLAG_PINGEX | SERVERCAPFLAG_ALLOWDUMMY | SERVERCAPFLAG_SYNCWEAPONINPUT); // flags
-	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CServer::SendMap(int ClientID)
+void CServer::SendMap(int ClientId)
 {
-	int MapType = IsSixup(ClientID) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
+	int MapType = IsSixup(ClientId) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
 	{
 		CMsgPacker Msg(NETMSG_MAP_DETAILS, true);
 		Msg.AddString(GetMapName(), 0);
@@ -1291,7 +1214,7 @@ void CServer::SendMap(int ClientID)
 		Msg.AddInt(m_aCurrentMapCrc[MapType]);
 		Msg.AddInt(m_aCurrentMapSize[MapType]);
 		Msg.AddString("", 0); // HTTPS map download URL
-		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 	}
 	{
 		CMsgPacker Msg(NETMSG_MAP_CHANGE, true);
@@ -1304,15 +1227,15 @@ void CServer::SendMap(int ClientID)
 			Msg.AddInt(1024 - 128);
 			Msg.AddRaw(m_aCurrentMapSha256[MapType].data, sizeof(m_aCurrentMapSha256[MapType].data));
 		}
-		SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+		SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 	}
 
-	m_aClients[ClientID].m_NextMapChunk = 0;
+	m_aClients[ClientId].m_NextMapChunk = 0;
 }
 
-void CServer::SendMapData(int ClientID, int Chunk)
+void CServer::SendMapData(int ClientId, int Chunk)
 {
-	int MapType = IsSixup(ClientID) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
+	int MapType = IsSixup(ClientId) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
 	unsigned int ChunkSize = 1024 - 128;
 	unsigned int Offset = Chunk * ChunkSize;
 	int Last = 0;
@@ -1336,7 +1259,7 @@ void CServer::SendMapData(int ClientID, int Chunk)
 		Msg.AddInt(ChunkSize);
 	}
 	Msg.AddRaw(&m_apCurrentMapData[MapType][Offset], ChunkSize);
-	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 
 	if(Config()->m_Debug)
 	{
@@ -1346,20 +1269,26 @@ void CServer::SendMapData(int ClientID, int Chunk)
 	}
 }
 
-void CServer::SendConnectionReady(int ClientID)
+void CServer::SendMapReload(int ClientId)
+{
+	CMsgPacker Msg(NETMSG_MAP_RELOAD, true);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
+}
+
+void CServer::SendConnectionReady(int ClientId)
 {
 	CMsgPacker Msg(NETMSG_CON_READY, true);
-	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 }
 
-void CServer::SendRconLine(int ClientID, const char *pLine)
+void CServer::SendRconLine(int ClientId, const char *pLine)
 {
 	CMsgPacker Msg(NETMSG_RCON_LINE, true);
 	Msg.AddString(pLine, 512);
-	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CServer::SendRconLogLine(int ClientID, const CLogMessage *pMessage)
+void CServer::SendRconLogLine(int ClientId, const CLogMessage *pMessage)
 {
 	const char *pLine = pMessage->m_aLine;
 	const char *pStart = str_find(pLine, "<{");
@@ -1388,7 +1317,7 @@ void CServer::SendRconLogLine(int ClientID, const CLogMessage *pMessage)
 		pLineWithoutIps = aLineWithoutIps;
 	}
 
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
@@ -1398,38 +1327,60 @@ void CServer::SendRconLogLine(int ClientID, const CLogMessage *pMessage)
 	}
 	else
 	{
-		if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY)
-			SendRconLine(ClientID, m_aClients[ClientID].m_ShowIps ? pLine : pLineWithoutIps);
+		if(m_aClients[ClientId].m_State != CClient::STATE_EMPTY)
+			SendRconLine(ClientId, m_aClients[ClientId].m_ShowIps ? pLine : pLineWithoutIps);
 	}
 }
 
-void CServer::SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientID)
+void CServer::SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientId)
 {
 	CMsgPacker Msg(NETMSG_RCON_CMD_ADD, true);
 	Msg.AddString(pCommandInfo->m_pName, IConsole::TEMPCMD_NAME_LENGTH);
 	Msg.AddString(pCommandInfo->m_pHelp, IConsole::TEMPCMD_HELP_LENGTH);
 	Msg.AddString(pCommandInfo->m_pParams, IConsole::TEMPCMD_PARAMS_LENGTH);
-	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CServer::SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientID)
+void CServer::SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientId)
 {
 	CMsgPacker Msg(NETMSG_RCON_CMD_REM, true);
 	Msg.AddString(pCommandInfo->m_pName, 256);
-	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
+}
+
+int CServer::GetConsoleAccessLevel(int ClientId)
+{
+	return m_aClients[ClientId].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientId].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER;
+}
+
+int CServer::NumRconCommands(int ClientId)
+{
+	int Num = 0;
+	int ConsoleAccessLevel = GetConsoleAccessLevel(ClientId);
+	for(const IConsole::CCommandInfo *pCmd = Console()->FirstCommandInfo(ConsoleAccessLevel, CFGFLAG_SERVER);
+		pCmd; pCmd = pCmd->NextCommandInfo(ConsoleAccessLevel, CFGFLAG_SERVER))
+	{
+		Num++;
+	}
+	return Num;
 }
 
 void CServer::UpdateClientRconCommands()
 {
-	int ClientID = Tick() % MAX_CLIENTS;
+	int ClientId = Tick() % MAX_CLIENTS;
 
-	if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY && m_aClients[ClientID].m_Authed)
+	if(m_aClients[ClientId].m_State != CClient::STATE_EMPTY && m_aClients[ClientId].m_Authed)
 	{
-		int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER;
-		for(int i = 0; i < MAX_RCONCMD_SEND && m_aClients[ClientID].m_pRconCmdToSend; ++i)
+		int ConsoleAccessLevel = GetConsoleAccessLevel(ClientId);
+		for(int i = 0; i < MAX_RCONCMD_SEND && m_aClients[ClientId].m_pRconCmdToSend; ++i)
 		{
-			SendRconCmdAdd(m_aClients[ClientID].m_pRconCmdToSend, ClientID);
-			m_aClients[ClientID].m_pRconCmdToSend = m_aClients[ClientID].m_pRconCmdToSend->NextCommandInfo(ConsoleAccessLevel, CFGFLAG_SERVER);
+			SendRconCmdAdd(m_aClients[ClientId].m_pRconCmdToSend, ClientId);
+			m_aClients[ClientId].m_pRconCmdToSend = m_aClients[ClientId].m_pRconCmdToSend->NextCommandInfo(ConsoleAccessLevel, CFGFLAG_SERVER);
+			if(m_aClients[ClientId].m_pRconCmdToSend == nullptr)
+			{
+				CMsgPacker Msg(NETMSG_RCON_CMD_GROUP_END, true);
+				SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
+			}
 		}
 	}
 }
@@ -1451,13 +1402,13 @@ static inline int MsgFromSixup(int Msg, bool System)
 	return Msg;
 }
 
-bool CServer::CheckReservedSlotAuth(int ClientID, const char *pPassword)
+bool CServer::CheckReservedSlotAuth(int ClientId, const char *pPassword)
 {
 	char aBuf[256];
 
 	if(Config()->m_SvReservedSlotsPass[0] && !str_comp(Config()->m_SvReservedSlotsPass, pPassword))
 	{
-		str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with reserved pass", ClientID);
+		str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with reserved pass", ClientId);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 		return true;
 	}
@@ -1474,7 +1425,7 @@ bool CServer::CheckReservedSlotAuth(int ClientID, const char *pPassword)
 		int Slot = m_AuthManager.FindKey(aName);
 		if(m_AuthManager.CheckKey(Slot, pInnerPassword + 1) && m_AuthManager.KeyLevel(Slot) >= Config()->m_SvReservedSlotsAuthLevel)
 		{
-			str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with key=%s", ClientID, m_AuthManager.KeyIdent(Slot));
+			str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with key=%s", ClientId, m_AuthManager.KeyIdent(Slot));
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 			return true;
 		}
@@ -1485,7 +1436,7 @@ bool CServer::CheckReservedSlotAuth(int ClientID, const char *pPassword)
 
 void CServer::ProcessClientPacket(CNetChunk *pPacket)
 {
-	int ClientID = pPacket->m_ClientID;
+	int ClientId = pPacket->m_ClientId;
 	CUnpacker Unpacker;
 	Unpacker.Reset(pPacket->m_pData, pPacket->m_DataSize);
 	CMsgPacker Packer(NETMSG_EX, true);
@@ -1495,13 +1446,13 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 	bool Sys;
 	CUuid Uuid;
 
-	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	int Result = UnpackMessageId(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
 	if(Result == UNPACKMESSAGE_ERROR)
 	{
 		return;
 	}
 
-	if(m_aClients[ClientID].m_Sixup && (Msg = MsgFromSixup(Msg, Sys)) < 0)
+	if(m_aClients[ClientId].m_Sixup && (Msg = MsgFromSixup(Msg, Sys)) < 0)
 	{
 		return;
 	}
@@ -1509,25 +1460,25 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 	if(Config()->m_SvNetlimit && Msg != NETMSG_REQUEST_MAP_DATA)
 	{
 		int64_t Now = time_get();
-		int64_t Diff = Now - m_aClients[ClientID].m_TrafficSince;
+		int64_t Diff = Now - m_aClients[ClientId].m_TrafficSince;
 		double Alpha = Config()->m_SvNetlimitAlpha / 100.0;
 		double Limit = (double)(Config()->m_SvNetlimit * 1024) / time_freq();
 
-		if(m_aClients[ClientID].m_Traffic > Limit)
+		if(m_aClients[ClientId].m_Traffic > Limit)
 		{
-			m_NetServer.NetBan()->BanAddr(&pPacket->m_Address, 600, "Stressing network");
+			m_NetServer.NetBan()->BanAddr(&pPacket->m_Address, 600, "Stressing network", false);
 			return;
 		}
 		if(Diff > 100)
 		{
-			m_aClients[ClientID].m_Traffic = (Alpha * ((double)pPacket->m_DataSize / Diff)) + (1.0 - Alpha) * m_aClients[ClientID].m_Traffic;
-			m_aClients[ClientID].m_TrafficSince = Now;
+			m_aClients[ClientId].m_Traffic = (Alpha * ((double)pPacket->m_DataSize / Diff)) + (1.0 - Alpha) * m_aClients[ClientId].m_Traffic;
+			m_aClients[ClientId].m_TrafficSince = Now;
 		}
 	}
 
 	if(Result == UNPACKMESSAGE_ANSWER)
 	{
-		SendMsg(&Packer, MSGFLAG_VITAL, ClientID);
+		SendMsg(&Packer, MSGFLAG_VITAL, ClientId);
 	}
 
 	if(Sys)
@@ -1535,29 +1486,29 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 		// system message
 		if(Msg == NETMSG_CLIENTVER)
 		{
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State == CClient::STATE_PREAUTH)
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientId].m_State == CClient::STATE_PREAUTH)
 			{
-				CUuid *pConnectionID = (CUuid *)Unpacker.GetRaw(sizeof(*pConnectionID));
+				CUuid *pConnectionId = (CUuid *)Unpacker.GetRaw(sizeof(*pConnectionId));
 				int DDNetVersion = Unpacker.GetInt();
 				const char *pDDNetVersionStr = Unpacker.GetString(CUnpacker::SANITIZE_CC);
-				if(Unpacker.Error() || !str_utf8_check(pDDNetVersionStr) || DDNetVersion < 0)
+				if(Unpacker.Error() || DDNetVersion < 0)
 				{
 					return;
 				}
-				m_aClients[ClientID].m_ConnectionID = *pConnectionID;
-				m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
-				str_copy(m_aClients[ClientID].m_aDDNetVersionStr, pDDNetVersionStr);
-				m_aClients[ClientID].m_DDNetVersionSettled = true;
-				m_aClients[ClientID].m_GotDDNetVersionPacket = true;
-				m_aClients[ClientID].m_State = CClient::STATE_AUTH;
+				m_aClients[ClientId].m_ConnectionId = *pConnectionId;
+				m_aClients[ClientId].m_DDNetVersion = DDNetVersion;
+				str_copy(m_aClients[ClientId].m_aDDNetVersionStr, pDDNetVersionStr);
+				m_aClients[ClientId].m_DDNetVersionSettled = true;
+				m_aClients[ClientId].m_GotDDNetVersionPacket = true;
+				m_aClients[ClientId].m_State = CClient::STATE_AUTH;
 			}
 		}
 		else if(Msg == NETMSG_INFO)
 		{
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientID].m_State == CClient::STATE_PREAUTH || m_aClients[ClientID].m_State == CClient::STATE_AUTH))
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientId].m_State == CClient::STATE_PREAUTH || m_aClients[ClientId].m_State == CClient::STATE_AUTH))
 			{
 				const char *pVersion = Unpacker.GetString(CUnpacker::SANITIZE_CC);
-				if(!str_utf8_check(pVersion))
+				if(Unpacker.Error())
 				{
 					return;
 				}
@@ -1566,53 +1517,57 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 					// wrong version
 					char aReason[256];
 					str_format(aReason, sizeof(aReason), "Wrong version. Server is running '%s' and client '%s'", GameServer()->NetVersion(), pVersion);
-					m_NetServer.Drop(ClientID, aReason);
+					m_NetServer.Drop(ClientId, aReason);
 					return;
 				}
 
 				const char *pPassword = Unpacker.GetString(CUnpacker::SANITIZE_CC);
-				if(!str_utf8_check(pPassword))
+				if(Unpacker.Error())
 				{
 					return;
 				}
 				if(Config()->m_Password[0] != 0 && str_comp(Config()->m_Password, pPassword) != 0)
 				{
 					// wrong password
-					m_NetServer.Drop(ClientID, "Wrong password");
+					m_NetServer.Drop(ClientId, "Wrong password");
 					return;
 				}
 
 				// reserved slot
-				if(ClientID >= Config()->m_SvMaxClients - Config()->m_SvReservedSlots && !CheckReservedSlotAuth(ClientID, pPassword))
+				if(ClientId >= MaxClients() - Config()->m_SvReservedSlots && !CheckReservedSlotAuth(ClientId, pPassword))
 				{
-					m_NetServer.Drop(ClientID, "This server is full");
+					m_NetServer.Drop(ClientId, "This server is full");
 					return;
 				}
 
-				m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
-				SendRconType(ClientID, m_AuthManager.NumNonDefaultKeys() > 0);
-				SendCapabilities(ClientID);
-				SendMap(ClientID);
+				m_aClients[ClientId].m_State = CClient::STATE_CONNECTING;
+				SendRconType(ClientId, m_AuthManager.NumNonDefaultKeys() > 0);
+				SendCapabilities(ClientId);
+				SendMap(ClientId);
 			}
 		}
 		else if(Msg == NETMSG_REQUEST_MAP_DATA)
 		{
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) == 0 || m_aClients[ClientID].m_State < CClient::STATE_CONNECTING)
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) == 0 || m_aClients[ClientId].m_State < CClient::STATE_CONNECTING)
 				return;
 
-			if(m_aClients[ClientID].m_Sixup)
+			if(m_aClients[ClientId].m_Sixup)
 			{
 				for(int i = 0; i < Config()->m_SvMapWindow; i++)
 				{
-					SendMapData(ClientID, m_aClients[ClientID].m_NextMapChunk++);
+					SendMapData(ClientId, m_aClients[ClientId].m_NextMapChunk++);
 				}
 				return;
 			}
 
 			int Chunk = Unpacker.GetInt();
-			if(Chunk != m_aClients[ClientID].m_NextMapChunk || !Config()->m_SvFastDownload)
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			if(Chunk != m_aClients[ClientId].m_NextMapChunk || !Config()->m_SvFastDownload)
 			{
-				SendMapData(ClientID, Chunk);
+				SendMapData(ClientId, Chunk);
 				return;
 			}
 
@@ -1620,91 +1575,92 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 			{
 				for(int i = 0; i < Config()->m_SvMapWindow; i++)
 				{
-					SendMapData(ClientID, i);
+					SendMapData(ClientId, i);
 				}
 			}
-			SendMapData(ClientID, Config()->m_SvMapWindow + m_aClients[ClientID].m_NextMapChunk);
-			m_aClients[ClientID].m_NextMapChunk++;
+			SendMapData(ClientId, Config()->m_SvMapWindow + m_aClients[ClientId].m_NextMapChunk);
+			m_aClients[ClientId].m_NextMapChunk++;
 		}
 		else if(Msg == NETMSG_READY)
 		{
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientID].m_State == CClient::STATE_CONNECTING))
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientId].m_State == CClient::STATE_CONNECTING))
 			{
 				char aAddrStr[NETADDR_MAXSTRSIZE];
-				net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+				net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
 
 				char aBuf[256];
-				str_format(aBuf, sizeof(aBuf), "player is ready. ClientID=%d addr=<{%s}> secure=%s", ClientID, aAddrStr, m_NetServer.HasSecurityToken(ClientID) ? "yes" : "no");
+				str_format(aBuf, sizeof(aBuf), "player is ready. ClientId=%d addr=<{%s}> secure=%s", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
 				Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
 
 				void *pPersistentData = 0;
-				if(m_aClients[ClientID].m_HasPersistentData)
+				if(m_aClients[ClientId].m_HasPersistentData)
 				{
-					pPersistentData = m_aClients[ClientID].m_pPersistentData;
-					m_aClients[ClientID].m_HasPersistentData = false;
+					pPersistentData = m_aClients[ClientId].m_pPersistentData;
+					m_aClients[ClientId].m_HasPersistentData = false;
 				}
-				m_aClients[ClientID].m_State = CClient::STATE_READY;
-				GameServer()->OnClientConnected(ClientID, pPersistentData);
+				m_aClients[ClientId].m_State = CClient::STATE_READY;
+				GameServer()->OnClientConnected(ClientId, pPersistentData);
 			}
 
-			SendConnectionReady(ClientID);
+			SendConnectionReady(ClientId);
 		}
 		else if(Msg == NETMSG_ENTERGAME)
 		{
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State == CClient::STATE_READY && GameServer()->IsClientReady(ClientID))
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientId].m_State == CClient::STATE_READY && GameServer()->IsClientReady(ClientId))
 			{
 				char aAddrStr[NETADDR_MAXSTRSIZE];
-				net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+				net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
 
 				char aBuf[256];
-				str_format(aBuf, sizeof(aBuf), "player has entered the game. ClientID=%d addr=<{%s}> sixup=%d", ClientID, aAddrStr, IsSixup(ClientID));
+				str_format(aBuf, sizeof(aBuf), "player has entered the game. ClientId=%d addr=<{%s}> sixup=%d", ClientId, aAddrStr, IsSixup(ClientId));
 				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
-				m_aClients[ClientID].m_State = CClient::STATE_INGAME;
-				if(!IsSixup(ClientID))
+				m_aClients[ClientId].m_State = CClient::STATE_INGAME;
+				if(!IsSixup(ClientId))
 				{
-					SendServerInfo(m_NetServer.ClientAddr(ClientID), -1, SERVERINFO_EXTENDED, false);
+					SendServerInfo(m_NetServer.ClientAddr(ClientId), -1, SERVERINFO_EXTENDED, false);
 				}
 				else
 				{
 					CMsgPacker Msgp(protocol7::NETMSG_SERVERINFO, true, true);
 					GetServerInfoSixup(&Msgp, -1, false);
-					SendMsg(&Msgp, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+					SendMsg(&Msgp, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 				}
-				GameServer()->OnClientEnter(ClientID);
+				GameServer()->OnClientEnter(ClientId);
 			}
 		}
 		else if(Msg == NETMSG_INPUT)
 		{
-			m_aClients[ClientID].m_LastAckedSnapshot = Unpacker.GetInt();
+			const int LastAckedSnapshot = Unpacker.GetInt();
 			int IntendedTick = Unpacker.GetInt();
 			int Size = Unpacker.GetInt();
-
-			// check for errors
 			if(Unpacker.Error() || Size / 4 > MAX_INPUT_SIZE || IntendedTick < MIN_TICK || IntendedTick >= MAX_TICK)
+			{
 				return;
+			}
 
-			if(m_aClients[ClientID].m_LastAckedSnapshot > 0)
-				m_aClients[ClientID].m_SnapRate = CClient::SNAPRATE_FULL;
+			m_aClients[ClientId].m_LastAckedSnapshot = LastAckedSnapshot;
+			if(m_aClients[ClientId].m_LastAckedSnapshot > 0)
+				m_aClients[ClientId].m_SnapRate = CClient::SNAPRATE_FULL;
 
 			int64_t TagTime;
-			if(m_aClients[ClientID].m_Snapshots.Get(m_aClients[ClientID].m_LastAckedSnapshot, &TagTime, 0, 0) >= 0)
-				m_aClients[ClientID].m_Latency = (int)(((time_get() - TagTime) * 1000) / time_freq());
+			if(m_aClients[ClientId].m_Snapshots.Get(m_aClients[ClientId].m_LastAckedSnapshot, &TagTime, nullptr, nullptr) >= 0)
+				m_aClients[ClientId].m_Latency = (int)(((time_get() - TagTime) * 1000) / time_freq());
 
 			// add message to report the input timing
 			// skip packets that are old
-			if(IntendedTick > m_aClients[ClientID].m_LastInputTick)
+			if(IntendedTick > m_aClients[ClientId].m_LastInputTick)
 			{
 				const int TimeLeft = (TickStartTime(IntendedTick) - time_get()) / (time_freq() / 1000);
 
 				CMsgPacker Msgp(NETMSG_INPUTTIMING, true);
 				Msgp.AddInt(IntendedTick);
 				Msgp.AddInt(TimeLeft);
-				SendMsg(&Msgp, 0, ClientID);
+				SendMsg(&Msgp, 0, ClientId);
 			}
 
-			m_aClients[ClientID].m_LastInputTick = IntendedTick;
+			m_aClients[ClientId].m_LastInputTick = IntendedTick;
 
-			CClient::CInput *pInput = &m_aClients[ClientID].m_aInputs[m_aClients[ClientID].m_CurrentInput];
+			CClient::CInput *pInput = &m_aClients[ClientId].m_aInputs[m_aClients[ClientId].m_CurrentInput];
 
 			if(IntendedTick <= Tick())
 				IntendedTick = Tick() + 1;
@@ -1712,174 +1668,195 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 			pInput->m_GameTick = IntendedTick;
 
 			for(int i = 0; i < Size / 4; i++)
+			{
 				pInput->m_aData[i] = Unpacker.GetInt();
+			}
+			if(Unpacker.Error())
+			{
+				return;
+			}
 
-			GameServer()->OnClientPrepareInput(ClientID, pInput->m_aData);
-			mem_copy(m_aClients[ClientID].m_LatestInput.m_aData, pInput->m_aData, MAX_INPUT_SIZE * sizeof(int));
+			GameServer()->OnClientPrepareInput(ClientId, pInput->m_aData);
+			mem_copy(m_aClients[ClientId].m_LatestInput.m_aData, pInput->m_aData, MAX_INPUT_SIZE * sizeof(int));
 
-			m_aClients[ClientID].m_CurrentInput++;
-			m_aClients[ClientID].m_CurrentInput %= 200;
+			m_aClients[ClientId].m_CurrentInput++;
+			m_aClients[ClientId].m_CurrentInput %= 200;
 
 			// call the mod with the fresh input data
-			if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
-				GameServer()->OnClientDirectInput(ClientID, m_aClients[ClientID].m_LatestInput.m_aData);
+			if(m_aClients[ClientId].m_State == CClient::STATE_INGAME)
+				GameServer()->OnClientDirectInput(ClientId, m_aClients[ClientId].m_LatestInput.m_aData);
 		}
 		else if(Msg == NETMSG_RCON_CMD)
 		{
 			const char *pCmd = Unpacker.GetString();
-			if(!str_utf8_check(pCmd))
+			if(Unpacker.Error())
 			{
 				return;
 			}
-			if(Unpacker.Error() == 0 && !str_comp(pCmd, "crashmeplx"))
+			if(!str_comp(pCmd, "crashmeplx"))
 			{
-				int Version = m_aClients[ClientID].m_DDNetVersion;
-				if(GameServer()->PlayerExists(ClientID) && Version < VERSION_DDNET_OLD)
+				int Version = m_aClients[ClientId].m_DDNetVersion;
+				if(GameServer()->PlayerExists(ClientId) && Version < VERSION_DDNET_OLD)
 				{
-					m_aClients[ClientID].m_DDNetVersion = VERSION_DDNET_OLD;
+					m_aClients[ClientId].m_DDNetVersion = VERSION_DDNET_OLD;
 				}
 			}
-			else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Unpacker.Error() == 0 && m_aClients[ClientID].m_Authed)
+			else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientId].m_Authed)
 			{
-				if(GameServer()->PlayerExists(ClientID))
+				if(GameServer()->PlayerExists(ClientId))
 				{
 					char aBuf[256];
-					str_format(aBuf, sizeof(aBuf), "ClientID=%d rcon='%s'", ClientID, pCmd);
+					str_format(aBuf, sizeof(aBuf), "ClientId=%d rcon='%s'", ClientId, pCmd);
 					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
-					m_RconClientID = ClientID;
-					m_RconAuthLevel = m_aClients[ClientID].m_Authed;
-					Console()->SetAccessLevel(m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : m_aClients[ClientID].m_Authed == AUTHED_HELPER ? IConsole::ACCESS_LEVEL_HELPER : IConsole::ACCESS_LEVEL_USER);
+					m_RconClientId = ClientId;
+					m_RconAuthLevel = m_aClients[ClientId].m_Authed;
+					Console()->SetAccessLevel(m_aClients[ClientId].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientId].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : m_aClients[ClientId].m_Authed == AUTHED_HELPER ? IConsole::ACCESS_LEVEL_HELPER : IConsole::ACCESS_LEVEL_USER);
 					{
-						CRconClientLogger Logger(this, ClientID);
+						CRconClientLogger Logger(this, ClientId);
 						CLogScope Scope(&Logger);
-						Console()->ExecuteLineFlag(pCmd, CFGFLAG_SERVER, ClientID);
+						Console()->ExecuteLineFlag(pCmd, CFGFLAG_SERVER, ClientId);
 					}
 					Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
-					m_RconClientID = IServer::RCON_CID_SERV;
+					m_RconClientId = IServer::RCON_CID_SERV;
 					m_RconAuthLevel = AUTHED_ADMIN;
 				}
 			}
 		}
 		else if(Msg == NETMSG_RCON_AUTH)
 		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) == 0)
+			{
+				return;
+			}
 			const char *pName = "";
-			if(!IsSixup(ClientID))
+			if(!IsSixup(ClientId))
+			{
 				pName = Unpacker.GetString(CUnpacker::SANITIZE_CC); // login name, now used
+			}
 			const char *pPw = Unpacker.GetString(CUnpacker::SANITIZE_CC);
-			if(!str_utf8_check(pPw) || !str_utf8_check(pName))
+			if(Unpacker.Error())
 			{
 				return;
 			}
 
-			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Unpacker.Error() == 0)
-			{
-				int AuthLevel = -1;
-				int KeySlot = -1;
+			int AuthLevel = -1;
+			int KeySlot = -1;
 
-				if(!pName[0])
-				{
-					if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_ADMIN)), pPw))
-						AuthLevel = AUTHED_ADMIN;
-					else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_MOD)), pPw))
-						AuthLevel = AUTHED_MOD;
-					else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_HELPER)), pPw))
-						AuthLevel = AUTHED_HELPER;
-				}
-				else
-				{
-					KeySlot = m_AuthManager.FindKey(pName);
-					if(m_AuthManager.CheckKey(KeySlot, pPw))
-						AuthLevel = m_AuthManager.KeyLevel(KeySlot);
-				}
+			if(!pName[0])
+			{
+				if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_ADMIN)), pPw))
+					AuthLevel = AUTHED_ADMIN;
+				else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_MOD)), pPw))
+					AuthLevel = AUTHED_MOD;
+				else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_HELPER)), pPw))
+					AuthLevel = AUTHED_HELPER;
+			}
+			else
+			{
+				KeySlot = m_AuthManager.FindKey(pName);
+				if(m_AuthManager.CheckKey(KeySlot, pPw))
+					AuthLevel = m_AuthManager.KeyLevel(KeySlot);
+			}
 
-				if(AuthLevel != -1)
+			if(AuthLevel != -1)
+			{
+				if(m_aClients[ClientId].m_Authed != AuthLevel)
 				{
-					if(m_aClients[ClientID].m_Authed != AuthLevel)
+					if(!IsSixup(ClientId))
 					{
-						if(!IsSixup(ClientID))
-						{
-							CMsgPacker Msgp(NETMSG_RCON_AUTH_STATUS, true);
-							Msgp.AddInt(1); //authed
-							Msgp.AddInt(1); //cmdlist
-							SendMsg(&Msgp, MSGFLAG_VITAL, ClientID);
-						}
-						else
-						{
-							CMsgPacker Msgp(protocol7::NETMSG_RCON_AUTH_ON, true, true);
-							SendMsg(&Msgp, MSGFLAG_VITAL, ClientID);
-						}
-
-						m_aClients[ClientID].m_Authed = AuthLevel; // Keeping m_Authed around is unwise...
-						m_aClients[ClientID].m_AuthKey = KeySlot;
-						int SendRconCmds = IsSixup(ClientID) ? true : Unpacker.GetInt();
-						if(Unpacker.Error() == 0 && SendRconCmds)
-							// AUTHED_ADMIN - AuthLevel gets the proper IConsole::ACCESS_LEVEL_<x>
-							m_aClients[ClientID].m_pRconCmdToSend = Console()->FirstCommandInfo(AUTHED_ADMIN - AuthLevel, CFGFLAG_SERVER);
+						CMsgPacker Msgp(NETMSG_RCON_AUTH_STATUS, true);
+						Msgp.AddInt(1); //authed
+						Msgp.AddInt(1); //cmdlist
+						SendMsg(&Msgp, MSGFLAG_VITAL, ClientId);
+					}
+					else
+					{
+						CMsgPacker Msgp(protocol7::NETMSG_RCON_AUTH_ON, true, true);
+						SendMsg(&Msgp, MSGFLAG_VITAL, ClientId);
+					}
 
-						char aBuf[256];
-						const char *pIdent = m_AuthManager.KeyIdent(KeySlot);
-						switch(AuthLevel)
-						{
-						case AUTHED_ADMIN:
-						{
-							SendRconLine(ClientID, "Admin authentication successful. Full remote console access granted.");
-							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (admin)", ClientID, pIdent);
-							break;
-						}
-						case AUTHED_MOD:
-						{
-							SendRconLine(ClientID, "Moderator authentication successful. Limited remote console access granted.");
-							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (moderator)", ClientID, pIdent);
-							break;
-						}
-						case AUTHED_HELPER:
+					m_aClients[ClientId].m_Authed = AuthLevel; // Keeping m_Authed around is unwise...
+					m_aClients[ClientId].m_AuthKey = KeySlot;
+					int SendRconCmds = IsSixup(ClientId) ? true : Unpacker.GetInt();
+					if(!Unpacker.Error() && SendRconCmds)
+					{
+						// AUTHED_ADMIN - AuthLevel gets the proper IConsole::ACCESS_LEVEL_<x>
+						m_aClients[ClientId].m_pRconCmdToSend = Console()->FirstCommandInfo(AUTHED_ADMIN - AuthLevel, CFGFLAG_SERVER);
+						CMsgPacker MsgStart(NETMSG_RCON_CMD_GROUP_START, true);
+						MsgStart.AddInt(NumRconCommands(ClientId));
+						SendMsg(&MsgStart, MSGFLAG_VITAL, ClientId);
+						if(m_aClients[ClientId].m_pRconCmdToSend == nullptr)
 						{
-							SendRconLine(ClientID, "Helper authentication successful. Limited remote console access granted.");
-							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (helper)", ClientID, pIdent);
-							break;
-						}
+							CMsgPacker MsgEnd(NETMSG_RCON_CMD_GROUP_END, true);
+							SendMsg(&MsgEnd, MSGFLAG_VITAL, ClientId);
 						}
-						Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+					}
 
-						// DDRace
-						GameServer()->OnSetAuthed(ClientID, AuthLevel);
+					char aBuf[256];
+					const char *pIdent = m_AuthManager.KeyIdent(KeySlot);
+					switch(AuthLevel)
+					{
+					case AUTHED_ADMIN:
+					{
+						SendRconLine(ClientId, "Admin authentication successful. Full remote console access granted.");
+						str_format(aBuf, sizeof(aBuf), "ClientId=%d authed with key=%s (admin)", ClientId, pIdent);
+						break;
 					}
-				}
-				else if(Config()->m_SvRconMaxTries)
-				{
-					m_aClients[ClientID].m_AuthTries++;
-					char aBuf[128];
-					str_format(aBuf, sizeof(aBuf), "Wrong password %d/%d.", m_aClients[ClientID].m_AuthTries, Config()->m_SvRconMaxTries);
-					SendRconLine(ClientID, aBuf);
-					if(m_aClients[ClientID].m_AuthTries >= Config()->m_SvRconMaxTries)
+					case AUTHED_MOD:
 					{
-						if(!Config()->m_SvRconBantime)
-							m_NetServer.Drop(ClientID, "Too many remote console authentication tries");
-						else
-							m_ServerBan.BanAddr(m_NetServer.ClientAddr(ClientID), Config()->m_SvRconBantime * 60, "Too many remote console authentication tries");
+						SendRconLine(ClientId, "Moderator authentication successful. Limited remote console access granted.");
+						str_format(aBuf, sizeof(aBuf), "ClientId=%d authed with key=%s (moderator)", ClientId, pIdent);
+						break;
+					}
+					case AUTHED_HELPER:
+					{
+						SendRconLine(ClientId, "Helper authentication successful. Limited remote console access granted.");
+						str_format(aBuf, sizeof(aBuf), "ClientId=%d authed with key=%s (helper)", ClientId, pIdent);
+						break;
 					}
+					}
+					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+
+					// DDRace
+					GameServer()->OnSetAuthed(ClientId, AuthLevel);
 				}
-				else
+			}
+			else if(Config()->m_SvRconMaxTries)
+			{
+				m_aClients[ClientId].m_AuthTries++;
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "Wrong password %d/%d.", m_aClients[ClientId].m_AuthTries, Config()->m_SvRconMaxTries);
+				SendRconLine(ClientId, aBuf);
+				if(m_aClients[ClientId].m_AuthTries >= Config()->m_SvRconMaxTries)
 				{
-					SendRconLine(ClientID, "Wrong password.");
+					if(!Config()->m_SvRconBantime)
+						m_NetServer.Drop(ClientId, "Too many remote console authentication tries");
+					else
+						m_ServerBan.BanAddr(m_NetServer.ClientAddr(ClientId), Config()->m_SvRconBantime * 60, "Too many remote console authentication tries", false);
 				}
 			}
+			else
+			{
+				SendRconLine(ClientId, "Wrong password.");
+			}
 		}
 		else if(Msg == NETMSG_PING)
 		{
 			CMsgPacker Msgp(NETMSG_PING_REPLY, true);
-			SendMsg(&Msgp, MSGFLAG_FLUSH, ClientID);
+			int Vital = (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 ? MSGFLAG_VITAL : 0;
+			SendMsg(&Msgp, MSGFLAG_FLUSH | Vital, ClientId);
 		}
 		else if(Msg == NETMSG_PINGEX)
 		{
-			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			CUuid *pId = (CUuid *)Unpacker.GetRaw(sizeof(*pId));
 			if(Unpacker.Error())
 			{
 				return;
 			}
 			CMsgPacker Msgp(NETMSG_PONGEX, true);
-			Msgp.AddRaw(pID, sizeof(*pID));
-			SendMsg(&Msgp, MSGFLAG_FLUSH, ClientID);
+			Msgp.AddRaw(pId, sizeof(*pId));
+			int Vital = (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 ? MSGFLAG_VITAL : 0;
+			SendMsg(&Msgp, MSGFLAG_FLUSH | Vital, ClientId);
 		}
 		else
 		{
@@ -1890,17 +1867,16 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 				str_hex(aBuf, sizeof(aBuf), pPacket->m_pData, minimum(pPacket->m_DataSize, MaxDumpedDataSize));
 
 				char aBufMsg[256];
-				str_format(aBufMsg, sizeof(aBufMsg), "strange message ClientID=%d msg=%d data_size=%d", ClientID, Msg, pPacket->m_DataSize);
+				str_format(aBufMsg, sizeof(aBufMsg), "strange message ClientId=%d msg=%d data_size=%d", ClientId, Msg, pPacket->m_DataSize);
 				Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "server", aBufMsg);
 				Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "server", aBuf);
 			}
 		}
 	}
-	else
+	else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientId].m_State >= CClient::STATE_READY)
 	{
 		// game message
-		if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State >= CClient::STATE_READY)
-			GameServer()->OnMessage(Msg, &Unpacker, ClientID);
+		GameServer()->OnMessage(Msg, &Unpacker, ClientId);
 	}
 }
 
@@ -1993,7 +1969,7 @@ void CServer::CacheServerInfo(CCache *pCache, int Type, bool SendClients)
 #define ADD_INT(p, x) \
 	do \
 	{ \
-		str_from_int(x, aBuf); \
+		str_format(aBuf, sizeof(aBuf), "%d", x); \
 		(p).AddString(aBuf, 0); \
 	} while(0)
 
@@ -2254,12 +2230,12 @@ void CServer::SendServerInfo(const NETADDR *pAddr, int Token, int Type, bool Sen
 #define ADD_INT(p, x) \
 	do \
 	{ \
-		str_from_int(x, aBuf); \
+		str_format(aBuf, sizeof(aBuf), "%d", x); \
 		(p).AddString(aBuf, 0); \
 	} while(0)
 
 	CNetChunk Packet;
-	Packet.m_ClientID = -1;
+	Packet.m_ClientId = -1;
 	Packet.m_Address = *pAddr;
 	Packet.m_Flags = NETSENDFLAG_CONNLESS;
 
@@ -2316,7 +2292,11 @@ void CServer::FillAntibot(CAntibotRoundData *pData)
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
 		CAntibotPlayerData *pPlayer = &pData->m_aPlayers[i];
-		net_addr_str(m_NetServer.ClientAddr(i), pPlayer->m_aAddress, sizeof(pPlayer->m_aAddress), true);
+		// No need for expensive str_copy since we don't truncate and the string is
+		// ASCII anyway
+		static_assert(std::size((CAntibotPlayerData{}).m_aAddress) >= NETADDR_MAXSTRSIZE);
+		static_assert(sizeof(*(CNetServer{}).ClientAddrString(i)) == NETADDR_MAXSTRSIZE);
+		mem_copy(pPlayer->m_aAddress, m_NetServer.ClientAddrString(i), NETADDR_MAXSTRSIZE);
 	}
 }
 
@@ -2342,76 +2322,81 @@ void CServer::UpdateRegisterServerInfo()
 
 	int MaxPlayers = maximum(m_NetServer.MaxClients() - maximum(g_Config.m_SvSpectatorSlots, g_Config.m_SvReservedSlots), PlayerCount);
 	int MaxClients = maximum(m_NetServer.MaxClients() - g_Config.m_SvReservedSlots, ClientCount);
-	char aName[256];
-	char aGameType[32];
-	char aMapName[64];
-	char aVersion[64];
 	char aMapSha256[SHA256_MAXSTRSIZE];
 
 	sha256_str(m_aCurrentMapSha256[MAP_TYPE_SIX], aMapSha256, sizeof(aMapSha256));
 
-	char aInfo[16384];
-	str_format(aInfo, sizeof(aInfo),
-		"{"
-		"\"max_clients\":%d,"
-		"\"max_players\":%d,"
-		"\"passworded\":%s,"
-		"\"game_type\":\"%s\","
-		"\"name\":\"%s\","
-		"\"map\":{"
-		"\"name\":\"%s\","
-		"\"sha256\":\"%s\","
-		"\"size\":%d"
-		"},"
-		"\"version\":\"%s\","
-		"\"client_score_kind\":\"time\","
-		"\"clients\":[",
-		MaxClients,
-		MaxPlayers,
-		JsonBool(g_Config.m_Password[0]),
-		EscapeJson(aGameType, sizeof(aGameType), GameServer()->GameType()),
-		EscapeJson(aName, sizeof(aName), g_Config.m_SvName),
-		EscapeJson(aMapName, sizeof(aMapName), m_aCurrentMap),
-		aMapSha256,
-		m_aCurrentMapSize[MAP_TYPE_SIX],
-		EscapeJson(aVersion, sizeof(aVersion), GameServer()->Version()));
-
-	bool FirstPlayer = true;
+	CJsonStringWriter JsonWriter;
+
+	JsonWriter.BeginObject();
+	JsonWriter.WriteAttribute("max_clients");
+	JsonWriter.WriteIntValue(MaxClients);
+
+	JsonWriter.WriteAttribute("max_players");
+	JsonWriter.WriteIntValue(MaxPlayers);
+
+	JsonWriter.WriteAttribute("passworded");
+	JsonWriter.WriteBoolValue(g_Config.m_Password[0]);
+
+	JsonWriter.WriteAttribute("game_type");
+	JsonWriter.WriteStrValue(GameServer()->GameType());
+
+	JsonWriter.WriteAttribute("name");
+	JsonWriter.WriteStrValue(g_Config.m_SvName);
+
+	JsonWriter.WriteAttribute("map");
+	JsonWriter.BeginObject();
+	JsonWriter.WriteAttribute("name");
+	JsonWriter.WriteStrValue(GetMapName());
+	JsonWriter.WriteAttribute("sha256");
+	JsonWriter.WriteStrValue(aMapSha256);
+	JsonWriter.WriteAttribute("size");
+	JsonWriter.WriteIntValue(m_aCurrentMapSize[MAP_TYPE_SIX]);
+	JsonWriter.EndObject();
+
+	JsonWriter.WriteAttribute("version");
+	JsonWriter.WriteStrValue(GameServer()->Version());
+
+	JsonWriter.WriteAttribute("client_score_kind");
+	JsonWriter.WriteStrValue("time"); // "points" or "time"
+
+	JsonWriter.WriteAttribute("requires_login");
+	JsonWriter.WriteBoolValue(false);
+
+	JsonWriter.WriteAttribute("clients");
+	JsonWriter.BeginArray();
+
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
 		if(m_aClients[i].IncludedInServerInfo())
 		{
-			char aCName[32];
-			char aCClan[32];
+			JsonWriter.BeginObject();
+
+			JsonWriter.WriteAttribute("name");
+			JsonWriter.WriteStrValue(ClientName(i));
+
+			JsonWriter.WriteAttribute("clan");
+			JsonWriter.WriteStrValue(ClientClan(i));
+
+			JsonWriter.WriteAttribute("country");
+			JsonWriter.WriteIntValue(m_aClients[i].m_Country);
+
+			JsonWriter.WriteAttribute("score");
+			JsonWriter.WriteIntValue(m_aClients[i].m_Score.value_or(-9999));
 
-			char aExtraPlayerInfo[512];
-			GameServer()->OnUpdatePlayerServerInfo(aExtraPlayerInfo, sizeof(aExtraPlayerInfo), i);
+			JsonWriter.WriteAttribute("is_player");
+			JsonWriter.WriteBoolValue(GameServer()->IsClientPlayer(i));
 
-			char aClientInfo[1024];
-			str_format(aClientInfo, sizeof(aClientInfo),
-				"%s{"
-				"\"name\":\"%s\","
-				"\"clan\":\"%s\","
-				"\"country\":%d,"
-				"\"score\":%d,"
-				"\"is_player\":%s"
-				"%s"
-				"}",
-				!FirstPlayer ? "," : "",
-				EscapeJson(aCName, sizeof(aCName), ClientName(i)),
-				EscapeJson(aCClan, sizeof(aCClan), ClientClan(i)),
-				m_aClients[i].m_Country,
-				m_aClients[i].m_Score.value_or(-9999),
-				JsonBool(GameServer()->IsClientPlayer(i)),
-				aExtraPlayerInfo);
-			str_append(aInfo, aClientInfo);
-			FirstPlayer = false;
+			GameServer()->OnUpdatePlayerServerInfo(&JsonWriter, i);
+
+			JsonWriter.EndObject();
 		}
 	}
 
-	str_append(aInfo, "]}");
+	JsonWriter.EndArray();
+	JsonWriter.EndObject();
 
-	m_pRegister->OnNewInfo(aInfo);
+	m_pRegister->OnNewInfo(JsonWriter.GetOutputString().c_str());
 }
 
 void CServer::UpdateServerInfo(bool Resend)
@@ -2459,9 +2444,10 @@ void CServer::PumpNetwork(bool PacketWaiting)
 	if(PacketWaiting)
 	{
 		// process packets
+		ResponseToken = NET_SECURITY_TOKEN_UNKNOWN;
 		while(m_NetServer.Recv(&Packet, &ResponseToken))
 		{
-			if(Packet.m_ClientID == -1)
+			if(Packet.m_ClientId == -1)
 			{
 				if(ResponseToken == NET_SECURITY_TOKEN_UNKNOWN && m_pRegister->OnPacket(&Packet))
 					continue;
@@ -2491,14 +2477,15 @@ void CServer::PumpNetwork(bool PacketWaiting)
 						Unpacker.Reset((unsigned char *)Packet.m_pData + sizeof(SERVERBROWSE_GETINFO), Packet.m_DataSize - sizeof(SERVERBROWSE_GETINFO));
 						int SrvBrwsToken = Unpacker.GetInt();
 						if(Unpacker.Error())
+						{
 							continue;
+						}
 
 						CPacker Packer;
-						CNetChunk Response;
-
 						GetServerInfoSixup(&Packer, SrvBrwsToken, RateLimitServerInfoConnless());
 
-						Response.m_ClientID = -1;
+						CNetChunk Response;
+						Response.m_ClientId = -1;
 						Response.m_Address = Packet.m_Address;
 						Response.m_Flags = NETSENDFLAG_CONNLESS;
 						Response.m_pData = Packer.Data();
@@ -2515,7 +2502,7 @@ void CServer::PumpNetwork(bool PacketWaiting)
 			}
 			else
 			{
-				if(m_aClients[Packet.m_ClientID].m_State == CClient::STATE_REDIRECTED)
+				if(m_aClients[Packet.m_ClientId].m_State == CClient::STATE_REDIRECTED)
 					continue;
 
 				int GameFlags = 0;
@@ -2523,7 +2510,7 @@ void CServer::PumpNetwork(bool PacketWaiting)
 				{
 					GameFlags |= MSGFLAG_VITAL;
 				}
-				if(Antibot()->OnEngineClientMessage(Packet.m_ClientID, Packet.m_pData, Packet.m_DataSize, GameFlags))
+				if(Antibot()->OnEngineClientMessage(Packet.m_ClientId, Packet.m_pData, Packet.m_DataSize, GameFlags))
 				{
 					continue;
 				}
@@ -2537,7 +2524,7 @@ void CServer::PumpNetwork(bool PacketWaiting)
 		int Flags;
 		mem_zero(&Packet, sizeof(Packet));
 		Packet.m_pData = aBuffer;
-		while(Antibot()->OnEngineSimulateClientMessage(&Packet.m_ClientID, aBuffer, sizeof(aBuffer), &Packet.m_DataSize, &Flags))
+		while(Antibot()->OnEngineSimulateClientMessage(&Packet.m_ClientId, aBuffer, sizeof(aBuffer), &Packet.m_DataSize, &Flags))
 		{
 			Packet.m_Flags = 0;
 			if(Flags & MSGFLAG_VITAL)
@@ -2570,9 +2557,15 @@ void CServer::ChangeMap(const char *pMap)
 	m_MapReload = str_comp(Config()->m_SvMap, m_aCurrentMap) != 0;
 }
 
+void CServer::ReloadMap()
+{
+	m_SameMapReload = true;
+}
+
 int CServer::LoadMap(const char *pMapName)
 {
 	m_MapReload = false;
+	m_SameMapReload = false;
 
 	char aBuf[IO_MAX_PATH_LENGTH];
 	str_format(aBuf, sizeof(aBuf), "maps/%s.map", pMapName);
@@ -2582,7 +2575,7 @@ int CServer::LoadMap(const char *pMapName)
 		return 0;
 
 	// reinit snapshot ids
-	m_IDPool.TimeoutIDs();
+	m_IdPool.TimeoutIds();
 
 	// get the crc of the map
 	m_aCurrentMapSha256[MAP_TYPE_SIX] = m_pMap->Sha256();
@@ -2615,9 +2608,8 @@ int CServer::LoadMap(const char *pMapName)
 			{
 				m_pRegister->OnConfigChange();
 			}
-			str_format(aBufMsg, sizeof(aBufMsg), "couldn't load map %s", aBuf);
-			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "sixup", aBufMsg);
-			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "sixup", "disabling 0.7 compatibility");
+			log_error("sixup", "couldn't load map %s", aBuf);
+			log_info("sixup", "disabling 0.7 compatibility");
 		}
 		else
 		{
@@ -2649,32 +2641,33 @@ void CServer::UpdateDebugDummies(bool ForceDisconnect)
 	if(m_PreviousDebugDummies == g_Config.m_DbgDummies && !ForceDisconnect)
 		return;
 
+	g_Config.m_DbgDummies = clamp(g_Config.m_DbgDummies, 0, MaxClients());
 	for(int DummyIndex = 0; DummyIndex < maximum(m_PreviousDebugDummies, g_Config.m_DbgDummies); ++DummyIndex)
 	{
 		const bool AddDummy = !ForceDisconnect && DummyIndex < g_Config.m_DbgDummies;
-		const int ClientID = MAX_CLIENTS - DummyIndex - 1;
-		if(AddDummy && m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
+		const int ClientId = MaxClients() - DummyIndex - 1;
+		if(AddDummy && m_aClients[ClientId].m_State == CClient::STATE_EMPTY)
 		{
-			NewClientCallback(ClientID, this, false);
-			m_aClients[ClientID].m_DebugDummy = true;
-			GameServer()->OnClientConnected(ClientID, nullptr);
-			m_aClients[ClientID].m_State = CClient::STATE_INGAME;
-			str_format(m_aClients[ClientID].m_aName, sizeof(m_aClients[ClientID].m_aName), "Debug dummy %d", DummyIndex + 1);
-			GameServer()->OnClientEnter(ClientID);
+			NewClientCallback(ClientId, this, false);
+			m_aClients[ClientId].m_DebugDummy = true;
+			GameServer()->OnClientConnected(ClientId, nullptr);
+			m_aClients[ClientId].m_State = CClient::STATE_INGAME;
+			str_format(m_aClients[ClientId].m_aName, sizeof(m_aClients[ClientId].m_aName), "Debug dummy %d", DummyIndex + 1);
+			GameServer()->OnClientEnter(ClientId);
 		}
-		else if(!AddDummy && m_aClients[ClientID].m_DebugDummy)
+		else if(!AddDummy && m_aClients[ClientId].m_DebugDummy)
 		{
-			DelClientCallback(ClientID, "Dropping debug dummy", this);
+			DelClientCallback(ClientId, "Dropping debug dummy", this);
 		}
 
-		if(AddDummy && m_aClients[ClientID].m_DebugDummy)
+		if(AddDummy && m_aClients[ClientId].m_DebugDummy)
 		{
 			CNetObj_PlayerInput Input = {0};
-			Input.m_Direction = (ClientID & 1) ? -1 : 1;
-			m_aClients[ClientID].m_aInputs[0].m_GameTick = Tick() + 1;
-			mem_copy(m_aClients[ClientID].m_aInputs[0].m_aData, &Input, minimum(sizeof(Input), sizeof(m_aClients[ClientID].m_aInputs[0].m_aData)));
-			m_aClients[ClientID].m_LatestInput = m_aClients[ClientID].m_aInputs[0];
-			m_aClients[ClientID].m_CurrentInput = 0;
+			Input.m_Direction = (ClientId & 1) ? -1 : 1;
+			m_aClients[ClientId].m_aInputs[0].m_GameTick = Tick() + 1;
+			mem_copy(m_aClients[ClientId].m_aInputs[0].m_aData, &Input, minimum(sizeof(Input), sizeof(m_aClients[ClientId].m_aInputs[0].m_aData)));
+			m_aClients[ClientId].m_LatestInput = m_aClients[ClientId].m_aInputs[0];
+			m_aClients[ClientId].m_CurrentInput = 0;
 		}
 	}
 
@@ -2707,7 +2700,7 @@ int CServer::Run()
 	// load map
 	if(!LoadMap(Config()->m_SvMap))
 	{
-		dbg_msg("server", "failed to load map. mapname='%s'", Config()->m_SvMap);
+		log_error("server", "failed to load map. mapname='%s'", Config()->m_SvMap);
 		return -1;
 	}
 
@@ -2716,7 +2709,7 @@ int CServer::Run()
 		char aFullPath[IO_MAX_PATH_LENGTH];
 		Storage()->GetCompletePath(IStorage::TYPE_SAVE_OR_ABSOLUTE, Config()->m_SvSqliteFile, aFullPath, sizeof(aFullPath));
 
-		if(Config()->m_SvUseSQL)
+		if(Config()->m_SvUseSql)
 		{
 			DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE_BACKUP, aFullPath);
 		}
@@ -2735,30 +2728,36 @@ int CServer::Run()
 	}
 	else if(net_host_lookup(g_Config.m_Bindaddr, &BindAddr, NETTYPE_ALL) != 0)
 	{
-		dbg_msg("server", "The configured bindaddr '%s' cannot be resolved", g_Config.m_Bindaddr);
+		log_error("server", "The configured bindaddr '%s' cannot be resolved", g_Config.m_Bindaddr);
 		return -1;
 	}
 	BindAddr.type = Config()->m_SvIpv4Only ? NETTYPE_IPV4 : NETTYPE_ALL;
 
 	int Port = Config()->m_SvPort;
-	for(BindAddr.port = Port != 0 ? Port : 8303; !m_NetServer.Open(BindAddr, &m_ServerBan, Config()->m_SvMaxClients, Config()->m_SvMaxClientsPerIP); BindAddr.port++)
+	for(BindAddr.port = Port != 0 ? Port : 8303; !m_NetServer.Open(BindAddr, &m_ServerBan, Config()->m_SvMaxClients, Config()->m_SvMaxClientsPerIp); BindAddr.port++)
 	{
 		if(Port != 0 || BindAddr.port >= 8310)
 		{
-			dbg_msg("server", "couldn't open socket. port %d might already be in use", BindAddr.port);
+			log_error("server", "couldn't open socket. port %d might already be in use", BindAddr.port);
 			return -1;
 		}
 	}
 
 	if(Port == 0)
-		dbg_msg("server", "using port %d", BindAddr.port);
+		log_info("server", "using port %d", BindAddr.port);
 
 #if defined(CONF_UPNP)
 	m_UPnP.Open(BindAddr);
 #endif
 
-	IEngine *pEngine = Kernel()->RequestInterface<IEngine>();
-	m_pRegister = CreateRegister(&g_Config, m_pConsole, pEngine, this->Port(), m_NetServer.GetGlobalToken());
+	if(!m_Http.Init(std::chrono::seconds{2}))
+	{
+		log_error("server", "Failed to initialize the HTTP client.");
+		return -1;
+	}
+
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pRegister = CreateRegister(&g_Config, m_pConsole, m_pEngine, &m_Http, this->Port(), m_NetServer.GetGlobalToken());
 
 	m_NetServer.SetCallbacks(NewClientCallback, NewClientNoAuthCallback, ClientRejoinCallback, DelClientCallback, this);
 
@@ -2783,15 +2782,17 @@ int CServer::Run()
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 	}
 
+	ReadAnnouncementsFile(g_Config.m_SvAnnouncementFileName);
+
 	// process pending commands
 	m_pConsole->StoreCommands(false);
 	m_pRegister->OnConfigChange();
 
 	if(m_AuthManager.IsGenerated())
 	{
-		dbg_msg("server", "+-------------------------+");
-		dbg_msg("server", "| rcon password: '%s' |", Config()->m_SvRconPassword);
-		dbg_msg("server", "+-------------------------+");
+		log_info("server", "+-------------------------+");
+		log_info("server", "| rcon password: '%s' |", Config()->m_SvRconPassword);
+		log_info("server", "+-------------------------+");
 	}
 
 	// start game
@@ -2813,8 +2814,9 @@ int CServer::Run()
 			int NewTicks = 0;
 
 			// load new map
-			if(m_MapReload || m_CurrentGameTick >= MAX_TICK) // force reload to make sure the ticks stay within a valid range
+			if(m_MapReload || m_SameMapReload || m_CurrentGameTick >= MAX_TICK) // force reload to make sure the ticks stay within a valid range
 			{
+				const bool SameMapReload = m_SameMapReload;
 				// load map
 				if(LoadMap(Config()->m_SvMap))
 				{
@@ -2834,16 +2836,19 @@ int CServer::Run()
 #endif
 					GameServer()->OnShutdown(m_pPersistentData);
 
-					for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+					for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 					{
-						if(m_aClients[ClientID].m_State <= CClient::STATE_AUTH)
+						if(m_aClients[ClientId].m_State <= CClient::STATE_AUTH)
 							continue;
 
-						SendMap(ClientID);
-						bool HasPersistentData = m_aClients[ClientID].m_HasPersistentData;
-						m_aClients[ClientID].Reset();
-						m_aClients[ClientID].m_HasPersistentData = HasPersistentData;
-						m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
+						if(SameMapReload)
+							SendMapReload(ClientId);
+
+						SendMap(ClientId);
+						bool HasPersistentData = m_aClients[ClientId].m_HasPersistentData;
+						m_aClients[ClientId].Reset();
+						m_aClients[ClientId].m_HasPersistentData = HasPersistentData;
+						m_aClients[ClientId].m_State = CClient::STATE_CONNECTING;
 					}
 
 					m_GameStartTime = time_get();
@@ -2856,15 +2861,15 @@ int CServer::Run()
 						break;
 					}
 					UpdateServerInfo(true);
-					for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+					for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 					{
-						if(m_aClients[ClientID].m_State != CClient::STATE_CONNECTING)
+						if(m_aClients[ClientId].m_State != CClient::STATE_CONNECTING)
 							continue;
 
 						// When doing a map change, a new Teehistorian file is created. For players that are already
 						// on the server, no PlayerJoin event is produced in Teehistorian from the network engine.
 						// Record PlayerJoin events here to record the Sixup version and player join event.
-						GameServer()->TeehistorianRecordPlayerJoin(ClientID, m_aClients[ClientID].m_Sixup);
+						GameServer()->TeehistorianRecordPlayerJoin(ClientId, m_aClients[ClientId].m_Sixup);
 					}
 				}
 				else
@@ -2875,48 +2880,6 @@ int CServer::Run()
 				}
 			}
 
-			// handle dnsbl
-			if(Config()->m_SvDnsbl)
-			{
-				for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
-				{
-					if(m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
-						continue;
-
-					if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE)
-					{
-						// initiate dnsbl lookup
-						InitDnsbl(ClientID);
-					}
-					else if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_PENDING &&
-						m_aClients[ClientID].m_pDnsblLookup->Status() == IJob::STATE_DONE)
-					{
-						if(m_aClients[ClientID].m_pDnsblLookup->Result() != 0)
-						{
-							// entry not found -> whitelisted
-							m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_WHITELISTED;
-						}
-						else
-						{
-							// entry found -> blacklisted
-							m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_BLACKLISTED;
-
-							// console output
-							char aAddrStr[NETADDR_MAXSTRSIZE];
-							net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
-
-							str_format(aBuf, sizeof(aBuf), "ClientID=%d addr=<{%s}> secure=%s blacklisted", ClientID, aAddrStr, m_NetServer.HasSecurityToken(ClientID) ? "yes" : "no");
-
-							Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "dnsbl", aBuf);
-						}
-					}
-
-					if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED &&
-						Config()->m_SvDnsblBan)
-						m_NetServer.NetBan()->BanAddr(m_NetServer.ClientAddr(ClientID), 60 * 10, "VPN detected, try connecting without. Contact admin if mistaken");
-				}
-			}
-
 			while(t > TickStartTime(m_CurrentGameTick + 1))
 			{
 				GameServer()->OnPreTickTeehistorian();
@@ -2980,27 +2943,81 @@ int CServer::Run()
 				UpdateClientRconCommands();
 
 				m_Fifo.Update();
-			}
 
-			// master server stuff
-			m_pRegister->Update();
+				// master server stuff
+				m_pRegister->Update();
 
-			if(m_ServerInfoNeedsUpdate)
-				UpdateServerInfo();
+				if(m_ServerInfoNeedsUpdate)
+					UpdateServerInfo();
 
-			Antibot()->OnEngineTick();
+				Antibot()->OnEngineTick();
+
+				// handle dnsbl
+				if(Config()->m_SvDnsbl)
+				{
+					for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
+					{
+						if(m_aClients[ClientId].m_State == CClient::STATE_EMPTY)
+							continue;
+
+						if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_NONE)
+						{
+							// initiate dnsbl lookup
+							InitDnsbl(ClientId);
+						}
+						else if(m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_PENDING &&
+							m_aClients[ClientId].m_pDnsblLookup->State() == IJob::STATE_DONE)
+						{
+							if(m_aClients[ClientId].m_pDnsblLookup->Result() != 0)
+							{
+								// entry not found -> whitelisted
+								m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_WHITELISTED;
+
+								char aAddrStr[NETADDR_MAXSTRSIZE];
+								net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
+
+								str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s whitelisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
+								Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
+							}
+							else
+							{
+								// entry found -> blacklisted
+								m_aClients[ClientId].m_DnsblState = CClient::DNSBL_STATE_BLACKLISTED;
+
+								// console output
+								char aAddrStr[NETADDR_MAXSTRSIZE];
+								net_addr_str(m_NetServer.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
+
+								str_format(aBuf, sizeof(aBuf), "ClientId=%d addr=<{%s}> secure=%s blacklisted", ClientId, aAddrStr, m_NetServer.HasSecurityToken(ClientId) ? "yes" : "no");
+								Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "dnsbl", aBuf);
+
+								if(Config()->m_SvDnsblBan)
+								{
+									m_NetServer.NetBan()->BanAddr(m_NetServer.ClientAddr(ClientId), 60, Config()->m_SvDnsblBanReason, true);
+								}
+							}
+						}
+					}
+				}
+				for(int i = 0; i < MAX_CLIENTS; ++i)
+				{
+					if(m_aClients[i].m_State == CClient::STATE_REDIRECTED)
+					{
+						if(time_get() > m_aClients[i].m_RedirectDropTime)
+						{
+							m_NetServer.Drop(i, "redirected");
+						}
+					}
+				}
+			}
 
 			if(!NonActive)
 				PumpNetwork(PacketWaiting);
 
 			NonActive = true;
-
-			for(int i = 0; i < MAX_CLIENTS; ++i)
+			for(const auto &Client : m_aClients)
 			{
-				if(m_aClients[i].m_State == CClient::STATE_REDIRECTED)
-					if(time_get() > m_aClients[i].m_RedirectDropTime)
-						m_NetServer.Drop(i, "redirected");
-				if(m_aClients[i].m_State != CClient::STATE_EMPTY)
+				if(Client.m_State != CClient::STATE_EMPTY)
 				{
 					NonActive = false;
 					break;
@@ -3049,7 +3066,7 @@ int CServer::Run()
 
 	if(ErrorShutdown())
 	{
-		dbg_msg("server", "shutdown from game server (%s)", m_aErrorShutdownReason);
+		log_info("server", "shutdown from game server (%s)", m_aErrorShutdownReason);
 		pDisconnectReason = m_aErrorShutdownReason;
 	}
 	// disconnect all clients on shutdown
@@ -3059,23 +3076,20 @@ int CServer::Run()
 			m_NetServer.Drop(i, pDisconnectReason);
 	}
 
+	m_pRegister->OnShutdown();
 	m_Econ.Shutdown();
-
 	m_Fifo.Shutdown();
+	Engine()->ShutdownJobs();
 
 	GameServer()->OnShutdown(nullptr);
 	m_pMap->Unload();
-
 	DbPool()->OnShutdown();
 
 #if defined(CONF_UPNP)
 	m_UPnP.Shutdown();
 #endif
-
 	m_NetServer.Close();
 
-	m_pRegister->OnShutdown();
-
 	return ErrorShutdown();
 }
 
@@ -3377,122 +3391,148 @@ void CServer::DemoRecorder_HandleAutoStart()
 {
 	if(Config()->m_SvAutoDemoRecord)
 	{
-		m_aDemoRecorder[MAX_CLIENTS].Stop();
+		m_aDemoRecorder[RECORDER_AUTO].Stop(IDemoRecorder::EStopMode::KEEP_FILE);
+
+		char aTimestamp[20];
+		str_timestamp(aTimestamp, sizeof(aTimestamp));
 		char aFilename[IO_MAX_PATH_LENGTH];
-		char aDate[20];
-		str_timestamp(aDate, sizeof(aDate));
-		str_format(aFilename, sizeof(aFilename), "demos/%s_%s.demo", "auto/autorecord", aDate);
-		m_aDemoRecorder[MAX_CLIENTS].Start(Storage(), m_pConsole, aFilename, GameServer()->NetVersion(), m_aCurrentMap, m_aCurrentMapSha256[MAP_TYPE_SIX], m_aCurrentMapCrc[MAP_TYPE_SIX], "server", m_aCurrentMapSize[MAP_TYPE_SIX], m_apCurrentMapData[MAP_TYPE_SIX]);
+		str_format(aFilename, sizeof(aFilename), "demos/auto/server/%s_%s.demo", m_aCurrentMap, aTimestamp);
+		m_aDemoRecorder[RECORDER_AUTO].Start(
+			Storage(),
+			m_pConsole,
+			aFilename,
+			GameServer()->NetVersion(),
+			m_aCurrentMap,
+			m_aCurrentMapSha256[MAP_TYPE_SIX],
+			m_aCurrentMapCrc[MAP_TYPE_SIX],
+			"server",
+			m_aCurrentMapSize[MAP_TYPE_SIX],
+			m_apCurrentMapData[MAP_TYPE_SIX],
+			nullptr,
+			nullptr,
+			nullptr);
+
 		if(Config()->m_SvAutoDemoMax)
 		{
 			// clean up auto recorded demos
 			CFileCollection AutoDemos;
-			AutoDemos.Init(Storage(), "demos/server", "autorecord", ".demo", Config()->m_SvAutoDemoMax);
+			AutoDemos.Init(Storage(), "demos/auto/server", "", ".demo", Config()->m_SvAutoDemoMax);
 		}
 	}
 }
 
-void CServer::SaveDemo(int ClientID, float Time)
+void CServer::SaveDemo(int ClientId, float Time)
 {
-	if(IsRecording(ClientID))
+	if(IsRecording(ClientId))
 	{
-		m_aDemoRecorder[ClientID].Stop();
-
-		// rename the demo
-		char aOldFilename[IO_MAX_PATH_LENGTH];
 		char aNewFilename[IO_MAX_PATH_LENGTH];
-		str_format(aOldFilename, sizeof(aOldFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
-		str_format(aNewFilename, sizeof(aNewFilename), "demos/%s_%s_%05.2f.demo", m_aCurrentMap, m_aClients[ClientID].m_aName, Time);
-		Storage()->RenameFile(aOldFilename, aNewFilename, IStorage::TYPE_SAVE);
+		str_format(aNewFilename, sizeof(aNewFilename), "demos/%s_%s_%05.2f.demo", m_aCurrentMap, m_aClients[ClientId].m_aName, Time);
+		m_aDemoRecorder[ClientId].Stop(IDemoRecorder::EStopMode::KEEP_FILE, aNewFilename);
 	}
 }
 
-void CServer::StartRecord(int ClientID)
+void CServer::StartRecord(int ClientId)
 {
 	if(Config()->m_SvPlayerDemoRecord)
 	{
 		char aFilename[IO_MAX_PATH_LENGTH];
-		str_format(aFilename, sizeof(aFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
-		m_aDemoRecorder[ClientID].Start(Storage(), Console(), aFilename, GameServer()->NetVersion(), m_aCurrentMap, m_aCurrentMapSha256[MAP_TYPE_SIX], m_aCurrentMapCrc[MAP_TYPE_SIX], "server", m_aCurrentMapSize[MAP_TYPE_SIX], m_apCurrentMapData[MAP_TYPE_SIX]);
+		str_format(aFilename, sizeof(aFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientId);
+		m_aDemoRecorder[ClientId].Start(
+			Storage(),
+			Console(),
+			aFilename,
+			GameServer()->NetVersion(),
+			m_aCurrentMap,
+			m_aCurrentMapSha256[MAP_TYPE_SIX],
+			m_aCurrentMapCrc[MAP_TYPE_SIX],
+			"server",
+			m_aCurrentMapSize[MAP_TYPE_SIX],
+			m_apCurrentMapData[MAP_TYPE_SIX],
+			nullptr,
+			nullptr,
+			nullptr);
 	}
 }
 
-void CServer::StopRecord(int ClientID)
+void CServer::StopRecord(int ClientId)
 {
-	if(IsRecording(ClientID))
+	if(IsRecording(ClientId))
 	{
-		m_aDemoRecorder[ClientID].Stop();
-
-		char aFilename[IO_MAX_PATH_LENGTH];
-		str_format(aFilename, sizeof(aFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
-		Storage()->RemoveFile(aFilename, IStorage::TYPE_SAVE);
+		m_aDemoRecorder[ClientId].Stop(IDemoRecorder::EStopMode::REMOVE_FILE);
 	}
 }
 
-bool CServer::IsRecording(int ClientID)
+bool CServer::IsRecording(int ClientId)
 {
-	return m_aDemoRecorder[ClientID].IsRecording();
+	return m_aDemoRecorder[ClientId].IsRecording();
 }
 
 void CServer::StopDemos()
 {
-	for(int i = 0; i < MAX_CLIENTS + 1; i++)
+	for(int i = 0; i < NUM_RECORDERS; i++)
 	{
 		if(!m_aDemoRecorder[i].IsRecording())
 			continue;
 
-		m_aDemoRecorder[i].Stop();
-
-		// remove tmp demos
-		if(i < MAX_CLIENTS)
-		{
-			char aPath[256];
-			str_format(aPath, sizeof(aPath), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, i);
-			Storage()->RemoveFile(aPath, IStorage::TYPE_SAVE);
-		}
+		m_aDemoRecorder[i].Stop(i < MAX_CLIENTS ? IDemoRecorder::EStopMode::REMOVE_FILE : IDemoRecorder::EStopMode::KEEP_FILE);
 	}
 }
 
 void CServer::ConRecord(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
-	char aFilename[IO_MAX_PATH_LENGTH];
 
-	if(pServer->IsRecording(MAX_CLIENTS))
+	if(pServer->IsRecording(RECORDER_MANUAL))
 	{
 		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Demo recorder already recording");
 		return;
 	}
 
+	char aFilename[IO_MAX_PATH_LENGTH];
 	if(pResult->NumArguments())
+	{
 		str_format(aFilename, sizeof(aFilename), "demos/%s.demo", pResult->GetString(0));
+	}
 	else
 	{
-		char aDate[20];
-		str_timestamp(aDate, sizeof(aDate));
-		str_format(aFilename, sizeof(aFilename), "demos/demo_%s.demo", aDate);
-	}
-	pServer->m_aDemoRecorder[MAX_CLIENTS].Start(pServer->Storage(), pServer->Console(), aFilename, pServer->GameServer()->NetVersion(), pServer->m_aCurrentMap, pServer->m_aCurrentMapSha256[MAP_TYPE_SIX], pServer->m_aCurrentMapCrc[MAP_TYPE_SIX], "server", pServer->m_aCurrentMapSize[MAP_TYPE_SIX], pServer->m_apCurrentMapData[MAP_TYPE_SIX]);
+		char aTimestamp[20];
+		str_timestamp(aTimestamp, sizeof(aTimestamp));
+		str_format(aFilename, sizeof(aFilename), "demos/demo_%s.demo", aTimestamp);
+	}
+	pServer->m_aDemoRecorder[RECORDER_MANUAL].Start(
+		pServer->Storage(),
+		pServer->Console(),
+		aFilename,
+		pServer->GameServer()->NetVersion(),
+		pServer->m_aCurrentMap,
+		pServer->m_aCurrentMapSha256[MAP_TYPE_SIX],
+		pServer->m_aCurrentMapCrc[MAP_TYPE_SIX],
+		"server",
+		pServer->m_aCurrentMapSize[MAP_TYPE_SIX],
+		pServer->m_apCurrentMapData[MAP_TYPE_SIX],
+		nullptr,
+		nullptr,
+		nullptr);
 }
 
 void CServer::ConStopRecord(IConsole::IResult *pResult, void *pUser)
 {
-	((CServer *)pUser)->m_aDemoRecorder[MAX_CLIENTS].Stop();
+	((CServer *)pUser)->m_aDemoRecorder[RECORDER_MANUAL].Stop(IDemoRecorder::EStopMode::KEEP_FILE);
 }
 
 void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser)
 {
-	((CServer *)pUser)->m_MapReload = true;
+	((CServer *)pUser)->ReloadMap();
 }
 
 void CServer::ConLogout(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
 
-	if(pServer->m_RconClientID >= 0 && pServer->m_RconClientID < MAX_CLIENTS &&
-		pServer->m_aClients[pServer->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	if(pServer->m_RconClientId >= 0 && pServer->m_RconClientId < MAX_CLIENTS &&
+		pServer->m_aClients[pServer->m_RconClientId].m_State != CServer::CClient::STATE_EMPTY)
 	{
-		pServer->LogoutClient(pServer->m_RconClientID, "");
+		pServer->LogoutClient(pServer->m_RconClientId, "");
 	}
 }
 
@@ -3500,19 +3540,19 @@ void CServer::ConShowIps(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
 
-	if(pServer->m_RconClientID >= 0 && pServer->m_RconClientID < MAX_CLIENTS &&
-		pServer->m_aClients[pServer->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	if(pServer->m_RconClientId >= 0 && pServer->m_RconClientId < MAX_CLIENTS &&
+		pServer->m_aClients[pServer->m_RconClientId].m_State != CServer::CClient::STATE_EMPTY)
 	{
 		if(pResult->NumArguments())
 		{
-			pServer->m_aClients[pServer->m_RconClientID].m_ShowIps = pResult->GetInteger(0);
+			pServer->m_aClients[pServer->m_RconClientId].m_ShowIps = pResult->GetInteger(0);
 		}
 		else
 		{
 			char aStr[9];
-			str_format(aStr, sizeof(aStr), "Value: %d", pServer->m_aClients[pServer->m_RconClientID].m_ShowIps);
+			str_format(aStr, sizeof(aStr), "Value: %d", pServer->m_aClients[pServer->m_RconClientId].m_ShowIps);
 			char aBuf[32];
-			pServer->SendRconLine(pServer->m_RconClientID, pServer->Console()->Format(aBuf, sizeof(aBuf), "server", aStr));
+			pServer->SendRconLine(pServer->m_RconClientId, pServer->Console()->Format(aBuf, sizeof(aBuf), "server", aStr));
 		}
 	}
 }
@@ -3527,7 +3567,7 @@ void CServer::ConAddSqlServer(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	if(!pSelf->Config()->m_SvUseSQL)
+	if(!pSelf->Config()->m_SvUseSql)
 		return;
 
 	if(pResult->NumArguments() != 7 && pResult->NumArguments() != 8)
@@ -3601,7 +3641,7 @@ void CServer::ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pU
 {
 	pfnCallback(pResult, pCallbackUserData);
 	if(pResult->NumArguments())
-		((CServer *)pUserData)->m_NetServer.SetMaxClientsPerIP(pResult->GetInteger(0));
+		((CServer *)pUserData)->m_NetServer.SetMaxClientsPerIp(pResult->GetInteger(0));
 }
 
 void CServer::ConchainCommandAccessUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
@@ -3635,41 +3675,41 @@ void CServer::ConchainCommandAccessUpdate(IConsole::IResult *pResult, void *pUse
 		pfnCallback(pResult, pCallbackUserData);
 }
 
-void CServer::LogoutClient(int ClientID, const char *pReason)
+void CServer::LogoutClient(int ClientId, const char *pReason)
 {
-	if(!IsSixup(ClientID))
+	if(!IsSixup(ClientId))
 	{
 		CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS, true);
 		Msg.AddInt(0); //authed
 		Msg.AddInt(0); //cmdlist
-		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 	}
 	else
 	{
 		CMsgPacker Msg(protocol7::NETMSG_RCON_AUTH_OFF, true, true);
-		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 	}
 
-	m_aClients[ClientID].m_AuthTries = 0;
-	m_aClients[ClientID].m_pRconCmdToSend = 0;
+	m_aClients[ClientId].m_AuthTries = 0;
+	m_aClients[ClientId].m_pRconCmdToSend = nullptr;
 
 	char aBuf[64];
 	if(*pReason)
 	{
 		str_format(aBuf, sizeof(aBuf), "Logged out by %s.", pReason);
-		SendRconLine(ClientID, aBuf);
-		str_format(aBuf, sizeof(aBuf), "ClientID=%d with key=%s logged out by %s", ClientID, m_AuthManager.KeyIdent(m_aClients[ClientID].m_AuthKey), pReason);
+		SendRconLine(ClientId, aBuf);
+		str_format(aBuf, sizeof(aBuf), "ClientId=%d with key=%s logged out by %s", ClientId, m_AuthManager.KeyIdent(m_aClients[ClientId].m_AuthKey), pReason);
 	}
 	else
 	{
-		SendRconLine(ClientID, "Logout successful.");
-		str_format(aBuf, sizeof(aBuf), "ClientID=%d with key=%s logged out", ClientID, m_AuthManager.KeyIdent(m_aClients[ClientID].m_AuthKey));
+		SendRconLine(ClientId, "Logout successful.");
+		str_format(aBuf, sizeof(aBuf), "ClientId=%d with key=%s logged out", ClientId, m_AuthManager.KeyIdent(m_aClients[ClientId].m_AuthKey));
 	}
 
-	m_aClients[ClientID].m_Authed = AUTHED_NO;
-	m_aClients[ClientID].m_AuthKey = -1;
+	m_aClients[ClientId].m_Authed = AUTHED_NO;
+	m_aClients[ClientId].m_AuthKey = -1;
 
-	GameServer()->OnSetAuthed(ClientID, AUTHED_NO);
+	GameServer()->OnSetAuthed(ClientId, AUTHED_NO);
 
 	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 }
@@ -3770,6 +3810,17 @@ void CServer::ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserD
 	}
 }
 
+void CServer::ConchainAnnouncementFileName(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pSelf = (CServer *)pUserData;
+	bool Changed = pResult->NumArguments() && str_comp(pResult->GetString(0), g_Config.m_SvAnnouncementFileName);
+	pfnCallback(pResult, pCallbackUserData);
+	if(Changed)
+	{
+		pSelf->ReadAnnouncementsFile(g_Config.m_SvAnnouncementFileName);
+	}
+}
+
 #if defined(CONF_FAMILY_UNIX)
 void CServer::ConchainConnLoggingServerChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
@@ -3806,7 +3857,7 @@ void CServer::RegisterCommands()
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 	m_pAntibot = Kernel()->RequestInterface<IEngineAntibot>();
 
-	HttpInit(m_pStorage);
+	Kernel()->RegisterInterface(static_cast<IHttp *>(&m_Http), false);
 
 	// register console commands
 	Console()->Register("kick", "i[id] ?r[reason]", CFGFLAG_SERVER, ConKick, this, "Kick player with specified id for any reason");
@@ -3848,6 +3899,8 @@ void CServer::RegisterCommands()
 	Console()->Chain("loglevel", ConchainLoglevel, this);
 	Console()->Chain("stdout_output_level", ConchainStdoutOutputLevel, this);
 
+	Console()->Chain("sv_announcement_filename", ConchainAnnouncementFileName, this);
+
 #if defined(CONF_FAMILY_UNIX)
 	Console()->Chain("sv_conn_logging_server", ConchainConnLoggingServerChange, this);
 #endif
@@ -3858,20 +3911,20 @@ void CServer::RegisterCommands()
 	m_pGameServer->OnConsoleInit();
 }
 
-int CServer::SnapNewID()
+int CServer::SnapNewId()
 {
-	return m_IDPool.NewID();
+	return m_IdPool.NewId();
 }
 
-void CServer::SnapFreeID(int ID)
+void CServer::SnapFreeId(int Id)
 {
-	m_IDPool.FreeID(ID);
+	m_IdPool.FreeId(Id);
 }
 
-void *CServer::SnapNewItem(int Type, int ID, int Size)
+void *CServer::SnapNewItem(int Type, int Id, int Size)
 {
-	dbg_assert(ID >= -1 && ID <= 0xffff, "incorrect id");
-	return ID < 0 ? 0 : m_SnapshotBuilder.NewItem(Type, ID, Size);
+	dbg_assert(Id >= -1 && Id <= 0xffff, "incorrect id");
+	return Id < 0 ? 0 : m_SnapshotBuilder.NewItem(Type, Id, Size);
 }
 
 void CServer::SnapSetStaticsize(int ItemType, int Size)
@@ -3883,35 +3936,38 @@ CServer *CreateServer() { return new CServer(); }
 
 // DDRace
 
-void CServer::GetClientAddr(int ClientID, NETADDR *pAddr) const
+void CServer::GetClientAddr(int ClientId, NETADDR *pAddr) const
 {
-	if(ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	if(ClientId >= 0 && ClientId < MAX_CLIENTS && m_aClients[ClientId].m_State == CClient::STATE_INGAME)
 	{
-		*pAddr = *m_NetServer.ClientAddr(ClientID);
+		*pAddr = *m_NetServer.ClientAddr(ClientId);
 	}
 }
 
-const char *CServer::GetAnnouncementLine(const char *pFileName)
+void CServer::ReadAnnouncementsFile(const char *pFileName)
 {
-	if(str_comp(pFileName, m_aAnnouncementFile) != 0)
-	{
-		str_copy(m_aAnnouncementFile, pFileName);
-		m_vAnnouncements.clear();
+	m_vAnnouncements.clear();
 
-		IOHANDLE File = m_pStorage->OpenFile(pFileName, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-		if(!File)
-			return 0;
-
-		char *pLine;
-		CLineReader Reader;
-		Reader.Init(File);
-		while((pLine = Reader.Get()))
-			if(str_length(pLine) && pLine[0] != '#')
-				m_vAnnouncements.emplace_back(pLine);
+	if(pFileName[0] == '\0')
+		return;
 
-		io_close(File);
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(m_pStorage->OpenFile(pFileName, IOFLAG_READ, IStorage::TYPE_ALL)))
+	{
+		dbg_msg("announcements", "failed to open '%s'", pFileName);
+		return;
 	}
+	while(const char *pLine = LineReader.Get())
+	{
+		if(str_length(pLine) && pLine[0] != '#')
+		{
+			m_vAnnouncements.emplace_back(pLine);
+		}
+	}
+}
 
+const char *CServer::GetAnnouncementLine()
+{
 	if(m_vAnnouncements.empty())
 	{
 		return 0;
@@ -3920,7 +3976,7 @@ const char *CServer::GetAnnouncementLine(const char *pFileName)
 	{
 		m_AnnouncementLastLine = 0;
 	}
-	else if(!Config()->m_SvAnnouncementRandom)
+	else if(!g_Config.m_SvAnnouncementRandom)
 	{
 		if(++m_AnnouncementLastLine >= m_vAnnouncements.size())
 			m_AnnouncementLastLine %= m_vAnnouncements.size();
@@ -3939,29 +3995,29 @@ const char *CServer::GetAnnouncementLine(const char *pFileName)
 	return m_vAnnouncements[m_AnnouncementLastLine].c_str();
 }
 
-int *CServer::GetIdMap(int ClientID)
+int *CServer::GetIdMap(int ClientId)
 {
-	return m_aIdMap + VANILLA_MAX_CLIENTS * ClientID;
+	return m_aIdMap + VANILLA_MAX_CLIENTS * ClientId;
 }
 
-bool CServer::SetTimedOut(int ClientID, int OrigID)
+bool CServer::SetTimedOut(int ClientId, int OrigId)
 {
-	if(!m_NetServer.SetTimedOut(ClientID, OrigID))
+	if(!m_NetServer.SetTimedOut(ClientId, OrigId))
 	{
 		return false;
 	}
-	m_aClients[ClientID].m_Sixup = m_aClients[OrigID].m_Sixup;
+	m_aClients[ClientId].m_Sixup = m_aClients[OrigId].m_Sixup;
 
-	if(m_aClients[OrigID].m_Authed != AUTHED_NO)
+	if(m_aClients[OrigId].m_Authed != AUTHED_NO)
 	{
-		LogoutClient(ClientID, "Timeout Protection");
+		LogoutClient(ClientId, "Timeout Protection");
 	}
-	DelClientCallback(OrigID, "Timeout Protection used", this);
-	m_aClients[ClientID].m_Authed = AUTHED_NO;
-	m_aClients[ClientID].m_Flags = m_aClients[OrigID].m_Flags;
-	m_aClients[ClientID].m_DDNetVersion = m_aClients[OrigID].m_DDNetVersion;
-	m_aClients[ClientID].m_GotDDNetVersionPacket = m_aClients[OrigID].m_GotDDNetVersionPacket;
-	m_aClients[ClientID].m_DDNetVersionSettled = m_aClients[OrigID].m_DDNetVersionSettled;
+	DelClientCallback(OrigId, "Timeout Protection used", this);
+	m_aClients[ClientId].m_Authed = AUTHED_NO;
+	m_aClients[ClientId].m_Flags = m_aClients[OrigId].m_Flags;
+	m_aClients[ClientId].m_DDNetVersion = m_aClients[OrigId].m_DDNetVersion;
+	m_aClients[ClientId].m_GotDDNetVersionPacket = m_aClients[OrigId].m_GotDDNetVersionPacket;
+	m_aClients[ClientId].m_DDNetVersionSettled = m_aClients[OrigId].m_DDNetVersionSettled;
 	return true;
 }
 
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index a5dcb34ae1..7a54efe36d 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -11,6 +11,7 @@
 #include <engine/shared/demo.h>
 #include <engine/shared/econ.h>
 #include <engine/shared/fifo.h>
+#include <engine/shared/http.h>
 #include <engine/shared/netban.h>
 #include <engine/shared/network.h>
 #include <engine/shared/protocol.h>
@@ -25,6 +26,7 @@
 #include "antibot.h"
 #include "authmanager.h"
 #include "name_ban.h"
+#include "snap_id_pool.h"
 
 #if defined(CONF_UPNP)
 #include "upnp.h"
@@ -35,63 +37,23 @@ class CHostLookup;
 class CLogMessage;
 class CMsgPacker;
 class CPacker;
+class IEngine;
 class IEngineMap;
 class ILogger;
 
-class CSnapIDPool
-{
-	enum
-	{
-		MAX_IDS = 32 * 1024,
-	};
-
-	// State of a Snap ID
-	enum
-	{
-		ID_FREE = 0,
-		ID_ALLOCATED = 1,
-		ID_TIMED = 2,
-	};
-
-	class CID
-	{
-	public:
-		short m_Next;
-		short m_State; // 0 = free, 1 = allocated, 2 = timed
-		int m_Timeout;
-	};
-
-	CID m_aIDs[MAX_IDS];
-
-	int m_FirstFree;
-	int m_FirstTimed;
-	int m_LastTimed;
-	int m_Usage;
-	int m_InUsage;
-
-public:
-	CSnapIDPool();
-
-	void Reset();
-	void RemoveFirstTimeout();
-	int NewID();
-	void TimeoutIDs();
-	void FreeID(int ID);
-};
-
 class CServerBan : public CNetBan
 {
 	class CServer *m_pServer;
 
 	template<class T>
-	int BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason);
+	int BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason, bool VerbatimReason);
 
 public:
 	class CServer *Server() const { return m_pServer; }
 
 	void InitServerBan(class IConsole *pConsole, class IStorage *pStorage, class CServer *pServer);
 
-	int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason) override;
+	int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason, bool VerbatimReason) override;
 	int BanRange(const CNetRange *pRange, int Seconds, const char *pReason) override;
 
 	static void ConBanExt(class IConsole::IResult *pResult, void *pUser);
@@ -109,6 +71,7 @@ class CServer : public IServer
 	class IStorage *m_pStorage;
 	class IEngineAntibot *m_pAntibot;
 	class IRegister *m_pRegister;
+	IEngine *m_pEngine;
 
 #if defined(CONF_UPNP)
 	CUPnP m_UPnP;
@@ -135,6 +98,7 @@ class CServer : public IServer
 	class IStorage *Storage() { return m_pStorage; }
 	class IEngineAntibot *Antibot() { return m_pAntibot; }
 	class CDbConnectionPool *DbPool() { return m_pConnectionPool; }
+	IEngine *Engine() { return m_pEngine; }
 
 	enum
 	{
@@ -213,7 +177,7 @@ class CServer : public IServer
 		bool m_DDNetVersionSettled;
 		int m_DDNetVersion;
 		char m_aDDNetVersionStr[64];
-		CUuid m_ConnectionID;
+		CUuid m_ConnectionId;
 		int64_t m_RedirectDropTime;
 
 		// DNSBL
@@ -233,11 +197,12 @@ class CServer : public IServer
 
 	CSnapshotDelta m_SnapshotDelta;
 	CSnapshotBuilder m_SnapshotBuilder;
-	CSnapIDPool m_IDPool;
+	CSnapIdPool m_IdPool;
 	CNetServer m_NetServer;
 	CEcon m_Econ;
 	CFifo m_Fifo;
 	CServerBan m_ServerBan;
+	CHttp m_Http;
 
 	IEngineMap *m_pMap;
 
@@ -254,8 +219,9 @@ class CServer : public IServer
 	int m_RunServer;
 
 	bool m_MapReload;
+	bool m_SameMapReload;
 	bool m_ReloadedWhenEmpty;
-	int m_RconClientID;
+	int m_RconClientId;
 	int m_RconAuthLevel;
 	int m_PrintCBIndex;
 	char m_aShutdownReason[128];
@@ -268,13 +234,20 @@ class CServer : public IServer
 		NUM_MAP_TYPES
 	};
 
+	enum
+	{
+		RECORDER_MANUAL = MAX_CLIENTS,
+		RECORDER_AUTO = MAX_CLIENTS + 1,
+		NUM_RECORDERS = MAX_CLIENTS + 2,
+	};
+
 	char m_aCurrentMap[IO_MAX_PATH_LENGTH];
 	SHA256_DIGEST m_aCurrentMapSha256[NUM_MAP_TYPES];
 	unsigned m_aCurrentMapCrc[NUM_MAP_TYPES];
 	unsigned char *m_apCurrentMapData[NUM_MAP_TYPES];
 	unsigned int m_aCurrentMapSize[NUM_MAP_TYPES];
 
-	CDemoRecorder m_aDemoRecorder[MAX_CLIENTS + 1];
+	CDemoRecorder m_aDemoRecorder[NUM_RECORDERS];
 	CAuthManager m_AuthManager;
 
 	int64_t m_ServerInfoFirstRequest;
@@ -286,7 +259,6 @@ class CServer : public IServer
 
 	size_t m_AnnouncementLastLine;
 	std::vector<std::string> m_vAnnouncements;
-	char m_aAnnouncementFile[IO_MAX_PATH_LENGTH];
 
 	std::shared_ptr<ILogger> m_pFileLogger = nullptr;
 	std::shared_ptr<ILogger> m_pStdoutLogger = nullptr;
@@ -294,21 +266,21 @@ class CServer : public IServer
 	CServer();
 	~CServer();
 
-	bool IsClientNameAvailable(int ClientID, const char *pNameRequest);
-	bool SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set);
-	bool SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set);
+	bool IsClientNameAvailable(int ClientId, const char *pNameRequest);
+	bool SetClientNameImpl(int ClientId, const char *pNameRequest, bool Set);
+	bool SetClientClanImpl(int ClientId, const char *pClanRequest, bool Set);
 
-	bool WouldClientNameChange(int ClientID, const char *pNameRequest) override;
-	bool WouldClientClanChange(int ClientID, const char *pClanRequest) override;
-	void SetClientName(int ClientID, const char *pName) override;
-	void SetClientClan(int ClientID, const char *pClan) override;
-	void SetClientCountry(int ClientID, int Country) override;
-	void SetClientScore(int ClientID, std::optional<int> Score) override;
-	void SetClientFlags(int ClientID, int Flags) override;
+	bool WouldClientNameChange(int ClientId, const char *pNameRequest) override;
+	bool WouldClientClanChange(int ClientId, const char *pClanRequest) override;
+	void SetClientName(int ClientId, const char *pName) override;
+	void SetClientClan(int ClientId, const char *pClan) override;
+	void SetClientCountry(int ClientId, int Country) override;
+	void SetClientScore(int ClientId, std::optional<int> Score) override;
+	void SetClientFlags(int ClientId, int Flags) override;
 
-	void Kick(int ClientID, const char *pReason) override;
-	void Ban(int ClientID, int Seconds, const char *pReason) override;
-	void RedirectClient(int ClientID, int Port, bool Verbose = false) override;
+	void Kick(int ClientId, const char *pReason) override;
+	void Ban(int ClientId, int Seconds, const char *pReason, bool VerbatimReason) override;
+	void RedirectClient(int ClientId, int Port, bool Verbose = false) override;
 
 	void DemoRecorder_HandleAutoStart() override;
 
@@ -319,48 +291,52 @@ class CServer : public IServer
 	int Init();
 
 	void SendLogLine(const CLogMessage *pMessage);
-	void SetRconCID(int ClientID) override;
-	int GetAuthedState(int ClientID) const override;
-	const char *GetAuthName(int ClientID) const override;
+	void SetRconCid(int ClientId) override;
+	int GetAuthedState(int ClientId) const override;
+	const char *GetAuthName(int ClientId) const override;
 	void GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pMapSha256, int *pMapCrc) override;
-	bool GetClientInfo(int ClientID, CClientInfo *pInfo) const override;
-	void SetClientDDNetVersion(int ClientID, int DDNetVersion) override;
-	void GetClientAddr(int ClientID, char *pAddrStr, int Size) const override;
-	const char *ClientName(int ClientID) const override;
-	const char *ClientClan(int ClientID) const override;
-	int ClientCountry(int ClientID) const override;
-	bool ClientIngame(int ClientID) const override;
-	bool ClientAuthed(int ClientID) const override;
+	bool GetClientInfo(int ClientId, CClientInfo *pInfo) const override;
+	void SetClientDDNetVersion(int ClientId, int DDNetVersion) override;
+	void GetClientAddr(int ClientId, char *pAddrStr, int Size) const override;
+	const char *ClientName(int ClientId) const override;
+	const char *ClientClan(int ClientId) const override;
+	int ClientCountry(int ClientId) const override;
+	bool ClientSlotEmpty(int ClientId) const override;
+	bool ClientIngame(int ClientId) const override;
+	bool ClientAuthed(int ClientId) const override;
 	int Port() const override;
 	int MaxClients() const override;
 	int ClientCount() const override;
 	int DistinctClientCount() const override;
 
-	int GetClientVersion(int ClientID) const override;
-	int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) override;
+	int GetClientVersion(int ClientId) const override;
+	int SendMsg(CMsgPacker *pMsg, int Flags, int ClientId) override;
 
 	void DoSnapshot();
 
-	static int NewClientCallback(int ClientID, void *pUser, bool Sixup);
-	static int NewClientNoAuthCallback(int ClientID, void *pUser);
-	static int DelClientCallback(int ClientID, const char *pReason, void *pUser);
-
-	static int ClientRejoinCallback(int ClientID, void *pUser);
-
-	void SendRconType(int ClientID, bool UsernameReq);
-	void SendCapabilities(int ClientID);
-	void SendMap(int ClientID);
-	void SendMapData(int ClientID, int Chunk);
-	void SendConnectionReady(int ClientID);
-	void SendRconLine(int ClientID, const char *pLine);
-	// Accepts -1 as ClientID to mean "all clients with at least auth level admin"
-	void SendRconLogLine(int ClientID, const CLogMessage *pMessage);
-
-	void SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientID);
-	void SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientID);
+	static int NewClientCallback(int ClientId, void *pUser, bool Sixup);
+	static int NewClientNoAuthCallback(int ClientId, void *pUser);
+	static int DelClientCallback(int ClientId, const char *pReason, void *pUser);
+
+	static int ClientRejoinCallback(int ClientId, void *pUser);
+
+	void SendRconType(int ClientId, bool UsernameReq);
+	void SendCapabilities(int ClientId);
+	void SendMap(int ClientId);
+	void SendMapData(int ClientId, int Chunk);
+	void SendMapReload(int ClientId);
+	void SendConnectionReady(int ClientId);
+	void SendRconLine(int ClientId, const char *pLine);
+	// Accepts -1 as ClientId to mean "all clients with at least auth level admin"
+	void SendRconLogLine(int ClientId, const CLogMessage *pMessage);
+
+	void SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientId);
+	void SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientId);
+	int GetConsoleAccessLevel(int ClientId);
+	int NumRconCommands(int ClientId);
 	void UpdateClientRconCommands();
 
-	bool CheckReservedSlotAuth(int ClientID, const char *pPassword);
+	bool CheckReservedSlotAuth(int ClientId, const char *pPassword);
 	void ProcessClientPacket(CNetChunk *pPacket);
 
 	class CCache
@@ -404,12 +380,13 @@ class CServer : public IServer
 
 	void ChangeMap(const char *pMap) override;
 	const char *GetMapName() const override;
+	void ReloadMap() override;
 	int LoadMap(const char *pMapName);
 
-	void SaveDemo(int ClientID, float Time) override;
-	void StartRecord(int ClientID) override;
-	void StopRecord(int ClientID) override;
-	bool IsRecording(int ClientID) override;
+	void SaveDemo(int ClientId, float Time) override;
+	void StartRecord(int ClientId) override;
+	void StopRecord(int ClientId) override;
+	bool IsRecording(int ClientId) override;
 	void StopDemos() override;
 
 	int Run();
@@ -438,7 +415,7 @@ class CServer : public IServer
 	static void ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainCommandAccessUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
-	void LogoutClient(int ClientID, const char *pReason);
+	void LogoutClient(int ClientId, const char *pReason);
 	void LogoutKey(int Key, const char *pReason);
 
 	void ConchainRconPasswordChangeGeneric(int Level, const char *pCurrent, IConsole::IResult *pResult);
@@ -449,6 +426,7 @@ class CServer : public IServer
 	static void ConchainSixupUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainLoglevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAnnouncementFileName(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
 #if defined(CONF_FAMILY_UNIX)
 	static void ConchainConnLoggingServerChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
@@ -456,47 +434,48 @@ class CServer : public IServer
 
 	void RegisterCommands();
 
-	int SnapNewID() override;
-	void SnapFreeID(int ID) override;
-	void *SnapNewItem(int Type, int ID, int Size) override;
+	int SnapNewId() override;
+	void SnapFreeId(int Id) override;
+	void *SnapNewItem(int Type, int Id, int Size) override;
 	void SnapSetStaticsize(int ItemType, int Size) override;
 
 	// DDRace
 
-	void GetClientAddr(int ClientID, NETADDR *pAddr) const override;
+	void GetClientAddr(int ClientId, NETADDR *pAddr) const override;
 	int m_aPrevStates[MAX_CLIENTS];
-	const char *GetAnnouncementLine(const char *pFileName) override;
+	const char *GetAnnouncementLine() override;
+	void ReadAnnouncementsFile(const char *pFileName) override;
 
-	int *GetIdMap(int ClientID) override;
+	int *GetIdMap(int ClientId) override;
 
-	void InitDnsbl(int ClientID);
-	bool DnsblWhite(int ClientID) override
+	void InitDnsbl(int ClientId);
+	bool DnsblWhite(int ClientId) override
 	{
-		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE ||
-		       m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED;
+		return m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_NONE ||
+		       m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED;
 	}
-	bool DnsblPending(int ClientID) override
+	bool DnsblPending(int ClientId) override
 	{
-		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_PENDING;
+		return m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_PENDING;
 	}
-	bool DnsblBlack(int ClientID) override
+	bool DnsblBlack(int ClientId) override
 	{
-		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED;
+		return m_aClients[ClientId].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED;
 	}
 
 	void AuthRemoveKey(int KeySlot);
-	bool ClientPrevIngame(int ClientID) override { return m_aPrevStates[ClientID] == CClient::STATE_INGAME; }
-	const char *GetNetErrorString(int ClientID) override { return m_NetServer.ErrorString(ClientID); }
-	void ResetNetErrorString(int ClientID) override { m_NetServer.ResetErrorString(ClientID); }
-	bool SetTimedOut(int ClientID, int OrigID) override;
-	void SetTimeoutProtected(int ClientID) override { m_NetServer.SetTimeoutProtected(ClientID); }
+	bool ClientPrevIngame(int ClientId) override { return m_aPrevStates[ClientId] == CClient::STATE_INGAME; }
+	const char *GetNetErrorString(int ClientId) override { return m_NetServer.ErrorString(ClientId); }
+	void ResetNetErrorString(int ClientId) override { m_NetServer.ResetErrorString(ClientId); }
+	bool SetTimedOut(int ClientId, int OrigId) override;
+	void SetTimeoutProtected(int ClientId) override { m_NetServer.SetTimeoutProtected(ClientId); }
 
-	void SendMsgRaw(int ClientID, const void *pData, int Size, int Flags) override;
+	void SendMsgRaw(int ClientId, const void *pData, int Size, int Flags) override;
 
 	bool ErrorShutdown() const { return m_aErrorShutdownReason[0] != 0; }
 	void SetErrorShutdown(const char *pReason) override;
 
-	bool IsSixup(int ClientID) const override { return ClientID != SERVER_DEMO_CLIENT && m_aClients[ClientID].m_Sixup; }
+	bool IsSixup(int ClientId) const override { return ClientId != SERVER_DEMO_CLIENT && m_aClients[ClientId].m_Sixup; }
 
 	void SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger);
 
diff --git a/src/engine/server/snap_id_pool.cpp b/src/engine/server/snap_id_pool.cpp
new file mode 100644
index 0000000000..516a807040
--- /dev/null
+++ b/src/engine/server/snap_id_pool.cpp
@@ -0,0 +1,96 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "snap_id_pool.h"
+
+#include <base/system.h>
+
+CSnapIdPool::CSnapIdPool()
+{
+	Reset();
+}
+
+void CSnapIdPool::Reset()
+{
+	for(int i = 0; i < MAX_IDS; i++)
+	{
+		m_aIds[i].m_Next = i + 1;
+		m_aIds[i].m_State = ID_FREE;
+	}
+
+	m_aIds[MAX_IDS - 1].m_Next = -1;
+	m_FirstFree = 0;
+	m_FirstTimed = -1;
+	m_LastTimed = -1;
+	m_Usage = 0;
+	m_InUsage = 0;
+}
+
+void CSnapIdPool::RemoveFirstTimeout()
+{
+	int NextTimed = m_aIds[m_FirstTimed].m_Next;
+
+	// add it to the free list
+	m_aIds[m_FirstTimed].m_Next = m_FirstFree;
+	m_aIds[m_FirstTimed].m_State = ID_FREE;
+	m_FirstFree = m_FirstTimed;
+
+	// remove it from the timed list
+	m_FirstTimed = NextTimed;
+	if(m_FirstTimed == -1)
+		m_LastTimed = -1;
+
+	m_Usage--;
+}
+
+int CSnapIdPool::NewId()
+{
+	int64_t Now = time_get();
+
+	// process timed ids
+	while(m_FirstTimed != -1 && m_aIds[m_FirstTimed].m_Timeout < Now)
+		RemoveFirstTimeout();
+
+	int Id = m_FirstFree;
+	if(Id == -1)
+	{
+		dbg_msg("server", "invalid id");
+		return Id;
+	}
+	m_FirstFree = m_aIds[m_FirstFree].m_Next;
+	m_aIds[Id].m_State = ID_ALLOCATED;
+	m_Usage++;
+	m_InUsage++;
+	return Id;
+}
+
+void CSnapIdPool::TimeoutIds()
+{
+	// process timed ids
+	while(m_FirstTimed != -1)
+		RemoveFirstTimeout();
+}
+
+void CSnapIdPool::FreeId(int Id)
+{
+	if(Id < 0)
+		return;
+	dbg_assert((size_t)Id < std::size(m_aIds), "id is out of range");
+	dbg_assert(m_aIds[Id].m_State == ID_ALLOCATED, "id is not allocated");
+
+	m_InUsage--;
+	m_aIds[Id].m_State = ID_TIMED;
+	m_aIds[Id].m_Timeout = time_get() + time_freq() * 5;
+	m_aIds[Id].m_Next = -1;
+
+	if(m_LastTimed != -1)
+	{
+		m_aIds[m_LastTimed].m_Next = Id;
+		m_LastTimed = Id;
+	}
+	else
+	{
+		m_FirstTimed = Id;
+		m_LastTimed = Id;
+	}
+}
diff --git a/src/engine/server/snap_id_pool.h b/src/engine/server/snap_id_pool.h
new file mode 100644
index 0000000000..e6a3327998
--- /dev/null
+++ b/src/engine/server/snap_id_pool.h
@@ -0,0 +1,48 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#ifndef ENGINE_SERVER_SNAP_ID_POOL_H
+#define ENGINE_SERVER_SNAP_ID_POOL_H
+
+class CSnapIdPool
+{
+	enum
+	{
+		MAX_IDS = 32 * 1024,
+	};
+
+	// State of a Snap ID
+	enum
+	{
+		ID_FREE = 0,
+		ID_ALLOCATED = 1,
+		ID_TIMED = 2,
+	};
+
+	class CID
+	{
+	public:
+		short m_Next;
+		short m_State; // 0 = free, 1 = allocated, 2 = timed
+		int m_Timeout;
+	};
+
+	CID m_aIds[MAX_IDS];
+
+	int m_FirstFree;
+	int m_FirstTimed;
+	int m_LastTimed;
+	int m_Usage;
+	int m_InUsage;
+
+public:
+	CSnapIdPool();
+
+	void Reset();
+	void RemoveFirstTimeout();
+	int NewId();
+	void TimeoutIds();
+	void FreeId(int Id);
+};
+
+#endif
diff --git a/src/engine/server/upnp.cpp b/src/engine/server/upnp.cpp
index e6639c07d2..2f0ebe0a07 100644
--- a/src/engine/server/upnp.cpp
+++ b/src/engine/server/upnp.cpp
@@ -25,14 +25,20 @@ void CUPnP::Open(NETADDR Address)
 
 		m_pUPnPDevice = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &Error);
 
+#if MINIUPNPC_API_VERSION > 17
+		char aWanAddr[64];
+		int Status = UPNP_GetValidIGD(m_pUPnPDevice, m_pUPnPUrls, m_pUPnPData, aLanAddr, sizeof(aLanAddr), aWanAddr, sizeof(aWanAddr));
+		dbg_msg("upnp", "status=%d, lan_addr=%s, wan_addr=%s", Status, aLanAddr, aWanAddr);
+#else
 		int Status = UPNP_GetValidIGD(m_pUPnPDevice, m_pUPnPUrls, m_pUPnPData, aLanAddr, sizeof(aLanAddr));
 		dbg_msg("upnp", "status=%d, lan_addr=%s", Status, aLanAddr);
+#endif
 
 		if(Status == 1)
 		{
 			m_Enabled = true;
 			dbg_msg("upnp", "found valid IGD: %s", m_pUPnPUrls->controlURL);
-			str_from_int(m_Addr.port, aPort);
+			str_format(aPort, sizeof(aPort), "%d", m_Addr.port);
 			Error = UPNP_AddPortMapping(m_pUPnPUrls->controlURL, m_pUPnPData->first.servicetype,
 				aPort, aPort, aLanAddr,
 				"DDNet Server " GAME_RELEASE_VERSION,
@@ -55,7 +61,7 @@ void CUPnP::Shutdown()
 		if(m_Enabled)
 		{
 			char aPort[6];
-			str_from_int(m_Addr.port, aPort);
+			str_format(aPort, sizeof(aPort), "%d", m_Addr.port);
 			int Error = UPNP_DeletePortMapping(m_pUPnPUrls->controlURL, m_pUPnPData->first.servicetype, aPort, "UDP", NULL);
 
 			if(Error != 0)
diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h
index 015f5171a3..0b3f58eac5 100644
--- a/src/engine/serverbrowser.h
+++ b/src/engine/serverbrowser.h
@@ -117,10 +117,10 @@ class CServerInfo
 	char m_aAddress[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE];
 	CClient m_aClients[SERVERINFO_MAX_CLIENTS];
 	int m_NumFilteredPlayers;
+	bool m_RequiresLogin;
 
 	static int EstimateLatency(int Loc1, int Loc2);
 	static bool ParseLocation(int *pResult, const char *pString);
-	void InfoToString(char *pBuffer, int BufferSize) const;
 };
 
 class CCommunityCountryServer
@@ -231,6 +231,8 @@ class CCommunity
 	const SHA256_DIGEST &IconSha256() const { return m_IconSha256; }
 	const std::vector<CCommunityCountry> &Countries() const { return m_vCountries; }
 	const std::vector<CCommunityType> &Types() const { return m_vTypes; }
+	bool HasCountry(const char *pCountryName) const;
+	bool HasType(const char *pTypeName) const;
 	bool HasRanks() const { return m_HasFinishes; }
 	CServerInfo::ERankState HasRank(const char *pMap) const;
 };
@@ -245,6 +247,18 @@ class IFilterList
 	virtual bool Filtered(const char *pElement) const = 0;
 };
 
+class ICommunityCache
+{
+public:
+	virtual void Update(bool Force) = 0;
+	virtual const std::vector<const CCommunity *> &SelectedCommunities() const = 0;
+	virtual const std::vector<const CCommunityCountry *> &SelectableCountries() const = 0;
+	virtual const std::vector<const CCommunityType *> &SelectableTypes() const = 0;
+	virtual bool AnyRanksAvailable() const = 0;
+	virtual bool CountriesTypesFilterAvailable() const = 0;
+	virtual const char *CountryTypeFilterKey() const = 0;
+};
+
 class IServerBrowser : public IInterface
 {
 	MACRO_INTERFACE("serverbrowser")
@@ -255,6 +269,7 @@ class IServerBrowser : public IInterface
 		SORT_MAP - Sort by map
 		SORT_GAMETYPE - Sort by game type. DM, TDM etc.
 		SORT_NUMPLAYERS - Sort after how many players there are on the server.
+		SORT_NUMFRIENDS - Sort after how many friends there are on the server.
 	*/
 	enum
 	{
@@ -263,6 +278,7 @@ class IServerBrowser : public IInterface
 		SORT_MAP,
 		SORT_GAMETYPE,
 		SORT_NUMPLAYERS,
+		SORT_NUMFRIENDS,
 
 		QUICK_SERVERNAME = 1,
 		QUICK_PLAYER = 2,
@@ -271,16 +287,43 @@ class IServerBrowser : public IInterface
 		TYPE_INTERNET = 0,
 		TYPE_LAN,
 		TYPE_FAVORITES,
+		TYPE_FAVORITE_COMMUNITY_1,
+		TYPE_FAVORITE_COMMUNITY_2,
+		TYPE_FAVORITE_COMMUNITY_3,
+		TYPE_FAVORITE_COMMUNITY_4,
+		TYPE_FAVORITE_COMMUNITY_5,
 		NUM_TYPES,
 
+		LAN_PORT_BEGIN = 8303,
+		LAN_PORT_END = 8310,
+	};
+
+	class CServerEntry
+	{
+	public:
+		int64_t m_RequestTime;
+		bool m_RequestIgnoreInfo;
+		int m_GotInfo;
+		CServerInfo m_Info;
+
+		CServerEntry *m_pPrevReq; // request list
+		CServerEntry *m_pNextReq;
 	};
 
 	static constexpr const char *COMMUNITY_DDNET = "ddnet";
 	static constexpr const char *COMMUNITY_NONE = "none";
 
+	static constexpr const char *COMMUNITY_COUNTRY_NONE = "none";
+	static constexpr const char *COMMUNITY_TYPE_NONE = "None";
+	/**
+	 * Special community value for country/type filters that
+	 * affect all communities.
+	 */
+	static constexpr const char *COMMUNITY_ALL = "all";
+
 	static constexpr const char *SEARCH_EXCLUDE_TOKEN = ";";
 
-	virtual void Refresh(int Type) = 0;
+	virtual void Refresh(int Type, bool Force = false) = 0;
 	virtual bool IsGettingServerlist() const = 0;
 	virtual bool IsRefreshing() const = 0;
 	virtual int LoadingProgression() const = 0;
@@ -297,16 +340,26 @@ class IServerBrowser : public IInterface
 	virtual const std::vector<CCommunity> &Communities() const = 0;
 	virtual const CCommunity *Community(const char *pCommunityId) const = 0;
 	virtual std::vector<const CCommunity *> SelectedCommunities() const = 0;
-	virtual int64_t DDNetInfoUpdateTime() const = 0;
+	virtual std::vector<const CCommunity *> FavoriteCommunities() const = 0;
+	virtual std::vector<const CCommunity *> CurrentCommunities() const = 0;
+	virtual unsigned CurrentCommunitiesHash() const = 0;
+
+	virtual bool DDNetInfoAvailable() const = 0;
+	virtual SHA256_DIGEST DDNetInfoSha256() const = 0;
 
+	virtual ICommunityCache &CommunityCache() = 0;
+	virtual const ICommunityCache &CommunityCache() const = 0;
+	virtual IFilterList &FavoriteCommunitiesFilter() = 0;
 	virtual IFilterList &CommunitiesFilter() = 0;
 	virtual IFilterList &CountriesFilter() = 0;
 	virtual IFilterList &TypesFilter() = 0;
+	virtual const IFilterList &FavoriteCommunitiesFilter() const = 0;
 	virtual const IFilterList &CommunitiesFilter() const = 0;
 	virtual const IFilterList &CountriesFilter() const = 0;
 	virtual const IFilterList &TypesFilter() const = 0;
 	virtual void CleanFilters() = 0;
 
+	virtual CServerEntry *Find(const NETADDR &Addr) = 0;
 	virtual int GetCurrentType() = 0;
 	virtual const char *GetTutorialServer() = 0;
 };
diff --git a/src/engine/shared/Cargo.toml b/src/engine/shared/Cargo.toml
index b939c23d16..690081ea0f 100644
--- a/src/engine/shared/Cargo.toml
+++ b/src/engine/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ddnet-engine-shared"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
diff --git a/src/engine/shared/config.cpp b/src/engine/shared/config.cpp
index 3c0f61e23b..28f0e30e84 100644
--- a/src/engine/shared/config.cpp
+++ b/src/engine/shared/config.cpp
@@ -11,361 +11,267 @@
 
 CConfig g_Config;
 
+// ----------------------- Config Variables
+
 static void EscapeParam(char *pDst, const char *pSrc, int Size)
 {
 	str_escape(&pDst, pSrc, pDst + Size);
 }
 
-struct SConfigVariable
+void SConfigVariable::ExecuteLine(const char *pLine) const
 {
-	enum EVariableType
-	{
-		VAR_INT,
-		VAR_COLOR,
-		VAR_STRING,
-	};
-	IConsole *m_pConsole;
-	const char *m_pScriptName;
-	EVariableType m_Type;
-	int m_Flags;
-	const char *m_pHelp;
-	// Note that this only applies to the console command and the SetValue function,
-	// but the underlying config variable can still be modified programatically.
-	bool m_ReadOnly = false;
-
-	SConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp) :
-		m_pConsole(pConsole),
-		m_pScriptName(pScriptName),
-		m_Type(Type),
-		m_Flags(Flags),
-		m_pHelp(pHelp)
-	{
-	}
-
-	virtual ~SConfigVariable() = default;
-
-	virtual void Register() = 0;
-	virtual bool IsDefault() const = 0;
-	virtual void Serialize(char *pOut, size_t Size) const = 0;
-	virtual void ResetToDefault() = 0;
-	virtual void ResetToOld() = 0;
+	m_pConsole->ExecuteLine(pLine, (m_Flags & CFGFLAG_GAME) != 0 ? IConsole::CLIENT_ID_GAME : -1);
+}
 
-protected:
-	void ExecuteLine(const char *pLine) const
-	{
-		m_pConsole->ExecuteLine(pLine, (m_Flags & CFGFLAG_GAME) != 0 ? IConsole::CLIENT_ID_GAME : -1);
-	}
+bool SConfigVariable::CheckReadOnly() const
+{
+	if(!m_ReadOnly)
+		return false;
+	char aBuf[IConsole::CMDLINE_LENGTH + 64];
+	str_format(aBuf, sizeof(aBuf), "The config variable '%s' cannot be changed right now.", m_pScriptName);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+	return true;
+}
 
-	bool CheckReadOnly() const
-	{
-		if(!m_ReadOnly)
-			return false;
-		char aBuf[IConsole::CMDLINE_LENGTH + 64];
-		str_format(aBuf, sizeof(aBuf), "The config variable '%s' cannot be changed right now.", m_pScriptName);
-		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-		return true;
-	}
-};
-
-struct SIntConfigVariable : public SConfigVariable
-{
-	int *m_pVariable;
-	int m_Default;
-	int m_Min;
-	int m_Max;
-	int m_OldValue;
-
-	SIntConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, int *pVariable, int Default, int Min, int Max) :
-		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
-		m_pVariable(pVariable),
-		m_Default(Default),
-		m_Min(Min),
-		m_Max(Max),
-		m_OldValue(Default)
-	{
-		*m_pVariable = m_Default;
-	}
+// -----
 
-	~SIntConfigVariable() override = default;
+void SIntConfigVariable::CommandCallback(IConsole::IResult *pResult, void *pUserData)
+{
+	SIntConfigVariable *pData = static_cast<SIntConfigVariable *>(pUserData);
 
-	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
+	if(pResult->NumArguments())
 	{
-		SIntConfigVariable *pData = static_cast<SIntConfigVariable *>(pUserData);
-
-		if(pResult->NumArguments())
-		{
-			if(pData->CheckReadOnly())
-				return;
-
-			int Value = pResult->GetInteger(0);
+		if(pData->CheckReadOnly())
+			return;
 
-			// do clamping
-			if(pData->m_Min != pData->m_Max)
-			{
-				if(Value < pData->m_Min)
-					Value = pData->m_Min;
-				if(pData->m_Max != 0 && Value > pData->m_Max)
-					Value = pData->m_Max;
-			}
+		int Value = pResult->GetInteger(0);
 
-			*pData->m_pVariable = Value;
-			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
-				pData->m_OldValue = Value;
-		}
-		else
+		// do clamping
+		if(pData->m_Min != pData->m_Max)
 		{
-			char aBuf[32];
-			str_format(aBuf, sizeof(aBuf), "Value: %d", *pData->m_pVariable);
-			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+			if(Value < pData->m_Min)
+				Value = pData->m_Min;
+			if(pData->m_Max != 0 && Value > pData->m_Max)
+				Value = pData->m_Max;
 		}
-	}
 
-	void Register() override
-	{
-		m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
+		*pData->m_pVariable = Value;
+		if(pResult->m_ClientId != IConsole::CLIENT_ID_GAME)
+			pData->m_OldValue = Value;
 	}
-
-	bool IsDefault() const override
+	else
 	{
-		return *m_pVariable == m_Default;
+		char aBuf[32];
+		str_format(aBuf, sizeof(aBuf), "Value: %d", *pData->m_pVariable);
+		pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
 	}
+}
 
-	void Serialize(char *pOut, size_t Size, int Value) const
-	{
-		str_format(pOut, Size, "%s %i", m_pScriptName, Value);
-	}
+void SIntConfigVariable::Register()
+{
+	m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
+}
 
-	void Serialize(char *pOut, size_t Size) const override
-	{
-		Serialize(pOut, Size, *m_pVariable);
-	}
+bool SIntConfigVariable::IsDefault() const
+{
+	return *m_pVariable == m_Default;
+}
 
-	void SetValue(int Value)
-	{
-		if(CheckReadOnly())
-			return;
-		char aBuf[IConsole::CMDLINE_LENGTH];
-		Serialize(aBuf, sizeof(aBuf), Value);
-		ExecuteLine(aBuf);
-	}
+void SIntConfigVariable::Serialize(char *pOut, size_t Size, int Value) const
+{
+	str_format(pOut, Size, "%s %i", m_pScriptName, Value);
+}
 
-	void ResetToDefault() override
-	{
-		SetValue(m_Default);
-	}
+void SIntConfigVariable::Serialize(char *pOut, size_t Size) const
+{
+	Serialize(pOut, Size, *m_pVariable);
+}
 
-	void ResetToOld() override
-	{
-		*m_pVariable = m_OldValue;
-	}
-};
-
-struct SColorConfigVariable : public SConfigVariable
-{
-	unsigned *m_pVariable;
-	unsigned m_Default;
-	bool m_Light;
-	bool m_Alpha;
-	unsigned m_OldValue;
-
-	SColorConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, unsigned *pVariable, unsigned Default) :
-		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
-		m_pVariable(pVariable),
-		m_Default(Default),
-		m_Light(Flags & CFGFLAG_COLLIGHT),
-		m_Alpha(Flags & CFGFLAG_COLALPHA),
-		m_OldValue(Default)
-	{
-		*m_pVariable = m_Default;
-	}
+void SIntConfigVariable::SetValue(int Value)
+{
+	if(CheckReadOnly())
+		return;
+	char aBuf[IConsole::CMDLINE_LENGTH];
+	Serialize(aBuf, sizeof(aBuf), Value);
+	ExecuteLine(aBuf);
+}
+
+void SIntConfigVariable::ResetToDefault()
+{
+	SetValue(m_Default);
+}
+
+void SIntConfigVariable::ResetToOld()
+{
+	*m_pVariable = m_OldValue;
+}
 
-	~SColorConfigVariable() override = default;
+// -----
 
-	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
+void SColorConfigVariable::CommandCallback(IConsole::IResult *pResult, void *pUserData)
+{
+	SColorConfigVariable *pData = static_cast<SColorConfigVariable *>(pUserData);
+	char aBuf[IConsole::CMDLINE_LENGTH + 64];
+	if(pResult->NumArguments())
 	{
-		SColorConfigVariable *pData = static_cast<SColorConfigVariable *>(pUserData);
+		if(pData->CheckReadOnly())
+			return;
 
-		if(pResult->NumArguments())
+		const auto Color = pResult->GetColor(0, pData->m_DarkestLighting);
+		if(Color)
 		{
-			if(pData->CheckReadOnly())
-				return;
-
-			const ColorHSLA Color = pResult->GetColor(0, pData->m_Light);
-			const unsigned Value = Color.Pack(pData->m_Light ? 0.5f : 0.0f, pData->m_Alpha);
+			const unsigned Value = Color->Pack(pData->m_DarkestLighting, pData->m_Alpha);
 
 			*pData->m_pVariable = Value;
-			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
+			if(pResult->m_ClientId != IConsole::CLIENT_ID_GAME)
 				pData->m_OldValue = Value;
 		}
 		else
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Value: %u", *pData->m_pVariable);
+			str_format(aBuf, sizeof(aBuf), "%s is not a valid color.", pResult->GetString(0));
 			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-
-			ColorHSLA Hsla = ColorHSLA(*pData->m_pVariable, true);
-			if(pData->m_Light)
-				Hsla = Hsla.UnclampLighting();
-			str_format(aBuf, sizeof(aBuf), "H: %d°, S: %d%%, L: %d%%", round_truncate(Hsla.h * 360), round_truncate(Hsla.s * 100), round_truncate(Hsla.l * 100));
-			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-
-			const ColorRGBA Rgba = color_cast<ColorRGBA>(Hsla);
-			str_format(aBuf, sizeof(aBuf), "R: %d, G: %d, B: %d, #%06X", round_truncate(Rgba.r * 255), round_truncate(Rgba.g * 255), round_truncate(Rgba.b * 255), Rgba.Pack(false));
-			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-
-			if(pData->m_Alpha)
-			{
-				str_format(aBuf, sizeof(aBuf), "A: %d%%", round_truncate(Hsla.a * 100));
-				pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-			}
 		}
 	}
-
-	void Register() override
+	else
 	{
-		m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
-	}
+		str_format(aBuf, sizeof(aBuf), "Value: %u", *pData->m_pVariable);
+		pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
 
-	bool IsDefault() const override
-	{
-		return *m_pVariable == m_Default;
-	}
+		const ColorHSLA Hsla = ColorHSLA(*pData->m_pVariable, true).UnclampLighting(pData->m_DarkestLighting);
+		str_format(aBuf, sizeof(aBuf), "H: %d°, S: %d%%, L: %d%%", round_to_int(Hsla.h * 360), round_to_int(Hsla.s * 100), round_to_int(Hsla.l * 100));
+		pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
 
-	void Serialize(char *pOut, size_t Size, unsigned Value) const
-	{
-		str_format(pOut, Size, "%s %u", m_pScriptName, Value);
-	}
+		const ColorRGBA Rgba = color_cast<ColorRGBA>(Hsla);
+		str_format(aBuf, sizeof(aBuf), "R: %d, G: %d, B: %d, #%06X", round_to_int(Rgba.r * 255), round_to_int(Rgba.g * 255), round_to_int(Rgba.b * 255), Rgba.Pack(false));
+		pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
 
-	void Serialize(char *pOut, size_t Size) const override
-	{
-		Serialize(pOut, Size, *m_pVariable);
+		if(pData->m_Alpha)
+		{
+			str_format(aBuf, sizeof(aBuf), "A: %d%%", round_to_int(Hsla.a * 100));
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+		}
 	}
+}
 
-	void SetValue(unsigned Value)
-	{
-		if(CheckReadOnly())
-			return;
-		char aBuf[IConsole::CMDLINE_LENGTH];
-		Serialize(aBuf, sizeof(aBuf), Value);
-		ExecuteLine(aBuf);
-	}
+void SColorConfigVariable::Register()
+{
+	m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
+}
 
-	void ResetToDefault() override
-	{
-		SetValue(m_Default);
-	}
+bool SColorConfigVariable::IsDefault() const
+{
+	return *m_pVariable == m_Default;
+}
 
-	void ResetToOld() override
-	{
-		*m_pVariable = m_OldValue;
-	}
-};
+void SColorConfigVariable::Serialize(char *pOut, size_t Size, unsigned Value) const
+{
+	str_format(pOut, Size, "%s %u", m_pScriptName, Value);
+}
 
-struct SStringConfigVariable : public SConfigVariable
+void SColorConfigVariable::Serialize(char *pOut, size_t Size) const
 {
-	char *m_pStr;
-	const char *m_pDefault;
-	size_t m_MaxSize;
-	char *m_pOldValue;
+	Serialize(pOut, Size, *m_pVariable);
+}
 
-	SStringConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, char *pStr, const char *pDefault, size_t MaxSize, char *pOldValue) :
-		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
-		m_pStr(pStr),
-		m_pDefault(pDefault),
-		m_MaxSize(MaxSize),
-		m_pOldValue(pOldValue)
-	{
-		str_copy(m_pStr, m_pDefault, m_MaxSize);
-		str_copy(m_pOldValue, m_pDefault, m_MaxSize);
-	}
+void SColorConfigVariable::SetValue(unsigned Value)
+{
+	if(CheckReadOnly())
+		return;
+	char aBuf[IConsole::CMDLINE_LENGTH];
+	Serialize(aBuf, sizeof(aBuf), Value);
+	ExecuteLine(aBuf);
+}
 
-	~SStringConfigVariable() override = default;
+void SColorConfigVariable::ResetToDefault()
+{
+	SetValue(m_Default);
+}
 
-	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
-	{
-		SStringConfigVariable *pData = static_cast<SStringConfigVariable *>(pUserData);
+void SColorConfigVariable::ResetToOld()
+{
+	*m_pVariable = m_OldValue;
+}
 
-		if(pResult->NumArguments())
-		{
-			if(pData->CheckReadOnly())
-				return;
+// -----
 
-			const char *pString = pResult->GetString(0);
-			if(!str_utf8_check(pString))
-			{
-				char aTemp[4];
-				size_t Length = 0;
-				while(*pString)
-				{
-					size_t Size = str_utf8_encode(aTemp, static_cast<unsigned char>(*pString++));
-					if(Length + Size < pData->m_MaxSize)
-					{
-						mem_copy(pData->m_pStr + Length, aTemp, Size);
-						Length += Size;
-					}
-					else
-						break;
-				}
-				pData->m_pStr[Length] = '\0';
-			}
-			else
-				str_copy(pData->m_pStr, pString, pData->m_MaxSize);
+SStringConfigVariable::SStringConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, char *pStr, const char *pDefault, size_t MaxSize, char *pOldValue) :
+	SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+	m_pStr(pStr),
+	m_pDefault(pDefault),
+	m_MaxSize(MaxSize),
+	m_pOldValue(pOldValue)
+{
+	str_copy(m_pStr, m_pDefault, m_MaxSize);
+	str_copy(m_pOldValue, m_pDefault, m_MaxSize);
+}
 
-			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
-				str_copy(pData->m_pOldValue, pData->m_pStr, pData->m_MaxSize);
-		}
-		else
-		{
-			char aBuf[1024];
-			str_format(aBuf, sizeof(aBuf), "Value: %s", pData->m_pStr);
-			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
-		}
-	}
+void SStringConfigVariable::CommandCallback(IConsole::IResult *pResult, void *pUserData)
+{
+	SStringConfigVariable *pData = static_cast<SStringConfigVariable *>(pUserData);
 
-	void Register() override
+	if(pResult->NumArguments())
 	{
-		m_pConsole->Register(m_pScriptName, "?r", m_Flags, CommandCallback, this, m_pHelp);
-	}
+		if(pData->CheckReadOnly())
+			return;
 
-	bool IsDefault() const override
-	{
-		return str_comp(m_pStr, m_pDefault) == 0;
-	}
+		const char *pString = pResult->GetString(0);
+		str_copy(pData->m_pStr, pString, pData->m_MaxSize);
 
-	void Serialize(char *pOut, size_t Size, const char *pValue) const
-	{
-		str_copy(pOut, m_pScriptName, Size);
-		str_append(pOut, " \"", Size);
-		const int OutLen = str_length(pOut);
-		EscapeParam(pOut + OutLen, pValue, Size - OutLen - 1); // -1 to ensure space for final quote
-		str_append(pOut, "\"", Size);
+		if(pResult->m_ClientId != IConsole::CLIENT_ID_GAME)
+			str_copy(pData->m_pOldValue, pData->m_pStr, pData->m_MaxSize);
 	}
-
-	void Serialize(char *pOut, size_t Size) const override
+	else
 	{
-		Serialize(pOut, Size, m_pStr);
+		char aBuf[1024];
+		str_format(aBuf, sizeof(aBuf), "Value: %s", pData->m_pStr);
+		pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
 	}
+}
 
-	void SetValue(const char *pValue)
-	{
-		if(CheckReadOnly())
-			return;
-		char aBuf[2048];
-		Serialize(aBuf, sizeof(aBuf), pValue);
-		ExecuteLine(aBuf);
-	}
+void SStringConfigVariable::Register()
+{
+	m_pConsole->Register(m_pScriptName, "?r", m_Flags, CommandCallback, this, m_pHelp);
+}
 
-	void ResetToDefault() override
-	{
-		SetValue(m_pDefault);
-	}
+bool SStringConfigVariable::IsDefault() const
+{
+	return str_comp(m_pStr, m_pDefault) == 0;
+}
 
-	void ResetToOld() override
-	{
-		str_copy(m_pStr, m_pOldValue, m_MaxSize);
-	}
-};
+void SStringConfigVariable::Serialize(char *pOut, size_t Size, const char *pValue) const
+{
+	str_copy(pOut, m_pScriptName, Size);
+	str_append(pOut, " \"", Size);
+	const int OutLen = str_length(pOut);
+	EscapeParam(pOut + OutLen, pValue, Size - OutLen - 1); // -1 to ensure space for final quote
+	str_append(pOut, "\"", Size);
+}
+
+void SStringConfigVariable::Serialize(char *pOut, size_t Size) const
+{
+	Serialize(pOut, Size, m_pStr);
+}
+
+void SStringConfigVariable::SetValue(const char *pValue)
+{
+	if(CheckReadOnly())
+		return;
+	char aBuf[2048];
+	Serialize(aBuf, sizeof(aBuf), pValue);
+	ExecuteLine(aBuf);
+}
+
+void SStringConfigVariable::ResetToDefault()
+{
+	SetValue(m_pDefault);
+}
 
+void SStringConfigVariable::ResetToOld()
+{
+	str_copy(m_pStr, m_pOldValue, m_MaxSize);
+}
+
+// ----------------------- Config Manager
 CConfigManager::CConfigManager()
 {
 	m_pConsole = nullptr;
@@ -388,7 +294,7 @@ void CConfigManager::Init()
 
 #define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \
 	{ \
-		const char *pHelp = Min == Max ? Desc " (default: " #Def ")" : Max == 0 ? Desc " (default: " #Def ", min: " #Min ")" : Desc " (default: " #Def ", min: " #Min ", max: " #Max ")"; \
+		const char *pHelp = Min == Max ? Desc " (default: " #Def ")" : (Max == 0 ? Desc " (default: " #Def ", min: " #Min ")" : Desc " (default: " #Def ", min: " #Min ", max: " #Max ")"); \
 		AddVariable(m_ConfigHeap.Allocate<SIntConfigVariable>(m_pConsole, #ScriptName, SConfigVariable::VAR_INT, Flags, pHelp, &g_Config.m_##Name, Def, Min, Max)); \
 	}
 
@@ -496,19 +402,27 @@ bool CConfigManager::Save()
 		WriteLine(pCommand);
 	}
 
+	if(m_Failed)
+	{
+		log_error("config", "ERROR: writing to %s failed", aConfigFileTmp);
+	}
+
 	if(io_sync(m_ConfigFile) != 0)
 	{
 		m_Failed = true;
+		log_error("config", "ERROR: synchronizing %s failed", aConfigFileTmp);
 	}
 
 	if(io_close(m_ConfigFile) != 0)
+	{
 		m_Failed = true;
+		log_error("config", "ERROR: closing %s failed", aConfigFileTmp);
+	}
 
 	m_ConfigFile = 0;
 
 	if(m_Failed)
 	{
-		log_error("config", "ERROR: writing to %s failed", aConfigFileTmp);
 		return false;
 	}
 
@@ -518,6 +432,7 @@ bool CConfigManager::Save()
 		return false;
 	}
 
+	log_info("config", "saved to " CONFIG_FILE);
 	return true;
 }
 
@@ -541,6 +456,20 @@ void CConfigManager::StoreUnknownCommand(const char *pCommand)
 	m_vpUnknownCommands.push_back(m_ConfigHeap.StoreString(pCommand));
 }
 
+void CConfigManager::PossibleConfigVariables(const char *pStr, int FlagMask, POSSIBLECFGFUNC pfnCallback, void *pUserData)
+{
+	for(const SConfigVariable *pVariable : m_vpAllVariables)
+	{
+		if(pVariable->m_Flags & FlagMask)
+		{
+			if(str_find_nocase(pVariable->m_pScriptName, pStr))
+			{
+				pfnCallback(pVariable, pUserData);
+			}
+		}
+	}
+}
+
 void CConfigManager::Con_Reset(IConsole::IResult *pResult, void *pUserData)
 {
 	static_cast<CConfigManager *>(pUserData)->Reset(pResult->GetString(0));
@@ -563,19 +492,21 @@ void CConfigManager::Con_Toggle(IConsole::IResult *pResult, void *pUserData)
 		if(pVariable->m_Type == SConfigVariable::VAR_INT)
 		{
 			SIntConfigVariable *pIntVariable = static_cast<SIntConfigVariable *>(pVariable);
-			pIntVariable->SetValue(*pIntVariable->m_pVariable == pResult->GetInteger(1) ? pResult->GetInteger(2) : pResult->GetInteger(1));
+			const bool EqualToFirst = *pIntVariable->m_pVariable == pResult->GetInteger(1);
+			pIntVariable->SetValue(pResult->GetInteger(EqualToFirst ? 2 : 1));
 		}
 		else if(pVariable->m_Type == SConfigVariable::VAR_COLOR)
 		{
 			SColorConfigVariable *pColorVariable = static_cast<SColorConfigVariable *>(pVariable);
-			const float Darkest = pColorVariable->m_Light ? 0.5f : 0.0f;
-			const ColorHSLA Value = *pColorVariable->m_pVariable == pResult->GetColor(1, pColorVariable->m_Light).Pack(Darkest, pColorVariable->m_Alpha) ? pResult->GetColor(2, pColorVariable->m_Light) : pResult->GetColor(1, pColorVariable->m_Light);
-			pColorVariable->SetValue(Value.Pack(Darkest, pColorVariable->m_Alpha));
+			const bool EqualToFirst = *pColorVariable->m_pVariable == pResult->GetColor(1, pColorVariable->m_DarkestLighting).value_or(ColorHSLA(0, 0, 0)).Pack(pColorVariable->m_DarkestLighting, pColorVariable->m_Alpha);
+			const std::optional<ColorHSLA> Value = pResult->GetColor(EqualToFirst ? 2 : 1, pColorVariable->m_DarkestLighting);
+			pColorVariable->SetValue(Value.value_or(ColorHSLA(0, 0, 0)).Pack(pColorVariable->m_DarkestLighting, pColorVariable->m_Alpha));
 		}
 		else if(pVariable->m_Type == SConfigVariable::VAR_STRING)
 		{
 			SStringConfigVariable *pStringVariable = static_cast<SStringConfigVariable *>(pVariable);
-			pStringVariable->SetValue(str_comp(pStringVariable->m_pStr, pResult->GetString(1)) == 0 ? pResult->GetString(2) : pResult->GetString(1));
+			const bool EqualToFirst = str_comp(pStringVariable->m_pStr, pResult->GetString(1)) == 0;
+			pStringVariable->SetValue(pResult->GetString(EqualToFirst ? 2 : 1));
 		}
 		return;
 	}
diff --git a/src/engine/shared/config.h b/src/engine/shared/config.h
index de3c54e47d..431ca02728 100644
--- a/src/engine/shared/config.h
+++ b/src/engine/shared/config.h
@@ -18,7 +18,7 @@
 #define AUTOEXEC_FILE "autoexec.cfg"
 #define AUTOEXEC_CLIENT_FILE "autoexec_client.cfg"
 #define AUTOEXEC_SERVER_FILE "autoexec_server.cfg"
-#define TCONFIG_FILE "settings_sta.cfg"
+
 class CConfig
 {
 public:
@@ -32,7 +32,6 @@ class CConfig
 	static constexpr const char *ms_p##Name = Def; \
 	char m_##Name[Len]; // Flawfinder: ignore
 #include "config_variables.h"
-
 #undef MACRO_CONFIG_INT
 #undef MACRO_CONFIG_COL
 #undef MACRO_CONFIG_STR
@@ -55,8 +54,142 @@ enum
 	CFGFLAG_GAME = 1 << 8,
 	CFGFLAG_NONTEEHISTORIC = 1 << 9,
 	CFGFLAG_COLLIGHT = 1 << 10,
-	CFGFLAG_COLALPHA = 1 << 11,
-	CFGFLAG_INSENSITIVE = 1 << 12,
+	CFGFLAG_COLLIGHT7 = 1 << 11,
+	CFGFLAG_COLALPHA = 1 << 12,
+	CFGFLAG_INSENSITIVE = 1 << 13,
+	CMDFLAG_PRACTICE = 1 << 14,
+};
+
+struct SConfigVariable
+{
+	enum EVariableType
+	{
+		VAR_INT,
+		VAR_COLOR,
+		VAR_STRING,
+	};
+	IConsole *m_pConsole;
+	const char *m_pScriptName;
+	EVariableType m_Type;
+	int m_Flags;
+	const char *m_pHelp;
+	// Note that this only applies to the console command and the SetValue function,
+	// but the underlying config variable can still be modified programatically.
+	bool m_ReadOnly = false;
+
+	SConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp) :
+		m_pConsole(pConsole),
+		m_pScriptName(pScriptName),
+		m_Type(Type),
+		m_Flags(Flags),
+		m_pHelp(pHelp)
+	{
+	}
+
+	virtual ~SConfigVariable() = default;
+
+	virtual void Register() = 0;
+	virtual bool IsDefault() const = 0;
+	virtual void Serialize(char *pOut, size_t Size) const = 0;
+	virtual void ResetToDefault() = 0;
+	virtual void ResetToOld() = 0;
+
+protected:
+	void ExecuteLine(const char *pLine) const;
+	bool CheckReadOnly() const;
+};
+
+struct SIntConfigVariable : public SConfigVariable
+{
+	int *m_pVariable;
+	int m_Default;
+	int m_Min;
+	int m_Max;
+	int m_OldValue;
+
+	SIntConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, int *pVariable, int Default, int Min, int Max) :
+		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+		m_pVariable(pVariable),
+		m_Default(Default),
+		m_Min(Min),
+		m_Max(Max),
+		m_OldValue(Default)
+	{
+		*m_pVariable = m_Default;
+	}
+
+	~SIntConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData);
+	void Register() override;
+	bool IsDefault() const override;
+	void Serialize(char *pOut, size_t Size, int Value) const;
+	void Serialize(char *pOut, size_t Size) const override;
+	void SetValue(int Value);
+	void ResetToDefault() override;
+	void ResetToOld() override;
+};
+
+struct SColorConfigVariable : public SConfigVariable
+{
+	unsigned *m_pVariable;
+	unsigned m_Default;
+	float m_DarkestLighting;
+	bool m_Alpha;
+	unsigned m_OldValue;
+
+	SColorConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, unsigned *pVariable, unsigned Default) :
+		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+		m_pVariable(pVariable),
+		m_Default(Default),
+		m_Alpha(Flags & CFGFLAG_COLALPHA),
+		m_OldValue(Default)
+	{
+		*m_pVariable = m_Default;
+		if(Flags & CFGFLAG_COLLIGHT)
+		{
+			m_DarkestLighting = ColorHSLA::DARKEST_LGT;
+		}
+		else if(Flags & CFGFLAG_COLLIGHT7)
+		{
+			m_DarkestLighting = ColorHSLA::DARKEST_LGT7;
+		}
+		else
+		{
+			m_DarkestLighting = 0.0f;
+		}
+	}
+
+	~SColorConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData);
+	void Register() override;
+	bool IsDefault() const override;
+	void Serialize(char *pOut, size_t Size, unsigned Value) const;
+	void Serialize(char *pOut, size_t Size) const override;
+	void SetValue(unsigned Value);
+	void ResetToDefault() override;
+	void ResetToOld() override;
+};
+
+struct SStringConfigVariable : public SConfigVariable
+{
+	char *m_pStr;
+	const char *m_pDefault;
+	size_t m_MaxSize;
+	char *m_pOldValue;
+
+	SStringConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, char *pStr, const char *pDefault, size_t MaxSize, char *pOldValue);
+	~SStringConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData);
+	void Register() override;
+	bool IsDefault() const override;
+	void Serialize(char *pOut, size_t Size, const char *pValue) const;
+	void Serialize(char *pOut, size_t Size) const override;
+	void SetValue(const char *pValue);
+	void ResetToDefault() override;
+	void ResetToOld() override;
 };
 
 class CConfigManager : public IConfigManager
@@ -80,8 +213,8 @@ class CConfigManager : public IConfigManager
 	};
 	std::vector<SCallback> m_vCallbacks;
 
-	std::vector<struct SConfigVariable *> m_vpAllVariables;
-	std::vector<struct SConfigVariable *> m_vpGameVariables;
+	std::vector<SConfigVariable *> m_vpAllVariables;
+	std::vector<SConfigVariable *> m_vpGameVariables;
 	std::vector<const char *> m_vpUnknownCommands;
 	CHeap m_ConfigHeap;
 
@@ -104,6 +237,8 @@ class CConfigManager : public IConfigManager
 	void WriteLine(const char *pLine) override;
 
 	void StoreUnknownCommand(const char *pCommand) override;
+
+	void PossibleConfigVariables(const char *pStr, int FlagMask, POSSIBLECFGFUNC pfnCallback, void *pUserData) override;
 };
 
 #endif
diff --git a/src/engine/shared/config.rs b/src/engine/shared/config.rs
index ca42303ee6..968f18025e 100644
--- a/src/engine/shared/config.rs
+++ b/src/engine/shared/config.rs
@@ -45,13 +45,21 @@ pub const CFGFLAG_NONTEEHISTORIC: i32 = 1 << 9;
 /// Has no effect on other commands or config variables.
 pub const CFGFLAG_COLLIGHT: i32 = 1 << 10;
 
+/// Color config variable that can only have lightness (61/255) to 1.0.
+///
+/// This is achieved by dividing the lightness channel by and adding (61/255), i.e.
+/// remapping all the colors.
+///
+/// Has no effect on other commands or config variables.
+pub const CFGFLAG_COLLIGHT7: i32 = 1 << 11;
+
 /// Color config variable that includes an alpha (opacity) value.
 ///
 /// Has no effect on other commands or config variables.
-pub const CFGFLAG_COLALPHA: i32 = 1 << 11;
+pub const CFGFLAG_COLALPHA: i32 = 1 << 12;
 
 /// Config variable with insensitive data that can be included in client
 /// integrity checks.
 ///
 /// This should only be set on config variables the server could observe anyway.
-pub const CFGFLAG_INSENSITIVE: i32 = 1 << 12;
+pub const CFGFLAG_INSENSITIVE: i32 = 1 << 13;
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h
index b73e4b9287..45859dec3c 100644
--- a/src/engine/shared/config_variables.h
+++ b/src/engine/shared/config_variables.h
@@ -30,7 +30,7 @@ MACRO_CONFIG_INT(ClNameplatesTeamcolors, cl_nameplates_teamcolors, 1, 0, 1, CFGF
 MACRO_CONFIG_INT(ClNameplatesSize, cl_nameplates_size, 50, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of the name plates from 0 to 100%")
 MACRO_CONFIG_INT(ClNameplatesClan, cl_nameplates_clan, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show clan in name plates")
 MACRO_CONFIG_INT(ClNameplatesClanSize, cl_nameplates_clan_size, 30, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of the clan plates from 0 to 100%")
-MACRO_CONFIG_INT(ClNameplatesIDs, cl_nameplates_ids, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show IDs in name plates")
+MACRO_CONFIG_INT(ClNameplatesIds, cl_nameplates_ids, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show IDs in name plates")
 MACRO_CONFIG_INT(ClNameplatesOwn, cl_nameplates_own, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show own name plate (useful for demo recording)")
 MACRO_CONFIG_INT(ClNameplatesFriendMark, cl_nameplates_friendmark, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show friend mark (♥) in name plates")
 MACRO_CONFIG_INT(ClNameplatesStrong, cl_nameplates_strong, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show strong/weak in name plates (0 - off, 1 - icons, 2 - icons + numbers)")
@@ -49,6 +49,7 @@ MACRO_CONFIG_INT(ClShowhud, cl_showhud, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE,
 MACRO_CONFIG_INT(ClShowhudHealthAmmo, cl_showhud_healthammo, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Health + Ammo)")
 MACRO_CONFIG_INT(ClShowhudScore, cl_showhud_score, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Score)")
 MACRO_CONFIG_INT(ClShowhudTimer, cl_showhud_timer, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Timer)")
+MACRO_CONFIG_INT(ClShowhudTimeCpDiff, cl_showhud_time_cp_diff, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Time Checkpoint Difference)")
 MACRO_CONFIG_INT(ClShowhudDummyActions, cl_showhud_dummy_actions, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Dummy Actions)")
 MACRO_CONFIG_INT(ClShowhudPlayerPosition, cl_showhud_player_position, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Player Position)")
 MACRO_CONFIG_INT(ClShowhudPlayerSpeed, cl_showhud_player_speed, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Player Speed)")
@@ -62,6 +63,7 @@ MACRO_CONFIG_INT(ClShowNotifications, cl_shownotifications, 1, 0, 1, CFGFLAG_CLI
 MACRO_CONFIG_INT(ClShowEmotes, cl_showemotes, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show tee emotes")
 MACRO_CONFIG_INT(ClShowChat, cl_showchat, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show chat (2 to always show large chat area)")
 MACRO_CONFIG_INT(ClShowChatFriends, cl_show_chat_friends, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show only chat messages from friends")
+MACRO_CONFIG_INT(ClShowChatTeamMembersOnly, cl_show_chat_team_members_only, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show only chat messages from team members")
 MACRO_CONFIG_INT(ClShowChatSystem, cl_show_chat_system, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show chat messages from the server")
 MACRO_CONFIG_INT(ClShowKillMessages, cl_showkillmessages, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show kill messages")
 MACRO_CONFIG_INT(ClShowFinishMessages, cl_show_finish_messages, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show finish messages")
@@ -71,6 +73,7 @@ MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE,
 MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
 MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show eye wheel along together with emotes")
 MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long the eyes emotes last")
+MACRO_CONFIG_INT(ClFreezeStars, cl_freeze_stars, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show old star particles for frozen tees")
 
 MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the air jump indicator")
 MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")
@@ -95,6 +98,9 @@ MACRO_CONFIG_INT(ClDyncamStabilizing, cl_dyncam_stabilizing, 0, 0, 100, CFGFLAG_
 MACRO_CONFIG_INT(ClMultiViewSensitivity, cl_multiview_sensitivity, 100, 0, 200, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set how fast the camera will move to the desired location (higher = faster)")
 MACRO_CONFIG_INT(ClMultiViewZoomSmoothness, cl_multiview_zoom_smoothness, 1300, 50, 5000, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set the smoothness of the multi-view zoom (in ms, higher = slower)")
 
+MACRO_CONFIG_INT(ClSpectatorMouseclicks, cl_spectator_mouseclicks, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enables left-click to toggle between spectating the closest player and free-view")
+MACRO_CONFIG_INT(ClSmoothSpectatingTime, cl_smooth_spectating_time, 300, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time of smooth camera switch animation when spectating in ms (0 for off)")
+
 MACRO_CONFIG_INT(EdAutosaveInterval, ed_autosave_interval, 10, 0, 240, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interval in minutes at which a copy of the current editor map is automatically saved to the 'auto' folder (0 for off)")
 MACRO_CONFIG_INT(EdAutosaveMax, ed_autosave_max, 10, 0, 1000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of autosaves that are kept per map name (0 = no limit)")
 MACRO_CONFIG_INT(EdSmoothZoomTime, ed_smooth_zoom_time, 250, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time of smooth zoom animation in the editor in ms (0 for off)")
@@ -103,6 +109,8 @@ MACRO_CONFIG_INT(EdZoomTarget, ed_zoom_target, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG
 MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show pressed keys")
 MACRO_CONFIG_INT(EdAlignQuads, ed_align_quads, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable/disable quad alignment. When enabled, red lines appear to show how quad/points are aligned and snapped to other quads/points when moving them")
 MACRO_CONFIG_INT(EdShowQuadsRect, ed_show_quads_rect, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the bounds of the selected quad. In case of multiple quads, it shows the bounds of the englobing rect. Can be helpful when aligning a group of quads")
+MACRO_CONFIG_INT(EdAutoMapReload, ed_auto_map_reload, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Run 'hot_reload' on the local server while rcon authed on map save")
+MACRO_CONFIG_INT(EdLayerSelector, ed_layer_selector, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Ctrl+right click tiles to select their layers in the editor")
 
 MACRO_CONFIG_INT(ClShowWelcome, cl_show_welcome, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show welcome message indicating the first launch of the client")
 MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long to show the server message of the day")
@@ -134,7 +142,49 @@ MACRO_CONFIG_INT(ClPlayerDefaultEyes, player_default_eyes, 0, 0, 5, CFGFLAG_CLIE
 MACRO_CONFIG_STR(ClSkinPrefix, cl_skin_prefix, 12, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Replace the skins by skins with this prefix (e.g. kitty, santa)")
 MACRO_CONFIG_INT(ClFatSkins, cl_fat_skins, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable fat skins")
 
-MACRO_CONFIG_INT(UiPage, ui_page, 6, 6, 10, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interface page")
+MACRO_CONFIG_COL(ClPlayer7ColorBody, player7_color_body, 0x1B6F74, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Player body color")
+MACRO_CONFIG_COL(ClPlayer7ColorFeet, player7_color_feet, 0x1C873E, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Player feet color")
+
+MACRO_CONFIG_COL(ClPlayer7ColorMarking, player7_color_marking, 0xFF0000FF, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_COLALPHA | CFGFLAG_INSENSITIVE, "Player marking color")
+MACRO_CONFIG_COL(ClPlayer7ColorDecoration, player7_color_decoration, 0x1B6F74, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Player decoration color")
+MACRO_CONFIG_COL(ClPlayer7ColorHands, player7_color_hands, 0x1B759E, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Player hands color")
+MACRO_CONFIG_COL(ClPlayer7ColorEyes, player7_color_eyes, 0x0000FF, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Player eyes color")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorBody, player7_use_custom_color_body, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for body")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorMarking, player7_use_custom_color_marking, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for marking")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorDecoration, player7_use_custom_color_decoration, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for decoration")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorHands, player7_use_custom_color_hands, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for hands")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorFeet, player7_use_custom_color_feet, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for feet")
+MACRO_CONFIG_INT(ClPlayer7UseCustomColorEyes, player7_use_custom_color_eyes, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for eyes")
+MACRO_CONFIG_STR(ClPlayer7Skin, player7_skin, protocol7::MAX_SKIN_ARRAY_SIZE, "default", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin")
+MACRO_CONFIG_STR(ClPlayer7SkinBody, player7_skin_body, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin body")
+MACRO_CONFIG_STR(ClPlayer7SkinMarking, player7_skin_marking, protocol7::MAX_SKIN_ARRAY_SIZE, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin marking")
+MACRO_CONFIG_STR(ClPlayer7SkinDecoration, player7_skin_decoration, protocol7::MAX_SKIN_ARRAY_SIZE, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin decoration")
+MACRO_CONFIG_STR(ClPlayer7SkinHands, player7_skin_hands, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin hands")
+MACRO_CONFIG_STR(ClPlayer7SkinFeet, player7_skin_feet, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin feet")
+MACRO_CONFIG_STR(ClPlayer7SkinEyes, player7_skin_eyes, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin eyes")
+
+MACRO_CONFIG_COL(ClDummy7ColorBody, dummy7_color_body, 0x1B6F74, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Dummy body color")
+MACRO_CONFIG_COL(ClDummy7ColorFeet, dummy7_color_feet, 0x1C873E, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Dummy feet color")
+
+MACRO_CONFIG_COL(ClDummy7ColorMarking, dummy7_color_marking, 0xFF0000FF, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_COLALPHA | CFGFLAG_INSENSITIVE, "Dummy marking color")
+MACRO_CONFIG_COL(ClDummy7ColorDecoration, dummy7_color_decoration, 0x1B6F74, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Dummy decoration color")
+MACRO_CONFIG_COL(ClDummy7ColorHands, dummy7_color_hands, 0x1B759E, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Dummy hands color")
+MACRO_CONFIG_COL(ClDummy7ColorEyes, dummy7_color_eyes, 0x0000FF, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT7 | CFGFLAG_INSENSITIVE, "Dummy eyes color")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorBody, dummy7_use_custom_color_body, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for body")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorMarking, dummy7_use_custom_color_marking, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for marking")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorDecoration, dummy7_use_custom_color_decoration, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for decoration")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorHands, dummy7_use_custom_color_hands, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for hands")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorFeet, dummy7_use_custom_color_feet, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for feet")
+MACRO_CONFIG_INT(ClDummy7UseCustomColorEyes, dummy7_use_custom_color_eyes, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors for eyes")
+MACRO_CONFIG_STR(ClDummy7Skin, dummy7_skin, protocol7::MAX_SKIN_ARRAY_SIZE, "default", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin")
+MACRO_CONFIG_STR(ClDummy7SkinBody, dummy7_skin_body, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin body")
+MACRO_CONFIG_STR(ClDummy7SkinMarking, dummy7_skin_marking, protocol7::MAX_SKIN_ARRAY_SIZE, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin marking")
+MACRO_CONFIG_STR(ClDummy7SkinDecoration, dummy7_skin_decoration, protocol7::MAX_SKIN_ARRAY_SIZE, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin decoration")
+MACRO_CONFIG_STR(ClDummy7SkinHands, dummy7_skin_hands, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin hands")
+MACRO_CONFIG_STR(ClDummy7SkinFeet, dummy7_skin_feet, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin feet")
+MACRO_CONFIG_STR(ClDummy7SkinEyes, dummy7_skin_eyes, protocol7::MAX_SKIN_ARRAY_SIZE, "standard", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin eyes")
+
+MACRO_CONFIG_INT(UiPage, ui_page, 6, 6, 13, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interface page")
 MACRO_CONFIG_INT(UiSettingsPage, ui_settings_page, 0, 0, 9, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interface settings page")
 MACRO_CONFIG_INT(UiToolboxPage, ui_toolbox_page, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Toolbox page")
 MACRO_CONFIG_STR(UiServerAddress, ui_server_address, 1024, "localhost:8303", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Interface server address")
@@ -160,15 +210,15 @@ MACRO_CONFIG_INT(ClDummyUseCustomColor, dummy_use_custom_color, 0, 0, 1, CFGFLAG
 MACRO_CONFIG_COL(ClDummyColorBody, dummy_color_body, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Dummy body color")
 MACRO_CONFIG_COL(ClDummyColorFeet, dummy_color_feet, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Dummy feet color")
 MACRO_CONFIG_STR(ClDummySkin, dummy_skin, 24, "default", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin")
-MACRO_CONFIG_INT(ClDummyDefaultEyes, dummy_default_eyes, 0, 0, 5, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dummy eyes when joining server. 0 = normal, 1 = pain, 2 = happy, 3 = surprise, 4 = angry, 5 = blink")
-MACRO_CONFIG_INT(ClDummy, cl_dummy, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "0 - player / 1 - dummy")
+MACRO_CONFIG_INT(ClDummyDefaultEyes, dummy_default_eyes, 0, 0, 5, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dummy eyes when joining server (0 = normal, 1 = pain, 2 = happy, 3 = surprise, 4 = angry, 5 = blink)")
+MACRO_CONFIG_INT(ClDummy, cl_dummy, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether you control your player (0) or your dummy (1)")
 MACRO_CONFIG_INT(ClDummyHammer, cl_dummy_hammer, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is hammering for a hammerfly")
-MACRO_CONFIG_INT(ClDummyResetOnSwitch, cl_dummy_resetonswitch, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Whether dummy or player should stop pressing keys when you switch. 0 = off, 1 = dummy, 2 = player")
+MACRO_CONFIG_INT(ClDummyResetOnSwitch, cl_dummy_resetonswitch, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Whether dummy or player should stop pressing keys when you switch (0 = off, 1 = dummy, 2 = player)")
 MACRO_CONFIG_INT(ClDummyRestoreWeapon, cl_dummy_restore_weapon, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Whether dummy should switch to last weapon after hammerfly")
 MACRO_CONFIG_INT(ClDummyCopyMoves, cl_dummy_copy_moves, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy should copy your moves")
 
 // more controllable dummy command
-MACRO_CONFIG_INT(ClDummyControl, cl_dummy_control, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether can you control dummy at the same time (cl_dummy_jump, cl_dummy_fire, cl_dummy_hook)")
+MACRO_CONFIG_INT(ClDummyControl, cl_dummy_control, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether you can control dummy at the same time (cl_dummy_jump, cl_dummy_fire, cl_dummy_hook)")
 MACRO_CONFIG_INT(ClDummyJump, cl_dummy_jump, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is jumping (requires cl_dummy_control 1)")
 MACRO_CONFIG_INT(ClDummyFire, cl_dummy_fire, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is firing (requires cl_dummy_control 1)")
 MACRO_CONFIG_INT(ClDummyHook, cl_dummy_hook, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is hooking (requires cl_dummy_control 1)")
@@ -182,7 +232,7 @@ MACRO_CONFIG_INT(SvWarmup, sv_warmup, 0, 0, 0, CFGFLAG_SERVER, "Number of second
 MACRO_CONFIG_STR(SvMotd, sv_motd, 900, "", CFGFLAG_SERVER, "Message of the day to display for the clients")
 MACRO_CONFIG_STR(SvGametype, sv_gametype, 32, "ddnet", CFGFLAG_SERVER, "Game type (ddnet, mod)")
 MACRO_CONFIG_INT(SvTournamentMode, sv_tournament_mode, 0, 0, 1, CFGFLAG_SERVER, "Tournament mode. When enabled, players joins the server as spectator")
-MACRO_CONFIG_INT(SvSpamprotection, sv_spamprotection, 1, 0, 1, CFGFLAG_SERVER, "Spam protection")
+MACRO_CONFIG_INT(SvSpamprotection, sv_spamprotection, 1, 0, 1, CFGFLAG_SERVER, "Spam protection for: team change, chat, skin change, emotes and votes")
 
 MACRO_CONFIG_INT(SvSpectatorSlots, sv_spectator_slots, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Number of slots to reserve for spectators")
 MACRO_CONFIG_INT(SvInactiveKickTime, sv_inactivekick_time, 0, 0, 1000, CFGFLAG_SERVER, "How many minutes to wait before taking care of inactive players")
@@ -285,10 +335,8 @@ MACRO_CONFIG_INT(BrFilterGametypeStrict, br_filter_gametype_strict, 0, 0, 1, CFG
 MACRO_CONFIG_INT(BrFilterConnectingPlayers, br_filter_connecting_players, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter connecting players")
 MACRO_CONFIG_STR(BrFilterServerAddress, br_filter_serveraddress, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Server address to filter")
 MACRO_CONFIG_INT(BrFilterUnfinishedMap, br_filter_unfinished_map, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show only servers with unfinished maps")
+MACRO_CONFIG_INT(BrFilterLogin, br_filter_login, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out servers that require login")
 
-MACRO_CONFIG_STR(BrFilterExcludeCommunities, br_filter_exclude_communities, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out servers by community")
-MACRO_CONFIG_STR(BrFilterExcludeCountries, br_filter_exclude_countries, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out communities' servers by country")
-MACRO_CONFIG_STR(BrFilterExcludeTypes, br_filter_exclude_types, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out communities' servers by gametype")
 MACRO_CONFIG_INT(BrIndicateFinished, br_indicate_finished, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show whether you have finished a DDNet map (transmits your player name to info.ddnet.org/info)")
 MACRO_CONFIG_STR(BrLocation, br_location, 16, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Override location for ping estimation, available: auto, af, as, as:cn, eu, na, oc, sa (Automatic, Africa, Asia, China, Europe, North America, Oceania/Australia, South America")
 MACRO_CONFIG_STR(BrCachedBestServerinfoUrl, br_cached_best_serverinfo_url, 256, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Do not set this variable, instead create a ddnet-serverlist-urls.cfg next to settings_ddnet.cfg to specify all possible serverlist URLs")
@@ -301,6 +349,9 @@ MACRO_CONFIG_INT(BrDemoSort, br_demo_sort, 0, 0, 2, CFGFLAG_SAVE | CFGFLAG_CLIEN
 MACRO_CONFIG_INT(BrDemoSortOrder, br_demo_sort_order, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting order in demo browser")
 MACRO_CONFIG_INT(BrDemoFetchInfo, br_demo_fetch_info, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to auto fetch demo infos on refresh")
 
+MACRO_CONFIG_INT(GhSort, gh_sort, 1, 0, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting column in ghost list")
+MACRO_CONFIG_INT(GhSortOrder, gh_sort_order, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting order in ghost list")
+
 MACRO_CONFIG_INT(SndBufferSize, snd_buffer_size, 512, 128, 32768, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound buffer size (may cause delay if large)")
 MACRO_CONFIG_INT(SndRate, snd_rate, 48000, 5512, 384000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound mixing rate")
 MACRO_CONFIG_INT(SndEnable, snd_enable, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound enable")
@@ -372,11 +423,11 @@ MACRO_CONFIG_INT(ClContactPort, cl_contact_port, 0, 0, 65535, CFGFLAG_SAVE | CFG
 MACRO_CONFIG_STR(SvName, sv_name, 128, "unnamed server", CFGFLAG_SERVER, "Server name")
 MACRO_CONFIG_STR(Bindaddr, bindaddr, 128, "", CFGFLAG_CLIENT | CFGFLAG_SERVER | CFGFLAG_MASTER, "Address to bind the client/server to")
 MACRO_CONFIG_INT(SvIpv4Only, sv_ipv4only, 0, 0, 1, CFGFLAG_SERVER, "Whether to bind only to ipv4, otherwise bind to all available interfaces")
-MACRO_CONFIG_INT(SvPort, sv_port, 0, 0, 0, CFGFLAG_SERVER, "Port to use for the server (Only ports 8303-8310 work in LAN server browser, 0 to automatically find a free port in 8303-8310)")
+MACRO_CONFIG_INT(SvPort, sv_port, 0, 0, 65535, CFGFLAG_SERVER, "Port to use for the server (Only ports 8303-8310 work in LAN server browser, 0 to automatically find a free port in 8303-8310)")
 MACRO_CONFIG_STR(SvHostname, sv_hostname, 128, "", CFGFLAG_SERVER, "Server hostname (0.7 only)")
 MACRO_CONFIG_STR(SvMap, sv_map, 128, "Sunny Side Up", CFGFLAG_SERVER, "Map to use on the server")
 MACRO_CONFIG_INT(SvMaxClients, sv_max_clients, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients that are allowed on a server")
-MACRO_CONFIG_INT(SvMaxClientsPerIP, sv_max_clients_per_ip, 4, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients with the same IP that can connect to the server")
+MACRO_CONFIG_INT(SvMaxClientsPerIp, sv_max_clients_per_ip, 4, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients with the same IP that can connect to the server")
 MACRO_CONFIG_INT(SvHighBandwidth, sv_high_bandwidth, 0, 0, 1, CFGFLAG_SERVER, "Use high bandwidth mode. Doubles the bandwidth required for the server. LAN use only")
 MACRO_CONFIG_STR(SvRegister, sv_register, 16, "1", CFGFLAG_SERVER, "Register server with master server for public listing, can also accept a comma-separated list of protocols to register on, like 'ipv4,ipv6'")
 MACRO_CONFIG_STR(SvRegisterExtra, sv_register_extra, 256, "", CFGFLAG_SERVER, "Extra headers to send to the register endpoint, comma separated 'Header: Value' pairs")
@@ -395,6 +446,7 @@ MACRO_CONFIG_STR(SvDnsblHost, sv_dnsbl_host, 128, "", CFGFLAG_SERVER, "Hostname
 MACRO_CONFIG_STR(SvDnsblKey, sv_dnsbl_key, 128, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Optional Authentication Key for the specified DNSBL provider")
 MACRO_CONFIG_INT(SvDnsblVote, sv_dnsbl_vote, 0, 0, 1, CFGFLAG_SERVER, "Block votes by blacklisted addresses")
 MACRO_CONFIG_INT(SvDnsblBan, sv_dnsbl_ban, 0, 0, 1, CFGFLAG_SERVER, "Automatically ban blacklisted addresses")
+MACRO_CONFIG_STR(SvDnsblBanReason, sv_dnsbl_ban_reason, 128, "VPN detected, try connecting without. Contact admin if mistaken", CFGFLAG_SERVER, "Ban reason for 'sv_dnsbl_ban'")
 MACRO_CONFIG_INT(SvDnsblChat, sv_dnsbl_chat, 0, 0, 1, CFGFLAG_SERVER, "Don't allow chat from blacklisted addresses")
 MACRO_CONFIG_INT(SvRconVote, sv_rcon_vote, 0, 0, 1, CFGFLAG_SERVER, "Only allow authed clients to call votes")
 
@@ -406,8 +458,8 @@ MACRO_CONFIG_INT(SvSixup, sv_sixup, 1, 0, 1, CFGFLAG_SERVER, "Enable sixup conne
 MACRO_CONFIG_INT(SvSkillLevel, sv_skill_level, 1, SERVERINFO_LEVEL_MIN, SERVERINFO_LEVEL_MAX, CFGFLAG_SERVER, "Difficulty level for Teeworlds 0.7 (0: Casual, 1: Normal, 2: Competitive)")
 
 MACRO_CONFIG_STR(EcBindaddr, ec_bindaddr, 128, "localhost", CFGFLAG_ECON, "Address to bind the external console to. Anything but 'localhost' is dangerous")
-MACRO_CONFIG_INT(EcPort, ec_port, 0, 0, 0, CFGFLAG_ECON, "Port to use for the external console")
-MACRO_CONFIG_STR(EcPassword, ec_password, 128, "", CFGFLAG_ECON, "External console password")
+MACRO_CONFIG_INT(EcPort, ec_port, 0, 0, 65535, CFGFLAG_ECON, "Port to use for the external console")
+MACRO_CONFIG_STR(EcPassword, ec_password, 128, "", CFGFLAG_ECON, "External console password. This option is required to be set for econ to be enabled.")
 MACRO_CONFIG_INT(EcBantime, ec_bantime, 0, 0, 1440, CFGFLAG_ECON, "The time a client gets banned if econ authentication fails. 0 just closes the connection")
 MACRO_CONFIG_INT(EcAuthTimeout, ec_auth_timeout, 30, 1, 120, CFGFLAG_ECON, "Time in seconds before the the econ authentication times out")
 MACRO_CONFIG_INT(EcOutputLevel, ec_output_level, 0, -3, 2, CFGFLAG_ECON, "Adjusts the amount of information in the external console (-3 = none, -2 = error only, -1 = warn, 0 = info, 1 = debug, 2 = trace)")
@@ -424,7 +476,7 @@ MACRO_CONFIG_STR(DbgStressServer, dbg_stress_server, 32, "localhost", CFGFLAG_CL
 MACRO_CONFIG_INT(HttpAllowInsecure, http_allow_insecure, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SERVER, "Allow insecure HTTP protocol in addition to the secure HTTPS one. Mostly useful for testing.")
 
 // DDRace
-MACRO_CONFIG_STR(SvWelcome, sv_welcome, 64, "", CFGFLAG_SERVER, "Message that will be displayed to players who join the server")
+MACRO_CONFIG_STR(SvWelcome, sv_welcome, 256, "", CFGFLAG_SERVER, "Message that will be displayed to players who join the server")
 MACRO_CONFIG_INT(SvReservedSlots, sv_reserved_slots, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "The number of slots that are reserved for special players")
 MACRO_CONFIG_STR(SvReservedSlotsPass, sv_reserved_slots_pass, 256, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "The password that is required to use a reserved slot")
 MACRO_CONFIG_INT(SvReservedSlotsAuthLevel, sv_reserved_slots_auth_level, 1, 1, 4, CFGFLAG_SERVER, "Minimum rcon auth level needed to use a reserved slot. 4 = rcon auth disabled")
@@ -452,13 +504,13 @@ MACRO_CONFIG_INT(SvEyeEmoteChangeDelay, sv_eye_emote_change_delay, 1, 0, 9999, C
 MACRO_CONFIG_INT(SvChatDelay, sv_chat_delay, 1, 0, 9999, CFGFLAG_SERVER, "The time in seconds between chat messages")
 MACRO_CONFIG_INT(SvTeamChangeDelay, sv_team_change_delay, 3, 0, 9999, CFGFLAG_SERVER, "The time in seconds between team changes (spectator/in game)")
 MACRO_CONFIG_INT(SvInfoChangeDelay, sv_info_change_delay, 5, 0, 9999, CFGFLAG_SERVER, "The time in seconds between info changes (name/skin/color), to avoid ranbow mod set this to a very high time")
-MACRO_CONFIG_INT(SvVoteTime, sv_vote_time, 25, 1, 9999, CFGFLAG_SERVER, "The time in seconds a vote lasts")
+MACRO_CONFIG_INT(SvVoteTime, sv_vote_time, 25, 1, 60, CFGFLAG_SERVER, "The time in seconds a vote lasts")
 MACRO_CONFIG_INT(SvVoteMapTimeDelay, sv_vote_map_delay, 0, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between map votes")
 MACRO_CONFIG_INT(SvVoteDelay, sv_vote_delay, 3, 0, 9999, CFGFLAG_SERVER, "The time in seconds between any vote")
 MACRO_CONFIG_INT(SvVoteKickDelay, sv_vote_kick_delay, 0, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between kick votes")
-MACRO_CONFIG_INT(SvVoteYesPercentage, sv_vote_yes_percentage, 50, 1, 100, CFGFLAG_SERVER, "The percent of people that need to agree or deny for the vote to succeed/fail")
-MACRO_CONFIG_INT(SvVoteMajority, sv_vote_majority, 0, 0, 1, CFGFLAG_SERVER, "Whether No. of Yes is compared to No. of No votes or to number of total Players ( Default is 0 Y compare N)")
-MACRO_CONFIG_INT(SvVoteMaxTotal, sv_vote_max_total, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "How many people can participate in a vote at max (0 = no limit by default)")
+MACRO_CONFIG_INT(SvVoteYesPercentage, sv_vote_yes_percentage, 50, 1, 99, CFGFLAG_SERVER, "More than this percentage of players need to agree for a vote to succeed")
+MACRO_CONFIG_INT(SvVoteMajority, sv_vote_majority, 0, 0, 1, CFGFLAG_SERVER, "Whether non-voting players are considered as votes for \"no\" (0) or are ignored (1)")
+MACRO_CONFIG_INT(SvVoteMaxTotal, sv_vote_max_total, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "How many players can participate in a vote at max (0 = no limit)")
 MACRO_CONFIG_INT(SvVoteVetoTime, sv_vote_veto_time, 20, 0, 1000, CFGFLAG_SERVER, "Minutes of time on a server until a player can veto map change votes (0 = disabled)")
 MACRO_CONFIG_INT(SvKillDelay, sv_kill_delay, 1, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between kills")
 
@@ -474,7 +526,8 @@ MACRO_CONFIG_INT(SvSaveSwapGamesDelay, sv_saveswapgames_delay, 30, 0, 10000, CFG
 MACRO_CONFIG_INT(SvSaveSwapGamesPenalty, sv_saveswapgames_penalty, 60, 0, 10000, CFGFLAG_SERVER, "Penalty in seconds for saving or swapping position")
 MACRO_CONFIG_INT(SvSwapTimeout, sv_swap_timeout, 180, 0, 10000, CFGFLAG_SERVER, "Timeout in seconds before option to swap expires")
 MACRO_CONFIG_INT(SvSwap, sv_swap, 1, 0, 1, CFGFLAG_SERVER, "Enable /swap")
-MACRO_CONFIG_INT(SvUseSQL, sv_use_sql, 0, 0, 1, CFGFLAG_SERVER, "Enables MySQL backend instead of SQLite backend (sv_sqlite_file is still used as fallback write server when no MySQL server is reachable)")
+MACRO_CONFIG_INT(SvTeam0Mode, sv_team0mode, 1, 0, 1, CFGFLAG_SERVER, "Enables /team0mode")
+MACRO_CONFIG_INT(SvUseSql, sv_use_sql, 0, 0, 1, CFGFLAG_SERVER, "Enables MySQL backend instead of SQLite backend (sv_sqlite_file is still used as fallback write server when no MySQL server is reachable)")
 MACRO_CONFIG_INT(SvSqlQueriesDelay, sv_sql_queries_delay, 1, 0, 20, CFGFLAG_SERVER, "Delay in seconds between SQL queries of a single player")
 MACRO_CONFIG_STR(SvSqliteFile, sv_sqlite_file, 64, "ddnet-server.sqlite", CFGFLAG_SERVER, "File to store ranks in case sv_use_sql is turned off or used as backup sql server")
 
@@ -499,8 +552,8 @@ MACRO_CONFIG_INT(SvMinTeamSize, sv_min_team_size, 2, 1, MAX_CLIENTS, CFGFLAG_SER
 MACRO_CONFIG_INT(SvMaxTeamSize, sv_max_team_size, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER | CFGFLAG_GAME, "Maximum team size")
 MACRO_CONFIG_INT(SvMapVote, sv_map_vote, 1, 0, 1, CFGFLAG_SERVER, "Whether to allow /map")
 
-MACRO_CONFIG_STR(SvAnnouncementFileName, sv_announcement_filename, 24, "announcement.txt", CFGFLAG_SERVER, "file which will have the announcement, each one at a line")
-MACRO_CONFIG_INT(SvAnnouncementInterval, sv_announcement_interval, 300, 1, 9999, CFGFLAG_SERVER, "time(minutes) in which the announcement will be displayed from the announcement file")
+MACRO_CONFIG_STR(SvAnnouncementFileName, sv_announcement_filename, IO_MAX_PATH_LENGTH, "announcement.txt", CFGFLAG_SERVER, "File which contains the announcements, one on each line")
+MACRO_CONFIG_INT(SvAnnouncementInterval, sv_announcement_interval, 120, 1, 9999, CFGFLAG_SERVER, "The time (minutes) for how often an announcement will be displayed from the announcement file")
 MACRO_CONFIG_INT(SvAnnouncementRandom, sv_announcement_random, 1, 0, 1, CFGFLAG_SERVER, "Whether announcements are sequential or random")
 
 MACRO_CONFIG_INT(SvOldLaser, sv_old_laser, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether lasers can hit you if you shot them and that they pull you towards the bounce origin (0 for all new maps) or lasers can't hit you if you shot them, and they pull others towards the shooter")
@@ -533,14 +586,13 @@ MACRO_CONFIG_COL(ClMessageFriendColor, cl_message_friend_color, 65425, CFGFLAG_C
 
 MACRO_CONFIG_INT(ConnTimeout, conn_timeout, 100, 5, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Network timeout")
 MACRO_CONFIG_INT(ConnTimeoutProtection, conn_timeout_protection, 1000, 5, 10000, CFGFLAG_SERVER, "Network timeout protection")
-MACRO_CONFIG_INT(ClShowIDs, cl_show_ids, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show client ids in scoreboard")
+MACRO_CONFIG_INT(ClShowIds, cl_show_ids, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show client IDs in scoreboard, chat and spectator menu")
 MACRO_CONFIG_INT(ClScoreboardOnDeath, cl_scoreboard_on_death, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show scoreboard after death or not")
 MACRO_CONFIG_INT(ClAutoRaceRecord, cl_auto_race_record, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save the best demo of each race")
 MACRO_CONFIG_INT(ClReplays, cl_replays, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable/disable replays")
 MACRO_CONFIG_INT(ClReplayLength, cl_replay_length, 30, 10, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Set the default length of the replays")
 MACRO_CONFIG_INT(ClRaceRecordServerControl, cl_race_record_server_control, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Let the server start the race recorder")
 MACRO_CONFIG_INT(ClDemoName, cl_demo_name, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save the player name within the demo")
-MACRO_CONFIG_INT(ClDemoAssumeRace, cl_demo_assume_race, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Assume that demos are race demos")
 MACRO_CONFIG_INT(ClRaceGhost, cl_race_ghost, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable ghost")
 MACRO_CONFIG_INT(ClRaceGhostServerControl, cl_race_ghost_server_control, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Let the server start the ghost")
 MACRO_CONFIG_INT(ClRaceShowGhost, cl_race_show_ghost, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ghost")
@@ -549,7 +601,6 @@ MACRO_CONFIG_INT(ClRaceGhostStrictMap, cl_race_ghost_strict_map, 0, 0, 1, CFGFLA
 MACRO_CONFIG_INT(ClRaceGhostSaveBest, cl_race_ghost_save_best, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save only ghosts that are better than the previous record.")
 MACRO_CONFIG_INT(ClRaceGhostAlpha, cl_race_ghost_alpha, 40, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Visbility of ghosts (alpha value, 0 invisible, 100 fully visible)")
 
-MACRO_CONFIG_INT(ClDDRaceScoreBoard, cl_ddrace_scoreboard, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable DDRace Scoreboard")
 MACRO_CONFIG_INT(SvResetPickups, sv_reset_pickups, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether the weapons are reset on passing the start tile or not")
 MACRO_CONFIG_INT(ClShowOthers, cl_show_others, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show players in other teams (2 to show own team only)")
 MACRO_CONFIG_INT(ClShowOthersAlpha, cl_show_others_alpha, 40, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show players in other teams (alpha value, 0 invisible, 100 fully visible)")
@@ -557,7 +608,7 @@ MACRO_CONFIG_INT(ClOverlayEntities, cl_overlay_entities, 0, 0, 100, CFGFLAG_CLIE
 MACRO_CONFIG_INT(ClShowQuads, cl_showquads, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show quads (only interesting for mappers, or if your system has extremely bad performance)")
 MACRO_CONFIG_COL(ClBackgroundColor, cl_background_color, 128, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background color") // 0 0 128
 MACRO_CONFIG_COL(ClBackgroundEntitiesColor, cl_background_entities_color, 128, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background (entities) color") // 0 0 128
-MACRO_CONFIG_STR(ClBackgroundEntities, cl_background_entities, 100, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background (entities)")
+MACRO_CONFIG_STR(ClBackgroundEntities, cl_background_entities, IO_MAX_PATH_LENGTH, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background (entities)")
 MACRO_CONFIG_STR(ClRunOnJoin, cl_run_on_join, 100, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Command to run when joining a server")
 
 // menu background map
@@ -587,7 +638,7 @@ MACRO_CONFIG_INT(SvDefaultTimerType, sv_default_timer_type, 0, 0, 3, CFGFLAG_SER
 // these might need some fine tuning
 MACRO_CONFIG_INT(SvChatInitialDelay, sv_chat_initial_delay, 0, 0, 360, CFGFLAG_SERVER, "The time in seconds before the first message can be sent")
 MACRO_CONFIG_INT(SvChatPenalty, sv_chat_penalty, 250, 50, 1000, CFGFLAG_SERVER, "chat score will be increased by this on every message, and decremented by 1 on every tick.")
-MACRO_CONFIG_INT(SvChatThreshold, sv_chat_threshold, 1000, 50, 10000, CFGFLAG_SERVER, "if chats core exceeds this, the player will be muted for sv_spam_mute_duration seconds")
+MACRO_CONFIG_INT(SvChatThreshold, sv_chat_threshold, 1000, 50, 10000, CFGFLAG_SERVER, "if chats score exceeds this, the player will be muted for sv_spam_mute_duration seconds")
 MACRO_CONFIG_INT(SvSpamMuteDuration, sv_spam_mute_duration, 60, 0, 3600, CFGFLAG_SERVER, "how many seconds to mute, if player triggers mute on spam. 0 = off")
 
 MACRO_CONFIG_INT(SvShutdownWhenEmpty, sv_shutdown_when_empty, 0, 0, 1, CFGFLAG_SERVER, "Shutdown server as soon as no one is on it anymore")
@@ -622,9 +673,11 @@ MACRO_CONFIG_COL(ClHookCollColorNoColl, cl_hook_coll_color_no_coll, 65407, CFGFL
 MACRO_CONFIG_COL(ClHookCollColorHookableColl, cl_hook_coll_color_hookable_coll, 6401973, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies the color of a hookline that hits hookable tiles.")
 MACRO_CONFIG_COL(ClHookCollColorTeeColl, cl_hook_coll_color_tee_coll, 2817919, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies the color of a hookline that hits tees.")
 
-MACRO_CONFIG_INT(ClChatTeamColors, cl_chat_teamcolors, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show names in chat in team colors")
+MACRO_CONFIG_INT(ClChatTeamColors, cl_chat_teamcolors, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show names in chat in team colors")
 MACRO_CONFIG_INT(ClChatReset, cl_chat_reset, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Reset chat when pressing escape")
 MACRO_CONFIG_INT(ClChatOld, cl_chat_old, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Old chat style: No tee, no background")
+MACRO_CONFIG_INT(ClChatFontSize, cl_chat_size, 60, 10, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat font size")
+MACRO_CONFIG_INT(ClChatWidth, cl_chat_width, 200, 140, 400, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat width")
 
 MACRO_CONFIG_INT(ClShowDirection, cl_show_direction, 1, 0, 3, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show key presses (1 = other players', 2 = also your own, 3 = only your own")
 MACRO_CONFIG_INT(ClOldGunPosition, cl_old_gun_position, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Tees hold gun a bit higher like in TW 0.6.1 and older")
@@ -665,91 +718,20 @@ MACRO_CONFIG_INT(Gfx3DTextureAnalysisRan, gfx_3d_texture_analysis_ran, 0, 0, 1,
 MACRO_CONFIG_STR(Gfx3DTextureAnalysisRenderer, gfx_3d_texture_analysis_renderer, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The renderer on which the analysis was performed")
 MACRO_CONFIG_STR(Gfx3DTextureAnalysisVersion, gfx_3d_texture_analysis_version, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The version on which the analysis was performed")
 
-MACRO_CONFIG_STR(GfxGPUName, gfx_gpu_name, 256, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The GPU's name, which will be selected by the backend. (if supported by the backend)")
-#if !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
+MACRO_CONFIG_STR(GfxGpuName, gfx_gpu_name, 256, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The GPU's name, which will be selected by the backend. (if supported by the backend)")
+#if defined(CONF_PLATFORM_ANDROID)
+MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "GLES", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. GLES or Vulkan)")
+#elif !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
 MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "Vulkan", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
 #else
 MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "OpenGL", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
 #endif
-//sta
 MACRO_CONFIG_INT(GfxRenderThreadCount, gfx_render_thread_count, 3, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Number of threads the backend can use for rendering. (note: the value can be ignored by the backend)")
 
 MACRO_CONFIG_INT(GfxDriverIsBlocked, gfx_driver_is_blocked, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "If 1, the current driver is in a blocked error state.")
 
 MACRO_CONFIG_INT(ClVideoRecorderFPS, cl_video_recorder_fps, 60, 1, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "At which FPS the videorecorder should record demos.")
+
 /*
  * Add config variables for mods below this comment to avoid merge conflicts.
  */
-
-MACRO_CONFIG_INT(ClShowFrozenText, sc_frozen_tees_text, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show how many tees in your team are currently frozen. (0 - off, 1 - show alive, 2 - show frozen)")
-MACRO_CONFIG_INT(ClShowFrozenHud, sc_frozen_tees_hud, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show frozen tee HUD")
-MACRO_CONFIG_INT(ClShowFrozenHudSkins, sc_frozen_tees_hud_skins, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Use ninja skin, or darkened skin for frozen tees on hud")
-
-MACRO_CONFIG_INT(ClFrozenHudTeeSize, sc_frozen_tees_size, 15, 8, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of tees in frozen tee hud. (Default : 15)")
-MACRO_CONFIG_INT(ClFrozenMaxRows, sc_frozen_tees_max_rows, 1, 1, 6, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of rows in frozen tee HUD display")
-MACRO_CONFIG_INT(ClFrozenHudTeamOnly, sc_frozen_tees_only_inteam, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only render frozen tee HUD display while in team")
-
-MACRO_CONFIG_COL(ScPlayerOwnColor, sc_player_own_color, 6684927, CFGFLAG_CLIENT | CFGFLAG_SAVE, "You'r color in TAB list")
-MACRO_CONFIG_COL(ScLocalConsoleColor, sc_local_console_color, 51, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Local console color")
-MACRO_CONFIG_COL(ScConsoleBarColor, sc_console_bar_color, 8883654, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Console bar color")
-MACRO_CONFIG_COL(ScRemoteConsoleColor, sc_remote_console_color, 21837, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Remote console color")
-MACRO_CONFIG_INT(ClLocalConsolaAlpha, cl_local_console_alpha, 90, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of local console")
-MACRO_CONFIG_INT(ClRemoteConsolaAlpha, cl_remote_console_alpha, 90, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of remote console")
-
-MACRO_CONFIG_COL(ScBlacklistPColor, sc_blacklist_p_color, 65457, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Blacklist players color")
-MACRO_CONFIG_COL(ScFriendColor, sc_friend_color, 7995321, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friends color")
-MACRO_CONFIG_COL(ScFrozenTeeColor, sc_frozen_tee_color, 172, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Frozen tee color")
-
-MACRO_CONFIG_INT(ClApplyProfileSkin, sc_passet_skin, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply skin in profiles")
-MACRO_CONFIG_INT(ClApplyProfileName, sc_passet_name, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply name in profiles")
-MACRO_CONFIG_INT(ClApplyProfileClan, sc_passet_clan, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply clan in profiles")
-MACRO_CONFIG_INT(ClApplyProfileFlag, sc_passet_flag, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply flag in profiles")
-MACRO_CONFIG_INT(ClApplyProfileColors, sc_passet_colors, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply colors in profiles")
-MACRO_CONFIG_INT(ClApplyProfileEmote, sc_passet_emote, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply emote in profiles")
-//autolog
-MACRO_CONFIG_INT(ClAutoVerify, sc_auto_verify, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Auto verify")
-//chat size
-MACRO_CONFIG_INT(ClChatSize, sc_chat_size, 100, 10, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat sizer")
-//Chat pos
-MACRO_CONFIG_INT(ClChatPos, sc_chat_pos, 1, 1, 3, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat Position")
-//Anim
-MACRO_CONFIG_INT(ClAnimFeetSpeed, cl_anim_feet_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for feet")
-MACRO_CONFIG_INT(ClAnimHammerSpeed, cl_anim_hammer_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for hammer")
-MACRO_CONFIG_INT(ClAnimNinjaSpeed, cl_anim_ninja_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for ninja")
-MACRO_CONFIG_INT(ClAnimGunsSpeed, cl_anim_guns_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for guns(shotgun, gun, grenade, laser)")
-//nameplates rendr.
-MACRO_CONFIG_INT(ScShowFriendsNameplatesColor, sc_show_friends_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friend's Nameplates Color")
-MACRO_CONFIG_INT(ScShowBlacklistNameplaterColor, sc_show_blacklist_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Foe's Nameplates Color")
-MACRO_CONFIG_INT(ScShowFrozenNameplaterColor, sc_show_frozen_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Frozen tee Nameplates Color")
-
-MACRO_CONFIG_INT(ClChatFontSize, cl_chat_size, 60, 10, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat font size")
-MACRO_CONFIG_INT(ClChatWidth, cl_chat_width, 200, 140, 400, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat width")
-
-//Outline Variables
-MACRO_CONFIG_INT(ClOutline, sc_outline, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outlines")
-MACRO_CONFIG_INT(ClOutlineEntities, sc_outline_in_entities, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only show outlines in entities")
-MACRO_CONFIG_INT(ClOutlineFreeze, sc_outline_freeze, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around freeze and deep")
-MACRO_CONFIG_INT(ClOutlineUnFreeze, sc_outline_unfreeze, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around unfreeze and undeep")
-MACRO_CONFIG_INT(ClOutlineTele, sc_outline_tele, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around teleporters")
-MACRO_CONFIG_INT(ClOutlineSolid, sc_outline_solid, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around hook and unhook")
-MACRO_CONFIG_INT(ClOutlineWidth, sc_outline_width, 5, 1, 16, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(1-16) Width of freeze outline")
-MACRO_CONFIG_INT(ClOutlineAlpha, sc_outline_alpha, 50, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(0-100) Outline alpha")
-MACRO_CONFIG_INT(ClOutlineAlphaSolid, sc_outline_alpha_solid, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(0-100) Outline solids alpha")
-MACRO_CONFIG_COL(ClOutlineColorSolid, sc_outline_color_solid, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Solid outline color") //0 0 0
-MACRO_CONFIG_COL(ClOutlineColorFreeze, sc_outline_color_freeze, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Freeze outline color") //0 0 0
-MACRO_CONFIG_COL(ClOutlineColorTele, sc_outline_color_tele, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Tele outline color") //0 0 0
-MACRO_CONFIG_COL(ClOutlineColorUnfreeze, sc_outline_color_unfreeze, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Unfreeze outline color") //0 0 0
-
-MACRO_CONFIG_INT(ClRainbow, sc_rainbow, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow urself")
-MACRO_CONFIG_INT(ClRainbowSpeed, sc_rainbow_speed, 20, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow speed")
-MACRO_CONFIG_INT(ClRainbowEveryone, sc_rainbow_all, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow all")
-MACRO_CONFIG_INT(ClShowStateChangeCountdown, sc_stars, 1, 1, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow all")
-
-//tee skin name
-MACRO_CONFIG_INT(ClShowSkinName, sc_nameplates_skin_name, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
-MACRO_CONFIG_INT(ClConsoleSimple, sc_console_simple, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
-MACRO_CONFIG_INT(ClConsoleBarSimple, cl_consolebar_simple, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
-// Old ninja mode
-MACRO_CONFIG_INT(ClOldFreezeMode, cl_old_freeze_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "OldNinjaMode")
-MACRO_CONFIG_INT(ClFrozenWeapon, cl_frozen_weapon, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Give frozen tees their weapon")
-MACRO_CONFIG_INT(ClRainbowHook, cl_rainbow_hook, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "rainbow hook lmfao")
\ No newline at end of file
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index e20e2dae28..c7e0fb4d24 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -40,22 +40,26 @@ float CConsole::CResult::GetFloat(unsigned Index) const
 	return str_tofloat(m_apArgs[Index]);
 }
 
-ColorHSLA CConsole::CResult::GetColor(unsigned Index, bool Light) const
+std::optional<ColorHSLA> CConsole::CResult::GetColor(unsigned Index, float DarkestLighting) const
 {
 	if(Index >= m_NumArgs)
-		return ColorHSLA(0, 0, 0);
+		return std::nullopt;
 
 	const char *pStr = m_apArgs[Index];
 	if(str_isallnum(pStr) || ((pStr[0] == '-' || pStr[0] == '+') && str_isallnum(pStr + 1))) // Teeworlds Color (Packed HSL)
 	{
-		const ColorHSLA Hsla = ColorHSLA(str_toulong_base(pStr, 10), true);
-		if(Light)
-			return Hsla.UnclampLighting();
-		return Hsla;
+		unsigned long Value = str_toulong_base(pStr, 10);
+		if(Value == std::numeric_limits<unsigned long>::max())
+			return std::nullopt;
+		return ColorHSLA(Value, true).UnclampLighting(DarkestLighting);
 	}
 	else if(*pStr == '$') // Hex RGB/RGBA
 	{
-		return color_cast<ColorHSLA>(color_parse<ColorRGBA>(pStr + 1).value_or(ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
+		auto ParsedColor = color_parse<ColorRGBA>(pStr + 1);
+		if(ParsedColor)
+			return color_cast<ColorHSLA>(ParsedColor.value());
+		else
+			return std::nullopt;
 	}
 	else if(!str_comp_nocase(pStr, "red"))
 		return ColorHSLA(0.0f / 6.0f, 1, .5f);
@@ -76,7 +80,7 @@ ColorHSLA CConsole::CResult::GetColor(unsigned Index, bool Light) const
 	else if(!str_comp_nocase(pStr, "black"))
 		return ColorHSLA(0, 0, 0);
 
-	return ColorHSLA(0, 0, 0);
+	return std::nullopt;
 }
 
 const IConsole::CCommandInfo *CConsole::CCommand::NextCommandInfo(int AccessLevel, int FlagMask) const
@@ -129,12 +133,12 @@ int CConsole::ParseStart(CResult *pResult, const char *pString, int Length)
 	return 0;
 }
 
-int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
+int CConsole::ParseArgs(CResult *pResult, const char *pFormat, bool IsColor)
 {
 	char Command = *pFormat;
 	char *pStr;
 	int Optional = 0;
-	int Error = 0;
+	int Error = PARSEARGS_OK;
 
 	pResult->ResetVictim();
 
@@ -155,7 +159,7 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
 			{
 				if(!Optional)
 				{
-					Error = 1;
+					Error = PARSEARGS_MISSING_VALUE;
 					break;
 				}
 
@@ -191,7 +195,7 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
 							pStr++; // skip due to escape
 					}
 					else if(pStr[0] == 0)
-						return 1; // return error
+						return PARSEARGS_MISSING_VALUE; // return error
 
 					*pDst = *pStr;
 					pDst++;
@@ -215,13 +219,7 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
 
 				if(Command == 'r') // rest of the string
 					break;
-				else if(Command == 'v') // validate victim
-					pStr = str_skip_to_whitespace(pStr);
-				else if(Command == 'i') // validate int
-					pStr = str_skip_to_whitespace(pStr);
-				else if(Command == 'f') // validate float
-					pStr = str_skip_to_whitespace(pStr);
-				else if(Command == 's') // validate string
+				else if(Command == 'v' || Command == 'i' || Command == 'f' || Command == 's')
 					pStr = str_skip_to_whitespace(pStr);
 
 				if(pStr[0] != 0) // check for end of string
@@ -230,6 +228,32 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
 					pStr++;
 				}
 
+				// validate args
+				if(Command == 'i')
+				{
+					// don't validate colors here
+					if(!IsColor)
+					{
+						int Value;
+						if(!str_toint(pResult->GetString(pResult->NumArguments() - 1), &Value) ||
+							Value == std::numeric_limits<int>::max() || Value == std::numeric_limits<int>::min())
+						{
+							Error = PARSEARGS_INVALID_INTEGER;
+							break;
+						}
+					}
+				}
+				else if(Command == 'f')
+				{
+					float Value;
+					if(!str_tofloat(pResult->GetString(pResult->NumArguments() - 1), &Value) ||
+						Value == std::numeric_limits<float>::max() || Value == std::numeric_limits<float>::min())
+					{
+						Error = PARSEARGS_INVALID_FLOAT;
+						break;
+					}
+				}
+
 				if(pVictim)
 				{
 					pResult->SetVictim(pVictim);
@@ -314,7 +338,7 @@ void CConsole::Print(int Level, const char *pFrom, const char *pStr, ColorRGBA P
 {
 	LEVEL LogLevel = IConsole::ToLogLevel(Level);
 	// if console colors are not enabled or if the color is pure white, use default terminal color
-	if(g_Config.m_ConsoleEnableColors && mem_comp(&PrintColor, &gs_ConsoleDefaultColor, sizeof(ColorRGBA)) != 0)
+	if(g_Config.m_ConsoleEnableColors && PrintColor != gs_ConsoleDefaultColor)
 	{
 		log_log_color(LogLevel, ColorToLogColor(PrintColor), pFrom, "%s", pStr);
 	}
@@ -402,7 +426,7 @@ bool CConsole::LineIsValid(const char *pStr)
 	return true;
 }
 
-void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bool InterpretSemicolons)
+void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientId, bool InterpretSemicolons)
 {
 	const char *pWithoutPrefix = str_startswith(pStr, "mc;");
 	if(pWithoutPrefix)
@@ -413,7 +437,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 	while(pStr && *pStr)
 	{
 		CResult Result;
-		Result.m_ClientID = ClientID;
+		Result.m_ClientId = ClientId;
 		const char *pEnd = pStr;
 		const char *pNextPart = 0;
 		int InString = 0;
@@ -448,14 +472,14 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 			return;
 
 		CCommand *pCommand;
-		if(ClientID == IConsole::CLIENT_ID_GAME)
+		if(ClientId == IConsole::CLIENT_ID_GAME)
 			pCommand = FindCommand(Result.m_pCommand, m_FlagMask | CFGFLAG_GAME);
 		else
 			pCommand = FindCommand(Result.m_pCommand, m_FlagMask);
 
 		if(pCommand)
 		{
-			if(ClientID == IConsole::CLIENT_ID_GAME && !(pCommand->m_Flags & CFGFLAG_GAME))
+			if(ClientId == IConsole::CLIENT_ID_GAME && !(pCommand->m_Flags & CFGFLAG_GAME))
 			{
 				if(Stroke)
 				{
@@ -464,7 +488,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 					Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
 				}
 			}
-			else if(ClientID == IConsole::CLIENT_ID_NO_GAME && pCommand->m_Flags & CFGFLAG_GAME)
+			else if(ClientId == IConsole::CLIENT_ID_NO_GAME && pCommand->m_Flags & CFGFLAG_GAME)
 			{
 				if(Stroke)
 				{
@@ -487,10 +511,15 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 
 				if(Stroke || IsStrokeCommand)
 				{
-					if(ParseArgs(&Result, pCommand->m_pParams))
+					if(int Error = ParseArgs(&Result, pCommand->m_pParams, pCommand->m_pfnCallback == &SColorConfigVariable::CommandCallback))
 					{
-						char aBuf[TEMPCMD_NAME_LENGTH + TEMPCMD_PARAMS_LENGTH + 32];
-						str_format(aBuf, sizeof(aBuf), "Invalid arguments. Usage: %s %s", pCommand->m_pName, pCommand->m_pParams);
+						char aBuf[CMDLINE_LENGTH + 64];
+						if(Error == PARSEARGS_INVALID_INTEGER)
+							str_format(aBuf, sizeof(aBuf), "%s is not a valid integer.", Result.GetString(Result.NumArguments() - 1));
+						else if(Error == PARSEARGS_INVALID_FLOAT)
+							str_format(aBuf, sizeof(aBuf), "%s is not a valid decimal number.", Result.GetString(Result.NumArguments() - 1));
+						else
+							str_format(aBuf, sizeof(aBuf), "Invalid arguments. Usage: %s %s", pCommand->m_pName, pCommand->m_pParams);
 						Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 					}
 					else if(m_StoreCommands && pCommand->m_Flags & CFGFLAG_STORE)
@@ -502,15 +531,18 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 					else
 					{
 						if(pCommand->m_Flags & CMDFLAG_TEST && !g_Config.m_SvTestingCommands)
+						{
+							Print(OUTPUT_LEVEL_STANDARD, "console", "Test commands aren't allowed, enable them with 'sv_test_cmds 1' in your initial config.");
 							return;
+						}
 
 						if(m_pfnTeeHistorianCommandCallback && !(pCommand->m_Flags & CFGFLAG_NONTEEHISTORIC))
 						{
-							m_pfnTeeHistorianCommandCallback(ClientID, m_FlagMask, pCommand->m_pName, &Result, m_pTeeHistorianCommandUserdata);
+							m_pfnTeeHistorianCommandCallback(ClientId, m_FlagMask, pCommand->m_pName, &Result, m_pTeeHistorianCommandUserdata);
 						}
 
 						if(Result.GetVictim() == CResult::VICTIM_ME)
-							Result.SetVictim(ClientID);
+							Result.SetVictim(ClientId);
 
 						if(Result.HasVictim() && Result.GetVictim() == CResult::VICTIM_ALL)
 						{
@@ -544,7 +576,10 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bo
 			if(!m_pfnUnknownCommandCallback(pStr, m_pUnknownCommandUserdata))
 			{
 				char aBuf[CMDLINE_LENGTH + 32];
-				str_format(aBuf, sizeof(aBuf), "No such command: %s.", Result.m_pCommand);
+				if(m_FlagMask & CFGFLAG_CHAT)
+					str_format(aBuf, sizeof(aBuf), "No such command: %s. Use /cmdlist for a list of all commands.", Result.m_pCommand);
+				else
+					str_format(aBuf, sizeof(aBuf), "No such command: %s.", Result.m_pCommand);
 				Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 			}
 		}
@@ -584,21 +619,21 @@ CConsole::CCommand *CConsole::FindCommand(const char *pName, int FlagMask)
 	return 0x0;
 }
 
-void CConsole::ExecuteLine(const char *pStr, int ClientID, bool InterpretSemicolons)
+void CConsole::ExecuteLine(const char *pStr, int ClientId, bool InterpretSemicolons)
 {
-	CConsole::ExecuteLineStroked(1, pStr, ClientID, InterpretSemicolons); // press it
-	CConsole::ExecuteLineStroked(0, pStr, ClientID, InterpretSemicolons); // then release it
+	CConsole::ExecuteLineStroked(1, pStr, ClientId, InterpretSemicolons); // press it
+	CConsole::ExecuteLineStroked(0, pStr, ClientId, InterpretSemicolons); // then release it
 }
 
-void CConsole::ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID, bool InterpretSemicolons)
+void CConsole::ExecuteLineFlag(const char *pStr, int FlagMask, int ClientId, bool InterpretSemicolons)
 {
 	int Temp = m_FlagMask;
 	m_FlagMask = FlagMask;
-	ExecuteLine(pStr, ClientID, InterpretSemicolons);
+	ExecuteLine(pStr, ClientId, InterpretSemicolons);
 	m_FlagMask = Temp;
 }
 
-bool CConsole::ExecuteFile(const char *pFilename, int ClientID, bool LogFailure, int StorageType)
+bool CConsole::ExecuteFile(const char *pFilename, int ClientId, bool LogFailure, int StorageType)
 {
 	// make sure that this isn't being executed already
 	for(CExecFile *pCur = m_pFirstExec; pCur; pCur = pCur->m_pPrev)
@@ -616,23 +651,19 @@ bool CConsole::ExecuteFile(const char *pFilename, int ClientID, bool LogFailure,
 	m_pFirstExec = &ThisFile;
 
 	// exec the file
-	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, StorageType);
-
+	CLineReader LineReader;
 	bool Success = false;
 	char aBuf[32 + IO_MAX_PATH_LENGTH];
-	if(File)
+	if(LineReader.OpenFile(m_pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType)))
 	{
 		str_format(aBuf, sizeof(aBuf), "executing '%s'", pFilename);
 		Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
 
-		CLineReader Reader;
-		Reader.Init(File);
-
-		char *pLine;
-		while((pLine = Reader.Get()))
-			ExecuteLine(pLine, ClientID);
+		while(const char *pLine = LineReader.Get())
+		{
+			ExecuteLine(pLine, ClientId);
+		}
 
-		io_close(File);
 		Success = true;
 	}
 	else if(LogFailure)
@@ -727,10 +758,10 @@ void CConsole::ConUserCommandStatus(IResult *pResult, void *pUser)
 	CResult Result;
 	Result.m_pCommand = "access_status";
 	char aBuf[4];
-	str_from_int((int)IConsole::ACCESS_LEVEL_USER, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", (int)IConsole::ACCESS_LEVEL_USER);
 	Result.AddArgument(aBuf);
 
-	pConsole->ConCommandStatus(&Result, pConsole);
+	CConsole::ConCommandStatus(&Result, pConsole);
 }
 
 void CConsole::TraverseChain(FCommandCallback *ppfnCallback, void **ppUserData)
diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h
index 339b521ce6..9a40dd3d15 100644
--- a/src/engine/shared/console.h
+++ b/src/engine/shared/console.h
@@ -61,7 +61,7 @@ class CConsole : public IConsole
 	static void ConCommandAccess(IResult *pResult, void *pUser);
 	static void ConCommandStatus(IConsole::IResult *pResult, void *pUser);
 
-	void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) override;
+	void ExecuteLineStroked(int Stroke, const char *pStr, int ClientId = -1, bool InterpretSemicolons = true) override;
 
 	FTeeHistorianCommandCallback m_pfnTeeHistorianCommandCallback;
 	void *m_pTeeHistorianCommandUserdata;
@@ -115,7 +115,7 @@ class CConsole : public IConsole
 		const char *GetString(unsigned Index) const override;
 		int GetInteger(unsigned Index) const override;
 		float GetFloat(unsigned Index) const override;
-		ColorHSLA GetColor(unsigned Index, bool Light) const override;
+		std::optional<ColorHSLA> GetColor(unsigned Index, float DarkestLighting) const override;
 
 		void RemoveArgument(unsigned Index) override
 		{
@@ -144,7 +144,16 @@ class CConsole : public IConsole
 	};
 
 	int ParseStart(CResult *pResult, const char *pString, int Length);
-	int ParseArgs(CResult *pResult, const char *pFormat);
+
+	enum
+	{
+		PARSEARGS_OK = 0,
+		PARSEARGS_MISSING_VALUE,
+		PARSEARGS_INVALID_INTEGER,
+		PARSEARGS_INVALID_FLOAT,
+	};
+
+	int ParseArgs(CResult *pResult, const char *pFormat, bool IsColor = false);
 
 	/*
 	this function will set pFormat to the next parameter (i,s,r,v,?) it contains and
@@ -207,9 +216,9 @@ class CConsole : public IConsole
 	void StoreCommands(bool Store) override;
 
 	bool LineIsValid(const char *pStr) override;
-	void ExecuteLine(const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) override;
-	void ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID = -1, bool InterpretSemicolons = true) override;
-	bool ExecuteFile(const char *pFilename, int ClientID = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) override;
+	void ExecuteLine(const char *pStr, int ClientId = -1, bool InterpretSemicolons = true) override;
+	void ExecuteLineFlag(const char *pStr, int FlagMask, int ClientId = -1, bool InterpretSemicolons = true) override;
+	bool ExecuteFile(const char *pFilename, int ClientId = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) override;
 
 	char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr) override;
 	void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor) const override;
diff --git a/src/engine/shared/datafile.cpp b/src/engine/shared/datafile.cpp
index 7714b4e77f..abcccedec4 100644
--- a/src/engine/shared/datafile.cpp
+++ b/src/engine/shared/datafile.cpp
@@ -14,6 +14,8 @@
 #include <cstdlib>
 #include <limits>
 
+#include <zlib.h>
+
 static const int DEBUG = 0;
 
 enum
@@ -51,13 +53,13 @@ struct CDatafileItemType
 
 struct CDatafileItem
 {
-	int m_TypeAndID;
+	int m_TypeAndId;
 	int m_Size;
 };
 
 struct CDatafileHeader
 {
-	char m_aID[4];
+	char m_aId[4];
 	int m_Version;
 	int m_Size;
 	int m_Swaplen;
@@ -70,7 +72,7 @@ struct CDatafileHeader
 	constexpr size_t SizeOffset()
 	{
 		// The size of these members is not included in m_Size and m_Swaplen
-		return sizeof(m_aID) + sizeof(m_Version) + sizeof(m_Size) + sizeof(m_Swaplen);
+		return sizeof(m_aId) + sizeof(m_Version) + sizeof(m_Size) + sizeof(m_Swaplen);
 	}
 };
 
@@ -142,11 +144,11 @@ bool CDataFileReader::Open(class IStorage *pStorage, const char *pFilename, int
 		dbg_msg("datafile", "couldn't load header");
 		return false;
 	}
-	if(Header.m_aID[0] != 'A' || Header.m_aID[1] != 'T' || Header.m_aID[2] != 'A' || Header.m_aID[3] != 'D')
+	if(Header.m_aId[0] != 'A' || Header.m_aId[1] != 'T' || Header.m_aId[2] != 'A' || Header.m_aId[3] != 'D')
 	{
-		if(Header.m_aID[0] != 'D' || Header.m_aID[1] != 'A' || Header.m_aID[2] != 'T' || Header.m_aID[3] != 'A')
+		if(Header.m_aId[0] != 'D' || Header.m_aId[1] != 'A' || Header.m_aId[2] != 'T' || Header.m_aId[3] != 'A')
 		{
-			dbg_msg("datafile", "wrong signature. %x %x %x %x", Header.m_aID[0], Header.m_aID[1], Header.m_aID[2], Header.m_aID[3]);
+			dbg_msg("datafile", "wrong signature. %x %x %x %x", Header.m_aId[0], Header.m_aId[1], Header.m_aId[2], Header.m_aId[3]);
 			return false;
 		}
 	}
@@ -450,20 +452,27 @@ int CDataFileReader::GetItemSize(int Index) const
 	return m_pDataFile->m_Info.m_pItemOffsets[Index + 1] - m_pDataFile->m_Info.m_pItemOffsets[Index] - sizeof(CDatafileItem);
 }
 
-int CDataFileReader::GetExternalItemType(int InternalType)
+int CDataFileReader::GetExternalItemType(int InternalType, CUuid *pUuid)
 {
 	if(InternalType <= OFFSET_UUID_TYPE || InternalType == ITEMTYPE_EX)
 	{
+		if(pUuid)
+			*pUuid = UUID_ZEROED;
 		return InternalType;
 	}
 	int TypeIndex = FindItemIndex(ITEMTYPE_EX, InternalType);
 	if(TypeIndex < 0 || GetItemSize(TypeIndex) < (int)sizeof(CItemEx))
 	{
+		if(pUuid)
+			*pUuid = UUID_ZEROED;
 		return InternalType;
 	}
 	const CItemEx *pItemEx = (const CItemEx *)GetItem(TypeIndex);
+	CUuid Uuid = pItemEx->ToUuid();
+	if(pUuid)
+		*pUuid = Uuid;
 	// Propagate UUID_UNKNOWN, it doesn't hurt.
-	return g_UuidManager.LookupUuid(pItemEx->ToUuid());
+	return g_UuidManager.LookupUuid(Uuid);
 }
 
 int CDataFileReader::GetInternalItemType(int ExternalType)
@@ -481,35 +490,39 @@ int CDataFileReader::GetInternalItemType(int ExternalType)
 		{
 			continue;
 		}
-		int ID;
-		if(Uuid == ((const CItemEx *)GetItem(i, nullptr, &ID))->ToUuid())
+		int Id;
+		if(Uuid == ((const CItemEx *)GetItem(i, nullptr, &Id))->ToUuid())
 		{
-			return ID;
+			return Id;
 		}
 	}
 	return -1;
 }
 
-void *CDataFileReader::GetItem(int Index, int *pType, int *pID)
+void *CDataFileReader::GetItem(int Index, int *pType, int *pId, CUuid *pUuid)
 {
 	if(!m_pDataFile)
 	{
 		if(pType)
 			*pType = 0;
-		if(pID)
-			*pID = 0;
+		if(pId)
+			*pId = 0;
+		if(pUuid)
+			*pUuid = UUID_ZEROED;
 		return nullptr;
 	}
 
 	CDatafileItem *pItem = (CDatafileItem *)(m_pDataFile->m_Info.m_pItemStart + m_pDataFile->m_Info.m_pItemOffsets[Index]);
+
+	// remove sign extension
+	const int Type = GetExternalItemType((pItem->m_TypeAndId >> 16) & 0xffff, pUuid);
 	if(pType)
 	{
-		// remove sign extension
-		*pType = GetExternalItemType((pItem->m_TypeAndID >> 16) & 0xffff);
+		*pType = Type;
 	}
-	if(pID)
+	if(pId)
 	{
-		*pID = pItem->m_TypeAndID & 0xffff;
+		*pId = pItem->m_TypeAndId & 0xffff;
 	}
 	return (void *)(pItem + 1);
 }
@@ -534,7 +547,7 @@ void CDataFileReader::GetType(int Type, int *pStart, int *pNum)
 	}
 }
 
-int CDataFileReader::FindItemIndex(int Type, int ID)
+int CDataFileReader::FindItemIndex(int Type, int Id)
 {
 	if(!m_pDataFile)
 	{
@@ -545,9 +558,9 @@ int CDataFileReader::FindItemIndex(int Type, int ID)
 	GetType(Type, &Start, &Num);
 	for(int i = 0; i < Num; i++)
 	{
-		int ItemID;
-		GetItem(Start + i, nullptr, &ItemID);
-		if(ID == ItemID)
+		int ItemId;
+		GetItem(Start + i, nullptr, &ItemId);
+		if(Id == ItemId)
 		{
 			return Start + i;
 		}
@@ -555,9 +568,9 @@ int CDataFileReader::FindItemIndex(int Type, int ID)
 	return -1;
 }
 
-void *CDataFileReader::FindItem(int Type, int ID)
+void *CDataFileReader::FindItem(int Type, int Id)
 {
-	int Index = FindItemIndex(Type, ID);
+	int Index = FindItemIndex(Type, Id);
 	if(Index < 0)
 	{
 		return nullptr;
@@ -643,42 +656,58 @@ int CDataFileWriter::GetTypeFromIndex(int Index) const
 	return ITEMTYPE_EX - Index - 1;
 }
 
-int CDataFileWriter::GetExtendedItemTypeIndex(int Type)
+int CDataFileWriter::GetExtendedItemTypeIndex(int Type, const CUuid *pUuid)
 {
 	int Index = 0;
-	for(int ExtendedItemType : m_vExtendedItemTypes)
+	if(Type == -1)
+	{
+		// Unknown type, search for UUID
+		for(const auto &ExtendedItemType : m_vExtendedItemTypes)
+		{
+			if(ExtendedItemType.m_Uuid == *pUuid)
+				return Index;
+			++Index;
+		}
+	}
+	else
 	{
-		if(ExtendedItemType == Type)
-			return Index;
-		++Index;
+		for(const auto &ExtendedItemType : m_vExtendedItemTypes)
+		{
+			if(ExtendedItemType.m_Type == Type)
+				return Index;
+			++Index;
+		}
 	}
 
 	// Type not found, add it.
-	m_vExtendedItemTypes.push_back(Type);
+	CExtendedItemType ExtendedType;
+	ExtendedType.m_Type = Type;
+	ExtendedType.m_Uuid = Type == -1 ? *pUuid : g_UuidManager.GetUuid(Type);
+	m_vExtendedItemTypes.push_back(ExtendedType);
 
-	CItemEx ExtendedType = CItemEx::FromUuid(g_UuidManager.GetUuid(Type));
-	AddItem(ITEMTYPE_EX, GetTypeFromIndex(Index), sizeof(ExtendedType), &ExtendedType);
+	CItemEx ItemEx = CItemEx::FromUuid(ExtendedType.m_Uuid);
+	AddItem(ITEMTYPE_EX, GetTypeFromIndex(Index), sizeof(ItemEx), &ItemEx);
 	return Index;
 }
 
-int CDataFileWriter::AddItem(int Type, int ID, size_t Size, const void *pData)
+int CDataFileWriter::AddItem(int Type, int Id, size_t Size, const void *pData, const CUuid *pUuid)
 {
-	dbg_assert((Type >= 0 && Type < MAX_ITEM_TYPES) || Type >= OFFSET_UUID, "Invalid type");
-	dbg_assert(ID >= 0 && ID <= ITEMTYPE_EX, "Invalid ID");
+	dbg_assert((Type >= 0 && Type < MAX_ITEM_TYPES) || Type >= OFFSET_UUID || (Type == -1 && pUuid != nullptr), "Invalid type");
+	dbg_assert(Id >= 0 && Id <= ITEMTYPE_EX, "Invalid ID");
 	dbg_assert(Size == 0 || pData != nullptr, "Data missing"); // Items without data are allowed
 	dbg_assert(Size <= (size_t)std::numeric_limits<int>::max(), "Data too large");
 	dbg_assert(Size % sizeof(int) == 0, "Invalid data boundary");
 
-	if(Type >= OFFSET_UUID)
+	if(Type == -1 || Type >= OFFSET_UUID)
 	{
-		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type));
+		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type, pUuid));
 	}
 
 	const int NumItems = m_vItems.size();
 	m_vItems.emplace_back();
 	CItemInfo &Info = m_vItems.back();
 	Info.m_Type = Type;
-	Info.m_ID = ID;
+	Info.m_Id = Id;
 	Info.m_Size = Size;
 
 	// copy data
@@ -705,7 +734,7 @@ int CDataFileWriter::AddItem(int Type, int ID, size_t Size, const void *pData)
 	return NumItems;
 }
 
-int CDataFileWriter::AddData(size_t Size, const void *pData, int CompressionLevel)
+int CDataFileWriter::AddData(size_t Size, const void *pData, ECompressionLevel CompressionLevel)
 {
 	dbg_assert(Size > 0 && pData != nullptr, "Data missing");
 	dbg_assert(Size <= (size_t)std::numeric_limits<int>::max(), "Data too large");
@@ -749,6 +778,20 @@ int CDataFileWriter::AddDataString(const char *pStr)
 	return AddData(str_length(pStr) + 1, pStr);
 }
 
+static int CompressionLevelToZlib(CDataFileWriter::ECompressionLevel CompressionLevel)
+{
+	switch(CompressionLevel)
+	{
+	case CDataFileWriter::COMPRESSION_DEFAULT:
+		return Z_DEFAULT_COMPRESSION;
+	case CDataFileWriter::COMPRESSION_BEST:
+		return Z_BEST_COMPRESSION;
+	default:
+		dbg_assert(false, "CompressionLevel invalid");
+		dbg_break();
+	}
+}
+
 void CDataFileWriter::Finish()
 {
 	dbg_assert((bool)m_File, "File not open");
@@ -759,7 +802,7 @@ void CDataFileWriter::Finish()
 	{
 		unsigned long CompressedSize = compressBound(DataInfo.m_UncompressedSize);
 		DataInfo.m_pCompressedData = malloc(CompressedSize);
-		const int Result = compress2((Bytef *)DataInfo.m_pCompressedData, &CompressedSize, (Bytef *)DataInfo.m_pUncompressedData, DataInfo.m_UncompressedSize, DataInfo.m_CompressionLevel);
+		const int Result = compress2((Bytef *)DataInfo.m_pCompressedData, &CompressedSize, (Bytef *)DataInfo.m_pUncompressedData, DataInfo.m_UncompressedSize, CompressionLevelToZlib(DataInfo.m_CompressionLevel));
 		DataInfo.m_CompressedSize = CompressedSize;
 		free(DataInfo.m_pUncompressedData);
 		DataInfo.m_pUncompressedData = nullptr;
@@ -808,10 +851,10 @@ void CDataFileWriter::Finish()
 	// Construct and write header
 	{
 		CDatafileHeader Header;
-		Header.m_aID[0] = 'D';
-		Header.m_aID[1] = 'A';
-		Header.m_aID[2] = 'T';
-		Header.m_aID[3] = 'A';
+		Header.m_aId[0] = 'D';
+		Header.m_aId[1] = 'A';
+		Header.m_aId[2] = 'T';
+		Header.m_aId[3] = 'A';
 		Header.m_Version = 4;
 		Header.m_Size = FileSize - Header.SizeOffset();
 		Header.m_Swaplen = SwapSize - Header.SizeOffset();
@@ -904,11 +947,11 @@ void CDataFileWriter::Finish()
 		for(int ItemIndex = m_aItemTypes[Type].m_First; ItemIndex != -1; ItemIndex = m_vItems[ItemIndex].m_Next)
 		{
 			CDatafileItem Item;
-			Item.m_TypeAndID = (Type << 16) | m_vItems[ItemIndex].m_ID;
+			Item.m_TypeAndId = (Type << 16) | m_vItems[ItemIndex].m_Id;
 			Item.m_Size = m_vItems[ItemIndex].m_Size;
 
 			if(DEBUG)
-				dbg_msg("datafile", "writing item. Type=%x ItemIndex=%d ID=%d Size=%d", Type, ItemIndex, m_vItems[ItemIndex].m_ID, m_vItems[ItemIndex].m_Size);
+				dbg_msg("datafile", "writing item. Type=%x ItemIndex=%d Id=%d Size=%d", Type, ItemIndex, m_vItems[ItemIndex].m_Id, m_vItems[ItemIndex].m_Size);
 
 #if defined(CONF_ARCH_ENDIAN_BIG)
 			swap_endian(&Item, sizeof(int), sizeof(Item) / sizeof(int));
diff --git a/src/engine/shared/datafile.h b/src/engine/shared/datafile.h
index db77ca41e4..f86b7c4d47 100644
--- a/src/engine/shared/datafile.h
+++ b/src/engine/shared/datafile.h
@@ -8,11 +8,11 @@
 #include <base/hash.h>
 #include <base/types.h>
 
+#include "uuid_manager.h"
+
 #include <array>
 #include <vector>
 
-#include <zlib.h>
-
 enum
 {
 	ITEMTYPE_EX = 0xffff,
@@ -25,7 +25,7 @@ class CDataFileReader
 	void *GetDataImpl(int Index, bool Swap);
 	int GetFileDataSize(int Index) const;
 
-	int GetExternalItemType(int InternalType);
+	int GetExternalItemType(int InternalType, CUuid *pUuid);
 	int GetInternalItemType(int ExternalType);
 
 public:
@@ -54,10 +54,10 @@ class CDataFileReader
 	int NumData() const;
 
 	int GetItemSize(int Index) const;
-	void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr);
+	void *GetItem(int Index, int *pType = nullptr, int *pId = nullptr, CUuid *pUuid = nullptr);
 	void GetType(int Type, int *pStart, int *pNum);
-	int FindItemIndex(int Type, int ID);
-	void *FindItem(int Type, int ID);
+	int FindItemIndex(int Type, int Id);
+	void *FindItem(int Type, int Id);
 	int NumItems() const;
 
 	SHA256_DIGEST Sha256() const;
@@ -68,19 +68,27 @@ class CDataFileReader
 // write access
 class CDataFileWriter
 {
+public:
+	enum ECompressionLevel
+	{
+		COMPRESSION_DEFAULT,
+		COMPRESSION_BEST,
+	};
+
+private:
 	struct CDataInfo
 	{
 		void *m_pUncompressedData;
 		int m_UncompressedSize;
 		void *m_pCompressedData;
 		int m_CompressedSize;
-		int m_CompressionLevel;
+		ECompressionLevel m_CompressionLevel;
 	};
 
 	struct CItemInfo
 	{
 		int m_Type;
-		int m_ID;
+		int m_Id;
 		int m_Size;
 		int m_Next;
 		int m_Prev;
@@ -94,6 +102,12 @@ class CDataFileWriter
 		int m_Last;
 	};
 
+	struct CExtendedItemType
+	{
+		int m_Type;
+		CUuid m_Uuid;
+	};
+
 	enum
 	{
 		MAX_ITEM_TYPES = 0x10000,
@@ -103,10 +117,10 @@ class CDataFileWriter
 	std::array<CItemTypeInfo, MAX_ITEM_TYPES> m_aItemTypes;
 	std::vector<CItemInfo> m_vItems;
 	std::vector<CDataInfo> m_vDatas;
-	std::vector<int> m_vExtendedItemTypes;
+	std::vector<CExtendedItemType> m_vExtendedItemTypes;
 
 	int GetTypeFromIndex(int Index) const;
-	int GetExtendedItemTypeIndex(int Type);
+	int GetExtendedItemTypeIndex(int Type, const CUuid *pUuid);
 
 public:
 	CDataFileWriter();
@@ -122,8 +136,8 @@ class CDataFileWriter
 	~CDataFileWriter();
 
 	bool Open(class IStorage *pStorage, const char *pFilename, int StorageType = IStorage::TYPE_SAVE);
-	int AddItem(int Type, int ID, size_t Size, const void *pData);
-	int AddData(size_t Size, const void *pData, int CompressionLevel = Z_DEFAULT_COMPRESSION);
+	int AddItem(int Type, int Id, size_t Size, const void *pData, const CUuid *pUuid = nullptr);
+	int AddData(size_t Size, const void *pData, ECompressionLevel CompressionLevel = COMPRESSION_DEFAULT);
 	int AddDataSwapped(size_t Size, const void *pData);
 	int AddDataString(const char *pStr);
 	void Finish();
diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 2eefe2b824..161e0d6cc1 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -62,18 +62,15 @@ int CDemoRecorder::Start(class IStorage *pStorage, class IConsole *pConsole, con
 {
 	dbg_assert(m_File == 0, "Demo recorder already recording");
 
-	m_pfnFilter = pfnFilter;
-	m_pUser = pUser;
-
-	m_pMapData = pMapData;
 	m_pConsole = pConsole;
+	m_pStorage = pStorage;
 
 	IOHANDLE DemoFile = pStorage->OpenFile(pFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
 	if(!DemoFile)
 	{
 		if(m_pConsole)
 		{
-			char aBuf[256];
+			char aBuf[64 + IO_MAX_PATH_LENGTH];
 			str_format(aBuf, sizeof(aBuf), "Unable to open '%s' for recording", pFilename);
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
 		}
@@ -186,6 +183,10 @@ int CDemoRecorder::Start(class IStorage *pStorage, class IConsole *pConsole, con
 		str_format(aBuf, sizeof(aBuf), "Recording to '%s'", pFilename);
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
 	}
+
+	m_pfnFilter = pfnFilter;
+	m_pUser = pUser;
+
 	m_File = DemoFile;
 	str_copy(m_aCurrentFilename, pFilename);
 
@@ -315,6 +316,8 @@ void CDemoRecorder::RecordSnapshot(int Tick, const void *pData, int Size)
 
 		// create delta
 		char aDeltaData[CSnapshot::MAX_SIZE + sizeof(int)];
+		m_pSnapshotDelta->SetStaticsize(protocol7::NETEVENTTYPE_SOUNDWORLD, true);
+		m_pSnapshotDelta->SetStaticsize(protocol7::NETEVENTTYPE_DAMAGE, true);
 		const int DeltaSize = m_pSnapshotDelta->CreateDelta((CSnapshot *)m_aLastSnapshotData, (CSnapshot *)pData, &aDeltaData);
 		if(DeltaSize)
 		{
@@ -337,33 +340,68 @@ void CDemoRecorder::RecordMessage(const void *pData, int Size)
 	Write(CHUNKTYPE_MESSAGE, pData, Size);
 }
 
-int CDemoRecorder::Stop()
+int CDemoRecorder::Stop(IDemoRecorder::EStopMode Mode, const char *pTargetFilename)
 {
 	if(!m_File)
 		return -1;
 
-	// add the demo length to the header
-	io_seek(m_File, gs_LengthOffset, IOSEEK_START);
-	unsigned char aLength[sizeof(int32_t)];
-	uint_to_bytes_be(aLength, Length());
-	io_write(m_File, aLength, sizeof(aLength));
-
-	// add the timeline markers to the header
-	io_seek(m_File, gs_NumMarkersOffset, IOSEEK_START);
-	unsigned char aNumMarkers[sizeof(int32_t)];
-	uint_to_bytes_be(aNumMarkers, m_NumTimelineMarkers);
-	io_write(m_File, aNumMarkers, sizeof(aNumMarkers));
-	for(int i = 0; i < m_NumTimelineMarkers; i++)
+	if(Mode == IDemoRecorder::EStopMode::KEEP_FILE)
 	{
-		unsigned char aMarker[sizeof(int32_t)];
-		uint_to_bytes_be(aMarker, m_aTimelineMarkers[i]);
-		io_write(m_File, aMarker, sizeof(aMarker));
+		// add the demo length to the header
+		io_seek(m_File, gs_LengthOffset, IOSEEK_START);
+		unsigned char aLength[sizeof(int32_t)];
+		uint_to_bytes_be(aLength, Length());
+		io_write(m_File, aLength, sizeof(aLength));
+
+		// add the timeline markers to the header
+		io_seek(m_File, gs_NumMarkersOffset, IOSEEK_START);
+		unsigned char aNumMarkers[sizeof(int32_t)];
+		uint_to_bytes_be(aNumMarkers, m_NumTimelineMarkers);
+		io_write(m_File, aNumMarkers, sizeof(aNumMarkers));
+		for(int i = 0; i < m_NumTimelineMarkers; i++)
+		{
+			unsigned char aMarker[sizeof(int32_t)];
+			uint_to_bytes_be(aMarker, m_aTimelineMarkers[i]);
+			io_write(m_File, aMarker, sizeof(aMarker));
+		}
 	}
 
 	io_close(m_File);
 	m_File = 0;
+
+	if(Mode == IDemoRecorder::EStopMode::REMOVE_FILE)
+	{
+		if(!m_pStorage->RemoveFile(m_aCurrentFilename, IStorage::TYPE_SAVE))
+		{
+			if(m_pConsole)
+			{
+				char aBuf[64 + IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "Could not remove demo file '%s'.", m_aCurrentFilename);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+			}
+			return -1;
+		}
+	}
+	else if(pTargetFilename[0] != '\0')
+	{
+		if(!m_pStorage->RenameFile(m_aCurrentFilename, pTargetFilename, IStorage::TYPE_SAVE))
+		{
+			if(m_pConsole)
+			{
+				char aBuf[64 + 2 * IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "Could not move demo file '%s' to '%s'.", m_aCurrentFilename, pTargetFilename);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+			}
+			return -1;
+		}
+	}
+
 	if(m_pConsole)
-		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Stopped recording", gs_DemoPrintColor);
+	{
+		char aBuf[64 + IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "Stopped recording to '%s'", m_aCurrentFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+	}
 
 	return 0;
 }
@@ -379,20 +417,34 @@ void CDemoRecorder::AddDemoMarker(int Tick)
 {
 	dbg_assert(Tick >= 0, "invalid marker tick");
 	if(m_NumTimelineMarkers >= MAX_TIMELINE_MARKERS)
+	{
+		if(m_pConsole)
+		{
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Too many timeline markers", gs_DemoPrintColor);
+		}
 		return;
+	}
 
 	// not more than 1 marker in a second
 	if(m_NumTimelineMarkers > 0)
 	{
-		int Diff = Tick - m_aTimelineMarkers[m_NumTimelineMarkers - 1];
+		const int Diff = Tick - m_aTimelineMarkers[m_NumTimelineMarkers - 1];
 		if(Diff < (float)SERVER_TICK_SPEED)
+		{
+			if(m_pConsole)
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Previous timeline marker too close", gs_DemoPrintColor);
+			}
 			return;
+		}
 	}
 
 	m_aTimelineMarkers[m_NumTimelineMarkers++] = Tick;
 
 	if(m_pConsole)
+	{
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Added timeline marker", gs_DemoPrintColor);
+	}
 }
 
 CDemoPlayer::CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo, TUpdateIntraTimesFunc &&UpdateIntraTimesFunc)
@@ -443,15 +495,15 @@ CDemoPlayer::EReadChunkHeaderResult CDemoPlayer::ReadChunkHeader(int *pType, int
 	if(Chunk & CHUNKTYPEFLAG_TICKMARKER)
 	{
 		// decode tick marker
-		int Tickdelta_legacy = Chunk & CHUNKMASK_TICK_LEGACY; // compatibility
+		int TickdeltaLegacy = Chunk & CHUNKMASK_TICK_LEGACY; // compatibility
 		*pType = Chunk & (CHUNKTYPEFLAG_TICKMARKER | CHUNKTICKFLAG_KEYFRAME);
 
 		int NewTick;
-		if(m_Info.m_Header.m_Version < gs_VersionTickCompression && Tickdelta_legacy != 0)
+		if(m_Info.m_Header.m_Version < gs_VersionTickCompression && TickdeltaLegacy != 0)
 		{
 			if(*pTick < 0) // initial tick not initialized before a tick delta
 				return CHUNKHEADER_ERROR;
-			NewTick = *pTick + Tickdelta_legacy;
+			NewTick = *pTick + TickdeltaLegacy;
 		}
 		else if(Chunk & CHUNKTICKFLAG_TICK_COMPRESSED)
 		{
@@ -615,7 +667,7 @@ void CDemoPlayer::DoTick()
 				break;
 			}
 
-			DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aCurrentSnapshotData, sizeof(m_aCurrentSnapshotData));
+			DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aChunkData, sizeof(m_aChunkData));
 			if(DataSize < 0)
 			{
 				Stop("Error during intpack decompression");
@@ -626,8 +678,8 @@ void CDemoPlayer::DoTick()
 		if(ChunkType == CHUNKTYPE_DELTA)
 		{
 			// process delta snapshot
-			CSnapshot *pNewsnap = (CSnapshot *)m_aDeltaSnapshotData;
-			DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aCurrentSnapshotData, DataSize);
+			CSnapshot *pNewsnap = (CSnapshot *)m_aSnapshot;
+			DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aChunkData, DataSize, IsSixup());
 
 			if(DataSize < 0)
 			{
@@ -650,17 +702,17 @@ void CDemoPlayer::DoTick()
 			else
 			{
 				if(m_pListener)
-					m_pListener->OnDemoPlayerSnapshot(m_aDeltaSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerSnapshot(m_aSnapshot, DataSize);
 
 				m_LastSnapshotDataSize = DataSize;
-				mem_copy(m_aLastSnapshotData, m_aDeltaSnapshotData, DataSize);
+				mem_copy(m_aLastSnapshotData, m_aSnapshot, DataSize);
 				GotSnapshot = true;
 			}
 		}
 		else if(ChunkType == CHUNKTYPE_SNAPSHOT)
 		{
 			// process full snapshot
-			CSnapshot *pSnap = (CSnapshot *)m_aCurrentSnapshotData;
+			CSnapshot *pSnap = (CSnapshot *)m_aChunkData;
 			if(!pSnap->IsValid(DataSize))
 			{
 				if(m_pConsole)
@@ -675,9 +727,9 @@ void CDemoPlayer::DoTick()
 				GotSnapshot = true;
 
 				m_LastSnapshotDataSize = DataSize;
-				mem_copy(m_aLastSnapshotData, m_aCurrentSnapshotData, DataSize);
+				mem_copy(m_aLastSnapshotData, m_aChunkData, DataSize);
 				if(m_pListener)
-					m_pListener->OnDemoPlayerSnapshot(m_aCurrentSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerSnapshot(m_aChunkData, DataSize);
 			}
 		}
 		else
@@ -698,7 +750,7 @@ void CDemoPlayer::DoTick()
 			else if(ChunkType == CHUNKTYPE_MESSAGE)
 			{
 				if(m_pListener)
-					m_pListener->OnDemoPlayerMessage(m_aCurrentSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerMessage(m_aChunkData, DataSize);
 			}
 		}
 	}
@@ -753,6 +805,7 @@ int CDemoPlayer::Load(class IStorage *pStorage, class IConsole *pConsole, const
 		str_copy(m_aFilename, "");
 		return -1;
 	}
+	m_Sixup = str_startswith(m_Info.m_Header.m_aNetversion, "0.7");
 
 	// save byte offset of map for later use
 	m_MapOffset = io_tell(m_File);
@@ -1167,19 +1220,18 @@ class CDemoRecordingListener : public CDemoPlayer::IListener
 	}
 };
 
-void CDemoEditor::Init(const char *pNetVersion, class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage)
+void CDemoEditor::Init(class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage)
 {
-	m_pNetVersion = pNetVersion;
 	m_pSnapshotDelta = pSnapshotDelta;
 	m_pConsole = pConsole;
 	m_pStorage = pStorage;
 }
 
-void CDemoEditor::Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser)
+bool CDemoEditor::Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser)
 {
 	CDemoPlayer DemoPlayer(m_pSnapshotDelta, false);
 	if(DemoPlayer.Load(m_pStorage, m_pConsole, pDemo, IStorage::TYPE_ALL_OR_ABSOLUTE) == -1)
-		return;
+		return false;
 
 	const CMapInfo *pMapInfo = DemoPlayer.GetMapInfo();
 	const CDemoPlayer::CPlaybackInfo *pInfo = DemoPlayer.Info();
@@ -1193,12 +1245,12 @@ void CDemoEditor::Slice(const char *pDemo, const char *pDst, int StartTick, int
 
 	CDemoRecorder DemoRecorder(m_pSnapshotDelta);
 	unsigned char *pMapData = DemoPlayer.GetMapData(m_pStorage);
-	const int Result = DemoRecorder.Start(m_pStorage, m_pConsole, pDst, m_pNetVersion, pMapInfo->m_aName, Sha256, pMapInfo->m_Crc, pInfo->m_Header.m_aType, pMapInfo->m_Size, pMapData, nullptr, pfnFilter, pUser) == -1;
+	const int Result = DemoRecorder.Start(m_pStorage, m_pConsole, pDst, pInfo->m_Header.m_aNetversion, pMapInfo->m_aName, Sha256, pMapInfo->m_Crc, pInfo->m_Header.m_aType, pMapInfo->m_Size, pMapData, nullptr, pfnFilter, pUser) == -1;
 	free(pMapData);
 	if(Result != 0)
 	{
 		DemoPlayer.Stop();
-		return;
+		return false;
 	}
 
 	CDemoRecordingListener Listener;
@@ -1229,5 +1281,6 @@ void CDemoEditor::Slice(const char *pDemo, const char *pDst, int StartTick, int
 	}
 
 	DemoPlayer.Stop();
-	DemoRecorder.Stop();
+	DemoRecorder.Stop(IDemoRecorder::EStopMode::KEEP_FILE);
+	return true;
 }
diff --git a/src/engine/shared/demo.h b/src/engine/shared/demo.h
index 0544f41786..0230e60239 100644
--- a/src/engine/shared/demo.h
+++ b/src/engine/shared/demo.h
@@ -18,17 +18,21 @@ typedef std::function<void()> TUpdateIntraTimesFunc;
 class CDemoRecorder : public IDemoRecorder
 {
 	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+
 	IOHANDLE m_File;
 	char m_aCurrentFilename[IO_MAX_PATH_LENGTH];
 	int m_LastTickMarker;
 	int m_LastKeyFrame;
 	int m_FirstTick;
+
 	unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
 	class CSnapshotDelta *m_pSnapshotDelta;
+
 	int m_NumTimelineMarkers;
 	int m_aTimelineMarkers[MAX_TIMELINE_MARKERS];
+
 	bool m_NoMapData;
-	unsigned char *m_pMapData;
 
 	DEMOFUNC_FILTER m_pfnFilter;
 	void *m_pUser;
@@ -41,8 +45,8 @@ class CDemoRecorder : public IDemoRecorder
 	CDemoRecorder() {}
 	~CDemoRecorder() override;
 
-	int Start(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, const char *pNetversion, const char *pMap, const SHA256_DIGEST &Sha256, unsigned MapCrc, const char *pType, unsigned MapSize, unsigned char *pMapData, IOHANDLE MapFile = nullptr, DEMOFUNC_FILTER pfnFilter = nullptr, void *pUser = nullptr);
-	int Stop() override;
+	int Start(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, const char *pNetversion, const char *pMap, const SHA256_DIGEST &Sha256, unsigned MapCrc, const char *pType, unsigned MapSize, unsigned char *pMapData, IOHANDLE MapFile, DEMOFUNC_FILTER pfnFilter, void *pUser);
+	int Stop(IDemoRecorder::EStopMode Mode, const char *pTargetFilename = "") override;
 
 	void AddDemoMarker();
 	void AddDemoMarker(int Tick);
@@ -51,8 +55,7 @@ class CDemoRecorder : public IDemoRecorder
 	void RecordMessage(const void *pData, int Size);
 
 	bool IsRecording() const override { return m_File != nullptr; }
-	char *GetCurrentFilename() override { return m_aCurrentFilename; }
-	void ClearCurrentFilename() { m_aCurrentFilename[0] = '\0'; }
+	const char *CurrentFilename() const override { return m_aCurrentFilename; }
 
 	int Length() const override { return (m_LastTickMarker - m_FirstTick) / SERVER_TICK_SPEED; }
 };
@@ -115,8 +118,13 @@ class CDemoPlayer : public IDemoPlayer
 	CPlaybackInfo m_Info;
 	unsigned char m_aCompressedSnapshotData[CSnapshot::MAX_SIZE];
 	unsigned char m_aDecompressedSnapshotData[CSnapshot::MAX_SIZE];
-	unsigned char m_aCurrentSnapshotData[CSnapshot::MAX_SIZE];
-	unsigned char m_aDeltaSnapshotData[CSnapshot::MAX_SIZE];
+
+	// Depending on the chunk header
+	// this is either a full CSnapshot or a CSnapshotDelta.
+	unsigned char m_aChunkData[CSnapshot::MAX_SIZE];
+	// Storage for the full snapshot
+	// where the delta gets unpacked into.
+	unsigned char m_aSnapshot[CSnapshot::MAX_SIZE];
 	unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
 	int m_LastSnapshotDataSize;
 	class CSnapshotDelta *m_pSnapshotDelta;
@@ -137,6 +145,7 @@ class CDemoPlayer : public IDemoPlayer
 	bool ScanFile();
 
 	int64_t Time();
+	bool m_Sixup;
 
 public:
 	CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo);
@@ -164,10 +173,11 @@ class CDemoPlayer : public IDemoPlayer
 	const CInfo *BaseInfo() const override { return &m_Info.m_Info; }
 	void GetDemoName(char *pBuffer, size_t BufferSize) const override;
 	bool GetDemoInfo(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo, IOHANDLE *pFile = nullptr, char *pErrorMessage = nullptr, size_t ErrorMessageSize = 0) const override;
-	const char *Filename() { return m_aFilename; }
-	const char *ErrorMessage() { return m_aErrorMessage; }
+	const char *Filename() const { return m_aFilename; }
+	const char *ErrorMessage() const override { return m_aErrorMessage; }
 
 	int Update(bool RealTime = true);
+	bool IsSixup() const { return m_Sixup; }
 
 	const CPlaybackInfo *Info() const { return &m_Info; }
 	bool IsPlaying() const override { return m_File != nullptr; }
@@ -179,11 +189,10 @@ class CDemoEditor : public IDemoEditor
 	IConsole *m_pConsole;
 	IStorage *m_pStorage;
 	class CSnapshotDelta *m_pSnapshotDelta;
-	const char *m_pNetVersion;
 
 public:
-	virtual void Init(const char *pNetVersion, class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage);
-	void Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) override;
+	virtual void Init(class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage);
+	bool Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) override;
 };
 
 #endif
diff --git a/src/engine/shared/econ.cpp b/src/engine/shared/econ.cpp
index 7a00362cfd..52305395ab 100644
--- a/src/engine/shared/econ.cpp
+++ b/src/engine/shared/econ.cpp
@@ -9,35 +9,35 @@ CEcon::CEcon() :
 {
 }
 
-int CEcon::NewClientCallback(int ClientID, void *pUser)
+int CEcon::NewClientCallback(int ClientId, void *pUser)
 {
 	CEcon *pThis = (CEcon *)pUser;
 
 	char aAddrStr[NETADDR_MAXSTRSIZE];
-	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
 	char aBuf[128];
-	str_format(aBuf, sizeof(aBuf), "client accepted. cid=%d addr=%s'", ClientID, aAddrStr);
+	str_format(aBuf, sizeof(aBuf), "client accepted. cid=%d addr=%s'", ClientId, aAddrStr);
 	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "econ", aBuf);
 
-	pThis->m_aClients[ClientID].m_State = CClient::STATE_CONNECTED;
-	pThis->m_aClients[ClientID].m_TimeConnected = time_get();
-	pThis->m_aClients[ClientID].m_AuthTries = 0;
+	pThis->m_aClients[ClientId].m_State = CClient::STATE_CONNECTED;
+	pThis->m_aClients[ClientId].m_TimeConnected = time_get();
+	pThis->m_aClients[ClientId].m_AuthTries = 0;
 
-	pThis->m_NetConsole.Send(ClientID, "Enter password:");
+	pThis->m_NetConsole.Send(ClientId, "Enter password:");
 	return 0;
 }
 
-int CEcon::DelClientCallback(int ClientID, const char *pReason, void *pUser)
+int CEcon::DelClientCallback(int ClientId, const char *pReason, void *pUser)
 {
 	CEcon *pThis = (CEcon *)pUser;
 
 	char aAddrStr[NETADDR_MAXSTRSIZE];
-	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientId), aAddrStr, sizeof(aAddrStr), true);
 	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=%s reason='%s'", ClientID, aAddrStr, pReason);
+	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=%s reason='%s'", ClientId, aAddrStr, pReason);
 	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "econ", aBuf);
 
-	pThis->m_aClients[ClientID].m_State = CClient::STATE_EMPTY;
+	pThis->m_aClients[ClientId].m_State = CClient::STATE_EMPTY;
 	return 0;
 }
 
@@ -45,8 +45,8 @@ void CEcon::ConLogout(IConsole::IResult *pResult, void *pUserData)
 {
 	CEcon *pThis = static_cast<CEcon *>(pUserData);
 
-	if(pThis->m_UserClientID >= 0 && pThis->m_UserClientID < NET_MAX_CONSOLE_CLIENTS && pThis->m_aClients[pThis->m_UserClientID].m_State != CClient::STATE_EMPTY)
-		pThis->m_NetConsole.Drop(pThis->m_UserClientID, "Logout");
+	if(pThis->m_UserClientId >= 0 && pThis->m_UserClientId < NET_MAX_CONSOLE_CLIENTS && pThis->m_aClients[pThis->m_UserClientId].m_State != CClient::STATE_EMPTY)
+		pThis->m_NetConsole.Drop(pThis->m_UserClientId, "Logout");
 }
 
 void CEcon::Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan)
@@ -58,24 +58,30 @@ void CEcon::Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan)
 		Client.m_State = CClient::STATE_EMPTY;
 
 	m_Ready = false;
-	m_UserClientID = -1;
+	m_UserClientId = -1;
 
-	if(g_Config.m_EcPort == 0 || g_Config.m_EcPassword[0] == 0)
+	if(g_Config.m_EcPort == 0)
 		return;
 
+	if(g_Config.m_EcPassword[0] == 0)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", "ec_password is required to be set for econ to be enabled.");
+		return;
+	}
+
 	NETADDR BindAddr;
-	if(g_Config.m_EcBindaddr[0] == '\0')
+	if(g_Config.m_EcBindaddr[0] && net_host_lookup(g_Config.m_EcBindaddr, &BindAddr, NETTYPE_ALL) == 0)
 	{
-		mem_zero(&BindAddr, sizeof(BindAddr));
+		// got bindaddr
+		BindAddr.port = g_Config.m_EcPort;
 	}
-	else if(net_host_lookup(g_Config.m_EcBindaddr, &BindAddr, NETTYPE_ALL) != 0)
+	else
 	{
 		char aBuf[256];
-		str_format(aBuf, sizeof(aBuf), "The configured bindaddr '%s' cannot be resolved.", g_Config.m_Bindaddr);
+		str_format(aBuf, sizeof(aBuf), "The configured bindaddr '%s' cannot be resolved.", g_Config.m_EcBindaddr);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
+		return;
 	}
-	BindAddr.type = NETTYPE_ALL;
-	BindAddr.port = g_Config.m_EcPort;
 
 	if(m_NetConsole.Open(BindAddr, pNetBan))
 	{
@@ -98,44 +104,44 @@ void CEcon::Update()
 	m_NetConsole.Update();
 
 	char aBuf[NET_MAX_PACKETSIZE];
-	int ClientID;
+	int ClientId;
 
-	while(m_NetConsole.Recv(aBuf, (int)(sizeof(aBuf)) - 1, &ClientID))
+	while(m_NetConsole.Recv(aBuf, (int)(sizeof(aBuf)) - 1, &ClientId))
 	{
-		dbg_assert(m_aClients[ClientID].m_State != CClient::STATE_EMPTY, "got message from empty slot");
-		if(m_aClients[ClientID].m_State == CClient::STATE_CONNECTED)
+		dbg_assert(m_aClients[ClientId].m_State != CClient::STATE_EMPTY, "got message from empty slot");
+		if(m_aClients[ClientId].m_State == CClient::STATE_CONNECTED)
 		{
 			if(str_comp(aBuf, g_Config.m_EcPassword) == 0)
 			{
-				m_aClients[ClientID].m_State = CClient::STATE_AUTHED;
-				m_NetConsole.Send(ClientID, "Authentication successful. External console access granted.");
+				m_aClients[ClientId].m_State = CClient::STATE_AUTHED;
+				m_NetConsole.Send(ClientId, "Authentication successful. External console access granted.");
 
-				str_format(aBuf, sizeof(aBuf), "cid=%d authed", ClientID);
+				str_format(aBuf, sizeof(aBuf), "cid=%d authed", ClientId);
 				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
 			}
 			else
 			{
-				m_aClients[ClientID].m_AuthTries++;
+				m_aClients[ClientId].m_AuthTries++;
 				char aMsg[128];
-				str_format(aMsg, sizeof(aMsg), "Wrong password %d/%d.", m_aClients[ClientID].m_AuthTries, MAX_AUTH_TRIES);
-				m_NetConsole.Send(ClientID, aMsg);
-				if(m_aClients[ClientID].m_AuthTries >= MAX_AUTH_TRIES)
+				str_format(aMsg, sizeof(aMsg), "Wrong password %d/%d.", m_aClients[ClientId].m_AuthTries, MAX_AUTH_TRIES);
+				m_NetConsole.Send(ClientId, aMsg);
+				if(m_aClients[ClientId].m_AuthTries >= MAX_AUTH_TRIES)
 				{
 					if(!g_Config.m_EcBantime)
-						m_NetConsole.Drop(ClientID, "Too many authentication tries");
+						m_NetConsole.Drop(ClientId, "Too many authentication tries");
 					else
-						m_NetConsole.NetBan()->BanAddr(m_NetConsole.ClientAddr(ClientID), g_Config.m_EcBantime * 60, "Too many authentication tries");
+						m_NetConsole.NetBan()->BanAddr(m_NetConsole.ClientAddr(ClientId), g_Config.m_EcBantime * 60, "Too many authentication tries", false);
 				}
 			}
 		}
-		else if(m_aClients[ClientID].m_State == CClient::STATE_AUTHED)
+		else if(m_aClients[ClientId].m_State == CClient::STATE_AUTHED)
 		{
 			char aFormatted[256];
-			str_format(aFormatted, sizeof(aFormatted), "cid=%d cmd='%s'", ClientID, aBuf);
+			str_format(aFormatted, sizeof(aFormatted), "cid=%d cmd='%s'", ClientId, aBuf);
 			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aFormatted);
-			m_UserClientID = ClientID;
+			m_UserClientId = ClientId;
 			Console()->ExecuteLine(aBuf);
-			m_UserClientID = -1;
+			m_UserClientId = -1;
 		}
 	}
 
@@ -147,12 +153,12 @@ void CEcon::Update()
 	}
 }
 
-void CEcon::Send(int ClientID, const char *pLine)
+void CEcon::Send(int ClientId, const char *pLine)
 {
 	if(!m_Ready)
 		return;
 
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
 		{
@@ -160,8 +166,8 @@ void CEcon::Send(int ClientID, const char *pLine)
 				m_NetConsole.Send(i, pLine);
 		}
 	}
-	else if(ClientID >= 0 && ClientID < NET_MAX_CONSOLE_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_AUTHED)
-		m_NetConsole.Send(ClientID, pLine);
+	else if(ClientId >= 0 && ClientId < NET_MAX_CONSOLE_CLIENTS && m_aClients[ClientId].m_State == CClient::STATE_AUTHED)
+		m_NetConsole.Send(ClientId, pLine);
 }
 
 void CEcon::Shutdown()
diff --git a/src/engine/shared/econ.h b/src/engine/shared/econ.h
index c7cc60f526..52c0cd6a8e 100644
--- a/src/engine/shared/econ.h
+++ b/src/engine/shared/econ.h
@@ -38,13 +38,13 @@ class CEcon
 
 	bool m_Ready;
 	int m_PrintCBIndex;
-	int m_UserClientID;
+	int m_UserClientId;
 
 	static void SendLineCB(const char *pLine, void *pUserData, ColorRGBA PrintColor = {1, 1, 1, 1});
 	static void ConLogout(IConsole::IResult *pResult, void *pUserData);
 
-	static int NewClientCallback(int ClientID, void *pUser);
-	static int DelClientCallback(int ClientID, const char *pReason, void *pUser);
+	static int NewClientCallback(int ClientId, void *pUser);
+	static int DelClientCallback(int ClientId, const char *pReason, void *pUser);
 
 public:
 	CEcon();
@@ -52,7 +52,7 @@ class CEcon
 
 	void Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan);
 	void Update();
-	void Send(int ClientID, const char *pLine);
+	void Send(int ClientId, const char *pLine);
 	void Shutdown();
 };
 
diff --git a/src/engine/shared/engine.cpp b/src/engine/shared/engine.cpp
index 9f0469e98d..411eae5ab9 100644
--- a/src/engine/shared/engine.cpp
+++ b/src/engine/shared/engine.cpp
@@ -7,20 +7,22 @@
 #include <engine/console.h>
 #include <engine/engine.h>
 #include <engine/shared/config.h>
+#include <engine/shared/jobs.h>
 #include <engine/shared/network.h>
 #include <engine/storage.h>
 
 class CEngine : public IEngine
 {
-public:
 	IConsole *m_pConsole;
 	IStorage *m_pStorage;
-	bool m_Logging;
 
+	bool m_Logging;
 	std::shared_ptr<CFutureLogger> m_pFutureLogger;
 
 	char m_aAppName[256];
 
+	CJobPool m_JobPool;
+
 	static void Con_DbgLognetwork(IConsole::IResult *pResult, void *pUserData)
 	{
 		CEngine *pEngine = static_cast<CEngine *>(pUserData);
@@ -43,6 +45,7 @@ class CEngine : public IEngine
 		}
 	}
 
+public:
 	CEngine(bool Test, const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs) :
 		m_pFutureLogger(std::move(pFutureLogger))
 	{
@@ -70,7 +73,6 @@ class CEngine : public IEngine
 
 	~CEngine() override
 	{
-		m_JobPool.Destroy();
 		CNetBase::CloseLog();
 	}
 
@@ -92,16 +94,16 @@ class CEngine : public IEngine
 		m_JobPool.Add(std::move(pJob));
 	}
 
+	void ShutdownJobs() override
+	{
+		m_JobPool.Shutdown();
+	}
+
 	void SetAdditionalLogger(std::shared_ptr<ILogger> &&pLogger) override
 	{
 		m_pFutureLogger->Set(pLogger);
 	}
 };
 
-void IEngine::RunJobBlocking(IJob *pJob)
-{
-	CJobPool::RunBlocking(pJob);
-}
-
 IEngine *CreateEngine(const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs) { return new CEngine(false, pAppname, std::move(pFutureLogger), Jobs); }
 IEngine *CreateTestEngine(const char *pAppname, int Jobs) { return new CEngine(true, pAppname, nullptr, Jobs); }
diff --git a/src/engine/shared/fifo.cpp b/src/engine/shared/fifo.cpp
index af2b49f09a..2595d88866 100644
--- a/src/engine/shared/fifo.cpp
+++ b/src/engine/shared/fifo.cpp
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-void CFifo::Init(IConsole *pConsole, char *pFifoFile, int Flag)
+void CFifo::Init(IConsole *pConsole, const char *pFifoFile, int Flag)
 {
 	m_File = -1;
 
@@ -70,19 +70,23 @@ void CFifo::Update()
 		if(aBuf[i] != '\n')
 			continue;
 		aBuf[i] = '\0';
-		m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+		if(str_utf8_check(pCur))
+		{
+			m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+		}
 		pCur = aBuf + i + 1;
 	}
-	if(pCur < aBuf + Length) // missed the last line
+	if(pCur < aBuf + Length && str_utf8_check(pCur)) // missed the last line
+	{
 		m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+	}
 }
 
 #elif defined(CONF_FAMILY_WINDOWS)
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-void CFifo::Init(IConsole *pConsole, char *pFifoFile, int Flag)
+void CFifo::Init(IConsole *pConsole, const char *pFifoFile, int Flag)
 {
 	m_pConsole = pConsole;
 	if(pFifoFile[0] == '\0')
@@ -188,11 +192,16 @@ void CFifo::Update()
 			if(pBuf[i] != '\n')
 				continue;
 			pBuf[i] = '\0';
-			m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+			if(str_utf8_check(pCur))
+			{
+				m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+			}
 			pCur = pBuf + i + 1;
 		}
-		if(pCur < pBuf + Length) // missed the last line
+		if(pCur < pBuf + Length && str_utf8_check(pCur)) // missed the last line
+		{
 			m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+		}
 
 		free(pBuf);
 	}
diff --git a/src/engine/shared/fifo.h b/src/engine/shared/fifo.h
index ad431b9bba..910b87e910 100644
--- a/src/engine/shared/fifo.h
+++ b/src/engine/shared/fifo.h
@@ -16,7 +16,7 @@ class CFifo
 #endif
 
 public:
-	void Init(IConsole *pConsole, char *pFifoFile, int Flag);
+	void Init(IConsole *pConsole, const char *pFifoFile, int Flag);
 	void Update();
 	void Shutdown();
 };
diff --git a/src/engine/shared/filecollection.cpp b/src/engine/shared/filecollection.cpp
index 0dab1c258f..252e6e1efb 100644
--- a/src/engine/shared/filecollection.cpp
+++ b/src/engine/shared/filecollection.cpp
@@ -1,135 +1,16 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
+#include <algorithm>
 #include <base/math.h>
-#include <base/system.h>
 
 #include <engine/storage.h>
 
 #include "filecollection.h"
 
-bool CFileCollection::IsFilenameValid(const char *pFilename)
-{
-	if(m_aFileDesc[0] == '\0')
-	{
-		int FilenameLength = str_length(pFilename);
-		if(m_FileExtLength + TIMESTAMP_LENGTH > FilenameLength)
-		{
-			return false;
-		}
-
-		pFilename += FilenameLength - m_FileExtLength - TIMESTAMP_LENGTH;
-	}
-	else
-	{
-		if(str_length(pFilename) != m_FileDescLength + TIMESTAMP_LENGTH + m_FileExtLength ||
-			str_comp_num(pFilename, m_aFileDesc, m_FileDescLength) ||
-			str_comp(pFilename + m_FileDescLength + TIMESTAMP_LENGTH, m_aFileExt))
-			return false;
-
-		pFilename += m_FileDescLength;
-	}
-
-	return pFilename[0] == '_' &&
-	       pFilename[1] >= '0' && pFilename[1] <= '9' &&
-	       pFilename[2] >= '0' && pFilename[2] <= '9' &&
-	       pFilename[3] >= '0' && pFilename[3] <= '9' &&
-	       pFilename[4] >= '0' && pFilename[4] <= '9' &&
-	       pFilename[5] == '-' &&
-	       pFilename[6] >= '0' && pFilename[6] <= '9' &&
-	       pFilename[7] >= '0' && pFilename[7] <= '9' &&
-	       pFilename[8] == '-' &&
-	       pFilename[9] >= '0' && pFilename[9] <= '9' &&
-	       pFilename[10] >= '0' && pFilename[10] <= '9' &&
-	       pFilename[11] == '_' &&
-	       pFilename[12] >= '0' && pFilename[12] <= '9' &&
-	       pFilename[13] >= '0' && pFilename[13] <= '9' &&
-	       pFilename[14] == '-' &&
-	       pFilename[15] >= '0' && pFilename[15] <= '9' &&
-	       pFilename[16] >= '0' && pFilename[16] <= '9' &&
-	       pFilename[17] == '-' &&
-	       pFilename[18] >= '0' && pFilename[18] <= '9' &&
-	       pFilename[19] >= '0' && pFilename[19] <= '9';
-}
-
-int64_t CFileCollection::ExtractTimestamp(const char *pTimestring)
-{
-	int64_t Timestamp = pTimestring[0] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[1] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[2] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[3] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[5] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[6] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[8] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[9] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[11] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[12] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[14] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[15] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[17] - '0';
-	Timestamp <<= 4;
-	Timestamp += pTimestring[18] - '0';
-
-	return Timestamp;
-}
-
-void CFileCollection::BuildTimestring(int64_t Timestamp, char *pTimestring)
-{
-	pTimestring[19] = 0;
-	pTimestring[18] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[17] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[16] = '-';
-	pTimestring[15] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[14] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[13] = '-';
-	pTimestring[12] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[11] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[10] = '_';
-	pTimestring[9] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[8] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[7] = '-';
-	pTimestring[6] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[5] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[4] = '-';
-	pTimestring[3] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[2] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[1] = (Timestamp & 0xF) + '0';
-	Timestamp >>= 4;
-	pTimestring[0] = (Timestamp & 0xF) + '0';
-}
-
 void CFileCollection::Init(IStorage *pStorage, const char *pPath, const char *pFileDesc, const char *pFileExt, int MaxEntries)
 {
-	mem_zero(m_aTimestamps, sizeof(m_aTimestamps));
-	m_NumTimestamps = 0;
-	m_Remove = -1;
-	// MAX_ENTRIES - 1 to make sure that we can insert one entry into the sorted
-	// list and then remove the oldest one
-	m_MaxEntries = clamp(MaxEntries, 1, static_cast<int>(MAX_ENTRIES) - 1);
+	m_vFileEntries.clear();
 	str_copy(m_aFileDesc, pFileDesc);
 	m_FileDescLength = str_length(m_aFileDesc);
 	str_copy(m_aFileExt, pFileExt);
@@ -138,136 +19,84 @@ void CFileCollection::Init(IStorage *pStorage, const char *pPath, const char *pF
 	m_pStorage = pStorage;
 
 	m_pStorage->ListDirectory(IStorage::TYPE_SAVE, m_aPath, FilelistCallback, this);
-}
+	std::sort(m_vFileEntries.begin(), m_vFileEntries.end(), [](const CFileEntry &Lhs, const CFileEntry &Rhs) { return Lhs.m_Timestamp < Rhs.m_Timestamp; });
 
-void CFileCollection::AddEntry(int64_t Timestamp)
-{
-	if(m_NumTimestamps == 0)
-	{
-		// empty list
-		m_aTimestamps[m_NumTimestamps++] = Timestamp;
-	}
-	else
+	int FilesDeleted = 0;
+	for(auto FileEntry : m_vFileEntries)
 	{
-		// add entry to the sorted list
-		if(Timestamp < m_aTimestamps[0])
-		{
-			// first entry
-			if(m_NumTimestamps <= m_MaxEntries)
-			{
-				mem_move(m_aTimestamps + 1, m_aTimestamps, m_NumTimestamps * sizeof(int64_t));
-				m_aTimestamps[0] = Timestamp;
-				++m_NumTimestamps;
-			}
-		}
-		else if(Timestamp >= m_aTimestamps[m_NumTimestamps - 1])
+		if((int)m_vFileEntries.size() - FilesDeleted <= MaxEntries)
+			break;
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		if(m_aFileDesc[0] == '\0')
 		{
-			// last entry
-			if(m_NumTimestamps > m_MaxEntries)
-			{
-				mem_move(m_aTimestamps, m_aTimestamps + 1, (m_NumTimestamps - 1) * sizeof(int64_t));
-				m_aTimestamps[m_NumTimestamps - 1] = Timestamp;
-			}
-			else
-				m_aTimestamps[m_NumTimestamps++] = Timestamp;
+			str_format(aBuf, sizeof(aBuf), "%s/%s", m_aPath, FileEntry.m_aFilename);
 		}
 		else
 		{
-			// middle entry
-			int Left = 0, Right = m_NumTimestamps - 1;
-			while(Right - Left > 1)
-			{
-				int Mid = (Left + Right) / 2;
-				if(m_aTimestamps[Mid] > Timestamp)
-					Right = Mid;
-				else
-					Left = Mid;
-			}
-
-			if(m_NumTimestamps > m_MaxEntries)
-			{
-				mem_move(m_aTimestamps, m_aTimestamps + 1, (Right - 1) * sizeof(int64_t));
-				m_aTimestamps[Right - 1] = Timestamp;
-			}
-			else
-			{
-				mem_move(m_aTimestamps + Right + 1, m_aTimestamps + Right, (m_NumTimestamps - Right) * sizeof(int64_t));
-				m_aTimestamps[Right] = Timestamp;
-				++m_NumTimestamps;
-			}
+			char aTimestring[TIMESTAMP_LENGTH];
+			str_timestamp_ex(FileEntry.m_Timestamp, aTimestring, sizeof(aBuf), FORMAT_NOSPACE);
+			str_format(aBuf, sizeof(aBuf), "%s/%s_%s%s", m_aPath, m_aFileDesc, aTimestring, m_aFileExt);
 		}
 
-		// remove old file only after we inserted the new entry, otherwise we can't
-		// know which one is the oldest
-		if(m_NumTimestamps > m_MaxEntries)
-		{
-			if(m_aFileDesc[0] == '\0') // consider an empty file desc as a wild card
-			{
-				m_Remove = m_aTimestamps[0];
-				m_pStorage->ListDirectory(IStorage::TYPE_SAVE, m_aPath, RemoveCallback, this);
-			}
-			else
-			{
-				char aBuf[IO_MAX_PATH_LENGTH];
-				char aTimestring[TIMESTAMP_LENGTH];
-				BuildTimestring(m_aTimestamps[0], aTimestring);
-
-				str_format(aBuf, sizeof(aBuf), "%s/%s_%s%s", m_aPath, m_aFileDesc, aTimestring, m_aFileExt);
-				m_pStorage->RemoveFile(aBuf, IStorage::TYPE_SAVE);
-			}
-		}
+		m_pStorage->RemoveFile(aBuf, IStorage::TYPE_SAVE);
+		FilesDeleted++;
 	}
 }
 
-int64_t CFileCollection::GetTimestamp(const char *pFilename)
+bool CFileCollection::ExtractTimestamp(const char *pTimestring, time_t *pTimestamp)
+{
+	// Discard anything after timestamp length from pTimestring (most likely the extension)
+	char aStrippedTimestring[TIMESTAMP_LENGTH];
+	str_copy(aStrippedTimestring, pTimestring);
+	return timestamp_from_str(aStrippedTimestring, FORMAT_NOSPACE, pTimestamp);
+}
+
+bool CFileCollection::ParseFilename(const char *pFilename, time_t *pTimestamp)
 {
+	// Check if filename is valid
+	if(!str_endswith(pFilename, m_aFileExt))
+		return false;
+
+	const char *pTimestring = pFilename;
+
 	if(m_aFileDesc[0] == '\0')
 	{
 		int FilenameLength = str_length(pFilename);
-		return ExtractTimestamp(pFilename + FilenameLength - m_FileExtLength - TIMESTAMP_LENGTH + 1);
+		if(m_FileExtLength + TIMESTAMP_LENGTH > FilenameLength)
+		{
+			return false;
+		}
+
+		pTimestring += FilenameLength - m_FileExtLength - TIMESTAMP_LENGTH + 1;
 	}
 	else
 	{
-		return ExtractTimestamp(pFilename + m_FileDescLength + 1);
-	}
-}
-
-int CFileCollection::FilelistCallback(const char *pFilename, int IsDir, int StorageType, void *pUser)
-{
-	CFileCollection *pThis = static_cast<CFileCollection *>(pUser);
-
-	// check for valid file name format
-	if(IsDir || !pThis->IsFilenameValid(pFilename))
-		return 0;
+		if(str_length(pFilename) != m_FileDescLength + TIMESTAMP_LENGTH + m_FileExtLength ||
+			!str_startswith(pFilename, m_aFileDesc))
+			return false;
 
-	// extract the timestamp
-	int64_t Timestamp = pThis->GetTimestamp(pFilename);
+		pTimestring += m_FileDescLength + 1;
+	}
 
-	// add the entry
-	pThis->AddEntry(Timestamp);
+	// Extract timestamp
+	if(!ExtractTimestamp(pTimestring, pTimestamp))
+		return false;
 
-	return 0;
+	return true;
 }
 
-int CFileCollection::RemoveCallback(const char *pFilename, int IsDir, int StorageType, void *pUser)
+int CFileCollection::FilelistCallback(const char *pFilename, int IsDir, int StorageType, void *pUser)
 {
 	CFileCollection *pThis = static_cast<CFileCollection *>(pUser);
 
-	// check for valid file name format
-	if(IsDir || !pThis->IsFilenameValid(pFilename))
+	// Try to parse filename and extract timestamp
+	time_t Timestamp;
+	if(IsDir || !pThis->ParseFilename(pFilename, &Timestamp))
 		return 0;
 
-	// extract the timestamp
-	int64_t Timestamp = pThis->GetTimestamp(pFilename);
-
-	if(Timestamp == pThis->m_Remove)
-	{
-		char aBuf[IO_MAX_PATH_LENGTH];
-		str_format(aBuf, sizeof(aBuf), "%s/%s", pThis->m_aPath, pFilename);
-		pThis->m_pStorage->RemoveFile(aBuf, IStorage::TYPE_SAVE);
-		pThis->m_Remove = -1;
-		return 1;
-	}
+	// Add the entry
+	pThis->m_vFileEntries.emplace_back(Timestamp, pFilename);
 
 	return 0;
 }
diff --git a/src/engine/shared/filecollection.h b/src/engine/shared/filecollection.h
index 9a4b561c65..6fb066a55b 100644
--- a/src/engine/shared/filecollection.h
+++ b/src/engine/shared/filecollection.h
@@ -3,9 +3,11 @@
 #ifndef ENGINE_SHARED_FILECOLLECTION_H
 #define ENGINE_SHARED_FILECOLLECTION_H
 
+#include <base/system.h>
 #include <base/types.h>
 
 #include <cstdint>
+#include <vector>
 
 class IStorage;
 
@@ -13,32 +15,35 @@ class CFileCollection
 {
 	enum
 	{
-		MAX_ENTRIES = 1001,
 		TIMESTAMP_LENGTH = 20, // _YYYY-MM-DD_HH-MM-SS
 	};
 
-	int64_t m_aTimestamps[MAX_ENTRIES];
-	int m_NumTimestamps;
-	int m_MaxEntries;
+	struct CFileEntry
+	{
+		time_t m_Timestamp;
+		char m_aFilename[IO_MAX_PATH_LENGTH];
+		CFileEntry(int64_t Timestamp, const char *pFilename)
+		{
+			m_Timestamp = Timestamp;
+			str_copy(m_aFilename, pFilename);
+		}
+	};
+
+	std::vector<CFileEntry> m_vFileEntries;
 	char m_aFileDesc[128];
 	int m_FileDescLength;
 	char m_aFileExt[32];
 	int m_FileExtLength;
 	char m_aPath[IO_MAX_PATH_LENGTH];
 	IStorage *m_pStorage;
-	int64_t m_Remove; // Timestamp we want to remove
 
-	bool IsFilenameValid(const char *pFilename);
-	int64_t ExtractTimestamp(const char *pTimestring);
-	void BuildTimestring(int64_t Timestamp, char *pTimestring);
-	int64_t GetTimestamp(const char *pFilename);
+	bool ExtractTimestamp(const char *pTimestring, time_t *pTimestamp);
+	bool ParseFilename(const char *pFilename, time_t *pTimestamp);
 
 public:
 	void Init(IStorage *pStorage, const char *pPath, const char *pFileDesc, const char *pFileExt, int MaxEntries);
-	void AddEntry(int64_t Timestamp);
 
 	static int FilelistCallback(const char *pFilename, int IsDir, int StorageType, void *pUser);
-	static int RemoveCallback(const char *pFilename, int IsDir, int StorageType, void *pUser);
 };
 
 #endif
diff --git a/src/engine/shared/host_lookup.cpp b/src/engine/shared/host_lookup.cpp
index ea79b97f0b..a6efe45deb 100644
--- a/src/engine/shared/host_lookup.cpp
+++ b/src/engine/shared/host_lookup.cpp
@@ -11,6 +11,7 @@ CHostLookup::CHostLookup(const char *pHostname, int Nettype)
 {
 	str_copy(m_aHostname, pHostname);
 	m_Nettype = Nettype;
+	Abortable(true);
 }
 
 void CHostLookup::Run()
diff --git a/src/engine/shared/http.cpp b/src/engine/shared/http.cpp
index 259ff8d044..c69da07dcd 100644
--- a/src/engine/shared/http.cpp
+++ b/src/engine/shared/http.cpp
@@ -8,41 +8,19 @@
 #include <engine/storage.h>
 #include <game/version.h>
 
+#include <limits>
+#include <thread>
+
 #if !defined(CONF_FAMILY_WINDOWS)
 #include <csignal>
 #endif
 
-#define WIN32_LEAN_AND_MEAN
 #include <curl/curl.h>
 
-// TODO: Non-global pls?
-static CURLSH *gs_pShare;
-static CLock gs_aLocks[CURL_LOCK_DATA_LAST + 1];
-static bool gs_Initialized = false;
-
-static int GetLockIndex(int Data)
-{
-	if(!(0 <= Data && Data < CURL_LOCK_DATA_LAST))
-	{
-		Data = CURL_LOCK_DATA_LAST;
-	}
-	return Data;
-}
-
-static void CurlLock(CURL *pHandle, curl_lock_data Data, curl_lock_access Access, void *pUser) ACQUIRE(gs_aLocks[GetLockIndex(Data)])
-{
-	(void)pHandle;
-	(void)Access;
-	(void)pUser;
-	gs_aLocks[GetLockIndex(Data)].lock();
-}
-
-static void CurlUnlock(CURL *pHandle, curl_lock_data Data, void *pUser) RELEASE(gs_aLocks[GetLockIndex(Data)])
-{
-	(void)pHandle;
-	(void)pUser;
-	gs_aLocks[GetLockIndex(Data)].unlock();
-}
+// There is a stray constant on Windows/MSVC...
+#ifdef ERROR
+#undef ERROR
+#endif
 
 int CurlDebug(CURL *pHandle, curl_infotype Type, char *pData, size_t DataSize, void *pUser)
 {
@@ -71,39 +49,6 @@ int CurlDebug(CURL *pHandle, curl_infotype Type, char *pData, size_t DataSize, v
 	return 0;
 }
 
-bool HttpInit(IStorage *pStorage)
-{
-	if(curl_global_init(CURL_GLOBAL_DEFAULT))
-	{
-		return true;
-	}
-	gs_pShare = curl_share_init();
-	if(!gs_pShare)
-	{
-		return true;
-	}
-	// print curl version
-	{
-		curl_version_info_data *pVersion = curl_version_info(CURLVERSION_NOW);
-		dbg_msg("http", "libcurl version %s (compiled = " LIBCURL_VERSION ")", pVersion->version);
-	}
-
-	curl_share_setopt(gs_pShare, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
-	curl_share_setopt(gs_pShare, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
-	curl_share_setopt(gs_pShare, CURLSHOPT_LOCKFUNC, CurlLock);
-	curl_share_setopt(gs_pShare, CURLSHOPT_UNLOCKFUNC, CurlUnlock);
-
-#if !defined(CONF_FAMILY_WINDOWS)
-	// As a multithreaded application we have to tell curl to not install signal
-	// handlers and instead ignore SIGPIPE from OpenSSL ourselves.
-	signal(SIGPIPE, SIG_IGN);
-#endif
-
-	gs_Initialized = true;
-
-	return false;
-}
-
 void EscapeUrl(char *pBuf, int Size, const char *pStr)
 {
 	char *pEsc = curl_easy_escape(0, pStr, 0);
@@ -121,44 +66,15 @@ bool HttpHasIpresolveBug()
 CHttpRequest::CHttpRequest(const char *pUrl)
 {
 	str_copy(m_aUrl, pUrl);
-	sha256_init(&m_ActualSha256);
+	sha256_init(&m_ActualSha256Ctx);
 }
 
 CHttpRequest::~CHttpRequest()
 {
-	m_ResponseLength = 0;
-	if(!m_WriteToFile)
-	{
-		m_BufferSize = 0;
-		free(m_pBuffer);
-		m_pBuffer = nullptr;
-	}
+	dbg_assert(m_File == nullptr, "HTTP request file was not closed");
+	free(m_pBuffer);
 	curl_slist_free_all((curl_slist *)m_pHeaders);
-	m_pHeaders = nullptr;
-	if(m_pBody)
-	{
-		m_BodyLength = 0;
-		free(m_pBody);
-		m_pBody = nullptr;
-	}
-}
-
-void CHttpRequest::Run()
-{
-	dbg_assert(gs_Initialized, "must initialize HTTP before running HTTP requests");
-	int FinalState;
-	if(!BeforeInit())
-	{
-		FinalState = HTTP_ERROR;
-	}
-	else
-	{
-		CURL *pHandle = curl_easy_init();
-		FinalState = RunImpl(pHandle);
-		curl_easy_cleanup(pHandle);
-	}
-
-	m_State = OnCompletion(FinalState);
+	free(m_pBody);
 }
 
 bool CHttpRequest::BeforeInit()
@@ -167,98 +83,102 @@ bool CHttpRequest::BeforeInit()
 	{
 		if(fs_makedir_rec_for(m_aDestAbsolute) < 0)
 		{
-			dbg_msg("http", "i/o error, cannot create folder for: %s", m_aDest);
+			log_error("http", "i/o error, cannot create folder for: %s", m_aDest);
 			return false;
 		}
 
 		m_File = io_open(m_aDestAbsolute, IOFLAG_WRITE);
 		if(!m_File)
 		{
-			dbg_msg("http", "i/o error, cannot open file: %s", m_aDest);
+			log_error("http", "i/o error, cannot open file: %s", m_aDest);
 			return false;
 		}
 	}
 	return true;
 }
 
-int CHttpRequest::RunImpl(CURL *pUser)
+bool CHttpRequest::ConfigureHandle(void *pHandle)
 {
-	CURL *pHandle = (CURL *)pUser;
-	if(!pHandle)
+	CURL *pH = (CURL *)pHandle;
+	if(!BeforeInit())
 	{
-		return HTTP_ERROR;
+		return false;
 	}
 
 	if(g_Config.m_DbgCurl)
 	{
-		curl_easy_setopt(pHandle, CURLOPT_VERBOSE, 1L);
-		curl_easy_setopt(pHandle, CURLOPT_DEBUGFUNCTION, CurlDebug);
+		curl_easy_setopt(pH, CURLOPT_VERBOSE, 1L);
+		curl_easy_setopt(pH, CURLOPT_DEBUGFUNCTION, CurlDebug);
 	}
 	long Protocols = CURLPROTO_HTTPS;
 	if(g_Config.m_HttpAllowInsecure)
 	{
 		Protocols |= CURLPROTO_HTTP;
 	}
-	char aErr[CURL_ERROR_SIZE];
-	curl_easy_setopt(pHandle, CURLOPT_ERRORBUFFER, aErr);
 
-	curl_easy_setopt(pHandle, CURLOPT_CONNECTTIMEOUT_MS, m_Timeout.ConnectTimeoutMs);
-	curl_easy_setopt(pHandle, CURLOPT_TIMEOUT_MS, m_Timeout.TimeoutMs);
-	curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_LIMIT, m_Timeout.LowSpeedLimit);
-	curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_TIME, m_Timeout.LowSpeedTime);
+	curl_easy_setopt(pH, CURLOPT_ERRORBUFFER, m_aErr);
+
+	curl_easy_setopt(pH, CURLOPT_CONNECTTIMEOUT_MS, m_Timeout.ConnectTimeoutMs);
+	curl_easy_setopt(pH, CURLOPT_TIMEOUT_MS, m_Timeout.TimeoutMs);
+	curl_easy_setopt(pH, CURLOPT_LOW_SPEED_LIMIT, m_Timeout.LowSpeedLimit);
+	curl_easy_setopt(pH, CURLOPT_LOW_SPEED_TIME, m_Timeout.LowSpeedTime);
 	if(m_MaxResponseSize >= 0)
 	{
-		curl_easy_setopt(pHandle, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)m_MaxResponseSize);
+		curl_easy_setopt(pH, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)m_MaxResponseSize);
 	}
 
-	curl_easy_setopt(pHandle, CURLOPT_SHARE, gs_pShare);
 	// ‘CURLOPT_PROTOCOLS’ is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR
 	// Wait until all platforms have 7.85.0
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
-	curl_easy_setopt(pHandle, CURLOPT_PROTOCOLS, Protocols);
+	curl_easy_setopt(pH, CURLOPT_PROTOCOLS, Protocols);
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
-	curl_easy_setopt(pHandle, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(pHandle, CURLOPT_MAXREDIRS, 4L);
-	curl_easy_setopt(pHandle, CURLOPT_FAILONERROR, 1L);
-	curl_easy_setopt(pHandle, CURLOPT_URL, m_aUrl);
-	curl_easy_setopt(pHandle, CURLOPT_NOSIGNAL, 1L);
-	curl_easy_setopt(pHandle, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
-	curl_easy_setopt(pHandle, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
-
-	curl_easy_setopt(pHandle, CURLOPT_WRITEDATA, this);
-	curl_easy_setopt(pHandle, CURLOPT_WRITEFUNCTION, WriteCallback);
-	curl_easy_setopt(pHandle, CURLOPT_NOPROGRESS, 0L);
-	curl_easy_setopt(pHandle, CURLOPT_PROGRESSDATA, this);
+	curl_easy_setopt(pH, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(pH, CURLOPT_MAXREDIRS, 4L);
+	if(m_FailOnErrorStatus)
+	{
+		curl_easy_setopt(pH, CURLOPT_FAILONERROR, 1L);
+	}
+	curl_easy_setopt(pH, CURLOPT_URL, m_aUrl);
+	curl_easy_setopt(pH, CURLOPT_NOSIGNAL, 1L);
+	curl_easy_setopt(pH, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
+	curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
+
+	curl_easy_setopt(pH, CURLOPT_HEADERDATA, this);
+	curl_easy_setopt(pH, CURLOPT_HEADERFUNCTION, HeaderCallback);
+	curl_easy_setopt(pH, CURLOPT_WRITEDATA, this);
+	curl_easy_setopt(pH, CURLOPT_WRITEFUNCTION, WriteCallback);
+	curl_easy_setopt(pH, CURLOPT_NOPROGRESS, 0L);
+	curl_easy_setopt(pH, CURLOPT_PROGRESSDATA, this);
 	// ‘CURLOPT_PROGRESSFUNCTION’ is deprecated: since 7.32.0. Use CURLOPT_XFERINFOFUNCTION
 	// See problems with curl_off_t type in header file in https://github.com/ddnet/ddnet/pull/6185/
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
-	curl_easy_setopt(pHandle, CURLOPT_PROGRESSFUNCTION, ProgressCallback);
+	curl_easy_setopt(pH, CURLOPT_PROGRESSFUNCTION, ProgressCallback);
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
-	curl_easy_setopt(pHandle, CURLOPT_IPRESOLVE, m_IpResolve == IPRESOLVE::V4 ? CURL_IPRESOLVE_V4 : m_IpResolve == IPRESOLVE::V6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_WHATEVER);
+	curl_easy_setopt(pH, CURLOPT_IPRESOLVE, m_IpResolve == IPRESOLVE::V4 ? CURL_IPRESOLVE_V4 : m_IpResolve == IPRESOLVE::V6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_WHATEVER);
 	if(g_Config.m_Bindaddr[0] != '\0')
 	{
-		curl_easy_setopt(pHandle, CURLOPT_INTERFACE, g_Config.m_Bindaddr);
+		curl_easy_setopt(pH, CURLOPT_INTERFACE, g_Config.m_Bindaddr);
 	}
 
 	if(curl_version_info(CURLVERSION_NOW)->version_num < 0x074400)
 	{
 		// Causes crashes, see https://github.com/ddnet/ddnet/issues/4342.
 		// No longer a problem in curl 7.68 and above, and 0x44 = 68.
-		curl_easy_setopt(pHandle, CURLOPT_FORBID_REUSE, 1L);
+		curl_easy_setopt(pH, CURLOPT_FORBID_REUSE, 1L);
 	}
 
 #ifdef CONF_PLATFORM_ANDROID
-	curl_easy_setopt(pHandle, CURLOPT_CAINFO, "data/cacert.pem");
+	curl_easy_setopt(pH, CURLOPT_CAINFO, "data/cacert.pem");
 #endif
 
 	switch(m_Type)
@@ -266,7 +186,7 @@ int CHttpRequest::RunImpl(CURL *pUser)
 	case REQUEST::GET:
 		break;
 	case REQUEST::HEAD:
-		curl_easy_setopt(pHandle, CURLOPT_NOBODY, 1L);
+		curl_easy_setopt(pH, CURLOPT_NOBODY, 1L);
 		break;
 	case REQUEST::POST:
 	case REQUEST::POST_JSON:
@@ -278,29 +198,60 @@ int CHttpRequest::RunImpl(CURL *pUser)
 		{
 			Header("Content-Type:");
 		}
-		curl_easy_setopt(pHandle, CURLOPT_POSTFIELDS, m_pBody);
-		curl_easy_setopt(pHandle, CURLOPT_POSTFIELDSIZE, m_BodyLength);
+		curl_easy_setopt(pH, CURLOPT_POSTFIELDS, m_pBody);
+		curl_easy_setopt(pH, CURLOPT_POSTFIELDSIZE, m_BodyLength);
 		break;
 	}
 
-	curl_easy_setopt(pHandle, CURLOPT_HTTPHEADER, m_pHeaders);
+	curl_easy_setopt(pH, CURLOPT_HTTPHEADER, m_pHeaders);
+
+	return true;
+}
+
+size_t CHttpRequest::OnHeader(char *pHeader, size_t HeaderSize)
+{
+	// `pHeader` is NOT null-terminated.
+	// `pHeader` has a trailing newline.
+
+	if(HeaderSize <= 1)
+	{
+		m_HeadersEnded = true;
+		return HeaderSize;
+	}
+	if(m_HeadersEnded)
+	{
+		// redirect, clear old headers
+		m_HeadersEnded = false;
+		m_ResultDate = {};
+		m_ResultLastModified = {};
+	}
+
+	static const char DATE[] = "Date: ";
+	static const char LAST_MODIFIED[] = "Last-Modified: ";
 
-	if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::ALL)
-		dbg_msg("http", "fetching %s", m_aUrl);
-	m_State = HTTP_RUNNING;
-	int Ret = curl_easy_perform(pHandle);
-	if(Ret != CURLE_OK)
+	// Trailing newline and null termination evens out.
+	if(HeaderSize - 1 >= sizeof(DATE) - 1 && str_startswith_nocase(pHeader, DATE))
 	{
-		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::FAILURE)
-			dbg_msg("http", "%s failed. libcurl error (%d): %s", m_aUrl, (int)Ret, aErr);
-		return (Ret == CURLE_ABORTED_BY_CALLBACK) ? HTTP_ABORTED : HTTP_ERROR;
+		char aValue[128];
+		str_truncate(aValue, sizeof(aValue), pHeader + (sizeof(DATE) - 1), HeaderSize - (sizeof(DATE) - 1) - 1);
+		int64_t Value = curl_getdate(aValue, nullptr);
+		if(Value != -1)
+		{
+			m_ResultDate = Value;
+		}
 	}
-	else
+	if(HeaderSize - 1 >= sizeof(LAST_MODIFIED) - 1 && str_startswith_nocase(pHeader, LAST_MODIFIED))
 	{
-		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::ALL)
-			dbg_msg("http", "task done %s", m_aUrl);
-		return HTTP_DONE;
+		char aValue[128];
+		str_truncate(aValue, sizeof(aValue), pHeader + (sizeof(LAST_MODIFIED) - 1), HeaderSize - (sizeof(LAST_MODIFIED) - 1) - 1);
+		int64_t Value = curl_getdate(aValue, nullptr);
+		if(Value != -1)
+		{
+			m_ResultLastModified = Value;
+		}
 	}
+
+	return HeaderSize;
 }
 
 size_t CHttpRequest::OnData(char *pData, size_t DataSize)
@@ -312,7 +263,7 @@ size_t CHttpRequest::OnData(char *pData, size_t DataSize)
 		return 0;
 	}
 
-	sha256_update(&m_ActualSha256, pData, DataSize);
+	sha256_update(&m_ActualSha256Ctx, pData, DataSize);
 
 	if(!m_WriteToFile)
 	{
@@ -341,6 +292,12 @@ size_t CHttpRequest::OnData(char *pData, size_t DataSize)
 	}
 }
 
+size_t CHttpRequest::HeaderCallback(char *pData, size_t Size, size_t Number, void *pUser)
+{
+	dbg_assert(Size == 1, "invalid size parameter passed to header callback");
+	return ((CHttpRequest *)pUser)->OnHeader(pData, Number);
+}
+
 size_t CHttpRequest::WriteCallback(char *pData, size_t Size, size_t Number, void *pUser)
 {
 	return ((CHttpRequest *)pUser)->OnData(pData, Size * Number);
@@ -351,30 +308,54 @@ int CHttpRequest::ProgressCallback(void *pUser, double DlTotal, double DlCurr, d
 	CHttpRequest *pTask = (CHttpRequest *)pUser;
 	pTask->m_Current.store(DlCurr, std::memory_order_relaxed);
 	pTask->m_Size.store(DlTotal, std::memory_order_relaxed);
-	pTask->m_Progress.store((100 * DlCurr) / (DlTotal ? DlTotal : 1), std::memory_order_relaxed);
+	pTask->m_Progress.store(DlTotal == 0.0 ? 0 : (100 * DlCurr) / DlTotal, std::memory_order_relaxed);
 	pTask->OnProgress();
 	return pTask->m_Abort ? -1 : 0;
 }
 
-int CHttpRequest::OnCompletion(int State)
+void CHttpRequest::OnCompletionInternal(void *pHandle, unsigned int Result)
 {
-	if(m_Abort)
-		State = HTTP_ABORTED;
+	if(pHandle)
+	{
+		CURL *pH = (CURL *)pHandle;
+		long StatusCode;
+		curl_easy_getinfo(pH, CURLINFO_RESPONSE_CODE, &StatusCode);
+		m_StatusCode = StatusCode;
+	}
+
+	EHttpState State;
+	const CURLcode Code = static_cast<CURLcode>(Result);
+	if(Code != CURLE_OK)
+	{
+		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::FAILURE)
+		{
+			log_error("http", "%s failed. libcurl error (%u): %s", m_aUrl, Code, m_aErr);
+		}
+		State = (Code == CURLE_ABORTED_BY_CALLBACK) ? EHttpState::ABORTED : EHttpState::ERROR;
+	}
+	else
+	{
+		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::ALL)
+		{
+			log_info("http", "task done: %s", m_aUrl);
+		}
+		State = EHttpState::DONE;
+	}
 
-	if(State == HTTP_DONE && m_ExpectedSha256 != SHA256_ZEROED)
+	if(State == EHttpState::DONE)
 	{
-		const SHA256_DIGEST ActualSha256 = sha256_finish(&m_ActualSha256);
-		if(ActualSha256 != m_ExpectedSha256)
+		m_ActualSha256 = sha256_finish(&m_ActualSha256Ctx);
+		if(m_ExpectedSha256 != SHA256_ZEROED && m_ActualSha256 != m_ExpectedSha256)
 		{
 			if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::FAILURE)
 			{
 				char aActualSha256[SHA256_MAXSTRSIZE];
-				sha256_str(ActualSha256, aActualSha256, sizeof(aActualSha256));
+				sha256_str(m_ActualSha256, aActualSha256, sizeof(aActualSha256));
 				char aExpectedSha256[SHA256_MAXSTRSIZE];
 				sha256_str(m_ExpectedSha256, aExpectedSha256, sizeof(aExpectedSha256));
-				dbg_msg("http", "SHA256 mismatch: got=%s, expected=%s, url=%s", aActualSha256, aExpectedSha256, m_aUrl);
+				log_error("http", "SHA256 mismatch: got=%s, expected=%s, url=%s", aActualSha256, aExpectedSha256, m_aUrl);
 			}
-			State = HTTP_ERROR;
+			State = EHttpState::ERROR;
 		}
 	}
 
@@ -382,16 +363,22 @@ int CHttpRequest::OnCompletion(int State)
 	{
 		if(m_File && io_close(m_File) != 0)
 		{
-			dbg_msg("http", "i/o error, cannot close file: %s", m_aDest);
-			State = HTTP_ERROR;
+			log_error("http", "i/o error, cannot close file: %s", m_aDest);
+			State = EHttpState::ERROR;
 		}
+		m_File = nullptr;
 
-		if(State == HTTP_ERROR || State == HTTP_ABORTED)
+		if(State == EHttpState::ERROR || State == EHttpState::ABORTED)
 		{
 			fs_remove(m_aDestAbsolute);
 		}
 	}
-	return State;
+
+	// The globally visible state must be updated after OnCompletion has finished,
+	// or other threads may try to access the result of a completed HTTP request,
+	// before the result has been initialized/updated in OnCompletion.
+	OnCompletion(State);
+	m_State = State;
 }
 
 void CHttpRequest::WriteToFile(IStorage *pStorage, const char *pDest, int StorageType)
@@ -413,14 +400,26 @@ void CHttpRequest::Header(const char *pNameColonValue)
 	m_pHeaders = curl_slist_append((curl_slist *)m_pHeaders, pNameColonValue);
 }
 
-void CHttpRequest::Result(unsigned char **ppResult, size_t *pResultLength) const
+void CHttpRequest::Wait()
 {
-	if(m_WriteToFile || State() != HTTP_DONE)
+	using namespace std::chrono_literals;
+
+	// This is so uncommon that polling just might work
+	for(;;)
 	{
-		*ppResult = nullptr;
-		*pResultLength = 0;
-		return;
+		EHttpState State = m_State.load(std::memory_order_seq_cst);
+		if(State != EHttpState::QUEUED && State != EHttpState::RUNNING)
+		{
+			return;
+		}
+		std::this_thread::sleep_for(10ms);
 	}
+}
+
+void CHttpRequest::Result(unsigned char **ppResult, size_t *pResultLength) const
+{
+	dbg_assert(State() == EHttpState::DONE, "Request not done");
+	dbg_assert(!m_WriteToFile, "Result not usable together with WriteToFile");
 	*ppResult = m_pBuffer;
 	*pResultLength = m_ResponseLength;
 }
@@ -430,9 +429,262 @@ json_value *CHttpRequest::ResultJson() const
 	unsigned char *pResult;
 	size_t ResultLength;
 	Result(&pResult, &ResultLength);
-	if(!pResult)
+	return json_parse((char *)pResult, ResultLength);
+}
+
+const SHA256_DIGEST &CHttpRequest::ResultSha256() const
+{
+	dbg_assert(State() == EHttpState::DONE, "Request not done");
+	return m_ActualSha256;
+}
+
+int CHttpRequest::StatusCode() const
+{
+	dbg_assert(State() == EHttpState::DONE, "Request not done");
+	return m_StatusCode;
+}
+
+std::optional<int64_t> CHttpRequest::ResultAgeSeconds() const
+{
+	dbg_assert(State() == EHttpState::DONE, "Request not done");
+	if(!m_ResultDate || !m_ResultLastModified)
 	{
-		return nullptr;
+		return {};
 	}
-	return json_parse((char *)pResult, ResultLength);
+	return *m_ResultDate - *m_ResultLastModified;
+}
+
+std::optional<int64_t> CHttpRequest::ResultLastModified() const
+{
+	dbg_assert(State() == EHttpState::DONE, "Request not done");
+	return m_ResultLastModified;
+}
+
+bool CHttp::Init(std::chrono::milliseconds ShutdownDelay)
+{
+	m_ShutdownDelay = ShutdownDelay;
+
+#if !defined(CONF_FAMILY_WINDOWS)
+	// As a multithreaded application we have to tell curl to not install signal
+	// handlers and instead ignore SIGPIPE from OpenSSL ourselves.
+	signal(SIGPIPE, SIG_IGN);
+#endif
+	m_pThread = thread_init(CHttp::ThreadMain, this, "http");
+
+	std::unique_lock Lock(m_Lock);
+	m_Cv.wait(Lock, [this]() { return m_State != CHttp::UNINITIALIZED; });
+	if(m_State != CHttp::RUNNING)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+void CHttp::ThreadMain(void *pUser)
+{
+	CHttp *pHttp = static_cast<CHttp *>(pUser);
+	pHttp->RunLoop();
+}
+
+void CHttp::RunLoop()
+{
+	std::unique_lock Lock(m_Lock);
+	if(curl_global_init(CURL_GLOBAL_DEFAULT))
+	{
+		log_error("http", "curl_global_init failed");
+		m_State = CHttp::ERROR;
+		m_Cv.notify_all();
+		return;
+	}
+
+	m_pMultiH = curl_multi_init();
+	if(!m_pMultiH)
+	{
+		log_error("http", "curl_multi_init failed");
+		m_State = CHttp::ERROR;
+		m_Cv.notify_all();
+		return;
+	}
+
+	// print curl version
+	{
+		curl_version_info_data *pVersion = curl_version_info(CURLVERSION_NOW);
+		log_info("http", "libcurl version %s (compiled = " LIBCURL_VERSION ")", pVersion->version);
+	}
+
+	m_State = CHttp::RUNNING;
+	m_Cv.notify_all();
+	Lock.unlock();
+
+	while(m_State == CHttp::RUNNING)
+	{
+		static int s_NextTimeout = std::numeric_limits<int>::max();
+		int Events = 0;
+		const CURLMcode PollCode = curl_multi_poll(m_pMultiH, nullptr, 0, s_NextTimeout, &Events);
+
+		// We may have been woken up for a shutdown
+		if(m_Shutdown)
+		{
+			auto Now = std::chrono::steady_clock::now();
+			if(!m_ShutdownTime.has_value())
+			{
+				m_ShutdownTime = Now + m_ShutdownDelay;
+				s_NextTimeout = m_ShutdownDelay.count();
+			}
+			else if(m_ShutdownTime < Now || m_RunningRequests.empty())
+			{
+				break;
+			}
+		}
+
+		if(PollCode != CURLM_OK)
+		{
+			Lock.lock();
+			log_error("http", "curl_multi_poll failed: %s", curl_multi_strerror(PollCode));
+			m_State = CHttp::ERROR;
+			break;
+		}
+
+		const CURLMcode PerformCode = curl_multi_perform(m_pMultiH, &Events);
+		if(PerformCode != CURLM_OK)
+		{
+			Lock.lock();
+			log_error("http", "curl_multi_perform failed: %s", curl_multi_strerror(PerformCode));
+			m_State = CHttp::ERROR;
+			break;
+		}
+
+		struct CURLMsg *pMsg;
+		while((pMsg = curl_multi_info_read(m_pMultiH, &Events)))
+		{
+			if(pMsg->msg == CURLMSG_DONE)
+			{
+				auto RequestIt = m_RunningRequests.find(pMsg->easy_handle);
+				dbg_assert(RequestIt != m_RunningRequests.end(), "Running handle not added to map");
+				auto pRequest = std::move(RequestIt->second);
+				m_RunningRequests.erase(RequestIt);
+
+				pRequest->OnCompletionInternal(pMsg->easy_handle, pMsg->data.result);
+				curl_multi_remove_handle(m_pMultiH, pMsg->easy_handle);
+				curl_easy_cleanup(pMsg->easy_handle);
+			}
+		}
+
+		decltype(m_PendingRequests) NewRequests = {};
+		Lock.lock();
+		std::swap(m_PendingRequests, NewRequests);
+		Lock.unlock();
+
+		while(!NewRequests.empty())
+		{
+			auto &pRequest = NewRequests.front();
+			if(g_Config.m_DbgCurl)
+				log_debug("http", "task: %s %s", CHttpRequest::GetRequestType(pRequest->m_Type), pRequest->m_aUrl);
+
+			CURL *pEH = curl_easy_init();
+			if(!pEH)
+			{
+				log_error("http", "curl_easy_init failed");
+				goto error_init;
+			}
+
+			if(!pRequest->ConfigureHandle(pEH))
+			{
+				curl_easy_cleanup(pEH);
+				str_copy(pRequest->m_aErr, "Failed to initialize request");
+				pRequest->OnCompletionInternal(nullptr, CURLE_ABORTED_BY_CALLBACK);
+				NewRequests.pop_front();
+				continue;
+			}
+
+			if(curl_multi_add_handle(m_pMultiH, pEH) != CURLM_OK)
+			{
+				log_error("http", "curl_multi_add_handle failed");
+				goto error_configure;
+			}
+
+			m_RunningRequests.emplace(pEH, std::move(pRequest));
+			NewRequests.pop_front();
+			continue;
+
+		error_configure:
+			curl_easy_cleanup(pEH);
+		error_init:
+			Lock.lock();
+			m_State = CHttp::ERROR;
+			break;
+		}
+
+		// Only happens if m_State == ERROR, thus we already hold the lock
+		if(!NewRequests.empty())
+		{
+			m_PendingRequests.insert(m_PendingRequests.end(), std::make_move_iterator(NewRequests.begin()), std::make_move_iterator(NewRequests.end()));
+			break;
+		}
+	}
+
+	if(!Lock.owns_lock())
+		Lock.lock();
+
+	bool Cleanup = m_State != CHttp::ERROR;
+	for(auto &pRequest : m_PendingRequests)
+	{
+		str_copy(pRequest->m_aErr, "Shutting down");
+		pRequest->OnCompletionInternal(nullptr, CURLE_ABORTED_BY_CALLBACK);
+	}
+
+	for(auto &ReqPair : m_RunningRequests)
+	{
+		auto &[pHandle, pRequest] = ReqPair;
+
+		str_copy(pRequest->m_aErr, "Shutting down");
+		pRequest->OnCompletionInternal(pHandle, CURLE_ABORTED_BY_CALLBACK);
+
+		if(Cleanup)
+		{
+			curl_multi_remove_handle(m_pMultiH, pHandle);
+			curl_easy_cleanup(pHandle);
+		}
+	}
+
+	if(Cleanup)
+	{
+		curl_multi_cleanup(m_pMultiH);
+		curl_global_cleanup();
+	}
+}
+
+void CHttp::Run(std::shared_ptr<IHttpRequest> pRequest)
+{
+	std::shared_ptr<CHttpRequest> pRequestImpl = std::static_pointer_cast<CHttpRequest>(pRequest);
+	std::unique_lock Lock(m_Lock);
+	if(m_Shutdown || m_State == CHttp::ERROR)
+	{
+		str_copy(pRequestImpl->m_aErr, "Shutting down");
+		pRequestImpl->OnCompletionInternal(nullptr, CURLE_ABORTED_BY_CALLBACK);
+		return;
+	}
+	m_Cv.wait(Lock, [this]() { return m_State != CHttp::UNINITIALIZED; });
+	m_PendingRequests.emplace_back(pRequestImpl);
+	curl_multi_wakeup(m_pMultiH);
+}
+
+void CHttp::Shutdown()
+{
+	std::unique_lock Lock(m_Lock);
+	if(m_Shutdown || m_State != CHttp::RUNNING)
+		return;
+
+	m_Shutdown = true;
+	curl_multi_wakeup(m_pMultiH);
+}
+
+CHttp::~CHttp()
+{
+	if(!m_pThread)
+		return;
+
+	Shutdown();
+	thread_wait(m_pThread);
 }
diff --git a/src/engine/shared/http.h b/src/engine/shared/http.h
index eb90fcaf11..86e53fac9f 100644
--- a/src/engine/shared/http.h
+++ b/src/engine/shared/http.h
@@ -7,17 +7,24 @@
 
 #include <algorithm>
 #include <atomic>
+#include <condition_variable>
+#include <deque>
+#include <mutex>
+#include <optional>
+#include <unordered_map>
+
+#include <engine/http.h>
 
 typedef struct _json_value json_value;
 class IStorage;
 
-enum
+enum class EHttpState
 {
-	HTTP_ERROR = -1,
-	HTTP_QUEUED,
-	HTTP_RUNNING,
-	HTTP_DONE,
-	HTTP_ABORTED,
+	ERROR = -1,
+	QUEUED,
+	RUNNING,
+	DONE,
+	ABORTED,
 };
 
 enum class HTTPLOG
@@ -42,8 +49,10 @@ struct CTimeout
 	long LowSpeedTime;
 };
 
-class CHttpRequest : public IJob
+class CHttpRequest : public IHttpRequest
 {
+	friend class CHttp;
+
 	enum class REQUEST
 	{
 		GET = 0,
@@ -51,6 +60,24 @@ class CHttpRequest : public IJob
 		POST,
 		POST_JSON,
 	};
+
+	static constexpr const char *GetRequestType(REQUEST Type)
+	{
+		switch(Type)
+		{
+		case REQUEST::GET:
+			return "GET";
+		case REQUEST::HEAD:
+			return "HEAD";
+		case REQUEST::POST:
+		case REQUEST::POST_JSON:
+			return "POST";
+		}
+
+		// Unreachable, maybe assert instead?
+		return "UNKNOWN";
+	}
+
 	char m_aUrl[256] = {0};
 
 	void *m_pHeaders = nullptr;
@@ -61,7 +88,8 @@ class CHttpRequest : public IJob
 	int64_t m_MaxResponseSize = -1;
 	REQUEST m_Type = REQUEST::GET;
 
-	SHA256_CTX m_ActualSha256;
+	SHA256_DIGEST m_ActualSha256 = SHA256_ZEROED;
+	SHA256_CTX m_ActualSha256Ctx;
 	SHA256_DIGEST m_ExpectedSha256 = SHA256_ZEROED;
 
 	bool m_WriteToFile = false;
@@ -83,33 +111,48 @@ class CHttpRequest : public IJob
 	HTTPLOG m_LogProgress = HTTPLOG::ALL;
 	IPRESOLVE m_IpResolve = IPRESOLVE::WHATEVER;
 
-	std::atomic<int> m_State{HTTP_QUEUED};
+	bool m_FailOnErrorStatus = true;
+
+	char m_aErr[256]; // 256 == CURL_ERROR_SIZE
+	std::atomic<EHttpState> m_State{EHttpState::QUEUED};
 	std::atomic<bool> m_Abort{false};
 
-	void Run() override;
+	int m_StatusCode = 0;
+	bool m_HeadersEnded = false;
+	std::optional<int64_t> m_ResultDate = {};
+	std::optional<int64_t> m_ResultLastModified = {};
+
 	// Abort the request with an error if `BeforeInit()` returns false.
 	bool BeforeInit();
-	int RunImpl(void *pUser);
+	bool ConfigureHandle(void *pHandle); // void * == CURL *
+	// `pHandle` can be nullptr if no handle was ever created for this request.
+	void OnCompletionInternal(void *pHandle, unsigned int Result); // void * == CURL *, unsigned int == CURLcode
 
+	// Abort the request if `OnHeader()` returns something other than
+	// `DataSize`. `pHeader` is NOT null-terminated.
+	size_t OnHeader(char *pHeader, size_t HeaderSize);
 	// Abort the request if `OnData()` returns something other than
 	// `DataSize`.
 	size_t OnData(char *pData, size_t DataSize);
 
 	static int ProgressCallback(void *pUser, double DlTotal, double DlCurr, double UlTotal, double UlCurr);
+	static size_t HeaderCallback(char *pData, size_t Size, size_t Number, void *pUser);
 	static size_t WriteCallback(char *pData, size_t Size, size_t Number, void *pUser);
 
 protected:
+	// These run on the curl thread now, DO NOT STALL THE THREAD
 	virtual void OnProgress() {}
-	virtual int OnCompletion(int State);
+	virtual void OnCompletion(EHttpState State) {}
 
 public:
 	CHttpRequest(const char *pUrl);
-	~CHttpRequest();
+	virtual ~CHttpRequest();
 
 	void Timeout(CTimeout Timeout) { m_Timeout = Timeout; }
 	void MaxResponseSize(int64_t MaxResponseSize) { m_MaxResponseSize = MaxResponseSize; }
 	void LogProgress(HTTPLOG LogProgress) { m_LogProgress = LogProgress; }
 	void IpResolve(IPRESOLVE IpResolve) { m_IpResolve = IpResolve; }
+	void FailOnErrorStatus(bool FailOnErrorStatus) { m_FailOnErrorStatus = FailOnErrorStatus; }
 	void WriteToFile(IStorage *pStorage, const char *pDest, int StorageType);
 	void ExpectSha256(const SHA256_DIGEST &Sha256) { m_ExpectedSha256 = Sha256; }
 	void Head() { m_Type = REQUEST::HEAD; }
@@ -156,11 +199,23 @@ class CHttpRequest : public IJob
 	double Current() const { return m_Current.load(std::memory_order_relaxed); }
 	double Size() const { return m_Size.load(std::memory_order_relaxed); }
 	int Progress() const { return m_Progress.load(std::memory_order_relaxed); }
-	int State() const { return m_State; }
+	EHttpState State() const { return m_State; }
+	bool Done() const
+	{
+		EHttpState State = m_State;
+		return State != EHttpState::QUEUED && State != EHttpState::RUNNING;
+	}
 	void Abort() { m_Abort = true; }
 
+	void Wait();
+
 	void Result(unsigned char **ppResult, size_t *pResultLength) const;
 	json_value *ResultJson() const;
+	const SHA256_DIGEST &ResultSha256() const;
+
+	int StatusCode() const;
+	std::optional<int64_t> ResultAgeSeconds() const;
+	std::optional<int64_t> ResultLastModified() const;
 };
 
 inline std::unique_ptr<CHttpRequest> HttpHead(const char *pUrl)
@@ -199,7 +254,44 @@ inline std::unique_ptr<CHttpRequest> HttpPostJson(const char *pUrl, const char *
 	return pResult;
 }
 
-bool HttpInit(IStorage *pStorage);
 void EscapeUrl(char *pBuf, int Size, const char *pStr);
 bool HttpHasIpresolveBug();
+
+// In an ideal world this would be a kernel interface
+class CHttp : public IHttp
+{
+	enum EState
+	{
+		UNINITIALIZED,
+		RUNNING,
+		ERROR,
+	};
+
+	void *m_pThread = nullptr;
+
+	std::mutex m_Lock{};
+	std::condition_variable m_Cv{};
+	std::atomic<EState> m_State = UNINITIALIZED;
+	std::deque<std::shared_ptr<CHttpRequest>> m_PendingRequests{};
+	std::unordered_map<void *, std::shared_ptr<CHttpRequest>> m_RunningRequests{}; // void * == CURL *
+	std::chrono::milliseconds m_ShutdownDelay{};
+	std::optional<std::chrono::time_point<std::chrono::steady_clock>> m_ShutdownTime{};
+	std::atomic<bool> m_Shutdown = false;
+
+	// Only to be used with curl_multi_wakeup
+	void *m_pMultiH = nullptr; // void * == CURLM *
+
+	static void ThreadMain(void *pUser);
+	void RunLoop();
+
+public:
+	// Startup
+	bool Init(std::chrono::milliseconds ShutdownDelay);
+
+	// User
+	virtual void Run(std::shared_ptr<IHttpRequest> pRequest) override;
+	void Shutdown() override;
+	~CHttp();
+};
+
 #endif // ENGINE_SHARED_HTTP_H
diff --git a/src/engine/shared/jobs.cpp b/src/engine/shared/jobs.cpp
index 852243367c..0959c0a0de 100644
--- a/src/engine/shared/jobs.cpp
+++ b/src/engine/shared/jobs.cpp
@@ -1,95 +1,223 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include "jobs.h"
+#include <algorithm>
 
 IJob::IJob() :
-	m_Status(STATE_PENDING)
+	m_pNext(nullptr),
+	m_State(STATE_QUEUED),
+	m_Abortable(false)
 {
 }
 
 IJob::~IJob() = default;
 
-int IJob::Status()
+IJob::EJobState IJob::State() const
 {
-	return m_Status.load();
+	return m_State;
+}
+
+bool IJob::Done() const
+{
+	EJobState State = m_State;
+	return State != STATE_QUEUED && State != STATE_RUNNING;
+}
+
+bool IJob::Abort()
+{
+	if(!IsAbortable())
+		return false;
+
+	m_State = STATE_ABORTED;
+	return true;
+}
+
+void IJob::Abortable(bool Abortable)
+{
+	m_Abortable = Abortable;
+}
+
+bool IJob::IsAbortable() const
+{
+	return m_Abortable;
 }
 
 CJobPool::CJobPool()
 {
-	// empty the pool
-	m_Shutdown = false;
-	sphore_init(&m_Semaphore);
-	m_pFirstJob = 0;
-	m_pLastJob = 0;
+	m_Shutdown = true;
 }
 
 CJobPool::~CJobPool()
 {
 	if(!m_Shutdown)
 	{
-		Destroy();
+		Shutdown();
 	}
 }
 
 void CJobPool::WorkerThread(void *pUser)
 {
-	CJobPool *pPool = (CJobPool *)pUser;
+	static_cast<CJobPool *>(pUser)->RunLoop();
+}
 
-	while(!pPool->m_Shutdown)
+void CJobPool::RunLoop()
+{
+	while(true)
 	{
-		std::shared_ptr<IJob> pJob = 0;
+		// wait for job to become available
+		sphore_wait(&m_Semaphore);
 
 		// fetch job from queue
-		sphore_wait(&pPool->m_Semaphore);
+		std::shared_ptr<IJob> pJob = nullptr;
 		{
-			CLockScope ls(pPool->m_Lock);
-			if(pPool->m_pFirstJob)
+			const CLockScope LockScope(m_Lock);
+			if(m_pFirstJob)
 			{
-				pJob = pPool->m_pFirstJob;
-				pPool->m_pFirstJob = pPool->m_pFirstJob->m_pNext;
+				pJob = m_pFirstJob;
+				m_pFirstJob = m_pFirstJob->m_pNext;
 				// allow remaining objects in list to destruct, even when current object stays alive
 				pJob->m_pNext = nullptr;
-				if(!pPool->m_pFirstJob)
-					pPool->m_pLastJob = 0;
+				if(!m_pFirstJob)
+					m_pLastJob = nullptr;
 			}
 		}
 
-		// do the job if we have one
 		if(pJob)
 		{
-			RunBlocking(pJob.get());
+			IJob::EJobState OldStateQueued = IJob::STATE_QUEUED;
+			if(!pJob->m_State.compare_exchange_strong(OldStateQueued, IJob::STATE_RUNNING))
+			{
+				if(OldStateQueued == IJob::STATE_ABORTED)
+				{
+					// job was aborted before it was started
+					pJob->m_State = IJob::STATE_ABORTED;
+					continue;
+				}
+				dbg_assert(false, "Job state invalid. Job was reused or uninitialized.");
+				dbg_break();
+			}
+
+			// remember running jobs so we can abort them
+			{
+				const CLockScope LockScope(m_LockRunning);
+				m_RunningJobs.push_back(pJob);
+			}
+			pJob->Run();
+			{
+				const CLockScope LockScope(m_LockRunning);
+				m_RunningJobs.erase(std::find(m_RunningJobs.begin(), m_RunningJobs.end(), pJob));
+			}
+
+			// do not change state to done if job was not completed successfully
+			IJob::EJobState OldStateRunning = IJob::STATE_RUNNING;
+			if(!pJob->m_State.compare_exchange_strong(OldStateRunning, IJob::STATE_DONE))
+			{
+				if(OldStateRunning != IJob::STATE_ABORTED)
+				{
+					dbg_assert(false, "Job state invalid, must be either running or aborted");
+				}
+			}
+		}
+		else if(m_Shutdown)
+		{
+			// shut down worker thread when pool is shutting down and no more jobs are left
+			break;
 		}
 	}
 }
 
 void CJobPool::Init(int NumThreads)
 {
-	// start threads
-	char aName[32];
+	dbg_assert(m_Shutdown, "Job pool already running");
+	m_Shutdown = false;
+
+	const CLockScope LockScope(m_Lock);
+	sphore_init(&m_Semaphore);
+	m_pFirstJob = nullptr;
+	m_pLastJob = nullptr;
+
+	// start worker threads
+	char aName[16]; // unix kernel length limit
 	m_vpThreads.reserve(NumThreads);
 	for(int i = 0; i < NumThreads; i++)
 	{
-		str_format(aName, sizeof(aName), "CJobPool worker %d", i);
+		str_format(aName, sizeof(aName), "CJobPool W%d", i);
 		m_vpThreads.push_back(thread_init(WorkerThread, this, aName));
 	}
 }
 
-void CJobPool::Destroy()
+void CJobPool::Shutdown()
 {
+	dbg_assert(!m_Shutdown, "Job pool already shut down");
 	m_Shutdown = true;
+
+	// abort queued jobs
+	{
+		const CLockScope LockScope(m_Lock);
+		std::shared_ptr<IJob> pJob = m_pFirstJob;
+		std::shared_ptr<IJob> pPrev = nullptr;
+		while(pJob != nullptr)
+		{
+			std::shared_ptr<IJob> pNext = pJob->m_pNext;
+			if(pJob->Abort())
+			{
+				// only remove abortable jobs from queue
+				pJob->m_pNext = nullptr;
+				if(pPrev)
+				{
+					pPrev->m_pNext = pNext;
+				}
+				else
+				{
+					m_pFirstJob = pNext;
+				}
+			}
+			else
+			{
+				pPrev = pJob;
+			}
+			pJob = pNext;
+		}
+		m_pLastJob = pPrev;
+	}
+
+	// abort running jobs
+	{
+		const CLockScope LockScope(m_LockRunning);
+		for(const std::shared_ptr<IJob> &pJob : m_RunningJobs)
+		{
+			pJob->Abort();
+		}
+	}
+
+	// wake up all worker threads
 	for(size_t i = 0; i < m_vpThreads.size(); i++)
+	{
 		sphore_signal(&m_Semaphore);
+	}
+
+	// wait for all worker threads to finish
 	for(void *pThread : m_vpThreads)
+	{
 		thread_wait(pThread);
+	}
+
 	m_vpThreads.clear();
 	sphore_destroy(&m_Semaphore);
 }
 
 void CJobPool::Add(std::shared_ptr<IJob> pJob)
 {
+	if(m_Shutdown)
+	{
+		// no jobs are accepted when the job pool is already shutting down
+		pJob->Abort();
+		return;
+	}
+
+	// add job to queue
 	{
-		CLockScope ls(m_Lock);
-		// add job to queue
+		const CLockScope LockScope(m_Lock);
 		if(m_pLastJob)
 			m_pLastJob->m_pNext = pJob;
 		m_pLastJob = std::move(pJob);
@@ -97,12 +225,6 @@ void CJobPool::Add(std::shared_ptr<IJob> pJob)
 			m_pFirstJob = m_pLastJob;
 	}
 
+	// signal a worker thread that a job is available
 	sphore_signal(&m_Semaphore);
 }
-
-void CJobPool::RunBlocking(IJob *pJob)
-{
-	pJob->m_Status = IJob::STATE_RUNNING;
-	pJob->Run();
-	pJob->m_Status = IJob::STATE_DONE;
-}
diff --git a/src/engine/shared/jobs.h b/src/engine/shared/jobs.h
index 8f347b16c3..fcc36d5ac9 100644
--- a/src/engine/shared/jobs.h
+++ b/src/engine/shared/jobs.h
@@ -7,36 +7,123 @@
 #include <base/system.h>
 
 #include <atomic>
+#include <deque>
 #include <memory>
 #include <vector>
 
-class CJobPool;
-
+/**
+ * A job which runs in a worker thread of a job pool.
+ *
+ * @see CJobPool
+ */
 class IJob
 {
-	friend CJobPool;
+	friend class CJobPool;
+
+public:
+	/**
+	 * The state of a job in the job pool.
+	 */
+	enum EJobState
+	{
+		/**
+		 * Job has been created/queued but not started on a worker thread yet.
+		 */
+		STATE_QUEUED = 0,
+
+		/**
+		 * Job is currently running on a worker thread.
+		 */
+		STATE_RUNNING,
+
+		/**
+		 * Job was completed successfully.
+		 */
+		STATE_DONE,
+
+		/**
+		 * Job was aborted. Note the job may or may not still be running while
+		 * in this state.
+		 *
+		 * @see IsAbortable
+		 */
+		STATE_ABORTED,
+	};
 
 private:
 	std::shared_ptr<IJob> m_pNext;
+	std::atomic<EJobState> m_State;
+	std::atomic<bool> m_Abortable;
 
-	std::atomic<int> m_Status;
+protected:
+	/**
+	 * Performs tasks in a worker thread.
+	 */
 	virtual void Run() = 0;
 
+	/**
+	 * Sets whether this job can be aborted.
+	 *
+	 * @remark Has no effect if the job has already been aborted.
+	 *
+	 * @see IsAbortable
+	 */
+	void Abortable(bool Abortable);
+
 public:
 	IJob();
+	virtual ~IJob();
+
 	IJob(const IJob &Other) = delete;
 	IJob &operator=(const IJob &Other) = delete;
-	virtual ~IJob();
-	int Status();
 
-	enum
-	{
-		STATE_PENDING = 0,
-		STATE_RUNNING,
-		STATE_DONE
-	};
+	/**
+	 * Returns the state of the job.
+	 *
+	 * @remark Accessing jobs in any other way that with the base functions of `IJob`
+	 * is generally not thread-safe unless the job is in @link STATE_DONE @endlink
+	 * or has not been enqueued yet.
+	 *
+	 * @return State of the job.
+	 */
+	EJobState State() const;
+
+	/**
+	 * Returns whether the job was completed, i.e. whether it's not still queued
+	 * or running.
+	 *
+	 * @return `true` if the job is done, `false` otherwise.
+	 */
+	bool Done() const;
+
+	/**
+	 * Aborts the job, if it can be aborted.
+	 *
+	 * @return `true` if abort was accepted, `false` otherwise.
+	 *
+	 * @remark May be overridden to delegate abort to other jobs. Note that this
+	 * function may be called from any thread and should be thread-safe.
+	 */
+	virtual bool Abort();
+
+	/**
+	 * Returns whether the job can be aborted. Jobs that are abortable may have
+	 * their state set to `STATE_ABORTED` at any point if the job was aborted.
+	 * The job state should be checked periodically in the `Run` function and the
+	 * job should terminate at the earliest, safe opportunity when aborted.
+	 * Scheduled jobs which are not abortable are guaranteed to fully complete
+	 * before the job pool is shut down.
+	 *
+	 * @return `true` if the job can be aborted, `false` otherwise.
+	 */
+	bool IsAbortable() const;
 };
 
+/**
+ * A job pool which runs jobs in one or more worker threads.
+ *
+ * @see IJob
+ */
 class CJobPool
 {
 	std::vector<void *> m_vpThreads;
@@ -47,15 +134,41 @@ class CJobPool
 	std::shared_ptr<IJob> m_pFirstJob GUARDED_BY(m_Lock);
 	std::shared_ptr<IJob> m_pLastJob GUARDED_BY(m_Lock);
 
+	CLock m_LockRunning;
+	std::deque<std::shared_ptr<IJob>> m_RunningJobs GUARDED_BY(m_LockRunning);
+
 	static void WorkerThread(void *pUser) NO_THREAD_SAFETY_ANALYSIS;
+	void RunLoop() NO_THREAD_SAFETY_ANALYSIS;
 
 public:
 	CJobPool();
 	~CJobPool();
 
-	void Init(int NumThreads);
-	void Destroy();
+	/**
+	 * Initializes the job pool with the given number of worker threads.
+	 *
+	 * @param NumTheads The number of worker threads.
+	 *
+	 * @remark Must be called on the main thread.
+	 */
+	void Init(int NumThreads) REQUIRES(!m_Lock);
+
+	/**
+	 * Shuts down the job pool. Aborts all abortable jobs. Then waits for all
+	 * worker threads to complete all remaining queued jobs and terminate.
+	 *
+	 * @remark Must be called on the main thread.
+	 */
+	void Shutdown() REQUIRES(!m_Lock) REQUIRES(!m_LockRunning);
+
+	/**
+	 * Adds a job to the queue of the job pool.
+	 *
+	 * @param pJob The job to enqueue.
+	 *
+	 * @remark If the job pool is already shutting down, no additional jobs
+	 * will be enqueue anymore. Abortable jobs will immediately be aborted.
+	 */
 	void Add(std::shared_ptr<IJob> pJob) REQUIRES(!m_Lock);
-	static void RunBlocking(IJob *pJob);
 };
 #endif
diff --git a/src/engine/shared/json.cpp b/src/engine/shared/json.cpp
index 37338ff1bf..93660edccb 100644
--- a/src/engine/shared/json.cpp
+++ b/src/engine/shared/json.cpp
@@ -1,46 +1,46 @@
 #include <base/system.h>
 #include <engine/shared/json.h>
 
-const struct _json_value *json_object_get(const json_value *object, const char *index)
+const struct _json_value *json_object_get(const json_value *pObject, const char *pIndex)
 {
 	unsigned int i;
 
-	if(object->type != json_object)
+	if(pObject->type != json_object)
 		return &json_value_none;
 
-	for(i = 0; i < object->u.object.length; ++i)
-		if(!str_comp(object->u.object.values[i].name, index))
-			return object->u.object.values[i].value;
+	for(i = 0; i < pObject->u.object.length; ++i)
+		if(!str_comp(pObject->u.object.values[i].name, pIndex))
+			return pObject->u.object.values[i].value;
 
 	return &json_value_none;
 }
 
-const struct _json_value *json_array_get(const json_value *array, int index)
+const struct _json_value *json_array_get(const json_value *pArray, int Index)
 {
-	if(array->type != json_array || index >= (int)array->u.array.length)
+	if(pArray->type != json_array || Index >= (int)pArray->u.array.length)
 		return &json_value_none;
 
-	return array->u.array.values[index];
+	return pArray->u.array.values[Index];
 }
 
-int json_array_length(const json_value *array)
+int json_array_length(const json_value *pArray)
 {
-	return array->u.array.length;
+	return pArray->u.array.length;
 }
 
-const char *json_string_get(const json_value *string)
+const char *json_string_get(const json_value *pString)
 {
-	return string->u.string.ptr;
+	return pString->u.string.ptr;
 }
 
-int json_int_get(const json_value *integer)
+int json_int_get(const json_value *pInteger)
 {
-	return integer->u.integer;
+	return pInteger->u.integer;
 }
 
-int json_boolean_get(const json_value *boolean)
+int json_boolean_get(const json_value *pBoolean)
 {
-	return boolean->u.boolean != 0;
+	return pBoolean->u.boolean != 0;
 }
 
 static char EscapeJsonChar(char c)
diff --git a/src/engine/shared/jsonwriter.cpp b/src/engine/shared/jsonwriter.cpp
index ca703bf49c..b47b3e4d00 100644
--- a/src/engine/shared/jsonwriter.cpp
+++ b/src/engine/shared/jsonwriter.cpp
@@ -81,7 +81,7 @@ void CJsonWriter::WriteIntValue(int Value)
 	dbg_assert(CanWriteDatatype(), "Cannot write value here");
 	WriteIndent(false);
 	char aBuf[32];
-	str_from_int(Value, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", Value);
 	WriteInternal(aBuf);
 	CompleteDataType();
 }
diff --git a/src/engine/shared/kernel.cpp b/src/engine/shared/kernel.cpp
index f578cb6850..bdeb46ee3a 100644
--- a/src/engine/shared/kernel.cpp
+++ b/src/engine/shared/kernel.cpp
@@ -1,23 +1,29 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
 #include <base/system.h>
+
 #include <engine/kernel.h>
 
+#include <vector>
+
 class CKernel : public IKernel
 {
-	enum
-	{
-		MAX_INTERFACES = 32,
-	};
-
 	class CInterfaceInfo
 	{
 	public:
-		CInterfaceInfo()
+		CInterfaceInfo() :
+			m_pInterface(nullptr),
+			m_AutoDestroy(false)
+		{
+			m_aName[0] = '\0';
+		}
+
+		CInterfaceInfo(const char *pName, IInterface *pInterface, bool AutoDestroy) :
+			m_pInterface(pInterface),
+			m_AutoDestroy(AutoDestroy)
 		{
-			m_aName[0] = 0;
-			m_pInterface = 0x0;
-			m_AutoDestroy = false;
+			str_copy(m_aName, pName);
 		}
 
 		char m_aName[64];
@@ -25,98 +31,64 @@ class CKernel : public IKernel
 		bool m_AutoDestroy;
 	};
 
-	CInterfaceInfo m_aInterfaces[MAX_INTERFACES];
-	int m_NumInterfaces;
+	std::vector<CInterfaceInfo> m_vInterfaces;
 
 	CInterfaceInfo *FindInterfaceInfo(const char *pName)
 	{
-		for(int i = 0; i < m_NumInterfaces; i++)
+		for(CInterfaceInfo &Info : m_vInterfaces)
 		{
-			if(str_comp(pName, m_aInterfaces[i].m_aName) == 0)
-				return &m_aInterfaces[i];
+			if(str_comp(pName, Info.m_aName) == 0)
+				return &Info;
 		}
-		return 0x0;
+		return nullptr;
 	}
 
 public:
-	CKernel()
-	{
-		m_NumInterfaces = 0;
-	}
+	CKernel() = default;
 
 	void Shutdown() override
 	{
-		for(int i = m_NumInterfaces - 1; i >= 0; i--)
+		for(int i = (int)m_vInterfaces.size() - 1; i >= 0; --i)
 		{
-			if(m_aInterfaces[i].m_AutoDestroy)
-				m_aInterfaces[i].m_pInterface->Shutdown();
+			if(m_vInterfaces[i].m_AutoDestroy)
+			{
+				m_vInterfaces[i].m_pInterface->Shutdown();
+			}
 		}
 	}
 
 	~CKernel() override
 	{
 		// delete interfaces in reverse order just the way it would happen to objects on the stack
-		for(int i = m_NumInterfaces - 1; i >= 0; i--)
+		for(int i = (int)m_vInterfaces.size() - 1; i >= 0; --i)
 		{
-			if(m_aInterfaces[i].m_AutoDestroy)
+			if(m_vInterfaces[i].m_AutoDestroy)
 			{
-				delete m_aInterfaces[i].m_pInterface;
-				m_aInterfaces[i].m_pInterface = 0;
+				delete m_vInterfaces[i].m_pInterface;
+				m_vInterfaces[i].m_pInterface = nullptr;
 			}
 		}
 	}
 
-	bool RegisterInterfaceImpl(const char *pName, IInterface *pInterface, bool Destroy) override
+	void RegisterInterfaceImpl(const char *pName, IInterface *pInterface, bool Destroy) override
 	{
-		// TODO: More error checks here
-		if(!pInterface)
-		{
-			dbg_msg("kernel", "ERROR: couldn't register interface %s. null pointer given", pName);
-			return false;
-		}
-
-		if(m_NumInterfaces == MAX_INTERFACES)
-		{
-			dbg_msg("kernel", "ERROR: couldn't register interface '%s'. maximum of interfaces reached", pName);
-			return false;
-		}
-
-		if(FindInterfaceInfo(pName) != 0)
-		{
-			dbg_msg("kernel", "ERROR: couldn't register interface '%s'. interface already exists", pName);
-			return false;
-		}
+		dbg_assert(str_length(pName) < (int)sizeof(CInterfaceInfo().m_aName), "Interface name too long");
+		dbg_assert(FindInterfaceInfo(pName) == nullptr, "Duplicate interface name");
 
 		pInterface->m_pKernel = this;
-		m_aInterfaces[m_NumInterfaces].m_pInterface = pInterface;
-		str_copy(m_aInterfaces[m_NumInterfaces].m_aName, pName);
-		m_aInterfaces[m_NumInterfaces].m_AutoDestroy = Destroy;
-		m_NumInterfaces++;
-
-		return true;
+		m_vInterfaces.emplace_back(pName, pInterface, Destroy);
 	}
 
-	bool ReregisterInterfaceImpl(const char *pName, IInterface *pInterface) override
+	void ReregisterInterfaceImpl(const char *pName, IInterface *pInterface) override
 	{
-		if(FindInterfaceInfo(pName) == 0)
-		{
-			dbg_msg("kernel", "ERROR: couldn't reregister interface '%s'. interface doesn't exist", pName);
-			return false;
-		}
-
+		dbg_assert(FindInterfaceInfo(pName) != nullptr, "Cannot reregister interface that is not registered");
 		pInterface->m_pKernel = this;
-
-		return true;
 	}
 
 	IInterface *RequestInterfaceImpl(const char *pName) override
 	{
 		CInterfaceInfo *pInfo = FindInterfaceInfo(pName);
-		if(!pInfo)
-		{
-			dbg_msg("kernel", "failed to find interface with the name '%s'", pName);
-			return 0;
-		}
+		dbg_assert(pInfo != nullptr, "Interface not found");
 		return pInfo->m_pInterface;
 	}
 };
diff --git a/src/engine/shared/linereader.cpp b/src/engine/shared/linereader.cpp
index d322ee2792..ae56cc39f9 100644
--- a/src/engine/shared/linereader.cpp
+++ b/src/engine/shared/linereader.cpp
@@ -4,81 +4,92 @@
 
 #include <base/system.h>
 
-void CLineReader::Init(IOHANDLE File)
+CLineReader::CLineReader()
 {
-	m_BufferMaxSize = sizeof(m_aBuffer) - 1;
-	m_BufferSize = 0;
-	m_BufferPos = 0;
-	m_File = File;
+	m_pBuffer = nullptr;
 }
 
-char *CLineReader::Get()
+CLineReader::~CLineReader()
 {
-	unsigned LineStart = m_BufferPos;
-	bool CRLFBreak = false;
+	free(m_pBuffer);
+}
 
-	while(true)
+bool CLineReader::OpenFile(IOHANDLE File)
+{
+	if(!File)
 	{
-		if(m_BufferPos >= m_BufferSize)
-		{
-			// fetch more
+		return false;
+	}
+	char *pBuffer = io_read_all_str(File);
+	io_close(File);
+	if(pBuffer == nullptr)
+	{
+		return false;
+	}
+	OpenBuffer(pBuffer);
+	return true;
+}
 
-			// move the remaining part to the front
-			unsigned Read;
-			unsigned Left = m_BufferSize - LineStart;
+void CLineReader::OpenBuffer(char *pBuffer)
+{
+	dbg_assert(pBuffer != nullptr, "Line reader initialized without valid buffer");
 
-			if(LineStart > m_BufferSize)
-				Left = 0;
-			if(Left)
-				mem_move(m_aBuffer, &m_aBuffer[LineStart], Left);
-			m_BufferPos = Left;
+	m_pBuffer = pBuffer;
+	m_BufferPos = 0;
+	m_ReadLastLine = false;
+
+	// Skip UTF-8 BOM
+	if(m_pBuffer[0] == '\xEF' && m_pBuffer[1] == '\xBB' && m_pBuffer[2] == '\xBF')
+	{
+		m_BufferPos += 3;
+	}
+}
 
-			// fill the buffer
-			Read = io_read(m_File, &m_aBuffer[m_BufferPos], m_BufferMaxSize - m_BufferPos);
-			m_BufferSize = Left + Read;
-			LineStart = 0;
+const char *CLineReader::Get()
+{
+	dbg_assert(m_pBuffer != nullptr, "Line reader not initialized");
+	if(m_ReadLastLine)
+	{
+		return nullptr;
+	}
 
-			if(!Read)
+	unsigned LineStart = m_BufferPos;
+	while(true)
+	{
+		if(m_pBuffer[m_BufferPos] == '\0' || m_pBuffer[m_BufferPos] == '\n' || (m_pBuffer[m_BufferPos] == '\r' && m_pBuffer[m_BufferPos + 1] == '\n'))
+		{
+			if(m_pBuffer[m_BufferPos] == '\0')
 			{
-				if(Left)
+				m_ReadLastLine = true;
+			}
+			else
+			{
+				if(m_pBuffer[m_BufferPos] == '\r')
 				{
-					m_aBuffer[Left] = 0; // return the last line
-					m_BufferPos = Left;
-					m_BufferSize = Left;
-					return m_aBuffer;
+					m_pBuffer[m_BufferPos] = '\0';
+					++m_BufferPos;
 				}
-				else
-					return 0x0; // we are done!
+				m_pBuffer[m_BufferPos] = '\0';
+				++m_BufferPos;
 			}
-		}
-		else
-		{
-			if(m_aBuffer[m_BufferPos] == '\n' || m_aBuffer[m_BufferPos] == '\r')
+
+			if(!str_utf8_check(&m_pBuffer[LineStart]))
 			{
-				// line found
-				if(m_aBuffer[m_BufferPos] == '\r')
+				// Skip lines containing invalid UTF-8
+				if(m_ReadLastLine)
 				{
-					if(m_BufferPos + 1 >= m_BufferSize)
-					{
-						// read more to get the connected '\n'
-						CRLFBreak = true;
-						++m_BufferPos;
-						continue;
-					}
-					else if(m_aBuffer[m_BufferPos + 1] == '\n')
-						m_aBuffer[m_BufferPos++] = 0;
+					return nullptr;
 				}
-				m_aBuffer[m_BufferPos++] = 0;
-				return &m_aBuffer[LineStart];
+				LineStart = m_BufferPos;
+				continue;
 			}
-			else if(CRLFBreak)
+			// Skip trailing empty line
+			if(m_ReadLastLine && m_pBuffer[LineStart] == '\0')
 			{
-				if(m_aBuffer[m_BufferPos] == '\n')
-					m_aBuffer[m_BufferPos++] = 0;
-				return &m_aBuffer[LineStart];
+				return nullptr;
 			}
-			else
-				m_BufferPos++;
+			return &m_pBuffer[LineStart];
 		}
+		++m_BufferPos;
 	}
 }
diff --git a/src/engine/shared/linereader.h b/src/engine/shared/linereader.h
index 7d5f1c5ab4..4575b76592 100644
--- a/src/engine/shared/linereader.h
+++ b/src/engine/shared/linereader.h
@@ -4,17 +4,20 @@
 #define ENGINE_SHARED_LINEREADER_H
 #include <base/types.h>
 
-// buffered stream for reading lines, should perhaps be something smaller
+// buffered stream for reading lines
 class CLineReader
 {
-	char m_aBuffer[4 * 8192 + 1]; // 1 additional byte for null termination
+	char *m_pBuffer;
 	unsigned m_BufferPos;
-	unsigned m_BufferSize;
-	unsigned m_BufferMaxSize;
-	IOHANDLE m_File;
+	bool m_ReadLastLine;
 
 public:
-	void Init(IOHANDLE File);
-	char *Get(); // Returned string is only valid until next Get() call
+	CLineReader();
+	~CLineReader();
+
+	bool OpenFile(IOHANDLE File);
+	void OpenBuffer(char *pBuffer); // Buffer must have been allocated with malloc, will be freed by the line reader
+
+	const char *Get(); // Returned string is valid until the line reader is destroyed
 };
 #endif
diff --git a/src/engine/shared/map.cpp b/src/engine/shared/map.cpp
index 605f95e3e9..c1f619ea4e 100644
--- a/src/engine/shared/map.cpp
+++ b/src/engine/shared/map.cpp
@@ -45,9 +45,9 @@ int CMap::GetItemSize(int Index)
 	return m_DataFile.GetItemSize(Index);
 }
 
-void *CMap::GetItem(int Index, int *pType, int *pID)
+void *CMap::GetItem(int Index, int *pType, int *pId)
 {
-	return m_DataFile.GetItem(Index, pType, pID);
+	return m_DataFile.GetItem(Index, pType, pId);
 }
 
 void CMap::GetType(int Type, int *pStart, int *pNum)
@@ -55,14 +55,14 @@ void CMap::GetType(int Type, int *pStart, int *pNum)
 	m_DataFile.GetType(Type, pStart, pNum);
 }
 
-int CMap::FindItemIndex(int Type, int ID)
+int CMap::FindItemIndex(int Type, int Id)
 {
-	return m_DataFile.FindItemIndex(Type, ID);
+	return m_DataFile.FindItemIndex(Type, Id);
 }
 
-void *CMap::FindItem(int Type, int ID)
+void *CMap::FindItem(int Type, int Id)
 {
-	return m_DataFile.FindItem(Type, ID);
+	return m_DataFile.FindItem(Type, Id);
 }
 
 int CMap::NumItems() const
@@ -106,8 +106,17 @@ bool CMap::Load(const char *pMapName)
 				CMapItemLayerTilemap *pTilemap = reinterpret_cast<CMapItemLayerTilemap *>(pLayer);
 				if(pTilemap->m_Version >= CMapItemLayerTilemap::TILE_SKIP_MIN_VERSION)
 				{
-					const size_t TilemapSize = (size_t)pTilemap->m_Width * pTilemap->m_Height * sizeof(CTile);
+					const size_t TilemapCount = (size_t)pTilemap->m_Width * pTilemap->m_Height;
+					const size_t TilemapSize = TilemapCount * sizeof(CTile);
+
+					if(((int)TilemapCount / pTilemap->m_Width != pTilemap->m_Height) || (TilemapSize / sizeof(CTile) != TilemapCount))
+					{
+						log_error("map/load", "map layer too big (%d * %d * %d causes an integer overflow)", pTilemap->m_Width, pTilemap->m_Height, sizeof(CTile));
+						return false;
+					}
 					CTile *pTiles = static_cast<CTile *>(malloc(TilemapSize));
+					if(!pTiles)
+						return false;
 					ExtractTiles(pTiles, (size_t)pTilemap->m_Width * pTilemap->m_Height, static_cast<CTile *>(NewDataFile.GetData(pTilemap->m_Data)), NewDataFile.GetDataSize(pTilemap->m_Data) / sizeof(CTile));
 					NewDataFile.ReplaceData(pTilemap->m_Data, reinterpret_cast<char *>(pTiles), TilemapSize);
 				}
diff --git a/src/engine/shared/map.h b/src/engine/shared/map.h
index c104c6c0a6..03beb7edd9 100644
--- a/src/engine/shared/map.h
+++ b/src/engine/shared/map.h
@@ -25,10 +25,10 @@ class CMap : public IEngineMap
 	int NumData() const override;
 
 	int GetItemSize(int Index) override;
-	void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr) override;
+	void *GetItem(int Index, int *pType = nullptr, int *pId = nullptr) override;
 	void GetType(int Type, int *pStart, int *pNum) override;
-	int FindItemIndex(int Type, int ID) override;
-	void *FindItem(int Type, int ID) override;
+	int FindItemIndex(int Type, int Id) override;
+	void *FindItem(int Type, int Id) override;
 	int NumItems() const override;
 
 	bool Load(const char *pMapName) override;
diff --git a/src/engine/shared/netban.cpp b/src/engine/shared/netban.cpp
index 4f9d0ff441..0c42f4c326 100644
--- a/src/engine/shared/netban.cpp
+++ b/src/engine/shared/netban.cpp
@@ -208,20 +208,21 @@ typename CNetBan::CBan<T> *CNetBan::CBanPool<T, HashCount>::Get(int Index) const
 }
 
 template<class T>
-int CNetBan::Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason)
+int CNetBan::Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason, bool VerbatimReason)
 {
 	// do not ban localhost
-	if(NetMatch(pData, &m_LocalhostIPV4) || NetMatch(pData, &m_LocalhostIPV6))
+	if(NetMatch(pData, &m_LocalhostIpV4) || NetMatch(pData, &m_LocalhostIpV6))
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (localhost)");
 		return -1;
 	}
 
-	int Stamp = Seconds > 0 ? time_timestamp() + Seconds : CBanInfo::EXPIRES_NEVER;
+	int64_t Stamp = Seconds > 0 ? time_timestamp() + Seconds : static_cast<int64_t>(CBanInfo::EXPIRES_NEVER);
 
 	// set up info
 	CBanInfo Info = {0};
 	Info.m_Expires = Stamp;
+	Info.m_VerbatimReason = VerbatimReason;
 	str_copy(Info.m_aReason, pReason);
 
 	// check if it already exists
@@ -231,7 +232,7 @@ int CNetBan::Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, c
 	{
 		// adjust the ban
 		pBanPool->Update(pBan, &Info);
-		char aBuf[128];
+		char aBuf[256];
 		MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_LIST);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
 		return 1;
@@ -241,7 +242,7 @@ int CNetBan::Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, c
 	pBan = pBanPool->Add(pData, &Info, &NetHash);
 	if(pBan)
 	{
-		char aBuf[128];
+		char aBuf[256];
 		MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_BANADD);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
 		return 0;
@@ -276,21 +277,21 @@ void CNetBan::Init(IConsole *pConsole, IStorage *pStorage)
 	m_BanAddrPool.Reset();
 	m_BanRangePool.Reset();
 
-	net_host_lookup("localhost", &m_LocalhostIPV4, NETTYPE_IPV4);
-	net_host_lookup("localhost", &m_LocalhostIPV6, NETTYPE_IPV6);
+	net_host_lookup("localhost", &m_LocalhostIpV4, NETTYPE_IPV4);
+	net_host_lookup("localhost", &m_LocalhostIpV6, NETTYPE_IPV6);
 
 	Console()->Register("ban", "s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBan, this, "Ban ip for x minutes for any reason");
 	Console()->Register("ban_range", "s[first ip] s[last ip] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBanRange, this, "Ban ip range for x minutes for any reason");
 	Console()->Register("unban", "s[ip|entry]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnban, this, "Unban ip/banlist entry");
 	Console()->Register("unban_range", "s[first ip] s[last ip]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnbanRange, this, "Unban ip range");
 	Console()->Register("unban_all", "", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnbanAll, this, "Unban all entries");
-	Console()->Register("bans", "?i[page]", CFGFLAG_SERVER | CFGFLAG_MASTER, ConBans, this, "Show banlist (page 0 by default, 20 entries per page)");
+	Console()->Register("bans", "?i[page]", CFGFLAG_SERVER | CFGFLAG_MASTER, ConBans, this, "Show banlist (page 1 by default, 20 entries per page)");
 	Console()->Register("bans_save", "s[file]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBansSave, this, "Save banlist in a file");
 }
 
 void CNetBan::Update()
 {
-	int Now = time_timestamp();
+	int64_t Now = time_timestamp();
 
 	// remove expired bans
 	char aBuf[256], aNetStr[256];
@@ -308,15 +309,15 @@ void CNetBan::Update()
 	}
 }
 
-int CNetBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason)
+int CNetBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason, bool VerbatimReason)
 {
-	return Ban(&m_BanAddrPool, pAddr, Seconds, pReason);
+	return Ban(&m_BanAddrPool, pAddr, Seconds, pReason, VerbatimReason);
 }
 
 int CNetBan::BanRange(const CNetRange *pRange, int Seconds, const char *pReason)
 {
 	if(pRange->IsValid())
-		return Ban(&m_BanRangePool, pRange, Seconds, pReason);
+		return Ban(&m_BanRangePool, pRange, Seconds, pReason, false);
 
 	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (invalid range)");
 	return -1;
@@ -414,7 +415,7 @@ void CNetBan::ConBan(IConsole::IResult *pResult, void *pUser)
 
 	NETADDR Addr;
 	if(net_addr_from_str(&Addr, pStr) == 0)
-		pThis->BanAddr(&Addr, Minutes * 60, pReason);
+		pThis->BanAddr(&Addr, Minutes * 60, pReason, false);
 	else
 		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (invalid network address)");
 }
@@ -478,13 +479,31 @@ void CNetBan::ConBans(IConsole::IResult *pResult, void *pUser)
 {
 	CNetBan *pThis = static_cast<CNetBan *>(pUser);
 
-	int Page = pResult->NumArguments() > 0 ? pResult->GetInteger(0) : 0;
+	int Page = pResult->NumArguments() > 0 ? pResult->GetInteger(0) : 1;
 	static const int s_EntriesPerPage = 20;
-	const int Start = Page * s_EntriesPerPage;
-	const int End = (Page + 1) * s_EntriesPerPage;
+	const int Start = (Page - 1) * s_EntriesPerPage;
+	const int End = Page * s_EntriesPerPage;
+	const int NumBans = pThis->m_BanAddrPool.Num() + pThis->m_BanRangePool.Num();
+	const int NumPages = NumBans / s_EntriesPerPage + 1;
 
-	int Count = 0;
 	char aBuf[256], aMsg[256];
+
+	if(NumBans == 0)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "The ban list is empty.");
+
+		return;
+	}
+
+	if(Page <= 0 || Page > NumPages)
+	{
+		str_format(aMsg, sizeof(aMsg), "Invalid page number. There %s %d %s available.", NumPages == 1 ? "is" : "are", NumPages, NumPages == 1 ? "page" : "pages");
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
+
+		return;
+	}
+
+	int Count = 0;
 	for(CBanAddr *pBan = pThis->m_BanAddrPool.First(); pBan; pBan = pBan->m_pNext, Count++)
 	{
 		if(Count < Start || Count >= End)
@@ -505,7 +524,7 @@ void CNetBan::ConBans(IConsole::IResult *pResult, void *pUser)
 		str_format(aMsg, sizeof(aMsg), "#%i %s", Count, aBuf);
 		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
 	}
-	str_format(aMsg, sizeof(aMsg), "%d %s, showing entries %d - %d", Count, Count == 1 ? "ban" : "bans", Start, End - 1);
+	str_format(aMsg, sizeof(aMsg), "%d %s, showing entries %d - %d (page %d/%d)", Count, Count == 1 ? "ban" : "bans", Start, End > Count ? Count - 1 : End - 1, Page, NumPages);
 	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
 }
 
@@ -522,7 +541,7 @@ void CNetBan::ConBansSave(IConsole::IResult *pResult, void *pUser)
 		return;
 	}
 
-	int Now = time_timestamp();
+	int64_t Now = time_timestamp();
 	char aAddrStr1[NETADDR_MAXSTRSIZE], aAddrStr2[NETADDR_MAXSTRSIZE];
 	for(CBanAddr *pBan = pThis->m_BanAddrPool.First(); pBan; pBan = pBan->m_pNext)
 	{
diff --git a/src/engine/shared/netban.h b/src/engine/shared/netban.h
index 6de37e51d9..f51afc07c3 100644
--- a/src/engine/shared/netban.h
+++ b/src/engine/shared/netban.h
@@ -77,10 +77,11 @@ class CNetBan
 		enum
 		{
 			EXPIRES_NEVER = -1,
-			REASON_LENGTH = 64,
+			REASON_LENGTH = 128,
 		};
-		int m_Expires;
+		int64_t m_Expires;
 		char m_aReason[REASON_LENGTH];
+		bool m_VerbatimReason;
 	};
 
 	template<class T>
@@ -150,7 +151,7 @@ class CNetBan
 	template<class T>
 	void MakeBanInfo(const CBan<T> *pBan, char *pBuf, unsigned BuffSize, int Type) const;
 	template<class T>
-	int Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason);
+	int Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason, bool VerbatimReason);
 	template<class T>
 	int Unban(T *pBanPool, const typename T::CDataType *pData);
 
@@ -158,7 +159,7 @@ class CNetBan
 	class IStorage *m_pStorage;
 	CBanAddrPool m_BanAddrPool;
 	CBanRangePool m_BanRangePool;
-	NETADDR m_LocalhostIPV4, m_LocalhostIPV6;
+	NETADDR m_LocalhostIpV4, m_LocalhostIpV6;
 
 public:
 	enum
@@ -176,7 +177,7 @@ class CNetBan
 	void Init(class IConsole *pConsole, class IStorage *pStorage);
 	void Update();
 
-	virtual int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason);
+	virtual int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason, bool VerbatimReason);
 	virtual int BanRange(const CNetRange *pRange, int Seconds, const char *pReason);
 	int UnbanByAddr(const NETADDR *pAddr);
 	int UnbanByRange(const CNetRange *pRange);
@@ -227,7 +228,7 @@ void CNetBan::MakeBanInfo(const CBan<T> *pBan, char *pBuf, unsigned BuffSize, in
 	}
 
 	// add info part
-	if(pBan->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER)
+	if(!pBan->m_Info.m_VerbatimReason && pBan->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER)
 	{
 		int Mins = ((pBan->m_Info.m_Expires - time_timestamp()) + 59) / 60;
 		if(Mins <= 1)
diff --git a/src/engine/shared/network.cpp b/src/engine/shared/network.cpp
index 92e87ce8a0..d427c153d1 100644
--- a/src/engine/shared/network.cpp
+++ b/src/engine/shared/network.cpp
@@ -8,16 +8,26 @@
 
 const unsigned char SECURITY_TOKEN_MAGIC[4] = {'T', 'K', 'E', 'N'};
 
+SECURITY_TOKEN ToSecurityToken(const unsigned char *pData)
+{
+	return bytes_be_to_uint(pData);
+}
+
+void WriteSecurityToken(unsigned char *pData, SECURITY_TOKEN Token)
+{
+	uint_to_bytes_be(pData, Token);
+}
+
 void CNetRecvUnpacker::Clear()
 {
 	m_Valid = false;
 }
 
-void CNetRecvUnpacker::Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientID)
+void CNetRecvUnpacker::Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientId)
 {
 	m_Addr = *pAddr;
 	m_pConnection = pConnection;
-	m_ClientID = ClientID;
+	m_ClientId = ClientId;
 	m_CurrentChunk = 0;
 	m_Valid = true;
 }
@@ -82,7 +92,7 @@ int CNetRecvUnpacker::FetchChunk(CNetChunk *pChunk)
 		}
 
 		// fill in the info
-		pChunk->m_ClientID = m_ClientID;
+		pChunk->m_ClientId = m_ClientId;
 		pChunk->m_Address = m_Addr;
 		pChunk->m_Flags = Header.m_Flags;
 		pChunk->m_DataSize = Header.m_Size;
@@ -131,13 +141,13 @@ void CNetBase::SendPacket(NETSOCKET Socket, NETADDR *pAddr, CNetPacketConstruct
 	if(Sixup)
 	{
 		HeaderSize += sizeof(SecurityToken);
-		mem_copy(&aBuffer[3], &SecurityToken, sizeof(SecurityToken));
+		WriteSecurityToken(aBuffer + 3, SecurityToken);
 	}
 	else if(SecurityToken != NET_SECURITY_TOKEN_UNSUPPORTED)
 	{
 		// append security token
 		// if SecurityToken is NET_SECURITY_TOKEN_UNKNOWN we will still append it hoping to negotiate it
-		mem_copy(&pPacket->m_aChunkData[pPacket->m_DataSize], &SecurityToken, sizeof(SecurityToken));
+		WriteSecurityToken(pPacket->m_aChunkData + pPacket->m_DataSize, SecurityToken);
 		pPacket->m_DataSize += sizeof(SecurityToken);
 	}
 
@@ -223,8 +233,8 @@ int CNetBase::UnpackPacket(unsigned char *pBuffer, int Size, CNetPacketConstruct
 
 		if(Sixup)
 		{
-			mem_copy(pSecurityToken, &pBuffer[1], sizeof(*pSecurityToken));
-			mem_copy(pResponseToken, &pBuffer[5], sizeof(*pResponseToken));
+			*pSecurityToken = ToSecurityToken(pBuffer + 1);
+			*pResponseToken = ToSecurityToken(pBuffer + 5);
 		}
 
 		pPacket->m_Flags = NET_PACKETFLAG_CONNLESS;
@@ -264,7 +274,7 @@ int CNetBase::UnpackPacket(unsigned char *pBuffer, int Size, CNetPacketConstruct
 				Flags |= NET_PACKETFLAG_COMPRESSION;
 			pPacket->m_Flags = Flags;
 
-			mem_copy(pSecurityToken, &pBuffer[3], sizeof(*pSecurityToken));
+			*pSecurityToken = ToSecurityToken(pBuffer + 3);
 		}
 
 		if(pPacket->m_Flags & NET_PACKETFLAG_COMPRESSION)
@@ -288,6 +298,18 @@ int CNetBase::UnpackPacket(unsigned char *pBuffer, int Size, CNetPacketConstruct
 		return -1;
 	}
 
+	// set the response token (a bit hacky because this function shouldn't know about control packets)
+	if(pPacket->m_Flags & NET_PACKETFLAG_CONTROL)
+	{
+		if(pPacket->m_DataSize >= 5) // control byte + token
+		{
+			if(pPacket->m_aChunkData[0] == NET_CTRLMSG_CONNECT || pPacket->m_aChunkData[0] == NET_CTRLMSG_TOKEN)
+			{
+				*pResponseToken = ToSecurityToken(&pPacket->m_aChunkData[1]);
+			}
+		}
+	}
+
 	// log the data
 	if(ms_DataLogRecv)
 	{
@@ -317,6 +339,19 @@ void CNetBase::SendControlMsg(NETSOCKET Socket, NETADDR *pAddr, int Ack, int Con
 	CNetBase::SendPacket(Socket, pAddr, &Construct, SecurityToken, Sixup, true);
 }
 
+void CNetBase::SendControlMsgWithToken7(NETSOCKET Socket, NETADDR *pAddr, TOKEN Token, int Ack, int ControlMsg, TOKEN MyToken, bool Extended)
+{
+	dbg_assert((Token & ~NET_TOKEN_MASK) == 0, "token out of range");
+	dbg_assert((MyToken & ~NET_TOKEN_MASK) == 0, "resp token out of range");
+
+	unsigned char s_aRequestTokenBuf[NET_TOKENREQUEST_DATASIZE];
+	s_aRequestTokenBuf[0] = (MyToken >> 24) & 0xff;
+	s_aRequestTokenBuf[1] = (MyToken >> 16) & 0xff;
+	s_aRequestTokenBuf[2] = (MyToken >> 8) & 0xff;
+	s_aRequestTokenBuf[3] = (MyToken)&0xff;
+	CNetBase::SendControlMsg(Socket, pAddr, 0, ControlMsg, s_aRequestTokenBuf, Extended ? sizeof(s_aRequestTokenBuf) : 4, Token, true);
+}
+
 unsigned char *CNetChunkHeader::Pack(unsigned char *pData, int Split) const
 {
 	pData[0] = ((m_Flags & 3) << 6) | ((m_Size >> Split) & 0x3f);
diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index 7ab0de5b5f..7cea700c10 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -65,10 +65,11 @@ enum
 	NET_SEQUENCE_MASK = NET_MAX_SEQUENCE - 1,
 
 	NET_CONNSTATE_OFFLINE = 0,
-	NET_CONNSTATE_CONNECT = 1,
-	NET_CONNSTATE_PENDING = 2,
-	NET_CONNSTATE_ONLINE = 3,
-	NET_CONNSTATE_ERROR = 4,
+	NET_CONNSTATE_TOKEN = 1,
+	NET_CONNSTATE_CONNECT = 2,
+	NET_CONNSTATE_PENDING = 3,
+	NET_CONNSTATE_ONLINE = 4,
+	NET_CONNSTATE_ERROR = 5,
 
 	NET_PACKETFLAG_UNUSED = 1 << 0,
 	NET_PACKETFLAG_TOKEN = 1 << 1,
@@ -87,6 +88,7 @@ enum
 	NET_CTRLMSG_CONNECTACCEPT = 2,
 	NET_CTRLMSG_ACCEPT = 3,
 	NET_CTRLMSG_CLOSE = 4,
+	NET_CTRLMSG_TOKEN = 5,
 
 	NET_CONN_BUFFERSIZE = 1024 * 32,
 
@@ -94,10 +96,20 @@ enum
 
 	NET_ENUM_TERMINATOR
 };
+enum
+{
+	NET_TOKEN_MAX = 0xffffffff,
+	NET_TOKEN_NONE = NET_TOKEN_MAX,
+	NET_TOKEN_MASK = NET_TOKEN_MAX,
+
+	NET_TOKENREQUEST_DATASIZE = 512,
+};
 
 typedef int SECURITY_TOKEN;
+typedef unsigned int TOKEN;
 
-SECURITY_TOKEN ToSecurityToken(unsigned char *pData);
+SECURITY_TOKEN ToSecurityToken(const unsigned char *pData);
+void WriteSecurityToken(unsigned char *pData, SECURITY_TOKEN Token);
 
 extern const unsigned char SECURITY_TOKEN_MAGIC[4];
 
@@ -107,17 +119,17 @@ enum
 	NET_SECURITY_TOKEN_UNSUPPORTED = 0,
 };
 
-typedef int (*NETFUNC_DELCLIENT)(int ClientID, const char *pReason, void *pUser);
-typedef int (*NETFUNC_NEWCLIENT_CON)(int ClientID, void *pUser);
-typedef int (*NETFUNC_NEWCLIENT)(int ClientID, void *pUser, bool Sixup);
-typedef int (*NETFUNC_NEWCLIENT_NOAUTH)(int ClientID, void *pUser);
-typedef int (*NETFUNC_CLIENTREJOIN)(int ClientID, void *pUser);
+typedef int (*NETFUNC_DELCLIENT)(int ClientId, const char *pReason, void *pUser);
+typedef int (*NETFUNC_NEWCLIENT_CON)(int ClientId, void *pUser);
+typedef int (*NETFUNC_NEWCLIENT)(int ClientId, void *pUser, bool Sixup);
+typedef int (*NETFUNC_NEWCLIENT_NOAUTH)(int ClientId, void *pUser);
+typedef int (*NETFUNC_CLIENTREJOIN)(int ClientId, void *pUser);
 
 struct CNetChunk
 {
 	// -1 means that it's a stateless packet
 	// 0 on the client means the server
-	int m_ClientID;
+	int m_ClientId;
 	NETADDR m_Address; // only used when client_id == -1
 	int m_Flags;
 	int m_DataSize;
@@ -216,7 +228,10 @@ class CNetConnection
 	unsigned short m_PeerAck;
 	unsigned m_State;
 
+public:
 	SECURITY_TOKEN m_SecurityToken;
+
+private:
 	int m_RemoteClosed;
 	bool m_BlockCloseMsg;
 	bool m_UnknownSeq;
@@ -237,6 +252,12 @@ class CNetConnection
 	NETSOCKET m_Socket;
 	NETSTATS m_Stats;
 
+	char m_aPeerAddrStr[NETADDR_MAXSTRSIZE];
+	// client 0.7
+	static TOKEN GenerateToken7(const NETADDR *pPeerAddr);
+	class CNetBase *m_pNetBase;
+	bool IsSixup() { return m_Sixup; }
+
 	//
 	void ResetStats();
 	void SetError(const char *pString);
@@ -245,6 +266,7 @@ class CNetConnection
 	int QueueChunkEx(int Flags, int DataSize, const void *pData, int Sequence);
 	void SendConnect();
 	void SendControl(int ControlMsg, const void *pExtra, int ExtraSize);
+	void SendControlWithToken7(int ControlMsg, SECURITY_TOKEN ResponseToken);
 	void ResendChunk(CNetChunkResend *pResend);
 	void Resend();
 
@@ -252,21 +274,25 @@ class CNetConnection
 	bool m_TimeoutProtected;
 	bool m_TimeoutSituation;
 
+	void SetToken7(TOKEN Token);
+
 	void Reset(bool Rejoin = false);
 	void Init(NETSOCKET Socket, bool BlockCloseMsg);
 	int Connect(const NETADDR *pAddr, int NumAddrs);
+	int Connect7(const NETADDR *pAddr, int NumAddrs);
 	void Disconnect(const char *pReason);
 
 	int Update();
 	int Flush();
 
-	int Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED);
+	int Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED, SECURITY_TOKEN ResponseToken = NET_SECURITY_TOKEN_UNSUPPORTED);
 	int QueueChunk(int Flags, int DataSize, const void *pData);
 
 	const char *ErrorString();
 	void SignalResend();
 	int State() const { return m_State; }
 	const NETADDR *PeerAddress() const { return &m_PeerAddr; }
+	const char (*PeerAddressString() const)[NETADDR_MAXSTRSIZE] { return &m_aPeerAddrStr; }
 	void ConnectAddresses(const NETADDR **ppAddrs, int *pNumAddrs) const
 	{
 		*ppAddrs = m_aConnectAddrs;
@@ -334,13 +360,13 @@ class CNetRecvUnpacker
 	NETADDR m_Addr;
 	CNetConnection *m_pConnection;
 	int m_CurrentChunk;
-	int m_ClientID;
+	int m_ClientId;
 	CNetPacketConstruct m_Data;
 	unsigned char m_aBuffer[NET_MAX_PACKETSIZE];
 
 	CNetRecvUnpacker() { Clear(); }
 	void Clear();
-	void Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientID);
+	void Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientId);
 	int FetchChunk(CNetChunk *pChunk);
 };
 
@@ -365,7 +391,7 @@ class CNetServer
 	CNetBan *m_pNetBan;
 	CSlot m_aSlots[NET_MAX_CLIENTS];
 	int m_MaxClients;
-	int m_MaxClientsPerIP;
+	int m_MaxClientsPerIp;
 
 	NETFUNC_NEWCLIENT m_pfnNewClient;
 	NETFUNC_NEWCLIENT_NOAUTH m_pfnNewClientNoAuth;
@@ -388,7 +414,7 @@ class CNetServer
 	void OnTokenCtrlMsg(NETADDR &Addr, int ControlMsg, const CNetPacketConstruct &Packet);
 	int OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg, const CNetPacketConstruct &Packet, SECURITY_TOKEN &ResponseToken, SECURITY_TOKEN Token);
 	void OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet);
-	void OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, const CNetPacketConstruct &Packet);
+	void OnConnCtrlMsg(NETADDR &Addr, int ClientId, int ControlMsg, const CNetPacketConstruct &Packet);
 	bool ClientExists(const NETADDR &Addr) { return GetClientSlot(Addr) != -1; }
 	int GetClientSlot(const NETADDR &Addr);
 	void SendControl(NETADDR &Addr, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken);
@@ -403,7 +429,7 @@ class CNetServer
 	int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_NEWCLIENT_NOAUTH pfnNewClientNoAuth, NETFUNC_CLIENTREJOIN pfnClientRejoin, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
 
 	//
-	bool Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIP);
+	bool Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIp);
 	int Close();
 
 	//
@@ -412,11 +438,12 @@ class CNetServer
 	int Update();
 
 	//
-	int Drop(int ClientID, const char *pReason);
+	int Drop(int ClientId, const char *pReason);
 
 	// status requests
-	const NETADDR *ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
-	bool HasSecurityToken(int ClientID) const { return m_aSlots[ClientID].m_Connection.SecurityToken() != NET_SECURITY_TOKEN_UNSUPPORTED; }
+	const NETADDR *ClientAddr(int ClientId) const { return m_aSlots[ClientId].m_Connection.PeerAddress(); }
+	const char (*ClientAddrString(int ClientID) const)[NETADDR_MAXSTRSIZE] { return m_aSlots[ClientID].m_Connection.PeerAddressString(); }
+	bool HasSecurityToken(int ClientId) const { return m_aSlots[ClientId].m_Connection.SecurityToken() != NET_SECURITY_TOKEN_UNSUPPORTED; }
 	NETADDR Address() const { return m_Address; }
 	NETSOCKET Socket() const { return m_Socket; }
 	CNetBan *NetBan() const { return m_pNetBan; }
@@ -427,12 +454,12 @@ class CNetServer
 	int SendConnlessSixup(CNetChunk *pChunk, SECURITY_TOKEN ResponseToken);
 
 	//
-	void SetMaxClientsPerIP(int Max);
-	bool SetTimedOut(int ClientID, int OrigID);
-	void SetTimeoutProtected(int ClientID);
+	void SetMaxClientsPerIp(int Max);
+	bool SetTimedOut(int ClientId, int OrigId);
+	void SetTimeoutProtected(int ClientId);
 
-	int ResetErrorString(int ClientID);
-	const char *ErrorString(int ClientID);
+	int ResetErrorString(int ClientId);
+	const char *ErrorString(int ClientId);
 
 	// anti spoof
 	SECURITY_TOKEN GetGlobalToken();
@@ -466,16 +493,16 @@ class CNetConsole
 	int Close();
 
 	//
-	int Recv(char *pLine, int MaxLength, int *pClientID = nullptr);
-	int Send(int ClientID, const char *pLine);
+	int Recv(char *pLine, int MaxLength, int *pClientId = nullptr);
+	int Send(int ClientId, const char *pLine);
 	int Update();
 
 	//
 	int AcceptClient(NETSOCKET Socket, const NETADDR *pAddr);
-	int Drop(int ClientID, const char *pReason);
+	int Drop(int ClientId, const char *pReason);
 
 	// status requests
-	const NETADDR *ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
+	const NETADDR *ClientAddr(int ClientId) const { return m_aSlots[ClientId].m_Connection.PeerAddress(); }
 	CNetBan *NetBan() const { return m_pNetBan; }
 };
 
@@ -496,9 +523,10 @@ class CNetClient
 	// connection state
 	int Disconnect(const char *pReason);
 	int Connect(const NETADDR *pAddr, int NumAddrs);
+	int Connect7(const NETADDR *pAddr, int NumAddrs);
 
 	// communication
-	int Recv(CNetChunk *pChunk);
+	int Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken, bool Sixup);
 	int Send(CNetChunk *pChunk);
 
 	// pumping
@@ -515,8 +543,6 @@ class CNetClient
 	int GotProblems(int64_t MaxLatency) const;
 	const char *ErrorString() const;
 
-	bool SecurityTokenUnknown() { return m_Connection.SecurityToken() == NET_SECURITY_TOKEN_UNKNOWN; }
-
 	// stun
 	void FeedStunServer(NETADDR StunServer);
 	void RefreshStun();
@@ -538,6 +564,7 @@ class CNetBase
 	static int Decompress(const void *pData, int DataSize, void *pOutput, int OutputSize);
 
 	static void SendControlMsg(NETSOCKET Socket, NETADDR *pAddr, int Ack, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken, bool Sixup = false);
+	static void SendControlMsgWithToken7(NETSOCKET Socket, NETADDR *pAddr, TOKEN Token, int Ack, int ControlMsg, TOKEN MyToken, bool Extended);
 	static void SendPacketConnless(NETSOCKET Socket, NETADDR *pAddr, const void *pData, int DataSize, bool Extended, unsigned char aExtra[4]);
 	static void SendPacket(NETSOCKET Socket, NETADDR *pAddr, CNetPacketConstruct *pPacket, SECURITY_TOKEN SecurityToken, bool Sixup = false, bool NoCompress = false);
 
diff --git a/src/engine/shared/network_client.cpp b/src/engine/shared/network_client.cpp
index a978154752..7d80272153 100644
--- a/src/engine/shared/network_client.cpp
+++ b/src/engine/shared/network_client.cpp
@@ -56,13 +56,19 @@ int CNetClient::Connect(const NETADDR *pAddr, int NumAddrs)
 	return 0;
 }
 
+int CNetClient::Connect7(const NETADDR *pAddr, int NumAddrs)
+{
+	m_Connection.Connect7(pAddr, NumAddrs);
+	return 0;
+}
+
 int CNetClient::ResetErrorString()
 {
 	m_Connection.ResetErrorString();
 	return 0;
 }
 
-int CNetClient::Recv(CNetChunk *pChunk)
+int CNetClient::Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken, bool Sixup)
 {
 	while(true)
 	{
@@ -83,14 +89,17 @@ int CNetClient::Recv(CNetChunk *pChunk)
 		{
 			continue;
 		}
+		if(Sixup)
+			Addr.type |= NETTYPE_TW7;
 
-		bool Sixup = false;
-		if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup) == 0)
+		SECURITY_TOKEN Token;
+		*pResponseToken = NET_SECURITY_TOKEN_UNKNOWN;
+		if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup, &Token, pResponseToken) == 0)
 		{
 			if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONNLESS)
 			{
 				pChunk->m_Flags = NETSENDFLAG_CONNLESS;
-				pChunk->m_ClientID = -1;
+				pChunk->m_ClientId = -1;
 				pChunk->m_Address = Addr;
 				pChunk->m_DataSize = m_RecvUnpacker.m_Data.m_DataSize;
 				pChunk->m_pData = m_RecvUnpacker.m_Data.m_aChunkData;
@@ -103,7 +112,7 @@ int CNetClient::Recv(CNetChunk *pChunk)
 			}
 			else
 			{
-				if(m_Connection.State() != NET_CONNSTATE_OFFLINE && m_Connection.State() != NET_CONNSTATE_ERROR && m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr))
+				if(m_Connection.State() != NET_CONNSTATE_OFFLINE && m_Connection.State() != NET_CONNSTATE_ERROR && m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr, Token, *pResponseToken))
 					m_RecvUnpacker.Start(&Addr, &m_Connection, 0);
 			}
 		}
@@ -128,7 +137,7 @@ int CNetClient::Send(CNetChunk *pChunk)
 	else
 	{
 		int Flags = 0;
-		dbg_assert(pChunk->m_ClientID == 0, "erroneous client id");
+		dbg_assert(pChunk->m_ClientId == 0, "erroneous client id");
 
 		if(pChunk->m_Flags & NETSENDFLAG_VITAL)
 			Flags = NET_CHUNKFLAG_VITAL;
diff --git a/src/engine/shared/network_conn.cpp b/src/engine/shared/network_conn.cpp
index 50961465d8..2826b1a6e3 100644
--- a/src/engine/shared/network_conn.cpp
+++ b/src/engine/shared/network_conn.cpp
@@ -4,15 +4,11 @@
 #include "network.h"
 #include <base/system.h>
 
-SECURITY_TOKEN ToSecurityToken(unsigned char *pData)
-{
-	return (int)pData[0] | (pData[1] << 8) | (pData[2] << 16) | (pData[3] << 24);
-}
-
 void CNetConnection::ResetStats()
 {
 	mem_zero(&m_Stats, sizeof(m_Stats));
 	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	m_aPeerAddrStr[0] = '\0';
 	m_LastUpdateTime = 0;
 }
 
@@ -201,6 +197,8 @@ int CNetConnection::Connect(const NETADDR *pAddr, int NumAddrs)
 	// init connection
 	Reset();
 	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	m_aPeerAddrStr[0] = '\0';
+
 	for(int i = 0; i < NumAddrs; i++)
 	{
 		m_aConnectAddrs[i] = pAddr[i];
@@ -212,6 +210,51 @@ int CNetConnection::Connect(const NETADDR *pAddr, int NumAddrs)
 	return 0;
 }
 
+void CNetConnection::SendControlWithToken7(int ControlMsg, SECURITY_TOKEN ResponseToken)
+{
+	m_LastSendTime = time_get();
+
+	CNetBase::SendControlMsgWithToken7(m_Socket, &m_PeerAddr, ResponseToken, 0, ControlMsg, m_Token, true);
+}
+
+int CNetConnection::Connect7(const NETADDR *pAddr, int NumAddrs)
+{
+	if(State() != NET_CONNSTATE_OFFLINE)
+		return -1;
+
+	// init connection
+	Reset();
+	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		m_aConnectAddrs[i] = pAddr[i];
+	}
+	m_LastRecvTime = time_get();
+	m_NumConnectAddrs = NumAddrs;
+	m_PeerAddr = *pAddr;
+	SetToken7(GenerateToken7(pAddr));
+	mem_zero(m_aErrorString, sizeof(m_aErrorString));
+	m_State = NET_CONNSTATE_TOKEN;
+	SendControlWithToken7(NET_CTRLMSG_TOKEN, NET_TOKEN_NONE);
+	m_Sixup = true;
+	return 0;
+}
+
+void CNetConnection::SetToken7(TOKEN Token)
+{
+	if(State() != NET_CONNSTATE_OFFLINE)
+		return;
+
+	m_Token = Token;
+}
+
+TOKEN CNetConnection::GenerateToken7(const NETADDR *pPeerAddr)
+{
+	TOKEN Token;
+	secure_random_fill(&Token, sizeof(Token));
+	return Token;
+}
+
 void CNetConnection::Disconnect(const char *pReason)
 {
 	if(State() == NET_CONNSTATE_OFFLINE)
@@ -245,6 +288,7 @@ void CNetConnection::DirectInit(const NETADDR &Addr, SECURITY_TOKEN SecurityToke
 	m_State = NET_CONNSTATE_ONLINE;
 
 	m_PeerAddr = Addr;
+	net_addr_str(&Addr, m_aPeerAddrStr, sizeof(m_aPeerAddrStr), true);
 	mem_zero(m_aErrorString, sizeof(m_aErrorString));
 
 	int64_t Now = time_get();
@@ -257,7 +301,7 @@ void CNetConnection::DirectInit(const NETADDR &Addr, SECURITY_TOKEN SecurityToke
 	m_Sixup = Sixup;
 }
 
-int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken)
+int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken, SECURITY_TOKEN ResponseToken)
 {
 	// Disregard packets from the wrong address, unless we don't know our peer yet.
 	if(State() != NET_CONNSTATE_OFFLINE && State() != NET_CONNSTATE_CONNECT && *pAddr != m_PeerAddr)
@@ -326,10 +370,10 @@ int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_
 				m_State = NET_CONNSTATE_ERROR;
 				m_RemoteClosed = 1;
 
-				char aStr[128] = {0};
+				char aStr[256] = {0};
 				if(pPacket->m_DataSize > 1)
 				{
-					// make sure to sanitize the error string form the other party
+					// make sure to sanitize the error string from the other party
 					str_copy(aStr, (char *)&pPacket->m_aChunkData[1], minimum(pPacket->m_DataSize, (int)sizeof(aStr)));
 					str_sanitize_cc(aStr);
 				}
@@ -347,61 +391,80 @@ int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_
 		}
 		else
 		{
-			if(State() == NET_CONNSTATE_OFFLINE)
+			if(CtrlMsg == NET_CTRLMSG_TOKEN)
 			{
-				if(CtrlMsg == NET_CTRLMSG_CONNECT)
+				if(State() == NET_CONNSTATE_TOKEN)
 				{
-					if(net_addr_comp_noport(&m_PeerAddr, pAddr) == 0 && time_get() - m_LastUpdateTime < time_freq() * 3)
-						return 0;
-
-					// send response and init connection
-					Reset();
-					m_State = NET_CONNSTATE_PENDING;
-					m_PeerAddr = *pAddr;
-					mem_zero(m_aErrorString, sizeof(m_aErrorString));
-					m_LastSendTime = Now;
 					m_LastRecvTime = Now;
-					m_LastUpdateTime = Now;
-					if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
-					{
-						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
-						if(g_Config.m_Debug)
-							dbg_msg("security", "generated token %d", m_SecurityToken);
-					}
-					else
-					{
-						if(g_Config.m_Debug)
-							dbg_msg("security", "token not supported by client (packet size %d)", pPacket->m_DataSize);
-						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
-					}
-					SendControl(NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC));
-					if(g_Config.m_Debug)
-						dbg_msg("connection", "got connection, sending connect+accept");
+					m_State = NET_CONNSTATE_CONNECT;
+					m_SecurityToken = ResponseToken;
+					SendControlWithToken7(NET_CTRLMSG_CONNECT, m_SecurityToken);
+					dbg_msg("connection", "got token, replying, token=%x mytoken=%x", m_SecurityToken, m_Token);
 				}
+				else if(g_Config.m_Debug)
+					dbg_msg("connection", "got token, token=%x", ResponseToken);
 			}
-			else if(State() == NET_CONNSTATE_CONNECT)
+			else
 			{
-				// connection made
-				if(CtrlMsg == NET_CTRLMSG_CONNECTACCEPT)
+				if(State() == NET_CONNSTATE_OFFLINE)
 				{
-					m_PeerAddr = *pAddr;
-					if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
+					if(CtrlMsg == NET_CTRLMSG_CONNECT)
 					{
-						m_SecurityToken = ToSecurityToken(&pPacket->m_aChunkData[1 + sizeof(SECURITY_TOKEN_MAGIC)]);
+						if(net_addr_comp_noport(&m_PeerAddr, pAddr) == 0 && time_get() - m_LastUpdateTime < time_freq() * 3)
+							return 0;
+
+						// send response and init connection
+						Reset();
+						m_State = NET_CONNSTATE_PENDING;
+						m_PeerAddr = *pAddr;
+						net_addr_str(pAddr, m_aPeerAddrStr, sizeof(m_aPeerAddrStr), true);
+						mem_zero(m_aErrorString, sizeof(m_aErrorString));
+						m_LastSendTime = Now;
+						m_LastRecvTime = Now;
+						m_LastUpdateTime = Now;
+						if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
+						{
+							m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+							if(g_Config.m_Debug)
+								dbg_msg("security", "generated token %d", m_SecurityToken);
+						}
+						else
+						{
+							if(g_Config.m_Debug)
+								dbg_msg("security", "token not supported by client (packet size %d)", pPacket->m_DataSize);
+							m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+						}
+						SendControl(NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC));
 						if(g_Config.m_Debug)
-							dbg_msg("security", "got token %d", m_SecurityToken);
+							dbg_msg("connection", "got connection, sending connect+accept");
 					}
-					else
+				}
+				else if(State() == NET_CONNSTATE_CONNECT)
+				{
+					// connection made
+					if(CtrlMsg == NET_CTRLMSG_CONNECTACCEPT)
 					{
-						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+						m_PeerAddr = *pAddr;
+						net_addr_str(pAddr, m_aPeerAddrStr, sizeof(m_aPeerAddrStr), true);
+						if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
+						{
+							m_SecurityToken = ToSecurityToken(&pPacket->m_aChunkData[1 + sizeof(SECURITY_TOKEN_MAGIC)]);
+							if(g_Config.m_Debug)
+								dbg_msg("security", "got token %d", m_SecurityToken);
+						}
+						else if(!IsSixup())
+						{
+							m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+							if(g_Config.m_Debug)
+								dbg_msg("security", "token not supported by server");
+						}
+						if(!IsSixup())
+							SendControl(NET_CTRLMSG_ACCEPT, 0, 0);
+						m_LastRecvTime = Now;
+						m_State = NET_CONNSTATE_ONLINE;
 						if(g_Config.m_Debug)
-							dbg_msg("security", "token not supported by server");
+							dbg_msg("connection", "got connect+accept, sending accept. connection online");
 					}
-					m_LastRecvTime = Now;
-					SendControl(NET_CTRLMSG_ACCEPT, 0, 0);
-					m_State = NET_CONNSTATE_ONLINE;
-					if(g_Config.m_Debug)
-						dbg_msg("connection", "got connect+accept, sending accept. connection online");
 				}
 			}
 		}
@@ -460,7 +523,7 @@ int CNetConnection::Update()
 		if(Now - pResend->m_FirstSendTime > time_freq() * g_Config.m_ConnTimeout)
 		{
 			m_State = NET_CONNSTATE_ERROR;
-			char aBuf[512];
+			char aBuf[128];
 			str_format(aBuf, sizeof(aBuf), "Too weak connection (not acked for %d seconds)", g_Config.m_ConnTimeout);
 			SetError(aBuf);
 			m_TimeoutSituation = true;
@@ -510,6 +573,7 @@ void CNetConnection::SetTimedOut(const NETADDR *pAddr, int Sequence, int Ack, SE
 
 	m_State = NET_CONNSTATE_ONLINE;
 	m_PeerAddr = *pAddr;
+	net_addr_str(pAddr, m_aPeerAddrStr, sizeof(m_aPeerAddrStr), true);
 	mem_zero(m_aErrorString, sizeof(m_aErrorString));
 	m_LastSendTime = Now;
 	m_LastRecvTime = Now;
diff --git a/src/engine/shared/network_console.cpp b/src/engine/shared/network_console.cpp
index 27c2fd2d16..b03dd95889 100644
--- a/src/engine/shared/network_console.cpp
+++ b/src/engine/shared/network_console.cpp
@@ -42,12 +42,12 @@ int CNetConsole::Close()
 	return 0;
 }
 
-int CNetConsole::Drop(int ClientID, const char *pReason)
+int CNetConsole::Drop(int ClientId, const char *pReason)
 {
 	if(m_pfnDelClient)
-		m_pfnDelClient(ClientID, pReason, m_pUser);
+		m_pfnDelClient(ClientId, pReason, m_pUser);
 
-	m_aSlots[ClientID].m_Connection.Disconnect(pReason);
+	m_aSlots[ClientId].m_Connection.Disconnect(pReason);
 
 	return 0;
 }
@@ -121,24 +121,24 @@ int CNetConsole::Update()
 	return 0;
 }
 
-int CNetConsole::Recv(char *pLine, int MaxLength, int *pClientID)
+int CNetConsole::Recv(char *pLine, int MaxLength, int *pClientId)
 {
 	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
 	{
 		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ONLINE && m_aSlots[i].m_Connection.Recv(pLine, MaxLength))
 		{
-			if(pClientID)
-				*pClientID = i;
+			if(pClientId)
+				*pClientId = i;
 			return 1;
 		}
 	}
 	return 0;
 }
 
-int CNetConsole::Send(int ClientID, const char *pLine)
+int CNetConsole::Send(int ClientId, const char *pLine)
 {
-	if(m_aSlots[ClientID].m_Connection.State() == NET_CONNSTATE_ONLINE)
-		return m_aSlots[ClientID].m_Connection.Send(pLine);
+	if(m_aSlots[ClientId].m_Connection.State() == NET_CONNSTATE_ONLINE)
+		return m_aSlots[ClientId].m_Connection.Send(pLine);
 	else
 		return -1;
 }
diff --git a/src/engine/shared/network_console_conn.cpp b/src/engine/shared/network_console_conn.cpp
index 7bae792fc3..9ab375d4c3 100644
--- a/src/engine/shared/network_console_conn.cpp
+++ b/src/engine/shared/network_console_conn.cpp
@@ -143,7 +143,7 @@ int CConsoleNetConnection::Recv(char *pLine, int MaxLength)
 			str_sanitize_cc(pLine);
 			mem_move(m_aBuffer, m_aBuffer + EndOffset, m_BufferOffset - EndOffset);
 			m_BufferOffset -= EndOffset;
-			return 1;
+			return str_utf8_check(pLine);
 		}
 	}
 	return 0;
diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp
index 0dd81393c7..e72bc2000a 100644
--- a/src/engine/shared/network_server.cpp
+++ b/src/engine/shared/network_server.cpp
@@ -36,12 +36,7 @@ const unsigned char g_aDummyMapData[] = {
 	0x78, 0x9C, 0x63, 0x64, 0x60, 0x60, 0x60, 0x44, 0xC2, 0x00, 0x00, 0x38,
 	0x00, 0x05};
 
-static SECURITY_TOKEN ToSecurityToken(const unsigned char *pData)
-{
-	return (int)pData[0] | (pData[1] << 8) | (pData[2] << 16) | (pData[3] << 24);
-}
-
-bool CNetServer::Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIP)
+bool CNetServer::Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIp)
 {
 	// zero out the whole structure
 	this->~CNetServer();
@@ -56,7 +51,7 @@ bool CNetServer::Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int Ma
 	m_pNetBan = pNetBan;
 
 	m_MaxClients = clamp(MaxClients, 1, (int)NET_MAX_CLIENTS);
-	m_MaxClientsPerIP = MaxClientsPerIP;
+	m_MaxClientsPerIp = MaxClientsPerIp;
 
 	m_NumConAttempts = 0;
 	m_TimeNumConAttempts = time_get();
@@ -97,14 +92,14 @@ int CNetServer::Close()
 	return net_udp_close(m_Socket);
 }
 
-int CNetServer::Drop(int ClientID, const char *pReason)
+int CNetServer::Drop(int ClientId, const char *pReason)
 {
 	// TODO: insert lots of checks here
 
 	if(m_pfnDelClient)
-		m_pfnDelClient(ClientID, pReason, m_pUser);
+		m_pfnDelClient(ClientId, pReason, m_pUser);
 
-	m_aSlots[ClientID].m_Connection.Disconnect(pReason);
+	m_aSlots[ClientId].m_Connection.Disconnect(pReason);
 
 	return 0;
 }
@@ -127,8 +122,8 @@ int CNetServer::Update()
 
 SECURITY_TOKEN CNetServer::GetGlobalToken()
 {
-	static NETADDR NullAddr = {0};
-	return GetToken(NullAddr);
+	static const NETADDR NULL_ADDR = {0};
+	return GetToken(NULL_ADDR);
 }
 SECURITY_TOKEN CNetServer::GetToken(const NETADDR &Addr)
 {
@@ -219,10 +214,10 @@ int CNetServer::TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, boo
 	}
 
 	// check for sv_max_clients_per_ip
-	if(NumClientsWithAddr(Addr) + 1 > m_MaxClientsPerIP)
+	if(NumClientsWithAddr(Addr) + 1 > m_MaxClientsPerIp)
 	{
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "Only %d players with the same IP are allowed", m_MaxClientsPerIP);
+		str_format(aBuf, sizeof(aBuf), "Only %d players with the same IP are allowed", m_MaxClientsPerIp);
 		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aBuf, str_length(aBuf) + 1, SecurityToken, Sixup);
 		return -1; // failed to add client
 	}
@@ -465,7 +460,7 @@ void CNetServer::OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet)
 	}
 }
 
-void CNetServer::OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, const CNetPacketConstruct &Packet)
+void CNetServer::OnConnCtrlMsg(NETADDR &Addr, int ClientId, int ControlMsg, const CNetPacketConstruct &Packet)
 {
 	if(ControlMsg == NET_CTRLMSG_CONNECT)
 	{
@@ -483,7 +478,7 @@ void CNetServer::OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, cons
 		}
 
 		if(g_Config.m_Debug)
-			dbg_msg("security", "client %d wants to reconnect", ClientID);
+			dbg_msg("security", "client %d wants to reconnect", ClientId);
 	}
 	else if(ControlMsg == NET_CTRLMSG_ACCEPT && Packet.m_DataSize == 1 + sizeof(SECURITY_TOKEN))
 	{
@@ -493,11 +488,11 @@ void CNetServer::OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, cons
 			// correct token
 			// try to accept client
 			if(g_Config.m_Debug)
-				dbg_msg("security", "client %d reconnect", ClientID);
+				dbg_msg("security", "client %d reconnect", ClientId);
 
 			// reset netconn and process rejoin
-			m_aSlots[ClientID].m_Connection.Reset(true);
-			m_pfnClientRejoin(ClientID, m_pUser);
+			m_aSlots[ClientId].m_Connection.Reset(true);
+			m_pfnClientRejoin(ClientId, m_pUser);
 		}
 	}
 }
@@ -545,7 +540,7 @@ int CNetServer::OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg,
 	if(m_RecvUnpacker.m_Data.m_DataSize < 5 || ClientExists(Addr))
 		return 0; // silently ignore
 
-	mem_copy(&ResponseToken, Packet.m_aChunkData + 1, 4);
+	ResponseToken = ToSecurityToken(Packet.m_aChunkData + 1);
 
 	if(ControlMsg == 5)
 	{
@@ -557,7 +552,7 @@ int CNetServer::OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg,
 
 		// Is this behaviour safe to rely on?
 		pChunk->m_Flags = 0;
-		pChunk->m_ClientID = -1;
+		pChunk->m_ClientId = -1;
 		pChunk->m_Address = Addr;
 		pChunk->m_DataSize = 0;
 		return 1;
@@ -645,7 +640,6 @@ int CNetServer::Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken)
 
 		SECURITY_TOKEN Token;
 		bool Sixup = false;
-		*pResponseToken = NET_SECURITY_TOKEN_UNKNOWN;
 		if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup, &Token, pResponseToken) == 0)
 		{
 			if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONNLESS)
@@ -654,7 +648,7 @@ int CNetServer::Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken)
 					continue;
 
 				pChunk->m_Flags = NETSENDFLAG_CONNLESS;
-				pChunk->m_ClientID = -1;
+				pChunk->m_ClientId = -1;
 				pChunk->m_Address = Addr;
 				pChunk->m_DataSize = m_RecvUnpacker.m_Data.m_DataSize;
 				pChunk->m_pData = m_RecvUnpacker.m_Data.m_aChunkData;
@@ -690,7 +684,7 @@ int CNetServer::Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken)
 					if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONTROL)
 						OnConnCtrlMsg(Addr, Slot, m_RecvUnpacker.m_Data.m_aChunkData[0], m_RecvUnpacker.m_Data);
 
-					if(m_aSlots[Slot].m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr, Token))
+					if(m_aSlots[Slot].m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr, Token, *pResponseToken))
 					{
 						if(m_RecvUnpacker.m_Data.m_DataSize)
 							m_RecvUnpacker.Start(&Addr, &m_aSlots[Slot].m_Connection, Slot);
@@ -740,20 +734,20 @@ int CNetServer::Send(CNetChunk *pChunk)
 	else
 	{
 		int Flags = 0;
-		dbg_assert(pChunk->m_ClientID >= 0, "erroneous client id");
-		dbg_assert(pChunk->m_ClientID < MaxClients(), "erroneous client id");
+		dbg_assert(pChunk->m_ClientId >= 0, "erroneous client id");
+		dbg_assert(pChunk->m_ClientId < MaxClients(), "erroneous client id");
 
 		if(pChunk->m_Flags & NETSENDFLAG_VITAL)
 			Flags = NET_CHUNKFLAG_VITAL;
 
-		if(m_aSlots[pChunk->m_ClientID].m_Connection.QueueChunk(Flags, pChunk->m_DataSize, pChunk->m_pData) == 0)
+		if(m_aSlots[pChunk->m_ClientId].m_Connection.QueueChunk(Flags, pChunk->m_DataSize, pChunk->m_pData) == 0)
 		{
 			if(pChunk->m_Flags & NETSENDFLAG_FLUSH)
-				m_aSlots[pChunk->m_ClientID].m_Connection.Flush();
+				m_aSlots[pChunk->m_ClientId].m_Connection.Flush();
 		}
 		else
 		{
-			//Drop(pChunk->m_ClientID, "Error sending data");
+			//Drop(pChunk->m_ClientId, "Error sending data");
 		}
 	}
 	return 0;
@@ -763,7 +757,7 @@ void CNetServer::SendTokenSixup(NETADDR &Addr, SECURITY_TOKEN Token)
 {
 	SECURITY_TOKEN MyToken = GetToken(Addr);
 	unsigned char aBuf[512] = {};
-	mem_copy(aBuf, &MyToken, 4);
+	WriteSecurityToken(aBuf, MyToken);
 	int Size = (Token == NET_SECURITY_TOKEN_UNKNOWN) ? 512 : 4;
 	CNetBase::SendControlMsg(m_Socket, &Addr, 0, 5, aBuf, Size, Token, true);
 }
@@ -776,15 +770,15 @@ int CNetServer::SendConnlessSixup(CNetChunk *pChunk, SECURITY_TOKEN ResponseToke
 	unsigned char aBuffer[NET_MAX_PACKETSIZE];
 	aBuffer[0] = NET_PACKETFLAG_CONNLESS << 2 | 1;
 	SECURITY_TOKEN Token = GetToken(pChunk->m_Address);
-	mem_copy(aBuffer + 1, &ResponseToken, 4);
-	mem_copy(aBuffer + 5, &Token, 4);
+	WriteSecurityToken(aBuffer + 1, ResponseToken);
+	WriteSecurityToken(aBuffer + 5, Token);
 	mem_copy(aBuffer + 9, pChunk->m_pData, pChunk->m_DataSize);
 	net_udp_send(m_Socket, &pChunk->m_Address, aBuffer, pChunk->m_DataSize + 9);
 
 	return 0;
 }
 
-void CNetServer::SetMaxClientsPerIP(int Max)
+void CNetServer::SetMaxClientsPerIp(int Max)
 {
 	// clamp
 	if(Max < 1)
@@ -792,31 +786,31 @@ void CNetServer::SetMaxClientsPerIP(int Max)
 	else if(Max > NET_MAX_CLIENTS)
 		Max = NET_MAX_CLIENTS;
 
-	m_MaxClientsPerIP = Max;
+	m_MaxClientsPerIp = Max;
 }
 
-bool CNetServer::SetTimedOut(int ClientID, int OrigID)
+bool CNetServer::SetTimedOut(int ClientId, int OrigId)
 {
-	if(m_aSlots[ClientID].m_Connection.State() != NET_CONNSTATE_ERROR)
+	if(m_aSlots[ClientId].m_Connection.State() != NET_CONNSTATE_ERROR)
 		return false;
 
-	m_aSlots[ClientID].m_Connection.SetTimedOut(ClientAddr(OrigID), m_aSlots[OrigID].m_Connection.SeqSequence(), m_aSlots[OrigID].m_Connection.AckSequence(), m_aSlots[OrigID].m_Connection.SecurityToken(), m_aSlots[OrigID].m_Connection.ResendBuffer(), m_aSlots[OrigID].m_Connection.m_Sixup);
-	m_aSlots[OrigID].m_Connection.Reset();
+	m_aSlots[ClientId].m_Connection.SetTimedOut(ClientAddr(OrigId), m_aSlots[OrigId].m_Connection.SeqSequence(), m_aSlots[OrigId].m_Connection.AckSequence(), m_aSlots[OrigId].m_Connection.SecurityToken(), m_aSlots[OrigId].m_Connection.ResendBuffer(), m_aSlots[OrigId].m_Connection.m_Sixup);
+	m_aSlots[OrigId].m_Connection.Reset();
 	return true;
 }
 
-void CNetServer::SetTimeoutProtected(int ClientID)
+void CNetServer::SetTimeoutProtected(int ClientId)
 {
-	m_aSlots[ClientID].m_Connection.m_TimeoutProtected = true;
+	m_aSlots[ClientId].m_Connection.m_TimeoutProtected = true;
 }
 
-int CNetServer::ResetErrorString(int ClientID)
+int CNetServer::ResetErrorString(int ClientId)
 {
-	m_aSlots[ClientID].m_Connection.ResetErrorString();
+	m_aSlots[ClientId].m_Connection.ResetErrorString();
 	return 0;
 }
 
-const char *CNetServer::ErrorString(int ClientID)
+const char *CNetServer::ErrorString(int ClientId)
 {
-	return m_aSlots[ClientID].m_Connection.ErrorString();
+	return m_aSlots[ClientId].m_Connection.ErrorString();
 }
diff --git a/src/engine/shared/packer.cpp b/src/engine/shared/packer.cpp
index 2b183113b1..3593929ea6 100644
--- a/src/engine/shared/packer.cpp
+++ b/src/engine/shared/packer.cpp
@@ -172,6 +172,12 @@ const char *CUnpacker::GetString(int SanitizeType)
 	}
 	m_pCurrent++;
 
+	if(!str_utf8_check(pPtr))
+	{
+		m_Error = true;
+		return "";
+	}
+
 	// sanitize all strings
 	if(SanitizeType & SANITIZE)
 		str_sanitize(pPtr);
diff --git a/src/engine/shared/protocol.h b/src/engine/shared/protocol.h
index 6c00a487bd..e0f807b10e 100644
--- a/src/engine/shared/protocol.h
+++ b/src/engine/shared/protocol.h
@@ -4,6 +4,7 @@
 #define ENGINE_SHARED_PROTOCOL_H
 
 #include <bitset>
+#include <engine/shared/protocol7.h>
 
 /*
 	Connection diagram - How the initialization works.
diff --git a/src/engine/shared/protocol7.h b/src/engine/shared/protocol7.h
index c8524ef78c..73bbe92fda 100644
--- a/src/engine/shared/protocol7.h
+++ b/src/engine/shared/protocol7.h
@@ -3,6 +3,8 @@
 #ifndef ENGINE_SHARED_PROTOCOL7_H
 #define ENGINE_SHARED_PROTOCOL7_H
 
+#include <base/types.h>
+
 namespace protocol7 {
 
 enum
@@ -52,6 +54,16 @@ enum
 	NETMSG_MAPLIST_ENTRY_REM,
 };
 
-}
+enum
+{
+	MAX_NAME_LENGTH = 16,
+	MAX_NAME_ARRAY_SIZE = MAX_NAME_LENGTH * UTF8_BYTE_LENGTH + 1,
+	MAX_CLAN_LENGTH = 12,
+	MAX_CLAN_ARRAY_SIZE = MAX_CLAN_LENGTH * UTF8_BYTE_LENGTH + 1,
+	MAX_SKIN_LENGTH = 24,
+	MAX_SKIN_ARRAY_SIZE = MAX_SKIN_LENGTH * UTF8_BYTE_LENGTH + 1,
+};
+
+} // namespace protocol7
 
 #endif
diff --git a/src/engine/shared/protocol_ex.cpp b/src/engine/shared/protocol_ex.cpp
index 51f4b286ad..4041265d7d 100644
--- a/src/engine/shared/protocol_ex.cpp
+++ b/src/engine/shared/protocol_ex.cpp
@@ -15,52 +15,52 @@ void RegisterUuids(CUuidManager *pManager)
 #undef UUID
 }
 
-int UnpackMessageID(int *pID, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker)
+int UnpackMessageId(int *pId, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker)
 {
-	*pID = 0;
+	*pId = 0;
 	*pSys = false;
 	mem_zero(pUuid, sizeof(*pUuid));
 
-	int MsgID = pUnpacker->GetInt();
+	int MsgId = pUnpacker->GetInt();
 
 	if(pUnpacker->Error())
 	{
 		return UNPACKMESSAGE_ERROR;
 	}
 
-	*pID = MsgID >> 1;
-	*pSys = MsgID & 1;
+	*pId = MsgId >> 1;
+	*pSys = MsgId & 1;
 
-	if(*pID < 0 || *pID >= OFFSET_UUID)
+	if(*pId < 0 || *pId >= OFFSET_UUID)
 	{
 		return UNPACKMESSAGE_ERROR;
 	}
 
-	if(*pID != 0) // NETMSG_EX, NETMSGTYPE_EX
+	if(*pId != 0) // NETMSG_EX, NETMSGTYPE_EX
 	{
 		return UNPACKMESSAGE_OK;
 	}
 
-	*pID = g_UuidManager.UnpackUuid(pUnpacker, pUuid);
+	*pId = g_UuidManager.UnpackUuid(pUnpacker, pUuid);
 
-	if(*pID == UUID_INVALID || *pID == UUID_UNKNOWN)
+	if(*pId == UUID_INVALID || *pId == UUID_UNKNOWN)
 	{
 		return UNPACKMESSAGE_ERROR;
 	}
 
 	if(*pSys)
 	{
-		switch(*pID)
+		switch(*pId)
 		{
 		case NETMSG_WHATIS:
 		{
 			CUuid Uuid2;
-			int ID2 = g_UuidManager.UnpackUuid(pUnpacker, &Uuid2);
-			if(ID2 == UUID_INVALID)
+			int Id2 = g_UuidManager.UnpackUuid(pUnpacker, &Uuid2);
+			if(Id2 == UUID_INVALID)
 			{
 				break;
 			}
-			if(ID2 == UUID_UNKNOWN)
+			if(Id2 == UUID_UNKNOWN)
 			{
 				new(pPacker) CMsgPacker(NETMSG_IDONTKNOW, true);
 				pPacker->AddRaw(&Uuid2, sizeof(Uuid2));
@@ -69,7 +69,7 @@ int UnpackMessageID(int *pID, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CM
 			{
 				new(pPacker) CMsgPacker(NETMSG_ITIS, true);
 				pPacker->AddRaw(&Uuid2, sizeof(Uuid2));
-				pPacker->AddString(g_UuidManager.GetName(ID2), 0);
+				pPacker->AddString(g_UuidManager.GetName(Id2), 0);
 			}
 			return UNPACKMESSAGE_ANSWER;
 		}
diff --git a/src/engine/shared/protocol_ex.h b/src/engine/shared/protocol_ex.h
index 2ca61ac0ce..6ef72f163f 100644
--- a/src/engine/shared/protocol_ex.h
+++ b/src/engine/shared/protocol_ex.h
@@ -33,8 +33,8 @@ enum
 };
 
 void RegisterUuids(CUuidManager *pManager);
-bool NetworkExDefaultHandler(int *pID, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker, int Type);
+bool NetworkExDefaultHandler(int *pId, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker, int Type);
 
-int UnpackMessageID(int *pID, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker);
+int UnpackMessageId(int *pId, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker);
 
 #endif // ENGINE_SHARED_PROTOCOL_EX_H
diff --git a/src/engine/shared/protocol_ex_msgs.h b/src/engine/shared/protocol_ex_msgs.h
index c3f760a845..d137d5c176 100644
--- a/src/engine/shared/protocol_ex_msgs.h
+++ b/src/engine/shared/protocol_ex_msgs.h
@@ -22,7 +22,6 @@
 UUID(NETMSG_WHATIS, "what-is@ddnet.tw")
 UUID(NETMSG_ITIS, "it-is@ddnet.tw")
 UUID(NETMSG_IDONTKNOW, "i-dont-know@ddnet.tw")
-UUID(NETMSG_IAMSTA, "i-am-StA@stormaxs.github.io/sta.github.io")
 
 UUID(NETMSG_RCONTYPE, "rcon-type@ddnet.tw")
 UUID(NETMSG_MAP_DETAILS, "map-details@ddnet.tw")
@@ -34,3 +33,6 @@ UUID(NETMSG_CHECKSUM_REQUEST, "checksum-request@ddnet.tw")
 UUID(NETMSG_CHECKSUM_RESPONSE, "checksum-response@ddnet.tw")
 UUID(NETMSG_CHECKSUM_ERROR, "checksum-error@ddnet.tw")
 UUID(NETMSG_REDIRECT, "redirect@ddnet.org")
+UUID(NETMSG_RCON_CMD_GROUP_START, "rcon-cmd-group-start@ddnet.org")
+UUID(NETMSG_RCON_CMD_GROUP_END, "rcon-cmd-group-end@ddnet.org")
+UUID(NETMSG_MAP_RELOAD, "map-reload@ddnet.org")
diff --git a/src/engine/shared/protocolglue.cpp b/src/engine/shared/protocolglue.cpp
new file mode 100644
index 0000000000..e690614ca4
--- /dev/null
+++ b/src/engine/shared/protocolglue.cpp
@@ -0,0 +1,85 @@
+#include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
+
+#include "protocolglue.h"
+
+int GameFlags_ClampToSix(int Flags)
+{
+	int Six = 0;
+	if(Flags & GAMEFLAG_TEAMS)
+		Six |= GAMEFLAG_TEAMS;
+	if(Flags & GAMEFLAG_FLAGS)
+		Six |= GAMEFLAG_FLAGS;
+	return Six;
+}
+
+int PlayerFlags_SevenToSix(int Flags)
+{
+	int Six = 0;
+	if(Flags & protocol7::PLAYERFLAG_CHATTING)
+		Six |= PLAYERFLAG_CHATTING;
+	if(Flags & protocol7::PLAYERFLAG_SCOREBOARD)
+		Six |= PLAYERFLAG_SCOREBOARD;
+	if(Flags & protocol7::PLAYERFLAG_AIM)
+		Six |= PLAYERFLAG_AIM;
+	return Six;
+}
+
+int PlayerFlags_SixToSeven(int Flags)
+{
+	int Seven = 0;
+	if(Flags & PLAYERFLAG_CHATTING)
+		Seven |= protocol7::PLAYERFLAG_CHATTING;
+	if(Flags & PLAYERFLAG_SCOREBOARD)
+		Seven |= protocol7::PLAYERFLAG_SCOREBOARD;
+	if(Flags & PLAYERFLAG_AIM)
+		Seven |= protocol7::PLAYERFLAG_AIM;
+	return Seven;
+}
+
+void PickupType_SevenToSix(int Type7, int &Type6, int &SubType6)
+{
+	SubType6 = 0;
+	Type6 = POWERUP_WEAPON;
+	switch(Type7)
+	{
+	case protocol7::PICKUP_HEALTH:
+	case protocol7::PICKUP_ARMOR:
+		Type6 = Type7;
+		break;
+	case protocol7::PICKUP_GRENADE:
+		SubType6 = WEAPON_GRENADE;
+		break;
+	case protocol7::PICKUP_SHOTGUN:
+		SubType6 = WEAPON_SHOTGUN;
+		break;
+	case protocol7::PICKUP_LASER:
+		SubType6 = WEAPON_LASER;
+		break;
+	case protocol7::PICKUP_GUN:
+		SubType6 = WEAPON_GUN;
+		break;
+	case protocol7::PICKUP_HAMMER:
+		SubType6 = WEAPON_HAMMER;
+		break;
+	case protocol7::PICKUP_NINJA:
+		SubType6 = WEAPON_NINJA;
+		Type6 = POWERUP_NINJA;
+		break;
+	default:
+		// dbg_msg("sixup", "ERROR: failed to translate weapon=%d to 0.6", Type7);
+		break;
+	}
+}
+
+int PickupType_SixToSeven(int Type6, int SubType6)
+{
+	if(Type6 == POWERUP_WEAPON)
+		return SubType6 == WEAPON_SHOTGUN ? protocol7::PICKUP_SHOTGUN : SubType6 == WEAPON_GRENADE ? protocol7::PICKUP_GRENADE : protocol7::PICKUP_LASER;
+	else if(Type6 == POWERUP_NINJA)
+		return protocol7::PICKUP_NINJA;
+	else if(Type6 == POWERUP_ARMOR)
+		return protocol7::PICKUP_ARMOR;
+	return 0;
+}
diff --git a/src/engine/shared/protocolglue.h b/src/engine/shared/protocolglue.h
new file mode 100644
index 0000000000..614cc62988
--- /dev/null
+++ b/src/engine/shared/protocolglue.h
@@ -0,0 +1,10 @@
+#ifndef ENGINE_SHARED_PROTOCOLGLUE_H
+#define ENGINE_SHARED_PROTOCOLGLUE_H
+
+int GameFlags_ClampToSix(int Flags);
+int PlayerFlags_SevenToSix(int Flags);
+int PlayerFlags_SixToSeven(int Flags);
+void PickupType_SevenToSix(int Type7, int &Type6, int &SubType6);
+int PickupType_SixToSeven(int Type6, int SubType6);
+
+#endif
diff --git a/src/engine/shared/ringbuffer.cpp b/src/engine/shared/ringbuffer.cpp
index 23301a669b..c8697942e4 100644
--- a/src/engine/shared/ringbuffer.cpp
+++ b/src/engine/shared/ringbuffer.cpp
@@ -1,7 +1,5 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#include <base/system.h>
-
 #include "ringbuffer.h"
 
 CRingBufferBase::CItem *CRingBufferBase::NextBlock(CItem *pItem)
@@ -125,11 +123,21 @@ void *CRingBufferBase::Allocate(int Size)
 	return (void *)(pBlock + 1);
 }
 
+void CRingBufferBase::SetPopCallback(std::function<void(void *pCurrent)> PopCallback)
+{
+	m_PopCallback = std::move(PopCallback);
+}
+
 int CRingBufferBase::PopFirst()
 {
 	if(m_pConsume->m_Free)
 		return 0;
 
+	if(m_PopCallback)
+	{
+		m_PopCallback(m_pConsume + 1);
+	}
+
 	// set the free flag
 	m_pConsume->m_Free = 1;
 
diff --git a/src/engine/shared/ringbuffer.h b/src/engine/shared/ringbuffer.h
index 842e0520c4..11af0fa320 100644
--- a/src/engine/shared/ringbuffer.h
+++ b/src/engine/shared/ringbuffer.h
@@ -3,6 +3,10 @@
 #ifndef ENGINE_SHARED_RINGBUFFER_H
 #define ENGINE_SHARED_RINGBUFFER_H
 
+#include <base/system.h>
+
+#include <functional>
+
 class CRingBufferBase
 {
 	class CItem
@@ -23,6 +27,8 @@ class CRingBufferBase
 	int m_Size;
 	int m_Flags;
 
+	std::function<void(void *pCurrent)> m_PopCallback = nullptr;
+
 	CItem *NextBlock(CItem *pItem);
 	CItem *PrevBlock(CItem *pItem);
 	CItem *MergeBack(CItem *pItem);
@@ -37,6 +43,7 @@ class CRingBufferBase
 
 	void Init(void *pMemory, int Size, int Flags);
 	int PopFirst();
+	void SetPopCallback(const std::function<void(void *pCurrent)> PopCallback);
 
 public:
 	enum
@@ -44,10 +51,30 @@ class CRingBufferBase
 		// Will start to destroy items to try to fit the next one
 		FLAG_RECYCLE = 1
 	};
+	static constexpr int ITEM_SIZE = sizeof(CItem);
+};
+
+template<typename T>
+class CTypedRingBuffer : public CRingBufferBase
+{
+public:
+	T *Allocate(int Size) { return (T *)CRingBufferBase::Allocate(Size); }
+	int PopFirst() { return CRingBufferBase::PopFirst(); }
+	void SetPopCallback(std::function<void(T *pCurrent)> PopCallback)
+	{
+		CRingBufferBase::SetPopCallback([PopCallback](void *pCurrent) {
+			PopCallback((T *)pCurrent);
+		});
+	}
+
+	T *Prev(T *pCurrent) { return (T *)CRingBufferBase::Prev(pCurrent); }
+	T *Next(T *pCurrent) { return (T *)CRingBufferBase::Next(pCurrent); }
+	T *First() { return (T *)CRingBufferBase::First(); }
+	T *Last() { return (T *)CRingBufferBase::Last(); }
 };
 
 template<typename T, int TSIZE, int TFLAGS = 0>
-class CStaticRingBuffer : public CRingBufferBase
+class CStaticRingBuffer : public CTypedRingBuffer<T>
 {
 	unsigned char m_aBuffer[TSIZE];
 
@@ -55,14 +82,27 @@ class CStaticRingBuffer : public CRingBufferBase
 	CStaticRingBuffer() { Init(); }
 
 	void Init() { CRingBufferBase::Init(m_aBuffer, TSIZE, TFLAGS); }
+};
 
-	T *Allocate(int Size) { return (T *)CRingBufferBase::Allocate(Size); }
-	int PopFirst() { return CRingBufferBase::PopFirst(); }
+template<typename T>
+class CDynamicRingBuffer : public CTypedRingBuffer<T>
+{
+	unsigned char *m_pBuffer = nullptr;
 
-	T *Prev(T *pCurrent) { return (T *)CRingBufferBase::Prev(pCurrent); }
-	T *Next(T *pCurrent) { return (T *)CRingBufferBase::Next(pCurrent); }
-	T *First() { return (T *)CRingBufferBase::First(); }
-	T *Last() { return (T *)CRingBufferBase::Last(); }
+public:
+	CDynamicRingBuffer(int Size, int Flags = 0) { Init(Size, Flags); }
+
+	virtual ~CDynamicRingBuffer()
+	{
+		free(m_pBuffer);
+	}
+
+	void Init(int Size, int Flags)
+	{
+		free(m_pBuffer);
+		m_pBuffer = static_cast<unsigned char *>(malloc(Size));
+		CRingBufferBase::Init(m_pBuffer, Size, Flags);
+	}
 };
 
 #endif
diff --git a/src/engine/shared/serverinfo.cpp b/src/engine/shared/serverinfo.cpp
index ecccfa5994..3e6ef8e570 100644
--- a/src/engine/shared/serverinfo.cpp
+++ b/src/engine/shared/serverinfo.cpp
@@ -71,6 +71,8 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
 	const json_value &MapName = ServerInfo["map"]["name"];
 	const json_value &Version = ServerInfo["version"];
 	const json_value &Clients = ServerInfo["clients"];
+	const json_value &RequiresLogin = ServerInfo["requires_login"];
+
 	Error = false;
 	Error = Error || MaxClients.type != json_integer;
 	Error = Error || MaxPlayers.type != json_integer;
@@ -96,6 +98,11 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
 	{
 		pOut->m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_TIME;
 	}
+	pOut->m_RequiresLogin = false;
+	if(RequiresLogin.type == json_boolean)
+	{
+		pOut->m_RequiresLogin = RequiresLogin;
+	}
 	pOut->m_Passworded = Passworded;
 	str_copy(pOut->m_aGameType, GameType);
 	str_copy(pOut->m_aName, Name);
@@ -196,6 +203,7 @@ bool CServerInfo2::operator==(const CServerInfo2 &Other) const
 	Unequal = Unequal || str_comp(m_aName, Other.m_aName) != 0;
 	Unequal = Unequal || str_comp(m_aMapName, Other.m_aMapName) != 0;
 	Unequal = Unequal || str_comp(m_aVersion, Other.m_aVersion) != 0;
+	Unequal = Unequal || m_RequiresLogin != Other.m_RequiresLogin;
 	if(Unequal)
 	{
 		return false;
@@ -225,6 +233,7 @@ CServerInfo2::operator CServerInfo() const
 	Result.m_MaxPlayers = m_MaxPlayers;
 	Result.m_NumPlayers = m_NumPlayers;
 	Result.m_ClientScoreKind = m_ClientScoreKind;
+	Result.m_RequiresLogin = m_RequiresLogin;
 	Result.m_Flags = m_Passworded ? SERVER_FLAG_PASSWORD : 0;
 	str_copy(Result.m_aGameType, m_aGameType);
 	str_copy(Result.m_aName, m_aName);
diff --git a/src/engine/shared/serverinfo.h b/src/engine/shared/serverinfo.h
index edb06a467d..4e4c28902c 100644
--- a/src/engine/shared/serverinfo.h
+++ b/src/engine/shared/serverinfo.h
@@ -38,6 +38,7 @@ class CServerInfo2
 	char m_aName[64];
 	char m_aMapName[MAX_MAP_LENGTH];
 	char m_aVersion[32];
+	bool m_RequiresLogin;
 
 	bool operator==(const CServerInfo2 &Other) const;
 	bool operator!=(const CServerInfo2 &Other) const { return !(*this == Other); }
diff --git a/src/engine/shared/sixup_translate_snapshot.cpp b/src/engine/shared/sixup_translate_snapshot.cpp
new file mode 100644
index 0000000000..2b06e53692
--- /dev/null
+++ b/src/engine/shared/sixup_translate_snapshot.cpp
@@ -0,0 +1,15 @@
+#include <base/system.h>
+
+#include "snapshot.h"
+
+void CSnapshotBuilder::Init7(const CSnapshot *pSnapshot)
+{
+	// the method is called Init7 because it is only used for 0.7 support
+	// but the snap we are building is a 0.6 snap
+	m_Sixup = false;
+
+	m_DataSize = pSnapshot->m_DataSize;
+	m_NumItems = pSnapshot->m_NumItems;
+	mem_copy(m_aOffsets, pSnapshot->Offsets(), sizeof(int) * m_NumItems);
+	mem_copy(m_aData, pSnapshot->DataStart(), m_DataSize);
+}
diff --git a/src/engine/shared/snapshot.cpp b/src/engine/shared/snapshot.cpp
index 7481eb63e4..99d2b50ccc 100644
--- a/src/engine/shared/snapshot.cpp
+++ b/src/engine/shared/snapshot.cpp
@@ -10,6 +10,7 @@
 #include <base/math.h>
 #include <base/system.h>
 
+#include <game/generated/protocol7.h>
 #include <game/generated/protocolglue.h>
 
 // CSnapshot
@@ -65,7 +66,12 @@ int CSnapshot::GetItemIndex(int Key) const
 	return -1;
 }
 
-const void *CSnapshot::FindItem(int Type, int ID) const
+void CSnapshot::InvalidateItem(int Index)
+{
+	((CSnapshotItem *)(DataStart() + Offsets()[Index]))->Invalidate();
+}
+
+const void *CSnapshot::FindItem(int Type, int Id) const
 {
 	int InternalType = Type;
 	if(Type >= OFFSET_UUID)
@@ -79,11 +85,11 @@ const void *CSnapshot::FindItem(int Type, int ID) const
 		for(int i = 0; i < m_NumItems; i++)
 		{
 			const CSnapshotItem *pItem = GetItem(i);
-			if(pItem->Type() == 0 && pItem->ID() >= OFFSET_UUID_TYPE) // NETOBJTYPE_EX
+			if(pItem->Type() == 0 && pItem->Id() >= OFFSET_UUID_TYPE) // NETOBJTYPE_EX
 			{
 				if(mem_comp(pItem->Data(), aTypeUuidItem, sizeof(CUuid)) == 0)
 				{
-					InternalType = pItem->ID();
+					InternalType = pItem->Id();
 					Found = true;
 					break;
 				}
@@ -94,7 +100,7 @@ const void *CSnapshot::FindItem(int Type, int ID) const
 			return nullptr;
 		}
 	}
-	int Index = GetItemIndex((InternalType << 16) | ID);
+	int Index = GetItemIndex((InternalType << 16) | Id);
 	return Index < 0 ? nullptr : GetItem(Index)->Data();
 }
 
@@ -120,7 +126,7 @@ void CSnapshot::DebugDump() const
 	{
 		const CSnapshotItem *pItem = GetItem(i);
 		int Size = GetItemSize(i);
-		dbg_msg("snapshot", "\ttype=%d id=%d", pItem->Type(), pItem->ID());
+		dbg_msg("snapshot", "\ttype=%d id=%d", pItem->Type(), pItem->Id());
 		for(size_t b = 0; b < Size / sizeof(int32_t); b++)
 			dbg_msg("snapshot", "\t\t%3d %12d\t%08x", (int)b, pItem->Data()[b], pItem->Data()[b]);
 	}
@@ -129,8 +135,15 @@ void CSnapshot::DebugDump() const
 bool CSnapshot::IsValid(size_t ActualSize) const
 {
 	// validate total size
-	if(ActualSize < sizeof(CSnapshot) || m_NumItems < 0 || m_DataSize < 0 || ActualSize != TotalSize())
+	if(ActualSize < sizeof(CSnapshot) ||
+		ActualSize > MAX_SIZE ||
+		m_NumItems < 0 ||
+		m_NumItems > MAX_ITEMS ||
+		m_DataSize < 0 ||
+		ActualSize != TotalSize())
+	{
 		return false;
+	}
 
 	// validate item offsets
 	const int *pOffsets = Offsets();
@@ -161,7 +174,7 @@ struct CItemList
 	int m_aIndex[HASHLIST_BUCKET_SIZE];
 };
 
-inline size_t CalcHashID(int Key)
+inline size_t CalcHashId(int Key)
 {
 	// djb2 (http://www.cse.yorku.ca/~oz/hash.html)
 	unsigned Hash = 5381;
@@ -178,23 +191,23 @@ static void GenerateHash(CItemList *pHashlist, const CSnapshot *pSnapshot)
 	for(int i = 0; i < pSnapshot->NumItems(); i++)
 	{
 		int Key = pSnapshot->GetItem(i)->Key();
-		size_t HashID = CalcHashID(Key);
-		if(pHashlist[HashID].m_Num < HASHLIST_BUCKET_SIZE)
+		size_t HashId = CalcHashId(Key);
+		if(pHashlist[HashId].m_Num < HASHLIST_BUCKET_SIZE)
 		{
-			pHashlist[HashID].m_aIndex[pHashlist[HashID].m_Num] = i;
-			pHashlist[HashID].m_aKeys[pHashlist[HashID].m_Num] = Key;
-			pHashlist[HashID].m_Num++;
+			pHashlist[HashId].m_aIndex[pHashlist[HashId].m_Num] = i;
+			pHashlist[HashId].m_aKeys[pHashlist[HashId].m_Num] = Key;
+			pHashlist[HashId].m_Num++;
 		}
 	}
 }
 
 static int GetItemIndexHashed(int Key, const CItemList *pHashlist)
 {
-	size_t HashID = CalcHashID(Key);
-	for(int i = 0; i < pHashlist[HashID].m_Num; i++)
+	size_t HashId = CalcHashId(Key);
+	for(int i = 0; i < pHashlist[HashId].m_Num; i++)
 	{
-		if(pHashlist[HashID].m_aKeys[i] == Key)
-			return pHashlist[HashID].m_aIndex[i];
+		if(pHashlist[HashId].m_aKeys[i] == Key)
+			return pHashlist[HashId].m_aIndex[i];
 	}
 
 	return -1;
@@ -243,6 +256,7 @@ void CSnapshotDelta::UndiffItem(const int *pPast, const int *pDiff, int *pOut, i
 CSnapshotDelta::CSnapshotDelta()
 {
 	mem_zero(m_aItemSizes, sizeof(m_aItemSizes));
+	mem_zero(m_aItemSizes7, sizeof(m_aItemSizes7));
 	mem_zero(m_aSnapshotDataRate, sizeof(m_aSnapshotDataRate));
 	mem_zero(m_aSnapshotDataUpdates, sizeof(m_aSnapshotDataUpdates));
 	mem_zero(&m_Empty, sizeof(m_Empty));
@@ -251,6 +265,7 @@ CSnapshotDelta::CSnapshotDelta()
 CSnapshotDelta::CSnapshotDelta(const CSnapshotDelta &Old)
 {
 	mem_copy(m_aItemSizes, Old.m_aItemSizes, sizeof(m_aItemSizes));
+	mem_copy(m_aItemSizes7, Old.m_aItemSizes7, sizeof(m_aItemSizes7));
 	mem_copy(m_aSnapshotDataRate, Old.m_aSnapshotDataRate, sizeof(m_aSnapshotDataRate));
 	mem_copy(m_aSnapshotDataUpdates, Old.m_aSnapshotDataUpdates, sizeof(m_aSnapshotDataUpdates));
 	mem_zero(&m_Empty, sizeof(m_Empty));
@@ -263,6 +278,13 @@ void CSnapshotDelta::SetStaticsize(int ItemType, size_t Size)
 	m_aItemSizes[ItemType] = Size;
 }
 
+void CSnapshotDelta::SetStaticsize7(int ItemType, size_t Size)
+{
+	dbg_assert(ItemType >= 0 && ItemType < MAX_NETOBJSIZES, "ItemType invalid");
+	dbg_assert(Size <= (size_t)std::numeric_limits<int16_t>::max(), "Size invalid");
+	m_aItemSizes7[ItemType] = Size;
+}
+
 const CSnapshotDelta::CData *CSnapshotDelta::EmptyDelta() const
 {
 	return &m_Empty;
@@ -326,7 +348,7 @@ int CSnapshotDelta::CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, vo
 			if(DiffItem(pPastItem->Data(), pCurItem->Data(), pItemDataDst, ItemSize / sizeof(int32_t)))
 			{
 				*pData++ = pCurItem->Type();
-				*pData++ = pCurItem->ID();
+				*pData++ = pCurItem->Id();
 				if(IncludeSize)
 					*pData++ = ItemSize / sizeof(int32_t);
 				pData += ItemSize / sizeof(int32_t);
@@ -336,7 +358,7 @@ int CSnapshotDelta::CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, vo
 		else
 		{
 			*pData++ = pCurItem->Type();
-			*pData++ = pCurItem->ID();
+			*pData++ = pCurItem->Id();
 			if(IncludeSize)
 				*pData++ = ItemSize / sizeof(int32_t);
 
@@ -352,7 +374,139 @@ int CSnapshotDelta::CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, vo
 	return (int)((char *)pData - (char *)pDstData);
 }
 
-int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize)
+int CSnapshotDelta::DebugDumpDelta(const void *pSrcData, int DataSize)
+{
+	CData *pDelta = (CData *)pSrcData;
+	int *pData = (int *)pDelta->m_aData;
+	int *pEnd = (int *)(((char *)pSrcData + DataSize));
+
+	dbg_msg("delta_dump", "+-----------------------------------------------");
+	if(DataSize < 3 * (int)sizeof(int32_t))
+	{
+		dbg_msg("delta_dump", "|  delta size %d too small. Should at least fit the empty delta header.", DataSize);
+		return -505;
+	}
+
+	dbg_msg("delta_dump", "|  data_size=%d", DataSize);
+
+	int DumpIndex = 0;
+
+	// dump header
+	{
+		int *pDumpHeader = (int *)pSrcData;
+		dbg_msg("delta_dump", "|  %3d %12d  %08x m_NumDeletedItems=%d", DumpIndex++, *pDumpHeader, *pDumpHeader, *pDumpHeader);
+		pDumpHeader++;
+		dbg_msg("delta_dump", "|  %3d %12d  %08x m_NumUpdatedItems=%d", DumpIndex++, *pDumpHeader, *pDumpHeader, *pDumpHeader);
+		pDumpHeader++;
+		dbg_msg("delta_dump", "|  %3d %12d  %08x _zero=%d", DumpIndex++, *pDumpHeader, *pDumpHeader, *pDumpHeader);
+		pDumpHeader++;
+
+		dbg_assert(pDumpHeader == pData, "invalid header size");
+	}
+
+	// unpack deleted stuff
+	int *pDeleted = pData;
+	if(pDelta->m_NumDeletedItems < 0)
+	{
+		dbg_msg("delta_dump", "|  Invalid delta. Number of deleted items %d is negative.", pDelta->m_NumDeletedItems);
+		return -201;
+	}
+	pData += pDelta->m_NumDeletedItems;
+	if(pData > pEnd)
+	{
+		dbg_msg("delta_dump", "|  Invalid delta. Read past the end.");
+		return -101;
+	}
+
+	// list deleted items
+	// (all other items should be copied from the last full snap)
+	for(int d = 0; d < pDelta->m_NumDeletedItems; d++)
+	{
+		int Type = pDeleted[d] >> 16;
+		int Id = pDeleted[d] & 0xffff;
+		dbg_msg("delta_dump", "  %3d %12d %08x deleted Type=%d Id=%d", DumpIndex++, pDeleted[d], pDeleted[d], Type, Id);
+	}
+
+	// unpack updated stuff
+	for(int i = 0; i < pDelta->m_NumUpdateItems; i++)
+	{
+		if(pData + 2 > pEnd)
+		{
+			dbg_msg("delta_dump", "|  Invalid delta. NumUpdateItems=%d can't be fit into DataSize=%d", pDelta->m_NumUpdateItems, DataSize);
+			return -102;
+		}
+
+		dbg_msg("delta_dump", "|  --------------------------------");
+		dbg_msg("delta_dump", "|  %3d %12d  %08x updated Type=%d", DumpIndex++, *pData, *pData, *pData);
+		const int Type = *pData++;
+		if(Type < 0 || Type > CSnapshot::MAX_TYPE)
+		{
+			dbg_msg("delta_dump", "|  Invalid delta. Type=%d out of range (0 - %d)", Type, CSnapshot::MAX_TYPE);
+			return -202;
+		}
+
+		dbg_msg("delta_dump", "|  %3d %12d  %08x updated Id=%d", DumpIndex++, *pData, *pData, *pData);
+		const int Id = *pData++;
+		if(Id < 0 || Id > CSnapshot::MAX_ID)
+		{
+			dbg_msg("delta_dump", "|  Invalid delta. Id=%d out of range (0 - %d)", Id, CSnapshot::MAX_ID);
+			return -203;
+		}
+
+		// size of the item in bytes
+		int ItemSize;
+		if(Type < MAX_NETOBJSIZES && m_aItemSizes[Type])
+		{
+			ItemSize = m_aItemSizes[Type];
+			dbg_msg("delta_dump", "|                             updated size=%d (known)", ItemSize);
+		}
+		else
+		{
+			if(pData + 1 > pEnd)
+			{
+				dbg_msg("delta_dump", "|  Invalid delta. Expected item size but got end of data.");
+				return -103;
+			}
+			if(*pData < 0 || (size_t)*pData > std::numeric_limits<int32_t>::max() / sizeof(int32_t))
+			{
+				dbg_msg("delta_dump", "|  Invalid delta. Item size %d out of range (0 - %" PRIzu ")", *pData, std::numeric_limits<int32_t>::max() / sizeof(int32_t));
+				return -204;
+			}
+			dbg_msg("delta_dump", "|  %3d %12d  %08x updated size=%d", DumpIndex++, *pData, *pData, *pData);
+			ItemSize = (*pData++) * sizeof(int32_t);
+		}
+
+		if(ItemSize < 0)
+		{
+			dbg_msg("delta_dump", "|  Invalid delta. Item size %d is negative.", ItemSize);
+			return -205;
+		}
+		if((const char *)pEnd - (const char *)pData < ItemSize)
+		{
+			dbg_msg("delta_dump", "|  Invalid delta. Item with type=%d id=%d size=%d does not fit into the delta.", Type, Id, ItemSize);
+			return -205;
+		}
+
+		// divide item size in bytes by size of integers
+		// to get the number of integers we want to increment the pointer
+		const int *pItemEnd = pData + (ItemSize / sizeof(int32_t));
+
+		for(size_t b = 0; b < ItemSize / sizeof(int32_t); b++)
+		{
+			dbg_msg("delta_dump", "|  %3d %12d  %08x item data", DumpIndex++, *pData, *pData);
+			pData++;
+		}
+
+		dbg_assert(pItemEnd == pData, "Incorrect amount of data dumped for this item.");
+	}
+
+	dbg_msg("delta_dump", "|  Finished with expected_data_size=%d parsed_data_size=%" PRIzu, DataSize, (pData - (int *)pSrcData) * sizeof(int32_t));
+	dbg_msg("delta_dump", "+--------------------");
+
+	return 0;
+}
+
+int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize, bool Sixup)
 {
 	CData *pDelta = (CData *)pSrcData;
 	int *pData = (int *)pDelta->m_aData;
@@ -386,7 +540,7 @@ int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const vo
 
 		if(Keep)
 		{
-			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->Id(), ItemSize);
 			if(!pObj)
 				return -301;
 
@@ -405,13 +559,14 @@ int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const vo
 		if(Type < 0 || Type > CSnapshot::MAX_TYPE)
 			return -202;
 
-		const int ID = *pData++;
-		if(ID < 0 || ID > CSnapshot::MAX_ID)
+		const int Id = *pData++;
+		if(Id < 0 || Id > CSnapshot::MAX_ID)
 			return -203;
 
 		int ItemSize;
-		if(Type < MAX_NETOBJSIZES && m_aItemSizes[Type])
-			ItemSize = m_aItemSizes[Type];
+		const short *pItemSizes = Sixup ? m_aItemSizes7 : m_aItemSizes;
+		if(Type < MAX_NETOBJSIZES && pItemSizes[Type])
+			ItemSize = pItemSizes[Type];
 		else
 		{
 			if(pData + 1 > pEnd)
@@ -424,12 +579,12 @@ int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const vo
 		if(ItemSize < 0 || (const char *)pEnd - (const char *)pData < ItemSize)
 			return -205;
 
-		const int Key = (Type << 16) | ID;
+		const int Key = (Type << 16) | Id;
 
 		// create the item if needed
 		int *pNewData = Builder.GetItemData(Key);
 		if(!pNewData)
-			pNewData = (int *)Builder.NewItem(Type, ID, ItemSize);
+			pNewData = (int *)Builder.NewItem(Type, Id, ItemSize);
 
 		if(!pNewData)
 			return -302;
@@ -587,8 +742,11 @@ int *CSnapshotBuilder::GetItemData(int Key)
 {
 	for(int i = 0; i < m_NumItems; i++)
 	{
-		if(GetItem(i)->Key() == Key)
-			return GetItem(i)->Data();
+		CSnapshotItem *pItem = GetItem(i);
+		if(pItem->Key() == Key)
+		{
+			return pItem->Data();
+		}
 	}
 	return nullptr;
 }
@@ -596,12 +754,15 @@ int *CSnapshotBuilder::GetItemData(int Key)
 int CSnapshotBuilder::Finish(void *pSnapData)
 {
 	// flatten and make the snapshot
+	dbg_assert(m_NumItems <= CSnapshot::MAX_ITEMS, "Too many snap items");
 	CSnapshot *pSnap = (CSnapshot *)pSnapData;
 	pSnap->m_DataSize = m_DataSize;
 	pSnap->m_NumItems = m_NumItems;
+	const size_t TotalSize = pSnap->TotalSize();
+	dbg_assert(TotalSize <= (size_t)CSnapshot::MAX_SIZE, "Snapshot too large");
 	mem_copy(pSnap->Offsets(), m_aOffsets, pSnap->OffsetSize());
 	mem_copy(pSnap->DataStart(), m_aData, m_DataSize);
-	return pSnap->TotalSize();
+	return TotalSize;
 }
 
 int CSnapshotBuilder::GetTypeFromIndex(int Index) const
@@ -609,55 +770,73 @@ int CSnapshotBuilder::GetTypeFromIndex(int Index) const
 	return CSnapshot::MAX_TYPE - Index;
 }
 
-void CSnapshotBuilder::AddExtendedItemType(int Index)
+bool CSnapshotBuilder::AddExtendedItemType(int Index)
 {
 	dbg_assert(0 <= Index && Index < m_NumExtendedItemTypes, "index out of range");
-	int TypeID = m_aExtendedItemTypes[Index];
-	CUuid Uuid = g_UuidManager.GetUuid(TypeID);
-	int *pUuidItem = (int *)NewItem(0, GetTypeFromIndex(Index), sizeof(Uuid)); // NETOBJTYPE_EX
-	if(pUuidItem)
+	int *pUuidItem = static_cast<int *>(NewItem(0, GetTypeFromIndex(Index), sizeof(CUuid))); // NETOBJTYPE_EX
+	if(pUuidItem == nullptr)
 	{
-		for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
-			pUuidItem[i] = bytes_be_to_uint(&Uuid.m_aData[i * sizeof(int32_t)]);
+		return false;
+	}
+
+	const int TypeId = m_aExtendedItemTypes[Index];
+	const CUuid Uuid = g_UuidManager.GetUuid(TypeId);
+	for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+	{
+		pUuidItem[i] = bytes_be_to_uint(&Uuid.m_aData[i * sizeof(int32_t)]);
 	}
+	return true;
 }
 
-int CSnapshotBuilder::GetExtendedItemTypeIndex(int TypeID)
+int CSnapshotBuilder::GetExtendedItemTypeIndex(int TypeId)
 {
 	for(int i = 0; i < m_NumExtendedItemTypes; i++)
 	{
-		if(m_aExtendedItemTypes[i] == TypeID)
+		if(m_aExtendedItemTypes[i] == TypeId)
 		{
 			return i;
 		}
 	}
 	dbg_assert(m_NumExtendedItemTypes < MAX_EXTENDED_ITEM_TYPES, "too many extended item types");
 	int Index = m_NumExtendedItemTypes;
-	m_aExtendedItemTypes[Index] = TypeID;
 	m_NumExtendedItemTypes++;
-	return Index;
+	m_aExtendedItemTypes[Index] = TypeId;
+	if(AddExtendedItemType(Index))
+	{
+		return Index;
+	}
+	m_NumExtendedItemTypes--;
+	return -1;
 }
 
-void *CSnapshotBuilder::NewItem(int Type, int ID, int Size)
+void *CSnapshotBuilder::NewItem(int Type, int Id, int Size)
 {
-	if(ID == -1)
+	if(Id == -1)
 	{
 		return nullptr;
 	}
 
-	if(m_DataSize + sizeof(CSnapshotItem) + Size >= CSnapshot::MAX_SIZE ||
-		m_NumItems + 1 >= CSnapshot::MAX_ITEMS)
+	if(m_NumItems >= CSnapshot::MAX_ITEMS)
 	{
-		dbg_assert(m_DataSize < CSnapshot::MAX_SIZE, "too much data");
-		dbg_assert(m_NumItems < CSnapshot::MAX_ITEMS, "too many items");
 		return nullptr;
 	}
 
-	bool Extended = false;
-	if(Type >= OFFSET_UUID)
+	const size_t OffsetSize = (m_NumItems + 1) * sizeof(int);
+	const size_t ItemSize = sizeof(CSnapshotItem) + Size;
+	if(sizeof(CSnapshot) + OffsetSize + m_DataSize + ItemSize > CSnapshot::MAX_SIZE)
 	{
-		Extended = true;
-		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type));
+		return nullptr;
+	}
+
+	const bool Extended = Type >= OFFSET_UUID;
+	if(Extended)
+	{
+		const int ExtendedItemTypeIndex = GetExtendedItemTypeIndex(Type);
+		if(ExtendedItemTypeIndex == -1)
+		{
+			return nullptr;
+		}
+		Type = GetTypeFromIndex(ExtendedItemTypeIndex);
 	}
 
 	CSnapshotItem *pObj = (CSnapshotItem *)(m_aData + m_DataSize);
@@ -675,11 +854,11 @@ void *CSnapshotBuilder::NewItem(int Type, int ID, int Size)
 	else if(Type < 0)
 		return nullptr;
 
-	mem_zero(pObj, sizeof(CSnapshotItem) + Size);
-	pObj->m_TypeAndID = (Type << 16) | ID;
+	pObj->m_TypeAndId = (Type << 16) | Id;
 	m_aOffsets[m_NumItems] = m_DataSize;
-	m_DataSize += sizeof(CSnapshotItem) + Size;
+	m_DataSize += ItemSize;
 	m_NumItems++;
 
+	mem_zero(pObj->Data(), Size);
 	return pObj->Data();
 }
diff --git a/src/engine/shared/snapshot.h b/src/engine/shared/snapshot.h
index 6947db1bce..7a001221d5 100644
--- a/src/engine/shared/snapshot.h
+++ b/src/engine/shared/snapshot.h
@@ -6,6 +6,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
+
 // CSnapshot
 
 class CSnapshotItem
@@ -15,12 +18,13 @@ class CSnapshotItem
 	int *Data() { return (int *)(this + 1); }
 
 public:
-	int m_TypeAndID;
+	int m_TypeAndId;
 
 	const int *Data() const { return (int *)(this + 1); }
-	int Type() const { return m_TypeAndID >> 16; }
-	int ID() const { return m_TypeAndID & 0xffff; }
-	int Key() const { return m_TypeAndID; }
+	int Type() const { return m_TypeAndId >> 16; }
+	int Id() const { return m_TypeAndId & 0xffff; }
+	int Key() const { return m_TypeAndId; }
+	void Invalidate() { m_TypeAndId = -1; }
 };
 
 class CSnapshot
@@ -52,9 +56,10 @@ class CSnapshot
 	const CSnapshotItem *GetItem(int Index) const;
 	int GetItemSize(int Index) const;
 	int GetItemIndex(int Key) const;
+	void InvalidateItem(int Index);
 	int GetItemType(int Index) const;
 	int GetExternalItemType(int InternalType) const;
-	const void *FindItem(int Type, int ID) const;
+	const void *FindItem(int Type, int Id) const;
 
 	unsigned Crc() const;
 	void DebugDump() const;
@@ -83,6 +88,7 @@ class CSnapshotDelta
 		MAX_NETOBJSIZES = 64
 	};
 	short m_aItemSizes[MAX_NETOBJSIZES];
+	short m_aItemSizes7[MAX_NETOBJSIZES];
 	int m_aSnapshotDataRate[CSnapshot::MAX_TYPE + 1];
 	int m_aSnapshotDataUpdates[CSnapshot::MAX_TYPE + 1];
 	CData m_Empty;
@@ -96,9 +102,11 @@ class CSnapshotDelta
 	int GetDataRate(int Index) const { return m_aSnapshotDataRate[Index]; }
 	int GetDataUpdates(int Index) const { return m_aSnapshotDataUpdates[Index]; }
 	void SetStaticsize(int ItemType, size_t Size);
+	void SetStaticsize7(int ItemType, size_t Size);
 	const CData *EmptyDelta() const;
 	int CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, void *pDstData);
-	int UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize);
+	int UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize, bool Sixup);
+	int DebugDumpDelta(const void *pSrcData, int DataSize);
 };
 
 // CSnapshotStorage
@@ -150,18 +158,19 @@ class CSnapshotBuilder
 	int m_aExtendedItemTypes[MAX_EXTENDED_ITEM_TYPES];
 	int m_NumExtendedItemTypes;
 
-	void AddExtendedItemType(int Index);
-	int GetExtendedItemTypeIndex(int TypeID);
+	bool AddExtendedItemType(int Index);
+	int GetExtendedItemTypeIndex(int TypeId);
 	int GetTypeFromIndex(int Index) const;
 
-	bool m_Sixup;
+	bool m_Sixup = false;
 
 public:
 	CSnapshotBuilder();
 
 	void Init(bool Sixup = false);
+	void Init7(const CSnapshot *pSnapshot);
 
-	void *NewItem(int Type, int ID, int Size);
+	void *NewItem(int Type, int Id, int Size);
 
 	CSnapshotItem *GetItem(int Index);
 	int *GetItemData(int Key);
diff --git a/src/engine/shared/storage.cpp b/src/engine/shared/storage.cpp
index 3782830a66..7ff3cdc87b 100644
--- a/src/engine/shared/storage.cpp
+++ b/src/engine/shared/storage.cpp
@@ -39,8 +39,13 @@ class CStorage : public IStorage
 
 	int Init(int StorageType, int NumArgs, const char **ppArguments)
 	{
-#if !defined(CONF_PLATFORM_ANDROID)
-		// get userdir, just use data directory on android
+#if defined(CONF_PLATFORM_ANDROID)
+		// See InitAndroid in android_main.cpp for details about Android storage handling.
+		// The current working directory is set to the app specific external storage location
+		// on Android. The user data is stored within a folder "user" in the external storage.
+		str_copy(m_aUserdir, "user");
+#else
+		// get userdir
 		char aFallbackUserdir[IO_MAX_PATH_LENGTH];
 		if(fs_storage_path("DDNet", m_aUserdir, sizeof(m_aUserdir)))
 		{
@@ -91,6 +96,7 @@ class CStorage : public IStorage
 				CreateFolder("mapres", TYPE_SAVE);
 				CreateFolder("downloadedmaps", TYPE_SAVE);
 				CreateFolder("skins", TYPE_SAVE);
+				CreateFolder("skins7", TYPE_SAVE);
 				CreateFolder("downloadedskins", TYPE_SAVE);
 				CreateFolder("themes", TYPE_SAVE);
 				CreateFolder("communityicons", TYPE_SAVE);
@@ -109,6 +115,7 @@ class CStorage : public IStorage
 			CreateFolder("demos", TYPE_SAVE);
 			CreateFolder("demos/auto", TYPE_SAVE);
 			CreateFolder("demos/auto/race", TYPE_SAVE);
+			CreateFolder("demos/auto/server", TYPE_SAVE);
 			CreateFolder("demos/replays", TYPE_SAVE);
 			CreateFolder("editor", TYPE_SAVE);
 			CreateFolder("ghosts", TYPE_SAVE);
@@ -121,7 +128,7 @@ class CStorage : public IStorage
 	void LoadPaths(const char *pArgv0)
 	{
 		// check current directory
-		IOHANDLE File = io_open("storage.cfg", IOFLAG_READ | IOFLAG_SKIP_BOM);
+		IOHANDLE File = io_open("storage.cfg", IOFLAG_READ);
 		if(!File)
 		{
 			// check usable path in argv[0]
@@ -134,7 +141,7 @@ class CStorage : public IStorage
 				char aBuffer[IO_MAX_PATH_LENGTH];
 				str_copy(aBuffer, pArgv0, Pos + 1);
 				str_append(aBuffer, "/storage.cfg");
-				File = io_open(aBuffer, IOFLAG_READ | IOFLAG_SKIP_BOM);
+				File = io_open(aBuffer, IOFLAG_READ);
 			}
 
 			if(Pos >= IO_MAX_PATH_LENGTH || !File)
@@ -145,10 +152,12 @@ class CStorage : public IStorage
 		}
 
 		CLineReader LineReader;
-		LineReader.Init(File);
-
-		char *pLine;
-		while((pLine = LineReader.Get()))
+		if(!LineReader.OpenFile(File))
+		{
+			dbg_msg("storage", "couldn't open storage.cfg");
+			return;
+		}
+		while(const char *pLine = LineReader.Get())
 		{
 			const char *pLineWithoutPrefix = str_startswith(pLine, "add_path ");
 			if(pLineWithoutPrefix)
@@ -157,8 +166,6 @@ class CStorage : public IStorage
 			}
 		}
 
-		io_close(File);
-
 		if(!m_NumPaths)
 			dbg_msg("storage", "no paths found in storage.cfg");
 	}
@@ -559,7 +566,7 @@ class CStorage : public IStorage
 
 	char *ReadFileStr(const char *pFilename, int Type) override
 	{
-		IOHANDLE File = OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, Type);
+		IOHANDLE File = OpenFile(pFilename, IOFLAG_READ, Type);
 		if(!File)
 			return nullptr;
 		char *pResult = io_read_all_str(File);
diff --git a/src/engine/shared/teehistorian_ex_chunks.h b/src/engine/shared/teehistorian_ex_chunks.h
index b1f07fefd1..8546e521c0 100644
--- a/src/engine/shared/teehistorian_ex_chunks.h
+++ b/src/engine/shared/teehistorian_ex_chunks.h
@@ -18,3 +18,6 @@ UUID(TEEHISTORIAN_TEAM_PRACTICE, "teehistorian-team-practice@ddnet.tw")
 UUID(TEEHISTORIAN_PLAYER_READY, "teehistorian-player-ready@ddnet.tw")
 UUID(TEEHISTORIAN_PLAYER_REJOIN, "teehistorian-rejoinver6@ddnet.org")
 UUID(TEEHISTORIAN_ANTIBOT, "teehistorian-antibot@ddnet.org")
+UUID(TEEHISTORIAN_PLAYER_NAME, "teehistorian-player-name@ddnet.org")
+UUID(TEEHISTORIAN_PLAYER_FINISH, "teehistorian-player-finish@ddnet.org")
+UUID(TEEHISTORIAN_TEAM_FINISH, "teehistorian-team-finish@ddnet.org")
diff --git a/src/engine/shared/translation_context.cpp b/src/engine/shared/translation_context.cpp
new file mode 100644
index 0000000000..0214f2c22d
--- /dev/null
+++ b/src/engine/shared/translation_context.cpp
@@ -0,0 +1,38 @@
+#include <base/system.h>
+
+#include "translation_context.h"
+
+void CTranslationContext::Reset()
+{
+	m_ServerSettings.Reset();
+
+	std::fill(std::begin(m_apPlayerInfosRace), std::end(m_apPlayerInfosRace), nullptr);
+
+	for(CClientData &Client : m_aClients)
+		Client.Reset();
+
+	std::fill(std::begin(m_aDamageTaken), std::end(m_aDamageTaken), 0);
+	std::fill(std::begin(m_aDamageTakenTick), std::end(m_aDamageTakenTick), 0);
+	std::fill(std::begin(m_aLocalClientId), std::end(m_aLocalClientId), -1);
+
+	m_ShouldSendGameInfo = false;
+	m_GameStateFlags7 = 0;
+
+	m_GameFlags = 0;
+	m_ScoreLimit = 0;
+	m_TimeLimit = 0;
+	m_MatchNum = 0;
+	m_MatchCurrent = 0;
+
+	m_MapdownloadTotalsize = -1;
+	m_MapDownloadChunkSize = 0;
+	m_MapDownloadChunksPerRequest = 0;
+
+	m_FlagCarrierBlue = 0;
+	m_FlagCarrierRed = 0;
+	m_TeamscoreRed = 0;
+	m_TeamscoreBlue = 0;
+
+	m_GameStartTick7 = 0;
+	m_GameStateEndTick7 = 0;
+}
diff --git a/src/engine/shared/translation_context.h b/src/engine/shared/translation_context.h
new file mode 100644
index 0000000000..7c574955bc
--- /dev/null
+++ b/src/engine/shared/translation_context.h
@@ -0,0 +1,123 @@
+#ifndef ENGINE_SHARED_TRANSLATION_CONTEXT_H
+#define ENGINE_SHARED_TRANSLATION_CONTEXT_H
+
+#include <engine/shared/protocol.h>
+#include <game/generated/protocol7.h>
+
+#include <engine/client/enums.h>
+
+class CTranslationContext
+{
+public:
+	CTranslationContext()
+	{
+		Reset();
+	}
+
+	void Reset();
+
+	// this class is not used
+	// it could be used in the in game menu
+	// to grey out buttons and similar
+	//
+	// but that can not be done without mixing it
+	// into the 0.6 code so it is out of scope for ddnet
+	class CServerSettings
+	{
+	public:
+		bool m_KickVote;
+		int m_KickMin;
+		bool m_SpecVote;
+		bool m_TeamLock;
+		bool m_TeamBalance;
+		int m_PlayerSlots;
+
+		CServerSettings()
+		{
+			Reset();
+		}
+
+		void Reset()
+		{
+			m_KickVote = false;
+			m_KickMin = 0;
+			m_SpecVote = false;
+			m_TeamLock = false;
+			m_TeamBalance = false;
+			m_PlayerSlots = 0;
+		}
+
+	} m_ServerSettings;
+
+	class CClientData
+	{
+	public:
+		CClientData()
+		{
+			Reset();
+		}
+
+		void Reset()
+		{
+			m_Active = false;
+
+			m_UseCustomColor = 0;
+			m_ColorBody = 0;
+			m_ColorFeet = 0;
+
+			m_aName[0] = '\0';
+			m_aClan[0] = '\0';
+			m_Country = 0;
+			m_aSkinName[0] = '\0';
+			m_SkinColor = 0;
+			m_Team = 0;
+			m_PlayerFlags7 = 0;
+		}
+
+		bool m_Active;
+
+		int m_UseCustomColor;
+		int m_ColorBody;
+		int m_ColorFeet;
+
+		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
+		int m_Country;
+		char m_aSkinName[protocol7::MAX_SKIN_LENGTH];
+		int m_SkinColor;
+		int m_Team;
+		int m_PlayerFlags7;
+	};
+
+	const protocol7::CNetObj_PlayerInfoRace *m_apPlayerInfosRace[MAX_CLIENTS];
+	CClientData m_aClients[MAX_CLIENTS];
+	int m_aDamageTaken[MAX_CLIENTS];
+	float m_aDamageTakenTick[MAX_CLIENTS];
+
+	int m_aLocalClientId[NUM_DUMMIES];
+
+	bool m_ShouldSendGameInfo;
+	int m_GameStateFlags7;
+	// 0.7 game flags
+	// use in combination with protocol7::GAMEFLAG_*
+	// for example protocol7::GAMEFLAG_TEAMS
+	int m_GameFlags;
+	int m_ScoreLimit;
+	int m_TimeLimit;
+	int m_MatchNum;
+	int m_MatchCurrent;
+
+	int m_MapdownloadTotalsize;
+	int m_MapDownloadChunkSize;
+	int m_MapDownloadChunksPerRequest;
+
+	int m_FlagCarrierBlue;
+	int m_FlagCarrierRed;
+	int m_TeamscoreRed;
+	int m_TeamscoreBlue;
+
+	int m_GameStartTick7;
+	int m_GameStateEndTick7;
+};
+
+#endif
diff --git a/src/engine/shared/uuid_manager.cpp b/src/engine/shared/uuid_manager.cpp
index 3cff589d60..de69044b81 100644
--- a/src/engine/shared/uuid_manager.cpp
+++ b/src/engine/shared/uuid_manager.cpp
@@ -106,19 +106,19 @@ bool CUuid::operator<(const CUuid &Other) const
 	return mem_comp(this, &Other, sizeof(*this)) < 0;
 }
 
-static int GetIndex(int ID)
+static int GetIndex(int Id)
 {
-	return ID - OFFSET_UUID;
+	return Id - OFFSET_UUID;
 }
 
-static int GetID(int Index)
+static int GetId(int Index)
 {
 	return Index + OFFSET_UUID;
 }
 
-void CUuidManager::RegisterName(int ID, const char *pName)
+void CUuidManager::RegisterName(int Id, const char *pName)
 {
-	dbg_assert(GetIndex(ID) == (int)m_vNames.size(), "names must be registered with increasing ID");
+	dbg_assert(GetIndex(Id) == (int)m_vNames.size(), "names must be registered with increasing ID");
 	CName Name;
 	Name.m_pName = pName;
 	Name.m_Uuid = CalculateUuid(pName);
@@ -128,29 +128,29 @@ void CUuidManager::RegisterName(int ID, const char *pName)
 
 	CNameIndexed NameIndexed;
 	NameIndexed.m_Uuid = Name.m_Uuid;
-	NameIndexed.m_ID = GetIndex(ID);
+	NameIndexed.m_Id = GetIndex(Id);
 	m_vNamesSorted.insert(std::lower_bound(m_vNamesSorted.begin(), m_vNamesSorted.end(), NameIndexed), NameIndexed);
 }
 
-CUuid CUuidManager::GetUuid(int ID) const
+CUuid CUuidManager::GetUuid(int Id) const
 {
-	return m_vNames[GetIndex(ID)].m_Uuid;
+	return m_vNames[GetIndex(Id)].m_Uuid;
 }
 
-const char *CUuidManager::GetName(int ID) const
+const char *CUuidManager::GetName(int Id) const
 {
-	return m_vNames[GetIndex(ID)].m_pName;
+	return m_vNames[GetIndex(Id)].m_pName;
 }
 
 int CUuidManager::LookupUuid(CUuid Uuid) const
 {
 	CNameIndexed Needle;
 	Needle.m_Uuid = Uuid;
-	Needle.m_ID = 0;
+	Needle.m_Id = 0;
 	auto Range = std::equal_range(m_vNamesSorted.begin(), m_vNamesSorted.end(), Needle);
 	if(std::distance(Range.first, Range.second) == 1)
 	{
-		return GetID(Range.first->m_ID);
+		return GetId(Range.first->m_Id);
 	}
 	return UUID_UNKNOWN;
 }
@@ -177,9 +177,9 @@ int CUuidManager::UnpackUuid(CUnpacker *pUnpacker, CUuid *pOut) const
 	return LookupUuid(*pUuid);
 }
 
-void CUuidManager::PackUuid(int ID, CPacker *pPacker) const
+void CUuidManager::PackUuid(int Id, CPacker *pPacker) const
 {
-	CUuid Uuid = GetUuid(ID);
+	CUuid Uuid = GetUuid(Id);
 	pPacker->AddRaw(&Uuid, sizeof(Uuid));
 }
 
diff --git a/src/engine/shared/uuid_manager.h b/src/engine/shared/uuid_manager.h
index 00d1a4822f..d8b10086a0 100644
--- a/src/engine/shared/uuid_manager.h
+++ b/src/engine/shared/uuid_manager.h
@@ -40,7 +40,7 @@ struct CName
 struct CNameIndexed
 {
 	CUuid m_Uuid;
-	int m_ID;
+	int m_Id;
 
 	bool operator<(const CNameIndexed &Other) const { return m_Uuid < Other.m_Uuid; }
 	bool operator==(const CNameIndexed &Other) const { return m_Uuid == Other.m_Uuid; }
@@ -55,15 +55,15 @@ class CUuidManager
 	std::vector<CNameIndexed> m_vNamesSorted;
 
 public:
-	void RegisterName(int ID, const char *pName);
-	CUuid GetUuid(int ID) const;
-	const char *GetName(int ID) const;
+	void RegisterName(int Id, const char *pName);
+	CUuid GetUuid(int Id) const;
+	const char *GetName(int Id) const;
 	int LookupUuid(CUuid Uuid) const;
 	int NumUuids() const;
 
 	int UnpackUuid(CUnpacker *pUnpacker) const;
 	int UnpackUuid(CUnpacker *pUnpacker, CUuid *pOut) const;
-	void PackUuid(int ID, CPacker *pPacker) const;
+	void PackUuid(int Id, CPacker *pPacker) const;
 
 	void DebugDump() const;
 };
diff --git a/src/engine/shared/video.h b/src/engine/shared/video.h
index c93cdd80a9..1a97f5a52e 100644
--- a/src/engine/shared/video.h
+++ b/src/engine/shared/video.h
@@ -12,7 +12,7 @@ class IVideo
 public:
 	virtual ~IVideo(){};
 
-	virtual void Start() = 0;
+	virtual bool Start() = 0;
 	virtual void Stop() = 0;
 	virtual void Pause(bool Pause) = 0;
 	virtual bool IsRecording() = 0;
diff --git a/src/engine/sound.h b/src/engine/sound.h
index f5e2c08d54..e4462a95a1 100644
--- a/src/engine/sound.h
+++ b/src/engine/sound.h
@@ -6,6 +6,8 @@
 #include <engine/kernel.h>
 #include <engine/storage.h>
 
+#include <base/vmath.h>
+
 class ISound : public IInterface
 {
 	MACRO_INTERFACE("sound")
@@ -28,7 +30,7 @@ class ISound : public IInterface
 	// unused
 	struct CSampleHandle
 	{
-		int m_SampleID;
+		int m_SampleId;
 	};
 
 	struct CVoiceShapeCircle
@@ -67,32 +69,34 @@ class ISound : public IInterface
 	virtual int LoadWV(const char *pFilename, int StorageType = IStorage::TYPE_ALL) = 0;
 	virtual int LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor = false) = 0;
 	virtual int LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor = false) = 0;
-	virtual void UnloadSample(int SampleID) = 0;
+	virtual void UnloadSample(int SampleId) = 0;
 
-	virtual float GetSampleTotalTime(int SampleID) = 0; // in s
-	virtual float GetSampleCurrentTime(int SampleID) = 0; // in s
-	virtual void SetSampleCurrentTime(int SampleID, float Time) = 0;
+	virtual float GetSampleTotalTime(int SampleId) = 0; // in s
+	virtual float GetSampleCurrentTime(int SampleId) = 0; // in s
+	virtual void SetSampleCurrentTime(int SampleId, float Time) = 0;
 
-	virtual void SetChannel(int ChannelID, float Volume, float Panning) = 0;
-	virtual void SetListenerPos(float x, float y) = 0;
+	virtual void SetChannel(int ChannelId, float Volume, float Panning) = 0;
+	virtual void SetListenerPosition(vec2 Position) = 0;
 
 	virtual void SetVoiceVolume(CVoiceHandle Voice, float Volume) = 0;
 	virtual void SetVoiceFalloff(CVoiceHandle Voice, float Falloff) = 0;
-	virtual void SetVoiceLocation(CVoiceHandle Voice, float x, float y) = 0;
+	virtual void SetVoicePosition(CVoiceHandle Voice, vec2 Position) = 0;
 	virtual void SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset) = 0; // in s
 
 	virtual void SetVoiceCircle(CVoiceHandle Voice, float Radius) = 0;
 	virtual void SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height) = 0;
 
-	virtual CVoiceHandle PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) = 0;
-	virtual CVoiceHandle Play(int ChannelID, int SampleID, int Flags) = 0;
-	virtual void Pause(int SampleID) = 0;
-	virtual void Stop(int SampleID) = 0;
+	virtual CVoiceHandle PlayAt(int ChannelId, int SampleId, int Flags, float Volume, vec2 Position) = 0;
+	virtual CVoiceHandle Play(int ChannelId, int SampleId, int Flags, float Volume) = 0;
+	virtual void Pause(int SampleId) = 0;
+	virtual void Stop(int SampleId) = 0;
 	virtual void StopAll() = 0;
 	virtual void StopVoice(CVoiceHandle Voice) = 0;
-	virtual bool IsPlaying(int SampleID) = 0;
+	virtual bool IsPlaying(int SampleId) = 0;
 
+	virtual int MixingRate() const = 0;
 	virtual void Mix(short *pFinalOut, unsigned Frames) = 0;
+
 	// useful for thread synchronization
 	virtual void PauseAudioDevice() = 0;
 	virtual void UnpauseAudioDevice() = 0;
diff --git a/src/engine/textrender.h b/src/engine/textrender.h
index 0d1287c3d4..3b26e0aaa7 100644
--- a/src/engine/textrender.h
+++ b/src/engine/textrender.h
@@ -66,6 +66,7 @@ enum class EFontPreset
 namespace FontIcons {
 // Each font icon is named according to its official name in Font Awesome
 MAYBE_UNUSED static const char *FONT_ICON_PLUS = "+";
+MAYBE_UNUSED static const char *FONT_ICON_MINUS = "-";
 MAYBE_UNUSED static const char *FONT_ICON_LOCK = "\xEF\x80\xA3";
 MAYBE_UNUSED static const char *FONT_ICON_MAGNIFYING_GLASS = "\xEF\x80\x82";
 MAYBE_UNUSED static const char *FONT_ICON_HEART = "\xEF\x80\x84";
@@ -89,8 +90,10 @@ MAYBE_UNUSED static const char *FONT_ICON_GEAR = "\xEF\x80\x93";
 MAYBE_UNUSED static const char *FONT_ICON_PEN_TO_SQUARE = "\xEF\x81\x84";
 MAYBE_UNUSED static const char *FONT_ICON_CLAPPERBOARD = "\xEE\x84\xB1";
 MAYBE_UNUSED static const char *FONT_ICON_EARTH_AMERICAS = "\xEF\x95\xBD";
+MAYBE_UNUSED static const char *FONT_ICON_NETWORK_WIRED = "\xEF\x9B\xBF";
 MAYBE_UNUSED static const char *FONT_ICON_LIST_UL = "\xEF\x83\x8A";
 MAYBE_UNUSED static const char *FONT_ICON_INFO = "\xEF\x84\xA9";
+MAYBE_UNUSED static const char *FONT_ICON_TERMINAL = "\xEF\x84\xA0";
 
 MAYBE_UNUSED static const char *FONT_ICON_SLASH = "\xEF\x9C\x95";
 MAYBE_UNUSED static const char *FONT_ICON_PLAY = "\xEF\x81\x8B";
@@ -131,6 +134,7 @@ MAYBE_UNUSED static const char *FONT_ICON_CIRCLE_PLAY = "\xEF\x85\x84";
 MAYBE_UNUSED static const char *FONT_ICON_BORDER_ALL = "\xEF\xA1\x8C";
 MAYBE_UNUSED static const char *FONT_ICON_EYE = "\xEF\x81\xAE";
 MAYBE_UNUSED static const char *FONT_ICON_EYE_SLASH = "\xEF\x81\xB0";
+MAYBE_UNUSED static const char *FONT_ICON_EYE_DROPPER = "\xEF\x87\xBB";
 
 MAYBE_UNUSED static const char *FONT_ICON_DICE_ONE = "\xEF\x94\xA5";
 MAYBE_UNUSED static const char *FONT_ICON_DICE_TWO = "\xEF\x94\xA8";
@@ -142,6 +146,9 @@ MAYBE_UNUSED static const char *FONT_ICON_DICE_SIX = "\xEF\x94\xA6";
 MAYBE_UNUSED static const char *FONT_ICON_LAYER_GROUP = "\xEF\x97\xBD";
 MAYBE_UNUSED static const char *FONT_ICON_UNDO = "\xEF\x8B\xAA";
 MAYBE_UNUSED static const char *FONT_ICON_REDO = "\xEF\x8B\xB9";
+
+MAYBE_UNUSED static const char *FONT_ICON_ARROWS_ROTATE = "\xEF\x80\xA1";
+MAYBE_UNUSED static const char *FONT_ICON_QUESTION = "?";
 } // end namespace FontIcons
 
 enum ETextCursorSelectionMode
@@ -212,6 +219,7 @@ class CTextCursor
 	float m_FontSize;
 	float m_AlignedFontSize;
 	float m_LineSpacing;
+	float m_AlignedLineSpacing;
 
 	ETextCursorSelectionMode m_CalculateSelectionMode;
 	float m_SelectionHeightFactor;
@@ -237,7 +245,7 @@ class CTextCursor
 
 	float Height() const
 	{
-		return m_LineCount * m_AlignedFontSize + std::max(0, m_LineCount - 1) * m_LineSpacing;
+		return m_LineCount * (m_AlignedFontSize + m_AlignedLineSpacing);
 	}
 
 	STextBoundingBox BoundingBox() const
@@ -337,18 +345,18 @@ class ITextRender : public IInterface
 
 	virtual STextBoundingBox GetBoundingBoxTextContainer(STextContainerIndex TextContainerIndex) = 0;
 
-	virtual void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) = 0;
+	virtual void UploadEntityLayerText(const CImageInfo &TextImage, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) = 0;
 	virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth) const = 0;
 	virtual float GetGlyphOffsetX(int FontSize, char TextCharacter) const = 0;
 	virtual int CalculateTextWidth(const char *pText, int TextLength, int FontWidth, int FontSize) const = 0;
 
 	// old foolish interface
 	virtual void TextColor(float r, float g, float b, float a) = 0;
-	virtual void TextColor(ColorRGBA rgb) = 0;
+	virtual void TextColor(ColorRGBA Color) = 0;
 	virtual void TextOutlineColor(float r, float g, float b, float a) = 0;
-	virtual void TextOutlineColor(ColorRGBA rgb) = 0;
+	virtual void TextOutlineColor(ColorRGBA Color) = 0;
 	virtual void TextSelectionColor(float r, float g, float b, float a) = 0;
-	virtual void TextSelectionColor(ColorRGBA rgb) = 0;
+	virtual void TextSelectionColor(ColorRGBA Color) = 0;
 	virtual void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) = 0;
 	virtual float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, const STextSizeProperties &TextSizeProps = {}) = 0;
 	virtual STextBoundingBox TextBoundingBox(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, float LineSpacing = 0.0f, int Flags = 0) = 0;
diff --git a/src/engine/updater.h b/src/engine/updater.h
index 8a3be8651f..3de864091c 100644
--- a/src/engine/updater.h
+++ b/src/engine/updater.h
@@ -7,9 +7,9 @@ class IUpdater : public IInterface
 {
 	MACRO_INTERFACE("updater")
 public:
-	enum
+	enum EUpdaterState
 	{
-		CLEAN = 0,
+		CLEAN,
 		GETTING_MANIFEST,
 		GOT_MANIFEST,
 		PARSING_UPDATE,
@@ -22,7 +22,7 @@ class IUpdater : public IInterface
 	virtual void Update() = 0;
 	virtual void InitiateUpdate() = 0;
 
-	virtual int GetCurrentState() = 0;
+	virtual EUpdaterState GetCurrentState() = 0;
 	virtual void GetCurrentFile(char *pBuf, int BufSize) = 0;
 	virtual int GetCurrentPercent() = 0;
 };
diff --git a/src/engine/warning.h b/src/engine/warning.h
index bd1e45e752..4532a10353 100644
--- a/src/engine/warning.h
+++ b/src/engine/warning.h
@@ -7,8 +7,8 @@ struct SWarning
 	SWarning(const char *pMsg);
 	SWarning(const char *pTitle, const char *pMsg);
 
-	char m_aWarningTitle[128];
-	char m_aWarningMsg[256];
+	char m_aWarningTitle[128] = "";
+	char m_aWarningMsg[256] = "";
 	bool m_WasShown = false;
 	bool m_AutoHide = true;
 };
diff --git a/src/game/alloc.h b/src/game/alloc.h
index b4a76a9bd9..4a829a1184 100644
--- a/src/game/alloc.h
+++ b/src/game/alloc.h
@@ -22,9 +22,9 @@
 public: \
 	void *operator new(size_t Size) \
 	{ \
-		void *p = malloc(Size); \
-		mem_zero(p, Size); \
-		return p; \
+		void *pObj = malloc(Size); \
+		mem_zero(pObj, Size); \
+		return pObj; \
 	} \
 	void operator delete(void *pPtr) \
 	{ \
@@ -35,9 +35,9 @@ public: \
 
 #define MACRO_ALLOC_POOL_ID() \
 public: \
-	void *operator new(size_t Size, int id); \
-	void operator delete(void *p, int id); \
-	void operator delete(void *p); /* NOLINT(misc-new-delete-overloads) */ \
+	void *operator new(size_t Size, int Id); \
+	void operator delete(void *pObj, int Id); \
+	void operator delete(void *pObj); /* NOLINT(misc-new-delete-overloads) */ \
 \
 private:
 
@@ -51,30 +51,30 @@ public: \
 	static char gs_PoolData##POOLTYPE[PoolSize][MACRO_ALLOC_GET_SIZE(POOLTYPE)] = {{0}}; \
 	static int gs_PoolUsed##POOLTYPE[PoolSize] = {0}; \
 	MAYBE_UNUSED static int gs_PoolDummy##POOLTYPE = (ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE, sizeof(gs_PoolData##POOLTYPE)), 0); \
-	void *POOLTYPE::operator new(size_t Size, int id) \
+	void *POOLTYPE::operator new(size_t Size, int Id) \
 	{ \
 		dbg_assert(sizeof(POOLTYPE) >= Size, "size error"); \
-		dbg_assert(!gs_PoolUsed##POOLTYPE[id], "already used"); \
-		ASAN_UNPOISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
-		gs_PoolUsed##POOLTYPE[id] = 1; \
-		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
-		return gs_PoolData##POOLTYPE[id]; \
+		dbg_assert(!gs_PoolUsed##POOLTYPE[Id], "already used"); \
+		ASAN_UNPOISON_MEMORY_REGION(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
+		gs_PoolUsed##POOLTYPE[Id] = 1; \
+		mem_zero(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
+		return gs_PoolData##POOLTYPE[Id]; \
 	} \
-	void POOLTYPE::operator delete(void *p, int id) \
+	void POOLTYPE::operator delete(void *pObj, int Id) \
 	{ \
-		dbg_assert(gs_PoolUsed##POOLTYPE[id], "not used"); \
-		dbg_assert(id == (POOLTYPE *)p - (POOLTYPE *)gs_PoolData##POOLTYPE, "invalid id"); \
-		gs_PoolUsed##POOLTYPE[id] = 0; \
-		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
-		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		dbg_assert(gs_PoolUsed##POOLTYPE[Id], "not used"); \
+		dbg_assert(Id == (POOLTYPE *)pObj - (POOLTYPE *)gs_PoolData##POOLTYPE, "invalid id"); \
+		gs_PoolUsed##POOLTYPE[Id] = 0; \
+		mem_zero(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
+		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
 	} \
-	void POOLTYPE::operator delete(void *p) /* NOLINT(misc-new-delete-overloads) */ \
+	void POOLTYPE::operator delete(void *pObj) /* NOLINT(misc-new-delete-overloads) */ \
 	{ \
-		int id = (POOLTYPE *)p - (POOLTYPE *)gs_PoolData##POOLTYPE; \
-		dbg_assert(gs_PoolUsed##POOLTYPE[id], "not used"); \
-		gs_PoolUsed##POOLTYPE[id] = 0; \
-		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
-		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		int Id = (POOLTYPE *)pObj - (POOLTYPE *)gs_PoolData##POOLTYPE; \
+		dbg_assert(gs_PoolUsed##POOLTYPE[Id], "not used"); \
+		gs_PoolUsed##POOLTYPE[Id] = 0; \
+		mem_zero(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
+		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[Id], sizeof(gs_PoolData##POOLTYPE[Id])); \
 	}
 
 #endif
diff --git a/src/game/client/component.cpp b/src/game/client/component.cpp
index 754aea48d5..c682d7457d 100644
--- a/src/game/client/component.cpp
+++ b/src/game/client/component.cpp
@@ -2,13 +2,15 @@
 
 #include "gameclient.h"
 
+#include <base/system.h>
+
 class IKernel *CComponent::Kernel() const { return m_pClient->Kernel(); }
 class IEngine *CComponent::Engine() const { return m_pClient->Engine(); }
 class IGraphics *CComponent::Graphics() const { return m_pClient->Graphics(); }
 class ITextRender *CComponent::TextRender() const { return m_pClient->TextRender(); }
 class IInput *CComponent::Input() const { return m_pClient->Input(); }
 class IStorage *CComponent::Storage() const { return m_pClient->Storage(); }
-class CUI *CComponent::UI() const { return m_pClient->UI(); }
+class CUi *CComponent::Ui() const { return m_pClient->Ui(); }
 class ISound *CComponent::Sound() const { return m_pClient->Sound(); }
 class CRenderTools *CComponent::RenderTools() const { return m_pClient->RenderTools(); }
 class IConfigManager *CComponent::ConfigManager() const { return m_pClient->ConfigManager(); }
@@ -27,6 +29,15 @@ class IUpdater *CComponent::Updater() const
 }
 #endif
 
+int64_t CComponent::time() const
+{
+#if defined(CONF_VIDEORECORDER)
+	return IVideo::Current() ? IVideo::Time() : time_get();
+#else
+	return time_get();
+#endif
+}
+
 float CComponent::LocalTime() const
 {
 #if defined(CONF_VIDEORECORDER)
@@ -40,3 +51,5 @@ class IClient *CComponent::Client() const
 {
 	return m_pClient->Client();
 }
+
+class IHttp *CComponent::Http() const { return m_pClient->Http(); }
diff --git a/src/game/client/component.h b/src/game/client/component.h
index 8e754e7f32..639c8b140a 100644
--- a/src/game/client/component.h
+++ b/src/game/client/component.h
@@ -49,7 +49,7 @@ class CComponent
 	/**
 	 * Get the ui interface.
 	 */
-	class CUI *UI() const;
+	class CUi *Ui() const;
 	/**
 	 * Get the sound interface.
 	 */
@@ -104,30 +104,22 @@ class CComponent
 	class IUpdater *Updater() const;
 #endif
 
-#if defined(CONF_VIDEORECORDER)
-	/**
-	 * Gets the current time.
-	 * @see time_get()
-	 */
-	int64_t time() const
-	{
-		return IVideo::Current() ? IVideo::Time() : time_get();
-	}
-#else
 	/**
 	 * Gets the current time.
 	 * @see time_get()
 	 */
-	int64_t time() const
-	{
-		return time_get();
-	}
-#endif
+	int64_t time() const;
+
 	/**
 	 * Gets the local time.
 	 */
 	float LocalTime() const;
 
+	/**
+	 * Get the http interface
+	 */
+	class IHttp *Http() const;
+
 public:
 	/**
 	 * The component virtual destructor.
@@ -177,6 +169,10 @@ class CComponent
 	 * Called when the window has been resized.
 	 */
 	virtual void OnWindowResize() {}
+	/**
+	 * Called when skins have been invalidated and must be updated.
+	 */
+	virtual void OnRefreshSkins() {}
 	/**
 	 * Called when the component should get rendered.
 	 *
diff --git a/src/game/client/components/background.cpp b/src/game/client/components/background.cpp
index 425ec5bf64..1d7c41c61f 100644
--- a/src/game/client/components/background.cpp
+++ b/src/game/client/components/background.cpp
@@ -60,7 +60,7 @@ void CBackground::LoadBackground()
 		bool NeedImageLoading = false;
 
 		char aBuf[IO_MAX_PATH_LENGTH];
-		str_format(aBuf, sizeof(aBuf), "maps/%s", g_Config.m_ClBackgroundEntities);
+		str_format(aBuf, sizeof(aBuf), "maps/%s%s", g_Config.m_ClBackgroundEntities, str_endswith(g_Config.m_ClBackgroundEntities, ".map") ? "" : ".map");
 		if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0)
 		{
 			m_pMap = Kernel()->RequestInterface<IEngineMap>();
diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp
index 1ec52bc76f..3e7ca824de 100644
--- a/src/game/client/components/binds.cpp
+++ b/src/game/client/components/binds.cpp
@@ -5,32 +5,23 @@
 #include <engine/config.h>
 #include <engine/shared/config.h>
 
+#include <game/client/components/chat.h>
+#include <game/client/components/console.h>
 #include <game/client/gameclient.h>
 
 static const ColorRGBA gs_BindPrintColor{1.0f, 1.0f, 0.8f, 1.0f};
 
 bool CBinds::CBindsSpecial::OnInput(const IInput::CEvent &Event)
 {
+	if((Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_RELEASE)) == 0)
+		return false;
+
 	// only handle F and composed F binds
-	if(((Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) || (Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24)) && (Event.m_Key != KEY_F5 || !m_pClient->m_Menus.IsActive()))
+	// do not handle F5 bind while menu is active
+	if(((Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) || (Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24)) &&
+		(Event.m_Key != KEY_F5 || !m_pClient->m_Menus.IsActive()))
 	{
-		int Mask = CBinds::GetModifierMask(Input());
-
-		// Look for a composed bind
-		bool ret = false;
-		if(m_pBinds->m_aapKeyBindings[Mask][Event.m_Key])
-		{
-			m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mask][Event.m_Key]);
-			ret = true;
-		}
-		// Look for a non composed bind
-		if(!ret && m_pBinds->m_aapKeyBindings[0][Event.m_Key])
-		{
-			m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[0][Event.m_Key]);
-			ret = true;
-		}
-
-		return ret;
+		return m_pBinds->OnInput(Event);
 	}
 
 	return false;
@@ -44,37 +35,33 @@ CBinds::CBinds()
 
 CBinds::~CBinds()
 {
-	for(int i = 0; i < KEY_LAST; i++)
-		for(auto &apKeyBinding : m_aapKeyBindings)
-			free(apKeyBinding[i]);
+	UnbindAll();
 }
 
-void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int ModifierCombination)
+void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombination)
 {
-	if(KeyID < 0 || KeyID >= KEY_LAST)
-		return;
+	dbg_assert(KeyId >= KEY_FIRST && KeyId < KEY_LAST, "KeyId invalid");
+	dbg_assert(ModifierCombination >= MODIFIER_NONE && ModifierCombination < MODIFIER_COMBINATION_COUNT, "ModifierCombination invalid");
 
-	if(FreeOnly && Get(KeyID, ModifierCombination)[0])
+	if(FreeOnly && Get(KeyId, ModifierCombination)[0])
 		return;
 
-	free(m_aapKeyBindings[ModifierCombination][KeyID]);
-	m_aapKeyBindings[ModifierCombination][KeyID] = 0;
-
-	// skip modifiers for +xxx binds
-	if(pStr[0] == '+')
-		ModifierCombination = 0;
+	free(m_aapKeyBindings[ModifierCombination][KeyId]);
+	m_aapKeyBindings[ModifierCombination][KeyId] = nullptr;
 
 	char aBuf[256];
+	char aModifiers[128];
+	GetKeyBindModifiersName(ModifierCombination, aModifiers, sizeof(aModifiers));
 	if(!pStr[0])
 	{
-		str_format(aBuf, sizeof(aBuf), "unbound %s%s (%d)", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID);
+		str_format(aBuf, sizeof(aBuf), "unbound %s%s (%d)", aModifiers, Input()->KeyName(KeyId), KeyId);
 	}
 	else
 	{
 		int Size = str_length(pStr) + 1;
-		m_aapKeyBindings[ModifierCombination][KeyID] = (char *)malloc(Size);
-		str_copy(m_aapKeyBindings[ModifierCombination][KeyID], pStr, Size);
-		str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[ModifierCombination][KeyID]);
+		m_aapKeyBindings[ModifierCombination][KeyId] = (char *)malloc(Size);
+		str_copy(m_aapKeyBindings[ModifierCombination][KeyId], pStr, Size);
+		str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", aModifiers, Input()->KeyName(KeyId), KeyId, m_aapKeyBindings[ModifierCombination][KeyId]);
 	}
 	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "binds", aBuf, gs_BindPrintColor);
 }
@@ -120,59 +107,113 @@ int CBinds::GetModifierMaskOfKey(int Key)
 	case KEY_RGUI:
 		return 1 << CBinds::MODIFIER_GUI;
 	default:
-		return 0;
+		return CBinds::MODIFIER_NONE;
 	}
 }
 
 bool CBinds::OnInput(const IInput::CEvent &Event)
 {
-	// don't handle invalid events
-	if(Event.m_Key <= KEY_FIRST || Event.m_Key >= KEY_LAST)
+	if((Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_RELEASE)) == 0)
 		return false;
 
-	int Mask = GetModifierMask(Input());
-	int KeyModifierMask = GetModifierMaskOfKey(Event.m_Key);
-	Mask &= ~KeyModifierMask;
+	const int KeyModifierMask = GetModifierMaskOfKey(Event.m_Key);
+	const int ModifierMask = GetModifierMask(Input()) & ~KeyModifierMask;
 
-	bool ret = false;
-	const char *pKey = nullptr;
+	bool Handled = false;
 
-	if(m_aapKeyBindings[Mask][Event.m_Key])
+	if(Event.m_Flags & IInput::FLAG_PRESS)
 	{
-		if(Event.m_Flags & IInput::FLAG_PRESS)
+		auto ActiveBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
+			return Event.m_Key == Bind.m_Key;
+		});
+		if(ActiveBind == m_vActiveBinds.end())
 		{
-			Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mask][Event.m_Key]);
-			pKey = m_aapKeyBindings[Mask][Event.m_Key];
+			const auto &&OnKeyPress = [&](int Mask) {
+				const char *pBind = m_aapKeyBindings[Mask][Event.m_Key];
+				if(g_Config.m_ClSubTickAiming)
+				{
+					if(str_comp("+fire", pBind) == 0 || str_comp("+hook", pBind) == 0)
+					{
+						m_MouseOnAction = true;
+					}
+				}
+				Console()->ExecuteLineStroked(1, pBind);
+				m_vActiveBinds.emplace_back(Event.m_Key, Mask);
+			};
+
+			if(m_aapKeyBindings[ModifierMask][Event.m_Key])
+			{
+				OnKeyPress(ModifierMask);
+				Handled = true;
+			}
+			else if(m_aapKeyBindings[MODIFIER_NONE][Event.m_Key] &&
+				ModifierMask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) &&
+				ModifierMask != ((1 << MODIFIER_GUI) | (1 << MODIFIER_SHIFT)))
+			{
+				OnKeyPress(MODIFIER_NONE);
+				Handled = true;
+			}
+		}
+		else
+		{
+			// Repeat active bind while key is held down
+			// Have to check for nullptr again because the previous execute can unbind itself
+			if(m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key])
+			{
+				Console()->ExecuteLineStroked(1, m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key]);
+			}
+			Handled = true;
 		}
-		// Have to check for nullptr again because the previous execute can unbind itself
-		if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[Mask][Event.m_Key])
-			Console()->ExecuteLineStroked(0, m_aapKeyBindings[Mask][Event.m_Key]);
-		ret = true;
 	}
 
-	if(m_aapKeyBindings[0][Event.m_Key] && !ret)
+	if(Event.m_Flags & IInput::FLAG_RELEASE)
 	{
-		// When ctrl+shift are pressed (ctrl+shift binds and also the hard-coded ctrl+shift+d, ctrl+shift+g, ctrl+shift+e), ignore other +xxx binds
-		if(Event.m_Flags & IInput::FLAG_PRESS && Mask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) && Mask != ((1 << MODIFIER_GUI) | (1 << MODIFIER_SHIFT)))
+		const auto &&OnKeyRelease = [&](const CBindSlot &Bind) {
+			// Prevent binds from being deactivated while chat, console and menus are open, as these components will
+			// still allow key release events to be forwarded to this component, so the active binds can be cleared.
+			if(GameClient()->m_Chat.IsActive() ||
+				!GameClient()->m_GameConsole.IsClosed() ||
+				GameClient()->m_Menus.IsActive())
+			{
+				return;
+			}
+			// Have to check for nullptr again because the previous execute can unbind itself
+			if(!m_aapKeyBindings[Bind.m_ModifierMask][Bind.m_Key])
+			{
+				return;
+			}
+			Console()->ExecuteLineStroked(0, m_aapKeyBindings[Bind.m_ModifierMask][Bind.m_Key]);
+		};
+
+		// Release active bind that uses this primary key
+		auto ActiveBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
+			return Event.m_Key == Bind.m_Key;
+		});
+		if(ActiveBind != m_vActiveBinds.end())
 		{
-			Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][Event.m_Key]);
-			pKey = m_aapKeyBindings[Mask][Event.m_Key];
+			OnKeyRelease(*ActiveBind);
+			m_vActiveBinds.erase(ActiveBind);
+			Handled = true;
 		}
-		// Have to check for nullptr again because the previous execute can unbind itself
-		if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[0][Event.m_Key])
-			Console()->ExecuteLineStroked(0, m_aapKeyBindings[0][Event.m_Key]);
-		ret = true;
-	}
 
-	if(g_Config.m_ClSubTickAiming && pKey)
-	{
-		if(str_comp("+fire", pKey) == 0 || str_comp("+hook", pKey) == 0)
+		// Release all active binds that use this modifier key
+		if(KeyModifierMask != MODIFIER_NONE)
 		{
-			m_MouseOnAction = true;
+			while(true)
+			{
+				auto ActiveModifierBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
+					return (Bind.m_ModifierMask & KeyModifierMask) != 0;
+				});
+				if(ActiveModifierBind == m_vActiveBinds.end())
+					break;
+				OnKeyRelease(*ActiveModifierBind);
+				m_vActiveBinds.erase(ActiveModifierBind);
+				Handled = true;
+			}
 		}
 	}
 
-	return ret;
+	return Handled;
 }
 
 void CBinds::UnbindAll()
@@ -182,51 +223,44 @@ void CBinds::UnbindAll()
 		for(auto &pKeyBinding : apKeyBinding)
 		{
 			free(pKeyBinding);
-			pKeyBinding = 0;
+			pKeyBinding = nullptr;
 		}
 	}
 }
 
-const char *CBinds::Get(int KeyID, int ModifierCombination)
+const char *CBinds::Get(int KeyId, int ModifierCombination)
 {
-	if(KeyID > 0 && KeyID < KEY_LAST && m_aapKeyBindings[ModifierCombination][KeyID])
-		return m_aapKeyBindings[ModifierCombination][KeyID];
-	return "";
+	dbg_assert(KeyId >= KEY_FIRST && KeyId < KEY_LAST, "KeyId invalid");
+	dbg_assert(ModifierCombination >= MODIFIER_NONE && ModifierCombination < MODIFIER_COMBINATION_COUNT, "ModifierCombination invalid");
+	return m_aapKeyBindings[ModifierCombination][KeyId] ? m_aapKeyBindings[ModifierCombination][KeyId] : "";
 }
 
 void CBinds::GetKey(const char *pBindStr, char *pBuf, size_t BufSize)
 {
-	pBuf[0] = 0;
-	for(int Mod = 0; Mod < MODIFIER_COMBINATION_COUNT; Mod++)
+	pBuf[0] = '\0';
+	for(int Modifier = MODIFIER_NONE; Modifier < MODIFIER_COMBINATION_COUNT; Modifier++)
 	{
-		for(int KeyId = 0; KeyId < KEY_LAST; KeyId++)
+		char aModifiers[128];
+		GetKeyBindModifiersName(Modifier, aModifiers, sizeof(aModifiers));
+		for(int KeyId = KEY_FIRST; KeyId < KEY_LAST; KeyId++)
 		{
-			const char *pBind = Get(KeyId, Mod);
+			const char *pBind = Get(KeyId, Modifier);
 			if(!pBind[0])
 				continue;
 
 			if(str_comp(pBind, pBindStr) == 0)
 			{
-				if(Mod)
-					str_format(pBuf, BufSize, "%s+%s", GetModifierName(Mod), Input()->KeyName(KeyId));
-				else
-					str_copy(pBuf, Input()->KeyName(KeyId), BufSize);
+				str_format(pBuf, BufSize, "%s%s", aModifiers, Input()->KeyName(KeyId));
 				return;
 			}
 		}
 	}
 }
 
-void CBinds::StaBinds()
-{
-	Bind(KEY_X, "exec TripleFlyON.cfg ");
-	Bind(KEY_V, "exec DeepFlyOn.cfg ");
-}
-
 void CBinds::SetDefaults()
 {
-	// set default key bindings
 	UnbindAll();
+
 	Bind(KEY_F1, "toggle_local_console");
 	Bind(KEY_F2, "toggle_remote_console");
 	Bind(KEY_TAB, "+scoreboard");
@@ -266,7 +300,6 @@ void CBinds::SetDefaults()
 	Bind(KEY_Q, "say /pause");
 	Bind(KEY_P, "say /pause");
 
-	// DDRace
 	g_Config.m_ClDDRaceBindsSet = 0;
 	SetDDRaceBinds(false);
 }
@@ -280,7 +313,6 @@ void CBinds::OnConsoleInit()
 	Console()->Register("unbind", "s[key]", CFGFLAG_CLIENT, ConUnbind, this, "Unbind key");
 	Console()->Register("unbindall", "", CFGFLAG_CLIENT, ConUnbindAll, this, "Unbind all keys");
 
-	// default bindings
 	SetDefaults();
 }
 
@@ -288,10 +320,9 @@ void CBinds::ConBind(IConsole::IResult *pResult, void *pUserData)
 {
 	CBinds *pBinds = (CBinds *)pUserData;
 	const char *pBindStr = pResult->GetString(0);
-	int Modifier;
-	int KeyID = pBinds->GetBindSlot(pBindStr, &Modifier);
+	const CBindSlot BindSlot = pBinds->GetBindSlot(pBindStr);
 
-	if(!KeyID)
+	if(!BindSlot.m_Key)
 	{
 		char aBuf[256];
 		str_format(aBuf, sizeof(aBuf), "key %s not found", pBindStr);
@@ -304,16 +335,16 @@ void CBinds::ConBind(IConsole::IResult *pResult, void *pUserData)
 		char aBuf[256];
 		const char *pKeyName = pResult->GetString(0);
 
-		if(!pBinds->m_aapKeyBindings[Modifier][KeyID])
-			str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, KeyID);
+		if(!pBinds->m_aapKeyBindings[BindSlot.m_ModifierMask][BindSlot.m_Key])
+			str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, BindSlot.m_Key);
 		else
-			str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, KeyID, pBinds->m_aapKeyBindings[Modifier][KeyID]);
+			str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, BindSlot.m_Key, pBinds->m_aapKeyBindings[BindSlot.m_ModifierMask][BindSlot.m_Key]);
 
 		pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
 		return;
 	}
 
-	pBinds->Bind(KeyID, pResult->GetString(1), false, Modifier);
+	pBinds->Bind(BindSlot.m_Key, pResult->GetString(1), false, BindSlot.m_ModifierMask);
 }
 
 void CBinds::ConBinds(IConsole::IResult *pResult, void *pUserData)
@@ -323,35 +354,35 @@ void CBinds::ConBinds(IConsole::IResult *pResult, void *pUserData)
 	{
 		char aBuf[256];
 		const char *pKeyName = pResult->GetString(0);
-
-		int Modifier;
-		int KeyID = pBinds->GetBindSlot(pKeyName, &Modifier);
-		if(!KeyID)
+		const CBindSlot BindSlot = pBinds->GetBindSlot(pKeyName);
+		if(!BindSlot.m_Key)
 		{
 			str_format(aBuf, sizeof(aBuf), "key '%s' not found", pKeyName);
 			pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
 		}
 		else
 		{
-			if(!pBinds->m_aapKeyBindings[Modifier][KeyID])
-				str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, KeyID);
+			if(!pBinds->m_aapKeyBindings[BindSlot.m_ModifierMask][BindSlot.m_Key])
+				str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, BindSlot.m_Key);
 			else
-				str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, KeyID, pBinds->m_aapKeyBindings[Modifier][KeyID]);
+				str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, BindSlot.m_Key, pBinds->m_aapKeyBindings[BindSlot.m_ModifierMask][BindSlot.m_Key]);
 
 			pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
 		}
 	}
-	else if(pResult->NumArguments() == 0)
+	else
 	{
 		char aBuf[1024];
-		for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++)
+		for(int Modifier = MODIFIER_NONE; Modifier < MODIFIER_COMBINATION_COUNT; Modifier++)
 		{
-			for(int j = 0; j < KEY_LAST; j++)
+			char aModifiers[128];
+			GetKeyBindModifiersName(Modifier, aModifiers, sizeof(aModifiers));
+			for(int Key = KEY_FIRST; Key < KEY_LAST; Key++)
 			{
-				if(!pBinds->m_aapKeyBindings[i][j])
+				if(!pBinds->m_aapKeyBindings[Modifier][Key])
 					continue;
 
-				str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", GetKeyBindModifiersName(i), pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]);
+				str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", aModifiers, pBinds->Input()->KeyName(Key), Key, pBinds->m_aapKeyBindings[Modifier][Key]);
 				pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
 			}
 		}
@@ -362,10 +393,9 @@ void CBinds::ConUnbind(IConsole::IResult *pResult, void *pUserData)
 {
 	CBinds *pBinds = (CBinds *)pUserData;
 	const char *pKeyName = pResult->GetString(0);
-	int Modifier;
-	int KeyID = pBinds->GetBindSlot(pKeyName, &Modifier);
+	const CBindSlot BindSlot = pBinds->GetBindSlot(pKeyName);
 
-	if(!KeyID)
+	if(!BindSlot.m_Key)
 	{
 		char aBuf[256];
 		str_format(aBuf, sizeof(aBuf), "key %s not found", pKeyName);
@@ -373,7 +403,7 @@ void CBinds::ConUnbind(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	pBinds->Bind(KeyID, "", false, Modifier);
+	pBinds->Bind(BindSlot.m_Key, "", false, BindSlot.m_ModifierMask);
 }
 
 void CBinds::ConUnbindAll(IConsole::IResult *pResult, void *pUserData)
@@ -382,51 +412,31 @@ void CBinds::ConUnbindAll(IConsole::IResult *pResult, void *pUserData)
 	pBinds->UnbindAll();
 }
 
-int CBinds::GetKeyID(const char *pKeyName)
-{
-	// check for numeric
-	if(pKeyName[0] == '&')
-	{
-		int i = str_toint(pKeyName + 1);
-		if(i > 0 && i < KEY_LAST)
-			return i; // numeric
-	}
-
-	// search for key
-	for(int i = 0; i < KEY_LAST; i++)
-	{
-		if(str_comp_nocase(pKeyName, Input()->KeyName(i)) == 0)
-			return i;
-	}
-
-	return 0;
-}
-
-int CBinds::GetBindSlot(const char *pBindString, int *pModifierCombination)
+CBinds::CBindSlot CBinds::GetBindSlot(const char *pBindString) const
 {
-	*pModifierCombination = MODIFIER_NONE;
+	int ModifierMask = MODIFIER_NONE;
 	char aMod[32];
 	aMod[0] = '\0';
 	const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
 	while(aMod[0] && *(pKey))
 	{
 		if(!str_comp_nocase(aMod, "shift"))
-			*pModifierCombination |= (1 << MODIFIER_SHIFT);
+			ModifierMask |= (1 << MODIFIER_SHIFT);
 		else if(!str_comp_nocase(aMod, "ctrl"))
-			*pModifierCombination |= (1 << MODIFIER_CTRL);
+			ModifierMask |= (1 << MODIFIER_CTRL);
 		else if(!str_comp_nocase(aMod, "alt"))
-			*pModifierCombination |= (1 << MODIFIER_ALT);
+			ModifierMask |= (1 << MODIFIER_ALT);
 		else if(!str_comp_nocase(aMod, "gui"))
-			*pModifierCombination |= (1 << MODIFIER_GUI);
+			ModifierMask |= (1 << MODIFIER_GUI);
 		else
-			return 0;
+			return {KEY_UNKNOWN, MODIFIER_NONE};
 
 		if(str_find(pKey + 1, "+"))
 			pKey = str_next_token(pKey + 1, "+", aMod, sizeof(aMod));
 		else
 			break;
 	}
-	return GetKeyID(*pModifierCombination == MODIFIER_NONE ? aMod : pKey + 1);
+	return {Input()->FindKeyByName(ModifierMask == MODIFIER_NONE ? aMod : pKey + 1), ModifierMask};
 }
 
 const char *CBinds::GetModifierName(int Modifier)
@@ -447,19 +457,17 @@ const char *CBinds::GetModifierName(int Modifier)
 	}
 }
 
-const char *CBinds::GetKeyBindModifiersName(int ModifierCombination)
+void CBinds::GetKeyBindModifiersName(int ModifierCombination, char *pBuf, size_t BufSize)
 {
-	static char aModifier[256];
-	aModifier[0] = '\0';
+	pBuf[0] = '\0';
 	for(int k = 1; k < MODIFIER_COUNT; k++)
 	{
 		if(ModifierCombination & (1 << k))
 		{
-			str_append(aModifier, GetModifierName(k));
-			str_append(aModifier, "+");
+			str_append(pBuf, GetModifierName(k), BufSize);
+			str_append(pBuf, "+", BufSize);
 		}
 	}
-	return aModifier;
 }
 
 void CBinds::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
@@ -467,22 +475,24 @@ void CBinds::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
 	CBinds *pSelf = (CBinds *)pUserData;
 
 	pConfigManager->WriteLine("unbindall");
-	for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++)
+	for(int Modifier = MODIFIER_NONE; Modifier < MODIFIER_COMBINATION_COUNT; Modifier++)
 	{
-		for(int j = 0; j < KEY_LAST; j++)
+		char aModifiers[128];
+		GetKeyBindModifiersName(Modifier, aModifiers, sizeof(aModifiers));
+		for(int Key = KEY_FIRST; Key < KEY_LAST; Key++)
 		{
-			if(!pSelf->m_aapKeyBindings[i][j])
+			if(!pSelf->m_aapKeyBindings[Modifier][Key])
 				continue;
 
 			// worst case the str_escape can double the string length
-			int Size = str_length(pSelf->m_aapKeyBindings[i][j]) * 2 + 30;
+			int Size = str_length(pSelf->m_aapKeyBindings[Modifier][Key]) * 2 + 30;
 			char *pBuffer = (char *)malloc(Size);
 			char *pEnd = pBuffer + Size;
 
-			str_format(pBuffer, Size, "bind %s%s \"", GetKeyBindModifiersName(i), pSelf->Input()->KeyName(j));
+			str_format(pBuffer, Size, "bind %s%s \"", aModifiers, pSelf->Input()->KeyName(Key));
 			// process the string. we need to escape some characters
 			char *pDst = pBuffer + str_length(pBuffer);
-			str_escape(&pDst, pSelf->m_aapKeyBindings[i][j], pEnd);
+			str_escape(&pDst, pSelf->m_aapKeyBindings[Modifier][Key], pEnd);
 			str_append(pBuffer, "\"", Size);
 
 			pConfigManager->WriteLine(pBuffer);
diff --git a/src/game/client/components/binds.h b/src/game/client/components/binds.h
index 5b9ceadb8d..21daf9c988 100644
--- a/src/game/client/components/binds.h
+++ b/src/game/client/components/binds.h
@@ -8,12 +8,12 @@
 
 #include <game/client/component.h>
 
+#include <vector>
+
 class IConfigManager;
 
 class CBinds : public CComponent
 {
-	int GetKeyID(const char *pKeyName);
-
 	static void ConBind(IConsole::IResult *pResult, void *pUserData);
 	static void ConBinds(IConsole::IResult *pResult, void *pUserData);
 	static void ConUnbind(IConsole::IResult *pResult, void *pUserData);
@@ -22,6 +22,20 @@ class CBinds : public CComponent
 
 	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
 
+	class CBindSlot
+	{
+	public:
+		int m_Key;
+		int m_ModifierMask;
+
+		CBindSlot(int Key, int ModifierMask) :
+			m_Key(Key),
+			m_ModifierMask(ModifierMask)
+		{
+		}
+	};
+	CBindSlot GetBindSlot(const char *pBindString) const;
+
 public:
 	CBinds();
 	~CBinds();
@@ -50,17 +64,15 @@ class CBinds : public CComponent
 
 	CBindsSpecial m_SpecialBinds;
 
-	void Bind(int KeyID, const char *pStr, bool FreeOnly = false, int ModifierCombination = MODIFIER_NONE);
+	void Bind(int KeyId, const char *pStr, bool FreeOnly = false, int ModifierCombination = MODIFIER_NONE);
 	void SetDefaults();
-	void StaBinds();
 	void UnbindAll();
-	const char *Get(int KeyID, int ModifierCombination);
+	const char *Get(int KeyId, int ModifierCombination);
 	void GetKey(const char *pBindStr, char *pBuf, size_t BufSize);
-	int GetBindSlot(const char *pBindString, int *pModifierCombination);
 	static int GetModifierMask(IInput *pInput);
 	static int GetModifierMaskOfKey(int Key);
 	static const char *GetModifierName(int Modifier);
-	static const char *GetKeyBindModifiersName(int ModifierCombination);
+	static void GetKeyBindModifiersName(int ModifierCombination, char *pBuf, size_t BufSize);
 
 	virtual void OnConsoleInit() override;
 	virtual bool OnInput(const IInput::CEvent &Event) override;
@@ -71,5 +83,6 @@ class CBinds : public CComponent
 
 private:
 	char *m_aapKeyBindings[MODIFIER_COMBINATION_COUNT][KEY_LAST];
+	std::vector<CBindSlot> m_vActiveBinds;
 };
 #endif
diff --git a/src/game/client/components/broadcast.cpp b/src/game/client/components/broadcast.cpp
index 5683705dae..87a1c0f604 100644
--- a/src/game/client/components/broadcast.cpp
+++ b/src/game/client/components/broadcast.cpp
@@ -74,20 +74,20 @@ void CBroadcast::OnMessage(int MsgType, void *pRawMsg)
 {
 	if(MsgType == NETMSGTYPE_SV_BROADCAST)
 	{
-		OnBroadcastMessage((CNetMsg_Sv_Broadcast *)pRawMsg);
+		const CNetMsg_Sv_Broadcast *pMsg = (CNetMsg_Sv_Broadcast *)pRawMsg;
+		DoBroadcast(pMsg->m_pMessage);
 	}
 }
 
-void CBroadcast::OnBroadcastMessage(const CNetMsg_Sv_Broadcast *pMsg)
+void CBroadcast::DoBroadcast(const char *pText)
 {
-	str_copy(m_aBroadcastText, pMsg->m_pMessage);
+	str_copy(m_aBroadcastText, pText);
 	m_BroadcastTick = Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed() * 10;
 	m_BroadcastRenderOffset = -1.0f;
 	TextRender()->DeleteTextContainer(m_TextContainerIndex);
 
 	if(g_Config.m_ClPrintBroadcasts)
 	{
-		const char *pText = m_aBroadcastText;
 		char aLine[sizeof(m_aBroadcastText)];
 		while((pText = str_next_token(pText, "\n", aLine, sizeof(aLine))))
 		{
diff --git a/src/game/client/components/broadcast.h b/src/game/client/components/broadcast.h
index 056adce91b..11942764dd 100644
--- a/src/game/client/components/broadcast.h
+++ b/src/game/client/components/broadcast.h
@@ -4,6 +4,7 @@
 #define GAME_CLIENT_COMPONENTS_BROADCAST_H
 
 #include <engine/textrender.h>
+#include <game/generated/protocol.h>
 
 #include <game/client/component.h>
 
@@ -24,6 +25,8 @@ class CBroadcast : public CComponent
 	virtual void OnWindowResize() override;
 	virtual void OnRender() override;
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+
+	void DoBroadcast(const char *pText);
 };
 
 #endif
diff --git a/src/game/client/components/camera.cpp b/src/game/client/components/camera.cpp
index 4837be0ba3..307f3c3261 100644
--- a/src/game/client/components/camera.cpp
+++ b/src/game/client/components/camera.cpp
@@ -3,7 +3,9 @@
 
 #include <engine/shared/config.h>
 
+#include <base/log.h>
 #include <base/math.h>
+#include <base/vmath.h>
 #include <game/client/gameclient.h>
 #include <game/collision.h>
 #include <game/mapitems.h>
@@ -19,7 +21,7 @@ CCamera::CCamera()
 	m_ZoomSet = false;
 	m_Zoom = 1.0f;
 	m_Zooming = false;
-	m_ForceFreeviewPos = vec2(-1, -1);
+	m_ForceFreeview = false;
 	m_GotoSwitchOffset = 0;
 	m_GotoTeleOffset = 0;
 	m_GotoSwitchLastPos = ivec2(-1, -1);
@@ -28,6 +30,16 @@ CCamera::CCamera()
 	mem_zero(m_aLastPos, sizeof(m_aLastPos));
 	m_PrevCenter = vec2(0, 0);
 	m_Center = vec2(0, 0);
+
+	m_PrevSpecId = -1;
+	m_WasSpectating = false;
+
+	m_CameraSmoothing = false;
+}
+
+float CCamera::CameraSmoothingProgress(float CurrentTime) const
+{
+	return (CurrentTime - m_CameraSmoothingStart) / (m_CameraSmoothingEnd - m_CameraSmoothingStart);
 }
 
 float CCamera::ZoomProgress(float CurrentTime) const
@@ -99,7 +111,34 @@ void CCamera::OnRender()
 		m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel());
 	}
 
-	if(!(m_pClient->m_Snap.m_SpecInfo.m_Active || GameClient()->m_GameInfo.m_AllowZoom || Client()->State() == IClient::STATE_DEMOPLAYBACK))
+	if(m_CameraSmoothing)
+	{
+		if(!m_pClient->m_Snap.m_SpecInfo.m_Active)
+		{
+			m_Center = m_CameraSmoothingTarget;
+			m_CameraSmoothing = false;
+		}
+		else
+		{
+			float Time = Client()->LocalTime();
+			if(Time >= m_CameraSmoothingEnd)
+			{
+				m_Center = m_CameraSmoothingTarget;
+				m_CameraSmoothing = false;
+			}
+			else
+			{
+				m_CameraSmoothingCenter = vec2(m_CameraSmoothingBezierX.Evaluate(CameraSmoothingProgress(Time)), m_CameraSmoothingBezierY.Evaluate(CameraSmoothingProgress(Time)));
+				if(distance(m_CameraSmoothingCenter, m_CameraSmoothingTarget) <= 0.1f)
+				{
+					m_Center = m_CameraSmoothingTarget;
+					m_CameraSmoothing = false;
+				}
+			}
+		}
+	}
+
+	if(!ZoomAllowed())
 	{
 		m_ZoomSet = false;
 		m_Zoom = 1.0f;
@@ -177,12 +216,61 @@ void CCamera::OnRender()
 			m_Center = m_pClient->m_LocalCharacterPos + s_aCurrentCameraOffset[g_Config.m_ClDummy];
 	}
 
-	if(m_ForceFreeviewPos != vec2(-1, -1) && m_CamType == CAMTYPE_SPEC)
+	if(m_ForceFreeview && m_CamType == CAMTYPE_SPEC)
 	{
 		m_Center = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] = m_ForceFreeviewPos;
-		m_ForceFreeviewPos = vec2(-1, -1);
+		m_ForceFreeview = false;
+	}
+	else
+		m_ForceFreeviewPos = m_Center;
+
+	const int SpecId = m_pClient->m_Snap.m_SpecInfo.m_SpectatorId;
+
+	// start smoothing from the current position when the target changes
+	if(m_CameraSmoothing && SpecId != m_PrevSpecId)
+		m_CameraSmoothing = false;
+
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active &&
+		(SpecId != m_PrevSpecId ||
+			(m_CameraSmoothing && m_CameraSmoothingTarget != m_Center)) && // the target is moving during camera smoothing
+		!(!m_WasSpectating && m_Center != m_PrevCenter) && // dont smooth when starting to spectate
+		m_CamType != CAMTYPE_SPEC &&
+		!GameClient()->m_MultiViewActivated)
+	{
+		float Now = Client()->LocalTime();
+		if(!m_CameraSmoothing)
+			m_CenterBeforeSmoothing = m_PrevCenter;
+
+		vec2 Derivative = {0.f, 0.f};
+		if(m_CameraSmoothing)
+		{
+			float Progress = CameraSmoothingProgress(Now);
+			Derivative.x = m_CameraSmoothingBezierX.Derivative(Progress);
+			Derivative.y = m_CameraSmoothingBezierY.Derivative(Progress);
+		}
+
+		m_CameraSmoothingTarget = m_Center;
+		m_CameraSmoothingBezierX = CCubicBezier::With(m_CenterBeforeSmoothing.x, Derivative.x, 0, m_CameraSmoothingTarget.x);
+		m_CameraSmoothingBezierY = CCubicBezier::With(m_CenterBeforeSmoothing.y, Derivative.y, 0, m_CameraSmoothingTarget.y);
+
+		if(!m_CameraSmoothing)
+		{
+			m_CameraSmoothingStart = Now;
+			m_CameraSmoothingEnd = Now + (float)g_Config.m_ClSmoothSpectatingTime / 1000.0f;
+		}
+
+		if(!m_CameraSmoothing)
+			m_CameraSmoothingCenter = m_PrevCenter;
+
+		m_CameraSmoothing = true;
 	}
+
+	if(m_CameraSmoothing)
+		m_Center = m_CameraSmoothingCenter;
+
 	m_PrevCenter = m_Center;
+	m_PrevSpecId = SpecId;
+	m_WasSpectating = m_pClient->m_Snap.m_SpecInfo.m_Active;
 }
 
 void CCamera::OnConsoleInit()
@@ -191,12 +279,15 @@ void CCamera::OnConsoleInit()
 	Console()->Register("zoom-", "", CFGFLAG_CLIENT, ConZoomMinus, this, "Zoom decrease");
 	Console()->Register("zoom", "?i", CFGFLAG_CLIENT, ConZoom, this, "Change zoom");
 	Console()->Register("set_view", "i[x]i[y]", CFGFLAG_CLIENT, ConSetView, this, "Set camera position to x and y in the map");
+	Console()->Register("set_view_relative", "i[x]i[y]", CFGFLAG_CLIENT, ConSetViewRelative, this, "Set camera position relative to current view in the map");
 	Console()->Register("goto_switch", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoSwitch, this, "View switch found (at offset) with given number");
 	Console()->Register("goto_tele", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoTele, this, "View tele found (at offset) with given number");
 }
 
 void CCamera::OnReset()
 {
+	m_CameraSmoothing = false;
+
 	m_Zoom = std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10);
 	m_Zooming = false;
 }
@@ -204,28 +295,31 @@ void CCamera::OnReset()
 void CCamera::ConZoomPlus(IConsole::IResult *pResult, void *pUserData)
 {
 	CCamera *pSelf = (CCamera *)pUserData;
-	if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || pSelf->GameClient()->m_GameInfo.m_AllowZoom || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
-	{
-		pSelf->ScaleZoom(CCamera::ZOOM_STEP);
+	if(!pSelf->ZoomAllowed())
+		return;
 
-		if(pSelf->GameClient()->m_MultiViewActivated)
-			pSelf->GameClient()->m_MultiViewPersonalZoom++;
-	}
+	pSelf->ScaleZoom(CCamera::ZOOM_STEP);
+
+	if(pSelf->GameClient()->m_MultiViewActivated)
+		pSelf->GameClient()->m_MultiViewPersonalZoom++;
 }
 void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData)
 {
 	CCamera *pSelf = (CCamera *)pUserData;
-	if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || pSelf->GameClient()->m_GameInfo.m_AllowZoom || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
-	{
-		pSelf->ScaleZoom(1 / CCamera::ZOOM_STEP);
+	if(!pSelf->ZoomAllowed())
+		return;
 
-		if(pSelf->GameClient()->m_MultiViewActivated)
-			pSelf->GameClient()->m_MultiViewPersonalZoom--;
-	}
+	pSelf->ScaleZoom(1 / CCamera::ZOOM_STEP);
+
+	if(pSelf->GameClient()->m_MultiViewActivated)
+		pSelf->GameClient()->m_MultiViewPersonalZoom--;
 }
 void CCamera::ConZoom(IConsole::IResult *pResult, void *pUserData)
 {
 	CCamera *pSelf = (CCamera *)pUserData;
+	if(!pSelf->ZoomAllowed())
+		return;
+
 	float TargetLevel = pResult->NumArguments() ? pResult->GetFloat(0) : g_Config.m_ClDefaultZoom;
 	pSelf->ChangeZoom(std::pow(CCamera::ZOOM_STEP, TargetLevel - 10), pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active && pSelf->GameClient()->m_MultiViewActivated ? g_Config.m_ClMultiViewZoomSmoothness : g_Config.m_ClSmoothZoomTime);
 
@@ -238,6 +332,12 @@ void CCamera::ConSetView(IConsole::IResult *pResult, void *pUserData)
 	// wait until free view camera type to update the position
 	pSelf->SetView(ivec2(pResult->GetInteger(0), pResult->GetInteger(1)));
 }
+void CCamera::ConSetViewRelative(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	// wait until free view camera type to update the position
+	pSelf->SetView(ivec2(pResult->GetInteger(0), pResult->GetInteger(1)), true);
+}
 void CCamera::ConGotoSwitch(IConsole::IResult *pResult, void *pUserData)
 {
 	CCamera *pSelf = (CCamera *)pUserData;
@@ -249,11 +349,16 @@ void CCamera::ConGotoTele(IConsole::IResult *pResult, void *pUserData)
 	pSelf->GotoTele(pResult->GetInteger(0), pResult->NumArguments() > 1 ? pResult->GetInteger(1) : -1);
 }
 
-void CCamera::SetView(ivec2 Pos)
+void CCamera::SetView(ivec2 Pos, bool Relative)
 {
+	vec2 RealPos = vec2(Pos.x * 32.0, Pos.y * 32.0);
+	vec2 UntestedViewPos = Relative ? m_ForceFreeviewPos + RealPos : RealPos;
+
+	m_ForceFreeview = true;
+
 	m_ForceFreeviewPos = vec2(
-		clamp(Pos.x * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f),
-		clamp(Pos.y * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f));
+		clamp(UntestedViewPos.x, 200.0f, Collision()->GetWidth() * 32 - 200.0f),
+		clamp(UntestedViewPos.y, 200.0f, Collision()->GetWidth() * 32 - 200.0f));
 }
 
 void CCamera::GotoSwitch(int Number, int Offset)
@@ -304,57 +409,66 @@ void CCamera::GotoTele(int Number, int Offset)
 {
 	if(Collision()->TeleLayer() == nullptr)
 		return;
+	Number--;
+
+	if(m_GotoTeleLastNumber != Number)
+		m_GotoTeleLastPos = ivec2(-1, -1);
 
-	int Match = -1;
 	ivec2 MatchPos = ivec2(-1, -1);
+	const size_t NumTeles = Collision()->TeleAllSize(Number);
+	if(!NumTeles)
+	{
+		log_error("camera", "No teleporter with number %d found.", Number + 1);
+		return;
+	}
 
-	auto FindTile = [this, &Match, &MatchPos, &Number, &Offset]() {
-		for(int x = 0; x < Collision()->GetWidth(); x++)
+	if(Offset != -1 || m_GotoTeleLastPos == ivec2(-1, -1))
+	{
+		if((size_t)Offset >= NumTeles || Offset < 0)
+			Offset = 0;
+		vec2 Tele = Collision()->TeleAllGet(Number, Offset);
+		MatchPos = ivec2(Tele.x / 32, Tele.y / 32);
+		m_GotoTeleOffset = Offset;
+	}
+	else
+	{
+		bool FullRound = false;
+		do
 		{
-			for(int y = 0; y < Collision()->GetHeight(); y++)
+			vec2 Tele = Collision()->TeleAllGet(Number, m_GotoTeleOffset);
+			MatchPos = ivec2(Tele.x / 32, Tele.y / 32);
+			m_GotoTeleOffset++;
+			if((size_t)m_GotoTeleOffset >= NumTeles)
 			{
-				int i = y * Collision()->GetWidth() + x;
-				int Tele = Collision()->TeleLayer()[i].m_Number;
-				if(Number == Tele)
+				m_GotoTeleOffset = 0;
+				if(FullRound)
 				{
-					Match++;
-					if(Offset != -1)
-					{
-						if(Match == Offset)
-						{
-							MatchPos = ivec2(x, y);
-							m_GotoTeleOffset = Match;
-							return;
-						}
-						continue;
-					}
-					MatchPos = ivec2(x, y);
-					if(m_GotoTeleLastPos != ivec2(-1, -1))
-					{
-						if(distance(m_GotoTeleLastPos, MatchPos) < 10.0f)
-						{
-							m_GotoTeleOffset++;
-							continue;
-						}
-					}
-					m_GotoTeleLastPos = MatchPos;
-					if(Match == m_GotoTeleOffset)
-						return;
+					MatchPos = m_GotoTeleLastPos;
+					break;
+				}
+				else
+				{
+					FullRound = true;
 				}
 			}
-		}
-	};
-	FindTile();
+		} while(distance(m_GotoTeleLastPos, MatchPos) < 10.0f);
+	}
 
 	if(MatchPos == ivec2(-1, -1))
 		return;
-	if(Match < m_GotoTeleOffset)
-		m_GotoTeleOffset = -1;
+	m_GotoTeleLastPos = MatchPos;
+	m_GotoTeleLastNumber = Number;
 	SetView(MatchPos);
-	m_GotoTeleOffset++;
 }
 
 void CCamera::SetZoom(float Target, int Smoothness)
 {
 	ChangeZoom(Target, Smoothness);
 }
+
+bool CCamera::ZoomAllowed() const
+{
+	return GameClient()->m_Snap.m_SpecInfo.m_Active ||
+	       GameClient()->m_GameInfo.m_AllowZoom ||
+	       Client()->State() == IClient::STATE_DEMOPLAYBACK;
+}
diff --git a/src/game/client/components/camera.h b/src/game/client/components/camera.h
index ae8798d863..72b42230f9 100644
--- a/src/game/client/components/camera.h
+++ b/src/game/client/components/camera.h
@@ -25,6 +25,20 @@ class CCamera : public CComponent
 	vec2 m_aLastPos[NUM_DUMMIES];
 	vec2 m_PrevCenter;
 
+	int m_PrevSpecId;
+	bool m_WasSpectating;
+
+	bool m_CameraSmoothing;
+	vec2 m_CameraSmoothingCenter;
+	vec2 m_CameraSmoothingTarget;
+	CCubicBezier m_CameraSmoothingBezierX;
+	CCubicBezier m_CameraSmoothingBezierY;
+	float m_CameraSmoothingStart;
+	float m_CameraSmoothingEnd;
+	vec2 m_CenterBeforeSmoothing;
+
+	float CameraSmoothingProgress(float CurrentTime) const;
+
 	CCubicBezier m_ZoomSmoothing;
 	float m_ZoomSmoothingStart;
 	float m_ZoomSmoothingEnd;
@@ -54,24 +68,29 @@ class CCamera : public CComponent
 	virtual void OnConsoleInit() override;
 	virtual void OnReset() override;
 
-	void SetZoom(float Target, int Smoothness);
-	void SetView(ivec2 Pos);
+	void SetView(ivec2 Pos, bool Relative = false);
 	void GotoSwitch(int Number, int Offset = -1);
 	void GotoTele(int Number, int Offset = -1);
 
+	void SetZoom(float Target, int Smoothness);
+	bool ZoomAllowed() const;
+
 private:
 	static void ConZoomPlus(IConsole::IResult *pResult, void *pUserData);
 	static void ConZoomMinus(IConsole::IResult *pResult, void *pUserData);
 	static void ConZoom(IConsole::IResult *pResult, void *pUserData);
 	static void ConSetView(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetViewRelative(IConsole::IResult *pResult, void *pUserData);
 	static void ConGotoSwitch(IConsole::IResult *pResult, void *pUserData);
 	static void ConGotoTele(IConsole::IResult *pResult, void *pUserData);
 
+	bool m_ForceFreeview;
 	vec2 m_ForceFreeviewPos;
 	int m_GotoSwitchOffset;
 	int m_GotoTeleOffset;
 	ivec2 m_GotoSwitchLastPos;
 	ivec2 m_GotoTeleLastPos;
+	int m_GotoTeleLastNumber = -1;
 };
 
 #endif
diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index 3d9ea8a105..8779787264 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -9,6 +9,7 @@
 #include <engine/textrender.h>
 
 #include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
 
 #include <game/client/animstate.h>
 #include <game/client/components/scoreboard.h>
@@ -30,14 +31,9 @@ CChat::CChat()
 		Line.m_QuadContainerIndex = -1;
 	}
 
-#define CHAT_COMMAND(name, params, flags, callback, userdata, help) m_vDefaultCommands.emplace_back(name, params, help);
-#include <game/ddracechat.h>
-#undef CHAT_COMMAND
-
-	std::sort(m_vDefaultCommands.begin(), m_vDefaultCommands.end());
 	m_Mode = MODE_NONE;
 
-	m_Input.SetClipboardLineCallback([this](const char *pStr) { SayChat(pStr); });
+	m_Input.SetClipboardLineCallback([this](const char *pStr) { SendChatQueued(pStr); });
 	m_Input.SetCalculateOffsetCallback([this]() { return m_IsInputCensored; });
 	m_Input.SetDisplayTextCallback([this](char *pStr, size_t NumChars) {
 		m_IsInputCensored = false;
@@ -136,6 +132,7 @@ void CChat::Reset()
 	m_CommandsNeedSorting = false;
 	mem_zero(m_aCurrentInputText, sizeof(m_aCurrentInputText));
 	DisableMode();
+	m_vCommands.clear();
 
 	for(int64_t &LastSoundPlayed : m_aLastSoundPlayed)
 		LastSoundPlayed = 0;
@@ -154,12 +151,12 @@ void CChat::OnStateChange(int NewState, int OldState)
 
 void CChat::ConSay(IConsole::IResult *pResult, void *pUserData)
 {
-	((CChat *)pUserData)->Say(0, pResult->GetString(0));
+	((CChat *)pUserData)->SendChat(0, pResult->GetString(0));
 }
 
 void CChat::ConSayTeam(IConsole::IResult *pResult, void *pUserData)
 {
-	((CChat *)pUserData)->Say(1, pResult->GetString(0));
+	((CChat *)pUserData)->SendChat(1, pResult->GetString(0));
 }
 
 void CChat::ConChat(IConsole::IResult *pResult, void *pUserData)
@@ -230,11 +227,6 @@ void CChat::OnInit()
 	Console()->Chain("cl_chat_width", ConchainChatWidth, this);
 }
 
-void CChat::OnMapLoad()
-{
-	m_vCommands = m_vDefaultCommands;
-}
-
 bool CChat::OnInput(const IInput::CEvent &Event)
 {
 	if(m_Mode == MODE_NONE)
@@ -258,28 +250,7 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 			m_CommandsNeedSorting = false;
 		}
 
-		if(m_Input.GetString()[0])
-		{
-			bool AddEntry = false;
-
-			if(m_LastChatSend + time_freq() < time())
-			{
-				Say(m_Mode == MODE_ALL ? 0 : 1, m_Input.GetString());
-				AddEntry = true;
-			}
-			else if(m_PendingChatCounter < 3)
-			{
-				++m_PendingChatCounter;
-				AddEntry = true;
-			}
-
-			if(AddEntry)
-			{
-				CHistoryEntry *pEntry = m_History.Allocate(sizeof(CHistoryEntry) + m_Input.GetLength());
-				pEntry->m_Team = m_Mode == MODE_ALL ? 0 : 1;
-				mem_copy(pEntry->m_aText, m_Input.GetString(), m_Input.GetLength() + 1);
-			}
-		}
+		SendChatQueued(m_Input.GetString());
 		m_pHistoryEntry = nullptr;
 		DisableMode();
 		m_pClient->OnRelease();
@@ -312,11 +283,11 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 			{
 				if(PlayerInfo)
 				{
-					PlayerName = m_pClient->m_aClients[PlayerInfo->m_ClientID].m_aName;
+					PlayerName = m_pClient->m_aClients[PlayerInfo->m_ClientId].m_aName;
 					FoundInput = str_utf8_find_nocase(PlayerName, m_aCompletionBuffer);
 					if(FoundInput != 0)
 					{
-						m_aPlayerCompletionList[m_PlayerCompletionListLength].ClientID = PlayerInfo->m_ClientID;
+						m_aPlayerCompletionList[m_PlayerCompletionListLength].ClientId = PlayerInfo->m_ClientId;
 						// The score for suggesting a player name is determined by the distance of the search input to the beginning of the player name
 						m_aPlayerCompletionList[m_PlayerCompletionListLength].Score = (int)(FoundInput - PlayerName);
 						m_PlayerCompletionListLength++;
@@ -362,7 +333,7 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 
 				auto &Command = m_vCommands[Index];
 
-				if(str_startswith(Command.m_aName, pCommandStart))
+				if(str_startswith_nocase(Command.m_aName, pCommandStart))
 				{
 					pCompletionCommand = &Command;
 					m_CompletionChosen = Index + SearchType * NumCommands;
@@ -384,8 +355,6 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 				// add separator
 				const char *pSeparator = pCompletionCommand->m_aParams[0] == '\0' ? "" : " ";
 				str_append(aBuf, pSeparator);
-				if(*pSeparator)
-					str_append(aBuf, pSeparator);
 
 				// add part after the name
 				str_append(aBuf, m_Input.GetString() + m_PlaceholderOffset + m_PlaceholderLength);
@@ -420,7 +389,7 @@ bool CChat::OnInput(const IInput::CEvent &Event)
 					m_CompletionChosen %= m_PlayerCompletionListLength;
 					m_CompletionUsed = true;
 
-					pCompletionClientData = &m_pClient->m_aClients[m_aPlayerCompletionList[m_CompletionChosen].ClientID];
+					pCompletionClientData = &m_pClient->m_aClients[m_aPlayerCompletionList[m_CompletionChosen].ClientId];
 					if(!pCompletionClientData->m_Active)
 					{
 						continue;
@@ -560,7 +529,7 @@ void CChat::OnMessage(int MsgType, void *pRawMsg)
 	if(MsgType == NETMSGTYPE_SV_CHAT)
 	{
 		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
-		AddLine(pMsg->m_ClientID, pMsg->m_Team, pMsg->m_pMessage);
+		AddLine(pMsg->m_ClientId, pMsg->m_Team, pMsg->m_pMessage);
 	}
 	else if(MsgType == NETMSGTYPE_SV_COMMANDINFO)
 	{
@@ -581,14 +550,16 @@ void CChat::OnMessage(int MsgType, void *pRawMsg)
 
 bool CChat::LineShouldHighlight(const char *pLine, const char *pName)
 {
-	const char *pHL = str_utf8_find_nocase(pLine, pName);
+	const char *pHit = str_utf8_find_nocase(pLine, pName);
 
-	if(pHL)
+	while(pHit)
 	{
 		int Length = str_length(pName);
 
-		if(Length > 0 && (pLine == pHL || pHL[-1] == ' ') && (pHL[Length] == 0 || pHL[Length] == ' ' || pHL[Length] == '.' || pHL[Length] == '!' || pHL[Length] == ',' || pHL[Length] == '?' || pHL[Length] == ':'))
+		if(Length > 0 && (pLine == pHit || pHit[-1] == ' ') && (pHit[Length] == 0 || pHit[Length] == ' ' || pHit[Length] == '.' || pHit[Length] == '!' || pHit[Length] == ',' || pHit[Length] == '?' || pHit[Length] == ':'))
 			return true;
+
+		pHit = str_utf8_find_nocase(pHit + 1, pName);
 	}
 
 	return false;
@@ -634,6 +605,7 @@ void CChat::StoreSave(const char *pText)
 	}
 	*/
 
+	const bool SavesFileExists = Storage()->FileExists(SAVES_FILE, IStorage::TYPE_SAVE);
 	IOHANDLE File = Storage()->OpenFile(SAVES_FILE, IOFLAG_APPEND, IStorage::TYPE_SAVE);
 	if(!File)
 		return;
@@ -645,7 +617,7 @@ void CChat::StoreSave(const char *pText)
 		aSaveCode,
 	};
 
-	if(io_tell(File) == 0)
+	if(!SavesFileExists)
 	{
 		CsvWrite(File, 4, SAVES_HEADER);
 	}
@@ -653,14 +625,15 @@ void CChat::StoreSave(const char *pText)
 	io_close(File);
 }
 
-void CChat::AddLine(int ClientID, int Team, const char *pLine)
+void CChat::AddLine(int ClientId, int Team, const char *pLine)
 {
 	if(*pLine == 0 ||
-		(ClientID == SERVER_MSG && !g_Config.m_ClShowChatSystem) ||
-		(ClientID >= 0 && (m_pClient->m_aClients[ClientID].m_aName[0] == '\0' || // unknown client
-					  m_pClient->m_aClients[ClientID].m_ChatIgnore ||
-					  (m_pClient->m_Snap.m_LocalClientID != ClientID && g_Config.m_ClShowChatFriends && !m_pClient->m_aClients[ClientID].m_Friend) ||
-					  (m_pClient->m_Snap.m_LocalClientID != ClientID && m_pClient->m_aClients[ClientID].m_Foe))))
+		(ClientId == SERVER_MSG && !g_Config.m_ClShowChatSystem) ||
+		(ClientId >= 0 && (m_pClient->m_aClients[ClientId].m_aName[0] == '\0' || // unknown client
+					  m_pClient->m_aClients[ClientId].m_ChatIgnore ||
+					  (m_pClient->m_Snap.m_LocalClientId != ClientId && g_Config.m_ClShowChatFriends && !m_pClient->m_aClients[ClientId].m_Friend) ||
+					  (m_pClient->m_Snap.m_LocalClientId != ClientId && g_Config.m_ClShowChatTeamMembersOnly && m_pClient->IsOtherTeam(ClientId) && m_pClient->m_Teams.Team(m_pClient->m_Snap.m_LocalClientId) != TEAM_FLOCK) ||
+					  (m_pClient->m_Snap.m_LocalClientId != ClientId && m_pClient->m_aClients[ClientId].m_Foe))))
 		return;
 
 	// trim right and set maximum length to 256 utf8-characters
@@ -689,22 +662,20 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 	if(pEnd != 0)
 		*(const_cast<char *>(pEnd)) = 0;
 
-	bool Highlighted = false;
-	char *p = const_cast<char *>(pLine);
-
-	// Only empty string left
-	if(*p == 0)
+	if(*pLine == 0)
 		return;
 
+	bool Highlighted = false;
+
 	auto &&FChatMsgCheckAndPrint = [this](CLine *pLine_) {
-		if(pLine_->m_ClientID < 0) // server or client message
+		if(pLine_->m_ClientId < 0) // server or client message
 		{
 			if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
 				StoreSave(pLine_->m_aText);
 		}
 
 		char aBuf[1024];
-		str_format(aBuf, sizeof(aBuf), "%s%s%s", pLine_->m_aName, pLine_->m_ClientID >= 0 ? ": " : "", pLine_->m_aText);
+		str_format(aBuf, sizeof(aBuf), "%s%s%s", pLine_->m_aName, pLine_->m_ClientId >= 0 ? ": " : "", pLine_->m_aText);
 
 		ColorRGBA ChatLogColor{1, 1, 1, 1};
 		if(pLine_->m_Highlighted)
@@ -717,9 +688,9 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
 			else if(pLine_->m_Team)
 				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
-			else if(pLine_->m_ClientID == SERVER_MSG)
+			else if(pLine_->m_ClientId == SERVER_MSG)
 				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
-			else if(pLine_->m_ClientID == CLIENT_MSG)
+			else if(pLine_->m_ClientId == CLIENT_MSG)
 				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
 			else // regular message
 				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
@@ -728,159 +699,135 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, pLine_->m_Whisper ? "whisper" : (pLine_->m_Team ? "teamchat" : "chat"), aBuf, ChatLogColor);
 	};
 
-	while(*p)
-	{
-		Highlighted = false;
-		pLine = p;
-		// find line separator and strip multiline
-		while(*p)
-		{
-			if(*p++ == '\n')
-			{
-				*(p - 1) = 0;
-				break;
-			}
-		}
+	CLine *pCurrentLine = &m_aLines[m_CurrentLine];
 
-		CLine *pCurrentLine = &m_aLines[m_CurrentLine];
+	// Team Number:
+	// 0 = global; 1 = team; 2 = sending whisper; 3 = receiving whisper
 
-		// Team Number:
-		// 0 = global; 1 = team; 2 = sending whisper; 3 = receiving whisper
+	// If it's a client message, m_aText will have ": " prepended so we have to work around it.
+	if(pCurrentLine->m_TeamNumber == Team && pCurrentLine->m_ClientId == ClientId && str_comp(pCurrentLine->m_aText, pLine) == 0)
+	{
+		pCurrentLine->m_TimesRepeated++;
+		TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
+		pCurrentLine->m_Time = time();
+		pCurrentLine->m_aYOffset[0] = -1.f;
+		pCurrentLine->m_aYOffset[1] = -1.f;
 
-		// If it's a client message, m_aText will have ": " prepended so we have to work around it.
-		if(pCurrentLine->m_TeamNumber == Team && pCurrentLine->m_ClientID == ClientID && str_comp(pCurrentLine->m_aText, pLine) == 0)
+		FChatMsgCheckAndPrint(pCurrentLine);
+		return;
+	}
+
+	m_CurrentLine = (m_CurrentLine + 1) % MAX_LINES;
+
+	pCurrentLine = &m_aLines[m_CurrentLine];
+	pCurrentLine->m_TimesRepeated = 0;
+	pCurrentLine->m_Time = time();
+	pCurrentLine->m_aYOffset[0] = -1.0f;
+	pCurrentLine->m_aYOffset[1] = -1.0f;
+	pCurrentLine->m_ClientId = ClientId;
+	pCurrentLine->m_TeamNumber = Team;
+	pCurrentLine->m_Team = Team == 1;
+	pCurrentLine->m_Whisper = Team >= 2;
+	pCurrentLine->m_NameColor = -2;
+	pCurrentLine->m_Friend = false;
+	pCurrentLine->m_HasRenderTee = false;
+
+	TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
+	Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
+
+	// check for highlighted name
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		if(ClientId >= 0 && ClientId != m_pClient->m_aLocalIds[0] && (!m_pClient->Client()->DummyConnected() || ClientId != m_pClient->m_aLocalIds[1]))
 		{
-			pCurrentLine->m_TimesRepeated++;
-			TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
-			Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
-			pCurrentLine->m_Time = time();
-			pCurrentLine->m_aYOffset[0] = -1.f;
-			pCurrentLine->m_aYOffset[1] = -1.f;
-
-			FChatMsgCheckAndPrint(pCurrentLine);
-			return;
+			// main character
+			Highlighted |= LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIds[0]].m_aName);
+			// dummy
+			Highlighted |= m_pClient->Client()->DummyConnected() && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIds[1]].m_aName);
 		}
+	}
+	else
+	{
+		// on demo playback use local id from snap directly,
+		// since m_aLocalIds isn't valid there
+		Highlighted |= m_pClient->m_Snap.m_LocalClientId >= 0 && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId].m_aName);
+	}
 
-		m_CurrentLine = (m_CurrentLine + 1) % MAX_LINES;
+	pCurrentLine->m_Highlighted = Highlighted;
 
-		pCurrentLine = &m_aLines[m_CurrentLine];
-		pCurrentLine->m_TimesRepeated = 0;
-		pCurrentLine->m_Time = time();
-		pCurrentLine->m_aYOffset[0] = -1.0f;
-		pCurrentLine->m_aYOffset[1] = -1.0f;
-		pCurrentLine->m_ClientID = ClientID;
-		pCurrentLine->m_TeamNumber = Team;
-		pCurrentLine->m_Team = Team == 1;
-		pCurrentLine->m_Whisper = Team >= 2;
-		pCurrentLine->m_NameColor = -2;
+	if(pCurrentLine->m_ClientId == SERVER_MSG)
+	{
+		str_copy(pCurrentLine->m_aName, "*** ");
+		str_copy(pCurrentLine->m_aText, pLine);
+	}
+	else if(pCurrentLine->m_ClientId == CLIENT_MSG)
+	{
+		str_copy(pCurrentLine->m_aName, "— ");
+		str_copy(pCurrentLine->m_aText, pLine);
+	}
+	else
+	{
+		auto &LineAuthor = m_pClient->m_aClients[pCurrentLine->m_ClientId];
 
-		TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
-		Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
+		if(LineAuthor.m_Team == TEAM_SPECTATORS)
+			pCurrentLine->m_NameColor = TEAM_SPECTATORS;
 
-		// check for highlighted name
-		if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
 		{
-			if(ClientID >= 0 && ClientID != m_pClient->m_aLocalIDs[0] && (!m_pClient->Client()->DummyConnected() || ClientID != m_pClient->m_aLocalIDs[1]))
-			{
-				// main character
-				Highlighted |= LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIDs[0]].m_aName);
-				// dummy
-				Highlighted |= m_pClient->Client()->DummyConnected() && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIDs[1]].m_aName);
-			}
-		}
-		else
-		{
-			// on demo playback use local id from snap directly,
-			// since m_aLocalIDs isn't valid there
-			Highlighted |= m_pClient->m_Snap.m_LocalClientID >= 0 && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName);
+			if(LineAuthor.m_Team == TEAM_RED)
+				pCurrentLine->m_NameColor = TEAM_RED;
+			else if(LineAuthor.m_Team == TEAM_BLUE)
+				pCurrentLine->m_NameColor = TEAM_BLUE;
 		}
 
-		pCurrentLine->m_Highlighted = Highlighted;
-
-		if(pCurrentLine->m_ClientID == SERVER_MSG)
+		if(Team == TEAM_WHISPER_SEND)
 		{
-			str_copy(pCurrentLine->m_aName, "*** ");
-			str_copy(pCurrentLine->m_aText, pLine);
+			str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "→ %s", LineAuthor.m_aName);
+			pCurrentLine->m_NameColor = TEAM_BLUE;
+			pCurrentLine->m_Highlighted = false;
+			Highlighted = false;
 		}
-		else if(pCurrentLine->m_ClientID == CLIENT_MSG)
+		else if(Team == TEAM_WHISPER_RECV)
 		{
-			str_copy(pCurrentLine->m_aName, "— ");
-			str_copy(pCurrentLine->m_aText, pLine);
+			str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "← %s", LineAuthor.m_aName);
+			pCurrentLine->m_NameColor = TEAM_RED;
+			pCurrentLine->m_Highlighted = true;
+			Highlighted = true;
 		}
 		else
-		{
-			if(m_pClient->m_aClients[ClientID].m_Team == TEAM_SPECTATORS)
-				pCurrentLine->m_NameColor = TEAM_SPECTATORS;
+			str_copy(pCurrentLine->m_aName, LineAuthor.m_aName);
 
-			if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
-			{
-				if(m_pClient->m_aClients[ClientID].m_Team == TEAM_RED)
-					pCurrentLine->m_NameColor = TEAM_RED;
-				else if(m_pClient->m_aClients[ClientID].m_Team == TEAM_BLUE)
-					pCurrentLine->m_NameColor = TEAM_BLUE;
-			}
+		str_copy(pCurrentLine->m_aText, pLine);
+		pCurrentLine->m_Friend = LineAuthor.m_Friend;
 
-			if(Team == 2) // whisper send
-			{
-				str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "→ %s", m_pClient->m_aClients[ClientID].m_aName);
-				pCurrentLine->m_NameColor = TEAM_BLUE;
-				pCurrentLine->m_Highlighted = false;
-				Highlighted = false;
-			}
-			else if(Team == 3) // whisper recv
-			{
-				str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "← %s", m_pClient->m_aClients[ClientID].m_aName);
-				pCurrentLine->m_NameColor = TEAM_RED;
-				pCurrentLine->m_Highlighted = true;
-				Highlighted = true;
-			}
-			else
-				str_copy(pCurrentLine->m_aName, m_pClient->m_aClients[ClientID].m_aName);
-
-			str_copy(pCurrentLine->m_aText, pLine);
-			pCurrentLine->m_Friend = m_pClient->m_aClients[ClientID].m_Friend;
-		}
-
-		pCurrentLine->m_HasRenderTee = false;
-
-		pCurrentLine->m_Friend = ClientID >= 0 ? m_pClient->m_aClients[ClientID].m_Friend : false;
-
-		if(pCurrentLine->m_ClientID >= 0 && pCurrentLine->m_aName[0] != '\0')
+		if(pCurrentLine->m_aName[0] != '\0')
 		{
 			if(!g_Config.m_ClChatOld)
 			{
-				pCurrentLine->m_CustomColoredSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_CustomColoredSkin;
-				if(pCurrentLine->m_CustomColoredSkin)
-					pCurrentLine->m_RenderSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorableRenderSkin;
-				else
-					pCurrentLine->m_RenderSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_OriginalRenderSkin;
-
-				str_copy(pCurrentLine->m_aSkinName, m_pClient->m_aClients[pCurrentLine->m_ClientID].m_aSkinName);
-				pCurrentLine->m_ColorBody = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorBody;
-				pCurrentLine->m_ColorFeet = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorFeet;
-
-				pCurrentLine->m_RenderSkinMetrics = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_SkinMetrics;
+				str_copy(pCurrentLine->m_aSkinName, LineAuthor.m_aSkinName);
+				pCurrentLine->m_TeeRenderInfo = LineAuthor.m_RenderInfo;
 				pCurrentLine->m_HasRenderTee = true;
 			}
 		}
-
-		FChatMsgCheckAndPrint(pCurrentLine);
 	}
 
+	FChatMsgCheckAndPrint(pCurrentLine);
+
 	// play sound
 	int64_t Now = time();
-	if(ClientID == SERVER_MSG)
+	if(ClientId == SERVER_MSG)
 	{
 		if(Now - m_aLastSoundPlayed[CHAT_SERVER] >= time_freq() * 3 / 10)
 		{
 			if(g_Config.m_SndServerMessage)
 			{
-				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_SERVER, 0);
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_SERVER, 1.0f);
 				m_aLastSoundPlayed[CHAT_SERVER] = Now;
 			}
 		}
 	}
-	else if(ClientID == CLIENT_MSG)
+	else if(ClientId == CLIENT_MSG)
 	{
 		// No sound yet
 	}
@@ -893,7 +840,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 			Client()->Notify("DDNet Chat", aBuf);
 			if(g_Config.m_SndHighlight)
 			{
-				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0);
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 1.0f);
 				m_aLastSoundPlayed[CHAT_HIGHLIGHT] = Now;
 			}
 
@@ -903,7 +850,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 			}
 		}
 	}
-	else if(Team != 2)
+	else if(Team != TEAM_WHISPER_SEND)
 	{
 		if(Now - m_aLastSoundPlayed[CHAT_CLIENT] >= time_freq() * 3 / 10)
 		{
@@ -916,30 +863,24 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
 #endif
 			if(PlaySound)
 			{
-				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_CLIENT, 0);
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_CLIENT, 1.0f);
 				m_aLastSoundPlayed[CHAT_CLIENT] = Now;
 			}
 		}
 	}
 }
 
-void CChat::RefindSkins()
+void CChat::OnRefreshSkins()
 {
 	for(auto &Line : m_aLines)
 	{
 		if(Line.m_HasRenderTee)
 		{
-			const CSkin *pSkin = m_pClient->m_Skins.Find(Line.m_aSkinName);
-			if(Line.m_CustomColoredSkin)
-				Line.m_RenderSkin = pSkin->m_ColorableSkin;
-			else
-				Line.m_RenderSkin = pSkin->m_OriginalSkin;
-
-			Line.m_RenderSkinMetrics = pSkin->m_Metrics;
+			Line.m_TeeRenderInfo.Apply(m_pClient->m_Skins.Find(Line.m_aSkinName));
 		}
 		else
 		{
-			Line.m_RenderSkin.Reset();
+			Line.m_TeeRenderInfo.Reset();
 		}
 	}
 }
@@ -949,9 +890,7 @@ void CChat::OnPrepareLines(float y)
 	float x = 5.0f;
 	float FontSize = this->FontSize();
 
-	float ScreenRatio = Graphics()->ScreenAspect();
-
-	const bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (ScreenRatio > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
+	const bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (Graphics()->ScreenAspect() > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
 	const bool ShowLargeArea = m_Show || (m_Mode != MODE_NONE && g_Config.m_ClShowChat == 1) || g_Config.m_ClShowChat == 2;
 	const bool ForceRecreate = IsScoreBoardOpen != m_PrevScoreBoardShowed || ShowLargeArea != m_PrevShowChat;
 	m_PrevScoreBoardShowed = IsScoreBoardOpen;
@@ -980,63 +919,75 @@ void CChat::OnPrepareLines(float y)
 
 	for(int i = 0; i < MAX_LINES; i++)
 	{
-		int r = ((m_CurrentLine - i) + MAX_LINES) % MAX_LINES;
+		CLine &Line = m_aLines[((m_CurrentLine - i) + MAX_LINES) % MAX_LINES];
 
-		if(Now > m_aLines[r].m_Time + 16 * time_freq() && !m_PrevShowChat)
+		if(Now > Line.m_Time + 16 * time_freq() && !m_PrevShowChat)
 			break;
 
-		if(m_aLines[r].m_TextContainerIndex.Valid() && !ForceRecreate)
+		if(Line.m_TextContainerIndex.Valid() && !ForceRecreate)
 			continue;
 
-		TextRender()->DeleteTextContainer(m_aLines[r].m_TextContainerIndex);
-		Graphics()->DeleteQuadContainer(m_aLines[r].m_QuadContainerIndex);
-
-		char aName[64 + 12] = "";
+		TextRender()->DeleteTextContainer(Line.m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(Line.m_QuadContainerIndex);
 
-		if(g_Config.m_ClShowIDs && m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		char aClientId[16] = "";
+		if(g_Config.m_ClShowIds && Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 		{
-			if(m_aLines[r].m_ClientID < 10)
-				str_format(aName, sizeof(aName), " %d: ", m_aLines[r].m_ClientID);
-			else
-				str_format(aName, sizeof(aName), "%d: ", m_aLines[r].m_ClientID);
+			GameClient()->FormatClientId(Line.m_ClientId, aClientId, EClientIdFormat::INDENT_AUTO);
 		}
 
-		str_append(aName, m_aLines[r].m_aName);
-
 		char aCount[12];
-		if(m_aLines[r].m_ClientID < 0)
-			str_format(aCount, sizeof(aCount), "[%d] ", m_aLines[r].m_TimesRepeated + 1);
+		if(Line.m_ClientId < 0)
+			str_format(aCount, sizeof(aCount), "[%d] ", Line.m_TimesRepeated + 1);
 		else
-			str_format(aCount, sizeof(aCount), " [%d]", m_aLines[r].m_TimesRepeated + 1);
+			str_format(aCount, sizeof(aCount), " [%d]", Line.m_TimesRepeated + 1);
+
+		const char *pText = Line.m_aText;
+		if(Config()->m_ClStreamerMode && Line.m_ClientId == SERVER_MSG)
+		{
+			if(str_startswith(Line.m_aText, "Team save in progress. You'll be able to load with '/load ") && str_endswith(Line.m_aText, "'"))
+			{
+				pText = "Team save in progress. You'll be able to load with '/load ***'";
+			}
+			else if(str_startswith(Line.m_aText, "Team save in progress. You'll be able to load with '/load") && str_endswith(Line.m_aText, "if it fails"))
+			{
+				pText = "Team save in progress. You'll be able to load with '/load ***' if save is successful or with '/load *** *** ***' if it fails";
+			}
+			else if(str_startswith(Line.m_aText, "Team successfully saved by ") && str_endswith(Line.m_aText, " to continue"))
+			{
+				pText = "Team successfully saved by ***. Use '/load ***' to continue";
+			}
+		}
 
 		if(g_Config.m_ClChatOld)
 		{
-			m_aLines[r].m_HasRenderTee = false;
+			Line.m_HasRenderTee = false;
 		}
 
 		// get the y offset (calculate it if we haven't done that yet)
-		if(m_aLines[r].m_aYOffset[OffsetType] < 0.0f)
+		if(Line.m_aYOffset[OffsetType] < 0.0f)
 		{
 			TextRender()->SetCursor(&Cursor, TextBegin, 0.0f, FontSize, 0);
 			Cursor.m_LineWidth = LineWidth;
 
-			if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+			if(Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 			{
 				Cursor.m_X += RealMsgPaddingTee;
 
-				if(m_aLines[r].m_Friend && g_Config.m_ClMessageFriend)
+				if(Line.m_Friend && g_Config.m_ClMessageFriend)
 				{
-					TextRender()->TextEx(&Cursor, "♥ ", -1);
+					TextRender()->TextEx(&Cursor, "♥ ");
 				}
 			}
 
-			TextRender()->TextEx(&Cursor, aName, -1);
-			if(m_aLines[r].m_TimesRepeated > 0)
-				TextRender()->TextEx(&Cursor, aCount, -1);
+			TextRender()->TextEx(&Cursor, aClientId);
+			TextRender()->TextEx(&Cursor, Line.m_aName);
+			if(Line.m_TimesRepeated > 0)
+				TextRender()->TextEx(&Cursor, aCount);
 
-			if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+			if(Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 			{
-				TextRender()->TextEx(&Cursor, ": ", -1);
+				TextRender()->TextEx(&Cursor, ": ");
 			}
 
 			CTextCursor AppendCursor = Cursor;
@@ -1047,84 +998,83 @@ void CChat::OnPrepareLines(float y)
 				AppendCursor.m_LineWidth -= Cursor.m_LongestLineWidth;
 			}
 
-			TextRender()->TextEx(&AppendCursor, m_aLines[r].m_aText, -1);
+			TextRender()->TextEx(&AppendCursor, pText);
 
-			m_aLines[r].m_aYOffset[OffsetType] = AppendCursor.m_Y + AppendCursor.m_FontSize + RealMsgPaddingY;
+			Line.m_aYOffset[OffsetType] = AppendCursor.Height() + RealMsgPaddingY;
 		}
 
-		y -= m_aLines[r].m_aYOffset[OffsetType];
+		y -= Line.m_aYOffset[OffsetType];
 
 		// cut off if msgs waste too much space
 		if(y < HeightLimit)
 			break;
 
 		// the position the text was created
-		m_aLines[r].m_TextYOffset = y + RealMsgPaddingY / 2.f;
+		Line.m_TextYOffset = y + RealMsgPaddingY / 2.f;
 
 		int CurRenderFlags = TextRender()->GetRenderFlags();
 		TextRender()->SetRenderFlags(CurRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_AUTOMATIC_QUAD_UPLOAD);
 
 		// reset the cursor
-		TextRender()->SetCursor(&Cursor, TextBegin, m_aLines[r].m_TextYOffset, FontSize, TEXTFLAG_RENDER);
+		TextRender()->SetCursor(&Cursor, TextBegin, Line.m_TextYOffset, FontSize, TEXTFLAG_RENDER);
 		Cursor.m_LineWidth = LineWidth;
 
 		// Message is from valid player
-		if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		if(Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 		{
 			Cursor.m_X += RealMsgPaddingTee;
 
-			if(m_aLines[r].m_Friend && g_Config.m_ClMessageFriend)
+			if(Line.m_Friend && g_Config.m_ClMessageFriend)
 			{
-				const char *pHeartStr = "♥ ";
-				ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
-				TextRender()->TextColor(rgb.WithAlpha(1.f));
-				TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, pHeartStr);
+				TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor)).WithAlpha(1.f));
+				TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, "♥ ");
 			}
 		}
 
 		// render name
 		ColorRGBA NameColor;
-		if(m_aLines[r].m_ClientID == SERVER_MSG)
+		if(Line.m_ClientId == SERVER_MSG)
 			NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
-		else if(m_aLines[r].m_ClientID == CLIENT_MSG)
+		else if(Line.m_ClientId == CLIENT_MSG)
 			NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
-		else if(m_aLines[r].m_Team)
+		else if(Line.m_Team)
 			NameColor = CalculateNameColor(ColorHSLA(g_Config.m_ClMessageTeamColor));
-		else if(m_aLines[r].m_NameColor == TEAM_RED)
+		else if(Line.m_NameColor == TEAM_RED)
 			NameColor = ColorRGBA(1.0f, 0.5f, 0.5f, 1.f);
-		else if(m_aLines[r].m_NameColor == TEAM_BLUE)
+		else if(Line.m_NameColor == TEAM_BLUE)
 			NameColor = ColorRGBA(0.7f, 0.7f, 1.0f, 1.f);
-		else if(m_aLines[r].m_NameColor == TEAM_SPECTATORS)
+		else if(Line.m_NameColor == TEAM_SPECTATORS)
 			NameColor = ColorRGBA(0.75f, 0.5f, 0.75f, 1.f);
-		else if(m_aLines[r].m_ClientID >= 0 && g_Config.m_ClChatTeamColors && m_pClient->m_Teams.Team(m_aLines[r].m_ClientID))
-			NameColor = m_pClient->GetDDTeamColor(m_pClient->m_Teams.Team(m_aLines[r].m_ClientID), 0.75f);
+		else if(Line.m_ClientId >= 0 && g_Config.m_ClChatTeamColors && m_pClient->m_Teams.Team(Line.m_ClientId))
+			NameColor = m_pClient->GetDDTeamColor(m_pClient->m_Teams.Team(Line.m_ClientId), 0.75f);
 		else
 			NameColor = ColorRGBA(0.8f, 0.8f, 0.8f, 1.f);
 
 		TextRender()->TextColor(NameColor);
-		TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, aName);
+		TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, aClientId);
+		TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, Line.m_aName);
 
-		if(m_aLines[r].m_TimesRepeated > 0)
+		if(Line.m_TimesRepeated > 0)
 		{
 			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.3f);
-			TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, aCount);
+			TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, aCount);
 		}
 
-		if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		if(Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 		{
 			TextRender()->TextColor(NameColor);
-			TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, ": ");
+			TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, ": ");
 		}
 
 		// render line
 		ColorRGBA Color;
-		if(m_aLines[r].m_ClientID == SERVER_MSG)
+		if(Line.m_ClientId == SERVER_MSG)
 			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
-		else if(m_aLines[r].m_ClientID == CLIENT_MSG)
+		else if(Line.m_ClientId == CLIENT_MSG)
 			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
-		else if(m_aLines[r].m_Highlighted)
+		else if(Line.m_Highlighted)
 			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
-		else if(m_aLines[r].m_Team)
+		else if(Line.m_Team)
 			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
 		else // regular message
 			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
@@ -1133,34 +1083,32 @@ void CChat::OnPrepareLines(float y)
 
 		CTextCursor AppendCursor = Cursor;
 		AppendCursor.m_LongestLineWidth = 0.0f;
-		float OriginalWidth = 0.0f;
 		if(!IsScoreBoardOpen && !g_Config.m_ClChatOld)
 		{
 			AppendCursor.m_StartX = Cursor.m_X;
 			AppendCursor.m_LineWidth -= Cursor.m_LongestLineWidth;
-			OriginalWidth = Cursor.m_LongestLineWidth;
 		}
 
-		const char *pText = m_aLines[r].m_aText;
-		if(Config()->m_ClStreamerMode && m_aLines[r].m_ClientID == SERVER_MSG)
-		{
-			if(str_startswith(m_aLines[r].m_aText, "Team save in progress. You'll be able to load with '/load") && str_endswith(m_aLines[r].m_aText, "if it fails"))
-				pText = "Team save in progress. You'll be able to load with '/load ***' if save is successful or with '/load *** *** ***' if it fails";
-			else if(str_startswith(m_aLines[r].m_aText, "Team successfully saved by ") && str_endswith(m_aLines[r].m_aText, " to continue"))
-				pText = "Team successfully saved by ***. Use '/load ***' to continue";
-		}
-		TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &AppendCursor, pText);
+		TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &AppendCursor, pText);
 
-		if(!g_Config.m_ClChatOld && (m_aLines[r].m_aText[0] != '\0' || m_aLines[r].m_aName[0] != '\0'))
+		if(!g_Config.m_ClChatOld && (Line.m_aText[0] != '\0' || Line.m_aName[0] != '\0'))
 		{
-			float Height = m_aLines[r].m_aYOffset[OffsetType];
+			float FullWidth = RealMsgPaddingX * 1.5f;
+			if(!IsScoreBoardOpen && !g_Config.m_ClChatOld)
+			{
+				FullWidth += Cursor.m_LongestLineWidth + AppendCursor.m_LongestLineWidth;
+			}
+			else
+			{
+				FullWidth += maximum(Cursor.m_LongestLineWidth, AppendCursor.m_LongestLineWidth);
+			}
 			Graphics()->SetColor(1, 1, 1, 1);
-			m_aLines[r].m_QuadContainerIndex = Graphics()->CreateRectQuadContainer(Begin, y, OriginalWidth + AppendCursor.m_LongestLineWidth + RealMsgPaddingX * 1.5f, Height, MessageRounding(), IGraphics::CORNER_ALL);
+			Line.m_QuadContainerIndex = Graphics()->CreateRectQuadContainer(Begin, y, FullWidth, Line.m_aYOffset[OffsetType], MessageRounding(), IGraphics::CORNER_ALL);
 		}
 
 		TextRender()->SetRenderFlags(CurRenderFlags);
-		if(m_aLines[r].m_TextContainerIndex.Valid())
-			TextRender()->UploadTextContainer(m_aLines[r].m_TextContainerIndex);
+		if(Line.m_TextContainerIndex.Valid())
+			TextRender()->UploadTextContainer(Line.m_TextContainerIndex);
 	}
 
 	TextRender()->TextColor(TextRender()->DefaultTextColor());
@@ -1168,6 +1116,9 @@ void CChat::OnPrepareLines(float y)
 
 void CChat::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	// send pending chat messages
 	if(m_PendingChatCounter > 0 && m_LastChatSend + time_freq() < time())
 	{
@@ -1176,7 +1127,7 @@ void CChat::OnRender()
 		{
 			if(i == 0)
 			{
-				Say(pEntry->m_Team, pEntry->m_aText);
+				SendChat(pEntry->m_Team, pEntry->m_aText);
 				break;
 			}
 		}
@@ -1198,13 +1149,13 @@ void CChat::OnRender()
 		Cursor.m_LineWidth = Width - 190.0f;
 
 		if(m_Mode == MODE_ALL)
-			TextRender()->TextEx(&Cursor, Localize("All"), -1);
+			TextRender()->TextEx(&Cursor, Localize("All"));
 		else if(m_Mode == MODE_TEAM)
-			TextRender()->TextEx(&Cursor, Localize("Team"), -1);
+			TextRender()->TextEx(&Cursor, Localize("Team"));
 		else
-			TextRender()->TextEx(&Cursor, Localize("Chat"), -1);
+			TextRender()->TextEx(&Cursor, Localize("Chat"));
 
-		TextRender()->TextEx(&Cursor, ": ", -1);
+		TextRender()->TextEx(&Cursor, ": ");
 
 		const float MessageMaxWidth = Cursor.m_LineWidth - (Cursor.m_X - Cursor.m_StartX);
 		const CUIRect ClippingRect = {Cursor.m_X, Cursor.m_Y, MessageMaxWidth, 2.25f * Cursor.m_FontSize};
@@ -1231,10 +1182,27 @@ void CChat::OnRender()
 		else if(CaretPositionY + Cursor.m_FontSize > ClippingRect.y + ClippingRect.h)
 			ScrollOffsetChange += CaretPositionY + Cursor.m_FontSize - (ClippingRect.y + ClippingRect.h);
 
-		UI()->DoSmoothScrollLogic(&ScrollOffset, &ScrollOffsetChange, ClippingRect.h, BoundingBox.m_H);
+		Ui()->DoSmoothScrollLogic(&ScrollOffset, &ScrollOffsetChange, ClippingRect.h, BoundingBox.m_H);
 
 		m_Input.SetScrollOffset(ScrollOffset);
 		m_Input.SetScrollOffsetChange(ScrollOffsetChange);
+
+		// Autocompletion hint
+		if(m_Input.GetString()[0] == '/' && m_Input.GetString()[1] != '\0' && !m_vCommands.empty())
+		{
+			for(const auto &Command : m_vCommands)
+			{
+				if(str_startswith_nocase(Command.m_aName, m_Input.GetString() + 1))
+				{
+					Cursor.m_X = m_Input.GetCaretPosition().x;
+					Cursor.m_Y = m_Input.GetCaretPosition().y;
+					TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.5f);
+					TextRender()->TextEx(&Cursor, Command.m_aName + str_length(m_Input.GetString() + 1));
+					TextRender()->TextColor(TextRender()->DefaultTextColor());
+					break;
+				}
+			}
+		}
 	}
 
 #if defined(CONF_VIDEORECORDER)
@@ -1248,8 +1216,7 @@ void CChat::OnRender()
 
 	OnPrepareLines(y);
 
-	float ScreenRatio = Graphics()->ScreenAspect();
-	bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (ScreenRatio > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
+	bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (Graphics()->ScreenAspect() > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
 
 	int64_t Now = time();
 	float HeightLimit = IsScoreBoardOpen ? 180.0f : (m_PrevShowChat ? 50.0f : 200.0f);
@@ -1266,45 +1233,35 @@ void CChat::OnRender()
 
 	for(int i = 0; i < MAX_LINES; i++)
 	{
-		int r = ((m_CurrentLine - i) + MAX_LINES) % MAX_LINES;
-		if(Now > m_aLines[r].m_Time + 16 * time_freq() && !m_PrevShowChat)
+		CLine &Line = m_aLines[((m_CurrentLine - i) + MAX_LINES) % MAX_LINES];
+		if(Now > Line.m_Time + 16 * time_freq() && !m_PrevShowChat)
 			break;
 
-		y -= m_aLines[r].m_aYOffset[OffsetType];
+		y -= Line.m_aYOffset[OffsetType];
 
 		// cut off if msgs waste too much space
 		if(y < HeightLimit)
 			break;
 
-		float Blend = Now > m_aLines[r].m_Time + 14 * time_freq() && !m_PrevShowChat ? 1.0f - (Now - m_aLines[r].m_Time - 14 * time_freq()) / (2.0f * time_freq()) : 1.0f;
+		float Blend = Now > Line.m_Time + 14 * time_freq() && !m_PrevShowChat ? 1.0f - (Now - Line.m_Time - 14 * time_freq()) / (2.0f * time_freq()) : 1.0f;
 
 		// Draw backgrounds for messages in one batch
 		if(!g_Config.m_ClChatOld)
 		{
 			Graphics()->TextureClear();
-			if(m_aLines[r].m_QuadContainerIndex != -1)
+			if(Line.m_QuadContainerIndex != -1)
 			{
 				Graphics()->SetColor(0, 0, 0, 0.12f * Blend);
-				Graphics()->RenderQuadContainerEx(m_aLines[r].m_QuadContainerIndex, 0, -1, 0, ((y + RealMsgPaddingY / 2.0f) - m_aLines[r].m_TextYOffset));
+				Graphics()->RenderQuadContainerEx(Line.m_QuadContainerIndex, 0, -1, 0, ((y + RealMsgPaddingY / 2.0f) - Line.m_TextYOffset));
 			}
 		}
 
-		if(m_aLines[r].m_TextContainerIndex.Valid())
+		if(Line.m_TextContainerIndex.Valid())
 		{
-			if(!g_Config.m_ClChatOld && m_aLines[r].m_HasRenderTee)
+			if(!g_Config.m_ClChatOld && Line.m_HasRenderTee)
 			{
 				const int TeeSize = MessageTeeSize();
-				CTeeRenderInfo RenderInfo;
-				RenderInfo.m_CustomColoredSkin = m_aLines[r].m_CustomColoredSkin;
-				if(m_aLines[r].m_CustomColoredSkin)
-					RenderInfo.m_ColorableRenderSkin = m_aLines[r].m_RenderSkin;
-				else
-					RenderInfo.m_OriginalRenderSkin = m_aLines[r].m_RenderSkin;
-				RenderInfo.m_SkinMetrics = m_aLines[r].m_RenderSkinMetrics;
-
-				RenderInfo.m_ColorBody = m_aLines[r].m_ColorBody;
-				RenderInfo.m_ColorFeet = m_aLines[r].m_ColorFeet;
-				RenderInfo.m_Size = TeeSize;
+				Line.m_TeeRenderInfo.m_Size = TeeSize;
 
 				float RowHeight = FontSize() + RealMsgPaddingY;
 				float OffsetTeeY = TeeSize / 2.0f;
@@ -1312,19 +1269,41 @@ void CChat::OnRender()
 
 				const CAnimState *pIdleState = CAnimState::GetIdle();
 				vec2 OffsetToMid;
-				RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &RenderInfo, OffsetToMid);
+				CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &Line.m_TeeRenderInfo, OffsetToMid);
 				vec2 TeeRenderPos(x + (RealMsgPaddingX + TeeSize) / 2.0f, y + OffsetTeeY + FullHeightMinusTee / 2.0f + OffsetToMid.y);
-				RenderTools()->RenderTee(pIdleState, &RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
+				RenderTools()->RenderTee(pIdleState, &Line.m_TeeRenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
 			}
 
 			const ColorRGBA TextColor = TextRender()->DefaultTextColor().WithMultipliedAlpha(Blend);
 			const ColorRGBA TextOutlineColor = TextRender()->DefaultTextOutlineColor().WithMultipliedAlpha(Blend);
-			TextRender()->RenderTextContainer(m_aLines[r].m_TextContainerIndex, TextColor, TextOutlineColor, 0, (y + RealMsgPaddingY / 2.0f) - m_aLines[r].m_TextYOffset);
+			TextRender()->RenderTextContainer(Line.m_TextContainerIndex, TextColor, TextOutlineColor, 0, (y + RealMsgPaddingY / 2.0f) - Line.m_TextYOffset);
 		}
 	}
 }
 
-void CChat::Say(int Team, const char *pLine)
+void CChat::EnsureCoherentFontSize() const
+{
+	// Adjust font size based on width
+	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
+		return;
+
+	// We want to keep a ration between font size and font width so that we don't have a weird rendering
+	g_Config.m_ClChatFontSize = g_Config.m_ClChatWidth / CHAT_FONTSIZE_WIDTH_RATIO;
+}
+
+void CChat::EnsureCoherentWidth() const
+{
+	// Adjust width based on font size
+	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
+		return;
+
+	// We want to keep a ration between font size and font width so that we don't have a weird rendering
+	g_Config.m_ClChatWidth = CHAT_FONTSIZE_WIDTH_RATIO * g_Config.m_ClChatFontSize;
+}
+
+// ----- send functions -----
+
+void CChat::SendChat(int Team, const char *pLine)
 {
 	// don't send empty messages
 	if(*str_utf8_skip_whitespaces(pLine) == '\0')
@@ -1332,6 +1311,16 @@ void CChat::Say(int Team, const char *pLine)
 
 	m_LastChatSend = time();
 
+	if(m_pClient->Client()->IsSixup())
+	{
+		protocol7::CNetMsg_Cl_Say Msg7;
+		Msg7.m_Mode = Team == 1 ? protocol7::CHAT_TEAM : protocol7::CHAT_ALL;
+		Msg7.m_Target = -1;
+		Msg7.m_pMessage = pLine;
+		Client()->SendPackMsgActive(&Msg7, MSGFLAG_VITAL, true);
+		return;
+	}
+
 	// send chat message
 	CNetMsg_Cl_Say Msg;
 	Msg.m_Team = Team;
@@ -1339,7 +1328,7 @@ void CChat::Say(int Team, const char *pLine)
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
 }
 
-void CChat::SayChat(const char *pLine)
+void CChat::SendChatQueued(const char *pLine)
 {
 	if(!pLine || str_length(pLine) < 1)
 		return;
@@ -1348,7 +1337,7 @@ void CChat::SayChat(const char *pLine)
 
 	if(m_LastChatSend + time_freq() < time())
 	{
-		Say(m_Mode == MODE_ALL ? 0 : 1, pLine);
+		SendChat(m_Mode == MODE_ALL ? 0 : 1, pLine);
 		AddEntry = true;
 	}
 	else if(m_PendingChatCounter < 3)
@@ -1359,28 +1348,9 @@ void CChat::SayChat(const char *pLine)
 
 	if(AddEntry)
 	{
-		CHistoryEntry *pEntry = m_History.Allocate(sizeof(CHistoryEntry) + str_length(pLine) - 1);
+		const int Length = str_length(pLine);
+		CHistoryEntry *pEntry = m_History.Allocate(sizeof(CHistoryEntry) + Length);
 		pEntry->m_Team = m_Mode == MODE_ALL ? 0 : 1;
-		mem_copy(pEntry->m_aText, pLine, str_length(pLine));
+		str_copy(pEntry->m_aText, pLine, Length + 1);
 	}
 }
-
-void CChat::EnsureCoherentFontSize() const
-{
-	// Adjust font size based on width
-	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
-		return;
-
-	// We want to keep a ration between font size and font width so that we don't have a weird rendering
-	g_Config.m_ClChatFontSize = g_Config.m_ClChatWidth / CHAT_FONTSIZE_WIDTH_RATIO;
-}
-
-void CChat::EnsureCoherentWidth() const
-{
-	// Adjust width based on font size
-	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
-		return;
-
-	// We want to keep a ration between font size and font width so that we don't have a weird rendering
-	g_Config.m_ClChatWidth = CHAT_FONTSIZE_WIDTH_RATIO * g_Config.m_ClChatFontSize;
-}
diff --git a/src/game/client/components/chat.h b/src/game/client/components/chat.h
index cf23efc935..b585dfdd2f 100644
--- a/src/game/client/components/chat.h
+++ b/src/game/client/components/chat.h
@@ -11,7 +11,9 @@
 
 #include <game/client/component.h>
 #include <game/client/lineinput.h>
+#include <game/client/render.h>
 #include <game/client/skin.h>
+#include <game/generated/protocol7.h>
 
 class CChat : public CComponent
 {
@@ -30,7 +32,7 @@ class CChat : public CComponent
 	{
 		int64_t m_Time;
 		float m_aYOffset[2];
-		int m_ClientID;
+		int m_ClientId;
 		int m_TeamNumber;
 		bool m_Team;
 		bool m_Whisper;
@@ -44,13 +46,9 @@ class CChat : public CComponent
 		int m_QuadContainerIndex;
 
 		char m_aSkinName[std::size(g_Config.m_ClPlayerSkin)];
-		CSkin::SSkinTextures m_RenderSkin;
-		CSkin::SSkinMetrics m_RenderSkinMetrics;
-		bool m_CustomColoredSkin;
-		ColorRGBA m_ColorBody;
-		ColorRGBA m_ColorFeet;
-
 		bool m_HasRenderTee;
+		CTeeRenderInfo m_TeeRenderInfo;
+
 		float m_TextYOffset;
 
 		int m_TimesRepeated;
@@ -88,7 +86,7 @@ class CChat : public CComponent
 	static char ms_aDisplayText[MAX_LINE_LENGTH];
 	struct CRateablePlayer
 	{
-		int ClientID;
+		int ClientId;
 		int Score;
 	};
 	CRateablePlayer m_aPlayerCompletionList[MAX_CLIENTS];
@@ -114,7 +112,6 @@ class CChat : public CComponent
 	};
 
 	std::vector<CCommand> m_vCommands;
-	std::vector<CCommand> m_vDefaultCommands;
 	bool m_CommandsNeedSorting;
 
 	struct CHistoryEntry
@@ -153,11 +150,9 @@ class CChat : public CComponent
 	static constexpr float MESSAGE_TEE_PADDING_RIGHT = 0.5f;
 
 	bool IsActive() const { return m_Mode != MODE_NONE; }
-	void AddLine(int ClientID, int Team, const char *pLine);
+	void AddLine(int ClientId, int Team, const char *pLine);
 	void EnableMode(int Team);
 	void DisableMode();
-	void Say(int Team, const char *pLine);
-	void SayChat(const char *pLine);
 	void RegisterCommand(const char *pName, const char *pParams, const char *pHelpText);
 	void UnregisterCommand(const char *pName);
 	void Echo(const char *pString);
@@ -165,15 +160,14 @@ class CChat : public CComponent
 	void OnWindowResize() override;
 	void OnConsoleInit() override;
 	void OnStateChange(int NewState, int OldState) override;
+	void OnRefreshSkins() override;
 	void OnRender() override;
-	void RefindSkins();
 	void OnPrepareLines(float y);
 	void Reset();
 	void OnRelease() override;
 	void OnMessage(int MsgType, void *pRawMsg) override;
 	bool OnInput(const IInput::CEvent &Event) override;
 	void OnInit() override;
-	void OnMapLoad() override;
 
 	void RebuildChat();
 
@@ -185,5 +179,22 @@ class CChat : public CComponent
 	float MessagePaddingY() const { return FontSize() * (1 / 6.f); }
 	float MessageTeeSize() const { return FontSize() * (7 / 6.f); }
 	float MessageRounding() const { return FontSize() * (1 / 2.f); }
+
+	// ----- send functions -----
+
+	// Sends a chat message to the server.
+	//
+	// @param Team MODE_ALL=0 MODE_TEAM=1
+	// @param pLine the chat message
+	void SendChat(int Team, const char *pLine);
+
+	// Sends a chat message to the server.
+	//
+	// It uses a queue with a maximum of 3 entries
+	// that ensures there is a minimum delay of one second
+	// between sent messages.
+	//
+	// It uses team or public chat depending on m_Mode.
+	void SendChatQueued(const char *pLine);
 };
 #endif
diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp
index 4c11fdd78b..1c08e61553 100644
--- a/src/game/client/components/console.cpp
+++ b/src/game/client/components/console.cpp
@@ -73,11 +73,76 @@ void CConsoleLogger::OnConsoleDeletion()
 	m_pConsole = nullptr;
 }
 
-// TODO: support "tune_zone", which has tuning as second argument
-static const char *gs_apTuningCommands[] = {"tune ", "tune_reset ", "toggle_tune "};
-static bool IsTuningCommandPrefix(const char *pStr)
+enum class EArgumentCompletionType
 {
-	return std::any_of(std::begin(gs_apTuningCommands), std::end(gs_apTuningCommands), [pStr](auto *pCmd) { return str_startswith_nocase(pStr, pCmd); });
+	NONE,
+	TUNE,
+	SETTING,
+	KEY,
+};
+
+class CArgumentCompletionEntry
+{
+public:
+	EArgumentCompletionType m_Type;
+	const char *m_pCommandName;
+	int m_ArgumentIndex;
+};
+
+static const CArgumentCompletionEntry gs_aArgumentCompletionEntries[] = {
+	{EArgumentCompletionType::TUNE, "tune", 0},
+	{EArgumentCompletionType::TUNE, "tune_reset", 0},
+	{EArgumentCompletionType::TUNE, "toggle_tune", 0},
+	{EArgumentCompletionType::TUNE, "tune_zone", 1},
+	{EArgumentCompletionType::SETTING, "reset", 0},
+	{EArgumentCompletionType::SETTING, "toggle", 0},
+	{EArgumentCompletionType::SETTING, "access_level", 0},
+	{EArgumentCompletionType::SETTING, "+toggle", 0},
+	{EArgumentCompletionType::KEY, "bind", 0},
+	{EArgumentCompletionType::KEY, "binds", 0},
+	{EArgumentCompletionType::KEY, "unbind", 0},
+};
+
+static std::pair<EArgumentCompletionType, int> ArgumentCompletion(const char *pStr)
+{
+	const char *pCommandStart = pStr;
+	const char *pIt = pStr;
+	pIt = str_skip_to_whitespace_const(pIt);
+	int CommandLength = pIt - pCommandStart;
+	const char *pCommandEnd = pIt;
+
+	if(!CommandLength)
+		return {EArgumentCompletionType::NONE, -1};
+
+	pIt = str_skip_whitespaces_const(pIt);
+	if(pIt == pCommandEnd)
+		return {EArgumentCompletionType::NONE, -1};
+
+	for(const auto &Entry : gs_aArgumentCompletionEntries)
+	{
+		int Length = maximum(str_length(Entry.m_pCommandName), CommandLength);
+		if(str_comp_nocase_num(Entry.m_pCommandName, pCommandStart, Length) == 0)
+		{
+			int CurrentArg = 0;
+			const char *pArgStart = nullptr, *pArgEnd = nullptr;
+			while(CurrentArg < Entry.m_ArgumentIndex)
+			{
+				pArgStart = pIt;
+				pIt = str_skip_to_whitespace_const(pIt); // Skip argument value
+				pArgEnd = pIt;
+
+				if(!pIt[0] || pArgStart == pIt) // Check that argument is not empty
+					return {EArgumentCompletionType::NONE, -1};
+
+				pIt = str_skip_whitespaces_const(pIt); // Go to next argument position
+				CurrentArg++;
+			}
+			if(pIt == pArgEnd)
+				return {EArgumentCompletionType::NONE, -1}; // Check that there is at least one space after
+			return {Entry.m_Type, pIt - pStr};
+		}
+	}
+	return {EArgumentCompletionType::NONE, -1};
 }
 
 static int PossibleTunings(const char *pStr, IConsole::FPossibleCallback pfnCallback = IConsole::EmptyPossibleCommandCallback, void *pUser = nullptr)
@@ -94,10 +159,20 @@ static int PossibleTunings(const char *pStr, IConsole::FPossibleCallback pfnCall
 	return Index;
 }
 
-static const char *gs_apSettingCommands[] = {"reset ", "toggle ", "access_level ", "+toggle "};
-static bool IsSettingCommandPrefix(const char *pStr)
+static int PossibleKeys(const char *pStr, IInput *pInput, IConsole::FPossibleCallback pfnCallback = IConsole::EmptyPossibleCommandCallback, void *pUser = nullptr)
 {
-	return std::any_of(std::begin(gs_apSettingCommands), std::end(gs_apSettingCommands), [pStr](auto *pCmd) { return str_startswith_nocase(pStr, pCmd); });
+	int Index = 0;
+	for(int Key = KEY_A; Key < KEY_JOY_AXIS_11_RIGHT; Key++)
+	{
+		// Ignore unnamed keys starting with '&'
+		const char *pKeyName = pInput->KeyName(Key);
+		if(pKeyName[0] != '&' && str_find_nocase(pKeyName, pStr))
+		{
+			pfnCallback(Index, pKeyName, pUser);
+			Index++;
+		}
+	}
+	return Index;
 }
 
 const ColorRGBA CGameConsole::ms_SearchHighlightColor = ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f);
@@ -124,6 +199,7 @@ CGameConsole::CInstance::CInstance(int Type)
 	m_CompletionChosen = -1;
 	m_aCompletionBufferArgument[0] = 0;
 	m_CompletionChosenArgument = -1;
+	m_CompletionArgumentPosition = 0;
 	Reset();
 
 	m_aUser[0] = '\0';
@@ -132,6 +208,13 @@ CGameConsole::CInstance::CInstance(int Type)
 
 	m_IsCommand = false;
 
+	m_Backlog.SetPopCallback([this](CBacklogEntry *pEntry) {
+		if(pEntry->m_LineCount != -1)
+		{
+			m_NewLineCounter -= pEntry->m_LineCount;
+		}
+	});
+
 	m_Input.SetClipboardLineCallback([this](const char *pStr) { ExecuteLine(pStr); });
 
 	m_CurrentMatchIndex = -1;
@@ -160,7 +243,7 @@ void CGameConsole::CInstance::ClearBacklog()
 void CGameConsole::CInstance::UpdateBacklogTextAttributes()
 {
 	// Pending backlog entries are not handled because they don't have text attributes yet.
-	for(CInstance::CBacklogEntry *pEntry = m_Backlog.First(); pEntry; pEntry = m_Backlog.Next(pEntry))
+	for(CBacklogEntry *pEntry = m_Backlog.First(); pEntry; pEntry = m_Backlog.Next(pEntry))
 	{
 		UpdateEntryTextAttributes(pEntry);
 	}
@@ -168,27 +251,29 @@ void CGameConsole::CInstance::UpdateBacklogTextAttributes()
 
 void CGameConsole::CInstance::PumpBacklogPending()
 {
-	std::vector<CInstance::CBacklogEntry *> vpEntries;
 	{
 		// We must ensure that no log messages are printed while owning
 		// m_BacklogPendingLock or this will result in a dead lock.
 		const CLockScope LockScopePending(m_BacklogPendingLock);
-		for(CInstance::CBacklogEntry *pPendingEntry = m_BacklogPending.First(); pPendingEntry; pPendingEntry = m_BacklogPending.Next(pPendingEntry))
+		for(CBacklogEntry *pPendingEntry = m_BacklogPending.First(); pPendingEntry; pPendingEntry = m_BacklogPending.Next(pPendingEntry))
 		{
 			const size_t EntrySize = sizeof(CBacklogEntry) + pPendingEntry->m_Length;
 			CBacklogEntry *pEntry = m_Backlog.Allocate(EntrySize);
 			mem_copy(pEntry, pPendingEntry, EntrySize);
-			vpEntries.push_back(pEntry);
 		}
 
 		m_BacklogPending.Init();
 	}
 
-	m_pGameConsole->UI()->MapScreen();
-	for(CInstance::CBacklogEntry *pEntry : vpEntries)
+	// Update text attributes and count number of added lines
+	m_pGameConsole->Ui()->MapScreen();
+	for(CBacklogEntry *pEntry = m_Backlog.First(); pEntry; pEntry = m_Backlog.Next(pEntry))
 	{
-		UpdateEntryTextAttributes(pEntry);
-		m_NewLineCounter += pEntry->m_LineCount;
+		if(pEntry->m_LineCount == -1)
+		{
+			UpdateEntryTextAttributes(pEntry);
+			m_NewLineCounter += pEntry->m_LineCount;
+		}
 	}
 }
 
@@ -205,6 +290,7 @@ void CGameConsole::CInstance::Reset()
 	m_pCommandName = "";
 	m_pCommandHelp = "";
 	m_pCommandParams = "";
+	m_CompletionArgumentPosition = 0;
 }
 
 void CGameConsole::CInstance::ExecuteLine(const char *pLine)
@@ -235,7 +321,34 @@ void CGameConsole::CInstance::PossibleCommandsCompleteCallback(int Index, const
 {
 	CGameConsole::CInstance *pInstance = (CGameConsole::CInstance *)pUser;
 	if(pInstance->m_CompletionChosen == Index)
-		pInstance->m_Input.Set(pStr);
+	{
+		char aBefore[IConsole::CMDLINE_LENGTH];
+		str_truncate(aBefore, sizeof(aBefore), pInstance->m_aCompletionBuffer, pInstance->m_CompletionCommandStart);
+		char aBuf[IConsole::CMDLINE_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "%s%s%s", aBefore, pStr, pInstance->m_aCompletionBuffer + pInstance->m_CompletionCommandEnd);
+		pInstance->m_Input.Set(aBuf);
+		pInstance->m_Input.SetCursorOffset(str_length(pStr) + pInstance->m_CompletionCommandStart);
+	}
+}
+
+void CGameConsole::CInstance::GetCommand(const char *pInput, char (&aCmd)[IConsole::CMDLINE_LENGTH])
+{
+	char aInput[IConsole::CMDLINE_LENGTH];
+	str_copy(aInput, pInput);
+	m_CompletionCommandStart = 0;
+	m_CompletionCommandEnd = 0;
+
+	char aaSeparators[][2] = {";", "\""};
+	for(auto *pSeparator : aaSeparators)
+	{
+		int Start, End;
+		str_delimiters_around_offset(aInput + m_CompletionCommandStart, pSeparator, m_Input.GetCursorOffset() - m_CompletionCommandStart, &Start, &End);
+		m_CompletionCommandStart += Start;
+		m_CompletionCommandEnd = m_CompletionCommandStart + (End - Start);
+		aInput[m_CompletionCommandEnd] = '\0';
+	}
+
+	str_copy(aCmd, aInput + m_CompletionCommandStart, sizeof(aCmd));
 }
 
 static void StrCopyUntilSpace(char *pDest, size_t DestSize, const char *pSrc)
@@ -251,7 +364,7 @@ void CGameConsole::CInstance::PossibleArgumentsCompleteCallback(int Index, const
 	{
 		// get command
 		char aBuf[IConsole::CMDLINE_LENGTH];
-		StrCopyUntilSpace(aBuf, sizeof(aBuf), pInstance->GetString());
+		str_copy(aBuf, pInstance->GetString(), pInstance->m_CompletionArgumentPosition);
 		str_append(aBuf, " ");
 
 		// append argument
@@ -264,6 +377,10 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 {
 	bool Handled = false;
 
+	// Don't allow input while the console is opening/closing
+	if(m_pGameConsole->m_ConsoleState == CONSOLE_OPENING || m_pGameConsole->m_ConsoleState == CONSOLE_CLOSING)
+		return Handled;
+
 	auto &&SelectNextSearchMatch = [&](int Direction) {
 		if(!m_vSearchMatches.empty())
 		{
@@ -278,6 +395,7 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 		}
 	};
 
+	const int BacklogPrevLine = m_BacklogCurLine;
 	if(Event.m_Flags & IInput::FLAG_PRESS)
 	{
 		if(Event.m_Key == KEY_RETURN || Event.m_Key == KEY_KP_ENTER)
@@ -358,9 +476,12 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 
 			if(!m_Searching)
 			{
+				char aSearch[IConsole::CMDLINE_LENGTH];
+				GetCommand(m_aCompletionBuffer, aSearch);
+
 				// command completion
 				const bool UseTempCommands = m_Type == CGameConsole::CONSOLETYPE_REMOTE && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands();
-				int CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands);
+				int CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(aSearch, m_CompletionFlagmask, UseTempCommands);
 				if(m_Type == CGameConsole::CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
 				{
 					if(CompletionEnumerationCount)
@@ -368,7 +489,8 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 						if(m_CompletionChosen == -1 && Direction < 0)
 							m_CompletionChosen = 0;
 						m_CompletionChosen = (m_CompletionChosen + Direction + CompletionEnumerationCount) % CompletionEnumerationCount;
-						m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands, PossibleCommandsCompleteCallback, this);
+						m_CompletionArgumentPosition = 0;
+						m_pGameConsole->m_pConsole->PossibleCommands(aSearch, m_CompletionFlagmask, UseTempCommands, PossibleCommandsCompleteCallback, this);
 					}
 					else if(m_CompletionChosen != -1)
 					{
@@ -378,22 +500,26 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 				}
 
 				// Argument completion
-				const bool TuningCompletion = IsTuningCommandPrefix(GetString());
-				const bool SettingCompletion = IsSettingCommandPrefix(GetString());
-				if(TuningCompletion)
+				const auto [CompletionType, CompletionPos] = ArgumentCompletion(GetString());
+				if(CompletionType == EArgumentCompletionType::TUNE)
 					CompletionEnumerationCount = PossibleTunings(m_aCompletionBufferArgument);
-				else if(SettingCompletion)
+				else if(CompletionType == EArgumentCompletionType::SETTING)
 					CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBufferArgument, m_CompletionFlagmask, UseTempCommands);
+				else if(CompletionType == EArgumentCompletionType::KEY)
+					CompletionEnumerationCount = PossibleKeys(m_aCompletionBufferArgument, m_pGameConsole->Input());
 
 				if(CompletionEnumerationCount)
 				{
 					if(m_CompletionChosenArgument == -1 && Direction < 0)
 						m_CompletionChosenArgument = 0;
 					m_CompletionChosenArgument = (m_CompletionChosenArgument + Direction + CompletionEnumerationCount) % CompletionEnumerationCount;
-					if(TuningCompletion && m_pGameConsole->Client()->RconAuthed() && m_Type == CGameConsole::CONSOLETYPE_REMOTE)
+					m_CompletionArgumentPosition = CompletionPos;
+					if(CompletionType == EArgumentCompletionType::TUNE)
 						PossibleTunings(m_aCompletionBufferArgument, PossibleArgumentsCompleteCallback, this);
-					else if(SettingCompletion)
+					else if(CompletionType == EArgumentCompletionType::SETTING)
 						m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBufferArgument, m_CompletionFlagmask, UseTempCommands, PossibleArgumentsCompleteCallback, this);
+					else if(CompletionType == EArgumentCompletionType::KEY)
+						PossibleKeys(m_aCompletionBufferArgument, m_pGameConsole->Input(), PossibleArgumentsCompleteCallback, this);
 				}
 				else if(m_CompletionChosenArgument != -1)
 				{
@@ -406,55 +532,62 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 				// Use Tab / Shift-Tab to cycle through search matches
 				SelectNextSearchMatch(Direction);
 			}
+			Handled = true;
 		}
 		else if(Event.m_Key == KEY_PAGEUP)
 		{
 			m_BacklogCurLine += GetLinesToScroll(-1, m_LinesRendered);
-			m_HasSelection = false;
+			Handled = true;
 		}
 		else if(Event.m_Key == KEY_PAGEDOWN)
 		{
-			m_HasSelection = false;
 			m_BacklogCurLine -= GetLinesToScroll(1, m_LinesRendered);
-
 			if(m_BacklogCurLine < 0)
+			{
 				m_BacklogCurLine = 0;
+			}
+			Handled = true;
 		}
 		else if(Event.m_Key == KEY_MOUSE_WHEEL_UP)
 		{
 			m_BacklogCurLine += GetLinesToScroll(-1, 1);
-			m_HasSelection = false;
+			Handled = true;
 		}
 		else if(Event.m_Key == KEY_MOUSE_WHEEL_DOWN)
 		{
-			m_HasSelection = false;
 			--m_BacklogCurLine;
 			if(m_BacklogCurLine < 0)
+			{
 				m_BacklogCurLine = 0;
+			}
+			Handled = true;
 		}
 		// in order not to conflict with CLineInput's handling of Home/End only
 		// react to it when the input is empty
 		else if(Event.m_Key == KEY_HOME && m_Input.IsEmpty())
 		{
-			int Lines = GetLinesToScroll(-1, -1);
-			m_BacklogCurLine += Lines;
+			m_BacklogCurLine += GetLinesToScroll(-1, -1);
 			m_BacklogLastActiveLine = m_BacklogCurLine;
-			m_HasSelection = false;
+			Handled = true;
 		}
 		else if(Event.m_Key == KEY_END && m_Input.IsEmpty())
 		{
 			m_BacklogCurLine = 0;
-			m_HasSelection = false;
+			Handled = true;
 		}
-		else if(Event.m_Key == KEY_F && m_pGameConsole->Input()->ModifierIsPressed() && Event.m_Flags & IInput::FLAG_PRESS)
+		else if(Event.m_Key == KEY_F && m_pGameConsole->Input()->ModifierIsPressed())
 		{
 			m_Searching = !m_Searching;
 			ClearSearch();
-
 			Handled = true;
 		}
 	}
 
+	if(m_BacklogCurLine != BacklogPrevLine)
+	{
+		m_HasSelection = false;
+	}
+
 	if(!Handled)
 	{
 		Handled = m_Input.ProcessInput(Event);
@@ -466,24 +599,24 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 	{
 		if(Event.m_Key != KEY_TAB && Event.m_Key != KEY_LSHIFT && Event.m_Key != KEY_RSHIFT)
 		{
-			m_CompletionChosen = -1;
-			str_copy(m_aCompletionBuffer, m_Input.GetString());
+			const char *pInputStr = m_Input.GetString();
 
-			for(const auto *pCmd : gs_apTuningCommands)
-			{
-				if(str_startswith_nocase(m_Input.GetString(), pCmd))
-				{
-					m_CompletionChosenArgument = -1;
-					str_copy(m_aCompletionBufferArgument, &m_Input.GetString()[str_length(pCmd)]);
-				}
-			}
+			m_CompletionChosen = -1;
+			str_copy(m_aCompletionBuffer, pInputStr);
 
-			for(const auto *pCmd : gs_apSettingCommands)
+			const auto [CompletionType, CompletionPos] = ArgumentCompletion(GetString());
+			if(CompletionType != EArgumentCompletionType::NONE)
 			{
-				if(str_startswith_nocase(m_Input.GetString(), pCmd))
+				for(const auto &Entry : gs_aArgumentCompletionEntries)
 				{
-					m_CompletionChosenArgument = -1;
-					str_copy(m_aCompletionBufferArgument, &m_Input.GetString()[str_length(pCmd)]);
+					if(Entry.m_Type != CompletionType)
+						continue;
+					const int Len = str_length(Entry.m_pCommandName);
+					if(str_comp_nocase_num(pInputStr, Entry.m_pCommandName, Len) == 0 && str_isspace(pInputStr[Len]))
+					{
+						m_CompletionChosenArgument = -1;
+						str_copy(m_aCompletionBufferArgument, &pInputStr[CompletionPos]);
+					}
 				}
 			}
 
@@ -492,8 +625,11 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
 
 		// find the current command
 		{
+			char aCmd[IConsole::CMDLINE_LENGTH];
+			GetCommand(GetString(), aCmd);
 			char aBuf[IConsole::CMDLINE_LENGTH];
-			StrCopyUntilSpace(aBuf, sizeof(aBuf), GetString());
+			StrCopyUntilSpace(aBuf, sizeof(aBuf), aCmd);
+
 			const IConsole::CCommandInfo *pCommand = m_pGameConsole->m_pConsole->GetCommandInfo(aBuf, m_CompletionFlagmask,
 				m_Type != CGameConsole::CONSOLETYPE_LOCAL && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands());
 			if(pCommand)
@@ -573,11 +709,11 @@ void CGameConsole::CInstance::UpdateEntryTextAttributes(CBacklogEntry *pEntry) c
 {
 	CTextCursor Cursor;
 	m_pGameConsole->TextRender()->SetCursor(&Cursor, 0.0f, 0.0f, FONT_SIZE, 0);
-	Cursor.m_LineWidth = m_pGameConsole->UI()->Screen()->w - 10;
+	Cursor.m_LineWidth = m_pGameConsole->Ui()->Screen()->w - 10;
 	Cursor.m_MaxLines = 10;
 	Cursor.m_LineSpacing = LINE_SPACING;
 	m_pGameConsole->TextRender()->TextEx(&Cursor, pEntry->m_aText, -1);
-	pEntry->m_YOffset = Cursor.Height() + LINE_SPACING;
+	pEntry->m_YOffset = Cursor.Height();
 	pEntry->m_LineCount = Cursor.m_LineCount;
 }
 
@@ -613,8 +749,8 @@ void CGameConsole::CInstance::UpdateSearch()
 		m_HasSelection = false;
 	}
 
-	ITextRender *pTextRender = m_pGameConsole->UI()->TextRender();
-	const int LineWidth = m_pGameConsole->UI()->Screen()->w - 10.0f;
+	ITextRender *pTextRender = m_pGameConsole->Ui()->TextRender();
+	const int LineWidth = m_pGameConsole->Ui()->Screen()->w - 10.0f;
 
 	CBacklogEntry *pEntry = m_Backlog.Last();
 	int EntryLine = 0, LineToScrollStart = 0, LineToScrollEnd = 0;
@@ -694,6 +830,30 @@ void CGameConsole::CInstance::UpdateSearch()
 	}
 }
 
+void CGameConsole::CInstance::Dump()
+{
+	char aTimestamp[20];
+	str_timestamp(aTimestamp, sizeof(aTimestamp));
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), "dumps/%s_dump_%s.txt", m_pName, aTimestamp);
+	IOHANDLE File = m_pGameConsole->Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(File)
+	{
+		PumpBacklogPending();
+		for(CInstance::CBacklogEntry *pEntry = m_Backlog.First(); pEntry; pEntry = m_Backlog.Next(pEntry))
+		{
+			io_write(File, pEntry->m_aText, pEntry->m_Length);
+			io_write_newline(File);
+		}
+		io_close(File);
+		log_info("console", "%s contents were written to '%s'", m_pName, aFilename);
+	}
+	else
+	{
+		log_error("console", "Failed to open '%s'", aFilename);
+	}
+}
+
 CGameConsole::CGameConsole() :
 	m_LocalConsole(CONSOLETYPE_LOCAL), m_RemoteConsole(CONSOLETYPE_REMOTE)
 {
@@ -711,13 +871,18 @@ CGameConsole::~CGameConsole()
 		m_pConsoleLogger->OnConsoleDeletion();
 }
 
-CGameConsole::CInstance *CGameConsole::CurrentConsole()
+CGameConsole::CInstance *CGameConsole::ConsoleForType(int ConsoleType)
 {
-	if(m_ConsoleType == CONSOLETYPE_REMOTE)
+	if(ConsoleType == CONSOLETYPE_REMOTE)
 		return &m_RemoteConsole;
 	return &m_LocalConsole;
 }
 
+CGameConsole::CInstance *CGameConsole::CurrentConsole()
+{
+	return ConsoleForType(m_ConsoleType);
+}
+
 void CGameConsole::OnReset()
 {
 	m_RemoteConsole.Reset();
@@ -815,20 +980,17 @@ void CGameConsole::Prompt(char (&aPrompt)[32])
 
 void CGameConsole::OnRender()
 {
-	CUIRect Screen = *UI()->Screen();
+	CUIRect Screen = *Ui()->Screen();
 	CInstance *pConsole = CurrentConsole();
 
-	float MaxConsoleHeight = Screen.h * 3 / 5.0f;
-	float ConsoleHeight;
-
-	float Progress = (Client()->GlobalTime() - (m_StateChangeEnd - m_StateChangeDuration)) / m_StateChangeDuration / 2;
+	const float MaxConsoleHeight = Screen.h * 3 / 5.0f;
+	float Progress = (Client()->GlobalTime() - (m_StateChangeEnd - m_StateChangeDuration)) / m_StateChangeDuration;
 
 	if(Progress >= 1.0f)
 	{
 		if(m_ConsoleState == CONSOLE_CLOSING)
 		{
 			m_ConsoleState = CONSOLE_CLOSED;
-			pConsole->m_Input.Deactivate();
 			pConsole->m_BacklogLastActiveLine = -1;
 		}
 		else if(m_ConsoleState == CONSOLE_OPENING)
@@ -850,17 +1012,16 @@ void CGameConsole::OnRender()
 		Input()->MouseModeAbsolute();
 
 	float ConsoleHeightScale;
-
 	if(m_ConsoleState == CONSOLE_OPENING)
 		ConsoleHeightScale = ConsoleScaleFunc(Progress);
 	else if(m_ConsoleState == CONSOLE_CLOSING)
 		ConsoleHeightScale = ConsoleScaleFunc(1.0f - Progress);
-	else // if (console_state == CONSOLE_OPEN)
+	else // CONSOLE_OPEN
 		ConsoleHeightScale = ConsoleScaleFunc(1.0f);
 
-	ConsoleHeight = ConsoleHeightScale * MaxConsoleHeight;
+	const float ConsoleHeight = ConsoleHeightScale * MaxConsoleHeight;
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 
 	// do console shadow
 	Graphics()->TextureClear();
@@ -876,37 +1037,16 @@ void CGameConsole::OnRender()
 	Graphics()->QuadsEnd();
 
 	// do background
-	ColorRGBA ScLocalConsoleColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScLocalConsoleColor));
-	ScLocalConsoleColor.a = g_Config.m_ClLocalConsolaAlpha / 100.0f;
-	ColorRGBA ScRemoteConsoleColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScRemoteConsoleColor));
-	ScRemoteConsoleColor.a = g_Config.m_ClRemoteConsolaAlpha / 100.0f;
-
-	ColorRGBA ScConsoleBarColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScConsoleBarColor));
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BG].m_Id);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(0.2f, 0.2f, 0.2f, 0.9f);
+	if(m_ConsoleType == CONSOLETYPE_REMOTE)
+		Graphics()->SetColor(0.4f, 0.2f, 0.2f, 0.9f);
+	Graphics()->QuadsSetSubset(0, -ConsoleHeight * 0.075f, Screen.w * 0.075f * 0.5f, 0);
+	QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
 
-	if(g_Config.m_ClConsoleSimple == 1)
-	{
-		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_SIMPLE].m_Id);
-		Graphics()->QuadsBegin();
-		Graphics()->SetColor(ScLocalConsoleColor);
-		if(m_ConsoleType == CONSOLETYPE_REMOTE)
-			Graphics()->SetColor(ScRemoteConsoleColor);
-		Graphics()->QuadsSetSubset(0, -ConsoleHeight * 0.075f, Screen.w * 0.075f * 0.5f, 0);
-		QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight);
-		Graphics()->QuadsDrawTL(&QuadItem, 1);
-		Graphics()->QuadsEnd();
-	}
-	else
-	{
-		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BG].m_Id);
-		Graphics()->QuadsBegin();
-		Graphics()->SetColor(ScLocalConsoleColor);
-		if(m_ConsoleType == CONSOLETYPE_REMOTE)
-			Graphics()->SetColor(ScRemoteConsoleColor);
-		Graphics()->QuadsSetSubset(0, -ConsoleHeight * 0.075f, Screen.w * 0.075f * 0.5f, 0);
-		QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight);
-		Graphics()->QuadsDrawTL(&QuadItem, 1);
-		Graphics()->QuadsEnd();
-	}
 	// do small bar shadow
 	Graphics()->TextureClear();
 	Graphics()->QuadsBegin();
@@ -914,41 +1054,29 @@ void CGameConsole::OnRender()
 	Array[1] = IGraphics::CColorVertex(1, 0, 0, 0, 0.0f);
 	Array[2] = IGraphics::CColorVertex(2, 0, 0, 0, 0.25f);
 	Array[3] = IGraphics::CColorVertex(3, 0, 0, 0, 0.25f);
+
 	Graphics()->SetColorVertex(Array, 4);
 	QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 20, Screen.w, 10);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
 
 	// do the lower bar
-	if(g_Config.m_ClConsoleBarSimple == 1)
-	{
-		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BAR_SIMPLE].m_Id);
-		Graphics()->QuadsBegin();
-		Graphics()->SetColor(ScConsoleBarColor);
-		Graphics()->QuadsSetSubset(0, 0.1f, Screen.w * 0.015f, 1 - 0.1f);
-		QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 10.0f, Screen.w, 10.0f);
-		Graphics()->QuadsDrawTL(&QuadItem, 1);
-		Graphics()->QuadsEnd();
-	}
-	else
-	{
-		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BAR].m_Id);
-		Graphics()->QuadsBegin();
-		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.9f);
-		Graphics()->QuadsSetSubset(0, 0.1f, Screen.w * 0.015f, 1 - 0.1f);
-		QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 10.0f, Screen.w, 10.0f);
-		Graphics()->QuadsDrawTL(&QuadItem, 1);
-		Graphics()->QuadsEnd();
-	}
-	ConsoleHeight -= 22.0f;
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BAR].m_Id);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.9f);
+	Graphics()->QuadsSetSubset(0, 0.1f, Screen.w * 0.015f, 1 - 0.1f);
+	QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 10.0f, Screen.w, 10.0f);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
 
 	{
 		// Get height of 1 line
-		float LineHeight = TextRender()->TextBoundingBox(FONT_SIZE, " ", -1, -1, LINE_SPACING).m_H + LINE_SPACING;
+		const float LineHeight = TextRender()->TextBoundingBox(FONT_SIZE, " ", -1, -1.0f, LINE_SPACING).m_H;
+
+		const float RowHeight = FONT_SIZE * 1.5f;
 
-		float RowHeight = FONT_SIZE * 1.25f;
 		float x = 3;
-		float y = ConsoleHeight - RowHeight - 5.0f;
+		float y = ConsoleHeight - RowHeight - 27.0f;
 
 		const float InitialX = x;
 		const float InitialY = y;
@@ -962,24 +1090,48 @@ void CGameConsole::OnRender()
 		TextRender()->TextEx(&Cursor, aPrompt);
 
 		// check if mouse is pressed
-		if(!pConsole->m_MouseIsPress && Input()->NativeMousePressed(1))
+		const vec2 WindowSize = vec2(Graphics()->WindowWidth(), Graphics()->WindowHeight());
+		const vec2 ScreenSize = vec2(Screen.w, Screen.h);
+		Ui()->UpdateTouchState(m_TouchState);
+		const auto &&GetMousePosition = [&]() -> vec2 {
+			if(m_TouchState.m_PrimaryPressed)
+			{
+				return m_TouchState.m_PrimaryPosition * ScreenSize;
+			}
+			else
+			{
+				return Input()->NativeMousePos() / WindowSize * ScreenSize;
+			}
+		};
+		if(!pConsole->m_MouseIsPress && (m_TouchState.m_PrimaryPressed || Input()->NativeMousePressed(1)))
 		{
 			pConsole->m_MouseIsPress = true;
-			ivec2 MousePress;
-			Input()->NativeMousePos(&MousePress.x, &MousePress.y);
-			pConsole->m_MousePress.x = (MousePress.x / (float)Graphics()->WindowWidth()) * Screen.w;
-			pConsole->m_MousePress.y = (MousePress.y / (float)Graphics()->WindowHeight()) * Screen.h;
+			pConsole->m_MousePress = GetMousePosition();
+		}
+		if(pConsole->m_MouseIsPress && !m_TouchState.m_PrimaryPressed && !Input()->NativeMousePressed(1))
+		{
+			pConsole->m_MouseIsPress = false;
 		}
 		if(pConsole->m_MouseIsPress)
 		{
-			ivec2 MouseRelease;
-			Input()->NativeMousePos(&MouseRelease.x, &MouseRelease.y);
-			pConsole->m_MouseRelease.x = (MouseRelease.x / (float)Graphics()->WindowWidth()) * Screen.w;
-			pConsole->m_MouseRelease.y = (MouseRelease.y / (float)Graphics()->WindowHeight()) * Screen.h;
+			pConsole->m_MouseRelease = GetMousePosition();
 		}
-		if(pConsole->m_MouseIsPress && !Input()->NativeMousePressed(1))
+		const float ScaledRowHeight = RowHeight / ScreenSize.y;
+		if(absolute(m_TouchState.m_ScrollAmount.y) >= ScaledRowHeight)
 		{
-			pConsole->m_MouseIsPress = false;
+			if(m_TouchState.m_ScrollAmount.y > 0.0f)
+			{
+				pConsole->m_BacklogCurLine += pConsole->GetLinesToScroll(-1, 1);
+				m_TouchState.m_ScrollAmount.y -= ScaledRowHeight;
+			}
+			else
+			{
+				--pConsole->m_BacklogCurLine;
+				if(pConsole->m_BacklogCurLine < 0)
+					pConsole->m_BacklogCurLine = 0;
+				m_TouchState.m_ScrollAmount.y += ScaledRowHeight;
+			}
+			pConsole->m_HasSelection = false;
 		}
 
 		x = Cursor.m_X;
@@ -1001,7 +1153,10 @@ void CGameConsole::OnRender()
 
 		// render console input (wrap line)
 		pConsole->m_Input.SetHidden(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed() && (pConsole->m_UserGot || !pConsole->m_UsernameReq));
-		pConsole->m_Input.Activate(EInputPriority::CONSOLE); // Ensure that the input is active
+		if(m_ConsoleState == CONSOLE_OPEN)
+		{
+			pConsole->m_Input.Activate(EInputPriority::CONSOLE); // Ensure that the input is active
+		}
 		const CUIRect InputCursorRect = {x, y + FONT_SIZE, 0.0f, 0.0f};
 		const bool WasChanged = pConsole->m_Input.WasChanged();
 		const bool WasCursorChanged = pConsole->m_Input.WasCursorChanged();
@@ -1034,7 +1189,10 @@ void CGameConsole::OnRender()
 			Info.m_pOffsetChange = &pConsole->m_CompletionRenderOffsetChange;
 			Info.m_Width = Screen.w;
 			Info.m_TotalWidth = 0.0f;
-			Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer;
+			char aCmd[IConsole::CMDLINE_LENGTH];
+			pConsole->GetCommand(pConsole->m_aCompletionBuffer, aCmd);
+			Info.m_pCurrentCmd = aCmd;
+
 			TextRender()->SetCursor(&Info.m_Cursor, InitialX - Info.m_Offset, InitialY + RowHeight + 2.0f, FONT_SIZE, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
 			Info.m_Cursor.m_LineWidth = std::numeric_limits<float>::max();
 			const int NumCommands = m_pConsole->PossibleCommands(Info.m_pCurrentCmd, pConsole->m_CompletionFlagmask, m_ConsoleType != CGameConsole::CONSOLETYPE_LOCAL && Client()->RconAuthed() && Client()->UseTempRconCommands(), PossibleCommandsRenderCallback, &Info);
@@ -1042,18 +1200,19 @@ void CGameConsole::OnRender()
 
 			if(NumCommands <= 0 && pConsole->m_IsCommand)
 			{
-				const bool TuningCompletion = IsTuningCommandPrefix(Info.m_pCurrentCmd);
-				const bool SettingCompletion = IsSettingCommandPrefix(Info.m_pCurrentCmd);
+				const auto [CompletionType, _] = ArgumentCompletion(Info.m_pCurrentCmd);
 				int NumArguments = 0;
-				if(TuningCompletion || SettingCompletion)
+				if(CompletionType != EArgumentCompletionType::NONE)
 				{
 					Info.m_WantedCompletion = pConsole->m_CompletionChosenArgument;
 					Info.m_TotalWidth = 0.0f;
 					Info.m_pCurrentCmd = pConsole->m_aCompletionBufferArgument;
-					if(TuningCompletion)
+					if(CompletionType == EArgumentCompletionType::TUNE)
 						NumArguments = PossibleTunings(Info.m_pCurrentCmd, PossibleCommandsRenderCallback, &Info);
-					else if(SettingCompletion)
+					else if(CompletionType == EArgumentCompletionType::SETTING)
 						NumArguments = m_pConsole->PossibleCommands(Info.m_pCurrentCmd, pConsole->m_CompletionFlagmask, m_ConsoleType != CGameConsole::CONSOLETYPE_LOCAL && Client()->RconAuthed() && Client()->UseTempRconCommands(), PossibleCommandsRenderCallback, &Info);
+					else if(CompletionType == EArgumentCompletionType::KEY)
+						NumArguments = PossibleKeys(Info.m_pCurrentCmd, Input(), PossibleCommandsRenderCallback, &Info);
 					pConsole->m_CompletionRenderOffset = Info.m_Offset;
 				}
 
@@ -1068,7 +1227,7 @@ void CGameConsole::OnRender()
 				}
 			}
 
-			UI()->DoSmoothScrollLogic(&pConsole->m_CompletionRenderOffset, &pConsole->m_CompletionRenderOffsetChange, Info.m_Width, Info.m_TotalWidth);
+			Ui()->DoSmoothScrollLogic(&pConsole->m_CompletionRenderOffset, &pConsole->m_CompletionRenderOffsetChange, Info.m_Width, Info.m_TotalWidth);
 		}
 		else if(pConsole->m_Searching && !pConsole->m_Input.IsEmpty())
 		{ // Render current match and match count
@@ -1088,9 +1247,20 @@ void CGameConsole::OnRender()
 		}
 
 		pConsole->PumpBacklogPending();
-		if(pConsole->m_NewLineCounter > 0)
+		if(pConsole->m_NewLineCounter != 0)
+		{
 			pConsole->UpdateSearch();
 
+			// keep scroll position when new entries are printed.
+			if(pConsole->m_BacklogCurLine != 0 || pConsole->m_HasSelection)
+			{
+				pConsole->m_BacklogCurLine += pConsole->m_NewLineCounter;
+				pConsole->m_BacklogLastActiveLine += pConsole->m_NewLineCounter;
+			}
+			if(pConsole->m_NewLineCounter < 0)
+				pConsole->m_NewLineCounter = 0;
+		}
+
 		// render console log (current entry, status, wrap lines)
 		CInstance::CBacklogEntry *pEntry = pConsole->m_Backlog.Last();
 		float OffsetY = 0.0f;
@@ -1108,11 +1278,9 @@ void CGameConsole::OnRender()
 
 		const float XScale = Graphics()->ScreenWidth() / Screen.w;
 		const float YScale = Graphics()->ScreenHeight() / Screen.h;
-		float CalcOffsetY = 0;
-		while(y - (CalcOffsetY + LineHeight) > RowHeight)
-			CalcOffsetY += LineHeight;
-		float ClipStartY = y - CalcOffsetY;
-		Graphics()->ClipEnable(0, ClipStartY * YScale, Screen.w * XScale, y * YScale - ClipStartY * YScale);
+		const float CalcOffsetY = LineHeight * std::floor((y - RowHeight) / LineHeight);
+		const float ClipStartY = (y - CalcOffsetY) * YScale;
+		Graphics()->ClipEnable(0, ClipStartY, Screen.w * XScale, y * YScale - ClipStartY);
 
 		while(pEntry)
 		{
@@ -1120,17 +1288,6 @@ void CGameConsole::OnRender()
 				pConsole->UpdateEntryTextAttributes(pEntry);
 
 			LineNum += pEntry->m_LineCount;
-			while(pConsole->m_NewLineCounter > 0)
-			{
-				--pConsole->m_NewLineCounter;
-
-				// keep scroll position when new entries are printed.
-				if(pConsole->m_BacklogCurLine != 0)
-				{
-					pConsole->m_BacklogCurLine++;
-					pConsole->m_BacklogLastActiveLine++;
-				}
-			}
 			if(LineNum < pConsole->m_BacklogLastActiveLine)
 			{
 				SkippedLines += pEntry->m_LineCount;
@@ -1141,28 +1298,27 @@ void CGameConsole::OnRender()
 
 			if(First)
 			{
-				int Diff = pConsole->m_BacklogLastActiveLine - SkippedLines;
-				OffsetY -= Diff * LineHeight - LINE_SPACING;
+				OffsetY -= (pConsole->m_BacklogLastActiveLine - SkippedLines) * LineHeight;
 			}
 
-			float LocalOffsetY = OffsetY + pEntry->m_YOffset / (float)pEntry->m_LineCount;
+			const float LocalOffsetY = OffsetY + pEntry->m_YOffset / (float)pEntry->m_LineCount;
 			OffsetY += pEntry->m_YOffset;
 
-			if((pConsole->m_HasSelection || pConsole->m_MouseIsPress) && pConsole->m_NewLineCounter > 0)
+			// Only apply offset if we do not keep scroll position (m_BacklogCurLine == 0)
+			if((pConsole->m_HasSelection || pConsole->m_MouseIsPress) && pConsole->m_NewLineCounter > 0 && pConsole->m_BacklogCurLine == 0)
 			{
-				float MouseExtraOff = pEntry->m_YOffset;
-				pConsole->m_MousePress.y -= MouseExtraOff;
+				pConsole->m_MousePress.y -= pEntry->m_YOffset;
 				if(!pConsole->m_MouseIsPress)
-					pConsole->m_MouseRelease.y -= MouseExtraOff;
+					pConsole->m_MouseRelease.y -= pEntry->m_YOffset;
 			}
 
 			// stop rendering when lines reach the top
-			bool Outside = y - OffsetY <= RowHeight;
-			int CanRenderOneLine = y - LocalOffsetY > RowHeight;
+			const bool Outside = y - OffsetY <= RowHeight;
+			const bool CanRenderOneLine = y - LocalOffsetY > RowHeight;
 			if(Outside && !CanRenderOneLine)
 				break;
 
-			int LinesNotRendered = pEntry->m_LineCount - minimum((int)std::floor((y - LocalOffsetY) / RowHeight), pEntry->m_LineCount);
+			const int LinesNotRendered = pEntry->m_LineCount - minimum((int)std::floor((y - LocalOffsetY) / RowHeight), pEntry->m_LineCount);
 			pConsole->m_LinesRendered -= LinesNotRendered;
 
 			TextRender()->SetCursor(&Cursor, 0.0f, y - OffsetY, FONT_SIZE, TEXTFLAG_RENDER);
@@ -1213,6 +1369,9 @@ void CGameConsole::OnRender()
 				pConsole->m_HasSelection = true;
 			}
 
+			if(pConsole->m_NewLineCounter > 0) // Decrease by the entry line count since we can have multiline entries
+				pConsole->m_NewLineCounter -= pEntry->m_LineCount;
+
 			pEntry = pConsole->m_Backlog.Prev(pEntry);
 
 			// reset color
@@ -1223,6 +1382,14 @@ void CGameConsole::OnRender()
 				break;
 		}
 
+		// Make sure to reset m_NewLineCounter when we are done drawing
+		// This is because otherwise, if many entries are printed at once while console is
+		// hidden, m_NewLineCounter will always be > 0 since the console won't be able to render
+		// them all, thus wont be able to decrease m_NewLineCounter to 0.
+		// This leads to an infinite increase of m_BacklogCurLine and m_BacklogLastActiveLine
+		// when we want to keep scroll position.
+		pConsole->m_NewLineCounter = 0;
+
 		Graphics()->ClipDisable();
 
 		pConsole->m_BacklogLastActiveLine = pConsole->m_BacklogCurLine;
@@ -1243,10 +1410,27 @@ void CGameConsole::OnRender()
 		str_format(aBuf, sizeof(aBuf), Localize("Lines %d - %d (%s)"), pConsole->m_BacklogCurLine + 1, pConsole->m_BacklogCurLine + pConsole->m_LinesRendered, pConsole->m_BacklogCurLine != 0 ? Localize("Locked") : Localize("Following"));
 		TextRender()->Text(10.0f, FONT_SIZE / 2.f, FONT_SIZE, aBuf);
 
+		if(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->ReceivingRconCommands())
+		{
+			float Percentage = Client()->GotRconCommandsPercentage();
+			SProgressSpinnerProperties ProgressProps;
+			ProgressProps.m_Progress = Percentage;
+			Ui()->RenderProgressSpinner(vec2(Screen.w / 4.0f + FONT_SIZE / 2.f, FONT_SIZE), FONT_SIZE / 2.f, ProgressProps);
+
+			char aLoading[128];
+			str_copy(aLoading, Localize("Loading commands…"));
+			if(Percentage > 0)
+			{
+				char aPercentage[8];
+				str_format(aPercentage, sizeof(aPercentage), " %d%%", (int)(Percentage * 100));
+				str_append(aLoading, aPercentage);
+			}
+			TextRender()->Text(Screen.w / 4.0f + FONT_SIZE + 2.0f, FONT_SIZE / 2.f, FONT_SIZE, aLoading);
+		}
+
 		// render version
 		str_copy(aBuf, "v" GAME_VERSION " on " CONF_PLATFORM_STRING " " CONF_ARCH_STRING);
-		float Width = TextRender()->TextWidth(FONT_SIZE, aBuf, -1, -1.0f);
-		TextRender()->Text(Screen.w - Width - 10.0f, FONT_SIZE / 2.f, FONT_SIZE, aBuf);
+		TextRender()->Text(Screen.w - TextRender()->TextWidth(FONT_SIZE, aBuf) - 10.0f, FONT_SIZE / 2.f, FONT_SIZE, aBuf);
 	}
 }
 
@@ -1295,13 +1479,14 @@ void CGameConsole::Toggle(int Type)
 
 		if(m_ConsoleState == CONSOLE_CLOSED || m_ConsoleState == CONSOLE_CLOSING)
 		{
-			UI()->SetEnabled(false);
+			Ui()->SetEnabled(false);
 			m_ConsoleState = CONSOLE_OPENING;
 		}
 		else
 		{
+			ConsoleForType(Type)->m_Input.Deactivate();
 			Input()->MouseModeRelative();
-			UI()->SetEnabled(true);
+			Ui()->SetEnabled(true);
 			m_pClient->OnRelease();
 			m_ConsoleState = CONSOLE_CLOSING;
 		}
@@ -1309,32 +1494,6 @@ void CGameConsole::Toggle(int Type)
 	m_ConsoleType = Type;
 }
 
-void CGameConsole::Dump(int Type)
-{
-	CInstance *pConsole = Type == CONSOLETYPE_REMOTE ? &m_RemoteConsole : &m_LocalConsole;
-	char aBuf[IO_MAX_PATH_LENGTH + 64];
-	char aFilename[IO_MAX_PATH_LENGTH];
-	str_timestamp(aBuf, sizeof(aBuf));
-	str_format(aFilename, sizeof(aFilename), "dumps/%s_dump_%s.txt", pConsole->m_pName, aBuf);
-	IOHANDLE File = Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
-	if(File)
-	{
-		pConsole->PumpBacklogPending();
-		for(CInstance::CBacklogEntry *pEntry = pConsole->m_Backlog.First(); pEntry; pEntry = pConsole->m_Backlog.Next(pEntry))
-		{
-			io_write(File, pEntry->m_aText, pEntry->m_Length);
-			io_write_newline(File);
-		}
-		io_close(File);
-		str_format(aBuf, sizeof(aBuf), "%s contents were written to '%s'", pConsole->m_pName, aFilename);
-	}
-	else
-	{
-		str_format(aBuf, sizeof(aBuf), "Failed to open '%s'", aFilename);
-	}
-	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
-}
-
 void CGameConsole::ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData)
 {
 	((CGameConsole *)pUserData)->Toggle(CONSOLETYPE_LOCAL);
@@ -1357,12 +1516,12 @@ void CGameConsole::ConClearRemoteConsole(IConsole::IResult *pResult, void *pUser
 
 void CGameConsole::ConDumpLocalConsole(IConsole::IResult *pResult, void *pUserData)
 {
-	((CGameConsole *)pUserData)->Dump(CONSOLETYPE_LOCAL);
+	((CGameConsole *)pUserData)->m_LocalConsole.Dump();
 }
 
 void CGameConsole::ConDumpRemoteConsole(IConsole::IResult *pResult, void *pUserData)
 {
-	((CGameConsole *)pUserData)->Dump(CONSOLETYPE_REMOTE);
+	((CGameConsole *)pUserData)->m_RemoteConsole.Dump();
 }
 
 void CGameConsole::ConConsolePageUp(IConsole::IResult *pResult, void *pUserData)
@@ -1442,7 +1601,7 @@ void CGameConsole::OnInit()
 
 void CGameConsole::OnStateChange(int NewState, int OldState)
 {
-	if(OldState == IClient::STATE_ONLINE && NewState < IClient::STATE_LOADING)
+	if(OldState <= IClient::STATE_ONLINE && NewState == IClient::STATE_OFFLINE)
 	{
 		m_RemoteConsole.m_UserGot = false;
 		m_RemoteConsole.m_aUser[0] = '\0';
diff --git a/src/game/client/components/console.h b/src/game/client/components/console.h
index 66e3c90e0b..e8ab47900f 100644
--- a/src/game/client/components/console.h
+++ b/src/game/client/components/console.h
@@ -10,6 +10,7 @@
 
 #include <game/client/component.h>
 #include <game/client/lineinput.h>
+#include <game/client/ui.h>
 
 enum
 {
@@ -68,6 +69,9 @@ class CGameConsole : public CComponent
 		int m_CompletionFlagmask;
 		float m_CompletionRenderOffset;
 		float m_CompletionRenderOffsetChange;
+		int m_CompletionArgumentPosition;
+		int m_CompletionCommandStart = 0;
+		int m_CompletionCommandEnd = 0;
 
 		char m_aUser[32];
 		bool m_UserGot;
@@ -109,8 +113,22 @@ class CGameConsole : public CComponent
 		int GetLinesToScroll(int Direction, int LinesToScroll);
 		void ScrollToCenter(int StartLine, int EndLine);
 		void ClearSearch();
+		void Dump() REQUIRES(!m_BacklogPendingLock);
 
 		const char *GetString() const { return m_Input.GetString(); }
+		/**
+		 * Gets the command at the current cursor including surrounding spaces.
+		 * Commands are split by semicolons.
+		 *
+		 * So if the current console input is for example "hello; world ;foo"
+		 *                                                        ^
+		 *                   and the cursor is here  -------------/
+		 * The result would be " world "
+		 *
+		 * @param pInput the console input line
+		 * @param aCmd the command the cursor is at
+		 */
+		void GetCommand(const char *pInput, char (&aCmd)[IConsole::CMDLINE_LENGTH]);
 		static void PossibleCommandsCompleteCallback(int Index, const char *pStr, void *pUser);
 		static void PossibleArgumentsCompleteCallback(int Index, const char *pStr, void *pUser);
 
@@ -128,6 +146,7 @@ class CGameConsole : public CComponent
 	CInstance m_LocalConsole;
 	CInstance m_RemoteConsole;
 
+	CInstance *ConsoleForType(int ConsoleType);
 	CInstance *CurrentConsole();
 
 	int m_ConsoleType;
@@ -136,13 +155,11 @@ class CGameConsole : public CComponent
 	float m_StateChangeDuration;
 
 	bool m_WantsSelectionCopy = false;
+	CUi::CTouchState m_TouchState;
 
 	static const ColorRGBA ms_SearchHighlightColor;
 	static const ColorRGBA ms_SearchSelectedColor;
 
-	void Toggle(int Type);
-	void Dump(int Type);
-
 	static void PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser);
 	static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData);
 	static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData);
@@ -177,6 +194,7 @@ class CGameConsole : public CComponent
 	virtual bool OnInput(const IInput::CEvent &Event) override;
 	void Prompt(char (&aPrompt)[32]);
 
+	void Toggle(int Type);
 	bool IsClosed() { return m_ConsoleState == CONSOLE_CLOSED; }
 };
 #endif
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index f72cce98f7..fffb564d89 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/math.h>
 
+#include <engine/client.h>
 #include <engine/shared/config.h>
 
 #include <game/client/components/camera.h>
@@ -18,9 +19,6 @@
 CControls::CControls()
 {
 	mem_zero(&m_aLastData, sizeof(m_aLastData));
-	m_LastDummy = 0;
-	m_OtherFire = 0;
-
 	mem_zero(m_aMousePos, sizeof(m_aMousePos));
 	mem_zero(m_aMousePosOnAction, sizeof(m_aMousePosOnAction));
 	mem_zero(m_aTargetPos, sizeof(m_aTargetPos));
@@ -33,13 +31,13 @@ void CControls::OnReset()
 
 	for(int &AmmoCount : m_aAmmoCount)
 		AmmoCount = 0;
-	m_OldMouseX = m_OldMouseY = 0.0f;
+
+	m_LastSendTime = 0;
 }
 
 void CControls::ResetInput(int Dummy)
 {
 	m_aLastData[Dummy].m_Direction = 0;
-	//m_aLastData[Dummy].m_Hook = 0;
 	// simulate releasing the fire button
 	if((m_aLastData[Dummy].m_Fire & 1) != 0)
 		m_aLastData[Dummy].m_Fire++;
@@ -51,11 +49,6 @@ void CControls::ResetInput(int Dummy)
 	m_aInputDirectionRight[Dummy] = 0;
 }
 
-void CControls::OnRelease()
-{
-	//OnReset();
-}
-
 void CControls::OnPlayerDeath()
 {
 	for(int &AmmoCount : m_aAmmoCount)
@@ -65,8 +58,7 @@ void CControls::OnPlayerDeath()
 struct CInputState
 {
 	CControls *m_pControls;
-	int *m_pVariable1;
-	int *m_pVariable2;
+	int *m_apVariables[NUM_DUMMIES];
 };
 
 static void ConKeyInputState(IConsole::IResult *pResult, void *pUserData)
@@ -76,10 +68,7 @@ static void ConKeyInputState(IConsole::IResult *pResult, void *pUserData)
 	if(pState->m_pControls->GameClient()->m_GameInfo.m_BugDDRaceInput && pState->m_pControls->GameClient()->m_Snap.m_SpecInfo.m_Active)
 		return;
 
-	if(g_Config.m_ClDummy)
-		*pState->m_pVariable2 = pResult->GetInteger(0);
-	else
-		*pState->m_pVariable1 = pResult->GetInteger(0);
+	*pState->m_apVariables[g_Config.m_ClDummy] = pResult->GetInteger(0);
 }
 
 static void ConKeyInputCounter(IConsole::IResult *pResult, void *pUserData)
@@ -89,22 +78,16 @@ static void ConKeyInputCounter(IConsole::IResult *pResult, void *pUserData)
 	if(pState->m_pControls->GameClient()->m_GameInfo.m_BugDDRaceInput && pState->m_pControls->GameClient()->m_Snap.m_SpecInfo.m_Active)
 		return;
 
-	int *v;
-	if(g_Config.m_ClDummy)
-		v = pState->m_pVariable2;
-	else
-		v = pState->m_pVariable1;
-
-	if(((*v) & 1) != pResult->GetInteger(0))
-		(*v)++;
-	*v &= INPUT_STATE_MASK;
+	int *pVariable = pState->m_apVariables[g_Config.m_ClDummy];
+	if(((*pVariable) & 1) != pResult->GetInteger(0))
+		(*pVariable)++;
+	*pVariable &= INPUT_STATE_MASK;
 }
 
 struct CInputSet
 {
 	CControls *m_pControls;
-	int *m_pVariable1;
-	int *m_pVariable2;
+	int *m_apVariables[NUM_DUMMIES];
 	int m_Value;
 };
 
@@ -113,10 +96,7 @@ static void ConKeyInputSet(IConsole::IResult *pResult, void *pUserData)
 	CInputSet *pSet = (CInputSet *)pUserData;
 	if(pResult->GetInteger(0))
 	{
-		if(g_Config.m_ClDummy)
-			*pSet->m_pVariable2 = pSet->m_Value;
-		else
-			*pSet->m_pVariable1 = pSet->m_Value;
+		*pSet->m_apVariables[g_Config.m_ClDummy] = pSet->m_Value;
 	}
 }
 
@@ -131,58 +111,58 @@ void CControls::OnConsoleInit()
 {
 	// game commands
 	{
-		static CInputState s_State = {this, &m_aInputDirectionLeft[0], &m_aInputDirectionLeft[1]};
-		Console()->Register("+left", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Move left");
+		static CInputState s_State = {this, {&m_aInputDirectionLeft[0], &m_aInputDirectionLeft[1]}};
+		Console()->Register("+left", "", CFGFLAG_CLIENT, ConKeyInputState, &s_State, "Move left");
 	}
 	{
-		static CInputState s_State = {this, &m_aInputDirectionRight[0], &m_aInputDirectionRight[1]};
-		Console()->Register("+right", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Move right");
+		static CInputState s_State = {this, {&m_aInputDirectionRight[0], &m_aInputDirectionRight[1]}};
+		Console()->Register("+right", "", CFGFLAG_CLIENT, ConKeyInputState, &s_State, "Move right");
 	}
 	{
-		static CInputState s_State = {this, &m_aInputData[0].m_Jump, &m_aInputData[1].m_Jump};
-		Console()->Register("+jump", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Jump");
+		static CInputState s_State = {this, {&m_aInputData[0].m_Jump, &m_aInputData[1].m_Jump}};
+		Console()->Register("+jump", "", CFGFLAG_CLIENT, ConKeyInputState, &s_State, "Jump");
 	}
 	{
-		static CInputState s_State = {this, &m_aInputData[0].m_Hook, &m_aInputData[1].m_Hook};
-		Console()->Register("+hook", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Hook");
+		static CInputState s_State = {this, {&m_aInputData[0].m_Hook, &m_aInputData[1].m_Hook}};
+		Console()->Register("+hook", "", CFGFLAG_CLIENT, ConKeyInputState, &s_State, "Hook");
 	}
 	{
-		static CInputState s_State = {this, &m_aInputData[0].m_Fire, &m_aInputData[1].m_Fire};
-		Console()->Register("+fire", "", CFGFLAG_CLIENT, ConKeyInputCounter, (void *)&s_State, "Fire");
+		static CInputState s_State = {this, {&m_aInputData[0].m_Fire, &m_aInputData[1].m_Fire}};
+		Console()->Register("+fire", "", CFGFLAG_CLIENT, ConKeyInputCounter, &s_State, "Fire");
 	}
 	{
-		static CInputState s_State = {this, &m_aShowHookColl[0], &m_aShowHookColl[1]};
-		Console()->Register("+showhookcoll", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Show Hook Collision");
+		static CInputState s_State = {this, {&m_aShowHookColl[0], &m_aShowHookColl[1]}};
+		Console()->Register("+showhookcoll", "", CFGFLAG_CLIENT, ConKeyInputState, &s_State, "Show Hook Collision");
 	}
 
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 1};
-		Console()->Register("+weapon1", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to hammer");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon}, 1};
+		Console()->Register("+weapon1", "", CFGFLAG_CLIENT, ConKeyInputSet, &s_Set, "Switch to hammer");
 	}
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 2};
-		Console()->Register("+weapon2", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to gun");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon}, 2};
+		Console()->Register("+weapon2", "", CFGFLAG_CLIENT, ConKeyInputSet, &s_Set, "Switch to gun");
 	}
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 3};
-		Console()->Register("+weapon3", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to shotgun");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon}, 3};
+		Console()->Register("+weapon3", "", CFGFLAG_CLIENT, ConKeyInputSet, &s_Set, "Switch to shotgun");
 	}
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 4};
-		Console()->Register("+weapon4", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to grenade");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon}, 4};
+		Console()->Register("+weapon4", "", CFGFLAG_CLIENT, ConKeyInputSet, &s_Set, "Switch to grenade");
 	}
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 5};
-		Console()->Register("+weapon5", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to laser");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon}, 5};
+		Console()->Register("+weapon5", "", CFGFLAG_CLIENT, ConKeyInputSet, &s_Set, "Switch to laser");
 	}
 
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_NextWeapon, &m_aInputData[1].m_NextWeapon, 0};
-		Console()->Register("+nextweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, (void *)&s_Set, "Switch to next weapon");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_NextWeapon, &m_aInputData[1].m_NextWeapon}, 0};
+		Console()->Register("+nextweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, &s_Set, "Switch to next weapon");
 	}
 	{
-		static CInputSet s_Set = {this, &m_aInputData[0].m_PrevWeapon, &m_aInputData[1].m_PrevWeapon, 0};
-		Console()->Register("+prevweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, (void *)&s_Set, "Switch to previous weapon");
+		static CInputSet s_Set = {this, {&m_aInputData[0].m_PrevWeapon, &m_aInputData[1].m_PrevWeapon}, 0};
+		Console()->Register("+prevweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, &s_Set, "Switch to previous weapon");
 	}
 }
 
@@ -200,9 +180,6 @@ void CControls::OnMessage(int Msg, void *pRawMsg)
 
 int CControls::SnapInput(int *pData)
 {
-	static int64_t LastSendTime = 0;
-	bool Send = false;
-
 	// update player state
 	if(m_pClient->m_Chat.IsActive())
 		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags = PLAYERFLAG_CHATTING;
@@ -214,11 +191,10 @@ int CControls::SnapInput(int *pData)
 	if(m_pClient->m_Scoreboard.Active())
 		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags |= PLAYERFLAG_SCOREBOARD;
 
-	if(m_pClient->m_Controls.m_aShowHookColl[g_Config.m_ClDummy])
+	if(m_pClient->m_Controls.m_aShowHookColl[g_Config.m_ClDummy] && Client()->ServerCapAnyPlayerFlag())
 		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags |= PLAYERFLAG_AIM;
 
-	if(m_aLastData[g_Config.m_ClDummy].m_PlayerFlags != m_aInputData[g_Config.m_ClDummy].m_PlayerFlags)
-		Send = true;
+	bool Send = m_aLastData[g_Config.m_ClDummy].m_PlayerFlags != m_aInputData[g_Config.m_ClDummy].m_PlayerFlags;
 
 	m_aLastData[g_Config.m_ClDummy].m_PlayerFlags = m_aInputData[g_Config.m_ClDummy].m_PlayerFlags;
 
@@ -235,22 +211,26 @@ int CControls::SnapInput(int *pData)
 		m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePos[g_Config.m_ClDummy].x;
 		m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePos[g_Config.m_ClDummy].y;
 
+		// scale TargetX, TargetY by zoom.
+		if(!m_pClient->m_Snap.m_SpecInfo.m_Active)
+		{
+			m_aInputData[g_Config.m_ClDummy].m_TargetX *= m_pClient->m_Camera.m_Zoom;
+			m_aInputData[g_Config.m_ClDummy].m_TargetY *= m_pClient->m_Camera.m_Zoom;
+		}
+
 		// send once a second just to be sure
-		if(time_get() > LastSendTime + time_freq())
-			Send = true;
+		Send = Send || time_get() > m_LastSendTime + time_freq();
 	}
 	else
 	{
 		m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePos[g_Config.m_ClDummy].x;
 		m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePos[g_Config.m_ClDummy].y;
 
-		if(g_Config.m_ClSubTickAiming && m_aMousePosOnAction[g_Config.m_ClDummy].x != 0 && m_aMousePosOnAction[g_Config.m_ClDummy].y != 0)
+		if(g_Config.m_ClSubTickAiming && m_aMousePosOnAction[g_Config.m_ClDummy] != vec2(0.0f, 0.0f))
 		{
 			m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePosOnAction[g_Config.m_ClDummy].x;
 			m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePosOnAction[g_Config.m_ClDummy].y;
-
-			m_aMousePosOnAction[g_Config.m_ClDummy].x = 0;
-			m_aMousePosOnAction[g_Config.m_ClDummy].y = 0;
+			m_aMousePosOnAction[g_Config.m_ClDummy] = vec2(0.0f, 0.0f);
 		}
 
 		if(!m_aInputData[g_Config.m_ClDummy].m_TargetX && !m_aInputData[g_Config.m_ClDummy].m_TargetY)
@@ -285,7 +265,9 @@ int CControls::SnapInput(int *pData)
 			pDummyInput->m_TargetY = m_aInputData[g_Config.m_ClDummy].m_TargetY;
 			pDummyInput->m_WantedWeapon = m_aInputData[g_Config.m_ClDummy].m_WantedWeapon;
 
-			pDummyInput->m_Fire += m_aInputData[g_Config.m_ClDummy].m_Fire - m_aLastData[g_Config.m_ClDummy].m_Fire;
+			if(!g_Config.m_ClDummyControl)
+				pDummyInput->m_Fire += m_aInputData[g_Config.m_ClDummy].m_Fire - m_aLastData[g_Config.m_ClDummy].m_Fire;
+
 			pDummyInput->m_NextWeapon += m_aInputData[g_Config.m_ClDummy].m_NextWeapon - m_aLastData[g_Config.m_ClDummy].m_NextWeapon;
 			pDummyInput->m_PrevWeapon += m_aInputData[g_Config.m_ClDummy].m_PrevWeapon - m_aLastData[g_Config.m_ClDummy].m_PrevWeapon;
 
@@ -296,7 +278,12 @@ int CControls::SnapInput(int *pData)
 		{
 			CNetObj_PlayerInput *pDummyInput = &m_pClient->m_DummyInput;
 			pDummyInput->m_Jump = g_Config.m_ClDummyJump;
-			pDummyInput->m_Fire = g_Config.m_ClDummyFire;
+
+			if(g_Config.m_ClDummyFire)
+				pDummyInput->m_Fire = g_Config.m_ClDummyFire;
+			else if((pDummyInput->m_Fire & 1) != 0)
+				pDummyInput->m_Fire++;
+
 			pDummyInput->m_Hook = g_Config.m_ClDummyHook;
 		}
 
@@ -317,27 +304,15 @@ int CControls::SnapInput(int *pData)
 		}
 #endif
 		// check if we need to send input
-		if(m_aInputData[g_Config.m_ClDummy].m_Direction != m_aLastData[g_Config.m_ClDummy].m_Direction)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_Jump != m_aLastData[g_Config.m_ClDummy].m_Jump)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_Fire != m_aLastData[g_Config.m_ClDummy].m_Fire)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_Hook != m_aLastData[g_Config.m_ClDummy].m_Hook)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_WantedWeapon != m_aLastData[g_Config.m_ClDummy].m_WantedWeapon)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_NextWeapon != m_aLastData[g_Config.m_ClDummy].m_NextWeapon)
-			Send = true;
-		else if(m_aInputData[g_Config.m_ClDummy].m_PrevWeapon != m_aLastData[g_Config.m_ClDummy].m_PrevWeapon)
-			Send = true;
-
-		// send at at least 10hz
-		if(time_get() > LastSendTime + time_freq() / 25)
-			Send = true;
-
-		if(m_pClient->m_Snap.m_pLocalCharacter && m_pClient->m_Snap.m_pLocalCharacter->m_Weapon == WEAPON_NINJA && (m_aInputData[g_Config.m_ClDummy].m_Direction || m_aInputData[g_Config.m_ClDummy].m_Jump || m_aInputData[g_Config.m_ClDummy].m_Hook))
-			Send = true;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_Direction != m_aLastData[g_Config.m_ClDummy].m_Direction;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_Jump != m_aLastData[g_Config.m_ClDummy].m_Jump;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_Fire != m_aLastData[g_Config.m_ClDummy].m_Fire;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_Hook != m_aLastData[g_Config.m_ClDummy].m_Hook;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_WantedWeapon != m_aLastData[g_Config.m_ClDummy].m_WantedWeapon;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_NextWeapon != m_aLastData[g_Config.m_ClDummy].m_NextWeapon;
+		Send = Send || m_aInputData[g_Config.m_ClDummy].m_PrevWeapon != m_aLastData[g_Config.m_ClDummy].m_PrevWeapon;
+		Send = Send || time_get() > m_LastSendTime + time_freq() / 25; // send at least 10hz
+		Send = Send || (m_pClient->m_Snap.m_pLocalCharacter && m_pClient->m_Snap.m_pLocalCharacter->m_Weapon == WEAPON_NINJA && (m_aInputData[g_Config.m_ClDummy].m_Direction || m_aInputData[g_Config.m_ClDummy].m_Jump || m_aInputData[g_Config.m_ClDummy].m_Hook));
 	}
 
 	// copy and return size
@@ -346,13 +321,16 @@ int CControls::SnapInput(int *pData)
 	if(!Send)
 		return 0;
 
-	LastSendTime = time_get();
+	m_LastSendTime = time_get();
 	mem_copy(pData, &m_aInputData[g_Config.m_ClDummy], sizeof(m_aInputData[0]));
 	return sizeof(m_aInputData[0]);
 }
 
 void CControls::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(g_Config.m_ClAutoswitchWeaponsOutOfAmmo && !GameClient()->m_GameInfo.m_UnlimitedAmmo && m_pClient->m_Snap.m_pLocalCharacter)
 	{
 		// Keep track of ammo count, we know weapon ammo only when we switch to that weapon, this is tracked on server and protocol does not track that
@@ -363,16 +341,16 @@ void CControls::OnRender()
 			m_pClient->m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_HAMMER &&
 			m_pClient->m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_NINJA)
 		{
-			int w;
-			for(w = WEAPON_LASER; w > WEAPON_GUN; w--)
+			int Weapon;
+			for(Weapon = WEAPON_LASER; Weapon > WEAPON_GUN; Weapon--)
 			{
-				if(w == m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
+				if(Weapon == m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
 					continue;
-				if(m_aAmmoCount[w] > 0)
+				if(m_aAmmoCount[Weapon] > 0)
 					break;
 			}
-			if(w != m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
-				m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = w + 1;
+			if(Weapon != m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
+				m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = Weapon + 1;
 		}
 	}
 
@@ -392,9 +370,9 @@ bool CControls::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 
 	if(CursorType == IInput::CURSOR_JOYSTICK && g_Config.m_InpControllerAbsolute && m_pClient->m_Snap.m_pGameInfoObj && !m_pClient->m_Snap.m_SpecInfo.m_Active)
 	{
-		float AbsX = 0.0f, AbsY = 0.0f;
-		if(Input()->GetActiveJoystick()->Absolute(&AbsX, &AbsY))
-			m_aMousePos[g_Config.m_ClDummy] = vec2(AbsX, AbsY) * GetMaxMouseDistance();
+		vec2 AbsoluteDirection;
+		if(Input()->GetActiveJoystick()->Absolute(&AbsoluteDirection.x, &AbsoluteDirection.y))
+			m_aMousePos[g_Config.m_ClDummy] = AbsoluteDirection * GetMaxMouseDistance();
 		return true;
 	}
 
@@ -420,7 +398,7 @@ bool CControls::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 		}
 	}
 
-	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID < 0)
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorId < 0)
 		Factor *= m_pClient->m_Camera.m_Zoom;
 
 	m_aMousePos[g_Config.m_ClDummy] += vec2(x, y) * Factor;
@@ -430,32 +408,36 @@ bool CControls::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 
 void CControls::ClampMousePos()
 {
-	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID < 0)
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorId < 0)
 	{
 		m_aMousePos[g_Config.m_ClDummy].x = clamp(m_aMousePos[g_Config.m_ClDummy].x, -201.0f * 32, (Collision()->GetWidth() + 201.0f) * 32.0f);
 		m_aMousePos[g_Config.m_ClDummy].y = clamp(m_aMousePos[g_Config.m_ClDummy].y, -201.0f * 32, (Collision()->GetHeight() + 201.0f) * 32.0f);
 	}
 	else
 	{
-		float MouseMax = GetMaxMouseDistance();
-		float MinDistance = g_Config.m_ClDyncam ? g_Config.m_ClDyncamMinDistance : g_Config.m_ClMouseMinDistance;
-		float MouseMin = MinDistance;
+		const float MouseMin = GetMinMouseDistance();
+		const float MouseMax = GetMaxMouseDistance();
 
-		float MDistance = length(m_aMousePos[g_Config.m_ClDummy]);
-		if(MDistance < 0.001f)
+		float MouseDistance = length(m_aMousePos[g_Config.m_ClDummy]);
+		if(MouseDistance < 0.001f)
 		{
 			m_aMousePos[g_Config.m_ClDummy].x = 0.001f;
 			m_aMousePos[g_Config.m_ClDummy].y = 0;
-			MDistance = 0.001f;
+			MouseDistance = 0.001f;
 		}
-		if(MDistance < MouseMin)
-			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MDistance) * MouseMin;
-		MDistance = length(m_aMousePos[g_Config.m_ClDummy]);
-		if(MDistance > MouseMax)
-			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MDistance) * MouseMax;
+		if(MouseDistance < MouseMin)
+			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MouseDistance) * MouseMin;
+		MouseDistance = length(m_aMousePos[g_Config.m_ClDummy]);
+		if(MouseDistance > MouseMax)
+			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MouseDistance) * MouseMax;
 	}
 }
 
+float CControls::GetMinMouseDistance() const
+{
+	return g_Config.m_ClDyncam ? g_Config.m_ClDyncamMinDistance : g_Config.m_ClMouseMinDistance;
+}
+
 float CControls::GetMaxMouseDistance() const
 {
 	float CameraMaxDistance = 200.0f;
diff --git a/src/game/client/components/controls.h b/src/game/client/components/controls.h
index 67323a12a3..ce6bc664dd 100644
--- a/src/game/client/components/controls.h
+++ b/src/game/client/components/controls.h
@@ -12,30 +12,27 @@
 
 class CControls : public CComponent
 {
+	float GetMinMouseDistance() const;
 	float GetMaxMouseDistance() const;
 
 public:
 	vec2 m_aMousePos[NUM_DUMMIES];
 	vec2 m_aMousePosOnAction[NUM_DUMMIES];
 	vec2 m_aTargetPos[NUM_DUMMIES];
-	float m_OldMouseX;
-	float m_OldMouseY;
 
 	int m_aAmmoCount[NUM_WEAPONS];
 
+	int64_t m_LastSendTime;
 	CNetObj_PlayerInput m_aInputData[NUM_DUMMIES];
 	CNetObj_PlayerInput m_aLastData[NUM_DUMMIES];
 	int m_aInputDirectionLeft[NUM_DUMMIES];
 	int m_aInputDirectionRight[NUM_DUMMIES];
 	int m_aShowHookColl[NUM_DUMMIES];
-	int m_LastDummy;
-	int m_OtherFire;
 
 	CControls();
 	virtual int Sizeof() const override { return sizeof(*this); }
 
 	virtual void OnReset() override;
-	virtual void OnRelease() override;
 	virtual void OnRender() override;
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
 	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
diff --git a/src/game/client/components/countryflags.cpp b/src/game/client/components/countryflags.cpp
index 1f28a4bc5f..b05778596e 100644
--- a/src/game/client/components/countryflags.cpp
+++ b/src/game/client/components/countryflags.cpp
@@ -16,8 +16,8 @@
 void CCountryFlags::LoadCountryflagsIndexfile()
 {
 	const char *pFilename = "countryflags/index.txt";
-	IOHANDLE File = Storage()->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!File)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(Storage()->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
 		char aBuf[128];
 		str_format(aBuf, sizeof(aBuf), "couldn't open index file '%s'", pFilename);
@@ -26,16 +26,13 @@ void CCountryFlags::LoadCountryflagsIndexfile()
 	}
 
 	char aOrigin[128];
-	CLineReader LineReader;
-	LineReader.Init(File);
-	char *pLine;
-	while((pLine = LineReader.Get()))
+	while(const char *pLine = LineReader.Get())
 	{
 		if(!str_length(pLine) || pLine[0] == '#') // skip empty lines and comments
 			continue;
 
 		str_copy(aOrigin, pLine);
-		char *pReplacement = LineReader.Get();
+		const char *pReplacement = LineReader.Get();
 		if(!pReplacement)
 		{
 			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", "unexpected end of index file");
@@ -63,7 +60,7 @@ void CCountryFlags::LoadCountryflagsIndexfile()
 		char aBuf[128];
 		CImageInfo Info;
 		str_format(aBuf, sizeof(aBuf), "countryflags/%s.png", aOrigin);
-		if(!Graphics()->LoadPNG(&Info, aBuf, IStorage::TYPE_ALL))
+		if(!Graphics()->LoadPng(Info, aBuf, IStorage::TYPE_ALL))
 		{
 			char aMsg[128];
 			str_format(aMsg, sizeof(aMsg), "failed to load '%s'", aBuf);
@@ -75,8 +72,7 @@ void CCountryFlags::LoadCountryflagsIndexfile()
 		CCountryFlag CountryFlag;
 		CountryFlag.m_CountryCode = CountryCode;
 		str_copy(CountryFlag.m_aCountryCodeString, aOrigin);
-		CountryFlag.m_Texture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0, aOrigin);
-		Graphics()->FreePNG(&Info);
+		CountryFlag.m_Texture = Graphics()->LoadTextureRawMove(Info, 0, aBuf);
 
 		if(g_Config.m_Debug)
 		{
@@ -85,7 +81,7 @@ void CCountryFlags::LoadCountryflagsIndexfile()
 		}
 		m_vCountryFlags.push_back(CountryFlag);
 	}
-	io_close(File);
+
 	std::sort(m_vCountryFlags.begin(), m_vCountryFlags.end());
 
 	// find index of default item
diff --git a/src/game/client/components/countryflags.h b/src/game/client/components/countryflags.h
index d928e8d3b0..9af9302d6e 100644
--- a/src/game/client/components/countryflags.h
+++ b/src/game/client/components/countryflags.h
@@ -3,6 +3,7 @@
 #ifndef GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
 #define GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
 
+#include <engine/graphics.h>
 #include <game/client/component.h>
 #include <vector>
 
diff --git a/src/game/client/components/damageind.cpp b/src/game/client/components/damageind.cpp
index aeed8b0d09..0ac462da08 100644
--- a/src/game/client/components/damageind.cpp
+++ b/src/game/client/components/damageind.cpp
@@ -12,90 +12,67 @@
 
 CDamageInd::CDamageInd()
 {
-	m_Lastupdate = 0;
 	m_NumItems = 0;
 }
 
-CDamageInd::CItem *CDamageInd::CreateI()
+void CDamageInd::Create(vec2 Pos, vec2 Dir, float Alpha)
 {
-	if(m_NumItems < MAX_ITEMS)
-	{
-		CItem *p = &m_aItems[m_NumItems];
-		m_NumItems++;
-		return p;
-	}
-	return 0;
-}
+	if(m_NumItems >= MAX_ITEMS)
+		return;
 
-void CDamageInd::DestroyI(CDamageInd::CItem *pItem)
-{
-	m_NumItems--;
-	*pItem = m_aItems[m_NumItems];
+	CItem *pItem = &m_aItems[m_NumItems];
+	pItem->m_Pos = Pos;
+	pItem->m_Dir = -Dir;
+	pItem->m_RemainingLife = 0.75f;
+	pItem->m_StartAngle = -random_angle();
+	pItem->m_Color = ColorRGBA(1.0f, 1.0f, 1.0f, Alpha);
+	++m_NumItems;
 }
 
-void CDamageInd::CreateDamageInd(vec2 Pos, float Angle, float Alpha, int Amount)
+void CDamageInd::OnRender()
 {
-	float a = 3 * pi / 2 + Angle;
-	float s = a - pi / 3;
-	float e = a + pi / 3;
-	for(int i = 0; i < Amount; i++)
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	static float s_LastLocalTime = LocalTime();
+	float LifeAdjustment;
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
 	{
-		float f = mix(s, e, (i + 1) / (float)(Amount + 2));
-		Create(Pos, direction(f), Alpha);
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		if(pInfo->m_Paused)
+			LifeAdjustment = 0.0f;
+		else
+			LifeAdjustment = (LocalTime() - s_LastLocalTime) * pInfo->m_Speed;
 	}
-}
-
-void CDamageInd::Create(vec2 Pos, vec2 Dir, float Alpha)
-{
-	CItem *pItem = CreateI();
-	if(pItem)
+	else
 	{
-		pItem->m_Pos = Pos;
-		pItem->m_StartTime = LocalTime();
-		pItem->m_Dir = -Dir;
-		pItem->m_StartAngle = -random_angle();
-		pItem->m_Color = ColorRGBA(1.0f, 1.0f, 1.0f, Alpha);
-		pItem->m_StartAlpha = Alpha;
+		const auto &pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
+		if(pGameInfoObj && pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+			LifeAdjustment = 0.0f;
+		else
+			LifeAdjustment = LocalTime() - s_LastLocalTime;
 	}
-}
+	s_LastLocalTime = LocalTime();
 
-void CDamageInd::OnRender()
-{
 	Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteStars[0]);
-	static float s_LastLocalTime = LocalTime();
 	for(int i = 0; i < m_NumItems;)
 	{
-		if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		m_aItems[i].m_RemainingLife -= LifeAdjustment;
+		if(m_aItems[i].m_RemainingLife < 0.0f)
 		{
-			const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
-			if(pInfo->m_Paused)
-				m_aItems[i].m_StartTime += LocalTime() - s_LastLocalTime;
-			else
-				m_aItems[i].m_StartTime += (LocalTime() - s_LastLocalTime) * (1.0f - pInfo->m_Speed);
+			--m_NumItems;
+			m_aItems[i] = m_aItems[m_NumItems];
 		}
 		else
 		{
-			if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
-				m_aItems[i].m_StartTime += LocalTime() - s_LastLocalTime;
-		}
-
-		float Life = 0.75f - (LocalTime() - m_aItems[i].m_StartTime);
-		if(Life < 0.0f)
-			DestroyI(&m_aItems[i]);
-		else
-		{
-			vec2 Pos = mix(m_aItems[i].m_Pos + m_aItems[i].m_Dir * 75.0f, m_aItems[i].m_Pos, clamp((Life - 0.60f) / 0.15f, 0.0f, 1.0f));
-			ColorRGBA Color = m_aItems[i].m_Color;
-
-			Color.a = m_aItems[i].m_StartAlpha * fmin(1, Life / 0.1f);
-
-			Graphics()->SetColor(Color);
-			Graphics()->QuadsSetRotation(m_aItems[i].m_StartAngle + Life * 2.0f);
+			vec2 Pos = mix(m_aItems[i].m_Pos + m_aItems[i].m_Dir * 75.0f, m_aItems[i].m_Pos, clamp((m_aItems[i].m_RemainingLife - 0.60f) / 0.15f, 0.0f, 1.0f));
+			const float LifeAlpha = m_aItems[i].m_RemainingLife / 0.1f;
+			Graphics()->SetColor(m_aItems[i].m_Color.WithMultipliedAlpha(LifeAlpha));
+			Graphics()->QuadsSetRotation(m_aItems[i].m_StartAngle + m_aItems[i].m_RemainingLife * 2.0f);
 			Graphics()->RenderQuadContainerAsSprite(m_DmgIndQuadContainerIndex, 0, Pos.x, Pos.y);
 			i++;
 		}
 	}
-	s_LastLocalTime = LocalTime();
 
 	Graphics()->QuadsSetRotation(0);
 	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
@@ -114,10 +91,7 @@ void CDamageInd::OnInit()
 	Graphics()->QuadContainerUpload(m_DmgIndQuadContainerIndex);
 }
 
-void CDamageInd::Reset()
+void CDamageInd::OnReset()
 {
-	for(int i = 0; i < m_NumItems;)
-	{
-		DestroyI(&m_aItems[i]);
-	}
+	m_NumItems = 0;
 }
diff --git a/src/game/client/components/damageind.h b/src/game/client/components/damageind.h
index 9324a68da2..8b45acc8bc 100644
--- a/src/game/client/components/damageind.h
+++ b/src/game/client/components/damageind.h
@@ -8,15 +8,13 @@
 
 class CDamageInd : public CComponent
 {
-	int64_t m_Lastupdate;
 	struct CItem
 	{
 		vec2 m_Pos;
 		vec2 m_Dir;
-		float m_StartTime;
+		float m_RemainingLife;
 		float m_StartAngle;
 		ColorRGBA m_Color;
-		float m_StartAlpha;
 	};
 
 	enum
@@ -27,18 +25,14 @@ class CDamageInd : public CComponent
 	CItem m_aItems[MAX_ITEMS];
 	int m_NumItems;
 
-	CItem *CreateI();
-	void DestroyI(CItem *pItem);
-
 	int m_DmgIndQuadContainerIndex;
 
 public:
 	CDamageInd();
 	virtual int Sizeof() const override { return sizeof(*this); }
 
-	void CreateDamageInd(vec2 Pos, float Angle, float Alpha, int Amount);
 	void Create(vec2 Pos, vec2 Dir, float Alpha);
-	void Reset();
+	virtual void OnReset() override;
 	virtual void OnRender() override;
 	virtual void OnInit() override;
 };
diff --git a/src/game/client/components/debughud.cpp b/src/game/client/components/debughud.cpp
index 212744b24c..3b0afb0795 100644
--- a/src/game/client/components/debughud.cpp
+++ b/src/game/client/components/debughud.cpp
@@ -12,6 +12,14 @@
 
 #include "debughud.h"
 
+static constexpr int64_t GRAPH_MAX_VALUES = 128;
+
+CDebugHud::CDebugHud() :
+	m_RampGraph(GRAPH_MAX_VALUES),
+	m_ZoomedInGraph(GRAPH_MAX_VALUES)
+{
+}
+
 void CDebugHud::RenderNetCorrections()
 {
 	if(!g_Config.m_Debug || g_Config.m_DbgGraphs || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
@@ -25,7 +33,7 @@ void CDebugHud::RenderNetCorrections()
 	const float VelspeedX = m_pClient->m_Snap.m_pLocalCharacter->m_VelX / 256.0f * Client()->GameTickSpeed();
 	const float VelspeedY = m_pClient->m_Snap.m_pLocalCharacter->m_VelY / 256.0f * Client()->GameTickSpeed();
 	const float Ramp = VelocityRamp(Velspeed, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampStart, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampRange, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampCurvature);
-	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
+	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterById(m_pClient->m_Snap.m_LocalClientId);
 
 	const float FontSize = 5.0f;
 	const float LineHeight = FontSize + 1.0f;
@@ -52,10 +60,10 @@ void CDebugHud::RenderNetCorrections()
 	str_format(aBuf, sizeof(aBuf), "%.2f", Ramp);
 	RenderRow("Ramp:", aBuf);
 
-	str_from_int(pCharacter == nullptr ? -1 : pCharacter->m_TeleCheckpoint, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", pCharacter == nullptr ? -1 : pCharacter->m_TeleCheckpoint);
 	RenderRow("Checkpoint:", aBuf);
 
-	str_from_int(pCharacter == nullptr ? -1 : pCharacter->m_TuneZone, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", pCharacter == nullptr ? -1 : pCharacter->m_TuneZone);
 	RenderRow("Tune zone:", aBuf);
 
 	str_format(aBuf, sizeof(aBuf), "%.2f", m_pClient->m_Snap.m_pLocalCharacter->m_X / 32.0f);
@@ -64,10 +72,10 @@ void CDebugHud::RenderNetCorrections()
 	str_format(aBuf, sizeof(aBuf), "%.2f", m_pClient->m_Snap.m_pLocalCharacter->m_Y / 32.0f);
 	RenderRow("Pos.y:", aBuf);
 
-	str_from_int(m_pClient->m_Snap.m_pLocalCharacter->m_Angle, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", m_pClient->m_Snap.m_pLocalCharacter->m_Angle);
 	RenderRow("Angle:", aBuf);
 
-	str_from_int(m_pClient->NetobjNumCorrections(), aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", m_pClient->NetobjNumCorrections());
 	RenderRow("Netobj corrections", aBuf);
 	RenderRow(" on:", m_pClient->NetobjCorrectedOn());
 }
@@ -84,7 +92,7 @@ void CDebugHud::RenderTuning()
 	if(g_Config.m_DbgTuning == DBG_TUNING_OFF)
 		return;
 
-	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
+	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterById(m_pClient->m_Snap.m_LocalClientId);
 
 	const CTuningParams StandardTuning;
 	const CTuningParams *pGlobalTuning = m_pClient->GetTuning(0);
@@ -179,7 +187,7 @@ void CDebugHud::RenderTuning()
 		m_RampGraph.Init(0.0f, 0.0f);
 		m_SpeedTurningPoint = 0;
 		float PreviousRampedSpeed = 1.0f;
-		for(size_t i = 0; i < CGraph::MAX_VALUES; i++)
+		for(int64_t i = 0; i < GRAPH_MAX_VALUES; i++)
 		{
 			// This is a calculation of the speed values per second on the X axis, from 270 to 34560 in steps of 270
 			const float Speed = (i + 1) * StepSizeRampGraph;
@@ -196,12 +204,12 @@ void CDebugHud::RenderTuning()
 			}
 			PreviousRampedSpeed = RampedSpeed;
 		}
-		m_RampGraph.Scale();
+		m_RampGraph.Scale(GRAPH_MAX_VALUES - 1);
 
 		m_ZoomedInGraph.Init(0.0f, 0.0f);
 		PreviousRampedSpeed = 1.0f;
 		MiddleOfZoomedInGraph = m_SpeedTurningPoint;
-		for(size_t i = 0; i < CGraph::MAX_VALUES; i++)
+		for(int64_t i = 0; i < GRAPH_MAX_VALUES; i++)
 		{
 			// This is a calculation of the speed values per second on the X axis, from (MiddleOfZoomedInGraph - 64 * StepSize) to (MiddleOfZoomedInGraph + 64 * StepSize)
 			const float Speed = MiddleOfZoomedInGraph - 64 * StepSizeZoomedInGraph + i * StepSizeZoomedInGraph;
@@ -222,7 +230,7 @@ void CDebugHud::RenderTuning()
 			}
 			PreviousRampedSpeed = RampedSpeed;
 		}
-		m_ZoomedInGraph.Scale();
+		m_ZoomedInGraph.Scale(GRAPH_MAX_VALUES - 1);
 	}
 
 	const float GraphFontSize = 12.0f;
@@ -253,6 +261,9 @@ void CDebugHud::RenderHint()
 
 void CDebugHud::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	RenderTuning();
 	RenderNetCorrections();
 	RenderHint();
diff --git a/src/game/client/components/debughud.h b/src/game/client/components/debughud.h
index 67b9019d35..3dc326d73e 100644
--- a/src/game/client/components/debughud.h
+++ b/src/game/client/components/debughud.h
@@ -21,6 +21,7 @@ class CDebugHud : public CComponent
 	float m_OldVelrampCurvature;
 
 public:
+	CDebugHud();
 	virtual int Sizeof() const override { return sizeof(*this); }
 	virtual void OnRender() override;
 };
diff --git a/src/game/client/components/effects.cpp b/src/game/client/components/effects.cpp
index d22999367b..d5c7fd6083 100644
--- a/src/game/client/components/effects.cpp
+++ b/src/game/client/components/effects.cpp
@@ -53,11 +53,6 @@ void CEffects::DamageIndicator(vec2 Pos, vec2 Dir, float Alpha)
 	m_pClient->m_DamageInd.Create(Pos, Dir, Alpha);
 }
 
-void CEffects::ResetDamageIndicator()
-{
-	m_pClient->m_DamageInd.Reset();
-}
-
 void CEffects::PowerupShine(vec2 Pos, vec2 Size, float Alpha)
 {
 	if(!m_Add50hz)
@@ -190,11 +185,11 @@ void CEffects::PlayerSpawn(vec2 Pos, float Alpha)
 		m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_SPAWN, 1.0f, Pos);
 }
 
-void CEffects::PlayerDeath(vec2 Pos, int ClientID, float Alpha)
+void CEffects::PlayerDeath(vec2 Pos, int ClientId, float Alpha)
 {
 	ColorRGBA BloodColor(1.0f, 1.0f, 1.0f);
 
-	if(ClientID >= 0)
+	if(ClientId >= 0)
 	{
 		// Use m_RenderInfo.m_CustomColoredSkin instead of m_UseCustomColor
 		// m_UseCustomColor says if the player's skin has a custom color (value sent from the client side)
@@ -202,11 +197,11 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientID, float Alpha)
 		// m_RenderInfo.m_CustomColoredSkin Defines if in the context of the game the color is being customized,
 		// Using this value if the game is teams (red and blue), this value will be true even if the skin is with the normal color.
 		// And will use the team body color to create player death effect instead of tee color
-		if(m_pClient->m_aClients[ClientID].m_RenderInfo.m_CustomColoredSkin)
-			BloodColor = m_pClient->m_aClients[ClientID].m_RenderInfo.m_ColorBody;
+		if(m_pClient->m_aClients[ClientId].m_RenderInfo.m_CustomColoredSkin)
+			BloodColor = m_pClient->m_aClients[ClientId].m_RenderInfo.m_ColorBody;
 		else
 		{
-			BloodColor = m_pClient->m_aClients[ClientID].m_RenderInfo.m_BloodColor;
+			BloodColor = m_pClient->m_aClients[ClientId].m_RenderInfo.m_BloodColor;
 		}
 	}
 
@@ -231,6 +226,60 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientID, float Alpha)
 	}
 }
 
+void CEffects::Confetti(vec2 Pos, float Alpha)
+{
+	ColorRGBA Red(1.0f, 0.4f, 0.4f);
+	ColorRGBA Green(0.4f, 1.0f, 0.4f);
+	ColorRGBA Blue(0.4f, 0.4f, 1.0f);
+	ColorRGBA Yellow(1.0f, 1.0f, 0.4f);
+	ColorRGBA Cyan(0.4f, 1.0f, 1.0f);
+	ColorRGBA Magenta(1.0f, 0.4f, 1.0f);
+
+	ColorRGBA aConfettiColors[] = {Red, Green, Blue, Yellow, Cyan, Magenta};
+
+	// powerful confettis
+	for(int i = 0; i < 32; i++)
+	{
+		CParticle p;
+		p.SetDefault();
+		p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
+		p.m_Pos = Pos;
+		p.m_Vel = direction(-0.5f * pi + random_float(-0.2f, 0.2f)) * random_float(0.01f, 1.0f) * 2000.0f;
+		p.m_LifeSpan = random_float(1.0f, 1.2f);
+		p.m_StartSize = random_float(12.0f, 24.0f);
+		p.m_EndSize = 0;
+		p.m_Rot = random_angle();
+		p.m_Rotspeed = random_float(-0.5f, 0.5f) * pi;
+		p.m_Gravity = -700.0f;
+		p.m_Friction = 0.6f;
+		ColorRGBA c = aConfettiColors[(rand() % std::size(aConfettiColors))];
+		p.m_Color = c.WithMultipliedAlpha(0.75f * Alpha);
+		p.m_StartAlpha = Alpha;
+		m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+	}
+
+	// broader confettis
+	for(int i = 0; i < 32; i++)
+	{
+		CParticle p;
+		p.SetDefault();
+		p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
+		p.m_Pos = Pos;
+		p.m_Vel = direction(-0.5f * pi + random_float(-0.8f, 0.8f)) * random_float(0.01f, 1.0f) * 1500.0f;
+		p.m_LifeSpan = random_float(0.8f, 1.0f);
+		p.m_StartSize = random_float(12.0f, 24.0f);
+		p.m_EndSize = 0;
+		p.m_Rot = random_angle();
+		p.m_Rotspeed = random_float(-0.5f, 0.5f) * pi;
+		p.m_Gravity = -700.0f;
+		p.m_Friction = 0.6f;
+		ColorRGBA c = aConfettiColors[(rand() % std::size(aConfettiColors))];
+		p.m_Color = c.WithMultipliedAlpha(0.75f * Alpha);
+		p.m_StartAlpha = Alpha;
+		m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+	}
+}
+
 void CEffects::Explosion(vec2 Pos, float Alpha)
 {
 	// add to flow
@@ -257,6 +306,28 @@ void CEffects::Explosion(vec2 Pos, float Alpha)
 	p.m_StartAlpha = Alpha;
 	m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
 
+	// Nudge position slightly to edge of closest tile so the
+	// smoke doesn't get stuck inside the tile.
+	if(Collision()->CheckPoint(Pos))
+	{
+		const vec2 DistanceToTopLeft = Pos - vec2(round_truncate(Pos.x / 32), round_truncate(Pos.y / 32)) * 32;
+
+		vec2 CheckOffset;
+		CheckOffset.x = (DistanceToTopLeft.x > 16 ? 32 : -1);
+		CheckOffset.y = (DistanceToTopLeft.y > 16 ? 32 : -1);
+		CheckOffset -= DistanceToTopLeft;
+
+		for(vec2 Mask : {vec2(1.0f, 0.0f), vec2(0.0f, 1.0f), vec2(1.0f, 1.0f)})
+		{
+			const vec2 NewPos = Pos + CheckOffset * Mask;
+			if(!Collision()->CheckPoint(NewPos))
+			{
+				Pos = NewPos;
+				break;
+			}
+		}
+	}
+
 	// add the smoke
 	for(int i = 0; i < 24; i++)
 	{
diff --git a/src/game/client/components/effects.h b/src/game/client/components/effects.h
index 02acc90f66..de75e63c9e 100644
--- a/src/game/client/components/effects.h
+++ b/src/game/client/components/effects.h
@@ -2,6 +2,9 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_EFFECTS_H
 #define GAME_CLIENT_COMPONENTS_EFFECTS_H
+
+#include <base/vmath.h>
+
 #include <game/client/component.h>
 
 class CEffects : public CComponent
@@ -23,11 +26,11 @@ class CEffects : public CComponent
 	void HammerHit(vec2 Pos, float Alpha = 1.0f);
 	void AirJump(vec2 Pos, float Alpha = 1.0f);
 	void DamageIndicator(vec2 Pos, vec2 Dir, float Alpha = 1.0f);
-	void ResetDamageIndicator();
 	void PlayerSpawn(vec2 Pos, float Alpha = 1.0f);
-	void PlayerDeath(vec2 Pos, int ClientID, float Alpha = 1.0f);
+	void PlayerDeath(vec2 Pos, int ClientId, float Alpha = 1.0f);
 	void PowerupShine(vec2 Pos, vec2 Size, float Alpha = 1.0f);
 	void FreezingFlakes(vec2 Pos, vec2 Size, float Alpha = 1.0f);
+	void Confetti(vec2 Pos, float Alpha = 1.0f);
 
 	void Update();
 };
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp
index 16c6c32b47..e7c0963d0c 100644
--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@@ -41,6 +41,7 @@ void CEmoticon::OnReset()
 	m_Active = false;
 	m_SelectedEmote = -1;
 	m_SelectedEyeEmote = -1;
+	m_TouchPressedOutside = false;
 }
 
 void CEmoticon::OnRelease()
@@ -53,15 +54,35 @@ bool CEmoticon::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 	if(!m_Active)
 		return false;
 
-	UI()->ConvertMouseMove(&x, &y, CursorType);
+	Ui()->ConvertMouseMove(&x, &y, CursorType);
 	m_SelectorMouse += vec2(x, y);
 	return true;
 }
 
+bool CEmoticon::OnInput(const IInput::CEvent &Event)
+{
+	if(IsActive() && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE)
+	{
+		OnRelease();
+		return true;
+	}
+	return false;
+}
+
 void CEmoticon::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!m_Active)
 	{
+		if(m_TouchPressedOutside)
+		{
+			m_SelectedEmote = -1;
+			m_SelectedEyeEmote = -1;
+			m_TouchPressedOutside = false;
+		}
+
 		if(m_WasActive && m_SelectedEmote != -1)
 			Emote(m_SelectedEmote);
 		if(m_WasActive && m_SelectedEyeEmote != -1)
@@ -79,6 +100,29 @@ void CEmoticon::OnRender()
 
 	m_WasActive = true;
 
+	const CUIRect Screen = *Ui()->Screen();
+
+	const bool WasTouchPressed = m_TouchState.m_AnyPressed;
+	Ui()->UpdateTouchState(m_TouchState);
+	if(m_TouchState.m_AnyPressed)
+	{
+		const vec2 TouchPos = (m_TouchState.m_PrimaryPosition - vec2(0.5f, 0.5f)) * Screen.Size();
+		const float TouchCenterDistance = length(TouchPos);
+		if(TouchCenterDistance <= 170.0f)
+		{
+			m_SelectorMouse = TouchPos;
+		}
+		else if(TouchCenterDistance > 190.0f)
+		{
+			m_TouchPressedOutside = true;
+		}
+	}
+	else if(WasTouchPressed)
+	{
+		m_Active = false;
+		return;
+	}
+
 	if(length(m_SelectorMouse) > 170.0f)
 		m_SelectorMouse = normalize(m_SelectorMouse) * 170.0f;
 
@@ -93,35 +137,31 @@ void CEmoticon::OnRender()
 	else if(length(m_SelectorMouse) > 40.0f)
 		m_SelectedEyeEmote = (int)(SelectedAngle / (2 * pi) * NUM_EMOTES);
 
-	CUIRect Screen = *UI()->Screen();
+	const vec2 ScreenCenter = Screen.Center();
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 
 	Graphics()->BlendNormal();
 
 	Graphics()->TextureClear();
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(0, 0, 0, 0.3f);
-	Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 190.0f, 64);
+	Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 190.0f, 64);
 	Graphics()->QuadsEnd();
 
 	Graphics()->WrapClamp();
-	for(int i = 0; i < NUM_EMOTICONS; i++)
+	for(int Emote = 0; Emote < NUM_EMOTICONS; Emote++)
 	{
-		float Angle = 2 * pi * i / NUM_EMOTICONS;
+		float Angle = 2 * pi * Emote / NUM_EMOTICONS;
 		if(Angle > pi)
 			Angle -= 2 * pi;
 
-		bool Selected = m_SelectedEmote == i;
-
-		float Size = Selected ? 80.0f : 50.0f;
-
-		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[i]);
+		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[Emote]);
 		Graphics()->QuadsSetSubset(0, 0, 1, 1);
-
 		Graphics()->QuadsBegin();
 		const vec2 Nudge = direction(Angle) * 150.0f;
-		IGraphics::CQuadItem QuadItem(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y, Size, Size);
+		const float Size = m_SelectedEmote == Emote ? 80.0f : 50.0f;
+		IGraphics::CQuadItem QuadItem(ScreenCenter.x + Nudge.x, ScreenCenter.y + Nudge.y, Size, Size);
 		Graphics()->QuadsDraw(&QuadItem, 1);
 		Graphics()->QuadsEnd();
 	}
@@ -132,34 +172,32 @@ void CEmoticon::OnRender()
 		Graphics()->TextureClear();
 		Graphics()->QuadsBegin();
 		Graphics()->SetColor(1.0, 1.0, 1.0, 0.3f);
-		Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 100.0f, 64);
+		Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 100.0f, 64);
 		Graphics()->QuadsEnd();
 
-		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_aLocalIDs[g_Config.m_ClDummy]].m_RenderInfo;
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_aLocalIds[g_Config.m_ClDummy]].m_RenderInfo;
 
-		for(int i = 0; i < NUM_EMOTES; i++)
+		for(int Emote = 0; Emote < NUM_EMOTES; Emote++)
 		{
-			float Angle = 2 * pi * i / NUM_EMOTES;
+			float Angle = 2 * pi * Emote / NUM_EMOTES;
 			if(Angle > pi)
 				Angle -= 2 * pi;
 
-			const bool Selected = m_SelectedEyeEmote == i;
-
 			const vec2 Nudge = direction(Angle) * 70.0f;
-			TeeInfo.m_Size = Selected ? 64.0f : 48.0f;
-			RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, i, vec2(-1, 0), vec2(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y));
+			TeeInfo.m_Size = m_SelectedEyeEmote == Emote ? 64.0f : 48.0f;
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, Emote, vec2(-1, 0), ScreenCenter + Nudge);
 		}
 
 		Graphics()->TextureClear();
 		Graphics()->QuadsBegin();
 		Graphics()->SetColor(0, 0, 0, 0.3f);
-		Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 30.0f, 64);
+		Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 30.0f, 64);
 		Graphics()->QuadsEnd();
 	}
 	else
 		m_SelectedEyeEmote = -1;
 
-	RenderTools()->RenderCursor(m_SelectorMouse + vec2(Screen.w, Screen.h) / 2, 24.0f);
+	RenderTools()->RenderCursor(ScreenCenter + m_SelectorMouse, 24.0f);
 }
 
 void CEmoticon::Emote(int Emoticon)
@@ -200,5 +238,5 @@ void CEmoticon::EyeEmote(int Emote)
 		str_format(aBuf, sizeof(aBuf), "/emote blink %d", g_Config.m_ClEyeDuration);
 		break;
 	}
-	GameClient()->m_Chat.Say(0, aBuf);
+	GameClient()->m_Chat.SendChat(0, aBuf);
 }
diff --git a/src/game/client/components/emoticon.h b/src/game/client/components/emoticon.h
index aec896cfa9..890f1c80ef 100644
--- a/src/game/client/components/emoticon.h
+++ b/src/game/client/components/emoticon.h
@@ -3,7 +3,10 @@
 #ifndef GAME_CLIENT_COMPONENTS_EMOTICON_H
 #define GAME_CLIENT_COMPONENTS_EMOTICON_H
 #include <base/vmath.h>
+#include <engine/console.h>
+
 #include <game/client/component.h>
+#include <game/client/ui.h>
 
 class CEmoticon : public CComponent
 {
@@ -14,6 +17,9 @@ class CEmoticon : public CComponent
 	int m_SelectedEmote;
 	int m_SelectedEyeEmote;
 
+	CUi::CTouchState m_TouchState;
+	bool m_TouchPressedOutside;
+
 	static void ConKeyEmoticon(IConsole::IResult *pResult, void *pUserData);
 	static void ConEmote(IConsole::IResult *pResult, void *pUserData);
 
@@ -26,9 +32,12 @@ class CEmoticon : public CComponent
 	virtual void OnRender() override;
 	virtual void OnRelease() override;
 	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
 
 	void Emote(int Emoticon);
 	void EyeEmote(int EyeEmote);
+
+	bool IsActive() const { return m_Active; }
 };
 
 #endif
diff --git a/src/game/client/components/freezebars.cpp b/src/game/client/components/freezebars.cpp
index 817be51129..1f5f0204ee 100644
--- a/src/game/client/components/freezebars.cpp
+++ b/src/game/client/components/freezebars.cpp
@@ -2,16 +2,16 @@
 
 #include "freezebars.h"
 
-void CFreezeBars::RenderFreezeBar(const int ClientID)
+void CFreezeBars::RenderFreezeBar(const int ClientId)
 {
 	const float FreezeBarWidth = 64.0f;
 	const float FreezeBarHalfWidth = 32.0f;
 	const float FreezeBarHight = 16.0f;
 
 	// pCharacter contains the predicted character for local players or the last snap for players who are spectated
-	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientID].m_Predicted;
+	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientId].m_Predicted;
 
-	if(pCharacter->m_FreezeEnd <= 0 || pCharacter->m_FreezeStart == 0 || pCharacter->m_FreezeEnd <= pCharacter->m_FreezeStart || !m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo || (pCharacter->m_IsInFreeze && g_Config.m_ClFreezeBarsAlphaInsideFreeze == 0))
+	if(pCharacter->m_FreezeEnd <= 0 || pCharacter->m_FreezeStart == 0 || pCharacter->m_FreezeEnd <= pCharacter->m_FreezeStart || !m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo || (pCharacter->m_IsInFreeze && g_Config.m_ClFreezeBarsAlphaInsideFreeze == 0))
 	{
 		return;
 	}
@@ -23,11 +23,11 @@ void CFreezeBars::RenderFreezeBar(const int ClientID)
 		return;
 	}
 
-	vec2 Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	vec2 Position = m_pClient->m_aClients[ClientId].m_RenderPos;
 	Position.x -= FreezeBarHalfWidth;
 	Position.y += 32;
 
-	float Alpha = m_pClient->IsOtherTeam(ClientID) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	float Alpha = m_pClient->IsOtherTeam(ClientId) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
 	if(pCharacter->m_IsInFreeze)
 	{
 		Alpha *= g_Config.m_ClFreezeBarsAlphaInsideFreeze / 100.0f;
@@ -36,7 +36,7 @@ void CFreezeBars::RenderFreezeBar(const int ClientID)
 	RenderFreezeBarPos(Position.x, Position.y, FreezeBarWidth, FreezeBarHight, FreezeProgress, Alpha);
 }
 
-void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width, const float height, float Progress, const float Alpha)
+void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float Width, const float Height, float Progress, const float Alpha)
 {
 	Progress = clamp(Progress, 0.0f, 1.0f);
 
@@ -45,9 +45,9 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
 	const float RestPct = 0.5f;
 	const float ProgPct = 0.5f;
 
-	const float EndWidth = height; // to keep the correct scale - the height of the sprite is as long as the width
-	const float BarHeight = height;
-	const float WholeBarWidth = width;
+	const float EndWidth = Height; // to keep the correct scale - the height of the sprite is as long as the width
+	const float BarHeight = Height;
+	const float WholeBarWidth = Width;
 	const float MiddleBarWidth = WholeBarWidth - (EndWidth * 2.0f);
 	const float EndProgressWidth = EndWidth * ProgPct;
 	const float EndRestWidth = EndWidth * RestPct;
@@ -187,15 +187,18 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
 	Graphics()->WrapNormal();
 }
 
-inline bool CFreezeBars::IsPlayerInfoAvailable(int ClientID) const
+inline bool CFreezeBars::IsPlayerInfoAvailable(int ClientId) const
 {
-	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientID);
-	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientID);
+	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientId);
+	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientId);
 	return pPrevInfo && pInfo;
 }
 
 void CFreezeBars::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!g_Config.m_ClShowFreezeBars)
 	{
 		return;
@@ -213,27 +216,27 @@ void CFreezeBars::OnRender()
 	ScreenY0 -= BorderBuffer;
 	ScreenY1 += BorderBuffer;
 
-	int LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+	int LocalClientId = m_pClient->m_Snap.m_LocalClientId;
 
 	// render everyone else's freeze bar, then our own
-	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 	{
-		if(ClientID == LocalClientID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		if(ClientId == LocalClientId || !m_pClient->m_Snap.m_aCharacters[ClientId].m_Active || !IsPlayerInfoAvailable(ClientId))
 		{
 			continue;
 		}
 
 		//don't render if the tee is offscreen
-		vec2 *pRenderPos = &m_pClient->m_aClients[ClientID].m_RenderPos;
+		vec2 *pRenderPos = &m_pClient->m_aClients[ClientId].m_RenderPos;
 		if(pRenderPos->x < ScreenX0 || pRenderPos->x > ScreenX1 || pRenderPos->y < ScreenY0 || pRenderPos->y > ScreenY1)
 		{
 			continue;
 		}
 
-		RenderFreezeBar(ClientID);
+		RenderFreezeBar(ClientId);
 	}
-	if(LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientID].m_Active && IsPlayerInfoAvailable(LocalClientID))
+	if(LocalClientId != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientId].m_Active && IsPlayerInfoAvailable(LocalClientId))
 	{
-		RenderFreezeBar(LocalClientID);
+		RenderFreezeBar(LocalClientId);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/game/client/components/freezebars.h b/src/game/client/components/freezebars.h
index f0f76110d1..1f8307453e 100644
--- a/src/game/client/components/freezebars.h
+++ b/src/game/client/components/freezebars.h
@@ -4,9 +4,9 @@
 
 class CFreezeBars : public CComponent
 {
-	void RenderFreezeBar(const int ClientID);
-	void RenderFreezeBarPos(float x, const float y, const float width, const float height, float Progress, float Alpha = 1.0f);
-	bool IsPlayerInfoAvailable(int ClientID) const;
+	void RenderFreezeBar(const int ClientId);
+	void RenderFreezeBarPos(float x, const float y, const float Width, const float Height, float Progress, float Alpha = 1.0f);
+	bool IsPlayerInfoAvailable(int ClientId) const;
 
 public:
 	virtual int Sizeof() const override { return sizeof(*this); }
diff --git a/src/game/client/components/ghost.cpp b/src/game/client/components/ghost.cpp
index 2a55688f15..26272d3690 100644
--- a/src/game/client/components/ghost.cpp
+++ b/src/game/client/components/ghost.cpp
@@ -216,7 +216,7 @@ void CGhost::CheckStartLocal(bool Predicted)
 
 		vec2 PrevPos = m_pClient->m_PredictedPrevChar.m_Pos;
 		vec2 Pos = m_pClient->m_PredictedChar.m_Pos;
-		if(((!m_Rendering && RenderTick == -1) || m_AllowRestart) && CRaceHelper::IsStart(m_pClient, PrevPos, Pos))
+		if(((!m_Rendering && RenderTick == -1) || m_AllowRestart) && GameClient()->RaceHelper()->IsStart(PrevPos, Pos))
 		{
 			if(m_Rendering && !m_RenderingStartedByServer) // race restarted: stop rendering
 				StopRender();
@@ -240,7 +240,7 @@ void CGhost::CheckStartLocal(bool Predicted)
 			int TickDiff = CurTick - PrevTick;
 			for(int i = 0; i < TickDiff; i++)
 			{
-				if(CRaceHelper::IsStart(m_pClient, mix(PrevPos, Pos, (float)i / TickDiff), mix(PrevPos, Pos, (float)(i + 1) / TickDiff)))
+				if(GameClient()->RaceHelper()->IsStart(mix(PrevPos, Pos, (float)i / TickDiff), mix(PrevPos, Pos, (float)(i + 1) / TickDiff)))
 				{
 					RecordTick = PrevTick + i + 1;
 					if(!m_AllowRestart)
@@ -287,7 +287,7 @@ void CGhost::OnNewSnapshot()
 			CheckStart();
 
 		if(m_Recording)
-			AddInfos(m_pClient->m_Snap.m_pLocalCharacter, (m_pClient->m_Snap.m_LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData) ? &m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_ExtendedData : nullptr);
+			AddInfos(m_pClient->m_Snap.m_pLocalCharacter, (m_pClient->m_Snap.m_LocalClientId != -1 && m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientId].m_HasExtendedData) ? &m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientId].m_ExtendedData : nullptr);
 	}
 
 	// Record m_LastRaceTick for g_Config.m_ClConfirmDisconnect/QuitTime anyway
@@ -311,6 +311,9 @@ void CGhost::OnNewPredictedSnapshot()
 
 void CGhost::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	// Play the ghost
 	if(!m_Rendering || !g_Config.m_ClRaceShowGhost)
 		return;
@@ -363,10 +366,7 @@ void CGhost::OnRender()
 					IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;
 
 				GhostNinjaRenderInfo = Ghost.m_RenderInfo;
-				GhostNinjaRenderInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-				GhostNinjaRenderInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-				GhostNinjaRenderInfo.m_BloodColor = pSkin->m_BloodColor;
-				GhostNinjaRenderInfo.m_SkinMetrics = pSkin->m_Metrics;
+				GhostNinjaRenderInfo.Apply(pSkin);
 				GhostNinjaRenderInfo.m_CustomColoredSkin = IsTeamplay;
 				if(!IsTeamplay)
 				{
@@ -385,20 +385,16 @@ void CGhost::OnRender()
 
 void CGhost::InitRenderInfos(CGhostItem *pGhost)
 {
-	char aSkinName[64];
-	IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName);
+	char aSkinName[24];
+	IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName, std::size(aSkinName));
 	CTeeRenderInfo *pRenderInfo = &pGhost->m_RenderInfo;
 
-	const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
-	pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-	pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-	pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
-	pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
+	pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
 	pRenderInfo->m_CustomColoredSkin = pGhost->m_Skin.m_UseCustomColor;
 	if(pGhost->m_Skin.m_UseCustomColor)
 	{
-		pRenderInfo->m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorBody).UnclampLighting());
-		pRenderInfo->m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorFeet).UnclampLighting());
+		pRenderInfo->m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT));
+		pRenderInfo->m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorFeet).UnclampLighting(ColorHSLA::DARKEST_LGT));
 	}
 	else
 	{
@@ -415,7 +411,7 @@ void CGhost::StartRecord(int Tick)
 	m_CurGhost.Reset();
 	m_CurGhost.m_StartTick = Tick;
 
-	const CGameClient::CClientData *pData = &m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID];
+	const CGameClient::CClientData *pData = &m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId];
 	str_copy(m_CurGhost.m_aPlayer, Client()->PlayerName());
 	GetGhostSkin(&m_CurGhost.m_Skin, pData->m_aSkinName, pData->m_UseCustomColor, pData->m_ColorBody, pData->m_ColorFeet);
 	InitRenderInfos(&m_CurGhost);
@@ -620,7 +616,7 @@ void CGhost::OnMessage(int MsgType, void *pRawMsg)
 	if(MsgType == NETMSGTYPE_SV_KILLMSG)
 	{
 		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
-		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientID)
+		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientId)
 		{
 			if(m_Recording)
 				StopRecord();
@@ -633,7 +629,7 @@ void CGhost::OnMessage(int MsgType, void *pRawMsg)
 		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientID)
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientId)
 			{
 				if(m_Recording)
 					StopRecord();
@@ -645,11 +641,11 @@ void CGhost::OnMessage(int MsgType, void *pRawMsg)
 	else if(MsgType == NETMSGTYPE_SV_CHAT)
 	{
 		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
-		if(pMsg->m_ClientID == -1 && m_Recording)
+		if(pMsg->m_ClientId == -1 && m_Recording)
 		{
 			char aName[MAX_NAME_LENGTH];
 			int Time = CRaceHelper::TimeFromFinishMessage(pMsg->m_pMessage, aName, sizeof(aName));
-			if(Time > 0 && m_pClient->m_Snap.m_LocalClientID >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName) == 0)
+			if(Time > 0 && m_pClient->m_Snap.m_LocalClientId >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId].m_aName) == 0)
 			{
 				StopRecord(Time);
 				StopRender();
@@ -684,21 +680,17 @@ int CGhost::GetLastRaceTick() const
 	return m_LastRaceTick;
 }
 
-void CGhost::RefindSkins()
+void CGhost::OnRefreshSkins()
 {
 	const auto &&RefindSkin = [&](auto &Ghost) {
 		if(Ghost.Empty())
 			return;
-		char aSkinName[64];
-		IntsToStr(&Ghost.m_Skin.m_Skin0, 6, aSkinName);
+		char aSkinName[24];
+		IntsToStr(&Ghost.m_Skin.m_Skin0, 6, aSkinName, std::size(aSkinName));
 		CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
 		if(aSkinName[0] != '\0')
 		{
-			const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
-			pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-			pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-			pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
-			pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
+			pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
 		}
 		else
 		{
diff --git a/src/game/client/components/ghost.h b/src/game/client/components/ghost.h
index c7582523e8..e1c263677c 100644
--- a/src/game/client/components/ghost.h
+++ b/src/game/client/components/ghost.h
@@ -155,6 +155,7 @@ class CGhost : public CComponent
 	virtual void OnRender() override;
 	virtual void OnConsoleInit() override;
 	virtual void OnReset() override;
+	virtual void OnRefreshSkins() override;
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
 	virtual void OnMapLoad() override;
 	virtual void OnShutdown() override;
@@ -175,8 +176,6 @@ class CGhost : public CComponent
 	class IGhostRecorder *GhostRecorder() const { return m_pGhostRecorder; }
 
 	int GetLastRaceTick() const;
-
-	void RefindSkins();
 };
 
 #endif
diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
index 4b4648f71b..91aa908424 100644
--- a/src/game/client/components/hud.cpp
+++ b/src/game/client/components/hud.cpp
@@ -1,5 +1,6 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/color.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>
@@ -7,6 +8,7 @@
 #include <game/client/animstate.h>
 #include <game/client/components/scoreboard.h>
 #include <game/client/gameclient.h>
+#include <game/client/prediction/entities/character.h>
 #include <game/client/render.h>
 #include <game/generated/client_data.h>
 #include <game/generated/protocol.h>
@@ -28,6 +30,13 @@ CHud::CHud()
 	m_FrameTimeAvg = 0.0f;
 	m_FPSTextContainerIndex.Reset();
 	m_DDRaceEffectsTextContainerIndex.Reset();
+	m_PlayerAngleTextContainerIndex.Reset();
+
+	for(int i = 0; i < 2; i++)
+	{
+		m_aPlayerSpeedTextContainers[i].Reset();
+		m_aPlayerPositionContainers[i].Reset();
+	}
 }
 
 void CHud::ResetHudContainers()
@@ -44,6 +53,12 @@ void CHud::ResetHudContainers()
 
 	TextRender()->DeleteTextContainer(m_FPSTextContainerIndex);
 	TextRender()->DeleteTextContainer(m_DDRaceEffectsTextContainerIndex);
+	TextRender()->DeleteTextContainer(m_PlayerAngleTextContainerIndex);
+	for(int i = 0; i < 2; i++)
+	{
+		TextRender()->DeleteTextContainer(m_aPlayerSpeedTextContainers[i]);
+		TextRender()->DeleteTextContainer(m_aPlayerPositionContainers[i]);
+	}
 }
 
 void CHud::OnWindowResize()
@@ -61,6 +76,8 @@ void CHud::OnReset()
 	m_ServerRecord = -1.0f;
 	m_aPlayerRecord[0] = -1.0f;
 	m_aPlayerRecord[1] = -1.0f;
+	m_aLastPlayerSpeedChange[0] = ESpeedChange::NONE;
+	m_aLastPlayerSpeedChange[1] = ESpeedChange::NONE;
 
 	ResetHudContainers();
 }
@@ -171,8 +188,8 @@ void CHud::RenderScoreHud()
 		if(GameFlags & GAMEFLAG_TEAMS && m_pClient->m_Snap.m_pGameDataObj)
 		{
 			char aScoreTeam[2][16];
-			str_from_int(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed, aScoreTeam[TEAM_RED]);
-			str_from_int(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue, aScoreTeam[TEAM_BLUE]);
+			str_format(aScoreTeam[TEAM_RED], sizeof(aScoreTeam[TEAM_RED]), "%d", m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed);
+			str_format(aScoreTeam[TEAM_BLUE], sizeof(aScoreTeam[TEAM_BLUE]), "%d", m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue);
 
 			bool aRecreateTeamScore[2] = {str_comp(aScoreTeam[0], m_aScoreInfo[0].m_aScoreText) != 0, str_comp(aScoreTeam[1], m_aScoreInfo[1].m_aScoreText) != 0};
 
@@ -186,7 +203,7 @@ void CHud::RenderScoreHud()
 				if(aRecreateTeamScore[t])
 				{
 					m_aScoreInfo[t].m_ScoreTextWidth = TextRender()->TextWidth(14.0f, aScoreTeam[t == 0 ? TEAM_RED : TEAM_BLUE], -1, -1.0f);
-					mem_copy(m_aScoreInfo[t].m_aScoreText, aScoreTeam[t == 0 ? TEAM_RED : TEAM_BLUE], sizeof(m_aScoreInfo[t].m_aScoreText));
+					str_copy(m_aScoreInfo[t].m_aScoreText, aScoreTeam[t == 0 ? TEAM_RED : TEAM_BLUE]);
 					RecreateRect = true;
 				}
 			}
@@ -203,9 +220,9 @@ void CHud::RenderScoreHud()
 					Graphics()->DeleteQuadContainer(m_aScoreInfo[t].m_RoundRectQuadContainerIndex);
 
 					if(t == 0)
-						Graphics()->SetColor(1.0f, 0.0f, 0.0f, 0.25f);
+						Graphics()->SetColor(0.975f, 0.17f, 0.17f, 0.3f);
 					else
-						Graphics()->SetColor(0.0f, 0.0f, 1.0f, 0.25f);
+						Graphics()->SetColor(0.17f, 0.46f, 0.975f, 0.3f);
 					m_aScoreInfo[t].m_RoundRectQuadContainerIndex = Graphics()->CreateRectQuadContainer(m_Width - ScoreWidthMax - ImageSize - 2 * Split, StartY + t * 20, ScoreWidthMax + ImageSize + 2 * Split, ScoreSingleBoxHeight, 5.0f, IGraphics::CORNER_L);
 				}
 				Graphics()->TextureClear();
@@ -244,11 +261,11 @@ void CHud::RenderScoreHud()
 					else if(aFlagCarrier[t] >= 0)
 					{
 						// draw name of the flag holder
-						int ID = aFlagCarrier[t] % MAX_CLIENTS;
-						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						int Id = aFlagCarrier[t] % MAX_CLIENTS;
+						const char *pName = m_pClient->m_aClients[Id].m_aName;
 						if(str_comp(pName, m_aScoreInfo[t].m_aPlayerNameText) != 0 || RecreateRect)
 						{
-							mem_copy(m_aScoreInfo[t].m_aPlayerNameText, pName, sizeof(m_aScoreInfo[t].m_aPlayerNameText));
+							str_copy(m_aScoreInfo[t].m_aPlayerNameText, pName);
 
 							float w = TextRender()->TextWidth(8.0f, pName, -1, -1.0f);
 
@@ -266,12 +283,12 @@ void CHud::RenderScoreHud()
 						}
 
 						// draw tee of the flag holder
-						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[ID].m_RenderInfo;
+						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[Id].m_RenderInfo;
 						TeeInfo.m_Size = ScoreSingleBoxHeight;
 
 						const CAnimState *pIdleState = CAnimState::GetIdle();
 						vec2 OffsetToMid;
-						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+						CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 						vec2 TeeRenderPos(m_Width - ScoreWidthMax - TeeInfo.m_Size / 2 - Split, StartY + (t * 20) + ScoreSingleBoxHeight / 2.0f + OffsetToMid.y);
 
 						RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
@@ -291,7 +308,7 @@ void CHud::RenderScoreHud()
 				if(m_pClient->m_Snap.m_apInfoByScore[i]->m_Team != TEAM_SPECTATORS)
 				{
 					apPlayerInfo[t] = m_pClient->m_Snap.m_apInfoByScore[i];
-					if(apPlayerInfo[t]->m_ClientID == m_pClient->m_Snap.m_LocalClientID)
+					if(apPlayerInfo[t]->m_ClientId == m_pClient->m_Snap.m_LocalClientId)
 						Local = t;
 					++t;
 				}
@@ -303,7 +320,7 @@ void CHud::RenderScoreHud()
 				{
 					if(m_pClient->m_Snap.m_apInfoByScore[i]->m_Team != TEAM_SPECTATORS)
 						++aPos[1];
-					if(m_pClient->m_Snap.m_apInfoByScore[i]->m_ClientID == m_pClient->m_Snap.m_LocalClientID)
+					if(m_pClient->m_Snap.m_apInfoByScore[i]->m_ClientId == m_pClient->m_Snap.m_LocalClientId)
 					{
 						apPlayerInfo[1] = m_pClient->m_Snap.m_apInfoByScore[i];
 						Local = 1;
@@ -316,7 +333,9 @@ void CHud::RenderScoreHud()
 			{
 				if(apPlayerInfo[t])
 				{
-					if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
+					if(Client()->IsSixup() && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & protocol7::GAMEFLAG_RACE)
+						str_time((int64_t)absolute(apPlayerInfo[t]->m_Score) / 10, TIME_MINS_CENTISECS, aScore[t], sizeof(aScore[t]));
+					else if(m_pClient->m_GameInfo.m_TimeScore)
 					{
 						if(apPlayerInfo[t]->m_Score != -9999)
 							str_time((int64_t)absolute(apPlayerInfo[t]->m_Score) * 100, TIME_HOURS, aScore[t], sizeof(aScore[t]));
@@ -324,15 +343,14 @@ void CHud::RenderScoreHud()
 							aScore[t][0] = 0;
 					}
 					else
-						str_from_int(apPlayerInfo[t]->m_Score, aScore[t]);
+						str_format(aScore[t], sizeof(aScore[t]), "%d", apPlayerInfo[t]->m_Score);
 				}
 				else
 					aScore[t][0] = 0;
 			}
 
-			static int LocalClientID = -1;
-			bool RecreateScores = str_comp(aScore[0], m_aScoreInfo[0].m_aScoreText) != 0 || str_comp(aScore[1], m_aScoreInfo[1].m_aScoreText) != 0 || LocalClientID != m_pClient->m_Snap.m_LocalClientID;
-			LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+			bool RecreateScores = str_comp(aScore[0], m_aScoreInfo[0].m_aScoreText) != 0 || str_comp(aScore[1], m_aScoreInfo[1].m_aScoreText) != 0 || m_LastLocalClientId != m_pClient->m_Snap.m_LocalClientId;
+			m_LastLocalClientId = m_pClient->m_Snap.m_LocalClientId;
 
 			bool RecreateRect = ForceScoreInfoInit;
 			for(int t = 0; t < 2; t++)
@@ -340,16 +358,16 @@ void CHud::RenderScoreHud()
 				if(RecreateScores)
 				{
 					m_aScoreInfo[t].m_ScoreTextWidth = TextRender()->TextWidth(14.0f, aScore[t], -1, -1.0f);
-					mem_copy(m_aScoreInfo[t].m_aScoreText, aScore[t], sizeof(m_aScoreInfo[t].m_aScoreText));
+					str_copy(m_aScoreInfo[t].m_aScoreText, aScore[t]);
 					RecreateRect = true;
 				}
 
 				if(apPlayerInfo[t])
 				{
-					int ID = apPlayerInfo[t]->m_ClientID;
-					if(ID >= 0 && ID < MAX_CLIENTS)
+					int Id = apPlayerInfo[t]->m_ClientId;
+					if(Id >= 0 && Id < MAX_CLIENTS)
 					{
-						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						const char *pName = m_pClient->m_aClients[Id].m_aName;
 						if(str_comp(pName, m_aScoreInfo[t].m_aPlayerNameText) != 0)
 							RecreateRect = true;
 					}
@@ -406,13 +424,13 @@ void CHud::RenderScoreHud()
 				if(apPlayerInfo[t])
 				{
 					// draw name
-					int ID = apPlayerInfo[t]->m_ClientID;
-					if(ID >= 0 && ID < MAX_CLIENTS)
+					int Id = apPlayerInfo[t]->m_ClientId;
+					if(Id >= 0 && Id < MAX_CLIENTS)
 					{
-						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						const char *pName = m_pClient->m_aClients[Id].m_aName;
 						if(RecreateRect)
 						{
-							mem_copy(m_aScoreInfo[t].m_aPlayerNameText, pName, sizeof(m_aScoreInfo[t].m_aPlayerNameText));
+							str_copy(m_aScoreInfo[t].m_aPlayerNameText, pName);
 
 							CTextCursor Cursor;
 							float w = TextRender()->TextWidth(8.0f, pName, -1, -1.0f);
@@ -429,12 +447,12 @@ void CHud::RenderScoreHud()
 						}
 
 						// draw tee
-						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[ID].m_RenderInfo;
+						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[Id].m_RenderInfo;
 						TeeInfo.m_Size = ScoreSingleBoxHeight;
 
 						const CAnimState *pIdleState = CAnimState::GetIdle();
 						vec2 OffsetToMid;
-						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+						CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 						vec2 TeeRenderPos(m_Width - ScoreWidthMax - TeeInfo.m_Size / 2 - Split, StartY + (t * 20) + ScoreSingleBoxHeight / 2.0f + OffsetToMid.y);
 
 						RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
@@ -450,7 +468,7 @@ void CHud::RenderScoreHud()
 				str_format(aBuf, sizeof(aBuf), "%d.", aPos[t]);
 				if(RecreateRect)
 				{
-					mem_copy(m_aScoreInfo[t].m_aRankText, aBuf, sizeof(m_aScoreInfo[t].m_aRankText));
+					str_copy(m_aScoreInfo[t].m_aRankText, aBuf);
 
 					CTextCursor Cursor;
 					TextRender()->SetCursor(&Cursor, m_Width - ScoreWidthMax - ImageSize - Split - PosSize, StartY + t * 20 + (18.f - 10.f) / 2.f, 10.0f, TEXTFLAG_RENDER);
@@ -484,7 +502,7 @@ void CHud::RenderWarmupTimer()
 		if(Seconds < 5)
 			str_format(aBuf, sizeof(aBuf), "%d.%d", Seconds, (m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer * 10 / Client()->GameTickSpeed()) % 10);
 		else
-			str_from_int(Seconds, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", Seconds);
 		w = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 		TextRender()->Text(150 * Graphics()->ScreenAspect() + -w / 2, 75, FontSize, aBuf, -1.0f);
 	}
@@ -492,13 +510,18 @@ void CHud::RenderWarmupTimer()
 
 void CHud::RenderTextInfo()
 {
-	if(g_Config.m_ClShowfps)
+	int Showfps = g_Config.m_ClShowfps;
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current())
+		Showfps = 0;
+#endif
+	if(Showfps)
 	{
 		// calculate avg. fps
 		m_FrameTimeAvg = m_FrameTimeAvg * 0.9f + Client()->RenderFrameTime() * 0.1f;
 		char aBuf[64];
 		int FrameTime = (int)(1.0f / m_FrameTimeAvg + 0.5f);
-		str_from_int(FrameTime, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", FrameTime);
 
 		static float s_TextWidth0 = TextRender()->TextWidth(12.f, "0", -1, -1.0f);
 		static float s_TextWidth00 = TextRender()->TextWidth(12.f, "00", -1, -1.0f);
@@ -527,132 +550,8 @@ void CHud::RenderTextInfo()
 	if(g_Config.m_ClShowpred && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		char aBuf[64];
-		str_from_int(Client()->GetPredictionTime(), aBuf);
-		TextRender()->Text(m_Width - 10 - TextRender()->TextWidth(12, aBuf, -1, -1.0f), g_Config.m_ClShowfps ? 20 : 5, 12, aBuf, -1.0f);
-	}
-
-	//initial idea from tater - tater uses "notifyWhenLast" aswell, i dont like that - because it seems scripty to use (alerts you when everyone except you is in freeze)
-
-	if((g_Config.m_ClShowFrozenText > 0 || g_Config.m_ClShowFrozenHud > 0) && GameClient()->m_GameInfo.m_EntitiesDDRace)
-	{
-		int NumInTeam = 0;
-		int NumFrozen = 0;
-		int LocalTeamID = m_pClient->m_Snap.m_SpecInfo.m_Active == 1 && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != -1 ?
-					  m_pClient->m_Teams.Team(m_pClient->m_Snap.m_SpecInfo.m_SpectatorID) :
-					  m_pClient->m_Teams.Team(m_pClient->m_Snap.m_LocalClientID);
-
-		for(int i = 0; i < MAX_CLIENTS; i++)
-		{
-			if(!m_pClient->m_Snap.m_apPlayerInfos[i])
-				continue;
-
-			if(m_pClient->m_Teams.Team(i) == LocalTeamID)
-			{
-				NumInTeam++;
-				if(m_pClient->m_aClients[i].m_FreezeEnd > 0 || m_pClient->m_aClients[i].m_DeepFrozen)
-					NumFrozen++;
-			}
-		}
-
-		char aBuf[64];
-		if(g_Config.m_ClShowFrozenText == 1)
-			str_format(aBuf, sizeof(aBuf), "%d / %d", NumInTeam - NumFrozen, NumInTeam);
-		else if(g_Config.m_ClShowFrozenText == 2)
-			str_format(aBuf, sizeof(aBuf), "%d / %d", NumFrozen, NumInTeam);
-		if(g_Config.m_ClShowFrozenText > 0)
-			TextRender()->Text(m_Width / 2 - TextRender()->TextWidth(10, aBuf, -1, -1.0f) / 2, 12, 10, aBuf, -1.0f);
-
-		if(g_Config.m_ClShowFrozenHud > 0 && !m_pClient->m_Scoreboard.Active() && !(LocalTeamID == 0 && g_Config.m_ClFrozenHudTeamOnly))
-		{
-			CTeeRenderInfo FreezeInfo;
-			const CSkin *pSkin = m_pClient->m_Skins.Find("x_ninja");
-			FreezeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-			FreezeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-			FreezeInfo.m_BloodColor = pSkin->m_BloodColor;
-			FreezeInfo.m_SkinMetrics = pSkin->m_Metrics;
-			FreezeInfo.m_ColorBody = ColorRGBA(1, 1, 1);
-			FreezeInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
-			FreezeInfo.m_CustomColoredSkin = false;
-
-			float progressiveOffset = 0.0f;
-			float TeeSize = g_Config.m_ClFrozenHudTeeSize;
-			int MaxTees = (int)(8.3 * (m_Width / m_Height) * 13.0f / TeeSize);
-			if(!g_Config.m_ClShowfps && !g_Config.m_ClShowpred)
-				MaxTees = (int)(9.5 * (m_Width / m_Height) * 13.0f / TeeSize);
-			int MaxRows = g_Config.m_ClFrozenMaxRows;
-			float StartPos = m_Width / 2 + 38.0f * (m_Width / m_Height) / 1.78;
-
-			int TotalRows = std::min(MaxRows, (NumInTeam + MaxTees - 1) / MaxTees);
-			//create quad layer a little better than tater >:3
-			Graphics()->TextureClear();
-			Graphics()->QuadsBegin();
-			Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.35f);
-			Graphics()->DrawRectExt(StartPos - TeeSize / 2, 0.0f, TeeSize * std::min(NumInTeam, MaxTees), TeeSize + 2.0f + (TotalRows - 1) * TeeSize, 4.0f, IGraphics::CORNER_B);
-			Graphics()->QuadsEnd();
-
-			bool Overflow = NumInTeam > MaxTees * MaxRows;
-
-			int NumDisplayed = 0;
-			int NumInRow = 0;
-			int CurrentRow = 0;
-
-			for(int OverflowIndex = 0; OverflowIndex < 1 + Overflow; OverflowIndex++)
-			{
-				for(int i = 0; i < MAX_CLIENTS && NumDisplayed < MaxTees * MaxRows; i++)
-				{
-					if(!m_pClient->m_Snap.m_apPlayerInfos[i])
-						continue;
-					if(m_pClient->m_Teams.Team(i) == LocalTeamID)
-					{
-						bool Frozen = false;
-						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[i].m_RenderInfo;
-						if(m_pClient->m_aClients[i].m_FreezeEnd > 0 || m_pClient->m_aClients[i].m_DeepFrozen)
-						{
-							if(!g_Config.m_ClShowFrozenHudSkins)
-								TeeInfo = FreezeInfo;
-							Frozen = true;
-						}
-
-						if(Overflow && Frozen && OverflowIndex == 0)
-							continue;
-						if(Overflow && !Frozen && OverflowIndex == 1)
-							continue;
-
-						NumDisplayed++;
-						NumInRow++;
-						if(NumInRow > MaxTees)
-						{
-							NumInRow = 1;
-							progressiveOffset = 0.0f;
-							CurrentRow++;
-						}
-
-						TeeInfo.m_Size = TeeSize;
-						const CAnimState *pIdleState = CAnimState::GetIdle();
-						vec2 OffsetToMid;
-						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
-						vec2 TeeRenderPos(StartPos + progressiveOffset, TeeSize * (0.7f) + CurrentRow * TeeSize);
-						float Alpha = 1.0f;
-						CNetObj_Character CurChar = m_pClient->m_aClients[i].m_RenderCur;
-						if(g_Config.m_ClShowFrozenHudSkins && Frozen)
-						{
-							Alpha = 0.6f;
-							TeeInfo.m_ColorBody.r *= 0.4;
-							TeeInfo.m_ColorBody.g *= 0.4;
-							TeeInfo.m_ColorBody.b *= 0.4;
-							TeeInfo.m_ColorFeet.r *= 0.4;
-							TeeInfo.m_ColorFeet.g *= 0.4;
-							TeeInfo.m_ColorFeet.b *= 0.4;
-						}
-						if(Frozen)
-							RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_HAPPY, vec2(1.0f, 0.0f), TeeRenderPos, Alpha);
-						else
-							RenderTools()->RenderTee(pIdleState, &TeeInfo, CurChar.m_Emote, vec2(1.0f, 0.0f), TeeRenderPos);
-						progressiveOffset += TeeSize;
-					}
-				}
-			}
-		}
+		str_format(aBuf, sizeof(aBuf), "%d", Client()->GetPredictionTime());
+		TextRender()->Text(m_Width - 10 - TextRender()->TextWidth(12, aBuf, -1, -1.0f), Showfps ? 20 : 5, 12, aBuf, -1.0f);
 	}
 }
 
@@ -660,7 +559,7 @@ void CHud::RenderConnectionWarning()
 {
 	if(Client()->ConnectionProblems())
 	{
-		const char *pText = Localize("Connection Problems...");
+		const char *pText = Localize("Connection Problems…");
 		float w = TextRender()->TextWidth(24, pText, -1, -1.0f);
 		TextRender()->Text(150 * Graphics()->ScreenAspect() - w / 2, 50, 24, pText, -1.0f);
 	}
@@ -686,57 +585,6 @@ void CHud::RenderTeambalanceWarning()
 	}
 }
 
-void CHud::RenderVoting()
-{
-	if((!g_Config.m_ClShowVotesAfterVoting && !m_pClient->m_Scoreboard.Active() && m_pClient->m_Voting.TakenChoice()) || !m_pClient->m_Voting.IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
-		return;
-
-	Graphics()->DrawRect(-10, 60 - 2, 100 + 10 + 4 + 5, 46, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 5.0f);
-
-	TextRender()->TextColor(TextRender()->DefaultTextColor());
-
-	CTextCursor Cursor;
-	char aBuf[512];
-	str_format(aBuf, sizeof(aBuf), Localize("%ds left"), m_pClient->m_Voting.SecondsLeft());
-	float tw = TextRender()->TextWidth(6, aBuf, -1, -1.0f);
-	TextRender()->SetCursor(&Cursor, 5.0f + 100.0f - tw, 60.0f, 6.0f, TEXTFLAG_RENDER);
-	TextRender()->TextEx(&Cursor, aBuf, -1);
-
-	TextRender()->SetCursor(&Cursor, 5.0f, 60.0f, 6.0f, TEXTFLAG_RENDER);
-	Cursor.m_LineWidth = 100.0f - tw;
-	Cursor.m_MaxLines = 3;
-	TextRender()->TextEx(&Cursor, m_pClient->m_Voting.VoteDescription(), -1);
-
-	// reason
-	str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), m_pClient->m_Voting.VoteReason());
-	TextRender()->SetCursor(&Cursor, 5.0f, 79.0f, 6.0f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
-	Cursor.m_LineWidth = 100.0f;
-	TextRender()->TextEx(&Cursor, aBuf, -1);
-
-	CUIRect Base = {5, 88, 100, 4};
-	m_pClient->m_Voting.RenderBars(Base, false);
-
-	char aKey[64];
-	m_pClient->m_Binds.GetKey("vote yes", aKey, sizeof(aKey));
-
-	str_format(aBuf, sizeof(aBuf), "%s - %s", aKey, Localize("Vote yes"));
-	Base.y += Base.h;
-	Base.h = 12.0f;
-	if(m_pClient->m_Voting.TakenChoice() == 1)
-		TextRender()->TextColor(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f));
-	UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_ML);
-
-	TextRender()->TextColor(TextRender()->DefaultTextColor());
-
-	m_pClient->m_Binds.GetKey("vote no", aKey, sizeof(aKey));
-	str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), aKey);
-	if(m_pClient->m_Voting.TakenChoice() == -1)
-		TextRender()->TextColor(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f));
-	UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_MR);
-
-	TextRender()->TextColor(TextRender()->DefaultTextColor());
-}
-
 void CHud::RenderCursor()
 {
 	if(!m_pClient->m_Snap.m_pLocalCharacter || Client()->State() == IClient::STATE_DEMOPLAYBACK)
@@ -919,22 +767,24 @@ void CHud::PreparePlayerStateQuads()
 	m_DummyHammerOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
 	m_DummyCopyOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
 
-	// Quad for displaying practice mode
+	// Quads for displaying team modes
 	m_PracticeModeOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_LockModeOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_Team0ModeOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
 }
 
-void CHud::RenderPlayerState(const int ClientID)
+void CHud::RenderPlayerState(const int ClientId)
 {
 	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
 
 	// pCharacter contains the predicted character for local players or the last snap for players who are spectated
-	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientID].m_Predicted;
-	CNetObj_Character *pPlayer = &m_pClient->m_aClients[ClientID].m_RenderCur;
+	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientId].m_Predicted;
+	CNetObj_Character *pPlayer = &m_pClient->m_aClients[ClientId].m_RenderCur;
 	int TotalJumpsToDisplay = 0;
 	if(g_Config.m_ClShowhudJumpsIndicator)
 	{
 		int AvailableJumpsToDisplay;
-		if(m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+		if(m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo)
 		{
 			bool Grounded = false;
 			if(Collision()->CheckPoint(pPlayer->m_X + CCharacterCore::PhysicalSize() / 2,
@@ -980,7 +830,7 @@ void CHud::RenderPlayerState(const int ClientID)
 		}
 		else
 		{
-			TotalJumpsToDisplay = AvailableJumpsToDisplay = absolute(m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData.m_Jumps);
+			TotalJumpsToDisplay = AvailableJumpsToDisplay = absolute(m_pClient->m_Snap.m_aCharacters[ClientId].m_ExtendedData.m_Jumps);
 		}
 
 		// render available and used jumps
@@ -1033,7 +883,7 @@ void CHud::RenderPlayerState(const int ClientID)
 		{
 			const int Max = g_pData->m_Weapons.m_Ninja.m_Duration * Client()->GameTickSpeed() / 1000;
 			float NinjaProgress = clamp(pCharacter->m_Ninja.m_ActivationTick + g_pData->m_Weapons.m_Ninja.m_Duration * Client()->GameTickSpeed() / 1000 - Client()->GameTick(g_Config.m_ClDummy), 0, Max) / (float)Max;
-			if(NinjaProgress > 0.0f && m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+			if(NinjaProgress > 0.0f && m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo)
 			{
 				RenderNinjaBarPos(x, y - 12, 6.f, 24.f, NinjaProgress);
 			}
@@ -1159,12 +1009,24 @@ void CHud::RenderPlayerState(const int ClientID)
 	{
 		y += 12;
 	}
-	if(m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo && m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData.m_Flags & CHARACTERFLAG_PRACTICE_MODE)
+	if(m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo && m_pClient->m_Snap.m_aCharacters[ClientId].m_ExtendedData.m_Flags & CHARACTERFLAG_LOCK_MODE)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudLockMode);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_LockModeOffset, x, y);
+		x += 12;
+	}
+	if(m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo && m_pClient->m_Snap.m_aCharacters[ClientId].m_ExtendedData.m_Flags & CHARACTERFLAG_PRACTICE_MODE)
 	{
 		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudPracticeMode);
 		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_PracticeModeOffset, x, y);
 		x += 12;
 	}
+	if(m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo && m_pClient->m_Snap.m_aCharacters[ClientId].m_ExtendedData.m_Flags & CHARACTERFLAG_TEAM0_MODE)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudTeam0Mode);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_Team0ModeOffset, x, y);
+		x += 12;
+	}
 	if(pCharacter->m_DeepFrozen)
 	{
 		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudDeepFrozen);
@@ -1178,7 +1040,7 @@ void CHud::RenderPlayerState(const int ClientID)
 	}
 }
 
-void CHud::RenderNinjaBarPos(const float x, float y, const float width, const float height, float Progress, const float Alpha)
+void CHud::RenderNinjaBarPos(const float x, float y, const float Width, const float Height, float Progress, const float Alpha)
 {
 	Progress = clamp(Progress, 0.0f, 1.0f);
 
@@ -1187,9 +1049,9 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
 	const float RestPct = 0.5f;
 	const float ProgPct = 0.5f;
 
-	const float EndHeight = width; // to keep the correct scale - the width of the sprite is as long as the height
-	const float BarWidth = width;
-	const float WholeBarHeight = height;
+	const float EndHeight = Width; // to keep the correct scale - the width of the sprite is as long as the height
+	const float BarWidth = Width;
+	const float WholeBarHeight = Height;
 	const float MiddleBarHeight = WholeBarHeight - (EndHeight * 2.0f);
 	const float EndProgressHeight = EndHeight * ProgPct;
 	const float EndRestHeight = EndHeight * RestPct;
@@ -1401,7 +1263,29 @@ inline float CHud::GetMovementInformationBoxHeight()
 	return BoxHeight;
 }
 
-void CHud::RenderMovementInformation(const int ClientID)
+void CHud::UpdateMovementInformationTextContainer(STextContainerIndex &TextContainer, float FontSize, float Value, char *pPrevValue, size_t Size)
+{
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "%.2f", Value);
+
+	if(!TextContainer.Valid() || str_comp(pPrevValue, aBuf) != 0)
+	{
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+		TextRender()->RecreateTextContainer(TextContainer, &Cursor, aBuf);
+		str_copy(pPrevValue, aBuf, Size);
+	}
+}
+
+void CHud::RenderMovementInformationTextContainer(STextContainerIndex &TextContainer, const ColorRGBA &Color, float X, float Y)
+{
+	if(TextContainer.Valid())
+	{
+		TextRender()->RenderTextContainer(TextContainer, Color, TextRender()->DefaultTextOutlineColor(), X - TextRender()->GetBoundingBoxTextContainer(TextContainer).m_W, Y);
+	}
+}
+
+void CHud::RenderMovementInformation(const int ClientId)
 {
 	// Draw the infomations depending on settings: Position, speed and target angle
 	// This display is only to present the available information from the last snapshot, not to interpolate or predict
@@ -1424,8 +1308,8 @@ void CHud::RenderMovementInformation(const int ClientID)
 
 	Graphics()->DrawRect(StartX, StartY, BoxWidth, BoxHeight, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_L, 5.0f);
 
-	const CNetObj_Character *pPrevChar = &m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev;
-	const CNetObj_Character *pCurChar = &m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur;
+	const CNetObj_Character *pPrevChar = &m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev;
+	const CNetObj_Character *pCurChar = &m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur;
 	const float IntraTick = Client()->IntraGameTick(g_Config.m_ClDummy);
 
 	// To make the player position relative to blocks we need to divide by the block size
@@ -1452,35 +1336,16 @@ void CHud::RenderMovementInformation(const int ClientID)
 	DisplaySpeedX *= Ramp;
 	float DisplaySpeedY = VelspeedY / 32;
 
-	float Angle = m_pClient->m_Players.GetPlayerTargetAngle(pPrevChar, pCurChar, ClientID, IntraTick);
+	float Angle = m_pClient->m_Players.GetPlayerTargetAngle(pPrevChar, pCurChar, ClientId, IntraTick);
 	if(Angle < 0)
 	{
 		Angle += 2.0f * pi;
 	}
 	float DisplayAngle = Angle * 180.0f / pi;
 
-	char aBuf[128];
-	float w;
-
 	float y = StartY + LineSpacer * 2;
 	float xl = StartX + 2;
 	float xr = m_Width - 2;
-	int DigitsIndex;
-
-	static float s_TextWidth0 = TextRender()->TextWidth(Fontsize, "0.00", -1, -1.0f);
-	static float s_TextWidth00 = TextRender()->TextWidth(Fontsize, "00.00", -1, -1.0f);
-	static float s_TextWidth000 = TextRender()->TextWidth(Fontsize, "000.00", -1, -1.0f);
-	static float s_TextWidth0000 = TextRender()->TextWidth(Fontsize, "0000.00", -1, -1.0f);
-	static float s_TextWidth00000 = TextRender()->TextWidth(Fontsize, "00000.00", -1, -1.0f);
-	static float s_TextWidth000000 = TextRender()->TextWidth(Fontsize, "000000.00", -1, -1.0f);
-	static float s_aTextWidth[6] = {s_TextWidth0, s_TextWidth00, s_TextWidth000, s_TextWidth0000, s_TextWidth00000, s_TextWidth000000};
-	static float s_TextWidthMinus0 = TextRender()->TextWidth(Fontsize, "-0.00", -1, -1.0f);
-	static float s_TextWidthMinus00 = TextRender()->TextWidth(Fontsize, "-00.00", -1, -1.0f);
-	static float s_TextWidthMinus000 = TextRender()->TextWidth(Fontsize, "-000.00", -1, -1.0f);
-	static float s_TextWidthMinus0000 = TextRender()->TextWidth(Fontsize, "-0000.00", -1, -1.0f);
-	static float s_TextWidthMinus00000 = TextRender()->TextWidth(Fontsize, "-00000.00", -1, -1.0f);
-	static float s_TextWidthMinus000000 = TextRender()->TextWidth(Fontsize, "-000000.00", -1, -1.0f);
-	static float s_aTextWidthMinus[6] = {s_TextWidthMinus0, s_TextWidthMinus00, s_TextWidthMinus000, s_TextWidthMinus0000, s_TextWidthMinus00000, s_TextWidthMinus000000};
 
 	if(g_Config.m_ClShowhudPlayerPosition)
 	{
@@ -1488,17 +1353,13 @@ void CHud::RenderMovementInformation(const int ClientID)
 		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
 
 		TextRender()->Text(xl, y, Fontsize, "X:", -1.0f);
-		str_format(aBuf, sizeof(aBuf), "%.2f", Pos.x);
-		DigitsIndex = GetDigitsIndex(Pos.x, 5);
-		w = (Pos.x < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
-		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		UpdateMovementInformationTextContainer(m_aPlayerPositionContainers[0], Fontsize, Pos.x, m_aaPlayerPositionText[0], sizeof(m_aaPlayerPositionText[0]));
+		RenderMovementInformationTextContainer(m_aPlayerPositionContainers[0], TextRender()->DefaultTextColor(), xr, y);
 		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
 
 		TextRender()->Text(xl, y, Fontsize, "Y:", -1.0f);
-		str_format(aBuf, sizeof(aBuf), "%.2f", Pos.y);
-		DigitsIndex = GetDigitsIndex(Pos.y, 5);
-		w = (Pos.y < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
-		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		UpdateMovementInformationTextContainer(m_aPlayerPositionContainers[1], Fontsize, Pos.y, m_aaPlayerPositionText[1], sizeof(m_aaPlayerPositionText[1]));
+		RenderMovementInformationTextContainer(m_aPlayerPositionContainers[1], TextRender()->DefaultTextColor(), xr, y);
 		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
 	}
 
@@ -1507,29 +1368,30 @@ void CHud::RenderMovementInformation(const int ClientID)
 		TextRender()->Text(xl, y, Fontsize, Localize("Speed:"), -1.0f);
 		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
 
-		TextRender()->Text(xl, y, Fontsize, "X:", -1.0f);
-		str_format(aBuf, sizeof(aBuf), "%.2f", DisplaySpeedX);
-		DigitsIndex = GetDigitsIndex(DisplaySpeedX, 5);
-		w = (DisplaySpeedX < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
-		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
-		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+		const char aaCoordinates[][4] = {"X:", "Y:"};
+		for(int i = 0; i < 2; i++)
+		{
+			ColorRGBA Color(1, 1, 1, 1);
+			if(m_aLastPlayerSpeedChange[i] == ESpeedChange::INCREASE)
+				Color = ColorRGBA(0, 1, 0, 1);
+			if(m_aLastPlayerSpeedChange[i] == ESpeedChange::DECREASE)
+				Color = ColorRGBA(1, 0.5f, 0.5f, 1);
+			TextRender()->Text(xl, y, Fontsize, aaCoordinates[i], -1.0f);
+			UpdateMovementInformationTextContainer(m_aPlayerSpeedTextContainers[i], Fontsize, i == 0 ? DisplaySpeedX : DisplaySpeedY, m_aaPlayerSpeedText[i], sizeof(m_aaPlayerSpeedText[i]));
+			RenderMovementInformationTextContainer(m_aPlayerSpeedTextContainers[i], Color, xr, y);
+			y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+		}
 
-		TextRender()->Text(xl, y, Fontsize, "Y:", -1.0f);
-		str_format(aBuf, sizeof(aBuf), "%.2f", DisplaySpeedY);
-		DigitsIndex = GetDigitsIndex(DisplaySpeedY, 5);
-		w = (DisplaySpeedY < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
-		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
-		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+		TextRender()->TextColor(1, 1, 1, 1);
 	}
 
 	if(g_Config.m_ClShowhudPlayerAngle)
 	{
 		TextRender()->Text(xl, y, Fontsize, Localize("Angle:"), -1.0f);
 		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
-		str_format(aBuf, sizeof(aBuf), "%.2f", DisplayAngle);
-		DigitsIndex = GetDigitsIndex(DisplayAngle, 5);
-		w = (DisplayAngle < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
-		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+
+		UpdateMovementInformationTextContainer(m_PlayerAngleTextContainerIndex, Fontsize, DisplayAngle, m_aPlayerAngleText, sizeof(m_aPlayerAngleText));
+		RenderMovementInformationTextContainer(m_PlayerAngleTextContainerIndex, TextRender()->DefaultTextColor(), xr, y);
 	}
 }
 
@@ -1540,7 +1402,18 @@ void CHud::RenderSpectatorHud()
 
 	// draw the text
 	char aBuf[128];
-	str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Spectate"), GameClient()->m_MultiViewActivated ? Localize("Multi-View") : m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW ? m_pClient->m_aClients[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID].m_aName : Localize("Free-View"));
+	if(GameClient()->m_MultiViewActivated)
+	{
+		str_copy(aBuf, Localize("Multi-View"));
+	}
+	else if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("Following %s", "Spectating"), m_pClient->m_aClients[m_pClient->m_Snap.m_SpecInfo.m_SpectatorId].m_aName);
+	}
+	else
+	{
+		str_copy(aBuf, Localize("Free-View"));
+	}
 	TextRender()->Text(m_Width - 174.0f, m_Height - 15.0f + (15.f - 8.f) / 2.f, 8.0f, aBuf, -1.0f);
 }
 
@@ -1558,8 +1431,57 @@ void CHud::RenderLocalTime(float x)
 	TextRender()->Text(x - 25.0f, (12.5f - 5.f) / 2.f, 5.0f, aTimeStr, -1.0f);
 }
 
+void CHud::OnNewSnapshot()
+{
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+	if(!m_pClient->m_Snap.m_pGameInfoObj)
+		return;
+
+	int ClientId = -1;
+	if(m_pClient->m_Snap.m_pLocalCharacter && !m_pClient->m_Snap.m_SpecInfo.m_Active && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+		ClientId = m_pClient->m_Snap.m_LocalClientId;
+	else if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+		ClientId = m_pClient->m_Snap.m_SpecInfo.m_SpectatorId;
+
+	if(ClientId == -1)
+		return;
+
+	const CNetObj_Character *pPrevChar = &m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev;
+	const CNetObj_Character *pCurChar = &m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur;
+	const float IntraTick = Client()->IntraGameTick(g_Config.m_ClDummy);
+	ivec2 Vel = mix(ivec2(pPrevChar->m_VelX, pPrevChar->m_VelY), ivec2(pCurChar->m_VelX, pCurChar->m_VelY), IntraTick);
+
+	CCharacter *pChar = m_pClient->m_PredictedWorld.GetCharacterById(ClientId);
+	if(pChar && pChar->IsGrounded())
+		Vel.y = 0;
+
+	int aVels[2] = {Vel.x, Vel.y};
+
+	for(int i = 0; i < 2; i++)
+	{
+		int AbsVel = abs(aVels[i]);
+		if(AbsVel > m_aPlayerSpeed[i])
+		{
+			m_aLastPlayerSpeedChange[i] = ESpeedChange::INCREASE;
+		}
+		if(AbsVel < m_aPlayerSpeed[i])
+		{
+			m_aLastPlayerSpeedChange[i] = ESpeedChange::DECREASE;
+		}
+		if(AbsVel < 2)
+		{
+			m_aLastPlayerSpeedChange[i] = ESpeedChange::NONE;
+		}
+		m_aPlayerSpeed[i] = AbsVel;
+	}
+}
+
 void CHud::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!m_pClient->m_Snap.m_pGameInfoObj)
 		return;
 
@@ -1579,31 +1501,31 @@ void CHud::OnRender()
 			{
 				RenderAmmoHealthAndArmor(m_pClient->m_Snap.m_pLocalCharacter);
 			}
-			if(m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData && g_Config.m_ClShowhudDDRace && GameClient()->m_GameInfo.m_HudDDRace)
+			if(m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientId].m_HasExtendedData && g_Config.m_ClShowhudDDRace && GameClient()->m_GameInfo.m_HudDDRace)
 			{
-				RenderPlayerState(m_pClient->m_Snap.m_LocalClientID);
+				RenderPlayerState(m_pClient->m_Snap.m_LocalClientId);
 			}
-			RenderMovementInformation(m_pClient->m_Snap.m_LocalClientID);
+			RenderMovementInformation(m_pClient->m_Snap.m_LocalClientId);
 			RenderDDRaceEffects();
 		}
 		else if(m_pClient->m_Snap.m_SpecInfo.m_Active)
 		{
-			int SpectatorID = m_pClient->m_Snap.m_SpecInfo.m_SpectatorID;
-			if(SpectatorID != SPEC_FREEVIEW && g_Config.m_ClShowhudHealthAmmo)
+			int SpectatorId = m_pClient->m_Snap.m_SpecInfo.m_SpectatorId;
+			if(SpectatorId != SPEC_FREEVIEW && g_Config.m_ClShowhudHealthAmmo)
 			{
-				RenderAmmoHealthAndArmor(&m_pClient->m_Snap.m_aCharacters[SpectatorID].m_Cur);
+				RenderAmmoHealthAndArmor(&m_pClient->m_Snap.m_aCharacters[SpectatorId].m_Cur);
 			}
-			if(SpectatorID != SPEC_FREEVIEW &&
-				m_pClient->m_Snap.m_aCharacters[SpectatorID].m_HasExtendedData &&
+			if(SpectatorId != SPEC_FREEVIEW &&
+				m_pClient->m_Snap.m_aCharacters[SpectatorId].m_HasExtendedData &&
 				g_Config.m_ClShowhudDDRace &&
 				(!GameClient()->m_MultiViewActivated || GameClient()->m_MultiViewShowHud) &&
 				GameClient()->m_GameInfo.m_HudDDRace)
 			{
-				RenderPlayerState(SpectatorID);
+				RenderPlayerState(SpectatorId);
 			}
-			if(SpectatorID != SPEC_FREEVIEW)
+			if(SpectatorId != SPEC_FREEVIEW)
 			{
-				RenderMovementInformation(SpectatorID);
+				RenderMovementInformation(SpectatorId);
 			}
 			RenderSpectatorHud();
 		}
@@ -1621,7 +1543,7 @@ void CHud::OnRender()
 		if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
 			RenderConnectionWarning();
 		RenderTeambalanceWarning();
-		RenderVoting();
+		m_pClient->m_Voting.Render();
 		if(g_Config.m_ClShowRecord)
 			RenderRecord();
 	}
@@ -1724,7 +1646,7 @@ void CHud::RenderDDRaceEffects()
 			}
 			TextRender()->TextColor(TextRender()->DefaultTextColor());
 		}
-		else if(!m_ShowFinishTime && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
+		else if(g_Config.m_ClShowhudTimeCpDiff && !m_ShowFinishTime && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
 		{
 			if(m_TimeCpDiff < 0)
 			{
@@ -1773,8 +1695,7 @@ void CHud::RenderRecord()
 	if(m_ServerRecord > 0.0f)
 	{
 		char aBuf[64];
-		str_format(aBuf, sizeof(aBuf), Localize("Server best:"));
-		TextRender()->Text(5, 75, 6, aBuf, -1.0f);
+		TextRender()->Text(5, 75, 6, Localize("Server best:"), -1.0f);
 		char aTime[32];
 		str_time_float(m_ServerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
 		str_format(aBuf, sizeof(aBuf), "%s%s", m_ServerRecord > 3600 ? "" : "   ", aTime);
@@ -1785,8 +1706,7 @@ void CHud::RenderRecord()
 	if(PlayerRecord > 0.0f)
 	{
 		char aBuf[64];
-		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"));
-		TextRender()->Text(5, 82, 6, aBuf, -1.0f);
+		TextRender()->Text(5, 82, 6, Localize("Personal best:"), -1.0f);
 		char aTime[32];
 		str_time_float(PlayerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
 		str_format(aBuf, sizeof(aBuf), "%s%s", PlayerRecord > 3600 ? "" : "   ", aTime);
diff --git a/src/game/client/components/hud.h b/src/game/client/components/hud.h
index f292dd0b1c..23463bc724 100644
--- a/src/game/client/components/hud.h
+++ b/src/game/client/components/hud.h
@@ -2,7 +2,11 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_HUD_H
 #define GAME_CLIENT_COMPONENTS_HUD_H
+#include <engine/client.h>
+#include <engine/shared/protocol.h>
+#include <engine/textrender.h>
 #include <game/client/component.h>
+#include <game/generated/protocol.h>
 
 struct SScoreInfo
 {
@@ -45,6 +49,20 @@ class CHud : public CComponent
 	SScoreInfo m_aScoreInfo[2];
 	STextContainerIndex m_FPSTextContainerIndex;
 	STextContainerIndex m_DDRaceEffectsTextContainerIndex;
+	STextContainerIndex m_PlayerAngleTextContainerIndex;
+	char m_aPlayerAngleText[128];
+	STextContainerIndex m_aPlayerSpeedTextContainers[2];
+	char m_aaPlayerSpeedText[2][128];
+	int m_aPlayerSpeed[2];
+	enum class ESpeedChange
+	{
+		NONE,
+		INCREASE,
+		DECREASE
+	};
+	ESpeedChange m_aLastPlayerSpeedChange[2];
+	STextContainerIndex m_aPlayerPositionContainers[2];
+	char m_aaPlayerPositionText[2][128];
 
 	void RenderCursor();
 
@@ -57,14 +75,20 @@ class CHud : public CComponent
 	void RenderAmmoHealthAndArmor(const CNetObj_Character *pCharacter);
 
 	void PreparePlayerStateQuads();
-	void RenderPlayerState(const int ClientID);
+	void RenderPlayerState(const int ClientId);
 	void RenderDummyActions();
-	void RenderMovementInformation(const int ClientID);
+	void RenderMovementInformation(const int ClientId);
+
+	void UpdateMovementInformationTextContainer(STextContainerIndex &TextContainer, float FontSize, float Value, char *pPrevValue, size_t Size);
+	void RenderMovementInformationTextContainer(STextContainerIndex &TextContainer, const ColorRGBA &Color, float X, float Y);
 
 	void RenderGameTimer();
 	void RenderPauseNotification();
 	void RenderSuddenDeath();
+
 	void RenderScoreHud();
+	int m_LastLocalClientId = -1;
+
 	void RenderSpectatorHud();
 	void RenderWarmupTimer();
 	void RenderLocalTime(float x);
@@ -80,11 +104,12 @@ class CHud : public CComponent
 	virtual void OnReset() override;
 	virtual void OnRender() override;
 	virtual void OnInit() override;
+	virtual void OnNewSnapshot() override;
 
 	// DDRace
 
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
-	void RenderNinjaBarPos(float x, const float y, const float width, const float height, float Progress, float Alpha = 1.0f);
+	void RenderNinjaBarPos(float x, const float y, const float Width, const float Height, float Progress, float Alpha = 1.0f);
 
 private:
 	void RenderRecord();
@@ -131,6 +156,8 @@ class CHud : public CComponent
 	int m_DummyHammerOffset;
 	int m_DummyCopyOffset;
 	int m_PracticeModeOffset;
+	int m_Team0ModeOffset;
+	int m_LockModeOffset;
 };
 
 #endif
diff --git a/src/game/client/components/infomessages.cpp b/src/game/client/components/infomessages.cpp
index d461d67051..243072568a 100644
--- a/src/game/client/components/infomessages.cpp
+++ b/src/game/client/components/infomessages.cpp
@@ -14,11 +14,14 @@
 #include <game/client/prediction/entities/character.h>
 #include <game/client/prediction/gameworld.h>
 
+static constexpr float ROW_HEIGHT = 46.0f;
+static constexpr float FONT_SIZE = 36.0f;
+
 void CInfoMessages::OnWindowResize()
 {
 	for(auto &InfoMsg : m_aInfoMsgs)
 	{
-		DeleteTextContainers(&InfoMsg);
+		DeleteTextContainers(InfoMsg);
 	}
 }
 
@@ -28,16 +31,16 @@ void CInfoMessages::OnReset()
 	for(auto &InfoMsg : m_aInfoMsgs)
 	{
 		InfoMsg.m_Tick = -100000;
-		DeleteTextContainers(&InfoMsg);
+		DeleteTextContainers(InfoMsg);
 	}
 }
 
-void CInfoMessages::DeleteTextContainers(CInfoMsg *pInfoMsg)
+void CInfoMessages::DeleteTextContainers(CInfoMsg &InfoMsg)
 {
-	TextRender()->DeleteTextContainer(pInfoMsg->m_VictimTextContainerIndex);
-	TextRender()->DeleteTextContainer(pInfoMsg->m_KillerTextContainerIndex);
-	TextRender()->DeleteTextContainer(pInfoMsg->m_DiffTextContainerIndex);
-	TextRender()->DeleteTextContainer(pInfoMsg->m_TimeTextContainerIndex);
+	TextRender()->DeleteTextContainer(InfoMsg.m_VictimTextContainerIndex);
+	TextRender()->DeleteTextContainer(InfoMsg.m_KillerTextContainerIndex);
+	TextRender()->DeleteTextContainer(InfoMsg.m_DiffTextContainerIndex);
+	TextRender()->DeleteTextContainer(InfoMsg.m_TimeTextContainerIndex);
 }
 
 void CInfoMessages::OnInit()
@@ -65,87 +68,119 @@ void CInfoMessages::OnInit()
 	Graphics()->QuadContainerUpload(m_SpriteQuadContainerIndex);
 }
 
-void CInfoMessages::AddInfoMsg(EType Type, CInfoMsg NewMsg)
+CInfoMessages::CInfoMsg CInfoMessages::CreateInfoMsg(EType Type)
 {
-	NewMsg.m_Type = Type;
-	NewMsg.m_Tick = Client()->GameTick(g_Config.m_ClDummy);
+	CInfoMsg InfoMsg;
+	InfoMsg.m_Type = Type;
+	InfoMsg.m_Tick = Client()->GameTick(g_Config.m_ClDummy);
 
-	m_InfoMsgCurrent = (m_InfoMsgCurrent + 1) % MAX_INFOMSGS;
-	DeleteTextContainers(&m_aInfoMsgs[m_InfoMsgCurrent]);
-	m_aInfoMsgs[m_InfoMsgCurrent] = NewMsg;
+	for(int i = 0; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
+	{
+		InfoMsg.m_aVictimIds[i] = -1;
+		InfoMsg.m_aVictimRenderInfo[i].Reset();
+	}
+	InfoMsg.m_VictimDDTeam = 0;
+	InfoMsg.m_aVictimName[0] = '\0';
+	InfoMsg.m_VictimTextContainerIndex.Reset();
+
+	InfoMsg.m_KillerId = -1;
+	InfoMsg.m_aKillerName[0] = '\0';
+	InfoMsg.m_KillerTextContainerIndex.Reset();
+	InfoMsg.m_KillerRenderInfo.Reset();
+
+	InfoMsg.m_Weapon = -1;
+	InfoMsg.m_ModeSpecial = 0;
+	InfoMsg.m_FlagCarrierBlue = -1;
+	InfoMsg.m_TeamSize = 0;
+
+	InfoMsg.m_Diff = 0;
+	InfoMsg.m_aTimeText[0] = '\0';
+	InfoMsg.m_aDiffText[0] = '\0';
+	InfoMsg.m_TimeTextContainerIndex.Reset();
+	InfoMsg.m_DiffTextContainerIndex.Reset();
+	InfoMsg.m_RecordPersonal = false;
+	return InfoMsg;
 }
 
-void CInfoMessages::CreateNamesIfNotCreated(CInfoMsg *pInfoMsg)
+void CInfoMessages::AddInfoMsg(const CInfoMsg &InfoMsg)
 {
-	const float FontSize = 36.0f;
-	if(!pInfoMsg->m_VictimTextContainerIndex.Valid() && pInfoMsg->m_aVictimName[0] != 0)
+	if(InfoMsg.m_KillerId >= 0 && !InfoMsg.m_KillerRenderInfo.Valid())
+		return;
+	for(int i = 0; i < InfoMsg.m_TeamSize; i++)
 	{
-		pInfoMsg->m_VictimTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aVictimName);
+		if(InfoMsg.m_aVictimIds[i] < 0 || !InfoMsg.m_aVictimRenderInfo[i].Valid())
+			return;
+	}
 
-		CTextCursor Cursor;
-		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
-		Cursor.m_LineWidth = -1;
+	const float Height = 1.5f * 400.0f * 3.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	Graphics()->MapScreen(0, 0, Width, Height);
+
+	m_InfoMsgCurrent = (m_InfoMsgCurrent + 1) % MAX_INFOMSGS;
+	DeleteTextContainers(m_aInfoMsgs[m_InfoMsgCurrent]);
+	m_aInfoMsgs[m_InfoMsgCurrent] = InfoMsg;
+	CreateTextContainersIfNotCreated(m_aInfoMsgs[m_InfoMsgCurrent]);
 
-		unsigned Color = g_Config.m_ClKillMessageNormalColor;
-		if(pInfoMsg->m_aVictimIds[0] == m_pClient->m_Snap.m_LocalClientID)
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CInfoMessages::CreateTextContainersIfNotCreated(CInfoMsg &InfoMsg)
+{
+	const auto &&NameColor = [&](int ClientId) -> ColorRGBA {
+		unsigned Color;
+		if(ClientId == m_pClient->m_Snap.m_LocalClientId)
 		{
 			Color = g_Config.m_ClKillMessageHighlightColor;
 		}
-		TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(Color)));
+		else
+		{
+			Color = g_Config.m_ClKillMessageNormalColor;
+		}
+		return color_cast<ColorRGBA>(ColorHSLA(Color));
+	};
 
-		TextRender()->CreateTextContainer(pInfoMsg->m_VictimTextContainerIndex, &Cursor, pInfoMsg->m_aVictimName);
+	if(!InfoMsg.m_VictimTextContainerIndex.Valid() && InfoMsg.m_aVictimName[0] != '\0')
+	{
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FONT_SIZE, TEXTFLAG_RENDER);
+		TextRender()->TextColor(NameColor(InfoMsg.m_aVictimIds[0]));
+		TextRender()->CreateTextContainer(InfoMsg.m_VictimTextContainerIndex, &Cursor, InfoMsg.m_aVictimName);
 	}
 
-	if(!pInfoMsg->m_KillerTextContainerIndex.Valid() && pInfoMsg->m_aKillerName[0] != 0)
+	if(!InfoMsg.m_KillerTextContainerIndex.Valid() && InfoMsg.m_aKillerName[0] != '\0')
 	{
-		pInfoMsg->m_KillerTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aKillerName);
-
 		CTextCursor Cursor;
-		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
-		Cursor.m_LineWidth = -1;
-
-		unsigned Color = g_Config.m_ClKillMessageNormalColor;
-		if(pInfoMsg->m_KillerID == m_pClient->m_Snap.m_LocalClientID)
-		{
-			Color = g_Config.m_ClKillMessageHighlightColor;
-		}
-		TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(Color)));
-
-		TextRender()->CreateTextContainer(pInfoMsg->m_KillerTextContainerIndex, &Cursor, pInfoMsg->m_aKillerName);
+		TextRender()->SetCursor(&Cursor, 0, 0, FONT_SIZE, TEXTFLAG_RENDER);
+		TextRender()->TextColor(NameColor(InfoMsg.m_KillerId));
+		TextRender()->CreateTextContainer(InfoMsg.m_KillerTextContainerIndex, &Cursor, InfoMsg.m_aKillerName);
 	}
-	TextRender()->TextColor(TextRender()->DefaultTextColor());
-}
 
-void CInfoMessages::CreateFinishTextContainersIfNotCreated(CInfoMsg *pInfoMsg)
-{
-	const float FontSize = 36.0f;
-	if(!pInfoMsg->m_DiffTextContainerIndex.Valid() && pInfoMsg->m_aDiffText[0] != 0)
+	if(!InfoMsg.m_DiffTextContainerIndex.Valid() && InfoMsg.m_aDiffText[0] != '\0')
 	{
-		pInfoMsg->m_DiffTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aDiffText);
 		CTextCursor Cursor;
-		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
-		Cursor.m_LineWidth = -1;
+		TextRender()->SetCursor(&Cursor, 0, 0, FONT_SIZE, TEXTFLAG_RENDER);
 
-		if(pInfoMsg->m_Diff > 0)
-			TextRender()->TextColor(1.0f, 0.5f, 0.5f, 1); // red
-		else if(pInfoMsg->m_Diff < 0)
-			TextRender()->TextColor(0.5f, 1.0f, 0.5f, 1); // green
+		if(InfoMsg.m_Diff > 0)
+			TextRender()->TextColor(1.0f, 0.5f, 0.5f, 1.0f); // red
+		else if(InfoMsg.m_Diff < 0)
+			TextRender()->TextColor(0.5f, 1.0f, 0.5f, 1.0f); // green
 		else
 			TextRender()->TextColor(TextRender()->DefaultTextColor());
 
-		TextRender()->CreateTextContainer(pInfoMsg->m_DiffTextContainerIndex, &Cursor, pInfoMsg->m_aDiffText);
+		TextRender()->CreateTextContainer(InfoMsg.m_DiffTextContainerIndex, &Cursor, InfoMsg.m_aDiffText);
 	}
-	if(!pInfoMsg->m_TimeTextContainerIndex.Valid() && pInfoMsg->m_aTimeText[0] != 0)
+
+	if(!InfoMsg.m_TimeTextContainerIndex.Valid() && InfoMsg.m_aTimeText[0] != '\0')
 	{
-		pInfoMsg->m_TimeTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aTimeText);
 		CTextCursor Cursor;
-		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
-		Cursor.m_LineWidth = -1;
-
+		TextRender()->SetCursor(&Cursor, 0, 0, FONT_SIZE, TEXTFLAG_RENDER);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
-
-		TextRender()->CreateTextContainer(pInfoMsg->m_TimeTextContainerIndex, &Cursor, pInfoMsg->m_aTimeText);
+		TextRender()->CreateTextContainer(InfoMsg.m_TimeTextContainerIndex, &Cursor, InfoMsg.m_aTimeText);
 	}
+
 	TextRender()->TextColor(TextRender()->DefaultTextColor());
 }
 
@@ -154,400 +189,288 @@ void CInfoMessages::OnMessage(int MsgType, void *pRawMsg)
 	if(m_pClient->m_SuppressEvents)
 		return;
 
-	if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM && g_Config.m_ClShowKillMessages)
+	switch(MsgType)
 	{
-		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
-
-		CInfoMsg Kill{};
-
-		std::vector<std::pair<int, int>> vStrongWeakSorted;
-		for(int i = 0; i < MAX_CLIENTS; i++)
-		{
-			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team)
-			{
-				CCharacter *pChr = m_pClient->m_GameWorld.GetCharacterByID(i);
-				vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChr ? pChr->GetStrongWeakID() : 0);
-			}
-		}
-
-		std::stable_sort(vStrongWeakSorted.begin(), vStrongWeakSorted.end(), [](auto &Left, auto &Right) { return Left.second > Right.second; });
-
-		Kill.m_TeamSize = vStrongWeakSorted.size();
-		if(Kill.m_TeamSize > MAX_KILLMSG_TEAM_MEMBERS)
-			Kill.m_TeamSize = MAX_KILLMSG_TEAM_MEMBERS;
-
-		Kill.m_VictimDDTeam = pMsg->m_Team;
-		for(int i = 0; i < Kill.m_TeamSize; i++)
-		{
-			if(m_pClient->m_aClients[vStrongWeakSorted[i].first].m_Active)
-			{
-				Kill.m_aVictimIds[i] = vStrongWeakSorted[i].first;
-				Kill.m_aVictimRenderInfo[i] = m_pClient->m_aClients[vStrongWeakSorted[i].first].m_RenderInfo;
-			}
-			else
-			{
-				Kill.m_aVictimIds[i] = -1;
-				Kill.m_aVictimRenderInfo[i].Reset();
-			}
-		}
-		for(int i = Kill.m_TeamSize; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
-		{
-			Kill.m_aVictimIds[i] = -1;
-			Kill.m_aVictimRenderInfo[i].Reset();
-		}
-		str_format(Kill.m_aVictimName, sizeof(Kill.m_aVictimName), Localize("Team %d"), pMsg->m_Team);
-
-		Kill.m_KillerID = -1;
-		Kill.m_aKillerName[0] = '\0';
-		Kill.m_KillerRenderInfo.Reset();
-
-		Kill.m_Weapon = -1;
-		Kill.m_ModeSpecial = 0;
-
-		Kill.m_VictimTextWidth = Kill.m_KillerTextWidth = 0.f;
-
-		float Height = 400 * 3.0f;
-		float Width = Height * Graphics()->ScreenAspect();
-
-		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
-		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
-
-		CreateNamesIfNotCreated(&Kill);
-
-		bool KillMsgValid = true;
-		for(int i = 0; i < Kill.m_TeamSize; i++)
-		{
-			KillMsgValid = KillMsgValid && Kill.m_aVictimIds[i] >= 0 && ((Kill.m_aVictimRenderInfo[i].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[i].m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_aVictimRenderInfo[i].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[i].m_OriginalRenderSkin.m_Body.IsValid()));
-		}
-
-		if(KillMsgValid)
-		{
-			AddInfoMsg(EType::TYPE_KILL, Kill);
-		}
-		else
-		{
-			DeleteTextContainers(&Kill);
-		}
-
-		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	case NETMSGTYPE_SV_KILLMSGTEAM:
+		OnTeamKillMessage(static_cast<CNetMsg_Sv_KillMsgTeam *>(pRawMsg));
+		break;
+	case NETMSGTYPE_SV_KILLMSG:
+		OnKillMessage(static_cast<CNetMsg_Sv_KillMsg *>(pRawMsg));
+		break;
+	case NETMSGTYPE_SV_RACEFINISH:
+		OnRaceFinishMessage(static_cast<CNetMsg_Sv_RaceFinish *>(pRawMsg));
+		break;
 	}
+}
 
-	if(MsgType == NETMSGTYPE_SV_KILLMSG && g_Config.m_ClShowKillMessages)
+void CInfoMessages::OnTeamKillMessage(const CNetMsg_Sv_KillMsgTeam *pMsg)
+{
+	std::vector<std::pair<int, int>> vStrongWeakSorted;
+	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
-
-		CInfoMsg Kill{};
-
-		Kill.m_TeamSize = 1;
-		Kill.m_aVictimIds[0] = pMsg->m_Victim;
-		if(Kill.m_aVictimIds[0] >= 0 && Kill.m_aVictimIds[0] < MAX_CLIENTS)
-		{
-			Kill.m_VictimDDTeam = m_pClient->m_Teams.Team(Kill.m_aVictimIds[0]);
-			str_copy(Kill.m_aVictimName, m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_aName);
-			Kill.m_aVictimRenderInfo[0] = m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_RenderInfo;
-		}
-		else
-		{
-			Kill.m_VictimDDTeam = 0;
-			Kill.m_aVictimName[0] = '\0';
-		}
-		for(int i = Kill.m_TeamSize; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
-		{
-			Kill.m_aVictimIds[i] = -1;
-			Kill.m_aVictimRenderInfo[i].Reset();
-		}
-
-		Kill.m_KillerID = pMsg->m_Killer;
-		if(Kill.m_KillerID >= 0 && Kill.m_KillerID < MAX_CLIENTS)
-		{
-			str_copy(Kill.m_aKillerName, m_pClient->m_aClients[Kill.m_KillerID].m_aName);
-			Kill.m_KillerRenderInfo = m_pClient->m_aClients[Kill.m_KillerID].m_RenderInfo;
-		}
-		else
+		if(m_pClient->m_Teams.Team(i) == pMsg->m_Team)
 		{
-			Kill.m_aKillerName[0] = '\0';
-			Kill.m_KillerRenderInfo.Reset();
+			CCharacter *pChr = m_pClient->m_GameWorld.GetCharacterById(i);
+			vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChr ? pChr->GetStrongWeakId() : 0);
 		}
+	}
+	std::stable_sort(vStrongWeakSorted.begin(), vStrongWeakSorted.end(), [](auto &Left, auto &Right) { return Left.second > Right.second; });
 
-		Kill.m_Weapon = pMsg->m_Weapon;
-		Kill.m_ModeSpecial = pMsg->m_ModeSpecial;
-
-		Kill.m_FlagCarrierBlue = m_pClient->m_Snap.m_pGameDataObj ? m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue : -1;
-
-		Kill.m_VictimTextWidth = Kill.m_KillerTextWidth = 0.f;
-
-		float Height = 400 * 3.0f;
-		float Width = Height * Graphics()->ScreenAspect();
-
-		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
-		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
-
-		CreateNamesIfNotCreated(&Kill);
+	CInfoMsg Kill = CreateInfoMsg(TYPE_KILL);
+	Kill.m_TeamSize = minimum<int>(vStrongWeakSorted.size(), MAX_KILLMSG_TEAM_MEMBERS);
 
-		bool KillMsgValid = (Kill.m_aVictimRenderInfo[0].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[0].m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_aVictimRenderInfo[0].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[0].m_OriginalRenderSkin.m_Body.IsValid());
-		KillMsgValid &= Kill.m_KillerID == -1 || ((Kill.m_KillerRenderInfo.m_CustomColoredSkin && Kill.m_KillerRenderInfo.m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_KillerRenderInfo.m_CustomColoredSkin && Kill.m_KillerRenderInfo.m_OriginalRenderSkin.m_Body.IsValid()));
-		if(KillMsgValid)
-		{
-			AddInfoMsg(EType::TYPE_KILL, Kill);
-		}
-		else
+	Kill.m_VictimDDTeam = pMsg->m_Team;
+	for(int i = 0; i < Kill.m_TeamSize; i++)
+	{
+		if(m_pClient->m_aClients[vStrongWeakSorted[i].first].m_Active)
 		{
-			DeleteTextContainers(&Kill);
+			Kill.m_aVictimIds[i] = vStrongWeakSorted[i].first;
+			Kill.m_aVictimRenderInfo[i] = m_pClient->m_aClients[vStrongWeakSorted[i].first].m_RenderInfo;
 		}
-
-		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 	}
+	str_format(Kill.m_aVictimName, sizeof(Kill.m_aVictimName), Localize("Team %d"), pMsg->m_Team);
 
-	if(MsgType == NETMSGTYPE_SV_RACEFINISH && g_Config.m_ClShowFinishMessages)
-	{
-		CNetMsg_Sv_RaceFinish *pMsg = (CNetMsg_Sv_RaceFinish *)pRawMsg;
-
-		char aBuf[256];
-
-		CInfoMsg Finish;
-		Finish.m_TeamSize = 1;
-		Finish.m_aVictimIds[0] = pMsg->m_ClientID;
-		Finish.m_VictimDDTeam = m_pClient->m_Teams.Team(Finish.m_aVictimIds[0]);
-		str_copy(Finish.m_aVictimName, m_pClient->m_aClients[Finish.m_aVictimIds[0]].m_aName);
-		Finish.m_aVictimRenderInfo[0] = m_pClient->m_aClients[pMsg->m_ClientID].m_RenderInfo;
+	AddInfoMsg(Kill);
+}
 
-		Finish.m_aKillerName[0] = '\0';
+void CInfoMessages::OnKillMessage(const CNetMsg_Sv_KillMsg *pMsg)
+{
+	CInfoMsg Kill = CreateInfoMsg(TYPE_KILL);
 
-		Finish.m_Diff = pMsg->m_Diff;
-		Finish.m_RecordPersonal = (pMsg->m_RecordPersonal || pMsg->m_RecordServer);
+	Kill.m_TeamSize = 1;
+	Kill.m_aVictimIds[0] = pMsg->m_Victim;
+	Kill.m_VictimDDTeam = m_pClient->m_Teams.Team(Kill.m_aVictimIds[0]);
+	str_copy(Kill.m_aVictimName, m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_aName);
+	Kill.m_aVictimRenderInfo[0] = m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_RenderInfo;
 
-		// diff time text
-		if(Finish.m_Diff)
-		{
-			if(Finish.m_Diff < 0)
-			{
-				str_time_float(-Finish.m_Diff / 1000.0f, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
-				str_format(Finish.m_aDiffText, sizeof(Finish.m_aDiffText), "(-%s)", aBuf);
-			}
-			else
-			{
-				str_time_float(Finish.m_Diff / 1000.0f, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
-				str_format(Finish.m_aDiffText, sizeof(Finish.m_aDiffText), "(+%s)", aBuf);
-			}
-		}
-		else
-		{
-			Finish.m_aDiffText[0] = '\0';
-		}
+	Kill.m_KillerId = pMsg->m_Killer;
+	str_copy(Kill.m_aKillerName, m_pClient->m_aClients[Kill.m_KillerId].m_aName);
+	Kill.m_KillerRenderInfo = m_pClient->m_aClients[Kill.m_KillerId].m_RenderInfo;
 
-		// finish time text
-		str_time_float(pMsg->m_Time / 1000.0f, TIME_HOURS_CENTISECS, Finish.m_aTimeText, sizeof(Finish.m_aTimeText));
+	Kill.m_Weapon = pMsg->m_Weapon;
+	Kill.m_ModeSpecial = pMsg->m_ModeSpecial;
+	Kill.m_FlagCarrierBlue = m_pClient->m_Snap.m_pGameDataObj ? m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue : -1;
 
-		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
-		float Height = 400 * 3.0f;
-		float Width = Height * Graphics()->ScreenAspect();
-		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
+	AddInfoMsg(Kill);
+}
 
-		CreateNamesIfNotCreated(&Finish);
-		CreateFinishTextContainersIfNotCreated(&Finish);
+void CInfoMessages::OnRaceFinishMessage(const CNetMsg_Sv_RaceFinish *pMsg)
+{
+	CInfoMsg Finish = CreateInfoMsg(TYPE_FINISH);
 
-		AddInfoMsg(EType::TYPE_FINISH, Finish);
+	Finish.m_TeamSize = 1;
+	Finish.m_aVictimIds[0] = pMsg->m_ClientId;
+	Finish.m_VictimDDTeam = m_pClient->m_Teams.Team(Finish.m_aVictimIds[0]);
+	str_copy(Finish.m_aVictimName, m_pClient->m_aClients[Finish.m_aVictimIds[0]].m_aName);
+	Finish.m_aVictimRenderInfo[0] = m_pClient->m_aClients[pMsg->m_ClientId].m_RenderInfo;
 
-		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	Finish.m_Diff = pMsg->m_Diff;
+	Finish.m_RecordPersonal = pMsg->m_RecordPersonal || pMsg->m_RecordServer;
+	if(Finish.m_Diff)
+	{
+		char aBuf[64];
+		str_time_float(absolute(Finish.m_Diff) / 1000.0f, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+		str_format(Finish.m_aDiffText, sizeof(Finish.m_aDiffText), "(%c%s)", Finish.m_Diff < 0 ? '-' : '+', aBuf);
 	}
+	str_time_float(pMsg->m_Time / 1000.0f, TIME_HOURS_CENTISECS, Finish.m_aTimeText, sizeof(Finish.m_aTimeText));
+
+	AddInfoMsg(Finish);
 }
 
-void CInfoMessages::RenderKillMsg(CInfoMsg *pInfoMsg, float x, float y)
+void CInfoMessages::RenderKillMsg(const CInfoMsg &InfoMsg, float x, float y)
 {
-	// render victim name
-	x -= pInfoMsg->m_VictimTextWidth;
 	ColorRGBA TextColor;
-	if(g_Config.m_ClChatTeamColors && pInfoMsg->m_VictimDDTeam)
-		TextColor = m_pClient->GetDDTeamColor(pInfoMsg->m_VictimDDTeam, 0.75f);
+	if(InfoMsg.m_VictimDDTeam)
+		TextColor = m_pClient->GetDDTeamColor(InfoMsg.m_VictimDDTeam, 0.75f);
 	else
 		TextColor = TextRender()->DefaultTextColor();
 
-	CreateNamesIfNotCreated(pInfoMsg);
-
-	if(pInfoMsg->m_VictimTextContainerIndex.Valid())
-		TextRender()->RenderTextContainer(pInfoMsg->m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+	// render victim name
+	if(InfoMsg.m_VictimTextContainerIndex.Valid())
+	{
+		x -= TextRender()->GetBoundingBoxTextContainer(InfoMsg.m_VictimTextContainerIndex).m_W;
+		TextRender()->RenderTextContainer(InfoMsg.m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (ROW_HEIGHT - FONT_SIZE) / 2.0f);
+	}
 
-	// render victim tee
+	// render victim flag
 	x -= 24.0f;
-
-	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS)
+	if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS) && (InfoMsg.m_ModeSpecial & 1))
 	{
-		if(pInfoMsg->m_ModeSpecial & 1)
+		int QuadOffset;
+		if(InfoMsg.m_aVictimIds[0] == InfoMsg.m_FlagCarrierBlue)
 		{
-			int QuadOffset = 0;
-			if(pInfoMsg->m_aVictimIds[0] == pInfoMsg->m_FlagCarrierBlue)
-				++QuadOffset;
-
-			if(QuadOffset == 0)
-				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
-			else
-				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
-
-			Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x, y - 16);
+			Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+			QuadOffset = 0;
+		}
+		else
+		{
+			Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+			QuadOffset = 1;
 		}
+		Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x, y - 16);
 	}
 
-	for(int j = (pInfoMsg->m_TeamSize - 1); j >= 0; j--)
+	// render victim tees
+	for(int j = (InfoMsg.m_TeamSize - 1); j >= 0; j--)
 	{
-		if(pInfoMsg->m_aVictimIds[j] < 0)
+		if(InfoMsg.m_aVictimIds[j] < 0)
 			continue;
 
-		const CAnimState *pIdleState = CAnimState::GetIdle();
 		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[j], OffsetToMid);
-		const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
-		RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[j], EMOTE_PAIN, vec2(-1, 0), TeeRenderPos);
-
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &InfoMsg.m_aVictimRenderInfo[j], OffsetToMid);
+		const vec2 TeeRenderPos = vec2(x, y + ROW_HEIGHT / 2.0f + OffsetToMid.y);
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &InfoMsg.m_aVictimRenderInfo[j], EMOTE_PAIN, vec2(-1, 0), TeeRenderPos);
 		x -= 44.0f;
 	}
 
 	// render weapon
 	x -= 32.0f;
-	if(pInfoMsg->m_Weapon >= 0)
+	if(InfoMsg.m_Weapon >= 0)
 	{
-		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[pInfoMsg->m_Weapon]);
-		Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, 4 + pInfoMsg->m_Weapon, x, y + 28);
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[InfoMsg.m_Weapon]);
+		Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, 4 + InfoMsg.m_Weapon, x, y + 28);
 	}
 	x -= 52.0f;
 
-	if(pInfoMsg->m_aVictimIds[0] != pInfoMsg->m_KillerID)
+	// render killer (only if different from victim)
+	if(InfoMsg.m_aVictimIds[0] != InfoMsg.m_KillerId)
 	{
-		if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS)
+		// render killer flag
+		if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS) && (InfoMsg.m_ModeSpecial & 2))
 		{
-			if(pInfoMsg->m_ModeSpecial & 2)
+			int QuadOffset;
+			if(InfoMsg.m_KillerId == InfoMsg.m_FlagCarrierBlue)
 			{
-				int QuadOffset = 2;
-				if(pInfoMsg->m_KillerID == pInfoMsg->m_FlagCarrierBlue)
-					++QuadOffset;
-
-				if(QuadOffset == 2)
-					Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
-				else
-					Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
-
-				Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x - 56, y - 16);
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+				QuadOffset = 2;
 			}
+			else
+			{
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+				QuadOffset = 3;
+			}
+			Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x - 56, y - 16);
 		}
 
 		// render killer tee
 		x -= 24.0f;
-
-		if(pInfoMsg->m_KillerID >= 0)
+		if(InfoMsg.m_KillerId >= 0)
 		{
-			const CAnimState *pIdleState = CAnimState::GetIdle();
 			vec2 OffsetToMid;
-			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_KillerRenderInfo, OffsetToMid);
-			const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
-			RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_KillerRenderInfo, EMOTE_ANGRY, vec2(1, 0), TeeRenderPos);
+			CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &InfoMsg.m_KillerRenderInfo, OffsetToMid);
+			const vec2 TeeRenderPos = vec2(x, y + ROW_HEIGHT / 2.0f + OffsetToMid.y);
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &InfoMsg.m_KillerRenderInfo, EMOTE_ANGRY, vec2(1, 0), TeeRenderPos);
 		}
-
 		x -= 32.0f;
 
 		// render killer name
-		x -= pInfoMsg->m_KillerTextWidth;
-
-		if(pInfoMsg->m_KillerTextContainerIndex.Valid())
-			TextRender()->RenderTextContainer(pInfoMsg->m_KillerTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+		if(InfoMsg.m_KillerTextContainerIndex.Valid())
+		{
+			x -= TextRender()->GetBoundingBoxTextContainer(InfoMsg.m_KillerTextContainerIndex).m_W;
+			TextRender()->RenderTextContainer(InfoMsg.m_KillerTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (ROW_HEIGHT - FONT_SIZE) / 2.0f);
+		}
 	}
 }
 
-void CInfoMessages::RenderFinishMsg(CInfoMsg *pInfoMsg, float x, float y)
+void CInfoMessages::RenderFinishMsg(const CInfoMsg &InfoMsg, float x, float y)
 {
 	// render time diff
-	CreateFinishTextContainersIfNotCreated(pInfoMsg);
-
-	if(pInfoMsg->m_Diff)
+	if(InfoMsg.m_DiffTextContainerIndex.Valid())
 	{
-		x -= pInfoMsg->m_DiffTextWidth;
-
-		if(pInfoMsg->m_DiffTextContainerIndex.Valid())
-			TextRender()->RenderTextContainer(pInfoMsg->m_DiffTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+		x -= TextRender()->GetBoundingBoxTextContainer(InfoMsg.m_DiffTextContainerIndex).m_W;
+		TextRender()->RenderTextContainer(InfoMsg.m_DiffTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (ROW_HEIGHT - FONT_SIZE) / 2.0f);
 	}
 
 	// render time
-	x -= pInfoMsg->m_TimeTextWidth;
-
-	if(pInfoMsg->m_TimeTextContainerIndex.Valid())
-		TextRender()->RenderTextContainer(pInfoMsg->m_TimeTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+	if(InfoMsg.m_TimeTextContainerIndex.Valid())
+	{
+		x -= TextRender()->GetBoundingBoxTextContainer(InfoMsg.m_TimeTextContainerIndex).m_W;
+		TextRender()->RenderTextContainer(InfoMsg.m_TimeTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (ROW_HEIGHT - FONT_SIZE) / 2.0f);
+	}
 
 	// render flag
-	x -= 52.0f;
-
+	const float FlagSize = 52.0f;
+	x -= FlagSize;
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_RACEFLAG].m_Id);
 	Graphics()->QuadsBegin();
-	IGraphics::CQuadItem QuadItem(x, y, 52, 52);
+	IGraphics::CQuadItem QuadItem(x, y, FlagSize, FlagSize);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
 
 	// render victim name
-	ColorRGBA TextColor;
-	x -= pInfoMsg->m_VictimTextWidth;
-	if(g_Config.m_ClChatTeamColors && pInfoMsg->m_VictimDDTeam)
-		TextColor = m_pClient->GetDDTeamColor(pInfoMsg->m_VictimDDTeam, 0.75f);
-	else
-		TextColor = TextRender()->DefaultTextColor();
-
-	CreateNamesIfNotCreated(pInfoMsg);
-
-	if(pInfoMsg->m_VictimTextContainerIndex.Valid())
-		TextRender()->RenderTextContainer(pInfoMsg->m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+	if(InfoMsg.m_VictimTextContainerIndex.Valid())
+	{
+		x -= TextRender()->GetBoundingBoxTextContainer(InfoMsg.m_VictimTextContainerIndex).m_W;
+		ColorRGBA TextColor;
+		if(InfoMsg.m_VictimDDTeam)
+			TextColor = m_pClient->GetDDTeamColor(InfoMsg.m_VictimDDTeam, 0.75f);
+		else
+			TextColor = TextRender()->DefaultTextColor();
+		TextRender()->RenderTextContainer(InfoMsg.m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (ROW_HEIGHT - FONT_SIZE) / 2.0f);
+	}
 
 	// render victim tee
 	x -= 24.0f;
-
-	const CAnimState *pIdleState = CAnimState::GetIdle();
 	vec2 OffsetToMid;
-	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[0], OffsetToMid);
-	const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
-	const int Emote = pInfoMsg->m_RecordPersonal ? EMOTE_HAPPY : EMOTE_NORMAL;
-	RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[0], Emote, vec2(-1, 0), TeeRenderPos);
+	CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &InfoMsg.m_aVictimRenderInfo[0], OffsetToMid);
+	const vec2 TeeRenderPos = vec2(x, y + ROW_HEIGHT / 2.0f + OffsetToMid.y);
+	const int Emote = InfoMsg.m_RecordPersonal ? EMOTE_HAPPY : EMOTE_NORMAL;
+	RenderTools()->RenderTee(CAnimState::GetIdle(), &InfoMsg.m_aVictimRenderInfo[0], Emote, vec2(-1, 0), TeeRenderPos);
 }
 
 void CInfoMessages::OnRender()
 {
-	float Height = 400 * 3.0f;
-	float Width = Height * Graphics()->ScreenAspect();
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
 
-	Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
-	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	const float Height = 1.5f * 400.0f * 3.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
 
-	float StartX = Width * 1.5f - 10.0f;
-	float y = 30.0f + 100.0f * ((g_Config.m_ClShowfps ? 1 : 0) + (g_Config.m_ClShowpred && Client()->State() != IClient::STATE_DEMOPLAYBACK));
+	Graphics()->MapScreen(0, 0, Width, Height);
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 
+	int Showfps = g_Config.m_ClShowfps;
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current())
+		Showfps = 0;
+#endif
+	const float StartX = Width - 10.0f;
+	const float StartY = 30.0f + (Showfps ? 100.0f : 0.0f) + (g_Config.m_ClShowpred && Client()->State() != IClient::STATE_DEMOPLAYBACK ? 100.0f : 0.0f);
+
+	float y = StartY;
 	for(int i = 1; i <= MAX_INFOMSGS; i++)
 	{
-		CInfoMsg *pInfoMsg = &m_aInfoMsgs[(m_InfoMsgCurrent + i) % MAX_INFOMSGS];
-		if(Client()->GameTick(g_Config.m_ClDummy) > pInfoMsg->m_Tick + Client()->GameTickSpeed() * 10)
+		CInfoMsg &InfoMsg = m_aInfoMsgs[(m_InfoMsgCurrent + i) % MAX_INFOMSGS];
+		if(Client()->GameTick(g_Config.m_ClDummy) > InfoMsg.m_Tick + Client()->GameTickSpeed() * 10)
 			continue;
 
-		if(pInfoMsg->m_Type == EType::TYPE_KILL && g_Config.m_ClShowKillMessages)
+		CreateTextContainersIfNotCreated(InfoMsg);
+
+		if(InfoMsg.m_Type == EType::TYPE_KILL && g_Config.m_ClShowKillMessages)
 		{
-			RenderKillMsg(pInfoMsg, StartX, y);
-			y += 46.0f;
+			RenderKillMsg(InfoMsg, StartX, y);
+			y += ROW_HEIGHT;
 		}
-		else if(pInfoMsg->m_Type == EType::TYPE_FINISH && g_Config.m_ClShowFinishMessages)
+		else if(InfoMsg.m_Type == EType::TYPE_FINISH && g_Config.m_ClShowFinishMessages)
 		{
-			RenderFinishMsg(pInfoMsg, StartX, y);
-			y += 46.0f;
+			RenderFinishMsg(InfoMsg, StartX, y);
+			y += ROW_HEIGHT;
 		}
 	}
 }
 
-void CInfoMessages::RefindSkins()
+void CInfoMessages::OnRefreshSkins()
 {
 	for(auto &InfoMsg : m_aInfoMsgs)
 	{
 		InfoMsg.m_KillerRenderInfo.Reset();
-		if(InfoMsg.m_KillerID >= 0)
+		if(InfoMsg.m_KillerId >= 0)
 		{
-			const CGameClient::CClientData &Client = GameClient()->m_aClients[InfoMsg.m_KillerID];
+			const CGameClient::CClientData &Client = GameClient()->m_aClients[InfoMsg.m_KillerId];
 			if(Client.m_Active && Client.m_aSkinName[0] != '\0')
 				InfoMsg.m_KillerRenderInfo = Client.m_RenderInfo;
 			else
-				InfoMsg.m_KillerID = -1;
+				InfoMsg.m_KillerId = -1;
 		}
 
 		for(int i = 0; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
diff --git a/src/game/client/components/infomessages.h b/src/game/client/components/infomessages.h
index 680c46c651..03d953db8c 100644
--- a/src/game/client/components/infomessages.h
+++ b/src/game/client/components/infomessages.h
@@ -2,12 +2,14 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_INFOMESSAGES_H
 #define GAME_CLIENT_COMPONENTS_INFOMESSAGES_H
+#include <engine/textrender.h>
 #include <game/client/component.h>
 
 #include <game/client/render.h>
 class CInfoMessages : public CComponent
 {
 	int m_SpriteQuadContainerIndex;
+
 	enum
 	{
 		MAX_INFOMSGS = 5,
@@ -20,8 +22,6 @@ class CInfoMessages : public CComponent
 		TYPE_FINISH,
 	};
 
-public:
-	// info messages
 	struct CInfoMsg
 	{
 		EType m_Type;
@@ -31,12 +31,10 @@ class CInfoMessages : public CComponent
 		int m_VictimDDTeam;
 		char m_aVictimName[64];
 		STextContainerIndex m_VictimTextContainerIndex;
-		float m_VictimTextWidth;
 		CTeeRenderInfo m_aVictimRenderInfo[MAX_KILLMSG_TEAM_MEMBERS];
-		int m_KillerID;
+		int m_KillerId;
 		char m_aKillerName[64];
 		STextContainerIndex m_KillerTextContainerIndex;
-		float m_KillerTextWidth;
 		CTeeRenderInfo m_KillerRenderInfo;
 
 		// kill msg
@@ -51,33 +49,32 @@ class CInfoMessages : public CComponent
 		char m_aDiffText[32];
 		STextContainerIndex m_TimeTextContainerIndex;
 		STextContainerIndex m_DiffTextContainerIndex;
-		float m_TimeTextWidth;
-		float m_DiffTextWidth;
 		bool m_RecordPersonal;
 	};
 
-private:
-	void AddInfoMsg(EType Type, CInfoMsg NewMsg);
-	void RenderKillMsg(CInfoMsg *pInfoMsg, float x, float y);
-	void RenderFinishMsg(CInfoMsg *pInfoMsg, float x, float y);
+	CInfoMsg m_aInfoMsgs[MAX_INFOMSGS];
+	int m_InfoMsgCurrent;
 
-	void CreateNamesIfNotCreated(CInfoMsg *pInfoMsg);
-	void CreateFinishTextContainersIfNotCreated(CInfoMsg *pInfoMsg);
+	CInfoMsg CreateInfoMsg(EType Type);
+	void AddInfoMsg(const CInfoMsg &InfoMsg);
+	void RenderKillMsg(const CInfoMsg &InfoMsg, float x, float y);
+	void RenderFinishMsg(const CInfoMsg &InfoMsg, float x, float y);
 
-	void DeleteTextContainers(CInfoMsg *pInfoMsg);
+	void OnTeamKillMessage(const struct CNetMsg_Sv_KillMsgTeam *pMsg);
+	void OnKillMessage(const struct CNetMsg_Sv_KillMsg *pMsg);
+	void OnRaceFinishMessage(const struct CNetMsg_Sv_RaceFinish *pMsg);
 
-public:
-	CInfoMsg m_aInfoMsgs[MAX_INFOMSGS];
-	int m_InfoMsgCurrent;
+	void CreateTextContainersIfNotCreated(CInfoMsg &InfoMsg);
+	void DeleteTextContainers(CInfoMsg &InfoMsg);
 
+public:
 	virtual int Sizeof() const override { return sizeof(*this); }
 	virtual void OnWindowResize() override;
+	virtual void OnRefreshSkins() override;
 	virtual void OnReset() override;
 	virtual void OnRender() override;
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
 	virtual void OnInit() override;
-
-	void RefindSkins();
 };
 
 #endif
diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp
index d3f8b21dd3..d58dea1827 100644
--- a/src/game/client/components/items.cpp
+++ b/src/game/client/components/items.cpp
@@ -23,7 +23,7 @@
 
 #include "items.h"
 
-void CItems::RenderProjectile(const CProjectileData *pCurrent, int ItemID)
+void CItems::RenderProjectile(const CProjectileData *pCurrent, int ItemId)
 {
 	int CurWeapon = clamp(pCurrent->m_Type, 0, NUM_WEAPONS - 1);
 
@@ -50,7 +50,7 @@ void CItems::RenderProjectile(const CProjectileData *pCurrent, int ItemID)
 	bool LocalPlayerInGame = false;
 
 	if(m_pClient->m_Snap.m_pLocalInfo)
-		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientID].m_Team != TEAM_SPECTATORS;
+		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientId].m_Team != TEAM_SPECTATORS;
 
 	static float s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
 	if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
@@ -117,7 +117,7 @@ void CItems::RenderProjectile(const CProjectileData *pCurrent, int ItemID)
 				s_Time += LocalTime() - s_LastLocalTime;
 		}
 
-		Graphics()->QuadsSetRotation(s_Time * pi * 2 * 2 + ItemID);
+		Graphics()->QuadsSetRotation(s_Time * pi * 2 * 2 + ItemId);
 		s_LastLocalTime = LocalTime();
 	}
 	else
@@ -383,7 +383,7 @@ void CItems::OnRender()
 				continue;
 
 			CProjectileData Data = pProj->GetData();
-			RenderProjectile(&Data, pProj->GetID());
+			RenderProjectile(&Data, pProj->GetId());
 		}
 		for(CEntity *pEnt = GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->NextEntity())
 		{
@@ -400,7 +400,7 @@ void CItems::OnRender()
 
 			if(pPickup->InDDNetTile())
 			{
-				if(auto *pPrev = (CPickup *)GameClient()->m_PrevPredictedWorld.GetEntity(pPickup->GetID(), CGameWorld::ENTTYPE_PICKUP))
+				if(auto *pPrev = (CPickup *)GameClient()->m_PrevPredictedWorld.GetEntity(pPickup->GetId(), CGameWorld::ENTTYPE_PICKUP))
 				{
 					CNetObj_Pickup Data, Prev;
 					pPickup->FillInfo(&Data);
@@ -414,7 +414,7 @@ void CItems::OnRender()
 	for(const CSnapEntities &Ent : m_pClient->SnapEntities())
 	{
 		const IClient::CSnapItem Item = Ent.m_Item;
-		const void *pData = Ent.m_pData;
+		const void *pData = Item.m_pData;
 		const CNetObj_EntityEx *pEntEx = Ent.m_pDataEx;
 
 		if(Item.m_Type == NETOBJTYPE_PROJECTILE || Item.m_Type == NETOBJTYPE_DDRACEPROJECTILE || Item.m_Type == NETOBJTYPE_DDNETPROJECTILE)
@@ -426,13 +426,13 @@ void CItems::OnRender()
 			if(UsePredicted)
 
 			{
-				if(auto *pProj = (CProjectile *)GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData))
+				if(auto *pProj = (CProjectile *)GameClient()->m_GameWorld.FindMatch(Item.m_Id, Item.m_Type, pData))
 				{
 					bool IsOtherTeam = m_pClient->IsOtherTeam(pProj->GetOwner());
 					if(pProj->m_LastRenderTick <= 0 && (pProj->m_Type != WEAPON_SHOTGUN || (!pProj->m_Freeze && !pProj->m_Explosive)) // skip ddrace shotgun bullets
 						&& (pProj->m_Type == WEAPON_SHOTGUN || absolute(length(pProj->m_Direction) - 1.f) < 0.02f) // workaround to skip grenades on ball mod
 						&& (pProj->GetOwner() < 0 || !GameClient()->m_aClients[pProj->GetOwner()].m_IsPredictedLocal || IsOtherTeam) // skip locally predicted projectiles
-						&& !Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID))
+						&& !Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_Id))
 					{
 						ReconstructSmokeTrail(&Data, pProj->m_DestroyTick);
 					}
@@ -441,7 +441,7 @@ void CItems::OnRender()
 						continue;
 				}
 			}
-			RenderProjectile(&Data, Item.m_ID);
+			RenderProjectile(&Data, Item.m_Id);
 		}
 		else if(Item.m_Type == NETOBJTYPE_PICKUP || Item.m_Type == NETOBJTYPE_DDNETPICKUP)
 		{
@@ -452,11 +452,11 @@ void CItems::OnRender()
 				continue;
 			if(UsePredicted)
 			{
-				auto *pPickup = (CPickup *)GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData);
+				auto *pPickup = (CPickup *)GameClient()->m_GameWorld.FindMatch(Item.m_Id, Item.m_Type, pData);
 				if(pPickup && pPickup->InDDNetTile())
 					continue;
 			}
-			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID);
+			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_Id);
 			if(pPrev)
 				RenderPickup((const CNetObj_Pickup *)pPrev, (const CNetObj_Pickup *)pData);
 		}
@@ -464,7 +464,7 @@ void CItems::OnRender()
 		{
 			if(UsePredicted)
 			{
-				auto *pLaser = dynamic_cast<CLaser *>(GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData));
+				auto *pLaser = dynamic_cast<CLaser *>(GameClient()->m_GameWorld.FindMatch(Item.m_Id, Item.m_Type, pData));
 				if(pLaser && pLaser->GetOwner() >= 0 && GameClient()->m_aClients[pLaser->GetOwner()].m_IsPredictedLocal)
 					continue;
 			}
@@ -523,16 +523,15 @@ void CItems::OnRender()
 	// render flag
 	for(int i = 0; i < Num; i++)
 	{
-		IClient::CSnapItem Item;
-		const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+		const IClient::CSnapItem Item = Client()->SnapGetItem(IClient::SNAP_CURRENT, i);
 
 		if(Item.m_Type == NETOBJTYPE_FLAG)
 		{
-			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID);
+			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_Id);
 			if(pPrev)
 			{
-				const void *pPrevGameData = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_GAMEDATA, m_pClient->m_Snap.m_GameDataSnapID);
-				RenderFlag(static_cast<const CNetObj_Flag *>(pPrev), static_cast<const CNetObj_Flag *>(pData),
+				const void *pPrevGameData = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_GAMEDATA, m_pClient->m_Snap.m_GameDataSnapId);
+				RenderFlag(static_cast<const CNetObj_Flag *>(pPrev), static_cast<const CNetObj_Flag *>(Item.m_pData),
 					static_cast<const CNetObj_GameData *>(pPrevGameData), m_pClient->m_Snap.m_pGameDataObj);
 			}
 		}
@@ -599,7 +598,7 @@ void CItems::ReconstructSmokeTrail(const CProjectileData *pCurrent, int DestroyT
 	bool LocalPlayerInGame = false;
 
 	if(m_pClient->m_Snap.m_pLocalInfo)
-		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientID].m_Team != TEAM_SPECTATORS;
+		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientId].m_Team != TEAM_SPECTATORS;
 	if(!m_pClient->AntiPingGunfire() || !LocalPlayerInGame)
 		return;
 	if(Client()->PredGameTick(g_Config.m_ClDummy) == pCurrent->m_StartTick)
diff --git a/src/game/client/components/items.h b/src/game/client/components/items.h
index d7fef4d972..b9d4a5664a 100644
--- a/src/game/client/components/items.h
+++ b/src/game/client/components/items.h
@@ -10,7 +10,7 @@ class CLaserData;
 
 class CItems : public CComponent
 {
-	void RenderProjectile(const CProjectileData *pCurrent, int ItemID);
+	void RenderProjectile(const CProjectileData *pCurrent, int ItemId);
 	void RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCurrent, bool IsPredicted = false);
 	void RenderFlag(const CNetObj_Flag *pPrev, const CNetObj_Flag *pCurrent, const CNetObj_GameData *pPrevGameData, const CNetObj_GameData *pCurGameData);
 	void RenderLaser(const CLaserData *pCurrent, bool IsPredicted = false);
diff --git a/src/game/client/components/mapimages.cpp b/src/game/client/components/mapimages.cpp
index 9a4733f161..4a34c5f25c 100644
--- a/src/game/client/components/mapimages.cpp
+++ b/src/game/client/components/mapimages.cpp
@@ -109,7 +109,6 @@ void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
 	{
 		const int LoadFlag = (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 1) != 0) ? TextureLoadFlag : 0) | (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 2) != 0) ? 0 : (Graphics()->HasTextureArraysSupport() ? IGraphics::TEXLOAD_NO_2D_TEXTURE : 0));
 		const CMapItemImage_v2 *pImg = (CMapItemImage_v2 *)pMap->GetItem(Start + i);
-		const CImageInfo::EImageFormat Format = pImg->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : CImageInfo::ImageFormatFromInt(pImg->m_Format);
 
 		const char *pName = pMap->GetDataString(pImg->m_ImageName);
 		if(pName == nullptr || pName[0] == '\0')
@@ -123,18 +122,38 @@ void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
 			pName = "(error)";
 		}
 
+		if(pImg->m_Version > 1 && pImg->m_MustBe1 != 1)
+		{
+			log_error("mapimages", "Failed to load map image %d '%s': invalid map image type.", i, pName);
+			ShowWarning = true;
+			continue;
+		}
+
 		if(pImg->m_External)
 		{
 			char aPath[IO_MAX_PATH_LENGTH];
-			str_format(aPath, sizeof(aPath), "mapres/%s.png", pName);
+			bool Translated = false;
+			if(Client()->IsSixup())
+			{
+				Translated =
+					!str_comp(pName, "grass_doodads") ||
+					!str_comp(pName, "grass_main") ||
+					!str_comp(pName, "winter_main") ||
+					!str_comp(pName, "generic_unhookable");
+			}
+			str_format(aPath, sizeof(aPath), "mapres/%s%s.png", pName, Translated ? "_0.7" : "");
 			m_aTextures[i] = Graphics()->LoadTexture(aPath, IStorage::TYPE_ALL, LoadFlag);
 		}
-		else if(Format == CImageInfo::FORMAT_RGBA)
+		else
 		{
-			void *pData = pMap->GetData(pImg->m_ImageData);
+			CImageInfo ImageInfo;
+			ImageInfo.m_Width = pImg->m_Width;
+			ImageInfo.m_Height = pImg->m_Height;
+			ImageInfo.m_Format = CImageInfo::FORMAT_RGBA;
+			ImageInfo.m_pData = static_cast<uint8_t *>(pMap->GetData(pImg->m_ImageData));
 			char aTexName[IO_MAX_PATH_LENGTH];
 			str_format(aTexName, sizeof(aTexName), "embedded: %s", pName);
-			m_aTextures[i] = Graphics()->LoadTextureRaw(pImg->m_Width, pImg->m_Height, Format, pData, LoadFlag, aTexName);
+			m_aTextures[i] = Graphics()->LoadTextureRaw(ImageInfo, LoadFlag, aTexName);
 			pMap->UnloadData(pImg->m_ImageData);
 		}
 		pMap->UnloadData(pImg->m_ImageName);
@@ -158,194 +177,139 @@ void CMapImages::LoadBackground(class CLayers *pLayers, class IMap *pMap)
 	OnMapLoadImpl(pLayers, pMap);
 }
 
-bool CMapImages::HasFrontLayer(EMapImageModType ModType)
+static EMapImageModType GetEntitiesModType(const CGameInfo &GameInfo)
 {
-	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
-}
-
-bool CMapImages::HasSpeedupLayer(EMapImageModType ModType)
-{
-	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
-}
-
-bool CMapImages::HasSwitchLayer(EMapImageModType ModType)
-{
-	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+	if(GameInfo.m_EntitiesFDDrace)
+		return MAP_IMAGE_MOD_TYPE_FDDRACE;
+	else if(GameInfo.m_EntitiesDDNet)
+		return MAP_IMAGE_MOD_TYPE_DDNET;
+	else if(GameInfo.m_EntitiesDDRace)
+		return MAP_IMAGE_MOD_TYPE_DDRACE;
+	else if(GameInfo.m_EntitiesRace)
+		return MAP_IMAGE_MOD_TYPE_RACE;
+	else if(GameInfo.m_EntitiesBW)
+		return MAP_IMAGE_MOD_TYPE_BLOCKWORLDS;
+	else if(GameInfo.m_EntitiesFNG)
+		return MAP_IMAGE_MOD_TYPE_FNG;
+	else if(GameInfo.m_EntitiesVanilla)
+		return MAP_IMAGE_MOD_TYPE_VANILLA;
+	else
+		return MAP_IMAGE_MOD_TYPE_DDNET;
 }
 
-bool CMapImages::HasTeleLayer(EMapImageModType ModType)
+static bool IsValidTile(int LayerType, bool EntitiesAreMasked, EMapImageModType EntitiesModType, int TileIndex)
 {
-	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
-}
+	if(TileIndex == TILE_AIR)
+		return false;
+	if(!EntitiesAreMasked)
+		return true;
 
-bool CMapImages::HasTuneLayer(EMapImageModType ModType)
-{
-	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+	if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || EntitiesModType == MAP_IMAGE_MOD_TYPE_DDRACE)
+	{
+		if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || TileIndex != TILE_BOOST)
+		{
+			if(LayerType == MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH &&
+				!IsValidGameTile(TileIndex) &&
+				!IsValidFrontTile(TileIndex) &&
+				!IsValidSpeedupTile(TileIndex) &&
+				!IsValidTeleTile(TileIndex) &&
+				!IsValidTuneTile(TileIndex))
+			{
+				return false;
+			}
+			else if(LayerType == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH &&
+				!IsValidSwitchTile(TileIndex))
+			{
+				return false;
+			}
+		}
+	}
+	else if(EntitiesModType == MAP_IMAGE_MOD_TYPE_RACE && IsCreditsTile(TileIndex))
+	{
+		return false;
+	}
+	else if(EntitiesModType == MAP_IMAGE_MOD_TYPE_FNG && IsCreditsTile(TileIndex))
+	{
+		return false;
+	}
+	else if(EntitiesModType == MAP_IMAGE_MOD_TYPE_VANILLA && IsCreditsTile(TileIndex))
+	{
+		return false;
+	}
+	return true;
 }
 
 IGraphics::CTextureHandle CMapImages::GetEntities(EMapImageEntityLayerType EntityLayerType)
 {
-	EMapImageModType EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
-	bool EntitiesAreMasked = !GameClient()->m_GameInfo.m_DontMaskEntities;
-
-	if(GameClient()->m_GameInfo.m_EntitiesFDDrace)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_FDDRACE;
-	else if(GameClient()->m_GameInfo.m_EntitiesDDNet)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
-	else if(GameClient()->m_GameInfo.m_EntitiesDDRace)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_DDRACE;
-	else if(GameClient()->m_GameInfo.m_EntitiesRace)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_RACE;
-	else if(GameClient()->m_GameInfo.m_EntitiesBW)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_BLOCKWORLDS;
-	else if(GameClient()->m_GameInfo.m_EntitiesFNG)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_FNG;
-	else if(GameClient()->m_GameInfo.m_EntitiesVanilla)
-		EntitiesModType = MAP_IMAGE_MOD_TYPE_VANILLA;
+	const bool EntitiesAreMasked = !GameClient()->m_GameInfo.m_DontMaskEntities;
+	const EMapImageModType EntitiesModType = GetEntitiesModType(GameClient()->m_GameInfo);
 
 	if(!m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked])
 	{
 		m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked] = true;
 
-		// any mod that does not mask, will get all layers unmasked
-		bool WasUnknown = !EntitiesAreMasked;
-
-		char aPath[64];
-		str_format(aPath, sizeof(aPath), "%s/%s.png", m_aEntitiesPath, gs_apModEntitiesNames[EntitiesModType]);
-
-		bool GameTypeHasFrontLayer = HasFrontLayer(EntitiesModType) || WasUnknown;
-		bool GameTypeHasSpeedupLayer = HasSpeedupLayer(EntitiesModType) || WasUnknown;
-		bool GameTypeHasSwitchLayer = HasSwitchLayer(EntitiesModType) || WasUnknown;
-		bool GameTypeHasTeleLayer = HasTeleLayer(EntitiesModType) || WasUnknown;
-		bool GameTypeHasTuneLayer = HasTuneLayer(EntitiesModType) || WasUnknown;
-
 		int TextureLoadFlag = 0;
 		if(Graphics()->HasTextureArraysSupport())
 			TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
 
 		CImageInfo ImgInfo;
-		bool ImagePNGLoaded = false;
-		if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
-			ImagePNGLoaded = true;
-		else
-		{
-			bool TryDefault = true;
-			// try as single ddnet replacement
-			if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET)
-			{
-				str_format(aPath, sizeof(aPath), "%s.png", m_aEntitiesPath);
-				if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
-				{
-					ImagePNGLoaded = true;
-					TryDefault = false;
-				}
-			}
+		char aPath[IO_MAX_PATH_LENGTH];
+		str_format(aPath, sizeof(aPath), "%s/%s.png", m_aEntitiesPath, gs_apModEntitiesNames[EntitiesModType]);
+		Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 
-			if(!ImagePNGLoaded && TryDefault)
-			{
-				// try default
-				str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[EntitiesModType]);
-				if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
-				{
-					ImagePNGLoaded = true;
-				}
-			}
+		// try as single ddnet replacement
+		if(ImgInfo.m_pData == nullptr && EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET)
+		{
+			str_format(aPath, sizeof(aPath), "%s.png", m_aEntitiesPath);
+			Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 		}
 
-		if(ImagePNGLoaded && ImgInfo.m_Width > 0 && ImgInfo.m_Height > 0)
+		// try default
+		if(ImgInfo.m_pData == nullptr)
 		{
-			const size_t PixelSize = ImgInfo.PixelSize();
-			const size_t BuildImageSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * PixelSize;
+			str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[EntitiesModType]);
+			Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
+		}
 
-			uint8_t *pTmpImgData = (uint8_t *)ImgInfo.m_pData;
-			uint8_t *pBuildImgData = (uint8_t *)malloc(BuildImageSize);
+		if(ImgInfo.m_pData != nullptr)
+		{
+			CImageInfo BuildImageInfo;
+			BuildImageInfo.m_Width = ImgInfo.m_Width;
+			BuildImageInfo.m_Height = ImgInfo.m_Height;
+			BuildImageInfo.m_Format = ImgInfo.m_Format;
+			BuildImageInfo.m_pData = static_cast<uint8_t *>(malloc(BuildImageInfo.DataSize()));
 
 			// build game layer
-			for(int n = 0; n < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++n)
+			for(int LayerType = 0; LayerType < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++LayerType)
 			{
-				bool BuildThisLayer = true;
-				if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH && !GameTypeHasFrontLayer &&
-					!GameTypeHasSpeedupLayer && !GameTypeHasTeleLayer && !GameTypeHasTuneLayer)
-					BuildThisLayer = false;
-				else if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH && !GameTypeHasSwitchLayer)
-					BuildThisLayer = false;
+				dbg_assert(!m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][LayerType].IsValid(), "entities texture already loaded when it should not be");
 
-				dbg_assert(!m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n].IsValid(), "entities texture already loaded when it should not be");
+				// set everything transparent
+				mem_zero(BuildImageInfo.m_pData, BuildImageInfo.DataSize());
 
-				if(BuildThisLayer)
+				for(int i = 0; i < 256; ++i)
 				{
-					// set everything transparent
-					mem_zero(pBuildImgData, BuildImageSize);
-
-					for(int i = 0; i < 256; ++i)
+					int TileIndex = i;
+					if(IsValidTile(LayerType, EntitiesAreMasked, EntitiesModType, TileIndex))
 					{
-						bool ValidTile = i != 0;
-						int TileIndex = i;
-						if(EntitiesAreMasked)
+						if(LayerType == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH && TileIndex == TILE_SWITCHTIMEDOPEN)
 						{
-							if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || EntitiesModType == MAP_IMAGE_MOD_TYPE_DDRACE)
-							{
-								if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || TileIndex != TILE_BOOST)
-								{
-									if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH && !IsValidGameTile((int)TileIndex) && !IsValidFrontTile((int)TileIndex) && !IsValidSpeedupTile((int)TileIndex) &&
-										!IsValidTeleTile((int)TileIndex) && !IsValidTuneTile((int)TileIndex))
-										ValidTile = false;
-									else if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH)
-									{
-										if(!IsValidSwitchTile((int)TileIndex))
-											ValidTile = false;
-									}
-								}
-							}
-							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_RACE) && IsCreditsTile((int)TileIndex))
-							{
-								ValidTile = false;
-							}
-							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_FNG) && IsCreditsTile((int)TileIndex))
-							{
-								ValidTile = false;
-							}
-							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_VANILLA) && IsCreditsTile((int)TileIndex))
-							{
-								ValidTile = false;
-							}
+							TileIndex = 8;
 						}
 
-						if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || EntitiesModType == MAP_IMAGE_MOD_TYPE_DDRACE)
-						{
-							if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH && TileIndex == TILE_SWITCHTIMEDOPEN)
-								TileIndex = 8;
-						}
-
-						int X = TileIndex % 16;
-						int Y = TileIndex / 16;
-
-						int CopyWidth = ImgInfo.m_Width / 16;
-						int CopyHeight = ImgInfo.m_Height / 16;
-						if(ValidTile)
-						{
-							Graphics()->CopyTextureBufferSub(pBuildImgData, pTmpImgData, ImgInfo.m_Width, ImgInfo.m_Height, PixelSize, (size_t)X * CopyWidth, (size_t)Y * CopyHeight, CopyWidth, CopyHeight);
-						}
+						const size_t CopyWidth = ImgInfo.m_Width / 16;
+						const size_t CopyHeight = ImgInfo.m_Height / 16;
+						const size_t OffsetX = (size_t)(TileIndex % 16) * CopyWidth;
+						const size_t OffsetY = (size_t)(TileIndex / 16) * CopyHeight;
+						BuildImageInfo.CopyRectFrom(ImgInfo, OffsetX, OffsetY, CopyWidth, CopyHeight, OffsetX, OffsetY);
 					}
-
-					m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n] = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, pBuildImgData, TextureLoadFlag, aPath);
 				}
-				else
-				{
-					if(!m_TransparentTexture.IsValid())
-					{
-						// set everything transparent
-						mem_zero(pBuildImgData, BuildImageSize);
 
-						m_TransparentTexture = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, pBuildImgData, TextureLoadFlag, aPath);
-					}
-					m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n] = m_TransparentTexture;
-				}
+				m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][LayerType] = Graphics()->LoadTextureRaw(BuildImageInfo, TextureLoadFlag, aPath);
 			}
 
-			free(pBuildImgData);
-
-			Graphics()->FreePNG(&ImgInfo);
+			BuildImageInfo.Free();
+			ImgInfo.Free();
 		}
 	}
 
@@ -358,10 +322,8 @@ IGraphics::CTextureHandle CMapImages::GetSpeedupArrow()
 	{
 		int TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
 		m_SpeedupArrowTexture = Graphics()->LoadTexture("editor/speed_arrow_array.png", IStorage::TYPE_ALL, TextureLoadFlag);
-
 		m_SpeedupArrowIsLoaded = true;
 	}
-
 	return m_SpeedupArrowTexture;
 }
 
@@ -389,18 +351,20 @@ void CMapImages::ChangeEntitiesPath(const char *pPath)
 		str_format(m_aEntitiesPath, sizeof(m_aEntitiesPath), "assets/entities/%s", pPath);
 	}
 
-	for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT * 2; ++i)
+	for(int ModType = 0; ModType < MAP_IMAGE_MOD_TYPE_COUNT * 2; ++ModType)
 	{
-		if(m_aEntitiesIsLoaded[i])
+		if(m_aEntitiesIsLoaded[ModType])
 		{
-			for(int n = 0; n < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++n)
+			for(int LayerType = 0; LayerType < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++LayerType)
 			{
-				if(m_aaEntitiesTextures[i][n].IsValid())
-					Graphics()->UnloadTexture(&(m_aaEntitiesTextures[i][n]));
-				m_aaEntitiesTextures[i][n] = IGraphics::CTextureHandle();
+				if(m_aaEntitiesTextures[ModType][LayerType].IsValid())
+				{
+					Graphics()->UnloadTexture(&(m_aaEntitiesTextures[ModType][LayerType]));
+				}
+				m_aaEntitiesTextures[ModType][LayerType] = IGraphics::CTextureHandle();
 			}
 
-			m_aEntitiesIsLoaded[i] = false;
+			m_aEntitiesIsLoaded[ModType] = false;
 		}
 	}
 }
@@ -434,24 +398,21 @@ int CMapImages::GetTextureScale() const
 
 IGraphics::CTextureHandle CMapImages::UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset)
 {
-	const size_t Width = 1024;
-	const size_t Height = 1024;
-	const size_t PixelSize = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+	CImageInfo TextImage;
+	TextImage.m_Width = 1024;
+	TextImage.m_Height = 1024;
+	TextImage.m_Format = CImageInfo::FORMAT_RGBA;
+	TextImage.m_pData = static_cast<uint8_t *>(calloc(TextImage.DataSize(), sizeof(uint8_t)));
 
-	void *pMem = calloc(Width * Height * PixelSize, 1);
-
-	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 0);
-	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 1);
-	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 2, 255);
+	UpdateEntityLayerText(TextImage, TextureSize, MaxWidth, YOffset, 0);
+	UpdateEntityLayerText(TextImage, TextureSize, MaxWidth, YOffset, 1);
+	UpdateEntityLayerText(TextImage, TextureSize, MaxWidth, YOffset, 2, 255);
 
 	const int TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
-	IGraphics::CTextureHandle Texture = Graphics()->LoadTextureRaw(Width, Height, CImageInfo::FORMAT_RGBA, pMem, TextureLoadFlag);
-	free(pMem);
-
-	return Texture;
+	return Graphics()->LoadTextureRawMove(TextImage, TextureLoadFlag);
 }
 
-void CMapImages::UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber)
+void CMapImages::UpdateEntityLayerText(CImageInfo &TextImage, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber)
 {
 	char aBuf[4];
 	int DigitsCount = NumbersPower + 1;
@@ -461,7 +422,7 @@ void CMapImages::UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_
 	if(MaxNumber == -1)
 		MaxNumber = CurrentNumber * 10 - 1;
 
-	str_from_int(CurrentNumber, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d", CurrentNumber);
 
 	int CurrentNumberSuitableFontSize = TextRender()->AdjustFontSize(aBuf, DigitsCount, TextureSize, MaxWidth);
 	int UniversalSuitableFontSize = CurrentNumberSuitableFontSize * 0.92f; // should be smoothed enough to fit any digits combination
@@ -470,7 +431,7 @@ void CMapImages::UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_
 
 	for(; CurrentNumber <= MaxNumber; ++CurrentNumber)
 	{
-		str_from_int(CurrentNumber, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", CurrentNumber);
 
 		float x = (CurrentNumber % 16) * 64;
 		float y = (CurrentNumber / 16) * 64;
@@ -478,7 +439,7 @@ void CMapImages::UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_
 		int ApproximateTextWidth = TextRender()->CalculateTextWidth(aBuf, DigitsCount, 0, UniversalSuitableFontSize);
 		int XOffSet = (MaxWidth - clamp(ApproximateTextWidth, 0, MaxWidth)) / 2;
 
-		TextRender()->UploadEntityLayerText(pTexBuffer, PixelSize, TexWidth, TexHeight, (TexWidth / 16) - XOffSet, (TexHeight / 16) - YOffset, aBuf, DigitsCount, x + XOffSet, y + YOffset, UniversalSuitableFontSize);
+		TextRender()->UploadEntityLayerText(TextImage, (TextImage.m_Width / 16) - XOffSet, (TextImage.m_Height / 16) - YOffset, aBuf, DigitsCount, x + XOffSet, y + YOffset, UniversalSuitableFontSize);
 	}
 }
 
diff --git a/src/game/client/components/mapimages.h b/src/game/client/components/mapimages.h
index 66bd83df56..a866b0d1b8 100644
--- a/src/game/client/components/mapimages.h
+++ b/src/game/client/components/mapimages.h
@@ -42,12 +42,6 @@ class CMapImages : public CComponent
 
 	char m_aEntitiesPath[IO_MAX_PATH_LENGTH];
 
-	bool HasFrontLayer(EMapImageModType ModType);
-	bool HasSpeedupLayer(EMapImageModType ModType);
-	bool HasSwitchLayer(EMapImageModType ModType);
-	bool HasTeleLayer(EMapImageModType ModType);
-	bool HasTuneLayer(EMapImageModType ModType);
-
 public:
 	CMapImages();
 	CMapImages(int TextureSize);
@@ -82,12 +76,11 @@ class CMapImages : public CComponent
 	IGraphics::CTextureHandle m_OverlayBottomTexture;
 	IGraphics::CTextureHandle m_OverlayTopTexture;
 	IGraphics::CTextureHandle m_OverlayCenterTexture;
-	IGraphics::CTextureHandle m_TransparentTexture;
 	int m_TextureScale;
 
 	void InitOverlayTextures();
 	IGraphics::CTextureHandle UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset);
-	void UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber = -1);
+	void UpdateEntityLayerText(CImageInfo &TextImage, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber = -1);
 };
 
 #endif
diff --git a/src/game/client/components/maplayers.cpp b/src/game/client/components/maplayers.cpp
index 191e613a9f..5d8176266a 100644
--- a/src/game/client/components/maplayers.cpp
+++ b/src/game/client/components/maplayers.cpp
@@ -56,18 +56,19 @@ void CMapLayers::EnvelopeUpdate()
 	}
 }
 
-void CMapLayers::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser)
+void CMapLayers::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Result, size_t Channels, void *pUser)
 {
 	CMapLayers *pThis = (CMapLayers *)pUser;
-	Channels = ColorRGBA();
 
 	int EnvStart, EnvNum;
 	pThis->m_pLayers->Map()->GetType(MAPITEMTYPE_ENVELOPE, &EnvStart, &EnvNum);
-
 	if(Env < 0 || Env >= EnvNum)
 		return;
 
 	const CMapItemEnvelope *pItem = (CMapItemEnvelope *)pThis->m_pLayers->Map()->GetItem(EnvStart + Env);
+	if(pItem->m_Channels <= 0)
+		return;
+	Channels = minimum<size_t>(Channels, pItem->m_Channels, CEnvPoint::MAX_CHANNELS);
 
 	CMapBasedEnvelopePointAccess EnvelopePoints(pThis->m_pLayers->Map());
 	EnvelopePoints.SetPointsRange(pItem->m_StartPoint, pItem->m_NumPoints);
@@ -114,7 +115,7 @@ void CMapLayers::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels
 					 MinTick * TickToNanoSeconds;
 			}
 		}
-		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, 4, s_Time + (int64_t)TimeOffsetMillis * std::chrono::nanoseconds(1ms), Channels);
+		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, s_Time + (int64_t)TimeOffsetMillis * std::chrono::nanoseconds(1ms), Result, Channels);
 	}
 	else
 	{
@@ -139,7 +140,7 @@ void CMapLayers::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels
 			s_Time += CurTime - s_LastLocalTime;
 			s_LastLocalTime = CurTime;
 		}
-		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, 4, s_Time + std::chrono::nanoseconds(std::chrono::milliseconds(TimeOffsetMillis)), Channels);
+		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, s_Time + std::chrono::nanoseconds(std::chrono::milliseconds(TimeOffsetMillis)), Result, Channels);
 	}
 }
 
@@ -581,7 +582,7 @@ void CMapLayers::OnMapLoad()
 										Flags = 0;
 										if(CurOverlay == 1)
 										{
-											if(IsTeleTileNumberUsed(Index))
+											if(IsTeleTileNumberUsedAny(Index))
 												Index = ((CTeleTile *)pTiles)[y * pTMap->m_Width + x].m_Number;
 											else
 												Index = 0;
@@ -812,36 +813,36 @@ void CMapLayers::OnMapLoad()
 					CQuad *pQuad = &pQuads[i];
 					for(int j = 0; j < 4; ++j)
 					{
-						int QuadIDX = j;
+						int QuadIdX = j;
 						if(j == 2)
-							QuadIDX = 3;
+							QuadIdX = 3;
 						else if(j == 3)
-							QuadIDX = 2;
+							QuadIdX = 2;
 						if(!Textured)
 						{
 							// ignore the conversion for the position coordinates
-							vtmpQuads[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIDX].x);
-							vtmpQuads[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIDX].y);
+							vtmpQuads[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIdX].x);
+							vtmpQuads[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIdX].y);
 							vtmpQuads[i].m_aVertices[j].m_CenterX = (pQuad->m_aPoints[4].x);
 							vtmpQuads[i].m_aVertices[j].m_CenterY = (pQuad->m_aPoints[4].y);
-							vtmpQuads[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIDX].r;
-							vtmpQuads[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIDX].g;
-							vtmpQuads[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIDX].b;
-							vtmpQuads[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIDX].a;
+							vtmpQuads[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIdX].r;
+							vtmpQuads[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIdX].g;
+							vtmpQuads[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIdX].b;
+							vtmpQuads[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIdX].a;
 						}
 						else
 						{
 							// ignore the conversion for the position coordinates
-							vtmpQuadsTextured[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIDX].x);
-							vtmpQuadsTextured[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIDX].y);
+							vtmpQuadsTextured[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIdX].x);
+							vtmpQuadsTextured[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIdX].y);
 							vtmpQuadsTextured[i].m_aVertices[j].m_CenterX = (pQuad->m_aPoints[4].x);
 							vtmpQuadsTextured[i].m_aVertices[j].m_CenterY = (pQuad->m_aPoints[4].y);
-							vtmpQuadsTextured[i].m_aVertices[j].m_U = fx2f(pQuad->m_aTexcoords[QuadIDX].x);
-							vtmpQuadsTextured[i].m_aVertices[j].m_V = fx2f(pQuad->m_aTexcoords[QuadIDX].y);
-							vtmpQuadsTextured[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIDX].r;
-							vtmpQuadsTextured[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIDX].g;
-							vtmpQuadsTextured[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIDX].b;
-							vtmpQuadsTextured[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIDX].a;
+							vtmpQuadsTextured[i].m_aVertices[j].m_U = fx2f(pQuad->m_aTexcoords[QuadIdX].x);
+							vtmpQuadsTextured[i].m_aVertices[j].m_V = fx2f(pQuad->m_aTexcoords[QuadIdX].y);
+							vtmpQuadsTextured[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIdX].r;
+							vtmpQuadsTextured[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIdX].g;
+							vtmpQuadsTextured[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIdX].b;
+							vtmpQuadsTextured[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIdX].a;
 						}
 					}
 				}
@@ -901,7 +902,7 @@ void CMapLayers::OnMapLoad()
 	}
 }
 
-void CMapLayers::RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup)
+void CMapLayers::RenderTileLayer(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup)
 {
 	STileLayerVisuals &Visuals = *m_vpTileLayerVisuals[LayerIndex];
 	if(Visuals.m_BufferContainerIndex == -1)
@@ -910,12 +911,6 @@ void CMapLayers::RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayer
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
 
-	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
-	if(pTileLayer->m_ColorEnv >= 0)
-	{
-		EnvelopeEval(pTileLayer->m_ColorEnvOffset, pTileLayer->m_ColorEnv, Channels, this);
-	}
-
 	int BorderX0, BorderY0, BorderX1, BorderY1;
 	bool DrawBorder = false;
 
@@ -985,11 +980,6 @@ void CMapLayers::RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayer
 			}
 		}
 
-		Color.x *= Channels.r;
-		Color.y *= Channels.g;
-		Color.z *= Channels.b;
-		Color.w *= Channels.a;
-
 		int DrawCount = s_vpIndexOffsets.size();
 		if(DrawCount != 0)
 		{
@@ -1277,27 +1267,11 @@ void CMapLayers::RenderQuadLayer(int LayerIndex, CMapItemLayerQuads *pQuadLayer,
 	{
 		CQuad *pQuad = &pQuads[i];
 
-		ColorRGBA Color(1.f, 1.f, 1.f, 1.f);
-		if(pQuad->m_ColorEnv >= 0)
-		{
-			EnvelopeEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, this);
-		}
-
-		float OffsetX = 0;
-		float OffsetY = 0;
-		float Rot = 0;
-
-		if(pQuad->m_PosEnv >= 0)
-		{
-			ColorRGBA Channels;
-			EnvelopeEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Channels, this);
-			OffsetX = Channels.r;
-			OffsetY = Channels.g;
-			Rot = Channels.b / 180.0f * pi;
-		}
+		ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		EnvelopeEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, 4, this);
 
-		const bool IsFullyTransparent = Color.a <= 0;
-		bool NeedsFlush = QuadsRenderCount == gs_GraphicsMaxQuadsRenderCount || IsFullyTransparent;
+		const bool IsFullyTransparent = Color.a <= 0.0f;
+		const bool NeedsFlush = QuadsRenderCount == gs_GraphicsMaxQuadsRenderCount || IsFullyTransparent;
 
 		if(NeedsFlush)
 		{
@@ -1314,11 +1288,14 @@ void CMapLayers::RenderQuadLayer(int LayerIndex, CMapItemLayerQuads *pQuadLayer,
 
 		if(!IsFullyTransparent)
 		{
+			ColorRGBA Position = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+			EnvelopeEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Position, 3, this);
+
 			SQuadRenderInfo &QInfo = s_vQuadRenderInfo[QuadsRenderCount++];
 			QInfo.m_Color = Color;
-			QInfo.m_Offsets.x = OffsetX;
-			QInfo.m_Offsets.y = OffsetY;
-			QInfo.m_Rotation = Rot;
+			QInfo.m_Offsets.x = Position.r;
+			QInfo.m_Offsets.y = Position.g;
+			QInfo.m_Rotation = Position.b / 180.0f * pi;
 		}
 	}
 	Graphics()->RenderQuadLayer(Visuals.m_BufferContainerIndex, s_vQuadRenderInfo.data(), QuadsRenderCount, CurQuadOffset);
@@ -1638,17 +1615,23 @@ void CMapLayers::OnRender()
 
 					if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTile))
 					{
-						ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f);
+						ColorRGBA Color = IsGameLayer ? ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f) : ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f);
 						if(IsGameLayer && EntityOverlayVal)
-							Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
-						else if(!IsGameLayer && EntityOverlayVal && !(m_Type == TYPE_BACKGROUND_FORCE))
-							Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * (100 - EntityOverlayVal) / 100.0f);
+							Color.a *= EntityOverlayVal / 100.0f;
+						else if(!IsGameLayer && EntityOverlayVal && m_Type != TYPE_BACKGROUND_FORCE)
+							Color.a *= (100 - EntityOverlayVal) / 100.0f;
+
+						if(!IsGameLayer)
+						{
+							ColorRGBA ColorEnv = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+							EnvelopeEval(pTMap->m_ColorEnvOffset, pTMap->m_ColorEnv, ColorEnv, 4, this);
+							Color = Color.Multiply(ColorEnv);
+						}
+
 						if(!Graphics()->IsTileBufferingEnabled())
 						{
 							Graphics()->BlendNone();
-							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE,
-								EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
-
+							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
 							Graphics()->BlendNormal();
 
 							// draw kill tiles outside the entity clipping rectangle
@@ -1657,15 +1640,12 @@ void CMapLayers::OnRender()
 								// slow blinking to hint that it's not a part of the map
 								double Seconds = time_get() / (double)time_freq();
 								ColorRGBA ColorHint = ColorRGBA(1.0f, 1.0f, 1.0f, 0.3 + 0.7 * (1 + std::sin(2 * (double)pi * Seconds / 3)) / 2);
-
 								RenderTools()->RenderTileRectangle(-201, -201, pTMap->m_Width + 402, pTMap->m_Height + 402,
 									0, TILE_DEATH, // display air inside, death outside
-									32.0f, Color.v4() * ColorHint.v4(), TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
-									EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+									32.0f, Color.Multiply(ColorHint), TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
 							}
 
-							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
-								EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
 						}
 						else
 						{
@@ -1676,9 +1656,7 @@ void CMapLayers::OnRender()
 								// slow blinking to hint that it's not a part of the map
 								double Seconds = time_get() / (double)time_freq();
 								ColorRGBA ColorHint = ColorRGBA(1.0f, 1.0f, 1.0f, 0.3 + 0.7 * (1.0 + std::sin(2 * (double)pi * Seconds / 3)) / 2);
-
-								ColorRGBA ColorKill(Color.x * ColorHint.x, Color.y * ColorHint.y, Color.z * ColorHint.z, Color.w * ColorHint.w);
-								RenderKillTileBorder(TileLayerCounter - 1, ColorKill, pTMap, pGroup);
+								RenderKillTileBorder(TileLayerCounter - 1, Color.Multiply(ColorHint), pTMap, pGroup);
 							}
 							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
 						}
@@ -1699,8 +1677,6 @@ void CMapLayers::OnRender()
 						{
 							if(!Graphics()->IsQuadBufferingEnabled())
 							{
-								//Graphics()->BlendNone();
-								//RenderTools()->ForceRenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_OPAQUE, EnvelopeEval, this, 1.f);
 								Graphics()->BlendNormal();
 								RenderTools()->ForceRenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_TRANSPARENT, EnvelopeEval, this, 1.f);
 							}
@@ -1714,8 +1690,6 @@ void CMapLayers::OnRender()
 					{
 						if(!Graphics()->IsQuadBufferingEnabled())
 						{
-							//Graphics()->BlendNone();
-							//RenderTools()->RenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_OPAQUE, EnvelopeEval, this);
 							Graphics()->BlendNormal();
 							RenderTools()->RenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_TRANSPARENT, EnvelopeEval, this);
 						}
@@ -1736,15 +1710,13 @@ void CMapLayers::OnRender()
 
 				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTile))
 				{
-					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					const ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, EntityOverlayVal / 100.0f);
 					if(!Graphics()->IsTileBufferingEnabled())
 					{
 						Graphics()->BlendNone();
-						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE,
-							EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
 						Graphics()->BlendNormal();
-						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
-							EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
 					}
 					else
 					{
@@ -1763,7 +1735,7 @@ void CMapLayers::OnRender()
 
 				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CSwitchTile))
 				{
-					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					const ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, EntityOverlayVal / 100.0f);
 					if(!Graphics()->IsTileBufferingEnabled())
 					{
 						Graphics()->BlendNone();
@@ -1778,9 +1750,9 @@ void CMapLayers::OnRender()
 						RenderTileLayer(TileLayerCounter - 3, Color, pTMap, pGroup);
 						if(g_Config.m_ClTextEntities)
 						{
-							Graphics()->TextureSet(m_pImages->GetOverlayBottom());
-							RenderTileLayer(TileLayerCounter - 2, Color, pTMap, pGroup);
 							Graphics()->TextureSet(m_pImages->GetOverlayTop());
+							RenderTileLayer(TileLayerCounter - 2, Color, pTMap, pGroup);
+							Graphics()->TextureSet(m_pImages->GetOverlayBottom());
 							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
 						}
 					}
@@ -1796,7 +1768,7 @@ void CMapLayers::OnRender()
 
 				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTeleTile))
 				{
-					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					const ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, EntityOverlayVal / 100.0f);
 					if(!Graphics()->IsTileBufferingEnabled())
 					{
 						Graphics()->BlendNone();
@@ -1827,7 +1799,7 @@ void CMapLayers::OnRender()
 
 				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CSpeedupTile))
 				{
-					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					const ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, EntityOverlayVal / 100.0f);
 					if(!Graphics()->IsTileBufferingEnabled())
 					{
 						Graphics()->BlendNone();
@@ -1866,14 +1838,13 @@ void CMapLayers::OnRender()
 
 				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTuneTile))
 				{
-					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					const ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, EntityOverlayVal / 100.0f);
 					if(!Graphics()->IsTileBufferingEnabled())
 					{
 						Graphics()->BlendNone();
 						RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
 						Graphics()->BlendNormal();
 						RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
-						//RenderTools()->RenderTuneOverlay(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, EntityOverlayVal/100.0f);
 					}
 					else
 					{
diff --git a/src/game/client/components/maplayers.h b/src/game/client/components/maplayers.h
index dbc4f05136..7e1d47ce9f 100644
--- a/src/game/client/components/maplayers.h
+++ b/src/game/client/components/maplayers.h
@@ -35,6 +35,8 @@ class CMapLayers : public CComponent
 	int m_LastLocalTick;
 	bool m_EnvelopeUpdate;
 
+	bool m_OnlineOnly;
+
 	struct STileLayerVisuals
 	{
 		STileLayerVisuals() :
@@ -150,15 +152,14 @@ class CMapLayers : public CComponent
 	virtual void OnRender() override;
 	virtual void OnMapLoad() override;
 
-	void RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup);
+	void RenderTileLayer(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup);
 	void RenderTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup, int BorderX0, int BorderY0, int BorderX1, int BorderY1);
 	void RenderKillTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup);
 	void RenderQuadLayer(int LayerIndex, CMapItemLayerQuads *pQuadLayer, CMapItemGroup *pGroup, bool ForceRender = false);
 
 	void EnvelopeUpdate();
 
-	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
-	bool m_OnlineOnly;
+	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Result, size_t Channels, void *pUser);
 };
 
 #endif
diff --git a/src/game/client/components/mapsounds.cpp b/src/game/client/components/mapsounds.cpp
index 9f7c0b93e3..fd65b9d4b2 100644
--- a/src/game/client/components/mapsounds.cpp
+++ b/src/game/client/components/mapsounds.cpp
@@ -17,12 +17,31 @@ CMapSounds::CMapSounds()
 	m_Count = 0;
 }
 
+void CMapSounds::Play(int Channel, int SoundId)
+{
+	if(SoundId < 0 || SoundId >= m_Count)
+		return;
+
+	m_pClient->m_Sounds.PlaySample(Channel, m_aSounds[SoundId], 0, 1.0f);
+}
+
+void CMapSounds::PlayAt(int Channel, int SoundId, vec2 Position)
+{
+	if(SoundId < 0 || SoundId >= m_Count)
+		return;
+
+	m_pClient->m_Sounds.PlaySampleAt(Channel, m_aSounds[SoundId], 0, 1.0f, Position);
+}
+
 void CMapSounds::OnMapLoad()
 {
 	IMap *pMap = Kernel()->RequestInterface<IMap>();
 
 	Clear();
 
+	if(!Sound()->IsSoundEnabled())
+		return;
+
 	// load samples
 	int Start;
 	pMap->GetType(MAPITEMTYPE_SOUND, &Start, &m_Count);
@@ -51,8 +70,9 @@ void CMapSounds::OnMapLoad()
 		}
 		else
 		{
-			void *pData = pMap->GetData(pSound->m_SoundData);
-			m_aSounds[i] = Sound()->LoadOpusFromMem(pData, pSound->m_SoundDataSize);
+			const int SoundDataSize = pMap->GetDataSize(pSound->m_SoundData);
+			const void *pData = pMap->GetData(pSound->m_SoundData);
+			m_aSounds[i] = Sound()->LoadOpusFromMem(pData, SoundDataSize);
 			pMap->UnloadData(pSound->m_SoundData);
 		}
 		ShowWarning = ShowWarning || m_aSounds[i] == -1;
@@ -63,7 +83,6 @@ void CMapSounds::OnMapLoad()
 	}
 
 	// enqueue sound sources
-	m_vSourceQueue.clear();
 	for(int g = 0; g < Layers()->NumGroups(); g++)
 	{
 		CMapItemGroup *pGroup = Layers()->GetGroup(g);
@@ -98,6 +117,7 @@ void CMapSounds::OnMapLoad()
 					CSourceQueueEntry Source;
 					Source.m_Sound = pSoundLayer->m_Sound;
 					Source.m_pSource = &pSources[i];
+					Source.m_HighDetail = pLayer->m_Flags & LAYERFLAG_DETAIL;
 
 					if(!Source.m_pSource || Source.m_Sound < 0 || Source.m_Sound >= m_Count)
 						continue;
@@ -127,7 +147,7 @@ void CMapSounds::OnRender()
 				Client()->IntraGameTick(g_Config.m_ClDummy));
 		}
 		float Offset = s_Time - Source.m_pSource->m_TimeDelay;
-		if(!DemoPlayerPaused && Offset >= 0.0f && g_Config.m_SndEnable)
+		if(!DemoPlayerPaused && Offset >= 0.0f && g_Config.m_SndEnable && (g_Config.m_GfxHighDetail || !Source.m_HighDetail))
 		{
 			if(Source.m_Voice.IsValid())
 			{
@@ -143,7 +163,7 @@ void CMapSounds::OnRender()
 				if(!Source.m_pSource->m_Pan)
 					Flags |= ISound::FLAG_NO_PANNING;
 
-				Source.m_Voice = m_pClient->m_Sounds.PlaySampleAt(CSounds::CHN_MAPSOUND, m_aSounds[Source.m_Sound], 1.0f, vec2(fx2f(Source.m_pSource->m_Position.x), fx2f(Source.m_pSource->m_Position.y)), Flags);
+				Source.m_Voice = m_pClient->m_Sounds.PlaySampleAt(CSounds::CHN_MAPSOUND, m_aSounds[Source.m_Sound], Flags, 1.0f, vec2(fx2f(Source.m_pSource->m_Position.x), fx2f(Source.m_pSource->m_Position.y)));
 				Sound()->SetVoiceTimeOffset(Source.m_Voice, Offset);
 				Sound()->SetVoiceFalloff(Source.m_Voice, Source.m_pSource->m_Falloff / 255.0f);
 				switch(Source.m_pSource->m_Shape.m_Type)
@@ -207,18 +227,11 @@ void CMapSounds::OnRender()
 						if(!Voice.m_Voice.IsValid())
 							continue;
 
-						float OffsetX = 0, OffsetY = 0;
+						ColorRGBA Position = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+						CMapLayers::EnvelopeEval(Voice.m_pSource->m_PosEnvOffset, Voice.m_pSource->m_PosEnv, Position, 2, &m_pClient->m_MapLayersBackground);
 
-						if(Voice.m_pSource->m_PosEnv >= 0)
-						{
-							ColorRGBA Channels;
-							CMapLayers::EnvelopeEval(Voice.m_pSource->m_PosEnvOffset, Voice.m_pSource->m_PosEnv, Channels, &m_pClient->m_MapLayersBackground);
-							OffsetX = Channels.r;
-							OffsetY = Channels.g;
-						}
-
-						float x = fx2f(Voice.m_pSource->m_Position.x) + OffsetX;
-						float y = fx2f(Voice.m_pSource->m_Position.y) + OffsetY;
+						float x = fx2f(Voice.m_pSource->m_Position.x) + Position.r;
+						float y = fx2f(Voice.m_pSource->m_Position.y) + Position.g;
 
 						x += Center.x * (1.0f - pGroup->m_ParallaxX / 100.0f);
 						y += Center.y * (1.0f - pGroup->m_ParallaxY / 100.0f);
@@ -226,15 +239,13 @@ void CMapSounds::OnRender()
 						x -= pGroup->m_OffsetX;
 						y -= pGroup->m_OffsetY;
 
-						Sound()->SetVoiceLocation(Voice.m_Voice, x, y);
+						Sound()->SetVoicePosition(Voice.m_Voice, vec2(x, y));
 
-						if(Voice.m_pSource->m_SoundEnv >= 0)
+						ColorRGBA Volume = ColorRGBA(1.0f, 0.0f, 0.0f, 0.0f);
+						CMapLayers::EnvelopeEval(Voice.m_pSource->m_SoundEnvOffset, Voice.m_pSource->m_SoundEnv, Volume, 1, &m_pClient->m_MapLayersBackground);
+						if(Volume.r < 1.0f)
 						{
-							ColorRGBA Channels;
-							CMapLayers::EnvelopeEval(Voice.m_pSource->m_SoundEnvOffset, Voice.m_pSource->m_SoundEnv, Channels, &m_pClient->m_MapLayersBackground);
-							float Volume = clamp(Channels.r, 0.0f, 1.0f);
-
-							Sound()->SetVoiceVolume(Voice.m_Voice, Volume);
+							Sound()->SetVoiceVolume(Voice.m_Voice, Volume.r);
 						}
 					}
 				}
@@ -246,6 +257,7 @@ void CMapSounds::OnRender()
 void CMapSounds::Clear()
 {
 	// unload all samples
+	m_vSourceQueue.clear();
 	for(int i = 0; i < m_Count; i++)
 	{
 		Sound()->UnloadSample(m_aSounds[i]);
diff --git a/src/game/client/components/mapsounds.h b/src/game/client/components/mapsounds.h
index afdd7353fb..ffca022e5d 100644
--- a/src/game/client/components/mapsounds.h
+++ b/src/game/client/components/mapsounds.h
@@ -18,6 +18,7 @@ class CMapSounds : public CComponent
 	struct CSourceQueueEntry
 	{
 		int m_Sound;
+		bool m_HighDetail;
 		ISound::CVoiceHandle m_Voice;
 		CSoundSource *m_pSource;
 
@@ -32,6 +33,9 @@ class CMapSounds : public CComponent
 	CMapSounds();
 	virtual int Sizeof() const override { return sizeof(*this); }
 
+	void Play(int Channel, int SoundId);
+	void PlayAt(int Channel, int SoundId, vec2 Position);
+
 	virtual void OnMapLoad() override;
 	virtual void OnRender() override;
 	virtual void OnStateChange(int NewState, int OldState) override;
diff --git a/src/game/client/components/menu_background.cpp b/src/game/client/components/menu_background.cpp
index 7a6ee7b783..a92f271f5e 100644
--- a/src/game/client/components/menu_background.cpp
+++ b/src/game/client/components/menu_background.cpp
@@ -307,15 +307,14 @@ bool CMenuBackground::Render()
 		return false;
 
 	m_Camera.m_Zoom = 0.7f;
-	static vec2 Dir = vec2(1.0f, 0.0f);
 
 	float DistToCenter = distance(m_Camera.m_Center, m_RotationCenter);
 	if(!m_ChangedPosition && absolute(DistToCenter - (float)g_Config.m_ClRotationRadius) <= 0.5f)
 	{
 		// do little rotation
 		float RotPerTick = 360.0f / (float)g_Config.m_ClRotationSpeed * clamp(Client()->RenderFrameTime(), 0.0f, 0.1f);
-		Dir = rotate(Dir, RotPerTick);
-		m_Camera.m_Center = m_RotationCenter + Dir * (float)g_Config.m_ClRotationRadius;
+		m_CurrentDirection = rotate(m_CurrentDirection, RotPerTick);
+		m_Camera.m_Center = m_RotationCenter + m_CurrentDirection * (float)g_Config.m_ClRotationRadius;
 	}
 	else
 	{
@@ -328,16 +327,16 @@ bool CMenuBackground::Render()
 		vec2 TargetPos = m_RotationCenter + DirToCenter * (float)g_Config.m_ClRotationRadius;
 		float Distance = distance(m_AnimationStartPos, TargetPos);
 		if(Distance > 0.001f)
-			Dir = normalize(m_AnimationStartPos - TargetPos);
+			m_CurrentDirection = normalize(m_AnimationStartPos - TargetPos);
 		else
-			Dir = vec2(1, 0);
+			m_CurrentDirection = vec2(1.0f, 0.0f);
 
 		// move time
 		m_MoveTime += clamp(Client()->RenderFrameTime(), 0.0f, 0.1f) * g_Config.m_ClCameraSpeed / 10.0f;
 		float XVal = 1 - m_MoveTime;
 		XVal = std::pow(XVal, 7.0f);
 
-		m_Camera.m_Center = TargetPos + Dir * (XVal * Distance);
+		m_Camera.m_Center = TargetPos + m_CurrentDirection * (XVal * Distance);
 		if(m_CurrentPosition < 0)
 		{
 			m_AnimationStartPos = m_Camera.m_Center;
diff --git a/src/game/client/components/menu_background.h b/src/game/client/components/menu_background.h
index 5cc7e2066b..a2f3791e6a 100644
--- a/src/game/client/components/menu_background.h
+++ b/src/game/client/components/menu_background.h
@@ -61,13 +61,14 @@ class CMenuBackground : public CBackground
 		POS_BROWSER_CUSTOM1,
 		POS_BROWSER_CUSTOM2,
 		POS_BROWSER_CUSTOM3,
+		POS_BROWSER_CUSTOM4,
 		POS_RESERVED0,
 		POS_RESERVED1,
 		POS_RESERVED2,
 
 		NUM_POS,
 
-		POS_BROWSER_CUSTOM_NUM = (POS_BROWSER_CUSTOM3 - POS_BROWSER_CUSTOM0) + 1,
+		POS_BROWSER_CUSTOM_NUM = (POS_BROWSER_CUSTOM4 - POS_BROWSER_CUSTOM0) + 1,
 		POS_SETTINGS_RESERVED_NUM = (POS_SETTINGS_RESERVED1 - POS_SETTINGS_RESERVED0) + 1,
 		POS_RESERVED_NUM = (POS_RESERVED2 - POS_RESERVED0) + 1,
 	};
@@ -84,6 +85,7 @@ class CMenuBackground : public CBackground
 	vec2 m_RotationCenter;
 	std::array<vec2, NUM_POS> m_aPositions;
 	int m_CurrentPosition;
+	vec2 m_CurrentDirection = vec2(1.0f, 0.0f);
 	vec2 m_AnimationStartPos;
 	bool m_ChangedPosition;
 	float m_MoveTime;
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 8cd07433c3..0c0f07f8f2 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -14,6 +14,7 @@
 #include <engine/config.h>
 #include <engine/editor.h>
 #include <engine/friends.h>
+#include <engine/gfx/image_manipulation.h>
 #include <engine/graphics.h>
 #include <engine/keys.h>
 #include <engine/serverbrowser.h>
@@ -56,10 +57,8 @@ float CMenus::ms_ListheaderHeight = 17.0f;
 CMenus::CMenus()
 {
 	m_Popup = POPUP_NONE;
-	m_ActivePage = PAGE_INTERNET;
 	m_MenuPage = 0;
 	m_GamePage = PAGE_GAME;
-	m_JoinTutorial = false;
 
 	m_NeedRestartGraphics = false;
 	m_NeedRestartSound = false;
@@ -100,7 +99,7 @@ CMenus::CMenus()
 	m_PasswordInput.SetHidden(true);
 }
 
-int CMenus::DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect, bool Active)
+int CMenus::DoButton_Toggle(const void *pId, int Checked, const CUIRect *pRect, bool Active)
 {
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GUIBUTTONS].m_Id);
 	Graphics()->QuadsBegin();
@@ -109,7 +108,7 @@ int CMenus::DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect,
 	RenderTools()->SelectSprite(Checked ? SPRITE_GUIBUTTON_ON : SPRITE_GUIBUTTON_OFF);
 	IGraphics::CQuadItem QuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
-	if(UI()->HotItem() == pID && Active)
+	if(Ui()->HotItem() == pId && Active)
 	{
 		RenderTools()->SelectSprite(SPRITE_GUIBUTTON_HOVER);
 		QuadItem = IGraphics::CQuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
@@ -117,7 +116,7 @@ int CMenus::DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect,
 	}
 	Graphics()->QuadsEnd();
 
-	return Active ? UI()->DoButtonLogic(pID, Checked, pRect) : 0;
+	return Active ? Ui()->DoButtonLogic(pId, Checked, pRect) : 0;
 }
 
 int CMenus::DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, const char *pImageName, int Corners, float Rounding, float FontFactor, ColorRGBA Color)
@@ -126,7 +125,7 @@ int CMenus::DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText,
 
 	if(Checked)
 		Color = ColorRGBA(0.6f, 0.6f, 0.6f, 0.5f);
-	Color.a *= UI()->ButtonColorMul(pButtonContainer);
+	Color.a *= Ui()->ButtonColorMul(pButtonContainer);
 
 	pRect->Draw(Color, Corners, Rounding);
 
@@ -139,7 +138,7 @@ int CMenus::DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText,
 		const CMenuImage *pImage = FindMenuImage(pImageName);
 		if(pImage)
 		{
-			Graphics()->TextureSet(UI()->HotItem() == pButtonContainer ? pImage->m_OrgTexture : pImage->m_GreyTexture);
+			Graphics()->TextureSet(Ui()->HotItem() == pButtonContainer ? pImage->m_OrgTexture : pImage->m_GreyTexture);
 			Graphics()->WrapClamp();
 			Graphics()->QuadsBegin();
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
@@ -152,14 +151,14 @@ int CMenus::DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText,
 
 	Text.HMargin(pRect->h >= 20.0f ? 2.0f : 1.0f, &Text);
 	Text.HMargin((Text.h * FontFactor) / 2.0f, &Text);
-	UI()->DoLabel(&Text, pText, Text.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+	Ui()->DoLabel(&Text, pText, Text.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 
-	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+	return Ui()->DoButtonLogic(pButtonContainer, Checked, pRect);
 }
 
-int CMenus::DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator, const ColorRGBA *pDefaultColor, const ColorRGBA *pActiveColor, const ColorRGBA *pHoverColor, float EdgeRounding)
+int CMenus::DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator, const ColorRGBA *pDefaultColor, const ColorRGBA *pActiveColor, const ColorRGBA *pHoverColor, float EdgeRounding, const SCommunityIcon *pCommunityIcon)
 {
-	const bool MouseInside = UI()->HotItem() == pButtonContainer;
+	const bool MouseInside = Ui()->HotItem() == pButtonContainer;
 	CUIRect Rect = *pRect;
 
 	if(pAnimator != NULL)
@@ -230,14 +229,23 @@ int CMenus::DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pTe
 		}
 	}
 
-	CUIRect Temp;
-	Rect.HMargin(2.0f, &Temp);
-	UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+	if(pCommunityIcon)
+	{
+		CUIRect CommunityIcon;
+		Rect.Margin(2.0f, &CommunityIcon);
+		RenderCommunityIcon(pCommunityIcon, CommunityIcon, true);
+	}
+	else
+	{
+		CUIRect Label;
+		Rect.HMargin(2.0f, &Label);
+		Ui()->DoLabel(&Label, pText, Label.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
+	}
 
-	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+	return Ui()->DoButtonLogic(pButtonContainer, Checked, pRect);
 }
 
-int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+int CMenus::DoButton_GridHeader(const void *pId, const char *pText, int Checked, const CUIRect *pRect)
 {
 	if(Checked == 2)
 		pRect->Draw(ColorRGBA(1, 0.98f, 0.5f, 0.55f), IGraphics::CORNER_T, 5.0f);
@@ -246,34 +254,52 @@ int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked,
 
 	CUIRect Temp;
 	pRect->VSplitLeft(5.0f, nullptr, &Temp);
-	UI()->DoLabel(&Temp, pText, pRect->h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
-	return UI()->DoButtonLogic(pID, Checked, pRect);
+	Ui()->DoLabel(&Temp, pText, pRect->h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
+	return Ui()->DoButtonLogic(pId, Checked, pRect);
+}
+
+int CMenus::DoButton_Favorite(const void *pButtonId, const void *pParentId, bool Checked, const CUIRect *pRect)
+{
+	if(Checked || (pParentId != nullptr && Ui()->HotItem() == pParentId) || Ui()->HotItem() == pButtonId)
+	{
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		const float Alpha = Ui()->HotItem() == pButtonId ? 0.2f : 0.0f;
+		TextRender()->TextColor(Checked ? ColorRGBA(1.0f, 0.85f, 0.3f, 0.8f + Alpha) : ColorRGBA(0.5f, 0.5f, 0.5f, 0.8f + Alpha));
+		SLabelProperties Props;
+		Props.m_MaxWidth = pRect->w;
+		Ui()->DoLabel(pRect, FONT_ICON_STAR, 12.0f, TEXTALIGN_MC, Props);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	}
+	return Ui()->DoButtonLogic(pButtonId, 0, pRect);
 }
 
-int CMenus::DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect)
+int CMenus::DoButton_CheckBox_Common(const void *pId, const char *pText, const char *pBoxText, const CUIRect *pRect)
 {
 	CUIRect Box, Label;
 	pRect->VSplitLeft(pRect->h, &Box, &Label);
 	Label.VSplitLeft(5.0f, nullptr, &Label);
 
 	Box.Margin(2.0f, &Box);
-	Box.Draw(ColorRGBA(1, 1, 1, 0.25f * UI()->ButtonColorMul(pID)), IGraphics::CORNER_ALL, 3.0f);
+	Box.Draw(ColorRGBA(1, 1, 1, 0.25f * Ui()->ButtonColorMul(pId)), IGraphics::CORNER_ALL, 3.0f);
 
 	const bool Checkable = *pBoxText == 'X';
 	if(Checkable)
 	{
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT);
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-		UI()->DoLabel(&Box, FONT_ICON_XMARK, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		Ui()->DoLabel(&Box, FONT_ICON_XMARK, Box.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 	}
 	else
-		UI()->DoLabel(&Box, pBoxText, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		Ui()->DoLabel(&Box, pBoxText, Box.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 
 	TextRender()->SetRenderFlags(0);
-	UI()->DoLabel(&Label, pText, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, pText, Box.h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
 
-	return UI()->DoButtonLogic(pID, 0, pRect);
+	return Ui()->DoButtonLogic(pId, 0, pRect);
 }
 
 void CMenus::DoLaserPreview(const CUIRect *pRect, const ColorHSLA LaserOutlineColor, const ColorHSLA LaserInnerColor, const int LaserType)
@@ -347,37 +373,37 @@ void CMenus::DoLaserPreview(const CUIRect *pRect, const ColorHSLA LaserOutlineCo
 	}
 }
 
-ColorHSLA CMenus::DoLine_ColorPicker(CButtonContainer *pResetID, const float LineSize, const float LabelSize, const float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, const ColorRGBA DefaultColor, bool CheckBoxSpacing, int *pCheckBoxValue, bool Alpha)
+ColorHSLA CMenus::DoLine_ColorPicker(CButtonContainer *pResetId, const float LineSize, const float LabelSize, const float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, const ColorRGBA DefaultColor, bool CheckBoxSpacing, int *pCheckBoxValue, bool Alpha)
 {
 	CUIRect Section, ColorPickerButton, ResetButton, Label;
 
 	pMainRect->HSplitTop(LineSize, &Section, pMainRect);
 	pMainRect->HSplitTop(BottomMargin, nullptr, pMainRect);
 
-	if(CheckBoxSpacing || pCheckBoxValue != nullptr)
-	{
-		CUIRect CheckBox;
-		Section.VSplitLeft(Section.h, &CheckBox, &Section);
-		if(pCheckBoxValue != nullptr)
-		{
-			CheckBox.Margin(2.0f, &CheckBox);
-			if(DoButton_CheckBox(pCheckBoxValue, "", *pCheckBoxValue, &CheckBox))
-				*pCheckBoxValue ^= 1;
-		}
-		Section.VSplitLeft(5.0f, nullptr, &Section);
-	}
-
-	Section.VSplitMid(&Label, &Section, 4.0f);
 	Section.VSplitRight(60.0f, &Section, &ResetButton);
 	Section.VSplitRight(8.0f, &Section, nullptr);
 	Section.VSplitRight(Section.h, &Section, &ColorPickerButton);
+	Section.VSplitRight(8.0f, &Label, nullptr);
 
-	UI()->DoLabel(&Label, pText, LabelSize, TEXTALIGN_ML);
+	if(pCheckBoxValue != nullptr)
+	{
+		Label.Margin(2.0f, &Label);
+		if(DoButton_CheckBox(pCheckBoxValue, pText, *pCheckBoxValue, &Label))
+			*pCheckBoxValue ^= 1;
+	}
+	else if(CheckBoxSpacing)
+	{
+		Label.VSplitLeft(Label.h + 5.0f, nullptr, &Label);
+	}
+	if(pCheckBoxValue == nullptr)
+	{
+		Ui()->DoLabel(&Label, pText, LabelSize, TEXTALIGN_ML);
+	}
 
-	ColorHSLA PickedColor = DoButton_ColorPicker(&ColorPickerButton, pColorValue, Alpha);
+	const ColorHSLA PickedColor = DoButton_ColorPicker(&ColorPickerButton, pColorValue, Alpha);
 
 	ResetButton.HMargin(2.0f, &ResetButton);
-	if(DoButton_Menu(pResetID, Localize("Reset"), 0, &ResetButton, nullptr, IGraphics::CORNER_ALL, 4.0f, 0.1f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f)))
+	if(DoButton_Menu(pResetId, Localize("Reset"), 0, &ResetButton, nullptr, IGraphics::CORNER_ALL, 4.0f, 0.1f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f)))
 	{
 		*pColorValue = color_cast<ColorHSLA>(DefaultColor).Pack(Alpha);
 	}
@@ -390,7 +416,7 @@ ColorHSLA CMenus::DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHsla
 	ColorHSLA HslaColor = ColorHSLA(*pHslaColor, Alpha);
 
 	ColorRGBA Outline = ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f);
-	Outline.a *= UI()->ButtonColorMul(pHslaColor);
+	Outline.a *= Ui()->ButtonColorMul(pHslaColor);
 
 	CUIRect Rect;
 	pRect->Margin(3.0f, &Rect);
@@ -398,17 +424,17 @@ ColorHSLA CMenus::DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHsla
 	pRect->Draw(Outline, IGraphics::CORNER_ALL, 4.0f);
 	Rect.Draw(color_cast<ColorRGBA>(HslaColor), IGraphics::CORNER_ALL, 4.0f);
 
-	static CUI::SColorPickerPopupContext s_ColorPickerPopupContext;
-	if(UI()->DoButtonLogic(pHslaColor, 0, pRect))
+	static CUi::SColorPickerPopupContext s_ColorPickerPopupContext;
+	if(Ui()->DoButtonLogic(pHslaColor, 0, pRect))
 	{
 		s_ColorPickerPopupContext.m_pHslaColor = pHslaColor;
 		s_ColorPickerPopupContext.m_HslaColor = HslaColor;
 		s_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(HslaColor);
 		s_ColorPickerPopupContext.m_RgbaColor = color_cast<ColorRGBA>(s_ColorPickerPopupContext.m_HsvaColor);
 		s_ColorPickerPopupContext.m_Alpha = Alpha;
-		UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &s_ColorPickerPopupContext);
+		Ui()->ShowPopupColorPicker(Ui()->MouseX(), Ui()->MouseY(), &s_ColorPickerPopupContext);
 	}
-	else if(UI()->IsPopupOpen(&s_ColorPickerPopupContext) && s_ColorPickerPopupContext.m_pHslaColor == pHslaColor)
+	else if(Ui()->IsPopupOpen(&s_ColorPickerPopupContext) && s_ColorPickerPopupContext.m_pHslaColor == pHslaColor)
 	{
 		HslaColor = color_cast<ColorHSLA>(s_ColorPickerPopupContext.m_HsvaColor);
 	}
@@ -416,12 +442,12 @@ ColorHSLA CMenus::DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHsla
 	return HslaColor;
 }
 
-int CMenus::DoButton_CheckBoxAutoVMarginAndSet(const void *pID, const char *pText, int *pValue, CUIRect *pRect, float VMargin)
+int CMenus::DoButton_CheckBoxAutoVMarginAndSet(const void *pId, const char *pText, int *pValue, CUIRect *pRect, float VMargin)
 {
 	CUIRect CheckBoxRect;
 	pRect->HSplitTop(VMargin, &CheckBoxRect, pRect);
 
-	int Logic = DoButton_CheckBox_Common(pID, pText, *pValue ? "X" : "", &CheckBoxRect);
+	int Logic = DoButton_CheckBox_Common(pId, pText, *pValue ? "X" : "", &CheckBoxRect);
 
 	if(Logic)
 		*pValue ^= 1;
@@ -429,109 +455,148 @@ int CMenus::DoButton_CheckBoxAutoVMarginAndSet(const void *pID, const char *pTex
 	return Logic;
 }
 
-int CMenus::DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+int CMenus::DoButton_CheckBox(const void *pId, const char *pText, int Checked, const CUIRect *pRect)
 {
-	return DoButton_CheckBox_Common(pID, pText, Checked ? "X" : "", pRect);
+	return DoButton_CheckBox_Common(pId, pText, Checked ? "X" : "", pRect);
 }
 
-int CMenus::DoButton_CheckBox_Number(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+int CMenus::DoButton_CheckBox_Number(const void *pId, const char *pText, int Checked, const CUIRect *pRect)
 {
 	char aBuf[16];
-	str_from_int(Checked, aBuf);
-	return DoButton_CheckBox_Common(pID, pText, aBuf, pRect);
+	str_format(aBuf, sizeof(aBuf), "%d", Checked);
+	return DoButton_CheckBox_Common(pId, pText, aBuf, pRect);
 }
 
-int CMenus::DoKeyReader(const void *pID, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination)
+int CMenus::DoKeyReader(const void *pId, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination)
 {
-	// process
-	static const void *s_pGrabbedID = nullptr;
-	static bool s_MouseReleased = true;
-	static int s_ButtonUsed = 0;
-	const bool Inside = UI()->MouseHovered(pRect);
 	int NewKey = Key;
 	*pNewModifierCombination = ModifierCombination;
 
-	if(!UI()->MouseButton(0) && !UI()->MouseButton(1) && s_pGrabbedID == pID)
-		s_MouseReleased = true;
-
-	if(UI()->CheckActiveItem(pID))
+	const int ButtonResult = Ui()->DoButtonLogic(pId, 0, pRect);
+	if(ButtonResult == 1)
 	{
-		if(m_Binder.m_GotKey)
-		{
-			// abort with escape key
-			if(m_Binder.m_Key.m_Key != KEY_ESCAPE)
-			{
-				NewKey = m_Binder.m_Key.m_Key;
-				*pNewModifierCombination = m_Binder.m_ModifierCombination;
-			}
-			m_Binder.m_GotKey = false;
-			UI()->SetActiveItem(nullptr);
-			s_MouseReleased = false;
-			s_pGrabbedID = pID;
-		}
-
-		if(s_ButtonUsed == 1 && !UI()->MouseButton(1))
-		{
-			if(Inside)
-				NewKey = 0;
-			UI()->SetActiveItem(nullptr);
-		}
+		m_Binder.m_pKeyReaderId = pId;
+		m_Binder.m_TakeKey = true;
+		m_Binder.m_GotKey = false;
 	}
-	else if(UI()->HotItem() == pID)
+	else if(ButtonResult == 2)
 	{
-		if(s_MouseReleased)
-		{
-			if(UI()->MouseButton(0))
-			{
-				m_Binder.m_TakeKey = true;
-				m_Binder.m_GotKey = false;
-				UI()->SetActiveItem(pID);
-				s_ButtonUsed = 0;
-			}
+		NewKey = 0;
+		*pNewModifierCombination = CBinds::MODIFIER_NONE;
+	}
 
-			if(UI()->MouseButton(1))
-			{
-				UI()->SetActiveItem(pID);
-				s_ButtonUsed = 1;
-			}
+	if(m_Binder.m_pKeyReaderId == pId && m_Binder.m_GotKey)
+	{
+		// abort with escape key
+		if(m_Binder.m_Key.m_Key != KEY_ESCAPE)
+		{
+			NewKey = m_Binder.m_Key.m_Key;
+			*pNewModifierCombination = m_Binder.m_ModifierCombination;
 		}
+		m_Binder.m_pKeyReaderId = nullptr;
+		m_Binder.m_GotKey = false;
+		Ui()->SetActiveItem(nullptr);
 	}
 
-	if(Inside)
-		UI()->SetHotItem(pID);
-
 	char aBuf[64];
-	if(UI()->CheckActiveItem(pID) && s_ButtonUsed == 0)
+	if(m_Binder.m_pKeyReaderId == pId && m_Binder.m_TakeKey)
 		str_copy(aBuf, Localize("Press a key…"));
 	else if(NewKey == 0)
 		aBuf[0] = '\0';
 	else
-		str_format(aBuf, sizeof(aBuf), "%s%s", CBinds::GetKeyBindModifiersName(*pNewModifierCombination), Input()->KeyName(NewKey));
+	{
+		char aModifiers[128];
+		CBinds::GetKeyBindModifiersName(*pNewModifierCombination, aModifiers, sizeof(aModifiers));
+		str_format(aBuf, sizeof(aBuf), "%s%s", aModifiers, Input()->KeyName(NewKey));
+	}
 
-	const ColorRGBA Color = UI()->CheckActiveItem(pID) && m_Binder.m_TakeKey ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.4f) : ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(pID));
+	const ColorRGBA Color = m_Binder.m_pKeyReaderId == pId && m_Binder.m_TakeKey ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.4f) : ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * Ui()->ButtonColorMul(pId));
 	pRect->Draw(Color, IGraphics::CORNER_ALL, 5.0f);
 	CUIRect Temp;
 	pRect->HMargin(1.0f, &Temp);
-	UI()->DoLabel(&Temp, aBuf, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+	Ui()->DoLabel(&Temp, aBuf, Temp.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 
 	return NewKey;
 }
 
-int CMenus::RenderMenubar(CUIRect r)
+void CMenus::RenderMenubar(CUIRect Box, IClient::EClientState ClientState)
 {
-	CUIRect Box = r;
 	CUIRect Button;
 
-	m_ActivePage = m_MenuPage;
 	int NewPage = -1;
+	int ActivePage = -1;
+	if(ClientState == IClient::STATE_OFFLINE)
+	{
+		ActivePage = m_MenuPage;
+	}
+	else if(ClientState == IClient::STATE_ONLINE)
+	{
+		ActivePage = m_GamePage;
+	}
+	else
+	{
+		dbg_assert(false, "Client state invalid for RenderMenubar");
+	}
+
+	// First render buttons aligned from right side so remaining
+	// width is known when rendering buttons from left side.
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_QuitButton;
+	ColorRGBA QuitColor(1, 0, 0, 0.5f);
+	if(DoButton_MenuTab(&s_QuitButton, FONT_ICON_POWER_OFF, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_QUIT], nullptr, nullptr, &QuitColor, 10.0f))
+	{
+		if(m_pClient->Editor()->HasUnsavedData() || (Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmQuitTime && g_Config.m_ClConfirmQuitTime >= 0))
+		{
+			m_Popup = POPUP_QUIT;
+		}
+		else
+		{
+			Client()->Quit();
+		}
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_QuitButton, &Button, Localize("Quit"));
+
+	Box.VSplitRight(10.0f, &Box, nullptr);
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_SettingsButton;
+	if(DoButton_MenuTab(&s_SettingsButton, FONT_ICON_GEAR, ActivePage == PAGE_SETTINGS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_SETTINGS]))
+	{
+		NewPage = PAGE_SETTINGS;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_SettingsButton, &Button, Localize("Settings"));
+
+	Box.VSplitRight(10.0f, &Box, nullptr);
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_EditorButton;
+	if(DoButton_MenuTab(&s_EditorButton, FONT_ICON_PEN_TO_SQUARE, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_EDITOR]))
+	{
+		g_Config.m_ClEditor = 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_EditorButton, &Button, Localize("Editor"));
+
+	if(ClientState == IClient::STATE_OFFLINE)
+	{
+		Box.VSplitRight(10.0f, &Box, nullptr);
+		Box.VSplitRight(33.0f, &Box, &Button);
+		static CButtonContainer s_DemoButton;
+		if(DoButton_MenuTab(&s_DemoButton, FONT_ICON_CLAPPERBOARD, ActivePage == PAGE_DEMOS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_DEMOBUTTON]))
+		{
+			NewPage = PAGE_DEMOS;
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_DemoButton, &Button, Localize("Demos"));
+	}
+
+	Box.VSplitRight(10.0f, &Box, nullptr);
 
-	if(Client()->State() != IClient::STATE_OFFLINE)
-		m_ActivePage = m_GamePage;
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 
-	if(Client()->State() == IClient::STATE_OFFLINE)
+	if(ClientState == IClient::STATE_OFFLINE)
 	{
 		Box.VSplitLeft(33.0f, &Button, &Box);
-		static CButtonContainer s_StartButton;
 
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
@@ -551,8 +616,8 @@ int CMenus::RenderMenubar(CUIRect r)
 
 		ColorRGBA HomeButtonColorAlert(0, 1, 0, 0.25f);
 		ColorRGBA HomeButtonColorAlertHover(0, 1, 0, 0.5f);
-		ColorRGBA *pHomeButtonColor = NULL;
-		ColorRGBA *pHomeButtonColorHover = NULL;
+		ColorRGBA *pHomeButtonColor = nullptr;
+		ColorRGBA *pHomeButtonColorHover = nullptr;
 
 		const char *pHomeScreenButtonLabel = FONT_ICON_HOUSE;
 		if(GotNewsOrUpdate)
@@ -562,247 +627,192 @@ int CMenus::RenderMenubar(CUIRect r)
 			pHomeButtonColorHover = &HomeButtonColorAlertHover;
 		}
 
+		static CButtonContainer s_StartButton;
 		if(DoButton_MenuTab(&s_StartButton, pHomeScreenButtonLabel, false, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_HOME], pHomeButtonColor, pHomeButtonColor, pHomeButtonColorHover, 10.0f))
 		{
 			m_ShowStart = true;
 		}
+		GameClient()->m_Tooltips.DoToolTip(&s_StartButton, &Button, Localize("Main menu"));
 
-		TextRender()->SetRenderFlags(0);
-		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-
-		Box.VSplitLeft(10.0f, 0, &Box);
+		const float BrowserButtonWidth = 75.0f;
+		Box.VSplitLeft(10.0f, nullptr, &Box);
+		Box.VSplitLeft(BrowserButtonWidth, &Button, &Box);
+		static CButtonContainer s_InternetButton;
+		if(DoButton_MenuTab(&s_InternetButton, FONT_ICON_EARTH_AMERICAS, ActivePage == PAGE_INTERNET, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_INTERNET]))
+		{
+			NewPage = PAGE_INTERNET;
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_InternetButton, &Button, Localize("Internet"));
 
-		// offline menus
-		if(m_ActivePage == PAGE_NEWS)
+		Box.VSplitLeft(BrowserButtonWidth, &Button, &Box);
+		static CButtonContainer s_LanButton;
+		if(DoButton_MenuTab(&s_LanButton, FONT_ICON_NETWORK_WIRED, ActivePage == PAGE_LAN, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_LAN]))
 		{
-			Box.VSplitLeft(100.0f, &Button, &Box);
-			static CButtonContainer s_NewsButton;
-			if(DoButton_MenuTab(&s_NewsButton, Localize("Hall of fame"), m_ActivePage == PAGE_NEWS, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_NEWS]))
-			{
-				NewPage = PAGE_NEWS;
-			}
+			NewPage = PAGE_LAN;
 		}
-		else if(m_ActivePage == PAGE_DEMOS)
+		GameClient()->m_Tooltips.DoToolTip(&s_LanButton, &Button, Localize("LAN"));
+
+		Box.VSplitLeft(BrowserButtonWidth, &Button, &Box);
+		static CButtonContainer s_FavoritesButton;
+		if(DoButton_MenuTab(&s_FavoritesButton, FONT_ICON_STAR, ActivePage == PAGE_FAVORITES, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_FAVORITES]))
 		{
-			Box.VSplitLeft(100.0f, &Button, &Box);
-			static CButtonContainer s_DemosButton;
-			if(DoButton_MenuTab(&s_DemosButton, Localize("Demos"), m_ActivePage == PAGE_DEMOS, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_DEMOS]))
-			{
-				DemolistPopulate();
-				NewPage = PAGE_DEMOS;
-			}
+			NewPage = PAGE_FAVORITES;
 		}
-		else
+		GameClient()->m_Tooltips.DoToolTip(&s_FavoritesButton, &Button, Localize("Favorites"));
+
+		int MaxPage = PAGE_FAVORITES + ServerBrowser()->FavoriteCommunities().size();
+		if(
+			!Ui()->IsPopupOpen() &&
+			CLineInput::GetActiveInput() == nullptr &&
+			(g_Config.m_UiPage >= PAGE_INTERNET && g_Config.m_UiPage <= MaxPage) &&
+			(m_MenuPage >= PAGE_INTERNET && m_MenuPage <= PAGE_FAVORITE_COMMUNITY_5))
 		{
-			Box.VSplitLeft(100.0f, &Button, &Box);
-			static CButtonContainer s_InternetButton;
-			if(DoButton_MenuTab(&s_InternetButton, Localize("Internet"), m_ActivePage == PAGE_INTERNET, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_INTERNET]))
+			if(Input()->KeyPress(KEY_RIGHT))
 			{
-				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_INTERNET)
-				{
-					if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_FAVORITES)
-						Client()->RequestDDNetInfo();
-					ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
-				}
-				NewPage = PAGE_INTERNET;
+				NewPage = g_Config.m_UiPage + 1;
+				if(NewPage > MaxPage)
+					NewPage = PAGE_INTERNET;
 			}
-
-			Box.VSplitLeft(100.0f, &Button, &Box);
-			static CButtonContainer s_LanButton;
-			if(DoButton_MenuTab(&s_LanButton, Localize("LAN"), m_ActivePage == PAGE_LAN, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_LAN]))
+			if(Input()->KeyPress(KEY_LEFT))
 			{
-				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_LAN)
-					ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
-				NewPage = PAGE_LAN;
+				NewPage = g_Config.m_UiPage - 1;
+				if(NewPage < PAGE_INTERNET)
+					NewPage = MaxPage;
 			}
+		}
 
-			Box.VSplitLeft(100.0f, &Button, &Box);
-			static CButtonContainer s_FavoritesButton;
-			if(DoButton_MenuTab(&s_FavoritesButton, Localize("Favorites"), m_ActivePage == PAGE_FAVORITES, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_FAVORITES]))
+		size_t FavoriteCommunityIndex = 0;
+		static CButtonContainer s_aFavoriteCommunityButtons[5];
+		static_assert(std::size(s_aFavoriteCommunityButtons) == (size_t)PAGE_FAVORITE_COMMUNITY_5 - PAGE_FAVORITE_COMMUNITY_1 + 1);
+		static_assert(std::size(s_aFavoriteCommunityButtons) == (size_t)BIT_TAB_FAVORITE_COMMUNITY_5 - BIT_TAB_FAVORITE_COMMUNITY_1 + 1);
+		static_assert(std::size(s_aFavoriteCommunityButtons) == (size_t)IServerBrowser::TYPE_FAVORITE_COMMUNITY_5 - IServerBrowser::TYPE_FAVORITE_COMMUNITY_1 + 1);
+		for(const CCommunity *pCommunity : ServerBrowser()->FavoriteCommunities())
+		{
+			if(Box.w < BrowserButtonWidth)
+				break;
+			Box.VSplitLeft(BrowserButtonWidth, &Button, &Box);
+			const int Page = PAGE_FAVORITE_COMMUNITY_1 + FavoriteCommunityIndex;
+			if(DoButton_MenuTab(&s_aFavoriteCommunityButtons[FavoriteCommunityIndex], FONT_ICON_ELLIPSIS, ActivePage == Page, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIT_TAB_FAVORITE_COMMUNITY_1 + FavoriteCommunityIndex], nullptr, nullptr, nullptr, 10.0f, FindCommunityIcon(pCommunity->Id())))
 			{
-				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_FAVORITES)
-				{
-					if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_INTERNET)
-						Client()->RequestDDNetInfo();
-					ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
-				}
-				NewPage = PAGE_FAVORITES;
+				NewPage = Page;
 			}
+			GameClient()->m_Tooltips.DoToolTip(&s_aFavoriteCommunityButtons[FavoriteCommunityIndex], &Button, pCommunity->Name());
 
-			//Box.VSplitLeft(100.0f, &Button, &Box);
-			//static CButtonContainer s_StatsButton;
-			//if(DoButton_MenuTab(&s_StatsButton, Localize("DDRace Stats"), m_ActivePage == PAGE_STATS, &Button, IGraphics::CORNER_T))
-			//{
-			//	NewPage = PAGE_STATS;
-			//}
+			++FavoriteCommunityIndex;
+			if(FavoriteCommunityIndex >= std::size(s_aFavoriteCommunityButtons))
+				break;
 		}
+
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 	}
 	else
 	{
 		// online menus
 		Box.VSplitLeft(90.0f, &Button, &Box);
 		static CButtonContainer s_GameButton;
-		if(DoButton_MenuTab(&s_GameButton, Localize("Game"), m_ActivePage == PAGE_GAME, &Button, IGraphics::CORNER_TL))
+		if(DoButton_MenuTab(&s_GameButton, Localize("Game"), ActivePage == PAGE_GAME, &Button, IGraphics::CORNER_TL))
 			NewPage = PAGE_GAME;
 
 		Box.VSplitLeft(90.0f, &Button, &Box);
 		static CButtonContainer s_PlayersButton;
-		if(DoButton_MenuTab(&s_PlayersButton, Localize("Players"), m_ActivePage == PAGE_PLAYERS, &Button, 0))
+		if(DoButton_MenuTab(&s_PlayersButton, Localize("Players"), ActivePage == PAGE_PLAYERS, &Button, IGraphics::CORNER_NONE))
 			NewPage = PAGE_PLAYERS;
 
 		Box.VSplitLeft(130.0f, &Button, &Box);
 		static CButtonContainer s_ServerInfoButton;
-		if(DoButton_MenuTab(&s_ServerInfoButton, Localize("Server info"), m_ActivePage == PAGE_SERVER_INFO, &Button, 0))
+		if(DoButton_MenuTab(&s_ServerInfoButton, Localize("Server info"), ActivePage == PAGE_SERVER_INFO, &Button, IGraphics::CORNER_NONE))
 			NewPage = PAGE_SERVER_INFO;
 
 		Box.VSplitLeft(90.0f, &Button, &Box);
 		static CButtonContainer s_NetworkButton;
-		if(DoButton_MenuTab(&s_NetworkButton, Localize("Browser"), m_ActivePage == PAGE_NETWORK, &Button, 0))
+		if(DoButton_MenuTab(&s_NetworkButton, Localize("Browser"), ActivePage == PAGE_NETWORK, &Button, IGraphics::CORNER_NONE))
 			NewPage = PAGE_NETWORK;
 
+		if(GameClient()->m_GameInfo.m_Race)
 		{
+			Box.VSplitLeft(90.0f, &Button, &Box);
 			static CButtonContainer s_GhostButton;
-			if(GameClient()->m_GameInfo.m_Race)
-			{
-				Box.VSplitLeft(90.0f, &Button, &Box);
-				if(DoButton_MenuTab(&s_GhostButton, Localize("Ghost"), m_ActivePage == PAGE_GHOST, &Button, 0))
-					NewPage = PAGE_GHOST;
-			}
+			if(DoButton_MenuTab(&s_GhostButton, Localize("Ghost"), ActivePage == PAGE_GHOST, &Button, IGraphics::CORNER_NONE))
+				NewPage = PAGE_GHOST;
 		}
 
 		Box.VSplitLeft(100.0f, &Button, &Box);
+		Box.VSplitLeft(4.0f, nullptr, &Box);
 		static CButtonContainer s_CallVoteButton;
-		if(DoButton_MenuTab(&s_CallVoteButton, Localize("Call vote"), m_ActivePage == PAGE_CALLVOTE, &Button, 0))
+		if(DoButton_MenuTab(&s_CallVoteButton, Localize("Call vote"), ActivePage == PAGE_CALLVOTE, &Button, IGraphics::CORNER_TR))
 		{
 			NewPage = PAGE_CALLVOTE;
 			m_ControlPageOpening = true;
 		}
-		Box.VSplitLeft(90.0f, &Button, &Box);
-		Box.VSplitLeft(4.0f, 0, &Box);
-		static CButtonContainer s_StatsButton;
-		if(DoButton_MenuTab(&s_StatsButton, Localize("Stats"), m_ActivePage == PAGE_STATS, &Button, IGraphics::CORNER_TR))
-		{
-			NewPage = PAGE_STATS;
-		}
-	}
-
-	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-
-	Box.VSplitRight(33.0f, &Box, &Button);
-	static CButtonContainer s_QuitButton;
-	ColorRGBA QuitColor(1, 0, 0, 0.5f);
-	if(DoButton_MenuTab(&s_QuitButton, FONT_ICON_POWER_OFF, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_QUIT], nullptr, nullptr, &QuitColor, 10.0f))
-	{
-		if(m_pClient->Editor()->HasUnsavedData() || (Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmQuitTime && g_Config.m_ClConfirmQuitTime >= 0))
-		{
-			m_Popup = POPUP_QUIT;
-		}
-		else
-		{
-			Client()->Quit();
-		}
-	}
-
-	Box.VSplitRight(10.0f, &Box, &Button);
-	Box.VSplitRight(33.0f, &Box, &Button);
-	static CButtonContainer s_SettingsButton;
-
-	if(DoButton_MenuTab(&s_SettingsButton, FONT_ICON_GEAR, m_ActivePage == PAGE_SETTINGS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_SETTINGS], nullptr, nullptr, nullptr, 10.0f))
-		NewPage = PAGE_SETTINGS;
-
-	Box.VSplitRight(10.0f, &Box, &Button);
-	Box.VSplitRight(33.0f, &Box, &Button);
-	static CButtonContainer s_EditorButton;
-	if(DoButton_MenuTab(&s_EditorButton, FONT_ICON_PEN_TO_SQUARE, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_EDITOR], nullptr, nullptr, nullptr, 10.0f))
-	{
-		g_Config.m_ClEditor = 1;
-	}
-
-	if(Client()->State() == IClient::STATE_OFFLINE)
-	{
-		Box.VSplitRight(10.0f, &Box, &Button);
-		Box.VSplitRight(33.0f, &Box, &Button);
-		static CButtonContainer s_DemoButton;
-
-		if(DoButton_MenuTab(&s_DemoButton, FONT_ICON_CLAPPERBOARD, m_ActivePage == PAGE_DEMOS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_DEMOBUTTON], nullptr, nullptr, nullptr, 10.0f))
-			NewPage = PAGE_DEMOS;
-
-		Box.VSplitRight(10.0f, &Box, &Button);
-		Box.VSplitRight(33.0f, &Box, &Button);
-		static CButtonContainer s_ServerButton;
-
-		if(DoButton_MenuTab(&s_ServerButton, FONT_ICON_EARTH_AMERICAS, m_ActivePage == g_Config.m_UiPage, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_SERVER], nullptr, nullptr, nullptr, 10.0f))
-			NewPage = g_Config.m_UiPage;
 	}
 
-	TextRender()->SetRenderFlags(0);
-	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-
 	if(NewPage != -1)
 	{
-		if(Client()->State() == IClient::STATE_OFFLINE)
+		if(ClientState == IClient::STATE_OFFLINE)
 			SetMenuPage(NewPage);
 		else
 			m_GamePage = NewPage;
 	}
-
-	return 0;
 }
 
 void CMenus::RenderLoading(const char *pCaption, const char *pContent, int IncreaseCounter, bool RenderLoadingBar, bool RenderMenuBackgroundMap)
 {
 	// TODO: not supported right now due to separate render thread
 
-	static std::chrono::nanoseconds s_LastLoadRender{0};
-	const int CurLoadRenderCount = m_LoadCurrent;
-	m_LoadCurrent += IncreaseCounter;
-	const float Percent = CurLoadRenderCount / (float)m_LoadTotal;
+	const int CurLoadRenderCount = m_LoadingState.m_Current;
+	m_LoadingState.m_Current += IncreaseCounter;
 
 	// make sure that we don't render for each little thing we load
 	// because that will slow down loading if we have vsync
-	if(time_get_nanoseconds() - s_LastLoadRender < std::chrono::nanoseconds(1s) / 60l)
+	const std::chrono::nanoseconds Now = time_get_nanoseconds();
+	if(Now - m_LoadingState.m_LastRender < std::chrono::nanoseconds(1s) / 60l)
 		return;
 
-	s_LastLoadRender = time_get_nanoseconds();
+	m_LoadingState.m_LastRender = Now;
 
 	// need up date this here to get correct
 	ms_GuiColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_UiColor, true));
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 
-	if(!RenderMenuBackgroundMap || !m_pBackground->Render())
+	if(!RenderMenuBackgroundMap || !GameClient()->m_MenuBackground.Render())
 	{
 		RenderBackground();
 	}
 
-	CUIRect Box = *UI()->Screen();
-	Box.Margin(160.0f, &Box);
+	CUIRect Box;
+	Ui()->Screen()->Margin(160.0f, &Box);
 
 	Graphics()->BlendNormal();
-
 	Graphics()->TextureClear();
-	Box.Draw(ColorRGBA{0, 0, 0, 0.50f}, IGraphics::CORNER_ALL, 15.0f);
+	Box.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Box.Margin(20.0f, &Box);
 
-	CUIRect Part;
-	Box.HSplitTop(20.f, nullptr, &Box);
-	Box.HSplitTop(24.f, &Part, &Box);
-	Part.VMargin(20.f, &Part);
-	UI()->DoLabel(&Part, pCaption, 24.f, TEXTALIGN_MC);
+	CUIRect Label;
+	Box.HSplitTop(24.0f, &Label, &Box);
+	Ui()->DoLabel(&Label, pCaption, 24.0f, TEXTALIGN_MC);
 
-	Box.HSplitTop(20.f, nullptr, &Box);
-	Box.HSplitTop(24.f, &Part, &Box);
-	Part.VMargin(20.f, &Part);
-	UI()->DoLabel(&Part, pContent, 20.0f, TEXTALIGN_MC);
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	Box.HSplitTop(24.0f, &Label, &Box);
+	Ui()->DoLabel(&Label, pContent, 20.0f, TEXTALIGN_MC);
 
 	if(RenderLoadingBar)
-		Graphics()->DrawRect(Box.x + 40, Box.y + Box.h - 75, (Box.w - 80) * Percent, 25, ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f), IGraphics::CORNER_ALL, 5.0f);
+	{
+		CUIRect ProgressBar;
+		Box.HSplitBottom(30.0f, &Box, nullptr);
+		Box.HSplitBottom(25.0f, &Box, &ProgressBar);
+		ProgressBar.VMargin(20.0f, &ProgressBar);
+		Ui()->RenderProgressBar(ProgressBar, CurLoadRenderCount / (float)m_LoadingState.m_Total);
+	}
 
 	Client()->UpdateAndSwap();
 }
 
 void CMenus::RenderNews(CUIRect MainView)
 {
+	GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_NEWS);
+
 	g_Config.m_UiUnreadNews = false;
 
 	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
@@ -821,12 +831,12 @@ void CMenus::RenderNews(CUIRect MainView)
 		{
 			MainView.HSplitTop(30.0f, &Label, &MainView);
 			aLine[Len - 1] = '\0';
-			UI()->DoLabel(&Label, aLine + 1, 20.0f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Label, aLine + 1, 20.0f, TEXTALIGN_ML);
 		}
 		else
 		{
 			MainView.HSplitTop(20.0f, &Label, &MainView);
-			UI()->DoLabel(&Label, aLine, 15.f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Label, aLine, 15.f, TEXTALIGN_ML);
 		}
 	}
 }
@@ -836,22 +846,43 @@ void CMenus::OnInit()
 	if(g_Config.m_ClShowWelcome)
 	{
 		m_Popup = POPUP_LANGUAGE;
-		str_copy(g_Config.m_BrFilterExcludeCommunities, "*ddnet");
+		m_CreateDefaultFavoriteCommunities = true;
 	}
+
+	if(g_Config.m_UiPage >= PAGE_FAVORITE_COMMUNITY_1 && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5 &&
+		(size_t)(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1) >= ServerBrowser()->FavoriteCommunities().size())
+	{
+		// Reset page to internet when there is no favorite community for this page.
+		g_Config.m_UiPage = PAGE_INTERNET;
+	}
+
 	if(g_Config.m_ClSkipStartMenu)
+	{
 		m_ShowStart = false;
+	}
 
-	m_RefreshButton.Init(UI(), -1);
-	m_ConnectButton.Init(UI(), -1);
+	SetMenuPage(g_Config.m_UiPage);
+
+	m_RefreshButton.Init(Ui(), -1);
+	m_ConnectButton.Init(Ui(), -1);
 
 	Console()->Chain("add_favorite", ConchainFavoritesUpdate, this);
 	Console()->Chain("remove_favorite", ConchainFavoritesUpdate, this);
 	Console()->Chain("add_friend", ConchainFriendlistUpdate, this);
 	Console()->Chain("remove_friend", ConchainFriendlistUpdate, this);
-	Console()->Chain("br_filter_exclude_communities", ConchainCommunitiesUpdate, this);
+
+	Console()->Chain("add_excluded_community", ConchainCommunitiesUpdate, this);
+	Console()->Chain("remove_excluded_community", ConchainCommunitiesUpdate, this);
+	Console()->Chain("add_excluded_country", ConchainCommunitiesUpdate, this);
+	Console()->Chain("remove_excluded_country", ConchainCommunitiesUpdate, this);
+	Console()->Chain("add_excluded_type", ConchainCommunitiesUpdate, this);
+	Console()->Chain("remove_excluded_type", ConchainCommunitiesUpdate, this);
+
+	Console()->Chain("ui_page", ConchainUiPageUpdate, this);
 
 	Console()->Chain("snd_enable", ConchainUpdateMusicState, this);
 	Console()->Chain("snd_enable_music", ConchainUpdateMusicState, this);
+	Console()->Chain("cl_background_entities", ConchainBackgroundEntities, this);
 
 	Console()->Chain("cl_assets_entities", ConchainAssetsEntities, this);
 	Console()->Chain("cl_asset_game", ConchainAssetGame, this);
@@ -864,10 +895,10 @@ void CMenus::OnInit()
 
 	// setup load amount
 	const int NumMenuImages = 5;
-	m_LoadCurrent = 0;
-	m_LoadTotal = g_pData->m_NumImages + NumMenuImages + GameClient()->ComponentCount();
+	m_LoadingState.m_Current = 0;
+	m_LoadingState.m_Total = g_pData->m_NumImages + NumMenuImages + GameClient()->ComponentCount();
 	if(!g_Config.m_ClThreadsoundloading)
-		m_LoadTotal += g_pData->m_NumSounds;
+		m_LoadingState.m_Total += g_pData->m_NumSounds;
 
 	m_IsInit = true;
 
@@ -887,6 +918,17 @@ void CMenus::OnConsoleInit()
 	Console()->Register("remove_favorite_skin", "s[skin_name]", CFGFLAG_CLIENT, Con_RemFavoriteSkin, this, "Remove a skin from the favorites");
 }
 
+void CMenus::ConchainBackgroundEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		CMenus *pSelf = (CMenus *)pUserData;
+		if(str_comp(g_Config.m_ClBackgroundEntities, pSelf->m_pClient->m_Background.MapName()) != 0)
+			pSelf->m_pClient->m_Background.LoadBackground();
+	}
+}
+
 void CMenus::ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
 	pfnCallback(pResult, pCallbackUserData);
@@ -907,7 +949,7 @@ void CMenus::UpdateMusicState()
 void CMenus::PopupMessage(const char *pTitle, const char *pMessage, const char *pButtonLabel, int NextPopup, FPopupButtonCallback pfnButtonCallback)
 {
 	// reset active item
-	UI()->SetActiveItem(nullptr);
+	Ui()->SetActiveItem(nullptr);
 
 	str_copy(m_aPopupTitle, pTitle);
 	str_copy(m_aPopupMessage, pMessage);
@@ -921,7 +963,7 @@ void CMenus::PopupConfirm(const char *pTitle, const char *pMessage, const char *
 	FPopupButtonCallback pfnConfirmButtonCallback, int ConfirmNextPopup, FPopupButtonCallback pfnCancelButtonCallback, int CancelNextPopup)
 {
 	// reset active item
-	UI()->SetActiveItem(nullptr);
+	Ui()->SetActiveItem(nullptr);
 
 	str_copy(m_aPopupTitle, pTitle);
 	str_copy(m_aPopupMessage, pMessage);
@@ -943,7 +985,7 @@ void CMenus::PopupWarning(const char *pTopic, const char *pBody, const char *pBu
 	dbg_msg(pTopic, "%s", BodyStr.c_str());
 
 	// reset active item
-	UI()->SetActiveItem(nullptr);
+	Ui()->SetActiveItem(nullptr);
 
 	str_copy(m_aMessageTopic, pTopic);
 	str_copy(m_aMessageBody, pBody);
@@ -960,29 +1002,61 @@ bool CMenus::CanDisplayWarning() const
 	return m_Popup == POPUP_NONE;
 }
 
-int CMenus::Render()
+void CMenus::Render()
 {
-	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_Popup == POPUP_NONE)
-		return 0;
-
-	CUIRect Screen = *UI()->Screen();
-	UI()->MapScreen();
-	UI()->ResetMouseSlow();
+	Ui()->MapScreen();
+	Ui()->ResetMouseSlow();
 
 	static int s_Frame = 0;
 	if(s_Frame == 0)
 	{
-		SetMenuPage(g_Config.m_UiPage);
+		RefreshBrowserTab(true);
 		s_Frame++;
 	}
 	else if(s_Frame == 1)
 	{
 		UpdateMusicState();
-		RefreshBrowserTab(g_Config.m_UiPage);
 		s_Frame++;
 	}
+	else
+	{
+		UpdateCommunityIcons();
+	}
+
+	if(ServerBrowser()->DDNetInfoAvailable())
+	{
+		// Initially add DDNet as favorite community and select its tab.
+		// This must be delayed until the DDNet info is available.
+		if(m_CreateDefaultFavoriteCommunities)
+		{
+			m_CreateDefaultFavoriteCommunities = false;
+			if(ServerBrowser()->Community(IServerBrowser::COMMUNITY_DDNET) != nullptr)
+			{
+				ServerBrowser()->FavoriteCommunitiesFilter().Clear();
+				ServerBrowser()->FavoriteCommunitiesFilter().Add(IServerBrowser::COMMUNITY_DDNET);
+				SetMenuPage(PAGE_FAVORITE_COMMUNITY_1);
+				ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITE_COMMUNITY_1);
+			}
+		}
+
+		if(m_JoinTutorial && m_Popup == POPUP_NONE && !ServerBrowser()->IsGettingServerlist())
+		{
+			m_JoinTutorial = false;
+			// This is only reached on first launch, when the DDNet community tab has been created and
+			// activated by default, so the server info for the tutorial server should be available.
+			const char *pAddr = ServerBrowser()->GetTutorialServer();
+			if(pAddr)
+			{
+				Client()->Connect(pAddr);
+			}
+		}
+	}
+
+	// Determine the client state once before rendering because it can change
+	// while rendering which causes frames with broken user interface.
+	const IClient::EClientState ClientState = Client()->State();
 
-	if(Client()->State() == IClient::STATE_ONLINE || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	if(ClientState == IClient::STATE_ONLINE || ClientState == IClient::STATE_DEMOPLAYBACK)
 	{
 		ms_ColorTabbarInactive = ms_ColorTabbarInactiveIngame;
 		ms_ColorTabbarActive = ms_ColorTabbarActiveIngame;
@@ -990,7 +1064,7 @@ int CMenus::Render()
 	}
 	else
 	{
-		if(!m_pBackground->Render())
+		if(!GameClient()->m_MenuBackground.Render())
 		{
 			RenderBackground();
 		}
@@ -999,808 +1073,961 @@ int CMenus::Render()
 		ms_ColorTabbarHover = ms_ColorTabbarHoverOutgame;
 	}
 
-	CUIRect TabBar;
-	CUIRect MainView;
-
-	// some margin around the screen
-	Screen.Margin(10.0f, &Screen);
-
-	static bool s_SoundCheck = false;
-	if(!s_SoundCheck && m_Popup == POPUP_NONE)
+	CUIRect Screen = *Ui()->Screen();
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK || m_Popup != POPUP_NONE)
 	{
-		if(Client()->SoundInitFailed())
-			PopupMessage(Localize("Sound error"), Localize("The audio device couldn't be initialised."), Localize("Ok"));
-		s_SoundCheck = true;
+		Screen.Margin(10.0f, &Screen);
 	}
 
-	if(m_Popup == POPUP_NONE)
+	switch(ClientState)
 	{
-		if(m_JoinTutorial && !Client()->InfoTaskRunning() && !ServerBrowser()->IsGettingServerlist())
+	case IClient::STATE_QUITTING:
+	case IClient::STATE_RESTARTING:
+		// Render nothing except menu background. This should not happen for more than one frame.
+		return;
+
+	case IClient::STATE_CONNECTING:
+		RenderPopupConnecting(Screen);
+		break;
+
+	case IClient::STATE_LOADING:
+		RenderPopupLoading(Screen);
+		break;
+
+	case IClient::STATE_OFFLINE:
+		if(m_Popup != POPUP_NONE)
 		{
-			m_JoinTutorial = false;
-			const char *pAddr = ServerBrowser()->GetTutorialServer();
-			if(pAddr)
-				Client()->Connect(pAddr);
+			RenderPopupFullscreen(Screen);
 		}
-		if(m_ShowStart && Client()->State() == IClient::STATE_OFFLINE)
+		else if(m_ShowStart)
 		{
-			m_pBackground->ChangePosition(CMenuBackground::POS_START);
 			RenderStartMenu(Screen);
 		}
 		else
 		{
+			CUIRect TabBar, MainView;
 			Screen.HSplitTop(24.0f, &TabBar, &MainView);
 
-			// render news
-			if(m_MenuPage < PAGE_NEWS || m_MenuPage > PAGE_SETTINGS || (Client()->State() == IClient::STATE_OFFLINE && m_MenuPage >= PAGE_GAME && m_MenuPage <= PAGE_CALLVOTE))
-			{
-				ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
-				SetMenuPage(PAGE_INTERNET);
-			}
-
-			// render current page
-			if(Client()->State() != IClient::STATE_OFFLINE)
-			{
-				if(m_GamePage == PAGE_GAME)
-				{
-					RenderGame(MainView);
-					RenderIngameHint();
-				}
-				else if(m_GamePage == PAGE_PLAYERS)
-				{
-					RenderPlayers(MainView);
-				}
-				else if(m_GamePage == PAGE_SERVER_INFO)
-				{
-					RenderServerInfo(MainView);
-				}
-				else if(m_GamePage == PAGE_NETWORK)
-				{
-					RenderInGameNetwork(MainView);
-				}
-				else if(m_GamePage == PAGE_GHOST)
-				{
-					RenderGhost(MainView);
-				}
-				else if(m_GamePage == PAGE_CALLVOTE)
-				{
-					RenderServerControl(MainView);
-				}
-				else if(m_GamePage == PAGE_STATS)
-				{
-					RenderStats(MainView);
-				}
-				else if(m_GamePage == PAGE_SETTINGS)
-				{
-					RenderSettings(MainView);
-				}
-			}
-			else if(m_MenuPage == PAGE_NEWS)
+			if(m_MenuPage == PAGE_NEWS)
 			{
-				m_pBackground->ChangePosition(CMenuBackground::POS_NEWS);
 				RenderNews(MainView);
 			}
-			else if(m_MenuPage == PAGE_INTERNET)
+			else if(m_MenuPage >= PAGE_INTERNET && m_MenuPage <= PAGE_FAVORITE_COMMUNITY_5)
 			{
-				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_INTERNET);
-				RenderServerbrowser(MainView);
-			}
-			else if(m_MenuPage == PAGE_LAN)
-			{
-				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_LAN);
 				RenderServerbrowser(MainView);
 			}
 			else if(m_MenuPage == PAGE_DEMOS)
 			{
-				m_pBackground->ChangePosition(CMenuBackground::POS_DEMOS);
 				RenderDemoBrowser(MainView);
 			}
-			else if(m_MenuPage == PAGE_FAVORITES)
-			{
-				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_FAVORITES);
-				RenderServerbrowser(MainView);
-			}
 			else if(m_MenuPage == PAGE_SETTINGS)
+			{
 				RenderSettings(MainView);
-
-			// do tab bar
-			RenderMenubar(TabBar);
+			}
+			else
+			{
+				dbg_assert(false, "m_MenuPage invalid");
+			}
+
+			RenderMenubar(TabBar, ClientState);
 		}
-	}
-	else
-	{
-		char aBuf[1536];
-		const char *pTitle = "";
-		const char *pExtraText = "";
-		const char *pButtonText = "";
-		bool TopAlign = false;
-		bool UseIpLabel = false;
+		break;
 
-		ColorRGBA BgColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f);
-		if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+	case IClient::STATE_ONLINE:
+		if(m_Popup != POPUP_NONE)
 		{
-			pTitle = m_aPopupTitle;
-			pExtraText = m_aPopupMessage;
-			TopAlign = true;
+			RenderPopupFullscreen(Screen);
 		}
-		else if(m_Popup == POPUP_CONNECTING)
+		else
 		{
-			pTitle = Localize("Connecting to");
-			UseIpLabel = true;
-			pButtonText = Localize("Abort");
-			if(Client()->State() == IClient::STATE_CONNECTING && time_get() - Client()->StateStartTime() > time_freq())
+			CUIRect TabBar, MainView;
+			Screen.HSplitTop(24.0f, &TabBar, &MainView);
+
+			if(m_GamePage == PAGE_GAME)
 			{
-				int Connectivity = Client()->UdpConnectivity(Client()->ConnectNetTypes());
-				switch(Connectivity)
-				{
-				case IClient::CONNECTIVITY_UNKNOWN:
-					break;
-				case IClient::CONNECTIVITY_CHECKING:
-					pExtraText = Localize("Trying to determine UDP connectivity...");
-					break;
-				case IClient::CONNECTIVITY_UNREACHABLE:
-					pExtraText = Localize("UDP seems to be filtered.");
-					break;
-				case IClient::CONNECTIVITY_DIFFERING_UDP_TCP_IP_ADDRESSES:
-					pExtraText = Localize("UDP and TCP IP addresses seem to be different. Try disabling VPN, proxy or network accelerators.");
-					break;
-				case IClient::CONNECTIVITY_REACHABLE:
-					pExtraText = Localize("No answer from server yet.");
-					break;
-				}
+				RenderGame(MainView);
+				RenderIngameHint();
 			}
-			else if(Client()->MapDownloadTotalsize() > 0)
+			else if(m_GamePage == PAGE_PLAYERS)
 			{
-				str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Downloading map"), Client()->MapDownloadName());
-				pTitle = aBuf;
-				UseIpLabel = false;
+				RenderPlayers(MainView);
 			}
-			else if(Client()->State() == IClient::STATE_LOADING)
+			else if(m_GamePage == PAGE_SERVER_INFO)
 			{
-				UseIpLabel = false;
-				if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_INITIAL)
-				{
-					pTitle = Localize("Connected");
-					pExtraText = Localize("Getting game info");
-				}
-				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_LOADING_MAP)
-				{
-					pTitle = Localize("Connected");
-					pExtraText = Localize("Loading map file from storage");
-				}
-				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_SENDING_READY)
-				{
-					pTitle = Localize("Connected");
-					pExtraText = Localize("Requesting to join the game");
-				}
-				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_GETTING_READY)
-				{
-					pTitle = Localize("Connected");
-					pExtraText = Localize("Sending initial client info");
-				}
+				RenderServerInfo(MainView);
 			}
-		}
-		else if(m_Popup == POPUP_DISCONNECTED)
-		{
-			pTitle = Localize("Disconnected");
-			pExtraText = Client()->ErrorString();
-			pButtonText = Localize("Ok");
-			if(Client()->ReconnectTime() > 0)
+			else if(m_GamePage == PAGE_NETWORK)
+			{
+				RenderInGameNetwork(MainView);
+			}
+			else if(m_GamePage == PAGE_GHOST)
+			{
+				RenderGhost(MainView);
+			}
+			else if(m_GamePage == PAGE_CALLVOTE)
+			{
+				RenderServerControl(MainView);
+			}
+			else if(m_GamePage == PAGE_SETTINGS)
+			{
+				RenderSettings(MainView);
+			}
+			else
 			{
-				str_format(aBuf, sizeof(aBuf), Localize("Reconnect in %d sec"), (int)((Client()->ReconnectTime() - time_get()) / time_freq()));
-				pTitle = Client()->ErrorString();
-				pExtraText = aBuf;
-				pButtonText = Localize("Abort");
+				dbg_assert(false, "m_GamePage invalid");
 			}
+
+			RenderMenubar(TabBar, ClientState);
 		}
-		else if(m_Popup == POPUP_RENAME_DEMO)
+		break;
+
+	case IClient::STATE_DEMOPLAYBACK:
+		if(m_Popup != POPUP_NONE)
 		{
-			dbg_assert(m_DemolistSelectedIndex >= 0, "m_DemolistSelectedIndex invalid for POPUP_RENAME_DEMO");
-			pTitle = m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Rename folder") : Localize("Rename demo");
+			RenderPopupFullscreen(Screen);
 		}
-#if defined(CONF_VIDEORECORDER)
-		else if(m_Popup == POPUP_RENDER_DEMO)
+		else
 		{
-			pTitle = Localize("Render demo");
+			RenderDemoPlayer(Screen);
 		}
-		else if(m_Popup == POPUP_RENDER_DONE)
+		break;
+	}
+
+	Ui()->RenderPopupMenus();
+
+	// Prevent UI elements from being hovered while a key reader is active
+	if(m_Binder.m_TakeKey)
+	{
+		Ui()->SetHotItem(nullptr);
+	}
+
+	// Handle this escape hotkey after popup menus
+	if(!m_ShowStart && ClientState == IClient::STATE_OFFLINE && Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+	{
+		m_ShowStart = true;
+	}
+}
+
+void CMenus::RenderPopupFullscreen(CUIRect Screen)
+{
+	char aBuf[1536];
+	const char *pTitle = "";
+	const char *pExtraText = "";
+	const char *pButtonText = "";
+	bool TopAlign = false;
+
+	ColorRGBA BgColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f);
+	if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+	{
+		pTitle = m_aPopupTitle;
+		pExtraText = m_aPopupMessage;
+		TopAlign = true;
+	}
+	else if(m_Popup == POPUP_DISCONNECTED)
+	{
+		pTitle = Localize("Disconnected");
+		pExtraText = Client()->ErrorString();
+		pButtonText = Localize("Ok");
+		if(Client()->ReconnectTime() > 0)
 		{
-			pTitle = Localize("Render complete");
+			str_format(aBuf, sizeof(aBuf), Localize("Reconnect in %d sec"), (int)((Client()->ReconnectTime() - time_get()) / time_freq()) + 1);
+			pTitle = Client()->ErrorString();
+			pExtraText = aBuf;
+			pButtonText = Localize("Abort");
 		}
+	}
+	else if(m_Popup == POPUP_RENAME_DEMO)
+	{
+		dbg_assert(m_DemolistSelectedIndex >= 0, "m_DemolistSelectedIndex invalid for POPUP_RENAME_DEMO");
+		pTitle = m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Rename folder") : Localize("Rename demo");
+	}
+#if defined(CONF_VIDEORECORDER)
+	else if(m_Popup == POPUP_RENDER_DEMO)
+	{
+		pTitle = Localize("Render demo");
+	}
+	else if(m_Popup == POPUP_RENDER_DONE)
+	{
+		pTitle = Localize("Render complete");
+	}
 #endif
-		else if(m_Popup == POPUP_PASSWORD)
-		{
-			pTitle = Localize("Password incorrect");
-			pButtonText = Localize("Try again");
-		}
-		else if(m_Popup == POPUP_QUIT)
-		{
-			pTitle = Localize("Quit");
-			pExtraText = Localize("Are you sure that you want to quit?");
-		}
-		else if(m_Popup == POPUP_FIRST_LAUNCH)
+	else if(m_Popup == POPUP_PASSWORD)
+	{
+		pTitle = Localize("Password incorrect");
+		pButtonText = Localize("Try again");
+	}
+	else if(m_Popup == POPUP_RESTART)
+	{
+		pTitle = Localize("Restart");
+		pExtraText = Localize("Are you sure that you want to restart?");
+	}
+	else if(m_Popup == POPUP_QUIT)
+	{
+		pTitle = Localize("Quit");
+		pExtraText = Localize("Are you sure that you want to quit?");
+	}
+	else if(m_Popup == POPUP_FIRST_LAUNCH)
+	{
+		pTitle = Localize("Welcome to DDNet");
+		str_format(aBuf, sizeof(aBuf), "%s\n\n%s\n\n%s\n\n%s",
+			Localize("DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you."),
+			Localize("Use k key to kill (restart), q to pause and watch other players. See settings for other key binds."),
+			Localize("It's recommended that you check the settings to adjust them to your liking before joining a server."),
+			Localize("Please enter your nickname below."));
+		pExtraText = aBuf;
+		pButtonText = Localize("Ok");
+		TopAlign = true;
+	}
+	else if(m_Popup == POPUP_POINTS)
+	{
+		pTitle = Localize("Existing Player");
+		if(Client()->Points() > 50)
 		{
-			pTitle = Localize("Welcome to DDNet");
-			str_format(aBuf, sizeof(aBuf), "%s\n\n%s\n\n%s\n\n%s",
-				Localize("DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you."),
-				Localize("Use k key to kill (restart), q to pause and watch other players. See settings for other key binds."),
-				Localize("It's recommended that you check the settings to adjust them to your liking before joining a server."),
-				Localize("Please enter your nickname below."));
+			str_format(aBuf, sizeof(aBuf), Localize("Your nickname '%s' is already used (%d points). Do you still want to use it?"), Client()->PlayerName(), Client()->Points());
 			pExtraText = aBuf;
-			pButtonText = Localize("Ok");
 			TopAlign = true;
 		}
-		else if(m_Popup == POPUP_POINTS)
+		else if(Client()->Points() >= 0)
 		{
-			pTitle = Localize("Existing Player");
-			if(Client()->Points() > 50)
-			{
-				str_format(aBuf, sizeof(aBuf), Localize("Your nickname '%s' is already used (%d points). Do you still want to use it?"), Client()->PlayerName(), Client()->Points());
-				pExtraText = aBuf;
-				TopAlign = true;
-			}
-			else if(Client()->Points() >= 0)
-			{
-				m_Popup = POPUP_NONE;
-			}
-			else
-			{
-				pExtraText = Localize("Checking for existing player with your name");
-			}
+			m_Popup = POPUP_NONE;
 		}
-		else if(m_Popup == POPUP_WARNING)
+		else
 		{
-			BgColor = ColorRGBA(0.5f, 0.0f, 0.0f, 0.7f);
-			pTitle = m_aMessageTopic;
-			pExtraText = m_aMessageBody;
-			pButtonText = m_aMessageButton;
-			TopAlign = true;
+			pExtraText = Localize("Checking for existing player with your name");
 		}
+	}
+	else if(m_Popup == POPUP_WARNING)
+	{
+		BgColor = ColorRGBA(0.5f, 0.0f, 0.0f, 0.7f);
+		pTitle = m_aMessageTopic;
+		pExtraText = m_aMessageBody;
+		pButtonText = m_aMessageButton;
+		TopAlign = true;
+	}
+	else if(m_Popup == POPUP_SAVE_SKIN)
+	{
+		pTitle = Localize("Save skin");
+		pExtraText = Localize("Are you sure you want to save your skin? If a skin with this name already exists, it will be replaced.");
+	}
 
-		CUIRect Box, Part;
-		Box = Screen;
-		if(m_Popup != POPUP_FIRST_LAUNCH)
-			Box.Margin(150.0f, &Box);
+	CUIRect Box, Part;
+	Box = Screen;
+	if(m_Popup != POPUP_FIRST_LAUNCH)
+		Box.Margin(150.0f, &Box);
 
-		// render the box
-		Box.Draw(BgColor, IGraphics::CORNER_ALL, 15.0f);
+	// render the box
+	Box.Draw(BgColor, IGraphics::CORNER_ALL, 15.0f);
 
-		Box.HSplitTop(20.f, &Part, &Box);
-		Box.HSplitTop(24.f, &Part, &Box);
-		Part.VMargin(20.f, &Part);
-		SLabelProperties Props;
-		Props.m_MaxWidth = (int)Part.w;
+	Box.HSplitTop(20.f, &Part, &Box);
+	Box.HSplitTop(24.f, &Part, &Box);
+	Part.VMargin(20.f, &Part);
+	SLabelProperties Props;
+	Props.m_MaxWidth = (int)Part.w;
 
-		if(TextRender()->TextWidth(24.f, pTitle, -1, -1.0f) > Part.w)
-			UI()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_ML, Props);
-		else
-			UI()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_MC);
+	if(TextRender()->TextWidth(24.f, pTitle, -1, -1.0f) > Part.w)
+		Ui()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_ML, Props);
+	else
+		Ui()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_MC);
 
-		Box.HSplitTop(20.f, &Part, &Box);
-		Box.HSplitTop(24.f, &Part, &Box);
-		Part.VMargin(20.f, &Part);
+	Box.HSplitTop(20.f, &Part, &Box);
+	Box.HSplitTop(24.f, &Part, &Box);
+	Part.VMargin(20.f, &Part);
 
-		float FontSize = m_Popup == POPUP_FIRST_LAUNCH ? 16.0f : 20.f;
+	float FontSize = m_Popup == POPUP_FIRST_LAUNCH ? 16.0f : 20.f;
 
-		if(UseIpLabel)
-		{
-			SLabelProperties IpLabelProps;
-			IpLabelProps.m_MaxWidth = Part.w;
-			IpLabelProps.m_EllipsisAtEnd = true;
-			UI()->DoLabel(&Part, Client()->ConnectAddressString(), FontSize, TEXTALIGN_MC, IpLabelProps);
-			Box.HSplitTop(20.f, &Part, &Box);
-			Box.HSplitTop(24.f, &Part, &Box);
-		}
+	Props.m_MaxWidth = (int)Part.w;
+	if(TopAlign)
+		Ui()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_TL, Props);
+	else if(TextRender()->TextWidth(FontSize, pExtraText, -1, -1.0f) > Part.w)
+		Ui()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_ML, Props);
+	else
+		Ui()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_MC);
 
-		Props.m_MaxWidth = (int)Part.w;
-		if(TopAlign)
-			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_TL, Props);
-		else if(TextRender()->TextWidth(FontSize, pExtraText, -1, -1.0f) > Part.w)
-			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_ML, Props);
-		else
-			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_MC);
+	if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+	{
+		CUIRect ButtonBar;
+		Box.HSplitBottom(20.0f, &Box, nullptr);
+		Box.HSplitBottom(24.0f, &Box, &ButtonBar);
+		ButtonBar.VMargin(100.0f, &ButtonBar);
 
-		if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+		if(m_Popup == POPUP_MESSAGE)
 		{
-			CUIRect ButtonBar;
-			Box.HSplitBottom(20.0f, &Box, nullptr);
-			Box.HSplitBottom(24.0f, &Box, &ButtonBar);
-			ButtonBar.VMargin(100.0f, &ButtonBar);
-
-			if(m_Popup == POPUP_MESSAGE)
+			static CButtonContainer s_ButtonConfirm;
+			if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ButtonBar) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
 			{
-				static CButtonContainer s_ButtonConfirm;
-				if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ButtonBar) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
-				{
-					m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
-					(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
-				}
+				m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
+				(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
 			}
-			else if(m_Popup == POPUP_CONFIRM)
-			{
-				CUIRect CancelButton, ConfirmButton;
-				ButtonBar.VSplitMid(&CancelButton, &ConfirmButton, 40.0f);
+		}
+		else if(m_Popup == POPUP_CONFIRM)
+		{
+			CUIRect CancelButton, ConfirmButton;
+			ButtonBar.VSplitMid(&CancelButton, &ConfirmButton, 40.0f);
 
-				static CButtonContainer s_ButtonCancel;
-				if(DoButton_Menu(&s_ButtonCancel, m_aPopupButtons[BUTTON_CANCEL].m_aLabel, 0, &CancelButton) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-				{
-					m_Popup = m_aPopupButtons[BUTTON_CANCEL].m_NextPopup;
-					(this->*m_aPopupButtons[BUTTON_CANCEL].m_pfnCallback)();
-				}
+			static CButtonContainer s_ButtonCancel;
+			if(DoButton_Menu(&s_ButtonCancel, m_aPopupButtons[BUTTON_CANCEL].m_aLabel, 0, &CancelButton) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			{
+				m_Popup = m_aPopupButtons[BUTTON_CANCEL].m_NextPopup;
+				(this->*m_aPopupButtons[BUTTON_CANCEL].m_pfnCallback)();
+			}
 
-				static CButtonContainer s_ButtonConfirm;
-				if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ConfirmButton) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
-				{
-					m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
-					(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
-				}
+			static CButtonContainer s_ButtonConfirm;
+			if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ConfirmButton) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+			{
+				m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
+				(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
 			}
 		}
-		else if(m_Popup == POPUP_QUIT)
+	}
+	else if(m_Popup == POPUP_QUIT || m_Popup == POPUP_RESTART)
+	{
+		CUIRect Yes, No;
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+
+		// additional info
+		Box.VMargin(20.f, &Box);
+		if(m_pClient->Editor()->HasUnsavedData())
 		{
-			CUIRect Yes, No;
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
+			str_format(aBuf, sizeof(aBuf), "%s\n\n%s", Localize("There's an unsaved map in the editor, you might want to save it."), Localize("Continue anyway?"));
+			Props.m_MaxWidth = Part.w - 20.0f;
+			Ui()->DoLabel(&Box, aBuf, 20.f, TEXTALIGN_ML, Props);
+		}
 
-			// additional info
-			Box.VMargin(20.f, &Box);
-			if(m_pClient->Editor()->HasUnsavedData())
-			{
-				str_format(aBuf, sizeof(aBuf), "%s\n%s", Localize("There's an unsaved map in the editor, you might want to save it before you quit the game."), Localize("Quit anyway?"));
-				Props.m_MaxWidth = Part.w - 20.0f;
-				UI()->DoLabel(&Box, aBuf, 20.f, TEXTALIGN_ML, Props);
-			}
+		// buttons
+		Part.VMargin(80.0f, &Part);
+		Part.VSplitMid(&No, &Yes);
+		Yes.VMargin(20.0f, &Yes);
+		No.VMargin(20.0f, &No);
 
-			// buttons
-			Part.VMargin(80.0f, &Part);
-			Part.VSplitMid(&No, &Yes);
-			Yes.VMargin(20.0f, &Yes);
-			No.VMargin(20.0f, &No);
+		static CButtonContainer s_ButtonAbort;
+		if(DoButton_Menu(&s_ButtonAbort, Localize("No"), 0, &No) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			m_Popup = POPUP_NONE;
 
-			static CButtonContainer s_ButtonAbort;
-			if(DoButton_Menu(&s_ButtonAbort, Localize("No"), 0, &No) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+		static CButtonContainer s_ButtonTryAgain;
+		if(DoButton_Menu(&s_ButtonTryAgain, Localize("Yes"), 0, &Yes) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+		{
+			if(m_Popup == POPUP_RESTART)
+			{
 				m_Popup = POPUP_NONE;
-
-			static CButtonContainer s_ButtonTryAgain;
-			if(DoButton_Menu(&s_ButtonTryAgain, Localize("Yes"), 0, &Yes) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+				Client()->Restart();
+			}
+			else
 			{
 				m_Popup = POPUP_NONE;
 				Client()->Quit();
 			}
 		}
-		else if(m_Popup == POPUP_PASSWORD)
-		{
-			CUIRect Label, TextBox, TryAgain, Abort;
+	}
+	else if(m_Popup == POPUP_PASSWORD)
+	{
+		CUIRect AddressLabel, Address, Icon, Name, Label, TextBox, TryAgain, Abort;
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(80.0f, &Part);
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
 
-			Part.VSplitMid(&Abort, &TryAgain);
+		Part.VSplitMid(&Abort, &TryAgain);
 
-			TryAgain.VMargin(20.0f, &TryAgain);
-			Abort.VMargin(20.0f, &Abort);
+		TryAgain.VMargin(20.0f, &TryAgain);
+		Abort.VMargin(20.0f, &Abort);
 
-			static CButtonContainer s_ButtonAbort;
-			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-				m_Popup = POPUP_NONE;
+		static CButtonContainer s_ButtonAbort;
+		if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			m_Popup = POPUP_NONE;
 
-			static CButtonContainer s_ButtonTryAgain;
-			if(DoButton_Menu(&s_ButtonTryAgain, Localize("Try again"), 0, &TryAgain) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
-			{
-				Client()->Connect(g_Config.m_UiServerAddress, g_Config.m_Password);
-			}
+		char aAddr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&Client()->ServerAddress(), aAddr, sizeof(aAddr), true);
 
-			Box.HSplitBottom(60.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
+		static CButtonContainer s_ButtonTryAgain;
+		if(DoButton_Menu(&s_ButtonTryAgain, Localize("Try again"), 0, &TryAgain) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+			Client()->Connect(aAddr, g_Config.m_Password);
 
-			Part.VSplitLeft(60.0f, 0, &Label);
-			Label.VSplitLeft(100.0f, 0, &TextBox);
-			TextBox.VSplitLeft(20.0f, 0, &TextBox);
-			TextBox.VSplitRight(60.0f, &TextBox, 0);
-			UI()->DoLabel(&Label, Localize("Password"), 18.0f, TEXTALIGN_ML);
-			UI()->DoClearableEditBox(&m_PasswordInput, &TextBox, 12.0f);
-		}
-		else if(m_Popup == POPUP_CONNECTING)
-		{
-			Box = Screen;
-			Box.Margin(150.0f, &Box);
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(120.0f, &Part);
+		Box.HSplitBottom(32.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-			static CButtonContainer s_Button;
-			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-			{
-				Client()->Disconnect();
-				m_Popup = POPUP_NONE;
-				RefreshBrowserTab(g_Config.m_UiPage);
-			}
+		Part.VSplitLeft(60.0f, 0, &Label);
+		Label.VSplitLeft(100.0f, 0, &TextBox);
+		TextBox.VSplitLeft(20.0f, 0, &TextBox);
+		TextBox.VSplitRight(60.0f, &TextBox, 0);
+		Ui()->DoLabel(&Label, Localize("Password"), 18.0f, TEXTALIGN_ML);
+		Ui()->DoClearableEditBox(&m_PasswordInput, &TextBox, 12.0f);
 
-			if(Client()->MapDownloadTotalsize() > 0)
-			{
-				int64_t Now = time_get();
-				if(Now - m_DownloadLastCheckTime >= time_freq())
-				{
-					if(m_DownloadLastCheckSize > Client()->MapDownloadAmount())
-					{
-						// map downloaded restarted
-						m_DownloadLastCheckSize = 0;
-					}
+		Box.HSplitBottom(32.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-					// update download speed
-					float Diff = (Client()->MapDownloadAmount() - m_DownloadLastCheckSize) / ((int)((Now - m_DownloadLastCheckTime) / time_freq()));
-					float StartDiff = m_DownloadLastCheckSize - 0.0f;
-					if(StartDiff + Diff > 0.0f)
-						m_DownloadSpeed = (Diff / (StartDiff + Diff)) * (Diff / 1.0f) + (StartDiff / (Diff + StartDiff)) * m_DownloadSpeed;
-					else
-						m_DownloadSpeed = 0.0f;
-					m_DownloadLastCheckTime = Now;
-					m_DownloadLastCheckSize = Client()->MapDownloadAmount();
-				}
+		Part.VSplitLeft(60.0f, 0, &AddressLabel);
+		AddressLabel.VSplitLeft(100.0f, 0, &Address);
+		Address.VSplitLeft(20.0f, 0, &Address);
+		Ui()->DoLabel(&AddressLabel, Localize("Address"), 18.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Address, aAddr, 18.0f, TEXTALIGN_ML);
 
-				Box.HSplitTop(64.f, 0, &Box);
-				Box.HSplitTop(24.f, &Part, &Box);
-				str_format(aBuf, sizeof(aBuf), "%d/%d KiB (%.1f KiB/s)", Client()->MapDownloadAmount() / 1024, Client()->MapDownloadTotalsize() / 1024, m_DownloadSpeed / 1024.0f);
-				UI()->DoLabel(&Part, aBuf, 20.f, TEXTALIGN_MC);
+		Box.HSplitBottom(32.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-				// time left
-				int TimeLeft = maximum(1, m_DownloadSpeed > 0.0f ? static_cast<int>((Client()->MapDownloadTotalsize() - Client()->MapDownloadAmount()) / m_DownloadSpeed) : 1);
-				if(TimeLeft >= 60)
-				{
-					TimeLeft /= 60;
-					str_format(aBuf, sizeof(aBuf), TimeLeft == 1 ? Localize("%i minute left") : Localize("%i minutes left"), TimeLeft);
-				}
-				else
-				{
-					str_format(aBuf, sizeof(aBuf), TimeLeft == 1 ? Localize("%i second left") : Localize("%i seconds left"), TimeLeft);
-				}
-				Box.HSplitTop(20.f, 0, &Box);
-				Box.HSplitTop(24.f, &Part, &Box);
-				UI()->DoLabel(&Part, aBuf, 20.f, TEXTALIGN_MC);
-
-				// progress bar
-				Box.HSplitTop(20.f, 0, &Box);
-				Box.HSplitTop(24.f, &Part, &Box);
-				Part.VMargin(40.0f, &Part);
-				Part.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
-				Part.w = maximum(10.0f, (Part.w * Client()->MapDownloadAmount()) / Client()->MapDownloadTotalsize());
-				Part.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), IGraphics::CORNER_ALL, 5.0f);
-			}
-		}
-		else if(m_Popup == POPUP_LANGUAGE)
+		const CServerBrowser::CServerEntry *pEntry = ServerBrowser()->Find(Client()->ServerAddress());
+		if(pEntry != nullptr && pEntry->m_GotInfo)
 		{
-			CUIRect Button;
-			Screen.Margin(150.0f, &Box);
-			Box.HSplitTop(20.0f, nullptr, &Box);
-			Box.HSplitBottom(20.0f, &Box, nullptr);
-			Box.HSplitBottom(24.0f, &Box, &Button);
-			Box.HSplitBottom(20.0f, &Box, nullptr);
-			Box.VMargin(20.0f, &Box);
-			const bool Activated = RenderLanguageSelection(Box);
-			Button.VMargin(120.0f, &Button);
+			Part.VSplitLeft(60.0f, 0, &Icon);
+			Icon.VSplitLeft(100.0f, 0, &Name);
+			Icon.VSplitLeft(80.0f, &Icon, 0);
+			Name.VSplitLeft(20.0f, 0, &Name);
+
+			const SCommunityIcon *pIcon = FindCommunityIcon(pEntry->m_Info.m_aCommunityId);
+			if(pIcon != nullptr)
+				RenderCommunityIcon(pIcon, Icon, true);
+			else
+				Ui()->DoLabel(&Icon, Localize("Name"), 18.0f, TEXTALIGN_ML);
 
-			static CButtonContainer s_Button;
-			if(DoButton_Menu(&s_Button, Localize("Ok"), 0, &Button) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || Activated)
-				m_Popup = POPUP_FIRST_LAUNCH;
+			Ui()->DoLabel(&Name, pEntry->m_Info.m_aName, 18.0f, TEXTALIGN_ML);
 		}
-		else if(m_Popup == POPUP_RENAME_DEMO)
-		{
-			CUIRect Label, TextBox, Ok, Abort;
+	}
+	else if(m_Popup == POPUP_LANGUAGE)
+	{
+		CUIRect Button;
+		Screen.Margin(150.0f, &Box);
+		Box.HSplitTop(20.0f, nullptr, &Box);
+		Box.HSplitBottom(20.0f, &Box, nullptr);
+		Box.HSplitBottom(24.0f, &Box, &Button);
+		Box.HSplitBottom(20.0f, &Box, nullptr);
+		Box.VMargin(20.0f, &Box);
+		const bool Activated = RenderLanguageSelection(Box);
+		Button.VMargin(120.0f, &Button);
+
+		static CButtonContainer s_Button;
+		if(DoButton_Menu(&s_Button, Localize("Ok"), 0, &Button) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || Activated)
+			m_Popup = POPUP_FIRST_LAUNCH;
+	}
+	else if(m_Popup == POPUP_RENAME_DEMO)
+	{
+		CUIRect Label, TextBox, Ok, Abort;
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(80.0f, &Part);
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
 
-			Part.VSplitMid(&Abort, &Ok);
+		Part.VSplitMid(&Abort, &Ok);
 
-			Ok.VMargin(20.0f, &Ok);
-			Abort.VMargin(20.0f, &Abort);
+		Ok.VMargin(20.0f, &Ok);
+		Abort.VMargin(20.0f, &Abort);
 
-			static CButtonContainer s_ButtonAbort;
-			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-				m_Popup = POPUP_NONE;
+		static CButtonContainer s_ButtonAbort;
+		if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			m_Popup = POPUP_NONE;
 
-			static CButtonContainer s_ButtonOk;
-			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+		static CButtonContainer s_ButtonOk;
+		if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+		{
+			m_Popup = POPUP_NONE;
+			// rename demo
+			char aBufOld[IO_MAX_PATH_LENGTH];
+			str_format(aBufOld, sizeof(aBufOld), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+			char aBufNew[IO_MAX_PATH_LENGTH];
+			str_format(aBufNew, sizeof(aBufNew), "%s/%s", m_aCurrentDemoFolder, m_DemoRenameInput.GetString());
+			if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir && !str_endswith(aBufNew, ".demo"))
+				str_append(aBufNew, ".demo");
+
+			if(Storage()->FileExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
 			{
-				m_Popup = POPUP_NONE;
-				// rename demo
-				char aBufOld[IO_MAX_PATH_LENGTH];
-				str_format(aBufOld, sizeof(aBufOld), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
-				char aBufNew[IO_MAX_PATH_LENGTH];
-				str_format(aBufNew, sizeof(aBufNew), "%s/%s", m_aCurrentDemoFolder, m_DemoRenameInput.GetString());
-				if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir && !str_endswith(aBufNew, ".demo"))
-					str_append(aBufNew, ".demo");
-
-				if(Storage()->FileExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
-				{
-					PopupMessage(Localize("Error"), Localize("A demo with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
-				}
-				else if(Storage()->FolderExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
-				{
-					PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
-				}
-				else if(Storage()->RenameFile(aBufOld, aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
-				{
-					str_copy(m_aCurrentDemoSelectionName, m_DemoRenameInput.GetString());
-					if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir)
-						fs_split_file_extension(m_DemoRenameInput.GetString(), m_aCurrentDemoSelectionName, sizeof(m_aCurrentDemoSelectionName));
-					DemolistPopulate();
-					DemolistOnUpdate(false);
-				}
-				else
-				{
-					PopupMessage(Localize("Error"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Unable to rename the folder") : Localize("Unable to rename the demo"), Localize("Ok"), POPUP_RENAME_DEMO);
-				}
+				PopupMessage(Localize("Error"), Localize("A demo with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
+			}
+			else if(Storage()->FolderExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+			{
+				PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
+			}
+			else if(Storage()->RenameFile(aBufOld, aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+			{
+				str_copy(m_aCurrentDemoSelectionName, m_DemoRenameInput.GetString());
+				if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir)
+					fs_split_file_extension(m_DemoRenameInput.GetString(), m_aCurrentDemoSelectionName, sizeof(m_aCurrentDemoSelectionName));
+				DemolistPopulate();
+				DemolistOnUpdate(false);
+			}
+			else
+			{
+				PopupMessage(Localize("Error"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Unable to rename the folder") : Localize("Unable to rename the demo"), Localize("Ok"), POPUP_RENAME_DEMO);
 			}
+		}
 
-			Box.HSplitBottom(60.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
+		Box.HSplitBottom(60.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-			Part.VSplitLeft(60.0f, 0, &Label);
-			Label.VSplitLeft(120.0f, 0, &TextBox);
-			TextBox.VSplitLeft(20.0f, 0, &TextBox);
-			TextBox.VSplitRight(60.0f, &TextBox, 0);
-			UI()->DoLabel(&Label, Localize("New name:"), 18.0f, TEXTALIGN_ML);
-			UI()->DoEditBox(&m_DemoRenameInput, &TextBox, 12.0f);
-		}
+		Part.VSplitLeft(60.0f, 0, &Label);
+		Label.VSplitLeft(120.0f, 0, &TextBox);
+		TextBox.VSplitLeft(20.0f, 0, &TextBox);
+		TextBox.VSplitRight(60.0f, &TextBox, 0);
+		Ui()->DoLabel(&Label, Localize("New name:"), 18.0f, TEXTALIGN_ML);
+		Ui()->DoEditBox(&m_DemoRenameInput, &TextBox, 12.0f);
+	}
 #if defined(CONF_VIDEORECORDER)
-		else if(m_Popup == POPUP_RENDER_DEMO)
-		{
-			CUIRect Row, Ok, Abort;
-			Box.VMargin(60.0f, &Box);
-			Box.HMargin(20.0f, &Box);
-			Box.HSplitBottom(24.0f, &Box, &Row);
-			Box.HSplitBottom(40.0f, &Box, nullptr);
-			Row.VMargin(40.0f, &Row);
-			Row.VSplitMid(&Abort, &Ok, 40.0f);
-
-			static CButtonContainer s_ButtonAbort;
-			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-			{
-				m_DemoRenderInput.Clear();
-				m_Popup = POPUP_NONE;
-			}
+	else if(m_Popup == POPUP_RENDER_DEMO)
+	{
+		CUIRect Row, Ok, Abort;
+		Box.VMargin(60.0f, &Box);
+		Box.HMargin(20.0f, &Box);
+		Box.HSplitBottom(24.0f, &Box, &Row);
+		Box.HSplitBottom(40.0f, &Box, nullptr);
+		Row.VMargin(40.0f, &Row);
+		Row.VSplitMid(&Abort, &Ok, 40.0f);
+
+		static CButtonContainer s_ButtonAbort;
+		if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+		{
+			m_DemoRenderInput.Clear();
+			m_Popup = POPUP_NONE;
+		}
 
-			static CButtonContainer s_ButtonOk;
-			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+		static CButtonContainer s_ButtonOk;
+		if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+		{
+			m_Popup = POPUP_NONE;
+			// render video
+			char aVideoPath[IO_MAX_PATH_LENGTH];
+			str_format(aVideoPath, sizeof(aVideoPath), "videos/%s", m_DemoRenderInput.GetString());
+			if(!str_endswith(aVideoPath, ".mp4"))
+				str_append(aVideoPath, ".mp4");
+			if(Storage()->FolderExists(aVideoPath, IStorage::TYPE_SAVE))
 			{
-				m_Popup = POPUP_NONE;
-				// render video
-				char aVideoPath[IO_MAX_PATH_LENGTH];
-				str_format(aVideoPath, sizeof(aVideoPath), "videos/%s", m_DemoRenderInput.GetString());
-				if(!str_endswith(aVideoPath, ".mp4"))
-					str_append(aVideoPath, ".mp4");
-				if(Storage()->FolderExists(aVideoPath, IStorage::TYPE_SAVE))
-				{
-					PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENDER_DEMO);
-				}
-				else if(Storage()->FileExists(aVideoPath, IStorage::TYPE_SAVE))
-				{
-					char aMessage[128 + IO_MAX_PATH_LENGTH];
-					str_format(aMessage, sizeof(aMessage), Localize("File '%s' already exists, do you want to overwrite it?"), m_DemoRenderInput.GetString());
-					PopupConfirm(Localize("Replace video"), aMessage, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDemoReplaceVideo, POPUP_NONE, &CMenus::DefaultButtonCallback, POPUP_RENDER_DEMO);
-				}
-				else
-				{
-					PopupConfirmDemoReplaceVideo();
-				}
+				PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENDER_DEMO);
 			}
-
-			CUIRect ShowChatCheckbox, UseSoundsCheckbox;
-			Box.HSplitBottom(20.0f, &Box, &Row);
-			Box.HSplitBottom(10.0f, &Box, nullptr);
-			Row.VSplitMid(&ShowChatCheckbox, &UseSoundsCheckbox, 20.0f);
-
-			if(DoButton_CheckBox(&g_Config.m_ClVideoShowChat, Localize("Show chat"), g_Config.m_ClVideoShowChat, &ShowChatCheckbox))
-				g_Config.m_ClVideoShowChat ^= 1;
-
-			if(DoButton_CheckBox(&g_Config.m_ClVideoSndEnable, Localize("Use sounds"), g_Config.m_ClVideoSndEnable, &UseSoundsCheckbox))
-				g_Config.m_ClVideoSndEnable ^= 1;
-
-			CUIRect ShowHudButton;
-			Box.HSplitBottom(20.0f, &Box, &Row);
-			Row.VSplitMid(&Row, &ShowHudButton, 20.0f);
-
-			if(DoButton_CheckBox(&g_Config.m_ClVideoShowhud, Localize("Show ingame HUD"), g_Config.m_ClVideoShowhud, &ShowHudButton))
-				g_Config.m_ClVideoShowhud ^= 1;
-
-			// slowdown
-			CUIRect SlowDownButton;
-			Row.VSplitLeft(20.0f, &SlowDownButton, &Row);
-			Row.VSplitLeft(5.0f, nullptr, &Row);
-			static CButtonContainer s_SlowDownButton;
-			if(DoButton_FontIcon(&s_SlowDownButton, FONT_ICON_BACKWARD, 0, &SlowDownButton, IGraphics::CORNER_ALL))
-				m_Speed = clamp(m_Speed - 1, 0, (int)(g_DemoSpeeds - 1));
-
-			// paused
-			CUIRect PausedButton;
-			Row.VSplitLeft(20.0f, &PausedButton, &Row);
-			Row.VSplitLeft(5.0f, nullptr, &Row);
-			static CButtonContainer s_PausedButton;
-			if(DoButton_FontIcon(&s_PausedButton, FONT_ICON_PAUSE, 0, &PausedButton, IGraphics::CORNER_ALL))
-				m_StartPaused ^= 1;
-
-			// fastforward
-			CUIRect FastForwardButton;
-			Row.VSplitLeft(20.0f, &FastForwardButton, &Row);
-			Row.VSplitLeft(8.0f, nullptr, &Row);
-			static CButtonContainer s_FastForwardButton;
-			if(DoButton_FontIcon(&s_FastForwardButton, FONT_ICON_FORWARD, 0, &FastForwardButton, IGraphics::CORNER_ALL))
-				m_Speed = clamp(m_Speed + 1, 0, (int)(g_DemoSpeeds - 1));
-
-			// speed meter
-			char aBuffer[128];
-			const char *pPaused = m_StartPaused ? Localize("(paused)") : "";
-			str_format(aBuffer, sizeof(aBuffer), "%s: ×%g %s", Localize("Speed"), g_aSpeeds[m_Speed], pPaused);
-			UI()->DoLabel(&Row, aBuffer, 12.8f, TEXTALIGN_ML);
-
-			Box.HSplitBottom(16.0f, &Box, nullptr);
-			Box.HSplitBottom(24.0f, &Box, &Row);
-
-			CUIRect Label, TextBox;
-			Row.VSplitLeft(110.0f, &Label, &TextBox);
-			TextBox.VSplitLeft(10.0f, nullptr, &TextBox);
-			UI()->DoLabel(&Label, Localize("Video name:"), 12.8f, TEXTALIGN_ML);
-			UI()->DoEditBox(&m_DemoRenderInput, &TextBox, 12.8f);
-		}
-		else if(m_Popup == POPUP_RENDER_DONE)
-		{
-			CUIRect Ok, OpenFolder;
-
-			char aFilePath[IO_MAX_PATH_LENGTH];
-			char aSaveFolder[IO_MAX_PATH_LENGTH];
-			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "videos", aSaveFolder, sizeof(aSaveFolder));
-			str_format(aFilePath, sizeof(aFilePath), "%s/%s.mp4", aSaveFolder, m_DemoRenderInput.GetString());
-
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(80.0f, &Part);
-
-			Part.VSplitMid(&OpenFolder, &Ok);
-
-			Ok.VMargin(20.0f, &Ok);
-			OpenFolder.VMargin(20.0f, &OpenFolder);
-
-			static CButtonContainer s_ButtonOpenFolder;
-			if(DoButton_Menu(&s_ButtonOpenFolder, Localize("Videos directory"), 0, &OpenFolder))
+			else if(Storage()->FileExists(aVideoPath, IStorage::TYPE_SAVE))
 			{
-				if(!open_file(aSaveFolder))
-				{
-					dbg_msg("menus", "couldn't open file '%s'", aSaveFolder);
-				}
+				char aMessage[128 + IO_MAX_PATH_LENGTH];
+				str_format(aMessage, sizeof(aMessage), Localize("File '%s' already exists, do you want to overwrite it?"), m_DemoRenderInput.GetString());
+				PopupConfirm(Localize("Replace video"), aMessage, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDemoReplaceVideo, POPUP_NONE, &CMenus::DefaultButtonCallback, POPUP_RENDER_DEMO);
 			}
-
-			static CButtonContainer s_ButtonOk;
-			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			else
 			{
-				m_Popup = POPUP_NONE;
-				m_DemoRenderInput.Clear();
+				PopupConfirmDemoReplaceVideo();
 			}
+		}
+
+		CUIRect ShowChatCheckbox, UseSoundsCheckbox;
+		Box.HSplitBottom(20.0f, &Box, &Row);
+		Box.HSplitBottom(10.0f, &Box, nullptr);
+		Row.VSplitMid(&ShowChatCheckbox, &UseSoundsCheckbox, 20.0f);
+
+		if(DoButton_CheckBox(&g_Config.m_ClVideoShowChat, Localize("Show chat"), g_Config.m_ClVideoShowChat, &ShowChatCheckbox))
+			g_Config.m_ClVideoShowChat ^= 1;
+
+		if(DoButton_CheckBox(&g_Config.m_ClVideoSndEnable, Localize("Use sounds"), g_Config.m_ClVideoSndEnable, &UseSoundsCheckbox))
+			g_Config.m_ClVideoSndEnable ^= 1;
+
+		CUIRect ShowHudButton;
+		Box.HSplitBottom(20.0f, &Box, &Row);
+		Row.VSplitMid(&Row, &ShowHudButton, 20.0f);
+
+		if(DoButton_CheckBox(&g_Config.m_ClVideoShowhud, Localize("Show ingame HUD"), g_Config.m_ClVideoShowhud, &ShowHudButton))
+			g_Config.m_ClVideoShowhud ^= 1;
+
+		// slowdown
+		CUIRect SlowDownButton;
+		Row.VSplitLeft(20.0f, &SlowDownButton, &Row);
+		Row.VSplitLeft(5.0f, nullptr, &Row);
+		static CButtonContainer s_SlowDownButton;
+		if(DoButton_FontIcon(&s_SlowDownButton, FONT_ICON_BACKWARD, 0, &SlowDownButton, IGraphics::CORNER_ALL))
+			m_Speed = clamp(m_Speed - 1, 0, (int)(g_DemoSpeeds - 1));
+
+		// paused
+		CUIRect PausedButton;
+		Row.VSplitLeft(20.0f, &PausedButton, &Row);
+		Row.VSplitLeft(5.0f, nullptr, &Row);
+		static CButtonContainer s_PausedButton;
+		if(DoButton_FontIcon(&s_PausedButton, FONT_ICON_PAUSE, 0, &PausedButton, IGraphics::CORNER_ALL))
+			m_StartPaused ^= 1;
+
+		// fastforward
+		CUIRect FastForwardButton;
+		Row.VSplitLeft(20.0f, &FastForwardButton, &Row);
+		Row.VSplitLeft(8.0f, nullptr, &Row);
+		static CButtonContainer s_FastForwardButton;
+		if(DoButton_FontIcon(&s_FastForwardButton, FONT_ICON_FORWARD, 0, &FastForwardButton, IGraphics::CORNER_ALL))
+			m_Speed = clamp(m_Speed + 1, 0, (int)(g_DemoSpeeds - 1));
+
+		// speed meter
+		char aBuffer[128];
+		const char *pPaused = m_StartPaused ? Localize("(paused)") : "";
+		str_format(aBuffer, sizeof(aBuffer), "%s: ×%g %s", Localize("Speed"), g_aSpeeds[m_Speed], pPaused);
+		Ui()->DoLabel(&Row, aBuffer, 12.8f, TEXTALIGN_ML);
+		Box.HSplitBottom(16.0f, &Box, nullptr);
+		Box.HSplitBottom(24.0f, &Box, &Row);
+
+		CUIRect Label, TextBox;
+		Row.VSplitLeft(110.0f, &Label, &TextBox);
+		TextBox.VSplitLeft(10.0f, nullptr, &TextBox);
+		Ui()->DoLabel(&Label, Localize("Video name:"), 12.8f, TEXTALIGN_ML);
+		Ui()->DoEditBox(&m_DemoRenderInput, &TextBox, 12.8f);
+	}
+	else if(m_Popup == POPUP_RENDER_DONE)
+	{
+		CUIRect Ok, OpenFolder;
+
+		char aFilePath[IO_MAX_PATH_LENGTH];
+		char aSaveFolder[IO_MAX_PATH_LENGTH];
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "videos", aSaveFolder, sizeof(aSaveFolder));
+		str_format(aFilePath, sizeof(aFilePath), "%s/%s.mp4", aSaveFolder, m_DemoRenderInput.GetString());
+
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
 
-			Box.HSplitBottom(160.f, &Box, &Part);
-			Part.VMargin(20.0f, &Part);
+		Part.VSplitMid(&OpenFolder, &Ok);
 
-			str_format(aBuf, sizeof(aBuf), Localize("Video was saved to '%s'"), aFilePath);
+		Ok.VMargin(20.0f, &Ok);
+		OpenFolder.VMargin(20.0f, &OpenFolder);
 
-			SLabelProperties MessageProps;
-			MessageProps.m_MaxWidth = (int)Part.w;
-			UI()->DoLabel(&Part, aBuf, 18.0f, TEXTALIGN_TL, MessageProps);
+		static CButtonContainer s_ButtonOpenFolder;
+		if(DoButton_Menu(&s_ButtonOpenFolder, Localize("Videos directory"), 0, &OpenFolder))
+		{
+			Client()->ViewFile(aSaveFolder);
+		}
+
+		static CButtonContainer s_ButtonOk;
+		if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+		{
+			m_Popup = POPUP_NONE;
+			m_DemoRenderInput.Clear();
 		}
+
+		Box.HSplitBottom(160.f, &Box, &Part);
+		Part.VMargin(20.0f, &Part);
+
+		str_format(aBuf, sizeof(aBuf), Localize("Video was saved to '%s'"), aFilePath);
+
+		SLabelProperties MessageProps;
+		MessageProps.m_MaxWidth = (int)Part.w;
+		Ui()->DoLabel(&Part, aBuf, 18.0f, TEXTALIGN_TL, MessageProps);
+	}
 #endif
-		else if(m_Popup == POPUP_FIRST_LAUNCH)
+	else if(m_Popup == POPUP_FIRST_LAUNCH)
+	{
+		CUIRect Label, TextBox, Skip, Join;
+
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
+		Part.VSplitMid(&Skip, &Join);
+		Skip.VMargin(20.0f, &Skip);
+		Join.VMargin(20.0f, &Join);
+
+		static CButtonContainer s_JoinTutorialButton;
+		if(DoButton_Menu(&s_JoinTutorialButton, Localize("Join Tutorial Server"), 0, &Join) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
 		{
-			CUIRect Label, TextBox, Skip, Join;
+			m_JoinTutorial = true;
+			Client()->RequestDDNetInfo();
+			m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
+		}
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(80.0f, &Part);
-			Part.VSplitMid(&Skip, &Join);
-			Skip.VMargin(20.0f, &Skip);
-			Join.VMargin(20.0f, &Join);
+		static CButtonContainer s_SkipTutorialButton;
+		if(DoButton_Menu(&s_SkipTutorialButton, Localize("Skip Tutorial"), 0, &Skip) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+		{
+			m_JoinTutorial = false;
+			Client()->RequestDDNetInfo();
+			m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
+		}
 
-			static CButtonContainer s_JoinTutorialButton;
-			if(DoButton_Menu(&s_JoinTutorialButton, Localize("Join Tutorial Server"), 0, &Join) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
-			{
-				m_JoinTutorial = true;
-				Client()->RequestDDNetInfo();
-				m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
-			}
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-			static CButtonContainer s_SkipTutorialButton;
-			if(DoButton_Menu(&s_SkipTutorialButton, Localize("Skip Tutorial"), 0, &Skip) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-			{
-				m_JoinTutorial = false;
-				Client()->RequestDDNetInfo();
-				m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
-			}
+		Part.VSplitLeft(30.0f, 0, &Part);
+		str_format(aBuf, sizeof(aBuf), "%s\n(%s)",
+			Localize("Show DDNet map finishes in server browser"),
+			Localize("transmits your player name to info.ddnet.org"));
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
+		if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, aBuf, g_Config.m_BrIndicateFinished, &Part))
+			g_Config.m_BrIndicateFinished ^= 1;
 
-			Part.VSplitLeft(30.0f, 0, &Part);
-			str_format(aBuf, sizeof(aBuf), "%s\n(%s)",
-				Localize("Show DDNet map finishes in server browser"),
-				Localize("transmits your player name to info.ddnet.org"));
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
 
-			if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, aBuf, g_Config.m_BrIndicateFinished, &Part))
-				g_Config.m_BrIndicateFinished ^= 1;
+		Part.VSplitLeft(60.0f, 0, &Label);
+		Label.VSplitLeft(100.0f, 0, &TextBox);
+		TextBox.VSplitLeft(20.0f, 0, &TextBox);
+		TextBox.VSplitRight(60.0f, &TextBox, 0);
+		Ui()->DoLabel(&Label, Localize("Nickname"), 16.0f, TEXTALIGN_ML);
+		static CLineInput s_PlayerNameInput(g_Config.m_PlayerName, sizeof(g_Config.m_PlayerName));
+		s_PlayerNameInput.SetEmptyText(Client()->PlayerName());
+		Ui()->DoEditBox(&s_PlayerNameInput, &TextBox, 12.0f);
+	}
+	else if(m_Popup == POPUP_POINTS)
+	{
+		CUIRect Yes, No;
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
 
-			Part.VSplitLeft(60.0f, 0, &Label);
-			Label.VSplitLeft(100.0f, 0, &TextBox);
-			TextBox.VSplitLeft(20.0f, 0, &TextBox);
-			TextBox.VSplitRight(60.0f, &TextBox, 0);
-			UI()->DoLabel(&Label, Localize("Nickname"), 16.0f, TEXTALIGN_ML);
-			static CLineInput s_PlayerNameInput(g_Config.m_PlayerName, sizeof(g_Config.m_PlayerName));
-			s_PlayerNameInput.SetEmptyText(Client()->PlayerName());
-			UI()->DoEditBox(&s_PlayerNameInput, &TextBox, 12.0f);
-		}
-		else if(m_Popup == POPUP_POINTS)
+		Part.VSplitMid(&No, &Yes);
+
+		Yes.VMargin(20.0f, &Yes);
+		No.VMargin(20.0f, &No);
+
+		static CButtonContainer s_ButtonNo;
+		if(DoButton_Menu(&s_ButtonNo, Localize("No"), 0, &No) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			m_Popup = POPUP_FIRST_LAUNCH;
+
+		static CButtonContainer s_ButtonYes;
+		if(DoButton_Menu(&s_ButtonYes, Localize("Yes"), 0, &Yes) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+			m_Popup = POPUP_NONE;
+	}
+	else if(m_Popup == POPUP_WARNING)
+	{
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(120.0f, &Part);
+
+		static CButtonContainer s_Button;
+		if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || (m_PopupWarningDuration > 0s && time_get_nanoseconds() - m_PopupWarningLastTime >= m_PopupWarningDuration))
 		{
-			CUIRect Yes, No;
+			m_Popup = POPUP_NONE;
+			SetActive(false);
+		}
+	}
+	else if(m_Popup == POPUP_SAVE_SKIN)
+	{
+		CUIRect Label, TextBox, Yes, No;
 
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(80.0f, &Part);
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(80.0f, &Part);
 
-			Part.VSplitMid(&No, &Yes);
+		Part.VSplitMid(&No, &Yes);
 
-			Yes.VMargin(20.0f, &Yes);
-			No.VMargin(20.0f, &No);
+		Yes.VMargin(20.0f, &Yes);
+		No.VMargin(20.0f, &No);
 
-			static CButtonContainer s_ButtonNo;
-			if(DoButton_Menu(&s_ButtonNo, Localize("No"), 0, &No) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
-				m_Popup = POPUP_FIRST_LAUNCH;
+		static CButtonContainer s_ButtonNo;
+		if(DoButton_Menu(&s_ButtonNo, Localize("No"), 0, &No) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+			m_Popup = POPUP_NONE;
 
-			static CButtonContainer s_ButtonYes;
-			if(DoButton_Menu(&s_ButtonYes, Localize("Yes"), 0, &Yes) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
-				m_Popup = POPUP_NONE;
-		}
-		else if(m_Popup == POPUP_WARNING)
+		static CButtonContainer s_ButtonYes;
+		if(DoButton_Menu(&s_ButtonYes, Localize("Yes"), m_SkinNameInput.IsEmpty() ? 1 : 0, &Yes) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
 		{
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(120.0f, &Part);
-
-			static CButtonContainer s_Button;
-			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (m_PopupWarningDuration > 0s && time_get_nanoseconds() - m_PopupWarningLastTime >= m_PopupWarningDuration))
+			if(m_SkinNameInput.GetLength())
 			{
-				m_Popup = POPUP_NONE;
-				SetActive(false);
+				if(m_SkinNameInput.GetString()[0] != 'x' && m_SkinNameInput.GetString()[1] != '_')
+				{
+					if(m_pClient->m_Skins7.SaveSkinfile(m_SkinNameInput.GetString(), m_Dummy))
+					{
+						m_Popup = POPUP_NONE;
+						m_SkinListNeedsUpdate = true;
+					}
+					else
+						PopupMessage(Localize("Error"), Localize("Unable to save the skin"), Localize("Ok"), POPUP_SAVE_SKIN);
+				}
+				else
+					PopupMessage(Localize("Error"), Localize("Unable to save the skin with a reserved name"), Localize("Ok"), POPUP_SAVE_SKIN);
 			}
 		}
-		else
+
+		Box.HSplitBottom(60.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+
+		Part.VMargin(60.0f, &Label);
+		Label.VSplitLeft(100.0f, &Label, &TextBox);
+		TextBox.VSplitLeft(20.0f, nullptr, &TextBox);
+		Ui()->DoLabel(&Label, Localize("Name"), 18.0f, TEXTALIGN_ML);
+		Ui()->DoClearableEditBox(&m_SkinNameInput, &TextBox, 12.0f);
+	}
+	else
+	{
+		Box.HSplitBottom(20.f, &Box, &Part);
+		Box.HSplitBottom(24.f, &Box, &Part);
+		Part.VMargin(120.0f, &Part);
+
+		static CButtonContainer s_Button;
+		if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER))
+		{
+			if(m_Popup == POPUP_DISCONNECTED && Client()->ReconnectTime() > 0)
+				Client()->SetReconnectTime(0);
+			m_Popup = POPUP_NONE;
+		}
+	}
+
+	if(m_Popup == POPUP_NONE)
+		Ui()->SetActiveItem(nullptr);
+}
+
+void CMenus::RenderPopupConnecting(CUIRect Screen)
+{
+	const float FontSize = 20.0f;
+
+	CUIRect Box, Label;
+	Screen.Margin(150.0f, &Box);
+	Box.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Box.Margin(20.0f, &Box);
+
+	Box.HSplitTop(24.0f, &Label, &Box);
+	Ui()->DoLabel(&Label, Localize("Connecting to"), 24.0f, TEXTALIGN_MC);
+
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	Box.HSplitTop(24.0f, &Label, &Box);
+	SLabelProperties Props;
+	Props.m_MaxWidth = Label.w;
+	Props.m_EllipsisAtEnd = true;
+	Ui()->DoLabel(&Label, Client()->ConnectAddressString(), FontSize, TEXTALIGN_MC, Props);
+
+	if(time_get() - Client()->StateStartTime() > time_freq())
+	{
+		const char *pConnectivityLabel = "";
+		switch(Client()->UdpConnectivity(Client()->ConnectNetTypes()))
+		{
+		case IClient::CONNECTIVITY_UNKNOWN:
+			break;
+		case IClient::CONNECTIVITY_CHECKING:
+			pConnectivityLabel = Localize("Trying to determine UDP connectivity…");
+			break;
+		case IClient::CONNECTIVITY_UNREACHABLE:
+			pConnectivityLabel = Localize("UDP seems to be filtered.");
+			break;
+		case IClient::CONNECTIVITY_DIFFERING_UDP_TCP_IP_ADDRESSES:
+			pConnectivityLabel = Localize("UDP and TCP IP addresses seem to be different. Try disabling VPN, proxy or network accelerators.");
+			break;
+		case IClient::CONNECTIVITY_REACHABLE:
+			pConnectivityLabel = Localize("No answer from server yet.");
+			break;
+		}
+		if(pConnectivityLabel[0] != '\0')
 		{
-			Box.HSplitBottom(20.f, &Box, &Part);
-			Box.HSplitBottom(24.f, &Box, &Part);
-			Part.VMargin(120.0f, &Part);
+			Box.HSplitTop(20.0f, nullptr, &Box);
+			Box.HSplitTop(24.0f, &Label, &Box);
+			SLabelProperties ConnectivityLabelProps;
+			ConnectivityLabelProps.m_MaxWidth = Label.w;
+			if(TextRender()->TextWidth(FontSize, pConnectivityLabel) > Label.w)
+				Ui()->DoLabel(&Label, pConnectivityLabel, FontSize, TEXTALIGN_ML, ConnectivityLabelProps);
+			else
+				Ui()->DoLabel(&Label, pConnectivityLabel, FontSize, TEXTALIGN_MC);
+		}
+	}
+
+	CUIRect Button;
+	Box.HSplitBottom(24.0f, &Box, &Button);
+	Button.VMargin(100.0f, &Button);
 
-			static CButtonContainer s_Button;
-			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+	static CButtonContainer s_Button;
+	if(DoButton_Menu(&s_Button, Localize("Abort"), 0, &Button) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+	{
+		Client()->Disconnect();
+		Ui()->SetActiveItem(nullptr);
+		RefreshBrowserTab(true);
+	}
+}
+
+void CMenus::RenderPopupLoading(CUIRect Screen)
+{
+	char aTitle[256];
+	char aLabel1[128];
+	char aLabel2[128];
+	if(Client()->MapDownloadTotalsize() > 0)
+	{
+		const int64_t Now = time_get();
+		if(Now - m_DownloadLastCheckTime >= time_freq())
+		{
+			if(m_DownloadLastCheckSize > Client()->MapDownloadAmount())
 			{
-				if(m_Popup == POPUP_DISCONNECTED && Client()->ReconnectTime() > 0)
-					Client()->SetReconnectTime(0);
-				m_Popup = POPUP_NONE;
+				// map downloaded restarted
+				m_DownloadLastCheckSize = 0;
 			}
+
+			// update download speed
+			const float Diff = (Client()->MapDownloadAmount() - m_DownloadLastCheckSize) / ((int)((Now - m_DownloadLastCheckTime) / time_freq()));
+			const float StartDiff = m_DownloadLastCheckSize - 0.0f;
+			if(StartDiff + Diff > 0.0f)
+				m_DownloadSpeed = (Diff / (StartDiff + Diff)) * (Diff / 1.0f) + (StartDiff / (Diff + StartDiff)) * m_DownloadSpeed;
+			else
+				m_DownloadSpeed = 0.0f;
+			m_DownloadLastCheckTime = Now;
+			m_DownloadLastCheckSize = Client()->MapDownloadAmount();
 		}
 
-		if(m_Popup == POPUP_NONE)
-			UI()->SetActiveItem(nullptr);
+		str_format(aTitle, sizeof(aTitle), "%s: %s", Localize("Downloading map"), Client()->MapDownloadName());
+
+		str_format(aLabel1, sizeof(aLabel1), Localize("%d/%d KiB (%.1f KiB/s)"), Client()->MapDownloadAmount() / 1024, Client()->MapDownloadTotalsize() / 1024, m_DownloadSpeed / 1024.0f);
+
+		const int SecondsLeft = maximum(1, m_DownloadSpeed > 0.0f ? static_cast<int>((Client()->MapDownloadTotalsize() - Client()->MapDownloadAmount()) / m_DownloadSpeed) : 1);
+		const int MinutesLeft = SecondsLeft / 60;
+		if(MinutesLeft > 0)
+		{
+			str_format(aLabel2, sizeof(aLabel2), MinutesLeft == 1 ? Localize("%i minute left") : Localize("%i minutes left"), MinutesLeft);
+		}
+		else
+		{
+			str_format(aLabel2, sizeof(aLabel2), SecondsLeft == 1 ? Localize("%i second left") : Localize("%i seconds left"), SecondsLeft);
+		}
+	}
+	else
+	{
+		str_copy(aTitle, Localize("Connected"));
+		switch(Client()->LoadingStateDetail())
+		{
+		case IClient::LOADING_STATE_DETAIL_INITIAL:
+			str_copy(aLabel1, Localize("Getting game info"));
+			break;
+		case IClient::LOADING_STATE_DETAIL_LOADING_MAP:
+			str_copy(aLabel1, Localize("Loading map file from storage"));
+			break;
+		case IClient::LOADING_STATE_DETAIL_LOADING_DEMO:
+			str_copy(aLabel1, Localize("Loading demo file from storage"));
+			break;
+		case IClient::LOADING_STATE_DETAIL_SENDING_READY:
+			str_copy(aLabel1, Localize("Requesting to join the game"));
+			break;
+		case IClient::LOADING_STATE_DETAIL_GETTING_READY:
+			str_copy(aLabel1, Localize("Sending initial client info"));
+			break;
+		default:
+			dbg_assert(false, "Invalid loading state for RenderPopupLoading");
+			break;
+		}
+		aLabel2[0] = '\0';
 	}
 
-	UI()->RenderPopupMenus();
+	const float FontSize = 20.0f;
 
-	// Handle this escape hotkey after popup menus
-	if(!m_ShowStart && Client()->State() == IClient::STATE_OFFLINE && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+	CUIRect Box, Label;
+	Screen.Margin(150.0f, &Box);
+	Box.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Box.Margin(20.0f, &Box);
+
+	Box.HSplitTop(24.0f, &Label, &Box);
+	Ui()->DoLabel(&Label, aTitle, 24.0f, TEXTALIGN_MC);
+
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	Box.HSplitTop(24.0f, &Label, &Box);
+	Ui()->DoLabel(&Label, aLabel1, FontSize, TEXTALIGN_MC);
+
+	if(aLabel2[0] != '\0')
 	{
-		m_ShowStart = true;
+		Box.HSplitTop(20.0f, nullptr, &Box);
+		Box.HSplitTop(24.0f, &Label, &Box);
+		SLabelProperties ExtraTextProps;
+		ExtraTextProps.m_MaxWidth = Label.w;
+		if(TextRender()->TextWidth(FontSize, aLabel2) > Label.w)
+			Ui()->DoLabel(&Label, aLabel2, FontSize, TEXTALIGN_ML, ExtraTextProps);
+		else
+			Ui()->DoLabel(&Label, aLabel2, FontSize, TEXTALIGN_MC);
 	}
 
-	return 0;
+	if(Client()->MapDownloadTotalsize() > 0)
+	{
+		CUIRect ProgressBar;
+		Box.HSplitTop(20.0f, nullptr, &Box);
+		Box.HSplitTop(24.0f, &ProgressBar, &Box);
+		ProgressBar.VMargin(20.0f, &ProgressBar);
+		Ui()->RenderProgressBar(ProgressBar, Client()->MapDownloadAmount() / (float)Client()->MapDownloadTotalsize());
+	}
+
+	CUIRect Button;
+	Box.HSplitBottom(24.0f, &Box, &Button);
+	Button.VMargin(100.0f, &Button);
+
+	static CButtonContainer s_Button;
+	if(DoButton_Menu(&s_Button, Localize("Abort"), 0, &Button) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+	{
+		Client()->Disconnect();
+		Ui()->SetActiveItem(nullptr);
+		RefreshBrowserTab(true);
+	}
 }
 
 #if defined(CONF_VIDEORECORDER)
@@ -1810,8 +2037,6 @@ void CMenus::PopupConfirmDemoReplaceVideo()
 	str_format(aBuf, sizeof(aBuf), "%s/%s.demo", m_aCurrentDemoFolder, m_aCurrentDemoSelectionName);
 	char aVideoName[IO_MAX_PATH_LENGTH];
 	str_copy(aVideoName, m_DemoRenderInput.GetString());
-	if(!str_endswith(aVideoName, ".mp4"))
-		str_append(aVideoName, ".mp4");
 	const char *pError = Client()->DemoPlayer_Render(aBuf, m_DemolistStorageType, aVideoName, m_Speed, m_StartPaused);
 	m_Speed = 4;
 	m_StartPaused = false;
@@ -1827,7 +2052,7 @@ void CMenus::PopupConfirmDemoReplaceVideo()
 
 void CMenus::RenderThemeSelection(CUIRect MainView)
 {
-	const std::vector<CTheme> &vThemes = m_pBackground->GetThemes();
+	const std::vector<CTheme> &vThemes = GameClient()->m_MenuBackground.GetThemes();
 
 	int SelectedTheme = -1;
 	for(int i = 0; i < (int)vThemes.size(); i++)
@@ -1884,7 +2109,7 @@ void CMenus::RenderThemeSelection(CUIRect MainView)
 		else // generic
 			str_copy(aName, Theme.m_Name.c_str());
 
-		UI()->DoLabel(&Label, aName, 16.0f * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, aName, 16.0f * CUi::ms_FontmodHeight, TEXTALIGN_ML);
 	}
 
 	SelectedTheme = s_ListBox.DoEnd();
@@ -1893,7 +2118,7 @@ void CMenus::RenderThemeSelection(CUIRect MainView)
 	{
 		const CTheme &Theme = vThemes[SelectedTheme];
 		str_copy(g_Config.m_ClMenuMap, Theme.m_Name.c_str());
-		m_pBackground->LoadMenuBackground(Theme.m_HasDay, Theme.m_HasNight);
+		GameClient()->m_MenuBackground.LoadMenuBackground(Theme.m_HasDay, Theme.m_HasNight);
 	}
 }
 
@@ -1901,8 +2126,8 @@ void CMenus::SetActive(bool Active)
 {
 	if(Active != m_MenuActive)
 	{
-		UI()->SetHotItem(nullptr);
-		UI()->SetActiveItem(nullptr);
+		Ui()->SetHotItem(nullptr);
+		Ui()->SetActiveItem(nullptr);
 	}
 	m_MenuActive = Active;
 	if(!m_MenuActive)
@@ -1937,6 +2162,8 @@ void CMenus::OnReset()
 void CMenus::OnShutdown()
 {
 	KillServer();
+	m_CommunityIconLoadJobs.clear();
+	m_CommunityIconDownloadJobs.clear();
 }
 
 bool CMenus::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
@@ -1944,8 +2171,8 @@ bool CMenus::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 	if(!m_MenuActive)
 		return false;
 
-	UI()->ConvertMouseMove(&x, &y, CursorType);
-	UI()->OnCursorMove(x, y);
+	Ui()->ConvertMouseMove(&x, &y, CursorType);
+	Ui()->OnCursorMove(x, y);
 
 	return true;
 }
@@ -1955,7 +2182,7 @@ bool CMenus::OnInput(const IInput::CEvent &Event)
 	// Escape key is always handled to activate/deactivate menu
 	if((Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE) || IsActive())
 	{
-		UI()->OnInput(Event);
+		Ui()->OnInput(Event);
 		return true;
 	}
 	return false;
@@ -1964,7 +2191,7 @@ bool CMenus::OnInput(const IInput::CEvent &Event)
 void CMenus::OnStateChange(int NewState, int OldState)
 {
 	// reset active item
-	UI()->SetActiveItem(nullptr);
+	Ui()->SetActiveItem(nullptr);
 
 	if(OldState == IClient::STATE_ONLINE || OldState == IClient::STATE_OFFLINE)
 		TextRender()->DeleteTextContainer(m_MotdTextContainerIndex);
@@ -1980,7 +2207,7 @@ void CMenus::OnStateChange(int NewState, int OldState)
 			{
 				m_Popup = POPUP_PASSWORD;
 				m_PasswordInput.SelectAll();
-				UI()->SetActiveItem(&m_PasswordInput);
+				Ui()->SetActiveItem(&m_PasswordInput);
 			}
 			else
 				m_Popup = POPUP_DISCONNECTED;
@@ -1988,15 +2215,10 @@ void CMenus::OnStateChange(int NewState, int OldState)
 	}
 	else if(NewState == IClient::STATE_LOADING)
 	{
-		m_Popup = POPUP_CONNECTING;
 		m_DownloadLastCheckTime = time_get();
 		m_DownloadLastCheckSize = 0;
 		m_DownloadSpeed = 0.0f;
 	}
-	else if(NewState == IClient::STATE_CONNECTING)
-	{
-		m_Popup = POPUP_CONNECTING;
-	}
 	else if(NewState == IClient::STATE_ONLINE || NewState == IClient::STATE_DEMOPLAYBACK)
 	{
 		if(m_Popup != POPUP_WARNING)
@@ -2014,17 +2236,11 @@ void CMenus::OnWindowResize()
 
 void CMenus::OnRender()
 {
-	UI()->StartCheck();
+	Ui()->StartCheck();
 
 	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 		SetActive(true);
 
-	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
-	{
-		UI()->MapScreen();
-		RenderDemoPlayer(*UI()->Screen());
-	}
-
 	if(Client()->State() == IClient::STATE_ONLINE && m_pClient->m_ServerMode == CGameClient::SERVERMODE_PUREMOD)
 	{
 		Client()->Disconnect();
@@ -2034,29 +2250,38 @@ void CMenus::OnRender()
 
 	if(!IsActive())
 	{
-		if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+		{
 			SetActive(true);
-		UI()->FinishCheck();
-		UI()->ClearHotkeys();
-		return;
+		}
+		else if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		{
+			Ui()->FinishCheck();
+			Ui()->ClearHotkeys();
+			return;
+		}
 	}
 
 	UpdateColors();
 
-	UI()->Update();
+	Ui()->Update();
 
 	Render();
-	RenderTools()->RenderCursor(UI()->MousePos(), 24.0f);
+
+	if(IsActive())
+	{
+		RenderTools()->RenderCursor(Ui()->MousePos(), 24.0f);
+	}
 
 	// render debug information
 	if(g_Config.m_Debug)
-		UI()->DebugRender();
+		Ui()->DebugRender(2.0f, Ui()->Screen()->h - 12.0f);
 
-	if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+	if(Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
 		SetActive(false);
 
-	UI()->FinishCheck();
-	UI()->ClearHotkeys();
+	Ui()->FinishCheck();
+	Ui()->ClearHotkeys();
 }
 
 void CMenus::UpdateColors()
@@ -2106,14 +2331,16 @@ void CMenus::RenderBackground()
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.045f);
 	const float Size = 15.0f;
-	const float OffsetTime = std::fmod(LocalTime() * 0.15f, 2.0f);
+	const float OffsetTime = std::fmod(Client()->GlobalTime() * 0.15f, 2.0f);
 	IGraphics::CQuadItem aCheckerItems[64];
 	size_t NumCheckerItems = 0;
-	for(int y = -2; y < (int)(ScreenWidth / Size); y++)
+	const int NumItemsWidth = std::ceil(ScreenWidth / Size);
+	const int NumItemsHeight = std::ceil(ScreenHeight / Size);
+	for(int y = -2; y < NumItemsHeight; y++)
 	{
-		for(int x = -2; x < (int)(ScreenHeight / Size); x++)
+		for(int x = 0; x < NumItemsWidth + 4; x += 2)
 		{
-			aCheckerItems[NumCheckerItems] = IGraphics::CQuadItem((x - OffsetTime) * Size * 2 + (y & 1) * Size, (y + OffsetTime) * Size, Size, Size);
+			aCheckerItems[NumCheckerItems] = IGraphics::CQuadItem((x - 2 * OffsetTime + (y & 1)) * Size, (y + OffsetTime) * Size, Size, Size);
 			NumCheckerItems++;
 			if(NumCheckerItems == std::size(aCheckerItems))
 			{
@@ -2135,7 +2362,7 @@ void CMenus::RenderBackground()
 	Graphics()->QuadsEnd();
 
 	// restore screen
-	UI()->MapScreen();
+	Ui()->MapScreen();
 }
 
 bool CMenus::CheckHotKey(int Key) const
@@ -2145,16 +2372,16 @@ bool CMenus::CheckHotKey(int Key) const
 	       Input()->KeyIsPressed(Key) && m_pClient->m_GameConsole.IsClosed();
 }
 
-int CMenus::DoButton_CheckBox_Tristate(const void *pID, const char *pText, TRISTATE Checked, const CUIRect *pRect)
+int CMenus::DoButton_CheckBox_Tristate(const void *pId, const char *pText, TRISTATE Checked, const CUIRect *pRect)
 {
 	switch(Checked)
 	{
 	case TRISTATE::NONE:
-		return DoButton_CheckBox_Common(pID, pText, "", pRect);
+		return DoButton_CheckBox_Common(pId, pText, "", pRect);
 	case TRISTATE::SOME:
-		return DoButton_CheckBox_Common(pID, pText, "O", pRect);
+		return DoButton_CheckBox_Common(pId, pText, "O", pRect);
 	case TRISTATE::ALL:
-		return DoButton_CheckBox_Common(pID, pText, "X", pRect);
+		return DoButton_CheckBox_Common(pId, pText, "X", pRect);
 	default:
 		dbg_assert(false, "invalid tristate");
 	}
@@ -2173,7 +2400,7 @@ int CMenus::MenuImageScan(const char *pName, int IsDir, int DirType, void *pUser
 	str_format(aPath, sizeof(aPath), "menuimages/%s", pName);
 
 	CImageInfo Info;
-	if(!pSelf->Graphics()->LoadPNG(&Info, aPath, DirType))
+	if(!pSelf->Graphics()->LoadPng(Info, aPath, DirType))
 	{
 		char aError[IO_MAX_PATH_LENGTH + 64];
 		str_format(aError, sizeof(aError), "Failed to load menu image from '%s'", aPath);
@@ -2182,32 +2409,22 @@ int CMenus::MenuImageScan(const char *pName, int IsDir, int DirType, void *pUser
 	}
 	if(Info.m_Format != CImageInfo::FORMAT_RGBA)
 	{
-		pSelf->Graphics()->FreePNG(&Info);
+		Info.Free();
 		char aError[IO_MAX_PATH_LENGTH + 64];
 		str_format(aError, sizeof(aError), "Failed to load menu image from '%s': must be an RGBA image", aPath);
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus", aError);
 		return 0;
 	}
 
-	MenuImage.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+	MenuImage.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info, 0, aPath);
 
-	// create gray scale version
-	unsigned char *pData = static_cast<unsigned char *>(Info.m_pData);
-	const size_t Step = Info.PixelSize();
-	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
-	{
-		int v = (pData[i * Step] + pData[i * Step + 1] + pData[i * Step + 2]) / 3;
-		pData[i * Step] = v;
-		pData[i * Step + 1] = v;
-		pData[i * Step + 2] = v;
-	}
-	MenuImage.m_GreyTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
-	pSelf->Graphics()->FreePNG(&Info);
+	ConvertToGrayscale(Info);
+	MenuImage.m_GreyTexture = pSelf->Graphics()->LoadTextureRawMove(Info, 0, aPath);
 
 	str_truncate(MenuImage.m_aName, sizeof(MenuImage.m_aName), pName, str_length(pName) - str_length(pExtension));
 	pSelf->m_vMenuImages.push_back(MenuImage);
 
-	pSelf->RenderLoading(Localize("Loading StormA Client"), Localize("Loading menu images"), 1);
+	pSelf->RenderLoading(Localize("Loading DDNet Client"), Localize("Loading menu images"), 1);
 
 	return 0;
 }
@@ -2222,28 +2439,69 @@ const CMenus::CMenuImage *CMenus::FindMenuImage(const char *pName)
 
 void CMenus::SetMenuPage(int NewPage)
 {
-	if(NewPage == PAGE_DDNET_LEGACY || NewPage == PAGE_KOG_LEGACY)
-		NewPage = PAGE_INTERNET;
-
+	const int OldPage = m_MenuPage;
 	m_MenuPage = NewPage;
-	if(NewPage >= PAGE_INTERNET && NewPage <= PAGE_FAVORITES)
+	if(NewPage >= PAGE_INTERNET && NewPage <= PAGE_FAVORITE_COMMUNITY_5)
+	{
 		g_Config.m_UiPage = NewPage;
+		bool ForceRefresh = false;
+		if(m_ForceRefreshLanPage)
+		{
+			ForceRefresh = NewPage == PAGE_LAN;
+			m_ForceRefreshLanPage = false;
+		}
+		if(OldPage != NewPage || ForceRefresh)
+		{
+			RefreshBrowserTab(ForceRefresh);
+		}
+	}
 }
 
-void CMenus::RefreshBrowserTab(int UiPage)
+void CMenus::RefreshBrowserTab(bool Force)
 {
-	if(UiPage == PAGE_INTERNET)
+	if(g_Config.m_UiPage == PAGE_INTERNET)
+	{
+		if(Force || ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_INTERNET)
+		{
+			if(Force || ServerBrowser()->GetCurrentType() == IServerBrowser::TYPE_LAN)
+			{
+				Client()->RequestDDNetInfo();
+			}
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+			UpdateCommunityCache(true);
+		}
+	}
+	else if(g_Config.m_UiPage == PAGE_LAN)
 	{
-		Client()->RequestDDNetInfo();
-		ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+		if(Force || ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_LAN)
+		{
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
+			UpdateCommunityCache(true);
+		}
 	}
-	else if(UiPage == PAGE_LAN)
+	else if(g_Config.m_UiPage == PAGE_FAVORITES)
 	{
-		ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
+		if(Force || ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_FAVORITES)
+		{
+			if(Force || ServerBrowser()->GetCurrentType() == IServerBrowser::TYPE_LAN)
+			{
+				Client()->RequestDDNetInfo();
+			}
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+			UpdateCommunityCache(true);
+		}
 	}
-	else if(UiPage == PAGE_FAVORITES)
+	else if(g_Config.m_UiPage >= PAGE_FAVORITE_COMMUNITY_1 && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5)
 	{
-		Client()->RequestDDNetInfo();
-		ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+		const int BrowserType = g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1 + IServerBrowser::TYPE_FAVORITE_COMMUNITY_1;
+		if(Force || ServerBrowser()->GetCurrentType() != BrowserType)
+		{
+			if(Force || ServerBrowser()->GetCurrentType() == IServerBrowser::TYPE_LAN)
+			{
+				Client()->RequestDDNetInfo();
+			}
+			ServerBrowser()->Refresh(BrowserType);
+			UpdateCommunityCache(true);
+		}
 	}
 }
diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
index 98eeeb4e06..4595bd1eeb 100644
--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@@ -17,15 +17,19 @@
 #include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/shared/http.h>
+#include <engine/shared/jobs.h>
 #include <engine/shared/linereader.h>
 #include <engine/textrender.h>
 
 #include <game/client/component.h>
 #include <game/client/components/mapimages.h>
+#include <game/client/lineinput.h>
 #include <game/client/render.h>
 #include <game/client/ui.h>
 #include <game/voting.h>
 
+#include <game/client/components/skins7.h>
+
 struct CServerProcess
 {
 	PROCESS m_Process;
@@ -35,6 +39,7 @@ struct CServerProcess
 class CMenusKeyBinder : public CComponent
 {
 public:
+	const void *m_pKeyReaderId;
 	bool m_TakeKey;
 	bool m_GotKey;
 	IInput::CEvent m_Key;
@@ -44,6 +49,14 @@ class CMenusKeyBinder : public CComponent
 	virtual bool OnInput(const IInput::CEvent &Event) override;
 };
 
+struct SCommunityIcon
+{
+	char m_aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	SHA256_DIGEST m_Sha256;
+	IGraphics::CTextureHandle m_OrgTexture;
+	IGraphics::CTextureHandle m_GreyTexture;
+};
+
 class CMenus : public CComponent
 {
 	static ColorRGBA ms_GuiColor;
@@ -58,21 +71,22 @@ class CMenus : public CComponent
 	static ColorRGBA ms_ColorTabbarHover;
 
 	int DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners = IGraphics::CORNER_ALL, bool Enabled = true);
-	int DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect, bool Active);
+	int DoButton_Toggle(const void *pId, int Checked, const CUIRect *pRect, bool Active);
 	int DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, const char *pImageName = nullptr, int Corners = IGraphics::CORNER_ALL, float Rounding = 5.0f, float FontFactor = 0.0f, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
-	int DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator = nullptr, const ColorRGBA *pDefaultColor = nullptr, const ColorRGBA *pActiveColor = nullptr, const ColorRGBA *pHoverColor = nullptr, float EdgeRounding = 10);
+	int DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator = nullptr, const ColorRGBA *pDefaultColor = nullptr, const ColorRGBA *pActiveColor = nullptr, const ColorRGBA *pHoverColor = nullptr, float EdgeRounding = 10.0f, const SCommunityIcon *pCommunityIcon = nullptr);
 
-	int DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect);
-	int DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
-	int DoButton_CheckBoxAutoVMarginAndSet(const void *pID, const char *pText, int *pValue, CUIRect *pRect, float VMargin);
-	int DoButton_CheckBox_Number(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
+	int DoButton_CheckBox_Common(const void *pId, const char *pText, const char *pBoxText, const CUIRect *pRect);
+	int DoButton_CheckBox(const void *pId, const char *pText, int Checked, const CUIRect *pRect);
+	int DoButton_CheckBoxAutoVMarginAndSet(const void *pId, const char *pText, int *pValue, CUIRect *pRect, float VMargin);
+	int DoButton_CheckBox_Number(const void *pId, const char *pText, int Checked, const CUIRect *pRect);
 
-	ColorHSLA DoLine_ColorPicker(CButtonContainer *pResetID, float LineSize, float LabelSize, float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, ColorRGBA DefaultColor, bool CheckBoxSpacing = true, int *pCheckBoxValue = nullptr, bool Alpha = false);
+	ColorHSLA DoLine_ColorPicker(CButtonContainer *pResetId, float LineSize, float LabelSize, float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, ColorRGBA DefaultColor, bool CheckBoxSpacing = true, int *pCheckBoxValue = nullptr, bool Alpha = false);
 	ColorHSLA DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHslaColor, bool Alpha);
 	void DoLaserPreview(const CUIRect *pRect, ColorHSLA OutlineColor, ColorHSLA InnerColor, const int LaserType);
-	int DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
+	int DoButton_GridHeader(const void *pId, const char *pText, int Checked, const CUIRect *pRect);
+	int DoButton_Favorite(const void *pButtonId, const void *pParentId, bool Checked, const CUIRect *pRect);
 
-	int DoKeyReader(const void *pID, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination);
+	int DoKeyReader(const void *pId, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination);
 
 	void DoSettingsControlsButtons(int Start, int Stop, CUIRect View);
 
@@ -80,9 +94,7 @@ class CMenus : public CComponent
 	void DoJoystickAxisPicker(CUIRect View);
 	void DoJoystickBar(const CUIRect *pRect, float Current, float Tolerance, bool Active);
 
-	void RefreshSkins();
-
-	void RandomSkin();
+	bool m_SkinListNeedsUpdate = false;
 
 	// menus_settings_assets.cpp
 public:
@@ -155,10 +167,12 @@ class CMenus : public CComponent
 	int m_MenuPage;
 	int m_GamePage;
 	int m_Popup;
-	int m_ActivePage;
 	bool m_ShowStart;
 	bool m_MenuActive;
-	bool m_JoinTutorial;
+
+	bool m_JoinTutorial = false;
+	bool m_CreateDefaultFavoriteCommunities = false;
+	bool m_ForceRefreshLanPage = false;
 
 	char m_aNextServer[256];
 
@@ -174,8 +188,14 @@ class CMenus : public CComponent
 	const CMenuImage *FindMenuImage(const char *pName);
 
 	// loading
-	int m_LoadCurrent;
-	int m_LoadTotal;
+	class CLoadingState
+	{
+	public:
+		std::chrono::nanoseconds m_LastRender{0};
+		int m_Current;
+		int m_Total;
+	};
+	CLoadingState m_LoadingState;
 
 	//
 	char m_aMessageTopic[512];
@@ -219,16 +239,21 @@ class CMenus : public CComponent
 	static float ms_ListitemAdditionalHeight;
 
 	// for settings
-	bool m_NeedRestartGeneral;
-	bool m_NeedRestartSkins;
 	bool m_NeedRestartGraphics;
 	bool m_NeedRestartSound;
 	bool m_NeedRestartUpdate;
-	bool m_NeedRestartDDNet;
 	bool m_NeedSendinfo;
 	bool m_NeedSendDummyinfo;
 	int m_SettingPlayerPage;
 
+	// 0.7 skins
+	bool m_CustomSkinMenu = false;
+	int m_TeePartSelected = protocol7::SKINPART_BODY;
+	const CSkins7::CSkin *m_pSelectedSkin = nullptr;
+	CLineInputBuffered<protocol7::MAX_SKIN_ARRAY_SIZE, protocol7::MAX_SKIN_LENGTH> m_SkinNameInput;
+	bool m_SkinPartListNeedsUpdate = false;
+	void PopupConfirmDeleteSkin7();
+
 	// for map download popup
 	int64_t m_DownloadLastCheckTime;
 	int m_DownloadLastCheckSize;
@@ -244,8 +269,6 @@ class CMenus : public CComponent
 	CLineInputBuffered<64> m_FilterInput;
 	bool m_ControlPageOpening;
 
-	// for stats
-	CLineInputBuffered<MAX_NAME_LENGTH> m_StatsPlayerInput;
 	// demo
 	enum
 	{
@@ -394,11 +417,12 @@ class CMenus : public CComponent
 		const void *ListItemId() const { return &m_aName; }
 		const void *RemoveButtonId() const { return &m_FriendState; }
 		const void *CommunityTooltipId() const { return &m_IsPlayer; }
+		const void *SkinTooltipId() const { return &m_aSkin; }
 
 		bool operator<(const CFriendItem &Other) const
 		{
-			const int Result = str_comp(m_aName, Other.m_aName);
-			return Result < 0 || (Result == 0 && str_comp(m_aClan, Other.m_aClan) < 0);
+			const int Result = str_comp_nocase(m_aName, Other.m_aName);
+			return Result < 0 || (Result == 0 && str_comp_nocase(m_aClan, Other.m_aClan) < 0);
 		}
 	};
 
@@ -413,12 +437,16 @@ class CMenus : public CComponent
 	const CFriendItem *m_pRemoveFriend = nullptr;
 
 	// found in menus.cpp
-	int Render();
+	void Render();
+	void RenderPopupFullscreen(CUIRect Screen);
+	void RenderPopupConnecting(CUIRect Screen);
+	void RenderPopupLoading(CUIRect Screen);
 #if defined(CONF_VIDEORECORDER)
 	void PopupConfirmDemoReplaceVideo();
 #endif
-	int RenderMenubar(CUIRect r);
+	void RenderMenubar(CUIRect Box, IClient::EClientState ClientState);
 	void RenderNews(CUIRect MainView);
+	static void ConchainBackgroundEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	void UpdateMusicState();
 
@@ -442,6 +470,8 @@ class CMenus : public CComponent
 
 	// found in menus_start.cpp
 	void RenderStartMenu(CUIRect MainView);
+	bool m_EditorHotkeyWasPressed = true;
+	float m_EditorHotKeyChecktime = 0.0f;
 
 	// found in menus_ingame.cpp
 	STextContainerIndex m_MotdTextContainerIndex;
@@ -452,7 +482,6 @@ class CMenus : public CComponent
 	void RenderServerInfo(CUIRect MainView);
 	void RenderServerInfoMotd(CUIRect Motd);
 	void RenderServerControl(CUIRect MainView);
-	void RenderStats(CUIRect MainView);
 	bool RenderServerControlKick(CUIRect MainView, bool FilterSpectators);
 	bool RenderServerControlServer(CUIRect MainView);
 	void RenderIngameHint();
@@ -466,6 +495,7 @@ class CMenus : public CComponent
 	void Connect(const char *pAddress);
 	void PopupConfirmSwitchServer();
 	void RenderServerbrowserFilters(CUIRect View);
+	void ResetServerbrowserFilters();
 	void RenderServerbrowserDDNetFilter(CUIRect View,
 		IFilterList &Filter,
 		float ItemHeight, int MaxItems, int ItemsPerRow,
@@ -482,7 +512,7 @@ class CMenus : public CComponent
 		int m_Selection;
 		bool m_New;
 	};
-	static CUI::EPopupMenuFunctionResult PopupCountrySelection(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupCountrySelection(void *pContext, CUIRect View, bool Active);
 	void RenderServerbrowserInfo(CUIRect View);
 	void RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *pSelectedServer);
 	void RenderServerbrowserFriends(CUIRect View);
@@ -497,16 +527,7 @@ class CMenus : public CComponent
 	static void ConchainFriendlistUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainFavoritesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainCommunitiesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
-	struct SCommunityCache
-	{
-		int64_t m_UpdateTime = 0;
-		bool m_PageWithCommunities;
-		std::vector<const CCommunity *> m_vpSelectedCommunities;
-		std::vector<const CCommunityCountry *> m_vpSelectableCountries;
-		std::vector<const CCommunityType *> m_vpSelectableTypes;
-		bool m_AnyRanksAvailable;
-	};
-	SCommunityCache m_CommunityCache;
+	static void ConchainUiPageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	void UpdateCommunityCache(bool Force);
 
 	// community icons
@@ -518,49 +539,45 @@ class CMenus : public CComponent
 		char m_aPath[IO_MAX_PATH_LENGTH];
 		int m_StorageType;
 		bool m_Success = false;
-		CImageInfo m_ImageInfo;
 		SHA256_DIGEST m_Sha256;
 
 		CAbstractCommunityIconJob(CMenus *pMenus, const char *pCommunityId, int StorageType);
-		virtual ~CAbstractCommunityIconJob();
+		virtual ~CAbstractCommunityIconJob(){};
 
 	public:
 		const char *CommunityId() const { return m_aCommunityId; }
 		bool Success() const { return m_Success; }
-		CImageInfo &&ImageInfo() { return std::move(m_ImageInfo); }
-		SHA256_DIGEST &&Sha256() { return std::move(m_Sha256); }
+		const SHA256_DIGEST &Sha256() const { return m_Sha256; }
 	};
+
 	class CCommunityIconLoadJob : public IJob, public CAbstractCommunityIconJob
 	{
+		CImageInfo m_ImageInfo;
+
 	protected:
 		void Run() override;
 
 	public:
 		CCommunityIconLoadJob(CMenus *pMenus, const char *pCommunityId, int StorageType);
+		~CCommunityIconLoadJob();
+
+		CImageInfo &ImageInfo() { return m_ImageInfo; }
 	};
+
 	class CCommunityIconDownloadJob : public CHttpRequest, public CAbstractCommunityIconJob
 	{
-	protected:
-		int OnCompletion(int State) override;
-
 	public:
 		CCommunityIconDownloadJob(CMenus *pMenus, const char *pCommunityId, const char *pUrl, const SHA256_DIGEST &Sha256);
 	};
-	struct SCommunityIcon
-	{
-		char m_aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
-		SHA256_DIGEST m_Sha256;
-		IGraphics::CTextureHandle m_OrgTexture;
-		IGraphics::CTextureHandle m_GreyTexture;
-	};
+
 	std::vector<SCommunityIcon> m_vCommunityIcons;
 	std::deque<std::shared_ptr<CCommunityIconLoadJob>> m_CommunityIconLoadJobs;
 	std::deque<std::shared_ptr<CCommunityIconDownloadJob>> m_CommunityIconDownloadJobs;
-	int64_t m_CommunityIconsUpdateTime = 0;
+	SHA256_DIGEST m_CommunityIconsInfoSha256 = SHA256_ZEROED;
 	static int CommunityIconScan(const char *pName, int IsDir, int DirType, void *pUser);
 	const SCommunityIcon *FindCommunityIcon(const char *pCommunityId);
 	bool LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &Info, SHA256_DIGEST &Sha256);
-	void LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &&Info, SHA256_DIGEST &&Sha256);
+	void LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &Info, const SHA256_DIGEST &Sha256);
 	void RenderCommunityIcon(const SCommunityIcon *pIcon, CUIRect Rect, bool Active);
 	void UpdateCommunityIcons();
 
@@ -576,9 +593,13 @@ class CMenus : public CComponent
 	bool RenderLanguageSelection(CUIRect MainView);
 	void RenderThemeSelection(CUIRect MainView);
 	void RenderSettingsGeneral(CUIRect MainView);
-	int RenderSettingsPlayer(CUIRect MainView);
+	void RenderSettingsPlayer(CUIRect MainView);
 	void RenderSettingsDummyPlayer(CUIRect MainView);
 	void RenderSettingsTee(CUIRect MainView);
+	void RenderSettingsTee7(CUIRect MainView);
+	void RenderSettingsTeeCustom7(CUIRect MainView);
+	void RenderSkinSelection7(CUIRect MainView);
+	void RenderSkinPartSelection7(CUIRect MainView);
 	void RenderSettingsControls(CUIRect MainView);
 	void ResetSettingsControls();
 	void RenderSettingsGraphics(CUIRect MainView);
@@ -586,6 +607,36 @@ class CMenus : public CComponent
 	void RenderSettings(CUIRect MainView);
 	void RenderSettingsCustom(CUIRect MainView);
 
+	class CMapListItem
+	{
+	public:
+		char m_aFilename[IO_MAX_PATH_LENGTH];
+		bool m_IsDirectory;
+	};
+	class CPopupMapPickerContext
+	{
+	public:
+		std::vector<CMapListItem> m_vMaps;
+		char m_aCurrentMapFolder[IO_MAX_PATH_LENGTH] = "";
+		static int MapListFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser);
+		void MapListPopulate();
+		CMenus *m_pMenus;
+		int m_Selection;
+	};
+
+	static bool CompareFilenameAscending(const CMapListItem Lhs, const CMapListItem Rhs)
+	{
+		if(str_comp(Lhs.m_aFilename, "..") == 0)
+			return true;
+		if(str_comp(Rhs.m_aFilename, "..") == 0)
+			return false;
+		if(Lhs.m_IsDirectory != Rhs.m_IsDirectory)
+			return Lhs.m_IsDirectory;
+		return str_comp_filenames(Lhs.m_aFilename, Rhs.m_aFilename) < 0;
+	}
+
+	static CUi::EPopupMenuFunctionResult PopupMapPicker(void *pContext, CUIRect View, bool Active);
+
 	void SetNeedSendInfo();
 	void SetActive(bool Active);
 	void UpdateColors();
@@ -594,13 +645,9 @@ class CMenus : public CComponent
 
 	bool CheckHotKey(int Key) const;
 
-	class CMenuBackground *m_pBackground;
-
 public:
 	void RenderBackground();
 
-	void SetMenuBackground(class CMenuBackground *pBackground) { m_pBackground = pBackground; }
-
 	static CMenusKeyBinder m_Binder;
 
 	CMenus();
@@ -618,6 +665,7 @@ class CMenus : public CComponent
 
 	virtual void OnStateChange(int NewState, int OldState) override;
 	virtual void OnWindowResize() override;
+	virtual void OnRefreshSkins() override;
 	virtual void OnReset() override;
 	virtual void OnRender() override;
 	virtual bool OnInput(const IInput::CEvent &Event) override;
@@ -630,16 +678,17 @@ class CMenus : public CComponent
 		PAGE_GAME,
 		PAGE_PLAYERS,
 		PAGE_SERVER_INFO,
-		PAGE_STATS,
 		PAGE_CALLVOTE,
 		PAGE_INTERNET,
 		PAGE_LAN,
 		PAGE_FAVORITES,
-		PAGE_DDNET_LEGACY, // removed, redirects to PAGE_INTERNET
-		PAGE_KOG_LEGACY, // removed, redirects to PAGE_INTERNET //fuckers ;c
+		PAGE_FAVORITE_COMMUNITY_1,
+		PAGE_FAVORITE_COMMUNITY_2,
+		PAGE_FAVORITE_COMMUNITY_3,
+		PAGE_FAVORITE_COMMUNITY_4,
+		PAGE_FAVORITE_COMMUNITY_5,
 		PAGE_DEMOS,
 		PAGE_SETTINGS,
-		PAGE_SYSTEM,
 		PAGE_NETWORK,
 		PAGE_GHOST,
 
@@ -655,8 +704,6 @@ class CMenus : public CComponent
 		SETTINGS_SOUND,
 		SETTINGS_DDNET,
 		SETTINGS_ASSETS,
-		SETTINGS_STA,
-		SETTINGS_PROFILES,
 
 		SETTINGS_LENGTH,
 
@@ -664,7 +711,11 @@ class CMenus : public CComponent
 		BIG_TAB_INTERNET,
 		BIG_TAB_LAN,
 		BIG_TAB_FAVORITES,
-		BIG_TAB_STATS,
+		BIT_TAB_FAVORITE_COMMUNITY_1,
+		BIT_TAB_FAVORITE_COMMUNITY_2,
+		BIT_TAB_FAVORITE_COMMUNITY_3,
+		BIT_TAB_FAVORITE_COMMUNITY_4,
+		BIT_TAB_FAVORITE_COMMUNITY_5,
 		BIG_TAB_DEMOS,
 
 		BIG_TAB_LENGTH,
@@ -687,7 +738,7 @@ class CMenus : public CComponent
 	SUIAnimator m_aAnimatorsSettingsTab[SETTINGS_LENGTH];
 
 	// DDRace
-	int DoButton_CheckBox_Tristate(const void *pID, const char *pText, TRISTATE Checked, const CUIRect *pRect);
+	int DoButton_CheckBox_Tristate(const void *pId, const char *pText, TRISTATE Checked, const CUIRect *pRect);
 	std::vector<CDemoItem> m_vDemos;
 	std::vector<CDemoItem *> m_vpFilteredDemos;
 	void DemolistPopulate();
@@ -718,6 +769,14 @@ class CMenus : public CComponent
 		bool HasFile() const { return m_aFilename[0]; }
 	};
 
+	enum
+	{
+		GHOST_SORT_NONE = -1,
+		GHOST_SORT_NAME,
+		GHOST_SORT_TIME,
+		GHOST_SORT_DATE,
+	};
+
 	std::vector<CGhostItem> m_vGhosts;
 
 	std::chrono::nanoseconds m_GhostPopulateStartTime{0};
@@ -726,8 +785,8 @@ class CMenus : public CComponent
 	CGhostItem *GetOwnGhost();
 	void UpdateOwnGhost(CGhostItem Item);
 	void DeleteGhostItem(int Index);
+	void SortGhostlist();
 
-	int GetCurPopup() const { return m_Popup; }
 	bool CanDisplayWarning() const;
 
 	void PopupWarning(const char *pTopic, const char *pBody, const char *pButton, std::chrono::nanoseconds Duration);
@@ -744,7 +803,6 @@ class CMenus : public CComponent
 		POPUP_CONFIRM, // generic confirmation popup (two buttons)
 		POPUP_FIRST_LAUNCH,
 		POPUP_POINTS,
-		POPUP_CONNECTING,
 		POPUP_DISCONNECTED,
 		POPUP_LANGUAGE,
 		POPUP_RENAME_DEMO,
@@ -752,7 +810,9 @@ class CMenus : public CComponent
 		POPUP_RENDER_DONE,
 		POPUP_PASSWORD,
 		POPUP_QUIT,
+		POPUP_RESTART,
 		POPUP_WARNING,
+		POPUP_SAVE_SKIN,
 
 		// demo player states
 		DEMOPLAYER_NONE = 0,
@@ -762,20 +822,17 @@ class CMenus : public CComponent
 private:
 	static int GhostlistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser);
 	void SetMenuPage(int NewPage);
-	void RefreshBrowserTab(int UiPage);
+	void RefreshBrowserTab(bool Force);
 
 	// found in menus_ingame.cpp
 	void RenderInGameNetwork(CUIRect MainView);
 	void RenderGhost(CUIRect MainView);
 
 	// found in menus_settings.cpp
-	void RenderSettingsProfiles(CUIRect MainView);
 	void RenderSettingsDDNet(CUIRect MainView);
 	void RenderSettingsAppearance(CUIRect MainView);
-	void RenderSettingsStA(CUIRect MainView);
-	ColorHSLA RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha = false, bool ClampedLight = false);
+	bool RenderHslaScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha, float DarkestLight);
 
 	CServerProcess m_ServerProcess;
-	void RotateLabel(CUIRect rect, void *pVoid, const char *str, float d, ETextAlignment alignment, SLabelProperties properties, int i, void *pVoid1, float d1);
 };
 #endif
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp
index 34d0250a11..ac5e3328be 100644
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@@ -5,6 +5,7 @@
 #include <engine/engine.h>
 #include <engine/favorites.h>
 #include <engine/friends.h>
+#include <engine/gfx/image_manipulation.h>
 #include <engine/keys.h>
 #include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
@@ -30,10 +31,10 @@ static void FormatServerbrowserPing(char (&aBuffer)[N], const CServerInfo *pInfo
 {
 	if(!pInfo->m_LatencyIsEstimated)
 	{
-		str_from_int(pInfo->m_Latency, aBuffer);
+		str_format(aBuffer, sizeof(aBuffer), "%d", pInfo->m_Latency);
 		return;
 	}
-	static const char *LOCATION_NAMES[CServerInfo::NUM_LOCS] = {
+	static const char *const LOCATION_NAMES[CServerInfo::NUM_LOCS] = {
 		"", // LOC_UNKNOWN
 		Localizable("AFR"), // LOC_AFRICA
 		Localizable("ASI"), // LOC_ASIA
@@ -55,11 +56,18 @@ static ColorRGBA GetPingTextColor(int Latency)
 static ColorRGBA GetGametypeTextColor(const char *pGametype)
 {
 	ColorHSLA HslaColor;
-	if(str_comp(pGametype, "DM") == 0 || str_comp(pGametype, "TDM") == 0 || str_comp(pGametype, "CTF") == 0)
+	if(str_comp(pGametype, "DM") == 0 || str_comp(pGametype, "TDM") == 0 || str_comp(pGametype, "CTF") == 0 || str_comp(pGametype, "LMS") == 0 || str_comp(pGametype, "LTS") == 0)
 		HslaColor = ColorHSLA(0.33f, 1.0f, 0.75f);
 	else if(str_find_nocase(pGametype, "catch"))
 		HslaColor = ColorHSLA(0.17f, 1.0f, 0.75f);
-	else if(str_find_nocase(pGametype, "idm") || str_find_nocase(pGametype, "itdm") || str_find_nocase(pGametype, "ictf") || str_find_nocase(pGametype, "f-ddrace"))
+	else if(str_find_nocase(pGametype, "dm") || str_find_nocase(pGametype, "tdm") || str_find_nocase(pGametype, "ctf") || str_find_nocase(pGametype, "lms") || str_find_nocase(pGametype, "lts"))
+	{
+		if(pGametype[0] == 'i' || pGametype[0] == 'g')
+			HslaColor = ColorHSLA(0.0f, 1.0f, 0.75f);
+		else
+			HslaColor = ColorHSLA(0.40f, 1.0f, 0.75f);
+	}
+	else if(str_find_nocase(pGametype, "f-ddrace") || str_find_nocase(pGametype, "freeze"))
 		HslaColor = ColorHSLA(0.0f, 1.0f, 0.75f);
 	else if(str_find_nocase(pGametype, "fng"))
 		HslaColor = ColorHSLA(0.83f, 1.0f, 0.75f);
@@ -92,7 +100,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 
 	struct SColumn
 	{
-		int m_ID;
+		int m_Id;
 		int m_Sort;
 		const char *m_pCaption;
 		int m_Direction;
@@ -108,6 +116,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 		COL_NAME,
 		COL_GAMETYPE,
 		COL_MAP,
+		COL_FRIENDS,
 		COL_PLAYERS,
 		COL_PING,
 
@@ -135,7 +144,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 		{COL_NAME, IServerBrowser::SORT_NAME, Localizable("Name"), 0, 50.0f, {0}},
 		{COL_GAMETYPE, IServerBrowser::SORT_GAMETYPE, Localizable("Type"), 1, 50.0f, {0}},
 		{COL_MAP, IServerBrowser::SORT_MAP, Localizable("Map"), 1, 120.0f + (Headers.w - 480) / 8, {0}},
-		{COL_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, Localizable("Players"), 1, 85.0f, {0}},
+		{COL_FRIENDS, IServerBrowser::SORT_NUMFRIENDS, "", 1, 20.0f, {0}},
+		{COL_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, Localizable("Players"), 1, 60.0f, {0}},
 		{-1, -1, "", 1, 4.0f, {0}},
 		{COL_PING, IServerBrowser::SORT_PING, Localizable("Ping"), 1, 40.0f, {0}},
 	};
@@ -180,7 +190,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 		if(PlayersOrPing && g_Config.m_BrSortOrder == 2 && (Col.m_Sort == IServerBrowser::SORT_NUMPLAYERS || Col.m_Sort == IServerBrowser::SORT_PING))
 			Checked = 2;
 
-		if(DoButton_GridHeader(&Col.m_ID, Localize(Col.m_pCaption), Checked, &Col.m_Rect))
+		if(DoButton_GridHeader(&Col.m_Id, Localize(Col.m_pCaption), Checked, &Col.m_Rect))
 		{
 			if(Col.m_Sort != -1)
 			{
@@ -191,6 +201,15 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 				g_Config.m_BrSort = Col.m_Sort;
 			}
 		}
+
+		if(Col.m_Id == COL_FRIENDS)
+		{
+			TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+			TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+			Ui()->DoLabel(&Col.m_Rect, FONT_ICON_HEART, 14.0f, TEXTALIGN_MC);
+			TextRender()->SetRenderFlags(0);
+			TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		}
 	}
 
 	const int NumServers = ServerBrowser()->NumSortedServers();
@@ -199,14 +218,39 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 	// users misses it
 	{
 		if(!ServerBrowser()->NumServers() && ServerBrowser()->IsGettingServerlist())
-			UI()->DoLabel(&View, Localize("Getting server list from master server"), 16.0f, TEXTALIGN_MC);
+		{
+			Ui()->DoLabel(&View, Localize("Getting server list from master server"), 16.0f, TEXTALIGN_MC);
+		}
 		else if(!ServerBrowser()->NumServers())
-			UI()->DoLabel(&View, Localize("No servers found"), 16.0f, TEXTALIGN_MC);
+		{
+			if(ServerBrowser()->GetCurrentType() == IServerBrowser::TYPE_LAN)
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), Localize("No local servers found (ports %d-%d)"), IServerBrowser::LAN_PORT_BEGIN, IServerBrowser::LAN_PORT_END);
+				Ui()->DoLabel(&View, aBuf, 16.0f, TEXTALIGN_MC);
+			}
+			else
+			{
+				Ui()->DoLabel(&View, Localize("No servers found"), 16.0f, TEXTALIGN_MC);
+			}
+		}
 		else if(ServerBrowser()->NumServers() && !NumServers)
-			UI()->DoLabel(&View, Localize("No servers match your filter criteria"), 16.0f, TEXTALIGN_MC);
+		{
+			CUIRect Label, ResetButton;
+			View.HMargin((View.h - (16.0f + 18.0f + 8.0f)) / 2.0f, &Label);
+			Label.HSplitTop(16.0f, &Label, &ResetButton);
+			ResetButton.HSplitTop(8.0f, nullptr, &ResetButton);
+			ResetButton.VMargin((ResetButton.w - 200.0f) / 2.0f, &ResetButton);
+			Ui()->DoLabel(&Label, Localize("No servers match your filter criteria"), 16.0f, TEXTALIGN_MC);
+			static CButtonContainer s_ResetButton;
+			if(DoButton_Menu(&s_ResetButton, Localize("Reset filter"), 0, &ResetButton))
+			{
+				ResetServerbrowserFilters();
+			}
+		}
 	}
 
-	s_ListBox.SetActive(!UI()->IsPopupOpen());
+	s_ListBox.SetActive(!Ui()->IsPopupOpen());
 	s_ListBox.DoStart(ms_ListheaderHeight, NumServers, 1, 3, -1, &View, false);
 
 	if(m_ServerBrowserShouldRevealSelection)
@@ -222,7 +266,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
 		TextRender()->TextColor(TextColor);
 		TextRender()->TextOutlineColor(TextOutlineColor);
-		UI()->DoLabelStreamed(UIRect, pRect, pText, FontSize, TextAlign);
+		Ui()->DoLabelStreamed(UIRect, pRect, pText, FontSize, TextAlign);
 		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 		TextRender()->SetRenderFlags(0);
@@ -240,7 +284,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 
 		if(vpServerBrowserUiElements[i] == nullptr)
 		{
-			vpServerBrowserUiElements[i] = UI()->GetNewUIElement(NUM_UI_ELEMS);
+			vpServerBrowserUiElements[i] = Ui()->GetNewUIElement(NUM_UI_ELEMS);
 		}
 		CUIElement *pUiElement = vpServerBrowserUiElements[i];
 
@@ -251,8 +295,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 		if(!ListItem.m_Visible)
 		{
 			// reset active item, if not visible
-			if(UI()->CheckActiveItem(pItem))
-				UI()->SetActiveItem(nullptr);
+			if(Ui()->CheckActiveItem(pItem))
+				Ui()->SetActiveItem(nullptr);
 
 			// don't render invisible items
 			continue;
@@ -268,22 +312,22 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 			Button.h = ListItem.m_Rect.h;
 			Button.w = Col.m_Rect.w;
 
-			const int ID = Col.m_ID;
-			if(ID == COL_FLAG_LOCK)
+			const int Id = Col.m_Id;
+			if(Id == COL_FLAG_LOCK)
 			{
 				if(pItem->m_Flags & SERVER_FLAG_PASSWORD)
 				{
 					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_LOCK_ICON), &Button, ColorRGBA(0.75f, 0.75f, 0.75f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_LOCK, TEXTALIGN_MC);
 				}
 			}
-			else if(ID == COL_FLAG_FAV)
+			else if(Id == COL_FLAG_FAV)
 			{
 				if(pItem->m_Favorite != TRISTATE::NONE)
 				{
-					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FAVORITE_ICON), &Button, ColorRGBA(0.94f, 0.4f, 0.4f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_HEART, TEXTALIGN_MC);
+					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FAVORITE_ICON), &Button, ColorRGBA(1.0f, 0.85f, 0.3f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_STAR, TEXTALIGN_MC);
 				}
 			}
-			else if(ID == COL_COMMUNITY)
+			else if(Id == COL_COMMUNITY)
 			{
 				if(pCommunity != nullptr)
 				{
@@ -293,12 +337,12 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 						CUIRect CommunityIcon;
 						Button.Margin(2.0f, &CommunityIcon);
 						RenderCommunityIcon(pIcon, CommunityIcon, true);
-						UI()->DoButtonLogic(&pItem->m_aCommunityId, 0, &CommunityIcon);
+						Ui()->DoButtonLogic(&pItem->m_aCommunityId, 0, &CommunityIcon);
 						GameClient()->m_Tooltips.DoToolTip(&pItem->m_aCommunityId, &CommunityIcon, pCommunity->Name());
 					}
 				}
 			}
-			else if(ID == COL_NAME)
+			else if(Id == COL_NAME)
 			{
 				SLabelProperties Props;
 				Props.m_MaxWidth = Button.w;
@@ -307,16 +351,16 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 				bool Printed = false;
 				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_SERVERNAME))
 					Printed = PrintHighlighted(pItem->m_aName, [&](const char *pFilteredStr, const int FilterLen) {
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aName));
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aName));
 						TextRender()->TextColor(gs_HighlightedTextColor);
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_NAME_1)->m_Cursor);
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_NAME_1)->m_Cursor);
 						TextRender()->TextColor(TextRender()->DefaultTextColor());
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_NAME_2)->m_Cursor);
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_NAME_2)->m_Cursor);
 					});
 				if(!Printed)
-					UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props);
+					Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props);
 			}
-			else if(ID == COL_GAMETYPE)
+			else if(Id == COL_GAMETYPE)
 			{
 				SLabelProperties Props;
 				Props.m_MaxWidth = Button.w;
@@ -326,10 +370,10 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 				{
 					TextRender()->TextColor(GetGametypeTextColor(pItem->m_aGameType));
 				}
-				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_GAMETYPE), &Button, pItem->m_aGameType, FontSize, TEXTALIGN_ML, Props);
+				Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_GAMETYPE), &Button, pItem->m_aGameType, FontSize, TEXTALIGN_ML, Props);
 				TextRender()->TextColor(TextRender()->DefaultTextColor());
 			}
-			else if(ID == COL_MAP)
+			else if(Id == COL_MAP)
 			{
 				{
 					CUIRect Icon;
@@ -349,43 +393,41 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 				bool Printed = false;
 				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_MAPNAME))
 					Printed = PrintHighlighted(pItem->m_aMap, [&](const char *pFilteredStr, const int FilterLen) {
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aMap));
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aMap));
 						TextRender()->TextColor(gs_HighlightedTextColor);
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_MAP_1)->m_Cursor);
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_MAP_1)->m_Cursor);
 						TextRender()->TextColor(TextRender()->DefaultTextColor());
-						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_MAP_2)->m_Cursor);
+						Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_MAP_2)->m_Cursor);
 					});
 				if(!Printed)
-					UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props);
+					Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props);
 			}
-			else if(ID == COL_PLAYERS)
+			else if(Id == COL_FRIENDS)
 			{
-				Button.VMargin(2.0f, &Button);
 				if(pItem->m_FriendState != IFriends::FRIEND_NO)
 				{
-					CUIRect Icon;
-					Button.VSplitRight(50.0f, &Icon, &Button);
-					Icon.Margin(2.0f, &Icon);
-					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FRIEND_ICON), &Icon, ColorRGBA(0.94f, 0.4f, 0.4f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_HEART, TEXTALIGN_MC);
+					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FRIEND_ICON), &Button, ColorRGBA(0.94f, 0.4f, 0.4f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_HEART, TEXTALIGN_MC);
 
 					if(pItem->m_FriendNum > 1)
 					{
-						str_from_int(pItem->m_FriendNum, aTemp);
+						str_format(aTemp, sizeof(aTemp), "%d", pItem->m_FriendNum);
 						TextRender()->TextColor(0.94f, 0.8f, 0.8f, 1.0f);
-						UI()->DoLabel(&Icon, aTemp, 9.0f, TEXTALIGN_MC);
+						Ui()->DoLabel(&Button, aTemp, 9.0f, TEXTALIGN_MC);
 						TextRender()->TextColor(TextRender()->DefaultTextColor());
 					}
 				}
-
+			}
+			else if(Id == COL_PLAYERS)
+			{
 				str_format(aTemp, sizeof(aTemp), "%i/%i", pItem->m_NumFilteredPlayers, ServerBrowser()->Max(*pItem));
 				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_PLAYER))
 				{
 					TextRender()->TextColor(gs_HighlightedTextColor);
 				}
-				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PLAYERS), &Button, aTemp, FontSize, TEXTALIGN_MR);
+				Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PLAYERS), &Button, aTemp, FontSize, TEXTALIGN_MR);
 				TextRender()->TextColor(TextRender()->DefaultTextColor());
 			}
-			else if(ID == COL_PING)
+			else if(Id == COL_PING)
 			{
 				Button.VMargin(4.0f, &Button);
 				FormatServerbrowserPing(aTemp, pItem);
@@ -393,7 +435,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemAct
 				{
 					TextRender()->TextColor(GetPingTextColor(pItem->m_Latency));
 				}
-				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PING), &Button, aTemp, FontSize, TEXTALIGN_MR);
+				Ui()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PING), &Button, aTemp, FontSize, TEXTALIGN_MR);
 				TextRender()->TextColor(TextRender()->DefaultTextColor());
 			}
 		}
@@ -464,7 +506,7 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 	{
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 16.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 16.0f, TEXTALIGN_ML);
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 		QuickSearch.VSplitLeft(ExcludeSearchIconMax, nullptr, &QuickSearch);
@@ -472,17 +514,20 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 
 		char aBufSearch[64];
 		str_format(aBufSearch, sizeof(aBufSearch), "%s:", Localize("Search"));
-		UI()->DoLabel(&QuickSearch, aBufSearch, 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&QuickSearch, aBufSearch, 14.0f, TEXTALIGN_ML);
 		QuickSearch.VSplitLeft(SearchExcludeAddrStrMax, nullptr, &QuickSearch);
 		QuickSearch.VSplitLeft(5.0f, nullptr, &QuickSearch);
 
 		static CLineInput s_FilterInput(g_Config.m_BrFilterString, sizeof(g_Config.m_BrFilterString));
-		if(!UI()->IsPopupOpen() && Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
+		static char s_aTooltipText[64];
+		str_format(s_aTooltipText, sizeof(s_aTooltipText), "%s: \"solo; nameless tee; kobra 2\"", Localize("Example of usage"));
+		GameClient()->m_Tooltips.DoToolTip(&s_FilterInput, &QuickSearch, s_aTooltipText);
+		if(!Ui()->IsPopupOpen() && Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
 		{
-			UI()->SetActiveItem(&s_FilterInput);
+			Ui()->SetActiveItem(&s_FilterInput);
 			s_FilterInput.SelectAll();
 		}
-		if(UI()->DoClearableEditBox(&s_FilterInput, &QuickSearch, 12.0f))
+		if(Ui()->DoClearableEditBox(&s_FilterInput, &QuickSearch, 12.0f))
 			Client()->ServerBrowserUpdate();
 	}
 
@@ -490,7 +535,7 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 	{
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-		UI()->DoLabel(&QuickExclude, FONT_ICON_BAN, 16.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&QuickExclude, FONT_ICON_BAN, 16.0f, TEXTALIGN_ML);
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 		QuickExclude.VSplitLeft(ExcludeSearchIconMax, nullptr, &QuickExclude);
@@ -498,17 +543,20 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 
 		char aBufExclude[64];
 		str_format(aBufExclude, sizeof(aBufExclude), "%s:", Localize("Exclude"));
-		UI()->DoLabel(&QuickExclude, aBufExclude, 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&QuickExclude, aBufExclude, 14.0f, TEXTALIGN_ML);
 		QuickExclude.VSplitLeft(SearchExcludeAddrStrMax, nullptr, &QuickExclude);
 		QuickExclude.VSplitLeft(5.0f, nullptr, &QuickExclude);
 
 		static CLineInput s_ExcludeInput(g_Config.m_BrExcludeString, sizeof(g_Config.m_BrExcludeString));
-		if(!UI()->IsPopupOpen() && Input()->KeyPress(KEY_X) && Input()->ShiftIsPressed() && Input()->ModifierIsPressed())
+		static char s_aTooltipText[64];
+		str_format(s_aTooltipText, sizeof(s_aTooltipText), "%s: \"CHN; [A]\"", Localize("Example of usage"));
+		GameClient()->m_Tooltips.DoToolTip(&s_ExcludeInput, &QuickSearch, s_aTooltipText);
+		if(!Ui()->IsPopupOpen() && Input()->KeyPress(KEY_X) && Input()->ShiftIsPressed() && Input()->ModifierIsPressed())
 		{
-			UI()->SetActiveItem(&s_ExcludeInput);
+			Ui()->SetActiveItem(&s_ExcludeInput);
 			s_ExcludeInput.SelectAll();
 		}
-		if(UI()->DoClearableEditBox(&s_ExcludeInput, &QuickExclude, 12.0f))
+		if(Ui()->DoClearableEditBox(&s_ExcludeInput, &QuickExclude, 12.0f))
 			Client()->ServerBrowserUpdate();
 	}
 
@@ -522,13 +570,13 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 			str_format(aBuf, sizeof(aBuf), Localize("%d of %d servers"), ServerBrowser()->NumSortedServers(), ServerBrowser()->NumServers());
 		else
 			str_format(aBuf, sizeof(aBuf), Localize("%d of %d server"), ServerBrowser()->NumSortedServers(), ServerBrowser()->NumServers());
-		UI()->DoLabel(&ServersOnline, aBuf, 12.0f, TEXTALIGN_MR);
+		Ui()->DoLabel(&ServersOnline, aBuf, 12.0f, TEXTALIGN_MR);
 
 		if(ServerBrowser()->NumSortedPlayers() != 1)
 			str_format(aBuf, sizeof(aBuf), Localize("%d players"), ServerBrowser()->NumSortedPlayers());
 		else
 			str_format(aBuf, sizeof(aBuf), Localize("%d player"), ServerBrowser()->NumSortedPlayers());
-		UI()->DoLabel(&PlayersOnline, aBuf, 12.0f, TEXTALIGN_MR);
+		Ui()->DoLabel(&PlayersOnline, aBuf, 12.0f, TEXTALIGN_MR);
 	}
 
 	// address info
@@ -537,9 +585,9 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 		ServerAddr.Margin(2.0f, &ServerAddr);
 		ServerAddr.VSplitLeft(SearchExcludeAddrStrMax + 5.0f + ExcludeSearchIconMax + 5.0f, &ServerAddrLabel, &ServerAddrEditBox);
 
-		UI()->DoLabel(&ServerAddrLabel, Localize("Server address:"), 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&ServerAddrLabel, Localize("Server address:"), 14.0f, TEXTALIGN_ML);
 		static CLineInput s_ServerAddressInput(g_Config.m_UiServerAddress, sizeof(g_Config.m_UiServerAddress));
-		if(UI()->DoClearableEditBox(&s_ServerAddressInput, &ServerAddrEditBox, 12.0f))
+		if(Ui()->DoClearableEditBox(&s_ServerAddressInput, &ServerAddrEditBox, 12.0f))
 			m_ServerBrowserShouldRevealSelection = true;
 	}
 
@@ -564,9 +612,9 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 			Props.m_UseIconFont = true;
 
 			static CButtonContainer s_RefreshButton;
-			if(UI()->DoButton_Menu(m_RefreshButton, &s_RefreshButton, RefreshLabelFunc, &ButtonRefresh, Props) || (!UI()->IsPopupOpen() && (Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))))
+			if(Ui()->DoButton_Menu(m_RefreshButton, &s_RefreshButton, RefreshLabelFunc, &ButtonRefresh, Props) || (!Ui()->IsPopupOpen() && (Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))))
 			{
-				RefreshBrowserTab(g_Config.m_UiPage);
+				RefreshBrowserTab(true);
 			}
 		}
 
@@ -579,7 +627,7 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem
 			Props.m_Color = ColorRGBA(0.5f, 1.0f, 0.5f, 0.5f);
 
 			static CButtonContainer s_ConnectButton;
-			if(UI()->DoButton_Menu(m_ConnectButton, &s_ConnectButton, ConnectLabelFunc, &ButtonConnect, Props) || WasListboxItemActivated || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+			if(Ui()->DoButton_Menu(m_ConnectButton, &s_ConnectButton, ConnectLabelFunc, &ButtonConnect, Props) || WasListboxItemActivated || (!Ui()->IsPopupOpen() && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 			{
 				Connect(g_Config.m_UiServerAddress);
 			}
@@ -606,7 +654,7 @@ void CMenus::PopupConfirmSwitchServer()
 void CMenus::RenderServerbrowserFilters(CUIRect View)
 {
 	const float RowHeight = 18.0f;
-	const float FontSize = (RowHeight - 4.0f) * CUI::ms_FontmodHeight; // based on DoButton_CheckBox
+	const float FontSize = (RowHeight - 4.0f) * CUi::ms_FontmodHeight; // based on DoButton_CheckBox
 
 	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
 	View.Margin(5.0f, &View);
@@ -635,26 +683,30 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
 	if(DoButton_CheckBox(&g_Config.m_BrFilterPw, Localize("No password"), g_Config.m_BrFilterPw, &Button))
 		g_Config.m_BrFilterPw ^= 1;
 
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterLogin, Localize("No login required"), g_Config.m_BrFilterLogin, &Button))
+		g_Config.m_BrFilterLogin ^= 1;
+
 	View.HSplitTop(RowHeight, &Button, &View);
 	if(DoButton_CheckBox(&g_Config.m_BrFilterGametypeStrict, Localize("Strict gametype filter"), g_Config.m_BrFilterGametypeStrict, &Button))
 		g_Config.m_BrFilterGametypeStrict ^= 1;
 
 	View.HSplitTop(3.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Button, &View);
-	UI()->DoLabel(&Button, Localize("Game types:"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Button, Localize("Game types:"), FontSize, TEXTALIGN_ML);
 	Button.VSplitRight(60.0f, nullptr, &Button);
 	static CLineInput s_GametypeInput(g_Config.m_BrFilterGametype, sizeof(g_Config.m_BrFilterGametype));
-	if(UI()->DoEditBox(&s_GametypeInput, &Button, FontSize))
+	if(Ui()->DoEditBox(&s_GametypeInput, &Button, FontSize))
 		Client()->ServerBrowserUpdate();
 
 	// server address
 	View.HSplitTop(6.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Button, &View);
 	View.HSplitTop(6.0f, nullptr, &View);
-	UI()->DoLabel(&Button, Localize("Server address:"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Button, Localize("Server address:"), FontSize, TEXTALIGN_ML);
 	Button.VSplitRight(60.0f, nullptr, &Button);
 	static CLineInput s_FilterServerAddressInput(g_Config.m_BrFilterServerAddress, sizeof(g_Config.m_BrFilterServerAddress));
-	if(UI()->DoEditBox(&s_FilterServerAddressInput, &Button, FontSize))
+	if(Ui()->DoEditBox(&s_FilterServerAddressInput, &Button, FontSize))
 		Client()->ServerBrowserUpdate();
 
 	// player country
@@ -668,16 +720,16 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
 		const float OldWidth = Flag.w;
 		Flag.w = Flag.h * 2.0f;
 		Flag.x += (OldWidth - Flag.w) / 2.0f;
-		m_pClient->m_CountryFlags.Render(g_Config.m_BrFilterCountryIndex, ColorRGBA(1.0f, 1.0f, 1.0f, UI()->HotItem() == &g_Config.m_BrFilterCountryIndex ? 1.0f : g_Config.m_BrFilterCountry ? 0.9f : 0.5f), Flag.x, Flag.y, Flag.w, Flag.h);
+		m_pClient->m_CountryFlags.Render(g_Config.m_BrFilterCountryIndex, ColorRGBA(1.0f, 1.0f, 1.0f, Ui()->HotItem() == &g_Config.m_BrFilterCountryIndex ? 1.0f : g_Config.m_BrFilterCountry ? 0.9f : 0.5f), Flag.x, Flag.y, Flag.w, Flag.h);
 
-		if(UI()->DoButtonLogic(&g_Config.m_BrFilterCountryIndex, 0, &Flag))
+		if(Ui()->DoButtonLogic(&g_Config.m_BrFilterCountryIndex, 0, &Flag))
 		{
 			static SPopupMenuId s_PopupCountryId;
 			static SPopupCountrySelectionContext s_PopupCountryContext;
 			s_PopupCountryContext.m_pMenus = this;
 			s_PopupCountryContext.m_Selection = g_Config.m_BrFilterCountryIndex;
 			s_PopupCountryContext.m_New = true;
-			UI()->DoPopupMenu(&s_PopupCountryId, Flag.x, Flag.y + Flag.h, 490, 210, &s_PopupCountryContext, PopupCountrySelection);
+			Ui()->DoPopupMenu(&s_PopupCountryId, Flag.x, Flag.y + Flag.h, 490, 210, &s_PopupCountryContext, PopupCountrySelection);
 		}
 	}
 
@@ -685,23 +737,8 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
 	if(DoButton_CheckBox(&g_Config.m_BrFilterConnectingPlayers, Localize("Filter connecting players"), g_Config.m_BrFilterConnectingPlayers, &Button))
 		g_Config.m_BrFilterConnectingPlayers ^= 1;
 
-	// community filter
-	if((g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES) && !ServerBrowser()->Communities().empty())
-	{
-		CUIRect Row;
-		View.HSplitTop(6.0f, nullptr, &View);
-		View.HSplitTop(19.0f, &Row, &View);
-		Row.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_T, 4.0f);
-		UI()->DoLabel(&Row, Localize("Communities"), 12.0f, TEXTALIGN_MC);
-
-		View.HSplitTop(4.0f * 17.0f + CScrollRegion::HEIGHT_MAGIC_FIX, &Row, &View);
-		View.HSplitTop(3.0f, nullptr, &View);
-		Row.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
-		RenderServerbrowserCommunitiesFilter(Row);
-	}
-
 	// map finish filters
-	if(m_CommunityCache.m_AnyRanksAvailable)
+	if(ServerBrowser()->CommunityCache().AnyRanksAvailable())
 	{
 		View.HSplitTop(RowHeight, &Button, &View);
 		if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, Localize("Indicate map finish"), g_Config.m_BrIndicateFinished, &Button))
@@ -723,7 +760,8 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
 		}
 	}
 
-	if(!m_CommunityCache.m_vpSelectableCountries.empty() || !m_CommunityCache.m_vpSelectableTypes.empty())
+	// countries and types filters
+	if(ServerBrowser()->CommunityCache().CountriesTypesFilterAvailable())
 	{
 		const ColorRGBA ColorActive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f);
 		const ColorRGBA ColorInactive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f);
@@ -767,26 +805,43 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
 	static CButtonContainer s_ResetButton;
 	if(DoButton_Menu(&s_ResetButton, Localize("Reset filter"), 0, &ResetButton))
 	{
-		g_Config.m_BrFilterString[0] = '\0';
-		g_Config.m_BrExcludeString[0] = '\0';
-		g_Config.m_BrFilterFull = 0;
-		g_Config.m_BrFilterEmpty = 0;
-		g_Config.m_BrFilterSpectators = 0;
-		g_Config.m_BrFilterFriends = 0;
-		g_Config.m_BrFilterCountry = 0;
-		g_Config.m_BrFilterCountryIndex = -1;
-		g_Config.m_BrFilterPw = 0;
-		g_Config.m_BrFilterGametype[0] = '\0';
-		g_Config.m_BrFilterGametypeStrict = 0;
-		g_Config.m_BrFilterConnectingPlayers = 1;
-		g_Config.m_BrFilterUnfinishedMap = 0;
-		g_Config.m_BrFilterServerAddress[0] = '\0';
-		ConfigManager()->Reset("br_filter_exclude_communities");
-		ConfigManager()->Reset("br_filter_exclude_countries");
-		ConfigManager()->Reset("br_filter_exclude_types");
-		Client()->ServerBrowserUpdate();
+		ResetServerbrowserFilters();
+	}
+}
+
+void CMenus::ResetServerbrowserFilters()
+{
+	g_Config.m_BrFilterString[0] = '\0';
+	g_Config.m_BrExcludeString[0] = '\0';
+	g_Config.m_BrFilterFull = 0;
+	g_Config.m_BrFilterEmpty = 0;
+	g_Config.m_BrFilterSpectators = 0;
+	g_Config.m_BrFilterFriends = 0;
+	g_Config.m_BrFilterCountry = 0;
+	g_Config.m_BrFilterCountryIndex = -1;
+	g_Config.m_BrFilterPw = 0;
+	g_Config.m_BrFilterGametype[0] = '\0';
+	g_Config.m_BrFilterGametypeStrict = 0;
+	g_Config.m_BrFilterConnectingPlayers = 1;
+	g_Config.m_BrFilterServerAddress[0] = '\0';
+	g_Config.m_BrFilterLogin = true;
+
+	if(g_Config.m_UiPage != PAGE_LAN)
+	{
+		if(ServerBrowser()->CommunityCache().AnyRanksAvailable())
+		{
+			g_Config.m_BrFilterUnfinishedMap = 0;
+		}
+		if(g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES)
+		{
+			ServerBrowser()->CommunitiesFilter().Clear();
+		}
+		ServerBrowser()->CountriesFilter().Clear();
+		ServerBrowser()->TypesFilter().Clear();
 		UpdateCommunityCache(true);
 	}
+
+	Client()->ServerBrowserUpdate();
 }
 
 void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
@@ -823,7 +878,7 @@ void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
 		const char *pName = GetItemName(ItemIndex);
 		const bool Active = !Filter.Filtered(pName);
 
-		const int Click = UI()->DoButtonLogic(pItemId, 0, &Item);
+		const int Click = Ui()->DoButtonLogic(pItemId, 0, &Item);
 		if(Click == 1 || Click == 2)
 		{
 			// left/right click to toggle filter
@@ -831,17 +886,23 @@ void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
 			{
 				if(Click == 1)
 				{
-					// Left click: when all are active, only activate one
+					// Left click: when all are active, only activate one and none
 					for(int j = 0; j < MaxItems; ++j)
 					{
-						if(j != ItemIndex)
-							Filter.Add(GetItemName(j));
+						if(const char *pItemName = GetItemName(j);
+							j != ItemIndex &&
+							!((&Filter == &ServerBrowser()->CountriesFilter() && str_comp(pItemName, IServerBrowser::COMMUNITY_COUNTRY_NONE) == 0) ||
+								(&Filter == &ServerBrowser()->TypesFilter() && str_comp(pItemName, IServerBrowser::COMMUNITY_TYPE_NONE) == 0)))
+							Filter.Add(pItemName);
 					}
 				}
 				else if(Click == 2)
 				{
 					// Right click: when all are active, only deactivate one
-					Filter.Add(GetItemName(ItemIndex));
+					if(MaxItems >= 2)
+					{
+						Filter.Add(GetItemName(ItemIndex));
+					}
 				}
 			}
 			else
@@ -849,16 +910,23 @@ void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
 				bool AllFilteredExceptUs = true;
 				for(int j = 0; j < MaxItems; ++j)
 				{
-					if(j != ItemIndex && !Filter.Filtered(GetItemName(j)))
+					if(const char *pItemName = GetItemName(j);
+						j != ItemIndex && !Filter.Filtered(pItemName) &&
+						!((&Filter == &ServerBrowser()->CountriesFilter() && str_comp(pItemName, IServerBrowser::COMMUNITY_COUNTRY_NONE) == 0) ||
+							(&Filter == &ServerBrowser()->TypesFilter() && str_comp(pItemName, IServerBrowser::COMMUNITY_TYPE_NONE) == 0)))
 					{
 						AllFilteredExceptUs = false;
 						break;
 					}
 				}
-				// when last one is removed, reset (re-enable all)
-				if(AllFilteredExceptUs)
+				// When last one is removed, re-enable all currently selectable items.
+				// Don't use Clear, to avoid enabling also currently unselectable items.
+				if(AllFilteredExceptUs && Active)
 				{
-					Filter.Clear();
+					for(int j = 0; j < MaxItems; ++j)
+					{
+						Filter.Remove(GetItemName(j));
+					}
 				}
 				else if(Active)
 				{
@@ -876,14 +944,17 @@ void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
 		}
 		else if(Click == 3)
 		{
-			// middle click to reset (re-enable all)
-			Filter.Clear();
+			// middle click to reset (re-enable all currently selectable items)
+			for(int j = 0; j < MaxItems; ++j)
+			{
+				Filter.Remove(GetItemName(j));
+			}
 			Client()->ServerBrowserUpdate();
 			if(UpdateCommunityCacheOnChange)
 				UpdateCommunityCache(true);
 		}
 
-		if(UI()->HotItem() == pItemId && !ScrollRegion.Animating())
+		if(Ui()->HotItem() == pItemId && !ScrollRegion.Animating())
 			Item.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f), IGraphics::CORNER_ALL, 2.0f);
 		RenderItem(ItemIndex, Item, pItemId, Active);
 	}
@@ -893,11 +964,18 @@ void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
 
 void CMenus::RenderServerbrowserCommunitiesFilter(CUIRect View)
 {
+	CUIRect Tab;
+	View.HSplitTop(19.0f, &Tab, &View);
+	Tab.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_T, 4.0f);
+	Ui()->DoLabel(&Tab, Localize("Communities"), 12.0f, TEXTALIGN_MC);
+	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
+
 	const int MaxEntries = ServerBrowser()->Communities().size();
 	const int EntriesPerRow = 1;
 
 	static CScrollRegion s_ScrollRegion;
 	static std::vector<unsigned char> s_vItemIds;
+	static std::vector<unsigned char> s_vFavoriteButtonIds;
 
 	const float ItemHeight = 13.0f;
 	const float Spacing = 2.0f;
@@ -909,30 +987,46 @@ void CMenus::RenderServerbrowserCommunitiesFilter(CUIRect View)
 		return ServerBrowser()->Communities()[ItemIndex].Name();
 	};
 	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
-		const float Alpha = (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f);
+		const float Alpha = (Active ? 0.9f : 0.2f) + (Ui()->HotItem() == pItemId ? 0.1f : 0.0f);
 
-		CUIRect Icon, Label;
+		CUIRect Icon, Label, FavoriteButton;
+		Item.VSplitRight(Item.h, &Item, &FavoriteButton);
 		Item.Margin(Spacing, &Item);
 		Item.VSplitLeft(Item.h * 2.0f, &Icon, &Label);
 		Label.VSplitLeft(Spacing, nullptr, &Label);
 
-		const SCommunityIcon *pIcon = FindCommunityIcon(GetItemName(ItemIndex));
+		const char *pItemName = GetItemName(ItemIndex);
+		const SCommunityIcon *pIcon = FindCommunityIcon(pItemName);
 		if(pIcon != nullptr)
 		{
 			RenderCommunityIcon(pIcon, Icon, Active);
 		}
 
 		TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-		UI()->DoLabel(&Label, GetItemDisplayName(ItemIndex), Label.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, GetItemDisplayName(ItemIndex), Label.h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+		const bool Favorite = ServerBrowser()->FavoriteCommunitiesFilter().Filtered(pItemName);
+		if(DoButton_Favorite(&s_vFavoriteButtonIds[ItemIndex], pItemId, Favorite, &FavoriteButton))
+		{
+			if(Favorite)
+			{
+				ServerBrowser()->FavoriteCommunitiesFilter().Remove(pItemName);
+			}
+			else
+			{
+				ServerBrowser()->FavoriteCommunitiesFilter().Add(pItemName);
+			}
+		}
 	};
 
+	s_vFavoriteButtonIds.resize(MaxEntries);
 	RenderServerbrowserDDNetFilter(View, ServerBrowser()->CommunitiesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, true, GetItemName, RenderItem);
 }
 
 void CMenus::RenderServerbrowserCountriesFilter(CUIRect View)
 {
-	const int MaxEntries = m_CommunityCache.m_vpSelectableCountries.size();
+	const int MaxEntries = ServerBrowser()->CommunityCache().SelectableCountries().size();
 	const int EntriesPerRow = MaxEntries > 8 ? 5 : 4;
 
 	static CScrollRegion s_ScrollRegion;
@@ -942,14 +1036,14 @@ void CMenus::RenderServerbrowserCountriesFilter(CUIRect View)
 	const float Spacing = 2.0f;
 
 	const auto &&GetItemName = [&](int ItemIndex) {
-		return m_CommunityCache.m_vpSelectableCountries[ItemIndex]->Name();
+		return ServerBrowser()->CommunityCache().SelectableCountries()[ItemIndex]->Name();
 	};
 	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
 		Item.Margin(Spacing, &Item);
 		const float OldWidth = Item.w;
 		Item.w = Item.h * 2.0f;
 		Item.x += (OldWidth - Item.w) / 2.0f;
-		m_pClient->m_CountryFlags.Render(m_CommunityCache.m_vpSelectableCountries[ItemIndex]->FlagId(), ColorRGBA(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f)), Item.x, Item.y, Item.w, Item.h);
+		m_pClient->m_CountryFlags.Render(ServerBrowser()->CommunityCache().SelectableCountries()[ItemIndex]->FlagId(), ColorRGBA(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (Ui()->HotItem() == pItemId ? 0.1f : 0.0f)), Item.x, Item.y, Item.w, Item.h);
 	};
 
 	RenderServerbrowserDDNetFilter(View, ServerBrowser()->CountriesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, false, GetItemName, RenderItem);
@@ -957,7 +1051,7 @@ void CMenus::RenderServerbrowserCountriesFilter(CUIRect View)
 
 void CMenus::RenderServerbrowserTypesFilter(CUIRect View)
 {
-	const int MaxEntries = m_CommunityCache.m_vpSelectableTypes.size();
+	const int MaxEntries = ServerBrowser()->CommunityCache().SelectableTypes().size();
 	const int EntriesPerRow = 3;
 
 	static CScrollRegion s_ScrollRegion;
@@ -967,19 +1061,19 @@ void CMenus::RenderServerbrowserTypesFilter(CUIRect View)
 	const float Spacing = 2.0f;
 
 	const auto &&GetItemName = [&](int ItemIndex) {
-		return m_CommunityCache.m_vpSelectableTypes[ItemIndex]->Name();
+		return ServerBrowser()->CommunityCache().SelectableTypes()[ItemIndex]->Name();
 	};
 	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
 		Item.Margin(Spacing, &Item);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f));
-		UI()->DoLabel(&Item, GetItemName(ItemIndex), Item.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (Ui()->HotItem() == pItemId ? 0.1f : 0.0f));
+		Ui()->DoLabel(&Item, GetItemName(ItemIndex), Item.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	};
 
 	RenderServerbrowserDDNetFilter(View, ServerBrowser()->TypesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, false, GetItemName, RenderItem);
 }
 
-CUI::EPopupMenuFunctionResult CMenus::PopupCountrySelection(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CMenus::PopupCountrySelection(void *pContext, CUIRect View, bool Active)
 {
 	SPopupCountrySelectionContext *pPopupContext = static_cast<SPopupCountrySelectionContext *>(pContext);
 	CMenus *pMenus = pPopupContext->m_pMenus;
@@ -1011,7 +1105,7 @@ CUI::EPopupMenuFunctionResult CMenus::PopupCountrySelection(void *pContext, CUIR
 		FlagRect.x += (OldWidth - FlagRect.w) / 2.0f;
 		pMenus->m_pClient->m_CountryFlags.Render(pEntry->m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
 
-		pMenus->UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
+		pMenus->Ui()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
 	}
 
 	const int NewSelected = s_ListBox.DoEnd();
@@ -1021,10 +1115,10 @@ CUI::EPopupMenuFunctionResult CMenus::PopupCountrySelection(void *pContext, CUIR
 		g_Config.m_BrFilterCountry = 1;
 		g_Config.m_BrFilterCountryIndex = pPopupContext->m_Selection;
 		pMenus->Client()->ServerBrowserUpdate();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CMenus::RenderServerbrowserInfo(CUIRect View)
@@ -1032,7 +1126,7 @@ void CMenus::RenderServerbrowserInfo(CUIRect View)
 	const CServerInfo *pSelectedServer = ServerBrowser()->SortedGet(m_SelectedIndex);
 
 	const float RowHeight = 18.0f;
-	const float FontSize = (RowHeight - 4.0f) * CUI::ms_FontmodHeight; // based on DoButton_CheckBox
+	const float FontSize = (RowHeight - 4.0f) * CUi::ms_FontmodHeight; // based on DoButton_CheckBox
 
 	CUIRect ServerDetails, Scoreboard;
 	View.HSplitTop(4.0f * 15.0f + RowHeight + 2.0f * 5.0f + 2.0f * 2.0f, &ServerDetails, &Scoreboard);
@@ -1050,7 +1144,13 @@ void CMenus::RenderServerbrowserInfo(CUIRect View)
 			if(DoButton_Menu(&s_CopyButton, Localize("Copy info"), 0, &Button))
 			{
 				char aInfo[256];
-				pSelectedServer->InfoToString(aInfo, sizeof(aInfo));
+				str_format(
+					aInfo,
+					sizeof(aInfo),
+					"%s\n"
+					"Address: ddnet://%s\n",
+					pSelectedServer->m_aName,
+					pSelectedServer->m_aAddress);
 				Input()->SetClipboardText(aInfo);
 			}
 		}
@@ -1094,30 +1194,30 @@ void CMenus::RenderServerbrowserInfo(CUIRect View)
 		ServerDetails.VSplitLeft(80.0f, &LeftColumn, &RightColumn);
 
 		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
-		UI()->DoLabel(&Row, Localize("Version"), FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, Localize("Version"), FontSize, TEXTALIGN_ML);
 
 		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
-		UI()->DoLabel(&Row, pSelectedServer->m_aVersion, FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, pSelectedServer->m_aVersion, FontSize, TEXTALIGN_ML);
 
 		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
-		UI()->DoLabel(&Row, Localize("Game type"), FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, Localize("Game type"), FontSize, TEXTALIGN_ML);
 
 		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
-		UI()->DoLabel(&Row, pSelectedServer->m_aGameType, FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, pSelectedServer->m_aGameType, FontSize, TEXTALIGN_ML);
 
 		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
-		UI()->DoLabel(&Row, Localize("Ping"), FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, Localize("Ping"), FontSize, TEXTALIGN_ML);
 
 		char aTemp[16];
 		FormatServerbrowserPing(aTemp, pSelectedServer);
 		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
-		UI()->DoLabel(&Row, aTemp, FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Row, aTemp, FontSize, TEXTALIGN_ML);
 
 		RenderServerbrowserInfoScoreboard(Scoreboard, pSelectedServer);
 	}
 	else
 	{
-		UI()->DoLabel(&ServerDetails, Localize("No server selected"), FontSize, TEXTALIGN_MC);
+		Ui()->DoLabel(&ServerDetails, Localize("No server selected"), FontSize, TEXTALIGN_MC);
 	}
 }
 
@@ -1185,7 +1285,7 @@ void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *
 		}
 		else if(pSelectedServer->m_ClientScoreKind == CServerInfo::CLIENT_SCORE_KIND_POINTS)
 		{
-			str_from_int(CurrentClient.m_Score, aTemp);
+			str_format(aTemp, sizeof(aTemp), "%d", CurrentClient.m_Score);
 		}
 		else
 		{
@@ -1214,7 +1314,7 @@ void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *
 			}
 		}
 
-		UI()->DoLabel(&Score, aTemp, FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Score, aTemp, FontSize, TEXTALIGN_ML);
 
 		// render tee if available
 		if(CurrentClient.m_aSkin[0] != '\0')
@@ -1222,9 +1322,11 @@ void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *
 			const CTeeRenderInfo TeeInfo = GetTeeRenderInfo(vec2(Skin.w, Skin.h), CurrentClient.m_aSkin, CurrentClient.m_CustomSkinColors, CurrentClient.m_CustomSkinColorBody, CurrentClient.m_CustomSkinColorFeet);
 			const CAnimState *pIdleState = CAnimState::GetIdle();
 			vec2 OffsetToMid;
-			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+			CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 			const vec2 TeeRenderPos = vec2(Skin.x + TeeInfo.m_Size / 2.0f, Skin.y + Skin.h / 2.0f + OffsetToMid.y);
 			RenderTools()->RenderTee(pIdleState, &TeeInfo, CurrentClient.m_Afk ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+			Ui()->DoButtonLogic(&CurrentClient.m_aSkin, 0, &Skin);
+			GameClient()->m_Tooltips.DoToolTip(&CurrentClient.m_aSkin, &Skin, CurrentClient.m_aSkin);
 		}
 
 		// name
@@ -1345,12 +1447,12 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 		CUIRect Header, GroupIcon, GroupLabel;
 		List.HSplitTop(ms_ListheaderHeight, &Header, &List);
 		s_ScrollRegion.AddRect(Header);
-		Header.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, UI()->HotItem() == &s_aListExtended[FriendType] ? 0.4f : 0.25f), IGraphics::CORNER_ALL, 5.0f);
+		Header.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, Ui()->HotItem() == &s_aListExtended[FriendType] ? 0.4f : 0.25f), IGraphics::CORNER_ALL, 5.0f);
 		Header.VSplitLeft(Header.h, &GroupIcon, &GroupLabel);
 		GroupIcon.Margin(2.0f, &GroupIcon);
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-		TextRender()->TextColor(UI()->HotItem() == &s_aListExtended[FriendType] ? TextRender()->DefaultTextColor() : ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f));
-		UI()->DoLabel(&GroupIcon, s_aListExtended[FriendType] ? FONT_ICON_SQUARE_MINUS : FONT_ICON_SQUARE_PLUS, GroupIcon.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->TextColor(Ui()->HotItem() == &s_aListExtended[FriendType] ? TextRender()->DefaultTextColor() : ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f));
+		Ui()->DoLabel(&GroupIcon, s_aListExtended[FriendType] ? FONT_ICON_SQUARE_MINUS : FONT_ICON_SQUARE_PLUS, GroupIcon.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 		switch(FriendType)
@@ -1368,8 +1470,8 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 			dbg_assert(false, "FriendType invalid");
 			break;
 		}
-		UI()->DoLabel(&GroupLabel, aBuf, FontSize, TEXTALIGN_ML);
-		if(UI()->DoButtonLogic(&s_aListExtended[FriendType], 0, &Header))
+		Ui()->DoLabel(&GroupLabel, aBuf, FontSize, TEXTALIGN_ML);
+		if(Ui()->DoButtonLogic(&s_aListExtended[FriendType], 0, &Header))
 		{
 			s_aListExtended[FriendType] = !s_aListExtended[FriendType];
 		}
@@ -1393,8 +1495,9 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 				if(s_ScrollRegion.RectClipped(Rect))
 					continue;
 
-				const bool Inside = UI()->HotItem() == Friend.ListItemId() || UI()->HotItem() == Friend.RemoveButtonId() || UI()->HotItem() == Friend.CommunityTooltipId();
-				bool ButtonResult = UI()->DoButtonLogic(Friend.ListItemId(), 0, &Rect);
+				const bool Inside = Ui()->HotItem() == Friend.ListItemId() || Ui()->HotItem() == Friend.RemoveButtonId() || Ui()->HotItem() == Friend.CommunityTooltipId() || Ui()->HotItem() == Friend.SkinTooltipId();
+				int ButtonResult = Ui()->DoButtonLogic(Friend.ListItemId(), 0, &Rect);
+
 				if(Friend.ServerInfo())
 				{
 					GameClient()->m_Tooltips.DoToolTip(Friend.ListItemId(), &Rect, Localize("Click to select server. Double click to join your friend."));
@@ -1414,26 +1517,27 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 				Rect.HSplitTop(11.0f + 10.0f, &Rect, nullptr);
 
 				// tee
+				CUIRect Skin;
+				Rect.VSplitLeft(Rect.h, &Skin, &Rect);
+				Rect.VSplitLeft(2.0f, nullptr, &Rect);
 				if(Friend.Skin()[0] != '\0')
 				{
-					CUIRect Skin;
-					Rect.VSplitLeft(Rect.h, &Skin, &Rect);
-					Rect.VSplitLeft(2.0f, nullptr, &Rect);
-
 					const CTeeRenderInfo TeeInfo = GetTeeRenderInfo(vec2(Skin.w, Skin.h), Friend.Skin(), Friend.CustomSkinColors(), Friend.CustomSkinColorBody(), Friend.CustomSkinColorFeet());
 					const CAnimState *pIdleState = CAnimState::GetIdle();
 					vec2 OffsetToMid;
-					RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+					CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 					const vec2 TeeRenderPos = vec2(Skin.x + Skin.w / 2.0f, Skin.y + Skin.h * 0.55f + OffsetToMid.y);
 					RenderTools()->RenderTee(pIdleState, &TeeInfo, Friend.IsAfk() ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+					Ui()->DoButtonLogic(Friend.SkinTooltipId(), 0, &Skin);
+					GameClient()->m_Tooltips.DoToolTip(Friend.SkinTooltipId(), &Skin, Friend.Skin());
 				}
 				Rect.HSplitTop(11.0f, &NameLabel, &ClanLabel);
 
 				// name
-				UI()->DoLabel(&NameLabel, Friend.Name(), FontSize - 1.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&NameLabel, Friend.Name(), FontSize - 1.0f, TEXTALIGN_ML);
 
 				// clan
-				UI()->DoLabel(&ClanLabel, Friend.Clan(), FontSize - 2.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&ClanLabel, Friend.Clan(), FontSize - 2.0f, TEXTALIGN_ML);
 
 				// server info
 				if(Friend.ServerInfo())
@@ -1449,7 +1553,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 							InfoLabel.VSplitLeft(21.0f, &CommunityIcon, &InfoLabel);
 							InfoLabel.VSplitLeft(2.0f, nullptr, &InfoLabel);
 							RenderCommunityIcon(pIcon, CommunityIcon, true);
-							UI()->DoButtonLogic(Friend.CommunityTooltipId(), 0, &CommunityIcon);
+							Ui()->DoButtonLogic(Friend.CommunityTooltipId(), 0, &CommunityIcon);
 							GameClient()->m_Tooltips.DoToolTip(Friend.CommunityTooltipId(), &CommunityIcon, pCommunity->Name());
 						}
 					}
@@ -1461,23 +1565,23 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 						str_format(aBuf, sizeof(aBuf), "%s | %s | %s", Friend.ServerInfo()->m_aMap, Friend.ServerInfo()->m_aGameType, aLatency);
 					else
 						str_format(aBuf, sizeof(aBuf), "%s | %s", Friend.ServerInfo()->m_aMap, Friend.ServerInfo()->m_aGameType);
-					UI()->DoLabel(&InfoLabel, aBuf, FontSize - 2.0f, TEXTALIGN_ML);
+					Ui()->DoLabel(&InfoLabel, aBuf, FontSize - 2.0f, TEXTALIGN_ML);
 				}
 
 				// remove button
 				if(Inside)
 				{
-					TextRender()->TextColor(UI()->HotItem() == Friend.RemoveButtonId() ? TextRender()->DefaultTextColor() : ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
+					TextRender()->TextColor(Ui()->HotItem() == Friend.RemoveButtonId() ? TextRender()->DefaultTextColor() : ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
 					TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 					TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-					UI()->DoLabel(&RemoveButton, FONT_ICON_TRASH, RemoveButton.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+					Ui()->DoLabel(&RemoveButton, FONT_ICON_TRASH, RemoveButton.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 					TextRender()->SetRenderFlags(0);
 					TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 					TextRender()->TextColor(TextRender()->DefaultTextColor());
-					if(UI()->DoButtonLogic(Friend.RemoveButtonId(), 0, &RemoveButton))
+					if(Ui()->DoButtonLogic(Friend.RemoveButtonId(), 0, &RemoveButton))
 					{
 						m_pRemoveFriend = &Friend;
-						ButtonResult = false;
+						ButtonResult = 0;
 					}
 					GameClient()->m_Tooltips.DoToolTip(Friend.RemoveButtonId(), &RemoveButton, Friend.FriendState() == IFriends::FRIEND_PLAYER ? Localize("Click to remove this player from your friends list.") : Localize("Click to remove this clan from your friends list."));
 				}
@@ -1487,7 +1591,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 				{
 					str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress);
 					m_ServerBrowserShouldRevealSelection = true;
-					if(Input()->MouseDoubleClick())
+					if(ButtonResult == 1 && Ui()->DoDoubleClickLogic(Friend.ListItemId()))
 					{
 						Connect(g_Config.m_UiServerAddress);
 					}
@@ -1499,7 +1603,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 				CUIRect Label;
 				List.HSplitTop(12.0f, &Label, &List);
 				s_ScrollRegion.AddRect(Label);
-				UI()->DoLabel(&Label, Localize("None"), Label.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+				Ui()->DoLabel(&Label, Localize("None"), Label.h * CUi::ms_FontmodHeight, TEXTALIGN_ML);
 			}
 		}
 
@@ -1529,18 +1633,18 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
 
 		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
 		str_format(aBuf, sizeof(aBuf), "%s:", Localize("Name"));
-		UI()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
 		Button.VSplitLeft(80.0f, nullptr, &Button);
 		static CLineInputBuffered<MAX_NAME_LENGTH> s_NameInput;
-		UI()->DoEditBox(&s_NameInput, &Button, FontSize + 2.0f);
+		Ui()->DoEditBox(&s_NameInput, &Button, FontSize + 2.0f);
 
 		ServerFriends.HSplitTop(3.0f, nullptr, &ServerFriends);
 		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
 		str_format(aBuf, sizeof(aBuf), "%s:", Localize("Clan"));
-		UI()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
 		Button.VSplitLeft(80.0f, nullptr, &Button);
 		static CLineInputBuffered<MAX_CLAN_LENGTH> s_ClanInput;
-		UI()->DoEditBox(&s_ClanInput, &Button, FontSize + 2.0f);
+		Ui()->DoEditBox(&s_ClanInput, &Button, FontSize + 2.0f);
 
 		ServerFriends.HSplitTop(3.0f, nullptr, &ServerFriends);
 		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
@@ -1586,7 +1690,7 @@ void CMenus::RenderServerbrowserTabBar(CUIRect TabBar)
 	const ColorRGBA ColorActive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f);
 	const ColorRGBA ColorInactive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f);
 
-	if(!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_TAB))
+	if(!Ui()->IsPopupOpen() && Ui()->ConsumeHotkey(CUi::HOTKEY_TAB))
 	{
 		const int Direction = Input()->ShiftIsPressed() ? -1 : 1;
 		g_Config.m_UiToolboxPage = (g_Config.m_UiToolboxPage + NUM_UI_TOOLBOX_PAGES + Direction) % NUM_UI_TOOLBOX_PAGES;
@@ -1597,15 +1701,24 @@ void CMenus::RenderServerbrowserTabBar(CUIRect TabBar)
 
 	static CButtonContainer s_FilterTabButton;
 	if(DoButton_MenuTab(&s_FilterTabButton, FONT_ICON_LIST_UL, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_FILTERS, &FilterTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_FILTER], &ColorInactive, &ColorActive))
+	{
 		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_FILTERS;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_FilterTabButton, &FilterTabButton, Localize("Server filter"));
 
 	static CButtonContainer s_InfoTabButton;
 	if(DoButton_MenuTab(&s_InfoTabButton, FONT_ICON_INFO, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_INFO, &InfoTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_INFO], &ColorInactive, &ColorActive))
+	{
 		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_INFO;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_InfoTabButton, &InfoTabButton, Localize("Server info"));
 
 	static CButtonContainer s_FriendsTabButton;
 	if(DoButton_MenuTab(&s_FriendsTabButton, FONT_ICON_HEART, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_FRIENDS, &FriendsTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_FRIENDS], &ColorInactive, &ColorActive))
+	{
 		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_FRIENDS;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_FriendsTabButton, &FriendsTabButton, Localize("Friends"));
 
 	TextRender()->SetRenderFlags(0);
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
@@ -1635,17 +1748,38 @@ void CMenus::RenderServerbrowserToolBox(CUIRect ToolBox)
 void CMenus::RenderServerbrowser(CUIRect MainView)
 {
 	UpdateCommunityCache(false);
-	UpdateCommunityIcons();
+
+	switch(g_Config.m_UiPage)
+	{
+	case PAGE_INTERNET:
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_INTERNET);
+		break;
+	case PAGE_LAN:
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_LAN);
+		break;
+	case PAGE_FAVORITES:
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_BROWSER_FAVORITES);
+		break;
+	case PAGE_FAVORITE_COMMUNITY_1:
+	case PAGE_FAVORITE_COMMUNITY_2:
+	case PAGE_FAVORITE_COMMUNITY_3:
+	case PAGE_FAVORITE_COMMUNITY_4:
+	case PAGE_FAVORITE_COMMUNITY_5:
+		GameClient()->m_MenuBackground.ChangePosition(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1 + CMenuBackground::POS_BROWSER_CUSTOM0);
+		break;
+	default:
+		dbg_assert(false, "ui_page invalid for RenderServerbrowser");
+	}
 
 	/*
-		+-----------------+	+--tabs--+
-		|				  |	|		 |
-		|				  |	|		 |
-		|   server list	  |	|  tool	 |
-		|				  |	|  box	 |
-		|				  |	|		 |
-		+-----------------+	|	 	 |
-			status box		+--------+
+		+---------------------------+ +---communities---+
+		|                           | |                 |
+		|                           | +------tabs-------+
+		|       server list         | |                 |
+		|                           | |      tool       |
+		|                           | |      box        |
+		+---------------------------+ |                 |
+		        status box            +-----------------+
 	*/
 
 	CUIRect ServerList, StatusBox, ToolBox, TabBar;
@@ -1653,6 +1787,15 @@ void CMenus::RenderServerbrowser(CUIRect MainView)
 	MainView.Margin(10.0f, &MainView);
 	MainView.VSplitRight(205.0f, &ServerList, &ToolBox);
 	ServerList.VSplitRight(5.0f, &ServerList, nullptr);
+
+	if((g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES) && !ServerBrowser()->Communities().empty())
+	{
+		CUIRect CommunityFilter;
+		ToolBox.HSplitTop(19.0f + 4.0f * 17.0f + CScrollRegion::HEIGHT_MAGIC_FIX, &CommunityFilter, &ToolBox);
+		ToolBox.HSplitTop(8.0f, nullptr, &ToolBox);
+		RenderServerbrowserCommunitiesFilter(CommunityFilter);
+	}
+
 	ToolBox.HSplitTop(24.0f, &TabBar, &ToolBox);
 	ServerList.HSplitBottom(65.0f, &ServerList, &StatusBox);
 
@@ -1669,21 +1812,24 @@ bool CMenus::PrintHighlighted(const char *pName, F &&PrintFn)
 {
 	const char *pStr = g_Config.m_BrFilterString;
 	char aFilterStr[sizeof(g_Config.m_BrFilterString)];
+	char aFilterStrTrimmed[sizeof(g_Config.m_BrFilterString)];
 	while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aFilterStr, sizeof(aFilterStr))))
 	{
+		str_copy(aFilterStrTrimmed, str_utf8_skip_whitespaces(aFilterStr));
+		str_utf8_trim_right(aFilterStrTrimmed);
 		// highlight the parts that matches
 		const char *pFilteredStr;
-		int FilterLen = str_length(aFilterStr);
-		if(aFilterStr[0] == '"' && aFilterStr[FilterLen - 1] == '"')
+		int FilterLen = str_length(aFilterStrTrimmed);
+		if(aFilterStrTrimmed[0] == '"' && aFilterStrTrimmed[FilterLen - 1] == '"')
 		{
-			aFilterStr[FilterLen - 1] = '\0';
-			pFilteredStr = str_comp(pName, &aFilterStr[1]) == 0 ? pName : nullptr;
+			aFilterStrTrimmed[FilterLen - 1] = '\0';
+			pFilteredStr = str_comp(pName, &aFilterStrTrimmed[1]) == 0 ? pName : nullptr;
 			FilterLen -= 2;
 		}
 		else
 		{
 			const char *pFilteredStrEnd;
-			pFilteredStr = str_utf8_find_nocase(pName, aFilterStr, &pFilteredStrEnd);
+			pFilteredStr = str_utf8_find_nocase(pName, aFilterStrTrimmed, &pFilteredStrEnd);
 			if(pFilteredStr != nullptr && pFilteredStrEnd != nullptr)
 				FilterLen = pFilteredStrEnd - pFilteredStr;
 		}
@@ -1698,17 +1844,13 @@ bool CMenus::PrintHighlighted(const char *pName, F &&PrintFn)
 
 CTeeRenderInfo CMenus::GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const
 {
-	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
-
 	CTeeRenderInfo TeeInfo;
-	TeeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-	TeeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-	TeeInfo.m_SkinMetrics = pSkin->m_Metrics;
+	TeeInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
 	TeeInfo.m_CustomColoredSkin = CustomSkinColors;
 	if(CustomSkinColors)
 	{
-		TeeInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorBody).UnclampLighting());
-		TeeInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorFeet).UnclampLighting());
+		TeeInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT));
+		TeeInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorFeet).UnclampLighting(ColorHSLA::DARKEST_LGT));
 	}
 	else
 	{
@@ -1741,57 +1883,44 @@ void CMenus::ConchainCommunitiesUpdate(IConsole::IResult *pResult, void *pUserDa
 {
 	pfnCallback(pResult, pCallbackUserData);
 	CMenus *pThis = static_cast<CMenus *>(pUserData);
-	if(pResult->NumArguments() >= 1 && (g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES))
+	if(pResult->NumArguments() >= 1 && (g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES || (g_Config.m_UiPage >= PAGE_FAVORITE_COMMUNITY_1 && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5)))
 	{
-		pThis->ServerBrowser()->CleanFilters();
 		pThis->UpdateCommunityCache(true);
 		pThis->Client()->ServerBrowserUpdate();
 	}
 }
 
-void CMenus::UpdateCommunityCache(bool Force)
+void CMenus::ConchainUiPageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
-	const bool PageWithCommunities = g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES;
-	if(!Force && m_CommunityCache.m_UpdateTime != 0 && m_CommunityCache.m_UpdateTime == ServerBrowser()->DDNetInfoUpdateTime() && m_CommunityCache.m_PageWithCommunities == PageWithCommunities)
-		return;
-
-	m_CommunityCache.m_UpdateTime = ServerBrowser()->DDNetInfoUpdateTime();
-	m_CommunityCache.m_PageWithCommunities = PageWithCommunities;
-
-	if(m_CommunityCache.m_PageWithCommunities)
-		m_CommunityCache.m_vpSelectedCommunities = ServerBrowser()->SelectedCommunities();
-	else
-		m_CommunityCache.m_vpSelectedCommunities.clear();
-
-	m_CommunityCache.m_vpSelectableCountries.clear();
-	m_CommunityCache.m_vpSelectableTypes.clear();
-	for(const CCommunity *pCommunity : m_CommunityCache.m_vpSelectedCommunities)
+	pfnCallback(pResult, pCallbackUserData);
+	CMenus *pThis = static_cast<CMenus *>(pUserData);
+	if(pResult->NumArguments() >= 1)
 	{
-		for(const auto &Country : pCommunity->Countries())
+		if(g_Config.m_UiPage >= PAGE_FAVORITE_COMMUNITY_1 && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5 &&
+			(size_t)(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1) >= pThis->ServerBrowser()->FavoriteCommunities().size())
 		{
-			const auto ExistingCountry = std::find_if(m_CommunityCache.m_vpSelectableCountries.begin(), m_CommunityCache.m_vpSelectableCountries.end(), [&](const CCommunityCountry *pOther) {
-				return str_comp(Country.Name(), pOther->Name()) == 0 && Country.FlagId() == pOther->FlagId();
-			});
-			if(ExistingCountry == m_CommunityCache.m_vpSelectableCountries.end())
-			{
-				m_CommunityCache.m_vpSelectableCountries.push_back(&Country);
-			}
-		}
-		for(const auto &Type : pCommunity->Types())
-		{
-			const auto ExistingType = std::find_if(m_CommunityCache.m_vpSelectableTypes.begin(), m_CommunityCache.m_vpSelectableTypes.end(), [&](const CCommunityType *pOther) {
-				return str_comp(Type.Name(), pOther->Name()) == 0;
-			});
-			if(ExistingType == m_CommunityCache.m_vpSelectableTypes.end())
-			{
-				m_CommunityCache.m_vpSelectableTypes.push_back(&Type);
-			}
+			// Reset page to internet when there is no favorite community for this page.
+			g_Config.m_UiPage = PAGE_INTERNET;
 		}
+
+		pThis->SetMenuPage(g_Config.m_UiPage);
 	}
+}
 
-	m_CommunityCache.m_AnyRanksAvailable = std::any_of(m_CommunityCache.m_vpSelectedCommunities.begin(), m_CommunityCache.m_vpSelectedCommunities.end(), [](const CCommunity *pCommunity) {
-		return pCommunity->HasRanks();
-	});
+void CMenus::UpdateCommunityCache(bool Force)
+{
+	if(g_Config.m_UiPage >= PAGE_FAVORITE_COMMUNITY_1 && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5 &&
+		(size_t)(g_Config.m_UiPage - PAGE_FAVORITE_COMMUNITY_1) >= ServerBrowser()->FavoriteCommunities().size())
+	{
+		// Reset page to internet when there is no favorite community for this page,
+		// i.e. when favorite community is removed via console while the page is open.
+		// This also updates the community cache because the page is changed.
+		SetMenuPage(PAGE_INTERNET);
+	}
+	else
+	{
+		ServerBrowser()->CommunityCache().Update(Force);
+	}
 }
 
 CMenus::CAbstractCommunityIconJob::CAbstractCommunityIconJob(CMenus *pMenus, const char *pCommunityId, int StorageType) :
@@ -1802,25 +1931,6 @@ CMenus::CAbstractCommunityIconJob::CAbstractCommunityIconJob(CMenus *pMenus, con
 	str_format(m_aPath, sizeof(m_aPath), "communityicons/%s.png", pCommunityId);
 }
 
-CMenus::CAbstractCommunityIconJob::~CAbstractCommunityIconJob()
-{
-	free(m_ImageInfo.m_pData);
-	m_ImageInfo.m_pData = nullptr;
-}
-
-int CMenus::CCommunityIconDownloadJob::OnCompletion(int State)
-{
-	State = CHttpRequest::OnCompletion(State);
-	if(State == HTTP_DONE)
-	{
-		if(m_pMenus->LoadCommunityIconFile(Dest(), IStorage::TYPE_SAVE, m_ImageInfo, m_Sha256))
-			m_Success = true;
-		else
-			State = HTTP_ERROR;
-	}
-	return State;
-}
-
 CMenus::CCommunityIconDownloadJob::CCommunityIconDownloadJob(CMenus *pMenus, const char *pCommunityId, const char *pUrl, const SHA256_DIGEST &Sha256) :
 	CHttpRequest(pUrl),
 	CAbstractCommunityIconJob(pMenus, pCommunityId, IStorage::TYPE_SAVE)
@@ -1839,6 +1949,12 @@ void CMenus::CCommunityIconLoadJob::Run()
 CMenus::CCommunityIconLoadJob::CCommunityIconLoadJob(CMenus *pMenus, const char *pCommunityId, int StorageType) :
 	CAbstractCommunityIconJob(pMenus, pCommunityId, StorageType)
 {
+	Abortable(true);
+}
+
+CMenus::CCommunityIconLoadJob::~CCommunityIconLoadJob()
+{
+	m_ImageInfo.Free();
 }
 
 int CMenus::CommunityIconScan(const char *pName, int IsDir, int DirType, void *pUser)
@@ -1857,7 +1973,7 @@ int CMenus::CommunityIconScan(const char *pName, int IsDir, int DirType, void *p
 	return 0;
 }
 
-const CMenus::SCommunityIcon *CMenus::FindCommunityIcon(const char *pCommunityId)
+const SCommunityIcon *CMenus::FindCommunityIcon(const char *pCommunityId)
 {
 	auto Icon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) {
 		return str_comp(Element.m_aCommunityId, pCommunityId) == 0;
@@ -1868,7 +1984,7 @@ const CMenus::SCommunityIcon *CMenus::FindCommunityIcon(const char *pCommunityId
 bool CMenus::LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &Info, SHA256_DIGEST &Sha256)
 {
 	char aError[IO_MAX_PATH_LENGTH + 128];
-	if(!Graphics()->LoadPNG(&Info, pPath, DirType))
+	if(!Graphics()->LoadPng(Info, pPath, DirType))
 	{
 		str_format(aError, sizeof(aError), "Failed to load community icon from '%s'", pPath);
 		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
@@ -1876,14 +1992,14 @@ bool CMenus::LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &I
 	}
 	if(Info.m_Format != CImageInfo::FORMAT_RGBA)
 	{
-		Graphics()->FreePNG(&Info);
+		Info.Free();
 		str_format(aError, sizeof(aError), "Failed to load community icon from '%s': must be an RGBA image", pPath);
 		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
 		return false;
 	}
 	if(!Storage()->CalculateHashes(pPath, DirType, &Sha256))
 	{
-		Graphics()->FreePNG(&Info);
+		Info.Free();
 		str_format(aError, sizeof(aError), "Failed to load community icon from '%s': could not calculate hash", pPath);
 		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
 		return false;
@@ -1891,25 +2007,15 @@ bool CMenus::LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &I
 	return true;
 }
 
-void CMenus::LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &&Info, SHA256_DIGEST &&Sha256)
+void CMenus::LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &Info, const SHA256_DIGEST &Sha256)
 {
 	SCommunityIcon CommunityIcon;
 	str_copy(CommunityIcon.m_aCommunityId, pCommunityId);
 	CommunityIcon.m_Sha256 = Sha256;
-	CommunityIcon.m_OrgTexture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+	CommunityIcon.m_OrgTexture = Graphics()->LoadTextureRaw(Info, 0, pCommunityId);
 
-	// create gray scale version
-	unsigned char *pData = static_cast<unsigned char *>(Info.m_pData);
-	const size_t Step = Info.PixelSize();
-	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
-	{
-		int v = (pData[i * Step] + pData[i * Step + 1] + pData[i * Step + 2]) / 3;
-		pData[i * Step] = v;
-		pData[i * Step + 1] = v;
-		pData[i * Step + 2] = v;
-	}
-	CommunityIcon.m_GreyTexture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
-	Graphics()->FreePNG(&Info);
+	ConvertToGrayscale(Info);
+	CommunityIcon.m_GreyTexture = Graphics()->LoadTextureRawMove(Info, 0, pCommunityId);
 
 	auto ExistingIcon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) {
 		return str_comp(Element.m_aCommunityId, pCommunityId) == 0;
@@ -1948,7 +2054,7 @@ void CMenus::UpdateCommunityIcons()
 	if(!m_CommunityIconLoadJobs.empty())
 	{
 		std::shared_ptr<CCommunityIconLoadJob> pJob = m_CommunityIconLoadJobs.front();
-		if(pJob->Status() == IJob::STATE_DONE)
+		if(pJob->Done())
 		{
 			if(pJob->Success())
 				LoadCommunityIconFinish(pJob->CommunityId(), pJob->ImageInfo(), pJob->Sha256());
@@ -1964,18 +2070,22 @@ void CMenus::UpdateCommunityIcons()
 	if(!m_CommunityIconDownloadJobs.empty())
 	{
 		std::shared_ptr<CCommunityIconDownloadJob> pJob = m_CommunityIconDownloadJobs.front();
-		if(pJob->Status() == IJob::STATE_DONE)
+		if(pJob->Done())
 		{
-			if(pJob->Success())
-				LoadCommunityIconFinish(pJob->CommunityId(), pJob->ImageInfo(), pJob->Sha256());
+			if(pJob->State() == EHttpState::DONE)
+			{
+				std::shared_ptr<CCommunityIconLoadJob> pLoadJob = std::make_shared<CCommunityIconLoadJob>(this, pJob->CommunityId(), IStorage::TYPE_SAVE);
+				Engine()->AddJob(pLoadJob);
+				m_CommunityIconLoadJobs.push_back(pLoadJob);
+			}
 			m_CommunityIconDownloadJobs.pop_front();
 		}
 	}
 
 	// Rescan for changed communities only when necessary
-	if(m_CommunityIconsUpdateTime != 0 && m_CommunityIconsUpdateTime == ServerBrowser()->DDNetInfoUpdateTime())
+	if(!ServerBrowser()->DDNetInfoAvailable() || (m_CommunityIconsInfoSha256 != SHA256_ZEROED && m_CommunityIconsInfoSha256 == ServerBrowser()->DDNetInfoSha256()))
 		return;
-	m_CommunityIconsUpdateTime = ServerBrowser()->DDNetInfoUpdateTime();
+	m_CommunityIconsInfoSha256 = ServerBrowser()->DDNetInfoSha256();
 
 	// Remove icons for removed communities
 	auto RemovalIterator = m_vCommunityIcons.begin();
@@ -2007,7 +2117,7 @@ void CMenus::UpdateCommunityIcons()
 		if(pExistingDownload == m_CommunityIconDownloadJobs.end() && (ExistingIcon == m_vCommunityIcons.end() || ExistingIcon->m_Sha256 != Community.IconSha256()))
 		{
 			std::shared_ptr<CCommunityIconDownloadJob> pJob = std::make_shared<CCommunityIconDownloadJob>(this, Community.Id(), Community.IconUrl(), Community.IconSha256());
-			Engine()->AddJob(pJob);
+			Http()->Run(pJob);
 			m_CommunityIconDownloadJobs.push_back(pJob);
 		}
 	}
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index 506af175ed..9da978a1f3 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -30,7 +30,7 @@ using namespace std::chrono_literals;
 
 int CMenus::DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, bool Enabled)
 {
-	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, (Checked ? 0.10f : 0.5f) * UI()->ButtonColorMul(pButtonContainer)), Corners, 5.0f);
+	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, (Checked ? 0.10f : 0.5f) * Ui()->ButtonColorMul(pButtonContainer)), Corners, 5.0f);
 
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
@@ -38,13 +38,13 @@ int CMenus::DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pT
 	TextRender()->TextColor(TextRender()->DefaultTextColor());
 	CUIRect Temp;
 	pRect->HMargin(2.0f, &Temp);
-	UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+	Ui()->DoLabel(&Temp, pText, Temp.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 
 	if(!Enabled)
 	{
 		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
 		TextRender()->TextOutlineColor(ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f));
-		UI()->DoLabel(&Temp, FONT_ICON_SLASH, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		Ui()->DoLabel(&Temp, FONT_ICON_SLASH, Temp.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	}
@@ -52,7 +52,7 @@ int CMenus::DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pT
 	TextRender()->SetRenderFlags(0);
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 
-	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+	return Ui()->DoButtonLogic(pButtonContainer, Checked, pRect);
 }
 
 bool CMenus::DemoFilterChat(const void *pData, int Size, void *pUser)
@@ -78,6 +78,7 @@ void CMenus::HandleDemoSeeking(float PositionToSeek, float TimeToSeek)
 	if((PositionToSeek >= 0.0f && PositionToSeek <= 1.0f) || TimeToSeek != 0.0f)
 	{
 		m_pClient->m_Chat.Reset();
+		m_pClient->m_DamageInd.OnReset();
 		m_pClient->m_InfoMessages.OnReset();
 		m_pClient->m_Particles.OnReset();
 		m_pClient->m_Sounds.OnReset();
@@ -169,17 +170,17 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	// handle keyboard shortcuts independent of active menu
 	float PositionToSeek = -1.0f;
 	float TimeToSeek = 0.0f;
-	if(m_pClient->m_GameConsole.IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE && g_Config.m_ClDemoKeyboardShortcuts && !UI()->IsPopupOpen())
+	if(m_pClient->m_GameConsole.IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE && g_Config.m_ClDemoKeyboardShortcuts && !Ui()->IsPopupOpen())
 	{
 		// increase/decrease speed
 		if(!Input()->ModifierIsPressed() && !Input()->ShiftIsPressed() && !Input()->AltIsPressed())
 		{
-			if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP) || Input()->KeyPress(KEY_UP))
+			if(Input()->KeyPress(KEY_UP) || (m_MenuActive && Input()->KeyPress(KEY_MOUSE_WHEEL_UP)))
 			{
 				DemoPlayer()->AdjustSpeedIndex(+1);
 				UpdateLastSpeedChange();
 			}
-			else if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN) || Input()->KeyPress(KEY_DOWN))
+			else if(Input()->KeyPress(KEY_DOWN) || (m_MenuActive && Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN)))
 			{
 				DemoPlayer()->AdjustSpeedIndex(-1);
 				UpdateLastSpeedChange();
@@ -271,7 +272,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 				TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor().WithMultipliedAlpha(Alpha));
 				TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 				TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
-				UI()->DoLabel(UI()->Screen(), pInfo->m_Paused ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 36.0f + Time * 12.0f, TEXTALIGN_MC);
+				Ui()->DoLabel(Ui()->Screen(), pInfo->m_Paused ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 36.0f + Time * 12.0f, TEXTALIGN_MC);
 				TextRender()->TextColor(TextRender()->DefaultTextColor());
 				TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
 				TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
@@ -282,7 +283,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		// Render speed info
 		if(g_Config.m_ClDemoShowSpeed && Client()->GlobalTime() - m_LastSpeedChange < 1.0f)
 		{
-			CUIRect Screen = *UI()->Screen();
+			CUIRect Screen = *Ui()->Screen();
 
 			char aSpeedBuf[16];
 			str_format(aSpeedBuf, sizeof(aSpeedBuf), "×%.2f", pInfo->m_Speed);
@@ -349,18 +350,18 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 
 		bool Clicked;
 		bool Abrupted;
-		if(int Result = UI()->DoDraggableButtonLogic(&s_Operation, 8, &DemoControlsDragRect, &Clicked, &Abrupted))
+		if(int Result = Ui()->DoDraggableButtonLogic(&s_Operation, 8, &DemoControlsDragRect, &Clicked, &Abrupted))
 		{
 			if(s_Operation == OP_NONE && Result == 1)
 			{
-				s_InitialMouse = UI()->MousePos();
+				s_InitialMouse = Ui()->MousePos();
 				s_Operation = OP_CLICKED;
 			}
 
 			if(Clicked || Abrupted)
 				s_Operation = OP_NONE;
 
-			if(s_Operation == OP_CLICKED && length(UI()->MousePos() - s_InitialMouse) > 5.0f)
+			if(s_Operation == OP_CLICKED && length(Ui()->MousePos() - s_InitialMouse) > 5.0f)
 			{
 				s_Operation = OP_DRAGGING;
 				s_InitialMouse -= m_DemoControlsPositionOffset;
@@ -368,7 +369,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 
 			if(s_Operation == OP_DRAGGING)
 			{
-				m_DemoControlsPositionOffset = UI()->MousePos() - s_InitialMouse;
+				m_DemoControlsPositionOffset = Ui()->MousePos() - s_InitialMouse;
 				m_DemoControlsPositionOffset.x = clamp(m_DemoControlsPositionOffset.x, -DemoControlsOriginal.x, MainView.w - DemoControlsDragRect.w - DemoControlsOriginal.x);
 				m_DemoControlsPositionOffset.y = clamp(m_DemoControlsPositionOffset.y, -DemoControlsOriginal.y, MainView.h - DemoControlsDragRect.h - DemoControlsOriginal.y);
 			}
@@ -379,8 +380,8 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	{
 		const float Rounding = 5.0f;
 
-		static int s_SeekBarID = 0;
-		void *pId = &s_SeekBarID;
+		static int s_SeekBarId = 0;
+		void *pId = &s_SeekBarId;
 		char aBuffer[128];
 
 		// draw seek bar
@@ -413,7 +414,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 			Graphics()->TextureClear();
 			Graphics()->QuadsBegin();
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
-			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, Ui()->PixelSize(), SeekBar.h);
 			Graphics()->QuadsDrawTL(&QuadItem, 1);
 			Graphics()->QuadsEnd();
 		}
@@ -426,7 +427,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 			Graphics()->TextureClear();
 			Graphics()->QuadsBegin();
 			Graphics()->SetColor(1.0f, 0.0f, 0.0f, 1.0f);
-			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, Ui()->PixelSize(), SeekBar.h);
 			Graphics()->QuadsDrawTL(&QuadItem, 1);
 			Graphics()->QuadsEnd();
 		}
@@ -438,7 +439,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 			Graphics()->TextureClear();
 			Graphics()->QuadsBegin();
 			Graphics()->SetColor(1.0f, 0.0f, 0.0f, 1.0f);
-			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, Ui()->PixelSize(), SeekBar.h);
 			Graphics()->QuadsDrawTL(&QuadItem, 1);
 			Graphics()->QuadsEnd();
 		}
@@ -449,19 +450,19 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		char aTotalTime[32];
 		str_time((int64_t)TotalTicks / Client()->GameTickSpeed() * 100, TIME_HOURS, aTotalTime, sizeof(aTotalTime));
 		str_format(aBuffer, sizeof(aBuffer), "%s / %s", aCurrentTime, aTotalTime);
-		UI()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
+		Ui()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
 
 		// do the logic
-		const bool Inside = UI()->MouseInside(&SeekBar);
+		const bool Inside = Ui()->MouseInside(&SeekBar);
 
-		if(UI()->CheckActiveItem(pId))
+		if(Ui()->CheckActiveItem(pId))
 		{
-			if(!UI()->MouseButton(0))
-				UI()->SetActiveItem(nullptr);
+			if(!Ui()->MouseButton(0))
+				Ui()->SetActiveItem(nullptr);
 			else
 			{
 				static float s_PrevAmount = 0.0f;
-				float AmountSeek = clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
+				float AmountSeek = clamp((Ui()->MouseX() - SeekBar.x - Rounding) / (SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
 
 				if(Input()->ShiftIsPressed())
 				{
@@ -481,23 +482,24 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 				}
 			}
 		}
-		else if(UI()->HotItem() == pId)
+		else if(Ui()->HotItem() == pId)
 		{
-			if(UI()->MouseButton(0))
+			if(Ui()->MouseButton(0))
 			{
-				UI()->SetActiveItem(pId);
-			}
-			else
-			{
-				const int HoveredTick = (int)(clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f) * TotalTicks);
-				static char s_aHoveredTime[32];
-				str_time((int64_t)HoveredTick / Client()->GameTickSpeed() * 100, TIME_HOURS, s_aHoveredTime, sizeof(s_aHoveredTime));
-				GameClient()->m_Tooltips.DoToolTip(pId, &SeekBar, s_aHoveredTime);
+				Ui()->SetActiveItem(pId);
 			}
 		}
 
-		if(Inside)
-			UI()->SetHotItem(pId);
+		if(Inside && !Ui()->MouseButton(0))
+			Ui()->SetHotItem(pId);
+
+		if(Ui()->HotItem() == pId)
+		{
+			const int HoveredTick = (int)(clamp((Ui()->MouseX() - SeekBar.x - Rounding) / (SeekBar.w - 2 * Rounding), 0.0f, 1.0f) * TotalTicks);
+			static char s_aHoveredTime[32];
+			str_time((int64_t)HoveredTick / Client()->GameTickSpeed() * 100, TIME_HOURS, s_aHoveredTime, sizeof(s_aHoveredTime));
+			GameClient()->m_Tooltips.DoToolTip(pId, &SeekBar, s_aHoveredTime);
+		}
 	}
 
 	bool IncreaseDemoSpeed = false, DecreaseDemoSpeed = false;
@@ -565,10 +567,10 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 			s_vpDurationNames[i] = s_vDurationNames[i].c_str();
 		}
 
-		static CUI::SDropDownState s_SkipDurationDropDownState;
+		static CUi::SDropDownState s_SkipDurationDropDownState;
 		static CScrollRegion s_SkipDurationDropDownScrollRegion;
 		s_SkipDurationDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_SkipDurationDropDownScrollRegion;
-		s_SkipDurationIndex = UI()->DoDropDown(&Button, s_SkipDurationIndex, s_vpDurationNames.data(), NumDurationLabels, s_SkipDurationDropDownState);
+		s_SkipDurationIndex = Ui()->DoDropDown(&Button, s_SkipDurationIndex, s_vpDurationNames.data(), NumDurationLabels, s_SkipDurationDropDownState);
 		GameClient()->m_Tooltips.DoToolTip(&s_SkipDurationDropDownState.m_ButtonContainer, &Button, Localize("Change the skip duration"));
 	}
 
@@ -642,7 +644,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	ButtonBar.VSplitLeft(Margins * 12, &SpeedBar, &ButtonBar);
 	char aBuffer[64];
 	str_format(aBuffer, sizeof(aBuffer), "×%g", pInfo->m_Speed);
-	UI()->DoLabel(&SpeedBar, aBuffer, Button.h * 0.7f, TEXTALIGN_MC);
+	Ui()->DoLabel(&SpeedBar, aBuffer, Button.h * 0.7f, TEXTALIGN_MC);
 
 	// slice begin button
 	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
@@ -691,7 +693,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		char aDemoName[IO_MAX_PATH_LENGTH];
 		DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));
 		m_DemoSliceInput.Set(aDemoName);
-		UI()->SetActiveItem(&m_DemoSliceInput);
+		Ui()->SetActiveItem(&m_DemoSliceInput);
 		m_DemoPlayerState = DEMOPLAYER_SLICE_SAVE;
 	}
 	GameClient()->m_Tooltips.DoToolTip(&s_SliceSaveButton, &Button, Localize("Export cut as a separate demo"));
@@ -725,7 +727,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	Props.m_MaxWidth = NameBar.w;
 	Props.m_EllipsisAtEnd = true;
 	Props.m_EnableWidthCheck = false;
-	UI()->DoLabel(&NameBar, aBuf, Button.h * 0.5f, TEXTALIGN_ML, Props);
+	Ui()->DoLabel(&NameBar, aBuf, Button.h * 0.5f, TEXTALIGN_ML, Props);
 
 	if(IncreaseDemoSpeed)
 	{
@@ -744,14 +746,12 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	if(m_DemoPlayerState != DEMOPLAYER_NONE)
 	{
 		// prevent element under the active popup from being activated
-		UI()->SetHotItem(nullptr);
+		Ui()->SetHotItem(nullptr);
 	}
 	if(m_DemoPlayerState == DEMOPLAYER_SLICE_SAVE)
 	{
 		RenderDemoPlayerSliceSavePopup(MainView);
 	}
-
-	UI()->RenderPopupMenus();
 }
 
 void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
@@ -769,7 +769,7 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 	CUIRect Title;
 	Box.HSplitTop(24.0f, &Title, &Box);
 	Box.HSplitTop(20.0f, nullptr, &Box);
-	UI()->DoLabel(&Title, Localize("Export demo cut"), 24.0f, TEXTALIGN_MC);
+	Ui()->DoLabel(&Title, Localize("Export demo cut"), 24.0f, TEXTALIGN_MC);
 
 	// slice times
 	CUIRect SliceTimesBar, SliceInterval, SliceLength;
@@ -786,9 +786,9 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 	str_time((RealSliceEnd - RealSliceBegin) / Client()->GameTickSpeed() * 100, TIME_HOURS, aSliceLength, sizeof(aSliceLength));
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "%s: %s – %s", Localize("Cut interval"), aSliceBegin, aSliceEnd);
-	UI()->DoLabel(&SliceInterval, aBuf, 18.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&SliceInterval, aBuf, 18.0f, TEXTALIGN_ML);
 	str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Cut length"), aSliceLength);
-	UI()->DoLabel(&SliceLength, aBuf, 18.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&SliceLength, aBuf, 18.0f, TEXTALIGN_ML);
 
 	// file name
 	CUIRect NameLabel, NameBox;
@@ -796,8 +796,8 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 	Box.HSplitTop(20.0f, nullptr, &Box);
 	NameLabel.VSplitLeft(150.0f, &NameLabel, &NameBox);
 	NameBox.VSplitLeft(20.0f, nullptr, &NameBox);
-	UI()->DoLabel(&NameLabel, Localize("New name:"), 18.0f, TEXTALIGN_ML);
-	UI()->DoEditBox(&m_DemoSliceInput, &NameBox, 12.0f);
+	Ui()->DoLabel(&NameLabel, Localize("New name:"), 18.0f, TEXTALIGN_ML);
+	Ui()->DoEditBox(&m_DemoSliceInput, &NameBox, 12.0f);
 
 	// remove chat checkbox
 	static int s_RemoveChat = 0;
@@ -824,26 +824,28 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 	ButtonBar.VSplitMid(&AbortButton, &OkButton, 40.0f);
 
 	static CButtonContainer s_ButtonAbort;
-	if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &AbortButton) || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)))
+	if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &AbortButton) || (!Ui()->IsPopupOpen() && Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE)))
 		m_DemoPlayerState = DEMOPLAYER_NONE;
 
-	static CUI::SConfirmPopupContext s_ConfirmPopupContext;
+	static CUi::SConfirmPopupContext s_ConfirmPopupContext;
 	static CButtonContainer s_ButtonOk;
-	if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &OkButton) || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &OkButton) || (!Ui()->IsPopupOpen() && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 	{
+		if(str_endswith(m_DemoSliceInput.GetString(), ".demo"))
+		{
+			char aNameWithoutExt[IO_MAX_PATH_LENGTH];
+			fs_split_file_extension(m_DemoSliceInput.GetString(), aNameWithoutExt, sizeof(aNameWithoutExt));
+			m_DemoSliceInput.Set(aNameWithoutExt);
+		}
+
 		char aDemoName[IO_MAX_PATH_LENGTH];
-		char aNameWithoutExt[IO_MAX_PATH_LENGTH];
 		DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));
-
-		fs_split_file_extension(m_DemoSliceInput.GetString(), aNameWithoutExt, sizeof(aNameWithoutExt));
-		m_DemoSliceInput.Set(aNameWithoutExt);
-
 		if(str_comp(aDemoName, m_DemoSliceInput.GetString()) == 0)
 		{
-			static CUI::SMessagePopupContext s_MessagePopupContext;
+			static CUi::SMessagePopupContext s_MessagePopupContext;
 			s_MessagePopupContext.ErrorColor();
 			str_copy(s_MessagePopupContext.m_aMessage, Localize("Please use a different filename"));
-			UI()->ShowPopupMessage(UI()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_MessagePopupContext);
+			Ui()->ShowPopupMessage(Ui()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_MessagePopupContext);
 		}
 		else
 		{
@@ -854,14 +856,14 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 				s_ConfirmPopupContext.Reset();
 				s_ConfirmPopupContext.YesNoButtons();
 				str_copy(s_ConfirmPopupContext.m_aMessage, Localize("File already exists, do you want to overwrite it?"));
-				UI()->ShowPopupConfirm(UI()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_ConfirmPopupContext);
+				Ui()->ShowPopupConfirm(Ui()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_ConfirmPopupContext);
 			}
 			else
-				s_ConfirmPopupContext.m_Result = CUI::SConfirmPopupContext::CONFIRMED;
+				s_ConfirmPopupContext.m_Result = CUi::SConfirmPopupContext::CONFIRMED;
 		}
 	}
 
-	if(s_ConfirmPopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+	if(s_ConfirmPopupContext.m_Result == CUi::SConfirmPopupContext::CONFIRMED)
 	{
 		char aPath[IO_MAX_PATH_LENGTH];
 		str_format(aPath, sizeof(aPath), "%s/%s.demo", m_aCurrentDemoFolder, m_DemoSliceInput.GetString());
@@ -879,13 +881,13 @@ void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
 			m_Popup = POPUP_RENDER_DEMO;
 			m_StartPaused = false;
 			m_DemoRenderInput.Set(m_aCurrentDemoSelectionName);
-			UI()->SetActiveItem(&m_DemoRenderInput);
+			Ui()->SetActiveItem(&m_DemoRenderInput);
 			if(m_DemolistStorageType != IStorage::TYPE_ALL && m_DemolistStorageType != IStorage::TYPE_SAVE)
 				m_DemolistStorageType = IStorage::TYPE_ALL; // Select a storage type containing the sliced demo
 		}
 #endif
 	}
-	if(s_ConfirmPopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+	if(s_ConfirmPopupContext.m_Result != CUi::SConfirmPopupContext::UNSET)
 	{
 		s_ConfirmPopupContext.Reset();
 	}
@@ -1060,6 +1062,8 @@ void CMenus::FetchAllHeaders()
 
 void CMenus::RenderDemoBrowser(CUIRect MainView)
 {
+	GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_DEMOS);
+
 	CUIRect ListView, DetailsView, ButtonsView;
 	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
 	MainView.Margin(10.0f, &MainView);
@@ -1085,7 +1089,14 @@ void CMenus::RenderDemoBrowserList(CUIRect ListView, bool &WasListboxItemActivat
 #if defined(CONF_VIDEORECORDER)
 	if(!m_DemoRenderInput.IsEmpty())
 	{
-		m_Popup = POPUP_RENDER_DONE;
+		if(DemoPlayer()->ErrorMessage()[0] == '\0')
+		{
+			m_Popup = POPUP_RENDER_DONE;
+		}
+		else
+		{
+			m_DemoRenderInput.Clear();
+		}
 	}
 #endif
 
@@ -1212,7 +1223,7 @@ void CMenus::RenderDemoBrowserList(CUIRect ListView, bool &WasListboxItemActivat
 				TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 				TextRender()->TextColor(IconColor);
 				TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
-				UI()->DoLabel(&Button, pIconType, 12.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&Button, pIconType, 12.0f, TEXTALIGN_ML);
 				TextRender()->SetRenderFlags(0);
 				TextRender()->TextColor(TextRender()->DefaultTextColor());
 				TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
@@ -1223,19 +1234,19 @@ void CMenus::RenderDemoBrowserList(CUIRect ListView, bool &WasListboxItemActivat
 				Props.m_MaxWidth = Button.w;
 				Props.m_EllipsisAtEnd = true;
 				Props.m_EnableWidthCheck = false;
-				UI()->DoLabel(&Button, pItem->m_aName, 12.0f, TEXTALIGN_ML, Props);
+				Ui()->DoLabel(&Button, pItem->m_aName, 12.0f, TEXTALIGN_ML, Props);
 			}
 			else if(Col.m_Id == COL_LENGTH && !pItem->m_IsDir && pItem->m_Valid)
 			{
 				str_time((int64_t)pItem->Length() * 100, TIME_HOURS, aBuf, sizeof(aBuf));
 				Button.VMargin(4.0f, &Button);
-				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
+				Ui()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
 			}
 			else if(Col.m_Id == COL_DATE && !pItem->m_IsDir)
 			{
 				str_timestamp_ex(pItem->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
 				Button.VMargin(4.0f, &Button);
-				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
+				Ui()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
 			}
 		}
 	}
@@ -1276,7 +1287,7 @@ void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
 		pHeaderLabel = Localize("Invalid Demo");
 	else
 		pHeaderLabel = Localize("Demo");
-	UI()->DoLabel(&Header, pHeaderLabel, FontSize + 2.0f, TEXTALIGN_MC);
+	Ui()->DoLabel(&Header, pHeaderLabel, FontSize + 2.0f, TEXTALIGN_MC);
 
 	if(pItem == nullptr || pItem->m_IsDir)
 		return;
@@ -1285,10 +1296,10 @@ void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
 	CUIRect Left, Right;
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, Localize("Created"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Created"), FontSize, TEXTALIGN_ML);
 	str_timestamp_ex(pItem->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 
 	if(!pItem->m_Valid)
@@ -1296,41 +1307,41 @@ void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	Left.VSplitMid(&Left, &Right, 4.0f);
-	UI()->DoLabel(&Left, Localize("Type"), FontSize, TEXTALIGN_ML);
-	UI()->DoLabel(&Right, Localize("Version"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Type"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Right, Localize("Version"), FontSize, TEXTALIGN_ML);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	Left.VSplitMid(&Left, &Right, 4.0f);
-	UI()->DoLabel(&Left, pItem->m_Info.m_aType, FontSize - 1.0f, TEXTALIGN_ML);
-	str_from_int(pItem->m_Info.m_Version, aBuf);
-	UI()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, pItem->m_Info.m_aType, FontSize - 1.0f, TEXTALIGN_ML);
+	str_format(aBuf, sizeof(aBuf), "%d", pItem->m_Info.m_Version);
+	Ui()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	Left.VSplitMid(&Left, &Right, 4.0f);
-	UI()->DoLabel(&Left, Localize("Length"), FontSize, TEXTALIGN_ML);
-	UI()->DoLabel(&Right, Localize("Markers"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Length"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Right, Localize("Markers"), FontSize, TEXTALIGN_ML);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	Left.VSplitMid(&Left, &Right, 4.0f);
 	str_time((int64_t)pItem->Length() * 100, TIME_HOURS, aBuf, sizeof(aBuf));
-	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
-	str_from_int(pItem->NumMarkers(), aBuf);
-	UI()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	str_format(aBuf, sizeof(aBuf), "%d", pItem->NumMarkers());
+	Ui()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, Localize("Netversion"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Netversion"), FontSize, TEXTALIGN_ML);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, pItem->m_Info.m_aNetversion, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, pItem->m_Info.m_aNetversion, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(16.0f, nullptr, &Contents);
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, Localize("Map"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Map"), FontSize, TEXTALIGN_ML);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, pItem->m_Info.m_aMapName, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, pItem->m_Info.m_aMapName, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
-	UI()->DoLabel(&Left, Localize("Size"), FontSize, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, Localize("Size"), FontSize, TEXTALIGN_ML);
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	const float Size = pItem->Size() / 1024.0f;
 	if(Size == 0.0f)
@@ -1339,13 +1350,13 @@ void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
 		str_format(aBuf, sizeof(aBuf), Localize("%.2f MiB"), Size / 1024.0f);
 	else
 		str_format(aBuf, sizeof(aBuf), Localize("%.2f KiB"), Size);
-	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 
 	Contents.HSplitTop(18.0f, &Left, &Contents);
 	if(pItem->m_MapInfo.m_Sha256 != SHA256_ZEROED)
 	{
-		UI()->DoLabel(&Left, "SHA256", FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Left, "SHA256", FontSize, TEXTALIGN_ML);
 		Contents.HSplitTop(18.0f, &Left, &Contents);
 		char aSha[SHA256_MAXSTRSIZE];
 		sha256_str(pItem->m_MapInfo.m_Sha256, aSha, sizeof(aSha));
@@ -1353,14 +1364,14 @@ void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
 		Props.m_MaxWidth = Left.w;
 		Props.m_EllipsisAtEnd = true;
 		Props.m_EnableWidthCheck = false;
-		UI()->DoLabel(&Left, aSha, FontSize - 1.0f, TEXTALIGN_ML, Props);
+		Ui()->DoLabel(&Left, aSha, FontSize - 1.0f, TEXTALIGN_ML, Props);
 	}
 	else
 	{
-		UI()->DoLabel(&Left, "CRC32", FontSize, TEXTALIGN_ML);
+		Ui()->DoLabel(&Left, "CRC32", FontSize, TEXTALIGN_ML);
 		Contents.HSplitTop(18.0f, &Left, &Contents);
 		str_format(aBuf, sizeof(aBuf), "%08x", pItem->m_MapInfo.m_Crc);
-		UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
 	}
 	Contents.HSplitTop(4.0f, nullptr, &Contents);
 }
@@ -1386,22 +1397,10 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 
 	// quick search
 	{
-		SetIconMode(true);
-		CUIRect DemoSearch, SearchIcon;
+		CUIRect DemoSearch;
 		ButtonBarTop.VSplitLeft(ButtonBarBottom.h * 21.0f, &DemoSearch, &ButtonBarTop);
 		ButtonBarTop.VSplitLeft(ButtonBarTop.h / 2.0f, nullptr, &ButtonBarTop);
-		DemoSearch.VSplitLeft(TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS), &SearchIcon, &DemoSearch);
-		DemoSearch.VSplitLeft(5.0f, nullptr, &DemoSearch);
-		UI()->DoLabel(&SearchIcon, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
-		SetIconMode(false);
-		m_DemoSearchInput.SetEmptyText(Localize("Search"));
-
-		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
-		{
-			UI()->SetActiveItem(&m_DemoSearchInput);
-			m_DemoSearchInput.SelectAll();
-		}
-		if(UI()->DoClearableEditBox(&m_DemoSearchInput, &DemoSearch, 12.0f))
+		if(Ui()->DoEditBox_Search(&m_DemoSearchInput, &DemoSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed()))
 		{
 			RefreshFilteredDemos();
 			DemolistOnUpdate(false);
@@ -1448,10 +1447,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 		{
 			char aBuf[IO_MAX_PATH_LENGTH];
 			Storage()->GetCompletePath(m_DemolistSelectedIndex >= 0 ? m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType : IStorage::TYPE_SAVE, m_aCurrentDemoFolder[0] == '\0' ? "demos" : m_aCurrentDemoFolder, aBuf, sizeof(aBuf));
-			if(!open_file(aBuf))
-			{
-				dbg_msg("menus", "couldn't open file '%s'", aBuf);
-			}
+			Client()->ViewFile(aBuf);
 		}
 		GameClient()->m_Tooltips.DoToolTip(&s_DemosDirectoryButton, &DemosDirectoryButton, Localize("Open the directory that contains the demo files"));
 	}
@@ -1464,7 +1460,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 		ButtonBarBottom.VSplitRight(ButtonBarBottom.h, &ButtonBarBottom, nullptr);
 		SetIconMode(true);
 		static CButtonContainer s_PlayButton;
-		if(DoButton_Menu(&s_PlayButton, (m_DemolistSelectedIndex >= 0 && m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir) ? FONT_ICON_FOLDER_OPEN : FONT_ICON_PLAY, 0, &PlayButton) || WasListboxItemActivated || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (Input()->KeyPress(KEY_P) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
+		if(DoButton_Menu(&s_PlayButton, (m_DemolistSelectedIndex >= 0 && m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir) ? FONT_ICON_FOLDER_OPEN : FONT_ICON_PLAY, 0, &PlayButton) || WasListboxItemActivated || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || (Input()->KeyPress(KEY_P) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
 		{
 			SetIconMode(false);
 			if(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir) // folder
@@ -1513,7 +1509,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 				}
 				else
 				{
-					UI()->SetActiveItem(nullptr);
+					Ui()->SetActiveItem(nullptr);
 					return;
 				}
 			}
@@ -1544,7 +1540,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 						fs_split_file_extension(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, aNameWithoutExt, sizeof(aNameWithoutExt));
 						m_DemoRenameInput.Set(aNameWithoutExt);
 					}
-					UI()->SetActiveItem(&m_DemoRenameInput);
+					Ui()->SetActiveItem(&m_DemoRenameInput);
 					return;
 				}
 
@@ -1553,7 +1549,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 				CUIRect DeleteButton;
 				ButtonBarBottom.VSplitRight(ButtonBarBottom.h * 3.0f, &ButtonBarBottom, &DeleteButton);
 				ButtonBarBottom.VSplitRight(ButtonBarBottom.h / 2.0f, &ButtonBarBottom, nullptr);
-				if(DoButton_Menu(&s_DeleteButton, FONT_ICON_TRASH, 0, &DeleteButton) || UI()->ConsumeHotkey(CUI::HOTKEY_DELETE) || (Input()->KeyPress(KEY_D) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
+				if(DoButton_Menu(&s_DeleteButton, FONT_ICON_TRASH, 0, &DeleteButton) || Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE) || (Input()->KeyPress(KEY_D) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
 				{
 					SetIconMode(false);
 					char aBuf[128 + IO_MAX_PATH_LENGTH];
@@ -1581,7 +1577,7 @@ void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemAc
 					char aNameWithoutExt[IO_MAX_PATH_LENGTH];
 					fs_split_file_extension(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, aNameWithoutExt, sizeof(aNameWithoutExt));
 					m_DemoRenderInput.Set(aNameWithoutExt);
-					UI()->SetActiveItem(&m_DemoRenderInput);
+					Ui()->SetActiveItem(&m_DemoRenderInput);
 					return;
 				}
 				SetIconMode(false);
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index d3b2099f95..ab511e7688 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -41,6 +41,7 @@ using namespace std::chrono_literals;
 void CMenus::RenderGame(CUIRect MainView)
 {
 	CUIRect Button, ButtonBar, ButtonBar2;
+	bool ShowDDRaceButtons = MainView.w > 855.0f;
 	MainView.HSplitTop(45.0f, &ButtonBar, &MainView);
 	ButtonBar.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
 
@@ -64,20 +65,25 @@ void CMenus::RenderGame(CUIRect MainView)
 		else
 		{
 			Client()->Disconnect();
-			RefreshBrowserTab(g_Config.m_UiPage);
+			RefreshBrowserTab(true);
 		}
 	}
 
-	ButtonBar.VSplitRight(5.0f, &ButtonBar, 0);
+	ButtonBar.VSplitRight(5.0f, &ButtonBar, nullptr);
 	ButtonBar.VSplitRight(170.0f, &ButtonBar, &Button);
 
-	bool DummyConnecting = Client()->DummyConnecting();
 	static CButtonContainer s_DummyButton;
 	if(!Client()->DummyAllowed())
 	{
 		DoButton_Menu(&s_DummyButton, Localize("Connect Dummy"), 1, &Button);
+		GameClient()->m_Tooltips.DoToolTip(&s_DummyButton, &Button, Localize("Dummy is not allowed on this server"));
 	}
-	else if(DummyConnecting)
+	else if(Client()->DummyConnectingDelayed())
+	{
+		DoButton_Menu(&s_DummyButton, Localize("Connect Dummy"), 1, &Button);
+		GameClient()->m_Tooltips.DoToolTip(&s_DummyButton, &Button, Localize("Please wait…"));
+	}
+	else if(Client()->DummyConnecting())
 	{
 		DoButton_Menu(&s_DummyButton, Localize("Connecting dummy"), 1, &Button);
 	}
@@ -101,38 +107,34 @@ void CMenus::RenderGame(CUIRect MainView)
 		}
 	}
 
-	ButtonBar.VSplitRight(5.0f, &ButtonBar, 0);
+	ButtonBar.VSplitRight(5.0f, &ButtonBar, nullptr);
 	ButtonBar.VSplitRight(140.0f, &ButtonBar, &Button);
-
 	static CButtonContainer s_DemoButton;
-	bool Recording = DemoRecorder(RECORDER_MANUAL)->IsRecording();
+	const bool Recording = DemoRecorder(RECORDER_MANUAL)->IsRecording();
 	if(DoButton_Menu(&s_DemoButton, Recording ? Localize("Stop record") : Localize("Record demo"), 0, &Button))
 	{
 		if(!Recording)
 			Client()->DemoRecorder_Start(Client()->GetCurrentMap(), true, RECORDER_MANUAL);
 		else
-			Client()->DemoRecorder_Stop(RECORDER_MANUAL);
+			Client()->DemoRecorder(RECORDER_MANUAL)->Stop(IDemoRecorder::EStopMode::KEEP_FILE);
 	}
 
-	static CButtonContainer s_SpectateButton;
-	static CButtonContainer s_JoinRedButton;
-	static CButtonContainer s_JoinBlueButton;
-
 	bool Paused = false;
 	bool Spec = false;
-	if(m_pClient->m_Snap.m_LocalClientID >= 0)
+	if(m_pClient->m_Snap.m_LocalClientId >= 0)
 	{
-		Paused = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_Paused;
-		Spec = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_Spec;
+		Paused = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId].m_Paused;
+		Spec = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId].m_Spec;
 	}
 
 	if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && !Paused && !Spec)
 	{
 		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
 		{
-			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 			ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
-			if(!DummyConnecting && DoButton_Menu(&s_SpectateButton, Localize("Spectate"), 0, &Button))
+			ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
+			static CButtonContainer s_SpectateButton;
+			if(!Client()->DummyConnecting() && DoButton_Menu(&s_SpectateButton, Localize("Spectate"), 0, &Button))
 			{
 				if(g_Config.m_ClDummy == 0 || Client()->DummyConnected())
 				{
@@ -146,9 +148,10 @@ void CMenus::RenderGame(CUIRect MainView)
 		{
 			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED)
 			{
-				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
-				if(!DummyConnecting && DoButton_Menu(&s_JoinRedButton, Localize("Join red"), 0, &Button))
+				ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
+				static CButtonContainer s_JoinRedButton;
+				if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinRedButton, Localize("Join red"), 0, &Button))
 				{
 					m_pClient->SendSwitchTeam(TEAM_RED);
 					SetActive(false);
@@ -157,9 +160,10 @@ void CMenus::RenderGame(CUIRect MainView)
 
 			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_BLUE)
 			{
-				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
-				if(!DummyConnecting && DoButton_Menu(&s_JoinBlueButton, Localize("Join blue"), 0, &Button))
+				ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
+				static CButtonContainer s_JoinBlueButton;
+				if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinBlueButton, Localize("Join blue"), 0, &Button))
 				{
 					m_pClient->SendSwitchTeam(TEAM_BLUE);
 					SetActive(false);
@@ -168,22 +172,23 @@ void CMenus::RenderGame(CUIRect MainView)
 		}
 		else
 		{
-			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != 0)
+			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED)
 			{
-				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
-				if(!DummyConnecting && DoButton_Menu(&s_SpectateButton, Localize("Join game"), 0, &Button))
+				ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
+				static CButtonContainer s_JoinGameButton;
+				if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinGameButton, Localize("Join game"), 0, &Button))
 				{
-					m_pClient->SendSwitchTeam(0);
+					m_pClient->SendSwitchTeam(TEAM_RED);
 					SetActive(false);
 				}
 			}
 		}
 
-		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
+		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)))
 		{
-			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 			ButtonBar.VSplitLeft(65.0f, &Button, &ButtonBar);
+			ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
 
 			static CButtonContainer s_KillButton;
 			if(DoButton_Menu(&s_KillButton, Localize("Kill"), 0, &Button))
@@ -194,17 +199,17 @@ void CMenus::RenderGame(CUIRect MainView)
 		}
 	}
 
-	if(m_pClient->m_ReceivedDDNetPlayer && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj)
+	if(m_pClient->m_ReceivedDDNetPlayer && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)))
 	{
 		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS || Paused || Spec)
 		{
-			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
 			ButtonBar.VSplitLeft((!Paused && !Spec) ? 65.0f : 120.0f, &Button, &ButtonBar);
+			ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
 
 			static CButtonContainer s_PauseButton;
 			if(DoButton_Menu(&s_PauseButton, (!Paused && !Spec) ? Localize("Pause") : Localize("Join game"), 0, &Button))
 			{
-				m_pClient->Console()->ExecuteLine("say /pause");
+				Console()->ExecuteLine("say /pause");
 				SetActive(false);
 			}
 		}
@@ -224,20 +229,18 @@ void CMenus::PopupConfirmDisconnectDummy()
 
 void CMenus::RenderPlayers(CUIRect MainView)
 {
-	CUIRect Button, Button2, ButtonBar, Options, Player;
+	CUIRect Button, Button2, ButtonBar, PlayerList, Player;
 	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
 
-	// player options
-	MainView.Margin(10.0f, &Options);
-	Options.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 10.0f);
-	Options.Margin(10.0f, &Options);
-	Options.HSplitTop(50.0f, &Button, &Options);
-	UI()->DoLabel(&Button, Localize("Player options"), 34.0f, TEXTALIGN_ML);
+	// list background color
+	MainView.Margin(10.0f, &PlayerList);
+	PlayerList.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+	PlayerList.Margin(10.0f, &PlayerList);
 
 	// headline
-	Options.HSplitTop(34.0f, &ButtonBar, &Options);
+	PlayerList.HSplitTop(34.0f, &ButtonBar, &PlayerList);
 	ButtonBar.VSplitRight(231.0f, &Player, &ButtonBar);
-	UI()->DoLabel(&Player, Localize("Player"), 24.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Player, Localize("Player"), 24.0f, TEXTALIGN_ML);
 
 	ButtonBar.HMargin(1.0f, &ButtonBar);
 	float Width = ButtonBar.h * 2.0f;
@@ -252,37 +255,33 @@ void CMenus::RenderPlayers(CUIRect MainView)
 	ButtonBar.VSplitLeft(Width, &Button, &ButtonBar);
 	RenderTools()->RenderIcon(IMAGE_GUIICONS, SPRITE_GUIICON_FRIEND, &Button);
 
-	Options.HSplitTop(34.0f, &ButtonBar, &Options);
-	ButtonBar.VSplitRight(310.0f, &Player, &ButtonBar);
-	UI()->DoLabel(&Player, Localize("Blacklist"), 10.0f, TEXTALIGN_MR);
-
 	int TotalPlayers = 0;
 	for(const auto &pInfoByName : m_pClient->m_Snap.m_apInfoByName)
 	{
 		if(!pInfoByName)
 			continue;
 
-		int Index = pInfoByName->m_ClientID;
+		int Index = pInfoByName->m_ClientId;
 
-		if(Index == m_pClient->m_Snap.m_LocalClientID)
+		if(Index == m_pClient->m_Snap.m_LocalClientId)
 			continue;
 
 		TotalPlayers++;
 	}
 
 	static CListBox s_ListBox;
-	s_ListBox.DoStart(24.0f, TotalPlayers, 1, 3, -1, &Options);
+	s_ListBox.DoStart(24.0f, TotalPlayers, 1, 3, -1, &PlayerList);
 
 	// options
-	static char s_aPlayerIDs[MAX_CLIENTS][4] = {{0}};
+	static char s_aPlayerIds[MAX_CLIENTS][4] = {{0}};
 
 	for(int i = 0, Count = 0; i < MAX_CLIENTS; ++i)
 	{
 		if(!m_pClient->m_Snap.m_apInfoByName[i])
 			continue;
 
-		int Index = m_pClient->m_Snap.m_apInfoByName[i]->m_ClientID;
-		if(Index == m_pClient->m_Snap.m_LocalClientID)
+		int Index = m_pClient->m_Snap.m_apInfoByName[i]->m_ClientId;
+		if(Index == m_pClient->m_Snap.m_LocalClientId)
 			continue;
 
 		CGameClient::CClientData &CurrentClient = m_pClient->m_aClients[Index];
@@ -303,49 +302,34 @@ void CMenus::RenderPlayers(CUIRect MainView)
 		Player.VSplitLeft(28.0f, &Button, &Player);
 
 		CTeeRenderInfo TeeInfo = CurrentClient.m_RenderInfo;
-
 		TeeInfo.m_Size = Button.h;
 
 		const CAnimState *pIdleState = CAnimState::GetIdle();
 		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 		vec2 TeeRenderPos(Button.x + Button.h / 2, Button.y + Button.h / 2 + OffsetToMid.y);
-
 		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+		Ui()->DoButtonLogic(&s_aPlayerIds[Index][3], 0, &Button);
+		GameClient()->m_Tooltips.DoToolTip(&s_aPlayerIds[Index][3], &Button, CurrentClient.m_aSkinName);
 
 		Player.HSplitTop(1.5f, nullptr, &Player);
 		Player.VSplitMid(&Player, &Button);
 		Row.VSplitRight(210.0f, &Button2, &Row);
 
-		UI()->DoLabel(&Player, CurrentClient.m_aName, 14.0f, TEXTALIGN_ML);
-		UI()->DoLabel(&Button, CurrentClient.m_aClan, 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Player, CurrentClient.m_aName, 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Button, CurrentClient.m_aClan, 14.0f, TEXTALIGN_ML);
 
 		m_pClient->m_CountryFlags.Render(CurrentClient.m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f),
 			Button2.x, Button2.y + Button2.h / 2.0f - 0.75f * Button2.h / 2.0f, 1.5f * Button2.h, 0.75f * Button2.h);
 
-		//blacklisting hahxd
-		Row.VSplitLeft(5.0f, &Row, nullptr);
-		//  Row.VSplitLeft(Width, &Button, &Row);
-		Button.VSplitRight((Width - Button.h) / 4.0f, nullptr, &Button);
-		Button.VSplitRight(Button.h, nullptr, &Button);
-
-		if(DoButton_CheckBox(&s_aPlayerIDs[Index][3], Localize(""), CurrentClient.m_Foe, &Button))
-		{
-			CurrentClient.m_Foe ^= 1;
-			if(CurrentClient.m_Foe)
-				Client()->Foes()->AddFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
-			else
-				Client()->Foes()->RemoveFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
-		}
-
 		// ignore chat button
 		Row.HMargin(2.0f, &Row);
 		Row.VSplitLeft(Width, &Button, &Row);
 		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
 		Button.VSplitLeft(Button.h, &Button, nullptr);
 		if(g_Config.m_ClShowChatFriends && !CurrentClient.m_Friend)
-			DoButton_Toggle(&s_aPlayerIDs[Index][0], 1, &Button, false);
-		else if(DoButton_Toggle(&s_aPlayerIDs[Index][0], CurrentClient.m_ChatIgnore, &Button, true))
+			DoButton_Toggle(&s_aPlayerIds[Index][0], 1, &Button, false);
+		else if(DoButton_Toggle(&s_aPlayerIds[Index][0], CurrentClient.m_ChatIgnore, &Button, true))
 			CurrentClient.m_ChatIgnore ^= 1;
 
 		// ignore emoticon button
@@ -354,8 +338,8 @@ void CMenus::RenderPlayers(CUIRect MainView)
 		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
 		Button.VSplitLeft(Button.h, &Button, nullptr);
 		if(g_Config.m_ClShowChatFriends && !CurrentClient.m_Friend)
-			DoButton_Toggle(&s_aPlayerIDs[Index][1], 1, &Button, false);
-		else if(DoButton_Toggle(&s_aPlayerIDs[Index][1], CurrentClient.m_EmoticonIgnore, &Button, true))
+			DoButton_Toggle(&s_aPlayerIds[Index][1], 1, &Button, false);
+		else if(DoButton_Toggle(&s_aPlayerIds[Index][1], CurrentClient.m_EmoticonIgnore, &Button, true))
 			CurrentClient.m_EmoticonIgnore ^= 1;
 
 		// friend button
@@ -363,7 +347,7 @@ void CMenus::RenderPlayers(CUIRect MainView)
 		Row.VSplitLeft(Width, &Button, &Row);
 		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
 		Button.VSplitLeft(Button.h, &Button, nullptr);
-		if(DoButton_Toggle(&s_aPlayerIDs[Index][2], CurrentClient.m_Friend, &Button, true))
+		if(DoButton_Toggle(&s_aPlayerIds[Index][2], CurrentClient.m_Friend, &Button, true))
 		{
 			if(CurrentClient.m_Friend)
 				m_pClient->Friends()->RemoveFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
@@ -396,7 +380,7 @@ void CMenus::RenderServerInfo(CUIRect MainView)
 
 	char aBuf[1024];
 
-	// set view to use for all submodules
+	// set view to use for all sub-modules
 	MainView.Margin(10.0f, &View);
 
 	// serverinfo
@@ -438,7 +422,15 @@ void CMenus::RenderServerInfo(CUIRect MainView)
 		if(DoButton_Menu(&s_CopyButton, Localize("Copy info"), 0, &Button))
 		{
 			char aInfo[256];
-			CurrentServerInfo.InfoToString(aInfo, sizeof(aInfo));
+			str_format(
+				aInfo,
+				sizeof(aInfo),
+				"%s\n"
+				"Address: ddnet://%s\n"
+				"My IGN: %s\n",
+				CurrentServerInfo.m_aName,
+				CurrentServerInfo.m_aAddress,
+				Client()->PlayerName());
 			Input()->SetClipboardText(aInfo);
 		}
 	}
@@ -576,7 +568,7 @@ bool CMenus::RenderServerControlServer(CUIRect MainView)
 
 		CUIRect Label;
 		Item.m_Rect.VMargin(2.0f, &Label);
-		UI()->DoLabel(&Label, pOption->m_aDescription, 13.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, pOption->m_aDescription, 13.0f, TEXTALIGN_ML);
 	}
 
 	s_CurVoteOption = s_ListBox.DoEnd();
@@ -588,15 +580,15 @@ bool CMenus::RenderServerControlServer(CUIRect MainView)
 bool CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 {
 	int NumOptions = 0;
-	int Selected = 0;
-	static int aPlayerIDs[MAX_CLIENTS];
+	int Selected = -1;
+	int aPlayerIds[MAX_CLIENTS];
 	for(const auto &pInfoByName : m_pClient->m_Snap.m_apInfoByName)
 	{
 		if(!pInfoByName)
 			continue;
 
-		int Index = pInfoByName->m_ClientID;
-		if(Index == m_pClient->m_Snap.m_LocalClientID || (FilterSpectators && pInfoByName->m_Team == TEAM_SPECTATORS))
+		int Index = pInfoByName->m_ClientId;
+		if(Index == m_pClient->m_Snap.m_LocalClientId || (FilterSpectators && pInfoByName->m_Team == TEAM_SPECTATORS))
 			continue;
 
 		if(!str_utf8_find_nocase(m_pClient->m_aClients[Index].m_aName, m_FilterInput.GetString()))
@@ -604,7 +596,8 @@ bool CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 
 		if(m_CallvoteSelectedPlayer == Index)
 			Selected = NumOptions;
-		aPlayerIDs[NumOptions++] = Index;
+		aPlayerIds[NumOptions] = Index;
+		NumOptions++;
 	}
 
 	static CListBox s_ListBox;
@@ -612,38 +605,45 @@ bool CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 
 	for(int i = 0; i < NumOptions; i++)
 	{
-		const CListboxItem Item = s_ListBox.DoNextItem(&aPlayerIDs[i]);
+		const CListboxItem Item = s_ListBox.DoNextItem(&aPlayerIds[i]);
 		if(!Item.m_Visible)
 			continue;
 
 		CUIRect TeeRect, Label;
 		Item.m_Rect.VSplitLeft(Item.m_Rect.h, &TeeRect, &Label);
 
-		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[aPlayerIDs[i]].m_RenderInfo;
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[aPlayerIds[i]].m_RenderInfo;
 		TeeInfo.m_Size = TeeRect.h;
 
 		const CAnimState *pIdleState = CAnimState::GetIdle();
 		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 		vec2 TeeRenderPos(TeeRect.x + TeeInfo.m_Size / 2, TeeRect.y + TeeInfo.m_Size / 2 + OffsetToMid.y);
 
 		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
 
-		UI()->DoLabel(&Label, m_pClient->m_aClients[aPlayerIDs[i]].m_aName, 16.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, m_pClient->m_aClients[aPlayerIds[i]].m_aName, 16.0f, TEXTALIGN_ML);
 	}
 
 	Selected = s_ListBox.DoEnd();
-	m_CallvoteSelectedPlayer = Selected != -1 ? aPlayerIDs[Selected] : -1;
+	m_CallvoteSelectedPlayer = Selected != -1 ? aPlayerIds[Selected] : -1;
 	return s_ListBox.WasItemActivated();
 }
 
 void CMenus::RenderServerControl(CUIRect MainView)
 {
-	static int s_ControlPage = 0;
+	enum class EServerControlTab
+	{
+		SETTINGS,
+		KICKVOTE,
+		SPECVOTE,
+	};
+	static EServerControlTab s_ControlPage = EServerControlTab::SETTINGS;
+
 	// render background
 	CUIRect Bottom, RconExtension, TabBar, Button;
 	MainView.HSplitTop(20.0f, &Bottom, &MainView);
-	Bottom.Draw(ms_ColorTabbarActive, 0, 10.0f);
+	Bottom.Draw(ms_ColorTabbarActive, IGraphics::CORNER_NONE, 0.0f);
 	MainView.HSplitTop(20.0f, &TabBar, &MainView);
 	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
 	MainView.Margin(10.0f, &MainView);
@@ -654,71 +654,59 @@ void CMenus::RenderServerControl(CUIRect MainView)
 	// tab bar
 	TabBar.VSplitLeft(TabBar.w / 3, &Button, &TabBar);
 	static CButtonContainer s_Button0;
-	if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == 0, &Button, 0))
-		s_ControlPage = 0;
+	if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == EServerControlTab::SETTINGS, &Button, IGraphics::CORNER_NONE))
+		s_ControlPage = EServerControlTab::SETTINGS;
 
 	TabBar.VSplitMid(&Button, &TabBar);
 	static CButtonContainer s_Button1;
-	if(DoButton_MenuTab(&s_Button1, Localize("Kick player"), s_ControlPage == 1, &Button, 0))
-		s_ControlPage = 1;
+	if(DoButton_MenuTab(&s_Button1, Localize("Kick player"), s_ControlPage == EServerControlTab::KICKVOTE, &Button, IGraphics::CORNER_NONE))
+		s_ControlPage = EServerControlTab::KICKVOTE;
 
 	static CButtonContainer s_Button2;
-	if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == 2, &TabBar, 0))
-		s_ControlPage = 2;
+	if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == EServerControlTab::SPECVOTE, &TabBar, IGraphics::CORNER_NONE))
+		s_ControlPage = EServerControlTab::SPECVOTE;
 
 	// render page
 	MainView.HSplitBottom(ms_ButtonHeight + 5 * 2, &MainView, &Bottom);
 	Bottom.HMargin(5.0f, &Bottom);
+	Bottom.HSplitTop(5.0f, nullptr, &Bottom);
 
 	bool Call = false;
-	if(s_ControlPage == 0)
+	if(s_ControlPage == EServerControlTab::SETTINGS)
 		Call = RenderServerControlServer(MainView);
-	else if(s_ControlPage == 1)
+	else if(s_ControlPage == EServerControlTab::KICKVOTE)
 		Call = RenderServerControlKick(MainView, false);
-	else if(s_ControlPage == 2)
+	else if(s_ControlPage == EServerControlTab::SPECVOTE)
 		Call = RenderServerControlKick(MainView, true);
 
 	// vote menu
-	CUIRect QuickSearch;
 
 	// render quick search
-	Bottom.VSplitLeft(5.0f, 0, &Bottom);
+	CUIRect QuickSearch;
+	Bottom.VSplitLeft(5.0f, nullptr, &Bottom);
 	Bottom.VSplitLeft(250.0f, &QuickSearch, &Bottom);
-	QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
-	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-
-	UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
-	float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
-	TextRender()->SetRenderFlags(0);
-	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-	QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
-	QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
-
-	if(m_ControlPageOpening || (Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed()))
+	if(m_ControlPageOpening)
 	{
-		UI()->SetActiveItem(&m_FilterInput);
 		m_ControlPageOpening = false;
+		Ui()->SetActiveItem(&m_FilterInput);
 		m_FilterInput.SelectAll();
 	}
-	m_FilterInput.SetEmptyText(Localize("Search"));
-	UI()->DoClearableEditBox(&m_FilterInput, &QuickSearch, 14.0f);
+	Ui()->DoEditBox_Search(&m_FilterInput, &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed());
 
 	// call vote
 	Bottom.VSplitRight(10.0f, &Bottom, 0);
 	Bottom.VSplitRight(120.0f, &Bottom, &Button);
-	Button.HSplitTop(5.0f, 0, &Button);
 
 	static CButtonContainer s_CallVoteButton;
 	if(DoButton_Menu(&s_CallVoteButton, Localize("Call vote"), 0, &Button) || Call)
 	{
-		if(s_ControlPage == 0)
+		if(s_ControlPage == EServerControlTab::SETTINGS)
 		{
 			m_pClient->m_Voting.CallvoteOption(m_CallvoteSelectedOption, m_CallvoteReasonInput.GetString());
 			if(g_Config.m_UiCloseWindowAfterChangingSetting)
 				SetActive(false);
 		}
-		else if(s_ControlPage == 1)
+		else if(s_ControlPage == EServerControlTab::KICKVOTE)
 		{
 			if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
 				m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
@@ -727,7 +715,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
 				SetActive(false);
 			}
 		}
-		else if(s_ControlPage == 2)
+		else if(s_ControlPage == EServerControlTab::SPECVOTE)
 		{
 			if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
 				m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
@@ -743,17 +731,28 @@ void CMenus::RenderServerControl(CUIRect MainView)
 	CUIRect Reason;
 	Bottom.VSplitRight(20.0f, &Bottom, 0);
 	Bottom.VSplitRight(200.0f, &Bottom, &Reason);
-	Reason.HSplitTop(5.0f, 0, &Reason);
 	const char *pLabel = Localize("Reason:");
-	UI()->DoLabel(&Reason, pLabel, 14.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Reason, pLabel, 14.0f, TEXTALIGN_ML);
 	float w = TextRender()->TextWidth(14.0f, pLabel, -1, -1.0f);
 	Reason.VSplitLeft(w + 10.0f, 0, &Reason);
 	if(Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed())
 	{
-		UI()->SetActiveItem(&m_CallvoteReasonInput);
+		Ui()->SetActiveItem(&m_CallvoteReasonInput);
 		m_CallvoteReasonInput.SelectAll();
 	}
-	UI()->DoEditBox(&m_CallvoteReasonInput, &Reason, 14.0f);
+	Ui()->DoEditBox(&m_CallvoteReasonInput, &Reason, 14.0f);
+
+	// vote option loading indicator
+	if(s_ControlPage == EServerControlTab::SETTINGS && m_pClient->m_Voting.IsReceivingOptions())
+	{
+		CUIRect Spinner, LoadingLabel;
+		Bottom.VSplitLeft(20.0f, nullptr, &Bottom);
+		Bottom.VSplitLeft(16.0f, &Spinner, &Bottom);
+		Bottom.VSplitLeft(5.0f, nullptr, &Bottom);
+		Bottom.VSplitRight(10.0f, &LoadingLabel, nullptr);
+		Ui()->RenderProgressSpinner(Spinner.Center(), 8.0f);
+		Ui()->DoLabel(&LoadingLabel, Localize("Loading…"), 14.0f, TEXTALIGN_ML);
+	}
 
 	// extended features (only available when authed in rcon)
 	if(Client()->RconAuthed())
@@ -770,9 +769,11 @@ void CMenus::RenderServerControl(CUIRect MainView)
 		static CButtonContainer s_ForceVoteButton;
 		if(DoButton_Menu(&s_ForceVoteButton, Localize("Force vote"), 0, &Button))
 		{
-			if(s_ControlPage == 0)
+			if(s_ControlPage == EServerControlTab::SETTINGS)
+			{
 				m_pClient->m_Voting.CallvoteOption(m_CallvoteSelectedOption, m_CallvoteReasonInput.GetString(), true);
-			else if(s_ControlPage == 1)
+			}
+			else if(s_ControlPage == EServerControlTab::KICKVOTE)
 			{
 				if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
 					m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
@@ -781,7 +782,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
 					SetActive(false);
 				}
 			}
-			else if(s_ControlPage == 2)
+			else if(s_ControlPage == EServerControlTab::SPECVOTE)
 			{
 				if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
 					m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
@@ -793,7 +794,7 @@ void CMenus::RenderServerControl(CUIRect MainView)
 			m_CallvoteReasonInput.Clear();
 		}
 
-		if(s_ControlPage == 0)
+		if(s_ControlPage == EServerControlTab::SETTINGS)
 		{
 			// remove vote
 			Bottom.VSplitRight(10.0f, &Bottom, 0);
@@ -806,10 +807,10 @@ void CMenus::RenderServerControl(CUIRect MainView)
 			RconExtension.HSplitTop(20.0f, &Bottom, &RconExtension);
 			Bottom.VSplitLeft(5.0f, 0, &Bottom);
 			Bottom.VSplitLeft(250.0f, &Button, &Bottom);
-			UI()->DoLabel(&Button, Localize("Vote description:"), 14.0f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Vote description:"), 14.0f, TEXTALIGN_ML);
 
 			Bottom.VSplitLeft(20.0f, 0, &Button);
-			UI()->DoLabel(&Button, Localize("Vote command:"), 14.0f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Vote command:"), 14.0f, TEXTALIGN_ML);
 
 			static CLineInputBuffered<VOTE_DESC_LENGTH> s_VoteDescriptionInput;
 			static CLineInputBuffered<VOTE_CMD_LENGTH> s_VoteCommandInput;
@@ -823,10 +824,10 @@ void CMenus::RenderServerControl(CUIRect MainView)
 
 			Bottom.VSplitLeft(5.0f, 0, &Bottom);
 			Bottom.VSplitLeft(250.0f, &Button, &Bottom);
-			UI()->DoEditBox(&s_VoteDescriptionInput, &Button, 14.0f);
+			Ui()->DoEditBox(&s_VoteDescriptionInput, &Button, 14.0f);
 
 			Bottom.VMargin(20.0f, &Button);
-			UI()->DoEditBox(&s_VoteCommandInput, &Button, 14.0f);
+			Ui()->DoEditBox(&s_VoteCommandInput, &Button, 14.0f);
 		}
 	}
 }
@@ -840,45 +841,57 @@ void CMenus::RenderInGameNetwork(CUIRect MainView)
 
 	int NewPage = g_Config.m_UiPage;
 
-	TabBar.VSplitLeft(100.0f, &Button, &TabBar);
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+	TabBar.VSplitLeft(75.0f, &Button, &TabBar);
 	static CButtonContainer s_InternetButton;
-	if(DoButton_MenuTab(&s_InternetButton, Localize("Internet"), g_Config.m_UiPage == PAGE_INTERNET, &Button, IGraphics::CORNER_NONE))
+	if(DoButton_MenuTab(&s_InternetButton, FONT_ICON_EARTH_AMERICAS, g_Config.m_UiPage == PAGE_INTERNET, &Button, IGraphics::CORNER_NONE))
 	{
-		if(g_Config.m_UiPage != PAGE_INTERNET)
-		{
-			if(g_Config.m_UiPage != PAGE_FAVORITES)
-				Client()->RequestDDNetInfo();
-			ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
-		}
 		NewPage = PAGE_INTERNET;
 	}
+	GameClient()->m_Tooltips.DoToolTip(&s_InternetButton, &Button, Localize("Internet"));
 
-	TabBar.VSplitLeft(80.0f, &Button, &TabBar);
+	TabBar.VSplitLeft(75.0f, &Button, &TabBar);
 	static CButtonContainer s_LanButton;
-	if(DoButton_MenuTab(&s_LanButton, Localize("LAN"), g_Config.m_UiPage == PAGE_LAN, &Button, IGraphics::CORNER_NONE))
+	if(DoButton_MenuTab(&s_LanButton, FONT_ICON_NETWORK_WIRED, g_Config.m_UiPage == PAGE_LAN, &Button, IGraphics::CORNER_NONE))
 	{
-		if(g_Config.m_UiPage != PAGE_LAN)
-			ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
 		NewPage = PAGE_LAN;
 	}
+	GameClient()->m_Tooltips.DoToolTip(&s_LanButton, &Button, Localize("LAN"));
 
-	TabBar.VSplitLeft(110.0f, &Button, &TabBar);
+	TabBar.VSplitLeft(75.0f, &Button, &TabBar);
 	static CButtonContainer s_FavoritesButton;
-	if(DoButton_MenuTab(&s_FavoritesButton, Localize("Favorites"), g_Config.m_UiPage == PAGE_FAVORITES, &Button, IGraphics::CORNER_NONE))
+	if(DoButton_MenuTab(&s_FavoritesButton, FONT_ICON_STAR, g_Config.m_UiPage == PAGE_FAVORITES, &Button, IGraphics::CORNER_NONE))
+	{
+		NewPage = PAGE_FAVORITES;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_FavoritesButton, &Button, Localize("Favorites"));
+
+	size_t FavoriteCommunityIndex = 0;
+	static CButtonContainer s_aFavoriteCommunityButtons[5];
+	static_assert(std::size(s_aFavoriteCommunityButtons) == (size_t)PAGE_FAVORITE_COMMUNITY_5 - PAGE_FAVORITE_COMMUNITY_1 + 1);
+	for(const CCommunity *pCommunity : ServerBrowser()->FavoriteCommunities())
 	{
-		if(g_Config.m_UiPage != PAGE_FAVORITES)
+		TabBar.VSplitLeft(75.0f, &Button, &TabBar);
+		const int Page = PAGE_FAVORITE_COMMUNITY_1 + FavoriteCommunityIndex;
+		if(DoButton_MenuTab(&s_aFavoriteCommunityButtons[FavoriteCommunityIndex], FONT_ICON_ELLIPSIS, g_Config.m_UiPage == Page, &Button, IGraphics::CORNER_NONE, nullptr, nullptr, nullptr, nullptr, 10.0f, FindCommunityIcon(pCommunity->Id())))
 		{
-			if(g_Config.m_UiPage != PAGE_INTERNET)
-				Client()->RequestDDNetInfo();
-			ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+			NewPage = Page;
 		}
-		NewPage = PAGE_FAVORITES;
+		GameClient()->m_Tooltips.DoToolTip(&s_aFavoriteCommunityButtons[FavoriteCommunityIndex], &Button, pCommunity->Name());
+
+		++FavoriteCommunityIndex;
+		if(FavoriteCommunityIndex >= std::size(s_aFavoriteCommunityButtons))
+			break;
 	}
 
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
 	if(NewPage != g_Config.m_UiPage)
 	{
-		if(Client()->State() != IClient::STATE_OFFLINE)
-			SetMenuPage(NewPage);
+		SetMenuPage(NewPage);
 	}
 
 	RenderServerbrowser(MainView);
@@ -920,7 +933,7 @@ void CMenus::GhostlistPopulate()
 	m_vGhosts.clear();
 	m_GhostPopulateStartTime = time_get_nanoseconds();
 	Storage()->ListDirectoryInfo(IStorage::TYPE_ALL, m_pClient->m_Ghost.GetGhostDir(), GhostlistFetchCallback, this);
-	std::sort(m_vGhosts.begin(), m_vGhosts.end());
+	SortGhostlist();
 
 	CGhostItem *pOwnGhost = 0;
 	for(auto &Ghost : m_vGhosts)
@@ -952,33 +965,31 @@ void CMenus::UpdateOwnGhost(CGhostItem Item)
 		if(m_vGhosts[i].m_Own)
 			Own = i;
 
-	if(Own != -1)
+	if(Own == -1)
 	{
-		if(g_Config.m_ClRaceGhostSaveBest)
-		{
-			if(Item.HasFile() || !m_vGhosts[Own].HasFile())
-				DeleteGhostItem(Own);
-		}
-		if(m_vGhosts[Own].m_Time > Item.m_Time)
-		{
-			Item.m_Own = true;
-			m_vGhosts[Own].m_Own = false;
-			m_vGhosts[Own].m_Slot = -1;
-		}
-		else
-		{
-			Item.m_Own = false;
-			Item.m_Slot = -1;
-		}
+		Item.m_Own = true;
 	}
-	else
+	else if(g_Config.m_ClRaceGhostSaveBest && (Item.HasFile() || !m_vGhosts[Own].HasFile()))
+	{
+		Item.m_Own = true;
+		DeleteGhostItem(Own);
+	}
+	else if(m_vGhosts[Own].m_Time > Item.m_Time)
 	{
 		Item.m_Own = true;
+		m_vGhosts[Own].m_Own = false;
+		m_vGhosts[Own].m_Slot = -1;
+	}
+	else
+	{
+		Item.m_Own = false;
+		Item.m_Slot = -1;
 	}
 
 	Item.m_Date = std::time(0);
 	Item.m_Failed = false;
 	m_vGhosts.insert(std::lower_bound(m_vGhosts.begin(), m_vGhosts.end(), Item), Item);
+	SortGhostlist();
 }
 
 void CMenus::DeleteGhostItem(int Index)
@@ -988,6 +999,22 @@ void CMenus::DeleteGhostItem(int Index)
 	m_vGhosts.erase(m_vGhosts.begin() + Index);
 }
 
+void CMenus::SortGhostlist()
+{
+	if(g_Config.m_GhSort == GHOST_SORT_NAME)
+		std::stable_sort(m_vGhosts.begin(), m_vGhosts.end(), [](const CGhostItem &Left, const CGhostItem &Right) {
+			return g_Config.m_GhSortOrder ? (str_comp(Left.m_aPlayer, Right.m_aPlayer) > 0) : (str_comp(Left.m_aPlayer, Right.m_aPlayer) < 0);
+		});
+	else if(g_Config.m_GhSort == GHOST_SORT_TIME)
+		std::stable_sort(m_vGhosts.begin(), m_vGhosts.end(), [](const CGhostItem &Left, const CGhostItem &Right) {
+			return g_Config.m_GhSortOrder ? (Left.m_Time > Right.m_Time) : (Left.m_Time < Right.m_Time);
+		});
+	else if(g_Config.m_GhSort == GHOST_SORT_DATE)
+		std::stable_sort(m_vGhosts.begin(), m_vGhosts.end(), [](const CGhostItem &Left, const CGhostItem &Right) {
+			return g_Config.m_GhSortOrder ? (Left.m_Date > Right.m_Date) : (Left.m_Date < Right.m_Date);
+		});
+}
+
 void CMenus::RenderGhost(CUIRect MainView)
 {
 	// render background
@@ -1008,13 +1035,14 @@ void CMenus::RenderGhost(CUIRect MainView)
 	Headers.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_T, 5.0f);
 	Headers.VSplitRight(20.0f, &Headers, 0);
 
-	struct CColumn
+	class CColumn
 	{
+	public:
 		const char *m_pCaption;
 		int m_Id;
+		int m_Sort;
 		float m_Width;
 		CUIRect m_Rect;
-		CUIRect m_Spacer;
 	};
 
 	enum
@@ -1026,11 +1054,11 @@ void CMenus::RenderGhost(CUIRect MainView)
 	};
 
 	static CColumn s_aCols[] = {
-		{"", -1, 2.0f, {0}, {0}},
-		{"", COL_ACTIVE, 30.0f, {0}, {0}},
-		{Localizable("Name"), COL_NAME, 200.0f, {0}, {0}},
-		{Localizable("Time"), COL_TIME, 90.0f, {0}, {0}},
-		{Localizable("Date"), COL_DATE, 150.0f, {0}, {0}},
+		{"", -1, GHOST_SORT_NONE, 2.0f, {0}},
+		{"", COL_ACTIVE, GHOST_SORT_NONE, 30.0f, {0}},
+		{Localizable("Name"), COL_NAME, GHOST_SORT_NAME, 200.0f, {0}},
+		{Localizable("Time"), COL_TIME, GHOST_SORT_TIME, 90.0f, {0}},
+		{Localizable("Date"), COL_DATE, GHOST_SORT_DATE, 150.0f, {0}},
 	};
 
 	int NumCols = std::size(s_aCols);
@@ -1041,12 +1069,26 @@ void CMenus::RenderGhost(CUIRect MainView)
 		Headers.VSplitLeft(s_aCols[i].m_Width, &s_aCols[i].m_Rect, &Headers);
 
 		if(i + 1 < NumCols)
-			Headers.VSplitLeft(2, &s_aCols[i].m_Spacer, &Headers);
+			Headers.VSplitLeft(2, nullptr, &Headers);
 	}
 
 	// do headers
-	for(int i = 0; i < NumCols; i++)
-		DoButton_GridHeader(&s_aCols[i].m_Id, Localize(s_aCols[i].m_pCaption), 0, &s_aCols[i].m_Rect);
+	for(const auto &Col : s_aCols)
+	{
+		if(DoButton_GridHeader(&Col.m_Id, Localize(Col.m_pCaption), g_Config.m_GhSort == Col.m_Sort, &Col.m_Rect))
+		{
+			if(Col.m_Sort != GHOST_SORT_NONE)
+			{
+				if(g_Config.m_GhSort == Col.m_Sort)
+					g_Config.m_GhSortOrder ^= 1;
+				else
+					g_Config.m_GhSortOrder = 0;
+				g_Config.m_GhSort = Col.m_Sort;
+
+				SortGhostlist();
+			}
+		}
+	}
 
 	View.Draw(ColorRGBA(0, 0, 0, 0.15f), 0, 0);
 
@@ -1105,19 +1147,19 @@ void CMenus::RenderGhost(CUIRect MainView)
 			}
 			else if(Id == COL_NAME)
 			{
-				UI()->DoLabel(&Button, pGhost->m_aPlayer, 12.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&Button, pGhost->m_aPlayer, 12.0f, TEXTALIGN_ML);
 			}
 			else if(Id == COL_TIME)
 			{
 				char aBuf[64];
 				str_time(pGhost->m_Time / 10, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
-				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
 			}
 			else if(Id == COL_DATE)
 			{
 				char aBuf[64];
 				str_timestamp_ex(pGhost->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
-				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
 			}
 		}
 
@@ -1149,10 +1191,7 @@ void CMenus::RenderGhost(CUIRect MainView)
 		char aBuf[IO_MAX_PATH_LENGTH];
 		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "ghosts", aBuf, sizeof(aBuf));
 		Storage()->CreateFolder("ghosts", IStorage::TYPE_SAVE);
-		if(!open_file(aBuf))
-		{
-			dbg_msg("menus", "couldn't open file '%s'", aBuf);
-		}
+		Client()->ViewFile(aBuf);
 	}
 
 	Status.VSplitLeft(5.0f, &Button, &Status);
@@ -1246,6 +1285,5 @@ void CMenus::RenderIngameHint()
 	Graphics()->MapScreen(0, 0, Width, 300);
 	TextRender()->TextColor(1, 1, 1, 1);
 	TextRender()->Text(5, 280, 5, Localize("Menu opened. Press Esc key again to close menu."), -1.0f);
-	UI()->MapScreen();
+	Ui()->MapScreen();
 }
-
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index 4a8a52122d..95a62cc446 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -1,18 +1,20 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/log.h>
 #include <base/math.h>
 #include <base/system.h>
 
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
-#include <game/client/components/verify.h>
-//#include <engine/shared/linereader.h>
+#include <engine/shared/linereader.h>
 #include <engine/shared/localization.h>
+#include <engine/shared/protocol7.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>
-//#include <engine/updater.h>
-//#include <game/generated/protocol.h>
-#include <engine/client/client.h>
+#include <engine/updater.h>
+
+#include <game/generated/protocol.h>
+
 #include <game/client/animstate.h>
 #include <game/client/components/chat.h>
 #include <game/client/components/menu_background.h>
@@ -32,7 +34,7 @@
 
 #include <array>
 #include <chrono>
-//#include <memory>
+#include <memory>
 #include <numeric>
 #include <string>
 #include <vector>
@@ -44,9 +46,10 @@ CMenusKeyBinder CMenus::m_Binder;
 
 CMenusKeyBinder::CMenusKeyBinder()
 {
+	m_pKeyReaderId = nullptr;
 	m_TakeKey = false;
 	m_GotKey = false;
-	m_ModifierCombination = 0;
+	m_ModifierCombination = CBinds::MODIFIER_NONE;
 }
 
 bool CMenusKeyBinder::OnInput(const IInput::CEvent &Event)
@@ -63,7 +66,7 @@ bool CMenusKeyBinder::OnInput(const IInput::CEvent &Event)
 			m_ModifierCombination = CBinds::GetModifierMask(Input());
 			if(m_ModifierCombination == CBinds::GetModifierMaskOfKey(Event.m_Key))
 			{
-				m_ModifierCombination = 0;
+				m_ModifierCombination = CBinds::MODIFIER_NONE;
 			}
 		}
 		return true;
@@ -75,22 +78,20 @@ bool CMenusKeyBinder::OnInput(const IInput::CEvent &Event)
 void CMenus::RenderSettingsGeneral(CUIRect MainView)
 {
 	char aBuf[128 + IO_MAX_PATH_LENGTH];
-	CUIRect Label, Button, Left, Right, Game, Client;
-	MainView.HSplitTop(150.0f, &Game, &Client);
+	CUIRect Label, Button, Left, Right, Game, ClientSettings;
+	MainView.HSplitTop(150.0f, &Game, &ClientSettings);
 
 	// game
 	{
 		// headline
-		Game.HSplitTop(20.0f, &Label, &Game);
-		UI()->DoLabel(&Label, Localize("Game"), 20.0f, TEXTALIGN_ML);
-		Game.Margin(5.0f, &Game);
-		Game.VSplitMid(&Left, &Right);
-		Left.VSplitRight(5.0f, &Left, 0);
-		Right.VMargin(5.0f, &Right);
+		Game.HSplitTop(30.0f, &Label, &Game);
+		Ui()->DoLabel(&Label, Localize("Game"), 20.0f, TEXTALIGN_ML);
+		Game.HSplitTop(5.0f, nullptr, &Game);
+		Game.VSplitMid(&Left, nullptr, 20.0f);
 
 		// dynamic camera
 		Left.HSplitTop(20.0f, &Button, &Left);
-		bool IsDyncam = g_Config.m_ClDyncam || g_Config.m_ClMouseFollowfactor > 0;
+		const bool IsDyncam = g_Config.m_ClDyncam || g_Config.m_ClMouseFollowfactor > 0;
 		if(DoButton_CheckBox(&g_Config.m_ClDyncam, Localize("Dynamic Camera"), IsDyncam, &Button))
 		{
 			if(IsDyncam)
@@ -105,7 +106,7 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 		}
 
 		// smooth dynamic camera
-		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(5.0f, nullptr, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
 		if(g_Config.m_ClDyncam)
 		{
@@ -124,13 +125,13 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 		}
 
 		// weapon pickup
-		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(5.0f, nullptr, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
 		if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeapons, Localize("Switch weapon on pickup"), g_Config.m_ClAutoswitchWeapons, &Button))
 			g_Config.m_ClAutoswitchWeapons ^= 1;
 
 		// weapon out of ammo autoswitch
-		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(5.0f, nullptr, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
 		if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeaponsOutOfAmmo, Localize("Switch weapon when out of ammo"), g_Config.m_ClAutoswitchWeaponsOutOfAmmo, &Button))
 			g_Config.m_ClAutoswitchWeaponsOutOfAmmo ^= 1;
@@ -139,103 +140,88 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 	// client
 	{
 		// headline
-		Client.HSplitTop(20.0f, &Label, &Client);
-		UI()->DoLabel(&Label, Localize("Client"), 20.0f, TEXTALIGN_ML);
-		Client.Margin(5.0f, &Client);
-		Client.VSplitMid(&Left, &Right);
-		Left.VSplitRight(5.0f, &Left, 0);
-		Right.VMargin(5.0f, &Right);
+		ClientSettings.HSplitTop(30.0f, &Label, &ClientSettings);
+		Ui()->DoLabel(&Label, Localize("Client"), 20.0f, TEXTALIGN_ML);
+		ClientSettings.HSplitTop(5.0f, nullptr, &ClientSettings);
+		ClientSettings.VSplitMid(&Left, &Right, 20.0f);
 
 		// skip main menu
-		Left.HSplitTop(5.0f, 0, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
 		if(DoButton_CheckBox(&g_Config.m_ClSkipStartMenu, Localize("Skip the main menu"), g_Config.m_ClSkipStartMenu, &Button))
 			g_Config.m_ClSkipStartMenu ^= 1;
 
-		float SliderGroupMargin = 10.0f;
-
-		// auto demo settings
-		{
-			Right.HSplitTop(40.0f, nullptr, &Right);
-			Right.HSplitTop(20.0f, &Button, &Right);
-			if(DoButton_CheckBox(&g_Config.m_ClAutoDemoRecord, Localize("Automatically record demos"), g_Config.m_ClAutoDemoRecord, &Button))
-				g_Config.m_ClAutoDemoRecord ^= 1;
-
-			Right.HSplitTop(2 * 20.0f, &Button, &Right);
-			if(g_Config.m_ClAutoDemoRecord)
-				UI()->DoScrollbarOption(&g_Config.m_ClAutoDemoMax, &g_Config.m_ClAutoDemoMax, &Button, Localize("Max demos"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
-
-			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
-			Right.HSplitTop(20.0f, &Button, &Right);
-			if(DoButton_CheckBox(&g_Config.m_ClAutoScreenshot, Localize("Automatically take game over screenshot"), g_Config.m_ClAutoScreenshot, &Button))
-				g_Config.m_ClAutoScreenshot ^= 1;
-
-			Right.HSplitTop(2 * 20.0f, &Button, &Right);
-			if(g_Config.m_ClAutoScreenshot)
-				UI()->DoScrollbarOption(&g_Config.m_ClAutoScreenshotMax, &g_Config.m_ClAutoScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
-		}
-
 		Left.HSplitTop(10.0f, nullptr, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
-		UI()->DoScrollbarOption(&g_Config.m_ClRefreshRate, &g_Config.m_ClRefreshRate, &Button, Localize("Refresh Rate"), 10, 10000, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE, " Hz");
+		str_copy(aBuf, " ");
+		str_append(aBuf, Localize("Hz", "Hertz"));
+		Ui()->DoScrollbarOption(&g_Config.m_ClRefreshRate, &g_Config.m_ClRefreshRate, &Button, Localize("Refresh Rate"), 10, 10000, &CUi::ms_LogarithmicScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE, aBuf);
 		Left.HSplitTop(5.0f, nullptr, &Left);
 		Left.HSplitTop(20.0f, &Button, &Left);
-		int s_LowerRefreshRate;
+		static int s_LowerRefreshRate;
 		if(DoButton_CheckBox(&s_LowerRefreshRate, Localize("Save power by lowering refresh rate (higher input latency)"), g_Config.m_ClRefreshRate <= 480 && g_Config.m_ClRefreshRate != 0, &Button))
 			g_Config.m_ClRefreshRate = g_Config.m_ClRefreshRate > 480 || g_Config.m_ClRefreshRate == 0 ? 480 : 0;
 
 		CUIRect SettingsButton;
-		Left.HSplitBottom(25.0f, &Left, &SettingsButton);
-
-		SettingsButton.HSplitTop(5.0f, 0, &SettingsButton);
-		static CButtonContainer s_SettingsButtonID;
-		if(DoButton_Menu(&s_SettingsButtonID, Localize("Settings file"), 0, &SettingsButton))
+		Left.HSplitBottom(20.0f, &Left, &SettingsButton);
+		Left.HSplitBottom(5.0f, &Left, nullptr);
+		static CButtonContainer s_SettingsButtonId;
+		if(DoButton_Menu(&s_SettingsButtonId, Localize("Settings file"), 0, &SettingsButton))
 		{
 			Storage()->GetCompletePath(IStorage::TYPE_SAVE, CONFIG_FILE, aBuf, sizeof(aBuf));
-			if(!open_file(aBuf))
-			{
-				dbg_msg("menus", "couldn't open file '%s'", aBuf);
-			}
+			Client()->ViewFile(aBuf);
 		}
-		GameClient()->m_Tooltips.DoToolTip(&s_SettingsButtonID, &SettingsButton, Localize("Open the settings file"));
+		GameClient()->m_Tooltips.DoToolTip(&s_SettingsButtonId, &SettingsButton, Localize("Open the settings file"));
 
-		Left.HSplitTop(15.0f, 0, &Left);
 		CUIRect ConfigButton;
-		Left.HSplitBottom(25.0f, &Left, &ConfigButton);
-
-		ConfigButton.HSplitTop(5.0f, 0, &ConfigButton);
-		static CButtonContainer s_ConfigButtonID;
-		if(DoButton_Menu(&s_ConfigButtonID, Localize("Config directory"), 0, &ConfigButton))
+		Left.HSplitBottom(20.0f, &Left, &ConfigButton);
+		Left.HSplitBottom(5.0f, &Left, nullptr);
+		static CButtonContainer s_ConfigButtonId;
+		if(DoButton_Menu(&s_ConfigButtonId, Localize("Config directory"), 0, &ConfigButton))
 		{
 			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "", aBuf, sizeof(aBuf));
-			if(!open_file(aBuf))
-			{
-				dbg_msg("menus", "couldn't open file '%s'", aBuf);
-			}
+			Client()->ViewFile(aBuf);
 		}
-		GameClient()->m_Tooltips.DoToolTip(&s_ConfigButtonID, &ConfigButton, Localize("Open the directory that contains the configuration and user files"));
+		GameClient()->m_Tooltips.DoToolTip(&s_ConfigButtonId, &ConfigButton, Localize("Open the directory that contains the configuration and user files"));
 
-		Left.HSplitTop(15.0f, 0, &Left);
 		CUIRect DirectoryButton;
-		Left.HSplitBottom(25.0f, &Left, &DirectoryButton);
-		RenderThemeSelection(Left);
-
-		DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
-		static CButtonContainer s_ThemesButtonID;
-		if(DoButton_Menu(&s_ThemesButtonID, Localize("Themes directory"), 0, &DirectoryButton))
+		Left.HSplitBottom(20.0f, &Left, &DirectoryButton);
+		Left.HSplitBottom(5.0f, &Left, nullptr);
+		static CButtonContainer s_ThemesButtonId;
+		if(DoButton_Menu(&s_ThemesButtonId, Localize("Themes directory"), 0, &DirectoryButton))
 		{
 			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "themes", aBuf, sizeof(aBuf));
 			Storage()->CreateFolder("themes", IStorage::TYPE_SAVE);
-			if(!open_file(aBuf))
-			{
-				dbg_msg("menus", "couldn't open file '%s'", aBuf);
-			}
+			Client()->ViewFile(aBuf);
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_ThemesButtonId, &DirectoryButton, Localize("Open the directory to add custom themes"));
+
+		Left.HSplitTop(20.0f, nullptr, &Left);
+		RenderThemeSelection(Left);
+
+		// auto demo settings
+		{
+			Right.HSplitTop(40.0f, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoDemoRecord, Localize("Automatically record demos"), g_Config.m_ClAutoDemoRecord, &Button))
+				g_Config.m_ClAutoDemoRecord ^= 1;
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoDemoRecord)
+				Ui()->DoScrollbarOption(&g_Config.m_ClAutoDemoMax, &g_Config.m_ClAutoDemoMax, &Button, Localize("Max demos"), 1, 1000, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE | CUi::SCROLLBAR_OPTION_MULTILINE);
+
+			Right.HSplitTop(10.0f, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoScreenshot, Localize("Automatically take game over screenshot"), g_Config.m_ClAutoScreenshot, &Button))
+				g_Config.m_ClAutoScreenshot ^= 1;
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoScreenshot)
+				Ui()->DoScrollbarOption(&g_Config.m_ClAutoScreenshotMax, &g_Config.m_ClAutoScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE | CUi::SCROLLBAR_OPTION_MULTILINE);
 		}
-		GameClient()->m_Tooltips.DoToolTip(&s_ThemesButtonID, &DirectoryButton, Localize("Open the directory to add custom themes"));
 
 		// auto statboard screenshot
 		{
-			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
+			Right.HSplitTop(10.0f, nullptr, &Right);
 			Right.HSplitTop(20.0f, &Button, &Right);
 			if(DoButton_CheckBox(&g_Config.m_ClAutoStatboardScreenshot, Localize("Automatically take statboard screenshot"), g_Config.m_ClAutoStatboardScreenshot, &Button))
 			{
@@ -244,12 +230,12 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 
 			Right.HSplitTop(2 * 20.0f, &Button, &Right);
 			if(g_Config.m_ClAutoStatboardScreenshot)
-				UI()->DoScrollbarOption(&g_Config.m_ClAutoStatboardScreenshotMax, &g_Config.m_ClAutoStatboardScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+				Ui()->DoScrollbarOption(&g_Config.m_ClAutoStatboardScreenshotMax, &g_Config.m_ClAutoStatboardScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE | CUi::SCROLLBAR_OPTION_MULTILINE);
 		}
 
 		// auto statboard csv
 		{
-			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
+			Right.HSplitTop(10.0f, nullptr, &Right);
 			Right.HSplitTop(20.0f, &Button, &Right);
 			if(DoButton_CheckBox(&g_Config.m_ClAutoCSV, Localize("Automatically create statboard csv"), g_Config.m_ClAutoCSV, &Button))
 			{
@@ -258,7 +244,7 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 
 			Right.HSplitTop(2 * 20.0f, &Button, &Right);
 			if(g_Config.m_ClAutoCSV)
-				UI()->DoScrollbarOption(&g_Config.m_ClAutoCSVMax, &g_Config.m_ClAutoCSVMax, &Button, Localize("Max CSVs"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+				Ui()->DoScrollbarOption(&g_Config.m_ClAutoCSVMax, &g_Config.m_ClAutoCSVMax, &Button, Localize("Max CSVs"), 1, 1000, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE | CUi::SCROLLBAR_OPTION_MULTILINE);
 		}
 	}
 }
@@ -271,120 +257,103 @@ void CMenus::SetNeedSendInfo()
 		m_NeedSendinfo = true;
 }
 
-int CMenus::RenderSettingsPlayer(CUIRect MainView)
+void CMenus::RenderSettingsPlayer(CUIRect MainView)
 {
-	CUIRect Button, Label, Dummy;
-	MainView.HSplitTop(10.0f, 0, &MainView);
-
-	char *pName = g_Config.m_PlayerName;
-	const char *pNameFallback = Client()->PlayerName();
-	char *pClan = g_Config.m_PlayerClan;
-	int *pCountry = &g_Config.m_PlayerCountry;
+	CUIRect TabBar, PlayerTab, DummyTab, ChangeInfo, QuickSearch;
+	MainView.HSplitTop(20.0f, &TabBar, &MainView);
+	TabBar.VSplitMid(&TabBar, &ChangeInfo, 20.f);
+	TabBar.VSplitMid(&PlayerTab, &DummyTab);
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
 
-	if(m_Dummy)
+	static CButtonContainer s_PlayerTabButton;
+	if(DoButton_MenuTab(&s_PlayerTabButton, Localize("Player"), !m_Dummy, &PlayerTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
 	{
-		pName = g_Config.m_ClDummyName;
-		pNameFallback = Client()->DummyName();
-		pClan = g_Config.m_ClDummyClan;
-		pCountry = &g_Config.m_ClDummyCountry;
+		m_Dummy = false;
 	}
 
-	// player name
-	MainView.HSplitTop(20.0f, &Button, &MainView);
-	Button.VSplitLeft(80.0f, &Label, &Button);
-	Button.VSplitLeft(150.0f, &Button, 0);
-	char aBuf[128];
-	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Name"));
-	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
-	static CLineInput s_NameInput;
-
-	if(strcmp(Client()->PlayerName(), "-StormAx") == 0 || strcmp(Client()->PlayerName(), "meloƞ") == 0 || strcmp(Client()->PlayerName(), "我叫芙焦") == 0 || strcmp(Client()->PlayerName(), "Mʎɹ シ") == 0 || strcmp(Client()->PlayerName(), "Cheeru") == 0 || strcmp(Client()->PlayerName(), "Mónik") == 0)
+	static CButtonContainer s_DummyTabButton;
+	if(DoButton_MenuTab(&s_DummyTabButton, Localize("Dummy"), m_Dummy, &DummyTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
 	{
-		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 30.f) % 255 / 255.f, 1.f, 1.f));
-		TextRender()->TextColor(col);
+		m_Dummy = true;
 	}
 
-	s_NameInput.SetBuffer(pName, sizeof(g_Config.m_PlayerName));
-	s_NameInput.SetEmptyText(pNameFallback);
-	if(UI()->DoEditBox(&s_NameInput, &Button, 14.0f))
+	if(Client()->State() == IClient::STATE_ONLINE && m_pClient->m_NextChangeInfo && m_pClient->m_NextChangeInfo > Client()->GameTick(g_Config.m_ClDummy))
 	{
-		SetNeedSendInfo();
+		char aChangeInfo[128], aTimeLeft[32];
+		str_format(aTimeLeft, sizeof(aTimeLeft), Localize("%ds left"), (m_pClient->m_NextChangeInfo - Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed() - 1) / Client()->GameTickSpeed());
+		str_format(aChangeInfo, sizeof(aChangeInfo), "%s: %s", Localize("Player info change cooldown"), aTimeLeft);
+		Ui()->DoLabel(&ChangeInfo, aChangeInfo, 10.f, TEXTALIGN_ML);
 	}
 
-	//Kill game when start using m_PlayerName
-	if(!str_comp(g_Config.m_PlayerName, "nigger"))
-	{
-		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "YOU ARE FUCKING RACIST DON'T USE THIS CLIENT EVER AGAIN");
-	}
-	if(!str_comp(g_Config.m_PlayerName, "faggot"))
-	{
-		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "YOU ARE FUCKING RACIST DON'T USE THIS CLIENT EVER AGAIN");
-	}
-	if(!str_comp(g_Config.m_PlayerName, "pingvin?"))
-	{
-		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "Фу, умри русня");
-	}
-	if(!str_comp(g_Config.m_PlayerName, "Sedonya"))
-	{
-		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "Кисао привет");
-	}
-	if(!str_comp(g_Config.m_PlayerName, "Cheeru"))
-	{
-		dbg_assert_imp("Hey!.js", -1, 0, "Привет Aйви, надеюсь хорошо поживаешь? Если все таки заинтересовалась клиент отпиши, пожалуйста, очень важно</3");
-	}
+	static CLineInput s_NameInput;
+	static CLineInput s_ClanInput;
 
-	//TODO: Remove commits
-	/*
-	if(!str_comp(g_Config.m_PlayerName, "meloƞ"))
+	int *pCountry;
+	if(!m_Dummy)
 	{
-		dbg_assert_imp("FakeNameList.txt", -1, 0, "YOU ARE NOT MELON SOB" );
+		pCountry = &g_Config.m_PlayerCountry;
+		s_NameInput.SetBuffer(g_Config.m_PlayerName, sizeof(g_Config.m_PlayerName));
+		s_NameInput.SetEmptyText(Client()->PlayerName());
+		s_ClanInput.SetBuffer(g_Config.m_PlayerClan, sizeof(g_Config.m_PlayerClan));
 	}
-
-	if(!str_comp(g_Config.m_PlayerName, "-StormAx"))
+	else
 	{
-		dbg_assert_imp("FakeNameList.txt", -1, 0, "I see you tried to use developer name, :clueless:" );
+		pCountry = &g_Config.m_ClDummyCountry;
+		s_NameInput.SetBuffer(g_Config.m_ClDummyName, sizeof(g_Config.m_ClDummyName));
+		s_NameInput.SetEmptyText(Client()->DummyName());
+		s_ClanInput.SetBuffer(g_Config.m_ClDummyClan, sizeof(g_Config.m_ClDummyClan));
 	}
 
-	if(!str_comp(g_Config.m_PlayerName, "Mʎɹ シ"))
+	// player name
+	CUIRect Button, Label;
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	Button.VSplitLeft(80.0f, &Label, &Button);
+	Button.VSplitLeft(150.0f, &Button, nullptr);
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Name"));
+	Ui()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+	if(Ui()->DoEditBox(&s_NameInput, &Button, 14.0f))
 	{
-		dbg_assert_imp("FakeNameList.txt", -1, 0, "You was so clueless :Invalid:" );
+		SetNeedSendInfo();
 	}
-*/
+
 	// player clan
-	MainView.HSplitTop(5.0f, 0, &MainView);
+	MainView.HSplitTop(5.0f, nullptr, &MainView);
 	MainView.HSplitTop(20.0f, &Button, &MainView);
 	Button.VSplitLeft(80.0f, &Label, &Button);
-	Button.VSplitLeft(200.0f, &Button, &Dummy);
-	Button.VSplitLeft(150.0f, &Button, 0);
+	Button.VSplitLeft(150.0f, &Button, nullptr);
 	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Clan"));
-	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
-	static CLineInput s_ClanInput;
-	if(strcmp(g_Config.m_PlayerClan, "Inner peace") == 0 || strcmp(g_Config.m_PlayerClan, "Vegaming") == 0)
-	{
-		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 15.f) % 255 / 255.f, 1.f, 1.f));
-		TextRender()->TextColor(col);
-	}
-	s_ClanInput.SetBuffer(pClan, sizeof(g_Config.m_PlayerClan));
-	if(UI()->DoEditBox(&s_ClanInput, &Button, 14.0f))
+	Ui()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+	if(Ui()->DoEditBox(&s_ClanInput, &Button, 14.0f))
 	{
 		SetNeedSendInfo();
 	}
 
-	if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &Dummy))
+	// country flag selector
+	static CLineInputBuffered<25> s_FlagFilterInput;
+
+	std::vector<const CCountryFlags::CCountryFlag *> vpFilteredFlags;
+	for(size_t i = 0; i < m_pClient->m_CountryFlags.Num(); ++i)
 	{
-		m_Dummy ^= 1;
+		const CCountryFlags::CCountryFlag *pEntry = m_pClient->m_CountryFlags.GetByIndex(i);
+		if(!str_find_nocase(pEntry->m_aCountryCodeString, s_FlagFilterInput.GetString()))
+			continue;
+		vpFilteredFlags.push_back(pEntry);
 	}
-	GameClient()->m_Tooltips.DoToolTip(&m_Dummy, &Dummy, Localize("Toggle to edit your dummy settings"));
 
-	// country flag selector
-	MainView.HSplitTop(20.0f, 0, &MainView);
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+	MainView.HSplitBottom(20.0f, &MainView, &QuickSearch);
+	MainView.HSplitBottom(5.0f, &MainView, nullptr);
+	QuickSearch.VSplitLeft(220.0f, &QuickSearch, nullptr);
+
 	int OldSelected = -1;
 	static CListBox s_ListBox;
-	s_ListBox.DoStart(50.0f, m_pClient->m_CountryFlags.Num(), 10, 3, OldSelected, &MainView);
+	s_ListBox.DoStart(48.0f, vpFilteredFlags.size(), 10, 3, OldSelected, &MainView);
 
-	for(size_t i = 0; i < m_pClient->m_CountryFlags.Num(); ++i)
+	for(size_t i = 0; i < vpFilteredFlags.size(); i++)
 	{
-		const CCountryFlags::CCountryFlag *pEntry = m_pClient->m_CountryFlags.GetByIndex(i);
+		const CCountryFlags::CCountryFlag *pEntry = vpFilteredFlags[i];
+
 		if(pEntry->m_CountryCode == *pCountry)
 			OldSelected = i;
 
@@ -396,24 +365,25 @@ int CMenus::RenderSettingsPlayer(CUIRect MainView)
 		Item.m_Rect.Margin(5.0f, &FlagRect);
 		FlagRect.HSplitBottom(12.0f, &FlagRect, &Label);
 		Label.HSplitTop(2.0f, nullptr, &Label);
-		float OldWidth = FlagRect.w;
+		const float OldWidth = FlagRect.w;
 		FlagRect.w = FlagRect.h * 2;
 		FlagRect.x += (OldWidth - FlagRect.w) / 2.0f;
 		m_pClient->m_CountryFlags.Render(pEntry->m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
 
 		if(pEntry->m_Texture.IsValid())
 		{
-			UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
+			Ui()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
 		}
 	}
 
 	const int NewSelected = s_ListBox.DoEnd();
 	if(OldSelected != NewSelected)
 	{
-		*pCountry = m_pClient->m_CountryFlags.GetByIndex(NewSelected)->m_CountryCode;
+		*pCountry = vpFilteredFlags[NewSelected]->m_CountryCode;
 		SetNeedSendInfo();
 	}
-	return 0;
+
+	Ui()->DoEditBox_Search(&s_FlagFilterInput, &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed());
 }
 
 struct CUISkin
@@ -431,73 +401,33 @@ struct CUISkin
 	bool operator==(const char *pOther) const { return !str_comp_nocase(m_pSkin->GetName(), pOther); }
 };
 
-void CMenus::RefreshSkins()
-{
-	auto SkinStartLoadTime = time_get_nanoseconds();
-	m_pClient->m_Skins.Refresh([&](int) {
-		// if skin refreshing takes to long, swap to a loading screen
-		if(time_get_nanoseconds() - SkinStartLoadTime > 500ms)
-		{
-			RenderLoading(Localize("Loading skin files"), "", 0, false);
-		}
-	});
-	if(Client()->State() == IClient::STATE_ONLINE || Client()->State() == IClient::STATE_DEMOPLAYBACK)
-	{
-		m_pClient->RefindSkins();
-	}
-}
-
-void CMenus::RandomSkin()
+void CMenus::OnRefreshSkins()
 {
-	static const float s_aSchemes[] = {1.0f / 2.0f, 1.0f / 3.0f, 1.0f / -3.0f, 1.0f / 12.0f, 1.0f / -12.0f}; // complementary, triadic, analogous
-
-	float GoalSat = random_float(0.3f, 1.0f);
-	float MaxBodyLht = 1.0f - GoalSat * GoalSat; // max allowed lightness before we start losing saturation
-
-	ColorHSLA Body;
-	Body.h = random_float();
-	Body.l = random_float(0.0f, MaxBodyLht);
-	Body.s = clamp(GoalSat * GoalSat / (1.0f - Body.l), 0.0f, 1.0f);
-
-	ColorHSLA Feet;
-	Feet.h = std::fmod(Body.h + s_aSchemes[rand() % std::size(s_aSchemes)], 1.0f);
-	Feet.l = random_float();
-	Feet.s = clamp(GoalSat * GoalSat / (1.0f - Feet.l), 0.0f, 1.0f);
-
-	const char *pRandomSkinName = CSkins::VANILLA_SKINS[rand() % (std::size(CSkins::VANILLA_SKINS) - 2)]; // last 2 skins are x_ninja and x_spec
-
-	char *pSkinName = !m_Dummy ? g_Config.m_ClPlayerSkin : g_Config.m_ClDummySkin;
-	unsigned *pColorBody = !m_Dummy ? &g_Config.m_ClPlayerColorBody : &g_Config.m_ClDummyColorBody;
-	unsigned *pColorFeet = !m_Dummy ? &g_Config.m_ClPlayerColorFeet : &g_Config.m_ClDummyColorFeet;
-
-	mem_copy(pSkinName, pRandomSkinName, sizeof(g_Config.m_ClPlayerSkin));
-	*pColorBody = Body.Pack(false);
-	*pColorFeet = Feet.Pack(false);
-
-	SetNeedSendInfo();
+	m_SkinListNeedsUpdate = true;
 }
 
 void CMenus::Con_AddFavoriteSkin(IConsole::IResult *pResult, void *pUserData)
 {
 	auto *pSelf = (CMenus *)pUserData;
-	if(pResult->NumArguments() >= 1)
+	const char *pStr = pResult->GetString(0);
+	if(!CSkin::IsValidName(pStr))
 	{
-		pSelf->m_SkinFavorites.emplace(pResult->GetString(0));
-		pSelf->m_SkinFavoritesChanged = true;
+		log_error("menus/settings", "Favorite skin name '%s' is not valid", pStr);
+		log_error("menus/settings", "%s", CSkin::m_aSkinNameRestrictions);
+		return;
 	}
+	pSelf->m_SkinFavorites.emplace(pStr);
+	pSelf->m_SkinFavoritesChanged = true;
 }
 
 void CMenus::Con_RemFavoriteSkin(IConsole::IResult *pResult, void *pUserData)
 {
 	auto *pSelf = (CMenus *)pUserData;
-	if(pResult->NumArguments() >= 1)
+	const auto it = pSelf->m_SkinFavorites.find(pResult->GetString(0));
+	if(it != pSelf->m_SkinFavorites.end())
 	{
-		const auto it = pSelf->m_SkinFavorites.find(pResult->GetString(0));
-		if(it != pSelf->m_SkinFavorites.end())
-		{
-			pSelf->m_SkinFavorites.erase(it);
-			pSelf->m_SkinFavoritesChanged = true;
-		}
+		pSelf->m_SkinFavorites.erase(it);
+		pSelf->m_SkinFavoritesChanged = true;
 	}
 }
 
@@ -512,9 +442,6 @@ void CMenus::OnConfigSave(IConfigManager *pConfigManager)
 	for(const auto &Entry : m_SkinFavorites)
 	{
 		char aBuffer[256];
-		char aNameEscaped[256];
-		char *pDst = aNameEscaped;
-		str_escape(&pDst, Entry.c_str(), aNameEscaped + std::size(aNameEscaped));
 		str_format(aBuffer, std::size(aBuffer), "add_favorite_skin \"%s\"", Entry.c_str());
 		pConfigManager->WriteLine(aBuffer);
 	}
@@ -522,84 +449,119 @@ void CMenus::OnConfigSave(IConfigManager *pConfigManager)
 
 void CMenus::RenderSettingsTee(CUIRect MainView)
 {
-	CUIRect Button, Label, Dummy, DummyLabel, SkinList, QuickSearch, QuickSearchClearButton, SkinDB, SkinPrefix, SkinPrefixLabel, DirectoryButton, RefreshButton, Eyes, EyesLabel, EyesTee, EyesRight;
+	CUIRect TabBar, PlayerTab, DummyTab, ChangeInfo;
+	MainView.HSplitTop(20.0f, &TabBar, &MainView);
+	TabBar.VSplitMid(&TabBar, &ChangeInfo, 20.f);
+	TabBar.VSplitMid(&PlayerTab, &DummyTab);
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+
+	static CButtonContainer s_PlayerTabButton;
+	if(DoButton_MenuTab(&s_PlayerTabButton, Localize("Player"), !m_Dummy, &PlayerTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_Dummy = false;
+	}
 
-	static bool s_InitSkinlist = true;
-	Eyes = MainView;
+	static CButtonContainer s_DummyTabButton;
+	if(DoButton_MenuTab(&s_DummyTabButton, Localize("Dummy"), m_Dummy, &DummyTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_Dummy = true;
+	}
 
-	char *pSkinName = g_Config.m_ClPlayerSkin;
-	int *pUseCustomColor = &g_Config.m_ClPlayerUseCustomColor;
-	unsigned *pColorBody = &g_Config.m_ClPlayerColorBody;
-	unsigned *pColorFeet = &g_Config.m_ClPlayerColorFeet;
+	if(Client()->State() == IClient::STATE_ONLINE && m_pClient->m_NextChangeInfo && m_pClient->m_NextChangeInfo > Client()->GameTick(g_Config.m_ClDummy))
+	{
+		char aChangeInfo[128], aTimeLeft[32];
+		str_format(aTimeLeft, sizeof(aTimeLeft), Localize("%ds left"), (m_pClient->m_NextChangeInfo - Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed() - 1) / Client()->GameTickSpeed());
+		str_format(aChangeInfo, sizeof(aChangeInfo), "%s: %s", Localize("Player info change cooldown"), aTimeLeft);
+		Ui()->DoLabel(&ChangeInfo, aChangeInfo, 10.f, TEXTALIGN_ML);
+	}
 
-	if(m_Dummy)
+	char *pSkinName;
+	size_t SkinNameSize;
+	int *pUseCustomColor;
+	unsigned *pColorBody;
+	unsigned *pColorFeet;
+	int *pEmote;
+	if(!m_Dummy)
+	{
+		pSkinName = g_Config.m_ClPlayerSkin;
+		SkinNameSize = sizeof(g_Config.m_ClPlayerSkin);
+		pUseCustomColor = &g_Config.m_ClPlayerUseCustomColor;
+		pColorBody = &g_Config.m_ClPlayerColorBody;
+		pColorFeet = &g_Config.m_ClPlayerColorFeet;
+		pEmote = &g_Config.m_ClPlayerDefaultEyes;
+	}
+	else
 	{
 		pSkinName = g_Config.m_ClDummySkin;
+		SkinNameSize = sizeof(g_Config.m_ClDummySkin);
 		pUseCustomColor = &g_Config.m_ClDummyUseCustomColor;
 		pColorBody = &g_Config.m_ClDummyColorBody;
 		pColorFeet = &g_Config.m_ClDummyColorFeet;
+		pEmote = &g_Config.m_ClDummyDefaultEyes;
 	}
 
-	MainView.HSplitTop(10.0f, &Label, &MainView);
-	Label.VSplitLeft(280.0f, &Label, &Dummy);
-	Label.VSplitLeft(230.0f, &Label, 0);
-	Dummy.VSplitLeft(170.0f, &Dummy, &SkinPrefix);
-	SkinPrefix.VSplitLeft(120.0f, &SkinPrefix, &EyesRight);
-	char aBuf[128 + IO_MAX_PATH_LENGTH];
-	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Your skin"));
-	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
-
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
-
-	if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &DummyLabel))
+	const float EyeButtonSize = 40.0f;
+	const bool RenderEyesBelow = MainView.w < 750.0f;
+	CUIRect YourSkin, Checkboxes, SkinPrefix, Eyes, Button, Label;
+	MainView.HSplitTop(90.0f, &YourSkin, &MainView);
+	if(RenderEyesBelow)
 	{
-		m_Dummy ^= 1;
+		YourSkin.VSplitLeft(MainView.w * 0.45f, &YourSkin, &Checkboxes);
+		Checkboxes.VSplitLeft(MainView.w * 0.35f, &Checkboxes, &SkinPrefix);
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(EyeButtonSize, &Eyes, &MainView);
+		Eyes.VSplitRight(EyeButtonSize * NUM_EMOTES + 5.0f * (NUM_EMOTES - 1), nullptr, &Eyes);
 	}
-	GameClient()->m_Tooltips.DoToolTip(&m_Dummy, &DummyLabel, Localize("Toggle to edit your dummy settings"));
-
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+	else
+	{
+		YourSkin.VSplitRight(3 * EyeButtonSize + 2 * 5.0f, &YourSkin, &Eyes);
+		const float RemainderWidth = YourSkin.w;
+		YourSkin.VSplitLeft(RemainderWidth * 0.4f, &YourSkin, &Checkboxes);
+		Checkboxes.VSplitLeft(RemainderWidth * 0.35f, &Checkboxes, &SkinPrefix);
+		SkinPrefix.VSplitRight(20.0f, &SkinPrefix, nullptr);
+	}
+	YourSkin.VSplitRight(20.0f, &YourSkin, nullptr);
+	Checkboxes.VSplitRight(20.0f, &Checkboxes, nullptr);
 
-	if(DoButton_CheckBox(&g_Config.m_ClDownloadSkins, Localize("Download skins"), g_Config.m_ClDownloadSkins, &DummyLabel))
+	// Checkboxes
+	Checkboxes.HSplitTop(20.0f, &Button, &Checkboxes);
+	if(DoButton_CheckBox(&g_Config.m_ClDownloadSkins, Localize("Download skins"), g_Config.m_ClDownloadSkins, &Button))
 	{
 		g_Config.m_ClDownloadSkins ^= 1;
-		RefreshSkins();
-		s_InitSkinlist = true;
+		m_pClient->RefreshSkins();
 	}
 
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
-
-	if(DoButton_CheckBox(&g_Config.m_ClDownloadCommunitySkins, Localize("Download community skins"), g_Config.m_ClDownloadCommunitySkins, &DummyLabel))
+	Checkboxes.HSplitTop(20.0f, &Button, &Checkboxes);
+	if(DoButton_CheckBox(&g_Config.m_ClDownloadCommunitySkins, Localize("Download community skins"), g_Config.m_ClDownloadCommunitySkins, &Button))
 	{
 		g_Config.m_ClDownloadCommunitySkins ^= 1;
-		RefreshSkins();
-		s_InitSkinlist = true;
+		m_pClient->RefreshSkins();
 	}
 
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
-
-	if(DoButton_CheckBox(&g_Config.m_ClVanillaSkinsOnly, Localize("Vanilla skins only"), g_Config.m_ClVanillaSkinsOnly, &DummyLabel))
+	Checkboxes.HSplitTop(20.0f, &Button, &Checkboxes);
+	if(DoButton_CheckBox(&g_Config.m_ClVanillaSkinsOnly, Localize("Vanilla skins only"), g_Config.m_ClVanillaSkinsOnly, &Button))
 	{
 		g_Config.m_ClVanillaSkinsOnly ^= 1;
-		RefreshSkins();
-		s_InitSkinlist = true;
+		m_pClient->RefreshSkins();
 	}
 
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
-
-	if(DoButton_CheckBox(&g_Config.m_ClFatSkins, Localize("Fat skins (DDFat)"), g_Config.m_ClFatSkins, &DummyLabel))
+	Checkboxes.HSplitTop(20.0f, &Button, &Checkboxes);
+	if(DoButton_CheckBox(&g_Config.m_ClFatSkins, Localize("Fat skins (DDFat)"), g_Config.m_ClFatSkins, &Button))
 	{
 		g_Config.m_ClFatSkins ^= 1;
 	}
 
-	SkinPrefix.HSplitTop(20.0f, &SkinPrefixLabel, &SkinPrefix);
-	UI()->DoLabel(&SkinPrefixLabel, Localize("Skin prefix"), 14.0f, TEXTALIGN_ML);
+	// Skin prefix
+	{
+		SkinPrefix.HSplitTop(20.0f, &Label, &SkinPrefix);
+		Ui()->DoLabel(&Label, Localize("Skin prefix"), 14.0f, TEXTALIGN_ML);
+
+		SkinPrefix.HSplitTop(20.0f, &Button, &SkinPrefix);
+		static CLineInput s_SkinPrefixInput(g_Config.m_ClSkinPrefix, sizeof(g_Config.m_ClSkinPrefix));
+		Ui()->DoClearableEditBox(&s_SkinPrefixInput, &Button, 14.0f);
 
-	SkinPrefix.HSplitTop(20.0f, &SkinPrefixLabel, &SkinPrefix);
-	static CLineInput s_SkinPrefixInput(g_Config.m_ClSkinPrefix, sizeof(g_Config.m_ClSkinPrefix));
-	UI()->DoClearableEditBox(&s_SkinPrefixInput, &SkinPrefixLabel, 14.0f);
+		SkinPrefix.HSplitTop(2.0f, nullptr, &SkinPrefix);
 
-	SkinPrefix.HSplitTop(2.0f, 0, &SkinPrefix);
-	{
 		static const char *s_apSkinPrefixes[] = {"kitty", "santa"};
 		static CButtonContainer s_aPrefixButtons[std::size(s_apSkinPrefixes)];
 		for(size_t i = 0; i < std::size(s_apSkinPrefixes); i++)
@@ -613,21 +575,29 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 		}
 	}
 
-	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+	// Player skin area
+	CUIRect CustomColorsButton, RandomSkinButton;
+	YourSkin.HSplitTop(20.0f, &Label, &YourSkin);
+	YourSkin.HSplitBottom(20.0f, &YourSkin, &CustomColorsButton);
+	CustomColorsButton.VSplitRight(30.0f, &CustomColorsButton, &RandomSkinButton);
+	CustomColorsButton.VSplitRight(20.0f, &CustomColorsButton, nullptr);
+	YourSkin.VSplitLeft(65.0f, &YourSkin, &Button);
+	Button.VSplitLeft(5.0f, nullptr, &Button);
+	Button.HMargin((Button.h - 20.0f) / 2.0f, &Button);
 
-	// note: get the skin info after the settings buttons, because they can trigger a refresh
-	// which invalidates the skin
-	// skin info
+	char aBuf[128 + IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Your skin"));
+	Ui()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+
+	// Note: get the skin info after the settings buttons, because they can trigger a refresh
+	// which invalidates the skin.
 	CTeeRenderInfo OwnSkinInfo;
-	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
-	OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-	OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-	OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
+	OwnSkinInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
 	OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
 	if(*pUseCustomColor)
 	{
-		OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting());
-		OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(*pColorFeet).UnclampLighting());
+		OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT));
+		OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(*pColorFeet).UnclampLighting(ColorHSLA::DARKEST_LGT));
 	}
 	else
 	{
@@ -636,152 +606,114 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 	}
 	OwnSkinInfo.m_Size = 50.0f;
 
-	MainView.HSplitTop(50.0f, &Label, &MainView);
-	Label.VSplitLeft(260.0f, &Label, 0);
-	const CAnimState *pIdleState = CAnimState::GetIdle();
-	vec2 OffsetToMid;
-	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
-	vec2 TeeRenderPos(Label.x + 30.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
-	int Emote = m_Dummy ? g_Config.m_ClDummyDefaultEyes : g_Config.m_ClPlayerDefaultEyes;
-	RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, Emote, vec2(1, 0), TeeRenderPos);
-	Label.VSplitLeft(70.0f, 0, &Label);
-	Label.HMargin(15.0f, &Label);
-
-	// default eyes
-	bool RenderEyesBelow = MainView.w < 750.0f;
-	if(RenderEyesBelow)
-	{
-		Eyes.VSplitLeft(190.0f, 0, &Eyes);
-		Eyes.HSplitTop(105.0f, 0, &Eyes);
-	}
-	else
-	{
-		Eyes = EyesRight;
-		if(MainView.w < 810.0f)
-			Eyes.VSplitRight(205.0f, 0, &Eyes);
-		Eyes.HSplitTop(50.0f, &Eyes, 0);
-	}
-	Eyes.HSplitTop(120.0f, &EyesLabel, &Eyes);
-	EyesLabel.VSplitLeft(20.0f, 0, &EyesLabel);
-	EyesLabel.HSplitTop(50.0f, &EyesLabel, &Eyes);
-
-	static CButtonContainer s_aEyeButtons[6];
-	for(int CurrentEyeEmote = 0; CurrentEyeEmote < 6; CurrentEyeEmote++)
+	// Tee
 	{
-		EyesLabel.VSplitLeft(10.0f, 0, &EyesLabel);
-		EyesLabel.VSplitLeft(50.0f, &EyesTee, &EyesLabel);
-
-		if(CurrentEyeEmote == 2 && !RenderEyesBelow)
-		{
-			Eyes.HSplitTop(60.0f, &EyesLabel, 0);
-			EyesLabel.HSplitTop(10.0f, 0, &EyesLabel);
-		}
-		float Highlight = (m_Dummy ? g_Config.m_ClDummyDefaultEyes == CurrentEyeEmote : g_Config.m_ClPlayerDefaultEyes == CurrentEyeEmote) ? 1.0f : 0.0f;
-		if(DoButton_Menu(&s_aEyeButtons[CurrentEyeEmote], "", 0, &EyesTee, 0, IGraphics::CORNER_ALL, 10.0f, 0.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f + Highlight * 0.25f)))
-		{
-			if(m_Dummy)
-			{
-				g_Config.m_ClDummyDefaultEyes = CurrentEyeEmote;
-				if(g_Config.m_ClDummy)
-					GameClient()->m_Emoticon.EyeEmote(CurrentEyeEmote);
-			}
-			else
-			{
-				g_Config.m_ClPlayerDefaultEyes = CurrentEyeEmote;
-				if(!g_Config.m_ClDummy)
-					GameClient()->m_Emoticon.EyeEmote(CurrentEyeEmote);
-			}
-		}
-		GameClient()->m_Tooltips.DoToolTip(&s_aEyeButtons[CurrentEyeEmote], &EyesTee, Localize("Choose default eyes when joining a server"));
-		RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, CurrentEyeEmote, vec2(1, 0), vec2(EyesTee.x + 25.0f, EyesTee.y + EyesTee.h / 2.0f + OffsetToMid.y));
+		vec2 OffsetToMid;
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &OwnSkinInfo, OffsetToMid);
+		const vec2 TeeRenderPos = vec2(YourSkin.x + YourSkin.w / 2.0f, YourSkin.y + YourSkin.h / 2.0f + OffsetToMid.y);
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &OwnSkinInfo, *pEmote, vec2(1.0f, 0.0f), TeeRenderPos);
 	}
 
-	Label.VSplitRight(34.0f, &Label, &Button);
-
+	// Skin name
 	static CLineInput s_SkinInput;
-	s_SkinInput.SetBuffer(pSkinName, sizeof(g_Config.m_ClPlayerSkin));
+	s_SkinInput.SetBuffer(pSkinName, SkinNameSize);
 	s_SkinInput.SetEmptyText("default");
-	if(UI()->DoClearableEditBox(&s_SkinInput, &Label, 14.0f))
+	if(Ui()->DoClearableEditBox(&s_SkinInput, &Button, 14.0f))
 	{
 		SetNeedSendInfo();
 	}
 
-	// random skin button
-	Button.VSplitRight(30.0f, 0, &Button);
-	static CButtonContainer s_RandomSkinButtonID;
+	// Random skin button
+	static CButtonContainer s_RandomSkinButton;
 	static const char *s_apDice[] = {FONT_ICON_DICE_ONE, FONT_ICON_DICE_TWO, FONT_ICON_DICE_THREE, FONT_ICON_DICE_FOUR, FONT_ICON_DICE_FIVE, FONT_ICON_DICE_SIX};
 	static int s_CurrentDie = rand() % std::size(s_apDice);
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	if(DoButton_Menu(&s_RandomSkinButtonID, s_apDice[s_CurrentDie], 1, &Button, nullptr, IGraphics::CORNER_ALL, 5.0f, -0.2f))
+	if(DoButton_Menu(&s_RandomSkinButton, s_apDice[s_CurrentDie], 0, &RandomSkinButton, nullptr, IGraphics::CORNER_ALL, 5.0f, -0.2f))
 	{
-		RandomSkin();
+		GameClient()->m_Skins.RandomizeSkin(m_Dummy);
+		SetNeedSendInfo();
 		s_CurrentDie = rand() % std::size(s_apDice);
 	}
 	TextRender()->SetRenderFlags(0);
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-	GameClient()->m_Tooltips.DoToolTip(&s_RandomSkinButtonID, &Button, Localize("Create a random skin"));
+	GameClient()->m_Tooltips.DoToolTip(&s_RandomSkinButton, &RandomSkinButton, Localize("Create a random skin"));
 
-	// custom color selector
-	MainView.HSplitTop(20.0f + RenderEyesBelow * 25.0f, 0, &MainView);
-	MainView.HSplitTop(20.0f, &Button, &MainView);
-	CUIRect RandomColorsButton;
-	Button.VSplitLeft(150.0f, &Button, &RandomColorsButton);
-	static int s_CustomColorID = 0;
-	if(DoButton_CheckBox(&s_CustomColorID, Localize("Custom colors"), *pUseCustomColor, &Button))
+	// Custom colors button
+	if(DoButton_CheckBox(pUseCustomColor, Localize("Custom colors"), *pUseCustomColor, &CustomColorsButton))
 	{
 		*pUseCustomColor = *pUseCustomColor ? 0 : 1;
 		SetNeedSendInfo();
 	}
-	CButtonContainer s_RandomizeColors;
-	if(*pUseCustomColor)
+
+	// Default eyes
 	{
-		RandomColorsButton.VSplitLeft(120.0f, &RandomColorsButton, 0);
-		if(DoButton_Menu(&s_RandomizeColors, "Randomize Colors", 0, &RandomColorsButton, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0, 0, 0, 0.5f)))
+		CTeeRenderInfo EyeSkinInfo = OwnSkinInfo;
+		EyeSkinInfo.m_Size = EyeButtonSize;
+		vec2 OffsetToMid;
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &EyeSkinInfo, OffsetToMid);
+
+		CUIRect EyesRow;
+		Eyes.HSplitTop(EyeButtonSize, &EyesRow, &Eyes);
+		static CButtonContainer s_aEyeButtons[NUM_EMOTES];
+		for(int CurrentEyeEmote = 0; CurrentEyeEmote < NUM_EMOTES; CurrentEyeEmote++)
 		{
-			if(m_Dummy)
+			EyesRow.VSplitLeft(EyeButtonSize, &Button, &EyesRow);
+			EyesRow.VSplitLeft(5.0f, nullptr, &EyesRow);
+			if(!RenderEyesBelow && (CurrentEyeEmote + 1) % 3 == 0)
 			{
-				g_Config.m_ClDummyColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
-				g_Config.m_ClDummyColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				Eyes.HSplitTop(5.0f, nullptr, &Eyes);
+				Eyes.HSplitTop(EyeButtonSize, &EyesRow, &Eyes);
 			}
-			else
+
+			const ColorRGBA EyeButtonColor = ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f + (*pEmote == CurrentEyeEmote ? 0.25f : 0.0f));
+			if(DoButton_Menu(&s_aEyeButtons[CurrentEyeEmote], "", 0, &Button, nullptr, IGraphics::CORNER_ALL, 5.0f, 0.0f, EyeButtonColor))
 			{
-				g_Config.m_ClPlayerColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
-				g_Config.m_ClPlayerColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				*pEmote = CurrentEyeEmote;
+				if((int)m_Dummy == g_Config.m_ClDummy)
+					GameClient()->m_Emoticon.EyeEmote(CurrentEyeEmote);
 			}
-			SetNeedSendInfo();
+			GameClient()->m_Tooltips.DoToolTip(&s_aEyeButtons[CurrentEyeEmote], &Button, Localize("Choose default eyes when joining a server"));
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &EyeSkinInfo, CurrentEyeEmote, vec2(1.0f, 0.0f), vec2(Button.x + Button.w / 2.0f, Button.y + Button.h / 2.0f + OffsetToMid.y));
 		}
 	}
-	MainView.HSplitTop(5.0f, 0, &MainView);
-	MainView.HSplitTop(82.5f, &Label, &MainView);
+
+	// Custom color pickers
+	MainView.HSplitTop(5.0f, nullptr, &MainView);
 	if(*pUseCustomColor)
 	{
+		CUIRect CustomColors;
+		MainView.HSplitTop(95.0f, &CustomColors, &MainView);
 		CUIRect aRects[2];
-		Label.VSplitMid(&aRects[0], &aRects[1], 20.0f);
+		CustomColors.VSplitMid(&aRects[0], &aRects[1], 20.0f);
 
-		unsigned *apColors[2] = {pColorBody, pColorFeet};
+		unsigned *apColors[] = {pColorBody, pColorFeet};
 		const char *apParts[] = {Localize("Body"), Localize("Feet")};
 
 		for(int i = 0; i < 2; i++)
 		{
 			aRects[i].HSplitTop(20.0f, &Label, &aRects[i]);
-			UI()->DoLabel(&Label, apParts[i], 14.0f, TEXTALIGN_ML);
-			aRects[i].VSplitLeft(10.0f, 0, &aRects[i]);
-			aRects[i].HSplitTop(2.5f, 0, &aRects[i]);
-
-			unsigned PrevColor = *apColors[i];
-			RenderHSLScrollbars(&aRects[i], apColors[i], false, true);
-
-			if(PrevColor != *apColors[i])
+			Ui()->DoLabel(&Label, apParts[i], 14.0f, TEXTALIGN_ML);
+			if(RenderHslaScrollbars(&aRects[i], apColors[i], false, ColorHSLA::DARKEST_LGT))
 			{
 				SetNeedSendInfo();
 			}
 		}
 	}
+	MainView.HSplitTop(5.0f, nullptr, &MainView);
+
+	// Layout bottom controls and use remainder for skin selector
+	CUIRect QuickSearch, DatabaseButton, DirectoryButton, RefreshButton;
+	MainView.HSplitBottom(20.0f, &MainView, &QuickSearch);
+	MainView.HSplitBottom(5.0f, &MainView, nullptr);
+	QuickSearch.VSplitLeft(220.0f, &QuickSearch, &DatabaseButton);
+	DatabaseButton.VSplitLeft(10.0f, nullptr, &DatabaseButton);
+	DatabaseButton.VSplitLeft(150.0f, &DatabaseButton, &DirectoryButton);
+	DirectoryButton.VSplitRight(175.0f, nullptr, &DirectoryButton);
+	DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &RefreshButton);
+	DirectoryButton.VSplitRight(10.0f, &DirectoryButton, nullptr);
 
-	// skin selector
-	MainView.HSplitTop(20.0f, 0, &MainView);
-	MainView.HSplitTop(230.0f - RenderEyesBelow * 25.0f, &SkinList, &MainView);
+	// Skin selector
 	static std::vector<CUISkin> s_vSkinList;
 	static std::vector<CUISkin> s_vSkinListHelper;
 	static std::vector<CUISkin> s_vFavoriteSkinListHelper;
@@ -791,7 +723,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 	// be nice to the CPU
 	static auto s_SkinLastRebuildTime = time_get_nanoseconds();
 	const auto CurTime = time_get_nanoseconds();
-	if(s_InitSkinlist || m_pClient->m_Skins.Num() != s_SkinCount || m_SkinFavoritesChanged || (m_pClient->m_Skins.IsDownloadingSkins() && (CurTime - s_SkinLastRebuildTime > 500ms)))
+	if(m_SkinListNeedsUpdate || m_pClient->m_Skins.Num() != s_SkinCount || m_SkinFavoritesChanged || (m_pClient->m_Skins.IsDownloadingSkins() && (CurTime - s_SkinLastRebuildTime > 500ms)))
 	{
 		s_SkinLastRebuildTime = CurTime;
 		s_vSkinList.clear();
@@ -836,31 +768,14 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 		std::sort(s_vFavoriteSkinListHelper.begin(), s_vFavoriteSkinListHelper.end());
 		s_vSkinList = s_vFavoriteSkinListHelper;
 		s_vSkinList.insert(s_vSkinList.end(), s_vSkinListHelper.begin(), s_vSkinListHelper.end());
-		s_InitSkinlist = false;
+		m_SkinListNeedsUpdate = false;
 	}
 
-	auto &&RenderFavIcon = [&](const CUIRect &FavIcon, bool AsFav) {
-		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-		if(AsFav)
-			TextRender()->TextColor({1, 1, 0, 1});
-		else
-			TextRender()->TextColor({0.5f, 0.5f, 0.5f, 1});
-		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
-		SLabelProperties Props;
-		Props.m_MaxWidth = FavIcon.w;
-		UI()->DoLabel(&FavIcon, FONT_ICON_STAR, 12.0f, TEXTALIGN_MR, Props);
-		TextRender()->TextColor(TextRender()->DefaultTextColor());
-		TextRender()->SetRenderFlags(0);
-		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-	};
-
 	int OldSelected = -1;
-	s_ListBox.DoStart(50.0f, s_vSkinList.size(), 4, 1, OldSelected, &SkinList);
+	s_ListBox.DoStart(50.0f, s_vSkinList.size(), 4, 1, OldSelected, &MainView);
 	for(size_t i = 0; i < s_vSkinList.size(); ++i)
 	{
 		const CSkin *pSkinToBeDraw = s_vSkinList[i].m_pSkin;
-
 		if(str_comp(pSkinToBeDraw->GetName(), pSkinName) == 0)
 			OldSelected = i;
 
@@ -868,28 +783,26 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 		if(!Item.m_Visible)
 			continue;
 
-		const CUIRect OriginalRect = Item.m_Rect;
+		Item.m_Rect.VSplitLeft(60.0f, &Button, &Label);
 
 		CTeeRenderInfo Info = OwnSkinInfo;
 		Info.m_CustomColoredSkin = *pUseCustomColor;
-
 		Info.m_OriginalRenderSkin = pSkinToBeDraw->m_OriginalSkin;
 		Info.m_ColorableRenderSkin = pSkinToBeDraw->m_ColorableSkin;
 		Info.m_SkinMetrics = pSkinToBeDraw->m_Metrics;
 
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Info, OffsetToMid);
-		TeeRenderPos = vec2(OriginalRect.x + 30, OriginalRect.y + OriginalRect.h / 2 + OffsetToMid.y);
-		RenderTools()->RenderTee(pIdleState, &Info, Emote, vec2(1.0f, 0.0f), TeeRenderPos);
+		vec2 OffsetToMid;
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &Info, OffsetToMid);
+		const vec2 TeeRenderPos = vec2(Button.x + Button.w / 2.0f, Button.y + Button.h / 2 + OffsetToMid.y);
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, *pEmote, vec2(1.0f, 0.0f), TeeRenderPos);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w - 5.0f;
+		Ui()->DoLabel(&Label, pSkinToBeDraw->GetName(), 12.0f, TEXTALIGN_ML, Props);
 
-		OriginalRect.VSplitLeft(60.0f, 0, &Label);
-		{
-			SLabelProperties Props;
-			Props.m_MaxWidth = Label.w - 5.0f;
-			UI()->DoLabel(&Label, pSkinToBeDraw->GetName(), 12.0f, TEXTALIGN_ML, Props);
-		}
 		if(g_Config.m_Debug)
 		{
-			ColorRGBA BloodColor = *pUseCustomColor ? color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting()) : pSkinToBeDraw->m_BloodColor;
+			const ColorRGBA BloodColor = *pUseCustomColor ? color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT)) : pSkinToBeDraw->m_BloodColor;
 			Graphics()->TextureClear();
 			Graphics()->QuadsBegin();
 			Graphics()->SetColor(BloodColor.r, BloodColor.g, BloodColor.b, 1.0f);
@@ -901,22 +814,11 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 		// render skin favorite icon
 		{
 			const auto SkinItFav = m_SkinFavorites.find(pSkinToBeDraw->GetName());
-			const auto IsFav = SkinItFav != m_SkinFavorites.end();
+			const bool IsFav = SkinItFav != m_SkinFavorites.end();
 			CUIRect FavIcon;
-			OriginalRect.HSplitTop(20.0f, &FavIcon, nullptr);
+			Item.m_Rect.HSplitTop(20.0f, &FavIcon, nullptr);
 			FavIcon.VSplitRight(20.0f, nullptr, &FavIcon);
-			if(IsFav)
-			{
-				RenderFavIcon(FavIcon, IsFav);
-			}
-			else
-			{
-				if(UI()->MouseInside(&FavIcon))
-				{
-					RenderFavIcon(FavIcon, IsFav);
-				}
-			}
-			if(UI()->DoButtonLogic(&pSkinToBeDraw->m_Metrics.m_Body, 0, &FavIcon))
+			if(DoButton_Favorite(&pSkinToBeDraw->m_Metrics.m_Body, pSkinToBeDraw, IsFav, &FavIcon))
 			{
 				if(IsFav)
 				{
@@ -926,7 +828,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 				{
 					m_SkinFavorites.emplace(pSkinToBeDraw->GetName());
 				}
-				s_InitSkinlist = true;
+				m_SkinListNeedsUpdate = true;
 			}
 		}
 	}
@@ -934,74 +836,40 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 	const int NewSelected = s_ListBox.DoEnd();
 	if(OldSelected != NewSelected)
 	{
-		mem_copy(pSkinName, s_vSkinList[NewSelected].m_pSkin->GetName(), sizeof(g_Config.m_ClPlayerSkin));
+		str_copy(pSkinName, s_vSkinList[NewSelected].m_pSkin->GetName(), SkinNameSize);
 		SetNeedSendInfo();
 	}
 
-	// render quick search
+	static CLineInput s_SkinFilterInput(g_Config.m_ClSkinFilterString, sizeof(g_Config.m_ClSkinFilterString));
+	if(Ui()->DoEditBox_Search(&s_SkinFilterInput, &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed()))
 	{
-		MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
-		QuickSearch.VSplitLeft(240.0f, &QuickSearch, &SkinDB);
-		QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
-		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-
-		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
-		float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
-		TextRender()->SetRenderFlags(0);
-		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-		QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
-		QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
-		QuickSearch.VSplitLeft(QuickSearch.w - 15.0f, &QuickSearch, &QuickSearchClearButton);
-		static CLineInput s_SkinFilterInput(g_Config.m_ClSkinFilterString, sizeof(g_Config.m_ClSkinFilterString));
-		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
-		{
-			UI()->SetActiveItem(&s_SkinFilterInput);
-			s_SkinFilterInput.SelectAll();
-		}
-		s_SkinFilterInput.SetEmptyText(Localize("Search"));
-		if(UI()->DoClearableEditBox(&s_SkinFilterInput, &QuickSearch, 14.0f))
-			s_InitSkinlist = true;
+		m_SkinListNeedsUpdate = true;
 	}
 
-	SkinDB.VSplitLeft(150.0f, &SkinDB, &DirectoryButton);
-	SkinDB.HSplitTop(5.0f, 0, &SkinDB);
-	static CButtonContainer s_SkinDBDirID;
-	if(DoButton_Menu(&s_SkinDBDirID, Localize("Skin Database"), 0, &SkinDB))
+	static CButtonContainer s_SkinDatabaseButton;
+	if(DoButton_Menu(&s_SkinDatabaseButton, Localize("Skin Database"), 0, &DatabaseButton))
 	{
-		const char *pLink = "https://ddnet.org/skins/";
-		if(!open_link(pLink))
-		{
-			dbg_msg("menus", "couldn't open link '%s'", pLink);
-		}
+		Client()->ViewLink("https://ddnet.org/skins/");
 	}
 
-	DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
-	DirectoryButton.VSplitRight(175.0f, 0, &DirectoryButton);
-	DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &RefreshButton);
-	DirectoryButton.VSplitRight(10.0f, &DirectoryButton, 0);
-	static CButtonContainer s_DirectoryButtonID;
-	if(DoButton_Menu(&s_DirectoryButtonID, Localize("Skins directory"), 0, &DirectoryButton))
+	static CButtonContainer s_DirectoryButton;
+	if(DoButton_Menu(&s_DirectoryButton, Localize("Skins directory"), 0, &DirectoryButton))
 	{
 		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "skins", aBuf, sizeof(aBuf));
 		Storage()->CreateFolder("skins", IStorage::TYPE_SAVE);
-		if(!open_file(aBuf))
-		{
-			dbg_msg("menus", "couldn't open file '%s'", aBuf);
-		}
+		Client()->ViewFile(aBuf);
 	}
-	GameClient()->m_Tooltips.DoToolTip(&s_DirectoryButtonID, &DirectoryButton, Localize("Open the directory to add custom skins"));
+	GameClient()->m_Tooltips.DoToolTip(&s_DirectoryButton, &DirectoryButton, Localize("Open the directory to add custom skins"));
 
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	static CButtonContainer s_SkinRefreshButtonID;
-	if(DoButton_Menu(&s_SkinRefreshButtonID, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+	static CButtonContainer s_SkinRefreshButton;
+	if(DoButton_Menu(&s_SkinRefreshButton, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
 	{
 		// reset render flags for possible loading screen
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-		RefreshSkins();
-		s_InitSkinlist = true;
+		m_pClient->RefreshSkins();
 	}
 	TextRender()->SetRenderFlags(0);
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
@@ -1066,15 +934,6 @@ static CKeyInfo gs_aKeys[] =
 		{Localizable("Lock team"), "say /lock", 0, 0},
 		{Localizable("Show entities"), "toggle cl_overlay_entities 0 100", 0, 0},
 		{Localizable("Show HUD"), "toggle cl_showhud 0 1", 0, 0},
-		{Localizable("BindWheel"), "+bind_wheel", 0, 0},
-		{
-			Localizable("45° AIM"),
-			"+toggle cl_mouse_max_distance 2 400; +toggle inp_mousesens 1; +showhookcoll",
-			0,
-			0,
-		},
-		//TODO: Make it work
-		//{Localizable("Toggle dummy deep fly"), "bind mouse1 \"+fire; +toggle cl_dummy_hammer 1 0\" ;cl_message_client_color green; echo Deep Fly ON; bind x \"bind mouse1 +fire; cl_dummy_hammer 0; cl_message_client_color red; echo Deep Fly OFF;""" , 0, 0},
 };
 
 void CMenus::DoSettingsControlsButtons(int Start, int Stop, CUIRect View)
@@ -1090,7 +949,7 @@ void CMenus::DoSettingsControlsButtons(int Start, int Stop, CUIRect View)
 		char aBuf[64];
 		str_format(aBuf, sizeof(aBuf), "%s:", Localize(Key.m_pName));
 
-		UI()->DoLabel(&Label, aBuf, 13.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, aBuf, 13.0f, TEXTALIGN_ML);
 		int OldId = Key.m_KeyId, OldModifierCombination = Key.m_ModifierCombination, NewModifierCombination;
 		int NewId = DoKeyReader(&Key.m_KeyId, &Button, OldId, OldModifierCombination, &NewModifierCombination);
 		if(NewId != OldId || NewModifierCombination != OldModifierCombination)
@@ -1112,12 +971,9 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 	int NumOptions = 1; // expandable header
 	if(JoystickEnabled)
 	{
-		if(NumJoysticks == 0)
-			NumOptions++; // message
-		else
+		NumOptions++; // message or joystick name/selection
+		if(NumJoysticks > 0)
 		{
-			if(NumJoysticks > 1)
-				NumOptions++; // joystick selection
 			NumOptions += 3; // mode, ui sens, tolerance
 			if(!g_Config.m_InpControllerAbsolute)
 				NumOptions++; // ingame sens
@@ -1163,11 +1019,11 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 						s_vpJoystickNames[i] = s_vJoystickNames[i].c_str();
 					}
 
-					static CUI::SDropDownState s_JoystickDropDownState;
+					static CUi::SDropDownState s_JoystickDropDownState;
 					static CScrollRegion s_JoystickDropDownScrollRegion;
 					s_JoystickDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_JoystickDropDownScrollRegion;
 					const int CurrentJoystick = Input()->GetActiveJoystick()->GetIndex();
-					const int NewJoystick = UI()->DoDropDown(&JoystickDropDown, CurrentJoystick, s_vpJoystickNames.data(), s_vpJoystickNames.size(), s_JoystickDropDownState);
+					const int NewJoystick = Ui()->DoDropDown(&JoystickDropDown, CurrentJoystick, s_vpJoystickNames.data(), s_vpJoystickNames.size(), s_JoystickDropDownState);
 					if(NewJoystick != CurrentJoystick)
 					{
 						Input()->SetActiveJoystick(NewJoystick);
@@ -1177,7 +1033,7 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 				{
 					char aBuf[256];
 					str_format(aBuf, sizeof(aBuf), "%s 0: %s", Localize("Controller"), Input()->GetJoystick(0)->GetName());
-					UI()->DoLabel(&JoystickDropDown, aBuf, 13.0f, TEXTALIGN_ML);
+					Ui()->DoLabel(&JoystickDropDown, aBuf, 13.0f, TEXTALIGN_ML);
 				}
 			}
 
@@ -1188,7 +1044,7 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 				Button.VSplitMid(&Label, &Button, 10.0f);
 				Button.HMargin(2.0f, &Button);
 				Button.VSplitMid(&ButtonRelative, &ButtonAbsolute);
-				UI()->DoLabel(&Label, Localize("Ingame controller mode"), 13.0f, TEXTALIGN_ML);
+				Ui()->DoLabel(&Label, Localize("Ingame controller mode"), 13.0f, TEXTALIGN_ML);
 				CButtonContainer s_RelativeButton;
 				if(DoButton_Menu(&s_RelativeButton, Localize("Relative", "Ingame controller mode"), g_Config.m_InpControllerAbsolute == 0, &ButtonRelative, nullptr, IGraphics::CORNER_L))
 				{
@@ -1205,16 +1061,16 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 			{
 				View.HSplitTop(Spacing, nullptr, &View);
 				View.HSplitTop(ButtonHeight, &Button, &View);
-				UI()->DoScrollbarOption(&g_Config.m_InpControllerSens, &g_Config.m_InpControllerSens, &Button, Localize("Ingame controller sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+				Ui()->DoScrollbarOption(&g_Config.m_InpControllerSens, &g_Config.m_InpControllerSens, &Button, Localize("Ingame controller sens."), 1, 500, &CUi::ms_LogarithmicScrollbarScale, CUi::SCROLLBAR_OPTION_NOCLAMPVALUE);
 			}
 
 			View.HSplitTop(Spacing, nullptr, &View);
 			View.HSplitTop(ButtonHeight, &Button, &View);
-			UI()->DoScrollbarOption(&g_Config.m_UiControllerSens, &g_Config.m_UiControllerSens, &Button, Localize("UI controller sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+			Ui()->DoScrollbarOption(&g_Config.m_UiControllerSens, &g_Config.m_UiControllerSens, &Button, Localize("UI controller sens."), 1, 500, &CUi::ms_LogarithmicScrollbarScale, CUi::SCROLLBAR_OPTION_NOCLAMPVALUE);
 
 			View.HSplitTop(Spacing, nullptr, &View);
 			View.HSplitTop(ButtonHeight, &Button, &View);
-			UI()->DoScrollbarOption(&g_Config.m_InpControllerTolerance, &g_Config.m_InpControllerTolerance, &Button, Localize("Controller jitter tolerance"), 0, 50);
+			Ui()->DoScrollbarOption(&g_Config.m_InpControllerTolerance, &g_Config.m_InpControllerTolerance, &Button, Localize("Controller jitter tolerance"), 0, 50);
 
 			View.HSplitTop(Spacing, nullptr, &View);
 			View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.125f), IGraphics::CORNER_ALL, 5.0f);
@@ -1224,7 +1080,7 @@ float CMenus::RenderSettingsControlsJoystick(CUIRect View)
 		{
 			View.HSplitTop(View.h - ButtonHeight, nullptr, &View);
 			View.HSplitTop(ButtonHeight, &Button, &View);
-			UI()->DoLabel(&Button, Localize("No controller found. Plug in a controller."), 13.0f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("No controller found. Plug in a controller."), 13.0f, TEXTALIGN_ML);
 		}
 	}
 
@@ -1250,9 +1106,9 @@ void CMenus::DoJoystickAxisPicker(CUIRect View)
 	Row.VSplitLeft(SpacingV, nullptr, &Row);
 	Row.VSplitLeft(AimBindWidth, &AimBind, &Row);
 
-	UI()->DoLabel(&Axis, Localize("Axis"), FontSize, TEXTALIGN_MC);
-	UI()->DoLabel(&Status, Localize("Status"), FontSize, TEXTALIGN_MC);
-	UI()->DoLabel(&AimBind, Localize("Aim bind"), FontSize, TEXTALIGN_MC);
+	Ui()->DoLabel(&Axis, Localize("Axis"), FontSize, TEXTALIGN_MC);
+	Ui()->DoLabel(&Status, Localize("Status"), FontSize, TEXTALIGN_MC);
+	Ui()->DoLabel(&AimBind, Localize("Aim bind"), FontSize, TEXTALIGN_MC);
 
 	IInput::IJoystick *pJoystick = Input()->GetActiveJoystick();
 	static int s_aActive[NUM_JOYSTICK_AXES][2];
@@ -1271,12 +1127,12 @@ void CMenus::DoJoystickAxisPicker(CUIRect View)
 
 		// Axis label
 		char aBuf[16];
-		str_from_int(i + 1, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", i + 1);
 		if(Active)
 			TextRender()->TextColor(TextRender()->DefaultTextColor());
 		else
 			TextRender()->TextColor(0.7f, 0.7f, 0.7f, 1.0f);
-		UI()->DoLabel(&Axis, aBuf, FontSize, TEXTALIGN_MC);
+		Ui()->DoLabel(&Axis, aBuf, FontSize, TEXTALIGN_MC);
 
 		// Axis status
 		Status.HMargin(7.0f, &Status);
@@ -1356,7 +1212,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 	const float Margin = 10.0f;
 	const float HeaderHeight = FontSize + 5.0f + Margin;
 
-	CUIRect MouseSettings, MovementSettings, WeaponSettings, VotingSettings, ChatSettings, DummySettings, MiscSettings, BindWheelSettings, JoystickSettings, ResetButton, Button;
+	CUIRect MouseSettings, MovementSettings, WeaponSettings, VotingSettings, ChatSettings, DummySettings, MiscSettings, JoystickSettings, ResetButton, Button;
 	MainView.VSplitMid(&MouseSettings, &VotingSettings);
 
 	// mouse settings
@@ -1369,15 +1225,15 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			MouseSettings.VMargin(10.0f, &MouseSettings);
 
 			MouseSettings.HSplitTop(HeaderHeight, &Button, &MouseSettings);
-			UI()->DoLabel(&Button, Localize("Mouse"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Mouse"), FontSize, TEXTALIGN_ML);
 
 			MouseSettings.HSplitTop(20.0f, &Button, &MouseSettings);
-			UI()->DoScrollbarOption(&g_Config.m_InpMousesens, &g_Config.m_InpMousesens, &Button, Localize("Ingame mouse sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+			Ui()->DoScrollbarOption(&g_Config.m_InpMousesens, &g_Config.m_InpMousesens, &Button, Localize("Ingame mouse sens."), 1, 500, &CUi::ms_LogarithmicScrollbarScale, CUi::SCROLLBAR_OPTION_NOCLAMPVALUE);
 
 			MouseSettings.HSplitTop(2.0f, nullptr, &MouseSettings);
 
 			MouseSettings.HSplitTop(20.0f, &Button, &MouseSettings);
-			UI()->DoScrollbarOption(&g_Config.m_UiMousesens, &g_Config.m_UiMousesens, &Button, Localize("UI mouse sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+			Ui()->DoScrollbarOption(&g_Config.m_UiMousesens, &g_Config.m_UiMousesens, &Button, Localize("UI mouse sens."), 1, 500, &CUi::ms_LogarithmicScrollbarScale, CUi::SCROLLBAR_OPTION_NOCLAMPVALUE);
 		}
 	}
 
@@ -1391,7 +1247,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			JoystickSettings.VMargin(Margin, &JoystickSettings);
 
 			JoystickSettings.HSplitTop(HeaderHeight, &Button, &JoystickSettings);
-			UI()->DoLabel(&Button, Localize("Controller"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Controller"), FontSize, TEXTALIGN_ML);
 
 			s_JoystickSettingsHeight = RenderSettingsControlsJoystick(JoystickSettings);
 		}
@@ -1407,7 +1263,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			MovementSettings.VMargin(Margin, &MovementSettings);
 
 			MovementSettings.HSplitTop(HeaderHeight, &Button, &MovementSettings);
-			UI()->DoLabel(&Button, Localize("Movement"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Movement"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(0, 15, MovementSettings);
 		}
@@ -1423,7 +1279,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			WeaponSettings.VMargin(Margin, &WeaponSettings);
 
 			WeaponSettings.HSplitTop(HeaderHeight, &Button, &WeaponSettings);
-			UI()->DoLabel(&Button, Localize("Weapon"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Weapon"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(15, 22, WeaponSettings);
 		}
@@ -1456,7 +1312,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			VotingSettings.VMargin(Margin, &VotingSettings);
 
 			VotingSettings.HSplitTop(HeaderHeight, &Button, &VotingSettings);
-			UI()->DoLabel(&Button, Localize("Voting"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Voting"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(22, 24, VotingSettings);
 		}
@@ -1472,7 +1328,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			ChatSettings.VMargin(Margin, &ChatSettings);
 
 			ChatSettings.HSplitTop(HeaderHeight, &Button, &ChatSettings);
-			UI()->DoLabel(&Button, Localize("Chat"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Chat"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(24, 29, ChatSettings);
 		}
@@ -1488,7 +1344,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 			DummySettings.VMargin(Margin, &DummySettings);
 
 			DummySettings.HSplitTop(HeaderHeight, &Button, &DummySettings);
-			UI()->DoLabel(&Button, Localize("Dummy"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Dummy"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(29, 32, DummySettings);
 		}
@@ -1497,33 +1353,18 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 	// misc settings
 	{
 		MiscSettings.HSplitTop(Margin, nullptr, &MiscSettings);
-		MiscSettings.HSplitTop(300.0f, &MiscSettings, &BindWheelSettings);
+		MiscSettings.HSplitTop(300.0f, &MiscSettings, 0);
 		if(s_ScrollRegion.AddRect(MiscSettings))
 		{
 			MiscSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
 			MiscSettings.VMargin(Margin, &MiscSettings);
 
 			MiscSettings.HSplitTop(HeaderHeight, &Button, &MiscSettings);
-			UI()->DoLabel(&Button, Localize("Miscellaneous"), FontSize, TEXTALIGN_ML);
+			Ui()->DoLabel(&Button, Localize("Miscellaneous"), FontSize, TEXTALIGN_ML);
 
 			DoSettingsControlsButtons(32, 44, MiscSettings);
 		}
 	}
-	// sta
-	{
-		BindWheelSettings.HSplitTop(Margin, nullptr, &BindWheelSettings);
-		BindWheelSettings.HSplitTop(80.0f, &BindWheelSettings, 0);
-		if(s_ScrollRegion.AddRect(BindWheelSettings))
-		{
-			BindWheelSettings.Draw(vec4(1, 1, 1, 0.15f), IGraphics::CORNER_ALL, 10.0f);
-			BindWheelSettings.VMargin(Margin, &BindWheelSettings);
-
-			BindWheelSettings.HSplitTop(HeaderHeight, &Button, &BindWheelSettings);
-			UI()->DoLabel(&Button, Localize("StA"), FontSize, TEXTALIGN_ML);
-
-			DoSettingsControlsButtons(44, 46, BindWheelSettings);
-		}
-	}
 
 	s_ScrollRegion.End();
 }
@@ -1556,7 +1397,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	static int s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
 	static int s_GfxFsaaSamples = g_Config.m_GfxFsaaSamples;
 	static bool s_GfxBackendChanged = false;
-	static bool s_GfxGPUChanged = false;
+	static bool s_GfxGpuChanged = false;
 	static int s_GfxHighdpi = g_Config.m_GfxHighdpi;
 
 	static int s_InitDisplayAllVideoModes = g_Config.m_GfxDisplayAllVideoModes;
@@ -1593,11 +1434,11 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	{
 		int G = std::gcd(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight);
 		str_format(aBuf, sizeof(aBuf), "%s: %dx%d @%dhz %d bit (%d:%d)", Localize("Current"), (int)(g_Config.m_GfxScreenWidth * Graphics()->ScreenHiDPIScale()), (int)(g_Config.m_GfxScreenHeight * Graphics()->ScreenHiDPIScale()), g_Config.m_GfxScreenRefreshRate, g_Config.m_GfxColorDepth, g_Config.m_GfxScreenWidth / G, g_Config.m_GfxScreenHeight / G);
-		UI()->DoLabel(&ModeLabel, aBuf, sc_FontSizeResListHeader, TEXTALIGN_MC);
+		Ui()->DoLabel(&ModeLabel, aBuf, sc_FontSizeResListHeader, TEXTALIGN_MC);
 	}
 
 	int OldSelected = -1;
-	s_ListBox.SetActive(!UI()->IsPopupOpen());
+	s_ListBox.SetActive(!Ui()->IsPopupOpen());
 	s_ListBox.DoStart(sc_RowHeightResList, s_NumNodes, 1, 3, OldSelected, &ModeList);
 
 	for(int i = 0; i < s_NumNodes; ++i)
@@ -1617,7 +1458,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 
 		int G = std::gcd(s_aModes[i].m_CanvasWidth, s_aModes[i].m_CanvasHeight);
 		str_format(aBuf, sizeof(aBuf), " %dx%d @%dhz %d bit (%d:%d)", s_aModes[i].m_CanvasWidth, s_aModes[i].m_CanvasHeight, s_aModes[i].m_RefreshRate, Depth, s_aModes[i].m_CanvasWidth / G, s_aModes[i].m_CanvasHeight / G);
-		UI()->DoLabel(&Item.m_Rect, aBuf, sc_FontSizeResList, TEXTALIGN_ML);
+		Ui()->DoLabel(&Item.m_Rect, aBuf, sc_FontSizeResList, TEXTALIGN_ML);
 	}
 
 	const int NewSelected = s_ListBox.DoEnd();
@@ -1628,7 +1469,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		g_Config.m_GfxScreenWidth = s_aModes[NewSelected].m_WindowWidth;
 		g_Config.m_GfxScreenHeight = s_aModes[NewSelected].m_WindowHeight;
 		g_Config.m_GfxScreenRefreshRate = s_aModes[NewSelected].m_RefreshRate;
-		Graphics()->Resize(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+		Graphics()->ResizeToScreen();
 	}
 
 	// switches
@@ -1640,22 +1481,22 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 
 	const int OldWindowMode = (g_Config.m_GfxFullscreen ? (g_Config.m_GfxFullscreen == 1 ? 4 : (g_Config.m_GfxFullscreen == 2 ? 3 : 2)) : (g_Config.m_GfxBorderless ? 1 : 0));
 
-	static CUI::SDropDownState s_WindowModeDropDownState;
+	static CUi::SDropDownState s_WindowModeDropDownState;
 	static CScrollRegion s_WindowModeDropDownScrollRegion;
 	s_WindowModeDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_WindowModeDropDownScrollRegion;
-	const int NewWindowMode = UI()->DoDropDown(&WindowModeDropDown, OldWindowMode, apWindowModes, s_NumWindowMode, s_WindowModeDropDownState);
+	const int NewWindowMode = Ui()->DoDropDown(&WindowModeDropDown, OldWindowMode, apWindowModes, s_NumWindowMode, s_WindowModeDropDownState);
 	if(OldWindowMode != NewWindowMode)
 	{
 		if(NewWindowMode == 0)
-			Client()->SetWindowParams(0, false, true);
+			Client()->SetWindowParams(0, false);
 		else if(NewWindowMode == 1)
-			Client()->SetWindowParams(0, true, true);
+			Client()->SetWindowParams(0, true);
 		else if(NewWindowMode == 2)
-			Client()->SetWindowParams(3, false, false);
+			Client()->SetWindowParams(3, false);
 		else if(NewWindowMode == 3)
-			Client()->SetWindowParams(2, false, true);
+			Client()->SetWindowParams(2, false);
 		else if(NewWindowMode == 4)
-			Client()->SetWindowParams(1, false, true);
+			Client()->SetWindowParams(1, false);
 	}
 
 	if(Graphics()->GetNumScreens() > 1)
@@ -1677,15 +1518,12 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 			s_vpScreenNames[i] = s_vScreenNames[i].c_str();
 		}
 
-		static CUI::SDropDownState s_ScreenDropDownState;
+		static CUi::SDropDownState s_ScreenDropDownState;
 		static CScrollRegion s_ScreenDropDownScrollRegion;
 		s_ScreenDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_ScreenDropDownScrollRegion;
-		const int NewScreen = UI()->DoDropDown(&ScreenDropDown, g_Config.m_GfxScreen, s_vpScreenNames.data(), s_vpScreenNames.size(), s_ScreenDropDownState);
+		const int NewScreen = Ui()->DoDropDown(&ScreenDropDown, g_Config.m_GfxScreen, s_vpScreenNames.data(), s_vpScreenNames.size(), s_ScreenDropDownState);
 		if(NewScreen != g_Config.m_GfxScreen)
-		{
 			Client()->SwitchWindowScreen(NewScreen);
-			s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
-		}
 	}
 
 	MainView.HSplitTop(2.0f, nullptr, &MainView);
@@ -1699,16 +1537,16 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	bool MultiSamplingChanged = false;
 	MainView.HSplitTop(20.0f, &Button, &MainView);
 	str_format(aBuf, sizeof(aBuf), "%s (%s)", Localize("FSAA samples"), Localize("may cause delay"));
-	int GfxFsaaSamples_MouseButton = DoButton_CheckBox_Number(&g_Config.m_GfxFsaaSamples, aBuf, g_Config.m_GfxFsaaSamples, &Button);
+	int GfxFsaaSamplesMouseButton = DoButton_CheckBox_Number(&g_Config.m_GfxFsaaSamples, aBuf, g_Config.m_GfxFsaaSamples, &Button);
 	int CurFSAA = g_Config.m_GfxFsaaSamples == 0 ? 1 : g_Config.m_GfxFsaaSamples;
-	if(GfxFsaaSamples_MouseButton == 1) // inc
+	if(GfxFsaaSamplesMouseButton == 1) // inc
 	{
 		g_Config.m_GfxFsaaSamples = std::pow(2, (int)std::log2(CurFSAA) + 1);
 		if(g_Config.m_GfxFsaaSamples > 64)
 			g_Config.m_GfxFsaaSamples = 0;
 		MultiSamplingChanged = true;
 	}
-	else if(GfxFsaaSamples_MouseButton == 2) // dec
+	else if(GfxFsaaSamplesMouseButton == 2) // dec
 	{
 		if(CurFSAA == 1)
 			g_Config.m_GfxFsaaSamples = 64;
@@ -1726,7 +1564,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		{
 			// try again with 0 if mouse click was increasing multi sampling
 			// else just accept the current value as is
-			if((uint32_t)g_Config.m_GfxFsaaSamples > MultiSamplingCountBackend && GfxFsaaSamples_MouseButton == 1)
+			if((uint32_t)g_Config.m_GfxFsaaSamples > MultiSamplingCountBackend && GfxFsaaSamplesMouseButton == 1)
 				Graphics()->SetMultiSampling(0, MultiSamplingCountBackend);
 			g_Config.m_GfxFsaaSamples = (int)MultiSamplingCountBackend;
 		}
@@ -1749,7 +1587,9 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	}
 
 	MainView.HSplitTop(20.0f, &Button, &MainView);
-	UI()->DoScrollbarOption(&g_Config.m_GfxRefreshRate, &g_Config.m_GfxRefreshRate, &Button, Localize("Refresh Rate"), 10, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_NOCLAMPVALUE, " Hz");
+	str_copy(aBuf, " ");
+	str_append(aBuf, Localize("Hz", "Hertz"));
+	Ui()->DoScrollbarOption(&g_Config.m_GfxRefreshRate, &g_Config.m_GfxRefreshRate, &Button, Localize("Refresh Rate"), 10, 1000, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_INFINITE | CUi::SCROLLBAR_OPTION_NOCLAMPVALUE, aBuf);
 
 	MainView.HSplitTop(2.0f, nullptr, &MainView);
 	static CButtonContainer s_UiColorResetId;
@@ -1792,15 +1632,15 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		MainView.HSplitTop(20.0f, &Text, &MainView);
 		MainView.HSplitTop(2.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &BackendDropDown, &MainView);
-		UI()->DoLabel(&Text, Localize("Renderer"), 16.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&Text, Localize("Renderer"), 16.0f, TEXTALIGN_MC);
 
-		static std::vector<std::string> s_vBackendIDNames;
-		static std::vector<const char *> s_vpBackendIDNamesCStr;
+		static std::vector<std::string> s_vBackendIdNames;
+		static std::vector<const char *> s_vpBackendIdNamesCStr;
 		static std::vector<SMenuBackendInfo> s_vBackendInfos;
 
 		size_t BackendCount = FoundBackendCount + 1;
-		s_vBackendIDNames.resize(BackendCount);
-		s_vpBackendIDNamesCStr.resize(BackendCount);
+		s_vBackendIdNames.resize(BackendCount);
+		s_vpBackendIdNamesCStr.resize(BackendCount);
 		s_vBackendInfos.resize(BackendCount);
 
 		char aTmpBackendName[256];
@@ -1820,8 +1660,8 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 				{
 					bool IsDefault = IsInfoDefault(Info);
 					str_format(aTmpBackendName, sizeof(aTmpBackendName), "%s (%d.%d.%d)%s%s", Info.m_pBackendName, Info.m_Major, Info.m_Minor, Info.m_Patch, IsDefault ? " - " : "", IsDefault ? Localize("default") : "");
-					s_vBackendIDNames[CurCounter] = aTmpBackendName;
-					s_vpBackendIDNamesCStr[CurCounter] = s_vBackendIDNames[CurCounter].c_str();
+					s_vBackendIdNames[CurCounter] = aTmpBackendName;
+					s_vpBackendIdNamesCStr[CurCounter] = s_vBackendIdNames[CurCounter].c_str();
 					if(str_comp_nocase(Info.m_pBackendName, g_Config.m_GfxBackend) == 0 && g_Config.m_GfxGLMajor == Info.m_Major && g_Config.m_GfxGLMinor == Info.m_Minor && g_Config.m_GfxGLPatch == Info.m_Patch)
 					{
 						OldSelectedBackend = CurCounter;
@@ -1842,8 +1682,8 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		{
 			// custom selected one
 			str_format(aTmpBackendName, sizeof(aTmpBackendName), "%s (%s %d.%d.%d)", Localize("custom"), g_Config.m_GfxBackend, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch);
-			s_vBackendIDNames[CurCounter] = aTmpBackendName;
-			s_vpBackendIDNamesCStr[CurCounter] = s_vBackendIDNames[CurCounter].c_str();
+			s_vBackendIdNames[CurCounter] = aTmpBackendName;
+			s_vpBackendIdNamesCStr[CurCounter] = s_vBackendIdNames[CurCounter].c_str();
 			OldSelectedBackend = CurCounter;
 
 			s_vBackendInfos[CurCounter].m_pBackendName = "custom";
@@ -1856,10 +1696,10 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		if(s_OldSelectedBackend == -1)
 			s_OldSelectedBackend = OldSelectedBackend;
 
-		static CUI::SDropDownState s_BackendDropDownState;
+		static CUi::SDropDownState s_BackendDropDownState;
 		static CScrollRegion s_BackendDropDownScrollRegion;
 		s_BackendDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_BackendDropDownScrollRegion;
-		const int NewBackend = UI()->DoDropDown(&BackendDropDown, OldSelectedBackend, s_vpBackendIDNamesCStr.data(), BackendCount, s_BackendDropDownState);
+		const int NewBackend = Ui()->DoDropDown(&BackendDropDown, OldSelectedBackend, s_vpBackendIdNamesCStr.data(), BackendCount, s_BackendDropDownState);
 		if(OldSelectedBackend != NewBackend)
 		{
 			str_copy(g_Config.m_GfxBackend, s_vBackendInfos[NewBackend].m_pBackendName);
@@ -1873,61 +1713,61 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	}
 
 	// GPU list
-	const auto &GPUList = Graphics()->GetGPUs();
-	if(GPUList.m_vGPUs.size() > 1)
+	const auto &GpuList = Graphics()->GetGpus();
+	if(GpuList.m_vGpus.size() > 1)
 	{
 		CUIRect Text, GpuDropDown;
 		MainView.HSplitTop(10.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Text, &MainView);
 		MainView.HSplitTop(2.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &GpuDropDown, &MainView);
-		UI()->DoLabel(&Text, Localize("Graphics card"), 16.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&Text, Localize("Graphics card"), 16.0f, TEXTALIGN_MC);
 
-		static std::vector<const char *> s_vpGPUIDNames;
+		static std::vector<const char *> s_vpGpuIdNames;
 
-		size_t GPUCount = GPUList.m_vGPUs.size() + 1;
-		s_vpGPUIDNames.resize(GPUCount);
+		size_t GpuCount = GpuList.m_vGpus.size() + 1;
+		s_vpGpuIdNames.resize(GpuCount);
 
 		char aCurDeviceName[256 + 4];
 
-		int OldSelectedGPU = -1;
-		for(size_t i = 0; i < GPUCount; ++i)
+		int OldSelectedGpu = -1;
+		for(size_t i = 0; i < GpuCount; ++i)
 		{
 			if(i == 0)
 			{
-				str_format(aCurDeviceName, sizeof(aCurDeviceName), "%s (%s)", Localize("auto"), GPUList.m_AutoGPU.m_aName);
-				s_vpGPUIDNames[i] = aCurDeviceName;
-				if(str_comp("auto", g_Config.m_GfxGPUName) == 0)
+				str_format(aCurDeviceName, sizeof(aCurDeviceName), "%s (%s)", Localize("auto"), GpuList.m_AutoGpu.m_aName);
+				s_vpGpuIdNames[i] = aCurDeviceName;
+				if(str_comp("auto", g_Config.m_GfxGpuName) == 0)
 				{
-					OldSelectedGPU = 0;
+					OldSelectedGpu = 0;
 				}
 			}
 			else
 			{
-				s_vpGPUIDNames[i] = GPUList.m_vGPUs[i - 1].m_aName;
-				if(str_comp(GPUList.m_vGPUs[i - 1].m_aName, g_Config.m_GfxGPUName) == 0)
+				s_vpGpuIdNames[i] = GpuList.m_vGpus[i - 1].m_aName;
+				if(str_comp(GpuList.m_vGpus[i - 1].m_aName, g_Config.m_GfxGpuName) == 0)
 				{
-					OldSelectedGPU = i;
+					OldSelectedGpu = i;
 				}
 			}
 		}
 
-		static int s_OldSelectedGPU = -1;
-		if(s_OldSelectedGPU == -1)
-			s_OldSelectedGPU = OldSelectedGPU;
+		static int s_OldSelectedGpu = -1;
+		if(s_OldSelectedGpu == -1)
+			s_OldSelectedGpu = OldSelectedGpu;
 
-		static CUI::SDropDownState s_GpuDropDownState;
+		static CUi::SDropDownState s_GpuDropDownState;
 		static CScrollRegion s_GpuDropDownScrollRegion;
 		s_GpuDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_GpuDropDownScrollRegion;
-		const int NewGPU = UI()->DoDropDown(&GpuDropDown, OldSelectedGPU, s_vpGPUIDNames.data(), GPUCount, s_GpuDropDownState);
-		if(OldSelectedGPU != NewGPU)
+		const int NewGpu = Ui()->DoDropDown(&GpuDropDown, OldSelectedGpu, s_vpGpuIdNames.data(), GpuCount, s_GpuDropDownState);
+		if(OldSelectedGpu != NewGpu)
 		{
-			if(NewGPU == 0)
-				str_copy(g_Config.m_GfxGPUName, "auto");
+			if(NewGpu == 0)
+				str_copy(g_Config.m_GfxGpuName, "auto");
 			else
-				str_copy(g_Config.m_GfxGPUName, GPUList.m_vGPUs[NewGPU - 1].m_aName);
+				str_copy(g_Config.m_GfxGpuName, GpuList.m_vGpus[NewGpu - 1].m_aName);
 			CheckSettings = true;
-			s_GfxGPUChanged = NewGPU != s_OldSelectedGPU;
+			s_GfxGpuChanged = NewGpu != s_OldSelectedGpu;
 		}
 	}
 
@@ -1936,7 +1776,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	{
 		m_NeedRestartGraphics = !(s_GfxFsaaSamples == g_Config.m_GfxFsaaSamples &&
 					  !s_GfxBackendChanged &&
-					  !s_GfxGPUChanged &&
+					  !s_GfxGpuChanged &&
 					  s_GfxHighdpi == g_Config.m_GfxHighdpi);
 	}
 }
@@ -2000,35 +1840,35 @@ void CMenus::RenderSettingsSound(CUIRect MainView)
 	{
 		MainView.HSplitTop(5.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Button, &MainView);
-		UI()->DoScrollbarOption(&g_Config.m_SndVolume, &g_Config.m_SndVolume, &Button, Localize("Sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_SndVolume, &g_Config.m_SndVolume, &Button, Localize("Sound volume"), 0, 100, &CUi::ms_LogarithmicScrollbarScale, 0u, "%");
 	}
 
 	// volume slider game sounds
 	{
 		MainView.HSplitTop(5.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Button, &MainView);
-		UI()->DoScrollbarOption(&g_Config.m_SndGameSoundVolume, &g_Config.m_SndGameSoundVolume, &Button, Localize("Game sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_SndGameSoundVolume, &g_Config.m_SndGameSoundVolume, &Button, Localize("Game sound volume"), 0, 100, &CUi::ms_LogarithmicScrollbarScale, 0u, "%");
 	}
 
 	// volume slider gui sounds
 	{
 		MainView.HSplitTop(5.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Button, &MainView);
-		UI()->DoScrollbarOption(&g_Config.m_SndChatSoundVolume, &g_Config.m_SndChatSoundVolume, &Button, Localize("Chat sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_SndChatSoundVolume, &g_Config.m_SndChatSoundVolume, &Button, Localize("Chat sound volume"), 0, 100, &CUi::ms_LogarithmicScrollbarScale, 0u, "%");
 	}
 
 	// volume slider map sounds
 	{
 		MainView.HSplitTop(5.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Button, &MainView);
-		UI()->DoScrollbarOption(&g_Config.m_SndMapSoundVolume, &g_Config.m_SndMapSoundVolume, &Button, Localize("Map sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_SndMapSoundVolume, &g_Config.m_SndMapSoundVolume, &Button, Localize("Map sound volume"), 0, 100, &CUi::ms_LogarithmicScrollbarScale, 0u, "%");
 	}
 
 	// volume slider background music
 	{
 		MainView.HSplitTop(5.0f, nullptr, &MainView);
 		MainView.HSplitTop(20.0f, &Button, &MainView);
-		UI()->DoScrollbarOption(&g_Config.m_SndBackgroundMusicVolume, &g_Config.m_SndBackgroundMusicVolume, &Button, Localize("Background music volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_SndBackgroundMusicVolume, &g_Config.m_SndBackgroundMusicVolume, &Button, Localize("Background music volume"), 0, 100, &CUi::ms_LogarithmicScrollbarScale, 0u, "%");
 	}
 }
 
@@ -2067,7 +1907,7 @@ bool CMenus::RenderLanguageSelection(CUIRect MainView)
 		FlagRect.HMargin(3.0f, &FlagRect);
 		m_pClient->m_CountryFlags.Render(Language.m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
 
-		UI()->DoLabel(&Label, Language.m_Name.c_str(), 16.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, Language.m_Name.c_str(), 16.0f, TEXTALIGN_ML);
 	}
 
 	s_SelectedLanguage = s_ListBox.DoEnd();
@@ -2084,30 +1924,32 @@ bool CMenus::RenderLanguageSelection(CUIRect MainView)
 void CMenus::RenderSettings(CUIRect MainView)
 {
 	// render background
-	CUIRect Button, TabBar, RestartWarning;
+	CUIRect Button, TabBar, RestartBar;
 	MainView.VSplitRight(120.0f, &MainView, &TabBar);
 	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
-	MainView.Margin(10.0f, &MainView);
-	MainView.HSplitBottom(15.0f, &MainView, &RestartWarning);
+	MainView.Margin(20.0f, &MainView);
+
+	const bool NeedRestart = m_NeedRestartGraphics || m_NeedRestartSound || m_NeedRestartUpdate;
+	if(NeedRestart)
+	{
+		MainView.HSplitBottom(20.0f, &MainView, &RestartBar);
+		MainView.HSplitBottom(10.0f, &MainView, nullptr);
+	}
+
 	TabBar.HSplitTop(50.0f, &Button, &TabBar);
 	Button.Draw(ms_ColorTabbarActive, IGraphics::CORNER_BR, 10.0f);
 
-	MainView.HSplitTop(10.0f, nullptr, &MainView);
-
 	const char *apTabs[SETTINGS_LENGTH] = {
 		Localize("Language"),
 		Localize("General"),
 		Localize("Player"),
-		"Tee",
+		Client()->IsSixup() ? "Tee 0.7" : Localize("Tee"),
 		Localize("Appearance"),
 		Localize("Controls"),
 		Localize("Graphics"),
 		Localize("Sound"),
 		Localize("DDNet"),
-		Localize("Assets"),
-		"StA",
-		"PlayerAssets"};
-
+		Localize("Assets")};
 	static CButtonContainer s_aTabButtons[SETTINGS_LENGTH];
 
 	for(int i = 0; i < SETTINGS_LENGTH; i++)
@@ -2118,127 +1960,128 @@ void CMenus::RenderSettings(CUIRect MainView)
 			g_Config.m_UiSettingsPage = i;
 	}
 
-	MainView.Margin(10.0f, &MainView);
-	RestartWarning.VMargin(10.0f, &RestartWarning);
-
 	if(g_Config.m_UiSettingsPage == SETTINGS_LANGUAGE)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_LANGUAGE);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_LANGUAGE);
 		RenderLanguageSelection(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_GENERAL)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GENERAL);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_GENERAL);
 		RenderSettingsGeneral(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_PLAYER)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_PLAYER);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_PLAYER);
 		RenderSettingsPlayer(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_TEE)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_TEE);
-		RenderSettingsTee(MainView);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_TEE);
+		if(Client()->IsSixup())
+			RenderSettingsTee7(MainView);
+		else
+			RenderSettingsTee(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_APPEARANCE)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_APPEARANCE);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_APPEARANCE);
 		RenderSettingsAppearance(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_CONTROLS)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_CONTROLS);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_CONTROLS);
 		RenderSettingsControls(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_GRAPHICS)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GRAPHICS);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_GRAPHICS);
 		RenderSettingsGraphics(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_SOUND)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_SOUND);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_SOUND);
 		RenderSettingsSound(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_DDNET)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_DDNET);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_DDNET);
 		RenderSettingsDDNet(MainView);
 	}
 	else if(g_Config.m_UiSettingsPage == SETTINGS_ASSETS)
 	{
-		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_ASSETS);
+		GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_SETTINGS_ASSETS);
 		RenderSettingsCustom(MainView);
 	}
-
-	else if(g_Config.m_UiSettingsPage == SETTINGS_STA)
-	{
-		m_pBackground->ChangePosition(10);
-		RenderSettingsStA(MainView);
-	}
-	else if(g_Config.m_UiSettingsPage == SETTINGS_PROFILES)
-	{
-		m_pBackground->ChangePosition(11);
-		RenderSettingsProfiles(MainView);
-	}
-	if(m_NeedRestartUpdate)
+	else
 	{
-		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
-		UI()->DoLabel(&RestartWarning, Localize("DDNet Client needs to be restarted to complete update!"), 14.0f, TEXTALIGN_ML);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		dbg_assert(false, "ui_settings_page invalid");
 	}
-	else if(m_NeedRestartGeneral || m_NeedRestartSkins || m_NeedRestartGraphics || m_NeedRestartSound || m_NeedRestartDDNet)
-		UI()->DoLabel(&RestartWarning, Localize("You must restart the game for all settings to take effect."), 14.0f, TEXTALIGN_ML);
-}
-
-ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha, bool ClampedLight)
-{
-	ColorHSLA Color(*pColor, Alpha);
-	CUIRect Preview, Button, Label;
-	char aBuf[32];
-	float *apComponent[] = {&Color.h, &Color.s, &Color.l, &Color.a};
-	const char *apLabels[] = {Localize("Hue"), Localize("Sat."), Localize("Lht."), Localize("Alpha")};
-
-	float SizePerEntry = 20.0f;
-	float MarginPerEntry = 5.0f;
-
-	float OffY = (SizePerEntry + MarginPerEntry) * (3 + (Alpha ? 1 : 0)) - 40.0f;
-	pRect->VSplitLeft(40.0f, &Preview, pRect);
-	Preview.HSplitTop(OffY / 2.0f, NULL, &Preview);
-	Preview.HSplitTop(40.0f, &Preview, NULL);
 
-	Graphics()->TextureClear();
+	if(NeedRestart)
 	{
-		const float SizeBorder = 5.0f;
-		Graphics()->SetColor(ColorRGBA(0.15f, 0.15f, 0.15f, 1));
-		int TmpCont = Graphics()->CreateRectQuadContainer(Preview.x - SizeBorder / 2.0f, Preview.y - SizeBorder / 2.0f, Preview.w + SizeBorder, Preview.h + SizeBorder, 4.0f + SizeBorder / 2.0f, IGraphics::CORNER_ALL);
-		Graphics()->RenderQuadContainer(TmpCont, -1);
-		Graphics()->DeleteQuadContainer(TmpCont);
-	}
-	ColorHSLA RenderColorHSLA(Color.r, Color.g, Color.b, Color.a);
-	if(ClampedLight)
-		RenderColorHSLA = RenderColorHSLA.UnclampLighting();
-	Graphics()->SetColor(color_cast<ColorRGBA>(RenderColorHSLA));
-	int TmpCont = Graphics()->CreateRectQuadContainer(Preview.x, Preview.y, Preview.w, Preview.h, 4.0f, IGraphics::CORNER_ALL);
-	Graphics()->RenderQuadContainer(TmpCont, -1);
-	Graphics()->DeleteQuadContainer(TmpCont);
-
-	auto &&RenderHSLColorsRect = [&](CUIRect *pColorRect) {
-		Graphics()->TextureClear();
-		Graphics()->TrianglesBegin();
-
+		CUIRect RestartWarning, RestartButton;
+		RestartBar.VSplitRight(125.0f, &RestartWarning, &RestartButton);
+		RestartWarning.VSplitRight(10.0f, &RestartWarning, nullptr);
+		if(m_NeedRestartUpdate)
+		{
+			TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+			Ui()->DoLabel(&RestartWarning, Localize("DDNet Client needs to be restarted to complete update!"), 14.0f, TEXTALIGN_ML);
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+		else
+		{
+			Ui()->DoLabel(&RestartWarning, Localize("You must restart the game for all settings to take effect."), 14.0f, TEXTALIGN_ML);
+		}
+
+		static CButtonContainer s_RestartButton;
+		if(DoButton_Menu(&s_RestartButton, Localize("Restart"), 0, &RestartButton))
+		{
+			if(Client()->State() == IClient::STATE_ONLINE || m_pClient->Editor()->HasUnsavedData())
+			{
+				m_Popup = POPUP_RESTART;
+			}
+			else
+			{
+				Client()->Restart();
+			}
+		}
+	}
+}
+
+bool CMenus::RenderHslaScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha, float DarkestLight)
+{
+	const unsigned PrevPackedColor = *pColor;
+	ColorHSLA Color(*pColor, Alpha);
+	const ColorHSLA OriginalColor = Color;
+	const char *apLabels[] = {Localize("Hue"), Localize("Sat."), Localize("Lht."), Localize("Alpha")};
+	const float SizePerEntry = 20.0f;
+	const float MarginPerEntry = 5.0f;
+	const float PreviewMargin = 2.5f;
+	const float PreviewHeight = 40.0f + 2 * PreviewMargin;
+	const float OffY = (SizePerEntry + MarginPerEntry) * (3 + (Alpha ? 1 : 0)) - PreviewHeight;
+
+	CUIRect Preview;
+	pRect->VSplitLeft(PreviewHeight, &Preview, pRect);
+	Preview.HSplitTop(OffY / 2.0f, nullptr, &Preview);
+	Preview.HSplitTop(PreviewHeight, &Preview, nullptr);
+
+	Preview.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f), IGraphics::CORNER_ALL, 4.0f + PreviewMargin);
+	Preview.Margin(PreviewMargin, &Preview);
+	Preview.Draw(color_cast<ColorRGBA>(Color.UnclampLighting(DarkestLight)), IGraphics::CORNER_ALL, 4.0f + PreviewMargin);
+
+	auto &&RenderHueRect = [&](CUIRect *pColorRect) {
 		float CurXOff = pColorRect->x;
-		float SizeColor = pColorRect->w / 6;
+		const float SizeColor = pColorRect->w / 6;
 
 		// red to yellow
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 1, 0, 0, 1),
 				IGraphics::CColorVertex(1, 1, 1, 0, 1),
 				IGraphics::CColorVertex(2, 1, 0, 0, 1),
 				IGraphics::CColorVertex(3, 1, 1, 0, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2251,12 +2094,12 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		// yellow to green
 		CurXOff += SizeColor;
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 1, 1, 0, 1),
 				IGraphics::CColorVertex(1, 0, 1, 0, 1),
 				IGraphics::CColorVertex(2, 1, 1, 0, 1),
 				IGraphics::CColorVertex(3, 0, 1, 0, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2269,12 +2112,12 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		CurXOff += SizeColor;
 		// green to turquoise
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 0, 1, 0, 1),
 				IGraphics::CColorVertex(1, 0, 1, 1, 1),
 				IGraphics::CColorVertex(2, 0, 1, 0, 1),
 				IGraphics::CColorVertex(3, 0, 1, 1, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2287,12 +2130,12 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		CurXOff += SizeColor;
 		// turquoise to blue
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 0, 1, 1, 1),
 				IGraphics::CColorVertex(1, 0, 0, 1, 1),
 				IGraphics::CColorVertex(2, 0, 1, 1, 1),
 				IGraphics::CColorVertex(3, 0, 0, 1, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2305,12 +2148,12 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		CurXOff += SizeColor;
 		// blue to purple
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 0, 0, 1, 1),
 				IGraphics::CColorVertex(1, 1, 0, 1, 1),
 				IGraphics::CColorVertex(2, 0, 0, 1, 1),
 				IGraphics::CColorVertex(3, 1, 0, 1, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2323,12 +2166,12 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		CurXOff += SizeColor;
 		// purple to red
 		{
-			IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex aColorVertices[] = {
 				IGraphics::CColorVertex(0, 1, 0, 1, 1),
 				IGraphics::CColorVertex(1, 1, 0, 0, 1),
 				IGraphics::CColorVertex(2, 1, 0, 1, 1),
 				IGraphics::CColorVertex(3, 1, 0, 0, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+			Graphics()->SetColorVertex(aColorVertices, std::size(aColorVertices));
 
 			IGraphics::CFreeformItem Freeform(
 				CurXOff, pColorRect->y,
@@ -2337,150 +2180,68 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
 			Graphics()->QuadsDrawFreeform(&Freeform, 1);
 		}
-
-		Graphics()->TrianglesEnd();
 	};
 
-	auto &&RenderHSLSatRect = [&](CUIRect *pColorRect, ColorRGBA &CurColor) {
-		Graphics()->TextureClear();
-		Graphics()->TrianglesBegin();
-
-		float CurXOff = pColorRect->x;
-		float SizeColor = pColorRect->w;
-
-		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColor);
+	auto &&RenderSaturationRect = [&](CUIRect *pColorRect, const ColorRGBA &CurColor) {
 		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColor);
+		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColor);
 
-		LeftColor.g = 0;
-		RightColor.g = 1;
-
-		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
-		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+		LeftColor.s = 0.0f;
+		RightColor.s = 1.0f;
 
-		// saturation
-		{
-			IGraphics::CColorVertex Array[4] = {
-				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
-				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+		const ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+		const ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
 
-			IGraphics::CFreeformItem Freeform(
-				CurXOff, pColorRect->y,
-				CurXOff + SizeColor, pColorRect->y,
-				CurXOff, pColorRect->y + pColorRect->h,
-				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
-			Graphics()->QuadsDrawFreeform(&Freeform, 1);
-		}
+		Graphics()->SetColor4(LeftColorRGBA, RightColorRGBA, RightColorRGBA, LeftColorRGBA);
 
-		Graphics()->TrianglesEnd();
+		IGraphics::CFreeformItem Freeform(
+			pColorRect->x, pColorRect->y,
+			pColorRect->x + pColorRect->w, pColorRect->y,
+			pColorRect->x, pColorRect->y + pColorRect->h,
+			pColorRect->x + pColorRect->w, pColorRect->y + pColorRect->h);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
 	};
 
-	auto &&RenderHSLLightRect = [&](CUIRect *pColorRect, ColorRGBA &CurColorSat) {
-		Graphics()->TextureClear();
-		Graphics()->TrianglesBegin();
-
-		float CurXOff = pColorRect->x;
-		float SizeColor = pColorRect->w / (ClampedLight ? 1.0f : 2.0f);
-
-		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColorSat);
-		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColorSat);
-
-		LeftColor.b = ColorHSLA::DARKEST_LGT;
-		RightColor.b = 1;
-
-		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
-		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
-
-		if(!ClampedLight)
-			CurXOff += SizeColor;
-
-		// light
-		{
-			IGraphics::CColorVertex Array[4] = {
-				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
-				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
-			Graphics()->SetColorVertex(Array, 4);
-
-			IGraphics::CFreeformItem Freeform(
-				CurXOff, pColorRect->y,
-				CurXOff + SizeColor, pColorRect->y,
-				CurXOff, pColorRect->y + pColorRect->h,
-				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
-			Graphics()->QuadsDrawFreeform(&Freeform, 1);
-		}
-
-		if(!ClampedLight)
-		{
-			CurXOff -= SizeColor;
-			LeftColor.b = 0;
-			RightColor.b = ColorHSLA::DARKEST_LGT;
+	auto &&RenderLightingRect = [&](CUIRect *pColorRect, const ColorRGBA &CurColor) {
+		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColor);
+		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColor);
 
-			RightColorRGBA = color_cast<ColorRGBA>(RightColor);
-			LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+		LeftColor.l = DarkestLight;
+		RightColor.l = 1.0f;
 
-			IGraphics::CColorVertex Array[4] = {
-				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
-				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
-				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
-			Graphics()->SetColorVertex(Array, 4);
+		const ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+		const ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
 
-			IGraphics::CFreeformItem Freeform(
-				CurXOff, pColorRect->y,
-				CurXOff + SizeColor, pColorRect->y,
-				CurXOff, pColorRect->y + pColorRect->h,
-				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
-			Graphics()->QuadsDrawFreeform(&Freeform, 1);
-		}
+		Graphics()->SetColor4(LeftColorRGBA, RightColorRGBA, RightColorRGBA, LeftColorRGBA);
 
-		Graphics()->TrianglesEnd();
+		IGraphics::CFreeformItem Freeform(
+			pColorRect->x, pColorRect->y,
+			pColorRect->x + pColorRect->w, pColorRect->y,
+			pColorRect->x, pColorRect->y + pColorRect->h,
+			pColorRect->x + pColorRect->w, pColorRect->y + pColorRect->h);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
 	};
 
-	auto &&RenderHSLAlphaRect = [&](CUIRect *pColorRect, ColorRGBA &CurColorFull) {
-		Graphics()->TextureClear();
-		Graphics()->TrianglesBegin();
-
-		float CurXOff = pColorRect->x;
-		float SizeColor = pColorRect->w;
-
-		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColorFull);
-		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColorFull);
+	auto &&RenderAlphaRect = [&](CUIRect *pColorRect, const ColorRGBA &CurColorFull) {
+		const ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(color_cast<ColorHSLA>(CurColorFull).WithAlpha(0.0f));
+		const ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(color_cast<ColorHSLA>(CurColorFull).WithAlpha(1.0f));
 
-		LeftColor.a = 0;
-		RightColor.a = 1;
-
-		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
-		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
-
-		// alpha
-		{
-			IGraphics::CColorVertex Array[4] = {
-				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, LeftColorRGBA.a),
-				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, RightColorRGBA.a),
-				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, LeftColorRGBA.a),
-				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, RightColorRGBA.a)};
-			Graphics()->SetColorVertex(Array, 4);
+		Graphics()->SetColor4(LeftColorRGBA, RightColorRGBA, RightColorRGBA, LeftColorRGBA);
 
-			IGraphics::CFreeformItem Freeform(
-				CurXOff, pColorRect->y,
-				CurXOff + SizeColor, pColorRect->y,
-				CurXOff, pColorRect->y + pColorRect->h,
-				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
-			Graphics()->QuadsDrawFreeform(&Freeform, 1);
-		}
-
-		Graphics()->TrianglesEnd();
+		IGraphics::CFreeformItem Freeform(
+			pColorRect->x, pColorRect->y,
+			pColorRect->x + pColorRect->w, pColorRect->y,
+			pColorRect->x, pColorRect->y + pColorRect->h,
+			pColorRect->x + pColorRect->w, pColorRect->y + pColorRect->h);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
 	};
 
 	for(int i = 0; i < 3 + Alpha; i++)
 	{
+		CUIRect Button, Label;
 		pRect->HSplitTop(SizePerEntry, &Button, pRect);
-		pRect->HSplitTop(MarginPerEntry, NULL, pRect);
-		Button.VSplitLeft(10.0f, 0, &Button);
+		pRect->HSplitTop(MarginPerEntry, nullptr, pRect);
+		Button.VSplitLeft(10.0f, nullptr, &Button);
 		Button.VSplitLeft(100.0f, &Label, &Button);
 
 		Button.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f), IGraphics::CORNER_ALL, 1.0f);
@@ -2488,47 +2249,43 @@ ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool
 		CUIRect Rail;
 		Button.Margin(2.0f, &Rail);
 
-		str_format(aBuf, sizeof(aBuf), "%s: %03d", apLabels[i], (int)(*apComponent[i] * 255));
-		UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
-
-		ColorHSLA CurColorPureHSLA(RenderColorHSLA.r, 1, 0.5f, 1);
-		ColorRGBA CurColorPure = color_cast<ColorRGBA>(CurColorPureHSLA);
-		ColorRGBA ColorInner(1, 1, 1, 0.25f);
+		char aBuf[32];
+		str_format(aBuf, sizeof(aBuf), "%s: %03d", apLabels[i], round_to_int(Color[i] * 255.0f));
+		Ui()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
 
+		ColorRGBA HandleColor;
+		Graphics()->TextureClear();
+		Graphics()->TrianglesBegin();
 		if(i == 0)
 		{
-			ColorInner = CurColorPure;
-			RenderHSLColorsRect(&Rail);
+			RenderHueRect(&Rail);
+			HandleColor = color_cast<ColorRGBA>(ColorHSLA(Color.h, 1.0f, 0.5f, 1.0f));
 		}
 		else if(i == 1)
 		{
-			RenderHSLSatRect(&Rail, CurColorPure);
-			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], CurColorPureHSLA.b, 1));
+			RenderSaturationRect(&Rail, color_cast<ColorRGBA>(ColorHSLA(Color.h, 1.0f, 0.5f, 1.0f)));
+			HandleColor = color_cast<ColorRGBA>(ColorHSLA(Color.h, Color.s, 0.5f, 1.0f));
 		}
 		else if(i == 2)
 		{
-			ColorRGBA CurColorSat = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], 0.5f, 1));
-			RenderHSLLightRect(&Rail, CurColorSat);
-			float LightVal = *apComponent[2];
-			if(ClampedLight)
-				LightVal = ColorHSLA::DARKEST_LGT + LightVal * (1.0f - ColorHSLA::DARKEST_LGT);
-			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], LightVal, 1));
+			RenderLightingRect(&Rail, color_cast<ColorRGBA>(ColorHSLA(Color.h, Color.s, 0.5f, 1.0f)));
+			HandleColor = color_cast<ColorRGBA>(ColorHSLA(Color.h, Color.s, Color.l, 1.0f).UnclampLighting(DarkestLight));
 		}
 		else if(i == 3)
 		{
-			ColorRGBA CurColorFull = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], *apComponent[2], 1));
-			RenderHSLAlphaRect(&Rail, CurColorFull);
-			float LightVal = *apComponent[2];
-			if(ClampedLight)
-				LightVal = ColorHSLA::DARKEST_LGT + LightVal * (1.0f - ColorHSLA::DARKEST_LGT);
-			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], LightVal, *apComponent[3]));
+			RenderAlphaRect(&Rail, color_cast<ColorRGBA>(ColorHSLA(Color.h, Color.s, Color.l, 1.0f).UnclampLighting(DarkestLight)));
+			HandleColor = color_cast<ColorRGBA>(Color.UnclampLighting(DarkestLight));
 		}
+		Graphics()->TrianglesEnd();
 
-		*apComponent[i] = UI()->DoScrollbarH(&((char *)pColor)[i], &Button, *apComponent[i], &ColorInner);
+		Color[i] = Ui()->DoScrollbarH(&((char *)pColor)[i], &Button, Color[i], &HandleColor);
 	}
 
-	*pColor = Color.Pack(Alpha);
-	return Color;
+	if(OriginalColor != Color)
+	{
+		*pColor = Color.Pack(Alpha);
+	}
+	return PrevPackedColor != *pColor;
 }
 
 enum
@@ -2547,193 +2304,171 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 	char aBuf[128];
 	static int s_CurTab = 0;
 
-	CUIRect TabBar, Page1Tab, Page2Tab, Page3Tab, Page4Tab, Page5Tab, Page6Tab, LeftView, RightView, Section, Button, Label;
-
-	MainView.HSplitTop(20, &TabBar, &MainView);
-	float TabsW = TabBar.w;
-	TabBar.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page1Tab, &Page2Tab);
-	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page2Tab, &Page3Tab);
-	Page3Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page3Tab, &Page4Tab);
-	Page4Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page4Tab, &Page5Tab);
-	Page5Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page5Tab, &Page6Tab);
+	CUIRect TabBar, LeftView, RightView, Button, Label;
 
+	MainView.HSplitTop(20.0f, &TabBar, &MainView);
+	const float TabWidth = TabBar.w / NUMBER_OF_APPEARANCE_TABS;
 	static CButtonContainer s_aPageTabs[NUMBER_OF_APPEARANCE_TABS] = {};
+	const char *apTabNames[NUMBER_OF_APPEARANCE_TABS] = {
+		Localize("HUD"),
+		Localize("Chat"),
+		Localize("Name Plate"),
+		Localize("Hook Collisions"),
+		Localize("Info Messages"),
+		Localize("Laser")};
 
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_HUD], Localize("HUD"), s_CurTab == APPEARANCE_TAB_HUD, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_HUD;
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_CHAT], Localize("Chat"), s_CurTab == APPEARANCE_TAB_CHAT, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_CHAT;
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_NAME_PLATE], Localize("Name Plate"), s_CurTab == APPEARANCE_TAB_NAME_PLATE, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_NAME_PLATE;
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_HOOK_COLLISION], Localize("Hook Collisions"), s_CurTab == APPEARANCE_TAB_HOOK_COLLISION, &Page4Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_HOOK_COLLISION;
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_INFO_MESSAGES], Localize("Info Messages"), s_CurTab == APPEARANCE_TAB_INFO_MESSAGES, &Page5Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_INFO_MESSAGES;
-	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_LASER], Localize("Laser"), s_CurTab == APPEARANCE_TAB_LASER, &Page6Tab, IGraphics::CORNER_R, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = APPEARANCE_TAB_LASER;
+	for(int Tab = APPEARANCE_TAB_HUD; Tab < NUMBER_OF_APPEARANCE_TABS; ++Tab)
+	{
+		TabBar.VSplitLeft(TabWidth, &Button, &TabBar);
+		const int Corners = Tab == APPEARANCE_TAB_HUD ? IGraphics::CORNER_L : Tab == NUMBER_OF_APPEARANCE_TABS - 1 ? IGraphics::CORNER_R : IGraphics::CORNER_NONE;
+		if(DoButton_MenuTab(&s_aPageTabs[Tab], apTabNames[Tab], s_CurTab == Tab, &Button, Corners, nullptr, nullptr, nullptr, nullptr, 4.0f))
+		{
+			s_CurTab = Tab;
+		}
+	}
 
 	MainView.HSplitTop(10.0f, nullptr, &MainView);
 
 	const float LineSize = 20.0f;
 	const float ColorPickerLineSize = 25.0f;
-	const float SectionMargin = 5.0f;
-	const float SectionTotalMargin = SectionMargin * 2;
 	const float HeadlineFontSize = 20.0f;
-	const float HeadlineAndVMargin = HeadlineFontSize + SectionTotalMargin;
-	const float MarginToNextSection = 5.0f;
+	const float HeadlineHeight = 30.0f;
+	const float MarginSmall = 5.0f;
+	const float MarginBetweenViews = 20.0f;
 
 	const float ColorPickerLabelSize = 13.0f;
 	const float ColorPickerLineSpacing = 5.0f;
 
 	if(s_CurTab == APPEARANCE_TAB_HUD)
 	{
-		MainView.VSplitMid(&LeftView, &RightView);
+		MainView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** HUD ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("HUD"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("HUD"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// Switch of the entire HUD
-		LeftView.HSplitTop(SectionTotalMargin + LineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhud, Localize("Show ingame HUD"), &g_Config.m_ClShowhud, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhud, Localize("Show ingame HUD"), &g_Config.m_ClShowhud, &LeftView, LineSize);
 
 		// Switches of the various normal HUD elements
-		LeftView.HSplitTop(SectionTotalMargin + 6 * LineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudHealthAmmo, Localize("Show health, shields and ammo"), &g_Config.m_ClShowhudHealthAmmo, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChat, Localize("Show chat"), &g_Config.m_ClShowChat, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplates, Localize("Show name plates"), &g_Config.m_ClNameplates, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowKillMessages, Localize("Show kill messages"), &g_Config.m_ClShowKillMessages, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudScore, Localize("Show score"), &g_Config.m_ClShowhudScore, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowLocalTimeAlways, Localize("Show local time always"), &g_Config.m_ClShowLocalTimeAlways, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudHealthAmmo, Localize("Show health, shields and ammo"), &g_Config.m_ClShowhudHealthAmmo, &LeftView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudScore, Localize("Show score"), &g_Config.m_ClShowhudScore, &LeftView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowLocalTimeAlways, Localize("Show local time always"), &g_Config.m_ClShowLocalTimeAlways, &LeftView, LineSize);
 
 		// Settings of the HUD element for votes
-		LeftView.HSplitTop(SectionTotalMargin + LineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowVotesAfterVoting, Localize("Show votes window after voting"), &g_Config.m_ClShowVotesAfterVoting, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowVotesAfterVoting, Localize("Show votes window after voting"), &g_Config.m_ClShowVotesAfterVoting, &LeftView, LineSize);
 
 		// ***** DDRace HUD ***** //
-		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
-		UI()->DoLabel(&Label, Localize("DDRace HUD"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(HeadlineHeight, &Label, &RightView);
+		Ui()->DoLabel(&Label, Localize("DDRace HUD"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(MarginSmall, nullptr, &RightView);
 
 		// Switches of various DDRace HUD elements
-		RightView.HSplitTop(SectionTotalMargin + 4 * LineSize, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClDDRaceScoreBoard, Localize("Use DDRace Scoreboard"), &g_Config.m_ClDDRaceScoreBoard, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowIDs, Localize("Show client IDs in scoreboard"), &g_Config.m_ClShowIDs, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDDRace, Localize("Show DDRace HUD"), &g_Config.m_ClShowhudDDRace, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowIds, Localize("Show client IDs (scoreboard, chat, spectator)"), &g_Config.m_ClShowIds, &RightView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDDRace, Localize("Show DDRace HUD"), &g_Config.m_ClShowhudDDRace, &RightView, LineSize);
 		if(g_Config.m_ClShowhudDDRace)
 		{
-			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudJumpsIndicator, Localize("Show jumps indicator"), &g_Config.m_ClShowhudJumpsIndicator, &Section, LineSize);
+			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudJumpsIndicator, Localize("Show jumps indicator"), &g_Config.m_ClShowhudJumpsIndicator, &RightView, LineSize);
 		}
 		else
 		{
-			Section.HSplitTop(LineSize, 0x0, &Section); // Create empty space for hidden option
+			RightView.HSplitTop(LineSize, nullptr, &RightView); // Create empty space for hidden option
 		}
 
 		// Switch for dummy actions display
-		RightView.HSplitTop(SectionTotalMargin + LineSize, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDummyActions, Localize("Show dummy actions"), &g_Config.m_ClShowhudDummyActions, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDummyActions, Localize("Show dummy actions"), &g_Config.m_ClShowhudDummyActions, &RightView, LineSize);
 
 		// Player movement information display settings
-		RightView.HSplitTop(SectionTotalMargin + 3 * LineSize, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerPosition, Localize("Show player position"), &g_Config.m_ClShowhudPlayerPosition, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerSpeed, Localize("Show player speed"), &g_Config.m_ClShowhudPlayerSpeed, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerAngle, Localize("Show player target angle"), &g_Config.m_ClShowhudPlayerAngle, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerPosition, Localize("Show player position"), &g_Config.m_ClShowhudPlayerPosition, &RightView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerSpeed, Localize("Show player speed"), &g_Config.m_ClShowhudPlayerSpeed, &RightView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerAngle, Localize("Show player target angle"), &g_Config.m_ClShowhudPlayerAngle, &RightView, LineSize);
 
 		// Freeze bar settings
-		RightView.HSplitTop(SectionTotalMargin + 3 * LineSize, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFreezeBars, Localize("Show freeze bars"), &g_Config.m_ClShowFreezeBars, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFreezeBars, Localize("Show freeze bars"), &g_Config.m_ClShowFreezeBars, &RightView, LineSize);
+		RightView.HSplitTop(2 * LineSize, &Button, &RightView);
+		if(g_Config.m_ClShowFreezeBars)
 		{
-			Section.HSplitTop(2 * LineSize, &Button, &Section);
-			if(g_Config.m_ClShowFreezeBars)
-			{
-				UI()->DoScrollbarOption(&g_Config.m_ClFreezeBarsAlphaInsideFreeze, &g_Config.m_ClFreezeBarsAlphaInsideFreeze, &Button, Localize("Opacity of freeze bars inside freeze"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE, "%");
-			}
+			Ui()->DoScrollbarOption(&g_Config.m_ClFreezeBarsAlphaInsideFreeze, &g_Config.m_ClFreezeBarsAlphaInsideFreeze, &Button, Localize("Opacity of freeze bars inside freeze"), 0, 100, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE, "%");
 		}
 	}
 	else if(s_CurTab == APPEARANCE_TAB_CHAT)
 	{
 		CChat &Chat = GameClient()->m_Chat;
 		CUIRect TopView, PreviewView;
-		MainView.h += 20.f; // Increase height a little
-		MainView.HSplitTop(MainView.h - 260, &TopView, &PreviewView);
-		TopView.VSplitMid(&LeftView, &RightView);
+		MainView.HSplitBottom(220.0f, &TopView, &PreviewView);
+		TopView.HSplitBottom(MarginBetweenViews, &TopView, nullptr);
+		TopView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** Chat ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Chat"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Chat"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// General chat settings
-		LeftView.HSplitTop(SectionTotalMargin + 7 * LineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(DoButton_CheckBox(&g_Config.m_ClShowChat, Localize("Show chat"), g_Config.m_ClShowChat, &Button))
+		{
+			g_Config.m_ClShowChat = g_Config.m_ClShowChat ? 0 : 1;
+		}
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(g_Config.m_ClShowChat)
+		{
+			static int s_ShowChat = 0;
+			if(DoButton_CheckBox(&s_ShowChat, Localize("Always show chat"), g_Config.m_ClShowChat == 2, &Button))
+				g_Config.m_ClShowChat = g_Config.m_ClShowChat != 2 ? 2 : 1;
+		}
 
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatTeamColors, Localize("Show names in chat in team colors"), &g_Config.m_ClChatTeamColors, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChatFriends, Localize("Show only chat messages from friends"), &g_Config.m_ClShowChatFriends, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatTeamColors, Localize("Show names in chat in team colors"), &g_Config.m_ClChatTeamColors, &LeftView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChatFriends, Localize("Show only chat messages from friends"), &g_Config.m_ClShowChatFriends, &LeftView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChatTeamMembersOnly, Localize("Show only chat messages from team members"), &g_Config.m_ClShowChatTeamMembersOnly, &LeftView, LineSize);
 
-		if(DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatOld, Localize("Use old chat style"), &g_Config.m_ClChatOld, &Section, LineSize))
+		if(DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatOld, Localize("Use old chat style"), &g_Config.m_ClChatOld, &LeftView, LineSize))
 			GameClient()->m_Chat.RebuildChat();
 
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
-		int PrevFontSize = g_Config.m_ClChatFontSize;
-		UI()->DoScrollbarOption(&g_Config.m_ClChatFontSize, &g_Config.m_ClChatFontSize, &Button, Localize("Chat font size"), 10, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
-		if(PrevFontSize != g_Config.m_ClChatFontSize)
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
+		if(Ui()->DoScrollbarOption(&g_Config.m_ClChatFontSize, &g_Config.m_ClChatFontSize, &Button, Localize("Chat font size"), 10, 100, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE))
 		{
 			Chat.EnsureCoherentWidth();
 			Chat.RebuildChat();
 		}
 
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
-		int PrevWidth = g_Config.m_ClChatWidth;
-		UI()->DoScrollbarOption(&g_Config.m_ClChatWidth, &g_Config.m_ClChatWidth, &Button, Localize("Chat width"), 120, 400, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
-		if(PrevWidth != g_Config.m_ClChatWidth)
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
+		if(Ui()->DoScrollbarOption(&g_Config.m_ClChatWidth, &g_Config.m_ClChatWidth, &Button, Localize("Chat width"), 120, 400, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE))
 		{
 			Chat.EnsureCoherentFontSize();
 			Chat.RebuildChat();
 		}
 
 		// ***** Messages ***** //
-		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
-		UI()->DoLabel(&Label, Localize("Messages"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(HeadlineHeight, &Label, &RightView);
+		Ui()->DoLabel(&Label, Localize("Messages"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(MarginSmall, nullptr, &RightView);
 
 		// Message Colors and extra settings
-		RightView.HSplitTop(SectionTotalMargin + 6 * ColorPickerLineSize, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-
-		int i = 0;
-		static CButtonContainer s_aResetIDs[24];
-
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("System message"), &g_Config.m_ClMessageSystemColor, ColorRGBA(1.0f, 1.0f, 0.5f), true, &g_Config.m_ClShowChatSystem);
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Highlighted message"), &g_Config.m_ClMessageHighlightColor, ColorRGBA(1.0f, 0.5f, 0.5f));
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Team message"), &g_Config.m_ClMessageTeamColor, ColorRGBA(0.65f, 1.0f, 0.65f));
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Friend message"), &g_Config.m_ClMessageFriendColor, ColorRGBA(1.0f, 0.137f, 0.137f), true, &g_Config.m_ClMessageFriend);
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Normal message"), &g_Config.m_ClMessageColor, ColorRGBA(1.0f, 1.0f, 1.0f));
+		static CButtonContainer s_SystemMessageColor;
+		DoLine_ColorPicker(&s_SystemMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, Localize("System message"), &g_Config.m_ClMessageSystemColor, ColorRGBA(1.0f, 1.0f, 0.5f), true, &g_Config.m_ClShowChatSystem);
+		static CButtonContainer s_HighlightedMessageColor;
+		DoLine_ColorPicker(&s_HighlightedMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, Localize("Highlighted message"), &g_Config.m_ClMessageHighlightColor, ColorRGBA(1.0f, 0.5f, 0.5f));
+		static CButtonContainer s_TeamMessageColor;
+		DoLine_ColorPicker(&s_TeamMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, Localize("Team message"), &g_Config.m_ClMessageTeamColor, ColorRGBA(0.65f, 1.0f, 0.65f));
+		static CButtonContainer s_FriendMessageColor;
+		DoLine_ColorPicker(&s_FriendMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, Localize("Friend message"), &g_Config.m_ClMessageFriendColor, ColorRGBA(1.0f, 0.137f, 0.137f), true, &g_Config.m_ClMessageFriend);
+		static CButtonContainer s_NormalMessageColor;
+		DoLine_ColorPicker(&s_NormalMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, Localize("Normal message"), &g_Config.m_ClMessageColor, ColorRGBA(1.0f, 1.0f, 1.0f));
 
 		str_format(aBuf, sizeof(aBuf), "%s (echo)", Localize("Client message"));
-		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, aBuf, &g_Config.m_ClMessageClientColor, ColorRGBA(0.5f, 0.78f, 1.0f));
+		static CButtonContainer s_ClientMessageColor;
+		DoLine_ColorPicker(&s_ClientMessageColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &RightView, aBuf, &g_Config.m_ClMessageClientColor, ColorRGBA(0.5f, 0.78f, 1.0f));
 
 		// ***** Chat Preview ***** //
-		PreviewView.HSplitTop(HeadlineAndVMargin, &Label, &PreviewView);
-		UI()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+		PreviewView.HSplitTop(HeadlineHeight, &Label, &PreviewView);
+		Ui()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+		PreviewView.HSplitTop(MarginSmall, nullptr, &PreviewView);
 
 		// Use the rest of the view for preview
-		Section = PreviewView;
-		Section.Margin(SectionMargin, &Section);
-
-		Section.Draw(ColorRGBA(1, 1, 1, 0.1f), IGraphics::CORNER_ALL, 8.0f);
-
-		Section.HSplitTop(10.0f, 0x0, &Section); // Margin
+		PreviewView.Draw(ColorRGBA(1, 1, 1, 0.1f), IGraphics::CORNER_ALL, 5.0f);
+		PreviewView.Margin(MarginSmall, &PreviewView);
 
 		ColorRGBA SystemColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
 		ColorRGBA HighlightedColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
@@ -2749,14 +2484,10 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		const float RealMsgPaddingTee = (!g_Config.m_ClChatOld ? Chat.MessageTeeSize() + CChat::MESSAGE_TEE_PADDING_RIGHT : 0) * 2;
 		const float RealOffsetY = RealFontSize + RealMsgPaddingY;
 
-		const float X = 5.0f + RealMsgPaddingX / 2.0f + Section.x;
-		float Y = Section.y;
+		const float X = RealMsgPaddingX / 2.0f + PreviewView.x;
+		float Y = PreviewView.y;
 		float LineWidth = g_Config.m_ClChatWidth * 2 - (RealMsgPaddingX * 1.5f) - RealMsgPaddingTee;
 
-		CTextCursor Cursor;
-		TextRender()->SetCursor(&Cursor, X, Y, RealFontSize, TEXTFLAG_RENDER);
-		Cursor.m_LineWidth = LineWidth;
-
 		str_copy(aBuf, Client()->PlayerName());
 
 		const CAnimState *pIdleState = CAnimState::GetIdle();
@@ -2768,7 +2499,7 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 
 		struct SPreviewLine
 		{
-			int m_ClientID;
+			int m_ClientId;
 			bool m_Team;
 			char m_aName[64];
 			char m_aText[256];
@@ -2800,13 +2531,21 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 			PREVIEW_SPAMMER,
 			PREVIEW_CLIENT
 		};
-		auto &&AddPreviewLine = [](int Index, int ClientID, const char *pName, const char *pText, int Flag, int Repeats) {
-			s_vLines.emplace_back();
-			SPreviewLine *pLine = &s_vLines[s_vLines.size() - 1];
-			pLine->m_ClientID = ClientID;
+		auto &&SetPreviewLine = [](int Index, int ClientId, const char *pName, const char *pText, int Flag, int Repeats) {
+			SPreviewLine *pLine;
+			if((int)s_vLines.size() <= Index)
+			{
+				s_vLines.emplace_back();
+				pLine = &s_vLines.back();
+			}
+			else
+			{
+				pLine = &s_vLines[Index];
+			}
+			pLine->m_ClientId = ClientId;
 			pLine->m_Team = Flag & FLAG_TEAM;
 			pLine->m_Friend = Flag & FLAG_FRIEND;
-			pLine->m_Player = ClientID >= 0;
+			pLine->m_Player = ClientId >= 0;
 			pLine->m_Highlighted = Flag & FLAG_HIGHLIGHT;
 			pLine->m_Client = Flag & FLAG_CLIENT;
 			pLine->m_TimesRepeated = Repeats;
@@ -2832,20 +2571,14 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 			LocalCursor.m_LineWidth = LineWidth;
 			const auto &Line = s_vLines[LineIndex];
 
-			char aName[64 + 12] = "";
-
-			if(g_Config.m_ClShowIDs && Line.m_ClientID >= 0 && Line.m_aName[0] != '\0')
+			char aClientId[16] = "";
+			if(g_Config.m_ClShowIds && Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 			{
-				if(Line.m_ClientID < 10)
-					str_format(aName, sizeof(aName), " %d: ", Line.m_ClientID);
-				else
-					str_format(aName, sizeof(aName), "%d: ", Line.m_ClientID);
+				GameClient()->FormatClientId(Line.m_ClientId, aClientId, EClientIdFormat::INDENT_FORCE);
 			}
 
-			str_append(aName, Line.m_aName);
-
 			char aCount[12];
-			if(Line.m_ClientID < 0)
+			if(Line.m_ClientId < 0)
 				str_format(aCount, sizeof(aCount), "[%d] ", Line.m_TimesRepeated + 1);
 			else
 				str_format(aCount, sizeof(aCount), " [%d]", Line.m_TimesRepeated + 1);
@@ -2875,7 +2608,8 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 			if(Render)
 				TextRender()->TextColor(NameColor);
 
-			TextRender()->TextEx(&LocalCursor, aName, -1);
+			TextRender()->TextEx(&LocalCursor, aClientId);
+			TextRender()->TextEx(&LocalCursor, Line.m_aName);
 
 			if(Line.m_TimesRepeated > 0)
 			{
@@ -2884,7 +2618,7 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 				TextRender()->TextEx(&LocalCursor, aCount, -1);
 			}
 
-			if(Line.m_ClientID >= 0 && Line.m_aName[0] != '\0')
+			if(Line.m_ClientId >= 0 && Line.m_aName[0] != '\0')
 			{
 				if(Render)
 					TextRender()->TextColor(NameColor);
@@ -2916,21 +2650,20 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 			return vec2{LocalCursor.m_LongestLineWidth + AppendCursor.m_LongestLineWidth, AppendCursor.Height() + RealMsgPaddingY};
 		};
 
-		// Init lines
-		if(s_vLines.empty())
+		// Set preview lines
 		{
 			char aLineBuilder[128];
 
 			str_format(aLineBuilder, sizeof(aLineBuilder), "'%s' entered and joined the game", aBuf);
-			AddPreviewLine(PREVIEW_SYS, -1, "*** ", aLineBuilder, 0, 0);
+			SetPreviewLine(PREVIEW_SYS, -1, "*** ", aLineBuilder, 0, 0);
 
 			str_format(aLineBuilder, sizeof(aLineBuilder), "Hey, how are you %s?", aBuf);
-			AddPreviewLine(PREVIEW_HIGHLIGHT, 7, "Random Tee", aLineBuilder, FLAG_HIGHLIGHT, 0);
+			SetPreviewLine(PREVIEW_HIGHLIGHT, 7, "Random Tee", aLineBuilder, FLAG_HIGHLIGHT, 0);
 
-			AddPreviewLine(PREVIEW_TEAM, 11, "Your Teammate", "Let's speedrun this!", FLAG_TEAM, 0);
-			AddPreviewLine(PREVIEW_FRIEND, 8, "Friend", "Hello there", FLAG_FRIEND, 0);
-			AddPreviewLine(PREVIEW_SPAMMER, 9, "Spammer", "Hey fools, I'm spamming here!", 0, 5);
-			AddPreviewLine(PREVIEW_CLIENT, -1, "— ", "Echo command executed", FLAG_CLIENT, 0);
+			SetPreviewLine(PREVIEW_TEAM, 11, "Your Teammate", "Let's speedrun this!", FLAG_TEAM, 0);
+			SetPreviewLine(PREVIEW_FRIEND, 8, "Friend", "Hello there", FLAG_FRIEND, 0);
+			SetPreviewLine(PREVIEW_SPAMMER, 9, "Spammer", "Hey fools, I'm spamming here!", 0, 5);
+			SetPreviewLine(PREVIEW_CLIENT, -1, "— ", "Echo command executed", FLAG_CLIENT, 0);
 		}
 
 		SetLineSkin(1, GameClient()->m_Skins.FindOrNullptr("pinky"));
@@ -2961,13 +2694,15 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 
 			if(!g_Config.m_ClShowChatFriends)
 			{
-				TempY += RenderMessageBackground(PREVIEW_HIGHLIGHT);
+				if(!g_Config.m_ClShowChatTeamMembersOnly)
+					TempY += RenderMessageBackground(PREVIEW_HIGHLIGHT);
 				TempY += RenderMessageBackground(PREVIEW_TEAM);
 			}
 
-			TempY += RenderMessageBackground(PREVIEW_FRIEND);
+			if(!g_Config.m_ClShowChatTeamMembersOnly)
+				TempY += RenderMessageBackground(PREVIEW_FRIEND);
 
-			if(!g_Config.m_ClShowChatFriends)
+			if(!g_Config.m_ClShowChatFriends && !g_Config.m_ClShowChatTeamMembersOnly)
 			{
 				TempY += RenderMessageBackground(PREVIEW_SPAMMER);
 			}
@@ -2986,9 +2721,10 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		if(!g_Config.m_ClShowChatFriends)
 		{
 			// Highlighted
-			if(!g_Config.m_ClChatOld)
+			if(!g_Config.m_ClChatOld && !g_Config.m_ClShowChatTeamMembersOnly)
 				RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_HIGHLIGHT].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
-			Y += RenderPreview(PREVIEW_HIGHLIGHT, X, Y).y;
+			if(!g_Config.m_ClShowChatTeamMembersOnly)
+				Y += RenderPreview(PREVIEW_HIGHLIGHT, X, Y).y;
 
 			// Team
 			if(!g_Config.m_ClChatOld)
@@ -2997,12 +2733,13 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		}
 
 		// Friend
-		if(!g_Config.m_ClChatOld)
+		if(!g_Config.m_ClChatOld && !g_Config.m_ClShowChatTeamMembersOnly)
 			RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_FRIEND].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
-		Y += RenderPreview(PREVIEW_FRIEND, X, Y).y;
+		if(!g_Config.m_ClShowChatTeamMembersOnly)
+			Y += RenderPreview(PREVIEW_FRIEND, X, Y).y;
 
 		// Normal
-		if(!g_Config.m_ClShowChatFriends)
+		if(!g_Config.m_ClShowChatFriends && !g_Config.m_ClShowChatTeamMembersOnly)
 		{
 			if(!g_Config.m_ClChatOld)
 				RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_SPAMMER].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
@@ -3010,185 +2747,180 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		}
 		// Client
 		RenderPreview(PREVIEW_CLIENT, X, Y);
-		TextRender()->SetCursorPosition(&Cursor, X, Y);
 
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	}
 	else if(s_CurTab == APPEARANCE_TAB_NAME_PLATE)
 	{
-		MainView.VSplitMid(&LeftView, &RightView);
+		MainView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** Name Plate ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Name Plate"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Name Plate"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
-		// General chat settings
-		LeftView.HSplitTop(SectionTotalMargin + 9 * LineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
-		UI()->DoScrollbarOption(&g_Config.m_ClNameplatesSize, &g_Config.m_ClNameplatesSize, &Button, Localize("Name plates size"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+		// General name plate settings
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplates, Localize("Show name plates"), &g_Config.m_ClNameplates, &LeftView, LineSize);
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
+		Ui()->DoScrollbarOption(&g_Config.m_ClNameplatesSize, &g_Config.m_ClNameplatesSize, &Button, Localize("Name plates size"), 0, 100, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE);
 
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesClan, Localize("Show clan above name plates"), &g_Config.m_ClNameplatesClan, &Section, LineSize);
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesClan, Localize("Show clan above name plates"), &g_Config.m_ClNameplatesClan, &LeftView, LineSize);
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
 		if(g_Config.m_ClNameplatesClan)
 		{
-			UI()->DoScrollbarOption(&g_Config.m_ClNameplatesClanSize, &g_Config.m_ClNameplatesClanSize, &Button, Localize("Clan plates size"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+			Ui()->DoScrollbarOption(&g_Config.m_ClNameplatesClanSize, &g_Config.m_ClNameplatesClanSize, &Button, Localize("Clan plates size"), 0, 100, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE);
 		}
 
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesTeamcolors, Localize("Use team colors for name plates"), &g_Config.m_ClNameplatesTeamcolors, &Section, LineSize);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesStrong, Localize("Show hook strength indicator"), &g_Config.m_ClNameplatesStrong, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesTeamcolors, Localize("Use team colors for name plates"), &g_Config.m_ClNameplatesTeamcolors, &LeftView, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesFriendMark, Localize("Show friend mark (♥) in name plates"), &g_Config.m_ClNameplatesFriendMark, &LeftView, LineSize);
+
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(DoButton_CheckBox(&g_Config.m_ClNameplatesStrong, Localize("Show hook strength icon indicator"), g_Config.m_ClNameplatesStrong, &Button))
+		{
+			g_Config.m_ClNameplatesStrong = g_Config.m_ClNameplatesStrong ? 0 : 1;
+		}
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(g_Config.m_ClNameplatesStrong)
+		{
+			static int s_NameplatesStrong = 0;
+			if(DoButton_CheckBox(&s_NameplatesStrong, Localize("Show hook strength number indicator"), g_Config.m_ClNameplatesStrong == 2, &Button))
+				g_Config.m_ClNameplatesStrong = g_Config.m_ClNameplatesStrong != 2 ? 2 : 1;
+		}
 
-		Section.HSplitTop(LineSize, &Button, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
 		if(DoButton_CheckBox(&g_Config.m_ClShowDirection, Localize("Show other players' key presses"), g_Config.m_ClShowDirection >= 1 && g_Config.m_ClShowDirection != 3, &Button))
 		{
-			switch(g_Config.m_ClShowDirection)
-			{
-			case 0:
-				g_Config.m_ClShowDirection = 1;
-				break;
-			case 1:
-				g_Config.m_ClShowDirection = 0;
-				break;
-			case 2:
-				g_Config.m_ClShowDirection = 3;
-				break;
-			case 3:
-				g_Config.m_ClShowDirection = 2;
-				break;
-			}
+			g_Config.m_ClShowDirection = g_Config.m_ClShowDirection ^ 1;
 		}
 
-		Section.HSplitTop(LineSize, &Button, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
 		static int s_ShowLocalPlayer = 0;
 		if(DoButton_CheckBox(&s_ShowLocalPlayer, Localize("Show local player's key presses"), g_Config.m_ClShowDirection >= 2, &Button))
 		{
-			switch(g_Config.m_ClShowDirection)
-			{
-			case 0:
-				g_Config.m_ClShowDirection = 3;
-				break;
-			case 1:
-				g_Config.m_ClShowDirection = 2;
-				break;
-			case 2:
-				g_Config.m_ClShowDirection = 1;
-				break;
-			case 3:
-				g_Config.m_ClShowDirection = 0;
-				break;
-			}
+			g_Config.m_ClShowDirection = g_Config.m_ClShowDirection ^ 3;
 		}
 
-		Section.HSplitTop(LineSize, &Button, &Section);
 		ColorRGBA GreenDefault(0.78f, 1.0f, 0.8f, 1.0f);
-		static CButtonContainer s_AuthedColor;
-		static CButtonContainer s_SameClanColor;
-		DoLine_ColorPicker(&s_AuthedColor, 25.0f, 13.0f, 5.0f, &Button, Localize("Authed name color in scoreboard"), &g_Config.m_ClAuthedPlayerColor, GreenDefault, false);
-		DoLine_ColorPicker(&s_SameClanColor, 25.0f, 13.0f, 5.0f, &Button, Localize("Same clan color in scoreboard"), &g_Config.m_ClSameClanColor, GreenDefault, false);
+		static CButtonContainer s_AuthedColor, s_SameClanColor;
+		DoLine_ColorPicker(&s_AuthedColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Authed name color in scoreboard"), &g_Config.m_ClAuthedPlayerColor, GreenDefault, false);
+		DoLine_ColorPicker(&s_SameClanColor, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Same clan color in scoreboard"), &g_Config.m_ClSameClanColor, GreenDefault, false);
 	}
 	else if(s_CurTab == APPEARANCE_TAB_HOOK_COLLISION)
 	{
-		MainView.VSplitMid(&LeftView, &RightView);
+		MainView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** Hookline ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Hook collision line"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Hook collision line"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// General hookline settings
-		LeftView.HSplitTop(SectionTotalMargin + 6 * LineSize + 3 * ColorPickerLineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(DoButton_CheckBox(&g_Config.m_ClShowHookCollOwn, Localize("Show own player's hook collision line"), g_Config.m_ClShowHookCollOwn, &Button))
+		{
+			g_Config.m_ClShowHookCollOwn = g_Config.m_ClShowHookCollOwn ? 0 : 1;
+		}
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(g_Config.m_ClShowHookCollOwn)
+		{
+			static int s_ShowHookCollOwn = 0;
+			if(DoButton_CheckBox(&s_ShowHookCollOwn, Localize("Always show own player's hook collision line"), g_Config.m_ClShowHookCollOwn == 2, &Button))
+				g_Config.m_ClShowHookCollOwn = g_Config.m_ClShowHookCollOwn != 2 ? 2 : 1;
+		}
 
-		Section.HSplitTop(LineSize, &Button, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
 		if(DoButton_CheckBox(&g_Config.m_ClShowHookCollOther, Localize("Show other players' hook collision lines"), g_Config.m_ClShowHookCollOther, &Button))
 		{
 			g_Config.m_ClShowHookCollOther = g_Config.m_ClShowHookCollOther >= 1 ? 0 : 1;
 		}
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(g_Config.m_ClShowHookCollOther)
+		{
+			static int s_ShowHookCollOther = 0;
+			if(DoButton_CheckBox(&s_ShowHookCollOther, Localize("Always show other players' hook collision lines"), g_Config.m_ClShowHookCollOther == 2, &Button))
+				g_Config.m_ClShowHookCollOther = g_Config.m_ClShowHookCollOther != 2 ? 2 : 1;
+		}
 
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
-		UI()->DoScrollbarOption(&g_Config.m_ClHookCollSize, &g_Config.m_ClHookCollSize, &Button, Localize("Hook collision line width"), 0, 20, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
+		Ui()->DoScrollbarOption(&g_Config.m_ClHookCollSize, &g_Config.m_ClHookCollSize, &Button, Localize("Hook collision line width"), 0, 20, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE);
 
-		Section.HSplitTop(2 * LineSize, &Button, &Section);
-		UI()->DoScrollbarOption(&g_Config.m_ClHookCollAlpha, &g_Config.m_ClHookCollAlpha, &Button, Localize("Hook collision line opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE, "%");
+		LeftView.HSplitTop(2 * LineSize, &Button, &LeftView);
+		Ui()->DoScrollbarOption(&g_Config.m_ClHookCollAlpha, &g_Config.m_ClHookCollAlpha, &Button, Localize("Hook collision line opacity"), 0, 100, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_MULTILINE, "%");
 
-		static CButtonContainer s_HookCollNoCollResetID, s_HookCollHookableCollResetID, s_HookCollTeeCollResetID;
+		static CButtonContainer s_HookCollNoCollResetId, s_HookCollHookableCollResetId, s_HookCollTeeCollResetId;
 		static int s_HookCollToolTip;
 
-		Section.HSplitTop(LineSize, &Label, &Section);
-		UI()->DoLabel(&Label, Localize("Colors of the hook collision line, in case of a possible collision with:"), 13.0f, TEXTALIGN_ML);
-		UI()->DoButtonLogic(&s_HookCollToolTip, 0, &Label); // Just for the tooltip, result ignored
+		LeftView.HSplitTop(LineSize, &Label, &LeftView);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Colors of the hook collision line, in case of a possible collision with:"), 13.0f, TEXTALIGN_ML);
+		Ui()->DoButtonLogic(&s_HookCollToolTip, 0, &Label); // Just for the tooltip, result ignored
 		GameClient()->m_Tooltips.DoToolTip(&s_HookCollToolTip, &Label, Localize("Your movements are not taken into account when calculating the line colors"));
-		DoLine_ColorPicker(&s_HookCollNoCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Nothing hookable"), &g_Config.m_ClHookCollColorNoColl, ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), false);
-		DoLine_ColorPicker(&s_HookCollHookableCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Something hookable"), &g_Config.m_ClHookCollColorHookableColl, ColorRGBA(130.0f / 255.0f, 232.0f / 255.0f, 160.0f / 255.0f, 1.0f), false);
-		DoLine_ColorPicker(&s_HookCollTeeCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("A Tee"), &g_Config.m_ClHookCollColorTeeColl, ColorRGBA(1.0f, 1.0f, 0.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_HookCollNoCollResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Nothing hookable"), &g_Config.m_ClHookCollColorNoColl, ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_HookCollHookableCollResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Something hookable"), &g_Config.m_ClHookCollColorHookableColl, ColorRGBA(130.0f / 255.0f, 232.0f / 255.0f, 160.0f / 255.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_HookCollTeeCollResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("A Tee"), &g_Config.m_ClHookCollColorTeeColl, ColorRGBA(1.0f, 1.0f, 0.0f, 1.0f), false);
 	}
 	else if(s_CurTab == APPEARANCE_TAB_INFO_MESSAGES)
 	{
-		MainView.VSplitMid(&LeftView, &RightView);
+		MainView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** Info Messages ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Info Messages"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Info Messages"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// General info messages settings
-		LeftView.HSplitTop(SectionTotalMargin + 2 * LineSize + 2 * ColorPickerLineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-
-		Section.HSplitTop(LineSize, &Button, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
 		if(DoButton_CheckBox(&g_Config.m_ClShowKillMessages, Localize("Show kill messages"), g_Config.m_ClShowKillMessages, &Button))
 		{
 			g_Config.m_ClShowKillMessages ^= 1;
 		}
 
-		Section.HSplitTop(LineSize, &Button, &Section);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
 		if(DoButton_CheckBox(&g_Config.m_ClShowFinishMessages, Localize("Show finish messages"), g_Config.m_ClShowFinishMessages, &Button))
 		{
 			g_Config.m_ClShowFinishMessages ^= 1;
 		}
 
-		static CButtonContainer s_KillMessageNormalColorID, s_KillMessageHighlightColorID;
-		DoLine_ColorPicker(&s_KillMessageNormalColorID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Normal Color"), &g_Config.m_ClKillMessageNormalColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
-		DoLine_ColorPicker(&s_KillMessageHighlightColorID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Highlight Color"), &g_Config.m_ClKillMessageHighlightColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
+		static CButtonContainer s_KillMessageNormalColorId, s_KillMessageHighlightColorId;
+		DoLine_ColorPicker(&s_KillMessageNormalColorId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Normal Color"), &g_Config.m_ClKillMessageNormalColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_KillMessageHighlightColorId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Highlight Color"), &g_Config.m_ClKillMessageHighlightColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
 	}
 	else if(s_CurTab == APPEARANCE_TAB_LASER)
 	{
-		MainView.VSplitMid(&LeftView, &RightView);
+		MainView.VSplitMid(&LeftView, &RightView, MarginBetweenViews);
 
 		// ***** Weapons ***** //
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Weapons"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Weapons"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// General weapon laser settings
-		LeftView.HSplitTop(SectionTotalMargin + 4 * ColorPickerLineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
+		static CButtonContainer s_LaserRifleOutResetId, s_LaserRifleInResetId, s_LaserShotgunOutResetId, s_LaserShotgunInResetId;
 
-		static CButtonContainer s_LaserRifleOutResetID, s_LaserRifleInResetID, s_LaserShotgunOutResetID, s_LaserShotgunInResetID;
-
-		ColorHSLA LaserRifleOutlineColor = DoLine_ColorPicker(&s_LaserRifleOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Rifle Laser Outline Color"), &g_Config.m_ClLaserRifleOutlineColor, ColorRGBA(0.074402f, 0.074402f, 0.247166f, 1.0f), false);
-		ColorHSLA LaserRifleInnerColor = DoLine_ColorPicker(&s_LaserRifleInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Rifle Laser Inner Color"), &g_Config.m_ClLaserRifleInnerColor, ColorRGBA(0.498039f, 0.498039f, 1.0f, 1.0f), false);
-		ColorHSLA LaserShotgunOutlineColor = DoLine_ColorPicker(&s_LaserShotgunOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Shotgun Laser Outline Color"), &g_Config.m_ClLaserShotgunOutlineColor, ColorRGBA(0.125490f, 0.098039f, 0.043137f, 1.0f), false);
-		ColorHSLA LaserShotgunInnerColor = DoLine_ColorPicker(&s_LaserShotgunInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Shotgun Laser Inner Color"), &g_Config.m_ClLaserShotgunInnerColor, ColorRGBA(0.570588f, 0.417647f, 0.252941f, 1.0f), false);
+		ColorHSLA LaserRifleOutlineColor = DoLine_ColorPicker(&s_LaserRifleOutResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Rifle Laser Outline Color"), &g_Config.m_ClLaserRifleOutlineColor, ColorRGBA(0.074402f, 0.074402f, 0.247166f, 1.0f), false);
+		ColorHSLA LaserRifleInnerColor = DoLine_ColorPicker(&s_LaserRifleInResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Rifle Laser Inner Color"), &g_Config.m_ClLaserRifleInnerColor, ColorRGBA(0.498039f, 0.498039f, 1.0f, 1.0f), false);
+		ColorHSLA LaserShotgunOutlineColor = DoLine_ColorPicker(&s_LaserShotgunOutResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Shotgun Laser Outline Color"), &g_Config.m_ClLaserShotgunOutlineColor, ColorRGBA(0.125490f, 0.098039f, 0.043137f, 1.0f), false);
+		ColorHSLA LaserShotgunInnerColor = DoLine_ColorPicker(&s_LaserShotgunInResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Shotgun Laser Inner Color"), &g_Config.m_ClLaserShotgunInnerColor, ColorRGBA(0.570588f, 0.417647f, 0.252941f, 1.0f), false);
 
 		// ***** Entities ***** //
-		LeftView.HSplitTop(MarginToNextSection * 2.0f, 0x0, &LeftView);
-		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
-		UI()->DoLabel(&Label, Localize("Entities"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(10.0f, nullptr, &LeftView);
+		LeftView.HSplitTop(HeadlineHeight, &Label, &LeftView);
+		Ui()->DoLabel(&Label, Localize("Entities"), HeadlineFontSize, TEXTALIGN_ML);
+		LeftView.HSplitTop(MarginSmall, nullptr, &LeftView);
 
 		// General entity laser settings
-		LeftView.HSplitTop(SectionTotalMargin + 4 * ColorPickerLineSize, &Section, &LeftView);
-		Section.Margin(SectionMargin, &Section);
-
-		static CButtonContainer s_LaserDoorOutResetID, s_LaserDoorInResetID, s_LaserFreezeOutResetID, s_LaserFreezeInResetID;
+		static CButtonContainer s_LaserDoorOutResetId, s_LaserDoorInResetId, s_LaserFreezeOutResetId, s_LaserFreezeInResetId;
 
-		ColorHSLA LaserDoorOutlineColor = DoLine_ColorPicker(&s_LaserDoorOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Door Laser Outline Color"), &g_Config.m_ClLaserDoorOutlineColor, ColorRGBA(0.0f, 0.131372f, 0.096078f, 1.0f), false);
-		ColorHSLA LaserDoorInnerColor = DoLine_ColorPicker(&s_LaserDoorInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Door Laser Inner Color"), &g_Config.m_ClLaserDoorInnerColor, ColorRGBA(0.262745f, 0.760784f, 0.639215f, 1.0f), false);
-		ColorHSLA LaserFreezeOutlineColor = DoLine_ColorPicker(&s_LaserFreezeOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Freeze Laser Outline Color"), &g_Config.m_ClLaserFreezeOutlineColor, ColorRGBA(0.131372f, 0.123529f, 0.182352f, 1.0f), false);
-		ColorHSLA LaserFreezeInnerColor = DoLine_ColorPicker(&s_LaserFreezeInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Freeze Laser Inner Color"), &g_Config.m_ClLaserFreezeInnerColor, ColorRGBA(0.482352f, 0.443137f, 0.564705f, 1.0f), false);
+		ColorHSLA LaserDoorOutlineColor = DoLine_ColorPicker(&s_LaserDoorOutResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Door Laser Outline Color"), &g_Config.m_ClLaserDoorOutlineColor, ColorRGBA(0.0f, 0.131372f, 0.096078f, 1.0f), false);
+		ColorHSLA LaserDoorInnerColor = DoLine_ColorPicker(&s_LaserDoorInResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Door Laser Inner Color"), &g_Config.m_ClLaserDoorInnerColor, ColorRGBA(0.262745f, 0.760784f, 0.639215f, 1.0f), false);
+		ColorHSLA LaserFreezeOutlineColor = DoLine_ColorPicker(&s_LaserFreezeOutResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Freeze Laser Outline Color"), &g_Config.m_ClLaserFreezeOutlineColor, ColorRGBA(0.131372f, 0.123529f, 0.182352f, 1.0f), false);
+		ColorHSLA LaserFreezeInnerColor = DoLine_ColorPicker(&s_LaserFreezeInResetId, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &LeftView, Localize("Freeze Laser Inner Color"), &g_Config.m_ClLaserFreezeInnerColor, ColorRGBA(0.482352f, 0.443137f, 0.564705f, 1.0f), false);
 
-		static CButtonContainer s_AllToRifleResetID, s_AllToDefaultResetID;
+		static CButtonContainer s_AllToRifleResetId, s_AllToDefaultResetId;
 
-		LeftView.HSplitTop(20.0f, 0x0, &LeftView);
-		LeftView.HSplitTop(20.0f, &Button, &LeftView);
-		if(DoButton_Menu(&s_AllToRifleResetID, Localize("Set all to Rifle"), 0, &Button))
+		LeftView.HSplitTop(4 * MarginSmall, nullptr, &LeftView);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(DoButton_Menu(&s_AllToRifleResetId, Localize("Set all to Rifle"), 0, &Button))
 		{
 			g_Config.m_ClLaserShotgunOutlineColor = g_Config.m_ClLaserRifleOutlineColor;
 			g_Config.m_ClLaserShotgunInnerColor = g_Config.m_ClLaserRifleInnerColor;
@@ -3199,9 +2931,9 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		}
 
 		// values taken from the CL commands
-		LeftView.HSplitTop(10.0f, 0x0, &LeftView);
-		LeftView.HSplitTop(20.0f, &Button, &LeftView);
-		if(DoButton_Menu(&s_AllToDefaultResetID, Localize("Reset to defaults"), 0, &Button))
+		LeftView.HSplitTop(2 * MarginSmall, nullptr, &LeftView);
+		LeftView.HSplitTop(LineSize, &Button, &LeftView);
+		if(DoButton_Menu(&s_AllToDefaultResetId, Localize("Reset to defaults"), 0, &Button))
 		{
 			g_Config.m_ClLaserRifleOutlineColor = 11176233;
 			g_Config.m_ClLaserRifleInnerColor = 11206591;
@@ -3214,820 +2946,30 @@ void CMenus::RenderSettingsAppearance(CUIRect MainView)
 		}
 
 		// ***** Laser Preview ***** //
-		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
-		UI()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(HeadlineHeight, &Label, &RightView);
+		Ui()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+		RightView.HSplitTop(MarginSmall, nullptr, &RightView);
 
-		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-		DoLaserPreview(&Section, LaserRifleOutlineColor, LaserRifleInnerColor, LASERTYPE_RIFLE);
+		const float LaserPreviewHeight = 50.0f;
+		CUIRect LaserPreview;
+		RightView.HSplitTop(LaserPreviewHeight, &LaserPreview, &RightView);
+		RightView.HSplitTop(2 * MarginSmall, nullptr, &RightView);
+		DoLaserPreview(&LaserPreview, LaserRifleOutlineColor, LaserRifleInnerColor, LASERTYPE_RIFLE);
 
-		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-		DoLaserPreview(&Section, LaserShotgunOutlineColor, LaserShotgunInnerColor, LASERTYPE_SHOTGUN);
+		RightView.HSplitTop(LaserPreviewHeight, &LaserPreview, &RightView);
+		RightView.HSplitTop(2 * MarginSmall, nullptr, &RightView);
+		DoLaserPreview(&LaserPreview, LaserShotgunOutlineColor, LaserShotgunInnerColor, LASERTYPE_SHOTGUN);
 
-		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-		DoLaserPreview(&Section, LaserDoorOutlineColor, LaserDoorInnerColor, LASERTYPE_DOOR);
+		RightView.HSplitTop(LaserPreviewHeight, &LaserPreview, &RightView);
+		RightView.HSplitTop(2 * MarginSmall, nullptr, &RightView);
+		DoLaserPreview(&LaserPreview, LaserDoorOutlineColor, LaserDoorInnerColor, LASERTYPE_DOOR);
 
-		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
-		Section.Margin(SectionMargin, &Section);
-		DoLaserPreview(&Section, LaserFreezeOutlineColor, LaserFreezeInnerColor, LASERTYPE_DOOR);
+		RightView.HSplitTop(LaserPreviewHeight, &LaserPreview, &RightView);
+		RightView.HSplitTop(2 * MarginSmall, nullptr, &RightView);
+		DoLaserPreview(&LaserPreview, LaserFreezeOutlineColor, LaserFreezeInnerColor, LASERTYPE_DOOR);
 	}
 }
 
-enum
-{
-	STA_TAB_PAGE1 = 0,
-	STA_TAB_PAGE2 = 1,
-	STA_TAB_PAGE3 = 2,
-	NUMBER_OF_STA_TABS = 3,
-};
-
-void CMenus::RenderSettingsStA(CUIRect MainView)
-{//TODO: buttons before upd
-	static int s_CurTab = 0;
-
-	CUIRect TabBar, Page1Tab, Page2Tab, Page3Tab, Left, Right, Button, Label;
-
-	MainView.HSplitTop(20, &TabBar, &MainView);
-	float TabsW = TabBar.w;
-	TabBar.VSplitLeft(TabsW / NUMBER_OF_STA_TABS, &Page1Tab, &Page2Tab);
-	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_STA_TABS, &Page2Tab, &Page3Tab);
-
-	static CButtonContainer s_aPageTabs[NUMBER_OF_STA_TABS] = {};
-
-	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE1], Localize("Options"), s_CurTab == STA_TAB_PAGE1, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = STA_TAB_PAGE1;
-	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE2], Localize("Customization"), s_CurTab == STA_TAB_PAGE2, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = STA_TAB_PAGE2;
-	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE3], Localize("3rd PAGE"), s_CurTab == STA_TAB_PAGE3, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurTab = STA_TAB_PAGE3;
-
-	MainView.HSplitTop(10.0f, nullptr, &MainView);
-	MainView.VSplitMid(&Left, &Right, 10.f);
-
-	const float LineMargin = 20.0f;
-	const float ColorPickerLineSize = 25.0f;
-	const float SectionMargin = 5.0f;
-	const float ColorPickerLabelSize = 13.0f;
-	const float ColorPickerLineSpacing = 5.0f;
-
-	if(s_CurTab == STA_TAB_PAGE1)
-	{
-		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(2.0f) % 255 / 100.f, 0.4f, 1.f));
-		CUIRect LeftLeft, Demo, Outline;
-
-		Right.HSplitTop(25.f, &Label, &Outline);
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Tile Outlines(TYSM TClient)"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutline, ("Show any enabled outlines"), &g_Config.m_ClOutline, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineEntities, ("Only show outlines in entities"), &g_Config.m_ClOutlineEntities, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineFreeze, ("Outline freeze & deep"), &g_Config.m_ClOutlineFreeze, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineSolid, ("Outline walls"), &g_Config.m_ClOutlineSolid, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineTele, ("Outline teleporter"), &g_Config.m_ClOutlineTele, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineUnFreeze, ("Outline unfreeze & undeep"), &g_Config.m_ClOutlineUnFreeze, &Outline, LineMargin);
-
-		Outline.HSplitTop(20.f, &Button, &Outline);
-		UI()->DoScrollbarOption(&g_Config.m_ClOutlineWidth, &g_Config.m_ClOutlineWidth, &Button, Localize("Outline Width"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-
-		Outline.HSplitTop(20.f, &Button, &Outline);
-		UI()->DoScrollbarOption(&g_Config.m_ClOutlineAlphaSolid, &g_Config.m_ClOutlineAlphaSolid, &Button, Localize("Outline Opacity (walls)"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-
-		Outline.HSplitTop(20.f, &Button, &Outline);
-		UI()->DoScrollbarOption(&g_Config.m_ClOutlineAlpha, &g_Config.m_ClOutlineAlpha, &Button, Localize("Outline Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-
-		static CButtonContainer s_aResetIDs[24];
-		static CUI::SDropDownState s_BackendDropDownState;
-		static CScrollRegion s_BackendDropDownScrollRegion;
-		int i = 0;
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Outline, Localize("Freeze Outline Color"),
-			&g_Config.m_ClOutlineColorFreeze,
-			ColorRGBA(1),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Outline, Localize("Walls Outline Color"),
-			&g_Config.m_ClOutlineColorSolid,
-			ColorRGBA(1),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Outline, Localize("Teleporter Outline Color"),
-			&g_Config.m_ClOutlineColorTele,
-			ColorRGBA(1),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Outline, Localize("Unfreeze Outline Color"),
-			&g_Config.m_ClOutlineColorUnfreeze,
-			ColorRGBA(1),
-			false);
-
-		Outline.HSplitTop(25.f, &Label, &Outline);
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, ("Frozen Tee Display"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFrozenHud, ("Enable Frozen Tee Display"), &g_Config.m_ClShowFrozenHud, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFrozenHudSkins, ("Use teeskin instead of ninja tee"), &g_Config.m_ClShowFrozenHudSkins, &Outline, LineMargin);
-		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClFrozenHudTeamOnly, ("Enable only for Team"), &g_Config.m_ClFrozenHudTeamOnly, &Outline, LineMargin);
-
-		Outline.HSplitTop(20.f, &Button, &Outline);
-		UI()->DoScrollbarOption(&g_Config.m_ClFrozenMaxRows, &g_Config.m_ClFrozenMaxRows, &Button, Localize("Max rows"), 1, 6, &CUI::ms_LinearScrollbarScale, 0u, "");
-
-		Outline.HSplitTop(20.f, &Button, &Outline);
-		UI()->DoScrollbarOption(&g_Config.m_ClFrozenHudTeeSize, &g_Config.m_ClFrozenHudTeeSize, &Button, Localize("Tee Size"), 8, 20, &CUI::ms_LinearScrollbarScale, 0u, "");
-
-		// Preferences
-		Left.HSplitTop(20.0f, &Demo, &MainView);
-		Demo.HSplitTop(0.0f, &Label, &Demo);
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Preferences"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		Button.VSplitMid(&LeftLeft, &Button);
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClShowfps, Localize("Show FPS"), g_Config.m_ClShowfps, &Button))
-			g_Config.m_ClShowfps ^= 1;
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClShowpred, Localize("Show ping(predict)"), g_Config.m_ClShowpred, &Button))
-			g_Config.m_ClShowpred ^= 1;
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClAutoVerify, Localize("Server Auto Whitelist"), g_Config.m_ClAutoVerify, &Button))
-			g_Config.m_ClAutoVerify ^= 1;
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClShowSkinName, Localize("Display skin name in nameplates"), g_Config.m_ClShowSkinName, &Button))
-			g_Config.m_ClShowSkinName ^= 1;
-
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClOldFreezeMode, Localize("Old Freeze Mode"), g_Config.m_ClOldFreezeMode, &Button))
-			g_Config.m_ClOldFreezeMode ^= 1;
-
-		// Bind wheel config
-		Left.HSplitTop(30.f, &Label, &Right);
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Bind wheel"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		CUIRect BindWheelZone, BindWheelList, BindWheelOptions;
-		Right.HSplitTop(60.f, &BindWheelZone, &Right);
-		BindWheelZone.VSplitMid(&BindWheelList, &BindWheelOptions, 10.f);
-		BindWheelList.h = 20.f;
-
-		static int s_SelectedBind = -1;
-
-		auto &vBindsList = GameClient()->m_BindWheel.m_vBinds;
-		std::vector<const char *> vBindsName;
-
-		for(auto &Bind : vBindsList)
-			vBindsName.push_back(Bind.m_aName);
-
-		s_BackendDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_BackendDropDownScrollRegion;
-		s_SelectedBind = UI()->DoDropDown(&BindWheelList, s_SelectedBind, vBindsName.data(), vBindsName.size(), s_BackendDropDownState);
-
-		// Input fields
-		static char s_aBindName[BIND_WHEEL_MAX_NAME];
-		static char s_aBindBind[BIND_WHEEL_MAX_BIND];
-
-		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
-		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
-		static CLineInput s_NameInput;
-		s_NameInput.SetBuffer(s_aBindName, sizeof(s_aBindName));
-		s_NameInput.SetEmptyText("New Bind Description");
-		UI()->DoEditBox(&s_NameInput, &Button, 14.0f);
-
-		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
-		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
-		static CLineInput s_BindInput;
-		s_BindInput.SetBuffer(s_aBindBind, sizeof(s_aBindBind));
-		s_BindInput.SetEmptyText("New Bind Command");
-		UI()->DoEditBox(&s_BindInput, &Button, 14.0f);
-
-		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
-		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
-		CUIRect LeftButton, RightButton;
-		Button.VSplitMid(&LeftButton, &RightButton, 5.f);
-
-		// New bind button
-		static CButtonContainer s_NewBindButton, s_RemBindButton;
-		if(DoButton_Menu(&s_NewBindButton, Localize("New bind"), 0, &RightButton) && str_length(s_aBindName) > 0 && str_length(s_aBindBind))
-		{
-			CBindWheel::SBind Bind;
-			str_copy(Bind.m_aName, s_aBindName);
-			str_copy(Bind.m_aBind, s_aBindBind);
-
-			vBindsList.push_back(Bind);
-		}
-
-		if(DoButton_Menu(&s_RemBindButton, Localize("Remove bind"), 0, &LeftButton) && s_SelectedBind >= 0)
-		{
-			vBindsList.erase(vBindsList.begin() + s_SelectedBind);
-			s_SelectedBind = -1;
-		}
-	}
-
-	if(s_CurTab == STA_TAB_PAGE2)
-	{
-		int i = 0;
-		static CButtonContainer s_aResetIDs[24];
-		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(2.0f) % 255 / 100.f, 0.4f, 1.f));
-
-		// Tab
-		Left.HSplitTop(25.f, &Label, &Left);
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Tab"), 20.f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Blacklisted player color"),
-			&g_Config.m_ScBlacklistPColor,
-			ColorRGBA(1.0f, 0.39f, 0.39f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Friends color"),
-			&g_Config.m_ScFriendColor,
-			ColorRGBA(0.45f, 1.0f, 0.91f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Сlanmates color"),
-			&g_Config.m_ClSameClanColor,
-			ColorRGBA(0.2f, 0.7f, 1.0f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Staff player color(f2)"),
-			&g_Config.m_ClAuthedPlayerColor,
-			ColorRGBA(1.f, 0.25f, 0.6f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Own player color"),
-			&g_Config.m_ScPlayerOwnColor,
-			ColorRGBA(1.0f, 1.0f, 1.0f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Left, Localize("Frozen Tee Color"),
-			&g_Config.m_ScFrozenTeeColor,
-			ColorRGBA(1.0f, 1.0f, 1.0f),
-			false);
-
-		Left.HSplitTop(20.f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ScShowBlacklistNameplaterColor, Localize("Display Blacklisted Color in Nameplates"), g_Config.m_ScShowBlacklistNameplaterColor, &Button))
-			g_Config.m_ScShowBlacklistNameplaterColor ^= 1;
-
-		Left.HSplitTop(20.f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ScShowFriendsNameplatesColor, Localize("Display Friend Color in Nameplates"), g_Config.m_ScShowFriendsNameplatesColor, &Button))
-			g_Config.m_ScShowFriendsNameplatesColor ^= 1;
-
-		Left.HSplitTop(20.f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ScShowFrozenNameplaterColor, Localize("Display Frozen Tee's Color in Nameplates"), g_Config.m_ScShowFrozenNameplaterColor, &Button))
-			g_Config.m_ScShowFrozenNameplaterColor ^= 1;
-
-		Left.HSplitTop(25.f, &Label, &Left);
-
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Tee"), 20.f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		Left.HSplitTop(20.f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClRainbow, Localize("Rainbow Tee"), g_Config.m_ClRainbow, &Button))
-			g_Config.m_ClRainbow ^= 1;
-		Left.HSplitTop(20.f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClRainbowHook, Localize("Rainbow Hook"), g_Config.m_ClRainbowHook, &Button))
-			g_Config.m_ClRainbowHook ^= 1;
-		if(g_Config.m_ClRainbow == 1 || g_Config.m_ClRainbowHook == 1)
-		{
-			Left.HSplitTop(20.f, &Button, &Left);
-			UI()->DoScrollbarOption(&g_Config.m_ClRainbowSpeed, &g_Config.m_ClRainbowSpeed, &Button, Localize("Rainbow Speed"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-		}
-
-		// Console color
-		Right.HSplitTop(25.f, &Label, &Right);
-
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Console Settings"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClConsoleSimple, Localize("Use simpled console"), g_Config.m_ClConsoleSimple, &Button))
-			g_Config.m_ClConsoleSimple ^= 1;
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClConsoleBarSimple, Localize("Use simpled console bar"), g_Config.m_ClConsoleBarSimple, &Button))
-			g_Config.m_ClConsoleBarSimple ^= 1;
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Right, Localize("Local console color"),
-			&g_Config.m_ScLocalConsoleColor,
-			ColorRGBA(0.2f, 0.2f, 0.2f),
-			false);
-
-		DoLine_ColorPicker(&s_aResetIDs[i++],
-			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-			&Right, Localize("Remote console color"),
-			&g_Config.m_ScRemoteConsoleColor,
-			ColorRGBA(0.4f, 0.2f, 0.2f),
-			false);
-
-		if(g_Config.m_ClConsoleBarSimple == 1)
-		{
-			DoLine_ColorPicker(&s_aResetIDs[i++],
-				ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
-				&Right, Localize("Simpled console bar color"),
-				&g_Config.m_ScConsoleBarColor,
-				ColorRGBA(8883654),
-				false);
-		}
-
-		Right.HSplitTop(20.f, &Button, &Right);
-		UI()->DoScrollbarOption(&g_Config.m_ClLocalConsolaAlpha, &g_Config.m_ClLocalConsolaAlpha, &Button, Localize("Local Console Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-		Right.HSplitTop(20.f, &Button, &Right);
-		UI()->DoScrollbarOption(&g_Config.m_ClRemoteConsolaAlpha, &g_Config.m_ClRemoteConsolaAlpha, &Button, Localize("Remote Console Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
-
-		Right.HSplitTop(30.f, &Label, &Right);
-
-		TextRender()->TextColor(col);
-		UI()->DoLabel(&Label, Localize("Better Animation"), 20.0f, TEXTALIGN_TC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-		// feets
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClAnimFeetSpeed, Localize("Enable Feet LERP"), g_Config.m_ClAnimFeetSpeed < 100, &Button))
-			g_Config.m_ClAnimFeetSpeed = g_Config.m_ClAnimFeetSpeed < 100 ? 100 : 1;
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(g_Config.m_ClAnimFeetSpeed > 0 && g_Config.m_ClAnimFeetSpeed < 100)
-			UI()->DoScrollbarOption(&g_Config.m_ClAnimFeetSpeed, &g_Config.m_ClAnimFeetSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
-
-		// guns
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClAnimGunsSpeed, Localize("Enable Guns LERP"), g_Config.m_ClAnimGunsSpeed < 100, &Button))
-			g_Config.m_ClAnimGunsSpeed = g_Config.m_ClAnimGunsSpeed < 100 ? 100 : 1;
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(g_Config.m_ClAnimGunsSpeed > 0 && g_Config.m_ClAnimGunsSpeed < 100)
-			UI()->DoScrollbarOption(&g_Config.m_ClAnimGunsSpeed, &g_Config.m_ClAnimGunsSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
-
-		// hammer
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClAnimHammerSpeed, Localize("Enable Hammer LERP"), g_Config.m_ClAnimHammerSpeed < 100, &Button))
-			g_Config.m_ClAnimHammerSpeed = g_Config.m_ClAnimHammerSpeed < 100 ? 100 : 1;
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(g_Config.m_ClAnimHammerSpeed > 0 && g_Config.m_ClAnimHammerSpeed < 100)
-			UI()->DoScrollbarOption(&g_Config.m_ClAnimHammerSpeed, &g_Config.m_ClAnimHammerSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
-
-		// ninja
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(DoButton_CheckBox(&g_Config.m_ClAnimNinjaSpeed, Localize("Enable Ninja LERP"), g_Config.m_ClAnimNinjaSpeed < 100, &Button))
-			g_Config.m_ClAnimNinjaSpeed = g_Config.m_ClAnimNinjaSpeed < 100 ? 100 : 1;
-
-		Right.HSplitTop(20.0f, &Button, &Right);
-		if(g_Config.m_ClAnimNinjaSpeed > 0 && g_Config.m_ClAnimNinjaSpeed < 100)
-			UI()->DoScrollbarOption(&g_Config.m_ClAnimNinjaSpeed, &g_Config.m_ClAnimNinjaSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
-	}
-	if(s_CurTab == STA_TAB_PAGE3)
-	{
-		Left.HSplitTop(25.f, &Label, &Left);
-		UI()->DoLabel(&Label, Localize("Why are you looking right here?:o"), 20.f, TEXTALIGN_ML);
-	}
-}
-void CMenus::RenderSettingsProfiles(CUIRect MainView)
-{
-	CUIRect Label, LabelMid, Section, LabelRight;
-	static int SelectedProfile = -1;
-
-	const float LineMargin = 22.0f;
-	char *pSkinName = g_Config.m_ClPlayerSkin;
-	int *pUseCustomColor = &g_Config.m_ClPlayerUseCustomColor;
-	unsigned *pColorBody = &g_Config.m_ClPlayerColorBody;
-	unsigned *pColorFeet = &g_Config.m_ClPlayerColorFeet;
-	int CurrentFlag = m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry;
-
-	if(m_Dummy)
-	{
-		pSkinName = g_Config.m_ClDummySkin;
-		pUseCustomColor = &g_Config.m_ClDummyUseCustomColor;
-		pColorBody = &g_Config.m_ClDummyColorBody;
-		pColorFeet = &g_Config.m_ClDummyColorFeet;
-	}
-
-	// skin info
-	CTeeRenderInfo OwnSkinInfo;
-	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
-	OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-	OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-	OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
-	OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
-	if(*pUseCustomColor)
-	{
-		OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting());
-		OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(*pColorFeet).UnclampLighting());
-	}
-	else
-	{
-		OwnSkinInfo.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
-		OwnSkinInfo.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
-	}
-	OwnSkinInfo.m_Size = 50.0f;
-
-	//======YOUR PROFILE======
-	MainView.HSplitTop(10.0f, &Label, &MainView);
-	char aTempBuf[256];
-	str_format(aTempBuf, sizeof(aTempBuf), "%s:", Localize("PlayerAsset"));
-	UI()->DoLabel(&Label, aTempBuf, 14.0f, TEXTALIGN_LEFT);
-
-	MainView.HSplitTop(50.0f, &Label, &MainView);
-	Label.VSplitLeft(250.0f, &Label, &LabelMid);
-	const CAnimState *pIdleState = CAnimState::GetIdle();
-	vec2 OffsetToMid;
-	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
-	vec2 TeeRenderPos(Label.x + 20.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
-	int Emote = m_Dummy ? g_Config.m_ClDummyDefaultEyes : g_Config.m_ClPlayerDefaultEyes;
-	RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, Emote, vec2(1, 0), TeeRenderPos);
-
-	char aName[64];
-	char aClan[64];
-	str_format(aName, sizeof(aName), ("%s"), m_Dummy ? g_Config.m_ClDummyName : g_Config.m_PlayerName);
-	str_format(aClan, sizeof(aClan), ("%s"), m_Dummy ? g_Config.m_ClDummyClan : g_Config.m_PlayerClan);
-
-	CUIRect FlagRect;
-	Label.VSplitLeft(90.0, &FlagRect, &Label);
-	Label.HMargin(-5.0f, &Label);
-	Label.HSplitTop(25.0f, &Section, &Label);
-
-	str_format(aTempBuf, sizeof(aTempBuf), ("Name: %s"), aName);
-	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-	Label.HSplitTop(20.0f, &Section, &Label);
-	str_format(aTempBuf, sizeof(aTempBuf), ("Clan: %s"), aClan);
-	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-	Label.HSplitTop(20.0f, &Section, &Label);
-	str_format(aTempBuf, sizeof(aTempBuf), ("Skin: %s"), pSkinName);
-	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-	FlagRect.VSplitRight(50, 0, &FlagRect);
-	FlagRect.HSplitBottom(25, 0, &FlagRect);
-	FlagRect.y -= 10.0f;
-	ColorRGBA Color(1.0f, 1.0f, 1.0f, 1.0f);
-	m_pClient->m_CountryFlags.Render(m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
-
-	bool doSkin = g_Config.m_ClApplyProfileSkin;
-	bool doColors = g_Config.m_ClApplyProfileColors;
-	bool doEmote = g_Config.m_ClApplyProfileEmote;
-	bool doName = g_Config.m_ClApplyProfileName;
-	bool doClan = g_Config.m_ClApplyProfileClan;
-	bool doFlag = g_Config.m_ClApplyProfileFlag;
-
-	//======AFTER LOAD======
-	if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
-	{
-		CProfile LoadProfile = GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile];
-		MainView.HSplitTop(20.0f, 0, &MainView);
-		MainView.HSplitTop(10.0f, &Label, &MainView);
-		str_format(aTempBuf, sizeof(aTempBuf), "%s:", ("After Load"));
-		UI()->DoLabel(&Label, aTempBuf, 14.0f, TEXTALIGN_LEFT);
-
-		MainView.HSplitTop(50.0f, &Label, &MainView);
-		Label.VSplitLeft(250.0f, &Label, 0);
-
-		if(doSkin && strlen(LoadProfile.SkinName) != 0)
-		{
-			const CSkin *pLoadSkin = m_pClient->m_Skins.Find(LoadProfile.SkinName);
-			OwnSkinInfo.m_OriginalRenderSkin = pLoadSkin->m_OriginalSkin;
-			OwnSkinInfo.m_ColorableRenderSkin = pLoadSkin->m_ColorableSkin;
-			OwnSkinInfo.m_SkinMetrics = pLoadSkin->m_Metrics;
-		}
-		if(*pUseCustomColor && doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
-		{
-			OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(LoadProfile.BodyColor).UnclampLighting());
-			OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(LoadProfile.FeetColor).UnclampLighting());
-		}
-
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
-		TeeRenderPos = vec2(Label.x + 20.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
-		int LoadEmote = Emote;
-		if(doEmote && LoadProfile.Emote != -1)
-			LoadEmote = LoadProfile.Emote;
-		RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, LoadEmote, vec2(1, 0), TeeRenderPos);
-
-		if(doName && strlen(LoadProfile.Name) != 0)
-			str_format(aName, sizeof(aName), ("%s"), LoadProfile.Name);
-		if(doClan && strlen(LoadProfile.Clan) != 0)
-			str_format(aClan, sizeof(aClan), ("%s"), LoadProfile.Clan);
-
-		Label.VSplitLeft(90.0, &FlagRect, &Label);
-		Label.HMargin(-5.0f, &Label);
-		Label.HSplitTop(25.0f, &Section, &Label);
-
-		str_format(aTempBuf, sizeof(aTempBuf), ("Name: %s"), aName);
-		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-		Label.HSplitTop(20.0f, &Section, &Label);
-		str_format(aTempBuf, sizeof(aTempBuf), ("Clan: %s"), aClan);
-		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-		Label.HSplitTop(20.0f, &Section, &Label);
-		str_format(aTempBuf, sizeof(aTempBuf), ("Skin: %s"), (doSkin && strlen(LoadProfile.SkinName) != 0) ? LoadProfile.SkinName : pSkinName);
-		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
-
-		FlagRect.VSplitRight(50, 0, &FlagRect);
-		FlagRect.HSplitBottom(25, 0, &FlagRect);
-		FlagRect.y -= 10.0f;
-		int RenderFlag = m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry;
-		if(doFlag && LoadProfile.CountryFlag != -2)
-			RenderFlag = LoadProfile.CountryFlag;
-		m_pClient->m_CountryFlags.Render(RenderFlag, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
-
-		str_format(aName, sizeof(aName), ("%s"), m_Dummy ? g_Config.m_ClDummyName : g_Config.m_PlayerName);
-		str_format(aClan, sizeof(aClan), ("%s"), m_Dummy ? g_Config.m_ClDummyClan : g_Config.m_PlayerClan);
-	}
-	else
-	{
-		MainView.HSplitTop(80.0f, 0, &MainView);
-	}
-
-	//===BUTTONS AND CHECK BOX===
-	CUIRect DummyCheck, CustomCheck;
-	MainView.HSplitTop(30, &DummyCheck, 0);
-	DummyCheck.HSplitTop(13, 0, &DummyCheck);
-
-	DummyCheck.VSplitLeft(100, &DummyCheck, &CustomCheck);
-	CustomCheck.VSplitLeft(150, &CustomCheck, 0);
-
-	DoButton_CheckBoxAutoVMarginAndSet(&m_Dummy, Localize("Dummy"), (int *)&m_Dummy, &DummyCheck, LineMargin);
-
-	static int s_CustomColorID = 0;
-	CustomCheck.HSplitTop(LineMargin, &CustomCheck, 0);
-
-	if(DoButton_CheckBox(&s_CustomColorID, Localize("Custom colors"), *pUseCustomColor, &CustomCheck))
-	{
-		*pUseCustomColor = *pUseCustomColor ? 0 : 1;
-		SetNeedSendInfo();
-	}
-
-	LabelMid.VSplitLeft(20.0f, 0, &LabelMid);
-	LabelMid.VSplitLeft(160.0f, &LabelMid, &LabelRight);
-
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileSkin, ("Save/Load Skin"), &g_Config.m_ClApplyProfileSkin, &LabelMid, LineMargin);
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileColors, ("Save/Load Colors"), &g_Config.m_ClApplyProfileColors, &LabelMid, LineMargin);
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileEmote, ("Save/Load Emote"), &g_Config.m_ClApplyProfileEmote, &LabelMid, LineMargin);
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileName, ("Save/Load Name"), &g_Config.m_ClApplyProfileName, &LabelMid, LineMargin);
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileClan, ("Save/Load Clan"), &g_Config.m_ClApplyProfileClan, &LabelMid, LineMargin);
-	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileFlag, ("Save/Load Flag"), &g_Config.m_ClApplyProfileFlag, &LabelMid, LineMargin);
-
-	CUIRect Button;
-	LabelRight.VSplitLeft(150.0f, &LabelRight, 0);
-
-	LabelRight.HSplitTop(30.0f, &Button, &LabelRight);
-	static CButtonContainer s_LoadButton;
-
-	if(DoButton_Menu(&s_LoadButton, Localize("Load"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f))
-	{
-		if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
-		{
-			CProfile LoadProfile = GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile];
-			if(!m_Dummy)
-			{
-				if(doSkin && strlen(LoadProfile.SkinName) != 0)
-					str_copy(g_Config.m_ClPlayerSkin, LoadProfile.SkinName, sizeof(g_Config.m_ClPlayerSkin));
-				if(doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
-				{
-					g_Config.m_ClPlayerColorBody = LoadProfile.BodyColor;
-					g_Config.m_ClPlayerColorFeet = LoadProfile.FeetColor;
-				}
-				if(doEmote && LoadProfile.Emote != -1)
-					g_Config.m_ClPlayerDefaultEyes = LoadProfile.Emote;
-				if(doName && strlen(LoadProfile.Name) != 0)
-					str_copy(g_Config.m_PlayerName, LoadProfile.Name, sizeof(g_Config.m_PlayerName));
-				if(doClan && strlen(LoadProfile.Clan) != 0)
-					str_copy(g_Config.m_PlayerClan, LoadProfile.Clan, sizeof(g_Config.m_PlayerClan));
-				if(doFlag && LoadProfile.CountryFlag != -2)
-					g_Config.m_PlayerCountry = LoadProfile.CountryFlag;
-			}
-			else
-			{
-				if(doSkin && strlen(LoadProfile.SkinName) != 0)
-					str_copy(g_Config.m_ClDummySkin, LoadProfile.SkinName, sizeof(g_Config.m_ClDummySkin));
-				if(doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
-				{
-					g_Config.m_ClDummyColorBody = LoadProfile.BodyColor;
-					g_Config.m_ClDummyColorFeet = LoadProfile.FeetColor;
-				}
-				if(doEmote && LoadProfile.Emote != -1)
-					g_Config.m_ClDummyDefaultEyes = LoadProfile.Emote;
-				if(doName && strlen(LoadProfile.Name) != 0)
-					str_copy(g_Config.m_ClDummyName, LoadProfile.Name, sizeof(g_Config.m_ClDummyName));
-				if(doClan && strlen(LoadProfile.Clan) != 0)
-					str_copy(g_Config.m_ClDummyClan, LoadProfile.Clan, sizeof(g_Config.m_ClDummyClan));
-				if(doFlag && LoadProfile.CountryFlag != -2)
-					g_Config.m_ClDummyCountry = LoadProfile.CountryFlag;
-			}
-		}
-		SetNeedSendInfo();
-	}
-	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
-
-	LabelRight.HSplitTop(30.0f, &Button, &LabelRight);
-	static CButtonContainer s_SaveButton;
-	if(DoButton_Menu(&s_SaveButton, Localize("Save"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
-	{
-		GameClient()->m_SkinProfiles.AddProfile(
-			doColors ? *pColorBody : -1,
-			doColors ? *pColorFeet : -1,
-			doFlag ? CurrentFlag : -2,
-			doEmote ? Emote : -1,
-			doSkin ? pSkinName : "",
-			doName ? aName : "",
-			doClan ? aClan : "");
-		GameClient()->m_SkinProfiles.SaveProfiles();
-	}
-	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
-
-	static int s_AllowDelete;
-	DoButton_CheckBoxAutoVMarginAndSet(&s_AllowDelete, ("Enable Deleting"), &s_AllowDelete, &LabelRight, LineMargin);
-	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
-
-	if(s_AllowDelete)
-	{
-		LabelRight.HSplitTop(28.0f, &Button, &LabelRight);
-		static CButtonContainer s_DeleteButton;
-		if(DoButton_Menu(&s_DeleteButton, Localize("Delete"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
-		{
-			if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
-			{
-				GameClient()->m_SkinProfiles.m_Profiles.erase(GameClient()->m_SkinProfiles.m_Profiles.begin() + SelectedProfile);
-				GameClient()->m_SkinProfiles.SaveProfiles();
-			}
-		}
-		LabelRight.HSplitTop(5.0f, 0, &LabelRight);
-
-		LabelRight.HSplitTop(28.0f, &Button, &LabelRight);
-		static CButtonContainer s_OverrideButton;
-		if(DoButton_Menu(&s_OverrideButton, Localize("Override"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
-		{
-			if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
-			{
-				GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile] = CProfile(
-					doColors ? *pColorBody : -1,
-					doColors ? *pColorFeet : -1,
-					doFlag ? CurrentFlag : -2,
-					doEmote ? Emote : -1,
-					doSkin ? pSkinName : "",
-					doName ? aName : "",
-					doClan ? aClan : "");
-				GameClient()->m_SkinProfiles.SaveProfiles();
-			}
-		}
-	}
-
-	//---RENDER THE SELECTOR---
-	CUIRect SelectorRect;
-	MainView.HSplitTop(50, 0, &SelectorRect);
-	SelectorRect.HSplitBottom(15.0, &SelectorRect, 0);
-	std::vector<CProfile> *pProfileList = &GameClient()->m_SkinProfiles.m_Profiles;
-
-	static CListBox s_ListBox;
-	s_ListBox.DoStart(50.0f, pProfileList->size(), 4, 3, SelectedProfile, &SelectorRect, true);
-
-	static bool s_Indexs[1024];
-
-	for(size_t i = 0; i < pProfileList->size(); ++i)
-	{
-		CProfile CurrentProfile = GameClient()->m_SkinProfiles.m_Profiles[i];
-
-		char RenderSkin[24];
-		if(strlen(CurrentProfile.SkinName) == 0)
-			str_copy(RenderSkin, pSkinName, sizeof(RenderSkin));
-		else
-			str_copy(RenderSkin, CurrentProfile.SkinName, sizeof(RenderSkin));
-
-		const CSkin *pSkinToBeDraw = m_pClient->m_Skins.Find(RenderSkin);
-
-		CListboxItem Item = s_ListBox.DoNextItem(&s_Indexs[i], SelectedProfile >= 0 && (size_t)SelectedProfile == i);
-
-		if(!Item.m_Visible)
-			continue;
-
-		if(Item.m_Visible)
-		{
-			CTeeRenderInfo Info;
-			Info.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.BodyColor).UnclampLighting());
-			Info.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.FeetColor).UnclampLighting());
-			Info.m_CustomColoredSkin = 1;
-			Info.m_OriginalRenderSkin = pSkinToBeDraw->m_OriginalSkin;
-			Info.m_ColorableRenderSkin = pSkinToBeDraw->m_ColorableSkin;
-			Info.m_SkinMetrics = pSkinToBeDraw->m_Metrics;
-			Info.m_Size = 50.0f;
-			if(CurrentProfile.BodyColor == -1 && CurrentProfile.FeetColor == -1)
-			{
-				Info.m_CustomColoredSkin = m_Dummy ? g_Config.m_ClDummyUseCustomColor : g_Config.m_ClPlayerUseCustomColor;
-				Info.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
-				Info.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
-			}
-
-			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Info, OffsetToMid);
-
-			int RenderEmote = CurrentProfile.Emote == -1 ? Emote : CurrentProfile.Emote;
-			TeeRenderPos = vec2(Item.m_Rect.x + 30, Item.m_Rect.y + Item.m_Rect.h / 2 + OffsetToMid.y);
-
-			Item.m_Rect.VSplitLeft(60.0f, 0, &Item.m_Rect);
-			CUIRect PlayerRect, ClanRect, FeetColorSquare, BodyColorSquare;
-
-			Item.m_Rect.VSplitLeft(60.0f, 0, &BodyColorSquare); //Delete this maybe
-
-			Item.m_Rect.VSplitRight(60.0, &BodyColorSquare, &FlagRect);
-			BodyColorSquare.x -= 11.0;
-			BodyColorSquare.VSplitLeft(10, &BodyColorSquare, 0);
-			BodyColorSquare.HSplitMid(&BodyColorSquare, &FeetColorSquare);
-			BodyColorSquare.HSplitMid(0, &BodyColorSquare);
-			FeetColorSquare.HSplitMid(&FeetColorSquare, 0);
-			FlagRect.HSplitBottom(10.0, &FlagRect, 0);
-			FlagRect.HSplitTop(10.0, 0, &FlagRect);
-
-			Item.m_Rect.HSplitMid(&PlayerRect, &ClanRect);
-
-			SLabelProperties Props;
-			Props.m_MaxWidth = Item.m_Rect.w;
-			if(CurrentProfile.CountryFlag != -2)
-				m_pClient->m_CountryFlags.Render(CurrentProfile.CountryFlag, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
-
-			if(CurrentProfile.BodyColor != -1 && CurrentProfile.FeetColor != -1)
-			{
-				ColorRGBA BodyColor = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.BodyColor).UnclampLighting());
-				ColorRGBA FeetColor = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.FeetColor).UnclampLighting());
-
-				Graphics()->TextureClear();
-				Graphics()->QuadsBegin();
-				Graphics()->SetColor(BodyColor.r, BodyColor.g, BodyColor.b, 1.0f);
-				IGraphics::CQuadItem Quads[2];
-				Quads[0] = IGraphics::CQuadItem(BodyColorSquare.x, BodyColorSquare.y, BodyColorSquare.w, BodyColorSquare.h);
-				Graphics()->QuadsDrawTL(&Quads[0], 1);
-				Graphics()->SetColor(FeetColor.r, FeetColor.g, FeetColor.b, 1.0f);
-				Quads[1] = IGraphics::CQuadItem(FeetColorSquare.x, FeetColorSquare.y, FeetColorSquare.w, FeetColorSquare.h);
-				Graphics()->QuadsDrawTL(&Quads[1], 1);
-				Graphics()->QuadsEnd();
-			}
-			RenderTools()->RenderTee(pIdleState, &Info, RenderEmote, vec2(1.0f, 0.0f), TeeRenderPos);
-
-			if(strlen(CurrentProfile.Name) == 0 && strlen(CurrentProfile.Clan) == 0)
-			{
-				PlayerRect = Item.m_Rect;
-				UI()->DoLabel(&PlayerRect, CurrentProfile.SkinName, 12.0f, TEXTALIGN_LEFT, Props);
-			}
-			else
-			{
-				UI()->DoLabel(&PlayerRect, CurrentProfile.Name, 12.0f, TEXTALIGN_LEFT, Props);
-				Item.m_Rect.HSplitTop(20.0f, 0, &Item.m_Rect);
-				Props.m_MaxWidth = Item.m_Rect.w;
-				UI()->DoLabel(&ClanRect, CurrentProfile.Clan, 12.0f, TEXTALIGN_LEFT, Props);
-			}
-		}
-	}
-
-	const int NewSelected = s_ListBox.DoEnd();
-	if(SelectedProfile != NewSelected)
-	{
-		SelectedProfile = NewSelected;
-	}
-	static CButtonContainer s_ProfilesFile;
-	CUIRect FileButton;
-	MainView.HSplitBottom(25.0, 0, &FileButton);
-	FileButton.y += 15.0;
-	FileButton.VSplitLeft(130.0, &FileButton, 0);
-	if(DoButton_Menu(&s_ProfilesFile, Localize("Profiles file"), 0, &FileButton))
-	{
-		Storage()->GetCompletePath(IStorage::TYPE_SAVE, PROFILES_FILE, aTempBuf, sizeof(aTempBuf));
-		if(!open_file(aTempBuf))
-		{
-			dbg_msg("menus", "couldn't open file");
-		}
-	}
-}
 void CMenus::RenderSettingsDDNet(CUIRect MainView)
 {
 	CUIRect Button, Left, Right, LeftLeft, Label;
@@ -4042,9 +2984,9 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	CUIRect Demo;
 	MainView.HSplitTop(110.0f, &Demo, &MainView);
 	Demo.HSplitTop(30.0f, &Label, &Demo);
-	UI()->DoLabel(&Label, Localize("Demo"), 20.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Demo"), 20.0f, TEXTALIGN_ML);
 	Label.VSplitMid(nullptr, &Label, 20.0f);
-	UI()->DoLabel(&Label, Localize("Ghost"), 20.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Ghost"), 20.0f, TEXTALIGN_ML);
 
 	Demo.HSplitTop(5.0f, nullptr, &Demo);
 	Demo.VSplitMid(&Left, &Right, 20.0f);
@@ -4059,21 +3001,12 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	if(DoButton_CheckBox(&g_Config.m_ClReplays, Localize("Enable replays"), g_Config.m_ClReplays, &Button))
 	{
 		g_Config.m_ClReplays ^= 1;
-		if(!g_Config.m_ClReplays)
-		{
-			// stop recording and remove the tmp demo file
-			Client()->DemoRecorder_Stop(RECORDER_REPLAYS, true);
-		}
-		else
-		{
-			// start recording
-			Client()->DemoRecorder_HandleAutoStart();
-		}
+		Client()->DemoRecorder_UpdateReplayRecorder();
 	}
 
 	Left.HSplitTop(20.0f, &Button, &Left);
 	if(g_Config.m_ClReplays)
-		UI()->DoScrollbarOption(&g_Config.m_ClReplayLength, &g_Config.m_ClReplayLength, &Button, Localize("Default length"), 10, 600, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+		Ui()->DoScrollbarOption(&g_Config.m_ClReplayLength, &g_Config.m_ClReplayLength, &Button, Localize("Default length"), 10, 600, &CUi::ms_LinearScrollbarScale, CUi::SCROLLBAR_OPTION_NOCLAMPVALUE);
 
 	Right.HSplitTop(20.0f, &Button, &Right);
 	if(DoButton_CheckBox(&g_Config.m_ClRaceGhost, Localize("Enable ghost"), g_Config.m_ClRaceGhost, &Button))
@@ -4090,7 +3023,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 		{
 			g_Config.m_ClRaceShowGhost ^= 1;
 		}
-		UI()->DoScrollbarOption(&g_Config.m_ClRaceGhostAlpha, &g_Config.m_ClRaceGhostAlpha, &Button, Localize("Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+		Ui()->DoScrollbarOption(&g_Config.m_ClRaceGhostAlpha, &g_Config.m_ClRaceGhostAlpha, &Button, Localize("Opacity"), 0, 100, &CUi::ms_LinearScrollbarScale, 0u, "%");
 
 		Right.HSplitTop(20.0f, &Button, &Right);
 		if(DoButton_CheckBox(&g_Config.m_ClRaceSaveGhost, Localize("Save ghost"), g_Config.m_ClRaceSaveGhost, &Button))
@@ -4112,12 +3045,12 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	CUIRect Gameplay;
 	MainView.HSplitTop(150.0f, &Gameplay, &MainView);
 	Gameplay.HSplitTop(30.0f, &Label, &Gameplay);
-	UI()->DoLabel(&Label, Localize("Gameplay"), 20.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Gameplay"), 20.0f, TEXTALIGN_ML);
 	Gameplay.HSplitTop(5.0f, nullptr, &Gameplay);
 	Gameplay.VSplitMid(&Left, &Right, 20.0f);
 
 	Left.HSplitTop(20.0f, &Button, &Left);
-	UI()->DoScrollbarOption(&g_Config.m_ClOverlayEntities, &g_Config.m_ClOverlayEntities, &Button, Localize("Overlay entities"), 0, 100);
+	Ui()->DoScrollbarOption(&g_Config.m_ClOverlayEntities, &g_Config.m_ClOverlayEntities, &Button, Localize("Overlay entities"), 0, 100);
 
 	Left.HSplitTop(20.0f, &Button, &Left);
 	Button.VSplitMid(&LeftLeft, &Button);
@@ -4127,10 +3060,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 
 	if(g_Config.m_ClTextEntities)
 	{
-		int PreviousSize = g_Config.m_ClTextEntitiesSize;
-		UI()->DoScrollbarOption(&g_Config.m_ClTextEntitiesSize, &g_Config.m_ClTextEntitiesSize, &Button, Localize("Size"), 0, 100);
-
-		if(PreviousSize != g_Config.m_ClTextEntitiesSize)
+		if(Ui()->DoScrollbarOption(&g_Config.m_ClTextEntitiesSize, &g_Config.m_ClTextEntitiesSize, &Button, Localize("Size"), 0, 100))
 			m_pClient->m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
 	}
 
@@ -4140,13 +3070,13 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	if(DoButton_CheckBox(&g_Config.m_ClShowOthers, Localize("Show others"), g_Config.m_ClShowOthers == SHOW_OTHERS_ON, &LeftLeft))
 		g_Config.m_ClShowOthers = g_Config.m_ClShowOthers != SHOW_OTHERS_ON ? SHOW_OTHERS_ON : SHOW_OTHERS_OFF;
 
-	UI()->DoScrollbarOption(&g_Config.m_ClShowOthersAlpha, &g_Config.m_ClShowOthersAlpha, &Button, Localize("Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+	Ui()->DoScrollbarOption(&g_Config.m_ClShowOthersAlpha, &g_Config.m_ClShowOthersAlpha, &Button, Localize("Opacity"), 0, 100, &CUi::ms_LinearScrollbarScale, 0u, "%");
 
 	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClShowOthersAlpha, &Button, Localize("Adjust the opacity of entities belonging to other teams, such as tees and nameplates"));
 
 	Left.HSplitTop(20.0f, &Button, &Left);
-	static int s_ShowOwnTeamID = 0;
-	if(DoButton_CheckBox(&s_ShowOwnTeamID, Localize("Show others (own team only)"), g_Config.m_ClShowOthers == SHOW_OTHERS_ONLY_TEAM, &Button))
+	static int s_ShowOwnTeamId = 0;
+	if(DoButton_CheckBox(&s_ShowOwnTeamId, Localize("Show others (own team only)"), g_Config.m_ClShowOthers == SHOW_OTHERS_ONLY_TEAM, &Button))
 	{
 		g_Config.m_ClShowOthers = g_Config.m_ClShowOthers != SHOW_OTHERS_ONLY_TEAM ? SHOW_OTHERS_ONLY_TEAM : SHOW_OTHERS_OFF;
 	}
@@ -4159,9 +3089,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClShowQuads, &Button, Localize("Quads are used for background decoration"));
 
 	Right.HSplitTop(20.0f, &Button, &Right);
-	int PreviousZoom = g_Config.m_ClDefaultZoom;
-	UI()->DoScrollbarOption(&g_Config.m_ClDefaultZoom, &g_Config.m_ClDefaultZoom, &Button, Localize("Default zoom"), 0, 20);
-	if(PreviousZoom != g_Config.m_ClDefaultZoom)
+	if(Ui()->DoScrollbarOption(&g_Config.m_ClDefaultZoom, &g_Config.m_ClDefaultZoom, &Button, Localize("Default zoom"), 0, 20))
 		m_pClient->m_Camera.SetZoom(std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10), g_Config.m_ClSmoothZoomTime);
 
 	Right.HSplitTop(20.0f, &Button, &Right);
@@ -4198,39 +3126,50 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	// background
 	Background.HSplitTop(30.0f, &Label, &Background);
 	Background.HSplitTop(5.0f, nullptr, &Background);
-	UI()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML);
 
 	ColorRGBA GreyDefault(0.5f, 0.5f, 0.5f, 1);
 
-	static CButtonContainer s_ResetID1;
-	DoLine_ColorPicker(&s_ResetID1, 25.0f, 13.0f, 5.0f, &Background, Localize("Regular background color"), &g_Config.m_ClBackgroundColor, GreyDefault, false);
+	static CButtonContainer s_ResetId1;
+	DoLine_ColorPicker(&s_ResetId1, 25.0f, 13.0f, 5.0f, &Background, Localize("Regular background color"), &g_Config.m_ClBackgroundColor, GreyDefault, false);
 
-	static CButtonContainer s_ResetID2;
-	DoLine_ColorPicker(&s_ResetID2, 25.0f, 13.0f, 5.0f, &Background, Localize("Entities background color"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false);
+	static CButtonContainer s_ResetId2;
+	DoLine_ColorPicker(&s_ResetId2, 25.0f, 13.0f, 5.0f, &Background, Localize("Entities background color"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false);
 
-	CUIRect EditBox;
+	CUIRect EditBox, ReloadButton;
 	Background.HSplitTop(20.0f, &Label, &Background);
 	Background.HSplitTop(2.0f, nullptr, &Background);
 	Label.VSplitLeft(100.0f, &Label, &EditBox);
-	EditBox.VSplitRight(100.0f, &EditBox, &Button);
+	EditBox.VSplitRight(60.0f, &EditBox, &Button);
+	Button.VSplitMid(&ReloadButton, &Button, 5.0f);
 	EditBox.VSplitRight(5.0f, &EditBox, nullptr);
 
-	UI()->DoLabel(&Label, Localize("Map"), 14.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Map"), 14.0f, TEXTALIGN_ML);
 
 	static CLineInput s_BackgroundEntitiesInput(g_Config.m_ClBackgroundEntities, sizeof(g_Config.m_ClBackgroundEntities));
-	UI()->DoEditBox(&s_BackgroundEntitiesInput, &EditBox, 14.0f);
+	Ui()->DoEditBox(&s_BackgroundEntitiesInput, &EditBox, 14.0f);
+
+	static CButtonContainer s_BackgroundEntitiesMapPicker, s_BackgroundEntitiesReload;
 
-	static CButtonContainer s_BackgroundEntitiesReloadButton;
-	if(DoButton_Menu(&s_BackgroundEntitiesReloadButton, Localize("Reload"), 0, &Button))
+	if(DoButton_FontIcon(&s_BackgroundEntitiesReload, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton))
 	{
-		if(str_comp(g_Config.m_ClBackgroundEntities, m_pClient->m_Background.MapName()) != 0)
-			m_pClient->m_Background.LoadBackground();
+		m_pClient->m_Background.LoadBackground();
+	}
+
+	if(DoButton_FontIcon(&s_BackgroundEntitiesMapPicker, FONT_ICON_FOLDER, 0, &Button))
+	{
+		static SPopupMenuId s_PopupMapPickerId;
+		static CPopupMapPickerContext s_PopupMapPickerContext;
+		s_PopupMapPickerContext.m_pMenus = this;
+
+		s_PopupMapPickerContext.MapListPopulate();
+		Ui()->DoPopupMenu(&s_PopupMapPickerId, Ui()->MouseX(), Ui()->MouseY(), 300.0f, 250.0f, &s_PopupMapPickerContext, PopupMapPicker);
 	}
 
 	Background.HSplitTop(20.0f, &Button, &Background);
 	const bool UseCurrentMap = str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0;
-	static int s_UseCurrentMapID = 0;
-	if(DoButton_CheckBox(&s_UseCurrentMapID, Localize("Use current map as background"), UseCurrentMap, &Button))
+	static int s_UseCurrentMapId = 0;
+	if(DoButton_CheckBox(&s_UseCurrentMapId, Localize("Use current map as background"), UseCurrentMap, &Button))
 	{
 		if(UseCurrentMap)
 			g_Config.m_ClBackgroundEntities[0] = '\0';
@@ -4247,7 +3186,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	Miscellaneous.HSplitTop(30.0f, &Label, &Miscellaneous);
 	Miscellaneous.HSplitTop(5.0f, nullptr, &Miscellaneous);
 
-	UI()->DoLabel(&Label, Localize("Miscellaneous"), 20.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Miscellaneous"), 20.0f, TEXTALIGN_ML);
 
 	static CButtonContainer s_ButtonTimeout;
 	Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
@@ -4259,11 +3198,11 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 	Miscellaneous.HSplitTop(5.0f, nullptr, &Miscellaneous);
 	Miscellaneous.HSplitTop(20.0f, &Label, &Miscellaneous);
 	Miscellaneous.HSplitTop(2.0f, nullptr, &Miscellaneous);
-	UI()->DoLabel(&Label, Localize("Run on join"), 14.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Label, Localize("Run on join"), 14.0f, TEXTALIGN_ML);
 	Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
 	static CLineInput s_RunOnJoinInput(g_Config.m_ClRunOnJoin, sizeof(g_Config.m_ClRunOnJoin));
 	s_RunOnJoinInput.SetEmptyText(Localize("Chat command (e.g. showall 1)"));
-	UI()->DoEditBox(&s_RunOnJoinInput, &Button, 14.0f);
+	Ui()->DoEditBox(&s_RunOnJoinInput, &Button, 14.0f);
 
 #if defined(CONF_FAMILY_WINDOWS)
 	static CButtonContainer s_ButtonUnregisterShell;
@@ -4279,7 +3218,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 #if defined(CONF_AUTOUPDATE)
 	{
 		bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
-		int State = Updater()->GetCurrentState();
+		IUpdater::EUpdaterState State = Updater()->GetCurrentState();
 
 		// Update Button
 		char aBuf[256];
@@ -4295,15 +3234,15 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 			}
 		}
 		else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
-			str_format(aBuf, sizeof(aBuf), Localize("Updating..."));
+			str_copy(aBuf, Localize("Updating…"));
 		else if(State == IUpdater::NEED_RESTART)
 		{
-			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
+			str_copy(aBuf, Localize("DDNet Client updated!"));
 			m_NeedRestartUpdate = true;
 		}
 		else
 		{
-			str_format(aBuf, sizeof(aBuf), Localize("No updates available"));
+			str_copy(aBuf, Localize("No updates available"));
 			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
 			Button.VSplitLeft(100.0f, &Button, nullptr);
 			static CButtonContainer s_ButtonUpdate;
@@ -4312,8 +3251,109 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
 				Client()->RequestDDNetInfo();
 			}
 		}
-		UI()->DoLabel(&UpdaterRect, aBuf, 14.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&UpdaterRect, aBuf, 14.0f, TEXTALIGN_ML);
 		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
 	}
 #endif
 }
+
+CUi::EPopupMenuFunctionResult CMenus::PopupMapPicker(void *pContext, CUIRect View, bool Active)
+{
+	CPopupMapPickerContext *pPopupContext = static_cast<CPopupMapPickerContext *>(pContext);
+	CMenus *pMenus = pPopupContext->m_pMenus;
+
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(Active);
+	s_ListBox.DoStart(20.0f, pPopupContext->m_vMaps.size(), 1, 1, -1, &View, false);
+
+	int MapIndex = 0;
+	for(auto &Map : pPopupContext->m_vMaps)
+	{
+		MapIndex++;
+		const CListboxItem Item = s_ListBox.DoNextItem(&Map, MapIndex == pPopupContext->m_Selection);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Label, Icon;
+		Item.m_Rect.VSplitLeft(20.0f, &Icon, &Label);
+
+		char aLabelText[IO_MAX_PATH_LENGTH];
+		str_copy(aLabelText, Map.m_aFilename);
+		if(Map.m_IsDirectory)
+			str_append(aLabelText, "/", sizeof(aLabelText));
+
+		const char *pIconType;
+		if(!Map.m_IsDirectory)
+		{
+			pIconType = FONT_ICON_MAP;
+		}
+		else
+		{
+			if(!str_comp(Map.m_aFilename, ".."))
+				pIconType = FONT_ICON_FOLDER_TREE;
+			else
+				pIconType = FONT_ICON_FOLDER;
+		}
+
+		pMenus->TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		pMenus->TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+		pMenus->Ui()->DoLabel(&Icon, pIconType, 12.0f, TEXTALIGN_ML);
+		pMenus->TextRender()->SetRenderFlags(0);
+		pMenus->TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+		pMenus->Ui()->DoLabel(&Label, aLabelText, 10.0f, TEXTALIGN_ML);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	pPopupContext->m_Selection = NewSelected >= 0 ? NewSelected : -1;
+	if(s_ListBox.WasItemSelected() || s_ListBox.WasItemActivated())
+	{
+		const CMapListItem SelectedItem = pPopupContext->m_vMaps[pPopupContext->m_Selection];
+
+		if(SelectedItem.m_IsDirectory)
+		{
+			if(!str_comp(SelectedItem.m_aFilename, ".."))
+			{
+				fs_parent_dir(pPopupContext->m_aCurrentMapFolder);
+			}
+			else
+			{
+				str_append(pPopupContext->m_aCurrentMapFolder, "/", sizeof(pPopupContext->m_aCurrentMapFolder));
+				str_append(pPopupContext->m_aCurrentMapFolder, SelectedItem.m_aFilename, sizeof(pPopupContext->m_aCurrentMapFolder));
+			}
+			pPopupContext->MapListPopulate();
+		}
+		else
+		{
+			str_format(g_Config.m_ClBackgroundEntities, sizeof(g_Config.m_ClBackgroundEntities), "%s/%s", pPopupContext->m_aCurrentMapFolder, SelectedItem.m_aFilename);
+			pMenus->m_pClient->m_Background.LoadBackground();
+			return CUi::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	return CUi::POPUP_KEEP_OPEN;
+}
+
+void CMenus::CPopupMapPickerContext::MapListPopulate()
+{
+	m_vMaps.clear();
+	char aTemp[IO_MAX_PATH_LENGTH];
+	str_format(aTemp, sizeof(aTemp), "maps/%s", m_aCurrentMapFolder);
+	m_pMenus->Storage()->ListDirectoryInfo(IStorage::TYPE_ALL, aTemp, MapListFetchCallback, this);
+	std::stable_sort(m_vMaps.begin(), m_vMaps.end(), CompareFilenameAscending);
+}
+
+int CMenus::CPopupMapPickerContext::MapListFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser)
+{
+	CPopupMapPickerContext *pRealUser = (CPopupMapPickerContext *)pUser;
+	if((!IsDir && !str_endswith(pInfo->m_pName, ".map")) || !str_comp(pInfo->m_pName, ".") || (!str_comp(pInfo->m_pName, "..") && (!str_comp(pRealUser->m_aCurrentMapFolder, ""))))
+		return 0;
+
+	CMapListItem Item;
+	str_copy(Item.m_aFilename, pInfo->m_pName);
+	Item.m_IsDirectory = IsDir;
+
+	pRealUser->m_vMaps.emplace_back(Item);
+
+	return 0;
+}
diff --git a/src/game/client/components/menus_settings7.cpp b/src/game/client/components/menus_settings7.cpp
new file mode 100644
index 0000000000..cfde9d1875
--- /dev/null
+++ b/src/game/client/components/menus_settings7.cpp
@@ -0,0 +1,503 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/linereader.h>
+#include <engine/shared/localization.h>
+#include <engine/shared/protocol7.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+#include <engine/updater.h>
+
+#include <game/generated/protocol.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/chat.h>
+#include <game/client/components/menu_background.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/skin.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/client/ui_scrollregion.h>
+#include <game/localization.h>
+
+#include "menus.h"
+#include "skins7.h"
+
+#include <vector>
+
+using namespace FontIcons;
+
+void CMenus::RenderSettingsTee7(CUIRect MainView)
+{
+	CUIRect SkinPreview, NormalSkinPreview, RedTeamSkinPreview, BlueTeamSkinPreview, Buttons, QuickSearch, DirectoryButton, RefreshButton, SaveDeleteButton, TabBars, TabBar, LeftTab, RightTab;
+	MainView.HSplitBottom(20.0f, &MainView, &Buttons);
+	MainView.HSplitBottom(5.0f, &MainView, nullptr);
+	Buttons.VSplitRight(25.0f, &Buttons, &RefreshButton);
+	Buttons.VSplitRight(10.0f, &Buttons, nullptr);
+	Buttons.VSplitRight(140.0f, &Buttons, &DirectoryButton);
+	Buttons.VSplitLeft(220.0f, &QuickSearch, &Buttons);
+	Buttons.VSplitLeft(10.0f, nullptr, &Buttons);
+	Buttons.VSplitLeft(120.0f, &SaveDeleteButton, &Buttons);
+	MainView.HSplitTop(50.0f, &TabBars, &MainView);
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+	TabBars.VSplitMid(&TabBars, &SkinPreview, 20.0f);
+
+	TabBars.HSplitTop(20.0f, &TabBar, &TabBars);
+	TabBar.VSplitMid(&LeftTab, &RightTab);
+	TabBars.HSplitTop(10.0f, nullptr, &TabBars);
+
+	SkinPreview.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
+	SkinPreview.VMargin(10.0f, &SkinPreview);
+	SkinPreview.VSplitRight(50.0f, &SkinPreview, &BlueTeamSkinPreview);
+	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
+	SkinPreview.VSplitRight(50.0f, &SkinPreview, &RedTeamSkinPreview);
+	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
+	SkinPreview.VSplitRight(50.0f, &SkinPreview, &NormalSkinPreview);
+	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
+
+	static CButtonContainer s_PlayerTabButton;
+	if(DoButton_MenuTab(&s_PlayerTabButton, Localize("Player"), !m_Dummy, &LeftTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_Dummy = false;
+	}
+
+	static CButtonContainer s_DummyTabButton;
+	if(DoButton_MenuTab(&s_DummyTabButton, Localize("Dummy"), m_Dummy, &RightTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_Dummy = true;
+	}
+
+	TabBars.HSplitTop(20.0f, &TabBar, &TabBars);
+	TabBar.VSplitMid(&LeftTab, &RightTab);
+
+	static CButtonContainer s_BasicTabButton;
+	if(DoButton_MenuTab(&s_BasicTabButton, Localize("Basic"), !m_CustomSkinMenu, &LeftTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_CustomSkinMenu = false;
+	}
+
+	static CButtonContainer s_CustomTabButton;
+	if(DoButton_MenuTab(&s_CustomTabButton, Localize("Custom"), m_CustomSkinMenu, &RightTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	{
+		m_CustomSkinMenu = true;
+		if(m_CustomSkinMenu && m_pSelectedSkin)
+		{
+			if(m_pSelectedSkin->m_Flags & CSkins7::SKINFLAG_STANDARD)
+			{
+				m_SkinNameInput.Set("copy_");
+				m_SkinNameInput.Append(m_pSelectedSkin->m_aName);
+			}
+			else
+				m_SkinNameInput.Set(m_pSelectedSkin->m_aName);
+		}
+	}
+
+	// validate skin parts for solo mode
+	char aSkinParts[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_ARRAY_SIZE];
+	char *apSkinPartsPtr[protocol7::NUM_SKINPARTS];
+	int aUCCVars[protocol7::NUM_SKINPARTS];
+	int aColorVars[protocol7::NUM_SKINPARTS];
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
+		apSkinPartsPtr[Part] = aSkinParts[Part];
+		aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
+		aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
+	}
+	m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, 0);
+
+	CTeeRenderInfo OwnSkinInfo;
+	OwnSkinInfo.m_Size = 50.0f;
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
+		const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
+		if(aUCCVars[Part])
+		{
+			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
+			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
+		}
+		else
+		{
+			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
+			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+	}
+
+	char aBuf[128 + IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Your skin"));
+	Ui()->DoLabel(&SkinPreview, aBuf, 14.0f, TEXTALIGN_ML);
+
+	{
+		// interactive tee: tee looking towards cursor, and it is happy when you touch it
+		const vec2 TeePosition = NormalSkinPreview.Center() + vec2(0.0f, 6.0f);
+		const vec2 DeltaPosition = Ui()->MousePos() - TeePosition;
+		const float Distance = length(DeltaPosition);
+		const float InteractionDistance = 20.0f;
+		const vec2 TeeDirection = Distance < InteractionDistance ? normalize(vec2(DeltaPosition.x, maximum(DeltaPosition.y, 0.5f))) : normalize(DeltaPosition);
+		const int TeeEmote = Distance < InteractionDistance ? EMOTE_HAPPY : EMOTE_NORMAL;
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &OwnSkinInfo, TeeEmote, TeeDirection, TeePosition);
+		static char s_InteractiveTeeButtonId;
+		if(Distance < InteractionDistance && Ui()->DoButtonLogic(&s_InteractiveTeeButtonId, 0, &NormalSkinPreview))
+		{
+			m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_PLAYER_SPAWN, 1.0f);
+		}
+	}
+
+	// validate skin parts for team game mode
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
+		apSkinPartsPtr[Part] = aSkinParts[Part];
+		aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
+		aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
+	}
+	m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, GAMEFLAG_TEAMS);
+
+	CTeeRenderInfo TeamSkinInfo = OwnSkinInfo;
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
+		const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
+		if(aUCCVars[Part])
+		{
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
+		}
+		else
+		{
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+	}
+
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_RED, Part);
+	}
+	RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(1, 0), RedTeamSkinPreview.Center() + vec2(0.0f, 6.0f));
+
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_BLUE, Part);
+	}
+	RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(-1, 0), BlueTeamSkinPreview.Center() + vec2(0.0f, 6.0f));
+
+	if(m_CustomSkinMenu)
+		RenderSettingsTeeCustom7(MainView);
+	else
+		RenderSkinSelection7(MainView);
+
+	if(m_CustomSkinMenu)
+	{
+		static CButtonContainer s_CustomSkinSaveButton;
+		if(DoButton_Menu(&s_CustomSkinSaveButton, Localize("Save"), 0, &SaveDeleteButton))
+		{
+			m_Popup = POPUP_SAVE_SKIN;
+			m_SkinNameInput.SelectAll();
+			Ui()->SetActiveItem(&m_SkinNameInput);
+		}
+	}
+	else if(m_pSelectedSkin && (m_pSelectedSkin->m_Flags & CSkins7::SKINFLAG_STANDARD) == 0)
+	{
+		static CButtonContainer s_CustomSkinDeleteButton;
+		if(DoButton_Menu(&s_CustomSkinDeleteButton, Localize("Delete"), 0, &SaveDeleteButton) || Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE))
+		{
+			str_format(aBuf, sizeof(aBuf), Localize("Are you sure that you want to delete '%s'?"), m_pSelectedSkin->m_aName);
+			PopupConfirm(Localize("Delete skin"), aBuf, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDeleteSkin7);
+		}
+	}
+
+	static CLineInput s_SkinFilterInput(g_Config.m_ClSkinFilterString, sizeof(g_Config.m_ClSkinFilterString));
+	if(Ui()->DoEditBox_Search(&s_SkinFilterInput, &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed()))
+	{
+		m_SkinListNeedsUpdate = true;
+		m_SkinPartListNeedsUpdate = true;
+	}
+
+	static CButtonContainer s_DirectoryButton;
+	if(DoButton_Menu(&s_DirectoryButton, Localize("Skins directory"), 0, &DirectoryButton))
+	{
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "skins7", aBuf, sizeof(aBuf));
+		Storage()->CreateFolder("skins7", IStorage::TYPE_SAVE);
+		Client()->ViewFile(aBuf);
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_DirectoryButton, &DirectoryButton, Localize("Open the directory to add custom skins"));
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	static CButtonContainer s_SkinRefreshButton;
+	if(DoButton_Menu(&s_SkinRefreshButton, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) ||
+		(!Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed() && (Input()->KeyPress(KEY_F5) || (Input()->ModifierIsPressed() && Input()->KeyPress(KEY_R)))))
+	{
+		// reset render flags for possible loading screen
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		// TODO: m_pClient->RefreshSkins();
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+}
+
+void CMenus::PopupConfirmDeleteSkin7()
+{
+	dbg_assert(m_pSelectedSkin, "no skin selected for deletion");
+
+	if(!m_pClient->m_Skins7.RemoveSkin(m_pSelectedSkin))
+	{
+		PopupMessage(Localize("Error"), Localize("Unable to delete skin"), Localize("Ok"));
+		return;
+	}
+	m_pSelectedSkin = nullptr;
+}
+
+void CMenus::RenderSettingsTeeCustom7(CUIRect MainView)
+{
+	CUIRect ButtonBar, SkinPartSelection, CustomColors;
+
+	MainView.HSplitTop(20.0f, &ButtonBar, &MainView);
+	MainView.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f), IGraphics::CORNER_B, 5.0f);
+	MainView.VSplitMid(&SkinPartSelection, &CustomColors, 10.0f);
+	CustomColors.Margin(5.0f, &CustomColors);
+	CUIRect CustomColorsButton, RandomSkinButton;
+	CustomColors.HSplitTop(20.0f, &CustomColorsButton, &CustomColors);
+	CustomColorsButton.VSplitRight(30.0f, &CustomColorsButton, &RandomSkinButton);
+	CustomColorsButton.VSplitRight(20.0f, &CustomColorsButton, nullptr);
+
+	const float ButtonWidth = ButtonBar.w / protocol7::NUM_SKINPARTS;
+
+	static CButtonContainer s_aSkinPartButtons[protocol7::NUM_SKINPARTS];
+	for(int i = 0; i < protocol7::NUM_SKINPARTS; i++)
+	{
+		CUIRect Button;
+		ButtonBar.VSplitLeft(ButtonWidth, &Button, &ButtonBar);
+		const int Corners = i == 0 ? IGraphics::CORNER_TL : (i == (protocol7::NUM_SKINPARTS - 1) ? IGraphics::CORNER_TR : IGraphics::CORNER_NONE);
+		if(DoButton_MenuTab(&s_aSkinPartButtons[i], Localize(CSkins7::ms_apSkinPartNamesLocalized[i], "skins"), m_TeePartSelected == i, &Button, Corners, nullptr, nullptr, nullptr, nullptr, 4.0f))
+		{
+			m_TeePartSelected = i;
+		}
+	}
+
+	RenderSkinPartSelection7(SkinPartSelection);
+
+	int *pUseCustomColor = CSkins7::ms_apUCCVariables[(int)m_Dummy][m_TeePartSelected];
+	if(DoButton_CheckBox(pUseCustomColor, Localize("Custom colors"), *pUseCustomColor, &CustomColorsButton))
+	{
+		*pUseCustomColor = !*pUseCustomColor;
+		SetNeedSendInfo();
+	}
+
+	if(*pUseCustomColor)
+	{
+		CUIRect CustomColorScrollbars;
+		CustomColors.HSplitTop(5.0f, nullptr, &CustomColors);
+		CustomColors.HSplitTop(95.0f, &CustomColorScrollbars, &CustomColors);
+
+		if(RenderHslaScrollbars(&CustomColorScrollbars, CSkins7::ms_apColorVariables[(int)m_Dummy][m_TeePartSelected], m_TeePartSelected == protocol7::SKINPART_MARKING, ColorHSLA::DARKEST_LGT7))
+		{
+			SetNeedSendInfo();
+		}
+	}
+
+	// Random skin button
+	static CButtonContainer s_RandomSkinButton;
+	static const char *s_apDice[] = {FONT_ICON_DICE_ONE, FONT_ICON_DICE_TWO, FONT_ICON_DICE_THREE, FONT_ICON_DICE_FOUR, FONT_ICON_DICE_FIVE, FONT_ICON_DICE_SIX};
+	static int s_CurrentDie = rand() % std::size(s_apDice);
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	if(DoButton_Menu(&s_RandomSkinButton, s_apDice[s_CurrentDie], 0, &RandomSkinButton, nullptr, IGraphics::CORNER_ALL, 5.0f, -0.2f))
+	{
+		m_pClient->m_Skins7.RandomizeSkin(m_Dummy);
+		SetNeedSendInfo();
+		s_CurrentDie = rand() % std::size(s_apDice);
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	GameClient()->m_Tooltips.DoToolTip(&s_RandomSkinButton, &RandomSkinButton, Localize("Create a random skin"));
+}
+
+void CMenus::RenderSkinSelection7(CUIRect MainView)
+{
+	static float s_LastSelectionTime = -10.0f;
+	static std::vector<const CSkins7::CSkin *> s_vpSkinList;
+	static CListBox s_ListBox;
+	static int s_SkinCount = 0;
+	if(m_SkinListNeedsUpdate || m_pClient->m_Skins7.Num() != s_SkinCount)
+	{
+		s_vpSkinList.clear();
+		s_SkinCount = m_pClient->m_Skins7.Num();
+		for(int i = 0; i < s_SkinCount; ++i)
+		{
+			const CSkins7::CSkin *pSkin = m_pClient->m_Skins7.Get(i);
+			if(g_Config.m_ClSkinFilterString[0] != '\0' && !str_utf8_find_nocase(pSkin->m_aName, g_Config.m_ClSkinFilterString))
+				continue;
+
+			// no special skins
+			if((pSkin->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
+			{
+				s_vpSkinList.emplace_back(pSkin);
+			}
+		}
+		m_SkinListNeedsUpdate = false;
+	}
+
+	m_pSelectedSkin = nullptr;
+	int s_OldSelected = -1;
+	s_ListBox.DoStart(50.0f, s_vpSkinList.size(), 4, 1, s_OldSelected, &MainView);
+
+	for(int i = 0; i < (int)s_vpSkinList.size(); ++i)
+	{
+		const CSkins7::CSkin *pSkin = s_vpSkinList[i];
+		if(pSkin == nullptr)
+			continue;
+		if(!str_comp(pSkin->m_aName, CSkins7::ms_apSkinNameVariables[m_Dummy]))
+		{
+			m_pSelectedSkin = pSkin;
+			s_OldSelected = i;
+		}
+
+		const CListboxItem Item = s_ListBox.DoNextItem(&s_vpSkinList[i], s_OldSelected == i);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect TeePreview, Label;
+		Item.m_Rect.VSplitLeft(60.0f, &TeePreview, &Label);
+
+		CTeeRenderInfo Info;
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			if(pSkin->m_aUseCustomColors[Part])
+			{
+				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkin->m_apParts[Part]->m_ColorTexture;
+				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(pSkin->m_aPartColors[Part], Part == protocol7::SKINPART_MARKING);
+			}
+			else
+			{
+				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkin->m_apParts[Part]->m_OrgTexture;
+				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+		Info.m_Size = 50.0f;
+
+		{
+			// interactive tee: tee is happy to be selected
+			int TeeEmote = (Item.m_Selected && s_LastSelectionTime + 0.75f > Client()->GlobalTime()) ? EMOTE_HAPPY : EMOTE_NORMAL;
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeeEmote, vec2(1.0f, 0.0f), TeePreview.Center() + vec2(0.0f, 6.0f));
+		}
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w - 5.0f;
+		Ui()->DoLabel(&Label, pSkin->m_aName, 12.0f, TEXTALIGN_ML, Props);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(NewSelected != -1 && NewSelected != s_OldSelected)
+	{
+		s_LastSelectionTime = Client()->GlobalTime();
+		m_pSelectedSkin = s_vpSkinList[NewSelected];
+		str_copy(CSkins7::ms_apSkinNameVariables[m_Dummy], m_pSelectedSkin->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			str_copy(CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], m_pSelectedSkin->m_apParts[Part]->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+			*CSkins7::ms_apUCCVariables[(int)m_Dummy][Part] = m_pSelectedSkin->m_aUseCustomColors[Part];
+			*CSkins7::ms_apColorVariables[(int)m_Dummy][Part] = m_pSelectedSkin->m_aPartColors[Part];
+		}
+		SetNeedSendInfo();
+	}
+}
+
+void CMenus::RenderSkinPartSelection7(CUIRect MainView)
+{
+	static std::vector<const CSkins7::CSkinPart *> s_paList[protocol7::NUM_SKINPARTS];
+	static CListBox s_ListBox;
+	static int s_aSkinPartCount[protocol7::NUM_SKINPARTS] = {0};
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		if(m_SkinPartListNeedsUpdate || m_pClient->m_Skins7.NumSkinPart(Part) != s_aSkinPartCount[Part])
+		{
+			s_paList[Part].clear();
+			s_aSkinPartCount[Part] = m_pClient->m_Skins7.NumSkinPart(Part);
+			for(int i = 0; i < s_aSkinPartCount[Part]; ++i)
+			{
+				const CSkins7::CSkinPart *pPart = m_pClient->m_Skins7.GetSkinPart(Part, i);
+				if(g_Config.m_ClSkinFilterString[0] != '\0' && !str_utf8_find_nocase(pPart->m_aName, g_Config.m_ClSkinFilterString))
+					continue;
+
+				// no special skins
+				if((pPart->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
+				{
+					s_paList[Part].emplace_back(pPart);
+				}
+			}
+		}
+	}
+	m_SkinPartListNeedsUpdate = false;
+
+	static int s_OldSelected = -1;
+	s_ListBox.DoBegin(&MainView);
+	s_ListBox.DoStart(72.0f, s_paList[m_TeePartSelected].size(), 4, 1, s_OldSelected, nullptr, false, IGraphics::CORNER_NONE, true);
+
+	for(int i = 0; i < (int)s_paList[m_TeePartSelected].size(); ++i)
+	{
+		const CSkins7::CSkinPart *pPart = s_paList[m_TeePartSelected][i];
+		if(pPart == nullptr)
+			continue;
+		if(!str_comp(pPart->m_aName, CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected]))
+			s_OldSelected = i;
+
+		CListboxItem Item = s_ListBox.DoNextItem(&s_paList[m_TeePartSelected][i], s_OldSelected == i);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Label;
+		Item.m_Rect.Margin(5.0f, &Item.m_Rect);
+		Item.m_Rect.HSplitBottom(12.0f, &Item.m_Rect, &Label);
+
+		CTeeRenderInfo Info;
+		for(int j = 0; j < protocol7::NUM_SKINPARTS; j++)
+		{
+			int SkinPart = m_pClient->m_Skins7.FindSkinPart(j, CSkins7::ms_apSkinVariables[(int)m_Dummy][j], false);
+			const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(j, SkinPart);
+			if(*CSkins7::ms_apUCCVariables[(int)m_Dummy][j])
+			{
+				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = m_TeePartSelected == j ? pPart->m_ColorTexture : pSkinPart->m_ColorTexture;
+				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[j] = m_pClient->m_Skins7.GetColor(*CSkins7::ms_apColorVariables[(int)m_Dummy][j], j == protocol7::SKINPART_MARKING);
+			}
+			else
+			{
+				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = m_TeePartSelected == j ? pPart->m_OrgTexture : pSkinPart->m_OrgTexture;
+				Info.m_aSixup[0].m_aColors[j] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+		Info.m_Size = 50.0f;
+
+		const vec2 TeePos = Item.m_Rect.Center() + vec2(0.0f, 6.0f);
+		if(m_TeePartSelected == protocol7::SKINPART_HANDS)
+		{
+			// RenderTools()->RenderTeeHand(&Info, TeePos, vec2(1.0f, 0.0f), -pi*0.5f, vec2(18, 0));
+		}
+		int TeePartEmote = EMOTE_NORMAL;
+		if(m_TeePartSelected == protocol7::SKINPART_EYES)
+		{
+			TeePartEmote = (int)(Client()->GlobalTime() * 0.5f) % NUM_EMOTES;
+		}
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeePartEmote, vec2(1.0f, 0.0f), TeePos);
+
+		Ui()->DoLabel(&Label, pPart->m_aName, 12.0f, TEXTALIGN_MC);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(NewSelected != -1 && NewSelected != s_OldSelected)
+	{
+		str_copy(CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected], s_paList[m_TeePartSelected][NewSelected]->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+		CSkins7::ms_apSkinNameVariables[m_Dummy][0] = '\0';
+		SetNeedSendInfo();
+	}
+	s_OldSelected = NewSelected;
+}
diff --git a/src/game/client/components/menus_settings_assets.cpp b/src/game/client/components/menus_settings_assets.cpp
index e0ff5a4081..9d022bb841 100644
--- a/src/game/client/components/menus_settings_assets.cpp
+++ b/src/game/client/components/menus_settings_assets.cpp
@@ -352,30 +352,29 @@ int InitSearchList(std::vector<const TName *> &vpSearchList, std::vector<TName>
 
 void CMenus::RenderSettingsCustom(CUIRect MainView)
 {
-	CUIRect TabBar, CustomList, QuickSearch, QuickSearchClearButton, DirectoryButton, Page1Tab, Page2Tab, Page3Tab, Page4Tab, Page5Tab, Page6Tab, ReloadButton;
-
-	MainView.HSplitTop(20, &TabBar, &MainView);
-	float TabsW = TabBar.w;
-	TabBar.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page1Tab, &Page2Tab);
-	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page2Tab, &Page3Tab);
-	Page3Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page3Tab, &Page4Tab);
-	Page4Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page4Tab, &Page5Tab);
-	Page5Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page5Tab, &Page6Tab);
+	CUIRect TabBar, CustomList, QuickSearch, DirectoryButton, ReloadButton;
 
+	MainView.HSplitTop(20.0f, &TabBar, &MainView);
+	const float TabWidth = TabBar.w / NUMBER_OF_ASSETS_TABS;
 	static CButtonContainer s_aPageTabs[NUMBER_OF_ASSETS_TABS] = {};
-
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_ENTITIES], Localize("Entities"), s_CurCustomTab == ASSETS_TAB_ENTITIES, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_ENTITIES;
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_GAME], Localize("Game"), s_CurCustomTab == ASSETS_TAB_GAME, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_GAME;
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EMOTICONS], Localize("Emoticons"), s_CurCustomTab == ASSETS_TAB_EMOTICONS, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_EMOTICONS;
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_PARTICLES], Localize("Particles"), s_CurCustomTab == ASSETS_TAB_PARTICLES, &Page4Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_PARTICLES;
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_HUD], Localize("HUD"), s_CurCustomTab == ASSETS_TAB_HUD, &Page5Tab, 0, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_HUD;
-	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EXTRAS], Localize("Extras"), s_CurCustomTab == ASSETS_TAB_EXTRAS, &Page6Tab, IGraphics::CORNER_R, NULL, NULL, NULL, NULL, 4))
-		s_CurCustomTab = ASSETS_TAB_EXTRAS;
+	const char *apTabNames[NUMBER_OF_ASSETS_TABS] = {
+		Localize("Entities"),
+		Localize("Game"),
+		Localize("Emoticons"),
+		Localize("Particles"),
+		Localize("HUD"),
+		Localize("Extras")};
+
+	for(int Tab = ASSETS_TAB_ENTITIES; Tab < NUMBER_OF_ASSETS_TABS; ++Tab)
+	{
+		CUIRect Button;
+		TabBar.VSplitLeft(TabWidth, &Button, &TabBar);
+		const int Corners = Tab == ASSETS_TAB_ENTITIES ? IGraphics::CORNER_L : Tab == NUMBER_OF_ASSETS_TABS - 1 ? IGraphics::CORNER_R : IGraphics::CORNER_NONE;
+		if(DoButton_MenuTab(&s_aPageTabs[Tab], apTabNames[Tab], s_CurCustomTab == Tab, &Button, Corners, nullptr, nullptr, nullptr, nullptr, 4.0f))
+		{
+			s_CurCustomTab = Tab;
+		}
+	}
 
 	auto LoadStartTime = time_get_nanoseconds();
 	SMenuAssetScanUser User;
@@ -548,7 +547,7 @@ void CMenus::RenderSettingsCustom(CUIRect MainView)
 		CUIRect TextureRect;
 		ItemRect.HSplitTop(15, &ItemRect, &TextureRect);
 		TextureRect.HSplitTop(10, NULL, &TextureRect);
-		UI()->DoLabel(&ItemRect, pItem->m_aName, ItemRect.h - 2, TEXTALIGN_MC);
+		Ui()->DoLabel(&ItemRect, pItem->m_aName, ItemRect.h - 2, TEXTALIGN_MC);
 		if(pItem->m_RenderTexture.IsValid())
 		{
 			Graphics()->WrapClamp();
@@ -600,37 +599,21 @@ void CMenus::RenderSettingsCustom(CUIRect MainView)
 		}
 	}
 
-	// render quick search
+	// Quick search
+	MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
+	QuickSearch.VSplitLeft(220.0f, &QuickSearch, &DirectoryButton);
+	QuickSearch.HSplitTop(5.0f, nullptr, &QuickSearch);
+	if(Ui()->DoEditBox_Search(&s_aFilterInputs[s_CurCustomTab], &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed()))
 	{
-		MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
-		QuickSearch.VSplitLeft(240.0f, &QuickSearch, &DirectoryButton);
-		QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
-		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-
-		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
-		float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
-		TextRender()->SetRenderFlags(0);
-		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-		QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
-		QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
-		QuickSearch.VSplitLeft(QuickSearch.w - 15.0f, &QuickSearch, &QuickSearchClearButton);
-		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
-		{
-			UI()->SetActiveItem(&s_aFilterInputs[s_CurCustomTab]);
-			s_aFilterInputs[s_CurCustomTab].SelectAll();
-		}
-		s_aFilterInputs[s_CurCustomTab].SetEmptyText(Localize("Search"));
-		if(UI()->DoClearableEditBox(&s_aFilterInputs[s_CurCustomTab], &QuickSearch, 14.0f))
-			gs_aInitCustomList[s_CurCustomTab] = true;
+		gs_aInitCustomList[s_CurCustomTab] = true;
 	}
 
 	DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
 	DirectoryButton.VSplitRight(175.0f, 0, &DirectoryButton);
 	DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &ReloadButton);
 	DirectoryButton.VSplitRight(10.0f, &DirectoryButton, 0);
-	static CButtonContainer s_AssetsDirID;
-	if(DoButton_Menu(&s_AssetsDirID, Localize("Assets directory"), 0, &DirectoryButton))
+	static CButtonContainer s_AssetsDirId;
+	if(DoButton_Menu(&s_AssetsDirId, Localize("Assets directory"), 0, &DirectoryButton))
 	{
 		char aBuf[IO_MAX_PATH_LENGTH];
 		char aBufFull[IO_MAX_PATH_LENGTH + 7];
@@ -649,17 +632,14 @@ void CMenus::RenderSettingsCustom(CUIRect MainView)
 		Storage()->GetCompletePath(IStorage::TYPE_SAVE, aBufFull, aBuf, sizeof(aBuf));
 		Storage()->CreateFolder("assets", IStorage::TYPE_SAVE);
 		Storage()->CreateFolder(aBufFull, IStorage::TYPE_SAVE);
-		if(!open_file(aBuf))
-		{
-			dbg_msg("menus", "couldn't open file '%s'", aBuf);
-		}
+		Client()->ViewFile(aBuf);
 	}
-	GameClient()->m_Tooltips.DoToolTip(&s_AssetsDirID, &DirectoryButton, Localize("Open the directory to add custom assets"));
+	GameClient()->m_Tooltips.DoToolTip(&s_AssetsDirId, &DirectoryButton, Localize("Open the directory to add custom assets"));
 
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	static CButtonContainer s_AssetsReloadBtnID;
-	if(DoButton_Menu(&s_AssetsReloadBtnID, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+	static CButtonContainer s_AssetsReloadBtnId;
+	if(DoButton_Menu(&s_AssetsReloadBtnId, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
 	{
 		ClearCustomItems(s_CurCustomTab);
 	}
diff --git a/src/game/client/components/menus_start.cpp b/src/game/client/components/menus_start.cpp
index c871c4229c..de7520404b 100644
--- a/src/game/client/components/menus_start.cpp
+++ b/src/game/client/components/menus_start.cpp
@@ -16,157 +16,21 @@
 #include <game/version.h>
 
 #include "menus.h"
-#include <vector>
-#include <string>
-#include <cstdlib> // For rand() and srand()
-#include <ctime>   // For time()
-
-std::vector<std::string> quotes = {
-	"Client was made by -StormAx",
-	"don't use S-Client lol xD",
-	"Aslo try S-Client",
-	"Cook some maps today >:D",
-	"Hi!",
-	"Bye;c",
-	"You go gaming?",
-	"-StormAxD",
-	"Inner peace clan on top, isn't it?",
-	"The cake is lie :c",
-	"AH GG!!!!",
-	"YEPYEPYEPYEPYEP",
-	"My discord is 'stormaxd' go on!",
-	"Cheeru?",
-	"Cheeru!",
-	"Cheeru!?",
-	"Cheeru?!",
-	"The gamer is here!:D",
-	"OwO",
-	"UWU",
-	"QWQ",
-	"!ban 0.0.0.0-255.255.255.255",
-	"Me gamer :0, Me go hook random tees",
-	"PDGADHHAHDHAHAHADADAAAHAHAHAHAH",
-	"What is your best Grandma time? mine is 2:21:43",
-	"Со мной воюет сатана!!!!!!!",
-	"Never gonna give you.... forget it",
-	"AWwwwwww, you so cutie >.<",
-	"WhAt ThE...?",
-	"Kurw........Amach",
-	"Suka blyad'",
-	"Paxtell...",
-	"Number one roblox player",
-	"AYAYAAAAAA, ayakaaaaa",
-	"liga a camera ae!",
-	"Я рот ебал ваших ДДнетов",
-	"Я щас на атомы разорвусь",
-	"caos e regresso",
-	"Do HH right broh!",
-	"ПК это печь керамическая",
-	"melo melo melooon",
-	":gigachad:",
-	"-Dummygod was here",
-	"PL is not poland, is PlantKnight",
-	"Im so in love with ddnet code c:",
-	"Loving Ayako",
-	"deen>all!!!",
-	"Blocker<all",
-	"Block is nuts, don't play it",
-	"Also try KoG",
-	"Also try BlockWords",
-	"Also try FNG",
-	"Also try to touch some grass",
-	"chillin'",
-	"Our old party was Kao, Draggory, Ayako, Tokly, -StormAx",
-	"first -StormAx name is - NEDEX",
-	"Why tf you are staring at me? >:C",
-	"Bro i love this game so much",
-	"testtext",
-	"220km/h :wheelchair:",
-	"YEP CLAN on top;p",
-	"no sex ;c",
-	"still no sex ;c",
-	"and still no sex ;c",
-	"pepega xD",
-	"Go play Luxis",
-	"Go play Stronghold 4",
-	"AOE is not a YT guy, its splash DMG",
-	"VAMO VER QM DA MAIS O RABO, PRA VER SE EU NUM GANHO!",
-	"muhehehehe",
-	"10/10",
-	"10010101010ERROR11010101010101010101011011010110ERROR101010011",
-	"voulez-vous couchez avec moi?!?",
-	"BlueMeww, Bluee... BlueMewing!... F*CK",
-	"ronyan'",
-	"W's in the shhhhhaaata :screamin':",
-	"W's in the shhhhhaaat :screamin':",
-	"SpinbrosTV... you'r onto something, you'r onto something man",
-	"Also try M-Client v3 :D",
-	"Choo-Choo",
-	"Hi Atsuko!",
-	"pinuuuuuuuu!",
-	"n9",
-	"gamer",
-	"Inner Sillyness",
-	"Im am the storm that is approaching!",
-	"Dev love Lukov so much<3",
-	"DDnet moderator with most bans - IZA 12k bans",
-	"Mewing insead of Meowing",
-	"Prepare to suffer",
-	"Did you saw ddnet describtion in Steam?",
-	"allleeeeeee, hopa!",
-	"std::string GetRandomQuote()",
-	"there's 0.0001% to get special rainbow text, gl^^",
-	"https://open.spotify.com/track/1SQDvOrbSykg0lP5y7EQ8o?si=a002ae00a4eb4935",
-	"Don't use M-Client V3",
-
-};
-
-std::vector<std::string> rares = {
-	"no fucking way you read this..."
-};
-
-
-// Function to get a random quote
-std::string GetRandomQuote() {
-	// Seed the random number generator
-	std::srand(static_cast<unsigned>(std::time(nullptr)));
-
-	// Generate a random number between 0 and 9999
-	int randomNum = std::rand() % 10000;
-
-	// Check if the random number falls in the 0.01% range
-	if (randomNum < 1) {
-		return rares[0]; // Return the super rare quote
-	} else {
-		// Otherwise, return a regular quote
-		int index = std::rand() % quotes.size();
-		return quotes[index];
-	}
-}
+
+using namespace FontIcons;
 
 void CMenus::RenderStartMenu(CUIRect MainView)
 {
-	// Render logo
+	GameClient()->m_MenuBackground.ChangePosition(CMenuBackground::POS_START);
+
+	// render logo
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_BANNER].m_Id);
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(1, 1, 1, 1);
-	IGraphics::CQuadItem QuadItem(MainView.w / 2 - 210, 50, 490, 103);
+	IGraphics::CQuadItem QuadItem(MainView.w / 2 - 170, 60, 360, 103);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
 
-	// Get a random quote when the game starts
-	static bool firstTime = true;
-	static std::string randomQuote;
-
-	if (firstTime) {
-		srand(::time(nullptr)); // Seed the random number generator only once
-		randomQuote = GetRandomQuote();
-		firstTime = false;
-	}
-
-
-
-
 	const float Rounding = 10.0f;
 	const float VMargin = MainView.w / 2 - 190.0f;
 
@@ -181,11 +45,7 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 	static CButtonContainer s_DiscordButton;
 	if(DoButton_Menu(&s_DiscordButton, Localize("Discord"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
 	{
-		const char *pLink = Localize("https://ddnet.org/discord");
-		if(!open_link(pLink))
-		{
-			dbg_msg("menus", "couldn't open link '%s'", pLink);
-		}
+		Client()->ViewLink(Localize("https://ddnet.org/discord"));
 	}
 
 	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
@@ -193,11 +53,7 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 	static CButtonContainer s_LearnButton;
 	if(DoButton_Menu(&s_LearnButton, Localize("Learn"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
 	{
-		const char *pLink = Localize("https://wiki.ddnet.org/");
-		if(!open_link(pLink))
-		{
-			dbg_msg("menus", "couldn't open link '%s'", pLink);
-		}
+		Client()->ViewLink(Localize("https://wiki.ddnet.org/"));
 	}
 
 	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
@@ -207,6 +63,10 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 	if(DoButton_Menu(&s_TutorialButton, Localize("Tutorial"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) ||
 		(s_JoinTutorialTime != 0.0f && Client()->LocalTime() >= s_JoinTutorialTime))
 	{
+		// Activate internet tab before joining tutorial to make sure the server info
+		// for the tutorial servers is available.
+		SetMenuPage(PAGE_INTERNET);
+		RefreshBrowserTab(true);
 		const char *pAddr = ServerBrowser()->GetTutorialServer();
 		if(pAddr)
 		{
@@ -230,11 +90,7 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 	static CButtonContainer s_WebsiteButton;
 	if(DoButton_Menu(&s_WebsiteButton, Localize("Website"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
 	{
-		const char *pLink = "https://ddnet.org/";
-		if(!open_link(pLink))
-		{
-			dbg_msg("menus", "couldn't open link '%s'", pLink);
-		}
+		Client()->ViewLink("https://ddnet.org/");
 	}
 
 	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
@@ -244,16 +100,13 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 		NewPage = PAGE_NEWS;
 
 	CUIRect Menu;
-
 	MainView.VMargin(VMargin, &Menu);
-	Menu.HSplitBottom(15.0f, &Menu, 0);
+	Menu.HSplitBottom(25.0f, &Menu, 0);
 
-	MainView.VSplitLeft(MainView.w / 2 + 115, &Menu, nullptr);
-	Menu.VSplitLeft(Menu.w / 1.45, nullptr, &Menu);
 	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_QuitButton;
 	bool UsedEscape = false;
-	if(DoButton_Menu(&s_QuitButton, Localize("Quit"), 0, &Button, 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (UsedEscape = UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)) || CheckHotKey(KEY_Q))
+	if(DoButton_Menu(&s_QuitButton, Localize("Quit"), 0, &Button, 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (UsedEscape = Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE)) || CheckHotKey(KEY_Q))
 	{
 		if(UsedEscape || m_pClient->Editor()->HasUnsavedData() || (Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmQuitTime && g_Config.m_ClConfirmQuitTime >= 0))
 		{
@@ -264,23 +117,22 @@ void CMenus::RenderStartMenu(CUIRect MainView)
 			Client()->Quit();
 		}
 	}
-	//Main buttons
 
 	Menu.HSplitBottom(100.0f, &Menu, 0);
-	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_SettingsButton;
-	if(DoButton_Menu(&s_SettingsButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "settings" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_S))
+	if(DoButton_Menu(&s_SettingsButton, Localize("Settings"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "settings" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_S))
 		NewPage = PAGE_SETTINGS;
 
+#if !defined(CONF_PLATFORM_ANDROID)
 	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
-	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_LocalServerButton;
 
-
 	if(!is_process_alive(m_ServerProcess.m_Process))
 		KillServer();
 
-if(DoButton_Menu(&s_LocalServerButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_ServerProcess.m_Process? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
+	if(DoButton_Menu(&s_LocalServerButton, m_ServerProcess.m_Process ? Localize("Stop server") : Localize("Run server"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_ServerProcess.m_Process ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
 	{
 		if(m_ServerProcess.m_Process)
 		{
@@ -291,13 +143,10 @@ if(DoButton_Menu(&s_LocalServerButton, Localize(""), 0, &Button, g_Config.m_ClSh
 			char aBuf[IO_MAX_PATH_LENGTH];
 			Storage()->GetBinaryPath(PLAT_SERVER_EXEC, aBuf, sizeof(aBuf));
 			// No / in binary path means to search in $PATH, so it is expected that the file can't be opened. Just try executing anyway.
-			if(str_find(aBuf, "/") == 0)
+			if(str_find(aBuf, "/") == 0 || fs_is_file(aBuf))
 			{
-				m_ServerProcess.m_Process = shell_execute(aBuf);
-			}
-			else if(fs_is_file(aBuf))
-			{
-				m_ServerProcess.m_Process = shell_execute(aBuf);
+				m_ServerProcess.m_Process = shell_execute(aBuf, EShellExecuteWindowState::BACKGROUND);
+				m_ForceRefreshLanPage = true;
 			}
 			else
 			{
@@ -305,98 +154,91 @@ if(DoButton_Menu(&s_LocalServerButton, Localize(""), 0, &Button, g_Config.m_ClSh
 			}
 		}
 	}
+#endif
 
-	static bool EditorHotkeyWasPressed = true;
-	static float EditorHotKeyChecktime = 0.0f;
 	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
-	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_MapEditorButton;
-	if(DoButton_Menu(&s_MapEditorButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "editor" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_pClient->Editor()->HasUnsavedData() ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (!EditorHotkeyWasPressed && Client()->LocalTime() - EditorHotKeyChecktime < 0.1f && CheckHotKey(KEY_E)))
+	if(DoButton_Menu(&s_MapEditorButton, Localize("Editor"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "editor" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_pClient->Editor()->HasUnsavedData() ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (!m_EditorHotkeyWasPressed && Client()->LocalTime() - m_EditorHotKeyChecktime < 0.1f && CheckHotKey(KEY_E)))
 	{
 		g_Config.m_ClEditor = 1;
 		Input()->MouseModeRelative();
-		EditorHotkeyWasPressed = true;
+		m_EditorHotkeyWasPressed = true;
 	}
 	if(!Input()->KeyIsPressed(KEY_E))
 	{
-		EditorHotkeyWasPressed = false;
-		EditorHotKeyChecktime = Client()->LocalTime();
+		m_EditorHotkeyWasPressed = false;
+		m_EditorHotKeyChecktime = Client()->LocalTime();
 	}
 
 	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
-	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_DemoButton;
-	if(DoButton_Menu(&s_DemoButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "demos" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_D))
+	if(DoButton_Menu(&s_DemoButton, Localize("Demos"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "demos" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_D))
 	{
 		NewPage = PAGE_DEMOS;
 	}
 
 	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
-	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
 	static CButtonContainer s_PlayButton;
-	if(DoButton_Menu(&s_PlayButton, Localize("", "Start menu"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "play_game" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || CheckHotKey(KEY_P))
+	if(DoButton_Menu(&s_PlayButton, Localize("Play", "Start menu"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "play_game" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || CheckHotKey(KEY_P))
 	{
-		NewPage = g_Config.m_UiPage >= PAGE_INTERNET && g_Config.m_UiPage <= PAGE_FAVORITES ? g_Config.m_UiPage : PAGE_INTERNET;
+		NewPage = g_Config.m_UiPage >= PAGE_INTERNET && g_Config.m_UiPage <= PAGE_FAVORITE_COMMUNITY_5 ? g_Config.m_UiPage : PAGE_INTERNET;
 	}
 
 	// render version
-	CUIRect VersionUpdate, CurVersion;
-	MainView.HSplitBottom(30.0f, 0, 0);
-	MainView.HSplitBottom(55.0f, 0, &VersionUpdate);
+	CUIRect CurVersion, ConsoleButton;
+	MainView.HSplitBottom(45.0f, nullptr, &CurVersion);
+	CurVersion.VSplitRight(40.0f, &CurVersion, nullptr);
+	CurVersion.HSplitTop(20.0f, &ConsoleButton, &CurVersion);
+	CurVersion.HSplitTop(5.0f, nullptr, &CurVersion);
+	ConsoleButton.VSplitRight(40.0f, nullptr, &ConsoleButton);
+	Ui()->DoLabel(&CurVersion, GAME_RELEASE_VERSION, 14.0f, TEXTALIGN_MR);
+
+	static CButtonContainer s_ConsoleButton;
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	if(DoButton_Menu(&s_ConsoleButton, FONT_ICON_TERMINAL, 0, &ConsoleButton, nullptr, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.1f)))
+	{
+		GameClient()->m_GameConsole.Toggle(CGameConsole::CONSOLETYPE_LOCAL);
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 
-	VersionUpdate.VSplitRight(50.0f, &CurVersion, 0);
+	CUIRect VersionUpdate;
+	MainView.HSplitBottom(20.0f, nullptr, &VersionUpdate);
 	VersionUpdate.VMargin(VMargin, &VersionUpdate);
+#if defined(CONF_AUTOUPDATE)
+	CUIRect UpdateButton;
+	VersionUpdate.VSplitRight(100.0f, &VersionUpdate, &UpdateButton);
+	VersionUpdate.VSplitRight(10.0f, &VersionUpdate, nullptr);
 
-	CUIRect RandomText;
-	RandomText.x = 605.0f;
-	RandomText.y = 130.0f;
-	RandomText.w = 330.0f;
-	RandomText.h = 60.0f;
-	static bool Quote = false;
+	char aBuf[128];
+	const IUpdater::EUpdaterState State = Updater()->GetCurrentState();
+	const bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
 
-	if (!Quote)
+	if(State == IUpdater::CLEAN && NeedUpdate)
 	{
-		Quote = true;
-		dbg_msg("Quotes", "%s", randomQuote.c_str());
+		static CButtonContainer s_VersionUpdate;
+		if(DoButton_Menu(&s_VersionUpdate, Localize("Update now"), 0, &UpdateButton, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+		{
+			Updater()->InitiateUpdate();
+		}
 	}
-
-	if(!str_comp(randomQuote.c_str(), "no fucking way you read this..."))
+	else if(State == IUpdater::NEED_RESTART)
 	{
-		ColorRGBA color = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 25) % 255 / 255.f, 1.f, 1.f));
-		color.a = 0.9f;
-		TextRender()->TextColor(color);
-
-		UI()->DoLabel(&RandomText, "no fucking way you read this...", 20.0f, TEXTALIGN_ML);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		static CButtonContainer s_VersionUpdate;
+		if(DoButton_Menu(&s_VersionUpdate, Localize("Restart"), 0, &UpdateButton, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+		{
+			Client()->Restart();
+		}
 	}
-	else
+	else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
 	{
-		TextRender()->TextColor(1.0f, 1.0f, 0.0f, 1.0f);
-
-
-		float animationFactor = sinf(LocalTime() * 10);
-
-		float animationFactorSmooth = animationFactor * animationFactor;
-
-		float baseSizeMin = 18.0f;
-		float baseSizeMax = 20.0f;
-
-		float scale = 0.5f;
-
-		float newSize = baseSizeMin + (baseSizeMax - baseSizeMin) * (0.5f + scale * animationFactorSmooth);
-
-		TextRender()->Text(605.0f, 130.0f, newSize, randomQuote.c_str());
-
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
+		Ui()->RenderProgressBar(UpdateButton, Updater()->GetCurrentPercent() / 100.0f);
 	}
 
-#if defined(CONF_AUTOUPDATE)
-
-	char aBuf[64];
-	CUIRect Part;
-	int State = Updater()->GetCurrentState();
-	bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
 	if(State == IUpdater::CLEAN && NeedUpdate)
 	{
 		str_format(aBuf, sizeof(aBuf), Localize("DDNet %s is out!"), Client()->LatestVersion());
@@ -414,81 +256,43 @@ if(DoButton_Menu(&s_LocalServerButton, Localize(""), 0, &Button, g_Config.m_ClSh
 	}
 	else if(State == IUpdater::FAIL)
 	{
-		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log..."));
+		str_copy(aBuf, Localize("Update failed! Check log…"));
 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
 	}
 	else if(State == IUpdater::NEED_RESTART)
 	{
-		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
+		str_copy(aBuf, Localize("DDNet Client updated!"));
 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
 	}
-	UI()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
-	TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-	VersionUpdate.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, 0, &Part);
-
-	if(State == IUpdater::CLEAN && NeedUpdate)
-	{
-		CUIRect Update;
-		Part.VSplitLeft(100.0f, &Update, NULL);
-
-		static CButtonContainer s_VersionUpdate;
-		if(DoButton_Menu(&s_VersionUpdate, Localize("Update now"), 0, &Update, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
-		{
-			Updater()->InitiateUpdate();
-		}
-	}
-	else if(State == IUpdater::NEED_RESTART)
-	{
-		CUIRect Restart;
-		Part.VSplitLeft(50.0f, &Restart, &Part);
-
-		static CButtonContainer s_VersionUpdate;
-		if(DoButton_Menu(&s_VersionUpdate, Localize("Restart"), 0, &Restart, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
-		{
-			Client()->Restart();
-		}
-	}
-	else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
-	{
-		CUIRect ProgressBar, Percent;
-		Part.VSplitLeft(100.0f, &ProgressBar, &Percent);
-		ProgressBar.y += 2.0f;
-		ProgressBar.HMargin(1.0f, &ProgressBar);
-		ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
-		ProgressBar.w = clamp((float)Updater()->GetCurrentPercent(), 10.0f, 100.0f);
-		ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), IGraphics::CORNER_ALL, 5.0f);
-	}
-	/*
+	Ui()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 #elif defined(CONF_INFORM_UPDATE)
 	if(str_comp(Client()->LatestVersion(), "0") != 0)
 	{
 		char aBuf[64];
 		str_format(aBuf, sizeof(aBuf), Localize("DDNet %s is out!"), Client()->LatestVersion());
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-		UI()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_MC);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+		Ui()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_MC);
 	}
-*/
 #endif
 
-	UI()->DoLabel(&CurVersion, GAME_RELEASE_VERSION, 14.0f, TEXTALIGN_MR);
-
 	if(NewPage != -1)
 	{
-		m_MenuPage = NewPage;
 		m_ShowStart = false;
+		SetMenuPage(NewPage);
 	}
-
 }
 
 void CMenus::KillServer()
 {
+#if !defined(CONF_PLATFORM_ANDROID)
 	if(m_ServerProcess.m_Process)
 	{
 		if(kill_process(m_ServerProcess.m_Process))
 		{
 			m_ServerProcess.m_Process = INVALID_PROCESS;
+			m_ForceRefreshLanPage = true;
 		}
 	}
+#endif
 }
diff --git a/src/game/client/components/motd.cpp b/src/game/client/components/motd.cpp
index 3e7f9a9fe5..2d90e33f7b 100644
--- a/src/game/client/components/motd.cpp
+++ b/src/game/client/components/motd.cpp
@@ -43,6 +43,9 @@ void CMotd::OnWindowResize()
 
 void CMotd::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!IsActive())
 		return;
 
diff --git a/src/game/client/components/motd.h b/src/game/client/components/motd.h
index 3971097c7c..cd110b2dcf 100644
--- a/src/game/client/components/motd.h
+++ b/src/game/client/components/motd.h
@@ -4,6 +4,7 @@
 #define GAME_CLIENT_COMPONENTS_MOTD_H
 
 #include <engine/shared/config.h>
+#include <engine/textrender.h>
 
 #include <game/client/component.h>
 
diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp
index d6012e36bf..59366afe51 100644
--- a/src/game/client/components/nameplates.cpp
+++ b/src/game/client/components/nameplates.cpp
@@ -14,30 +14,14 @@
 #include "controls.h"
 #include "nameplates.h"
 
-void CNamePlates::RenderNameplate(
-	const CNetObj_Character *pPrevChar,
-	const CNetObj_Character *pPlayerChar,
-	const CNetObj_PlayerInfo *pPlayerInfo)
+void CNamePlates::RenderNameplate(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha)
 {
-	int ClientID = pPlayerInfo->m_ClientID;
+	SPlayerNamePlate &NamePlate = m_aNamePlates[pPlayerInfo->m_ClientId];
+	const auto &ClientData = m_pClient->m_aClients[pPlayerInfo->m_ClientId];
+	const bool OtherTeam = m_pClient->IsOtherTeam(pPlayerInfo->m_ClientId);
 
-	vec2 Position;
-	if(ClientID >= 0 && ClientID < MAX_CLIENTS)
-		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
-	else
-		Position = mix(vec2(pPrevChar->m_X, pPrevChar->m_Y), vec2(pPlayerChar->m_X, pPlayerChar->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
-
-	RenderNameplatePos(Position, pPlayerInfo, 1.0f);
-}
-
-void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha)
-{
-	int ClientID = pPlayerInfo->m_ClientID;
-
-	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
-
-	float FontSize = 18.0f + 20.0f * g_Config.m_ClNameplatesSize / 100.0f;
-	float FontSizeClan = 18.0f + 20.0f * g_Config.m_ClNameplatesClanSize / 100.0f;
+	const float FontSize = 18.0f + 20.0f * g_Config.m_ClNameplatesSize / 100.0f;
+	const float FontSizeClan = 18.0f + 20.0f * g_Config.m_ClNameplatesClanSize / 100.0f;
 
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
 	float YOffset = Position.y - 38;
@@ -49,31 +33,41 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP
 	if(IVideo::Current())
 		ShowDirection = g_Config.m_ClVideoShowDirection;
 #endif
-	if((ShowDirection && ShowDirection != 3 && !pPlayerInfo->m_Local) || (ShowDirection >= 2 && pPlayerInfo->m_Local) || (ShowDirection == 3 && Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy]))
+	if((ShowDirection && ShowDirection != 3 && !pPlayerInfo->m_Local) || (ShowDirection >= 2 && pPlayerInfo->m_Local) || (ShowDirection == 3 && Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && pPlayerInfo->m_ClientId == m_pClient->m_aLocalIds[!g_Config.m_ClDummy]))
 	{
-		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
-		Graphics()->QuadsSetRotation(0);
-
-		const float ShowDirectionImgSize = 22.0f;
-		YOffset -= ShowDirectionImgSize;
-		vec2 ShowDirectionPos = vec2(Position.x - 11.0f, YOffset);
-
-		bool DirLeft = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Direction == -1;
-		bool DirRight = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Direction == 1;
-		bool Jump = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Jumped & 1;
-
-		if(pPlayerInfo->m_Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		bool DirLeft;
+		bool DirRight;
+		bool Jump;
+		if(Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && pPlayerInfo->m_ClientId == m_pClient->m_aLocalIds[!g_Config.m_ClDummy])
 		{
-			DirLeft = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Direction == -1;
-			DirRight = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Direction == 1;
-			Jump = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Jump == 1;
+			const auto &InputData = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy];
+			DirLeft = InputData.m_Direction == -1;
+			DirRight = InputData.m_Direction == 1;
+			Jump = InputData.m_Jump == 1;
 		}
-		if(Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && pPlayerInfo->m_ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy])
+		else if(pPlayerInfo->m_Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 		{
-			DirLeft = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Direction == -1;
-			DirRight = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Direction == 1;
-			Jump = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Jump == 1;
+			const auto &InputData = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy];
+			DirLeft = InputData.m_Direction == -1;
+			DirRight = InputData.m_Direction == 1;
+			Jump = InputData.m_Jump == 1;
 		}
+		else
+		{
+			const auto &Character = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientId];
+			DirLeft = Character.m_Cur.m_Direction == -1;
+			DirRight = Character.m_Cur.m_Direction == 1;
+			Jump = Character.m_Cur.m_Jumped & 1;
+		}
+
+		if(OtherTeam && !ForceAlpha)
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, g_Config.m_ClShowOthersAlpha / 100.0f);
+		else
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		const float ShowDirectionImgSize = 22.0f;
+		YOffset -= ShowDirectionImgSize;
+		const vec2 ShowDirectionPos = vec2(Position.x - 11.0f, YOffset);
 		if(DirLeft)
 		{
 			Graphics()->TextureSet(g_pData->m_aImages[IMAGE_ARROW].m_Id);
@@ -83,6 +77,7 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP
 		else if(DirRight)
 		{
 			Graphics()->TextureSet(g_pData->m_aImages[IMAGE_ARROW].m_Id);
+			Graphics()->QuadsSetRotation(0);
 			Graphics()->RenderQuadContainerAsSprite(m_DirectionQuadContainerIndex, 0, ShowDirectionPos.x + 30.f, ShowDirectionPos.y);
 		}
 		if(Jump)
@@ -98,209 +93,163 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP
 	// render name plate
 	if((!pPlayerInfo->m_Local || g_Config.m_ClNameplatesOwn) && g_Config.m_ClNameplates)
 	{
-		float a = 1;
+		float a;
 		if(g_Config.m_ClNameplatesAlways == 0)
 			a = clamp(1 - std::pow(distance(m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy], Position) / 200.0f, 16.0f), 0.0f, 1.0f);
+		else
+			a = 1.0f;
 
-		const char *pName = m_pClient->m_aClients[pPlayerInfo->m_ClientID].m_aName;
-		if(str_comp(pName, m_aNamePlates[ClientID].m_aName) != 0 || FontSize != m_aNamePlates[ClientID].m_NameTextFontSize)
+		if(str_comp(ClientData.m_aName, NamePlate.m_aName) != 0 || FontSize != NamePlate.m_NameTextFontSize)
 		{
-			mem_copy(m_aNamePlates[ClientID].m_aName, pName, sizeof(m_aNamePlates[ClientID].m_aName));
-			m_aNamePlates[ClientID].m_NameTextFontSize = FontSize;
+			str_copy(NamePlate.m_aName, ClientData.m_aName);
+			NamePlate.m_NameTextFontSize = FontSize;
 
 			CTextCursor Cursor;
 			TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
-			Cursor.m_LineWidth = -1;
 
 			// create nameplates at standard zoom
 			float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 			Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
 			RenderTools()->MapScreenToInterface(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
-
-			m_aNamePlates[ClientID].m_NameTextWidth = TextRender()->TextWidth(FontSize, pName, -1, -1.0f);
-
-			TextRender()->RecreateTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, &Cursor, pName);
+			TextRender()->RecreateTextContainer(NamePlate.m_NameTextContainerIndex, &Cursor, ClientData.m_aName);
 			Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 		}
 
 		if(g_Config.m_ClNameplatesClan)
 		{
-			const char *pClan = m_pClient->m_aClients[ClientID].m_aClan;
-			if(str_comp(pClan, m_aNamePlates[ClientID].m_aClanName) != 0 || FontSizeClan != m_aNamePlates[ClientID].m_ClanNameTextFontSize)
+			if(str_comp(ClientData.m_aClan, NamePlate.m_aClan) != 0 || FontSizeClan != NamePlate.m_ClanTextFontSize)
 			{
-				mem_copy(m_aNamePlates[ClientID].m_aClanName, pClan, sizeof(m_aNamePlates[ClientID].m_aClanName));
-				m_aNamePlates[ClientID].m_ClanNameTextFontSize = FontSizeClan;
+				str_copy(NamePlate.m_aClan, ClientData.m_aClan);
+				NamePlate.m_ClanTextFontSize = FontSizeClan;
 
 				CTextCursor Cursor;
 				TextRender()->SetCursor(&Cursor, 0, 0, FontSizeClan, TEXTFLAG_RENDER);
-				Cursor.m_LineWidth = -1;
 
 				// create nameplates at standard zoom
 				float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 				Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
 				RenderTools()->MapScreenToInterface(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
-
-				m_aNamePlates[ClientID].m_ClanNameTextWidth = TextRender()->TextWidth(FontSizeClan, pClan, -1, -1.0f);
-
-				TextRender()->RecreateTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, &Cursor, pClan);
+				TextRender()->RecreateTextContainer(NamePlate.m_ClanTextContainerIndex, &Cursor, ClientData.m_aClan);
 				Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 			}
 		}
-		ColorRGBA TColor;
-		if(g_Config.m_ScShowFrozenNameplaterColor == 1)
-			if(GameClient()->m_aClients[ClientID].m_FreezeEnd)
+
+		if(g_Config.m_ClNameplatesTeamcolors)
+		{
+			const int Team = m_pClient->m_Teams.Team(pPlayerInfo->m_ClientId);
+			if(Team)
 			{
-				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFrozenTeeColor));
+				rgb = m_pClient->GetDDTeamColor(Team, 0.75f);
 			}
+		}
 
-		float tw = m_aNamePlates[ClientID].m_NameTextWidth;
-		if(g_Config.m_ClNameplatesTeamcolors && m_pClient->m_Teams.Team(ClientID))
-			rgb = m_pClient->GetDDTeamColor(m_pClient->m_Teams.Team(ClientID), 0.75f);
+		ColorRGBA TColor;
 		ColorRGBA TOutlineColor;
 
 		if(OtherTeam && !ForceAlpha)
 		{
 			TOutlineColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.2f * g_Config.m_ClShowOthersAlpha / 100.0f);
-			TColor = ColorRGBA(rgb.r, rgb.g, rgb.b, g_Config.m_ClShowOthersAlpha / 100.0f);
+			TColor = rgb.WithAlpha(g_Config.m_ClShowOthersAlpha / 100.0f);
 		}
 		else
 		{
 			TOutlineColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f * a);
-			TColor = ColorRGBA(rgb.r, rgb.g, rgb.b, a);
+			TColor = rgb.WithAlpha(a);
 		}
-
-		if(g_Config.m_ScShowFrozenNameplaterColor == 1)
-			if(GameClient()->m_aClients[ClientID].m_FreezeEnd)
-			{
-				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFrozenTeeColor));
-			}
-
 		if(g_Config.m_ClNameplatesTeamcolors && m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
 		{
-			if(m_pClient->m_aClients[ClientID].m_Team == TEAM_RED)
+			if(ClientData.m_Team == TEAM_RED)
 				TColor = ColorRGBA(1.0f, 0.5f, 0.5f, a);
-			else if(m_pClient->m_aClients[ClientID].m_Team == TEAM_BLUE)
+			else if(ClientData.m_Team == TEAM_BLUE)
 				TColor = ColorRGBA(0.7f, 0.7f, 1.0f, a);
 		}
 
-		if(g_Config.m_ScShowBlacklistNameplaterColor == 1)
-		{
-			if(GameClient()->m_aClients[ClientID].m_Foe)
-			{
-				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScBlacklistPColor));
-			}
-		}
-
-		if(g_Config.m_ScShowFriendsNameplatesColor == 1)
-		{
-			if(GameClient()->m_aClients[ClientID].m_Friend)
-			{
-				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFriendColor));
-			}
-		}
-
 		TOutlineColor.a *= Alpha;
 		TColor.a *= Alpha;
 
-		if(m_aNamePlates[ClientID].m_NameTextContainerIndex.Valid())
+		if(NamePlate.m_NameTextContainerIndex.Valid())
 		{
 			YOffset -= FontSize;
-			TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, TColor, TOutlineColor, Position.x - tw / 2.0f, YOffset);
+			TextRender()->RenderTextContainer(NamePlate.m_NameTextContainerIndex, TColor, TOutlineColor, Position.x - TextRender()->GetBoundingBoxTextContainer(NamePlate.m_NameTextContainerIndex).m_W / 2.0f, YOffset);
 		}
 
 		if(g_Config.m_ClNameplatesClan)
 		{
 			YOffset -= FontSizeClan;
-			if(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex.Valid())
-				TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, TColor, TOutlineColor, Position.x - m_aNamePlates[ClientID].m_ClanNameTextWidth / 2.0f, YOffset);
+			if(NamePlate.m_ClanTextContainerIndex.Valid())
+				TextRender()->RenderTextContainer(NamePlate.m_ClanTextContainerIndex, TColor, TOutlineColor, Position.x - TextRender()->GetBoundingBoxTextContainer(NamePlate.m_ClanTextContainerIndex).m_W / 2.0f, YOffset);
 		}
-		//tee skin name
-		if(g_Config.m_ClShowSkinName)
-		{
-			const CGameClient::CClientData &ClientData = m_pClient->m_aClients[pPlayerInfo->m_ClientID];
-			const char *pSkinName = ClientData.m_aSkinName;
 
-			YOffset -= FontSizeClan;
-			float XOffset = TextRender()->TextWidth(FontSize, pSkinName, -1, -1.0f) / 2.0f;
-			TextRender()->TextColor(rgb);
-			TextRender()->Text(Position.x - XOffset, YOffset, FontSize, pSkinName, -1.0f);
-		}
-
-		if(g_Config.m_ClNameplatesFriendMark && m_pClient->m_aClients[ClientID].m_Friend)
+		if(g_Config.m_ClNameplatesFriendMark && ClientData.m_Friend)
 		{
 			YOffset -= FontSize;
-			char aFriendMark[] = "♥";
-
-			ColorRGBA Color;
-
+			ColorRGBA Color = ColorRGBA(1.0f, 0.0f, 0.0f, Alpha);
 			if(OtherTeam && !ForceAlpha)
-				Color = ColorRGBA(1.0f, 0.0f, 0.0f, g_Config.m_ClShowOthersAlpha / 100.0f);
+				Color.a *= g_Config.m_ClShowOthersAlpha / 100.0f;
 			else
-				Color = ColorRGBA(1.0f, 0.0f, 0.0f, a);
-
-			Color.a *= Alpha;
+				Color.a *= a;
 
+			const char *pFriendMark = "♥";
 			TextRender()->TextColor(Color);
-			float XOffSet = TextRender()->TextWidth(FontSize, aFriendMark, -1, -1.0f) / 2.0f;
-			TextRender()->Text(Position.x - XOffSet, YOffset, FontSize, aFriendMark, -1.0f);
+			TextRender()->Text(Position.x - TextRender()->TextWidth(FontSize, pFriendMark) / 2.0f, YOffset, FontSize, pFriendMark);
 		}
 
-		if(g_Config.m_Debug || g_Config.m_ClNameplatesIDs) // render client id when in debug as well
+		if(g_Config.m_Debug || g_Config.m_ClNameplatesIds) // render client id when in debug as well
 		{
 			YOffset -= FontSize;
-			char aBuf[128];
-			str_from_int(pPlayerInfo->m_ClientID, aBuf);
-			float XOffset = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f) / 2.0f;
+			char aBuf[12];
+			str_format(aBuf, sizeof(aBuf), "%d", pPlayerInfo->m_ClientId);
 			TextRender()->TextColor(rgb);
-			TextRender()->Text(Position.x - XOffset, YOffset, FontSize, aBuf, -1.0f);
+			TextRender()->Text(Position.x - TextRender()->TextWidth(FontSize, aBuf) / 2.0f, YOffset, FontSize, aBuf);
 		}
 	}
 
 	if((g_Config.m_Debug || g_Config.m_ClNameplatesStrong) && g_Config.m_ClNameplates)
 	{
-		if(m_pClient->m_Snap.m_LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_HasExtendedData && m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData)
+		const bool Following = (m_pClient->m_Snap.m_SpecInfo.m_Active && !GameClient()->m_MultiViewActivated && m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW);
+		if(m_pClient->m_Snap.m_LocalClientId != -1 || Following)
 		{
-			CCharacter *pLocalChar = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
-			CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(pPlayerInfo->m_ClientID);
-			if(pCharacter && pLocalChar)
+			const int SelectedId = Following ? m_pClient->m_Snap.m_SpecInfo.m_SpectatorId : m_pClient->m_Snap.m_LocalClientId;
+			const CGameClient::CSnapState::CCharacterInfo &Selected = m_pClient->m_Snap.m_aCharacters[SelectedId];
+			const CGameClient::CSnapState::CCharacterInfo &Other = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientId];
+			if(Selected.m_HasExtendedData && Other.m_HasExtendedData)
 			{
-				if(pPlayerInfo->m_Local)
+				if(SelectedId == pPlayerInfo->m_ClientId)
+				{
 					TextRender()->TextColor(rgb);
+				}
 				else
 				{
-					float ScaleX, ScaleY;
-					const float StrongWeakImgSize = 40.0f;
-					Graphics()->TextureClear();
 					Graphics()->TextureSet(g_pData->m_aImages[IMAGE_STRONGWEAK].m_Id);
 					Graphics()->QuadsBegin();
 					ColorRGBA StrongWeakStatusColor;
-					int StrongWeakSpriteID;
-					if(pLocalChar->GetStrongWeakID() > pCharacter->GetStrongWeakID())
+					int StrongWeakSpriteId;
+					if(Selected.m_ExtendedData.m_StrongWeakId > Other.m_ExtendedData.m_StrongWeakId)
 					{
 						StrongWeakStatusColor = color_cast<ColorRGBA>(ColorHSLA(6401973));
-						StrongWeakSpriteID = SPRITE_HOOK_STRONG;
+						StrongWeakSpriteId = SPRITE_HOOK_STRONG;
 					}
 					else
 					{
 						StrongWeakStatusColor = color_cast<ColorRGBA>(ColorHSLA(41131));
-						StrongWeakSpriteID = SPRITE_HOOK_WEAK;
+						StrongWeakSpriteId = SPRITE_HOOK_WEAK;
 					}
 
-					float ClampedAlpha = 1;
-					if(g_Config.m_ClNameplatesAlways == 0)
-						ClampedAlpha = clamp(1 - std::pow(distance(m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy], Position) / 200.0f, 16.0f), 0.0f, 1.0f);
-
 					if(OtherTeam && !ForceAlpha)
 						StrongWeakStatusColor.a = g_Config.m_ClShowOthersAlpha / 100.0f;
+					else if(g_Config.m_ClNameplatesAlways == 0)
+						StrongWeakStatusColor.a = clamp(1 - std::pow(distance(m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy], Position) / 200.0f, 16.0f), 0.0f, 1.0f);
 					else
-						StrongWeakStatusColor.a = ClampedAlpha;
+						StrongWeakStatusColor.a = 1.0f;
 
 					StrongWeakStatusColor.a *= Alpha;
 					Graphics()->SetColor(StrongWeakStatusColor);
-					RenderTools()->SelectSprite(StrongWeakSpriteID);
-					RenderTools()->GetSpriteScale(StrongWeakSpriteID, ScaleX, ScaleY);
+					float ScaleX, ScaleY;
+					RenderTools()->SelectSprite(StrongWeakSpriteId);
+					RenderTools()->GetSpriteScale(StrongWeakSpriteId, ScaleX, ScaleY);
 					TextRender()->TextColor(StrongWeakStatusColor);
 
+					const float StrongWeakImgSize = 40.0f;
 					YOffset -= StrongWeakImgSize * ScaleY;
 					RenderTools()->DrawSprite(Position.x, YOffset + (StrongWeakImgSize / 2.0f) * ScaleY, StrongWeakImgSize);
 					Graphics()->QuadsEnd();
@@ -309,9 +258,8 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP
 				{
 					YOffset -= FontSize;
 					char aBuf[12];
-					str_from_int(pCharacter->GetStrongWeakID(), aBuf);
-					float XOffset = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f) / 2.0f;
-					TextRender()->Text(Position.x - XOffset, YOffset, FontSize, aBuf, -1.0f);
+					str_format(aBuf, sizeof(aBuf), "%d", Other.m_ExtendedData.m_StrongWeakId);
+					TextRender()->Text(Position.x - TextRender()->TextWidth(FontSize, aBuf) / 2.0f, YOffset, FontSize, aBuf);
 				}
 			}
 		}
@@ -325,6 +273,9 @@ void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pP
 
 void CNamePlates::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	int ShowDirection = g_Config.m_ClShowDirection;
 #if defined(CONF_VIDEORECORDER)
 	if(IVideo::Current())
@@ -353,44 +304,35 @@ void CNamePlates::OnRender()
 			continue;
 		}
 
-		vec2 *pRenderPos;
 		if(m_pClient->m_aClients[i].m_SpecCharPresent)
 		{
 			// Each player can also have a spec char whose nameplate is displayed independently
-			pRenderPos = &m_pClient->m_aClients[i].m_SpecChar;
+			const vec2 RenderPos = m_pClient->m_aClients[i].m_SpecChar;
 			// don't render offscreen
-			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
+			if(in_range(RenderPos.x, ScreenX0, ScreenX1) && in_range(RenderPos.y, ScreenY0, ScreenY1))
 			{
-				RenderNameplatePos(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true);
+				RenderNameplate(RenderPos, pInfo, 0.4f, true);
 			}
 		}
 		if(m_pClient->m_Snap.m_aCharacters[i].m_Active)
 		{
 			// Only render nameplates for active characters
-			pRenderPos = &m_pClient->m_aClients[i].m_RenderPos;
+			const vec2 RenderPos = m_pClient->m_aClients[i].m_RenderPos;
 			// don't render offscreen
-			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
+			if(in_range(RenderPos.x, ScreenX0, ScreenX1) && in_range(RenderPos.y, ScreenY0, ScreenY1))
 			{
-				RenderNameplate(
-					&m_pClient->m_Snap.m_aCharacters[i].m_Prev,
-					&m_pClient->m_Snap.m_aCharacters[i].m_Cur,
-					pInfo);
+				RenderNameplate(RenderPos, pInfo, 1.0f, false);
 			}
 		}
 	}
 }
 
-void CNamePlates::SetPlayers(CPlayers *pPlayers)
-{
-	m_pPlayers = pPlayers;
-}
-
 void CNamePlates::ResetNamePlates()
 {
 	for(auto &NamePlate : m_aNamePlates)
 	{
 		TextRender()->DeleteTextContainer(NamePlate.m_NameTextContainerIndex);
-		TextRender()->DeleteTextContainer(NamePlate.m_ClanNameTextContainerIndex);
+		TextRender()->DeleteTextContainer(NamePlate.m_ClanTextContainerIndex);
 
 		NamePlate.Reset();
 	}
diff --git a/src/game/client/components/nameplates.h b/src/game/client/components/nameplates.h
index 24042f8fde..7148dd7d56 100644
--- a/src/game/client/components/nameplates.h
+++ b/src/game/client/components/nameplates.h
@@ -5,6 +5,7 @@
 #include <base/vmath.h>
 
 #include <engine/shared/protocol.h>
+#include <engine/textrender.h>
 
 #include <game/client/component.h>
 
@@ -21,34 +22,26 @@ struct SPlayerNamePlate
 	void Reset()
 	{
 		m_NameTextContainerIndex.Reset();
-		m_ClanNameTextContainerIndex.Reset();
-		m_aName[0] = 0;
-		m_aClanName[0] = 0;
-		m_NameTextWidth = m_ClanNameTextWidth = 0.f;
-		m_NameTextFontSize = m_ClanNameTextFontSize = 0;
+		m_ClanTextContainerIndex.Reset();
+		m_aName[0] = '\0';
+		m_aClan[0] = '\0';
+		m_NameTextFontSize = m_ClanTextFontSize = 0.0f;
 	}
 
 	char m_aName[MAX_NAME_LENGTH];
-	float m_NameTextWidth;
 	STextContainerIndex m_NameTextContainerIndex;
 	float m_NameTextFontSize;
 
-	char m_aClanName[MAX_CLAN_LENGTH];
-	float m_ClanNameTextWidth;
-	STextContainerIndex m_ClanNameTextContainerIndex;
-	float m_ClanNameTextFontSize;
+	char m_aClan[MAX_CLAN_LENGTH];
+	STextContainerIndex m_ClanTextContainerIndex;
+	float m_ClanTextFontSize;
 };
 
 class CNamePlates : public CComponent
 {
-	void RenderNameplate(
-		const CNetObj_Character *pPrevChar,
-		const CNetObj_Character *pPlayerChar,
-		const CNetObj_PlayerInfo *pPlayerInfo);
-	void RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha = false);
+	void RenderNameplate(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha);
 
 	SPlayerNamePlate m_aNamePlates[MAX_CLIENTS];
-	class CPlayers *m_pPlayers;
 
 	void ResetNamePlates();
 
@@ -59,8 +52,6 @@ class CNamePlates : public CComponent
 	virtual void OnWindowResize() override;
 	virtual void OnInit() override;
 	virtual void OnRender() override;
-
-	void SetPlayers(class CPlayers *pPlayers);
 };
 
 #endif
diff --git a/src/game/client/components/particles.cpp b/src/game/client/components/particles.cpp
index d076939de6..fef6e886d6 100644
--- a/src/game/client/components/particles.cpp
+++ b/src/game/client/components/particles.cpp
@@ -78,17 +78,16 @@ void CParticles::Update(float TimePassed)
 	if(TimePassed <= 0.0f)
 		return;
 
-	static float FrictionFraction = 0;
-	FrictionFraction += TimePassed;
+	m_FrictionFraction += TimePassed;
 
-	if(FrictionFraction > 2.0f) // safety measure
-		FrictionFraction = 0;
+	if(m_FrictionFraction > 2.0f) // safety measure
+		m_FrictionFraction = 0;
 
 	int FrictionCount = 0;
-	while(FrictionFraction > 0.05f)
+	while(m_FrictionFraction > 0.05f)
 	{
 		FrictionCount++;
-		FrictionFraction -= 0.05f;
+		m_FrictionFraction -= 0.05f;
 	}
 
 	for(int &FirstPart : m_aFirstPart)
@@ -149,22 +148,21 @@ void CParticles::OnRender()
 		return;
 
 	set_new_tick();
-	static int64_t LastTime = 0;
 	int64_t t = time();
 
 	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
 	{
 		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
 		if(!pInfo->m_Paused)
-			Update((float)((t - LastTime) / (double)time_freq()) * pInfo->m_Speed);
+			Update((float)((t - m_LastRenderTime) / (double)time_freq()) * pInfo->m_Speed);
 	}
 	else
 	{
 		if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
-			Update((float)((t - LastTime) / (double)time_freq()));
+			Update((float)((t - m_LastRenderTime) / (double)time_freq()));
 	}
 
-	LastTime = t;
+	m_LastRenderTime = t;
 }
 
 void CParticles::OnInit()
diff --git a/src/game/client/components/particles.h b/src/game/client/components/particles.h
index eb32993ceb..0d2f4937db 100644
--- a/src/game/client/components/particles.h
+++ b/src/game/client/components/particles.h
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_PARTICLES_H
 #define GAME_CLIENT_COMPONENTS_PARTICLES_H
+#include <base/color.h>
 #include <base/vmath.h>
 #include <game/client/component.h>
 
@@ -95,6 +96,9 @@ class CParticles : public CComponent
 	int m_FirstFree;
 	int m_aFirstPart[NUM_GROUPS];
 
+	float m_FrictionFraction = 0.0f;
+	int64_t m_LastRenderTime = 0;
+
 	void RenderGroup(int Group);
 	void Update(float TimePassed);
 
diff --git a/src/game/client/components/players.cpp b/src/game/client/components/players.cpp
index cc425e206e..3876c5331d 100644
--- a/src/game/client/components/players.cpp
+++ b/src/game/client/components/players.cpp
@@ -1,11 +1,13 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
+#include <engine/client/enums.h>
 #include <engine/demo.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <game/gamecore.h>
 #include <game/generated/client_data.h>
+#include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>
 
 #include <game/mapitems.h>
@@ -21,10 +23,59 @@
 #include <game/client/components/sounds.h>
 
 #include "players.h"
+
 #include <base/color.h>
 #include <base/math.h>
 
 void CPlayers::RenderHand(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha)
+{
+	if(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_BODY].IsValid())
+		RenderHand7(pInfo, CenterPos, Dir, AngleOffset, PostRotOffset, Alpha);
+	else
+		RenderHand6(pInfo, CenterPos, Dir, AngleOffset, PostRotOffset, Alpha);
+}
+
+void CPlayers::RenderHand7(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha)
+{
+	// in-game hand size is 15 when tee size is 64
+	float BaseSize = 15.0f * (pInfo->m_Size / 64.0f);
+
+	vec2 HandPos = CenterPos + Dir;
+	float Angle = angle(Dir);
+	if(Dir.x < 0)
+		Angle -= AngleOffset;
+	else
+		Angle += AngleOffset;
+
+	vec2 DirX = Dir;
+	vec2 DirY(-Dir.y, Dir.x);
+
+	if(Dir.x < 0)
+		DirY = -DirY;
+
+	HandPos += DirX * PostRotOffset.x;
+	HandPos += DirY * PostRotOffset.y;
+
+	ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_HANDS];
+	Color.a = Alpha;
+	IGraphics::CQuadItem QuadOutline(HandPos.x, HandPos.y, 2 * BaseSize, 2 * BaseSize);
+	IGraphics::CQuadItem QuadHand = QuadOutline;
+
+	Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_HANDS]);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color);
+	Graphics()->QuadsSetRotation(Angle);
+
+	RenderTools()->SelectSprite7(client_data7::SPRITE_TEE_HAND_OUTLINE);
+	Graphics()->QuadsDraw(&QuadOutline, 1);
+	RenderTools()->SelectSprite7(client_data7::SPRITE_TEE_HAND);
+	Graphics()->QuadsDraw(&QuadHand, 1);
+
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->QuadsEnd();
+}
+
+void CPlayers::RenderHand6(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha)
 {
 	vec2 HandPos = CenterPos + Dir;
 	float Angle = angle(Dir);
@@ -70,19 +121,19 @@ inline float AngularApproach(float Src, float Dst, float Amount)
 float CPlayers::GetPlayerTargetAngle(
 	const CNetObj_Character *pPrevChar,
 	const CNetObj_Character *pPlayerChar,
-	int ClientID,
+	int ClientId,
 	float Intra)
 {
 	float AngleIntraTick = Intra;
 	// using unpredicted angle when rendering other players in-game
-	if(ClientID >= 0)
+	if(ClientId >= 0)
 		AngleIntraTick = Client()->IntraGameTick(g_Config.m_ClDummy);
-	if(ClientID >= 0 && m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+	if(ClientId >= 0 && m_pClient->m_Snap.m_aCharacters[ClientId].m_HasExtendedDisplayInfo)
 	{
-		CNetObj_DDNetCharacter *pExtendedData = &m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData;
-		if(m_pClient->m_Snap.m_aCharacters[ClientID].m_PrevExtendedData)
+		CNetObj_DDNetCharacter *pExtendedData = &m_pClient->m_Snap.m_aCharacters[ClientId].m_ExtendedData;
+		if(m_pClient->m_Snap.m_aCharacters[ClientId].m_PrevExtendedData)
 		{
-			const CNetObj_DDNetCharacter *PrevExtendedData = m_pClient->m_Snap.m_aCharacters[ClientID].m_PrevExtendedData;
+			const CNetObj_DDNetCharacter *PrevExtendedData = m_pClient->m_Snap.m_aCharacters[ClientId].m_PrevExtendedData;
 
 			float MixX = mix((float)PrevExtendedData->m_TargetX, (float)pExtendedData->m_TargetX, AngleIntraTick);
 			float MixY = mix((float)PrevExtendedData->m_TargetY, (float)pExtendedData->m_TargetY, AngleIntraTick);
@@ -117,7 +168,7 @@ float CPlayers::GetPlayerTargetAngle(
 void CPlayers::RenderHookCollLine(
 	const CNetObj_Character *pPrevChar,
 	const CNetObj_Character *pPlayerChar,
-	int ClientID,
+	int ClientId,
 	float Intra)
 {
 	CNetObj_Character Prev;
@@ -125,36 +176,49 @@ void CPlayers::RenderHookCollLine(
 	Prev = *pPrevChar;
 	Player = *pPlayerChar;
 
-	bool Local = m_pClient->m_Snap.m_LocalClientID == ClientID;
-	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
-	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	bool Local = m_pClient->m_Snap.m_LocalClientId == ClientId;
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientId);
+	float Alpha = (OtherTeam || ClientId < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
 	Alpha *= (float)g_Config.m_ClHookCollAlpha / 100;
 
 	float IntraTick = Intra;
-	if(ClientID >= 0)
-		IntraTick = m_pClient->m_aClients[ClientID].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+	if(ClientId >= 0)
+		IntraTick = m_pClient->m_aClients[ClientId].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
 
 	float Angle;
-	if(Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	if(Local && (!m_pClient->m_Snap.m_SpecInfo.m_Active || m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		// just use the direct input if it's the local player we are rendering
-		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy]);
+		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] * m_pClient->m_Camera.m_Zoom);
 	}
 	else
 	{
-		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientID, IntraTick);
+		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientId, IntraTick);
 	}
 
 	vec2 Direction = direction(Angle);
 	vec2 Position;
-	if(in_range(ClientID, MAX_CLIENTS - 1))
-		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	if(in_range(ClientId, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientId].m_RenderPos;
 	else
 		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
 	// draw hook collision line
 	{
+		bool Aim = (Player.m_PlayerFlags & PLAYERFLAG_AIM);
+		if(!Client()->ServerCapAnyPlayerFlag())
+		{
+			for(int i = 0; i < NUM_DUMMIES; i++)
+			{
+				if(ClientId == m_pClient->m_aLocalIds[i])
+				{
+					Aim = GameClient()->m_Controls.m_aShowHookColl[i];
+					break;
+				}
+			}
+		}
+
 		bool AlwaysRenderHookColl = GameClient()->m_GameInfo.m_AllowHookColl && (Local ? g_Config.m_ClShowHookCollOwn : g_Config.m_ClShowHookCollOther) == 2;
-		bool RenderHookCollPlayer = ClientID >= 0 && Player.m_PlayerFlags & PLAYERFLAG_AIM && (Local ? g_Config.m_ClShowHookCollOwn : g_Config.m_ClShowHookCollOther) > 0;
+		bool RenderHookCollPlayer = ClientId >= 0 && Aim && (Local ? g_Config.m_ClShowHookCollOwn : g_Config.m_ClShowHookCollOther) > 0;
 		if(Local && GameClient()->m_GameInfo.m_AllowHookColl && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 			RenderHookCollPlayer = GameClient()->m_Controls.m_aShowHookColl[g_Config.m_ClDummy] && g_Config.m_ClShowHookCollOwn > 0;
 
@@ -166,9 +230,11 @@ void CPlayers::RenderHookCollLine(
 		{
 			vec2 ExDirection = Direction;
 
-			if(Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+			if(Local && (!m_pClient->m_Snap.m_SpecInfo.m_Active || m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 			{
-				ExDirection = normalize(vec2((int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].x, (int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].y));
+				ExDirection = normalize(
+					vec2((int)((int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].x * m_pClient->m_Camera.m_Zoom),
+						(int)((int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].y * m_pClient->m_Camera.m_Zoom)));
 
 				// fix direction if mouse is exactly in the center
 				if(!(int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].x && !(int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].y)
@@ -211,7 +277,7 @@ void CPlayers::RenderHookCollLine(
 					}
 				}
 
-				if(m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientID) != -1)
+				if(ClientId >= 0 && m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientId) != -1)
 				{
 					HookCollColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClHookCollColorTeeColl));
 					break;
@@ -261,7 +327,7 @@ void CPlayers::RenderHook(
 	const CNetObj_Character *pPrevChar,
 	const CNetObj_Character *pPlayerChar,
 	const CTeeRenderInfo *pRenderInfo,
-	int ClientID,
+	int ClientId,
 	float Intra)
 {
 	CNetObj_Character Prev;
@@ -276,19 +342,19 @@ void CPlayers::RenderHook(
 		return;
 
 	float IntraTick = Intra;
-	if(ClientID >= 0)
-		IntraTick = (m_pClient->m_aClients[ClientID].m_IsPredicted) ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+	if(ClientId >= 0)
+		IntraTick = (m_pClient->m_aClients[ClientId].m_IsPredicted) ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
 
-	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
-	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
-	if(ClientID == -2) // ghost
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientId);
+	float Alpha = (OtherTeam || ClientId < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	if(ClientId == -2) // ghost
 		Alpha = g_Config.m_ClRaceGhostAlpha / 100.0f;
 
 	RenderInfo.m_Size = 64.0f;
 
 	vec2 Position;
-	if(in_range(ClientID, MAX_CLIENTS - 1))
-		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	if(in_range(ClientId, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientId].m_RenderPos;
 	else
 		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
 
@@ -296,7 +362,7 @@ void CPlayers::RenderHook(
 	if(Prev.m_HookState > 0 && Player.m_HookState > 0)
 	{
 		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
-		if(ClientID < 0)
+		if(ClientId < 0)
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
 
 		vec2 Pos = Position;
@@ -314,19 +380,7 @@ void CPlayers::RenderHook(
 		Graphics()->QuadsSetRotation(angle(Dir) + pi);
 		// render head
 		int QuadOffset = NUM_WEAPONS * 2 + 2;
-		if(g_Config.m_ClRainbowHook == 0){
-
-			Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
-		}
-		else
-		{
-			ColorHSVA ColorHSV(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f);
-			ColorRGBA ColorWithAlpha = color_cast<ColorRGBA>(ColorHSV);
-			ColorWithAlpha.a = Alpha;
-
-			Graphics()->SetColor(ColorWithAlpha);
-
-		}
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
 		Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, HookPos.x, HookPos.y);
 
 		// render chain
@@ -355,7 +409,7 @@ void CPlayers::RenderPlayer(
 	const CNetObj_Character *pPrevChar,
 	const CNetObj_Character *pPlayerChar,
 	const CTeeRenderInfo *pRenderInfo,
-	int ClientID,
+	int ClientId,
 	float Intra)
 {
 	CNetObj_Character Prev;
@@ -365,18 +419,18 @@ void CPlayers::RenderPlayer(
 
 	CTeeRenderInfo RenderInfo = *pRenderInfo;
 
-	bool Local = m_pClient->m_Snap.m_LocalClientID == ClientID;
-	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
-	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
-	if(ClientID == -2) // ghost
+	bool Local = m_pClient->m_Snap.m_LocalClientId == ClientId;
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientId);
+	float Alpha = (OtherTeam || ClientId < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	if(ClientId == -2) // ghost
 		Alpha = g_Config.m_ClRaceGhostAlpha / 100.0f;
 
 	// set size
 	RenderInfo.m_Size = 64.0f;
 
 	float IntraTick = Intra;
-	if(ClientID >= 0)
-		IntraTick = m_pClient->m_aClients[ClientID].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+	if(ClientId >= 0)
+		IntraTick = m_pClient->m_aClients[ClientId].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
 
 	static float s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
 	static float s_LastPredIntraTick = Client()->PredIntraGameTick(g_Config.m_ClDummy);
@@ -389,7 +443,7 @@ void CPlayers::RenderPlayer(
 	bool PredictLocalWeapons = false;
 	float AttackTime = (Client()->PrevGameTick(g_Config.m_ClDummy) - Player.m_AttackTick) / (float)Client()->GameTickSpeed() + Client()->GameTickTime(g_Config.m_ClDummy);
 	float LastAttackTime = (Client()->PrevGameTick(g_Config.m_ClDummy) - Player.m_AttackTick) / (float)Client()->GameTickSpeed() + s_LastGameTickTime;
-	if(ClientID >= 0 && m_pClient->m_aClients[ClientID].m_IsPredictedLocal && m_pClient->AntiPingGunfire())
+	if(ClientId >= 0 && m_pClient->m_aClients[ClientId].m_IsPredictedLocal && m_pClient->AntiPingGunfire())
 	{
 		PredictLocalWeapons = true;
 		AttackTime = (Client()->PredIntraGameTick(g_Config.m_ClDummy) + (Client()->PredGameTick(g_Config.m_ClDummy) - 1 - Player.m_AttackTick)) / (float)Client()->GameTickSpeed();
@@ -398,27 +452,27 @@ void CPlayers::RenderPlayer(
 	float AttackTicksPassed = AttackTime * (float)Client()->GameTickSpeed();
 
 	float Angle;
-	if(Local && (!m_pClient->m_Snap.m_SpecInfo.m_Active || m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	if(Local && (!m_pClient->m_Snap.m_SpecInfo.m_Active || m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		// just use the direct input if it's the local player we are rendering
-		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy]);
+		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] * m_pClient->m_Camera.m_Zoom);
 	}
 	else
 	{
-		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientID, IntraTick);
+		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientId, IntraTick);
 	}
 
 	vec2 Direction = direction(Angle);
 	vec2 Position;
-	if(in_range(ClientID, MAX_CLIENTS - 1))
-		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	if(in_range(ClientId, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientId].m_RenderPos;
 	else
 		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
 	vec2 Vel = mix(vec2(Prev.m_VelX / 256.0f, Prev.m_VelY / 256.0f), vec2(Player.m_VelX / 256.0f, Player.m_VelY / 256.0f), IntraTick);
 
 	m_pClient->m_Flow.Add(Position, Vel * 100.0f, 10.0f);
 
-	RenderInfo.m_GotAirJump = (Player.m_Jumped & 2) == 0;
+	RenderInfo.m_GotAirJump = Player.m_Jumped & 2 ? false : true;
 
 	RenderInfo.m_FeetFlipped = false;
 
@@ -426,7 +480,7 @@ void CPlayers::RenderPlayer(
 	bool InAir = !Collision()->CheckPoint(Player.m_X, Player.m_Y + 16);
 	bool Running = Player.m_VelX >= 5000 || Player.m_VelX <= -5000;
 	bool WantOtherDir = (Player.m_Direction == -1 && Vel.x > 0) || (Player.m_Direction == 1 && Vel.x < 0);
-	bool Inactive = m_pClient->m_aClients[ClientID].m_Afk || m_pClient->m_aClients[ClientID].m_Paused;
+	bool Inactive = ClientId >= 0 && (m_pClient->m_aClients[ClientId].m_Afk || m_pClient->m_aClients[ClientId].m_Paused);
 
 	// evaluate animation
 	float WalkTime = std::fmod(Position.x, 100.0f) / 100.0f;
@@ -461,26 +515,19 @@ void CPlayers::RenderPlayer(
 			State.Add(&g_pData->m_aAnimations[ANIM_WALK], WalkTime, 1.0f);
 	}
 
-	int CurrentWeapon = clamp(Player.m_Weapon, 0, NUM_WEAPONS - 1);
-	if(m_pClient->m_aClients[ClientID].m_FreezeEnd)
-	{
-		CurrentWeapon = WEAPON_NINJA;
-	}
-
-	if(CurrentWeapon == WEAPON_HAMMER)
+	if(Player.m_Weapon == WEAPON_HAMMER)
 		State.Add(&g_pData->m_aAnimations[ANIM_HAMMER_SWING], clamp(LastAttackTime * 5.0f, 0.0f, 1.0f), 1.0f);
-	if(CurrentWeapon == WEAPON_NINJA)
+	if(Player.m_Weapon == WEAPON_NINJA)
 		State.Add(&g_pData->m_aAnimations[ANIM_NINJA_SWING], clamp(LastAttackTime * 2.0f, 0.0f, 1.0f), 1.0f);
 
 	// do skidding
 	if(!InAir && WantOtherDir && length(Vel * 50) > 500.0f)
 	{
-		static int64_t SkidSoundTime = 0;
-		if(time() - SkidSoundTime > time_freq() / 10)
+		if(time() - m_SkidSoundTime > time_freq() / 10)
 		{
 			if(g_Config.m_SndGame)
-				m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_SKID, 0.25f, Position);
-			SkidSoundTime = time();
+				m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_SKID, 1.0f, Position);
+			m_SkidSoundTime = time();
 		}
 
 		m_pClient->m_Effects.SkidTrail(
@@ -489,36 +536,18 @@ void CPlayers::RenderPlayer(
 			Alpha);
 	}
 
-	// rainbow
-
-	bool IsRainbowBody = g_Config.m_ClRainbow,
-	     IsRainbowFeet = g_Config.m_ClRainbow;
-
-	if(g_Config.m_ClRainbow == 1 && (m_pClient->m_Snap.m_LocalClientID == ClientID) == 1)
-	{
-		IsRainbowBody = true;
-		IsRainbowFeet = true;
-	}
-	else
-	{
-		IsRainbowBody = false;
-		IsRainbowFeet = false;
-	}
-
 	// draw gun
 	{
-		static vec2 s_aGunPositions[MAX_CLIENTS];
-
 		if(!(RenderInfo.m_TeeRenderFlags & TEE_NO_WEAPON))
 		{
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 			Graphics()->QuadsSetRotation(State.GetAttach()->m_Angle * pi * 2 + Angle);
 
-			if(ClientID < 0)
+			if(ClientId < 0)
 				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
 
 			// normal weapons
-
+			int CurrentWeapon = clamp(Player.m_Weapon, 0, NUM_WEAPONS - 1);
 			Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[CurrentWeapon]);
 			int QuadOffset = CurrentWeapon * 2 + (Direction.x < 0 ? 1 : 0);
 
@@ -529,7 +558,7 @@ void CPlayers::RenderPlayer(
 			vec2 WeaponPosition;
 			bool IsSit = Inactive && !InAir && Stationary;
 
-			if(CurrentWeapon == WEAPON_HAMMER)
+			if(Player.m_Weapon == WEAPON_HAMMER)
 			{
 				// static position for hammer
 				WeaponPosition = Position + vec2(State.GetAttach()->m_X, State.GetAttach()->m_Y);
@@ -539,10 +568,6 @@ void CPlayers::RenderPlayer(
 				if(IsSit)
 					WeaponPosition.y += 3.0f;
 
-				if(s_aGunPositions[ClientID] != vec2())
-					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimHammerSpeed);
-				s_aGunPositions[ClientID] = WeaponPosition;
-
 				// if active and attack is under way, bash stuffs
 				if(!Inactive || LastAttackTime < m_pClient->m_aTuning[g_Config.m_ClDummy].GetWeaponFireDelay(Player.m_Weapon))
 				{
@@ -556,7 +581,7 @@ void CPlayers::RenderPlayer(
 
 				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
 			}
-			else if(CurrentWeapon == WEAPON_NINJA)
+			else if(Player.m_Weapon == WEAPON_NINJA)
 			{
 				WeaponPosition = Position;
 				WeaponPosition.y += g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsety;
@@ -574,14 +599,9 @@ void CPlayers::RenderPlayer(
 					Graphics()->QuadsSetRotation(-pi / 2 + State.GetAttach()->m_Angle * pi * 2);
 					m_pClient->m_Effects.PowerupShine(WeaponPosition - vec2(32, 0), vec2(32, 12), Alpha);
 				}
-
-				if(s_aGunPositions[ClientID] != vec2())
-					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimNinjaSpeed);
-				s_aGunPositions[ClientID] = WeaponPosition;
-
 				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
 
-				// NO HADOKEN ;(
+				// HADOKEN
 				if(AttackTime <= 1 / 6.f && g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles)
 				{
 					int IteX = rand() % g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles;
@@ -603,10 +623,10 @@ void CPlayers::RenderPlayer(
 					}
 					if(g_pData->m_Weapons.m_aId[CurrentWeapon].m_aSpriteMuzzles[IteX])
 					{
-						if(PredictLocalWeapons)
+						if(PredictLocalWeapons || ClientId < 0)
 							Dir = vec2(pPlayerChar->m_X, pPlayerChar->m_Y) - vec2(pPrevChar->m_X, pPrevChar->m_Y);
 						else
-							Dir = vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_Y) - vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_Y);
+							Dir = vec2(m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur.m_Y) - vec2(m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev.m_Y);
 						float HadOkenAngle = 0;
 						if(absolute(Dir.x) > 0.0001f || absolute(Dir.y) > 0.0001f)
 						{
@@ -641,15 +661,10 @@ void CPlayers::RenderPlayer(
 					WeaponPosition.y += 3.0f;
 				if(Player.m_Weapon == WEAPON_GUN && g_Config.m_ClOldGunPosition)
 					WeaponPosition.y -= 8;
-
-				if(s_aGunPositions[ClientID] != vec2())
-					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimGunsSpeed);
-				s_aGunPositions[ClientID] = WeaponPosition;
-
 				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
 			}
 
-			if(CurrentWeapon == WEAPON_GUN || Player.m_Weapon == WEAPON_SHOTGUN)
+			if(Player.m_Weapon == WEAPON_GUN || Player.m_Weapon == WEAPON_SHOTGUN)
 			{
 				// check if we're firing stuff
 				if(g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles) // prev.attackticks)
@@ -692,13 +707,9 @@ void CPlayers::RenderPlayer(
 					}
 				}
 			}
-
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 			Graphics()->QuadsSetRotation(0);
 
-			if(IsRainbowBody)
-				RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 20.f) % 255 / 255.f, 1.f, 1.f));
-
 			switch(Player.m_Weapon)
 			{
 			case WEAPON_GUN: RenderHand(&RenderInfo, WeaponPosition, Direction, -3 * pi / 4, vec2(-15, 4), Alpha); break;
@@ -712,33 +723,31 @@ void CPlayers::RenderPlayer(
 	if(Local && ((g_Config.m_Debug && g_Config.m_ClUnpredictedShadow >= 0) || g_Config.m_ClUnpredictedShadow == 1))
 	{
 		vec2 ShadowPosition = Position;
-		if(ClientID >= 0)
+		if(ClientId >= 0)
 			ShadowPosition = mix(
-				vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_Y),
-				vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_Y),
+				vec2(m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientId].m_Prev.m_Y),
+				vec2(m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientId].m_Cur.m_Y),
 				Client()->IntraGameTick(g_Config.m_ClDummy));
 
 		CTeeRenderInfo Shadow = RenderInfo;
 		RenderTools()->RenderTee(&State, &Shadow, Player.m_Emote, Direction, ShadowPosition, 0.5f); // render ghost
 	}
 
-	if(IsRainbowBody)
-		RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f));
-	if(IsRainbowFeet)
-		RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f));
-
-	RenderTools()->RenderTee(&State, &RenderInfo, Player.m_Emote, Direction, Position, Alpha, true, ClientID, InAir);
+	RenderTools()->RenderTee(&State, &RenderInfo, Player.m_Emote, Direction, Position, Alpha);
 
 	float TeeAnimScale, TeeBaseSize;
-	RenderTools()->GetRenderTeeAnimScaleAndBaseSize(&RenderInfo, TeeAnimScale, TeeBaseSize);
+	CRenderTools::GetRenderTeeAnimScaleAndBaseSize(&RenderInfo, TeeAnimScale, TeeBaseSize);
 	vec2 BodyPos = Position + vec2(State.GetBody()->m_X, State.GetBody()->m_Y) * TeeAnimScale;
 	if(RenderInfo.m_TeeRenderFlags & TEE_EFFECT_FROZEN)
 	{
 		GameClient()->m_Effects.FreezingFlakes(BodyPos, vec2(32, 32), Alpha);
 	}
 
+	if(ClientId < 0)
+		return;
+
 	int QuadOffsetToEmoticon = NUM_WEAPONS * 2 + 2 + 2;
-	if((Player.m_PlayerFlags & PLAYERFLAG_CHATTING) && !m_pClient->m_aClients[ClientID].m_Afk)
+	if((Player.m_PlayerFlags & PLAYERFLAG_CHATTING) && !m_pClient->m_aClients[ClientId].m_Afk)
 	{
 		int CurEmoticon = (SPRITE_DOTDOT - SPRITE_OOP);
 		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[CurEmoticon]);
@@ -750,10 +759,7 @@ void CPlayers::RenderPlayer(
 		Graphics()->QuadsSetRotation(0);
 	}
 
-	if(ClientID < 0)
-		return;
-
-	if(g_Config.m_ClAfkEmote && m_pClient->m_aClients[ClientID].m_Afk && !(Client()->DummyConnected() && ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy]))
+	if(g_Config.m_ClAfkEmote && m_pClient->m_aClients[ClientId].m_Afk && !(Client()->DummyConnected() && ClientId == m_pClient->m_aLocalIds[!g_Config.m_ClDummy]))
 	{
 		int CurEmoticon = (SPRITE_ZZZ - SPRITE_OOP);
 		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[CurEmoticon]);
@@ -765,9 +771,9 @@ void CPlayers::RenderPlayer(
 		Graphics()->QuadsSetRotation(0);
 	}
 
-	if(g_Config.m_ClShowEmotes && !m_pClient->m_aClients[ClientID].m_EmoticonIgnore && m_pClient->m_aClients[ClientID].m_EmoticonStartTick != -1)
+	if(g_Config.m_ClShowEmotes && !m_pClient->m_aClients[ClientId].m_EmoticonIgnore && m_pClient->m_aClients[ClientId].m_EmoticonStartTick != -1)
 	{
-		float SinceStart = (Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientID].m_EmoticonStartTick) + (Client()->IntraGameTickSincePrev(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientID].m_EmoticonStartFraction);
+		float SinceStart = (Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientId].m_EmoticonStartTick) + (Client()->IntraGameTickSincePrev(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientId].m_EmoticonStartFraction);
 		float FromEnd = (2 * Client()->GameTickSpeed()) - SinceStart;
 
 		if(0 <= SinceStart && FromEnd > 0)
@@ -791,8 +797,8 @@ void CPlayers::RenderPlayer(
 
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, a * Alpha);
 			// client_datas::emoticon is an offset from the first emoticon
-			int QuadOffset = QuadOffsetToEmoticon + m_pClient->m_aClients[ClientID].m_Emoticon;
-			Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[m_pClient->m_aClients[ClientID].m_Emoticon]);
+			int QuadOffset = QuadOffsetToEmoticon + m_pClient->m_aClients[ClientId].m_Emoticon;
+			Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[m_pClient->m_aClients[ClientId].m_Emoticon]);
 			Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, Position.x, Position.y - 23.f - 32.f * h, 1.f, (64.f * h) / 64.f);
 
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
@@ -801,15 +807,18 @@ void CPlayers::RenderPlayer(
 	}
 }
 
-inline bool CPlayers::IsPlayerInfoAvailable(int ClientID) const
+inline bool CPlayers::IsPlayerInfoAvailable(int ClientId) const
 {
-	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientID);
-	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientID);
+	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientId);
+	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientId);
 	return pPrevInfo && pInfo;
 }
 
 void CPlayers::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	CTeeRenderInfo aRenderInfo[MAX_CLIENTS];
 
 	// update RenderInfo for ninja
@@ -819,41 +828,23 @@ void CPlayers::OnRender()
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
 		aRenderInfo[i] = m_pClient->m_aClients[i].m_RenderInfo;
-		//aRenderInfo[i].m_ShineDecoration = m_pClient->m_aClients[i].m_LiveFrozen;
-
 		aRenderInfo[i].m_TeeRenderFlags = 0;
-
-		CGameClient::CSnapState::CCharacterInfo &CharacterInfo = m_pClient->m_Snap.m_aCharacters[i];
-		const bool Frozen = CharacterInfo.m_HasExtendedData && CharacterInfo.m_ExtendedData.m_FreezeEnd != 0;
-		if(g_Config.m_ClOldFreezeMode == 1)
-		{
-			if(m_pClient->m_aClients[i].m_FreezeEnd != 0)
-			{
-				aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN;
-			}
-		}
-		else
-		{
-			if(m_pClient->m_aClients[i].m_FreezeEnd != 0)
-			{
-				aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN | TEE_NO_WEAPON;
-			}
-		}
+		if(m_pClient->m_aClients[i].m_FreezeEnd != 0)
+			aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN | TEE_NO_WEAPON;
 		if(m_pClient->m_aClients[i].m_LiveFrozen)
-		{
 			aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN;
-		}
 
+		const CGameClient::CSnapState::CCharacterInfo &CharacterInfo = m_pClient->m_Snap.m_aCharacters[i];
+		const bool Frozen = CharacterInfo.m_HasExtendedData && CharacterInfo.m_ExtendedData.m_FreezeEnd != 0;
 		if((CharacterInfo.m_Cur.m_Weapon == WEAPON_NINJA || (Frozen && !m_pClient->m_GameInfo.m_NoSkinChangeForFrozen)) && g_Config.m_ClShowNinja)
 		{
 			// change the skin for the player to the ninja
 			const auto *pSkin = m_pClient->m_Skins.FindOrNullptr("x_ninja");
 			if(pSkin != nullptr)
 			{
-				aRenderInfo[i].m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-				aRenderInfo[i].m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-				aRenderInfo[i].m_BloodColor = pSkin->m_BloodColor;
-				aRenderInfo[i].m_SkinMetrics = pSkin->m_Metrics;
+				aRenderInfo[i].m_aSixup[g_Config.m_ClDummy].Reset();
+
+				aRenderInfo[i].Apply(pSkin);
 				aRenderInfo[i].m_CustomColoredSkin = IsTeamplay;
 				if(!IsTeamplay)
 				{
@@ -863,16 +854,11 @@ void CPlayers::OnRender()
 			}
 		}
 	}
-
-	const CSkin *pSkin = m_pClient->m_Skins.Find("x_spec");
 	CTeeRenderInfo RenderInfoSpec;
-	RenderInfoSpec.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-	RenderInfoSpec.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-	RenderInfoSpec.m_BloodColor = pSkin->m_BloodColor;
-	RenderInfoSpec.m_SkinMetrics = pSkin->m_Metrics;
+	RenderInfoSpec.Apply(m_pClient->m_Skins.Find("x_spec"));
 	RenderInfoSpec.m_CustomColoredSkin = false;
 	RenderInfoSpec.m_Size = 64.0f;
-	const int LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+	const int LocalClientId = m_pClient->m_Snap.m_LocalClientId;
 
 	// get screen edges to avoid rendering offscreen
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
@@ -888,56 +874,55 @@ void CPlayers::OnRender()
 	ScreenY1 += BorderBuffer;
 
 	// render everyone else's hook, then our own
-	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 	{
-		if(ClientID == LocalClientID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		if(ClientId == LocalClientId || !m_pClient->m_Snap.m_aCharacters[ClientId].m_Active || !IsPlayerInfoAvailable(ClientId))
 		{
 			continue;
 		}
-
-		RenderHook(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, &aRenderInfo[ClientID], ClientID);
+		RenderHook(&m_pClient->m_aClients[ClientId].m_RenderPrev, &m_pClient->m_aClients[ClientId].m_RenderCur, &aRenderInfo[ClientId], ClientId);
 	}
-	if(LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientID].m_Active && IsPlayerInfoAvailable(LocalClientID))
+	if(LocalClientId != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientId].m_Active && IsPlayerInfoAvailable(LocalClientId))
 	{
-		const CGameClient::CClientData *pLocalClientData = &m_pClient->m_aClients[LocalClientID];
-		RenderHook(&pLocalClientData->m_RenderPrev, &pLocalClientData->m_RenderCur, &aRenderInfo[LocalClientID], LocalClientID);
+		const CGameClient::CClientData *pLocalClientData = &m_pClient->m_aClients[LocalClientId];
+		RenderHook(&pLocalClientData->m_RenderPrev, &pLocalClientData->m_RenderCur, &aRenderInfo[LocalClientId], LocalClientId);
 	}
 
 	// render spectating players
-	for(auto &m_aClient : m_pClient->m_aClients)
+	for(auto &Client : m_pClient->m_aClients)
 	{
-		if(!m_aClient.m_SpecCharPresent)
+		if(!Client.m_SpecCharPresent)
 		{
 			continue;
 		}
-		RenderTools()->RenderTee(CAnimState::GetIdle(), &RenderInfoSpec, EMOTE_BLINK, vec2(1, 0), m_aClient.m_SpecChar);
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &RenderInfoSpec, EMOTE_BLINK, vec2(1, 0), Client.m_SpecChar);
 	}
 
 	// render everyone else's tee, then either our own or the tee we are spectating.
-	const int RenderLastID = (m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW && m_pClient->m_Snap.m_SpecInfo.m_Active) ? m_pClient->m_Snap.m_SpecInfo.m_SpectatorID : LocalClientID;
+	const int RenderLastId = (m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW && m_pClient->m_Snap.m_SpecInfo.m_Active) ? m_pClient->m_Snap.m_SpecInfo.m_SpectatorId : LocalClientId;
 
-	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 	{
-		if(ClientID == RenderLastID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		if(ClientId == RenderLastId || !m_pClient->m_Snap.m_aCharacters[ClientId].m_Active || !IsPlayerInfoAvailable(ClientId))
 		{
 			continue;
 		}
 
-		RenderHookCollLine(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, ClientID);
+		RenderHookCollLine(&m_pClient->m_aClients[ClientId].m_RenderPrev, &m_pClient->m_aClients[ClientId].m_RenderCur, ClientId);
 
 		// don't render offscreen
-		vec2 *pRenderPos = &m_pClient->m_aClients[ClientID].m_RenderPos;
+		vec2 *pRenderPos = &m_pClient->m_aClients[ClientId].m_RenderPos;
 		if(pRenderPos->x < ScreenX0 || pRenderPos->x > ScreenX1 || pRenderPos->y < ScreenY0 || pRenderPos->y > ScreenY1)
 		{
 			continue;
 		}
-		RenderPlayer(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, &aRenderInfo[ClientID], ClientID);
+		RenderPlayer(&m_pClient->m_aClients[ClientId].m_RenderPrev, &m_pClient->m_aClients[ClientId].m_RenderCur, &aRenderInfo[ClientId], ClientId);
 	}
-	if(RenderLastID != -1 && m_pClient->m_Snap.m_aCharacters[RenderLastID].m_Active && IsPlayerInfoAvailable(RenderLastID))
+	if(RenderLastId != -1 && m_pClient->m_Snap.m_aCharacters[RenderLastId].m_Active && IsPlayerInfoAvailable(RenderLastId))
 	{
-		const CGameClient::CClientData *pClientData = &m_pClient->m_aClients[RenderLastID];
-		RenderHookCollLine(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, RenderLastID);
-		RenderPlayer(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, &aRenderInfo[RenderLastID], RenderLastID);
+		const CGameClient::CClientData *pClientData = &m_pClient->m_aClients[RenderLastId];
+		RenderHookCollLine(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, RenderLastId);
+		RenderPlayer(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, &aRenderInfo[RenderLastId], RenderLastId);
 	}
 }
 
@@ -1012,4 +997,4 @@ void CPlayers::OnInit()
 
 	Graphics()->QuadsSetSubset(0.f, 0.f, 1.f, 1.f);
 	Graphics()->QuadsSetRotation(0.f);
-}
\ No newline at end of file
+}
diff --git a/src/game/client/components/players.h b/src/game/client/components/players.h
index 00c66d6ae3..b20df35185 100644
--- a/src/game/client/components/players.h
+++ b/src/game/client/components/players.h
@@ -11,34 +11,39 @@ class CPlayers : public CComponent
 {
 	friend class CGhost;
 
+	void RenderHand6(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha = 1.0f);
+	void RenderHand7(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha = 1.0f);
+
 	void RenderHand(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha = 1.0f);
 	void RenderPlayer(
 		const CNetObj_Character *pPrevChar,
 		const CNetObj_Character *pPlayerChar,
 		const CTeeRenderInfo *pRenderInfo,
-		int ClientID,
+		int ClientId,
 		float Intra = 0.f);
 	void RenderHook(
 		const CNetObj_Character *pPrevChar,
 		const CNetObj_Character *pPlayerChar,
 		const CTeeRenderInfo *pRenderInfo,
-		int ClientID,
+		int ClientId,
 		float Intra = 0.f);
 	void RenderHookCollLine(
 		const CNetObj_Character *pPrevChar,
 		const CNetObj_Character *pPlayerChar,
-		int ClientID,
+		int ClientId,
 		float Intra = 0.f);
-	bool IsPlayerInfoAvailable(int ClientID) const;
+	bool IsPlayerInfoAvailable(int ClientId) const;
 
 	int m_WeaponEmoteQuadContainerIndex;
 	int m_aWeaponSpriteMuzzleQuadContainerIndex[NUM_WEAPONS];
 
+	int64_t m_SkidSoundTime = 0;
+
 public:
 	float GetPlayerTargetAngle(
 		const CNetObj_Character *pPrevChar,
 		const CNetObj_Character *pPlayerChar,
-		int ClientID,
+		int ClientId,
 		float Intra = 0.f);
 
 	virtual int Sizeof() const override { return sizeof(*this); }
diff --git a/src/game/client/components/race_demo.cpp b/src/game/client/components/race_demo.cpp
index 4f57bc5b45..d1de5ef46a 100644
--- a/src/game/client/components/race_demo.cpp
+++ b/src/game/client/components/race_demo.cpp
@@ -29,7 +29,7 @@ struct CDemoListParam
 {
 	const CRaceDemo *m_pThis;
 	std::vector<CDemoItem> *m_pvDemos;
-	const char *pMap;
+	const char *m_pMap;
 };
 
 CRaceDemo::CRaceDemo() :
@@ -79,7 +79,7 @@ void CRaceDemo::OnNewSnapshot()
 		vec2 PrevPos = vec2(m_pClient->m_Snap.m_pLocalPrevCharacter->m_X, m_pClient->m_Snap.m_pLocalPrevCharacter->m_Y);
 		vec2 Pos = vec2(m_pClient->m_Snap.m_pLocalCharacter->m_X, m_pClient->m_Snap.m_pLocalCharacter->m_Y);
 
-		if(ForceStart || (!ServerControl && CRaceHelper::IsStart(m_pClient, PrevPos, Pos)))
+		if(ForceStart || (!ServerControl && GameClient()->RaceHelper()->IsStart(PrevPos, Pos)))
 		{
 			if(m_RaceState == RACE_STARTED)
 				Client()->RaceRecord_Stop();
@@ -132,7 +132,7 @@ void CRaceDemo::OnMessage(int MsgType, void *pRawMsg)
 	if(MsgType == NETMSGTYPE_SV_KILLMSG)
 	{
 		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
-		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientID && Client()->RaceRecord_IsRecording())
+		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientId && Client()->RaceRecord_IsRecording())
 			StopRecord(m_Time);
 	}
 	else if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM)
@@ -140,18 +140,18 @@ void CRaceDemo::OnMessage(int MsgType, void *pRawMsg)
 		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientID && Client()->RaceRecord_IsRecording())
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientId && Client()->RaceRecord_IsRecording())
 				StopRecord(m_Time);
 		}
 	}
 	else if(MsgType == NETMSGTYPE_SV_CHAT)
 	{
 		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
-		if(pMsg->m_ClientID == -1 && m_RaceState == RACE_STARTED)
+		if(pMsg->m_ClientId == -1 && m_RaceState == RACE_STARTED)
 		{
 			char aName[MAX_NAME_LENGTH];
 			int Time = CRaceHelper::TimeFromFinishMessage(pMsg->m_pMessage, aName, sizeof(aName));
-			if(Time > 0 && m_pClient->m_Snap.m_LocalClientID >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName) == 0)
+			if(Time > 0 && m_pClient->m_Snap.m_LocalClientId >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientId].m_aName) == 0)
 			{
 				m_RaceState = RACE_FINISHED;
 				m_RecordStopTick = Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed();
@@ -203,8 +203,8 @@ int CRaceDemo::RaceDemolistFetchCallback(const CFsFileInfo *pInfo, int IsDir, in
 {
 	auto *pRealUser = (SRaceDemoFetchUser *)pUser;
 	auto *pParam = pRealUser->m_pParam;
-	int MapLen = str_length(pParam->pMap);
-	if(IsDir || !str_endswith(pInfo->m_pName, ".demo") || !str_startswith(pInfo->m_pName, pParam->pMap) || pInfo->m_pName[MapLen] != '_')
+	int MapLen = str_length(pParam->m_pMap);
+	if(IsDir || !str_endswith(pInfo->m_pName, ".demo") || !str_startswith(pInfo->m_pName, pParam->m_pMap) || pInfo->m_pName[MapLen] != '_')
 		return 0;
 
 	CDemoItem Item;
diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp
index 6be6adadbb..33d2fd4527 100644
--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@@ -1,9 +1,12 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "scoreboard.h"
+
 #include <engine/demo.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>
+
 #include <game/generated/protocol.h>
 
 #include <game/client/animstate.h>
@@ -12,11 +15,10 @@
 #include <game/client/components/statboard.h>
 #include <game/client/gameclient.h>
 #include <game/client/render.h>
-
+#include <game/client/ui.h>
+#include <game/generated/client_data7.h>
 #include <game/localization.h>
 
-#include "scoreboard.h"
-
 CScoreboard::CScoreboard()
 {
 	OnReset();
@@ -24,10 +26,15 @@ CScoreboard::CScoreboard()
 
 void CScoreboard::ConKeyScoreboard(IConsole::IResult *pResult, void *pUserData)
 {
-	CScoreboard *pSelf = (CScoreboard *)pUserData;
+	CScoreboard *pSelf = static_cast<CScoreboard *>(pUserData);
 	pSelf->m_Active = pResult->GetInteger(0) != 0;
 }
 
+void CScoreboard::OnConsoleInit()
+{
+	Console()->Register("+scoreboard", "", CFGFLAG_CLIENT, ConKeyScoreboard, this, "Show scoreboard");
+}
+
 void CScoreboard::OnReset()
 {
 	m_Active = false;
@@ -41,216 +48,241 @@ void CScoreboard::OnRelease()
 
 void CScoreboard::OnMessage(int MsgType, void *pRawMsg)
 {
-	if(MsgType == NETMSGTYPE_SV_RECORD || MsgType == NETMSGTYPE_SV_RECORDLEGACY)
+	if(MsgType == NETMSGTYPE_SV_RECORD)
 	{
-		CNetMsg_Sv_Record *pMsg = (CNetMsg_Sv_Record *)pRawMsg;
-		m_ServerRecord = (float)pMsg->m_ServerTimeBest / 100;
+		CNetMsg_Sv_Record *pMsg = static_cast<CNetMsg_Sv_Record *>(pRawMsg);
+		m_ServerRecord = pMsg->m_ServerTimeBest / 100.0f;
+	}
+	else if(MsgType == NETMSGTYPE_SV_RECORDLEGACY)
+	{
+		CNetMsg_Sv_RecordLegacy *pMsg = static_cast<CNetMsg_Sv_RecordLegacy *>(pRawMsg);
+		m_ServerRecord = pMsg->m_ServerTimeBest / 100.0f;
 	}
 }
 
-void CScoreboard::OnConsoleInit()
-{
-	Console()->Register("+scoreboard", "", CFGFLAG_CLIENT, ConKeyScoreboard, this, "Show scoreboard");
-}
-
-void CScoreboard::RenderGoals(float x, float y, float w)
+void CScoreboard::RenderTitle(CUIRect TitleBar, int Team, const char *pTitle)
 {
-	float h = 50.0f;
+	dbg_assert(Team == TEAM_RED || Team == TEAM_BLUE, "Team invalid");
 
-	Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 10.0f);
+	const CNetObj_GameInfo *pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
 
-	// render goals
-	if(m_pClient->m_Snap.m_pGameInfoObj)
+	char aScore[128] = "";
+	if(GameClient()->m_GameInfo.m_TimeScore)
+	{
+		if(m_ServerRecord > 0)
+		{
+			str_time_float(m_ServerRecord, TIME_HOURS, aScore, sizeof(aScore));
+		}
+	}
+	else if(pGameInfoObj && (pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS))
 	{
-		if(m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit)
+		const CNetObj_GameData *pGameDataObj = GameClient()->m_Snap.m_pGameDataObj;
+		if(pGameDataObj)
 		{
-			char aBuf[64];
-			str_format(aBuf, sizeof(aBuf), "%s: %d", Localize("Score limit"), m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit);
-			TextRender()->Text(x + 10.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+			str_format(aScore, sizeof(aScore), "%d", Team == TEAM_RED ? pGameDataObj->m_TeamscoreRed : pGameDataObj->m_TeamscoreBlue);
 		}
-		if(m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit)
+	}
+	else
+	{
+		if(GameClient()->m_Snap.m_SpecInfo.m_Active &&
+			GameClient()->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW &&
+			GameClient()->m_Snap.m_apPlayerInfos[GameClient()->m_Snap.m_SpecInfo.m_SpectatorId])
 		{
-			char aBuf[64];
-			str_format(aBuf, sizeof(aBuf), Localize("Time limit: %d min"), m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit);
-			TextRender()->Text(x + 230.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+			str_format(aScore, sizeof(aScore), "%d", GameClient()->m_Snap.m_apPlayerInfos[GameClient()->m_Snap.m_SpecInfo.m_SpectatorId]->m_Score);
 		}
-		if(m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum && m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent)
+		else if(GameClient()->m_Snap.m_pLocalInfo)
 		{
-			char aBuf[64];
-			str_format(aBuf, sizeof(aBuf), "%s %d/%d", Localize("Round"), m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent, m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum);
-			float tw = TextRender()->TextWidth(20.0f, aBuf, -1, -1.0f);
-			TextRender()->Text(x + w - tw - 10.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+			str_format(aScore, sizeof(aScore), "%d", GameClient()->m_Snap.m_pLocalInfo->m_Score);
 		}
 	}
-}
 
-void CScoreboard::RenderSpectators(float x, float y, float w, float h)
-{
-	// background
-	Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 10.0f);
+	const float TitleFontSize = 40.0f;
+	const float ScoreTextWidth = TextRender()->TextWidth(TitleFontSize, aScore);
 
-	// Headline
-	y += 10.0f;
-	TextRender()->Text(x + 10.0f, y + (30.f - 28.f) / 2.f, 28.0f, Localize("Spectators"), w - 20.0f);
-
-	// spectator names
-	y += 30.0f;
-	bool Multiple = false;
+	TitleBar.VMargin(20.0f, &TitleBar);
+	CUIRect TitleLabel, ScoreLabel;
+	if(Team == TEAM_RED)
+	{
+		TitleBar.VSplitRight(ScoreTextWidth, &TitleLabel, &ScoreLabel);
+		TitleLabel.VSplitRight(10.0f, &TitleLabel, nullptr);
+	}
+	else
+	{
+		TitleBar.VSplitLeft(ScoreTextWidth, &ScoreLabel, &TitleLabel);
+		TitleLabel.VSplitLeft(10.0f, nullptr, &TitleLabel);
+	}
 
-	CTextCursor Cursor;
-	TextRender()->SetCursor(&Cursor, x + 10.0f, y, 22.0f, TEXTFLAG_RENDER);
-	Cursor.m_LineWidth = w - 20.0f;
-	Cursor.m_MaxLines = 4;
+	{
+		SLabelProperties Props;
+		Props.m_MaxWidth = TitleLabel.w;
+		Props.m_EllipsisAtEnd = true;
+		Ui()->DoLabel(&TitleLabel, pTitle, TitleFontSize, Team == TEAM_RED ? TEXTALIGN_ML : TEXTALIGN_MR, Props);
+	}
 
-	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByName)
+	if(aScore[0] != '\0')
 	{
-		if(!pInfo || pInfo->m_Team != TEAM_SPECTATORS)
-			continue;
+		Ui()->DoLabel(&ScoreLabel, aScore, TitleFontSize, Team == TEAM_RED ? TEXTALIGN_MR : TEXTALIGN_ML);
+	}
+}
 
-		if(Multiple)
-			TextRender()->TextEx(&Cursor, ", ", 2);
+void CScoreboard::RenderGoals(CUIRect Goals)
+{
+	Goals.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Goals.VMargin(10.0f, &Goals);
 
-		if(m_pClient->m_aClients[pInfo->m_ClientID].m_AuthLevel)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor));
-			TextRender()->TextColor(Color);
-		}
+	const float FontSize = 20.0f;
+	const CNetObj_GameInfo *pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
+	char aBuf[64];
 
-		if(g_Config.m_ClShowIDs)
-		{
-			char aBuffer[5];
-			int size = str_format(aBuffer, sizeof(aBuffer), "%d: ", pInfo->m_ClientID);
-			TextRender()->TextEx(&Cursor, aBuffer, size);
-		}
-		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	if(pGameInfoObj->m_ScoreLimit)
+	{
+		str_format(aBuf, sizeof(aBuf), "%s: %d", Localize("Score limit"), pGameInfoObj->m_ScoreLimit);
+		Ui()->DoLabel(&Goals, aBuf, FontSize, TEXTALIGN_ML);
+	}
+
+	if(pGameInfoObj->m_TimeLimit)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("Time limit: %d min"), pGameInfoObj->m_TimeLimit);
+		Ui()->DoLabel(&Goals, aBuf, FontSize, TEXTALIGN_MC);
+	}
 
-		Multiple = true;
+	if(pGameInfoObj->m_RoundNum && pGameInfoObj->m_RoundCurrent)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("Round %d/%d"), pGameInfoObj->m_RoundCurrent, pGameInfoObj->m_RoundNum);
+		Ui()->DoLabel(&Goals, aBuf, FontSize, TEXTALIGN_MR);
 	}
 }
 
-void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const char *pTitle, int NumPlayers)
+void CScoreboard::RenderSpectators(CUIRect Spectators)
 {
-	if(Team == TEAM_SPECTATORS)
-		return;
+	Spectators.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Spectators.Margin(10.0f, &Spectators);
+
+	CTextCursor Cursor;
+	TextRender()->SetCursor(&Cursor, Spectators.x, Spectators.y, 22.0f, TEXTFLAG_RENDER);
+	Cursor.m_LineWidth = Spectators.w;
+	Cursor.m_MaxLines = round_truncate(Spectators.h / Cursor.m_FontSize);
 
-	bool lower16 = false;
-	bool upper16 = false;
-	bool lower24 = false;
-	bool upper24 = false;
-	bool lower32 = false;
-	bool upper32 = false;
-
-	if(Team == -3)
-		upper16 = true;
-	else if(Team == -4)
-		lower32 = true;
-	else if(Team == -5)
-		upper32 = true;
-	else if(Team == -6)
-		lower16 = true;
-	else if(Team == -7)
-		lower24 = true;
-	else if(Team == -8)
-		upper24 = true;
-
-	bool IsTeamplayTeam = Team > TEAM_SPECTATORS;
-
-	if(Team < -1)
-		Team = 0;
-
-	if(NumPlayers < 0)
-		NumPlayers = m_pClient->m_Snap.m_aTeamSize[Team];
-
-	float h = 760.0f;
-
-	// background
+	int RemainingSpectators = 0;
+	for(const CNetObj_PlayerInfo *pInfo : GameClient()->m_Snap.m_apInfoByName)
 	{
-		int Corners;
-		if(upper16 || upper32 || upper24)
-			Corners = IGraphics::CORNER_R;
-		else if(lower16 || lower32 || lower24)
-			Corners = IGraphics::CORNER_L;
-		else
-			Corners = IGraphics::CORNER_ALL;
-		Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), Corners, 17.0f);
+		if(!pInfo || pInfo->m_Team != TEAM_SPECTATORS)
+			continue;
+		++RemainingSpectators;
 	}
 
-	char aBuf[128] = {0};
+	TextRender()->TextEx(&Cursor, Localize("Spectators"));
 
-	// render title
-	float TitleFontsize = 40.0f;
-	int TitleWidth = (lower32 || lower24 || lower16) ? 1140 : 440;
-	if(!pTitle)
+	if(RemainingSpectators > 0)
 	{
-		if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
-			pTitle = Localize("Game over");
-		else
-		{
-			str_copy(aBuf, Client()->GetCurrentMap());
-			while(TextRender()->TextWidth(TitleFontsize, aBuf, -1, -1.0f) > TitleWidth)
-				aBuf[str_length(aBuf) - 1] = '\0';
-			if(str_comp(aBuf, Client()->GetCurrentMap()))
-				str_append(aBuf, "…");
-			pTitle = aBuf;
-		}
+		TextRender()->TextEx(&Cursor, ": ");
 	}
-	TextRender()->Text(x + 20.0f, y + (50.f - TitleFontsize) / 2.f, TitleFontsize, pTitle, -1.0f);
 
-	if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+	bool CommaNeeded = false;
+	for(const CNetObj_PlayerInfo *pInfo : GameClient()->m_Snap.m_apInfoByName)
 	{
-		if(m_pClient->m_Snap.m_pGameDataObj)
+		if(!pInfo || pInfo->m_Team != TEAM_SPECTATORS)
+			continue;
+
+		if(CommaNeeded)
 		{
-			int Score = Team == TEAM_RED ? m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed : m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue;
-			str_from_int(Score, aBuf);
+			TextRender()->TextEx(&Cursor, ", ");
 		}
-	}
-	else
-	{
-		if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW &&
-			m_pClient->m_Snap.m_apPlayerInfos[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID])
+
+		if(Cursor.m_LineCount == Cursor.m_MaxLines && RemainingSpectators >= 2)
 		{
-			int Score = m_pClient->m_Snap.m_apPlayerInfos[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID]->m_Score;
-			str_from_int(Score, aBuf);
+			// This is less expensive than checking with a separate invisible
+			// text cursor though we waste some space at the end of the line.
+			char aRemaining[64];
+			str_format(aRemaining, sizeof(aRemaining), Localize("%d others…", "Spectators"), RemainingSpectators);
+			TextRender()->TextEx(&Cursor, aRemaining);
+			break;
 		}
-		else if(m_pClient->m_Snap.m_pLocalInfo)
+
+		if(g_Config.m_ClShowIds)
 		{
-			int Score = m_pClient->m_Snap.m_pLocalInfo->m_Score;
-			str_from_int(Score, aBuf);
+			char aClientId[16];
+			GameClient()->FormatClientId(pInfo->m_ClientId, aClientId, EClientIdFormat::NO_INDENT);
+			TextRender()->TextEx(&Cursor, aClientId);
 		}
-	}
 
-	if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
-	{
-		if(m_ServerRecord > 0)
-			str_time_float(m_ServerRecord, TIME_HOURS, aBuf, sizeof(aBuf));
-		else
-			aBuf[0] = 0;
-	}
+		{
+			const char *pClanName = GameClient()->m_aClients[pInfo->m_ClientId].m_aClan;
+
+			if(pClanName[0] != '\0')
+			{
+				if(str_comp(pClanName, GameClient()->m_aClients[GameClient()->m_aLocalIds[g_Config.m_ClDummy]].m_aClan) == 0)
+				{
+					TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor)));
+				}
+				else
+				{
+					TextRender()->TextColor(ColorRGBA(0.7f, 0.7f, 0.7f));
+				}
 
-	float tw;
+				TextRender()->TextEx(&Cursor, pClanName);
+				TextRender()->TextEx(&Cursor, " ");
 
-	if(!lower16 && !lower32 && !lower24)
-	{
-		tw = TextRender()->TextWidth(TitleFontsize, aBuf, -1, -1.0f);
-		TextRender()->Text(x + w - tw - 20.0f, y + (50.f - TitleFontsize) / 2.f, TitleFontsize, aBuf, -1.0f);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+			}
+		}
+
+		if(GameClient()->m_aClients[pInfo->m_ClientId].m_AuthLevel)
+		{
+			TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor)));
+		}
+
+		TextRender()->TextEx(&Cursor, GameClient()->m_aClients[pInfo->m_ClientId].m_aName);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+		CommaNeeded = true;
+		--RemainingSpectators;
 	}
+}
+
+void CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart, int CountEnd, CScoreboardRenderState &State)
+{
+	dbg_assert(Team == TEAM_RED || Team == TEAM_BLUE, "Team invalid");
+
+	const CNetObj_GameInfo *pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
+	const CNetObj_GameData *pGameDataObj = GameClient()->m_Snap.m_pGameDataObj;
+	const bool TimeScore = GameClient()->m_GameInfo.m_TimeScore;
+	const int NumPlayers = CountEnd - CountStart;
+	const bool LowScoreboardWidth = Scoreboard.w < 700.0f;
+
+	bool Race7 = Client()->IsSixup() && pGameInfoObj && pGameInfoObj->m_GameFlags & protocol7::GAMEFLAG_RACE;
 
 	// calculate measurements
-	float LineHeight = 60.0f;
-	float TeeSizeMod = 1.0f;
-	float Spacing = 16.0f;
-	float RoundRadius = 15.0f;
-	float FontSize = 24.0f;
-	if(NumPlayers > 48)
+	float LineHeight;
+	float TeeSizeMod;
+	float Spacing;
+	float RoundRadius;
+	float FontSize;
+	if(NumPlayers <= 8)
 	{
-		LineHeight = 20.0f;
-		TeeSizeMod = 0.4f;
+		LineHeight = 60.0f;
+		TeeSizeMod = 1.0f;
+		Spacing = 16.0f;
+		RoundRadius = 10.0f;
+		FontSize = 24.0f;
+	}
+	else if(NumPlayers <= 12)
+	{
+		LineHeight = 50.0f;
+		TeeSizeMod = 0.9f;
+		Spacing = 5.0f;
+		RoundRadius = 10.0f;
+		FontSize = 24.0f;
+	}
+	else if(NumPlayers <= 16)
+	{
+		LineHeight = 40.0f;
+		TeeSizeMod = 0.8f;
 		Spacing = 0.0f;
 		RoundRadius = 5.0f;
-		FontSize = 16.0f;
+		FontSize = 24.0f;
 	}
-	else if(NumPlayers > 32)
+	else if(NumPlayers <= 24)
 	{
 		LineHeight = 27.0f;
 		TeeSizeMod = 0.6f;
@@ -258,308 +290,304 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
 		RoundRadius = 5.0f;
 		FontSize = 20.0f;
 	}
-	else if(NumPlayers > 12)
+	else if(NumPlayers <= 32)
 	{
-		LineHeight = 40.0f;
-		TeeSizeMod = 0.8f;
+		LineHeight = 20.0f;
+		TeeSizeMod = 0.4f;
 		Spacing = 0.0f;
-		RoundRadius = 15.0f;
+		RoundRadius = 5.0f;
+		FontSize = 16.0f;
 	}
-	else if(NumPlayers > 8)
+	else if(LowScoreboardWidth)
 	{
-		LineHeight = 50.0f;
-		TeeSizeMod = 0.9f;
-		Spacing = 5.0f;
-		RoundRadius = 15.0f;
+		LineHeight = 15.0f;
+		TeeSizeMod = 0.25f;
+		Spacing = 0.0f;
+		RoundRadius = 2.0f;
+		FontSize = 14.0f;
+	}
+	else
+	{
+		LineHeight = 10.0f;
+		TeeSizeMod = 0.2f;
+		Spacing = 0.0f;
+		RoundRadius = 2.0f;
+		FontSize = 10.0f;
 	}
 
-	float ScoreOffset = x + 10.0f + 10.0f, ScoreLength = TextRender()->TextWidth(FontSize, "00:00:00", -1, -1.0f);
-	if(IsTeamplayTeam)
-		ScoreLength = TextRender()->TextWidth(FontSize, "99999", -1, -1.0f);
-	float TeeOffset = ScoreOffset + ScoreLength + 15.0f, TeeLength = 60 * TeeSizeMod;
-	float NameOffset = TeeOffset + TeeLength, NameLength = 300.0f - TeeLength;
-	float CountryLength = (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f;
-	float PingLength = 65.0f;
-	float PingOffset = x + w - PingLength - 10.0f - 10.0f;
-	float CountryOffset = PingOffset - CountryLength;
-	float ClanLength = w - ((NameOffset - x) + NameLength) - (w - (CountryOffset - x));
-	float ClanOffset = CountryOffset - ClanLength;
+	const float ScoreOffset = Scoreboard.x + 40.0f;
+	const float ScoreLength = TextRender()->TextWidth(FontSize, TimeScore ? "00:00:00" : "99999");
+	const float TeeOffset = ScoreOffset + ScoreLength + 20.0f;
+	const float TeeLength = 60.0f * TeeSizeMod;
+	const float NameOffset = TeeOffset + TeeLength;
+	const float NameLength = (LowScoreboardWidth ? 180.0f : 300.0f) - TeeLength;
+	const float CountryLength = (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f;
+	const float PingLength = 55.0f;
+	const float PingOffset = Scoreboard.x + Scoreboard.w - PingLength - 20.0f;
+	const float CountryOffset = PingOffset - CountryLength;
+	const float ClanOffset = NameOffset + NameLength + 5.0f;
+	const float ClanLength = CountryOffset - ClanOffset - 5.0f;
 
 	// render headlines
-	x += 10.0f;
-	y += 50.0f;
-	float HeadlineFontsize = 22.0f;
-	const char *pScore = (m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard) ? Localize("Time") : Localize("Score");
-	tw = TextRender()->TextWidth(HeadlineFontsize, pScore, -1, -1.0f);
-	TextRender()->Text(ScoreOffset + ScoreLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, pScore, -1.0f);
-
-	TextRender()->Text(NameOffset, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Name"), -1.0f);
-
-	tw = TextRender()->TextWidth(HeadlineFontsize, Localize("Clan"), -1, -1.0f);
-	TextRender()->Text(ClanOffset + (ClanLength - tw) / 2, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Clan"), -1.0f);
-
-	tw = TextRender()->TextWidth(HeadlineFontsize, Localize("Ping"), -1, -1.0f);
-	TextRender()->Text(PingOffset + PingLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Ping"), -1.0f);
+	const float HeadlineFontsize = 22.0f;
+	CUIRect Headline;
+	Scoreboard.HSplitTop(HeadlineFontsize * 2.0f, &Headline, &Scoreboard);
+	const float HeadlineY = Headline.y + Headline.h / 2.0f - HeadlineFontsize / 2.0f;
+	const char *pScore = TimeScore ? Localize("Time") : Localize("Score");
+	TextRender()->Text(ScoreOffset + ScoreLength - TextRender()->TextWidth(HeadlineFontsize, pScore), HeadlineY, HeadlineFontsize, pScore);
+	TextRender()->Text(NameOffset, HeadlineY, HeadlineFontsize, Localize("Name"));
+	const char *pClanLabel = Localize("Clan");
+	TextRender()->Text(ClanOffset + (ClanLength - TextRender()->TextWidth(HeadlineFontsize, pClanLabel)) / 2.0f, HeadlineY, HeadlineFontsize, pClanLabel);
+	const char *pPingLabel = Localize("Ping");
+	TextRender()->Text(PingOffset + PingLength - TextRender()->TextWidth(HeadlineFontsize, pPingLabel), HeadlineY, HeadlineFontsize, pPingLabel);
 
 	// render player entries
-	y += HeadlineFontsize * 2.0f;
-	CTextCursor Cursor;
-
-	int rendered = 0;
-	if(upper16)
-		rendered = -16;
-	if(upper32)
-		rendered = -32;
-	if(upper24)
-		rendered = -24;
-
-	int OldDDTeam = -1;
+	int CountRendered = 0;
+	int PrevDDTeam = -1;
+	int &CurrentDDTeamSize = State.m_CurrentDDTeamSize;
 
-	int m_aTeamsCount[64];
-	mem_zero(m_aTeamsCount, sizeof(int) * 64);
+	char aBuf[64];
+	int MaxTeamSize = m_pClient->Config()->m_SvMaxTeamSize;
 
-	for(int i = 0; i < MAX_CLIENTS; i++)
+	for(int RenderDead = 0; RenderDead < 2; RenderDead++)
 	{
-		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamScore[i];
-		if(!pInfo)
-			continue;
-
-		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
-		if(DDTeam != -1 && DDTeam < TEAM_SUPER)
-			m_aTeamsCount[DDTeam]++;
-	}
-
-	for(int i = 0; i < MAX_CLIENTS; i++)
-	{
-		// make sure that we render the correct team
-		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamScore[i];
-		if(!pInfo || pInfo->m_Team != Team)
-			continue;
-
-		if(rendered++ < 0)
-			continue;
-
-		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
-		int NextDDTeam = 0;
-
-		for(int j = i + 1; j < MAX_CLIENTS; j++)
+		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamScore[j];
+			// make sure that we render the correct team
+			const CNetObj_PlayerInfo *pInfo = GameClient()->m_Snap.m_apInfoByDDTeamScore[i];
+			if(!pInfo || pInfo->m_Team != Team)
+				continue;
 
-			if(!pInfo2 || pInfo2->m_Team != Team)
+			if(CountRendered++ < CountStart)
 				continue;
 
-			NextDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
-			break;
-		}
+			int DDTeam = GameClient()->m_Teams.Team(pInfo->m_ClientId);
+			int NextDDTeam = 0;
+			bool IsDead = Client()->m_TranslationContext.m_aClients[pInfo->m_ClientId].m_PlayerFlags7 & protocol7::PLAYERFLAG_DEAD;
+			if(!RenderDead && IsDead)
+				continue;
+			if(RenderDead && !IsDead)
+				continue;
 
-		if(OldDDTeam == -1)
-		{
-			for(int j = i - 1; j >= 0; j--)
-			{
-				const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamScore[j];
+			ColorRGBA TextColor = TextRender()->DefaultTextColor();
+			TextColor.a = RenderDead ? 0.5f : 1.0f;
+			TextRender()->TextColor(TextColor);
 
-				if(!pInfo2 || pInfo2->m_Team != Team)
+			for(int j = i + 1; j < MAX_CLIENTS; j++)
+			{
+				const CNetObj_PlayerInfo *pInfoNext = GameClient()->m_Snap.m_apInfoByDDTeamScore[j];
+				if(!pInfoNext || pInfoNext->m_Team != Team)
 					continue;
 
-				OldDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+				NextDDTeam = GameClient()->m_Teams.Team(pInfoNext->m_ClientId);
 				break;
 			}
-		}
 
-		if(DDTeam != TEAM_FLOCK)
-		{
-			const ColorRGBA Color = m_pClient->GetDDTeamColor(DDTeam).WithAlpha(0.5f);
-			int Corners = 0;
-			if(OldDDTeam != DDTeam)
-				Corners |= IGraphics::CORNER_TL | IGraphics::CORNER_TR;
-			if(NextDDTeam != DDTeam)
-				Corners |= IGraphics::CORNER_BL | IGraphics::CORNER_BR;
-			Graphics()->DrawRect(x - 10.0f, y, w, LineHeight + Spacing, Color, Corners, RoundRadius);
-
-			if(NextDDTeam != DDTeam)
+			if(PrevDDTeam == -1)
 			{
-				if(m_pClient->m_Snap.m_aTeamSize[0] > 8)
-				{
-					if(DDTeam == TEAM_SUPER)
-						str_copy(aBuf, Localize("Super"));
-					else
-						str_format(aBuf, sizeof(aBuf), "%d | %d", DDTeam, m_aTeamsCount[DDTeam]);
-					TextRender()->SetCursor(&Cursor, x - 10.0f, y + Spacing + FontSize - (FontSize / 1.5f), FontSize / 1.5f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
-					Cursor.m_LineWidth = NameLength + 3;
-				}
-				else
+				for(int j = i - 1; j >= 0; j--)
 				{
-					if(DDTeam == TEAM_SUPER)
-						str_copy(aBuf, Localize("Super"));
-					else
-						str_format(aBuf, sizeof(aBuf), Localize("Team %d | Players: %d"), DDTeam, m_aTeamsCount[DDTeam]);
-					tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
-					TextRender()->SetCursor(&Cursor, ScoreOffset + w / 2.0f - tw / 2.0f, y + LineHeight, FontSize / 1.5f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
-					Cursor.m_LineWidth = NameLength + 3;
+					const CNetObj_PlayerInfo *pInfoPrev = GameClient()->m_Snap.m_apInfoByDDTeamScore[j];
+					if(!pInfoPrev || pInfoPrev->m_Team != Team)
+						continue;
+
+					PrevDDTeam = GameClient()->m_Teams.Team(pInfoPrev->m_ClientId);
+					break;
 				}
-				TextRender()->TextEx(&Cursor, aBuf, -1);
 			}
-		}
-		OldDDTeam = DDTeam;
 
-		// background so it's easy to find the local player or the followed one in spectator mode
-		if((!m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_Local) || (m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW && pInfo->m_Local) || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID))
-		{
-			Graphics()->DrawRect(x, y, w - 20.0f, LineHeight, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, RoundRadius);
-		}
-
-		// score
-		if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
-		{
-			if(pInfo->m_Score == -9999)
-				aBuf[0] = 0;
-			else
-				str_time((int64_t)absolute(pInfo->m_Score) * 100, TIME_HOURS, aBuf, sizeof(aBuf));
-		}
-		else
-			str_from_int(clamp(pInfo->m_Score, -999, 99999), aBuf);
-		tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
-		TextRender()->SetCursor(&Cursor, ScoreOffset + ScoreLength - tw, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER);
-		TextRender()->TextEx(&Cursor, aBuf, -1);
-
-		// flag
-		if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS &&
-			m_pClient->m_Snap.m_pGameDataObj && (m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed == pInfo->m_ClientID || m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientID))
-		{
-			Graphics()->BlendNormal();
-			if(m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientID)
-				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
-			else
-				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
-
-			Graphics()->QuadsBegin();
-			Graphics()->QuadsSetSubset(1, 0, 0, 1);
-
-			float Size = LineHeight;
-			IGraphics::CQuadItem QuadItem(TeeOffset + 0.0f, y - 5.0f - Spacing / 2.0f, Size / 2.0f, Size);
-			Graphics()->QuadsDrawTL(&QuadItem, 1);
-			Graphics()->QuadsEnd();
-		}
-
-		// avatar
-		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[pInfo->m_ClientID].m_RenderInfo;
-		TeeInfo.m_Size *= TeeSizeMod;
-		const CAnimState *pIdleState = CAnimState::GetIdle();
-		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
-		vec2 TeeRenderPos(TeeOffset + TeeLength / 2, y + LineHeight / 2.0f + OffsetToMid.y);
-
-		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
-		// Own color
-		if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aName,
-			   m_pClient->m_aClients[GameClient()->m_aLocalIDs[g_Config.m_ClDummy]].m_aName) == 0)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScPlayerOwnColor));
-			TextRender()->TextColor(Color);
-		}
-		else
-			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			CUIRect RowAndSpacing, Row;
+			Scoreboard.HSplitTop(LineHeight + Spacing, &RowAndSpacing, &Scoreboard);
+			RowAndSpacing.HSplitTop(LineHeight, &Row, nullptr);
 
+			// team background
+			if(DDTeam != TEAM_FLOCK)
+			{
+				const ColorRGBA Color = GameClient()->GetDDTeamColor(DDTeam).WithAlpha(0.5f);
+				int TeamRectCorners = 0;
+				if(PrevDDTeam != DDTeam)
+				{
+					TeamRectCorners |= IGraphics::CORNER_T;
+					State.m_TeamStartX = Row.x;
+					State.m_TeamStartY = Row.y;
+				}
+				if(NextDDTeam != DDTeam)
+					TeamRectCorners |= IGraphics::CORNER_B;
+				RowAndSpacing.Draw(Color, TeamRectCorners, RoundRadius);
 
-		// Set the cursor for the name rendering
-		TextRender()->SetCursor(&Cursor, NameOffset, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
-
+				CurrentDDTeamSize++;
 
-		if(m_pClient->m_aClients[pInfo->m_ClientID].m_AuthLevel)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor));
-			TextRender()->TextColor(Color);
-		}
-		else if(m_pClient->m_aClients[pInfo->m_ClientID].m_Friend)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScFriendColor));
-			TextRender()->TextColor(Color);
-		}
+				if(NextDDTeam != DDTeam)
+				{
+					const float TeamFontSize = FontSize / 1.5f;
+
+					if(NumPlayers > 8)
+					{
+						if(DDTeam == TEAM_SUPER)
+							str_copy(aBuf, Localize("Super"));
+						else if(CurrentDDTeamSize <= 1)
+							str_format(aBuf, sizeof(aBuf), "%d", DDTeam);
+						else
+							str_format(aBuf, sizeof(aBuf), Localize("%d\n(%d/%d)", "Team and size"), DDTeam, CurrentDDTeamSize, MaxTeamSize);
+						TextRender()->Text(State.m_TeamStartX, maximum(State.m_TeamStartY + Row.h / 2.0f - TeamFontSize, State.m_TeamStartY + 3.0f /* padding top */), TeamFontSize, aBuf);
+					}
+					else
+					{
+						if(DDTeam == TEAM_SUPER)
+							str_copy(aBuf, Localize("Super"));
+						else if(CurrentDDTeamSize > 1)
+							str_format(aBuf, sizeof(aBuf), Localize("Team %d (%d/%d)"), DDTeam, CurrentDDTeamSize, MaxTeamSize);
+						else
+							str_format(aBuf, sizeof(aBuf), Localize("Team %d"), DDTeam);
+						TextRender()->Text(Row.x + Row.w / 2.0f - TextRender()->TextWidth(TeamFontSize, aBuf) / 2.0f + 10.0f, Row.y + Row.h, TeamFontSize, aBuf);
+					}
+
+					CurrentDDTeamSize = 0;
+				}
+			}
+			PrevDDTeam = DDTeam;
 
-		TextRender()->SetCursor(&Cursor, NameOffset, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
-		if(m_pClient->m_aClients[pInfo->m_ClientID].m_Foe)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScBlacklistPColor));
-			TextRender()->TextColor(Color);
-		}
+			// background so it's easy to find the local player or the followed one in spectator mode
+			if((!GameClient()->m_Snap.m_SpecInfo.m_Active && pInfo->m_Local) ||
+				(GameClient()->m_Snap.m_SpecInfo.m_SpectatorId == SPEC_FREEVIEW && pInfo->m_Local) ||
+				(GameClient()->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientId == GameClient()->m_Snap.m_SpecInfo.m_SpectatorId))
+			{
+				Row.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, RoundRadius);
+			}
 
-		if(g_Config.m_ClShowIDs)
-		{
-			char aId[64] = "";
-			if(pInfo->m_ClientID < 10)
-				str_format(aId, sizeof(aId), " %d: %s", pInfo->m_ClientID, m_pClient->m_aClients[pInfo->m_ClientID].m_aName);
+			// score
+			if(Race7)
+			{
+				if(pInfo->m_Score == -1)
+				{
+					aBuf[0] = '\0';
+				}
+				else
+				{
+					// 0.7 uses milliseconds and ddnets str_time wants centiseconds
+					// 0.7 servers can also send the amount of precision the client should use
+					// we ignore that and always show 3 digit precision
+					str_time((int64_t)absolute(pInfo->m_Score / 10), TIME_MINS_CENTISECS, aBuf, sizeof(aBuf));
+				}
+			}
+			else if(TimeScore)
+			{
+				if(pInfo->m_Score == -9999)
+				{
+					aBuf[0] = '\0';
+				}
+				else
+				{
+					str_time((int64_t)absolute(pInfo->m_Score) * 100, TIME_HOURS, aBuf, sizeof(aBuf));
+				}
+			}
 			else
-				str_format(aId, sizeof(aId), "%d: %s", pInfo->m_ClientID, m_pClient->m_aClients[pInfo->m_ClientID].m_aName);
+			{
+				str_format(aBuf, sizeof(aBuf), "%d", clamp(pInfo->m_Score, -999, 99999));
+			}
+			TextRender()->Text(ScoreOffset + ScoreLength - TextRender()->TextWidth(FontSize, aBuf), Row.y + (Row.h - FontSize) / 2.0f, FontSize, aBuf);
 
-			Cursor.m_LineWidth = NameLength;
-			TextRender()->TextEx(&Cursor, aId, -1);
-		}
-		else
-		{
-			Cursor.m_LineWidth = NameLength;
-			TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
-		}
+			// CTF flag
+			if(pGameInfoObj && (pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS) &&
+				pGameDataObj && (pGameDataObj->m_FlagCarrierRed == pInfo->m_ClientId || pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientId))
+			{
+				Graphics()->BlendNormal();
+				Graphics()->TextureSet(pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientId ? GameClient()->m_GameSkin.m_SpriteFlagBlue : GameClient()->m_GameSkin.m_SpriteFlagRed);
+				Graphics()->QuadsBegin();
+				Graphics()->QuadsSetSubset(1.0f, 0.0f, 0.0f, 1.0f);
+				IGraphics::CQuadItem QuadItem(TeeOffset, Row.y - 5.0f - Spacing / 2.0f, Row.h / 2.0f, Row.h);
+				Graphics()->QuadsDrawTL(&QuadItem, 1);
+				Graphics()->QuadsEnd();
+			}
 
-		// clan
+			const CGameClient::CClientData &ClientData = GameClient()->m_aClients[pInfo->m_ClientId];
 
-		if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan,
-			   m_pClient->m_aClients[GameClient()->m_aLocalIDs[g_Config.m_ClDummy]].m_aClan) == 0)
-		{
-			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor));
-			TextRender()->TextColor(Color);
-			ColorRGBA special = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 20) % 255 / 255.f, 1.f, 1.f));
-			
-			std::string innerpeace = "Inner peace";
-			if(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan == innerpeace)
+			// skin
+			if(RenderDead)
 			{
-				TextRender()->TextColor(special);
+				Graphics()->BlendNormal();
+				Graphics()->TextureSet(client_data7::g_pData->m_aImages[client_data7::IMAGE_DEADTEE].m_Id);
+				Graphics()->QuadsBegin();
+				if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+				{
+					ColorRGBA Color = m_pClient->m_Skins7.GetTeamColor(true, 0, m_pClient->m_aClients[pInfo->m_ClientId].m_Team, protocol7::SKINPART_BODY);
+					Graphics()->SetColor(Color.r, Color.g, Color.b, Color.a);
+				}
+				CTeeRenderInfo TeeInfo = m_pClient->m_aClients[pInfo->m_ClientId].m_RenderInfo;
+				TeeInfo.m_Size *= TeeSizeMod;
+				IGraphics::CQuadItem QuadItem(TeeOffset, Row.y, TeeInfo.m_Size, TeeInfo.m_Size);
+				Graphics()->QuadsDrawTL(&QuadItem, 1);
+				Graphics()->QuadsEnd();
+			}
+			else
+			{
+				CTeeRenderInfo TeeInfo = ClientData.m_RenderInfo;
+				TeeInfo.m_Size *= TeeSizeMod;
+				vec2 OffsetToMid;
+				CRenderTools::GetRenderTeeOffsetToRenderedTee(CAnimState::GetIdle(), &TeeInfo, OffsetToMid);
+				const vec2 TeeRenderPos = vec2(TeeOffset + TeeLength / 2, Row.y + Row.h / 2.0f + OffsetToMid.y);
+				RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
 			}
-		}
-		else
-			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-
 
+			// name
+			{
+				CTextCursor Cursor;
+				TextRender()->SetCursor(&Cursor, NameOffset, Row.y + (Row.h - FontSize) / 2.0f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+				Cursor.m_LineWidth = NameLength;
+				if(ClientData.m_AuthLevel)
+				{
+					TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor)));
+				}
+				if(g_Config.m_ClShowIds)
+				{
+					char aClientId[16];
+					GameClient()->FormatClientId(pInfo->m_ClientId, aClientId, EClientIdFormat::INDENT_AUTO);
+					TextRender()->TextEx(&Cursor, aClientId);
+				}
+				TextRender()->TextEx(&Cursor, ClientData.m_aName);
 
-		tw = minimum(TextRender()->TextWidth(FontSize, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1, -1.0f), ClanLength);
-		TextRender()->SetCursor(&Cursor, ClanOffset + (ClanLength - tw) / 2, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
-		Cursor.m_LineWidth = ClanLength;
-		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1);
+				// ready / watching
+				if(Client()->IsSixup() && Client()->m_TranslationContext.m_aClients[pInfo->m_ClientId].m_PlayerFlags7 & protocol7::PLAYERFLAG_READY)
+				{
+					TextRender()->TextColor(0.1f, 1.0f, 0.1f, TextColor.a);
+					TextRender()->TextEx(&Cursor, "✓");
+				}
+			}
 
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			// clan
+			{
+				if(str_comp(ClientData.m_aClan, GameClient()->m_aClients[GameClient()->m_aLocalIds[g_Config.m_ClDummy]].m_aClan) == 0)
+				{
+					TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor)));
+				}
+				else
+				{
+					TextRender()->TextColor(TextColor);
+				}
+				CTextCursor Cursor;
+				TextRender()->SetCursor(&Cursor, ClanOffset + (ClanLength - minimum(TextRender()->TextWidth(FontSize, ClientData.m_aClan), ClanLength)) / 2.0f, Row.y + (Row.h - FontSize) / 2.0f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+				Cursor.m_LineWidth = ClanLength;
+				TextRender()->TextEx(&Cursor, ClientData.m_aClan);
+			}
 
-		// country flag
-		m_pClient->m_CountryFlags.Render(m_pClient->m_aClients[pInfo->m_ClientID].m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f),
-			CountryOffset, y + (Spacing + TeeSizeMod * 5.0f) / 2.0f, CountryLength, LineHeight - Spacing - TeeSizeMod * 5.0f);
+			// country flag
+			GameClient()->m_CountryFlags.Render(ClientData.m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f),
+				CountryOffset, Row.y + (Spacing + TeeSizeMod * 5.0f) / 2.0f, CountryLength, Row.h - Spacing - TeeSizeMod * 5.0f);
 
-		// ping
-		if(g_Config.m_ClEnablePingColor)
-		{
-			ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA((300.0f - clamp(pInfo->m_Latency, 0, 300)) / 1000.0f, 1.0f, 0.5f));
-			TextRender()->TextColor(rgb);
-		}
-		str_from_int(clamp(pInfo->m_Latency, 0, 6000), aBuf);
-		tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
-		TextRender()->SetCursor(&Cursor, PingOffset + PingLength - tw, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
-		Cursor.m_LineWidth = PingLength;
-		TextRender()->TextEx(&Cursor, aBuf, -1);
-
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			// ping
+			if(g_Config.m_ClEnablePingColor)
+			{
+				TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA((300.0f - clamp(pInfo->m_Latency, 0, 300)) / 1000.0f, 1.0f, 0.5f)));
+			}
+			else
+			{
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+			}
+			str_format(aBuf, sizeof(aBuf), "%d", clamp(pInfo->m_Latency, 0, 999));
+			TextRender()->Text(PingOffset + PingLength - TextRender()->TextWidth(FontSize, aBuf), Row.y + (Row.h - FontSize) / 2.0f, FontSize, aBuf);
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
 
-		y += LineHeight + Spacing;
-		if(lower32 || upper32)
-		{
-			if(rendered == 32)
-				break;
-		}
-		else if(lower24 || upper24)
-		{
-			if(rendered == 24)
-				break;
-		}
-		else
-		{
-			if(rendered == 16)
+			if(CountRendered == CountEnd)
 				break;
 		}
 	}
@@ -567,189 +595,251 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
 
 void CScoreboard::RenderRecordingNotification(float x)
 {
-	char aBuf[64] = "\0";
-	char aBuf2[64];
-	char aTime[32];
+	char aBuf[512] = "";
 
-	if(m_pClient->DemoRecorder(RECORDER_MANUAL)->IsRecording())
-	{
-		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_MANUAL)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
-		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Manual"), aTime);
-		str_append(aBuf, aBuf2);
-	}
-	if(m_pClient->DemoRecorder(RECORDER_RACE)->IsRecording())
-	{
-		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_RACE)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
-		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Race"), aTime);
-		str_append(aBuf, aBuf2);
-	}
-	if(m_pClient->DemoRecorder(RECORDER_AUTO)->IsRecording())
-	{
-		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_AUTO)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
-		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Auto"), aTime);
-		str_append(aBuf, aBuf2);
-	}
-	if(m_pClient->DemoRecorder(RECORDER_REPLAYS)->IsRecording())
-	{
-		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_REPLAYS)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
-		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Replay"), aTime);
-		str_append(aBuf, aBuf2);
-	}
+	const auto &&AppendRecorderInfo = [&](int Recorder, const char *pName) {
+		if(GameClient()->DemoRecorder(Recorder)->IsRecording())
+		{
+			char aTime[32];
+			str_time((int64_t)GameClient()->DemoRecorder(Recorder)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
+			str_append(aBuf, pName);
+			str_append(aBuf, " ");
+			str_append(aBuf, aTime);
+			str_append(aBuf, "  ");
+		}
+	};
 
-	if(!aBuf[0])
+	AppendRecorderInfo(RECORDER_MANUAL, Localize("Manual"));
+	AppendRecorderInfo(RECORDER_RACE, Localize("Race"));
+	AppendRecorderInfo(RECORDER_AUTO, Localize("Auto"));
+	AppendRecorderInfo(RECORDER_REPLAYS, Localize("Replay"));
+
+	if(aBuf[0] == '\0')
 		return;
 
-	float w = TextRender()->TextWidth(20.0f, aBuf, -1, -1.0f);
+	const float FontSize = 20.0f;
 
-	// draw the box
-	Graphics()->DrawRect(x, 0.0f, w + 60.0f, 50.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_B, 15.0f);
+	CUIRect Rect = {x, 0.0f, TextRender()->TextWidth(FontSize, aBuf) + 60.0f, 50.0f};
+	Rect.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_B, 15.0f);
+	Rect.VSplitLeft(20.0f, nullptr, &Rect);
+	Rect.VSplitRight(10.0f, &Rect, nullptr);
 
-	// draw the red dot
-	Graphics()->DrawRect(x + 20, 15.0f, 20.0f, 20.0f, ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), IGraphics::CORNER_ALL, 10.0f);
+	CUIRect Circle;
+	Rect.VSplitLeft(20.0f, &Circle, &Rect);
+	Circle.HMargin((Circle.h - Circle.w) / 2.0f, &Circle);
+	Circle.Draw(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), IGraphics::CORNER_ALL, Circle.h / 2.0f);
 
-	TextRender()->Text(x + 50.0f, (50.f - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+	Rect.VSplitLeft(10.0f, nullptr, &Rect);
+	Ui()->DoLabel(&Rect, aBuf, FontSize, TEXTALIGN_ML);
 }
 
 void CScoreboard::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!Active())
 		return;
 
 	// if the score board is active, then we should clear the motd message as well
-	if(m_pClient->m_Motd.IsActive())
-		m_pClient->m_Motd.Clear();
-
-	float Width = 400 * 3.0f * Graphics()->ScreenAspect();
-	float Height = 400 * 3.0f;
+	if(GameClient()->m_Motd.IsActive())
+		GameClient()->m_Motd.Clear();
 
+	const float Height = 400.0f * 3.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
 	Graphics()->MapScreen(0, 0, Width, Height);
 
-	float w = 750.0f;
-	float ExtraWidthSingle = 20.0f;
+	const CNetObj_GameInfo *pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
+	const bool Teams = pGameInfoObj && (pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS);
+	const auto &aTeamSize = GameClient()->m_Snap.m_aTeamSize;
+	const int NumPlayers = Teams ? maximum(aTeamSize[TEAM_RED], aTeamSize[TEAM_BLUE]) : aTeamSize[TEAM_RED];
+
+	const float ScoreboardSmallWidth = 750.0f + 20.0f;
+	const float ScoreboardWidth = !Teams && NumPlayers <= 16 ? ScoreboardSmallWidth : 1500.0f;
+	const float TitleHeight = 60.0f;
 
-	if(m_pClient->m_Snap.m_pGameInfoObj)
+	CUIRect Scoreboard = {(Width - ScoreboardWidth) / 2.0f, 150.0f, ScoreboardWidth, 710.0f + TitleHeight};
+	CScoreboardRenderState RenderState{};
+
+	if(Teams)
 	{
-		if(!(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS))
+		const char *pRedTeamName = GetTeamName(TEAM_RED);
+		const char *pBlueTeamName = GetTeamName(TEAM_BLUE);
+
+		// Game over title
+		const CNetObj_GameData *pGameDataObj = GameClient()->m_Snap.m_pGameDataObj;
+		if((pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER) && pGameDataObj)
 		{
-			if(m_pClient->m_Snap.m_aTeamSize[0] > 48)
+			char aTitle[256];
+			if(pGameDataObj->m_TeamscoreRed > pGameDataObj->m_TeamscoreBlue)
 			{
-				RenderScoreboard(Width / 2, 150.0f, w, -5, "");
-				RenderScoreboard(Width / 2 - w, 150.0f, w, -4, 0);
-			}
-			else if(m_pClient->m_Snap.m_aTeamSize[0] > 32)
-			{
-				RenderScoreboard(Width / 2, 150.0f, w, -8, "");
-				RenderScoreboard(Width / 2 - w, 150.0f, w, -7, 0);
+				TextRender()->TextColor(ColorRGBA(0.975f, 0.17f, 0.17f, 1.0f));
+				if(pRedTeamName == nullptr)
+				{
+					str_copy(aTitle, Localize("Red team wins!"));
+				}
+				else
+				{
+					str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pRedTeamName);
+				}
 			}
-			else if(m_pClient->m_Snap.m_aTeamSize[0] > 16)
+			else if(pGameDataObj->m_TeamscoreBlue > pGameDataObj->m_TeamscoreRed)
 			{
-				RenderScoreboard(Width / 2, 150.0f, w, -3, "");
-				RenderScoreboard(Width / 2 - w, 150.0f, w, -6, 0);
+				TextRender()->TextColor(ColorRGBA(0.17f, 0.46f, 0.975f, 1.0f));
+				if(pBlueTeamName == nullptr)
+				{
+					str_copy(aTitle, Localize("Blue team wins!"));
+				}
+				else
+				{
+					str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pBlueTeamName);
+				}
 			}
 			else
 			{
-				w += ExtraWidthSingle;
-				RenderScoreboard(Width / 2 - w / 2, 150.0f, w, -2, 0);
+				TextRender()->TextColor(ColorRGBA(0.91f, 0.78f, 0.33f, 1.0f));
+				str_copy(aTitle, Localize("Draw!"));
 			}
+
+			const float TitleFontSize = 72.0f;
+			CUIRect GameOverTitle = {Scoreboard.x, Scoreboard.y - TitleFontSize - 12.0f, Scoreboard.w, TitleFontSize};
+			Ui()->DoLabel(&GameOverTitle, aTitle, TitleFontSize, TEXTALIGN_MC);
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+		}
+
+		CUIRect RedScoreboard, BlueScoreboard, RedTitle, BlueTitle;
+		Scoreboard.VSplitMid(&RedScoreboard, &BlueScoreboard, 15.0f);
+		RedScoreboard.HSplitTop(TitleHeight, &RedTitle, &RedScoreboard);
+		BlueScoreboard.HSplitTop(TitleHeight, &BlueTitle, &BlueScoreboard);
+
+		RedTitle.Draw(ColorRGBA(0.975f, 0.17f, 0.17f, 0.5f), IGraphics::CORNER_T, 15.0f);
+		BlueTitle.Draw(ColorRGBA(0.17f, 0.46f, 0.975f, 0.5f), IGraphics::CORNER_T, 15.0f);
+		RedScoreboard.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_B, 15.0f);
+		BlueScoreboard.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_B, 15.0f);
+
+		RenderTitle(RedTitle, TEAM_RED, pRedTeamName == nullptr ? Localize("Red team") : pRedTeamName);
+		RenderTitle(BlueTitle, TEAM_BLUE, pBlueTeamName == nullptr ? Localize("Blue team") : pBlueTeamName);
+		RenderScoreboard(RedScoreboard, TEAM_RED, 0, NumPlayers, RenderState);
+		RenderScoreboard(BlueScoreboard, TEAM_BLUE, 0, NumPlayers, RenderState);
+	}
+	else
+	{
+		Scoreboard.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+
+		const char *pTitle;
+		if(pGameInfoObj && (pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+		{
+			pTitle = Localize("Game over");
 		}
 		else
 		{
-			const char *pRedClanName = GetClanName(TEAM_RED);
-			const char *pBlueClanName = GetClanName(TEAM_BLUE);
+			pTitle = Client()->GetCurrentMap();
+		}
 
-			if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER && m_pClient->m_Snap.m_pGameDataObj)
-			{
-				char aText[256];
-				str_copy(aText, Localize("Draw!"));
+		CUIRect Title;
+		Scoreboard.HSplitTop(TitleHeight, &Title, &Scoreboard);
+		RenderTitle(Title, TEAM_RED, pTitle);
 
-				if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue)
-				{
-					if(pRedClanName)
-						str_format(aText, sizeof(aText), Localize("%s wins!"), pRedClanName);
-					else
-						str_copy(aText, Localize("Red team wins!"));
-				}
-				else if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed)
-				{
-					if(pBlueClanName)
-						str_format(aText, sizeof(aText), Localize("%s wins!"), pBlueClanName);
-					else
-						str_copy(aText, Localize("Blue team wins!"));
-				}
+		if(NumPlayers <= 16)
+		{
+			RenderScoreboard(Scoreboard, TEAM_RED, 0, NumPlayers, RenderState);
+		}
+		else if(NumPlayers <= 64)
+		{
+			int PlayersPerSide;
+			if(NumPlayers <= 24)
+				PlayersPerSide = 12;
+			else if(NumPlayers <= 32)
+				PlayersPerSide = 16;
+			else if(NumPlayers <= 48)
+				PlayersPerSide = 24;
+			else
+				PlayersPerSide = 32;
 
-				float TextWidth = TextRender()->TextWidth(86.0f, aText, -1, -1.0f);
-				TextRender()->Text(Width / 2 - TextWidth / 2, 39, 86.0f, aText, -1.0f);
+			CUIRect LeftScoreboard, RightScoreboard;
+			Scoreboard.VSplitMid(&LeftScoreboard, &RightScoreboard);
+			RenderScoreboard(LeftScoreboard, TEAM_RED, 0, PlayersPerSide, RenderState);
+			RenderScoreboard(RightScoreboard, TEAM_RED, PlayersPerSide, 2 * PlayersPerSide, RenderState);
+		}
+		else
+		{
+			const int NumColumns = 3;
+			const int PlayersPerColumn = std::ceil(128.0f / NumColumns);
+			CUIRect RemainingScoreboard = Scoreboard;
+			for(int i = 0; i < NumColumns; ++i)
+			{
+				CUIRect Column;
+				RemainingScoreboard.VSplitLeft(Scoreboard.w / NumColumns, &Column, &RemainingScoreboard);
+				RenderScoreboard(Column, TEAM_RED, i * PlayersPerColumn, (i + 1) * PlayersPerColumn, RenderState);
 			}
-
-			//decrease width, because team games use additional offsets
-			w -= 10.0f;
-
-			int NumPlayers = maximum(m_pClient->m_Snap.m_aTeamSize[TEAM_RED], m_pClient->m_Snap.m_aTeamSize[TEAM_BLUE]);
-			RenderScoreboard(Width / 2 - w - 5.0f, 150.0f, w, TEAM_RED, pRedClanName ? pRedClanName : Localize("Red team"), NumPlayers);
-			RenderScoreboard(Width / 2 + 5.0f, 150.0f, w, TEAM_BLUE, pBlueClanName ? pBlueClanName : Localize("Blue team"), NumPlayers);
 		}
 	}
-	if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit || m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit || (m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum && m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent)))
-	{
-		RenderGoals(Width / 2 - w / 2, 150 + 760 + 10, w);
-		RenderSpectators(Width / 2 - w / 2, 150 + 760 + 10 + 50 + 10, w, 160.0f);
-	}
-	else
+
+	CUIRect Spectators = {(Width - ScoreboardSmallWidth) / 2.0f, Scoreboard.y + Scoreboard.h + 10.0f, ScoreboardSmallWidth, 200.0f};
+	if(pGameInfoObj && (pGameInfoObj->m_ScoreLimit || pGameInfoObj->m_TimeLimit || (pGameInfoObj->m_RoundNum && pGameInfoObj->m_RoundCurrent)))
 	{
-		RenderSpectators(Width / 2 - w / 2, 150 + 760 + 10, w, 200.0f);
+		CUIRect Goals;
+		Spectators.HSplitTop(50.0f, &Goals, &Spectators);
+		Spectators.HSplitTop(10.0f, nullptr, &Spectators);
+		RenderGoals(Goals);
 	}
+	RenderSpectators(Spectators);
 
 	RenderRecordingNotification((Width / 7) * 4 + 20);
 }
 
-bool CScoreboard::Active()
+bool CScoreboard::Active() const
 {
 	// if statboard is active don't show scoreboard
-	if(m_pClient->m_Statboard.IsActive())
+	if(GameClient()->m_Statboard.IsActive())
 		return false;
 
 	if(m_Active)
 		return true;
 
-	if(m_pClient->m_Snap.m_pLocalInfo && !m_pClient->m_Snap.m_SpecInfo.m_Active)
+	const CNetObj_GameInfo *pGameInfoObj = GameClient()->m_Snap.m_pGameInfoObj;
+	if(GameClient()->m_Snap.m_pLocalInfo && !GameClient()->m_Snap.m_SpecInfo.m_Active)
 	{
-		// we are not a spectator, check if we are dead
-		if(!m_pClient->m_Snap.m_pLocalCharacter && g_Config.m_ClScoreboardOnDeath)
+		// we are not a spectator, check if we are dead and the game isn't paused
+		if(!GameClient()->m_Snap.m_pLocalCharacter && g_Config.m_ClScoreboardOnDeath &&
+			!(pGameInfoObj && pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
 			return true;
 	}
 
 	// if the game is over
-	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
+	if(pGameInfoObj && pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
 		return true;
 
 	return false;
 }
 
-const char *CScoreboard::GetClanName(int Team)
+const char *CScoreboard::GetTeamName(int Team) const
 {
+	dbg_assert(Team == TEAM_RED || Team == TEAM_BLUE, "Team invalid");
+
 	int ClanPlayers = 0;
-	const char *pClanName = 0;
-	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+	const char *pClanName = nullptr;
+	for(const CNetObj_PlayerInfo *pInfo : GameClient()->m_Snap.m_apInfoByScore)
 	{
 		if(!pInfo || pInfo->m_Team != Team)
 			continue;
 
 		if(!pClanName)
 		{
-			pClanName = m_pClient->m_aClients[pInfo->m_ClientID].m_aClan;
+			pClanName = GameClient()->m_aClients[pInfo->m_ClientId].m_aClan;
 			ClanPlayers++;
 		}
 		else
 		{
-			if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, pClanName) == 0)
+			if(str_comp(GameClient()->m_aClients[pInfo->m_ClientId].m_aClan, pClanName) == 0)
 				ClanPlayers++;
 			else
-				return 0;
+				return nullptr;
 		}
 	}
 
-	if(ClanPlayers > 1 && pClanName[0])
+	if(ClanPlayers > 1 && pClanName[0] != '\0')
 		return pClanName;
 	else
-		return 0;
+		return nullptr;
 }
diff --git a/src/game/client/components/scoreboard.h b/src/game/client/components/scoreboard.h
index e45b781cfd..09f064fab1 100644
--- a/src/game/client/components/scoreboard.h
+++ b/src/game/client/components/scoreboard.h
@@ -6,36 +6,42 @@
 #include <engine/console.h>
 
 #include <game/client/component.h>
+#include <game/client/ui_rect.h>
 
 class CScoreboard : public CComponent
 {
-	void RenderGoals(float x, float y, float w);
-	void RenderSpectators(float x, float y, float w, float h);
-	void RenderScoreboard(float x, float y, float w, int Team, const char *pTitle, int NumPlayers = -1);
+	struct CScoreboardRenderState
+	{
+		float m_TeamStartX;
+		float m_TeamStartY;
+		int m_CurrentDDTeamSize;
+
+		CScoreboardRenderState() :
+			m_TeamStartX(0), m_TeamStartY(0), m_CurrentDDTeamSize(0) {}
+	};
+
+	void RenderTitle(CUIRect TitleBar, int Team, const char *pTitle);
+	void RenderGoals(CUIRect Goals);
+	void RenderSpectators(CUIRect Spectators);
+	void RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart, int CountEnd, CScoreboardRenderState &State);
 	void RenderRecordingNotification(float x);
 
 	static void ConKeyScoreboard(IConsole::IResult *pResult, void *pUserData);
-
-	const char *GetClanName(int Team);
+	const char *GetTeamName(int Team) const;
 
 	bool m_Active;
+	float m_ServerRecord;
 
 public:
 	CScoreboard();
 	virtual int Sizeof() const override { return sizeof(*this); }
-	virtual void OnReset() override;
 	virtual void OnConsoleInit() override;
+	virtual void OnReset() override;
 	virtual void OnRender() override;
 	virtual void OnRelease() override;
-
-	bool Active();
-
-	// DDRace
-
 	virtual void OnMessage(int MsgType, void *pRawMsg) override;
 
-private:
-	float m_ServerRecord;
+	bool Active() const;
 };
 
 #endif
diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp
index 90296fc439..9e66d06516 100644
--- a/src/game/client/components/skins.cpp
+++ b/src/game/client/components/skins.cpp
@@ -1,10 +1,12 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
+#include <base/log.h>
 #include <base/math.h>
 #include <base/system.h>
 
 #include <engine/engine.h>
+#include <engine/gfx/image_manipulation.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/storage.h>
@@ -16,20 +18,38 @@
 
 #include "skins.h"
 
+CSkins::CSkins() :
+	m_PlaceholderSkin("dummy")
+{
+	m_PlaceholderSkin.m_OriginalSkin.Reset();
+	m_PlaceholderSkin.m_ColorableSkin.Reset();
+	m_PlaceholderSkin.m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+	m_PlaceholderSkin.m_Metrics.m_Body.m_Width = 64;
+	m_PlaceholderSkin.m_Metrics.m_Body.m_Height = 64;
+	m_PlaceholderSkin.m_Metrics.m_Body.m_OffsetX = 16;
+	m_PlaceholderSkin.m_Metrics.m_Body.m_OffsetY = 16;
+	m_PlaceholderSkin.m_Metrics.m_Body.m_MaxWidth = 96;
+	m_PlaceholderSkin.m_Metrics.m_Body.m_MaxHeight = 96;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_Width = 32;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_Height = 16;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_OffsetX = 16;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_OffsetY = 8;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_MaxWidth = 64;
+	m_PlaceholderSkin.m_Metrics.m_Feet.m_MaxHeight = 32;
+}
+
 bool CSkins::IsVanillaSkin(const char *pName)
 {
 	return std::any_of(std::begin(VANILLA_SKINS), std::end(VANILLA_SKINS), [pName](const char *pVanillaSkin) { return str_comp(pName, pVanillaSkin) == 0; });
 }
 
-int CSkins::CGetPngFile::OnCompletion(int State)
+void CSkins::CGetPngFile::OnCompletion(EHttpState State)
 {
-	State = CHttpRequest::OnCompletion(State);
-
-	if(State != HTTP_ERROR && State != HTTP_ABORTED && !m_pSkins->LoadSkinPNG(m_Info, Dest(), Dest(), IStorage::TYPE_SAVE))
+	// Maybe this should start another thread to load the png in instead of stalling the curl thread
+	if(State == EHttpState::DONE)
 	{
-		State = HTTP_ERROR;
+		m_pSkins->LoadSkinPng(m_Info, Dest(), Dest(), IStorage::TYPE_SAVE);
 	}
-	return State;
 }
 
 CSkins::CGetPngFile::CGetPngFile(CSkins *pSkins, const char *pUrl, IStorage *pStorage, const char *pDest) :
@@ -49,27 +69,31 @@ struct SSkinScanUser
 
 int CSkins::SkinScan(const char *pName, int IsDir, int DirType, void *pUser)
 {
-	auto *pUserReal = (SSkinScanUser *)pUser;
+	auto *pUserReal = static_cast<SSkinScanUser *>(pUser);
 	CSkins *pSelf = pUserReal->m_pThis;
 
-	if(IsDir || !str_endswith(pName, ".png"))
+	if(IsDir)
 		return 0;
 
-	char aNameWithoutPng[128];
-	str_copy(aNameWithoutPng, pName);
-	aNameWithoutPng[str_length(aNameWithoutPng) - 4] = 0;
+	const char *pSuffix = str_endswith(pName, ".png");
+	if(pSuffix == nullptr)
+		return 0;
 
-	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(aNameWithoutPng))
+	char aSkinName[IO_MAX_PATH_LENGTH];
+	str_truncate(aSkinName, sizeof(aSkinName), pName, pSuffix - pName);
+	if(!CSkin::IsValidName(aSkinName))
+	{
+		log_error("skins", "Skin name is not valid: %s", aSkinName);
+		log_error("skins", "%s", CSkin::m_aSkinNameRestrictions);
 		return 0;
+	}
 
-	// Don't add duplicate skins (one from user's config directory, other from
-	// client itself)
-	if(pSelf->m_Skins.find(aNameWithoutPng) != pSelf->m_Skins.end())
+	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(aSkinName))
 		return 0;
 
-	char aBuf[IO_MAX_PATH_LENGTH];
-	str_format(aBuf, sizeof(aBuf), "skins/%s", pName);
-	pSelf->LoadSkin(aNameWithoutPng, aBuf, DirType);
+	char aPath[IO_MAX_PATH_LENGTH];
+	str_format(aPath, sizeof(aPath), "skins/%s", pName);
+	pSelf->LoadSkin(aSkinName, aPath, DirType);
 	pUserReal->m_SkinLoadedFunc((int)pSelf->m_Skins.size());
 	return 0;
 }
@@ -112,18 +136,16 @@ static void CheckMetrics(CSkin::SSkinMetricVariable &Metrics, const uint8_t *pIm
 const CSkin *CSkins::LoadSkin(const char *pName, const char *pPath, int DirType)
 {
 	CImageInfo Info;
-	if(!LoadSkinPNG(Info, pName, pPath, DirType))
-		return 0;
+	if(!LoadSkinPng(Info, pName, pPath, DirType))
+		return nullptr;
 	return LoadSkin(pName, Info);
 }
 
-bool CSkins::LoadSkinPNG(CImageInfo &Info, const char *pName, const char *pPath, int DirType)
+bool CSkins::LoadSkinPng(CImageInfo &Info, const char *pName, const char *pPath, int DirType)
 {
-	char aBuf[512];
-	if(!Graphics()->LoadPNG(&Info, pPath, DirType))
+	if(!Graphics()->LoadPng(Info, pPath, DirType))
 	{
-		str_format(aBuf, sizeof(aBuf), "failed to load skin from %s", pName);
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		log_error("skins", "Failed to load skin PNG: %s", pName);
 		return false;
 	}
 	return true;
@@ -131,18 +153,14 @@ bool CSkins::LoadSkinPNG(CImageInfo &Info, const char *pName, const char *pPath,
 
 const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 {
-	char aBuf[512];
-
 	if(!Graphics()->CheckImageDivisibility(pName, Info, g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridy, true))
 	{
-		str_format(aBuf, sizeof(aBuf), "skin failed image divisibility: %s", pName);
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		log_error("skins", "Skin failed image divisibility: %s", pName);
 		return nullptr;
 	}
-	if(!Graphics()->IsImageFormatRGBA(pName, Info))
+	if(!Graphics()->IsImageFormatRgba(pName, Info))
 	{
-		str_format(aBuf, sizeof(aBuf), "skin format is not RGBA: %s", pName);
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		log_error("skins", "Skin format is not RGBA: %s", pName);
 		return nullptr;
 	}
 
@@ -181,19 +199,20 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	int BodyOutlineOffsetX = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_X * BodyOutlineGridPixelsWidth;
 	int BodyOutlineOffsetY = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_Y * BodyOutlineGridPixelsHeight;
 
-	int BodyWidth = g_pData->m_aSprites[SPRITE_TEE_BODY].m_W * (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridx); // body width
-	int BodyHeight = g_pData->m_aSprites[SPRITE_TEE_BODY].m_H * (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridy); // body height
+	size_t BodyWidth = g_pData->m_aSprites[SPRITE_TEE_BODY].m_W * (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridx); // body width
+	size_t BodyHeight = g_pData->m_aSprites[SPRITE_TEE_BODY].m_H * (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridy); // body height
 	if(BodyWidth > Info.m_Width || BodyHeight > Info.m_Height)
 		return nullptr;
-	unsigned char *pData = (unsigned char *)Info.m_pData;
+	uint8_t *pData = Info.m_pData;
 	const int PixelStep = 4;
 	int Pitch = Info.m_Width * PixelStep;
 
 	// dig out blood color
 	{
-		int aColors[3] = {0};
-		for(int y = 0; y < BodyHeight; y++)
-			for(int x = 0; x < BodyWidth; x++)
+		int64_t aColors[3] = {0};
+		for(size_t y = 0; y < BodyHeight; y++)
+		{
+			for(size_t x = 0; x < BodyWidth; x++)
 			{
 				uint8_t AlphaValue = pData[y * Pitch + x * PixelStep + 3];
 				if(AlphaValue > 128)
@@ -203,10 +222,9 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 					aColors[2] += pData[y * Pitch + x * PixelStep + 2];
 				}
 			}
-		if(aColors[0] != 0 && aColors[1] != 0 && aColors[2] != 0)
-			Skin.m_BloodColor = ColorRGBA(normalize(vec3(aColors[0], aColors[1], aColors[2])));
-		else
-			Skin.m_BloodColor = ColorRGBA(0, 0, 0, 1);
+		}
+
+		Skin.m_BloodColor = ColorRGBA(normalize(vec3(aColors[0], aColors[1], aColors[2])));
 	}
 
 	CheckMetrics(Skin.m_Metrics.m_Body, pData, Pitch, 0, 0, BodyWidth, BodyHeight);
@@ -220,22 +238,15 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	// get feet outline size
 	CheckMetrics(Skin.m_Metrics.m_Feet, pData, Pitch, FeetOutlineOffsetX, FeetOutlineOffsetY, FeetOutlineWidth, FeetOutlineHeight);
 
-	// make the texture gray scale
-	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
-	{
-		int v = (pData[i * PixelStep] + pData[i * PixelStep + 1] + pData[i * PixelStep + 2]) / 3;
-		pData[i * PixelStep] = v;
-		pData[i * PixelStep + 1] = v;
-		pData[i * PixelStep + 2] = v;
-	}
+	ConvertToGrayscale(Info);
 
 	int aFreq[256] = {0};
 	int OrgWeight = 0;
 	int NewWeight = 192;
 
 	// find most common frequency
-	for(int y = 0; y < BodyHeight; y++)
-		for(int x = 0; x < BodyWidth; x++)
+	for(size_t y = 0; y < BodyHeight; y++)
+		for(size_t x = 0; x < BodyWidth; x++)
 		{
 			if(pData[y * Pitch + x * PixelStep + 3] > 128)
 				aFreq[pData[y * Pitch + x * PixelStep]]++;
@@ -250,8 +261,8 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	// reorder
 	int InvOrgWeight = 255 - OrgWeight;
 	int InvNewWeight = 255 - NewWeight;
-	for(int y = 0; y < BodyHeight; y++)
-		for(int x = 0; x < BodyWidth; x++)
+	for(size_t y = 0; y < BodyHeight; y++)
+		for(size_t x = 0; x < BodyWidth; x++)
 		{
 			int v = pData[y * Pitch + x * PixelStep];
 			if(v <= OrgWeight && OrgWeight == 0)
@@ -277,13 +288,11 @@ const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	for(int i = 0; i < 6; ++i)
 		Skin.m_ColorableSkin.m_aEyes[i] = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_EYE_NORMAL + i]);
 
-	Graphics()->FreePNG(&Info);
+	Info.Free();
 
-	// set skin data
 	if(g_Config.m_Debug)
 	{
-		str_format(aBuf, sizeof(aBuf), "load skin %s", Skin.GetName());
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		log_trace("skins", "Loaded skin '%s'", Skin.GetName());
 	}
 
 	auto &&pSkin = std::make_unique<CSkin>(std::move(Skin));
@@ -306,32 +315,16 @@ void CSkins::OnInit()
 
 	// load skins;
 	Refresh([this](int SkinCounter) {
-		GameClient()->m_Menus.RenderLoading(Localize("Rendering u'r skins..."), Localize("Loading skin files"), 0);
+		GameClient()->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading skin files"), 0);
 	});
 }
 
 void CSkins::Refresh(TSkinLoadedCBFunc &&SkinLoadedFunc)
 {
-	for(const auto &SkinIt : m_Skins)
+	for(const auto &[_, pSkin] : m_Skins)
 	{
-		const auto &pSkin = SkinIt.second;
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Body);
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_BodyOutline);
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Feet);
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_FeetOutline);
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Hands);
-		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_HandsOutline);
-		for(auto &Eye : pSkin->m_OriginalSkin.m_aEyes)
-			Graphics()->UnloadTexture(&Eye);
-
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Body);
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_BodyOutline);
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Feet);
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_FeetOutline);
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Hands);
-		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_HandsOutline);
-		for(auto &Eye : pSkin->m_ColorableSkin.m_aEyes)
-			Graphics()->UnloadTexture(&Eye);
+		pSkin->m_OriginalSkin.Unload(Graphics());
+		pSkin->m_ColorableSkin.Unload(Graphics());
 	}
 
 	m_Skins.clear();
@@ -341,14 +334,6 @@ void CSkins::Refresh(TSkinLoadedCBFunc &&SkinLoadedFunc)
 	SkinScanUser.m_pThis = this;
 	SkinScanUser.m_SkinLoadedFunc = SkinLoadedFunc;
 	Storage()->ListDirectory(IStorage::TYPE_ALL, "skins", SkinScan, &SkinScanUser);
-	if(m_Skins.empty())
-	{
-		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load skins. folder='skins/'");
-		CSkin DummySkin{"dummy"};
-		DummySkin.m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f);
-		auto &&pDummySkin = std::make_unique<CSkin>(std::move(DummySkin));
-		m_Skins.insert({pDummySkin->GetName(), std::move(pDummySkin)});
-	}
 }
 
 int CSkins::Num()
@@ -362,35 +347,34 @@ const CSkin *CSkins::Find(const char *pName)
 	if(pSkin == nullptr)
 	{
 		pSkin = FindOrNullptr("default");
-		if(pSkin == nullptr)
-			return m_Skins.begin()->second.get();
-		else
-			return pSkin;
 	}
-	else
+	if(pSkin == nullptr)
 	{
-		return pSkin;
+		pSkin = &m_PlaceholderSkin;
 	}
+	return pSkin;
 }
 
 const CSkin *CSkins::FindOrNullptr(const char *pName, bool IgnorePrefix)
 {
-	const char *pSkinPrefix = m_aEventSkinPrefix[0] ? m_aEventSkinPrefix : g_Config.m_ClSkinPrefix;
 	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(pName))
 	{
 		return nullptr;
 	}
-	else if(pSkinPrefix && pSkinPrefix[0] && !IgnorePrefix)
+
+	const char *pSkinPrefix = m_aEventSkinPrefix[0] != '\0' ? m_aEventSkinPrefix : g_Config.m_ClSkinPrefix;
+	if(!IgnorePrefix && pSkinPrefix[0] != '\0')
 	{
-		char aBuf[24];
-		str_format(aBuf, sizeof(aBuf), "%s_%s", pSkinPrefix, pName);
+		char aNameWithPrefix[48]; // Larger than skin name length to allow IsValidName to check if it's too long
+		str_format(aNameWithPrefix, sizeof(aNameWithPrefix), "%s_%s", pSkinPrefix, pName);
 		// If we find something, use it, otherwise fall back to normal skins.
-		const auto *pResult = FindImpl(aBuf);
+		const auto *pResult = FindImpl(aNameWithPrefix);
 		if(pResult != nullptr)
 		{
 			return pResult;
 		}
 	}
+
 	return FindImpl(pName);
 }
 
@@ -406,13 +390,13 @@ const CSkin *CSkins::FindImpl(const char *pName)
 	if(!g_Config.m_ClDownloadSkins)
 		return nullptr;
 
-	if(str_find(pName, "/") != 0)
+	if(!CSkin::IsValidName(pName))
 		return nullptr;
 
 	const auto SkinDownloadIt = m_DownloadSkins.find(pName);
 	if(SkinDownloadIt != m_DownloadSkins.end())
 	{
-		if(SkinDownloadIt->second->m_pTask && SkinDownloadIt->second->m_pTask->State() == HTTP_DONE)
+		if(SkinDownloadIt->second->m_pTask && SkinDownloadIt->second->m_pTask->State() == EHttpState::DONE && SkinDownloadIt->second->m_pTask->m_Info.m_pData)
 		{
 			char aPath[IO_MAX_PATH_LENGTH];
 			str_format(aPath, sizeof(aPath), "downloadedskins/%s.png", SkinDownloadIt->second->GetName());
@@ -422,7 +406,7 @@ const CSkin *CSkins::FindImpl(const char *pName)
 			--m_DownloadingSkins;
 			return pSkin;
 		}
-		if(SkinDownloadIt->second->m_pTask && (SkinDownloadIt->second->m_pTask->State() == HTTP_ERROR || SkinDownloadIt->second->m_pTask->State() == HTTP_ABORTED))
+		if(SkinDownloadIt->second->m_pTask && (SkinDownloadIt->second->m_pTask->State() == EHttpState::ERROR || SkinDownloadIt->second->m_pTask->State() == EHttpState::ABORTED))
 		{
 			SkinDownloadIt->second->m_pTask = nullptr;
 			--m_DownloadingSkins;
@@ -432,16 +416,62 @@ const CSkin *CSkins::FindImpl(const char *pName)
 
 	CDownloadSkin Skin{pName};
 
-	char aUrl[IO_MAX_PATH_LENGTH];
 	char aEscapedName[256];
 	EscapeUrl(aEscapedName, sizeof(aEscapedName), pName);
+	char aUrl[IO_MAX_PATH_LENGTH];
 	str_format(aUrl, sizeof(aUrl), "%s%s.png", g_Config.m_ClDownloadCommunitySkins != 0 ? g_Config.m_ClSkinCommunityDownloadUrl : g_Config.m_ClSkinDownloadUrl, aEscapedName);
+
 	char aBuf[IO_MAX_PATH_LENGTH];
 	str_format(Skin.m_aPath, sizeof(Skin.m_aPath), "downloadedskins/%s", IStorage::FormatTmpPath(aBuf, sizeof(aBuf), pName));
+
 	Skin.m_pTask = std::make_shared<CGetPngFile>(this, aUrl, Storage(), Skin.m_aPath);
-	m_pClient->Engine()->AddJob(Skin.m_pTask);
+	Http()->Run(Skin.m_pTask);
+
 	auto &&pDownloadSkin = std::make_unique<CDownloadSkin>(std::move(Skin));
 	m_DownloadSkins.insert({pDownloadSkin->GetName(), std::move(pDownloadSkin)});
 	++m_DownloadingSkins;
+
 	return nullptr;
 }
+
+void CSkins::RandomizeSkin(int Dummy)
+{
+	static const float s_aSchemes[] = {1.0f / 2.0f, 1.0f / 3.0f, 1.0f / -3.0f, 1.0f / 12.0f, 1.0f / -12.0f}; // complementary, triadic, analogous
+	const bool UseCustomColor = Dummy ? g_Config.m_ClDummyUseCustomColor : g_Config.m_ClPlayerUseCustomColor;
+	if(UseCustomColor)
+	{
+		float GoalSat = random_float(0.3f, 1.0f);
+		float MaxBodyLht = 1.0f - GoalSat * GoalSat; // max allowed lightness before we start losing saturation
+
+		ColorHSLA Body;
+		Body.h = random_float();
+		Body.l = random_float(0.0f, MaxBodyLht);
+		Body.s = clamp(GoalSat * GoalSat / (1.0f - Body.l), 0.0f, 1.0f);
+
+		ColorHSLA Feet;
+		Feet.h = std::fmod(Body.h + s_aSchemes[rand() % std::size(s_aSchemes)], 1.0f);
+		Feet.l = random_float();
+		Feet.s = clamp(GoalSat * GoalSat / (1.0f - Feet.l), 0.0f, 1.0f);
+
+		unsigned *pColorBody = Dummy ? &g_Config.m_ClDummyColorBody : &g_Config.m_ClPlayerColorBody;
+		unsigned *pColorFeet = Dummy ? &g_Config.m_ClDummyColorFeet : &g_Config.m_ClPlayerColorFeet;
+
+		*pColorBody = Body.Pack(false);
+		*pColorFeet = Feet.Pack(false);
+	}
+
+	const size_t SkinNameSize = Dummy ? sizeof(g_Config.m_ClDummySkin) : sizeof(g_Config.m_ClPlayerSkin);
+	char aRandomSkinName[24];
+	str_copy(aRandomSkinName, "default", SkinNameSize);
+	if(!m_pClient->m_Skins.GetSkinsUnsafe().empty())
+	{
+		do
+		{
+			auto it = m_pClient->m_Skins.GetSkinsUnsafe().begin();
+			std::advance(it, rand() % m_pClient->m_Skins.GetSkinsUnsafe().size());
+			str_copy(aRandomSkinName, (*it).second->GetName(), SkinNameSize);
+		} while(!str_comp(aRandomSkinName, "x_ninja") || !str_comp(aRandomSkinName, "x_spec"));
+	}
+	char *pSkinName = Dummy ? g_Config.m_ClDummySkin : g_Config.m_ClPlayerSkin;
+	str_copy(pSkinName, aRandomSkinName, SkinNameSize);
+}
diff --git a/src/game/client/components/skins.h b/src/game/client/components/skins.h
index 677350fca4..cf648f6ad9 100644
--- a/src/game/client/components/skins.h
+++ b/src/game/client/components/skins.h
@@ -13,14 +13,14 @@
 class CSkins : public CComponent
 {
 public:
-	CSkins() = default;
+	CSkins();
 
 	class CGetPngFile : public CHttpRequest
 	{
 		CSkins *m_pSkins;
 
 	protected:
-		virtual int OnCompletion(int State) override;
+		virtual void OnCompletion(EHttpState State) override;
 
 	public:
 		CGetPngFile(CSkins *pSkins, const char *pUrl, IStorage *pStorage, const char *pDest);
@@ -66,6 +66,7 @@ class CSkins : public CComponent
 	std::unordered_map<std::string_view, std::unique_ptr<CSkin>> &GetSkinsUnsafe() { return m_Skins; }
 	const CSkin *FindOrNullptr(const char *pName, bool IgnorePrefix = false);
 	const CSkin *Find(const char *pName);
+	void RandomizeSkin(int Dummy);
 
 	bool IsDownloadingSkins() { return m_DownloadingSkins; }
 
@@ -79,10 +80,11 @@ class CSkins : public CComponent
 private:
 	std::unordered_map<std::string_view, std::unique_ptr<CSkin>> m_Skins;
 	std::unordered_map<std::string_view, std::unique_ptr<CDownloadSkin>> m_DownloadSkins;
+	CSkin m_PlaceholderSkin;
 	size_t m_DownloadingSkins = 0;
 	char m_aEventSkinPrefix[24];
 
-	bool LoadSkinPNG(CImageInfo &Info, const char *pName, const char *pPath, int DirType);
+	bool LoadSkinPng(CImageInfo &Info, const char *pName, const char *pPath, int DirType);
 	const CSkin *LoadSkin(const char *pName, const char *pPath, int DirType);
 	const CSkin *LoadSkin(const char *pName, CImageInfo &Info);
 	const CSkin *FindImpl(const char *pName);
diff --git a/src/game/client/components/skins7.cpp b/src/game/client/components/skins7.cpp
new file mode 100644
index 0000000000..6dc5a18a20
--- /dev/null
+++ b/src/game/client/components/skins7.cpp
@@ -0,0 +1,579 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/color.h>
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/external/json-parser/json.h>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/jsonwriter.h>
+#include <engine/shared/localization.h>
+#include <engine/shared/protocol7.h>
+#include <engine/storage.h>
+
+#include <game/client/gameclient.h>
+#include <game/localization.h>
+
+#include "menus.h"
+#include "skins7.h"
+
+const char *const CSkins7::ms_apSkinPartNames[protocol7::NUM_SKINPARTS] = {"body", "marking", "decoration", "hands", "feet", "eyes"};
+const char *const CSkins7::ms_apSkinPartNamesLocalized[protocol7::NUM_SKINPARTS] = {Localizable("Body", "skins"), Localizable("Marking", "skins"), Localizable("Decoration", "skins"), Localizable("Hands", "skins"), Localizable("Feet", "skins"), Localizable("Eyes", "skins")};
+const char *const CSkins7::ms_apColorComponents[NUM_COLOR_COMPONENTS] = {"hue", "sat", "lgt", "alp"};
+
+char *CSkins7::ms_apSkinNameVariables[NUM_DUMMIES] = {0};
+char *CSkins7::ms_apSkinVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
+int *CSkins7::ms_apUCCVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
+int unsigned *CSkins7::ms_apColorVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
+
+#define SKINS_DIR "skins7"
+
+// TODO: uncomment
+// const float MIN_EYE_BODY_COLOR_DIST = 80.f; // between body and eyes (LAB color space)
+
+int CSkins7::SkinPartScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	CSkins7 *pSelf = (CSkins7 *)pUser;
+	if(IsDir || !str_endswith(pName, ".png"))
+		return 0;
+
+	size_t PartNameSize, PartNameCount;
+	str_utf8_stats(pName, str_length(pName) - str_length(".png") + 1, IO_MAX_PATH_LENGTH, &PartNameSize, &PartNameCount);
+	if(PartNameSize >= protocol7::MAX_SKIN_ARRAY_SIZE || PartNameCount > protocol7::MAX_SKIN_LENGTH)
+	{
+		log_error("skins7", "Failed to load skin part '%s': name too long", pName);
+		return 0;
+	}
+
+	CSkinPart Part;
+	str_copy(Part.m_aName, pName, minimum<int>(PartNameSize + 1, sizeof(Part.m_aName)));
+	if(pSelf->FindSkinPart(pSelf->m_ScanningPart, Part.m_aName, true) != -1)
+		return 0;
+
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), SKINS_DIR "/%s/%s", CSkins7::ms_apSkinPartNames[pSelf->m_ScanningPart], pName);
+	CImageInfo Info;
+	if(!pSelf->Graphics()->LoadPng(Info, aFilename, DirType))
+	{
+		log_error("skins7", "Failed to load skin part '%s'", pName);
+		return 0;
+	}
+	if(!pSelf->Graphics()->IsImageFormatRgba(aFilename, Info))
+	{
+		log_error("skins7", "Failed to load skin part '%s': must be RGBA format", pName);
+		Info.Free();
+		return 0;
+	}
+
+	Part.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info, 0, aFilename);
+	Part.m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f);
+
+	const int Step = 4;
+	unsigned char *pData = (unsigned char *)Info.m_pData;
+
+	// dig out blood color
+	if(pSelf->m_ScanningPart == protocol7::SKINPART_BODY)
+	{
+		int Pitch = Info.m_Width * Step;
+		int PartX = Info.m_Width / 2;
+		int PartY = 0;
+		int PartWidth = Info.m_Width / 2;
+		int PartHeight = Info.m_Height / 2;
+
+		int64_t aColors[3] = {0};
+		for(int y = PartY; y < PartY + PartHeight; y++)
+			for(int x = PartX; x < PartX + PartWidth; x++)
+				if(pData[y * Pitch + x * Step + 3] > 128)
+					for(int c = 0; c < 3; c++)
+						aColors[c] += pData[y * Pitch + x * Step + c];
+
+		Part.m_BloodColor = ColorRGBA(normalize(vec3(aColors[0], aColors[1], aColors[2])));
+	}
+
+	ConvertToGrayscale(Info);
+
+	Part.m_ColorTexture = pSelf->Graphics()->LoadTextureRawMove(Info, 0, aFilename);
+
+	// set skin part data
+	Part.m_Flags = 0;
+	if(pName[0] == 'x' && pName[1] == '_')
+		Part.m_Flags |= SKINFLAG_SPECIAL;
+	if(DirType != IStorage::TYPE_SAVE)
+		Part.m_Flags |= SKINFLAG_STANDARD;
+
+	if(pSelf->Config()->m_Debug)
+	{
+		log_trace("skins7", "Loaded skin part '%s'", Part.m_aName);
+	}
+	pSelf->m_avSkinParts[pSelf->m_ScanningPart].emplace_back(Part);
+
+	return 0;
+}
+
+int CSkins7::SkinScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	if(IsDir || !str_endswith(pName, ".json"))
+		return 0;
+
+	CSkins7 *pSelf = (CSkins7 *)pUser;
+
+	// read file data into buffer
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), SKINS_DIR "/%s", pName);
+	void *pFileData;
+	unsigned JsonFileSize;
+	if(!pSelf->Storage()->ReadFile(aFilename, IStorage::TYPE_ALL, &pFileData, &JsonFileSize))
+	{
+		return 0;
+	}
+
+	// init
+	CSkin Skin = pSelf->m_DummySkin;
+	int NameLength = str_length(pName);
+	str_copy(Skin.m_aName, pName, 1 + NameLength - str_length(".json"));
+	bool SpecialSkin = pName[0] == 'x' && pName[1] == '_';
+
+	// parse json data
+	json_settings JsonSettings;
+	mem_zero(&JsonSettings, sizeof(JsonSettings));
+	char aError[256];
+	json_value *pJsonData = json_parse_ex(&JsonSettings, static_cast<const json_char *>(pFileData), JsonFileSize, aError);
+	free(pFileData);
+
+	if(pJsonData == nullptr)
+	{
+		log_error("skins7", "Failed to parse skin json file '%s': %s", aFilename, aError);
+		return 0;
+	}
+
+	// extract data
+	const json_value &Start = (*pJsonData)["skin"];
+	if(Start.type == json_object)
+	{
+		for(int PartIndex = 0; PartIndex < protocol7::NUM_SKINPARTS; ++PartIndex)
+		{
+			const json_value &Part = Start[(const char *)ms_apSkinPartNames[PartIndex]];
+			if(Part.type != json_object)
+				continue;
+
+			// filename
+			const json_value &Filename = Part["filename"];
+			if(Filename.type == json_string)
+			{
+				int SkinPart = pSelf->FindSkinPart(PartIndex, (const char *)Filename, SpecialSkin);
+				if(SkinPart > -1)
+					Skin.m_apParts[PartIndex] = pSelf->GetSkinPart(PartIndex, SkinPart);
+			}
+
+			// use custom colors
+			bool UseCustomColors = false;
+			const json_value &Color = Part["custom_colors"];
+			if(Color.type == json_string)
+				UseCustomColors = str_comp((const char *)Color, "true") == 0;
+			else if(Color.type == json_boolean)
+				UseCustomColors = Color.u.boolean;
+			Skin.m_aUseCustomColors[PartIndex] = UseCustomColors;
+
+			// color components
+			if(!UseCustomColors)
+				continue;
+
+			for(int i = 0; i < NUM_COLOR_COMPONENTS; i++)
+			{
+				if(PartIndex != protocol7::SKINPART_MARKING && i == 3)
+					continue;
+
+				const json_value &Component = Part[(const char *)ms_apColorComponents[i]];
+				if(Component.type == json_integer)
+				{
+					switch(i)
+					{
+					case 0: Skin.m_aPartColors[PartIndex] = (Skin.m_aPartColors[PartIndex] & 0xFF00FFFF) | (Component.u.integer << 16); break;
+					case 1: Skin.m_aPartColors[PartIndex] = (Skin.m_aPartColors[PartIndex] & 0xFFFF00FF) | (Component.u.integer << 8); break;
+					case 2: Skin.m_aPartColors[PartIndex] = (Skin.m_aPartColors[PartIndex] & 0xFFFFFF00) | Component.u.integer; break;
+					case 3: Skin.m_aPartColors[PartIndex] = (Skin.m_aPartColors[PartIndex] & 0x00FFFFFF) | (Component.u.integer << 24); break;
+					}
+				}
+			}
+		}
+	}
+
+	// clean up
+	json_value_free(pJsonData);
+
+	// set skin data
+	Skin.m_Flags = SpecialSkin ? SKINFLAG_SPECIAL : 0;
+	if(DirType != IStorage::TYPE_SAVE)
+		Skin.m_Flags |= SKINFLAG_STANDARD;
+
+	if(pSelf->Config()->m_Debug)
+	{
+		log_trace("skins7", "Loaded skin '%s'", Skin.m_aName);
+	}
+	pSelf->m_vSkins.insert(std::lower_bound(pSelf->m_vSkins.begin(), pSelf->m_vSkins.end(), Skin), Skin);
+
+	return 0;
+}
+
+int CSkins7::GetInitAmount() const
+{
+	return protocol7::NUM_SKINPARTS * 5 + 8;
+}
+
+void CSkins7::OnInit()
+{
+	int Dummy = 0;
+	ms_apSkinNameVariables[Dummy] = Config()->m_ClPlayer7Skin;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_BODY] = Config()->m_ClPlayer7SkinBody;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_MARKING] = Config()->m_ClPlayer7SkinMarking;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_DECORATION] = Config()->m_ClPlayer7SkinDecoration;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_HANDS] = Config()->m_ClPlayer7SkinHands;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_FEET] = Config()->m_ClPlayer7SkinFeet;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_EYES] = Config()->m_ClPlayer7SkinEyes;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_BODY] = &Config()->m_ClPlayer7UseCustomColorBody;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_MARKING] = &Config()->m_ClPlayer7UseCustomColorMarking;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_DECORATION] = &Config()->m_ClPlayer7UseCustomColorDecoration;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_HANDS] = &Config()->m_ClPlayer7UseCustomColorHands;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_FEET] = &Config()->m_ClPlayer7UseCustomColorFeet;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_EYES] = &Config()->m_ClPlayer7UseCustomColorEyes;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_BODY] = &Config()->m_ClPlayer7ColorBody;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_MARKING] = &Config()->m_ClPlayer7ColorMarking;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_DECORATION] = &Config()->m_ClPlayer7ColorDecoration;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_HANDS] = &Config()->m_ClPlayer7ColorHands;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_FEET] = &Config()->m_ClPlayer7ColorFeet;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_EYES] = &Config()->m_ClPlayer7ColorEyes;
+
+	Dummy = 1;
+	ms_apSkinNameVariables[Dummy] = Config()->m_ClDummy7Skin;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_BODY] = Config()->m_ClDummy7SkinBody;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_MARKING] = Config()->m_ClDummy7SkinMarking;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_DECORATION] = Config()->m_ClDummy7SkinDecoration;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_HANDS] = Config()->m_ClDummy7SkinHands;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_FEET] = Config()->m_ClDummy7SkinFeet;
+	ms_apSkinVariables[Dummy][protocol7::SKINPART_EYES] = Config()->m_ClDummy7SkinEyes;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_BODY] = &Config()->m_ClDummy7UseCustomColorBody;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_MARKING] = &Config()->m_ClDummy7UseCustomColorMarking;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_DECORATION] = &Config()->m_ClDummy7UseCustomColorDecoration;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_HANDS] = &Config()->m_ClDummy7UseCustomColorHands;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_FEET] = &Config()->m_ClDummy7UseCustomColorFeet;
+	ms_apUCCVariables[Dummy][protocol7::SKINPART_EYES] = &Config()->m_ClDummy7UseCustomColorEyes;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_BODY] = &Config()->m_ClDummy7ColorBody;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_MARKING] = &Config()->m_ClDummy7ColorMarking;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_DECORATION] = &Config()->m_ClDummy7ColorDecoration;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_HANDS] = &Config()->m_ClDummy7ColorHands;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_FEET] = &Config()->m_ClDummy7ColorFeet;
+	ms_apColorVariables[Dummy][protocol7::SKINPART_EYES] = &Config()->m_ClDummy7ColorEyes;
+
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		m_avSkinParts[Part].clear();
+
+		// add none part
+		if(Part == protocol7::SKINPART_MARKING || Part == protocol7::SKINPART_DECORATION)
+		{
+			CSkinPart NoneSkinPart;
+			NoneSkinPart.m_Flags = SKINFLAG_STANDARD;
+			NoneSkinPart.m_aName[0] = '\0';
+			NoneSkinPart.m_BloodColor = vec3(1.0f, 1.0f, 1.0f);
+			m_avSkinParts[Part].emplace_back(NoneSkinPart);
+		}
+
+		// load skin parts
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), SKINS_DIR "/%s", ms_apSkinPartNames[Part]);
+		m_ScanningPart = Part;
+		Storage()->ListDirectory(IStorage::TYPE_ALL, aBuf, SkinPartScan, this);
+
+		// add dummy skin part
+		if(m_avSkinParts[Part].empty())
+		{
+			CSkinPart DummySkinPart;
+			DummySkinPart.m_Flags = SKINFLAG_STANDARD;
+			str_copy(DummySkinPart.m_aName, "dummy");
+			DummySkinPart.m_BloodColor = vec3(1.0f, 1.0f, 1.0f);
+			m_avSkinParts[Part].emplace_back(DummySkinPart);
+		}
+
+		GameClient()->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading skin files"), 0);
+	}
+
+	// create dummy skin
+	m_DummySkin.m_Flags = SKINFLAG_STANDARD;
+	str_copy(m_DummySkin.m_aName, "dummy");
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		int Default;
+		if(Part == protocol7::SKINPART_MARKING || Part == protocol7::SKINPART_DECORATION)
+			Default = FindSkinPart(Part, "", false);
+		else
+			Default = FindSkinPart(Part, "standard", false);
+		if(Default < 0)
+			Default = 0;
+		m_DummySkin.m_apParts[Part] = GetSkinPart(Part, Default);
+		m_DummySkin.m_aPartColors[Part] = Part == protocol7::SKINPART_MARKING ? (255 << 24) + 65408 : 65408;
+		m_DummySkin.m_aUseCustomColors[Part] = 0;
+	}
+	GameClient()->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading skin files"), 0);
+
+	// load skins
+	m_vSkins.clear();
+	Storage()->ListDirectory(IStorage::TYPE_ALL, SKINS_DIR, SkinScan, this);
+	GameClient()->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading skin files"), 0);
+
+	// add dummy skin
+	if(m_vSkins.empty())
+		m_vSkins.emplace_back(m_DummySkin);
+
+	LoadXmasHat();
+	LoadBotDecoration();
+	GameClient()->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading skin files"), 0);
+}
+
+void CSkins7::LoadXmasHat()
+{
+	const char *pFilename = SKINS_DIR "/xmas_hat.png";
+	CImageInfo Info;
+	if(!Graphics()->LoadPng(Info, pFilename, IStorage::TYPE_ALL) ||
+		!Graphics()->IsImageFormatRgba(pFilename, Info) ||
+		!Graphics()->CheckImageDivisibility(pFilename, Info, 1, 4, false))
+	{
+		log_error("skins7", "Failed to xmas hat '%s'", pFilename);
+		Info.Free();
+	}
+	else
+	{
+		if(Config()->m_Debug)
+		{
+			log_trace("skins7", "Loaded xmas hat '%s'", pFilename);
+		}
+		m_XmasHatTexture = Graphics()->LoadTextureRawMove(Info, 0, pFilename);
+	}
+}
+
+void CSkins7::LoadBotDecoration()
+{
+	const char *pFilename = SKINS_DIR "/bot.png";
+	CImageInfo Info;
+	if(!Graphics()->LoadPng(Info, pFilename, IStorage::TYPE_ALL) ||
+		!Graphics()->IsImageFormatRgba(pFilename, Info) ||
+		!Graphics()->CheckImageDivisibility(pFilename, Info, 12, 5, false))
+	{
+		log_error("skins7", "Failed to load bot '%s'", pFilename);
+		Info.Free();
+	}
+	else
+	{
+		if(Config()->m_Debug)
+		{
+			log_trace("skins7", "Loaded bot '%s'", pFilename);
+		}
+		m_BotTexture = Graphics()->LoadTextureRawMove(Info, 0, pFilename);
+	}
+}
+
+void CSkins7::AddSkin(const char *pSkinName, int Dummy)
+{
+	CSkin Skin = m_DummySkin;
+	Skin.m_Flags = 0;
+	str_copy(Skin.m_aName, pSkinName, sizeof(Skin.m_aName));
+	for(int PartIndex = 0; PartIndex < protocol7::NUM_SKINPARTS; ++PartIndex)
+	{
+		int SkinPart = FindSkinPart(PartIndex, ms_apSkinVariables[Dummy][PartIndex], false);
+		if(SkinPart > -1)
+			Skin.m_apParts[PartIndex] = GetSkinPart(PartIndex, SkinPart);
+		Skin.m_aUseCustomColors[PartIndex] = *ms_apUCCVariables[Dummy][PartIndex];
+		Skin.m_aPartColors[PartIndex] = *ms_apColorVariables[Dummy][PartIndex];
+	}
+	int SkinIndex = Find(Skin.m_aName, false);
+	if(SkinIndex != -1)
+		m_vSkins[SkinIndex] = Skin;
+	else
+		m_vSkins.emplace_back(Skin);
+}
+
+bool CSkins7::RemoveSkin(const CSkin *pSkin)
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), SKINS_DIR "/%s.json", pSkin->m_aName);
+	if(!Storage()->RemoveFile(aBuf, IStorage::TYPE_SAVE))
+	{
+		return false;
+	}
+
+	auto Position = std::find(m_vSkins.begin(), m_vSkins.end(), *pSkin);
+	m_vSkins.erase(Position);
+	return true;
+}
+
+int CSkins7::Num()
+{
+	return m_vSkins.size();
+}
+
+int CSkins7::NumSkinPart(int Part)
+{
+	return m_avSkinParts[Part].size();
+}
+
+const CSkins7::CSkin *CSkins7::Get(int Index)
+{
+	return &m_vSkins[maximum((std::size_t)0, Index % m_vSkins.size())];
+}
+
+int CSkins7::Find(const char *pName, bool AllowSpecialSkin)
+{
+	for(unsigned int i = 0; i < m_vSkins.size(); i++)
+	{
+		if(str_comp(m_vSkins[i].m_aName, pName) == 0 && ((m_vSkins[i].m_Flags & SKINFLAG_SPECIAL) == 0 || AllowSpecialSkin))
+			return i;
+	}
+	return -1;
+}
+
+const CSkins7::CSkinPart *CSkins7::GetSkinPart(int Part, int Index)
+{
+	int Size = m_avSkinParts[Part].size();
+	return &m_avSkinParts[Part][maximum(0, Index % Size)];
+}
+
+int CSkins7::FindSkinPart(int Part, const char *pName, bool AllowSpecialPart)
+{
+	for(unsigned int i = 0; i < m_avSkinParts[Part].size(); i++)
+	{
+		if(str_comp(m_avSkinParts[Part][i].m_aName, pName) == 0 && ((m_avSkinParts[Part][i].m_Flags & SKINFLAG_SPECIAL) == 0 || AllowSpecialPart))
+			return i;
+	}
+	return -1;
+}
+
+void CSkins7::RandomizeSkin(int Dummy)
+{
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		int Hue = rand() % 255;
+		int Sat = rand() % 255;
+		int Lgt = rand() % 255;
+		int Alp = 0;
+		if(Part == protocol7::SKINPART_MARKING)
+			Alp = rand() % 255;
+		int ColorVariable = (Alp << 24) | (Hue << 16) | (Sat << 8) | Lgt;
+		*ms_apUCCVariables[Dummy][Part] = true;
+		*ms_apColorVariables[Dummy][Part] = ColorVariable;
+	}
+
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		const CSkinPart *pSkinPart = GetSkinPart(Part, rand() % NumSkinPart(Part));
+		while(pSkinPart->m_Flags & SKINFLAG_SPECIAL)
+			pSkinPart = GetSkinPart(Part, rand() % NumSkinPart(Part));
+		str_copy(ms_apSkinVariables[Dummy][Part], pSkinPart->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+	}
+
+	ms_apSkinNameVariables[Dummy][0] = '\0';
+}
+
+ColorRGBA CSkins7::GetColor(int Value, bool UseAlpha) const
+{
+	return color_cast<ColorRGBA>(ColorHSLA(Value, UseAlpha).UnclampLighting(ColorHSLA::DARKEST_LGT7));
+}
+
+ColorRGBA CSkins7::GetTeamColor(int UseCustomColors, int PartColor, int Team, int Part) const
+{
+	static const int s_aTeamColors[3] = {0xC4C34E, 0x00FF6B, 0x9BFF6B};
+
+	int TeamHue = (s_aTeamColors[Team + 1] >> 16) & 0xff;
+	int TeamSat = (s_aTeamColors[Team + 1] >> 8) & 0xff;
+	int TeamLgt = s_aTeamColors[Team + 1] & 0xff;
+	int PartSat = (PartColor >> 8) & 0xff;
+	int PartLgt = PartColor & 0xff;
+
+	if(!UseCustomColors)
+	{
+		PartSat = 255;
+		PartLgt = 255;
+	}
+
+	int MinSat = 160;
+	int MaxSat = 255;
+
+	int h = TeamHue;
+	int s = clamp(mix(TeamSat, PartSat, 0.2), MinSat, MaxSat);
+	int l = clamp(mix(TeamLgt, PartLgt, 0.2), (int)ColorHSLA::DARKEST_LGT7, 200);
+
+	int ColorVal = (h << 16) + (s << 8) + l;
+
+	return GetColor(ColorVal, Part == protocol7::SKINPART_MARKING);
+}
+
+bool CSkins7::ValidateSkinParts(char *apPartNames[protocol7::NUM_SKINPARTS], int *pUseCustomColors, int *pPartColors, int GameFlags) const
+{
+	// force standard (black) eyes on team skins
+	if(GameFlags & GAMEFLAG_TEAMS)
+	{
+		// TODO: adjust eye color here as well?
+		if(str_comp(apPartNames[protocol7::SKINPART_EYES], "colorable") == 0 || str_comp(apPartNames[protocol7::SKINPART_EYES], "negative") == 0)
+		{
+			str_copy(apPartNames[protocol7::SKINPART_EYES], "standard", protocol7::MAX_SKIN_ARRAY_SIZE);
+			return false;
+		}
+	}
+	return true;
+}
+
+bool CSkins7::SaveSkinfile(const char *pSaveSkinName, int Dummy)
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), SKINS_DIR "/%s.json", pSaveSkinName);
+	IOHANDLE File = Storage()->OpenFile(aBuf, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!File)
+		return false;
+
+	CJsonFileWriter Writer(File);
+
+	Writer.BeginObject();
+	Writer.WriteAttribute("skin");
+	Writer.BeginObject();
+	for(int PartIndex = 0; PartIndex < protocol7::NUM_SKINPARTS; PartIndex++)
+	{
+		if(!ms_apSkinVariables[Dummy][PartIndex][0])
+			continue;
+
+		// part start
+		Writer.WriteAttribute(ms_apSkinPartNames[PartIndex]);
+		Writer.BeginObject();
+		{
+			Writer.WriteAttribute("filename");
+			Writer.WriteStrValue(ms_apSkinVariables[Dummy][PartIndex]);
+
+			const bool CustomColors = *ms_apUCCVariables[Dummy][PartIndex];
+			Writer.WriteAttribute("custom_colors");
+			Writer.WriteBoolValue(CustomColors);
+
+			if(CustomColors)
+			{
+				for(int ColorComponent = 0; ColorComponent < NUM_COLOR_COMPONENTS - 1; ColorComponent++)
+				{
+					int Val = (*ms_apColorVariables[Dummy][PartIndex] >> (2 - ColorComponent) * 8) & 0xff;
+					Writer.WriteAttribute(ms_apColorComponents[ColorComponent]);
+					Writer.WriteIntValue(Val);
+				}
+				if(PartIndex == protocol7::SKINPART_MARKING)
+				{
+					int Val = (*ms_apColorVariables[Dummy][PartIndex] >> 24) & 0xff;
+					Writer.WriteAttribute(ms_apColorComponents[3]);
+					Writer.WriteIntValue(Val);
+				}
+			}
+		}
+		Writer.EndObject();
+	}
+	Writer.EndObject();
+	Writer.EndObject();
+
+	// add new skin to the skin list
+	AddSkin(pSaveSkinName, Dummy);
+	return true;
+}
diff --git a/src/game/client/components/skins7.h b/src/game/client/components/skins7.h
new file mode 100644
index 0000000000..3cfd1f74fb
--- /dev/null
+++ b/src/game/client/components/skins7.h
@@ -0,0 +1,100 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_SKINS7_H
+#define GAME_CLIENT_COMPONENTS_SKINS7_H
+#include <base/color.h>
+#include <base/vmath.h>
+#include <engine/client/enums.h>
+#include <engine/graphics.h>
+#include <game/client/component.h>
+#include <vector>
+
+#include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
+
+class CSkins7 : public CComponent
+{
+public:
+	enum
+	{
+		SKINFLAG_SPECIAL = 1 << 0,
+		SKINFLAG_STANDARD = 1 << 1,
+
+		NUM_COLOR_COMPONENTS = 4,
+
+		HAT_NUM = 2,
+		HAT_OFFSET_SIDE = 2,
+	};
+
+	struct CSkinPart
+	{
+		int m_Flags;
+		char m_aName[24];
+		IGraphics::CTextureHandle m_OrgTexture;
+		IGraphics::CTextureHandle m_ColorTexture;
+		ColorRGBA m_BloodColor;
+
+		bool operator<(const CSkinPart &Other) { return str_comp_nocase(m_aName, Other.m_aName) < 0; }
+	};
+
+	struct CSkin
+	{
+		int m_Flags;
+		char m_aName[24];
+		const CSkinPart *m_apParts[protocol7::NUM_SKINPARTS];
+		int m_aPartColors[protocol7::NUM_SKINPARTS];
+		int m_aUseCustomColors[protocol7::NUM_SKINPARTS];
+
+		bool operator<(const CSkin &Other) const { return str_comp_nocase(m_aName, Other.m_aName) < 0; }
+		bool operator==(const CSkin &Other) const { return !str_comp(m_aName, Other.m_aName); }
+	};
+
+	static const char *const ms_apSkinPartNames[protocol7::NUM_SKINPARTS];
+	static const char *const ms_apSkinPartNamesLocalized[protocol7::NUM_SKINPARTS];
+	static const char *const ms_apColorComponents[NUM_COLOR_COMPONENTS];
+
+	static char *ms_apSkinNameVariables[NUM_DUMMIES];
+	static char *ms_apSkinVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS];
+	static int *ms_apUCCVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS]; // use custom color
+	static unsigned int *ms_apColorVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS];
+	IGraphics::CTextureHandle m_XmasHatTexture;
+	IGraphics::CTextureHandle m_BotTexture;
+
+	int GetInitAmount() const;
+	void OnInit() override;
+
+	void AddSkin(const char *pSkinName, int Dummy);
+	bool RemoveSkin(const CSkin *pSkin);
+
+	int Num();
+	int NumSkinPart(int Part);
+	const CSkin *Get(int Index);
+	int Find(const char *pName, bool AllowSpecialSkin);
+	const CSkinPart *GetSkinPart(int Part, int Index);
+	int FindSkinPart(int Part, const char *pName, bool AllowSpecialPart);
+	void RandomizeSkin(int Dummy);
+
+	ColorRGBA GetColor(int Value, bool UseAlpha) const;
+	ColorRGBA GetTeamColor(int UseCustomColors, int PartColor, int Team, int Part) const;
+
+	// returns true if everything was valid and nothing changed
+	bool ValidateSkinParts(char *apPartNames[protocol7::NUM_SKINPARTS], int *pUseCustomColors, int *pPartColors, int GameFlags) const;
+
+	bool SaveSkinfile(const char *pSaveSkinName, int Dummy);
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+private:
+	int m_ScanningPart;
+	std::vector<CSkinPart> m_avSkinParts[protocol7::NUM_SKINPARTS];
+	std::vector<CSkin> m_vSkins;
+	CSkin m_DummySkin;
+
+	static int SkinPartScan(const char *pName, int IsDir, int DirType, void *pUser);
+	static int SkinScan(const char *pName, int IsDir, int DirType, void *pUser);
+
+	void LoadXmasHat();
+	void LoadBotDecoration();
+};
+
+#endif
diff --git a/src/game/client/components/sounds.cpp b/src/game/client/components/sounds.cpp
index d1af20ccb5..d04a20fdf6 100644
--- a/src/game/client/components/sounds.cpp
+++ b/src/game/client/components/sounds.cpp
@@ -16,17 +16,21 @@ CSoundLoading::CSoundLoading(CGameClient *pGameClient, bool Render) :
 	m_pGameClient(pGameClient),
 	m_Render(Render)
 {
+	Abortable(true);
 }
 
 void CSoundLoading::Run()
 {
 	for(int s = 0; s < g_pData->m_NumSounds; s++)
 	{
-		const char *pLoadingCaption = Localize("Loading StormA Client");
+		const char *pLoadingCaption = Localize("Loading DDNet Client");
 		const char *pLoadingContent = Localize("Loading sound files");
 
 		for(int i = 0; i < g_pData->m_aSounds[s].m_NumSounds; i++)
 		{
+			if(State() == IJob::STATE_ABORTED)
+				return;
+
 			int Id = m_pGameClient->Sound()->LoadWV(g_pData->m_aSounds[s].m_aSounds[i].m_pFilename);
 			g_pData->m_aSounds[s].m_aSounds[i].m_Id = Id;
 			// try to render a frame
@@ -39,6 +43,38 @@ void CSoundLoading::Run()
 	}
 }
 
+void CSounds::UpdateChannels()
+{
+	const float NewGuiSoundVolume = g_Config.m_SndChatSoundVolume / 100.0f;
+	if(NewGuiSoundVolume != m_GuiSoundVolume)
+	{
+		m_GuiSoundVolume = NewGuiSoundVolume;
+		Sound()->SetChannel(CSounds::CHN_GUI, m_GuiSoundVolume, 0.0f);
+	}
+
+	const float NewGameSoundVolume = g_Config.m_SndGameSoundVolume / 100.0f;
+	if(NewGameSoundVolume != m_GameSoundVolume)
+	{
+		m_GameSoundVolume = NewGameSoundVolume;
+		Sound()->SetChannel(CSounds::CHN_WORLD, 0.9f * m_GameSoundVolume, 1.0f);
+		Sound()->SetChannel(CSounds::CHN_GLOBAL, m_GameSoundVolume, 0.0f);
+	}
+
+	const float NewMapSoundVolume = g_Config.m_SndMapSoundVolume / 100.0f;
+	if(NewMapSoundVolume != m_MapSoundVolume)
+	{
+		m_MapSoundVolume = NewMapSoundVolume;
+		Sound()->SetChannel(CSounds::CHN_MAPSOUND, m_MapSoundVolume, 1.0f);
+	}
+
+	const float NewBackgroundMusicVolume = g_Config.m_SndBackgroundMusicVolume / 100.0f;
+	if(NewBackgroundMusicVolume != m_BackgroundMusicVolume)
+	{
+		m_BackgroundMusicVolume = NewBackgroundMusicVolume;
+		Sound()->SetChannel(CSounds::CHN_MUSIC, m_BackgroundMusicVolume, 1.0f);
+	}
+}
+
 int CSounds::GetSampleId(int SetId)
 {
 	if(!g_Config.m_SndEnable || !Sound()->IsSoundEnabled() || m_WaitForSoundJob || SetId < 0 || SetId >= g_pData->m_NumSounds)
@@ -63,20 +99,7 @@ int CSounds::GetSampleId(int SetId)
 
 void CSounds::OnInit()
 {
-	// setup sound channels
-	m_GuiSoundVolume = g_Config.m_SndChatSoundVolume / 100.0f;
-	m_GameSoundVolume = g_Config.m_SndGameSoundVolume / 100.0f;
-	m_MapSoundVolume = g_Config.m_SndMapSoundVolume / 100.0f;
-	m_BackgroundMusicVolume = g_Config.m_SndBackgroundMusicVolume / 100.0f;
-
-	Sound()->SetChannel(CSounds::CHN_GUI, m_GuiSoundVolume, 0.0f);
-	Sound()->SetChannel(CSounds::CHN_MUSIC, m_BackgroundMusicVolume, 1.0f);
-	Sound()->SetChannel(CSounds::CHN_WORLD, 0.9f * m_GameSoundVolume, 1.0f);
-	Sound()->SetChannel(CSounds::CHN_GLOBAL, m_GameSoundVolume, 0.0f);
-	Sound()->SetChannel(CSounds::CHN_MAPSOUND, m_MapSoundVolume, 1.0f);
-
-	Sound()->SetListenerPos(0.0f, 0.0f);
-
+	UpdateChannels();
 	ClearQueue();
 
 	// load sounds
@@ -114,44 +137,14 @@ void CSounds::OnRender()
 	// check for sound initialisation
 	if(m_WaitForSoundJob)
 	{
-		if(m_pSoundJob->Status() == IJob::STATE_DONE)
+		if(m_pSoundJob->State() == IJob::STATE_DONE)
 			m_WaitForSoundJob = false;
 		else
 			return;
 	}
 
-	// set listener pos
-	Sound()->SetListenerPos(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
-
-	// update volume
-	float NewGuiSoundVol = g_Config.m_SndChatSoundVolume / 100.0f;
-	if(NewGuiSoundVol != m_GuiSoundVolume)
-	{
-		m_GuiSoundVolume = NewGuiSoundVol;
-		Sound()->SetChannel(CSounds::CHN_GUI, m_GuiSoundVolume, 1.0f);
-	}
-
-	float NewGameSoundVol = g_Config.m_SndGameSoundVolume / 100.0f;
-	if(NewGameSoundVol != m_GameSoundVolume)
-	{
-		m_GameSoundVolume = NewGameSoundVol;
-		Sound()->SetChannel(CSounds::CHN_WORLD, 0.9f * m_GameSoundVolume, 1.0f);
-		Sound()->SetChannel(CSounds::CHN_GLOBAL, m_GameSoundVolume, 1.0f);
-	}
-
-	float NewMapSoundVol = g_Config.m_SndMapSoundVolume / 100.0f;
-	if(NewMapSoundVol != m_MapSoundVolume)
-	{
-		m_MapSoundVolume = NewMapSoundVol;
-		Sound()->SetChannel(CSounds::CHN_MAPSOUND, m_MapSoundVolume, 1.0f);
-	}
-
-	float NewBackgroundMusicVol = g_Config.m_SndBackgroundMusicVolume / 100.0f;
-	if(NewBackgroundMusicVol != m_BackgroundMusicVolume)
-	{
-		m_BackgroundMusicVolume = NewBackgroundMusicVol;
-		Sound()->SetChannel(CSounds::CHN_MUSIC, m_BackgroundMusicVolume, 1.0f);
-	}
+	Sound()->SetListenerPosition(m_pClient->m_Camera.m_Center);
+	UpdateChannels();
 
 	// play sound from queue
 	if(m_QueuePos > 0)
@@ -187,49 +180,26 @@ void CSounds::Enqueue(int Channel, int SetId)
 	m_aQueue[m_QueuePos++].m_SetId = SetId;
 }
 
-void CSounds::PlayAndRecord(int Channel, int SetId, float Vol, vec2 Pos)
+void CSounds::PlayAndRecord(int Channel, int SetId, float Volume, vec2 Position)
 {
+	// TODO: Volume and position are currently not recorded for sounds played with this function
+	// TODO: This also causes desync sounds during demo playback of demos recorded on high ping servers:
+	//       https://github.com/ddnet/ddnet/issues/1282
 	CNetMsg_Sv_SoundGlobal Msg;
-	Msg.m_SoundID = SetId;
+	Msg.m_SoundId = SetId;
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_NOSEND | MSGFLAG_RECORD);
 
-	Play(Channel, SetId, Vol);
+	PlayAt(Channel, SetId, Volume, Position);
 }
 
-void CSounds::Play(int Channel, int SetId, float Vol)
+void CSounds::Play(int Channel, int SetId, float Volume)
 {
-	if(m_pClient->m_SuppressEvents)
-		return;
-	if(Channel == CHN_MUSIC && !g_Config.m_SndMusic)
-		return;
-
-	int SampleId = GetSampleId(SetId);
-	if(SampleId == -1)
-		return;
-
-	int Flags = 0;
-	if(Channel == CHN_MUSIC)
-		Flags = ISound::FLAG_LOOP;
-
-	Sound()->Play(Channel, SampleId, Flags);
+	PlaySample(Channel, GetSampleId(SetId), 0, Volume);
 }
 
-void CSounds::PlayAt(int Channel, int SetId, float Vol, vec2 Pos)
+void CSounds::PlayAt(int Channel, int SetId, float Volume, vec2 Position)
 {
-	if(m_pClient->m_SuppressEvents)
-		return;
-	if(Channel == CHN_MUSIC && !g_Config.m_SndMusic)
-		return;
-
-	int SampleId = GetSampleId(SetId);
-	if(SampleId == -1)
-		return;
-
-	int Flags = 0;
-	if(Channel == CHN_MUSIC)
-		Flags = ISound::FLAG_LOOP;
-
-	Sound()->PlayAt(Channel, SampleId, Flags, Pos.x, Pos.y);
+	PlaySampleAt(Channel, GetSampleId(SetId), 0, Volume, Position);
 }
 
 void CSounds::Stop(int SetId)
@@ -255,24 +225,24 @@ bool CSounds::IsPlaying(int SetId)
 	return false;
 }
 
-ISound::CVoiceHandle CSounds::PlaySample(int Channel, int SampleId, float Vol, int Flags)
+ISound::CVoiceHandle CSounds::PlaySample(int Channel, int SampleId, int Flags, float Volume)
 {
-	if((Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
+	if(m_pClient->m_SuppressEvents || (Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
 		return ISound::CVoiceHandle();
 
 	if(Channel == CHN_MUSIC)
 		Flags |= ISound::FLAG_LOOP;
 
-	return Sound()->Play(Channel, SampleId, Flags);
+	return Sound()->Play(Channel, SampleId, Flags, Volume);
 }
 
-ISound::CVoiceHandle CSounds::PlaySampleAt(int Channel, int SampleId, float Vol, vec2 Pos, int Flags)
+ISound::CVoiceHandle CSounds::PlaySampleAt(int Channel, int SampleId, int Flags, float Volume, vec2 Position)
 {
-	if((Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
+	if(m_pClient->m_SuppressEvents || (Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
 		return ISound::CVoiceHandle();
 
 	if(Channel == CHN_MUSIC)
 		Flags |= ISound::FLAG_LOOP;
 
-	return Sound()->PlayAt(Channel, SampleId, Flags, Pos.x, Pos.y);
+	return Sound()->PlayAt(Channel, SampleId, Flags, Volume, Position);
 }
diff --git a/src/game/client/components/sounds.h b/src/game/client/components/sounds.h
index 4ee5df561a..8671f3bf82 100644
--- a/src/game/client/components/sounds.h
+++ b/src/game/client/components/sounds.h
@@ -34,12 +34,13 @@ class CSounds : public CComponent
 	std::shared_ptr<CSoundLoading> m_pSoundJob;
 	bool m_WaitForSoundJob;
 
+	void UpdateChannels();
 	int GetSampleId(int SetId);
 
-	float m_GuiSoundVolume;
-	float m_GameSoundVolume;
-	float m_MapSoundVolume;
-	float m_BackgroundMusicVolume;
+	float m_GuiSoundVolume = -1.0f;
+	float m_GameSoundVolume = -1.0f;
+	float m_MapSoundVolume = -1.0f;
+	float m_BackgroundMusicVolume = -1.0f;
 
 public:
 	// sound channels
@@ -60,14 +61,14 @@ class CSounds : public CComponent
 
 	void ClearQueue();
 	void Enqueue(int Channel, int SetId);
-	void Play(int Channel, int SetId, float Vol);
-	void PlayAt(int Channel, int SetId, float Vol, vec2 Pos);
-	void PlayAndRecord(int Channel, int SetId, float Vol, vec2 Pos);
+	void Play(int Channel, int SetId, float Volume);
+	void PlayAt(int Channel, int SetId, float Volume, vec2 Position);
+	void PlayAndRecord(int Channel, int SetId, float Volume, vec2 Position);
 	void Stop(int SetId);
 	bool IsPlaying(int SetId);
 
-	ISound::CVoiceHandle PlaySample(int Channel, int SampleId, float Vol, int Flags = 0);
-	ISound::CVoiceHandle PlaySampleAt(int Channel, int SampleId, float Vol, vec2 Pos, int Flags = 0);
+	ISound::CVoiceHandle PlaySample(int Channel, int SampleId, int Flags, float Volume);
+	ISound::CVoiceHandle PlaySampleAt(int Channel, int SampleId, int Flags, float Volume, vec2 Position);
 };
 
 #endif
diff --git a/src/game/client/components/spectator.cpp b/src/game/client/components/spectator.cpp
index b6c981599f..1e29fccacb 100644
--- a/src/game/client/components/spectator.cpp
+++ b/src/game/client/components/spectator.cpp
@@ -1,7 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
-#include <climits>
+#include <limits>
 
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
@@ -20,7 +20,7 @@
 
 bool CSpectator::CanChangeSpectator()
 {
-	// Don't change SpectatorID when not spectating
+	// Don't change SpectatorId when not spectating
 	return m_pClient->m_Snap.m_SpecInfo.m_Active;
 }
 
@@ -29,12 +29,12 @@ void CSpectator::SpectateNext(bool Reverse)
 	int CurIndex = -1;
 	const CNetObj_PlayerInfo **paPlayerInfos = m_pClient->m_Snap.m_apInfoByDDTeamName;
 
-	// m_SpectatorID may be uninitialized if m_Active is false
+	// m_SpectatorId may be uninitialized if m_Active is false
 	if(m_pClient->m_Snap.m_SpecInfo.m_Active)
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(paPlayerInfos[i] && paPlayerInfos[i]->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID)
+			if(paPlayerInfos[i] && paPlayerInfos[i]->m_ClientId == m_pClient->m_Snap.m_SpecInfo.m_SpectatorId)
 			{
 				CurIndex = i;
 				break;
@@ -70,7 +70,7 @@ void CSpectator::SpectateNext(bool Reverse)
 		const CNetObj_PlayerInfo *pPlayerInfo = paPlayerInfos[PlayerIndex];
 		if(pPlayerInfo && pPlayerInfo->m_Team != TEAM_SPECTATORS)
 		{
-			Spectate(pPlayerInfo->m_ClientID);
+			Spectate(pPlayerInfo->m_ClientId);
 			break;
 		}
 	}
@@ -120,33 +120,33 @@ void CSpectator::ConSpectateClosest(IConsole::IResult *pResult, void *pUserData)
 		return;
 
 	const CGameClient::CSnapState &Snap = pSelf->m_pClient->m_Snap;
-	int SpectatorID = Snap.m_SpecInfo.m_SpectatorID;
+	int SpectatorId = Snap.m_SpecInfo.m_SpectatorId;
 
-	int NewSpectatorID = -1;
+	int NewSpectatorId = -1;
 
 	vec2 CurPosition(pSelf->m_pClient->m_Camera.m_Center);
-	if(SpectatorID != SPEC_FREEVIEW)
+	if(SpectatorId != SPEC_FREEVIEW)
 	{
-		const CNetObj_Character &CurCharacter = Snap.m_aCharacters[SpectatorID].m_Cur;
+		const CNetObj_Character &CurCharacter = Snap.m_aCharacters[SpectatorId].m_Cur;
 		CurPosition.x = CurCharacter.m_X;
 		CurPosition.y = CurCharacter.m_Y;
 	}
 
-	int ClosestDistance = INT_MAX;
+	int ClosestDistance = std::numeric_limits<int>::max();
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(i == SpectatorID || !Snap.m_apPlayerInfos[i] || Snap.m_apPlayerInfos[i]->m_Team == TEAM_SPECTATORS || (SpectatorID == SPEC_FREEVIEW && i == Snap.m_LocalClientID))
+		if(i == SpectatorId || !Snap.m_aCharacters[i].m_Active || !Snap.m_apPlayerInfos[i] || Snap.m_apPlayerInfos[i]->m_Team == TEAM_SPECTATORS || (SpectatorId == SPEC_FREEVIEW && i == Snap.m_LocalClientId))
 			continue;
 		const CNetObj_Character &MaybeClosestCharacter = Snap.m_aCharacters[i].m_Cur;
 		int Distance = distance(CurPosition, vec2(MaybeClosestCharacter.m_X, MaybeClosestCharacter.m_Y));
-		if(NewSpectatorID == -1 || Distance < ClosestDistance)
+		if(NewSpectatorId == -1 || Distance < ClosestDistance)
 		{
-			NewSpectatorID = i;
+			NewSpectatorId = i;
 			ClosestDistance = Distance;
 		}
 	}
-	if(NewSpectatorID > -1)
-		pSelf->Spectate(NewSpectatorID);
+	if(NewSpectatorId > -1)
+		pSelf->Spectate(NewSpectatorId);
 }
 
 void CSpectator::ConMultiView(IConsole::IResult *pResult, void *pUserData)
@@ -164,7 +164,6 @@ CSpectator::CSpectator()
 {
 	m_SelectorMouse = vec2(0.0f, 0.0f);
 	OnReset();
-	m_OldMouseX = m_OldMouseY = 0.0f;
 }
 
 void CSpectator::OnConsoleInit()
@@ -182,11 +181,38 @@ bool CSpectator::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
 	if(!m_Active)
 		return false;
 
-	UI()->ConvertMouseMove(&x, &y, CursorType);
+	Ui()->ConvertMouseMove(&x, &y, CursorType);
 	m_SelectorMouse += vec2(x, y);
 	return true;
 }
 
+bool CSpectator::OnInput(const IInput::CEvent &Event)
+{
+	if(IsActive() && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE)
+	{
+		OnRelease();
+		return true;
+	}
+
+	if(g_Config.m_ClSpectatorMouseclicks)
+	{
+		if(m_pClient->m_Snap.m_SpecInfo.m_Active && !IsActive() && !GameClient()->m_MultiViewActivated &&
+			!Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed() && !m_pClient->m_Menus.IsActive())
+		{
+			if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_MOUSE_1)
+			{
+				if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)
+					Spectate(SPEC_FREEVIEW);
+				else
+					SpectateClosest();
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 void CSpectator::OnRelease()
 {
 	OnReset();
@@ -194,6 +220,9 @@ void CSpectator::OnRelease()
 
 void CSpectator::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(!GameClient()->m_MultiViewActivated && m_MultiViewActivateDelay != 0.0f)
 	{
 		if(m_MultiViewActivateDelay <= Client()->LocalTime())
@@ -208,20 +237,20 @@ void CSpectator::OnRender()
 		// closing the spectator menu
 		if(m_WasActive)
 		{
-			if(m_SelectedSpectatorID != NO_SELECTION)
+			if(m_SelectedSpectatorId != NO_SELECTION)
 			{
-				if(m_SelectedSpectatorID == MULTI_VIEW)
+				if(m_SelectedSpectatorId == MULTI_VIEW)
 					GameClient()->m_MultiViewActivated = true;
-				else if(m_SelectedSpectatorID == SPEC_FREEVIEW || m_SelectedSpectatorID == SPEC_FOLLOW)
+				else if(m_SelectedSpectatorId == SPEC_FREEVIEW || m_SelectedSpectatorId == SPEC_FOLLOW)
 					GameClient()->m_MultiViewActivated = false;
 
 				if(!GameClient()->m_MultiViewActivated)
-					Spectate(m_SelectedSpectatorID);
+					Spectate(m_SelectedSpectatorId);
 
-				if(GameClient()->m_MultiViewActivated && m_SelectedSpectatorID != MULTI_VIEW && m_pClient->m_Teams.Team(m_SelectedSpectatorID) != GameClient()->m_MultiViewTeam)
+				if(GameClient()->m_MultiViewActivated && m_SelectedSpectatorId != MULTI_VIEW && m_pClient->m_Teams.Team(m_SelectedSpectatorId) != GameClient()->m_MultiViewTeam)
 				{
 					GameClient()->ResetMultiView();
-					Spectate(m_SelectedSpectatorID);
+					Spectate(m_SelectedSpectatorId);
 					m_MultiViewActivateDelay = Client()->LocalTime() + 0.3f;
 				}
 			}
@@ -230,24 +259,6 @@ void CSpectator::OnRender()
 		return;
 	}
 
-	if(m_SelectedSpectatorID != NO_SELECTION)
-	{
-		// clicking a component
-		if(m_Clicked)
-		{
-			if(!GameClient()->m_MultiViewActivated)
-				Spectate(m_SelectedSpectatorID);
-
-			if(m_SelectedSpectatorID == MULTI_VIEW)
-				GameClient()->m_MultiViewActivated = true;
-			else if(m_SelectedSpectatorID == SPEC_FREEVIEW || m_SelectedSpectatorID == SPEC_FOLLOW)
-				GameClient()->m_MultiViewActivated = false;
-
-			if(!GameClient()->m_MultiViewActivated && m_SelectedSpectatorID >= 0 && m_SelectedSpectatorID < MAX_CLIENTS)
-				m_Clicked = false;
-		}
-	}
-
 	if(!m_pClient->m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		m_Active = false;
@@ -256,7 +267,7 @@ void CSpectator::OnRender()
 	}
 
 	m_WasActive = true;
-	m_SelectedSpectatorID = NO_SELECTION;
+	m_SelectedSpectatorId = NO_SELECTION;
 
 	// draw background
 	float Width = 400 * 3.0f * Graphics()->ScreenAspect();
@@ -268,7 +279,6 @@ void CSpectator::OnRender()
 	float LineHeight = 60.0f;
 	float TeeSizeMod = 1.0f;
 	float RoundRadius = 30.0f;
-	bool Selected = false;
 	bool MultiViewSelected = false;
 	int TotalPlayers = 0;
 	int PerLine = 8;
@@ -283,7 +293,17 @@ void CSpectator::OnRender()
 		++TotalPlayers;
 	}
 
-	if(TotalPlayers > 32)
+	if(TotalPlayers > 64)
+	{
+		FontSize = 12.0f;
+		LineHeight = 15.0f;
+		TeeSizeMod = 0.3f;
+		PerLine = 32;
+		RoundRadius = 5.0f;
+		BoxMove = 3.0f;
+		BoxOffset = 6.0f;
+	}
+	else if(TotalPlayers > 32)
 	{
 		FontSize = 18.0f;
 		LineHeight = 30.0f;
@@ -298,17 +318,45 @@ void CSpectator::OnRender()
 		ObjWidth = 600.0f;
 	}
 
+	const vec2 ScreenSize = vec2(Width, Height);
+	const vec2 ScreenCenter = ScreenSize / 2.0f;
+	CUIRect SpectatorRect = {Width / 2.0f - ObjWidth, Height / 2.0f - 300.0f, ObjWidth * 2.0f, 600.0f};
+	CUIRect SpectatorMouseRect;
+	SpectatorRect.Margin(20.0f, &SpectatorMouseRect);
+
+	const bool WasTouchPressed = m_TouchState.m_AnyPressed;
+	Ui()->UpdateTouchState(m_TouchState);
+	if(m_TouchState.m_AnyPressed)
+	{
+		const vec2 TouchPos = (m_TouchState.m_PrimaryPosition - vec2(0.5f, 0.5f)) * ScreenSize;
+		if(SpectatorMouseRect.Inside(ScreenCenter + TouchPos))
+		{
+			m_SelectorMouse = TouchPos;
+		}
+	}
+	else if(WasTouchPressed)
+	{
+		const vec2 TouchPos = (m_TouchState.m_PrimaryPosition - vec2(0.5f, 0.5f)) * ScreenSize;
+		if(!SpectatorRect.Inside(ScreenCenter + TouchPos))
+		{
+			OnRelease();
+			return;
+		}
+	}
+
 	Graphics()->MapScreen(0, 0, Width, Height);
 
-	Graphics()->DrawRect(Width / 2.0f - ObjWidth, Height / 2.0f - 300.0f, ObjWidth * 2, 600.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_ALL, 20.0f);
+	SpectatorRect.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_ALL, 20.0f);
 
 	// clamp mouse position to selector area
 	m_SelectorMouse.x = clamp(m_SelectorMouse.x, -(ObjWidth - 20.0f), ObjWidth - 20.0f);
 	m_SelectorMouse.y = clamp(m_SelectorMouse.y, -280.0f, 280.0f);
 
+	const bool MousePressed = Input()->KeyPress(KEY_MOUSE_1) || m_TouchState.m_PrimaryPressed;
+
 	// draw selections
-	if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecID == SPEC_FREEVIEW) ||
-		(Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW))
+	if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecId == SPEC_FREEVIEW) ||
+		(Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorId == SPEC_FREEVIEW))
 	{
 		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
 	}
@@ -318,39 +366,54 @@ void CSpectator::OnRender()
 		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
 	}
 
-	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientID >= 0 && m_pClient->m_DemoSpecID == SPEC_FOLLOW)
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientId >= 0 && m_pClient->m_DemoSpecId == SPEC_FOLLOW)
 	{
 		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
 	}
 
+	bool FreeViewSelected = false;
 	if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
 		m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
 	{
-		m_SelectedSpectatorID = SPEC_FREEVIEW;
-		Selected = true;
+		m_SelectedSpectatorId = SPEC_FREEVIEW;
+		FreeViewSelected = true;
+		if(MousePressed)
+		{
+			GameClient()->m_MultiViewActivated = false;
+			Spectate(m_SelectedSpectatorId);
+		}
 	}
-	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, FreeViewSelected ? 1.0f : 0.5f);
 	TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f), Height / 2.0f - 280.f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Free-View"), -1.0f);
 
 	if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
 		m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
 	{
-		m_SelectedSpectatorID = MULTI_VIEW;
+		m_SelectedSpectatorId = MULTI_VIEW;
 		MultiViewSelected = true;
+		if(MousePressed)
+		{
+			GameClient()->m_MultiViewActivated = true;
+		}
 	}
 	TextRender()->TextColor(1.0f, 1.0f, 1.0f, MultiViewSelected ? 1.0f : 0.5f);
 	TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f) + (ObjWidth * 2.0f / 3.0f), Height / 2.0f - 280.f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Multi-View"), -1.0f);
 
-	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientID >= 0)
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientId >= 0)
 	{
-		Selected = false;
+		bool FollowSelected = false;
 		if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
 			m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
 		{
-			m_SelectedSpectatorID = SPEC_FOLLOW;
-			Selected = true;
+			m_SelectedSpectatorId = SPEC_FOLLOW;
+			FollowSelected = true;
+			if(MousePressed)
+			{
+				GameClient()->m_MultiViewActivated = false;
+				Spectate(m_SelectedSpectatorId);
+			}
 		}
-		TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, FollowSelected ? 1.0f : 0.5f);
 		TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f), Height / 2.0f - 280.0f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Follow"), -1.0f);
 	}
 
@@ -372,7 +435,7 @@ void CSpectator::OnRender()
 		}
 
 		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamName[i];
-		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
+		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientId);
 		int NextDDTeam = 0;
 
 		for(int j = i + 1; j < MAX_CLIENTS; j++)
@@ -382,7 +445,7 @@ void CSpectator::OnRender()
 			if(!pInfo2 || pInfo2->m_Team == TEAM_SPECTATORS)
 				continue;
 
-			NextDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+			NextDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientId);
 			break;
 		}
 
@@ -395,7 +458,7 @@ void CSpectator::OnRender()
 				if(!pInfo2 || pInfo2->m_Team == TEAM_SPECTATORS)
 					continue;
 
-				OldDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+				OldDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientId);
 				break;
 			}
 		}
@@ -413,76 +476,91 @@ void CSpectator::OnRender()
 
 		OldDDTeam = DDTeam;
 
-		if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecID == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID))
+		if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecId == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorId == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId))
 		{
 			Graphics()->DrawRect(Width / 2.0f + x - 10.0f + BoxOffset, Height / 2.0f + y + BoxMove, 270.0f - BoxOffset, LineHeight, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, RoundRadius);
 		}
 
-		Selected = false;
+		bool PlayerSelected = false;
 		if(m_SelectorMouse.x >= x - 10.0f && m_SelectorMouse.x < x + 260.0f &&
 			m_SelectorMouse.y >= y - (LineHeight / 6.0f) && m_SelectorMouse.y < y + (LineHeight * 5.0f / 6.0f))
 		{
-			m_SelectedSpectatorID = m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID;
-			Selected = true;
-			if(GameClient()->m_MultiViewActivated && m_Clicked)
+			m_SelectedSpectatorId = m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId;
+			PlayerSelected = true;
+			if(MousePressed)
 			{
-				if(GameClient()->m_MultiViewTeam == DDTeam)
+				if(GameClient()->m_MultiViewActivated)
 				{
-					GameClient()->m_aMultiViewId[m_SelectedSpectatorID] = !GameClient()->m_aMultiViewId[m_SelectedSpectatorID];
-					if(!GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID])
+					if(GameClient()->m_MultiViewTeam == DDTeam)
 					{
-						int NewClientID = GameClient()->FindFirstMultiViewId();
-						if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
+						GameClient()->m_aMultiViewId[m_SelectedSpectatorId] = !GameClient()->m_aMultiViewId[m_SelectedSpectatorId];
+						if(!GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_SpecInfo.m_SpectatorId])
 						{
-							GameClient()->CleanMultiViewId(NewClientID);
-							GameClient()->m_aMultiViewId[NewClientID] = true;
-							Spectate(NewClientID);
+							int NewClientId = GameClient()->FindFirstMultiViewId();
+							if(NewClientId < MAX_CLIENTS && NewClientId >= 0)
+							{
+								GameClient()->CleanMultiViewId(NewClientId);
+								GameClient()->m_aMultiViewId[NewClientId] = true;
+								Spectate(NewClientId);
+							}
 						}
 					}
+					else
+					{
+						GameClient()->ResetMultiView();
+						Spectate(m_SelectedSpectatorId);
+						m_MultiViewActivateDelay = Client()->LocalTime() + 0.3f;
+					}
 				}
 				else
 				{
-					GameClient()->ResetMultiView();
-					Spectate(m_SelectedSpectatorID);
-					m_MultiViewActivateDelay = Client()->LocalTime() + 0.3f;
+					Spectate(m_SelectedSpectatorId);
 				}
-				m_Clicked = false;
 			}
 		}
 		float TeeAlpha;
 		if(Client()->State() == IClient::STATE_DEMOPLAYBACK &&
-			!m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_Active)
+			!m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId].m_Active)
 		{
 			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.25f);
 			TeeAlpha = 0.5f;
 		}
 		else
 		{
-			TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, PlayerSelected ? 1.0f : 0.5f);
 			TeeAlpha = 1.0f;
 		}
-		TextRender()->Text(Width / 2.0f + x + 50.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize, m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_aName, 220.0f);
+		CTextCursor NameCursor;
+		TextRender()->SetCursor(&NameCursor, Width / 2.0f + x + 50.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+		NameCursor.m_LineWidth = 180.0f;
+		if(g_Config.m_ClShowIds)
+		{
+			char aClientId[16];
+			GameClient()->FormatClientId(m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId, aClientId, EClientIdFormat::INDENT_AUTO);
+			TextRender()->TextEx(&NameCursor, aClientId);
+		}
+		TextRender()->TextEx(&NameCursor, m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId].m_aName);
 
 		if(GameClient()->m_MultiViewActivated)
 		{
-			if(GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID])
+			if(GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId])
 			{
-				TextRender()->TextColor(0.1f, 1.0f, 0.1f, Selected ? 1.0f : 0.5f);
+				TextRender()->TextColor(0.1f, 1.0f, 0.1f, PlayerSelected ? 1.0f : 0.5f);
 				TextRender()->Text(Width / 2.0f + x + 50.0f + 180.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize - 3, "⬤", 220.0f);
 			}
 			else if(GameClient()->m_MultiViewTeam == DDTeam)
 			{
-				TextRender()->TextColor(1.0f, 0.1f, 0.1f, Selected ? 1.0f : 0.5f);
+				TextRender()->TextColor(1.0f, 0.1f, 0.1f, PlayerSelected ? 1.0f : 0.5f);
 				TextRender()->Text(Width / 2.0f + x + 50.0f + 180.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize - 3, "◯", 220.0f);
 			}
 		}
 
 		// flag
 		if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS) &&
-			m_pClient->m_Snap.m_pGameDataObj && (m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID || m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID))
+			m_pClient->m_Snap.m_pGameDataObj && (m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId || m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId))
 		{
 			Graphics()->BlendNormal();
-			if(m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID)
+			if(m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId)
 				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
 			else
 				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
@@ -496,54 +574,70 @@ void CSpectator::OnRender()
 			Graphics()->QuadsEnd();
 		}
 
-		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_RenderInfo;
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId].m_RenderInfo;
 		TeeInfo.m_Size *= TeeSizeMod;
 
 		const CAnimState *pIdleState = CAnimState::GetIdle();
 		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
 		vec2 TeeRenderPos(Width / 2.0f + x + 20.0f, Height / 2.0f + y + BoxMove + LineHeight / 2.0f + OffsetToMid.y);
 
 		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos, TeeAlpha);
 
-		if(m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_Friend)
+		if(m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientId].m_Friend)
 		{
 			ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
 			TextRender()->TextColor(rgb.WithAlpha(1.f));
 			TextRender()->Text(Width / 2.0f + x - TeeInfo.m_Size / 2.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize, "♥", 220.0f);
-			TextRender()->TextColor(g_Config.m_ScFriendColor);
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
 		}
 
 		y += LineHeight;
 	}
 	TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
 
-	RenderTools()->RenderCursor(m_SelectorMouse + vec2(Width, Height) / 2, 48.0f);
+	RenderTools()->RenderCursor(ScreenCenter + m_SelectorMouse, 48.0f);
 }
 
 void CSpectator::OnReset()
 {
 	m_WasActive = false;
 	m_Active = false;
-	m_SelectedSpectatorID = NO_SELECTION;
+	m_SelectedSpectatorId = NO_SELECTION;
 }
 
-void CSpectator::Spectate(int SpectatorID)
+void CSpectator::Spectate(int SpectatorId)
 {
 	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
 	{
-		m_pClient->m_DemoSpecID = clamp(SpectatorID, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
+		m_pClient->m_DemoSpecId = clamp(SpectatorId, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
 		// The tick must be rendered for the spectator mode to be updated, so we do it manually when demo playback is paused
 		if(DemoPlayer()->BaseInfo()->m_Paused)
 			GameClient()->m_Menus.DemoSeekTick(IDemoPlayer::TICK_CURRENT);
 		return;
 	}
 
-	if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SpectatorID)
+	if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorId == SpectatorId)
 		return;
 
+	if(Client()->IsSixup())
+	{
+		protocol7::CNetMsg_Cl_SetSpectatorMode Msg;
+		if(SpectatorId == SPEC_FREEVIEW)
+		{
+			Msg.m_SpecMode = protocol7::SPEC_FREEVIEW;
+			Msg.m_SpectatorId = -1;
+		}
+		else
+		{
+			Msg.m_SpecMode = protocol7::SPEC_PLAYER;
+			Msg.m_SpectatorId = SpectatorId;
+		}
+		Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL, true);
+		return;
+	}
 	CNetMsg_Cl_SetSpectatorMode Msg;
-	Msg.m_SpectatorID = SpectatorID;
+	Msg.m_SpectatorId = SpectatorId;
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
 }
 
@@ -551,18 +645,3 @@ void CSpectator::SpectateClosest()
 {
 	ConSpectateClosest(NULL, this);
 }
-
-bool CSpectator::OnInput(const IInput::CEvent &Event)
-{
-	if(m_Active && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_MOUSE_1)
-	{
-		m_Clicked = true;
-		return true;
-	}
-	else if(Event.m_Flags & IInput::FLAG_RELEASE && Event.m_Key == KEY_MOUSE_1)
-	{
-		m_Clicked = false;
-		return false;
-	}
-	return false;
-}
diff --git a/src/game/client/components/spectator.h b/src/game/client/components/spectator.h
index 11b9e585b9..25dddfb60e 100644
--- a/src/game/client/components/spectator.h
+++ b/src/game/client/components/spectator.h
@@ -3,8 +3,10 @@
 #ifndef GAME_CLIENT_COMPONENTS_SPECTATOR_H
 #define GAME_CLIENT_COMPONENTS_SPECTATOR_H
 #include <base/vmath.h>
+#include <engine/console.h>
 
 #include <game/client/component.h>
+#include <game/client/ui.h>
 
 class CSpectator : public CComponent
 {
@@ -16,13 +18,11 @@ class CSpectator : public CComponent
 
 	bool m_Active;
 	bool m_WasActive;
-	bool m_Clicked;
 
-	int m_SelectedSpectatorID;
+	int m_SelectedSpectatorId;
 	vec2 m_SelectorMouse;
 
-	float m_OldMouseX;
-	float m_OldMouseY;
+	CUi::CTouchState m_TouchState;
 
 	float m_MultiViewActivateDelay;
 
@@ -42,13 +42,15 @@ class CSpectator : public CComponent
 
 	virtual void OnConsoleInit() override;
 	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
 	virtual void OnRender() override;
 	virtual void OnRelease() override;
 	virtual void OnReset() override;
-	virtual bool OnInput(const IInput::CEvent &Event) override;
 
-	void Spectate(int SpectatorID);
+	void Spectate(int SpectatorId);
 	void SpectateClosest();
+
+	bool IsActive() const { return m_Active; }
 };
 
 #endif
diff --git a/src/game/client/components/statboard.cpp b/src/game/client/components/statboard.cpp
index be9bed2195..2cfe85b0b9 100644
--- a/src/game/client/components/statboard.cpp
+++ b/src/game/client/components/statboard.cpp
@@ -90,7 +90,7 @@ void CStatboard::OnMessage(int MsgType, void *pRawMsg)
 	else if(MsgType == NETMSGTYPE_SV_CHAT)
 	{
 		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
-		if(pMsg->m_ClientID < 0)
+		if(pMsg->m_ClientId < 0)
 		{
 			const char *p, *t;
 			const char *pLookFor = "flag was captured by '";
@@ -102,7 +102,7 @@ void CStatboard::OnMessage(int MsgType, void *pRawMsg)
 
 				if(t <= p)
 					return;
-				str_utf8_truncate(aName, sizeof(aName), p, t - p);
+				str_truncate(aName, sizeof(aName), p, t - p);
 
 				for(int i = 0; i < MAX_CLIENTS; i++)
 				{
@@ -122,6 +122,9 @@ void CStatboard::OnMessage(int MsgType, void *pRawMsg)
 
 void CStatboard::OnRender()
 {
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if((g_Config.m_ClAutoStatboardScreenshot || g_Config.m_ClAutoCSV) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		if(m_ScreenshotTime < 0 && m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
@@ -155,7 +158,7 @@ void CStatboard::RenderGlobalStats()
 	// sort red or dm players by score
 	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
 	{
-		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_RED)
+		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientId].IsActive() || m_pClient->m_aClients[pInfo->m_ClientId].m_Team != TEAM_RED)
 			continue;
 		apPlayers[NumPlayers] = pInfo;
 		NumPlayers++;
@@ -166,7 +169,7 @@ void CStatboard::RenderGlobalStats()
 	{
 		for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
 		{
-			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_BLUE)
+			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientId].IsActive() || m_pClient->m_aClients[pInfo->m_ClientId].m_Team != TEAM_BLUE)
 				continue;
 			apPlayers[NumPlayers] = pInfo;
 			NumPlayers++;
@@ -193,7 +196,7 @@ void CStatboard::RenderGlobalStats()
 	bool aDisplayWeapon[NUM_WEAPONS] = {false};
 	for(int i = 0; i < NumPlayers; i++)
 	{
-		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[apPlayers[i]->m_ClientID];
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[apPlayers[i]->m_ClientId];
 		for(int j = 0; j < NUM_WEAPONS; j++)
 			aDisplayWeapon[j] = aDisplayWeapon[j] || pStats->m_aFragsWith[j] || pStats->m_aDeathsFrom[j];
 	}
@@ -279,20 +282,20 @@ void CStatboard::RenderGlobalStats()
 	for(int j = 0; j < NumPlayers; j++)
 	{
 		const CNetObj_PlayerInfo *pInfo = apPlayers[j];
-		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientID];
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientId];
 
-		if(m_pClient->m_Snap.m_LocalClientID == pInfo->m_ClientID || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID))
+		if(m_pClient->m_Snap.m_LocalClientId == pInfo->m_ClientId || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientId == m_pClient->m_Snap.m_SpecInfo.m_SpectatorId))
 		{
 			// background so it's easy to find the local player
 			Graphics()->DrawRect(x - 10, y + ContentLineOffset / 2, StatboardContentWidth, LineHeight - ContentLineOffset, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_NONE, 0.0f);
 		}
 
-		CTeeRenderInfo Teeinfo = m_pClient->m_aClients[pInfo->m_ClientID].m_RenderInfo;
+		CTeeRenderInfo Teeinfo = m_pClient->m_aClients[pInfo->m_ClientId].m_RenderInfo;
 		Teeinfo.m_Size *= TeeSizemod;
 
 		const CAnimState *pIdleState = CAnimState::GetIdle();
 		vec2 OffsetToMid;
-		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Teeinfo, OffsetToMid);
+		CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &Teeinfo, OffsetToMid);
 		vec2 TeeRenderPos(x + Teeinfo.m_Size / 2, y + LineHeight / 2.0f + OffsetToMid.y);
 
 		RenderTools()->RenderTee(pIdleState, &Teeinfo, EMOTE_NORMAL, vec2(1, 0), TeeRenderPos);
@@ -301,20 +304,20 @@ void CStatboard::RenderGlobalStats()
 		CTextCursor Cursor;
 		TextRender()->SetCursor(&Cursor, x + 64, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
 		Cursor.m_LineWidth = 220;
-		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
+		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientId].m_aName, -1);
 
 		px = 325;
 
 		// FRAGS
 		{
-			str_from_int(pStats->m_Frags, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_Frags);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
 		}
 		// DEATHS
 		{
-			str_from_int(pStats->m_Deaths, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_Deaths);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
@@ -322,7 +325,7 @@ void CStatboard::RenderGlobalStats()
 		// SUICIDES
 		{
 			px += 10;
-			str_from_int(pStats->m_Suicides, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_Suicides);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
@@ -354,14 +357,14 @@ void CStatboard::RenderGlobalStats()
 		}
 		// SPREE
 		{
-			str_from_int(pStats->m_CurrentSpree, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_CurrentSpree);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
 		}
 		// BEST SPREE
 		{
-			str_from_int(pStats->m_BestSpree, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_BestSpree);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
@@ -369,7 +372,7 @@ void CStatboard::RenderGlobalStats()
 		// GRABS
 		if(GameWithFlags)
 		{
-			str_from_int(pStats->m_FlagGrabs, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_FlagGrabs);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 			px += 85;
@@ -389,7 +392,7 @@ void CStatboard::RenderGlobalStats()
 		// FLAGS
 		if(GameWithFlags)
 		{
-			str_from_int(pStats->m_FlagCaptures, aBuf);
+			str_format(aBuf, sizeof(aBuf), "%d", pStats->m_FlagCaptures);
 			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
 			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
 		}
@@ -464,7 +467,7 @@ void CStatboard::FormatStats(char *pDest, size_t DestSize)
 	// sort red or dm players by score
 	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
 	{
-		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_RED)
+		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientId].IsActive() || m_pClient->m_aClients[pInfo->m_ClientId].m_Team != TEAM_RED)
 			continue;
 		apPlayers[NumPlayers] = pInfo;
 		NumPlayers++;
@@ -475,7 +478,7 @@ void CStatboard::FormatStats(char *pDest, size_t DestSize)
 	{
 		for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
 		{
-			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_BLUE)
+			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientId].IsActive() || m_pClient->m_aClients[pInfo->m_ClientId].m_Team != TEAM_BLUE)
 				continue;
 			apPlayers[NumPlayers] = pInfo;
 			NumPlayers++;
@@ -487,7 +490,7 @@ void CStatboard::FormatStats(char *pDest, size_t DestSize)
 	for(int i = 0; i < NumPlayers; i++)
 	{
 		const CNetObj_PlayerInfo *pInfo = apPlayers[i];
-		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientID];
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientId];
 
 		// Pre-formatting
 
@@ -507,7 +510,7 @@ void CStatboard::FormatStats(char *pDest, size_t DestSize)
 			fdratio = (float)(pStats->m_Frags) / pStats->m_Deaths;
 
 		// Local player
-		bool localPlayer = (m_pClient->m_Snap.m_LocalClientID == pInfo->m_ClientID || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID));
+		bool localPlayer = (m_pClient->m_Snap.m_LocalClientId == pInfo->m_ClientId || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientId == m_pClient->m_Snap.m_SpecInfo.m_SpectatorId));
 
 		// Game with flags
 		bool GameWithFlags = (m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS);
@@ -515,9 +518,9 @@ void CStatboard::FormatStats(char *pDest, size_t DestSize)
 		char aBuf[1024];
 		str_format(aBuf, sizeof(aBuf), "%d,%d,%s,%s,%d,%d,%d,%d,%.2f,%i,%.1f,%d,%d,%s,%d,%d,%d\n",
 			localPlayer ? 1 : 0, // Local player
-			m_pClient->m_aClients[pInfo->m_ClientID].m_Team, // Team
-			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientID].m_aName).c_str(), // Name
-			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan).c_str(), // Clan
+			m_pClient->m_aClients[pInfo->m_ClientId].m_Team, // Team
+			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientId].m_aName).c_str(), // Name
+			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientId].m_aClan).c_str(), // Clan
 			clamp(pInfo->m_Score, -999, 999), // Score
 			pStats->m_Frags, // Frags
 			pStats->m_Deaths, // Deaths
diff --git a/src/game/client/components/tooltips.cpp b/src/game/client/components/tooltips.cpp
index 4d7dd79701..ed1cbba9f7 100644
--- a/src/game/client/components/tooltips.cpp
+++ b/src/game/client/components/tooltips.cpp
@@ -26,11 +26,11 @@ inline void CTooltips::ClearActiveTooltip()
 	m_PreviousTooltip.reset();
 }
 
-void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint)
+void CTooltips::DoToolTip(const void *pId, const CUIRect *pNearRect, const char *pText, float WidthHint)
 {
-	uintptr_t ID = reinterpret_cast<uintptr_t>(pID);
-	const auto result = m_Tooltips.emplace(ID, CTooltip{
-							   pID,
+	uintptr_t Id = reinterpret_cast<uintptr_t>(pId);
+	const auto result = m_Tooltips.emplace(Id, CTooltip{
+							   pId,
 							   *pNearRect,
 							   pText,
 							   WidthHint,
@@ -45,7 +45,7 @@ void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char
 
 	Tooltip.m_OnScreen = true;
 
-	if(UI()->HotItem() == Tooltip.m_pID)
+	if(Ui()->HotItem() == Tooltip.m_pId)
 	{
 		SetActiveTooltip(Tooltip);
 	}
@@ -57,7 +57,7 @@ void CTooltips::OnRender()
 	{
 		CTooltip &Tooltip = m_ActiveTooltip.value();
 
-		if(UI()->HotItem() != Tooltip.m_pID)
+		if(Ui()->HotItem() != Tooltip.m_pId)
 		{
 			Tooltip.m_OnScreen = false;
 			ClearActiveTooltip();
@@ -91,33 +91,33 @@ void CTooltips::OnRender()
 		Rect.w = BoundingBox.m_W + 2 * Padding;
 		Rect.h = BoundingBox.m_H + 2 * Padding;
 
-		const CUIRect *pScreen = UI()->Screen();
+		const CUIRect *pScreen = Ui()->Screen();
 		Rect.w = minimum(Rect.w, pScreen->w - 2 * Margin);
 		Rect.h = minimum(Rect.h, pScreen->h - 2 * Margin);
 
 		// Try the top side.
 		if(Tooltip.m_Rect.y - Rect.h - Margin > pScreen->y)
 		{
-			Rect.x = clamp(UI()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
+			Rect.x = clamp(Ui()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
 			Rect.y = Tooltip.m_Rect.y - Rect.h - Margin;
 		}
 		// Try the bottom side.
 		else if(Tooltip.m_Rect.y + Tooltip.m_Rect.h + Margin < pScreen->h)
 		{
-			Rect.x = clamp(UI()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
+			Rect.x = clamp(Ui()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
 			Rect.y = Tooltip.m_Rect.y + Tooltip.m_Rect.h + Margin;
 		}
 		// Try the right side.
 		else if(Tooltip.m_Rect.x + Tooltip.m_Rect.w + Margin + Rect.w < pScreen->w)
 		{
 			Rect.x = Tooltip.m_Rect.x + Tooltip.m_Rect.w + Margin;
-			Rect.y = clamp(UI()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
+			Rect.y = clamp(Ui()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
 		}
 		// Try the left side.
 		else if(Tooltip.m_Rect.x - Rect.w - Margin > pScreen->x)
 		{
 			Rect.x = Tooltip.m_Rect.x - Rect.w - Margin;
-			Rect.y = clamp(UI()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
+			Rect.y = clamp(Ui()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
 		}
 
 		Rect.Draw(ColorRGBA(0.2f, 0.2f, 0.2f, 0.8f * AlphaFactor), IGraphics::CORNER_ALL, Padding);
diff --git a/src/game/client/components/tooltips.h b/src/game/client/components/tooltips.h
index aaac1afec1..b2b98b363b 100644
--- a/src/game/client/components/tooltips.h
+++ b/src/game/client/components/tooltips.h
@@ -11,7 +11,7 @@
 
 struct CTooltip
 {
-	const void *m_pID;
+	const void *m_pId;
 	CUIRect m_Rect;
 	const char *m_pText;
 	float m_WidthHint;
@@ -47,12 +47,12 @@ class CTooltips : public CComponent
 	 * On the first call to this function, the data passed is cached, afterwards the calls are used to detect if the tooltip should be activated.
 	 * If multiple tooltips cover the same rect or the rects intersect, then the tooltip that is added later has priority.
 	 *
-	 * @param pID The ID of the tooltip. Usually a reference to some g_Config value.
+	 * @param pId The ID of the tooltip. Usually a reference to some g_Config value.
 	 * @param pNearRect Place the tooltip near this rect.
 	 * @param pText The text to display in the tooltip.
 	 * @param WidthHint The maximum width of the tooltip, or -1.0f for unlimited.
 	 */
-	void DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint = -1.0f);
+	void DoToolTip(const void *pId, const CUIRect *pNearRect, const char *pText, float WidthHint = -1.0f);
 
 	virtual void OnReset() override;
 	virtual void OnRender() override;
diff --git a/src/game/client/components/voting.cpp b/src/game/client/components/voting.cpp
index aaab39dedd..462a14e8da 100644
--- a/src/game/client/components/voting.cpp
+++ b/src/game/client/components/voting.cpp
@@ -1,13 +1,18 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "voting.h"
+
+#include <base/system.h>
+
 #include <engine/shared/config.h>
+#include <engine/textrender.h>
 
-#include "voting.h"
+#include <game/client/components/scoreboard.h>
 #include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
 #include <game/client/render.h>
 #include <game/generated/protocol.h>
-
-#include <game/client/gameclient.h>
+#include <game/localization.h>
 
 void CVoting::ConCallvote(IConsole::IResult *pResult, void *pUserData)
 {
@@ -26,6 +31,16 @@ void CVoting::ConVote(IConsole::IResult *pResult, void *pUserData)
 
 void CVoting::Callvote(const char *pType, const char *pValue, const char *pReason)
 {
+	if(Client()->IsSixup())
+	{
+		protocol7::CNetMsg_Cl_CallVote Msg;
+		Msg.m_pType = pType;
+		Msg.m_pValue = pValue;
+		Msg.m_pReason = pReason;
+		Msg.m_Force = false;
+		Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL, true);
+		return;
+	}
 	CNetMsg_Cl_CallVote Msg = {0};
 	Msg.m_pType = pType;
 	Msg.m_pValue = pValue;
@@ -33,44 +48,44 @@ void CVoting::Callvote(const char *pType, const char *pValue, const char *pReaso
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
 }
 
-void CVoting::CallvoteSpectate(int ClientID, const char *pReason, bool ForceVote)
+void CVoting::CallvoteSpectate(int ClientId, const char *pReason, bool ForceVote)
 {
 	if(ForceVote)
 	{
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "set_team %d -1", ClientID);
+		str_format(aBuf, sizeof(aBuf), "set_team %d -1", ClientId);
 		Client()->Rcon(aBuf);
 	}
 	else
 	{
 		char aBuf[32];
-		str_from_int(ClientID, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", ClientId);
 		Callvote("spectate", aBuf, pReason);
 	}
 }
 
-void CVoting::CallvoteKick(int ClientID, const char *pReason, bool ForceVote)
+void CVoting::CallvoteKick(int ClientId, const char *pReason, bool ForceVote)
 {
 	if(ForceVote)
 	{
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "force_vote kick %d %s", ClientID, pReason);
+		str_format(aBuf, sizeof(aBuf), "force_vote kick %d %s", ClientId, pReason);
 		Client()->Rcon(aBuf);
 	}
 	else
 	{
 		char aBuf[32];
-		str_from_int(ClientID, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", ClientId);
 		Callvote("kick", aBuf, pReason);
 	}
 }
 
-void CVoting::CallvoteOption(int OptionID, const char *pReason, bool ForceVote)
+void CVoting::CallvoteOption(int OptionId, const char *pReason, bool ForceVote)
 {
 	CVoteOptionClient *pOption = m_pFirst;
-	while(pOption && OptionID >= 0)
+	while(pOption && OptionId >= 0)
 	{
-		if(OptionID == 0)
+		if(OptionId == 0)
 		{
 			if(ForceVote)
 			{
@@ -89,17 +104,17 @@ void CVoting::CallvoteOption(int OptionID, const char *pReason, bool ForceVote)
 			break;
 		}
 
-		OptionID--;
+		OptionId--;
 		pOption = pOption->m_pNext;
 	}
 }
 
-void CVoting::RemovevoteOption(int OptionID)
+void CVoting::RemovevoteOption(int OptionId)
 {
 	CVoteOptionClient *pOption = m_pFirst;
-	while(pOption && OptionID >= 0)
+	while(pOption && OptionId >= 0)
 	{
-		if(OptionID == 0)
+		if(OptionId == 0)
 		{
 			char aBuf[128];
 			str_copy(aBuf, "remove_vote \"");
@@ -110,7 +125,7 @@ void CVoting::RemovevoteOption(int OptionID)
 			break;
 		}
 
-		OptionID--;
+		OptionId--;
 		pOption = pOption->m_pNext;
 	}
 }
@@ -136,15 +151,15 @@ void CVoting::Vote(int v)
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
 }
 
+int CVoting::SecondsLeft() const
+{
+	return (m_Closetime - time()) / time_freq();
+}
+
 CVoting::CVoting()
 {
 	ClearOptions();
-
-	m_Closetime = 0;
-	m_aDescription[0] = 0;
-	m_aReason[0] = 0;
-	m_Yes = m_No = m_Pass = m_Total = 0;
-	m_Voted = 0;
+	OnReset();
 }
 
 void CVoting::AddOption(const char *pDescription)
@@ -177,6 +192,37 @@ void CVoting::AddOption(const char *pDescription)
 	++m_NumVoteOptions;
 }
 
+void CVoting::RemoveOption(const char *pDescription)
+{
+	for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
+	{
+		if(str_comp(pOption->m_aDescription, pDescription) == 0)
+		{
+			// remove it from the list
+			if(m_pFirst == pOption)
+				m_pFirst = m_pFirst->m_pNext;
+			if(m_pLast == pOption)
+				m_pLast = m_pLast->m_pPrev;
+			if(pOption->m_pPrev)
+				pOption->m_pPrev->m_pNext = pOption->m_pNext;
+			if(pOption->m_pNext)
+				pOption->m_pNext->m_pPrev = pOption->m_pPrev;
+			--m_NumVoteOptions;
+
+			// add it to recycle list
+			pOption->m_pNext = 0;
+			pOption->m_pPrev = m_pRecycleLast;
+			if(pOption->m_pPrev)
+				pOption->m_pPrev->m_pNext = pOption;
+			m_pRecycleLast = pOption;
+			if(!m_pRecycleFirst)
+				m_pRecycleLast = pOption;
+
+			break;
+		}
+	}
+}
+
 void CVoting::ClearOptions()
 {
 	m_Heap.Reset();
@@ -191,11 +237,12 @@ void CVoting::ClearOptions()
 
 void CVoting::OnReset()
 {
-	m_Closetime = 0;
+	m_Opentime = m_Closetime = 0;
 	m_aDescription[0] = 0;
 	m_aReason[0] = 0;
 	m_Yes = m_No = m_Pass = m_Total = 0;
 	m_Voted = 0;
+	m_ReceivingOptions = false;
 }
 
 void CVoting::OnConsoleInit()
@@ -214,6 +261,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
 		{
 			str_copy(m_aDescription, pMsg->m_pDescription);
 			str_copy(m_aReason, pMsg->m_pReason);
+			m_Opentime = time();
 			m_Closetime = time() + time_freq() * pMsg->m_Timeout;
 
 			if(Client()->RconAuthed())
@@ -221,7 +269,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
 				char aBuf[512];
 				str_format(aBuf, sizeof(aBuf), "%s (%s)", m_aDescription, m_aReason);
 				Client()->Notify("DDNet Vote", aBuf);
-				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0);
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 1.0f);
 			}
 		}
 	}
@@ -271,98 +319,110 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
 	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONREMOVE)
 	{
 		CNetMsg_Sv_VoteOptionRemove *pMsg = (CNetMsg_Sv_VoteOptionRemove *)pRawMsg;
-
-		for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
-		{
-			if(str_comp(pOption->m_aDescription, pMsg->m_pDescription) == 0)
-			{
-				// remove it from the list
-				if(m_pFirst == pOption)
-					m_pFirst = m_pFirst->m_pNext;
-				if(m_pLast == pOption)
-					m_pLast = m_pLast->m_pPrev;
-				if(pOption->m_pPrev)
-					pOption->m_pPrev->m_pNext = pOption->m_pNext;
-				if(pOption->m_pNext)
-					pOption->m_pNext->m_pPrev = pOption->m_pPrev;
-				--m_NumVoteOptions;
-
-				// add it to recycle list
-				pOption->m_pNext = 0;
-				pOption->m_pPrev = m_pRecycleLast;
-				if(pOption->m_pPrev)
-					pOption->m_pPrev->m_pNext = pOption;
-				m_pRecycleLast = pOption;
-				if(!m_pRecycleFirst)
-					m_pRecycleLast = pOption;
-
-				break;
-			}
-		}
+		RemoveOption(pMsg->m_pDescription);
 	}
 	else if(MsgType == NETMSGTYPE_SV_YOURVOTE)
 	{
 		CNetMsg_Sv_YourVote *pMsg = (CNetMsg_Sv_YourVote *)pRawMsg;
 		m_Voted = pMsg->m_Voted;
 	}
+	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONGROUPSTART)
+	{
+		m_ReceivingOptions = true;
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONGROUPEND)
+	{
+		m_ReceivingOptions = false;
+	}
 }
 
-void CVoting::OnRender()
+void CVoting::Render()
 {
+	if((!g_Config.m_ClShowVotesAfterVoting && !m_pClient->m_Scoreboard.Active() && TakenChoice()) || !IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+	const int Seconds = SecondsLeft();
+	if(Seconds < 0)
+	{
+		OnReset();
+		return;
+	}
+
+	CUIRect View = {0.0f, 60.0f, 120.0f, 38.0f};
+	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_R, 3.0f);
+	View.Margin(3.0f, &View);
+
+	SLabelProperties Props;
+	Props.m_EllipsisAtEnd = true;
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), Localize("%ds left"), Seconds);
+
+	CUIRect Row, LeftColumn, RightColumn, ProgressSpinner;
+	View.HSplitTop(6.0f, &Row, &View);
+	Row.VSplitRight(TextRender()->TextWidth(6.0f, aBuf), &LeftColumn, &RightColumn);
+	LeftColumn.VSplitRight(2.0f, &LeftColumn, nullptr);
+	LeftColumn.VSplitRight(6.0f, &LeftColumn, &ProgressSpinner);
+	LeftColumn.VSplitRight(2.0f, &LeftColumn, nullptr);
+
+	SProgressSpinnerProperties ProgressProps;
+	ProgressProps.m_Progress = clamp((time() - m_Opentime) / (float)(m_Closetime - m_Opentime), 0.0f, 1.0f);
+	Ui()->RenderProgressSpinner(ProgressSpinner.Center(), ProgressSpinner.h / 2.0f, ProgressProps);
+
+	Ui()->DoLabel(&RightColumn, aBuf, 6.0f, TEXTALIGN_MR);
+
+	Props.m_MaxWidth = LeftColumn.w;
+	Ui()->DoLabel(&LeftColumn, VoteDescription(), 6.0f, TEXTALIGN_ML, Props);
+
+	View.HSplitTop(3.0f, nullptr, &View);
+	View.HSplitTop(6.0f, &Row, &View);
+	str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), VoteReason());
+	Props.m_MaxWidth = Row.w;
+	Ui()->DoLabel(&Row, aBuf, 6.0f, TEXTALIGN_ML, Props);
+
+	View.HSplitTop(3.0f, nullptr, &View);
+	View.HSplitTop(4.0f, &Row, &View);
+	RenderBars(Row);
+
+	View.HSplitTop(3.0f, nullptr, &View);
+	View.HSplitTop(6.0f, &Row, &View);
+	Row.VSplitMid(&LeftColumn, &RightColumn, 4.0f);
+
+	char aKey[64];
+	m_pClient->m_Binds.GetKey("vote yes", aKey, sizeof(aKey));
+	str_format(aBuf, sizeof(aBuf), "%s - %s", aKey, Localize("Vote yes"));
+	TextRender()->TextColor(TakenChoice() == 1 ? ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f) : TextRender()->DefaultTextColor());
+	Ui()->DoLabel(&LeftColumn, aBuf, 6.0f, TEXTALIGN_ML);
+
+	m_pClient->m_Binds.GetKey("vote no", aKey, sizeof(aKey));
+	str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), aKey);
+	TextRender()->TextColor(TakenChoice() == -1 ? ColorRGBA(0.95f, 0.25f, 0.25f, 0.85f) : TextRender()->DefaultTextColor());
+	Ui()->DoLabel(&RightColumn, aBuf, 6.0f, TEXTALIGN_MR);
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 }
 
-void CVoting::RenderBars(CUIRect Bars, bool Text)
+void CVoting::RenderBars(CUIRect Bars) const
 {
-	Bars.Draw(ColorRGBA(0.8f, 0.8f, 0.8f, 0.5f), IGraphics::CORNER_ALL, Bars.h / 3);
+	Bars.Draw(ColorRGBA(0.8f, 0.8f, 0.8f, 0.5f), IGraphics::CORNER_ALL, Bars.h / 2.0f);
 
-	CUIRect Splitter = Bars;
-	Splitter.x = Splitter.x + Splitter.w / 2;
-	Splitter.w = Splitter.h / 2.0f;
-	Splitter.x -= Splitter.w / 2;
-	Splitter.Draw(ColorRGBA(0.4f, 0.4f, 0.4f, 0.5f), IGraphics::CORNER_ALL, Splitter.h / 4);
+	CUIRect Splitter;
+	Bars.VMargin((Bars.w - 2.0f) / 2.0f, &Splitter);
+	Splitter.Draw(ColorRGBA(0.4f, 0.4f, 0.4f, 0.5f), IGraphics::CORNER_NONE, 0.0f);
 
 	if(m_Total)
 	{
-		CUIRect PassArea = Bars;
 		if(m_Yes)
 		{
-			CUIRect YesArea = Bars;
-			YesArea.w *= m_Yes / (float)m_Total;
-			YesArea.Draw(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
-
-			if(Text)
-			{
-				char aBuf[256];
-				str_from_int(m_Yes, aBuf);
-				UI()->DoLabel(&YesArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
-			}
-
-			PassArea.x += YesArea.w;
-			PassArea.w -= YesArea.w;
+			CUIRect YesArea;
+			Bars.VSplitLeft(Bars.w * m_Yes / m_Total, &YesArea, nullptr);
+			YesArea.Draw(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f), IGraphics::CORNER_ALL, YesArea.h / 2.0f);
 		}
 
 		if(m_No)
 		{
-			CUIRect NoArea = Bars;
-			NoArea.w *= m_No / (float)m_Total;
-			NoArea.x = (Bars.x + Bars.w) - NoArea.w;
-			NoArea.Draw(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
-
-			if(Text)
-			{
-				char aBuf[256];
-				str_from_int(m_No, aBuf);
-				UI()->DoLabel(&NoArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
-			}
-
-			PassArea.w -= NoArea.w;
-		}
-
-		if(Text && m_Pass)
-		{
-			char aBuf[256];
-			str_from_int(m_Pass, aBuf);
-			UI()->DoLabel(&PassArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
+			CUIRect NoArea;
+			Bars.VSplitRight(Bars.w * m_No / m_Total, nullptr, &NoArea);
+			NoArea.Draw(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f), IGraphics::CORNER_ALL, NoArea.h / 2.0f);
 		}
 	}
 }
diff --git a/src/game/client/components/voting.h b/src/game/client/components/voting.h
index f81959a68e..87abcb1ebb 100644
--- a/src/game/client/components/voting.h
+++ b/src/game/client/components/voting.h
@@ -18,16 +18,20 @@ class CVoting : public CComponent
 	static void ConCallvote(IConsole::IResult *pResult, void *pUserData);
 	static void ConVote(IConsole::IResult *pResult, void *pUserData);
 
+	int64_t m_Opentime;
 	int64_t m_Closetime;
 	char m_aDescription[VOTE_DESC_LENGTH];
 	char m_aReason[VOTE_REASON_LENGTH];
 	int m_Voted;
 	int m_Yes, m_No, m_Pass, m_Total;
+	bool m_ReceivingOptions;
 
-	void AddOption(const char *pDescription);
+	void RemoveOption(const char *pDescription);
 	void ClearOptions();
 	void Callvote(const char *pType, const char *pValue, const char *pReason);
 
+	void RenderBars(CUIRect Bars) const;
+
 public:
 	int m_NumVoteOptions;
 	CVoteOptionClient *m_pFirst;
@@ -41,23 +45,24 @@ class CVoting : public CComponent
 	virtual void OnReset() override;
 	virtual void OnConsoleInit() override;
 	virtual void OnMessage(int Msgtype, void *pRawMsg) override;
-	virtual void OnRender() override;
 
-	void RenderBars(CUIRect Bars, bool Text);
+	void Render();
 
-	void CallvoteSpectate(int ClientID, const char *pReason, bool ForceVote = false);
-	void CallvoteKick(int ClientID, const char *pReason, bool ForceVote = false);
-	void CallvoteOption(int OptionID, const char *pReason, bool ForceVote = false);
-	void RemovevoteOption(int OptionID);
+	void CallvoteSpectate(int ClientId, const char *pReason, bool ForceVote = false);
+	void CallvoteKick(int ClientId, const char *pReason, bool ForceVote = false);
+	void CallvoteOption(int OptionId, const char *pReason, bool ForceVote = false);
+	void RemovevoteOption(int OptionId);
 	void AddvoteOption(const char *pDescription, const char *pCommand);
+	void AddOption(const char *pDescription);
 
 	void Vote(int v); // -1 = no, 1 = yes
 
-	int SecondsLeft() { return (m_Closetime - time()) / time_freq(); }
-	bool IsVoting() { return m_Closetime != 0; }
+	int SecondsLeft() const;
+	bool IsVoting() const { return m_Closetime != 0; }
 	int TakenChoice() const { return m_Voted; }
 	const char *VoteDescription() const { return m_aDescription; }
 	const char *VoteReason() const { return m_aReason; }
+	bool IsReceivingOptions() const { return m_ReceivingOptions; }
 };
 
 #endif
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index ca0ae8c00e..cc5fc66b34 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -2,11 +2,10 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 
 #include <chrono>
-#include <cstdlib> // for rand()
 #include <limits>
 
-#include "engine/discord.h"
 #include <engine/client/checksum.h>
+#include <engine/client/enums.h>
 #include <engine/demo.h>
 #include <engine/editor.h>
 #include <engine/engine.h>
@@ -25,6 +24,7 @@
 #include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>
 
+#include <base/log.h>
 #include <base/math.h>
 #include <base/system.h>
 #include <base/vmath.h>
@@ -38,6 +38,9 @@
 #include <game/mapitems.h>
 #include <game/version.h>
 
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
+
 #include "components/background.h"
 #include "components/binds.h"
 #include "components/broadcast.h"
@@ -62,12 +65,12 @@
 #include "components/menus.h"
 #include "components/motd.h"
 #include "components/nameplates.h"
-#include "components/parser.h"
 #include "components/particles.h"
 #include "components/players.h"
 #include "components/race_demo.h"
 #include "components/scoreboard.h"
 #include "components/skins.h"
+#include "components/skins7.h"
 #include "components/sounds.h"
 #include "components/spectator.h"
 #include "components/statboard.h"
@@ -79,8 +82,10 @@ using namespace std::chrono_literals;
 
 const char *CGameClient::Version() const { return GAME_VERSION; }
 const char *CGameClient::NetVersion() const { return GAME_NETVERSION; }
+const char *CGameClient::NetVersion7() const { return GAME_NETVERSION7; }
 int CGameClient::DDNetVersion() const { return DDNET_VERSION_NUMBER; }
 const char *CGameClient::DDNetVersionStr() const { return m_aDDNetVersionStr; }
+int CGameClient::ClientVersion7() const { return CLIENT_VERSION7; }
 const char *CGameClient::GetItemName(int Type) const { return m_NetObjHandler.GetObjName(Type); }
 
 void CGameClient::OnConsoleInit()
@@ -103,17 +108,14 @@ void CGameClient::OnConsoleInit()
 #if defined(CONF_AUTOUPDATE)
 	m_pUpdater = Kernel()->RequestInterface<IUpdater>();
 #endif
-
-	m_Menus.SetMenuBackground(&m_MenuBackground);
-
-	m_NamePlates.SetPlayers(&m_Players);
+	m_pHttp = Kernel()->RequestInterface<IHttp>();
 
 	// make a list of all the systems, make sure to add them in the correct render order
 	m_vpAll.insert(m_vpAll.end(), {&m_Skins,
+					      &m_Skins7,
 					      &m_CountryFlags,
 					      &m_MapImages,
 					      &m_Effects, // doesn't render anything, just updates effects
-					      &m_SkinProfiles,
 					      &m_Binds,
 					      &m_Binds.m_SpecialBinds,
 					      &m_Controls,
@@ -132,9 +134,6 @@ void CGameClient::OnConsoleInit()
 					      &m_MapLayersForeground,
 					      &m_Particles.m_RenderExplosions,
 					      &m_NamePlates,
-					      //bindwheel
-					      &m_BindWheel,
-					      &m_Outlines,
 					      &m_Particles.m_RenderExtra,
 					      &m_Particles.m_RenderGeneral,
 					      &m_FreezeBars,
@@ -148,7 +147,6 @@ void CGameClient::OnConsoleInit()
 					      &m_DebugHud,
 					      &m_Scoreboard,
 					      &m_Statboard,
-					      &m_Stats,
 					      &m_Motd,
 					      &m_Menus,
 					      &m_Tooltips,
@@ -162,39 +160,19 @@ void CGameClient::OnConsoleInit()
 						  &m_GameConsole,
 						  &m_Chat, // chat has higher prio, due to that you can quit it by pressing esc
 						  &m_Motd, // for pressing esc to remove it
-						  &m_Menus,
-						  //bindwheel
-						  &m_BindWheel,
 						  &m_Spectator,
 						  &m_Emoticon,
+						  &m_Menus,
 						  &m_Controls,
 						  &m_Binds});
 
-	// add the some console commands
+	// add basic console commands
 	Console()->Register("team", "i[team-id]", CFGFLAG_CLIENT, ConTeam, this, "Switch team");
 	Console()->Register("kill", "", CFGFLAG_CLIENT, ConKill, this, "Kill yourself to restart");
-
-	// register server dummy commands for tab completion
-	Console()->Register("tune", "s[tuning] ?i[value]", CFGFLAG_SERVER, 0, 0, "Tune variable to value or show current value");
-	Console()->Register("tune_reset", "?s[tuning]", CFGFLAG_SERVER, 0, 0, "Reset all or one tuning variable to default");
-	Console()->Register("tunes", "", CFGFLAG_SERVER, 0, 0, "List all tuning variables and their values");
-	Console()->Register("change_map", "?r[map]", CFGFLAG_SERVER, 0, 0, "Change map");
-	Console()->Register("restart", "?i[seconds]", CFGFLAG_SERVER, 0, 0, "Restart in x seconds");
-	Console()->Register("broadcast", "r[message]", CFGFLAG_SERVER, 0, 0, "Broadcast message");
-	Console()->Register("say", "r[message]", CFGFLAG_SERVER, 0, 0, "Say in chat");
-	Console()->Register("set_team", "i[id] i[team-id] ?i[delay in minutes]", CFGFLAG_SERVER, 0, 0, "Set team of player to team");
-	Console()->Register("set_team_all", "i[team-id]", CFGFLAG_SERVER, 0, 0, "Set team of all players to team");
-	Console()->Register("add_vote", "s[name] r[command]", CFGFLAG_SERVER, 0, 0, "Add a voting option");
-	Console()->Register("remove_vote", "s[name]", CFGFLAG_SERVER, 0, 0, "remove a voting option");
-	Console()->Register("force_vote", "s[name] s[command] ?r[reason]", CFGFLAG_SERVER, 0, 0, "Force a voting option");
-	Console()->Register("clear_votes", "", CFGFLAG_SERVER, 0, 0, "Clears the voting options");
-	Console()->Register("add_map_votes", "", CFGFLAG_SERVER, 0, 0, "Automatically adds voting options for all maps");
-	Console()->Register("vote", "r['yes'|'no']", CFGFLAG_SERVER, 0, 0, "Force a vote to yes/no");
-	Console()->Register("swap_teams", "", CFGFLAG_SERVER, 0, 0, "Swap the current teams");
-	Console()->Register("shuffle_teams", "", CFGFLAG_SERVER, 0, 0, "Shuffle the current teams");
+	Console()->Register("ready_change", "", CFGFLAG_CLIENT, ConReadyChange7, this, "Change ready state (0.7 only)");
 
 	// register tune zone command to allow the client prediction to load tunezones from the map
-	Console()->Register("tune_zone", "i[zone] s[tuning] i[value]", CFGFLAG_CLIENT | CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
+	Console()->Register("tune_zone", "i[zone] s[tuning] f[value]", CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
 
 	for(auto &pComponent : m_vpAll)
 		pComponent->m_pClient = this;
@@ -213,6 +191,26 @@ void CGameClient::OnConsoleInit()
 	Console()->Chain("player_color_feet", ConchainSpecialInfoupdate, this);
 	Console()->Chain("player_skin", ConchainSpecialInfoupdate, this);
 
+	Console()->Chain("player7_skin", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_body", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_marking", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_decoration", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_hands", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_feet", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_skin_eyes", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_body", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_marking", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_decoration", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_hands", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_feet", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_color_eyes", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_body", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_marking", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_decoration", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_hands", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_feet", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player7_use_custom_color_eyes", ConchainSpecialInfoupdate, this);
+
 	Console()->Chain("dummy_name", ConchainSpecialDummyInfoupdate, this);
 	Console()->Chain("dummy_clan", ConchainSpecialDummyInfoupdate, this);
 	Console()->Chain("dummy_country", ConchainSpecialDummyInfoupdate, this);
@@ -221,19 +219,81 @@ void CGameClient::OnConsoleInit()
 	Console()->Chain("dummy_color_feet", ConchainSpecialDummyInfoupdate, this);
 	Console()->Chain("dummy_skin", ConchainSpecialDummyInfoupdate, this);
 
+	Console()->Chain("dummy7_skin", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_body", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_marking", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_decoration", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_hands", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_feet", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_skin_eyes", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_body", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_marking", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_decoration", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_hands", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_feet", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_color_eyes", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_body", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_marking", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_decoration", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_hands", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_feet", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy7_use_custom_color_eyes", ConchainSpecialDummyInfoupdate, this);
+
+	Console()->Chain("cl_skin_download_url", ConchainRefreshSkins, this);
+	Console()->Chain("cl_skin_community_download_url", ConchainRefreshSkins, this);
+	Console()->Chain("cl_download_skins", ConchainRefreshSkins, this);
+	Console()->Chain("cl_download_community_skins", ConchainRefreshSkins, this);
+	Console()->Chain("cl_vanilla_skins_only", ConchainRefreshSkins, this);
+
 	Console()->Chain("cl_dummy", ConchainSpecialDummy, this);
 	Console()->Chain("cl_text_entities_size", ConchainClTextEntitiesSize, this);
 
 	Console()->Chain("cl_menu_map", ConchainMenuMap, this);
+}
 
-	//
-	m_SuppressEvents = false;
+static void GenerateTimeoutCode(char *pTimeoutCode)
+{
+	if(pTimeoutCode[0] == '\0' || str_comp(pTimeoutCode, "hGuEYnfxicsXGwFq") == 0)
+	{
+		for(unsigned int i = 0; i < 16; i++)
+		{
+			if(rand() % 2)
+				pTimeoutCode[i] = (char)((rand() % ('z' - 'a' + 1)) + 'a');
+			else
+				pTimeoutCode[i] = (char)((rand() % ('Z' - 'A' + 1)) + 'A');
+		}
+	}
 }
 
 void CGameClient::OnInit()
 {
-	Client()->SetMapLoadingCBFunc([this]() {
-		m_Menus.RenderLoading(DemoPlayer()->IsPlaying() ? Localize("Preparing demo playback") : Localize("Connected"), Localize("Loading map file from storage"), 0, false);
+	const int64_t OnInitStart = time_get();
+
+	Client()->SetLoadingCallback([this](IClient::ELoadingCallbackDetail Detail) {
+		const char *pTitle;
+		if(Detail == IClient::LOADING_CALLBACK_DETAIL_DEMO || DemoPlayer()->IsPlaying())
+		{
+			pTitle = Localize("Preparing demo playback");
+		}
+		else
+		{
+			pTitle = Localize("Connected");
+		}
+
+		const char *pMessage;
+		switch(Detail)
+		{
+		case IClient::LOADING_CALLBACK_DETAIL_MAP:
+			pMessage = Localize("Loading map file from storage");
+			break;
+		case IClient::LOADING_CALLBACK_DETAIL_DEMO:
+			pMessage = Localize("Loading demo file from storage");
+			break;
+		default:
+			dbg_assert(false, "Invalid callback loading detail");
+			dbg_break();
+		}
+		m_Menus.RenderLoading(pTitle, pMessage, 0, false);
 	});
 
 	m_pGraphics = Kernel()->RequestInterface<IGraphics>();
@@ -242,8 +302,6 @@ void CGameClient::OnInit()
 	m_UI.Init(Kernel());
 	m_RenderTools.Init(Graphics(), TextRender());
 
-	int64_t Start = time_get();
-
 	if(GIT_SHORTREV_HASH)
 	{
 		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s (%s)", GAME_NAME, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH);
@@ -263,6 +321,11 @@ void CGameClient::OnInit()
 	// setup item sizes
 	for(int i = 0; i < NUM_NETOBJTYPES; i++)
 		Client()->SnapSetStaticsize(i, m_NetObjHandler.GetObjSize(i));
+	// HACK: only set static size for items, which were available in the first 0.7 release
+	// so new items don't break the snapshot delta
+	static const int OLD_NUM_NETOBJTYPES = 23;
+	for(int i = 0; i < OLD_NUM_NETOBJTYPES; i++)
+		Client()->SnapSetStaticsize7(i, m_NetObjHandler7.GetObjSize(i));
 
 	TextRender()->LoadFonts();
 	TextRender()->SetFontLanguageVariant(g_Config.m_ClLanguagefile);
@@ -270,21 +333,24 @@ void CGameClient::OnInit()
 	// update and swap after font loading, they are quite huge
 	Client()->UpdateAndSwap();
 
-	const char *pLoadingDDNetCaption = Localize("StA Client Loading");
+	const char *pLoadingDDNetCaption = Localize("Loading DDNet Client");
+	const char *pLoadingMessageComponents = Localize("Initializing components");
+	const char *pLoadingMessageComponentsSpecial = Localize("Why are you slowmo replaying to read this?");
+	char aLoadingMessage[256];
 
 	// init all components
-	int SkippedComps = 0;
-	int CompCounter = 0;
-	for(int i = m_vpAll.size() - 1; i >= 0; --i)
+	int SkippedComps = 1;
+	int CompCounter = 1;
+	const int NumComponents = ComponentCount();
+	for(int i = NumComponents - 1; i >= 0; --i)
 	{
 		m_vpAll[i]->OnInit();
 		// try to render a frame after each component, also flushes GPU uploads
 		if(m_Menus.IsInit())
 		{
-			char aBuff[256];
-			str_format(aBuff, std::size(aBuff), "%s [%d/%d]", CompCounter == 40 ? Localize("Why are you slowmo replaying to read this?") : Localize("Initializing components"), (CompCounter + 1), (int)ComponentCount());
-			m_Menus.RenderLoading(pLoadingDDNetCaption, aBuff, 1 + SkippedComps);
-			SkippedComps = 0;
+			str_format(aLoadingMessage, std::size(aLoadingMessage), "%s [%d/%d]", CompCounter == NumComponents ? pLoadingMessageComponentsSpecial : pLoadingMessageComponents, CompCounter, NumComponents);
+			m_Menus.RenderLoading(pLoadingDDNetCaption, aLoadingMessage, SkippedComps);
+			SkippedComps = 1;
 		}
 		else
 		{
@@ -293,14 +359,13 @@ void CGameClient::OnInit()
 		++CompCounter;
 	}
 
-	char aBuf[256];
-
 	m_GameSkinLoaded = false;
 	m_ParticlesSkinLoaded = false;
 	m_EmoticonsSkinLoaded = false;
 	m_HudSkinLoaded = false;
 
 	// setup load amount, load textures
+	const char *pLoadingMessageAssets = Localize("Initializing assets");
 	for(int i = 0; i < g_pData->m_NumImages; i++)
 	{
 		if(i == IMAGE_GAME)
@@ -317,56 +382,26 @@ void CGameClient::OnInit()
 			g_pData->m_aImages[i].m_Id = IGraphics::CTextureHandle();
 		else
 			g_pData->m_aImages[i].m_Id = Graphics()->LoadTexture(g_pData->m_aImages[i].m_pFilename, IStorage::TYPE_ALL);
+		m_Menus.RenderLoading(pLoadingDDNetCaption, pLoadingMessageAssets, 1);
+	}
+	for(int i = 0; i < client_data7::g_pData->m_NumImages; i++)
+	{
+		if(client_data7::g_pData->m_aImages[i].m_pFilename[0] == '\0') // handle special null image without filename
+			client_data7::g_pData->m_aImages[i].m_Id = IGraphics::CTextureHandle();
+		else if(i == client_data7::IMAGE_DEADTEE)
+			client_data7::g_pData->m_aImages[i].m_Id = Graphics()->LoadTexture(client_data7::g_pData->m_aImages[i].m_pFilename, IStorage::TYPE_ALL, 0);
 		m_Menus.RenderLoading(pLoadingDDNetCaption, Localize("Initializing assets"), 1);
 	}
 
-	for(auto &pComponent : m_vpAll)
-		pComponent->OnReset();
-
-	m_ServerMode = SERVERMODE_PURE;
-
-	m_aDDRaceMsgSent[0] = false;
-	m_aDDRaceMsgSent[1] = false;
-	m_aShowOthers[0] = SHOW_OTHERS_NOT_SET;
-	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
-	m_aSwitchStateTeam[0] = -1;
-	m_aSwitchStateTeam[1] = -1;
-
-	m_LastZoom = .0;
-	m_LastScreenAspect = .0;
-	m_LastDummyConnected = false;
+	m_GameWorld.m_pCollision = Collision();
+	m_GameWorld.m_pTuningList = m_aTuningList;
+	OnReset();
 
 	// Set free binds to DDRace binds if it's active
 	m_Binds.SetDDRaceBinds(true);
 
-	if(g_Config.m_ClTimeoutCode[0] == '\0' || str_comp(g_Config.m_ClTimeoutCode, "hGuEYnfxicsXGwFq") == 0)
-	{
-		for(unsigned int i = 0; i < 16; i++)
-		{
-			if(rand() % 2)
-				g_Config.m_ClTimeoutCode[i] = (char)((rand() % 26) + 97);
-			else
-				g_Config.m_ClTimeoutCode[i] = (char)((rand() % 26) + 65);
-		}
-	}
-
-	if(g_Config.m_ClDummyTimeoutCode[0] == '\0' || str_comp(g_Config.m_ClDummyTimeoutCode, "hGuEYnfxicsXGwFq") == 0)
-	{
-		for(unsigned int i = 0; i < 16; i++)
-		{
-			if(rand() % 2)
-				g_Config.m_ClDummyTimeoutCode[i] = (char)((rand() % 26) + 97);
-			else
-				g_Config.m_ClDummyTimeoutCode[i] = (char)((rand() % 26) + 65);
-		}
-	}
-
-	int64_t End = time_get();
-	str_format(aBuf, sizeof(aBuf), "initialisation finished after %.2fms", ((End - Start) * 1000) / (float)time_freq());
-	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "gameclient", aBuf);
-
-	m_GameWorld.m_pCollision = Collision();
-	m_GameWorld.m_pTuningList = m_aTuningList;
+	GenerateTimeoutCode(g_Config.m_ClTimeoutCode);
+	GenerateTimeoutCode(g_Config.m_ClDummyTimeoutCode);
 
 	m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
 
@@ -386,13 +421,15 @@ void CGameClient::OnInit()
 		int Size = m_vpAll[i]->Sizeof();
 		pChecksum->m_aComponentsChecksum[i] = Size;
 	}
+
+	log_trace("gameclient", "initialization finished after %.2fms", (time_get() - OnInitStart) * 1000.0f / (float)time_freq());
 }
 
 void CGameClient::OnUpdate()
 {
 	HandleLanguageChanged();
 
-	CUIElementBase::Init(UI()); // update static pointer because game and editor use separate UI
+	CUIElementBase::Init(Ui()); // update static pointer because game and editor use separate UI
 
 	// handle mouse movement
 	float x = 0.0f, y = 0.0f;
@@ -407,55 +444,21 @@ void CGameClient::OnUpdate()
 	}
 
 	// handle key presses
-	for(size_t i = 0; i < Input()->NumEvents(); i++)
-	{
-		const IInput::CEvent &Event = Input()->GetEvent(i);
-		if(!Input()->IsEventValid(Event))
-			continue;
-
+	Input()->ConsumeEvents([&](const IInput::CEvent &Event) {
 		for(auto &pComponent : m_vpInput)
 		{
-			if(pComponent->OnInput(Event))
+			// Events with flag `FLAG_RELEASE` must always be forwarded to all components so keys being
+			// released can be handled in all components also after some components have been disabled.
+			if(pComponent->OnInput(Event) && (Event.m_Flags & ~IInput::FLAG_RELEASE) != 0)
 				break;
 		}
-	}
+	});
 
 	if(g_Config.m_ClSubTickAiming && m_Binds.m_MouseOnAction)
 	{
 		m_Controls.m_aMousePosOnAction[g_Config.m_ClDummy] = m_Controls.m_aMousePos[g_Config.m_ClDummy];
 		m_Binds.m_MouseOnAction = false;
 	}
-	static float OldUpdateTime = Client()->LocalTime();
-	if(OldUpdateTime + 1 < Client()->LocalTime())
-	{
-		OldUpdateTime = Client()->LocalTime();
-		IDiscord *discord = Kernel()->RequestInterface<IDiscord>();
-		int LocalID = m_aLocalIDs[g_Config.m_ClDummy];
-		bool Afk = m_aClients[LocalID].m_Afk;
-		if(!discord)
-			return;
-
-		const char *pText;
-		const char *pImage;
-
-		if(Afk)
-		{
-			pText = "Idleing...";
-			pImage = "idle";
-		}
-		else if(Client()->State() != IClient::STATE_ONLINE)
-		{
-			pText = "Chilling in menus";
-			pImage = "menu1";
-		}
-		else
-		{
-			pText = "Playing";
-			pImage = "greenline";
-		}
-
-		discord->SetGameInfo(Client()->ServerAddress(), (Client()->State() != IClient::STATE_ONLINE) ? "" : Client()->GetCurrentMap(), false, pText, pImage, Client()->PlayerName());
-	}
 }
 
 void CGameClient::OnDummySwap()
@@ -512,7 +515,7 @@ int CGameClient::OnSnapInput(int *pData, bool Dummy, bool Force)
 		}
 
 		vec2 MainPos = m_LocalCharacterPos;
-		vec2 DummyPos = m_aClients[m_aLocalIDs[!g_Config.m_ClDummy]].m_Predicted.m_Pos;
+		vec2 DummyPos = m_aClients[m_aLocalIds[!g_Config.m_ClDummy]].m_Predicted.m_Pos;
 		vec2 Dir = MainPos - DummyPos;
 		m_HammerInput.m_TargetX = (int)(Dir.x);
 		m_HammerInput.m_TargetY = (int)(Dir.y);
@@ -531,21 +534,7 @@ void CGameClient::OnConnected()
 	m_Layers.Init(Kernel());
 	m_Collision.Init(Layers());
 	m_GameWorld.m_Core.InitSwitchers(m_Collision.m_HighestSwitchNumber);
-
-	CRaceHelper::ms_aFlagIndex[0] = -1;
-	CRaceHelper::ms_aFlagIndex[1] = -1;
-
-	CTile *pGameTiles = static_cast<CTile *>(Layers()->Map()->GetData(Layers()->GameLayer()->m_Data));
-
-	// get flag positions
-	for(int i = 0; i < m_Collision.GetWidth() * m_Collision.GetHeight(); i++)
-	{
-		if(pGameTiles[i].m_Index - ENTITY_OFFSET == ENTITY_FLAGSTAND_RED)
-			CRaceHelper::ms_aFlagIndex[TEAM_RED] = i;
-		else if(pGameTiles[i].m_Index - ENTITY_OFFSET == ENTITY_FLAGSTAND_BLUE)
-			CRaceHelper::ms_aFlagIndex[TEAM_BLUE] = i;
-		i += pGameTiles[i].m_Skip;
-	}
+	m_RaceHelper.Init(this);
 
 	// render loading before going through all components
 	m_Menus.RenderLoading(pConnectCaption, pLoadMapContent, 0, false);
@@ -558,8 +547,6 @@ void CGameClient::OnConnected()
 	Client()->SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_GETTING_READY);
 	m_Menus.RenderLoading(pConnectCaption, Localize("Sending initial client info"), 0, false);
 
-	m_ServerMode = SERVERMODE_PURE;
-
 	// send the initial info
 	SendInfo(true);
 	// we should keep this in for now, because otherwise you can't spectate
@@ -567,10 +554,6 @@ void CGameClient::OnConnected()
 	// snap
 	Client()->Rcon("crashmeplx");
 
-	m_GameWorld.Clear();
-	m_GameWorld.m_WorldConfig.m_InfiniteAmmo = true;
-	mem_zero(&m_GameInfo, sizeof(m_GameInfo));
-	m_PredictedDummyID = -1;
 	ConfigManager()->ResetGameSettings();
 	LoadMapSettings();
 
@@ -580,48 +563,100 @@ void CGameClient::OnConnected()
 
 void CGameClient::OnReset()
 {
-	m_aLastNewPredictedTick[0] = -1;
-	m_aLastNewPredictedTick[1] = -1;
+	InvalidateSnapshot();
 
-	m_aLocalTuneZone[0] = 0;
-	m_aLocalTuneZone[1] = 0;
+	m_EditorMovementDelay = 5;
 
-	m_aExpectingTuningForZone[0] = -1;
-	m_aExpectingTuningForZone[1] = -1;
+	m_PredictedTick = -1;
+	std::fill(std::begin(m_aLastNewPredictedTick), std::end(m_aLastNewPredictedTick), -1);
 
-	m_aReceivedTuning[0] = false;
-	m_aReceivedTuning[1] = false;
+	m_LastRoundStartTick = -1;
+	m_LastFlagCarrierRed = -4;
+	m_LastFlagCarrierBlue = -4;
 
-	InvalidateSnapshot();
+	std::fill(std::begin(m_aCheckInfo), std::end(m_aCheckInfo), -1);
 
-	for(auto &Client : m_aClients)
-		Client.Reset();
+	// m_aDDNetVersionStr is initialized once in OnInit
 
-	for(auto &pComponent : m_vpAll)
-		pComponent->OnReset();
+	std::fill(std::begin(m_aLastPos), std::end(m_aLastPos), vec2(0.0f, 0.0f));
+	std::fill(std::begin(m_aLastActive), std::end(m_aLastActive), false);
+
+	m_GameOver = false;
+	m_GamePaused = false;
+	m_PrevLocalId = -1;
+
+	m_SuppressEvents = false;
+	m_NewTick = false;
+	m_NewPredictedTick = false;
 
-	m_DemoSpecID = SPEC_FOLLOW;
 	m_aFlagDropTick[TEAM_RED] = 0;
 	m_aFlagDropTick[TEAM_BLUE] = 0;
-	m_LastRoundStartTick = -1;
-	m_LastFlagCarrierRed = -4;
-	m_LastFlagCarrierBlue = -4;
-	m_aTuning[g_Config.m_ClDummy] = CTuningParams();
+
+	m_ServerMode = SERVERMODE_PURE;
+	mem_zero(&m_GameInfo, sizeof(m_GameInfo));
+
+	m_DemoSpecId = SPEC_FOLLOW;
+	m_LocalCharacterPos = vec2(0.0f, 0.0f);
+
+	m_PredictedPrevChar.Reset();
+	m_PredictedChar.Reset();
+
+	// m_Snap was cleared in InvalidateSnapshot
+
+	std::fill(std::begin(m_aLocalTuneZone), std::end(m_aLocalTuneZone), 0);
+	std::fill(std::begin(m_aReceivedTuning), std::end(m_aReceivedTuning), false);
+	std::fill(std::begin(m_aExpectingTuningForZone), std::end(m_aExpectingTuningForZone), -1);
+	std::fill(std::begin(m_aExpectingTuningSince), std::end(m_aExpectingTuningSince), 0);
+	std::fill(std::begin(m_aTuning), std::end(m_aTuning), CTuningParams());
+
+	for(auto &Client : m_aClients)
+		Client.Reset();
+
+	for(auto &Stats : m_aStats)
+		Stats.Reset();
+
+	m_NextChangeInfo = 0;
+	std::fill(std::begin(m_aLocalIds), std::end(m_aLocalIds), -1);
+	m_DummyInput = {};
+	m_HammerInput = {};
+	m_DummyFire = 0;
+	m_ReceivedDDNetPlayer = false;
 
 	m_Teams.Reset();
-	m_aDDRaceMsgSent[0] = false;
-	m_aDDRaceMsgSent[1] = false;
-	m_aShowOthers[0] = SHOW_OTHERS_NOT_SET;
-	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
+	m_GameWorld.Clear();
+	m_GameWorld.m_WorldConfig.m_InfiniteAmmo = true;
+	m_PredictedWorld.CopyWorld(&m_GameWorld);
+	m_PrevPredictedWorld.CopyWorld(&m_PredictedWorld);
 
-	m_LastZoom = .0;
-	m_LastScreenAspect = .0;
+	m_vSnapEntities.clear();
+
+	std::fill(std::begin(m_aDDRaceMsgSent), std::end(m_aDDRaceMsgSent), false);
+	std::fill(std::begin(m_aShowOthers), std::end(m_aShowOthers), SHOW_OTHERS_NOT_SET);
+	std::fill(std::begin(m_aLastUpdateTick), std::end(m_aLastUpdateTick), 0);
+
+	m_PredictedDummyId = -1;
+	m_IsDummySwapping = false;
+	m_CharOrder.Reset();
+	std::fill(std::begin(m_aSwitchStateTeam), std::end(m_aSwitchStateTeam), -1);
+
+	// m_aTuningList is reset in LoadMapSettings
+
+	m_LastZoom = 0.0f;
+	m_LastScreenAspect = 0.0f;
 	m_LastDummyConnected = false;
 
-	m_ReceivedDDNetPlayer = false;
+	m_MultiViewPersonalZoom = 0;
+	m_MultiViewActivated = false;
+	m_MultiView.m_IsInit = false;
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnReset();
 
 	Editor()->ResetMentions();
 	Editor()->ResetIngameMoved();
+
+	Collision()->Unload();
+	Layers()->Unload();
 }
 
 void CGameClient::UpdatePositions()
@@ -663,17 +698,17 @@ void CGameClient::UpdatePositions()
 		{
 			HandleMultiView();
 		}
-		else if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecID != SPEC_FOLLOW && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
+		else if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecId != SPEC_FOLLOW && m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)
 		{
 			m_Snap.m_SpecInfo.m_Position = mix(
-				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Prev.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Prev.m_Y),
-				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Cur.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Cur.m_Y),
+				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorId].m_Prev.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorId].m_Prev.m_Y),
+				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorId].m_Cur.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorId].m_Cur.m_Y),
 				Client()->IntraGameTick(g_Config.m_ClDummy));
 			m_Snap.m_SpecInfo.m_UsePosition = true;
 		}
-		else if(m_Snap.m_pSpectatorInfo && ((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecID == SPEC_FOLLOW) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)))
+		else if(m_Snap.m_pSpectatorInfo && ((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecId == SPEC_FOLLOW) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)))
 		{
-			if(m_Snap.m_pPrevSpectatorInfo && m_Snap.m_pPrevSpectatorInfo->m_SpectatorID == m_Snap.m_pSpectatorInfo->m_SpectatorID)
+			if(m_Snap.m_pPrevSpectatorInfo && m_Snap.m_pPrevSpectatorInfo->m_SpectatorId == m_Snap.m_pSpectatorInfo->m_SpectatorId)
 				m_Snap.m_SpecInfo.m_Position = mix(vec2(m_Snap.m_pPrevSpectatorInfo->m_X, m_Snap.m_pPrevSpectatorInfo->m_Y),
 					vec2(m_Snap.m_pSpectatorInfo->m_X, m_Snap.m_pSpectatorInfo->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
 			else
@@ -690,17 +725,12 @@ void CGameClient::UpdatePositions()
 
 void CGameClient::OnRender()
 {
-	if(g_Config.m_ClAutoVerify)
-	{
-		m_Verify.OnRender();
-	}
-
 	// check if multi view got activated
 	if(!m_MultiView.m_IsInit && m_MultiViewActivated)
 	{
 		int TeamId = 0;
-		if(m_Snap.m_SpecInfo.m_SpectatorID >= 0)
-			TeamId = m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
+		if(m_Snap.m_SpecInfo.m_SpectatorId >= 0)
+			TeamId = m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorId);
 
 		if(TeamId > MAX_CLIENTS || TeamId < 0)
 			TeamId = 0;
@@ -720,7 +750,7 @@ void CGameClient::OnRender()
 	{
 		if(pWarning != nullptr && m_Menus.CanDisplayWarning())
 		{
-			m_Menus.PopupWarning(pWarning->m_aWarningTitle[0] == '\0' ? Localize("Warning") : pWarning->m_aWarningTitle, pWarning->m_aWarningMsg, "Ok", pWarning->m_AutoHide ? 10s : 0s);
+			m_Menus.PopupWarning(pWarning->m_aWarningTitle[0] == '\0' ? Localize("Warning") : pWarning->m_aWarningTitle, pWarning->m_aWarningMsg, Localize("Ok"), pWarning->m_AutoHide ? 10s : 0s);
 			pWarning->m_WasShown = true;
 		}
 	}
@@ -746,17 +776,27 @@ void CGameClient::OnRender()
 	{
 		if(m_aCheckInfo[0] == 0)
 		{
-			if(
-				str_comp(m_aClients[m_aLocalIDs[0]].m_aName, Client()->PlayerName()) ||
-				str_comp(m_aClients[m_aLocalIDs[0]].m_aClan, g_Config.m_PlayerClan) ||
-				m_aClients[m_aLocalIDs[0]].m_Country != g_Config.m_PlayerCountry ||
-				str_comp(m_aClients[m_aLocalIDs[0]].m_aSkinName, g_Config.m_ClPlayerSkin) ||
-				m_aClients[m_aLocalIDs[0]].m_UseCustomColor != g_Config.m_ClPlayerUseCustomColor ||
-				m_aClients[m_aLocalIDs[0]].m_ColorBody != (int)g_Config.m_ClPlayerColorBody ||
-				m_aClients[m_aLocalIDs[0]].m_ColorFeet != (int)g_Config.m_ClPlayerColorFeet)
-				SendInfo(false);
+			if(m_pClient->IsSixup())
+			{
+				if(!GotWantedSkin7(false))
+					SendSkinChange7(false);
+				else
+					m_aCheckInfo[0] = -1;
+			}
 			else
-				m_aCheckInfo[0] = -1;
+			{
+				if(
+					str_comp(m_aClients[m_aLocalIds[0]].m_aName, Client()->PlayerName()) ||
+					str_comp(m_aClients[m_aLocalIds[0]].m_aClan, g_Config.m_PlayerClan) ||
+					m_aClients[m_aLocalIds[0]].m_Country != g_Config.m_PlayerCountry ||
+					str_comp(m_aClients[m_aLocalIds[0]].m_aSkinName, g_Config.m_ClPlayerSkin) ||
+					m_aClients[m_aLocalIds[0]].m_UseCustomColor != g_Config.m_ClPlayerUseCustomColor ||
+					m_aClients[m_aLocalIds[0]].m_ColorBody != (int)g_Config.m_ClPlayerColorBody ||
+					m_aClients[m_aLocalIds[0]].m_ColorFeet != (int)g_Config.m_ClPlayerColorFeet)
+					SendInfo(false);
+				else
+					m_aCheckInfo[0] = -1;
+			}
 		}
 
 		if(m_aCheckInfo[0] > 0)
@@ -766,17 +806,27 @@ void CGameClient::OnRender()
 		{
 			if(m_aCheckInfo[1] == 0)
 			{
-				if(
-					str_comp(m_aClients[m_aLocalIDs[1]].m_aName, Client()->DummyName()) ||
-					str_comp(m_aClients[m_aLocalIDs[1]].m_aClan, g_Config.m_ClDummyClan) ||
-					m_aClients[m_aLocalIDs[1]].m_Country != g_Config.m_ClDummyCountry ||
-					str_comp(m_aClients[m_aLocalIDs[1]].m_aSkinName, g_Config.m_ClDummySkin) ||
-					m_aClients[m_aLocalIDs[1]].m_UseCustomColor != g_Config.m_ClDummyUseCustomColor ||
-					m_aClients[m_aLocalIDs[1]].m_ColorBody != (int)g_Config.m_ClDummyColorBody ||
-					m_aClients[m_aLocalIDs[1]].m_ColorFeet != (int)g_Config.m_ClDummyColorFeet)
-					SendDummyInfo(false);
+				if(m_pClient->IsSixup())
+				{
+					if(!GotWantedSkin7(true))
+						SendSkinChange7(true);
+					else
+						m_aCheckInfo[1] = -1;
+				}
 				else
-					m_aCheckInfo[1] = -1;
+				{
+					if(
+						str_comp(m_aClients[m_aLocalIds[1]].m_aName, Client()->DummyName()) ||
+						str_comp(m_aClients[m_aLocalIds[1]].m_aClan, g_Config.m_ClDummyClan) ||
+						m_aClients[m_aLocalIds[1]].m_Country != g_Config.m_ClDummyCountry ||
+						str_comp(m_aClients[m_aLocalIds[1]].m_aSkinName, g_Config.m_ClDummySkin) ||
+						m_aClients[m_aLocalIds[1]].m_UseCustomColor != g_Config.m_ClDummyUseCustomColor ||
+						m_aClients[m_aLocalIds[1]].m_ColorBody != (int)g_Config.m_ClDummyColorBody ||
+						m_aClients[m_aLocalIds[1]].m_ColorFeet != (int)g_Config.m_ClDummyColorFeet)
+						SendDummyInfo(false);
+					else
+						m_aCheckInfo[1] = -1;
+				}
 			}
 
 			if(m_aCheckInfo[1] > 0)
@@ -790,7 +840,7 @@ void CGameClient::OnDummyDisconnect()
 	m_aDDRaceMsgSent[1] = false;
 	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
 	m_aLastNewPredictedTick[1] = -1;
-	m_PredictedDummyID = -1;
+	m_PredictedDummyId = -1;
 }
 
 int CGameClient::GetLastRaceTick() const
@@ -825,6 +875,32 @@ ColorRGBA CGameClient::GetDDTeamColor(int DDTeam, float Lightness) const
 	return color_cast<ColorRGBA>(ColorHSLA(Hue, 1.0f, Lightness));
 }
 
+void CGameClient::FormatClientId(int ClientId, char (&aClientId)[16], EClientIdFormat Format) const
+{
+	if(Format == EClientIdFormat::NO_INDENT)
+	{
+		str_format(aClientId, sizeof(aClientId), "%d", ClientId);
+	}
+	else
+	{
+		const int HighestClientId = Format == EClientIdFormat::INDENT_AUTO ? m_Snap.m_HighestClientId : 64;
+		const char *pFigureSpace = " ";
+		char aNumber[8];
+		str_format(aNumber, sizeof(aNumber), "%d", ClientId);
+		aClientId[0] = '\0';
+		if(ClientId < 100 && HighestClientId >= 100)
+		{
+			str_append(aClientId, pFigureSpace);
+		}
+		if(ClientId < 10 && HighestClientId >= 10)
+		{
+			str_append(aClientId, pFigureSpace);
+		}
+		str_append(aClientId, aNumber);
+	}
+	str_append(aClientId, ": ");
+}
+
 void CGameClient::OnRelease()
 {
 	// release all systems
@@ -835,16 +911,18 @@ void CGameClient::OnRelease()
 void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dummy)
 {
 	// special messages
+	static_assert((int)NETMSGTYPE_SV_TUNEPARAMS == (int)protocol7::NETMSGTYPE_SV_TUNEPARAMS, "0.6 and 0.7 tune message id do not match");
 	if(MsgId == NETMSGTYPE_SV_TUNEPARAMS)
 	{
 		// unpack the new tuning
 		CTuningParams NewTuning;
 		int *pParams = (int *)&NewTuning;
-		// No jetpack on DDNet incompatible servers:
-		NewTuning.m_JetpackStrength = 0;
 		for(unsigned i = 0; i < sizeof(CTuningParams) / sizeof(int); i++)
 		{
-			int value = pUnpacker->GetInt();
+			// 31 is the magic number index of laser_damage
+			// which was removed in 0.7
+			// also in 0.6 it is unsed so we just set it to 0
+			int value = (Client()->IsSixup() && i == 30) ? 0 : pUnpacker->GetInt();
 
 			// check for unpacking errors
 			if(pUnpacker->Error())
@@ -853,6 +931,9 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 			pParams[i] = value;
 		}
 
+		// No jetpack on DDNet incompatible servers:
+		NewTuning.m_JetpackStrength = 0;
+
 		m_ServerMode = SERVERMODE_PURE;
 
 		m_aReceivedTuning[Conn] = true;
@@ -861,22 +942,28 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 		return;
 	}
 
-	void *pRawMsg = m_NetObjHandler.SecureUnpackMsg(MsgId, pUnpacker);
+	void *pRawMsg = TranslateGameMsg(&MsgId, pUnpacker, Conn);
+
 	if(!pRawMsg)
 	{
-		char aBuf[256];
-		str_format(aBuf, sizeof(aBuf), "dropped weird message '%s' (%d), failed on '%s'", m_NetObjHandler.GetMsgName(MsgId), MsgId, m_NetObjHandler.FailedMsgOn());
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+		// the 0.7 version of this error message is printed on translation
+		// in sixup/translate_game.cpp
+		if(!Client()->IsSixup())
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "dropped weird message '%s' (%d), failed on '%s'", m_NetObjHandler.GetMsgName(MsgId), MsgId, m_NetObjHandler.FailedMsgOn());
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+		}
 		return;
 	}
 
 	if(Dummy)
 	{
-		if(MsgId == NETMSGTYPE_SV_CHAT && m_aLocalIDs[0] >= 0 && m_aLocalIDs[1] >= 0)
+		if(MsgId == NETMSGTYPE_SV_CHAT && m_aLocalIds[0] >= 0 && m_aLocalIds[1] >= 0)
 		{
 			CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
 
-			if((pMsg->m_Team == 1 && (m_aClients[m_aLocalIDs[0]].m_Team != m_aClients[m_aLocalIDs[1]].m_Team || m_Teams.Team(m_aLocalIDs[0]) != m_Teams.Team(m_aLocalIDs[1]))) || pMsg->m_Team > 1)
+			if((pMsg->m_Team == 1 && (m_aClients[m_aLocalIds[0]].m_Team != m_aClients[m_aLocalIds[1]].m_Team || m_Teams.Team(m_aLocalIds[0]) != m_Teams.Team(m_aLocalIds[1]))) || pMsg->m_Team > 1)
 			{
 				m_Chat.OnMessage(MsgId, pRawMsg);
 			}
@@ -897,9 +984,9 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 		CNetMsg_Sv_Emoticon *pMsg = (CNetMsg_Sv_Emoticon *)pRawMsg;
 
 		// apply
-		m_aClients[pMsg->m_ClientID].m_Emoticon = pMsg->m_Emoticon;
-		m_aClients[pMsg->m_ClientID].m_EmoticonStartTick = Client()->GameTick(Conn);
-		m_aClients[pMsg->m_ClientID].m_EmoticonStartFraction = Client()->IntraGameTickSincePrev(Conn);
+		m_aClients[pMsg->m_ClientId].m_Emoticon = pMsg->m_Emoticon;
+		m_aClients[pMsg->m_ClientId].m_EmoticonStartTick = Client()->GameTick(Conn);
+		m_aClients[pMsg->m_ClientId].m_EmoticonStartFraction = Client()->IntraGameTickSincePrev(Conn);
 	}
 	else if(MsgId == NETMSGTYPE_SV_SOUNDGLOBAL)
 	{
@@ -908,17 +995,17 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 
 		// don't enqueue pseudo-global sounds from demos (created by PlayAndRecord)
 		CNetMsg_Sv_SoundGlobal *pMsg = (CNetMsg_Sv_SoundGlobal *)pRawMsg;
-		if(pMsg->m_SoundID == SOUND_CTF_DROP || pMsg->m_SoundID == SOUND_CTF_RETURN ||
-			pMsg->m_SoundID == SOUND_CTF_CAPTURE || pMsg->m_SoundID == SOUND_CTF_GRAB_EN ||
-			pMsg->m_SoundID == SOUND_CTF_GRAB_PL)
+		if(pMsg->m_SoundId == SOUND_CTF_DROP || pMsg->m_SoundId == SOUND_CTF_RETURN ||
+			pMsg->m_SoundId == SOUND_CTF_CAPTURE || pMsg->m_SoundId == SOUND_CTF_GRAB_EN ||
+			pMsg->m_SoundId == SOUND_CTF_GRAB_PL)
 		{
 			if(g_Config.m_SndGame)
-				m_Sounds.Enqueue(CSounds::CHN_GLOBAL, pMsg->m_SoundID);
+				m_Sounds.Enqueue(CSounds::CHN_GLOBAL, pMsg->m_SoundId);
 		}
 		else
 		{
 			if(g_Config.m_SndGame)
-				m_Sounds.Play(CSounds::CHN_GLOBAL, pMsg->m_SoundID, 1.0f);
+				m_Sounds.Play(CSounds::CHN_GLOBAL, pMsg->m_SoundId, 1.0f);
 		}
 	}
 	else if(MsgId == NETMSGTYPE_SV_TEAMSSTATE || MsgId == NETMSGTYPE_SV_TEAMSSTATELEGACY)
@@ -950,13 +1037,14 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 		if(!(m_GameWorld.m_WorldConfig.m_IsFNG && pMsg->m_Weapon == WEAPON_LASER))
 		{
 			m_CharOrder.GiveWeak(pMsg->m_Victim);
-			if(CCharacter *pChar = m_GameWorld.GetCharacterByID(pMsg->m_Victim))
+			if(CCharacter *pChar = m_GameWorld.GetCharacterById(pMsg->m_Victim))
 				pChar->ResetPrediction();
 			m_GameWorld.ReleaseHooked(pMsg->m_Victim);
 		}
 
 		// if we are spectating a static id set (team 0) and somebody killed, and its not a guy in solo, we remove him from the list
-		if(IsMultiViewIdSet() && m_MultiViewTeam == 0 && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec && !m_MultiView.m_Solo)
+		// never remove players from the list if it is a pvp server
+		if(IsMultiViewIdSet() && m_MultiViewTeam == 0 && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec && !m_MultiView.m_Solo && !m_GameInfo.m_Pvp)
 		{
 			m_aMultiViewId[pMsg->m_Victim] = false;
 
@@ -966,14 +1054,14 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 			else
 			{
 				// the "main" tee killed, search a new one
-				if(m_Snap.m_SpecInfo.m_SpectatorID == pMsg->m_Victim)
+				if(m_Snap.m_SpecInfo.m_SpectatorId == pMsg->m_Victim)
 				{
-					int NewClientID = FindFirstMultiViewId();
-					if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
+					int NewClientId = FindFirstMultiViewId();
+					if(NewClientId < MAX_CLIENTS && NewClientId >= 0)
 					{
-						CleanMultiViewId(NewClientID);
-						m_aMultiViewId[NewClientID] = true;
-						m_Spectator.Spectate(NewClientID);
+						CleanMultiViewId(NewClientId);
+						m_aMultiViewId[NewClientId] = true;
+						m_Spectator.Spectate(NewClientId);
 					}
 				}
 			}
@@ -989,20 +1077,36 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 		{
 			if(m_Teams.Team(i) == pMsg->m_Team)
 			{
-				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+				if(CCharacter *pChar = m_GameWorld.GetCharacterById(i))
 				{
 					pChar->ResetPrediction();
-					vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChar ? pChar->GetStrongWeakID() : 0);
+					vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChar ? pChar->GetStrongWeakId() : 0);
 				}
 				m_GameWorld.ReleaseHooked(i);
 			}
 		}
 		std::stable_sort(vStrongWeakSorted.begin(), vStrongWeakSorted.end(), [](auto &Left, auto &Right) { return Left.second > Right.second; });
-		for(auto ID : vStrongWeakSorted)
+		for(auto Id : vStrongWeakSorted)
 		{
-			m_CharOrder.GiveWeak(ID.first);
+			m_CharOrder.GiveWeak(Id.first);
 		}
 	}
+	else if(MsgId == NETMSGTYPE_SV_CHANGEINFOCOOLDOWN)
+	{
+		CNetMsg_Sv_ChangeInfoCooldown *pMsg = (CNetMsg_Sv_ChangeInfoCooldown *)pRawMsg;
+		m_NextChangeInfo = pMsg->m_WaitUntil;
+	}
+	else if(MsgId == NETMSGTYPE_SV_MAPSOUNDGLOBAL)
+	{
+		if(m_SuppressEvents)
+			return;
+
+		if(!g_Config.m_SndGame)
+			return;
+
+		CNetMsg_Sv_MapSoundGlobal *pMsg = (CNetMsg_Sv_MapSoundGlobal *)pRawMsg;
+		m_MapSounds.Play(CSounds::CHN_GLOBAL, pMsg->m_SoundId);
+	}
 }
 
 void CGameClient::OnStateChange(int NewState, int OldState)
@@ -1018,15 +1122,12 @@ void CGameClient::OnStateChange(int NewState, int OldState)
 
 void CGameClient::OnShutdown()
 {
-	RenderShutdownMessage();
-
 	for(auto &pComponent : m_vpAll)
 		pComponent->OnShutdown();
 }
 
 void CGameClient::OnEnterGame()
 {
-	m_Effects.ResetDamageIndicator();
 }
 
 void CGameClient::OnGameOver()
@@ -1053,9 +1154,9 @@ void CGameClient::OnStartRound()
 	m_RaceDemo.OnReset();
 }
 
-void CGameClient::OnFlagGrab(int TeamID)
+void CGameClient::OnFlagGrab(int TeamId)
 {
-	if(TeamID == TEAM_RED)
+	if(TeamId == TEAM_RED)
 		m_aStats[m_Snap.m_pGameDataObj->m_FlagCarrierRed].m_FlagGrabs++;
 	else
 		m_aStats[m_Snap.m_pGameDataObj->m_FlagCarrierBlue].m_FlagGrabs++;
@@ -1066,7 +1167,7 @@ void CGameClient::OnWindowResize()
 	for(auto &pComponent : m_vpAll)
 		pComponent->OnWindowResize();
 
-	UI()->OnWindowResize();
+	Ui()->OnWindowResize();
 }
 
 void CGameClient::OnLanguageChange()
@@ -1093,20 +1194,8 @@ void CGameClient::HandleLanguageChanged()
 void CGameClient::RenderShutdownMessage()
 {
 	const char *pMessage = nullptr;
-
 	if(Client()->State() == IClient::STATE_QUITTING)
-	{
-		// Randomly decide whether to display "Goodbye..." (10% chance)
-		if(rand() % 20 == 0)
-		{
-			pMessage = "Hope -StormAx gonna kill himself soon…";
-		}
-		else
-		{
-			pMessage = Localize("Quitting. Please wait…");
-		}
-	}
-
+		pMessage = Localize("Quitting. Please wait…");
 	else if(Client()->State() == IClient::STATE_RESTARTING)
 		pMessage = Localize("Restarting. Please wait…");
 	else
@@ -1114,9 +1203,9 @@ void CGameClient::RenderShutdownMessage()
 
 	// This function only gets called after the render loop has already terminated, so we have to call Swap manually.
 	Graphics()->Clear(0.0f, 0.0f, 0.0f);
-	UI()->MapScreen();
+	Ui()->MapScreen();
 	TextRender()->TextColor(TextRender()->DefaultTextColor());
-	UI()->DoLabel(UI()->Screen(), pMessage, 16.0f, TEXTALIGN_MC);
+	Ui()->DoLabel(Ui()->Screen(), pMessage, 16.0f, TEXTALIGN_MC);
 	Graphics()->Swap();
 	Graphics()->Clear(0.0f, 0.0f, 0.0f);
 }
@@ -1140,52 +1229,69 @@ void CGameClient::ProcessEvents()
 	int Num = Client()->SnapNumItems(SnapType);
 	for(int Index = 0; Index < Num; Index++)
 	{
-		IClient::CSnapItem Item;
-		const void *pData = Client()->SnapGetItem(SnapType, Index, &Item);
+		const IClient::CSnapItem Item = Client()->SnapGetItem(SnapType, Index);
 
 		// We don't have enough info about us, others, to know a correct alpha value.
 		float Alpha = 1.0f;
 
 		if(Item.m_Type == NETEVENTTYPE_DAMAGEIND)
 		{
-			CNetEvent_DamageInd *pEvent = (CNetEvent_DamageInd *)pData;
+			const CNetEvent_DamageInd *pEvent = (const CNetEvent_DamageInd *)Item.m_pData;
 			m_Effects.DamageIndicator(vec2(pEvent->m_X, pEvent->m_Y), direction(pEvent->m_Angle / 256.0f), Alpha);
 		}
 		else if(Item.m_Type == NETEVENTTYPE_EXPLOSION)
 		{
-			CNetEvent_Explosion *pEvent = (CNetEvent_Explosion *)pData;
+			const CNetEvent_Explosion *pEvent = (const CNetEvent_Explosion *)Item.m_pData;
 			m_Effects.Explosion(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
 		}
 		else if(Item.m_Type == NETEVENTTYPE_HAMMERHIT)
 		{
-			CNetEvent_HammerHit *pEvent = (CNetEvent_HammerHit *)pData;
+			const CNetEvent_HammerHit *pEvent = (const CNetEvent_HammerHit *)Item.m_pData;
 			m_Effects.HammerHit(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
 		}
+		else if(Item.m_Type == NETEVENTTYPE_BIRTHDAY)
+		{
+			const CNetEvent_Birthday *pEvent = (const CNetEvent_Birthday *)Item.m_pData;
+			m_Effects.Confetti(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_FINISH)
+		{
+			const CNetEvent_Finish *pEvent = (const CNetEvent_Finish *)Item.m_pData;
+			m_Effects.Confetti(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
+		}
 		else if(Item.m_Type == NETEVENTTYPE_SPAWN)
 		{
-			CNetEvent_Spawn *pEvent = (CNetEvent_Spawn *)pData;
+			const CNetEvent_Spawn *pEvent = (const CNetEvent_Spawn *)Item.m_pData;
 			m_Effects.PlayerSpawn(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
 		}
 		else if(Item.m_Type == NETEVENTTYPE_DEATH)
 		{
-			CNetEvent_Death *pEvent = (CNetEvent_Death *)pData;
-			m_Effects.PlayerDeath(vec2(pEvent->m_X, pEvent->m_Y), pEvent->m_ClientID, Alpha);
+			const CNetEvent_Death *pEvent = (const CNetEvent_Death *)Item.m_pData;
+			m_Effects.PlayerDeath(vec2(pEvent->m_X, pEvent->m_Y), pEvent->m_ClientId, Alpha);
 		}
 		else if(Item.m_Type == NETEVENTTYPE_SOUNDWORLD)
 		{
-			CNetEvent_SoundWorld *pEvent = (CNetEvent_SoundWorld *)pData;
+			const CNetEvent_SoundWorld *pEvent = (const CNetEvent_SoundWorld *)Item.m_pData;
 			if(!Config()->m_SndGame)
 				continue;
 
-			if(m_GameInfo.m_RaceSounds && ((pEvent->m_SoundID == SOUND_GUN_FIRE && !g_Config.m_SndGun) || (pEvent->m_SoundID == SOUND_PLAYER_PAIN_LONG && !g_Config.m_SndLongPain)))
+			if(m_GameInfo.m_RaceSounds && ((pEvent->m_SoundId == SOUND_GUN_FIRE && !g_Config.m_SndGun) || (pEvent->m_SoundId == SOUND_PLAYER_PAIN_LONG && !g_Config.m_SndLongPain)))
+				continue;
+
+			m_Sounds.PlayAt(CSounds::CHN_WORLD, pEvent->m_SoundId, 1.0f, vec2(pEvent->m_X, pEvent->m_Y));
+		}
+		else if(Item.m_Type == NETEVENTTYPE_MAPSOUNDWORLD)
+		{
+			CNetEvent_MapSoundWorld *pEvent = (CNetEvent_MapSoundWorld *)Item.m_pData;
+			if(!Config()->m_SndGame)
 				continue;
 
-			m_Sounds.PlayAt(CSounds::CHN_WORLD, pEvent->m_SoundID, 1.0f, vec2(pEvent->m_X, pEvent->m_Y));
+			m_MapSounds.PlayAt(CSounds::CHN_WORLD, pEvent->m_SoundId, vec2(pEvent->m_X, pEvent->m_Y));
 		}
 	}
 }
 
-static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize, CServerInfo *pFallbackServerInfo)
+static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize, const CServerInfo *pFallbackServerInfo)
 {
 	int Version = -1;
 	if(InfoExSize >= 12)
@@ -1277,6 +1383,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 	Info.m_EntitiesVanilla = Vanilla;
 	Info.m_EntitiesBW = BlockWorlds;
 	Info.m_Race = Race;
+	Info.m_Pvp = !Race;
 	Info.m_DontMaskEntities = !DDNet;
 	Info.m_AllowXSkins = false;
 	Info.m_EntitiesFDDrace = FDDrace;
@@ -1352,7 +1459,7 @@ void CGameClient::InvalidateSnapshot()
 {
 	// clear all pointers
 	mem_zero(&m_Snap, sizeof(m_Snap));
-	m_Snap.m_LocalClientID = -1;
+	m_Snap.m_LocalClientId = -1;
 	SnapCollectEntities();
 }
 
@@ -1394,14 +1501,14 @@ void CGameClient::OnNewSnapshot()
 				aMessage[i] = (char)('a' + (rand() % ('z' - 'a')));
 			aMessage[MsgLen] = 0;
 
-			CNetMsg_Cl_Say Msg;
-			Msg.m_Team = rand() & 1;
-			Msg.m_pMessage = aMessage;
-			Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+			m_Chat.SendChat(rand() & 1, aMessage);
 		}
 	}
 #endif
 
+	CServerInfo ServerInfo;
+	Client()->GetServerInfo(&ServerInfo);
+
 	bool FoundGameInfoEx = false;
 	bool GotSwitchStateTeam = false;
 	m_aSwitchStateTeam[g_Config.m_ClDummy] = -1;
@@ -1418,21 +1525,23 @@ void CGameClient::OnNewSnapshot()
 		int Num = Client()->SnapNumItems(IClient::SNAP_CURRENT);
 		for(int i = 0; i < Num; i++)
 		{
-			IClient::CSnapItem Item;
-			const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+			const IClient::CSnapItem Item = Client()->SnapGetItem(IClient::SNAP_CURRENT, i);
 
 			if(Item.m_Type == NETOBJTYPE_CLIENTINFO)
 			{
-				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)pData;
-				int ClientID = Item.m_ID;
-				if(ClientID < MAX_CLIENTS)
+				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)Item.m_pData;
+				int ClientId = Item.m_Id;
+				if(ClientId < MAX_CLIENTS)
 				{
-					CClientData *pClient = &m_aClients[ClientID];
+					CClientData *pClient = &m_aClients[ClientId];
 
-					IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName);
-					IntsToStr(&pInfo->m_Clan0, 3, pClient->m_aClan);
+					if(!IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName, std::size(pClient->m_aName)))
+					{
+						str_copy(pClient->m_aName, "nameless tee");
+					}
+					IntsToStr(&pInfo->m_Clan0, 3, pClient->m_aClan, std::size(pClient->m_aClan));
 					pClient->m_Country = pInfo->m_Country;
-					IntsToStr(&pInfo->m_Skin0, 6, pClient->m_aSkinName);
+					IntsToStr(&pInfo->m_Skin0, 6, pClient->m_aSkinName, std::size(pClient->m_aSkinName));
 
 					pClient->m_UseCustomColor = pInfo->m_UseCustomColor;
 					pClient->m_ColorBody = pInfo->m_ColorBody;
@@ -1442,16 +1551,12 @@ void CGameClient::OnNewSnapshot()
 					if(!m_GameInfo.m_AllowXSkins && (pClient->m_aSkinName[0] == 'x' && pClient->m_aSkinName[1] == '_'))
 						str_copy(pClient->m_aSkinName, "default");
 
-					pClient->m_SkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorBody).UnclampLighting());
-					pClient->m_SkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorFeet).UnclampLighting());
+					pClient->m_SkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT));
+					pClient->m_SkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorFeet).UnclampLighting(ColorHSLA::DARKEST_LGT));
 					pClient->m_SkinInfo.m_Size = 64;
 
 					// find new skin
-					const CSkin *pSkin = m_Skins.Find(pClient->m_aSkinName);
-					pClient->m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-					pClient->m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-					pClient->m_SkinInfo.m_SkinMetrics = pSkin->m_Metrics;
-					pClient->m_SkinInfo.m_BloodColor = pSkin->m_BloodColor;
+					pClient->m_SkinInfo.Apply(m_Skins.Find(pClient->m_aSkinName));
 					pClient->m_SkinInfo.m_CustomColoredSkin = pClient->m_UseCustomColor;
 
 					if(!pClient->m_UseCustomColor)
@@ -1465,18 +1570,18 @@ void CGameClient::OnNewSnapshot()
 			}
 			else if(Item.m_Type == NETOBJTYPE_PLAYERINFO)
 			{
-				const CNetObj_PlayerInfo *pInfo = (const CNetObj_PlayerInfo *)pData;
+				const CNetObj_PlayerInfo *pInfo = (const CNetObj_PlayerInfo *)Item.m_pData;
 
-				if(pInfo->m_ClientID < MAX_CLIENTS && pInfo->m_ClientID == Item.m_ID)
+				if(pInfo->m_ClientId < MAX_CLIENTS && pInfo->m_ClientId == Item.m_Id)
 				{
-					m_aClients[pInfo->m_ClientID].m_Team = pInfo->m_Team;
-					m_aClients[pInfo->m_ClientID].m_Active = true;
-					m_Snap.m_apPlayerInfos[pInfo->m_ClientID] = pInfo;
+					m_aClients[pInfo->m_ClientId].m_Team = pInfo->m_Team;
+					m_aClients[pInfo->m_ClientId].m_Active = true;
+					m_Snap.m_apPlayerInfos[pInfo->m_ClientId] = pInfo;
 					m_Snap.m_NumPlayers++;
 
 					if(pInfo->m_Local)
 					{
-						m_Snap.m_LocalClientID = pInfo->m_ClientID;
+						m_Snap.m_LocalClientId = pInfo->m_ClientId;
 						m_Snap.m_pLocalInfo = pInfo;
 
 						if(pInfo->m_Team == TEAM_SPECTATORS)
@@ -1485,29 +1590,31 @@ void CGameClient::OnNewSnapshot()
 						}
 					}
 
+					m_Snap.m_HighestClientId = maximum(m_Snap.m_HighestClientId, pInfo->m_ClientId);
+
 					// calculate team-balance
 					if(pInfo->m_Team != TEAM_SPECTATORS)
 					{
 						m_Snap.m_aTeamSize[pInfo->m_Team]++;
-						if(!m_aStats[pInfo->m_ClientID].IsActive())
-							m_aStats[pInfo->m_ClientID].JoinGame(Client()->GameTick(g_Config.m_ClDummy));
+						if(!m_aStats[pInfo->m_ClientId].IsActive())
+							m_aStats[pInfo->m_ClientId].JoinGame(Client()->GameTick(g_Config.m_ClDummy));
 					}
-					else if(m_aStats[pInfo->m_ClientID].IsActive())
-						m_aStats[pInfo->m_ClientID].JoinSpec(Client()->GameTick(g_Config.m_ClDummy));
+					else if(m_aStats[pInfo->m_ClientId].IsActive())
+						m_aStats[pInfo->m_ClientId].JoinSpec(Client()->GameTick(g_Config.m_ClDummy));
 				}
 			}
 			else if(Item.m_Type == NETOBJTYPE_DDNETPLAYER)
 			{
 				m_ReceivedDDNetPlayer = true;
-				const CNetObj_DDNetPlayer *pInfo = (const CNetObj_DDNetPlayer *)pData;
-				if(Item.m_ID < MAX_CLIENTS)
+				const CNetObj_DDNetPlayer *pInfo = (const CNetObj_DDNetPlayer *)Item.m_pData;
+				if(Item.m_Id < MAX_CLIENTS)
 				{
-					m_aClients[Item.m_ID].m_AuthLevel = pInfo->m_AuthLevel;
-					m_aClients[Item.m_ID].m_Afk = pInfo->m_Flags & EXPLAYERFLAG_AFK;
-					m_aClients[Item.m_ID].m_Paused = pInfo->m_Flags & EXPLAYERFLAG_PAUSED;
-					m_aClients[Item.m_ID].m_Spec = pInfo->m_Flags & EXPLAYERFLAG_SPEC;
+					m_aClients[Item.m_Id].m_AuthLevel = pInfo->m_AuthLevel;
+					m_aClients[Item.m_Id].m_Afk = pInfo->m_Flags & EXPLAYERFLAG_AFK;
+					m_aClients[Item.m_Id].m_Paused = pInfo->m_Flags & EXPLAYERFLAG_PAUSED;
+					m_aClients[Item.m_Id].m_Spec = pInfo->m_Flags & EXPLAYERFLAG_SPEC;
 
-					if(Item.m_ID == m_Snap.m_LocalClientID && (m_aClients[Item.m_ID].m_Paused || m_aClients[Item.m_ID].m_Spec))
+					if(Item.m_Id == m_Snap.m_LocalClientId && (m_aClients[Item.m_Id].m_Paused || m_aClients[Item.m_Id].m_Spec))
 					{
 						m_Snap.m_SpecInfo.m_Active = true;
 					}
@@ -1515,57 +1622,57 @@ void CGameClient::OnNewSnapshot()
 			}
 			else if(Item.m_Type == NETOBJTYPE_CHARACTER)
 			{
-				if(Item.m_ID < MAX_CLIENTS)
+				if(Item.m_Id < MAX_CLIENTS)
 				{
-					const void *pOld = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, Item.m_ID);
-					m_Snap.m_aCharacters[Item.m_ID].m_Cur = *((const CNetObj_Character *)pData);
+					const void *pOld = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, Item.m_Id);
+					m_Snap.m_aCharacters[Item.m_Id].m_Cur = *((const CNetObj_Character *)Item.m_pData);
 					if(pOld)
 					{
-						m_Snap.m_aCharacters[Item.m_ID].m_Active = true;
-						m_Snap.m_aCharacters[Item.m_ID].m_Prev = *((const CNetObj_Character *)pOld);
+						m_Snap.m_aCharacters[Item.m_Id].m_Active = true;
+						m_Snap.m_aCharacters[Item.m_Id].m_Prev = *((const CNetObj_Character *)pOld);
 
 						// limit evolving to 3 seconds
-						bool EvolvePrev = Client()->PrevGameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_ID].m_Prev.m_Tick <= 3 * Client()->GameTickSpeed();
-						bool EvolveCur = Client()->GameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_ID].m_Cur.m_Tick <= 3 * Client()->GameTickSpeed();
+						bool EvolvePrev = Client()->PrevGameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_Id].m_Prev.m_Tick <= 3 * Client()->GameTickSpeed();
+						bool EvolveCur = Client()->GameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_Id].m_Cur.m_Tick <= 3 * Client()->GameTickSpeed();
 
 						// reuse the result from the previous evolve if the snapped character didn't change since the previous snapshot
-						if(EvolveCur && m_aClients[Item.m_ID].m_Evolved.m_Tick == Client()->PrevGameTick(g_Config.m_ClDummy))
+						if(EvolveCur && m_aClients[Item.m_Id].m_Evolved.m_Tick == Client()->PrevGameTick(g_Config.m_ClDummy))
 						{
-							if(mem_comp(&m_Snap.m_aCharacters[Item.m_ID].m_Prev, &m_aClients[Item.m_ID].m_Snapped, sizeof(CNetObj_Character)) == 0)
-								m_Snap.m_aCharacters[Item.m_ID].m_Prev = m_aClients[Item.m_ID].m_Evolved;
-							if(mem_comp(&m_Snap.m_aCharacters[Item.m_ID].m_Cur, &m_aClients[Item.m_ID].m_Snapped, sizeof(CNetObj_Character)) == 0)
-								m_Snap.m_aCharacters[Item.m_ID].m_Cur = m_aClients[Item.m_ID].m_Evolved;
+							if(mem_comp(&m_Snap.m_aCharacters[Item.m_Id].m_Prev, &m_aClients[Item.m_Id].m_Snapped, sizeof(CNetObj_Character)) == 0)
+								m_Snap.m_aCharacters[Item.m_Id].m_Prev = m_aClients[Item.m_Id].m_Evolved;
+							if(mem_comp(&m_Snap.m_aCharacters[Item.m_Id].m_Cur, &m_aClients[Item.m_Id].m_Snapped, sizeof(CNetObj_Character)) == 0)
+								m_Snap.m_aCharacters[Item.m_Id].m_Cur = m_aClients[Item.m_Id].m_Evolved;
 						}
 
-						if(EvolvePrev && m_Snap.m_aCharacters[Item.m_ID].m_Prev.m_Tick)
-							Evolve(&m_Snap.m_aCharacters[Item.m_ID].m_Prev, Client()->PrevGameTick(g_Config.m_ClDummy));
-						if(EvolveCur && m_Snap.m_aCharacters[Item.m_ID].m_Cur.m_Tick)
-							Evolve(&m_Snap.m_aCharacters[Item.m_ID].m_Cur, Client()->GameTick(g_Config.m_ClDummy));
+						if(EvolvePrev && m_Snap.m_aCharacters[Item.m_Id].m_Prev.m_Tick)
+							Evolve(&m_Snap.m_aCharacters[Item.m_Id].m_Prev, Client()->PrevGameTick(g_Config.m_ClDummy));
+						if(EvolveCur && m_Snap.m_aCharacters[Item.m_Id].m_Cur.m_Tick)
+							Evolve(&m_Snap.m_aCharacters[Item.m_Id].m_Cur, Client()->GameTick(g_Config.m_ClDummy));
 
-						m_aClients[Item.m_ID].m_Snapped = *((const CNetObj_Character *)pData);
-						m_aClients[Item.m_ID].m_Evolved = m_Snap.m_aCharacters[Item.m_ID].m_Cur;
+						m_aClients[Item.m_Id].m_Snapped = *((const CNetObj_Character *)Item.m_pData);
+						m_aClients[Item.m_Id].m_Evolved = m_Snap.m_aCharacters[Item.m_Id].m_Cur;
 					}
 					else
 					{
-						m_aClients[Item.m_ID].m_Evolved.m_Tick = -1;
+						m_aClients[Item.m_Id].m_Evolved.m_Tick = -1;
 					}
 				}
 			}
 			else if(Item.m_Type == NETOBJTYPE_DDNETCHARACTER)
 			{
-				const CNetObj_DDNetCharacter *pCharacterData = (const CNetObj_DDNetCharacter *)pData;
+				const CNetObj_DDNetCharacter *pCharacterData = (const CNetObj_DDNetCharacter *)Item.m_pData;
 
-				if(Item.m_ID < MAX_CLIENTS)
+				if(Item.m_Id < MAX_CLIENTS)
 				{
-					m_Snap.m_aCharacters[Item.m_ID].m_ExtendedData = *pCharacterData;
-					m_Snap.m_aCharacters[Item.m_ID].m_PrevExtendedData = (const CNetObj_DDNetCharacter *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_DDNETCHARACTER, Item.m_ID);
-					m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedData = true;
-					m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedDisplayInfo = false;
+					m_Snap.m_aCharacters[Item.m_Id].m_ExtendedData = *pCharacterData;
+					m_Snap.m_aCharacters[Item.m_Id].m_PrevExtendedData = (const CNetObj_DDNetCharacter *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_DDNETCHARACTER, Item.m_Id);
+					m_Snap.m_aCharacters[Item.m_Id].m_HasExtendedData = true;
+					m_Snap.m_aCharacters[Item.m_Id].m_HasExtendedDisplayInfo = false;
 					if(pCharacterData->m_JumpedTotal != -1)
 					{
-						m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedDisplayInfo = true;
+						m_Snap.m_aCharacters[Item.m_Id].m_HasExtendedDisplayInfo = true;
 					}
-					CClientData *pClient = &m_aClients[Item.m_ID];
+					CClientData *pClient = &m_aClients[Item.m_Id];
 					// Collision
 					pClient->m_Solo = pCharacterData->m_Flags & CHARACTERFLAG_SOLO;
 					pClient->m_Jetpack = pCharacterData->m_Flags & CHARACTERFLAG_JETPACK;
@@ -1593,16 +1700,16 @@ void CGameClient::OnNewSnapshot()
 
 					pClient->m_Predicted.ReadDDNet(pCharacterData);
 
-					m_Teams.SetSolo(Item.m_ID, pClient->m_Solo);
+					m_Teams.SetSolo(Item.m_Id, pClient->m_Solo);
 				}
 			}
 			else if(Item.m_Type == NETOBJTYPE_SPECCHAR)
 			{
-				const CNetObj_SpecChar *pSpecCharData = (const CNetObj_SpecChar *)pData;
+				const CNetObj_SpecChar *pSpecCharData = (const CNetObj_SpecChar *)Item.m_pData;
 
-				if(Item.m_ID < MAX_CLIENTS)
+				if(Item.m_Id < MAX_CLIENTS)
 				{
-					CClientData *pClient = &m_aClients[Item.m_ID];
+					CClientData *pClient = &m_aClients[Item.m_Id];
 					pClient->m_SpecCharPresent = true;
 					pClient->m_SpecChar.x = pSpecCharData->m_X;
 					pClient->m_SpecChar.y = pSpecCharData->m_Y;
@@ -1610,14 +1717,18 @@ void CGameClient::OnNewSnapshot()
 			}
 			else if(Item.m_Type == NETOBJTYPE_SPECTATORINFO)
 			{
-				m_Snap.m_pSpectatorInfo = (const CNetObj_SpectatorInfo *)pData;
-				m_Snap.m_pPrevSpectatorInfo = (const CNetObj_SpectatorInfo *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_SPECTATORINFO, Item.m_ID);
-
-				m_Snap.m_SpecInfo.m_SpectatorID = m_Snap.m_pSpectatorInfo->m_SpectatorID;
+				m_Snap.m_pSpectatorInfo = (const CNetObj_SpectatorInfo *)Item.m_pData;
+				m_Snap.m_pPrevSpectatorInfo = (const CNetObj_SpectatorInfo *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_SPECTATORINFO, Item.m_Id);
+
+				// needed for 0.7 survival
+				// to auto spec players when dead
+				if(Client()->IsSixup())
+					m_Snap.m_SpecInfo.m_Active = true;
+				m_Snap.m_SpecInfo.m_SpectatorId = m_Snap.m_pSpectatorInfo->m_SpectatorId;
 			}
 			else if(Item.m_Type == NETOBJTYPE_GAMEINFO)
 			{
-				m_Snap.m_pGameInfoObj = (const CNetObj_GameInfo *)pData;
+				m_Snap.m_pGameInfoObj = (const CNetObj_GameInfo *)Item.m_pData;
 				bool CurrentTickGameOver = (bool)(m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER);
 				if(!m_GameOver && CurrentTickGameOver)
 					OnGameOver();
@@ -1638,14 +1749,12 @@ void CGameClient::OnNewSnapshot()
 					continue;
 				}
 				FoundGameInfoEx = true;
-				CServerInfo ServerInfo;
-				Client()->GetServerInfo(&ServerInfo);
-				m_GameInfo = GetGameInfo((const CNetObj_GameInfoEx *)pData, Client()->SnapItemSize(IClient::SNAP_CURRENT, i), &ServerInfo);
+				m_GameInfo = GetGameInfo((const CNetObj_GameInfoEx *)Item.m_pData, Item.m_DataSize, &ServerInfo);
 			}
 			else if(Item.m_Type == NETOBJTYPE_GAMEDATA)
 			{
-				m_Snap.m_pGameDataObj = (const CNetObj_GameData *)pData;
-				m_Snap.m_GameDataSnapID = Item.m_ID;
+				m_Snap.m_pGameDataObj = (const CNetObj_GameData *)Item.m_pData;
+				m_Snap.m_GameDataSnapId = Item.m_Id;
 				if(m_Snap.m_pGameDataObj->m_FlagCarrierRed == FLAG_TAKEN)
 				{
 					if(m_aFlagDropTick[TEAM_RED] == 0)
@@ -1669,15 +1778,15 @@ void CGameClient::OnNewSnapshot()
 				m_LastFlagCarrierBlue = m_Snap.m_pGameDataObj->m_FlagCarrierBlue;
 			}
 			else if(Item.m_Type == NETOBJTYPE_FLAG)
-				m_Snap.m_apFlags[Item.m_ID % 2] = (const CNetObj_Flag *)pData;
+				m_Snap.m_apFlags[Item.m_Id % 2] = (const CNetObj_Flag *)Item.m_pData;
 			else if(Item.m_Type == NETOBJTYPE_SWITCHSTATE)
 			{
 				if(Item.m_DataSize < 36)
 				{
 					continue;
 				}
-				const CNetObj_SwitchState *pSwitchStateData = (const CNetObj_SwitchState *)pData;
-				int Team = clamp(Item.m_ID, (int)TEAM_FLOCK, (int)TEAM_SUPER - 1);
+				const CNetObj_SwitchState *pSwitchStateData = (const CNetObj_SwitchState *)Item.m_pData;
+				int Team = clamp(Item.m_Id, (int)TEAM_FLOCK, (int)TEAM_SUPER - 1);
 
 				int HighestSwitchNumber = clamp(pSwitchStateData->m_HighestSwitchNumber, 0, 255);
 				if(HighestSwitchNumber != maximum(0, (int)Switchers().size() - 1))
@@ -1725,17 +1834,15 @@ void CGameClient::OnNewSnapshot()
 
 	if(!FoundGameInfoEx)
 	{
-		CServerInfo ServerInfo;
-		Client()->GetServerInfo(&ServerInfo);
 		m_GameInfo = GetGameInfo(0, 0, &ServerInfo);
 	}
 
 	// setup local pointers
-	if(m_Snap.m_LocalClientID >= 0)
+	if(m_Snap.m_LocalClientId >= 0)
 	{
-		m_aLocalIDs[g_Config.m_ClDummy] = m_Snap.m_LocalClientID;
+		m_aLocalIds[g_Config.m_ClDummy] = m_Snap.m_LocalClientId;
 
-		CSnapState::CCharacterInfo *pChr = &m_Snap.m_aCharacters[m_Snap.m_LocalClientID];
+		CSnapState::CCharacterInfo *pChr = &m_Snap.m_aCharacters[m_Snap.m_LocalClientId];
 		if(pChr->m_Active)
 		{
 			if(!m_Snap.m_SpecInfo.m_Active)
@@ -1745,7 +1852,7 @@ void CGameClient::OnNewSnapshot()
 				m_LocalCharacterPos = vec2(m_Snap.m_pLocalCharacter->m_X, m_Snap.m_pLocalCharacter->m_Y);
 			}
 		}
-		else if(Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, m_Snap.m_LocalClientID))
+		else if(Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, m_Snap.m_LocalClientId))
 		{
 			// player died
 			m_Controls.OnPlayerDeath();
@@ -1753,15 +1860,19 @@ void CGameClient::OnNewSnapshot()
 	}
 	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
 	{
-		if(m_Snap.m_LocalClientID == -1 && m_DemoSpecID == SPEC_FOLLOW)
-			m_DemoSpecID = SPEC_FREEVIEW;
-		if(m_DemoSpecID != SPEC_FOLLOW)
+		if(m_Snap.m_LocalClientId == -1 && m_DemoSpecId == SPEC_FOLLOW)
+		{
+			// TODO: can this be done in the translation layer?
+			if(!Client()->IsSixup())
+				m_DemoSpecId = SPEC_FREEVIEW;
+		}
+		if(m_DemoSpecId != SPEC_FOLLOW)
 		{
 			m_Snap.m_SpecInfo.m_Active = true;
-			if(m_DemoSpecID > SPEC_FREEVIEW && m_Snap.m_aCharacters[m_DemoSpecID].m_Active)
-				m_Snap.m_SpecInfo.m_SpectatorID = m_DemoSpecID;
+			if(m_DemoSpecId > SPEC_FREEVIEW && m_Snap.m_aCharacters[m_DemoSpecId].m_Active)
+				m_Snap.m_SpecInfo.m_SpectatorId = m_DemoSpecId;
 			else
-				m_Snap.m_SpecInfo.m_SpectatorID = SPEC_FREEVIEW;
+				m_Snap.m_SpecInfo.m_SpectatorId = SPEC_FREEVIEW;
 		}
 	}
 
@@ -1778,10 +1889,10 @@ void CGameClient::OnNewSnapshot()
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
 		// update friend state
-		m_aClients[i].m_Friend = !(i == m_Snap.m_LocalClientID || !m_Snap.m_apPlayerInfos[i] || !Friends()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
+		m_aClients[i].m_Friend = !(i == m_Snap.m_LocalClientId || !m_Snap.m_apPlayerInfos[i] || !Friends()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
 
 		// update foe state
-		m_aClients[i].m_Foe = !(i == m_Snap.m_LocalClientID || !m_Snap.m_apPlayerInfos[i] || !Foes()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
+		m_aClients[i].m_Foe = !(i == m_Snap.m_LocalClientId || !m_Snap.m_apPlayerInfos[i] || !Foes()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
 	}
 
 	// sort player infos by name
@@ -1792,22 +1903,34 @@ void CGameClient::OnNewSnapshot()
 				return static_cast<bool>(p1);
 			if(!p1)
 				return false;
-			return str_comp_nocase(m_aClients[p1->m_ClientID].m_aName, m_aClients[p2->m_ClientID].m_aName) < 0;
+			return str_comp_nocase(m_aClients[p1->m_ClientId].m_aName, m_aClients[p2->m_ClientId].m_aName) < 0;
 		});
 
 	bool TimeScore = m_GameInfo.m_TimeScore;
+	bool Race7 = Client()->IsSixup() && m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameFlags & protocol7::GAMEFLAG_RACE;
 
 	// sort player infos by score
 	mem_copy(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByName, sizeof(m_Snap.m_apInfoByScore));
-	std::stable_sort(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByScore + MAX_CLIENTS,
-		[TimeScore](const CNetObj_PlayerInfo *p1, const CNetObj_PlayerInfo *p2) -> bool {
-			if(!p2)
-				return static_cast<bool>(p1);
-			if(!p1)
-				return false;
-			return (((TimeScore && p1->m_Score == -9999) ? std::numeric_limits<int>::min() : p1->m_Score) >
-				((TimeScore && p2->m_Score == -9999) ? std::numeric_limits<int>::min() : p2->m_Score));
-		});
+	if(Race7)
+		std::stable_sort(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByScore + MAX_CLIENTS,
+			[](const CNetObj_PlayerInfo *p1, const CNetObj_PlayerInfo *p2) -> bool {
+				if(!p2)
+					return static_cast<bool>(p1);
+				if(!p1)
+					return false;
+				return (((p1->m_Score == -1) ? std::numeric_limits<int>::max() : p1->m_Score) <
+					((p2->m_Score == -1) ? std::numeric_limits<int>::max() : p2->m_Score));
+			});
+	else
+		std::stable_sort(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByScore + MAX_CLIENTS,
+			[TimeScore](const CNetObj_PlayerInfo *p1, const CNetObj_PlayerInfo *p2) -> bool {
+				if(!p2)
+					return static_cast<bool>(p1);
+				if(!p1)
+					return false;
+				return (((TimeScore && p1->m_Score == -9999) ? std::numeric_limits<int>::min() : p1->m_Score) >
+					((TimeScore && p2->m_Score == -9999) ? std::numeric_limits<int>::min() : p2->m_Score));
+			});
 
 	// sort player infos by DDRace Team (and score between)
 	int Index = 0;
@@ -1815,7 +1938,7 @@ void CGameClient::OnNewSnapshot()
 	{
 		for(int i = 0; i < MAX_CLIENTS && Index < MAX_CLIENTS; ++i)
 		{
-			if(m_Snap.m_apInfoByScore[i] && m_Teams.Team(m_Snap.m_apInfoByScore[i]->m_ClientID) == Team)
+			if(m_Snap.m_apInfoByScore[i] && m_Teams.Team(m_Snap.m_apInfoByScore[i]->m_ClientId) == Team)
 				m_Snap.m_apInfoByDDTeamScore[Index++] = m_Snap.m_apInfoByScore[i];
 		}
 	}
@@ -1826,17 +1949,15 @@ void CGameClient::OnNewSnapshot()
 	{
 		for(int i = 0; i < MAX_CLIENTS && Index < MAX_CLIENTS; ++i)
 		{
-			if(m_Snap.m_apInfoByName[i] && m_Teams.Team(m_Snap.m_apInfoByName[i]->m_ClientID) == Team)
+			if(m_Snap.m_apInfoByName[i] && m_Teams.Team(m_Snap.m_apInfoByName[i]->m_ClientId) == Team)
 				m_Snap.m_apInfoByDDTeamName[Index++] = m_Snap.m_apInfoByName[i];
 		}
 	}
 
-	CServerInfo CurrentServerInfo;
-	Client()->GetServerInfo(&CurrentServerInfo);
 	CTuningParams StandardTuning;
-	if(CurrentServerInfo.m_aGameType[0] != '0')
+	if(ServerInfo.m_aGameType[0] != '0')
 	{
-		if(str_comp(CurrentServerInfo.m_aGameType, "DM") != 0 && str_comp(CurrentServerInfo.m_aGameType, "TDM") != 0 && str_comp(CurrentServerInfo.m_aGameType, "CTF") != 0)
+		if(str_comp(ServerInfo.m_aGameType, "DM") != 0 && str_comp(ServerInfo.m_aGameType, "TDM") != 0 && str_comp(ServerInfo.m_aGameType, "CTF") != 0)
 			m_ServerMode = SERVERMODE_MOD;
 		else if(mem_comp(&StandardTuning, &m_aTuning[g_Config.m_ClDummy], 33) == 0)
 			m_ServerMode = SERVERMODE_PURE;
@@ -1936,21 +2057,47 @@ void CGameClient::OnNewSnapshot()
 	// detect air jump for other players
 	for(int i = 0; i < MAX_CLIENTS; i++)
 		if(m_Snap.m_aCharacters[i].m_Active && (m_Snap.m_aCharacters[i].m_Cur.m_Jumped & 2) && !(m_Snap.m_aCharacters[i].m_Prev.m_Jumped & 2))
-			if(!Predict() || (i != m_Snap.m_LocalClientID && (!AntiPingPlayers() || i != m_PredictedDummyID)))
+			if(!Predict() || (i != m_Snap.m_LocalClientId && (!AntiPingPlayers() || i != m_PredictedDummyId)))
 			{
 				vec2 Pos = mix(vec2(m_Snap.m_aCharacters[i].m_Prev.m_X, m_Snap.m_aCharacters[i].m_Prev.m_Y),
 					vec2(m_Snap.m_aCharacters[i].m_Cur.m_X, m_Snap.m_aCharacters[i].m_Cur.m_Y),
 					Client()->IntraGameTick(g_Config.m_ClDummy));
 				float Alpha = 1.0f;
-				bool SameTeam = m_Teams.SameTeam(m_Snap.m_LocalClientID, i);
-				if(!SameTeam || m_aClients[i].m_Solo || m_aClients[m_Snap.m_LocalClientID].m_Solo)
+				bool SameTeam = m_Teams.SameTeam(m_Snap.m_LocalClientId, i);
+				if(!SameTeam || m_aClients[i].m_Solo || m_aClients[m_Snap.m_LocalClientId].m_Solo)
 					Alpha = g_Config.m_ClShowOthersAlpha / 100.0f;
 				m_Effects.AirJump(Pos, Alpha);
 			}
 
-	if(m_Snap.m_LocalClientID != m_PrevLocalID)
-		m_PredictedDummyID = m_PrevLocalID;
-	m_PrevLocalID = m_Snap.m_LocalClientID;
+	if(g_Config.m_ClFreezeStars && !m_SuppressEvents)
+	{
+		for(auto &Character : m_Snap.m_aCharacters)
+		{
+			if(Character.m_Active && Character.m_HasExtendedData && Character.m_PrevExtendedData)
+			{
+				int FreezeTimeNow = Character.m_ExtendedData.m_FreezeEnd - Client()->GameTick(g_Config.m_ClDummy);
+				int FreezeTimePrev = Character.m_PrevExtendedData->m_FreezeEnd - Client()->PrevGameTick(g_Config.m_ClDummy);
+				vec2 Pos = vec2(Character.m_Cur.m_X, Character.m_Cur.m_Y);
+				int StarsNow = (FreezeTimeNow + 1) / Client()->GameTickSpeed();
+				int StarsPrev = (FreezeTimePrev + 1) / Client()->GameTickSpeed();
+				if(StarsNow < StarsPrev || (StarsPrev == 0 && StarsNow > 0))
+				{
+					int Amount = StarsNow + 1;
+					float Mid = 3 * pi / 2;
+					float Min = Mid - pi / 3;
+					float Max = Mid + pi / 3;
+					for(int j = 0; j < Amount; j++)
+					{
+						float Angle = mix(Min, Max, (j + 1) / (float)(Amount + 2));
+						m_Effects.DamageIndicator(Pos, direction(Angle));
+					}
+				}
+			}
+		}
+	}
+	if(m_Snap.m_LocalClientId != m_PrevLocalId)
+		m_PredictedDummyId = m_PrevLocalId;
+	m_PrevLocalId = m_Snap.m_LocalClientId;
 	m_IsDummySwapping = 0;
 
 	SnapCollectEntities(); // creates a collection that associates EntityEx snap items with the entities they belong to
@@ -1984,7 +2131,7 @@ void CGameClient::OnPredict()
 	CCharacterCore BeforeChar = m_PredictedChar;
 
 	// we can't predict without our own id or own character
-	if(m_Snap.m_LocalClientID == -1 || !m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_Active)
+	if(m_Snap.m_LocalClientId == -1 || !m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_Active)
 		return;
 
 	// don't predict anything if we are paused
@@ -2013,7 +2160,7 @@ void CGameClient::OnPredict()
 
 	// don't predict inactive players, or entities from other teams
 	for(int i = 0; i < MAX_CLIENTS; i++)
-		if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+		if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))
 			if((!m_Snap.m_aCharacters[i].m_Active && pChar->m_SnapTicks > 10) || IsOtherTeam(i))
 				pChar->Destroy();
 
@@ -2027,12 +2174,12 @@ void CGameClient::OnPredict()
 		}
 	}
 
-	CCharacter *pLocalChar = m_PredictedWorld.GetCharacterByID(m_Snap.m_LocalClientID);
+	CCharacter *pLocalChar = m_PredictedWorld.GetCharacterById(m_Snap.m_LocalClientId);
 	if(!pLocalChar)
 		return;
 	CCharacter *pDummyChar = 0;
 	if(PredictDummy())
-		pDummyChar = m_PredictedWorld.GetCharacterByID(m_PredictedDummyID);
+		pDummyChar = m_PredictedWorld.GetCharacterById(m_PredictedDummyId);
 
 	// predict
 	for(int Tick = Client()->GameTick(g_Config.m_ClDummy) + 1; Tick <= Client()->PredGameTick(g_Config.m_ClDummy); Tick++)
@@ -2043,7 +2190,7 @@ void CGameClient::OnPredict()
 			m_PrevPredictedWorld.CopyWorld(&m_PredictedWorld);
 			m_PredictedPrevChar = pLocalChar->GetCore();
 			for(int i = 0; i < MAX_CLIENTS; i++)
-				if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+				if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))
 					m_aClients[i].m_PrevPredicted = pChar->GetCore();
 		}
 
@@ -2054,7 +2201,7 @@ void CGameClient::OnPredict()
 		// apply inputs and tick
 		CNetObj_PlayerInput *pInputData = (CNetObj_PlayerInput *)Client()->GetInput(Tick, m_IsDummySwapping);
 		CNetObj_PlayerInput *pDummyInputData = !pDummyChar ? 0 : (CNetObj_PlayerInput *)Client()->GetInput(Tick, m_IsDummySwapping ^ 1);
-		bool DummyFirst = pInputData && pDummyInputData && pDummyChar->GetCID() < pLocalChar->GetCID();
+		bool DummyFirst = pInputData && pDummyInputData && pDummyChar->GetCid() < pLocalChar->GetCid();
 
 		if(DummyFirst)
 			pDummyChar->OnDirectInput(pDummyInputData);
@@ -2074,12 +2221,12 @@ void CGameClient::OnPredict()
 		{
 			m_PredictedChar = pLocalChar->GetCore();
 			for(int i = 0; i < MAX_CLIENTS; i++)
-				if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+				if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))
 					m_aClients[i].m_Predicted = pChar->GetCore();
 		}
 
 		for(int i = 0; i < MAX_CLIENTS; i++)
-			if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+			if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))
 			{
 				m_aClients[i].m_aPredPos[Tick % 200] = pChar->Core()->m_Pos;
 				m_aClients[i].m_aPredTick[Tick % 200] = Tick;
@@ -2119,7 +2266,7 @@ void CGameClient::OnPredict()
 	}
 
 	// detect mispredictions of other players and make corrections smoother when possible
-	if(g_Config.m_ClAntiPingSmooth && Predict() && AntiPingPlayers() && m_NewTick && absolute(m_PredictedTick - Client()->PredGameTick(g_Config.m_ClDummy)) <= 1 && absolute(Client()->GameTick(g_Config.m_ClDummy) - Client()->PrevGameTick(g_Config.m_ClDummy)) <= 2)
+	if(g_Config.m_ClAntiPingSmooth && Predict() && AntiPingPlayers() && m_NewTick && m_PredictedTick >= MIN_TICK && absolute(m_PredictedTick - Client()->PredGameTick(g_Config.m_ClDummy)) <= 1 && absolute(Client()->GameTick(g_Config.m_ClDummy) - Client()->PrevGameTick(g_Config.m_ClDummy)) <= 2)
 	{
 		int PredTime = clamp(Client()->GetPredictionTime(), 0, 800);
 		float SmoothPace = 4 - 1.5f * PredTime / 800.f; // smoothing pace (a lower value will make the smoothing quicker)
@@ -2127,7 +2274,7 @@ void CGameClient::OnPredict()
 
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(!m_Snap.m_aCharacters[i].m_Active || i == m_Snap.m_LocalClientID || !m_aLastActive[i])
+			if(!m_Snap.m_aCharacters[i].m_Active || i == m_Snap.m_LocalClientId || !m_aLastActive[i])
 				continue;
 			vec2 NewPos = (m_PredictedTick == Client()->PredGameTick(g_Config.m_ClDummy)) ? m_aClients[i].m_Predicted.m_Pos : m_aClients[i].m_PrevPredicted.m_Pos;
 			vec2 PredErr = (m_aLastPos[i] - NewPos) / (float)minimum(Client()->GetPredictionTime(), 200);
@@ -2228,16 +2375,15 @@ void CGameClient::CClientStats::Reset()
 	m_JoinTick = 0;
 	m_IngameTicks = 0;
 	m_Active = false;
+
+	std::fill(std::begin(m_aFragsWith), std::end(m_aFragsWith), 0);
+	std::fill(std::begin(m_aDeathsFrom), std::end(m_aDeathsFrom), 0);
 	m_Frags = 0;
 	m_Deaths = 0;
 	m_Suicides = 0;
 	m_BestSpree = 0;
 	m_CurrentSpree = 0;
-	for(int j = 0; j < NUM_WEAPONS; j++)
-	{
-		m_aFragsWith[j] = 0;
-		m_aDeathsFrom[j] = 0;
-	}
+
 	m_FlagGrabs = 0;
 	m_FlagCaptures = 0;
 }
@@ -2255,41 +2401,50 @@ void CGameClient::CClientData::UpdateRenderInfo(bool IsTeamPlay)
 		{
 			m_RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(aTeamColors[m_Team]));
 			m_RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(aTeamColors[m_Team]));
+
+			// 0.7
+			for(auto &Sixup : m_RenderInfo.m_aSixup)
+			{
+				const ColorRGBA aTeamColorsSixup[2] = {
+					ColorRGBA(0.753f, 0.318f, 0.318f, 1.0f),
+					ColorRGBA(0.318f, 0.471f, 0.753f, 1.0f)};
+				const ColorRGBA aMarkingColorsSixup[2] = {
+					ColorRGBA(0.824f, 0.345f, 0.345f, 1.0f),
+					ColorRGBA(0.345f, 0.514f, 0.824f, 1.0f)};
+				float MarkingAlpha = Sixup.m_aColors[protocol7::SKINPART_MARKING].a;
+				for(auto &Color : Sixup.m_aColors)
+					Color = aTeamColorsSixup[m_Team];
+				if(MarkingAlpha > 0.1f)
+					Sixup.m_aColors[protocol7::SKINPART_MARKING] = aMarkingColorsSixup[m_Team];
+			}
 		}
 		else
 		{
 			m_RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(12829350));
 			m_RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(12829350));
+			for(auto &Sixup : m_RenderInfo.m_aSixup)
+				for(auto &Color : Sixup.m_aColors)
+					Color = color_cast<ColorRGBA>(ColorHSLA(12829350));
 		}
 	}
 }
 
 void CGameClient::CClientData::Reset()
 {
-	m_aName[0] = 0;
-	m_aClan[0] = 0;
+	m_UseCustomColor = 0;
+	m_ColorBody = 0;
+	m_ColorFeet = 0;
+
+	m_aName[0] = '\0';
+	m_aClan[0] = '\0';
 	m_Country = -1;
+	m_aSkinName[0] = '\0';
+	m_SkinColor = 0;
+
 	m_Team = 0;
-	m_Angle = 0;
 	m_Emoticon = 0;
-	m_EmoticonStartTick = -1;
 	m_EmoticonStartFraction = 0;
-	m_Active = false;
-	m_ChatIgnore = false;
-	m_EmoticonIgnore = false;
-	m_Friend = false;
-	m_Foe = false;
-	m_AuthLevel = AUTHED_NO;
-	m_Afk = false;
-	m_Paused = false;
-	m_Spec = false;
-	m_SkinInfo.m_BloodColor = ColorRGBA(1, 1, 1);
-	m_SkinInfo.m_ColorableRenderSkin.Reset();
-	m_SkinInfo.m_OriginalRenderSkin.Reset();
-	m_SkinInfo.m_CustomColoredSkin = false;
-	m_SkinInfo.m_ColorBody = ColorRGBA(1, 1, 1);
-	m_SkinInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
-	m_SkinInfo.m_SkinMetrics.Reset();
+	m_EmoticonStartTick = -1;
 
 	m_Solo = false;
 	m_Jetpack = false;
@@ -2309,28 +2464,146 @@ void CGameClient::CClientData::Reset()
 	m_DeepFrozen = false;
 	m_LiveFrozen = false;
 
+	m_Predicted.Reset();
+	m_PrevPredicted.Reset();
+
+	m_SkinInfo.Reset();
+	m_RenderInfo.Reset();
+
+	m_Angle = 0.0f;
+	m_Active = false;
+	m_ChatIgnore = false;
+	m_EmoticonIgnore = false;
+	m_Friend = false;
+	m_Foe = false;
+
+	m_AuthLevel = AUTHED_NO;
+	m_Afk = false;
+	m_Paused = false;
+	m_Spec = false;
+
+	std::fill(std::begin(m_aSwitchStates), std::end(m_aSwitchStates), 0);
+
+	m_Snapped.m_Tick = -1;
 	m_Evolved.m_Tick = -1;
 
-	m_SpecChar = vec2(0, 0);
+	m_RenderCur.m_Tick = -1;
+	m_RenderPrev.m_Tick = -1;
+	m_RenderPos = vec2(0.0f, 0.0f);
+	m_IsPredicted = false;
+	m_IsPredictedLocal = false;
+	std::fill(std::begin(m_aSmoothStart), std::end(m_aSmoothStart), 0);
+	std::fill(std::begin(m_aSmoothLen), std::end(m_aSmoothLen), 0);
+	std::fill(std::begin(m_aPredPos), std::end(m_aPredPos), vec2(0.0f, 0.0f));
+	std::fill(std::begin(m_aPredTick), std::end(m_aPredTick), 0);
 	m_SpecCharPresent = false;
+	m_SpecChar = vec2(0.0f, 0.0f);
 
-	mem_zero(m_aSwitchStates, sizeof(m_aSwitchStates));
+	for(auto &Info : m_aSixup)
+		Info.Reset();
+}
 
-	UpdateRenderInfo(false);
+void CGameClient::CClientData::CSixup::Reset()
+{
+	for(int i = 0; i < protocol7::NUM_SKINPARTS; ++i)
+	{
+		m_aaSkinPartNames[i][0] = '\0';
+		m_aUseCustomColors[i] = 0;
+		m_aSkinPartColors[i] = 0;
+	}
 }
 
-void CGameClient::SendSwitchTeam(int Team)
+void CGameClient::SendSwitchTeam(int Team) const
 {
 	CNetMsg_Cl_SetTeam Msg;
 	Msg.m_Team = Team;
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+void CGameClient::SendStartInfo7(bool Dummy) const
+{
+	protocol7::CNetMsg_Cl_StartInfo Msg;
+	Msg.m_pName = Dummy ? Client()->DummyName() : Client()->PlayerName();
+	Msg.m_pClan = Dummy ? Config()->m_ClDummyClan : Config()->m_PlayerClan;
+	Msg.m_Country = Dummy ? Config()->m_ClDummyCountry : Config()->m_PlayerCountry;
+	for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
+	{
+		Msg.m_apSkinPartNames[p] = CSkins7::ms_apSkinVariables[(int)Dummy][p];
+		Msg.m_aUseCustomColors[p] = *CSkins7::ms_apUCCVariables[(int)Dummy][p];
+		Msg.m_aSkinPartColors[p] = *CSkins7::ms_apColorVariables[(int)Dummy][p];
+	}
+	CMsgPacker Packer(&Msg, false, true);
+	if(Msg.Pack(&Packer))
+		return;
+	Client()->SendMsg((int)Dummy, &Packer, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+}
+
+void CGameClient::SendSkinChange7(bool Dummy)
+{
+	protocol7::CNetMsg_Cl_SkinChange Msg;
+	for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
+	{
+		Msg.m_apSkinPartNames[p] = CSkins7::ms_apSkinVariables[(int)Dummy][p];
+		Msg.m_aUseCustomColors[p] = *CSkins7::ms_apUCCVariables[(int)Dummy][p];
+		Msg.m_aSkinPartColors[p] = *CSkins7::ms_apColorVariables[(int)Dummy][p];
+	}
+	CMsgPacker Packer(&Msg, false, true);
+	if(Msg.Pack(&Packer))
+		return;
+	Client()->SendMsg((int)Dummy, &Packer, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+	m_aCheckInfo[(int)Dummy] = Client()->GameTickSpeed();
+}
+
+bool CGameClient::GotWantedSkin7(bool Dummy)
+{
+	// validate the wanted skinparts before comparison
+	// because the skin parts we compare against are also validated
+	// otherwise it tries to resend the skin info when the eyes are set to "negative"
+	// in team based modes
+	char aSkinParts[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_ARRAY_SIZE];
+	char *apSkinPartsPtr[protocol7::NUM_SKINPARTS];
+	int aUCCVars[protocol7::NUM_SKINPARTS];
+	int aColorVars[protocol7::NUM_SKINPARTS];
+	for(int SkinPart = 0; SkinPart < protocol7::NUM_SKINPARTS; SkinPart++)
+	{
+		str_copy(aSkinParts[SkinPart], CSkins7::ms_apSkinVariables[(int)Dummy][SkinPart], protocol7::MAX_SKIN_ARRAY_SIZE);
+		apSkinPartsPtr[SkinPart] = aSkinParts[SkinPart];
+		aUCCVars[SkinPart] = *CSkins7::ms_apUCCVariables[(int)Dummy][SkinPart];
+		aColorVars[SkinPart] = *CSkins7::ms_apColorVariables[(int)Dummy][SkinPart];
+	}
+	m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, m_pClient->m_TranslationContext.m_GameFlags);
+
+	for(int SkinPart = 0; SkinPart < protocol7::NUM_SKINPARTS; SkinPart++)
+	{
+		if(str_comp(m_aClients[m_aLocalIds[(int)Dummy]].m_aSixup[g_Config.m_ClDummy].m_aaSkinPartNames[SkinPart], apSkinPartsPtr[SkinPart]))
+			return false;
+		if(m_aClients[m_aLocalIds[(int)Dummy]].m_aSixup[g_Config.m_ClDummy].m_aUseCustomColors[SkinPart] != aUCCVars[SkinPart])
+			return false;
+		if(m_aClients[m_aLocalIds[(int)Dummy]].m_aSixup[g_Config.m_ClDummy].m_aSkinPartColors[SkinPart] != aColorVars[SkinPart])
+			return false;
+	}
 
-	if(Team != TEAM_SPECTATORS)
-		m_Camera.OnReset();
+	// TODO: add name change ddnet extension to 0.7 protocol
+	// if(str_comp(m_aClients[m_aLocalIds[(int)Dummy]].m_aName, Dummy ? Client()->DummyName() : Client()->PlayerName()))
+	// 	return false;
+	// if(str_comp(m_aClients[m_aLocalIds[(int)Dummy]].m_aClan, Dummy ? g_Config.m_ClDummyClan : g_Config.m_PlayerClan))
+	// 	return false;
+	// if(m_aClients[m_aLocalIds[(int)Dummy]].m_Country != (Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry))
+	// 	return false;
+
+	return true;
 }
 
 void CGameClient::SendInfo(bool Start)
 {
+	if(m_pClient->IsSixup())
+	{
+		if(Start)
+			SendStartInfo7(false);
+		else
+			SendSkinChange7(false);
+		return;
+	}
 	if(Start)
 	{
 		CNetMsg_Cl_StartInfo Msg;
@@ -2365,6 +2638,14 @@ void CGameClient::SendInfo(bool Start)
 
 void CGameClient::SendDummyInfo(bool Start)
 {
+	if(m_pClient->IsSixup())
+	{
+		if(Start)
+			SendStartInfo7(true);
+		else
+			SendSkinChange7(true);
+		return;
+	}
 	if(Start)
 	{
 		CNetMsg_Cl_StartInfo Msg;
@@ -2397,7 +2678,7 @@ void CGameClient::SendDummyInfo(bool Start)
 	}
 }
 
-void CGameClient::SendKill(int ClientID) const
+void CGameClient::SendKill(int ClientId) const
 {
 	CNetMsg_Cl_Kill Msg;
 	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
@@ -2409,6 +2690,17 @@ void CGameClient::SendKill(int ClientID) const
 	}
 }
 
+void CGameClient::SendReadyChange7()
+{
+	if(!Client()->IsSixup())
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", "Error you have to be connected to a 0.7 server to use ready_change");
+		return;
+	}
+	protocol7::CNetMsg_Cl_ReadyChange Msg;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL, true);
+}
+
 void CGameClient::ConTeam(IConsole::IResult *pResult, void *pUserData)
 {
 	((CGameClient *)pUserData)->SendSwitchTeam(pResult->GetInteger(0));
@@ -2419,11 +2711,22 @@ void CGameClient::ConKill(IConsole::IResult *pResult, void *pUserData)
 	((CGameClient *)pUserData)->SendKill(-1);
 }
 
+void CGameClient::ConReadyChange7(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameClient *pClient = static_cast<CGameClient *>(pUserData);
+	if(pClient->Client()->State() == IClient::STATE_ONLINE)
+		pClient->SendReadyChange7();
+}
+
 void CGameClient::ConchainLanguageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
+	CGameClient *pThis = static_cast<CGameClient *>(pUserData);
+	const bool Changed = pThis->Client()->GlobalTime() && pResult->NumArguments() && str_comp(pResult->GetString(0), g_Config.m_ClLanguagefile) != 0;
 	pfnCallback(pResult, pCallbackUserData);
-	if(pResult->NumArguments())
-		((CGameClient *)pUserData)->OnLanguageChange();
+	if(Changed)
+	{
+		pThis->OnLanguageChange();
+	}
 }
 
 void CGameClient::ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
@@ -2444,8 +2747,10 @@ void CGameClient::ConchainSpecialDummy(IConsole::IResult *pResult, void *pUserDa
 {
 	pfnCallback(pResult, pCallbackUserData);
 	if(pResult->NumArguments())
+	{
 		if(g_Config.m_ClDummy && !((CGameClient *)pUserData)->Client()->DummyConnected())
 			g_Config.m_ClDummy = 0;
+	}
 }
 
 void CGameClient::ConchainClTextEntitiesSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
@@ -2464,21 +2769,21 @@ IGameClient *CreateGameClient()
 	return new CGameClient();
 }
 
-int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int ownID)
+int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int OwnId)
 {
 	float Distance = 0.0f;
-	int ClosestID = -1;
+	int ClosestId = -1;
 
-	const CClientData &OwnClientData = m_aClients[ownID];
+	const CClientData &OwnClientData = m_aClients[OwnId];
 
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(i == ownID)
+		if(i == OwnId)
 			continue;
 
-		const CClientData &cData = m_aClients[i];
+		const CClientData &Data = m_aClients[i];
 
-		if(!cData.m_Active)
+		if(!Data.m_Active)
 			continue;
 
 		CNetObj_Character Prev = m_Snap.m_aCharacters[i].m_Prev;
@@ -2486,10 +2791,10 @@ int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, in
 
 		vec2 Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
 
-		bool IsOneSuper = cData.m_Super || OwnClientData.m_Super;
-		bool IsOneSolo = cData.m_Solo || OwnClientData.m_Solo;
+		bool IsOneSuper = Data.m_Super || OwnClientData.m_Super;
+		bool IsOneSolo = Data.m_Solo || OwnClientData.m_Solo;
 
-		if(!IsOneSuper && (!m_Teams.SameTeam(i, ownID) || IsOneSolo || OwnClientData.m_HookHitDisabled))
+		if(!IsOneSuper && (!m_Teams.SameTeam(i, OwnId) || IsOneSolo || OwnClientData.m_HookHitDisabled))
 			continue;
 
 		vec2 ClosestPoint;
@@ -2497,17 +2802,17 @@ int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, in
 		{
 			if(distance(Position, ClosestPoint) < CCharacterCore::PhysicalSize() + 2.0f)
 			{
-				if(ClosestID == -1 || distance(HookPos, Position) < Distance)
+				if(ClosestId == -1 || distance(HookPos, Position) < Distance)
 				{
 					NewPos2 = ClosestPoint;
-					ClosestID = i;
+					ClosestId = i;
 					Distance = distance(HookPos, Position);
 				}
 			}
 		}
 	}
 
-	return ClosestID;
+	return ClosestId;
 }
 
 ColorRGBA CalculateNameColor(ColorHSLA TextColorHSL)
@@ -2534,14 +2839,14 @@ void CGameClient::UpdatePrediction()
 
 	if(!m_Snap.m_pLocalCharacter)
 	{
-		if(CCharacter *pLocalChar = m_GameWorld.GetCharacterByID(m_Snap.m_LocalClientID))
+		if(CCharacter *pLocalChar = m_GameWorld.GetCharacterById(m_Snap.m_LocalClientId))
 			pLocalChar->Destroy();
 		return;
 	}
 
 	if(m_Snap.m_pLocalCharacter->m_AmmoCount > 0 && m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_NINJA)
 		m_GameWorld.m_WorldConfig.m_InfiniteAmmo = false;
-	m_GameWorld.m_WorldConfig.m_IsSolo = !m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData && !m_aTuning[g_Config.m_ClDummy].m_PlayerCollision && !m_aTuning[g_Config.m_ClDummy].m_PlayerHooking;
+	m_GameWorld.m_WorldConfig.m_IsSolo = !m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_HasExtendedData && !m_aTuning[g_Config.m_ClDummy].m_PlayerCollision && !m_aTuning[g_Config.m_ClDummy].m_PlayerHooking;
 
 	// update the tuning/tunezone at the local character position with the latest tunings received before the new snapshot
 	vec2 LocalCharPos = vec2(m_Snap.m_pLocalCharacter->m_X, m_Snap.m_pLocalCharacter->m_Y);
@@ -2596,40 +2901,40 @@ void CGameClient::UpdatePrediction()
 	}
 
 	// if ddnetcharacter is available, ignore server-wide tunings for hook and collision
-	if(m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData)
+	if(m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_HasExtendedData)
 	{
 		m_GameWorld.m_Core.m_aTuning[g_Config.m_ClDummy].m_PlayerCollision = 1;
 		m_GameWorld.m_Core.m_aTuning[g_Config.m_ClDummy].m_PlayerHooking = 1;
 	}
 
-	CCharacter *pLocalChar = m_GameWorld.GetCharacterByID(m_Snap.m_LocalClientID);
+	CCharacter *pLocalChar = m_GameWorld.GetCharacterById(m_Snap.m_LocalClientId);
 	CCharacter *pDummyChar = 0;
 	if(PredictDummy())
-		pDummyChar = m_GameWorld.GetCharacterByID(m_PredictedDummyID);
+		pDummyChar = m_GameWorld.GetCharacterById(m_PredictedDummyId);
 
 	// update strong and weak hook
 	if(pLocalChar && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && (m_aTuning[g_Config.m_ClDummy].m_PlayerCollision || m_aTuning[g_Config.m_ClDummy].m_PlayerHooking))
 	{
-		if(m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData)
+		if(m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_HasExtendedData)
 		{
-			int aIDs[MAX_CLIENTS];
-			for(int &ID : aIDs)
-				ID = -1;
+			int aIds[MAX_CLIENTS];
+			for(int &Id : aIds)
+				Id = -1;
 			for(int i = 0; i < MAX_CLIENTS; i++)
-				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
-					aIDs[pChar->GetStrongWeakID()] = i;
-			for(int ID : aIDs)
-				if(ID >= 0)
-					m_CharOrder.GiveStrong(ID);
+				if(CCharacter *pChar = m_GameWorld.GetCharacterById(i))
+					aIds[pChar->GetStrongWeakId()] = i;
+			for(int Id : aIds)
+				if(Id >= 0)
+					m_CharOrder.GiveStrong(Id);
 		}
 		else
 		{
 			// manual detection
 			DetectStrongHook();
 		}
-		for(int i : m_CharOrder.m_IDs)
+		for(int i : m_CharOrder.m_Ids)
 		{
-			if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+			if(CCharacter *pChar = m_GameWorld.GetCharacterById(i))
 			{
 				m_GameWorld.RemoveEntity(pChar);
 				m_GameWorld.InsertEntity(pChar);
@@ -2658,7 +2963,7 @@ void CGameClient::UpdatePrediction()
 			m_GameWorld.Tick();
 
 			for(int i = 0; i < MAX_CLIENTS; i++)
-				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+				if(CCharacter *pChar = m_GameWorld.GetCharacterById(i))
 				{
 					m_aClients[i].m_aPredPos[Tick % 200] = pChar->Core()->m_Pos;
 					m_aClients[i].m_aPredTick[Tick % 200] = Tick;
@@ -2678,19 +2983,19 @@ void CGameClient::UpdatePrediction()
 	}
 
 	for(int i = 0; i < MAX_CLIENTS; i++)
-		if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+		if(CCharacter *pChar = m_GameWorld.GetCharacterById(i))
 		{
 			m_aClients[i].m_aPredPos[Client()->GameTick(g_Config.m_ClDummy) % 200] = pChar->Core()->m_Pos;
 			m_aClients[i].m_aPredTick[Client()->GameTick(g_Config.m_ClDummy) % 200] = Client()->GameTick(g_Config.m_ClDummy);
 		}
 
 	// update the local gameworld with the new snapshot
-	m_GameWorld.NetObjBegin(m_Teams, m_Snap.m_LocalClientID);
+	m_GameWorld.NetObjBegin(m_Teams, m_Snap.m_LocalClientId);
 
 	for(int i = 0; i < MAX_CLIENTS; i++)
 		if(m_Snap.m_aCharacters[i].m_Active)
 		{
-			bool IsLocal = (i == m_Snap.m_LocalClientID || (PredictDummy() && i == m_PredictedDummyID));
+			bool IsLocal = (i == m_Snap.m_LocalClientId || (PredictDummy() && i == m_PredictedDummyId));
 			int GameTeam = (m_Snap.m_pGameInfoObj && (m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)) ? m_aClients[i].m_Team : i;
 			m_GameWorld.NetCharAdd(i, &m_Snap.m_aCharacters[i].m_Cur,
 				m_Snap.m_aCharacters[i].m_HasExtendedData ? &m_Snap.m_aCharacters[i].m_ExtendedData : 0,
@@ -2698,7 +3003,7 @@ void CGameClient::UpdatePrediction()
 		}
 
 	for(const CSnapEntities &EntData : SnapEntities())
-		m_GameWorld.NetObjAdd(EntData.m_Item.m_ID, EntData.m_Item.m_Type, EntData.m_pData, EntData.m_pDataEx);
+		m_GameWorld.NetObjAdd(EntData.m_Item.m_Id, EntData.m_Item.m_Type, EntData.m_Item.m_pData, EntData.m_pDataEx);
 
 	m_GameWorld.NetObjEnd();
 }
@@ -2719,8 +3024,8 @@ void CGameClient::UpdateRenderedCharacters()
 			Client()->IntraGameTick(g_Config.m_ClDummy));
 		vec2 Pos = UnpredPos;
 
-		CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i);
-		if(Predict() && (i == m_Snap.m_LocalClientID || (AntiPingPlayers() && !IsOtherTeam(i))) && pChar)
+		CCharacter *pChar = m_PredictedWorld.GetCharacterById(i);
+		if(Predict() && (i == m_Snap.m_LocalClientId || (AntiPingPlayers() && !IsOtherTeam(i))) && pChar)
 		{
 			m_aClients[i].m_Predicted.Write(&m_aClients[i].m_RenderCur);
 			m_aClients[i].m_PrevPredicted.Write(&m_aClients[i].m_RenderPrev);
@@ -2732,7 +3037,7 @@ void CGameClient::UpdateRenderedCharacters()
 				vec2(m_aClients[i].m_RenderCur.m_X, m_aClients[i].m_RenderCur.m_Y),
 				m_aClients[i].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy));
 
-			if(i == m_Snap.m_LocalClientID)
+			if(i == m_Snap.m_LocalClientId)
 			{
 				m_aClients[i].m_IsPredictedLocal = true;
 				if(AntiPingGunfire() && ((pChar->m_NinjaJetpack && pChar->m_FreezeTime == 0) || m_Snap.m_aCharacters[i].m_Cur.m_Weapon != WEAPON_NINJA || m_Snap.m_aCharacters[i].m_Cur.m_Weapon == m_aClients[i].m_Predicted.m_ActiveWeapon))
@@ -2754,7 +3059,7 @@ void CGameClient::UpdateRenderedCharacters()
 		}
 		m_Snap.m_aCharacters[i].m_Position = Pos;
 		m_aClients[i].m_RenderPos = Pos;
-		if(Predict() && i == m_Snap.m_LocalClientID)
+		if(Predict() && i == m_Snap.m_LocalClientId)
 			m_LocalCharacterPos = Pos;
 	}
 }
@@ -2774,8 +3079,8 @@ void CGameClient::DetectStrongHook()
 		if(m_Snap.m_aCharacters[FromPlayer].m_Prev.m_Direction != m_Snap.m_aCharacters[FromPlayer].m_Cur.m_Direction || m_Snap.m_aCharacters[ToPlayer].m_Prev.m_Direction != m_Snap.m_aCharacters[ToPlayer].m_Cur.m_Direction)
 			continue;
 
-		CCharacter *pFromCharWorld = m_GameWorld.GetCharacterByID(FromPlayer);
-		CCharacter *pToCharWorld = m_GameWorld.GetCharacterByID(ToPlayer);
+		CCharacter *pFromCharWorld = m_GameWorld.GetCharacterById(FromPlayer);
+		CCharacter *pToCharWorld = m_GameWorld.GetCharacterById(ToPlayer);
 		if(!pFromCharWorld || !pToCharWorld)
 			continue;
 
@@ -2825,7 +3130,7 @@ void CGameClient::DetectStrongHook()
 		{
 			if(m_CharOrder.HasStrongAgainst(ToPlayer, FromPlayer))
 			{
-				if(ToPlayer != m_Snap.m_LocalClientID)
+				if(ToPlayer != m_Snap.m_LocalClientId)
 					m_CharOrder.GiveWeak(ToPlayer);
 				else
 					m_CharOrder.GiveStrong(FromPlayer);
@@ -2835,7 +3140,7 @@ void CGameClient::DetectStrongHook()
 		{
 			if(m_CharOrder.HasStrongAgainst(FromPlayer, ToPlayer))
 			{
-				if(ToPlayer != m_Snap.m_LocalClientID)
+				if(ToPlayer != m_Snap.m_LocalClientId)
 					m_CharOrder.GiveStrong(ToPlayer);
 				else
 					m_CharOrder.GiveWeak(FromPlayer);
@@ -2844,22 +3149,22 @@ void CGameClient::DetectStrongHook()
 	}
 }
 
-vec2 CGameClient::GetSmoothPos(int ClientID)
+vec2 CGameClient::GetSmoothPos(int ClientId)
 {
-	vec2 Pos = mix(m_aClients[ClientID].m_PrevPredicted.m_Pos, m_aClients[ClientID].m_Predicted.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+	vec2 Pos = mix(m_aClients[ClientId].m_PrevPredicted.m_Pos, m_aClients[ClientId].m_Predicted.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
 	int64_t Now = time_get();
 	for(int i = 0; i < 2; i++)
 	{
-		int64_t Len = clamp(m_aClients[ClientID].m_aSmoothLen[i], (int64_t)1, time_freq());
-		int64_t TimePassed = Now - m_aClients[ClientID].m_aSmoothStart[i];
+		int64_t Len = clamp(m_aClients[ClientId].m_aSmoothLen[i], (int64_t)1, time_freq());
+		int64_t TimePassed = Now - m_aClients[ClientId].m_aSmoothStart[i];
 		if(in_range(TimePassed, (int64_t)0, Len - 1))
 		{
 			float MixAmount = 1.f - std::pow(1.f - TimePassed / (float)Len, 1.2f);
 			int SmoothTick;
 			float SmoothIntra;
 			Client()->GetSmoothTick(&SmoothTick, &SmoothIntra, MixAmount);
-			if(SmoothTick > 0 && m_aClients[ClientID].m_aPredTick[(SmoothTick - 1) % 200] >= Client()->PrevGameTick(g_Config.m_ClDummy) && m_aClients[ClientID].m_aPredTick[SmoothTick % 200] <= Client()->PredGameTick(g_Config.m_ClDummy))
-				Pos[i] = mix(m_aClients[ClientID].m_aPredPos[(SmoothTick - 1) % 200][i], m_aClients[ClientID].m_aPredPos[SmoothTick % 200][i], SmoothIntra);
+			if(SmoothTick > 0 && m_aClients[ClientId].m_aPredTick[(SmoothTick - 1) % 200] >= Client()->PrevGameTick(g_Config.m_ClDummy) && m_aClients[ClientId].m_aPredTick[SmoothTick % 200] <= Client()->PredGameTick(g_Config.m_ClDummy))
+				Pos[i] = mix(m_aClients[ClientId].m_aPredPos[(SmoothTick - 1) % 200][i], m_aClients[ClientId].m_aPredPos[SmoothTick % 200][i], SmoothIntra);
 		}
 	}
 	return Pos;
@@ -2870,45 +3175,45 @@ void CGameClient::Echo(const char *pString)
 	m_Chat.Echo(pString);
 }
 
-bool CGameClient::IsOtherTeam(int ClientID) const
+bool CGameClient::IsOtherTeam(int ClientId) const
 {
-	bool Local = m_Snap.m_LocalClientID == ClientID;
+	bool Local = m_Snap.m_LocalClientId == ClientId;
 
-	if(m_Snap.m_LocalClientID < 0)
+	if(m_Snap.m_LocalClientId < 0)
 		return false;
-	else if((m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW) || ClientID < 0)
+	else if((m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorId == SPEC_FREEVIEW) || ClientId < 0)
 		return false;
-	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
+	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)
 	{
-		if(m_Teams.Team(ClientID) == TEAM_SUPER || m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID) == TEAM_SUPER)
+		if(m_Teams.Team(ClientId) == TEAM_SUPER || m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorId) == TEAM_SUPER)
 			return false;
-		return m_Teams.Team(ClientID) != m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
+		return m_Teams.Team(ClientId) != m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorId);
 	}
-	else if((m_aClients[m_Snap.m_LocalClientID].m_Solo || m_aClients[ClientID].m_Solo) && !Local)
+	else if((m_aClients[m_Snap.m_LocalClientId].m_Solo || m_aClients[ClientId].m_Solo) && !Local)
 		return true;
 
-	if(m_Teams.Team(ClientID) == TEAM_SUPER || m_Teams.Team(m_Snap.m_LocalClientID) == TEAM_SUPER)
+	if(m_Teams.Team(ClientId) == TEAM_SUPER || m_Teams.Team(m_Snap.m_LocalClientId) == TEAM_SUPER)
 		return false;
 
-	return m_Teams.Team(ClientID) != m_Teams.Team(m_Snap.m_LocalClientID);
+	return m_Teams.Team(ClientId) != m_Teams.Team(m_Snap.m_LocalClientId);
 }
 
 int CGameClient::SwitchStateTeam() const
 {
 	if(m_aSwitchStateTeam[g_Config.m_ClDummy] >= 0)
 		return m_aSwitchStateTeam[g_Config.m_ClDummy];
-	else if(m_Snap.m_LocalClientID < 0)
+	else if(m_Snap.m_LocalClientId < 0)
 		return 0;
-	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
-		return m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
-	return m_Teams.Team(m_Snap.m_LocalClientID);
+	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorId != SPEC_FREEVIEW)
+		return m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorId);
+	return m_Teams.Team(m_Snap.m_LocalClientId);
 }
 
 bool CGameClient::IsLocalCharSuper() const
 {
-	if(m_Snap.m_LocalClientID < 0)
+	if(m_Snap.m_LocalClientId < 0)
 		return false;
-	return m_aClients[m_Snap.m_LocalClientID].m_Super;
+	return m_aClients[m_Snap.m_LocalClientId].m_Super;
 }
 
 void CGameClient::LoadGameSkin(const char *pPath, bool AsDir)
@@ -3033,7 +3338,7 @@ void CGameClient::LoadGameSkin(const char *pPath, bool AsDir)
 	}
 
 	CImageInfo ImgInfo;
-	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	bool PngLoaded = Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 	if(!PngLoaded && !IsDefault)
 	{
 		if(AsDir)
@@ -3041,7 +3346,7 @@ void CGameClient::LoadGameSkin(const char *pPath, bool AsDir)
 		else
 			LoadGameSkin(pPath, true);
 	}
-	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRgba(aPath, ImgInfo))
 	{
 		m_GameSkin.m_SpriteHealthFull = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HEALTH_FULL]);
 		m_GameSkin.m_SpriteHealthEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HEALTH_EMPTY]);
@@ -3164,9 +3469,8 @@ void CGameClient::LoadGameSkin(const char *pPath, bool AsDir)
 		}
 
 		m_GameSkinLoaded = true;
-
-		Graphics()->FreePNG(&ImgInfo);
 	}
+	ImgInfo.Free();
 }
 
 void CGameClient::LoadEmoticonsSkin(const char *pPath, bool AsDir)
@@ -3195,7 +3499,7 @@ void CGameClient::LoadEmoticonsSkin(const char *pPath, bool AsDir)
 	}
 
 	CImageInfo ImgInfo;
-	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	bool PngLoaded = Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 	if(!PngLoaded && !IsDefault)
 	{
 		if(AsDir)
@@ -3203,14 +3507,14 @@ void CGameClient::LoadEmoticonsSkin(const char *pPath, bool AsDir)
 		else
 			LoadEmoticonsSkin(pPath, true);
 	}
-	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRgba(aPath, ImgInfo))
 	{
 		for(int i = 0; i < 16; ++i)
 			m_EmoticonsSkin.m_aSpriteEmoticons[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_OOP + i]);
 
 		m_EmoticonsSkinLoaded = true;
-		Graphics()->FreePNG(&ImgInfo);
 	}
+	ImgInfo.Free();
 }
 
 void CGameClient::LoadParticlesSkin(const char *pPath, bool AsDir)
@@ -3249,7 +3553,7 @@ void CGameClient::LoadParticlesSkin(const char *pPath, bool AsDir)
 	}
 
 	CImageInfo ImgInfo;
-	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	bool PngLoaded = Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 	if(!PngLoaded && !IsDefault)
 	{
 		if(AsDir)
@@ -3257,7 +3561,7 @@ void CGameClient::LoadParticlesSkin(const char *pPath, bool AsDir)
 		else
 			LoadParticlesSkin(pPath, true);
 	}
-	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRgba(aPath, ImgInfo))
 	{
 		m_ParticlesSkin.m_SpriteParticleSlice = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SLICE]);
 		m_ParticlesSkin.m_SpriteParticleBall = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_BALL]);
@@ -3280,8 +3584,8 @@ void CGameClient::LoadParticlesSkin(const char *pPath, bool AsDir)
 		m_ParticlesSkin.m_aSpriteParticles[9] = m_ParticlesSkin.m_SpriteParticleHit;
 
 		m_ParticlesSkinLoaded = true;
-		free(ImgInfo.m_pData);
 	}
+	ImgInfo.Free();
 }
 
 void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
@@ -3315,6 +3619,8 @@ void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
 		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeleportGun);
 		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeleportLaser);
 		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudPracticeMode);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudLockMode);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeam0Mode);
 		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudDummyHammer);
 		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudDummyCopy);
 		m_HudSkinLoaded = false;
@@ -3336,7 +3642,7 @@ void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
 	}
 
 	CImageInfo ImgInfo;
-	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	bool PngLoaded = Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 	if(!PngLoaded && !IsDefault)
 	{
 		if(AsDir)
@@ -3344,7 +3650,7 @@ void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
 		else
 			LoadHudSkin(pPath, true);
 	}
-	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRgba(aPath, ImgInfo))
 	{
 		m_HudSkin.m_SpriteHudAirjump = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_AIRJUMP]);
 		m_HudSkin.m_SpriteHudAirjumpEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_AIRJUMP_EMPTY]);
@@ -3373,12 +3679,14 @@ void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
 		m_HudSkin.m_SpriteHudTeleportGun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TELEPORT_GUN]);
 		m_HudSkin.m_SpriteHudTeleportLaser = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TELEPORT_LASER]);
 		m_HudSkin.m_SpriteHudPracticeMode = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_PRACTICE_MODE]);
+		m_HudSkin.m_SpriteHudLockMode = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_LOCK_MODE]);
+		m_HudSkin.m_SpriteHudTeam0Mode = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TEAM0_MODE]);
 		m_HudSkin.m_SpriteHudDummyHammer = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_DUMMY_HAMMER]);
 		m_HudSkin.m_SpriteHudDummyCopy = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_DUMMY_COPY]);
 
 		m_HudSkinLoaded = true;
-		free(ImgInfo.m_pData);
 	}
+	ImgInfo.Free();
 }
 
 void CGameClient::LoadExtrasSkin(const char *pPath, bool AsDir)
@@ -3409,7 +3717,7 @@ void CGameClient::LoadExtrasSkin(const char *pPath, bool AsDir)
 	}
 
 	CImageInfo ImgInfo;
-	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	bool PngLoaded = Graphics()->LoadPng(ImgInfo, aPath, IStorage::TYPE_ALL);
 	if(!PngLoaded && !IsDefault)
 	{
 		if(AsDir)
@@ -3417,26 +3725,31 @@ void CGameClient::LoadExtrasSkin(const char *pPath, bool AsDir)
 		else
 			LoadExtrasSkin(pPath, true);
 	}
-	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRgba(aPath, ImgInfo))
 	{
 		m_ExtrasSkin.m_SpriteParticleSnowflake = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE]);
 		m_ExtrasSkin.m_aSpriteParticles[0] = m_ExtrasSkin.m_SpriteParticleSnowflake;
 		m_ExtrasSkinLoaded = true;
-		free(ImgInfo.m_pData);
 	}
+	ImgInfo.Free();
 }
 
-void CGameClient::RefindSkins()
+void CGameClient::RefreshSkins()
 {
+	const auto SkinStartLoadTime = time_get_nanoseconds();
+	m_Skins.Refresh([&](int) {
+		// if skin refreshing takes to long, swap to a loading screen
+		if(time_get_nanoseconds() - SkinStartLoadTime > 500ms)
+		{
+			m_Menus.RenderLoading(Localize("Loading skin files"), "", 0, false);
+		}
+	});
+
 	for(auto &Client : m_aClients)
 	{
-		Client.m_SkinInfo.m_OriginalRenderSkin.Reset();
-		Client.m_SkinInfo.m_ColorableRenderSkin.Reset();
 		if(Client.m_aSkinName[0] != '\0')
 		{
-			const CSkin *pSkin = m_Skins.Find(Client.m_aSkinName);
-			Client.m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-			Client.m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+			Client.m_SkinInfo.Apply(m_Skins.Find(Client.m_aSkinName));
 		}
 		else
 		{
@@ -3445,9 +3758,19 @@ void CGameClient::RefindSkins()
 		}
 		Client.UpdateRenderInfo(IsTeamPlay());
 	}
-	m_Ghost.RefindSkins();
-	m_Chat.RefindSkins();
-	m_InfoMessages.RefindSkins();
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnRefreshSkins();
+}
+
+void CGameClient::ConchainRefreshSkins(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CGameClient *pThis = static_cast<CGameClient *>(pUserData);
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() && pThis->m_Menus.IsInit())
+	{
+		pThis->RefreshSkins();
+	}
 }
 
 static bool UnknownMapSettingCallback(const char *pCommand, void *pUser)
@@ -3475,10 +3798,10 @@ void CGameClient::LoadMapSettings()
 	pMap->GetType(MAPITEMTYPE_INFO, &Start, &Num);
 	for(int i = Start; i < Start + Num; i++)
 	{
-		int ItemID;
-		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemID);
+		int ItemId;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemId);
 		int ItemSize = pMap->GetItemSize(i);
-		if(!pItem || ItemID != 0)
+		if(!pItem || ItemId != 0)
 			continue;
 
 		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
@@ -3548,14 +3871,14 @@ bool CGameClient::CanDisplayWarning() const
 	return m_Menus.CanDisplayWarning();
 }
 
-bool CGameClient::IsDisplayingWarning() const
+CNetObjHandler *CGameClient::GetNetObjHandler()
 {
-	return m_Menus.GetCurPopup() == CMenus::POPUP_WARNING;
+	return &m_NetObjHandler;
 }
 
-CNetObjHandler *CGameClient::GetNetObjHandler()
+protocol7::CNetObjHandler *CGameClient::GetNetObjHandler7()
 {
-	return &m_NetObjHandler;
+	return &m_NetObjHandler7;
 }
 
 void CGameClient::SnapCollectEntities()
@@ -3567,21 +3890,20 @@ void CGameClient::SnapCollectEntities()
 
 	for(int Index = 0; Index < NumSnapItems; Index++)
 	{
-		IClient::CSnapItem Item;
-		const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index, &Item);
+		const IClient::CSnapItem Item = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index);
 		if(Item.m_Type == NETOBJTYPE_ENTITYEX)
-			vItemEx.push_back({Item, pData, 0});
+			vItemEx.push_back({Item, nullptr});
 		else if(Item.m_Type == NETOBJTYPE_PICKUP || Item.m_Type == NETOBJTYPE_DDNETPICKUP || Item.m_Type == NETOBJTYPE_LASER || Item.m_Type == NETOBJTYPE_DDNETLASER || Item.m_Type == NETOBJTYPE_PROJECTILE || Item.m_Type == NETOBJTYPE_DDRACEPROJECTILE || Item.m_Type == NETOBJTYPE_DDNETPROJECTILE)
-			vItemData.push_back({Item, pData, 0});
+			vItemData.push_back({Item, nullptr});
 	}
 
 	// sort by id
 	class CEntComparer
 	{
 	public:
-		bool operator()(const CSnapEntities &lhs, const CSnapEntities &rhs) const
+		bool operator()(const CSnapEntities &Lhs, const CSnapEntities &Rhs) const
 		{
-			return lhs.m_Item.m_ID < rhs.m_Item.m_ID;
+			return Lhs.m_Item.m_Id < Rhs.m_Item.m_Id;
 		}
 	};
 
@@ -3594,13 +3916,14 @@ void CGameClient::SnapCollectEntities()
 	size_t IndexEx = 0;
 	for(const CSnapEntities &Ent : vItemData)
 	{
-		const CNetObj_EntityEx *pDataEx = 0;
-		while(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_ID < Ent.m_Item.m_ID)
+		while(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_Id < Ent.m_Item.m_Id)
 			IndexEx++;
-		if(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_ID == Ent.m_Item.m_ID)
-			pDataEx = (const CNetObj_EntityEx *)vItemEx[IndexEx].m_pData;
 
-		m_vSnapEntities.push_back({Ent.m_Item, Ent.m_pData, pDataEx});
+		const CNetObj_EntityEx *pDataEx = nullptr;
+		if(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_Id == Ent.m_Item.m_Id)
+			pDataEx = (const CNetObj_EntityEx *)vItemEx[IndexEx].m_Item.m_pData;
+
+		m_vSnapEntities.push_back({Ent.m_Item, pDataEx});
 	}
 }
 
@@ -3655,7 +3978,7 @@ void CGameClient::HandleMultiView()
 			{
 				m_MultiView.m_aVanish[i] = true;
 				// player we want to be vanished is our "main" tee, so lets switch the tee
-				if(i == m_Snap.m_SpecInfo.m_SpectatorID)
+				if(i == m_Snap.m_SpecInfo.m_SpectatorId)
 					m_Spectator.Spectate(FindFirstMultiViewId());
 			}
 		}
@@ -3786,18 +4109,18 @@ bool CGameClient::InitMultiView(int Team)
 
 	if(IsMultiViewIdSet())
 	{
-		int SpectatorID = m_Snap.m_SpecInfo.m_SpectatorID;
-		int NewSpectatorID = -1;
+		int SpectatorId = m_Snap.m_SpecInfo.m_SpectatorId;
+		int NewSpectatorId = -1;
 
 		vec2 CurPosition(m_Camera.m_Center);
-		if(SpectatorID != SPEC_FREEVIEW)
+		if(SpectatorId != SPEC_FREEVIEW)
 		{
-			const CNetObj_Character &CurCharacter = m_Snap.m_aCharacters[SpectatorID].m_Cur;
+			const CNetObj_Character &CurCharacter = m_Snap.m_aCharacters[SpectatorId].m_Cur;
 			CurPosition.x = CurCharacter.m_X;
 			CurPosition.y = CurCharacter.m_Y;
 		}
 
-		int ClosestDistance = INT_MAX;
+		int ClosestDistance = std::numeric_limits<int>::max();
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
 			if(!m_Snap.m_apPlayerInfos[i] || m_Snap.m_apPlayerInfos[i]->m_Team == TEAM_SPECTATORS || m_Teams.Team(i) != m_MultiViewTeam)
@@ -3812,15 +4135,15 @@ bool CGameClient::InitMultiView(int Team)
 				continue;
 
 			int Distance = distance(CurPosition, PlayerPos);
-			if(NewSpectatorID == -1 || Distance < ClosestDistance)
+			if(NewSpectatorId == -1 || Distance < ClosestDistance)
 			{
-				NewSpectatorID = i;
+				NewSpectatorId = i;
 				ClosestDistance = Distance;
 			}
 		}
 
-		if(NewSpectatorID > -1)
-			m_Spectator.Spectate(NewSpectatorID);
+		if(NewSpectatorId > -1)
+			m_Spectator.Spectate(NewSpectatorId);
 	}
 
 	return IsMultiViewIdSet();
@@ -3898,14 +4221,14 @@ void CGameClient::CleanMultiViewIds()
 	std::fill(std::begin(m_MultiView.m_aVanish), std::end(m_MultiView.m_aVanish), false);
 }
 
-void CGameClient::CleanMultiViewId(int ClientID)
+void CGameClient::CleanMultiViewId(int ClientId)
 {
-	if(ClientID >= MAX_CLIENTS || ClientID < 0)
+	if(ClientId >= MAX_CLIENTS || ClientId < 0)
 		return;
 
-	m_aMultiViewId[ClientID] = false;
-	m_MultiView.m_aLastFreeze[ClientID] = 0.0f;
-	m_MultiView.m_aVanish[ClientID] = false;
+	m_aMultiViewId[ClientId] = false;
+	m_MultiView.m_aLastFreeze[ClientId] = 0.0f;
+	m_MultiView.m_aVanish[ClientId] = false;
 }
 
 bool CGameClient::IsMultiViewIdSet()
@@ -3915,22 +4238,11 @@ bool CGameClient::IsMultiViewIdSet()
 
 int CGameClient::FindFirstMultiViewId()
 {
-	int ClientID = -1;
+	int ClientId = -1;
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
 		if(m_aMultiViewId[i] && !m_MultiView.m_aVanish[i])
 			return i;
 	}
-	return ClientID;
+	return ClientId;
 }
-
-// void CGameClient (const std::string& p.Client./m_aName)
-//{
-//    if(m_aName == "furo")
-//    {
-//        int game = 0;
-//        char a = '\0';
-//        int* ptr = &game;
-//        return;
-//    }
-//}
\ No newline at end of file
diff --git a/src/game/client/gameclient.h b/src/game/client/gameclient.h
index 8cff3a0c5d..11fd32f27b 100644
--- a/src/game/client/gameclient.h
+++ b/src/game/client/gameclient.h
@@ -7,19 +7,24 @@
 #include <base/color.h>
 #include <base/vmath.h>
 #include <engine/client.h>
+#include <engine/client/enums.h>
 #include <engine/console.h>
 #include <engine/shared/config.h>
+
 #include <game/collision.h>
 #include <game/gamecore.h>
 #include <game/layers.h>
 #include <game/teamscore.h>
 
 #include <game/client/prediction/gameworld.h>
+#include <game/client/race.h>
+
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
 
 // components
 #include "components/background.h"
 #include "components/binds.h"
-#include "components/bindwheel.h"
 #include "components/broadcast.h"
 #include "components/camera.h"
 #include "components/chat.h"
@@ -43,19 +48,16 @@
 #include "components/menus.h"
 #include "components/motd.h"
 #include "components/nameplates.h"
-#include "components/outlines.h"
-#include "components/parser.h"
 #include "components/particles.h"
 #include "components/players.h"
 #include "components/race_demo.h"
 #include "components/scoreboard.h"
-#include "components/skinprofiles.h"
 #include "components/skins.h"
+#include "components/skins7.h"
 #include "components/sounds.h"
 #include "components/spectator.h"
 #include "components/statboard.h"
 #include "components/tooltips.h"
-#include "components/verify.h"
 #include "components/voting.h"
 
 class CGameInfo
@@ -91,6 +93,7 @@ class CGameInfo
 	bool m_EntitiesFDDrace;
 
 	bool m_Race;
+	bool m_Pvp;
 
 	bool m_DontMaskEntities;
 	bool m_AllowXSkins;
@@ -107,10 +110,16 @@ class CSnapEntities
 {
 public:
 	IClient::CSnapItem m_Item;
-	const void *m_pData;
 	const CNetObj_EntityEx *m_pDataEx;
 };
 
+enum class EClientIdFormat
+{
+	NO_INDENT,
+	INDENT_AUTO,
+	INDENT_FORCE, // for rendering settings preview
+};
+
 class CGameClient : public IGameClient
 {
 public:
@@ -119,16 +128,13 @@ class CGameClient : public IGameClient
 	CCamera m_Camera;
 	CChat m_Chat;
 	CMotd m_Motd;
-	CBindWheel m_BindWheel;
-	CVerify m_Verify;
 	CBroadcast m_Broadcast;
-	COutlines m_Outlines;
 	CGameConsole m_GameConsole;
 	CBinds m_Binds;
-	CSkinProfiles m_SkinProfiles;
 	CParticles m_Particles;
 	CMenus m_Menus;
 	CSkins m_Skins;
+	CSkins7 m_Skins7;
 	CCountryFlags m_CountryFlags;
 	CFlow m_Flow;
 	CHud m_Hud;
@@ -137,7 +143,6 @@ class CGameClient : public IGameClient
 	CEffects m_Effects;
 	CScoreboard m_Scoreboard;
 	CStatboard m_Statboard;
-	CStats m_Stats;
 	CSounds m_Sounds;
 	CEmoticon m_Emoticon;
 	CDamageInd m_DamageInd;
@@ -158,7 +163,6 @@ class CGameClient : public IGameClient
 	CMapSounds m_MapSounds;
 
 	CRaceDemo m_RaceDemo;
-
 	CGhost m_Ghost;
 
 	CTooltips m_Tooltips;
@@ -167,6 +171,7 @@ class CGameClient : public IGameClient
 	std::vector<class CComponent *> m_vpAll;
 	std::vector<class CComponent *> m_vpInput;
 	CNetObjHandler m_NetObjHandler;
+	protocol7::CNetObjHandler m_NetObjHandler7;
 
 	class IEngine *m_pEngine;
 	class IInput *m_pInput;
@@ -187,16 +192,16 @@ class CGameClient : public IGameClient
 #if defined(CONF_AUTOUPDATE)
 	class IUpdater *m_pUpdater;
 #endif
+	class IHttp *m_pHttp;
 
 	CLayers m_Layers;
 	CCollision m_Collision;
-	CUI m_UI;
+	CUi m_UI;
+	CRaceHelper m_RaceHelper;
 
 	void ProcessEvents();
 	void UpdatePositions();
 
-	//  void ShutdownOnName(const std::string& m_aName);
-
 	int m_EditorMovementDelay = 5;
 	void UpdateEditorIngameMoved();
 
@@ -214,10 +219,12 @@ class CGameClient : public IGameClient
 
 	static void ConTeam(IConsole::IResult *pResult, void *pUserData);
 	static void ConKill(IConsole::IResult *pResult, void *pUserData);
+	static void ConReadyChange7(IConsole::IResult *pResult, void *pUserData);
 
 	static void ConchainLanguageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainSpecialDummyInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainRefreshSkins(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainSpecialDummy(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainClTextEntitiesSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
@@ -226,20 +233,20 @@ class CGameClient : public IGameClient
 	static void ConchainMenuMap(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
 	// only used in OnPredict
-	vec2 m_aLastPos[MAX_CLIENTS] = {{0, 0}};
-	bool m_aLastActive[MAX_CLIENTS] = {false};
+	vec2 m_aLastPos[MAX_CLIENTS];
+	bool m_aLastActive[MAX_CLIENTS];
 
 	// only used in OnNewSnapshot
 	bool m_GameOver = false;
 	bool m_GamePaused = false;
-	int m_PrevLocalID = -1;
+	int m_PrevLocalId = -1;
 
 public:
 	IKernel *Kernel() { return IInterface::Kernel(); }
 	IEngine *Engine() const { return m_pEngine; }
 	class IGraphics *Graphics() const { return m_pGraphics; }
 	class IClient *Client() const { return m_pClient; }
-	class CUI *UI() { return &m_UI; }
+	class CUi *Ui() { return &m_UI; }
 	class ISound *Sound() const { return m_pSound; }
 	class IInput *Input() const { return m_pInput; }
 	class IStorage *Storage() const { return m_pStorage; }
@@ -254,6 +261,8 @@ class CGameClient : public IGameClient
 	class CRenderTools *RenderTools() { return &m_RenderTools; }
 	class CLayers *Layers() { return &m_Layers; }
 	CCollision *Collision() { return &m_Collision; }
+	const CCollision *Collision() const { return &m_Collision; }
+	const CRaceHelper *RaceHelper() const { return &m_RaceHelper; }
 	class IEditor *Editor() { return m_pEditor; }
 	class IFriends *Friends() { return m_pFriends; }
 	class IFriends *Foes() { return m_pFoes; }
@@ -263,6 +272,10 @@ class CGameClient : public IGameClient
 		return m_pUpdater;
 	}
 #endif
+	class IHttp *Http()
+	{
+		return m_pHttp;
+	}
 
 	int NetobjNumCorrections()
 	{
@@ -275,9 +288,6 @@ class CGameClient : public IGameClient
 	bool m_NewPredictedTick;
 	int m_aFlagDropTick[2];
 
-	// TODO: move this
-	CTuningParams m_aTuning[NUM_DUMMIES];
-
 	enum
 	{
 		SERVERMODE_PURE = 0,
@@ -287,7 +297,7 @@ class CGameClient : public IGameClient
 	int m_ServerMode;
 	CGameInfo m_GameInfo;
 
-	int m_DemoSpecID;
+	int m_DemoSpecId;
 
 	vec2 m_LocalCharacterPos;
 
@@ -306,7 +316,7 @@ class CGameClient : public IGameClient
 		const CNetObj_Flag *m_apFlags[2];
 		const CNetObj_GameInfo *m_pGameInfoObj;
 		const CNetObj_GameData *m_pGameDataObj;
-		int m_GameDataSnapID;
+		int m_GameDataSnapId;
 
 		const CNetObj_PlayerInfo *m_apPlayerInfos[MAX_CLIENTS];
 		const CNetObj_PlayerInfo *m_apInfoByScore[MAX_CLIENTS];
@@ -314,15 +324,16 @@ class CGameClient : public IGameClient
 		const CNetObj_PlayerInfo *m_apInfoByDDTeamScore[MAX_CLIENTS];
 		const CNetObj_PlayerInfo *m_apInfoByDDTeamName[MAX_CLIENTS];
 
-		int m_LocalClientID;
+		int m_LocalClientId;
 		int m_NumPlayers;
 		int m_aTeamSize[2];
+		int m_HighestClientId;
 
 		// spectate data
 		struct CSpectateInfo
 		{
 			bool m_Active;
-			int m_SpectatorID;
+			int m_SpectatorId;
 			bool m_UsePosition;
 			vec2 m_Position;
 		} m_SpecInfo;
@@ -353,6 +364,7 @@ class CGameClient : public IGameClient
 	bool m_aReceivedTuning[NUM_DUMMIES];
 	int m_aExpectingTuningForZone[NUM_DUMMIES];
 	int m_aExpectingTuningSince[NUM_DUMMIES];
+	CTuningParams m_aTuning[NUM_DUMMIES];
 
 	// client data
 	struct CClientData
@@ -361,15 +373,16 @@ class CGameClient : public IGameClient
 		int m_ColorBody;
 		int m_ColorFeet;
 
-		char m_aClan[MAX_CLAN_LENGTH];
 		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
 		int m_Country;
-		char m_aSkinName[64];
+		char m_aSkinName[24];
 		int m_SkinColor;
 		int m_Team;
 		int m_Emoticon;
 		float m_EmoticonStartFraction;
 		int m_EmoticonStartTick;
+
 		bool m_Solo;
 		bool m_Jetpack;
 		bool m_CollisionDisabled;
@@ -398,9 +411,9 @@ class CGameClient : public IGameClient
 		bool m_Active;
 		bool m_ChatIgnore;
 		bool m_EmoticonIgnore;
-
 		bool m_Friend;
 		bool m_Foe;
+
 		int m_AuthLevel;
 		bool m_Afk;
 		bool m_Paused;
@@ -412,9 +425,6 @@ class CGameClient : public IGameClient
 		CNetObj_Character m_Snapped;
 		CNetObj_Character m_Evolved;
 
-		void UpdateRenderInfo(bool IsTeamPlay);
-		void Reset();
-
 		// rendered characters
 		CNetObj_Character m_RenderCur;
 		CNetObj_Character m_RenderPrev;
@@ -427,6 +437,22 @@ class CGameClient : public IGameClient
 		int m_aPredTick[200];
 		bool m_SpecCharPresent;
 		vec2 m_SpecChar;
+
+		void UpdateRenderInfo(bool IsTeamPlay);
+		void Reset();
+
+		class CSixup
+		{
+		public:
+			void Reset();
+
+			char m_aaSkinPartNames[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_LENGTH];
+			int m_aUseCustomColors[protocol7::NUM_SKINPARTS];
+			int m_aSkinPartColors[protocol7::NUM_SKINPARTS];
+		};
+
+		// 0.7 Skin
+		CSixup m_aSixup[NUM_DUMMIES];
 	};
 
 	CClientData m_aClients[MAX_CLIENTS];
@@ -485,6 +511,12 @@ class CGameClient : public IGameClient
 	void OnInit() override;
 	void OnConsoleInit() override;
 	void OnStateChange(int NewState, int OldState) override;
+	template<typename T>
+	void ApplySkin7InfoFromGameMsg(const T *pMsg, int ClientId, int Conn);
+	void ApplySkin7InfoFromSnapObj(const protocol7::CNetObj_De_ClientInfo *pObj, int ClientId) override;
+	int OnDemoRecSnap7(class CSnapshot *pFrom, class CSnapshot *pTo, int Conn) override;
+	void *TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn);
+	int TranslateSnap(CSnapshot *pSnapDstSix, CSnapshot *pSnapSrcSeven, int Conn, bool Dummy) override;
 	void OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dummy) override;
 	void InvalidateSnapshot() override;
 	void OnNewSnapshot() override;
@@ -499,31 +531,44 @@ class CGameClient : public IGameClient
 	virtual void OnGameOver();
 	virtual void OnStartGame();
 	virtual void OnStartRound();
-	virtual void OnFlagGrab(int TeamID);
+	virtual void OnFlagGrab(int TeamId);
 	void OnWindowResize() override;
 
 	bool m_LanguageChanged = false;
 	void OnLanguageChange();
 	void HandleLanguageChanged();
 
-	void RenderShutdownMessage();
+	void RefreshSkins();
+
+	void RenderShutdownMessage() override;
 
 	const char *GetItemName(int Type) const override;
 	const char *Version() const override;
 	const char *NetVersion() const override;
+	const char *NetVersion7() const override;
 	int DDNetVersion() const override;
 	const char *DDNetVersionStr() const override;
+	virtual int ClientVersion7() const override;
+
+	void DoTeamChangeMessage7(const char *pName, int ClientId, int Team, const char *pPrefix = "");
 
 	// actions
 	// TODO: move these
-	void SendSwitchTeam(int Team);
+	void SendSwitchTeam(int Team) const;
+	void SendStartInfo7(bool Dummy) const;
+	void SendSkinChange7(bool Dummy);
+	// Returns true if the requested skin change got applied by the server
+	bool GotWantedSkin7(bool Dummy);
 	void SendInfo(bool Start);
 	void SendDummyInfo(bool Start) override;
-	void SendKill(int ClientID) const;
+	void SendKill(int ClientId) const;
+	void SendReadyChange7();
+
+	int m_NextChangeInfo;
 
 	// DDRace
 
-	int m_aLocalIDs[NUM_DUMMIES];
+	int m_aLocalIds[NUM_DUMMIES];
 	CNetObj_PlayerInput m_DummyInput;
 	CNetObj_PlayerInput m_HammerInput;
 	unsigned int m_DummyFire;
@@ -531,7 +576,7 @@ class CGameClient : public IGameClient
 
 	class CTeamsCore m_Teams;
 
-	int IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int ownID);
+	int IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int OwnId);
 
 	int GetLastRaceTick() const override;
 
@@ -542,9 +587,10 @@ class CGameClient : public IGameClient
 	bool AntiPingWeapons() { return g_Config.m_ClAntiPing && g_Config.m_ClAntiPingWeapons && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK; }
 	bool AntiPingGunfire() { return AntiPingGrenade() && AntiPingWeapons() && g_Config.m_ClAntiPingGunfire; }
 	bool Predict() const;
-	bool PredictDummy() { return g_Config.m_ClPredictDummy && Client()->DummyConnected() && m_Snap.m_LocalClientID >= 0 && m_PredictedDummyID >= 0 && !m_aClients[m_PredictedDummyID].m_Paused; }
+	bool PredictDummy() { return g_Config.m_ClPredictDummy && Client()->DummyConnected() && m_Snap.m_LocalClientId >= 0 && m_PredictedDummyId >= 0 && !m_aClients[m_PredictedDummyId].m_Paused; }
 	const CTuningParams *GetTuning(int i) { return &m_aTuningList[i]; }
 	ColorRGBA GetDDTeamColor(int DDTeam, float Lightness = 0.5f) const;
+	void FormatClientId(int ClientId, char (&aClientId)[16], EClientIdFormat Format) const;
 
 	CGameWorld m_GameWorld;
 	CGameWorld m_PredictedWorld;
@@ -555,12 +601,12 @@ class CGameClient : public IGameClient
 
 	void DummyResetInput() override;
 	void Echo(const char *pString) override;
-	bool IsOtherTeam(int ClientID) const;
+	bool IsOtherTeam(int ClientId) const;
 	int SwitchStateTeam() const;
 	bool IsLocalCharSuper() const;
 	bool CanDisplayWarning() const override;
-	bool IsDisplayingWarning() const override;
 	CNetObjHandler *GetNetObjHandler() override;
+	protocol7::CNetObjHandler *GetNetObjHandler7() override;
 
 	void LoadGameSkin(const char *pPath, bool AsDir = false);
 	void LoadEmoticonsSkin(const char *pPath, bool AsDir = false);
@@ -568,8 +614,6 @@ class CGameClient : public IGameClient
 	void LoadHudSkin(const char *pPath, bool AsDir = false);
 	void LoadExtrasSkin(const char *pPath, bool AsDir = false);
 
-	void RefindSkins();
-
 	struct SClientGameSkin
 	{
 		// health armor hud
@@ -657,7 +701,7 @@ class CGameClient : public IGameClient
 	};
 
 	SClientGameSkin m_GameSkin;
-	bool m_GameSkinLoaded;
+	bool m_GameSkinLoaded = false;
 
 	struct SClientParticlesSkin
 	{
@@ -673,7 +717,7 @@ class CGameClient : public IGameClient
 	};
 
 	SClientParticlesSkin m_ParticlesSkin;
-	bool m_ParticlesSkinLoaded;
+	bool m_ParticlesSkinLoaded = false;
 
 	struct SClientEmoticonsSkin
 	{
@@ -681,7 +725,7 @@ class CGameClient : public IGameClient
 	};
 
 	SClientEmoticonsSkin m_EmoticonsSkin;
-	bool m_EmoticonsSkinLoaded;
+	bool m_EmoticonsSkinLoaded = false;
 
 	struct SClientHudSkin
 	{
@@ -712,12 +756,14 @@ class CGameClient : public IGameClient
 		IGraphics::CTextureHandle m_SpriteHudTeleportGun;
 		IGraphics::CTextureHandle m_SpriteHudTeleportLaser;
 		IGraphics::CTextureHandle m_SpriteHudPracticeMode;
+		IGraphics::CTextureHandle m_SpriteHudLockMode;
+		IGraphics::CTextureHandle m_SpriteHudTeam0Mode;
 		IGraphics::CTextureHandle m_SpriteHudDummyHammer;
 		IGraphics::CTextureHandle m_SpriteHudDummyCopy;
 	};
 
 	SClientHudSkin m_HudSkin;
-	bool m_HudSkinLoaded;
+	bool m_HudSkinLoaded = false;
 
 	struct SClientExtrasSkin
 	{
@@ -726,7 +772,7 @@ class CGameClient : public IGameClient
 	};
 
 	SClientExtrasSkin m_ExtrasSkin;
-	bool m_ExtrasSkinLoaded;
+	bool m_ExtrasSkinLoaded = false;
 
 	const std::vector<CSnapEntities> &SnapEntities() { return m_vSnapEntities; }
 
@@ -738,7 +784,7 @@ class CGameClient : public IGameClient
 
 	void ResetMultiView();
 	int FindFirstMultiViewId();
-	void CleanMultiViewId(int ClientID);
+	void CleanMultiViewId(int ClientId);
 
 private:
 	std::vector<CSnapEntities> m_vSnapEntities;
@@ -753,9 +799,9 @@ class CGameClient : public IGameClient
 	int m_aLastUpdateTick[MAX_CLIENTS] = {0};
 	void DetectStrongHook();
 
-	vec2 GetSmoothPos(int ClientID);
+	vec2 GetSmoothPos(int ClientId);
 
-	int m_PredictedDummyID;
+	int m_PredictedDummyId;
 	int m_IsDummySwapping;
 	CCharOrder m_CharOrder;
 	int m_aSwitchStateTeam[NUM_DUMMIES];
diff --git a/src/game/client/lineinput.cpp b/src/game/client/lineinput.cpp
index 7af53941a0..9c9564a05a 100644
--- a/src/game/client/lineinput.cpp
+++ b/src/game/client/lineinput.cpp
@@ -199,6 +199,7 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 	if((Event.m_Flags & IInput::FLAG_TEXT) && !(KEY_LCTRL <= Event.m_Key && Event.m_Key <= KEY_RGUI))
 	{
 		SetRange(Event.m_aText, m_SelectionStart, m_SelectionEnd);
+		KeyHandled = true;
 	}
 
 	if(Event.m_Flags & IInput::FLAG_PRESS)
@@ -231,6 +232,7 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 				}
 				m_SelectionStart = m_SelectionEnd = m_CursorPos;
 			}
+			KeyHandled = true;
 		}
 		else if(Event.m_Key == KEY_DELETE)
 		{
@@ -251,6 +253,7 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 				}
 				m_SelectionStart = m_SelectionEnd = m_CursorPos;
 			}
+			KeyHandled = true;
 		}
 		else if(Event.m_Key == KEY_LEFT)
 		{
@@ -271,7 +274,10 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 			}
 
 			if(!Selecting)
+			{
 				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+			}
+			KeyHandled = true;
 		}
 		else if(Event.m_Key == KEY_RIGHT)
 		{
@@ -292,7 +298,10 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 			}
 
 			if(!Selecting)
+			{
 				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+			}
+			KeyHandled = true;
 		}
 		else if(Event.m_Key == KEY_HOME)
 		{
@@ -305,6 +314,7 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 				m_SelectionEnd = 0;
 			m_CursorPos = 0;
 			m_SelectionStart = 0;
+			KeyHandled = true;
 		}
 		else if(Event.m_Key == KEY_END)
 		{
@@ -317,13 +327,13 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 				m_SelectionStart = m_Len;
 			m_CursorPos = m_Len;
 			m_SelectionEnd = m_Len;
+			KeyHandled = true;
 		}
 		else if(ModPressed && !AltPressed && Event.m_Key == KEY_V)
 		{
-			const char *pClipboardText = Input()->GetClipboardText();
-			if(pClipboardText)
+			std::string ClipboardText = Input()->GetClipboardText();
+			if(!ClipboardText.empty())
 			{
-				std::string ClipboardText = Input()->GetClipboardText();
 				if(m_pfnClipboardLineCallback)
 				{
 					// Split clipboard text into multiple lines. Send all complete lines to callback.
@@ -381,15 +391,16 @@ bool CLineInput::ProcessInput(const IInput::CEvent &Event)
 		{
 			m_SelectionStart = 0;
 			m_SelectionEnd = m_CursorPos = m_Len;
+			KeyHandled = true;
 		}
 	}
 
 	m_WasCursorChanged |= OldCursorPos != m_CursorPos;
 	m_WasCursorChanged |= SelectionLength != GetSelectionLength();
-	return m_WasChanged || m_WasCursorChanged || KeyHandled;
+	return KeyHandled;
 }
 
-STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing)
+STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing, const std::vector<STextColorSplit> &vColorSplits)
 {
 	// update derived attributes to handle external changes to the buffer
 	UpdateStrData();
@@ -424,7 +435,7 @@ STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Al
 		}
 
 		const STextBoundingBox BoundingBox = TextRender()->TextBoundingBox(FontSize, pDisplayStr, -1, LineWidth, LineSpacing);
-		const vec2 CursorPos = CUI::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
+		const vec2 CursorPos = CUi::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
 
 		TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, FontSize, TEXTFLAG_RENDER);
 		Cursor.m_LineWidth = LineWidth;
@@ -432,6 +443,7 @@ STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Al
 		Cursor.m_LineSpacing = LineSpacing;
 		Cursor.m_PressMouse.x = m_MouseSelection.m_PressMouse.x;
 		Cursor.m_ReleaseMouse.x = m_MouseSelection.m_ReleaseMouse.x;
+		Cursor.m_vColorSplits = vColorSplits;
 		if(LineWidth < 0.0f)
 		{
 			// Using a Y position that's always inside the line input makes it so the selection does not reset when
@@ -508,10 +520,11 @@ STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Al
 	else
 	{
 		const STextBoundingBox BoundingBox = TextRender()->TextBoundingBox(FontSize, pDisplayStr, -1, LineWidth, LineSpacing);
-		const vec2 CursorPos = CUI::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
+		const vec2 CursorPos = CUi::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
 		TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, FontSize, TEXTFLAG_RENDER);
 		Cursor.m_LineWidth = LineWidth;
 		Cursor.m_LineSpacing = LineSpacing;
+		Cursor.m_vColorSplits = vColorSplits;
 		TextRender()->TextEx(&Cursor, pDisplayStr);
 	}
 
@@ -659,7 +672,7 @@ void CLineInputNumber::SetInteger(int Number, int Base, int HexPrefix)
 	switch(Base)
 	{
 	case 10:
-		str_from_int(Number, aBuf);
+		str_format(aBuf, sizeof(aBuf), "%d", Number);
 		break;
 	case 16:
 		str_format(aBuf, sizeof(aBuf), "%0*X", HexPrefix, Number);
diff --git a/src/game/client/lineinput.h b/src/game/client/lineinput.h
index 0bd405a041..cbf4e42e92 100644
--- a/src/game/client/lineinput.h
+++ b/src/game/client/lineinput.h
@@ -187,7 +187,7 @@ class CLineInput
 		return Changed;
 	}
 
-	STextBoundingBox Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing);
+	STextBoundingBox Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing, const std::vector<STextColorSplit> &vColorSplits = {});
 	SMouseSelection *GetMouseSelection() { return &m_MouseSelection; }
 
 	const void *GetClearButtonId() const { return &m_ClearButtonId; }
diff --git a/src/game/client/prediction/entities/character.cpp b/src/game/client/prediction/entities/character.cpp
index d1c1570f13..8ce77b67e7 100644
--- a/src/game/client/prediction/entities/character.cpp
+++ b/src/game/client/prediction/entities/character.cpp
@@ -27,14 +27,14 @@ void CCharacter::SetWeapon(int W)
 void CCharacter::SetSolo(bool Solo)
 {
 	m_Core.m_Solo = Solo;
-	TeamsCore()->SetSolo(GetCID(), Solo);
+	TeamsCore()->SetSolo(GetCid(), Solo);
 }
 
 void CCharacter::SetSuper(bool Super)
 {
 	m_Core.m_Super = Super;
 	if(m_Core.m_Super)
-		TeamsCore()->Team(GetCID(), TeamsCore()->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER);
+		TeamsCore()->Team(GetCid(), TeamsCore()->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER);
 }
 
 bool CCharacter::IsGrounded()
@@ -87,7 +87,7 @@ void CCharacter::HandleJetpack()
 			float Strength = GetTuning(m_TuneZone)->m_JetpackStrength;
 			if(!m_TuneZone)
 				Strength = m_LastJetpackStrength;
-			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, GetCID(), m_Core.m_ActiveWeapon);
+			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, GetCid(), m_Core.m_ActiveWeapon);
 		}
 	}
 	}
@@ -142,7 +142,7 @@ void CCharacter::HandleNinja()
 			int Num = GameWorld()->FindEntities(OldPos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
 
 			// check that we're not in solo part
-			if(TeamsCore()->GetSolo(GetCID()))
+			if(TeamsCore()->GetSolo(GetCid()))
 				return;
 
 			for(int i = 0; i < Num; ++i)
@@ -156,17 +156,17 @@ void CCharacter::HandleNinja()
 					continue;
 
 				// Don't hit players in solo parts
-				if(TeamsCore()->GetSolo(pChr->GetCID()))
+				if(TeamsCore()->GetSolo(pChr->GetCid()))
 					return;
 
 				// make sure we haven't Hit this object before
-				bool bAlreadyHit = false;
+				bool AlreadyHit = false;
 				for(int j = 0; j < m_NumObjectsHit; j++)
 				{
-					if(m_aHitObjects[j] == pChr->GetCID())
-						bAlreadyHit = true;
+					if(m_aHitObjects[j] == pChr->GetCid())
+						AlreadyHit = true;
 				}
-				if(bAlreadyHit)
+				if(AlreadyHit)
 					continue;
 
 				// check so we are sufficiently close
@@ -176,11 +176,11 @@ void CCharacter::HandleNinja()
 				// Hit a player, give them damage and stuffs...
 				// set his velocity to fast upward (for now)
 				if(m_NumObjectsHit < 10)
-					m_aHitObjects[m_NumObjectsHit++] = pChr->GetCID();
+					m_aHitObjects[m_NumObjectsHit++] = pChr->GetCid();
 
-				CCharacter *pChar = GameWorld()->GetCharacterByID(pChr->GetCID());
+				CCharacter *pChar = GameWorld()->GetCharacterById(pChr->GetCid());
 				if(pChar)
-					pChar->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, GetCID(), WEAPON_NINJA);
+					pChar->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, GetCid(), WEAPON_NINJA);
 			}
 		}
 
@@ -312,7 +312,7 @@ void CCharacter::FireWeapon()
 		{
 			auto *pTarget = static_cast<CCharacter *>(apEnts[i]);
 
-			if((pTarget == this || !CanCollide(pTarget->GetCID())))
+			if((pTarget == this || !CanCollide(pTarget->GetCid())))
 				continue;
 
 			// set his velocity to fast upward (for now)
@@ -348,7 +348,7 @@ void CCharacter::FireWeapon()
 				Force *= Strength;
 
 			pTarget->TakeDamage(Force, g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage,
-				GetCID(), m_Core.m_ActiveWeapon);
+				GetCid(), m_Core.m_ActiveWeapon);
 			pTarget->UnFreeze();
 
 			Hits++;
@@ -372,7 +372,7 @@ void CCharacter::FireWeapon()
 			new CProjectile(
 				GameWorld(),
 				WEAPON_GUN, //Type
-				GetCID(), //Owner
+				GetCid(), //Owner
 				ProjStartPos, //Pos
 				Direction, //Dir
 				Lifetime, //Span
@@ -400,7 +400,7 @@ void CCharacter::FireWeapon()
 				new CProjectile(
 					GameWorld(),
 					WEAPON_SHOTGUN, //Type
-					GetCID(), //Owner
+					GetCid(), //Owner
 					ProjStartPos, //Pos
 					direction(a) * Speed, //Dir
 					(int)(GameWorld()->GameTickSpeed() * Tuning()->m_ShotgunLifetime), //Span
@@ -414,7 +414,7 @@ void CCharacter::FireWeapon()
 		{
 			float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
 
-			new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCID(), WEAPON_SHOTGUN);
+			new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_SHOTGUN);
 		}
 	}
 	break;
@@ -426,7 +426,7 @@ void CCharacter::FireWeapon()
 		new CProjectile(
 			GameWorld(),
 			WEAPON_GRENADE, //Type
-			GetCID(), //Owner
+			GetCid(), //Owner
 			ProjStartPos, //Pos
 			Direction, //Dir
 			Lifetime, //Span
@@ -441,7 +441,7 @@ void CCharacter::FireWeapon()
 	{
 		float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
 
-		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCID(), WEAPON_LASER);
+		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_LASER);
 	}
 	break;
 
@@ -546,6 +546,19 @@ void CCharacter::OnDirectInput(CNetObj_PlayerInput *pNewInput)
 	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
 }
 
+void CCharacter::ReleaseHook()
+{
+	m_Core.SetHookedPlayer(-1);
+	m_Core.m_HookState = HOOK_RETRACTED;
+	m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+}
+
+void CCharacter::ResetHook()
+{
+	ReleaseHook();
+	m_Core.m_HookPos = m_Core.m_Pos;
+}
+
 void CCharacter::ResetInput()
 {
 	m_Input.m_Direction = 0;
@@ -605,19 +618,19 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 
 // DDRace
 
-bool CCharacter::CanCollide(int ClientID)
+bool CCharacter::CanCollide(int ClientId)
 {
-	return TeamsCore()->CanCollide(GetCID(), ClientID);
+	return TeamsCore()->CanCollide(GetCid(), ClientId);
 }
 
-bool CCharacter::SameTeam(int ClientID)
+bool CCharacter::SameTeam(int ClientId)
 {
-	return TeamsCore()->SameTeam(GetCID(), ClientID);
+	return TeamsCore()->SameTeam(GetCid(), ClientId);
 }
 
 int CCharacter::Team()
 {
-	return TeamsCore()->Team(GetCID());
+	return TeamsCore()->Team(GetCid());
 }
 
 void CCharacter::HandleSkippableTiles(int Index)
@@ -911,11 +924,11 @@ void CCharacter::HandleTiles(int Index)
 	}
 
 	// solo part
-	if(((m_TileIndex == TILE_SOLO_ENABLE) || (m_TileFIndex == TILE_SOLO_ENABLE)) && !TeamsCore()->GetSolo(GetCID()))
+	if(((m_TileIndex == TILE_SOLO_ENABLE) || (m_TileFIndex == TILE_SOLO_ENABLE)) && !TeamsCore()->GetSolo(GetCid()))
 	{
 		SetSolo(true);
 	}
-	else if(((m_TileIndex == TILE_SOLO_DISABLE) || (m_TileFIndex == TILE_SOLO_DISABLE)) && TeamsCore()->GetSolo(GetCID()))
+	else if(((m_TileIndex == TILE_SOLO_DISABLE) || (m_TileFIndex == TILE_SOLO_DISABLE)) && TeamsCore()->GetSolo(GetCid()))
 	{
 		SetSolo(false);
 	}
@@ -1105,15 +1118,42 @@ void CCharacter::GiveAllWeapons()
 	}
 }
 
+void CCharacter::ResetVelocity()
+{
+	m_Core.m_Vel = vec2(0, 0);
+}
+
+// The method is needed only to reproduce 'shotgun bug' ddnet#5258
+// Use SetVelocity() instead.
+void CCharacter::SetVelocity(const vec2 NewVelocity)
+{
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, NewVelocity);
+}
+
+void CCharacter::SetRawVelocity(const vec2 NewVelocity)
+{
+	m_Core.m_Vel = NewVelocity;
+}
+
+void CCharacter::AddVelocity(const vec2 Addition)
+{
+	SetVelocity(m_Core.m_Vel + Addition);
+}
+
+void CCharacter::ApplyMoveRestrictions()
+{
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, m_Core.m_Vel);
+}
+
 CTeamsCore *CCharacter::TeamsCore()
 {
 	return GameWorld()->Teams();
 }
 
-CCharacter::CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended) :
+CCharacter::CCharacter(CGameWorld *pGameWorld, int Id, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_CHARACTER, vec2(0, 0), CCharacterCore::PhysicalSize())
 {
-	m_ID = ID;
+	m_Id = Id;
 	m_IsLocal = false;
 
 	m_LastWeapon = WEAPON_HAMMER;
@@ -1122,7 +1162,7 @@ CCharacter::CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar,
 	m_PrevPrevPos = m_PrevPos = m_Pos = vec2(pChar->m_X, pChar->m_Y);
 	m_Core.Reset();
 	m_Core.Init(&GameWorld()->m_Core, GameWorld()->Collision(), GameWorld()->Teams());
-	m_Core.m_Id = ID;
+	m_Core.m_Id = Id;
 	mem_zero(&m_Core.m_Ninja, sizeof(m_Core.m_Ninja));
 	m_Core.m_LeftWall = true;
 	m_ReloadTimer = 0;
@@ -1131,7 +1171,7 @@ CCharacter::CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar,
 	m_LastJetpackStrength = 400.0f;
 	m_CanMoveInFreeze = false;
 	m_TeleCheckpoint = 0;
-	m_StrongWeakID = 0;
+	m_StrongWeakId = 0;
 
 	mem_zero(&m_Input, sizeof(m_Input));
 	// never initialize both to zero
@@ -1191,7 +1231,7 @@ void CCharacter::Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtende
 		SetSuper(pExtended->m_Flags & CHARACTERFLAG_SUPER);
 
 		m_TeleCheckpoint = pExtended->m_TeleCheckpoint;
-		m_StrongWeakID = pExtended->m_StrongWeakID;
+		m_StrongWeakId = pExtended->m_StrongWeakId;
 
 		const bool Ninja = (pExtended->m_Flags & CHARACTERFLAG_WEAPON_NINJA) != 0;
 		if(Ninja && m_Core.m_ActiveWeapon != WEAPON_NINJA)
diff --git a/src/game/client/prediction/entities/character.h b/src/game/client/prediction/entities/character.h
index b424a8c9b7..cbdaed919b 100644
--- a/src/game/client/prediction/entities/character.h
+++ b/src/game/client/prediction/entities/character.h
@@ -51,6 +51,8 @@ class CCharacter : public CEntity
 
 	void OnPredictedInput(CNetObj_PlayerInput *pNewInput);
 	void OnDirectInput(CNetObj_PlayerInput *pNewInput);
+	void ReleaseHook();
+	void ResetHook();
 	void ResetInput();
 	void FireWeapon();
 
@@ -60,6 +62,12 @@ class CCharacter : public CEntity
 	void GiveNinja();
 	void RemoveNinja();
 
+	void ResetVelocity();
+	void SetVelocity(vec2 NewVelocity);
+	void SetRawVelocity(vec2 NewVelocity);
+	void AddVelocity(vec2 Addition);
+	void ApplyMoveRestrictions();
+
 	bool m_IsLocal;
 
 	CTeamsCore *TeamsCore();
@@ -68,8 +76,8 @@ class CCharacter : public CEntity
 	bool UnFreeze();
 	void GiveAllWeapons();
 	int Team();
-	bool CanCollide(int ClientID);
-	bool SameTeam(int ClientID);
+	bool CanCollide(int ClientId);
+	bool SameTeam(int ClientId);
 	bool m_NinjaJetpack;
 	int m_FreezeTime;
 	bool m_FrozenLastTick;
@@ -81,7 +89,6 @@ class CCharacter : public CEntity
 	int m_TileIndex;
 	int m_TileFIndex;
 
-	int m_MoveRestrictions;
 	bool m_LastRefillJumps;
 
 	// Setters/Getters because i don't want to modify vanilla vars access modifiers
@@ -91,7 +98,7 @@ class CCharacter : public CEntity
 	void SetActiveWeapon(int ActiveWeap);
 	CCharacterCore GetCore() { return m_Core; }
 	void SetCore(CCharacterCore Core) { m_Core = Core; }
-	CCharacterCore *Core() { return &m_Core; }
+	const CCharacterCore *Core() const { return &m_Core; }
 	bool GetWeaponGot(int Type) { return m_Core.m_aWeapons[Type].m_Got; }
 	void SetWeaponGot(int Type, bool Value) { m_Core.m_aWeapons[Type].m_Got = Value; }
 	int GetWeaponAmmo(int Type) { return m_Core.m_aWeapons[Type].m_Ammo; }
@@ -99,7 +106,7 @@ class CCharacter : public CEntity
 	void SetNinjaActivationDir(vec2 ActivationDir) { m_Core.m_Ninja.m_ActivationDir = ActivationDir; }
 	void SetNinjaActivationTick(int ActivationTick) { m_Core.m_Ninja.m_ActivationTick = ActivationTick; }
 	void SetNinjaCurrentMoveTime(int CurrentMoveTime) { m_Core.m_Ninja.m_CurrentMoveTime = CurrentMoveTime; }
-	int GetCID() { return m_ID; }
+	int GetCid() { return m_Id; }
 	void SetInput(const CNetObj_PlayerInput *pNewInput)
 	{
 		m_LatestInput = m_Input = *pNewInput;
@@ -111,9 +118,9 @@ class CCharacter : public CEntity
 	};
 	int GetJumped() { return m_Core.m_Jumped; }
 	int GetAttackTick() { return m_AttackTick; }
-	int GetStrongWeakID() { return m_StrongWeakID; }
+	int GetStrongWeakId() { return m_StrongWeakId; }
 
-	CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended = 0);
+	CCharacter(CGameWorld *pGameWorld, int Id, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended = 0);
 	void Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, bool IsLocal);
 	void SetCoreWorld(CGameWorld *pGameWorld);
 
@@ -145,6 +152,8 @@ class CCharacter : public CEntity
 	int m_ReloadTimer;
 	int m_AttackTick;
 
+	int m_MoveRestrictions;
+
 	// these are non-heldback inputs
 	CNetObj_PlayerInput m_LatestPrevInput;
 	CNetObj_PlayerInput m_LatestInput;
@@ -170,7 +179,7 @@ class CCharacter : public CEntity
 
 	CTuningParams *CharacterTuning();
 
-	int m_StrongWeakID;
+	int m_StrongWeakId;
 
 	int m_LastWeaponSwitchTick;
 	int m_LastTuneZoneTick;
diff --git a/src/game/client/prediction/entities/dragger.cpp b/src/game/client/prediction/entities/dragger.cpp
index 07aec45afc..2daba1ee20 100644
--- a/src/game/client/prediction/entities/dragger.cpp
+++ b/src/game/client/prediction/entities/dragger.cpp
@@ -66,7 +66,7 @@ void CDragger::LookForPlayersToDrag()
 				!Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
 		if(IsReachable)
 		{
-			const int &TargetClientId = pTarget->GetCID();
+			const int &TargetClientId = pTarget->GetCid();
 			int Distance = distance(pTarget->m_Pos, m_Pos);
 			if(MinDistInTeam == 0 || MinDistInTeam > Distance)
 			{
@@ -94,7 +94,7 @@ void CDragger::DraggerBeamReset()
 
 void CDragger::DraggerBeamTick()
 {
-	CCharacter *pTarget = GameWorld()->GetCharacterByID(m_TargetId);
+	CCharacter *pTarget = GameWorld()->GetCharacterById(m_TargetId);
 	if(!pTarget)
 	{
 		DraggerBeamReset();
@@ -124,16 +124,15 @@ void CDragger::DraggerBeamTick()
 	// In the center of the dragger a tee does not experience speed-up
 	else if(distance(pTarget->m_Pos, m_Pos) > 28)
 	{
-		vec2 Temp = pTarget->Core()->m_Vel + (normalize(m_Pos - pTarget->m_Pos) * m_Strength);
-		pTarget->Core()->m_Vel = ClampVel(pTarget->m_MoveRestrictions, Temp);
+		pTarget->AddVelocity(normalize(m_Pos - pTarget->m_Pos) * m_Strength);
 	}
 }
 
-CDragger::CDragger(CGameWorld *pGameWorld, int ID, const CLaserData *pData) :
+CDragger::CDragger(CGameWorld *pGameWorld, int Id, const CLaserData *pData) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_DRAGGER)
 {
 	m_Core = vec2(0.f, 0.f);
-	m_ID = ID;
+	m_Id = Id;
 	m_TargetId = -1;
 
 	m_Strength = 0;
diff --git a/src/game/client/prediction/entities/dragger.h b/src/game/client/prediction/entities/dragger.h
index 3ee35346a0..d2751fb30f 100644
--- a/src/game/client/prediction/entities/dragger.h
+++ b/src/game/client/prediction/entities/dragger.h
@@ -18,7 +18,7 @@ class CDragger : public CEntity
 	void DraggerBeamReset();
 
 public:
-	CDragger(CGameWorld *pGameWorld, int ID, const CLaserData *pData);
+	CDragger(CGameWorld *pGameWorld, int Id, const CLaserData *pData);
 	bool Match(CDragger *pDragger);
 	void Read(const CLaserData *pData);
 	float GetStrength() { return m_Strength; }
diff --git a/src/game/client/prediction/entities/laser.cpp b/src/game/client/prediction/entities/laser.cpp
index 6b0fb9247d..fdbd569fb5 100644
--- a/src/game/client/prediction/entities/laser.cpp
+++ b/src/game/client/prediction/entities/laser.cpp
@@ -31,7 +31,7 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 {
 	static const vec2 StackedLaserShotgunBugSpeed = vec2(-2147483648.0f, -2147483648.0f);
 	vec2 At;
-	CCharacter *pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+	CCharacter *pOwnerChar = GameWorld()->GetCharacterById(m_Owner);
 	CCharacter *pHit;
 	bool DontHitSelf = (g_Config.m_SvOldLaser || !GameWorld()->m_WorldConfig.m_IsDDRace) || (m_Bounces == 0);
 
@@ -47,36 +47,39 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 	m_Energy = -1;
 	if(m_Type == WEAPON_SHOTGUN)
 	{
-		vec2 Temp;
-		float Strength = GetTuning(m_TuneZone)->m_ShotgunStrength;
+		float Strength;
+		if(!m_TuneZone)
+			Strength = Tuning()->m_ShotgunStrength;
+		else
+			Strength = TuningList()[m_TuneZone].m_ShotgunStrength;
+
 		const vec2 &HitPos = pHit->Core()->m_Pos;
 		if(!g_Config.m_SvOldLaser)
 		{
 			if(m_PrevPos != HitPos)
 			{
-				Temp = pHit->Core()->m_Vel + normalize(m_PrevPos - HitPos) * Strength;
-				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+				pHit->AddVelocity(normalize(m_PrevPos - HitPos) * Strength);
 			}
 			else
 			{
-				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+				pHit->SetRawVelocity(StackedLaserShotgunBugSpeed);
 			}
 		}
 		else if(g_Config.m_SvOldLaser && pOwnerChar)
 		{
 			if(pOwnerChar->Core()->m_Pos != HitPos)
 			{
-				Temp = pHit->Core()->m_Vel + normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength;
-				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+				pHit->AddVelocity(normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength);
 			}
 			else
 			{
-				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+				pHit->SetRawVelocity(StackedLaserShotgunBugSpeed);
 			}
 		}
 		else
 		{
-			pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, pHit->Core()->m_Vel);
+			// Re-apply move restrictions as a part of 'shotgun bug' reproduction
+			pHit->ApplyMoveRestrictions();
 		}
 	}
 	else if(m_Type == WEAPON_LASER)
@@ -175,7 +178,7 @@ void CLaser::Tick()
 	}
 }
 
-CLaser::CLaser(CGameWorld *pGameWorld, int ID, CLaserData *pLaser) :
+CLaser::CLaser(CGameWorld *pGameWorld, int Id, CLaserData *pLaser) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
 {
 	m_Pos = pLaser->m_To;
@@ -194,7 +197,7 @@ CLaser::CLaser(CGameWorld *pGameWorld, int ID, CLaserData *pLaser) :
 		m_Energy = 0;
 	m_Type = pLaser->m_Type == LASERTYPE_SHOTGUN ? WEAPON_SHOTGUN : WEAPON_LASER;
 	m_PrevPos = m_From;
-	m_ID = ID;
+	m_Id = Id;
 }
 
 bool CLaser::Match(CLaser *pLaser)
diff --git a/src/game/client/prediction/entities/laser.h b/src/game/client/prediction/entities/laser.h
index 3bf8e27373..d8d2f2101d 100644
--- a/src/game/client/prediction/entities/laser.h
+++ b/src/game/client/prediction/entities/laser.h
@@ -19,7 +19,7 @@ class CLaser : public CEntity
 	const vec2 &GetFrom() { return m_From; }
 	const int &GetOwner() { return m_Owner; }
 	const int &GetEvalTick() { return m_EvalTick; }
-	CLaser(CGameWorld *pGameWorld, int ID, CLaserData *pLaser);
+	CLaser(CGameWorld *pGameWorld, int Id, CLaserData *pLaser);
 	bool Match(CLaser *pLaser);
 	CLaserData GetData() const;
 
diff --git a/src/game/client/prediction/entities/pickup.cpp b/src/game/client/prediction/entities/pickup.cpp
index 86f66e55cb..ff25b70081 100644
--- a/src/game/client/prediction/entities/pickup.cpp
+++ b/src/game/client/prediction/entities/pickup.cpp
@@ -144,7 +144,7 @@ void CPickup::Move()
 	}
 }
 
-CPickup::CPickup(CGameWorld *pGameWorld, int ID, const CPickupData *pPickup) :
+CPickup::CPickup(CGameWorld *pGameWorld, int Id, const CPickupData *pPickup) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_PICKUP, vec2(0, 0), gs_PickupPhysSize)
 {
 	m_Pos = pPickup->m_Pos;
@@ -152,7 +152,7 @@ CPickup::CPickup(CGameWorld *pGameWorld, int ID, const CPickupData *pPickup) :
 	m_Subtype = pPickup->m_Subtype;
 	m_Core = vec2(0.f, 0.f);
 	m_IsCoreActive = false;
-	m_ID = ID;
+	m_Id = Id;
 	m_Number = pPickup->m_SwitchNumber;
 	m_Layer = m_Number > 0 ? LAYER_SWITCH : LAYER_GAME;
 }
diff --git a/src/game/client/prediction/entities/pickup.h b/src/game/client/prediction/entities/pickup.h
index 1fd4395da7..f73fcf689d 100644
--- a/src/game/client/prediction/entities/pickup.h
+++ b/src/game/client/prediction/entities/pickup.h
@@ -14,7 +14,7 @@ class CPickup : public CEntity
 
 	void Tick() override;
 
-	CPickup(CGameWorld *pGameWorld, int ID, const CPickupData *pPickup);
+	CPickup(CGameWorld *pGameWorld, int Id, const CPickupData *pPickup);
 	void FillInfo(CNetObj_Pickup *pPickup);
 	bool Match(CPickup *pPickup);
 	bool InDDNetTile() { return m_IsCoreActive; }
diff --git a/src/game/client/prediction/entities/projectile.cpp b/src/game/client/prediction/entities/projectile.cpp
index 832717b8be..700da69372 100644
--- a/src/game/client/prediction/entities/projectile.cpp
+++ b/src/game/client/prediction/entities/projectile.cpp
@@ -78,7 +78,7 @@ void CProjectile::Tick()
 	vec2 ColPos;
 	vec2 NewPos;
 	int Collide = Collision()->IntersectLine(PrevPos, CurPos, &ColPos, &NewPos);
-	CCharacter *pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+	CCharacter *pOwnerChar = GameWorld()->GetCharacterById(m_Owner);
 
 	CCharacter *pTargetChr = GameWorld()->IntersectCharacter(PrevPos, ColPos, m_Freeze ? 1.0f : 6.0f, ColPos, pOwnerChar, m_Owner);
 
@@ -140,7 +140,7 @@ void CProjectile::Tick()
 		if(m_Explosive)
 		{
 			if(m_Owner >= 0)
-				pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+				pOwnerChar = GameWorld()->GetCharacterById(m_Owner);
 
 			GameWorld()->CreateExplosion(ColPos, m_Owner, m_Type, m_Owner == -1, (!pOwnerChar ? -1 : pOwnerChar->Team()), CClientMask().set());
 		}
@@ -155,7 +155,7 @@ void CProjectile::SetBouncing(int Value)
 	m_Bouncing = Value;
 }
 
-CProjectile::CProjectile(CGameWorld *pGameWorld, int ID, const CProjectileData *pProj) :
+CProjectile::CProjectile(CGameWorld *pGameWorld, int Id, const CProjectileData *pProj) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_PROJECTILE)
 {
 	m_Pos = pProj->m_StartPos;
@@ -190,7 +190,7 @@ CProjectile::CProjectile(CGameWorld *pGameWorld, int ID, const CProjectileData *
 	else if(m_Type == WEAPON_SHOTGUN && !GameWorld()->m_WorldConfig.m_IsDDRace)
 		Lifetime = GetTuning(m_TuneZone)->m_ShotgunLifetime * GameWorld()->GameTickSpeed();
 	m_LifeSpan = Lifetime - (pGameWorld->GameTick() - m_StartTick);
-	m_ID = ID;
+	m_Id = Id;
 	m_Number = pProj->m_SwitchNumber;
 	m_Layer = m_Number > 0 ? LAYER_SWITCH : LAYER_GAME;
 }
diff --git a/src/game/client/prediction/entities/projectile.h b/src/game/client/prediction/entities/projectile.h
index c296fe1665..950a96faf2 100644
--- a/src/game/client/prediction/entities/projectile.h
+++ b/src/game/client/prediction/entities/projectile.h
@@ -37,7 +37,7 @@ class CProjectile : public CEntity
 	const vec2 &GetDirection() { return m_Direction; }
 	const int &GetOwner() { return m_Owner; }
 	const int &GetStartTick() { return m_StartTick; }
-	CProjectile(CGameWorld *pGameWorld, int ID, const CProjectileData *pProj);
+	CProjectile(CGameWorld *pGameWorld, int Id, const CProjectileData *pProj);
 
 private:
 	vec2 m_Direction;
diff --git a/src/game/client/prediction/entity.cpp b/src/game/client/prediction/entity.cpp
index e90bc7b768..3b3b14b065 100644
--- a/src/game/client/prediction/entity.cpp
+++ b/src/game/client/prediction/entity.cpp
@@ -17,7 +17,7 @@ CEntity::CEntity(CGameWorld *pGameWorld, int ObjType, vec2 Pos, int ProximityRad
 	m_ProximityRadius = ProximityRadius;
 
 	m_MarkedForDestroy = false;
-	m_ID = -1;
+	m_Id = -1;
 
 	m_pPrevTypeEntity = 0;
 	m_pNextTypeEntity = 0;
diff --git a/src/game/client/prediction/entity.h b/src/game/client/prediction/entity.h
index 364d0141b8..940d724a57 100644
--- a/src/game/client/prediction/entity.h
+++ b/src/game/client/prediction/entity.h
@@ -21,11 +21,11 @@ class CEntity
 protected:
 	CGameWorld *m_pGameWorld;
 	bool m_MarkedForDestroy;
-	int m_ID;
+	int m_Id;
 	int m_ObjType;
 
 public:
-	int GetID() const { return m_ID; }
+	int GetId() const { return m_Id; }
 
 	CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0);
 	virtual ~CEntity();
@@ -66,7 +66,7 @@ class CEntity
 
 	CEntity()
 	{
-		m_ID = -1;
+		m_Id = -1;
 		m_pGameWorld = 0;
 	}
 };
diff --git a/src/game/client/prediction/gameworld.cpp b/src/game/client/prediction/gameworld.cpp
index a2fb701236..cecffb9b8f 100644
--- a/src/game/client/prediction/gameworld.cpp
+++ b/src/game/client/prediction/gameworld.cpp
@@ -112,11 +112,11 @@ void CGameWorld::InsertEntity(CEntity *pEnt, bool Last)
 	if(pEnt->m_ObjType == ENTTYPE_CHARACTER)
 	{
 		auto *pChar = (CCharacter *)pEnt;
-		int ID = pChar->GetCID();
-		if(ID >= 0 && ID < MAX_CLIENTS)
+		int Id = pChar->GetCid();
+		if(Id >= 0 && Id < MAX_CLIENTS)
 		{
-			m_apCharacters[ID] = pChar;
-			m_Core.m_apCharacters[ID] = pChar->Core();
+			m_apCharacters[Id] = pChar;
+			m_Core.m_apCharacters[Id] = &pChar->m_Core;
 		}
 		pChar->SetCoreWorld(this);
 	}
@@ -159,11 +159,11 @@ void CGameWorld::RemoveEntity(CEntity *pEnt)
 
 void CGameWorld::RemoveCharacter(CCharacter *pChar)
 {
-	int ID = pChar->GetCID();
-	if(ID >= 0 && ID < MAX_CLIENTS)
+	int Id = pChar->GetCid();
+	if(Id >= 0 && Id < MAX_CLIENTS)
 	{
-		m_apCharacters[ID] = 0;
-		m_Core.m_apCharacters[ID] = 0;
+		m_apCharacters[Id] = 0;
+		m_Core.m_apCharacters[Id] = 0;
 	}
 }
 
@@ -304,17 +304,14 @@ std::vector<CCharacter *> CGameWorld::IntersectedCharacters(vec2 Pos0, vec2 Pos1
 	return vpCharacters;
 }
 
-void CGameWorld::ReleaseHooked(int ClientID)
+void CGameWorld::ReleaseHooked(int ClientId)
 {
 	CCharacter *pChr = (CCharacter *)CGameWorld::FindFirst(CGameWorld::ENTTYPE_CHARACTER);
 	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
 	{
-		CCharacterCore *pCore = pChr->Core();
-		if(pCore->HookedPlayer() == ClientID)
+		if(pChr->Core()->HookedPlayer() == ClientId && !pChr->IsSuper())
 		{
-			pCore->SetHookedPlayer(-1);
-			pCore->m_HookState = HOOK_RETRACTED;
-			pCore->m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+			pChr->ReleaseHook();
 		}
 	}
 }
@@ -324,10 +321,10 @@ CTuningParams *CGameWorld::Tuning()
 	return &m_Core.m_aTuning[g_Config.m_ClDummy];
 }
 
-CEntity *CGameWorld::GetEntity(int ID, int EntityType)
+CEntity *CGameWorld::GetEntity(int Id, int EntityType)
 {
 	for(CEntity *pEnt = m_apFirstEntityTypes[EntityType]; pEnt; pEnt = pEnt->m_pNextTypeEntity)
-		if(pEnt->m_ID == ID)
+		if(pEnt->m_Id == Id)
 			return pEnt;
 	return 0;
 }
@@ -352,35 +349,35 @@ void CGameWorld::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage,
 			ForceDir = normalize(Diff);
 		l = 1 - clamp((l - InnerRadius) / (Radius - InnerRadius), 0.0f, 1.0f);
 		float Strength;
-		if(Owner == -1 || !GetCharacterByID(Owner))
+		if(Owner == -1 || !GetCharacterById(Owner))
 			Strength = Tuning()->m_ExplosionStrength;
 		else
-			Strength = GetCharacterByID(Owner)->Tuning()->m_ExplosionStrength;
+			Strength = GetCharacterById(Owner)->Tuning()->m_ExplosionStrength;
 
 		float Dmg = Strength * l;
 		if((int)Dmg)
-			if((GetCharacterByID(Owner) ? !GetCharacterByID(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit || NoDamage) || Owner == pChar->GetCID())
+			if((GetCharacterById(Owner) ? !GetCharacterById(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit || NoDamage) || Owner == pChar->GetCid())
 			{
 				if(Owner != -1 && !pChar->CanCollide(Owner))
 					continue;
 				if(Owner == -1 && ActivatedTeam != -1 && pChar->Team() != ActivatedTeam)
 					continue;
 				pChar->TakeDamage(ForceDir * Dmg * 2, (int)Dmg, Owner, Weapon);
-				if(GetCharacterByID(Owner) ? GetCharacterByID(Owner)->GrenadeHitDisabled() : !g_Config.m_SvHit || NoDamage)
+				if(GetCharacterById(Owner) ? GetCharacterById(Owner)->GrenadeHitDisabled() : !g_Config.m_SvHit || NoDamage)
 					break;
 			}
 	}
 }
 
-bool CGameWorld::IsLocalTeam(int OwnerID) const
+bool CGameWorld::IsLocalTeam(int OwnerId) const
 {
-	return OwnerID < 0 || m_Teams.CanCollide(m_LocalClientID, OwnerID);
+	return OwnerId < 0 || m_Teams.CanCollide(m_LocalClientId, OwnerId);
 }
 
-void CGameWorld::NetObjBegin(CTeamsCore Teams, int LocalClientID)
+void CGameWorld::NetObjBegin(CTeamsCore Teams, int LocalClientId)
 {
 	m_Teams = Teams;
-	m_LocalClientID = LocalClientID;
+	m_LocalClientId = LocalClientId;
 
 	for(int i = 0; i < NUM_ENTTYPES; i++)
 		for(CEntity *pEnt = FindFirst(i); pEnt; pEnt = pEnt->TypeNext())
@@ -392,19 +389,19 @@ void CGameWorld::NetObjBegin(CTeamsCore Teams, int LocalClientID)
 	OnModified();
 }
 
-void CGameWorld::NetCharAdd(int ObjID, CNetObj_Character *pCharObj, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal)
+void CGameWorld::NetCharAdd(int ObjId, CNetObj_Character *pCharObj, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal)
 {
-	if(IsLocalTeam(ObjID))
+	if(IsLocalTeam(ObjId))
 	{
 		CCharacter *pChar;
-		if((pChar = (CCharacter *)GetEntity(ObjID, ENTTYPE_CHARACTER)))
+		if((pChar = (CCharacter *)GetEntity(ObjId, ENTTYPE_CHARACTER)))
 		{
 			pChar->Read(pCharObj, pExtended, IsLocal);
 			pChar->Keep();
 		}
 		else
 		{
-			pChar = new CCharacter(this, ObjID, pCharObj, pExtended);
+			pChar = new CCharacter(this, ObjId, pCharObj, pExtended);
 			InsertEntity(pChar);
 		}
 
@@ -413,7 +410,7 @@ void CGameWorld::NetCharAdd(int ObjID, CNetObj_Character *pCharObj, CNetObj_DDNe
 	}
 }
 
-void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx)
+void CGameWorld::NetObjAdd(int ObjId, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx)
 {
 	if((ObjType == NETOBJTYPE_PROJECTILE || ObjType == NETOBJTYPE_DDRACEPROJECTILE || ObjType == NETOBJTYPE_DDNETPROJECTILE) && m_WorldConfig.m_PredictWeapons)
 	{
@@ -421,12 +418,12 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 		if(!IsLocalTeam(Data.m_Owner))
 			return;
 
-		CProjectile NetProj = CProjectile(this, ObjID, &Data);
+		CProjectile NetProj = CProjectile(this, ObjId, &Data);
 
 		if(NetProj.m_Type != WEAPON_SHOTGUN && absolute(length(NetProj.m_Direction) - 1.f) > 0.02f) // workaround to skip grenades on ball mod
 			return;
 
-		if(CProjectile *pProj = (CProjectile *)GetEntity(ObjID, ENTTYPE_PROJECTILE))
+		if(CProjectile *pProj = (CProjectile *)GetEntity(ObjId, ENTTYPE_PROJECTILE))
 		{
 			if(NetProj.Match(pProj))
 			{
@@ -441,9 +438,9 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 			// try to match the newly received (unrecognized) projectile with a locally fired one
 			for(CProjectile *pProj = (CProjectile *)FindFirst(CGameWorld::ENTTYPE_PROJECTILE); pProj; pProj = (CProjectile *)pProj->TypeNext())
 			{
-				if(pProj->m_ID == -1 && NetProj.Match(pProj))
+				if(pProj->m_Id == -1 && NetProj.Match(pProj))
 				{
-					pProj->m_ID = ObjID;
+					pProj->m_Id = ObjId;
 					pProj->Keep();
 					return;
 				}
@@ -467,7 +464,7 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 						Second = Dist;
 				}
 				if(pClosest && maximum(First, 2.f) * 1.2f < Second)
-					NetProj.m_Owner = pClosest->m_ID;
+					NetProj.m_Owner = pClosest->m_Id;
 			}
 		}
 		CProjectile *pProj = new CProjectile(NetProj);
@@ -476,8 +473,8 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 	else if((ObjType == NETOBJTYPE_PICKUP || ObjType == NETOBJTYPE_DDNETPICKUP) && m_WorldConfig.m_PredictWeapons)
 	{
 		CPickupData Data = ExtractPickupInfo(ObjType, pObjData, pDataEx);
-		CPickup NetPickup = CPickup(this, ObjID, &Data);
-		if(CPickup *pPickup = (CPickup *)GetEntity(ObjID, ENTTYPE_PICKUP))
+		CPickup NetPickup = CPickup(this, ObjId, &Data);
+		if(CPickup *pPickup = (CPickup *)GetEntity(ObjId, ENTTYPE_PICKUP))
 		{
 			if(NetPickup.Match(pPickup))
 			{
@@ -499,9 +496,9 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 
 		if(Data.m_Type == LASERTYPE_RIFLE || Data.m_Type == LASERTYPE_SHOTGUN || Data.m_Type < 0)
 		{
-			CLaser NetLaser = CLaser(this, ObjID, &Data);
+			CLaser NetLaser = CLaser(this, ObjId, &Data);
 			CLaser *pMatching = 0;
-			if(CLaser *pLaser = dynamic_cast<CLaser *>(GetEntity(ObjID, ENTTYPE_LASER)))
+			if(CLaser *pLaser = dynamic_cast<CLaser *>(GetEntity(ObjId, ENTTYPE_LASER)))
 				if(NetLaser.Match(pLaser))
 					pMatching = pLaser;
 			if(!pMatching)
@@ -509,10 +506,10 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 				for(CEntity *pEnt = FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->TypeNext())
 				{
 					auto *const pLaser = dynamic_cast<CLaser *>(pEnt);
-					if(pLaser && pLaser->m_ID == -1 && NetLaser.Match(pLaser))
+					if(pLaser && pLaser->m_Id == -1 && NetLaser.Match(pLaser))
 					{
 						pMatching = pLaser;
-						pMatching->m_ID = ObjID;
+						pMatching->m_Id = ObjId;
 						break;
 					}
 				}
@@ -530,10 +527,10 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
 		}
 		else if(Data.m_Type == LASERTYPE_DRAGGER)
 		{
-			CDragger NetDragger = CDragger(this, ObjID, &Data);
+			CDragger NetDragger = CDragger(this, ObjId, &Data);
 			if(NetDragger.GetStrength() > 0)
 			{
-				auto *pDragger = dynamic_cast<CDragger *>(GetEntity(ObjID, ENTTYPE_DRAGGER));
+				auto *pDragger = dynamic_cast<CDragger *>(GetEntity(ObjId, ENTTYPE_DRAGGER));
 				if(pDragger && NetDragger.Match(pDragger))
 				{
 					pDragger->Keep();
@@ -551,13 +548,13 @@ void CGameWorld::NetObjEnd()
 {
 	// keep predicting hooked characters, based on hook position
 	for(int i = 0; i < MAX_CLIENTS; i++)
-		if(CCharacter *pChar = GetCharacterByID(i))
+		if(CCharacter *pChar = GetCharacterById(i))
 			if(!pChar->m_MarkedForDestroy)
-				if(CCharacter *pHookedChar = GetCharacterByID(pChar->m_Core.HookedPlayer()))
+				if(CCharacter *pHookedChar = GetCharacterById(pChar->m_Core.HookedPlayer()))
 					if(pHookedChar->m_MarkedForDestroy)
 					{
 						pHookedChar->m_Pos = pHookedChar->m_Core.m_Pos = pChar->m_Core.m_HookPos;
-						pHookedChar->m_Core.m_Vel = vec2(0, 0);
+						pHookedChar->ResetVelocity();
 						mem_zero(&pHookedChar->m_SavedInput, sizeof(pHookedChar->m_SavedInput));
 						pHookedChar->m_SavedInput.m_TargetY = -1;
 						pHookedChar->m_KeepHooked = true;
@@ -573,11 +570,11 @@ void CGameWorld::NetObjEnd()
 	}
 	for(CCharacter *pChar = (CCharacter *)FindFirst(ENTTYPE_CHARACTER); pChar; pChar = (CCharacter *)pChar->TypeNext())
 	{
-		int ID = pChar->GetCID();
-		if(ID >= 0 && ID < MAX_CLIENTS)
+		int Id = pChar->GetCid();
+		if(Id >= 0 && Id < MAX_CLIENTS)
 		{
-			m_apCharacters[ID] = pChar;
-			m_Core.m_apCharacters[ID] = pChar->Core();
+			m_apCharacters[Id] = pChar;
+			m_Core.m_apCharacters[Id] = &pChar->m_Core;
 		}
 	}
 }
@@ -636,14 +633,14 @@ void CGameWorld::CopyWorld(CGameWorld *pFrom)
 	m_IsValidCopy = true;
 }
 
-CEntity *CGameWorld::FindMatch(int ObjID, int ObjType, const void *pObjData)
+CEntity *CGameWorld::FindMatch(int ObjId, int ObjType, const void *pObjData)
 {
 	switch(ObjType)
 	{
 	case NETOBJTYPE_CHARACTER:
 	{
-		CCharacter *pEnt = (CCharacter *)GetEntity(ObjID, ENTTYPE_CHARACTER);
-		if(pEnt && CCharacter(this, ObjID, (CNetObj_Character *)pObjData).Match((CCharacter *)pEnt))
+		CCharacter *pEnt = (CCharacter *)GetEntity(ObjId, ENTTYPE_CHARACTER);
+		if(pEnt && CCharacter(this, ObjId, (CNetObj_Character *)pObjData).Match(pEnt))
 		{
 			return pEnt;
 		}
@@ -654,8 +651,8 @@ CEntity *CGameWorld::FindMatch(int ObjID, int ObjType, const void *pObjData)
 	case NETOBJTYPE_DDNETPROJECTILE:
 	{
 		CProjectileData Data = ExtractProjectileInfo(ObjType, pObjData, this, nullptr);
-		CProjectile *pEnt = (CProjectile *)GetEntity(ObjID, ENTTYPE_PROJECTILE);
-		if(pEnt && CProjectile(this, ObjID, &Data).Match(pEnt))
+		CProjectile *pEnt = (CProjectile *)GetEntity(ObjId, ENTTYPE_PROJECTILE);
+		if(pEnt && CProjectile(this, ObjId, &Data).Match(pEnt))
 		{
 			return pEnt;
 		}
@@ -667,16 +664,16 @@ CEntity *CGameWorld::FindMatch(int ObjID, int ObjType, const void *pObjData)
 		CLaserData Data = ExtractLaserInfo(ObjType, pObjData, this, nullptr);
 		if(Data.m_Type == LASERTYPE_RIFLE || Data.m_Type == LASERTYPE_SHOTGUN)
 		{
-			CLaser *pEnt = (CLaser *)GetEntity(ObjID, ENTTYPE_LASER);
-			if(pEnt && CLaser(this, ObjID, &Data).Match(pEnt))
+			CLaser *pEnt = (CLaser *)GetEntity(ObjId, ENTTYPE_LASER);
+			if(pEnt && CLaser(this, ObjId, &Data).Match(pEnt))
 			{
 				return pEnt;
 			}
 		}
 		else if(Data.m_Type == LASERTYPE_DRAGGER)
 		{
-			CDragger *pEnt = (CDragger *)GetEntity(ObjID, ENTTYPE_DRAGGER);
-			if(pEnt && CDragger(this, ObjID, &Data).Match(pEnt))
+			CDragger *pEnt = (CDragger *)GetEntity(ObjId, ENTTYPE_DRAGGER);
+			if(pEnt && CDragger(this, ObjId, &Data).Match(pEnt))
 			{
 				return pEnt;
 			}
@@ -687,8 +684,8 @@ CEntity *CGameWorld::FindMatch(int ObjID, int ObjType, const void *pObjData)
 	case NETOBJTYPE_DDNETPICKUP:
 	{
 		CPickupData Data = ExtractPickupInfo(ObjType, pObjData, nullptr);
-		CPickup *pEnt = (CPickup *)GetEntity(ObjID, ENTTYPE_PICKUP);
-		if(pEnt && CPickup(this, ObjID, &Data).Match(pEnt))
+		CPickup *pEnt = (CPickup *)GetEntity(ObjId, ENTTYPE_PICKUP);
+		if(pEnt && CPickup(this, ObjId, &Data).Match(pEnt))
 		{
 			return pEnt;
 		}
diff --git a/src/game/client/prediction/gameworld.h b/src/game/client/prediction/gameworld.h
index 18be1fc258..78d6403084 100644
--- a/src/game/client/prediction/gameworld.h
+++ b/src/game/client/prediction/gameworld.h
@@ -47,7 +47,7 @@ class CGameWorld
 	void Tick();
 
 	// DDRace
-	void ReleaseHooked(int ClientID);
+	void ReleaseHooked(int ClientId);
 	std::vector<CCharacter *> IntersectedCharacters(vec2 Pos0, vec2 Pos1, float Radius, const CEntity *pNotThis = nullptr);
 
 	int m_GameTick;
@@ -60,8 +60,8 @@ class CGameWorld
 	CTeamsCore *Teams() { return &m_Teams; }
 	std::vector<SSwitchers> &Switchers() { return m_Core.m_vSwitchers; }
 	CTuningParams *Tuning();
-	CEntity *GetEntity(int ID, int EntityType);
-	CCharacter *GetCharacterByID(int ID) { return (ID >= 0 && ID < MAX_CLIENTS) ? m_apCharacters[ID] : nullptr; }
+	CEntity *GetEntity(int Id, int EntityType);
+	CCharacter *GetCharacterById(int Id) { return (Id >= 0 && Id < MAX_CLIENTS) ? m_apCharacters[Id] : nullptr; }
 
 	// from gamecontext
 	void CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask);
@@ -87,16 +87,16 @@ class CGameWorld
 	CGameWorld *m_pParent;
 	CGameWorld *m_pChild;
 
-	int m_LocalClientID;
+	int m_LocalClientId;
 
-	bool IsLocalTeam(int OwnerID) const;
+	bool IsLocalTeam(int OwnerId) const;
 	void OnModified() const;
-	void NetObjBegin(CTeamsCore Teams, int LocalClientID);
-	void NetCharAdd(int ObjID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal);
-	void NetObjAdd(int ObjID, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx);
+	void NetObjBegin(CTeamsCore Teams, int LocalClientId);
+	void NetCharAdd(int ObjId, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal);
+	void NetObjAdd(int ObjId, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx);
 	void NetObjEnd();
 	void CopyWorld(CGameWorld *pFrom);
-	CEntity *FindMatch(int ObjID, int ObjType, const void *pObjData);
+	CEntity *FindMatch(int ObjId, int ObjType, const void *pObjData);
 	void Clear();
 
 	CTuningParams *m_pTuningList;
@@ -115,31 +115,36 @@ class CGameWorld
 class CCharOrder
 {
 public:
-	std::list<int> m_IDs; // reverse of the order in the gameworld, since entities will be inserted in reverse
+	std::list<int> m_Ids; // reverse of the order in the gameworld, since entities will be inserted in reverse
 	CCharOrder()
 	{
+		Reset();
+	}
+	void Reset()
+	{
+		m_Ids.clear();
 		for(int i = 0; i < MAX_CLIENTS; i++)
-			m_IDs.push_back(i);
+			m_Ids.push_back(i);
 	}
 	void GiveStrong(int c)
 	{
 		if(0 <= c && c < MAX_CLIENTS)
 		{
-			m_IDs.remove(c);
-			m_IDs.push_front(c);
+			m_Ids.remove(c);
+			m_Ids.push_front(c);
 		}
 	}
 	void GiveWeak(int c)
 	{
 		if(0 <= c && c < MAX_CLIENTS)
 		{
-			m_IDs.remove(c);
-			m_IDs.push_back(c);
+			m_Ids.remove(c);
+			m_Ids.push_back(c);
 		}
 	}
 	bool HasStrongAgainst(int From, int To)
 	{
-		for(int i : m_IDs)
+		for(int i : m_Ids)
 		{
 			if(i == To)
 				return false;
diff --git a/src/game/client/projectile_data.cpp b/src/game/client/projectile_data.cpp
index 45387a4526..9bf7cdf8bf 100644
--- a/src/game/client/projectile_data.cpp
+++ b/src/game/client/projectile_data.cpp
@@ -104,9 +104,8 @@ CProjectileData ExtractProjectileInfoDDNet(const CNetObj_DDNetProjectile *pProj)
 	return Result;
 }
 
-void SnapshotRemoveExtraProjectileInfo(unsigned char *pData)
+void SnapshotRemoveExtraProjectileInfo(CSnapshot *pSnap)
 {
-	CSnapshot *pSnap = (CSnapshot *)pData;
 	for(int Index = 0; Index < pSnap->NumItems(); Index++)
 	{
 		const CSnapshotItem *pItem = pSnap->GetItem(Index);
diff --git a/src/game/client/race.cpp b/src/game/client/race.cpp
index d71c4a3ab2..2b5c5f4ef6 100644
--- a/src/game/client/race.cpp
+++ b/src/game/client/race.cpp
@@ -1,12 +1,39 @@
 #include <cctype>
-#include <list>
+#include <vector>
 
 #include <game/client/gameclient.h>
+#include <game/collision.h>
 #include <game/mapitems.h>
 
 #include "race.h"
 
-int CRaceHelper::ms_aFlagIndex[2] = {-1, -1};
+void CRaceHelper::Init(const CGameClient *pGameClient)
+{
+	m_pGameClient = pGameClient;
+
+	m_aFlagIndex[TEAM_RED] = -1;
+	m_aFlagIndex[TEAM_BLUE] = -1;
+
+	const CTile *pGameTiles = m_pGameClient->Collision()->GameLayer();
+	const int MapSize = m_pGameClient->Collision()->GetWidth() * m_pGameClient->Collision()->GetHeight();
+	for(int Index = 0; Index < MapSize; Index++)
+	{
+		const int EntityIndex = pGameTiles[Index].m_Index - ENTITY_OFFSET;
+		if(EntityIndex == ENTITY_FLAGSTAND_RED)
+		{
+			m_aFlagIndex[TEAM_RED] = Index;
+			if(m_aFlagIndex[TEAM_BLUE] != -1)
+				break; // Found both flags
+		}
+		else if(EntityIndex == ENTITY_FLAGSTAND_BLUE)
+		{
+			m_aFlagIndex[TEAM_BLUE] = Index;
+			if(m_aFlagIndex[TEAM_RED] != -1)
+				break; // Found both flags
+		}
+		Index += pGameTiles[Index].m_Skip;
+	}
+}
 
 int CRaceHelper::TimeFromSecondsStr(const char *pStr)
 {
@@ -66,30 +93,32 @@ int CRaceHelper::TimeFromFinishMessage(const char *pStr, char *pNameBuf, int Nam
 	return TimeFromStr(pFinished + str_length(s_pFinishedStr));
 }
 
-bool CRaceHelper::IsStart(CGameClient *pClient, vec2 Prev, vec2 Pos)
+bool CRaceHelper::IsStart(vec2 Prev, vec2 Pos) const
 {
-	CCollision *pCollision = pClient->Collision();
-	if(pClient->m_GameInfo.m_FlagStartsRace)
+	if(m_pGameClient->m_GameInfo.m_FlagStartsRace)
 	{
-		int EnemyTeam = pClient->m_aClients[pClient->m_Snap.m_LocalClientID].m_Team ^ 1;
-		return ms_aFlagIndex[EnemyTeam] != -1 && distance(Pos, pCollision->GetPos(ms_aFlagIndex[EnemyTeam])) < 32;
+		int EnemyTeam = m_pGameClient->m_aClients[m_pGameClient->m_Snap.m_LocalClientId].m_Team ^ 1;
+		return m_aFlagIndex[EnemyTeam] != -1 && distance(Pos, m_pGameClient->Collision()->GetPos(m_aFlagIndex[EnemyTeam])) < 32;
 	}
 	else
 	{
-		std::vector<int> vIndices = pCollision->GetMapIndices(Prev, Pos);
+		std::vector<int> vIndices = m_pGameClient->Collision()->GetMapIndices(Prev, Pos);
 		if(!vIndices.empty())
-			for(int &Indice : vIndices)
+		{
+			for(const int Index : vIndices)
 			{
-				if(pCollision->GetTileIndex(Indice) == TILE_START)
+				if(m_pGameClient->Collision()->GetTileIndex(Index) == TILE_START)
 					return true;
-				if(pCollision->GetFTileIndex(Indice) == TILE_START)
+				if(m_pGameClient->Collision()->GetFTileIndex(Index) == TILE_START)
 					return true;
 			}
+		}
 		else
 		{
-			if(pCollision->GetTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START)
+			const int Index = m_pGameClient->Collision()->GetPureMapIndex(Pos);
+			if(m_pGameClient->Collision()->GetTileIndex(Index) == TILE_START)
 				return true;
-			if(pCollision->GetFTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START)
+			if(m_pGameClient->Collision()->GetFTileIndex(Index) == TILE_START)
 				return true;
 		}
 	}
diff --git a/src/game/client/race.h b/src/game/client/race.h
index ae82461b46..b9b67ec647 100644
--- a/src/game/client/race.h
+++ b/src/game/client/race.h
@@ -3,17 +3,23 @@
 
 #include <base/vmath.h>
 
+class CGameClient;
+
 class CRaceHelper
 {
+	const CGameClient *m_pGameClient;
+
+	int m_aFlagIndex[2] = {-1, -1};
+
 public:
-	static int ms_aFlagIndex[2];
+	void Init(const CGameClient *pGameClient);
 
 	// these functions return the time in milliseconds, time -1 is invalid
 	static int TimeFromSecondsStr(const char *pStr); // x.xxx
 	static int TimeFromStr(const char *pStr); // x minute(s) x.xxx second(s)
 	static int TimeFromFinishMessage(const char *pStr, char *pNameBuf, int NameBufSize); // xxx finished in: x minute(s) x.xxx second(s)
 
-	static bool IsStart(class CGameClient *pClient, vec2 Prev, vec2 Pos);
+	bool IsStart(vec2 Prev, vec2 Pos) const;
 };
 
 #endif // GAME_CLIENT_RACE_H
diff --git a/src/game/client/render.cpp b/src/game/client/render.cpp
index de198c3d95..b9f9018ddb 100644
--- a/src/game/client/render.cpp
+++ b/src/game/client/render.cpp
@@ -13,6 +13,7 @@
 #include <game/generated/client_data.h>
 #include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
 
 #include <game/mapitems.h>
 
@@ -57,14 +58,14 @@ void CRenderTools::Init(IGraphics *pGraphics, ITextRender *pTextRender)
 	Graphics()->QuadContainerUpload(m_TeeQuadContainerIndex);
 }
 
-void CRenderTools::SelectSprite(CDataSprite *pSpr, int Flags, int sx, int sy) const
+void CRenderTools::SelectSprite(const CDataSprite *pSprite, int Flags) const
 {
-	int x = pSpr->m_X + sx;
-	int y = pSpr->m_Y + sy;
-	int w = pSpr->m_W;
-	int h = pSpr->m_H;
-	int cx = pSpr->m_pSet->m_Gridx;
-	int cy = pSpr->m_pSet->m_Gridy;
+	int x = pSprite->m_X;
+	int y = pSprite->m_Y;
+	int w = pSprite->m_W;
+	int h = pSprite->m_H;
+	int cx = pSprite->m_pSet->m_Gridx;
+	int cy = pSprite->m_pSet->m_Gridy;
 
 	GetSpriteScaleImpl(w, h, gs_SpriteWScale, gs_SpriteHScale);
 
@@ -82,11 +83,16 @@ void CRenderTools::SelectSprite(CDataSprite *pSpr, int Flags, int sx, int sy) co
 	Graphics()->QuadsSetSubset(x1, y1, x2, y2);
 }
 
-void CRenderTools::SelectSprite(int Id, int Flags, int sx, int sy) const
+void CRenderTools::SelectSprite(int Id, int Flags) const
 {
-	if(Id < 0 || Id >= g_pData->m_NumSprites)
-		return;
-	SelectSprite(&g_pData->m_aSprites[Id], Flags, sx, sy);
+	dbg_assert(Id >= 0 && Id < g_pData->m_NumSprites, "Id invalid");
+	SelectSprite(&g_pData->m_aSprites[Id], Flags);
+}
+
+void CRenderTools::SelectSprite7(int Id, int Flags) const
+{
+	dbg_assert(Id >= 0 && Id < client_data7::g_pData->m_NumSprites, "Id invalid");
+	SelectSprite(&client_data7::g_pData->m_aSprites[Id], Flags);
 }
 
 void CRenderTools::GetSpriteScale(const CDataSprite *pSprite, float &ScaleX, float &ScaleY) const
@@ -262,26 +268,263 @@ void CRenderTools::GetRenderTeeOffsetToRenderedTee(const CAnimState *pAnim, cons
 	TeeOffsetToMid.y = -MidOfRendered;
 }
 
-void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha, bool Ext, int ClientID, bool InAir)
+void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha) const
+{
+	if(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_BODY].IsValid())
+		RenderTee7(pAnim, pInfo, Emote, Dir, Pos, Alpha);
+	else
+		RenderTee6(pAnim, pInfo, Emote, Dir, Pos, Alpha);
+
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->QuadsSetRotation(0);
+}
+
+void CRenderTools::RenderTee7(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha) const
 {
 	vec2 Direction = Dir;
 	vec2 Position = Pos;
+	bool IsBot = false;
 
-	const CSkin::SSkinTextures *pSkinTextures = pInfo->m_CustomColoredSkin ? &pInfo->m_ColorableRenderSkin : &pInfo->m_OriginalRenderSkin;
+	// first pass we draw the outline
+	// second pass we draw the filling
+	for(int Pass = 0; Pass < 2; Pass++)
+	{
+		bool OutLine = Pass == 0;
+
+		for(int Filling = 0; Filling < 2; Filling++)
+		{
+			float AnimScale = pInfo->m_Size * 1.0f / 64.0f;
+			float BaseSize = pInfo->m_Size;
+			if(Filling == 1)
+			{
+				vec2 BodyPos = Position + vec2(pAnim->GetBody()->m_X, pAnim->GetBody()->m_Y) * AnimScale;
+				IGraphics::CQuadItem BodyItem(BodyPos.x, BodyPos.y, BaseSize, BaseSize);
+				IGraphics::CQuadItem BotItem(BodyPos.x + (2.f / 3.f) * AnimScale, BodyPos.y + (-16 + 2.f / 3.f) * AnimScale, BaseSize, BaseSize); // x+0.66, y+0.66 to correct some rendering bug
+				IGraphics::CQuadItem Item;
+
+				// draw bot visuals (background)
+				if(IsBot && !OutLine)
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_BotTexture);
+					Graphics()->QuadsBegin();
+					Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+					SelectSprite7(client_data7::SPRITE_TEE_BOT_BACKGROUND);
+					Item = BotItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					Graphics()->QuadsEnd();
+				}
+
+				// draw bot visuals (foreground)
+				if(IsBot && !OutLine)
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_BotTexture);
+					Graphics()->QuadsBegin();
+					Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+					SelectSprite7(client_data7::SPRITE_TEE_BOT_FOREGROUND);
+					Item = BotItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_BotColor;
+					Color.a = Alpha;
+					Graphics()->SetColor(Color);
+					SelectSprite7(client_data7::SPRITE_TEE_BOT_GLOW);
+					Item = BotItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					Graphics()->QuadsEnd();
+				}
+
+				// draw decoration
+				if(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_DECORATION].IsValid())
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_DECORATION]);
+					Graphics()->QuadsBegin();
+					Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+					ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_DECORATION];
+					Color.a = Alpha;
+					Graphics()->SetColor(Color);
+					SelectSprite7(OutLine ? client_data7::SPRITE_TEE_DECORATION_OUTLINE : client_data7::SPRITE_TEE_DECORATION);
+					Item = BodyItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					Graphics()->QuadsEnd();
+				}
 
-	static vec2 s_aFootPositions[MAX_CLIENTS][2];
+				// draw body (behind marking)
+				Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_BODY]);
+				Graphics()->QuadsBegin();
+				Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+				if(OutLine)
+				{
+					Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+					SelectSprite7(client_data7::SPRITE_TEE_BODY_OUTLINE);
+				}
+				else
+				{
+					ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_BODY];
+					Color.a = Alpha;
+					Graphics()->SetColor(Color);
+					SelectSprite7(client_data7::SPRITE_TEE_BODY);
+				}
+				Item = BodyItem;
+				Graphics()->QuadsDraw(&Item, 1);
+				Graphics()->QuadsEnd();
+
+				// draw marking
+				if(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_MARKING].IsValid() && !OutLine)
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_MARKING]);
+					Graphics()->QuadsBegin();
+					Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+					ColorRGBA MarkingColor = pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_MARKING];
+					Graphics()->SetColor(MarkingColor.r * MarkingColor.a, MarkingColor.g * MarkingColor.a, MarkingColor.b * MarkingColor.a, MarkingColor.a * Alpha);
+					SelectSprite7(client_data7::SPRITE_TEE_MARKING);
+					Item = BodyItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					Graphics()->QuadsEnd();
+				}
+
+				// draw body (in front of marking)
+				if(!OutLine)
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_BODY]);
+					Graphics()->QuadsBegin();
+					Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+					Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+					for(int t = 0; t < 2; t++)
+					{
+						SelectSprite7(t == 0 ? client_data7::SPRITE_TEE_BODY_SHADOW : client_data7::SPRITE_TEE_BODY_UPPER_OUTLINE);
+						Item = BodyItem;
+						Graphics()->QuadsDraw(&Item, 1);
+					}
+					Graphics()->QuadsEnd();
+				}
+
+				// draw eyes
+				Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_EYES]);
+				Graphics()->QuadsBegin();
+				Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+				if(IsBot)
+				{
+					ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_BotColor;
+					Color.a = Alpha;
+					Graphics()->SetColor(Color);
+					Emote = EMOTE_SURPRISE;
+				}
+				else
+				{
+					ColorRGBA Color = pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_EYES];
+					Color.a = Alpha;
+					Graphics()->SetColor(Color);
+				}
+				if(Pass == 1)
+				{
+					switch(Emote)
+					{
+					case EMOTE_PAIN:
+						SelectSprite7(client_data7::SPRITE_TEE_EYES_PAIN);
+						break;
+					case EMOTE_HAPPY:
+						SelectSprite7(client_data7::SPRITE_TEE_EYES_HAPPY);
+						break;
+					case EMOTE_SURPRISE:
+						SelectSprite7(client_data7::SPRITE_TEE_EYES_SURPRISE);
+						break;
+					case EMOTE_ANGRY:
+						SelectSprite7(client_data7::SPRITE_TEE_EYES_ANGRY);
+						break;
+					default:
+						SelectSprite7(client_data7::SPRITE_TEE_EYES_NORMAL);
+						break;
+					}
+
+					float EyeScale = BaseSize * 0.60f;
+					float h = Emote == EMOTE_BLINK ? BaseSize * 0.15f / 2.0f : EyeScale / 2.0f;
+					vec2 Offset = vec2(Direction.x * 0.125f, -0.05f + Direction.y * 0.10f) * BaseSize;
+					IGraphics::CQuadItem QuadItem(BodyPos.x + Offset.x, BodyPos.y + Offset.y, EyeScale, h);
+					Graphics()->QuadsDraw(&QuadItem, 1);
+				}
+				Graphics()->QuadsEnd();
+
+				// draw xmas hat
+				if(!OutLine && pInfo->m_aSixup[g_Config.m_ClDummy].m_HatTexture.IsValid())
+				{
+					Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_HatTexture);
+					Graphics()->QuadsBegin();
+					Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+					Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+					int Flag = Direction.x < 0.0f ? SPRITE_FLAG_FLIP_X : 0;
+					switch(pInfo->m_aSixup[g_Config.m_ClDummy].m_HatSpriteIndex)
+					{
+					case 0:
+						SelectSprite7(client_data7::SPRITE_TEE_HATS_TOP1, Flag);
+						break;
+					case 1:
+						SelectSprite7(client_data7::SPRITE_TEE_HATS_TOP2, Flag);
+						break;
+					case 2:
+						SelectSprite7(client_data7::SPRITE_TEE_HATS_SIDE1, Flag);
+						break;
+					case 3:
+						SelectSprite7(client_data7::SPRITE_TEE_HATS_SIDE2, Flag);
+					}
+					Item = BodyItem;
+					Graphics()->QuadsDraw(&Item, 1);
+					Graphics()->QuadsEnd();
+				}
+			}
+
+			// draw feet
+			Graphics()->TextureSet(pInfo->m_aSixup[g_Config.m_ClDummy].m_aTextures[protocol7::SKINPART_FEET]);
+			Graphics()->QuadsBegin();
+			const CAnimKeyframe *pFoot = Filling ? pAnim->GetFrontFoot() : pAnim->GetBackFoot();
+
+			float w = BaseSize / 2.1f;
+			float h = w;
+
+			Graphics()->QuadsSetRotation(pFoot->m_Angle * pi * 2);
+
+			if(OutLine)
+			{
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+				SelectSprite7(client_data7::SPRITE_TEE_FOOT_OUTLINE);
+			}
+			else
+			{
+				bool Indicate = !pInfo->m_GotAirJump && g_Config.m_ClAirjumpindicator;
+				float ColorScale = 1.0f;
+				if(Indicate)
+					ColorScale = 0.5f;
+				Graphics()->SetColor(
+					pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_FEET].r * ColorScale,
+					pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_FEET].g * ColorScale,
+					pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_FEET].b * ColorScale,
+					pInfo->m_aSixup[g_Config.m_ClDummy].m_aColors[protocol7::SKINPART_FEET].a * Alpha);
+				SelectSprite7(client_data7::SPRITE_TEE_FOOT);
+			}
+
+			IGraphics::CQuadItem QuadItem(Position.x + pFoot->m_X * AnimScale, Position.y + pFoot->m_Y * AnimScale, w, h);
+			Graphics()->QuadsDraw(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+	}
+}
+
+void CRenderTools::RenderTee6(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha) const
+{
+	vec2 Direction = Dir;
+	vec2 Position = Pos;
+
+	const CSkin::SSkinTextures *pSkinTextures = pInfo->m_CustomColoredSkin ? &pInfo->m_ColorableRenderSkin : &pInfo->m_OriginalRenderSkin;
 
 	// first pass we draw the outline
 	// second pass we draw the filling
-	for(int p = 0; p < 2; p++)
+	for(int Pass = 0; Pass < 2; Pass++)
 	{
-		int OutLine = p == 0 ? 1 : 0;
+		int OutLine = Pass == 0 ? 1 : 0;
 
-		for(int f = 0; f < 2; f++)
+		for(int Filling = 0; Filling < 2; Filling++)
 		{
 			float AnimScale, BaseSize;
 			GetRenderTeeAnimScaleAndBaseSize(pInfo, AnimScale, BaseSize);
-			if(f == 1)
+			if(Filling == 1)
 			{
 				Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
 
@@ -294,7 +537,7 @@ void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInf
 				Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, OutLine, BodyPos.x, BodyPos.y, BodyScale, BodyScale);
 
 				// draw eyes
-				if(p == 1)
+				if(Pass == 1)
 				{
 					int QuadOffset = 2;
 					int EyeQuadOffset = 0;
@@ -335,7 +578,7 @@ void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInf
 			}
 
 			// draw feet
-			const CAnimKeyframe *pFoot = f ? pAnim->GetFrontFoot() : pAnim->GetBackFoot();
+			const CAnimKeyframe *pFoot = Filling ? pAnim->GetFrontFoot() : pAnim->GetBackFoot();
 
 			float w = BaseSize;
 			float h = BaseSize / 2;
@@ -360,22 +603,12 @@ void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInf
 
 			Graphics()->SetColor(pInfo->m_ColorFeet.r * ColorScale, pInfo->m_ColorFeet.g * ColorScale, pInfo->m_ColorFeet.b * ColorScale, Alpha);
 
-			vec2 FootPos = vec2(Position.x + pFoot->m_X * AnimScale, Position.y + pFoot->m_Y * AnimScale);
-			if(Ext)
-			{
-				if(s_aFootPositions[ClientID][f] != vec2())
-					FootPos = mix(s_aFootPositions[ClientID][f], FootPos, 1.f / 100.f * g_Config.m_ClAnimFeetSpeed);
-				s_aFootPositions[ClientID][f] = FootPos;
-			}
-
 			Graphics()->TextureSet(OutLine == 1 ? pSkinTextures->m_FeetOutline : pSkinTextures->m_Feet);
-			Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, QuadOffset, FootPos.x, FootPos.y, w / 64.f, h / 32.f);
+			Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, QuadOffset, Position.x + pFoot->m_X * AnimScale, Position.y + pFoot->m_Y * AnimScale, w / 64.f, h / 32.f);
 		}
 	}
-
-	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
-	Graphics()->QuadsSetRotation(0);
 }
+
 void CRenderTools::CalcScreenParams(float Aspect, float Zoom, float *pWidth, float *pHeight)
 {
 	const float Amount = 1150 * 1000;
diff --git a/src/game/client/render.h b/src/game/client/render.h
index 1d4242932f..17d8ccfa74 100644
--- a/src/game/client/render.h
+++ b/src/game/client/render.h
@@ -3,11 +3,14 @@
 #ifndef GAME_CLIENT_RENDER_H
 #define GAME_CLIENT_RENDER_H
 
+#include <engine/client/enums.h>
+
 #include <base/color.h>
 #include <base/vmath.h>
 
 #include <game/client/skin.h>
 #include <game/client/ui_rect.h>
+#include <game/generated/protocol7.h>
 
 class CAnimState;
 class CSpeedupTile;
@@ -25,6 +28,8 @@ struct CEnvPointBezier_upstream;
 struct CMapItemGroup;
 struct CQuad;
 
+#include <game/generated/protocol.h>
+
 class CTeeRenderInfo
 {
 public:
@@ -46,6 +51,17 @@ class CTeeRenderInfo
 		m_GotAirJump = true;
 		m_TeeRenderFlags = 0;
 		m_FeetFlipped = false;
+
+		for(auto &Sixup : m_aSixup)
+			Sixup.Reset();
+	}
+
+	void Apply(const CSkin *pSkin)
+	{
+		m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+		m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+		m_BloodColor = pSkin->m_BloodColor;
+		m_SkinMetrics = pSkin->m_Metrics;
 	}
 
 	CSkin::SSkinTextures m_OriginalRenderSkin;
@@ -62,6 +78,44 @@ class CTeeRenderInfo
 	bool m_GotAirJump;
 	int m_TeeRenderFlags;
 	bool m_FeetFlipped;
+
+	bool Valid() const
+	{
+		return m_CustomColoredSkin ? m_ColorableRenderSkin.m_Body.IsValid() : m_OriginalRenderSkin.m_Body.IsValid();
+	}
+
+	class CSixup
+	{
+	public:
+		void Reset()
+		{
+			for(auto &Texture : m_aTextures)
+				Texture = IGraphics::CTextureHandle();
+			m_BotTexture = IGraphics::CTextureHandle();
+			for(ColorRGBA &PartColor : m_aColors)
+			{
+				PartColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+			m_HatSpriteIndex = 0;
+			m_BotColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+		bool Valid() const
+		{
+			for(const auto &Texture : m_aTextures)
+				if(!Texture.IsValid())
+					return false;
+			return true;
+		}
+
+		IGraphics::CTextureHandle m_aTextures[protocol7::NUM_SKINPARTS];
+		ColorRGBA m_aColors[protocol7::NUM_SKINPARTS];
+		IGraphics::CTextureHandle m_HatTexture;
+		IGraphics::CTextureHandle m_BotTexture;
+		int m_HatSpriteIndex;
+		ColorRGBA m_BotColor;
+	};
+
+	CSixup m_aSixup[NUM_DUMMIES];
 };
 
 // Tee Render Flags
@@ -112,7 +166,7 @@ class CMapBasedEnvelopePointAccess : public IEnvelopePointAccess
 	const CEnvPointBezier *GetBezier(int Index) const override;
 };
 
-typedef void (*ENVELOPE_EVAL)(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
+typedef void (*ENVELOPE_EVAL)(int TimeOffsetMillis, int Env, ColorRGBA &Result, size_t Channels, void *pUser);
 
 class CRenderTools
 {
@@ -121,8 +175,13 @@ class CRenderTools
 
 	int m_TeeQuadContainerIndex;
 
-	void GetRenderTeeBodyScale(float BaseSize, float &BodyScale);
-	void GetRenderTeeFeetScale(float BaseSize, float &FeetScaleWidth, float &FeetScaleHeight);
+	static void GetRenderTeeBodyScale(float BaseSize, float &BodyScale);
+	static void GetRenderTeeFeetScale(float BaseSize, float &FeetScaleWidth, float &FeetScaleHeight);
+
+	void SelectSprite(const CDataSprite *pSprite, int Flags) const;
+
+	void RenderTee6(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha = 1.0f) const;
+	void RenderTee7(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha = 1.0f) const;
 
 public:
 	class IGraphics *Graphics() const { return m_pGraphics; }
@@ -130,8 +189,8 @@ class CRenderTools
 
 	void Init(class IGraphics *pGraphics, class ITextRender *pTextRender);
 
-	void SelectSprite(CDataSprite *pSprite, int Flags = 0, int sx = 0, int sy = 0) const;
-	void SelectSprite(int Id, int Flags = 0, int sx = 0, int sy = 0) const;
+	void SelectSprite(int Id, int Flags = 0) const;
+	void SelectSprite7(int Id, int Flags = 0) const;
 
 	void GetSpriteScale(const CDataSprite *pSprite, float &ScaleX, float &ScaleY) const;
 	void GetSpriteScale(int Id, float &ScaleX, float &ScaleY) const;
@@ -147,24 +206,24 @@ class CRenderTools
 	int QuadContainerAddSprite(int QuadContainerIndex, float X, float Y, float Width, float Height) const;
 
 	// larger rendering methods
-	void GetRenderTeeBodySize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &BodyOffset, float &Width, float &Height);
-	void GetRenderTeeFeetSize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &FeetOffset, float &Width, float &Height);
-	void GetRenderTeeAnimScaleAndBaseSize(const CTeeRenderInfo *pInfo, float &AnimScale, float &BaseSize);
+	static void GetRenderTeeBodySize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &BodyOffset, float &Width, float &Height);
+	static void GetRenderTeeFeetSize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &FeetOffset, float &Width, float &Height);
+	static void GetRenderTeeAnimScaleAndBaseSize(const CTeeRenderInfo *pInfo, float &AnimScale, float &BaseSize);
 
 	// returns the offset to use, to render the tee with @see RenderTee exactly in the mid
-	void GetRenderTeeOffsetToRenderedTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &TeeOffsetToMid);
+	static void GetRenderTeeOffsetToRenderedTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &TeeOffsetToMid);
 	// object render methods
-	void RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha = 1.0f, bool Ext = false, int ClientID = -1, bool InAir = false);
+	void RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha = 1.0f) const;
 
 	// map render methods (render_map.cpp)
-	static void RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int Channels, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result);
+	static void RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result, size_t Channels);
 	void RenderQuads(CQuad *pQuads, int NumQuads, int Flags, ENVELOPE_EVAL pfnEval, void *pUser) const;
 	void ForceRenderQuads(CQuad *pQuads, int NumQuads, int Flags, ENVELOPE_EVAL pfnEval, void *pUser, float Alpha = 1.0f) const;
-	void RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const;
+	void RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const;
 
 	// render a rectangle made of IndexIn tiles, over a background made of IndexOut tiles
 	// the rectangle include all tiles in [RectX, RectX+RectW-1] x [RectY, RectY+RectH-1]
-	void RenderTileRectangle(int RectX, int RectY, int RectW, int RectH, unsigned char IndexIn, unsigned char IndexOut, float Scale, ColorRGBA Color, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const;
+	void RenderTileRectangle(int RectX, int RectY, int RectW, int RectH, unsigned char IndexIn, unsigned char IndexOut, float Scale, ColorRGBA Color, int RenderFlags) const;
 
 	// helpers
 	void CalcScreenParams(float Aspect, float Zoom, float *pWidth, float *pHeight);
@@ -175,16 +234,14 @@ class CRenderTools
 
 	// DDRace
 
-	void RenderGameTileOutlines(CTile *pTiles, int w, int h, float Scale, int TileType, float Alpha = 1.0f);
-	void RenderTeleOutlines(CTile *pTiles, CTeleTile *pTele, int w, int h, float Scale, float Alpha = 1.0f);
-	void RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha = 1.0f);
-	void RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha = 1.0f);
-	void RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha = 1.0f);
-	void RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha = 1.0f);
-	void RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
-	void RenderSpeedupmap(CSpeedupTile *pSpeedup, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
-	void RenderSwitchmap(CSwitchTile *pSwitch, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
-	void RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
+	void RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha = 1.0f) const;
+	void RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha = 1.0f) const;
+	void RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha = 1.0f) const;
+	void RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha = 1.0f) const;
+	void RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const;
+	void RenderSpeedupmap(CSpeedupTile *pSpeedup, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const;
+	void RenderSwitchmap(CSwitchTile *pSwitch, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const;
+	void RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const;
 };
 
 #endif
diff --git a/src/game/client/render_map.cpp b/src/game/client/render_map.cpp
index d684fc62c3..f096a773d2 100644
--- a/src/game/client/render_map.cpp
+++ b/src/game/client/render_map.cpp
@@ -124,13 +124,6 @@ const CEnvPointBezier *CMapBasedEnvelopePointAccess::GetBezier(int Index) const
 	return nullptr;
 }
 
-static void ValidateFCurve(const vec2 &p0, vec2 &p1, vec2 &p2, const vec2 &p3)
-{
-	// validate the bezier curve
-	p1.x = clamp(p1.x, p0.x, p3.x);
-	p2.x = clamp(p2.x, p0.x, p3.x);
-}
-
 static double CubicRoot(double x)
 {
 	if(x == 0.0)
@@ -143,11 +136,6 @@ static double CubicRoot(double x)
 
 static float SolveBezier(float x, float p0, float p1, float p2, float p3)
 {
-	// check for valid f-curve
-	// we only take care of monotonic bezier curves, so there has to be exactly 1 real solution
-	if(!(p0 <= x && x <= p3) || !(p0 <= p1 && p1 <= p3) || !(p0 <= p2 && p2 <= p3))
-		return 0.0f;
-
 	const double x3 = -p0 + 3.0 * p1 - 3.0 * p2 + p3;
 	const double x2 = 3.0 * p0 - 6.0 * p1 + 3.0 * p2;
 	const double x1 = -3.0 * p0 + 3.0 * p1;
@@ -167,7 +155,7 @@ static float SolveBezier(float x, float p0, float p1, float p2, float p3)
 	else if(x3 == 0.0)
 	{
 		// quadratic
-		// t * t + b * t +c = 0
+		// t * t + b * t + c = 0
 		const double b = x1 / x2;
 		const double c = x0 / x2;
 
@@ -179,7 +167,7 @@ static float SolveBezier(float x, float p0, float p1, float p2, float p3)
 
 		const double t = (-b + SqrtD) / 2.0;
 
-		if(0.0 <= t && t <= 1.0001f)
+		if(0.0 <= t && t <= 1.0001)
 			return t;
 		return (-b - SqrtD) / 2.0;
 	}
@@ -213,46 +201,45 @@ static float SolveBezier(float x, float p0, float p1, float p2, float p3)
 			const double s = CubicRoot(-q);
 			const double t = 2.0 * s - sub;
 
-			if(0.0 <= t && t <= 1.0001f)
+			if(0.0 <= t && t <= 1.0001)
 				return t;
 			return (-s - sub);
 		}
 		else
 		{
-			// Casus irreductibilis ... ,_,
+			// Casus irreducibilis ... ,_,
 			const double phi = std::acos(-q / std::sqrt(-(p * p * p))) / 3.0;
 			const double s = 2.0 * std::sqrt(-p);
 
 			const double t1 = s * std::cos(phi) - sub;
 
-			if(0.0 <= t1 && t1 <= 1.0001f)
+			if(0.0 <= t1 && t1 <= 1.0001)
 				return t1;
 
 			const double t2 = -s * std::cos(phi + pi / 3.0) - sub;
 
-			if(0.0 <= t2 && t2 <= 1.0001f)
+			if(0.0 <= t2 && t2 <= 1.0001)
 				return t2;
 			return -s * std::cos(phi - pi / 3.0) - sub;
 		}
 	}
 }
 
-void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int Channels, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result)
+void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result, size_t Channels)
 {
 	const int NumPoints = pPoints->NumPoints();
 	if(NumPoints == 0)
 	{
-		Result = ColorRGBA();
 		return;
 	}
 
 	if(NumPoints == 1)
 	{
 		const CEnvPoint *pFirstPoint = pPoints->GetPoint(0);
-		Result.r = fx2f(pFirstPoint->m_aValues[0]);
-		Result.g = fx2f(pFirstPoint->m_aValues[1]);
-		Result.b = fx2f(pFirstPoint->m_aValues[2]);
-		Result.a = fx2f(pFirstPoint->m_aValues[3]);
+		for(size_t c = 0; c < Channels; c++)
+		{
+			Result[c] = fx2f(pFirstPoint->m_aValues[c]);
+		}
 		return;
 	}
 
@@ -268,7 +255,7 @@ void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int C
 	{
 		const CEnvPoint *pCurrentPoint = pPoints->GetPoint(i);
 		const CEnvPoint *pNextPoint = pPoints->GetPoint(i + 1);
-		if(TimeMillis >= pCurrentPoint->m_Time && TimeMillis <= pNextPoint->m_Time)
+		if(TimeMillis >= pCurrentPoint->m_Time && TimeMillis < pNextPoint->m_Time)
 		{
 			const float Delta = pNextPoint->m_Time - pCurrentPoint->m_Time;
 			float a = (float)(TimeMillis - pCurrentPoint->m_Time) / Delta;
@@ -298,22 +285,24 @@ void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int C
 				const CEnvPointBezier *pNextPointBezier = pPoints->GetBezier(i + 1);
 				if(pCurrentPointBezier == nullptr || pNextPointBezier == nullptr)
 					break; // fallback to linear
-				for(int c = 0; c < Channels; c++)
+				for(size_t c = 0; c < Channels; c++)
 				{
 					// monotonic 2d cubic bezier curve
-					const vec2 p0 = vec2(pCurrentPoint->m_Time / 1000.0f, fx2f(pCurrentPoint->m_aValues[c]));
-					const vec2 p3 = vec2(pNextPoint->m_Time / 1000.0f, fx2f(pNextPoint->m_aValues[c]));
+					const vec2 p0 = vec2(pCurrentPoint->m_Time, fx2f(pCurrentPoint->m_aValues[c]));
+					const vec2 p3 = vec2(pNextPoint->m_Time, fx2f(pNextPoint->m_aValues[c]));
+
+					const vec2 OutTang = vec2(pCurrentPointBezier->m_aOutTangentDeltaX[c], fx2f(pCurrentPointBezier->m_aOutTangentDeltaY[c]));
+					const vec2 InTang = vec2(pNextPointBezier->m_aInTangentDeltaX[c], fx2f(pNextPointBezier->m_aInTangentDeltaY[c]));
 
-					const vec2 OutTang = vec2(pCurrentPointBezier->m_aOutTangentDeltaX[c] / 1000.0f, fx2f(pCurrentPointBezier->m_aOutTangentDeltaY[c]));
-					const vec2 InTang = -vec2(pNextPointBezier->m_aInTangentDeltaX[c] / 1000.0f, fx2f(pNextPointBezier->m_aInTangentDeltaY[c]));
 					vec2 p1 = p0 + OutTang;
-					vec2 p2 = p3 - InTang;
+					vec2 p2 = p3 + InTang;
 
 					// validate bezier curve
-					ValidateFCurve(p0, p1, p2, p3);
+					p1.x = clamp(p1.x, p0.x, p3.x);
+					p2.x = clamp(p2.x, p0.x, p3.x);
 
 					// solve x(a) = time for a
-					a = clamp(SolveBezier(TimeMillis / 1000.0f, p0.x, p1.x, p2.x, p3.x), 0.0f, 1.0f);
+					a = clamp(SolveBezier(TimeMillis, p0.x, p1.x, p2.x, p3.x), 0.0f, 1.0f);
 
 					// value = y(t)
 					Result[c] = bezier(p0.y, p1.y, p2.y, p3.y, a);
@@ -326,7 +315,7 @@ void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int C
 				break;
 			}
 
-			for(int c = 0; c < Channels; c++)
+			for(size_t c = 0; c < Channels; c++)
 			{
 				const float v0 = fx2f(pCurrentPoint->m_aValues[c]);
 				const float v1 = fx2f(pNextPoint->m_aValues[c]);
@@ -337,13 +326,13 @@ void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int C
 		}
 	}
 
-	Result.r = fx2f(pLastPoint->m_aValues[0]);
-	Result.g = fx2f(pLastPoint->m_aValues[1]);
-	Result.b = fx2f(pLastPoint->m_aValues[2]);
-	Result.a = fx2f(pLastPoint->m_aValues[3]);
+	for(size_t c = 0; c < Channels; c++)
+	{
+		Result[c] = fx2f(pLastPoint->m_aValues[c]);
+	}
 }
 
-static void Rotate(CPoint *pCenter, CPoint *pPoint, float Rotation)
+static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)
 {
 	int x = pPoint->x - pCenter->x;
 	int y = pPoint->y - pCenter->y;
@@ -367,13 +356,10 @@ void CRenderTools::ForceRenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags
 	{
 		CQuad *pQuad = &pQuads[i];
 
-		ColorRGBA Color(1.f, 1.f, 1.f, 1.f);
-		if(pQuad->m_ColorEnv >= 0)
-		{
-			pfnEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, pUser);
-		}
+		ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		pfnEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, 4, pUser);
 
-		if(Color.a <= 0)
+		if(Color.a <= 0.0f)
 			continue;
 
 		bool Opaque = false;
@@ -392,19 +378,10 @@ void CRenderTools::ForceRenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags
 			fx2f(pQuad->m_aTexcoords[2].x), fx2f(pQuad->m_aTexcoords[2].y),
 			fx2f(pQuad->m_aTexcoords[3].x), fx2f(pQuad->m_aTexcoords[3].y));
 
-		float OffsetX = 0;
-		float OffsetY = 0;
-		float Rot = 0;
-
-		// TODO: fix this
-		if(pQuad->m_PosEnv >= 0)
-		{
-			ColorRGBA Channels;
-			pfnEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Channels, pUser);
-			OffsetX = Channels.r;
-			OffsetY = Channels.g;
-			Rot = Channels.b / 360.0f * pi * 2;
-		}
+		ColorRGBA Position = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+		pfnEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Position, 3, pUser);
+		const vec2 Offset = vec2(Position.r, Position.g);
+		const float Rotation = Position.b / 180.0f * pi;
 
 		IGraphics::CColorVertex Array[4] = {
 			IGraphics::CColorVertex(0, pQuad->m_aColors[0].r * Conv * Color.r, pQuad->m_aColors[0].g * Conv * Color.g, pQuad->m_aColors[0].b * Conv * Color.b, pQuad->m_aColors[0].a * Conv * Color.a * Alpha),
@@ -415,26 +392,22 @@ void CRenderTools::ForceRenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags
 
 		CPoint *pPoints = pQuad->m_aPoints;
 
-		if(Rot != 0)
+		CPoint aRotated[4];
+		if(Rotation != 0.0f)
 		{
-			static CPoint aRotated[4];
-			aRotated[0] = pQuad->m_aPoints[0];
-			aRotated[1] = pQuad->m_aPoints[1];
-			aRotated[2] = pQuad->m_aPoints[2];
-			aRotated[3] = pQuad->m_aPoints[3];
+			for(size_t p = 0; p < std::size(aRotated); ++p)
+			{
+				aRotated[p] = pQuad->m_aPoints[p];
+				Rotate(&pQuad->m_aPoints[4], &aRotated[p], Rotation);
+			}
 			pPoints = aRotated;
-
-			Rotate(&pQuad->m_aPoints[4], &aRotated[0], Rot);
-			Rotate(&pQuad->m_aPoints[4], &aRotated[1], Rot);
-			Rotate(&pQuad->m_aPoints[4], &aRotated[2], Rot);
-			Rotate(&pQuad->m_aPoints[4], &aRotated[3], Rot);
 		}
 
 		IGraphics::CFreeformItem Freeform(
-			fx2f(pPoints[0].x) + OffsetX, fx2f(pPoints[0].y) + OffsetY,
-			fx2f(pPoints[1].x) + OffsetX, fx2f(pPoints[1].y) + OffsetY,
-			fx2f(pPoints[2].x) + OffsetX, fx2f(pPoints[2].y) + OffsetY,
-			fx2f(pPoints[3].x) + OffsetX, fx2f(pPoints[3].y) + OffsetY);
+			fx2f(pPoints[0].x) + Offset.x, fx2f(pPoints[0].y) + Offset.y,
+			fx2f(pPoints[1].x) + Offset.x, fx2f(pPoints[1].y) + Offset.y,
+			fx2f(pPoints[2].x) + Offset.x, fx2f(pPoints[2].y) + Offset.y,
+			fx2f(pPoints[3].x) + Offset.x, fx2f(pPoints[3].y) + Offset.y);
 		Graphics()->QuadsDrawFreeform(&Freeform, 1);
 	}
 	Graphics()->TrianglesEnd();
@@ -442,8 +415,7 @@ void CRenderTools::ForceRenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags
 
 void CRenderTools::RenderTileRectangle(int RectX, int RectY, int RectW, int RectH,
 	unsigned char IndexIn, unsigned char IndexOut,
-	float Scale, ColorRGBA Color, int RenderFlags,
-	ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const
+	float Scale, ColorRGBA Color, int RenderFlags) const
 {
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
@@ -453,17 +425,11 @@ void CRenderTools::RenderTileRectangle(int RectX, int RectY, int RectW, int Rect
 	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
 	float FinalTilesetScale = FinalTileSize / TilePixelSize;
 
-	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
-	if(ColorEnv >= 0)
-	{
-		pfnEval(ColorEnvOffset, ColorEnv, Channels, pUser);
-	}
-
 	if(Graphics()->HasTextureArraysSupport())
 		Graphics()->QuadsTex3DBegin();
 	else
 		Graphics()->QuadsBegin();
-	Graphics()->SetColor(Color.r * Channels.r, Color.g * Channels.g, Color.b * Channels.b, Color.a * Channels.a);
+	Graphics()->SetColor(Color);
 
 	int StartY = (int)(ScreenY0 / Scale) - 1;
 	int StartX = (int)(ScreenX0 / Scale) - 1;
@@ -540,8 +506,7 @@ void CRenderTools::RenderTileRectangle(int RectX, int RectY, int RectW, int Rect
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags,
-	ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const
+void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const
 {
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
@@ -551,17 +516,12 @@ void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, Color
 	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
 	float FinalTilesetScale = FinalTileSize / TilePixelSize;
 
-	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
-	if(ColorEnv >= 0)
-	{
-		pfnEval(ColorEnvOffset, ColorEnv, Channels, pUser);
-	}
-
 	if(Graphics()->HasTextureArraysSupport())
 		Graphics()->QuadsTex3DBegin();
 	else
 		Graphics()->QuadsBegin();
-	Graphics()->SetColor(Color.r * Channels.r, Color.g * Channels.g, Color.b * Channels.b, Color.a * Channels.a);
+	Graphics()->SetColor(Color);
+	const bool ColorOpaque = Color.a > 254.0f / 255.0f;
 
 	int StartY = (int)(ScreenY0 / Scale) - 1;
 	int StartX = (int)(ScreenX0 / Scale) - 1;
@@ -611,7 +571,7 @@ void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, Color
 				unsigned char Flags = pTiles[c].m_Flags;
 
 				bool Render = false;
-				if(Flags & TILEFLAG_OPAQUE && Color.a * Channels.a > 254.0f / 255.0f)
+				if(ColorOpaque && Flags & TILEFLAG_OPAQUE)
 				{
 					if(RenderFlags & LAYERRENDERFLAG_OPAQUE)
 						Render = true;
@@ -707,333 +667,7 @@ void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, Color
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderGameTileOutlines(CTile *pTiles, int w, int h, float Scale, int TileType, float Alpha)
-{
-	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
-	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-
-	int StartY = (int)(ScreenY0 / Scale) - 1;
-	int StartX = (int)(ScreenX0 / Scale) - 1;
-	int EndY = (int)(ScreenY1 / Scale) + 1;
-	int EndX = (int)(ScreenX1 / Scale) + 1;
-	int MaxScale = 12;
-	if(EndX - StartX > Graphics()->ScreenWidth() / MaxScale || EndY - StartY > Graphics()->ScreenHeight() / MaxScale)
-	{
-		int EdgeX = (EndX - StartX) - (Graphics()->ScreenWidth() / MaxScale);
-		StartX += EdgeX / 2;
-		EndX -= EdgeX / 2;
-		int EdgeY = (EndY - StartY) - (Graphics()->ScreenHeight() / MaxScale);
-		StartY += EdgeY / 2;
-		EndY -= EdgeY / 2;
-	}
-	Graphics()->TextureClear();
-	Graphics()->QuadsBegin();
-	ColorRGBA col = ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f);
-	if(TileType == TILE_FREEZE)
-	{
-		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorFreeze));
-	}
-	else if(TileType == TILE_SOLID)
-	{
-		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorSolid));
-	}
-	else if(TileType == TILE_UNFREEZE)
-	{
-		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorUnfreeze));
-	}
-	Graphics()->SetColor(col.r, col.g, col.b, Alpha);
-
-	for(int y = StartY; y < EndY; y++)
-		for(int x = StartX; x < EndX; x++)
-		{
-			int mx = x;
-			int my = y;
-
-			if(mx < 1)
-				continue; // mx = 0;
-			if(mx >= w - 1)
-				continue; // mx = w-1;
-			if(my < 1)
-				continue; // my = 0;
-			if(my >= h - 1)
-				continue; // my = h-1;
-
-			int c = mx + my * w;
-
-			unsigned char Index = pTiles[c].m_Index;
-			bool IsFreeze = Index == TILE_FREEZE || Index == TILE_DFREEZE;
-			bool IsUnFreeze = Index == TILE_UNFREEZE || Index == TILE_DUNFREEZE;
-			bool IsSolid = Index == TILE_SOLID || Index == TILE_NOHOOK;
-
-			if(!(IsSolid || IsFreeze || IsUnFreeze)) //Not an tile we care about
-				continue;
-			if(IsSolid && !(TileType == TILE_SOLID))
-				continue;
-			if(IsFreeze && !(TileType == TILE_FREEZE))
-				continue;
-			if(IsUnFreeze && !(TileType == TILE_UNFREEZE))
-				continue;
-
-			IGraphics::CQuadItem Array[8];
-			bool Neighbors[8];
-			if(IsFreeze && TileType == TILE_FREEZE)
-			{
-				int IndexN;
-				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
-				Neighbors[0] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
-				Neighbors[1] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
-				Neighbors[2] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
-				Neighbors[3] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
-				Neighbors[4] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
-				Neighbors[5] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
-				Neighbors[6] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
-				Neighbors[7] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
-			}
-			else if(IsSolid && TileType == TILE_SOLID)
-			{
-				int IndexN;
-				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
-				Neighbors[0] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
-				Neighbors[1] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
-				Neighbors[2] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
-				Neighbors[3] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
-				Neighbors[4] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
-				Neighbors[5] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
-				Neighbors[6] = IndexN != TILE_NOHOOK && IndexN != Index;
-				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
-				Neighbors[7] = IndexN != TILE_NOHOOK && IndexN != Index;
-			}
-			else
-			{
-				int IndexN;
-				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
-				Neighbors[0] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
-				Neighbors[1] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
-				Neighbors[2] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
-				Neighbors[3] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
-				Neighbors[4] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
-				Neighbors[5] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
-				Neighbors[6] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
-				Neighbors[7] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
-			}
-
-			float Size = (float)g_Config.m_ClOutlineWidth;
-			int NumQuads = 0;
-
-			//Do lonely corners first
-			if(Neighbors[0] && !Neighbors[1] && !Neighbors[3])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[2] && !Neighbors[1] && !Neighbors[4])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[5] && !Neighbors[3] && !Neighbors[6])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[7] && !Neighbors[6] && !Neighbors[4])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Scale - Size, Size, Size);
-				NumQuads++;
-			}
-			//Top
-			if(Neighbors[1])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Scale, Size);
-				NumQuads++;
-			}
-			//Bottom
-			if(Neighbors[6])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Scale, Size);
-				NumQuads++;
-			}
-			//Left
-			if(Neighbors[3])
-			{
-				if(!Neighbors[1] && !Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale);
-				else if(!Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size);
-				else if(!Neighbors[1])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale - Size);
-				else
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size * 2.0f);
-				NumQuads++;
-			}
-			//Right
-			if(Neighbors[4])
-			{
-				if(!Neighbors[1] && !Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale);
-				else if(!Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size);
-				else if(!Neighbors[1])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale - Size);
-				else
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size * 2.0f);
-				NumQuads++;
-			}
-
-			Graphics()->QuadsDrawTL(Array, NumQuads);
-		}
-	Graphics()->QuadsEnd();
-	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
-}
-void CRenderTools::RenderTeleOutlines(CTile *pTiles, CTeleTile *pTele, int w, int h, float Scale, float Alpha)
-{
-	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
-	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-
-	int StartY = (int)(ScreenY0 / Scale) - 1;
-	int StartX = (int)(ScreenX0 / Scale) - 1;
-	int EndY = (int)(ScreenY1 / Scale) + 1;
-	int EndX = (int)(ScreenX1 / Scale) + 1;
-
-	int MaxScale = 12;
-	if(EndX - StartX > Graphics()->ScreenWidth() / MaxScale || EndY - StartY > Graphics()->ScreenHeight() / MaxScale)
-	{
-		int EdgeX = (EndX - StartX) - (Graphics()->ScreenWidth() / MaxScale);
-		StartX += EdgeX / 2;
-		EndX -= EdgeX / 2;
-		int EdgeY = (EndY - StartY) - (Graphics()->ScreenHeight() / MaxScale);
-		StartY += EdgeY / 2;
-		EndY -= EdgeY / 2;
-	}
-
-	Graphics()->TextureClear();
-	Graphics()->QuadsBegin();
-	ColorRGBA col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorTele));
-	Graphics()->SetColor(col.r, col.g, col.b, Alpha);
-
-	for(int y = StartY; y < EndY; y++)
-		for(int x = StartX; x < EndX; x++)
-		{
-			int mx = x;
-			int my = y;
-
-			if(mx < 1)
-				continue; // mx = 0;
-			if(mx >= w - 1)
-				continue; // mx = w-1;
-			if(my < 1)
-				continue; // my = 0;
-			if(my >= h - 1)
-				continue; // my = h-1;
-
-			int c = mx + my * w;
-
-			unsigned char Index = pTele[c].m_Type;
-			if(!Index)
-				continue;
-			if(!(Index == TILE_TELECHECKINEVIL || Index == TILE_TELEIN || Index == TILE_TELEINEVIL))
-				continue;
-
-			IGraphics::CQuadItem Array[8];
-			bool Neighbors[8];
-			Neighbors[0] = pTiles[(mx - 1) + (my - 1) * w].m_Index == 0 && !pTele[(mx - 1) + (my - 1) * w].m_Number;
-			Neighbors[1] = pTiles[(mx + 0) + (my - 1) * w].m_Index == 0 && !pTele[(mx + 0) + (my - 1) * w].m_Number;
-			Neighbors[2] = pTiles[(mx + 1) + (my - 1) * w].m_Index == 0 && !pTele[(mx + 1) + (my - 1) * w].m_Number;
-			Neighbors[3] = pTiles[(mx - 1) + (my + 0) * w].m_Index == 0 && !pTele[(mx - 1) + (my + 0) * w].m_Number;
-			Neighbors[4] = pTiles[(mx + 1) + (my + 0) * w].m_Index == 0 && !pTele[(mx + 1) + (my + 0) * w].m_Number;
-			Neighbors[5] = pTiles[(mx - 1) + (my + 1) * w].m_Index == 0 && !pTele[(mx - 1) + (my + 1) * w].m_Number;
-			Neighbors[6] = pTiles[(mx + 0) + (my + 1) * w].m_Index == 0 && !pTele[(mx + 0) + (my + 1) * w].m_Number;
-			Neighbors[7] = pTiles[(mx + 1) + (my + 1) * w].m_Index == 0 && !pTele[(mx + 1) + (my + 1) * w].m_Number;
-
-			float Size = (float)g_Config.m_ClOutlineWidth;
-			int NumQuads = 0;
-
-			//Do lonely corners first
-			if(Neighbors[0] && !Neighbors[1] && !Neighbors[3])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[2] && !Neighbors[1] && !Neighbors[4])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[5] && !Neighbors[3] && !Neighbors[6])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Size, Size);
-				NumQuads++;
-			}
-			if(Neighbors[7] && !Neighbors[6] && !Neighbors[4])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Scale - Size, Size, Size);
-				NumQuads++;
-			}
-			//Top
-			if(Neighbors[1])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Scale, Size);
-				NumQuads++;
-			}
-			//Bottom
-			if(Neighbors[6])
-			{
-				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Scale, Size);
-				NumQuads++;
-			}
-			//Left
-			if(Neighbors[3])
-			{
-				if(!Neighbors[1] && !Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale);
-				else if(!Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size);
-				else if(!Neighbors[1])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale - Size);
-				else
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size * 2.0f);
-				NumQuads++;
-			}
-			//Right
-			if(Neighbors[4])
-			{
-				if(!Neighbors[1] && !Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale);
-				else if(!Neighbors[6])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size);
-				else if(!Neighbors[1])
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale - Size);
-				else
-					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size * 2.0f);
-				NumQuads++;
-			}
-
-			Graphics()->QuadsDrawTL(Array, NumQuads);
-		}
-	Graphics()->QuadsEnd();
-	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
-}
-void CRenderTools::RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha)
+void CRenderTools::RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha) const
 {
 	if(!g_Config.m_ClTextEntities)
 		return;
@@ -1050,9 +684,11 @@ void CRenderTools::RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale
 		return; // its useless to render text at this distance
 
 	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
-	float ToCenterOffset = (1 - Size) / 2.f;
+	char aBuf[16];
 
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
 	for(int y = StartY; y < EndY; y++)
+	{
 		for(int x = StartX; x < EndX; x++)
 		{
 			int mx = x;
@@ -1070,20 +706,23 @@ void CRenderTools::RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale
 			int c = mx + my * w;
 
 			unsigned char Index = pTele[c].m_Number;
-			if(Index && IsTeleTileNumberUsed(pTele[c].m_Type))
+			if(Index && IsTeleTileNumberUsedAny(pTele[c].m_Type))
 			{
-				char aBuf[16];
-				str_from_int(Index, aBuf);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-				TextRender()->Text(mx * Scale - 3.f, (my + ToCenterOffset) * Scale, Size * Scale, aBuf, -1.0f);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+				str_format(aBuf, sizeof(aBuf), "%d", Index);
+				// Auto-resize text to fit inside the tile
+				float ScaledWidth = TextRender()->TextWidth(Size * Scale, aBuf, -1);
+				float Factor = clamp(Scale / ScaledWidth, 0.0f, 1.0f);
+				float LocalSize = Size * Factor;
+				float ToCenterOffset = (1 - LocalSize) / 2.f;
+				TextRender()->Text((mx + 0.5f) * Scale - (ScaledWidth * Factor) / 2.0f, (my + ToCenterOffset) * Scale, LocalSize * Scale, aBuf);
 			}
 		}
-
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha)
+void CRenderTools::RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha) const
 {
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
@@ -1098,8 +737,11 @@ void CRenderTools::RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, fl
 
 	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
 	float ToCenterOffset = (1 - Size) / 2.f;
+	char aBuf[16];
 
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
 	for(int y = StartY; y < EndY; y++)
+	{
 		for(int x = StartX; x < EndX; x++)
 		{
 			int mx = x;
@@ -1123,36 +765,31 @@ void CRenderTools::RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, fl
 				// draw arrow
 				Graphics()->TextureSet(g_pData->m_aImages[IMAGE_SPEEDUP_ARROW].m_Id);
 				Graphics()->QuadsBegin();
-				Graphics()->SetColor(255.0f, 255.0f, 255.0f, Alpha);
-
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
 				SelectSprite(SPRITE_SPEEDUP_ARROW);
 				Graphics()->QuadsSetRotation(pSpeedup[c].m_Angle * (pi / 180.0f));
 				DrawSprite(mx * Scale + 16, my * Scale + 16, 35.0f);
-
 				Graphics()->QuadsEnd();
 
+				// draw force and max speed
 				if(g_Config.m_ClTextEntities)
 				{
-					// draw force
-					char aBuf[16];
-					str_from_int(Force, aBuf);
-					TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-					TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
-					TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+					str_format(aBuf, sizeof(aBuf), "%d", Force);
+					TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf);
 					if(MaxSpeed)
 					{
-						str_from_int(MaxSpeed, aBuf);
-						TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-						TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
-						TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+						str_format(aBuf, sizeof(aBuf), "%d", MaxSpeed);
+						TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf);
 					}
 				}
 			}
 		}
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha)
+void CRenderTools::RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha) const
 {
 	if(!g_Config.m_ClTextEntities)
 		return;
@@ -1170,8 +807,11 @@ void CRenderTools::RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float
 
 	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
 	float ToCenterOffset = (1 - Size) / 2.f;
+	char aBuf[16];
 
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
 	for(int y = StartY; y < EndY; y++)
+	{
 		for(int x = StartX; x < EndX; x++)
 		{
 			int mx = x;
@@ -1191,28 +831,23 @@ void CRenderTools::RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float
 			unsigned char Index = pSwitch[c].m_Number;
 			if(Index && IsSwitchTileNumberUsed(pSwitch[c].m_Type))
 			{
-				char aBuf[16];
-				str_from_int(Index, aBuf);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-				TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+				str_format(aBuf, sizeof(aBuf), "%d", Index);
+				TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf);
 			}
 
 			unsigned char Delay = pSwitch[c].m_Delay;
 			if(Delay && IsSwitchTileDelayUsed(pSwitch[c].m_Type))
 			{
-				char aBuf[16];
-				str_from_int(Delay, aBuf);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-				TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+				str_format(aBuf, sizeof(aBuf), "%d", Delay);
+				TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf);
 			}
 		}
-
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha)
+void CRenderTools::RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha) const
 {
 	if(!g_Config.m_ClTextEntities)
 		return;
@@ -1229,8 +864,11 @@ void CRenderTools::RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale
 		return; // its useless to render text at this distance
 
 	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
+	char aBuf[16];
 
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
 	for(int y = StartY; y < EndY; y++)
+	{
 		for(int x = StartX; x < EndX; x++)
 		{
 			int mx = x;
@@ -1250,18 +888,16 @@ void CRenderTools::RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale
 			unsigned char Index = pTune[c].m_Number;
 			if(Index)
 			{
-				char aBuf[16];
-				str_from_int(Index, aBuf);
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
-				TextRender()->Text(mx * Scale + 11.f, my * Scale + 6.f, Size * Scale / 1.5f - 5.f, aBuf, -1.0f); // numbers shouldn't be too big and in the center of the tile
-				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+				str_format(aBuf, sizeof(aBuf), "%d", Index);
+				TextRender()->Text(mx * Scale + 11.f, my * Scale + 6.f, Size * Scale / 1.5f - 5.f, aBuf); // numbers shouldn't be too big and in the center of the tile
 			}
 		}
-
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+void CRenderTools::RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const
 {
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
@@ -1378,12 +1014,10 @@ void CRenderTools::RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, Co
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderSpeedupmap(CSpeedupTile *pSpeedupTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+void CRenderTools::RenderSpeedupmap(CSpeedupTile *pSpeedupTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const
 {
-	//Graphics()->TextureSet(img_get(tmap->image));
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-	//Graphics()->MapScreen(screen_x0-50, screen_y0-50, screen_x1+50, screen_y1+50);
 
 	// calculate the final pixelsize for the tiles
 	float TilePixelSize = 1024 / 32.0f;
@@ -1497,12 +1131,10 @@ void CRenderTools::RenderSpeedupmap(CSpeedupTile *pSpeedupTile, int w, int h, fl
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderSwitchmap(CSwitchTile *pSwitchTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+void CRenderTools::RenderSwitchmap(CSwitchTile *pSwitchTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const
 {
-	//Graphics()->TextureSet(img_get(tmap->image));
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
-	//Graphics()->MapScreen(screen_x0-50, screen_y0-50, screen_x1+50, screen_y1+50);
 
 	// calculate the final pixelsize for the tiles
 	float TilePixelSize = 1024 / 32.0f;
@@ -1659,7 +1291,7 @@ void CRenderTools::RenderSwitchmap(CSwitchTile *pSwitchTile, int w, int h, float
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-void CRenderTools::RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+void CRenderTools::RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags) const
 {
 	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
 	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
diff --git a/src/game/client/sixup_translate_game.cpp b/src/game/client/sixup_translate_game.cpp
new file mode 100644
index 0000000000..ae6f8ed5b0
--- /dev/null
+++ b/src/game/client/sixup_translate_game.cpp
@@ -0,0 +1,727 @@
+#include <base/system.h>
+#include <engine/shared/protocol7.h>
+#include <game/gamecore.h>
+#include <game/generated/protocol7.h>
+#include <game/localization.h>
+
+#include <game/client/gameclient.h>
+
+enum
+{
+	STR_TEAM_GAME,
+	STR_TEAM_RED,
+	STR_TEAM_BLUE,
+	STR_TEAM_SPECTATORS,
+};
+
+static int GetStrTeam7(int Team, bool Teamplay)
+{
+	if(Teamplay)
+	{
+		if(Team == TEAM_RED)
+			return STR_TEAM_RED;
+		else if(Team == TEAM_BLUE)
+			return STR_TEAM_BLUE;
+	}
+	else if(Team == 0)
+		return STR_TEAM_GAME;
+
+	return STR_TEAM_SPECTATORS;
+}
+
+enum
+{
+	DO_CHAT = 0,
+	DO_BROADCAST,
+	DO_SPECIAL,
+
+	PARA_NONE = 0,
+	PARA_I,
+	PARA_II,
+	PARA_III,
+};
+
+struct CGameMsg7
+{
+	int m_Action;
+	int m_ParaType;
+	const char *m_pText;
+};
+
+static CGameMsg7 gs_GameMsgList7[protocol7::NUM_GAMEMSGS] = {
+	{/*GAMEMSG_TEAM_SWAP*/ DO_CHAT, PARA_NONE, "Teams were swapped"},
+	{/*GAMEMSG_SPEC_INVALIDID*/ DO_CHAT, PARA_NONE, "Invalid spectator id used"}, //!
+	{/*GAMEMSG_TEAM_SHUFFLE*/ DO_CHAT, PARA_NONE, "Teams were shuffled"},
+	{/*GAMEMSG_TEAM_BALANCE*/ DO_CHAT, PARA_NONE, "Teams have been balanced"},
+	{/*GAMEMSG_CTF_DROP*/ DO_SPECIAL, PARA_NONE, ""}, // special - play ctf drop sound
+	{/*GAMEMSG_CTF_RETURN*/ DO_SPECIAL, PARA_NONE, ""}, // special - play ctf return sound
+
+	{/*GAMEMSG_TEAM_ALL*/ DO_SPECIAL, PARA_I, ""}, // special - add team name
+	{/*GAMEMSG_TEAM_BALANCE_VICTIM*/ DO_SPECIAL, PARA_I, ""}, // special - add team name
+	{/*GAMEMSG_CTF_GRAB*/ DO_SPECIAL, PARA_I, ""}, // special - play ctf grab sound based on team
+
+	{/*GAMEMSG_CTF_CAPTURE*/ DO_SPECIAL, PARA_III, ""}, // special - play ctf capture sound + capture chat message
+
+	{/*GAMEMSG_GAME_PAUSED*/ DO_SPECIAL, PARA_I, ""}, // special - add player name
+};
+
+void CGameClient::DoTeamChangeMessage7(const char *pName, int ClientId, int Team, const char *pPrefix)
+{
+	char aBuf[128];
+	switch(GetStrTeam7(Team, m_pClient->m_TranslationContext.m_GameFlags & protocol7::GAMEFLAG_TEAMS))
+	{
+	case STR_TEAM_GAME: str_format(aBuf, sizeof(aBuf), "'%s' %sjoined the game", pName, pPrefix); break;
+	case STR_TEAM_RED: str_format(aBuf, sizeof(aBuf), "'%s' %sjoined the red team", pName, pPrefix); break;
+	case STR_TEAM_BLUE: str_format(aBuf, sizeof(aBuf), "'%s' %sjoined the blue team", pName, pPrefix); break;
+	case STR_TEAM_SPECTATORS: str_format(aBuf, sizeof(aBuf), "'%s' %sjoined the spectators", pName, pPrefix); break;
+	}
+	m_Chat.AddLine(-1, 0, aBuf);
+}
+
+template<typename T>
+void CGameClient::ApplySkin7InfoFromGameMsg(const T *pMsg, int ClientId, int Conn)
+{
+	CClientData *pClient = &m_aClients[ClientId];
+	char *apSkinPartsPtr[protocol7::NUM_SKINPARTS];
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		str_utf8_copy_num(pClient->m_aSixup[Conn].m_aaSkinPartNames[Part], pMsg->m_apSkinPartNames[Part], sizeof(pClient->m_aSixup[Conn].m_aaSkinPartNames[Part]), protocol7::MAX_SKIN_LENGTH);
+		apSkinPartsPtr[Part] = pClient->m_aSixup[Conn].m_aaSkinPartNames[Part];
+		pClient->m_aSixup[Conn].m_aUseCustomColors[Part] = pMsg->m_aUseCustomColors[Part];
+		pClient->m_aSixup[Conn].m_aSkinPartColors[Part] = pMsg->m_aSkinPartColors[Part];
+	}
+	m_Skins7.ValidateSkinParts(apSkinPartsPtr, pClient->m_aSixup[Conn].m_aUseCustomColors, pClient->m_aSixup[Conn].m_aSkinPartColors, m_pClient->m_TranslationContext.m_GameFlags);
+
+	if(time_season() == SEASON_XMAS)
+	{
+		pClient->m_SkinInfo.m_aSixup[Conn].m_HatTexture = m_Skins7.m_XmasHatTexture;
+		pClient->m_SkinInfo.m_aSixup[Conn].m_HatSpriteIndex = ClientId % CSkins7::HAT_NUM;
+	}
+	else
+		pClient->m_SkinInfo.m_aSixup[Conn].m_HatTexture.Invalidate();
+
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		int Id = m_Skins7.FindSkinPart(Part, pClient->m_aSixup[Conn].m_aaSkinPartNames[Part], false);
+		const CSkins7::CSkinPart *pSkinPart = m_Skins7.GetSkinPart(Part, Id);
+		if(pClient->m_aSixup[Conn].m_aUseCustomColors[Part])
+		{
+			pClient->m_SkinInfo.m_aSixup[Conn].m_aTextures[Part] = pSkinPart->m_ColorTexture;
+			pClient->m_SkinInfo.m_aSixup[Conn].m_aColors[Part] = m_Skins7.GetColor(pMsg->m_aSkinPartColors[Part], Part == protocol7::SKINPART_MARKING);
+		}
+		else
+		{
+			pClient->m_SkinInfo.m_aSixup[Conn].m_aTextures[Part] = pSkinPart->m_OrgTexture;
+			pClient->m_SkinInfo.m_aSixup[Conn].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+		if(pClient->m_SkinInfo.m_aSixup[Conn].m_HatTexture.IsValid())
+		{
+			if(Part == protocol7::SKINPART_BODY && str_comp(pClient->m_aSixup[Conn].m_aaSkinPartNames[Part], "standard"))
+				pClient->m_SkinInfo.m_aSixup[Conn].m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
+			if(Part == protocol7::SKINPART_DECORATION && !str_comp(pClient->m_aSixup[Conn].m_aaSkinPartNames[Part], "twinbopp"))
+				pClient->m_SkinInfo.m_aSixup[Conn].m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
+		}
+	}
+}
+
+void CGameClient::ApplySkin7InfoFromSnapObj(const protocol7::CNetObj_De_ClientInfo *pObj, int ClientId)
+{
+	char aSkinPartNames[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_ARRAY_SIZE];
+	protocol7::CNetMsg_Sv_SkinChange Msg;
+	Msg.m_ClientId = ClientId;
+	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+	{
+		IntsToStr(pObj->m_aaSkinPartNames[Part], 6, aSkinPartNames[Part], std::size(aSkinPartNames[Part]));
+		Msg.m_apSkinPartNames[Part] = aSkinPartNames[Part];
+		Msg.m_aUseCustomColors[Part] = pObj->m_aUseCustomColors[Part];
+		Msg.m_aSkinPartColors[Part] = pObj->m_aSkinPartColors[Part];
+	}
+	ApplySkin7InfoFromGameMsg(&Msg, ClientId, 0);
+}
+
+void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
+{
+	if(!m_pClient->IsSixup())
+	{
+		return m_NetObjHandler.SecureUnpackMsg(*pMsgId, pUnpacker);
+	}
+
+	void *pRawMsg = m_NetObjHandler7.SecureUnpackMsg(*pMsgId, pUnpacker);
+	if(!pRawMsg)
+	{
+		if(*pMsgId > __NETMSGTYPE_UUID_HELPER && *pMsgId < OFFSET_MAPITEMTYPE_UUID)
+		{
+			void *pDDNetExMsg = m_NetObjHandler.SecureUnpackMsg(*pMsgId, pUnpacker);
+			if(pDDNetExMsg)
+				return pDDNetExMsg;
+		}
+
+		dbg_msg("sixup", "dropped weird message '%s' (%d), failed on '%s'", m_NetObjHandler7.GetMsgName(*pMsgId), *pMsgId, m_NetObjHandler7.FailedMsgOn());
+		return nullptr;
+	}
+	static char s_aRawMsg[1024];
+
+	if(*pMsgId == protocol7::NETMSGTYPE_SV_MOTD)
+	{
+		protocol7::CNetMsg_Sv_Motd *pMsg7 = (protocol7::CNetMsg_Sv_Motd *)pRawMsg;
+		::CNetMsg_Sv_Motd *pMsg = (::CNetMsg_Sv_Motd *)s_aRawMsg;
+
+		pMsg->m_pMessage = pMsg7->m_pMessage;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_BROADCAST)
+	{
+		protocol7::CNetMsg_Sv_Broadcast *pMsg7 = (protocol7::CNetMsg_Sv_Broadcast *)pRawMsg;
+		::CNetMsg_Sv_Broadcast *pMsg = (::CNetMsg_Sv_Broadcast *)s_aRawMsg;
+
+		pMsg->m_pMessage = pMsg7->m_pMessage;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_CL_SETTEAM)
+	{
+		protocol7::CNetMsg_Cl_SetTeam *pMsg7 = (protocol7::CNetMsg_Cl_SetTeam *)pRawMsg;
+		::CNetMsg_Cl_SetTeam *pMsg = (::CNetMsg_Cl_SetTeam *)s_aRawMsg;
+
+		pMsg->m_Team = pMsg7->m_Team;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_TEAM)
+	{
+		protocol7::CNetMsg_Sv_Team *pMsg7 = (protocol7::CNetMsg_Sv_Team *)pRawMsg;
+
+		if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		{
+			m_aClients[pMsg7->m_ClientId].m_Team = pMsg7->m_Team;
+			m_pClient->m_TranslationContext.m_aClients[pMsg7->m_ClientId].m_Team = pMsg7->m_Team;
+			m_aClients[pMsg7->m_ClientId].UpdateRenderInfo(IsTeamPlay());
+
+			// if(pMsg7->m_ClientId == m_LocalClientId)
+			// {
+			// 	m_TeamCooldownTick = pMsg7->m_CooldownTick;
+			// 	m_TeamChangeTime = Client()->LocalTime();
+			// }
+		}
+
+		if(Conn != g_Config.m_ClDummy)
+			return nullptr;
+
+		if(pMsg7->m_Silent == 0)
+		{
+			DoTeamChangeMessage7(m_aClients[pMsg7->m_ClientId].m_aName, pMsg7->m_ClientId, pMsg7->m_Team);
+		}
+
+		// we drop the message and add the new team
+		// info to the playerinfo snap item
+		// using translation context
+		return nullptr;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_WEAPONPICKUP)
+	{
+		protocol7::CNetMsg_Sv_WeaponPickup *pMsg7 = (protocol7::CNetMsg_Sv_WeaponPickup *)pRawMsg;
+		::CNetMsg_Sv_WeaponPickup *pMsg = (::CNetMsg_Sv_WeaponPickup *)s_aRawMsg;
+
+		pMsg->m_Weapon = pMsg7->m_Weapon;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_SERVERSETTINGS)
+	{
+		// 0.7 only message for ui enrichment like locked teams
+		protocol7::CNetMsg_Sv_ServerSettings *pMsg = (protocol7::CNetMsg_Sv_ServerSettings *)pRawMsg;
+
+		if(!m_pClient->m_TranslationContext.m_ServerSettings.m_TeamLock && pMsg->m_TeamLock)
+			m_Chat.AddLine(-1, 0, "Teams were locked");
+		else if(m_pClient->m_TranslationContext.m_ServerSettings.m_TeamLock && !pMsg->m_TeamLock)
+			m_Chat.AddLine(-1, 0, "Teams were unlocked");
+
+		m_pClient->m_TranslationContext.m_ServerSettings.m_KickVote = pMsg->m_KickVote;
+		m_pClient->m_TranslationContext.m_ServerSettings.m_KickMin = pMsg->m_KickMin;
+		m_pClient->m_TranslationContext.m_ServerSettings.m_SpecVote = pMsg->m_SpecVote;
+		m_pClient->m_TranslationContext.m_ServerSettings.m_TeamLock = pMsg->m_TeamLock;
+		m_pClient->m_TranslationContext.m_ServerSettings.m_TeamBalance = pMsg->m_TeamBalance;
+		m_pClient->m_TranslationContext.m_ServerSettings.m_PlayerSlots = pMsg->m_PlayerSlots;
+		return nullptr; // There is no 0.6 equivalent
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_RACEFINISH)
+	{
+		*pMsgId = NETMSGTYPE_SV_RACEFINISH;
+		protocol7::CNetMsg_Sv_RaceFinish *pMsg7 = (protocol7::CNetMsg_Sv_RaceFinish *)pRawMsg;
+		::CNetMsg_Sv_RaceFinish *pMsg = (::CNetMsg_Sv_RaceFinish *)s_aRawMsg;
+
+		pMsg->m_ClientId = pMsg7->m_ClientId;
+		pMsg->m_Time = pMsg7->m_Time;
+		pMsg->m_Diff = pMsg7->m_Diff;
+		pMsg->m_RecordPersonal = pMsg7->m_RecordPersonal;
+		pMsg->m_RecordServer = pMsg7->m_RecordServer;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_COMMANDINFOREMOVE)
+	{
+		*pMsgId = NETMSGTYPE_SV_COMMANDINFOREMOVE;
+		protocol7::CNetMsg_Sv_CommandInfoRemove *pMsg7 = (protocol7::CNetMsg_Sv_CommandInfoRemove *)pRawMsg;
+		::CNetMsg_Sv_CommandInfoRemove *pMsg = (::CNetMsg_Sv_CommandInfoRemove *)s_aRawMsg;
+
+		pMsg->m_pName = pMsg7->m_pName;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_COMMANDINFO)
+	{
+		*pMsgId = NETMSGTYPE_SV_COMMANDINFO;
+		protocol7::CNetMsg_Sv_CommandInfo *pMsg7 = (protocol7::CNetMsg_Sv_CommandInfo *)pRawMsg;
+		::CNetMsg_Sv_CommandInfo *pMsg = (::CNetMsg_Sv_CommandInfo *)s_aRawMsg;
+
+		pMsg->m_pName = pMsg7->m_pName;
+		pMsg->m_pArgsFormat = pMsg7->m_pArgsFormat;
+		pMsg->m_pHelpText = pMsg7->m_pHelpText;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_SKINCHANGE)
+	{
+		protocol7::CNetMsg_Sv_SkinChange *pMsg7 = (protocol7::CNetMsg_Sv_SkinChange *)pRawMsg;
+
+		if(pMsg7->m_ClientId < 0 || pMsg7->m_ClientId >= MAX_CLIENTS)
+		{
+			dbg_msg("sixup", "Sv_SkinChange got invalid ClientId: %d", pMsg7->m_ClientId);
+			return nullptr;
+		}
+
+		CTranslationContext::CClientData &Client = m_pClient->m_TranslationContext.m_aClients[pMsg7->m_ClientId];
+		Client.m_Active = true;
+		ApplySkin7InfoFromGameMsg(pMsg7, pMsg7->m_ClientId, Conn);
+		// skin will be moved to the 0.6 snap by the translation context
+		// and we drop the game message
+		return nullptr;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTECLEAROPTIONS)
+	{
+		*pMsgId = NETMSGTYPE_SV_VOTECLEAROPTIONS;
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTEOPTIONADD)
+	{
+		*pMsgId = NETMSGTYPE_SV_VOTEOPTIONADD;
+		protocol7::CNetMsg_Sv_VoteOptionAdd *pMsg7 = (protocol7::CNetMsg_Sv_VoteOptionAdd *)pRawMsg;
+		::CNetMsg_Sv_VoteOptionAdd *pMsg = (::CNetMsg_Sv_VoteOptionAdd *)s_aRawMsg;
+		pMsg->m_pDescription = pMsg7->m_pDescription;
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTEOPTIONREMOVE)
+	{
+		*pMsgId = NETMSGTYPE_SV_VOTEOPTIONREMOVE;
+		protocol7::CNetMsg_Sv_VoteOptionRemove *pMsg7 = (protocol7::CNetMsg_Sv_VoteOptionRemove *)pRawMsg;
+		::CNetMsg_Sv_VoteOptionRemove *pMsg = (::CNetMsg_Sv_VoteOptionRemove *)s_aRawMsg;
+		pMsg->m_pDescription = pMsg7->m_pDescription;
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTEOPTIONLISTADD)
+	{
+		::CNetMsg_Sv_VoteOptionListAdd *pMsg = (::CNetMsg_Sv_VoteOptionListAdd *)s_aRawMsg;
+		int NumOptions = pUnpacker->GetInt();
+		if(NumOptions > 14)
+		{
+			for(int i = 0; i < NumOptions; i++)
+			{
+				const char *pDescription = pUnpacker->GetString(CUnpacker::SANITIZE_CC);
+				if(pUnpacker->Error())
+					continue;
+
+				m_Voting.AddOption(pDescription);
+			}
+			// 0.7 can send more vote options than
+			// the 0.6 protocol fit
+			// in that case we do not translate it but just
+			// reimplement what 0.6 would do
+			return nullptr;
+		}
+		pMsg->m_NumOptions = 0;
+		for(int i = 0; i < NumOptions; i++)
+		{
+			const char *pDescription = pUnpacker->GetString(CUnpacker::SANITIZE_CC);
+			if(pUnpacker->Error())
+				continue;
+
+			pMsg->m_NumOptions++;
+			switch(i)
+			{
+			case 0: (pMsg->m_pDescription0 = pDescription); break;
+			case 1: (pMsg->m_pDescription1 = pDescription); break;
+			case 2: (pMsg->m_pDescription2 = pDescription); break;
+			case 3: (pMsg->m_pDescription3 = pDescription); break;
+			case 4: (pMsg->m_pDescription4 = pDescription); break;
+			case 5: (pMsg->m_pDescription5 = pDescription); break;
+			case 6: (pMsg->m_pDescription6 = pDescription); break;
+			case 7: (pMsg->m_pDescription7 = pDescription); break;
+			case 8: (pMsg->m_pDescription8 = pDescription); break;
+			case 9: (pMsg->m_pDescription9 = pDescription); break;
+			case 10: (pMsg->m_pDescription10 = pDescription); break;
+			case 11: (pMsg->m_pDescription11 = pDescription); break;
+			case 12: (pMsg->m_pDescription12 = pDescription); break;
+			case 13: (pMsg->m_pDescription13 = pDescription); break;
+			case 14: (pMsg->m_pDescription14 = pDescription);
+			}
+		}
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTESET)
+	{
+		*pMsgId = NETMSGTYPE_SV_VOTESET;
+		protocol7::CNetMsg_Sv_VoteSet *pMsg7 = (protocol7::CNetMsg_Sv_VoteSet *)pRawMsg;
+		::CNetMsg_Sv_VoteSet *pMsg = (::CNetMsg_Sv_VoteSet *)s_aRawMsg;
+
+		pMsg->m_Timeout = pMsg7->m_Timeout;
+		pMsg->m_pDescription = pMsg7->m_pDescription;
+		pMsg->m_pReason = pMsg7->m_pReason;
+
+		char aBuf[128];
+		if(pMsg7->m_Timeout)
+		{
+			if(pMsg7->m_ClientId != -1)
+			{
+				const char *pName = m_aClients[pMsg7->m_ClientId].m_aName;
+				switch(pMsg7->m_Type)
+				{
+				case protocol7::VOTE_START_OP:
+					str_format(aBuf, sizeof(aBuf), "'%s' called vote to change server option '%s' (%s)", pName, pMsg7->m_pDescription, pMsg7->m_pReason);
+					m_Chat.AddLine(-1, 0, aBuf);
+					break;
+				case protocol7::VOTE_START_KICK:
+				{
+					str_format(aBuf, sizeof(aBuf), "'%s' called for vote to kick '%s' (%s)", pName, pMsg7->m_pDescription, pMsg7->m_pReason);
+					m_Chat.AddLine(-1, 0, aBuf);
+					break;
+				}
+				case protocol7::VOTE_START_SPEC:
+				{
+					str_format(aBuf, sizeof(aBuf), "'%s' called for vote to move '%s' to spectators (%s)", pName, pMsg7->m_pDescription, pMsg7->m_pReason);
+					m_Chat.AddLine(-1, 0, aBuf);
+				}
+				}
+			}
+		}
+		else
+		{
+			switch(pMsg7->m_Type)
+			{
+			case protocol7::VOTE_START_OP:
+				str_format(aBuf, sizeof(aBuf), "Admin forced server option '%s' (%s)", pMsg7->m_pDescription, pMsg7->m_pReason);
+				m_Chat.AddLine(-1, 0, aBuf);
+				break;
+			case protocol7::VOTE_START_SPEC:
+				str_format(aBuf, sizeof(aBuf), "Admin moved '%s' to spectator (%s)", pMsg7->m_pDescription, pMsg7->m_pReason);
+				m_Chat.AddLine(-1, 0, aBuf);
+				break;
+			case protocol7::VOTE_END_ABORT:
+				m_Voting.OnReset();
+				m_Chat.AddLine(-1, 0, "Vote aborted");
+				break;
+			case protocol7::VOTE_END_PASS:
+				m_Voting.OnReset();
+				m_Chat.AddLine(-1, 0, pMsg7->m_ClientId == -1 ? "Admin forced vote yes" : "Vote passed");
+				break;
+			case protocol7::VOTE_END_FAIL:
+				m_Voting.OnReset();
+				m_Chat.AddLine(-1, 0, pMsg7->m_ClientId == -1 ? "Admin forced vote no" : "Vote failed");
+			}
+		}
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_VOTESTATUS)
+	{
+		*pMsgId = NETMSGTYPE_SV_VOTESTATUS;
+		protocol7::CNetMsg_Sv_VoteStatus *pMsg7 = (protocol7::CNetMsg_Sv_VoteStatus *)pRawMsg;
+		::CNetMsg_Sv_VoteStatus *pMsg = (::CNetMsg_Sv_VoteStatus *)s_aRawMsg;
+
+		pMsg->m_Yes = pMsg7->m_Yes;
+		pMsg->m_No = pMsg7->m_No;
+		pMsg->m_Pass = pMsg7->m_Pass;
+		pMsg->m_Total = pMsg7->m_Total;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_READYTOENTER)
+	{
+		*pMsgId = NETMSGTYPE_SV_READYTOENTER;
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_CLIENTDROP)
+	{
+		protocol7::CNetMsg_Sv_ClientDrop *pMsg7 = (protocol7::CNetMsg_Sv_ClientDrop *)pRawMsg;
+		if(pMsg7->m_ClientId < 0 || pMsg7->m_ClientId >= MAX_CLIENTS)
+		{
+			dbg_msg("sixup", "Sv_ClientDrop got invalid ClientId: %d", pMsg7->m_ClientId);
+			return nullptr;
+		}
+		CTranslationContext::CClientData &Client = m_pClient->m_TranslationContext.m_aClients[pMsg7->m_ClientId];
+		Client.Reset();
+
+		if(pMsg7->m_Silent)
+			return nullptr;
+
+		if(Conn != g_Config.m_ClDummy)
+			return nullptr;
+
+		static char s_aBuf[128];
+		if(pMsg7->m_pReason[0])
+			str_format(s_aBuf, sizeof(s_aBuf), "'%s' has left the game (%s)", m_aClients[pMsg7->m_ClientId].m_aName, pMsg7->m_pReason);
+		else
+			str_format(s_aBuf, sizeof(s_aBuf), "'%s' has left the game", m_aClients[pMsg7->m_ClientId].m_aName);
+		m_Chat.AddLine(-1, 0, s_aBuf);
+
+		return nullptr;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_CLIENTINFO)
+	{
+		protocol7::CNetMsg_Sv_ClientInfo *pMsg7 = (protocol7::CNetMsg_Sv_ClientInfo *)pRawMsg;
+		if(pMsg7->m_ClientId < 0 || pMsg7->m_ClientId >= MAX_CLIENTS)
+		{
+			dbg_msg("sixup", "Sv_ClientInfo got invalid ClientId: %d", pMsg7->m_ClientId);
+			return nullptr;
+		}
+
+		if(pMsg7->m_Local)
+		{
+			m_pClient->m_TranslationContext.m_aLocalClientId[Conn] = pMsg7->m_ClientId;
+		}
+		CTranslationContext::CClientData &Client = m_pClient->m_TranslationContext.m_aClients[pMsg7->m_ClientId];
+		Client.m_Active = true;
+		Client.m_Team = pMsg7->m_Team;
+		str_copy(Client.m_aName, pMsg7->m_pName);
+		str_copy(Client.m_aClan, pMsg7->m_pClan);
+		Client.m_Country = pMsg7->m_Country;
+		ApplySkin7InfoFromGameMsg(pMsg7, pMsg7->m_ClientId, Conn);
+		if(m_pClient->m_TranslationContext.m_aLocalClientId[Conn] == -1)
+			return nullptr;
+		if(pMsg7->m_Silent || pMsg7->m_Local)
+			return nullptr;
+
+		if(Conn != g_Config.m_ClDummy)
+			return nullptr;
+
+		DoTeamChangeMessage7(
+			pMsg7->m_pName,
+			pMsg7->m_ClientId,
+			pMsg7->m_Team,
+			"entered and ");
+
+		return nullptr; // we only do side effects and add stuff to the snap here
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_GAMEINFO)
+	{
+		protocol7::CNetMsg_Sv_GameInfo *pMsg7 = (protocol7::CNetMsg_Sv_GameInfo *)pRawMsg;
+		m_pClient->m_TranslationContext.m_GameFlags = pMsg7->m_GameFlags;
+		m_pClient->m_TranslationContext.m_ScoreLimit = pMsg7->m_ScoreLimit;
+		m_pClient->m_TranslationContext.m_TimeLimit = pMsg7->m_TimeLimit;
+		m_pClient->m_TranslationContext.m_MatchNum = pMsg7->m_MatchNum;
+		m_pClient->m_TranslationContext.m_MatchCurrent = pMsg7->m_MatchCurrent;
+		m_pClient->m_TranslationContext.m_ShouldSendGameInfo = true;
+		return nullptr; // Added to snap by translation context
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_EMOTICON)
+	{
+		*pMsgId = NETMSGTYPE_SV_EMOTICON;
+		protocol7::CNetMsg_Sv_Emoticon *pMsg7 = (protocol7::CNetMsg_Sv_Emoticon *)pRawMsg;
+		::CNetMsg_Sv_Emoticon *pMsg = (::CNetMsg_Sv_Emoticon *)s_aRawMsg;
+
+		pMsg->m_ClientId = pMsg7->m_ClientId;
+		pMsg->m_Emoticon = pMsg7->m_Emoticon;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_KILLMSG)
+	{
+		*pMsgId = NETMSGTYPE_SV_KILLMSG;
+
+		protocol7::CNetMsg_Sv_KillMsg *pMsg7 = (protocol7::CNetMsg_Sv_KillMsg *)pRawMsg;
+		::CNetMsg_Sv_KillMsg *pMsg = (::CNetMsg_Sv_KillMsg *)s_aRawMsg;
+
+		pMsg->m_Killer = pMsg7->m_Killer;
+		pMsg->m_Victim = pMsg7->m_Victim;
+		pMsg->m_Weapon = pMsg7->m_Weapon;
+		pMsg->m_ModeSpecial = pMsg7->m_ModeSpecial;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_CHAT)
+	{
+		*pMsgId = NETMSGTYPE_SV_CHAT;
+
+		protocol7::CNetMsg_Sv_Chat *pMsg7 = (protocol7::CNetMsg_Sv_Chat *)pRawMsg;
+		::CNetMsg_Sv_Chat *pMsg = (::CNetMsg_Sv_Chat *)s_aRawMsg;
+
+		if(pMsg7->m_Mode == protocol7::CHAT_WHISPER)
+		{
+			bool Receive = pMsg7->m_TargetId == m_pClient->m_TranslationContext.m_aLocalClientId[Conn];
+
+			pMsg->m_Team = Receive ? 3 : 2;
+			pMsg->m_ClientId = Receive ? pMsg7->m_ClientId : pMsg7->m_TargetId;
+		}
+		else
+		{
+			pMsg->m_Team = pMsg7->m_Mode == protocol7::CHAT_TEAM ? 1 : 0;
+			pMsg->m_ClientId = pMsg7->m_ClientId;
+		}
+
+		pMsg->m_pMessage = pMsg7->m_pMessage;
+
+		return s_aRawMsg;
+	}
+	else if(*pMsgId == protocol7::NETMSGTYPE_SV_GAMEMSG)
+	{
+		int GameMsgId = pUnpacker->GetInt();
+
+		/**
+		 * Prints chat message only once
+		 * even if it is being sent to main tee and dummy
+		 */
+		auto SendChat = [Conn, GameMsgId, this](const char *pText) -> void {
+			if(GameMsgId != protocol7::GAMEMSG_TEAM_BALANCE_VICTIM && GameMsgId != protocol7::GAMEMSG_SPEC_INVALIDID)
+			{
+				if(Conn != g_Config.m_ClDummy)
+					return;
+			}
+			m_Chat.AddLine(-1, 0, pText);
+		};
+
+		// check for valid gamemsgid
+		if(GameMsgId < 0 || GameMsgId >= protocol7::NUM_GAMEMSGS)
+			return nullptr;
+
+		int aParaI[3] = {0};
+		int NumParaI = 0;
+
+		// get paras
+		switch(gs_GameMsgList7[GameMsgId].m_ParaType)
+		{
+		case PARA_I: NumParaI = 1; break;
+		case PARA_II: NumParaI = 2; break;
+		case PARA_III: NumParaI = 3; break;
+		}
+		for(int i = 0; i < NumParaI; i++)
+		{
+			aParaI[i] = pUnpacker->GetInt();
+		}
+
+		// check for unpacking errors
+		if(pUnpacker->Error())
+			return nullptr;
+
+		// handle special messages
+		char aBuf[256];
+		bool TeamPlay = m_pClient->m_TranslationContext.m_GameFlags & protocol7::GAMEFLAG_TEAMS;
+		if(gs_GameMsgList7[GameMsgId].m_Action == DO_SPECIAL)
+		{
+			switch(GameMsgId)
+			{
+			case protocol7::GAMEMSG_CTF_DROP:
+				if(Conn == g_Config.m_ClDummy)
+					m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_DROP);
+				break;
+			case protocol7::GAMEMSG_CTF_RETURN:
+				if(Conn == g_Config.m_ClDummy)
+					m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_RETURN);
+				break;
+			case protocol7::GAMEMSG_TEAM_ALL:
+			{
+				const char *pMsg = "";
+				switch(GetStrTeam7(aParaI[0], TeamPlay))
+				{
+				case STR_TEAM_GAME: pMsg = "All players were moved to the game"; break;
+				case STR_TEAM_RED: pMsg = "All players were moved to the red team"; break;
+				case STR_TEAM_BLUE: pMsg = "All players were moved to the blue team"; break;
+				case STR_TEAM_SPECTATORS: pMsg = "All players were moved to the spectators"; break;
+				}
+				m_Broadcast.DoBroadcast(pMsg); // client side broadcast
+			}
+			break;
+			case protocol7::GAMEMSG_TEAM_BALANCE_VICTIM:
+			{
+				const char *pMsg = "";
+				switch(GetStrTeam7(aParaI[0], TeamPlay))
+				{
+				case STR_TEAM_RED: pMsg = "You were moved to the red team due to team balancing"; break;
+				case STR_TEAM_BLUE: pMsg = "You were moved to the blue team due to team balancing"; break;
+				}
+				m_Broadcast.DoBroadcast(pMsg); // client side broadcast
+			}
+			break;
+			case protocol7::GAMEMSG_CTF_GRAB:
+				if(Conn == g_Config.m_ClDummy)
+					m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_GRAB_EN);
+				break;
+			case protocol7::GAMEMSG_GAME_PAUSED:
+			{
+				int ClientId = clamp(aParaI[0], 0, MAX_CLIENTS - 1);
+				str_format(aBuf, sizeof(aBuf), "'%s' initiated a pause", m_aClients[ClientId].m_aName);
+				SendChat(aBuf);
+			}
+			break;
+			case protocol7::GAMEMSG_CTF_CAPTURE:
+				if(Conn == g_Config.m_ClDummy)
+					m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_CAPTURE);
+				int ClientId = clamp(aParaI[1], 0, MAX_CLIENTS - 1);
+				m_aStats[ClientId].m_FlagCaptures++;
+
+				float Time = aParaI[2] / (float)Client()->GameTickSpeed();
+				if(Time <= 60)
+				{
+					if(aParaI[0])
+					{
+						str_format(aBuf, sizeof(aBuf), "The blue flag was captured by '%s' (%.2f seconds)", m_aClients[ClientId].m_aName, Time);
+					}
+					else
+					{
+						str_format(aBuf, sizeof(aBuf), "The red flag was captured by '%s' (%.2f seconds)", m_aClients[ClientId].m_aName, Time);
+					}
+				}
+				else
+				{
+					if(aParaI[0])
+					{
+						str_format(aBuf, sizeof(aBuf), "The blue flag was captured by '%s'", m_aClients[ClientId].m_aName);
+					}
+					else
+					{
+						str_format(aBuf, sizeof(aBuf), "The red flag was captured by '%s'", m_aClients[ClientId].m_aName);
+					}
+				}
+				SendChat(aBuf);
+			}
+			return nullptr;
+		}
+
+		// build message
+		const char *pText = "";
+		if(NumParaI == 0)
+		{
+			pText = gs_GameMsgList7[GameMsgId].m_pText;
+		}
+
+		// handle message
+		switch(gs_GameMsgList7[GameMsgId].m_Action)
+		{
+		case DO_CHAT:
+			SendChat(pText);
+			break;
+		case DO_BROADCAST:
+			m_Broadcast.DoBroadcast(pText); // client side broadcast
+			break;
+		}
+
+		// no need to handle it in 0.6 since we printed
+		// the message already
+		return nullptr;
+	}
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "dropped weird message '%s' (%d), failed on '%s'", m_NetObjHandler7.GetMsgName(*pMsgId), *pMsgId, m_NetObjHandler7.FailedMsgOn());
+	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+
+	return nullptr;
+}
diff --git a/src/game/client/sixup_translate_snapshot.cpp b/src/game/client/sixup_translate_snapshot.cpp
new file mode 100644
index 0000000000..2c33f4e1db
--- /dev/null
+++ b/src/game/client/sixup_translate_snapshot.cpp
@@ -0,0 +1,564 @@
+#include <engine/shared/protocolglue.h>
+#include <engine/shared/snapshot.h>
+#include <engine/shared/translation_context.h>
+#include <game/client/gameclient.h>
+#include <game/generated/protocol7.h>
+
+int CGameClient::TranslateSnap(CSnapshot *pSnapDstSix, CSnapshot *pSnapSrcSeven, int Conn, bool Dummy)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	float LocalTime = Client()->LocalTime();
+	int GameTick = Client()->GameTick(g_Config.m_ClDummy);
+	CTranslationContext &TranslationContext = Client()->m_TranslationContext;
+
+	for(auto &PlayerInfosRace : TranslationContext.m_apPlayerInfosRace)
+		PlayerInfosRace = nullptr;
+
+	int SpectatorId = -3;
+
+	for(int i = 0; i < pSnapSrcSeven->NumItems(); i++)
+	{
+		const CSnapshotItem *pItem7 = (CSnapshotItem *)pSnapSrcSeven->GetItem(i);
+		const int Size = pSnapSrcSeven->GetItemSize(i);
+		const int ItemType = pSnapSrcSeven->GetItemType(i);
+
+		// ddnet ex snap items
+		if((ItemType > __NETOBJTYPE_UUID_HELPER && ItemType < OFFSET_NETMSGTYPE_UUID) || pItem7->Type() == NETOBJTYPE_EX)
+		{
+			CUnpacker Unpacker;
+			Unpacker.Reset(pItem7->Data(), Size);
+
+			void *pRawObj = GetNetObjHandler()->SecureUnpackObj(ItemType, &Unpacker);
+			if(!pRawObj)
+			{
+				if(ItemType != UUID_UNKNOWN)
+					dbg_msg("sixup", "dropped weird ddnet ex object '%s' (%d), failed on '%s'", GetNetObjHandler()->GetObjName(ItemType), ItemType, GetNetObjHandler()->FailedObjOn());
+				continue;
+			}
+			const int ItemSize = GetNetObjHandler()->GetUnpackedObjSize(ItemType);
+
+			void *pObj = Builder.NewItem(pItem7->Type(), pItem7->Id(), ItemSize);
+			if(!pObj)
+				return -17;
+
+			mem_copy(pObj, pRawObj, ItemSize);
+			continue;
+		}
+
+		if(GetNetObjHandler7()->ValidateObj(pItem7->Type(), pItem7->Data(), Size) != 0)
+		{
+			if(pItem7->Type() > 0 && pItem7->Type() < CSnapshot::OFFSET_UUID_TYPE)
+			{
+				dbg_msg(
+					"sixup",
+					"invalidated index=%d type=%d (%s) size=%d id=%d",
+					i,
+					pItem7->Type(),
+					GetNetObjHandler7()->GetObjName(pItem7->Type()),
+					Size,
+					pItem7->Id());
+			}
+			pSnapSrcSeven->InvalidateItem(i);
+		}
+
+		if(pItem7->Type() == protocol7::NETOBJTYPE_PLAYERINFORACE)
+		{
+			const protocol7::CNetObj_PlayerInfoRace *pInfo = (const protocol7::CNetObj_PlayerInfoRace *)pItem7->Data();
+			int ClientId = pItem7->Id();
+			if(ClientId < MAX_CLIENTS && TranslationContext.m_aClients[ClientId].m_Active)
+			{
+				TranslationContext.m_apPlayerInfosRace[ClientId] = pInfo;
+			}
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_SPECTATORINFO)
+		{
+			const protocol7::CNetObj_SpectatorInfo *pSpec7 = (const protocol7::CNetObj_SpectatorInfo *)pItem7->Data();
+			SpectatorId = pSpec7->m_SpectatorId;
+			if(pSpec7->m_SpecMode == protocol7::SPEC_FREEVIEW)
+				SpectatorId = SPEC_FREEVIEW;
+		}
+	}
+
+	// hack to put game info in the snap
+	// even though in 0.7 we get it as a game message
+	// this message has to be on the top
+	// the client looks at the items in order and needs the gameinfo at the top
+	// otherwise it will not render skins with team colors
+	if(TranslationContext.m_ShouldSendGameInfo)
+	{
+		void *pObj = Builder.NewItem(NETOBJTYPE_GAMEINFO, 0, sizeof(CNetObj_GameInfo));
+		if(!pObj)
+			return -1;
+
+		int GameStateFlagsSix = 0;
+		if(TranslationContext.m_GameStateFlags7 & protocol7::GAMESTATEFLAG_GAMEOVER)
+			GameStateFlagsSix |= GAMESTATEFLAG_GAMEOVER;
+		if(TranslationContext.m_GameStateFlags7 & protocol7::GAMESTATEFLAG_SUDDENDEATH)
+			GameStateFlagsSix |= GAMESTATEFLAG_SUDDENDEATH;
+		if(TranslationContext.m_GameStateFlags7 & protocol7::GAMESTATEFLAG_PAUSED)
+			GameStateFlagsSix |= GAMESTATEFLAG_PAUSED;
+
+		/*
+			This is a 0.7 only flag that we just ignore for now
+
+			GAMESTATEFLAG_ROUNDOVER
+		*/
+
+		CNetObj_GameInfo Info6 = {};
+		Info6.m_GameFlags = TranslationContext.m_GameFlags;
+		Info6.m_GameStateFlags = GameStateFlagsSix;
+		Info6.m_RoundStartTick = TranslationContext.m_GameStartTick7;
+		Info6.m_WarmupTimer = 0; // removed in 0.7
+		if(TranslationContext.m_GameStateFlags7 & protocol7::GAMESTATEFLAG_WARMUP)
+			Info6.m_WarmupTimer = TranslationContext.m_GameStateEndTick7 - GameTick;
+		if(TranslationContext.m_GameStateFlags7 & protocol7::GAMESTATEFLAG_STARTCOUNTDOWN)
+			Info6.m_WarmupTimer = TranslationContext.m_GameStateEndTick7 - GameTick;
+
+		// hack to port 0.7 race timer to ddnet warmup gametimer hack
+		int TimerClientId = clamp(TranslationContext.m_aLocalClientId[Conn], 0, (int)MAX_CLIENTS);
+		if(SpectatorId >= 0)
+			TimerClientId = SpectatorId;
+		const protocol7::CNetObj_PlayerInfoRace *pRaceInfo = TranslationContext.m_apPlayerInfosRace[TimerClientId];
+		if(pRaceInfo)
+		{
+			Info6.m_WarmupTimer = -pRaceInfo->m_RaceStartTick;
+			Info6.m_GameStateFlags |= GAMESTATEFLAG_RACETIME;
+		}
+
+		Info6.m_ScoreLimit = TranslationContext.m_ScoreLimit;
+		Info6.m_TimeLimit = TranslationContext.m_TimeLimit;
+		Info6.m_RoundNum = TranslationContext.m_MatchNum;
+		Info6.m_RoundCurrent = TranslationContext.m_MatchCurrent;
+
+		mem_copy(pObj, &Info6, sizeof(CNetObj_GameInfo));
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		const CTranslationContext::CClientData &Client = TranslationContext.m_aClients[i];
+		if(!Client.m_Active)
+			continue;
+
+		void *pObj = Builder.NewItem(NETOBJTYPE_CLIENTINFO, i, sizeof(CNetObj_ClientInfo));
+		if(!pObj)
+			return -2;
+
+		CNetObj_ClientInfo Info6 = {};
+		StrToInts(&Info6.m_Name0, 4, Client.m_aName);
+		StrToInts(&Info6.m_Clan0, 3, Client.m_aClan);
+		Info6.m_Country = Client.m_Country;
+		StrToInts(&Info6.m_Skin0, 6, Client.m_aSkinName);
+		Info6.m_UseCustomColor = Client.m_UseCustomColor;
+		Info6.m_ColorBody = Client.m_ColorBody;
+		Info6.m_ColorFeet = Client.m_ColorFeet;
+		mem_copy(pObj, &Info6, sizeof(CNetObj_ClientInfo));
+	}
+
+	bool NewGameData = false;
+
+	for(int i = 0; i < pSnapSrcSeven->NumItems(); i++)
+	{
+		const CSnapshotItem *pItem7 = pSnapSrcSeven->GetItem(i);
+		const int Size = pSnapSrcSeven->GetItemSize(i);
+		// the first few items are a full match
+		// no translation needed
+		if(pItem7->Type() == protocol7::NETOBJTYPE_PROJECTILE ||
+			pItem7->Type() == protocol7::NETOBJTYPE_LASER ||
+			pItem7->Type() == protocol7::NETOBJTYPE_FLAG)
+		{
+			void *pObj = Builder.NewItem(pItem7->Type(), pItem7->Id(), Size);
+			if(!pObj)
+				return -4;
+
+			mem_copy(pObj, pItem7->Data(), Size);
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_PICKUP)
+		{
+			void *pObj = Builder.NewItem(NETOBJTYPE_PICKUP, pItem7->Id(), sizeof(CNetObj_Pickup));
+			if(!pObj)
+				return -5;
+
+			const protocol7::CNetObj_Pickup *pPickup7 = (const protocol7::CNetObj_Pickup *)pItem7->Data();
+			CNetObj_Pickup Pickup6 = {};
+			Pickup6.m_X = pPickup7->m_X;
+			Pickup6.m_Y = pPickup7->m_Y;
+			PickupType_SevenToSix(pPickup7->m_Type, Pickup6.m_Type, Pickup6.m_Subtype);
+
+			mem_copy(pObj, &Pickup6, sizeof(CNetObj_Pickup));
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_GAMEDATA)
+		{
+			const protocol7::CNetObj_GameData *pGameData = (const protocol7::CNetObj_GameData *)pItem7->Data();
+			TranslationContext.m_GameStateFlags7 = pGameData->m_GameStateFlags;
+			TranslationContext.m_GameStartTick7 = pGameData->m_GameStartTick;
+			TranslationContext.m_GameStateEndTick7 = pGameData->m_GameStateEndTick;
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_GAMEDATATEAM)
+		{
+			// 0.7 added GameDataTeam and GameDataFlag
+			// both items merged together have all fields of the 0.6 GameData
+			// so if we get either one of them we store the details in the translation context
+			// and build one GameData snap item after this loop
+			const protocol7::CNetObj_GameDataTeam *pTeam7 = (const protocol7::CNetObj_GameDataTeam *)pItem7->Data();
+
+			TranslationContext.m_TeamscoreRed = pTeam7->m_TeamscoreRed;
+			TranslationContext.m_TeamscoreBlue = pTeam7->m_TeamscoreBlue;
+			NewGameData = true;
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_GAMEDATAFLAG)
+		{
+			const protocol7::CNetObj_GameDataFlag *pFlag7 = (const protocol7::CNetObj_GameDataFlag *)pItem7->Data();
+
+			TranslationContext.m_FlagCarrierRed = pFlag7->m_FlagCarrierRed;
+			TranslationContext.m_FlagCarrierBlue = pFlag7->m_FlagCarrierBlue;
+			NewGameData = true;
+
+			// used for blinking the flags in the hud
+			// but that already works the 0.6 way
+			// and is covered by the NETOBJTYPE_GAMEDATA translation
+			// pFlag7->m_FlagDropTickRed;
+			// pFlag7->m_FlagDropTickBlue;
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_CHARACTER)
+		{
+			void *pObj = Builder.NewItem(NETOBJTYPE_CHARACTER, pItem7->Id(), sizeof(CNetObj_Character));
+			if(!pObj)
+				return -6;
+
+			const protocol7::CNetObj_Character *pChar7 = (const protocol7::CNetObj_Character *)pItem7->Data();
+
+			CNetObj_Character Char6 = {};
+			// character core is unchanged
+			mem_copy(&Char6, pItem7->Data(), sizeof(CNetObj_CharacterCore));
+
+			Char6.m_PlayerFlags = 0;
+			if(pItem7->Id() >= 0 && pItem7->Id() < MAX_CLIENTS)
+				Char6.m_PlayerFlags = PlayerFlags_SevenToSix(TranslationContext.m_aClients[pItem7->Id()].m_PlayerFlags7);
+			Char6.m_Health = pChar7->m_Health;
+			Char6.m_Armor = pChar7->m_Armor;
+			Char6.m_AmmoCount = pChar7->m_AmmoCount;
+			Char6.m_Weapon = pChar7->m_Weapon;
+			Char6.m_Emote = pChar7->m_Emote;
+			Char6.m_AttackTick = pChar7->m_AttackTick;
+
+			if(pChar7->m_TriggeredEvents & protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER)
+			{
+				void *pEvent = Builder.NewItem(NETEVENTTYPE_SOUNDWORLD, pItem7->Id(), sizeof(CNetEvent_SoundWorld));
+				if(!pEvent)
+					return -7;
+
+				CNetEvent_SoundWorld Sound = {};
+				Sound.m_X = pChar7->m_X;
+				Sound.m_Y = pChar7->m_Y;
+				Sound.m_SoundId = SOUND_HOOK_ATTACH_PLAYER;
+				mem_copy(pEvent, &Sound, sizeof(CNetEvent_SoundWorld));
+			}
+
+			if(TranslationContext.m_aLocalClientId[Conn] != pItem7->Id())
+			{
+				if(pChar7->m_TriggeredEvents & protocol7::COREEVENTFLAG_GROUND_JUMP)
+				{
+					void *pEvent = Builder.NewItem(NETEVENTTYPE_SOUNDWORLD, pItem7->Id(), sizeof(CNetEvent_SoundWorld));
+					if(!pEvent)
+						return -7;
+
+					CNetEvent_SoundWorld Sound = {};
+					Sound.m_X = pChar7->m_X;
+					Sound.m_Y = pChar7->m_Y;
+					Sound.m_SoundId = SOUND_PLAYER_JUMP;
+					mem_copy(pEvent, &Sound, sizeof(CNetEvent_SoundWorld));
+				}
+				if(pChar7->m_TriggeredEvents & protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND)
+				{
+					void *pEvent = Builder.NewItem(NETEVENTTYPE_SOUNDWORLD, pItem7->Id(), sizeof(CNetEvent_SoundWorld));
+					if(!pEvent)
+						return -7;
+
+					CNetEvent_SoundWorld Sound = {};
+					Sound.m_X = pChar7->m_X;
+					Sound.m_Y = pChar7->m_Y;
+					Sound.m_SoundId = SOUND_HOOK_ATTACH_GROUND;
+					mem_copy(pEvent, &Sound, sizeof(CNetEvent_SoundWorld));
+				}
+				if(pChar7->m_TriggeredEvents & protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK)
+				{
+					void *pEvent = Builder.NewItem(NETEVENTTYPE_SOUNDWORLD, pItem7->Id(), sizeof(CNetEvent_SoundWorld));
+					if(!pEvent)
+						return -7;
+
+					CNetEvent_SoundWorld Sound = {};
+					Sound.m_X = pChar7->m_X;
+					Sound.m_Y = pChar7->m_Y;
+					Sound.m_SoundId = SOUND_HOOK_NOATTACH;
+					mem_copy(pEvent, &Sound, sizeof(CNetEvent_SoundWorld));
+				}
+			}
+
+			mem_copy(pObj, &Char6, sizeof(CNetObj_Character));
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_PLAYERINFO)
+		{
+			void *pObj = Builder.NewItem(NETOBJTYPE_PLAYERINFO, pItem7->Id(), sizeof(CNetObj_PlayerInfo));
+			if(!pObj)
+				return -8;
+
+			const protocol7::CNetObj_PlayerInfo *pInfo7 = (const protocol7::CNetObj_PlayerInfo *)pItem7->Data();
+			CNetObj_PlayerInfo Info6 = {};
+			Info6.m_Local = TranslationContext.m_aLocalClientId[Conn] == pItem7->Id();
+			Info6.m_ClientId = pItem7->Id();
+			Info6.m_Team = 0;
+			if(pItem7->Id() >= 0 && pItem7->Id() < MAX_CLIENTS)
+			{
+				Info6.m_Team = TranslationContext.m_aClients[pItem7->Id()].m_Team;
+				TranslationContext.m_aClients[pItem7->Id()].m_PlayerFlags7 = pInfo7->m_PlayerFlags;
+			}
+			Info6.m_Score = pInfo7->m_Score;
+			Info6.m_Latency = pInfo7->m_Latency;
+			mem_copy(pObj, &Info6, sizeof(CNetObj_PlayerInfo));
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_SPECTATORINFO)
+		{
+			void *pObj = Builder.NewItem(NETOBJTYPE_SPECTATORINFO, pItem7->Id(), sizeof(CNetObj_SpectatorInfo));
+			if(!pObj)
+				return -9;
+
+			const protocol7::CNetObj_SpectatorInfo *pSpec7 = (const protocol7::CNetObj_SpectatorInfo *)pItem7->Data();
+			CNetObj_SpectatorInfo Spec6 = {};
+			Spec6.m_SpectatorId = pSpec7->m_SpectatorId;
+			if(pSpec7->m_SpecMode == protocol7::SPEC_FREEVIEW)
+				Spec6.m_SpectatorId = SPEC_FREEVIEW;
+			Spec6.m_X = pSpec7->m_X;
+			Spec6.m_Y = pSpec7->m_Y;
+			mem_copy(pObj, &Spec6, sizeof(CNetObj_SpectatorInfo));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_EXPLOSION)
+		{
+			void *pEvent = Builder.NewItem(NETEVENTTYPE_EXPLOSION, pItem7->Id(), sizeof(CNetEvent_Explosion));
+			if(!pEvent)
+				return -10;
+
+			const protocol7::CNetEvent_Explosion *pExplosion7 = (const protocol7::CNetEvent_Explosion *)pItem7->Data();
+			CNetEvent_Explosion Explosion6 = {};
+			Explosion6.m_X = pExplosion7->m_X;
+			Explosion6.m_Y = pExplosion7->m_Y;
+			mem_copy(pEvent, &Explosion6, sizeof(CNetEvent_Explosion));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_SPAWN)
+		{
+			void *pEvent = Builder.NewItem(NETEVENTTYPE_SPAWN, pItem7->Id(), sizeof(CNetEvent_Spawn));
+			if(!pEvent)
+				return -11;
+
+			const protocol7::CNetEvent_Spawn *pSpawn7 = (const protocol7::CNetEvent_Spawn *)pItem7->Data();
+			CNetEvent_Spawn Spawn6 = {};
+			Spawn6.m_X = pSpawn7->m_X;
+			Spawn6.m_Y = pSpawn7->m_Y;
+			mem_copy(pEvent, &Spawn6, sizeof(CNetEvent_Spawn));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_HAMMERHIT)
+		{
+			void *pEvent = Builder.NewItem(NETEVENTTYPE_HAMMERHIT, pItem7->Id(), sizeof(CNetEvent_HammerHit));
+			if(!pEvent)
+				return -12;
+
+			const protocol7::CNetEvent_HammerHit *pHammerHit7 = (const protocol7::CNetEvent_HammerHit *)pItem7->Data();
+			CNetEvent_HammerHit HammerHit6 = {};
+			HammerHit6.m_X = pHammerHit7->m_X;
+			HammerHit6.m_Y = pHammerHit7->m_Y;
+			mem_copy(pEvent, &HammerHit6, sizeof(CNetEvent_HammerHit));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_DEATH)
+		{
+			void *pEvent = Builder.NewItem(NETEVENTTYPE_DEATH, pItem7->Id(), sizeof(CNetEvent_Death));
+			if(!pEvent)
+				return -13;
+
+			const protocol7::CNetEvent_Death *pDeath7 = (const protocol7::CNetEvent_Death *)pItem7->Data();
+			CNetEvent_Death Death6 = {};
+			Death6.m_X = pDeath7->m_X;
+			Death6.m_Y = pDeath7->m_Y;
+			Death6.m_ClientId = pDeath7->m_ClientId;
+			mem_copy(pEvent, &Death6, sizeof(CNetEvent_Death));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_SOUNDWORLD)
+		{
+			void *pEvent = Builder.NewItem(NETEVENTTYPE_SOUNDWORLD, pItem7->Id(), sizeof(CNetEvent_SoundWorld));
+			if(!pEvent)
+				return -14;
+
+			const protocol7::CNetEvent_SoundWorld *pSoundWorld7 = (const protocol7::CNetEvent_SoundWorld *)pItem7->Data();
+			CNetEvent_SoundWorld SoundWorld6 = {};
+			SoundWorld6.m_X = pSoundWorld7->m_X;
+			SoundWorld6.m_Y = pSoundWorld7->m_Y;
+			SoundWorld6.m_SoundId = pSoundWorld7->m_SoundId;
+			mem_copy(pEvent, &SoundWorld6, sizeof(CNetEvent_SoundWorld));
+		}
+		else if(pItem7->Type() == protocol7::NETEVENTTYPE_DAMAGE)
+		{
+			// 0.7 introduced amount for damage indicators
+			// so for one 0.7 item we might create multiple 0.6 ones
+			const protocol7::CNetEvent_Damage *pDmg7 = (const protocol7::CNetEvent_Damage *)pItem7->Data();
+
+			int Amount = pDmg7->m_HealthAmount + pDmg7->m_ArmorAmount;
+			if(Amount < 1)
+				continue;
+
+			int ClientId = pDmg7->m_ClientId;
+			TranslationContext.m_aDamageTaken[ClientId]++;
+
+			float Angle;
+			// create healthmod indicator
+			if(LocalTime < TranslationContext.m_aDamageTakenTick[ClientId] + 0.5f)
+			{
+				// make sure that the damage indicators don't group together
+				Angle = TranslationContext.m_aDamageTaken[ClientId] * 0.25f;
+			}
+			else
+			{
+				TranslationContext.m_aDamageTaken[ClientId] = 0;
+				Angle = 0;
+			}
+
+			TranslationContext.m_aDamageTakenTick[ClientId] = LocalTime;
+
+			float a = 3 * pi / 2 + Angle;
+			float s = a - pi / 3;
+			float e = a + pi / 3;
+			for(int k = 0; k < Amount; k++)
+			{
+				// pItem7->Id() is reused that is technically wrong
+				// but the client implementation does not look at the ids
+				// and renders the damage indicators just fine
+				void *pEvent = Builder.NewItem(NETEVENTTYPE_DAMAGEIND, pItem7->Id(), sizeof(CNetEvent_DamageInd));
+				if(!pEvent)
+					return -16;
+
+				CNetEvent_DamageInd Dmg6 = {};
+				Dmg6.m_X = pDmg7->m_X;
+				Dmg6.m_Y = pDmg7->m_Y;
+				float f = mix(s, e, float(k + 1) / float(Amount + 2));
+				Dmg6.m_Angle = (int)(f * 256.0f);
+				mem_copy(pEvent, &Dmg6, sizeof(CNetEvent_DamageInd));
+			}
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_DE_CLIENTINFO)
+		{
+			const protocol7::CNetObj_De_ClientInfo *pInfo = (const protocol7::CNetObj_De_ClientInfo *)pItem7->Data();
+
+			const int ClientId = pItem7->Id();
+
+			if(ClientId < 0 || ClientId >= MAX_CLIENTS)
+			{
+				dbg_msg("sixup", "De_ClientInfo got invalid ClientId: %d", ClientId);
+				return -17;
+			}
+
+			if(pInfo->m_Local)
+			{
+				TranslationContext.m_aLocalClientId[Conn] = ClientId;
+			}
+			CTranslationContext::CClientData &Client = TranslationContext.m_aClients[ClientId];
+			Client.m_Active = true;
+			Client.m_Team = pInfo->m_Team;
+			IntsToStr(pInfo->m_aName, 4, Client.m_aName, std::size(Client.m_aName));
+			IntsToStr(pInfo->m_aClan, 3, Client.m_aClan, std::size(Client.m_aClan));
+			Client.m_Country = pInfo->m_Country;
+
+			ApplySkin7InfoFromSnapObj(pInfo, ClientId);
+		}
+		else if(pItem7->Type() == protocol7::NETOBJTYPE_DE_GAMEINFO)
+		{
+			const protocol7::CNetObj_De_GameInfo *pInfo = (const protocol7::CNetObj_De_GameInfo *)pItem7->Data();
+
+			TranslationContext.m_GameFlags = pInfo->m_GameFlags;
+			TranslationContext.m_ScoreLimit = pInfo->m_ScoreLimit;
+			TranslationContext.m_TimeLimit = pInfo->m_TimeLimit;
+			TranslationContext.m_MatchNum = pInfo->m_MatchNum;
+			TranslationContext.m_MatchCurrent = pInfo->m_MatchCurrent;
+			TranslationContext.m_ShouldSendGameInfo = true;
+		}
+	}
+
+	if(NewGameData)
+	{
+		void *pObj = Builder.NewItem(NETOBJTYPE_GAMEDATA, 0, sizeof(CNetObj_GameData));
+		if(!pObj)
+			return -17;
+
+		CNetObj_GameData GameData = {};
+		GameData.m_TeamscoreRed = TranslationContext.m_TeamscoreRed;
+		GameData.m_TeamscoreBlue = TranslationContext.m_TeamscoreBlue;
+		GameData.m_FlagCarrierRed = TranslationContext.m_FlagCarrierRed;
+		GameData.m_FlagCarrierBlue = TranslationContext.m_FlagCarrierBlue;
+		mem_copy(pObj, &GameData, sizeof(CNetObj_GameData));
+	}
+
+	return Builder.Finish(pSnapDstSix);
+}
+
+int CGameClient::OnDemoRecSnap7(CSnapshot *pFrom, CSnapshot *pTo, int Conn)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init7(pFrom);
+
+	// add client info
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(!m_aClients[i].m_Active)
+			continue;
+
+		void *pItem = Builder.NewItem(protocol7::NETOBJTYPE_DE_CLIENTINFO, i, sizeof(protocol7::CNetObj_De_ClientInfo));
+		if(!pItem)
+			return -1;
+
+		CTranslationContext::CClientData &ClientData = Client()->m_TranslationContext.m_aClients[i];
+
+		protocol7::CNetObj_De_ClientInfo ClientInfoObj;
+		ClientInfoObj.m_Local = i == Client()->m_TranslationContext.m_aLocalClientId[Conn];
+		ClientInfoObj.m_Team = ClientData.m_Team;
+		StrToInts(ClientInfoObj.m_aName, 4, m_aClients[i].m_aName);
+		StrToInts(ClientInfoObj.m_aClan, 3, m_aClients[i].m_aClan);
+		ClientInfoObj.m_Country = ClientData.m_Country;
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			StrToInts(ClientInfoObj.m_aaSkinPartNames[Part], 6, m_aClients[i].m_aSixup[Conn].m_aaSkinPartNames[Part]);
+			ClientInfoObj.m_aUseCustomColors[Part] = m_aClients[i].m_aSixup[Conn].m_aUseCustomColors[Part];
+			ClientInfoObj.m_aSkinPartColors[Part] = m_aClients[i].m_aSixup[Conn].m_aSkinPartColors[Part];
+		}
+
+		mem_copy(pItem, &ClientInfoObj, sizeof(protocol7::CNetObj_De_ClientInfo));
+	}
+
+	// add tuning
+	CTuningParams StandardTuning;
+	if(mem_comp(&StandardTuning, &m_aTuning[Conn], sizeof(CTuningParams)) != 0)
+	{
+		void *pItem = Builder.NewItem(protocol7::NETOBJTYPE_DE_TUNEPARAMS, 0, sizeof(protocol7::CNetObj_De_TuneParams));
+		if(!pItem)
+			return -2;
+
+		protocol7::CNetObj_De_TuneParams TuneParams;
+		mem_copy(&TuneParams.m_aTuneParams, &m_aTuning[Conn], sizeof(TuneParams));
+		mem_copy(pItem, &TuneParams, sizeof(protocol7::CNetObj_De_TuneParams));
+	}
+
+	// add game info
+	void *pItem = Builder.NewItem(protocol7::NETOBJTYPE_DE_GAMEINFO, 0, sizeof(protocol7::CNetObj_De_GameInfo));
+	if(!pItem)
+		return -3;
+
+	protocol7::CNetObj_De_GameInfo GameInfo;
+
+	GameInfo.m_GameFlags = Client()->m_TranslationContext.m_GameFlags;
+	GameInfo.m_ScoreLimit = Client()->m_TranslationContext.m_ScoreLimit;
+	GameInfo.m_TimeLimit = Client()->m_TranslationContext.m_TimeLimit;
+	GameInfo.m_MatchNum = Client()->m_TranslationContext.m_MatchNum;
+	GameInfo.m_MatchCurrent = Client()->m_TranslationContext.m_MatchCurrent;
+
+	mem_copy(pItem, &GameInfo, sizeof(protocol7::CNetObj_De_GameInfo));
+
+	return Builder.Finish(pTo);
+}
diff --git a/src/game/client/skin.h b/src/game/client/skin.h
index aed057e3c1..b679186708 100644
--- a/src/game/client/skin.h
+++ b/src/game/client/skin.h
@@ -37,6 +37,18 @@ struct CSkin
 			for(auto &Eye : m_aEyes)
 				Eye = IGraphics::CTextureHandle();
 		}
+
+		void Unload(IGraphics *pGraphics)
+		{
+			pGraphics->UnloadTexture(&m_Body);
+			pGraphics->UnloadTexture(&m_BodyOutline);
+			pGraphics->UnloadTexture(&m_Feet);
+			pGraphics->UnloadTexture(&m_FeetOutline);
+			pGraphics->UnloadTexture(&m_Hands);
+			pGraphics->UnloadTexture(&m_HandsOutline);
+			for(auto &Eye : m_aEyes)
+				pGraphics->UnloadTexture(&Eye);
+		}
 	};
 
 	SSkinTextures m_OriginalSkin;
@@ -142,6 +154,25 @@ struct CSkin
 	CSkin &operator=(CSkin &&) = default;
 
 	const char *GetName() const { return m_aName; }
+
+	// has to be kept in sync with m_aSkinNameRestrictions
+	static bool IsValidName(const char *pName)
+	{
+		if(pName[0] == '\0' || str_length(pName) >= (int)sizeof(CSkin("").m_aName))
+		{
+			return false;
+		}
+
+		for(int i = 0; pName[i] != '\0'; ++i)
+		{
+			if(pName[i] == '"' || pName[i] == '/' || pName[i] == '\\')
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+	static constexpr char m_aSkinNameRestrictions[] = "Skin names must be valid filenames shorter than 24 characters.";
 };
 
 #endif
diff --git a/src/game/client/ui.cpp b/src/game/client/ui.cpp
index d1ee0242b6..fada88295b 100644
--- a/src/game/client/ui.cpp
+++ b/src/game/client/ui.cpp
@@ -18,7 +18,7 @@
 
 using namespace FontIcons;
 
-void CUIElement::Init(CUI *pUI, int RequestedRectCount)
+void CUIElement::Init(CUi *pUI, int RequestedRectCount)
 {
 	m_pUI = pUI;
 	pUI->AddUIElement(this);
@@ -57,9 +57,9 @@ void CUIElement::SUIElementRect::Reset()
 void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int Corners, float Rounding)
 {
 	bool NeedsRecreate = false;
-	if(m_UIRectQuadContainer == -1 || m_Width != pRect->w || m_Height != pRect->h || mem_comp(&m_QuadColor, &Color, sizeof(Color)) != 0)
+	if(m_UIRectQuadContainer == -1 || m_Width != pRect->w || m_Height != pRect->h || m_QuadColor != Color)
 	{
-		m_pParent->UI()->Graphics()->DeleteQuadContainer(m_UIRectQuadContainer);
+		m_pParent->Ui()->Graphics()->DeleteQuadContainer(m_UIRectQuadContainer);
 		NeedsRecreate = true;
 	}
 	m_X = pRect->x;
@@ -70,13 +70,13 @@ void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int
 		m_Height = pRect->h;
 		m_QuadColor = Color;
 
-		m_pParent->UI()->Graphics()->SetColor(Color);
-		m_UIRectQuadContainer = m_pParent->UI()->Graphics()->CreateRectQuadContainer(0, 0, pRect->w, pRect->h, Rounding, Corners);
-		m_pParent->UI()->Graphics()->SetColor(1, 1, 1, 1);
+		m_pParent->Ui()->Graphics()->SetColor(Color);
+		m_UIRectQuadContainer = m_pParent->Ui()->Graphics()->CreateRectQuadContainer(0, 0, pRect->w, pRect->h, Rounding, Corners);
+		m_pParent->Ui()->Graphics()->SetColor(1, 1, 1, 1);
 	}
 
-	m_pParent->UI()->Graphics()->TextureClear();
-	m_pParent->UI()->Graphics()->RenderQuadContainerEx(m_UIRectQuadContainer,
+	m_pParent->Ui()->Graphics()->TextureClear();
+	m_pParent->Ui()->Graphics()->RenderQuadContainerEx(m_UIRectQuadContainer,
 		0, -1, m_X, m_Y, 1, 1);
 }
 
@@ -84,21 +84,21 @@ void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int
  UI
 *********************************************************/
 
-const CLinearScrollbarScale CUI::ms_LinearScrollbarScale;
-const CLogarithmicScrollbarScale CUI::ms_LogarithmicScrollbarScale(25);
-const CDarkButtonColorFunction CUI::ms_DarkButtonColorFunction;
-const CLightButtonColorFunction CUI::ms_LightButtonColorFunction;
-const CScrollBarColorFunction CUI::ms_ScrollBarColorFunction;
-const float CUI::ms_FontmodHeight = 0.8f;
+const CLinearScrollbarScale CUi::ms_LinearScrollbarScale;
+const CLogarithmicScrollbarScale CUi::ms_LogarithmicScrollbarScale(25);
+const CDarkButtonColorFunction CUi::ms_DarkButtonColorFunction;
+const CLightButtonColorFunction CUi::ms_LightButtonColorFunction;
+const CScrollBarColorFunction CUi::ms_ScrollBarColorFunction;
+const float CUi::ms_FontmodHeight = 0.8f;
 
-CUI *CUIElementBase::s_pUI = nullptr;
+CUi *CUIElementBase::s_pUI = nullptr;
 
 IClient *CUIElementBase::Client() const { return s_pUI->Client(); }
 IGraphics *CUIElementBase::Graphics() const { return s_pUI->Graphics(); }
 IInput *CUIElementBase::Input() const { return s_pUI->Input(); }
 ITextRender *CUIElementBase::TextRender() const { return s_pUI->TextRender(); }
 
-void CUI::Init(IKernel *pKernel)
+void CUi::Init(IKernel *pKernel)
 {
 	m_pClient = pKernel->RequestInterface<IClient>();
 	m_pGraphics = pKernel->RequestInterface<IGraphics>();
@@ -109,27 +109,15 @@ void CUI::Init(IKernel *pKernel)
 	CUIElementBase::Init(this);
 }
 
-CUI::CUI()
+CUi::CUi()
 {
 	m_Enabled = true;
 
-	m_pHotItem = nullptr;
-	m_pActiveItem = nullptr;
-	m_pLastActiveItem = nullptr;
-	m_pBecomingHotItem = nullptr;
-
-	m_MouseX = 0;
-	m_MouseY = 0;
-	m_MouseWorldX = 0;
-	m_MouseWorldY = 0;
-	m_MouseButtons = 0;
-	m_LastMouseButtons = 0;
-
 	m_Screen.x = 0.0f;
 	m_Screen.y = 0.0f;
 }
 
-CUI::~CUI()
+CUi::~CUi()
 {
 	for(CUIElement *&pEl : m_vpOwnUIElements)
 	{
@@ -138,7 +126,7 @@ CUI::~CUI()
 	m_vpOwnUIElements.clear();
 }
 
-CUIElement *CUI::GetNewUIElement(int RequestedRectCount)
+CUIElement *CUi::GetNewUIElement(int RequestedRectCount)
 {
 	CUIElement *pNewEl = new CUIElement(this, RequestedRectCount);
 
@@ -147,12 +135,12 @@ CUIElement *CUI::GetNewUIElement(int RequestedRectCount)
 	return pNewEl;
 }
 
-void CUI::AddUIElement(CUIElement *pElement)
+void CUi::AddUIElement(CUIElement *pElement)
 {
 	m_vpUIElements.push_back(pElement);
 }
 
-void CUI::ResetUIElement(CUIElement &UIElement) const
+void CUi::ResetUIElement(CUIElement &UIElement) const
 {
 	for(CUIElement::SUIElementRect &Rect : UIElement.m_vUIRects)
 	{
@@ -162,7 +150,7 @@ void CUI::ResetUIElement(CUIElement &UIElement) const
 	}
 }
 
-void CUI::OnElementsReset()
+void CUi::OnElementsReset()
 {
 	for(CUIElement *pEl : m_vpUIElements)
 	{
@@ -170,56 +158,88 @@ void CUI::OnElementsReset()
 	}
 }
 
-void CUI::OnWindowResize()
+void CUi::OnWindowResize()
 {
 	OnElementsReset();
 }
 
-void CUI::OnCursorMove(float X, float Y)
+void CUi::OnCursorMove(float X, float Y)
 {
 	if(!CheckMouseLock())
 	{
-		m_UpdatedMousePos.x = clamp(m_UpdatedMousePos.x + X, 0.0f, (float)Graphics()->WindowWidth());
-		m_UpdatedMousePos.y = clamp(m_UpdatedMousePos.y + Y, 0.0f, (float)Graphics()->WindowHeight());
+		m_UpdatedMousePos.x = clamp(m_UpdatedMousePos.x + X, 0.0f, Graphics()->WindowWidth() - 1.0f);
+		m_UpdatedMousePos.y = clamp(m_UpdatedMousePos.y + Y, 0.0f, Graphics()->WindowHeight() - 1.0f);
 	}
 
 	m_UpdatedMouseDelta += vec2(X, Y);
 }
 
-void CUI::Update()
+void CUi::Update(vec2 MouseWorldPos)
 {
+	const vec2 WindowSize = vec2(Graphics()->WindowWidth(), Graphics()->WindowHeight());
 	const CUIRect *pScreen = Screen();
-	const float MouseX = (m_UpdatedMousePos.x / (float)Graphics()->WindowWidth()) * pScreen->w;
-	const float MouseY = (m_UpdatedMousePos.y / (float)Graphics()->WindowHeight()) * pScreen->h;
-	Update(MouseX, MouseY, m_UpdatedMouseDelta.x, m_UpdatedMouseDelta.y, MouseX * 3.0f, MouseY * 3.0f);
-	m_UpdatedMouseDelta = vec2(0.0f, 0.0f);
-}
 
-void CUI::Update(float MouseX, float MouseY, float MouseDeltaX, float MouseDeltaY, float MouseWorldX, float MouseWorldY)
-{
-	unsigned MouseButtons = 0;
+	unsigned UpdatedMouseButtonsNext = 0;
 	if(Enabled())
 	{
-		if(Input()->KeyIsPressed(KEY_MOUSE_1))
-			MouseButtons |= 1;
-		if(Input()->KeyIsPressed(KEY_MOUSE_2))
-			MouseButtons |= 2;
-		if(Input()->KeyIsPressed(KEY_MOUSE_3))
-			MouseButtons |= 4;
+		// Update mouse buttons based on mouse keys
+		for(int MouseKey = KEY_MOUSE_1; MouseKey <= KEY_MOUSE_3; ++MouseKey)
+		{
+			if(Input()->KeyIsPressed(MouseKey))
+			{
+				m_UpdatedMouseButtons |= 1 << (MouseKey - KEY_MOUSE_1);
+			}
+		}
+
+		// Update mouse position and buttons based on touch finger state
+		UpdateTouchState(m_TouchState);
+		if(m_TouchState.m_AnyPressed)
+		{
+			if(!CheckMouseLock())
+			{
+				m_UpdatedMousePos = m_TouchState.m_PrimaryPosition * WindowSize;
+				m_UpdatedMousePos.x = clamp(m_UpdatedMousePos.x, 0.0f, WindowSize.x - 1.0f);
+				m_UpdatedMousePos.y = clamp(m_UpdatedMousePos.y, 0.0f, WindowSize.y - 1.0f);
+			}
+			m_UpdatedMouseDelta += m_TouchState.m_PrimaryDelta * WindowSize;
+
+			// Scroll currently hovered scroll region with touch scroll gesture.
+			if(m_TouchState.m_ScrollAmount != vec2(0.0f, 0.0f))
+			{
+				if(m_pHotScrollRegion != nullptr)
+				{
+					m_pHotScrollRegion->ScrollRelativeDirect(-m_TouchState.m_ScrollAmount.y * pScreen->h);
+				}
+				m_TouchState.m_ScrollAmount = vec2(0.0f, 0.0f);
+			}
+
+			// We need to delay the click until the next update or it's not possible to use UI
+			// elements because click and hover would happen at the same time for touch events.
+			if(m_TouchState.m_PrimaryPressed)
+			{
+				UpdatedMouseButtonsNext |= 1;
+			}
+			if(m_TouchState.m_SecondaryPressed)
+			{
+				UpdatedMouseButtonsNext |= 2;
+			}
+		}
 	}
 
-	m_MouseDeltaX = MouseDeltaX;
-	m_MouseDeltaY = MouseDeltaY;
-	m_MouseX = MouseX;
-	m_MouseY = MouseY;
-	m_MouseWorldX = MouseWorldX;
-	m_MouseWorldY = MouseWorldY;
+	m_MousePos = m_UpdatedMousePos * vec2(pScreen->w, pScreen->h) / WindowSize;
+	m_MouseDelta = m_UpdatedMouseDelta;
+	m_UpdatedMouseDelta = vec2(0.0f, 0.0f);
+	m_MouseWorldPos = MouseWorldPos;
 	m_LastMouseButtons = m_MouseButtons;
-	m_MouseButtons = MouseButtons;
+	m_MouseButtons = m_UpdatedMouseButtons;
+	m_UpdatedMouseButtons = UpdatedMouseButtonsNext;
+
 	m_pHotItem = m_pBecomingHotItem;
 	if(m_pActiveItem)
 		m_pHotItem = m_pActiveItem;
 	m_pBecomingHotItem = nullptr;
+	m_pHotScrollRegion = m_pBecomingHotScrollRegion;
+	m_pBecomingHotScrollRegion = nullptr;
 
 	if(Enabled())
 	{
@@ -231,24 +251,28 @@ void CUI::Update(float MouseX, float MouseY, float MouseDeltaX, float MouseDelta
 	{
 		m_pHotItem = nullptr;
 		m_pActiveItem = nullptr;
+		m_pHotScrollRegion = nullptr;
 	}
+
+	m_ProgressSpinnerOffset += Client()->RenderFrameTime() * 1.5f;
+	m_ProgressSpinnerOffset = std::fmod(m_ProgressSpinnerOffset, 1.0f);
 }
 
-void CUI::DebugRender()
+void CUi::DebugRender(float X, float Y)
 {
 	MapScreen();
 
 	char aBuf[128];
 	str_format(aBuf, sizeof(aBuf), "hot=%p nexthot=%p active=%p lastactive=%p", HotItem(), NextHotItem(), ActiveItem(), m_pLastActiveItem);
-	TextRender()->Text(2.0f, Screen()->h - 12.0f, 10.0f, aBuf);
+	TextRender()->Text(X, Y, 10.0f, aBuf);
 }
 
-bool CUI::MouseInside(const CUIRect *pRect) const
+bool CUi::MouseInside(const CUIRect *pRect) const
 {
-	return pRect->Inside(m_MouseX, m_MouseY);
+	return pRect->Inside(MousePos());
 }
 
-void CUI::ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType) const
+void CUi::ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType) const
 {
 	float Factor = 1.0f;
 	switch(CursorType)
@@ -260,7 +284,7 @@ void CUI::ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType)
 		Factor = g_Config.m_UiControllerSens / 100.0f;
 		break;
 	default:
-		dbg_msg("assert", "CUI::ConvertMouseMove CursorType %d", (int)CursorType);
+		dbg_msg("assert", "CUi::ConvertMouseMove CursorType %d", (int)CursorType);
 		dbg_break();
 		break;
 	}
@@ -272,14 +296,95 @@ void CUI::ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType)
 	*pY *= Factor;
 }
 
-bool CUI::ConsumeHotkey(EHotkey Hotkey)
+void CUi::UpdateTouchState(CTouchState &State) const
+{
+	const std::vector<IInput::CTouchFingerState> &vTouchFingerStates = Input()->TouchFingerStates();
+
+	// Updated touch position as long as any finger is beinged pressed.
+	const bool WasAnyPressed = State.m_AnyPressed;
+	State.m_AnyPressed = !vTouchFingerStates.empty();
+	if(State.m_AnyPressed)
+	{
+		// We always use the position of first finger being pressed down. Multi-touch UI is
+		// not possible and always choosing the last finger would cause the cursor to briefly
+		// warp without having any effect if multiple fingers are used.
+		const IInput::CTouchFingerState &PrimaryTouchFingerState = vTouchFingerStates.front();
+		State.m_PrimaryPosition = PrimaryTouchFingerState.m_Position;
+		State.m_PrimaryDelta = PrimaryTouchFingerState.m_Delta;
+	}
+
+	// Update primary (left click) and secondary (right click) action.
+	if(State.m_SecondaryPressedNext)
+	{
+		// The secondary action is delayed by one frame until the primary has been released,
+		// otherwise most UI elements cannot be activated by the secondary action because they
+		// never become the hot-item unless all mouse buttons are released for one frame.
+		State.m_SecondaryPressedNext = false;
+		State.m_SecondaryPressed = true;
+	}
+	else if(vTouchFingerStates.size() != 1)
+	{
+		// Consider primary and secondary to be pressed only when exactly one finger is pressed,
+		// to avoid UI elements and console text selection being activated while scrolling.
+		State.m_PrimaryPressed = false;
+		State.m_SecondaryPressed = false;
+	}
+	else if(!WasAnyPressed)
+	{
+		State.m_PrimaryPressed = true;
+		State.m_SecondaryActivationTime = Client()->GlobalTime();
+		State.m_SecondaryActivationDelta = vec2(0.0f, 0.0f);
+	}
+	else if(State.m_PrimaryPressed)
+	{
+		// Activate secondary by pressing and holding roughly on the same position for some time.
+		const float SecondaryActivationDelay = 0.5f;
+		const float SecondaryActivationMaxDistance = 0.001f;
+		State.m_SecondaryActivationDelta += State.m_PrimaryDelta;
+		if(Client()->GlobalTime() - State.m_SecondaryActivationTime >= SecondaryActivationDelay &&
+			length(State.m_SecondaryActivationDelta) <= SecondaryActivationMaxDistance)
+		{
+			State.m_PrimaryPressed = false;
+			State.m_SecondaryPressedNext = true;
+		}
+	}
+
+	// Handle two fingers being moved roughly in same direction as a scrolling gesture.
+	if(vTouchFingerStates.size() == 2)
+	{
+		const vec2 Delta0 = vTouchFingerStates[0].m_Delta;
+		const vec2 Delta1 = vTouchFingerStates[1].m_Delta;
+		const float Similarity = dot(normalize(Delta0), normalize(Delta1));
+		const float SimilarityThreshold = 0.8f; // How parallel the deltas have to be (1.0f being completely parallel)
+		if(Similarity > SimilarityThreshold)
+		{
+			const float DirectionThreshold = 3.0f; // How much longer the delta of one axis has to be compared to other axis
+
+			// Vertical scrolling (y-delta must be larger than x-delta)
+			if(absolute(Delta0.y) > DirectionThreshold * absolute(Delta0.x) &&
+				absolute(Delta1.y) > DirectionThreshold * absolute(Delta1.x) &&
+				Delta0.y * Delta1.y > 0.0f) // Same y direction required
+			{
+				// Accumulate average delta of the two fingers
+				State.m_ScrollAmount.y += (Delta0.y + Delta1.y) / 2.0f;
+			}
+		}
+	}
+	else
+	{
+		// Scrolling gesture should start from zero again if released.
+		State.m_ScrollAmount = vec2(0.0f, 0.0f);
+	}
+}
+
+bool CUi::ConsumeHotkey(EHotkey Hotkey)
 {
 	const bool Pressed = m_HotkeysPressed & Hotkey;
 	m_HotkeysPressed &= ~Hotkey;
 	return Pressed;
 }
 
-bool CUI::OnInput(const IInput::CEvent &Event)
+bool CUi::OnInput(const IInput::CEvent &Event)
 {
 	if(!Enabled())
 		return false;
@@ -303,6 +408,10 @@ bool CUI::OnInput(const IInput::CEvent &Event)
 			m_HotkeysPressed |= HOTKEY_UP;
 		else if(Event.m_Key == KEY_DOWN)
 			m_HotkeysPressed |= HOTKEY_DOWN;
+		else if(Event.m_Key == KEY_LEFT)
+			m_HotkeysPressed |= HOTKEY_LEFT;
+		else if(Event.m_Key == KEY_RIGHT)
+			m_HotkeysPressed |= HOTKEY_RIGHT;
 		else if(Event.m_Key == KEY_MOUSE_WHEEL_UP)
 			m_HotkeysPressed |= HOTKEY_SCROLL_UP;
 		else if(Event.m_Key == KEY_MOUSE_WHEEL_DOWN)
@@ -320,34 +429,34 @@ bool CUI::OnInput(const IInput::CEvent &Event)
 	return false;
 }
 
-float CUI::ButtonColorMul(const void *pID)
+float CUi::ButtonColorMul(const void *pId)
 {
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 		return ButtonColorMulActive();
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 		return ButtonColorMulHot();
 	return ButtonColorMulDefault();
 }
 
-const CUIRect *CUI::Screen()
+const CUIRect *CUi::Screen()
 {
 	m_Screen.h = 600.0f;
 	m_Screen.w = Graphics()->ScreenAspect() * m_Screen.h;
 	return &m_Screen;
 }
 
-void CUI::MapScreen()
+void CUi::MapScreen()
 {
 	const CUIRect *pScreen = Screen();
 	Graphics()->MapScreen(pScreen->x, pScreen->y, pScreen->w, pScreen->h);
 }
 
-float CUI::PixelSize()
+float CUi::PixelSize()
 {
 	return Screen()->w / Graphics()->ScreenWidth();
 }
 
-void CUI::ClipEnable(const CUIRect *pRect)
+void CUi::ClipEnable(const CUIRect *pRect)
 {
 	if(IsClipped())
 	{
@@ -366,20 +475,20 @@ void CUI::ClipEnable(const CUIRect *pRect)
 	UpdateClipping();
 }
 
-void CUI::ClipDisable()
+void CUi::ClipDisable()
 {
 	dbg_assert(IsClipped(), "no clip region");
 	m_vClips.pop_back();
 	UpdateClipping();
 }
 
-const CUIRect *CUI::ClipArea() const
+const CUIRect *CUi::ClipArea() const
 {
 	dbg_assert(IsClipped(), "no clip region");
 	return &m_vClips.back();
 }
 
-void CUI::UpdateClipping()
+void CUi::UpdateClipping()
 {
 	if(IsClipped())
 	{
@@ -394,146 +503,159 @@ void CUI::UpdateClipping()
 	}
 }
 
-int CUI::DoButtonLogic(const void *pID, int Checked, const CUIRect *pRect)
+int CUi::DoButtonLogic(const void *pId, int Checked, const CUIRect *pRect)
 {
 	// logic
 	int ReturnValue = 0;
 	const bool Inside = MouseHovered(pRect);
-	static int s_ButtonUsed = -1;
 
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 	{
-		if(s_ButtonUsed >= 0 && !MouseButton(s_ButtonUsed))
+		dbg_assert(m_ActiveButtonLogicButton >= 0, "m_ActiveButtonLogicButton invalid");
+		if(!MouseButton(m_ActiveButtonLogicButton))
 		{
 			if(Inside && Checked >= 0)
-				ReturnValue = 1 + s_ButtonUsed;
+				ReturnValue = 1 + m_ActiveButtonLogicButton;
 			SetActiveItem(nullptr);
-			s_ButtonUsed = -1;
+			m_ActiveButtonLogicButton = -1;
 		}
 	}
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 	{
 		for(int i = 0; i < 3; ++i)
 		{
 			if(MouseButton(i))
 			{
-				SetActiveItem(pID);
-				s_ButtonUsed = i;
+				SetActiveItem(pId);
+				m_ActiveButtonLogicButton = i;
 			}
 		}
 	}
 
 	if(Inside && !MouseButton(0) && !MouseButton(1) && !MouseButton(2))
-		SetHotItem(pID);
+		SetHotItem(pId);
 
 	return ReturnValue;
 }
 
-int CUI::DoDraggableButtonLogic(const void *pID, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted)
+int CUi::DoDraggableButtonLogic(const void *pId, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted)
 {
 	// logic
 	int ReturnValue = 0;
 	const bool Inside = MouseHovered(pRect);
-	static int s_ButtonUsed = -1;
 
 	if(pClicked != nullptr)
 		*pClicked = false;
 	if(pAbrupted != nullptr)
 		*pAbrupted = false;
 
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 	{
-		if(s_ButtonUsed == 0)
+		dbg_assert(m_ActiveDraggableButtonLogicButton >= 0, "m_ActiveDraggableButtonLogicButton invalid");
+		if(m_ActiveDraggableButtonLogicButton == 0)
 		{
 			if(Checked >= 0)
-				ReturnValue = 1 + s_ButtonUsed;
-			if(!MouseButton(s_ButtonUsed))
+				ReturnValue = 1 + m_ActiveDraggableButtonLogicButton;
+			if(!MouseButton(m_ActiveDraggableButtonLogicButton))
 			{
 				if(pClicked != nullptr)
 					*pClicked = true;
 				SetActiveItem(nullptr);
-				s_ButtonUsed = -1;
+				m_ActiveDraggableButtonLogicButton = -1;
 			}
 			if(MouseButton(1))
 			{
 				if(pAbrupted != nullptr)
 					*pAbrupted = true;
 				SetActiveItem(nullptr);
-				s_ButtonUsed = -1;
+				m_ActiveDraggableButtonLogicButton = -1;
 			}
 		}
-		else if(s_ButtonUsed > 0 && !MouseButton(s_ButtonUsed))
+		else if(!MouseButton(m_ActiveDraggableButtonLogicButton))
 		{
 			if(Inside && Checked >= 0)
-				ReturnValue = 1 + s_ButtonUsed;
+				ReturnValue = 1 + m_ActiveDraggableButtonLogicButton;
 			if(pClicked != nullptr)
 				*pClicked = true;
 			SetActiveItem(nullptr);
-			s_ButtonUsed = -1;
+			m_ActiveDraggableButtonLogicButton = -1;
 		}
 	}
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 	{
 		for(int i = 0; i < 3; ++i)
 		{
 			if(MouseButton(i))
 			{
-				SetActiveItem(pID);
-				s_ButtonUsed = i;
+				SetActiveItem(pId);
+				m_ActiveDraggableButtonLogicButton = i;
 			}
 		}
 	}
 
 	if(Inside && !MouseButton(0) && !MouseButton(1) && !MouseButton(2))
-		SetHotItem(pID);
+		SetHotItem(pId);
 
 	return ReturnValue;
 }
 
-EEditState CUI::DoPickerLogic(const void *pID, const CUIRect *pRect, float *pX, float *pY)
+bool CUi::DoDoubleClickLogic(const void *pId)
 {
-	static const void *s_pEditing = nullptr;
+	if(m_DoubleClickState.m_pLastClickedId == pId &&
+		Client()->GlobalTime() - m_DoubleClickState.m_LastClickTime < 0.5f &&
+		distance(m_DoubleClickState.m_LastClickPos, MousePos()) <= 32.0f * Screen()->h / Graphics()->ScreenHeight())
+	{
+		m_DoubleClickState.m_pLastClickedId = nullptr;
+		return true;
+	}
+	m_DoubleClickState.m_pLastClickedId = pId;
+	m_DoubleClickState.m_LastClickTime = Client()->GlobalTime();
+	m_DoubleClickState.m_LastClickPos = MousePos();
+	return false;
+}
 
+EEditState CUi::DoPickerLogic(const void *pId, const CUIRect *pRect, float *pX, float *pY)
+{
 	if(MouseHovered(pRect))
-		SetHotItem(pID);
+		SetHotItem(pId);
 
 	EEditState Res = EEditState::EDITING;
 
-	if(HotItem() == pID && MouseButtonClicked(0))
+	if(HotItem() == pId && MouseButtonClicked(0))
 	{
-		SetActiveItem(pID);
-		if(!s_pEditing)
+		SetActiveItem(pId);
+		if(!m_pLastEditingItem)
 		{
-			s_pEditing = pID;
+			m_pLastEditingItem = pId;
 			Res = EEditState::START;
 		}
 	}
 
-	if(CheckActiveItem(pID) && !MouseButton(0))
+	if(CheckActiveItem(pId) && !MouseButton(0))
 	{
 		SetActiveItem(nullptr);
-		if(s_pEditing == pID)
+		if(m_pLastEditingItem == pId)
 		{
-			s_pEditing = nullptr;
+			m_pLastEditingItem = nullptr;
 			Res = EEditState::END;
 		}
 	}
 
-	if(!CheckActiveItem(pID) && Res == EEditState::EDITING)
+	if(!CheckActiveItem(pId) && Res == EEditState::EDITING)
 		return EEditState::NONE;
 
 	if(Input()->ShiftIsPressed())
 		m_MouseSlow = true;
 
 	if(pX)
-		*pX = clamp(m_MouseX - pRect->x, 0.0f, pRect->w);
+		*pX = clamp(MouseX() - pRect->x, 0.0f, pRect->w);
 	if(pY)
-		*pY = clamp(m_MouseY - pRect->y, 0.0f, pRect->h);
+		*pY = clamp(MouseY() - pRect->y, 0.0f, pRect->h);
 
 	return Res;
 }
 
-void CUI::DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp, float ScrollSpeed) const
+void CUi::DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp, float ScrollSpeed) const
 {
 	// reset scrolling if it's not necessary anymore
 	if(TotalSize < ViewPortSize)
@@ -639,7 +761,7 @@ static int GetFlagsForLabelProperties(const SLabelProperties &LabelProps, const
 	return Flags;
 }
 
-vec2 CUI::CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight)
+vec2 CUi::CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight)
 {
 	vec2 Cursor(pRect->x, pRect->y);
 
@@ -666,7 +788,7 @@ vec2 CUI::CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, c
 	return Cursor;
 }
 
-void CUI::DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps) const
+void CUi::DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps) const
 {
 	const int Flags = GetFlagsForLabelProperties(LabelProps, nullptr);
 	const SCursorAndBoundingBox TextBounds = CalcFontSizeCursorHeightAndBoundingBox(TextRender(), pText, Flags, Size, pRect->w, LabelProps);
@@ -674,12 +796,12 @@ void CUI::DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align
 
 	CTextCursor Cursor;
 	TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, Size, TEXTFLAG_RENDER | Flags);
+	Cursor.m_vColorSplits = LabelProps.m_vColorSplits;
 	Cursor.m_LineWidth = (float)LabelProps.m_MaxWidth;
 	TextRender()->TextEx(&Cursor, pText, -1);
 }
 
-
-void CUI::DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
+void CUi::DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
 {
 	const int Flags = GetFlagsForLabelProperties(LabelProps, pReadCursor);
 	const SCursorAndBoundingBox TextBounds = CalcFontSizeCursorHeightAndBoundingBox(TextRender(), pText, Flags, Size, pRect->w, LabelProps);
@@ -706,7 +828,7 @@ void CUI::DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, cons
 	RectEl.m_Cursor = Cursor;
 }
 
-void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
+void CUi::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
 {
 	const int ReadCursorGlyphCount = pReadCursor == nullptr ? -1 : pReadCursor->m_GlyphCount;
 	bool NeedsRecreate = false;
@@ -762,7 +884,7 @@ void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRe
 	}
 }
 
-bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners)
+bool CUi::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const std::vector<STextColorSplit> &vColorSplits)
 {
 	const bool Inside = MouseHovered(pRect);
 	const bool Active = m_pLastActiveItem == pLineInput;
@@ -800,7 +922,7 @@ bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize
 		}
 	}
 
-	if(Inside)
+	if(Inside && !MouseButton(0))
 		SetHotItem(pLineInput);
 
 	if(Enabled() && Active && !JustGotActive)
@@ -825,7 +947,7 @@ bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize
 	if(pMouseSelection->m_Selecting)
 	{
 		pMouseSelection->m_ReleaseMouse = MousePos();
-		if(MouseButtonReleased(0))
+		if(!MouseButton(0))
 		{
 			pMouseSelection->m_Selecting = false;
 		}
@@ -844,7 +966,7 @@ bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize
 	pRect->Draw(ms_LightButtonColorFunction.GetColor(Active, HotItem() == pLineInput), Corners, 3.0f);
 	ClipEnable(pRect);
 	Textbox.x -= ScrollOffset;
-	const STextBoundingBox BoundingBox = pLineInput->Render(&Textbox, FontSize, TEXTALIGN_ML, Changed || CursorChanged, -1.0f, 0.0f);
+	const STextBoundingBox BoundingBox = pLineInput->Render(&Textbox, FontSize, TEXTALIGN_ML, Changed || CursorChanged, -1.0f, 0.0f, vColorSplits);
 	ClipDisable();
 
 	// Scroll left or right if necessary
@@ -865,16 +987,16 @@ bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize
 	return Changed;
 }
 
-bool CUI::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners)
+bool CUi::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const std::vector<STextColorSplit> &vColorSplits)
 {
 	CUIRect EditBox, ClearButton;
 	pRect->VSplitRight(pRect->h, &EditBox, &ClearButton);
 
-	bool ReturnValue = DoEditBox(pLineInput, &EditBox, FontSize, Corners & ~IGraphics::CORNER_R);
+	bool ReturnValue = DoEditBox(pLineInput, &EditBox, FontSize, Corners & ~IGraphics::CORNER_R, vColorSplits);
 
 	ClearButton.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f * ButtonColorMul(pLineInput->GetClearButtonId())), Corners & ~IGraphics::CORNER_L, 3.0f);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	DoLabel(&ClearButton, "×", ClearButton.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+	DoLabel(&ClearButton, "×", ClearButton.h * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
 	TextRender()->SetRenderFlags(0);
 	if(DoButtonLogic(pLineInput->GetClearButtonId(), 0, &ClearButton))
 	{
@@ -886,7 +1008,26 @@ bool CUI::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float
 	return ReturnValue;
 }
 
-int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props)
+bool CUi::DoEditBox_Search(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, bool HotkeyEnabled)
+{
+	CUIRect QuickSearch = *pRect;
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, FontSize, TEXTALIGN_ML);
+	const float SearchWidth = TextRender()->TextWidth(FontSize, FONT_ICON_MAGNIFYING_GLASS);
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	QuickSearch.VSplitLeft(SearchWidth + 5.0f, nullptr, &QuickSearch);
+	if(HotkeyEnabled && Input()->ModifierIsPressed() && Input()->KeyPress(KEY_F))
+	{
+		SetActiveItem(pLineInput);
+		pLineInput->SelectAll();
+	}
+	pLineInput->SetEmptyText(Localize("Search"));
+	return DoClearableEditBox(pLineInput, &QuickSearch, FontSize);
+}
+
+int CUi::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pId, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props)
 {
 	CUIRect Text = *pRect, DropDownIcon;
 	Text.HMargin(pRect->h >= 20.0f ? 2.0f : 1.0f, &Text);
@@ -957,7 +1098,7 @@ int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const
 					NewRect.m_Text = pText;
 					if(Props.m_UseIconFont)
 						TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-					DoLabel(NewRect, &Text, pText, Text.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+					DoLabel(NewRect, &Text, pText, Text.h * CUi::ms_FontmodHeight, TEXTALIGN_MC);
 					if(Props.m_UseIconFont)
 						TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 				}
@@ -967,9 +1108,9 @@ int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const
 	}
 	// render
 	size_t Index = 2;
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 		Index = 0;
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 		Index = 1;
 	Graphics()->TextureClear();
 	Graphics()->RenderQuadContainer(UIElement.Rect(Index)->m_UIRectQuadContainer, -1);
@@ -977,7 +1118,7 @@ int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const
 	{
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-		DoLabel(&DropDownIcon, FONT_ICON_CIRCLE_CHEVRON_DOWN, DropDownIcon.h * CUI::ms_FontmodHeight, TEXTALIGN_MR);
+		DoLabel(&DropDownIcon, FONT_ICON_CIRCLE_CHEVRON_DOWN, DropDownIcon.h * CUi::ms_FontmodHeight, TEXTALIGN_MR);
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 	}
@@ -985,10 +1126,10 @@ int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const
 	ColorRGBA ColorTextOutline(TextRender()->DefaultTextOutlineColor());
 	if(UIElement.Rect(0)->m_UITextContainer.Valid())
 		TextRender()->RenderTextContainer(UIElement.Rect(0)->m_UITextContainer, ColorText, ColorTextOutline);
-	return DoButtonLogic(pID, Props.m_Checked, pRect);
+	return DoButtonLogic(pId, Props.m_Checked, pRect);
 }
 
-int CUI::DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pText, const CUIRect *pRect, float Size, int Align, float Padding, bool TransparentInactive, bool Enabled)
+int CUi::DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pText, const CUIRect *pRect, float Size, int Align, float Padding, bool TransparentInactive, bool Enabled)
 {
 	if(!TransparentInactive || CheckActiveItem(pButtonContainer) || HotItem() == pButtonContainer)
 		pRect->Draw(Enabled ? ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * ButtonColorMul(pButtonContainer)) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 3.0f);
@@ -1000,98 +1141,93 @@ int CUI::DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pTex
 	return Enabled ? DoButtonLogic(pButtonContainer, 0, pRect) : 0;
 }
 
-int64_t CUI::DoValueSelector(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
+int64_t CUi::DoValueSelector(const void *pId, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
 {
-	return DoValueSelectorWithState(pID, pRect, pLabel, Current, Min, Max, Props).m_Value;
+	return DoValueSelectorWithState(pId, pRect, pLabel, Current, Min, Max, Props).m_Value;
 }
 
-SEditResult<int64_t> CUI::DoValueSelectorWithState(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
+SEditResult<int64_t> CUi::DoValueSelectorWithState(const void *pId, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
 {
 	// logic
-	static float s_Value;
-	static CLineInputNumber s_NumberInput;
-	static const void *s_pLastTextID = pID;
 	const bool Inside = MouseInside(pRect);
-	static const void *s_pEditing = nullptr;
-	EEditState State = EEditState::NONE;
-
-	if(Inside)
-		SetHotItem(pID);
-
 	const int Base = Props.m_IsHex ? 16 : 10;
 
-	if(MouseButtonReleased(1) && HotItem() == pID)
+	if(HotItem() == pId && m_ActiveValueSelectorState.m_Button >= 0 && !MouseButton(m_ActiveValueSelectorState.m_Button))
 	{
-		s_pLastTextID = pID;
-		m_ValueSelectorTextMode = true;
-		s_NumberInput.SetInteger64(Current, Base, Props.m_HexPrefix);
-		s_NumberInput.SelectAll();
-	}
-
-	if(CheckActiveItem(pID))
-	{
-		if(!MouseButton(0))
+		DisableMouseLock();
+		if(CheckActiveItem(pId))
 		{
-			DisableMouseLock();
 			SetActiveItem(nullptr);
-			m_ValueSelectorTextMode = false;
 		}
+		if(Inside && ((m_ActiveValueSelectorState.m_Button == 0 && !m_ActiveValueSelectorState.m_DidScroll && DoDoubleClickLogic(pId)) || m_ActiveValueSelectorState.m_Button == 1))
+		{
+			m_ActiveValueSelectorState.m_pLastTextId = pId;
+			m_ActiveValueSelectorState.m_NumberInput.SetInteger64(Current, Base, Props.m_HexPrefix);
+			m_ActiveValueSelectorState.m_NumberInput.SelectAll();
+		}
+		m_ActiveValueSelectorState.m_Button = -1;
 	}
 
-	if(m_ValueSelectorTextMode && s_pLastTextID == pID)
+	if(m_ActiveValueSelectorState.m_pLastTextId == pId)
 	{
-		DoEditBox(&s_NumberInput, pRect, 10.0f);
-		SetActiveItem(&s_NumberInput);
+		SetActiveItem(&m_ActiveValueSelectorState.m_NumberInput);
+		DoEditBox(&m_ActiveValueSelectorState.m_NumberInput, pRect, 10.0f);
 
 		if(ConsumeHotkey(HOTKEY_ENTER) || ((MouseButtonClicked(1) || MouseButtonClicked(0)) && !Inside))
 		{
-			Current = clamp(s_NumberInput.GetInteger64(Base), Min, Max);
+			Current = clamp(m_ActiveValueSelectorState.m_NumberInput.GetInteger64(Base), Min, Max);
 			DisableMouseLock();
 			SetActiveItem(nullptr);
-			m_ValueSelectorTextMode = false;
+			m_ActiveValueSelectorState.m_pLastTextId = nullptr;
 		}
 
 		if(ConsumeHotkey(HOTKEY_ESCAPE))
 		{
 			DisableMouseLock();
 			SetActiveItem(nullptr);
-			m_ValueSelectorTextMode = false;
+			m_ActiveValueSelectorState.m_pLastTextId = nullptr;
 		}
 	}
 	else
 	{
-		if(CheckActiveItem(pID))
+		if(CheckActiveItem(pId))
 		{
-			if(Props.m_UseScroll)
+			dbg_assert(m_ActiveValueSelectorState.m_Button >= 0, "m_ActiveValueSelectorState.m_Button invalid");
+			if(Props.m_UseScroll && m_ActiveValueSelectorState.m_Button == 0 && MouseButton(0))
 			{
-				if(MouseButton(0))
+				m_ActiveValueSelectorState.m_ScrollValue += MouseDeltaX() * (Input()->ShiftIsPressed() ? 0.05f : 1.0f);
+
+				if(absolute(m_ActiveValueSelectorState.m_ScrollValue) > Props.m_Scale)
 				{
-					s_Value += MouseDeltaX() * (Input()->ShiftIsPressed() ? 0.05f : 1.0f);
-
-					if(absolute(s_Value) > Props.m_Scale)
-					{
-						const int64_t Count = (int64_t)(s_Value / Props.m_Scale);
-						s_Value = std::fmod(s_Value, Props.m_Scale);
-						Current += Props.m_Step * Count;
-						Current = clamp(Current, Min, Max);
-
-						// Constrain to discrete steps
-						if(Count > 0)
-							Current = Current / Props.m_Step * Props.m_Step;
-						else
-							Current = std::ceil(Current / (float)Props.m_Step) * Props.m_Step;
-					}
+					const int64_t Count = (int64_t)(m_ActiveValueSelectorState.m_ScrollValue / Props.m_Scale);
+					m_ActiveValueSelectorState.m_ScrollValue = std::fmod(m_ActiveValueSelectorState.m_ScrollValue, Props.m_Scale);
+					Current += Props.m_Step * Count;
+					Current = clamp(Current, Min, Max);
+					m_ActiveValueSelectorState.m_DidScroll = true;
+
+					// Constrain to discrete steps
+					if(Count > 0)
+						Current = Current / Props.m_Step * Props.m_Step;
+					else
+						Current = std::ceil(Current / (float)Props.m_Step) * Props.m_Step;
 				}
 			}
 		}
-		else if(HotItem() == pID)
+		else if(HotItem() == pId)
 		{
-			if(MouseButtonClicked(0))
+			if(MouseButton(0))
 			{
-				s_Value = 0;
-				SetActiveItem(pID);
+				m_ActiveValueSelectorState.m_Button = 0;
+				m_ActiveValueSelectorState.m_DidScroll = false;
+				m_ActiveValueSelectorState.m_ScrollValue = 0.0f;
+				SetActiveItem(pId);
 				if(Props.m_UseScroll)
-					EnableMouseLock(pID);
+					EnableMouseLock(pId);
+			}
+			else if(MouseButton(1))
+			{
+				m_ActiveValueSelectorState.m_Button = 1;
+				SetActiveItem(pId);
 			}
 		}
 
@@ -1115,29 +1251,29 @@ SEditResult<int64_t> CUI::DoValueSelectorWithState(const void *pID, const CUIRec
 		DoLabel(pRect, aBuf, 10.0f, TEXTALIGN_MC);
 	}
 
-	if(!m_ValueSelectorTextMode)
-		s_NumberInput.Clear();
+	if(Inside && !MouseButton(0) && !MouseButton(1))
+		SetHotItem(pId);
 
-	if(s_pEditing == pID)
+	EEditState State = EEditState::NONE;
+	if(m_pLastEditingItem == pId)
+	{
 		State = EEditState::EDITING;
-
-	bool MouseLocked = CheckMouseLock();
-	if((MouseLocked || m_ValueSelectorTextMode) && !s_pEditing)
+	}
+	if(((CheckActiveItem(pId) && CheckMouseLock()) || m_ActiveValueSelectorState.m_pLastTextId == pId) && m_pLastEditingItem != pId)
 	{
 		State = EEditState::START;
-		s_pEditing = pID;
+		m_pLastEditingItem = pId;
 	}
-
-	if(!CheckMouseLock() && !m_ValueSelectorTextMode && s_pEditing == pID)
+	if(!CheckMouseLock() && m_ActiveValueSelectorState.m_pLastTextId != pId && m_pLastEditingItem == pId)
 	{
 		State = EEditState::END;
-		s_pEditing = nullptr;
+		m_pLastEditingItem = nullptr;
 	}
 
 	return SEditResult<int64_t>{State, Current};
 }
 
-float CUI::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current)
+float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
 {
 	Current = clamp(Current, 0.0f, 1.0f);
 
@@ -1150,12 +1286,11 @@ float CUI::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current)
 	Handle.y = Rail.y + (Rail.h - Handle.h) * Current;
 
 	// logic
-	static float s_OffsetY;
 	const bool InsideRail = MouseHovered(&Rail);
 	const bool InsideHandle = MouseHovered(&Handle);
 	bool Grabbed = false; // whether to apply the offset
 
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 	{
 		if(MouseButton(0))
 		{
@@ -1168,25 +1303,28 @@ float CUI::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current)
 			SetActiveItem(nullptr);
 		}
 	}
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 	{
-		if(MouseButton(0))
+		if(InsideHandle)
 		{
-			SetActiveItem(pID);
-			s_OffsetY = MouseY() - Handle.y;
+			if(MouseButton(0))
+			{
+				SetActiveItem(pId);
+				m_ActiveScrollbarOffset = MouseY() - Handle.y;
+				Grabbed = true;
+			}
+		}
+		else if(MouseButtonClicked(0))
+		{
+			SetActiveItem(pId);
+			m_ActiveScrollbarOffset = Handle.h / 2.0f;
 			Grabbed = true;
 		}
 	}
-	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
-	{
-		SetActiveItem(pID);
-		s_OffsetY = Handle.h / 2.0f;
-		Grabbed = true;
-	}
 
-	if(InsideHandle)
+	if(InsideRail && !MouseButton(0))
 	{
-		SetHotItem(pID);
+		SetHotItem(pId);
 	}
 
 	float ReturnValue = Current;
@@ -1194,18 +1332,18 @@ float CUI::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current)
 	{
 		const float Min = Rail.y;
 		const float Max = Rail.h - Handle.h;
-		const float Cur = MouseY() - s_OffsetY;
+		const float Cur = MouseY() - m_ActiveScrollbarOffset;
 		ReturnValue = clamp((Cur - Min) / Max, 0.0f, 1.0f);
 	}
 
 	// render
 	Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.w / 2.0f);
-	Handle.Draw(ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pID), HotItem() == pID), IGraphics::CORNER_ALL, Handle.w / 2.0f);
+	Handle.Draw(ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pId), HotItem() == pId), IGraphics::CORNER_ALL, Handle.w / 2.0f);
 
 	return ReturnValue;
 }
 
-float CUI::DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner)
+float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner)
 {
 	Current = clamp(Current, 0.0f, 1.0f);
 
@@ -1220,13 +1358,21 @@ float CUI::DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, co
 	Rail.VSplitLeft(pColorInner ? 8.0f : clamp(33.0f, Rail.h, Rail.w / 3.0f), &Handle, 0);
 	Handle.x += (Rail.w - Handle.w) * Current;
 
+	CUIRect HandleArea = Handle;
+	if(!pColorInner)
+	{
+		HandleArea.h = pRect->h * 0.9f;
+		HandleArea.y = pRect->y + pRect->h * 0.05f;
+		HandleArea.w += 6.0f;
+		HandleArea.x -= 3.0f;
+	}
+
 	// logic
-	static float s_OffsetX;
 	const bool InsideRail = MouseHovered(&Rail);
-	const bool InsideHandle = MouseHovered(&Handle);
+	const bool InsideHandle = MouseHovered(&HandleArea);
 	bool Grabbed = false; // whether to apply the offset
 
-	if(CheckActiveItem(pID))
+	if(CheckActiveItem(pId))
 	{
 		if(MouseButton(0))
 		{
@@ -1239,25 +1385,34 @@ float CUI::DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, co
 			SetActiveItem(nullptr);
 		}
 	}
-	else if(HotItem() == pID)
+	else if(HotItem() == pId)
 	{
-		if(MouseButton(0))
+		if(InsideHandle)
+		{
+			if(MouseButton(0))
+			{
+				SetActiveItem(pId);
+				m_ActiveScrollbarOffset = MouseX() - Handle.x;
+				Grabbed = true;
+			}
+		}
+		else if(MouseButtonClicked(0))
 		{
-			SetActiveItem(pID);
-			s_OffsetX = MouseX() - Handle.x;
+			SetActiveItem(pId);
+			m_ActiveScrollbarOffset = Handle.w / 2.0f;
 			Grabbed = true;
 		}
 	}
-	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+
+	if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
 	{
-		SetActiveItem(pID);
-		s_OffsetX = Handle.w / 2.0f;
-		Grabbed = true;
+		Handle.h += 3.0f;
+		Handle.y -= 1.5f;
 	}
 
-	if(InsideHandle)
+	if(InsideRail && !MouseButton(0))
 	{
-		SetHotItem(pID);
+		SetHotItem(pId);
 	}
 
 	float ReturnValue = Current;
@@ -1265,34 +1420,35 @@ float CUI::DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, co
 	{
 		const float Min = Rail.x;
 		const float Max = Rail.w - Handle.w;
-		const float Cur = MouseX() - s_OffsetX;
+		const float Cur = MouseX() - m_ActiveScrollbarOffset;
 		ReturnValue = clamp((Cur - Min) / Max, 0.0f, 1.0f);
 	}
 
 	// render
+	const ColorRGBA HandleColor = ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pId), HotItem() == pId);
 	if(pColorInner)
 	{
 		CUIRect Slider;
 		Handle.VMargin(-2.0f, &Slider);
 		Slider.HMargin(-3.0f, &Slider);
-		Slider.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f), IGraphics::CORNER_ALL, 5.0f);
+		Slider.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f).Multiply(HandleColor), IGraphics::CORNER_ALL, 5.0f);
 		Slider.Margin(2.0f, &Slider);
-		Slider.Draw(*pColorInner, IGraphics::CORNER_ALL, 3.0f);
+		Slider.Draw(pColorInner->Multiply(HandleColor), IGraphics::CORNER_ALL, 3.0f);
 	}
 	else
 	{
 		Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.h / 2.0f);
-		Handle.Draw(ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pID), HotItem() == pID), IGraphics::CORNER_ALL, Handle.h / 2.0f);
+		Handle.Draw(HandleColor, IGraphics::CORNER_ALL, Rail.h / 2.0f);
 	}
 
 	return ReturnValue;
 }
 
-void CUI::DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale, unsigned Flags, const char *pSuffix)
+bool CUi::DoScrollbarOption(const void *pId, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale, unsigned Flags, const char *pSuffix)
 {
-	const bool Infinite = Flags & CUI::SCROLLBAR_OPTION_INFINITE;
-	const bool NoClampValue = Flags & CUI::SCROLLBAR_OPTION_NOCLAMPVALUE;
-	const bool MultiLine = Flags & CUI::SCROLLBAR_OPTION_MULTILINE;
+	const bool Infinite = Flags & CUi::SCROLLBAR_OPTION_INFINITE;
+	const bool NoClampValue = Flags & CUi::SCROLLBAR_OPTION_NOCLAMPVALUE;
+	const bool MultiLine = Flags & CUi::SCROLLBAR_OPTION_MULTILINE;
 
 	int Value = *pOption;
 	if(Infinite)
@@ -1320,10 +1476,10 @@ void CUI::DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect,
 	else
 		pRect->VSplitMid(&Label, &ScrollBar, minimum(10.0f, pRect->w * 0.05f));
 
-	const float FontSize = Label.h * CUI::ms_FontmodHeight * 0.8f;
+	const float FontSize = Label.h * CUi::ms_FontmodHeight * 0.8f;
 	DoLabel(&Label, aBuf, FontSize, TEXTALIGN_ML);
 
-	Value = pScale->ToAbsolute(DoScrollbarH(pID, &ScrollBar, pScale->ToRelative(Value, Min, Max)), Min, Max);
+	Value = pScale->ToAbsolute(DoScrollbarH(pId, &ScrollBar, pScale->ToRelative(Value, Min, Max)), Min, Max);
 	if(NoClampValue && ((Value == Min && *pOption < Min) || (Value == Max && *pOption > Max)))
 	{
 		Value = *pOption; // use previous out of range value instead if the scrollbar is at the edge
@@ -1334,16 +1490,24 @@ void CUI::DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect,
 			Value = 0;
 	}
 
-	*pOption = Value;
+	if(*pOption != Value)
+	{
+		*pOption = Value;
+		return true;
+	}
+	return false;
 }
 
-void CUI::RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressSpinnerProperties &Props) const
+void CUi::RenderProgressBar(CUIRect ProgressBar, float Progress)
 {
-	static float s_SpinnerOffset = 0.0f;
-	static float s_LastRender = Client()->LocalTime();
-	s_SpinnerOffset += (Client()->LocalTime() - s_LastRender) * 1.5f;
-	s_SpinnerOffset = std::fmod(s_SpinnerOffset, 1.0f);
+	const float Rounding = minimum(5.0f, ProgressBar.h / 2.0f);
+	ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rounding);
+	ProgressBar.w = maximum(ProgressBar.w * Progress, 2 * Rounding);
+	ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), IGraphics::CORNER_ALL, Rounding);
+}
 
+void CUi::RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressSpinnerProperties &Props) const
+{
 	Graphics()->TextureClear();
 	Graphics()->QuadsBegin();
 
@@ -1366,7 +1530,7 @@ void CUI::RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressS
 	}
 
 	const float FilledRatio = Props.m_Progress < 0.0f ? 0.333f : Props.m_Progress;
-	const int FilledSegmentOffset = Props.m_Progress < 0.0f ? round_to_int(s_SpinnerOffset * Props.m_Segments) : 0;
+	const int FilledSegmentOffset = Props.m_Progress < 0.0f ? round_to_int(m_ProgressSpinnerOffset * Props.m_Segments) : 0;
 	const int FilledNumSegments = minimum<int>(Props.m_Segments * FilledRatio + (Props.m_Progress < 0.0f ? 0 : 1), Props.m_Segments);
 	Graphics()->SetColor(Props.m_Color);
 	for(int i = 0; i < FilledNumSegments; ++i)
@@ -1382,11 +1546,9 @@ void CUI::RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressS
 	}
 
 	Graphics()->QuadsEnd();
-
-	s_LastRender = Client()->LocalTime();
 }
 
-void CUI::DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props)
+void CUi::DoPopupMenu(const SPopupMenuId *pId, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props)
 {
 	constexpr float Margin = SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN;
 	if(X + Width > Screen()->w - Margin)
@@ -1396,7 +1558,7 @@ void CUI::DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Heig
 
 	m_vPopupMenus.emplace_back();
 	SPopupMenu *pNewMenu = &m_vPopupMenus.back();
-	pNewMenu->m_pID = pID;
+	pNewMenu->m_pId = pId;
 	pNewMenu->m_Props = Props;
 	pNewMenu->m_Rect.x = X;
 	pNewMenu->m_Rect.y = Y;
@@ -1406,32 +1568,44 @@ void CUI::DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Heig
 	pNewMenu->m_pfnFunc = pfnFunc;
 }
 
-void CUI::RenderPopupMenus()
+void CUi::RenderPopupMenus()
 {
 	for(size_t i = 0; i < m_vPopupMenus.size(); ++i)
 	{
 		const SPopupMenu &PopupMenu = m_vPopupMenus[i];
+		const SPopupMenuId *pId = PopupMenu.m_pId;
 		const bool Inside = MouseInside(&PopupMenu.m_Rect);
 		const bool Active = i == m_vPopupMenus.size() - 1;
 
 		if(Active)
-			SetHotItem(PopupMenu.m_pID);
+		{
+			// Prevent UI elements below the popup menu from being activated.
+			SetHotItem(pId);
+		}
 
-		if(CheckActiveItem(PopupMenu.m_pID))
+		if(CheckActiveItem(pId))
 		{
 			if(!MouseButton(0))
 			{
 				if(!Inside)
 				{
-					ClosePopupMenu(PopupMenu.m_pID);
+					ClosePopupMenu(pId);
+					--i;
+					continue;
 				}
 				SetActiveItem(nullptr);
 			}
 		}
-		else if(HotItem() == PopupMenu.m_pID)
+		else if(HotItem() == pId)
 		{
 			if(MouseButton(0))
-				SetActiveItem(PopupMenu.m_pID);
+				SetActiveItem(pId);
+		}
+
+		if(Inside)
+		{
+			// Prevent scroll regions directly behind popup menus from using the mouse scroll events.
+			SetHotScrollRegion(nullptr);
 		}
 
 		CUIRect PopupRect = PopupMenu.m_Rect;
@@ -1440,15 +1614,17 @@ void CUI::RenderPopupMenus()
 		PopupRect.Draw(PopupMenu.m_Props.m_BackgroundColor, PopupMenu.m_Props.m_Corners, 3.0f);
 		PopupRect.Margin(SPopupMenu::POPUP_MARGIN, &PopupRect);
 
+		// The popup render function can open/close popups, which may resize the vector and thus
+		// invalidate the variable PopupMenu. We therefore store pId in a separate variable.
 		EPopupMenuFunctionResult Result = PopupMenu.m_pfnFunc(PopupMenu.m_pContext, PopupRect, Active);
 		if(Result != POPUP_KEEP_OPEN || (Active && ConsumeHotkey(HOTKEY_ESCAPE)))
-			ClosePopupMenu(PopupMenu.m_pID, Result == POPUP_CLOSE_CURRENT_AND_DESCENDANTS);
+			ClosePopupMenu(pId, Result == POPUP_CLOSE_CURRENT_AND_DESCENDANTS);
 	}
 }
 
-void CUI::ClosePopupMenu(const SPopupMenuId *pID, bool IncludeDescendants)
+void CUi::ClosePopupMenu(const SPopupMenuId *pId, bool IncludeDescendants)
 {
-	auto PopupMenuToClose = std::find_if(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pID](const SPopupMenu PopupMenu) { return PopupMenu.m_pID == pID; });
+	auto PopupMenuToClose = std::find_if(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pId](const SPopupMenu PopupMenu) { return PopupMenu.m_pId == pId; });
 	if(PopupMenuToClose != m_vPopupMenus.end())
 	{
 		if(IncludeDescendants)
@@ -1461,7 +1637,7 @@ void CUI::ClosePopupMenu(const SPopupMenuId *pID, bool IncludeDescendants)
 	}
 }
 
-void CUI::ClosePopupMenus()
+void CUi::ClosePopupMenus()
 {
 	if(m_vPopupMenus.empty())
 		return;
@@ -1472,49 +1648,49 @@ void CUI::ClosePopupMenus()
 		m_pfnPopupMenuClosedCallback();
 }
 
-bool CUI::IsPopupOpen() const
+bool CUi::IsPopupOpen() const
 {
 	return !m_vPopupMenus.empty();
 }
 
-bool CUI::IsPopupOpen(const SPopupMenuId *pID) const
+bool CUi::IsPopupOpen(const SPopupMenuId *pId) const
 {
-	return std::any_of(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pID](const SPopupMenu PopupMenu) { return PopupMenu.m_pID == pID; });
+	return std::any_of(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pId](const SPopupMenu PopupMenu) { return PopupMenu.m_pId == pId; });
 }
 
-bool CUI::IsPopupHovered() const
+bool CUi::IsPopupHovered() const
 {
 	return std::any_of(m_vPopupMenus.begin(), m_vPopupMenus.end(), [this](const SPopupMenu PopupMenu) { return MouseHovered(&PopupMenu.m_Rect); });
 }
 
-void CUI::SetPopupMenuClosedCallback(FPopupMenuClosedCallback pfnCallback)
+void CUi::SetPopupMenuClosedCallback(FPopupMenuClosedCallback pfnCallback)
 {
 	m_pfnPopupMenuClosedCallback = std::move(pfnCallback);
 }
 
-void CUI::SMessagePopupContext::DefaultColor(ITextRender *pTextRender)
+void CUi::SMessagePopupContext::DefaultColor(ITextRender *pTextRender)
 {
 	m_TextColor = pTextRender->DefaultTextColor();
 }
 
-void CUI::SMessagePopupContext::ErrorColor()
+void CUi::SMessagePopupContext::ErrorColor()
 {
 	m_TextColor = ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f);
 }
 
-CUI::EPopupMenuFunctionResult CUI::PopupMessage(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CUi::PopupMessage(void *pContext, CUIRect View, bool Active)
 {
 	SMessagePopupContext *pMessagePopup = static_cast<SMessagePopupContext *>(pContext);
-	CUI *pUI = pMessagePopup->m_pUI;
+	CUi *pUI = pMessagePopup->m_pUI;
 
 	pUI->TextRender()->TextColor(pMessagePopup->m_TextColor);
 	pUI->TextRender()->Text(View.x, View.y, SMessagePopupContext::POPUP_FONT_SIZE, pMessagePopup->m_aMessage, View.w);
 	pUI->TextRender()->TextColor(pUI->TextRender()->DefaultTextColor());
 
-	return (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)) ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+	return (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)) ? CUi::POPUP_CLOSE_CURRENT : CUi::POPUP_KEEP_OPEN;
 }
 
-void CUI::ShowPopupMessage(float X, float Y, SMessagePopupContext *pContext)
+void CUi::ShowPopupMessage(float X, float Y, SMessagePopupContext *pContext)
 {
 	const float TextWidth = minimum(std::ceil(TextRender()->TextWidth(SMessagePopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, -1.0f) + 0.5f), SMessagePopupContext::POPUP_MAX_WIDTH);
 	float TextHeight = 0.0f;
@@ -1525,23 +1701,23 @@ void CUI::ShowPopupMessage(float X, float Y, SMessagePopupContext *pContext)
 	DoPopupMenu(pContext, X, Y, TextWidth + 10.0f, TextHeight + 10.0f, pContext, PopupMessage);
 }
 
-CUI::SConfirmPopupContext::SConfirmPopupContext()
+CUi::SConfirmPopupContext::SConfirmPopupContext()
 {
 	Reset();
 }
 
-void CUI::SConfirmPopupContext::Reset()
+void CUi::SConfirmPopupContext::Reset()
 {
 	m_Result = SConfirmPopupContext::UNSET;
 }
 
-void CUI::SConfirmPopupContext::YesNoButtons()
+void CUi::SConfirmPopupContext::YesNoButtons()
 {
 	str_copy(m_aPositiveButtonLabel, Localize("Yes"));
 	str_copy(m_aNegativeButtonLabel, Localize("No"));
 }
 
-void CUI::ShowPopupConfirm(float X, float Y, SConfirmPopupContext *pContext)
+void CUi::ShowPopupConfirm(float X, float Y, SConfirmPopupContext *pContext)
 {
 	const float TextWidth = minimum(std::ceil(TextRender()->TextWidth(SConfirmPopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, -1.0f) + 0.5f), SConfirmPopupContext::POPUP_MAX_WIDTH);
 	float TextHeight = 0.0f;
@@ -1554,10 +1730,10 @@ void CUI::ShowPopupConfirm(float X, float Y, SConfirmPopupContext *pContext)
 	DoPopupMenu(pContext, X, Y, TextWidth + 10.0f, PopupHeight, pContext, PopupConfirm);
 }
 
-CUI::EPopupMenuFunctionResult CUI::PopupConfirm(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CUi::PopupConfirm(void *pContext, CUIRect View, bool Active)
 {
 	SConfirmPopupContext *pConfirmPopup = static_cast<SConfirmPopupContext *>(pContext);
-	CUI *pUI = pConfirmPopup->m_pUI;
+	CUi *pUI = pConfirmPopup->m_pUI;
 
 	CUIRect Label, ButtonBar, CancelButton, ConfirmButton;
 	View.HSplitBottom(SConfirmPopupContext::POPUP_BUTTON_HEIGHT, &Label, &ButtonBar);
@@ -1568,24 +1744,24 @@ CUI::EPopupMenuFunctionResult CUI::PopupConfirm(void *pContext, CUIRect View, bo
 	if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_CancelButton, pConfirmPopup->m_aNegativeButtonLabel, &CancelButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC))
 	{
 		pConfirmPopup->m_Result = SConfirmPopupContext::CANCELED;
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_ConfirmButton, pConfirmPopup->m_aPositiveButtonLabel, &ConfirmButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC) || (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)))
 	{
 		pConfirmPopup->m_Result = SConfirmPopupContext::CONFIRMED;
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::SSelectionPopupContext::SSelectionPopupContext()
+CUi::SSelectionPopupContext::SSelectionPopupContext()
 {
 	Reset();
 }
 
-void CUI::SSelectionPopupContext::Reset()
+void CUi::SSelectionPopupContext::Reset()
 {
 	m_Props = SPopupMenuProperties();
 	m_aMessage[0] = '\0';
@@ -1602,10 +1778,10 @@ void CUI::SSelectionPopupContext::Reset()
 	m_TransparentButtons = false;
 }
 
-CUI::EPopupMenuFunctionResult CUI::PopupSelection(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CUi::PopupSelection(void *pContext, CUIRect View, bool Active)
 {
 	SSelectionPopupContext *pSelectionPopup = static_cast<SSelectionPopupContext *>(pContext);
-	CUI *pUI = pSelectionPopup->m_pUI;
+	CUi *pUI = pSelectionPopup->m_pUI;
 	CScrollRegion *pScrollRegion = pSelectionPopup->m_pScrollRegion;
 
 	vec2 ScrollOffset(0.0f, 0.0f);
@@ -1649,10 +1825,10 @@ CUI::EPopupMenuFunctionResult CUI::PopupSelection(void *pContext, CUIRect View,
 
 	pScrollRegion->End();
 
-	return pSelectionPopup->m_pSelection == nullptr ? CUI::POPUP_KEEP_OPEN : CUI::POPUP_CLOSE_CURRENT;
+	return pSelectionPopup->m_pSelection == nullptr ? CUi::POPUP_KEEP_OPEN : CUi::POPUP_CLOSE_CURRENT;
 }
 
-void CUI::ShowPopupSelection(float X, float Y, SSelectionPopupContext *pContext)
+void CUi::ShowPopupSelection(float X, float Y, SSelectionPopupContext *pContext)
 {
 	const STextBoundingBox TextBoundingBox = TextRender()->TextBoundingBox(pContext->m_FontSize, pContext->m_aMessage, -1, pContext->m_Width);
 	const float PopupHeight = minimum((pContext->m_aMessage[0] == '\0' ? -pContext->m_EntrySpacing : TextBoundingBox.m_H) + pContext->m_vEntries.size() * (pContext->m_EntryHeight + pContext->m_EntrySpacing) + (SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN) * 2 + CScrollRegion::HEIGHT_MAGIC_FIX, Screen()->h * 0.4f);
@@ -1681,7 +1857,7 @@ void CUI::ShowPopupSelection(float X, float Y, SSelectionPopupContext *pContext)
 	DoPopupMenu(pContext, X, Y, pContext->m_Width, PopupHeight, pContext, PopupSelection, pContext->m_Props);
 }
 
-int CUI::DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Num, SDropDownState &State)
+int CUi::DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Num, SDropDownState &State)
 {
 	if(!State.m_Init)
 	{
@@ -1708,7 +1884,7 @@ int CUI::DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Nu
 			State.m_SelectionPopupContext.m_vEntries.emplace_back(pStrs[i]);
 		State.m_SelectionPopupContext.m_EntryHeight = pRect->h;
 		State.m_SelectionPopupContext.m_EntryPadding = pRect->h >= 20.0f ? 2.0f : 1.0f;
-		State.m_SelectionPopupContext.m_FontSize = (State.m_SelectionPopupContext.m_EntryHeight - 2 * State.m_SelectionPopupContext.m_EntryPadding) * CUI::ms_FontmodHeight;
+		State.m_SelectionPopupContext.m_FontSize = (State.m_SelectionPopupContext.m_EntryHeight - 2 * State.m_SelectionPopupContext.m_EntryPadding) * CUi::ms_FontmodHeight;
 		State.m_SelectionPopupContext.m_Width = pRect->w;
 		State.m_SelectionPopupContext.m_AlignmentHeight = pRect->h;
 		State.m_SelectionPopupContext.m_TransparentButtons = true;
@@ -1725,10 +1901,10 @@ int CUI::DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Nu
 	return CurSelection;
 }
 
-CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CUi::PopupColorPicker(void *pContext, CUIRect View, bool Active)
 {
 	SColorPickerPopupContext *pColorPicker = static_cast<SColorPickerPopupContext *>(pContext);
-	CUI *pUI = pColorPicker->m_pUI;
+	CUi *pUI = pColorPicker->m_pUI;
 	pColorPicker->m_State = EEditState::NONE;
 
 	CUIRect ColorsArea, HueArea, BottomArea, ModeButtonArea, HueRect, SatRect, ValueRect, HexRect, AlphaRect;
@@ -1821,10 +1997,10 @@ CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View
 	// Editboxes Area
 	if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_HSVA)
 	{
-		const unsigned OldH = (unsigned)(PickerColorHSV.h * 255.0f);
-		const unsigned OldS = (unsigned)(PickerColorHSV.s * 255.0f);
-		const unsigned OldV = (unsigned)(PickerColorHSV.v * 255.0f);
-		const unsigned OldA = (unsigned)(PickerColorHSV.a * 255.0f);
+		const unsigned OldH = round_to_int(PickerColorHSV.h * 255.0f);
+		const unsigned OldS = round_to_int(PickerColorHSV.s * 255.0f);
+		const unsigned OldV = round_to_int(PickerColorHSV.v * 255.0f);
+		const unsigned OldA = round_to_int(PickerColorHSV.a * 255.0f);
 
 		const auto [StateH, H] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "H:", OldH, 0, 255);
 		const auto [StateS, S] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "S:", OldS, 0, 255);
@@ -1849,10 +2025,10 @@ CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View
 	}
 	else if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_RGBA)
 	{
-		const unsigned OldR = (unsigned)(PickerColorRGB.r * 255.0f);
-		const unsigned OldG = (unsigned)(PickerColorRGB.g * 255.0f);
-		const unsigned OldB = (unsigned)(PickerColorRGB.b * 255.0f);
-		const unsigned OldA = (unsigned)(PickerColorRGB.a * 255.0f);
+		const unsigned OldR = round_to_int(PickerColorRGB.r * 255.0f);
+		const unsigned OldG = round_to_int(PickerColorRGB.g * 255.0f);
+		const unsigned OldB = round_to_int(PickerColorRGB.b * 255.0f);
+		const unsigned OldA = round_to_int(PickerColorRGB.a * 255.0f);
 
 		const auto [StateR, R] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "R:", OldR, 0, 255);
 		const auto [StateG, G] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "G:", OldG, 0, 255);
@@ -1877,10 +2053,10 @@ CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View
 	}
 	else if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_HSLA)
 	{
-		const unsigned OldH = (unsigned)(PickerColorHSL.h * 255.0f);
-		const unsigned OldS = (unsigned)(PickerColorHSL.s * 255.0f);
-		const unsigned OldL = (unsigned)(PickerColorHSL.l * 255.0f);
-		const unsigned OldA = (unsigned)(PickerColorHSL.a * 255.0f);
+		const unsigned OldH = round_to_int(PickerColorHSL.h * 255.0f);
+		const unsigned OldS = round_to_int(PickerColorHSL.s * 255.0f);
+		const unsigned OldL = round_to_int(PickerColorHSL.l * 255.0f);
+		const unsigned OldA = round_to_int(PickerColorHSL.a * 255.0f);
 
 		const auto [StateH, H] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "H:", OldH, 0, 255);
 		const auto [StateS, S] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "S:", OldS, 0, 255);
@@ -1996,10 +2172,10 @@ CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View
 		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-void CUI::ShowPopupColorPicker(float X, float Y, SColorPickerPopupContext *pContext)
+void CUi::ShowPopupColorPicker(float X, float Y, SColorPickerPopupContext *pContext)
 {
 	pContext->m_pUI = this;
 	if(pContext->m_ColorMode == SColorPickerPopupContext::MODE_UNSET)
diff --git a/src/game/client/ui.h b/src/game/client/ui.h
index 60b336d215..a680cfbf42 100644
--- a/src/game/client/ui.h
+++ b/src/game/client/ui.h
@@ -14,6 +14,7 @@
 #include <string>
 #include <vector>
 
+class CScrollRegion;
 class IClient;
 class IGraphics;
 class IKernel;
@@ -142,15 +143,15 @@ class CScrollBarColorFunction : public IButtonColorFunction
 	}
 };
 
-class CUI;
+class CUi;
 
 class CUIElement
 {
-	friend class CUI;
+	friend class CUi;
 
-	CUI *m_pUI;
+	CUi *m_pUI;
 
-	CUIElement(CUI *pUI, int RequestedRectCount) { Init(pUI, RequestedRectCount); }
+	CUIElement(CUi *pUI, int RequestedRectCount) { Init(pUI, RequestedRectCount); }
 
 public:
 	struct SUIElementRect
@@ -185,13 +186,13 @@ class CUIElement
 	};
 
 protected:
-	CUI *UI() const { return m_pUI; }
+	CUi *Ui() const { return m_pUI; }
 	std::vector<SUIElementRect> m_vUIRects;
 
 public:
 	CUIElement() = default;
 
-	void Init(CUI *pUI, int RequestedRectCount);
+	void Init(CUi *pUI, int RequestedRectCount);
 
 	SUIElementRect *Rect(size_t Index)
 	{
@@ -212,6 +213,7 @@ struct SLabelProperties
 	bool m_StopAtEnd = false;
 	bool m_EllipsisAtEnd = false;
 	bool m_EnableWidthCheck = true;
+	std::vector<STextColorSplit> m_vColorSplits = {};
 };
 
 struct SMenuButtonProperties
@@ -230,16 +232,16 @@ struct SMenuButtonProperties
 class CUIElementBase
 {
 private:
-	static CUI *s_pUI;
+	static CUi *s_pUI;
 
 public:
-	static void Init(CUI *pUI) { s_pUI = pUI; }
+	static void Init(CUi *pUI) { s_pUI = pUI; }
 
 	IClient *Client() const;
 	IGraphics *Graphics() const;
 	IInput *Input() const;
 	ITextRender *TextRender() const;
-	CUI *UI() const { return s_pUI; }
+	CUi *Ui() const { return s_pUI; }
 };
 
 class CButtonContainer
@@ -277,7 +279,7 @@ struct SPopupMenuProperties
 	ColorRGBA m_BackgroundColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.75f);
 };
 
-class CUI
+class CUi
 {
 public:
 	/**
@@ -318,25 +320,73 @@ class CUI
 	 */
 	typedef std::function<void()> FPopupMenuClosedCallback;
 
+	/**
+	 * Represents the aggregated state of current touch events to control a user interface.
+	 */
+	class CTouchState
+	{
+		friend class CUi;
+
+		bool m_SecondaryPressedNext = false;
+		float m_SecondaryActivationTime = 0.0f;
+		vec2 m_SecondaryActivationDelta = vec2(0.0f, 0.0f);
+
+	public:
+		bool m_AnyPressed = false;
+		bool m_PrimaryPressed = false;
+		bool m_SecondaryPressed = false;
+		vec2 m_PrimaryPosition = vec2(-1.0f, -1.0f);
+		vec2 m_PrimaryDelta = vec2(0.0f, 0.0f);
+		vec2 m_ScrollAmount = vec2(0.0f, 0.0f);
+	};
+
 private:
 	bool m_Enabled;
 
-	const void *m_pHotItem;
-	const void *m_pActiveItem;
-	const void *m_pLastActiveItem; // only used internally to track active CLineInput
-	const void *m_pBecomingHotItem;
+	const void *m_pHotItem = nullptr;
+	const void *m_pActiveItem = nullptr;
+	const void *m_pLastActiveItem = nullptr; // only used internally to track active CLineInput
+	const void *m_pBecomingHotItem = nullptr;
+	CScrollRegion *m_pHotScrollRegion = nullptr;
+	CScrollRegion *m_pBecomingHotScrollRegion = nullptr;
 	bool m_ActiveItemValid = false;
 
-	vec2 m_UpdatedMousePos = vec2(0.0f, 0.0f);
-	vec2 m_UpdatedMouseDelta = vec2(0.0f, 0.0f);
-	float m_MouseX, m_MouseY; // in gui space
-	float m_MouseDeltaX, m_MouseDeltaY; // in gui space
-	float m_MouseWorldX, m_MouseWorldY; // in world space
-	unsigned m_MouseButtons;
-	unsigned m_LastMouseButtons;
+	int m_ActiveButtonLogicButton = -1;
+	int m_ActiveDraggableButtonLogicButton = -1;
+	class CDoubleClickState
+	{
+	public:
+		const void *m_pLastClickedId = nullptr;
+		float m_LastClickTime = -1.0f;
+		vec2 m_LastClickPos = vec2(-1.0f, -1.0f);
+	};
+	CDoubleClickState m_DoubleClickState;
+	const void *m_pLastEditingItem = nullptr;
+	float m_ActiveScrollbarOffset = 0.0f;
+	float m_ProgressSpinnerOffset = 0.0f;
+	class CValueSelectorState
+	{
+	public:
+		int m_Button = -1;
+		bool m_DidScroll = false;
+		float m_ScrollValue = 0.0f;
+		CLineInputNumber m_NumberInput;
+		const void *m_pLastTextId = nullptr;
+	};
+	CValueSelectorState m_ActiveValueSelectorState;
+
+	vec2 m_UpdatedMousePos = vec2(0.0f, 0.0f); // in window screen space
+	vec2 m_UpdatedMouseDelta = vec2(0.0f, 0.0f); // in window screen space
+	vec2 m_MousePos = vec2(0.0f, 0.0f); // in gui space
+	vec2 m_MouseDelta = vec2(0.0f, 0.0f); // in gui space
+	vec2 m_MouseWorldPos = vec2(-1.0f, -1.0f); // in world space
+	unsigned m_UpdatedMouseButtons = 0;
+	unsigned m_MouseButtons = 0;
+	unsigned m_LastMouseButtons = 0;
+	CTouchState m_TouchState;
 	bool m_MouseSlow = false;
 	bool m_MouseLock = false;
-	const void *m_pMouseLockID = nullptr;
+	const void *m_pMouseLockId = nullptr;
 
 	unsigned m_HotkeysPressed = 0;
 
@@ -345,14 +395,12 @@ class CUI
 	std::vector<CUIRect> m_vClips;
 	void UpdateClipping();
 
-	bool m_ValueSelectorTextMode = false;
-
 	struct SPopupMenu
 	{
 		static constexpr float POPUP_BORDER = 1.0f;
 		static constexpr float POPUP_MARGIN = 4.0f;
 
-		const SPopupMenuId *m_pID;
+		const SPopupMenuId *m_pId;
 		SPopupMenuProperties m_Props;
 		CUIRect m_Rect;
 		void *m_pContext;
@@ -361,17 +409,17 @@ class CUI
 	std::vector<SPopupMenu> m_vPopupMenus;
 	FPopupMenuClosedCallback m_pfnPopupMenuClosedCallback = nullptr;
 
-	static CUI::EPopupMenuFunctionResult PopupMessage(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupConfirm(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSelection(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupColorPicker(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupMessage(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupConfirm(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSelection(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupColorPicker(void *pContext, CUIRect View, bool Active);
 
 	IClient *m_pClient;
 	IGraphics *m_pGraphics;
 	IInput *m_pInput;
 	ITextRender *m_pTextRender;
 
-	std::vector<CUIElement *> m_vpOwnUIElements; // ui elements maintained by CUI class
+	std::vector<CUIElement *> m_vpOwnUIElements; // ui elements maintained by CUi class
 	std::vector<CUIElement *> m_vpUIElements;
 
 public:
@@ -389,8 +437,8 @@ class CUI
 	IInput *Input() const { return m_pInput; }
 	ITextRender *TextRender() const { return m_pTextRender; }
 
-	CUI();
-	~CUI();
+	CUi();
+	~CUi();
 
 	enum EHotkey : unsigned
 	{
@@ -398,14 +446,16 @@ class CUI
 		HOTKEY_ESCAPE = 1 << 1,
 		HOTKEY_UP = 1 << 2,
 		HOTKEY_DOWN = 1 << 3,
-		HOTKEY_DELETE = 1 << 4,
-		HOTKEY_TAB = 1 << 5,
-		HOTKEY_SCROLL_UP = 1 << 6,
-		HOTKEY_SCROLL_DOWN = 1 << 7,
-		HOTKEY_PAGE_UP = 1 << 8,
-		HOTKEY_PAGE_DOWN = 1 << 9,
-		HOTKEY_HOME = 1 << 10,
-		HOTKEY_END = 1 << 11,
+		HOTKEY_LEFT = 1 << 4,
+		HOTKEY_RIGHT = 1 << 5,
+		HOTKEY_DELETE = 1 << 6,
+		HOTKEY_TAB = 1 << 7,
+		HOTKEY_SCROLL_UP = 1 << 8,
+		HOTKEY_SCROLL_DOWN = 1 << 9,
+		HOTKEY_PAGE_UP = 1 << 10,
+		HOTKEY_PAGE_DOWN = 1 << 11,
+		HOTKEY_HOME = 1 << 12,
+		HOTKEY_END = 1 << 13,
 	};
 
 	void ResetUIElement(CUIElement &UIElement) const;
@@ -419,53 +469,57 @@ class CUI
 
 	void SetEnabled(bool Enabled) { m_Enabled = Enabled; }
 	bool Enabled() const { return m_Enabled; }
-	void Update();
-	void Update(float MouseX, float MouseY, float MouseDeltaX, float MouseDeltaY, float MouseWorldX, float MouseWorldY);
-	void DebugRender();
-
-	float MouseDeltaX() const { return m_MouseDeltaX; }
-	float MouseDeltaY() const { return m_MouseDeltaY; }
-	float MouseX() const { return m_MouseX; }
-	float MouseY() const { return m_MouseY; }
-	vec2 MousePos() const { return vec2(m_MouseX, m_MouseY); }
-	float MouseWorldX() const { return m_MouseWorldX; }
-	float MouseWorldY() const { return m_MouseWorldY; }
+	void Update(vec2 MouseWorldPos = vec2(-1.0f, -1.0f));
+	void DebugRender(float X, float Y);
+
+	vec2 MousePos() const { return m_MousePos; }
+	float MouseX() const { return m_MousePos.x; }
+	float MouseY() const { return m_MousePos.y; }
+	vec2 MouseDelta() const { return m_MouseDelta; }
+	float MouseDeltaX() const { return m_MouseDelta.x; }
+	float MouseDeltaY() const { return m_MouseDelta.y; }
+	vec2 MouseWorldPos() const { return m_MouseWorldPos; }
+	float MouseWorldX() const { return m_MouseWorldPos.x; }
+	float MouseWorldY() const { return m_MouseWorldPos.y; }
+	vec2 UpdatedMousePos() const { return m_UpdatedMousePos; }
+	vec2 UpdatedMouseDelta() const { return m_UpdatedMouseDelta; }
 	int MouseButton(int Index) const { return (m_MouseButtons >> Index) & 1; }
 	int MouseButtonClicked(int Index) const { return MouseButton(Index) && !((m_LastMouseButtons >> Index) & 1); }
-	int MouseButtonReleased(int Index) const { return ((m_LastMouseButtons >> Index) & 1) && !MouseButton(Index); }
 	bool CheckMouseLock()
 	{
-		if(m_MouseLock && ActiveItem() != m_pMouseLockID)
+		if(m_MouseLock && ActiveItem() != m_pMouseLockId)
 			DisableMouseLock();
 		return m_MouseLock;
 	}
-	void EnableMouseLock(const void *pID)
+	void EnableMouseLock(const void *pId)
 	{
 		m_MouseLock = true;
-		m_pMouseLockID = pID;
+		m_pMouseLockId = pId;
 	}
 	void DisableMouseLock() { m_MouseLock = false; }
 
-	void SetHotItem(const void *pID) { m_pBecomingHotItem = pID; }
-	void SetActiveItem(const void *pID)
+	void SetHotItem(const void *pId) { m_pBecomingHotItem = pId; }
+	void SetActiveItem(const void *pId)
 	{
 		m_ActiveItemValid = true;
-		m_pActiveItem = pID;
-		if(pID)
-			m_pLastActiveItem = pID;
+		m_pActiveItem = pId;
+		if(pId)
+			m_pLastActiveItem = pId;
 	}
-	bool CheckActiveItem(const void *pID)
+	bool CheckActiveItem(const void *pId)
 	{
-		if(m_pActiveItem == pID)
+		if(m_pActiveItem == pId)
 		{
 			m_ActiveItemValid = true;
 			return true;
 		}
 		return false;
 	}
+	void SetHotScrollRegion(CScrollRegion *pId) { m_pBecomingHotScrollRegion = pId; }
 	const void *HotItem() const { return m_pHotItem; }
 	const void *NextHotItem() const { return m_pBecomingHotItem; }
 	const void *ActiveItem() const { return m_pActiveItem; }
+	const CScrollRegion *HotScrollRegion() const { return m_pHotScrollRegion; }
 
 	void StartCheck() { m_ActiveItemValid = false; }
 	void FinishCheck()
@@ -482,6 +536,7 @@ class CUI
 	bool MouseInsideClip() const { return !IsClipped() || MouseInside(ClipArea()); }
 	bool MouseHovered(const CUIRect *pRect) const { return MouseInside(pRect) && MouseInsideClip(); }
 	void ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType) const;
+	void UpdateTouchState(CTouchState &State) const;
 	void ResetMouseSlow() { m_MouseSlow = false; }
 
 	bool ConsumeHotkey(EHotkey Hotkey);
@@ -491,7 +546,7 @@ class CUI
 	constexpr float ButtonColorMulActive() const { return 0.5f; }
 	constexpr float ButtonColorMulHot() const { return 1.5f; }
 	constexpr float ButtonColorMulDefault() const { return 1.0f; }
-	float ButtonColorMul(const void *pID);
+	float ButtonColorMul(const void *pId);
 
 	const CUIRect *Screen();
 	void MapScreen();
@@ -502,30 +557,79 @@ class CUI
 	const CUIRect *ClipArea() const;
 	inline bool IsClipped() const { return !m_vClips.empty(); }
 
-	int DoButtonLogic(const void *pID, int Checked, const CUIRect *pRect);
-	int DoDraggableButtonLogic(const void *pID, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted);
-	EEditState DoPickerLogic(const void *pID, const CUIRect *pRect, float *pX, float *pY);
+	int DoButtonLogic(const void *pId, int Checked, const CUIRect *pRect);
+	int DoDraggableButtonLogic(const void *pId, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted);
+	bool DoDoubleClickLogic(const void *pId);
+	EEditState DoPickerLogic(const void *pId, const CUIRect *pRect, float *pX, float *pY);
 	void DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp = false, float ScrollSpeed = 10.0f) const;
 	static vec2 CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight = nullptr);
 
-
 	void DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}) const;
 
 	void DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}, int StrLen = -1, const CTextCursor *pReadCursor = nullptr) const;
 	void DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}, int StrLen = -1, const CTextCursor *pReadCursor = nullptr) const;
 
-	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL);
-	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL);
+	/**
+	 * Creates an input field.
+	 *
+	 * @see DoClearableEditBox
+	 *
+	 * @param pLineInput This pointer will be stored and written to on next user input.
+	 *                   So you can not pass in a pointer that goes out of scope such as a local variable.
+	 *                   Pass in either a member variable of the current class or a static variable.
+	 *                   For example ```static CLineInputBuffered<IO_MAX_PATH_LENGTH> s_MyInput;```
+	 * @param pRect the UI rect it will attach to with a 2.0f margin
+	 * @param FontSize Size of the font (`10.0f`, `12.0f` and `14.0f` are commonly used here)
+	 * @param Corners Number of corners (default: `IGraphics::CORNER_ALL`)
+	 * @param vColorSplits Sets color splits of the `CTextCursor` to allow multicolored text
+	 *
+	 * @return true if the value of the input field changed since the last call.
+	 */
+	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const std::vector<STextColorSplit> &vColorSplits = {});
+
+	/**
+	 * Creates an input field with a clear [x] button attached to it.
+	 *
+	 * @see DoEditBox
+	 *
+	 * @param pLineInput This pointer will be stored and written to on next user input.
+	 *                   So you can not pass in a pointer that goes out of scope such as a local variable.
+	 *                   Pass in either a member variable of the current class or a static variable.
+	 *                   For example ```static CLineInputBuffered<IO_MAX_PATH_LENGTH> s_MyInput;```
+	 * @param pRect the UI rect it will attach to
+	 * @param FontSize Size of the font (`10.0f`, `12.0f` and `14.0f` are commonly used here)
+	 * @param Corners Number of corners (default: `IGraphics::CORNER_ALL`)
+	 * @param vColorSplits Sets color splits of the `CTextCursor` to allow multicolored text
+	 *
+	 * @return true if the value of the input field changed since the last call.
+	 */
+	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const std::vector<STextColorSplit> &vColorSplits = {});
+
+	/**
+	 * Creates an input field with a search icon and a clear [x] button attached to it.
+	 * The input will have default text "Search" and the hotkey Ctrl+F can be used to activate the input.
+	 *
+	 * @see DoEditBox
+	 *
+	 * @param pLineInput This pointer will be stored and written to on next user input.
+	 *                   So you can not pass in a pointer that goes out of scope such as a local variable.
+	 *                   Pass in either a member variable of the current class or a static variable.
+	 *                   For example ```static CLineInputBuffered<IO_MAX_PATH_LENGTH> s_MyInput;```
+	 * @param pRect the UI rect it will attach to
+	 * @param FontSize Size of the font (`10.0f`, `12.0f` and `14.0f` are commonly used here)
+	 * @param HotkeyEnabled Whether the hotkey to enable this editbox is currently enabled.
+	 *
+	 * @return true if the value of the input field changed since the last call.
+	 */
+	bool DoEditBox_Search(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, bool HotkeyEnabled);
 
-	int DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props = {});
+	int DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pId, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props = {});
 	// only used for popup menus
 	int DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pText, const CUIRect *pRect, float Size, int Align, float Padding = 0.0f, bool TransparentInactive = false, bool Enabled = true);
 
 	// value selector
-	SEditResult<int64_t> DoValueSelectorWithState(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
-	int64_t DoValueSelector(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
-	bool IsValueSelectorTextMode() const { return m_ValueSelectorTextMode; }
-	void SetValueSelectorTextMode(bool TextMode) { m_ValueSelectorTextMode = TextMode; }
+	SEditResult<int64_t> DoValueSelectorWithState(const void *pId, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
+	int64_t DoValueSelector(const void *pId, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
 
 	// scrollbars
 	enum
@@ -534,20 +638,23 @@ class CUI
 		SCROLLBAR_OPTION_NOCLAMPVALUE = 1 << 1,
 		SCROLLBAR_OPTION_MULTILINE = 1 << 2,
 	};
-	float DoScrollbarV(const void *pID, const CUIRect *pRect, float Current);
-	float DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner = nullptr);
-	void DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale = &ms_LinearScrollbarScale, unsigned Flags = 0u, const char *pSuffix = "");
+	float DoScrollbarV(const void *pId, const CUIRect *pRect, float Current);
+	float DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner = nullptr);
+	bool DoScrollbarOption(const void *pId, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale = &ms_LinearScrollbarScale, unsigned Flags = 0u, const char *pSuffix = "");
+
+	// progress bar
+	void RenderProgressBar(CUIRect ProgressBar, float Progress);
 
 	// progress spinner
 	void RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressSpinnerProperties &Props = {}) const;
 
 	// popup menu
-	void DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props = {});
+	void DoPopupMenu(const SPopupMenuId *pId, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props = {});
 	void RenderPopupMenus();
-	void ClosePopupMenu(const SPopupMenuId *pID, bool IncludeDescendants = false);
+	void ClosePopupMenu(const SPopupMenuId *pId, bool IncludeDescendants = false);
 	void ClosePopupMenus();
 	bool IsPopupOpen() const;
-	bool IsPopupOpen(const SPopupMenuId *pID) const;
+	bool IsPopupOpen(const SPopupMenuId *pId) const;
 	bool IsPopupHovered() const;
 	void SetPopupMenuClosedCallback(FPopupMenuClosedCallback pfnCallback);
 
@@ -556,7 +663,7 @@ class CUI
 		static constexpr float POPUP_MAX_WIDTH = 200.0f;
 		static constexpr float POPUP_FONT_SIZE = 10.0f;
 
-		CUI *m_pUI; // set by CUI when popup is shown
+		CUi *m_pUI; // set by CUi when popup is shown
 		char m_aMessage[1024];
 		ColorRGBA m_TextColor;
 
@@ -578,7 +685,7 @@ class CUI
 		static constexpr float POPUP_BUTTON_HEIGHT = 12.0f;
 		static constexpr float POPUP_BUTTON_SPACING = 5.0f;
 
-		CUI *m_pUI; // set by CUI when popup is shown
+		CUi *m_pUI; // set by CUi when popup is shown
 		char m_aPositiveButtonLabel[128];
 		char m_aNegativeButtonLabel[128];
 		char m_aMessage[1024];
@@ -595,8 +702,8 @@ class CUI
 
 	struct SSelectionPopupContext : public SPopupMenuId
 	{
-		CUI *m_pUI; // set by CUI when popup is shown
-		class CScrollRegion *m_pScrollRegion;
+		CUi *m_pUI; // set by CUi when popup is shown
+		CScrollRegion *m_pScrollRegion;
 		SPopupMenuProperties m_Props;
 		char m_aMessage[256];
 		std::vector<std::string> m_vEntries;
@@ -626,7 +733,7 @@ class CUI
 			MODE_HSLA,
 		};
 
-		CUI *m_pUI; // set by CUI when popup is shown
+		CUi *m_pUI; // set by CUi when popup is shown
 		EColorPickerMode m_ColorMode = MODE_UNSET;
 		bool m_Alpha = false;
 		unsigned int *m_pHslaColor = nullptr; // may be nullptr
diff --git a/src/game/client/ui_listbox.cpp b/src/game/client/ui_listbox.cpp
index 14cd6e65e6..cfbe18ddb0 100644
--- a/src/game/client/ui_listbox.cpp
+++ b/src/game/client/ui_listbox.cpp
@@ -39,7 +39,7 @@ void CListBox::DoHeader(const CUIRect *pRect, const char *pTitle, float HeaderHe
 
 	// draw header
 	View.HSplitTop(HeaderHeight, &Header, &View);
-	UI()->DoLabel(&Header, pTitle, Header.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+	Ui()->DoLabel(&Header, pTitle, Header.h * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
 
 	View.HSplitTop(Spacing, &Header, &View);
 
@@ -80,7 +80,7 @@ void CListBox::DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsP
 		CUIRect Footer;
 		View.HSplitBottom(m_FooterHeight, &View, &Footer);
 		Footer.VSplitLeft(10.0f, 0, &Footer);
-		UI()->DoLabel(&Footer, m_pBottomText, Footer.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+		Ui()->DoLabel(&Footer, m_pBottomText, Footer.h * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
 	}
 
 	// setup the variables
@@ -93,31 +93,33 @@ void CListBox::DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsP
 	m_ListBoxRowHeight = RowHeight;
 	m_ListBoxNumItems = NumItems;
 	m_ListBoxItemsPerRow = ItemsPerRow;
-	m_ListBoxDoneEvents = false;
 	m_ListBoxItemActivated = false;
 	m_ListBoxItemSelected = false;
 
 	// handle input
 	if(m_Active && !Input()->ModifierIsPressed() && !Input()->ShiftIsPressed() && !Input()->AltIsPressed())
 	{
-		if(UI()->ConsumeHotkey(CUI::HOTKEY_DOWN))
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_DOWN))
+			m_ListBoxNewSelOffset += m_ListBoxItemsPerRow;
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_UP))
+			m_ListBoxNewSelOffset -= m_ListBoxItemsPerRow;
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_RIGHT) && m_ListBoxItemsPerRow > 1)
 			m_ListBoxNewSelOffset += 1;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_UP))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_LEFT) && m_ListBoxItemsPerRow > 1)
 			m_ListBoxNewSelOffset -= 1;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_PAGE_UP))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_PAGE_UP))
 			m_ListBoxNewSelOffset = -ItemsPerRow * RowsPerScroll * 4;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_PAGE_DOWN))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_PAGE_DOWN))
 			m_ListBoxNewSelOffset = ItemsPerRow * RowsPerScroll * 4;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_HOME))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_HOME))
 			m_ListBoxNewSelOffset = 1 - m_ListBoxNumItems;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_END))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_END))
 			m_ListBoxNewSelOffset = m_ListBoxNumItems - 1;
 	}
 
 	// setup the scrollbar
 	m_ScrollOffset = vec2(0.0f, 0.0f);
 	CScrollRegionParams ScrollParams;
-	ScrollParams.m_Active = m_Active;
 	ScrollParams.m_ScrollbarWidth = ScrollbarWidthMax();
 	ScrollParams.m_ScrollbarMargin = ScrollbarMargin();
 	ScrollParams.m_ScrollUnit = (m_ListBoxRowHeight + m_AutoSpacing) * RowsPerScroll;
@@ -148,7 +150,7 @@ CListboxItem CListBox::DoNextRow()
 	return Item;
 }
 
-CListboxItem CListBox::DoNextItem(const void *pId, bool Selected)
+CListboxItem CListBox::DoNextItem(const void *pId, bool Selected, float CornerRadius)
 {
 	if(m_AutoSpacing > 0.0f && m_ListBoxItemIndex > 0)
 		DoSpacing(m_AutoSpacing);
@@ -162,37 +164,31 @@ CListboxItem CListBox::DoNextItem(const void *pId, bool Selected)
 	}
 
 	CListboxItem Item = DoNextRow();
-	bool ItemClicked = false;
-
-	if(Item.m_Visible && UI()->DoButtonLogic(pId, 0, &Item.m_Rect))
+	const int ItemClicked = Item.m_Visible ? Ui()->DoButtonLogic(pId, 0, &Item.m_Rect) : 0;
+	if(ItemClicked)
 	{
-		ItemClicked = true;
 		m_ListBoxNewSelected = ThisItemIndex;
 		m_ListBoxItemSelected = true;
 		m_Active = true;
 	}
-	else
-		ItemClicked = false;
 
 	// process input, regard selected index
-	if(m_ListBoxSelectedIndex == ThisItemIndex)
+	if(m_ListBoxNewSelected == ThisItemIndex)
 	{
-		if(m_Active && !m_ListBoxDoneEvents)
+		if(m_Active)
 		{
-			m_ListBoxDoneEvents = true;
-
-			if(UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (ItemClicked && Input()->MouseDoubleClick()))
+			if(Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || (ItemClicked == 1 && Ui()->DoDoubleClickLogic(pId)))
 			{
 				m_ListBoxItemActivated = true;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 
-		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, m_Active ? 0.5f : 0.33f), IGraphics::CORNER_ALL, 5.0f);
+		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, m_Active ? 0.5f : 0.33f), IGraphics::CORNER_ALL, CornerRadius);
 	}
-	if(UI()->HotItem() == pId && !m_ScrollRegion.Animating())
+	if(Ui()->HotItem() == pId && !m_ScrollRegion.Animating())
 	{
-		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f), IGraphics::CORNER_ALL, 5.0f);
+		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f), IGraphics::CORNER_ALL, CornerRadius);
 	}
 
 	return Item;
@@ -208,7 +204,7 @@ CListboxItem CListBox::DoSubheader()
 int CListBox::DoEnd()
 {
 	m_ScrollRegion.End();
-	m_Active |= m_ScrollRegion.Params().m_Active;
+	m_Active |= m_ScrollRegion.Active();
 
 	m_ScrollbarShown = m_ScrollRegion.ScrollbarShown();
 	if(m_ListBoxNewSelOffset != 0 && m_ListBoxNumItems > 0 && m_ListBoxSelectedIndex == m_ListBoxNewSelected)
diff --git a/src/game/client/ui_listbox.h b/src/game/client/ui_listbox.h
index 1e2b9af379..26ecc71710 100644
--- a/src/game/client/ui_listbox.h
+++ b/src/game/client/ui_listbox.h
@@ -24,7 +24,6 @@ class CListBox : private CUIElementBase
 	int m_ListBoxNewSelected;
 	int m_ListBoxNewSelOffset;
 	bool m_ListBoxUpdateScroll;
-	bool m_ListBoxDoneEvents;
 	int m_ListBoxNumItems;
 	int m_ListBoxItemsPerRow;
 	bool m_ListBoxItemSelected;
@@ -54,7 +53,7 @@ class CListBox : private CUIElementBase
 	void DoFooter(const char *pBottomText, float FooterHeight = 20.0f); // call before DoStart to create a footer
 	void DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsPerScroll, int SelectedIndex, const CUIRect *pRect = nullptr, bool Background = true, int BackgroundCorners = IGraphics::CORNER_ALL, bool ForceShowScrollbar = false);
 	void ScrollToSelected() { m_ListBoxUpdateScroll = true; }
-	CListboxItem DoNextItem(const void *pID, bool Selected = false);
+	CListboxItem DoNextItem(const void *pId, bool Selected = false, float CornerRadius = 5.0f);
 	CListboxItem DoSubheader();
 	int DoEnd();
 
diff --git a/src/game/client/ui_rect.cpp b/src/game/client/ui_rect.cpp
index 9f44a89f2a..347477ad2a 100644
--- a/src/game/client/ui_rect.cpp
+++ b/src/game/client/ui_rect.cpp
@@ -25,7 +25,7 @@ void CUIRect::HSplitMid(CUIRect *pTop, CUIRect *pBottom, float Spacing) const
 		pBottom->x = r.x;
 		pBottom->y = r.y + Cut + HalfSpacing;
 		pBottom->w = r.w;
-		pBottom->h = r.h - Cut - HalfSpacing;
+		pBottom->h = Cut - HalfSpacing;
 	}
 }
 
@@ -89,7 +89,7 @@ void CUIRect::VSplitMid(CUIRect *pLeft, CUIRect *pRight, float Spacing) const
 	{
 		pRight->x = r.x + Cut + HalfSpacing;
 		pRight->y = r.y;
-		pRight->w = r.w - Cut - HalfSpacing;
+		pRight->w = Cut - HalfSpacing;
 		pRight->h = r.h;
 	}
 }
@@ -161,9 +161,9 @@ void CUIRect::HMargin(float Cut, CUIRect *pOtherRect) const
 	Margin(vec2(0.0f, Cut), pOtherRect);
 }
 
-bool CUIRect::Inside(float PointX, float PointY) const
+bool CUIRect::Inside(vec2 Point) const
 {
-	return PointX >= x && PointX < x + w && PointY >= y && PointY < y + h;
+	return Point.x >= x && Point.x < x + w && Point.y >= y && Point.y < y + h;
 }
 
 void CUIRect::Draw(ColorRGBA Color, int Corners, float Rounding) const
diff --git a/src/game/client/ui_rect.h b/src/game/client/ui_rect.h
index c95067b521..f3d38e420e 100644
--- a/src/game/client/ui_rect.h
+++ b/src/game/client/ui_rect.h
@@ -111,19 +111,49 @@ class CUIRect
 	 * @param pOtherRect The CUIRect to place inside *this* CUIRect
 	 */
 	void HMargin(float Cut, CUIRect *pOtherRect) const;
+
 	/**
 	 * Checks whether a point is inside *this* CUIRect.
 	 *
-	 * @param PointX The point's X position.
-	 * @param PointY The point's Y position.
+	 * @param Point The point's position.
 	 * @return true iff the given point is inside *this* CUIRect.
 	 */
-	bool Inside(float PointX, float PointY) const;
+	bool Inside(vec2 Point) const;
 
+	/**
+	 * Fill background of *this* CUIRect.
+	 *
+	 * @note Example of filling a black half transparent background with 5px rounded edges on all sides
+	 * @note ```MyCuiRect.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 5.0f);```
+	 *
+	 * @note Example of filling a red background with sharp edges
+	 * @note ```MyCuiRect.Draw(ColorRGBA(1.0f, 0.0f, 0.0f), IGraphics::CORNER_NONE, 0.0f);```
+	 *
+	 * @param Color
+	 * @param Corners
+	 * @param Rounding
+	 */
 	void Draw(ColorRGBA Color, int Corners, float Rounding) const;
 	void Draw4(ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding) const;
 
-	vec2 Center() const { return vec2(x + w / 2.0f, y + h / 2.0f); }
+	/**
+	 * Returns the top-left position of *this* CUIRect as a vec2.
+	 *
+	 * @return Top-left position as vec2.
+	 */
+	vec2 TopLeft() const { return vec2(x, y); }
+	/**
+	 * Returns the size of *this* CUIRect as a vec2.
+	 *
+	 * @return Size as vec2.
+	 */
+	vec2 Size() const { return vec2(w, h); }
+	/**
+	 * Returns the center position of *this* CUIRect as a vec2.
+	 *
+	 * @return Center position as vec2.
+	 */
+	vec2 Center() const { return TopLeft() + Size() / 2.0f; }
 };
 
 #endif
diff --git a/src/game/client/ui_scrollregion.cpp b/src/game/client/ui_scrollregion.cpp
index 2d3303d4f0..8c0cdba6c5 100644
--- a/src/game/client/ui_scrollregion.cpp
+++ b/src/game/client/ui_scrollregion.cpp
@@ -60,7 +60,7 @@ void CScrollRegion::Begin(CUIRect *pClipRect, vec2 *pOutOffset, const CScrollReg
 	if(m_Params.m_ClipBgColor.a > 0.0f)
 		pClipRect->Draw(m_Params.m_ClipBgColor, HasScrollBar ? IGraphics::CORNER_L : IGraphics::CORNER_ALL, 4.0f);
 
-	UI()->ClipEnable(pClipRect);
+	Ui()->ClipEnable(pClipRect);
 
 	m_ClipRect = *pClipRect;
 	m_ContentH = 0.0f;
@@ -69,7 +69,7 @@ void CScrollRegion::Begin(CUIRect *pClipRect, vec2 *pOutOffset, const CScrollReg
 
 void CScrollRegion::End()
 {
-	UI()->ClipDisable();
+	Ui()->ClipDisable();
 
 	// only show scrollbar if content overflows
 	if(m_ContentH <= m_ClipRect.h)
@@ -79,12 +79,12 @@ void CScrollRegion::End()
 	CUIRect RegionRect = m_ClipRect;
 	RegionRect.w += m_Params.m_ScrollbarWidth;
 
-	if(m_ScrollDirection != SCROLLRELATIVE_NONE || (UI()->Enabled() && m_Params.m_Active && UI()->MouseHovered(&RegionRect)))
+	if(m_ScrollDirection != SCROLLRELATIVE_NONE || Ui()->HotScrollRegion() == this)
 	{
 		bool ProgrammaticScroll = false;
-		if(UI()->ConsumeHotkey(CUI::HOTKEY_SCROLL_UP))
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_SCROLL_UP))
 			m_ScrollDirection = SCROLLRELATIVE_UP;
-		else if(UI()->ConsumeHotkey(CUI::HOTKEY_SCROLL_DOWN))
+		else if(Ui()->ConsumeHotkey(CUi::HOTKEY_SCROLL_DOWN))
 			m_ScrollDirection = SCROLLRELATIVE_DOWN;
 		else
 			ProgrammaticScroll = true;
@@ -106,6 +106,11 @@ void CScrollRegion::End()
 		}
 	}
 
+	if(Ui()->Enabled() && Ui()->MouseHovered(&RegionRect))
+	{
+		Ui()->SetHotScrollRegion(this);
+	}
+
 	const float SliderHeight = maximum(m_Params.m_SliderMinHeight, m_ClipRect.h / m_ContentH * m_RailRect.h);
 
 	CUIRect Slider = m_RailRect;
@@ -140,13 +145,13 @@ void CScrollRegion::End()
 	Slider.y += m_ScrollY / MaxScroll * MaxSlider;
 
 	bool Grabbed = false;
-	const void *pID = &m_ScrollY;
-	const bool InsideSlider = UI()->MouseHovered(&Slider);
-	const bool InsideRail = UI()->MouseHovered(&m_RailRect);
+	const void *pId = &m_ScrollY;
+	const bool InsideSlider = Ui()->MouseHovered(&Slider);
+	const bool InsideRail = Ui()->MouseHovered(&m_RailRect);
 
-	if(UI()->CheckActiveItem(pID) && UI()->MouseButton(0))
+	if(Ui()->CheckActiveItem(pId) && Ui()->MouseButton(0))
 	{
-		float MouseY = UI()->MouseY();
+		float MouseY = Ui()->MouseY();
 		m_ScrollY += (MouseY - (Slider.y + m_SliderGrabPos)) / MaxSlider * MaxScroll;
 		m_SliderGrabPos = clamp(m_SliderGrabPos, 0.0f, SliderHeight);
 		m_AnimTargetScrollY = m_ScrollY;
@@ -155,36 +160,36 @@ void CScrollRegion::End()
 	}
 	else if(InsideSlider)
 	{
-		UI()->SetHotItem(pID);
+		if(!Ui()->MouseButton(0))
+			Ui()->SetHotItem(pId);
 
-		if(!UI()->CheckActiveItem(pID) && UI()->MouseButtonClicked(0))
+		if(!Ui()->CheckActiveItem(pId) && Ui()->MouseButtonClicked(0))
 		{
-			UI()->SetActiveItem(pID);
-			m_SliderGrabPos = UI()->MouseY() - Slider.y;
+			Ui()->SetActiveItem(pId);
+			m_SliderGrabPos = Ui()->MouseY() - Slider.y;
 			m_AnimTargetScrollY = m_ScrollY;
 			m_AnimTime = 0.0f;
-			m_Params.m_Active = true;
 		}
 	}
-	else if(InsideRail && UI()->MouseButtonClicked(0))
+	else if(InsideRail && Ui()->MouseButtonClicked(0))
 	{
-		m_ScrollY += (UI()->MouseY() - (Slider.y + Slider.h / 2.0f)) / MaxSlider * MaxScroll;
-		UI()->SetHotItem(pID);
-		UI()->SetActiveItem(pID);
+		m_ScrollY += (Ui()->MouseY() - (Slider.y + Slider.h / 2.0f)) / MaxSlider * MaxScroll;
+		Ui()->SetHotItem(pId);
+		Ui()->SetActiveItem(pId);
 		m_SliderGrabPos = Slider.h / 2.0f;
 		m_AnimTargetScrollY = m_ScrollY;
 		m_AnimTime = 0.0f;
-		m_Params.m_Active = true;
 	}
-	else if(UI()->CheckActiveItem(pID) && !UI()->MouseButton(0))
+
+	if(Ui()->CheckActiveItem(pId) && !Ui()->MouseButton(0))
 	{
-		UI()->SetActiveItem(nullptr);
+		Ui()->SetActiveItem(nullptr);
 	}
 
 	m_ScrollY = clamp(m_ScrollY, 0.0f, MaxScroll);
 	m_ContentScrollOff.y = -m_ScrollY;
 
-	Slider.Draw(m_Params.SliderColor(Grabbed, UI()->HotItem() == pID), IGraphics::CORNER_ALL, Slider.w / 2.0f);
+	Slider.Draw(m_Params.SliderColor(Grabbed, Ui()->HotItem() == pId), IGraphics::CORNER_ALL, Slider.w / 2.0f);
 }
 
 bool CScrollRegion::AddRect(const CUIRect &Rect, bool ShouldScrollHere)
@@ -229,6 +234,11 @@ void CScrollRegion::ScrollRelative(EScrollRelative Direction, float SpeedMultipl
 	m_ScrollSpeedMultiplier = SpeedMultiplier;
 }
 
+void CScrollRegion::ScrollRelativeDirect(float ScrollAmount)
+{
+	m_RequestScrollY = clamp(m_ScrollY + ScrollAmount, 0.0f, m_ContentH - m_ClipRect.h);
+}
+
 void CScrollRegion::DoEdgeScrolling()
 {
 	if(!ScrollbarShown())
@@ -239,10 +249,10 @@ void CScrollRegion::DoEdgeScrolling()
 	const float ScrollSpeedFactor = MaxScrollMultiplier / ScrollBorderSize;
 	const float TopScrollPosition = m_ClipRect.y + ScrollBorderSize;
 	const float BottomScrollPosition = m_ClipRect.y + m_ClipRect.h - ScrollBorderSize;
-	if(UI()->MouseY() < TopScrollPosition)
-		ScrollRelative(SCROLLRELATIVE_UP, minimum(MaxScrollMultiplier, (TopScrollPosition - UI()->MouseY()) * ScrollSpeedFactor));
-	else if(UI()->MouseY() > BottomScrollPosition)
-		ScrollRelative(SCROLLRELATIVE_DOWN, minimum(MaxScrollMultiplier, (UI()->MouseY() - BottomScrollPosition) * ScrollSpeedFactor));
+	if(Ui()->MouseY() < TopScrollPosition)
+		ScrollRelative(SCROLLRELATIVE_UP, minimum(MaxScrollMultiplier, (TopScrollPosition - Ui()->MouseY()) * ScrollSpeedFactor));
+	else if(Ui()->MouseY() > BottomScrollPosition)
+		ScrollRelative(SCROLLRELATIVE_DOWN, minimum(MaxScrollMultiplier, (Ui()->MouseY() - BottomScrollPosition) * ScrollSpeedFactor));
 }
 
 bool CScrollRegion::RectClipped(const CUIRect &Rect) const
@@ -259,3 +269,8 @@ bool CScrollRegion::Animating() const
 {
 	return m_AnimTime > 0.0f;
 }
+
+bool CScrollRegion::Active() const
+{
+	return Ui()->ActiveItem() == &m_ScrollY;
+}
diff --git a/src/game/client/ui_scrollregion.h b/src/game/client/ui_scrollregion.h
index 2a601be534..0094b66e27 100644
--- a/src/game/client/ui_scrollregion.h
+++ b/src/game/client/ui_scrollregion.h
@@ -7,7 +7,6 @@
 
 struct CScrollRegionParams
 {
-	bool m_Active;
 	float m_ScrollbarWidth;
 	float m_ScrollbarMargin;
 	bool m_ScrollbarNoMarginRight;
@@ -28,7 +27,6 @@ struct CScrollRegionParams
 
 	CScrollRegionParams()
 	{
-		m_Active = true;
 		m_ScrollbarWidth = 20.0f;
 		m_ScrollbarMargin = 5.0f;
 		m_ScrollbarNoMarginRight = false;
@@ -135,11 +133,13 @@ class CScrollRegion : private CUIElementBase
 	bool AddRect(const CUIRect &Rect, bool ShouldScrollHere = false); // returns true if the added rect is visible (not clipped)
 	void ScrollHere(EScrollOption Option = SCROLLHERE_KEEP_IN_VIEW);
 	void ScrollRelative(EScrollRelative Direction, float SpeedMultiplier = 1.0f);
+	void ScrollRelativeDirect(float ScrollAmount);
 	const CUIRect *ClipRect() const { return &m_ClipRect; }
 	void DoEdgeScrolling();
 	bool RectClipped(const CUIRect &Rect) const;
 	bool ScrollbarShown() const;
 	bool Animating() const;
+	bool Active() const;
 	const CScrollRegionParams &Params() const { return m_Params; }
 };
 
diff --git a/src/game/collision.cpp b/src/game/collision.cpp
index 8612ad7dc2..acdc51558c 100644
--- a/src/game/collision.cpp
+++ b/src/game/collision.cpp
@@ -38,28 +38,19 @@ vec2 ClampVel(int MoveRestriction, vec2 Vel)
 
 CCollision::CCollision()
 {
-	m_pTiles = 0;
-	m_Width = 0;
-	m_Height = 0;
-	m_pLayers = 0;
-
-	m_pTele = 0;
-	m_pSpeedup = 0;
-	m_pFront = 0;
-	m_pSwitch = 0;
-	m_pDoor = 0;
-	m_pTune = 0;
+	m_pDoor = nullptr;
+	Unload();
 }
 
 CCollision::~CCollision()
 {
-	Dest();
+	Unload();
 }
 
 void CCollision::Init(class CLayers *pLayers)
 {
-	Dest();
-	m_HighestSwitchNumber = 0;
+	Unload();
+
 	m_pLayers = pLayers;
 	m_Width = m_pLayers->GameLayer()->m_Width;
 	m_Height = m_pLayers->GameLayer()->m_Height;
@@ -88,10 +79,6 @@ void CCollision::Init(class CLayers *pLayers)
 		m_pDoor = new CDoorTile[m_Width * m_Height];
 		mem_zero(m_pDoor, (size_t)m_Width * m_Height * sizeof(CDoorTile));
 	}
-	else
-	{
-		m_pDoor = 0;
-	}
 
 	if(m_pLayers->TuneLayer())
 	{
@@ -131,9 +118,60 @@ void CCollision::Init(class CLayers *pLayers)
 			}
 		}
 	}
+
+	if(m_pTele)
+	{
+		for(int i = 0; i < m_Width * m_Height; i++)
+		{
+			int Number = m_pTele[i].m_Number;
+			int Type = m_pTele[i].m_Type;
+			if(Number > 0)
+			{
+				if(Type == TILE_TELEIN)
+				{
+					m_TeleIns[Number - 1].emplace_back(i % m_Width * 32.0f + 16.0f, i / m_Width * 32.0f + 16.0f);
+				}
+				else if(Type == TILE_TELEOUT)
+				{
+					m_TeleOuts[Number - 1].emplace_back(i % m_Width * 32.0f + 16.0f, i / m_Width * 32.0f + 16.0f);
+				}
+				else if(Type == TILE_TELECHECKOUT)
+				{
+					m_TeleCheckOuts[Number - 1].emplace_back(i % m_Width * 32.0f + 16.0f, i / m_Width * 32.0f + 16.0f);
+				}
+				else if(Type)
+				{
+					m_TeleOthers[Number - 1].emplace_back(i % m_Width * 32.0f + 16.0f, i / m_Width * 32.0f + 16.0f);
+				}
+			}
+		}
+	}
 }
 
-void CCollision::FillAntibot(CAntibotMapData *pMapData)
+void CCollision::Unload()
+{
+	m_pTiles = nullptr;
+	m_Width = 0;
+	m_Height = 0;
+	m_pLayers = nullptr;
+
+	m_HighestSwitchNumber = 0;
+
+	m_TeleIns.clear();
+	m_TeleOuts.clear();
+	m_TeleCheckOuts.clear();
+	m_TeleOthers.clear();
+
+	m_pTele = nullptr;
+	m_pSpeedup = nullptr;
+	m_pFront = nullptr;
+	m_pSwitch = nullptr;
+	m_pTune = nullptr;
+	delete[] m_pDoor;
+	m_pDoor = nullptr;
+}
+
+void CCollision::FillAntibot(CAntibotMapData *pMapData) const
 {
 	pMapData->m_Width = m_Width;
 	pMapData->m_Height = m_Height;
@@ -558,49 +596,34 @@ void CCollision::MoveBox(vec2 *pInoutPos, vec2 *pInoutVel, vec2 Size, vec2 Elast
 
 // DDRace
 
-void CCollision::Dest()
-{
-	delete[] m_pDoor;
-	m_pTiles = 0;
-	m_Width = 0;
-	m_Height = 0;
-	m_pLayers = 0;
-	m_pTele = 0;
-	m_pSpeedup = 0;
-	m_pFront = 0;
-	m_pSwitch = 0;
-	m_pTune = 0;
-	m_pDoor = 0;
-}
-
 int CCollision::IsSolid(int x, int y) const
 {
 	int index = GetTile(x, y);
 	return index == TILE_SOLID || index == TILE_NOHOOK;
 }
 
-bool CCollision::IsThrough(int x, int y, int xoff, int yoff, vec2 pos0, vec2 pos1) const
+bool CCollision::IsThrough(int x, int y, int OffsetX, int OffsetY, vec2 Pos0, vec2 Pos1) const
 {
 	int pos = GetPureMapIndex(x, y);
 	if(m_pFront && (m_pFront[pos].m_Index == TILE_THROUGH_ALL || m_pFront[pos].m_Index == TILE_THROUGH_CUT))
 		return true;
-	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && pos0.y > pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && pos0.x < pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && pos0.y < pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && pos0.x > pos1.x)))
+	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && Pos0.y > Pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && Pos0.x < Pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && Pos0.y < Pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && Pos0.x > Pos1.x)))
 		return true;
-	int offpos = GetPureMapIndex(x + xoff, y + yoff);
+	int offpos = GetPureMapIndex(x + OffsetX, y + OffsetY);
 	return m_pTiles[offpos].m_Index == TILE_THROUGH || (m_pFront && m_pFront[offpos].m_Index == TILE_THROUGH);
 }
 
-bool CCollision::IsHookBlocker(int x, int y, vec2 pos0, vec2 pos1) const
+bool CCollision::IsHookBlocker(int x, int y, vec2 Pos0, vec2 Pos1) const
 {
 	int pos = GetPureMapIndex(x, y);
 	if(m_pTiles[pos].m_Index == TILE_THROUGH_ALL || (m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_ALL))
 		return true;
-	if(m_pTiles[pos].m_Index == TILE_THROUGH_DIR && ((m_pTiles[pos].m_Flags == ROTATION_0 && pos0.y < pos1.y) ||
-								(m_pTiles[pos].m_Flags == ROTATION_90 && pos0.x > pos1.x) ||
-								(m_pTiles[pos].m_Flags == ROTATION_180 && pos0.y > pos1.y) ||
-								(m_pTiles[pos].m_Flags == ROTATION_270 && pos0.x < pos1.x)))
+	if(m_pTiles[pos].m_Index == TILE_THROUGH_DIR && ((m_pTiles[pos].m_Flags == ROTATION_0 && Pos0.y < Pos1.y) ||
+								(m_pTiles[pos].m_Flags == ROTATION_90 && Pos0.x > Pos1.x) ||
+								(m_pTiles[pos].m_Flags == ROTATION_180 && Pos0.y > Pos1.y) ||
+								(m_pTiles[pos].m_Flags == ROTATION_270 && Pos0.x < Pos1.x)))
 		return true;
-	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && pos0.y < pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && pos0.x > pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && pos0.y > pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && pos0.x < pos1.x)))
+	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && Pos0.y < Pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && Pos0.x > Pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && Pos0.y > Pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && Pos0.x < Pos1.x)))
 		return true;
 	return false;
 }
@@ -1032,60 +1055,35 @@ int CCollision::GetFTile(int x, int y) const
 int CCollision::Entity(int x, int y, int Layer) const
 {
 	if(x < 0 || x >= m_Width || y < 0 || y >= m_Height)
-	{
-		const char *pName;
-		switch(Layer)
-		{
-		case LAYER_GAME:
-			pName = "Game";
-			break;
-		case LAYER_FRONT:
-			pName = "Front";
-			break;
-		case LAYER_SWITCH:
-			pName = "Switch";
-			break;
-		case LAYER_TELE:
-			pName = "Tele";
-			break;
-		case LAYER_SPEEDUP:
-			pName = "Speedup";
-			break;
-		case LAYER_TUNE:
-			pName = "Tune";
-			break;
-		default:
-			pName = "Unknown";
-		}
-		dbg_msg("collision", "Something is VERY wrong with the %s layer near (%d, %d). Please report this at https://github.com/ddnet/ddnet/issues, you will need to post the map as well and any steps that you think may have led to this.", pName, x, y);
 		return 0;
-	}
+
+	const int Index = y * m_Width + x;
 	switch(Layer)
 	{
 	case LAYER_GAME:
-		return m_pTiles[y * m_Width + x].m_Index - ENTITY_OFFSET;
+		return m_pTiles[Index].m_Index - ENTITY_OFFSET;
 	case LAYER_FRONT:
-		return m_pFront[y * m_Width + x].m_Index - ENTITY_OFFSET;
+		return m_pFront[Index].m_Index - ENTITY_OFFSET;
 	case LAYER_SWITCH:
-		return m_pSwitch[y * m_Width + x].m_Type - ENTITY_OFFSET;
+		return m_pSwitch[Index].m_Type - ENTITY_OFFSET;
 	case LAYER_TELE:
-		return m_pTele[y * m_Width + x].m_Type - ENTITY_OFFSET;
+		return m_pTele[Index].m_Type - ENTITY_OFFSET;
 	case LAYER_SPEEDUP:
-		return m_pSpeedup[y * m_Width + x].m_Type - ENTITY_OFFSET;
+		return m_pSpeedup[Index].m_Type - ENTITY_OFFSET;
 	case LAYER_TUNE:
-		return m_pTune[y * m_Width + x].m_Type - ENTITY_OFFSET;
+		return m_pTune[Index].m_Type - ENTITY_OFFSET;
 	default:
-		return 0;
-		break;
+		dbg_assert(false, "Layer invalid");
+		dbg_break();
 	}
 }
 
-void CCollision::SetCollisionAt(float x, float y, int id)
+void CCollision::SetCollisionAt(float x, float y, int Index)
 {
 	int Nx = clamp(round_to_int(x) / 32, 0, m_Width - 1);
 	int Ny = clamp(round_to_int(y) / 32, 0, m_Height - 1);
 
-	m_pTiles[Ny * m_Width + Nx].m_Index = id;
+	m_pTiles[Ny * m_Width + Nx].m_Index = Index;
 }
 
 void CCollision::SetDCollisionAt(float x, float y, int Type, int Flags, int Number)
@@ -1162,7 +1160,7 @@ int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2
 
 	for(int i = 0, id = std::ceil(d); i < id; i++)
 	{
-		float a = (int)i / d;
+		float a = i / d;
 		vec2 Pos = mix(Pos0, Pos1, a);
 		int Nx = clamp(round_to_int(Pos.x) / 32, 0, m_Width - 1);
 		int Ny = clamp(round_to_int(Pos.y) / 32, 0, m_Height - 1);
@@ -1267,3 +1265,48 @@ int CCollision::IsFTimeCheckpoint(int Index) const
 		return z - TILE_TIME_CHECKPOINT_FIRST;
 	return -1;
 }
+
+vec2 CCollision::TeleAllGet(int Number, size_t Offset)
+{
+	if(m_TeleIns.count(Number) > 0)
+	{
+		if(m_TeleIns[Number].size() > Offset)
+			return m_TeleIns[Number][Offset];
+		else
+			Offset -= m_TeleIns[Number].size();
+	}
+	if(m_TeleOuts.count(Number) > 0)
+	{
+		if(m_TeleOuts[Number].size() > Offset)
+			return m_TeleOuts[Number][Offset];
+		else
+			Offset -= m_TeleOuts[Number].size();
+	}
+	if(m_TeleCheckOuts.count(Number) > 0)
+	{
+		if(m_TeleCheckOuts[Number].size() > Offset)
+			return m_TeleCheckOuts[Number][Offset];
+		else
+			Offset -= m_TeleCheckOuts[Number].size();
+	}
+	if(m_TeleOthers.count(Number) > 0)
+	{
+		if(m_TeleOthers[Number].size() > Offset)
+			return m_TeleOthers[Number][Offset];
+	}
+	return vec2(-1, -1);
+}
+
+size_t CCollision::TeleAllSize(int Number)
+{
+	size_t Total = 0;
+	if(m_TeleIns.count(Number) > 0)
+		Total += m_TeleIns[Number].size();
+	if(m_TeleOuts.count(Number) > 0)
+		Total += m_TeleOuts[Number].size();
+	if(m_TeleCheckOuts.count(Number) > 0)
+		Total += m_TeleCheckOuts[Number].size();
+	if(m_TeleOthers.count(Number) > 0)
+		Total += m_TeleOthers[Number].size();
+	return Total;
+}
diff --git a/src/game/collision.h b/src/game/collision.h
index 351ac05dd2..a5f987488b 100644
--- a/src/game/collision.h
+++ b/src/game/collision.h
@@ -6,8 +6,17 @@
 #include <base/vmath.h>
 #include <engine/shared/protocol.h>
 
+#include <map>
 #include <vector>
 
+class CTile;
+class CLayers;
+class CTeleTile;
+class CSpeedupTile;
+class CSwitchTile;
+class CTuneTile;
+class CDoorTile;
+
 enum
 {
 	CANTMOVE_LEFT = 1 << 0,
@@ -23,16 +32,14 @@ struct CAntibotMapData;
 
 class CCollision
 {
-	class CTile *m_pTiles;
-	int m_Width;
-	int m_Height;
-	class CLayers *m_pLayers;
-
 public:
 	CCollision();
 	~CCollision();
-	void Init(class CLayers *pLayers);
-	void FillAntibot(CAntibotMapData *pMapData);
+
+	void Init(CLayers *pLayers);
+	void Unload();
+	void FillAntibot(CAntibotMapData *pMapData) const;
+
 	bool CheckPoint(float x, float y) const { return IsSolid(round_to_int(x), round_to_int(y)); }
 	bool CheckPoint(vec2 Pos) const { return CheckPoint(Pos.x, Pos.y); }
 	int GetCollisionAt(float x, float y) const { return GetTile(round_to_int(x), round_to_int(y)); }
@@ -46,10 +53,7 @@ class CCollision
 	bool TestBox(vec2 Pos, vec2 Size) const;
 
 	// DDRace
-
-	void Dest();
-	void SetCollisionAt(float x, float y, int id);
-	void SetDTile(float x, float y, bool State);
+	void SetCollisionAt(float x, float y, int Index);
 	void SetDCollisionAt(float x, float y, int Type, int Flags, int Number);
 	int GetDTileIndex(int Index) const;
 	int GetDTileFlags(int Index) const;
@@ -63,7 +67,7 @@ class CCollision
 	int GetFIndex(int x, int y) const;
 
 	int GetMoveRestrictions(CALLBACK_SWITCHACTIVE pfnSwitchActive, void *pUser, vec2 Pos, float Distance = 18.0f, int OverrideCenterTileIndex = -1) const;
-	int GetMoveRestrictions(vec2 Pos, float Distance = 18.0f)
+	int GetMoveRestrictions(vec2 Pos, float Distance = 18.0f) const
 	{
 		return GetMoveRestrictions(nullptr, nullptr, Pos, Distance);
 	}
@@ -97,8 +101,8 @@ class CCollision
 	int GetSwitchDelay(int Index) const;
 
 	int IsSolid(int x, int y) const;
-	bool IsThrough(int x, int y, int xoff, int yoff, vec2 pos0, vec2 pos1) const;
-	bool IsHookBlocker(int x, int y, vec2 pos0, vec2 pos1) const;
+	bool IsThrough(int x, int y, int OffsetX, int OffsetY, vec2 Pos0, vec2 Pos1) const;
+	bool IsHookBlocker(int x, int y, vec2 Pos0, vec2 Pos1) const;
 	int IsWallJump(int Index) const;
 	int IsNoLaser(int x, int y) const;
 	int IsFNoLaser(int x, int y) const;
@@ -110,19 +114,61 @@ class CCollision
 
 	vec2 CpSpeed(int index, int Flags = 0) const;
 
-	class CTeleTile *TeleLayer() { return m_pTele; }
-	class CSwitchTile *SwitchLayer() { return m_pSwitch; }
-	class CTuneTile *TuneLayer() { return m_pTune; }
-	class CLayers *Layers() { return m_pLayers; }
+	const CLayers *Layers() const { return m_pLayers; }
+	const CTile *GameLayer() const { return m_pTiles; }
+	const CTeleTile *TeleLayer() const { return m_pTele; }
+	const CSpeedupTile *SpeedupLayer() const { return m_pSpeedup; }
+	const CTile *FrontLayer() const { return m_pFront; }
+	const CSwitchTile *SwitchLayer() const { return m_pSwitch; }
+	const CTuneTile *TuneLayer() const { return m_pTune; }
+
 	int m_HighestSwitchNumber;
 
+	/**
+	 * Index all teleporter types (in, out and checkpoints)
+	 * as one consecutive list.
+	 *
+	 * @param Number is the teleporter number (one less than what is shown in game)
+	 * @param Offset picks the n'th occurence of that teleporter in the map
+	 *
+	 * @return The coordinates of the teleporter in the map
+	 *         or (-1, -1) if not found
+	 */
+	vec2 TeleAllGet(int Number, size_t Offset);
+
+	/**
+	 * @param Number is the teleporter number (one less than what is shown in game)
+	 * @return The amount of occurences of that teleporter across all types (in, out, checkpoint)
+	 */
+	size_t TeleAllSize(int Number);
+
+	const std::vector<vec2> &TeleIns(int Number) { return m_TeleIns[Number]; }
+	const std::vector<vec2> &TeleOuts(int Number) { return m_TeleOuts[Number]; }
+	const std::vector<vec2> &TeleCheckOuts(int Number) { return m_TeleCheckOuts[Number]; }
+	const std::vector<vec2> &TeleOthers(int Number) { return m_TeleOthers[Number]; }
+
 private:
-	class CTeleTile *m_pTele;
-	class CSpeedupTile *m_pSpeedup;
-	class CTile *m_pFront;
-	class CSwitchTile *m_pSwitch;
-	class CTuneTile *m_pTune;
-	class CDoorTile *m_pDoor;
+	CLayers *m_pLayers;
+
+	int m_Width;
+	int m_Height;
+
+	CTile *m_pTiles;
+	CTeleTile *m_pTele;
+	CSpeedupTile *m_pSpeedup;
+	CTile *m_pFront;
+	CSwitchTile *m_pSwitch;
+	CTuneTile *m_pTune;
+	CDoorTile *m_pDoor;
+
+	// TILE_TELEIN
+	std::map<int, std::vector<vec2>> m_TeleIns;
+	// TILE_TELEOUT
+	std::map<int, std::vector<vec2>> m_TeleOuts;
+	// TILE_TELECHECKOUT
+	std::map<int, std::vector<vec2>> m_TeleCheckOuts;
+	// TILE_TELEINEVIL, TILE_TELECHECK, TILE_TELECHECKIN, TILE_TELECHECKINEVIL
+	std::map<int, std::vector<vec2>> m_TeleOthers;
 };
 
 void ThroughOffset(vec2 Pos0, vec2 Pos1, int *pOffsetX, int *pOffsetY);
diff --git a/src/game/editor/auto_map.cpp b/src/game/editor/auto_map.cpp
index 4f58f8e0fd..4edb402384 100644
--- a/src/game/editor/auto_map.cpp
+++ b/src/game/editor/auto_map.cpp
@@ -5,10 +5,10 @@
 #include <engine/shared/linereader.h>
 #include <engine/storage.h>
 
+#include <game/editor/mapitems/layer_tiles.h>
 #include <game/mapitems.h>
 
 #include "auto_map.h"
-#include "editor.h" // TODO: only needs CLayerTiles
 #include "editor_actions.h"
 
 // Based on triple32inc from https://github.com/skeeto/hash-prospector/tree/79a6074062a84907df6e45b756134b74e2956760
@@ -42,15 +42,15 @@ static int HashLocation(uint32_t Seed, uint32_t Run, uint32_t Rule, uint32_t X,
 
 CAutoMapper::CAutoMapper(CEditor *pEditor)
 {
-	Init(pEditor);
+	OnInit(pEditor);
 }
 
 void CAutoMapper::Load(const char *pTileName)
 {
 	char aPath[IO_MAX_PATH_LENGTH];
 	str_format(aPath, sizeof(aPath), "editor/automap/%s.rules", pTileName);
-	IOHANDLE RulesFile = Storage()->OpenFile(aPath, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!RulesFile)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(Storage()->OpenFile(aPath, IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
 		char aBuf[IO_MAX_PATH_LENGTH + 32];
 		str_format(aBuf, sizeof(aBuf), "failed to load %s", aPath);
@@ -58,15 +58,12 @@ void CAutoMapper::Load(const char *pTileName)
 		return;
 	}
 
-	CLineReader LineReader;
-	LineReader.Init(RulesFile);
-
 	CConfiguration *pCurrentConf = nullptr;
 	CRun *pCurrentRun = nullptr;
 	CIndexRule *pCurrentIndex = nullptr;
 
 	// read each line
-	while(char *pLine = LineReader.Get())
+	while(const char *pLine = LineReader.Get())
 	{
 		// skip blank/empty lines as well as comments
 		if(str_length(pLine) > 0 && pLine[0] != '#' && pLine[0] != '\n' && pLine[0] != '\r' && pLine[0] != '\t' && pLine[0] != '\v' && pLine[0] != ' ')
@@ -82,16 +79,16 @@ void CAutoMapper::Load(const char *pTileName)
 				NewConf.m_EndX = 0;
 				NewConf.m_EndY = 0;
 				m_vConfigs.push_back(NewConf);
-				int ConfigurationID = m_vConfigs.size() - 1;
-				pCurrentConf = &m_vConfigs[ConfigurationID];
+				int ConfigurationId = m_vConfigs.size() - 1;
+				pCurrentConf = &m_vConfigs[ConfigurationId];
 				str_copy(pCurrentConf->m_aName, pLine, minimum<int>(sizeof(pCurrentConf->m_aName), str_length(pLine)));
 
 				// add start run
 				CRun NewRun;
 				NewRun.m_AutomapCopy = true;
 				pCurrentConf->m_vRuns.push_back(NewRun);
-				int RunID = pCurrentConf->m_vRuns.size() - 1;
-				pCurrentRun = &pCurrentConf->m_vRuns[RunID];
+				int RunId = pCurrentConf->m_vRuns.size() - 1;
+				pCurrentRun = &pCurrentConf->m_vRuns[RunId];
 			}
 			else if(str_startswith(pLine, "NewRun") && pCurrentConf)
 			{
@@ -99,21 +96,21 @@ void CAutoMapper::Load(const char *pTileName)
 				CRun NewRun;
 				NewRun.m_AutomapCopy = true;
 				pCurrentConf->m_vRuns.push_back(NewRun);
-				int RunID = pCurrentConf->m_vRuns.size() - 1;
-				pCurrentRun = &pCurrentConf->m_vRuns[RunID];
+				int RunId = pCurrentConf->m_vRuns.size() - 1;
+				pCurrentRun = &pCurrentConf->m_vRuns[RunId];
 			}
 			else if(str_startswith(pLine, "Index") && pCurrentRun)
 			{
 				// new index
-				int ID = 0;
+				int Id = 0;
 				char aOrientation1[128] = "";
 				char aOrientation2[128] = "";
 				char aOrientation3[128] = "";
 
-				sscanf(pLine, "Index %d %127s %127s %127s", &ID, aOrientation1, aOrientation2, aOrientation3);
+				sscanf(pLine, "Index %d %127s %127s %127s", &Id, aOrientation1, aOrientation2, aOrientation3);
 
 				CIndexRule NewIndexRule;
-				NewIndexRule.m_ID = ID;
+				NewIndexRule.m_Id = Id;
 				NewIndexRule.m_Flag = 0;
 				NewIndexRule.m_RandomProbability = 1.0f;
 				NewIndexRule.m_DefaultRule = true;
@@ -152,8 +149,8 @@ void CAutoMapper::Load(const char *pTileName)
 
 				// add the index rule object and make it current
 				pCurrentRun->m_vIndexRules.push_back(NewIndexRule);
-				int IndexRuleID = pCurrentRun->m_vIndexRules.size() - 1;
-				pCurrentIndex = &pCurrentRun->m_vIndexRules[IndexRuleID];
+				int IndexRuleId = pCurrentRun->m_vIndexRules.size() - 1;
+				pCurrentIndex = &pCurrentRun->m_vIndexRules[IndexRuleId];
 			}
 			else if(str_startswith(pLine, "Pos") && pCurrentIndex)
 			{
@@ -188,15 +185,15 @@ void CAutoMapper::Load(const char *pTileName)
 					int pWord = 4;
 					while(true)
 					{
-						int ID = 0;
+						int Id = 0;
 						char aOrientation1[128] = "";
 						char aOrientation2[128] = "";
 						char aOrientation3[128] = "";
 						char aOrientation4[128] = "";
-						sscanf(str_trim_words(pLine, pWord), "%d %127s %127s %127s %127s", &ID, aOrientation1, aOrientation2, aOrientation3, aOrientation4);
+						sscanf(str_trim_words(pLine, pWord), "%d %127s %127s %127s %127s", &Id, aOrientation1, aOrientation2, aOrientation3, aOrientation4);
 
 						CIndexInfo NewIndexInfo;
-						NewIndexInfo.m_ID = ID;
+						NewIndexInfo.m_Id = Id;
 						NewIndexInfo.m_Flag = 0;
 						NewIndexInfo.m_TestFlag = false;
 
@@ -296,10 +293,18 @@ void CAutoMapper::Load(const char *pTileName)
 					{
 						for(const auto &Index : vNewIndexList)
 						{
-							if(Value == CPosRule::INDEX && Index.m_ID == 0)
+							if(Index.m_Id == 0 && Value == CPosRule::INDEX)
+							{
+								// Skip full tiles if we have a rule "POS 0 0 INDEX 0"
+								// because that forces the tile to be empty
 								pCurrentIndex->m_SkipFull = true;
-							else
+							}
+							else if((Index.m_Id > 0 && Value == CPosRule::INDEX) || (Index.m_Id == 0 && Value == CPosRule::NOTINDEX))
+							{
+								// Skip empty tiles if we have a rule "POS 0 0 INDEX i" where i > 0
+								// or if we have a rule "POS 0 0 NOTINDEX 0"
 								pCurrentIndex->m_SkipEmpty = true;
+							}
 						}
 					}
 				}
@@ -337,14 +342,25 @@ void CAutoMapper::Load(const char *pTileName)
 			for(auto &IndexRule : Run.m_vIndexRules)
 			{
 				bool Found = false;
+
+				// Search for the exact rule "POS 0 0 INDEX 0" which corresponds to the default rule
 				for(const auto &Rule : IndexRule.m_vRules)
 				{
-					if(Rule.m_X == 0 && Rule.m_Y == 0)
+					if(Rule.m_X == 0 && Rule.m_Y == 0 && Rule.m_Value == CPosRule::INDEX)
 					{
-						Found = true;
+						for(const auto &Index : Rule.m_vIndexList)
+						{
+							if(Index.m_Id == 0)
+								Found = true;
+						}
 						break;
 					}
+
+					if(Found)
+						break;
 				}
+
+				// If the default rule was not found, and we require it, then add it
 				if(!Found && IndexRule.m_DefaultRule)
 				{
 					std::vector<CIndexInfo> vNewIndexList;
@@ -356,6 +372,7 @@ void CAutoMapper::Load(const char *pTileName)
 					IndexRule.m_SkipEmpty = true;
 					IndexRule.m_SkipFull = false;
 				}
+
 				if(IndexRule.m_SkipEmpty && IndexRule.m_SkipFull)
 				{
 					IndexRule.m_SkipEmpty = false;
@@ -365,8 +382,6 @@ void CAutoMapper::Load(const char *pTileName)
 		}
 	}
 
-	io_close(RulesFile);
-
 	char aBuf[IO_MAX_PATH_LENGTH + 16];
 	str_format(aBuf, sizeof(aBuf), "loaded %s", aPath);
 	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
@@ -382,9 +397,9 @@ const char *CAutoMapper::GetConfigName(int Index)
 	return m_vConfigs[Index].m_aName;
 }
 
-void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigID, int Seed, int X, int Y, int Width, int Height)
+void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigId, int Seed, int X, int Y, int Width, int Height)
 {
-	if(!m_FileLoaded || pLayer->m_Readonly || ConfigID < 0 || ConfigID >= (int)m_vConfigs.size())
+	if(!m_FileLoaded || pLayer->m_Readonly || ConfigId < 0 || ConfigId >= (int)m_vConfigs.size())
 		return;
 
 	if(Width < 0)
@@ -393,7 +408,7 @@ void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigID, int Seed,
 	if(Height < 0)
 		Height = pLayer->m_Height;
 
-	CConfiguration *pConf = &m_vConfigs[ConfigID];
+	CConfiguration *pConf = &m_vConfigs[ConfigId];
 
 	int CommitFromX = clamp(X + pConf->m_StartX, 0, pLayer->m_Width);
 	int CommitFromY = clamp(Y + pConf->m_StartY, 0, pLayer->m_Height);
@@ -418,7 +433,7 @@ void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigID, int Seed,
 		}
 	}
 
-	Proceed(pUpdateLayer, ConfigID, Seed, UpdateFromX, UpdateFromY);
+	Proceed(pUpdateLayer, ConfigId, Seed, UpdateFromX, UpdateFromY);
 
 	for(int y = CommitFromY; y < CommitToY; y++)
 	{
@@ -436,15 +451,15 @@ void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigID, int Seed,
 	delete pUpdateLayer;
 }
 
-void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedOffsetX, int SeedOffsetY)
+void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigId, int Seed, int SeedOffsetX, int SeedOffsetY)
 {
-	if(!m_FileLoaded || pLayer->m_Readonly || ConfigID < 0 || ConfigID >= (int)m_vConfigs.size())
+	if(!m_FileLoaded || pLayer->m_Readonly || ConfigId < 0 || ConfigId >= (int)m_vConfigs.size())
 		return;
 
 	if(Seed == 0)
 		Seed = rand();
 
-	CConfiguration *pConf = &m_vConfigs[ConfigID];
+	CConfiguration *pConf = &m_vConfigs[ConfigId];
 	pLayer->ClearHistory();
 
 	// for every run: copy tiles, automap, overwrite tiles
@@ -480,14 +495,15 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedO
 			for(int x = 0; x < pLayer->m_Width; x++)
 			{
 				CTile *pTile = &(pLayer->m_pTiles[y * pLayer->m_Width + x]);
+				const CTile *pReadTile = &(pReadLayer->m_pTiles[y * pLayer->m_Width + x]);
 				Editor()->m_Map.OnModify();
 
 				for(size_t i = 0; i < pRun->m_vIndexRules.size(); ++i)
 				{
 					CIndexRule *pIndexRule = &pRun->m_vIndexRules[i];
-					if(pIndexRule->m_SkipEmpty && pTile->m_Index == 0) // skip empty tiles
+					if(pIndexRule->m_SkipEmpty && pReadTile->m_Index == 0) // skip empty tiles
 						continue;
-					if(pIndexRule->m_SkipFull && pTile->m_Index != 0) // skip full tiles
+					if(pIndexRule->m_SkipFull && pReadTile->m_Index != 0) // skip full tiles
 						continue;
 
 					bool RespectRules = true;
@@ -515,7 +531,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedO
 							RespectRules = false;
 							for(const auto &Index : pRule->m_vIndexList)
 							{
-								if(CheckIndex == Index.m_ID && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
+								if(CheckIndex == Index.m_Id && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
 								{
 									RespectRules = true;
 									break;
@@ -526,7 +542,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedO
 						{
 							for(const auto &Index : pRule->m_vIndexList)
 							{
-								if(CheckIndex == Index.m_ID && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
+								if(CheckIndex == Index.m_Id && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
 								{
 									RespectRules = false;
 									break;
@@ -539,7 +555,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedO
 						(pIndexRule->m_RandomProbability >= 1.0f || HashLocation(Seed, h, i, x + SeedOffsetX, y + SeedOffsetY) < HASH_MAX * pIndexRule->m_RandomProbability))
 					{
 						CTile Previous = *pTile;
-						pTile->m_Index = pIndexRule->m_ID;
+						pTile->m_Index = pIndexRule->m_Id;
 						pTile->m_Flags = pIndexRule->m_Flag;
 						pLayer->RecordStateChange(x, y, Previous, *pTile);
 					}
diff --git a/src/game/editor/auto_map.h b/src/game/editor/auto_map.h
index 4e998af724..02ddd9b892 100644
--- a/src/game/editor/auto_map.h
+++ b/src/game/editor/auto_map.h
@@ -9,7 +9,7 @@ class CAutoMapper : public CEditorComponent
 {
 	struct CIndexInfo
 	{
-		int m_ID;
+		int m_Id;
 		int m_Flag;
 		bool m_TestFlag;
 	};
@@ -31,7 +31,7 @@ class CAutoMapper : public CEditorComponent
 
 	struct CIndexRule
 	{
-		int m_ID;
+		int m_Id;
 		std::vector<CPosRule> m_vRules;
 		int m_Flag;
 		float m_RandomProbability;
@@ -60,8 +60,8 @@ class CAutoMapper : public CEditorComponent
 	explicit CAutoMapper(CEditor *pEditor);
 
 	void Load(const char *pTileName);
-	void ProceedLocalized(class CLayerTiles *pLayer, int ConfigID, int Seed = 0, int X = 0, int Y = 0, int Width = -1, int Height = -1);
-	void Proceed(class CLayerTiles *pLayer, int ConfigID, int Seed = 0, int SeedOffsetX = 0, int SeedOffsetY = 0);
+	void ProceedLocalized(class CLayerTiles *pLayer, int ConfigId, int Seed = 0, int X = 0, int Y = 0, int Width = -1, int Height = -1);
+	void Proceed(class CLayerTiles *pLayer, int ConfigId, int Seed = 0, int SeedOffsetX = 0, int SeedOffsetY = 0);
 
 	int ConfigNamesNum() const { return m_vConfigs.size(); }
 	const char *GetConfigName(int Index);
diff --git a/src/game/editor/component.cpp b/src/game/editor/component.cpp
index 05e49ad29c..f008ab4e45 100644
--- a/src/game/editor/component.cpp
+++ b/src/game/editor/component.cpp
@@ -14,7 +14,7 @@ void CEditorComponent::InitSubComponents()
 {
 	for(CEditorComponent &Component : m_vSubComponents)
 	{
-		Component.Init(Editor());
+		Component.OnInit(Editor());
 	}
 }
 
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index 2caf68a624..ca238a279b 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -41,6 +41,7 @@
 #include "editor_actions.h"
 
 #include <chrono>
+#include <iterator>
 #include <limits>
 #include <type_traits>
 
@@ -93,39 +94,36 @@ enum
 	BUTTON_CONTEXT = 1,
 };
 
-void CEditor::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser)
+void CEditor::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Result, size_t Channels, void *pUser)
 {
 	CEditor *pThis = (CEditor *)pUser;
 	if(Env < 0 || Env >= (int)pThis->m_Map.m_vpEnvelopes.size())
-	{
-		Channels = ColorRGBA();
 		return;
-	}
 
 	std::shared_ptr<CEnvelope> pEnv = pThis->m_Map.m_vpEnvelopes[Env];
-	float t = pThis->m_AnimateTime;
-	t *= pThis->m_AnimateSpeed;
-	t += (TimeOffsetMillis / 1000.0f);
-	pEnv->Eval(t, Channels);
+	float Time = pThis->m_AnimateTime;
+	Time *= pThis->m_AnimateSpeed;
+	Time += (TimeOffsetMillis / 1000.0f);
+	pEnv->Eval(Time, Result, Channels);
 }
 
 /********************************************************
  OTHER
 *********************************************************/
 
-bool CEditor::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip)
+bool CEditor::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip, const std::vector<STextColorSplit> &vColorSplits)
 {
 	UpdateTooltip(pLineInput, pRect, pToolTip);
-	return UI()->DoEditBox(pLineInput, pRect, FontSize, Corners);
+	return Ui()->DoEditBox(pLineInput, pRect, FontSize, Corners, vColorSplits);
 }
 
-bool CEditor::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip)
+bool CEditor::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip, const std::vector<STextColorSplit> &vColorSplits)
 {
 	UpdateTooltip(pLineInput, pRect, pToolTip);
-	return UI()->DoClearableEditBox(pLineInput, pRect, FontSize, Corners);
+	return Ui()->DoClearableEditBox(pLineInput, pRect, FontSize, Corners, vColorSplits);
 }
 
-ColorRGBA CEditor::GetButtonColor(const void *pID, int Checked)
+ColorRGBA CEditor::GetButtonColor(const void *pId, int Checked)
 {
 	if(Checked < 0)
 		return ColorRGBA(0, 0, 0, 0.5f);
@@ -135,113 +133,92 @@ ColorRGBA CEditor::GetButtonColor(const void *pID, int Checked)
 	case 8: // invisible
 		return ColorRGBA(0, 0, 0, 0);
 	case 7: // selected + game layers
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 0, 0, 0.4f);
 		return ColorRGBA(1, 0, 0, 0.2f);
 
 	case 6: // game layers
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 1, 1, 0.4f);
 		return ColorRGBA(1, 1, 1, 0.2f);
 
 	case 5: // selected + image/sound should be embedded
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 0, 0, 0.75f);
 		return ColorRGBA(1, 0, 0, 0.5f);
 
 	case 4: // image/sound should be embedded
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 0, 0, 1.0f);
 		return ColorRGBA(1, 0, 0, 0.875f);
 
 	case 3: // selected + unused image/sound
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 0, 1, 0.75f);
 		return ColorRGBA(1, 0, 1, 0.5f);
 
 	case 2: // unused image/sound
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(0, 0, 1, 0.75f);
 		return ColorRGBA(0, 0, 1, 0.5f);
 
 	case 1: // selected
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 0, 0, 0.75f);
 		return ColorRGBA(1, 0, 0, 0.5f);
 
 	default: // regular
-		if(UI()->HotItem() == pID)
+		if(Ui()->HotItem() == pId)
 			return ColorRGBA(1, 1, 1, 0.75f);
 		return ColorRGBA(1, 1, 1, 0.5f);
 	}
 }
 
-void CEditor::UpdateTooltip(const void *pID, const CUIRect *pRect, const char *pToolTip)
+void CEditor::UpdateTooltip(const void *pId, const CUIRect *pRect, const char *pToolTip)
 {
-	if(UI()->MouseInside(pRect) && !pToolTip)
+	if(Ui()->MouseInside(pRect) && !pToolTip)
 		str_copy(m_aTooltip, "");
-	else if(UI()->HotItem() == pID && pToolTip)
+	else if(Ui()->HotItem() == pId && pToolTip)
 		str_copy(m_aTooltip, pToolTip);
 }
 
-int CEditor::DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+int CEditor::DoButton_Editor_Common(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
 {
-	if(UI()->MouseInside(pRect))
+	if(Ui()->MouseInside(pRect))
 	{
 		if(Flags & BUTTON_CONTEXT)
-			ms_pUiGotContext = pID;
+			ms_pUiGotContext = pId;
 	}
 
-	UpdateTooltip(pID, pRect, pToolTip);
-	return UI()->DoButtonLogic(pID, Checked, pRect);
+	UpdateTooltip(pId, pRect, pToolTip);
+	return Ui()->DoButtonLogic(pId, Checked, pRect);
 }
 
-int CEditor::DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+int CEditor::DoButton_Editor(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
 {
-	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
+	pRect->Draw(GetButtonColor(pId, Checked), IGraphics::CORNER_ALL, 3.0f);
 	CUIRect NewRect = *pRect;
-	UI()->DoLabel(&NewRect, pText, 10.0f, TEXTALIGN_MC);
+	Ui()->DoLabel(&NewRect, pText, 10.0f, TEXTALIGN_MC);
 	Checked %= 2;
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+	return DoButton_Editor_Common(pId, pText, Checked, pRect, Flags, pToolTip);
 }
 
-int CEditor::DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA BaseColor, int Corners)
+int CEditor::DoButton_Env(const void *pId, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA BaseColor, int Corners)
 {
 	float Bright = Checked ? 1.0f : 0.5f;
-	float Alpha = UI()->HotItem() == pID ? 1.0f : 0.75f;
+	float Alpha = Ui()->HotItem() == pId ? 1.0f : 0.75f;
 	ColorRGBA Color = ColorRGBA(BaseColor.r * Bright, BaseColor.g * Bright, BaseColor.b * Bright, Alpha);
 
 	pRect->Draw(Color, Corners, 3.0f);
-	UI()->DoLabel(pRect, pText, 10.0f, TEXTALIGN_MC);
+	Ui()->DoLabel(pRect, pText, 10.0f, TEXTALIGN_MC);
 	Checked %= 2;
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, 0, pToolTip);
-}
-
-int CEditor::DoButton_File(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
-{
-	if(Checked)
-		pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
-
-	CUIRect Rect;
-	pRect->VMargin(5.0f, &Rect);
-	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML);
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+	return DoButton_Editor_Common(pId, pText, Checked, pRect, 0, pToolTip);
 }
 
-int CEditor::DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+int CEditor::DoButton_MenuItem(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
 {
-	pRect->Draw(ColorRGBA(0.5f, 0.5f, 0.5f, 1.0f), IGraphics::CORNER_T, 3.0f);
-
-	CUIRect Rect;
-	pRect->VMargin(5.0f, &Rect);
-	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML);
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
-}
-
-int CEditor::DoButton_MenuItem(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
-{
-	if(UI()->HotItem() == pID || Checked)
-		pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
+	if(Ui()->HotItem() == pId || Checked)
+		pRect->Draw(GetButtonColor(pId, Checked), IGraphics::CORNER_ALL, 3.0f);
 
 	CUIRect Rect;
 	pRect->VMargin(5.0f, &Rect);
@@ -249,56 +226,42 @@ int CEditor::DoButton_MenuItem(const void *pID, const char *pText, int Checked,
 	SLabelProperties Props;
 	Props.m_MaxWidth = Rect.w;
 	Props.m_EllipsisAtEnd = true;
-	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML, Props);
+	Ui()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML, Props);
 
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+	return DoButton_Editor_Common(pId, pText, Checked, pRect, Flags, pToolTip);
 }
 
-int CEditor::DoButton_Ex(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
+int CEditor::DoButton_Ex(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize, int Align)
 {
-	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+	pRect->Draw(GetButtonColor(pId, Checked), Corners, 3.0f);
 
 	CUIRect Rect;
-	pRect->VMargin(pRect->w > 20.0f ? 5.0f : 0.0f, &Rect);
+	pRect->VMargin(((Align & TEXTALIGN_MASK_HORIZONTAL) == TEXTALIGN_CENTER) ? 1.0f : 5.0f, &Rect);
 
 	SLabelProperties Props;
 	Props.m_MaxWidth = Rect.w;
 	Props.m_EllipsisAtEnd = true;
-	UI()->DoLabel(&Rect, pText, FontSize, TEXTALIGN_MC, Props);
+	Ui()->DoLabel(&Rect, pText, FontSize, Align, Props);
 
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+	return DoButton_Editor_Common(pId, pText, Checked, pRect, Flags, pToolTip);
 }
 
-int CEditor::DoButton_FontIcon(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
+int CEditor::DoButton_FontIcon(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
 {
-	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+	pRect->Draw(GetButtonColor(pId, Checked), Corners, 3.0f);
 
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
-	UI()->DoLabel(pRect, pText, FontSize, TEXTALIGN_MC);
+	Ui()->DoLabel(pRect, pText, FontSize, TEXTALIGN_MC);
 	TextRender()->SetRenderFlags(0);
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
-}
-
-int CEditor::DoButton_ButtonInc(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
-{
-	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_R, 3.0f);
-	UI()->DoLabel(pRect, pText ? pText : "+", 10.0f, TEXTALIGN_MC);
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
-}
-
-int CEditor::DoButton_ButtonDec(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
-{
-	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_L, 3.0f);
-	UI()->DoLabel(pRect, pText ? pText : "-", 10.0f, TEXTALIGN_MC);
-	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+	return DoButton_Editor_Common(pId, pText, Checked, pRect, Flags, pToolTip);
 }
 
-int CEditor::DoButton_DraggableEx(const void *pID, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip, int Corners, float FontSize)
+int CEditor::DoButton_DraggableEx(const void *pId, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip, int Corners, float FontSize)
 {
-	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+	pRect->Draw(GetButtonColor(pId, Checked), Corners, 3.0f);
 
 	CUIRect Rect;
 	pRect->VMargin(pRect->w > 20.0f ? 5.0f : 0.0f, &Rect);
@@ -306,19 +269,19 @@ int CEditor::DoButton_DraggableEx(const void *pID, const char *pText, int Checke
 	SLabelProperties Props;
 	Props.m_MaxWidth = Rect.w;
 	Props.m_EllipsisAtEnd = true;
-	UI()->DoLabel(&Rect, pText, FontSize, TEXTALIGN_MC, Props);
+	Ui()->DoLabel(&Rect, pText, FontSize, TEXTALIGN_MC, Props);
 
-	if(UI()->MouseInside(pRect))
+	if(Ui()->MouseInside(pRect))
 	{
 		if(Flags & BUTTON_CONTEXT)
-			ms_pUiGotContext = pID;
+			ms_pUiGotContext = pId;
 	}
 
-	UpdateTooltip(pID, pRect, pToolTip);
-	return UI()->DoDraggableButtonLogic(pID, Checked, pRect, pClicked, pAbrupted);
+	UpdateTooltip(pId, pRect, pToolTip);
+	return Ui()->DoDraggableButtonLogic(pId, Checked, pRect, pClicked, pAbrupted);
 }
 
-void CEditor::RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness)
+void CEditor::RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness) const
 {
 	Graphics()->TextureSet(Texture);
 	Graphics()->BlendNormal();
@@ -330,77 +293,70 @@ void CEditor::RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture,
 	Graphics()->QuadsEnd();
 }
 
-SEditResult<int> CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree, bool IsHex, int Corners, ColorRGBA *pColor, bool ShowValue)
+SEditResult<int> CEditor::UiDoValueSelector(void *pId, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree, bool IsHex, int Corners, const ColorRGBA *pColor, bool ShowValue)
 {
 	// logic
-	static float s_Value;
+	static bool s_DidScroll = false;
+	static float s_ScrollValue = 0.0f;
 	static CLineInputNumber s_NumberInput;
-	static bool s_TextMode = false;
-	static void *s_pLastTextID = pID;
-	const bool Inside = UI()->MouseInside(pRect);
-	const int Base = IsHex ? 16 : 10;
-	static bool s_Editing = false;
-	EEditState State = EEditState::EDITING;
+	static int s_ButtonUsed = -1;
+	static void *s_pLastTextId = nullptr;
 
-	if(UI()->MouseButton(1) && UI()->HotItem() == pID)
-	{
-		s_pLastTextID = pID;
-		s_TextMode = true;
-		UI()->DisableMouseLock();
-		s_NumberInput.SetInteger(Current, Base);
-	}
+	const bool Inside = Ui()->MouseInside(pRect);
+	const int Base = IsHex ? 16 : 10;
 
-	if(UI()->CheckActiveItem(pID))
+	if(Ui()->HotItem() == pId && s_ButtonUsed >= 0 && !Ui()->MouseButton(s_ButtonUsed))
 	{
-		if(!UI()->MouseButton(0))
+		Ui()->DisableMouseLock();
+		if(Ui()->CheckActiveItem(pId))
+		{
+			Ui()->SetActiveItem(nullptr);
+		}
+		if(Inside && ((s_ButtonUsed == 0 && !s_DidScroll && Ui()->DoDoubleClickLogic(pId)) || s_ButtonUsed == 1))
 		{
-			UI()->DisableMouseLock();
-			UI()->SetActiveItem(nullptr);
-			s_TextMode = false;
+			s_pLastTextId = pId;
+			s_NumberInput.SetInteger(Current, Base);
+			s_NumberInput.SelectAll();
 		}
+		s_ButtonUsed = -1;
 	}
 
-	if(s_TextMode && s_pLastTextID == pID)
+	if(s_pLastTextId == pId)
 	{
 		str_copy(m_aTooltip, "Type your number");
+		Ui()->SetActiveItem(&s_NumberInput);
+		DoEditBox(&s_NumberInput, pRect, 10.0f, Corners);
 
-		DoEditBox(&s_NumberInput, pRect, 10.0f);
-
-		UI()->SetActiveItem(&s_NumberInput);
-
-		if(Input()->KeyIsPressed(KEY_RETURN) || Input()->KeyIsPressed(KEY_KP_ENTER) ||
-			((UI()->MouseButton(1) || UI()->MouseButton(0)) && !Inside))
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || ((Ui()->MouseButtonClicked(1) || Ui()->MouseButtonClicked(0)) && !Inside))
 		{
 			Current = clamp(s_NumberInput.GetInteger(Base), Min, Max);
-			UI()->DisableMouseLock();
-			UI()->SetActiveItem(nullptr);
-			s_TextMode = false;
+			Ui()->DisableMouseLock();
+			Ui()->SetActiveItem(nullptr);
+			s_pLastTextId = nullptr;
 		}
 
-		if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
 		{
-			UI()->DisableMouseLock();
-			UI()->SetActiveItem(nullptr);
-			s_TextMode = false;
+			Ui()->DisableMouseLock();
+			Ui()->SetActiveItem(nullptr);
+			s_pLastTextId = nullptr;
 		}
 	}
 	else
 	{
-		if(UI()->CheckActiveItem(pID))
+		if(Ui()->CheckActiveItem(pId))
 		{
-			if(UI()->MouseButton(0))
+			if(s_ButtonUsed == 0 && Ui()->MouseButton(0))
 			{
-				if(Input()->ShiftIsPressed())
-					s_Value += m_MouseDeltaX * 0.05f;
-				else
-					s_Value += m_MouseDeltaX;
+				s_ScrollValue += Ui()->MouseDeltaX() * (Input()->ShiftIsPressed() ? 0.05f : 1.0f);
 
-				if(absolute(s_Value) >= Scale)
+				if(absolute(s_ScrollValue) >= Scale)
 				{
-					int Count = (int)(s_Value / Scale);
-					s_Value = std::fmod(s_Value, Scale);
+					int Count = (int)(s_ScrollValue / Scale);
+					s_ScrollValue = std::fmod(s_ScrollValue, Scale);
 					Current += Step * Count;
 					Current = clamp(Current, Min, Max);
+					s_DidScroll = true;
 
 					// Constrain to discrete steps
 					if(Count > 0)
@@ -409,24 +365,30 @@ SEditResult<int> CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const cha
 						Current = std::ceil(Current / (float)Step) * Step;
 				}
 			}
-			if(pToolTip && !s_TextMode)
+
+			if(pToolTip && s_pLastTextId != pId)
 				str_copy(m_aTooltip, pToolTip);
 		}
-		else if(UI()->HotItem() == pID)
+		else if(Ui()->HotItem() == pId)
 		{
-			if(UI()->MouseButton(0))
+			if(Ui()->MouseButton(0))
 			{
-				UI()->SetActiveItem(pID);
-				UI()->EnableMouseLock(pID);
-				s_Value = 0;
+				s_ButtonUsed = 0;
+				s_DidScroll = false;
+				s_ScrollValue = 0.0f;
+				Ui()->SetActiveItem(pId);
+				Ui()->EnableMouseLock(pId);
 			}
-			if(pToolTip && !s_TextMode)
+			else if(Ui()->MouseButton(1))
+			{
+				s_ButtonUsed = 1;
+				Ui()->SetActiveItem(pId);
+			}
+
+			if(pToolTip && s_pLastTextId != pId)
 				str_copy(m_aTooltip, pToolTip);
 		}
 
-		if(Inside)
-			UI()->SetHotItem(pID);
-
 		// render
 		char aBuf[128];
 		if(pLabel[0] != '\0')
@@ -441,25 +403,29 @@ SEditResult<int> CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const cha
 		else if(IsHex)
 			str_format(aBuf, sizeof(aBuf), "#%06X", Current);
 		else
-			str_from_int(Current, aBuf);
-		pRect->Draw(pColor ? *pColor : GetButtonColor(pID, 0), Corners, 3.0f);
-		UI()->DoLabel(pRect, aBuf, 10, TEXTALIGN_MC);
+			str_format(aBuf, sizeof(aBuf), "%d", Current);
+		pRect->Draw(pColor ? *pColor : GetButtonColor(pId, 0), Corners, 3.0f);
+		Ui()->DoLabel(pRect, aBuf, 10, TEXTALIGN_MC);
 	}
 
-	if(!s_TextMode)
-		s_NumberInput.Clear();
+	if(Inside && !Ui()->MouseButton(0) && !Ui()->MouseButton(1))
+		Ui()->SetHotItem(pId);
 
-	bool MouseLocked = UI()->CheckMouseLock();
-	if((MouseLocked || s_TextMode) && !s_Editing)
+	static const void *s_pEditing = nullptr;
+	EEditState State = EEditState::NONE;
+	if(s_pEditing == pId)
+	{
+		State = EEditState::EDITING;
+	}
+	if(((Ui()->CheckActiveItem(pId) && Ui()->CheckMouseLock()) || s_pLastTextId == pId) && s_pEditing != pId)
 	{
 		State = EEditState::START;
-		s_Editing = true;
+		s_pEditing = pId;
 	}
-
-	if(!MouseLocked && !s_TextMode && s_Editing)
+	if(!Ui()->CheckMouseLock() && s_pLastTextId != pId && s_pEditing == pId)
 	{
 		State = EEditState::END;
-		s_Editing = false;
+		s_pEditing = nullptr;
 	}
 
 	return SEditResult<int>{State, Current};
@@ -772,13 +738,62 @@ std::pair<int, int> CEditor::EnvGetSelectedTimeAndValue() const
 	return std::pair<int, int>{CurrentTime, CurrentValue};
 }
 
+void CEditor::SelectNextLayer()
+{
+	int CurrentLayer = 0;
+	for(const auto &Selected : m_vSelectedLayers)
+		CurrentLayer = maximum(Selected, CurrentLayer);
+	SelectLayer(CurrentLayer);
+
+	if(m_vSelectedLayers[0] < (int)m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1)
+	{
+		SelectLayer(m_vSelectedLayers[0] + 1);
+	}
+	else
+	{
+		for(size_t Group = m_SelectedGroup + 1; Group < m_Map.m_vpGroups.size(); Group++)
+		{
+			if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
+			{
+				SelectLayer(0, Group);
+				break;
+			}
+		}
+	}
+}
+
+void CEditor::SelectPreviousLayer()
+{
+	int CurrentLayer = std::numeric_limits<int>::max();
+	for(const auto &Selected : m_vSelectedLayers)
+		CurrentLayer = minimum(Selected, CurrentLayer);
+	SelectLayer(CurrentLayer);
+
+	if(m_vSelectedLayers[0] > 0)
+	{
+		SelectLayer(m_vSelectedLayers[0] - 1);
+	}
+	else
+	{
+		for(int Group = m_SelectedGroup - 1; Group >= 0; Group--)
+		{
+			if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
+			{
+				SelectLayer(m_Map.m_vpGroups[Group]->m_vpLayers.size() - 1, Group);
+				break;
+			}
+		}
+	}
+}
+
 bool CEditor::CallbackOpenMap(const char *pFileName, int StorageType, void *pUser)
 {
 	CEditor *pEditor = (CEditor *)pUser;
 	if(pEditor->Load(pFileName, StorageType))
 	{
 		pEditor->m_ValidSaveFilename = StorageType == IStorage::TYPE_SAVE && (pEditor->m_pFileDialogPath == pEditor->m_aFileDialogCurrentFolder || (pEditor->m_pFileDialogPath == pEditor->m_aFileDialogCurrentLink && str_comp(pEditor->m_aFileDialogCurrentLink, "themes") == 0));
-		pEditor->m_Dialog = DIALOG_NONE;
+		if(pEditor->m_Dialog == DIALOG_FILE)
+			pEditor->m_Dialog = DIALOG_NONE;
 		return true;
 	}
 	else
@@ -883,41 +898,14 @@ bool CEditor::CallbackSaveImage(const char *pFileName, int StorageType, void *pU
 
 	std::shared_ptr<CEditorImage> pImg = pEditor->m_Map.m_vpImages[pEditor->m_SelectedImage];
 
-	EImageFormat OutputFormat;
-	switch(pImg->m_Format)
-	{
-	case CImageInfo::FORMAT_RGB:
-		OutputFormat = IMAGE_FORMAT_RGB;
-		break;
-	case CImageInfo::FORMAT_RGBA:
-		OutputFormat = IMAGE_FORMAT_RGBA;
-		break;
-	case CImageInfo::FORMAT_SINGLE_COMPONENT:
-		OutputFormat = IMAGE_FORMAT_R;
-		break;
-	default:
-		dbg_assert(false, "Image has invalid format.");
-		return false;
-	};
-
-	TImageByteBuffer ByteBuffer;
-	SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-	if(SavePNG(OutputFormat, static_cast<const uint8_t *>(pImg->m_pData), ImageByteBuffer, pImg->m_Width, pImg->m_Height))
+	if(CImageLoader::SavePng(pEditor->Storage()->OpenFile(pFileName, IOFLAG_WRITE, StorageType), pFileName, *pImg))
 	{
-		IOHANDLE File = pEditor->Storage()->OpenFile(pFileName, IOFLAG_WRITE, StorageType);
-		if(File)
-		{
-			io_write(File, &ByteBuffer.front(), ByteBuffer.size());
-			io_close(File);
-			pEditor->m_Dialog = DIALOG_NONE;
-			return true;
-		}
-		pEditor->ShowFileDialogError("Failed to open file '%s'.", pFileName);
-		return false;
+		pEditor->m_Dialog = DIALOG_NONE;
+		return true;
 	}
 	else
 	{
-		pEditor->ShowFileDialogError("Failed to write image to file.");
+		pEditor->ShowFileDialogError("Failed to write image to file '%s'.", pFileName);
 		return false;
 	}
 }
@@ -950,25 +938,56 @@ bool CEditor::CallbackSaveSound(const char *pFileName, int StorageType, void *pU
 	return false;
 }
 
-void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const void *pStopButtonID, const void *pSeekBarID, const int SampleID)
+bool CEditor::CallbackCustomEntities(const char *pFileName, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+
+	char aBuf[IO_MAX_PATH_LENGTH];
+	IStorage::StripPathAndExtension(pFileName, aBuf, sizeof(aBuf));
+
+	if(std::find(pEditor->m_vSelectEntitiesFiles.begin(), pEditor->m_vSelectEntitiesFiles.end(), std::string(aBuf)) != pEditor->m_vSelectEntitiesFiles.end())
+	{
+		pEditor->ShowFileDialogError("Custom entities cannot have the same name as default entities.");
+		return false;
+	}
+
+	CImageInfo ImgInfo;
+	if(!pEditor->Graphics()->LoadPng(ImgInfo, pFileName, StorageType))
+	{
+		pEditor->ShowFileDialogError("Failed to load image from file '%s'.", pFileName);
+		return false;
+	}
+
+	pEditor->m_SelectEntitiesImage = aBuf;
+	pEditor->m_AllowPlaceUnusedTiles = -1;
+	pEditor->m_PreventUnusedTilesWasWarned = false;
+
+	pEditor->Graphics()->UnloadTexture(&pEditor->m_EntitiesTexture);
+	pEditor->m_EntitiesTexture = pEditor->Graphics()->LoadTextureRawMove(ImgInfo, pEditor->GetTextureUsageFlag());
+
+	pEditor->m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, int SampleId)
 {
 	CUIRect Button, SeekBar;
 	// play/pause button
 	{
 		View.VSplitLeft(View.h, &Button, &View);
-		if(DoButton_FontIcon(pPlayPauseButtonID, Sound()->IsPlaying(SampleID) ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 0, &Button, 0, "Play/pause audio preview", IGraphics::CORNER_ALL) ||
+		if(DoButton_FontIcon(pPlayPauseButtonId, Sound()->IsPlaying(SampleId) ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 0, &Button, 0, "Play/pause audio preview", IGraphics::CORNER_ALL) ||
 			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_SPACE)))
 		{
-			if(Sound()->IsPlaying(SampleID))
+			if(Sound()->IsPlaying(SampleId))
 			{
-				Sound()->Pause(SampleID);
+				Sound()->Pause(SampleId);
 			}
 			else
 			{
-				if(SampleID != m_ToolbarPreviewSound && m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+				if(SampleId != m_ToolbarPreviewSound && m_ToolbarPreviewSound >= 0 && Sound()->IsPlaying(m_ToolbarPreviewSound))
 					Sound()->Pause(m_ToolbarPreviewSound);
 
-				Sound()->Play(CSounds::CHN_GUI, SampleID, ISound::FLAG_PREVIEW);
+				Sound()->Play(CSounds::CHN_GUI, SampleId, ISound::FLAG_PREVIEW, 1.0f);
 			}
 		}
 	}
@@ -976,9 +995,9 @@ void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const
 	{
 		View.VSplitLeft(2.0f, nullptr, &View);
 		View.VSplitLeft(View.h, &Button, &View);
-		if(DoButton_FontIcon(pStopButtonID, FONT_ICON_STOP, 0, &Button, 0, "Stop audio preview", IGraphics::CORNER_ALL))
+		if(DoButton_FontIcon(pStopButtonId, FONT_ICON_STOP, 0, &Button, 0, "Stop audio preview", IGraphics::CORNER_ALL))
 		{
-			Sound()->Stop(SampleID);
+			Sound()->Stop(SampleId);
 		}
 	}
 	// do seekbar
@@ -991,8 +1010,8 @@ void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const
 		const float Rounding = 5.0f;
 
 		char aBuffer[64];
-		const float CurrentTime = Sound()->GetSampleCurrentTime(SampleID);
-		const float TotalTime = Sound()->GetSampleTotalTime(SampleID);
+		const float CurrentTime = Sound()->GetSampleCurrentTime(SampleId);
+		const float TotalTime = Sound()->GetSampleTotalTime(SampleId);
 
 		// draw seek bar
 		SeekBar.Draw(ColorRGBA(0, 0, 0, 0.5f), IGraphics::CORNER_ALL, Rounding);
@@ -1009,31 +1028,31 @@ void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const
 		char aTotalTime[32];
 		str_time_float(TotalTime, TIME_HOURS, aTotalTime, sizeof(aTotalTime));
 		str_format(aBuffer, sizeof(aBuffer), "%s / %s", aCurrentTime, aTotalTime);
-		UI()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
+		Ui()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
 
 		// do the logic
-		const bool Inside = UI()->MouseInside(&SeekBar);
+		const bool Inside = Ui()->MouseInside(&SeekBar);
 
-		if(UI()->CheckActiveItem(pSeekBarID))
+		if(Ui()->CheckActiveItem(pSeekBarId))
 		{
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 			else
 			{
-				const float AmountSeek = clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
-				Sound()->SetSampleCurrentTime(SampleID, AmountSeek);
+				const float AmountSeek = clamp((Ui()->MouseX() - SeekBar.x - Rounding) / (SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
+				Sound()->SetSampleCurrentTime(SampleId, AmountSeek);
 			}
 		}
-		else if(UI()->HotItem() == pSeekBarID)
+		else if(Ui()->HotItem() == pSeekBarId)
 		{
-			if(UI()->MouseButton(0))
-				UI()->SetActiveItem(pSeekBarID);
+			if(Ui()->MouseButton(0))
+				Ui()->SetActiveItem(pSeekBarId);
 		}
 
-		if(Inside)
-			UI()->SetHotItem(pSeekBarID);
+		if(Inside && !Ui()->MouseButton(0))
+			Ui()->SetHotItem(pSeekBarId);
 	}
 }
 
@@ -1084,24 +1103,32 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
 
 		// animation button
-		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
-		static int s_AnimateButton = 0;
-		if(DoButton_Editor(&s_AnimateButton, "Anim", m_Animate, &Button, 0, "[ctrl+m] Toggle animation") ||
+		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+		static char s_AnimateButton;
+		if(DoButton_FontIcon(&s_AnimateButton, FONT_ICON_CIRCLE_PLAY, m_Animate, &Button, 0, "[ctrl+m] Toggle animation", IGraphics::CORNER_L) ||
 			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_M) && ModPressed))
 		{
 			m_AnimateStart = time_get();
 			m_Animate = !m_Animate;
 		}
 
+		// animation settings button
+		TB_Top.VSplitLeft(14.0f, &Button, &TB_Top);
+		static char s_AnimateSettingsButton;
+		if(DoButton_FontIcon(&s_AnimateSettingsButton, FONT_ICON_CIRCLE_CHEVRON_DOWN, 0, &Button, 0, "Change animation settings.", IGraphics::CORNER_R, 8.0f))
+		{
+			m_AnimateUpdatePopup = true;
+			static SPopupMenuId s_PopupAnimateSettingsId;
+			Ui()->DoPopupMenu(&s_PopupAnimateSettingsId, Button.x, Button.y + Button.h, 150.0f, 37.0f, this, PopupAnimateSettings);
+		}
+
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
 
 		// proof button
 		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
-		static int s_ProofButton = 0;
-		if(DoButton_Ex(&s_ProofButton, "Proof", MapView()->ProofMode()->IsEnabled(), &Button, 0, "[ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.", IGraphics::CORNER_L) ||
-			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_P) && ModPressed))
+		if(DoButton_Ex(&m_QuickActionProof, m_QuickActionProof.Label(), m_QuickActionProof.Active(), &Button, 0, m_QuickActionProof.Description(), IGraphics::CORNER_L))
 		{
-			MapView()->ProofMode()->Toggle();
+			m_QuickActionProof.Call();
 		}
 
 		TB_Top.VSplitLeft(14.0f, &Button, &TB_Top);
@@ -1109,7 +1136,7 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 		if(DoButton_FontIcon(&s_ProofModeButton, FONT_ICON_CIRCLE_CHEVRON_DOWN, 0, &Button, 0, "Select proof mode.", IGraphics::CORNER_R, 8.0f))
 		{
 			static SPopupMenuId s_PopupProofModeId;
-			UI()->DoPopupMenu(&s_PopupProofModeId, Button.x, Button.y + Button.h, 60.0f, 36.0f, this, PopupProofMode);
+			Ui()->DoPopupMenu(&s_PopupProofModeId, Button.x, Button.y + Button.h, 60.0f, 36.0f, this, PopupProofMode);
 		}
 
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
@@ -1125,12 +1152,20 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
 
 		// grid button
-		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
 		static int s_GridButton = 0;
-		if(DoButton_Editor(&s_GridButton, "Grid", MapView()->MapGrid()->IsEnabled(), &Button, 0, "[ctrl+g] Toggle Grid") ||
+		if(DoButton_FontIcon(&s_GridButton, FONT_ICON_BORDER_ALL, m_QuickActionToggleGrid.Active(), &Button, 0, m_QuickActionToggleGrid.Description(), IGraphics::CORNER_L) ||
 			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_G) && ModPressed && !ShiftPressed))
 		{
-			MapView()->MapGrid()->Toggle();
+			m_QuickActionToggleGrid.Call();
+		}
+
+		// grid settings button
+		TB_Top.VSplitLeft(14.0f, &Button, &TB_Top);
+		static char s_GridSettingsButton;
+		if(DoButton_FontIcon(&s_GridSettingsButton, FONT_ICON_CIRCLE_CHEVRON_DOWN, 0, &Button, 0, "Change grid settings.", IGraphics::CORNER_R, 8.0f))
+		{
+			MapView()->MapGrid()->DoSettingsPopup(vec2(Button.x, Button.y + Button.h));
 		}
 
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
@@ -1138,23 +1173,23 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 		// zoom group
 		TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
 		static int s_ZoomOutButton = 0;
-		if(DoButton_FontIcon(&s_ZoomOutButton, "-", 0, &Button, 0, "[NumPad-] Zoom out", IGraphics::CORNER_L))
+		if(DoButton_FontIcon(&s_ZoomOutButton, FONT_ICON_MINUS, 0, &Button, 0, m_QuickActionZoomOut.Description(), IGraphics::CORNER_L))
 		{
-			MapView()->Zoom()->ChangeValue(50.0f);
+			m_QuickActionZoomOut.Call();
 		}
 
 		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
 		static int s_ZoomNormalButton = 0;
-		if(DoButton_FontIcon(&s_ZoomNormalButton, FONT_ICON_MAGNIFYING_GLASS, 0, &Button, 0, "[NumPad*] Zoom to normal and remove editor offset", IGraphics::CORNER_NONE))
+		if(DoButton_FontIcon(&s_ZoomNormalButton, FONT_ICON_MAGNIFYING_GLASS, 0, &Button, 0, m_QuickActionResetZoom.Description(), IGraphics::CORNER_NONE))
 		{
-			MapView()->ResetZoom();
+			m_QuickActionResetZoom.Call();
 		}
 
 		TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
 		static int s_ZoomInButton = 0;
-		if(DoButton_FontIcon(&s_ZoomInButton, "+", 0, &Button, 0, "[NumPad+] Zoom in", IGraphics::CORNER_R))
+		if(DoButton_FontIcon(&s_ZoomInButton, FONT_ICON_PLUS, 0, &Button, 0, m_QuickActionZoomIn.Description(), IGraphics::CORNER_R))
 		{
-			MapView()->Zoom()->ChangeValue(-50.0f);
+			m_QuickActionZoomIn.Call();
 		}
 
 		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
@@ -1229,56 +1264,38 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 				for(auto &pLayer : m_pBrush->m_vpLayers)
 					pLayer->BrushRotate(s_RotationAmount / 360.0f * pi * 2);
 			}
-
-			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
 		}
 
-		// animation speed
-		if(m_Animate)
+		// Color pipette and palette
 		{
-			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
-			static int s_AnimSlowerButton = 0;
-			if(DoButton_FontIcon(&s_AnimSlowerButton, "-", 0, &Button, 0, "Decrease animation speed", IGraphics::CORNER_L))
-			{
-				if(m_AnimateSpeed > 0.5f)
-					m_AnimateSpeed -= 0.5f;
-			}
-
-			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
-			static int s_AnimNormalButton = 0;
-			if(DoButton_FontIcon(&s_AnimNormalButton, FONT_ICON_CIRCLE_PLAY, 0, &Button, 0, "Normal animation speed", 0))
-				m_AnimateSpeed = 1.0f;
+			const float PipetteButtonWidth = 30.0f;
+			const float ColorPickerButtonWidth = 20.0f;
+			const float Spacing = 2.0f;
+			const size_t NumColorsShown = clamp<int>(round_to_int((TB_Top.w - PipetteButtonWidth - 40.0f) / (ColorPickerButtonWidth + Spacing)), 1, std::size(m_aSavedColors));
 
-			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
-			static int s_AnimFasterButton = 0;
-			if(DoButton_FontIcon(&s_AnimFasterButton, "+", 0, &Button, 0, "Increase animation speed", IGraphics::CORNER_R))
-				m_AnimateSpeed += 0.5f;
+			CUIRect ColorPalette;
+			TB_Top.VSplitRight(NumColorsShown * (ColorPickerButtonWidth + Spacing) + PipetteButtonWidth, &TB_Top, &ColorPalette);
 
-			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
-		}
-
-		// grid zoom
-		if(MapView()->MapGrid()->IsEnabled())
-		{
-			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
-			static int s_GridIncreaseButton = 0;
-			if(DoButton_FontIcon(&s_GridIncreaseButton, "-", 0, &Button, 0, "Decrease grid", IGraphics::CORNER_L))
+			// Pipette button
+			static char s_PipetteButton;
+			ColorPalette.VSplitLeft(PipetteButtonWidth, &Button, &ColorPalette);
+			ColorPalette.VSplitLeft(Spacing, nullptr, &ColorPalette);
+			if(DoButton_FontIcon(&s_PipetteButton, FONT_ICON_EYE_DROPPER, m_QuickActionPipette.Active(), &Button, 0, m_QuickActionPipette.Description(), IGraphics::CORNER_ALL) ||
+				(CLineInput::GetActiveInput() == nullptr && ModPressed && ShiftPressed && Input()->KeyPress(KEY_C)))
 			{
-				MapView()->MapGrid()->DecreaseFactor();
+				m_QuickActionPipette.Call();
 			}
 
-			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
-			static int s_GridNormalButton = 0;
-			if(DoButton_FontIcon(&s_GridNormalButton, FONT_ICON_BORDER_ALL, 0, &Button, 0, "Normal grid", IGraphics::CORNER_NONE))
-				MapView()->MapGrid()->ResetFactor();
-
-			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
-			static int s_GridDecreaseButton = 0;
-			if(DoButton_FontIcon(&s_GridDecreaseButton, "+", 0, &Button, 0, "Increase grid", IGraphics::CORNER_R))
+			// Palette color pickers
+			for(size_t i = 0; i < NumColorsShown; ++i)
 			{
-				MapView()->MapGrid()->IncreaseFactor();
+				ColorPalette.VSplitLeft(ColorPickerButtonWidth, &Button, &ColorPalette);
+				ColorPalette.VSplitLeft(Spacing, nullptr, &ColorPalette);
+				const auto &&SetColor = [&](ColorRGBA NewColor) {
+					m_aSavedColors[i] = NewColor;
+				};
+				DoColorPickerButton(&m_aSavedColors[i], &Button, m_aSavedColors[i], SetColor);
 			}
-			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
 		}
 	}
 
@@ -1286,11 +1303,10 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 	{
 		// refocus button
 		{
-			TB_Bottom.VSplitLeft(45.0f, &Button, &TB_Bottom);
-			static int s_RefocusButton = 0;
+			TB_Bottom.VSplitLeft(50.0f, &Button, &TB_Bottom);
 			int FocusButtonChecked = MapView()->IsFocused() ? -1 : 1;
-			if(DoButton_Editor(&s_RefocusButton, "Refocus", FocusButtonChecked, &Button, 0, "[HOME] Restore map focus") || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_HOME)))
-				MapView()->Focus();
+			if(DoButton_Editor(&m_QuickActionRefocus, m_QuickActionRefocus.Label(), FocusButtonChecked, &Button, 0, m_QuickActionRefocus.Description()) || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_HOME)))
+				m_QuickActionRefocus.Call();
 			TB_Bottom.VSplitLeft(5.0f, nullptr, &TB_Bottom);
 		}
 
@@ -1302,13 +1318,13 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 				if(pS)
 				{
 					const char *pButtonName = nullptr;
-					CUI::FPopupMenuFunction pfnPopupFunc = nullptr;
+					CUi::FPopupMenuFunction pfnPopupFunc = nullptr;
 					int Rows = 0;
 					if(pS == m_Map.m_pSwitchLayer)
 					{
 						pButtonName = "Switch";
 						pfnPopupFunc = PopupSwitch;
-						Rows = 2;
+						Rows = 3;
 					}
 					else if(pS == m_Map.m_pSpeedupLayer)
 					{
@@ -1326,7 +1342,7 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 					{
 						pButtonName = "Tele";
 						pfnPopupFunc = PopupTele;
-						Rows = 1;
+						Rows = 3;
 					}
 
 					if(pButtonName != nullptr)
@@ -1339,9 +1355,9 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 						if(DoButton_Ex(&s_ModifierButton, pButtonName, 0, &Button, 0, s_aButtonTooltip, IGraphics::CORNER_ALL) || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && ModPressed && Input()->KeyPress(KEY_T)))
 						{
 							static SPopupMenuId s_PopupModifierId;
-							if(!UI()->IsPopupOpen(&s_PopupModifierId))
+							if(!Ui()->IsPopupOpen(&s_PopupModifierId))
 							{
-								UI()->DoPopupMenu(&s_PopupModifierId, Button.x, Button.y + Button.h, 120, 10.0f + Rows * 13.0f, this, pfnPopupFunc);
+								Ui()->DoPopupMenu(&s_PopupModifierId, Button.x, Button.y + Button.h, 120, 10.0f + Rows * 13.0f, this, pfnPopupFunc);
 							}
 						}
 						TB_Bottom.VSplitLeft(5.0f, nullptr, &TB_Bottom);
@@ -1356,39 +1372,23 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
 		{
 			TB_Bottom.VSplitLeft(60.0f, &Button, &TB_Bottom);
 
-			bool Invoked = false;
-			static int s_AddItemButton = 0;
-
 			if(pLayer->m_Type == LAYERTYPE_QUADS)
 			{
-				Invoked = DoButton_Editor(&s_AddItemButton, "Add Quad", 0, &Button, 0, "[ctrl+q] Add a new quad") ||
-					  (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed);
+				if(DoButton_Editor(&m_QuickActionAddQuad, m_QuickActionAddQuad.Label(), 0, &Button, 0, m_QuickActionAddQuad.Description()) ||
+					(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed))
+				{
+					m_QuickActionAddQuad.Call();
+				}
 			}
 			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
 			{
-				Invoked = DoButton_Editor(&s_AddItemButton, "Add Sound", 0, &Button, 0, "[ctrl+q] Add a new sound source") ||
-					  (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed);
-			}
-
-			if(Invoked)
-			{
-				std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
-
-				float aMapping[4];
-				pGroup->Mapping(aMapping);
-				int x = aMapping[0] + (aMapping[2] - aMapping[0]) / 2;
-				int y = aMapping[1] + (aMapping[3] - aMapping[1]) / 2;
-				if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed)
+				if(DoButton_Editor(&m_QuickActionAddSound, m_QuickActionAddSound.Label(), 0, &Button, 0, m_QuickActionAddSound.Description()) ||
+					(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed))
 				{
-					x += UI()->MouseWorldX() - (MapView()->GetWorldOffset().x * pGroup->m_ParallaxX / 100) - pGroup->m_OffsetX;
-					y += UI()->MouseWorldY() - (MapView()->GetWorldOffset().y * pGroup->m_ParallaxY / 100) - pGroup->m_OffsetY;
+					m_QuickActionAddSound.Call();
 				}
-
-				if(pLayer->m_Type == LAYERTYPE_QUADS)
-					m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptyQuad>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
-				else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
-					m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptySound>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
 			}
+
 			TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
 		}
 
@@ -1412,15 +1412,20 @@ void CEditor::DoToolbarSounds(CUIRect ToolBar)
 	if(m_SelectedSound >= 0 && (size_t)m_SelectedSound < m_Map.m_vpSounds.size())
 	{
 		const std::shared_ptr<CEditorSound> pSelectedSound = m_Map.m_vpSounds[m_SelectedSound];
-		if(pSelectedSound->m_SoundID != m_ToolbarPreviewSound && m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+		if(pSelectedSound->m_SoundId != m_ToolbarPreviewSound && m_ToolbarPreviewSound >= 0 && Sound()->IsPlaying(m_ToolbarPreviewSound))
 			Sound()->Stop(m_ToolbarPreviewSound);
-		m_ToolbarPreviewSound = pSelectedSound->m_SoundID;
+		m_ToolbarPreviewSound = pSelectedSound->m_SoundId;
+	}
+	else
+	{
+		m_ToolbarPreviewSound = -1;
+	}
 
+	if(m_ToolbarPreviewSound >= 0)
+	{
 		static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0;
 		DoAudioPreview(ToolBarBottom, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_ToolbarPreviewSound);
 	}
-	else
-		m_ToolbarPreviewSound = -1;
 }
 
 static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)
@@ -1431,37 +1436,42 @@ static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)
 	pPoint->y = (int)(x * std::sin(Rotation) + y * std::cos(Rotation) + pCenter->y);
 }
 
-void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
+void CEditor::DoSoundSource(int LayerIndex, CSoundSource *pSource, int Index)
 {
-	enum
-	{
-		OP_NONE = 0,
-		OP_MOVE,
-		OP_CONTEXT_MENU,
-	};
+	void *pId = &pSource->m_Position;
 
-	void *pID = &pSource->m_Position;
+	static ESoundSourceOp s_Operation = ESoundSourceOp::OP_NONE;
 
-	static int s_Operation = OP_NONE;
-
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
 
 	float CenterX = fx2f(pSource->m_Position.x);
 	float CenterY = fx2f(pSource->m_Position.y);
 
-	float dx = (CenterX - wx) / m_MouseWScale;
-	float dy = (CenterY - wy) / m_MouseWScale;
+	float dx = (CenterX - wx) / m_MouseWorldScale;
+	float dy = (CenterY - wy) / m_MouseWorldScale;
 	if(dx * dx + dy * dy < 50)
-		UI()->SetHotItem(pID);
+		Ui()->SetHotItem(pId);
 
 	const bool IgnoreGrid = Input()->AltIsPressed();
+	static CSoundSourceOperationTracker s_Tracker(this);
+
+	if(s_Operation == ESoundSourceOp::OP_NONE)
+	{
+		if(!Ui()->MouseButton(0))
+			s_Tracker.End();
+	}
 
-	if(UI()->CheckActiveItem(pID))
+	if(Ui()->CheckActiveItem(pId))
 	{
-		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		if(s_Operation != ESoundSourceOp::OP_NONE)
+		{
+			s_Tracker.Begin(pSource, s_Operation, LayerIndex);
+		}
+
+		if(m_MouseDeltaWorld != vec2(0.0f, 0.0f))
 		{
-			if(s_Operation == OP_MOVE)
+			if(s_Operation == ESoundSourceOp::OP_MOVE)
 			{
 				float x = wx;
 				float y = wy;
@@ -1472,52 +1482,52 @@ void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
 			}
 		}
 
-		if(s_Operation == OP_CONTEXT_MENU)
+		if(s_Operation == ESoundSourceOp::OP_CONTEXT_MENU)
 		{
-			if(!UI()->MouseButton(1))
+			if(!Ui()->MouseButton(1))
 			{
 				if(m_vSelectedLayers.size() == 1)
 				{
 					static SPopupMenuId s_PopupSourceId;
-					UI()->DoPopupMenu(&s_PopupSourceId, UI()->MouseX(), UI()->MouseY(), 120, 200, this, PopupSource);
-					UI()->DisableMouseLock();
+					Ui()->DoPopupMenu(&s_PopupSourceId, Ui()->MouseX(), Ui()->MouseY(), 120, 200, this, PopupSource);
+					Ui()->DisableMouseLock();
 				}
-				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				s_Operation = ESoundSourceOp::OP_NONE;
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 		else
 		{
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
-				UI()->DisableMouseLock();
-				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->DisableMouseLock();
+				s_Operation = ESoundSourceOp::OP_NONE;
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 
 		Graphics()->SetColor(1, 1, 1, 1);
 	}
-	else if(UI()->HotItem() == pID)
+	else if(Ui()->HotItem() == pId)
 	{
-		ms_pUiGotContext = pID;
+		ms_pUiGotContext = pId;
 
 		Graphics()->SetColor(1, 1, 1, 1);
 		str_copy(m_aTooltip, "Left mouse button to move. Hold alt to ignore grid.");
 
-		if(UI()->MouseButton(0))
+		if(Ui()->MouseButton(0))
 		{
-			s_Operation = OP_MOVE;
+			s_Operation = ESoundSourceOp::OP_MOVE;
 
-			UI()->SetActiveItem(pID);
+			Ui()->SetActiveItem(pId);
 			m_SelectedSource = Index;
 		}
 
-		if(UI()->MouseButton(1))
+		if(Ui()->MouseButton(1))
 		{
 			m_SelectedSource = Index;
-			s_Operation = OP_CONTEXT_MENU;
-			UI()->SetActiveItem(pID);
+			s_Operation = ESoundSourceOp::OP_CONTEXT_MENU;
+			Ui()->SetActiveItem(pId);
 		}
 	}
 	else
@@ -1525,7 +1535,7 @@ void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
 		Graphics()->SetColor(0, 1, 0, 1);
 	}
 
-	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
@@ -1540,7 +1550,7 @@ void CEditor::DoPointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 	pQuad->m_aPoints[PointIndex].y = m_QuadDragOriginalPoints[QuadIndex][PointIndex].y + OffsetY;
 }
 
-CEditor::EAxis CEditor::GetDragAxis(int OffsetX, int OffsetY)
+CEditor::EAxis CEditor::GetDragAxis(int OffsetX, int OffsetY) const
 {
 	if(Input()->ShiftIsPressed())
 		if(absolute(OffsetX) < absolute(OffsetY))
@@ -1551,7 +1561,7 @@ CEditor::EAxis CEditor::GetDragAxis(int OffsetX, int OffsetY)
 		return EAxis::AXIS_NONE;
 }
 
-void CEditor::DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point)
+void CEditor::DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point) const
 {
 	if(Axis == EAxis::AXIS_NONE)
 		return;
@@ -1559,17 +1569,17 @@ void CEditor::DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point)
 	Graphics()->SetColor(1, 0, 0.1f, 1);
 	if(Axis == EAxis::AXIS_X)
 	{
-		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x + Point.x) / 2.0f, fx2f(OriginalPoint.y), fx2f(Point.x - OriginalPoint.x), 1.0f * m_MouseWScale);
+		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x + Point.x) / 2.0f, fx2f(OriginalPoint.y), fx2f(Point.x - OriginalPoint.x), 1.0f * m_MouseWorldScale);
 		Graphics()->QuadsDraw(&Line, 1);
 	}
 	else if(Axis == EAxis::AXIS_Y)
 	{
-		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y + Point.y) / 2.0f, 1.0f * m_MouseWScale, fx2f(Point.y - OriginalPoint.y));
+		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y + Point.y) / 2.0f, 1.0f * m_MouseWorldScale, fx2f(Point.y - OriginalPoint.y));
 		Graphics()->QuadsDraw(&Line, 1);
 	}
 
 	// Draw ghost of original point
-	IGraphics::CQuadItem QuadItem(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y), 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem QuadItem(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y), 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
@@ -1580,8 +1590,10 @@ void CEditor::ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 	if(!g_Config.m_EdAlignQuads)
 		return;
 
+	bool GridEnabled = MapView()->MapGrid()->IsEnabled() && !Input()->AltIsPressed();
+
 	// Perform computation from the original position of this point
-	int Threshold = f2fx(maximum(10.0f, 10.0f * m_MouseWScale));
+	int Threshold = f2fx(maximum(5.0f, 10.0f * m_MouseWorldScale));
 	CPoint OrigPoint = m_QuadDragOriginalPoints.at(QuadIndex)[PointIndex];
 	// Get the "current" point by applying the offset
 	CPoint Point = OrigPoint + ivec2(OffsetX, OffsetY);
@@ -1598,8 +1610,7 @@ void CEditor::ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 		int DiffX = absolute(DX);
 		int DiffY = absolute(DY);
 
-		// Check the X axis
-		if(DiffX <= Threshold)
+		if(DiffX <= Threshold && (!GridEnabled || DiffX == 0))
 		{
 			// Only store alignments that have the smallest difference
 			if(DiffX < SmallestDiffX)
@@ -1620,7 +1631,8 @@ void CEditor::ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 				});
 			}
 		}
-		if(DiffY <= Threshold)
+
+		if(DiffY <= Threshold && (!GridEnabled || DiffY == 0))
 		{
 			// Only store alignments that have the smallest difference
 			if(DiffY < SmallestDiffY)
@@ -1680,8 +1692,12 @@ void CEditor::ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 			CheckAlignment(pQuadPoint);
 		}
 
-		CPoint Center = (Min + Max) / 2.0f;
-		CheckAlignment(&Center);
+		// Don't check alignment with center of selected quads
+		if(!IsQuadSelected(i))
+		{
+			CPoint Center = (Min + Max) / 2.0f;
+			CheckAlignment(&Center);
+		}
 	}
 
 	// Finally concatenate both alignment vectors into the output
@@ -1762,10 +1778,12 @@ void CEditor::ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 	// This method is a bit different than the point alignment in the way where instead of trying to aling 1 point to all quads,
 	// we try to align 5 points to all quads, these 5 points being 5 points of an AABB.
 	// Otherwise, the concept is the same, we use the original position of the AABB to make the computations.
-	int Threshold = f2fx(maximum(10.0f, 10.0f * m_MouseWScale));
+	int Threshold = f2fx(maximum(5.0f, 10.0f * m_MouseWorldScale));
 	int SmallestDiffX = Threshold + 1, SmallestDiffY = Threshold + 1;
 	std::vector<SAlignmentInfo> vAlignmentsX, vAlignmentsY;
 
+	bool GridEnabled = MapView()->MapGrid()->IsEnabled() && !Input()->AltIsPressed();
+
 	auto &&CheckAlignment = [&](CPoint &Aligned, int Point) {
 		CPoint ToCheck = AABB.m_aPoints[Point] + ivec2(OffsetX, OffsetY);
 		int DX = Aligned.x - ToCheck.x;
@@ -1773,7 +1791,7 @@ void CEditor::ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 		int DiffX = absolute(DX);
 		int DiffY = absolute(DY);
 
-		if(DiffX <= Threshold)
+		if(DiffX <= Threshold && (!GridEnabled || DiffX == 0))
 		{
 			if(DiffX < SmallestDiffX)
 			{
@@ -1792,7 +1810,8 @@ void CEditor::ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 				});
 			}
 		}
-		if(DiffY <= Threshold)
+
+		if(DiffY <= Threshold && (!GridEnabled || DiffY == 0))
 		{
 			if(DiffY < SmallestDiffY)
 			{
@@ -1862,7 +1881,7 @@ void CEditor::ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer,
 	vAlignments.insert(vAlignments.end(), vAlignmentsY.begin(), vAlignmentsY.end());
 }
 
-void CEditor::DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY)
+void CEditor::DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY) const
 {
 	if(!g_Config.m_EdAlignQuads)
 		return;
@@ -1875,18 +1894,18 @@ void CEditor::DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments
 		// We don't use IGraphics::CLineItem to draw because we don't want to stop QuadsBegin(), quads work just fine.
 		if(Alignment.m_Axis == EAxis::AXIS_X)
 		{ // Alignment on X axis is same Y values but different X values
-			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), fx2f(Alignment.m_X + OffsetX - Alignment.m_AlignedPoint.x), 1.0f * m_MouseWScale);
+			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), fx2f(Alignment.m_X + OffsetX - Alignment.m_AlignedPoint.x), 1.0f * m_MouseWorldScale);
 			Graphics()->QuadsDrawTL(&Line, 1);
 		}
 		else if(Alignment.m_Axis == EAxis::AXIS_Y)
 		{ // Alignment on Y axis is same X values but different Y values
-			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), 1.0f * m_MouseWScale, fx2f(Alignment.m_Y + OffsetY - Alignment.m_AlignedPoint.y));
+			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), 1.0f * m_MouseWorldScale, fx2f(Alignment.m_Y + OffsetY - Alignment.m_AlignedPoint.y));
 			Graphics()->QuadsDrawTL(&Line, 1);
 		}
 	}
 }
 
-void CEditor::DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY)
+void CEditor::DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY) const
 {
 	// Drawing an AABB is simply converting the points from fixed to float
 	// Then making lines out of quads and drawing them
@@ -1898,15 +1917,15 @@ void CEditor::DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX, int Off
 
 	// We don't use IGraphics::CLineItem to draw because we don't want to stop QuadsBegin(), quads work just fine.
 	IGraphics::CQuadItem Lines[4] = {
-		{TL.x, TL.y, TR.x - TL.x, 1.0f * m_MouseWScale},
-		{TL.x, TL.y, 1.0f * m_MouseWScale, BL.y - TL.y},
-		{TR.x, TR.y, 1.0f * m_MouseWScale, BR.y - TR.y},
-		{BL.x, BL.y, BR.x - BL.x, 1.0f * m_MouseWScale},
+		{TL.x, TL.y, TR.x - TL.x, 1.0f * m_MouseWorldScale},
+		{TL.x, TL.y, 1.0f * m_MouseWorldScale, BL.y - TL.y},
+		{TR.x, TR.y, 1.0f * m_MouseWorldScale, BR.y - TR.y},
+		{BL.x, BL.y, BR.x - BL.x, 1.0f * m_MouseWorldScale},
 	};
 	Graphics()->SetColor(1, 0, 1, 1);
 	Graphics()->QuadsDrawTL(Lines, 4);
 
-	IGraphics::CQuadItem CenterQuad(Center.x, Center.y, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem CenterQuad(Center.x, Center.y, 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&CenterQuad, 1);
 }
 
@@ -1924,12 +1943,13 @@ void CEditor::QuadSelectionAABB(const std::shared_ptr<CLayerQuads> &pLayer, SAxi
 	for(int Selected : m_vSelectedQuads)
 	{
 		CQuad *pQuad = &pLayer->m_vQuads[Selected];
-		for(auto &Point : pQuad->m_aPoints)
+		for(int i = 0; i < 4; i++)
 		{
-			Min.x = minimum(Min.x, Point.x);
-			Min.y = minimum(Min.y, Point.y);
-			Max.x = maximum(Max.x, Point.x);
-			Max.y = maximum(Max.y, Point.y);
+			auto *pPoint = &pQuad->m_aPoints[i];
+			Min.x = minimum(Min.x, pPoint->x);
+			Min.y = minimum(Min.y, pPoint->y);
+			Max.x = maximum(Max.x, pPoint->x);
+			Max.y = maximum(Max.y, pPoint->y);
 		}
 	}
 	CPoint Center = (Min + Max) / 2.0f;
@@ -1975,7 +1995,7 @@ void CEditor::ApplyAlignments(const std::vector<SAlignmentInfo> &vAlignments, in
 	OffsetY += AdjustY;
 }
 
-void CEditor::ApplyAxisAlignment(int &OffsetX, int &OffsetY)
+void CEditor::ApplyAxisAlignment(int &OffsetX, int &OffsetY) const
 {
 	// This is used to preserve axis alignment when pressing `Shift`
 	// Should be called before any other computation
@@ -1984,7 +2004,7 @@ void CEditor::ApplyAxisAlignment(int &OffsetX, int &OffsetY)
 	OffsetY = ((Axis == EAxis::AXIS_NONE || Axis == EAxis::AXIS_Y) ? OffsetY : 0);
 }
 
-void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index)
+void CEditor::DoQuad(int LayerIndex, const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index)
 {
 	enum
 	{
@@ -1998,14 +2018,14 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 	};
 
 	// some basic values
-	void *pID = &pQuad->m_aPoints[4]; // use pivot addr as id
+	void *pId = &pQuad->m_aPoints[4]; // use pivot addr as id
 	static std::vector<std::vector<CPoint>> s_vvRotatePoints;
 	static int s_Operation = OP_NONE;
 	static float s_MouseXStart = 0.0f;
 	static float s_MouseYStart = 0.0f;
 	static float s_RotateAngle = 0;
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
 	static CPoint s_OriginalPosition;
 	static std::vector<SAlignmentInfo> s_PivotAlignments; // Alignments per pivot per quad
 	static std::vector<SAlignmentInfo> s_vAABBAlignments; // Alignments for one AABB (single quad or selection of multiple quads)
@@ -2034,18 +2054,18 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 	if(IsQuadSelected(Index))
 	{
 		Graphics()->SetColor(0, 0, 0, 1);
-		IGraphics::CQuadItem QuadItem(CenterX, CenterY, 7.0f * m_MouseWScale, 7.0f * m_MouseWScale);
+		IGraphics::CQuadItem QuadItem(CenterX, CenterY, 7.0f * m_MouseWorldScale, 7.0f * m_MouseWorldScale);
 		Graphics()->QuadsDraw(&QuadItem, 1);
 	}
 
-	if(UI()->CheckActiveItem(pID))
+	if(Ui()->CheckActiveItem(pId))
 	{
-		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		if(m_MouseDeltaWorld != vec2(0.0f, 0.0f))
 		{
 			if(s_Operation == OP_SELECT)
 			{
-				float x = s_MouseXStart - UI()->MouseX();
-				float y = s_MouseYStart - UI()->MouseY();
+				float x = s_MouseXStart - Ui()->MouseX();
+				float y = s_MouseYStart - Ui()->MouseY();
 
 				if(x * x + y * y > 20.0f)
 				{
@@ -2084,7 +2104,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 			// check if we only should move pivot
 			if(s_Operation == OP_MOVE_PIVOT)
 			{
-				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads, -1, LayerIndex);
 
 				s_LastOffset = GetDragOffset(); // Update offset
 				ApplyAxisAlignment(s_LastOffset.x, s_LastOffset.y); // Apply axis alignment to the offset
@@ -2100,7 +2120,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 			}
 			else if(s_Operation == OP_MOVE_ALL)
 			{
-				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads, -1, LayerIndex);
 
 				// Compute drag offset
 				s_LastOffset = GetDragOffset();
@@ -2120,7 +2140,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 			}
 			else if(s_Operation == OP_ROTATE)
 			{
-				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads, -1, LayerIndex);
 
 				for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
 				{
@@ -2132,10 +2152,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 					}
 				}
 
-				if(Input()->ShiftIsPressed())
-					s_RotateAngle += (m_MouseDeltaX)*0.0001f;
-				else
-					s_RotateAngle += (m_MouseDeltaX)*0.002f;
+				s_RotateAngle += Ui()->MouseDeltaX() * (Input()->ShiftIsPressed() ? 0.0001f : 0.002f);
 			}
 		}
 
@@ -2144,6 +2161,8 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 		{
 			EAxis Axis = GetDragAxis(s_LastOffset.x, s_LastOffset.y);
 			DrawAxis(Axis, s_OriginalPosition, pQuad->m_aPoints[4]);
+
+			str_copy(m_aTooltip, "Hold shift to keep alignment on one axis.");
 		}
 
 		if(s_Operation == OP_MOVE_PIVOT)
@@ -2159,48 +2178,48 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 
 		if(s_Operation == OP_CONTEXT_MENU)
 		{
-			if(!UI()->MouseButton(1))
+			if(!Ui()->MouseButton(1))
 			{
 				if(m_vSelectedLayers.size() == 1)
 				{
 					m_SelectedQuadIndex = FindSelectedQuadIndex(Index);
 
 					static SPopupMenuId s_PopupQuadId;
-					UI()->DoPopupMenu(&s_PopupQuadId, UI()->MouseX(), UI()->MouseY(), 120, 198, this, PopupQuad);
-					UI()->DisableMouseLock();
+					Ui()->DoPopupMenu(&s_PopupQuadId, Ui()->MouseX(), Ui()->MouseY(), 120, 222, this, PopupQuad);
+					Ui()->DisableMouseLock();
 				}
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 		else if(s_Operation == OP_DELETE)
 		{
-			if(!UI()->MouseButton(1))
+			if(!Ui()->MouseButton(1))
 			{
 				if(m_vSelectedLayers.size() == 1)
 				{
-					UI()->DisableMouseLock();
+					Ui()->DisableMouseLock();
 					m_Map.OnModify();
 					DeleteSelectedQuads();
 				}
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 		else if(s_Operation == OP_ROTATE)
 		{
-			if(UI()->MouseButton(0))
+			if(Ui()->MouseButton(0))
 			{
-				UI()->DisableMouseLock();
+				Ui()->DisableMouseLock();
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 				m_QuadTracker.EndQuadTrack();
 			}
-			else if(UI()->MouseButton(1))
+			else if(Ui()->MouseButton(1))
 			{
-				UI()->DisableMouseLock();
+				Ui()->DisableMouseLock();
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 
 				// Reset points to old position
 				for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
@@ -2213,7 +2232,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 		}
 		else
 		{
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
 				if(s_Operation == OP_SELECT)
 				{
@@ -2227,9 +2246,9 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 					m_QuadTracker.EndQuadTrack();
 				}
 
-				UI()->DisableMouseLock();
+				Ui()->DisableMouseLock();
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 
 				s_LastOffset = ivec2();
 				s_OriginalPosition = ivec2();
@@ -2242,8 +2261,8 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 	}
 	else if(Input()->KeyPress(KEY_R) && !m_vSelectedQuads.empty() && m_Dialog == DIALOG_NONE)
 	{
-		UI()->EnableMouseLock(pID);
-		UI()->SetActiveItem(pID);
+		Ui()->EnableMouseLock(pId);
+		Ui()->SetActiveItem(pId);
 		s_Operation = OP_ROTATE;
 		s_RotateAngle = 0;
 
@@ -2260,23 +2279,23 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 			s_vvRotatePoints[i][3] = pCurrentQuad->m_aPoints[3];
 		}
 	}
-	else if(UI()->HotItem() == pID)
+	else if(Ui()->HotItem() == pId)
 	{
-		ms_pUiGotContext = pID;
+		ms_pUiGotContext = pId;
 
 		Graphics()->SetColor(1, 1, 1, 1);
 		str_copy(m_aTooltip, "Left mouse button to move. Hold shift to move pivot. Hold alt to ignore grid. Hold shift and right click to delete.");
 
-		if(UI()->MouseButton(0))
+		if(Ui()->MouseButton(0))
 		{
-			UI()->SetActiveItem(pID);
+			Ui()->SetActiveItem(pId);
 
-			s_MouseXStart = UI()->MouseX();
-			s_MouseYStart = UI()->MouseY();
+			s_MouseXStart = Ui()->MouseX();
+			s_MouseYStart = Ui()->MouseY();
 
 			s_Operation = OP_SELECT;
 		}
-		else if(UI()->MouseButton(1))
+		else if(Ui()->MouseButtonClicked(1))
 		{
 			if(Input()->ShiftIsPressed())
 			{
@@ -2285,7 +2304,7 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 				if(!IsQuadSelected(Index))
 					SelectQuad(Index);
 
-				UI()->SetActiveItem(pID);
+				Ui()->SetActiveItem(pId);
 			}
 			else
 			{
@@ -2294,23 +2313,23 @@ void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, i
 				if(!IsQuadSelected(Index))
 					SelectQuad(Index);
 
-				UI()->SetActiveItem(pID);
+				Ui()->SetActiveItem(pId);
 			}
 		}
 	}
 	else
 		Graphics()->SetColor(0, 1, 0, 1);
 
-	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
-void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int V)
+void CEditor::DoQuadPoint(int LayerIndex, const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int V)
 {
-	void *pID = &pQuad->m_aPoints[V];
+	void *pId = &pQuad->m_aPoints[V];
 
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
 
 	float px = fx2f(pQuad->m_aPoints[V].x);
 	float py = fx2f(pQuad->m_aPoints[V].y);
@@ -2319,7 +2338,7 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 	if(IsQuadPointSelected(QuadIndex, V))
 	{
 		Graphics()->SetColor(0, 0, 0, 1);
-		IGraphics::CQuadItem QuadItem(px, py, 7.0f * m_MouseWScale, 7.0f * m_MouseWScale);
+		IGraphics::CQuadItem QuadItem(px, py, 7.0f * m_MouseWorldScale, 7.0f * m_MouseWorldScale);
 		Graphics()->QuadsDraw(&QuadItem, 1);
 	}
 
@@ -2353,14 +2372,14 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 		return {OffsetX, OffsetY};
 	};
 
-	if(UI()->CheckActiveItem(pID))
+	if(Ui()->CheckActiveItem(pId))
 	{
-		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		if(m_MouseDeltaWorld != vec2(0.0f, 0.0f))
 		{
 			if(s_Operation == OP_SELECT)
 			{
-				float x = s_MouseXStart - UI()->MouseX();
-				float y = s_MouseYStart - UI()->MouseY();
+				float x = s_MouseXStart - Ui()->MouseX();
+				float y = s_MouseYStart - Ui()->MouseY();
 
 				if(x * x + y * y > 20.0f)
 				{
@@ -2370,23 +2389,26 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 					if(Input()->ShiftIsPressed())
 					{
 						s_Operation = OP_MOVEUV;
-						UI()->EnableMouseLock(pID);
+						Ui()->EnableMouseLock(pId);
 					}
 					else
 					{
 						s_Operation = OP_MOVEPOINT;
 						// Save original positions before moving
 						s_OriginalPoint = pQuad->m_aPoints[V];
-						for(int m = 0; m < 4; m++)
-							if(IsQuadPointSelected(QuadIndex, m))
-								PreparePointDrag(pLayer, pQuad, QuadIndex, m);
+						for(int Selected : m_vSelectedQuads)
+						{
+							for(int m = 0; m < 4; m++)
+								if(IsQuadPointSelected(Selected, m))
+									PreparePointDrag(pLayer, &pLayer->m_vQuads[Selected], Selected, m);
+						}
 					}
 				}
 			}
 
 			if(s_Operation == OP_MOVEPOINT)
 			{
-				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads, -1, LayerIndex);
 
 				s_LastOffset = GetDragOffset(); // Update offset
 				ApplyAxisAlignment(s_LastOffset.x, s_LastOffset.y); // Apply axis alignment to offset
@@ -2394,11 +2416,14 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 				ComputePointsAlignments(pLayer, false, s_LastOffset.x, s_LastOffset.y, s_Alignments);
 				ApplyAlignments(s_Alignments, s_LastOffset.x, s_LastOffset.y);
 
-				for(int m = 0; m < 4; m++)
+				for(int Selected : m_vSelectedQuads)
 				{
-					if(IsQuadPointSelected(QuadIndex, m))
+					for(int m = 0; m < 4; m++)
 					{
-						DoPointDrag(pLayer, pQuad, QuadIndex, m, s_LastOffset.x, s_LastOffset.y);
+						if(IsQuadPointSelected(Selected, m))
+						{
+							DoPointDrag(pLayer, &pLayer->m_vQuads[Selected], Selected, m, s_LastOffset.x, s_LastOffset.y);
+						}
 					}
 				}
 			}
@@ -2406,22 +2431,26 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 			{
 				int SelectedPoints = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
 
-				m_QuadTracker.BeginQuadPointPropTrack(pLayer, m_vSelectedQuads, SelectedPoints);
+				m_QuadTracker.BeginQuadPointPropTrack(pLayer, m_vSelectedQuads, SelectedPoints, -1, LayerIndex);
 				m_QuadTracker.AddQuadPointPropTrack(EQuadPointProp::PROP_TEX_U);
 				m_QuadTracker.AddQuadPointPropTrack(EQuadPointProp::PROP_TEX_V);
 
-				for(int m = 0; m < 4; m++)
+				for(int Selected : m_vSelectedQuads)
 				{
-					if(IsQuadPointSelected(QuadIndex, m))
+					CQuad *pSelectedQuad = &pLayer->m_vQuads[Selected];
+					for(int m = 0; m < 4; m++)
 					{
-						// 0,2;1,3 - line x
-						// 0,1;2,3 - line y
+						if(IsQuadPointSelected(Selected, m))
+						{
+							// 0,2;1,3 - line x
+							// 0,1;2,3 - line y
 
-						pQuad->m_aTexcoords[m].x += f2fx(m_MouseDeltaWx * 0.001f);
-						pQuad->m_aTexcoords[(m + 2) % 4].x += f2fx(m_MouseDeltaWx * 0.001f);
+							pSelectedQuad->m_aTexcoords[m].x += f2fx(m_MouseDeltaWorld.x * 0.001f);
+							pSelectedQuad->m_aTexcoords[(m + 2) % 4].x += f2fx(m_MouseDeltaWorld.x * 0.001f);
 
-						pQuad->m_aTexcoords[m].y += f2fx(m_MouseDeltaWy * 0.001f);
-						pQuad->m_aTexcoords[m ^ 1].y += f2fx(m_MouseDeltaWy * 0.001f);
+							pSelectedQuad->m_aTexcoords[m].y += f2fx(m_MouseDeltaWorld.y * 0.001f);
+							pSelectedQuad->m_aTexcoords[m ^ 1].y += f2fx(m_MouseDeltaWorld.y * 0.001f);
+						}
 					}
 				}
 			}
@@ -2438,11 +2467,13 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 
 			// Alignments
 			DrawPointAlignments(s_Alignments, s_LastOffset.x, s_LastOffset.y);
+
+			str_copy(m_aTooltip, "Hold shift to keep alignment on one axis.");
 		}
 
 		if(s_Operation == OP_CONTEXT_MENU)
 		{
-			if(!UI()->MouseButton(1))
+			if(!Ui()->MouseButton(1))
 			{
 				if(m_vSelectedLayers.size() == 1)
 				{
@@ -2453,14 +2484,14 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 					m_SelectedQuadIndex = FindSelectedQuadIndex(QuadIndex);
 
 					static SPopupMenuId s_PopupPointId;
-					UI()->DoPopupMenu(&s_PopupPointId, UI()->MouseX(), UI()->MouseY(), 120, 75, this, PopupPoint);
+					Ui()->DoPopupMenu(&s_PopupPointId, Ui()->MouseX(), Ui()->MouseY(), 120, 75, this, PopupPoint);
 				}
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 		else
 		{
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
 				if(s_Operation == OP_SELECT)
 				{
@@ -2479,34 +2510,34 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 					m_QuadTracker.EndQuadPointPropTrackAll();
 				}
 
-				UI()->DisableMouseLock();
-				UI()->SetActiveItem(nullptr);
+				Ui()->DisableMouseLock();
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
 
 		Graphics()->SetColor(1, 1, 1, 1);
 	}
-	else if(UI()->HotItem() == pID)
+	else if(Ui()->HotItem() == pId)
 	{
-		ms_pUiGotContext = pID;
+		ms_pUiGotContext = pId;
 
 		Graphics()->SetColor(1, 1, 1, 1);
 		str_copy(m_aTooltip, "Left mouse button to move. Hold shift to move the texture. Hold alt to ignore grid.");
 
-		if(UI()->MouseButton(0))
+		if(Ui()->MouseButton(0))
 		{
-			UI()->SetActiveItem(pID);
+			Ui()->SetActiveItem(pId);
 
-			s_MouseXStart = UI()->MouseX();
-			s_MouseYStart = UI()->MouseY();
+			s_MouseXStart = Ui()->MouseX();
+			s_MouseYStart = Ui()->MouseY();
 
 			s_Operation = OP_SELECT;
 		}
-		else if(UI()->MouseButton(1))
+		else if(Ui()->MouseButton(1))
 		{
 			s_Operation = OP_CONTEXT_MENU;
 
-			UI()->SetActiveItem(pID);
+			Ui()->SetActiveItem(pId);
 
 			if(!IsQuadPointSelected(QuadIndex, V))
 				SelectQuadPoint(QuadIndex, V);
@@ -2515,7 +2546,7 @@ void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQu
 	else
 		Graphics()->SetColor(1, 0, 0, 1);
 
-	IGraphics::CQuadItem QuadItem(px, py, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem QuadItem(px, py, 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
@@ -2551,9 +2582,9 @@ void CEditor::DoQuadKnife(int QuadIndex)
 	CQuad *pQuad = &pLayer->m_vQuads[QuadIndex];
 
 	const bool IgnoreGrid = Input()->AltIsPressed();
-	float SnapRadius = 4.f * m_MouseWScale;
+	float SnapRadius = 4.f * m_MouseWorldScale;
 
-	vec2 Mouse = vec2(UI()->MouseWorldX(), UI()->MouseWorldY());
+	vec2 Mouse = vec2(Ui()->MouseWorldX(), Ui()->MouseWorldY());
 	vec2 Point = Mouse;
 
 	vec2 v[4] = {
@@ -2564,7 +2595,7 @@ void CEditor::DoQuadKnife(int QuadIndex)
 
 	str_copy(m_aTooltip, "Left click inside the quad to select an area to slice. Hold alt to ignore grid. Right click to leave knife mode");
 
-	if(UI()->MouseButtonClicked(1))
+	if(Ui()->MouseButtonClicked(1))
 	{
 		m_QuadKnifeActive = false;
 		return;
@@ -2658,7 +2689,7 @@ void CEditor::DoQuadKnife(int QuadIndex)
 
 	bool ValidPosition = IsInTriangle(Point, v[0], v[1], v[2]) || IsInTriangle(Point, v[0], v[3], v[2]);
 
-	if(UI()->MouseButtonClicked(0) && ValidPosition)
+	if(Ui()->MouseButtonClicked(0) && ValidPosition)
 	{
 		m_aQuadKnifePoints[m_QuadKnifeCount] = Point;
 		m_QuadKnifeCount++;
@@ -2754,14 +2785,14 @@ void CEditor::DoQuadKnife(int QuadIndex)
 	IGraphics::CQuadItem aMarkers[4];
 
 	for(int i = 0; i < m_QuadKnifeCount; i++)
-		aMarkers[i] = IGraphics::CQuadItem(m_aQuadKnifePoints[i].x, m_aQuadKnifePoints[i].y, 5.f * m_MouseWScale, 5.f * m_MouseWScale);
+		aMarkers[i] = IGraphics::CQuadItem(m_aQuadKnifePoints[i].x, m_aQuadKnifePoints[i].y, 5.f * m_MouseWorldScale, 5.f * m_MouseWorldScale);
 
 	Graphics()->SetColor(0.f, 0.f, 1.f, 1.f);
 	Graphics()->QuadsDraw(aMarkers, m_QuadKnifeCount);
 
 	if(ValidPosition)
 	{
-		IGraphics::CQuadItem MarkerCurrent(Point.x, Point.y, 5.f * m_MouseWScale, 5.f * m_MouseWScale);
+		IGraphics::CQuadItem MarkerCurrent(Point.x, Point.y, 5.f * m_MouseWorldScale, 5.f * m_MouseWorldScale);
 		Graphics()->QuadsDraw(&MarkerCurrent, 1);
 	}
 
@@ -2795,15 +2826,16 @@ void CEditor::DoQuadEnvelopes(const std::vector<CQuad> &vQuads, IGraphics::CText
 		const CPoint *pPivotPoint = &vQuads[j].m_aPoints[4];
 		for(size_t i = 0; i < apEnvelope[j]->m_vPoints.size() - 1; i++)
 		{
-			ColorRGBA Result;
-			apEnvelope[j]->Eval(apEnvelope[j]->m_vPoints[i].m_Time / 1000.0f + 0.000001f, Result);
+			ColorRGBA Result = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+			apEnvelope[j]->Eval(apEnvelope[j]->m_vPoints[i].m_Time / 1000.0f + 0.000001f, Result, 2);
 			vec2 Pos0 = vec2(fx2f(pPivotPoint->x) + Result.r, fx2f(pPivotPoint->y) + Result.g);
 
 			const int Steps = 15;
 			for(int n = 1; n <= Steps; n++)
 			{
 				const float Time = mix(apEnvelope[j]->m_vPoints[i].m_Time, apEnvelope[j]->m_vPoints[i + 1].m_Time, (float)n / Steps);
-				apEnvelope[j]->Eval(Time / 1000.0f - 0.000001f, Result);
+				Result = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+				apEnvelope[j]->Eval(Time / 1000.0f - 0.000001f, Result, 2);
 
 				vec2 Pos1 = vec2(fx2f(pPivotPoint->x) + Result.r, fx2f(pPivotPoint->y) + Result.g);
 
@@ -2846,9 +2878,9 @@ void CEditor::DoQuadEnvelopes(const std::vector<CQuad> &vQuads, IGraphics::CText
 			Graphics()->SetColorVertex(aArray, 4);
 
 			// Rotation
+			CPoint aRotated[4];
 			if(Rot != 0)
 			{
-				static CPoint aRotated[4];
 				aRotated[0] = vQuads[j].m_aPoints[0];
 				aRotated[1] = vQuads[j].m_aPoints[1];
 				aRotated[2] = vQuads[j].m_aPoints[2];
@@ -2907,10 +2939,10 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
 	static float s_LastWx = 0;
 	static float s_LastWy = 0;
 	static int s_Operation = OP_NONE;
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
 	std::shared_ptr<CEnvelope> pEnvelope = m_Map.m_vpEnvelopes[pQuad->m_PosEnv];
-	void *pID = &pEnvelope->m_vPoints[PIndex];
+	void *pId = &pEnvelope->m_vPoints[PIndex];
 
 	// get pivot
 	float CenterX = fx2f(pQuad->m_aPoints[4].x) + fx2f(pEnvelope->m_vPoints[PIndex].m_aValues[0]);
@@ -2918,7 +2950,7 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
 
 	const bool IgnoreGrid = Input()->AltIsPressed();
 
-	if(UI()->CheckActiveItem(pID) && m_CurrentQuadIndex == QIndex)
+	if(Ui()->CheckActiveItem(pId) && m_CurrentQuadIndex == QIndex)
 	{
 		if(s_Operation == OP_MOVE)
 		{
@@ -2937,32 +2969,32 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
 			}
 		}
 		else if(s_Operation == OP_ROTATE)
-			pEnvelope->m_vPoints[PIndex].m_aValues[2] += 10 * m_MouseDeltaX;
+			pEnvelope->m_vPoints[PIndex].m_aValues[2] += 10 * Ui()->MouseDeltaX();
 
 		s_LastWx = wx;
 		s_LastWy = wy;
 
-		if(!UI()->MouseButton(0))
+		if(!Ui()->MouseButton(0))
 		{
-			UI()->DisableMouseLock();
+			Ui()->DisableMouseLock();
 			s_Operation = OP_NONE;
-			UI()->SetActiveItem(nullptr);
+			Ui()->SetActiveItem(nullptr);
 		}
 
 		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 	}
-	else if(UI()->HotItem() == pID && m_CurrentQuadIndex == QIndex)
+	else if(Ui()->HotItem() == pId && m_CurrentQuadIndex == QIndex)
 	{
-		ms_pUiGotContext = pID;
+		ms_pUiGotContext = pId;
 
 		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 		str_copy(m_aTooltip, "Left mouse button to move. Hold ctrl to rotate. Hold alt to ignore grid.");
 
-		if(UI()->MouseButton(0))
+		if(Ui()->MouseButton(0))
 		{
 			if(Input()->ModifierIsPressed())
 			{
-				UI()->EnableMouseLock(pID);
+				Ui()->EnableMouseLock(pId);
 				s_Operation = OP_ROTATE;
 
 				SelectQuad(QIndex);
@@ -2977,7 +3009,7 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
 			SelectEnvPoint(PIndex);
 			m_SelectedQuadEnvelope = pQuad->m_PosEnv;
 
-			UI()->SetActiveItem(pID);
+			Ui()->SetActiveItem(pId);
 
 			s_LastWx = wx;
 			s_LastWy = wy;
@@ -2991,7 +3023,7 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
 	else
 		Graphics()->SetColor(0.0f, 1.0f, 0.0f, 1.0f);
 
-	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWorldScale, 5.0f * m_MouseWorldScale);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
@@ -3009,14 +3041,13 @@ void CEditor::DoMapEditor(CUIRect View)
 		View.w = View.h = Max;
 	}
 
-	static void *s_pEditorID = (void *)&s_pEditorID;
-	const bool Inside = !m_GuiActive || UI()->MouseInside(&View);
+	const bool Inside = Ui()->MouseInside(&View);
 
 	// fetch mouse position
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
-	float mx = UI()->MouseX();
-	float my = UI()->MouseY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
+	float mx = Ui()->MouseX();
+	float my = Ui()->MouseY();
 
 	static float s_StartWx = 0;
 	static float s_StartWy = 0;
@@ -3034,7 +3065,7 @@ void CEditor::DoMapEditor(CUIRect View)
 	// remap the screen so it can display the whole tileset
 	if(m_ShowPicker)
 	{
-		CUIRect Screen = *UI()->Screen();
+		CUIRect Screen = *Ui()->Screen();
 		float Size = 32.0f * 16.0f;
 		float w = Size * (Screen.w / View.w);
 		float h = Size * (Screen.h / View.h);
@@ -3093,17 +3124,17 @@ void CEditor::DoMapEditor(CUIRect View)
 	static int s_Operation = OP_NONE;
 
 	// draw layer borders
-	std::shared_ptr<CLayer> apEditLayers[128];
+	std::pair<int, std::shared_ptr<CLayer>> apEditLayers[128];
 	size_t NumEditLayers = 0;
 
 	if(m_ShowPicker && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_TILES)
 	{
-		apEditLayers[0] = m_pTilesetPicker;
+		apEditLayers[0] = {0, m_pTilesetPicker};
 		NumEditLayers++;
 	}
 	else if(m_ShowPicker)
 	{
-		apEditLayers[0] = m_pQuadsetPicker;
+		apEditLayers[0] = {0, m_pQuadsetPicker};
 		NumEditLayers++;
 	}
 	else
@@ -3122,8 +3153,8 @@ void CEditor::DoMapEditor(CUIRect View)
 		}
 		for(size_t i = 0; i < m_vSelectedLayers.size() && NumEditLayers < 128; i++)
 		{
-			apEditLayers[NumEditLayers] = GetSelectedLayerType(i, EditingType);
-			if(apEditLayers[NumEditLayers])
+			apEditLayers[NumEditLayers] = {m_vSelectedLayers[i], GetSelectedLayerType(i, EditingType)};
+			if(apEditLayers[NumEditLayers].second)
 			{
 				NumEditLayers++;
 			}
@@ -3133,30 +3164,46 @@ void CEditor::DoMapEditor(CUIRect View)
 		MapView()->MapGrid()->OnRender(View);
 	}
 
+	const bool ShouldPan = Ui()->HotItem() == &m_MapEditorId && ((Input()->ModifierIsPressed() && Ui()->MouseButton(0)) || Ui()->MouseButton(2));
+	if(m_pContainerPanned == &m_MapEditorId)
+	{
+		// do panning
+		if(ShouldPan)
+		{
+			if(Input()->ShiftIsPressed())
+				s_Operation = OP_PAN_EDITOR;
+			else
+				s_Operation = OP_PAN_WORLD;
+			Ui()->SetActiveItem(&m_MapEditorId);
+		}
+		else
+			s_Operation = OP_NONE;
+
+		if(s_Operation == OP_PAN_WORLD)
+			MapView()->OffsetWorld(-Ui()->MouseDelta() * m_MouseWorldScale);
+		else if(s_Operation == OP_PAN_EDITOR)
+			MapView()->OffsetEditor(-Ui()->MouseDelta() * m_MouseWorldScale);
+
+		if(s_Operation == OP_NONE)
+			m_pContainerPanned = nullptr;
+	}
+
 	if(Inside)
 	{
-		UI()->SetHotItem(s_pEditorID);
+		Ui()->SetHotItem(&m_MapEditorId);
 
 		// do global operations like pan and zoom
-		if(UI()->CheckActiveItem(nullptr) && (UI()->MouseButton(0) || UI()->MouseButton(2)))
+		if(Ui()->CheckActiveItem(nullptr) && (Ui()->MouseButton(0) || Ui()->MouseButton(2)))
 		{
 			s_StartWx = wx;
 			s_StartWy = wy;
 
-			if(Input()->ModifierIsPressed() || UI()->MouseButton(2))
-			{
-				if(Input()->ShiftIsPressed())
-					s_Operation = OP_PAN_EDITOR;
-				else
-					s_Operation = OP_PAN_WORLD;
-				UI()->SetActiveItem(s_pEditorID);
-			}
-			else
-				s_Operation = OP_NONE;
+			if(ShouldPan && m_pContainerPanned == nullptr)
+				m_pContainerPanned = &m_MapEditorId;
 		}
 
 		// brush editing
-		if(UI()->HotItem() == s_pEditorID)
+		if(Ui()->HotItem() == &m_MapEditorId)
 		{
 			if(m_ShowPicker)
 			{
@@ -3201,11 +3248,16 @@ void CEditor::DoMapEditor(CUIRect View)
 			else if(m_pBrush->IsEmpty() && GetSelectedLayerType(0, LAYERTYPE_QUADS) != nullptr)
 				str_copy(m_aTooltip, "Use left mouse button to drag and create a brush. Hold shift to select multiple quads. Press R to rotate selected quads. Use ctrl+right mouse to select layer.");
 			else if(m_pBrush->IsEmpty())
-				str_copy(m_aTooltip, "Use left mouse button to drag and create a brush. Use ctrl+right mouse to select layer.");
+			{
+				if(g_Config.m_EdLayerSelector)
+					str_copy(m_aTooltip, "Use left mouse button to drag and create a brush. Use ctrl+right click to select layer for hovered tile.");
+				else
+					str_copy(m_aTooltip, "Use left mouse button to drag and create a brush.");
+			}
 			else
 				str_copy(m_aTooltip, "Use left mouse button to paint with the brush. Right button clears the brush.");
 
-			if(UI()->CheckActiveItem(s_pEditorID))
+			if(Ui()->CheckActiveItem(&m_MapEditorId))
 			{
 				CUIRect r;
 				r.x = s_StartWx;
@@ -3232,19 +3284,19 @@ void CEditor::DoMapEditor(CUIRect View)
 						for(size_t k = 0; k < NumEditLayers; k++)
 						{
 							size_t BrushIndex = k % m_pBrush->m_vpLayers.size();
-							if(apEditLayers[k]->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
+							if(apEditLayers[k].second->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
 							{
-								if(apEditLayers[k]->m_Type == LAYERTYPE_TILES)
+								if(apEditLayers[k].second->m_Type == LAYERTYPE_TILES)
 								{
-									std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(apEditLayers[k]);
+									std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(apEditLayers[k].second);
 									std::shared_ptr<CLayerTiles> pBrushLayer = std::static_pointer_cast<CLayerTiles>(m_pBrush->m_vpLayers[BrushIndex]);
 
 									if(pLayer->m_Tele <= pBrushLayer->m_Tele && pLayer->m_Speedup <= pBrushLayer->m_Speedup && pLayer->m_Front <= pBrushLayer->m_Front && pLayer->m_Game <= pBrushLayer->m_Game && pLayer->m_Switch <= pBrushLayer->m_Switch && pLayer->m_Tune <= pBrushLayer->m_Tune)
-										pLayer->BrushDraw(pBrushLayer, wx, wy);
+										pLayer->BrushDraw(pBrushLayer, vec2(wx, wy));
 								}
 								else
 								{
-									apEditLayers[k]->BrushDraw(m_pBrush->m_vpLayers[BrushIndex], wx, wy);
+									apEditLayers[k].second->BrushDraw(m_pBrush->m_vpLayers[BrushIndex], vec2(wx, wy));
 								}
 							}
 						}
@@ -3252,7 +3304,7 @@ void CEditor::DoMapEditor(CUIRect View)
 				}
 				else if(s_Operation == OP_BRUSH_GRAB)
 				{
-					if(!UI()->MouseButton(0))
+					if(!Ui()->MouseButton(0))
 					{
 						std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
 						if(Input()->ShiftIsPressed() && pQuadLayer)
@@ -3261,10 +3313,8 @@ void CEditor::DoMapEditor(CUIRect View)
 							for(size_t i = 0; i < pQuadLayer->m_vQuads.size(); i++)
 							{
 								const CQuad &Quad = pQuadLayer->m_vQuads[i];
-								float px = fx2f(Quad.m_aPoints[4].x);
-								float py = fx2f(Quad.m_aPoints[4].y);
-
-								if(r.Inside(px, py) && !IsQuadSelected(i))
+								vec2 Position = vec2(fx2f(Quad.m_aPoints[4].x), fx2f(Quad.m_aPoints[4].y));
+								if(r.Inside(Position) && !IsQuadSelected(i))
 									ToggleSelectQuad(i);
 							}
 						}
@@ -3278,7 +3328,7 @@ void CEditor::DoMapEditor(CUIRect View)
 							// TODO: do all layers
 							int Grabs = 0;
 							for(size_t k = 0; k < NumEditLayers; k++)
-								Grabs += apEditLayers[k]->BrushGrab(m_pBrush, r);
+								Grabs += apEditLayers[k].second->BrushGrab(m_pBrush, r);
 							if(Grabs == 0)
 								m_pBrush->Clear();
 
@@ -3289,13 +3339,13 @@ void CEditor::DoMapEditor(CUIRect View)
 					else
 					{
 						for(size_t k = 0; k < NumEditLayers; k++)
-							apEditLayers[k]->BrushSelecting(r);
-						UI()->MapScreen();
+							apEditLayers[k].second->BrushSelecting(r);
+						Ui()->MapScreen();
 					}
 				}
 				else if(s_Operation == OP_BRUSH_PAINT)
 				{
-					if(!UI()->MouseButton(0))
+					if(!Ui()->MouseButton(0))
 					{
 						for(size_t k = 0; k < NumEditLayers; k++)
 						{
@@ -3303,7 +3353,7 @@ void CEditor::DoMapEditor(CUIRect View)
 							if(m_pBrush->m_vpLayers.size() != NumEditLayers)
 								BrushIndex = 0;
 							std::shared_ptr<CLayer> pBrush = m_pBrush->IsEmpty() ? nullptr : m_pBrush->m_vpLayers[BrushIndex];
-							apEditLayers[k]->FillSelection(m_pBrush->IsEmpty(), pBrush, r);
+							apEditLayers[k].second->FillSelection(m_pBrush->IsEmpty(), pBrush, r);
 						}
 						std::shared_ptr<IEditorAction> Action = std::make_shared<CEditorBrushDrawAction>(this, m_SelectedGroup);
 						m_EditorHistory.RecordAction(Action);
@@ -3311,21 +3361,21 @@ void CEditor::DoMapEditor(CUIRect View)
 					else
 					{
 						for(size_t k = 0; k < NumEditLayers; k++)
-							apEditLayers[k]->BrushSelecting(r);
-						UI()->MapScreen();
+							apEditLayers[k].second->BrushSelecting(r);
+						Ui()->MapScreen();
 					}
 				}
 			}
 			else
 			{
-				if(UI()->MouseButton(1))
+				if(Ui()->MouseButton(1))
 				{
 					m_pBrush->Clear();
 				}
 
-				if(UI()->MouseButton(0) && s_Operation == OP_NONE && !m_QuadKnifeActive)
+				if(!Input()->ModifierIsPressed() && Ui()->MouseButton(0) && s_Operation == OP_NONE && !m_QuadKnifeActive)
 				{
-					UI()->SetActiveItem(s_pEditorID);
+					Ui()->SetActiveItem(&m_MapEditorId);
 
 					if(m_pBrush->IsEmpty())
 						s_Operation = OP_BRUSH_GRAB;
@@ -3338,8 +3388,8 @@ void CEditor::DoMapEditor(CUIRect View)
 							if(m_pBrush->m_vpLayers.size() != NumEditLayers)
 								BrushIndex = 0;
 
-							if(apEditLayers[k]->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
-								apEditLayers[k]->BrushPlace(m_pBrush->m_vpLayers[BrushIndex], wx, wy);
+							if(apEditLayers[k].second->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
+								apEditLayers[k].second->BrushPlace(m_pBrush->m_vpLayers[BrushIndex], vec2(wx, wy));
 						}
 					}
 
@@ -3398,9 +3448,11 @@ void CEditor::DoMapEditor(CUIRect View)
 
 				for(size_t k = 0; k < NumEditLayers; k++)
 				{
-					if(apEditLayers[k]->m_Type == LAYERTYPE_QUADS)
+					auto &[LayerIndex, pEditLayer] = apEditLayers[k];
+
+					if(pEditLayer->m_Type == LAYERTYPE_QUADS)
 					{
-						std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(apEditLayers[k]);
+						std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(pEditLayer);
 
 						if(m_ShowEnvelopePreview == SHOWENV_NONE)
 							m_ShowEnvelopePreview = SHOWENV_ALL;
@@ -3416,29 +3468,29 @@ void CEditor::DoMapEditor(CUIRect View)
 							for(size_t i = 0; i < pLayer->m_vQuads.size(); i++)
 							{
 								for(int v = 0; v < 4; v++)
-									DoQuadPoint(pLayer, &pLayer->m_vQuads[i], i, v);
+									DoQuadPoint(LayerIndex, pLayer, &pLayer->m_vQuads[i], i, v);
 
-								DoQuad(pLayer, &pLayer->m_vQuads[i], i);
+								DoQuad(LayerIndex, pLayer, &pLayer->m_vQuads[i], i);
 							}
 							Graphics()->QuadsEnd();
 						}
 					}
 
-					if(apEditLayers[k]->m_Type == LAYERTYPE_SOUNDS)
+					if(pEditLayer->m_Type == LAYERTYPE_SOUNDS)
 					{
-						std::shared_ptr<CLayerSounds> pLayer = std::static_pointer_cast<CLayerSounds>(apEditLayers[k]);
+						std::shared_ptr<CLayerSounds> pLayer = std::static_pointer_cast<CLayerSounds>(pEditLayer);
 
 						Graphics()->TextureClear();
 						Graphics()->QuadsBegin();
 						for(size_t i = 0; i < pLayer->m_vSources.size(); i++)
 						{
-							DoSoundSource(&pLayer->m_vSources[i], i);
+							DoSoundSource(LayerIndex, &pLayer->m_vSources[i], i);
 						}
 						Graphics()->QuadsEnd();
 					}
 				}
 
-				UI()->MapScreen();
+				Ui()->MapScreen();
 			}
 		}
 
@@ -3452,21 +3504,20 @@ void CEditor::DoMapEditor(CUIRect View)
 				Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
 				Pos.y -= 3.0f;
 
-				vec2 MousePos(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
-				if(distance(Pos, MousePos) <= 20.0f)
+				if(distance(Pos, m_MouseWorldNoParaPos) <= 20.0f)
 				{
-					UI()->SetHotItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
+					Ui()->SetHotItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
 
-					if(i != MapView()->ProofMode()->m_CurrentMenuProofIndex && UI()->CheckActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]))
+					if(i != MapView()->ProofMode()->m_CurrentMenuProofIndex && Ui()->CheckActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]))
 					{
-						if(!UI()->MouseButton(0))
+						if(!Ui()->MouseButton(0))
 						{
 							MapView()->ProofMode()->m_CurrentMenuProofIndex = i;
 							MapView()->SetWorldOffset(MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
-							UI()->SetActiveItem(nullptr);
+							Ui()->SetActiveItem(nullptr);
 						}
 					}
-					else if(UI()->HotItem() == &MapView()->ProofMode()->m_vMenuBackgroundPositions[i])
+					else if(Ui()->HotItem() == &MapView()->ProofMode()->m_vMenuBackgroundPositions[i])
 					{
 						char aTooltipPrefix[32] = "Switch proof position to";
 						if(i == MapView()->ProofMode()->m_CurrentMenuProofIndex)
@@ -3490,8 +3541,7 @@ void CEditor::DoMapEditor(CUIRect View)
 							Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
 							Pos.y -= 3.0f;
 
-							MousePos = vec2(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
-							if(distance(Pos, MousePos) > 20.0f)
+							if(distance(Pos, m_MouseWorldNoParaPos) > 20.0f)
 								continue;
 
 							if(i < (TILE_TIME_CHECKPOINT_LAST - TILE_TIME_CHECKPOINT_FIRST))
@@ -3506,24 +3556,18 @@ void CEditor::DoMapEditor(CUIRect View)
 						str_format(m_aMenuBackgroundTooltip, sizeof(m_aMenuBackgroundTooltip), "%s %s", aTooltipPrefix, aTooltipPositions);
 
 						str_copy(m_aTooltip, m_aMenuBackgroundTooltip);
-						if(UI()->MouseButton(0))
-							UI()->SetActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
+						if(Ui()->MouseButton(0))
+							Ui()->SetActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
 					}
 					break;
 				}
 			}
 		}
 
-		if(UI()->CheckActiveItem(s_pEditorID))
+		if(Ui()->CheckActiveItem(&m_MapEditorId) && m_pContainerPanned == nullptr)
 		{
-			// do panning
-			if(s_Operation == OP_PAN_WORLD)
-				MapView()->OffsetWorld(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
-			else if(s_Operation == OP_PAN_EDITOR)
-				MapView()->OffsetEditor(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
-
 			// release mouse
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
 				if(s_Operation == OP_BRUSH_DRAW)
 				{
@@ -3534,29 +3578,29 @@ void CEditor::DoMapEditor(CUIRect View)
 				}
 
 				s_Operation = OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 			}
 		}
-		if(!Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+		if(!Input()->ModifierIsPressed() && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
 		{
-			float PanSpeed = 64.0f;
+			float PanSpeed = Input()->ShiftIsPressed() ? 200.0f : 64.0f;
 			if(Input()->KeyPress(KEY_A))
-				MapView()->OffsetWorld({-PanSpeed * m_MouseWScale, 0});
+				MapView()->OffsetWorld({-PanSpeed * m_MouseWorldScale, 0});
 			else if(Input()->KeyPress(KEY_D))
-				MapView()->OffsetWorld({PanSpeed * m_MouseWScale, 0});
+				MapView()->OffsetWorld({PanSpeed * m_MouseWorldScale, 0});
 			if(Input()->KeyPress(KEY_W))
-				MapView()->OffsetWorld({0, -PanSpeed * m_MouseWScale});
+				MapView()->OffsetWorld({0, -PanSpeed * m_MouseWorldScale});
 			else if(Input()->KeyPress(KEY_S))
-				MapView()->OffsetWorld({0, PanSpeed * m_MouseWScale});
+				MapView()->OffsetWorld({0, PanSpeed * m_MouseWorldScale});
 		}
 	}
-	else if(UI()->CheckActiveItem(s_pEditorID))
+	else if(Ui()->CheckActiveItem(&m_MapEditorId) && m_pContainerPanned == nullptr)
 	{
 		// release mouse
-		if(!UI()->MouseButton(0))
+		if(!Ui()->MouseButton(0))
 		{
 			s_Operation = OP_NONE;
-			UI()->SetActiveItem(nullptr);
+			Ui()->SetActiveItem(nullptr);
 		}
 	}
 
@@ -3600,26 +3644,26 @@ void CEditor::DoMapEditor(CUIRect View)
 		m_ShowEnvelopePreview = SHOWENV_NONE;
 	}
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 }
 
 void CEditor::SetHotQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer)
 {
-	float wx = UI()->MouseWorldX();
-	float wy = UI()->MouseWorldY();
+	float wx = Ui()->MouseWorldX();
+	float wy = Ui()->MouseWorldY();
 
 	float MinDist = 500.0f;
 	void *pMinPoint = nullptr;
 
-	auto UpdateMinimum = [&](float px, float py, void *pID) {
-		float dx = (px - wx) / m_MouseWScale;
-		float dy = (py - wy) / m_MouseWScale;
+	auto UpdateMinimum = [&](float px, float py, void *pId) {
+		float dx = (px - wx) / m_MouseWorldScale;
+		float dy = (py - wy) / m_MouseWorldScale;
 
 		float CurrDist = dx * dx + dy * dy;
 		if(CurrDist < MinDist)
 		{
 			MinDist = CurrDist;
-			pMinPoint = pID;
+			pMinPoint = pId;
 			return true;
 		}
 		return false;
@@ -3645,27 +3689,27 @@ void CEditor::SetHotQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer)
 	}
 
 	if(pMinPoint != nullptr)
-		UI()->SetHotItem(pMinPoint);
+		Ui()->SetHotItem(pMinPoint);
 }
 
-void CEditor::DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor)
+void CEditor::DoColorPickerButton(const void *pId, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor)
 {
 	CUIRect ColorRect;
-	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(pID)), IGraphics::CORNER_ALL, 3.0f);
+	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * Ui()->ButtonColorMul(pId)), IGraphics::CORNER_ALL, 3.0f);
 	pRect->Margin(1.0f, &ColorRect);
 	ColorRect.Draw(Color, IGraphics::CORNER_ALL, 3.0f);
 
-	const int ButtonResult = DoButton_Editor_Common(pID, nullptr, 0, pRect, 0, "Click to show the color picker. Shift+rightclick to copy color to clipboard. Shift+leftclick to paste color from clipboard.");
+	const int ButtonResult = DoButton_Editor_Common(pId, nullptr, 0, pRect, 0, "Click to show the color picker. Shift+rightclick to copy color to clipboard. Shift+leftclick to paste color from clipboard.");
 	if(Input()->ShiftIsPressed())
 	{
 		if(ButtonResult == 1)
 		{
-			const char *pClipboard = Input()->GetClipboardText();
-			if(*pClipboard == '#' || *pClipboard == '$') // ignore leading # (web color format) and $ (console color format)
-				++pClipboard;
-			if(str_isallnum_hex(pClipboard))
+			std::string Clipboard = Input()->GetClipboardText();
+			if(Clipboard[0] == '#' || Clipboard[0] == '$') // ignore leading # (web color format) and $ (console color format)
+				Clipboard = Clipboard.substr(1);
+			if(str_isallnum_hex(Clipboard.c_str()))
 			{
-				std::optional<ColorRGBA> ParsedColor = color_parse<ColorRGBA>(pClipboard);
+				std::optional<ColorRGBA> ParsedColor = color_parse<ColorRGBA>(Clipboard.c_str());
 				if(ParsedColor)
 				{
 					m_ColorPickerPopupContext.m_State = EEditState::ONE_GO;
@@ -3682,24 +3726,24 @@ void CEditor::DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRG
 	}
 	else if(ButtonResult > 0)
 	{
-		if(m_ColorPickerPopupContext.m_ColorMode == CUI::SColorPickerPopupContext::MODE_UNSET)
-			m_ColorPickerPopupContext.m_ColorMode = CUI::SColorPickerPopupContext::MODE_RGBA;
+		if(m_ColorPickerPopupContext.m_ColorMode == CUi::SColorPickerPopupContext::MODE_UNSET)
+			m_ColorPickerPopupContext.m_ColorMode = CUi::SColorPickerPopupContext::MODE_RGBA;
 		m_ColorPickerPopupContext.m_RgbaColor = Color;
 		m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(Color);
 		m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_ColorPickerPopupContext.m_HslaColor);
 		m_ColorPickerPopupContext.m_Alpha = true;
-		m_pColorPickerPopupActiveID = pID;
-		UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &m_ColorPickerPopupContext);
+		m_pColorPickerPopupActiveId = pId;
+		Ui()->ShowPopupColorPicker(Ui()->MouseX(), Ui()->MouseY(), &m_ColorPickerPopupContext);
 	}
 
-	if(UI()->IsPopupOpen(&m_ColorPickerPopupContext))
+	if(Ui()->IsPopupOpen(&m_ColorPickerPopupContext))
 	{
-		if(m_pColorPickerPopupActiveID == pID)
+		if(m_pColorPickerPopupActiveId == pId)
 			SetColor(m_ColorPickerPopupContext.m_RgbaColor);
 	}
 	else
 	{
-		m_pColorPickerPopupActiveID = nullptr;
+		m_pColorPickerPopupActiveId = nullptr;
 		if(m_ColorPickerPopupContext.m_State == EEditState::EDITING)
 		{
 			ColorRGBA c = color_cast<ColorRGBA>(m_ColorPickerPopupContext.m_HsvaColor);
@@ -3735,9 +3779,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 	};
 	static int s_Operation = OP_NONE;
 	static int s_PreviousOperation = OP_NONE;
-	static const void *s_pDraggedButton = 0;
+	static const void *s_pDraggedButton = nullptr;
 	static float s_InitialMouseY = 0;
 	static float s_InitialCutHeight = 0;
+	constexpr float MinDragDistance = 5.0f;
 	int GroupAfterDraggedLayer = -1;
 	int LayerAfterDraggedLayer = -1;
 	bool DraggedPositionFound = false;
@@ -3745,7 +3790,6 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 	bool MoveGroup = false;
 	bool StartDragLayer = false;
 	bool StartDragGroup = false;
-	bool AnyButtonActive = false;
 	std::vector<int> vButtonsPerGroup;
 
 	auto SetOperation = [](int Operation) {
@@ -3753,6 +3797,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		{
 			s_PreviousOperation = s_Operation;
 			s_Operation = Operation;
+			if(Operation == OP_NONE)
+			{
+				s_pDraggedButton = nullptr;
+			}
 		}
 	};
 
@@ -3762,8 +3810,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		vButtonsPerGroup.push_back(pGroup->m_vpLayers.size() + 1);
 	}
 
-	if(!UI()->CheckActiveItem(s_pDraggedButton))
+	if(s_pDraggedButton != nullptr && Ui()->ActiveItem() != s_pDraggedButton)
+	{
 		SetOperation(OP_NONE);
+	}
 
 	if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
 	{
@@ -3786,7 +3836,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		}
 
 		UnscrolledLayersBox.HSplitTop(s_InitialCutHeight, nullptr, &UnscrolledLayersBox);
-		UnscrolledLayersBox.y -= s_InitialMouseY - UI()->MouseY();
+		UnscrolledLayersBox.y -= s_InitialMouseY - Ui()->MouseY();
 
 		UnscrolledLayersBox.y = clamp(UnscrolledLayersBox.y, MinDraggableValue, MaxDraggableValue);
 
@@ -3794,13 +3844,13 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 	}
 
 	static bool s_ScrollToSelectionNext = false;
-	const bool ScrollToSelection = SelectLayerByTile() || s_ScrollToSelectionNext;
+	const bool ScrollToSelection = LayerSelector()->SelectByTile() || s_ScrollToSelectionNext;
 	s_ScrollToSelectionNext = false;
 
 	// render layers
 	for(int g = 0; g < (int)m_Map.m_vpGroups.size(); g++)
 	{
-		if(s_Operation == OP_LAYER_DRAG && g > 0 && !DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight / 2)
+		if(s_Operation == OP_LAYER_DRAG && g > 0 && !DraggedPositionFound && Ui()->MouseY() < LayersBox.y + RowHeight / 2)
 		{
 			DraggedPositionFound = true;
 			GroupAfterDraggedLayer = g;
@@ -3820,7 +3870,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 				UnscrolledLayersBox.HSplitTop(RowHeight, &Slot, &UnscrolledLayersBox);
 				UnscrolledLayersBox.HSplitTop(2.0f, nullptr, &UnscrolledLayersBox);
 			}
-			else if(!DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight * vButtonsPerGroup[g] / 2 + 3.0f)
+			else if(!DraggedPositionFound && Ui()->MouseY() < LayersBox.y + RowHeight * vButtonsPerGroup[g] / 2 + 3.0f)
 			{
 				DraggedPositionFound = true;
 				GroupAfterDraggedLayer = g;
@@ -3845,21 +3895,54 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		if(s_ScrollRegion.AddRect(Slot))
 		{
 			Slot.VSplitLeft(15.0f, &VisibleToggle, &Slot);
-			if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_Visible, m_Map.m_vpGroups[g]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, m_Map.m_vpGroups[g]->m_Collapse ? 1 : 0, &VisibleToggle, 0, "Toggle group visibility", IGraphics::CORNER_L, 8.0f))
+
+			const int MouseClick = DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_Visible, m_Map.m_vpGroups[g]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, m_Map.m_vpGroups[g]->m_Collapse ? 1 : 0, &VisibleToggle, 0, "Left click to toggle visibility. Right click to show this group only.", IGraphics::CORNER_L, 8.0f);
+			if(MouseClick == 1)
+			{
 				m_Map.m_vpGroups[g]->m_Visible = !m_Map.m_vpGroups[g]->m_Visible;
+			}
+			else if(MouseClick == 2)
+			{
+				if(Input()->ShiftIsPressed())
+				{
+					if(g != m_SelectedGroup)
+						SelectLayer(0, g);
+				}
+
+				int NumActive = 0;
+				for(auto &Group : m_Map.m_vpGroups)
+				{
+					if(Group == m_Map.m_vpGroups[g])
+					{
+						Group->m_Visible = true;
+						continue;
+					}
+
+					if(Group->m_Visible)
+					{
+						Group->m_Visible = false;
+						NumActive++;
+					}
+				}
+				if(NumActive == 0)
+				{
+					for(auto &Group : m_Map.m_vpGroups)
+					{
+						Group->m_Visible = true;
+					}
+				}
+			}
 
 			str_format(aBuf, sizeof(aBuf), "#%d %s", g, m_Map.m_vpGroups[g]->m_aName);
 
 			bool Clicked;
 			bool Abrupted;
-			if(int Result = DoButton_DraggableEx(&m_Map.m_vpGroups[g], aBuf, g == m_SelectedGroup, &Slot, &Clicked, &Abrupted,
+			if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g].get(), aBuf, g == m_SelectedGroup, &Slot, &Clicked, &Abrupted,
 				   BUTTON_CONTEXT, m_Map.m_vpGroups[g]->m_Collapse ? "Select group. Shift click to select all layers. Double click to expand." : "Select group. Shift click to select all layers. Double click to collapse.", IGraphics::CORNER_R))
 			{
-				AnyButtonActive = true;
-
 				if(s_Operation == OP_NONE)
 				{
-					s_InitialMouseY = UI()->MouseY();
+					s_InitialMouseY = Ui()->MouseY();
 					s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y;
 					SetOperation(OP_CLICK);
 
@@ -3868,14 +3951,14 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 				}
 
 				if(Abrupted)
+				{
 					SetOperation(OP_NONE);
+				}
 
-				if(s_Operation == OP_CLICK)
+				if(s_Operation == OP_CLICK && absolute(Ui()->MouseY() - s_InitialMouseY) > MinDragDistance)
 				{
-					if(absolute(UI()->MouseY() - s_InitialMouseY) > 5)
-						StartDragGroup = true;
-
-					s_pDraggedButton = &m_Map.m_vpGroups[g];
+					StartDragGroup = true;
+					s_pDraggedButton = m_Map.m_vpGroups[g].get();
 				}
 
 				if(s_Operation == OP_CLICK && Clicked)
@@ -3895,10 +3978,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 					if(Result == 2)
 					{
 						static SPopupMenuId s_PopupGroupId;
-						UI()->DoPopupMenu(&s_PopupGroupId, UI()->MouseX(), UI()->MouseY(), 145, 256, this, PopupGroup);
+						Ui()->DoPopupMenu(&s_PopupGroupId, Ui()->MouseX(), Ui()->MouseY(), 145, 256, this, PopupGroup);
 					}
 
-					if(!m_Map.m_vpGroups[g]->m_vpLayers.empty() && Input()->MouseDoubleClick())
+					if(!m_Map.m_vpGroups[g]->m_vpLayers.empty() && Ui()->DoDoubleClickLogic(m_Map.m_vpGroups[g].get()))
 						m_Map.m_vpGroups[g]->m_Collapse ^= 1;
 
 					SetOperation(OP_NONE);
@@ -3907,7 +3990,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 				if(s_Operation == OP_GROUP_DRAG && Clicked)
 					MoveGroup = true;
 			}
-			else if(s_pDraggedButton == &m_Map.m_vpGroups[g])
+			else if(s_pDraggedButton == m_Map.m_vpGroups[g].get())
 			{
 				SetOperation(OP_NONE);
 			}
@@ -3943,7 +4026,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 				}
 				else
 				{
-					if(!DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight / 2)
+					if(!DraggedPositionFound && Ui()->MouseY() < LayersBox.y + RowHeight / 2)
 					{
 						DraggedPositionFound = true;
 						GroupAfterDraggedLayer = g + 1;
@@ -3972,24 +4055,58 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 			Slot.VSplitLeft(12.0f, nullptr, &Slot);
 			Slot.VSplitLeft(15.0f, &VisibleToggle, &Button);
 
-			if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, 0, &VisibleToggle, 0, "Toggle layer visibility", IGraphics::CORNER_L, 8.0f))
+			const int MouseClick = DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, 0, &VisibleToggle, 0, "Left click to toggle visibility. Right click to show only this layer within its group.", IGraphics::CORNER_L, 8.0f);
+			if(MouseClick == 1)
+			{
 				m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible = !m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible;
-
-			if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName[0])
-				str_copy(aBuf, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName);
-			else
+			}
+			else if(MouseClick == 2)
 			{
-				if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_TILES)
-				{
-					std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
-					str_copy(aBuf, pTiles->m_Image >= 0 ? m_Map.m_vpImages[pTiles->m_Image]->m_aName : "Tiles");
-				}
-				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_QUADS)
+				if(Input()->ShiftIsPressed())
 				{
-					std::shared_ptr<CLayerQuads> pQuads = std::static_pointer_cast<CLayerQuads>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
-					str_copy(aBuf, pQuads->m_Image >= 0 ? m_Map.m_vpImages[pQuads->m_Image]->m_aName : "Quads");
+					if(!IsLayerSelected)
+						SelectLayer(i, g);
 				}
-				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_SOUNDS)
+
+				int NumActive = 0;
+				for(auto &Layer : m_Map.m_vpGroups[g]->m_vpLayers)
+				{
+					if(Layer == m_Map.m_vpGroups[g]->m_vpLayers[i])
+					{
+						Layer->m_Visible = true;
+						continue;
+					}
+
+					if(Layer->m_Visible)
+					{
+						Layer->m_Visible = false;
+						NumActive++;
+					}
+				}
+				if(NumActive == 0)
+				{
+					for(auto &Layer : m_Map.m_vpGroups[g]->m_vpLayers)
+					{
+						Layer->m_Visible = true;
+					}
+				}
+			}
+
+			if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName[0])
+				str_copy(aBuf, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName);
+			else
+			{
+				if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_TILES)
+				{
+					std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
+					str_copy(aBuf, pTiles->m_Image >= 0 ? m_Map.m_vpImages[pTiles->m_Image]->m_aName : "Tiles");
+				}
+				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_QUADS)
+				{
+					std::shared_ptr<CLayerQuads> pQuads = std::static_pointer_cast<CLayerQuads>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
+					str_copy(aBuf, pQuads->m_Image >= 0 ? m_Map.m_vpImages[pQuads->m_Image]->m_aName : "Quads");
+				}
+				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_SOUNDS)
 				{
 					std::shared_ptr<CLayerSounds> pSounds = std::static_pointer_cast<CLayerSounds>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
 					str_copy(aBuf, pSounds->m_Sound >= 0 ? m_Map.m_vpSounds[pSounds->m_Sound]->m_aName : "Sounds");
@@ -4007,12 +4124,11 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 			if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g]->m_vpLayers[i].get(), aBuf, Checked, &Button, &Clicked, &Abrupted,
 				   BUTTON_CONTEXT, "Select layer. Shift click to select multiple.", IGraphics::CORNER_R))
 			{
-				AnyButtonActive = true;
-
 				if(s_Operation == OP_NONE)
 				{
-					s_InitialMouseY = UI()->MouseY();
+					s_InitialMouseY = Ui()->MouseY();
 					s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y;
+
 					SetOperation(OP_CLICK);
 
 					if(!Input()->ShiftIsPressed() && !IsLayerSelected)
@@ -4022,23 +4138,22 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 				}
 
 				if(Abrupted)
+				{
 					SetOperation(OP_NONE);
+				}
 
-				if(s_Operation == OP_CLICK)
+				if(s_Operation == OP_CLICK && absolute(Ui()->MouseY() - s_InitialMouseY) > MinDragDistance)
 				{
-					if(absolute(UI()->MouseY() - s_InitialMouseY) > 5)
+					bool EntitiesLayerSelected = false;
+					for(int k : m_vSelectedLayers)
 					{
-						bool EntitiesLayerSelected = false;
-						for(int k : m_vSelectedLayers)
-						{
-							if(m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers[k]->IsEntitiesLayer())
-								EntitiesLayerSelected = true;
-						}
-
-						if(!EntitiesLayerSelected)
-							StartDragLayer = true;
+						if(m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers[k]->IsEntitiesLayer())
+							EntitiesLayerSelected = true;
 					}
 
+					if(!EntitiesLayerSelected)
+						StartDragLayer = true;
+
 					s_pDraggedButton = m_Map.m_vpGroups[g]->m_vpLayers[i].get();
 				}
 
@@ -4063,6 +4178,9 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 					}
 					else if(Result == 2)
 					{
+						s_LayerPopupContext.m_vpLayers.clear();
+						s_LayerPopupContext.m_vLayerIndices.clear();
+
 						if(!IsLayerSelected)
 						{
 							SelectLayer(i, g);
@@ -4090,13 +4208,8 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 								s_LayerPopupContext.m_vLayerIndices.clear();
 							}
 						}
-						else
-						{
-							s_LayerPopupContext.m_vpLayers.clear();
-							s_LayerPopupContext.m_vLayerIndices.clear();
-						}
 
-						UI()->DoPopupMenu(&s_LayerPopupContext, UI()->MouseX(), UI()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer);
+						Ui()->DoPopupMenu(&s_LayerPopupContext, Ui()->MouseX(), Ui()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer);
 					}
 
 					SetOperation(OP_NONE);
@@ -4199,7 +4312,9 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 	static std::vector<int> s_vInitialLayerIndices;
 
 	if(MoveLayers || MoveGroup)
+	{
 		SetOperation(OP_NONE);
+	}
 	if(StartDragLayer)
 	{
 		SetOperation(OP_LAYER_DRAG);
@@ -4214,11 +4329,18 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 
 	if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
 	{
-		s_ScrollRegion.DoEdgeScrolling();
-		UI()->SetActiveItem(s_pDraggedButton);
+		if(s_pDraggedButton == nullptr)
+		{
+			SetOperation(OP_NONE);
+		}
+		else
+		{
+			s_ScrollRegion.DoEdgeScrolling();
+			Ui()->SetActiveItem(s_pDraggedButton);
+		}
 	}
 
-	if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
+	if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE && !Ui()->IsPopupOpen() && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
 	{
 		if(Input()->ShiftIsPressed())
 		{
@@ -4227,30 +4349,11 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		}
 		else
 		{
-			int CurrentLayer = 0;
-			for(const auto &Selected : m_vSelectedLayers)
-				CurrentLayer = maximum(Selected, CurrentLayer);
-			SelectLayer(CurrentLayer);
-
-			if(m_vSelectedLayers[0] < (int)m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1)
-			{
-				SelectLayer(m_vSelectedLayers[0] + 1);
-			}
-			else
-			{
-				for(size_t Group = m_SelectedGroup + 1; Group < m_Map.m_vpGroups.size(); Group++)
-				{
-					if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
-					{
-						SelectLayer(0, Group);
-						break;
-					}
-				}
-			}
+			SelectNextLayer();
 		}
 		s_ScrollToSelectionNext = true;
 	}
-	if(Input()->KeyPress(KEY_UP) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
+	if(Input()->KeyPress(KEY_UP) && m_Dialog == DIALOG_NONE && !Ui()->IsPopupOpen() && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
 	{
 		if(Input()->ShiftIsPressed())
 		{
@@ -4259,48 +4362,53 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 		}
 		else
 		{
-			int CurrentLayer = std::numeric_limits<int>::max();
-			for(const auto &Selected : m_vSelectedLayers)
-				CurrentLayer = minimum(Selected, CurrentLayer);
-			SelectLayer(CurrentLayer);
-
-			if(m_vSelectedLayers[0] > 0)
-			{
-				SelectLayer(m_vSelectedLayers[0] - 1);
-			}
-			else
-			{
-				for(int Group = m_SelectedGroup - 1; Group >= 0; Group--)
-				{
-					if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
-					{
-						SelectLayer(m_Map.m_vpGroups[Group]->m_vpLayers.size() - 1, Group);
-						break;
-					}
-				}
-			}
+			SelectPreviousLayer();
 		}
+
 		s_ScrollToSelectionNext = true;
 	}
 
-	CUIRect AddGroupButton;
+	CUIRect AddGroupButton, CollapseAllButton;
 	LayersBox.HSplitTop(RowHeight + 1.0f, &AddGroupButton, &LayersBox);
 	if(s_ScrollRegion.AddRect(AddGroupButton))
 	{
 		AddGroupButton.HSplitTop(RowHeight, &AddGroupButton, 0);
-		static int s_AddGroupButton = 0;
-		if(DoButton_Editor(&s_AddGroupButton, "Add group", 0, &AddGroupButton, IGraphics::CORNER_R, "Adds a new group"))
+		if(DoButton_Editor(&m_QuickActionAddGroup, m_QuickActionAddGroup.Label(), 0, &AddGroupButton, IGraphics::CORNER_R, m_QuickActionAddGroup.Description()))
 		{
-			m_Map.NewGroup();
-			m_SelectedGroup = m_Map.m_vpGroups.size() - 1;
-			m_EditorHistory.RecordAction(std::make_shared<CEditorActionGroup>(this, m_SelectedGroup, false));
+			m_QuickActionAddGroup.Call();
 		}
 	}
 
-	s_ScrollRegion.End();
+	LayersBox.HSplitTop(5.0f, nullptr, &LayersBox);
+	LayersBox.HSplitTop(RowHeight + 1.0f, &CollapseAllButton, &LayersBox);
+	if(s_ScrollRegion.AddRect(CollapseAllButton))
+	{
+		unsigned long TotalCollapsed = 0;
+		for(const auto &pGroup : m_Map.m_vpGroups)
+		{
+			if(pGroup->m_Collapse)
+			{
+				TotalCollapsed++;
+			}
+		}
 
-	if(!AnyButtonActive)
-		SetOperation(OP_NONE);
+		const char *pActionText = TotalCollapsed == m_Map.m_vpGroups.size() ? "Expand all" : "Collapse all";
+
+		CollapseAllButton.HSplitTop(RowHeight, &CollapseAllButton, 0);
+		static int s_CollapseAllButton = 0;
+		if(DoButton_Editor(&s_CollapseAllButton, pActionText, 0, &CollapseAllButton, IGraphics::CORNER_R, "Expand or collapse all groups"))
+		{
+			for(const auto &pGroup : m_Map.m_vpGroups)
+			{
+				if(TotalCollapsed == m_Map.m_vpGroups.size())
+					pGroup->m_Collapse = false;
+				else
+					pGroup->m_Collapse = true;
+			}
+		}
+	}
+
+	s_ScrollRegion.End();
 
 	if(s_Operation == OP_NONE)
 	{
@@ -4318,79 +4426,21 @@ void CEditor::RenderLayers(CUIRect LayersBox)
 			else
 			{
 				std::vector<std::shared_ptr<IEditorAction>> vpActions;
-				for(int k = 0; k < (int)m_vSelectedLayers.size(); k++)
+				std::vector<int> vLayerIndices = m_vSelectedLayers;
+				std::sort(vLayerIndices.begin(), vLayerIndices.end());
+				std::sort(s_vInitialLayerIndices.begin(), s_vInitialLayerIndices.end());
+				for(int k = 0; k < (int)vLayerIndices.size(); k++)
 				{
-					int LayerIndex = m_vSelectedLayers[k];
+					int LayerIndex = vLayerIndices[k];
 					vpActions.push_back(std::make_shared<CEditorActionEditLayerProp>(this, m_SelectedGroup, LayerIndex, ELayerProp::PROP_ORDER, s_vInitialLayerIndices[k], LayerIndex));
 				}
-				m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(CEditorActionBulk(this, vpActions)));
+				m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(this, vpActions, nullptr, true));
 			}
 			s_PreviousOperation = OP_NONE;
 		}
 	}
 }
 
-bool CEditor::SelectLayerByTile()
-{
-	// ctrl+rightclick a map index to select the layer that has a tile there
-	static bool s_CtrlClick = false;
-	static int s_Selected = 0;
-	int MatchedGroup = -1;
-	int MatchedLayer = -1;
-	int Matches = 0;
-	bool IsFound = false;
-	if(UI()->MouseButton(1) && Input()->ModifierIsPressed())
-	{
-		if(s_CtrlClick)
-			return false;
-		s_CtrlClick = true;
-		for(size_t g = 0; g < m_Map.m_vpGroups.size(); g++)
-		{
-			for(size_t l = 0; l < m_Map.m_vpGroups[g]->m_vpLayers.size(); l++)
-			{
-				if(IsFound)
-					continue;
-				if(m_Map.m_vpGroups[g]->m_vpLayers[l]->m_Type != LAYERTYPE_TILES)
-					continue;
-
-				std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[g]->m_vpLayers[l]);
-				int x = (int)UI()->MouseWorldX() / 32 + m_Map.m_vpGroups[g]->m_OffsetX;
-				int y = (int)UI()->MouseWorldY() / 32 + m_Map.m_vpGroups[g]->m_OffsetY;
-				if(x < 0 || x >= pTiles->m_Width)
-					continue;
-				if(y < 0 || y >= pTiles->m_Height)
-					continue;
-				CTile Tile = pTiles->GetTile(x, y);
-				if(Tile.m_Index)
-				{
-					if(MatchedGroup == -1)
-					{
-						MatchedGroup = g;
-						MatchedLayer = l;
-					}
-					if(++Matches > s_Selected)
-					{
-						s_Selected++;
-						MatchedGroup = g;
-						MatchedLayer = l;
-						IsFound = true;
-					}
-				}
-			}
-		}
-		if(MatchedGroup != -1 && MatchedLayer != -1)
-		{
-			if(!IsFound)
-				s_Selected = 1;
-			SelectLayer(MatchedLayer, MatchedGroup);
-			return true;
-		}
-	}
-	else
-		s_CtrlClick = false;
-	return false;
-}
-
 bool CEditor::ReplaceImage(const char *pFileName, int StorageType, bool CheckDuplicate)
 {
 	// check if we have that image already
@@ -4408,8 +4458,8 @@ bool CEditor::ReplaceImage(const char *pFileName, int StorageType, bool CheckDup
 		}
 	}
 
-	CEditorImage ImgInfo(this);
-	if(!Graphics()->LoadPNG(&ImgInfo, pFileName, StorageType))
+	CImageInfo ImgInfo;
+	if(!Graphics()->LoadPng(ImgInfo, pFileName, StorageType))
 	{
 		ShowFileDialogError("Failed to load image from file '%s'.", pFileName);
 		return false;
@@ -4417,23 +4467,26 @@ bool CEditor::ReplaceImage(const char *pFileName, int StorageType, bool CheckDup
 
 	std::shared_ptr<CEditorImage> pImg = m_Map.m_vpImages[m_SelectedImage];
 	Graphics()->UnloadTexture(&(pImg->m_Texture));
-	free(pImg->m_pData);
-	pImg->m_pData = nullptr;
-	*pImg = ImgInfo;
+	pImg->Free();
+	pImg->m_Width = ImgInfo.m_Width;
+	pImg->m_Height = ImgInfo.m_Height;
+	pImg->m_Format = ImgInfo.m_Format;
+	pImg->m_pData = ImgInfo.m_pData;
 	str_copy(pImg->m_aName, aBuf);
 	pImg->m_External = IsVanillaImage(pImg->m_aName);
 
-	if(!pImg->m_External && g_Config.m_ClEditorDilate == 1 && pImg->m_Format == CImageInfo::FORMAT_RGBA)
+	ConvertToRgba(*pImg);
+	if(g_Config.m_ClEditorDilate == 1)
 	{
-		DilateImage((unsigned char *)ImgInfo.m_pData, ImgInfo.m_Width, ImgInfo.m_Height);
+		DilateImage(*pImg);
 	}
 
 	pImg->m_AutoMapper.Load(pImg->m_aName);
 	int TextureLoadFlag = Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
-	if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+	if(pImg->m_Width % 16 != 0 || pImg->m_Height % 16 != 0)
 		TextureLoadFlag = 0;
-	pImg->m_Texture = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, pFileName);
-	ImgInfo.m_pData = nullptr;
+	pImg->m_Texture = Graphics()->LoadTextureRaw(*pImg, TextureLoadFlag, pFileName);
+
 	SortImages();
 	for(size_t i = 0; i < m_Map.m_vpImages.size(); ++i)
 	{
@@ -4472,27 +4525,30 @@ bool CEditor::AddImage(const char *pFileName, int StorageType, void *pUser)
 		return false;
 	}
 
-	CEditorImage ImgInfo(pEditor);
-	if(!pEditor->Graphics()->LoadPNG(&ImgInfo, pFileName, StorageType))
+	CImageInfo ImgInfo;
+	if(!pEditor->Graphics()->LoadPng(ImgInfo, pFileName, StorageType))
 	{
 		pEditor->ShowFileDialogError("Failed to load image from file '%s'.", pFileName);
 		return false;
 	}
 
 	std::shared_ptr<CEditorImage> pImg = std::make_shared<CEditorImage>(pEditor);
-	*pImg = ImgInfo;
+	pImg->m_Width = ImgInfo.m_Width;
+	pImg->m_Height = ImgInfo.m_Height;
+	pImg->m_Format = ImgInfo.m_Format;
+	pImg->m_pData = ImgInfo.m_pData;
 	pImg->m_External = IsVanillaImage(aBuf);
 
-	if(!pImg->m_External && g_Config.m_ClEditorDilate == 1 && pImg->m_Format == CImageInfo::FORMAT_RGBA)
+	ConvertToRgba(*pImg);
+	if(g_Config.m_ClEditorDilate == 1)
 	{
-		DilateImage((unsigned char *)ImgInfo.m_pData, ImgInfo.m_Width, ImgInfo.m_Height);
+		DilateImage(*pImg);
 	}
 
 	int TextureLoadFlag = pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
-	if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+	if(pImg->m_Width % 16 != 0 || pImg->m_Height % 16 != 0)
 		TextureLoadFlag = 0;
-	pImg->m_Texture = pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, pFileName);
-	ImgInfo.m_pData = nullptr;
+	pImg->m_Texture = pEditor->Graphics()->LoadTextureRaw(*pImg, TextureLoadFlag, pFileName);
 	str_copy(pImg->m_aName, aBuf);
 	pImg->m_AutoMapper.Load(pImg->m_aName);
 	pEditor->m_Map.m_vpImages.push_back(pImg);
@@ -4553,7 +4609,7 @@ bool CEditor::AddSound(const char *pFileName, int StorageType, void *pUser)
 
 	// add sound
 	std::shared_ptr<CEditorSound> pSound = std::make_shared<CEditorSound>(pEditor);
-	pSound->m_SoundID = SoundId;
+	pSound->m_SoundId = SoundId;
 	pSound->m_DataSize = DataSize;
 	pSound->m_pData = pData;
 	str_copy(pSound->m_aName, aBuf);
@@ -4612,12 +4668,12 @@ bool CEditor::ReplaceSound(const char *pFileName, int StorageType, bool CheckDup
 	std::shared_ptr<CEditorSound> pSound = m_Map.m_vpSounds[m_SelectedSound];
 
 	// unload sample
-	Sound()->UnloadSample(pSound->m_SoundID);
+	Sound()->UnloadSample(pSound->m_SoundId);
 	free(pSound->m_pData);
 
 	// replace sound
 	str_copy(pSound->m_aName, aBuf);
-	pSound->m_SoundID = SoundId;
+	pSound->m_SoundId = SoundId;
 	pSound->m_pData = pData;
 	pSound->m_DataSize = DataSize;
 
@@ -4753,7 +4809,7 @@ void CEditor::RenderImagesList(CUIRect ToolBox)
 		CUIRect Slot;
 		ToolBox.HSplitTop(RowHeight + 3.0f, &Slot, &ToolBox);
 		if(s_ScrollRegion.AddRect(Slot))
-			UI()->DoLabel(&Slot, e == 0 ? "Embedded" : "External", 12.0f, TEXTALIGN_MC);
+			Ui()->DoLabel(&Slot, e == 0 ? "Embedded" : "External", 12.0f, TEXTALIGN_MC);
 
 		for(int i = 0; i < (int)m_Map.m_vpImages.size(); i++)
 		{
@@ -4798,9 +4854,9 @@ void CEditor::RenderImagesList(CUIRect ToolBox)
 				if(Result == 2)
 				{
 					const std::shared_ptr<CEditorImage> pImg = m_Map.m_vpImages[m_SelectedImage];
-					const int Height = !pImg->m_External && IsVanillaImage(pImg->m_aName) ? 107 : (pImg->m_External ? 73 : 90);
+					const int Height = pImg->m_External ? 73 : 107;
 					static SPopupMenuId s_PopupImageId;
-					UI()->DoPopupMenu(&s_PopupImageId, UI()->MouseX(), UI()->MouseY(), 140, Height, this, PopupImage);
+					Ui()->DoPopupMenu(&s_PopupImageId, Ui()->MouseX(), Ui()->MouseY(), 140, Height, this, PopupImage);
 				}
 			}
 		}
@@ -4825,8 +4881,8 @@ void CEditor::RenderImagesList(CUIRect ToolBox)
 	{
 		AddImageButton.HSplitTop(5.0f, nullptr, &AddImageButton);
 		AddImageButton.HSplitTop(RowHeight, &AddImageButton, nullptr);
-		if(DoButton_Editor(&s_AddImageButton, "Add", 0, &AddImageButton, 0, "Load a new image to use in the map"))
-			InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Add Image", "Add", "mapres", false, AddImage, this);
+		if(DoButton_Editor(&s_AddImageButton, m_QuickActionAddImage.Label(), 0, &AddImageButton, 0, m_QuickActionAddImage.Description()))
+			m_QuickActionAddImage.Call();
 	}
 	s_ScrollRegion.End();
 }
@@ -4885,7 +4941,7 @@ void CEditor::RenderSounds(CUIRect ToolBox)
 	CUIRect Slot;
 	ToolBox.HSplitTop(RowHeight + 3.0f, &Slot, &ToolBox);
 	if(s_ScrollRegion.AddRect(Slot))
-		UI()->DoLabel(&Slot, "Embedded", 12.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&Slot, "Embedded", 12.0f, TEXTALIGN_MC);
 
 	for(int i = 0; i < (int)m_Map.m_vpSounds.size(); i++)
 	{
@@ -4914,7 +4970,7 @@ void CEditor::RenderSounds(CUIRect ToolBox)
 			if(Result == 2)
 			{
 				static SPopupMenuId s_PopupSoundId;
-				UI()->DoPopupMenu(&s_PopupSoundId, UI()->MouseX(), UI()->MouseY(), 140, 90, this, PopupSound);
+				Ui()->DoPopupMenu(&s_PopupSoundId, Ui()->MouseX(), Ui()->MouseY(), 140, 90, this, PopupSound);
 			}
 		}
 	}
@@ -4996,8 +5052,8 @@ void CEditor::SortFilteredFileList()
 void CEditor::RenderFileDialog()
 {
 	// GUI coordsys
-	UI()->MapScreen();
-	CUIRect View = *UI()->Screen();
+	Ui()->MapScreen();
+	CUIRect View = *Ui()->Screen();
 	CUIRect Preview = {0.0f, 0.0f, 0.0f, 0.0f};
 	float Width = View.w, Height = View.h;
 
@@ -5075,7 +5131,7 @@ void CEditor::RenderFileDialog()
 
 	Title.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 4.0f);
 	Title.VMargin(10.0f, &Title);
-	UI()->DoLabel(&Title, m_pFileDialogTitle, 12.0f, TEXTALIGN_ML);
+	Ui()->DoLabel(&Title, m_pFileDialogTitle, 12.0f, TEXTALIGN_ML);
 
 	// pathbox
 	if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType >= IStorage::TYPE_SAVE)
@@ -5083,7 +5139,7 @@ void CEditor::RenderFileDialog()
 		char aPath[IO_MAX_PATH_LENGTH], aBuf[128 + IO_MAX_PATH_LENGTH];
 		Storage()->GetCompletePath(m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType, m_pFileDialogPath, aPath, sizeof(aPath));
 		str_format(aBuf, sizeof(aBuf), "Current path: %s", aPath);
-		UI()->DoLabel(&PathBox, aBuf, 10.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&PathBox, aBuf, 10.0f, TEXTALIGN_ML);
 	}
 
 	const auto &&UpdateFileNameInput = [this]() {
@@ -5099,11 +5155,11 @@ void CEditor::RenderFileDialog()
 
 	// filebox
 	static CListBox s_ListBox;
-	s_ListBox.SetActive(!UI()->IsPopupOpen());
+	s_ListBox.SetActive(!Ui()->IsPopupOpen());
 
 	if(m_FileDialogStorageType == IStorage::TYPE_SAVE)
 	{
-		UI()->DoLabel(&FileBoxLabel, "Filename:", 10.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&FileBoxLabel, "Filename:", 10.0f, TEXTALIGN_ML);
 		if(DoEditBox(&m_FileDialogFileNameInput, &FileBox, 10.0f))
 		{
 			// remove '/' and '\'
@@ -5132,18 +5188,18 @@ void CEditor::RenderFileDialog()
 		}
 
 		if(m_FileDialogOpening)
-			UI()->SetActiveItem(&m_FileDialogFileNameInput);
+			Ui()->SetActiveItem(&m_FileDialogFileNameInput);
 	}
 	else
 	{
 		// render search bar
-		UI()->DoLabel(&FileBoxLabel, "Search:", 10.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&FileBoxLabel, "Search:", 10.0f, TEXTALIGN_ML);
 		if(m_FileDialogOpening || (Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed()))
 		{
-			UI()->SetActiveItem(&m_FileDialogFilterInput);
+			Ui()->SetActiveItem(&m_FileDialogFilterInput);
 			m_FileDialogFilterInput.SelectAll();
 		}
-		if(UI()->DoClearableEditBox(&m_FileDialogFilterInput, &FileBox, 10.0f))
+		if(Ui()->DoClearableEditBox(&m_FileDialogFilterInput, &FileBox, 10.0f))
 		{
 			RefreshFilteredFileList();
 			if(m_vpFilteredFileList.empty())
@@ -5188,11 +5244,13 @@ void CEditor::RenderFileDialog()
 			{
 				char aBuffer[IO_MAX_PATH_LENGTH];
 				str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
-				if(Graphics()->LoadPNG(&m_FilePreviewImageInfo, aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType))
+				CImageInfo PreviewImageInfo;
+				if(Graphics()->LoadPng(PreviewImageInfo, aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType))
 				{
 					Graphics()->UnloadTexture(&m_FilePreviewImage);
-					m_FilePreviewImage = Graphics()->LoadTextureRaw(m_FilePreviewImageInfo.m_Width, m_FilePreviewImageInfo.m_Height, m_FilePreviewImageInfo.m_Format, m_FilePreviewImageInfo.m_pData, 0);
-					Graphics()->FreePNG(&m_FilePreviewImageInfo);
+					m_FilePreviewImageWidth = PreviewImageInfo.m_Width;
+					m_FilePreviewImageHeight = PreviewImageInfo.m_Height;
+					m_FilePreviewImage = Graphics()->LoadTextureRawMove(PreviewImageInfo, 0, aBuffer);
 					m_FilePreviewState = PREVIEW_LOADED;
 				}
 				else
@@ -5215,11 +5273,11 @@ void CEditor::RenderFileDialog()
 			Preview.Margin(10.0f, &Preview);
 			if(m_FilePreviewState == PREVIEW_LOADED)
 			{
-				int w = m_FilePreviewImageInfo.m_Width;
-				int h = m_FilePreviewImageInfo.m_Height;
-				if(m_FilePreviewImageInfo.m_Width > Preview.w)
+				int w = m_FilePreviewImageWidth;
+				int h = m_FilePreviewImageHeight;
+				if(m_FilePreviewImageWidth > Preview.w)
 				{
-					h = m_FilePreviewImageInfo.m_Height * Preview.w / m_FilePreviewImageInfo.m_Width;
+					h = m_FilePreviewImageHeight * Preview.w / m_FilePreviewImageWidth;
 					w = Preview.w;
 				}
 				if(h > Preview.h)
@@ -5239,7 +5297,7 @@ void CEditor::RenderFileDialog()
 			{
 				SLabelProperties Props;
 				Props.m_MaxWidth = Preview.w;
-				UI()->DoLabel(&Preview, "Failed to load the image (check the local console for details).", 12.0f, TEXTALIGN_TL, Props);
+				Ui()->DoLabel(&Preview, "Failed to load the image (check the local console for details).", 12.0f, TEXTALIGN_TL, Props);
 			}
 		}
 		else if(m_FileDialogFileType == CEditor::FILETYPE_SOUND)
@@ -5257,7 +5315,7 @@ void CEditor::RenderFileDialog()
 			{
 				SLabelProperties Props;
 				Props.m_MaxWidth = Preview.w;
-				UI()->DoLabel(&Preview, "Failed to load the sound (check the local console for details). Make sure you enabled sounds in the settings.", 12.0f, TEXTALIGN_TL, Props);
+				Ui()->DoLabel(&Preview, "Failed to load the sound (check the local console for details). Make sure you enabled sounds in the settings.", 12.0f, TEXTALIGN_TL, Props);
 			}
 		}
 	}
@@ -5304,20 +5362,20 @@ void CEditor::RenderFileDialog()
 
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
-		UI()->DoLabel(&FileIcon, pIconType, 12.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&FileIcon, pIconType, 12.0f, TEXTALIGN_ML);
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 
 		SLabelProperties Props;
 		Props.m_MaxWidth = Button.w;
 		Props.m_EllipsisAtEnd = true;
-		UI()->DoLabel(&Button, m_vpFilteredFileList[i]->m_aName, 10.0f, TEXTALIGN_ML, Props);
+		Ui()->DoLabel(&Button, m_vpFilteredFileList[i]->m_aName, 10.0f, TEXTALIGN_ML, Props);
 
 		if(!m_vpFilteredFileList[i]->m_IsLink && str_comp(m_vpFilteredFileList[i]->m_aFilename, "..") != 0)
 		{
 			char aBufTimeModified[64];
 			str_timestamp_ex(m_vpFilteredFileList[i]->m_TimeModified, aBufTimeModified, sizeof(aBufTimeModified), "%d.%m.%Y %H:%M");
-			UI()->DoLabel(&TimeModified, aBufTimeModified, 10.0f, TEXTALIGN_MR);
+			Ui()->DoLabel(&TimeModified, aBufTimeModified, 10.0f, TEXTALIGN_MR);
 		}
 	}
 
@@ -5346,12 +5404,12 @@ void CEditor::RenderFileDialog()
 	CUIRect Button;
 	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
 	const bool IsDir = m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsDir;
-	if(DoButton_Editor(&s_OkButton, IsDir ? "Open" : m_pFileDialogButtonText, 0, &Button, 0, nullptr) || s_ListBox.WasItemActivated() || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	if(DoButton_Editor(&s_OkButton, IsDir ? "Open" : m_pFileDialogButtonText, 0, &Button, 0, nullptr) || s_ListBox.WasItemActivated() || (s_ListBox.Active() && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 	{
 		if(IsDir) // folder
 		{
 			m_FileDialogFilterInput.Clear();
-			UI()->SetActiveItem(&m_FileDialogFilterInput);
+			Ui()->SetActiveItem(&m_FileDialogFilterInput);
 			const bool ParentFolder = str_comp(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, "..") == 0;
 			if(ParentFolder) // parent folder
 			{
@@ -5425,7 +5483,7 @@ void CEditor::RenderFileDialog()
 
 	ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
 	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
-	if(DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr) || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)))
+	if(DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr) || (s_ListBox.Active() && Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE)))
 	{
 		OnDialogClose();
 		m_Dialog = DIALOG_NONE;
@@ -5444,7 +5502,7 @@ void CEditor::RenderFileDialog()
 		{
 			char aOpenPath[IO_MAX_PATH_LENGTH];
 			Storage()->GetCompletePath(m_FilesSelectedIndex >= 0 ? m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType : IStorage::TYPE_SAVE, m_pFileDialogPath, aOpenPath, sizeof(aOpenPath));
-			if(!open_file(aOpenPath))
+			if(!Client()->ViewFile(aOpenPath))
 			{
 				ShowFileDialogError("Failed to open the directory '%s'.", aOpenPath);
 			}
@@ -5453,17 +5511,17 @@ void CEditor::RenderFileDialog()
 
 	ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
 	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
-	static CUI::SConfirmPopupContext s_ConfirmDeletePopupContext;
+	static CUi::SConfirmPopupContext s_ConfirmDeletePopupContext;
 	if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType == IStorage::TYPE_SAVE && !m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsLink && str_comp(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, "..") != 0)
 	{
-		if(DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, nullptr) || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
+		if(DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, nullptr) || (s_ListBox.Active() && Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE)))
 		{
 			s_ConfirmDeletePopupContext.Reset();
 			s_ConfirmDeletePopupContext.YesNoButtons();
 			str_format(s_ConfirmDeletePopupContext.m_aMessage, sizeof(s_ConfirmDeletePopupContext.m_aMessage), "Are you sure that you want to delete the %s '%s/%s'?", IsDir ? "folder" : "file", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
-			UI()->ShowPopupConfirm(UI()->MouseX(), UI()->MouseY(), &s_ConfirmDeletePopupContext);
+			Ui()->ShowPopupConfirm(Ui()->MouseX(), Ui()->MouseY(), &s_ConfirmDeletePopupContext);
 		}
-		if(s_ConfirmDeletePopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+		if(s_ConfirmDeletePopupContext.m_Result == CUi::SConfirmPopupContext::CONFIRMED)
 		{
 			char aDeleteFilePath[IO_MAX_PATH_LENGTH];
 			str_format(aDeleteFilePath, sizeof(aDeleteFilePath), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
@@ -5483,7 +5541,7 @@ void CEditor::RenderFileDialog()
 			}
 			UpdateFileNameInput();
 		}
-		if(s_ConfirmDeletePopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+		if(s_ConfirmDeletePopupContext.m_Result != CUi::SConfirmPopupContext::UNSET)
 			s_ConfirmDeletePopupContext.Reset();
 	}
 	else
@@ -5498,8 +5556,8 @@ void CEditor::RenderFileDialog()
 			static SPopupMenuId s_PopupNewFolderId;
 			constexpr float PopupWidth = 400.0f;
 			constexpr float PopupHeight = 110.0f;
-			UI()->DoPopupMenu(&s_PopupNewFolderId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupNewFolder);
-			UI()->SetActiveItem(&m_FileDialogNewFolderNameInput);
+			Ui()->DoPopupMenu(&s_PopupNewFolderId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupNewFolder);
+			Ui()->SetActiveItem(&m_FileDialogNewFolderNameInput);
 		}
 	}
 }
@@ -5637,7 +5695,7 @@ void CEditor::InvokeFileDialog(int StorageType, int FileType, const char *pTitle
 		m_FileDialogMultipleStorages = false;
 	}
 
-	UI()->ClosePopupMenus();
+	Ui()->ClosePopupMenus();
 	m_pFileDialogTitle = pTitle;
 	m_pFileDialogButtonText = pButtonText;
 	m_pfnFileDialogFunc = pfnFunc;
@@ -5676,20 +5734,20 @@ void CEditor::ShowFileDialogError(const char *pFormat, ...)
 	va_end(VarArgs);
 
 	auto ContextIterator = m_PopupMessageContexts.find(aMessage);
-	CUI::SMessagePopupContext *pContext;
+	CUi::SMessagePopupContext *pContext;
 	if(ContextIterator != m_PopupMessageContexts.end())
 	{
 		pContext = ContextIterator->second;
-		UI()->ClosePopupMenu(pContext);
+		Ui()->ClosePopupMenu(pContext);
 	}
 	else
 	{
-		pContext = new CUI::SMessagePopupContext();
+		pContext = new CUi::SMessagePopupContext();
 		pContext->ErrorColor();
 		str_copy(pContext->m_aMessage, aMessage);
 		m_PopupMessageContexts[pContext->m_aMessage] = pContext;
 	}
-	UI()->ShowPopupMessage(UI()->MouseX(), UI()->MouseY(), pContext);
+	Ui()->ShowPopupMessage(Ui()->MouseX(), Ui()->MouseY(), pContext);
 }
 
 void CEditor::RenderModebar(CUIRect View)
@@ -5698,7 +5756,9 @@ void CEditor::RenderModebar(CUIRect View)
 	View.HSplitTop(12.0f, &Mentions, &View);
 	View.HSplitTop(12.0f, &IngameMoved, &View);
 	View.HSplitTop(8.0f, nullptr, &ModeButtons);
-	ModeButtons.VSplitLeft(96.0f, &ModeButtons, nullptr);
+	const float Width = m_ToolBoxWidth - 5.0f;
+	ModeButtons.VSplitLeft(Width, &ModeButtons, nullptr);
+	const float ButtonWidth = Width / 3;
 
 	// mentions
 	if(m_Mentions)
@@ -5712,7 +5772,7 @@ void CEditor::RenderModebar(CUIRect View)
 			str_copy(aBuf, Localize("9+ new mentions"));
 
 		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
-		UI()->DoLabel(&Mentions, aBuf, 10.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&Mentions, aBuf, 10.0f, TEXTALIGN_MC);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	}
 
@@ -5720,27 +5780,27 @@ void CEditor::RenderModebar(CUIRect View)
 	if(m_IngameMoved)
 	{
 		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
-		UI()->DoLabel(&IngameMoved, Localize("Moved ingame"), 10.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&IngameMoved, Localize("Moved ingame"), 10.0f, TEXTALIGN_MC);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	}
 
 	// mode buttons
 	{
-		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		ModeButtons.VSplitLeft(ButtonWidth, &ModeButton, &ModeButtons);
 		static int s_LayersButton = 0;
 		if(DoButton_FontIcon(&s_LayersButton, FONT_ICON_LAYER_GROUP, m_Mode == MODE_LAYERS, &ModeButton, 0, "Go to layers management.", IGraphics::CORNER_L))
 		{
 			m_Mode = MODE_LAYERS;
 		}
 
-		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		ModeButtons.VSplitLeft(ButtonWidth, &ModeButton, &ModeButtons);
 		static int s_ImagesButton = 0;
 		if(DoButton_FontIcon(&s_ImagesButton, FONT_ICON_IMAGE, m_Mode == MODE_IMAGES, &ModeButton, 0, "Go to images management.", IGraphics::CORNER_NONE))
 		{
 			m_Mode = MODE_IMAGES;
 		}
 
-		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		ModeButtons.VSplitLeft(ButtonWidth, &ModeButton, &ModeButtons);
 		static int s_SoundsButton = 0;
 		if(DoButton_FontIcon(&s_SoundsButton, FONT_ICON_MUSIC, m_Mode == MODE_SOUNDS, &ModeButton, 0, "Go to sounds management.", IGraphics::CORNER_R))
 		{
@@ -5760,30 +5820,25 @@ void CEditor::RenderModebar(CUIRect View)
 
 void CEditor::RenderStatusbar(CUIRect View, CUIRect *pTooltipRect)
 {
-	const bool ButtonsDisabled = m_ShowPicker;
-
 	CUIRect Button;
 	View.VSplitRight(100.0f, &View, &Button);
-	static int s_EnvelopeButton = 0;
-	if(DoButton_Editor(&s_EnvelopeButton, "Envelopes", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES, &Button, 0, "Toggles the envelope editor.") == 1)
+	if(DoButton_Editor(&m_QuickActionEnvelopes, m_QuickActionEnvelopes.Label(), m_QuickActionEnvelopes.Color(), &Button, 0, m_QuickActionEnvelopes.Description()) == 1)
 	{
-		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES ? EXTRAEDITOR_NONE : EXTRAEDITOR_ENVELOPES;
+		m_QuickActionEnvelopes.Call();
 	}
 
 	View.VSplitRight(10.0f, &View, nullptr);
 	View.VSplitRight(100.0f, &View, &Button);
-	static int s_SettingsButton = 0;
-	if(DoButton_Editor(&s_SettingsButton, "Server settings", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS, &Button, 0, "Toggles the server settings editor.") == 1)
+	if(DoButton_Editor(&m_QuickActionServerSettings, m_QuickActionServerSettings.Label(), m_QuickActionServerSettings.Color(), &Button, 0, m_QuickActionServerSettings.Description()) == 1)
 	{
-		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS ? EXTRAEDITOR_NONE : EXTRAEDITOR_SERVER_SETTINGS;
+		m_QuickActionServerSettings.Call();
 	}
 
 	View.VSplitRight(10.0f, &View, nullptr);
 	View.VSplitRight(100.0f, &View, &Button);
-	static int s_HistoryButton = 0;
-	if(DoButton_Editor(&s_HistoryButton, "History", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_HISTORY, &Button, 0, "Toggles the editor history view.") == 1)
+	if(DoButton_Editor(&m_QuickActionHistory, m_QuickActionHistory.Label(), m_QuickActionHistory.Color(), &Button, 0, m_QuickActionHistory.Description()) == 1)
 	{
-		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_HISTORY ? EXTRAEDITOR_NONE : EXTRAEDITOR_HISTORY;
+		m_QuickActionHistory.Call();
 	}
 
 	View.VSplitRight(10.0f, pTooltipRect, nullptr);
@@ -5795,7 +5850,7 @@ void CEditor::RenderTooltip(CUIRect TooltipRect)
 		return;
 
 	char aBuf[256];
-	if(ms_pUiGotContext && ms_pUiGotContext == UI()->HotItem())
+	if(ms_pUiGotContext && ms_pUiGotContext == Ui()->HotItem())
 		str_format(aBuf, sizeof(aBuf), "%s Right click for context menu.", m_aTooltip);
 	else
 		str_copy(aBuf, m_aTooltip);
@@ -5803,7 +5858,7 @@ void CEditor::RenderTooltip(CUIRect TooltipRect)
 	SLabelProperties Props;
 	Props.m_MaxWidth = TooltipRect.w;
 	Props.m_EllipsisAtEnd = true;
-	UI()->DoLabel(&TooltipRect, aBuf, 10.0f, TEXTALIGN_ML, Props);
+	Ui()->DoLabel(&TooltipRect, aBuf, 10.0f, TEXTALIGN_ML, Props);
 }
 
 bool CEditor::IsEnvelopeUsed(int EnvelopeIndex) const
@@ -5847,6 +5902,8 @@ bool CEditor::IsEnvelopeUsed(int EnvelopeIndex) const
 
 void CEditor::RemoveUnusedEnvelopes()
 {
+	m_EnvelopeEditorHistory.BeginBulk();
+	int DeletedCount = 0;
 	for(size_t Envelope = 0; Envelope < m_Map.m_vpEnvelopes.size();)
 	{
 		if(IsEnvelopeUsed(Envelope))
@@ -5855,14 +5912,19 @@ void CEditor::RemoveUnusedEnvelopes()
 		}
 		else
 		{
+			m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEveloppeDelete>(this, Envelope));
 			m_Map.DeleteEnvelope(Envelope);
+			DeletedCount++;
 		}
 	}
+	char aDisplay[256];
+	str_format(aDisplay, sizeof(aDisplay), "Tool 'Remove unused envelopes': delete %d envelopes", DeletedCount);
+	m_EnvelopeEditorHistory.EndBulk(aDisplay);
 }
 
 void CEditor::ZoomAdaptOffsetX(float ZoomFactor, const CUIRect &View)
 {
-	float PosX = g_Config.m_EdZoomTarget ? (UI()->MouseX() - View.x) / View.w : 0.5f;
+	float PosX = g_Config.m_EdZoomTarget ? (Ui()->MouseX() - View.x) / View.w : 0.5f;
 	m_OffsetEnvelopeX = PosX - (PosX - m_OffsetEnvelopeX) * ZoomFactor;
 }
 
@@ -5875,7 +5937,7 @@ void CEditor::UpdateZoomEnvelopeX(const CUIRect &View)
 
 void CEditor::ZoomAdaptOffsetY(float ZoomFactor, const CUIRect &View)
 {
-	float PosY = g_Config.m_EdZoomTarget ? 1.0f - (UI()->MouseY() - View.y) / View.h : 0.5f;
+	float PosY = g_Config.m_EdZoomTarget ? 1.0f - (Ui()->MouseY() - View.y) / View.h : 0.5f;
 	m_OffsetEnvelopeY = PosY - (PosY - m_OffsetEnvelopeY) * ZoomFactor;
 }
 
@@ -5970,14 +6032,14 @@ float CEditor::EnvelopeToScreenY(const CUIRect &View, float y) const
 	return View.y + View.h - y / m_ZoomEnvelopeY.GetValue() * View.h - m_OffsetEnvelopeY * View.h;
 }
 
-float CEditor::ScreenToEnvelopeDX(const CUIRect &View, float dx)
+float CEditor::ScreenToEnvelopeDX(const CUIRect &View, float DeltaX)
 {
-	return dx / Graphics()->ScreenWidth() * UI()->Screen()->w / View.w * m_ZoomEnvelopeX.GetValue();
+	return DeltaX / Graphics()->ScreenWidth() * Ui()->Screen()->w / View.w * m_ZoomEnvelopeX.GetValue();
 }
 
-float CEditor::ScreenToEnvelopeDY(const CUIRect &View, float dy)
+float CEditor::ScreenToEnvelopeDY(const CUIRect &View, float DeltaY)
 {
-	return dy / Graphics()->ScreenHeight() * UI()->Screen()->h / View.h * m_ZoomEnvelopeY.GetValue();
+	return DeltaY / Graphics()->ScreenHeight() * Ui()->Screen()->h / View.h * m_ZoomEnvelopeY.GetValue();
 }
 
 void CEditor::RemoveTimeOffsetEnvelope(const std::shared_ptr<CEnvelope> &pEnvelope)
@@ -6075,16 +6137,16 @@ class CTimeStep
 
 void CEditor::SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels)
 {
-	if(!UI()->MouseInside(&View))
+	if(!Ui()->MouseInside(&View))
 		return;
 
-	float mx = UI()->MouseX();
-	float my = UI()->MouseY();
+	float mx = Ui()->MouseX();
+	float my = Ui()->MouseY();
 
 	float MinDist = 200.0f;
 	int *pMinPoint = nullptr;
 
-	auto UpdateMinimum = [&](float px, float py, int *pID) {
+	auto UpdateMinimum = [&](float px, float py, int *pId) {
 		float dx = px - mx;
 		float dy = py - my;
 
@@ -6092,7 +6154,7 @@ void CEditor::SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEn
 		if(CurrDist < MinDist)
 		{
 			MinDist = CurrDist;
-			pMinPoint = pID;
+			pMinPoint = pId;
 		}
 	};
 
@@ -6124,7 +6186,7 @@ void CEditor::SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEn
 	}
 
 	if(pMinPoint != nullptr)
-		UI()->SetHotItem(pMinPoint);
+		Ui()->SetHotItem(pMinPoint);
 }
 
 void CEditor::RenderEnvelopeEditor(CUIRect View)
@@ -6151,7 +6213,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 	DragBar.y -= 2.0f;
 	DragBar.w += 2.0f;
 	DragBar.h += 4.0f;
-	RenderExtraEditorDragBar(View, DragBar);
+	DoEditorDragBar(View, &DragBar, EDragSide::SIDE_TOP, &m_aExtraEditorSplits[EXTRAEDITOR_ENVELOPES]);
 	View.HSplitTop(15.0f, &ToolBar, &View);
 	View.HSplitTop(15.0f, &CurveBar, &View);
 	ToolBar.Margin(2.0f, &ToolBar);
@@ -6254,7 +6316,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
 				ToolBar.VSplitRight(20.0f, &ToolBar, &Button);
 				static int s_ZoomOutButton = 0;
-				if(DoButton_FontIcon(&s_ZoomOutButton, "-", 0, &Button, 0, "[NumPad-] Zoom out horizontally, hold shift to zoom vertically", IGraphics::CORNER_R, 9.0f))
+				if(DoButton_FontIcon(&s_ZoomOutButton, FONT_ICON_MINUS, 0, &Button, 0, "[NumPad-] Zoom out horizontally, hold shift to zoom vertically", IGraphics::CORNER_R, 9.0f))
 				{
 					if(Input()->ShiftIsPressed())
 						m_ZoomEnvelopeY.ChangeValue(0.1f * m_ZoomEnvelopeY.GetValue());
@@ -6269,7 +6331,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 				ToolBar.VSplitRight(20.0f, &ToolBar, &Button);
 				static int s_ZoomInButton = 0;
-				if(DoButton_FontIcon(&s_ZoomInButton, "+", 0, &Button, 0, "[NumPad+] Zoom in horizontally, hold shift to zoom vertically", IGraphics::CORNER_L, 9.0f))
+				if(DoButton_FontIcon(&s_ZoomInButton, FONT_ICON_PLUS, 0, &Button, 0, "[NumPad+] Zoom in horizontally, hold shift to zoom vertically", IGraphics::CORNER_L, 9.0f))
 				{
 					if(Input()->ShiftIsPressed())
 						m_ZoomEnvelopeY.ChangeValue(-0.1f * m_ZoomEnvelopeY.GetValue());
@@ -6321,7 +6383,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		}
 
 		static int s_PrevButton = 0;
-		if(DoButton_ButtonDec(&s_PrevButton, nullptr, 0, &Dec, 0, "Previous Envelope"))
+		if(DoButton_FontIcon(&s_PrevButton, FONT_ICON_MINUS, 0, &Dec, 0, "Previous Envelope", IGraphics::CORNER_L, 7.0f))
 		{
 			m_SelectedEnvelope--;
 			if(m_SelectedEnvelope < 0)
@@ -6330,7 +6392,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		}
 
 		static int s_NextButton = 0;
-		if(DoButton_ButtonInc(&s_NextButton, nullptr, 0, &Inc, 0, "Next Envelope"))
+		if(DoButton_FontIcon(&s_NextButton, FONT_ICON_PLUS, 0, &Inc, 0, "Next Envelope", IGraphics::CORNER_R, 7.0f))
 		{
 			m_SelectedEnvelope++;
 			if(m_SelectedEnvelope >= (int)m_Map.m_vpEnvelopes.size())
@@ -6342,7 +6404,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		{
 			ToolBar.VSplitLeft(15.0f, nullptr, &ToolBar);
 			ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
-			UI()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_MR);
+			Ui()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_MR);
 
 			ToolBar.VSplitLeft(3.0f, nullptr, &ToolBar);
 			ToolBar.VSplitLeft(ToolBar.w > ToolBar.h * 40 ? 80.0f : 60.0f, &Button, &ToolBar);
@@ -6373,8 +6435,6 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 			ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
 		}
 
-		static int s_EnvelopeEditorID = 0;
-
 		ColorRGBA aColors[] = {ColorRGBA(1, 0.2f, 0.2f), ColorRGBA(0.2f, 1, 0.2f), ColorRGBA(0.2f, 0.2f, 1), ColorRGBA(1, 1, 0.2f)};
 
 		CUIRect Button;
@@ -6416,30 +6476,39 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 			}
 		}
 
-		// sync checkbox
+		// toggle sync button
 		ToolBar.VSplitLeft(15.0f, nullptr, &ToolBar);
-		ToolBar.VSplitLeft(12.0f, &Button, &ToolBar);
+		ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
+
 		static int s_SyncButton;
-		if(DoButton_Editor(&s_SyncButton, pEnvelope->m_Synchronized ? "X" : "", 0, &Button, 0, "Synchronize envelope animation to game time (restarts when you touch the start line)"))
+		if(DoButton_Editor(&s_SyncButton, "Sync", pEnvelope->m_Synchronized, &Button, 0, "Synchronize envelope animation to game time (restarts when you touch the start line)"))
 		{
 			m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeEdit>(this, m_SelectedEnvelope, CEditorActionEnvelopeEdit::EEditType::SYNC, pEnvelope->m_Synchronized, !pEnvelope->m_Synchronized));
 			pEnvelope->m_Synchronized = !pEnvelope->m_Synchronized;
 			m_Map.OnModify();
 		}
 
-		ToolBar.VSplitLeft(4.0f, nullptr, &ToolBar);
-		ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
-		UI()->DoLabel(&Button, "Sync.", 10.0f, TEXTALIGN_ML);
-
-		if(UI()->MouseInside(&View) && m_Dialog == DIALOG_NONE)
+		static int s_EnvelopeEditorId = 0;
+		static int s_EnvelopeEditorButtonUsed = -1;
+		const bool ShouldPan = s_Operation == EEnvelopeEditorOp::OP_NONE && (Ui()->MouseButton(2) || (Ui()->MouseButton(0) && Input()->ModifierIsPressed()));
+		if(m_pContainerPanned == &s_EnvelopeEditorId)
 		{
-			UI()->SetHotItem(&s_EnvelopeEditorID);
-
-			if(s_Operation == EEnvelopeEditorOp::OP_NONE && (UI()->MouseButton(2) || (UI()->MouseButton(0) && Input()->ModifierIsPressed())))
+			if(!ShouldPan)
+				m_pContainerPanned = nullptr;
+			else
 			{
-				m_OffsetEnvelopeX += UI()->MouseDeltaX() / Graphics()->ScreenWidth() * UI()->Screen()->w / View.w;
-				m_OffsetEnvelopeY -= UI()->MouseDeltaY() / Graphics()->ScreenHeight() * UI()->Screen()->h / View.h;
+				m_OffsetEnvelopeX += Ui()->MouseDeltaX() / Graphics()->ScreenWidth() * Ui()->Screen()->w / View.w;
+				m_OffsetEnvelopeY -= Ui()->MouseDeltaY() / Graphics()->ScreenHeight() * Ui()->Screen()->h / View.h;
 			}
+		}
+
+		if(Ui()->MouseInside(&View) && m_Dialog == DIALOG_NONE)
+		{
+			Ui()->SetHotItem(&s_EnvelopeEditorId);
+
+			if(ShouldPan && m_pContainerPanned == nullptr)
+				m_pContainerPanned = &s_EnvelopeEditorId;
+
 			if(Input()->KeyPress(KEY_KP_MULTIPLY))
 				ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
 			if(Input()->ShiftIsPressed())
@@ -6466,20 +6535,28 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 			}
 		}
 
-		if(UI()->HotItem() == &s_EnvelopeEditorID)
+		if(Ui()->HotItem() == &s_EnvelopeEditorId)
 		{
 			// do stuff
-			if(UI()->MouseButton(0))
+			if(Ui()->MouseButton(0))
+			{
+				s_EnvelopeEditorButtonUsed = 0;
+				if(s_Operation != EEnvelopeEditorOp::OP_BOX_SELECT && !Input()->ModifierIsPressed())
+				{
+					s_Operation = EEnvelopeEditorOp::OP_BOX_SELECT;
+					s_MouseXStart = Ui()->MouseX();
+					s_MouseYStart = Ui()->MouseY();
+				}
+			}
+			else if(s_EnvelopeEditorButtonUsed == 0)
 			{
-				if(Input()->MouseDoubleClick())
+				if(Ui()->DoDoubleClickLogic(&s_EnvelopeEditorId))
 				{
 					// add point
-					float Time = ScreenToEnvelopeX(View, UI()->MouseX());
-					ColorRGBA Channels;
+					float Time = ScreenToEnvelopeX(View, Ui()->MouseX());
+					ColorRGBA Channels = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
 					if(in_range(Time, 0.0f, pEnvelope->EndTime()))
-						pEnvelope->Eval(Time, Channels);
-					else
-						Channels = {0, 0, 0, 0};
+						pEnvelope->Eval(Time, Channels, 4);
 
 					int FixedTime = std::round(Time * 1000.0f);
 					bool TimeFound = false;
@@ -6496,14 +6573,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 						RemoveTimeOffsetEnvelope(pEnvelope);
 					m_Map.OnModify();
 				}
-				else if(s_Operation != EEnvelopeEditorOp::OP_BOX_SELECT && !Input()->ModifierIsPressed())
-				{
-					static int s_BoxSelectID = 0;
-					UI()->SetActiveItem(&s_BoxSelectID);
-					s_Operation = EEnvelopeEditorOp::OP_BOX_SELECT;
-					s_MouseXStart = UI()->MouseX();
-					s_MouseYStart = UI()->MouseY();
-				}
+				s_EnvelopeEditorButtonUsed = -1;
 			}
 
 			m_ShowEnvelopePreview = SHOWENV_SELECTED;
@@ -6521,9 +6591,9 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				if(Value / m_ZoomEnvelopeY.GetValue() * View.h < 40.0f)
 					UnitsPerLineY = Value;
 			}
-			int NumLinesY = m_ZoomEnvelopeY.GetValue() / static_cast<float>(UnitsPerLineY) + 1;
+			int NumLinesY = m_ZoomEnvelopeY.GetValue() / UnitsPerLineY + 1;
 
-			UI()->ClipEnable(&View);
+			Ui()->ClipEnable(&View);
 			Graphics()->TextureClear();
 			Graphics()->LinesBegin();
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.2f);
@@ -6538,23 +6608,23 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 			Graphics()->LinesEnd();
 
-			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
+			Ui()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
 			for(int i = 0; i <= NumLinesY; i++)
 			{
 				float Value = UnitsPerLineY * i - BaseValue;
 				char aValueBuffer[16];
 				if(UnitsPerLineY >= 1.0f)
 				{
-					str_from_int(static_cast<int>(Value), aValueBuffer);
+					str_format(aValueBuffer, sizeof(aValueBuffer), "%d", static_cast<int>(Value));
 				}
 				else
 				{
 					str_format(aValueBuffer, sizeof(aValueBuffer), "%.3f", Value);
 				}
-				UI()->TextRender()->Text(View.x, EnvelopeToScreenY(View, Value) + 4.0f, 8.0f, aValueBuffer);
+				Ui()->TextRender()->Text(View.x, EnvelopeToScreenY(View, Value) + 4.0f, 8.0f, aValueBuffer);
 			}
-			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-			UI()->ClipDisable();
+			Ui()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			Ui()->ClipDisable();
 		}
 
 		{
@@ -6566,9 +6636,9 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				if(Value.AsSeconds() / m_ZoomEnvelopeX.GetValue() * View.w < 160.0f)
 					UnitsPerLineX = Value;
 			}
-			int NumLinesX = m_ZoomEnvelopeX.GetValue() / static_cast<float>(UnitsPerLineX.AsSeconds()) + 1;
+			int NumLinesX = m_ZoomEnvelopeX.GetValue() / UnitsPerLineX.AsSeconds() + 1;
 
-			UI()->ClipEnable(&View);
+			Ui()->ClipEnable(&View);
 			Graphics()->TextureClear();
 			Graphics()->LinesBegin();
 			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.2f);
@@ -6583,7 +6653,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 			Graphics()->LinesEnd();
 
-			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
+			Ui()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
 			for(int i = 0; i <= NumLinesX; i++)
 			{
 				CTimeStep Value = UnitsPerLineX * i - BaseValue;
@@ -6592,16 +6662,16 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 					char aValueBuffer[16];
 					Value.Format(aValueBuffer, sizeof(aValueBuffer));
 
-					UI()->TextRender()->Text(EnvelopeToScreenX(View, Value.AsSeconds()) + 1.0f, View.y + View.h - 8.0f, 8.0f, aValueBuffer);
+					Ui()->TextRender()->Text(EnvelopeToScreenX(View, Value.AsSeconds()) + 1.0f, View.y + View.h - 8.0f, 8.0f, aValueBuffer);
 				}
 			}
-			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
-			UI()->ClipDisable();
+			Ui()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			Ui()->ClipDisable();
 		}
 
 		// render tangents for bezier curves
 		{
-			UI()->ClipEnable(&View);
+			Ui()->ClipEnable(&View);
 			Graphics()->TextureClear();
 			Graphics()->LinesBegin();
 			for(int c = 0; c < pEnvelope->GetChannels(); c++)
@@ -6646,7 +6716,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				}
 			}
 			Graphics()->LinesEnd();
-			UI()->ClipDisable();
+			Ui()->ClipDisable();
 		}
 
 		// render lines
@@ -6658,7 +6728,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 			float EndTime = ScreenToEnvelopeX(View, EndX);
 			float StartTime = ScreenToEnvelopeX(View, StartX);
 
-			UI()->ClipEnable(&View);
+			Ui()->ClipEnable(&View);
 			Graphics()->TextureClear();
 			Graphics()->LinesBegin();
 			for(int c = 0; c < pEnvelope->GetChannels(); c++)
@@ -6668,16 +6738,17 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				else
 					Graphics()->SetColor(aColors[c].r * 0.5f, aColors[c].g * 0.5f, aColors[c].b * 0.5f, 1);
 
-				int Steps = static_cast<int>(((EndX - StartX) / UI()->Screen()->w) * Graphics()->ScreenWidth());
+				int Steps = static_cast<int>(((EndX - StartX) / Ui()->Screen()->w) * Graphics()->ScreenWidth());
 				float StepTime = (EndTime - StartTime) / static_cast<float>(Steps);
 				float StepSize = (EndX - StartX) / static_cast<float>(Steps);
 
-				ColorRGBA Channels;
-				pEnvelope->Eval(StartTime + StepTime, Channels);
+				ColorRGBA Channels = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+				pEnvelope->Eval(StartTime, Channels, c + 1);
 				float PrevY = EnvelopeToScreenY(View, Channels[c]);
-				for(int i = 2; i < Steps; i++)
+				for(int i = 1; i < Steps; i++)
 				{
-					pEnvelope->Eval(StartTime + i * StepTime, Channels);
+					Channels = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+					pEnvelope->Eval(StartTime + i * StepTime, Channels, c + 1);
 					float CurrentY = EnvelopeToScreenY(View, Channels[c]);
 
 					IGraphics::CLineItem LineItem(
@@ -6691,7 +6762,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				}
 			}
 			Graphics()->LinesEnd();
-			UI()->ClipDisable();
+			Ui()->ClipDisable();
 		}
 
 		// render curve options
@@ -6707,7 +6778,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				CurveButton.h = CurveBar.h;
 				CurveButton.w = CurveBar.h;
 				CurveButton.x -= CurveButton.w / 2.0f;
-				const void *pID = &pEnvelope->m_vPoints[i].m_Curvetype;
+				const void *pId = &pEnvelope->m_vPoints[i].m_Curvetype;
 				const char *apTypeName[] = {"N", "L", "S", "F", "M", "B"};
 				const char *pTypeName = "!?";
 				if(0 <= pEnvelope->m_vPoints[i].m_Curvetype && pEnvelope->m_vPoints[i].m_Curvetype < (int)std::size(apTypeName))
@@ -6715,7 +6786,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 				if(CurveButton.x >= View.x)
 				{
-					if(DoButton_Editor(pID, pTypeName, 0, &CurveButton, 0, "Switch curve type (N = step, L = linear, S = slow, F = fast, M = smooth, B = bezier)"))
+					if(DoButton_Editor(pId, pTypeName, 0, &CurveButton, 0, "Switch curve type (N = step, L = linear, S = slow, F = fast, M = smooth, B = bezier)"))
 					{
 						int PrevCurve = pEnvelope->m_vPoints[i].m_Curvetype;
 						pEnvelope->m_vPoints[i].m_Curvetype = (pEnvelope->m_vPoints[i].m_Curvetype + 1) % NUM_CURVETYPES;
@@ -6731,7 +6802,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		// render colorbar
 		if(ShowColorBar)
 		{
-			UI()->ClipEnable(&ColorBar);
+			Ui()->ClipEnable(&ColorBar);
 
 			float StartX = maximum(EnvelopeToScreenX(View, 0), ColorBar.x);
 			float EndX = EnvelopeToScreenX(View, pEnvelope->EndTime());
@@ -6768,7 +6839,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				Graphics()->QuadsDrawTL(&QuadItem, 1);
 			}
 			Graphics()->QuadsEnd();
-			UI()->ClipDisable();
+			Ui()->ClipDisable();
 		}
 
 		// render handles
@@ -6781,13 +6852,13 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		{
 			static SPopupMenuId s_PopupEnvPointId;
 			const auto &&ShowPopupEnvPoint = [&]() {
-				UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56 + (pEnvelope->GetChannels() == 4 ? 16.0f : 0.0f), this, PopupEnvPoint);
+				Ui()->DoPopupMenu(&s_PopupEnvPointId, Ui()->MouseX(), Ui()->MouseY(), 150, 56 + (pEnvelope->GetChannels() == 4 && !IsTangentSelected() ? 16.0f : 0.0f), this, PopupEnvPoint);
 			};
 
 			if(s_Operation == EEnvelopeEditorOp::OP_NONE)
 			{
 				SetHotEnvelopePoint(View, pEnvelope, s_ActiveChannels);
-				if(!UI()->MouseButton(0))
+				if(!Ui()->MouseButton(0))
 					m_EnvOpTracker.Stop(false);
 			}
 			else
@@ -6795,7 +6866,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				m_EnvOpTracker.Begin(s_Operation);
 			}
 
-			UI()->ClipEnable(&View);
+			Ui()->ClipEnable(&View);
 			Graphics()->TextureClear();
 			Graphics()->QuadsBegin();
 			for(int c = 0; c < pEnvelope->GetChannels(); c++)
@@ -6815,7 +6886,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 						Final.w = 4.0f;
 						Final.h = 4.0f;
 
-						const void *pID = &pEnvelope->m_vPoints[i].m_aValues[c];
+						const void *pId = &pEnvelope->m_vPoints[i].m_aValues[c];
 
 						if(IsEnvPointSelected(i, c))
 						{
@@ -6829,14 +6900,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 							Graphics()->QuadsDrawTL(&QuadItem, 1);
 						}
 
-						if(UI()->CheckActiveItem(pID))
+						if(Ui()->CheckActiveItem(pId))
 						{
 							m_ShowEnvelopePreview = SHOWENV_SELECTED;
 
 							if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
 							{
-								float dx = s_MouseXStart - UI()->MouseX();
-								float dy = s_MouseYStart - UI()->MouseY();
+								float dx = s_MouseXStart - Ui()->MouseX();
+								float dy = s_MouseYStart - Ui()->MouseY();
 
 								if(dx * dx + dy * dy > 20.0f)
 								{
@@ -6860,7 +6931,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									}
 									else
 									{
-										float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+										float DeltaX = ScreenToEnvelopeDX(View, Ui()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
 
 										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
 										{
@@ -6911,7 +6982,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									}
 									else
 									{
-										float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+										float DeltaY = ScreenToEnvelopeDY(View, Ui()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
 										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
 										{
 											auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints[k];
@@ -6930,7 +7001,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 							if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
 							{
-								if(!UI()->MouseButton(1))
+								if(!Ui()->MouseButton(1))
 								{
 									if(m_vSelectedEnvelopePoints.size() == 1)
 									{
@@ -6940,15 +7011,15 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									else if(m_vSelectedEnvelopePoints.size() > 1)
 									{
 										static SPopupMenuId s_PopupEnvPointMultiId;
-										UI()->DoPopupMenu(&s_PopupEnvPointMultiId, UI()->MouseX(), UI()->MouseY(), 80, 22, this, PopupEnvPointMulti);
+										Ui()->DoPopupMenu(&s_PopupEnvPointMultiId, Ui()->MouseX(), Ui()->MouseY(), 80, 22, this, PopupEnvPointMulti);
 									}
-									UI()->SetActiveItem(nullptr);
+									Ui()->SetActiveItem(nullptr);
 									s_Operation = EEnvelopeEditorOp::OP_NONE;
 								}
 							}
-							else if(!UI()->MouseButton(0))
+							else if(!Ui()->MouseButton(0))
 							{
-								UI()->SetActiveItem(nullptr);
+								Ui()->SetActiveItem(nullptr);
 								m_SelectedQuadEnvelope = -1;
 
 								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
@@ -6965,18 +7036,18 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 							Graphics()->SetColor(1, 1, 1, 1);
 						}
-						else if(UI()->HotItem() == pID)
+						else if(Ui()->HotItem() == pId)
 						{
-							if(UI()->MouseButton(0))
+							if(Ui()->MouseButton(0))
 							{
-								UI()->SetActiveItem(pID);
+								Ui()->SetActiveItem(pId);
 								s_Operation = EEnvelopeEditorOp::OP_SELECT;
 								m_SelectedQuadEnvelope = m_SelectedEnvelope;
 
-								s_MouseXStart = UI()->MouseX();
-								s_MouseYStart = UI()->MouseY();
+								s_MouseXStart = Ui()->MouseX();
+								s_MouseYStart = Ui()->MouseY();
 							}
-							else if(UI()->MouseButtonClicked(1))
+							else if(Ui()->MouseButtonClicked(1))
 							{
 								if(Input()->ShiftIsPressed())
 								{
@@ -6987,14 +7058,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
 									if(!IsEnvPointSelected(i, c))
 										SelectEnvPoint(i, c);
-									UI()->SetActiveItem(pID);
+									Ui()->SetActiveItem(pId);
 								}
 							}
 
 							m_ShowEnvelopePreview = SHOWENV_SELECTED;
 							Graphics()->SetColor(1, 1, 1, 1);
 							str_copy(m_aTooltip, "Envelope point. Left mouse to drag. Hold ctrl to be more precise. Hold shift to alter time. Shift + right-click to delete.");
-							ms_pUiGotContext = pID;
+							ms_pUiGotContext = pId;
 						}
 						else
 							Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
@@ -7018,7 +7089,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 							Final.h = 4.0f;
 
 							// handle logic
-							const void *pID = &pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c];
+							const void *pId = &pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c];
 
 							if(IsTangentOutPointSelected(i, c))
 							{
@@ -7035,14 +7106,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 								Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
 							}
 
-							if(UI()->CheckActiveItem(pID))
+							if(Ui()->CheckActiveItem(pId))
 							{
 								m_ShowEnvelopePreview = SHOWENV_SELECTED;
 
 								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
 								{
-									float dx = s_MouseXStart - UI()->MouseX();
-									float dy = s_MouseYStart - UI()->MouseY();
+									float dx = s_MouseXStart - Ui()->MouseX();
+									float dy = s_MouseYStart - Ui()->MouseY();
 
 									if(dx * dx + dy * dy > 20.0f)
 									{
@@ -7058,8 +7129,8 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT)
 								{
-									float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
-									float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+									float DeltaX = ScreenToEnvelopeDX(View, Ui()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+									float DeltaY = ScreenToEnvelopeDY(View, Ui()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
 									s_vAccurateDragValuesX[0] += DeltaX;
 									s_vAccurateDragValuesY[0] -= DeltaY;
 
@@ -7073,19 +7144,20 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
 								{
-									if(!UI()->MouseButton(1))
+									if(!Ui()->MouseButton(1))
 									{
 										if(IsTangentOutPointSelected(i, c))
 										{
 											m_UpdateEnvPointInfo = true;
 											ShowPopupEnvPoint();
 										}
-										UI()->SetActiveItem(nullptr);
+										Ui()->SetActiveItem(nullptr);
+										s_Operation = EEnvelopeEditorOp::OP_NONE;
 									}
 								}
-								else if(!UI()->MouseButton(0))
+								else if(!Ui()->MouseButton(0))
 								{
-									UI()->SetActiveItem(nullptr);
+									Ui()->SetActiveItem(nullptr);
 									m_SelectedQuadEnvelope = -1;
 
 									if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
@@ -7097,18 +7169,18 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								Graphics()->SetColor(1, 1, 1, 1);
 							}
-							else if(UI()->HotItem() == pID)
+							else if(Ui()->HotItem() == pId)
 							{
-								if(UI()->MouseButton(0))
+								if(Ui()->MouseButton(0))
 								{
-									UI()->SetActiveItem(pID);
+									Ui()->SetActiveItem(pId);
 									s_Operation = EEnvelopeEditorOp::OP_SELECT;
 									m_SelectedQuadEnvelope = m_SelectedEnvelope;
 
-									s_MouseXStart = UI()->MouseX();
-									s_MouseYStart = UI()->MouseY();
+									s_MouseXStart = Ui()->MouseX();
+									s_MouseYStart = Ui()->MouseY();
 								}
-								else if(UI()->MouseButtonClicked(1))
+								else if(Ui()->MouseButtonClicked(1))
 								{
 									if(Input()->ShiftIsPressed())
 									{
@@ -7121,14 +7193,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									{
 										s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
 										SelectTangentOutPoint(i, c);
-										UI()->SetActiveItem(pID);
+										Ui()->SetActiveItem(pId);
 									}
 								}
 
 								m_ShowEnvelopePreview = SHOWENV_SELECTED;
 								Graphics()->SetColor(1, 1, 1, 1);
 								str_copy(m_aTooltip, "Bezier out-tangent. Left mouse to drag. Hold ctrl to be more precise. Shift + right-click to reset.");
-								ms_pUiGotContext = pID;
+								ms_pUiGotContext = pId;
 							}
 							else
 								Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
@@ -7150,7 +7222,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 							Final.h = 4.0f;
 
 							// handle logic
-							const void *pID = &pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c];
+							const void *pId = &pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c];
 
 							if(IsTangentInPointSelected(i, c))
 							{
@@ -7167,14 +7239,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 								Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
 							}
 
-							if(UI()->CheckActiveItem(pID))
+							if(Ui()->CheckActiveItem(pId))
 							{
 								m_ShowEnvelopePreview = SHOWENV_SELECTED;
 
 								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
 								{
-									float dx = s_MouseXStart - UI()->MouseX();
-									float dy = s_MouseYStart - UI()->MouseY();
+									float dx = s_MouseXStart - Ui()->MouseX();
+									float dy = s_MouseYStart - Ui()->MouseY();
 
 									if(dx * dx + dy * dy > 20.0f)
 									{
@@ -7190,8 +7262,8 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT)
 								{
-									float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
-									float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+									float DeltaX = ScreenToEnvelopeDX(View, Ui()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+									float DeltaY = ScreenToEnvelopeDY(View, Ui()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
 									s_vAccurateDragValuesX[0] += DeltaX;
 									s_vAccurateDragValuesY[0] -= DeltaY;
 
@@ -7205,19 +7277,20 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
 								{
-									if(!UI()->MouseButton(1))
+									if(!Ui()->MouseButton(1))
 									{
 										if(IsTangentInPointSelected(i, c))
 										{
 											m_UpdateEnvPointInfo = true;
 											ShowPopupEnvPoint();
 										}
-										UI()->SetActiveItem(nullptr);
+										Ui()->SetActiveItem(nullptr);
+										s_Operation = EEnvelopeEditorOp::OP_NONE;
 									}
 								}
-								else if(!UI()->MouseButton(0))
+								else if(!Ui()->MouseButton(0))
 								{
-									UI()->SetActiveItem(nullptr);
+									Ui()->SetActiveItem(nullptr);
 									m_SelectedQuadEnvelope = -1;
 
 									if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
@@ -7229,18 +7302,18 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 								Graphics()->SetColor(1, 1, 1, 1);
 							}
-							else if(UI()->HotItem() == pID)
+							else if(Ui()->HotItem() == pId)
 							{
-								if(UI()->MouseButton(0))
+								if(Ui()->MouseButton(0))
 								{
-									UI()->SetActiveItem(pID);
+									Ui()->SetActiveItem(pId);
 									s_Operation = EEnvelopeEditorOp::OP_SELECT;
 									m_SelectedQuadEnvelope = m_SelectedEnvelope;
 
-									s_MouseXStart = UI()->MouseX();
-									s_MouseYStart = UI()->MouseY();
+									s_MouseXStart = Ui()->MouseX();
+									s_MouseYStart = Ui()->MouseY();
 								}
-								else if(UI()->MouseButtonClicked(1))
+								else if(Ui()->MouseButtonClicked(1))
 								{
 									if(Input()->ShiftIsPressed())
 									{
@@ -7253,14 +7326,14 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 									{
 										s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
 										SelectTangentInPoint(i, c);
-										UI()->SetActiveItem(pID);
+										Ui()->SetActiveItem(pId);
 									}
 								}
 
 								m_ShowEnvelopePreview = SHOWENV_SELECTED;
 								Graphics()->SetColor(1, 1, 1, 1);
 								str_copy(m_aTooltip, "Bezier in-tangent. Left mouse to drag. Hold ctrl to be more precise. Shift + right-click to reset.");
-								ms_pUiGotContext = pID;
+								ms_pUiGotContext = pId;
 							}
 							else
 								Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
@@ -7273,7 +7346,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				}
 			}
 			Graphics()->QuadsEnd();
-			UI()->ClipDisable();
+			Ui()->ClipDisable();
 		}
 
 		// handle scaling
@@ -7321,7 +7394,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 
 			if(Input()->ShiftIsPressed())
 			{
-				s_ScaleFactorX += UI()->MouseDeltaX() / Graphics()->ScreenWidth() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
+				s_ScaleFactorX += Ui()->MouseDeltaX() / Graphics()->ScreenWidth() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
 				float Midpoint = Input()->AltIsPressed() ? s_MidpointX : 0.0f;
 				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
 				{
@@ -7374,7 +7447,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 			}
 			else
 			{
-				s_ScaleFactorY -= UI()->MouseDeltaY() / Graphics()->ScreenHeight() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
+				s_ScaleFactorY -= Ui()->MouseDeltaY() / Graphics()->ScreenHeight() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
 				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
 				{
 					auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints[k];
@@ -7388,12 +7461,12 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 				}
 			}
 
-			if(UI()->MouseButton(0))
+			if(Ui()->MouseButton(0))
 			{
 				s_Operation = EEnvelopeEditorOp::OP_NONE;
 				m_EnvOpTracker.Stop(false);
 			}
-			else if(UI()->MouseButton(1) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			else if(Ui()->MouseButton(1) || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
 			{
 				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
 				{
@@ -7414,25 +7487,25 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 		if(s_Operation == EEnvelopeEditorOp::OP_BOX_SELECT)
 		{
 			IGraphics::CLineItem aLines[4] = {
-				{s_MouseXStart, s_MouseYStart, UI()->MouseX(), s_MouseYStart},
-				{s_MouseXStart, s_MouseYStart, s_MouseXStart, UI()->MouseY()},
-				{s_MouseXStart, UI()->MouseY(), UI()->MouseX(), UI()->MouseY()},
-				{UI()->MouseX(), s_MouseYStart, UI()->MouseX(), UI()->MouseY()}};
-			UI()->ClipEnable(&View);
+				{s_MouseXStart, s_MouseYStart, Ui()->MouseX(), s_MouseYStart},
+				{s_MouseXStart, s_MouseYStart, s_MouseXStart, Ui()->MouseY()},
+				{s_MouseXStart, Ui()->MouseY(), Ui()->MouseX(), Ui()->MouseY()},
+				{Ui()->MouseX(), s_MouseYStart, Ui()->MouseX(), Ui()->MouseY()}};
+			Ui()->ClipEnable(&View);
 			Graphics()->LinesBegin();
 			Graphics()->LinesDraw(aLines, std::size(aLines));
 			Graphics()->LinesEnd();
-			UI()->ClipDisable();
+			Ui()->ClipDisable();
 
-			if(!UI()->MouseButton(0))
+			if(!Ui()->MouseButton(0))
 			{
 				s_Operation = EEnvelopeEditorOp::OP_NONE;
-				UI()->SetActiveItem(nullptr);
+				Ui()->SetActiveItem(nullptr);
 
 				float TimeStart = ScreenToEnvelopeX(View, s_MouseXStart);
-				float TimeEnd = ScreenToEnvelopeX(View, UI()->MouseX());
+				float TimeEnd = ScreenToEnvelopeX(View, Ui()->MouseX());
 				float ValueStart = ScreenToEnvelopeY(View, s_MouseYStart);
-				float ValueEnd = ScreenToEnvelopeY(View, UI()->MouseY());
+				float ValueEnd = ScreenToEnvelopeY(View, Ui()->MouseY());
 
 				float TimeMin = minimum(TimeStart, TimeEnd);
 				float TimeMax = maximum(TimeStart, TimeEnd);
@@ -7461,189 +7534,6 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 	}
 }
 
-void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast)
-{
-	// TODO: improve validation (https://github.com/ddnet/ddnet/issues/1406)
-	// Returns true if the argument is a valid server setting
-	const auto &&ValidateServerSetting = [](const char *pStr) {
-		return str_find(pStr, " ") != nullptr;
-	};
-
-	static int s_CommandSelectedIndex = -1;
-	static CListBox s_ListBox;
-	s_ListBox.SetActive(m_Dialog == DIALOG_NONE && !UI()->IsPopupOpen());
-
-	bool GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
-	const bool CurrentInputValid = ValidateServerSetting(m_SettingsCommandInput.GetString());
-
-	CUIRect ToolBar, Button, Label, List, DragBar;
-	View.HSplitTop(22.0f, &DragBar, nullptr);
-	DragBar.y -= 2.0f;
-	DragBar.w += 2.0f;
-	DragBar.h += 4.0f;
-	RenderExtraEditorDragBar(View, DragBar);
-	View.HSplitTop(20.0f, &ToolBar, &View);
-	View.HSplitTop(2.0f, nullptr, &List);
-	ToolBar.HMargin(2.0f, &ToolBar);
-
-	// delete button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
-	static int s_DeleteButton = 0;
-	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, GotSelection ? 0 : -1, &Button, 0, "[Delete] Delete the selected command from the command list.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
-	{
-		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
-
-		m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
-		if(s_CommandSelectedIndex >= (int)m_Map.m_vSettings.size())
-			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
-		if(s_CommandSelectedIndex >= 0)
-			m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
-		m_Map.OnModify();
-		s_ListBox.ScrollToSelected();
-	}
-
-	// move down button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	const bool CanMoveDown = GotSelection && s_CommandSelectedIndex < (int)m_Map.m_vSettings.size() - 1;
-	static int s_DownButton = 0;
-	if(DoButton_FontIcon(&s_DownButton, FONT_ICON_SORT_DOWN, CanMoveDown ? 0 : -1, &Button, 0, "[Alt+Down] Move the selected command down.", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_DOWN)))
-	{
-		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_DOWN, &s_CommandSelectedIndex, s_CommandSelectedIndex));
-
-		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex + 1]);
-		s_CommandSelectedIndex++;
-		m_Map.OnModify();
-		s_ListBox.ScrollToSelected();
-	}
-
-	// move up button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
-	const bool CanMoveUp = GotSelection && s_CommandSelectedIndex > 0;
-	static int s_UpButton = 0;
-	if(DoButton_FontIcon(&s_UpButton, FONT_ICON_SORT_UP, CanMoveUp ? 0 : -1, &Button, 0, "[Alt+Up] Move the selected command up.", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_UP)))
-	{
-		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_UP, &s_CommandSelectedIndex, s_CommandSelectedIndex));
-
-		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex - 1]);
-		s_CommandSelectedIndex--;
-		m_Map.OnModify();
-		s_ListBox.ScrollToSelected();
-	}
-
-	// redo button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	static int s_RedoButton = 0;
-	if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_ServerSettingsHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo command edit", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_DOWN)))
-	{
-		m_ServerSettingsHistory.Redo();
-	}
-
-	// undo button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
-	static int s_UndoButton = 0;
-	if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_ServerSettingsHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo command edit", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_UP)))
-	{
-		m_ServerSettingsHistory.Undo();
-	}
-
-	GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
-
-	// update button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	const bool CanUpdate = GotSelection && CurrentInputValid && str_comp(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, m_SettingsCommandInput.GetString()) != 0;
-	static int s_UpdateButton = 0;
-	if(DoButton_FontIcon(&s_UpdateButton, FONT_ICON_PENCIL, CanUpdate ? 0 : -1, &Button, 0, "[Alt+Enter] Update the selected command based on the entered value.", IGraphics::CORNER_R, 9.0f) == 1 || (CanUpdate && Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
-	{
-		bool Found = false;
-		int i;
-		for(i = 0; i < (int)m_Map.m_vSettings.size(); ++i)
-		{
-			if(i != s_CommandSelectedIndex && !str_comp(m_Map.m_vSettings[i].m_aCommand, m_SettingsCommandInput.GetString()))
-			{
-				Found = true;
-				break;
-			}
-		}
-		if(Found)
-		{
-			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
-			m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
-			s_CommandSelectedIndex = i > s_CommandSelectedIndex ? i - 1 : i;
-		}
-		else
-		{
-			const char *pStr = m_SettingsCommandInput.GetString();
-			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
-			str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
-		}
-		m_Map.OnModify();
-		s_ListBox.ScrollToSelected();
-		UI()->SetActiveItem(&m_SettingsCommandInput);
-	}
-
-	// add button
-	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
-	ToolBar.VSplitRight(100.0f, &ToolBar, nullptr);
-	const bool CanAdd = s_ListBox.Active() && CurrentInputValid;
-	static int s_AddButton = 0;
-	if(DoButton_FontIcon(&s_AddButton, FONT_ICON_PLUS, CanAdd ? 0 : -1, &Button, 0, "[Enter] Add a command to the command list.", IGraphics::CORNER_L) == 1 || (CanAdd && !Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
-	{
-		bool Found = false;
-		for(size_t i = 0; i < m_Map.m_vSettings.size(); ++i)
-		{
-			if(!str_comp(m_Map.m_vSettings[i].m_aCommand, m_SettingsCommandInput.GetString()))
-			{
-				s_CommandSelectedIndex = i;
-				Found = true;
-				break;
-			}
-		}
-
-		if(!Found)
-		{
-			m_Map.m_vSettings.emplace_back(m_SettingsCommandInput.GetString());
-			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
-			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::ADD, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
-			m_Map.OnModify();
-		}
-		s_ListBox.ScrollToSelected();
-		UI()->SetActiveItem(&m_SettingsCommandInput);
-	}
-
-	// command input (use remaining toolbar width)
-	if(!ShowServerSettingsEditorLast) // Just activated
-		UI()->SetActiveItem(&m_SettingsCommandInput);
-	m_SettingsCommandInput.SetEmptyText("Command");
-	DoClearableEditBox(&m_SettingsCommandInput, &ToolBar, 12.0f, IGraphics::CORNER_ALL, "Enter a server setting.");
-
-	// command list
-	s_ListBox.DoStart(15.0f, m_Map.m_vSettings.size(), 1, 3, s_CommandSelectedIndex, &List);
-
-	for(size_t i = 0; i < m_Map.m_vSettings.size(); i++)
-	{
-		const CListboxItem Item = s_ListBox.DoNextItem(&m_Map.m_vSettings[i], s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex == i);
-		if(!Item.m_Visible)
-			continue;
-
-		Item.m_Rect.VMargin(5.0f, &Label);
-
-		SLabelProperties Props;
-		Props.m_MaxWidth = Label.w;
-		Props.m_EllipsisAtEnd = true;
-		UI()->DoLabel(&Label, m_Map.m_vSettings[i].m_aCommand, 10.0f, TEXTALIGN_ML, Props);
-	}
-
-	const int NewSelected = s_ListBox.DoEnd();
-	if(s_CommandSelectedIndex != NewSelected)
-	{
-		s_CommandSelectedIndex = NewSelected;
-		m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
-	}
-}
-
 void CEditor::RenderEditorHistory(CUIRect View)
 {
 	enum EHistoryType
@@ -7656,7 +7546,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 	static EHistoryType s_HistoryType = EDITOR_HISTORY;
 	static int s_ActionSelectedIndex = 0;
 	static CListBox s_ListBox;
-	s_ListBox.SetActive(m_Dialog == DIALOG_NONE && !UI()->IsPopupOpen());
+	s_ListBox.SetActive(m_Dialog == DIALOG_NONE && !Ui()->IsPopupOpen());
 
 	const bool GotSelection = s_ListBox.Active() && s_ActionSelectedIndex >= 0 && (size_t)s_ActionSelectedIndex < m_Map.m_vSettings.size();
 
@@ -7665,7 +7555,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 	DragBar.y -= 2.0f;
 	DragBar.w += 2.0f;
 	DragBar.h += 4.0f;
-	RenderExtraEditorDragBar(View, DragBar);
+	DoEditorDragBar(View, &DragBar, EDragSide::SIDE_TOP, &m_aExtraEditorSplits[EXTRAEDITOR_HISTORY]);
 	View.HSplitTop(20.0f, &ToolBar, &View);
 	View.HSplitTop(2.0f, nullptr, &List);
 	ToolBar.HMargin(2.0f, &ToolBar);
@@ -7702,7 +7592,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 	InfoProps.m_MaxWidth = ToolBar.w - 60.f;
 	InfoProps.m_EllipsisAtEnd = true;
 	Label.VSplitLeft(8.0f, nullptr, &Label);
-	UI()->DoLabel(&Label, "Editor history. Click on an action to undo all actions above.", 10.0f, TEXTALIGN_ML, InfoProps);
+	Ui()->DoLabel(&Label, "Editor history. Click on an action to undo all actions above.", 10.0f, TEXTALIGN_ML, InfoProps);
 
 	CEditorHistory *pCurrentHistory;
 	if(s_HistoryType == EDITOR_HISTORY)
@@ -7718,7 +7608,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
 	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
 	static int s_DeleteButton = 0;
-	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, (!pCurrentHistory->m_vpUndoActions.empty() || !pCurrentHistory->m_vpRedoActions.empty()) ? 0 : -1, &Button, 0, "Clear the history.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
+	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, (!pCurrentHistory->m_vpUndoActions.empty() || !pCurrentHistory->m_vpRedoActions.empty()) ? 0 : -1, &Button, 0, "Clear the history.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE)))
 	{
 		pCurrentHistory->Clear();
 		s_ActionSelectedIndex = 0;
@@ -7743,7 +7633,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 		Props.m_EllipsisAtEnd = true;
 		TextRender()->TextColor({.5f, .5f, .5f});
 		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
-		UI()->DoLabel(&Label, pCurrentHistory->m_vpRedoActions[i]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
+		Ui()->DoLabel(&Label, pCurrentHistory->m_vpRedoActions[i]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
 		TextRender()->TextColor(TextRender()->DefaultTextColor());
 	}
 
@@ -7758,7 +7648,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 		SLabelProperties Props;
 		Props.m_MaxWidth = Label.w;
 		Props.m_EllipsisAtEnd = true;
-		UI()->DoLabel(&Label, pCurrentHistory->m_vpUndoActions[UndoSize - i - 1]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
+		Ui()->DoLabel(&Label, pCurrentHistory->m_vpUndoActions[UndoSize - i - 1]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
 	}
 
 	{ // Base action "Loaded map" that cannot be undone
@@ -7768,7 +7658,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 		{
 			Item.m_Rect.VMargin(5.0f, &Label);
 
-			UI()->DoLabel(&Label, "Loaded map", 10.0f, TEXTALIGN_ML);
+			Ui()->DoLabel(&Label, "Loaded map", 10.0f, TEXTALIGN_ML);
 		}
 	}
 
@@ -7795,7 +7685,7 @@ void CEditor::RenderEditorHistory(CUIRect View)
 	}
 }
 
-void CEditor::RenderExtraEditorDragBar(CUIRect View, CUIRect DragBar)
+void CEditor::DoEditorDragBar(CUIRect View, CUIRect *pDragBar, EDragSide Side, float *pValue, float MinValue, float MaxValue)
 {
 	enum EDragOperation
 	{
@@ -7806,26 +7696,46 @@ void CEditor::RenderExtraEditorDragBar(CUIRect View, CUIRect DragBar)
 	static EDragOperation s_Operation = OP_NONE;
 	static float s_InitialMouseY = 0.0f;
 	static float s_InitialMouseOffsetY = 0.0f;
+	static float s_InitialMouseX = 0.0f;
+	static float s_InitialMouseOffsetX = 0.0f;
+
+	bool IsVertical = Side == EDragSide::SIDE_TOP || Side == EDragSide::SIDE_BOTTOM;
+
+	if(Ui()->MouseInside(pDragBar) && Ui()->HotItem() == pDragBar)
+		m_CursorType = IsVertical ? CURSOR_RESIZE_V : CURSOR_RESIZE_H;
 
 	bool Clicked;
 	bool Abrupted;
-	if(int Result = DoButton_DraggableEx(&s_Operation, "", 8, &DragBar, &Clicked, &Abrupted, 0, "Change the size of the editor by dragging."))
+	if(int Result = DoButton_DraggableEx(pDragBar, "", 8, pDragBar, &Clicked, &Abrupted, 0, "Change the size of the editor by dragging."))
 	{
 		if(s_Operation == OP_NONE && Result == 1)
 		{
-			s_InitialMouseY = UI()->MouseY();
-			s_InitialMouseOffsetY = UI()->MouseY() - DragBar.y;
+			s_InitialMouseY = Ui()->MouseY();
+			s_InitialMouseOffsetY = Ui()->MouseY() - pDragBar->y;
+			s_InitialMouseX = Ui()->MouseX();
+			s_InitialMouseOffsetX = Ui()->MouseX() - pDragBar->x;
 			s_Operation = OP_CLICKED;
 		}
 
 		if(Clicked || Abrupted)
 			s_Operation = OP_NONE;
 
-		if(s_Operation == OP_CLICKED && absolute(UI()->MouseY() - s_InitialMouseY) > 5.0f)
+		if(s_Operation == OP_CLICKED && absolute(IsVertical ? Ui()->MouseY() - s_InitialMouseY : Ui()->MouseX() - s_InitialMouseX) > 5.0f)
 			s_Operation = OP_DRAGGING;
 
 		if(s_Operation == OP_DRAGGING)
-			m_aExtraEditorSplits[(int)m_ActiveExtraEditor] = clamp(s_InitialMouseOffsetY + View.y + View.h - UI()->MouseY(), 100.0f, 400.0f);
+		{
+			if(Side == EDragSide::SIDE_TOP)
+				*pValue = clamp(s_InitialMouseOffsetY + View.y + View.h - Ui()->MouseY(), MinValue, MaxValue);
+			else if(Side == EDragSide::SIDE_RIGHT)
+				*pValue = clamp(Ui()->MouseX() - s_InitialMouseOffsetX - View.x + pDragBar->w, MinValue, MaxValue);
+			else if(Side == EDragSide::SIDE_BOTTOM)
+				*pValue = clamp(Ui()->MouseY() - s_InitialMouseOffsetY - View.y + pDragBar->h, MinValue, MaxValue);
+			else if(Side == EDragSide::SIDE_LEFT)
+				*pValue = clamp(s_InitialMouseOffsetX + View.x + View.w - Ui()->MouseX(), MinValue, MaxValue);
+
+			m_CursorType = IsVertical ? CURSOR_RESIZE_V : CURSOR_RESIZE_H;
+		}
 	}
 }
 
@@ -7837,10 +7747,10 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
 	CUIRect FileButton;
 	static int s_FileButton = 0;
 	MenuBar.VSplitLeft(60.0f, &FileButton, &MenuBar);
-	if(DoButton_Menu(&s_FileButton, "File", 0, &FileButton, 0, nullptr))
+	if(DoButton_Ex(&s_FileButton, "File", 0, &FileButton, 0, nullptr, IGraphics::CORNER_T, EditorFontSizes::MENU, TEXTALIGN_ML))
 	{
 		static SPopupMenuId s_PopupMenuFileId;
-		UI()->DoPopupMenu(&s_PopupMenuFileId, FileButton.x, FileButton.y + FileButton.h - 1.0f, 120.0f, 174.0f, this, PopupMenuFile, PopupProperties);
+		Ui()->DoPopupMenu(&s_PopupMenuFileId, FileButton.x, FileButton.y + FileButton.h - 1.0f, 120.0f, 174.0f, this, PopupMenuFile, PopupProperties);
 	}
 
 	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
@@ -7848,10 +7758,10 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
 	CUIRect ToolsButton;
 	static int s_ToolsButton = 0;
 	MenuBar.VSplitLeft(60.0f, &ToolsButton, &MenuBar);
-	if(DoButton_Menu(&s_ToolsButton, "Tools", 0, &ToolsButton, 0, nullptr))
+	if(DoButton_Ex(&s_ToolsButton, "Tools", 0, &ToolsButton, 0, nullptr, IGraphics::CORNER_T, EditorFontSizes::MENU, TEXTALIGN_ML))
 	{
 		static SPopupMenuId s_PopupMenuToolsId;
-		UI()->DoPopupMenu(&s_PopupMenuToolsId, ToolsButton.x, ToolsButton.y + ToolsButton.h - 1.0f, 200.0f, 64.0f, this, PopupMenuTools, PopupProperties);
+		Ui()->DoPopupMenu(&s_PopupMenuToolsId, ToolsButton.x, ToolsButton.y + ToolsButton.h - 1.0f, 200.0f, 64.0f, this, PopupMenuTools, PopupProperties);
 	}
 
 	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
@@ -7859,17 +7769,19 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
 	CUIRect SettingsButton;
 	static int s_SettingsButton = 0;
 	MenuBar.VSplitLeft(60.0f, &SettingsButton, &MenuBar);
-	if(DoButton_Menu(&s_SettingsButton, "Settings", 0, &SettingsButton, 0, nullptr))
+	if(DoButton_Ex(&s_SettingsButton, "Settings", 0, &SettingsButton, 0, nullptr, IGraphics::CORNER_T, EditorFontSizes::MENU, TEXTALIGN_ML))
 	{
 		static SPopupMenuId s_PopupMenuEntitiesId;
-		UI()->DoPopupMenu(&s_PopupMenuEntitiesId, SettingsButton.x, SettingsButton.y + SettingsButton.h - 1.0f, 200.0f, 92.0f, this, PopupMenuSettings, PopupProperties);
+		Ui()->DoPopupMenu(&s_PopupMenuEntitiesId, SettingsButton.x, SettingsButton.y + SettingsButton.h - 1.0f, 210.0f, 120.0f, this, PopupMenuSettings, PopupProperties);
 	}
 
-	CUIRect ChangedIndicator, Info, Close;
+	CUIRect ChangedIndicator, Info, Help, Close;
 	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
 	MenuBar.VSplitLeft(MenuBar.h, &ChangedIndicator, &MenuBar);
-	MenuBar.VSplitRight(20.0f, &MenuBar, &Close);
-	Close.VSplitLeft(5.0f, nullptr, &Close);
+	MenuBar.VSplitRight(15.0f, &MenuBar, &Close);
+	MenuBar.VSplitRight(5.0f, &MenuBar, nullptr);
+	MenuBar.VSplitRight(15.0f, &MenuBar, &Help);
+	MenuBar.VSplitRight(5.0f, &MenuBar, nullptr);
 	MenuBar.VSplitLeft(MenuBar.w * 0.6f, &MenuBar, &Info);
 	MenuBar.VSplitRight(5.0f, &MenuBar, nullptr);
 
@@ -7877,7 +7789,7 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
 	{
 		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-		UI()->DoLabel(&ChangedIndicator, FONT_ICON_CIRCLE, 8.0f, TEXTALIGN_MC);
+		Ui()->DoLabel(&ChangedIndicator, FONT_ICON_CIRCLE, 8.0f, TEXTALIGN_MC);
 		TextRender()->SetRenderFlags(0);
 		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 		static int s_ChangedIndicator;
@@ -7889,13 +7801,23 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
 	SLabelProperties Props;
 	Props.m_MaxWidth = MenuBar.w;
 	Props.m_EllipsisAtEnd = true;
-	UI()->DoLabel(&MenuBar, aBuf, 10.0f, TEXTALIGN_ML, Props);
+	Ui()->DoLabel(&MenuBar, aBuf, 10.0f, TEXTALIGN_ML, Props);
 
 	char aTimeStr[6];
 	str_timestamp_format(aTimeStr, sizeof(aTimeStr), "%H:%M");
 
-	str_format(aBuf, sizeof(aBuf), "X: %.1f, Y: %.1f, Z: %.1f, A: %.1f, G: %i  %s", UI()->MouseWorldX() / 32.0f, UI()->MouseWorldY() / 32.0f, MapView()->Zoom()->GetValue(), m_AnimateSpeed, MapView()->MapGrid()->Factor(), aTimeStr);
-	UI()->DoLabel(&Info, aBuf, 10.0f, TEXTALIGN_MR);
+	str_format(aBuf, sizeof(aBuf), "X: %.1f, Y: %.1f, Z: %.1f, A: %.1f, G: %i  %s", Ui()->MouseWorldX() / 32.0f, Ui()->MouseWorldY() / 32.0f, MapView()->Zoom()->GetValue(), m_AnimateSpeed, MapView()->MapGrid()->Factor(), aTimeStr);
+	Ui()->DoLabel(&Info, aBuf, 10.0f, TEXTALIGN_MR);
+
+	static int s_HelpButton = 0;
+	if(DoButton_Editor(&s_HelpButton, "?", 0, &Help, 0, "[F1] Open the DDNet Wiki page for the Map Editor in a web browser") || (Input()->KeyPress(KEY_F1) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr))
+	{
+		const char *pLink = Localize("https://wiki.ddnet.org/wiki/Mapping");
+		if(!Client()->ViewLink(pLink))
+		{
+			ShowFileDialogError("Failed to open the link '%s' in the default web browser.", pLink);
+		}
+	}
 
 	static int s_CloseButton = 0;
 	if(DoButton_Editor(&s_CloseButton, "×", 0, &Close, 0, "Exits from the editor"))
@@ -7909,8 +7831,9 @@ void CEditor::Render()
 {
 	// basic start
 	Graphics()->Clear(0.0f, 0.0f, 0.0f);
-	CUIRect View = *UI()->Screen();
-	UI()->MapScreen();
+	CUIRect View = *Ui()->Screen();
+	Ui()->MapScreen();
+	m_CursorType = CURSOR_NORMAL;
 
 	float Width = View.w;
 	float Height = View.h;
@@ -7928,7 +7851,8 @@ void CEditor::Render()
 	{
 		View.HSplitTop(16.0f, &MenuBar, &View);
 		View.HSplitTop(53.0f, &ToolBar, &View);
-		View.VSplitLeft(100.0f, &ToolBox, &View);
+		View.VSplitLeft(m_ToolBoxWidth, &ToolBox, &View);
+
 		View.HSplitBottom(16.0f, &View, &StatusBar);
 		if(!m_ShowPicker && m_ActiveExtraEditor != EXTRAEDITOR_NONE)
 			View.HSplitBottom(m_aExtraEditorSplits[(int)m_ActiveExtraEditor], &View, &ExtraEditor);
@@ -7949,9 +7873,9 @@ void CEditor::Render()
 	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
 	{
 		// handle undo/redo hotkeys
-		if(Input()->KeyPress(KEY_Z) && Input()->ModifierIsPressed())
+		if(Input()->KeyPress(KEY_Z) && Input()->ModifierIsPressed() && !Input()->ShiftIsPressed())
 			UndoLastAction();
-		if(Input()->KeyPress(KEY_Y) && Input()->ModifierIsPressed())
+		if((Input()->KeyPress(KEY_Y) && Input()->ModifierIsPressed()) || (Input()->KeyPress(KEY_Z) && Input()->ModifierIsPressed() && Input()->ShiftIsPressed()))
 			RedoLastAction();
 
 		// handle brush save/load hotkeys
@@ -7986,7 +7910,7 @@ void CEditor::Render()
 
 		RenderBackground(ToolBar, m_BackgroundTexture, 128.0f, Brightness);
 		ToolBar.Margin(2.0f, &ToolBar);
-		ToolBar.VSplitLeft(100.0f, &ModeBar, &ToolBar);
+		ToolBar.VSplitLeft(m_ToolBoxWidth, &ModeBar, &ToolBar);
 
 		RenderBackground(StatusBar, m_BackgroundTexture, 128.0f, Brightness);
 		StatusBar.Margin(2.0f, &StatusBar);
@@ -7998,11 +7922,21 @@ void CEditor::Render()
 	else if(m_Mode == MODE_SOUNDS)
 		DoToolbarSounds(ToolBar);
 
-	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+	if(m_Dialog == DIALOG_NONE)
 	{
 		const bool ModPressed = Input()->ModifierIsPressed();
 		const bool ShiftPressed = Input()->ShiftIsPressed();
 		const bool AltPressed = Input()->AltIsPressed();
+
+		if(CLineInput::GetActiveInput() == nullptr)
+		{
+			// ctrl+a to append map
+			if(Input()->KeyPress(KEY_A) && ModPressed)
+			{
+				InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CallbackAppendMap, this);
+			}
+		}
+
 		// ctrl+n to create new map
 		if(Input()->KeyPress(KEY_N) && ModPressed)
 		{
@@ -8020,11 +7954,6 @@ void CEditor::Render()
 				m_aFileName[0] = 0;
 			}
 		}
-		// ctrl+a to append map
-		if(Input()->KeyPress(KEY_A) && ModPressed)
-		{
-			InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CallbackAppendMap, this);
-		}
 		// ctrl+o or ctrl+l to open
 		if((Input()->KeyPress(KEY_O) || Input()->KeyPress(KEY_L)) && ModPressed)
 		{
@@ -8065,7 +7994,7 @@ void CEditor::Render()
 			InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CallbackSaveCopyMap, this);
 		// ctrl+shift+s to save as
 		else if(Input()->KeyPress(KEY_S) && ModPressed && ShiftPressed)
-			InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CallbackSaveMap, this);
+			m_QuickActionSaveAs.Call();
 		// ctrl+s to save
 		else if(Input()->KeyPress(KEY_S) && ModPressed)
 		{
@@ -8084,6 +8013,12 @@ void CEditor::Render()
 
 	if(m_GuiActive)
 	{
+		CUIRect DragBar;
+		ToolBox.VSplitRight(1.0f, &ToolBox, &DragBar);
+		DragBar.x -= 2.0f;
+		DragBar.w += 4.0f;
+		DoEditorDragBar(ToolBox, &DragBar, EDragSide::SIDE_RIGHT, &m_ToolBoxWidth);
+
 		if(m_Mode == MODE_LAYERS)
 			RenderLayers(ToolBox);
 		else if(m_Mode == MODE_IMAGES)
@@ -8095,7 +8030,7 @@ void CEditor::Render()
 			RenderSounds(ToolBox);
 	}
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 
 	CUIRect TooltipRect;
 	if(m_GuiActive)
@@ -8135,21 +8070,27 @@ void CEditor::Render()
 	if(m_Dialog == DIALOG_FILE)
 	{
 		static int s_NullUiTarget = 0;
-		UI()->SetHotItem(&s_NullUiTarget);
+		Ui()->SetHotItem(&s_NullUiTarget);
 		RenderFileDialog();
 	}
+	else if(m_Dialog == DIALOG_MAPSETTINGS_ERROR)
+	{
+		static int s_NullUiTarget = 0;
+		Ui()->SetHotItem(&s_NullUiTarget);
+		RenderMapSettingsErrorDialog();
+	}
 
 	if(m_PopupEventActivated)
 	{
 		static SPopupMenuId s_PopupEventId;
 		constexpr float PopupWidth = 400.0f;
 		constexpr float PopupHeight = 150.0f;
-		UI()->DoPopupMenu(&s_PopupEventId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupEvent);
+		Ui()->DoPopupMenu(&s_PopupEventId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupEvent);
 		m_PopupEventActivated = false;
 		m_PopupEventWasActivated = true;
 	}
 
-	if(m_Dialog == DIALOG_NONE && !UI()->IsPopupHovered() && (!m_GuiActive || UI()->MouseInside(&View)))
+	if(m_Dialog == DIALOG_NONE && !Ui()->IsPopupHovered() && Ui()->MouseInside(&View))
 	{
 		// handle zoom hotkeys
 		if(Input()->KeyPress(KEY_KP_MINUS))
@@ -8158,18 +8099,53 @@ void CEditor::Render()
 			MapView()->Zoom()->ChangeValue(-50.0f);
 		if(Input()->KeyPress(KEY_KP_MULTIPLY))
 			MapView()->ResetZoom();
-		if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
-			MapView()->Zoom()->ChangeValue(20.0f);
-		if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
-			MapView()->Zoom()->ChangeValue(-20.0f);
+
+		if(m_pBrush->IsEmpty() || !Input()->ShiftIsPressed())
+		{
+			if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
+				MapView()->Zoom()->ChangeValue(20.0f);
+			if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
+				MapView()->Zoom()->ChangeValue(-20.0f);
+		}
+		if(!m_pBrush->IsEmpty())
+		{
+			const bool HasTeleTiles = std::any_of(m_pBrush->m_vpLayers.begin(), m_pBrush->m_vpLayers.end(), [](auto pLayer) {
+				return pLayer->m_Type == LAYERTYPE_TILES && std::static_pointer_cast<CLayerTiles>(pLayer)->m_Tele;
+			});
+			if(HasTeleTiles)
+				str_copy(m_aTooltip, "Use shift+mousewheel up/down to adjust the tele numbers. Use ctrl+f to change all tele numbers to the first unused number.");
+
+			if(Input()->ShiftIsPressed())
+			{
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
+					AdjustBrushSpecialTiles(false, -1);
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
+					AdjustBrushSpecialTiles(false, 1);
+			}
+
+			// Use ctrl+f to replace number in brush with next free
+			if(Input()->ModifierIsPressed() && Input()->KeyPress(KEY_F))
+				AdjustBrushSpecialTiles(true);
+		}
 	}
 
+	for(CEditorComponent &Component : m_vComponents)
+		Component.OnRender(View);
+
 	MapView()->UpdateZoom();
 
-	UI()->RenderPopupMenus();
+	// Cancel color pipette with escape before closing popup menus with escape
+	if(m_ColorPipetteActive && Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+	{
+		m_ColorPipetteActive = false;
+	}
+
+	Ui()->RenderPopupMenus();
 	FreeDynamicPopupMenus();
 
-	if(m_Dialog == DIALOG_NONE && !m_PopupEventActivated && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+	UpdateColorPipette();
+
+	if(m_Dialog == DIALOG_NONE && !m_PopupEventActivated && Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
 	{
 		OnClose();
 		g_Config.m_ClEditor = 0;
@@ -8187,7 +8163,7 @@ void CEditor::RenderPressedKeys(CUIRect View)
 	if(!g_Config.m_EdShowkeys)
 		return;
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 	CTextCursor Cursor;
 	TextRender()->SetCursor(&Cursor, View.x + 10, View.y + View.h - 24 - 10, 24.0f, TEXTFLAG_RENDER);
 
@@ -8212,14 +8188,14 @@ void CEditor::RenderSavingIndicator(CUIRect View)
 	const char *pText = "Saving…";
 	const float FontSize = 24.0f;
 
-	UI()->MapScreen();
+	Ui()->MapScreen();
 	CUIRect Label, Spinner;
 	View.Margin(20.0f, &View);
 	View.HSplitBottom(FontSize, nullptr, &View);
 	View.VSplitRight(TextRender()->TextWidth(FontSize, pText) + 2.0f, &Spinner, &Label);
 	Spinner.VSplitRight(Spinner.h, nullptr, &Spinner);
-	UI()->DoLabel(&Label, pText, FontSize, TEXTALIGN_MR);
-	UI()->RenderProgressSpinner(Spinner.Center(), 8.0f);
+	Ui()->DoLabel(&Label, pText, FontSize, TEXTALIGN_MR);
+	Ui()->RenderProgressSpinner(Spinner.Center(), 8.0f);
 }
 
 void CEditor::FreeDynamicPopupMenus()
@@ -8227,9 +8203,9 @@ void CEditor::FreeDynamicPopupMenus()
 	auto Iterator = m_PopupMessageContexts.begin();
 	while(Iterator != m_PopupMessageContexts.end())
 	{
-		if(!UI()->IsPopupOpen(Iterator->second))
+		if(!Ui()->IsPopupOpen(Iterator->second))
 		{
-			CUI::SMessagePopupContext *pContext = Iterator->second;
+			CUi::SMessagePopupContext *pContext = Iterator->second;
 			Iterator = m_PopupMessageContexts.erase(Iterator);
 			delete pContext;
 		}
@@ -8238,28 +8214,116 @@ void CEditor::FreeDynamicPopupMenus()
 	}
 }
 
+void CEditor::UpdateColorPipette()
+{
+	if(!m_ColorPipetteActive)
+		return;
+
+	static char s_PipetteScreenButton;
+	if(Ui()->HotItem() == &s_PipetteScreenButton)
+	{
+		// Read color one pixel to the top and left as we would otherwise not read the correct
+		// color due to the cursor sprite being rendered over the current mouse position.
+		const int PixelX = clamp<int>(round_to_int((Ui()->MouseX() - 1.0f) / Ui()->Screen()->w * Graphics()->ScreenWidth()), 0, Graphics()->ScreenWidth() - 1);
+		const int PixelY = clamp<int>(round_to_int((Ui()->MouseY() - 1.0f) / Ui()->Screen()->h * Graphics()->ScreenHeight()), 0, Graphics()->ScreenHeight() - 1);
+		Graphics()->ReadPixel(ivec2(PixelX, PixelY), &m_PipetteColor);
+	}
+
+	// Simulate button overlaying the entire screen to intercept all clicks for color pipette.
+	const int ButtonResult = DoButton_Editor_Common(&s_PipetteScreenButton, "", 0, Ui()->Screen(), 0, "Left click to pick a color from the screen. Right click to cancel pipette mode.");
+	// Don't handle clicks if we are panning, so the pipette stays active while panning.
+	// Checking m_pContainerPanned alone is not enough, as this variable is reset when
+	// panning ends before this function is called.
+	if(m_pContainerPanned == nullptr && m_pContainerPannedLast == nullptr)
+	{
+		if(ButtonResult == 1)
+		{
+			char aClipboard[9];
+			str_format(aClipboard, sizeof(aClipboard), "%08X", m_PipetteColor.PackAlphaLast());
+			Input()->SetClipboardText(aClipboard);
+
+			// Check if any of the saved colors is equal to the picked color and
+			// bring it to the front of the list instead of adding a duplicate.
+			int ShiftEnd = (int)std::size(m_aSavedColors) - 1;
+			for(int i = 0; i < (int)std::size(m_aSavedColors); ++i)
+			{
+				if(m_aSavedColors[i].Pack() == m_PipetteColor.Pack())
+				{
+					ShiftEnd = i;
+					break;
+				}
+			}
+			for(int i = ShiftEnd; i > 0; --i)
+			{
+				m_aSavedColors[i] = m_aSavedColors[i - 1];
+			}
+			m_aSavedColors[0] = m_PipetteColor;
+		}
+		if(ButtonResult > 0)
+		{
+			m_ColorPipetteActive = false;
+		}
+	}
+}
+
 void CEditor::RenderMousePointer()
 {
 	if(!m_ShowMousePointer)
 		return;
 
+	constexpr float CursorSize = 16.0f;
+
+	// Cursor
 	Graphics()->WrapClamp();
-	Graphics()->TextureSet(m_CursorTexture);
+	Graphics()->TextureSet(m_aCursorTextures[m_CursorType]);
 	Graphics()->QuadsBegin();
-	if(ms_pUiGotContext == UI()->HotItem())
-		Graphics()->SetColor(1, 0, 0, 1);
-	IGraphics::CQuadItem QuadItem(UI()->MouseX(), UI()->MouseY(), 16.0f, 16.0f);
+	if(m_CursorType == CURSOR_RESIZE_V)
+	{
+		Graphics()->QuadsSetRotation(pi / 2.0f);
+	}
+	if(ms_pUiGotContext == Ui()->HotItem())
+	{
+		Graphics()->SetColor(1.0f, 0.0f, 0.0f, 1.0f);
+	}
+	const float CursorOffset = m_CursorType == CURSOR_RESIZE_V || m_CursorType == CURSOR_RESIZE_H ? -CursorSize / 2.0f : 0.0f;
+	IGraphics::CQuadItem QuadItem(Ui()->MouseX() + CursorOffset, Ui()->MouseY() + CursorOffset, CursorSize, CursorSize);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
 	Graphics()->WrapNormal();
+
+	// Pipette color
+	if(m_ColorPipetteActive)
+	{
+		CUIRect PipetteRect = {Ui()->MouseX() + CursorSize, Ui()->MouseY() + CursorSize, 80.0f, 20.0f};
+		if(PipetteRect.x + PipetteRect.w + 2.0f > Ui()->Screen()->w)
+		{
+			PipetteRect.x = Ui()->MouseX() - PipetteRect.w - CursorSize / 2.0f;
+		}
+		if(PipetteRect.y + PipetteRect.h + 2.0f > Ui()->Screen()->h)
+		{
+			PipetteRect.y = Ui()->MouseY() - PipetteRect.h - CursorSize / 2.0f;
+		}
+		PipetteRect.Draw(ColorRGBA(0.2f, 0.2f, 0.2f, 0.7f), IGraphics::CORNER_ALL, 3.0f);
+
+		CUIRect Pipette, Label;
+		PipetteRect.VSplitLeft(PipetteRect.h, &Pipette, &Label);
+		Pipette.Margin(2.0f, &Pipette);
+		Pipette.Draw(m_PipetteColor, IGraphics::CORNER_ALL, 3.0f);
+
+		char aLabel[8];
+		str_format(aLabel, sizeof(aLabel), "#%06X", m_PipetteColor.PackAlphaLast(false));
+		Ui()->DoLabel(&Label, aLabel, 10.0f, TEXTALIGN_MC);
+	}
 }
 
 void CEditor::Reset(bool CreateDefault)
 {
-	UI()->ClosePopupMenus();
+	Ui()->ClosePopupMenus();
 	m_Map.Clean();
 
-	m_MapView.OnReset();
+	for(CEditorComponent &Component : m_vComponents)
+		Component.OnReset();
+
 	// create default layers
 	if(CreateDefault)
 	{
@@ -8275,10 +8339,8 @@ void CEditor::Reset(bool CreateDefault)
 	m_SelectedSound = 0;
 	m_SelectedSource = -1;
 
-	m_MouseDeltaX = 0;
-	m_MouseDeltaY = 0;
-	m_MouseDeltaWx = 0;
-	m_MouseDeltaWy = 0;
+	m_pContainerPanned = nullptr;
+	m_pContainerPannedLast = nullptr;
 
 	m_Map.m_Modified = false;
 	m_Map.m_ModifiedAuto = false;
@@ -8300,9 +8362,11 @@ void CEditor::Reset(bool CreateDefault)
 
 	m_EnvOpTracker.m_pEditor = this;
 	m_EnvOpTracker.Reset();
+
+	m_MapSettingsCommandContext.Reset();
 }
 
-int CEditor::GetTextureUsageFlag()
+int CEditor::GetTextureUsageFlag() const
 {
 	return Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
 }
@@ -8353,7 +8417,8 @@ void CEditor::Init()
 {
 	m_pInput = Kernel()->RequestInterface<IInput>();
 	m_pClient = Kernel()->RequestInterface<IClient>();
-	m_pConfig = Kernel()->RequestInterface<IConfigManager>()->Values();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pConfig = m_pConfigManager->Values();
 	m_pConsole = Kernel()->RequestInterface<IConsole>();
 	m_pEngine = Kernel()->RequestInterface<IEngine>();
 	m_pGraphics = Kernel()->RequestInterface<IGraphics>();
@@ -8365,17 +8430,22 @@ void CEditor::Init()
 		m_PopupEventWasActivated = false;
 	});
 	m_RenderTools.Init(m_pGraphics, m_pTextRender);
-	m_ZoomEnvelopeX.Init(this);
-	m_ZoomEnvelopeY.Init(this);
+	m_ZoomEnvelopeX.OnInit(this);
+	m_ZoomEnvelopeY.OnInit(this);
 	m_Map.m_pEditor = this;
 
 	m_vComponents.emplace_back(m_MapView);
+	m_vComponents.emplace_back(m_MapSettingsBackend);
+	m_vComponents.emplace_back(m_LayerSelector);
+	m_vComponents.emplace_back(m_Prompt);
 	for(CEditorComponent &Component : m_vComponents)
-		Component.Init(this);
+		Component.OnInit(this);
 
 	m_CheckerTexture = Graphics()->LoadTexture("editor/checker.png", IStorage::TYPE_ALL);
 	m_BackgroundTexture = Graphics()->LoadTexture("editor/background.png", IStorage::TYPE_ALL);
-	m_CursorTexture = Graphics()->LoadTexture("editor/cursor.png", IStorage::TYPE_ALL);
+	m_aCursorTextures[CURSOR_NORMAL] = Graphics()->LoadTexture("editor/cursor.png", IStorage::TYPE_ALL);
+	m_aCursorTextures[CURSOR_RESIZE_H] = Graphics()->LoadTexture("editor/cursor_resize.png", IStorage::TYPE_ALL);
+	m_aCursorTextures[CURSOR_RESIZE_V] = m_aCursorTextures[CURSOR_RESIZE_H];
 
 	m_pTilesetPicker = std::make_shared<CLayerTiles>(this, 16, 16);
 	m_pTilesetPicker->MakePalette();
@@ -8416,29 +8486,11 @@ void CEditor::PlaceBorderTiles()
 
 void CEditor::HandleCursorMovement()
 {
-	static float s_MouseX = 0.0f;
-	static float s_MouseY = 0.0f;
-
-	float MouseRelX = 0.0f, MouseRelY = 0.0f;
-	IInput::ECursorType CursorType = Input()->CursorRelative(&MouseRelX, &MouseRelY);
-	if(CursorType != IInput::CURSOR_NONE)
-		UI()->ConvertMouseMove(&MouseRelX, &MouseRelY, CursorType);
-
-	m_MouseDeltaX += MouseRelX;
-	m_MouseDeltaY += MouseRelY;
-
-	if(!UI()->CheckMouseLock())
-	{
-		s_MouseX = clamp<float>(s_MouseX + MouseRelX, 0.0f, Graphics()->WindowWidth());
-		s_MouseY = clamp<float>(s_MouseY + MouseRelY, 0.0f, Graphics()->WindowHeight());
-	}
-
-	// update positions for ui, but only update ui when rendering
-	m_MouseX = UI()->Screen()->w * ((float)s_MouseX / Graphics()->WindowWidth());
-	m_MouseY = UI()->Screen()->h * ((float)s_MouseY / Graphics()->WindowHeight());
+	const vec2 UpdatedMousePos = Ui()->UpdatedMousePos();
+	const vec2 UpdatedMouseDelta = Ui()->UpdatedMouseDelta();
 
 	// fix correct world x and y
-	std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+	const std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
 	if(pGroup)
 	{
 		float aPoints[4];
@@ -8447,19 +8499,20 @@ void CEditor::HandleCursorMovement()
 		float WorldWidth = aPoints[2] - aPoints[0];
 		float WorldHeight = aPoints[3] - aPoints[1];
 
-		m_MouseWScale = WorldWidth / Graphics()->WindowWidth();
+		m_MouseWorldScale = WorldWidth / Graphics()->WindowWidth();
 
-		m_MouseWorldX = aPoints[0] + WorldWidth * (s_MouseX / Graphics()->WindowWidth());
-		m_MouseWorldY = aPoints[1] + WorldHeight * (s_MouseY / Graphics()->WindowHeight());
-		m_MouseDeltaWx = m_MouseDeltaX * (WorldWidth / Graphics()->WindowWidth());
-		m_MouseDeltaWy = m_MouseDeltaY * (WorldHeight / Graphics()->WindowHeight());
+		m_MouseWorldPos.x = aPoints[0] + WorldWidth * (UpdatedMousePos.x / Graphics()->WindowWidth());
+		m_MouseWorldPos.y = aPoints[1] + WorldHeight * (UpdatedMousePos.y / Graphics()->WindowHeight());
+		m_MouseDeltaWorld.x = UpdatedMouseDelta.x * (WorldWidth / Graphics()->WindowWidth());
+		m_MouseDeltaWorld.y = UpdatedMouseDelta.y * (WorldHeight / Graphics()->WindowHeight());
 	}
 	else
 	{
-		m_MouseWorldX = 0.0f;
-		m_MouseWorldY = 0.0f;
+		m_MouseWorldPos = vec2(-1.0f, -1.0f);
+		m_MouseDeltaWorld = vec2(0.0f, 0.0f);
 	}
 
+	m_MouseWorldNoParaPos = vec2(-1.0f, -1.0f);
 	for(const std::shared_ptr<CLayerGroup> &pGameGroup : m_Map.m_vpGroups)
 	{
 		if(!pGameGroup->m_GameGroup)
@@ -8471,20 +8524,59 @@ void CEditor::HandleCursorMovement()
 		float WorldWidth = aPoints[2] - aPoints[0];
 		float WorldHeight = aPoints[3] - aPoints[1];
 
-		m_MouseWorldNoParaX = aPoints[0] + WorldWidth * (s_MouseX / Graphics()->WindowWidth());
-		m_MouseWorldNoParaY = aPoints[1] + WorldHeight * (s_MouseY / Graphics()->WindowHeight());
+		m_MouseWorldNoParaPos.x = aPoints[0] + WorldWidth * (UpdatedMousePos.x / Graphics()->WindowWidth());
+		m_MouseWorldNoParaPos.y = aPoints[1] + WorldHeight * (UpdatedMousePos.y / Graphics()->WindowHeight());
 	}
+
+	OnMouseMove(UpdatedMousePos);
 }
 
-void CEditor::DispatchInputEvents()
+void CEditor::OnMouseMove(vec2 MousePos)
 {
-	for(size_t i = 0; i < Input()->NumEvents(); i++)
+	m_vHoverTiles.clear();
+	for(size_t g = 0; g < m_Map.m_vpGroups.size(); g++)
 	{
-		const IInput::CEvent &Event = Input()->GetEvent(i);
-		if(!Input()->IsEventValid(Event))
-			continue;
-		UI()->OnInput(Event);
+		const std::shared_ptr<CLayerGroup> pGroup = m_Map.m_vpGroups[g];
+		for(size_t l = 0; l < pGroup->m_vpLayers.size(); l++)
+		{
+			const std::shared_ptr<CLayer> pLayer = pGroup->m_vpLayers[l];
+			int LayerType = pLayer->m_Type;
+			if(LayerType != LAYERTYPE_TILES &&
+				LayerType != LAYERTYPE_FRONT &&
+				LayerType != LAYERTYPE_TELE &&
+				LayerType != LAYERTYPE_SPEEDUP &&
+				LayerType != LAYERTYPE_SWITCH &&
+				LayerType != LAYERTYPE_TUNE)
+				continue;
+
+			std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+			pGroup->MapScreen();
+			float aPoints[4];
+			pGroup->Mapping(aPoints);
+			float WorldWidth = aPoints[2] - aPoints[0];
+			float WorldHeight = aPoints[3] - aPoints[1];
+			CUIRect Rect;
+			Rect.x = aPoints[0] + WorldWidth * (MousePos.x / Graphics()->WindowWidth());
+			Rect.y = aPoints[1] + WorldHeight * (MousePos.y / Graphics()->WindowHeight());
+			Rect.w = 0;
+			Rect.h = 0;
+			RECTi r;
+			pTiles->Convert(Rect, &r);
+			pTiles->Clamp(&r);
+			int x = r.x;
+			int y = r.y;
+
+			if(x < 0 || x >= pTiles->m_Width)
+				continue;
+			if(y < 0 || y >= pTiles->m_Height)
+				continue;
+			CTile Tile = pTiles->GetTile(x, y);
+			if(Tile.m_Index)
+				m_vHoverTiles.emplace_back(
+					g, l, x, y, Tile);
+		}
 	}
+	Ui()->MapScreen();
 }
 
 void CEditor::HandleAutosave()
@@ -8561,7 +8653,7 @@ void CEditor::HandleWriterFinishJobs()
 		return;
 
 	std::shared_ptr<CDataFileWriterFinishJob> pJob = m_WriterFinishJobs.front();
-	if(pJob->Status() != IJob::STATE_DONE)
+	if(!pJob->Done())
 		return;
 	m_WriterFinishJobs.pop_front();
 
@@ -8586,28 +8678,36 @@ void CEditor::HandleWriterFinishJobs()
 	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor/save", aBuf);
 
 	// send rcon.. if we can
-	if(Client()->RconAuthed())
+	if(Client()->RconAuthed() && g_Config.m_EdAutoMapReload)
 	{
 		CServerInfo CurrentServerInfo;
 		Client()->GetServerInfo(&CurrentServerInfo);
-		NETADDR ServerAddr = Client()->ServerAddress();
-		const unsigned char aIpv4Localhost[16] = {127, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-		const unsigned char aIpv6Localhost[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
 
-		// and if we're on localhost
-		if(!mem_comp(ServerAddr.ip, aIpv4Localhost, sizeof(aIpv4Localhost)) || !mem_comp(ServerAddr.ip, aIpv6Localhost, sizeof(aIpv6Localhost)))
+		NETADDR pAddr = Client()->ServerAddress();
+		char aAddrStr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&Client()->ServerAddress(), aAddrStr, sizeof(aAddrStr), true);
+
+		// and if we're on a local address
+		bool IsLocalAddress = false;
+		if(pAddr.ip[0] == 127 || pAddr.ip[0] == 10 || (pAddr.ip[0] == 192 && pAddr.ip[1] == 168) || (pAddr.ip[0] == 172 && (pAddr.ip[1] >= 16 && pAddr.ip[1] <= 31)))
+			IsLocalAddress = true;
+
+		if(str_startswith(aAddrStr, "[fe80:") || str_startswith(aAddrStr, "[::1"))
+			IsLocalAddress = true;
+
+		if(IsLocalAddress)
 		{
 			char aMapName[128];
 			IStorage::StripPathAndExtension(pJob->GetRealFileName(), aMapName, sizeof(aMapName));
 			if(!str_comp(aMapName, CurrentServerInfo.m_aMap))
-				Client()->Rcon("reload");
+				Client()->Rcon("hot_reload");
 		}
 	}
 }
 
 void CEditor::OnUpdate()
 {
-	CUIElementBase::Init(UI()); // update static pointer because game and editor use separate UI
+	CUIElementBase::Init(Ui()); // update static pointer because game and editor use separate UI
 
 	if(!m_EditorWasUsedBefore)
 	{
@@ -8615,29 +8715,40 @@ void CEditor::OnUpdate()
 		Reset();
 	}
 
-	// handle key presses
-	for(size_t i = 0; i < Input()->NumEvents(); i++)
+	m_pContainerPannedLast = m_pContainerPanned;
+
+	// handle mouse movement
+	vec2 CursorRel = vec2(0.0f, 0.0f);
+	IInput::ECursorType CursorType = Input()->CursorRelative(&CursorRel.x, &CursorRel.y);
+	if(CursorType != IInput::CURSOR_NONE)
 	{
-		const IInput::CEvent &Event = Input()->GetEvent(i);
-		if(!Input()->IsEventValid(Event))
-			continue;
+		Ui()->ConvertMouseMove(&CursorRel.x, &CursorRel.y, CursorType);
+		Ui()->OnCursorMove(CursorRel.x, CursorRel.y);
+	}
 
+	// handle key presses
+	Input()->ConsumeEvents([&](const IInput::CEvent &Event) {
 		for(CEditorComponent &Component : m_vComponents)
 		{
-			if(Component.OnInput(Event))
-				break;
+			// Events with flag `FLAG_RELEASE` must always be forwarded to all components so keys being
+			// released can be handled in all components also after some components have been disabled.
+			if(Component.OnInput(Event) && (Event.m_Flags & ~IInput::FLAG_RELEASE) != 0)
+				return;
 		}
-	}
+		Ui()->OnInput(Event);
+	});
 
 	HandleCursorMovement();
-	DispatchInputEvents();
 	HandleAutosave();
 	HandleWriterFinishJobs();
+
+	for(CEditorComponent &Component : m_vComponents)
+		Component.OnUpdate();
 }
 
 void CEditor::OnRender()
 {
-	UI()->ResetMouseSlow();
+	Ui()->ResetMouseSlow();
 
 	// toggle gui
 	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_TAB))
@@ -8652,16 +8763,13 @@ void CEditor::OnRender()
 		m_AnimateTime = 0;
 
 	ms_pUiGotContext = nullptr;
-	UI()->StartCheck();
+	Ui()->StartCheck();
 
-	UI()->Update(m_MouseX, m_MouseY, m_MouseDeltaX, m_MouseDeltaY, m_MouseWorldX, m_MouseWorldY);
+	Ui()->Update(m_MouseWorldPos);
 
 	Render();
 
-	m_MouseDeltaX = 0.0f;
-	m_MouseDeltaY = 0.0f;
-	m_MouseDeltaWx = 0.0f;
-	m_MouseDeltaWy = 0.0f;
+	m_MouseDeltaWorld = vec2(0.0f, 0.0f);
 
 	if(Input()->KeyPress(KEY_F10))
 	{
@@ -8669,8 +8777,11 @@ void CEditor::OnRender()
 		m_ShowMousePointer = true;
 	}
 
-	UI()->FinishCheck();
-	UI()->ClearHotkeys();
+	if(g_Config.m_Debug)
+		Ui()->DebugRender(2.0f, Ui()->Screen()->h - 27.0f);
+
+	Ui()->FinishCheck();
+	Ui()->ClearHotkeys();
 	Input()->Clear();
 
 	CLineInput::RenderCandidates();
@@ -8684,24 +8795,25 @@ void CEditor::OnActivate()
 
 void CEditor::OnWindowResize()
 {
-	UI()->OnWindowResize();
+	Ui()->OnWindowResize();
 }
 
 void CEditor::OnClose()
 {
-	if(m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+	m_ColorPipetteActive = false;
+
+	if(m_ToolbarPreviewSound >= 0 && Sound()->IsPlaying(m_ToolbarPreviewSound))
 		Sound()->Pause(m_ToolbarPreviewSound);
-	if(m_FilePreviewSound && Sound()->IsPlaying(m_FilePreviewSound))
+	if(m_FilePreviewSound >= 0 && Sound()->IsPlaying(m_FilePreviewSound))
 		Sound()->Pause(m_FilePreviewSound);
 }
 
 void CEditor::OnDialogClose()
 {
-	if(m_FilePreviewSound)
-	{
-		Sound()->UnloadSample(m_FilePreviewSound);
-		m_FilePreviewSound = -1;
-	}
+	Graphics()->UnloadTexture(&m_FilePreviewImage);
+	Sound()->UnloadSample(m_FilePreviewSound);
+	m_FilePreviewSound = -1;
+	m_FilePreviewState = PREVIEW_UNLOADED;
 }
 
 void CEditor::LoadCurrentMap()
@@ -8728,7 +8840,11 @@ bool CEditor::Save(const char *pFilename)
 	if(std::any_of(std::begin(m_WriterFinishJobs), std::end(m_WriterFinishJobs), [pFilename](const std::shared_ptr<CDataFileWriterFinishJob> &Job) { return str_comp(pFilename, Job->GetRealFileName()) == 0; }))
 		return false;
 
-	return m_Map.Save(pFilename);
+	const auto &&ErrorHandler = [this](const char *pErrorMessage) {
+		ShowFileDialogError("%s", pErrorMessage);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor/save", pErrorMessage);
+	};
+	return m_Map.Save(pFilename, ErrorHandler);
 }
 
 bool CEditor::HandleMapDrop(const char *pFileName, int StorageType)
@@ -8760,7 +8876,9 @@ bool CEditor::Load(const char *pFileName, int StorageType)
 		str_copy(m_aFileName, pFileName);
 		SortImages();
 		SelectGameLayer();
-		MapView()->OnMapLoad();
+
+		for(CEditorComponent &Component : m_vComponents)
+			Component.OnMapLoad();
 	}
 	else
 	{
@@ -8787,31 +8905,63 @@ bool CEditor::Append(const char *pFileName, int StorageType, bool IgnoreHistory)
 		(int)m_Map.m_vpSounds.size(),
 		(int)m_Map.m_vpEnvelopes.size()};
 
+	// Keep a map to check if specific indices have already been replaced to prevent
+	// replacing those indices again when transfering images
+	static std::map<int *, bool> s_ReplacedMap;
 	static const auto &&s_ReplaceIndex = [](int ToReplace, int ReplaceWith) {
 		return [ToReplace, ReplaceWith](int *pIndex) {
-			if(*pIndex == ToReplace)
+			if(*pIndex == ToReplace && !s_ReplacedMap[pIndex])
+			{
 				*pIndex = ReplaceWith;
+				s_ReplacedMap[pIndex] = true;
+			}
 		};
 	};
 
-	//Transfer non-duplicate images
+	const auto &&Rename = [&](const std::shared_ptr<CEditorImage> &pImage) {
+		char aRenamed[IO_MAX_PATH_LENGTH];
+		int DuplicateCount = 1;
+		str_copy(aRenamed, pImage->m_aName);
+		while(std::find_if(m_Map.m_vpImages.begin(), m_Map.m_vpImages.end(), [aRenamed](const std::shared_ptr<CEditorImage> &OtherImage) { return str_comp(OtherImage->m_aName, aRenamed) == 0; }) != m_Map.m_vpImages.end())
+			str_format(aRenamed, sizeof(aRenamed), "%s (%d)", pImage->m_aName, DuplicateCount++); // Rename to "image_name (%d)"
+		str_copy(pImage->m_aName, aRenamed);
+	};
+
+	// Transfer non-duplicate images
+	s_ReplacedMap.clear();
 	for(auto NewMapIt = NewMap.m_vpImages.begin(); NewMapIt != NewMap.m_vpImages.end(); ++NewMapIt)
 	{
 		auto pNewImage = *NewMapIt;
 		auto NameIsTaken = [pNewImage](const std::shared_ptr<CEditorImage> &OtherImage) { return str_comp(pNewImage->m_aName, OtherImage->m_aName) == 0; };
-		auto MatchInCurrentMap = std::find_if(begin(m_Map.m_vpImages), end(m_Map.m_vpImages), NameIsTaken);
+		auto MatchInCurrentMap = std::find_if(m_Map.m_vpImages.begin(), m_Map.m_vpImages.end(), NameIsTaken);
 
-		const bool IsDuplicate = MatchInCurrentMap != std::end(m_Map.m_vpImages);
+		const bool IsDuplicate = MatchInCurrentMap != m_Map.m_vpImages.end();
 		const int IndexToReplace = NewMapIt - NewMap.m_vpImages.begin();
 
 		if(IsDuplicate)
 		{
-			const int IndexToReplaceWith = MatchInCurrentMap - m_Map.m_vpImages.begin();
+			// Check for image data
+			const bool ImageDataEquals = (*MatchInCurrentMap)->DataEquals(*pNewImage);
+
+			if(ImageDataEquals)
+			{
+				const int IndexToReplaceWith = MatchInCurrentMap - m_Map.m_vpImages.begin();
+
+				dbg_msg("editor", "map already contains image %s with the same data, removing duplicate", pNewImage->m_aName);
 
-			dbg_msg("editor", "map contains image %s already, removing duplicate", pNewImage->m_aName);
+				// In the new map, replace the index of the duplicate image to the index of the same in the current map.
+				NewMap.ModifyImageIndex(s_ReplaceIndex(IndexToReplace, IndexToReplaceWith));
+			}
+			else
+			{
+				// Rename image and add it
+				Rename(pNewImage);
+
+				dbg_msg("editor", "map already contains image %s but contents of appended image is different. Renaming to %s", (*MatchInCurrentMap)->m_aName, pNewImage->m_aName);
 
-			//In the new map, replace the index of the duplicate image to the index of the same in the current map.
-			NewMap.ModifyImageIndex(s_ReplaceIndex(IndexToReplace, IndexToReplaceWith));
+				NewMap.ModifyImageIndex(s_ReplaceIndex(IndexToReplace, m_Map.m_vpImages.size()));
+				m_Map.m_vpImages.push_back(pNewImage);
+			}
 		}
 		else
 		{
@@ -8853,6 +9003,22 @@ bool CEditor::Append(const char *pFileName, int StorageType, bool IgnoreHistory)
 	}
 	NewMap.m_vpGroups.clear();
 
+	// transfer server settings
+	for(const auto &pSetting : NewMap.m_vSettings)
+	{
+		// Check if setting already exists
+		bool AlreadyExists = false;
+		for(const auto &pExistingSetting : m_Map.m_vSettings)
+		{
+			if(!str_comp(pExistingSetting.m_aCommand, pSetting.m_aCommand))
+				AlreadyExists = true;
+		}
+		if(!AlreadyExists)
+			m_Map.m_vSettings.push_back(pSetting);
+	}
+
+	NewMap.m_vSettings.clear();
+
 	auto IndexMap = SortImages();
 
 	if(!IgnoreHistory)
@@ -8862,8 +9028,6 @@ bool CEditor::Append(const char *pFileName, int StorageType, bool IgnoreHistory)
 	return true;
 }
 
-IEditor *CreateEditor() { return new CEditor; }
-
 void CEditor::UndoLastAction()
 {
 	if(m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS)
@@ -8883,3 +9047,118 @@ void CEditor::RedoLastAction()
 	else
 		m_EditorHistory.Redo();
 }
+
+void CEditor::AdjustBrushSpecialTiles(bool UseNextFree, int Adjust)
+{
+	// Adjust m_Number field of tune, switch and tele tiles by `Adjust` if `UseNextFree` is false
+	// If true, then use the next free number instead
+
+	auto &&AdjustNumber = [Adjust](unsigned char &Number) {
+		Number = ((Number + Adjust) - 1 + 255) % 255 + 1;
+	};
+
+	for(auto &pLayer : m_pBrush->m_vpLayers)
+	{
+		if(pLayer->m_Type != LAYERTYPE_TILES)
+			continue;
+
+		std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+
+		// Only handle tele, switch and tune layers
+		if(pLayerTiles->m_Tele)
+		{
+			int NextFreeTeleNumber = FindNextFreeTeleNumber();
+			int NextFreeCPNumber = FindNextFreeTeleNumber(true);
+
+			std::shared_ptr<CLayerTele> pTeleLayer = std::static_pointer_cast<CLayerTele>(pLayer);
+			for(int y = 0; y < pTeleLayer->m_Height; y++)
+			{
+				for(int x = 0; x < pTeleLayer->m_Width; x++)
+				{
+					int i = y * pTeleLayer->m_Width + x;
+					if(!IsValidTeleTile(pTeleLayer->m_pTiles[i].m_Index) || (!UseNextFree && !pTeleLayer->m_pTeleTile[i].m_Number))
+						continue;
+
+					if(UseNextFree)
+					{
+						if(IsTeleTileCheckpoint(pTeleLayer->m_pTiles[i].m_Index))
+							pTeleLayer->m_pTeleTile[i].m_Number = NextFreeCPNumber;
+						else
+							pTeleLayer->m_pTeleTile[i].m_Number = NextFreeTeleNumber;
+					}
+					else
+						AdjustNumber(pTeleLayer->m_pTeleTile[i].m_Number);
+				}
+			}
+		}
+		else if(pLayerTiles->m_Tune)
+		{
+			if(!UseNextFree)
+			{
+				std::shared_ptr<CLayerTune> pTuneLayer = std::static_pointer_cast<CLayerTune>(pLayer);
+				for(int y = 0; y < pTuneLayer->m_Height; y++)
+				{
+					for(int x = 0; x < pTuneLayer->m_Width; x++)
+					{
+						int i = y * pTuneLayer->m_Width + x;
+						if(!IsValidTuneTile(pTuneLayer->m_pTiles[i].m_Index) || !pTuneLayer->m_pTuneTile[i].m_Number)
+							continue;
+
+						AdjustNumber(pTuneLayer->m_pTuneTile[i].m_Number);
+					}
+				}
+			}
+		}
+		else if(pLayerTiles->m_Switch)
+		{
+			int NextFreeNumber = FindNextFreeSwitchNumber();
+
+			std::shared_ptr<CLayerSwitch> pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(pLayer);
+			for(int y = 0; y < pSwitchLayer->m_Height; y++)
+			{
+				for(int x = 0; x < pSwitchLayer->m_Width; x++)
+				{
+					int i = y * pSwitchLayer->m_Width + x;
+					if(!IsValidSwitchTile(pSwitchLayer->m_pTiles[i].m_Index) || (!UseNextFree && !pSwitchLayer->m_pSwitchTile[i].m_Number))
+						continue;
+
+					if(UseNextFree)
+						pSwitchLayer->m_pSwitchTile[i].m_Number = NextFreeNumber;
+					else
+						AdjustNumber(pSwitchLayer->m_pSwitchTile[i].m_Number);
+				}
+			}
+		}
+	}
+}
+
+int CEditor::FindNextFreeSwitchNumber()
+{
+	int Number = -1;
+
+	for(int i = 1; i <= 255; i++)
+	{
+		if(!m_Map.m_pSwitchLayer->ContainsElementWithId(i))
+		{
+			Number = i;
+			break;
+		}
+	}
+	return Number;
+}
+
+int CEditor::FindNextFreeTeleNumber(bool IsCheckpoint)
+{
+	int Number = -1;
+	for(int i = 1; i <= 255; i++)
+	{
+		if(!m_Map.m_pTeleLayer->ContainsElementWithId(i, IsCheckpoint))
+		{
+			Number = i;
+			break;
+		}
+	}
+	return Number;
+}
+
+IEditor *CreateEditor() { return new CEditor; }
diff --git a/src/game/editor/editor.h b/src/game/editor/editor.h
index 7977cb0904..9e1287c788 100644
--- a/src/game/editor/editor.h
+++ b/src/game/editor/editor.h
@@ -8,8 +8,10 @@
 
 #include <game/client/render.h>
 #include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
 #include <game/mapitems.h>
 
+#include <game/editor/enums.h>
 #include <game/editor/mapitems/envelope.h>
 #include <game/editor/mapitems/layer.h>
 #include <game/editor/mapitems/layer_front.h>
@@ -23,17 +25,22 @@
 #include <game/editor/mapitems/layer_tiles.h>
 #include <game/editor/mapitems/layer_tune.h>
 
+#include <engine/console.h>
 #include <engine/editor.h>
 #include <engine/engine.h>
 #include <engine/graphics.h>
 #include <engine/shared/datafile.h>
 #include <engine/shared/jobs.h>
 
-#include "auto_map.h"
 #include "editor_history.h"
+#include "editor_server_settings.h"
 #include "editor_trackers.h"
+#include "editor_ui.h"
+#include "layer_selector.h"
 #include "map_view.h"
 #include "smooth_value.h"
+#include <game/editor/prompt.h>
+#include <game/editor/quick_action.h>
 
 #include <deque>
 #include <functional>
@@ -43,6 +50,8 @@
 #include <vector>
 
 typedef std::function<void(int *pIndex)> FIndexModifyFunction;
+template<typename T>
+using FDropdownRenderCallback = std::function<void(const T &, char (&aOutput)[128], std::vector<STextColorSplit> &)>;
 
 // CEditor SPECIFIC
 enum
@@ -54,6 +63,8 @@ enum
 
 	DIALOG_NONE = 0,
 	DIALOG_FILE,
+	DIALOG_MAPSETTINGS_ERROR,
+	DIALOG_QUICK_PROMPT,
 };
 
 class CEditorImage;
@@ -116,16 +127,7 @@ class CEditorMap
 	CMapInfo m_MapInfo;
 	CMapInfo m_MapInfoTmp;
 
-	struct CSetting
-	{
-		char m_aCommand[256];
-
-		CSetting(const char *pCommand)
-		{
-			str_copy(m_aCommand, pCommand);
-		}
-	};
-	std::vector<CSetting> m_vSettings;
+	std::vector<CEditorMapSetting> m_vSettings;
 
 	std::shared_ptr<class CLayerGame> m_pGameLayer;
 	std::shared_ptr<CLayerGroup> m_pGameGroup;
@@ -198,7 +200,8 @@ class CEditorMap
 	void CreateDefault(IGraphics::CTextureHandle EntitiesTexture);
 
 	// io
-	bool Save(const char *pFilename);
+	bool Save(const char *pFilename, const std::function<void(const char *pErrorMessage)> &ErrorHandler);
+	bool PerformPreSaveSanityChecks(const std::function<void(const char *pErrorMessage)> &ErrorHandler);
 	bool Load(const char *pFilename, int StorageType, const std::function<void(const char *pErrorMessage)> &ErrorHandler);
 	void PerformSanityChecks(const std::function<void(const char *pErrorMessage)> &ErrorHandler);
 
@@ -229,8 +232,7 @@ enum
 {
 	PROPTYPE_NULL = 0,
 	PROPTYPE_BOOL,
-	PROPTYPE_INT_STEP,
-	PROPTYPE_INT_SCROLL,
+	PROPTYPE_INT,
 	PROPTYPE_ANGLE_SCROLL,
 	PROPTYPE_COLOR,
 	PROPTYPE_IMAGE,
@@ -267,6 +269,7 @@ class CEditor : public IEditor
 {
 	class IInput *m_pInput = nullptr;
 	class IClient *m_pClient = nullptr;
+	class IConfigManager *m_pConfigManager = nullptr;
 	class CConfig *m_pConfig = nullptr;
 	class IConsole *m_pConsole = nullptr;
 	class IEngine *m_pEngine = nullptr;
@@ -275,10 +278,12 @@ class CEditor : public IEditor
 	class ISound *m_pSound = nullptr;
 	class IStorage *m_pStorage = nullptr;
 	CRenderTools m_RenderTools;
-	CUI m_UI;
+	CUi m_UI;
 
 	std::vector<std::reference_wrapper<CEditorComponent>> m_vComponents;
 	CMapView m_MapView;
+	CLayerSelector m_LayerSelector;
+	CPrompt m_Prompt;
 
 	bool m_EditorWasUsedBefore = false;
 
@@ -290,7 +295,7 @@ class CEditor : public IEditor
 	IGraphics::CTextureHandle m_SwitchTexture;
 	IGraphics::CTextureHandle m_TuneTexture;
 
-	int GetTextureUsageFlag();
+	int GetTextureUsageFlag() const;
 
 	enum EPreviewState
 	{
@@ -300,26 +305,56 @@ class CEditor : public IEditor
 	};
 
 	std::shared_ptr<CLayerGroup> m_apSavedBrushes[10];
+	static const ColorRGBA ms_DefaultPropColor;
 
 public:
-	class IInput *Input() { return m_pInput; }
-	class IClient *Client() { return m_pClient; }
-	class CConfig *Config() { return m_pConfig; }
-	class IConsole *Console() { return m_pConsole; }
-	class IEngine *Engine() { return m_pEngine; }
-	class IGraphics *Graphics() { return m_pGraphics; }
-	class ISound *Sound() { return m_pSound; }
-	class ITextRender *TextRender() { return m_pTextRender; }
-	class IStorage *Storage() { return m_pStorage; }
-	CUI *UI() { return &m_UI; }
+	class IInput *Input() const { return m_pInput; }
+	class IClient *Client() const { return m_pClient; }
+	class IConfigManager *ConfigManager() const { return m_pConfigManager; }
+	class CConfig *Config() const { return m_pConfig; }
+	class IConsole *Console() const { return m_pConsole; }
+	class IEngine *Engine() const { return m_pEngine; }
+	class IGraphics *Graphics() const { return m_pGraphics; }
+	class ISound *Sound() const { return m_pSound; }
+	class ITextRender *TextRender() const { return m_pTextRender; }
+	class IStorage *Storage() const { return m_pStorage; }
+	CUi *Ui() { return &m_UI; }
 	CRenderTools *RenderTools() { return &m_RenderTools; }
 
 	CMapView *MapView() { return &m_MapView; }
 	const CMapView *MapView() const { return &m_MapView; }
+	CLayerSelector *LayerSelector() { return &m_LayerSelector; }
+
+	void SelectNextLayer();
+	void SelectPreviousLayer();
+
+	void FillGameTiles(EGameTileOp FillTile) const;
+	bool CanFillGameTiles() const;
+	void AddQuadOrSound();
+	void AddGroup();
+	void AddSoundLayer();
+	void AddTileLayer();
+	void AddQuadsLayer();
+	void AddSwitchLayer();
+	void AddFrontLayer();
+	void AddTuneLayer();
+	void AddSpeedupLayer();
+	void AddTeleLayer();
+	void DeleteSelectedLayer();
+	void LayerSelectImage();
+	bool IsNonGameTileLayerSelected() const;
+	void MapDetails();
+#define REGISTER_QUICK_ACTION(name, text, callback, disabled, active, button_color, description) CQuickAction m_QuickAction##name;
+#include <game/editor/quick_actions.h>
+#undef REGISTER_QUICK_ACTION
 
 	CEditor() :
+#define REGISTER_QUICK_ACTION(name, text, callback, disabled, active, button_color, description) m_QuickAction##name(text, description, callback, disabled, active, button_color),
+#include <game/editor/quick_actions.h>
+#undef REGISTER_QUICK_ACTION
 		m_ZoomEnvelopeX(1.0f, 0.1f, 600.0f),
-		m_ZoomEnvelopeY(640.0f, 0.1f, 32000.0f)
+		m_ZoomEnvelopeY(640.0f, 0.1f, 32000.0f),
+		m_MapSettingsCommandContext(m_MapSettingsBackend.NewContext(&m_SettingsCommandInput))
 	{
 		m_EntitiesTexture.Invalidate();
 		m_FrontTexture.Invalidate();
@@ -366,10 +401,6 @@ class CEditor : public IEditor
 		m_OffsetEnvelopeY = 0.5f;
 
 		m_ShowMousePointer = true;
-		m_MouseDeltaX = 0;
-		m_MouseDeltaY = 0;
-		m_MouseDeltaWx = 0;
-		m_MouseDeltaWy = 0;
 
 		m_GuiActive = true;
 		m_PreviewZoom = false;
@@ -380,6 +411,7 @@ class CEditor : public IEditor
 		m_AnimateStart = 0;
 		m_AnimateTime = 0;
 		m_AnimateSpeed = 1;
+		m_AnimateUpdatePopup = false;
 
 		m_ShowEnvelopePreview = SHOWENV_NONE;
 		m_SelectedQuadEnvelope = -1;
@@ -394,15 +426,24 @@ class CEditor : public IEditor
 		m_QuadKnifeCount = 0;
 		mem_zero(m_aQuadKnifePoints, sizeof(m_aQuadKnifePoints));
 
+		for(size_t i = 0; i < std::size(m_aSavedColors); ++i)
+		{
+			m_aSavedColors[i] = color_cast<ColorRGBA>(ColorHSLA(i / (float)std::size(m_aSavedColors), 1.0f, 0.5f));
+		}
+
 		m_CheckerTexture.Invalidate();
 		m_BackgroundTexture.Invalidate();
-		m_CursorTexture.Invalidate();
+		for(auto &CursorTexture : m_aCursorTextures)
+			CursorTexture.Invalidate();
+
+		m_CursorType = CURSOR_NORMAL;
 
 		ms_pUiGotContext = nullptr;
 
 		// DDRace
 
 		m_TeleNumber = 1;
+		m_TeleCheckpointNumber = 1;
 		m_SwitchNum = 1;
 		m_TuningNum = 1;
 		m_SwitchDelay = 0;
@@ -415,6 +456,27 @@ class CEditor : public IEditor
 		m_BrushDrawDestructive = true;
 	}
 
+	class CHoverTile
+	{
+	public:
+		CHoverTile(int Group, int Layer, int x, int y, const CTile Tile) :
+			m_Group(Group),
+			m_Layer(Layer),
+			m_X(x),
+			m_Y(y),
+			m_Tile(Tile)
+		{
+		}
+
+		int m_Group;
+		int m_Layer;
+		int m_X;
+		int m_Y;
+		const CTile m_Tile;
+	};
+	std::vector<CHoverTile> m_vHoverTiles;
+	const std::vector<CHoverTile> &HoverTiles() const { return m_vHoverTiles; }
+
 	void Init() override;
 	void OnUpdate() override;
 	void OnRender() override;
@@ -429,7 +491,7 @@ class CEditor : public IEditor
 	void ResetIngameMoved() override { m_IngameMoved = false; }
 
 	void HandleCursorMovement();
-	void DispatchInputEvents();
+	void OnMouseMove(vec2 MousePos);
 	void HandleAutosave();
 	bool PerformAutosave();
 	void HandleWriterFinishJobs();
@@ -446,7 +508,7 @@ class CEditor : public IEditor
 			return str_comp(pLhs, pRhs) < 0;
 		}
 	};
-	std::map<const char *, CUI::SMessagePopupContext *, SStringKeyComparator> m_PopupMessageContexts;
+	std::map<const char *, CUi::SMessagePopupContext *, SStringKeyComparator> m_PopupMessageContexts;
 	void ShowFileDialogError(const char *pFormat, ...)
 		GNUC_ATTRIBUTE((format(printf, 2, 3)));
 
@@ -461,6 +523,7 @@ class CEditor : public IEditor
 	void RenderPressedKeys(CUIRect View);
 	void RenderSavingIndicator(CUIRect View);
 	void FreeDynamicPopupMenus();
+	void UpdateColorPipette();
 	void RenderMousePointer();
 
 	std::vector<CQuad *> GetSelectedQuads();
@@ -499,12 +562,12 @@ class CEditor : public IEditor
 	std::pair<int, int> EnvGetSelectedTimeAndValue() const;
 
 	template<typename E>
-	SEditResult<E> DoPropertiesWithState(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f));
-	int DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f));
+	SEditResult<E> DoPropertiesWithState(CUIRect *pToolbox, CProperty *pProps, int *pIds, int *pNewVal, const std::vector<ColorRGBA> &vColors = {});
+	int DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIds, int *pNewVal, const std::vector<ColorRGBA> &vColors = {});
 
-	CUI::SColorPickerPopupContext m_ColorPickerPopupContext;
-	const void *m_pColorPickerPopupActiveID = nullptr;
-	void DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor);
+	CUi::SColorPickerPopupContext m_ColorPickerPopupContext;
+	const void *m_pColorPickerPopupActiveId = nullptr;
+	void DoColorPickerButton(const void *pId, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor);
 
 	int m_Mode;
 	int m_Dialog;
@@ -579,7 +642,8 @@ class CEditor : public IEditor
 	IGraphics::CTextureHandle m_FilePreviewImage;
 	int m_FilePreviewSound;
 	EPreviewState m_FilePreviewState;
-	CImageInfo m_FilePreviewImageInfo;
+	int m_FilePreviewImageWidth;
+	int m_FilePreviewImageHeight;
 	bool m_FileDialogOpening;
 
 	int m_ToolbarPreviewSound;
@@ -669,17 +733,13 @@ class CEditor : public IEditor
 
 	char m_aMenuBackgroundTooltip[256];
 	bool m_PreviewZoom;
-	float m_MouseWScale = 1.0f; // Mouse (i.e. UI) scale relative to the World (selected Group)
-	float m_MouseX = 0.0f;
-	float m_MouseY = 0.0f;
-	float m_MouseWorldX = 0.0f;
-	float m_MouseWorldY = 0.0f;
-	float m_MouseWorldNoParaX = 0.0f;
-	float m_MouseWorldNoParaY = 0.0f;
-	float m_MouseDeltaX;
-	float m_MouseDeltaY;
-	float m_MouseDeltaWx;
-	float m_MouseDeltaWy;
+	float m_MouseWorldScale = 1.0f; // Mouse (i.e. UI) scale relative to the World (selected Group)
+	vec2 m_MouseWorldPos = vec2(0.0f, 0.0f);
+	vec2 m_MouseWorldNoParaPos = vec2(0.0f, 0.0f);
+	vec2 m_MouseDeltaWorld = vec2(0.0f, 0.0f);
+	const void *m_pContainerPanned;
+	const void *m_pContainerPannedLast;
+	char m_MapEditorId; // UI element ID for the main map editor
 
 	enum EShowTile
 	{
@@ -689,10 +749,12 @@ class CEditor : public IEditor
 	};
 	EShowTile m_ShowTileInfo;
 	bool m_ShowDetail;
+
 	bool m_Animate;
 	int64_t m_AnimateStart;
 	float m_AnimateTime;
 	float m_AnimateSpeed;
+	bool m_AnimateUpdatePopup;
 
 	enum EExtraEditor
 	{
@@ -704,6 +766,7 @@ class CEditor : public IEditor
 	};
 	EExtraEditor m_ActiveExtraEditor = EXTRAEDITOR_NONE;
 	float m_aExtraEditorSplits[NUM_EXTRAEDITORS] = {250.0f, 250.0f, 250.0f};
+	float m_ToolBoxWidth = 100.0f;
 
 	enum EShowEnvelope
 	{
@@ -735,9 +798,23 @@ class CEditor : public IEditor
 	int m_QuadKnifeCount;
 	vec2 m_aQuadKnifePoints[4];
 
+	// Color palette and pipette
+	ColorRGBA m_aSavedColors[8];
+	ColorRGBA m_PipetteColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+	bool m_ColorPipetteActive = false;
+
 	IGraphics::CTextureHandle m_CheckerTexture;
 	IGraphics::CTextureHandle m_BackgroundTexture;
-	IGraphics::CTextureHandle m_CursorTexture;
+
+	enum ECursorType
+	{
+		CURSOR_NORMAL,
+		CURSOR_RESIZE_V,
+		CURSOR_RESIZE_H,
+		NUM_CURSORS
+	};
+	IGraphics::CTextureHandle m_aCursorTextures[ECursorType::NUM_CURSORS];
+	ECursorType m_CursorType;
 
 	IGraphics::CTextureHandle GetEntitiesTexture();
 
@@ -752,9 +829,11 @@ class CEditor : public IEditor
 
 	int m_ShiftBy;
 
-	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
+	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Result, size_t Channels, void *pUser);
 
 	CLineInputBuffered<256> m_SettingsCommandInput;
+	CMapSettingsBackend m_MapSettingsBackend;
+	CMapSettingsBackend::CContext m_MapSettingsCommandContext;
 
 	CImageInfo m_TileartImageInfo;
 	char m_aTileartFilename[IO_MAX_PATH_LENGTH];
@@ -763,34 +842,35 @@ class CEditor : public IEditor
 
 	void PlaceBorderTiles();
 
-	void UpdateTooltip(const void *pID, const CUIRect *pRect, const char *pToolTip);
-	int DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
-	int DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
-	int DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA Color, int Corners);
+	void UpdateTooltip(const void *pId, const CUIRect *pRect, const char *pToolTip);
+	int DoButton_Editor_Common(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_Editor(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_Env(const void *pId, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA Color, int Corners);
 
-	int DoButton_Ex(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = 10.0f);
-	int DoButton_FontIcon(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = 10.0f);
-	int DoButton_ButtonDec(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
-	int DoButton_ButtonInc(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_Ex(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = EditorFontSizes::MENU, int Align = TEXTALIGN_MC);
+	int DoButton_FontIcon(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = 10.0f);
+	int DoButton_MenuItem(const void *pId, const char *pText, int Checked, const CUIRect *pRect, int Flags = 0, const char *pToolTip = nullptr);
 
-	int DoButton_File(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_DraggableEx(const void *pId, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip = nullptr, int Corners = IGraphics::CORNER_ALL, float FontSize = 10.0f);
 
-	int DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
-	int DoButton_MenuItem(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags = 0, const char *pToolTip = nullptr);
+	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr, const std::vector<STextColorSplit> &vColorSplits = {});
+	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr, const std::vector<STextColorSplit> &vColorSplits = {});
 
-	int DoButton_DraggableEx(const void *pID, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip = nullptr, int Corners = IGraphics::CORNER_ALL, float FontSize = 10.0f);
+	void DoMapSettingsEditBox(CMapSettingsBackend::CContext *pContext, const CUIRect *pRect, float FontSize, float DropdownMaxHeight, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr);
 
-	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr);
-	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr);
+	template<typename T>
+	int DoEditBoxDropdown(SEditBoxDropdownContext *pDropdown, CLineInput *pLineInput, const CUIRect *pEditBoxRect, int x, float MaxHeight, bool AutoWidth, const std::vector<T> &vData, const FDropdownRenderCallback<T> &pfnMatchCallback);
+	template<typename T>
+	int RenderEditBoxDropdown(SEditBoxDropdownContext *pDropdown, CUIRect View, CLineInput *pLineInput, int x, float MaxHeight, bool AutoWidth, const std::vector<T> &vData, const FDropdownRenderCallback<T> &pfnMatchCallback);
 
-	void RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness);
+	void RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness) const;
 
-	SEditResult<int> UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int corners = IGraphics::CORNER_ALL, ColorRGBA *pColor = nullptr, bool ShowValue = true);
+	SEditResult<int> UiDoValueSelector(void *pId, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int Corners = IGraphics::CORNER_ALL, const ColorRGBA *pColor = nullptr, bool ShowValue = true);
 
-	static CUI::EPopupMenuFunctionResult PopupMenuFile(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupMenuTools(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupMenuSettings(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupGroup(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupMenuFile(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupMenuTools(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupMenuSettings(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupGroup(void *pContext, CUIRect View, bool Active);
 	struct SLayerPopupContext : public SPopupMenuId
 	{
 		CEditor *m_pEditor;
@@ -798,29 +878,30 @@ class CEditor : public IEditor
 		std::vector<int> m_vLayerIndices;
 		CLayerTiles::SCommonPropState m_CommonPropState;
 	};
-	static CUI::EPopupMenuFunctionResult PopupLayer(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupQuad(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSource(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupPoint(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupEnvPoint(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupEnvPointMulti(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupImage(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSound(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupNewFolder(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupMapInfo(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupEvent(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSelectImage(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSelectSound(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSelectGametileOp(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupTele(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSpeedup(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupSwitch(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupTune(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupGoto(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupEntities(void *pContext, CUIRect View, bool Active);
-	static CUI::EPopupMenuFunctionResult PopupProofMode(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupLayer(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupQuad(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSource(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupPoint(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupEnvPoint(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupEnvPointMulti(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupImage(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSound(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupNewFolder(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupMapInfo(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupEvent(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSelectImage(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSelectSound(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSelectGametileOp(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupTele(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSpeedup(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupSwitch(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupTune(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupGoto(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupEntities(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupProofMode(void *pContext, CUIRect View, bool Active);
+	static CUi::EPopupMenuFunctionResult PopupAnimateSettings(void *pContext, CUIRect View, bool Active);
 
 	static bool CallbackOpenMap(const char *pFileName, int StorageType, void *pUser);
 	static bool CallbackAppendMap(const char *pFileName, int StorageType, void *pUser);
@@ -829,6 +910,7 @@ class CEditor : public IEditor
 	static bool CallbackAddTileart(const char *pFilepath, int StorageType, void *pUser);
 	static bool CallbackSaveImage(const char *pFileName, int StorageType, void *pUser);
 	static bool CallbackSaveSound(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackCustomEntities(const char *pFileName, int StorageType, void *pUser);
 
 	void PopupSelectImageInvoke(int Current, float x, float y);
 	int PopupSelectImageResult();
@@ -844,14 +926,14 @@ class CEditor : public IEditor
 
 	void DoQuadEnvelopes(const std::vector<CQuad> &vQuads, IGraphics::CTextureHandle Texture = IGraphics::CTextureHandle());
 	void DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int pIndex);
-	void DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int v);
+	void DoQuadPoint(int LayerIndex, const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int v);
 	void SetHotQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer);
 
 	float TriangleArea(vec2 A, vec2 B, vec2 C);
 	bool IsInTriangle(vec2 Point, vec2 A, vec2 B, vec2 C);
 	void DoQuadKnife(int QuadIndex);
 
-	void DoSoundSource(CSoundSource *pSource, int Index);
+	void DoSoundSource(int LayerIndex, CSoundSource *pSource, int Index);
 
 	enum class EAxis
 	{
@@ -875,13 +957,13 @@ class CEditor : public IEditor
 	void DoMapEditor(CUIRect View);
 	void DoToolbarLayers(CUIRect Toolbar);
 	void DoToolbarSounds(CUIRect Toolbar);
-	void DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index);
+	void DoQuad(int LayerIndex, const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index);
 	void PreparePointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex);
 	void DoPointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY);
-	EAxis GetDragAxis(int OffsetX, int OffsetY);
-	void DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point);
-	void DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX = 0, int OffsetY = 0);
-	ColorRGBA GetButtonColor(const void *pID, int Checked);
+	EAxis GetDragAxis(int OffsetX, int OffsetY) const;
+	void DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point) const;
+	void DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX = 0, int OffsetY = 0) const;
+	ColorRGBA GetButtonColor(const void *pId, int Checked);
 
 	// Alignment methods
 	// These methods take `OffsetX` and `OffsetY` because the calculations are made with the original positions
@@ -904,10 +986,10 @@ class CEditor : public IEditor
 	void ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments, bool Append = false) const;
 	void ComputePointsAlignments(const std::shared_ptr<CLayerQuads> &pLayer, bool Pivot, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const;
 	void ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer, const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const;
-	void DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY);
+	void DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY) const;
 	void QuadSelectionAABB(const std::shared_ptr<CLayerQuads> &pLayer, SAxisAlignedBoundingBox &OutAABB);
 	void ApplyAlignments(const std::vector<SAlignmentInfo> &vAlignments, int &OffsetX, int &OffsetY);
-	void ApplyAxisAlignment(int &OffsetX, int &OffsetY);
+	void ApplyAxisAlignment(int &OffsetX, int &OffsetY) const;
 
 	bool ReplaceImage(const char *pFilename, int StorageType, bool CheckDuplicate);
 	static bool ReplaceImageCallback(const char *pFilename, int StorageType, void *pUser);
@@ -930,10 +1012,21 @@ class CEditor : public IEditor
 	void RenderTooltip(CUIRect TooltipRect);
 
 	void RenderEnvelopeEditor(CUIRect View);
+
+	void RenderMapSettingsErrorDialog();
 	void RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast);
+	static void MapSettingsDropdownRenderCallback(const SPossibleValueMatch &Match, char (&aOutput)[128], std::vector<STextColorSplit> &vColorSplits);
+
 	void RenderEditorHistory(CUIRect View);
 
-	void RenderExtraEditorDragBar(CUIRect View, CUIRect DragBar);
+	enum class EDragSide // Which side is the drag bar on
+	{
+		SIDE_BOTTOM,
+		SIDE_LEFT,
+		SIDE_TOP,
+		SIDE_RIGHT
+	};
+	void DoEditorDragBar(CUIRect View, CUIRect *pDragBar, EDragSide Side, float *pValue, float MinValue = 100.0f, float MaxValue = 400.0f);
 
 	void SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels);
 
@@ -942,9 +1035,8 @@ class CEditor : public IEditor
 
 	void SelectGameLayer();
 	std::vector<int> SortImages();
-	bool SelectLayerByTile();
 
-	void DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const void *pStopButtonID, const void *pSeekBarID, const int SampleID);
+	void DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, int SampleId);
 
 	// Tile Numbers For Explanations - TODO: Add/Improve tiles and explanations
 	enum
@@ -1039,8 +1131,8 @@ class CEditor : public IEditor
 	float EnvelopeToScreenX(const CUIRect &View, float x) const;
 	float ScreenToEnvelopeY(const CUIRect &View, float y) const;
 	float EnvelopeToScreenY(const CUIRect &View, float y) const;
-	float ScreenToEnvelopeDX(const CUIRect &View, float dx);
-	float ScreenToEnvelopeDY(const CUIRect &View, float dy);
+	float ScreenToEnvelopeDX(const CUIRect &View, float DeltaX);
+	float ScreenToEnvelopeDY(const CUIRect &View, float DeltaY);
 
 	// DDRace
 
@@ -1051,6 +1143,8 @@ class CEditor : public IEditor
 	IGraphics::CTextureHandle GetTuneTexture();
 
 	unsigned char m_TeleNumber;
+	unsigned char m_TeleCheckpointNumber;
+	unsigned char m_ViewTeleNumber;
 
 	unsigned char m_TuningNum;
 
@@ -1060,8 +1154,12 @@ class CEditor : public IEditor
 
 	unsigned char m_SwitchNum;
 	unsigned char m_SwitchDelay;
+	unsigned char m_ViewSwitch;
+
+	void AdjustBrushSpecialTiles(bool UseNextFree, int Adjust = 0);
+	int FindNextFreeSwitchNumber();
+	int FindNextFreeTeleNumber(bool IsCheckpoint = false);
 
-public:
 	// Undo/Redo
 	CEditorHistory m_EditorHistory;
 	CEditorHistory m_ServerSettingsHistory;
@@ -1073,7 +1171,6 @@ class CEditor : public IEditor
 	void UndoLastAction();
 	void RedoLastAction();
 
-private:
 	std::map<int, CPoint[5]> m_QuadDragOriginalPoints;
 };
 
diff --git a/src/game/editor/editor_actions.cpp b/src/game/editor/editor_actions.cpp
index 88ce5d5590..8f4334d04b 100644
--- a/src/game/editor/editor_actions.cpp
+++ b/src/game/editor/editor_actions.cpp
@@ -320,7 +320,7 @@ void CEditorActionDeleteQuad::Redo()
 CEditorActionEditQuadPoint::CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints) :
 	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_vPreviousPoints(vPreviousPoints), m_vCurrentPoints(vCurrentPoints)
 {
-	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points");
+	str_copy(m_aDisplayText, "Edit quad points");
 }
 
 void CEditorActionEditQuadPoint::Undo()
@@ -476,24 +476,24 @@ void CEditorActionBulk::Redo()
 
 // ---------
 
-CEditorActionAutoMap::CEditorActionAutoMap(CEditor *pEditor, int GroupIndex, int LayerIndex, const EditorTileStateChangeHistory<STileStateChange> &Changes) :
+CEditorActionTileChanges::CEditorActionTileChanges(CEditor *pEditor, int GroupIndex, int LayerIndex, const char *pAction, const EditorTileStateChangeHistory<STileStateChange> &Changes) :
 	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_Changes(Changes)
 {
 	ComputeInfos();
-	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Auto map (x%d)", m_TotalChanges);
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "%s (x%d)", pAction, m_TotalChanges);
 }
 
-void CEditorActionAutoMap::Undo()
+void CEditorActionTileChanges::Undo()
 {
 	Apply(true);
 }
 
-void CEditorActionAutoMap::Redo()
+void CEditorActionTileChanges::Redo()
 {
 	Apply(false);
 }
 
-void CEditorActionAutoMap::Apply(bool Undo)
+void CEditorActionTileChanges::Apply(bool Undo)
 {
 	auto &Map = m_pEditor->m_Map;
 	std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
@@ -512,7 +512,7 @@ void CEditorActionAutoMap::Apply(bool Undo)
 	Map.OnModify();
 }
 
-void CEditorActionAutoMap::ComputeInfos()
+void CEditorActionTileChanges::ComputeInfos()
 {
 	m_TotalChanges = 0;
 	for(auto &Line : m_Changes)
@@ -539,6 +539,22 @@ void CEditorActionAddLayer::Undo()
 {
 	// Undo: remove layer from vector but keep it in case we want to add it back
 	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+
+	if(m_pLayer->m_Type == LAYERTYPE_TILES)
+	{
+		std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+		if(pLayerTiles->m_Front)
+			m_pEditor->m_Map.m_pFrontLayer = nullptr;
+		else if(pLayerTiles->m_Tele)
+			m_pEditor->m_Map.m_pTeleLayer = nullptr;
+		else if(pLayerTiles->m_Speedup)
+			m_pEditor->m_Map.m_pSpeedupLayer = nullptr;
+		else if(pLayerTiles->m_Switch)
+			m_pEditor->m_Map.m_pSwitchLayer = nullptr;
+		else if(pLayerTiles->m_Tune)
+			m_pEditor->m_Map.m_pTuneLayer = nullptr;
+	}
+
 	vLayers.erase(vLayers.begin() + m_LayerIndex);
 
 	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
@@ -552,6 +568,22 @@ void CEditorActionAddLayer::Redo()
 {
 	// Redo: add back the removed layer contained in this class
 	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+
+	if(m_pLayer->m_Type == LAYERTYPE_TILES)
+	{
+		std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+		if(pLayerTiles->m_Front)
+			m_pEditor->m_Map.m_pFrontLayer = std::static_pointer_cast<CLayerFront>(m_pLayer);
+		else if(pLayerTiles->m_Tele)
+			m_pEditor->m_Map.m_pTeleLayer = std::static_pointer_cast<CLayerTele>(m_pLayer);
+		else if(pLayerTiles->m_Speedup)
+			m_pEditor->m_Map.m_pSpeedupLayer = std::static_pointer_cast<CLayerSpeedup>(m_pLayer);
+		else if(pLayerTiles->m_Switch)
+			m_pEditor->m_Map.m_pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(m_pLayer);
+		else if(pLayerTiles->m_Tune)
+			m_pEditor->m_Map.m_pTuneLayer = std::static_pointer_cast<CLayerTune>(m_pLayer);
+	}
+
 	vLayers.insert(vLayers.begin() + m_LayerIndex, m_pLayer);
 
 	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
@@ -628,7 +660,7 @@ CEditorActionGroup::CEditorActionGroup(CEditor *pEditor, int GroupIndex, bool De
 	if(m_Delete)
 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete group %d", m_GroupIndex);
 	else
-		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group");
+		str_copy(m_aDisplayText, "New group", sizeof(m_aDisplayText));
 }
 
 void CEditorActionGroup::Undo()
@@ -794,12 +826,14 @@ void CEditorActionEditLayerProp::Apply(int Value)
 	if(m_Prop == ELayerProp::PROP_GROUP)
 	{
 		auto pCurrentGroup = m_pEditor->m_Map.m_vpGroups[Value == m_Previous ? m_Current : m_Previous];
-		auto Position = std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), m_pLayer);
-		if(Position != pCurrentGroup->m_vpLayers.end())
-			pCurrentGroup->m_vpLayers.erase(Position);
-		m_pEditor->m_Map.m_vpGroups[Value]->m_vpLayers.push_back(m_pLayer);
+		auto pPreviousGroup = m_pEditor->m_Map.m_vpGroups[Value];
+		pCurrentGroup->m_vpLayers.erase(pCurrentGroup->m_vpLayers.begin() + pCurrentGroup->m_vpLayers.size() - 1);
+		if(Value == m_Previous)
+			pPreviousGroup->m_vpLayers.insert(pPreviousGroup->m_vpLayers.begin() + m_LayerIndex, m_pLayer);
+		else
+			pPreviousGroup->m_vpLayers.push_back(m_pLayer);
 		m_pEditor->m_SelectedGroup = Value;
-		m_pEditor->SelectLayer(m_pEditor->m_Map.m_vpGroups[Value]->m_vpLayers.size() - 1);
+		m_pEditor->SelectLayer(m_LayerIndex);
 	}
 	else if(m_Prop == ELayerProp::PROP_HQ)
 	{
@@ -1196,7 +1230,7 @@ CEditorActionTileArt::CEditorActionTileArt(CEditor *pEditor, int PreviousImageCo
 	IEditorAction(pEditor), m_PreviousImageCount(PreviousImageCount), m_vImageIndexMap(vImageIndexMap)
 {
 	str_copy(m_aTileArtFile, pTileArtFile);
-	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art");
+	str_copy(m_aDisplayText, "Tile art");
 }
 
 void CEditorActionTileArt::Undo()
@@ -1241,7 +1275,7 @@ void CEditorActionTileArt::Undo()
 
 void CEditorActionTileArt::Redo()
 {
-	if(!m_pEditor->Graphics()->LoadPNG(&m_pEditor->m_TileartImageInfo, m_aTileArtFile, IStorage::TYPE_ALL))
+	if(!m_pEditor->Graphics()->LoadPng(m_pEditor->m_TileartImageInfo, m_aTileArtFile, IStorage::TYPE_ALL))
 	{
 		m_pEditor->ShowFileDialogError("Failed to load image from file '%s'.", m_aTileArtFile);
 		return;
@@ -1264,7 +1298,7 @@ CEditorCommandAction::CEditorCommandAction(CEditor *pEditor, EType Type, int *pS
 	switch(m_Type)
 	{
 	case EType::ADD:
-		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command");
+		str_copy(m_aDisplayText, "Add command");
 		break;
 	case EType::EDIT:
 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);
@@ -2065,3 +2099,23 @@ void CEditorActionNewQuad::Redo()
 	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
 	pLayerQuads->m_vQuads.emplace_back(m_Quad);
 }
+
+// --------------
+
+CEditorActionMoveSoundSource::CEditorActionMoveSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, CPoint OriginalPosition, CPoint CurrentPosition) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_SourceIndex(SourceIndex), m_OriginalPosition(OriginalPosition), m_CurrentPosition(CurrentPosition)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Move sound source %d of layer %d in group %d", SourceIndex, LayerIndex, GroupIndex);
+}
+
+void CEditorActionMoveSoundSource::Undo()
+{
+	dbg_assert(m_pLayer->m_Type == LAYERTYPE_SOUNDS, "Layer type does not match a sound layer");
+	std::static_pointer_cast<CLayerSounds>(m_pLayer)->m_vSources[m_SourceIndex].m_Position = m_OriginalPosition;
+}
+
+void CEditorActionMoveSoundSource::Redo()
+{
+	dbg_assert(m_pLayer->m_Type == LAYERTYPE_SOUNDS, "Layer type does not match a sound layer");
+	std::static_pointer_cast<CLayerSounds>(m_pLayer)->m_vSources[m_SourceIndex].m_Position = m_CurrentPosition;
+}
diff --git a/src/game/editor/editor_actions.h b/src/game/editor/editor_actions.h
index 198e02a6f3..688a342176 100644
--- a/src/game/editor/editor_actions.h
+++ b/src/game/editor/editor_actions.h
@@ -155,10 +155,10 @@ class CEditorActionBulk : public IEditorAction
 
 //
 
-class CEditorActionAutoMap : public CEditorActionLayerBase
+class CEditorActionTileChanges : public CEditorActionLayerBase
 {
 public:
-	CEditorActionAutoMap(CEditor *pEditor, int GroupIndex, int LayerIndex, const EditorTileStateChangeHistory<STileStateChange> &Changes);
+	CEditorActionTileChanges(CEditor *pEditor, int GroupIndex, int LayerIndex, const char *pAction, const EditorTileStateChangeHistory<STileStateChange> &Changes);
 
 	void Undo() override;
 	void Redo() override;
@@ -645,4 +645,18 @@ class CEditorActionNewQuad : public CEditorActionLayerBase
 	CQuad m_Quad;
 };
 
+class CEditorActionMoveSoundSource : public CEditorActionLayerBase
+{
+public:
+	CEditorActionMoveSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, CPoint OriginalPosition, CPoint CurrentPosition);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+	CPoint m_OriginalPosition;
+	CPoint m_CurrentPosition;
+};
+
 #endif
diff --git a/src/game/editor/editor_history.cpp b/src/game/editor/editor_history.cpp
index 46110de2d5..f020d42b12 100644
--- a/src/game/editor/editor_history.cpp
+++ b/src/game/editor/editor_history.cpp
@@ -17,6 +17,12 @@ void CEditorHistory::Execute(const std::shared_ptr<IEditorAction> &pAction, cons
 
 void CEditorHistory::RecordAction(const std::shared_ptr<IEditorAction> &pAction, const char *pDisplay)
 {
+	if(m_IsBulk)
+	{
+		m_vpBulkActions.push_back(pAction);
+		return;
+	}
+
 	m_vpRedoActions.clear();
 
 	if((int)m_vpUndoActions.size() >= g_Config.m_ClEditorMaxHistory)
@@ -63,3 +69,27 @@ void CEditorHistory::Clear()
 	m_vpUndoActions.clear();
 	m_vpRedoActions.clear();
 }
+
+void CEditorHistory::BeginBulk()
+{
+	m_IsBulk = true;
+	m_vpBulkActions.clear();
+}
+
+void CEditorHistory::EndBulk(const char *pDisplay)
+{
+	if(!m_IsBulk)
+		return;
+	m_IsBulk = false;
+
+	// Record bulk action
+	if(!m_vpBulkActions.empty())
+		RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, m_vpBulkActions, pDisplay, true));
+
+	m_vpBulkActions.clear();
+}
+
+void CEditorHistory::EndBulk(int DisplayToUse)
+{
+	EndBulk((DisplayToUse < 0 || DisplayToUse >= (int)m_vpBulkActions.size()) ? nullptr : m_vpBulkActions[DisplayToUse]->DisplayText());
+}
diff --git a/src/game/editor/editor_history.h b/src/game/editor/editor_history.h
index 144147140f..1a0dbf79fa 100644
--- a/src/game/editor/editor_history.h
+++ b/src/game/editor/editor_history.h
@@ -3,7 +3,9 @@
 
 #include "editor_action.h"
 
-#include <queue>
+#include <deque>
+#include <memory>
+#include <vector>
 
 class CEditorHistory
 {
@@ -11,6 +13,7 @@ class CEditorHistory
 	CEditorHistory()
 	{
 		m_pEditor = nullptr;
+		m_IsBulk = false;
 	}
 
 	~CEditorHistory()
@@ -29,9 +32,17 @@ class CEditorHistory
 	bool CanUndo() const { return !m_vpUndoActions.empty(); }
 	bool CanRedo() const { return !m_vpRedoActions.empty(); }
 
+	void BeginBulk();
+	void EndBulk(const char *pDisplay = nullptr);
+	void EndBulk(int DisplayToUse);
+
 	CEditor *m_pEditor;
 	std::deque<std::shared_ptr<IEditorAction>> m_vpUndoActions;
 	std::deque<std::shared_ptr<IEditorAction>> m_vpRedoActions;
+
+private:
+	std::vector<std::shared_ptr<IEditorAction>> m_vpBulkActions;
+	bool m_IsBulk;
 };
 
 #endif
diff --git a/src/game/editor/editor_object.cpp b/src/game/editor/editor_object.cpp
index 2154c3d10a..2889a068f2 100644
--- a/src/game/editor/editor_object.cpp
+++ b/src/game/editor/editor_object.cpp
@@ -2,15 +2,14 @@
 
 #include "editor.h"
 
-void CEditorObject::Init(CEditor *pEditor)
+void CEditorObject::OnInit(CEditor *pEditor)
 {
 	m_pEditor = pEditor;
 	OnReset();
 }
 
-void CEditorObject::OnUpdate(CUIRect View)
+void CEditorObject::OnUpdate()
 {
-	OnRender(View);
 	if(IsActive())
 		OnActive();
 	else if(IsHot())
@@ -29,37 +28,37 @@ void CEditorObject::OnMapLoad() {}
 
 bool CEditorObject::IsHot()
 {
-	return UI()->HotItem() == this;
+	return Ui()->HotItem() == this;
 }
 
 void CEditorObject::SetHot()
 {
-	UI()->SetHotItem(this);
+	Ui()->SetHotItem(this);
 }
 
 void CEditorObject::UnsetHot()
 {
 	if(IsHot())
-		UI()->SetHotItem(nullptr);
+		Ui()->SetHotItem(nullptr);
 }
 
 void CEditorObject::OnHot() {}
 
 bool CEditorObject::IsActive()
 {
-	return UI()->CheckActiveItem(this);
+	return Ui()->CheckActiveItem(this);
 }
 
 void CEditorObject::SetActive()
 {
 	SetHot();
-	UI()->SetActiveItem(this);
+	Ui()->SetActiveItem(this);
 }
 
 void CEditorObject::SetInactive()
 {
 	if(IsActive())
-		UI()->SetActiveItem(nullptr);
+		Ui()->SetActiveItem(nullptr);
 }
 
 void CEditorObject::OnActive() {}
@@ -75,5 +74,5 @@ IGraphics *CEditorObject::Graphics() { return m_pEditor->Graphics(); }
 ISound *CEditorObject::Sound() { return m_pEditor->Sound(); }
 ITextRender *CEditorObject::TextRender() { return m_pEditor->TextRender(); }
 IStorage *CEditorObject::Storage() { return m_pEditor->Storage(); }
-CUI *CEditorObject::UI() { return m_pEditor->UI(); }
+CUi *CEditorObject::Ui() { return m_pEditor->Ui(); }
 CRenderTools *CEditorObject::RenderTools() { return m_pEditor->RenderTools(); }
diff --git a/src/game/editor/editor_object.h b/src/game/editor/editor_object.h
index 87ec1df4e7..59fee4b2e4 100644
--- a/src/game/editor/editor_object.h
+++ b/src/game/editor/editor_object.h
@@ -6,7 +6,7 @@
 #include <engine/input.h>
 #include <game/client/ui_rect.h>
 
-class CUI;
+class CUi;
 class CEditor;
 class IClient;
 class CConfig;
@@ -26,14 +26,14 @@ class CEditorObject
 	/**
 	 * Initialise the component and interface pointers.
 	 * Needs to be the first function that is called.
-     * The default implentation also resets the component.
+	 * The default implentation also resets the component.
 	 */
-	virtual void Init(CEditor *pEditor);
+	virtual void OnInit(CEditor *pEditor);
 
 	/**
-	 * Calls `OnRender` and then maybe `OnHot` or `OnActive`.
+	 * Maybe calls `OnHot` or `OnActive`.
 	 */
-	void OnUpdate(CUIRect View);
+	virtual void OnUpdate();
 
 	/**
 	 * Gets called before `OnRender`. Should return true
@@ -45,7 +45,6 @@ class CEditorObject
 
 	/**
 	 * Gets called after `OnRender` when the component is hot but not active.
-	 * I
 	 */
 	virtual void OnHot();
 
@@ -76,7 +75,7 @@ class CEditorObject
 	ISound *Sound();
 	ITextRender *TextRender();
 	IStorage *Storage();
-	CUI *UI();
+	CUi *Ui();
 	CRenderTools *RenderTools();
 
 private:
diff --git a/src/game/editor/editor_props.cpp b/src/game/editor/editor_props.cpp
index 7d57b9c8f2..34d1e92e98 100644
--- a/src/game/editor/editor_props.cpp
+++ b/src/game/editor/editor_props.cpp
@@ -1,54 +1,62 @@
 #include "editor.h"
 
+#include <engine/textrender.h>
+
 #include <game/editor/mapitems/image.h>
 #include <game/editor/mapitems/sound.h>
 
-int CEditor::DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color)
+using namespace FontIcons;
+
+const ColorRGBA CEditor::ms_DefaultPropColor = ColorRGBA(1, 1, 1, 0.5f);
+
+int CEditor::DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIds, int *pNewVal, const std::vector<ColorRGBA> &vColors)
 {
-	auto Res = DoPropertiesWithState<int>(pToolbox, pProps, pIDs, pNewVal, Color);
+	auto Res = DoPropertiesWithState<int>(pToolbox, pProps, pIds, pNewVal, vColors);
 	return Res.m_Value;
 }
 
 template<typename E>
-SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color)
+SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pProps, int *pIds, int *pNewVal, const std::vector<ColorRGBA> &vColors)
 {
 	int Change = -1;
-	EEditState State = EEditState::EDITING;
+	EEditState State = EEditState::NONE;
 
 	for(int i = 0; pProps[i].m_pName; i++)
 	{
+		const ColorRGBA *pColor = i >= (int)vColors.size() ? &ms_DefaultPropColor : &vColors[i];
+
 		CUIRect Slot;
 		pToolBox->HSplitTop(13.0f, &Slot, pToolBox);
 		CUIRect Label, Shifter;
 		Slot.VSplitMid(&Label, &Shifter);
 		Shifter.HMargin(1.0f, &Shifter);
-		UI()->DoLabel(&Label, pProps[i].m_pName, 10.0f, TEXTALIGN_ML);
+		Ui()->DoLabel(&Label, pProps[i].m_pName, 10.0f, TEXTALIGN_ML);
 
-		if(pProps[i].m_Type == PROPTYPE_INT_STEP)
+		if(pProps[i].m_Type == PROPTYPE_INT)
 		{
 			CUIRect Inc, Dec;
 			char aBuf[64];
 
 			Shifter.VSplitRight(10.0f, &Shifter, &Inc);
 			Shifter.VSplitLeft(10.0f, &Dec, &Shifter);
-			str_from_int(pProps[i].m_Value, aBuf);
-			auto NewValueRes = UiDoValueSelector((char *)&pIDs[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0, &Color);
+			str_format(aBuf, sizeof(aBuf), "%d", pProps[i].m_Value);
+			auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0, pColor);
 			int NewValue = NewValueRes.m_Value;
-			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
+			if(NewValue != pProps[i].m_Value || (NewValueRes.m_State != EEditState::NONE && NewValueRes.m_State != EEditState::EDITING))
 			{
 				*pNewVal = NewValue;
 				Change = i;
 				State = NewValueRes.m_State;
 			}
-			if(DoButton_ButtonDec((char *)&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Decrease"))
+			if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease", IGraphics::CORNER_L, 7.0f))
 			{
-				*pNewVal = pProps[i].m_Value - 1;
+				*pNewVal = clamp(pProps[i].m_Value - 1, pProps[i].m_Min, pProps[i].m_Max);
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, nullptr, 0, &Inc, 0, "Increase"))
+			if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase", IGraphics::CORNER_R, 7.0f))
 			{
-				*pNewVal = pProps[i].m_Value + 1;
+				*pNewVal = clamp(pProps[i].m_Value + 1, pProps[i].m_Min, pProps[i].m_Max);
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
@@ -57,30 +65,19 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 		{
 			CUIRect No, Yes;
 			Shifter.VSplitMid(&No, &Yes);
-			if(DoButton_ButtonDec(&pIDs[i], "No", !pProps[i].m_Value, &No, 0, ""))
+			if(DoButton_Ex(&pIds[i], "No", !pProps[i].m_Value, &No, 0, "", IGraphics::CORNER_L))
 			{
 				*pNewVal = 0;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 1, "Yes", pProps[i].m_Value, &Yes, 0, ""))
+			if(DoButton_Ex(((char *)&pIds[i]) + 1, "Yes", pProps[i].m_Value, &Yes, 0, "", IGraphics::CORNER_R))
 			{
 				*pNewVal = 1;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
 		}
-		else if(pProps[i].m_Type == PROPTYPE_INT_SCROLL)
-		{
-			auto NewValueRes = UiDoValueSelector(&pIDs[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.");
-			int NewValue = NewValueRes.m_Value;
-			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
-			{
-				*pNewVal = NewValue;
-				Change = i;
-				State = NewValueRes.m_State;
-			}
-		}
 		else if(pProps[i].m_Type == PROPTYPE_ANGLE_SCROLL)
 		{
 			CUIRect Inc, Dec;
@@ -90,22 +87,22 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			int Step = Shift ? 1 : 45;
 			int Value = pProps[i].m_Value;
 
-			auto NewValueRes = UiDoValueSelector(&pIDs[i], &Shifter, "", Value, pProps[i].m_Min, pProps[i].m_Max, Shift ? 1 : 45, Shift ? 1.0f : 10.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0);
+			auto NewValueRes = UiDoValueSelector(&pIds[i], &Shifter, "", Value, pProps[i].m_Min, pProps[i].m_Max, Shift ? 1 : 45, Shift ? 1.0f : 10.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0);
 			int NewValue = NewValueRes.m_Value;
-			if(DoButton_ButtonDec(&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Decrease"))
+			if(DoButton_FontIcon(&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease", IGraphics::CORNER_L, 7.0f))
 			{
 				NewValue = (std::ceil((pProps[i].m_Value / (float)Step)) - 1) * Step;
 				if(NewValue < 0)
 					NewValue += 360;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(&pIDs[i] + 2, nullptr, 0, &Inc, 0, "Increase"))
+			if(DoButton_FontIcon(&pIds[i] + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase", IGraphics::CORNER_R, 7.0f))
 			{
 				NewValue = (pProps[i].m_Value + Step) / Step * Step;
 				State = EEditState::ONE_GO;
 			}
 
-			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
+			if(NewValue != pProps[i].m_Value || (NewValueRes.m_State != EEditState::NONE && NewValueRes.m_State != EEditState::EDITING))
 			{
 				*pNewVal = NewValue % 360;
 				Change = i;
@@ -123,7 +120,7 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 					State = m_ColorPickerPopupContext.m_State;
 				}
 			};
-			DoColorPickerButton(&pIDs[i], &Shifter, ColorRGBA::UnpackAlphaLast<ColorRGBA>(pProps[i].m_Value), SetColor);
+			DoColorPickerButton(&pIds[i], &Shifter, ColorRGBA::UnpackAlphaLast<ColorRGBA>(pProps[i].m_Value), SetColor);
 		}
 		else if(pProps[i].m_Type == PROPTYPE_IMAGE)
 		{
@@ -133,8 +130,8 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			else
 				pName = m_Map.m_vpImages[pProps[i].m_Value]->m_aName;
 
-			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
-				PopupSelectImageInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+			if(DoButton_Ex(&pIds[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectImageInvoke(pProps[i].m_Value, Ui()->MouseX(), Ui()->MouseY());
 
 			int r = PopupSelectImageResult();
 			if(r >= -1)
@@ -150,31 +147,31 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			Shifter.VSplitMid(&Left, &Up, 2.0f);
 			Left.VSplitLeft(10.0f, &Left, &Shifter);
 			Shifter.VSplitRight(10.0f, &Shifter, &Right);
-			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), 0, 0.0f);
-			UI()->DoLabel(&Shifter, "X", 10.0f, TEXTALIGN_MC);
+			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_NONE, 0.0f);
+			Ui()->DoLabel(&Shifter, "X", 10.0f, TEXTALIGN_MC);
 			Up.VSplitLeft(10.0f, &Up, &Shifter);
 			Shifter.VSplitRight(10.0f, &Shifter, &Down);
-			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), 0, 0.0f);
-			UI()->DoLabel(&Shifter, "Y", 10.0f, TEXTALIGN_MC);
-			if(DoButton_ButtonDec(&pIDs[i], "-", 0, &Left, 0, "Left"))
+			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_NONE, 0.0f);
+			Ui()->DoLabel(&Shifter, "Y", 10.0f, TEXTALIGN_MC);
+			if(DoButton_FontIcon(&pIds[i], FONT_ICON_MINUS, 0, &Left, 0, "Left", IGraphics::CORNER_L, 7.0f))
 			{
 				*pNewVal = DIRECTION_LEFT;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 3, "+", 0, &Right, 0, "Right"))
+			if(DoButton_FontIcon(((char *)&pIds[i]) + 3, FONT_ICON_PLUS, 0, &Right, 0, "Right", IGraphics::CORNER_R, 7.0f))
 			{
 				*pNewVal = DIRECTION_RIGHT;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonDec(((char *)&pIDs[i]) + 1, "-", 0, &Up, 0, "Up"))
+			if(DoButton_FontIcon(((char *)&pIds[i]) + 1, FONT_ICON_MINUS, 0, &Up, 0, "Up", IGraphics::CORNER_L, 7.0f))
 			{
 				*pNewVal = DIRECTION_UP;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, "+", 0, &Down, 0, "Down"))
+			if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Down, 0, "Down", IGraphics::CORNER_R, 7.0f))
 			{
 				*pNewVal = DIRECTION_DOWN;
 				Change = i;
@@ -189,8 +186,8 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			else
 				pName = m_Map.m_vpSounds[pProps[i].m_Value]->m_aName;
 
-			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
-				PopupSelectSoundInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+			if(DoButton_Ex(&pIds[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectSoundInvoke(pProps[i].m_Value, Ui()->MouseX(), Ui()->MouseY());
 
 			int r = PopupSelectSoundResult();
 			if(r >= -1)
@@ -208,8 +205,8 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			else
 				pName = m_Map.m_vpImages[pProps[i].m_Min]->m_AutoMapper.GetConfigName(pProps[i].m_Value);
 
-			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
-				PopupSelectConfigAutoMapInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+			if(DoButton_Ex(&pIds[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectConfigAutoMapInvoke(pProps[i].m_Value, Ui()->MouseX(), Ui()->MouseY());
 
 			int r = PopupSelectConfigAutoMapResult();
 			if(r >= -1)
@@ -242,22 +239,22 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 			else
 				aBuf[0] = '\0';
 
-			auto NewValueRes = UiDoValueSelector((char *)&pIDs[i], &Shifter, aBuf, CurValue, 0, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Set Envelope", false, false, IGraphics::CORNER_NONE);
+			auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, aBuf, CurValue, 0, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Set Envelope", false, false, IGraphics::CORNER_NONE);
 			int NewVal = NewValueRes.m_Value;
-			if(NewVal != CurValue || NewValueRes.m_State != EEditState::EDITING)
+			if(NewVal != CurValue || (NewValueRes.m_State != EEditState::NONE && NewValueRes.m_State != EEditState::EDITING))
 			{
 				*pNewVal = NewVal;
 				Change = i;
 				State = NewValueRes.m_State;
 			}
 
-			if(DoButton_ButtonDec((char *)&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Previous Envelope"))
+			if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Previous Envelope", IGraphics::CORNER_L, 7.0f))
 			{
 				*pNewVal = pProps[i].m_Value - 1;
 				Change = i;
 				State = EEditState::ONE_GO;
 			}
-			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, nullptr, 0, &Inc, 0, "Next Envelope"))
+			if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Next Envelope", IGraphics::CORNER_R, 7.0f))
 			{
 				*pNewVal = pProps[i].m_Value + 1;
 				Change = i;
@@ -269,14 +266,14 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
 	return SEditResult<E>{State, static_cast<E>(Change)};
 }
 
-template SEditResult<ECircleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ERectangleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<EGroupProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ELayerProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ELayerQuadsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ETilesProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ETilesCommonProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ELayerSoundsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<EQuadProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<EQuadPointProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
-template SEditResult<ESoundProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ECircleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ERectangleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<EGroupProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ELayerProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ELayerQuadsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ETilesProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ETilesCommonProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ELayerSoundsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<EQuadProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<EQuadPointProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
+template SEditResult<ESoundProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, const std::vector<ColorRGBA> &);
diff --git a/src/game/editor/editor_server_settings.cpp b/src/game/editor/editor_server_settings.cpp
new file mode 100644
index 0000000000..5d97c8cb44
--- /dev/null
+++ b/src/game/editor/editor_server_settings.cpp
@@ -0,0 +1,2244 @@
+#include "editor_server_settings.h"
+#include "editor.h"
+
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/lineinput.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/editor/editor_actions.h>
+#include <game/editor/editor_history.h>
+
+#include <base/color.h>
+#include <base/system.h>
+
+#include <iterator>
+
+using namespace FontIcons;
+
+static const int FONT_SIZE = 12.0f;
+
+struct IMapSetting
+{
+	enum EType
+	{
+		SETTING_INT,
+		SETTING_COMMAND,
+	};
+	const char *m_pName;
+	const char *m_pHelp;
+	EType m_Type;
+
+	IMapSetting(const char *pName, const char *pHelp, EType Type) :
+		m_pName(pName), m_pHelp(pHelp), m_Type(Type) {}
+};
+struct SMapSettingInt : public IMapSetting
+{
+	int m_Default;
+	int m_Min;
+	int m_Max;
+
+	SMapSettingInt(const char *pName, const char *pHelp, int Default, int Min, int Max) :
+		IMapSetting(pName, pHelp, IMapSetting::SETTING_INT), m_Default(Default), m_Min(Min), m_Max(Max) {}
+};
+struct SMapSettingCommand : public IMapSetting
+{
+	const char *m_pArgs;
+
+	SMapSettingCommand(const char *pName, const char *pHelp, const char *pArgs) :
+		IMapSetting(pName, pHelp, IMapSetting::SETTING_COMMAND), m_pArgs(pArgs) {}
+};
+
+void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast)
+{
+	static int s_CommandSelectedIndex = -1;
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(!m_MapSettingsCommandContext.m_DropdownContext.m_ListBox.Active() && m_Dialog == DIALOG_NONE && !Ui()->IsPopupOpen());
+
+	bool GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
+	const bool CurrentInputValid = m_MapSettingsCommandContext.Valid(); // Use the context to validate the input
+
+	CUIRect ToolBar, Button, Label, List, DragBar;
+	View.HSplitTop(22.0f, &DragBar, nullptr);
+	DragBar.y -= 2.0f;
+	DragBar.w += 2.0f;
+	DragBar.h += 4.0f;
+	DoEditorDragBar(View, &DragBar, EDragSide::SIDE_TOP, &m_aExtraEditorSplits[EXTRAEDITOR_SERVER_SETTINGS]);
+	View.HSplitTop(20.0f, &ToolBar, &View);
+	View.HSplitTop(2.0f, nullptr, &List);
+	ToolBar.HMargin(2.0f, &ToolBar);
+
+	// delete button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	static int s_DeleteButton = 0;
+	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, GotSelection ? 0 : -1, &Button, 0, "[Delete] Delete the selected command from the command list.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+
+		m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
+		if(s_CommandSelectedIndex >= (int)m_Map.m_vSettings.size())
+			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
+		if(s_CommandSelectedIndex >= 0)
+			m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
+		else
+			m_SettingsCommandInput.Clear();
+		m_Map.OnModify();
+		m_MapSettingsCommandContext.Update();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// move down button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	const bool CanMoveDown = GotSelection && s_CommandSelectedIndex < (int)m_Map.m_vSettings.size() - 1;
+	static int s_DownButton = 0;
+	if(DoButton_FontIcon(&s_DownButton, FONT_ICON_SORT_DOWN, CanMoveDown ? 0 : -1, &Button, 0, "[Alt+Down] Move the selected command down.", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_DOWN)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_DOWN, &s_CommandSelectedIndex, s_CommandSelectedIndex));
+
+		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex + 1]);
+		s_CommandSelectedIndex++;
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// move up button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	const bool CanMoveUp = GotSelection && s_CommandSelectedIndex > 0;
+	static int s_UpButton = 0;
+	if(DoButton_FontIcon(&s_UpButton, FONT_ICON_SORT_UP, CanMoveUp ? 0 : -1, &Button, 0, "[Alt+Up] Move the selected command up.", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_UP)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_UP, &s_CommandSelectedIndex, s_CommandSelectedIndex));
+
+		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex - 1]);
+		s_CommandSelectedIndex--;
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// redo button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	static int s_RedoButton = 0;
+	if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_ServerSettingsHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo command edit", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_DOWN)))
+	{
+		m_ServerSettingsHistory.Redo();
+	}
+
+	// undo button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	static int s_UndoButton = 0;
+	if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_ServerSettingsHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo command edit", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_UP)))
+	{
+		m_ServerSettingsHistory.Undo();
+	}
+
+	GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
+
+	int CollidingCommandIndex = -1;
+	ECollisionCheckResult CheckResult = ECollisionCheckResult::ERROR;
+	if(CurrentInputValid)
+		CollidingCommandIndex = m_MapSettingsCommandContext.CheckCollision(CheckResult);
+
+	// update button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	const bool CanAdd = CheckResult == ECollisionCheckResult::ADD;
+	const bool CanReplace = CheckResult == ECollisionCheckResult::REPLACE;
+
+	const bool CanUpdate = GotSelection && CurrentInputValid && str_comp(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, m_SettingsCommandInput.GetString()) != 0;
+
+	static int s_UpdateButton = 0;
+	if(DoButton_FontIcon(&s_UpdateButton, FONT_ICON_PENCIL, CanUpdate ? 0 : -1, &Button, 0, "[Alt+Enter] Update the selected command based on the entered value.", IGraphics::CORNER_R, 9.0f) == 1 || (CanUpdate && Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
+	{
+		if(CollidingCommandIndex == -1)
+		{
+			bool Found = false;
+			int i;
+			for(i = 0; i < (int)m_Map.m_vSettings.size(); ++i)
+			{
+				if(i != s_CommandSelectedIndex && !str_comp(m_Map.m_vSettings[i].m_aCommand, m_SettingsCommandInput.GetString()))
+				{
+					Found = true;
+					break;
+				}
+			}
+			if(Found)
+			{
+				m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+				m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
+				s_CommandSelectedIndex = i > s_CommandSelectedIndex ? i - 1 : i;
+			}
+			else
+			{
+				const char *pStr = m_SettingsCommandInput.GetString();
+				m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
+				str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
+			}
+		}
+		else
+		{
+			if(s_CommandSelectedIndex == CollidingCommandIndex)
+			{ // If we are editing the currently collinding line, then we can just call EDIT on it
+				const char *pStr = m_SettingsCommandInput.GetString();
+				m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
+				str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
+			}
+			else
+			{ // If not, then editing the current selected line will result in the deletion of the colliding line, and the editing of the selected line
+				const char *pStr = m_SettingsCommandInput.GetString();
+
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "Delete command %d; Edit command %d", CollidingCommandIndex, s_CommandSelectedIndex);
+
+				m_ServerSettingsHistory.BeginBulk();
+				// Delete the colliding command
+				m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, CollidingCommandIndex, m_Map.m_vSettings[CollidingCommandIndex].m_aCommand));
+				m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + CollidingCommandIndex);
+				// Edit the selected command
+				s_CommandSelectedIndex = s_CommandSelectedIndex > CollidingCommandIndex ? s_CommandSelectedIndex - 1 : s_CommandSelectedIndex;
+				m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
+				str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
+
+				m_ServerSettingsHistory.EndBulk(aBuf);
+			}
+		}
+
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+		m_SettingsCommandInput.Clear();
+		m_MapSettingsCommandContext.Reset(); // Reset context
+		Ui()->SetActiveItem(&m_SettingsCommandInput);
+	}
+
+	// add button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(100.0f, &ToolBar, nullptr);
+
+	static int s_AddButton = 0;
+	if(DoButton_FontIcon(&s_AddButton, CanReplace ? FONT_ICON_ARROWS_ROTATE : FONT_ICON_PLUS, CanAdd || CanReplace ? 0 : -1, &Button, 0, CanReplace ? "[Enter] Replace the corresponding command in the command list." : "[Enter] Add a command to the command list.", IGraphics::CORNER_L) == 1 || ((CanAdd || CanReplace) && !Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
+	{
+		if(CanReplace)
+		{
+			dbg_assert(CollidingCommandIndex != -1, "Could not replace command");
+			s_CommandSelectedIndex = CollidingCommandIndex;
+
+			const char *pStr = m_SettingsCommandInput.GetString();
+			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
+			str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
+		}
+		else if(CanAdd)
+		{
+			m_Map.m_vSettings.emplace_back(m_SettingsCommandInput.GetString());
+			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
+			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::ADD, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+		}
+
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+		m_SettingsCommandInput.Clear();
+		m_MapSettingsCommandContext.Reset(); // Reset context
+		Ui()->SetActiveItem(&m_SettingsCommandInput);
+	}
+
+	// command input (use remaining toolbar width)
+	if(!ShowServerSettingsEditorLast) // Just activated
+		Ui()->SetActiveItem(&m_SettingsCommandInput);
+	m_SettingsCommandInput.SetEmptyText("Command");
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+	// command list
+	s_ListBox.DoStart(15.0f, m_Map.m_vSettings.size(), 1, 3, s_CommandSelectedIndex, &List);
+
+	for(size_t i = 0; i < m_Map.m_vSettings.size(); i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&m_Map.m_vSettings[i], s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex == i);
+		if(!Item.m_Visible)
+			continue;
+
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		Ui()->DoLabel(&Label, m_Map.m_vSettings[i].m_aCommand, 10.0f, TEXTALIGN_ML, Props);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(s_CommandSelectedIndex != NewSelected || s_ListBox.WasItemSelected())
+	{
+		s_CommandSelectedIndex = NewSelected;
+		if(m_SettingsCommandInput.IsEmpty() || !Input()->ModifierIsPressed()) // Allow ctrl+click to only change selection
+		{
+			m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
+			m_MapSettingsCommandContext.Update();
+			m_MapSettingsCommandContext.UpdateCursor(true);
+		}
+		m_MapSettingsCommandContext.m_DropdownContext.m_ShouldHide = true;
+		Ui()->SetActiveItem(&m_SettingsCommandInput);
+	}
+
+	// Map setting input
+	DoMapSettingsEditBox(&m_MapSettingsCommandContext, &ToolBar, FONT_SIZE, List.h);
+}
+
+void CEditor::DoMapSettingsEditBox(CMapSettingsBackend::CContext *pContext, const CUIRect *pRect, float FontSize, float DropdownMaxHeight, int Corners, const char *pToolTip)
+{
+	// Main method to do the full featured map settings edit box
+
+	auto *pLineInput = pContext->LineInput();
+	auto &Context = *pContext;
+	Context.SetFontSize(FontSize);
+
+	// Set current active context if input is active
+	if(pLineInput->IsActive())
+		CMapSettingsBackend::ms_pActiveContext = pContext;
+
+	// Small utility to render a floating part above the input rect.
+	// Use to display either the error or the current argument name
+	const float PartMargin = 4.0f;
+	auto &&RenderFloatingPart = [&](CUIRect *pInputRect, float x, const char *pStr) {
+		CUIRect Background;
+		Background.x = x - PartMargin;
+		Background.y = pInputRect->y - pInputRect->h - 6.0f;
+		Background.w = TextRender()->TextWidth(FontSize, pStr) + 2 * PartMargin;
+		Background.h = pInputRect->h;
+		Background.Draw(ColorRGBA(0, 0, 0, 0.9f), IGraphics::CORNER_ALL, 3.0f);
+
+		CUIRect Label;
+		Background.VSplitLeft(PartMargin, nullptr, &Label);
+		TextRender()->TextColor(0.8f, 0.8f, 0.8f, 1.0f);
+		Ui()->DoLabel(&Label, pStr, FontSize, TEXTALIGN_ML);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	};
+
+	// If we have a valid command, display the help in the tooltip
+	if(Context.CommandIsValid() && pLineInput->IsActive() && Ui()->HotItem() == nullptr)
+		Context.GetCommandHelpText(m_aTooltip, sizeof(m_aTooltip));
+
+	CUIRect ToolBar = *pRect;
+	CUIRect Button;
+	ToolBar.VSplitRight(ToolBar.h, &ToolBar, &Button);
+
+	// Do the unknown command toggle button
+	if(DoButton_FontIcon(&Context.m_AllowUnknownCommands, FONT_ICON_QUESTION, Context.m_AllowUnknownCommands, &Button, 0, "Disallow/allow unknown commands", IGraphics::CORNER_R))
+	{
+		Context.m_AllowUnknownCommands = !Context.m_AllowUnknownCommands;
+		Context.Update();
+	}
+
+	// Color the arguments
+	std::vector<STextColorSplit> vColorSplits;
+	Context.ColorArguments(vColorSplits);
+
+	// Do and render clearable edit box with the colors
+	if(DoClearableEditBox(pLineInput, &ToolBar, FontSize, IGraphics::CORNER_L, "Enter a server setting.", vColorSplits))
+	{
+		Context.Update(); // Update the context when contents change
+		Context.m_DropdownContext.m_ShouldHide = false;
+	}
+
+	// Update/track the cursor
+	if(Context.UpdateCursor())
+		Context.m_DropdownContext.m_ShouldHide = false;
+
+	// Calculate x position of the dropdown and the floating part
+	float x = ToolBar.x + Context.CurrentArgPos() - pLineInput->GetScrollOffset();
+	x = clamp(x, ToolBar.x + PartMargin, ToolBar.x + ToolBar.w);
+
+	if(pLineInput->IsActive())
+	{
+		// If line input is active, let's display a floating part for either the current argument name
+		// or for the error, if any. The error is only displayed when the cursor is at the end of the input.
+		const bool IsAtEnd = pLineInput->GetCursorOffset() >= (m_MapSettingsCommandContext.CommentOffset() != -1 ? m_MapSettingsCommandContext.CommentOffset() : pLineInput->GetLength());
+
+		if(Context.CurrentArgName() && (!Context.HasError() || !IsAtEnd)) // Render argument name
+			RenderFloatingPart(&ToolBar, x, Context.CurrentArgName());
+		else if(Context.HasError() && IsAtEnd) // Render error
+			RenderFloatingPart(&ToolBar, ToolBar.x + PartMargin, Context.Error());
+	}
+
+	// If we have possible matches for the current argument, let's display an editbox suggestions dropdown
+	const auto &vPossibleCommands = Context.PossibleMatches();
+	int Selected = DoEditBoxDropdown<SPossibleValueMatch>(&Context.m_DropdownContext, pLineInput, &ToolBar, x - PartMargin, DropdownMaxHeight, Context.CurrentArg() >= 0, vPossibleCommands, MapSettingsDropdownRenderCallback);
+
+	// If the dropdown just became visible, update the context
+	// This is needed when input loses focus and then we click a command in the map settings list
+	if(Context.m_DropdownContext.m_DidBecomeVisible)
+	{
+		Context.Update();
+		Context.UpdateCursor(true);
+	}
+
+	if(!vPossibleCommands.empty())
+	{
+		// Check if the completion index has changed
+		if(Selected != pContext->m_CurrentCompletionIndex)
+		{
+			// If so, we should autocomplete the selected option
+			if(Selected != -1)
+			{
+				const char *pStr = vPossibleCommands[Selected].m_pValue;
+				int Len = pContext->m_CurrentCompletionIndex == -1 ? str_length(Context.CurrentArgValue()) : (pContext->m_CurrentCompletionIndex < (int)vPossibleCommands.size() ? str_length(vPossibleCommands[pContext->m_CurrentCompletionIndex].m_pValue) : 0);
+				size_t Start = Context.CurrentArgOffset();
+				size_t End = Start + Len;
+				pLineInput->SetRange(pStr, Start, End);
+			}
+
+			pContext->m_CurrentCompletionIndex = Selected;
+		}
+	}
+	else
+	{
+		Context.m_DropdownContext.m_ListBox.SetActive(false);
+	}
+}
+
+template<typename T>
+int CEditor::DoEditBoxDropdown(SEditBoxDropdownContext *pDropdown, CLineInput *pLineInput, const CUIRect *pEditBoxRect, int x, float MaxHeight, bool AutoWidth, const std::vector<T> &vData, const FDropdownRenderCallback<T> &pfnMatchCallback)
+{
+	// Do an edit box with a possible dropdown
+	// This is a generic method which can display any data we want
+
+	pDropdown->m_Selected = clamp(pDropdown->m_Selected, -1, (int)vData.size() - 1);
+
+	if(Input()->KeyPress(KEY_SPACE) && Input()->ModifierIsPressed())
+	{ // Handle Ctrl+Space to show available options
+		pDropdown->m_ShortcutUsed = true;
+		// Remove inserted space
+		pLineInput->SetRange("", pLineInput->GetCursorOffset() - 1, pLineInput->GetCursorOffset());
+	}
+
+	if((!pDropdown->m_ShouldHide && !pLineInput->IsEmpty() && (pLineInput->IsActive() || pDropdown->m_MousePressedInside)) || pDropdown->m_ShortcutUsed)
+	{
+		if(!pDropdown->m_Visible)
+		{
+			pDropdown->m_DidBecomeVisible = true;
+			pDropdown->m_Visible = true;
+		}
+		else if(pDropdown->m_DidBecomeVisible)
+			pDropdown->m_DidBecomeVisible = false;
+
+		if(!pLineInput->IsEmpty() || !pLineInput->IsActive())
+			pDropdown->m_ShortcutUsed = false;
+
+		int CurrentSelected = pDropdown->m_Selected;
+
+		// Use tab to navigate through entries
+		if(Ui()->ConsumeHotkey(CUi::HOTKEY_TAB) && !vData.empty())
+		{
+			int Direction = Input()->ShiftIsPressed() ? -1 : 1;
+
+			pDropdown->m_Selected += Direction;
+			if(pDropdown->m_Selected < 0)
+				pDropdown->m_Selected = (int)vData.size() - 1;
+			pDropdown->m_Selected %= vData.size();
+		}
+
+		int Selected = RenderEditBoxDropdown<T>(pDropdown, *pEditBoxRect, pLineInput, x, MaxHeight, AutoWidth, vData, pfnMatchCallback);
+		if(Selected != -1)
+			pDropdown->m_Selected = Selected;
+
+		if(CurrentSelected != pDropdown->m_Selected)
+			pDropdown->m_ListBox.ScrollToSelected();
+
+		return pDropdown->m_Selected;
+	}
+	else
+	{
+		pDropdown->m_ShortcutUsed = false;
+		pDropdown->m_Visible = false;
+		pDropdown->m_ListBox.SetActive(false);
+		pDropdown->m_Selected = -1;
+	}
+
+	return -1;
+}
+
+template<typename T>
+int CEditor::RenderEditBoxDropdown(SEditBoxDropdownContext *pDropdown, CUIRect View, CLineInput *pLineInput, int x, float MaxHeight, bool AutoWidth, const std::vector<T> &vData, const FDropdownRenderCallback<T> &pfnMatchCallback)
+{
+	// Render a dropdown tied to an edit box/line input
+	auto *pListBox = &pDropdown->m_ListBox;
+
+	pListBox->SetActive(m_Dialog == DIALOG_NONE && !Ui()->IsPopupOpen() && pLineInput->IsActive());
+	pListBox->SetScrollbarWidth(15.0f);
+
+	const int NumEntries = vData.size();
+
+	// Setup the rect
+	CUIRect CommandsDropdown = View;
+	CommandsDropdown.y += View.h + 0.1f;
+	CommandsDropdown.x = x;
+	if(AutoWidth)
+		CommandsDropdown.w = pDropdown->m_Width + pListBox->ScrollbarWidth();
+
+	pListBox->SetActive(NumEntries > 0);
+	if(NumEntries > 0)
+	{
+		// Draw the background
+		CommandsDropdown.h = minimum(NumEntries * 15.0f + 1.0f, MaxHeight);
+		CommandsDropdown.Draw(ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f), IGraphics::CORNER_ALL, 3.0f);
+
+		if(Ui()->MouseButton(0) && Ui()->MouseInside(&CommandsDropdown))
+			pDropdown->m_MousePressedInside = true;
+
+		// Do the list box
+		int Selected = pDropdown->m_Selected;
+		pListBox->DoStart(15.0f, NumEntries, 1, 3, Selected, &CommandsDropdown);
+		CUIRect Label;
+
+		int NewIndex = Selected;
+		float LargestWidth = 0;
+		for(int i = 0; i < NumEntries; i++)
+		{
+			const CListboxItem Item = pListBox->DoNextItem(&vData[i], Selected == i);
+
+			Item.m_Rect.VMargin(4.0f, &Label);
+
+			SLabelProperties Props;
+			Props.m_MaxWidth = Label.w;
+			Props.m_EllipsisAtEnd = true;
+
+			// Call the callback to fill the current line string
+			char aBuf[128];
+			pfnMatchCallback(vData.at(i), aBuf, Props.m_vColorSplits);
+
+			LargestWidth = maximum(LargestWidth, TextRender()->TextWidth(12.0f, aBuf) + 10.0f);
+			if(!Item.m_Visible)
+				continue;
+
+			Ui()->DoLabel(&Label, aBuf, 12.0f, TEXTALIGN_ML, Props);
+
+			if(Ui()->ActiveItem() == &vData[i])
+			{
+				// If we selected an item (by clicking on it for example), then set the active item back to the
+				// line input so we don't loose focus
+				NewIndex = i;
+				Ui()->SetActiveItem(pLineInput);
+			}
+		}
+
+		pDropdown->m_Width = LargestWidth;
+
+		int EndIndex = pListBox->DoEnd();
+		if(NewIndex == Selected)
+			NewIndex = EndIndex;
+
+		if(pDropdown->m_MousePressedInside && !Ui()->MouseButton(0))
+		{
+			Ui()->SetActiveItem(pLineInput);
+			pDropdown->m_MousePressedInside = false;
+		}
+
+		if(NewIndex != Selected)
+		{
+			Ui()->SetActiveItem(pLineInput);
+			return NewIndex;
+		}
+	}
+	return -1;
+}
+
+void CEditor::RenderMapSettingsErrorDialog()
+{
+	auto &LoadedMapSettings = m_MapSettingsBackend.m_LoadedMapSettings;
+	auto &vSettingsInvalid = LoadedMapSettings.m_vSettingsInvalid;
+	auto &vSettingsValid = LoadedMapSettings.m_vSettingsValid;
+	auto &SettingsDuplicate = LoadedMapSettings.m_SettingsDuplicate;
+
+	Ui()->MapScreen();
+	CUIRect Overlay = *Ui()->Screen();
+
+	Overlay.Draw(ColorRGBA(0, 0, 0, 0.33f), IGraphics::CORNER_NONE, 0.0f);
+	CUIRect Background;
+	Overlay.VMargin(150.0f, &Background);
+	Background.HMargin(50.0f, &Background);
+	Background.Draw(ColorRGBA(0, 0, 0, 0.80f), IGraphics::CORNER_ALL, 5.0f);
+
+	CUIRect View;
+	Background.Margin(10.0f, &View);
+
+	CUIRect Title, ButtonBar, Label;
+	View.HSplitTop(18.0f, &Title, &View);
+	View.HSplitTop(5.0f, nullptr, &View); // some spacing
+	View.HSplitBottom(18.0f, &View, &ButtonBar);
+	View.HSplitBottom(10.0f, &View, nullptr); // some spacing
+
+	// title bar
+	Title.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 4.0f);
+	Title.VMargin(10.0f, &Title);
+	Ui()->DoLabel(&Title, "Map settings error", 12.0f, TEXTALIGN_ML);
+
+	// Render body
+	{
+		static CLineInputBuffered<256> s_Input;
+		static CMapSettingsBackend::CContext s_Context = m_MapSettingsBackend.NewContext(&s_Input);
+
+		// Some text
+		SLabelProperties Props;
+		CUIRect Text;
+		View.HSplitTop(30.0f, &Text, &View);
+		Props.m_MaxWidth = Text.w;
+		Ui()->DoLabel(&Text, "Below is a report of the invalid map settings found when loading the map. Please fix them before proceeding further.", 10.0f, TEXTALIGN_MC, Props);
+
+		// Mixed list
+		CUIRect List = View;
+		View.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 3.0f);
+
+		const float RowHeight = 18.0f;
+		static CScrollRegion s_ScrollRegion;
+		vec2 ScrollOffset(0.0f, 0.0f);
+		CScrollRegionParams ScrollParams;
+		ScrollParams.m_ScrollUnit = 120.0f;
+		s_ScrollRegion.Begin(&List, &ScrollOffset, &ScrollParams);
+		const float EndY = List.y + List.h;
+		List.y += ScrollOffset.y;
+
+		List.HSplitTop(20.0f, nullptr, &List);
+
+		static int s_FixingCommandIndex = -1;
+
+		auto &&SetInput = [&](const char *pString) {
+			s_Input.Set(pString);
+			s_Context.Update();
+			s_Context.UpdateCursor(true);
+			Ui()->SetActiveItem(&s_Input);
+		};
+
+		CUIRect FixInput;
+		bool DisplayFixInput = false;
+		float DropdownHeight = 110.0f;
+
+		for(int i = 0; i < (int)m_Map.m_vSettings.size(); i++)
+		{
+			CUIRect Slot;
+
+			auto pInvalidSetting = std::find_if(vSettingsInvalid.begin(), vSettingsInvalid.end(), [i](const SInvalidSetting &Setting) { return Setting.m_Index == i; });
+			if(pInvalidSetting != vSettingsInvalid.end())
+			{ // This setting is invalid, only display it if its not a duplicate
+				if(!(pInvalidSetting->m_Type & SInvalidSetting::TYPE_DUPLICATE))
+				{
+					bool IsFixing = s_FixingCommandIndex == i;
+					List.HSplitTop(RowHeight, &Slot, &List);
+
+					// Draw a reddish background if setting is marked as deleted
+					if(pInvalidSetting->m_Context.m_Deleted)
+						Slot.Draw(ColorRGBA(0.85f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_ALL, 3.0f);
+
+					Slot.VMargin(5.0f, &Slot);
+					Slot.HMargin(1.0f, &Slot);
+
+					if(!IsFixing && !pInvalidSetting->m_Context.m_Fixed)
+					{ // Display "Fix" and "delete" buttons if we're not fixing the command and the command has not been fixed
+						CUIRect FixBtn, DelBtn;
+						Slot.VSplitRight(30.0f, &Slot, &DelBtn);
+						Slot.VSplitRight(5.0f, &Slot, nullptr);
+						DelBtn.HMargin(1.0f, &DelBtn);
+
+						Slot.VSplitRight(30.0f, &Slot, &FixBtn);
+						Slot.VSplitRight(10.0f, &Slot, nullptr);
+						FixBtn.HMargin(1.0f, &FixBtn);
+
+						// Delete button
+						if(DoButton_FontIcon(&pInvalidSetting->m_Context.m_Deleted, FONT_ICON_TRASH, pInvalidSetting->m_Context.m_Deleted, &DelBtn, 0, "Delete this command", IGraphics::CORNER_ALL, 10.0f))
+							pInvalidSetting->m_Context.m_Deleted = !pInvalidSetting->m_Context.m_Deleted;
+
+						// Fix button
+						if(DoButton_Editor(&pInvalidSetting->m_Context.m_Fixed, "Fix", !pInvalidSetting->m_Context.m_Deleted ? (s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1)) : -1, &FixBtn, 0, "Fix this command"))
+						{
+							s_FixingCommandIndex = i;
+							SetInput(pInvalidSetting->m_aSetting);
+						}
+					}
+					else if(IsFixing)
+					{ // If we're fixing this command, then display "Done" and "Cancel" buttons
+						// Also setup the input rect
+						CUIRect OkBtn, CancelBtn;
+						Slot.VSplitRight(50.0f, &Slot, &CancelBtn);
+						Slot.VSplitRight(5.0f, &Slot, nullptr);
+						CancelBtn.HMargin(1.0f, &CancelBtn);
+
+						Slot.VSplitRight(30.0f, &Slot, &OkBtn);
+						Slot.VSplitRight(10.0f, &Slot, nullptr);
+						OkBtn.HMargin(1.0f, &OkBtn);
+
+						// Buttons
+						static int s_Cancel = 0, s_Ok = 0;
+						if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+						{
+							s_FixingCommandIndex = -1;
+							s_Input.Clear();
+						}
+
+						// "Done" button only enabled if the fixed setting is valid
+						// For that we use a local CContext s_Context and use it to check
+						// that the setting is valid and that it is not a duplicate
+						ECollisionCheckResult Res = ECollisionCheckResult::ERROR;
+						s_Context.CheckCollision(vSettingsValid, Res);
+						bool Valid = s_Context.Valid() && Res == ECollisionCheckResult::ADD;
+
+						if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
+						{
+							// Mark the setting is being fixed
+							pInvalidSetting->m_Context.m_Fixed = true;
+							str_copy(pInvalidSetting->m_aSetting, s_Input.GetString());
+							// Add it to the list for future collision checks
+							vSettingsValid.emplace_back(s_Input.GetString());
+
+							// Clear the input & fixing command index
+							s_FixingCommandIndex = -1;
+							s_Input.Clear();
+						}
+					}
+
+					Label = Slot;
+					Props.m_EllipsisAtEnd = true;
+					Props.m_MaxWidth = Label.w;
+
+					if(IsFixing)
+					{
+						// Setup input rect, which will be used to draw the map settings input later
+						Label.HMargin(1.0, &FixInput);
+						DisplayFixInput = true;
+						DropdownHeight = minimum(DropdownHeight, EndY - FixInput.y - 16.0f);
+					}
+					else
+					{
+						// Draw label in case we're not fixing this setting.
+						// Deleted settings are shown in gray with a red line through them
+						// Fixed settings are shown in green
+						// Invalid settings are shown in red
+						if(!pInvalidSetting->m_Context.m_Deleted)
+						{
+							if(pInvalidSetting->m_Context.m_Fixed)
+								TextRender()->TextColor(0.0f, 1.0f, 0.0f, 1.0f);
+							else
+								TextRender()->TextColor(1.0f, 0.0f, 0.0f, 1.0f);
+							Ui()->DoLabel(&Label, pInvalidSetting->m_aSetting, 10.0f, TEXTALIGN_ML, Props);
+						}
+						else
+						{
+							TextRender()->TextColor(0.3f, 0.3f, 0.3f, 1.0f);
+							Ui()->DoLabel(&Label, pInvalidSetting->m_aSetting, 10.0f, TEXTALIGN_ML, Props);
+
+							CUIRect Line = Label;
+							Line.y = Label.y + Label.h / 2;
+							Line.h = 1;
+							Line.Draw(ColorRGBA(1, 0, 0, 1), IGraphics::CORNER_NONE, 0.0f);
+						}
+					}
+					TextRender()->TextColor(TextRender()->DefaultTextColor());
+				}
+			}
+			else
+			{ // This setting is valid
+				// Check for duplicates
+				const std::vector<int> &vDuplicates = SettingsDuplicate.at(i);
+				int Chosen = -1; // This is the chosen duplicate setting. -1 means the first valid setting that was found which was not a duplicate
+				for(int d = 0; d < (int)vDuplicates.size(); d++)
+				{
+					int DupIndex = vDuplicates[d];
+					if(vSettingsInvalid[DupIndex].m_Context.m_Chosen)
+					{
+						Chosen = d;
+						break;
+					}
+				}
+
+				List.HSplitTop(RowHeight * (vDuplicates.size() + 1) + 2.0f, &Slot, &List);
+				Slot.HMargin(1.0f, &Slot);
+
+				// Draw a background to highlight group of duplicates
+				if(!vDuplicates.empty())
+					Slot.Draw(ColorRGBA(1, 1, 1, 0.15f), IGraphics::CORNER_ALL, 3.0f);
+
+				Slot.VMargin(5.0f, &Slot);
+				Slot.HSplitTop(RowHeight, &Label, &Slot);
+				Label.HMargin(1.0f, &Label);
+
+				// Draw a "choose" button next to the label in case we have duplicates for this line
+				if(!vDuplicates.empty())
+				{
+					CUIRect ChooseBtn;
+					Label.VSplitRight(50.0f, &Label, &ChooseBtn);
+					Label.VSplitRight(5.0f, &Label, nullptr);
+					ChooseBtn.HMargin(1.0f, &ChooseBtn);
+					if(DoButton_Editor(&vDuplicates, "Choose", Chosen == -1, &ChooseBtn, 0, "Choose this command"))
+					{
+						if(Chosen != -1)
+							vSettingsInvalid[vDuplicates[Chosen]].m_Context.m_Chosen = false;
+						Chosen = -1; // Choosing this means that we do not choose any of the duplicates
+					}
+				}
+
+				// Draw the label
+				Props.m_MaxWidth = Label.w;
+				Ui()->DoLabel(&Label, m_Map.m_vSettings[i].m_aCommand, 10.0f, TEXTALIGN_ML, Props);
+
+				// Draw the list of duplicates, with a "Choose" button for each duplicate
+				// In case a duplicate is also invalid, then we draw a "Fix" button which behaves like the fix button above
+				// Duplicate settings name are shown in light blue, or in purple if they are also invalid
+				Slot.VSplitLeft(10.0f, nullptr, &Slot);
+				for(int DuplicateIndex = 0; DuplicateIndex < (int)vDuplicates.size(); DuplicateIndex++)
+				{
+					auto &Duplicate = vSettingsInvalid.at(vDuplicates[DuplicateIndex]);
+					bool IsFixing = s_FixingCommandIndex == Duplicate.m_Index;
+					bool IsInvalid = Duplicate.m_Type & SInvalidSetting::TYPE_INVALID;
+
+					ColorRGBA Color(0.329f, 0.714f, 0.859f, 1.0f);
+					CUIRect SubSlot;
+					Slot.HSplitTop(RowHeight, &SubSlot, &Slot);
+					SubSlot.HMargin(1.0f, &SubSlot);
+
+					if(!IsFixing)
+					{
+						// If not fixing, then display "Choose" and maybe "Fix" buttons.
+
+						CUIRect ChooseBtn;
+						SubSlot.VSplitRight(50.0f, &SubSlot, &ChooseBtn);
+						SubSlot.VSplitRight(5.0f, &SubSlot, nullptr);
+						ChooseBtn.HMargin(1.0f, &ChooseBtn);
+						if(DoButton_Editor(&Duplicate.m_Context.m_Chosen, "Choose", IsInvalid && !Duplicate.m_Context.m_Fixed ? -1 : Duplicate.m_Context.m_Chosen, &ChooseBtn, 0, "Override with this command"))
+						{
+							Duplicate.m_Context.m_Chosen = !Duplicate.m_Context.m_Chosen;
+							if(Chosen != -1 && Chosen != DuplicateIndex)
+								vSettingsInvalid[vDuplicates[Chosen]].m_Context.m_Chosen = false;
+							Chosen = DuplicateIndex;
+						}
+
+						if(IsInvalid)
+						{
+							if(!Duplicate.m_Context.m_Fixed)
+							{
+								Color = ColorRGBA(1, 0, 1, 1);
+								CUIRect FixBtn;
+								SubSlot.VSplitRight(30.0f, &SubSlot, &FixBtn);
+								SubSlot.VSplitRight(10.0f, &SubSlot, nullptr);
+								FixBtn.HMargin(1.0f, &FixBtn);
+								if(DoButton_Editor(&Duplicate.m_Context.m_Fixed, "Fix", s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1), &FixBtn, 0, "Fix this command (needed before it can be chosen)"))
+								{
+									s_FixingCommandIndex = Duplicate.m_Index;
+									SetInput(Duplicate.m_aSetting);
+								}
+							}
+							else
+							{
+								Color = ColorRGBA(0.329f, 0.714f, 0.859f, 1.0f);
+							}
+						}
+					}
+					else
+					{
+						// If we're fixing, display "Done" and "Cancel" buttons
+						CUIRect OkBtn, CancelBtn;
+						SubSlot.VSplitRight(50.0f, &SubSlot, &CancelBtn);
+						SubSlot.VSplitRight(5.0f, &SubSlot, nullptr);
+						CancelBtn.HMargin(1.0f, &CancelBtn);
+
+						SubSlot.VSplitRight(30.0f, &SubSlot, &OkBtn);
+						SubSlot.VSplitRight(10.0f, &SubSlot, nullptr);
+						OkBtn.HMargin(1.0f, &OkBtn);
+
+						static int s_Cancel = 0, s_Ok = 0;
+						if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+						{
+							s_FixingCommandIndex = -1;
+							s_Input.Clear();
+						}
+
+						// Use the local CContext s_Context to validate the input
+						// We also need to make sure the fixed setting matches the initial duplicate setting
+						// For example:
+						//   sv_deepfly 0
+						//      sv_deepfly 5  <- This is invalid and duplicate. We can only fix it by writing "sv_deepfly 0" or "sv_deepfly 1".
+						//                       If we write any other setting, like "sv_hit 1", it won't work as it does not match "sv_deepfly".
+						// To do that, we use the context and we check for collision with the current map setting
+						ECollisionCheckResult Res = ECollisionCheckResult::ERROR;
+						s_Context.CheckCollision({m_Map.m_vSettings[i]}, Res);
+						bool Valid = s_Context.Valid() && Res == ECollisionCheckResult::REPLACE;
+
+						if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
+						{
+							if(Valid) // Just to make sure
+							{
+								// Mark the setting as fixed
+								Duplicate.m_Context.m_Fixed = true;
+								str_copy(Duplicate.m_aSetting, s_Input.GetString());
+
+								s_FixingCommandIndex = -1;
+								s_Input.Clear();
+							}
+						}
+					}
+
+					Label = SubSlot;
+					Props.m_MaxWidth = Label.w;
+
+					if(IsFixing)
+					{
+						// Setup input rect in case we are fixing the setting
+						Label.HMargin(1.0, &FixInput);
+						DisplayFixInput = true;
+						DropdownHeight = minimum(DropdownHeight, EndY - FixInput.y - 16.0f);
+					}
+					else
+					{
+						// Otherwise, render the setting label
+						TextRender()->TextColor(Color);
+						Ui()->DoLabel(&Label, Duplicate.m_aSetting, 10.0f, TEXTALIGN_ML, Props);
+						TextRender()->TextColor(TextRender()->DefaultTextColor());
+					}
+				}
+			}
+
+			// Finally, add the slot to the scroll region
+			s_ScrollRegion.AddRect(Slot);
+		}
+
+		// Add some padding to the bottom so the dropdown can actually display some values in case we
+		// fix an invalid setting at the bottom of the list
+		CUIRect PaddingBottom;
+		List.HSplitTop(30.0f, &PaddingBottom, &List);
+		s_ScrollRegion.AddRect(PaddingBottom);
+
+		// Display the map settings edit box after having rendered all the lines, so the dropdown shows in
+		// front of everything, but is still being clipped by the scroll region.
+		if(DisplayFixInput)
+			DoMapSettingsEditBox(&s_Context, &FixInput, 10.0f, maximum(DropdownHeight, 30.0f));
+
+		s_ScrollRegion.End();
+	}
+
+	// Confirm button
+	static int s_ConfirmButton = 0, s_CancelButton = 0, s_FixAllButton = 0;
+	CUIRect ConfimButton, CancelButton, FixAllUnknownButton;
+	ButtonBar.VSplitLeft(110.0f, &CancelButton, &ButtonBar);
+	ButtonBar.VSplitRight(110.0f, &ButtonBar, &ConfimButton);
+	ButtonBar.VSplitRight(5.0f, &ButtonBar, nullptr);
+	ButtonBar.VSplitRight(150.0f, &ButtonBar, &FixAllUnknownButton);
+
+	bool CanConfirm = true;
+	bool CanFixAllUnknown = false;
+	for(auto &InvalidSetting : vSettingsInvalid)
+	{
+		if(!InvalidSetting.m_Context.m_Fixed && !InvalidSetting.m_Context.m_Deleted && !(InvalidSetting.m_Type & SInvalidSetting::TYPE_DUPLICATE))
+		{
+			CanConfirm = false;
+			if(InvalidSetting.m_Unknown)
+				CanFixAllUnknown = true;
+			break;
+		}
+	}
+
+	auto &&Execute = [&]() {
+		// Execute will modify the actual map settings according to the fixes that were just made within the dialog.
+
+		// Fix fixed settings, erase deleted settings
+		for(auto &FixedSetting : vSettingsInvalid)
+		{
+			if(FixedSetting.m_Context.m_Fixed)
+			{
+				str_copy(m_Map.m_vSettings[FixedSetting.m_Index].m_aCommand, FixedSetting.m_aSetting);
+			}
+		}
+
+		// Choose chosen settings
+		// => Erase settings that don't match
+		// => Erase settings that were not chosen
+		std::vector<CEditorMapSetting> vSettingsToErase;
+		for(auto &Setting : vSettingsInvalid)
+		{
+			if(Setting.m_Type & SInvalidSetting::TYPE_DUPLICATE)
+			{
+				if(!Setting.m_Context.m_Chosen)
+					vSettingsToErase.emplace_back(Setting.m_aSetting);
+				else
+					vSettingsToErase.emplace_back(m_Map.m_vSettings[Setting.m_CollidingIndex].m_aCommand);
+			}
+		}
+
+		// Erase deleted settings
+		for(auto &DeletedSetting : vSettingsInvalid)
+		{
+			if(DeletedSetting.m_Context.m_Deleted)
+			{
+				m_Map.m_vSettings.erase(
+					std::remove_if(m_Map.m_vSettings.begin(), m_Map.m_vSettings.end(), [&](const CEditorMapSetting &MapSetting) {
+						return str_comp_nocase(MapSetting.m_aCommand, DeletedSetting.m_aSetting) == 0;
+					}),
+					m_Map.m_vSettings.end());
+			}
+		}
+
+		// Erase settings to erase
+		for(auto &Setting : vSettingsToErase)
+		{
+			m_Map.m_vSettings.erase(
+				std::remove_if(m_Map.m_vSettings.begin(), m_Map.m_vSettings.end(), [&](const CEditorMapSetting &MapSetting) {
+					return str_comp_nocase(MapSetting.m_aCommand, Setting.m_aCommand) == 0;
+				}),
+				m_Map.m_vSettings.end());
+		}
+
+		m_Map.OnModify();
+	};
+
+	auto &&FixAllUnknown = [&] {
+		// Mark unknown settings as fixed
+		for(auto &InvalidSetting : vSettingsInvalid)
+			if(!InvalidSetting.m_Context.m_Fixed && !InvalidSetting.m_Context.m_Deleted && !(InvalidSetting.m_Type & SInvalidSetting::TYPE_DUPLICATE) && InvalidSetting.m_Unknown)
+				InvalidSetting.m_Context.m_Fixed = true;
+	};
+
+	// Fix all unknown settings
+	if(DoButton_Editor(&s_FixAllButton, "Allow all unknown settings", CanFixAllUnknown ? 0 : -1, &FixAllUnknownButton, 0, nullptr))
+	{
+		FixAllUnknown();
+	}
+
+	// Confirm - execute the fixes
+	if(DoButton_Editor(&s_ConfirmButton, "Confirm", CanConfirm ? 0 : -1, &ConfimButton, 0, nullptr) || (CanConfirm && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
+	{
+		Execute();
+		m_Dialog = DIALOG_NONE;
+	}
+
+	// Cancel - we load a new empty map
+	if(DoButton_Editor(&s_CancelButton, "Cancel", 0, &CancelButton, 0, nullptr) || (Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE)))
+	{
+		Reset();
+		m_aFileName[0] = 0;
+		m_Dialog = DIALOG_NONE;
+	}
+}
+
+void CEditor::MapSettingsDropdownRenderCallback(const SPossibleValueMatch &Match, char (&aOutput)[128], std::vector<STextColorSplit> &vColorSplits)
+{
+	// Check the match argument index.
+	// If it's -1, we're displaying the list of available map settings names
+	// If its >= 0, we're displaying the list of possible values matches for that argument
+	if(Match.m_ArgIndex == -1)
+	{
+		IMapSetting *pInfo = (IMapSetting *)Match.m_pData;
+		vColorSplits = {
+			{str_length(pInfo->m_pName) + 1, -1, ColorRGBA(0.6f, 0.6f, 0.6f, 1)}, // Darker arguments
+		};
+
+		if(pInfo->m_Type == IMapSetting::SETTING_INT)
+		{
+			str_format(aOutput, sizeof(aOutput), "%s i[value]", pInfo->m_pName);
+		}
+		else if(pInfo->m_Type == IMapSetting::SETTING_COMMAND)
+		{
+			SMapSettingCommand *pCommand = (SMapSettingCommand *)pInfo;
+			str_format(aOutput, sizeof(aOutput), "%s %s", pCommand->m_pName, pCommand->m_pArgs);
+		}
+	}
+	else
+	{
+		str_copy(aOutput, Match.m_pValue);
+	}
+}
+
+// ----------------------------------------
+
+CMapSettingsBackend::CContext *CMapSettingsBackend::ms_pActiveContext = nullptr;
+
+void CMapSettingsBackend::OnInit(CEditor *pEditor)
+{
+	CEditorComponent::OnInit(pEditor);
+
+	// Register values loader
+	InitValueLoaders();
+
+	// Load settings/commands
+	LoadAllMapSettings();
+
+	CValuesBuilder Builder(&m_PossibleValuesPerCommand);
+
+	// Load and parse static map settings so we can use them here
+	for(auto &pSetting : m_vpMapSettings)
+	{
+		// We want to parse the arguments of each map setting so we can autocomplete them later
+		// But that depends on the type of the setting.
+		// If we have a INT setting, then we know we can only ever have 1 argument which is a integer value
+		// If we have a COMMAND setting, then we need to parse its arguments
+		if(pSetting->m_Type == IMapSetting::SETTING_INT)
+			LoadSettingInt(std::static_pointer_cast<SMapSettingInt>(pSetting));
+		else if(pSetting->m_Type == IMapSetting::SETTING_COMMAND)
+			LoadSettingCommand(std::static_pointer_cast<SMapSettingCommand>(pSetting));
+
+		LoadPossibleValues(Builder(pSetting->m_pName), pSetting);
+	}
+
+	// Init constraints
+	LoadConstraints();
+}
+
+void CMapSettingsBackend::LoadAllMapSettings()
+{
+	// Gather all config variables having the flag CFGFLAG_GAME
+	Editor()->ConfigManager()->PossibleConfigVariables("", CFGFLAG_GAME, PossibleConfigVariableCallback, this);
+
+	// Load list of commands
+	LoadCommand("tune", "s[tuning] f[value]", "Tune variable to value or show current value");
+	LoadCommand("tune_zone", "i[zone] s[tuning] f[value]", "Tune in zone a variable to value");
+	LoadCommand("tune_zone_enter", "i[zone] r[message]", "which message to display on zone enter; use 0 for normal area");
+	LoadCommand("tune_zone_leave", "i[zone] r[message]", "which message to display on zone leave; use 0 for normal area");
+	LoadCommand("mapbug", "s[mapbug]", "Enable map compatibility mode using the specified bug (example: grenade-doubleexplosion@ddnet.tw)");
+	LoadCommand("switch_open", "i[switch]", "Whether a switch is deactivated by default (otherwise activated)");
+}
+
+void CMapSettingsBackend::LoadCommand(const char *pName, const char *pArgs, const char *pHelp)
+{
+	m_vpMapSettings.emplace_back(std::make_shared<SMapSettingCommand>(pName, pHelp, pArgs));
+}
+
+void CMapSettingsBackend::LoadSettingInt(const std::shared_ptr<SMapSettingInt> &pSetting)
+{
+	// We load an int argument here
+	m_ParsedCommandArgs[pSetting].emplace_back();
+	auto &Arg = m_ParsedCommandArgs[pSetting].back();
+	str_copy(Arg.m_aName, "value");
+	Arg.m_Type = 'i';
+}
+
+void CMapSettingsBackend::LoadSettingCommand(const std::shared_ptr<SMapSettingCommand> &pSetting)
+{
+	// This method parses a setting into its arguments (name and type) so we can later
+	// use them to validate the current input as well as display the current argument value
+	// over the line input.
+
+	m_ParsedCommandArgs[pSetting].clear();
+	const char *pIterator = pSetting->m_pArgs;
+
+	char Type;
+
+	while(*pIterator)
+	{
+		if(*pIterator == '?') // Skip optional values as a map setting should not have optional values
+			pIterator++;
+
+		Type = *pIterator;
+		pIterator++;
+		while(*pIterator && *pIterator != '[')
+			pIterator++;
+		pIterator++; // skip '['
+
+		const char *pNameStart = pIterator;
+
+		while(*pIterator && *pIterator != ']')
+			pIterator++;
+
+		size_t Len = pIterator - pNameStart;
+		pIterator++; // Skip ']'
+
+		dbg_assert(Len + 1 < sizeof(SParsedMapSettingArg::m_aName), "Length of server setting name exceeds limit.");
+
+		// Append parsed arg
+		m_ParsedCommandArgs[pSetting].emplace_back();
+		auto &Arg = m_ParsedCommandArgs[pSetting].back();
+		str_copy(Arg.m_aName, pNameStart, Len + 1);
+		Arg.m_Type = Type;
+
+		pIterator = str_skip_whitespaces_const(pIterator);
+	}
+}
+
+void CMapSettingsBackend::LoadPossibleValues(const CSettingValuesBuilder &Builder, const std::shared_ptr<IMapSetting> &pSetting)
+{
+	// Call the value loader for that setting
+	auto Iter = m_LoaderFunctions.find(pSetting->m_pName);
+	if(Iter == m_LoaderFunctions.end())
+		return;
+
+	(*Iter->second)(Builder);
+}
+
+void CMapSettingsBackend::RegisterLoader(const char *pSettingName, const FLoaderFunction &pfnLoader)
+{
+	// Registers a value loader function for a specific setting name
+	m_LoaderFunctions[pSettingName] = pfnLoader;
+}
+
+void CMapSettingsBackend::LoadConstraints()
+{
+	// Make an instance of constraint builder
+	CCommandArgumentConstraintBuilder Command(&m_ArgConstraintsPerCommand);
+
+	// Define constraints like this
+	// This is still a bit sad as we have to do it manually here.
+	Command("tune", 2).Unique(0);
+	Command("tune_zone", 3).Multiple(0).Unique(1);
+	Command("tune_zone_enter", 2).Unique(0);
+	Command("tune_zone_leave", 2).Unique(0);
+	Command("switch_open", 1).Unique(0);
+	Command("mapbug", 1).Unique(0);
+}
+
+void CMapSettingsBackend::PossibleConfigVariableCallback(const SConfigVariable *pVariable, void *pUserData)
+{
+	CMapSettingsBackend *pBackend = (CMapSettingsBackend *)pUserData;
+
+	if(pVariable->m_Type == SConfigVariable::VAR_INT)
+	{
+		SIntConfigVariable *pIntVariable = (SIntConfigVariable *)pVariable;
+		pBackend->m_vpMapSettings.emplace_back(std::make_shared<SMapSettingInt>(
+			pIntVariable->m_pScriptName,
+			pIntVariable->m_pHelp,
+			pIntVariable->m_Default,
+			pIntVariable->m_Min,
+			pIntVariable->m_Max));
+	}
+}
+
+void CMapSettingsBackend::CContext::Reset()
+{
+	m_LastCursorOffset = 0;
+	m_CursorArgIndex = -1;
+	m_pCurrentSetting = nullptr;
+	m_vCurrentArgs.clear();
+	m_aCommand[0] = '\0';
+	m_DropdownContext.m_Selected = -1;
+	m_CurrentCompletionIndex = -1;
+	m_DropdownContext.m_ShortcutUsed = false;
+	m_DropdownContext.m_MousePressedInside = false;
+	m_DropdownContext.m_Visible = false;
+	m_DropdownContext.m_ShouldHide = false;
+	m_CommentOffset = -1;
+
+	ClearError();
+}
+
+void CMapSettingsBackend::CContext::Update()
+{
+	UpdateFromString(InputString());
+}
+
+void CMapSettingsBackend::CContext::UpdateFromString(const char *pStr)
+{
+	// This is the main method that does all the argument parsing and validating.
+	// It fills pretty much all the context values, the arguments, their position,
+	// if they are valid or not, etc.
+
+	m_pCurrentSetting = nullptr;
+	m_vCurrentArgs.clear();
+	m_CommentOffset = -1;
+
+	const char *pIterator = pStr;
+
+	// Check for comment
+	const char *pEnd = pStr;
+	int InString = 0;
+
+	while(*pEnd)
+	{
+		if(*pEnd == '"')
+			InString ^= 1;
+		else if(*pEnd == '\\') // Escape sequences
+		{
+			if(pEnd[1] == '"')
+				pEnd++;
+		}
+		else if(!InString)
+		{
+			if(*pEnd == '#') // Found comment
+			{
+				m_CommentOffset = pEnd - pStr;
+				break;
+			}
+		}
+
+		pEnd++;
+	}
+
+	if(m_CommentOffset == 0)
+		return;
+
+	// End command at start of comment, if any
+	char aInputString[256];
+	str_copy(aInputString, pStr, m_CommentOffset != -1 ? m_CommentOffset + 1 : sizeof(aInputString));
+	pIterator = aInputString;
+
+	// Get the command/setting
+	m_aCommand[0] = '\0';
+	while(pIterator && *pIterator != ' ' && *pIterator != '\0')
+		pIterator++;
+
+	str_copy(m_aCommand, aInputString, (pIterator - aInputString) + 1);
+
+	// Get the command if it is a recognized one
+	for(auto &pSetting : m_pBackend->m_vpMapSettings)
+	{
+		if(str_comp_nocase(m_aCommand, pSetting->m_pName) == 0)
+		{
+			m_pCurrentSetting = pSetting;
+			break;
+		}
+	}
+
+	// Parse args
+	ParseArgs(aInputString, pIterator);
+}
+
+void CMapSettingsBackend::CContext::ParseArgs(const char *pLineInputStr, const char *pStr)
+{
+	// This method parses the arguments of the current command, starting at pStr
+
+	ClearError();
+
+	const char *pIterator = pStr;
+
+	if(!pStr || *pStr == '\0')
+		return; // No arguments
+
+	// NextArg is used to get the contents of the current argument and go to the next argument position
+	// It outputs the length of the argument in pLength and returns a boolean indicating if the parsing
+	// of that argument is valid or not (only the case when using strings with quotes ("))
+	auto &&NextArg = [&](const char *pArg, int *pLength) {
+		if(*pIterator == '"')
+		{
+			pIterator++;
+			bool Valid = true;
+			bool IsEscape = false;
+
+			while(true)
+			{
+				if(pIterator[0] == '"' && !IsEscape)
+					break;
+				else if(pIterator[0] == 0)
+				{
+					Valid = false;
+					break;
+				}
+
+				if(pIterator[0] == '\\' && !IsEscape)
+					IsEscape = true;
+				else if(IsEscape)
+					IsEscape = false;
+
+				pIterator++;
+			}
+			const char *pEnd = ++pIterator;
+			pIterator = str_skip_to_whitespace_const(pIterator);
+
+			// Make sure there are no other characters at the end, otherwise the string is invalid.
+			// E.g. "abcd"ef is invalid
+			Valid = Valid && pIterator == pEnd;
+			*pLength = pEnd - pArg;
+
+			return Valid;
+		}
+		else
+		{
+			pIterator = str_skip_to_whitespace_const(pIterator);
+			*pLength = pIterator - pArg;
+			return true;
+		}
+	};
+
+	// Simple validation of string. Checks that it does not contain unescaped " in the middle of it.
+	auto &&ValidateStr = [](const char *pString) -> bool {
+		const char *pIt = pString;
+		bool IsEscape = false;
+		while(*pIt)
+		{
+			if(pIt[0] == '"' && !IsEscape)
+				return false;
+
+			if(pIt[0] == '\\' && !IsEscape)
+				IsEscape = true;
+			else if(IsEscape)
+				IsEscape = false;
+
+			pIt++;
+		}
+		return true;
+	};
+
+	const int CommandArgCount = m_pCurrentSetting != nullptr ? m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting).size() : 0;
+	int ArgIndex = 0;
+	SCommandParseError::EErrorType Error = SCommandParseError::ERROR_NONE;
+
+	// Also keep track of the visual X position of each argument within the input
+	float PosX = 0;
+	const float WW = m_pBackend->TextRender()->TextWidth(m_FontSize, " ");
+	PosX += m_pBackend->TextRender()->TextWidth(m_FontSize, m_aCommand);
+
+	// Parsing beings
+	while(*pIterator)
+	{
+		Error = SCommandParseError::ERROR_NONE;
+		pIterator++; // Skip whitespace
+		PosX += WW; // Add whitespace width
+
+		// Insert argument here
+		char Char = *pIterator;
+		const char *pArgStart = pIterator;
+		int Length;
+		bool Valid = NextArg(pArgStart, &Length); // Get contents and go to next argument position
+		size_t Offset = pArgStart - pLineInputStr; // Compute offset from the start of the input
+
+		// Add new argument, copy the argument contents
+		m_vCurrentArgs.emplace_back();
+		auto &NewArg = m_vCurrentArgs.back();
+		// Fill argument value, with a maximum length of 256
+		str_copy(NewArg.m_aValue, pArgStart, minimum((int)sizeof(SCurrentSettingArg::m_aValue), Length + 1));
+
+		// Validate argument from the parsed argument of the current setting.
+		// If current setting is not valid, then there are no arguments which results in an error.
+
+		char Type = 'u'; // u = unknown, only possible for unknown commands when m_AllowUnknownCommands is true.
+		if(ArgIndex < CommandArgCount)
+		{
+			SParsedMapSettingArg &Arg = m_pBackend->m_ParsedCommandArgs[m_pCurrentSetting].at(ArgIndex);
+			if(Arg.m_Type == 'r')
+			{
+				// Rest of string, should add all the string if there was no quotes
+				// Otherwise, only get the contents in the quotes, and consider content after that as other arguments
+				if(Char != '"')
+				{
+					while(*pIterator)
+						pIterator++;
+					Length = pIterator - pArgStart;
+					str_copy(NewArg.m_aValue, pArgStart, Length + 1);
+				}
+
+				if(!Valid)
+					Error = SCommandParseError::ERROR_INVALID_VALUE;
+			}
+			else if(Arg.m_Type == 'i')
+			{
+				// Validate int
+				if(!str_toint(NewArg.m_aValue, nullptr))
+					Error = SCommandParseError::ERROR_INVALID_VALUE;
+			}
+			else if(Arg.m_Type == 'f')
+			{
+				// Validate float
+				if(!str_tofloat(NewArg.m_aValue, nullptr))
+					Error = SCommandParseError::ERROR_INVALID_VALUE;
+			}
+			else if(Arg.m_Type == 's')
+			{
+				// Validate string
+				if(!Valid || (Char != '"' && !ValidateStr(NewArg.m_aValue)))
+					Error = SCommandParseError::ERROR_INVALID_VALUE;
+			}
+
+			// Extended argument validation:
+			//   for int settings it checks that the value is in range
+			//   for command settings, it checks that the value is one of the possible values if there are any
+			EValidationResult Result = ValidateArg(ArgIndex, NewArg.m_aValue);
+			if(Length && !Error && Result != EValidationResult::VALID)
+			{
+				if(Result == EValidationResult::ERROR)
+					Error = SCommandParseError::ERROR_INVALID_VALUE; // Invalid argument value (invalid int, invalid float)
+				else if(Result == EValidationResult::UNKNOWN)
+					Error = SCommandParseError::ERROR_UNKNOWN_VALUE; // Unknown argument value
+				else if(Result == EValidationResult::INCOMPLETE)
+					Error = SCommandParseError::ERROR_INCOMPLETE; // Incomplete argument in case of possible values
+				else if(Result == EValidationResult::OUT_OF_RANGE)
+					Error = SCommandParseError::ERROR_OUT_OF_RANGE; // Out of range argument value in case of int settings
+				else
+					Error = SCommandParseError::ERROR_UNKNOWN; // Unknown error
+			}
+
+			Type = Arg.m_Type;
+		}
+		else
+		{
+			// Error: too many arguments if no comment after
+			if(m_CommentOffset == -1)
+				Error = SCommandParseError::ERROR_TOO_MANY_ARGS;
+			else
+			{ // Otherwise, check if there are any arguments left between this argument and the comment
+				const char *pSubIt = pArgStart;
+				pSubIt = str_skip_whitespaces_const(pSubIt);
+				if(*pSubIt != '\0')
+				{ // If there aren't only spaces between the last argument and the comment, then this is an error
+					Error = SCommandParseError::ERROR_TOO_MANY_ARGS;
+				}
+				else // If there are, then just exit the loop to avoid getting an error
+				{
+					m_vCurrentArgs.pop_back();
+					break;
+				}
+			}
+		}
+
+		// Fill argument informations
+		NewArg.m_X = PosX;
+		NewArg.m_Start = Offset;
+		NewArg.m_End = Offset + Length;
+		NewArg.m_Error = Error != SCommandParseError::ERROR_NONE || Length == 0 || m_Error.m_Type != SCommandParseError::ERROR_NONE;
+		NewArg.m_ExpectedType = Type;
+
+		// Do not emit an error if we allow unknown commands and the current setting is invalid
+		if(m_AllowUnknownCommands && m_pCurrentSetting == nullptr)
+			NewArg.m_Error = false;
+
+		// Check error and fill the error field with different messages
+		if(Error == SCommandParseError::ERROR_INVALID_VALUE || Error == SCommandParseError::ERROR_UNKNOWN_VALUE || Error == SCommandParseError::ERROR_OUT_OF_RANGE || Error == SCommandParseError::ERROR_INCOMPLETE)
+		{
+			// Only keep first error
+			if(!m_Error.m_aMessage[0])
+			{
+				int ErrorArgIndex = (int)m_vCurrentArgs.size() - 1;
+				SCurrentSettingArg &ErrorArg = m_vCurrentArgs.back();
+				SParsedMapSettingArg &SettingArg = m_pBackend->m_ParsedCommandArgs[m_pCurrentSetting].at(ArgIndex);
+				char aFormattedValue[256];
+				FormatDisplayValue(ErrorArg.m_aValue, aFormattedValue);
+
+				if(Error == SCommandParseError::ERROR_INVALID_VALUE || Error == SCommandParseError::ERROR_UNKNOWN_VALUE || Error == SCommandParseError::ERROR_INCOMPLETE)
+				{
+					static const std::map<int, const char *> s_Names = {
+						{SCommandParseError::ERROR_INVALID_VALUE, "Invalid"},
+						{SCommandParseError::ERROR_UNKNOWN_VALUE, "Unknown"},
+						{SCommandParseError::ERROR_INCOMPLETE, "Incomplete"},
+					};
+					str_format(m_Error.m_aMessage, sizeof(m_Error.m_aMessage), "%s argument value: %s at position %d for argument '%s'", s_Names.at(Error), aFormattedValue, (int)ErrorArg.m_Start, SettingArg.m_aName);
+				}
+				else
+				{
+					std::shared_ptr<SMapSettingInt> pSettingInt = std::static_pointer_cast<SMapSettingInt>(m_pCurrentSetting);
+					str_format(m_Error.m_aMessage, sizeof(m_Error.m_aMessage), "Invalid argument value: %s at position %d for argument '%s': out of range [%d, %d]", aFormattedValue, (int)ErrorArg.m_Start, SettingArg.m_aName, pSettingInt->m_Min, pSettingInt->m_Max);
+				}
+				m_Error.m_ArgIndex = ErrorArgIndex;
+				m_Error.m_Type = Error;
+			}
+		}
+		else if(Error == SCommandParseError::ERROR_TOO_MANY_ARGS)
+		{
+			// Only keep first error
+			if(!m_Error.m_aMessage[0])
+			{
+				if(m_pCurrentSetting != nullptr)
+				{
+					str_copy(m_Error.m_aMessage, "Too many arguments");
+					m_Error.m_ArgIndex = ArgIndex;
+					break;
+				}
+				else if(!m_AllowUnknownCommands)
+				{
+					char aFormattedValue[256];
+					FormatDisplayValue(m_aCommand, aFormattedValue);
+					str_format(m_Error.m_aMessage, sizeof(m_Error.m_aMessage), "Unknown server setting: %s", aFormattedValue);
+					m_Error.m_ArgIndex = -1;
+					break;
+				}
+				m_Error.m_Type = Error;
+			}
+		}
+
+		PosX += m_pBackend->TextRender()->TextWidth(m_FontSize, pArgStart, Length); // Advance argument position
+		ArgIndex++;
+	}
+}
+
+void CMapSettingsBackend::CContext::ClearError()
+{
+	m_Error.m_aMessage[0] = '\0';
+	m_Error.m_Type = SCommandParseError::ERROR_NONE;
+}
+
+bool CMapSettingsBackend::CContext::UpdateCursor(bool Force)
+{
+	// This method updates the cursor offset in this class from
+	// the cursor offset of the line input.
+	// It also updates the argument index where the cursor is at
+	// and the possible values matches if the argument index changes.
+	// Returns true in case the cursor changed position
+
+	if(!m_pLineInput)
+		return false;
+
+	size_t Offset = m_pLineInput->GetCursorOffset();
+	if(Offset == m_LastCursorOffset && !Force)
+		return false;
+
+	m_LastCursorOffset = Offset;
+	int NewArg = m_CursorArgIndex;
+
+	// Update current argument under cursor
+	if(m_CommentOffset != -1 && Offset >= (size_t)m_CommentOffset)
+	{
+		NewArg = (int)m_vCurrentArgs.size();
+	}
+	else
+	{
+		bool FoundArg = false;
+		for(int i = (int)m_vCurrentArgs.size() - 1; i >= 0; i--)
+		{
+			if(Offset >= m_vCurrentArgs[i].m_Start)
+			{
+				NewArg = i;
+				FoundArg = true;
+				break;
+			}
+		}
+
+		if(!FoundArg)
+			NewArg = -1;
+	}
+
+	bool ShouldUpdate = NewArg != m_CursorArgIndex;
+	m_CursorArgIndex = NewArg;
+
+	// Do not show error if current argument is incomplete, as we are editing it
+	if(m_pLineInput != nullptr)
+	{
+		if(Offset == m_pLineInput->GetLength() && m_Error.m_aMessage[0] && m_Error.m_ArgIndex == m_CursorArgIndex && m_Error.m_Type == SCommandParseError::ERROR_INCOMPLETE)
+			ClearError();
+	}
+
+	if(m_DropdownContext.m_Selected == -1 || ShouldUpdate || Force)
+	{
+		// Update possible commands from cursor
+		UpdatePossibleMatches();
+	}
+
+	return true;
+}
+
+EValidationResult CMapSettingsBackend::CContext::ValidateArg(int Index, const char *pArg)
+{
+	if(!m_pCurrentSetting)
+		return EValidationResult::ERROR;
+
+	// Check if this argument is valid against current argument
+	if(m_pCurrentSetting->m_Type == IMapSetting::SETTING_INT)
+	{
+		std::shared_ptr<SMapSettingInt> pSetting = std::static_pointer_cast<SMapSettingInt>(m_pCurrentSetting);
+		if(Index > 0)
+			return EValidationResult::ERROR;
+
+		int Value;
+		if(!str_toint(pArg, &Value)) // Try parse the integer
+			return EValidationResult::ERROR;
+
+		return Value >= pSetting->m_Min && Value <= pSetting->m_Max ? EValidationResult::VALID : EValidationResult::OUT_OF_RANGE;
+	}
+	else if(m_pCurrentSetting->m_Type == IMapSetting::SETTING_COMMAND)
+	{
+		auto &vArgs = m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting);
+		if(Index < (int)vArgs.size())
+		{
+			auto It = m_pBackend->m_PossibleValuesPerCommand.find(m_pCurrentSetting->m_pName);
+			if(It != m_pBackend->m_PossibleValuesPerCommand.end())
+			{
+				auto ValuesIt = It->second.find(Index);
+				if(ValuesIt != It->second.end())
+				{
+					// This means that we have possible values for this argument for this setting
+					// In order to validate such arg, we have to check if it maches any of the possible values
+					const bool EqualsAny = std::any_of(ValuesIt->second.begin(), ValuesIt->second.end(), [pArg](auto *pValue) { return str_comp_nocase(pArg, pValue) == 0; });
+
+					// If equals, then argument is valid
+					if(EqualsAny)
+						return EValidationResult::VALID;
+
+					// Here we check if argument is incomplete
+					const bool StartsAny = std::any_of(ValuesIt->second.begin(), ValuesIt->second.end(), [pArg](auto *pValue) { return str_startswith_nocase(pValue, pArg) != nullptr; });
+					if(StartsAny)
+						return EValidationResult::INCOMPLETE;
+
+					return EValidationResult::UNKNOWN;
+				}
+			}
+		}
+
+		// If we get here, it means there are no posssible values for that specific argument.
+		// The validation for specific types such as int and floats were done earlier so if we get here
+		// we know the argument is valid.
+		// String and "rest of string" types are valid by default.
+		return EValidationResult::VALID;
+	}
+
+	return EValidationResult::ERROR;
+}
+
+void CMapSettingsBackend::CContext::UpdatePossibleMatches()
+{
+	// This method updates the possible values matches based on the cursor position within the current argument in the line input.
+	// For example ("|" is the cursor):
+	// - Typing "sv_deep|" will show "sv_deepfly" as a possible match in the dropdown
+	//   Moving the cursor: "sv_|deep" will show all possible commands starting with "sv_"
+	// - Typing "tune ground_frict|" will show "ground_friction" as possible match
+	//   Moving the cursor: "tune ground_|frict" will show all possible values starting with "ground_" for that argument (argument 0 of "tune" setting)
+
+	m_vPossibleMatches.clear();
+	m_DropdownContext.m_Selected = -1;
+
+	if(m_CommentOffset == 0)
+		return;
+
+	// First case: argument index under cursor is -1 => we're on the command/setting name
+	if(m_CursorArgIndex == -1)
+	{
+		// Use a substring from the start of the input to the cursor offset
+		char aSubString[128];
+		str_copy(aSubString, m_aCommand, minimum(m_LastCursorOffset + 1, sizeof(aSubString)));
+
+		// Iterate through available map settings and find those which the beginning matches with the command/setting name we are writing
+		for(auto &pSetting : m_pBackend->m_vpMapSettings)
+		{
+			if(str_startswith_nocase(pSetting->m_pName, aSubString))
+			{
+				m_vPossibleMatches.emplace_back(SPossibleValueMatch{
+					pSetting->m_pName,
+					m_CursorArgIndex,
+					pSetting.get(),
+				});
+			}
+		}
+
+		// If there are no matches, then the command is unknown
+		if(m_vPossibleMatches.empty() && !m_AllowUnknownCommands)
+		{
+			// Fill the error if we do not allow unknown commands
+			char aFormattedValue[256];
+			FormatDisplayValue(m_aCommand, aFormattedValue);
+			str_format(m_Error.m_aMessage, sizeof(m_Error.m_aMessage), "Unknown server setting: %s", aFormattedValue);
+			m_Error.m_ArgIndex = -1;
+		}
+	}
+	else
+	{
+		// Second case: we are on an argument
+		if(!m_pCurrentSetting) // If we are on an argument of an unknown setting, we can't handle it => no possible values, ever.
+			return;
+
+		if(m_pCurrentSetting->m_Type == IMapSetting::SETTING_INT)
+		{
+			// No possible values for int settings.
+			// Maybe we can add "0" and "1" as possible values for settings that are binary.
+		}
+		else
+		{
+			// Get the parsed arguments for the current setting
+			auto &vArgs = m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting);
+			// Make sure we are not out of bounds
+			if(m_CursorArgIndex < (int)vArgs.size() && m_CursorArgIndex < (int)m_vCurrentArgs.size())
+			{
+				// Check if there are possible values for this command
+				auto It = m_pBackend->m_PossibleValuesPerCommand.find(m_pCurrentSetting->m_pName);
+				if(It != m_pBackend->m_PossibleValuesPerCommand.end())
+				{
+					// If that's the case, then check if there are possible values for the current argument index the cursor is on
+					auto ValuesIt = It->second.find(m_CursorArgIndex);
+					if(ValuesIt != It->second.end())
+					{
+						// If that's the case, then do the same as previously, we check for each value if they match
+						// with the current argument value
+
+						auto &CurrentArg = m_vCurrentArgs.at(m_CursorArgIndex);
+						int SubstringLength = minimum(m_LastCursorOffset, CurrentArg.m_End) - CurrentArg.m_Start;
+
+						// Substring based on the cursor position inside that argument
+						char aSubString[256];
+						str_copy(aSubString, CurrentArg.m_aValue, SubstringLength + 1);
+
+						for(auto &pValue : ValuesIt->second)
+						{
+							if(str_startswith_nocase(pValue, aSubString))
+							{
+								m_vPossibleMatches.emplace_back(SPossibleValueMatch{
+									pValue,
+									m_CursorArgIndex,
+									nullptr,
+								});
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+bool CMapSettingsBackend::CContext::OnInput(const IInput::CEvent &Event)
+{
+	if(!m_pLineInput)
+		return false;
+
+	if(!m_pLineInput->IsActive())
+		return false;
+
+	if(Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_TEXT) && !m_pBackend->Input()->ModifierIsPressed() && !m_pBackend->Input()->AltIsPressed())
+	{
+		// How to make this better?
+		// This checks when we press any key that is not handled by the dropdown
+		// When that's the case, it means we confirm the completion if we have a valid completion index
+		if(Event.m_Key != KEY_TAB && Event.m_Key != KEY_LSHIFT && Event.m_Key != KEY_RSHIFT && Event.m_Key != KEY_UP && Event.m_Key != KEY_DOWN && !(Event.m_Key >= KEY_MOUSE_1 && Event.m_Key <= KEY_MOUSE_WHEEL_RIGHT))
+		{
+			if(m_CurrentCompletionIndex != -1)
+			{
+				m_CurrentCompletionIndex = -1;
+				m_DropdownContext.m_Selected = -1;
+				Update();
+				UpdateCursor(true);
+			}
+		}
+	}
+
+	return false;
+}
+
+const char *CMapSettingsBackend::CContext::InputString() const
+{
+	if(!m_pLineInput)
+		return nullptr;
+	return m_pBackend->Input()->HasComposition() ? m_CompositionStringBuffer.c_str() : m_pLineInput->GetString();
+}
+
+const ColorRGBA CMapSettingsBackend::CContext::ms_ArgumentStringColor = ColorRGBA(84 / 255.0f, 1.0f, 1.0f, 1.0f);
+const ColorRGBA CMapSettingsBackend::CContext::ms_ArgumentNumberColor = ColorRGBA(0.1f, 0.9f, 0.05f, 1.0f);
+const ColorRGBA CMapSettingsBackend::CContext::ms_ArgumentUnknownColor = ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f);
+const ColorRGBA CMapSettingsBackend::CContext::ms_CommentColor = ColorRGBA(0.5f, 0.5f, 0.5f, 1.0f);
+const ColorRGBA CMapSettingsBackend::CContext::ms_ErrorColor = ColorRGBA(240 / 255.0f, 70 / 255.0f, 70 / 255.0f, 1.0f);
+
+void CMapSettingsBackend::CContext::ColorArguments(std::vector<STextColorSplit> &vColorSplits) const
+{
+	// Get argument color based on its type
+	auto &&GetArgumentColor = [](char Type) -> ColorRGBA {
+		if(Type == 'u')
+			return ms_ArgumentUnknownColor;
+		else if(Type == 's' || Type == 'r')
+			return ms_ArgumentStringColor;
+		else if(Type == 'i' || Type == 'f')
+			return ms_ArgumentNumberColor;
+		return ms_ErrorColor; // Invalid arg type
+	};
+
+	// Iterate through all the current arguments and color them
+	for(int i = 0; i < ArgCount(); i++)
+	{
+		const auto &Argument = Arg(i);
+		// Color is based on the error flag and the type of the argument
+		auto Color = Argument.m_Error ? ms_ErrorColor : GetArgumentColor(Argument.m_ExpectedType);
+		vColorSplits.emplace_back(Argument.m_Start, Argument.m_End - Argument.m_Start, Color);
+	}
+
+	if(m_pLineInput && !m_pLineInput->IsEmpty())
+	{
+		if(!CommandIsValid() && !m_AllowUnknownCommands && m_CommentOffset != 0)
+		{
+			// If command is invalid, override color splits with red, but not comment
+			int ErrorLength = m_CommentOffset == -1 ? -1 : m_CommentOffset;
+			vColorSplits = {{0, ErrorLength, ms_ErrorColor}};
+		}
+		else if(HasError())
+		{
+			// If there is an error, then color the wrong part of the input, excluding comment
+			int ErrorLength = m_CommentOffset == -1 ? -1 : m_CommentOffset - ErrorOffset();
+			vColorSplits.emplace_back(ErrorOffset(), ErrorLength, ms_ErrorColor);
+		}
+		if(m_CommentOffset != -1)
+		{ // Color comment if there is one
+			vColorSplits.emplace_back(m_CommentOffset, -1, ms_CommentColor);
+		}
+	}
+
+	std::sort(vColorSplits.begin(), vColorSplits.end(), [](const STextColorSplit &a, const STextColorSplit &b) {
+		return a.m_CharIndex < b.m_CharIndex;
+	});
+}
+
+int CMapSettingsBackend::CContext::CheckCollision(ECollisionCheckResult &Result) const
+{
+	return CheckCollision(m_pBackend->Editor()->m_Map.m_vSettings, Result);
+}
+
+int CMapSettingsBackend::CContext::CheckCollision(const std::vector<CEditorMapSetting> &vSettings, ECollisionCheckResult &Result) const
+{
+	return CheckCollision(InputString(), vSettings, Result);
+}
+
+int CMapSettingsBackend::CContext::CheckCollision(const char *pInputString, const std::vector<CEditorMapSetting> &vSettings, ECollisionCheckResult &Result) const
+{
+	// Checks for a collision with the current map settings.
+	// A collision is when a setting with the same arguments already exists and that it can't be added multiple times.
+	// For this, we use argument constraints that we define in CMapSettingsCommandObject::LoadConstraints().
+	// For example, the "tune" command can be added multiple times, but only if the actual tune argument is different, thus
+	//   the tune argument must be defined as UNIQUE.
+	// This method CheckCollision(ECollisionCheckResult&) returns an integer which is the index of the colliding line. If no
+	//   colliding line was found, then it returns -1.
+
+	if(m_CommentOffset == 0)
+	{ // Ignore comments
+		Result = ECollisionCheckResult::ADD;
+		return -1;
+	}
+
+	const int InputLength = str_length(pInputString);
+
+	struct SArgument
+	{
+		char m_aValue[128];
+		SArgument(const char *pStr)
+		{
+			str_copy(m_aValue, pStr);
+		}
+	};
+
+	struct SLineArgs
+	{
+		int m_Index;
+		std::vector<SArgument> m_vArgs;
+	};
+
+	// For now we split each map setting corresponding to the setting we want to add by spaces
+	auto &&SplitSetting = [](const char *pStr) {
+		std::vector<SArgument> vaArgs;
+		const char *pIt = pStr;
+		char aBuffer[128];
+		while((pIt = str_next_token(pIt, " ", aBuffer, sizeof(aBuffer))))
+			vaArgs.emplace_back(aBuffer);
+		return vaArgs;
+	};
+
+	// Define the result of the check
+	Result = ECollisionCheckResult::ERROR;
+
+	// First case: the command is not a valid (recognized) command.
+	if(!CommandIsValid())
+	{
+		// If we don't allow unknown commands, then we know there is no collision
+		// and the check results in an error.
+		if(!m_AllowUnknownCommands)
+			return -1;
+
+		if(InputLength == 0)
+			return -1;
+
+		// If we get here, it means we allow unknown commands.
+		// For them, we need to check if a similar exact command exists or not in the settings list.
+		// If it does, then we found a collision, and the result is REPLACE.
+		for(int i = 0; i < (int)vSettings.size(); i++)
+		{
+			if(str_comp_nocase(vSettings[i].m_aCommand, pInputString) == 0)
+			{
+				Result = ECollisionCheckResult::REPLACE;
+				return i;
+			}
+		}
+
+		// If nothing was found, then we must ensure that the command, although unknown, is somewhat valid
+		// by checking if the command contains a space and that there is at least one non-empty argument.
+		const char *pSpace = str_find(pInputString, " ");
+		if(!pSpace || !*(pSpace + 1))
+			Result = ECollisionCheckResult::ERROR;
+		else
+			Result = ECollisionCheckResult::ADD;
+
+		return -1; // No collision
+	}
+
+	// Second case: the command is valid.
+	// In this case, we know we have a valid setting name, which means we can use everything we have in this class which are
+	// related to valid map settings, such as parsed command arguments, etc.
+
+	const std::shared_ptr<IMapSetting> &pSetting = Setting();
+	if(pSetting->m_Type == IMapSetting::SETTING_INT)
+	{
+		// For integer settings, the check is quite simple as we know
+		// we can only ever have 1 argument.
+
+		// The integer setting cannot be added multiple times, which means if a collision was found, then the only result we
+		// can have is REPLACE.
+		// In this case, the collision is found only by checking the command name for every setting in the current map settings.
+		char aBuffer[256];
+		auto It = std::find_if(vSettings.begin(), vSettings.end(), [&](const CEditorMapSetting &Setting) {
+			const char *pLineSettingValue = Setting.m_aCommand; // Get the map setting command
+			pLineSettingValue = str_next_token(pLineSettingValue, " ", aBuffer, sizeof(aBuffer)); // Get the first token before the first space
+			return str_comp_nocase(aBuffer, pSetting->m_pName) == 0; // Check if that equals our current command
+		});
+
+		if(It == vSettings.end())
+		{
+			// If nothing was found, then there is no collision and we can add that command to the list
+			Result = ECollisionCheckResult::ADD;
+			return -1;
+		}
+		else
+		{
+			// Otherwise, we can only replace it
+			Result = ECollisionCheckResult::REPLACE;
+			return It - vSettings.begin(); // This is the index of the colliding line
+		}
+	}
+	else if(pSetting->m_Type == IMapSetting::SETTING_COMMAND)
+	{
+		// For "command" settings, this is a bit more complex as we have to use argument constraints.
+		// The general idea is to split every map setting in their arguments separated by spaces.
+		// Then, for each argument, we check if it collides with any of the map settings. When that's the case,
+		//   we need to check the constraint of the argument. If set to UNIQUE, then that's a collision and we can only
+		//   replace the command in the list.
+		// If set to anything else, we consider that it is not a collision and we move to the next argument.
+		// This system is simple and somewhat flexible as we only need to declare the constraints, the rest should be
+		//   handled automatically.
+
+		std::shared_ptr<SMapSettingCommand> pSettingCommand = std::static_pointer_cast<SMapSettingCommand>(pSetting);
+		// Get matching lines for that command
+		std::vector<SLineArgs> vLineArgs;
+		for(int i = 0; i < (int)vSettings.size(); i++)
+		{
+			const auto &Setting = vSettings.at(i);
+
+			// Split this setting into its arguments
+			std::vector<SArgument> vArgs = SplitSetting(Setting.m_aCommand);
+			// Only keep settings that match with the current input setting name
+			if(!vArgs.empty() && str_comp_nocase(vArgs[0].m_aValue, pSettingCommand->m_pName) == 0)
+			{
+				// When that's the case, we save them
+				vArgs.erase(vArgs.begin());
+				vLineArgs.push_back(SLineArgs{
+					i,
+					vArgs,
+				});
+			}
+		}
+
+		// Here is the simple algorithm to check for collisions according to argument constraints
+		bool Error = false;
+		int CollidingLineIndex = -1;
+		for(int ArgIndex = 0; ArgIndex < ArgCount(); ArgIndex++)
+		{
+			bool Collide = false;
+			const char *pValue = Arg(ArgIndex).m_aValue;
+			for(auto &Line : vLineArgs)
+			{
+				// Check first colliding line
+				if(str_comp_nocase(pValue, Line.m_vArgs[ArgIndex].m_aValue) == 0)
+				{
+					Collide = true;
+					CollidingLineIndex = Line.m_Index;
+					Error = m_pBackend->ArgConstraint(pSetting->m_pName, ArgIndex) == CMapSettingsBackend::EArgConstraint::UNIQUE;
+				}
+				if(Error)
+					break;
+			}
+
+			// If we did not collide with any of the lines for that argument, we're good to go
+			// (or if we had an error)
+			if(!Collide || Error)
+				break;
+
+			// Otherwise, remove non-colliding args from the list
+			vLineArgs.erase(
+				std::remove_if(vLineArgs.begin(), vLineArgs.end(), [&](const SLineArgs &Line) {
+					return str_comp_nocase(pValue, Line.m_vArgs[ArgIndex].m_aValue) != 0;
+				}),
+				vLineArgs.end());
+		}
+
+		// The result is either REPLACE when we found a collision, or ADD
+		Result = Error ? ECollisionCheckResult::REPLACE : ECollisionCheckResult::ADD;
+		return CollidingLineIndex;
+	}
+
+	return -1;
+}
+
+bool CMapSettingsBackend::CContext::Valid() const
+{
+	// Check if the entire setting is valid or not
+
+	if(m_CommentOffset == 0)
+		return true; // A "comment" setting is considered valid.
+
+	// Check if command is valid
+	if(m_pCurrentSetting)
+	{
+		// Check if all arguments are valid
+		const bool ArgumentsValid = std::all_of(m_vCurrentArgs.begin(), m_vCurrentArgs.end(), [](const SCurrentSettingArg &Arg) {
+			return !Arg.m_Error;
+		});
+
+		if(!ArgumentsValid)
+			return false;
+
+		// Check that we have the same number of arguments
+		return m_vCurrentArgs.size() == m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting).size();
+	}
+	else
+	{
+		// If we have an invalid setting, then we consider the entire setting as valid if we allow unknown commands
+		// as we cannot handle them.
+		return m_AllowUnknownCommands;
+	}
+}
+
+void CMapSettingsBackend::CContext::GetCommandHelpText(char *pStr, int Length) const
+{
+	if(!m_pCurrentSetting)
+		return;
+
+	str_copy(pStr, m_pCurrentSetting->m_pHelp, Length);
+}
+
+void CMapSettingsBackend::CContext::UpdateCompositionString()
+{
+	if(!m_pLineInput)
+		return;
+
+	const bool HasComposition = m_pBackend->Input()->HasComposition();
+
+	if(HasComposition)
+	{
+		const size_t CursorOffset = m_pLineInput->GetCursorOffset();
+		const size_t DisplayCursorOffset = m_pLineInput->OffsetFromActualToDisplay(CursorOffset);
+		const std::string DisplayStr = std::string(m_pLineInput->GetString());
+		std::string CompositionBuffer = DisplayStr.substr(0, DisplayCursorOffset) + m_pBackend->Input()->GetComposition() + DisplayStr.substr(DisplayCursorOffset);
+		if(CompositionBuffer != m_CompositionStringBuffer)
+		{
+			m_CompositionStringBuffer = CompositionBuffer;
+			Update();
+			UpdateCursor();
+		}
+	}
+}
+
+template<int N>
+void CMapSettingsBackend::CContext::FormatDisplayValue(const char *pValue, char (&aOut)[N])
+{
+	const int MaxLength = 32;
+	if(str_length(pValue) > MaxLength)
+	{
+		str_copy(aOut, pValue, MaxLength);
+		str_append(aOut, "...");
+	}
+	else
+	{
+		str_copy(aOut, pValue);
+	}
+}
+
+bool CMapSettingsBackend::OnInput(const IInput::CEvent &Event)
+{
+	if(ms_pActiveContext)
+		return ms_pActiveContext->OnInput(Event);
+
+	return false;
+}
+
+void CMapSettingsBackend::OnUpdate()
+{
+	if(ms_pActiveContext && ms_pActiveContext->m_pLineInput && ms_pActiveContext->m_pLineInput->IsActive())
+		ms_pActiveContext->UpdateCompositionString();
+}
+
+void CMapSettingsBackend::OnMapLoad()
+{
+	// Load & validate all map settings
+	m_LoadedMapSettings.Reset();
+
+	auto &vLoadedMapSettings = Editor()->m_Map.m_vSettings;
+
+	// Keep a vector of valid map settings, to check collision against: m_vValidLoadedMapSettings
+
+	// Create a local context with no lineinput, only used to parse the commands
+	CContext LocalContext = NewContext(nullptr);
+
+	// Iterate through map settings
+	// Two steps:
+	// 1. Save valid and invalid settings
+	// 2. Check for duplicates
+
+	std::vector<std::tuple<int, bool, CEditorMapSetting>> vSettingsInvalid;
+
+	for(int i = 0; i < (int)vLoadedMapSettings.size(); i++)
+	{
+		CEditorMapSetting &Setting = vLoadedMapSettings.at(i);
+		// Parse the setting using the context
+		LocalContext.UpdateFromString(Setting.m_aCommand);
+
+		bool Valid = LocalContext.Valid();
+		ECollisionCheckResult Result = ECollisionCheckResult::ERROR;
+		LocalContext.CheckCollision(Setting.m_aCommand, m_LoadedMapSettings.m_vSettingsValid, Result);
+
+		if(Valid && Result == ECollisionCheckResult::ADD)
+			m_LoadedMapSettings.m_vSettingsValid.emplace_back(Setting);
+		else
+			vSettingsInvalid.emplace_back(i, Valid, Setting);
+
+		LocalContext.Reset();
+
+		// Empty duplicates for this line, might be filled later
+		m_LoadedMapSettings.m_SettingsDuplicate.insert({i, {}});
+	}
+
+	for(const auto &[Index, Valid, Setting] : vSettingsInvalid)
+	{
+		LocalContext.UpdateFromString(Setting.m_aCommand);
+
+		ECollisionCheckResult Result = ECollisionCheckResult::ERROR;
+		int CollidingLineIndex = LocalContext.CheckCollision(Setting.m_aCommand, m_LoadedMapSettings.m_vSettingsValid, Result);
+		int RealCollidingLineIndex = CollidingLineIndex;
+
+		if(CollidingLineIndex != -1)
+			RealCollidingLineIndex = std::find_if(vLoadedMapSettings.begin(), vLoadedMapSettings.end(), [&](const CEditorMapSetting &MapSetting) {
+				return str_comp_nocase(MapSetting.m_aCommand, m_LoadedMapSettings.m_vSettingsValid.at(CollidingLineIndex).m_aCommand) == 0;
+			}) - vLoadedMapSettings.begin();
+
+		int Type = 0;
+		if(!Valid)
+			Type |= SInvalidSetting::TYPE_INVALID;
+		if(Result == ECollisionCheckResult::REPLACE)
+			Type |= SInvalidSetting::TYPE_DUPLICATE;
+
+		m_LoadedMapSettings.m_vSettingsInvalid.emplace_back(Index, Setting.m_aCommand, Type, RealCollidingLineIndex, !LocalContext.CommandIsValid());
+		if(Type & SInvalidSetting::TYPE_DUPLICATE)
+			m_LoadedMapSettings.m_SettingsDuplicate[RealCollidingLineIndex].emplace_back(m_LoadedMapSettings.m_vSettingsInvalid.size() - 1);
+
+		LocalContext.Reset();
+	}
+
+	if(!m_LoadedMapSettings.m_vSettingsInvalid.empty())
+		Editor()->m_Dialog = DIALOG_MAPSETTINGS_ERROR;
+}
+
+// ------ loaders
+
+void CMapSettingsBackend::InitValueLoaders()
+{
+	// Load the different possible values for some specific settings
+	RegisterLoader("tune", SValueLoader::LoadTuneValues);
+	RegisterLoader("tune_zone", SValueLoader::LoadTuneZoneValues);
+	RegisterLoader("mapbug", SValueLoader::LoadMapBugs);
+}
+
+void SValueLoader::LoadTuneValues(const CSettingValuesBuilder &TuneBuilder)
+{
+	// Add available tuning names to argument 0 of setting "tune"
+	LoadArgumentTuneValues(TuneBuilder.Argument(0));
+}
+
+void SValueLoader::LoadTuneZoneValues(const CSettingValuesBuilder &TuneZoneBuilder)
+{
+	// Add available tuning names to argument 1 of setting "tune_zone"
+	LoadArgumentTuneValues(TuneZoneBuilder.Argument(1));
+}
+
+void SValueLoader::LoadMapBugs(const CSettingValuesBuilder &BugBuilder)
+{
+	// Get argument 0 of setting "mapbug"
+	auto ArgBuilder = BugBuilder.Argument(0);
+	// Add available map bugs options
+	ArgBuilder.Add("grenade-doubleexplosion@ddnet.tw");
+}
+
+void SValueLoader::LoadArgumentTuneValues(CArgumentValuesListBuilder &&ArgBuilder)
+{
+	// Iterate through available tunings add their name to the list
+	for(int i = 0; i < CTuningParams::Num(); i++)
+	{
+		ArgBuilder.Add(CTuningParams::Name(i));
+	}
+}
diff --git a/src/game/editor/editor_server_settings.h b/src/game/editor/editor_server_settings.h
new file mode 100644
index 0000000000..f4f1d6e292
--- /dev/null
+++ b/src/game/editor/editor_server_settings.h
@@ -0,0 +1,416 @@
+#ifndef GAME_EDITOR_EDITOR_SERVER_SETTINGS_H
+#define GAME_EDITOR_EDITOR_SERVER_SETTINGS_H
+
+#include "component.h"
+#include "editor_ui.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+class CEditor;
+struct SMapSettingInt;
+struct SMapSettingCommand;
+struct IMapSetting;
+class CLineInput;
+
+struct CEditorMapSetting
+{
+	char m_aCommand[256];
+
+	CEditorMapSetting(const char *pCommand)
+	{
+		str_copy(m_aCommand, pCommand);
+	}
+};
+
+// A parsed map setting argument, storing the name and the type
+// Used for validation and to display arguments names
+struct SParsedMapSettingArg
+{
+	char m_aName[32];
+	char m_Type;
+};
+
+// An argument for the current setting
+struct SCurrentSettingArg
+{
+	char m_aValue[256]; // Value of the argument
+	float m_X; // The X position
+	size_t m_Start; // Start offset within the input string
+	size_t m_End; // End offset within the input string
+	bool m_Error; // If the argument is wrong or not
+	char m_ExpectedType; // The expected type
+};
+
+struct SPossibleValueMatch
+{
+	const char *m_pValue; // Possible value string
+	int m_ArgIndex; // Argument for that possible value
+	const void *m_pData; // Generic pointer to pass specific data
+};
+
+struct SCommandParseError
+{
+	char m_aMessage[256];
+	int m_ArgIndex;
+
+	enum EErrorType
+	{
+		ERROR_NONE = 0,
+		ERROR_TOO_MANY_ARGS,
+		ERROR_INVALID_VALUE,
+		ERROR_UNKNOWN_VALUE,
+		ERROR_INCOMPLETE,
+		ERROR_OUT_OF_RANGE,
+		ERROR_UNKNOWN
+	};
+	EErrorType m_Type;
+};
+
+struct SInvalidSetting
+{
+	enum
+	{
+		TYPE_INVALID = 1 << 0,
+		TYPE_DUPLICATE = 1 << 1
+	};
+	int m_Index; // Index of the command in the loaded map settings list
+	char m_aSetting[256]; // String of the setting
+	int m_Type; // Type of that invalid setting
+	int m_CollidingIndex; // The colliding line index in case type is TYPE_DUPLICATE
+	bool m_Unknown; // Is the command unknown
+
+	struct SContext
+	{
+		bool m_Fixed;
+		bool m_Deleted;
+		bool m_Chosen;
+	} m_Context;
+
+	SInvalidSetting(int Index, const char *pSetting, int Type, int CollidingIndex, bool Unknown) :
+		m_Index(Index), m_Type(Type), m_CollidingIndex(CollidingIndex), m_Unknown(Unknown), m_Context()
+	{
+		str_copy(m_aSetting, pSetting);
+	}
+};
+
+// --------------------------------------
+// Builder classes & methods to generate list of possible values
+// easily for specific settings and arguments.
+// It uses a container stored inside CMapSettingsBackend.
+// Usage:
+//   CValuesBuilder Builder(&m_Container);
+//   // Either do it in one go:
+//   Builder("tune").Argument(0).Add("value_1").Add("value_2");
+//   // Or reference the builder (useful when using in a loop):
+//   auto TuneBuilder = Builder("tune").Argument(0);
+//   TuneBuilder.Add("value_1");
+//   TuneBuilder.Add("value_2");
+//   // ...
+
+using TArgumentValuesList = std::vector<const char *>; // List of possible values
+using TSettingValues = std::map<int, TArgumentValuesList>; // Possible values per argument
+using TSettingsArgumentValues = std::map<std::string, TSettingValues>; // Possible values per argument, per command/setting name
+
+class CValuesBuilder;
+class CSettingValuesBuilder;
+class CArgumentValuesListBuilder
+{
+public:
+	CArgumentValuesListBuilder &Add(const char *pString)
+	{
+		m_pContainer->emplace_back(pString);
+		return *this;
+	}
+
+private:
+	CArgumentValuesListBuilder(std::vector<const char *> *pContainer) :
+		m_pContainer(pContainer) {}
+
+	std::vector<const char *> *m_pContainer;
+	friend class CSettingValuesBuilder;
+};
+
+class CSettingValuesBuilder
+{
+public:
+	CArgumentValuesListBuilder Argument(int Arg) const
+	{
+		return CArgumentValuesListBuilder(&(*m_pContainer)[Arg]);
+	}
+
+private:
+	CSettingValuesBuilder(TSettingValues *pContainer) :
+		m_pContainer(pContainer) {}
+
+	friend class CValuesBuilder;
+	TSettingValues *m_pContainer;
+};
+
+class CValuesBuilder
+{
+public:
+	CValuesBuilder(TSettingsArgumentValues *pContainer) :
+		m_pContainer(pContainer)
+	{
+	}
+
+	CSettingValuesBuilder operator()(const char *pSettingName) const
+	{
+		return CSettingValuesBuilder(&(*m_pContainer)[pSettingName]);
+	}
+
+private:
+	TSettingsArgumentValues *m_pContainer;
+};
+
+// --------------------------------------
+
+struct SValueLoader
+{
+	static void LoadTuneValues(const CSettingValuesBuilder &TuneBuilder);
+	static void LoadTuneZoneValues(const CSettingValuesBuilder &TuneZoneBuilder);
+	static void LoadMapBugs(const CSettingValuesBuilder &BugBuilder);
+	static void LoadArgumentTuneValues(CArgumentValuesListBuilder &&ArgBuilder);
+};
+
+enum class EValidationResult
+{
+	VALID = 0,
+	ERROR,
+	INCOMPLETE,
+	UNKNOWN,
+	OUT_OF_RANGE,
+};
+
+enum class ECollisionCheckResult
+{
+	ERROR,
+	REPLACE,
+	ADD
+};
+
+class CMapSettingsBackend : public CEditorComponent
+{
+	typedef void (*FLoaderFunction)(const CSettingValuesBuilder &);
+
+public: // General methods
+	CMapSettingsBackend() = default;
+
+	void OnInit(CEditor *pEditor) override;
+	bool OnInput(const IInput::CEvent &Event) override;
+	void OnUpdate() override;
+	void OnMapLoad() override;
+
+public: // Constraints methods
+	enum class EArgConstraint
+	{
+		DEFAULT = 0,
+		UNIQUE,
+		MULTIPLE,
+	};
+
+	EArgConstraint ArgConstraint(const char *pSettingName, int Arg) const
+	{
+		return m_ArgConstraintsPerCommand.at(pSettingName).at(Arg);
+	}
+
+public: // Backend methods
+	const std::vector<SParsedMapSettingArg> &ParsedArgs(const std::shared_ptr<IMapSetting> &pSetting) const
+	{
+		return m_ParsedCommandArgs.at(pSetting);
+	}
+
+public: // CContext
+	class CContext
+	{
+		static const ColorRGBA ms_ArgumentStringColor;
+		static const ColorRGBA ms_ArgumentNumberColor;
+		static const ColorRGBA ms_ArgumentUnknownColor;
+		static const ColorRGBA ms_CommentColor;
+		static const ColorRGBA ms_ErrorColor;
+
+		friend class CMapSettingsBackend;
+
+	public:
+		bool CommandIsValid() const { return m_pCurrentSetting != nullptr; }
+		int CurrentArg() const { return m_CursorArgIndex; }
+		const char *CurrentArgName() const { return (!m_pCurrentSetting || m_CursorArgIndex < 0 || m_CursorArgIndex >= (int)m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting).size()) ? nullptr : m_pBackend->m_ParsedCommandArgs.at(m_pCurrentSetting).at(m_CursorArgIndex).m_aName; }
+		float CurrentArgPos() const { return (m_CursorArgIndex < 0 || m_CursorArgIndex >= (int)m_vCurrentArgs.size()) ? 0 : m_vCurrentArgs[m_CursorArgIndex].m_X; }
+		size_t CurrentArgOffset() const { return m_CursorArgIndex == -1 ? 0 : m_vCurrentArgs[m_CursorArgIndex].m_Start; }
+		const char *CurrentArgValue() const { return m_CursorArgIndex == -1 ? m_aCommand : m_vCurrentArgs[m_CursorArgIndex].m_aValue; }
+		const std::vector<SPossibleValueMatch> &PossibleMatches() const { return m_vPossibleMatches; }
+		bool HasError() const { return m_Error.m_aMessage[0] != '\0'; }
+		size_t ErrorOffset() const { return m_Error.m_ArgIndex < 0 ? 0 : m_vCurrentArgs.at(m_Error.m_ArgIndex).m_Start; }
+		const char *Error() const { return m_Error.m_aMessage; }
+		int ArgCount() const { return (int)m_vCurrentArgs.size(); }
+		const SCurrentSettingArg &Arg(int Index) const { return m_vCurrentArgs.at(Index); }
+		const std::shared_ptr<IMapSetting> &Setting() const { return m_pCurrentSetting; }
+		CLineInput *LineInput() const { return m_pLineInput; }
+		void SetFontSize(float FontSize) { m_FontSize = FontSize; }
+		int CommentOffset() const { return m_CommentOffset; };
+
+		int CheckCollision(ECollisionCheckResult &Result) const;
+		int CheckCollision(const std::vector<CEditorMapSetting> &vSettings, ECollisionCheckResult &Result) const;
+		int CheckCollision(const char *pInputString, const std::vector<CEditorMapSetting> &vSettings, ECollisionCheckResult &Result) const;
+
+		void Update();
+		void UpdateFromString(const char *pStr);
+		bool UpdateCursor(bool Force = false);
+		void Reset();
+		void GetCommandHelpText(char *pStr, int Length) const;
+		bool Valid() const;
+		void ColorArguments(std::vector<STextColorSplit> &vColorSplits) const;
+
+		bool m_AllowUnknownCommands;
+		SEditBoxDropdownContext m_DropdownContext;
+		int m_CurrentCompletionIndex;
+
+	private: // Methods
+		CContext(CMapSettingsBackend *pMaster, CLineInput *pLineinput) :
+			m_DropdownContext(), m_pLineInput(pLineinput), m_pBackend(pMaster)
+		{
+			m_AllowUnknownCommands = false;
+			Reset();
+		}
+
+		void ClearError();
+		EValidationResult ValidateArg(int Index, const char *pArg);
+		void UpdatePossibleMatches();
+		void ParseArgs(const char *pLineInputStr, const char *pStr);
+		bool OnInput(const IInput::CEvent &Event);
+		const char *InputString() const;
+		void UpdateCompositionString();
+
+		template<int N>
+		void FormatDisplayValue(const char *pValue, char (&aOut)[N]);
+
+	private: // Fields
+		std::shared_ptr<IMapSetting> m_pCurrentSetting; // Current setting, can be nullptr in case of invalid setting name
+		std::vector<SCurrentSettingArg> m_vCurrentArgs; // Current parsed arguments from lineinput string
+		int m_CursorArgIndex; // The current argument the cursor is over
+		std::vector<SPossibleValueMatch> m_vPossibleMatches; // The current matches from cursor argument
+		size_t m_LastCursorOffset; // Last cursor offset
+		CLineInput *m_pLineInput;
+		char m_aCommand[128]; // The current command, not necessarily valid
+		SCommandParseError m_Error; // Error
+		int m_CommentOffset; // Position of the comment, if there is one
+
+		CMapSettingsBackend *m_pBackend;
+		std::string m_CompositionStringBuffer;
+		float m_FontSize;
+	};
+
+	CContext NewContext(CLineInput *pLineInput)
+	{
+		return CContext(this, pLineInput);
+	}
+
+private: // Loader methods
+	void LoadAllMapSettings();
+	void LoadCommand(const char *pName, const char *pArgs, const char *pHelp);
+	void LoadSettingInt(const std::shared_ptr<SMapSettingInt> &pSetting);
+	void LoadSettingCommand(const std::shared_ptr<SMapSettingCommand> &pSetting);
+	void InitValueLoaders();
+	void LoadPossibleValues(const CSettingValuesBuilder &Builder, const std::shared_ptr<IMapSetting> &pSetting);
+	void RegisterLoader(const char *pSettingName, const FLoaderFunction &pfnLoader);
+	void LoadConstraints();
+
+	static void PossibleConfigVariableCallback(const struct SConfigVariable *pVariable, void *pUserData);
+
+private: // Argument constraints
+	using TArgumentConstraints = std::map<int, EArgConstraint>; // Constraint per argument index
+	using TCommandArgumentConstraints = std::map<std::string, TArgumentConstraints>; // Constraints per command/setting name
+
+	// Argument constraints builder
+	// Used to define arguments constraints for specific commands
+	// It uses a container stored in CMapSettingsBackend.
+	// Usage:
+	//   CCommandArgumentConstraintBuilder Command(&m_Container);
+	//   Command("tune", 2).Unique(0); // Defines argument 0 of command "tune" having 2 args as UNIQUE
+	//   Command("tune_zone", 3).Multiple(0).Unique(1);
+	//   // ^ Multiple() currently is only for readable purposes. It can be omited:
+	//   // Command("tune_zone", 3).Unique(1);
+	//
+
+	class CCommandArgumentConstraintBuilder;
+
+	class CArgumentConstraintsBuilder
+	{
+		friend class CCommandArgumentConstraintBuilder;
+
+	private:
+		CArgumentConstraintsBuilder(TArgumentConstraints *pContainer) :
+			m_pContainer(pContainer){};
+
+		TArgumentConstraints *m_pContainer;
+
+	public:
+		CArgumentConstraintsBuilder &Multiple(int Arg)
+		{
+			// Define a multiple argument constraint
+			(*m_pContainer)[Arg] = EArgConstraint::MULTIPLE;
+			return *this;
+		}
+
+		CArgumentConstraintsBuilder &Unique(int Arg)
+		{
+			// Define a unique argument constraint
+			(*m_pContainer)[Arg] = EArgConstraint::UNIQUE;
+			return *this;
+		}
+	};
+
+	class CCommandArgumentConstraintBuilder
+	{
+	public:
+		CCommandArgumentConstraintBuilder(TCommandArgumentConstraints *pContainer) :
+			m_pContainer(pContainer) {}
+
+		CArgumentConstraintsBuilder operator()(const char *pSettingName, int ArgCount)
+		{
+			for(int i = 0; i < ArgCount; i++)
+				(*m_pContainer)[pSettingName][i] = EArgConstraint::DEFAULT;
+			return CArgumentConstraintsBuilder(&(*m_pContainer)[pSettingName]);
+		}
+
+	private:
+		TCommandArgumentConstraints *m_pContainer;
+	};
+
+	TCommandArgumentConstraints m_ArgConstraintsPerCommand;
+
+private: // Backend fields
+	std::vector<std::shared_ptr<IMapSetting>> m_vpMapSettings;
+	std::map<std::shared_ptr<IMapSetting>, std::vector<SParsedMapSettingArg>> m_ParsedCommandArgs; // Parsed available settings arguments, used for validation
+	TSettingsArgumentValues m_PossibleValuesPerCommand;
+	std::map<std::string, FLoaderFunction> m_LoaderFunctions;
+
+	static CContext *ms_pActiveContext;
+
+	friend class CEditor;
+
+private: // Map settings validation on load
+	struct SLoadedMapSettings
+	{
+		std::vector<SInvalidSetting> m_vSettingsInvalid;
+		std::vector<CEditorMapSetting> m_vSettingsValid;
+		std::map<int, std::vector<int>> m_SettingsDuplicate;
+
+		SLoadedMapSettings() :
+			m_vSettingsInvalid(), m_vSettingsValid(), m_SettingsDuplicate()
+		{
+		}
+
+		void Reset()
+		{
+			m_vSettingsInvalid.clear();
+			m_vSettingsValid.clear();
+			m_SettingsDuplicate.clear();
+		}
+
+	} m_LoadedMapSettings;
+};
+
+#endif
diff --git a/src/game/editor/editor_trackers.cpp b/src/game/editor/editor_trackers.cpp
index 8f3660422f..3200f67b81 100644
--- a/src/game/editor/editor_trackers.cpp
+++ b/src/game/editor/editor_trackers.cpp
@@ -15,13 +15,15 @@ CQuadEditTracker::~CQuadEditTracker()
 	m_vSelectedQuads.clear();
 }
 
-void CQuadEditTracker::BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads)
+void CQuadEditTracker::BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int GroupIndex, int LayerIndex)
 {
 	if(m_Tracking)
 		return;
 	m_Tracking = true;
 	m_vSelectedQuads.clear();
 	m_pLayer = pLayer;
+	m_GroupIndex = GroupIndex < 0 ? m_pEditor->m_SelectedGroup : GroupIndex;
+	m_LayerIndex = LayerIndex < 0 ? m_pEditor->m_vSelectedLayers[0] : LayerIndex;
 	// Init all points
 	for(auto QuadIndex : vSelectedQuads)
 	{
@@ -37,26 +39,25 @@ void CQuadEditTracker::EndQuadTrack()
 		return;
 	m_Tracking = false;
 
-	int GroupIndex = m_pEditor->m_SelectedGroup;
-	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
-
 	// Record all moved stuff
 	std::vector<std::shared_ptr<IEditorAction>> vpActions;
 	for(auto QuadIndex : m_vSelectedQuads)
 	{
 		auto &pQuad = m_pLayer->m_vQuads[QuadIndex];
 		auto vCurrentPoints = std::vector<CPoint>(pQuad.m_aPoints, pQuad.m_aPoints + 5);
-		vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+		vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
 	}
 	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
 }
 
-void CQuadEditTracker::BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop)
+void CQuadEditTracker::BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop, int GroupIndex, int LayerIndex)
 {
 	if(m_TrackedProp != EQuadProp::PROP_NONE)
 		return;
 	m_TrackedProp = Prop;
 	m_pLayer = pLayer;
+	m_GroupIndex = GroupIndex < 0 ? m_pEditor->m_SelectedGroup : GroupIndex;
+	m_LayerIndex = LayerIndex < 0 ? m_pEditor->m_vSelectedLayers[0] : LayerIndex;
 	m_vSelectedQuads = vSelectedQuads;
 	m_PreviousValues.clear();
 
@@ -83,16 +84,13 @@ void CQuadEditTracker::EndQuadPropTrack(EQuadProp Prop)
 
 	std::vector<std::shared_ptr<IEditorAction>> vpActions;
 
-	int GroupIndex = m_pEditor->m_SelectedGroup;
-	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
-
 	for(auto QuadIndex : m_vSelectedQuads)
 	{
 		auto &Quad = m_pLayer->m_vQuads[QuadIndex];
 		if(Prop == EQuadProp::PROP_POS_X || Prop == EQuadProp::PROP_POS_Y)
 		{
 			auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
-			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
 		}
 		else
 		{
@@ -107,7 +105,7 @@ void CQuadEditTracker::EndQuadPropTrack(EQuadProp Prop)
 				Value = Quad.m_ColorEnvOffset;
 
 			if(Value != m_PreviousValues[QuadIndex])
-				vpActions.push_back(std::make_shared<CEditorActionEditQuadProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, Prop, m_PreviousValues[QuadIndex], Value));
+				vpActions.push_back(std::make_shared<CEditorActionEditQuadProp>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, Prop, m_PreviousValues[QuadIndex], Value));
 		}
 	}
 
@@ -115,12 +113,14 @@ void CQuadEditTracker::EndQuadPropTrack(EQuadProp Prop)
 		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
 }
 
-void CQuadEditTracker::BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints)
+void CQuadEditTracker::BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints, int GroupIndex, int LayerIndex)
 {
 	if(!m_vTrackedProps.empty())
 		return;
 
 	m_pLayer = pLayer;
+	m_GroupIndex = GroupIndex < 0 ? m_pEditor->m_SelectedGroup : GroupIndex;
+	m_LayerIndex = LayerIndex < 0 ? m_pEditor->m_vSelectedLayers[0] : LayerIndex;
 	m_SelectedQuadPoints = SelectedQuadPoints;
 	m_vSelectedQuads = vSelectedQuads;
 	m_PreviousValuesPoint.clear();
@@ -187,16 +187,13 @@ void CQuadEditTracker::EndQuadPointPropTrack(EQuadPointProp Prop)
 
 	std::vector<std::shared_ptr<IEditorAction>> vpActions;
 
-	int GroupIndex = m_pEditor->m_SelectedGroup;
-	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
-
 	for(auto QuadIndex : m_vSelectedQuads)
 	{
 		auto &Quad = m_pLayer->m_vQuads[QuadIndex];
 		if(Prop == EQuadPointProp::PROP_POS_X || Prop == EQuadPointProp::PROP_POS_Y)
 		{
 			auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
-			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
 		}
 		else
 		{
@@ -219,7 +216,7 @@ void CQuadEditTracker::EndQuadPointPropTrack(EQuadPointProp Prop)
 					}
 
 					if(Value != m_PreviousValuesPoint[QuadIndex][v][Prop])
-						vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
+						vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
 				}
 			}
 		}
@@ -234,16 +231,13 @@ void CQuadEditTracker::EndQuadPointPropTrackAll()
 	std::vector<std::shared_ptr<IEditorAction>> vpActions;
 	for(auto &Prop : m_vTrackedProps)
 	{
-		int GroupIndex = m_pEditor->m_SelectedGroup;
-		int LayerIndex = m_pEditor->m_vSelectedLayers[0];
-
 		for(auto QuadIndex : m_vSelectedQuads)
 		{
 			auto &Quad = m_pLayer->m_vQuads[QuadIndex];
 			if(Prop == EQuadPointProp::PROP_POS_X || Prop == EQuadPointProp::PROP_POS_Y)
 			{
 				auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
-				vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+				vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
 			}
 			else
 			{
@@ -266,7 +260,7 @@ void CQuadEditTracker::EndQuadPointPropTrackAll()
 						}
 
 						if(Value != m_PreviousValuesPoint[QuadIndex][v][Prop])
-							vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
+							vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, m_GroupIndex, m_LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
 					}
 				}
 			}
@@ -279,22 +273,6 @@ void CQuadEditTracker::EndQuadPointPropTrackAll()
 	m_vTrackedProps.clear();
 }
 
-void CEditorPropTracker::BeginPropTrack(int Prop, int Value)
-{
-	if(m_TrackedProp != -1 || m_TrackedProp == Prop)
-		return;
-	m_TrackedProp = Prop;
-	m_PreviousValue = Value;
-}
-
-void CEditorPropTracker::StopPropTrack(int Prop, int Value)
-{
-	if(Prop != m_TrackedProp)
-		return;
-	m_TrackedProp = -1;
-	m_CurrentValue = Value;
-}
-
 // -----------------------------
 
 void CEnvelopeEditorOperationTracker::Begin(EEnvelopeEditorOp Operation)
@@ -385,20 +363,81 @@ void CEnvelopeEditorOperationTracker::HandlePointDragEnd(bool Switch)
 	m_SavedValues.clear();
 }
 
+// -----------------------------------------------------------------------
+CSoundSourceOperationTracker::CSoundSourceOperationTracker(CEditor *pEditor) :
+	m_pEditor(pEditor), m_pSource(nullptr), m_TrackedOp(ESoundSourceOp::OP_NONE), m_LayerIndex(-1)
+{
+}
+
+void CSoundSourceOperationTracker::Begin(CSoundSource *pSource, ESoundSourceOp Operation, int LayerIndex)
+{
+	if(m_TrackedOp == Operation || m_TrackedOp != ESoundSourceOp::OP_NONE)
+		return;
+
+	m_TrackedOp = Operation;
+	m_pSource = pSource;
+	m_LayerIndex = LayerIndex;
+
+	if(m_TrackedOp == ESoundSourceOp::OP_MOVE)
+		HandlePointMove(EState::STATE_BEGIN);
+}
+
+void CSoundSourceOperationTracker::End()
+{
+	if(m_TrackedOp == ESoundSourceOp::OP_NONE)
+		return;
+
+	if(m_TrackedOp == ESoundSourceOp::OP_MOVE)
+		HandlePointMove(EState::STATE_END);
+
+	m_TrackedOp = ESoundSourceOp::OP_NONE;
+}
+
+void CSoundSourceOperationTracker::HandlePointMove(EState State)
+{
+	if(State == EState::STATE_BEGIN)
+	{
+		m_Data.m_OriginalPoint = m_pSource->m_Position;
+	}
+	else if(State == EState::STATE_END)
+	{
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionMoveSoundSource>(m_pEditor, m_pEditor->m_SelectedGroup, m_LayerIndex, m_pEditor->m_SelectedSource, m_Data.m_OriginalPoint, m_pSource->m_Position));
+	}
+}
+
+// -----------------------------------------------------------------------
+
+int SPropTrackerHelper::GetDefaultGroupIndex(CEditor *pEditor)
+{
+	return pEditor->m_SelectedGroup;
+}
+
+int SPropTrackerHelper::GetDefaultLayerIndex(CEditor *pEditor)
+{
+	return pEditor->m_vSelectedLayers[0];
+}
+
 // -----------------------------------------------------------------------
 
 void CLayerPropTracker::OnEnd(ELayerProp Prop, int Value)
 {
-	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditLayerProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value));
+	if(Prop == ELayerProp::PROP_GROUP)
+	{
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditLayersGroupAndOrder>(m_pEditor, m_OriginalGroupIndex, std::vector<int>{m_OriginalLayerIndex}, m_CurrentGroupIndex, std::vector<int>{m_CurrentLayerIndex}));
+	}
+	else
+	{
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditLayerProp>(m_pEditor, m_CurrentGroupIndex, m_CurrentLayerIndex, Prop, m_OriginalValue, Value));
+	}
 }
 
 int CLayerPropTracker::PropToValue(ELayerProp Prop)
 {
 	switch(Prop)
 	{
-	case ELayerProp::PROP_GROUP: return m_pEditor->m_SelectedGroup;
+	case ELayerProp::PROP_GROUP: return m_CurrentGroupIndex;
 	case ELayerProp::PROP_HQ: return m_pObject->m_Flags;
-	case ELayerProp::PROP_ORDER: return m_pEditor->m_vSelectedLayers[0];
+	case ELayerProp::PROP_ORDER: return m_CurrentLayerIndex;
 	default: return 0;
 	}
 }
@@ -439,7 +478,7 @@ void CLayerTilesPropTracker::OnStart(ETilesProp Prop)
 
 void CLayerTilesPropTracker::OnEnd(ETilesProp Prop, int Value)
 {
-	auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+	auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, Prop, m_OriginalValue, Value);
 
 	pAction->SetSavedLayers(m_SavedLayers);
 	m_SavedLayers.clear();
@@ -490,7 +529,7 @@ void CLayerTilesCommonPropTracker::OnEnd(ETilesCommonProp Prop, int Value)
 	for(auto &pLayer : m_vpLayers)
 	{
 		int LayerIndex = m_vLayerIndices[j++];
-		auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, LayerIndex, s_PropMap[Prop], m_OriginalValue, Value);
+		auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_OriginalGroupIndex, LayerIndex, s_PropMap[Prop], m_OriginalValue, Value);
 		pAction->SetSavedLayers(m_SavedLayers[pLayer]);
 		vpActions.push_back(pAction);
 	}
@@ -549,7 +588,7 @@ int CLayerGroupPropTracker::PropToValue(EGroupProp Prop)
 
 void CLayerQuadsPropTracker::OnEnd(ELayerQuadsProp Prop, int Value)
 {
-	auto pAction = std::make_shared<CEditorActionEditLayerQuadsProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+	auto pAction = std::make_shared<CEditorActionEditLayerQuadsProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, Prop, m_OriginalValue, Value);
 	m_pEditor->m_EditorHistory.RecordAction(pAction);
 }
 
@@ -564,7 +603,7 @@ int CLayerQuadsPropTracker::PropToValue(ELayerQuadsProp Prop)
 
 void CLayerSoundsPropTracker::OnEnd(ELayerSoundsProp Prop, int Value)
 {
-	auto pAction = std::make_shared<CEditorActionEditLayerSoundsProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+	auto pAction = std::make_shared<CEditorActionEditLayerSoundsProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, Prop, m_OriginalValue, Value);
 	m_pEditor->m_EditorHistory.RecordAction(pAction);
 }
 
@@ -579,7 +618,7 @@ int CLayerSoundsPropTracker::PropToValue(ELayerSoundsProp Prop)
 
 void CSoundSourcePropTracker::OnEnd(ESoundProp Prop, int Value)
 {
-	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditSoundSourceProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditSoundSourceProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
 }
 
 int CSoundSourcePropTracker::PropToValue(ESoundProp Prop)
@@ -604,7 +643,7 @@ int CSoundSourcePropTracker::PropToValue(ESoundProp Prop)
 
 void CSoundSourceRectShapePropTracker::OnEnd(ERectangleShapeProp Prop, int Value)
 {
-	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditRectSoundSourceShapeProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditRectSoundSourceShapeProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
 }
 
 int CSoundSourceRectShapePropTracker::PropToValue(ERectangleShapeProp Prop)
@@ -619,7 +658,7 @@ int CSoundSourceRectShapePropTracker::PropToValue(ERectangleShapeProp Prop)
 
 void CSoundSourceCircleShapePropTracker::OnEnd(ECircleShapeProp Prop, int Value)
 {
-	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditCircleSoundSourceShapeProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditCircleSoundSourceShapeProp>(m_pEditor, m_OriginalGroupIndex, m_OriginalLayerIndex, m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
 }
 
 int CSoundSourceCircleShapePropTracker::PropToValue(ECircleShapeProp Prop)
diff --git a/src/game/editor/editor_trackers.h b/src/game/editor/editor_trackers.h
index 156096b6af..4767e732df 100644
--- a/src/game/editor/editor_trackers.h
+++ b/src/game/editor/editor_trackers.h
@@ -21,13 +21,13 @@ class CQuadEditTracker
 	CQuadEditTracker();
 	~CQuadEditTracker();
 
-	void BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads);
+	void BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int GroupIndex = -1, int LayerIndex = -1);
 	void EndQuadTrack();
 
-	void BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop);
+	void BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop, int GroupIndex = -1, int LayerIndex = -1);
 	void EndQuadPropTrack(EQuadProp Prop);
 
-	void BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints);
+	void BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints, int GroupIndex = -1, int LayerIndex = -1);
 	void AddQuadPointPropTrack(EQuadPointProp Prop);
 	void EndQuadPointPropTrack(EQuadPointProp Prop);
 	void EndQuadPointPropTrackAll();
@@ -46,23 +46,8 @@ class CQuadEditTracker
 	std::vector<EQuadPointProp> m_vTrackedProps;
 	std::map<int, int> m_PreviousValues;
 	std::map<int, std::vector<std::map<EQuadPointProp, int>>> m_PreviousValuesPoint;
-};
-
-class CEditorPropTracker
-{
-public:
-	CEditorPropTracker() = default;
-
-	void BeginPropTrack(int Prop, int Value);
-	void StopPropTrack(int Prop, int Value);
-	inline void Reset() { m_TrackedProp = -1; }
-
-	CEditor *m_pEditor;
-	int m_PreviousValue;
-	int m_CurrentValue;
-
-private:
-	int m_TrackedProp = -1;
+	int m_LayerIndex;
+	int m_GroupIndex;
 };
 
 enum class EEnvelopeEditorOp
@@ -77,6 +62,13 @@ enum class EEnvelopeEditorOp
 	OP_SCALE
 };
 
+enum class ESoundSourceOp
+{
+	OP_NONE = 0,
+	OP_MOVE,
+	OP_CONTEXT_MENU,
+};
+
 class CEnvelopeEditorOperationTracker
 {
 public:
@@ -104,34 +96,81 @@ class CEnvelopeEditorOperationTracker
 	void HandlePointDragEnd(bool Switch);
 };
 
+class CSoundSourceOperationTracker
+{
+public:
+	CSoundSourceOperationTracker(CEditor *pEditor);
+
+	void Begin(CSoundSource *pSource, ESoundSourceOp Operation, int LayerIndex);
+	void End();
+
+private:
+	CEditor *m_pEditor;
+	CSoundSource *m_pSource;
+	ESoundSourceOp m_TrackedOp;
+	int m_LayerIndex;
+
+	struct SData
+	{
+		CPoint m_OriginalPoint;
+	};
+	SData m_Data;
+
+	enum EState
+	{
+		STATE_BEGIN,
+		STATE_EDITING,
+		STATE_END
+	};
+	void HandlePointMove(EState State);
+};
+
+struct SPropTrackerHelper
+{
+	static int GetDefaultGroupIndex(CEditor *pEditor);
+	static int GetDefaultLayerIndex(CEditor *pEditor);
+};
+
 template<typename T, typename E>
 class CPropTracker
 {
 public:
 	CPropTracker(CEditor *pEditor) :
-		m_pEditor(pEditor), m_OriginalValue(0) {}
+		m_pEditor(pEditor), m_OriginalValue(0), m_pObject(nullptr), m_OriginalLayerIndex(-1), m_OriginalGroupIndex(-1), m_CurrentLayerIndex(-1), m_CurrentGroupIndex(-1), m_Tracking(false) {}
 	CEditor *m_pEditor;
 
-	void Begin(T *pObject, E Prop, EEditState State)
+	void Begin(T *pObject, E Prop, EEditState State, int GroupIndex = -1, int LayerIndex = -1)
 	{
-		if(Prop == static_cast<E>(-1))
+		if(m_Tracking || Prop == static_cast<E>(-1))
 			return;
 		m_pObject = pObject;
+
+		m_OriginalGroupIndex = GroupIndex < 0 ? SPropTrackerHelper::GetDefaultGroupIndex(m_pEditor) : GroupIndex;
+		m_OriginalLayerIndex = LayerIndex < 0 ? SPropTrackerHelper::GetDefaultLayerIndex(m_pEditor) : LayerIndex;
+		m_CurrentGroupIndex = m_OriginalGroupIndex;
+		m_CurrentLayerIndex = m_OriginalLayerIndex;
+
 		int Value = PropToValue(Prop);
 		if(StartChecker(Prop, State, Value))
 		{
+			m_Tracking = true;
 			m_OriginalValue = Value;
 			OnStart(Prop);
 		}
 	}
 
-	void End(E Prop, EEditState State)
+	void End(E Prop, EEditState State, int GroupIndex = -1, int LayerIndex = -1)
 	{
-		if(Prop == static_cast<E>(-1))
+		if(!m_Tracking || Prop == static_cast<E>(-1))
 			return;
+
+		m_CurrentGroupIndex = GroupIndex < 0 ? SPropTrackerHelper::GetDefaultGroupIndex(m_pEditor) : GroupIndex;
+		m_CurrentLayerIndex = LayerIndex < 0 ? SPropTrackerHelper::GetDefaultLayerIndex(m_pEditor) : LayerIndex;
+
 		int Value = PropToValue(Prop);
 		if(EndChecker(Prop, State, Value))
 		{
+			m_Tracking = false;
 			OnEnd(Prop, Value);
 		}
 	}
@@ -151,6 +190,11 @@ class CPropTracker
 
 	int m_OriginalValue;
 	T *m_pObject;
+	int m_OriginalLayerIndex;
+	int m_OriginalGroupIndex;
+	int m_CurrentLayerIndex;
+	int m_CurrentGroupIndex;
+	bool m_Tracking;
 };
 
 class CLayerPropTracker : public CPropTracker<CLayer, ELayerProp>
diff --git a/src/game/editor/editor_ui.h b/src/game/editor/editor_ui.h
new file mode 100644
index 0000000000..b3e2b54822
--- /dev/null
+++ b/src/game/editor/editor_ui.h
@@ -0,0 +1,22 @@
+#ifndef GAME_EDITOR_EDITOR_UI_H
+#define GAME_EDITOR_EDITOR_UI_H
+
+#include <game/client/ui_listbox.h>
+
+struct SEditBoxDropdownContext
+{
+	bool m_Visible = false;
+	int m_Selected = -1;
+	CListBox m_ListBox;
+	bool m_ShortcutUsed = false;
+	bool m_DidBecomeVisible = false;
+	bool m_MousePressedInside = false;
+	bool m_ShouldHide = false;
+	int m_Width = 0;
+};
+
+namespace EditorFontSizes {
+MAYBE_UNUSED static constexpr float MENU = 10.0f;
+}
+
+#endif
diff --git a/src/game/editor/enums.h b/src/game/editor/enums.h
new file mode 100644
index 0000000000..d14679b95d
--- /dev/null
+++ b/src/game/editor/enums.h
@@ -0,0 +1,36 @@
+#ifndef GAME_EDITOR_ENUMS_H
+#define GAME_EDITOR_ENUMS_H
+
+constexpr const char *g_apGametileOpNames[] = {
+	"Air",
+	"Hookable",
+	"Death",
+	"Unhookable",
+	"Hookthrough",
+	"Freeze",
+	"Unfreeze",
+	"Deep Freeze",
+	"Deep Unfreeze",
+	"Blue Check-Tele",
+	"Red Check-Tele",
+	"Live Freeze",
+	"Live Unfreeze",
+};
+enum class EGameTileOp
+{
+	AIR,
+	HOOKABLE,
+	DEATH,
+	UNHOOKABLE,
+	HOOKTHROUGH,
+	FREEZE,
+	UNFREEZE,
+	DEEP_FREEZE,
+	DEEP_UNFREEZE,
+	BLUE_CHECK_TELE,
+	RED_CHECK_TELE,
+	LIVE_FREEZE,
+	LIVE_UNFREEZE,
+};
+
+#endif
diff --git a/src/game/editor/explanations.cpp b/src/game/editor/explanations.cpp
index a25404ab0e..ad52b5d26e 100644
--- a/src/game/editor/explanations.cpp
+++ b/src/game/editor/explanations.cpp
@@ -14,7 +14,7 @@ const char *CEditor::ExplainDDNet(int Tile, int Layer)
 			return "HOOKABLE: It's possible to hook and collide with it.";
 		break;
 	case TILE_DEATH:
-		if(Layer == LAYER_GAME)
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
 			return "KILL: Kills the tee.";
 		break;
 	case TILE_NOHOOK:
diff --git a/src/game/editor/layer_selector.cpp b/src/game/editor/layer_selector.cpp
new file mode 100644
index 0000000000..4db70b67c8
--- /dev/null
+++ b/src/game/editor/layer_selector.cpp
@@ -0,0 +1,52 @@
+#include <engine/shared/config.h>
+
+#include "editor.h"
+
+#include "layer_selector.h"
+
+void CLayerSelector::OnInit(CEditor *pEditor)
+{
+	CEditorComponent::OnInit(pEditor);
+
+	m_SelectionOffset = 0;
+}
+
+bool CLayerSelector::SelectByTile()
+{
+	// ctrl+rightclick a map index to select the layer that has a tile there
+	if(Ui()->HotItem() != &Editor()->m_MapEditorId)
+		return false;
+	if(!Input()->ModifierIsPressed() || !Ui()->MouseButtonClicked(1))
+		return false;
+	if(!g_Config.m_EdLayerSelector)
+		return false;
+
+	int MatchedGroup = -1;
+	int MatchedLayer = -1;
+	int Matches = 0;
+	bool IsFound = false;
+	for(auto HoverTile : Editor()->HoverTiles())
+	{
+		if(MatchedGroup == -1)
+		{
+			MatchedGroup = HoverTile.m_Group;
+			MatchedLayer = HoverTile.m_Layer;
+		}
+		if(++Matches > m_SelectionOffset)
+		{
+			m_SelectionOffset++;
+			MatchedGroup = HoverTile.m_Group;
+			MatchedLayer = HoverTile.m_Layer;
+			IsFound = true;
+			break;
+		}
+	}
+	if(MatchedGroup != -1 && MatchedLayer != -1)
+	{
+		if(!IsFound)
+			m_SelectionOffset = 1;
+		Editor()->SelectLayer(MatchedLayer, MatchedGroup);
+		return true;
+	}
+	return false;
+}
diff --git a/src/game/editor/layer_selector.h b/src/game/editor/layer_selector.h
new file mode 100644
index 0000000000..1ea088ac24
--- /dev/null
+++ b/src/game/editor/layer_selector.h
@@ -0,0 +1,15 @@
+#ifndef GAME_EDITOR_LAYER_SELECTOR_H
+#define GAME_EDITOR_LAYER_SELECTOR_H
+
+#include "component.h"
+
+class CLayerSelector : public CEditorComponent
+{
+	int m_SelectionOffset;
+
+public:
+	void OnInit(CEditor *pEditor) override;
+	bool SelectByTile();
+};
+
+#endif
diff --git a/src/game/editor/map_grid.cpp b/src/game/editor/map_grid.cpp
index e241642aa6..6b090610fa 100644
--- a/src/game/editor/map_grid.cpp
+++ b/src/game/editor/map_grid.cpp
@@ -4,6 +4,9 @@
 
 #include "editor.h"
 
+static constexpr int MIN_GRID_FACTOR = 1;
+static constexpr int MAX_GRID_FACTOR = 15;
+
 void CMapGrid::OnReset()
 {
 	m_GridActive = false;
@@ -23,7 +26,7 @@ void CMapGrid::OnRender(CUIRect View)
 		float aGroupPoints[4];
 		pGroup->Mapping(aGroupPoints);
 
-		const CUIRect *pScreen = UI()->Screen();
+		const CUIRect *pScreen = Ui()->Screen();
 
 		int LineDistance = GridLineDistance();
 
@@ -60,7 +63,11 @@ void CMapGrid::OnRender(CUIRect View)
 
 int CMapGrid::GridLineDistance() const
 {
-	if(Editor()->MapView()->Zoom()->GetValue() <= 100.0f)
+	if(Editor()->MapView()->Zoom()->GetValue() <= 10.0f)
+		return 4;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 50.0f)
+		return 8;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 100.0f)
 		return 16;
 	else if(Editor()->MapView()->Zoom()->GetValue() <= 250.0f)
 		return 32;
@@ -96,19 +103,47 @@ int CMapGrid::Factor() const
 	return m_GridFactor;
 }
 
-void CMapGrid::ResetFactor()
+void CMapGrid::SetFactor(int Factor)
 {
-	m_GridFactor = 1;
+	m_GridFactor = clamp(Factor, MIN_GRID_FACTOR, MAX_GRID_FACTOR);
 }
 
-void CMapGrid::IncreaseFactor()
+void CMapGrid::DoSettingsPopup(vec2 Position)
 {
-	if(m_GridFactor < 15)
-		m_GridFactor++;
+	Ui()->DoPopupMenu(&m_PopupGridSettingsId, Position.x, Position.y, 120.0f, 37.0f, this, PopupGridSettings);
 }
 
-void CMapGrid::DecreaseFactor()
+CUi::EPopupMenuFunctionResult CMapGrid::PopupGridSettings(void *pContext, CUIRect View, bool Active)
 {
-	if(m_GridFactor > 1)
-		m_GridFactor--;
+	CMapGrid *pMapGrid = static_cast<CMapGrid *>(pContext);
+
+	enum
+	{
+		PROP_SIZE = 0,
+		NUM_PROPS,
+	};
+	CProperty aProps[] = {
+		{"Size", pMapGrid->Factor(), PROPTYPE_INT, MIN_GRID_FACTOR, MAX_GRID_FACTOR},
+		{nullptr},
+	};
+
+	static int s_aIds[NUM_PROPS];
+	int NewVal;
+	int Prop = pMapGrid->Editor()->DoProperties(&View, aProps, s_aIds, &NewVal);
+
+	if(Prop == PROP_SIZE)
+	{
+		pMapGrid->SetFactor(NewVal);
+	}
+
+	CUIRect Button;
+	View.HSplitBottom(12.0f, &View, &Button);
+
+	static char s_DefaultButton;
+	if(pMapGrid->Editor()->DoButton_Ex(&s_DefaultButton, "Default", 0, &Button, 0, "Normal grid size", IGraphics::CORNER_ALL))
+	{
+		pMapGrid->SetFactor(1);
+	}
+
+	return CUi::POPUP_KEEP_OPEN;
 }
diff --git a/src/game/editor/map_grid.h b/src/game/editor/map_grid.h
index 3a6e26a3be..0a4110cb51 100644
--- a/src/game/editor/map_grid.h
+++ b/src/game/editor/map_grid.h
@@ -3,6 +3,8 @@
 
 #include "component.h"
 
+#include <game/client/ui.h>
+
 class CMapGrid : public CEditorComponent
 {
 public:
@@ -20,13 +22,16 @@ class CMapGrid : public CEditorComponent
 	void Toggle();
 
 	int Factor() const;
-	void ResetFactor();
-	void IncreaseFactor();
-	void DecreaseFactor();
+	void SetFactor(int Factor);
+
+	void DoSettingsPopup(vec2 Position);
 
 private:
 	bool m_GridActive;
 	int m_GridFactor;
+
+	SPopupMenuId m_PopupGridSettingsId;
+	static CUi::EPopupMenuFunctionResult PopupGridSettings(void *pContext, CUIRect View, bool Active);
 };
 
 #endif
diff --git a/src/game/editor/map_view.cpp b/src/game/editor/map_view.cpp
index 99337b8f76..355eb8b91a 100644
--- a/src/game/editor/map_view.cpp
+++ b/src/game/editor/map_view.cpp
@@ -8,9 +8,9 @@
 
 #include "editor.h"
 
-void CMapView::Init(CEditor *pEditor)
+void CMapView::OnInit(CEditor *pEditor)
 {
-	CEditorComponent::Init(pEditor);
+	CEditorComponent::OnInit(pEditor);
 	RegisterSubComponent(m_MapGrid);
 	RegisterSubComponent(m_ProofMode);
 	InitSubComponents();
@@ -19,7 +19,7 @@ void CMapView::Init(CEditor *pEditor)
 void CMapView::OnReset()
 {
 	m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
-	m_Zoom.Init(Editor());
+	m_Zoom.OnInit(Editor());
 	m_WorldZoom = 1.0f;
 
 	SetWorldOffset({0, 0});
@@ -152,8 +152,8 @@ void CMapView::ZoomMouseTarget(float ZoomFactor)
 	float WorldWidth = aPoints[2] - aPoints[0];
 	float WorldHeight = aPoints[3] - aPoints[1];
 
-	float Mwx = aPoints[0] + WorldWidth * (UI()->MouseX() / UI()->Screen()->w);
-	float Mwy = aPoints[1] + WorldHeight * (UI()->MouseY() / UI()->Screen()->h);
+	float Mwx = aPoints[0] + WorldWidth * (Ui()->MouseX() / Ui()->Screen()->w);
+	float Mwy = aPoints[1] + WorldHeight * (Ui()->MouseY() / Ui()->Screen()->h);
 
 	// adjust camera
 	OffsetWorld((vec2(Mwx, Mwy) - GetWorldOffset()) * (1.0f - ZoomFactor));
diff --git a/src/game/editor/map_view.h b/src/game/editor/map_view.h
index 5aa86254d6..ca99ca836d 100644
--- a/src/game/editor/map_view.h
+++ b/src/game/editor/map_view.h
@@ -13,7 +13,7 @@ class CLayerGroup;
 class CMapView : public CEditorComponent
 {
 public:
-	void Init(CEditor *pEditor) override;
+	void OnInit(CEditor *pEditor) override;
 	void OnReset() override;
 	void OnMapLoad() override;
 
diff --git a/src/game/editor/mapitems/envelope.cpp b/src/game/editor/mapitems/envelope.cpp
index 5f0524eb2a..174ee96cc2 100644
--- a/src/game/editor/mapitems/envelope.cpp
+++ b/src/game/editor/mapitems/envelope.cpp
@@ -98,10 +98,10 @@ std::pair<float, float> CEnvelope::GetValueRange(int ChannelMask)
 	return {Bottom, Top};
 }
 
-int CEnvelope::Eval(float Time, ColorRGBA &Color)
+void CEnvelope::Eval(float Time, ColorRGBA &Result, size_t Channels)
 {
-	CRenderTools::RenderEvalEnvelope(&m_PointsAccess, GetChannels(), std::chrono::nanoseconds((int64_t)((double)Time * (double)std::chrono::nanoseconds(1s).count())), Color);
-	return GetChannels();
+	Channels = minimum<size_t>(Channels, GetChannels(), CEnvPoint::MAX_CHANNELS);
+	CRenderTools::RenderEvalEnvelope(&m_PointsAccess, std::chrono::nanoseconds((int64_t)((double)Time * (double)std::chrono::nanoseconds(1s).count())), Result, Channels);
 }
 
 void CEnvelope::AddPoint(int Time, int v0, int v1, int v2, int v3)
diff --git a/src/game/editor/mapitems/envelope.h b/src/game/editor/mapitems/envelope.h
index 2b25c9f362..b3a00a258f 100644
--- a/src/game/editor/mapitems/envelope.h
+++ b/src/game/editor/mapitems/envelope.h
@@ -21,7 +21,7 @@ class CEnvelope
 	explicit CEnvelope(int NumChannels);
 
 	std::pair<float, float> GetValueRange(int ChannelMask);
-	int Eval(float Time, ColorRGBA &Color);
+	void Eval(float Time, ColorRGBA &Result, size_t Channels);
 	void AddPoint(int Time, int v0, int v1 = 0, int v2 = 0, int v3 = 0);
 	float EndTime() const;
 	int GetChannels() const;
diff --git a/src/game/editor/mapitems/image.cpp b/src/game/editor/mapitems/image.cpp
index 514a1cadf7..0266ccb99d 100644
--- a/src/game/editor/mapitems/image.cpp
+++ b/src/game/editor/mapitems/image.cpp
@@ -5,7 +5,7 @@
 CEditorImage::CEditorImage(CEditor *pEditor) :
 	m_AutoMapper(pEditor)
 {
-	Init(pEditor);
+	OnInit(pEditor);
 	m_Texture.Invalidate();
 }
 
@@ -16,9 +16,9 @@ CEditorImage::~CEditorImage()
 	m_pData = nullptr;
 }
 
-void CEditorImage::Init(CEditor *pEditor)
+void CEditorImage::OnInit(CEditor *pEditor)
 {
-	CEditorComponent::Init(pEditor);
+	CEditorComponent::OnInit(pEditor);
 	RegisterSubComponent(m_AutoMapper);
 	InitSubComponents();
 }
@@ -27,22 +27,20 @@ void CEditorImage::AnalyseTileFlags()
 {
 	mem_zero(m_aTileFlags, sizeof(m_aTileFlags));
 
-	int tw = m_Width / 16; // tilesizes
-	int th = m_Height / 16;
+	size_t tw = m_Width / 16; // tilesizes
+	size_t th = m_Height / 16;
 	if(tw == th && m_Format == CImageInfo::FORMAT_RGBA)
 	{
-		unsigned char *pPixelData = (unsigned char *)m_pData;
-
-		int TileID = 0;
-		for(int ty = 0; ty < 16; ty++)
-			for(int tx = 0; tx < 16; tx++, TileID++)
+		int TileId = 0;
+		for(size_t ty = 0; ty < 16; ty++)
+			for(size_t tx = 0; tx < 16; tx++, TileId++)
 			{
 				bool Opaque = true;
-				for(int x = 0; x < tw; x++)
-					for(int y = 0; y < th; y++)
+				for(size_t x = 0; x < tw; x++)
+					for(size_t y = 0; y < th; y++)
 					{
-						int p = (ty * tw + y) * m_Width + tx * tw + x;
-						if(pPixelData[p * 4 + 3] < 250)
+						size_t p = (ty * tw + y) * m_Width + tx * tw + x;
+						if(m_pData[p * 4 + 3] < 250)
 						{
 							Opaque = false;
 							break;
@@ -50,7 +48,7 @@ void CEditorImage::AnalyseTileFlags()
 					}
 
 				if(Opaque)
-					m_aTileFlags[TileID] |= TILEFLAG_OPAQUE;
+					m_aTileFlags[TileId] |= TILEFLAG_OPAQUE;
 			}
 	}
 }
diff --git a/src/game/editor/mapitems/image.h b/src/game/editor/mapitems/image.h
index cffbd6c7e7..7e2142f630 100644
--- a/src/game/editor/mapitems/image.h
+++ b/src/game/editor/mapitems/image.h
@@ -12,7 +12,7 @@ class CEditorImage : public CImageInfo, public CEditorComponent
 	explicit CEditorImage(CEditor *pEditor);
 	~CEditorImage();
 
-	void Init(CEditor *pEditor) override;
+	void OnInit(CEditor *pEditor) override;
 	void AnalyseTileFlags();
 
 	IGraphics::CTextureHandle m_Texture;
diff --git a/src/game/editor/mapitems/layer.h b/src/game/editor/mapitems/layer.h
index 238c9e4ccd..3f62e04f94 100644
--- a/src/game/editor/mapitems/layer.h
+++ b/src/game/editor/mapitems/layer.h
@@ -46,8 +46,8 @@ class CLayer
 	virtual void BrushSelecting(CUIRect Rect) {}
 	virtual int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) { return 0; }
 	virtual void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) {}
-	virtual void BrushDraw(std::shared_ptr<CLayer> pBrush, float x, float y) {}
-	virtual void BrushPlace(std::shared_ptr<CLayer> pBrush, float x, float y) {}
+	virtual void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) {}
+	virtual void BrushPlace(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) {}
 	virtual void BrushFlipX() {}
 	virtual void BrushFlipY() {}
 	virtual void BrushRotate(float Amount) {}
@@ -55,7 +55,7 @@ class CLayer
 	virtual bool IsEntitiesLayer() const { return false; }
 
 	virtual void Render(bool Tileset = false) {}
-	virtual CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) { return CUI::POPUP_KEEP_OPEN; }
+	virtual CUi::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) { return CUi::POPUP_KEEP_OPEN; }
 
 	virtual void ModifyImageIndex(FIndexModifyFunction pfnFunc) {}
 	virtual void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) {}
diff --git a/src/game/editor/mapitems/layer_front.cpp b/src/game/editor/mapitems/layer_front.cpp
index f046299c4b..b553ead212 100644
--- a/src/game/editor/mapitems/layer_front.cpp
+++ b/src/game/editor/mapitems/layer_front.cpp
@@ -27,12 +27,7 @@ void CLayerFront::SetTile(int x, int y, CTile Tile)
 	{
 		CTile air = {TILE_AIR};
 		CLayerTiles::SetTile(x, y, air);
-		if(!m_pEditor->m_PreventUnusedTilesWasWarned)
-		{
-			m_pEditor->m_PopupEventType = CEditor::POPEVENT_PREVENTUNUSEDTILES;
-			m_pEditor->m_PopupEventActivated = true;
-			m_pEditor->m_PreventUnusedTilesWasWarned = true;
-		}
+		ShowPreventUnusedTilesWarning();
 	}
 }
 
diff --git a/src/game/editor/mapitems/layer_game.cpp b/src/game/editor/mapitems/layer_game.cpp
index eb0ee541fc..14dfd27e14 100644
--- a/src/game/editor/mapitems/layer_game.cpp
+++ b/src/game/editor/mapitems/layer_game.cpp
@@ -17,8 +17,8 @@ CTile CLayerGame::GetTile(int x, int y)
 {
 	if(m_pEditor->m_Map.m_pFrontLayer && m_pEditor->m_Map.m_pFrontLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
 	{
-		CTile through_cut = {TILE_THROUGH_CUT};
-		return through_cut;
+		CTile ThroughCut = {TILE_THROUGH_CUT};
+		return ThroughCut;
 	}
 	else
 	{
@@ -38,8 +38,8 @@ void CLayerGame::SetTile(int x, int y, CTile Tile)
 		}
 		CTile nohook = {TILE_NOHOOK};
 		CLayerTiles::SetTile(x, y, nohook);
-		CTile through_cut = {TILE_THROUGH_CUT};
-		m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, through_cut); // NOLINT(bugprone-parent-virtual-call)
+		CTile ThroughCut = {TILE_THROUGH_CUT};
+		m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, ThroughCut); // NOLINT(bugprone-parent-virtual-call)
 	}
 	else
 	{
@@ -56,19 +56,14 @@ void CLayerGame::SetTile(int x, int y, CTile Tile)
 		{
 			CTile air = {TILE_AIR};
 			CLayerTiles::SetTile(x, y, air);
-			if(!m_pEditor->m_PreventUnusedTilesWasWarned)
-			{
-				m_pEditor->m_PopupEventType = CEditor::POPEVENT_PREVENTUNUSEDTILES;
-				m_pEditor->m_PopupEventActivated = true;
-				m_pEditor->m_PreventUnusedTilesWasWarned = true;
-			}
+			ShowPreventUnusedTilesWarning();
 		}
 	}
 }
 
-CUI::EPopupMenuFunctionResult CLayerGame::RenderProperties(CUIRect *pToolbox)
+CUi::EPopupMenuFunctionResult CLayerGame::RenderProperties(CUIRect *pToolbox)
 {
-	const CUI::EPopupMenuFunctionResult Result = CLayerTiles::RenderProperties(pToolbox);
+	const CUi::EPopupMenuFunctionResult Result = CLayerTiles::RenderProperties(pToolbox);
 	m_Image = -1;
 	return Result;
 }
diff --git a/src/game/editor/mapitems/layer_game.h b/src/game/editor/mapitems/layer_game.h
index ec6f1d78fa..4fd7b71b86 100644
--- a/src/game/editor/mapitems/layer_game.h
+++ b/src/game/editor/mapitems/layer_game.h
@@ -13,7 +13,7 @@ class CLayerGame : public CLayerTiles
 	void SetTile(int x, int y, CTile Tile) override;
 	const char *TypeName() const override;
 
-	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+	CUi::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
 };
 
 #endif
diff --git a/src/game/editor/mapitems/layer_quads.cpp b/src/game/editor/mapitems/layer_quads.cpp
index 3f69708fd5..b523f815d2 100644
--- a/src/game/editor/mapitems/layer_quads.cpp
+++ b/src/game/editor/mapitems/layer_quads.cpp
@@ -138,7 +138,7 @@ int CLayerQuads::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
 	return pGrabbed->m_vQuads.empty() ? 0 : 1;
 }
 
-void CLayerQuads::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerQuads::BrushPlace(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(pBrush);
 	std::vector<CQuad> vAddedQuads;
@@ -148,8 +148,8 @@ void CLayerQuads::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 
 		for(auto &Point : n.m_aPoints)
 		{
-			Point.x += f2fx(wx);
-			Point.y += f2fx(wy);
+			Point.x += f2fx(WorldPos.x);
+			Point.y += f2fx(WorldPos.y);
 		}
 
 		m_vQuads.push_back(n);
@@ -221,7 +221,7 @@ void CLayerQuads::GetSize(float *pWidth, float *pHeight)
 	}
 }
 
-CUI::EPopupMenuFunctionResult CLayerQuads::RenderProperties(CUIRect *pToolBox)
+CUi::EPopupMenuFunctionResult CLayerQuads::RenderProperties(CUIRect *pToolBox)
 {
 	CProperty aProps[] = {
 		{"Image", m_Image, PROPTYPE_IMAGE, -1, 0},
@@ -231,7 +231,7 @@ CUI::EPopupMenuFunctionResult CLayerQuads::RenderProperties(CUIRect *pToolBox)
 	static int s_aIds[(int)ELayerQuadsProp::NUM_PROPS] = {0};
 	int NewVal = 0;
 	auto [State, Prop] = m_pEditor->DoPropertiesWithState<ELayerQuadsProp>(pToolBox, aProps, s_aIds, &NewVal);
-	if(Prop != ELayerQuadsProp::PROP_NONE)
+	if(Prop != ELayerQuadsProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
 		m_pEditor->m_Map.OnModify();
 	}
@@ -249,7 +249,7 @@ CUI::EPopupMenuFunctionResult CLayerQuads::RenderProperties(CUIRect *pToolBox)
 
 	s_Tracker.End(Prop, State);
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CLayerQuads::ModifyImageIndex(FIndexModifyFunction Func)
diff --git a/src/game/editor/mapitems/layer_quads.h b/src/game/editor/mapitems/layer_quads.h
index dd826b385e..e0026aaff0 100644
--- a/src/game/editor/mapitems/layer_quads.h
+++ b/src/game/editor/mapitems/layer_quads.h
@@ -16,12 +16,12 @@ class CLayerQuads : public CLayer
 
 	void BrushSelecting(CUIRect Rect) override;
 	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
-	void BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushPlace(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
 
-	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+	CUi::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
 
 	void ModifyImageIndex(FIndexModifyFunction pfnFunc) override;
 	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
diff --git a/src/game/editor/mapitems/layer_sounds.cpp b/src/game/editor/mapitems/layer_sounds.cpp
index ff8250617a..d25de9a2c6 100644
--- a/src/game/editor/mapitems/layer_sounds.cpp
+++ b/src/game/editor/mapitems/layer_sounds.cpp
@@ -34,41 +34,31 @@ void CLayerSounds::Render(bool Tileset)
 	Graphics()->SetColor(0.6f, 0.8f, 1.0f, 0.4f);
 	for(const auto &Source : m_vSources)
 	{
-		float OffsetX = 0;
-		float OffsetY = 0;
-
-		if(Source.m_PosEnv >= 0)
-		{
-			ColorRGBA Channels;
-			CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Channels, m_pEditor);
-			OffsetX = Channels.r;
-			OffsetY = Channels.g;
-		}
+		ColorRGBA Offset = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+		CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Offset, 2, m_pEditor);
+		const vec2 Position = vec2(fx2f(Source.m_Position.x) + Offset.r, fx2f(Source.m_Position.y) + Offset.g);
+		const float Falloff = Source.m_Falloff / 255.0f;
 
 		switch(Source.m_Shape.m_Type)
 		{
 		case CSoundShape::SHAPE_CIRCLE:
 		{
-			m_pEditor->Graphics()->DrawCircle(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY,
-				Source.m_Shape.m_Circle.m_Radius, 32);
-
-			float Falloff = ((float)Source.m_Falloff / 255.0f);
+			m_pEditor->Graphics()->DrawCircle(Position.x, Position.y, Source.m_Shape.m_Circle.m_Radius, 32);
 			if(Falloff > 0.0f)
-				m_pEditor->Graphics()->DrawCircle(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY,
-					Source.m_Shape.m_Circle.m_Radius * Falloff, 32);
+			{
+				m_pEditor->Graphics()->DrawCircle(Position.x, Position.y, Source.m_Shape.m_Circle.m_Radius * Falloff, 32);
+			}
 			break;
 		}
 		case CSoundShape::SHAPE_RECTANGLE:
 		{
-			float Width = fx2f(Source.m_Shape.m_Rectangle.m_Width);
-			float Height = fx2f(Source.m_Shape.m_Rectangle.m_Height);
-			m_pEditor->Graphics()->DrawRectExt(fx2f(Source.m_Position.x) + OffsetX - Width / 2, fx2f(Source.m_Position.y) + OffsetY - Height / 2,
-				Width, Height, 0.0f, IGraphics::CORNER_NONE);
-
-			float Falloff = ((float)Source.m_Falloff / 255.0f);
+			const float Width = fx2f(Source.m_Shape.m_Rectangle.m_Width);
+			const float Height = fx2f(Source.m_Shape.m_Rectangle.m_Height);
+			m_pEditor->Graphics()->DrawRectExt(Position.x - Width / 2, Position.y - Height / 2, Width, Height, 0.0f, IGraphics::CORNER_NONE);
 			if(Falloff > 0.0f)
-				m_pEditor->Graphics()->DrawRectExt(fx2f(Source.m_Position.x) + OffsetX - Falloff * Width / 2, fx2f(Source.m_Position.y) + OffsetY - Falloff * Height / 2,
-					Width * Falloff, Height * Falloff, 0.0f, IGraphics::CORNER_NONE);
+			{
+				m_pEditor->Graphics()->DrawRectExt(Position.x - Falloff * Width / 2, Position.y - Falloff * Height / 2, Width * Falloff, Height * Falloff, 0.0f, IGraphics::CORNER_NONE);
+			}
 			break;
 		}
 		}
@@ -84,18 +74,10 @@ void CLayerSounds::Render(bool Tileset)
 	m_pEditor->RenderTools()->SelectSprite(SPRITE_AUDIO_SOURCE);
 	for(const auto &Source : m_vSources)
 	{
-		float OffsetX = 0;
-		float OffsetY = 0;
-
-		if(Source.m_PosEnv >= 0)
-		{
-			ColorRGBA Channels;
-			CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Channels, m_pEditor);
-			OffsetX = Channels.r;
-			OffsetY = Channels.g;
-		}
-
-		m_pEditor->RenderTools()->DrawSprite(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY, m_pEditor->MapView()->ScaleLength(s_SourceVisualSize));
+		ColorRGBA Offset = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+		CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Offset, 2, m_pEditor);
+		const vec2 Position = vec2(fx2f(Source.m_Position.x) + Offset.r, fx2f(Source.m_Position.y) + Offset.g);
+		m_pEditor->RenderTools()->DrawSprite(Position.x, Position.y, m_pEditor->MapView()->ScaleLength(s_SourceVisualSize));
 	}
 
 	Graphics()->QuadsEnd();
@@ -168,7 +150,7 @@ int CLayerSounds::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
 	return pGrabbed->m_vSources.empty() ? 0 : 1;
 }
 
-void CLayerSounds::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerSounds::BrushPlace(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	std::shared_ptr<CLayerSounds> pSoundLayer = std::static_pointer_cast<CLayerSounds>(pBrush);
 	std::vector<CSoundSource> vAddedSources;
@@ -176,8 +158,8 @@ void CLayerSounds::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy
 	{
 		CSoundSource n = Source;
 
-		n.m_Position.x += f2fx(wx);
-		n.m_Position.y += f2fx(wy);
+		n.m_Position.x += f2fx(WorldPos.x);
+		n.m_Position.y += f2fx(WorldPos.y);
 
 		m_vSources.push_back(n);
 		vAddedSources.push_back(n);
@@ -186,7 +168,7 @@ void CLayerSounds::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy
 	m_pEditor->m_Map.OnModify();
 }
 
-CUI::EPopupMenuFunctionResult CLayerSounds::RenderProperties(CUIRect *pToolBox)
+CUi::EPopupMenuFunctionResult CLayerSounds::RenderProperties(CUIRect *pToolBox)
 {
 	CProperty aProps[] = {
 		{"Sound", m_Sound, PROPTYPE_SOUND, -1, 0},
@@ -196,7 +178,7 @@ CUI::EPopupMenuFunctionResult CLayerSounds::RenderProperties(CUIRect *pToolBox)
 	static int s_aIds[(int)ELayerSoundsProp::NUM_PROPS] = {0};
 	int NewVal = 0;
 	auto [State, Prop] = m_pEditor->DoPropertiesWithState<ELayerSoundsProp>(pToolBox, aProps, s_aIds, &NewVal);
-	if(Prop != ELayerSoundsProp::PROP_NONE)
+	if(Prop != ELayerSoundsProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
 		m_pEditor->m_Map.OnModify();
 	}
@@ -214,7 +196,7 @@ CUI::EPopupMenuFunctionResult CLayerSounds::RenderProperties(CUIRect *pToolBox)
 
 	s_Tracker.End(Prop, State);
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CLayerSounds::ModifySoundIndex(FIndexModifyFunction Func)
diff --git a/src/game/editor/mapitems/layer_sounds.h b/src/game/editor/mapitems/layer_sounds.h
index bc71b13642..5efe11d515 100644
--- a/src/game/editor/mapitems/layer_sounds.h
+++ b/src/game/editor/mapitems/layer_sounds.h
@@ -15,9 +15,9 @@ class CLayerSounds : public CLayer
 
 	void BrushSelecting(CUIRect Rect) override;
 	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
-	void BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushPlace(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 
-	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+	CUi::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
 
 	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
 	void ModifySoundIndex(FIndexModifyFunction pfnFunc) override;
diff --git a/src/game/editor/mapitems/layer_speedup.cpp b/src/game/editor/mapitems/layer_speedup.cpp
index 02795a4316..e963da8e81 100644
--- a/src/game/editor/mapitems/layer_speedup.cpp
+++ b/src/game/editor/mapitems/layer_speedup.cpp
@@ -65,14 +65,14 @@ bool CLayerSpeedup::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
 	return true;
 }
 
-void CLayerSpeedup::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerSpeedup::BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	if(m_Readonly)
 		return;
 
 	std::shared_ptr<CLayerSpeedup> pSpeedupLayer = std::static_pointer_cast<CLayerSpeedup>(pBrush);
-	int sx = ConvertX(wx);
-	int sy = ConvertY(wy);
+	int sx = ConvertX(WorldPos.x);
+	int sy = ConvertY(WorldPos.y);
 	if(str_comp(pSpeedupLayer->m_aFileName, m_pEditor->m_aFileName))
 	{
 		m_pEditor->m_SpeedupAngle = pSpeedupLayer->m_SpeedupAngle;
@@ -144,6 +144,9 @@ void CLayerSpeedup::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy
 				m_pSpeedupTile[Index].m_Angle = 0;
 				m_pSpeedupTile[Index].m_Type = 0;
 				m_pTiles[Index].m_Index = 0;
+
+				if(pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index != TILE_AIR)
+					ShowPreventUnusedTilesWarning();
 			}
 
 			SSpeedupTileStateChange::SData Current{
@@ -258,6 +261,9 @@ void CLayerSpeedup::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CU
 				m_pTiles[TgtIndex].m_Index = 0;
 				m_pSpeedupTile[TgtIndex].m_Force = 0;
 				m_pSpeedupTile[TgtIndex].m_Angle = 0;
+
+				if(!Empty)
+					ShowPreventUnusedTilesWarning();
 			}
 			else
 			{
diff --git a/src/game/editor/mapitems/layer_speedup.h b/src/game/editor/mapitems/layer_speedup.h
index 990f488e7d..5b298d5288 100644
--- a/src/game/editor/mapitems/layer_speedup.h
+++ b/src/game/editor/mapitems/layer_speedup.h
@@ -31,7 +31,7 @@ class CLayerSpeedup : public CLayerTiles
 	void Resize(int NewW, int NewH) override;
 	void Shift(int Direction) override;
 	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
-	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
diff --git a/src/game/editor/mapitems/layer_switch.cpp b/src/game/editor/mapitems/layer_switch.cpp
index 6d59903b6a..25e1bc35ee 100644
--- a/src/game/editor/mapitems/layer_switch.cpp
+++ b/src/game/editor/mapitems/layer_switch.cpp
@@ -10,6 +10,8 @@ CLayerSwitch::CLayerSwitch(CEditor *pEditor, int w, int h) :
 
 	m_pSwitchTile = new CSwitchTile[w * h];
 	mem_zero(m_pSwitchTile, (size_t)w * h * sizeof(CSwitchTile));
+	m_GotoSwitchLastPos = ivec2(-1, -1);
+	m_GotoSwitchOffset = 0;
 }
 
 CLayerSwitch::CLayerSwitch(const CLayerSwitch &Other) :
@@ -65,14 +67,14 @@ bool CLayerSwitch::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
 	return true;
 }
 
-void CLayerSwitch::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerSwitch::BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	if(m_Readonly)
 		return;
 
 	std::shared_ptr<CLayerSwitch> pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(pBrush);
-	int sx = ConvertX(wx);
-	int sy = ConvertY(wy);
+	int sx = ConvertX(WorldPos.x);
+	int sy = ConvertY(WorldPos.y);
 	if(str_comp(pSwitchLayer->m_aFileName, m_pEditor->m_aFileName))
 	{
 		m_pEditor->m_SwitchNum = pSwitchLayer->m_SwitchNumber;
@@ -144,6 +146,9 @@ void CLayerSwitch::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 				m_pSwitchTile[Index].m_Flags = 0;
 				m_pSwitchTile[Index].m_Delay = 0;
 				m_pTiles[Index].m_Index = 0;
+
+				if(pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index != TILE_AIR)
+					ShowPreventUnusedTilesWarning();
 			}
 
 			SSwitchTileStateChange::SData Current{
@@ -265,6 +270,9 @@ void CLayerSwitch::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUI
 				m_pSwitchTile[TgtIndex].m_Type = 0;
 				m_pSwitchTile[TgtIndex].m_Number = 0;
 				m_pSwitchTile[TgtIndex].m_Delay = 0;
+
+				if(!Empty)
+					ShowPreventUnusedTilesWarning();
 			}
 			else
 			{
@@ -322,6 +330,58 @@ bool CLayerSwitch::ContainsElementWithId(int Id)
 	return false;
 }
 
+void CLayerSwitch::GetPos(int Number, int Offset, ivec2 &SwitchPos)
+{
+	int Match = -1;
+	ivec2 MatchPos = ivec2(-1, -1);
+	SwitchPos = ivec2(-1, -1);
+
+	auto FindTile = [this, &Match, &MatchPos, &Number, &Offset]() {
+		for(int x = 0; x < m_Width; x++)
+		{
+			for(int y = 0; y < m_Height; y++)
+			{
+				int i = y * m_Width + x;
+				int Switch = m_pSwitchTile[i].m_Number;
+				if(Number == Switch)
+				{
+					Match++;
+					if(Offset != -1)
+					{
+						if(Match == Offset)
+						{
+							MatchPos = ivec2(x, y);
+							m_GotoSwitchOffset = Match;
+							return;
+						}
+						continue;
+					}
+					MatchPos = ivec2(x, y);
+					if(m_GotoSwitchLastPos != ivec2(-1, -1))
+					{
+						if(distance(m_GotoSwitchLastPos, MatchPos) < 10.0f)
+						{
+							m_GotoSwitchOffset++;
+							continue;
+						}
+					}
+					m_GotoSwitchLastPos = MatchPos;
+					if(Match == m_GotoSwitchOffset)
+						return;
+				}
+			}
+		}
+	};
+	FindTile();
+
+	if(MatchPos == ivec2(-1, -1))
+		return;
+	if(Match < m_GotoSwitchOffset)
+		m_GotoSwitchOffset = -1;
+	SwitchPos = MatchPos;
+	m_GotoSwitchOffset++;
+}
+
 std::shared_ptr<CLayer> CLayerSwitch::Duplicate() const
 {
 	return std::make_shared<CLayerSwitch>(*this);
diff --git a/src/game/editor/mapitems/layer_switch.h b/src/game/editor/mapitems/layer_switch.h
index 7a8aae79b2..810cbf9efe 100644
--- a/src/game/editor/mapitems/layer_switch.h
+++ b/src/game/editor/mapitems/layer_switch.h
@@ -30,12 +30,16 @@ class CLayerSwitch : public CLayerTiles
 	void Resize(int NewW, int NewH) override;
 	void Shift(int Direction) override;
 	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
-	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
 	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
 	virtual bool ContainsElementWithId(int Id);
+	virtual void GetPos(int Number, int Offset, ivec2 &SwitchPos);
+
+	int m_GotoSwitchOffset;
+	ivec2 m_GotoSwitchLastPos;
 
 	EditorTileStateChangeHistory<SSwitchTileStateChange> m_History;
 	inline void ClearHistory() override
diff --git a/src/game/editor/mapitems/layer_tele.cpp b/src/game/editor/mapitems/layer_tele.cpp
index 0006a74c90..3e57388f71 100644
--- a/src/game/editor/mapitems/layer_tele.cpp
+++ b/src/game/editor/mapitems/layer_tele.cpp
@@ -10,6 +10,9 @@ CLayerTele::CLayerTele(CEditor *pEditor, int w, int h) :
 
 	m_pTeleTile = new CTeleTile[w * h];
 	mem_zero(m_pTeleTile, (size_t)w * h * sizeof(CTeleTile));
+
+	m_GotoTeleOffset = 0;
+	m_GotoTeleLastPos = ivec2(-1, -1);
 }
 
 CLayerTele::CLayerTele(const CLayerTele &Other) :
@@ -65,14 +68,14 @@ bool CLayerTele::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
 	return true;
 }
 
-void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	if(m_Readonly)
 		return;
 
 	std::shared_ptr<CLayerTele> pTeleLayer = std::static_pointer_cast<CLayerTele>(pBrush);
-	int sx = ConvertX(wx);
-	int sy = ConvertY(wy);
+	int sx = ConvertX(WorldPos.x);
+	int sy = ConvertY(WorldPos.y);
 	if(str_comp(pTeleLayer->m_aFileName, m_pEditor->m_aFileName))
 		m_pEditor->m_TeleNumber = pTeleLayer->m_TeleNum;
 
@@ -98,23 +101,28 @@ void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 
 			if((m_pEditor->m_AllowPlaceUnusedTiles || IsValidTeleTile(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index)) && pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index != TILE_AIR)
 			{
-				if(!IsTeleTileNumberUsed(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index))
+				bool IsCheckpoint = IsTeleTileCheckpoint(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index);
+				if(!IsCheckpoint && !IsTeleTileNumberUsed(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index, false))
 				{
 					// Tele tile number is unused. Set a known value which is not 0,
 					// as tiles with number 0 would be ignored by previous versions.
 					m_pTeleTile[Index].m_Number = 255;
 				}
-				else if(m_pEditor->m_TeleNumber != pTeleLayer->m_TeleNum)
+				else if(!IsCheckpoint && m_pEditor->m_TeleNumber != pTeleLayer->m_TeleNum)
 				{
 					m_pTeleTile[Index].m_Number = m_pEditor->m_TeleNumber;
 				}
+				else if(IsCheckpoint && m_pEditor->m_TeleCheckpointNumber != pTeleLayer->m_TeleCheckpointNum)
+				{
+					m_pTeleTile[Index].m_Number = m_pEditor->m_TeleCheckpointNumber;
+				}
 				else if(pTeleLayer->m_pTeleTile[y * pTeleLayer->m_Width + x].m_Number)
 				{
 					m_pTeleTile[Index].m_Number = pTeleLayer->m_pTeleTile[y * pTeleLayer->m_Width + x].m_Number;
 				}
 				else
 				{
-					if(!m_pEditor->m_TeleNumber)
+					if((!IsCheckpoint && !m_pEditor->m_TeleNumber) || (IsCheckpoint && !m_pEditor->m_TeleCheckpointNumber))
 					{
 						m_pTeleTile[Index].m_Number = 0;
 						m_pTeleTile[Index].m_Type = 0;
@@ -130,7 +138,7 @@ void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 					}
 					else
 					{
-						m_pTeleTile[Index].m_Number = m_pEditor->m_TeleNumber;
+						m_pTeleTile[Index].m_Number = IsCheckpoint ? m_pEditor->m_TeleCheckpointNumber : m_pEditor->m_TeleNumber;
 					}
 				}
 
@@ -142,6 +150,9 @@ void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 				m_pTeleTile[Index].m_Number = 0;
 				m_pTeleTile[Index].m_Type = 0;
 				m_pTiles[Index].m_Index = 0;
+
+				if(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index != TILE_AIR)
+					ShowPreventUnusedTilesWarning();
 			}
 
 			STeleTileStateChange::SData Current{
@@ -254,6 +265,9 @@ void CLayerTele::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRe
 				m_pTiles[TgtIndex].m_Index = 0;
 				m_pTeleTile[TgtIndex].m_Type = 0;
 				m_pTeleTile[TgtIndex].m_Number = 0;
+
+				if(!Empty)
+					ShowPreventUnusedTilesWarning();
 			}
 			else
 			{
@@ -261,15 +275,18 @@ void CLayerTele::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRe
 				if(pLt->m_Tele && m_pTiles[TgtIndex].m_Index > 0)
 				{
 					m_pTeleTile[TgtIndex].m_Type = m_pTiles[TgtIndex].m_Index;
+					bool IsCheckpoint = IsTeleTileCheckpoint(m_pTiles[TgtIndex].m_Index);
 
-					if(!IsTeleTileNumberUsed(m_pTeleTile[TgtIndex].m_Type))
+					if(!IsCheckpoint && !IsTeleTileNumberUsed(m_pTeleTile[TgtIndex].m_Type, false))
 					{
 						// Tele tile number is unused. Set a known value which is not 0,
 						// as tiles with number 0 would be ignored by previous versions.
 						m_pTeleTile[TgtIndex].m_Number = 255;
 					}
-					else if((pLt->m_pTeleTile[SrcIndex].m_Number == 0 && m_pEditor->m_TeleNumber) || m_pEditor->m_TeleNumber != pLt->m_TeleNum)
+					else if(!IsCheckpoint && ((pLt->m_pTeleTile[SrcIndex].m_Number == 0 && m_pEditor->m_TeleNumber) || m_pEditor->m_TeleNumber != pLt->m_TeleNum))
 						m_pTeleTile[TgtIndex].m_Number = m_pEditor->m_TeleNumber;
+					else if(IsCheckpoint && ((pLt->m_pTeleTile[SrcIndex].m_Number == 0 && m_pEditor->m_TeleCheckpointNumber) || m_pEditor->m_TeleCheckpointNumber != pLt->m_TeleCheckpointNum))
+						m_pTeleTile[TgtIndex].m_Number = m_pEditor->m_TeleCheckpointNumber;
 					else
 						m_pTeleTile[TgtIndex].m_Number = pLt->m_pTeleTile[SrcIndex].m_Number;
 				}
@@ -286,13 +303,13 @@ void CLayerTele::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRe
 	FlagModified(sx, sy, w, h);
 }
 
-bool CLayerTele::ContainsElementWithId(int Id)
+bool CLayerTele::ContainsElementWithId(int Id, bool Checkpoint)
 {
 	for(int y = 0; y < m_Height; ++y)
 	{
 		for(int x = 0; x < m_Width; ++x)
 		{
-			if(IsTeleTileNumberUsed(m_pTeleTile[y * m_Width + x].m_Type) && m_pTeleTile[y * m_Width + x].m_Number == Id)
+			if(IsTeleTileNumberUsed(m_pTeleTile[y * m_Width + x].m_Type, Checkpoint) && m_pTeleTile[y * m_Width + x].m_Number == Id)
 			{
 				return true;
 			}
@@ -302,6 +319,60 @@ bool CLayerTele::ContainsElementWithId(int Id)
 	return false;
 }
 
+void CLayerTele::GetPos(int Number, int Offset, int &TeleX, int &TeleY)
+{
+	int Match = -1;
+	ivec2 MatchPos = ivec2(-1, -1);
+	TeleX = -1;
+	TeleY = -1;
+
+	auto FindTile = [this, &Match, &MatchPos, &Number, &Offset]() {
+		for(int x = 0; x < m_Width; x++)
+		{
+			for(int y = 0; y < m_Height; y++)
+			{
+				int i = y * m_Width + x;
+				int Tele = m_pTeleTile[i].m_Number;
+				if(Number == Tele)
+				{
+					Match++;
+					if(Offset != -1)
+					{
+						if(Match == Offset)
+						{
+							MatchPos = ivec2(x, y);
+							m_GotoTeleOffset = Match;
+							return;
+						}
+						continue;
+					}
+					MatchPos = ivec2(x, y);
+					if(m_GotoTeleLastPos != ivec2(-1, -1))
+					{
+						if(distance(m_GotoTeleLastPos, MatchPos) < 10.0f)
+						{
+							m_GotoTeleOffset++;
+							continue;
+						}
+					}
+					m_GotoTeleLastPos = MatchPos;
+					if(Match == m_GotoTeleOffset)
+						return;
+				}
+			}
+		}
+	};
+	FindTile();
+
+	if(MatchPos == ivec2(-1, -1))
+		return;
+	if(Match < m_GotoTeleOffset)
+		m_GotoTeleOffset = -1;
+	TeleX = MatchPos.x;
+	TeleY = MatchPos.y;
+	m_GotoTeleOffset++;
+}
+
 std::shared_ptr<CLayer> CLayerTele::Duplicate() const
 {
 	return std::make_shared<CLayerTele>(*this);
diff --git a/src/game/editor/mapitems/layer_tele.h b/src/game/editor/mapitems/layer_tele.h
index 569dd305e4..1a373e79ad 100644
--- a/src/game/editor/mapitems/layer_tele.h
+++ b/src/game/editor/mapitems/layer_tele.h
@@ -23,16 +23,21 @@ class CLayerTele : public CLayerTiles
 
 	CTeleTile *m_pTeleTile;
 	unsigned char m_TeleNum;
+	unsigned char m_TeleCheckpointNum;
 
 	void Resize(int NewW, int NewH) override;
 	void Shift(int Direction) override;
 	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
-	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
 	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
-	virtual bool ContainsElementWithId(int Id);
+	virtual bool ContainsElementWithId(int Id, bool Checkpoint);
+	virtual void GetPos(int Number, int Offset, int &TeleX, int &TeleY);
+
+	int m_GotoTeleOffset;
+	ivec2 m_GotoTeleLastPos;
 
 	EditorTileStateChangeHistory<STeleTileStateChange> m_History;
 	inline void ClearHistory() override
diff --git a/src/game/editor/mapitems/layer_tiles.cpp b/src/game/editor/mapitems/layer_tiles.cpp
index a3ed05c33a..a6a040a6d0 100644
--- a/src/game/editor/mapitems/layer_tiles.cpp
+++ b/src/game/editor/mapitems/layer_tiles.cpp
@@ -6,6 +6,7 @@
 #include <engine/shared/map.h>
 #include <game/editor/editor.h>
 #include <game/editor/editor_actions.h>
+#include <game/editor/enums.h>
 
 #include <iterator>
 #include <numeric>
@@ -64,7 +65,7 @@ CLayerTiles::CLayerTiles(const CLayerTiles &Other) :
 	m_Switch = Other.m_Switch;
 	m_Tune = Other.m_Tune;
 
-	mem_copy(m_aFileName, Other.m_aFileName, IO_MAX_PATH_LENGTH);
+	str_copy(m_aFileName, Other.m_aFileName);
 }
 
 CLayerTiles::~CLayerTiles()
@@ -146,13 +147,14 @@ void CLayerTiles::Render(bool Tileset)
 		Texture = m_pEditor->GetTuneTexture();
 	Graphics()->TextureSet(Texture);
 
-	ColorRGBA Color = ColorRGBA(m_Color.r / 255.0f, m_Color.g / 255.0f, m_Color.b / 255.0f, m_Color.a / 255.0f);
+	ColorRGBA ColorEnv = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+	CEditor::EnvelopeEval(m_ColorEnvOffset, m_ColorEnv, ColorEnv, 4, m_pEditor);
+	const ColorRGBA Color = ColorRGBA(m_Color.r / 255.0f, m_Color.g / 255.0f, m_Color.b / 255.0f, m_Color.a / 255.0f).Multiply(ColorEnv);
+
 	Graphics()->BlendNone();
-	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_OPAQUE,
-		CEditor::EnvelopeEval, m_pEditor, m_ColorEnv, m_ColorEnvOffset);
+	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_OPAQUE);
 	Graphics()->BlendNormal();
-	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_TRANSPARENT,
-		CEditor::EnvelopeEval, m_pEditor, m_ColorEnv, m_ColorEnvOffset);
+	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_TRANSPARENT);
 
 	// Render DDRace Layers
 	if(!Tileset)
@@ -251,12 +253,12 @@ bool CLayerTiles::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
 void CLayerTiles::BrushSelecting(CUIRect Rect)
 {
 	Graphics()->TextureClear();
-	m_pEditor->Graphics()->QuadsBegin();
-	m_pEditor->Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
 	Snap(&Rect);
 	IGraphics::CQuadItem QuadItem(Rect.x, Rect.y, Rect.w, Rect.h);
-	m_pEditor->Graphics()->QuadsDrawTL(&QuadItem, 1);
-	m_pEditor->Graphics()->QuadsEnd();
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
 	char aBuf[16];
 	str_format(aBuf, sizeof(aBuf), "%d⨯%d", ConvertX(Rect.w), ConvertY(Rect.h));
 	TextRender()->Text(Rect.x + 3.0f, Rect.y + 3.0f, m_pEditor->m_ShowPicker ? 15.0f : m_pEditor->MapView()->ScaleLength(15.0f), aBuf, -1.0f);
@@ -308,12 +310,18 @@ int CLayerTiles::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
 				for(int x = 0; x < r.w; x++)
 				{
 					pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x] = static_cast<CLayerTele *>(this)->m_pTeleTile[(r.y + y) * m_Width + (r.x + x)];
-					if(IsValidTeleTile(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type) && IsTeleTileNumberUsed(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type))
+					if(IsValidTeleTile(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type))
 					{
-						m_pEditor->m_TeleNumber = pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Number;
+						if(IsTeleTileNumberUsed(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type, false))
+							m_pEditor->m_TeleNumber = pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Number;
+						else if(IsTeleTileNumberUsed(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type, true))
+							m_pEditor->m_TeleCheckpointNumber = pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Number;
 					}
 				}
+
 		pGrabbed->m_TeleNum = m_pEditor->m_TeleNumber;
+		pGrabbed->m_TeleCheckpointNum = m_pEditor->m_TeleCheckpointNumber;
+
 		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
 	}
 	else if(this->m_Speedup)
@@ -479,15 +487,15 @@ void CLayerTiles::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIR
 	FlagModified(sx, sy, w, h);
 }
 
-void CLayerTiles::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerTiles::BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	if(m_Readonly)
 		return;
 
 	//
 	std::shared_ptr<CLayerTiles> pTileLayer = std::static_pointer_cast<CLayerTiles>(pBrush);
-	int sx = ConvertX(wx);
-	int sy = ConvertY(wy);
+	int sx = ConvertX(WorldPos.x);
+	int sy = ConvertY(WorldPos.y);
 
 	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pTileLayer);
 
@@ -669,7 +677,7 @@ void CLayerTiles::ShowInfo()
 				}
 				else
 				{
-					str_from_int(m_pTiles[c].m_Index, aBuf);
+					str_format(aBuf, sizeof(aBuf), "%d", m_pTiles[c].m_Index);
 				}
 				m_pEditor->Graphics()->QuadsText(x * 32, y * 32, 16.0f, aBuf);
 
@@ -686,92 +694,126 @@ void CLayerTiles::ShowInfo()
 	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
 }
 
-CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
+void CLayerTiles::FillGameTiles(EGameTileOp Fill)
 {
-	CUIRect Button;
-
-	const bool EntitiesLayer = IsEntitiesLayer();
+	if(!CanFillGameTiles())
+		return;
 
 	std::shared_ptr<CLayerGroup> pGroup = m_pEditor->m_Map.m_vpGroups[m_pEditor->m_SelectedGroup];
 
-	// Game tiles can only be constructed if the layer is relative to the game layer
-	if(!EntitiesLayer && !(pGroup->m_OffsetX % 32) && !(pGroup->m_OffsetY % 32) && pGroup->m_ParallaxX == 100 && pGroup->m_ParallaxY == 100)
+	int Result = (int)Fill;
+	switch(Fill)
 	{
-		pToolBox->HSplitBottom(12.0f, pToolBox, &Button);
-		static int s_GameTilesButton = 0;
-		if(m_pEditor->DoButton_Editor(&s_GameTilesButton, "Game tiles", 0, &Button, 0, "Constructs game tiles from this layer"))
-			m_pEditor->PopupSelectGametileOpInvoke(m_pEditor->UI()->MouseX(), m_pEditor->UI()->MouseY());
-		int Result = m_pEditor->PopupSelectGameTileOpResult();
-		switch(Result)
+	case EGameTileOp::HOOKTHROUGH:
+		Result = TILE_THROUGH_CUT;
+		break;
+	case EGameTileOp::FREEZE:
+		Result = TILE_FREEZE;
+		break;
+	case EGameTileOp::UNFREEZE:
+		Result = TILE_UNFREEZE;
+		break;
+	case EGameTileOp::DEEP_FREEZE:
+		Result = TILE_DFREEZE;
+		break;
+	case EGameTileOp::DEEP_UNFREEZE:
+		Result = TILE_DUNFREEZE;
+		break;
+	case EGameTileOp::BLUE_CHECK_TELE:
+		Result = TILE_TELECHECKIN;
+		break;
+	case EGameTileOp::RED_CHECK_TELE:
+		Result = TILE_TELECHECKINEVIL;
+		break;
+	case EGameTileOp::LIVE_FREEZE:
+		Result = TILE_LFREEZE;
+		break;
+	case EGameTileOp::LIVE_UNFREEZE:
+		Result = TILE_LUNFREEZE;
+		break;
+	default:
+		break;
+	}
+	if(Result > -1)
+	{
+		const int OffsetX = -pGroup->m_OffsetX / 32;
+		const int OffsetY = -pGroup->m_OffsetY / 32;
+
+		std::vector<std::shared_ptr<IEditorAction>> vpActions;
+		std::shared_ptr<CLayerTiles> pGLayer = m_pEditor->m_Map.m_pGameLayer;
+		int GameLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pGLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
+
+		if(Result != TILE_TELECHECKIN && Result != TILE_TELECHECKINEVIL)
 		{
-		case 4:
-			Result = TILE_THROUGH_CUT;
-			break;
-		case 5:
-			Result = TILE_FREEZE;
-			break;
-		case 6:
-			Result = TILE_UNFREEZE;
-			break;
-		case 7:
-			Result = TILE_DFREEZE;
-			break;
-		case 8:
-			Result = TILE_DUNFREEZE;
-			break;
-		case 9:
-			Result = TILE_TELECHECKIN;
-			break;
-		case 10:
-			Result = TILE_TELECHECKINEVIL;
-			break;
-		case 11:
-			Result = TILE_LFREEZE;
-			break;
-		case 12:
-			Result = TILE_LUNFREEZE;
-			break;
-		default:
-			break;
+			if(pGLayer->m_Width < m_Width + OffsetX || pGLayer->m_Height < m_Height + OffsetY)
+			{
+				std::map<int, std::shared_ptr<CLayer>> savedLayers;
+				savedLayers[LAYERTYPE_TILES] = pGLayer->Duplicate();
+				savedLayers[LAYERTYPE_GAME] = savedLayers[LAYERTYPE_TILES];
+
+				int PrevW = pGLayer->m_Width;
+				int PrevH = pGLayer->m_Height;
+				const int NewW = pGLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pGLayer->m_Width;
+				const int NewH = pGLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pGLayer->m_Height;
+				pGLayer->Resize(NewW, NewH);
+				vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
+				const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action1 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+				vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+				const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action2 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+
+				Action1->SetSavedLayers(savedLayers);
+				Action2->SetSavedLayers(savedLayers);
+			}
+
+			int Changes = 0;
+			for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
+			{
+				for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
+				{
+					if(GetTile(x, y).m_Index)
+					{
+						const CTile ResultTile = {(unsigned char)Result};
+						pGLayer->SetTile(x + OffsetX, y + OffsetY, ResultTile);
+						Changes++;
+					}
+				}
+			}
+
+			vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
+			char aDisplay[256];
+			str_format(aDisplay, sizeof(aDisplay), "Construct '%s' game tiles (x%d)", g_apGametileOpNames[(int)Fill], Changes);
+			m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
 		}
-		if(Result > -1)
+		else
 		{
-			const int OffsetX = -pGroup->m_OffsetX / 32;
-			const int OffsetY = -pGroup->m_OffsetY / 32;
-
-			static const char *s_apGametileOpNames[] = {
-				"Air",
-				"Hookable",
-				"Death",
-				"Unhookable",
-				"Hookthrough",
-				"Freeze",
-				"Unfreeze",
-				"Deep Freeze",
-				"Deep Unfreeze",
-				"Blue Check-Tele",
-				"Red Check-Tele",
-				"Live Freeze",
-				"Live Unfreeze",
-			};
+			if(!m_pEditor->m_Map.m_pTeleLayer)
+			{
+				std::shared_ptr<CLayerTele> pLayer = std::make_shared<CLayerTele>(m_pEditor, m_Width, m_Height);
+				m_pEditor->m_Map.MakeTeleLayer(pLayer);
+				m_pEditor->m_Map.m_pGameGroup->AddLayer(pLayer);
 
-			std::vector<std::shared_ptr<IEditorAction>> vpActions;
-			std::shared_ptr<CLayerTiles> pGLayer = m_pEditor->m_Map.m_pGameLayer;
-			int GameLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pGLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
+				vpActions.push_back(std::make_shared<CEditorActionAddLayer>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_Map.m_pGameGroup->m_vpLayers.size() - 1));
 
-			if(Result != TILE_TELECHECKIN && Result != TILE_TELECHECKINEVIL)
-			{
-				if(pGLayer->m_Width < m_Width + OffsetX || pGLayer->m_Height < m_Height + OffsetY)
+				if(m_Width != pGLayer->m_Width || m_Height > pGLayer->m_Height)
 				{
 					std::map<int, std::shared_ptr<CLayer>> savedLayers;
 					savedLayers[LAYERTYPE_TILES] = pGLayer->Duplicate();
 					savedLayers[LAYERTYPE_GAME] = savedLayers[LAYERTYPE_TILES];
 
+					int NewW = pGLayer->m_Width;
+					int NewH = pGLayer->m_Height;
+					if(m_Width > pGLayer->m_Width)
+					{
+						NewW = m_Width;
+					}
+					if(m_Height > pGLayer->m_Height)
+					{
+						NewH = m_Height;
+					}
+
 					int PrevW = pGLayer->m_Width;
 					int PrevH = pGLayer->m_Height;
-					const int NewW = pGLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pGLayer->m_Width;
-					const int NewH = pGLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pGLayer->m_Height;
-					pGLayer->Resize(NewW, NewH);
+					pLayer->Resize(NewW, NewH);
 					vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
 					const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action1 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
 					vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
@@ -780,124 +822,94 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 					Action1->SetSavedLayers(savedLayers);
 					Action2->SetSavedLayers(savedLayers);
 				}
+			}
 
-				int Changes = 0;
-				for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
-				{
-					for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
-					{
-						if(GetTile(x, y).m_Index)
-						{
-							const CTile ResultTile = {(unsigned char)Result};
-							pGLayer->SetTile(x + OffsetX, y + OffsetY, ResultTile);
-							Changes++;
-						}
-					}
-				}
+			std::shared_ptr<CLayerTele> pTLayer = m_pEditor->m_Map.m_pTeleLayer;
+			int TeleLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pTLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
 
-				vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
-				char aDisplay[256];
-				str_format(aDisplay, sizeof(aDisplay), "Construct '%s' game tiles (x%d)", s_apGametileOpNames[Result], Changes);
-				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
+			if(pTLayer->m_Width < m_Width + OffsetX || pTLayer->m_Height < m_Height + OffsetY)
+			{
+				std::map<int, std::shared_ptr<CLayer>> savedLayers;
+				savedLayers[LAYERTYPE_TILES] = pTLayer->Duplicate();
+				savedLayers[LAYERTYPE_TELE] = savedLayers[LAYERTYPE_TILES];
+
+				int PrevW = pTLayer->m_Width;
+				int PrevH = pTLayer->m_Height;
+				int NewW = pTLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pTLayer->m_Width;
+				int NewH = pTLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pTLayer->m_Height;
+				pTLayer->Resize(NewW, NewH);
+				std::shared_ptr<CEditorActionEditLayerTilesProp> Action1, Action2;
+				vpActions.push_back(Action1 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
+				vpActions.push_back(Action2 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+
+				Action1->SetSavedLayers(savedLayers);
+				Action2->SetSavedLayers(savedLayers);
 			}
-			else
+
+			int Changes = 0;
+			for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
 			{
-				if(!m_pEditor->m_Map.m_pTeleLayer)
+				for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
 				{
-					std::shared_ptr<CLayerTele> pLayer = std::make_shared<CLayerTele>(m_pEditor, m_Width, m_Height);
-					m_pEditor->m_Map.MakeTeleLayer(pLayer);
-					m_pEditor->m_Map.m_pGameGroup->AddLayer(pLayer);
-
-					vpActions.push_back(std::make_shared<CEditorActionAddLayer>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_Map.m_pGameGroup->m_vpLayers.size() - 1));
-
-					if(m_Width != pGLayer->m_Width || m_Height > pGLayer->m_Height)
+					if(GetTile(x, y).m_Index)
 					{
-						std::map<int, std::shared_ptr<CLayer>> savedLayers;
-						savedLayers[LAYERTYPE_TILES] = pGLayer->Duplicate();
-						savedLayers[LAYERTYPE_GAME] = savedLayers[LAYERTYPE_TILES];
-
-						int NewW = pGLayer->m_Width;
-						int NewH = pGLayer->m_Height;
-						if(m_Width > pGLayer->m_Width)
-						{
-							NewW = m_Width;
-						}
-						if(m_Height > pGLayer->m_Height)
-						{
-							NewH = m_Height;
-						}
-
-						int PrevW = pGLayer->m_Width;
-						int PrevH = pGLayer->m_Height;
-						pLayer->Resize(NewW, NewH);
-						vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
-						const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action1 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
-						vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
-						const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action2 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
-
-						Action1->SetSavedLayers(savedLayers);
-						Action2->SetSavedLayers(savedLayers);
-					}
-				}
+						auto TileIndex = (y + OffsetY) * pTLayer->m_Width + x + OffsetX;
+						Changes++;
 
-				std::shared_ptr<CLayerTele> pTLayer = m_pEditor->m_Map.m_pTeleLayer;
-				int TeleLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pTLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
+						STeleTileStateChange::SData Previous{
+							pTLayer->m_pTeleTile[TileIndex].m_Number,
+							pTLayer->m_pTeleTile[TileIndex].m_Type,
+							pTLayer->m_pTiles[TileIndex].m_Index};
 
-				if(pTLayer->m_Width < m_Width + OffsetX || pTLayer->m_Height < m_Height + OffsetY)
-				{
-					std::map<int, std::shared_ptr<CLayer>> savedLayers;
-					savedLayers[LAYERTYPE_TILES] = pTLayer->Duplicate();
-					savedLayers[LAYERTYPE_TELE] = savedLayers[LAYERTYPE_TILES];
-
-					int PrevW = pTLayer->m_Width;
-					int PrevH = pTLayer->m_Height;
-					int NewW = pTLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pTLayer->m_Width;
-					int NewH = pTLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pTLayer->m_Height;
-					pTLayer->Resize(NewW, NewH);
-					std::shared_ptr<CEditorActionEditLayerTilesProp> Action1, Action2;
-					vpActions.push_back(Action1 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
-					vpActions.push_back(Action2 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+						pTLayer->m_pTiles[TileIndex].m_Index = TILE_AIR + Result;
+						pTLayer->m_pTeleTile[TileIndex].m_Number = 1;
+						pTLayer->m_pTeleTile[TileIndex].m_Type = TILE_AIR + Result;
 
-					Action1->SetSavedLayers(savedLayers);
-					Action2->SetSavedLayers(savedLayers);
-				}
+						STeleTileStateChange::SData Current{
+							pTLayer->m_pTeleTile[TileIndex].m_Number,
+							pTLayer->m_pTeleTile[TileIndex].m_Type,
+							pTLayer->m_pTiles[TileIndex].m_Index};
 
-				int Changes = 0;
-				for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
-				{
-					for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
-					{
-						if(GetTile(x, y).m_Index)
-						{
-							auto TileIndex = (y + OffsetY) * pTLayer->m_Width + x + OffsetX;
-							Changes++;
-
-							STeleTileStateChange::SData Previous{
-								pTLayer->m_pTeleTile[TileIndex].m_Number,
-								pTLayer->m_pTeleTile[TileIndex].m_Type,
-								pTLayer->m_pTiles[TileIndex].m_Index};
-
-							pTLayer->m_pTiles[TileIndex].m_Index = TILE_AIR + Result;
-							pTLayer->m_pTeleTile[TileIndex].m_Number = 1;
-							pTLayer->m_pTeleTile[TileIndex].m_Type = TILE_AIR + Result;
-
-							STeleTileStateChange::SData Current{
-								pTLayer->m_pTeleTile[TileIndex].m_Number,
-								pTLayer->m_pTeleTile[TileIndex].m_Type,
-								pTLayer->m_pTiles[TileIndex].m_Index};
-
-							pTLayer->RecordStateChange(x, y, Previous, Current);
-						}
+						pTLayer->RecordStateChange(x, y, Previous, Current);
 					}
 				}
-
-				vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
-				char aDisplay[256];
-				str_format(aDisplay, sizeof(aDisplay), "Construct 'tele' game tiles (x%d)", Changes);
-				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
 			}
+
+			vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
+			char aDisplay[256];
+			str_format(aDisplay, sizeof(aDisplay), "Construct 'tele' game tiles (x%d)", Changes);
+			m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
 		}
 	}
+}
+
+bool CLayerTiles::CanFillGameTiles() const
+{
+	const bool EntitiesLayer = IsEntitiesLayer();
+	if(EntitiesLayer)
+		return false;
+
+	std::shared_ptr<CLayerGroup> pGroup = m_pEditor->m_Map.m_vpGroups[m_pEditor->m_SelectedGroup];
+
+	// Game tiles can only be constructed if the layer is relative to the game layer
+	return !(pGroup->m_OffsetX % 32) && !(pGroup->m_OffsetY % 32) && pGroup->m_ParallaxX == 100 && pGroup->m_ParallaxY == 100;
+}
+
+CUi::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
+{
+	CUIRect Button;
+
+	const bool EntitiesLayer = IsEntitiesLayer();
+
+	if(CanFillGameTiles())
+	{
+		pToolBox->HSplitBottom(12.0f, pToolBox, &Button);
+		static int s_GameTilesButton = 0;
+		if(m_pEditor->DoButton_Editor(&s_GameTilesButton, "Game tiles", 0, &Button, 0, "Constructs game tiles from this layer"))
+			m_pEditor->PopupSelectGametileOpInvoke(m_pEditor->Ui()->MouseX(), m_pEditor->Ui()->MouseY());
+		const int Selected = m_pEditor->PopupSelectGameTileOpResult();
+		FillGameTiles((EGameTileOp)Selected);
+	}
 
 	if(m_pEditor->m_Map.m_pGameLayer.get() != this)
 	{
@@ -918,7 +930,7 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 					if(!m_TilesHistory.empty()) // Sometimes pressing that button causes the automap to run so we should be able to undo that
 					{
 						// record undo
-						m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAutoMap>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_TilesHistory));
+						m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileChanges>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], "Auto map", m_TilesHistory));
 						ClearHistory();
 					}
 				}
@@ -929,9 +941,9 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 			{
 				m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.Proceed(this, m_AutoMapperConfig, m_Seed);
 				// record undo
-				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAutoMap>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_TilesHistory));
+				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileChanges>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], "Auto map", m_TilesHistory));
 				ClearHistory();
-				return CUI::POPUP_CLOSE_CURRENT;
+				return CUi::POPUP_CLOSE_CURRENT;
 			}
 		}
 	}
@@ -939,16 +951,16 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 	int Color = PackColor(m_Color);
 
 	CProperty aProps[] = {
-		{"Width", m_Width, PROPTYPE_INT_SCROLL, 1, 100000},
-		{"Height", m_Height, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Width", m_Width, PROPTYPE_INT, 1, 100000},
+		{"Height", m_Height, PROPTYPE_INT, 1, 100000},
 		{"Shift", 0, PROPTYPE_SHIFT, 0, 0},
-		{"Shift by", m_pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Shift by", m_pEditor->m_ShiftBy, PROPTYPE_INT, 1, 100000},
 		{"Image", m_Image, PROPTYPE_IMAGE, 0, 0},
 		{"Color", Color, PROPTYPE_COLOR, 0, 0},
 		{"Color Env", m_ColorEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
-		{"Color TO", m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Color TO", m_ColorEnvOffset, PROPTYPE_INT, -1000000, 1000000},
 		{"Auto Rule", m_AutoMapperConfig, PROPTYPE_AUTOMAPPER, m_Image, 0},
-		{"Seed", m_Seed, PROPTYPE_INT_SCROLL, 0, 1000000000},
+		{"Seed", m_Seed, PROPTYPE_INT, 0, 1000000000},
 		{nullptr},
 	};
 
@@ -970,6 +982,7 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 
 	static CLayerTilesPropTracker s_Tracker(m_pEditor);
 	s_Tracker.Begin(this, Prop, State);
+	m_pEditor->m_EditorHistory.BeginBulk();
 
 	if(Prop == ETilesProp::PROP_WIDTH && NewVal > 1)
 	{
@@ -1058,17 +1071,30 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
 			m_AutoMapperConfig = -1;
 	}
 
-	if(Prop != ETilesProp::PROP_NONE && Prop != ETilesProp::PROP_SHIFT_BY)
+	s_Tracker.End(Prop, State);
+
+	// Check if modified property could have an effect on automapper
+	if((State == EEditState::END || State == EEditState::ONE_GO) && HasAutomapEffect(Prop))
 	{
 		FlagModified(0, 0, m_Width, m_Height);
+
+		// Record undo if automapper was ran
+		if(m_AutoAutoMap && !m_TilesHistory.empty())
+		{
+			m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileChanges>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], "Auto map", m_TilesHistory));
+			ClearHistory();
+		}
 	}
 
-	s_Tracker.End(Prop, State);
+	// End undo bulk, taking the first action display as the displayed text in the history
+	// This is usually the resulting text of the edit layer tiles prop action
+	// Since we may also squeeze a tile changes action, we want both to appear as one, thus using a bulk
+	m_pEditor->m_EditorHistory.EndBulk(0);
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CLayerTiles::RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices)
+CUi::EPopupMenuFunctionResult CLayerTiles::RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices)
 {
 	if(State.m_Modified)
 	{
@@ -1169,16 +1195,16 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderCommonProperties(SCommonPropSta
 		pEditor->TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
 		SLabelProperties Props;
 		Props.m_MaxWidth = Warning.w;
-		pEditor->UI()->DoLabel(&Warning, "Editing multiple layers", 9.0f, TEXTALIGN_ML, Props);
+		pEditor->Ui()->DoLabel(&Warning, "Editing multiple layers", 9.0f, TEXTALIGN_ML, Props);
 		pEditor->TextRender()->TextColor(ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f));
 		pToolbox->HSplitTop(2.0f, nullptr, pToolbox);
 	}
 
 	CProperty aProps[] = {
-		{"Width", State.m_Width, PROPTYPE_INT_SCROLL, 1, 100000},
-		{"Height", State.m_Height, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Width", State.m_Width, PROPTYPE_INT, 1, 100000},
+		{"Height", State.m_Height, PROPTYPE_INT, 1, 100000},
 		{"Shift", 0, PROPTYPE_SHIFT, 0, 0},
-		{"Shift by", pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Shift by", pEditor->m_ShiftBy, PROPTYPE_INT, 1, 100000},
 		{"Color", State.m_Color, PROPTYPE_COLOR, 0, 0},
 		{nullptr},
 	};
@@ -1229,16 +1255,19 @@ CUI::EPopupMenuFunctionResult CLayerTiles::RenderCommonProperties(SCommonPropSta
 
 	s_Tracker.End(Prop, PropState);
 
-	if(Prop == ETilesCommonProp::PROP_WIDTH || Prop == ETilesCommonProp::PROP_HEIGHT)
-	{
-		State.m_Modified |= SCommonPropState::MODIFIED_SIZE;
-	}
-	else if(Prop == ETilesCommonProp::PROP_COLOR)
+	if(PropState == EEditState::END || PropState == EEditState::ONE_GO)
 	{
-		State.m_Modified |= SCommonPropState::MODIFIED_COLOR;
+		if(Prop == ETilesCommonProp::PROP_WIDTH || Prop == ETilesCommonProp::PROP_HEIGHT)
+		{
+			State.m_Modified |= SCommonPropState::MODIFIED_SIZE;
+		}
+		else if(Prop == ETilesCommonProp::PROP_COLOR)
+		{
+			State.m_Modified |= SCommonPropState::MODIFIED_COLOR;
+		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CLayerTiles::FlagModified(int x, int y, int w, int h)
@@ -1259,3 +1288,30 @@ void CLayerTiles::ModifyEnvelopeIndex(FIndexModifyFunction Func)
 {
 	Func(&m_ColorEnv);
 }
+
+void CLayerTiles::ShowPreventUnusedTilesWarning()
+{
+	if(!m_pEditor->m_PreventUnusedTilesWasWarned)
+	{
+		m_pEditor->m_PopupEventType = CEditor::POPEVENT_PREVENTUNUSEDTILES;
+		m_pEditor->m_PopupEventActivated = true;
+		m_pEditor->m_PreventUnusedTilesWasWarned = true;
+	}
+}
+
+bool CLayerTiles::HasAutomapEffect(ETilesProp Prop)
+{
+	switch(Prop)
+	{
+	case ETilesProp::PROP_WIDTH:
+	case ETilesProp::PROP_HEIGHT:
+	case ETilesProp::PROP_SHIFT:
+	case ETilesProp::PROP_IMAGE:
+	case ETilesProp::PROP_AUTOMAPPER:
+	case ETilesProp::PROP_SEED:
+		return true;
+	default:
+		return false;
+	}
+	return false;
+}
diff --git a/src/game/editor/mapitems/layer_tiles.h b/src/game/editor/mapitems/layer_tiles.h
index ca8e84e889..b6ca148d7e 100644
--- a/src/game/editor/mapitems/layer_tiles.h
+++ b/src/game/editor/mapitems/layer_tiles.h
@@ -2,6 +2,7 @@
 #define GAME_EDITOR_MAPITEMS_LAYER_TILES_H
 
 #include <game/editor/editor_trackers.h>
+#include <game/editor/enums.h>
 #include <map>
 
 #include "layer.h"
@@ -122,7 +123,9 @@ class CLayerTiles : public CLayer
 	void BrushSelecting(CUIRect Rect) override;
 	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
 	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
-	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void FillGameTiles(EGameTileOp Fill);
+	bool CanFillGameTiles() const;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
@@ -131,7 +134,7 @@ class CLayerTiles : public CLayer
 	const char *TypeName() const override;
 
 	virtual void ShowInfo();
-	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+	CUi::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
 
 	struct SCommonPropState
 	{
@@ -145,7 +148,7 @@ class CLayerTiles : public CLayer
 		int m_Height = -1;
 		int m_Color = 0;
 	};
-	static CUI::EPopupMenuFunctionResult RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices);
+	static CUi::EPopupMenuFunctionResult RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices);
 
 	void ModifyImageIndex(FIndexModifyFunction pfnFunc) override;
 	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
@@ -185,9 +188,13 @@ class CLayerTiles : public CLayer
 	EditorTileStateChangeHistory<STileStateChange> m_TilesHistory;
 	inline virtual void ClearHistory() { m_TilesHistory.clear(); }
 
+	static bool HasAutomapEffect(ETilesProp Prop);
+
 protected:
 	void RecordStateChange(int x, int y, CTile Previous, CTile Tile);
 
+	void ShowPreventUnusedTilesWarning();
+
 	friend class CAutoMapper;
 };
 
diff --git a/src/game/editor/mapitems/layer_tune.cpp b/src/game/editor/mapitems/layer_tune.cpp
index 0a41fcc7b2..a417599221 100644
--- a/src/game/editor/mapitems/layer_tune.cpp
+++ b/src/game/editor/mapitems/layer_tune.cpp
@@ -65,14 +65,14 @@ bool CLayerTune::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
 	return true;
 }
 
-void CLayerTune::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+void CLayerTune::BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos)
 {
 	if(m_Readonly)
 		return;
 
 	std::shared_ptr<CLayerTune> pTuneLayer = std::static_pointer_cast<CLayerTune>(pBrush);
-	int sx = ConvertX(wx);
-	int sy = ConvertY(wy);
+	int sx = ConvertX(WorldPos.x);
+	int sy = ConvertY(WorldPos.y);
 	if(str_comp(pTuneLayer->m_aFileName, m_pEditor->m_aFileName))
 	{
 		m_pEditor->m_TuningNum = pTuneLayer->m_TuningNumber;
@@ -127,6 +127,9 @@ void CLayerTune::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
 				m_pTuneTile[Index].m_Number = 0;
 				m_pTuneTile[Index].m_Type = 0;
 				m_pTiles[Index].m_Index = 0;
+
+				if(pTuneLayer->m_pTiles[y * pTuneLayer->m_Width + x].m_Index != TILE_AIR)
+					ShowPreventUnusedTilesWarning();
 			}
 
 			STuneTileStateChange::SData Current{
@@ -235,6 +238,9 @@ void CLayerTune::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRe
 				m_pTiles[TgtIndex].m_Index = 0;
 				m_pTuneTile[TgtIndex].m_Type = 0;
 				m_pTuneTile[TgtIndex].m_Number = 0;
+
+				if(!Empty)
+					ShowPreventUnusedTilesWarning();
 			}
 			else
 			{
diff --git a/src/game/editor/mapitems/layer_tune.h b/src/game/editor/mapitems/layer_tune.h
index cf35b95693..6ea607d8dc 100644
--- a/src/game/editor/mapitems/layer_tune.h
+++ b/src/game/editor/mapitems/layer_tune.h
@@ -27,7 +27,7 @@ class CLayerTune : public CLayerTiles
 	void Resize(int NewW, int NewH) override;
 	void Shift(int Direction) override;
 	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
-	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, vec2 WorldPos) override;
 	void BrushFlipX() override;
 	void BrushFlipY() override;
 	void BrushRotate(float Amount) override;
diff --git a/src/game/editor/mapitems/map_io.cpp b/src/game/editor/mapitems/map_io.cpp
index 30a88ee40e..30f85c6764 100644
--- a/src/game/editor/mapitems/map_io.cpp
+++ b/src/game/editor/mapitems/map_io.cpp
@@ -2,6 +2,7 @@
 
 #include <engine/client.h>
 #include <engine/console.h>
+#include <engine/gfx/image_manipulation.h>
 #include <engine/graphics.h>
 #include <engine/serverbrowser.h>
 #include <engine/shared/datafile.h>
@@ -33,18 +34,25 @@ struct CSoundSource_DEPRECATED
 	int m_SoundEnvOffset;
 };
 
-bool CEditorMap::Save(const char *pFileName)
+bool CEditorMap::Save(const char *pFileName, const std::function<void(const char *pErrorMessage)> &ErrorHandler)
 {
 	char aFileNameTmp[IO_MAX_PATH_LENGTH];
-	str_format(aFileNameTmp, sizeof(aFileNameTmp), "%s.%d.tmp", pFileName, pid());
+	IStorage::FormatTmpPath(aFileNameTmp, sizeof(aFileNameTmp), pFileName);
+
 	char aBuf[IO_MAX_PATH_LENGTH + 64];
 	str_format(aBuf, sizeof(aBuf), "saving to '%s'...", aFileNameTmp);
 	m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
+
+	if(!PerformPreSaveSanityChecks(ErrorHandler))
+	{
+		return false;
+	}
+
 	CDataFileWriter Writer;
 	if(!Writer.Open(m_pEditor->Storage(), aFileNameTmp))
 	{
-		str_format(aBuf, sizeof(aBuf), "failed to open file '%s'...", aFileNameTmp);
-		m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
+		str_format(aBuf, sizeof(aBuf), "Error: Failed to open file '%s' for writing.", aFileNameTmp);
+		ErrorHandler(aBuf);
 		return false;
 	}
 
@@ -110,27 +118,8 @@ bool CEditorMap::Save(const char *pFileName)
 		}
 		else
 		{
-			const size_t PixelSize = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
-			const size_t DataSize = (size_t)Item.m_Width * Item.m_Height * PixelSize;
-			if(pImg->m_Format == CImageInfo::FORMAT_RGB)
-			{
-				// Convert to RGBA
-				unsigned char *pDataRGBA = (unsigned char *)malloc(DataSize);
-				unsigned char *pDataRGB = (unsigned char *)pImg->m_pData;
-				for(int j = 0; j < Item.m_Width * Item.m_Height; j++)
-				{
-					pDataRGBA[j * PixelSize] = pDataRGB[j * 3];
-					pDataRGBA[j * PixelSize + 1] = pDataRGB[j * 3 + 1];
-					pDataRGBA[j * PixelSize + 2] = pDataRGB[j * 3 + 2];
-					pDataRGBA[j * PixelSize + 3] = 255;
-				}
-				Item.m_ImageData = Writer.AddData(DataSize, pDataRGBA);
-				free(pDataRGBA);
-			}
-			else
-			{
-				Item.m_ImageData = Writer.AddData(DataSize, pImg->m_pData);
-			}
+			dbg_assert(pImg->m_Format == CImageInfo::FORMAT_RGBA, "Embedded images must be in RGBA format");
+			Item.m_ImageData = Writer.AddData(pImg->DataSize(), pImg->m_pData);
 		}
 		Writer.AddItem(MAPITEMTYPE_IMAGE, i, sizeof(Item), &Item);
 	}
@@ -146,6 +135,7 @@ bool CEditorMap::Save(const char *pFileName)
 		Item.m_External = 0;
 		Item.m_SoundName = Writer.AddDataString(pSound->m_aName);
 		Item.m_SoundData = Writer.AddData(pSound->m_DataSize, pSound->m_pData);
+		// Value is not read in new versions, but we still need to write it for compatibility with old versions.
 		Item.m_SoundDataSize = pSound->m_DataSize;
 
 		Writer.AddItem(MAPITEMTYPE_SOUND, i, sizeof(Item), &Item);
@@ -172,7 +162,7 @@ bool CEditorMap::Save(const char *pFileName)
 		GItem.m_NumLayers = 0;
 
 		// save group name
-		StrToInts(GItem.m_aName, sizeof(GItem.m_aName) / sizeof(int), pGroup->m_aName);
+		StrToInts(GItem.m_aName, std::size(GItem.m_aName), pGroup->m_aName);
 
 		for(const std::shared_ptr<CLayer> &pLayer : pGroup->m_vpLayers)
 		{
@@ -241,8 +231,9 @@ bool CEditorMap::Save(const char *pFileName)
 					Item.m_Data = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile), pLayerTiles->m_pTiles);
 
 				// save layer name
-				StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerTiles->m_aName);
+				StrToInts(Item.m_aName, std::size(Item.m_aName), pLayerTiles->m_aName);
 
+				// save item
 				Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
 
 				// save auto mapper of each tile layer (not physics layer)
@@ -261,61 +252,75 @@ bool CEditorMap::Save(const char *pFileName)
 					Writer.AddItem(MAPITEMTYPE_AUTOMAPPER_CONFIG, AutomapperCount, sizeof(ItemAutomapper), &ItemAutomapper);
 					AutomapperCount++;
 				}
-
-				GItem.m_NumLayers++;
-				LayerCount++;
 			}
 			else if(pLayer->m_Type == LAYERTYPE_QUADS)
 			{
 				m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving quads layer");
 				std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(pLayer);
+				CMapItemLayerQuads Item;
+				Item.m_Version = 2;
+				Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
+				Item.m_Layer.m_Flags = pLayerQuads->m_Flags;
+				Item.m_Layer.m_Type = pLayerQuads->m_Type;
+				Item.m_Image = pLayerQuads->m_Image;
+
+				Item.m_NumQuads = 0;
+				Item.m_Data = -1;
 				if(!pLayerQuads->m_vQuads.empty())
 				{
-					CMapItemLayerQuads Item;
-					Item.m_Version = 2;
-					Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
-					Item.m_Layer.m_Flags = pLayerQuads->m_Flags;
-					Item.m_Layer.m_Type = pLayerQuads->m_Type;
-					Item.m_Image = pLayerQuads->m_Image;
-
 					// add the data
 					Item.m_NumQuads = pLayerQuads->m_vQuads.size();
 					Item.m_Data = Writer.AddDataSwapped(pLayerQuads->m_vQuads.size() * sizeof(CQuad), pLayerQuads->m_vQuads.data());
+				}
+				else
+				{
+					// add dummy data for backwards compatibility
+					// this allows the layer to be loaded with an empty array since m_NumQuads is 0 while saving
+					CQuad Dummy{};
+					Item.m_Data = Writer.AddDataSwapped(sizeof(CQuad), &Dummy);
+				}
 
-					// save layer name
-					StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerQuads->m_aName);
-
-					Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
+				// save layer name
+				StrToInts(Item.m_aName, std::size(Item.m_aName), pLayerQuads->m_aName);
 
-					GItem.m_NumLayers++;
-					LayerCount++;
-				}
+				// save item
+				Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
 			}
 			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
 			{
 				m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving sounds layer");
 				std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(pLayer);
+				CMapItemLayerSounds Item;
+				Item.m_Version = CMapItemLayerSounds::CURRENT_VERSION;
+				Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
+				Item.m_Layer.m_Flags = pLayerSounds->m_Flags;
+				Item.m_Layer.m_Type = pLayerSounds->m_Type;
+				Item.m_Sound = pLayerSounds->m_Sound;
+
+				Item.m_NumSources = 0;
 				if(!pLayerSounds->m_vSources.empty())
 				{
-					CMapItemLayerSounds Item;
-					Item.m_Version = CMapItemLayerSounds::CURRENT_VERSION;
-					Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
-					Item.m_Layer.m_Flags = pLayerSounds->m_Flags;
-					Item.m_Layer.m_Type = pLayerSounds->m_Type;
-					Item.m_Sound = pLayerSounds->m_Sound;
-
 					// add the data
 					Item.m_NumSources = pLayerSounds->m_vSources.size();
 					Item.m_Data = Writer.AddDataSwapped(pLayerSounds->m_vSources.size() * sizeof(CSoundSource), pLayerSounds->m_vSources.data());
+				}
+				else
+				{
+					// add dummy data for backwards compatibility
+					// this allows the layer to be loaded with an empty array since m_NumSources is 0 while saving
+					CSoundSource Dummy{};
+					Item.m_Data = Writer.AddDataSwapped(sizeof(CSoundSource), &Dummy);
+				}
 
-					// save layer name
-					StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerSounds->m_aName);
+				// save layer name
+				StrToInts(Item.m_aName, std::size(Item.m_aName), pLayerSounds->m_aName);
 
-					Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
-					GItem.m_NumLayers++;
-					LayerCount++;
-				}
+				// save item
+				Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
 			}
+
+			GItem.m_NumLayers++;
+			LayerCount++;
 		}
 
 		Writer.AddItem(MAPITEMTYPE_GROUP, GroupCount, sizeof(GItem), &GItem);
@@ -333,7 +338,7 @@ bool CEditorMap::Save(const char *pFileName)
 		Item.m_StartPoint = PointCount;
 		Item.m_NumPoints = m_vpEnvelopes[e]->m_vPoints.size();
 		Item.m_Synchronized = m_vpEnvelopes[e]->m_Synchronized;
-		StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), m_vpEnvelopes[e]->m_aName);
+		StrToInts(Item.m_aName, std::size(Item.m_aName), m_vpEnvelopes[e]->m_aName);
 
 		Writer.AddItem(MAPITEMTYPE_ENVELOPE, e, sizeof(Item), &Item);
 		PointCount += Item.m_NumPoints;
@@ -403,11 +408,42 @@ bool CEditorMap::Save(const char *pFileName)
 	return true;
 }
 
+bool CEditorMap::PerformPreSaveSanityChecks(const std::function<void(const char *pErrorMessage)> &ErrorHandler)
+{
+	bool Success = true;
+	char aErrorMessage[256];
+
+	for(const std::shared_ptr<CEditorImage> &pImage : m_vpImages)
+	{
+		if(!pImage->m_External && pImage->m_pData == nullptr)
+		{
+			str_format(aErrorMessage, sizeof(aErrorMessage), "Error: Saving is not possible because the image '%s' could not be loaded. Remove or replace this image.", pImage->m_aName);
+			ErrorHandler(aErrorMessage);
+			Success = false;
+		}
+	}
+
+	for(const std::shared_ptr<CEditorSound> &pSound : m_vpSounds)
+	{
+		if(pSound->m_pData == nullptr)
+		{
+			str_format(aErrorMessage, sizeof(aErrorMessage), "Error: Saving is not possible because the sound '%s' could not be loaded. Remove or replace this sound.", pSound->m_aName);
+			ErrorHandler(aErrorMessage);
+			Success = false;
+		}
+	}
+
+	return Success;
+}
+
 bool CEditorMap::Load(const char *pFileName, int StorageType, const std::function<void(const char *pErrorMessage)> &ErrorHandler)
 {
 	CDataFileReader DataFile;
 	if(!DataFile.Open(m_pEditor->Storage(), pFileName, StorageType))
+	{
+		ErrorHandler("Error: Failed to open map file. See local console for details.");
 		return false;
+	}
 
 	// check version
 	const CMapItemVersion *pItemVersion = static_cast<CMapItemVersion *>(DataFile.FindItem(MAPITEMTYPE_VERSION, 0));
@@ -426,9 +462,9 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 		for(int i = Start; i < Start + Num; i++)
 		{
 			int ItemSize = DataFile.GetItemSize(Start);
-			int ItemID;
-			CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)DataFile.GetItem(i, nullptr, &ItemID);
-			if(!pItem || ItemID != 0)
+			int ItemId;
+			CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)DataFile.GetItem(i, nullptr, &ItemId);
+			if(!pItem || ItemId != 0)
 				continue;
 
 			const auto &&ReadStringInfo = [&](int Index, char *pBuffer, size_t BufferSize, const char *pErrorContext) {
@@ -491,43 +527,55 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 			else
 				str_copy(pImg->m_aName, pName);
 
-			const CImageInfo::EImageFormat Format = pItem->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : CImageInfo::ImageFormatFromInt(pItem->m_Format);
-			if(pImg->m_External || (Format != CImageInfo::FORMAT_RGB && Format != CImageInfo::FORMAT_RGBA))
+			if(pItem->m_Version > 1 && pItem->m_MustBe1 != 1)
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "Error: Unsupported image type of image %d '%s'.", i, pImg->m_aName);
+				ErrorHandler(aBuf);
+			}
+
+			if(pImg->m_External || (pItem->m_Version > 1 && pItem->m_MustBe1 != 1))
 			{
 				char aBuf[IO_MAX_PATH_LENGTH];
 				str_format(aBuf, sizeof(aBuf), "mapres/%s.png", pImg->m_aName);
 
 				// load external
 				CImageInfo ImgInfo;
-				if(m_pEditor->Graphics()->LoadPNG(&ImgInfo, aBuf, IStorage::TYPE_ALL))
+				if(m_pEditor->Graphics()->LoadPng(ImgInfo, aBuf, IStorage::TYPE_ALL))
 				{
 					pImg->m_Width = ImgInfo.m_Width;
 					pImg->m_Height = ImgInfo.m_Height;
 					pImg->m_Format = ImgInfo.m_Format;
 					pImg->m_pData = ImgInfo.m_pData;
+					ConvertToRgba(*pImg);
+
 					int TextureLoadFlag = m_pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
-					if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+					if(pImg->m_Width % 16 != 0 || pImg->m_Height % 16 != 0)
 						TextureLoadFlag = 0;
-					pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, aBuf);
-					ImgInfo.m_pData = nullptr;
 					pImg->m_External = 1;
+					pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(*pImg, TextureLoadFlag, aBuf);
+				}
+				else
+				{
+					str_format(aBuf, sizeof(aBuf), "Error: Failed to load external image '%s'.", pImg->m_aName);
+					ErrorHandler(aBuf);
 				}
 			}
 			else
 			{
 				pImg->m_Width = pItem->m_Width;
 				pImg->m_Height = pItem->m_Height;
-				pImg->m_Format = Format;
+				pImg->m_Format = CImageInfo::FORMAT_RGBA;
 
 				// copy image data
 				void *pData = DataFile.GetData(pItem->m_ImageData);
-				const size_t DataSize = (size_t)pImg->m_Width * pImg->m_Height * CImageInfo::PixelSize(Format);
-				pImg->m_pData = malloc(DataSize);
+				const size_t DataSize = pImg->DataSize();
+				pImg->m_pData = static_cast<uint8_t *>(malloc(DataSize));
 				mem_copy(pImg->m_pData, pData, DataSize);
 				int TextureLoadFlag = m_pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
 				if(pImg->m_Width % 16 != 0 || pImg->m_Height % 16 != 0)
 					TextureLoadFlag = 0;
-				pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(pImg->m_Width, pImg->m_Height, pImg->m_Format, pImg->m_pData, TextureLoadFlag);
+				pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(*pImg, TextureLoadFlag, pImg->m_aName);
 			}
 
 			// load auto mapper file
@@ -570,18 +618,21 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 				// load external
 				if(m_pEditor->Storage()->ReadFile(aBuf, IStorage::TYPE_ALL, &pSound->m_pData, &pSound->m_DataSize))
 				{
-					pSound->m_SoundID = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
+					pSound->m_SoundId = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
+				}
+				else
+				{
+					str_format(aBuf, sizeof(aBuf), "Error: Failed to load external sound '%s'.", pSound->m_aName);
+					ErrorHandler(aBuf);
 				}
 			}
 			else
 			{
-				pSound->m_DataSize = pItem->m_SoundDataSize;
-
-				// copy sample data
+				pSound->m_DataSize = DataFile.GetDataSize(pItem->m_SoundData);
 				void *pData = DataFile.GetData(pItem->m_SoundData);
 				pSound->m_pData = malloc(pSound->m_DataSize);
 				mem_copy(pSound->m_pData, pData, pSound->m_DataSize);
-				pSound->m_SoundID = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
+				pSound->m_SoundId = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
 			}
 
 			m_vpSounds.push_back(pSound);
@@ -624,7 +675,7 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 
 			// load group name
 			if(pGItem->m_Version >= 3)
-				IntsToStr(pGItem->m_aName, sizeof(pGroup->m_aName) / sizeof(int), pGroup->m_aName);
+				IntsToStr(pGItem->m_aName, std::size(pGItem->m_aName), pGroup->m_aName, std::size(pGroup->m_aName));
 
 			for(int l = 0; l < pGItem->m_NumLayers; l++)
 			{
@@ -700,7 +751,7 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 
 					// load layer name
 					if(pTilemapItem->m_Version >= 3)
-						IntsToStr(pTilemapItem->m_aName, sizeof(pTiles->m_aName) / sizeof(int), pTiles->m_aName);
+						IntsToStr(pTilemapItem->m_aName, std::size(pTilemapItem->m_aName), pTiles->m_aName, std::size(pTiles->m_aName));
 
 					if(pTiles->m_Tele)
 					{
@@ -826,13 +877,17 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 
 					// load layer name
 					if(pQuadsItem->m_Version >= 2)
-						IntsToStr(pQuadsItem->m_aName, sizeof(pQuads->m_aName) / sizeof(int), pQuads->m_aName);
+						IntsToStr(pQuadsItem->m_aName, std::size(pQuadsItem->m_aName), pQuads->m_aName, std::size(pQuads->m_aName));
+
+					if(pQuadsItem->m_NumQuads > 0)
+					{
+						void *pData = DataFile.GetDataSwapped(pQuadsItem->m_Data);
+						pQuads->m_vQuads.resize(pQuadsItem->m_NumQuads);
+						mem_copy(pQuads->m_vQuads.data(), pData, sizeof(CQuad) * pQuadsItem->m_NumQuads);
+						DataFile.UnloadData(pQuadsItem->m_Data);
+					}
 
-					void *pData = DataFile.GetDataSwapped(pQuadsItem->m_Data);
 					pGroup->AddLayer(pQuads);
-					pQuads->m_vQuads.resize(pQuadsItem->m_NumQuads);
-					mem_copy(pQuads->m_vQuads.data(), pData, sizeof(CQuad) * pQuadsItem->m_NumQuads);
-					DataFile.UnloadData(pQuadsItem->m_Data);
 				}
 				else if(pLayerItem->m_Type == LAYERTYPE_SOUNDS)
 				{
@@ -849,14 +904,18 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 						pSounds->m_Sound = -1;
 
 					// load layer name
-					IntsToStr(pSoundsItem->m_aName, sizeof(pSounds->m_aName) / sizeof(int), pSounds->m_aName);
+					IntsToStr(pSoundsItem->m_aName, std::size(pSoundsItem->m_aName), pSounds->m_aName, std::size(pSounds->m_aName));
 
 					// load data
-					void *pData = DataFile.GetDataSwapped(pSoundsItem->m_Data);
+					if(pSoundsItem->m_NumSources > 0)
+					{
+						void *pData = DataFile.GetDataSwapped(pSoundsItem->m_Data);
+						pSounds->m_vSources.resize(pSoundsItem->m_NumSources);
+						mem_copy(pSounds->m_vSources.data(), pData, sizeof(CSoundSource) * pSoundsItem->m_NumSources);
+						DataFile.UnloadData(pSoundsItem->m_Data);
+					}
+
 					pGroup->AddLayer(pSounds);
-					pSounds->m_vSources.resize(pSoundsItem->m_NumSources);
-					mem_copy(pSounds->m_vSources.data(), pData, sizeof(CSoundSource) * pSoundsItem->m_NumSources);
-					DataFile.UnloadData(pSoundsItem->m_Data);
 				}
 				else if(pLayerItem->m_Type == LAYERTYPE_SOUNDS_DEPRECATED)
 				{
@@ -874,7 +933,7 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 						pSounds->m_Sound = -1;
 
 					// load layer name
-					IntsToStr(pSoundsItem->m_aName, sizeof(pSounds->m_aName) / sizeof(int), pSounds->m_aName);
+					IntsToStr(pSoundsItem->m_aName, std::size(pSoundsItem->m_aName), pSounds->m_aName, std::size(pSounds->m_aName));
 
 					// load data
 					CSoundSource_DEPRECATED *pData = (CSoundSource_DEPRECATED *)DataFile.GetDataSwapped(pSoundsItem->m_Data);
@@ -916,7 +975,20 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 		for(int e = 0; e < EnvNum; e++)
 		{
 			CMapItemEnvelope *pItem = (CMapItemEnvelope *)DataFile.GetItem(EnvStart + e);
-			std::shared_ptr<CEnvelope> pEnv = std::make_shared<CEnvelope>(pItem->m_Channels);
+			int Channels = pItem->m_Channels;
+			if(Channels <= 0 || Channels == 2 || Channels > CEnvPoint::MAX_CHANNELS)
+			{
+				// Fall back to showing all channels if the number of channels is unsupported
+				Channels = CEnvPoint::MAX_CHANNELS;
+			}
+			if(Channels != pItem->m_Channels)
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "Error: Envelope %d had an invalid number of channels, %d, which was changed to %d.", e, pItem->m_Channels, Channels);
+				ErrorHandler(aBuf);
+			}
+
+			std::shared_ptr<CEnvelope> pEnv = std::make_shared<CEnvelope>(Channels);
 			pEnv->m_vPoints.resize(pItem->m_NumPoints);
 			for(int p = 0; p < pItem->m_NumPoints; p++)
 			{
@@ -928,7 +1000,7 @@ bool CEditorMap::Load(const char *pFileName, int StorageType, const std::functio
 					mem_copy(&pEnv->m_vPoints[p].m_Bezier, pPointBezier, sizeof(CEnvPointBezier));
 			}
 			if(pItem->m_aName[0] != -1) // compatibility with old maps
-				IntsToStr(pItem->m_aName, sizeof(pItem->m_aName) / sizeof(int), pEnv->m_aName);
+				IntsToStr(pItem->m_aName, std::size(pItem->m_aName), pEnv->m_aName, std::size(pEnv->m_aName));
 			m_vpEnvelopes.push_back(pEnv);
 			if(pItem->m_Version >= CMapItemEnvelope_v2::CURRENT_VERSION)
 				pEnv->m_Synchronized = pItem->m_Synchronized;
@@ -996,7 +1068,7 @@ void CEditorMap::PerformSanityChecks(const std::function<void(const char *pError
 						{
 							pLayerTiles->m_Image = -1;
 							char aBuf[IO_MAX_PATH_LENGTH + 128];
-							str_format(aBuf, sizeof(aBuf), "Error: The image '%s' (size %dx%d) has a width or height that is not divisible by 16 and therefore cannot be used for tile layers. The image of layer #%" PRIzu " '%s' in group #%" PRIzu " '%s' has been unset.", pImage->m_aName, pImage->m_Width, pImage->m_Height, LayerIndex, pLayer->m_aName, GroupIndex, pGroup->m_aName);
+							str_format(aBuf, sizeof(aBuf), "Error: The image '%s' (size %" PRIzu "x%" PRIzu ") has a width or height that is not divisible by 16 and therefore cannot be used for tile layers. The image of layer #%" PRIzu " '%s' in group #%" PRIzu " '%s' has been unset.", pImage->m_aName, pImage->m_Width, pImage->m_Height, LayerIndex, pLayer->m_aName, GroupIndex, pGroup->m_aName);
 							ErrorHandler(aBuf);
 						}
 					}
diff --git a/src/game/editor/mapitems/sound.cpp b/src/game/editor/mapitems/sound.cpp
index 6465f915b4..33b260091e 100644
--- a/src/game/editor/mapitems/sound.cpp
+++ b/src/game/editor/mapitems/sound.cpp
@@ -4,12 +4,12 @@
 
 CEditorSound::CEditorSound(CEditor *pEditor)
 {
-	Init(pEditor);
+	OnInit(pEditor);
 }
 
 CEditorSound::~CEditorSound()
 {
-	Sound()->UnloadSample(m_SoundID);
+	Sound()->UnloadSample(m_SoundId);
 	free(m_pData);
 	m_pData = nullptr;
 }
diff --git a/src/game/editor/mapitems/sound.h b/src/game/editor/mapitems/sound.h
index 28b222972c..360d545468 100644
--- a/src/game/editor/mapitems/sound.h
+++ b/src/game/editor/mapitems/sound.h
@@ -10,7 +10,7 @@ class CEditorSound : public CEditorComponent
 	explicit CEditorSound(CEditor *pEditor);
 	~CEditorSound();
 
-	int m_SoundID = 0;
+	int m_SoundId = -1;
 	char m_aName[IO_MAX_PATH_LENGTH] = "";
 
 	void *m_pData = nullptr;
diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
index e9bcb721c4..579954a5cc 100644
--- a/src/game/editor/popups.cpp
+++ b/src/game/editor/popups.cpp
@@ -9,6 +9,7 @@
 #include <engine/keys.h>
 #include <engine/shared/config.h>
 #include <engine/storage.h>
+#include <engine/textrender.h>
 #include <limits>
 
 #include <game/client/ui_scrollregion.h>
@@ -18,7 +19,9 @@
 #include "editor.h"
 #include "editor_actions.h"
 
-CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect View, bool Active)
+using namespace FontIcons;
+
+CUi::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -29,7 +32,6 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 	static int s_OpenButton = 0;
 	static int s_OpenCurrentMapButton = 0;
 	static int s_AppendButton = 0;
-	static int s_MapInfoButton = 0;
 	static int s_ExitButton = 0;
 
 	CUIRect Slot;
@@ -46,7 +48,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 			pEditor->Reset();
 			pEditor->m_aFileName[0] = 0;
 		}
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(10.0f, nullptr, &View);
@@ -60,23 +62,15 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 		}
 		else
 			pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", false, CEditor::CallbackOpenMap, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(2.0f, nullptr, &View);
 	View.HSplitTop(12.0f, &Slot, &View);
-	if(pEditor->DoButton_MenuItem(&s_OpenCurrentMapButton, "Load Current Map", 0, &Slot, 0, "Opens the current in game map for editing (ctrl+alt+l)"))
+	if(pEditor->DoButton_MenuItem(&s_OpenCurrentMapButton, pEditor->m_QuickActionLoadCurrentMap.Label(), 0, &Slot, 0, pEditor->m_QuickActionLoadCurrentMap.Description()))
 	{
-		if(pEditor->HasUnsavedData())
-		{
-			pEditor->m_PopupEventType = POPEVENT_LOADCURRENT;
-			pEditor->m_PopupEventActivated = true;
-		}
-		else
-		{
-			pEditor->LoadCurrentMap();
-		}
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionLoadCurrentMap.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(10.0f, nullptr, &View);
@@ -84,7 +78,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 	if(pEditor->DoButton_MenuItem(&s_AppendButton, "Append", 0, &Slot, 0, "Opens a map and adds everything from that map to the current one (ctrl+a)"))
 	{
 		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CEditor::CallbackAppendMap, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(10.0f, nullptr, &View);
@@ -99,15 +93,15 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 		}
 		else
 			pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", false, CEditor::CallbackSaveMap, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(2.0f, nullptr, &View);
 	View.HSplitTop(12.0f, &Slot, &View);
-	if(pEditor->DoButton_MenuItem(&s_SaveAsButton, "Save As", 0, &Slot, 0, "Saves the current map under a new name (ctrl+shift+s)"))
+	if(pEditor->DoButton_MenuItem(&s_SaveAsButton, pEditor->m_QuickActionSaveAs.Label(), 0, &Slot, 0, pEditor->m_QuickActionSaveAs.Description()))
 	{
-		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CEditor::CallbackSaveMap, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionSaveAs.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(2.0f, nullptr, &View);
@@ -115,21 +109,15 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 	if(pEditor->DoButton_MenuItem(&s_SaveCopyButton, "Save Copy", 0, &Slot, 0, "Saves a copy of the current map under a new name (ctrl+shift+alt+s)"))
 	{
 		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CEditor::CallbackSaveCopyMap, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(10.0f, nullptr, &View);
 	View.HSplitTop(12.0f, &Slot, &View);
-	if(pEditor->DoButton_MenuItem(&s_MapInfoButton, "Map details", 0, &Slot, 0, "Adjust the map details of the current map"))
+	if(pEditor->DoButton_MenuItem(&pEditor->m_QuickActionMapDetails, pEditor->m_QuickActionMapDetails.Label(), 0, &Slot, 0, pEditor->m_QuickActionMapDetails.Description()))
 	{
-		const CUIRect *pScreen = pEditor->UI()->Screen();
-		pEditor->m_Map.m_MapInfoTmp.Copy(pEditor->m_Map.m_MapInfo);
-		static SPopupMenuId s_PopupMapInfoId;
-		constexpr float PopupWidth = 400.0f;
-		constexpr float PopupHeight = 170.0f;
-		pEditor->UI()->DoPopupMenu(&s_PopupMapInfoId, pScreen->w / 2.0f - PopupWidth / 2.0f, pScreen->h / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, pEditor, PopupMapInfo);
-		pEditor->UI()->SetActiveItem(nullptr);
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionMapDetails.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(10.0f, nullptr, &View);
@@ -146,33 +134,33 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect Vie
 			pEditor->OnClose();
 			g_Config.m_ClEditor = 0;
 		}
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
 	CUIRect Slot;
 	View.HSplitTop(12.0f, &Slot, &View);
 	static int s_RemoveUnusedEnvelopesButton = 0;
-	static CUI::SConfirmPopupContext s_ConfirmPopupContext;
+	static CUi::SConfirmPopupContext s_ConfirmPopupContext;
 	if(pEditor->DoButton_MenuItem(&s_RemoveUnusedEnvelopesButton, "Remove unused envelopes", 0, &Slot, 0, "Removes all unused envelopes from the map"))
 	{
 		s_ConfirmPopupContext.Reset();
 		s_ConfirmPopupContext.YesNoButtons();
 		str_copy(s_ConfirmPopupContext.m_aMessage, "Are you sure that you want to remove all unused envelopes from this map?");
-		pEditor->UI()->ShowPopupConfirm(Slot.x + Slot.w, Slot.y, &s_ConfirmPopupContext);
+		pEditor->Ui()->ShowPopupConfirm(Slot.x + Slot.w, Slot.y, &s_ConfirmPopupContext);
 	}
-	if(s_ConfirmPopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+	if(s_ConfirmPopupContext.m_Result == CUi::SConfirmPopupContext::CONFIRMED)
 		pEditor->RemoveUnusedEnvelopes();
-	if(s_ConfirmPopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+	if(s_ConfirmPopupContext.m_Result != CUi::SConfirmPopupContext::UNSET)
 	{
 		s_ConfirmPopupContext.Reset();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	static int s_BorderButton = 0;
@@ -188,10 +176,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect Vi
 		}
 		else
 		{
-			static CUI::SMessagePopupContext s_MessagePopupContext;
+			static CUi::SMessagePopupContext s_MessagePopupContext;
 			s_MessagePopupContext.DefaultColor(pEditor->m_pTextRender);
 			str_copy(s_MessagePopupContext.m_aMessage, "No tile layer selected");
-			pEditor->UI()->ShowPopupMessage(Slot.x, Slot.y + Slot.h, &s_MessagePopupContext);
+			pEditor->Ui()->ShowPopupMessage(Slot.x, Slot.y + Slot.h, &s_MessagePopupContext);
 		}
 	}
 
@@ -201,7 +189,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect Vi
 	if(pEditor->DoButton_MenuItem(&s_GotoButton, "Goto XY", 0, &Slot, 0, "Go to a specified coordinate point on the map"))
 	{
 		static SPopupMenuId s_PopupGotoId;
-		pEditor->UI()->DoPopupMenu(&s_PopupGotoId, Slot.x, Slot.y + Slot.h, 120, 52, pEditor, PopupGoto);
+		pEditor->Ui()->DoPopupMenu(&s_PopupGotoId, Slot.x, Slot.y + Slot.h, 120, 52, pEditor, PopupGoto);
 	}
 
 	static int s_TileartButton = 0;
@@ -210,10 +198,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect Vi
 	if(pEditor->DoButton_MenuItem(&s_TileartButton, "Add tileart", 0, &Slot, 0, "Generate tileart from image"))
 	{
 		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Add tileart", "Open", "mapres", false, CallbackAddTileart, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 static int EntitiesListdirCallback(const char *pName, int IsDir, int StorageType, void *pUser)
@@ -228,23 +216,24 @@ static int EntitiesListdirCallback(const char *pName, int IsDir, int StorageType
 	return 0;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
 	CUIRect Slot;
 	View.HSplitTop(12.0f, &Slot, &View);
-	static int s_EntitiesButtonID = 0;
+	static int s_EntitiesButtonId = 0;
 	char aButtonText[64];
 	str_format(aButtonText, sizeof(aButtonText), "Entities: %s", pEditor->m_SelectEntitiesImage.c_str());
-	if(pEditor->DoButton_MenuItem(&s_EntitiesButtonID, aButtonText, 0, &Slot, 0, "Choose game layer entities image for different gametypes"))
+	if(pEditor->DoButton_MenuItem(&s_EntitiesButtonId, aButtonText, 0, &Slot, 0, "Choose game layer entities image for different gametypes"))
 	{
 		pEditor->m_vSelectEntitiesFiles.clear();
 		pEditor->Storage()->ListDirectory(IStorage::TYPE_ALL, "editor/entities", EntitiesListdirCallback, pEditor);
 		std::sort(pEditor->m_vSelectEntitiesFiles.begin(), pEditor->m_vSelectEntitiesFiles.end());
+		pEditor->m_vSelectEntitiesFiles.emplace_back("Custom…");
 
 		static SPopupMenuId s_PopupEntitiesId;
-		pEditor->UI()->DoPopupMenu(&s_PopupEntitiesId, Slot.x, Slot.y + Slot.h, 250, pEditor->m_vSelectEntitiesFiles.size() * 14.0f + 10.0f, pEditor, PopupEntities);
+		pEditor->Ui()->DoPopupMenu(&s_PopupEntitiesId, Slot.x, Slot.y + Slot.h, 250, pEditor->m_vSelectEntitiesFiles.size() * 14.0f + 10.0f, pEditor, PopupEntities);
 	}
 
 	View.HSplitTop(2.0f, nullptr, &View);
@@ -257,14 +246,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
 		CUIRect No, Yes;
 		Selector.VSplitMid(&No, &Yes);
 
-		pEditor->UI()->DoLabel(&Label, "Brush coloring", 10.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Brush coloring", 10.0f, TEXTALIGN_ML);
 		static int s_ButtonNo = 0;
 		static int s_ButtonYes = 0;
-		if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_BrushColorEnabled, &No, 0, "Disable brush coloring"))
+		if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !pEditor->m_BrushColorEnabled, &No, 0, "Disable brush coloring", IGraphics::CORNER_L))
 		{
 			pEditor->m_BrushColorEnabled = false;
 		}
-		if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_BrushColorEnabled, &Yes, 0, "Enable brush coloring"))
+		if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", pEditor->m_BrushColorEnabled, &Yes, 0, "Enable brush coloring", IGraphics::CORNER_R))
 		{
 			pEditor->m_BrushColorEnabled = true;
 		}
@@ -280,16 +269,16 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
 		CUIRect No, Yes;
 		Selector.VSplitMid(&No, &Yes);
 
-		pEditor->UI()->DoLabel(&Label, "Allow unused", 10.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Allow unused", 10.0f, TEXTALIGN_ML);
 		if(pEditor->m_AllowPlaceUnusedTiles != -1)
 		{
 			static int s_ButtonNo = 0;
 			static int s_ButtonYes = 0;
-			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles"))
+			if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles", IGraphics::CORNER_L))
 			{
 				pEditor->m_AllowPlaceUnusedTiles = false;
 			}
-			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles"))
+			if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles", IGraphics::CORNER_R))
 			{
 				pEditor->m_AllowPlaceUnusedTiles = true;
 			}
@@ -307,24 +296,24 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
 		Selector.VSplitLeft(Selector.w / 3.0f, &Off, &Selector);
 		Selector.VSplitMid(&Dec, &Hex);
 
-		pEditor->UI()->DoLabel(&Label, "Show Info", 10.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Show Info", 10.0f, TEXTALIGN_ML);
 		static int s_ButtonOff = 0;
 		static int s_ButtonDec = 0;
 		static int s_ButtonHex = 0;
-		if(pEditor->DoButton_ButtonDec(&s_ButtonOff, "Off", pEditor->m_ShowTileInfo == SHOW_TILE_OFF, &Off, 0, "Do not show tile information"))
+		CQuickAction *pAction = &pEditor->m_QuickActionShowInfoOff;
+		if(pEditor->DoButton_Ex(&s_ButtonOff, pAction->LabelShort(), pAction->Active(), &Off, 0, pAction->Description(), IGraphics::CORNER_L))
 		{
-			pEditor->m_ShowTileInfo = SHOW_TILE_OFF;
-			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+			pAction->Call();
 		}
-		if(pEditor->DoButton_Ex(&s_ButtonDec, "Dec", pEditor->m_ShowTileInfo == SHOW_TILE_DECIMAL, &Dec, 0, "[ctrl+i] Show tile information", IGraphics::CORNER_NONE))
+		pAction = &pEditor->m_QuickActionShowInfoDec;
+		if(pEditor->DoButton_Ex(&s_ButtonDec, pAction->LabelShort(), pAction->Active(), &Dec, 0, pAction->Description(), IGraphics::CORNER_NONE))
 		{
-			pEditor->m_ShowTileInfo = SHOW_TILE_DECIMAL;
-			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+			pAction->Call();
 		}
-		if(pEditor->DoButton_ButtonInc(&s_ButtonHex, "Hex", pEditor->m_ShowTileInfo == SHOW_TILE_HEXADECIMAL, &Hex, 0, "[ctrl+shift+i] Show tile information in hexadecimal"))
+		pAction = &pEditor->m_QuickActionShowInfoHex;
+		if(pEditor->DoButton_Ex(&s_ButtonHex, pAction->LabelShort(), pAction->Active(), &Hex, 0, pAction->Description(), IGraphics::CORNER_R))
 		{
-			pEditor->m_ShowTileInfo = SHOW_TILE_HEXADECIMAL;
-			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+			pAction->Call();
 		}
 	}
 
@@ -338,19 +327,17 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
 		CUIRect No, Yes;
 		Selector.VSplitMid(&No, &Yes);
 
-		pEditor->UI()->DoLabel(&Label, "Align quads", 10.0f, TEXTALIGN_ML);
-		if(pEditor->m_AllowPlaceUnusedTiles != -1)
+		pEditor->Ui()->DoLabel(&Label, "Align quads", 10.0f, TEXTALIGN_ML);
+
+		static int s_ButtonNo = 0;
+		static int s_ButtonYes = 0;
+		if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !g_Config.m_EdAlignQuads, &No, 0, "Do not perform quad alignment to other quads/points when moving quads", IGraphics::CORNER_L))
 		{
-			static int s_ButtonNo = 0;
-			static int s_ButtonYes = 0;
-			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !g_Config.m_EdAlignQuads, &No, 0, "Do not perform quad alignment to other quads/points when moving quads"))
-			{
-				g_Config.m_EdAlignQuads = false;
-			}
-			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", g_Config.m_EdAlignQuads, &Yes, 0, "Allow quad alignment to other quads/points when moving quads"))
-			{
-				g_Config.m_EdAlignQuads = true;
-			}
+			g_Config.m_EdAlignQuads = false;
+		}
+		if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", g_Config.m_EdAlignQuads, &Yes, 0, "Allow quad alignment to other quads/points when moving quads", IGraphics::CORNER_R))
+		{
+			g_Config.m_EdAlignQuads = true;
 		}
 	}
 
@@ -364,26 +351,72 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
 		CUIRect No, Yes;
 		Selector.VSplitMid(&No, &Yes);
 
-		pEditor->UI()->DoLabel(&Label, "Show quads bounds", 10.0f, TEXTALIGN_ML);
-		if(pEditor->m_AllowPlaceUnusedTiles != -1)
+		pEditor->Ui()->DoLabel(&Label, "Show quads bounds", 10.0f, TEXTALIGN_ML);
+
+		static int s_ButtonNo = 0;
+		static int s_ButtonYes = 0;
+		if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !g_Config.m_EdShowQuadsRect, &No, 0, "Do not show quad bounds when moving quads", IGraphics::CORNER_L))
 		{
-			static int s_ButtonNo = 0;
-			static int s_ButtonYes = 0;
-			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !g_Config.m_EdShowQuadsRect, &No, 0, "Do not show quad bounds when moving quads"))
-			{
-				g_Config.m_EdShowQuadsRect = false;
-			}
-			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", g_Config.m_EdShowQuadsRect, &Yes, 0, "Show quad bounds when moving quads"))
-			{
-				g_Config.m_EdShowQuadsRect = true;
-			}
+			g_Config.m_EdShowQuadsRect = false;
+		}
+		if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", g_Config.m_EdShowQuadsRect, &Yes, 0, "Show quad bounds when moving quads", IGraphics::CORNER_R))
+		{
+			g_Config.m_EdShowQuadsRect = true;
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->Ui()->DoLabel(&Label, "Auto map reload", 10.0f, TEXTALIGN_ML);
+
+		static int s_ButtonNo = 0;
+		static int s_ButtonYes = 0;
+		if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !g_Config.m_EdAutoMapReload, &No, 0, "Do not run 'hot_reload' on the local server while rcon authed on map save", IGraphics::CORNER_L))
+		{
+			g_Config.m_EdAutoMapReload = false;
+		}
+		if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", g_Config.m_EdAutoMapReload, &Yes, 0, "Run 'hot_reload' on the local server while rcon authed on map save", IGraphics::CORNER_R))
+		{
+			g_Config.m_EdAutoMapReload = true;
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->Ui()->DoLabel(&Label, "Select layers by tile", 10.0f, TEXTALIGN_ML);
+
+		static int s_ButtonNo = 0;
+		static int s_ButtonYes = 0;
+		if(pEditor->DoButton_Ex(&s_ButtonNo, "No", !g_Config.m_EdLayerSelector, &No, 0, "Do not select layers when Ctrl+right clicking on a tile", IGraphics::CORNER_L))
+		{
+			g_Config.m_EdLayerSelector = false;
+		}
+		if(pEditor->DoButton_Ex(&s_ButtonYes, "Yes", g_Config.m_EdLayerSelector, &Yes, 0, "Select layers when Ctrl+right clicking on a tile", IGraphics::CORNER_R))
+		{
+			g_Config.m_EdLayerSelector = true;
 		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -400,7 +433,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionGroup>(pEditor, pEditor->m_SelectedGroup, true));
 			pEditor->m_Map.DeleteGroup(pEditor->m_SelectedGroup);
 			pEditor->m_SelectedGroup = maximum(0, pEditor->m_SelectedGroup - 1);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 	else
@@ -409,10 +442,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		{
 			// gather all tile layers
 			std::vector<std::shared_ptr<CLayerTiles>> vpLayers;
-			for(auto &pLayer : pEditor->m_Map.m_pGameGroup->m_vpLayers)
+			int GameLayerIndex = -1;
+			for(int LayerIndex = 0; LayerIndex < (int)pEditor->m_Map.m_pGameGroup->m_vpLayers.size(); LayerIndex++)
 			{
+				auto &pLayer = pEditor->m_Map.m_pGameGroup->m_vpLayers.at(LayerIndex);
 				if(pLayer != pEditor->m_Map.m_pGameLayer && pLayer->m_Type == LAYERTYPE_TILES)
 					vpLayers.push_back(std::static_pointer_cast<CLayerTiles>(pLayer));
+				else if(pLayer == pEditor->m_Map.m_pGameLayer)
+					GameLayerIndex = LayerIndex;
 			}
 
 			// search for unneeded game tiles
@@ -434,15 +471,31 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 						}
 					}
 
-					if(!Found)
+					CTile Tile = pGameLayer->GetTile(x, y);
+					if(!Found && Tile.m_Index != TILE_AIR)
 					{
-						pGameLayer->m_pTiles[y * pGameLayer->m_Width + x].m_Index = TILE_AIR;
+						Tile.m_Index = TILE_AIR;
+						pGameLayer->SetTile(x, y, Tile);
 						pEditor->m_Map.OnModify();
 					}
 				}
 			}
 
-			return CUI::POPUP_CLOSE_CURRENT;
+			if(!pGameLayer->m_TilesHistory.empty())
+			{
+				if(GameLayerIndex == -1)
+				{
+					dbg_msg("editor", "failed to record action (GameLayerIndex not found)");
+				}
+				else
+				{
+					// record undo
+					pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileChanges>(pEditor, pEditor->m_SelectedGroup, GameLayerIndex, "Clean up game tiles", pGameLayer->m_TilesHistory));
+				}
+				pGameLayer->ClearHistory();
+			}
+
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -451,17 +504,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		// new tele layer
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		static int s_NewTeleLayerButton = 0;
-		if(pEditor->DoButton_Editor(&s_NewTeleLayerButton, "Add tele layer", 0, &Button, 0, "Creates a new tele layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddTeleLayer, pEditor->m_QuickActionAddTeleLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddTeleLayer.Description()))
 		{
-			std::shared_ptr<CLayer> pTeleLayer = std::make_shared<CLayerTele>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-			pEditor->m_Map.MakeTeleLayer(pTeleLayer);
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTeleLayer);
-			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-			pEditor->SelectLayer(LayerIndex);
-			pEditor->m_pBrush->Clear();
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionAddTeleLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -470,17 +516,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		// new speedup layer
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		static int s_NewSpeedupLayerButton = 0;
-		if(pEditor->DoButton_Editor(&s_NewSpeedupLayerButton, "Add speedup layer", 0, &Button, 0, "Creates a new speedup layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddSpeedupLayer, pEditor->m_QuickActionAddSpeedupLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddSpeedupLayer.Description()))
 		{
-			std::shared_ptr<CLayer> pSpeedupLayer = std::make_shared<CLayerSpeedup>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-			pEditor->m_Map.MakeSpeedupLayer(pSpeedupLayer);
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSpeedupLayer);
-			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-			pEditor->SelectLayer(LayerIndex);
-			pEditor->m_pBrush->Clear();
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionAddSpeedupLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -489,17 +528,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		// new tune layer
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		static int s_NewTuneLayerButton = 0;
-		if(pEditor->DoButton_Editor(&s_NewTuneLayerButton, "Add tune layer", 0, &Button, 0, "Creates a new tuning layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddTuneLayer, pEditor->m_QuickActionAddTuneLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddTuneLayer.Description()))
 		{
-			std::shared_ptr<CLayer> pTuneLayer = std::make_shared<CLayerTune>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-			pEditor->m_Map.MakeTuneLayer(pTuneLayer);
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTuneLayer);
-			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-			pEditor->SelectLayer(LayerIndex);
-			pEditor->m_pBrush->Clear();
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionAddTuneLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -508,17 +540,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		// new front layer
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		static int s_NewFrontLayerButton = 0;
-		if(pEditor->DoButton_Editor(&s_NewFrontLayerButton, "Add front layer", 0, &Button, 0, "Creates a new item layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddFrontLayer, pEditor->m_QuickActionAddFrontLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddFrontLayer.Description()))
 		{
-			std::shared_ptr<CLayer> pFrontLayer = std::make_shared<CLayerFront>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-			pEditor->m_Map.MakeFrontLayer(pFrontLayer);
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pFrontLayer);
-			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-			pEditor->SelectLayer(LayerIndex);
-			pEditor->m_pBrush->Clear();
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionAddFrontLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -527,64 +552,38 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		// new Switch layer
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		static int s_NewSwitchLayerButton = 0;
-		if(pEditor->DoButton_Editor(&s_NewSwitchLayerButton, "Add switch layer", 0, &Button, 0, "Creates a new switch layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddSwitchLayer, pEditor->m_QuickActionAddSwitchLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddSwitchLayer.Description()))
 		{
-			std::shared_ptr<CLayer> pSwitchLayer = std::make_shared<CLayerSwitch>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-			pEditor->m_Map.MakeSwitchLayer(pSwitchLayer);
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSwitchLayer);
-			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-			pEditor->SelectLayer(LayerIndex);
-			pEditor->m_pBrush->Clear();
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionAddSwitchLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
 	// new quad layer
 	View.HSplitBottom(5.0f, &View, nullptr);
 	View.HSplitBottom(12.0f, &View, &Button);
-	static int s_NewQuadLayerButton = 0;
-	if(pEditor->DoButton_Editor(&s_NewQuadLayerButton, "Add quads layer", 0, &Button, 0, "Creates a new quad layer"))
+	if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddQuadsLayer, pEditor->m_QuickActionAddQuadsLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddQuadsLayer.Description()))
 	{
-		std::shared_ptr<CLayer> pQuadLayer = std::make_shared<CLayerQuads>(pEditor);
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pQuadLayer);
-		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-		pEditor->SelectLayer(LayerIndex);
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
-		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionAddQuadsLayer.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// new tile layer
 	View.HSplitBottom(5.0f, &View, nullptr);
 	View.HSplitBottom(12.0f, &View, &Button);
-	static int s_NewTileLayerButton = 0;
-	if(pEditor->DoButton_Editor(&s_NewTileLayerButton, "Add tile layer", 0, &Button, 0, "Creates a new tile layer"))
+	if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddTileLayer, pEditor->m_QuickActionAddTileLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddTileLayer.Description()))
 	{
-		std::shared_ptr<CLayer> pTileLayer = std::make_shared<CLayerTiles>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
-		pTileLayer->m_pEditor = pEditor;
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTileLayer);
-		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-		pEditor->SelectLayer(LayerIndex);
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
-		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionAddTileLayer.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// new sound layer
 	View.HSplitBottom(5.0f, &View, nullptr);
 	View.HSplitBottom(12.0f, &View, &Button);
-	static int s_NewSoundLayerButton = 0;
-	if(pEditor->DoButton_Editor(&s_NewSoundLayerButton, "Add sound layer", 0, &Button, 0, "Creates a new sound layer"))
+	if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddSoundLayer, pEditor->m_QuickActionAddSoundLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddSoundLayer.Description()))
 	{
-		std::shared_ptr<CLayer> pSoundLayer = std::make_shared<CLayerSounds>(pEditor);
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSoundLayer);
-		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
-		pEditor->SelectLayer(LayerIndex);
-		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
-		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
-		return CUI::POPUP_CLOSE_CURRENT;
+		pEditor->m_QuickActionAddSoundLayer.Call();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// group name
@@ -592,7 +591,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 	{
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Button);
-		pEditor->UI()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_ML);
 		Button.VSplitLeft(40.0f, nullptr, &Button);
 		static CLineInput s_NameInput;
 		s_NameInput.SetBuffer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName, sizeof(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName));
@@ -601,16 +600,16 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 	}
 
 	CProperty aProps[] = {
-		{"Order", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
-		{"Pos X", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Pos Y", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Para X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Para Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Order", pEditor->m_SelectedGroup, PROPTYPE_INT, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
+		{"Pos X", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX, PROPTYPE_INT, -1000000, 1000000},
+		{"Pos Y", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY, PROPTYPE_INT, -1000000, 1000000},
+		{"Para X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX, PROPTYPE_INT, -1000000, 1000000},
+		{"Para Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY, PROPTYPE_INT, -1000000, 1000000},
 		{"Use Clipping", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_UseClipping, PROPTYPE_BOOL, 0, 1},
-		{"Clip X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Clip Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Clip W", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW, PROPTYPE_INT_SCROLL, 0, 1000000},
-		{"Clip H", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH, PROPTYPE_INT_SCROLL, 0, 1000000},
+		{"Clip X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX, PROPTYPE_INT, -1000000, 1000000},
+		{"Clip Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY, PROPTYPE_INT, -1000000, 1000000},
+		{"Clip W", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW, PROPTYPE_INT, 0, 1000000},
+		{"Clip H", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH, PROPTYPE_INT, 0, 1000000},
 		{nullptr},
 	};
 
@@ -621,7 +620,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 	static int s_aIds[(int)EGroupProp::NUM_PROPS] = {0};
 	int NewVal = 0;
 	auto [State, Prop] = pEditor->DoPropertiesWithState<EGroupProp>(&View, aProps, s_aIds, &NewVal);
-	if(Prop != EGroupProp::PROP_NONE)
+	if(Prop != EGroupProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
 		pEditor->m_Map.OnModify();
 	}
@@ -647,11 +646,11 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 		}
 		else if(Prop == EGroupProp::PROP_POS_X)
 		{
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX = NewVal;
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX = -NewVal;
 		}
 		else if(Prop == EGroupProp::PROP_POS_Y)
 		{
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY = NewVal;
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY = -NewVal;
 		}
 		else if(Prop == EGroupProp::PROP_USE_CLIPPING)
 		{
@@ -677,10 +676,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
 
 	s_Tracker.End(Prop, State);
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View, bool Active)
 {
 	SLayerPopupContext *pPopup = (SLayerPopupContext *)pContext;
 	CEditor *pEditor = pPopup->m_pEditor;
@@ -700,24 +699,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 	{
 		CUIRect DeleteButton;
 		View.HSplitBottom(12.0f, &View, &DeleteButton);
-		static int s_DeleteButton = 0;
-		if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete layer", 0, &DeleteButton, 0, "Deletes the layer"))
+		if(pEditor->DoButton_Editor(&pEditor->m_QuickActionDeleteLayer, pEditor->m_QuickActionDeleteLayer.Label(), 0, &DeleteButton, 0, pEditor->m_QuickActionDeleteLayer.Description()))
 		{
-			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionDeleteLayer>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0]));
-
-			if(pCurrentLayer == pEditor->m_Map.m_pFrontLayer)
-				pEditor->m_Map.m_pFrontLayer = nullptr;
-			if(pCurrentLayer == pEditor->m_Map.m_pTeleLayer)
-				pEditor->m_Map.m_pTeleLayer = nullptr;
-			if(pCurrentLayer == pEditor->m_Map.m_pSpeedupLayer)
-				pEditor->m_Map.m_pSpeedupLayer = nullptr;
-			if(pCurrentLayer == pEditor->m_Map.m_pSwitchLayer)
-				pEditor->m_Map.m_pSwitchLayer = nullptr;
-			if(pCurrentLayer == pEditor->m_Map.m_pTuneLayer)
-				pEditor->m_Map.m_pTuneLayer = nullptr;
-			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DeleteLayer(pEditor->m_vSelectedLayers[0]);
-
-			return CUI::POPUP_CLOSE_CURRENT;
+			pEditor->m_QuickActionDeleteLayer.Call();
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -732,7 +717,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 		{
 			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DuplicateLayer(pEditor->m_vSelectedLayers[0]);
 			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0] + 1, true));
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
@@ -743,7 +728,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 		View.HSplitBottom(5.0f, &View, nullptr);
 		View.HSplitBottom(12.0f, &View, &Label);
 		Label.VSplitLeft(40.0f, &Label, &EditBox);
-		pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
 		static CLineInput s_NameInput;
 		s_NameInput.SetBuffer(pCurrentLayer->m_aName, sizeof(pCurrentLayer->m_aName));
 		if(pEditor->DoEditBox(&s_NameInput, &EditBox, 10.0f))
@@ -755,8 +740,8 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 		View.HSplitBottom(10.0f, &View, nullptr);
 
 	CProperty aProps[] = {
-		{"Group", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
-		{"Order", pEditor->m_vSelectedLayers[0], PROPTYPE_INT_STEP, 0, (int)pCurrentGroup->m_vpLayers.size() - 1},
+		{"Group", pEditor->m_SelectedGroup, PROPTYPE_INT, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
+		{"Order", pEditor->m_vSelectedLayers[0], PROPTYPE_INT, 0, (int)pCurrentGroup->m_vpLayers.size() - 1},
 		{"Detail", pCurrentLayer->m_Flags & LAYERFLAG_DETAIL, PROPTYPE_BOOL, 0, 1},
 		{nullptr},
 	};
@@ -768,16 +753,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 		aProps[2].m_Type = PROPTYPE_NULL;
 	}
 
-	// don't use Detail from the selection if this is a sound layer
-	if(pCurrentLayer->m_Type == LAYERTYPE_SOUNDS)
-	{
-		aProps[2].m_Type = PROPTYPE_NULL;
-	}
-
 	static int s_aIds[(int)ELayerProp::NUM_PROPS] = {0};
 	int NewVal = 0;
 	auto [State, Prop] = pEditor->DoPropertiesWithState<ELayerProp>(&View, aProps, s_aIds, &NewVal);
-	if(Prop != ELayerProp::PROP_NONE)
+	if(Prop != ELayerProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
 		pEditor->m_Map.OnModify();
 	}
@@ -792,7 +771,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 	}
 	else if(Prop == ELayerProp::PROP_GROUP)
 	{
-		if(NewVal >= 0 && (size_t)NewVal < pEditor->m_Map.m_vpGroups.size())
+		if(NewVal >= 0 && (size_t)NewVal < pEditor->m_Map.m_vpGroups.size() && NewVal != pEditor->m_SelectedGroup)
 		{
 			auto Position = std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), pCurrentLayer);
 			if(Position != pCurrentGroup->m_vpLayers.end())
@@ -814,10 +793,12 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
 	return pCurrentLayer->RenderProperties(&View);
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
+	if(pEditor->m_SelectedQuadIndex < 0 || pEditor->m_SelectedQuadIndex >= (int)vpQuads.size())
+		return CUi::POPUP_CLOSE_CURRENT;
 	CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
 	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(pEditor->GetSelectedLayerType(0, LAYERTYPE_QUADS));
 
@@ -833,7 +814,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 			pEditor->m_Map.OnModify();
 			pEditor->DeleteSelectedQuads();
 		}
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// aspect ratio button
@@ -875,8 +856,39 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 			}
 			pEditor->m_QuadTracker.EndQuadTrack();
 
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	// center pivot button
+	View.HSplitBottom(6.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_CenterButton = 0;
+	if(pEditor->DoButton_Editor(&s_CenterButton, "Center pivot", 0, &Button, 0, "Centers the pivot of the current quad"))
+	{
+		pEditor->m_QuadTracker.BeginQuadTrack(pLayer, pEditor->m_vSelectedQuads);
+		int Top = pCurrentQuad->m_aPoints[0].y;
+		int Left = pCurrentQuad->m_aPoints[0].x;
+		int Bottom = pCurrentQuad->m_aPoints[0].y;
+		int Right = pCurrentQuad->m_aPoints[0].x;
+
+		for(int k = 1; k < 4; k++)
+		{
+			if(pCurrentQuad->m_aPoints[k].y < Top)
+				Top = pCurrentQuad->m_aPoints[k].y;
+			if(pCurrentQuad->m_aPoints[k].x < Left)
+				Left = pCurrentQuad->m_aPoints[k].x;
+			if(pCurrentQuad->m_aPoints[k].y > Bottom)
+				Bottom = pCurrentQuad->m_aPoints[k].y;
+			if(pCurrentQuad->m_aPoints[k].x > Right)
+				Right = pCurrentQuad->m_aPoints[k].x;
 		}
+
+		pCurrentQuad->m_aPoints[4].x = Left + (Right - Left) / 2;
+		pCurrentQuad->m_aPoints[4].y = Top + (Bottom - Top) / 2;
+		pEditor->m_QuadTracker.EndQuadTrack();
+		pEditor->m_Map.OnModify();
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// align button
@@ -896,7 +908,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 			pEditor->m_Map.OnModify();
 		}
 		pEditor->m_QuadTracker.EndQuadTrack();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// square button
@@ -936,7 +948,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 			pEditor->m_Map.OnModify();
 		}
 		pEditor->m_QuadTracker.EndQuadTrack();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// slice button
@@ -947,32 +959,27 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 	{
 		pEditor->m_QuadKnifeCount = 0;
 		pEditor->m_QuadKnifeActive = true;
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	const int NumQuads = pLayer ? (int)pLayer->m_vQuads.size() : 0;
 	CProperty aProps[] = {
-		{"Order", pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], PROPTYPE_INT_STEP, 0, NumQuads},
-		{"Pos X", fx2i(pCurrentQuad->m_aPoints[4].x), PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Pos Y", fx2i(pCurrentQuad->m_aPoints[4].y), PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Order", pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], PROPTYPE_INT, 0, NumQuads},
+		{"Pos X", fx2i(pCurrentQuad->m_aPoints[4].x), PROPTYPE_INT, -1000000, 1000000},
+		{"Pos Y", fx2i(pCurrentQuad->m_aPoints[4].y), PROPTYPE_INT, -1000000, 1000000},
 		{"Pos. Env", pCurrentQuad->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
-		{"Pos. TO", pCurrentQuad->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos. TO", pCurrentQuad->m_PosEnvOffset, PROPTYPE_INT, -1000000, 1000000},
 		{"Color Env", pCurrentQuad->m_ColorEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
-		{"Color TO", pCurrentQuad->m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Color TO", pCurrentQuad->m_ColorEnvOffset, PROPTYPE_INT, -1000000, 1000000},
 		{nullptr},
 	};
 
 	static int s_aIds[(int)EQuadProp::NUM_PROPS] = {0};
 	int NewVal = 0;
-	auto PropRes = pEditor->DoPropertiesWithState<EQuadProp>(&View, aProps, s_aIds, &NewVal);
-	EQuadProp Prop = PropRes.m_Value;
-	if(Prop != EQuadProp::PROP_NONE)
+	auto [State, Prop] = pEditor->DoPropertiesWithState<EQuadProp>(&View, aProps, s_aIds, &NewVal);
+	if(Prop != EQuadProp::PROP_NONE && (State == EEditState::START || State == EEditState::ONE_GO))
 	{
-		pEditor->m_Map.OnModify();
-		if(PropRes.m_State == EEditState::START || PropRes.m_State == EEditState::ONE_GO)
-		{
-			pEditor->m_QuadTracker.BeginQuadPropTrack(pLayer, pEditor->m_vSelectedQuads, Prop);
-		}
+		pEditor->m_QuadTracker.BeginQuadPropTrack(pLayer, pEditor->m_vSelectedQuads, Prop);
 	}
 
 	const float OffsetX = i2fx(NewVal) - pCurrentQuad->m_aPoints[4].x;
@@ -1038,23 +1045,21 @@ CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, b
 		}
 	}
 
-	if(Prop != EQuadProp::PROP_NONE)
+	if(Prop != EQuadProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
-		if(PropRes.m_State == EEditState::END || PropRes.m_State == EEditState::ONE_GO)
-		{
-			pEditor->m_QuadTracker.EndQuadPropTrack(Prop);
-		}
+		pEditor->m_QuadTracker.EndQuadPropTrack(Prop);
+		pEditor->m_Map.OnModify();
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	CSoundSource *pSource = pEditor->GetSelectedSource();
 	if(!pSource)
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 
 	CUIRect Button;
 
@@ -1068,7 +1073,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View,
 		{
 			pEditor->m_EditorHistory.Execute(std::make_shared<CEditorActionDeleteSoundSource>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0], pEditor->m_SelectedSource));
 		}
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	// Sound shape button
@@ -1089,23 +1094,23 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View,
 	}
 
 	CProperty aProps[] = {
-		{"Pos X", pSource->m_Position.x / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Pos Y", pSource->m_Position.y / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos X", pSource->m_Position.x / 1000, PROPTYPE_INT, -1000000, 1000000},
+		{"Pos Y", pSource->m_Position.y / 1000, PROPTYPE_INT, -1000000, 1000000},
 		{"Loop", pSource->m_Loop, PROPTYPE_BOOL, 0, 1},
 		{"Pan", pSource->m_Pan, PROPTYPE_BOOL, 0, 1},
-		{"Delay", pSource->m_TimeDelay, PROPTYPE_INT_SCROLL, 0, 1000000},
-		{"Falloff", pSource->m_Falloff, PROPTYPE_INT_SCROLL, 0, 255},
+		{"Delay", pSource->m_TimeDelay, PROPTYPE_INT, 0, 1000000},
+		{"Falloff", pSource->m_Falloff, PROPTYPE_INT, 0, 255},
 		{"Pos. Env", pSource->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
-		{"Pos. TO", pSource->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos. TO", pSource->m_PosEnvOffset, PROPTYPE_INT, -1000000, 1000000},
 		{"Sound Env", pSource->m_SoundEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
-		{"Sound. TO", pSource->m_SoundEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Sound. TO", pSource->m_SoundEnvOffset, PROPTYPE_INT, -1000000, 1000000},
 		{nullptr},
 	};
 
 	static int s_aIds[(int)ESoundProp::NUM_PROPS] = {0};
 	int NewVal = 0;
 	auto [State, Prop] = pEditor->DoPropertiesWithState<ESoundProp>(&View, aProps, s_aIds, &NewVal);
-	if(Prop != ESoundProp::PROP_NONE)
+	if(Prop != ESoundProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
 		pEditor->m_Map.OnModify();
 	}
@@ -1180,14 +1185,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View,
 	case CSoundShape::SHAPE_CIRCLE:
 	{
 		CProperty aCircleProps[] = {
-			{"Radius", pSource->m_Shape.m_Circle.m_Radius, PROPTYPE_INT_SCROLL, 0, 1000000},
+			{"Radius", pSource->m_Shape.m_Circle.m_Radius, PROPTYPE_INT, 0, 1000000},
 			{nullptr},
 		};
 
 		static int s_aCircleIds[(int)ECircleShapeProp::NUM_CIRCLE_PROPS] = {0};
 		NewVal = 0;
 		auto [LocalState, LocalProp] = pEditor->DoPropertiesWithState<ECircleShapeProp>(&View, aCircleProps, s_aCircleIds, &NewVal);
-		if(LocalProp != ECircleShapeProp::PROP_NONE)
+		if(LocalProp != ECircleShapeProp::PROP_NONE && (LocalState == EEditState::END || LocalState == EEditState::ONE_GO))
 		{
 			pEditor->m_Map.OnModify();
 		}
@@ -1207,15 +1212,15 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View,
 	case CSoundShape::SHAPE_RECTANGLE:
 	{
 		CProperty aRectangleProps[] = {
-			{"Width", pSource->m_Shape.m_Rectangle.m_Width / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
-			{"Height", pSource->m_Shape.m_Rectangle.m_Height / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
+			{"Width", pSource->m_Shape.m_Rectangle.m_Width / 1024, PROPTYPE_INT, 0, 1000000},
+			{"Height", pSource->m_Shape.m_Rectangle.m_Height / 1024, PROPTYPE_INT, 0, 1000000},
 			{nullptr},
 		};
 
 		static int s_aRectangleIds[(int)ERectangleShapeProp::NUM_RECTANGLE_PROPS] = {0};
 		NewVal = 0;
 		auto [LocalState, LocalProp] = pEditor->DoPropertiesWithState<ERectangleShapeProp>(&View, aRectangleProps, s_aRectangleIds, &NewVal);
-		if(LocalProp != ERectangleShapeProp::PROP_NONE)
+		if(LocalProp != ERectangleShapeProp::PROP_NONE && (LocalState == EEditState::END || LocalState == EEditState::ONE_GO))
 		{
 			pEditor->m_Map.OnModify();
 		}
@@ -1237,15 +1242,15 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View,
 	}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
 	if(!in_range<int>(pEditor->m_SelectedQuadIndex, 0, vpQuads.size() - 1))
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
 	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(pEditor->GetSelectedLayerType(0, LAYERTYPE_QUADS));
 
@@ -1257,26 +1262,21 @@ CUI::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View,
 	const int TextureV = fx2f(pCurrentQuad->m_aTexcoords[pEditor->m_SelectedQuadPoint].y) * 1024;
 
 	CProperty aProps[] = {
-		{"Pos X", X, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Pos Y", Y, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos X", X, PROPTYPE_INT, -1000000, 1000000},
+		{"Pos Y", Y, PROPTYPE_INT, -1000000, 1000000},
 		{"Color", Color, PROPTYPE_COLOR, 0, 0},
-		{"Tex U", TextureU, PROPTYPE_INT_SCROLL, -1000000, 1000000},
-		{"Tex V", TextureV, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Tex U", TextureU, PROPTYPE_INT, -1000000, 1000000},
+		{"Tex V", TextureV, PROPTYPE_INT, -1000000, 1000000},
 		{nullptr},
 	};
 
 	static int s_aIds[(int)EQuadPointProp::NUM_PROPS] = {0};
 	int NewVal = 0;
-	auto PropRes = pEditor->DoPropertiesWithState<EQuadPointProp>(&View, aProps, s_aIds, &NewVal);
-	EQuadPointProp Prop = PropRes.m_Value;
-	if(Prop != EQuadPointProp::PROP_NONE)
+	auto [State, Prop] = pEditor->DoPropertiesWithState<EQuadPointProp>(&View, aProps, s_aIds, &NewVal);
+	if(Prop != EQuadPointProp::PROP_NONE && (State == EEditState::START || State == EEditState::ONE_GO))
 	{
-		pEditor->m_Map.OnModify();
-		if(PropRes.m_State == EEditState::START || PropRes.m_State == EEditState::ONE_GO)
-		{
-			pEditor->m_QuadTracker.BeginQuadPointPropTrack(pLayer, pEditor->m_vSelectedQuads, pEditor->m_SelectedQuadPoints);
-			pEditor->m_QuadTracker.AddQuadPointPropTrack(Prop);
-		}
+		pEditor->m_QuadTracker.BeginQuadPointPropTrack(pLayer, pEditor->m_vSelectedQuads, pEditor->m_SelectedQuadPoints);
+		pEditor->m_QuadTracker.AddQuadPointPropTrack(Prop);
 	}
 
 	for(CQuad *pQuad : vpQuads)
@@ -1320,23 +1320,20 @@ CUI::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View,
 		}
 	}
 
-	if(Prop != EQuadPointProp::PROP_NONE)
+	if(Prop != EQuadPointProp::PROP_NONE && (State == EEditState::END || State == EEditState::ONE_GO))
 	{
+		pEditor->m_QuadTracker.EndQuadPointPropTrack(Prop);
 		pEditor->m_Map.OnModify();
-		if(PropRes.m_State == EEditState::END || PropRes.m_State == EEditState::ONE_GO)
-		{
-			pEditor->m_QuadTracker.EndQuadPointPropTrack(Prop);
-		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	if(pEditor->m_SelectedEnvelope < 0 || pEditor->m_SelectedEnvelope >= (int)pEditor->m_Map.m_vpEnvelopes.size())
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 
 	const float RowHeight = 12.0f;
 	CUIRect Row, Label, EditBox;
@@ -1345,13 +1342,13 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect Vie
 
 	std::shared_ptr<CEnvelope> pEnvelope = pEditor->m_Map.m_vpEnvelopes[pEditor->m_SelectedEnvelope];
 
-	if(pEnvelope->GetChannels() == 4)
+	if(pEnvelope->GetChannels() == 4 && !pEditor->IsTangentSelected())
 	{
 		View.HSplitTop(RowHeight, &Row, &View);
 		View.HSplitTop(4.0f, nullptr, &View);
 		Row.VSplitLeft(60.0f, &Label, &Row);
 		Row.VSplitLeft(10.0f, nullptr, &EditBox);
-		pEditor->UI()->DoLabel(&Label, "Color:", RowHeight - 2.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Color:", RowHeight - 2.0f, TEXTALIGN_ML);
 
 		const auto SelectedPoint = pEditor->m_vSelectedEnvelopePoints.front();
 		const int SelectedIndex = SelectedPoint.first;
@@ -1420,14 +1417,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect Vie
 	View.HSplitTop(RowHeight, &Row, &View);
 	Row.VSplitLeft(60.0f, &Label, &Row);
 	Row.VSplitLeft(10.0f, nullptr, &EditBox);
-	pEditor->UI()->DoLabel(&Label, "Value:", RowHeight - 2.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Value:", RowHeight - 2.0f, TEXTALIGN_ML);
 	pEditor->DoEditBox(&s_CurValueInput, &EditBox, RowHeight - 2.0f, IGraphics::CORNER_ALL, "The value of the selected envelope point");
 
 	View.HSplitTop(4.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Row, &View);
 	Row.VSplitLeft(60.0f, &Label, &Row);
 	Row.VSplitLeft(10.0f, nullptr, &EditBox);
-	pEditor->UI()->DoLabel(&Label, "Time (in s):", RowHeight - 2.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Time (in s):", RowHeight - 2.0f, TEXTALIGN_ML);
 	pEditor->DoEditBox(&s_CurTimeInput, &EditBox, RowHeight - 2.0f, IGraphics::CORNER_ALL, "The time of the selected envelope point");
 
 	if(pEditor->Input()->KeyIsPressed(KEY_RETURN) || pEditor->Input()->KeyIsPressed(KEY_KP_ENTER))
@@ -1478,10 +1475,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect Vie
 
 	View.HSplitTop(6.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Row, &View);
-	static int s_DeleteButtonID = 0;
+	static int s_DeleteButtonId = 0;
 	const char *pButtonText = pEditor->IsTangentSelected() ? "Reset" : "Delete";
 	const char *pTooltip = pEditor->IsTangentSelected() ? "Reset tangent point to default value." : "Delete current envelope point in all channels.";
-	if(pEditor->DoButton_Editor(&s_DeleteButtonID, pButtonText, 0, &Row, 0, pTooltip))
+	if(pEditor->DoButton_Editor(&s_DeleteButtonId, pButtonText, 0, &Row, 0, pTooltip))
 	{
 		if(pEditor->IsTangentInSelected())
 		{
@@ -1499,64 +1496,64 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect Vie
 			pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionDeleteEnvelopePoint>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex));
 		}
 
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointMulti(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupEnvPointMulti(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	const float RowHeight = 12.0f;
 
-	static int s_CurveButtonID = 0;
+	static int s_CurveButtonId = 0;
 	CUIRect CurveButton;
 	View.HSplitTop(RowHeight, &CurveButton, &View);
-	if(pEditor->DoButton_Editor(&s_CurveButtonID, "Project onto", 0, &CurveButton, 0, "Project all selected envelopes onto the curve between the first and last selected envelope."))
+	if(pEditor->DoButton_Editor(&s_CurveButtonId, "Project onto", 0, &CurveButton, 0, "Project all selected envelopes onto the curve between the first and last selected envelope."))
 	{
 		static SPopupMenuId s_PopupCurveTypeId;
-		pEditor->UI()->DoPopupMenu(&s_PopupCurveTypeId, pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), 80, 80, pEditor, PopupEnvPointCurveType);
+		pEditor->Ui()->DoPopupMenu(&s_PopupCurveTypeId, pEditor->Ui()->MouseX(), pEditor->Ui()->MouseY(), 80, 80, pEditor, PopupEnvPointCurveType);
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	const float RowHeight = 14.0f;
 
 	int CurveType = -1;
 
-	static int s_ButtonLinearID;
+	static int s_ButtonLinearId;
 	CUIRect ButtonLinear;
 	View.HSplitTop(RowHeight, &ButtonLinear, &View);
-	if(pEditor->DoButton_MenuItem(&s_ButtonLinearID, "Linear", 0, &ButtonLinear))
+	if(pEditor->DoButton_MenuItem(&s_ButtonLinearId, "Linear", 0, &ButtonLinear))
 		CurveType = CURVETYPE_LINEAR;
 
-	static int s_ButtonSlowID;
+	static int s_ButtonSlowId;
 	CUIRect ButtonSlow;
 	View.HSplitTop(RowHeight, &ButtonSlow, &View);
-	if(pEditor->DoButton_MenuItem(&s_ButtonSlowID, "Slow", 0, &ButtonSlow))
+	if(pEditor->DoButton_MenuItem(&s_ButtonSlowId, "Slow", 0, &ButtonSlow))
 		CurveType = CURVETYPE_SLOW;
 
-	static int s_ButtonFastID;
+	static int s_ButtonFastId;
 	CUIRect ButtonFast;
 	View.HSplitTop(RowHeight, &ButtonFast, &View);
-	if(pEditor->DoButton_MenuItem(&s_ButtonFastID, "Fast", 0, &ButtonFast))
+	if(pEditor->DoButton_MenuItem(&s_ButtonFastId, "Fast", 0, &ButtonFast))
 		CurveType = CURVETYPE_FAST;
 
-	static int s_ButtonStepID;
+	static int s_ButtonStepId;
 	CUIRect ButtonStep;
 	View.HSplitTop(RowHeight, &ButtonStep, &View);
-	if(pEditor->DoButton_MenuItem(&s_ButtonStepID, "Step", 0, &ButtonStep))
+	if(pEditor->DoButton_MenuItem(&s_ButtonStepId, "Step", 0, &ButtonStep))
 		CurveType = CURVETYPE_STEP;
 
-	static int s_ButtonSmoothID;
+	static int s_ButtonSmoothId;
 	CUIRect ButtonSmooth;
 	View.HSplitTop(RowHeight, &ButtonSmooth, &View);
-	if(pEditor->DoButton_MenuItem(&s_ButtonSmoothID, "Smooth", 0, &ButtonSmooth))
+	if(pEditor->DoButton_MenuItem(&s_ButtonSmoothId, "Smooth", 0, &ButtonSmooth))
 		CurveType = CURVETYPE_SMOOTH;
 
 	std::vector<std::shared_ptr<IEditorAction>> vpActions;
@@ -1595,8 +1592,8 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointCurveType(void *pContext, CU
 						if(SelectedIndex != FirstSelectedIndex && SelectedIndex != LastSelectedIndex)
 						{
 							CEnvPoint &CurrentPoint = pEnvelope->m_vPoints[SelectedIndex];
-							ColorRGBA Channels;
-							HelperEnvelope.Eval(CurrentPoint.m_Time / 1000.0f, Channels);
+							ColorRGBA Channels = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+							HelperEnvelope.Eval(CurrentPoint.m_Time / 1000.0f, Channels, 1);
 							int PrevValue = CurrentPoint.m_aValues[c];
 							CurrentPoint.m_aValues[c] = f2fx(Channels.r);
 							vpActions.push_back(std::make_shared<CEditorActionEnvelopeEditPoint>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, CEditorActionEnvelopeEditPoint::EEditType::VALUE, PrevValue, CurrentPoint.m_aValues[c]));
@@ -1612,10 +1609,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointCurveType(void *pContext, CU
 		}
 
 		pEditor->m_Map.OnModify();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 static const auto &&gs_ModifyIndexDeleted = [](int DeletedIndex) {
@@ -1627,12 +1624,12 @@ static const auto &&gs_ModifyIndexDeleted = [](int DeletedIndex) {
 	};
 };
 
-CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
 	static int s_ExternalButton = 0;
-	static int s_ReaddButton = 0;
+	static int s_ReimportButton = 0;
 	static int s_ReplaceButton = 0;
 	static int s_RemoveButton = 0;
 	static int s_ExportButton = 0;
@@ -1652,7 +1649,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 		Slot.VMargin(5.0f, &Slot);
 		Slot.VSplitLeft(35.0f, &Label, &Slot);
 		Slot.VSplitLeft(RowHeight - 2.0f, nullptr, &EditBox);
-		pEditor->UI()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
+		pEditor->Ui()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
 
 		s_RenameInput.SetBuffer(pImg->m_aName, sizeof(pImg->m_aName));
 		if(pEditor->DoEditBox(&s_RenameInput, &EditBox, RowHeight - 2.0f))
@@ -1666,8 +1663,13 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 	{
 		if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Embed", 0, &Slot, 0, "Embeds the image into the map file."))
 		{
+			if(pImg->m_pData == nullptr)
+			{
+				pEditor->ShowFileDialogError("Embedding is not possible because the image could not be loaded.");
+				return CUi::POPUP_KEEP_OPEN;
+			}
 			pImg->m_External = 0;
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		View.HSplitTop(5.0f, nullptr, &View);
 		View.HSplitTop(RowHeight, &Slot, &View);
@@ -1677,16 +1679,16 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 		if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Make external", 0, &Slot, 0, "Removes the image from the map file."))
 		{
 			pImg->m_External = 1;
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		View.HSplitTop(5.0f, nullptr, &View);
 		View.HSplitTop(RowHeight, &Slot, &View);
 	}
 
-	static CUI::SSelectionPopupContext s_SelectionPopupContext;
+	static CUi::SSelectionPopupContext s_SelectionPopupContext;
 	static CScrollRegion s_SelectionPopupScrollRegion;
 	s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
-	if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the image from the mapres folder"))
+	if(pEditor->DoButton_MenuItem(&s_ReimportButton, "Re-import", 0, &Slot, 0, "Re-imports the image from the mapres folder"))
 	{
 		char aFilename[IO_MAX_PATH_LENGTH];
 		str_format(aFilename, sizeof(aFilename), "%s.png", pImg->m_aName);
@@ -1706,7 +1708,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 		else
 		{
 			str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted image:");
-			pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
+			pEditor->Ui()->ShowPopupSelection(pEditor->Ui()->MouseX(), pEditor->Ui()->MouseY(), &s_SelectionPopupContext);
 		}
 	}
 	if(s_SelectionPopupContext.m_pSelection != nullptr)
@@ -1715,7 +1717,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 		const bool Result = pEditor->ReplaceImage(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
 		pImg->m_External = WasExternal;
 		s_SelectionPopupContext.Reset();
-		return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+		return Result ? CUi::POPUP_CLOSE_CURRENT : CUi::POPUP_KEEP_OPEN;
 	}
 
 	View.HSplitTop(5.0f, nullptr, &View);
@@ -1723,7 +1725,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 	if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the image with a new one"))
 	{
 		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Replace Image", "Replace", "mapres", false, ReplaceImageCallback, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(5.0f, nullptr, &View);
@@ -1732,7 +1734,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 	{
 		pEditor->m_Map.m_vpImages.erase(pEditor->m_Map.m_vpImages.begin() + pEditor->m_SelectedImage);
 		pEditor->m_Map.ModifyImageIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedImage));
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	if(!pImg->m_External)
@@ -1741,20 +1743,25 @@ CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
 		View.HSplitTop(RowHeight, &Slot, &View);
 		if(pEditor->DoButton_MenuItem(&s_ExportButton, "Export", 0, &Slot, 0, "Export the image"))
 		{
+			if(pImg->m_pData == nullptr)
+			{
+				pEditor->ShowFileDialogError("Exporting is not possible because the image could not be loaded.");
+				return CUi::POPUP_KEEP_OPEN;
+			}
 			pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_IMG, "Save image", "Save", "mapres", false, CallbackSaveImage, pEditor);
 			pEditor->m_FileDialogFileNameInput.Set(pImg->m_aName);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
-	static int s_ReaddButton = 0;
+	static int s_ReimportButton = 0;
 	static int s_ReplaceButton = 0;
 	static int s_RemoveButton = 0;
 	static int s_ExportButton = 0;
@@ -1765,7 +1772,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 	View.HSplitTop(RowHeight, &Slot, &View);
 	std::shared_ptr<CEditorSound> pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
 
-	static CUI::SSelectionPopupContext s_SelectionPopupContext;
+	static CUi::SSelectionPopupContext s_SelectionPopupContext;
 	static CScrollRegion s_SelectionPopupScrollRegion;
 	s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
 
@@ -1776,7 +1783,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 	Slot.VMargin(5.0f, &Slot);
 	Slot.VSplitLeft(35.0f, &Label, &Slot);
 	Slot.VSplitLeft(RowHeight - 2.0f, nullptr, &EditBox);
-	pEditor->UI()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
 
 	s_RenameInput.SetBuffer(pSound->m_aName, sizeof(pSound->m_aName));
 	if(pEditor->DoEditBox(&s_RenameInput, &EditBox, RowHeight - 2.0f))
@@ -1785,7 +1792,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 	View.HSplitTop(5.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Slot, &View);
 
-	if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the sound from the mapres folder"))
+	if(pEditor->DoButton_MenuItem(&s_ReimportButton, "Re-import", 0, &Slot, 0, "Re-imports the sound from the mapres folder"))
 	{
 		char aFilename[IO_MAX_PATH_LENGTH];
 		str_format(aFilename, sizeof(aFilename), "%s.opus", pSound->m_aName);
@@ -1805,14 +1812,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 		else
 		{
 			str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted sound:");
-			pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
+			pEditor->Ui()->ShowPopupSelection(pEditor->Ui()->MouseX(), pEditor->Ui()->MouseY(), &s_SelectionPopupContext);
 		}
 	}
 	if(s_SelectionPopupContext.m_pSelection != nullptr)
 	{
 		const bool Result = pEditor->ReplaceSound(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
 		s_SelectionPopupContext.Reset();
-		return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+		return Result ? CUi::POPUP_CLOSE_CURRENT : CUi::POPUP_KEEP_OPEN;
 	}
 
 	View.HSplitTop(5.0f, nullptr, &View);
@@ -1820,7 +1827,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 	if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the sound with a new one"))
 	{
 		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Replace sound", "Replace", "mapres", false, ReplaceSoundCallback, pEditor);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(5.0f, nullptr, &View);
@@ -1829,22 +1836,27 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 	{
 		pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);
 		pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(5.0f, nullptr, &View);
 	View.HSplitTop(RowHeight, &Slot, &View);
 	if(pEditor->DoButton_MenuItem(&s_ExportButton, "Export", 0, &Slot, 0, "Export sound"))
 	{
+		if(pSound->m_pData == nullptr)
+		{
+			pEditor->ShowFileDialogError("Exporting is not possible because the sound could not be loaded.");
+			return CUi::POPUP_KEEP_OPEN;
+		}
 		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_SOUND, "Save sound", "Save", "mapres", false, CallbackSaveSound, pEditor);
 		pEditor->m_FileDialogFileNameInput.Set(pSound->m_aName);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -1855,12 +1867,12 @@ CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect Vi
 
 	// title
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Create new folder", 20.0f, TEXTALIGN_MC);
+	pEditor->Ui()->DoLabel(&Label, "Create new folder", 20.0f, TEXTALIGN_MC);
 	View.HSplitTop(10.0f, nullptr, &View);
 
 	// folder name
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
 	Label.VSplitLeft(50.0f, nullptr, &Button);
 	Button.HMargin(2.0f, &Button);
 	pEditor->DoEditBox(&pEditor->m_FileDialogNewFolderNameInput, &Button, 12.0f);
@@ -1869,11 +1881,11 @@ CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect Vi
 	ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
 	static int s_CancelButton = 0;
 	if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr))
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 
 	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
 	static int s_CreateButton = 0;
-	if(pEditor->DoButton_Editor(&s_CreateButton, "Create", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	if(pEditor->DoButton_Editor(&s_CreateButton, "Create", 0, &Button, 0, nullptr) || (Active && pEditor->Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 	{
 		// create the folder
 		if(!pEditor->m_FileDialogNewFolderNameInput.IsEmpty())
@@ -1883,7 +1895,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect Vi
 			if(pEditor->Storage()->CreateFolder(aBuf, IStorage::TYPE_SAVE))
 			{
 				pEditor->FilelistPopulate(IStorage::TYPE_SAVE);
-				return CUI::POPUP_CLOSE_CURRENT;
+				return CUi::POPUP_CLOSE_CURRENT;
 			}
 			else
 			{
@@ -1892,10 +1904,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect Vi
 		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -1906,12 +1918,12 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 
 	// title
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Map details", 20.0f, TEXTALIGN_MC);
+	pEditor->Ui()->DoLabel(&Label, "Map details", 20.0f, TEXTALIGN_MC);
 	View.HSplitTop(10.0f, nullptr, &View);
 
 	// author box
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Author:", 10.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Author:", 10.0f, TEXTALIGN_ML);
 	Label.VSplitLeft(60.0f, nullptr, &Button);
 	Button.HMargin(3.0f, &Button);
 	static CLineInput s_AuthorInput;
@@ -1920,7 +1932,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 
 	// version box
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Version:", 10.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Version:", 10.0f, TEXTALIGN_ML);
 	Label.VSplitLeft(60.0f, nullptr, &Button);
 	Button.HMargin(3.0f, &Button);
 	static CLineInput s_VersionInput;
@@ -1929,7 +1941,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 
 	// credits box
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "Credits:", 10.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "Credits:", 10.0f, TEXTALIGN_ML);
 	Label.VSplitLeft(60.0f, nullptr, &Button);
 	Button.HMargin(3.0f, &Button);
 	static CLineInput s_CreditsInput;
@@ -1938,7 +1950,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 
 	// license box
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, "License:", 10.0f, TEXTALIGN_ML);
+	pEditor->Ui()->DoLabel(&Label, "License:", 10.0f, TEXTALIGN_ML);
 	Label.VSplitLeft(60.0f, nullptr, &Button);
 	Button.HMargin(3.0f, &Button);
 	static CLineInput s_LicenseInput;
@@ -1949,11 +1961,11 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 	ButtonBar.VSplitLeft(110.0f, &Label, &ButtonBar);
 	static int s_CancelButton = 0;
 	if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Label, 0, nullptr))
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 
 	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Label);
 	static int s_ConfirmButton = 0;
-	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Label, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Label, 0, nullptr) || (Active && pEditor->Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 	{
 		bool AuthorDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aAuthor, pEditor->m_Map.m_MapInfo.m_aAuthor) != 0;
 		bool VersionDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aVersion, pEditor->m_Map.m_MapInfo.m_aVersion) != 0;
@@ -1964,13 +1976,13 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View
 			pEditor->m_Map.OnModify();
 
 		pEditor->m_Map.m_MapInfo.Copy(pEditor->m_Map.m_MapInfoTmp);
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2057,7 +2069,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 	else
 	{
 		dbg_assert(false, "m_PopupEventType invalid");
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	CUIRect Label, ButtonBar, Button;
@@ -2067,12 +2079,12 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 
 	// title
 	View.HSplitTop(20.0f, &Label, &View);
-	pEditor->UI()->DoLabel(&Label, pTitle, 20.0f, TEXTALIGN_MC);
+	pEditor->Ui()->DoLabel(&Label, pTitle, 20.0f, TEXTALIGN_MC);
 
 	// message
 	SLabelProperties Props;
 	Props.m_MaxWidth = View.w;
-	pEditor->UI()->DoLabel(&View, pMessage, 10.0f, TEXTALIGN_ML, Props);
+	pEditor->Ui()->DoLabel(&View, pMessage, 10.0f, TEXTALIGN_ML, Props);
 
 	// button bar
 	ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
@@ -2092,17 +2104,16 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 
 			if(pEditor->m_PopupEventType == POPEVENT_PIXELART_BIG_IMAGE || pEditor->m_PopupEventType == POPEVENT_PIXELART_MANY_COLORS)
 			{
-				free(pEditor->m_TileartImageInfo.m_pData);
-				pEditor->m_TileartImageInfo.m_pData = nullptr;
+				pEditor->m_TileartImageInfo.Free();
 			}
 
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 	}
 
 	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
 	static int s_ConfirmButton = 0;
-	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Button, 0, nullptr) || (Active && pEditor->Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
 	{
 		if(pEditor->m_PopupEventType == POPEVENT_EXIT)
 		{
@@ -2132,22 +2143,22 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 		else if(pEditor->m_PopupEventType == POPEVENT_SAVE)
 		{
 			CallbackSaveMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_COPY)
 		{
 			CallbackSaveCopyMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_IMG)
 		{
 			CallbackSaveImage(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_SOUND)
 		{
 			CallbackSaveSound(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
-			return CUI::POPUP_CLOSE_CURRENT;
+			return CUi::POPUP_CLOSE_CURRENT;
 		}
 		else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
 		{
@@ -2162,16 +2173,16 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 			pEditor->AddTileart();
 		}
 		pEditor->m_PopupEventWasActivated = false;
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 static int g_SelectImageSelected = -100;
 static int g_SelectImageCurrent = -100;
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2184,32 +2195,32 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect
 	const float ButtonHeight = 12.0f;
 	const float ButtonMargin = 2.0f;
 
-	static CScrollRegion s_ScrollRegion;
-	vec2 ScrollOffset(0.0f, 0.0f);
-	CScrollRegionParams ScrollParams;
-	ScrollParams.m_ScrollbarWidth = 10.0f;
-	ScrollParams.m_ScrollbarMargin = 3.0f;
-	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
-	s_ScrollRegion.Begin(&ButtonBar, &ScrollOffset, &ScrollParams);
-	ButtonBar.y += ScrollOffset.y;
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(ButtonHeight, pEditor->m_Map.m_vpImages.size() + 1, 1, 4, g_SelectImageCurrent + 1, &ButtonBar, false);
+	s_ListBox.DoAutoSpacing(ButtonMargin);
 
-	for(int i = -1; i < (int)pEditor->m_Map.m_vpImages.size(); i++)
+	for(int i = 0; i <= (int)pEditor->m_Map.m_vpImages.size(); i++)
 	{
-		CUIRect Button;
-		ButtonBar.HSplitTop(ButtonMargin, nullptr, &ButtonBar);
-		ButtonBar.HSplitTop(ButtonHeight, &Button, &ButtonBar);
-		if(s_ScrollRegion.AddRect(Button))
-		{
-			if(pEditor->UI()->MouseInside(&Button))
-				ShowImage = i;
+		static int s_NoneButton = 0;
+		CListboxItem Item = s_ListBox.DoNextItem(i == 0 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpImages[i - 1], (i - 1) == g_SelectImageCurrent, 3.0f);
+		if(!Item.m_Visible)
+			continue;
 
-			static int s_NoneButton = 0;
-			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpImages[i], i == -1 ? "None" : pEditor->m_Map.m_vpImages[i]->m_aName, i == g_SelectImageCurrent, &Button))
-				g_SelectImageSelected = i;
-		}
+		if(pEditor->Ui()->MouseInside(&Item.m_Rect))
+			ShowImage = i - 1;
+
+		CUIRect Label;
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		pEditor->Ui()->DoLabel(&Label, i == 0 ? "None" : pEditor->m_Map.m_vpImages[i - 1]->m_aName, EditorFontSizes::MENU, TEXTALIGN_ML, Props);
 	}
 
-	s_ScrollRegion.End();
+	int NewSelected = s_ListBox.DoEnd() - 1;
+	if(NewSelected != g_SelectImageCurrent)
+		g_SelectImageSelected = NewSelected;
 
 	if(ShowImage >= 0 && (size_t)ShowImage < pEditor->m_Map.m_vpImages.size())
 	{
@@ -2230,7 +2241,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect
 		pEditor->Graphics()->WrapNormal();
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CEditor::PopupSelectImageInvoke(int Current, float x, float y)
@@ -2238,7 +2249,7 @@ void CEditor::PopupSelectImageInvoke(int Current, float x, float y)
 	static SPopupMenuId s_PopupSelectImageId;
 	g_SelectImageSelected = -100;
 	g_SelectImageCurrent = Current;
-	UI()->DoPopupMenu(&s_PopupSelectImageId, x, y, 450, 300, this, PopupSelectImage);
+	Ui()->DoPopupMenu(&s_PopupSelectImageId, x, y, 450, 300, this, PopupSelectImage);
 }
 
 int CEditor::PopupSelectImageResult()
@@ -2254,38 +2265,38 @@ int CEditor::PopupSelectImageResult()
 static int g_SelectSoundSelected = -100;
 static int g_SelectSoundCurrent = -100;
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSelectSound(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSelectSound(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
 	const float ButtonHeight = 12.0f;
 	const float ButtonMargin = 2.0f;
 
-	static CScrollRegion s_ScrollRegion;
-	vec2 ScrollOffset(0.0f, 0.0f);
-	CScrollRegionParams ScrollParams;
-	ScrollParams.m_ScrollbarWidth = 10.0f;
-	ScrollParams.m_ScrollbarMargin = 3.0f;
-	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
-	s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
-	View.y += ScrollOffset.y;
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(ButtonHeight, pEditor->m_Map.m_vpSounds.size() + 1, 1, 4, g_SelectSoundCurrent + 1, &View, false);
+	s_ListBox.DoAutoSpacing(ButtonMargin);
 
-	for(int i = -1; i < (int)pEditor->m_Map.m_vpSounds.size(); i++)
+	for(int i = 0; i <= (int)pEditor->m_Map.m_vpSounds.size(); i++)
 	{
-		CUIRect Button;
-		View.HSplitTop(ButtonMargin, nullptr, &View);
-		View.HSplitTop(ButtonHeight, &Button, &View);
-		if(s_ScrollRegion.AddRect(Button))
-		{
-			static int s_NoneButton = 0;
-			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpSounds[i], i == -1 ? "None" : pEditor->m_Map.m_vpSounds[i]->m_aName, i == g_SelectSoundCurrent, &Button))
-				g_SelectSoundSelected = i;
-		}
+		static int s_NoneButton = 0;
+		CListboxItem Item = s_ListBox.DoNextItem(i == 0 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpSounds[i - 1], (i - 1) == g_SelectSoundCurrent, 3.0f);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Label;
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		pEditor->Ui()->DoLabel(&Label, i == 0 ? "None" : pEditor->m_Map.m_vpSounds[i - 1]->m_aName, EditorFontSizes::MENU, TEXTALIGN_ML, Props);
 	}
 
-	s_ScrollRegion.End();
+	int NewSelected = s_ListBox.DoEnd() - 1;
+	if(NewSelected != g_SelectSoundCurrent)
+		g_SelectSoundSelected = NewSelected;
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CEditor::PopupSelectSoundInvoke(int Current, float x, float y)
@@ -2293,7 +2304,7 @@ void CEditor::PopupSelectSoundInvoke(int Current, float x, float y)
 	static SPopupMenuId s_PopupSelectSoundId;
 	g_SelectSoundSelected = -100;
 	g_SelectSoundCurrent = Current;
-	UI()->DoPopupMenu(&s_PopupSelectSoundId, x, y, 150, 300, this, PopupSelectSound);
+	Ui()->DoPopupMenu(&s_PopupSelectSoundId, x, y, 150, 300, this, PopupSelectSound);
 }
 
 int CEditor::PopupSelectSoundResult()
@@ -2324,7 +2335,7 @@ static const char *s_apGametileOpButtonNames[] = {
 	"Live Unfreeze",
 };
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSelectGametileOp(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSelectGametileOp(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2339,14 +2350,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSelectGametileOp(void *pContext, CUI
 			s_GametileOpSelected = i;
 	}
 
-	return s_GametileOpSelected == PreviousSelected ? CUI::POPUP_KEEP_OPEN : CUI::POPUP_CLOSE_CURRENT;
+	return s_GametileOpSelected == PreviousSelected ? CUi::POPUP_KEEP_OPEN : CUi::POPUP_CLOSE_CURRENT;
 }
 
 void CEditor::PopupSelectGametileOpInvoke(float x, float y)
 {
 	static SPopupMenuId s_PopupSelectGametileOpId;
 	s_GametileOpSelected = -1;
-	UI()->DoPopupMenu(&s_PopupSelectGametileOpId, x, y, 120.0f, std::size(s_apGametileOpButtonNames) * 14.0f + 10.0f, this, PopupSelectGametileOp);
+	Ui()->DoPopupMenu(&s_PopupSelectGametileOpId, x, y, 120.0f, std::size(s_apGametileOpButtonNames) * 14.0f + 10.0f, this, PopupSelectGametileOp);
 }
 
 int CEditor::PopupSelectGameTileOpResult()
@@ -2362,7 +2373,7 @@ int CEditor::PopupSelectGameTileOpResult()
 static int s_AutoMapConfigSelected = -100;
 static int s_AutoMapConfigCurrent = -100;
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 	std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(pEditor->GetSelectedLayer(0));
@@ -2371,31 +2382,31 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSelectConfigAutoMap(void *pContext,
 	const float ButtonHeight = 12.0f;
 	const float ButtonMargin = 2.0f;
 
-	static CScrollRegion s_ScrollRegion;
-	vec2 ScrollOffset(0.0f, 0.0f);
-	CScrollRegionParams ScrollParams;
-	ScrollParams.m_ScrollbarWidth = 10.0f;
-	ScrollParams.m_ScrollbarMargin = 3.0f;
-	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
-	s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
-	View.y += ScrollOffset.y;
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(ButtonHeight, pAutoMapper->ConfigNamesNum() + 1, 1, 4, s_AutoMapConfigCurrent + 1, &View, false);
+	s_ListBox.DoAutoSpacing(ButtonMargin);
 
-	for(int i = -1; i < pAutoMapper->ConfigNamesNum(); i++)
+	for(int i = 0; i < pAutoMapper->ConfigNamesNum() + 1; i++)
 	{
-		CUIRect Button;
-		View.HSplitTop(ButtonMargin, nullptr, &View);
-		View.HSplitTop(ButtonHeight, &Button, &View);
-		if(s_ScrollRegion.AddRect(Button))
-		{
-			static int s_NoneButton = 0;
-			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : pAutoMapper->GetConfigName(i), i == -1 ? "None" : pAutoMapper->GetConfigName(i), i == s_AutoMapConfigCurrent, &Button))
-				s_AutoMapConfigSelected = i;
-		}
+		static int s_NoneButton = 0;
+		CListboxItem Item = s_ListBox.DoNextItem(i == 0 ? (void *)&s_NoneButton : pAutoMapper->GetConfigName(i - 1), (i - 1) == s_AutoMapConfigCurrent, 3.0f);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Label;
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		pEditor->Ui()->DoLabel(&Label, i == 0 ? "None" : pAutoMapper->GetConfigName(i - 1), EditorFontSizes::MENU, TEXTALIGN_ML, Props);
 	}
 
-	s_ScrollRegion.End();
+	int NewSelected = s_ListBox.DoEnd() - 1;
+	if(NewSelected != s_AutoMapConfigCurrent)
+		s_AutoMapConfigSelected = NewSelected;
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
 void CEditor::PopupSelectConfigAutoMapInvoke(int Current, float x, float y)
@@ -2406,7 +2417,7 @@ void CEditor::PopupSelectConfigAutoMapInvoke(int Current, float x, float y)
 	std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayer(0));
 	const int ItemCount = minimum(m_Map.m_vpImages[pLayer->m_Image]->m_AutoMapper.ConfigNamesNum(), 10);
 	// Width for buttons is 120, 15 is the scrollbar width, 2 is the margin between both.
-	UI()->DoPopupMenu(&s_PopupSelectConfigAutoMapId, x, y, 120.0f + 15.0f + 2.0f, 26.0f + 14.0f * ItemCount, this, PopupSelectConfigAutoMap);
+	Ui()->DoPopupMenu(&s_PopupSelectConfigAutoMapId, x, y, 120.0f + 15.0f + 2.0f, 26.0f + 14.0f * ItemCount, this, PopupSelectConfigAutoMap);
 }
 
 int CEditor::PopupSelectConfigAutoMapResult()
@@ -2421,77 +2432,121 @@ int CEditor::PopupSelectConfigAutoMapResult()
 
 // DDRace
 
-CUI::EPopupMenuFunctionResult CEditor::PopupTele(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupTele(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
-	static int s_PreviousNumber = -1;
+	static int s_PreviousTeleNumber;
+	static int s_PreviousCheckpointNumber;
+	static int s_PreviousViewTeleNumber;
 
 	CUIRect NumberPicker;
 	CUIRect FindEmptySlot;
+	CUIRect FindFreeTeleSlot, FindFreeCheckpointSlot, FindFreeViewSlot;
 
 	View.VSplitRight(15.f, &NumberPicker, &FindEmptySlot);
 	NumberPicker.VSplitRight(2.f, &NumberPicker, nullptr);
-	FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
-	FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
 
-	// find empty number button
+	FindEmptySlot.HSplitTop(13.0f, &FindFreeTeleSlot, &FindEmptySlot);
+	FindEmptySlot.HSplitTop(13.0f, &FindFreeCheckpointSlot, &FindEmptySlot);
+	FindEmptySlot.HSplitTop(13.0f, &FindFreeViewSlot, &FindEmptySlot);
+
+	FindFreeTeleSlot.HMargin(1.0f, &FindFreeTeleSlot);
+	FindFreeCheckpointSlot.HMargin(1.0f, &FindFreeCheckpointSlot);
+	FindFreeViewSlot.HMargin(1.0f, &FindFreeViewSlot);
+
+	auto ViewTele = [](CEditor *pEd) -> bool {
+		if(!pEd->m_ViewTeleNumber)
+			return false;
+		int TeleX, TeleY;
+		pEd->m_Map.m_pTeleLayer->GetPos(pEd->m_ViewTeleNumber, -1, TeleX, TeleY);
+		if(TeleX != -1 && TeleY != -1)
+		{
+			pEd->MapView()->SetWorldOffset({32.0f * TeleX + 0.5f, 32.0f * TeleY + 0.5f});
+			return true;
+		}
+		return false;
+	};
+
+	static std::vector<ColorRGBA> s_vColors = {
+		ColorRGBA(0.5f, 1, 0.5f, 0.5f),
+		ColorRGBA(0.5f, 1, 0.5f, 0.5f),
+		ColorRGBA(0.5f, 1, 0.5f, 0.5f),
+	};
+	enum
 	{
-		static int s_EmptySlotPid = 0;
-		if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
+		PROP_TELE = 0,
+		PROP_TELE_CP,
+		PROP_TELE_VIEW,
+		NUM_PROPS,
+	};
+
+	// find next free numbers buttons
+	{
+		// Pressing ctrl+f will find next free numbers for both tele and checkpoints
+
+		static int s_NextFreeTelePid = 0;
+		if(pEditor->DoButton_Editor(&s_NextFreeTelePid, "F", 0, &FindFreeTeleSlot, 0, "[ctrl+f] Find next free tele number") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
 		{
-			int number = -1;
-			for(int i = 1; i <= 255; i++)
-			{
-				if(!pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(i))
-				{
-					number = i;
-					break;
-				}
-			}
+			int TeleNumber = pEditor->FindNextFreeTeleNumber();
 
-			if(number != -1)
-			{
-				pEditor->m_TeleNumber = number;
-			}
+			if(TeleNumber != -1)
+				pEditor->m_TeleNumber = TeleNumber;
+		}
+
+		static int s_NextFreeCheckpointPid = 0;
+		if(pEditor->DoButton_Editor(&s_NextFreeCheckpointPid, "F", 0, &FindFreeCheckpointSlot, 0, "[ctrl+f] Find next free checkpoint number") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
+		{
+			int CPNumber = pEditor->FindNextFreeTeleNumber(true);
+
+			if(CPNumber != -1)
+				pEditor->m_TeleCheckpointNumber = CPNumber;
 		}
+
+		static int s_NextFreeViewPid = 0;
+		int btn = pEditor->DoButton_Editor(&s_NextFreeViewPid, "N", 0, &FindFreeViewSlot, 0, "[n] Show next tele with this number");
+		if(btn || (Active && pEditor->Input()->KeyPress(KEY_N)))
+			s_vColors[PROP_TELE_VIEW] = ViewTele(pEditor) ? ColorRGBA(0.5f, 1, 0.5f, 0.5f) : ColorRGBA(1, 0.5f, 0.5f, 0.5f);
 	}
 
 	// number picker
 	{
-		static ColorRGBA s_Color = ColorRGBA(0.5f, 1, 0.5f, 0.5f);
-
-		enum
-		{
-			PROP_TELE = 0,
-			NUM_PROPS,
-		};
 		CProperty aProps[] = {
-			{"Number", pEditor->m_TeleNumber, PROPTYPE_INT_STEP, 1, 255},
+			{"Number", pEditor->m_TeleNumber, PROPTYPE_INT, 1, 255},
+			{"Checkpoint", pEditor->m_TeleCheckpointNumber, PROPTYPE_INT, 1, 255},
+			{"View", pEditor->m_ViewTeleNumber, PROPTYPE_INT, 1, 255},
 			{nullptr},
 		};
 
 		static int s_aIds[NUM_PROPS] = {0};
 
-		static int NewVal = 0;
-		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
+		int NewVal = 0;
+		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_vColors);
 		if(Prop == PROP_TELE)
-		{
 			pEditor->m_TeleNumber = (NewVal - 1 + 255) % 255 + 1;
-		}
+		else if(Prop == PROP_TELE_CP)
+			pEditor->m_TeleCheckpointNumber = (NewVal - 1 + 255) % 255 + 1;
+		else if(Prop == PROP_TELE_VIEW)
+			pEditor->m_ViewTeleNumber = (NewVal - 1 + 255) % 255 + 1;
 
-		if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_TeleNumber)
-		{
-			s_Color = pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(pEditor->m_TeleNumber) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
-		}
+		if(s_PreviousTeleNumber == 1 || s_PreviousTeleNumber != pEditor->m_TeleNumber)
+			s_vColors[PROP_TELE] = pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(pEditor->m_TeleNumber, false) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+
+		if(s_PreviousCheckpointNumber == 1 || s_PreviousCheckpointNumber != pEditor->m_TeleCheckpointNumber)
+			s_vColors[PROP_TELE_CP] = pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(pEditor->m_TeleCheckpointNumber, true) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+
+		if(s_PreviousViewTeleNumber != pEditor->m_ViewTeleNumber)
+			s_vColors[PROP_TELE_VIEW] = ViewTele(pEditor) ? ColorRGBA(0.5f, 1, 0.5f, 0.5f) : ColorRGBA(1, 0.5f, 0.5f, 0.5f);
 	}
 
-	s_PreviousNumber = pEditor->m_TeleNumber;
+	s_PreviousTeleNumber = pEditor->m_TeleNumber;
+	s_PreviousCheckpointNumber = pEditor->m_TeleCheckpointNumber;
+	s_PreviousViewTeleNumber = pEditor->m_ViewTeleNumber;
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2504,8 +2559,8 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View
 	};
 
 	CProperty aProps[] = {
-		{"Force", pEditor->m_SpeedupForce, PROPTYPE_INT_STEP, 1, 255},
-		{"Max Speed", pEditor->m_SpeedupMaxSpeed, PROPTYPE_INT_STEP, 0, 255},
+		{"Force", pEditor->m_SpeedupForce, PROPTYPE_INT, 1, 255},
+		{"Max Speed", pEditor->m_SpeedupMaxSpeed, PROPTYPE_INT, 0, 255},
 		{"Angle", pEditor->m_SpeedupAngle, PROPTYPE_ANGLE_SCROLL, 0, 359},
 		{nullptr},
 	};
@@ -2527,63 +2582,82 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View
 		pEditor->m_SpeedupAngle = clamp(NewVal, 0, 359);
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupSwitch(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupSwitch(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
-	CUIRect NumberPicker, FindEmptySlot;
+	CUIRect NumberPicker, FindEmptySlot, ViewEmptySlot;
 
 	View.VSplitRight(15.0f, &NumberPicker, &FindEmptySlot);
 	NumberPicker.VSplitRight(2.0f, &NumberPicker, nullptr);
-	FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
+
+	FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, &ViewEmptySlot);
+	ViewEmptySlot.HSplitTop(13.0f, nullptr, &ViewEmptySlot);
+
 	FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
+	ViewEmptySlot.HMargin(1.0f, &ViewEmptySlot);
+
+	auto ViewSwitch = [pEditor]() -> bool {
+		if(!pEditor->m_ViewSwitch)
+			return false;
+		ivec2 SwitchPos;
+		pEditor->m_Map.m_pSwitchLayer->GetPos(pEditor->m_ViewSwitch, -1, SwitchPos);
+		if(SwitchPos != ivec2(-1, -1))
+		{
+			pEditor->MapView()->SetWorldOffset({32.0f * SwitchPos.x + 0.5f, 32.0f * SwitchPos.y + 0.5f});
+			return true;
+		}
+		return false;
+	};
+
+	static std::vector<ColorRGBA> s_vColors = {
+		ColorRGBA(1, 1, 1, 0.5f),
+		ColorRGBA(1, 1, 1, 0.5f),
+		ColorRGBA(1, 1, 1, 0.5f),
+	};
+
+	enum
+	{
+		PROP_SWITCH_NUMBER = 0,
+		PROP_SWITCH_DELAY,
+		PROP_SWITCH_VIEW,
+		NUM_PROPS,
+	};
 
 	// find empty number button
 	{
 		static int s_EmptySlotPid = 0;
 		if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
 		{
-			int Number = -1;
-			for(int i = 1; i <= 255; i++)
-			{
-				if(!pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(i))
-				{
-					Number = i;
-					break;
-				}
-			}
+			int Number = pEditor->FindNextFreeSwitchNumber();
 
 			if(Number != -1)
-			{
 				pEditor->m_SwitchNum = Number;
-			}
 		}
+
+		static int s_NextViewPid = 0;
+		int ButtonResult = pEditor->DoButton_Editor(&s_NextViewPid, "N", 0, &ViewEmptySlot, 0, "[n] Show next switcher with this number");
+		if(ButtonResult || (Active && pEditor->Input()->KeyPress(KEY_N)))
+			s_vColors[PROP_SWITCH_VIEW] = ViewSwitch() ? ColorRGBA(0.5f, 1, 0.5f, 0.5f) : ColorRGBA(1, 0.5f, 0.5f, 0.5f);
 	}
 
 	// number picker
 	static int s_PreviousNumber = -1;
+	static int s_PreviousView = -1;
 	{
-		static ColorRGBA s_Color = ColorRGBA(1, 1, 1, 0.5f);
-
-		enum
-		{
-			PROP_SWITCH_NUMBER = 0,
-			PROP_SWITCH_DELAY,
-			NUM_PROPS,
-		};
-
 		CProperty aProps[] = {
-			{"Number", pEditor->m_SwitchNum, PROPTYPE_INT_STEP, 0, 255},
-			{"Delay", pEditor->m_SwitchDelay, PROPTYPE_INT_STEP, 0, 255},
+			{"Number", pEditor->m_SwitchNum, PROPTYPE_INT, 0, 255},
+			{"Delay", pEditor->m_SwitchDelay, PROPTYPE_INT, 0, 255},
+			{"View", pEditor->m_ViewSwitch, PROPTYPE_INT, 0, 255},
 			{nullptr},
 		};
 
 		static int s_aIds[NUM_PROPS] = {0};
 		int NewVal = 0;
-		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
+		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_vColors);
 
 		if(Prop == PROP_SWITCH_NUMBER)
 		{
@@ -2593,18 +2667,23 @@ CUI::EPopupMenuFunctionResult CEditor::PopupSwitch(void *pContext, CUIRect View,
 		{
 			pEditor->m_SwitchDelay = (NewVal + 256) % 256;
 		}
-
-		if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_SwitchNum)
+		else if(Prop == PROP_SWITCH_VIEW)
 		{
-			s_Color = pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(pEditor->m_SwitchNum) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+			pEditor->m_ViewSwitch = (NewVal + 256) % 256;
 		}
+
+		if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_SwitchNum)
+			s_vColors[PROP_SWITCH_NUMBER] = pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(pEditor->m_SwitchNum) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+		if(s_PreviousView != pEditor->m_ViewSwitch)
+			s_vColors[PROP_SWITCH_VIEW] = ViewSwitch() ? ColorRGBA(0.5f, 1, 0.5f, 0.5f) : ColorRGBA(1, 0.5f, 0.5f, 0.5f);
 	}
 
 	s_PreviousNumber = pEditor->m_SwitchNum;
-	return CUI::POPUP_KEEP_OPEN;
+	s_PreviousView = pEditor->m_ViewSwitch;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2615,7 +2694,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, b
 	};
 
 	CProperty aProps[] = {
-		{"Zone", pEditor->m_TuningNum, PROPTYPE_INT_STEP, 1, 255},
+		{"Zone", pEditor->m_TuningNum, PROPTYPE_INT, 1, 255},
 		{nullptr},
 	};
 
@@ -2628,10 +2707,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, b
 		pEditor->m_TuningNum = (NewVal - 1 + 255) % 255 + 1;
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2645,14 +2724,14 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, b
 	static ivec2 s_GotoPos(0, 0);
 
 	CProperty aProps[] = {
-		{"X", s_GotoPos.x, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
-		{"Y", s_GotoPos.y, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
+		{"X", s_GotoPos.x, PROPTYPE_INT, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
+		{"Y", s_GotoPos.y, PROPTYPE_INT, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
 		{nullptr},
 	};
 
 	static int s_aIds[NUM_PROPS] = {0};
 	int NewVal = 0;
-	int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal, ColorRGBA(1, 1, 1, 0.5f));
+	int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
 
 	if(Prop == PROP_COORD_X)
 	{
@@ -2672,10 +2751,10 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, b
 		pEditor->MapView()->SetWorldOffset({32.0f * s_GotoPos.x + 0.5f, 32.0f * s_GotoPos.y + 0.5f});
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupEntities(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupEntities(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2689,25 +2768,30 @@ CUI::EPopupMenuFunctionResult CEditor::PopupEntities(void *pContext, CUIRect Vie
 		{
 			if(pEditor->m_vSelectEntitiesFiles[i] != pEditor->m_SelectEntitiesImage)
 			{
+				if(i == pEditor->m_vSelectEntitiesFiles.size() - 1)
+				{
+					pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Custom Entities", "Load", "assets/entities", false, CallbackCustomEntities, pEditor);
+					return CUi::POPUP_CLOSE_CURRENT;
+				}
+
 				pEditor->m_SelectEntitiesImage = pEditor->m_vSelectEntitiesFiles[i];
 				pEditor->m_AllowPlaceUnusedTiles = pEditor->m_SelectEntitiesImage == "DDNet" ? 0 : -1;
 				pEditor->m_PreventUnusedTilesWasWarned = false;
 
-				if(pEditor->m_EntitiesTexture.IsValid())
-					pEditor->Graphics()->UnloadTexture(&pEditor->m_EntitiesTexture);
+				pEditor->Graphics()->UnloadTexture(&pEditor->m_EntitiesTexture);
 
 				char aBuf[IO_MAX_PATH_LENGTH];
 				str_format(aBuf, sizeof(aBuf), "editor/entities/%s.png", pName);
 				pEditor->m_EntitiesTexture = pEditor->Graphics()->LoadTexture(aBuf, IStorage::TYPE_ALL, pEditor->GetTextureUsageFlag());
-				return CUI::POPUP_CLOSE_CURRENT;
+				return CUi::POPUP_CLOSE_CURRENT;
 			}
 		}
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
 
-CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect View, bool Active)
+CUi::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect View, bool Active)
 {
 	CEditor *pEditor = static_cast<CEditor *>(pContext);
 
@@ -2717,7 +2801,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect Vi
 	if(pEditor->DoButton_MenuItem(&s_ButtonIngame, "Ingame", pEditor->MapView()->ProofMode()->IsModeIngame(), &Button, 0, "These borders represent what a player maximum can see."))
 	{
 		pEditor->MapView()->ProofMode()->SetModeIngame();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
 	}
 
 	View.HSplitTop(2.0f, nullptr, &View);
@@ -2726,8 +2810,65 @@ CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect Vi
 	if(pEditor->DoButton_MenuItem(&s_ButtonMenu, "Menu", pEditor->MapView()->ProofMode()->IsModeMenu(), &Button, 0, "These borders represent what will be shown in the menu."))
 	{
 		pEditor->MapView()->ProofMode()->SetModeMenu();
-		return CUI::POPUP_CLOSE_CURRENT;
+		return CUi::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUi::POPUP_KEEP_OPEN;
+}
+
+CUi::EPopupMenuFunctionResult CEditor::PopupAnimateSettings(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	constexpr float MIN_ANIM_SPEED = 0.001f;
+	constexpr float MAX_ANIM_SPEED = 1000000.0f;
+
+	CUIRect Row, Label, ButtonDecrease, EditBox, ButtonIncrease, ButtonReset;
+	View.HSplitTop(13.0f, &Row, &View);
+	Row.VSplitMid(&Label, &Row);
+	Row.HMargin(1.0f, &Row);
+	Row.VSplitLeft(10.0f, &ButtonDecrease, &Row);
+	Row.VSplitRight(10.0f, &EditBox, &ButtonIncrease);
+	View.HSplitBottom(12.0f, &View, &ButtonReset);
+	pEditor->Ui()->DoLabel(&Label, "Speed", 10.0f, TEXTALIGN_ML);
+
+	static char s_DecreaseButton;
+	if(pEditor->DoButton_FontIcon(&s_DecreaseButton, FONT_ICON_MINUS, 0, &ButtonDecrease, 0, "Decrease animation speed", IGraphics::CORNER_L, 7.0f))
+	{
+		pEditor->m_AnimateSpeed -= pEditor->m_AnimateSpeed <= 1.0f ? 0.1f : 0.5f;
+		pEditor->m_AnimateSpeed = maximum(pEditor->m_AnimateSpeed, MIN_ANIM_SPEED);
+		pEditor->m_AnimateUpdatePopup = true;
+	}
+
+	static char s_IncreaseButton;
+	if(pEditor->DoButton_FontIcon(&s_IncreaseButton, FONT_ICON_PLUS, 0, &ButtonIncrease, 0, "Increase animation speed", IGraphics::CORNER_R, 7.0f))
+	{
+		if(pEditor->m_AnimateSpeed < 0.1f)
+			pEditor->m_AnimateSpeed = 0.1f;
+		else
+			pEditor->m_AnimateSpeed += pEditor->m_AnimateSpeed < 1.0f ? 0.1f : 0.5f;
+		pEditor->m_AnimateSpeed = minimum(pEditor->m_AnimateSpeed, MAX_ANIM_SPEED);
+		pEditor->m_AnimateUpdatePopup = true;
+	}
+
+	static char s_DefaultButton;
+	if(pEditor->DoButton_Ex(&s_DefaultButton, "Default", 0, &ButtonReset, 0, "Normal animation speed", IGraphics::CORNER_ALL))
+	{
+		pEditor->m_AnimateSpeed = 1.0f;
+		pEditor->m_AnimateUpdatePopup = true;
+	}
+
+	static CLineInputNumber s_SpeedInput;
+	if(pEditor->m_AnimateUpdatePopup)
+	{
+		s_SpeedInput.SetFloat(pEditor->m_AnimateSpeed);
+		pEditor->m_AnimateUpdatePopup = false;
+	}
+
+	if(pEditor->DoEditBox(&s_SpeedInput, &EditBox, 10.0f, IGraphics::CORNER_NONE, "The animation speed"))
+	{
+		pEditor->m_AnimateSpeed = clamp(s_SpeedInput.GetFloat(), MIN_ANIM_SPEED, MAX_ANIM_SPEED);
 	}
 
-	return CUI::POPUP_KEEP_OPEN;
+	return CUi::POPUP_KEEP_OPEN;
 }
diff --git a/src/game/editor/prompt.cpp b/src/game/editor/prompt.cpp
new file mode 100644
index 0000000000..822651e004
--- /dev/null
+++ b/src/game/editor/prompt.cpp
@@ -0,0 +1,166 @@
+#include <engine/keys.h>
+#include <game/client/ui_listbox.h>
+#include <game/editor/quick_action.h>
+
+#include "editor.h"
+
+#include "prompt.h"
+
+bool FuzzyMatch(const char *pHaystack, const char *pNeedle)
+{
+	if(!pNeedle || !pNeedle[0])
+		return false;
+	char aBuf[2] = {0};
+	const char *pHit = pHaystack;
+	int NeedleLen = str_length(pNeedle);
+	for(int i = 0; i < NeedleLen; i++)
+	{
+		if(!pHit)
+			return false;
+		aBuf[0] = pNeedle[i];
+		pHit = str_find_nocase(pHit, aBuf);
+		if(pHit)
+			pHit++;
+	}
+	return pHit;
+}
+
+bool CPrompt::IsActive()
+{
+	return CEditorComponent::IsActive() || Editor()->m_Dialog == DIALOG_QUICK_PROMPT;
+}
+
+void CPrompt::SetActive()
+{
+	Editor()->m_Dialog = DIALOG_QUICK_PROMPT;
+	CEditorComponent::SetActive();
+
+	Ui()->SetActiveItem(&m_PromptInput);
+}
+
+void CPrompt::SetInactive()
+{
+	m_ResetFilterResults = true;
+	m_PromptInput.Clear();
+	if(Editor()->m_Dialog == DIALOG_QUICK_PROMPT)
+		Editor()->m_Dialog = DIALOG_NONE;
+	CEditorComponent::SetInactive();
+}
+
+bool CPrompt::OnInput(const IInput::CEvent &Event)
+{
+	if(Input()->ModifierIsPressed() && Input()->KeyIsPressed(KEY_P))
+	{
+		SetActive();
+	}
+	return false;
+}
+
+void CPrompt::OnInit(CEditor *pEditor)
+{
+	CEditorComponent::OnInit(pEditor);
+
+#define REGISTER_QUICK_ACTION(name, text, callback, disabled, active, button_color, description) m_vQuickActions.emplace_back(&Editor()->m_QuickAction##name);
+#include <game/editor/quick_actions.h>
+#undef REGISTER_QUICK_ACTION
+}
+
+void CPrompt::OnRender(CUIRect _)
+{
+	if(!IsActive())
+		return;
+
+	if(Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
+	{
+		SetInactive();
+		return;
+	}
+
+	static CListBox s_ListBox;
+	CUIRect Prompt, PromptBox;
+	CUIRect Suggestions;
+
+	Ui()->MapScreen();
+	CUIRect Overlay = *Ui()->Screen();
+
+	Overlay.Draw(ColorRGBA(0, 0, 0, 0.33f), IGraphics::CORNER_NONE, 0.0f);
+	CUIRect Background;
+	Overlay.VMargin(150.0f, &Background);
+	Background.HMargin(50.0f, &Background);
+	Background.Draw(ColorRGBA(0, 0, 0, 0.80f), IGraphics::CORNER_ALL, 5.0f);
+
+	Background.Margin(10.0f, &Prompt);
+
+	Prompt.VSplitMid(nullptr, &PromptBox);
+
+	Prompt.HSplitTop(16.0f, &PromptBox, &Suggestions);
+	PromptBox.Draw(ColorRGBA(0, 0, 0, 0.75f), IGraphics::CORNER_ALL, 2.0f);
+	Suggestions.y += 6.0f;
+
+	if(Ui()->DoClearableEditBox(&m_PromptInput, &PromptBox, 10.0f) || m_ResetFilterResults)
+	{
+		m_PromptSelectedIndex = 0;
+		m_vpFilteredPromptList.clear();
+		if(m_ResetFilterResults && m_pLastAction && !m_pLastAction->Disabled())
+		{
+			m_vpFilteredPromptList.push_back(m_pLastAction);
+		}
+		for(auto *pQuickAction : m_vQuickActions)
+		{
+			if(pQuickAction->Disabled())
+				continue;
+
+			if(m_PromptInput.IsEmpty() || FuzzyMatch(pQuickAction->Label(), m_PromptInput.GetString()))
+			{
+				if(!m_ResetFilterResults || pQuickAction != m_pLastAction)
+					m_vpFilteredPromptList.push_back(pQuickAction);
+			}
+		}
+		m_ResetFilterResults = false;
+	}
+
+	s_ListBox.SetActive(!Ui()->IsPopupOpen());
+	s_ListBox.DoStart(15.0f, m_vpFilteredPromptList.size(), 1, 5, m_PromptSelectedIndex, &Suggestions, false);
+
+	float LabelWidth = Overlay.w > 855.0f ? 200.0f : 100.0f;
+
+	for(size_t i = 0; i < m_vpFilteredPromptList.size(); i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(m_vpFilteredPromptList[i]->ActionButtonId(), m_PromptSelectedIndex >= 0 && (size_t)m_PromptSelectedIndex == i);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect LabelColumn, DescColumn;
+		float Margin = 5.0f;
+		Item.m_Rect.VMargin(Margin, &LabelColumn);
+		LabelColumn.VSplitLeft(LabelWidth, &LabelColumn, &DescColumn);
+		DescColumn.VSplitLeft(Margin, nullptr, &DescColumn);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = LabelColumn.w;
+		Props.m_EllipsisAtEnd = true;
+		Ui()->DoLabel(&LabelColumn, m_vpFilteredPromptList[i]->Label(), 10.0f, TEXTALIGN_ML, Props);
+
+		Props.m_MaxWidth = DescColumn.w;
+		TextRender()->TextColor(TextRender()->DefaultTextColor().WithAlpha(Item.m_Selected ? 1.0f : 0.8f));
+		Ui()->DoLabel(&DescColumn, m_vpFilteredPromptList[i]->Description(), 10.0f, TEXTALIGN_MR, Props);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(m_PromptSelectedIndex != NewSelected)
+	{
+		m_PromptSelectedIndex = NewSelected;
+	}
+
+	if(s_ListBox.WasItemActivated())
+	{
+		if(m_PromptSelectedIndex >= 0)
+		{
+			CQuickAction *pBtn = m_vpFilteredPromptList[m_PromptSelectedIndex];
+			SetInactive();
+			pBtn->Call();
+			m_pLastAction = pBtn;
+		}
+	}
+}
diff --git a/src/game/editor/prompt.h b/src/game/editor/prompt.h
new file mode 100644
index 0000000000..2d873e580c
--- /dev/null
+++ b/src/game/editor/prompt.h
@@ -0,0 +1,29 @@
+#ifndef GAME_EDITOR_PROMPT_H
+#define GAME_EDITOR_PROMPT_H
+
+#include <game/client/lineinput.h>
+#include <game/client/ui_rect.h>
+#include <game/editor/quick_action.h>
+
+#include "component.h"
+
+class CPrompt : public CEditorComponent
+{
+	bool m_ResetFilterResults = true;
+	CQuickAction *m_pLastAction = nullptr;
+	int m_PromptSelectedIndex = -1;
+
+	std::vector<CQuickAction *> m_vpFilteredPromptList;
+	std::vector<CQuickAction *> m_vQuickActions;
+	CLineInputBuffered<512> m_PromptInput;
+
+public:
+	void OnInit(CEditor *pEditor) override;
+	bool OnInput(const IInput::CEvent &Event) override;
+	void OnRender(CUIRect _) override;
+	bool IsActive();
+	void SetActive();
+	void SetInactive();
+};
+
+#endif
diff --git a/src/game/editor/proof_mode.cpp b/src/game/editor/proof_mode.cpp
index 773e356d12..769fee4989 100644
--- a/src/game/editor/proof_mode.cpp
+++ b/src/game/editor/proof_mode.cpp
@@ -4,9 +4,9 @@
 
 #include "editor.h"
 
-void CProofMode::Init(CEditor *pEditor)
+void CProofMode::OnInit(CEditor *pEditor)
 {
-	CEditorComponent::Init(pEditor);
+	CEditorComponent::OnInit(pEditor);
 	SetMenuBackgroundPositionNames();
 	OnReset();
 	OnMapLoad();
@@ -47,6 +47,7 @@ void CProofMode::SetMenuBackgroundPositionNames()
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM1] = "custom(2)";
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM2] = "custom(3)";
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM3] = "custom(4)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM4] = "custom(5)";
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED0] = "reserved settings(1)";
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED1] = "reserved settings(2)";
 	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED0] = "reserved(1)";
diff --git a/src/game/editor/proof_mode.h b/src/game/editor/proof_mode.h
index 81b77f8eac..ffffd84732 100644
--- a/src/game/editor/proof_mode.h
+++ b/src/game/editor/proof_mode.h
@@ -6,7 +6,7 @@
 class CProofMode : public CEditorComponent
 {
 public:
-	void Init(CEditor *pEditor) override;
+	void OnInit(CEditor *pEditor) override;
 	void OnReset() override;
 	void OnMapLoad() override;
 	void RenderScreenSizes();
diff --git a/src/game/editor/quick_action.h b/src/game/editor/quick_action.h
new file mode 100644
index 0000000000..b6bb686345
--- /dev/null
+++ b/src/game/editor/quick_action.h
@@ -0,0 +1,73 @@
+#ifndef GAME_EDITOR_QUICK_ACTION_H
+#define GAME_EDITOR_QUICK_ACTION_H
+
+#include <functional>
+#include <utility>
+
+typedef std::function<void()> FButtonClickCallback;
+typedef std::function<bool()> FButtonDisabledCallback;
+typedef std::function<bool()> FButtonActiveCallback;
+typedef std::function<int()> FButtonColorCallback;
+
+class CQuickAction
+{
+private:
+	const char *m_pLabel;
+	const char *m_pDescription;
+
+	FButtonClickCallback m_pfnCallback;
+	FButtonDisabledCallback m_pfnDisabledCallback;
+	FButtonActiveCallback m_pfnActiveCallback;
+	FButtonColorCallback m_pfnColorCallback;
+
+	const char m_ActionButtonId = 0;
+
+public:
+	CQuickAction(
+		const char *pLabel,
+		const char *pDescription,
+		FButtonClickCallback pfnCallback,
+		FButtonDisabledCallback pfnDisabledCallback,
+		FButtonActiveCallback pfnActiveCallback,
+		FButtonColorCallback pfnColorCallback) :
+		m_pLabel(pLabel),
+		m_pDescription(pDescription),
+		m_pfnCallback(std::move(pfnCallback)),
+		m_pfnDisabledCallback(std::move(pfnDisabledCallback)),
+		m_pfnActiveCallback(std::move(pfnActiveCallback)),
+		m_pfnColorCallback(std::move(pfnColorCallback))
+	{
+	}
+
+	// code to run when the action is triggered
+	void Call() const { m_pfnCallback(); }
+
+	// bool that indicates if the action can be performed not or not
+	bool Disabled() { return m_pfnDisabledCallback(); }
+
+	// bool that indicates if the action is currently running
+	// only applies to actions that can be turned on or off like proof borders
+	bool Active() { return m_pfnActiveCallback(); }
+
+	// color "enum" that represents the state of the quick actions button
+	// used as Checked argument for DoButton_Editor()
+	int Color() { return m_pfnColorCallback(); }
+
+	const char *Label() const { return m_pLabel; }
+
+	// skips to the part of the label after the first colon
+	// useful for buttons that only show the state
+	const char *LabelShort() const
+	{
+		const char *pShort = str_find(m_pLabel, ": ");
+		if(!pShort)
+			return m_pLabel;
+		return pShort + 2;
+	}
+
+	const char *Description() const { return m_pDescription; }
+
+	const void *ActionButtonId() const { return &m_ActionButtonId; }
+};
+
+#endif
diff --git a/src/game/editor/quick_actions.cpp b/src/game/editor/quick_actions.cpp
new file mode 100644
index 0000000000..852ce48d61
--- /dev/null
+++ b/src/game/editor/quick_actions.cpp
@@ -0,0 +1,216 @@
+#include <engine/keys.h>
+#include <game/mapitems.h>
+
+#include "editor.h"
+
+#include "editor_actions.h"
+
+void CEditor::FillGameTiles(EGameTileOp FillTile) const
+{
+	std::shared_ptr<CLayerTiles> pTileLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+	if(pTileLayer)
+		pTileLayer->FillGameTiles(FillTile);
+}
+
+bool CEditor::CanFillGameTiles() const
+{
+	std::shared_ptr<CLayerTiles> pTileLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+	if(pTileLayer)
+		return pTileLayer->CanFillGameTiles();
+	return false;
+}
+
+void CEditor::AddQuadOrSound()
+{
+	std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+	if(!pLayer)
+		return;
+	if(pLayer->m_Type != LAYERTYPE_QUADS && pLayer->m_Type != LAYERTYPE_SOUNDS)
+		return;
+
+	std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+
+	float aMapping[4];
+	pGroup->Mapping(aMapping);
+	int x = aMapping[0] + (aMapping[2] - aMapping[0]) / 2;
+	int y = aMapping[1] + (aMapping[3] - aMapping[1]) / 2;
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && Input()->ModifierIsPressed())
+	{
+		x += Ui()->MouseWorldX() - (MapView()->GetWorldOffset().x * pGroup->m_ParallaxX / 100) - pGroup->m_OffsetX;
+		y += Ui()->MouseWorldY() - (MapView()->GetWorldOffset().y * pGroup->m_ParallaxY / 100) - pGroup->m_OffsetY;
+	}
+
+	if(pLayer->m_Type == LAYERTYPE_QUADS)
+		m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptyQuad>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
+	else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+		m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptySound>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
+}
+
+void CEditor::AddGroup()
+{
+	m_Map.NewGroup();
+	m_SelectedGroup = m_Map.m_vpGroups.size() - 1;
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionGroup>(this, m_SelectedGroup, false));
+}
+
+void CEditor::AddSoundLayer()
+{
+	std::shared_ptr<CLayer> pSoundLayer = std::make_shared<CLayerSounds>(this);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pSoundLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse = false;
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddTileLayer()
+{
+	std::shared_ptr<CLayer> pTileLayer = std::make_shared<CLayerTiles>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	pTileLayer->m_pEditor = this;
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pTileLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse = false;
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddQuadsLayer()
+{
+	std::shared_ptr<CLayer> pQuadLayer = std::make_shared<CLayerQuads>(this);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pQuadLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse = false;
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddSwitchLayer()
+{
+	std::shared_ptr<CLayer> pSwitchLayer = std::make_shared<CLayerSwitch>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	m_Map.MakeSwitchLayer(pSwitchLayer);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pSwitchLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_pBrush->Clear();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddFrontLayer()
+{
+	std::shared_ptr<CLayer> pFrontLayer = std::make_shared<CLayerFront>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	m_Map.MakeFrontLayer(pFrontLayer);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pFrontLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_pBrush->Clear();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddTuneLayer()
+{
+	std::shared_ptr<CLayer> pTuneLayer = std::make_shared<CLayerTune>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	m_Map.MakeTuneLayer(pTuneLayer);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pTuneLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_pBrush->Clear();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddSpeedupLayer()
+{
+	std::shared_ptr<CLayer> pSpeedupLayer = std::make_shared<CLayerSpeedup>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	m_Map.MakeSpeedupLayer(pSpeedupLayer);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pSpeedupLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_pBrush->Clear();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+void CEditor::AddTeleLayer()
+{
+	std::shared_ptr<CLayer> pTeleLayer = std::make_shared<CLayerTele>(this, m_Map.m_pGameLayer->m_Width, m_Map.m_pGameLayer->m_Height);
+	m_Map.MakeTeleLayer(pTeleLayer);
+	m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pTeleLayer);
+	int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
+	SelectLayer(LayerIndex);
+	m_pBrush->Clear();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
+}
+
+bool CEditor::IsNonGameTileLayerSelected() const
+{
+	std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+	if(!pLayer)
+		return false;
+	if(pLayer->m_Type != LAYERTYPE_TILES)
+		return false;
+	if(
+		pLayer == m_Map.m_pGameLayer ||
+		pLayer == m_Map.m_pFrontLayer ||
+		pLayer == m_Map.m_pSwitchLayer ||
+		pLayer == m_Map.m_pTeleLayer ||
+		pLayer == m_Map.m_pSpeedupLayer ||
+		pLayer == m_Map.m_pTuneLayer)
+		return false;
+
+	return true;
+}
+
+void CEditor::LayerSelectImage()
+{
+	if(!IsNonGameTileLayerSelected())
+		return;
+
+	std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+	std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+
+	static SLayerPopupContext s_LayerPopupContext = {};
+	s_LayerPopupContext.m_pEditor = this;
+	Ui()->DoPopupMenu(&s_LayerPopupContext, Ui()->MouseX(), Ui()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer);
+	PopupSelectImageInvoke(pTiles->m_Image, Ui()->MouseX(), Ui()->MouseY());
+}
+
+void CEditor::MapDetails()
+{
+	const CUIRect *pScreen = Ui()->Screen();
+	m_Map.m_MapInfoTmp.Copy(m_Map.m_MapInfo);
+	static SPopupMenuId s_PopupMapInfoId;
+	constexpr float PopupWidth = 400.0f;
+	constexpr float PopupHeight = 170.0f;
+	Ui()->DoPopupMenu(
+		&s_PopupMapInfoId,
+		pScreen->w / 2.0f - PopupWidth / 2.0f,
+		pScreen->h / 2.0f - PopupHeight / 2.0f,
+		PopupWidth,
+		PopupHeight,
+		this,
+		PopupMapInfo);
+	Ui()->SetActiveItem(nullptr);
+}
+
+void CEditor::DeleteSelectedLayer()
+{
+	std::shared_ptr<CLayer> pCurrentLayer = GetSelectedLayer(0);
+	if(!pCurrentLayer)
+		return;
+	if(m_Map.m_pGameLayer == pCurrentLayer)
+		return;
+
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionDeleteLayer>(this, m_SelectedGroup, m_vSelectedLayers[0]));
+
+	if(pCurrentLayer == m_Map.m_pFrontLayer)
+		m_Map.m_pFrontLayer = nullptr;
+	if(pCurrentLayer == m_Map.m_pTeleLayer)
+		m_Map.m_pTeleLayer = nullptr;
+	if(pCurrentLayer == m_Map.m_pSpeedupLayer)
+		m_Map.m_pSpeedupLayer = nullptr;
+	if(pCurrentLayer == m_Map.m_pSwitchLayer)
+		m_Map.m_pSwitchLayer = nullptr;
+	if(pCurrentLayer == m_Map.m_pTuneLayer)
+		m_Map.m_pTuneLayer = nullptr;
+	m_Map.m_vpGroups[m_SelectedGroup]->DeleteLayer(m_vSelectedLayers[0]);
+
+	SelectPreviousLayer();
+}
diff --git a/src/game/editor/quick_actions.h b/src/game/editor/quick_actions.h
new file mode 100644
index 0000000000..f1e1b282fb
--- /dev/null
+++ b/src/game/editor/quick_actions.h
@@ -0,0 +1,372 @@
+// This file can be included several times.
+
+#ifndef REGISTER_QUICK_ACTION
+#define REGISTER_QUICK_ACTION(name, text, callback, disabled, active, button_color, description)
+#endif
+
+#define ALWAYS_FALSE []() -> bool { return false; }
+#define DEFAULT_BTN []() -> int { return -1; }
+
+REGISTER_QUICK_ACTION(
+	ToggleGrid,
+	"Toggle Grid",
+	[&]() { MapView()->MapGrid()->Toggle(); },
+	ALWAYS_FALSE,
+	[&]() -> bool { return MapView()->MapGrid()->IsEnabled(); },
+	DEFAULT_BTN,
+	"[Ctrl+G] Toggle Grid.")
+REGISTER_QUICK_ACTION(
+	GameTilesAir,
+	"Game tiles: Air",
+	[&]() { FillGameTiles(EGameTileOp::AIR); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesHookable,
+	"Game tiles: Hookable",
+	[&]() { FillGameTiles(EGameTileOp::HOOKABLE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesDeath,
+	"Game tiles: Death",
+	[&]() { FillGameTiles(EGameTileOp::DEATH); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesUnhookable,
+	"Game tiles: Unhookable",
+	[&]() { FillGameTiles(EGameTileOp::UNHOOKABLE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesHookthrough,
+	"Game tiles: Hookthrough",
+	[&]() { FillGameTiles(EGameTileOp::HOOKTHROUGH); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesFreeze,
+	"Game tiles: Freeze",
+	[&]() { FillGameTiles(EGameTileOp::FREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesUnfreeze,
+	"Game tiles: Unfreeze",
+	[&]() { FillGameTiles(EGameTileOp::UNFREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesDeepFreeze,
+	"Game tiles: Deep Freeze",
+	[&]() { FillGameTiles(EGameTileOp::DEEP_FREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesDeepUnfreeze,
+	"Game tiles: Deep Unfreeze",
+	[&]() { FillGameTiles(EGameTileOp::DEEP_UNFREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesBlueCheckTele,
+	"Game tiles: Blue Check Tele",
+	[&]() { FillGameTiles(EGameTileOp::BLUE_CHECK_TELE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesRedCheckTele,
+	"Game tiles: Red Check Tele",
+	[&]() { FillGameTiles(EGameTileOp::RED_CHECK_TELE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesLiveFreeze,
+	"Game tiles: Live Freeze",
+	[&]() { FillGameTiles(EGameTileOp::LIVE_FREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	GameTilesLiveUnfreeze,
+	"Game tiles: Live Unfreeze",
+	[&]() { FillGameTiles(EGameTileOp::LIVE_UNFREEZE); },
+	[&]() -> bool { return !CanFillGameTiles(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Constructs game tiles from this layer.")
+REGISTER_QUICK_ACTION(
+	AddGroup,
+	"Add group",
+	[&]() { AddGroup(); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Adds a new group.")
+REGISTER_QUICK_ACTION(
+	ResetZoom,
+	"Reset Zoom",
+	[&]() { MapView()->ResetZoom(); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Numpad*] Zoom to normal and remove editor offset.")
+REGISTER_QUICK_ACTION(
+	ZoomOut,
+	"Zoom Out",
+	[&]() { MapView()->Zoom()->ChangeValue(50.0f); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Numpad-] Zoom out.")
+REGISTER_QUICK_ACTION(
+	ZoomIn,
+	"Zoom In",
+	[&]() { MapView()->Zoom()->ChangeValue(-50.0f); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Numpad+] Zoom in.")
+REGISTER_QUICK_ACTION(
+	Refocus,
+	"Refocus",
+	[&]() { MapView()->Focus(); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Home] Restore map focus.")
+REGISTER_QUICK_ACTION(
+	Proof,
+	"Proof",
+	[&]() { MapView()->ProofMode()->Toggle(); },
+	ALWAYS_FALSE,
+	[&]() -> bool { return MapView()->ProofMode()->IsEnabled(); },
+	DEFAULT_BTN,
+	"Toggles proof borders. These borders represent the area that a player can see with default zoom.")
+REGISTER_QUICK_ACTION(
+	AddTileLayer, "Add tile layer", [&]() { AddTileLayer(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "Creates a new tile layer.")
+REGISTER_QUICK_ACTION(
+	AddSwitchLayer,
+	"Add switch layer",
+	[&]() { AddSwitchLayer(); },
+	[&]() -> bool { return !GetSelectedGroup()->m_GameGroup || m_Map.m_pSwitchLayer; },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Creates a new switch layer.")
+REGISTER_QUICK_ACTION(
+	AddTuneLayer,
+	"Add tune layer",
+	[&]() { AddTuneLayer(); },
+	[&]() -> bool { return !GetSelectedGroup()->m_GameGroup || m_Map.m_pTuneLayer; },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Creates a new tuning layer.")
+REGISTER_QUICK_ACTION(
+	AddSpeedupLayer,
+	"Add speedup layer",
+	[&]() { AddSpeedupLayer(); },
+	[&]() -> bool { return !GetSelectedGroup()->m_GameGroup || m_Map.m_pSpeedupLayer; },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Creates a new speedup layer.")
+REGISTER_QUICK_ACTION(
+	AddTeleLayer,
+	"Add tele layer",
+	[&]() { AddTeleLayer(); },
+	[&]() -> bool { return !GetSelectedGroup()->m_GameGroup || m_Map.m_pTeleLayer; },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Creates a new tele layer.")
+REGISTER_QUICK_ACTION(
+	AddFrontLayer,
+	"Add front layer",
+	[&]() { AddFrontLayer(); },
+	[&]() -> bool { return !GetSelectedGroup()->m_GameGroup || m_Map.m_pFrontLayer; },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Creates a new item layer.")
+REGISTER_QUICK_ACTION(
+	AddQuadsLayer, "Add quads layer", [&]() { AddQuadsLayer(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "Creates a new quads layer.")
+REGISTER_QUICK_ACTION(
+	AddSoundLayer, "Add sound layer", [&]() { AddSoundLayer(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "Creates a new sound layer.")
+REGISTER_QUICK_ACTION(
+	SaveAs,
+	"Save As",
+	[&]() { InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save As", "maps", true, CEditor::CallbackSaveMap, this); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Ctrl+Shift+S] Saves the current map under a new name.")
+REGISTER_QUICK_ACTION(
+	LoadCurrentMap,
+	"Load Current Map",
+	[&]() {
+		if(HasUnsavedData())
+		{
+			m_PopupEventType = POPEVENT_LOADCURRENT;
+			m_PopupEventActivated = true;
+		}
+		else
+		{
+			LoadCurrentMap();
+		}
+	},
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Ctrl+Alt+L] Opens the current in game map for editing.")
+REGISTER_QUICK_ACTION(
+	Envelopes,
+	"Envelopes",
+	[&]() { m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES ? EXTRAEDITOR_NONE : EXTRAEDITOR_ENVELOPES; },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	[&]() -> int { return m_ShowPicker ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES; },
+	"Toggles the envelope editor.")
+REGISTER_QUICK_ACTION(
+	ServerSettings,
+	"Server settings",
+	[&]() { m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS ? EXTRAEDITOR_NONE : EXTRAEDITOR_SERVER_SETTINGS; },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	[&]() -> int { return m_ShowPicker ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS; },
+	"Toggles the server settings editor.")
+REGISTER_QUICK_ACTION(
+	History,
+	"History",
+	[&]() { m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_HISTORY ? EXTRAEDITOR_NONE : EXTRAEDITOR_HISTORY; },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	[&]() -> int { return m_ShowPicker ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_HISTORY; },
+	"Toggles the editor history view.")
+REGISTER_QUICK_ACTION(
+	AddImage,
+	"Add Image",
+	[&]() { InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Add Image", "Add", "mapres", false, AddImage, this); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Load a new image to use in the map.")
+REGISTER_QUICK_ACTION(
+	LayerPropAddImage,
+	"Layer: Add Image",
+	[&]() { LayerSelectImage(); },
+	[&]() -> bool { return !IsNonGameTileLayerSelected(); },
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Pick mapres image for currently selected layer.")
+REGISTER_QUICK_ACTION(
+	ShowInfoOff,
+	"Show Info: Off",
+	[&]() {
+		m_ShowTileInfo = SHOW_TILE_OFF;
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	},
+	ALWAYS_FALSE,
+	[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_OFF; },
+	DEFAULT_BTN,
+	"Do not show tile information.")
+REGISTER_QUICK_ACTION(
+	ShowInfoDec,
+	"Show Info: Dec",
+	[&]() {
+		m_ShowTileInfo = SHOW_TILE_DECIMAL;
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	},
+	ALWAYS_FALSE,
+	[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_DECIMAL; },
+	DEFAULT_BTN,
+	"[Ctrl+I] Show tile information.")
+REGISTER_QUICK_ACTION(
+	ShowInfoHex,
+	"Show Info: Hex",
+	[&]() {
+		m_ShowTileInfo = SHOW_TILE_HEXADECIMAL;
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	},
+	ALWAYS_FALSE,
+	[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_HEXADECIMAL; },
+	DEFAULT_BTN,
+	"[Ctrl+Shift+I] Show tile information in hexadecimal.")
+REGISTER_QUICK_ACTION(
+	DeleteLayer,
+	"Delete layer",
+	[&]() { DeleteSelectedLayer(); },
+	[&]() -> bool {
+		std::shared_ptr<CLayer> pCurrentLayer = GetSelectedLayer(0);
+		if(!pCurrentLayer)
+			return true;
+		return m_Map.m_pGameLayer == pCurrentLayer;
+	},
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Deletes the layer.")
+REGISTER_QUICK_ACTION(
+	Pipette,
+	"Pipette",
+	[&]() { m_ColorPipetteActive = !m_ColorPipetteActive; },
+	ALWAYS_FALSE,
+	[&]() -> bool { return m_ColorPipetteActive; },
+	DEFAULT_BTN,
+	"[Ctrl+Shift+C] Color pipette. Pick a color from the screen by clicking on it.")
+REGISTER_QUICK_ACTION(
+	MapDetails,
+	"Map details",
+	[&]() { MapDetails(); },
+	ALWAYS_FALSE,
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"Adjust the map details of the current map.")
+REGISTER_QUICK_ACTION(
+	AddQuad,
+	"Add Quad",
+	[&]() { AddQuadOrSound(); },
+	[&]() -> bool {
+		std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+		if(!pLayer)
+			return false;
+		return pLayer->m_Type != LAYERTYPE_QUADS;
+	},
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Ctrl+Q] Add a new quad.")
+REGISTER_QUICK_ACTION(
+	AddSound,
+	"Add Sound",
+	[&]() { AddQuadOrSound(); },
+	[&]() -> bool {
+		std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+		if(!pLayer)
+			return false;
+		return pLayer->m_Type != LAYERTYPE_SOUNDS;
+	},
+	ALWAYS_FALSE,
+	DEFAULT_BTN,
+	"[Ctrl+Q] Add a new sound source.")
+
+#undef ALWAYS_FALSE
+#undef DEFAULT_BTN
diff --git a/src/game/editor/tileart.cpp b/src/game/editor/tileart.cpp
index 5524dce026..102a75cc2c 100644
--- a/src/game/editor/tileart.cpp
+++ b/src/game/editor/tileart.cpp
@@ -17,60 +17,15 @@ bool operator<(const ColorRGBA &Left, const ColorRGBA &Right)
 		return Left.a < Right.a;
 }
 
-static ColorRGBA GetPixelColor(const CImageInfo &Image, size_t x, size_t y)
-{
-	uint8_t *pData = static_cast<uint8_t *>(Image.m_pData);
-	const size_t PixelSize = Image.PixelSize();
-	const size_t PixelStartIndex = x * PixelSize + (Image.m_Width * PixelSize * y);
-
-	ColorRGBA Color = {255, 255, 255, 255};
-	if(PixelSize == 1)
-	{
-		Color.a = pData[PixelStartIndex];
-	}
-	else
-	{
-		Color.r = pData[PixelStartIndex + 0];
-		Color.g = pData[PixelStartIndex + 1];
-		Color.b = pData[PixelStartIndex + 2];
-
-		if(PixelSize == 4)
-			Color.a = pData[PixelStartIndex + 3];
-	}
-
-	return Color;
-}
-
-static void SetPixelColor(CImageInfo *pImage, size_t x, size_t y, ColorRGBA Color)
-{
-	uint8_t *pData = static_cast<uint8_t *>(pImage->m_pData);
-	const size_t PixelSize = pImage->PixelSize();
-	const size_t PixelStartIndex = x * PixelSize + (pImage->m_Width * PixelSize * y);
-
-	if(PixelSize == 1)
-	{
-		pData[PixelStartIndex] = Color.a;
-	}
-	else
-	{
-		pData[PixelStartIndex + 0] = Color.r;
-		pData[PixelStartIndex + 1] = Color.g;
-		pData[PixelStartIndex + 2] = Color.b;
-
-		if(PixelSize == 4)
-			pData[PixelStartIndex + 3] = Color.a;
-	}
-}
-
 static std::vector<ColorRGBA> GetUniqueColors(const CImageInfo &Image)
 {
 	std::set<ColorRGBA> ColorSet;
 	std::vector<ColorRGBA> vUniqueColors;
-	for(int x = 0; x < Image.m_Width; x++)
+	for(size_t x = 0; x < Image.m_Width; x++)
 	{
-		for(int y = 0; y < Image.m_Height; y++)
+		for(size_t y = 0; y < Image.m_Height; y++)
 		{
-			ColorRGBA Color = GetPixelColor(Image, x, y);
+			ColorRGBA Color = Image.PixelColor(x, y);
 			if(Color.a > 0 && ColorSet.insert(Color).second)
 				vUniqueColors.push_back(Color);
 		}
@@ -106,12 +61,12 @@ static std::vector<std::array<ColorRGBA, NumTiles>> GroupColors(const std::vecto
 	return vaColorGroups;
 }
 
-static void SetColorTile(CImageInfo *pImage, int x, int y, ColorRGBA Color)
+static void SetColorTile(CImageInfo &Image, int x, int y, ColorRGBA Color)
 {
 	for(int i = 0; i < TileSize; i++)
 	{
 		for(int j = 0; j < TileSize; j++)
-			SetPixelColor(pImage, x * TileSize + i, y * TileSize + j, Color);
+			Image.SetPixelColor(x * TileSize + i, y * TileSize + j, Color);
 	}
 }
 
@@ -121,16 +76,14 @@ static CImageInfo ColorGroupToImage(const std::array<ColorRGBA, NumTiles> &aColo
 	Image.m_Width = NumTilesRow * TileSize;
 	Image.m_Height = NumTilesColumn * TileSize;
 	Image.m_Format = CImageInfo::FORMAT_RGBA;
-
-	uint8_t *pData = static_cast<uint8_t *>(malloc(static_cast<size_t>(Image.m_Width) * Image.m_Height * 4 * sizeof(uint8_t)));
-	Image.m_pData = pData;
+	Image.m_pData = static_cast<uint8_t *>(malloc(Image.DataSize()));
 
 	for(int y = 0; y < NumTilesColumn; y++)
 	{
 		for(int x = 0; x < NumTilesRow; x++)
 		{
 			int ColorIndex = x + NumTilesRow * y;
-			SetColorTile(&Image, x, y, aColorGroup[ColorIndex]);
+			SetColorTile(Image, x, y, aColorGroup[ColorIndex]);
 		}
 	}
 
@@ -156,7 +109,7 @@ static std::shared_ptr<CEditorImage> ImageInfoToEditorImage(CEditor *pEditor, co
 	pEditorImage->m_pData = Image.m_pData;
 
 	int TextureLoadFlag = pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
-	pEditorImage->m_Texture = pEditor->Graphics()->LoadTextureRaw(Image.m_Width, Image.m_Height, Image.m_Format, Image.m_pData, TextureLoadFlag, pName);
+	pEditorImage->m_Texture = pEditor->Graphics()->LoadTextureRaw(Image, TextureLoadFlag, pName);
 	pEditorImage->m_External = 0;
 	str_copy(pEditorImage->m_aName, pName);
 
@@ -181,7 +134,7 @@ static void SetTilelayerIndices(const std::shared_ptr<CLayerTiles> &pLayer, cons
 	for(int x = 0; x < pLayer->m_Width; x++)
 	{
 		for(int y = 0; y < pLayer->m_Height; y++)
-			pLayer->m_pTiles[x + y * pLayer->m_Width].m_Index = GetColorIndex(aColorGroup, GetPixelColor(Image, x, y));
+			pLayer->m_pTiles[x + y * pLayer->m_Width].m_Index = GetColorIndex(aColorGroup, Image.PixelColor(x, y));
 	}
 }
 
@@ -212,8 +165,7 @@ void CEditor::AddTileart(bool IgnoreHistory)
 		m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileArt>(this, ImageCount, m_aTileartFilename, IndexMap));
 	}
 
-	free(m_TileartImageInfo.m_pData);
-	m_TileartImageInfo.m_pData = nullptr;
+	m_TileartImageInfo.Free();
 	m_Map.OnModify();
 	m_Dialog = DIALOG_NONE;
 }
@@ -226,8 +178,7 @@ void CEditor::TileartCheckColors()
 	{
 		m_PopupEventType = CEditor::POPEVENT_PIXELART_TOO_MANY_COLORS;
 		m_PopupEventActivated = true;
-		free(m_TileartImageInfo.m_pData);
-		m_TileartImageInfo.m_pData = nullptr;
+		m_TileartImageInfo.Free();
 	}
 	else if(NumColorGroups > 1)
 	{
@@ -242,7 +193,7 @@ bool CEditor::CallbackAddTileart(const char *pFilepath, int StorageType, void *p
 {
 	CEditor *pEditor = (CEditor *)pUser;
 
-	if(!pEditor->Graphics()->LoadPNG(&pEditor->m_TileartImageInfo, pFilepath, StorageType))
+	if(!pEditor->Graphics()->LoadPng(pEditor->m_TileartImageInfo, pFilepath, StorageType))
 	{
 		pEditor->ShowFileDialogError("Failed to load image from file '%s'.", pFilepath);
 		return false;
diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index 3e0f921c66..042e64579f 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -9,6 +9,8 @@
 #include <base/system.h>
 #include <engine/shared/config.h>
 
+#include <limits>
+
 const char *CTuningParams::ms_apNames[] =
 	{
 #define MACRO_TUNING_PARAM(Name, ScriptName, Value, Description) #ScriptName,
@@ -63,6 +65,59 @@ float CTuningParams::GetWeaponFireDelay(int Weapon) const
 	}
 }
 
+static_assert(std::numeric_limits<char>::is_signed, "char must be signed for StrToInts to work correctly");
+
+void StrToInts(int *pInts, size_t NumInts, const char *pStr)
+{
+	dbg_assert(NumInts > 0, "StrToInts: NumInts invalid");
+	const size_t StrSize = str_length(pStr) + 1;
+	dbg_assert(StrSize <= NumInts * sizeof(int), "StrToInts: string truncated");
+
+	for(size_t i = 0; i < NumInts; i++)
+	{
+		// Copy to temporary buffer to ensure we don't read past the end of the input string
+		char aBuf[sizeof(int)] = {0, 0, 0, 0};
+		for(size_t c = 0; c < sizeof(int) && i * sizeof(int) + c < StrSize; c++)
+		{
+			aBuf[c] = pStr[i * sizeof(int) + c];
+		}
+		pInts[i] = ((aBuf[0] + 128) << 24) | ((aBuf[1] + 128) << 16) | ((aBuf[2] + 128) << 8) | (aBuf[3] + 128);
+	}
+	// Last byte is always zero and unused in this format
+	pInts[NumInts - 1] &= 0xFFFFFF00;
+}
+
+bool IntsToStr(const int *pInts, size_t NumInts, char *pStr, size_t StrSize)
+{
+	dbg_assert(NumInts > 0, "IntsToStr: NumInts invalid");
+	dbg_assert(StrSize >= NumInts * sizeof(int), "IntsToStr: StrSize invalid");
+
+	// Unpack string without validation
+	size_t StrIndex = 0;
+	for(size_t IntIndex = 0; IntIndex < NumInts; IntIndex++)
+	{
+		const int CurrentInt = pInts[IntIndex];
+		pStr[StrIndex] = ((CurrentInt >> 24) & 0xff) - 128;
+		StrIndex++;
+		pStr[StrIndex] = ((CurrentInt >> 16) & 0xff) - 128;
+		StrIndex++;
+		pStr[StrIndex] = ((CurrentInt >> 8) & 0xff) - 128;
+		StrIndex++;
+		pStr[StrIndex] = (CurrentInt & 0xff) - 128;
+		StrIndex++;
+	}
+	// Ensure null-termination
+	pStr[StrIndex - 1] = '\0';
+
+	// Ensure valid UTF-8
+	if(str_utf8_check(pStr))
+	{
+		return true;
+	}
+	pStr[0] = '\0';
+	return false;
+}
+
 float VelocityRamp(float Value, float Start, float Range, float Curvature)
 {
 	if(Value < Start)
@@ -70,11 +125,10 @@ float VelocityRamp(float Value, float Start, float Range, float Curvature)
 	return 1.0f / std::pow(Curvature, (Value - Start) / Range);
 }
 
-void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams, std::map<int, std::vector<vec2>> *pTeleOuts)
+void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams)
 {
 	m_pWorld = pWorld;
 	m_pCollision = pCollision;
-	m_pTeleOuts = pTeleOuts;
 
 	m_pTeams = pTeams;
 	m_Id = -1;
@@ -258,11 +312,16 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 	}
 	else if(m_HookState == HOOK_FLYING)
 	{
+		vec2 HookBase = m_Pos;
+		if(m_NewHook)
+		{
+			HookBase = m_HookTeleBase;
+		}
 		vec2 NewPos = m_HookPos + m_HookDir * m_Tuning.m_HookFireSpeed;
-		if((!m_NewHook && distance(m_Pos, NewPos) > m_Tuning.m_HookLength) || (m_NewHook && distance(m_HookTeleBase, NewPos) > m_Tuning.m_HookLength))
+		if(distance(HookBase, NewPos) > m_Tuning.m_HookLength)
 		{
 			m_HookState = HOOK_RETRACT_START;
-			NewPos = m_Pos + normalize(NewPos - m_Pos) * m_Tuning.m_HookLength;
+			NewPos = HookBase + normalize(NewPos - HookBase) * m_Tuning.m_HookLength;
 			m_Reset = true;
 		}
 
@@ -273,8 +332,6 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 		int teleNr = 0;
 		int Hit = m_pCollision->IntersectLineTeleHook(m_HookPos, NewPos, &NewPos, 0, &teleNr);
 
-		// m_NewHook = false;
-
 		if(Hit)
 		{
 			if(Hit == TILE_NOHOOK)
@@ -287,7 +344,7 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 		}
 
 		// Check against other players first
-		if(!this->m_HookHitDisabled && m_pWorld && m_Tuning.m_PlayerHooking)
+		if(!m_HookHitDisabled && m_pWorld && m_Tuning.m_PlayerHooking && (m_HookState == HOOK_FLYING || !m_NewHook))
 		{
 			float Distance = 0.0f;
 			for(int i = 0; i < MAX_CLIENTS; i++)
@@ -327,14 +384,14 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 				m_HookState = HOOK_RETRACT_START;
 			}
 
-			if(GoingThroughTele && m_pWorld && m_pTeleOuts && !m_pTeleOuts->empty() && !(*m_pTeleOuts)[teleNr - 1].empty())
+			if(GoingThroughTele && m_pWorld && !m_pCollision->TeleOuts(teleNr - 1).empty())
 			{
 				m_TriggeredEvents = 0;
 				SetHookedPlayer(-1);
 
 				m_NewHook = true;
-				int RandomOut = m_pWorld->RandomOr0((*m_pTeleOuts)[teleNr - 1].size());
-				m_HookPos = (*m_pTeleOuts)[teleNr - 1][RandomOut] + TargetDirection * PhysicalSize() * 1.5f;
+				int RandomOut = m_pWorld->RandomOr0(m_pCollision->TeleOuts(teleNr - 1).size());
+				m_HookPos = m_pCollision->TeleOuts(teleNr - 1)[RandomOut] + TargetDirection * PhysicalSize() * 1.5f;
 				m_HookDir = TargetDirection;
 				m_HookTeleBase = m_HookPos;
 			}
@@ -359,13 +416,9 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 				m_HookState = HOOK_RETRACTED;
 				m_HookPos = m_Pos;
 			}
-
-			// keep players hooked for a max of 1.5sec
-			// if(Server()->Tick() > hook_tick+(Server()->TickSpeed()*3)/2)
-			// release_hooked();
 		}
 
-		// don't do this hook rutine when we are hook to a player
+		// don't do this hook routine when we are already hooked to a player
 		if(m_HookedPlayer == -1 && distance(m_HookPos, m_Pos) > 46.0f)
 		{
 			vec2 HookVel = normalize(m_HookPos - m_Pos) * m_Tuning.m_HookDragAccel;
@@ -384,7 +437,8 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
 			vec2 NewVel = m_Vel + HookVel;
 
 			// check if we are under the legal limit for the hook
-			if(length(NewVel) < m_Tuning.m_HookDragSpeed || length(NewVel) < length(m_Vel))
+			const float NewVelLength = length(NewVel);
+			if(NewVelLength < m_Tuning.m_HookDragSpeed || NewVelLength < length(m_Vel))
 				m_Vel = NewVel; // no problem. apply
 		}
 
@@ -412,9 +466,6 @@ void CCharacterCore::TickDeferred()
 			if(!pCharCore)
 				continue;
 
-			// player *p = (player*)ent;
-			// if(pCharCore == this) // || !(p->flags&FLAG_ALIVE)
-
 			if(pCharCore == this || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, i)))
 				continue; // make sure that we don't nudge our self
 
@@ -429,7 +480,7 @@ void CCharacterCore::TickDeferred()
 
 				bool CanCollide = (m_Super || pCharCore->m_Super) || (!m_CollisionDisabled && !pCharCore->m_CollisionDisabled && m_Tuning.m_PlayerCollision);
 
-				if(CanCollide && Distance < PhysicalSize() * 1.25f && Distance > 0.0f)
+				if(CanCollide && Distance < PhysicalSize() * 1.25f)
 				{
 					float a = (PhysicalSize() * 1.45f - Distance);
 					float Velocity = 0.5f;
@@ -446,7 +497,7 @@ void CCharacterCore::TickDeferred()
 				// handle hook influence
 				if(!m_HookHitDisabled && m_HookedPlayer == i && m_Tuning.m_PlayerHooking)
 				{
-					if(Distance > PhysicalSize() * 1.50f) // TODO: fix tweakable variable
+					if(Distance > PhysicalSize() * 1.50f)
 					{
 						float HookAccel = m_Tuning.m_HookDragAccel * (Distance / m_Tuning.m_HookLength);
 						float DragSpeed = m_Tuning.m_HookDragSpeed;
@@ -530,7 +581,7 @@ void CCharacterCore::Move()
 					if((!(pCharCore->m_Super || m_Super) && (m_Solo || pCharCore->m_Solo || pCharCore->m_CollisionDisabled || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, p)))))
 						continue;
 					float D = distance(Pos, pCharCore->m_Pos);
-					if(D < PhysicalSize() && D >= 0.0f)
+					if(D < PhysicalSize())
 					{
 						if(a > 0.0f)
 							m_Pos = LastPos;
@@ -677,11 +728,6 @@ void CCharacterCore::SetTeamsCore(CTeamsCore *pTeams)
 	m_pTeams = pTeams;
 }
 
-void CCharacterCore::SetTeleOuts(std::map<int, std::vector<vec2>> *pTeleOuts)
-{
-	m_pTeleOuts = pTeleOuts;
-}
-
 bool CCharacterCore::IsSwitchActiveCb(int Number, void *pUser)
 {
 	CCharacterCore *pThis = (CCharacterCore *)pUser;
diff --git a/src/game/gamecore.h b/src/game/gamecore.h
index 8b16cfcaae..c33b14e171 100644
--- a/src/game/gamecore.h
+++ b/src/game/gamecore.h
@@ -65,53 +65,9 @@ class CTuningParams
 	float GetWeaponFireDelay(int Weapon) const;
 };
 
-inline void StrToInts(int *pInts, int Num, const char *pStr)
-{
-	int Index = 0;
-	while(Num)
-	{
-		char aBuf[4] = {0, 0, 0, 0};
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds" // false positive
-#endif
-		for(int c = 0; c < 4 && pStr[Index]; c++, Index++)
-			aBuf[c] = pStr[Index];
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-		*pInts = ((aBuf[0] + 128) << 24) | ((aBuf[1] + 128) << 16) | ((aBuf[2] + 128) << 8) | (aBuf[3] + 128);
-		pInts++;
-		Num--;
-	}
-
-	// null terminate
-	pInts[-1] &= 0xffffff00;
-}
-
-inline void IntsToStr(const int *pInts, int Num, char *pStr)
-{
-	while(Num)
-	{
-		pStr[0] = (((*pInts) >> 24) & 0xff) - 128;
-		pStr[1] = (((*pInts) >> 16) & 0xff) - 128;
-		pStr[2] = (((*pInts) >> 8) & 0xff) - 128;
-		pStr[3] = ((*pInts) & 0xff) - 128;
-		pStr += 4;
-		pInts++;
-		Num--;
-	}
-
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-overflow" // false positive
-#endif
-	// null terminate
-	pStr[-1] = 0;
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic pop
-#endif
-}
+// Do not use these function unless for legacy code!
+void StrToInts(int *pInts, size_t NumInts, const char *pStr);
+bool IntsToStr(const int *pInts, size_t NumInts, char *pStr, size_t StrSize);
 
 inline vec2 CalcPos(vec2 Pos, vec2 Velocity, float Curvature, float Speed, float Time)
 {
@@ -164,7 +120,6 @@ enum
 	COREEVENT_HOOK_ATTACH_GROUND = 0x10,
 	COREEVENT_HOOK_HIT_NOHOOK = 0x20,
 	COREEVENT_HOOK_RETRACT = 0x40,
-	// COREEVENT_HOOK_TELE=0x80,
 };
 
 // show others values - do not change them
@@ -221,7 +176,6 @@ class CCharacterCore
 {
 	CWorldCore *m_pWorld = nullptr;
 	CCollision *m_pCollision;
-	std::map<int, std::vector<vec2>> *m_pTeleOuts;
 
 public:
 	static constexpr float PhysicalSize() { return 28.0f; };
@@ -269,7 +223,7 @@ class CCharacterCore
 
 	int m_TriggeredEvents;
 
-	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams = nullptr, std::map<int, std::vector<vec2>> *pTeleOuts = nullptr);
+	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams = nullptr);
 	void SetCoreWorld(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams);
 	void Reset();
 	void TickDeferred();
@@ -290,7 +244,6 @@ class CCharacterCore
 
 	// DDNet Character
 	void SetTeamsCore(CTeamsCore *pTeams);
-	void SetTeleOuts(std::map<int, std::vector<vec2>> *pTeleOuts);
 	void ReadDDNet(const CNetObj_DDNetCharacter *pObjDDNet);
 	bool m_Solo;
 	bool m_Jetpack;
diff --git a/src/game/layers.cpp b/src/game/layers.cpp
index b00d0038c3..52f97e0799 100644
--- a/src/game/layers.cpp
+++ b/src/game/layers.cpp
@@ -8,33 +8,17 @@
 
 CLayers::CLayers()
 {
-	m_GroupsNum = 0;
-	m_GroupsStart = 0;
-	m_LayersNum = 0;
-	m_LayersStart = 0;
-	m_pGameGroup = 0;
-	m_pGameLayer = 0;
-	m_pMap = 0;
-
-	m_pTeleLayer = 0;
-	m_pSpeedupLayer = 0;
-	m_pFrontLayer = 0;
-	m_pSwitchLayer = 0;
-	m_pTuneLayer = 0;
+	Unload();
 }
 
 void CLayers::Init(class IKernel *pKernel)
 {
+	Unload();
+
 	m_pMap = pKernel->RequestInterface<IMap>();
 	m_pMap->GetType(MAPITEMTYPE_GROUP, &m_GroupsStart, &m_GroupsNum);
 	m_pMap->GetType(MAPITEMTYPE_LAYER, &m_LayersStart, &m_LayersNum);
 
-	m_pTeleLayer = 0;
-	m_pSpeedupLayer = 0;
-	m_pFrontLayer = 0;
-	m_pSwitchLayer = 0;
-	m_pTuneLayer = 0;
-
 	for(int g = 0; g < NumGroups(); g++)
 	{
 		CMapItemGroup *pGroup = GetGroup(g);
@@ -129,17 +113,12 @@ void CLayers::Init(class IKernel *pKernel)
 
 void CLayers::InitBackground(class IMap *pMap)
 {
+	Unload();
+
 	m_pMap = pMap;
 	m_pMap->GetType(MAPITEMTYPE_GROUP, &m_GroupsStart, &m_GroupsNum);
 	m_pMap->GetType(MAPITEMTYPE_LAYER, &m_LayersStart, &m_LayersNum);
 
-	//following is here to prevent crash using standard map as background
-	m_pTeleLayer = 0;
-	m_pSpeedupLayer = 0;
-	m_pFrontLayer = 0;
-	m_pSwitchLayer = 0;
-	m_pTuneLayer = 0;
-
 	for(int g = 0; g < NumGroups(); g++)
 	{
 		CMapItemGroup *pGroup = GetGroup(g);
@@ -179,6 +158,24 @@ void CLayers::InitBackground(class IMap *pMap)
 	InitTilemapSkip();
 }
 
+void CLayers::Unload()
+{
+	m_GroupsNum = 0;
+	m_GroupsStart = 0;
+	m_LayersNum = 0;
+	m_LayersStart = 0;
+
+	m_pGameGroup = nullptr;
+	m_pGameLayer = nullptr;
+	m_pMap = nullptr;
+
+	m_pTeleLayer = nullptr;
+	m_pSpeedupLayer = nullptr;
+	m_pFrontLayer = nullptr;
+	m_pSwitchLayer = nullptr;
+	m_pTuneLayer = nullptr;
+}
+
 void CLayers::InitTilemapSkip()
 {
 	for(int g = 0; g < NumGroups(); g++)
diff --git a/src/game/layers.h b/src/game/layers.h
index 1823dea9b4..2ce957cc15 100644
--- a/src/game/layers.h
+++ b/src/game/layers.h
@@ -12,20 +12,12 @@ struct CMapItemLayerTilemap;
 
 class CLayers
 {
-	int m_GroupsNum;
-	int m_GroupsStart;
-	int m_LayersNum;
-	int m_LayersStart;
-	CMapItemGroup *m_pGameGroup;
-	CMapItemLayerTilemap *m_pGameLayer;
-	IMap *m_pMap;
-
-	void InitTilemapSkip();
-
 public:
 	CLayers();
 	void Init(IKernel *pKernel);
 	void InitBackground(IMap *pMap);
+	void Unload();
+
 	int NumGroups() const { return m_GroupsNum; }
 	int NumLayers() const { return m_LayersNum; }
 	IMap *Map() const { return m_pMap; }
@@ -43,11 +35,22 @@ class CLayers
 	CMapItemLayerTilemap *TuneLayer() const { return m_pTuneLayer; }
 
 private:
+	int m_GroupsNum;
+	int m_GroupsStart;
+	int m_LayersNum;
+	int m_LayersStart;
+
+	CMapItemGroup *m_pGameGroup;
+	CMapItemLayerTilemap *m_pGameLayer;
+	IMap *m_pMap;
+
 	CMapItemLayerTilemap *m_pTeleLayer;
 	CMapItemLayerTilemap *m_pSpeedupLayer;
 	CMapItemLayerTilemap *m_pFrontLayer;
 	CMapItemLayerTilemap *m_pSwitchLayer;
 	CMapItemLayerTilemap *m_pTuneLayer;
+
+	void InitTilemapSkip();
 };
 
 #endif
diff --git a/src/game/localization.cpp b/src/game/localization.cpp
index 1b3feb33b7..5f29840f2d 100644
--- a/src/game/localization.cpp
+++ b/src/game/localization.cpp
@@ -3,6 +3,8 @@
 
 #include "localization.h"
 
+#include <base/log.h>
+
 #include <engine/console.h>
 #include <engine/shared/linereader.h>
 #include <engine/storage.h>
@@ -21,20 +23,14 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 	m_vLanguages.emplace_back("English", "", 826, vEnglishLanguageCodes);
 
 	const char *pFilename = "languages/index.txt";
-	IOHANDLE File = pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!File)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
-		char aBuf[64 + IO_MAX_PATH_LENGTH];
-		str_format(aBuf, sizeof(aBuf), "Couldn't open index file '%s'", pFilename);
-		pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+		log_error("localization", "Couldn't open index file '%s'", pFilename);
 		return;
 	}
 
-	CLineReader LineReader;
-	LineReader.Init(File);
-
-	const char *pLine;
-	while((pLine = LineReader.Get()))
+	while(const char *pLine = LineReader.Get())
 	{
 		if(!str_length(pLine) || pLine[0] == '#') // skip empty lines and comments
 			continue;
@@ -45,16 +41,12 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 		pLine = LineReader.Get();
 		if(!pLine)
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Unexpected end of index file after language '%s'", aEnglishName);
 			break;
 		}
 		if(!str_startswith(pLine, "== "))
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Missing native name for language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Missing native name for language '%s'", aEnglishName);
 			(void)LineReader.Get();
 			(void)LineReader.Get();
 			continue;
@@ -65,16 +57,12 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 		pLine = LineReader.Get();
 		if(!pLine)
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Unexpected end of index file after language '%s'", aEnglishName);
 			break;
 		}
 		if(!str_startswith(pLine, "== "))
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Missing country code for language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Missing country code for language '%s'", aEnglishName);
 			(void)LineReader.Get();
 			continue;
 		}
@@ -84,16 +72,12 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 		pLine = LineReader.Get();
 		if(!pLine)
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Unexpected end of index file after language '%s'", aEnglishName);
 			break;
 		}
 		if(!str_startswith(pLine, "== "))
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "Missing language codes for language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "Missing language codes for language '%s'", aEnglishName);
 			continue;
 		}
 		const char *pLanguageCodes = pLine + 3;
@@ -108,9 +92,7 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 		}
 		if(vLanguageCodes.empty())
 		{
-			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "At least one language code required for language '%s'", aEnglishName);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "At least one language code required for language '%s'", aEnglishName);
 			continue;
 		}
 
@@ -119,8 +101,6 @@ void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole
 		m_vLanguages.emplace_back(aNativeName, aFileName, str_toint(aCountryCode), vLanguageCodes);
 	}
 
-	io_close(File);
-
 	std::sort(m_vLanguages.begin(), m_vLanguages.end());
 }
 
@@ -137,9 +117,7 @@ void CLocalizationDatabase::SelectDefaultLanguage(IConsole *pConsole, char *pFil
 	char aLocaleStr[128];
 	os_locale_str(aLocaleStr, sizeof(aLocaleStr));
 
-	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "Choosing default language based on user locale '%s'", aLocaleStr);
-	pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+	log_info("localization", "Choosing default language based on user locale '%s'", aLocaleStr);
 
 	while(true)
 	{
@@ -195,23 +173,18 @@ bool CLocalizationDatabase::Load(const char *pFilename, IStorage *pStorage, ICon
 		return true;
 	}
 
-	IOHANDLE IoHandle = pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!IoHandle)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL)))
 		return false;
 
-	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "loaded '%s'", pFilename);
-	pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+	log_info("localization", "loaded '%s'", pFilename);
 	m_vStrings.clear();
 	m_StringsHeap.Reset();
 
 	char aContext[512];
 	char aOrigin[512];
-	CLineReader LineReader;
-	LineReader.Init(IoHandle);
-	char *pLine;
 	int Line = 0;
-	while((pLine = LineReader.Get()))
+	while(const char *pLine = LineReader.Get())
 	{
 		Line++;
 		if(!str_length(pLine))
@@ -225,38 +198,41 @@ bool CLocalizationDatabase::Load(const char *pFilename, IStorage *pStorage, ICon
 			size_t Len = str_length(pLine);
 			if(Len < 1 || pLine[Len - 1] != ']')
 			{
-				str_format(aBuf, sizeof(aBuf), "malformed context line (%d): %s", Line, pLine);
-				pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+				log_error("localization", "malformed context '%s' on line %d", pLine, Line);
 				continue;
 			}
-			str_copy(aContext, pLine + 1, Len - 1);
+			str_truncate(aContext, sizeof(aContext), pLine + 1, Len - 2);
 			pLine = LineReader.Get();
+			if(!pLine)
+			{
+				log_error("localization", "unexpected end of file after context line '%s' on line %d", aContext, Line);
+				break;
+			}
+			Line++;
 		}
 		else
 		{
 			aContext[0] = '\0';
 		}
 
-		str_copy(aOrigin, pLine, sizeof(aOrigin));
-		char *pReplacement = LineReader.Get();
-		Line++;
+		str_copy(aOrigin, pLine);
+		const char *pReplacement = LineReader.Get();
 		if(!pReplacement)
 		{
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", "unexpected end of file");
+			log_error("localization", "unexpected end of file after original '%s' on line %d", aOrigin, Line);
 			break;
 		}
+		Line++;
 
 		if(pReplacement[0] != '=' || pReplacement[1] != '=' || pReplacement[2] != ' ')
 		{
-			str_format(aBuf, sizeof(aBuf), "malformed replacement line (%d) for '%s'", Line, aOrigin);
-			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			log_error("localization", "malformed replacement '%s' for original '%s' on line %d", pReplacement, aOrigin, Line);
 			continue;
 		}
 
 		pReplacement += 3;
 		AddString(aOrigin, pReplacement, aContext);
 	}
-	io_close(IoHandle);
 	std::sort(m_vStrings.begin(), m_vStrings.end());
 	return true;
 }
diff --git a/src/game/mapitems.cpp b/src/game/mapitems.cpp
index 2ccab30670..2abd7468e3 100644
--- a/src/game/mapitems.cpp
+++ b/src/game/mapitems.cpp
@@ -57,7 +57,20 @@ bool IsValidTeleTile(int Index)
 		Index == TILE_TELECHECKINEVIL);
 }
 
-bool IsTeleTileNumberUsed(int Index)
+bool IsTeleTileCheckpoint(int Index)
+{
+	return Index == TILE_TELECHECK || Index == TILE_TELECHECKOUT;
+}
+
+bool IsTeleTileNumberUsed(int Index, bool Checkpoint)
+{
+	if(Checkpoint)
+		return IsTeleTileCheckpoint(Index);
+	return !IsTeleTileCheckpoint(Index) && Index != TILE_TELECHECKIN &&
+	       Index != TILE_TELECHECKINEVIL;
+}
+
+bool IsTeleTileNumberUsedAny(int Index)
 {
 	return Index != TILE_TELECHECKIN &&
 	       Index != TILE_TELECHECKINEVIL;
diff --git a/src/game/mapitems.h b/src/game/mapitems.h
index d89cde0cc2..0421e66e10 100644
--- a/src/game/mapitems.h
+++ b/src/game/mapitems.h
@@ -277,7 +277,7 @@ struct CMapItemImage_v2 : public CMapItemImage_v1
 		CURRENT_VERSION = 2,
 	};
 
-	int m_Format; // Default before this version is CImageInfo::FORMAT_RGBA
+	int m_MustBe1;
 };
 
 typedef CMapItemImage_v1 CMapItemImage;
@@ -520,6 +520,9 @@ struct CMapItemSound
 
 	int m_SoundName;
 	int m_SoundData;
+	// Deprecated. Do not read this value, it could be wrong.
+	// Use GetDataSize instead, which returns the de facto size.
+	// Value must still be written for compatibility.
 	int m_SoundDataSize;
 };
 
@@ -568,7 +571,9 @@ class CTuneTile
 bool IsValidGameTile(int Index);
 bool IsValidFrontTile(int Index);
 bool IsValidTeleTile(int Index);
-bool IsTeleTileNumberUsed(int Index); // Assumes that Index is a valid tele tile index
+bool IsTeleTileCheckpoint(int Index); // Assumes that Index is a valid tele tile index
+bool IsTeleTileNumberUsed(int Index, bool Checkpoint); // Assumes that Index is a valid tele tile index
+bool IsTeleTileNumberUsedAny(int Index); // Does not check for checkpoint only
 bool IsValidSpeedupTile(int Index);
 bool IsValidSwitchTile(int Index);
 bool IsSwitchTileFlagsUsed(int Index); // Assumes that Index is a valid switch tile index
diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp
index f422657ddb..2e027aa4c5 100644
--- a/src/game/server/ddracechat.cpp
+++ b/src/game/server/ddracechat.cpp
@@ -2,6 +2,7 @@
 #include "gamecontext.h"
 #include <engine/shared/config.h>
 #include <engine/shared/protocol.h>
+#include <game/mapitems.h>
 #include <game/server/gamemodes/DDRace.h>
 #include <game/server/teams.h>
 #include <game/version.h>
@@ -10,7 +11,9 @@
 #include "player.h"
 #include "score.h"
 
-bool CheckClientID(int ClientID);
+#include <optional>
+
+bool CheckClientId(int ClientId);
 
 void CGameContext::ConCredits(IConsole::IResult *pResult, void *pUserData)
 {
@@ -39,19 +42,21 @@ void CGameContext::ConCredits(IConsole::IResult *pResult, void *pUserData)
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 		"trafilaw, Zwelf, Patiga, Konsti, ElXreno, MikiGamer,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"Fireball, Banana090, axblk, yangfl, Kaffeine,");
+		"Fireball, Banana090, axblk, yangfl, Kaffeine, Zodiac,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"c0d3d3v, GiuCcc, Ravie, Robyt3, simpygirl, sjrc6, Cellegen,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"Zodiac, c0d3d3v, GiuCcc, Ravie, Robyt3, simpygirl,");
+		"srdante, Nouaa, Voxel, luk51, Vy0x2, Avolicious, louis,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"sjrc6, Cellegen, srdante, Nouaa, Voxel, luk51,");
+		"Marmare314, hus3h, ArijanJ, tarunsamanta2k20, Possseidon,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"Vy0x2, Avolicious, louis, Marmare314, hus3h,");
+		"M0REKZ, Teero, furo, dobrykafe, Moiman, JSaurusRex,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"ArijanJ, tarunsamanta2k20, Possseidon, M0REKZ,");
+		"Steinchen, ewancg, gerdoe-jr, BlaiZephyr, KebsCS, bencie,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"Teero, furo, dobrykafe, Moiman, JSaurusRex,");
+		"DynamoFox, MilkeeyCat, iMilchshake, SchrodingerZhu,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
-		"Steinchen & others");
+		"catseyenebulous, Rei-Tw, Matodor, Emilcha, art0007i & others");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 		"Based on DDRace by the DDRace developers,");
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
@@ -80,15 +85,15 @@ void CGameContext::ConInfo(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConList(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	int ClientID = pResult->m_ClientID;
-	if(!CheckClientID(ClientID))
+	int ClientId = pResult->m_ClientId;
+	if(!CheckClientId(ClientId))
 		return;
 
 	char zerochar = 0;
 	if(pResult->NumArguments() > 0)
-		pSelf->List(ClientID, pResult->GetString(0));
+		pSelf->List(ClientId, pResult->GetString(0));
 	else
-		pSelf->List(ClientID, &zerochar);
+		pSelf->List(ClientId, &zerochar);
 }
 
 void CGameContext::ConHelp(IConsole::IResult *pResult, void *pUserData)
@@ -150,7 +155,7 @@ void CGameContext::ConSettings(IConsole::IResult *pResult, void *pUserData)
 		float HookTemp;
 		pSelf->m_Tuning.Get("player_collision", &ColTemp);
 		pSelf->m_Tuning.Get("player_hooking", &HookTemp);
-		if(str_comp(pArg, "teams") == 0)
+		if(str_comp_nocase(pArg, "teams") == 0)
 		{
 			str_format(aBuf, sizeof(aBuf), "%s %s",
 				g_Config.m_SvTeam == SV_TEAM_ALLOWED ?
@@ -161,61 +166,61 @@ void CGameContext::ConSettings(IConsole::IResult *pResult, void *pUserData)
 				"and all of your team will die if the team is locked");
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 		}
-		else if(str_comp(pArg, "cheats") == 0)
+		else if(str_comp_nocase(pArg, "cheats") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvTestingCommands ?
 					"Cheats are enabled on this server" :
 					"Cheats are disabled on this server");
 		}
-		else if(str_comp(pArg, "collision") == 0)
+		else if(str_comp_nocase(pArg, "collision") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				ColTemp ?
 					"Players can collide on this server" :
 					"Players can't collide on this server");
 		}
-		else if(str_comp(pArg, "hooking") == 0)
+		else if(str_comp_nocase(pArg, "hooking") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				HookTemp ?
 					"Players can hook each other on this server" :
 					"Players can't hook each other on this server");
 		}
-		else if(str_comp(pArg, "endlesshooking") == 0)
+		else if(str_comp_nocase(pArg, "endlesshooking") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvEndlessDrag ?
 					"Players hook time is unlimited" :
 					"Players hook time is limited");
 		}
-		else if(str_comp(pArg, "hitting") == 0)
+		else if(str_comp_nocase(pArg, "hitting") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvHit ?
 					"Players weapons affect others" :
 					"Players weapons has no affect on others");
 		}
-		else if(str_comp(pArg, "oldlaser") == 0)
+		else if(str_comp_nocase(pArg, "oldlaser") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvOldLaser ?
 					"Lasers can hit you if you shot them and they pull you towards the bounce origin (Like DDRace Beta)" :
 					"Lasers can't hit you if you shot them, and they pull others towards the shooter");
 		}
-		else if(str_comp(pArg, "me") == 0)
+		else if(str_comp_nocase(pArg, "me") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvSlashMe ?
 					"Players can use /me commands the famous IRC Command" :
 					"Players can't use the /me command");
 		}
-		else if(str_comp(pArg, "timeout") == 0)
+		else if(str_comp_nocase(pArg, "timeout") == 0)
 		{
 			str_format(aBuf, sizeof(aBuf), "The Server Timeout is currently set to %d seconds", g_Config.m_ConnTimeout);
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 		}
-		else if(str_comp(pArg, "votes") == 0)
+		else if(str_comp_nocase(pArg, "votes") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvVoteKick ?
@@ -232,14 +237,14 @@ void CGameContext::ConSettings(IConsole::IResult *pResult, void *pUserData)
 						"Players are just kicked and not banned if they get voted off");
 			}
 		}
-		else if(str_comp(pArg, "pause") == 0)
+		else if(str_comp_nocase(pArg, "pause") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvPauseable ?
 					"/spec will pause you and your tee will vanish" :
 					"/spec will pause you but your tee will not vanish");
 		}
-		else if(str_comp(pArg, "scores") == 0)
+		else if(str_comp_nocase(pArg, "scores") == 0)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvHideScore ?
@@ -294,12 +299,12 @@ void CGameContext::ConRules(IConsole::IResult *pResult, void *pUserData)
 
 void ToggleSpecPause(IConsole::IResult *pResult, void *pUserData, int PauseType)
 {
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	IServer *pServ = pSelf->Server();
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -312,7 +317,7 @@ void ToggleSpecPause(IConsole::IResult *pResult, void *pUserData, int PauseType)
 	}
 	else if(pResult->NumArguments() > 0)
 	{
-		if(-PauseState == PauseType && pPlayer->m_SpectatorID != pResult->m_ClientID && pServ->ClientIngame(pPlayer->m_SpectatorID) && !str_comp(pServ->ClientName(pPlayer->m_SpectatorID), pResult->GetString(0)))
+		if(-PauseState == PauseType && pPlayer->m_SpectatorId != pResult->m_ClientId && pServ->ClientIngame(pPlayer->m_SpectatorId) && !str_comp(pServ->ClientName(pPlayer->m_SpectatorId), pResult->GetString(0)))
 		{
 			pPlayer->Pause(CPlayer::PAUSE_NONE, false);
 		}
@@ -334,11 +339,11 @@ void ToggleSpecPause(IConsole::IResult *pResult, void *pUserData, int PauseType)
 
 void ToggleSpecPauseVoted(IConsole::IResult *pResult, void *pUserData, int PauseType)
 {
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -354,9 +359,9 @@ void ToggleSpecPauseVoted(IConsole::IResult *pResult, void *pUserData, int Pause
 
 	bool IsPlayerBeingVoted = pSelf->m_VoteCloseTime &&
 				  (pSelf->IsKickVote() || pSelf->IsSpecVote()) &&
-				  pResult->m_ClientID != pSelf->m_VoteVictim;
+				  pResult->m_ClientId != pSelf->m_VoteVictim;
 	if((!IsPlayerBeingVoted && -PauseState == PauseType) ||
-		(IsPlayerBeingVoted && PauseState && pPlayer->m_SpectatorID == pSelf->m_VoteVictim))
+		(IsPlayerBeingVoted && PauseState && pPlayer->m_SpectatorId == pSelf->m_VoteVictim))
 	{
 		pPlayer->Pause(CPlayer::PAUSE_NONE, false);
 	}
@@ -364,7 +369,7 @@ void ToggleSpecPauseVoted(IConsole::IResult *pResult, void *pUserData, int Pause
 	{
 		pPlayer->Pause(PauseType, false);
 		if(IsPlayerBeingVoted)
-			pPlayer->m_SpectatorID = pSelf->m_VoteVictim;
+			pPlayer->m_SpectatorId = pSelf->m_VoteVictim;
 	}
 }
 
@@ -391,7 +396,7 @@ void CGameContext::ConTogglePauseVoted(IConsole::IResult *pResult, void *pUserDa
 void CGameContext::ConTeamTop5(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvHideScore)
@@ -403,28 +408,28 @@ void CGameContext::ConTeamTop5(IConsole::IResult *pResult, void *pUserData)
 
 	if(pResult->NumArguments() == 0)
 	{
-		pSelf->Score()->ShowTeamTop5(pResult->m_ClientID, 1);
+		pSelf->Score()->ShowTeamTop5(pResult->m_ClientId, 1);
 	}
 	else if(pResult->NumArguments() == 1)
 	{
 		if(pResult->GetInteger(0) != 0)
 		{
-			pSelf->Score()->ShowTeamTop5(pResult->m_ClientID, pResult->GetInteger(0));
+			pSelf->Score()->ShowTeamTop5(pResult->m_ClientId, pResult->GetInteger(0));
 		}
 		else
 		{
-			const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
-							     pSelf->Server()->ClientName(pResult->m_ClientID) :
+			const char *pRequestedName = (str_comp_nocase(pResult->GetString(0), "me") == 0) ?
+							     pSelf->Server()->ClientName(pResult->m_ClientId) :
 							     pResult->GetString(0);
-			pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientID, pRequestedName, 0);
+			pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientId, pRequestedName, 0);
 		}
 	}
 	else if(pResult->NumArguments() == 2 && pResult->GetInteger(1) != 0)
 	{
-		const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
-						     pSelf->Server()->ClientName(pResult->m_ClientID) :
+		const char *pRequestedName = (str_comp_nocase(pResult->GetString(0), "me") == 0) ?
+						     pSelf->Server()->ClientName(pResult->m_ClientId) :
 						     pResult->GetString(0);
-		pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+		pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientId, pRequestedName, pResult->GetInteger(1));
 	}
 	else
 	{
@@ -437,7 +442,7 @@ void CGameContext::ConTeamTop5(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConTop(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvHideScore)
@@ -448,41 +453,41 @@ void CGameContext::ConTop(IConsole::IResult *pResult, void *pUserData)
 	}
 
 	if(pResult->NumArguments() > 0)
-		pSelf->Score()->ShowTop(pResult->m_ClientID, pResult->GetInteger(0));
+		pSelf->Score()->ShowTop(pResult->m_ClientId, pResult->GetInteger(0));
 	else
-		pSelf->Score()->ShowTop(pResult->m_ClientID);
+		pSelf->Score()->ShowTop(pResult->m_ClientId);
 }
 
 void CGameContext::ConTimes(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(pResult->NumArguments() == 0)
 	{
-		pSelf->Score()->ShowTimes(pResult->m_ClientID, 1);
+		pSelf->Score()->ShowTimes(pResult->m_ClientId, 1);
 	}
 	else if(pResult->NumArguments() == 1)
 	{
 		if(pResult->GetInteger(0) != 0)
 		{
-			pSelf->Score()->ShowTimes(pResult->m_ClientID, pResult->GetInteger(0));
+			pSelf->Score()->ShowTimes(pResult->m_ClientId, pResult->GetInteger(0));
 		}
 		else
 		{
-			const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
-							     pSelf->Server()->ClientName(pResult->m_ClientID) :
+			const char *pRequestedName = (str_comp_nocase(pResult->GetString(0), "me") == 0) ?
+							     pSelf->Server()->ClientName(pResult->m_ClientId) :
 							     pResult->GetString(0);
-			pSelf->Score()->ShowTimes(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+			pSelf->Score()->ShowTimes(pResult->m_ClientId, pRequestedName, pResult->GetInteger(1));
 		}
 	}
 	else if(pResult->NumArguments() == 2 && pResult->GetInteger(1) != 0)
 	{
-		const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
-						     pSelf->Server()->ClientName(pResult->m_ClientID) :
+		const char *pRequestedName = (str_comp_nocase(pResult->GetString(0), "me") == 0) ?
+						     pSelf->Server()->ClientName(pResult->m_ClientId) :
 						     pResult->GetString(0);
-		pSelf->Score()->ShowTimes(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+		pSelf->Score()->ShowTimes(pResult->m_ClientId, pRequestedName, pResult->GetInteger(1));
 	}
 	else
 	{
@@ -495,29 +500,35 @@ void CGameContext::ConTimes(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConDND(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
-	if(pPlayer->m_DND)
-	{
-		pPlayer->m_DND = false;
-		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You will receive global chat and server messages");
-	}
-	else
-	{
-		pPlayer->m_DND = true;
-		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You will not receive any further global chat and server messages");
-	}
+	pPlayer->m_DND = pResult->NumArguments() == 0 ? !pPlayer->m_DND : pResult->GetInteger(0);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", pPlayer->m_DND ? "You will not receive any further global chat and server messages" : "You will receive global chat and server messages");
+}
+
+void CGameContext::ConWhispers(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientId(pResult->m_ClientId))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
+	if(!pPlayer)
+		return;
+
+	pPlayer->m_Whispers = pResult->NumArguments() == 0 ? !pPlayer->m_Whispers : pResult->GetInteger(0);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", pPlayer->m_Whispers ? "You will receive whispers" : "You will not receive any further whispers");
 }
 
 void CGameContext::ConMap(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvMapVote == 0)
@@ -533,55 +544,55 @@ void CGameContext::ConMap(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
-	if(pSelf->RateLimitPlayerVote(pResult->m_ClientID) || pSelf->RateLimitPlayerMapVote(pResult->m_ClientID))
+	if(pSelf->RateLimitPlayerVote(pResult->m_ClientId) || pSelf->RateLimitPlayerMapVote(pResult->m_ClientId))
 		return;
 
-	pSelf->Score()->MapVote(pResult->m_ClientID, pResult->GetString(0));
+	pSelf->Score()->MapVote(pResult->m_ClientId, pResult->GetString(0));
 }
 
 void CGameContext::ConMapInfo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
 	if(pResult->NumArguments() > 0)
-		pSelf->Score()->MapInfo(pResult->m_ClientID, pResult->GetString(0));
+		pSelf->Score()->MapInfo(pResult->m_ClientId, pResult->GetString(0));
 	else
-		pSelf->Score()->MapInfo(pResult->m_ClientID, g_Config.m_SvMap);
+		pSelf->Score()->MapInfo(pResult->m_ClientId, pSelf->Server()->GetMapName());
 }
 
 void CGameContext::ConTimeout(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
 	const char *pTimeout = pResult->NumArguments() > 0 ? pResult->GetString(0) : pPlayer->m_aTimeoutCode;
 
-	if(!pSelf->Server()->IsSixup(pResult->m_ClientID))
+	if(!pSelf->Server()->IsSixup(pResult->m_ClientId))
 	{
 		for(int i = 0; i < pSelf->Server()->MaxClients(); i++)
 		{
-			if(i == pResult->m_ClientID)
+			if(i == pResult->m_ClientId)
 				continue;
 			if(!pSelf->m_apPlayers[i])
 				continue;
 			if(str_comp(pSelf->m_apPlayers[i]->m_aTimeoutCode, pTimeout))
 				continue;
-			if(pSelf->Server()->SetTimedOut(i, pResult->m_ClientID))
+			if(pSelf->Server()->SetTimedOut(i, pResult->m_ClientId))
 			{
 				if(pSelf->m_apPlayers[i]->GetCharacter())
 					pSelf->SendTuningParams(i, pSelf->m_apPlayers[i]->GetCharacter()->m_TuneZone);
@@ -595,21 +606,21 @@ void CGameContext::ConTimeout(IConsole::IResult *pResult, void *pUserData)
 			"Your timeout code has been set. 0.7 clients can not reclaim their tees on timeout; however, a 0.6 client can claim your tee ");
 	}
 
-	pSelf->Server()->SetTimeoutProtected(pResult->m_ClientID);
+	pSelf->Server()->SetTimeoutProtected(pResult->m_ClientId);
 	str_copy(pPlayer->m_aTimeoutCode, pResult->GetString(0), sizeof(pPlayer->m_aTimeoutCode));
 }
 
 void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
-	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientId, false))
 		return;
 
 	if(!g_Config.m_SvPractice)
@@ -623,7 +634,7 @@ void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
 
-	int Team = Teams.m_Core.Team(pResult->m_ClientID);
+	int Team = Teams.m_Core.Team(pResult->m_ClientId);
 
 	if(Team < TEAM_FLOCK || (Team == TEAM_FLOCK && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || Team >= TEAM_SUPER)
 	{
@@ -634,6 +645,24 @@ void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
+	if(Teams.TeamFlock(Team))
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Practice mode can't be enabled in team 0 mode.");
+		return;
+	}
+
+	if(Teams.GetSaving(Team))
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Practice mode can't be enabled while team save or load is in progress");
+		return;
+	}
+
 	if(Teams.IsPractice(Team))
 	{
 		pSelf->Console()->Print(
@@ -667,25 +696,50 @@ void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
 	int NumRequiredVotes = TeamSize / 2 + 1;
 
 	char aBuf[512];
-	str_format(aBuf, sizeof(aBuf), "'%s' voted to %s /practice mode for your team, which means you can use /r, but you can't earn a rank. Type /practice to vote (%d/%d required votes)", pSelf->Server()->ClientName(pResult->m_ClientID), VotedForPractice ? "enable" : "disable", NumCurrentVotes, NumRequiredVotes);
+	str_format(aBuf, sizeof(aBuf), "'%s' voted to %s /practice mode for your team, which means you can use practice commands, but you can't earn a rank. Type /practice to vote (%d/%d required votes)", pSelf->Server()->ClientName(pResult->m_ClientId), VotedForPractice ? "enable" : "disable", NumCurrentVotes, NumRequiredVotes);
 	pSelf->SendChatTeam(Team, aBuf);
 
 	if(NumCurrentVotes >= NumRequiredVotes)
 	{
 		Teams.SetPractice(Team, true);
 		pSelf->SendChatTeam(Team, "Practice mode enabled for your team, happy practicing!");
+		pSelf->SendChatTeam(Team, "See /practicecmdlist for a list of all avaliable practice commands. Most commonly used ones are /telecursor, /lasttp and /rescue");
 	}
 }
 
+void CGameContext::ConPracticeCmdList(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	char aPracticeCommands[256];
+	mem_zero(aPracticeCommands, sizeof(aPracticeCommands));
+	str_append(aPracticeCommands, "Available practice commands: ");
+	for(const IConsole::CCommandInfo *pCmd = pSelf->Console()->FirstCommandInfo(IConsole::ACCESS_LEVEL_USER, CMDFLAG_PRACTICE);
+		pCmd; pCmd = pCmd->NextCommandInfo(IConsole::ACCESS_LEVEL_USER, CMDFLAG_PRACTICE))
+	{
+		char aCommand[64];
+
+		str_format(aCommand, sizeof(aCommand), "/%s%s", pCmd->m_pName, pCmd->NextCommandInfo(IConsole::ACCESS_LEVEL_USER, CMDFLAG_PRACTICE) ? ", " : "");
+
+		if(str_length(aCommand) + str_length(aPracticeCommands) > 255)
+		{
+			pSelf->SendChatTarget(pResult->m_ClientId, aPracticeCommands);
+			mem_zero(aPracticeCommands, sizeof(aPracticeCommands));
+		}
+		str_append(aPracticeCommands, aCommand);
+	}
+	pSelf->SendChatTarget(pResult->m_ClientId, aPracticeCommands);
+}
+
 void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	const char *pName = pResult->GetString(0);
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -698,9 +752,18 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Swap is not available on forced solo servers.");
+		return;
+	}
+
 	CGameTeams &Teams = pSelf->m_pController->Teams();
 
-	int Team = Teams.m_Core.Team(pResult->m_ClientID);
+	int Team = Teams.m_Core.Team(pResult->m_ClientId);
 
 	if(Team < TEAM_FLOCK || Team >= TEAM_SUPER)
 	{
@@ -728,7 +791,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 		int TeamSize = 1;
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(pSelf->m_apPlayers[i] && Teams.m_Core.Team(i) == Team && i != pResult->m_ClientID)
+			if(pSelf->m_apPlayers[i] && Teams.m_Core.Team(i) == Team && i != pResult->m_ClientId)
 			{
 				TargetClientId = i;
 				TeamSize++;
@@ -744,7 +807,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	if(TargetClientId == pResult->m_ClientID)
+	if(TargetClientId == pResult->m_ClientId)
 	{
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't swap with yourself");
 		return;
@@ -758,7 +821,7 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 	}
 
 	CPlayer *pSwapPlayer = pSelf->m_apPlayers[TargetClientId];
-	if(Team == TEAM_FLOCK && g_Config.m_SvTeam != 3)
+	if(Team == TEAM_FLOCK || Teams.TeamFlock(Team))
 	{
 		CCharacter *pChr = pPlayer->GetCharacter();
 		CCharacter *pSwapChr = pSwapPlayer->GetCharacter();
@@ -768,21 +831,21 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 			return;
 		}
 	}
-	else if(!Teams.IsStarted(Team))
+	else if(!Teams.IsStarted(Team) && !Teams.TeamFlock(Team))
 	{
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Need to have started the map to swap with a player.");
 		return;
 	}
-	if(pSelf->m_World.m_Core.m_apCharacters[pResult->m_ClientID] == nullptr || pSelf->m_World.m_Core.m_apCharacters[TargetClientId] == nullptr)
+	if(pSelf->m_World.m_Core.m_apCharacters[pResult->m_ClientId] == nullptr || pSelf->m_World.m_Core.m_apCharacters[TargetClientId] == nullptr)
 	{
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You and the other player must not be paused.");
 		return;
 	}
 
-	bool SwapPending = pSwapPlayer->m_SwapTargetsClientID != pResult->m_ClientID;
+	bool SwapPending = pSwapPlayer->m_SwapTargetsClientId != pResult->m_ClientId;
 	if(SwapPending)
 	{
-		if(pSelf->ProcessSpamProtection(pResult->m_ClientID))
+		if(pSelf->ProcessSpamProtection(pResult->m_ClientId))
 			return;
 
 		Teams.RequestTeamSwap(pPlayer, pSwapPlayer, Team);
@@ -795,12 +858,12 @@ void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConSave(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(!g_Config.m_SvSaveGames)
 	{
-		pSelf->SendChatTarget(pResult->m_ClientID, "Save-function is disabled on this server");
+		pSelf->SendChatTarget(pResult->m_ClientId, "Save-function is disabled on this server");
 		return;
 	}
 
@@ -808,37 +871,37 @@ void CGameContext::ConSave(IConsole::IResult *pResult, void *pUserData)
 	if(pResult->NumArguments() > 0)
 		pCode = pResult->GetString(0);
 
-	pSelf->Score()->SaveTeam(pResult->m_ClientID, pCode, g_Config.m_SvSqlServerName);
+	pSelf->Score()->SaveTeam(pResult->m_ClientId, pCode, g_Config.m_SvSqlServerName);
 }
 
 void CGameContext::ConLoad(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(!g_Config.m_SvSaveGames)
 	{
-		pSelf->SendChatTarget(pResult->m_ClientID, "Save-function is disabled on this server");
+		pSelf->SendChatTarget(pResult->m_ClientId, "Save-function is disabled on this server");
 		return;
 	}
 
 	if(pResult->NumArguments() > 0)
-		pSelf->Score()->LoadTeam(pResult->GetString(0), pResult->m_ClientID);
+		pSelf->Score()->LoadTeam(pResult->GetString(0), pResult->m_ClientId);
 	else
-		pSelf->Score()->GetSaves(pResult->m_ClientID);
+		pSelf->Score()->GetSaves(pResult->m_ClientId);
 }
 
 void CGameContext::ConTeamRank(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(pResult->NumArguments() > 0)
 	{
 		if(!g_Config.m_SvHideScore)
-			pSelf->Score()->ShowTeamRank(pResult->m_ClientID, pResult->GetString(0));
+			pSelf->Score()->ShowTeamRank(pResult->m_ClientId, pResult->GetString(0));
 		else
 			pSelf->Console()->Print(
 				IConsole::OUTPUT_LEVEL_STANDARD,
@@ -846,20 +909,20 @@ void CGameContext::ConTeamRank(IConsole::IResult *pResult, void *pUserData)
 				"Showing the team rank of other players is not allowed on this server.");
 	}
 	else
-		pSelf->Score()->ShowTeamRank(pResult->m_ClientID,
-			pSelf->Server()->ClientName(pResult->m_ClientID));
+		pSelf->Score()->ShowTeamRank(pResult->m_ClientId,
+			pSelf->Server()->ClientName(pResult->m_ClientId));
 }
 
 void CGameContext::ConRank(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(pResult->NumArguments() > 0)
 	{
 		if(!g_Config.m_SvHideScore)
-			pSelf->Score()->ShowRank(pResult->m_ClientID, pResult->GetString(0));
+			pSelf->Score()->ShowRank(pResult->m_ClientId, pResult->GetString(0));
 		else
 			pSelf->Console()->Print(
 				IConsole::OUTPUT_LEVEL_STANDARD,
@@ -867,14 +930,14 @@ void CGameContext::ConRank(IConsole::IResult *pResult, void *pUserData)
 				"Showing the rank of other players is not allowed on this server.");
 	}
 	else
-		pSelf->Score()->ShowRank(pResult->m_ClientID,
-			pSelf->Server()->ClientName(pResult->m_ClientID));
+		pSelf->Score()->ShowRank(pResult->m_ClientId,
+			pSelf->Server()->ClientName(pResult->m_ClientId));
 }
 
 void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
@@ -884,7 +947,7 @@ void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 
 	bool Lock = pSelf->m_pController->Teams().TeamLocked(Team);
 
@@ -900,19 +963,22 @@ void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientId, false))
 		return;
 
 	char aBuf[512];
 	if(Lock)
 	{
-		pSelf->UnlockTeam(pResult->m_ClientID, Team);
+		pSelf->UnlockTeam(pResult->m_ClientId, Team);
 	}
 	else
 	{
 		pSelf->m_pController->Teams().SetTeamLock(Team, true);
 
-		str_format(aBuf, sizeof(aBuf), "'%s' locked your team. After the race starts, killing will kill everyone in your team.", pSelf->Server()->ClientName(pResult->m_ClientID));
+		if(pSelf->m_pController->Teams().TeamFlock(Team))
+			str_format(aBuf, sizeof(aBuf), "'%s' locked your team.", pSelf->Server()->ClientName(pResult->m_ClientId));
+		else
+			str_format(aBuf, sizeof(aBuf), "'%s' locked your team. After the race starts, killing will kill everyone in your team.", pSelf->Server()->ClientName(pResult->m_ClientId));
 		pSelf->SendChatTeam(Team, aBuf);
 	}
 }
@@ -920,7 +986,7 @@ void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnlock(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
@@ -930,43 +996,45 @@ void CGameContext::ConUnlock(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 
 	if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
 		return;
 
-	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientId, false))
 		return;
 
-	pSelf->UnlockTeam(pResult->m_ClientID, Team);
+	pSelf->UnlockTeam(pResult->m_ClientId, Team);
 }
 
-void CGameContext::UnlockTeam(int ClientID, int Team) const
+void CGameContext::UnlockTeam(int ClientId, int Team) const
 {
 	m_pController->Teams().SetTeamLock(Team, false);
 
 	char aBuf[512];
-	str_format(aBuf, sizeof(aBuf), "'%s' unlocked your team.", Server()->ClientName(ClientID));
+	str_format(aBuf, sizeof(aBuf), "'%s' unlocked your team.", Server()->ClientName(ClientId));
 	SendChatTeam(Team, aBuf);
 }
 
-void CGameContext::AttemptJoinTeam(int ClientID, int Team)
+void CGameContext::AttemptJoinTeam(int ClientId, int Team)
 {
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if(!pPlayer)
 		return;
 
-	if(m_VoteCloseTime && m_VoteCreator == ClientID && (IsKickVote() || IsSpecVote()))
+	if(m_VoteCloseTime && m_VoteCreator == ClientId && (IsKickVote() || IsSpecVote()))
 	{
 		Console()->Print(
 			IConsole::OUTPUT_LEVEL_STANDARD,
 			"chatresp",
 			"You are running a vote please try again after the vote is done!");
+		return;
 	}
 	else if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 			"Teams are disabled");
+		return;
 	}
 	else if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && Team == 0 && pPlayer->GetCharacter() && pPlayer->GetCharacter()->m_LastStartWarning < Server()->Tick() - 3 * Server()->TickSpeed())
 	{
@@ -992,20 +1060,20 @@ void CGameContext::AttemptJoinTeam(int ClientID, int Team)
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				"You can\'t change teams that fast!");
 		}
-		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().TeamLocked(Team) && !m_pController->Teams().IsInvited(Team, ClientID))
+		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().TeamLocked(Team) && !m_pController->Teams().IsInvited(Team, ClientId))
 		{
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
 				g_Config.m_SvInvite ?
 					"This team is locked using /lock. Only members of the team can unlock it using /lock." :
 					"This team is locked using /lock. Only members of the team can invite you or unlock it using /lock.");
 		}
-		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize)
+		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize && !m_pController->Teams().TeamFlock(Team) && !m_pController->Teams().IsPractice(Team))
 		{
 			char aBuf[512];
 			str_format(aBuf, sizeof(aBuf), "This team already has the maximum allowed size of %d players", g_Config.m_SvMaxTeamSize);
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 		}
-		else if(const char *pError = m_pController->Teams().SetCharacterTeam(pPlayer->GetCID(), Team))
+		else if(const char *pError = m_pController->Teams().SetCharacterTeam(pPlayer->GetCid(), Team))
 		{
 			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", pError);
 		}
@@ -1013,13 +1081,16 @@ void CGameContext::AttemptJoinTeam(int ClientID, int Team)
 		{
 			char aBuf[512];
 			str_format(aBuf, sizeof(aBuf), "'%s' joined team %d",
-				Server()->ClientName(pPlayer->GetCID()),
+				Server()->ClientName(pPlayer->GetCid()),
 				Team);
-			SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+			SendChat(-1, TEAM_ALL, aBuf);
 			pPlayer->m_Last_Team = Server()->Tick();
 
 			if(m_pController->Teams().IsPractice(Team))
-				SendChatTarget(pPlayer->GetCID(), "Practice mode enabled for your team, happy practicing!");
+				SendChatTarget(pPlayer->GetCid(), "Practice mode enabled for your team, happy practicing!");
+
+			if(m_pController->Teams().TeamFlock(Team))
+				SendChatTarget(pPlayer->GetCid(), "Team 0 mode enabled for your team. This will make your team behave like team 0.");
 		}
 	}
 }
@@ -1043,7 +1114,7 @@ void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	int Team = pController->Teams().m_Core.Team(pResult->m_ClientID);
+	int Team = pController->Teams().m_Core.Team(pResult->m_ClientId);
 	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
 	{
 		int Target = -1;
@@ -1068,57 +1139,144 @@ void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData)
 			return;
 		}
 
-		if(pSelf->m_apPlayers[pResult->m_ClientID] && pSelf->m_apPlayers[pResult->m_ClientID]->m_LastInvited + g_Config.m_SvInviteFrequency * pSelf->Server()->TickSpeed() > pSelf->Server()->Tick())
+		if(pSelf->m_apPlayers[pResult->m_ClientId] && pSelf->m_apPlayers[pResult->m_ClientId]->m_LastInvited + g_Config.m_SvInviteFrequency * pSelf->Server()->TickSpeed() > pSelf->Server()->Tick())
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't invite this quickly");
 			return;
 		}
 
 		pController->Teams().SetClientInvited(Team, Target, true);
-		pSelf->m_apPlayers[pResult->m_ClientID]->m_LastInvited = pSelf->Server()->Tick();
+		pSelf->m_apPlayers[pResult->m_ClientId]->m_LastInvited = pSelf->Server()->Tick();
 
 		char aBuf[512];
-		str_format(aBuf, sizeof(aBuf), "'%s' invited you to team %d. Use /team %d to join.", pSelf->Server()->ClientName(pResult->m_ClientID), Team, Team);
+		str_format(aBuf, sizeof(aBuf), "'%s' invited you to team %d. Use /team %d to join.", pSelf->Server()->ClientName(pResult->m_ClientId), Team, Team);
 		pSelf->SendChatTarget(Target, aBuf);
 
-		str_format(aBuf, sizeof(aBuf), "'%s' invited '%s' to your team.", pSelf->Server()->ClientName(pResult->m_ClientID), pSelf->Server()->ClientName(Target));
+		str_format(aBuf, sizeof(aBuf), "'%s' invited '%s' to your team.", pSelf->Server()->ClientName(pResult->m_ClientId), pSelf->Server()->ClientName(Target));
 		pSelf->SendChatTeam(Team, aBuf);
 	}
 	else
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't invite players to this team");
 }
 
+void CGameContext::ConTeam0Mode(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pController = pSelf->m_pController;
+
+	if(!CheckClientId(pResult->m_ClientId))
+		return;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || g_Config.m_SvTeam == SV_TEAM_MANDATORY)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Team mode change disabled");
+		return;
+	}
+
+	if(!g_Config.m_SvTeam0Mode)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Team mode change is disabled on this server.");
+		return;
+	}
+
+	int Team = pController->Teams().m_Core.Team(pResult->m_ClientId);
+	bool Mode = pController->Teams().TeamFlock(Team);
+
+	if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"This team can't have the mode changed");
+		return;
+	}
+
+	if(pController->Teams().GetTeamState(Team) != CGameTeams::TEAMSTATE_OPEN)
+	{
+		pSelf->SendChatTarget(pResult->m_ClientId, "Team mode can't be changed while racing");
+		return;
+	}
+
+	if(pResult->NumArguments() > 0)
+		Mode = !pResult->GetInteger(0);
+
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientId, false))
+		return;
+
+	char aBuf[512];
+	if(Mode)
+	{
+		if(pController->Teams().Count(Team) > g_Config.m_SvMaxTeamSize)
+		{
+			str_format(aBuf, sizeof(aBuf), "Can't disable team 0 mode. This team exceeds the maximum allowed size of %d players for regular team", g_Config.m_SvMaxTeamSize);
+			pSelf->SendChatTarget(pResult->m_ClientId, aBuf);
+		}
+		else
+		{
+			pController->Teams().SetTeamFlock(Team, false);
+
+			str_format(aBuf, sizeof(aBuf), "'%s' disabled team 0 mode.", pSelf->Server()->ClientName(pResult->m_ClientId));
+			pSelf->SendChatTeam(Team, aBuf);
+		}
+	}
+	else
+	{
+		if(pController->Teams().IsPractice(Team))
+		{
+			pSelf->SendChatTarget(pResult->m_ClientId, "Can't enable team 0 mode with practice mode on.");
+		}
+		else
+		{
+			pController->Teams().SetTeamFlock(Team, true);
+
+			str_format(aBuf, sizeof(aBuf), "'%s' enabled team 0 mode. This will make your team behave like team 0.", pSelf->Server()->ClientName(pResult->m_ClientId));
+			pSelf->SendChatTeam(Team, aBuf);
+		}
+	}
+}
+
 void CGameContext::ConTeam(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
 	if(pResult->NumArguments() > 0)
 	{
-		pSelf->AttemptJoinTeam(pResult->m_ClientID, pResult->GetInteger(0));
+		pSelf->AttemptJoinTeam(pResult->m_ClientId, pResult->GetInteger(0));
 	}
 	else
 	{
 		char aBuf[512];
 		if(!pPlayer->IsPlaying())
 		{
-			pSelf->Console()->Print(
-				IConsole::OUTPUT_LEVEL_STANDARD,
-				"chatresp",
-				"You can't check your team while you are dead/a spectator.");
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You can't check your team while you are dead/a spectator.");
 		}
 		else
 		{
-			str_format(
-				aBuf,
-				sizeof(aBuf),
-				"You are in team %d",
-				pSelf->GetDDRaceTeam(pResult->m_ClientID));
+			int TeamSize = 0;
+			const int PlayerTeam = pSelf->GetDDRaceTeam(pResult->m_ClientId);
+
+			// Count players in team
+			for(int ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
+			{
+				const CPlayer *pOtherPlayer = pSelf->m_apPlayers[ClientId];
+				if(!pOtherPlayer || !pOtherPlayer->IsPlaying())
+					continue;
+
+				if(pSelf->GetDDRaceTeam(ClientId) == PlayerTeam)
+					TeamSize++;
+			}
+
+			str_format(aBuf, sizeof(aBuf), "You are in team %d having %d %s", PlayerTeam, TeamSize, TeamSize > 1 ? "players" : "player");
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
 		}
 	}
@@ -1127,7 +1285,7 @@ void CGameContext::ConTeam(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConJoin(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	int Target = -1;
@@ -1148,25 +1306,25 @@ void CGameContext::ConJoin(IConsole::IResult *pResult, void *pUserData)
 	}
 
 	int Team = pSelf->GetDDRaceTeam(Target);
-	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientId, false))
 		return;
 
-	pSelf->AttemptJoinTeam(pResult->m_ClientID, Team);
+	pSelf->AttemptJoinTeam(pResult->m_ClientId, Team);
 }
 
 void CGameContext::ConMe(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	char aBuf[256 + 24];
 
 	str_format(aBuf, 256 + 24, "'%s' %s",
-		pSelf->Server()->ClientName(pResult->m_ClientID),
+		pSelf->Server()->ClientName(pResult->m_ClientId),
 		pResult->GetString(0));
 	if(g_Config.m_SvSlashMe)
-		pSelf->SendChat(-2, CGameContext::CHAT_ALL, aBuf, pResult->m_ClientID);
+		pSelf->SendChat(-2, TEAM_ALL, aBuf, pResult->m_ClientId);
 	else
 		pSelf->Console()->Print(
 			IConsole::OUTPUT_LEVEL_STANDARD,
@@ -1188,10 +1346,10 @@ void CGameContext::ConSetEyeEmote(IConsole::IResult *pResult,
 	void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	if(pResult->NumArguments() == 0)
@@ -1201,7 +1359,7 @@ void CGameContext::ConSetEyeEmote(IConsole::IResult *pResult,
 			"chatresp",
 			(pPlayer->m_EyeEmoteEnabled) ?
 				"You can now use the preset eye emotes." :
-				"You don't have any eye emotes, remember to bind some. (until you die)");
+				"You don't have any eye emotes, remember to bind some.");
 		return;
 	}
 	else if(str_comp_nocase(pResult->GetString(0), "on") == 0)
@@ -1215,7 +1373,7 @@ void CGameContext::ConSetEyeEmote(IConsole::IResult *pResult,
 		"chatresp",
 		(pPlayer->m_EyeEmoteEnabled) ?
 			"You can now use the preset eye emotes." :
-			"You don't have any eye emotes, remember to bind some. (until you die)");
+			"You don't have any eye emotes, remember to bind some.");
 }
 
 void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
@@ -1228,10 +1386,10 @@ void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -1252,19 +1410,19 @@ void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
 			return;
 
 		int EmoteType = 0;
-		if(!str_comp(pResult->GetString(0), "angry"))
+		if(!str_comp_nocase(pResult->GetString(0), "angry"))
 			EmoteType = EMOTE_ANGRY;
-		else if(!str_comp(pResult->GetString(0), "blink"))
+		else if(!str_comp_nocase(pResult->GetString(0), "blink"))
 			EmoteType = EMOTE_BLINK;
-		else if(!str_comp(pResult->GetString(0), "close"))
+		else if(!str_comp_nocase(pResult->GetString(0), "close"))
 			EmoteType = EMOTE_BLINK;
-		else if(!str_comp(pResult->GetString(0), "happy"))
+		else if(!str_comp_nocase(pResult->GetString(0), "happy"))
 			EmoteType = EMOTE_HAPPY;
-		else if(!str_comp(pResult->GetString(0), "pain"))
+		else if(!str_comp_nocase(pResult->GetString(0), "pain"))
 			EmoteType = EMOTE_PAIN;
-		else if(!str_comp(pResult->GetString(0), "surprise"))
+		else if(!str_comp_nocase(pResult->GetString(0), "surprise"))
 			EmoteType = EMOTE_SURPRISE;
-		else if(!str_comp(pResult->GetString(0), "normal"))
+		else if(!str_comp_nocase(pResult->GetString(0), "normal"))
 			EmoteType = EMOTE_NORMAL;
 		else
 		{
@@ -1284,10 +1442,10 @@ void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConNinjaJetpack(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	if(pResult->NumArguments())
@@ -1299,10 +1457,10 @@ void CGameContext::ConNinjaJetpack(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConShowOthers(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	if(g_Config.m_SvShowOthers)
@@ -1322,10 +1480,10 @@ void CGameContext::ConShowOthers(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConShowAll(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -1342,18 +1500,18 @@ void CGameContext::ConShowAll(IConsole::IResult *pResult, void *pUserData)
 	}
 
 	if(pPlayer->m_ShowAll)
-		pSelf->SendChatTarget(pResult->m_ClientID, "You will now see all tees on this server, no matter the distance");
+		pSelf->SendChatTarget(pResult->m_ClientId, "You will now see all tees on this server, no matter the distance");
 	else
-		pSelf->SendChatTarget(pResult->m_ClientID, "You will no longer see all tees on this server");
+		pSelf->SendChatTarget(pResult->m_ClientId, "You will no longer see all tees on this server");
 }
 
 void CGameContext::ConSpecTeam(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -1363,38 +1521,38 @@ void CGameContext::ConSpecTeam(IConsole::IResult *pResult, void *pUserData)
 		pPlayer->m_SpecTeam = !pPlayer->m_SpecTeam;
 }
 
-bool CheckClientID(int ClientID)
+bool CheckClientId(int ClientId)
 {
-	return ClientID >= 0 && ClientID < MAX_CLIENTS;
+	return ClientId >= 0 && ClientId < MAX_CLIENTS;
 }
 
 void CGameContext::ConSayTime(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	int ClientID;
+	int ClientId;
 	char aBufName[MAX_NAME_LENGTH];
 
 	if(pResult->NumArguments() > 0)
 	{
-		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
-			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+		for(ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientId)) == 0)
 				break;
 
-		if(ClientID == MAX_CLIENTS)
+		if(ClientId == MAX_CLIENTS)
 			return;
 
-		str_format(aBufName, sizeof(aBufName), "%s's", pSelf->Server()->ClientName(ClientID));
+		str_format(aBufName, sizeof(aBufName), "%s's", pSelf->Server()->ClientName(ClientId));
 	}
 	else
 	{
 		str_copy(aBufName, "Your", sizeof(aBufName));
-		ClientID = pResult->m_ClientID;
+		ClientId = pResult->m_ClientId;
 	}
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1414,10 +1572,10 @@ void CGameContext::ConSayTime(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConSayTimeAll(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1429,19 +1587,19 @@ void CGameContext::ConSayTimeAll(IConsole::IResult *pResult, void *pUserData)
 	char aBufTime[32];
 	char aBuf[64];
 	int64_t Time = (int64_t)100 * (float)(pSelf->Server()->Tick() - pChr->m_StartTime) / ((float)pSelf->Server()->TickSpeed());
-	const char *pName = pSelf->Server()->ClientName(pResult->m_ClientID);
+	const char *pName = pSelf->Server()->ClientName(pResult->m_ClientId);
 	str_time(Time, TIME_HOURS, aBufTime, sizeof(aBufTime));
 	str_format(aBuf, sizeof(aBuf), "%s\'s current race time is %s", pName, aBufTime);
-	pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf, pResult->m_ClientID);
+	pSelf->SendChat(-1, TEAM_ALL, aBuf, pResult->m_ClientId);
 }
 
 void CGameContext::ConTime(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1453,7 +1611,7 @@ void CGameContext::ConTime(IConsole::IResult *pResult, void *pUserData)
 	int64_t Time = (int64_t)100 * (float)(pSelf->Server()->Tick() - pChr->m_StartTime) / ((float)pSelf->Server()->TickSpeed());
 	str_time(Time, TIME_HOURS, aBufTime, sizeof(aBufTime));
 	str_format(aBuf, sizeof(aBuf), "Your time is %s", aBufTime);
-	pSelf->SendBroadcast(aBuf, pResult->m_ClientID);
+	pSelf->SendBroadcast(aBuf, pResult->m_ClientId);
 }
 
 static const char s_aaMsg[4][128] = {"game/round timer.", "broadcast.", "both game/round timer and broadcast.", "racetime."};
@@ -1462,10 +1620,10 @@ void CGameContext::ConSetTimerType(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
@@ -1499,7 +1657,7 @@ void CGameContext::ConSetTimerType(IConsole::IResult *pResult, void *pUserData)
 		}
 
 		if((OldType == CPlayer::TIMERTYPE_BROADCAST || OldType == CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST) && (pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER || pPlayer->m_TimerType == CPlayer::TIMERTYPE_NONE))
-			pSelf->SendBroadcast("", pResult->m_ClientID);
+			pSelf->SendBroadcast("", pResult->m_ClientId);
 	}
 
 	if(pPlayer->m_TimerType <= CPlayer::TIMERTYPE_SIXUP && pPlayer->m_TimerType >= CPlayer::TIMERTYPE_GAMETIMER)
@@ -1513,9 +1671,9 @@ void CGameContext::ConSetTimerType(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConRescue(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1523,71 +1681,230 @@ void CGameContext::ConRescue(IConsole::IResult *pResult, void *pUserData)
 		return;
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!g_Config.m_SvRescue && !Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "Rescue is not enabled on this server and you're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Rescue is not enabled on this server and you're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
 
-	pChr->Rescue();
-	pChr->UnFreeze();
+	bool GoRescue = true;
+
+	if(pPlayer->m_RescueMode == RESCUEMODE_MANUAL)
+	{
+		// if character can't set his rescue state then we should rescue him instead
+		GoRescue = !pChr->TrySetRescue(RESCUEMODE_MANUAL);
+	}
+
+	if(GoRescue)
+	{
+		pChr->Rescue();
+		pChr->UnFreeze();
+	}
 }
 
-void CGameContext::ConTele(IConsole::IResult *pResult, void *pUserData)
+void CGameContext::ConRescueMode(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
-	CCharacter *pChr = pPlayer->GetCharacter();
-	if(!pChr)
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
+	if(!g_Config.m_SvRescue && !Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Rescue is not enabled on this server and you're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	if(str_comp_nocase(pResult->GetString(0), "auto") == 0)
+	{
+		if(pPlayer->m_RescueMode != RESCUEMODE_AUTO)
+		{
+			pPlayer->m_RescueMode = RESCUEMODE_AUTO;
+
+			pSelf->SendChatTarget(pPlayer->GetCid(), "Rescue mode changed to auto.");
+		}
+
+		return;
+	}
+
+	if(str_comp_nocase(pResult->GetString(0), "manual") == 0)
+	{
+		if(pPlayer->m_RescueMode != RESCUEMODE_MANUAL)
+		{
+			pPlayer->m_RescueMode = RESCUEMODE_MANUAL;
+
+			pSelf->SendChatTarget(pPlayer->GetCid(), "Rescue mode changed to manual.");
+		}
+
+		return;
+	}
+
+	if(str_comp_nocase(pResult->GetString(0), "list") == 0)
+	{
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Available rescue modes: auto, manual");
+	}
+	else if(str_comp_nocase(pResult->GetString(0), "") == 0)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "Current rescue mode: %s.", pPlayer->m_RescueMode == RESCUEMODE_MANUAL ? "manual" : "auto");
+		pSelf->SendChatTarget(pPlayer->GetCid(), aBuf);
+	}
+	else
+	{
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Unknown argument. Check '/rescuemode list'");
+	}
+}
+
+void CGameContext::ConTeleTo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientId(pResult->m_ClientId))
+		return;
+	CPlayer *pCallingPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
+	if(!pCallingPlayer)
+		return;
+	CCharacter *pCallingCharacter = pCallingPlayer->GetCharacter();
+	if(!pCallingCharacter)
 		return;
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pCallingPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
 
-	vec2 Pos = pPlayer->m_ViewPos;
-	if(pResult->NumArguments() > 0)
+	vec2 Pos = {};
+
+	if(pResult->NumArguments() == 0)
+	{
+		// Set calling tee's position to the origin of its spectating viewport
+		Pos = pCallingPlayer->m_ViewPos;
+	}
+	else
 	{
-		int ClientID;
-		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+		// Search for player with this name
+		int ClientId;
+		for(ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 		{
-			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientId)) == 0)
 				break;
 		}
-		if(ClientID == MAX_CLIENTS)
+		if(ClientId == MAX_CLIENTS)
 		{
-			pSelf->SendChatTarget(pPlayer->GetCID(), "No player with this name found.");
+			pSelf->SendChatTarget(pCallingPlayer->GetCid(), "No player with this name found.");
 			return;
 		}
-		CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientID];
-		if(!pPlayerTo)
+
+		CPlayer *pDestPlayer = pSelf->m_apPlayers[ClientId];
+		if(!pDestPlayer)
 			return;
-		CCharacter *pChrTo = pPlayerTo->GetCharacter();
-		if(!pChrTo)
+		CCharacter *pDestCharacter = pDestPlayer->GetCharacter();
+		if(!pDestCharacter)
 			return;
-		Pos = pChrTo->m_Pos;
+
+		// Set calling tee's position to that of the destination tee
+		Pos = pDestCharacter->m_Pos;
 	}
-	pSelf->Teleport(pChr, Pos);
-	pChr->UnFreeze();
-	pChr->Core()->m_Vel = vec2(0, 0);
-	pPlayer->m_LastTeleTee.Save(pChr);
+
+	// Teleport tee
+	pSelf->Teleport(pCallingCharacter, Pos);
+	pCallingCharacter->ResetJumps();
+	pCallingCharacter->UnFreeze();
+	pCallingCharacter->ResetVelocity();
+	pCallingPlayer->m_LastTeleTee.Save(pCallingCharacter);
+}
+
+void CGameContext::ConTeleXY(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientId(pResult->m_ClientId))
+		return;
+	CPlayer *pCallingPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
+	if(!pCallingPlayer)
+		return;
+	CCharacter *pCallingCharacter = pCallingPlayer->GetCharacter();
+	if(!pCallingCharacter)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pCallingPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	vec2 Pos = {};
+
+	if(pResult->NumArguments() != 2)
+	{
+		pSelf->SendChatTarget(pCallingPlayer->GetCid(), "Can't recognize specified arguments. Usage: /tpxy x y, e.g. /tpxy 9 3.");
+		return;
+	}
+	else
+	{
+		float BaseX = 0.f, BaseY = 0.f;
+
+		CMapItemLayerTilemap *pGameLayer = pSelf->m_Layers.GameLayer();
+		constexpr float OuterKillTileBoundaryDistance = 201 * 32.f;
+		float MapWidth = (pGameLayer->m_Width * 32) + (OuterKillTileBoundaryDistance * 2.f), MapHeight = (pGameLayer->m_Height * 32) + (OuterKillTileBoundaryDistance * 2.f);
+
+		const auto DetermineCoordinateRelativity = [](const char *pInString, const float AbsoluteDefaultValue, float &OutFloat) -> bool {
+			// mode 0 = abs, 1 = sub, 2 = add
+
+			// Relative?
+			const char *pStrDelta = str_startswith(pInString, "~");
+
+			float d;
+			if(!str_tofloat(pStrDelta ? pStrDelta : pInString, &d))
+				return false;
+
+			// Is the number valid?
+			if(std::isnan(d) || std::isinf(d))
+				return false;
+
+			// Convert our gleaned 'display' coordinate to an actual map coordinate
+			d *= 32.f;
+
+			OutFloat = (pStrDelta ? AbsoluteDefaultValue : 0) + d;
+			return true;
+		};
+
+		if(!DetermineCoordinateRelativity(pResult->GetString(0), pCallingPlayer->m_ViewPos.x, BaseX))
+		{
+			pSelf->SendChatTarget(pCallingPlayer->GetCid(), "Invalid X coordinate.");
+			return;
+		}
+		if(!DetermineCoordinateRelativity(pResult->GetString(1), pCallingPlayer->m_ViewPos.y, BaseY))
+		{
+			pSelf->SendChatTarget(pCallingPlayer->GetCid(), "Invalid Y coordinate.");
+			return;
+		}
+
+		Pos = {std::clamp(BaseX, (-OuterKillTileBoundaryDistance) + 1.f, (-OuterKillTileBoundaryDistance) + MapWidth - 1.f), std::clamp(BaseY, (-OuterKillTileBoundaryDistance) + 1.f, (-OuterKillTileBoundaryDistance) + MapHeight - 1.f)};
+	}
+
+	// Teleport tee
+	pSelf->Teleport(pCallingCharacter, Pos);
+	pCallingCharacter->ResetJumps();
+	pCallingCharacter->UnFreeze();
+	pCallingCharacter->ResetVelocity();
+	pCallingPlayer->m_LastTeleTee.Save(pCallingCharacter);
 }
 
 void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1595,10 +1912,10 @@ void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)
 		return;
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
 
@@ -1609,18 +1926,18 @@ void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)
 	}
 	else if(pResult->NumArguments() > 0)
 	{
-		int ClientID;
-		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+		int ClientId;
+		for(ClientId = 0; ClientId < MAX_CLIENTS; ClientId++)
 		{
-			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientId)) == 0)
 				break;
 		}
-		if(ClientID == MAX_CLIENTS)
+		if(ClientId == MAX_CLIENTS)
 		{
-			pSelf->SendChatTarget(pPlayer->GetCID(), "No player with this name found.");
+			pSelf->SendChatTarget(pPlayer->GetCid(), "No player with this name found.");
 			return;
 		}
-		CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientID];
+		CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientId];
 		if(!pPlayerTo)
 			return;
 		CCharacter *pChrTo = pPlayerTo->GetCharacter();
@@ -1629,17 +1946,18 @@ void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)
 		Pos = pChrTo->m_Pos;
 	}
 	pSelf->Teleport(pChr, Pos);
+	pChr->ResetJumps();
 	pChr->UnFreeze();
-	pChr->Core()->m_Vel = vec2(0, 0);
+	pChr->ResetVelocity();
 	pPlayer->m_LastTeleTee.Save(pChr);
 }
 
 void CGameContext::ConLastTele(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1647,27 +1965,48 @@ void CGameContext::ConLastTele(IConsole::IResult *pResult, void *pUserData)
 		return;
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
 	if(!pPlayer->m_LastTeleTee.GetPos().x)
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You haven't previously teleported. Use /tp before using this command.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "You haven't previously teleported. Use /tp before using this command.");
 		return;
 	}
 	pPlayer->m_LastTeleTee.Load(pChr, pChr->Team(), true);
 	pPlayer->Pause(CPlayer::PAUSE_NONE, true);
 }
 
+CCharacter *CGameContext::GetPracticeCharacter(IConsole::IResult *pResult)
+{
+	if(!CheckClientId(pResult->m_ClientId))
+		return nullptr;
+	CPlayer *pPlayer = m_apPlayers[pResult->m_ClientId];
+	if(!pPlayer)
+		return nullptr;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return nullptr;
+
+	CGameTeams &Teams = m_pController->Teams();
+	int Team = GetDDRaceTeam(pResult->m_ClientId);
+	if(!Teams.IsPractice(Team))
+	{
+		SendChatTarget(pPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return nullptr;
+	}
+	return pChr;
+}
+
 void CGameContext::ConPracticeUnSolo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1676,51 +2015,180 @@ void CGameContext::ConPracticeUnSolo(IConsole::IResult *pResult, void *pUserData
 
 	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "Command is not available on solo servers");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Command is not available on solo servers");
 		return;
 	}
 
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
-
 	pChr->SetSolo(false);
 }
 
-void CGameContext::ConPracticeUnDeep(IConsole::IResult *pResult, void *pUserData)
+void CGameContext::ConPracticeSolo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
 	if(!pChr)
 		return;
 
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->SendChatTarget(pPlayer->GetCid(), "Command is not available on solo servers");
+		return;
+	}
+
 	CGameTeams &Teams = pSelf->m_pController->Teams();
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
 	if(!Teams.IsPractice(Team))
 	{
-		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		pSelf->SendChatTarget(pPlayer->GetCid(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
 		return;
 	}
+	pChr->SetSolo(true);
+}
+
+void CGameContext::ConPracticeUnDeep(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pChr = pSelf->GetPracticeCharacter(pResult);
+	if(!pChr)
+		return;
 
 	pChr->SetDeepFrozen(false);
 	pChr->UnFreeze();
 }
 
+void CGameContext::ConPracticeDeep(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pChr = pSelf->GetPracticeCharacter(pResult);
+	if(!pChr)
+		return;
+
+	pChr->SetDeepFrozen(true);
+}
+
+void CGameContext::ConPracticeShotgun(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConShotgun(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeGrenade(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConGrenade(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeLaser(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConLaser(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeJetpack(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConJetpack(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeSetJumps(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConSetJumps(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeWeapons(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConWeapons(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnShotgun(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnShotgun(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnGrenade(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnGrenade(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnLaser(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnLaser(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnJetpack(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnJetpack(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnWeapons(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnWeapons(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeNinja(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConNinja(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeUnNinja(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConUnNinja(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeAddWeapon(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConAddWeapon(pResult, pUserData);
+}
+
+void CGameContext::ConPracticeRemoveWeapon(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pSelf->GetPracticeCharacter(pResult))
+		ConRemoveWeapon(pResult, pUserData);
+}
+
 void CGameContext::ConProtectedKill(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 	CCharacter *pChr = pPlayer->GetCharacter();
@@ -1737,13 +2205,13 @@ void CGameContext::ConProtectedKill(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConPoints(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(pResult->NumArguments() > 0)
 	{
 		if(!g_Config.m_SvHideScore)
-			pSelf->Score()->ShowPoints(pResult->m_ClientID, pResult->GetString(0));
+			pSelf->Score()->ShowPoints(pResult->m_ClientId, pResult->GetString(0));
 		else
 			pSelf->Console()->Print(
 				IConsole::OUTPUT_LEVEL_STANDARD,
@@ -1751,14 +2219,14 @@ void CGameContext::ConPoints(IConsole::IResult *pResult, void *pUserData)
 				"Showing the global points of other players is not allowed on this server.");
 	}
 	else
-		pSelf->Score()->ShowPoints(pResult->m_ClientID,
-			pSelf->Server()->ClientName(pResult->m_ClientID));
+		pSelf->Score()->ShowPoints(pResult->m_ClientId,
+			pSelf->Server()->ClientName(pResult->m_ClientId));
 }
 
 void CGameContext::ConTopPoints(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvHideScore)
@@ -1769,15 +2237,15 @@ void CGameContext::ConTopPoints(IConsole::IResult *pResult, void *pUserData)
 	}
 
 	if(pResult->NumArguments() > 0)
-		pSelf->Score()->ShowTopPoints(pResult->m_ClientID, pResult->GetInteger(0));
+		pSelf->Score()->ShowTopPoints(pResult->m_ClientId, pResult->GetInteger(0));
 	else
-		pSelf->Score()->ShowTopPoints(pResult->m_ClientID);
+		pSelf->Score()->ShowTopPoints(pResult->m_ClientId);
 }
 
 void CGameContext::ConTimeCP(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	if(g_Config.m_SvHideScore)
@@ -1787,10 +2255,10 @@ void CGameContext::ConTimeCP(IConsole::IResult *pResult, void *pUserData)
 		return;
 	}
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	if(!pPlayer)
 		return;
 
 	const char *pName = pResult->GetString(0);
-	pSelf->Score()->LoadPlayerData(pResult->m_ClientID, pName);
+	pSelf->Score()->LoadPlayerTimeCp(pResult->m_ClientId, pName);
 }
diff --git a/src/game/server/ddracecommands.cpp b/src/game/server/ddracecommands.cpp
index 27eacf94e5..e65cad482c 100644
--- a/src/game/server/ddracecommands.cpp
+++ b/src/game/server/ddracecommands.cpp
@@ -10,16 +10,16 @@
 #include <game/server/save.h>
 #include <game/server/teams.h>
 
-bool CheckClientID(int ClientID);
+bool CheckClientId(int ClientId);
 
 void CGameContext::ConGoLeft(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, -1 * Tiles, 0);
+	pSelf->MoveCharacter(pResult->m_ClientId, -1 * Tiles, 0);
 }
 
 void CGameContext::ConGoRight(IConsole::IResult *pResult, void *pUserData)
@@ -27,9 +27,9 @@ void CGameContext::ConGoRight(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, Tiles, 0);
+	pSelf->MoveCharacter(pResult->m_ClientId, Tiles, 0);
 }
 
 void CGameContext::ConGoDown(IConsole::IResult *pResult, void *pUserData)
@@ -37,9 +37,9 @@ void CGameContext::ConGoDown(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, 0, Tiles);
+	pSelf->MoveCharacter(pResult->m_ClientId, 0, Tiles);
 }
 
 void CGameContext::ConGoUp(IConsole::IResult *pResult, void *pUserData)
@@ -47,45 +47,44 @@ void CGameContext::ConGoUp(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
 
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, 0, -1 * Tiles);
+	pSelf->MoveCharacter(pResult->m_ClientId, 0, -1 * Tiles);
 }
 
 void CGameContext::ConMove(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, pResult->GetInteger(0),
+	pSelf->MoveCharacter(pResult->m_ClientId, pResult->GetInteger(0),
 		pResult->GetInteger(1));
 }
 
 void CGameContext::ConMoveRaw(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	pSelf->MoveCharacter(pResult->m_ClientID, pResult->GetInteger(0),
+	pSelf->MoveCharacter(pResult->m_ClientId, pResult->GetInteger(0),
 		pResult->GetInteger(1), true);
 }
 
-void CGameContext::MoveCharacter(int ClientID, int X, int Y, bool Raw)
+void CGameContext::MoveCharacter(int ClientId, int X, int Y, bool Raw)
 {
-	CCharacter *pChr = GetPlayerChar(ClientID);
+	CCharacter *pChr = GetPlayerChar(ClientId);
 
 	if(!pChr)
 		return;
 
-	pChr->Core()->m_Pos.x += ((Raw) ? 1 : 32) * X;
-	pChr->Core()->m_Pos.y += ((Raw) ? 1 : 32) * Y;
+	pChr->Move(vec2((Raw ? 1 : 32) * X, (Raw ? 1 : 32) * Y));
 	pChr->m_DDRaceState = DDRACE_CHEAT;
 }
 
 void CGameContext::ConKillPlayer(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 	int Victim = pResult->GetVictim();
 
@@ -95,8 +94,8 @@ void CGameContext::ConKillPlayer(IConsole::IResult *pResult, void *pUserData)
 		char aBuf[512];
 		str_format(aBuf, sizeof(aBuf), "%s was killed by %s",
 			pSelf->Server()->ClientName(Victim),
-			pSelf->Server()->ClientName(pResult->m_ClientID));
-		pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+			pSelf->Server()->ClientName(pResult->m_ClientId));
+		pSelf->SendChat(-1, TEAM_ALL, aBuf);
 	}
 }
 
@@ -115,9 +114,9 @@ void CGameContext::ConUnNinja(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConEndlessHook(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 	{
 		pChr->SetEndlessHook(true);
@@ -127,9 +126,9 @@ void CGameContext::ConEndlessHook(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnEndlessHook(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 	{
 		pChr->SetEndlessHook(false);
@@ -139,9 +138,9 @@ void CGameContext::ConUnEndlessHook(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConSuper(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr && !pChr->IsSuper())
 	{
 		pChr->SetSuper(true);
@@ -152,9 +151,9 @@ void CGameContext::ConSuper(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnSuper(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr && pChr->IsSuper())
 	{
 		pChr->SetSuper(false);
@@ -164,9 +163,9 @@ void CGameContext::ConUnSuper(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConSolo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetSolo(true);
 }
@@ -174,9 +173,9 @@ void CGameContext::ConSolo(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnSolo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetSolo(false);
 }
@@ -184,9 +183,9 @@ void CGameContext::ConUnSolo(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConFreeze(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->Freeze();
 }
@@ -194,9 +193,9 @@ void CGameContext::ConFreeze(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnFreeze(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->UnFreeze();
 }
@@ -204,9 +203,9 @@ void CGameContext::ConUnFreeze(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConDeep(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetDeepFrozen(true);
 }
@@ -214,19 +213,22 @@ void CGameContext::ConDeep(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnDeep(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
+	{
 		pChr->SetDeepFrozen(false);
+		pChr->UnFreeze();
+	}
 }
 
 void CGameContext::ConLiveFreeze(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetLiveFrozen(true);
 }
@@ -234,9 +236,9 @@ void CGameContext::ConLiveFreeze(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnLiveFreeze(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetLiveFrozen(false);
 }
@@ -262,11 +264,19 @@ void CGameContext::ConLaser(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConJetpack(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetJetpack(true);
 }
 
+void CGameContext::ConSetJumps(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
+	if(pChr)
+		pChr->SetJumps(pResult->GetInteger(0));
+}
+
 void CGameContext::ConWeapons(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
@@ -294,7 +304,7 @@ void CGameContext::ConUnLaser(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConUnJetpack(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 	if(pChr)
 		pChr->SetJetpack(false);
 }
@@ -321,7 +331,7 @@ void CGameContext::ModifyWeapons(IConsole::IResult *pResult, void *pUserData,
 	int Weapon, bool Remove)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	CCharacter *pChr = GetPlayerChar(pResult->m_ClientID);
+	CCharacter *pChr = GetPlayerChar(pResult->m_ClientId);
 	if(!pChr)
 		return;
 
@@ -348,7 +358,7 @@ void CGameContext::ModifyWeapons(IConsole::IResult *pResult, void *pUserData,
 
 void CGameContext::Teleport(CCharacter *pChr, vec2 Pos)
 {
-	pChr->Core()->m_Pos = Pos;
+	pChr->SetPosition(Pos);
 	pChr->m_Pos = Pos;
 	pChr->m_PrevPos = Pos;
 	pChr->m_DDRaceState = DDRACE_CHEAT;
@@ -359,13 +369,13 @@ void CGameContext::ConToTeleporter(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	unsigned int TeleTo = pResult->GetInteger(0);
 
-	if(!pSelf->m_pController->m_TeleOuts[TeleTo - 1].empty())
+	if(!pSelf->Collision()->TeleOuts(TeleTo - 1).empty())
 	{
-		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 		if(pChr)
 		{
-			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->m_pController->m_TeleOuts[TeleTo - 1].size());
-			pSelf->Teleport(pChr, pSelf->m_pController->m_TeleOuts[TeleTo - 1][TeleOut]);
+			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->Collision()->TeleOuts(TeleTo - 1).size());
+			pSelf->Teleport(pChr, pSelf->Collision()->TeleOuts(TeleTo - 1)[TeleOut]);
 		}
 	}
 }
@@ -375,13 +385,13 @@ void CGameContext::ConToCheckTeleporter(IConsole::IResult *pResult, void *pUserD
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	unsigned int TeleTo = pResult->GetInteger(0);
 
-	if(!pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1].empty())
+	if(!pSelf->Collision()->TeleCheckOuts(TeleTo - 1).empty())
 	{
-		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientId);
 		if(pChr)
 		{
-			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1].size());
-			pSelf->Teleport(pChr, pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1][TeleOut]);
+			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->Collision()->TeleCheckOuts(TeleTo - 1).size());
+			pSelf->Teleport(pChr, pSelf->Collision()->TeleCheckOuts(TeleTo - 1)[TeleOut]);
 			pChr->m_TeleCheckpoint = TeleTo;
 		}
 	}
@@ -390,18 +400,18 @@ void CGameContext::ConToCheckTeleporter(IConsole::IResult *pResult, void *pUserD
 void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	int Tele = pResult->NumArguments() == 2 ? pResult->GetInteger(0) : pResult->m_ClientID;
-	int TeleTo = pResult->NumArguments() ? pResult->GetInteger(pResult->NumArguments() - 1) : pResult->m_ClientID;
-	int AuthLevel = pSelf->Server()->GetAuthedState(pResult->m_ClientID);
+	int Tele = pResult->NumArguments() == 2 ? pResult->GetInteger(0) : pResult->m_ClientId;
+	int TeleTo = pResult->NumArguments() ? pResult->GetInteger(pResult->NumArguments() - 1) : pResult->m_ClientId;
+	int AuthLevel = pSelf->Server()->GetAuthedState(pResult->m_ClientId);
 
-	if(Tele != pResult->m_ClientID && AuthLevel < g_Config.m_SvTeleOthersAuthLevel)
+	if(Tele != pResult->m_ClientId && AuthLevel < g_Config.m_SvTeleOthersAuthLevel)
 	{
 		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tele", "you aren't allowed to tele others");
 		return;
 	}
 
 	CCharacter *pChr = pSelf->GetPlayerChar(Tele);
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 
 	if(pChr && pPlayer && pSelf->GetPlayerChar(TeleTo))
 	{
@@ -411,17 +421,18 @@ void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData)
 			Pos += vec2(pChr->Core()->m_Input.m_TargetX, pChr->Core()->m_Input.m_TargetY);
 		}
 		pSelf->Teleport(pChr, Pos);
+		pChr->ResetJumps();
 		pChr->UnFreeze();
-		pChr->Core()->m_Vel = vec2(0, 0);
+		pChr->SetVelocity(vec2(0, 0));
 	}
 }
 
 void CGameContext::ConKill(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 
 	if(!pPlayer || (pPlayer->m_LastKill && pPlayer->m_LastKill + pSelf->Server()->TickSpeed() * g_Config.m_SvKillDelay > pSelf->Server()->Tick()))
 		return;
@@ -472,7 +483,7 @@ bool CGameContext::TryVoteMute(const NETADDR *pAddr, int Secs, const char *pReas
 	return false;
 }
 
-void CGameContext::VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedID)
+void CGameContext::VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedId)
 {
 	if(!TryVoteMute(pAddr, Secs, pReason))
 		return;
@@ -482,14 +493,14 @@ void CGameContext::VoteMute(const NETADDR *pAddr, int Secs, const char *pReason,
 	char aBuf[128];
 	if(pReason[0])
 		str_format(aBuf, sizeof(aBuf), "'%s' banned '%s' for %d seconds from voting (%s)",
-			Server()->ClientName(AuthedID), pDisplayName, Secs, pReason);
+			Server()->ClientName(AuthedId), pDisplayName, Secs, pReason);
 	else
 		str_format(aBuf, sizeof(aBuf), "'%s' banned '%s' for %d seconds from voting",
-			Server()->ClientName(AuthedID), pDisplayName, Secs);
-	SendChat(-1, CHAT_ALL, aBuf);
+			Server()->ClientName(AuthedId), pDisplayName, Secs);
+	SendChat(-1, TEAM_ALL, aBuf);
 }
 
-bool CGameContext::VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedID)
+bool CGameContext::VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedId)
 {
 	for(int i = 0; i < m_NumVoteMutes; i++)
 	{
@@ -501,7 +512,7 @@ bool CGameContext::VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, in
 			{
 				char aBuf[128];
 				str_format(aBuf, sizeof(aBuf), "'%s' unbanned '%s' from voting.",
-					Server()->ClientName(AuthedID), pDisplayName);
+					Server()->ClientName(AuthedId), pDisplayName);
 				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "voteunmute", aBuf);
 			}
 			return true;
@@ -559,7 +570,7 @@ void CGameContext::Mute(const NETADDR *pAddr, int Secs, const char *pDisplayName
 		str_format(aBuf, sizeof(aBuf), "'%s' has been muted for %d seconds (%s)", pDisplayName, Secs, pReason);
 	else
 		str_format(aBuf, sizeof(aBuf), "'%s' has been muted for %d seconds", pDisplayName, Secs);
-	SendChat(-1, CHAT_ALL, aBuf);
+	SendChat(-1, TEAM_ALL, aBuf);
 }
 
 void CGameContext::ConVoteMute(IConsole::IResult *pResult, void *pUserData)
@@ -578,7 +589,7 @@ void CGameContext::ConVoteMute(IConsole::IResult *pResult, void *pUserData)
 
 	int Seconds = clamp(pResult->GetInteger(1), 1, 86400);
 	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "";
-	pSelf->VoteMute(&Addr, Seconds, pReason, pSelf->Server()->ClientName(Victim), pResult->m_ClientID);
+	pSelf->VoteMute(&Addr, Seconds, pReason, pSelf->Server()->ClientName(Victim), pResult->m_ClientId);
 }
 
 void CGameContext::ConVoteUnmute(IConsole::IResult *pResult, void *pUserData)
@@ -595,12 +606,12 @@ void CGameContext::ConVoteUnmute(IConsole::IResult *pResult, void *pUserData)
 	NETADDR Addr;
 	pSelf->Server()->GetClientAddr(Victim, &Addr);
 
-	bool Found = pSelf->VoteUnmute(&Addr, pSelf->Server()->ClientName(Victim), pResult->m_ClientID);
+	bool Found = pSelf->VoteUnmute(&Addr, pSelf->Server()->ClientName(Victim), pResult->m_ClientId);
 	if(Found)
 	{
 		char aBuf[128];
 		str_format(aBuf, sizeof(aBuf), "'%s' unbanned '%s' from voting.",
-			pSelf->Server()->ClientName(pResult->m_ClientID), pSelf->Server()->ClientName(Victim));
+			pSelf->Server()->ClientName(pResult->m_ClientId), pSelf->Server()->ClientName(Victim));
 		pSelf->SendChat(-1, 0, aBuf);
 	}
 }
@@ -641,7 +652,7 @@ void CGameContext::ConMute(IConsole::IResult *pResult, void *pUserData)
 }
 
 // mute through client id
-void CGameContext::ConMuteID(IConsole::IResult *pResult, void *pUserData)
+void CGameContext::ConMuteId(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Victim = pResult->GetVictim();
@@ -662,7 +673,7 @@ void CGameContext::ConMuteID(IConsole::IResult *pResult, void *pUserData)
 }
 
 // mute through ip, arguments reversed to workaround parsing
-void CGameContext::ConMuteIP(IConsole::IResult *pResult, void *pUserData)
+void CGameContext::ConMuteIp(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	NETADDR Addr;
@@ -695,7 +706,7 @@ void CGameContext::ConUnmute(IConsole::IResult *pResult, void *pUserData)
 }
 
 // unmute by player id
-void CGameContext::ConUnmuteID(IConsole::IResult *pResult, void *pUserData)
+void CGameContext::ConUnmuteId(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 	int Victim = pResult->GetVictim();
@@ -752,24 +763,24 @@ void CGameContext::ConMutes(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConModerate(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	if(!CheckClientID(pResult->m_ClientID))
+	if(!CheckClientId(pResult->m_ClientId))
 		return;
 
 	bool HadModerator = pSelf->PlayerModerating();
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 	pPlayer->m_Moderating = !pPlayer->m_Moderating;
 
 	if(!HadModerator && pPlayer->m_Moderating)
-		pSelf->SendChat(-1, CHAT_ALL, "Server kick/spec votes will now be actively moderated.", 0);
+		pSelf->SendChat(-1, TEAM_ALL, "Server kick/spec votes will now be actively moderated.", 0);
 
 	if(!pSelf->PlayerModerating())
-		pSelf->SendChat(-1, CHAT_ALL, "Server kick/spec votes are no longer actively moderated.", 0);
+		pSelf->SendChat(-1, TEAM_ALL, "Server kick/spec votes are no longer actively moderated.", 0);
 
 	if(pPlayer->m_Moderating)
-		pSelf->SendChatTarget(pResult->m_ClientID, "Active moderator mode enabled for you.");
+		pSelf->SendChatTarget(pResult->m_ClientId, "Active moderator mode enabled for you.");
 	else
-		pSelf->SendChatTarget(pResult->m_ClientID, "Active moderator mode disabled for you.");
+		pSelf->SendChatTarget(pResult->m_ClientId, "Active moderator mode disabled for you.");
 }
 
 void CGameContext::ConSetDDRTeam(IConsole::IResult *pResult, void *pUserData)
@@ -819,7 +830,7 @@ void CGameContext::ConFreezeHammer(IConsole::IResult *pResult, void *pUserData)
 	char aBuf[128];
 	str_format(aBuf, sizeof(aBuf), "'%s' got freeze hammer!",
 		pSelf->Server()->ClientName(Victim));
-	pSelf->SendChat(-1, CHAT_ALL, aBuf);
+	pSelf->SendChat(-1, TEAM_ALL, aBuf);
 
 	pChr->m_FreezeHammer = true;
 }
@@ -837,7 +848,7 @@ void CGameContext::ConUnFreezeHammer(IConsole::IResult *pResult, void *pUserData
 	char aBuf[128];
 	str_format(aBuf, sizeof(aBuf), "'%s' lost freeze hammer!",
 		pSelf->Server()->ClientName(Victim));
-	pSelf->SendChat(-1, CHAT_ALL, aBuf);
+	pSelf->SendChat(-1, TEAM_ALL, aBuf);
 
 	pChr->m_FreezeHammer = false;
 }
@@ -845,28 +856,28 @@ void CGameContext::ConVoteNo(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
-	pSelf->ForceVote(pResult->m_ClientID, false);
+	pSelf->ForceVote(pResult->m_ClientId, false);
 }
 
 void CGameContext::ConDrySave(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
-	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientId];
 
-	if(!pPlayer || pSelf->Server()->GetAuthedState(pResult->m_ClientID) != AUTHED_ADMIN)
+	if(!pPlayer || pSelf->Server()->GetAuthedState(pResult->m_ClientId) != AUTHED_ADMIN)
 		return;
 
 	CSaveTeam SavedTeam;
-	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
-	int Result = SavedTeam.Save(pSelf, Team, true);
-	if(CSaveTeam::HandleSaveError(Result, pResult->m_ClientID, pSelf))
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientId);
+	ESaveResult Result = SavedTeam.Save(pSelf, Team, true);
+	if(CSaveTeam::HandleSaveError(Result, pResult->m_ClientId, pSelf))
 		return;
 
 	char aTimestamp[32];
 	str_timestamp(aTimestamp, sizeof(aTimestamp));
 	char aBuf[64];
-	str_format(aBuf, sizeof(aBuf), "%s_%s_%s.save", pSelf->Server()->GetMapName(), aTimestamp, pSelf->Server()->GetAuthName(pResult->m_ClientID));
+	str_format(aBuf, sizeof(aBuf), "%s_%s_%s.save", pSelf->Server()->GetMapName(), aTimestamp, pSelf->Server()->GetAuthName(pResult->m_ClientId));
 	IOHANDLE File = pSelf->Storage()->OpenFile(aBuf, IOFLAG_WRITE, IStorage::TYPE_ALL);
 	if(!File)
 		return;
@@ -876,6 +887,18 @@ void CGameContext::ConDrySave(IConsole::IResult *pResult, void *pUserData)
 	io_close(File);
 }
 
+void CGameContext::ConReloadCensorlist(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ReadCensorList();
+}
+
+void CGameContext::ConReloadAnnouncement(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->Server()->ReadAnnouncementsFile(g_Config.m_SvAnnouncementFileName);
+}
+
 void CGameContext::ConDumpAntibot(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
@@ -921,18 +944,18 @@ void CGameContext::ConDumpLog(IConsole::IResult *pResult, void *pUserData)
 	}
 }
 
-void CGameContext::LogEvent(const char *Description, int ClientID)
+void CGameContext::LogEvent(const char *Description, int ClientId)
 {
 	CLog *pNewEntry = &m_aLogs[m_LatestLog];
 	m_LatestLog = (m_LatestLog + 1) % MAX_LOGS;
 
 	pNewEntry->m_Timestamp = time_get();
 	str_copy(pNewEntry->m_aDescription, Description);
-	pNewEntry->m_FromServer = ClientID < 0;
+	pNewEntry->m_FromServer = ClientId < 0;
 	if(!pNewEntry->m_FromServer)
 	{
-		pNewEntry->m_ClientVersion = Server()->GetClientVersion(ClientID);
-		Server()->GetClientAddr(ClientID, pNewEntry->m_aClientAddrStr, sizeof(pNewEntry->m_aClientAddrStr));
-		str_copy(pNewEntry->m_aClientName, Server()->ClientName(ClientID));
+		pNewEntry->m_ClientVersion = Server()->GetClientVersion(ClientId);
+		Server()->GetClientAddr(ClientId, pNewEntry->m_aClientAddrStr, sizeof(pNewEntry->m_aClientAddrStr));
+		str_copy(pNewEntry->m_aClientName, Server()->ClientName(ClientId));
 	}
 }
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 1c0c5a1ae4..44363e9153 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -28,7 +28,8 @@ CCharacter::CCharacter(CGameWorld *pWorld, CNetObj_PlayerInput LastInput) :
 {
 	m_Health = 0;
 	m_Armor = 0;
-	m_StrongWeakID = 0;
+	m_TriggeredEvents7 = 0;
+	m_StrongWeakId = 0;
 
 	m_Input = LastInput;
 	// never initialize both to zero
@@ -47,6 +48,7 @@ CCharacter::CCharacter(CGameWorld *pWorld, CNetObj_PlayerInput LastInput) :
 
 void CCharacter::Reset()
 {
+	StopRecording();
 	Destroy();
 }
 
@@ -72,14 +74,14 @@ bool CCharacter::Spawn(CPlayer *pPlayer, vec2 Pos)
 	m_NumInputs = 0;
 	m_SpawnTick = Server()->Tick();
 	m_WeaponChangeTick = Server()->Tick();
-	Antibot()->OnSpawn(m_pPlayer->GetCID());
+	Antibot()->OnSpawn(m_pPlayer->GetCid());
 
 	m_Core.Reset();
 	m_Core.Init(&GameServer()->m_World.m_Core, Collision());
 	m_Core.m_ActiveWeapon = WEAPON_GUN;
 	m_Core.m_Pos = m_Pos;
-	m_Core.m_Id = m_pPlayer->GetCID();
-	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = &m_Core;
+	m_Core.m_Id = m_pPlayer->GetCid();
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCid()] = &m_Core;
 
 	m_ReckoningTick = 0;
 	m_SendCore = CCharacterCore();
@@ -96,16 +98,46 @@ bool CCharacter::Spawn(CPlayer *pPlayer, vec2 Pos)
 	m_TuneZoneOld = -1; // no zone leave msg on spawn
 	m_NeededFaketuning = 0; // reset fake tunings on respawn and send the client
 	SendZoneMsgs(); // we want a entermessage also on spawn
-	GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone);
+	GameServer()->SendTuningParams(m_pPlayer->GetCid(), m_TuneZone);
 
-	Server()->StartRecord(m_pPlayer->GetCID());
+	TrySetRescue(RESCUEMODE_MANUAL);
+	Server()->StartRecord(m_pPlayer->GetCid());
+
+	int Team = GameServer()->m_aTeamMapping[m_pPlayer->GetCid()];
+
+	if(Team != -1)
+	{
+		GameServer()->m_pController->Teams().SetForceCharacterTeam(m_pPlayer->GetCid(), Team);
+		GameServer()->m_aTeamMapping[m_pPlayer->GetCid()] = -1;
+
+		if(GameServer()->m_apSavedTeams[Team])
+		{
+			GameServer()->m_apSavedTeams[Team]->Load(GameServer(), Team, true, true);
+			delete GameServer()->m_apSavedTeams[Team];
+			GameServer()->m_apSavedTeams[Team] = nullptr;
+		}
+
+		if(GameServer()->m_apSavedTees[m_pPlayer->GetCid()])
+		{
+			GameServer()->m_apSavedTees[m_pPlayer->GetCid()]->Load(m_pPlayer->GetCharacter(), Team);
+			delete GameServer()->m_apSavedTees[m_pPlayer->GetCid()];
+			GameServer()->m_apSavedTees[m_pPlayer->GetCid()] = nullptr;
+		}
+
+		if(GameServer()->m_apSavedTeleTees[m_pPlayer->GetCid()])
+		{
+			m_pPlayer->m_LastTeleTee = *GameServer()->m_apSavedTeleTees[m_pPlayer->GetCid()];
+			delete GameServer()->m_apSavedTeleTees[m_pPlayer->GetCid()];
+			GameServer()->m_apSavedTeleTees[m_pPlayer->GetCid()] = nullptr;
+		}
+	}
 
 	return true;
 }
 
 void CCharacter::Destroy()
 {
-	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCid()] = 0;
 	m_Alive = false;
 	SetSolo(false);
 }
@@ -129,10 +161,15 @@ void CCharacter::SetJetpack(bool Active)
 	m_Core.m_Jetpack = Active;
 }
 
+void CCharacter::SetJumps(int Jumps)
+{
+	m_Core.m_Jumps = Jumps;
+}
+
 void CCharacter::SetSolo(bool Solo)
 {
 	m_Core.m_Solo = Solo;
-	Teams()->m_Core.SetSolo(m_pPlayer->GetCID(), Solo);
+	Teams()->m_Core.SetSolo(m_pPlayer->GetCid(), Solo);
 }
 
 void CCharacter::SetSuper(bool Super)
@@ -141,12 +178,12 @@ void CCharacter::SetSuper(bool Super)
 	if(Super)
 	{
 		m_TeamBeforeSuper = Team();
-		Teams()->SetCharacterTeam(GetPlayer()->GetCID(), TEAM_SUPER);
+		Teams()->SetCharacterTeam(GetPlayer()->GetCid(), TEAM_SUPER);
 		m_DDRaceState = DDRACE_CHEAT;
 	}
 	else
 	{
-		Teams()->SetForceCharacterTeam(GetPlayer()->GetCID(), m_TeamBeforeSuper);
+		Teams()->SetForceCharacterTeam(GetPlayer()->GetCid(), m_TeamBeforeSuper);
 	}
 }
 
@@ -204,12 +241,8 @@ void CCharacter::HandleJetpack()
 	{
 		if(m_Core.m_Jetpack)
 		{
-			float Strength;
-			if(!m_TuneZone)
-				Strength = Tuning()->m_JetpackStrength;
-			else
-				Strength = TuningList()[m_TuneZone].m_JetpackStrength;
-			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
+			float Strength = GetTuning(m_TuneZone)->m_JetpackStrength;
+			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, m_pPlayer->GetCid(), m_Core.m_ActiveWeapon);
 		}
 	}
 	}
@@ -234,7 +267,7 @@ void CCharacter::HandleNinja()
 		GameServer()->CreateDamageInd(m_Pos, 0, NinjaTime / Server()->TickSpeed(), TeamMask() & GameServer()->ClientsMaskExcludeClientVersionAndHigher(VERSION_DDNET_NEW_HUD));
 	}
 
-	m_Armor = clamp(10 - (NinjaTime / 15), 0, 10);
+	GameServer()->m_pController->SetArmorProgress(this, NinjaTime);
 
 	// force ninja Weapon
 	SetWeapon(WEAPON_NINJA);
@@ -252,17 +285,14 @@ void CCharacter::HandleNinja()
 		// Set velocity
 		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * g_pData->m_Weapons.m_Ninja.m_Velocity;
 		vec2 OldPos = m_Pos;
-		vec2 GroundElasticity;
-
-		if(!m_TuneZone)
-			GroundElasticity = vec2(Tuning()->m_GroundElasticityX, Tuning()->m_GroundElasticityY);
-		else
-			GroundElasticity = vec2(TuningList()[m_TuneZone].m_GroundElasticityX, TuningList()[m_TuneZone].m_GroundElasticityY);
+		vec2 GroundElasticity = vec2(
+			GetTuning(m_TuneZone)->m_GroundElasticityX,
+			GetTuning(m_TuneZone)->m_GroundElasticityY);
 
 		Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(GetProximityRadius(), GetProximityRadius()), GroundElasticity);
 
 		// reset velocity so the client doesn't predict stuff
-		m_Core.m_Vel = vec2(0.f, 0.f);
+		ResetVelocity();
 
 		// check if we Hit anything along the way
 		{
@@ -271,7 +301,7 @@ void CCharacter::HandleNinja()
 			int Num = GameServer()->m_World.FindEntities(OldPos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
 
 			// check that we're not in solo part
-			if(Teams()->m_Core.GetSolo(m_pPlayer->GetCID()))
+			if(Teams()->m_Core.GetSolo(m_pPlayer->GetCid()))
 				return;
 
 			for(int i = 0; i < Num; ++i)
@@ -285,17 +315,17 @@ void CCharacter::HandleNinja()
 					continue;
 
 				// Don't hit players in solo parts
-				if(Teams()->m_Core.GetSolo(pChr->m_pPlayer->GetCID()))
+				if(Teams()->m_Core.GetSolo(pChr->m_pPlayer->GetCid()))
 					return;
 
 				// make sure we haven't Hit this object before
-				bool bAlreadyHit = false;
+				bool AlreadyHit = false;
 				for(int j = 0; j < m_NumObjectsHit; j++)
 				{
 					if(m_apHitObjects[j] == pChr)
-						bAlreadyHit = true;
+						AlreadyHit = true;
 				}
-				if(bAlreadyHit)
+				if(AlreadyHit)
 					continue;
 
 				// check so we are sufficiently close
@@ -308,7 +338,7 @@ void CCharacter::HandleNinja()
 				if(m_NumObjectsHit < 10)
 					m_apHitObjects[m_NumObjectsHit++] = pChr;
 
-				pChr->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, m_pPlayer->GetCID(), WEAPON_NINJA);
+				pChr->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, m_pPlayer->GetCid(), WEAPON_NINJA);
 			}
 		}
 
@@ -379,7 +409,7 @@ void CCharacter::FireWeapon()
 	{
 		if(m_LatestInput.m_Fire & 1)
 		{
-			Antibot()->OnHammerFireReloading(m_pPlayer->GetCID());
+			Antibot()->OnHammerFireReloading(m_pPlayer->GetCid());
 		}
 		return;
 	}
@@ -419,7 +449,7 @@ void CCharacter::FireWeapon()
 		if(m_PainSoundTimer <= 0 && !(m_LatestPrevInput.m_Fire & 1))
 		{
 			m_PainSoundTimer = 1 * Server()->TickSpeed();
-			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_LONG, TeamMask());
+			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_LONG, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 		}
 		return;
 	}
@@ -436,9 +466,9 @@ void CCharacter::FireWeapon()
 	{
 		// reset objects Hit
 		m_NumObjectsHit = 0;
-		GameServer()->CreateSound(m_Pos, SOUND_HAMMER_FIRE, TeamMask());
+		GameServer()->CreateSound(m_Pos, SOUND_HAMMER_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 
-		Antibot()->OnHammerFire(m_pPlayer->GetCID());
+		Antibot()->OnHammerFire(m_pPlayer->GetCid());
 
 		if(m_Core.m_HammerHitDisabled)
 			break;
@@ -453,7 +483,7 @@ void CCharacter::FireWeapon()
 			auto *pTarget = static_cast<CCharacter *>(apEnts[i]);
 
 			//if ((pTarget == this) || Collision()->IntersectLine(ProjStartPos, pTarget->m_Pos, NULL, NULL))
-			if((pTarget == this || (pTarget->IsAlive() && !CanCollide(pTarget->GetPlayer()->GetCID()))))
+			if((pTarget == this || (pTarget->IsAlive() && !CanCollide(pTarget->GetPlayer()->GetCid()))))
 				continue;
 
 			// set his velocity to fast upward (for now)
@@ -468,23 +498,19 @@ void CCharacter::FireWeapon()
 			else
 				Dir = vec2(0.f, -1.f);
 
-			float Strength;
-			if(!m_TuneZone)
-				Strength = Tuning()->m_HammerStrength;
-			else
-				Strength = TuningList()[m_TuneZone].m_HammerStrength;
+			float Strength = GetTuning(m_TuneZone)->m_HammerStrength;
 
 			vec2 Temp = pTarget->m_Core.m_Vel + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;
 			Temp = ClampVel(pTarget->m_MoveRestrictions, Temp);
 			Temp -= pTarget->m_Core.m_Vel;
 			pTarget->TakeDamage((vec2(0.f, -1.0f) + Temp) * Strength, g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage,
-				m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
+				m_pPlayer->GetCid(), m_Core.m_ActiveWeapon);
 			pTarget->UnFreeze();
 
 			if(m_FreezeHammer)
 				pTarget->Freeze();
 
-			Antibot()->OnHammerHit(m_pPlayer->GetCID(), pTarget->GetPlayer()->GetCID());
+			Antibot()->OnHammerHit(m_pPlayer->GetCid(), pTarget->GetPlayer()->GetCid());
 
 			Hits++;
 		}
@@ -492,11 +518,7 @@ void CCharacter::FireWeapon()
 		// if we Hit anything, we have to wait for the reload
 		if(Hits)
 		{
-			float FireDelay;
-			if(!m_TuneZone)
-				FireDelay = Tuning()->m_HammerHitFireDelay;
-			else
-				FireDelay = TuningList()[m_TuneZone].m_HammerHitFireDelay;
+			float FireDelay = GetTuning(m_TuneZone)->m_HammerHitFireDelay;
 			m_ReloadTimer = FireDelay * Server()->TickSpeed() / 1000;
 		}
 	}
@@ -506,16 +528,12 @@ void CCharacter::FireWeapon()
 	{
 		if(!m_Core.m_Jetpack || !m_pPlayer->m_NinjaJetpack || m_Core.m_HasTelegunGun)
 		{
-			int Lifetime;
-			if(!m_TuneZone)
-				Lifetime = (int)(Server()->TickSpeed() * Tuning()->m_GunLifetime);
-			else
-				Lifetime = (int)(Server()->TickSpeed() * TuningList()[m_TuneZone].m_GunLifetime);
+			int Lifetime = (int)(Server()->TickSpeed() * GetTuning(m_TuneZone)->m_GunLifetime);
 
 			new CProjectile(
 				GameWorld(),
 				WEAPON_GUN, //Type
-				m_pPlayer->GetCID(), //Owner
+				m_pPlayer->GetCid(), //Owner
 				ProjStartPos, //Pos
 				Direction, //Dir
 				Lifetime, //Span
@@ -532,29 +550,21 @@ void CCharacter::FireWeapon()
 
 	case WEAPON_SHOTGUN:
 	{
-		float LaserReach;
-		if(!m_TuneZone)
-			LaserReach = Tuning()->m_LaserReach;
-		else
-			LaserReach = TuningList()[m_TuneZone].m_LaserReach;
+		float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
 
-		new CLaser(&GameServer()->m_World, m_Pos, Direction, LaserReach, m_pPlayer->GetCID(), WEAPON_SHOTGUN);
+		new CLaser(&GameServer()->m_World, m_Pos, Direction, LaserReach, m_pPlayer->GetCid(), WEAPON_SHOTGUN);
 		GameServer()->CreateSound(m_Pos, SOUND_SHOTGUN_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 	}
 	break;
 
 	case WEAPON_GRENADE:
 	{
-		int Lifetime;
-		if(!m_TuneZone)
-			Lifetime = (int)(Server()->TickSpeed() * Tuning()->m_GrenadeLifetime);
-		else
-			Lifetime = (int)(Server()->TickSpeed() * TuningList()[m_TuneZone].m_GrenadeLifetime);
+		int Lifetime = (int)(Server()->TickSpeed() * GetTuning(m_TuneZone)->m_GrenadeLifetime);
 
 		new CProjectile(
 			GameWorld(),
 			WEAPON_GRENADE, //Type
-			m_pPlayer->GetCID(), //Owner
+			m_pPlayer->GetCid(), //Owner
 			ProjStartPos, //Pos
 			Direction, //Dir
 			Lifetime, //Span
@@ -564,19 +574,15 @@ void CCharacter::FireWeapon()
 			MouseTarget // MouseTarget
 		);
 
-		GameServer()->CreateSound(m_Pos, SOUND_GRENADE_FIRE, TeamMask());
+		GameServer()->CreateSound(m_Pos, SOUND_GRENADE_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 	}
 	break;
 
 	case WEAPON_LASER:
 	{
-		float LaserReach;
-		if(!m_TuneZone)
-			LaserReach = Tuning()->m_LaserReach;
-		else
-			LaserReach = TuningList()[m_TuneZone].m_LaserReach;
+		float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
 
-		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, m_pPlayer->GetCID(), WEAPON_LASER);
+		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, m_pPlayer->GetCid(), WEAPON_LASER);
 		GameServer()->CreateSound(m_Pos, SOUND_LASER_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 	}
 	break;
@@ -590,7 +596,7 @@ void CCharacter::FireWeapon()
 		m_Core.m_Ninja.m_CurrentMoveTime = g_pData->m_Weapons.m_Ninja.m_Movetime * Server()->TickSpeed() / 1000;
 		m_Core.m_Ninja.m_OldVelAmount = length(m_Core.m_Vel);
 
-		GameServer()->CreateSound(m_Pos, SOUND_NINJA_FIRE, TeamMask());
+		GameServer()->CreateSound(m_Pos, SOUND_NINJA_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
 	}
 	break;
 	}
@@ -600,10 +606,7 @@ void CCharacter::FireWeapon()
 	if(!m_ReloadTimer)
 	{
 		float FireDelay;
-		if(!m_TuneZone)
-			Tuning()->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
-		else
-			TuningList()[m_TuneZone].Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+		GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
 		m_ReloadTimer = FireDelay * Server()->TickSpeed() / 1000;
 	}
 }
@@ -686,7 +689,7 @@ void CCharacter::OnDirectInput(CNetObj_PlayerInput *pNewInput)
 	if(m_LatestInput.m_TargetX == 0 && m_LatestInput.m_TargetY == 0)
 		m_LatestInput.m_TargetY = -1;
 
-	Antibot()->OnDirectInput(m_pPlayer->GetCID());
+	Antibot()->OnDirectInput(m_pPlayer->GetCid());
 
 	if(m_NumInputs > 1 && m_pPlayer->GetTeam() != TEAM_SPECTATORS)
 	{
@@ -698,11 +701,16 @@ void CCharacter::OnDirectInput(CNetObj_PlayerInput *pNewInput)
 	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
 }
 
-void CCharacter::ResetHook()
+void CCharacter::ReleaseHook()
 {
 	m_Core.SetHookedPlayer(-1);
 	m_Core.m_HookState = HOOK_RETRACTED;
 	m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+}
+
+void CCharacter::ResetHook()
+{
+	ReleaseHook();
 	m_Core.m_HookPos = m_Core.m_Pos;
 }
 
@@ -724,8 +732,8 @@ void CCharacter::PreTick()
 		// Prevent the player from getting a negative time
 		// The main reason why this can happen is because of time penalty tiles
 		// However, other reasons are hereby also excluded
-		GameServer()->SendChatTarget(m_pPlayer->GetCID(), "You died of old age");
-		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+		GameServer()->SendChatTarget(m_pPlayer->GetCid(), "You died of old age");
+		Die(m_pPlayer->GetCid(), WEAPON_WORLD);
 	}
 
 	if(m_Paused)
@@ -739,7 +747,7 @@ void CCharacter::PreTick()
 
 	DDRaceTick();
 
-	Antibot()->OnCharacterTick(m_pPlayer->GetCID());
+	Antibot()->OnCharacterTick(m_pPlayer->GetCid());
 
 	m_Core.m_Input = m_Input;
 	m_Core.Tick(true, !g_Config.m_SvNoWeakHook);
@@ -761,7 +769,7 @@ void CCharacter::Tick()
 
 	if(!m_PrevInput.m_Hook && m_Input.m_Hook && !(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER))
 	{
-		Antibot()->OnHookAttach(m_pPlayer->GetCID(), false);
+		Antibot()->OnHookAttach(m_pPlayer->GetCid(), false);
 	}
 
 	// handle Weapons
@@ -774,7 +782,7 @@ void CCharacter::Tick()
 		const int HookedPlayer = m_Core.HookedPlayer();
 		if(HookedPlayer != -1 && GameServer()->m_apPlayers[HookedPlayer]->GetTeam() != TEAM_SPECTATORS)
 		{
-			Antibot()->OnHookAttach(m_pPlayer->GetCID(), true);
+			Antibot()->OnHookAttach(m_pPlayer->GetCid(), true);
 		}
 	}
 
@@ -789,8 +797,8 @@ void CCharacter::TickDeferred()
 	// advance the dummy
 	{
 		CWorldCore TempWorld;
-		m_ReckoningCore.Init(&TempWorld, Collision(), &Teams()->m_Core, m_pTeleOuts);
-		m_ReckoningCore.m_Id = m_pPlayer->GetCID();
+		m_ReckoningCore.Init(&TempWorld, Collision(), &Teams()->m_Core);
+		m_ReckoningCore.m_Id = m_pPlayer->GetCid();
 		m_ReckoningCore.Tick(false);
 		m_ReckoningCore.Move();
 		m_ReckoningCore.Quantize();
@@ -801,7 +809,7 @@ void CCharacter::TickDeferred()
 	vec2 StartVel = m_Core.m_Vel;
 	bool StuckBefore = Collision()->TestBox(m_Core.m_Pos, CCharacterCore::PhysicalSizeVec2());
 
-	m_Core.m_Id = m_pPlayer->GetCID();
+	m_Core.m_Id = m_pPlayer->GetCid();
 	m_Core.Move();
 	bool StuckAfterMove = Collision()->TestBox(m_Core.m_Pos, CCharacterCore::PhysicalSizeVec2());
 	m_Core.Quantize();
@@ -836,26 +844,36 @@ void CCharacter::TickDeferred()
 
 	{
 		int Events = m_Core.m_TriggeredEvents;
-		int CID = m_pPlayer->GetCID();
+		int CID = m_pPlayer->GetCid();
 
-		CClientMask TeamMask = Teams()->TeamMask(Team(), -1, CID);
-		// Some sounds are triggered client-side for the acting player
+		// Some sounds are triggered client-side for the acting player (or for all players on Sixup)
 		// so we need to avoid duplicating them
-		CClientMask TeamMaskExceptSelf = Teams()->TeamMask(Team(), CID, CID);
+		CClientMask TeamMaskExceptSelfAndSixup = Teams()->TeamMask(Team(), CID, CID, CGameContext::FLAG_SIX);
 		// Some are triggered client-side but only on Sixup
-		CClientMask TeamMaskExceptSelfIfSixup = Server()->IsSixup(CID) ? TeamMaskExceptSelf : TeamMask;
+		CClientMask TeamMaskExceptSixup = Teams()->TeamMask(Team(), -1, CID, CGameContext::FLAG_SIX);
 
 		if(Events & COREEVENT_GROUND_JUMP)
-			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_JUMP, TeamMaskExceptSelf);
+			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_JUMP, TeamMaskExceptSelfAndSixup);
 
 		if(Events & COREEVENT_HOOK_ATTACH_PLAYER)
-			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_PLAYER, TeamMaskExceptSelfIfSixup);
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_PLAYER, TeamMaskExceptSixup);
 
 		if(Events & COREEVENT_HOOK_ATTACH_GROUND)
-			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_GROUND, TeamMaskExceptSelf);
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_GROUND, TeamMaskExceptSelfAndSixup);
+
+		if(Events & COREEVENT_HOOK_HIT_NOHOOK)
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_NOATTACH, TeamMaskExceptSelfAndSixup);
 
+		if(Events & COREEVENT_GROUND_JUMP)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_GROUND_JUMP;
+		if(Events & COREEVENT_AIR_JUMP)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_AIR_JUMP;
+		if(Events & COREEVENT_HOOK_ATTACH_PLAYER)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER;
+		if(Events & COREEVENT_HOOK_ATTACH_GROUND)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND;
 		if(Events & COREEVENT_HOOK_HIT_NOHOOK)
-			GameServer()->CreateSound(m_Pos, SOUND_HOOK_NOATTACH, TeamMaskExceptSelf);
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK;
 	}
 
 	if(m_pPlayer->GetTeam() == TEAM_SPECTATORS)
@@ -873,7 +891,7 @@ void CCharacter::TickDeferred()
 		m_ReckoningCore.Write(&Predicted);
 		m_Core.Write(&Current);
 
-		// only allow dead reackoning for a top of 3 seconds
+		// only allow dead reckoning for a top of 3 seconds
 		if(m_Core.m_Reset || m_ReckoningTick + Server()->TickSpeed() * 3 < Server()->Tick() || mem_comp(&Predicted, &Current, sizeof(CNetObj_Character)) != 0)
 		{
 			m_ReckoningTick = Server()->Tick();
@@ -914,34 +932,38 @@ bool CCharacter::IncreaseArmor(int Amount)
 	return true;
 }
 
-void CCharacter::Die(int Killer, int Weapon, bool SendKillMsg)
+void CCharacter::StopRecording()
 {
-	if(Server()->IsRecording(m_pPlayer->GetCID()))
+	if(Server()->IsRecording(m_pPlayer->GetCid()))
 	{
-		CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
+		CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCid());
 
 		if(pData->m_RecordStopTick - Server()->Tick() <= Server()->TickSpeed() && pData->m_RecordStopTick != -1)
-			Server()->SaveDemo(m_pPlayer->GetCID(), pData->m_RecordFinishTime);
+			Server()->SaveDemo(m_pPlayer->GetCid(), pData->m_RecordFinishTime);
 		else
-			Server()->StopRecord(m_pPlayer->GetCID());
+			Server()->StopRecord(m_pPlayer->GetCid());
 
 		pData->m_RecordStopTick = -1;
 	}
+}
 
+void CCharacter::Die(int Killer, int Weapon, bool SendKillMsg)
+{
+	StopRecording();
 	int ModeSpecial = GameServer()->m_pController->OnCharacterDeath(this, GameServer()->m_apPlayers[Killer], Weapon);
 
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "kill killer='%d:%s' victim='%d:%s' weapon=%d special=%d",
 		Killer, Server()->ClientName(Killer),
-		m_pPlayer->GetCID(), Server()->ClientName(m_pPlayer->GetCID()), Weapon, ModeSpecial);
+		m_pPlayer->GetCid(), Server()->ClientName(m_pPlayer->GetCid()), Weapon, ModeSpecial);
 	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 
 	// send the kill message
-	if(SendKillMsg && (Team() == TEAM_FLOCK || Teams()->Count(Team()) == 1 || Teams()->GetTeamState(Team()) == CGameTeams::TEAMSTATE_OPEN || Teams()->TeamLocked(Team()) == false))
+	if(SendKillMsg && (Team() == TEAM_FLOCK || Teams()->TeamFlock(Team()) || Teams()->Count(Team()) == 1 || Teams()->GetTeamState(Team()) == CGameTeams::TEAMSTATE_OPEN || !Teams()->TeamLocked(Team())))
 	{
 		CNetMsg_Sv_KillMsg Msg;
 		Msg.m_Killer = Killer;
-		Msg.m_Victim = m_pPlayer->GetCID();
+		Msg.m_Victim = m_pPlayer->GetCid();
 		Msg.m_Weapon = Weapon;
 		Msg.m_ModeSpecial = ModeSpecial;
 		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, -1);
@@ -958,9 +980,9 @@ void CCharacter::Die(int Killer, int Weapon, bool SendKillMsg)
 	SetSolo(false);
 
 	GameServer()->m_World.RemoveEntity(this);
-	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
-	GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), TeamMask());
-	Teams()->OnCharacterDeath(GetPlayer()->GetCID(), Weapon);
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCid()] = 0;
+	GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCid(), TeamMask());
+	Teams()->OnCharacterDeath(GetPlayer()->GetCid(), Weapon);
 }
 
 bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
@@ -977,7 +999,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 }
 
 //TODO: Move the emote stuff to a function
-void CCharacter::SnapCharacter(int SnappingClient, int ID)
+void CCharacter::SnapCharacter(int SnappingClient, int Id)
 {
 	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
 	CCharacterCore *pCore;
@@ -1005,7 +1027,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 	}
 
 	// solo, collision, jetpack and ninjajetpack prediction
-	if(m_pPlayer->GetCID() == SnappingClient)
+	if(m_pPlayer->GetCid() == SnappingClient)
 	{
 		int Faketuning = 0;
 		if(m_pPlayer->GetClientVersion() < VERSION_DDNET_NEW_HUD)
@@ -1026,7 +1048,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 		if(Faketuning != m_NeededFaketuning)
 		{
 			m_NeededFaketuning = Faketuning;
-			GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone); // update tunings
+			GameServer()->SendTuningParams(m_pPlayer->GetCid(), m_TuneZone); // update tunings
 		}
 	}
 
@@ -1039,8 +1061,8 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 		AmmoCount = 10;
 	}
 
-	if(m_pPlayer->GetCID() == SnappingClient || SnappingClient == SERVER_DEMO_CLIENT ||
-		(!g_Config.m_SvStrictSpectateMode && m_pPlayer->GetCID() == GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID))
+	if(m_pPlayer->GetCid() == SnappingClient || SnappingClient == SERVER_DEMO_CLIENT ||
+		(!g_Config.m_SvStrictSpectateMode && m_pPlayer->GetCid() == GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId))
 	{
 		Health = m_Health;
 		Armor = m_Armor;
@@ -1064,7 +1086,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 
 	if(!Server()->IsSixup(SnappingClient))
 	{
-		CNetObj_Character *pCharacter = Server()->SnapNewItem<CNetObj_Character>(ID);
+		CNetObj_Character *pCharacter = Server()->SnapNewItem<CNetObj_Character>(Id);
 		if(!pCharacter)
 			return;
 
@@ -1089,7 +1111,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 	}
 	else
 	{
-		protocol7::CNetObj_Character *pCharacter = Server()->SnapNewItem<protocol7::CNetObj_Character>(ID);
+		protocol7::CNetObj_Character *pCharacter = Server()->SnapNewItem<protocol7::CNetObj_Character>(Id);
 		if(!pCharacter)
 			return;
 
@@ -1099,6 +1121,10 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 			pCharacter->m_Angle -= (int)(2.0f * pi * 256.0f);
 		}
 
+		// m_HookTick can be negative when using the hook_duration tune, which 0.7 clients
+		// will consider invalid. https://github.com/ddnet/ddnet/issues/3915
+		pCharacter->m_HookTick = maximum(0, pCharacter->m_HookTick);
+
 		pCharacter->m_Tick = Tick;
 		pCharacter->m_Emote = Emote;
 		pCharacter->m_AttackTick = m_AttackTick;
@@ -1113,18 +1139,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
 
 		pCharacter->m_Health = Health;
 		pCharacter->m_Armor = Armor;
-		int TriggeredEvents7 = 0;
-		if(m_Core.m_TriggeredEvents & COREEVENT_GROUND_JUMP)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_GROUND_JUMP;
-		if(m_Core.m_TriggeredEvents & COREEVENT_AIR_JUMP)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_AIR_JUMP;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_GROUND)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_HIT_NOHOOK)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK;
-		pCharacter->m_TriggeredEvents = TriggeredEvents7;
+		pCharacter->m_TriggeredEvents = m_TriggeredEvents7;
 	}
 }
 
@@ -1138,9 +1153,9 @@ bool CCharacter::CanSnapCharacter(int SnappingClient)
 
 	if(pSnapPlayer->GetTeam() == TEAM_SPECTATORS || pSnapPlayer->IsPaused())
 	{
-		if(pSnapPlayer->m_SpectatorID != SPEC_FREEVIEW && !CanCollide(pSnapPlayer->m_SpectatorID) && (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_OFF || (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM && !SameTeam(pSnapPlayer->m_SpectatorID))))
+		if(pSnapPlayer->m_SpectatorId != SPEC_FREEVIEW && !CanCollide(pSnapPlayer->m_SpectatorId) && (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_OFF || (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM && !SameTeam(pSnapPlayer->m_SpectatorId))))
 			return false;
-		else if(pSnapPlayer->m_SpectatorID == SPEC_FREEVIEW && !CanCollide(SnappingClient) && pSnapPlayer->m_SpecTeam && !SameTeam(SnappingClient))
+		else if(pSnapPlayer->m_SpectatorId == SPEC_FREEVIEW && !CanCollide(SnappingClient) && pSnapPlayer->m_SpecTeam && !SameTeam(SnappingClient))
 			return false;
 	}
 	else if(pSnapChar && !pSnapChar->m_Core.m_Super && !CanCollide(SnappingClient) && (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_OFF || (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM && !SameTeam(SnappingClient))))
@@ -1149,21 +1164,21 @@ bool CCharacter::CanSnapCharacter(int SnappingClient)
 	return true;
 }
 
-bool CCharacter::IsSnappingCharacterInView(int SnappingClientID)
+bool CCharacter::IsSnappingCharacterInView(int SnappingClientId)
 {
-	int ID = m_pPlayer->GetCID();
+	int Id = m_pPlayer->GetCid();
 
 	// A player may not be clipped away if his hook or a hook attached to him is in the field of view
-	bool PlayerAndHookNotInView = NetworkClippedLine(SnappingClientID, m_Pos, m_Core.m_HookPos);
+	bool PlayerAndHookNotInView = NetworkClippedLine(SnappingClientId, m_Pos, m_Core.m_HookPos);
 	bool AttachedHookInView = false;
 	if(PlayerAndHookNotInView)
 	{
-		for(const auto &AttachedPlayerID : m_Core.m_AttachedPlayers)
+		for(const auto &AttachedPlayerId : m_Core.m_AttachedPlayers)
 		{
-			const CCharacter *pOtherPlayer = GameServer()->GetPlayerChar(AttachedPlayerID);
-			if(pOtherPlayer && pOtherPlayer->m_Core.HookedPlayer() == ID)
+			const CCharacter *pOtherPlayer = GameServer()->GetPlayerChar(AttachedPlayerId);
+			if(pOtherPlayer && pOtherPlayer->m_Core.HookedPlayer() == Id)
 			{
-				if(!NetworkClippedLine(SnappingClientID, m_Pos, pOtherPlayer->m_Pos))
+				if(!NetworkClippedLine(SnappingClientId, m_Pos, pOtherPlayer->m_Pos))
 				{
 					AttachedHookInView = true;
 					break;
@@ -1180,9 +1195,9 @@ bool CCharacter::IsSnappingCharacterInView(int SnappingClientID)
 
 void CCharacter::Snap(int SnappingClient)
 {
-	int ID = m_pPlayer->GetCID();
+	int Id = m_pPlayer->GetCid();
 
-	if(!Server()->Translate(ID, SnappingClient))
+	if(!Server()->Translate(Id, SnappingClient))
 		return;
 
 	if(!CanSnapCharacter(SnappingClient))
@@ -1193,9 +1208,9 @@ void CCharacter::Snap(int SnappingClient)
 	if(!IsSnappingCharacterInView(SnappingClient))
 		return;
 
-	SnapCharacter(SnappingClient, ID);
+	SnapCharacter(SnappingClient, Id);
 
-	CNetObj_DDNetCharacter *pDDNetCharacter = Server()->SnapNewItem<CNetObj_DDNetCharacter>(ID);
+	CNetObj_DDNetCharacter *pDDNetCharacter = Server()->SnapNewItem<CNetObj_DDNetCharacter>(Id);
 	if(!pDDNetCharacter)
 		return;
 
@@ -1246,7 +1261,7 @@ void CCharacter::Snap(int SnappingClient)
 	pDDNetCharacter->m_FreezeEnd = m_Core.m_DeepFrozen ? -1 : m_FreezeTime == 0 ? 0 : Server()->Tick() + m_FreezeTime;
 	pDDNetCharacter->m_Jumps = m_Core.m_Jumps;
 	pDDNetCharacter->m_TeleCheckpoint = m_TeleCheckpoint;
-	pDDNetCharacter->m_StrongWeakID = m_StrongWeakID;
+	pDDNetCharacter->m_StrongWeakId = m_StrongWeakId;
 
 	// Display Information
 	pDDNetCharacter->m_JumpedTotal = m_Core.m_JumpedTotal;
@@ -1260,31 +1275,37 @@ void CCharacter::Snap(int SnappingClient)
 	{
 		pDDNetCharacter->m_Flags |= CHARACTERFLAG_PRACTICE_MODE;
 	}
+	if(Teams()->TeamLocked(Team()))
+	{
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_LOCK_MODE;
+	}
+	if(Teams()->TeamFlock(Team()))
+	{
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_TEAM0_MODE;
+	}
 	pDDNetCharacter->m_TargetX = m_Core.m_Input.m_TargetX;
 	pDDNetCharacter->m_TargetY = m_Core.m_Input.m_TargetY;
 }
 
+void CCharacter::PostSnap()
+{
+	m_TriggeredEvents7 = 0;
+}
+
 // DDRace
 
-bool CCharacter::CanCollide(int ClientID)
+bool CCharacter::CanCollide(int ClientId)
 {
-	return Teams()->m_Core.CanCollide(GetPlayer()->GetCID(), ClientID);
+	return Teams()->m_Core.CanCollide(GetPlayer()->GetCid(), ClientId);
 }
-bool CCharacter::SameTeam(int ClientID)
+bool CCharacter::SameTeam(int ClientId)
 {
-	return Teams()->m_Core.SameTeam(GetPlayer()->GetCID(), ClientID);
+	return Teams()->m_Core.SameTeam(GetPlayer()->GetCid(), ClientId);
 }
 
 int CCharacter::Team()
 {
-	return Teams()->m_Core.Team(m_pPlayer->GetCID());
-}
-
-void CCharacter::SetTeleports(std::map<int, std::vector<vec2>> *pTeleOuts, std::map<int, std::vector<vec2>> *pTeleCheckOuts)
-{
-	m_pTeleOuts = pTeleOuts;
-	m_pTeleCheckOuts = pTeleCheckOuts;
-	m_Core.SetTeleOuts(pTeleOuts);
+	return Teams()->m_Core.Team(m_pPlayer->GetCid());
 }
 
 void CCharacter::FillAntibot(CAntibotCharacterData *pData)
@@ -1305,7 +1326,7 @@ void CCharacter::FillAntibot(CAntibotCharacterData *pData)
 
 void CCharacter::HandleBroadcast()
 {
-	CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
+	CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCid());
 
 	if(m_DDRaceState == DDRACE_STARTED && m_pPlayer->GetClientVersion() == VERSION_VANILLA &&
 		m_LastTimeCpBroadcasted != m_LastTimeCp && m_LastTimeCp > -1 &&
@@ -1314,7 +1335,7 @@ void CCharacter::HandleBroadcast()
 		char aBroadcast[128];
 		float Diff = m_aCurrentTimeCp[m_LastTimeCp] - pData->m_aBestTimeCp[m_LastTimeCp];
 		str_format(aBroadcast, sizeof(aBroadcast), "Checkpoint | Diff : %+5.2f", Diff);
-		GameServer()->SendBroadcast(aBroadcast, m_pPlayer->GetCID());
+		GameServer()->SendBroadcast(aBroadcast, m_pPlayer->GetCid());
 		m_LastTimeCpBroadcasted = m_LastTimeCp;
 		m_LastBroadcast = Server()->Tick();
 	}
@@ -1323,7 +1344,7 @@ void CCharacter::HandleBroadcast()
 		char aBuf[32];
 		int Time = (int64_t)100 * ((float)(Server()->Tick() - m_StartTime) / ((float)Server()->TickSpeed()));
 		str_time(Time, TIME_HOURS, aBuf, sizeof(aBuf));
-		GameServer()->SendBroadcast(aBuf, m_pPlayer->GetCID(), false);
+		GameServer()->SendBroadcast(aBuf, m_pPlayer->GetCid(), false);
 		m_LastTimeCpBroadcasted = m_LastTimeCp;
 		m_LastBroadcast = Server()->Tick();
 	}
@@ -1340,15 +1361,15 @@ void CCharacter::HandleSkippableTiles(int Index)
 		   Collision()->GetFCollisionAt(m_Pos.x + GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH ||
 		   Collision()->GetFCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y - GetProximityRadius() / 3.f) == TILE_DEATH ||
 		   Collision()->GetFCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH) &&
-		!m_Core.m_Super && !(Team() && Teams()->TeeFinished(m_pPlayer->GetCID())))
+		!m_Core.m_Super && !(Team() && Teams()->TeeFinished(m_pPlayer->GetCid())))
 	{
-		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+		Die(m_pPlayer->GetCid(), WEAPON_WORLD);
 		return;
 	}
 
 	if(GameLayerClipped(m_Pos))
 	{
-		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+		Die(m_pPlayer->GetCid(), WEAPON_WORLD);
 		return;
 	}
 
@@ -1431,15 +1452,15 @@ void CCharacter::SetTimeCheckpoint(int TimeCheckpoint)
 		m_TimeCpBroadcastEndTick = Server()->Tick() + Server()->TickSpeed() * 2;
 		if(m_pPlayer->GetClientVersion() >= VERSION_DDRACE)
 		{
-			CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
-			if(pData->m_BestTime && pData->m_aBestTimeCp[m_LastTimeCp] != 0.0f)
+			CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCid());
+			if(pData->m_aBestTimeCp[m_LastTimeCp] != 0.0f)
 			{
 				CNetMsg_Sv_DDRaceTime Msg;
 				Msg.m_Time = (int)(m_Time * 100.0f);
 				Msg.m_Finish = 0;
 				float Diff = (m_aCurrentTimeCp[m_LastTimeCp] - pData->m_aBestTimeCp[m_LastTimeCp]) * 100;
 				Msg.m_Check = (int)Diff;
-				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, m_pPlayer->GetCID());
+				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, m_pPlayer->GetCid());
 			}
 		}
 	}
@@ -1466,6 +1487,8 @@ void CCharacter::HandleTiles(int Index)
 		m_TeleCheckpoint = TeleCheckpoint;
 
 	GameServer()->m_pController->HandleCharacterTiles(this, Index);
+	if(!m_Alive)
+		return;
 
 	// freeze
 	if(((m_TileIndex == TILE_FREEZE) || (m_TileFIndex == TILE_FREEZE)) && !m_Core.m_Super && !m_Core.m_DeepFrozen)
@@ -1504,7 +1527,7 @@ void CCharacter::HandleTiles(int Index)
 	// hit others
 	if(((m_TileIndex == TILE_HIT_DISABLE) || (m_TileFIndex == TILE_HIT_DISABLE)) && (!m_Core.m_HammerHitDisabled || !m_Core.m_ShotgunHitDisabled || !m_Core.m_GrenadeHitDisabled || !m_Core.m_LaserHitDisabled))
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hit others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't hit others");
 		m_Core.m_HammerHitDisabled = true;
 		m_Core.m_ShotgunHitDisabled = true;
 		m_Core.m_GrenadeHitDisabled = true;
@@ -1512,7 +1535,7 @@ void CCharacter::HandleTiles(int Index)
 	}
 	else if(((m_TileIndex == TILE_HIT_ENABLE) || (m_TileFIndex == TILE_HIT_ENABLE)) && (m_Core.m_HammerHitDisabled || m_Core.m_ShotgunHitDisabled || m_Core.m_GrenadeHitDisabled || m_Core.m_LaserHitDisabled))
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hit others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can hit others");
 		m_Core.m_ShotgunHitDisabled = false;
 		m_Core.m_GrenadeHitDisabled = false;
 		m_Core.m_HammerHitDisabled = false;
@@ -1522,36 +1545,36 @@ void CCharacter::HandleTiles(int Index)
 	// collide with others
 	if(((m_TileIndex == TILE_NPC_DISABLE) || (m_TileFIndex == TILE_NPC_DISABLE)) && !m_Core.m_CollisionDisabled)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't collide with others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't collide with others");
 		m_Core.m_CollisionDisabled = true;
 	}
 	else if(((m_TileIndex == TILE_NPC_ENABLE) || (m_TileFIndex == TILE_NPC_ENABLE)) && m_Core.m_CollisionDisabled)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can collide with others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can collide with others");
 		m_Core.m_CollisionDisabled = false;
 	}
 
 	// hook others
 	if(((m_TileIndex == TILE_NPH_DISABLE) || (m_TileFIndex == TILE_NPH_DISABLE)) && !m_Core.m_HookHitDisabled)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hook others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't hook others");
 		m_Core.m_HookHitDisabled = true;
 	}
 	else if(((m_TileIndex == TILE_NPH_ENABLE) || (m_TileFIndex == TILE_NPH_ENABLE)) && m_Core.m_HookHitDisabled)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hook others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can hook others");
 		m_Core.m_HookHitDisabled = false;
 	}
 
 	// unlimited air jumps
 	if(((m_TileIndex == TILE_UNLIMITED_JUMPS_ENABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_ENABLE)) && !m_Core.m_EndlessJump)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You have unlimited air jumps");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You have unlimited air jumps");
 		m_Core.m_EndlessJump = true;
 	}
 	else if(((m_TileIndex == TILE_UNLIMITED_JUMPS_DISABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_DISABLE)) && m_Core.m_EndlessJump)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You don't have unlimited air jumps");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You don't have unlimited air jumps");
 		m_Core.m_EndlessJump = false;
 	}
 
@@ -1569,12 +1592,12 @@ void CCharacter::HandleTiles(int Index)
 	// jetpack gun
 	if(((m_TileIndex == TILE_JETPACK_ENABLE) || (m_TileFIndex == TILE_JETPACK_ENABLE)) && !m_Core.m_Jetpack)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You have a jetpack gun");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You have a jetpack gun");
 		m_Core.m_Jetpack = true;
 	}
 	else if(((m_TileIndex == TILE_JETPACK_DISABLE) || (m_TileFIndex == TILE_JETPACK_DISABLE)) && m_Core.m_Jetpack)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You lost your jetpack gun");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You lost your jetpack gun");
 		m_Core.m_Jetpack = false;
 	}
 
@@ -1595,39 +1618,39 @@ void CCharacter::HandleTiles(int Index)
 	{
 		m_Core.m_HasTelegunGun = true;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport gun enabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport gun enabled");
 	}
 	else if(((m_TileIndex == TILE_TELE_GUN_DISABLE) || (m_TileFIndex == TILE_TELE_GUN_DISABLE)) && m_Core.m_HasTelegunGun)
 	{
 		m_Core.m_HasTelegunGun = false;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport gun disabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport gun disabled");
 	}
 
 	if(((m_TileIndex == TILE_TELE_GRENADE_ENABLE) || (m_TileFIndex == TILE_TELE_GRENADE_ENABLE)) && !m_Core.m_HasTelegunGrenade)
 	{
 		m_Core.m_HasTelegunGrenade = true;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport grenade enabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport grenade enabled");
 	}
 	else if(((m_TileIndex == TILE_TELE_GRENADE_DISABLE) || (m_TileFIndex == TILE_TELE_GRENADE_DISABLE)) && m_Core.m_HasTelegunGrenade)
 	{
 		m_Core.m_HasTelegunGrenade = false;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport grenade disabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport grenade disabled");
 	}
 
 	if(((m_TileIndex == TILE_TELE_LASER_ENABLE) || (m_TileFIndex == TILE_TELE_LASER_ENABLE)) && !m_Core.m_HasTelegunLaser)
 	{
 		m_Core.m_HasTelegunLaser = true;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport laser enabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport laser enabled");
 	}
 	else if(((m_TileIndex == TILE_TELE_LASER_DISABLE) || (m_TileFIndex == TILE_TELE_LASER_DISABLE)) && m_Core.m_HasTelegunLaser)
 	{
 		m_Core.m_HasTelegunLaser = false;
 
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport laser disabled");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "Teleport laser disabled");
 	}
 
 	// stopper
@@ -1636,7 +1659,7 @@ void CCharacter::HandleTiles(int Index)
 		m_Core.m_Jumped = 0;
 		m_Core.m_JumpedTotal = 0;
 	}
-	m_Core.m_Vel = ClampVel(m_MoveRestrictions, m_Core.m_Vel);
+	ApplyMoveRestrictions();
 
 	// handle switch tiles
 	if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHOPEN && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
@@ -1700,42 +1723,42 @@ void CCharacter::HandleTiles(int Index)
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_HammerHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hammer hit others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can hammer hit others");
 		m_Core.m_HammerHitDisabled = false;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_HammerHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hammer hit others");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't hammer hit others");
 		m_Core.m_HammerHitDisabled = true;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_ShotgunHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with shotgun");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can shoot others with shotgun");
 		m_Core.m_ShotgunHitDisabled = false;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_ShotgunHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with shotgun");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't shoot others with shotgun");
 		m_Core.m_ShotgunHitDisabled = true;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_GrenadeHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with grenade");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can shoot others with grenade");
 		m_Core.m_GrenadeHitDisabled = false;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_GrenadeHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with grenade");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't shoot others with grenade");
 		m_Core.m_GrenadeHitDisabled = true;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_LaserHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with laser");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can shoot others with laser");
 		m_Core.m_LaserHitDisabled = false;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_LaserHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
 	{
-		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with laser");
+		GameServer()->SendChatTarget(GetPlayer()->GetCid(), "You can't shoot others with laser");
 		m_Core.m_LaserHitDisabled = true;
 	}
 	else if(Collision()->GetSwitchType(MapIndex) == TILE_JUMP)
@@ -1755,7 +1778,7 @@ void CCharacter::HandleTiles(int Index)
 				str_format(aBuf, sizeof(aBuf), "You can jump %d time", NewJumps);
 			else
 				str_format(aBuf, sizeof(aBuf), "You can jump %d times", NewJumps);
-			GameServer()->SendChatTarget(GetPlayer()->GetCID(), aBuf);
+			GameServer()->SendChatTarget(GetPlayer()->GetCid(), aBuf);
 			m_Core.m_Jumps = NewJumps;
 		}
 	}
@@ -1767,7 +1790,7 @@ void CCharacter::HandleTiles(int Index)
 
 		m_StartTime -= (min * 60 + sec) * Server()->TickSpeed();
 
-		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team != TEAM_FLOCK) && Team != TEAM_SUPER)
+		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamFlock(Team))) && Team != TEAM_SUPER)
 		{
 			for(int i = 0; i < MAX_CLIENTS; i++)
 			{
@@ -1793,7 +1816,7 @@ void CCharacter::HandleTiles(int Index)
 		if(m_StartTime > Server()->Tick())
 			m_StartTime = Server()->Tick();
 
-		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team != TEAM_FLOCK) && Team != TEAM_SUPER)
+		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (Team != TEAM_FLOCK && !Teams()->TeamFlock(Team))) && Team != TEAM_SUPER)
 		{
 			for(int i = 0; i < MAX_CLIENTS; i++)
 			{
@@ -1821,12 +1844,12 @@ void CCharacter::HandleTiles(int Index)
 	}
 
 	int z = Collision()->IsTeleport(MapIndex);
-	if(!g_Config.m_SvOldTeleportHook && !g_Config.m_SvOldTeleportWeapons && z && !(*m_pTeleOuts)[z - 1].empty())
+	if(!g_Config.m_SvOldTeleportHook && !g_Config.m_SvOldTeleportWeapons && z && !Collision()->TeleOuts(z - 1).empty())
 	{
 		if(m_Core.m_Super)
 			return;
-		int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleOuts)[z - 1].size());
-		m_Core.m_Pos = (*m_pTeleOuts)[z - 1][TeleOut];
+		int TeleOut = GameWorld()->m_Core.RandomOr0(Collision()->TeleOuts(z - 1).size());
+		m_Core.m_Pos = Collision()->TeleOuts(z - 1)[TeleOut];
 		if(!g_Config.m_SvTeleportHoldHook)
 		{
 			ResetHook();
@@ -1836,12 +1859,12 @@ void CCharacter::HandleTiles(int Index)
 		return;
 	}
 	int evilz = Collision()->IsEvilTeleport(MapIndex);
-	if(evilz && !(*m_pTeleOuts)[evilz - 1].empty())
+	if(evilz && !Collision()->TeleOuts(evilz - 1).empty())
 	{
 		if(m_Core.m_Super)
 			return;
-		int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleOuts)[evilz - 1].size());
-		m_Core.m_Pos = (*m_pTeleOuts)[evilz - 1][TeleOut];
+		int TeleOut = GameWorld()->m_Core.RandomOr0(Collision()->TeleOuts(evilz - 1).size());
+		m_Core.m_Pos = Collision()->TeleOuts(evilz - 1)[TeleOut];
 		if(!g_Config.m_SvOldTeleportHook && !g_Config.m_SvOldTeleportWeapons)
 		{
 			m_Core.m_Vel = vec2(0, 0);
@@ -1849,7 +1872,7 @@ void CCharacter::HandleTiles(int Index)
 			if(!g_Config.m_SvTeleportHoldHook)
 			{
 				ResetHook();
-				GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+				GameWorld()->ReleaseHooked(GetPlayer()->GetCid());
 			}
 			if(g_Config.m_SvTeleportLoseWeapons)
 			{
@@ -1865,16 +1888,16 @@ void CCharacter::HandleTiles(int Index)
 		// first check if there is a TeleCheckOut for the current recorded checkpoint, if not check previous checkpoints
 		for(int k = m_TeleCheckpoint - 1; k >= 0; k--)
 		{
-			if(!(*m_pTeleCheckOuts)[k].empty())
+			if(!Collision()->TeleCheckOuts(k).empty())
 			{
-				int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleCheckOuts)[k].size());
-				m_Core.m_Pos = (*m_pTeleCheckOuts)[k][TeleOut];
+				int TeleOut = GameWorld()->m_Core.RandomOr0(Collision()->TeleCheckOuts(k).size());
+				m_Core.m_Pos = Collision()->TeleCheckOuts(k)[TeleOut];
 				m_Core.m_Vel = vec2(0, 0);
 
 				if(!g_Config.m_SvTeleportHoldHook)
 				{
 					ResetHook();
-					GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+					GameWorld()->ReleaseHooked(GetPlayer()->GetCid());
 				}
 
 				return;
@@ -1882,7 +1905,7 @@ void CCharacter::HandleTiles(int Index)
 		}
 		// if no checkpointout have been found (or if there no recorded checkpoint), teleport to start
 		vec2 SpawnPos;
-		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCID())))
+		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCid())))
 		{
 			m_Core.m_Pos = SpawnPos;
 			m_Core.m_Vel = vec2(0, 0);
@@ -1890,7 +1913,7 @@ void CCharacter::HandleTiles(int Index)
 			if(!g_Config.m_SvTeleportHoldHook)
 			{
 				ResetHook();
-				GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+				GameWorld()->ReleaseHooked(GetPlayer()->GetCid());
 			}
 		}
 		return;
@@ -1902,10 +1925,10 @@ void CCharacter::HandleTiles(int Index)
 		// first check if there is a TeleCheckOut for the current recorded checkpoint, if not check previous checkpoints
 		for(int k = m_TeleCheckpoint - 1; k >= 0; k--)
 		{
-			if(!(*m_pTeleCheckOuts)[k].empty())
+			if(!Collision()->TeleCheckOuts(k).empty())
 			{
-				int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleCheckOuts)[k].size());
-				m_Core.m_Pos = (*m_pTeleCheckOuts)[k][TeleOut];
+				int TeleOut = GameWorld()->m_Core.RandomOr0(Collision()->TeleCheckOuts(k).size());
+				m_Core.m_Pos = Collision()->TeleCheckOuts(k)[TeleOut];
 
 				if(!g_Config.m_SvTeleportHoldHook)
 				{
@@ -1917,7 +1940,7 @@ void CCharacter::HandleTiles(int Index)
 		}
 		// if no checkpointout have been found (or if there no recorded checkpoint), teleport to start
 		vec2 SpawnPos;
-		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCID())))
+		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCid())))
 		{
 			m_Core.m_Pos = SpawnPos;
 
@@ -1962,9 +1985,9 @@ void CCharacter::SendZoneMsgs()
 			str_copy(aBuf, pCur, pPos - pCur + 1);
 			aBuf[pPos - pCur + 1] = '\0';
 			pCur = pPos + 2;
-			GameServer()->SendChatTarget(m_pPlayer->GetCID(), aBuf);
+			GameServer()->SendChatTarget(m_pPlayer->GetCid(), aBuf);
 		}
-		GameServer()->SendChatTarget(m_pPlayer->GetCID(), pCur);
+		GameServer()->SendChatTarget(m_pPlayer->GetCid(), pCur);
 	}
 	// send zone enter msg
 	if(GameServer()->m_aaZoneEnterMsg[m_TuneZone][0])
@@ -1977,9 +2000,9 @@ void CCharacter::SendZoneMsgs()
 			str_copy(aBuf, pCur, pPos - pCur + 1);
 			aBuf[pPos - pCur + 1] = '\0';
 			pCur = pPos + 2;
-			GameServer()->SendChatTarget(m_pPlayer->GetCID(), aBuf);
+			GameServer()->SendChatTarget(m_pPlayer->GetCid(), aBuf);
 		}
-		GameServer()->SendChatTarget(m_pPlayer->GetCID(), pCur);
+		GameServer()->SendChatTarget(m_pPlayer->GetCid(), pCur);
 	}
 }
 
@@ -1994,16 +2017,52 @@ void CCharacter::SetTeams(CGameTeams *pTeams)
 	m_Core.SetTeamsCore(&m_pTeams->m_Core);
 }
 
-void CCharacter::SetRescue()
+bool CCharacter::TrySetRescue(int RescueMode)
+{
+	bool Set = false;
+	if(g_Config.m_SvRescue || ((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team() > TEAM_FLOCK) && Team() >= TEAM_FLOCK && Team() < TEAM_SUPER))
+	{
+		// check for nearby health pickups (also freeze)
+		bool InHealthPickup = false;
+		if(!m_Core.m_IsInFreeze)
+		{
+			CEntity *apEnts[9];
+			int Num = GameWorld()->FindEntities(m_Pos, GetProximityRadius() + CPickup::ms_CollisionExtraSize, apEnts, std::size(apEnts), CGameWorld::ENTTYPE_PICKUP);
+			for(int i = 0; i < Num; ++i)
+			{
+				CPickup *pPickup = static_cast<CPickup *>(apEnts[i]);
+				if(pPickup->Type() == POWERUP_HEALTH)
+				{
+					// This uses a separate variable InHealthPickup instead of setting m_Core.m_IsInFreeze
+					// as the latter causes freezebars to flicker when standing in the freeze range of a
+					// health pickup. When the same code for client prediction is added, the freezebars
+					// still flicker, but only when standing at the edge of the health pickup's freeze range.
+					InHealthPickup = true;
+					break;
+				}
+			}
+		}
+
+		if(!m_Core.m_IsInFreeze && IsGrounded() && !m_Core.m_DeepFrozen && !InHealthPickup)
+		{
+			ForceSetRescue(RescueMode);
+			Set = true;
+		}
+	}
+
+	return Set;
+}
+
+void CCharacter::ForceSetRescue(int RescueMode)
 {
-	m_RescueTee.Save(this);
-	m_SetSavePos = true;
+	m_RescueTee[RescueMode].Save(this);
+	m_SetSavePos[RescueMode] = true;
 }
 
 void CCharacter::DDRaceTick()
 {
 	mem_copy(&m_Input, &m_SavedInput, sizeof(m_Input));
-	m_Armor = clamp(10 - (m_FreezeTime / 15), 0, 10);
+	GameServer()->m_pController->SetArmorProgress(this, m_FreezeTime);
 	if(m_Input.m_Direction != 0 || m_Input.m_Jump != 0)
 		m_LastMove = Server()->Tick();
 
@@ -2045,37 +2104,11 @@ void CCharacter::DDRaceTick()
 		}
 	}
 
-	// check for nearby health pickups (also freeze)
-	bool InHealthPickup = false;
-	if(!m_Core.m_IsInFreeze)
-	{
-		CEntity *apEnts[9];
-		int Num = GameWorld()->FindEntities(m_Pos, GetProximityRadius() + CPickup::ms_CollisionExtraSize, apEnts, std::size(apEnts), CGameWorld::ENTTYPE_PICKUP);
-		for(int i = 0; i < Num; ++i)
-		{
-			CPickup *pPickup = static_cast<CPickup *>(apEnts[i]);
-			if(pPickup->Type() == POWERUP_HEALTH)
-			{
-				// This uses a separate variable InHealthPickup instead of setting m_Core.m_IsInFreeze
-				// as the latter causes freezebars to flicker when standing in the freeze range of a
-				// health pickup. When the same code for client prediction is added, the freezebars
-				// still flicker, but only when standing at the edge of the health pickup's freeze range.
-				InHealthPickup = true;
-				break;
-			}
-		}
-	}
-
 	// look for save position for rescue feature
-	if(g_Config.m_SvRescue || ((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team() > TEAM_FLOCK) && Team() >= TEAM_FLOCK && Team() < TEAM_SUPER))
-	{
-		if(!m_Core.m_IsInFreeze && IsGrounded() && !m_Core.m_DeepFrozen && !InHealthPickup)
-		{
-			SetRescue();
-		}
-	}
+	// always update auto rescue
+	TrySetRescue(RESCUEMODE_AUTO);
 
-	m_Core.m_Id = GetPlayer()->GetCID();
+	m_Core.m_Id = GetPlayer()->GetCid();
 }
 
 void CCharacter::DDRacePostCoreTick()
@@ -2144,11 +2177,11 @@ void CCharacter::DDRacePostCoreTick()
 	// teleport gun
 	if(m_TeleGunTeleport)
 	{
-		GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), TeamMask());
+		GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCid(), TeamMask());
 		m_Core.m_Pos = m_TeleGunPos;
 		if(!m_IsBlueTeleGunTeleport)
 			m_Core.m_Vel = vec2(0, 0);
-		GameServer()->CreateDeath(m_TeleGunPos, m_pPlayer->GetCID(), TeamMask());
+		GameServer()->CreateDeath(m_TeleGunPos, m_pPlayer->GetCid(), TeamMask());
 		GameServer()->CreateSound(m_TeleGunPos, SOUND_WEAPON_SPAWN, TeamMask());
 		m_TeleGunTeleport = false;
 		m_IsBlueTeleGunTeleport = false;
@@ -2161,7 +2194,7 @@ bool CCharacter::Freeze(int Seconds)
 {
 	if(Seconds <= 0 || m_Core.m_Super || m_FreezeTime > Seconds * Server()->TickSpeed())
 		return false;
-	if(m_Core.m_FreezeStart < Server()->Tick() - Server()->TickSpeed())
+	if(m_FreezeTime == 0 || m_Core.m_FreezeStart < Server()->Tick() - Server()->TickSpeed())
 	{
 		m_Armor = 0;
 		m_FreezeTime = Seconds * Server()->TickSpeed();
@@ -2191,6 +2224,12 @@ bool CCharacter::UnFreeze()
 	return false;
 }
 
+void CCharacter::ResetJumps()
+{
+	m_Core.m_JumpedTotal = 0;
+	m_Core.m_Jumped = 0;
+}
+
 void CCharacter::GiveWeapon(int Weapon, bool Remove)
 {
 	if(Weapon == WEAPON_NINJA)
@@ -2239,7 +2278,7 @@ void CCharacter::SetEndlessHook(bool Enable)
 	{
 		return;
 	}
-	GameServer()->SendChatTarget(GetPlayer()->GetCID(), Enable ? "Endless hook has been activated" : "Endless hook has been deactivated");
+	GameServer()->SendChatTarget(GetPlayer()->GetCid(), Enable ? "Endless hook has been activated" : "Endless hook has been deactivated");
 
 	m_Core.m_EndlessHook = Enable;
 }
@@ -2249,20 +2288,25 @@ void CCharacter::Pause(bool Pause)
 	m_Paused = Pause;
 	if(Pause)
 	{
-		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
+		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCid()] = 0;
 		GameServer()->m_World.RemoveEntity(this);
 
 		if(m_Core.HookedPlayer() != -1) // Keeping hook would allow cheats
 		{
 			ResetHook();
-			GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+			GameWorld()->ReleaseHooked(GetPlayer()->GetCid());
 		}
+		m_PausedTick = Server()->Tick();
 	}
 	else
 	{
 		m_Core.m_Vel = vec2(0, 0);
-		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = &m_Core;
+		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCid()] = &m_Core;
 		GameServer()->m_World.InsertEntity(this);
+		if(m_Core.m_FreezeStart > 0 && m_PausedTick >= 0)
+		{
+			m_Core.m_FreezeStart += Server()->Tick() - m_PausedTick;
+		}
 	}
 }
 
@@ -2271,10 +2315,11 @@ void CCharacter::DDRaceInit()
 	m_Paused = false;
 	m_DDRaceState = DDRACE_NONE;
 	m_PrevPos = m_Pos;
-	m_SetSavePos = false;
+	for(bool &Set : m_SetSavePos)
+		Set = false;
 	m_LastBroadcast = 0;
 	m_TeamBeforeSuper = 0;
-	m_Core.m_Id = GetPlayer()->GetCID();
+	m_Core.m_Id = GetPlayer()->GetCid();
 	m_TeleCheckpoint = 0;
 	m_Core.m_EndlessHook = g_Config.m_SvEndlessDrag;
 	if(g_Config.m_SvHit)
@@ -2296,7 +2341,7 @@ void CCharacter::DDRaceInit()
 
 	int Team = Teams()->m_Core.Team(m_Core.m_Id);
 
-	if(Teams()->TeamLocked(Team))
+	if(Teams()->TeamLocked(Team) && !Teams()->TeamFlock(Team))
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
@@ -2315,24 +2360,25 @@ void CCharacter::DDRaceInit()
 
 	if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && Team == TEAM_FLOCK)
 	{
-		GameServer()->SendStartWarning(GetPlayer()->GetCID(), "Please join a team before you start");
+		GameServer()->SendStartWarning(GetPlayer()->GetCid(), "Please join a team before you start");
 	}
 }
 
 void CCharacter::Rescue()
 {
-	if(m_SetSavePos && !m_Core.m_Super)
+	if(m_SetSavePos[GetPlayer()->m_RescueMode] && !m_Core.m_Super)
 	{
 		if(m_LastRescue + (int64_t)g_Config.m_SvRescueDelay * Server()->TickSpeed() > Server()->Tick())
 		{
 			char aBuf[256];
 			str_format(aBuf, sizeof(aBuf), "You have to wait %d seconds until you can rescue yourself", (int)((m_LastRescue + (int64_t)g_Config.m_SvRescueDelay * Server()->TickSpeed() - Server()->Tick()) / Server()->TickSpeed()));
-			GameServer()->SendChatTarget(GetPlayer()->GetCID(), aBuf);
+			GameServer()->SendChatTarget(GetPlayer()->GetCid(), aBuf);
 			return;
 		}
 
+		m_LastRescue = Server()->Tick();
 		float StartTime = m_StartTime;
-		m_RescueTee.Load(this, Team());
+		m_RescueTee[GetPlayer()->m_RescueMode].Load(this, Team());
 		// Don't load these from saved tee:
 		m_Core.m_Vel = vec2(0, 0);
 		m_Core.m_HookState = HOOK_IDLE;
@@ -2350,7 +2396,44 @@ void CCharacter::Rescue()
 
 CClientMask CCharacter::TeamMask()
 {
-	return Teams()->TeamMask(Team(), -1, GetPlayer()->GetCID());
+	return Teams()->TeamMask(Team(), -1, GetPlayer()->GetCid());
+}
+
+void CCharacter::SetPosition(const vec2 &Position)
+{
+	m_Core.m_Pos = Position;
+}
+
+void CCharacter::Move(vec2 RelPos)
+{
+	m_Core.m_Pos += RelPos;
+}
+
+void CCharacter::ResetVelocity()
+{
+	m_Core.m_Vel = vec2(0, 0);
+}
+
+void CCharacter::SetVelocity(vec2 NewVelocity)
+{
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, NewVelocity);
+}
+
+// The method is needed only to reproduce 'shotgun bug' ddnet#5258
+// Use SetVelocity() instead.
+void CCharacter::SetRawVelocity(vec2 NewVelocity)
+{
+	m_Core.m_Vel = NewVelocity;
+}
+
+void CCharacter::AddVelocity(vec2 Addition)
+{
+	SetVelocity(m_Core.m_Vel + Addition);
+}
+
+void CCharacter::ApplyMoveRestrictions()
+{
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, m_Core.m_Vel);
 }
 
 void CCharacter::SwapClients(int Client1, int Client2)
diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h
index 8f984b7701..df569dc2c6 100644
--- a/src/game/server/entities/character.h
+++ b/src/game/server/entities/character.h
@@ -38,15 +38,17 @@ class CCharacter : public CEntity
 	void TickDeferred() override;
 	void TickPaused() override;
 	void Snap(int SnappingClient) override;
+	void PostSnap() override;
 	void SwapClients(int Client1, int Client2) override;
 
 	bool CanSnapCharacter(int SnappingClient);
-	bool IsSnappingCharacterInView(int SnappingClientID);
+	bool IsSnappingCharacterInView(int SnappingClientId);
 
 	bool IsGrounded();
 
 	void SetWeapon(int W);
 	void SetJetpack(bool Active);
+	void SetJumps(int Jumps);
 	void SetSolo(bool Solo);
 	void SetSuper(bool Super);
 	void SetLiveFrozen(bool Active);
@@ -60,6 +62,7 @@ class CCharacter : public CEntity
 
 	void OnPredictedInput(CNetObj_PlayerInput *pNewInput);
 	void OnDirectInput(CNetObj_PlayerInput *pNewInput);
+	void ReleaseHook();
 	void ResetHook();
 	void ResetInput();
 	void FireWeapon();
@@ -82,18 +85,28 @@ class CCharacter : public CEntity
 
 	void Rescue();
 
-	int NeededFaketuning() { return m_NeededFaketuning; }
+	int NeededFaketuning() const { return m_NeededFaketuning; }
 	bool IsAlive() const { return m_Alive; }
 	bool IsPaused() const { return m_Paused; }
 	class CPlayer *GetPlayer() { return m_pPlayer; }
 	CClientMask TeamMask();
 
+	void SetPosition(const vec2 &Position);
+	void Move(vec2 RelPos);
+
+	void ResetVelocity();
+	void SetVelocity(vec2 NewVelocity);
+	void SetRawVelocity(vec2 NewVelocity);
+	void AddVelocity(vec2 Addition);
+	void ApplyMoveRestrictions();
+
 private:
 	// player controlling this character
 	class CPlayer *m_pPlayer;
 
 	bool m_Alive;
 	bool m_Paused;
+	int m_PausedTick;
 	int m_NeededFaketuning;
 
 	// weapon info
@@ -106,6 +119,8 @@ class CCharacter : public CEntity
 	int m_ReloadTimer;
 	int m_AttackTick;
 
+	int m_MoveRestrictions;
+
 	int m_DamageTaken;
 
 	int m_EmoteType;
@@ -131,13 +146,12 @@ class CCharacter : public CEntity
 	int m_Health;
 	int m_Armor;
 
+	int m_TriggeredEvents7;
+
 	// the player core for the physics
 	CCharacterCore m_Core;
 	CGameTeams *m_pTeams = nullptr;
 
-	std::map<int, std::vector<vec2>> *m_pTeleOuts = nullptr;
-	std::map<int, std::vector<vec2>> *m_pTeleCheckOuts = nullptr;
-
 	// info for dead reckoning
 	int m_ReckoningTick; // tick that we are performing dead reckoning From
 	CCharacterCore m_SendCore; // core that we should send
@@ -145,7 +159,7 @@ class CCharacter : public CEntity
 
 	// DDRace
 
-	void SnapCharacter(int SnappingClient, int ID);
+	void SnapCharacter(int SnappingClient, int Id);
 	static bool IsSwitchActiveCb(int Number, void *pUser);
 	void SetTimeCheckpoint(int TimeCheckpoint);
 	void HandleTiles(int Index);
@@ -153,7 +167,7 @@ class CCharacter : public CEntity
 	int m_LastBroadcast;
 	void DDRaceInit();
 	void HandleSkippableTiles(int Index);
-	void SetRescue();
+	void ForceSetRescue(int RescueMode);
 	void DDRaceTick();
 	void DDRacePostCoreTick();
 	void HandleBroadcast();
@@ -161,13 +175,13 @@ class CCharacter : public CEntity
 	void SendZoneMsgs();
 	IAntibot *Antibot();
 
-	bool m_SetSavePos;
-	CSaveTee m_RescueTee;
+	bool m_SetSavePos[NUM_RESCUEMODES];
+	CSaveTee m_RescueTee[NUM_RESCUEMODES];
 
 public:
 	CGameTeams *Teams() { return m_pTeams; }
 	void SetTeams(CGameTeams *pTeams);
-	void SetTeleports(std::map<int, std::vector<vec2>> *pTeleOuts, std::map<int, std::vector<vec2>> *pTeleCheckOuts);
+	bool TrySetRescue(int RescueMode);
 
 	void FillAntibot(CAntibotCharacterData *pData);
 	void Pause(bool Pause);
@@ -176,10 +190,12 @@ class CCharacter : public CEntity
 	bool UnFreeze();
 	void GiveAllWeapons();
 	void ResetPickups();
+	void ResetJumps();
 	int m_DDRaceState;
 	int Team();
-	bool CanCollide(int ClientID);
-	bool SameTeam(int ClientID);
+	bool CanCollide(int ClientId);
+	bool SameTeam(int ClientId);
+	void StopRecording();
 	bool m_NinjaJetpack;
 	int m_TeamBeforeSuper;
 	int m_FreezeTime;
@@ -201,8 +217,6 @@ class CCharacter : public CEntity
 	int m_TileIndex;
 	int m_TileFIndex;
 
-	int m_MoveRestrictions;
-
 	int64_t m_LastStartWarning;
 	int64_t m_LastRescue;
 	bool m_LastRefillJumps;
@@ -211,22 +225,22 @@ class CCharacter : public CEntity
 	vec2 m_TeleGunPos;
 	bool m_TeleGunTeleport;
 	bool m_IsBlueTeleGunTeleport;
-	int m_StrongWeakID;
+	int m_StrongWeakId;
 
 	int m_SpawnTick;
 	int m_WeaponChangeTick;
 
 	// Setters/Getters because i don't want to modify vanilla vars access modifiers
-	int GetLastWeapon() { return m_LastWeapon; }
+	int GetLastWeapon() const { return m_LastWeapon; }
 	void SetLastWeapon(int LastWeap) { m_LastWeapon = LastWeap; }
-	int GetActiveWeapon() { return m_Core.m_ActiveWeapon; }
+	int GetActiveWeapon() const { return m_Core.m_ActiveWeapon; }
 	void SetActiveWeapon(int ActiveWeap) { m_Core.m_ActiveWeapon = ActiveWeap; }
 	void SetLastAction(int LastAction) { m_LastAction = LastAction; }
-	int GetArmor() { return m_Armor; }
+	int GetArmor() const { return m_Armor; }
 	void SetArmor(int Armor) { m_Armor = Armor; }
 	CCharacterCore GetCore() { return m_Core; }
 	void SetCore(CCharacterCore Core) { m_Core = Core; }
-	CCharacterCore *Core() { return &m_Core; }
+	const CCharacterCore *Core() const { return &m_Core; }
 	bool GetWeaponGot(int Type) { return m_Core.m_aWeapons[Type].m_Got; }
 	void SetWeaponGot(int Type, bool Value) { m_Core.m_aWeapons[Type].m_Got = Value; }
 	int GetWeaponAmmo(int Type) { return m_Core.m_aWeapons[Type].m_Ammo; }
@@ -237,18 +251,19 @@ class CCharacter : public CEntity
 
 	int GetLastAction() const { return m_LastAction; }
 
-	bool HasTelegunGun() { return m_Core.m_HasTelegunGun; }
-	bool HasTelegunGrenade() { return m_Core.m_HasTelegunGrenade; }
-	bool HasTelegunLaser() { return m_Core.m_HasTelegunLaser; }
+	bool HasTelegunGun() const { return m_Core.m_HasTelegunGun; }
+	bool HasTelegunGrenade() const { return m_Core.m_HasTelegunGrenade; }
+	bool HasTelegunLaser() const { return m_Core.m_HasTelegunLaser; }
 
-	bool HammerHitDisabled() { return m_Core.m_HammerHitDisabled; }
-	bool ShotgunHitDisabled() { return m_Core.m_ShotgunHitDisabled; }
-	bool LaserHitDisabled() { return m_Core.m_LaserHitDisabled; }
-	bool GrenadeHitDisabled() { return m_Core.m_GrenadeHitDisabled; }
+	bool HammerHitDisabled() const { return m_Core.m_HammerHitDisabled; }
+	bool ShotgunHitDisabled() const { return m_Core.m_ShotgunHitDisabled; }
+	bool LaserHitDisabled() const { return m_Core.m_LaserHitDisabled; }
+	bool GrenadeHitDisabled() const { return m_Core.m_GrenadeHitDisabled; }
 
-	bool IsSuper() { return m_Core.m_Super; }
+	bool IsSuper() const { return m_Core.m_Super; }
 
-	CSaveTee &GetRescueTeeRef() { return m_RescueTee; }
+	CSaveTee &GetLastRescueTeeRef(int Mode = RESCUEMODE_AUTO) { return m_RescueTee[Mode]; }
+	CTuningParams *GetTuning(int Zone) { return Zone ? &TuningList()[Zone] : Tuning(); }
 };
 
 enum
diff --git a/src/game/server/entities/door.cpp b/src/game/server/entities/door.cpp
index 14e8670b73..c0ad7b0f8b 100644
--- a/src/game/server/entities/door.cpp
+++ b/src/game/server/entities/door.cpp
@@ -64,8 +64,8 @@ void CDoor::Snap(int SnappingClient)
 	{
 		CCharacter *pChr = GameServer()->GetPlayerChar(SnappingClient);
 
-		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
-			pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId != SPEC_FREEVIEW)
+			pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId);
 
 		if(pChr && pChr->Team() != TEAM_SUPER && pChr->IsAlive() && !Switchers().empty() && Switchers()[m_Number].m_aStatus[pChr->Team()])
 		{
@@ -78,6 +78,6 @@ void CDoor::Snap(int SnappingClient)
 		StartTick = Server()->Tick();
 	}
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, From, StartTick, -1, LASERTYPE_DOOR, 0, m_Number);
 }
diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp
index e22800187c..4b9a96bd90 100644
--- a/src/game/server/entities/dragger.cpp
+++ b/src/game/server/entities/dragger.cpp
@@ -105,7 +105,7 @@ void CDragger::LookForPlayersToDrag()
 				!GameServer()->Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
 		if(IsReachable && pTarget->IsAlive())
 		{
-			const int &TargetClientId = pTarget->GetPlayer()->GetCID();
+			const int &TargetClientId = pTarget->GetPlayer()->GetCid();
 			// Solo players are dragged independently from the rest of the team
 			if(pTarget->Teams()->m_Core.GetSolo(TargetClientId))
 			{
@@ -156,30 +156,30 @@ void CDragger::LookForPlayersToDrag()
 	}
 }
 
-void CDragger::RemoveDraggerBeam(int ClientID)
+void CDragger::RemoveDraggerBeam(int ClientId)
 {
-	m_apDraggerBeam[ClientID] = nullptr;
+	m_apDraggerBeam[ClientId] = nullptr;
 }
 
-bool CDragger::WillDraggerBeamUseDraggerID(int TargetClientID, int SnappingClientID)
+bool CDragger::WillDraggerBeamUseDraggerId(int TargetClientId, int SnappingClientId)
 {
 	// For each snapping client, this must return true for at most one target (i.e. only one of the dragger beams),
 	// in which case the dragger itself must not be snapped
-	CCharacter *pTargetChar = GameServer()->GetPlayerChar(TargetClientID);
-	CCharacter *pSnapChar = GameServer()->GetPlayerChar(SnappingClientID);
-	if(pTargetChar && pSnapChar && m_apDraggerBeam[TargetClientID] != nullptr)
+	CCharacter *pTargetChar = GameServer()->GetPlayerChar(TargetClientId);
+	CCharacter *pSnapChar = GameServer()->GetPlayerChar(SnappingClientId);
+	if(pTargetChar && pSnapChar && m_apDraggerBeam[TargetClientId] != nullptr)
 	{
 		const int SnapTeam = pSnapChar->Team();
 		const int TargetTeam = pTargetChar->Team();
 		if(SnapTeam == TargetTeam && SnapTeam < MAX_CLIENTS)
 		{
-			if(pSnapChar->Teams()->m_Core.GetSolo(SnappingClientID) || m_aTargetIdInTeam[SnapTeam] < 0)
+			if(pSnapChar->Teams()->m_Core.GetSolo(SnappingClientId) || m_aTargetIdInTeam[SnapTeam] < 0)
 			{
-				return SnappingClientID == TargetClientID;
+				return SnappingClientId == TargetClientId;
 			}
 			else
 			{
-				return m_aTargetIdInTeam[SnapTeam] == TargetClientID;
+				return m_aTargetIdInTeam[SnapTeam] == TargetClientId;
 			}
 		}
 	}
@@ -200,7 +200,7 @@ void CDragger::Snap(int SnappingClient)
 	// Send the dragger in its resting position if the player would not otherwise see a dragger beam within its own team
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(WillDraggerBeamUseDraggerID(i, SnappingClient))
+		if(WillDraggerBeamUseDraggerId(i, SnappingClient))
 		{
 			return;
 		}
@@ -222,8 +222,8 @@ void CDragger::Snap(int SnappingClient)
 		if(SnappingClient != SERVER_DEMO_CLIENT &&
 			(GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS ||
 				GameServer()->m_apPlayers[SnappingClient]->IsPaused()) &&
-			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
-			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId);
 
 		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
 		if(pChar && m_Layer == LAYER_SWITCH && m_Number > 0 &&
@@ -237,7 +237,7 @@ void CDragger::Snap(int SnappingClient)
 			StartTick = Server()->Tick();
 	}
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, m_Pos, StartTick, -1, LASERTYPE_DRAGGER, Subtype, m_Number);
 }
 
diff --git a/src/game/server/entities/dragger.h b/src/game/server/entities/dragger.h
index de8abe5a35..77b29703c4 100644
--- a/src/game/server/entities/dragger.h
+++ b/src/game/server/entities/dragger.h
@@ -35,8 +35,8 @@ class CDragger : public CEntity
 public:
 	CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool IgnoreWalls, int Layer = 0, int Number = 0);
 
-	void RemoveDraggerBeam(int ClientID);
-	bool WillDraggerBeamUseDraggerID(int TargetClientID, int SnappingClientID);
+	void RemoveDraggerBeam(int ClientId);
+	bool WillDraggerBeamUseDraggerId(int TargetClientId, int SnappingClientId);
 
 	void Reset() override;
 	void Tick() override;
diff --git a/src/game/server/entities/dragger_beam.cpp b/src/game/server/entities/dragger_beam.cpp
index 26f03dab73..5dace37f67 100644
--- a/src/game/server/entities/dragger_beam.cpp
+++ b/src/game/server/entities/dragger_beam.cpp
@@ -10,16 +10,17 @@
 #include <game/mapitems.h>
 
 #include <game/server/gamecontext.h>
+#include <game/server/save.h>
 
 CDraggerBeam::CDraggerBeam(CGameWorld *pGameWorld, CDragger *pDragger, vec2 Pos, float Strength, bool IgnoreWalls,
-	int ForClientID, int Layer, int Number) :
+	int ForClientId, int Layer, int Number) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
 {
 	m_pDragger = pDragger;
 	m_Pos = Pos;
 	m_Strength = Strength;
 	m_IgnoreWalls = IgnoreWalls;
-	m_ForClientID = ForClientID;
+	m_ForClientId = ForClientId;
 	m_Active = true;
 	m_Layer = Layer;
 	m_Number = Number;
@@ -36,7 +37,7 @@ void CDraggerBeam::Tick()
 	}
 
 	// Drag only if the player is reachable and alive
-	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientId);
 	if(!pTarget)
 	{
 		Reset();
@@ -71,8 +72,7 @@ void CDraggerBeam::Tick()
 	// In the center of the dragger a tee does not experience speed-up
 	else if(distance(pTarget->m_Pos, m_Pos) > 28)
 	{
-		vec2 Temp = pTarget->Core()->m_Vel + (normalize(m_Pos - pTarget->m_Pos) * m_Strength);
-		pTarget->Core()->m_Vel = ClampVel(pTarget->m_MoveRestrictions, Temp);
+		pTarget->AddVelocity(normalize(m_Pos - pTarget->m_Pos) * m_Strength);
 	}
 }
 
@@ -86,7 +86,7 @@ void CDraggerBeam::Reset()
 	m_MarkedForDestroy = true;
 	m_Active = false;
 
-	m_pDragger->RemoveDraggerBeam(m_ForClientID);
+	m_pDragger->RemoveDraggerBeam(m_ForClientId);
 }
 
 void CDraggerBeam::Snap(int SnappingClient)
@@ -97,7 +97,7 @@ void CDraggerBeam::Snap(int SnappingClient)
 	}
 
 	// Only players who can see the player attached to the dragger can see the dragger beam
-	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientId);
 	if(!pTarget || !pTarget->CanSnapCharacter(SnappingClient))
 	{
 		return;
@@ -127,17 +127,22 @@ void CDraggerBeam::Snap(int SnappingClient)
 		StartTick = -1;
 	}
 
-	int SnapObjID = GetID();
-	if(m_pDragger->WillDraggerBeamUseDraggerID(m_ForClientID, SnappingClient))
+	int SnapObjId = GetId();
+	if(m_pDragger->WillDraggerBeamUseDraggerId(m_ForClientId, SnappingClient))
 	{
-		SnapObjID = m_pDragger->GetID();
+		SnapObjId = m_pDragger->GetId();
 	}
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), SnapObjID,
-		TargetPos, m_Pos, StartTick, m_ForClientID, LASERTYPE_DRAGGER, Subtype, m_Number);
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), SnapObjId,
+		TargetPos, m_Pos, StartTick, m_ForClientId, LASERTYPE_DRAGGER, Subtype, m_Number);
 }
 
 void CDraggerBeam::SwapClients(int Client1, int Client2)
 {
-	m_ForClientID = m_ForClientID == Client1 ? Client2 : m_ForClientID == Client2 ? Client1 : m_ForClientID;
+	m_ForClientId = m_ForClientId == Client1 ? Client2 : m_ForClientId == Client2 ? Client1 : m_ForClientId;
+}
+
+ESaveResult CDraggerBeam::BlocksSave(int ClientId)
+{
+	return m_ForClientId == ClientId ? ESaveResult::DRAGGER_ACTIVE : ESaveResult::SUCCESS;
 }
diff --git a/src/game/server/entities/dragger_beam.h b/src/game/server/entities/dragger_beam.h
index ce3f65d983..70249d1e84 100644
--- a/src/game/server/entities/dragger_beam.h
+++ b/src/game/server/entities/dragger_beam.h
@@ -26,12 +26,12 @@ class CDraggerBeam : public CEntity
 	CDragger *m_pDragger;
 	float m_Strength;
 	bool m_IgnoreWalls;
-	int m_ForClientID;
+	int m_ForClientId;
 	int m_EvalTick;
 	bool m_Active;
 
 public:
-	CDraggerBeam(CGameWorld *pGameWorld, CDragger *pDragger, vec2 Pos, float Strength, bool IgnoreWalls, int ForClientID, int Layer, int Number);
+	CDraggerBeam(CGameWorld *pGameWorld, CDragger *pDragger, vec2 Pos, float Strength, bool IgnoreWalls, int ForClientId, int Layer, int Number);
 
 	void SetPos(vec2 Pos);
 
@@ -39,6 +39,7 @@ class CDraggerBeam : public CEntity
 	void Tick() override;
 	void Snap(int SnappingClient) override;
 	void SwapClients(int Client1, int Client2) override;
+	ESaveResult BlocksSave(int ClientId) override;
 };
 
 #endif // GAME_SERVER_ENTITIES_DRAGGER_BEAM_H
diff --git a/src/game/server/entities/gun.cpp b/src/game/server/entities/gun.cpp
index 5c03604d63..993407f45e 100644
--- a/src/game/server/entities/gun.cpp
+++ b/src/game/server/entities/gun.cpp
@@ -85,7 +85,7 @@ void CGun::Fire()
 		}
 
 		// Turrets can only shoot at a speed of sv_plasma_per_sec
-		const int &TargetClientId = pTarget->GetPlayer()->GetCID();
+		const int &TargetClientId = pTarget->GetPlayer()->GetCid();
 		const bool &TargetIsSolo = pTarget->Teams()->m_Core.GetSolo(TargetClientId);
 		if((TargetIsSolo &&
 			   m_aLastFireSolo[TargetClientId] + Server()->TickSpeed() / g_Config.m_SvPlasmaPerSec > Server()->Tick()) ||
@@ -165,8 +165,8 @@ void CGun::Snap(int SnappingClient)
 		if(SnappingClient != SERVER_DEMO_CLIENT &&
 			(GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS ||
 				GameServer()->m_apPlayers[SnappingClient]->IsPaused()) &&
-			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
-			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId);
 
 		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
 		if(pChar && m_Layer == LAYER_SWITCH && m_Number > 0 &&
@@ -176,6 +176,6 @@ void CGun::Snap(int SnappingClient)
 		StartTick = m_EvalTick;
 	}
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, m_Pos, StartTick, -1, LASERTYPE_GUN, Subtype, m_Number);
 }
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index 2907d5b958..ba15d94f5a 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -44,9 +44,9 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 	bool pDontHitSelf = g_Config.m_SvOldLaser || (m_Bounces == 0 && !m_WasTele);
 
 	if(pOwnerChar ? (!pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (!pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : g_Config.m_SvHit)
-		pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner);
+		pHit = GameWorld()->IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner);
 	else
-		pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner, pOwnerChar);
+		pHit = GameWorld()->IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner, pOwnerChar);
 
 	if(!pHit || (pHit == pOwnerChar && g_Config.m_SvOldLaser) || (pHit != pOwnerChar && pOwnerChar ? (pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : !g_Config.m_SvHit))
 		return false;
@@ -55,48 +55,46 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 	m_Energy = -1;
 	if(m_Type == WEAPON_SHOTGUN)
 	{
-		vec2 Temp;
-
 		float Strength;
 		if(!m_TuneZone)
 			Strength = Tuning()->m_ShotgunStrength;
 		else
 			Strength = TuningList()[m_TuneZone].m_ShotgunStrength;
 
-		vec2 &HitPos = pHit->Core()->m_Pos;
+		const vec2 &HitPos = pHit->Core()->m_Pos;
 		if(!g_Config.m_SvOldLaser)
 		{
 			if(m_PrevPos != HitPos)
 			{
-				Temp = pHit->Core()->m_Vel + normalize(m_PrevPos - HitPos) * Strength;
-				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+				pHit->AddVelocity(normalize(m_PrevPos - HitPos) * Strength);
 			}
 			else
 			{
-				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+				pHit->SetRawVelocity(StackedLaserShotgunBugSpeed);
 			}
 		}
 		else if(g_Config.m_SvOldLaser && pOwnerChar)
 		{
 			if(pOwnerChar->Core()->m_Pos != HitPos)
 			{
-				Temp = pHit->Core()->m_Vel + normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength;
-				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+				pHit->AddVelocity(normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength);
 			}
 			else
 			{
-				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+				pHit->SetRawVelocity(StackedLaserShotgunBugSpeed);
 			}
 		}
 		else
 		{
-			pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, pHit->Core()->m_Vel);
+			// Re-apply move restrictions as a part of 'shotgun bug' reproduction
+			pHit->ApplyMoveRestrictions();
 		}
 	}
 	else if(m_Type == WEAPON_LASER)
 	{
 		pHit->UnFreeze();
 	}
+	pHit->TakeDamage(vec2(0, 0), 0, m_Owner, m_Type);
 	return true;
 }
 
@@ -167,10 +165,10 @@ void CLaser::DoBounce()
 			}
 			m_ZeroEnergyBounceInLastTick = Distance == 0.0f;
 
-			if(Res == TILE_TELEINWEAPON && !GameServer()->m_pController->m_TeleOuts[z - 1].empty())
+			if(Res == TILE_TELEINWEAPON && !GameServer()->Collision()->TeleOuts(z - 1).empty())
 			{
-				int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->m_pController->m_TeleOuts[z - 1].size());
-				m_TelePos = GameServer()->m_pController->m_TeleOuts[z - 1][TeleOut];
+				int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->Collision()->TeleOuts(z - 1).size());
+				m_TelePos = GameServer()->Collision()->TeleOuts(z - 1)[TeleOut];
 				m_WasTele = true;
 			}
 			else
@@ -317,7 +315,7 @@ void CLaser::Snap(int SnappingClient)
 	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
 	int LaserType = m_Type == WEAPON_LASER ? LASERTYPE_RIFLE : m_Type == WEAPON_SHOTGUN ? LASERTYPE_SHOTGUN : -1;
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, m_From, m_EvalTick, m_Owner, LaserType, 0, m_Number);
 }
 
diff --git a/src/game/server/entities/laser.h b/src/game/server/entities/laser.h
index 00654c0ade..736789c0c4 100644
--- a/src/game/server/entities/laser.h
+++ b/src/game/server/entities/laser.h
@@ -16,7 +16,7 @@ class CLaser : public CEntity
 	virtual void Snap(int SnappingClient) override;
 	virtual void SwapClients(int Client1, int Client2) override;
 
-	virtual int GetOwnerID() const override { return m_Owner; }
+	virtual int GetOwnerId() const override { return m_Owner; }
 
 protected:
 	bool HitCharacter(vec2 From, vec2 To);
diff --git a/src/game/server/entities/light.cpp b/src/game/server/entities/light.cpp
index 42aea3f952..bc862caa0f 100644
--- a/src/game/server/entities/light.cpp
+++ b/src/game/server/entities/light.cpp
@@ -110,8 +110,8 @@ void CLight::Snap(int SnappingClient)
 
 	CCharacter *pChr = GameServer()->GetPlayerChar(SnappingClient);
 
-	if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
-		pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+	if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId != SPEC_FREEVIEW)
+		pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId);
 
 	vec2 From = m_Pos;
 	int StartTick = -1;
@@ -142,6 +142,6 @@ void CLight::Snap(int SnappingClient)
 			StartTick = Server()->Tick();
 	}
 
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, From, StartTick, -1, LASERTYPE_FREEZE, 0, m_Number);
 }
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp
index 6b599a08e5..a622c02bef 100644
--- a/src/game/server/entities/pickup.cpp
+++ b/src/game/server/entities/pickup.cpp
@@ -142,7 +142,7 @@ void CPickup::Tick()
 						GameServer()->CreateSound(m_Pos, SOUND_PICKUP_SHOTGUN, pChr->TeamMask());
 
 					if(pChr->GetPlayer())
-						GameServer()->SendWeaponPickup(pChr->GetPlayer()->GetCID(), m_Subtype);
+						GameServer()->SendWeaponPickup(pChr->GetPlayer()->GetCid(), m_Subtype);
 				}
 				break;
 
@@ -175,15 +175,15 @@ void CPickup::Snap(int SnappingClient)
 	{
 		CCharacter *pChar = GameServer()->GetPlayerChar(SnappingClient);
 
-		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
-			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorId);
 
 		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
 		if(pChar && pChar->IsAlive() && m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pChar->Team()] && !Tick)
 			return;
 	}
 
-	GameServer()->SnapPickup(CSnapContext(SnappingClientVersion, Sixup), GetID(), m_Pos, m_Type, m_Subtype, m_Number);
+	GameServer()->SnapPickup(CSnapContext(SnappingClientVersion, Sixup), GetId(), m_Pos, m_Type, m_Subtype, m_Number);
 }
 
 void CPickup::Move()
diff --git a/src/game/server/entities/plasma.cpp b/src/game/server/entities/plasma.cpp
index f89d5ea38a..9d8978338f 100644
--- a/src/game/server/entities/plasma.cpp
+++ b/src/game/server/entities/plasma.cpp
@@ -12,14 +12,14 @@
 const float PLASMA_ACCEL = 1.1f;
 
 CPlasma::CPlasma(CGameWorld *pGameWorld, vec2 Pos, vec2 Dir, bool Freeze,
-	bool Explosive, int ForClientID) :
+	bool Explosive, int ForClientId) :
 	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
 {
 	m_Pos = Pos;
 	m_Core = Dir;
 	m_Freeze = Freeze;
 	m_Explosive = Explosive;
-	m_ForClientID = ForClientID;
+	m_ForClientId = ForClientId;
 	m_EvalTick = Server()->Tick();
 	m_LifeTime = Server()->TickSpeed() * 1.5f;
 
@@ -34,7 +34,7 @@ void CPlasma::Tick()
 		Reset();
 		return;
 	}
-	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientId);
 	// Without a target, a plasma bullet has no reason to live
 	if(!pTarget)
 	{
@@ -58,7 +58,7 @@ bool CPlasma::HitCharacter(CCharacter *pTarget)
 {
 	vec2 IntersectPos;
 	CCharacter *pHitPlayer = GameServer()->m_World.IntersectCharacter(
-		m_Pos, m_Pos + m_Core, 0.0f, IntersectPos, 0, m_ForClientID);
+		m_Pos, m_Pos + m_Core, 0.0f, IntersectPos, 0, m_ForClientId);
 	if(!pHitPlayer)
 	{
 		return false;
@@ -76,7 +76,7 @@ bool CPlasma::HitCharacter(CCharacter *pTarget)
 		// Plasma Turrets are very precise weapons only one tee gets speed from it,
 		// other tees near the explosion remain unaffected
 		GameServer()->CreateExplosion(
-			m_Pos, m_ForClientID, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
+			m_Pos, m_ForClientId, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
 	}
 	Reset();
 	return true;
@@ -92,7 +92,7 @@ bool CPlasma::HitObstacle(CCharacter *pTarget)
 		{
 			// Even in the case of an explosion due to a collision with obstacles, only one player is affected
 			GameServer()->CreateExplosion(
-				m_Pos, m_ForClientID, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
+				m_Pos, m_ForClientId, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
 		}
 		Reset();
 		return true;
@@ -108,7 +108,7 @@ void CPlasma::Reset()
 void CPlasma::Snap(int SnappingClient)
 {
 	// Only players who can see the targeted player can see the plasma bullet
-	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientId);
 	if(!pTarget || !pTarget->CanSnapCharacter(SnappingClient))
 	{
 		return;
@@ -121,11 +121,11 @@ void CPlasma::Snap(int SnappingClient)
 	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
 
 	int Subtype = (m_Explosive ? 1 : 0) | (m_Freeze ? 2 : 0);
-	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetId(),
 		m_Pos, m_Pos, m_EvalTick, -1, LASERTYPE_PLASMA, Subtype, m_Number);
 }
 
 void CPlasma::SwapClients(int Client1, int Client2)
 {
-	m_ForClientID = m_ForClientID == Client1 ? Client2 : m_ForClientID == Client2 ? Client1 : m_ForClientID;
+	m_ForClientId = m_ForClientId == Client1 ? Client2 : m_ForClientId == Client2 ? Client1 : m_ForClientId;
 }
diff --git a/src/game/server/entities/plasma.h b/src/game/server/entities/plasma.h
index b961b961ed..f9d94d3e7a 100644
--- a/src/game/server/entities/plasma.h
+++ b/src/game/server/entities/plasma.h
@@ -25,7 +25,7 @@ class CPlasma : public CEntity
 	vec2 m_Core;
 	int m_Freeze;
 	bool m_Explosive;
-	int m_ForClientID;
+	int m_ForClientId;
 	int m_EvalTick;
 	int m_LifeTime;
 
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
index c829f6be34..c2bdac75fd 100644
--- a/src/game/server/entities/projectile.cpp
+++ b/src/game/server/entities/projectile.cpp
@@ -177,6 +177,8 @@ void CProjectile::Tick()
 					pChr->Freeze();
 			}
 		}
+		else if(pTargetChr)
+			pTargetChr->TakeDamage(vec2(0, 0), 0, m_Owner, m_Type);
 
 		if(pOwnerChar && !GameLayerClipped(ColPos) &&
 			((m_Type == WEAPON_GRENADE && pOwnerChar->HasTelegunGrenade()) || (m_Type == WEAPON_GUN && pOwnerChar->HasTelegunGun())))
@@ -276,10 +278,10 @@ void CProjectile::Tick()
 		z = GameServer()->Collision()->IsTeleport(x);
 	else
 		z = GameServer()->Collision()->IsTeleportWeapon(x);
-	if(z && !GameServer()->m_pController->m_TeleOuts[z - 1].empty())
+	if(z && !GameServer()->Collision()->TeleOuts(z - 1).empty())
 	{
-		int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->m_pController->m_TeleOuts[z - 1].size());
-		m_Pos = GameServer()->m_pController->m_TeleOuts[z - 1][TeleOut];
+		int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->Collision()->TeleOuts(z - 1).size());
+		m_Pos = GameServer()->Collision()->TeleOuts(z - 1)[TeleOut];
 		m_StartTick = Server()->Tick();
 	}
 }
@@ -331,7 +333,7 @@ void CProjectile::Snap(int SnappingClient)
 
 	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
 	{
-		CNetObj_DDNetProjectile *pDDNetProjectile = static_cast<CNetObj_DDNetProjectile *>(Server()->SnapNewItem(NETOBJTYPE_DDNETPROJECTILE, GetID(), sizeof(CNetObj_DDNetProjectile)));
+		CNetObj_DDNetProjectile *pDDNetProjectile = static_cast<CNetObj_DDNetProjectile *>(Server()->SnapNewItem(NETOBJTYPE_DDNETPROJECTILE, GetId(), sizeof(CNetObj_DDNetProjectile)));
 		if(!pDDNetProjectile)
 		{
 			return;
@@ -341,7 +343,7 @@ void CProjectile::Snap(int SnappingClient)
 	else if(SnappingClientVersion >= VERSION_DDNET_ANTIPING_PROJECTILE && FillExtraInfoLegacy(&DDRaceProjectile))
 	{
 		int Type = SnappingClientVersion < VERSION_DDNET_MSG_LEGACY ? (int)NETOBJTYPE_PROJECTILE : NETOBJTYPE_DDRACEPROJECTILE;
-		void *pProj = Server()->SnapNewItem(Type, GetID(), sizeof(DDRaceProjectile));
+		void *pProj = Server()->SnapNewItem(Type, GetId(), sizeof(DDRaceProjectile));
 		if(!pProj)
 		{
 			return;
@@ -350,7 +352,7 @@ void CProjectile::Snap(int SnappingClient)
 	}
 	else
 	{
-		CNetObj_Projectile *pProj = Server()->SnapNewItem<CNetObj_Projectile>(GetID());
+		CNetObj_Projectile *pProj = Server()->SnapNewItem<CNetObj_Projectile>(GetId());
 		if(!pProj)
 		{
 			return;
diff --git a/src/game/server/entities/projectile.h b/src/game/server/entities/projectile.h
index 85fae7f18d..1e5133b3de 100644
--- a/src/game/server/entities/projectile.h
+++ b/src/game/server/entities/projectile.h
@@ -54,7 +54,7 @@ class CProjectile : public CEntity
 	bool FillExtraInfoLegacy(CNetObj_DDRaceProjectile *pProj);
 	void FillExtraInfo(CNetObj_DDNetProjectile *pProj);
 
-	virtual int GetOwnerID() const override { return m_Owner; }
+	virtual int GetOwnerId() const override { return m_Owner; }
 };
 
 #endif
diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
index 658302ea94..93390dcafd 100644
--- a/src/game/server/entity.cpp
+++ b/src/game/server/entity.cpp
@@ -18,7 +18,7 @@ CEntity::CEntity(CGameWorld *pGameWorld, int ObjType, vec2 Pos, int ProximityRad
 	m_ProximityRadius = ProximityRadius;
 
 	m_MarkedForDestroy = false;
-	m_ID = Server()->SnapNewID();
+	m_Id = Server()->SnapNewId();
 
 	m_pPrevTypeEntity = 0;
 	m_pNextTypeEntity = 0;
@@ -27,7 +27,7 @@ CEntity::CEntity(CGameWorld *pGameWorld, int ObjType, vec2 Pos, int ProximityRad
 CEntity::~CEntity()
 {
 	GameWorld()->RemoveEntity(this);
-	Server()->SnapFreeID(m_ID);
+	Server()->SnapFreeId(m_Id);
 }
 
 bool CEntity::NetworkClipped(int SnappingClient) const
diff --git a/src/game/server/entity.h b/src/game/server/entity.h
index 69e9a43856..b3cf409bc2 100644
--- a/src/game/server/entity.h
+++ b/src/game/server/entity.h
@@ -8,6 +8,7 @@
 #include <game/alloc.h>
 
 #include "gameworld.h"
+#include "save.h"
 
 class CCollision;
 class CGameContext;
@@ -29,7 +30,7 @@ class CEntity
 	CGameWorld *m_pGameWorld;
 	CCollision *m_pCCollision;
 
-	int m_ID;
+	int m_Id;
 	int m_ObjType;
 
 	/*
@@ -50,7 +51,7 @@ class CEntity
 	vec2 m_Pos;
 
 	/* Getters */
-	int GetID() const { return m_ID; }
+	int GetId() const { return m_Id; }
 
 	/* Constructor */
 	CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0);
@@ -122,6 +123,12 @@ class CEntity
 	*/
 	virtual void Snap(int SnappingClient) {}
 
+	/*
+		Function: PostSnap
+			Called after all clients received their snapshot.
+	*/
+	virtual void PostSnap() {}
+
 	/*
 		Function: SwapClients
 			Called when two players have swapped their client ids.
@@ -133,14 +140,23 @@ class CEntity
 	virtual void SwapClients(int Client1, int Client2) {}
 
 	/*
-		Function GetOwnerID
+		Function: BlocksSave
+			Called to check if a team can be saved
+
+		Arguments:
+			ClientId - Client ID
+	*/
+	virtual ESaveResult BlocksSave(int ClientId) { return ESaveResult::SUCCESS; }
+
+	/*
+		Function GetOwnerId
 		Returns:
-			ClientID of the initiator from this entity. -1 created by map.
+			ClientId of the initiator from this entity. -1 created by map.
 			This is used by save/load to remove related entities to the tee.
 			CCharacter should not return the PlayerId, because they get
 			handled separately in save/load code.
 	*/
-	virtual int GetOwnerID() const { return -1; }
+	virtual int GetOwnerId() const { return -1; }
 
 	/*
 		Function: NetworkClipped
diff --git a/src/game/server/eventhandler.cpp b/src/game/server/eventhandler.cpp
index bff14e5a85..ddee723277 100644
--- a/src/game/server/eventhandler.cpp
+++ b/src/game/server/eventhandler.cpp
@@ -81,11 +81,17 @@ void CEventHandler::EventToSixup(int *pType, int *pSize, const char **ppData)
 		pEvent7->m_X = pEvent->m_X;
 		pEvent7->m_Y = pEvent->m_Y;
 
+		pEvent7->m_ClientId = 0;
+		pEvent7->m_Angle = 0;
+
 		// This will need some work, perhaps an event wrapper for damageind,
 		// a scan of the event array to merge multiple damageinds
 		// or a separate array of "damage ind" events that's added in while snapping
 		pEvent7->m_HealthAmount = 1;
 
+		pEvent7->m_ArmorAmount = 0;
+		pEvent7->m_Self = 0;
+
 		*ppData = s_aEventStore;
 	}
 	else if(*pType == NETEVENTTYPE_SOUNDGLOBAL) // No more global sounds for the server
@@ -96,7 +102,7 @@ void CEventHandler::EventToSixup(int *pType, int *pSize, const char **ppData)
 		*pType = -protocol7::NETEVENTTYPE_SOUNDWORLD;
 		*pSize = sizeof(*pEvent7);
 
-		pEvent7->m_SoundID = pEvent->m_SoundID;
+		pEvent7->m_SoundId = pEvent->m_SoundId;
 		pEvent7->m_X = pEvent->m_X;
 		pEvent7->m_Y = pEvent->m_Y;
 
diff --git a/src/game/server/eventhandler.h b/src/game/server/eventhandler.h
index 4390109b2f..25b05f9820 100644
--- a/src/game/server/eventhandler.h
+++ b/src/game/server/eventhandler.h
@@ -36,7 +36,7 @@ class CEventHandler
 	template<typename T>
 	T *Create(CClientMask Mask = CClientMask().set())
 	{
-		return static_cast<T *>(Create(T::ms_MsgID, sizeof(T), Mask));
+		return static_cast<T *>(Create(T::ms_MsgId, sizeof(T), Mask));
 	}
 
 	void Clear();
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index e55cfd4db9..3b0356a8e7 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -18,6 +18,7 @@
 #include <engine/shared/json.h>
 #include <engine/shared/linereader.h>
 #include <engine/shared/memheap.h>
+#include <engine/shared/protocolglue.h>
 #include <engine/storage.h>
 
 #include <game/collision.h>
@@ -38,13 +39,13 @@
 class CClientChatLogger : public ILogger
 {
 	CGameContext *m_pGameServer;
-	int m_ClientID;
+	int m_ClientId;
 	ILogger *m_pOuterLogger;
 
 public:
-	CClientChatLogger(CGameContext *pGameServer, int ClientID, ILogger *pOuterLogger) :
+	CClientChatLogger(CGameContext *pGameServer, int ClientId, ILogger *pOuterLogger) :
 		m_pGameServer(pGameServer),
-		m_ClientID(ClientID),
+		m_ClientId(ClientId),
 		m_pOuterLogger(pOuterLogger)
 	{
 	}
@@ -59,7 +60,7 @@ void CClientChatLogger::Log(const CLogMessage *pMessage)
 		{
 			return;
 		}
-		m_pGameServer->SendChatTarget(m_ClientID, pMessage->Message());
+		m_pGameServer->SendChatTarget(m_ClientId, pMessage->Message());
 	}
 	else
 	{
@@ -104,6 +105,17 @@ void CGameContext::Construct(int Resetting)
 
 	if(Resetting == NO_RESET)
 	{
+		for(auto &pSavedTee : m_apSavedTees)
+			pSavedTee = nullptr;
+
+		for(auto &pSavedTeleTee : m_apSavedTeleTees)
+			pSavedTeleTee = nullptr;
+
+		for(auto &pSavedTeam : m_apSavedTeams)
+			pSavedTeam = nullptr;
+
+		std::fill(std::begin(m_aTeamMapping), std::end(m_aTeamMapping), -1);
+
 		m_NonEmptySince = 0;
 		m_pVoteOptionHeap = new CHeap();
 	}
@@ -118,7 +130,18 @@ void CGameContext::Destruct(int Resetting)
 		delete pPlayer;
 
 	if(Resetting == NO_RESET)
+	{
+		for(auto &pSavedTee : m_apSavedTees)
+			delete pSavedTee;
+
+		for(auto &pSavedTeleTee : m_apSavedTeleTees)
+			delete pSavedTeleTee;
+
+		for(auto &pSavedTeam : m_apSavedTeams)
+			delete pSavedTeam;
+
 		delete m_pVoteOptionHeap;
+	}
 
 	if(m_pScore)
 	{
@@ -167,26 +190,26 @@ void CGameContext::TeeHistorianWrite(const void *pData, int DataSize, void *pUse
 	aio_write(pSelf->m_pTeeHistorianFile, pData, DataSize);
 }
 
-void CGameContext::CommandCallback(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser)
+void CGameContext::CommandCallback(int ClientId, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser)
 {
 	CGameContext *pSelf = (CGameContext *)pUser;
 	if(pSelf->m_TeeHistorianActive)
 	{
-		pSelf->m_TeeHistorian.RecordConsoleCommand(ClientID, FlagMask, pCmd, pResult);
+		pSelf->m_TeeHistorian.RecordConsoleCommand(ClientId, FlagMask, pCmd, pResult);
 	}
 }
 
-CNetObj_PlayerInput CGameContext::GetLastPlayerInput(int ClientID) const
+CNetObj_PlayerInput CGameContext::GetLastPlayerInput(int ClientId) const
 {
-	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid ClientID");
-	return m_aLastPlayerInput[ClientID];
+	dbg_assert(0 <= ClientId && ClientId < MAX_CLIENTS, "invalid ClientId");
+	return m_aLastPlayerInput[ClientId];
 }
 
-class CCharacter *CGameContext::GetPlayerChar(int ClientID)
+class CCharacter *CGameContext::GetPlayerChar(int ClientId)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS || !m_apPlayers[ClientID])
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS || !m_apPlayers[ClientId])
 		return 0;
-	return m_apPlayers[ClientID]->GetCharacter();
+	return m_apPlayers[ClientId]->GetCharacter();
 }
 
 bool CGameContext::EmulateBug(int Bug)
@@ -257,7 +280,6 @@ void CGameContext::CreateDamageInd(vec2 Pos, float Angle, int Amount, CClientMas
 
 void CGameContext::CreateHammerHit(vec2 Pos, CClientMask Mask)
 {
-	// create the event
 	CNetEvent_HammerHit *pEvent = m_Events.Create<CNetEvent_HammerHit>(Mask);
 	if(pEvent)
 	{
@@ -301,7 +323,7 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
 		if(!(int)Dmg)
 			continue;
 
-		if((GetPlayerChar(Owner) ? !GetPlayerChar(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit) || NoDamage || Owner == pChr->GetPlayer()->GetCID())
+		if((GetPlayerChar(Owner) ? !GetPlayerChar(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit) || NoDamage || Owner == pChr->GetPlayer()->GetCid())
 		{
 			if(Owner != -1 && pChr->IsAlive() && !pChr->CanCollide(Owner))
 				continue;
@@ -326,7 +348,6 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
 
 void CGameContext::CreatePlayerSpawn(vec2 Pos, CClientMask Mask)
 {
-	// create the event
 	CNetEvent_Spawn *pEvent = m_Events.Create<CNetEvent_Spawn>(Mask);
 	if(pEvent)
 	{
@@ -335,15 +356,34 @@ void CGameContext::CreatePlayerSpawn(vec2 Pos, CClientMask Mask)
 	}
 }
 
-void CGameContext::CreateDeath(vec2 Pos, int ClientID, CClientMask Mask)
+void CGameContext::CreateDeath(vec2 Pos, int ClientId, CClientMask Mask)
 {
-	// create the event
 	CNetEvent_Death *pEvent = m_Events.Create<CNetEvent_Death>(Mask);
 	if(pEvent)
 	{
 		pEvent->m_X = (int)Pos.x;
 		pEvent->m_Y = (int)Pos.y;
-		pEvent->m_ClientID = ClientID;
+		pEvent->m_ClientId = ClientId;
+	}
+}
+
+void CGameContext::CreateBirthdayEffect(vec2 Pos, CClientMask Mask)
+{
+	CNetEvent_Birthday *pEvent = m_Events.Create<CNetEvent_Birthday>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+	}
+}
+
+void CGameContext::CreateFinishEffect(vec2 Pos, CClientMask Mask)
+{
+	CNetEvent_Finish *pEvent = m_Events.Create<CNetEvent_Finish>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
 	}
 }
 
@@ -358,7 +398,7 @@ void CGameContext::CreateSound(vec2 Pos, int Sound, CClientMask Mask)
 	{
 		pEvent->m_X = (int)Pos.x;
 		pEvent->m_Y = (int)Pos.y;
-		pEvent->m_SoundID = Sound;
+		pEvent->m_SoundId = Sound;
 	}
 }
 
@@ -368,7 +408,7 @@ void CGameContext::CreateSoundGlobal(int Sound, int Target) const
 		return;
 
 	CNetMsg_Sv_SoundGlobal Msg;
-	Msg.m_SoundID = Sound;
+	Msg.m_SoundId = Sound;
 	if(Target == -2)
 		Server()->SendPackMsg(&Msg, MSGFLAG_NOSEND, -1);
 	else
@@ -388,8 +428,8 @@ void CGameContext::SnapSwitchers(int SnappingClient)
 	CPlayer *pPlayer = SnappingClient != SERVER_DEMO_CLIENT ? m_apPlayers[SnappingClient] : 0;
 	int Team = pPlayer && pPlayer->GetCharacter() ? pPlayer->GetCharacter()->Team() : 0;
 
-	if(pPlayer && (pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorID != SPEC_FREEVIEW && m_apPlayers[pPlayer->m_SpectatorID] && m_apPlayers[pPlayer->m_SpectatorID]->GetCharacter())
-		Team = m_apPlayers[pPlayer->m_SpectatorID]->GetCharacter()->Team();
+	if(pPlayer && (pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorId != SPEC_FREEVIEW && m_apPlayers[pPlayer->m_SpectatorId] && m_apPlayers[pPlayer->m_SpectatorId]->GetCharacter())
+		Team = m_apPlayers[pPlayer->m_SpectatorId]->GetCharacter()->Team();
 
 	if(Team == TEAM_SUPER)
 		return;
@@ -434,11 +474,11 @@ void CGameContext::SnapSwitchers(int SnappingClient)
 	}
 }
 
-bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapID, const vec2 &To, const vec2 &From, int StartTick, int Owner, int LaserType, int Subtype, int SwitchNumber) const
+bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapId, const vec2 &To, const vec2 &From, int StartTick, int Owner, int LaserType, int Subtype, int SwitchNumber) const
 {
 	if(Context.GetClientVersion() >= VERSION_DDNET_MULTI_LASER)
 	{
-		CNetObj_DDNetLaser *pObj = Server()->SnapNewItem<CNetObj_DDNetLaser>(SnapID);
+		CNetObj_DDNetLaser *pObj = Server()->SnapNewItem<CNetObj_DDNetLaser>(SnapId);
 		if(!pObj)
 			return false;
 
@@ -455,7 +495,7 @@ bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapID, cons
 	}
 	else
 	{
-		CNetObj_Laser *pObj = Server()->SnapNewItem<CNetObj_Laser>(SnapID);
+		CNetObj_Laser *pObj = Server()->SnapNewItem<CNetObj_Laser>(SnapId);
 		if(!pObj)
 			return false;
 
@@ -469,25 +509,21 @@ bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapID, cons
 	return true;
 }
 
-bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapID, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const
+bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapId, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const
 {
 	if(Context.IsSixup())
 	{
-		protocol7::CNetObj_Pickup *pPickup = Server()->SnapNewItem<protocol7::CNetObj_Pickup>(SnapID);
+		protocol7::CNetObj_Pickup *pPickup = Server()->SnapNewItem<protocol7::CNetObj_Pickup>(SnapId);
 		if(!pPickup)
 			return false;
 
 		pPickup->m_X = (int)Pos.x;
 		pPickup->m_Y = (int)Pos.y;
-
-		if(Type == POWERUP_WEAPON)
-			pPickup->m_Type = SubType == WEAPON_SHOTGUN ? protocol7::PICKUP_SHOTGUN : SubType == WEAPON_GRENADE ? protocol7::PICKUP_GRENADE : protocol7::PICKUP_LASER;
-		else if(Type == POWERUP_NINJA)
-			pPickup->m_Type = protocol7::PICKUP_NINJA;
+		pPickup->m_Type = PickupType_SixToSeven(Type, SubType);
 	}
 	else if(Context.GetClientVersion() >= VERSION_DDNET_ENTITY_NETOBJS)
 	{
-		CNetObj_DDNetPickup *pPickup = Server()->SnapNewItem<CNetObj_DDNetPickup>(SnapID);
+		CNetObj_DDNetPickup *pPickup = Server()->SnapNewItem<CNetObj_DDNetPickup>(SnapId);
 		if(!pPickup)
 			return false;
 
@@ -499,7 +535,7 @@ bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapID, const vec
 	}
 	else
 	{
-		CNetObj_Pickup *pPickup = Server()->SnapNewItem<CNetObj_Pickup>(SnapID);
+		CNetObj_Pickup *pPickup = Server()->SnapNewItem<CNetObj_Pickup>(SnapId);
 		if(!pPickup)
 			return false;
 
@@ -520,34 +556,34 @@ bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapID, const vec
 	return true;
 }
 
-void CGameContext::CallVote(int ClientID, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc)
+void CGameContext::CallVote(int ClientId, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc)
 {
 	// check if a vote is already running
 	if(m_VoteCloseTime)
 		return;
 
 	int64_t Now = Server()->Tick();
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
 	if(!pPlayer)
 		return;
 
-	SendChat(-1, CGameContext::CHAT_ALL, pChatmsg, -1, CHAT_SIX);
+	SendChat(-1, TEAM_ALL, pChatmsg, -1, FLAG_SIX);
 	if(!pSixupDesc)
 		pSixupDesc = pDesc;
 
-	m_VoteCreator = ClientID;
+	m_VoteCreator = ClientId;
 	StartVote(pDesc, pCmd, pReason, pSixupDesc);
 	pPlayer->m_Vote = 1;
 	pPlayer->m_VotePos = m_VotePos = 1;
 	pPlayer->m_LastVoteCall = Now;
 }
 
-void CGameContext::SendChatTarget(int To, const char *pText, int Flags) const
+void CGameContext::SendChatTarget(int To, const char *pText, int VersionFlags) const
 {
 	CNetMsg_Sv_Chat Msg;
 	Msg.m_Team = 0;
-	Msg.m_ClientID = -1;
+	Msg.m_ClientId = -1;
 	Msg.m_pMessage = pText;
 
 	if(g_Config.m_SvDemoChat)
@@ -557,8 +593,8 @@ void CGameContext::SendChatTarget(int To, const char *pText, int Flags) const
 	{
 		for(int i = 0; i < Server()->MaxClients(); i++)
 		{
-			if(!((Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
-				   (!Server()->IsSixup(i) && (Flags & CHAT_SIX))))
+			if(!((Server()->IsSixup(i) && (VersionFlags & FLAG_SIXUP)) ||
+				   (!Server()->IsSixup(i) && (VersionFlags & FLAG_SIX))))
 				continue;
 
 			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
@@ -566,8 +602,8 @@ void CGameContext::SendChatTarget(int To, const char *pText, int Flags) const
 	}
 	else
 	{
-		if(!((Server()->IsSixup(To) && (Flags & CHAT_SIXUP)) ||
-			   (!Server()->IsSixup(To) && (Flags & CHAT_SIX))))
+		if(!((Server()->IsSixup(To) && (VersionFlags & FLAG_SIXUP)) ||
+			   (!Server()->IsSixup(To) && (VersionFlags & FLAG_SIX))))
 			return;
 
 		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, To);
@@ -581,31 +617,31 @@ void CGameContext::SendChatTeam(int Team, const char *pText) const
 			SendChatTarget(i, pText);
 }
 
-void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, int SpamProtectionClientID, int Flags)
+void CGameContext::SendChat(int ChatterClientId, int Team, const char *pText, int SpamProtectionClientId, int VersionFlags)
 {
-	if(SpamProtectionClientID >= 0 && SpamProtectionClientID < MAX_CLIENTS)
-		if(ProcessSpamProtection(SpamProtectionClientID))
+	if(SpamProtectionClientId >= 0 && SpamProtectionClientId < MAX_CLIENTS)
+		if(ProcessSpamProtection(SpamProtectionClientId))
 			return;
 
 	char aBuf[256], aText[256];
 	str_copy(aText, pText, sizeof(aText));
-	if(ChatterClientID >= 0 && ChatterClientID < MAX_CLIENTS)
-		str_format(aBuf, sizeof(aBuf), "%d:%d:%s: %s", ChatterClientID, Team, Server()->ClientName(ChatterClientID), aText);
-	else if(ChatterClientID == -2)
+	if(ChatterClientId >= 0 && ChatterClientId < MAX_CLIENTS)
+		str_format(aBuf, sizeof(aBuf), "%d:%d:%s: %s", ChatterClientId, Team, Server()->ClientName(ChatterClientId), aText);
+	else if(ChatterClientId == -2)
 	{
 		str_format(aBuf, sizeof(aBuf), "### %s", aText);
 		str_copy(aText, aBuf, sizeof(aText));
-		ChatterClientID = -1;
+		ChatterClientId = -1;
 	}
 	else
 		str_format(aBuf, sizeof(aBuf), "*** %s", aText);
-	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, Team != CHAT_ALL ? "teamchat" : "chat", aBuf);
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, Team != TEAM_ALL ? "teamchat" : "chat", aBuf);
 
-	if(Team == CHAT_ALL)
+	if(Team == TEAM_ALL)
 	{
 		CNetMsg_Sv_Chat Msg;
 		Msg.m_Team = 0;
-		Msg.m_ClientID = ChatterClientID;
+		Msg.m_ClientId = ChatterClientId;
 		Msg.m_pMessage = aText;
 
 		// pack one for the recording only
@@ -617,22 +653,22 @@ void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, in
 		{
 			if(!m_apPlayers[i])
 				continue;
-			bool Send = (Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
-				    (!Server()->IsSixup(i) && (Flags & CHAT_SIX));
+			bool Send = (Server()->IsSixup(i) && (VersionFlags & FLAG_SIXUP)) ||
+				    (!Server()->IsSixup(i) && (VersionFlags & FLAG_SIX));
 
 			if(!m_apPlayers[i]->m_DND && Send)
 				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
 		}
 
 		str_format(aBuf, sizeof(aBuf), "Chat: %s", aText);
-		LogEvent(aBuf, ChatterClientID);
+		LogEvent(aBuf, ChatterClientId);
 	}
 	else
 	{
 		CTeamsCore *pTeams = &m_pController->Teams().m_Core;
 		CNetMsg_Sv_Chat Msg;
 		Msg.m_Team = 1;
-		Msg.m_ClientID = ChatterClientID;
+		Msg.m_ClientId = ChatterClientId;
 		Msg.m_pMessage = aText;
 
 		// pack one for the recording only
@@ -644,16 +680,16 @@ void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, in
 		{
 			if(m_apPlayers[i] != 0)
 			{
-				if(Team == CHAT_SPEC)
+				if(Team == TEAM_SPECTATORS)
 				{
-					if(m_apPlayers[i]->GetTeam() == CHAT_SPEC)
+					if(m_apPlayers[i]->GetTeam() == TEAM_SPECTATORS)
 					{
 						Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
 					}
 				}
 				else
 				{
-					if(pTeams->Team(i) == Team && m_apPlayers[i]->GetTeam() != CHAT_SPEC)
+					if(pTeams->Team(i) == Team && m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
 					{
 						Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
 					}
@@ -663,39 +699,39 @@ void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, in
 	}
 }
 
-void CGameContext::SendStartWarning(int ClientID, const char *pMessage)
+void CGameContext::SendStartWarning(int ClientId, const char *pMessage)
 {
-	CCharacter *pChr = GetPlayerChar(ClientID);
+	CCharacter *pChr = GetPlayerChar(ClientId);
 	if(pChr && pChr->m_LastStartWarning < Server()->Tick() - 3 * Server()->TickSpeed())
 	{
-		SendChatTarget(ClientID, pMessage);
+		SendChatTarget(ClientId, pMessage);
 		pChr->m_LastStartWarning = Server()->Tick();
 	}
 }
 
-void CGameContext::SendEmoticon(int ClientID, int Emoticon, int TargetClientID) const
+void CGameContext::SendEmoticon(int ClientId, int Emoticon, int TargetClientId) const
 {
 	CNetMsg_Sv_Emoticon Msg;
-	Msg.m_ClientID = ClientID;
+	Msg.m_ClientId = ClientId;
 	Msg.m_Emoticon = Emoticon;
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, TargetClientID);
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, TargetClientId);
 }
 
-void CGameContext::SendWeaponPickup(int ClientID, int Weapon) const
+void CGameContext::SendWeaponPickup(int ClientId, int Weapon) const
 {
 	CNetMsg_Sv_WeaponPickup Msg;
 	Msg.m_Weapon = Weapon;
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CGameContext::SendMotd(int ClientID) const
+void CGameContext::SendMotd(int ClientId) const
 {
 	CNetMsg_Sv_Motd Msg;
 	Msg.m_pMessage = g_Config.m_SvMotd;
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CGameContext::SendSettings(int ClientID) const
+void CGameContext::SendSettings(int ClientId) const
 {
 	protocol7::CNetMsg_Sv_ServerSettings Msg;
 	Msg.m_KickVote = g_Config.m_SvVoteKick;
@@ -703,19 +739,19 @@ void CGameContext::SendSettings(int ClientID) const
 	Msg.m_SpecVote = g_Config.m_SvVoteSpectate;
 	Msg.m_TeamLock = 0;
 	Msg.m_TeamBalance = 0;
-	Msg.m_PlayerSlots = g_Config.m_SvMaxClients - g_Config.m_SvSpectatorSlots;
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+	Msg.m_PlayerSlots = Server()->MaxClients() - g_Config.m_SvSpectatorSlots;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 }
 
-void CGameContext::SendBroadcast(const char *pText, int ClientID, bool IsImportant)
+void CGameContext::SendBroadcast(const char *pText, int ClientId, bool IsImportant)
 {
 	CNetMsg_Sv_Broadcast Msg;
 	Msg.m_pMessage = pText;
 
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		dbg_assert(IsImportant, "broadcast messages to all players must be important");
-		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 
 		for(auto &pPlayer : m_apPlayers)
 		{
@@ -728,22 +764,21 @@ void CGameContext::SendBroadcast(const char *pText, int ClientID, bool IsImporta
 		return;
 	}
 
-	if(!m_apPlayers[ClientID])
+	if(!m_apPlayers[ClientId])
 		return;
 
-	if(!IsImportant && m_apPlayers[ClientID]->m_LastBroadcastImportance && m_apPlayers[ClientID]->m_LastBroadcast > Server()->Tick() - Server()->TickSpeed() * 10)
+	if(!IsImportant && m_apPlayers[ClientId]->m_LastBroadcastImportance && m_apPlayers[ClientId]->m_LastBroadcast > Server()->Tick() - Server()->TickSpeed() * 10)
 		return;
 
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
-	m_apPlayers[ClientID]->m_LastBroadcast = Server()->Tick();
-	m_apPlayers[ClientID]->m_LastBroadcastImportance = IsImportant;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
+	m_apPlayers[ClientId]->m_LastBroadcast = Server()->Tick();
+	m_apPlayers[ClientId]->m_LastBroadcastImportance = IsImportant;
 }
 
 void CGameContext::StartVote(const char *pDesc, const char *pCommand, const char *pReason, const char *pSixupDesc)
 {
 	// reset votes
 	m_VoteEnforce = VOTE_ENFORCE_UNKNOWN;
-	m_VoteEnforcer = -1;
 	for(auto &pPlayer : m_apPlayers)
 	{
 		if(pPlayer)
@@ -769,12 +804,12 @@ void CGameContext::EndVote()
 	SendVoteSet(-1);
 }
 
-void CGameContext::SendVoteSet(int ClientID)
+void CGameContext::SendVoteSet(int ClientId)
 {
 	::CNetMsg_Sv_VoteSet Msg6;
 	protocol7::CNetMsg_Sv_VoteSet Msg7;
 
-	Msg7.m_ClientID = m_VoteCreator;
+	Msg7.m_ClientId = m_VoteCreator;
 	if(m_VoteCloseTime)
 	{
 		Msg6.m_Timeout = Msg7.m_Timeout = (m_VoteCloseTime - time_get()) / time_freq();
@@ -801,14 +836,14 @@ void CGameContext::SendVoteSet(int ClientID)
 			Type = protocol7::VOTE_END_FAIL;
 		else if(m_VoteEnforce == VOTE_ENFORCE_YES || m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
 			Type = protocol7::VOTE_END_PASS;
-		else if(m_VoteEnforce == VOTE_ENFORCE_ABORT)
+		else if(m_VoteEnforce == VOTE_ENFORCE_ABORT || m_VoteEnforce == VOTE_ENFORCE_CANCEL)
 			Type = protocol7::VOTE_END_ABORT;
 
 		if(m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN || m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
-			Msg7.m_ClientID = -1;
+			Msg7.m_ClientId = -1;
 	}
 
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		for(int i = 0; i < Server()->MaxClients(); i++)
 		{
@@ -822,16 +857,16 @@ void CGameContext::SendVoteSet(int ClientID)
 	}
 	else
 	{
-		if(!Server()->IsSixup(ClientID))
-			Server()->SendPackMsg(&Msg6, MSGFLAG_VITAL, ClientID);
+		if(!Server()->IsSixup(ClientId))
+			Server()->SendPackMsg(&Msg6, MSGFLAG_VITAL, ClientId);
 		else
-			Server()->SendPackMsg(&Msg7, MSGFLAG_VITAL, ClientID);
+			Server()->SendPackMsg(&Msg7, MSGFLAG_VITAL, ClientId);
 	}
 }
 
-void CGameContext::SendVoteStatus(int ClientID, int Total, int Yes, int No)
+void CGameContext::SendVoteStatus(int ClientId, int Total, int Yes, int No)
 {
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 			if(Server()->ClientIngame(i))
@@ -839,7 +874,7 @@ void CGameContext::SendVoteStatus(int ClientID, int Total, int Yes, int No)
 		return;
 	}
 
-	if(Total > VANILLA_MAX_CLIENTS && m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetClientVersion() <= VERSION_DDRACE)
+	if(Total > VANILLA_MAX_CLIENTS && m_apPlayers[ClientId] && m_apPlayers[ClientId]->GetClientVersion() <= VERSION_DDRACE)
 	{
 		Yes = (Yes * VANILLA_MAX_CLIENTS) / (float)Total;
 		No = (No * VANILLA_MAX_CLIENTS) / (float)Total;
@@ -852,13 +887,13 @@ void CGameContext::SendVoteStatus(int ClientID, int Total, int Yes, int No)
 	Msg.m_No = No;
 	Msg.m_Pass = Total - (Yes + No);
 
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CGameContext::AbortVoteKickOnDisconnect(int ClientID)
+void CGameContext::AbortVoteKickOnDisconnect(int ClientId)
 {
-	if(m_VoteCloseTime && ((str_startswith(m_aVoteCommand, "kick ") && str_toint(&m_aVoteCommand[5]) == ClientID) ||
-				      (str_startswith(m_aVoteCommand, "set_team ") && str_toint(&m_aVoteCommand[9]) == ClientID)))
+	if(m_VoteCloseTime && ((str_startswith(m_aVoteCommand, "kick ") && str_toint(&m_aVoteCommand[5]) == ClientId) ||
+				      (str_startswith(m_aVoteCommand, "set_team ") && str_toint(&m_aVoteCommand[9]) == ClientId)))
 		m_VoteEnforce = VOTE_ENFORCE_ABORT;
 }
 
@@ -881,9 +916,9 @@ void CGameContext::CheckPureTuning()
 	}
 }
 
-void CGameContext::SendTuningParams(int ClientID, int Zone)
+void CGameContext::SendTuningParams(int ClientId, int Zone)
 {
-	if(ClientID == -1)
+	if(ClientId == -1)
 	{
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
@@ -914,35 +949,35 @@ void CGameContext::SendTuningParams(int ClientID, int Zone)
 
 	for(unsigned i = 0; i < sizeof(m_Tuning) / sizeof(int); i++)
 	{
-		if(m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetCharacter())
+		if(m_apPlayers[ClientId] && m_apPlayers[ClientId]->GetCharacter())
 		{
 			if((i == 30) // laser_damage is removed from 0.7
-				&& (Server()->IsSixup(ClientID)))
+				&& (Server()->IsSixup(ClientId)))
 			{
 				continue;
 			}
 			else if((i == 31) // collision
-				&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOCOLL))
+				&& (m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOCOLL))
 			{
 				Msg.AddInt(0);
 			}
 			else if((i == 32) // hooking
-				&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHOOK))
+				&& (m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHOOK))
 			{
 				Msg.AddInt(0);
 			}
 			else if((i == 3) // ground jump impulse
-				&& m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOJUMP)
+				&& m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOJUMP)
 			{
 				Msg.AddInt(0);
 			}
 			else if((i == 33) // jetpack
-				&& !(m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_JETPACK))
+				&& !(m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_JETPACK))
 			{
 				Msg.AddInt(0);
 			}
 			else if((i == 36) // hammer hit
-				&& m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHAMMER)
+				&& m_apPlayers[ClientId]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHAMMER)
 			{
 				Msg.AddInt(0);
 			}
@@ -954,7 +989,7 @@ void CGameContext::SendTuningParams(int ClientID, int Zone)
 		else
 			Msg.AddInt(pParams[i]); // if everything is normal just send true tunings
 	}
-	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
 void CGameContext::OnPreTickTeehistorian()
@@ -1031,7 +1066,14 @@ void CGameContext::OnTick()
 		// abort the kick-vote on player-leave
 		if(m_VoteEnforce == VOTE_ENFORCE_ABORT)
 		{
-			SendChat(-1, CGameContext::CHAT_ALL, "Vote aborted");
+			SendChat(-1, TEAM_ALL, "Vote aborted");
+			EndVote();
+		}
+		else if(m_VoteEnforce == VOTE_ENFORCE_CANCEL)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "'%s' canceled their vote", Server()->ClientName(m_VoteCreator));
+			SendChat(-1, TEAM_ALL, aBuf);
 			EndVote();
 		}
 		else
@@ -1041,16 +1083,16 @@ void CGameContext::OnTick()
 			if(m_VoteUpdate)
 			{
 				// count votes
-				char aaBuf[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}}, *pIP = NULL;
+				char aaBuf[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}}, *pIp = NULL;
 				bool SinglePlayer = true;
 				for(int i = 0; i < MAX_CLIENTS; i++)
 				{
 					if(m_apPlayers[i])
 					{
 						Server()->GetClientAddr(i, aaBuf[i], NETADDR_MAXSTRSIZE);
-						if(!pIP)
-							pIP = aaBuf[i];
-						else if(SinglePlayer && str_comp(pIP, aaBuf[i]))
+						if(!pIp)
+							pIp = aaBuf[i];
+						else if(SinglePlayer && str_comp(pIp, aaBuf[i]))
 							SinglePlayer = false;
 					}
 				}
@@ -1156,34 +1198,34 @@ void CGameContext::OnTick()
 			if(m_VoteEnforce == VOTE_ENFORCE_YES && !(PlayerModerating() &&
 									(IsKickVote() || IsSpecVote()) && time_get() < m_VoteCloseTime))
 			{
-				Server()->SetRconCID(IServer::RCON_CID_VOTE);
+				Server()->SetRconCid(IServer::RCON_CID_VOTE);
 				Console()->ExecuteLine(m_aVoteCommand);
-				Server()->SetRconCID(IServer::RCON_CID_SERV);
+				Server()->SetRconCid(IServer::RCON_CID_SERV);
 				EndVote();
-				SendChat(-1, CGameContext::CHAT_ALL, "Vote passed", -1, CHAT_SIX);
+				SendChat(-1, TEAM_ALL, "Vote passed", -1, FLAG_SIX);
 
 				if(m_apPlayers[m_VoteCreator] && !IsKickVote() && !IsSpecVote())
 					m_apPlayers[m_VoteCreator]->m_LastVoteCall = 0;
 			}
 			else if(m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
 			{
-				Console()->ExecuteLine(m_aVoteCommand, m_VoteEnforcer);
-				SendChat(-1, CGameContext::CHAT_ALL, "Vote passed enforced by authorized player", -1, CHAT_SIX);
+				Console()->ExecuteLine(m_aVoteCommand, m_VoteCreator);
+				SendChat(-1, TEAM_ALL, "Vote passed enforced by authorized player", -1, FLAG_SIX);
 				EndVote();
 			}
 			else if(m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN)
 			{
 				EndVote();
-				SendChat(-1, CGameContext::CHAT_ALL, "Vote failed enforced by authorized player", -1, CHAT_SIX);
+				SendChat(-1, TEAM_ALL, "Vote failed enforced by authorized player", -1, FLAG_SIX);
 			}
 			//else if(m_VoteEnforce == VOTE_ENFORCE_NO || time_get() > m_VoteCloseTime)
 			else if(m_VoteEnforce == VOTE_ENFORCE_NO || (time_get() > m_VoteCloseTime && g_Config.m_SvVoteMajority))
 			{
 				EndVote();
 				if(VetoStop || (m_VoteWillPass && Veto))
-					SendChat(-1, CGameContext::CHAT_ALL, "Vote failed because of veto. Find an empty server instead", -1, CHAT_SIX);
+					SendChat(-1, TEAM_ALL, "Vote failed because of veto. Find an empty server instead", -1, FLAG_SIX);
 				else
-					SendChat(-1, CGameContext::CHAT_ALL, "Vote failed", -1, CHAT_SIX);
+					SendChat(-1, TEAM_ALL, "Vote failed", -1, FLAG_SIX);
 			}
 			else if(m_VoteUpdate)
 			{
@@ -1211,9 +1253,9 @@ void CGameContext::OnTick()
 
 	if(Server()->Tick() % (g_Config.m_SvAnnouncementInterval * Server()->TickSpeed() * 60) == 0)
 	{
-		const char *pLine = Server()->GetAnnouncementLine(g_Config.m_SvAnnouncementFileName);
+		const char *pLine = Server()->GetAnnouncementLine();
 		if(pLine)
-			SendChat(-1, CGameContext::CHAT_ALL, pLine);
+			SendChat(-1, TEAM_ALL, pLine);
 	}
 
 	for(auto &Switcher : Switchers())
@@ -1239,8 +1281,8 @@ void CGameContext::OnTick()
 	{
 		if(m_SqlRandomMapResult->m_Success)
 		{
-			if(PlayerExists(m_SqlRandomMapResult->m_ClientID) && m_SqlRandomMapResult->m_aMessage[0] != '\0')
-				SendChatTarget(m_SqlRandomMapResult->m_ClientID, m_SqlRandomMapResult->m_aMessage);
+			if(PlayerExists(m_SqlRandomMapResult->m_ClientId) && m_SqlRandomMapResult->m_aMessage[0] != '\0')
+				SendChat(-1, TEAM_ALL, m_SqlRandomMapResult->m_aMessage);
 			if(m_SqlRandomMapResult->m_aMap[0] != '\0')
 				Server()->ChangeMap(m_SqlRandomMapResult->m_aMap);
 			else
@@ -1271,66 +1313,54 @@ void CGameContext::OnTick()
 	// Warning: do not put code in this function directly above or below this comment
 }
 
-static int PlayerFlags_SevenToSix(int Flags)
-{
-	int Six = 0;
-	if(Flags & protocol7::PLAYERFLAG_CHATTING)
-		Six |= PLAYERFLAG_CHATTING;
-	if(Flags & protocol7::PLAYERFLAG_SCOREBOARD)
-		Six |= PLAYERFLAG_SCOREBOARD;
-	if(Flags & protocol7::PLAYERFLAG_AIM)
-		Six |= PLAYERFLAG_AIM;
-	return Six;
-}
-
 // Server hooks
-void CGameContext::OnClientPrepareInput(int ClientID, void *pInput)
+void CGameContext::OnClientPrepareInput(int ClientId, void *pInput)
 {
 	auto *pPlayerInput = (CNetObj_PlayerInput *)pInput;
-	if(Server()->IsSixup(ClientID))
+	if(Server()->IsSixup(ClientId))
 		pPlayerInput->m_PlayerFlags = PlayerFlags_SevenToSix(pPlayerInput->m_PlayerFlags);
 }
 
-void CGameContext::OnClientDirectInput(int ClientID, void *pInput)
+void CGameContext::OnClientDirectInput(int ClientId, void *pInput)
 {
 	if(!m_World.m_Paused)
-		m_apPlayers[ClientID]->OnDirectInput((CNetObj_PlayerInput *)pInput);
+		m_apPlayers[ClientId]->OnDirectInput((CNetObj_PlayerInput *)pInput);
 
 	int Flags = ((CNetObj_PlayerInput *)pInput)->m_PlayerFlags;
 	if((Flags & 256) || (Flags & 512))
 	{
-		Server()->Kick(ClientID, "please update your client or use DDNet client");
+		Server()->Kick(ClientId, "please update your client or use DDNet client");
 	}
 }
 
-void CGameContext::OnClientPredictedInput(int ClientID, void *pInput)
+void CGameContext::OnClientPredictedInput(int ClientId, void *pInput)
 {
 	// early return if no input at all has been sent by a player
-	if(pInput == nullptr && !m_aPlayerHasInput[ClientID])
+	if(pInput == nullptr && !m_aPlayerHasInput[ClientId])
 		return;
 
 	// set to last sent input when no new input has been sent
 	CNetObj_PlayerInput *pApplyInput = (CNetObj_PlayerInput *)pInput;
 	if(pApplyInput == nullptr)
 	{
-		pApplyInput = &m_aLastPlayerInput[ClientID];
+		pApplyInput = &m_aLastPlayerInput[ClientId];
 	}
 
 	if(!m_World.m_Paused)
-		m_apPlayers[ClientID]->OnPredictedInput(pApplyInput);
+		m_apPlayers[ClientId]->OnPredictedInput(pApplyInput);
 }
 
-void CGameContext::OnClientPredictedEarlyInput(int ClientID, void *pInput)
+void CGameContext::OnClientPredictedEarlyInput(int ClientId, void *pInput)
 {
 	// early return if no input at all has been sent by a player
-	if(pInput == nullptr && !m_aPlayerHasInput[ClientID])
+	if(pInput == nullptr && !m_aPlayerHasInput[ClientId])
 		return;
 
 	// set to last sent input when no new input has been sent
 	CNetObj_PlayerInput *pApplyInput = (CNetObj_PlayerInput *)pInput;
 	if(pApplyInput == nullptr)
 	{
-		pApplyInput = &m_aLastPlayerInput[ClientID];
+		pApplyInput = &m_aLastPlayerInput[ClientId];
 	}
 	else
 	{
@@ -1338,16 +1368,16 @@ void CGameContext::OnClientPredictedEarlyInput(int ClientID, void *pInput)
 		// because this function is called on all inputs, while
 		// `OnClientPredictedInput` is only called on the first input of each
 		// tick.
-		mem_copy(&m_aLastPlayerInput[ClientID], pApplyInput, sizeof(m_aLastPlayerInput[ClientID]));
-		m_aPlayerHasInput[ClientID] = true;
+		mem_copy(&m_aLastPlayerInput[ClientId], pApplyInput, sizeof(m_aLastPlayerInput[ClientId]));
+		m_aPlayerHasInput[ClientId] = true;
 	}
 
 	if(!m_World.m_Paused)
-		m_apPlayers[ClientID]->OnPredictedEarlyInput(pApplyInput);
+		m_apPlayers[ClientId]->OnPredictedEarlyInput(pApplyInput);
 
 	if(m_TeeHistorianActive)
 	{
-		m_TeeHistorian.RecordPlayerInput(ClientID, m_apPlayers[ClientID]->GetUniqueCID(), pApplyInput);
+		m_TeeHistorian.RecordPlayerInput(ClientId, m_apPlayers[ClientId]->GetUniqueCid(), pApplyInput);
 	}
 }
 
@@ -1364,9 +1394,9 @@ const CVoteOptionServer *CGameContext::GetVoteOption(int Index) const
 	return pCurrent;
 }
 
-void CGameContext::ProgressVoteOptions(int ClientID)
+void CGameContext::ProgressVoteOptions(int ClientId)
 {
-	CPlayer *pPl = m_apPlayers[ClientID];
+	CPlayer *pPl = m_apPlayers[ClientId];
 
 	if(pPl->m_SendVoteIndex == -1)
 		return; // we didn't start sending options yet
@@ -1432,46 +1462,42 @@ void CGameContext::ProgressVoteOptions(int ClientID)
 	}
 
 	// send msg
+	if(pPl->m_SendVoteIndex == 0)
+	{
+		CNetMsg_Sv_VoteOptionGroupStart StartMsg;
+		Server()->SendPackMsg(&StartMsg, MSGFLAG_VITAL, ClientId);
+	}
+
 	OptionMsg.m_NumOptions = NumVotesToSend;
-	Server()->SendPackMsg(&OptionMsg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&OptionMsg, MSGFLAG_VITAL, ClientId);
 
 	pPl->m_SendVoteIndex += NumVotesToSend;
+
+	if(pPl->m_SendVoteIndex == m_NumVoteOptions)
+	{
+		CNetMsg_Sv_VoteOptionGroupEnd EndMsg;
+		Server()->SendPackMsg(&EndMsg, MSGFLAG_VITAL, ClientId);
+	}
 }
 
-void CGameContext::OnClientEnter(int ClientID)
+void CGameContext::OnClientEnter(int ClientId)
 {
 	if(m_TeeHistorianActive)
 	{
-		m_TeeHistorian.RecordPlayerReady(ClientID);
+		m_TeeHistorian.RecordPlayerReady(ClientId);
 	}
-	m_pController->OnPlayerConnect(m_apPlayers[ClientID]);
+	m_pController->OnPlayerConnect(m_apPlayers[ClientId]);
 
-	if(Server()->IsSixup(ClientID))
 	{
-		{
-			protocol7::CNetMsg_Sv_GameInfo Msg;
-			Msg.m_GameFlags = protocol7::GAMEFLAG_RACE;
-			Msg.m_MatchCurrent = 1;
-			Msg.m_MatchNum = 0;
-			Msg.m_ScoreLimit = 0;
-			Msg.m_TimeLimit = 0;
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
-		}
-
-		// /team is essential
-		{
-			protocol7::CNetMsg_Sv_CommandInfoRemove Msg;
-			Msg.m_pName = "team";
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
-		}
+		CNetMsg_Sv_CommandInfoGroupStart Msg;
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 	}
-
 	for(const IConsole::CCommandInfo *pCmd = Console()->FirstCommandInfo(IConsole::ACCESS_LEVEL_USER, CFGFLAG_CHAT);
 		pCmd; pCmd = pCmd->NextCommandInfo(IConsole::ACCESS_LEVEL_USER, CFGFLAG_CHAT))
 	{
 		const char *pName = pCmd->m_pName;
 
-		if(Server()->IsSixup(ClientID))
+		if(Server()->IsSixup(ClientId))
 		{
 			if(!str_comp_nocase(pName, "w") || !str_comp_nocase(pName, "whisper"))
 				continue;
@@ -1483,7 +1509,7 @@ void CGameContext::OnClientEnter(int ClientID)
 			Msg.m_pName = pName;
 			Msg.m_pArgsFormat = pCmd->m_pParams;
 			Msg.m_pHelpText = pCmd->m_pHelp;
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 		}
 		else
 		{
@@ -1491,15 +1517,19 @@ void CGameContext::OnClientEnter(int ClientID)
 			Msg.m_pName = pName;
 			Msg.m_pArgsFormat = pCmd->m_pParams;
 			Msg.m_pHelpText = pCmd->m_pHelp;
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 		}
 	}
+	{
+		CNetMsg_Sv_CommandInfoGroupEnd Msg;
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
+	}
 
 	{
 		int Empty = -1;
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(!Server()->ClientIngame(i))
+			if(Server()->ClientSlotEmpty(i))
 			{
 				Empty = i;
 				break;
@@ -1507,55 +1537,55 @@ void CGameContext::OnClientEnter(int ClientID)
 		}
 		CNetMsg_Sv_Chat Msg;
 		Msg.m_Team = 0;
-		Msg.m_ClientID = Empty;
+		Msg.m_ClientId = Empty;
 		Msg.m_pMessage = "Do you know someone who uses a bot? Please report them to the moderators.";
-		m_apPlayers[ClientID]->m_EligibleForFinishCheck = time_get();
-		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		m_apPlayers[ClientId]->m_EligibleForFinishCheck = time_get();
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 	}
 
 	IServer::CClientInfo Info;
-	if(Server()->GetClientInfo(ClientID, &Info) && Info.m_GotDDNetVersion)
+	if(Server()->GetClientInfo(ClientId, &Info) && Info.m_GotDDNetVersion)
 	{
-		if(OnClientDDNetVersionKnown(ClientID))
+		if(OnClientDDNetVersionKnown(ClientId))
 			return; // kicked
 	}
 
-	if(!Server()->ClientPrevIngame(ClientID))
+	if(!Server()->ClientPrevIngame(ClientId))
 	{
 		if(g_Config.m_SvWelcome[0] != 0)
-			SendChatTarget(ClientID, g_Config.m_SvWelcome);
+			SendChatTarget(ClientId, g_Config.m_SvWelcome);
 
 		if(g_Config.m_SvShowOthersDefault > SHOW_OTHERS_OFF)
 		{
 			if(g_Config.m_SvShowOthers)
-				SendChatTarget(ClientID, "You can see other players. To disable this use DDNet client and type /showothers");
+				SendChatTarget(ClientId, "You can see other players. To disable this use DDNet client and type /showothers");
 
-			m_apPlayers[ClientID]->m_ShowOthers = g_Config.m_SvShowOthersDefault;
+			m_apPlayers[ClientId]->m_ShowOthers = g_Config.m_SvShowOthersDefault;
 		}
 	}
 	m_VoteUpdate = true;
 
 	// send active vote
 	if(m_VoteCloseTime)
-		SendVoteSet(ClientID);
+		SendVoteSet(ClientId);
 
 	Server()->ExpireServerInfo();
 
-	CPlayer *pNewPlayer = m_apPlayers[ClientID];
-	mem_zero(&m_aLastPlayerInput[ClientID], sizeof(m_aLastPlayerInput[ClientID]));
-	m_aPlayerHasInput[ClientID] = false;
+	CPlayer *pNewPlayer = m_apPlayers[ClientId];
+	mem_zero(&m_aLastPlayerInput[ClientId], sizeof(m_aLastPlayerInput[ClientId]));
+	m_aPlayerHasInput[ClientId] = false;
 
 	// new info for others
 	protocol7::CNetMsg_Sv_ClientInfo NewClientInfoMsg;
-	NewClientInfoMsg.m_ClientID = ClientID;
+	NewClientInfoMsg.m_ClientId = ClientId;
 	NewClientInfoMsg.m_Local = 0;
 	NewClientInfoMsg.m_Team = pNewPlayer->GetTeam();
-	NewClientInfoMsg.m_pName = Server()->ClientName(ClientID);
-	NewClientInfoMsg.m_pClan = Server()->ClientClan(ClientID);
-	NewClientInfoMsg.m_Country = Server()->ClientCountry(ClientID);
+	NewClientInfoMsg.m_pName = Server()->ClientName(ClientId);
+	NewClientInfoMsg.m_pClan = Server()->ClientClan(ClientId);
+	NewClientInfoMsg.m_Country = Server()->ClientCountry(ClientId);
 	NewClientInfoMsg.m_Silent = false;
 
-	for(int p = 0; p < 6; p++)
+	for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 	{
 		NewClientInfoMsg.m_apSkinPartNames[p] = pNewPlayer->m_TeeInfos.m_apSkinPartNames[p];
 		NewClientInfoMsg.m_aUseCustomColors[p] = pNewPlayer->m_TeeInfos.m_aUseCustomColors[p];
@@ -1565,7 +1595,7 @@ void CGameContext::OnClientEnter(int ClientID)
 	// update client infos (others before local)
 	for(int i = 0; i < Server()->MaxClients(); ++i)
 	{
-		if(i == ClientID || !m_apPlayers[i] || !Server()->ClientIngame(i))
+		if(i == ClientId || !m_apPlayers[i] || !Server()->ClientIngame(i))
 			continue;
 
 		CPlayer *pPlayer = m_apPlayers[i];
@@ -1573,11 +1603,11 @@ void CGameContext::OnClientEnter(int ClientID)
 		if(Server()->IsSixup(i))
 			Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
 
-		if(Server()->IsSixup(ClientID))
+		if(Server()->IsSixup(ClientId))
 		{
 			// existing infos for new player
 			protocol7::CNetMsg_Sv_ClientInfo ClientInfoMsg;
-			ClientInfoMsg.m_ClientID = i;
+			ClientInfoMsg.m_ClientId = i;
 			ClientInfoMsg.m_Local = 0;
 			ClientInfoMsg.m_Team = pPlayer->GetTeam();
 			ClientInfoMsg.m_pName = Server()->ClientName(i);
@@ -1585,51 +1615,51 @@ void CGameContext::OnClientEnter(int ClientID)
 			ClientInfoMsg.m_Country = Server()->ClientCountry(i);
 			ClientInfoMsg.m_Silent = 0;
 
-			for(int p = 0; p < 6; p++)
+			for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 			{
 				ClientInfoMsg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
 				ClientInfoMsg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
 				ClientInfoMsg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
 			}
 
-			Server()->SendPackMsg(&ClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+			Server()->SendPackMsg(&ClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 		}
 	}
 
 	// local info
-	if(Server()->IsSixup(ClientID))
+	if(Server()->IsSixup(ClientId))
 	{
 		NewClientInfoMsg.m_Local = 1;
-		Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 	}
 
 	// initial chat delay
-	if(g_Config.m_SvChatInitialDelay != 0 && m_apPlayers[ClientID]->m_JoinTick > m_NonEmptySince + 10 * Server()->TickSpeed())
+	if(g_Config.m_SvChatInitialDelay != 0 && m_apPlayers[ClientId]->m_JoinTick > m_NonEmptySince + 10 * Server()->TickSpeed())
 	{
 		char aBuf[128];
 		NETADDR Addr;
-		Server()->GetClientAddr(ClientID, &Addr);
+		Server()->GetClientAddr(ClientId, &Addr);
 		str_format(aBuf, sizeof(aBuf), "This server has an initial chat delay, you will need to wait %d seconds before talking.", g_Config.m_SvChatInitialDelay);
-		SendChatTarget(ClientID, aBuf);
-		Mute(&Addr, g_Config.m_SvChatInitialDelay, Server()->ClientName(ClientID), "Initial chat delay", true);
+		SendChatTarget(ClientId, aBuf);
+		Mute(&Addr, g_Config.m_SvChatInitialDelay, Server()->ClientName(ClientId), "Initial chat delay", true);
 	}
 
-	LogEvent("Connect", ClientID);
+	LogEvent("Connect", ClientId);
 }
 
-bool CGameContext::OnClientDataPersist(int ClientID, void *pData)
+bool CGameContext::OnClientDataPersist(int ClientId, void *pData)
 {
 	CPersistentClientData *pPersistent = (CPersistentClientData *)pData;
-	if(!m_apPlayers[ClientID])
+	if(!m_apPlayers[ClientId])
 	{
 		return false;
 	}
-	pPersistent->m_IsSpectator = m_apPlayers[ClientID]->GetTeam() == TEAM_SPECTATORS;
-	pPersistent->m_IsAfk = m_apPlayers[ClientID]->IsAfk();
+	pPersistent->m_IsSpectator = m_apPlayers[ClientId]->GetTeam() == TEAM_SPECTATORS;
+	pPersistent->m_IsAfk = m_apPlayers[ClientId]->IsAfk();
 	return true;
 }
 
-void CGameContext::OnClientConnected(int ClientID, void *pData)
+void CGameContext::OnClientConnected(int ClientId, void *pData)
 {
 	CPersistentClientData *pPersistentData = (CPersistentClientData *)pData;
 	bool Spec = false;
@@ -1645,7 +1675,7 @@ void CGameContext::OnClientConnected(int ClientID, void *pData)
 		for(auto &pPlayer : m_apPlayers)
 		{
 			// connecting clients with spoofed ips can clog slots without being ingame
-			if(pPlayer && Server()->ClientIngame(pPlayer->GetCID()))
+			if(pPlayer && Server()->ClientIngame(pPlayer->GetCid()))
 			{
 				Empty = false;
 				break;
@@ -1658,47 +1688,58 @@ void CGameContext::OnClientConnected(int ClientID, void *pData)
 	}
 
 	// Check which team the player should be on
-	const int StartTeam = (Spec || g_Config.m_SvTournamentMode) ? TEAM_SPECTATORS : m_pController->GetAutoTeam(ClientID);
+	const int StartTeam = (Spec || g_Config.m_SvTournamentMode) ? TEAM_SPECTATORS : m_pController->GetAutoTeam(ClientId);
 
-	if(m_apPlayers[ClientID])
-		delete m_apPlayers[ClientID];
-	m_apPlayers[ClientID] = new(ClientID) CPlayer(this, NextUniqueClientID, ClientID, StartTeam);
-	m_apPlayers[ClientID]->SetInitialAfk(Afk);
-	NextUniqueClientID += 1;
+	if(m_apPlayers[ClientId])
+		delete m_apPlayers[ClientId];
+	m_apPlayers[ClientId] = new(ClientId) CPlayer(this, NextUniqueClientId, ClientId, StartTeam);
+	m_apPlayers[ClientId]->SetInitialAfk(Afk);
+	NextUniqueClientId += 1;
 
-	SendMotd(ClientID);
-	SendSettings(ClientID);
+	SendMotd(ClientId);
+	SendSettings(ClientId);
 
 	Server()->ExpireServerInfo();
 }
 
-void CGameContext::OnClientDrop(int ClientID, const char *pReason)
+void CGameContext::OnClientDrop(int ClientId, const char *pReason)
 {
-	LogEvent("Disconnect", ClientID);
+	LogEvent("Disconnect", ClientId);
+
+	AbortVoteKickOnDisconnect(ClientId);
+	m_pController->OnPlayerDisconnect(m_apPlayers[ClientId], pReason);
+	delete m_apPlayers[ClientId];
+	m_apPlayers[ClientId] = 0;
+
+	delete m_apSavedTeams[ClientId];
+	m_apSavedTeams[ClientId] = nullptr;
+
+	delete m_apSavedTees[ClientId];
+	m_apSavedTees[ClientId] = nullptr;
 
-	AbortVoteKickOnDisconnect(ClientID);
-	m_pController->OnPlayerDisconnect(m_apPlayers[ClientID], pReason);
-	delete m_apPlayers[ClientID];
-	m_apPlayers[ClientID] = 0;
+	delete m_apSavedTeleTees[ClientId];
+	m_apSavedTeleTees[ClientId] = nullptr;
+
+	m_aTeamMapping[ClientId] = -1;
 
 	m_VoteUpdate = true;
 
 	// update spectator modes
 	for(auto &pPlayer : m_apPlayers)
 	{
-		if(pPlayer && pPlayer->m_SpectatorID == ClientID)
-			pPlayer->m_SpectatorID = SPEC_FREEVIEW;
+		if(pPlayer && pPlayer->m_SpectatorId == ClientId)
+			pPlayer->m_SpectatorId = SPEC_FREEVIEW;
 	}
 
 	// update conversation targets
 	for(auto &pPlayer : m_apPlayers)
 	{
-		if(pPlayer && pPlayer->m_LastWhisperTo == ClientID)
+		if(pPlayer && pPlayer->m_LastWhisperTo == ClientId)
 			pPlayer->m_LastWhisperTo = -1;
 	}
 
 	protocol7::CNetMsg_Sv_ClientDrop Msg;
-	Msg.m_ClientID = ClientID;
+	Msg.m_ClientId = ClientId;
 	Msg.m_pReason = pReason;
 	Msg.m_Silent = false;
 	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
@@ -1714,92 +1755,116 @@ void CGameContext::TeehistorianRecordAntibot(const void *pData, int DataSize)
 	}
 }
 
-void CGameContext::TeehistorianRecordPlayerJoin(int ClientID, bool Sixup)
+void CGameContext::TeehistorianRecordPlayerJoin(int ClientId, bool Sixup)
 {
 	if(m_TeeHistorianActive)
 	{
-		m_TeeHistorian.RecordPlayerJoin(ClientID, !Sixup ? CTeeHistorian::PROTOCOL_6 : CTeeHistorian::PROTOCOL_7);
+		m_TeeHistorian.RecordPlayerJoin(ClientId, !Sixup ? CTeeHistorian::PROTOCOL_6 : CTeeHistorian::PROTOCOL_7);
 	}
 }
 
-void CGameContext::TeehistorianRecordPlayerDrop(int ClientID, const char *pReason)
+void CGameContext::TeehistorianRecordPlayerDrop(int ClientId, const char *pReason)
 {
 	if(m_TeeHistorianActive)
 	{
-		m_TeeHistorian.RecordPlayerDrop(ClientID, pReason);
+		m_TeeHistorian.RecordPlayerDrop(ClientId, pReason);
 	}
 }
 
-void CGameContext::TeehistorianRecordPlayerRejoin(int ClientID)
+void CGameContext::TeehistorianRecordPlayerRejoin(int ClientId)
 {
 	if(m_TeeHistorianActive)
 	{
-		m_TeeHistorian.RecordPlayerRejoin(ClientID);
+		m_TeeHistorian.RecordPlayerRejoin(ClientId);
 	}
 }
 
-bool CGameContext::OnClientDDNetVersionKnown(int ClientID)
+void CGameContext::TeehistorianRecordPlayerName(int ClientId, const char *pName)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerName(ClientId, pName);
+	}
+}
+
+void CGameContext::TeehistorianRecordPlayerFinish(int ClientId, int TimeTicks)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerFinish(ClientId, TimeTicks);
+	}
+}
+
+void CGameContext::TeehistorianRecordTeamFinish(int TeamId, int TimeTicks)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordTeamFinish(TeamId, TimeTicks);
+	}
+}
+
+bool CGameContext::OnClientDDNetVersionKnown(int ClientId)
 {
 	IServer::CClientInfo Info;
-	dbg_assert(Server()->GetClientInfo(ClientID, &Info), "failed to get client info");
+	dbg_assert(Server()->GetClientInfo(ClientId, &Info), "failed to get client info");
 	int ClientVersion = Info.m_DDNetVersion;
-	dbg_msg("ddnet", "cid=%d version=%d", ClientID, ClientVersion);
+	dbg_msg("ddnet", "cid=%d version=%d", ClientId, ClientVersion);
 
 	if(m_TeeHistorianActive)
 	{
-		if(Info.m_pConnectionID && Info.m_pDDNetVersionStr)
+		if(Info.m_pConnectionId && Info.m_pDDNetVersionStr)
 		{
-			m_TeeHistorian.RecordDDNetVersion(ClientID, *Info.m_pConnectionID, ClientVersion, Info.m_pDDNetVersionStr);
+			m_TeeHistorian.RecordDDNetVersion(ClientId, *Info.m_pConnectionId, ClientVersion, Info.m_pDDNetVersionStr);
 		}
 		else
 		{
-			m_TeeHistorian.RecordDDNetVersionOld(ClientID, ClientVersion);
+			m_TeeHistorian.RecordDDNetVersionOld(ClientId, ClientVersion);
 		}
 	}
 
 	// Autoban known bot versions.
 	if(g_Config.m_SvBannedVersions[0] != '\0' && IsVersionBanned(ClientVersion))
 	{
-		Server()->Kick(ClientID, "unsupported client");
+		Server()->Kick(ClientId, "unsupported client");
 		return true;
 	}
 
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if(ClientVersion >= VERSION_DDNET_GAMETICK)
 		pPlayer->m_TimerType = g_Config.m_SvDefaultTimerType;
 
 	// First update the teams state.
-	m_pController->Teams().SendTeamsState(ClientID);
+	m_pController->Teams().SendTeamsState(ClientId);
 
 	// Then send records.
-	SendRecord(ClientID);
+	SendRecord(ClientId);
 
 	// And report correct tunings.
 	if(ClientVersion < VERSION_DDNET_EARLY_VERSION)
-		SendTuningParams(ClientID, pPlayer->m_TuneZone);
+		SendTuningParams(ClientId, pPlayer->m_TuneZone);
 
 	// Tell old clients to update.
 	if(ClientVersion < VERSION_DDNET_UPDATER_FIXED && g_Config.m_SvClientSuggestionOld[0] != '\0')
-		SendBroadcast(g_Config.m_SvClientSuggestionOld, ClientID);
+		SendBroadcast(g_Config.m_SvClientSuggestionOld, ClientId);
 	// Tell known bot clients that they're botting and we know it.
 	if(((ClientVersion >= 15 && ClientVersion < 100) || ClientVersion == 502) && g_Config.m_SvClientSuggestionBot[0] != '\0')
-		SendBroadcast(g_Config.m_SvClientSuggestionBot, ClientID);
+		SendBroadcast(g_Config.m_SvClientSuggestionBot, ClientId);
 
 	return false;
 }
 
-void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientID)
+void *CGameContext::PreProcessMsg(int *pMsgId, CUnpacker *pUnpacker, int ClientId)
 {
-	if(Server()->IsSixup(ClientID) && *pMsgID < OFFSET_UUID)
+	if(Server()->IsSixup(ClientId) && *pMsgId < OFFSET_UUID)
 	{
-		void *pRawMsg = m_NetObjHandler7.SecureUnpackMsg(*pMsgID, pUnpacker);
+		void *pRawMsg = m_NetObjHandler7.SecureUnpackMsg(*pMsgId, pUnpacker);
 		if(!pRawMsg)
 			return 0;
 
-		CPlayer *pPlayer = m_apPlayers[ClientID];
+		CPlayer *pPlayer = m_apPlayers[ClientId];
 		static char s_aRawMsg[1024];
 
-		if(*pMsgID == protocol7::NETMSGTYPE_CL_SAY)
+		if(*pMsgId == protocol7::NETMSGTYPE_CL_SAY)
 		{
 			protocol7::CNetMsg_Cl_Say *pMsg7 = (protocol7::CNetMsg_Cl_Say *)pRawMsg;
 			// Should probably use a placement new to start the lifetime of the object to avoid future weirdness
@@ -1807,18 +1872,18 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 
 			if(pMsg7->m_Target >= 0)
 			{
-				if(ProcessSpamProtection(ClientID))
+				if(ProcessSpamProtection(ClientId))
 					return 0;
 
 				// Should we maybe recraft the message so that it can go through the usual path?
-				WhisperID(ClientID, pMsg7->m_Target, pMsg7->m_pMessage);
+				WhisperId(ClientId, pMsg7->m_Target, pMsg7->m_pMessage);
 				return 0;
 			}
 
 			pMsg->m_Team = pMsg7->m_Mode == protocol7::CHAT_TEAM;
 			pMsg->m_pMessage = pMsg7->m_pMessage;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_STARTINFO)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_STARTINFO)
 		{
 			protocol7::CNetMsg_Cl_StartInfo *pMsg7 = (protocol7::CNetMsg_Cl_StartInfo *)pRawMsg;
 			::CNetMsg_Cl_StartInfo *pMsg = (::CNetMsg_Cl_StartInfo *)s_aRawMsg;
@@ -1838,7 +1903,7 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 			pMsg->m_ColorBody = pPlayer->m_TeeInfos.m_ColorBody;
 			pMsg->m_ColorFeet = pPlayer->m_TeeInfos.m_ColorFeet;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SKINCHANGE)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_SKINCHANGE)
 		{
 			protocol7::CNetMsg_Cl_SkinChange *pMsg = (protocol7::CNetMsg_Cl_SkinChange *)pRawMsg;
 			if(g_Config.m_SvSpamprotection && pPlayer->m_LastChangeInfo &&
@@ -1852,8 +1917,8 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 			pPlayer->m_TeeInfos = Info;
 
 			protocol7::CNetMsg_Sv_SkinChange Msg;
-			Msg.m_ClientID = ClientID;
-			for(int p = 0; p < 6; p++)
+			Msg.m_ClientId = ClientId;
+			for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 			{
 				Msg.m_apSkinPartNames[p] = pMsg->m_apSkinPartNames[p];
 				Msg.m_aSkinPartColors[p] = pMsg->m_aSkinPartColors[p];
@@ -1864,26 +1929,26 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 
 			return 0;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SETSPECTATORMODE)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_SETSPECTATORMODE)
 		{
 			protocol7::CNetMsg_Cl_SetSpectatorMode *pMsg7 = (protocol7::CNetMsg_Cl_SetSpectatorMode *)pRawMsg;
 			::CNetMsg_Cl_SetSpectatorMode *pMsg = (::CNetMsg_Cl_SetSpectatorMode *)s_aRawMsg;
 
 			if(pMsg7->m_SpecMode == protocol7::SPEC_FREEVIEW)
-				pMsg->m_SpectatorID = SPEC_FREEVIEW;
+				pMsg->m_SpectatorId = SPEC_FREEVIEW;
 			else if(pMsg7->m_SpecMode == protocol7::SPEC_PLAYER)
-				pMsg->m_SpectatorID = pMsg7->m_SpectatorID;
+				pMsg->m_SpectatorId = pMsg7->m_SpectatorId;
 			else
-				pMsg->m_SpectatorID = SPEC_FREEVIEW; // Probably not needed
+				pMsg->m_SpectatorId = SPEC_FREEVIEW; // Probably not needed
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SETTEAM)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_SETTEAM)
 		{
 			protocol7::CNetMsg_Cl_SetTeam *pMsg7 = (protocol7::CNetMsg_Cl_SetTeam *)pRawMsg;
 			::CNetMsg_Cl_SetTeam *pMsg = (::CNetMsg_Cl_SetTeam *)s_aRawMsg;
 
 			pMsg->m_Team = pMsg7->m_Team;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_COMMAND)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_COMMAND)
 		{
 			protocol7::CNetMsg_Cl_Command *pMsg7 = (protocol7::CNetMsg_Cl_Command *)pRawMsg;
 			::CNetMsg_Cl_Say *pMsg = (::CNetMsg_Cl_Say *)s_aRawMsg;
@@ -1893,20 +1958,20 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 			dbg_msg("debug", "line='%s'", s_aRawMsg + sizeof(*pMsg));
 			pMsg->m_Team = 0;
 
-			*pMsgID = NETMSGTYPE_CL_SAY;
+			*pMsgId = NETMSGTYPE_CL_SAY;
 			return s_aRawMsg;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_CALLVOTE)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_CALLVOTE)
 		{
 			protocol7::CNetMsg_Cl_CallVote *pMsg7 = (protocol7::CNetMsg_Cl_CallVote *)pRawMsg;
 			::CNetMsg_Cl_CallVote *pMsg = (::CNetMsg_Cl_CallVote *)s_aRawMsg;
 
-			int Authed = Server()->GetAuthedState(ClientID);
+			int Authed = Server()->GetAuthedState(ClientId);
 			if(pMsg7->m_Force)
 			{
 				str_format(s_aRawMsg, sizeof(s_aRawMsg), "force_vote \"%s\" \"%s\" \"%s\"", pMsg7->m_pType, pMsg7->m_pValue, pMsg7->m_pReason);
 				Console()->SetAccessLevel(Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER);
-				Console()->ExecuteLine(s_aRawMsg, ClientID, false);
+				Console()->ExecuteLine(s_aRawMsg, ClientId, false);
 				Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
 				return 0;
 			}
@@ -1915,14 +1980,14 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 			pMsg->m_pReason = pMsg7->m_pReason;
 			pMsg->m_pType = pMsg7->m_pType;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_EMOTICON)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_EMOTICON)
 		{
 			protocol7::CNetMsg_Cl_Emoticon *pMsg7 = (protocol7::CNetMsg_Cl_Emoticon *)pRawMsg;
 			::CNetMsg_Cl_Emoticon *pMsg = (::CNetMsg_Cl_Emoticon *)s_aRawMsg;
 
 			pMsg->m_Emoticon = pMsg7->m_Emoticon;
 		}
-		else if(*pMsgID == protocol7::NETMSGTYPE_CL_VOTE)
+		else if(*pMsgId == protocol7::NETMSGTYPE_CL_VOTE)
 		{
 			protocol7::CNetMsg_Cl_Vote *pMsg7 = (protocol7::CNetMsg_Cl_Vote *)pRawMsg;
 			::CNetMsg_Cl_Vote *pMsg = (::CNetMsg_Cl_Vote *)s_aRawMsg;
@@ -1930,12 +1995,12 @@ void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientI
 			pMsg->m_Vote = pMsg7->m_Vote;
 		}
 
-		*pMsgID = Msg_SevenToSix(*pMsgID);
+		*pMsgId = Msg_SevenToSix(*pMsgId);
 
 		return s_aRawMsg;
 	}
 	else
-		return m_NetObjHandler.SecureUnpackMsg(*pMsgID, pUnpacker);
+		return m_NetObjHandler.SecureUnpackMsg(*pMsgId, pUnpacker);
 }
 
 void CGameContext::CensorMessage(char *pCensoredMessage, const char *pMessage, int Size)
@@ -1960,88 +2025,84 @@ void CGameContext::CensorMessage(char *pCensoredMessage, const char *pMessage, i
 	}
 }
 
-void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
+void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
 {
 	if(m_TeeHistorianActive)
 	{
-		if(m_NetObjHandler.TeeHistorianRecordMsg(MsgID))
+		if(m_NetObjHandler.TeeHistorianRecordMsg(MsgId))
 		{
-			m_TeeHistorian.RecordPlayerMessage(ClientID, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
+			m_TeeHistorian.RecordPlayerMessage(ClientId, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
 		}
 	}
 
-	void *pRawMsg = PreProcessMsg(&MsgID, pUnpacker, ClientID);
+	void *pRawMsg = PreProcessMsg(&MsgId, pUnpacker, ClientId);
 
 	if(!pRawMsg)
 		return;
 
-	if(Server()->ClientIngame(ClientID))
+	if(Server()->ClientIngame(ClientId))
 	{
-		switch(MsgID)
+		switch(MsgId)
 		{
 		case NETMSGTYPE_CL_SAY:
-			OnSayNetMessage(static_cast<CNetMsg_Cl_Say *>(pRawMsg), ClientID, pUnpacker);
+			OnSayNetMessage(static_cast<CNetMsg_Cl_Say *>(pRawMsg), ClientId, pUnpacker);
 			break;
 		case NETMSGTYPE_CL_CALLVOTE:
-			OnCallVoteNetMessage(static_cast<CNetMsg_Cl_CallVote *>(pRawMsg), ClientID);
+			OnCallVoteNetMessage(static_cast<CNetMsg_Cl_CallVote *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_VOTE:
-			OnVoteNetMessage(static_cast<CNetMsg_Cl_Vote *>(pRawMsg), ClientID);
+			OnVoteNetMessage(static_cast<CNetMsg_Cl_Vote *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_SETTEAM:
-			OnSetTeamNetMessage(static_cast<CNetMsg_Cl_SetTeam *>(pRawMsg), ClientID);
+			OnSetTeamNetMessage(static_cast<CNetMsg_Cl_SetTeam *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_ISDDNETLEGACY:
-			OnIsDDNetLegacyNetMessage(static_cast<CNetMsg_Cl_IsDDNetLegacy *>(pRawMsg), ClientID, pUnpacker);
+			OnIsDDNetLegacyNetMessage(static_cast<CNetMsg_Cl_IsDDNetLegacy *>(pRawMsg), ClientId, pUnpacker);
 			break;
 		case NETMSGTYPE_CL_SHOWOTHERSLEGACY:
-			OnShowOthersLegacyNetMessage(static_cast<CNetMsg_Cl_ShowOthersLegacy *>(pRawMsg), ClientID);
+			OnShowOthersLegacyNetMessage(static_cast<CNetMsg_Cl_ShowOthersLegacy *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_SHOWOTHERS:
-			OnShowOthersNetMessage(static_cast<CNetMsg_Cl_ShowOthers *>(pRawMsg), ClientID);
+			OnShowOthersNetMessage(static_cast<CNetMsg_Cl_ShowOthers *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_SHOWDISTANCE:
-			OnShowDistanceNetMessage(static_cast<CNetMsg_Cl_ShowDistance *>(pRawMsg), ClientID);
+			OnShowDistanceNetMessage(static_cast<CNetMsg_Cl_ShowDistance *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_SETSPECTATORMODE:
-			OnSetSpectatorModeNetMessage(static_cast<CNetMsg_Cl_SetSpectatorMode *>(pRawMsg), ClientID);
+			OnSetSpectatorModeNetMessage(static_cast<CNetMsg_Cl_SetSpectatorMode *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_CHANGEINFO:
-			OnChangeInfoNetMessage(static_cast<CNetMsg_Cl_ChangeInfo *>(pRawMsg), ClientID);
+			OnChangeInfoNetMessage(static_cast<CNetMsg_Cl_ChangeInfo *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_EMOTICON:
-			OnEmoticonNetMessage(static_cast<CNetMsg_Cl_Emoticon *>(pRawMsg), ClientID);
+			OnEmoticonNetMessage(static_cast<CNetMsg_Cl_Emoticon *>(pRawMsg), ClientId);
 			break;
 		case NETMSGTYPE_CL_KILL:
-			OnKillNetMessage(static_cast<CNetMsg_Cl_Kill *>(pRawMsg), ClientID);
+			OnKillNetMessage(static_cast<CNetMsg_Cl_Kill *>(pRawMsg), ClientId);
 			break;
 		default:
 			break;
 		}
 	}
-	if(MsgID == NETMSGTYPE_CL_STARTINFO)
+	if(MsgId == NETMSGTYPE_CL_STARTINFO)
 	{
-		OnStartInfoNetMessage(static_cast<CNetMsg_Cl_StartInfo *>(pRawMsg), ClientID);
+		OnStartInfoNetMessage(static_cast<CNetMsg_Cl_StartInfo *>(pRawMsg), ClientId);
 	}
 }
 
-void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, const CUnpacker *pUnpacker)
+void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientId, const CUnpacker *pUnpacker)
 {
-	if(!str_utf8_check(pMsg->m_pMessage))
-	{
-		return;
-	}
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	bool Check = !pPlayer->m_NotEligibleForFinish && pPlayer->m_EligibleForFinishCheck + 10 * time_freq() >= time_get();
 	if(Check && str_comp(pMsg->m_pMessage, "xd sure chillerbot.png is lyfe") == 0 && pMsg->m_Team == 0)
 	{
 		if(m_TeeHistorianActive)
 		{
-			m_TeeHistorian.RecordPlayerMessage(ClientID, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
+			m_TeeHistorian.RecordPlayerMessage(ClientId, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
 		}
 
 		pPlayer->m_NotEligibleForFinish = true;
-		dbg_msg("hack", "bot detected, cid=%d", ClientID);
+		dbg_msg("hack", "bot detected, cid=%d", ClientId);
 		return;
 	}
 	int Team = pMsg->m_Team;
@@ -2076,11 +2137,11 @@ void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, con
 	if(Length == 0 || (pMsg->m_pMessage[0] != '/' && (g_Config.m_SvSpamprotection && pPlayer->m_LastChat && pPlayer->m_LastChat + Server()->TickSpeed() * ((31 + Length) / 32) > Server()->Tick())))
 		return;
 
-	int GameTeam = GetDDRaceTeam(pPlayer->GetCID());
+	int GameTeam = GetDDRaceTeam(pPlayer->GetCid());
 	if(Team)
-		Team = ((pPlayer->GetTeam() == TEAM_SPECTATORS) ? CHAT_SPEC : GameTeam);
+		Team = ((pPlayer->GetTeam() == TEAM_SPECTATORS) ? TEAM_SPECTATORS : GameTeam);
 	else
-		Team = CHAT_ALL;
+		Team = TEAM_ALL;
 
 	if(pMsg->m_pMessage[0] == '/')
 	{
@@ -2088,25 +2149,25 @@ void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, con
 		{
 			char aWhisperMsg[256];
 			str_copy(aWhisperMsg, pMsg->m_pMessage + 3, 256);
-			Whisper(pPlayer->GetCID(), aWhisperMsg);
+			Whisper(pPlayer->GetCid(), aWhisperMsg);
 		}
 		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "whisper "))
 		{
 			char aWhisperMsg[256];
 			str_copy(aWhisperMsg, pMsg->m_pMessage + 9, 256);
-			Whisper(pPlayer->GetCID(), aWhisperMsg);
+			Whisper(pPlayer->GetCid(), aWhisperMsg);
 		}
 		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "c "))
 		{
 			char aWhisperMsg[256];
 			str_copy(aWhisperMsg, pMsg->m_pMessage + 3, 256);
-			Converse(pPlayer->GetCID(), aWhisperMsg);
+			Converse(pPlayer->GetCid(), aWhisperMsg);
 		}
 		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "converse "))
 		{
 			char aWhisperMsg[256];
 			str_copy(aWhisperMsg, pMsg->m_pMessage + 10, 256);
-			Converse(pPlayer->GetCID(), aWhisperMsg);
+			Converse(pPlayer->GetCid(), aWhisperMsg);
 		}
 		else
 		{
@@ -2118,21 +2179,21 @@ void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, con
 			pPlayer->m_LastCommandPos = (pPlayer->m_LastCommandPos + 1) % 4;
 
 			Console()->SetFlagMask(CFGFLAG_CHAT);
-			int Authed = Server()->GetAuthedState(ClientID);
+			int Authed = Server()->GetAuthedState(ClientId);
 			if(Authed)
 				Console()->SetAccessLevel(Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER);
 			else
 				Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_USER);
 
 			{
-				CClientChatLogger Logger(this, ClientID, log_get_scope_logger());
+				CClientChatLogger Logger(this, ClientId, log_get_scope_logger());
 				CLogScope Scope(&Logger);
-				Console()->ExecuteLine(pMsg->m_pMessage + 1, ClientID, false);
+				Console()->ExecuteLine(pMsg->m_pMessage + 1, ClientId, false);
 			}
-			// m_apPlayers[ClientID] can be NULL, if the player used a
+			// m_apPlayers[ClientId] can be NULL, if the player used a
 			// timeout code and replaced another client.
 			char aBuf[256];
-			str_format(aBuf, sizeof(aBuf), "%d used %s", ClientID, pMsg->m_pMessage);
+			str_format(aBuf, sizeof(aBuf), "%d used %s", ClientId, pMsg->m_pMessage);
 			Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "chat-command", aBuf);
 
 			Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
@@ -2144,16 +2205,16 @@ void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, con
 		pPlayer->UpdatePlaytime();
 		char aCensoredMessage[256];
 		CensorMessage(aCensoredMessage, pMsg->m_pMessage, sizeof(aCensoredMessage));
-		SendChat(ClientID, Team, aCensoredMessage, ClientID);
+		SendChat(ClientId, Team, aCensoredMessage, ClientId);
 	}
 }
 
-void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientID)
+void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientId)
 {
-	if(RateLimitPlayerVote(ClientID) || m_VoteCloseTime)
+	if(RateLimitPlayerVote(ClientId) || m_VoteCloseTime)
 		return;
 
-	m_apPlayers[ClientID]->UpdatePlaytime();
+	m_apPlayers[ClientId]->UpdatePlaytime();
 
 	m_VoteType = VOTE_TYPE_UNKNOWN;
 	char aChatmsg[512] = {0};
@@ -2161,18 +2222,14 @@ void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int Cli
 	char aSixupDesc[VOTE_DESC_LENGTH] = {0};
 	char aCmd[VOTE_CMD_LENGTH] = {0};
 	char aReason[VOTE_REASON_LENGTH] = "No reason given";
-	if(!str_utf8_check(pMsg->m_pType) || !str_utf8_check(pMsg->m_pReason) || !str_utf8_check(pMsg->m_pValue))
-	{
-		return;
-	}
 	if(pMsg->m_pReason[0])
 	{
 		str_copy(aReason, pMsg->m_pReason, sizeof(aReason));
 	}
+	int Authed = Server()->GetAuthedState(ClientId);
 
 	if(str_comp_nocase(pMsg->m_pType, "option") == 0)
 	{
-		int Authed = Server()->GetAuthedState(ClientID);
 		CVoteOptionServer *pOption = m_pVoteOptionFirst;
 		while(pOption)
 		{
@@ -2180,15 +2237,15 @@ void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int Cli
 			{
 				if(!Console()->LineIsValid(pOption->m_aCommand))
 				{
-					SendChatTarget(ClientID, "Invalid option");
+					SendChatTarget(ClientId, "Invalid option");
 					return;
 				}
-				if((str_find(pOption->m_aCommand, "sv_map ") != 0 || str_find(pOption->m_aCommand, "change_map ") != 0 || str_find(pOption->m_aCommand, "random_map") != 0 || str_find(pOption->m_aCommand, "random_unfinished_map") != 0) && RateLimitPlayerMapVote(ClientID))
+				if((str_find(pOption->m_aCommand, "sv_map ") != 0 || str_find(pOption->m_aCommand, "change_map ") != 0 || str_find(pOption->m_aCommand, "random_map") != 0 || str_find(pOption->m_aCommand, "random_unfinished_map") != 0) && RateLimitPlayerMapVote(ClientId))
 				{
 					return;
 				}
 
-				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)", Server()->ClientName(ClientID),
+				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)", Server()->ClientName(ClientId),
 					pOption->m_aDescription, aReason);
 				str_copy(aDesc, pOption->m_aDescription);
 
@@ -2214,12 +2271,12 @@ void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int Cli
 			if(Authed != AUTHED_ADMIN) // allow admins to call any vote they want
 			{
 				str_format(aChatmsg, sizeof(aChatmsg), "'%s' isn't an option on this server", pMsg->m_pValue);
-				SendChatTarget(ClientID, aChatmsg);
+				SendChatTarget(ClientId, aChatmsg);
 				return;
 			}
 			else
 			{
-				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s'", Server()->ClientName(ClientID), pMsg->m_pValue);
+				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s'", Server()->ClientName(ClientId), pMsg->m_pValue);
 				str_copy(aDesc, pMsg->m_pValue);
 				str_copy(aCmd, pMsg->m_pValue);
 			}
@@ -2229,23 +2286,21 @@ void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int Cli
 	}
 	else if(str_comp_nocase(pMsg->m_pType, "kick") == 0)
 	{
-		int Authed = Server()->GetAuthedState(ClientID);
-
 		if(!g_Config.m_SvVoteKick && !Authed) // allow admins to call kick votes even if they are forbidden
 		{
-			SendChatTarget(ClientID, "Server does not allow voting to kick players");
+			SendChatTarget(ClientId, "Server does not allow voting to kick players");
 			return;
 		}
-		if(!Authed && time_get() < m_apPlayers[ClientID]->m_Last_KickVote + (time_freq() * g_Config.m_SvVoteKickDelay))
+		if(!Authed && time_get() < m_apPlayers[ClientId]->m_Last_KickVote + (time_freq() * g_Config.m_SvVoteKickDelay))
 		{
 			str_format(aChatmsg, sizeof(aChatmsg), "There's a %d second wait time between kick votes for each player please wait %d second(s)",
 				g_Config.m_SvVoteKickDelay,
-				(int)((m_apPlayers[ClientID]->m_Last_KickVote + g_Config.m_SvVoteKickDelay * time_freq() - time_get()) / time_freq()));
-			SendChatTarget(ClientID, aChatmsg);
+				(int)((m_apPlayers[ClientId]->m_Last_KickVote + g_Config.m_SvVoteKickDelay * time_freq() - time_get()) / time_freq()));
+			SendChatTarget(ClientId, aChatmsg);
 			return;
 		}
 
-		if(g_Config.m_SvVoteKickMin && !GetDDRaceTeam(ClientID))
+		if(g_Config.m_SvVoteKickMin && !GetDDRaceTeam(ClientId))
 		{
 			char aaAddresses[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}};
 			for(int i = 0; i < MAX_CLIENTS; i++)
@@ -2278,128 +2333,137 @@ void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int Cli
 			if(NumPlayers < g_Config.m_SvVoteKickMin)
 			{
 				str_format(aChatmsg, sizeof(aChatmsg), "Kick voting requires %d players", g_Config.m_SvVoteKickMin);
-				SendChatTarget(ClientID, aChatmsg);
+				SendChatTarget(ClientId, aChatmsg);
 				return;
 			}
 		}
 
-		int KickID = str_toint(pMsg->m_pValue);
+		int KickId = str_toint(pMsg->m_pValue);
 
-		if(KickID < 0 || KickID >= MAX_CLIENTS || !m_apPlayers[KickID])
+		if(KickId < 0 || KickId >= MAX_CLIENTS || !m_apPlayers[KickId])
 		{
-			SendChatTarget(ClientID, "Invalid client id to kick");
+			SendChatTarget(ClientId, "Invalid client id to kick");
 			return;
 		}
-		if(KickID == ClientID)
+		if(KickId == ClientId)
 		{
-			SendChatTarget(ClientID, "You can't kick yourself");
+			SendChatTarget(ClientId, "You can't kick yourself");
 			return;
 		}
-		if(!Server()->ReverseTranslate(KickID, ClientID))
+		if(!Server()->ReverseTranslate(KickId, ClientId))
 		{
 			return;
 		}
-		int KickedAuthed = Server()->GetAuthedState(KickID);
+		int KickedAuthed = Server()->GetAuthedState(KickId);
 		if(KickedAuthed > Authed)
 		{
-			SendChatTarget(ClientID, "You can't kick authorized players");
+			SendChatTarget(ClientId, "You can't kick authorized players");
 			char aBufKick[128];
-			str_format(aBufKick, sizeof(aBufKick), "'%s' called for vote to kick you", Server()->ClientName(ClientID));
-			SendChatTarget(KickID, aBufKick);
+			str_format(aBufKick, sizeof(aBufKick), "'%s' called for vote to kick you", Server()->ClientName(ClientId));
+			SendChatTarget(KickId, aBufKick);
 			return;
 		}
 
 		// Don't allow kicking if a player has no character
-		if(!GetPlayerChar(ClientID) || !GetPlayerChar(KickID) || GetDDRaceTeam(ClientID) != GetDDRaceTeam(KickID))
+		if(!GetPlayerChar(ClientId) || !GetPlayerChar(KickId) || GetDDRaceTeam(ClientId) != GetDDRaceTeam(KickId))
 		{
-			SendChatTarget(ClientID, "You can kick only your team member");
+			SendChatTarget(ClientId, "You can kick only your team member");
 			return;
 		}
 
-		str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientID), Server()->ClientName(KickID), aReason);
-		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", KickID, Server()->ClientName(KickID));
-		if(!GetDDRaceTeam(ClientID))
+		str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientId), Server()->ClientName(KickId), aReason);
+		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", KickId, Server()->ClientName(KickId));
+		if(!GetDDRaceTeam(ClientId))
 		{
 			if(!g_Config.m_SvVoteKickBantime)
 			{
-				str_format(aCmd, sizeof(aCmd), "kick %d Kicked by vote", KickID);
-				str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickID));
+				str_format(aCmd, sizeof(aCmd), "kick %d Kicked by vote", KickId);
+				str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickId));
 			}
 			else
 			{
 				char aAddrStr[NETADDR_MAXSTRSIZE] = {0};
-				Server()->GetClientAddr(KickID, aAddrStr, sizeof(aAddrStr));
+				Server()->GetClientAddr(KickId, aAddrStr, sizeof(aAddrStr));
 				str_format(aCmd, sizeof(aCmd), "ban %s %d Banned by vote", aAddrStr, g_Config.m_SvVoteKickBantime);
-				str_format(aDesc, sizeof(aDesc), "Ban '%s'", Server()->ClientName(KickID));
+				str_format(aDesc, sizeof(aDesc), "Ban '%s'", Server()->ClientName(KickId));
 			}
 		}
 		else
 		{
-			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team_ddr %d 0", KickID, GetDDRaceTeam(KickID), KickID);
-			str_format(aDesc, sizeof(aDesc), "Move '%s' to team 0", Server()->ClientName(KickID));
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team_ddr %d 0", KickId, GetDDRaceTeam(KickId), KickId);
+			str_format(aDesc, sizeof(aDesc), "Move '%s' to team 0", Server()->ClientName(KickId));
 		}
-		m_apPlayers[ClientID]->m_Last_KickVote = time_get();
+		m_apPlayers[ClientId]->m_Last_KickVote = time_get();
 		m_VoteType = VOTE_TYPE_KICK;
-		m_VoteVictim = KickID;
+		m_VoteVictim = KickId;
 	}
 	else if(str_comp_nocase(pMsg->m_pType, "spectate") == 0)
 	{
 		if(!g_Config.m_SvVoteSpectate)
 		{
-			SendChatTarget(ClientID, "Server does not allow voting to move players to spectators");
+			SendChatTarget(ClientId, "Server does not allow voting to move players to spectators");
 			return;
 		}
 
-		int SpectateID = str_toint(pMsg->m_pValue);
+		int SpectateId = str_toint(pMsg->m_pValue);
 
-		if(SpectateID < 0 || SpectateID >= MAX_CLIENTS || !m_apPlayers[SpectateID] || m_apPlayers[SpectateID]->GetTeam() == TEAM_SPECTATORS)
+		if(SpectateId < 0 || SpectateId >= MAX_CLIENTS || !m_apPlayers[SpectateId] || m_apPlayers[SpectateId]->GetTeam() == TEAM_SPECTATORS)
+		{
+			SendChatTarget(ClientId, "Invalid client id to move to spectators");
+			return;
+		}
+		if(SpectateId == ClientId)
 		{
-			SendChatTarget(ClientID, "Invalid client id to move");
+			SendChatTarget(ClientId, "You can't move yourself to spectators");
 			return;
 		}
-		if(SpectateID == ClientID)
+		int SpectateAuthed = Server()->GetAuthedState(SpectateId);
+		if(SpectateAuthed > Authed)
 		{
-			SendChatTarget(ClientID, "You can't move yourself");
+			SendChatTarget(ClientId, "You can't move authorized players to spectators");
+			char aBufSpectate[128];
+			str_format(aBufSpectate, sizeof(aBufSpectate), "'%s' called for vote to move you to spectators", Server()->ClientName(ClientId));
+			SendChatTarget(SpectateId, aBufSpectate);
 			return;
 		}
-		if(!Server()->ReverseTranslate(SpectateID, ClientID))
+		if(!Server()->ReverseTranslate(SpectateId, ClientId))
 		{
 			return;
 		}
 
-		if(!GetPlayerChar(ClientID) || !GetPlayerChar(SpectateID) || GetDDRaceTeam(ClientID) != GetDDRaceTeam(SpectateID))
+		if(!GetPlayerChar(ClientId) || !GetPlayerChar(SpectateId) || GetDDRaceTeam(ClientId) != GetDDRaceTeam(SpectateId))
 		{
-			SendChatTarget(ClientID, "You can only move your team member to spectators");
+			SendChatTarget(ClientId, "You can only move your team member to spectators");
 			return;
 		}
 
-		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", SpectateID, Server()->ClientName(SpectateID));
+		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", SpectateId, Server()->ClientName(SpectateId));
 		if(g_Config.m_SvPauseable && g_Config.m_SvVotePause)
 		{
-			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to pause '%s' for %d seconds (%s)", Server()->ClientName(ClientID), Server()->ClientName(SpectateID), g_Config.m_SvVotePauseTime, aReason);
-			str_format(aDesc, sizeof(aDesc), "Pause '%s' (%ds)", Server()->ClientName(SpectateID), g_Config.m_SvVotePauseTime);
-			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; force_pause %d %d", SpectateID, GetDDRaceTeam(SpectateID), SpectateID, g_Config.m_SvVotePauseTime);
+			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to pause '%s' for %d seconds (%s)", Server()->ClientName(ClientId), Server()->ClientName(SpectateId), g_Config.m_SvVotePauseTime, aReason);
+			str_format(aDesc, sizeof(aDesc), "Pause '%s' (%ds)", Server()->ClientName(SpectateId), g_Config.m_SvVotePauseTime);
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; force_pause %d %d", SpectateId, GetDDRaceTeam(SpectateId), SpectateId, g_Config.m_SvVotePauseTime);
 		}
 		else
 		{
-			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to move '%s' to spectators (%s)", Server()->ClientName(ClientID), Server()->ClientName(SpectateID), aReason);
-			str_format(aDesc, sizeof(aDesc), "Move '%s' to spectators", Server()->ClientName(SpectateID));
-			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team %d -1 %d", SpectateID, GetDDRaceTeam(SpectateID), SpectateID, g_Config.m_SvVoteSpectateRejoindelay);
+			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to move '%s' to spectators (%s)", Server()->ClientName(ClientId), Server()->ClientName(SpectateId), aReason);
+			str_format(aDesc, sizeof(aDesc), "Move '%s' to spectators", Server()->ClientName(SpectateId));
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team %d -1 %d", SpectateId, GetDDRaceTeam(SpectateId), SpectateId, g_Config.m_SvVoteSpectateRejoindelay);
 		}
 		m_VoteType = VOTE_TYPE_SPECTATE;
-		m_VoteVictim = SpectateID;
+		m_VoteVictim = SpectateId;
 	}
 
 	if(aCmd[0] && str_comp_nocase(aCmd, "info") != 0)
-		CallVote(ClientID, aDesc, aCmd, aReason, aChatmsg, aSixupDesc[0] ? aSixupDesc : 0);
+		CallVote(ClientId, aDesc, aCmd, aReason, aChatmsg, aSixupDesc[0] ? aSixupDesc : 0);
 }
 
-void CGameContext::OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientID)
+void CGameContext::OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientId)
 {
 	if(!m_VoteCloseTime)
 		return;
 
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
 	if(g_Config.m_SvSpamprotection && pPlayer->m_LastVoteTry && pPlayer->m_LastVoteTry + Server()->TickSpeed() * 3 > Server()->Tick())
 		return;
@@ -2412,20 +2476,27 @@ void CGameContext::OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientID)
 	if(!pMsg->m_Vote)
 		return;
 
+	// Allow the vote creator to cancel the vote
+	if(pPlayer->GetCid() == m_VoteCreator && pMsg->m_Vote == -1)
+	{
+		m_VoteEnforce = VOTE_ENFORCE_CANCEL;
+		return;
+	}
+
 	pPlayer->m_Vote = pMsg->m_Vote;
 	pPlayer->m_VotePos = ++m_VotePos;
 	m_VoteUpdate = true;
 
 	CNetMsg_Sv_YourVote Msg = {pMsg->m_Vote};
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 }
 
-void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientID)
+void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientId)
 {
 	if(m_World.m_Paused)
 		return;
 
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
 	if(pPlayer->GetTeam() == pMsg->m_Team || (g_Config.m_SvSpamprotection && pPlayer->m_LastSetTeam && pPlayer->m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay > Server()->Tick()))
 		return;
@@ -2437,7 +2508,7 @@ void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int Clien
 		int CurrTime = (Server()->Tick() - pChr->m_StartTime) / Server()->TickSpeed();
 		if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
 		{
-			SendChatTarget(ClientID, "Kill Protection enabled. If you really want to join the spectators, first type /kill");
+			SendChatTarget(ClientId, "Kill Protection enabled. If you really want to join the spectators, first type /kill");
 			return;
 		}
 	}
@@ -2450,13 +2521,13 @@ void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int Clien
 		str_time((int64_t)TimeLeft * 100, TIME_HOURS, aTime, sizeof(aTime));
 		char aBuf[128];
 		str_format(aBuf, sizeof(aBuf), "Time to wait before changing team: %s", aTime);
-		SendBroadcast(aBuf, ClientID);
+		SendBroadcast(aBuf, ClientId);
 		return;
 	}
 
 	// Switch team on given client and kill/respawn them
 	char aTeamJoinError[512];
-	if(m_pController->CanJoinTeam(pMsg->m_Team, ClientID, aTeamJoinError, sizeof(aTeamJoinError)))
+	if(m_pController->CanJoinTeam(pMsg->m_Team, ClientId, aTeamJoinError, sizeof(aTeamJoinError)))
 	{
 		if(pPlayer->GetTeam() == TEAM_SPECTATORS || pMsg->m_Team == TEAM_SPECTATORS)
 			m_VoteUpdate = true;
@@ -2464,13 +2535,13 @@ void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int Clien
 		pPlayer->m_TeamChangeTick = Server()->Tick();
 	}
 	else
-		SendBroadcast(aTeamJoinError, ClientID);
+		SendBroadcast(aTeamJoinError, ClientId);
 }
 
-void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker)
+void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientId, CUnpacker *pUnpacker)
 {
 	IServer::CClientInfo Info;
-	if(Server()->GetClientInfo(ClientID, &Info) && Info.m_GotDDNetVersion)
+	if(Server()->GetClientInfo(ClientId, &Info) && Info.m_GotDDNetVersion)
 	{
 		return;
 	}
@@ -2479,127 +2550,130 @@ void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMs
 	{
 		DDNetVersion = VERSION_DDRACE;
 	}
-	Server()->SetClientDDNetVersion(ClientID, DDNetVersion);
-	OnClientDDNetVersionKnown(ClientID);
+	Server()->SetClientDDNetVersion(ClientId, DDNetVersion);
+	OnClientDDNetVersionKnown(ClientId);
 }
 
-void CGameContext::OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientID)
+void CGameContext::OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientId)
 {
 	if(g_Config.m_SvShowOthers && !g_Config.m_SvShowOthersDefault)
 	{
-		CPlayer *pPlayer = m_apPlayers[ClientID];
+		CPlayer *pPlayer = m_apPlayers[ClientId];
 		pPlayer->m_ShowOthers = pMsg->m_Show;
 	}
 }
 
-void CGameContext::OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientID)
+void CGameContext::OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientId)
 {
 	if(g_Config.m_SvShowOthers && !g_Config.m_SvShowOthersDefault)
 	{
-		CPlayer *pPlayer = m_apPlayers[ClientID];
+		CPlayer *pPlayer = m_apPlayers[ClientId];
 		pPlayer->m_ShowOthers = pMsg->m_Show;
 	}
 }
 
-void CGameContext::OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientID)
+void CGameContext::OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientId)
 {
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	pPlayer->m_ShowDistance = vec2(pMsg->m_X, pMsg->m_Y);
 }
 
-void CGameContext::OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientID)
+void CGameContext::OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientId)
 {
 	if(m_World.m_Paused)
 		return;
 
-	int SpectatorID = clamp(pMsg->m_SpectatorID, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
-	if(SpectatorID >= 0)
-		if(!Server()->ReverseTranslate(SpectatorID, ClientID))
+	int SpectatorId = clamp(pMsg->m_SpectatorId, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
+	if(SpectatorId >= 0)
+		if(!Server()->ReverseTranslate(SpectatorId, ClientId))
 			return;
 
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if((g_Config.m_SvSpamprotection && pPlayer->m_LastSetSpectatorMode && pPlayer->m_LastSetSpectatorMode + Server()->TickSpeed() / 4 > Server()->Tick()))
 		return;
 
 	pPlayer->m_LastSetSpectatorMode = Server()->Tick();
 	pPlayer->UpdatePlaytime();
-	if(SpectatorID >= 0 && (!m_apPlayers[SpectatorID] || m_apPlayers[SpectatorID]->GetTeam() == TEAM_SPECTATORS))
-		SendChatTarget(ClientID, "Invalid spectator id used");
+	if(SpectatorId >= 0 && (!m_apPlayers[SpectatorId] || m_apPlayers[SpectatorId]->GetTeam() == TEAM_SPECTATORS))
+		SendChatTarget(ClientId, "Invalid spectator id used");
 	else
-		pPlayer->m_SpectatorID = SpectatorID;
+		pPlayer->m_SpectatorId = SpectatorId;
 }
 
-void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientID)
+void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientId)
 {
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if(g_Config.m_SvSpamprotection && pPlayer->m_LastChangeInfo && pPlayer->m_LastChangeInfo + Server()->TickSpeed() * g_Config.m_SvInfoChangeDelay > Server()->Tick())
 		return;
 
 	bool SixupNeedsUpdate = false;
 
-	if(!str_utf8_check(pMsg->m_pName) || !str_utf8_check(pMsg->m_pClan) || !str_utf8_check(pMsg->m_pSkin))
-	{
-		return;
-	}
 	pPlayer->m_LastChangeInfo = Server()->Tick();
 	pPlayer->UpdatePlaytime();
 
+	if(g_Config.m_SvSpamprotection)
+	{
+		CNetMsg_Sv_ChangeInfoCooldown ChangeInfoCooldownMsg;
+		ChangeInfoCooldownMsg.m_WaitUntil = Server()->Tick() + Server()->TickSpeed() * g_Config.m_SvInfoChangeDelay;
+		Server()->SendPackMsg(&ChangeInfoCooldownMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
+	}
+
 	// set infos
-	if(Server()->WouldClientNameChange(ClientID, pMsg->m_pName) && !ProcessSpamProtection(ClientID))
+	if(Server()->WouldClientNameChange(ClientId, pMsg->m_pName) && !ProcessSpamProtection(ClientId))
 	{
 		char aOldName[MAX_NAME_LENGTH];
-		str_copy(aOldName, Server()->ClientName(ClientID), sizeof(aOldName));
+		str_copy(aOldName, Server()->ClientName(ClientId), sizeof(aOldName));
 
-		Server()->SetClientName(ClientID, pMsg->m_pName);
+		Server()->SetClientName(ClientId, pMsg->m_pName);
 
 		char aChatText[256];
-		str_format(aChatText, sizeof(aChatText), "'%s' changed name to '%s'", aOldName, Server()->ClientName(ClientID));
-		SendChat(-1, CGameContext::CHAT_ALL, aChatText);
+		str_format(aChatText, sizeof(aChatText), "'%s' changed name to '%s'", aOldName, Server()->ClientName(ClientId));
+		SendChat(-1, TEAM_ALL, aChatText);
 
 		// reload scores
-		Score()->PlayerData(ClientID)->Reset();
-		m_apPlayers[ClientID]->m_Score.reset();
-		Score()->LoadPlayerData(ClientID);
+		Score()->PlayerData(ClientId)->Reset();
+		m_apPlayers[ClientId]->m_Score.reset();
+		Score()->LoadPlayerData(ClientId);
 
 		SixupNeedsUpdate = true;
 
-		LogEvent("Name change", ClientID);
+		LogEvent("Name change", ClientId);
 	}
 
-	if(Server()->WouldClientClanChange(ClientID, pMsg->m_pClan))
+	if(Server()->WouldClientClanChange(ClientId, pMsg->m_pClan))
 	{
 		SixupNeedsUpdate = true;
-		Server()->SetClientClan(ClientID, pMsg->m_pClan);
+		Server()->SetClientClan(ClientId, pMsg->m_pClan);
 	}
 
-	if(Server()->ClientCountry(ClientID) != pMsg->m_Country)
+	if(Server()->ClientCountry(ClientId) != pMsg->m_Country)
 		SixupNeedsUpdate = true;
-	Server()->SetClientCountry(ClientID, pMsg->m_Country);
+	Server()->SetClientCountry(ClientId, pMsg->m_Country);
 
 	str_copy(pPlayer->m_TeeInfos.m_aSkinName, pMsg->m_pSkin, sizeof(pPlayer->m_TeeInfos.m_aSkinName));
 	pPlayer->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
 	pPlayer->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;
 	pPlayer->m_TeeInfos.m_ColorFeet = pMsg->m_ColorFeet;
-	if(!Server()->IsSixup(ClientID))
+	if(!Server()->IsSixup(ClientId))
 		pPlayer->m_TeeInfos.ToSixup();
 
 	if(SixupNeedsUpdate)
 	{
 		protocol7::CNetMsg_Sv_ClientDrop Drop;
-		Drop.m_ClientID = ClientID;
+		Drop.m_ClientId = ClientId;
 		Drop.m_pReason = "";
 		Drop.m_Silent = true;
 
 		protocol7::CNetMsg_Sv_ClientInfo Info;
-		Info.m_ClientID = ClientID;
-		Info.m_pName = Server()->ClientName(ClientID);
+		Info.m_ClientId = ClientId;
+		Info.m_pName = Server()->ClientName(ClientId);
 		Info.m_Country = pMsg->m_Country;
 		Info.m_pClan = pMsg->m_pClan;
 		Info.m_Local = 0;
 		Info.m_Silent = true;
 		Info.m_Team = pPlayer->GetTeam();
 
-		for(int p = 0; p < 6; p++)
+		for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 		{
 			Info.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
 			Info.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
@@ -2608,7 +2682,7 @@ void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int
 
 		for(int i = 0; i < Server()->MaxClients(); i++)
 		{
-			if(i != ClientID)
+			if(i != ClientId)
 			{
 				Server()->SendPackMsg(&Drop, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
 				Server()->SendPackMsg(&Info, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
@@ -2618,8 +2692,8 @@ void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int
 	else
 	{
 		protocol7::CNetMsg_Sv_SkinChange Msg;
-		Msg.m_ClientID = ClientID;
-		for(int p = 0; p < 6; p++)
+		Msg.m_ClientId = ClientId;
+		for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 		{
 			Msg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
 			Msg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
@@ -2632,12 +2706,12 @@ void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int
 	Server()->ExpireServerInfo();
 }
 
-void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientID)
+void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientId)
 {
 	if(m_World.m_Paused)
 		return;
 
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
 	auto &&CheckPreventEmote = [&](int64_t LastEmote, int64_t DelayInMs) {
 		return (LastEmote * (int64_t)1000) + (int64_t)Server()->TickSpeed() * DelayInMs > ((int64_t)Server()->Tick() * (int64_t)1000);
@@ -2662,7 +2736,7 @@ void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int Cli
 		{
 			if(m_apPlayers[i] && pChr->CanSnapCharacter(i) && pChr->IsSnappingCharacterInView(i))
 			{
-				SendEmoticon(ClientID, pMsg->m_Emoticon, i);
+				SendEmoticon(ClientId, pMsg->m_Emoticon, i);
 			}
 		}
 	}
@@ -2670,10 +2744,10 @@ void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int Cli
 	{
 		// else send emoticons to all players
 		pPlayer->m_LastEmoteGlobal = Server()->Tick();
-		SendEmoticon(ClientID, pMsg->m_Emoticon, -1);
+		SendEmoticon(ClientId, pMsg->m_Emoticon, -1);
 	}
 
-	if(g_Config.m_SvEmotionalTees && pPlayer->m_EyeEmoteEnabled)
+	if(g_Config.m_SvEmotionalTees == 1 && pPlayer->m_EyeEmoteEnabled)
 	{
 		int EmoteType = EMOTE_NORMAL;
 		switch(pMsg->m_Emoticon)
@@ -2711,17 +2785,17 @@ void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int Cli
 	}
 }
 
-void CGameContext::OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID)
+void CGameContext::OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientId)
 {
 	if(m_World.m_Paused)
 		return;
 
-	if(m_VoteCloseTime && m_VoteCreator == ClientID && GetDDRaceTeam(ClientID) && (IsKickVote() || IsSpecVote()))
+	if(m_VoteCloseTime && m_VoteCreator == ClientId && GetDDRaceTeam(ClientId) && (IsKickVote() || IsSpecVote()))
 	{
-		SendChatTarget(ClientID, "You are running a vote please try again after the vote is done!");
+		SendChatTarget(ClientId, "You are running a vote please try again after the vote is done!");
 		return;
 	}
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if(pPlayer->m_LastKill && pPlayer->m_LastKill + Server()->TickSpeed() * g_Config.m_SvKillDelay > Server()->Tick())
 		return;
 	if(pPlayer->IsPaused())
@@ -2735,7 +2809,7 @@ void CGameContext::OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID)
 	int CurrTime = (Server()->Tick() - pChr->m_StartTime) / Server()->TickSpeed();
 	if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
 	{
-		SendChatTarget(ClientID, "Kill Protection enabled. If you really want to kill, type /kill");
+		SendChatTarget(ClientId, "Kill Protection enabled. If you really want to kill, type /kill");
 		return;
 	}
 
@@ -2744,66 +2818,50 @@ void CGameContext::OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID)
 	pPlayer->Respawn();
 }
 
-void CGameContext::OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientID)
+void CGameContext::OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientId)
 {
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
 	if(pPlayer->m_IsReady)
 		return;
 
-	if(!str_utf8_check(pMsg->m_pName))
-	{
-		Server()->Kick(ClientID, "name is not valid utf8");
-		return;
-	}
-	if(!str_utf8_check(pMsg->m_pClan))
-	{
-		Server()->Kick(ClientID, "clan is not valid utf8");
-		return;
-	}
-	if(!str_utf8_check(pMsg->m_pSkin))
-	{
-		Server()->Kick(ClientID, "skin is not valid utf8");
-		return;
-	}
-
 	pPlayer->m_LastChangeInfo = Server()->Tick();
 
 	// set start infos
-	Server()->SetClientName(ClientID, pMsg->m_pName);
+	Server()->SetClientName(ClientId, pMsg->m_pName);
 	// trying to set client name can delete the player object, check if it still exists
-	if(!m_apPlayers[ClientID])
+	if(!m_apPlayers[ClientId])
 	{
 		return;
 	}
-	Server()->SetClientClan(ClientID, pMsg->m_pClan);
+	Server()->SetClientClan(ClientId, pMsg->m_pClan);
 	// trying to set client clan can delete the player object, check if it still exists
-	if(!m_apPlayers[ClientID])
+	if(!m_apPlayers[ClientId])
 	{
 		return;
 	}
-	Server()->SetClientCountry(ClientID, pMsg->m_Country);
+	Server()->SetClientCountry(ClientId, pMsg->m_Country);
 	str_copy(pPlayer->m_TeeInfos.m_aSkinName, pMsg->m_pSkin, sizeof(pPlayer->m_TeeInfos.m_aSkinName));
 	pPlayer->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
 	pPlayer->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;
 	pPlayer->m_TeeInfos.m_ColorFeet = pMsg->m_ColorFeet;
-	if(!Server()->IsSixup(ClientID))
+	if(!Server()->IsSixup(ClientId))
 		pPlayer->m_TeeInfos.ToSixup();
 
 	// send clear vote options
 	CNetMsg_Sv_VoteClearOptions ClearMsg;
-	Server()->SendPackMsg(&ClearMsg, MSGFLAG_VITAL, ClientID);
+	Server()->SendPackMsg(&ClearMsg, MSGFLAG_VITAL, ClientId);
 
 	// begin sending vote options
 	pPlayer->m_SendVoteIndex = 0;
 
 	// send tuning parameters to client
-	SendTuningParams(ClientID, pPlayer->m_TuneZone);
+	SendTuningParams(ClientId, pPlayer->m_TuneZone);
 
 	// client is ready to enter
 	pPlayer->m_IsReady = true;
 	CNetMsg_Sv_ReadyToEnter m;
-	Server()->SendPackMsg(&m, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+	Server()->SendPackMsg(&m, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
 
 	Server()->ExpireServerInfo();
 }
@@ -3053,7 +3111,7 @@ void CGameContext::ConPause(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConChangeMap(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	pSelf->m_pController->ChangeMap(pResult->NumArguments() ? pResult->GetString(0) : "");
+	pSelf->m_pController->ChangeMap(pResult->GetString(0));
 }
 
 void CGameContext::ConRandomMap(IConsole::IResult *pResult, void *pUserData)
@@ -3070,6 +3128,8 @@ void CGameContext::ConRandomUnfinishedMap(IConsole::IResult *pResult, void *pUse
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
 	int Stars = pResult->NumArguments() ? pResult->GetInteger(0) : -1;
+	if(pResult->m_ClientId != -1)
+		pSelf->m_VoteCreator = pResult->m_ClientId;
 
 	pSelf->m_pScore->RandomUnfinishedMap(pSelf->m_VoteCreator, Stars);
 }
@@ -3111,27 +3171,27 @@ void CGameContext::ConBroadcast(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConSay(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	pSelf->SendChat(-1, CGameContext::CHAT_ALL, pResult->GetString(0));
+	pSelf->SendChat(-1, TEAM_ALL, pResult->GetString(0));
 }
 
 void CGameContext::ConSetTeam(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
-	int ClientID = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS - 1);
+	int ClientId = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS - 1);
 	int Team = clamp(pResult->GetInteger(1), -1, 1);
 	int Delay = pResult->NumArguments() > 2 ? pResult->GetInteger(2) : 0;
-	if(!pSelf->m_apPlayers[ClientID])
+	if(!pSelf->m_apPlayers[ClientId])
 		return;
 
 	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "moved client %d to team %d", ClientID, Team);
+	str_format(aBuf, sizeof(aBuf), "moved client %d to team %d", ClientId, Team);
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 
-	pSelf->m_apPlayers[ClientID]->Pause(CPlayer::PAUSE_NONE, false); // reset /spec and /pause to allow rejoin
-	pSelf->m_apPlayers[ClientID]->m_TeamChangeTick = pSelf->Server()->Tick() + pSelf->Server()->TickSpeed() * Delay * 60;
-	pSelf->m_pController->DoTeamChange(pSelf->m_apPlayers[ClientID], Team);
+	pSelf->m_apPlayers[ClientId]->Pause(CPlayer::PAUSE_NONE, false); // reset /spec and /pause to allow rejoin
+	pSelf->m_apPlayers[ClientId]->m_TeamChangeTick = pSelf->Server()->Tick() + pSelf->Server()->TickSpeed() * Delay * 60;
+	pSelf->m_pController->DoTeamChange(pSelf->m_apPlayers[ClientId], Team);
 	if(Team == TEAM_SPECTATORS)
-		pSelf->m_apPlayers[ClientID]->Pause(CPlayer::PAUSE_NONE, true);
+		pSelf->m_apPlayers[ClientId]->Pause(CPlayer::PAUSE_NONE, true);
 }
 
 void CGameContext::ConSetTeamAll(IConsole::IResult *pResult, void *pUserData)
@@ -3141,13 +3201,44 @@ void CGameContext::ConSetTeamAll(IConsole::IResult *pResult, void *pUserData)
 
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "All players were moved to the %s", pSelf->m_pController->GetTeamName(Team));
-	pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+	pSelf->SendChat(-1, TEAM_ALL, aBuf);
 
 	for(auto &pPlayer : pSelf->m_apPlayers)
 		if(pPlayer)
 			pSelf->m_pController->DoTeamChange(pPlayer, Team, false);
 }
 
+void CGameContext::ConHotReload(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(!pSelf->GetPlayerChar(i))
+			continue;
+
+		CCharacter *pChar = pSelf->GetPlayerChar(i);
+
+		// Save the tee individually
+		pSelf->m_apSavedTees[i] = new CSaveTee();
+		pSelf->m_apSavedTees[i]->Save(pChar, false);
+
+		if(pSelf->m_apPlayers[i])
+			pSelf->m_apSavedTeleTees[i] = new CSaveTee(pSelf->m_apPlayers[i]->m_LastTeleTee);
+
+		// Save the team state
+		pSelf->m_aTeamMapping[i] = pSelf->GetDDRaceTeam(i);
+		if(pSelf->m_aTeamMapping[i] == TEAM_SUPER)
+			pSelf->m_aTeamMapping[i] = pChar->m_TeamBeforeSuper;
+
+		if(pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]])
+			continue;
+
+		pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]] = new CSaveTeam();
+		pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]]->Save(pSelf, pSelf->m_aTeamMapping[i], true, true);
+	}
+	pSelf->Server()->ReloadMap();
+}
+
 void CGameContext::ConAddVote(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
@@ -3211,7 +3302,7 @@ void CGameContext::AddVote(const char *pDescription, const char *pCommand)
 		m_pVoteOptionFirst = pOption;
 
 	str_copy(pOption->m_aDescription, pDescription, sizeof(pOption->m_aDescription));
-	mem_copy(pOption->m_aCommand, pCommand, Len + 1);
+	str_copy(pOption->m_aCommand, pCommand, Len + 1);
 }
 
 void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData)
@@ -3262,7 +3353,7 @@ void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData)
 
 		// copy option
 		int Len = str_length(pSrc->m_aCommand);
-		CVoteOptionServer *pDst = (CVoteOptionServer *)pVoteOptionHeap->Allocate(sizeof(CVoteOptionServer) + Len);
+		CVoteOptionServer *pDst = (CVoteOptionServer *)pVoteOptionHeap->Allocate(sizeof(CVoteOptionServer) + Len, alignof(CVoteOptionServer));
 		pDst->m_pNext = 0;
 		pDst->m_pPrev = pVoteOptionLast;
 		if(pDst->m_pPrev)
@@ -3272,7 +3363,7 @@ void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData)
 			pVoteOptionFirst = pDst;
 
 		str_copy(pDst->m_aDescription, pSrc->m_aDescription, sizeof(pDst->m_aDescription));
-		mem_copy(pDst->m_aCommand, pSrc->m_aCommand, Len + 1);
+		str_copy(pDst->m_aCommand, pSrc->m_aCommand, Len + 1);
 	}
 
 	// clean up
@@ -3299,7 +3390,8 @@ void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
 			if(str_comp_nocase(pValue, pOption->m_aDescription) == 0)
 			{
 				str_format(aBuf, sizeof(aBuf), "authorized player forced server option '%s' (%s)", pValue, pReason);
-				pSelf->SendChatTarget(-1, aBuf, CHAT_SIX);
+				pSelf->SendChatTarget(-1, aBuf, FLAG_SIX);
+				pSelf->m_VoteCreator = pResult->m_ClientId;
 				pSelf->Console()->ExecuteLine(pOption->m_aCommand);
 				break;
 			}
@@ -3316,8 +3408,8 @@ void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
 	}
 	else if(str_comp_nocase(pType, "kick") == 0)
 	{
-		int KickID = str_toint(pValue);
-		if(KickID < 0 || KickID >= MAX_CLIENTS || !pSelf->m_apPlayers[KickID])
+		int KickId = str_toint(pValue);
+		if(KickId < 0 || KickId >= MAX_CLIENTS || !pSelf->m_apPlayers[KickId])
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "Invalid client id to kick");
 			return;
@@ -3325,29 +3417,29 @@ void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
 
 		if(!g_Config.m_SvVoteKickBantime)
 		{
-			str_format(aBuf, sizeof(aBuf), "kick %d %s", KickID, pReason);
+			str_format(aBuf, sizeof(aBuf), "kick %d %s", KickId, pReason);
 			pSelf->Console()->ExecuteLine(aBuf);
 		}
 		else
 		{
 			char aAddrStr[NETADDR_MAXSTRSIZE] = {0};
-			pSelf->Server()->GetClientAddr(KickID, aAddrStr, sizeof(aAddrStr));
+			pSelf->Server()->GetClientAddr(KickId, aAddrStr, sizeof(aAddrStr));
 			str_format(aBuf, sizeof(aBuf), "ban %s %d %s", aAddrStr, g_Config.m_SvVoteKickBantime, pReason);
 			pSelf->Console()->ExecuteLine(aBuf);
 		}
 	}
 	else if(str_comp_nocase(pType, "spectate") == 0)
 	{
-		int SpectateID = str_toint(pValue);
-		if(SpectateID < 0 || SpectateID >= MAX_CLIENTS || !pSelf->m_apPlayers[SpectateID] || pSelf->m_apPlayers[SpectateID]->GetTeam() == TEAM_SPECTATORS)
+		int SpectateId = str_toint(pValue);
+		if(SpectateId < 0 || SpectateId >= MAX_CLIENTS || !pSelf->m_apPlayers[SpectateId] || pSelf->m_apPlayers[SpectateId]->GetTeam() == TEAM_SPECTATORS)
 		{
 			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "Invalid client id to move");
 			return;
 		}
 
-		str_format(aBuf, sizeof(aBuf), "'%s' was moved to spectator (%s)", pSelf->Server()->ClientName(SpectateID), pReason);
+		str_format(aBuf, sizeof(aBuf), "'%s' was moved to spectator (%s)", pSelf->Server()->ClientName(SpectateId), pReason);
 		pSelf->SendChatTarget(-1, aBuf);
-		str_format(aBuf, sizeof(aBuf), "set_team %d -1 %d", SpectateID, g_Config.m_SvVoteSpectateRejoindelay);
+		str_format(aBuf, sizeof(aBuf), "set_team %d -1 %d", SpectateId, g_Config.m_SvVoteSpectateRejoindelay);
 		pSelf->Console()->ExecuteLine(aBuf);
 	}
 }
@@ -3374,8 +3466,18 @@ void CGameContext::ConClearVotes(IConsole::IResult *pResult, void *pUserData)
 struct CMapNameItem
 {
 	char m_aName[IO_MAX_PATH_LENGTH - 4];
+	bool m_IsDirectory;
 
-	bool operator<(const CMapNameItem &Other) const { return str_comp_nocase(m_aName, Other.m_aName) < 0; }
+	static bool CompareFilenameAscending(const CMapNameItem Lhs, const CMapNameItem Rhs)
+	{
+		if(str_comp(Lhs.m_aName, "..") == 0)
+			return true;
+		if(str_comp(Rhs.m_aName, "..") == 0)
+			return false;
+		if(Lhs.m_IsDirectory != Rhs.m_IsDirectory)
+			return Lhs.m_IsDirectory;
+		return str_comp_filenames(Lhs.m_aName, Rhs.m_aName) < 0;
+	}
 };
 
 void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
@@ -3383,19 +3485,48 @@ void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
 	std::vector<CMapNameItem> vMapList;
-	pSelf->Storage()->ListDirectory(IStorage::TYPE_ALL, "maps", MapScan, &vMapList);
-	std::sort(vMapList.begin(), vMapList.end());
+	const char *pDirectory = pResult->GetString(0);
+
+	// Don't allow moving to parent directories
+	if(str_find_nocase(pDirectory, ".."))
+		return;
+
+	char aPath[IO_MAX_PATH_LENGTH] = "maps/";
+	str_append(aPath, pDirectory, sizeof(aPath));
+	pSelf->Storage()->ListDirectory(IStorage::TYPE_ALL, aPath, MapScan, &vMapList);
+	std::sort(vMapList.begin(), vMapList.end(), CMapNameItem::CompareFilenameAscending);
 
 	for(auto &Item : vMapList)
 	{
-		char aDescription[64];
-		str_format(aDescription, sizeof(aDescription), "Map: %s", Item.m_aName);
+		if(!str_comp(Item.m_aName, "..") && (!str_comp(aPath, "maps/")))
+			continue;
+
+		char aDescription[VOTE_DESC_LENGTH];
+		str_format(aDescription, sizeof(aDescription), "%s: %s%s", Item.m_IsDirectory ? "Directory" : "Map", Item.m_aName, Item.m_IsDirectory ? "/" : "");
 
-		char aCommand[IO_MAX_PATH_LENGTH * 2 + 10];
-		char aMapEscaped[IO_MAX_PATH_LENGTH * 2];
-		char *pDst = aMapEscaped;
-		str_escape(&pDst, Item.m_aName, aMapEscaped + sizeof(aMapEscaped));
-		str_format(aCommand, sizeof(aCommand), "change_map \"%s\"", aMapEscaped);
+		char aCommand[VOTE_CMD_LENGTH];
+		char aOptionEscaped[IO_MAX_PATH_LENGTH * 2];
+		char *pDst = aOptionEscaped;
+		str_escape(&pDst, Item.m_aName, aOptionEscaped + sizeof(aOptionEscaped));
+
+		char aDirectory[IO_MAX_PATH_LENGTH] = "";
+		if(pResult->NumArguments())
+			str_copy(aDirectory, pDirectory);
+
+		if(!str_comp(Item.m_aName, ".."))
+		{
+			fs_parent_dir(aDirectory);
+			str_format(aCommand, sizeof(aCommand), "clear_votes; add_map_votes \"%s\"", aDirectory);
+		}
+		else if(Item.m_IsDirectory)
+		{
+			str_append(aDirectory, "/", sizeof(aDirectory));
+			str_append(aDirectory, aOptionEscaped, sizeof(aDirectory));
+
+			str_format(aCommand, sizeof(aCommand), "clear_votes; add_map_votes \"%s\"", aDirectory);
+		}
+		else
+			str_format(aCommand, sizeof(aCommand), "change_map \"%s%s%s\"", pDirectory, pDirectory[0] == '\0' ? "" : "/", aOptionEscaped);
 
 		pSelf->AddVote(aDescription, aCommand);
 	}
@@ -3405,11 +3536,15 @@ void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
 
 int CGameContext::MapScan(const char *pName, int IsDir, int DirType, void *pUserData)
 {
-	if(IsDir || !str_endswith(pName, ".map"))
+	if((!IsDir && !str_endswith(pName, ".map")) || !str_comp(pName, "."))
 		return 0;
 
 	CMapNameItem Item;
-	str_truncate(Item.m_aName, sizeof(Item.m_aName), pName, str_length(pName) - str_length(".map"));
+	Item.m_IsDirectory = IsDir;
+	if(!IsDir)
+		str_truncate(Item.m_aName, sizeof(Item.m_aName), pName, str_length(pName) - str_length(".map"));
+	else
+		str_copy(Item.m_aName, pName);
 	static_cast<std::vector<CMapNameItem> *>(pUserData)->push_back(Item);
 
 	return 0;
@@ -3420,9 +3555,9 @@ void CGameContext::ConVote(IConsole::IResult *pResult, void *pUserData)
 	CGameContext *pSelf = (CGameContext *)pUserData;
 
 	if(str_comp_nocase(pResult->GetString(0), "yes") == 0)
-		pSelf->ForceVote(pResult->m_ClientID, true);
+		pSelf->ForceVote(pResult->m_ClientId, true);
 	else if(str_comp_nocase(pResult->GetString(0), "no") == 0)
-		pSelf->ForceVote(pResult->m_ClientID, false);
+		pSelf->ForceVote(pResult->m_ClientId, false);
 }
 
 void CGameContext::ConVotes(IConsole::IResult *pResult, void *pUserData)
@@ -3486,32 +3621,35 @@ void CGameContext::OnConsoleInit()
 	m_pEngine = Kernel()->RequestInterface<IEngine>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 
-	Console()->Register("tune", "s[tuning] ?i[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneParam, this, "Tune variable to value or show current value");
-	Console()->Register("toggle_tune", "s[tuning] i[value 1] i[value 2]", CFGFLAG_SERVER | CFGFLAG_GAME, ConToggleTuneParam, this, "Toggle tune variable");
+	Console()->Register("tune", "s[tuning] ?f[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneParam, this, "Tune variable to value or show current value");
+	Console()->Register("toggle_tune", "s[tuning] f[value 1] f[value 2]", CFGFLAG_SERVER, ConToggleTuneParam, this, "Toggle tune variable");
 	Console()->Register("tune_reset", "?s[tuning]", CFGFLAG_SERVER, ConTuneReset, this, "Reset all or one tuning variable to default");
 	Console()->Register("tunes", "", CFGFLAG_SERVER, ConTunes, this, "List all tuning variables and their values");
-	Console()->Register("tune_zone", "i[zone] s[tuning] i[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
+	Console()->Register("tune_zone", "i[zone] s[tuning] f[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
 	Console()->Register("tune_zone_dump", "i[zone]", CFGFLAG_SERVER, ConTuneDumpZone, this, "Dump zone tuning in zone x");
-	Console()->Register("tune_zone_reset", "?i[zone]", CFGFLAG_SERVER, ConTuneResetZone, this, "reset zone tuning in zone x or in all zones");
-	Console()->Register("tune_zone_enter", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgEnter, this, "which message to display on zone enter; use 0 for normal area");
-	Console()->Register("tune_zone_leave", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgLeave, this, "which message to display on zone leave; use 0 for normal area");
+	Console()->Register("tune_zone_reset", "?i[zone]", CFGFLAG_SERVER, ConTuneResetZone, this, "Reset zone tuning in zone x or in all zones");
+	Console()->Register("tune_zone_enter", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgEnter, this, "Which message to display on zone enter; use 0 for normal area");
+	Console()->Register("tune_zone_leave", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgLeave, this, "Which message to display on zone leave; use 0 for normal area");
 	Console()->Register("mapbug", "s[mapbug]", CFGFLAG_SERVER | CFGFLAG_GAME, ConMapbug, this, "Enable map compatibility mode using the specified bug (example: grenade-doubleexplosion@ddnet.tw)");
 	Console()->Register("switch_open", "i[switch]", CFGFLAG_SERVER | CFGFLAG_GAME, ConSwitchOpen, this, "Whether a switch is deactivated by default (otherwise activated)");
 	Console()->Register("pause_game", "", CFGFLAG_SERVER, ConPause, this, "Pause/unpause game");
-	Console()->Register("change_map", "?r[map]", CFGFLAG_SERVER | CFGFLAG_STORE, ConChangeMap, this, "Change map");
-	Console()->Register("random_map", "?i[stars]", CFGFLAG_SERVER, ConRandomMap, this, "Random map");
-	Console()->Register("random_unfinished_map", "?i[stars]", CFGFLAG_SERVER, ConRandomUnfinishedMap, this, "Random unfinished map");
+	Console()->Register("change_map", "r[map]", CFGFLAG_SERVER | CFGFLAG_STORE, ConChangeMap, this, "Change map");
+	Console()->Register("random_map", "?i[stars]", CFGFLAG_SERVER | CFGFLAG_STORE, ConRandomMap, this, "Random map");
+	Console()->Register("random_unfinished_map", "?i[stars]", CFGFLAG_SERVER | CFGFLAG_STORE, ConRandomUnfinishedMap, this, "Random unfinished map");
 	Console()->Register("restart", "?i[seconds]", CFGFLAG_SERVER | CFGFLAG_STORE, ConRestart, this, "Restart in x seconds (0 = abort)");
 	Console()->Register("broadcast", "r[message]", CFGFLAG_SERVER, ConBroadcast, this, "Broadcast message");
 	Console()->Register("say", "r[message]", CFGFLAG_SERVER, ConSay, this, "Say in chat");
 	Console()->Register("set_team", "i[id] i[team-id] ?i[delay in minutes]", CFGFLAG_SERVER, ConSetTeam, this, "Set team of player to team");
 	Console()->Register("set_team_all", "i[team-id]", CFGFLAG_SERVER, ConSetTeamAll, this, "Set team of all players to team");
+	Console()->Register("hot_reload", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConHotReload, this, "Reload the map while preserving the state of tees and teams");
+	Console()->Register("reload_censorlist", "", CFGFLAG_SERVER, ConReloadCensorlist, this, "Reload the censorlist");
+	Console()->Register("reload_announcement", "", CFGFLAG_SERVER, ConReloadAnnouncement, this, "Reload the announcements");
 
 	Console()->Register("add_vote", "s[name] r[command]", CFGFLAG_SERVER, ConAddVote, this, "Add a voting option");
 	Console()->Register("remove_vote", "r[name]", CFGFLAG_SERVER, ConRemoveVote, this, "remove a voting option");
 	Console()->Register("force_vote", "s[name] s[command] ?r[reason]", CFGFLAG_SERVER, ConForceVote, this, "Force a voting option");
 	Console()->Register("clear_votes", "", CFGFLAG_SERVER, ConClearVotes, this, "Clears the voting options");
-	Console()->Register("add_map_votes", "", CFGFLAG_SERVER, ConAddMapVotes, this, "Automatically adds voting options for all maps");
+	Console()->Register("add_map_votes", "?s[directory]", CFGFLAG_SERVER, ConAddMapVotes, this, "Automatically adds voting options for all maps");
 	Console()->Register("vote", "r['yes'|'no']", CFGFLAG_SERVER, ConVote, this, "Force a vote to yes/no");
 	Console()->Register("votes", "?i[page]", CFGFLAG_SERVER, ConVotes, this, "Show all votes (page 0 by default, 20 entries per page)");
 	Console()->Register("dump_antibot", "", CFGFLAG_SERVER, ConDumpAntibot, this, "Dumps the antibot status");
@@ -3523,12 +3661,166 @@ void CGameContext::OnConsoleInit()
 	Console()->Chain("sv_vote_kick_min", ConchainSettingUpdate, this);
 	Console()->Chain("sv_vote_spectate", ConchainSettingUpdate, this);
 	Console()->Chain("sv_spectator_slots", ConchainSettingUpdate, this);
-	Console()->Chain("sv_max_clients", ConchainSettingUpdate, this);
 
-#define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help);
-#include <game/ddracecommands.h>
-#define CHAT_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help);
-#include <game/ddracechat.h>
+	RegisterDDRaceCommands();
+	RegisterChatCommands();
+}
+
+void CGameContext::RegisterDDRaceCommands()
+{
+	Console()->Register("kill_pl", "v[id]", CFGFLAG_SERVER, ConKillPlayer, this, "Kills player v and announces the kill");
+	Console()->Register("totele", "i[number]", CFGFLAG_SERVER | CMDFLAG_TEST, ConToTeleporter, this, "Teleports you to teleporter v");
+	Console()->Register("totelecp", "i[number]", CFGFLAG_SERVER | CMDFLAG_TEST, ConToCheckTeleporter, this, "Teleports you to checkpoint teleporter v");
+	Console()->Register("tele", "?i[id] ?i[id]", CFGFLAG_SERVER | CMDFLAG_TEST, ConTeleport, this, "Teleports player i (or you) to player i (or you to where you look at)");
+	Console()->Register("addweapon", "i[weapon-id]", CFGFLAG_SERVER | CMDFLAG_TEST, ConAddWeapon, this, "Gives weapon with id i to you (all = -1, hammer = 0, gun = 1, shotgun = 2, grenade = 3, laser = 4, ninja = 5)");
+	Console()->Register("removeweapon", "i[weapon-id]", CFGFLAG_SERVER | CMDFLAG_TEST, ConRemoveWeapon, this, "removes weapon with id i from you (all = -1, hammer = 0, gun = 1, shotgun = 2, grenade = 3, laser = 4, ninja = 5)");
+	Console()->Register("shotgun", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConShotgun, this, "Gives a shotgun to you");
+	Console()->Register("grenade", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConGrenade, this, "Gives a grenade launcher to you");
+	Console()->Register("laser", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConLaser, this, "Gives a laser to you");
+	Console()->Register("rifle", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConLaser, this, "Gives a laser to you");
+	Console()->Register("jetpack", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConJetpack, this, "Gives jetpack to you");
+	Console()->Register("setjumps", "i[jumps]", CFGFLAG_SERVER | CMDFLAG_TEST, ConSetJumps, this, "Gives you as many jumps as you specify");
+	Console()->Register("weapons", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConWeapons, this, "Gives all weapons to you");
+	Console()->Register("unshotgun", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnShotgun, this, "Removes the shotgun from you");
+	Console()->Register("ungrenade", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnGrenade, this, "Removes the grenade launcher from you");
+	Console()->Register("unlaser", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnLaser, this, "Removes the laser from you");
+	Console()->Register("unrifle", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnLaser, this, "Removes the laser from you");
+	Console()->Register("unjetpack", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnJetpack, this, "Removes the jetpack from you");
+	Console()->Register("unweapons", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnWeapons, this, "Removes all weapons from you");
+	Console()->Register("ninja", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConNinja, this, "Makes you a ninja");
+	Console()->Register("unninja", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnNinja, this, "Removes ninja from you");
+	Console()->Register("super", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConSuper, this, "Makes you super");
+	Console()->Register("unsuper", "", CFGFLAG_SERVER, ConUnSuper, this, "Removes super from you");
+	Console()->Register("endless_hook", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConEndlessHook, this, "Gives you endless hook");
+	Console()->Register("unendless_hook", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnEndlessHook, this, "Removes endless hook from you");
+	Console()->Register("solo", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConSolo, this, "Puts you into solo part");
+	Console()->Register("unsolo", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnSolo, this, "Puts you out of solo part");
+	Console()->Register("freeze", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConFreeze, this, "Puts you into freeze");
+	Console()->Register("unfreeze", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnFreeze, this, "Puts you out of freeze");
+	Console()->Register("deep", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConDeep, this, "Puts you into deep freeze");
+	Console()->Register("undeep", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnDeep, this, "Puts you out of deep freeze");
+	Console()->Register("livefreeze", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConLiveFreeze, this, "Makes you live frozen");
+	Console()->Register("unlivefreeze", "", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnLiveFreeze, this, "Puts you out of live freeze");
+	Console()->Register("left", "?i[tiles]", CFGFLAG_SERVER | CMDFLAG_TEST, ConGoLeft, this, "Makes you move 1 tile left");
+	Console()->Register("right", "?i[tiles]", CFGFLAG_SERVER | CMDFLAG_TEST, ConGoRight, this, "Makes you move 1 tile right");
+	Console()->Register("up", "?i[tiles]", CFGFLAG_SERVER | CMDFLAG_TEST, ConGoUp, this, "Makes you move 1 tile up");
+	Console()->Register("down", "?i[tiles]", CFGFLAG_SERVER | CMDFLAG_TEST, ConGoDown, this, "Makes you move 1 tile down");
+
+	Console()->Register("move", "i[x] i[y]", CFGFLAG_SERVER | CMDFLAG_TEST, ConMove, this, "Moves to the tile with x/y-number ii");
+	Console()->Register("move_raw", "i[x] i[y]", CFGFLAG_SERVER | CMDFLAG_TEST, ConMoveRaw, this, "Moves to the point with x/y-coordinates ii");
+	Console()->Register("force_pause", "v[id] i[seconds]", CFGFLAG_SERVER, ConForcePause, this, "Force i to pause for i seconds");
+	Console()->Register("force_unpause", "v[id]", CFGFLAG_SERVER, ConForcePause, this, "Set force-pause timer of i to 0.");
+
+	Console()->Register("set_team_ddr", "v[id] i[team]", CFGFLAG_SERVER, ConSetDDRTeam, this, "Set ddrace team of a player");
+	Console()->Register("uninvite", "v[id] i[team]", CFGFLAG_SERVER, ConUninvite, this, "Uninvite player from team");
+
+	Console()->Register("vote_mute", "v[id] i[seconds] ?r[reason]", CFGFLAG_SERVER, ConVoteMute, this, "Remove v's right to vote for i seconds");
+	Console()->Register("vote_unmute", "v[id]", CFGFLAG_SERVER, ConVoteUnmute, this, "Give back v's right to vote.");
+	Console()->Register("vote_mutes", "", CFGFLAG_SERVER, ConVoteMutes, this, "List the current active vote mutes.");
+	Console()->Register("mute", "", CFGFLAG_SERVER, ConMute, this, "Use either 'muteid <client_id> <seconds> <reason>' or 'muteip <ip> <seconds> <reason>'");
+	Console()->Register("muteid", "v[id] i[seconds] ?r[reason]", CFGFLAG_SERVER, ConMuteId, this, "Mute player with id");
+	Console()->Register("muteip", "s[ip] i[seconds] ?r[reason]", CFGFLAG_SERVER, ConMuteIp, this, "Mute player with IP address");
+	Console()->Register("unmute", "i[muteid]", CFGFLAG_SERVER, ConUnmute, this, "Unmute mute with number from \"mutes\"");
+	Console()->Register("unmuteid", "v[id]", CFGFLAG_SERVER, ConUnmuteId, this, "Unmute player with id");
+	Console()->Register("mutes", "", CFGFLAG_SERVER, ConMutes, this, "Show all active mutes");
+	Console()->Register("moderate", "", CFGFLAG_SERVER, ConModerate, this, "Enables/disables active moderator mode for the player");
+	Console()->Register("vote_no", "", CFGFLAG_SERVER, ConVoteNo, this, "Same as \"vote no\"");
+	Console()->Register("save_dry", "", CFGFLAG_SERVER, ConDrySave, this, "Dump the current savestring");
+	Console()->Register("dump_log", "?i[seconds]", CFGFLAG_SERVER, ConDumpLog, this, "Show logs of the last i seconds");
+
+	Console()->Register("freezehammer", "v[id]", CFGFLAG_SERVER | CMDFLAG_TEST, ConFreezeHammer, this, "Gives a player Freeze Hammer");
+	Console()->Register("unfreezehammer", "v[id]", CFGFLAG_SERVER | CMDFLAG_TEST, ConUnFreezeHammer, this, "Removes Freeze Hammer from a player");
+}
+
+void CGameContext::RegisterChatCommands()
+{
+	Console()->Register("credits", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConCredits, this, "Shows the credits of the DDNet mod");
+	Console()->Register("rules", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConRules, this, "Shows the server rules");
+	Console()->Register("emote", "?s[emote name] i[duration in seconds]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConEyeEmote, this, "Sets your tee's eye emote");
+	Console()->Register("eyeemote", "?s['on'|'off'|'toggle']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSetEyeEmote, this, "Toggles use of standard eye-emotes on/off, eyeemote s, where s = on for on, off for off, toggle for toggle and nothing to show current status");
+	Console()->Register("settings", "?s[configname]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSettings, this, "Shows gameplay information for this server");
+	Console()->Register("help", "?r[command]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConHelp, this, "Shows help to command r, general help if left blank");
+	Console()->Register("info", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConInfo, this, "Shows info about this server");
+	Console()->Register("list", "?s[filter]", CFGFLAG_CHAT, ConList, this, "List connected players with optional case-insensitive substring matching filter");
+	Console()->Register("me", "r[message]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConMe, this, "Like the famous irc command '/me says hi' will display '<yourname> says hi'");
+	Console()->Register("w", "s[player name] r[message]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConWhisper, this, "Whisper something to someone (private message)");
+	Console()->Register("whisper", "s[player name] r[message]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConWhisper, this, "Whisper something to someone (private message)");
+	Console()->Register("c", "r[message]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConConverse, this, "Converse with the last person you whispered to (private message)");
+	Console()->Register("converse", "r[message]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConConverse, this, "Converse with the last person you whispered to (private message)");
+	Console()->Register("pause", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTogglePause, this, "Toggles pause");
+	Console()->Register("spec", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConToggleSpec, this, "Toggles spec (if not available behaves as /pause)");
+	Console()->Register("pausevoted", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTogglePauseVoted, this, "Toggles pause on the currently voted player");
+	Console()->Register("specvoted", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConToggleSpecVoted, this, "Toggles spec on the currently voted player");
+	Console()->Register("dnd", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConDND, this, "Toggle Do Not Disturb (no chat and server messages)");
+	Console()->Register("whispers", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConWhispers, this, "Toggle receiving whispers");
+	Console()->Register("mapinfo", "?r[map]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConMapInfo, this, "Show info about the map with name r gives (current map by default)");
+	Console()->Register("timeout", "?s[code]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTimeout, this, "Set timeout protection code s");
+	Console()->Register("practice", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConPractice, this, "Enable cheats for your current team's run, but you can't earn a rank");
+	Console()->Register("practicecmdlist", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConPracticeCmdList, this, "List all commands that are avaliable in practice mode");
+	Console()->Register("swap", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSwap, this, "Request to swap your tee with another team member");
+	Console()->Register("save", "?r[code]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSave, this, "Save team with code r.");
+	Console()->Register("load", "?r[code]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConLoad, this, "Load with code r. /load to check your existing saves");
+	Console()->Register("map", "?r[map]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConMap, this, "Vote a map by name");
+
+	Console()->Register("rankteam", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeamRank, this, "Shows the team rank of player with name r (your team rank by default)");
+	Console()->Register("teamrank", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeamRank, this, "Shows the team rank of player with name r (your team rank by default)");
+
+	Console()->Register("rank", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConRank, this, "Shows the rank of player with name r (your rank by default)");
+	Console()->Register("top5team", "?s[player name] ?i[rank to start with]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeamTop5, this, "Shows five team ranks of the ladder or of a player beginning with rank i (1 by default, -1 for worst)");
+	Console()->Register("teamtop5", "?s[player name] ?i[rank to start with]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeamTop5, this, "Shows five team ranks of the ladder or of a player beginning with rank i (1 by default, -1 for worst)");
+	Console()->Register("top", "?i[rank to start with]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTop, this, "Shows the top ranks of the global and regional ladder beginning with rank i (1 by default, -1 for worst)");
+	Console()->Register("top5", "?i[rank to start with]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTop, this, "Shows the top ranks of the global and regional ladder beginning with rank i (1 by default, -1 for worst)");
+	Console()->Register("times", "?s[player name] ?i[number of times to skip]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTimes, this, "/times ?s?i shows last 5 times of the server or of a player beginning with name s starting with time i (i = 1 by default, -1 for first)");
+	Console()->Register("points", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConPoints, this, "Shows the global points of a player beginning with name r (your rank by default)");
+	Console()->Register("top5points", "?i[number]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTopPoints, this, "Shows five points of the global point ladder beginning with rank i (1 by default)");
+	Console()->Register("timecp", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTimeCP, this, "Set your checkpoints based on another player");
+
+	Console()->Register("team", "?i[id]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeam, this, "Lets you join team i (shows your team if left blank)");
+	Console()->Register("lock", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConLock, this, "Toggle team lock so no one else can join and so the team restarts when a player dies. /lock 0 to unlock, /lock 1 to lock");
+	Console()->Register("unlock", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConUnlock, this, "Unlock a team");
+	Console()->Register("invite", "r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConInvite, this, "Invite a person to a locked team");
+	Console()->Register("join", "r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConJoin, this, "Join the team of the specified player");
+	Console()->Register("team0mode", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeam0Mode, this, "Toggle team between team 0 and team mode. This mode will make your team behave like team 0.");
+
+	Console()->Register("showothers", "?i['0'|'1'|'2']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConShowOthers, this, "Whether to show players from other teams or not (off by default), optional i = 0 for off, i = 1 for on, i = 2 for own team only");
+	Console()->Register("showall", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConShowAll, this, "Whether to show players at any distance (off by default), optional i = 0 for off else for on");
+	Console()->Register("specteam", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSpecTeam, this, "Whether to show players from other teams when spectating (on by default), optional i = 0 for off else for on");
+	Console()->Register("ninjajetpack", "?i['0'|'1']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConNinjaJetpack, this, "Whether to use ninja jetpack or not. Makes jetpack look more awesome");
+	Console()->Register("saytime", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConSayTime, this, "Privately messages someone's current time in this current running race (your time by default)");
+	Console()->Register("saytimeall", "", CFGFLAG_CHAT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race");
+	Console()->Register("time", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message");
+	Console()->Register("timer", "?s['gametimer'|'broadcast'|'both'|'none'|'cycle']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSetTimerType, this, "Personal Setting of showing time in either broadcast or game/round timer, timer s, where s = broadcast for broadcast, gametimer for game/round timer, cycle for cycle, both for both, none for no timer and nothing to show current status");
+	Console()->Register("r", "", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConRescue, this, "Teleport yourself out of freeze if auto rescue mode is enabled, otherwise it will set position for rescuing if grounded and teleport you out of freeze if not (use sv_rescue 1 to enable this feature)");
+	Console()->Register("rescue", "", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConRescue, this, "Teleport yourself out of freeze if auto rescue mode is enabled, otherwise it will set position for rescuing if grounded and teleport you out of freeze if not (use sv_rescue 1 to enable this feature)");
+	Console()->Register("rescuemode", "?r['auto'|'manual']", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConRescueMode, this, "Sets one of the two rescue modes (auto or manual). Prints current mode if no arguments provided");
+	Console()->Register("tp", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConTeleTo, this, "Depending on the number of supplied arguments, teleport yourself to; (0.) where you are spectating or aiming; (1.) the specified player name");
+	Console()->Register("teleport", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConTeleTo, this, "Depending on the number of supplied arguments, teleport yourself to; (0.) where you are spectating or aiming; (1.) the specified player name");
+	Console()->Register("tpxy", "s[x] s[y]", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConTeleXY, this, "Teleport yourself to the specified coordinates. A tilde (~) can be used to denote your current position, e.g. '/tpxy ~1 ~' to teleport one tile to the right");
+	Console()->Register("lasttp", "", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConLastTele, this, "Teleport yourself to the last location you teleported to");
+	Console()->Register("tc", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConTeleCursor, this, "Teleport yourself to player or to where you are spectating/or looking if no player name is given");
+	Console()->Register("telecursor", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER | CMDFLAG_PRACTICE, ConTeleCursor, this, "Teleport yourself to player or to where you are spectating/or looking if no player name is given");
+	Console()->Register("unsolo", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnSolo, this, "Puts you out of solo part");
+	Console()->Register("solo", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeSolo, this, "Puts you into solo part");
+	Console()->Register("undeep", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnDeep, this, "Puts you out of deep freeze");
+	Console()->Register("deep", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeDeep, this, "Puts you into deep freeze");
+	Console()->Register("addweapon", "i[weapon-id]", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeAddWeapon, this, "Gives weapon with id i to you (all = -1, hammer = 0, gun = 1, shotgun = 2, grenade = 3, laser = 4, ninja = 5)");
+	Console()->Register("removeweapon", "i[weapon-id]", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeRemoveWeapon, this, "removes weapon with id i from you (all = -1, hammer = 0, gun = 1, shotgun = 2, grenade = 3, laser = 4, ninja = 5)");
+	Console()->Register("shotgun", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeShotgun, this, "Gives a shotgun to you");
+	Console()->Register("grenade", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeGrenade, this, "Gives a grenade launcher to you");
+	Console()->Register("laser", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeLaser, this, "Gives a laser to you");
+	Console()->Register("rifle", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeLaser, this, "Gives a laser to you");
+	Console()->Register("jetpack", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeJetpack, this, "Gives jetpack to you");
+	Console()->Register("setjumps", "i[jumps]", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeSetJumps, this, "Gives you as many jumps as you specify");
+	Console()->Register("weapons", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeWeapons, this, "Gives all weapons to you");
+	Console()->Register("unshotgun", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnShotgun, this, "Removes the shotgun from you");
+	Console()->Register("ungrenade", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnGrenade, this, "Removes the grenade launcher from you");
+	Console()->Register("unlaser", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnLaser, this, "Removes the laser from you");
+	Console()->Register("unrifle", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnLaser, this, "Removes the laser from you");
+	Console()->Register("unjetpack", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnJetpack, this, "Removes the jetpack from you");
+	Console()->Register("unweapons", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnWeapons, this, "Removes all weapons from you");
+	Console()->Register("ninja", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeNinja, this, "Makes you a ninja");
+	Console()->Register("unninja", "", CFGFLAG_CHAT | CMDFLAG_PRACTICE, ConPracticeUnNinja, this, "Removes ninja from you");
+	Console()->Register("kill", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConProtectedKill, this, "Kill yourself when kill-protected during a long game (use f1, kill for regular kill)");
 }
 
 void CGameContext::OnInit(const void *pPersistentData)
@@ -3643,23 +3935,7 @@ void CGameContext::OnInit(const void *pPersistentData)
 	else
 		m_pController = new CGameControllerDDRace(this);
 
-	const char *pCensorFilename = "censorlist.txt";
-	IOHANDLE File = Storage()->OpenFile(pCensorFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!File)
-	{
-		dbg_msg("censorlist", "failed to open '%s'", pCensorFilename);
-	}
-	else
-	{
-		CLineReader LineReader;
-		LineReader.Init(File);
-		char *pLine;
-		while((pLine = LineReader.Get()))
-		{
-			m_vCensorlist.emplace_back(pLine);
-		}
-		io_close(File);
-	}
+	ReadCensorList();
 
 	m_TeeHistorianActive = g_Config.m_SvTeeHistorian;
 	if(m_TeeHistorianActive)
@@ -3734,6 +4010,8 @@ void CGameContext::OnInit(const void *pPersistentData)
 		}
 	}
 
+	Server()->DemoRecorder_HandleAutoStart();
+
 	if(!m_pScore)
 	{
 		m_pScore = new CScore(this, ((CServer *)Server())->DbPool());
@@ -3742,9 +4020,6 @@ void CGameContext::OnInit(const void *pPersistentData)
 	// create all entities from the game layer
 	CreateAllEntities(true);
 
-	if(GIT_SHORTREV_HASH)
-		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "git-revision", GIT_SHORTREV_HASH);
-
 	m_pAntibot->RoundStart(this);
 }
 
@@ -3863,36 +4138,28 @@ void CGameContext::OnMapChange(char *pNewMapName, int MapNameSize)
 	char aConfig[IO_MAX_PATH_LENGTH];
 	str_format(aConfig, sizeof(aConfig), "maps/%s.cfg", g_Config.m_SvMap);
 
-	IOHANDLE File = Storage()->OpenFile(aConfig, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(!File)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(Storage()->OpenFile(aConfig, IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
 		// No map-specific config, just return.
 		return;
 	}
-	CLineReader LineReader;
-	LineReader.Init(File);
 
-	std::vector<char *> vLines;
-	char *pLine;
+	std::vector<const char *> vpLines;
 	int TotalLength = 0;
-	while((pLine = LineReader.Get()))
+	while(const char *pLine = LineReader.Get())
 	{
-		int Length = str_length(pLine) + 1;
-		char *pCopy = (char *)malloc(Length);
-		mem_copy(pCopy, pLine, Length);
-		vLines.push_back(pCopy);
-		TotalLength += Length;
+		vpLines.push_back(pLine);
+		TotalLength += str_length(pLine) + 1;
 	}
-	io_close(File);
 
 	char *pSettings = (char *)malloc(maximum(1, TotalLength));
 	int Offset = 0;
-	for(auto &Line : vLines)
+	for(const char *pLine : vpLines)
 	{
-		int Length = str_length(Line) + 1;
-		mem_copy(pSettings + Offset, Line, Length);
+		int Length = str_length(pLine) + 1;
+		mem_copy(pSettings + Offset, pLine, Length);
 		Offset += Length;
-		free(Line);
 	}
 
 	CDataFileReader Reader;
@@ -3904,12 +4171,12 @@ void CGameContext::OnMapChange(char *pNewMapName, int MapNameSize)
 	bool FoundInfo = false;
 	for(int i = 0; i < Reader.NumItems(); i++)
 	{
-		int TypeID;
-		int ItemID;
-		void *pData = Reader.GetItem(i, &TypeID, &ItemID);
+		int TypeId;
+		int ItemId;
+		void *pData = Reader.GetItem(i, &TypeId, &ItemId);
 		int Size = Reader.GetItemSize(i);
 		CMapItemInfoSettings MapInfo;
-		if(TypeID == MAPITEMTYPE_INFO && ItemID == 0)
+		if(TypeId == MAPITEMTYPE_INFO && ItemId == 0)
 		{
 			FoundInfo = true;
 			if(Size >= (int)sizeof(CMapItemInfoSettings))
@@ -3944,7 +4211,7 @@ void CGameContext::OnMapChange(char *pNewMapName, int MapNameSize)
 				Size = sizeof(MapInfo);
 			}
 		}
-		Writer.AddItem(TypeID, ItemID, Size, pData);
+		Writer.AddItem(TypeId, ItemId, Size, pData);
 	}
 
 	if(!FoundInfo)
@@ -4013,7 +4280,8 @@ void CGameContext::OnShutdown(void *pPersistentData)
 
 	DeleteTempfile();
 	ConfigManager()->ResetGameSettings();
-	Collision()->Dest();
+	Collision()->Unload();
+	Layers()->Unload();
 	delete m_pController;
 	m_pController = 0;
 	Clear();
@@ -4026,10 +4294,10 @@ void CGameContext::LoadMapSettings()
 	pMap->GetType(MAPITEMTYPE_INFO, &Start, &Num);
 	for(int i = Start; i < Start + Num; i++)
 	{
-		int ItemID;
-		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemID);
+		int ItemId;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemId);
 		int ItemSize = pMap->GetItemSize(i);
-		if(!pItem || ItemID != 0)
+		if(!pItem || ItemId != 0)
 			continue;
 
 		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
@@ -4055,36 +4323,37 @@ void CGameContext::LoadMapSettings()
 	Console()->ExecuteFile(aBuf, IConsole::CLIENT_ID_NO_GAME);
 }
 
-void CGameContext::OnSnap(int ClientID)
+void CGameContext::OnSnap(int ClientId)
 {
 	// add tuning to demo
 	CTuningParams StandardTuning;
-	if(Server()->IsRecording(ClientID > -1 ? ClientID : MAX_CLIENTS) && mem_comp(&StandardTuning, &m_Tuning, sizeof(CTuningParams)) != 0)
+	if(Server()->IsRecording(ClientId > -1 ? ClientId : MAX_CLIENTS) && mem_comp(&StandardTuning, &m_Tuning, sizeof(CTuningParams)) != 0)
 	{
 		CMsgPacker Msg(NETMSGTYPE_SV_TUNEPARAMS);
 		int *pParams = (int *)&m_Tuning;
 		for(unsigned i = 0; i < sizeof(m_Tuning) / sizeof(int); i++)
 			Msg.AddInt(pParams[i]);
-		Server()->SendMsg(&Msg, MSGFLAG_RECORD | MSGFLAG_NOSEND, ClientID);
+		Server()->SendMsg(&Msg, MSGFLAG_RECORD | MSGFLAG_NOSEND, ClientId);
 	}
 
-	m_pController->Snap(ClientID);
+	m_pController->Snap(ClientId);
 
 	for(auto &pPlayer : m_apPlayers)
 	{
 		if(pPlayer)
-			pPlayer->Snap(ClientID);
+			pPlayer->Snap(ClientId);
 	}
 
-	if(ClientID > -1)
-		m_apPlayers[ClientID]->FakeSnap();
+	if(ClientId > -1)
+		m_apPlayers[ClientId]->FakeSnap();
 
-	m_World.Snap(ClientID);
-	m_Events.Snap(ClientID);
+	m_World.Snap(ClientId);
+	m_Events.Snap(ClientId);
 }
 void CGameContext::OnPreSnap() {}
 void CGameContext::OnPostSnap()
 {
+	m_World.PostSnap();
 	m_Events.Clear();
 }
 
@@ -4149,14 +4418,14 @@ void CGameContext::UpdatePlayerMaps()
 	}
 }
 
-bool CGameContext::IsClientReady(int ClientID) const
+bool CGameContext::IsClientReady(int ClientId) const
 {
-	return m_apPlayers[ClientID] && m_apPlayers[ClientID]->m_IsReady;
+	return m_apPlayers[ClientId] && m_apPlayers[ClientId]->m_IsReady;
 }
 
-bool CGameContext::IsClientPlayer(int ClientID) const
+bool CGameContext::IsClientPlayer(int ClientId) const
 {
-	return m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetTeam() != TEAM_SPECTATORS;
+	return m_apPlayers[ClientId] && m_apPlayers[ClientId]->GetTeam() != TEAM_SPECTATORS;
 }
 
 CUuid CGameContext::GameUuid() const { return m_GameUuid; }
@@ -4166,13 +4435,13 @@ const char *CGameContext::NetVersion() const { return GAME_NETVERSION; }
 
 IGameServer *CreateGameServer() { return new CGameContext; }
 
-void CGameContext::OnSetAuthed(int ClientID, int Level)
+void CGameContext::OnSetAuthed(int ClientId, int Level)
 {
-	if(m_apPlayers[ClientID])
+	if(m_apPlayers[ClientId])
 	{
-		char aBuf[512], aIP[NETADDR_MAXSTRSIZE];
-		Server()->GetClientAddr(ClientID, aIP, sizeof(aIP));
-		str_format(aBuf, sizeof(aBuf), "ban %s %d Banned by vote", aIP, g_Config.m_SvVoteKickBantime);
+		char aBuf[512], aIp[NETADDR_MAXSTRSIZE];
+		Server()->GetClientAddr(ClientId, aIp, sizeof(aIp));
+		str_format(aBuf, sizeof(aBuf), "ban %s %d Banned by vote", aIp, g_Config.m_SvVoteKickBantime);
 		if(!str_comp_nocase(m_aVoteCommand, aBuf) && Level > Server()->GetAuthedState(m_VoteCreator))
 		{
 			m_VoteEnforce = CGameContext::VOTE_ENFORCE_NO_ADMIN;
@@ -4183,44 +4452,44 @@ void CGameContext::OnSetAuthed(int ClientID, int Level)
 	{
 		if(Level)
 		{
-			m_TeeHistorian.RecordAuthLogin(ClientID, Level, Server()->GetAuthName(ClientID));
+			m_TeeHistorian.RecordAuthLogin(ClientId, Level, Server()->GetAuthName(ClientId));
 		}
 		else
 		{
-			m_TeeHistorian.RecordAuthLogout(ClientID);
+			m_TeeHistorian.RecordAuthLogout(ClientId);
 		}
 	}
 }
 
-void CGameContext::SendRecord(int ClientID)
+void CGameContext::SendRecord(int ClientId)
 {
 	CNetMsg_Sv_Record Msg;
 	CNetMsg_Sv_RecordLegacy MsgLegacy;
-	MsgLegacy.m_PlayerTimeBest = Msg.m_PlayerTimeBest = Score()->PlayerData(ClientID)->m_BestTime * 100.0f;
+	MsgLegacy.m_PlayerTimeBest = Msg.m_PlayerTimeBest = Score()->PlayerData(ClientId)->m_BestTime * 100.0f;
 	MsgLegacy.m_ServerTimeBest = Msg.m_ServerTimeBest = m_pController->m_CurrentRecord * 100.0f; //TODO: finish this
-	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
-	if(!Server()->IsSixup(ClientID) && GetClientVersion(ClientID) < VERSION_DDNET_MSG_LEGACY)
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
+	if(!Server()->IsSixup(ClientId) && GetClientVersion(ClientId) < VERSION_DDNET_MSG_LEGACY)
 	{
-		Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+		Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientId);
 	}
 }
 
-bool CGameContext::ProcessSpamProtection(int ClientID, bool RespectChatInitialDelay)
+bool CGameContext::ProcessSpamProtection(int ClientId, bool RespectChatInitialDelay)
 {
-	if(!m_apPlayers[ClientID])
+	if(!m_apPlayers[ClientId])
 		return false;
-	if(g_Config.m_SvSpamprotection && m_apPlayers[ClientID]->m_LastChat && m_apPlayers[ClientID]->m_LastChat + Server()->TickSpeed() * g_Config.m_SvChatDelay > Server()->Tick())
+	if(g_Config.m_SvSpamprotection && m_apPlayers[ClientId]->m_LastChat && m_apPlayers[ClientId]->m_LastChat + Server()->TickSpeed() * g_Config.m_SvChatDelay > Server()->Tick())
 		return true;
-	else if(g_Config.m_SvDnsblChat && Server()->DnsblBlack(ClientID))
+	else if(g_Config.m_SvDnsblChat && Server()->DnsblBlack(ClientId))
 	{
-		SendChatTarget(ClientID, "Players are not allowed to chat from VPNs at this time");
+		SendChatTarget(ClientId, "Players are not allowed to chat from VPNs at this time");
 		return true;
 	}
 	else
-		m_apPlayers[ClientID]->m_LastChat = Server()->Tick();
+		m_apPlayers[ClientId]->m_LastChat = Server()->Tick();
 
 	NETADDR Addr;
-	Server()->GetClientAddr(ClientID, &Addr);
+	Server()->GetClientAddr(ClientId, &Addr);
 
 	CMute Muted;
 	int Expires = 0;
@@ -4243,23 +4512,23 @@ bool CGameContext::ProcessSpamProtection(int ClientID, bool RespectChatInitialDe
 			str_format(aBuf, sizeof(aBuf), "This server has an initial chat delay, you will be able to talk in %d seconds.", Expires);
 		else
 			str_format(aBuf, sizeof(aBuf), "You are not permitted to talk for the next %d seconds.", Expires);
-		SendChatTarget(ClientID, aBuf);
+		SendChatTarget(ClientId, aBuf);
 		return true;
 	}
 
-	if(g_Config.m_SvSpamMuteDuration && (m_apPlayers[ClientID]->m_ChatScore += g_Config.m_SvChatPenalty) > g_Config.m_SvChatThreshold)
+	if(g_Config.m_SvSpamMuteDuration && (m_apPlayers[ClientId]->m_ChatScore += g_Config.m_SvChatPenalty) > g_Config.m_SvChatThreshold)
 	{
-		Mute(&Addr, g_Config.m_SvSpamMuteDuration, Server()->ClientName(ClientID));
-		m_apPlayers[ClientID]->m_ChatScore = 0;
+		Mute(&Addr, g_Config.m_SvSpamMuteDuration, Server()->ClientName(ClientId));
+		m_apPlayers[ClientId]->m_ChatScore = 0;
 		return true;
 	}
 
 	return false;
 }
 
-int CGameContext::GetDDRaceTeam(int ClientID) const
+int CGameContext::GetDDRaceTeam(int ClientId) const
 {
-	return m_pController->Teams().m_Core.Team(ClientID);
+	return m_pController->Teams().m_Core.Team(ClientId);
 }
 
 void CGameContext::ResetTuning()
@@ -4274,14 +4543,14 @@ void CGameContext::ResetTuning()
 	SendTuningParams(-1);
 }
 
-bool CheckClientID2(int ClientID)
+bool CheckClientId2(int ClientId)
 {
-	return ClientID >= 0 && ClientID < MAX_CLIENTS;
+	return ClientId >= 0 && ClientId < MAX_CLIENTS;
 }
 
-void CGameContext::Whisper(int ClientID, char *pStr)
+void CGameContext::Whisper(int ClientId, char *pStr)
 {
-	if(ProcessSpamProtection(ClientID))
+	if(ProcessSpamProtection(ClientId))
 		return;
 
 	pStr = str_skip_whitespaces(pStr);
@@ -4369,118 +4638,124 @@ void CGameContext::Whisper(int ClientID, char *pStr)
 
 	if(Error)
 	{
-		SendChatTarget(ClientID, "Invalid whisper");
+		SendChatTarget(ClientId, "Invalid whisper");
 		return;
 	}
 
-	if(Victim >= MAX_CLIENTS || !CheckClientID2(Victim))
+	if(Victim >= MAX_CLIENTS || !CheckClientId2(Victim))
 	{
 		char aBuf[256];
 		str_format(aBuf, sizeof(aBuf), "No player with name \"%s\" found", pName);
-		SendChatTarget(ClientID, aBuf);
+		SendChatTarget(ClientId, aBuf);
 		return;
 	}
 
-	WhisperID(ClientID, Victim, pStr);
+	WhisperId(ClientId, Victim, pStr);
 }
 
-void CGameContext::WhisperID(int ClientID, int VictimID, const char *pMessage)
+void CGameContext::WhisperId(int ClientId, int VictimId, const char *pMessage)
 {
-	if(!CheckClientID2(ClientID))
+	if(!CheckClientId2(ClientId))
 		return;
 
-	if(!CheckClientID2(VictimID))
+	if(!CheckClientId2(VictimId))
 		return;
 
-	if(m_apPlayers[ClientID])
-		m_apPlayers[ClientID]->m_LastWhisperTo = VictimID;
+	if(m_apPlayers[ClientId])
+		m_apPlayers[ClientId]->m_LastWhisperTo = VictimId;
 
 	char aCensoredMessage[256];
 	CensorMessage(aCensoredMessage, pMessage, sizeof(aCensoredMessage));
 
 	char aBuf[256];
 
-	if(Server()->IsSixup(ClientID))
+	if(Server()->IsSixup(ClientId))
 	{
 		protocol7::CNetMsg_Sv_Chat Msg;
-		Msg.m_ClientID = ClientID;
+		Msg.m_ClientId = ClientId;
 		Msg.m_Mode = protocol7::CHAT_WHISPER;
 		Msg.m_pMessage = aCensoredMessage;
-		Msg.m_TargetID = VictimID;
+		Msg.m_TargetId = VictimId;
 
-		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 	}
-	else if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER)
+	else if(GetClientVersion(ClientId) >= VERSION_DDNET_WHISPER)
 	{
 		CNetMsg_Sv_Chat Msg;
-		Msg.m_Team = CHAT_WHISPER_SEND;
-		Msg.m_ClientID = VictimID;
+		Msg.m_Team = TEAM_WHISPER_SEND;
+		Msg.m_ClientId = VictimId;
 		Msg.m_pMessage = aCensoredMessage;
 		if(g_Config.m_SvDemoChat)
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 		else
-			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
 	}
 	else
 	{
-		str_format(aBuf, sizeof(aBuf), "[→ %s] %s", Server()->ClientName(VictimID), aCensoredMessage);
-		SendChatTarget(ClientID, aBuf);
+		str_format(aBuf, sizeof(aBuf), "[→ %s] %s", Server()->ClientName(VictimId), aCensoredMessage);
+		SendChatTarget(ClientId, aBuf);
+	}
+
+	if(!m_apPlayers[VictimId]->m_Whispers)
+	{
+		SendChatTarget(ClientId, "This person has disabled receiving whispers");
+		return;
 	}
 
-	if(Server()->IsSixup(VictimID))
+	if(Server()->IsSixup(VictimId))
 	{
 		protocol7::CNetMsg_Sv_Chat Msg;
-		Msg.m_ClientID = ClientID;
+		Msg.m_ClientId = ClientId;
 		Msg.m_Mode = protocol7::CHAT_WHISPER;
 		Msg.m_pMessage = aCensoredMessage;
-		Msg.m_TargetID = VictimID;
+		Msg.m_TargetId = VictimId;
 
-		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimID);
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimId);
 	}
-	else if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER)
+	else if(GetClientVersion(VictimId) >= VERSION_DDNET_WHISPER)
 	{
 		CNetMsg_Sv_Chat Msg2;
-		Msg2.m_Team = CHAT_WHISPER_RECV;
-		Msg2.m_ClientID = ClientID;
+		Msg2.m_Team = TEAM_WHISPER_RECV;
+		Msg2.m_ClientId = ClientId;
 		Msg2.m_pMessage = aCensoredMessage;
 		if(g_Config.m_SvDemoChat)
-			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL, VictimID);
+			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL, VictimId);
 		else
-			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimID);
+			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimId);
 	}
 	else
 	{
-		str_format(aBuf, sizeof(aBuf), "[← %s] %s", Server()->ClientName(ClientID), aCensoredMessage);
-		SendChatTarget(VictimID, aBuf);
+		str_format(aBuf, sizeof(aBuf), "[← %s] %s", Server()->ClientName(ClientId), aCensoredMessage);
+		SendChatTarget(VictimId, aBuf);
 	}
 }
 
-void CGameContext::Converse(int ClientID, char *pStr)
+void CGameContext::Converse(int ClientId, char *pStr)
 {
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 	if(!pPlayer)
 		return;
 
-	if(ProcessSpamProtection(ClientID))
+	if(ProcessSpamProtection(ClientId))
 		return;
 
 	if(pPlayer->m_LastWhisperTo < 0)
-		SendChatTarget(ClientID, "You do not have an ongoing conversation. Whisper to someone to start one");
+		SendChatTarget(ClientId, "You do not have an ongoing conversation. Whisper to someone to start one");
 	else
 	{
-		WhisperID(ClientID, pPlayer->m_LastWhisperTo, pStr);
+		WhisperId(ClientId, pPlayer->m_LastWhisperTo, pStr);
 	}
 }
 
 bool CGameContext::IsVersionBanned(int Version)
 {
 	char aVersion[16];
-	str_from_int(Version, aVersion);
+	str_format(aVersion, sizeof(aVersion), "%d", Version);
 
 	return str_in_list(g_Config.m_SvBannedVersions, ",", aVersion);
 }
 
-void CGameContext::List(int ClientID, const char *pFilter)
+void CGameContext::List(int ClientId, const char *pFilter)
 {
 	int Total = 0;
 	char aBuf[256];
@@ -4489,7 +4764,7 @@ void CGameContext::List(int ClientID, const char *pFilter)
 		str_format(aBuf, sizeof(aBuf), "Listing players with \"%s\" in name:", pFilter);
 	else
 		str_copy(aBuf, "Listing all players:");
-	SendChatTarget(ClientID, aBuf);
+	SendChatTarget(ClientId, aBuf);
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
 		if(m_apPlayers[i])
@@ -4500,7 +4775,7 @@ void CGameContext::List(int ClientID, const char *pFilter)
 				continue;
 			if(Bufcnt + str_length(pName) + 4 > 256)
 			{
-				SendChatTarget(ClientID, aBuf);
+				SendChatTarget(ClientId, aBuf);
 				Bufcnt = 0;
 			}
 			if(Bufcnt != 0)
@@ -4516,14 +4791,14 @@ void CGameContext::List(int ClientID, const char *pFilter)
 		}
 	}
 	if(Bufcnt != 0)
-		SendChatTarget(ClientID, aBuf);
+		SendChatTarget(ClientId, aBuf);
 	str_format(aBuf, sizeof(aBuf), "%d players online", Total);
-	SendChatTarget(ClientID, aBuf);
+	SendChatTarget(ClientId, aBuf);
 }
 
-int CGameContext::GetClientVersion(int ClientID) const
+int CGameContext::GetClientVersion(int ClientId) const
 {
-	return Server()->GetClientVersion(ClientID);
+	return Server()->GetClientVersion(ClientId);
 }
 
 CClientMask CGameContext::ClientsMaskExcludeClientVersionAndHigher(int Version) const
@@ -4543,14 +4818,13 @@ bool CGameContext::PlayerModerating() const
 	return std::any_of(std::begin(m_apPlayers), std::end(m_apPlayers), [](const CPlayer *pPlayer) { return pPlayer && pPlayer->m_Moderating; });
 }
 
-void CGameContext::ForceVote(int EnforcerID, bool Success)
+void CGameContext::ForceVote(int EnforcerId, bool Success)
 {
 	// check if there is a vote running
 	if(!m_VoteCloseTime)
 		return;
 
 	m_VoteEnforce = Success ? CGameContext::VOTE_ENFORCE_YES_ADMIN : CGameContext::VOTE_ENFORCE_NO_ADMIN;
-	m_VoteEnforcer = EnforcerID;
 
 	char aBuf[256];
 	const char *pOption = Success ? "yes" : "no";
@@ -4560,28 +4834,28 @@ void CGameContext::ForceVote(int EnforcerID, bool Success)
 	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 }
 
-bool CGameContext::RateLimitPlayerVote(int ClientID)
+bool CGameContext::RateLimitPlayerVote(int ClientId)
 {
 	int64_t Now = Server()->Tick();
 	int64_t TickSpeed = Server()->TickSpeed();
-	CPlayer *pPlayer = m_apPlayers[ClientID];
+	CPlayer *pPlayer = m_apPlayers[ClientId];
 
-	if(g_Config.m_SvRconVote && !Server()->GetAuthedState(ClientID))
+	if(g_Config.m_SvRconVote && !Server()->GetAuthedState(ClientId))
 	{
-		SendChatTarget(ClientID, "You can only vote after logging in.");
+		SendChatTarget(ClientId, "You can only vote after logging in.");
 		return true;
 	}
 
 	if(g_Config.m_SvDnsblVote && Server()->DistinctClientCount() > 1)
 	{
-		if(m_pServer->DnsblPending(ClientID))
+		if(m_pServer->DnsblPending(ClientId))
 		{
-			SendChatTarget(ClientID, "You are not allowed to vote because we're currently checking for VPNs. Try again in ~30 seconds.");
+			SendChatTarget(ClientId, "You are not allowed to vote because we're currently checking for VPNs. Try again in ~30 seconds.");
 			return true;
 		}
-		else if(m_pServer->DnsblBlack(ClientID))
+		else if(m_pServer->DnsblBlack(ClientId))
 		{
-			SendChatTarget(ClientID, "You are not allowed to vote because you appear to be using a VPN. Try connecting without a VPN or contacting an admin if you think this is a mistake.");
+			SendChatTarget(ClientId, "You are not allowed to vote because you appear to be using a VPN. Try connecting without a VPN or contacting an admin if you think this is a mistake.");
 			return true;
 		}
 	}
@@ -4592,7 +4866,7 @@ bool CGameContext::RateLimitPlayerVote(int ClientID)
 	pPlayer->m_LastVoteTry = Now;
 	if(m_VoteCloseTime)
 	{
-		SendChatTarget(ClientID, "Wait for current vote to end before calling a new one.");
+		SendChatTarget(ClientId, "Wait for current vote to end before calling a new one.");
 		return true;
 	}
 
@@ -4600,7 +4874,7 @@ bool CGameContext::RateLimitPlayerVote(int ClientID)
 	{
 		char aBuf[64];
 		str_format(aBuf, sizeof(aBuf), "You must wait %d seconds before making your first vote.", (int)((pPlayer->m_FirstVoteTick - Now) / TickSpeed) + 1);
-		SendChatTarget(ClientID, aBuf);
+		SendChatTarget(ClientId, aBuf);
 		return true;
 	}
 
@@ -4609,12 +4883,12 @@ bool CGameContext::RateLimitPlayerVote(int ClientID)
 	{
 		char aChatmsg[64];
 		str_format(aChatmsg, sizeof(aChatmsg), "You must wait %d seconds before making another vote.", (int)(TimeLeft / TickSpeed) + 1);
-		SendChatTarget(ClientID, aChatmsg);
+		SendChatTarget(ClientId, aChatmsg);
 		return true;
 	}
 
 	NETADDR Addr;
-	Server()->GetClientAddr(ClientID, &Addr);
+	Server()->GetClientAddr(ClientId, &Addr);
 	int VoteMuted = 0;
 	for(int i = 0; i < m_NumVoteMutes && !VoteMuted; i++)
 		if(!net_addr_comp_noport(&Addr, &m_aVoteMutes[i].m_Addr))
@@ -4628,96 +4902,98 @@ bool CGameContext::RateLimitPlayerVote(int ClientID)
 	{
 		char aChatmsg[64];
 		str_format(aChatmsg, sizeof(aChatmsg), "You are not permitted to vote for the next %d seconds.", VoteMuted);
-		SendChatTarget(ClientID, aChatmsg);
+		SendChatTarget(ClientId, aChatmsg);
 		return true;
 	}
 	return false;
 }
 
-bool CGameContext::RateLimitPlayerMapVote(int ClientID) const
+bool CGameContext::RateLimitPlayerMapVote(int ClientId) const
 {
-	if(!Server()->GetAuthedState(ClientID) && time_get() < m_LastMapVote + (time_freq() * g_Config.m_SvVoteMapTimeDelay))
+	if(!Server()->GetAuthedState(ClientId) && time_get() < m_LastMapVote + (time_freq() * g_Config.m_SvVoteMapTimeDelay))
 	{
 		char aChatmsg[512] = {0};
 		str_format(aChatmsg, sizeof(aChatmsg), "There's a %d second delay between map-votes, please wait %d seconds.",
 			g_Config.m_SvVoteMapTimeDelay, (int)((m_LastMapVote + g_Config.m_SvVoteMapTimeDelay * time_freq() - time_get()) / time_freq()));
-		SendChatTarget(ClientID, aChatmsg);
+		SendChatTarget(ClientId, aChatmsg);
 		return true;
 	}
 	return false;
 }
 
-void CGameContext::OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID)
+void CGameContext::OnUpdatePlayerServerInfo(CJsonStringWriter *pJSonWriter, int Id)
 {
-	if(BufSize <= 0)
+	if(!m_apPlayers[Id])
 		return;
 
-	aBuf[0] = '\0';
+	CTeeInfo &TeeInfo = m_apPlayers[Id]->m_TeeInfos;
 
-	if(!m_apPlayers[ID])
-		return;
-
-	char aCSkinName[64];
-
-	CTeeInfo &TeeInfo = m_apPlayers[ID]->m_TeeInfos;
+	pJSonWriter->WriteAttribute("skin");
+	pJSonWriter->BeginObject();
 
-	char aJsonSkin[400];
-	aJsonSkin[0] = '\0';
-
-	if(!Server()->IsSixup(ID))
+	// 0.6
+	if(!Server()->IsSixup(Id))
 	{
-		// 0.6
+		pJSonWriter->WriteAttribute("name");
+		pJSonWriter->WriteStrValue(TeeInfo.m_aSkinName);
+
 		if(TeeInfo.m_UseCustomColor)
 		{
-			str_format(aJsonSkin, sizeof(aJsonSkin),
-				"\"name\":\"%s\","
-				"\"color_body\":%d,"
-				"\"color_feet\":%d",
-				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_aSkinName),
-				TeeInfo.m_ColorBody,
-				TeeInfo.m_ColorFeet);
-		}
-		else
-		{
-			str_format(aJsonSkin, sizeof(aJsonSkin),
-				"\"name\":\"%s\"",
-				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_aSkinName));
+			pJSonWriter->WriteAttribute("color_body");
+			pJSonWriter->WriteIntValue(TeeInfo.m_ColorBody);
+
+			pJSonWriter->WriteAttribute("color_feet");
+			pJSonWriter->WriteIntValue(TeeInfo.m_ColorFeet);
 		}
 	}
+	// 0.7
 	else
 	{
 		const char *apPartNames[protocol7::NUM_SKINPARTS] = {"body", "marking", "decoration", "hands", "feet", "eyes"};
-		char aPartBuf[64];
 
 		for(int i = 0; i < protocol7::NUM_SKINPARTS; ++i)
 		{
-			str_format(aPartBuf, sizeof(aPartBuf),
-				"%s\"%s\":{"
-				"\"name\":\"%s\"",
-				i == 0 ? "" : ",",
-				apPartNames[i],
-				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_apSkinPartNames[i]));
+			pJSonWriter->WriteAttribute(apPartNames[i]);
+			pJSonWriter->BeginObject();
 
-			str_append(aJsonSkin, aPartBuf);
+			pJSonWriter->WriteAttribute("name");
+			pJSonWriter->WriteStrValue(TeeInfo.m_apSkinPartNames[i]);
 
 			if(TeeInfo.m_aUseCustomColors[i])
 			{
-				str_format(aPartBuf, sizeof(aPartBuf),
-					",\"color\":%d",
-					TeeInfo.m_aSkinPartColors[i]);
-				str_append(aJsonSkin, aPartBuf);
+				pJSonWriter->WriteAttribute("color");
+				pJSonWriter->WriteIntValue(TeeInfo.m_aSkinPartColors[i]);
 			}
-			str_append(aJsonSkin, "}");
+
+			pJSonWriter->EndObject();
 		}
 	}
 
-	str_format(aBuf, BufSize,
-		",\"skin\":{"
-		"%s"
-		"},"
-		"\"afk\":%s,"
-		"\"team\":%d",
-		aJsonSkin,
-		JsonBool(m_apPlayers[ID]->IsAfk()),
-		m_apPlayers[ID]->GetTeam());
+	pJSonWriter->EndObject();
+
+	pJSonWriter->WriteAttribute("afk");
+	pJSonWriter->WriteBoolValue(m_apPlayers[Id]->IsAfk());
+
+	const int Team = m_pController->IsTeamPlay() ? m_apPlayers[Id]->GetTeam() : m_apPlayers[Id]->GetTeam() == TEAM_SPECTATORS ? -1 : GetDDRaceTeam(Id);
+
+	pJSonWriter->WriteAttribute("team");
+	pJSonWriter->WriteIntValue(Team);
+}
+
+void CGameContext::ReadCensorList()
+{
+	const char *pCensorFilename = "censorlist.txt";
+	CLineReader LineReader;
+	m_vCensorlist.clear();
+	if(LineReader.OpenFile(Storage()->OpenFile(pCensorFilename, IOFLAG_READ, IStorage::TYPE_ALL)))
+	{
+		while(const char *pLine = LineReader.Get())
+		{
+			m_vCensorlist.emplace_back(pLine);
+		}
+	}
+	else
+	{
+		dbg_msg("censorlist", "failed to open '%s'", pCensorFilename);
+	}
 }
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 67a2a37597..d25758c538 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -101,7 +101,7 @@ class CGameContext : public IGameServer
 
 	bool m_Resetting;
 
-	static void CommandCallback(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser);
+	static void CommandCallback(int ClientId, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser);
 	static void TeeHistorianWrite(const void *pData, int DataSize, void *pUser);
 
 	static void ConTuneParam(IConsole::IResult *pResult, void *pUserData);
@@ -124,6 +124,7 @@ class CGameContext : public IGameServer
 	static void ConSay(IConsole::IResult *pResult, void *pUserData);
 	static void ConSetTeam(IConsole::IResult *pResult, void *pUserData);
 	static void ConSetTeamAll(IConsole::IResult *pResult, void *pUserData);
+	static void ConHotReload(IConsole::IResult *pResult, void *pUserData);
 	static void ConAddVote(IConsole::IResult *pResult, void *pUserData);
 	static void ConRemoveVote(IConsole::IResult *pResult, void *pUserData);
 	static void ConForceVote(IConsole::IResult *pResult, void *pUserData);
@@ -180,25 +181,29 @@ class CGameContext : public IGameServer
 	// keep last input to always apply when none is sent
 	CNetObj_PlayerInput m_aLastPlayerInput[MAX_CLIENTS];
 	bool m_aPlayerHasInput[MAX_CLIENTS];
+	CSaveTeam *m_apSavedTeams[MAX_CLIENTS];
+	CSaveTee *m_apSavedTees[MAX_CLIENTS];
+	CSaveTee *m_apSavedTeleTees[MAX_CLIENTS];
+	int m_aTeamMapping[MAX_CLIENTS];
 
 	// returns last input if available otherwise nulled PlayerInput object
-	// ClientID has to be valid
-	CNetObj_PlayerInput GetLastPlayerInput(int ClientID) const;
+	// ClientId has to be valid
+	CNetObj_PlayerInput GetLastPlayerInput(int ClientId) const;
 
 	IGameController *m_pController;
 	CGameWorld m_World;
 
 	// helper functions
-	class CCharacter *GetPlayerChar(int ClientID);
+	class CCharacter *GetPlayerChar(int ClientId);
 	bool EmulateBug(int Bug);
 	std::vector<SSwitchers> &Switchers() { return m_World.m_Core.m_vSwitchers; }
 
 	// voting
 	void StartVote(const char *pDesc, const char *pCommand, const char *pReason, const char *pSixupDesc);
 	void EndVote();
-	void SendVoteSet(int ClientID);
-	void SendVoteStatus(int ClientID, int Total, int Yes, int No);
-	void AbortVoteKickOnDisconnect(int ClientID);
+	void SendVoteSet(int ClientId);
+	void SendVoteStatus(int ClientId, int Total, int Yes, int No);
+	void AbortVoteKickOnDisconnect(int ClientId);
 
 	int m_VoteCreator;
 	int m_VoteType;
@@ -224,7 +229,10 @@ class CGameContext : public IGameServer
 		VOTE_ENFORCE_UNKNOWN = 0,
 		VOTE_ENFORCE_NO,
 		VOTE_ENFORCE_YES,
+		VOTE_ENFORCE_NO_ADMIN,
+		VOTE_ENFORCE_YES_ADMIN,
 		VOTE_ENFORCE_ABORT,
+		VOTE_ENFORCE_CANCEL,
 	};
 	CHeap *m_pVoteOptionHeap;
 	CVoteOptionServer *m_pVoteOptionFirst;
@@ -235,47 +243,42 @@ class CGameContext : public IGameServer
 	void CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask = CClientMask().set());
 	void CreateHammerHit(vec2 Pos, CClientMask Mask = CClientMask().set());
 	void CreatePlayerSpawn(vec2 Pos, CClientMask Mask = CClientMask().set());
-	void CreateDeath(vec2 Pos, int ClientID, CClientMask Mask = CClientMask().set());
+	void CreateDeath(vec2 Pos, int ClientId, CClientMask Mask = CClientMask().set());
+	void CreateBirthdayEffect(vec2 Pos, CClientMask Mask = CClientMask().set());
+	void CreateFinishEffect(vec2 Pos, CClientMask Mask = CClientMask().set());
 	void CreateSound(vec2 Pos, int Sound, CClientMask Mask = CClientMask().set());
 	void CreateSoundGlobal(int Sound, int Target = -1) const;
 
 	void SnapSwitchers(int SnappingClient);
-	bool SnapLaserObject(const CSnapContext &Context, int SnapID, const vec2 &To, const vec2 &From, int StartTick, int Owner = -1, int LaserType = -1, int Subtype = -1, int SwitchNumber = -1) const;
-	bool SnapPickup(const CSnapContext &Context, int SnapID, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const;
+	bool SnapLaserObject(const CSnapContext &Context, int SnapId, const vec2 &To, const vec2 &From, int StartTick, int Owner = -1, int LaserType = -1, int Subtype = -1, int SwitchNumber = -1) const;
+	bool SnapPickup(const CSnapContext &Context, int SnapId, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const;
 
 	enum
 	{
-		CHAT_ALL = -2,
-		CHAT_SPEC = -1,
-		CHAT_RED = 0,
-		CHAT_BLUE = 1,
-		CHAT_WHISPER_SEND = 2,
-		CHAT_WHISPER_RECV = 3,
-
-		CHAT_SIX = 1 << 0,
-		CHAT_SIXUP = 1 << 1,
+		FLAG_SIX = 1 << 0,
+		FLAG_SIXUP = 1 << 1,
 	};
 
 	// network
-	void CallVote(int ClientID, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc = 0);
-	void SendChatTarget(int To, const char *pText, int Flags = CHAT_SIX | CHAT_SIXUP) const;
+	void CallVote(int ClientId, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc = 0);
+	void SendChatTarget(int To, const char *pText, int VersionFlags = FLAG_SIX | FLAG_SIXUP) const;
 	void SendChatTeam(int Team, const char *pText) const;
-	void SendChat(int ClientID, int Team, const char *pText, int SpamProtectionClientID = -1, int Flags = CHAT_SIX | CHAT_SIXUP);
-	void SendStartWarning(int ClientID, const char *pMessage);
-	void SendEmoticon(int ClientID, int Emoticon, int TargetClientID) const;
-	void SendWeaponPickup(int ClientID, int Weapon) const;
-	void SendMotd(int ClientID) const;
-	void SendSettings(int ClientID) const;
-	void SendBroadcast(const char *pText, int ClientID, bool IsImportant = true);
+	void SendChat(int ClientId, int Team, const char *pText, int SpamProtectionClientId = -1, int VersionFlags = FLAG_SIX | FLAG_SIXUP);
+	void SendStartWarning(int ClientId, const char *pMessage);
+	void SendEmoticon(int ClientId, int Emoticon, int TargetClientId) const;
+	void SendWeaponPickup(int ClientId, int Weapon) const;
+	void SendMotd(int ClientId) const;
+	void SendSettings(int ClientId) const;
+	void SendBroadcast(const char *pText, int ClientId, bool IsImportant = true);
 
-	void List(int ClientID, const char *pFilter);
+	void List(int ClientId, const char *pFilter);
 
 	//
 	void CheckPureTuning();
-	void SendTuningParams(int ClientID, int Zone = 0);
+	void SendTuningParams(int ClientId, int Zone = 0);
 
 	const CVoteOptionServer *GetVoteOption(int Index) const;
-	void ProgressVoteOptions(int ClientID);
+	void ProgressVoteOptions(int ClientId);
 
 	//
 	void LoadMapSettings();
@@ -283,49 +286,54 @@ class CGameContext : public IGameServer
 	// engine events
 	void OnInit(const void *pPersistentData) override;
 	void OnConsoleInit() override;
+	void RegisterDDRaceCommands();
+	void RegisterChatCommands();
 	void OnMapChange(char *pNewMapName, int MapNameSize) override;
 	void OnShutdown(void *pPersistentData) override;
 
 	void OnTick() override;
 	void OnPreSnap() override;
-	void OnSnap(int ClientID) override;
+	void OnSnap(int ClientId) override;
 	void OnPostSnap() override;
 
 	void UpdatePlayerMaps();
 
-	void *PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientID);
+	void *PreProcessMsg(int *pMsgId, CUnpacker *pUnpacker, int ClientId);
 	void CensorMessage(char *pCensoredMessage, const char *pMessage, int Size);
-	void OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) override;
-	void OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, const CUnpacker *pUnpacker);
-	void OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientID);
-	void OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientID);
-	void OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientID);
-	void OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker);
-	void OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientID);
-	void OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientID);
-	void OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientID);
-	void OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientID);
-	void OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientID);
-	void OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientID);
-	void OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID);
-	void OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientID);
-
-	bool OnClientDataPersist(int ClientID, void *pData) override;
-	void OnClientConnected(int ClientID, void *pData) override;
-	void OnClientEnter(int ClientID) override;
-	void OnClientDrop(int ClientID, const char *pReason) override;
-	void OnClientPrepareInput(int ClientID, void *pInput) override;
-	void OnClientDirectInput(int ClientID, void *pInput) override;
-	void OnClientPredictedInput(int ClientID, void *pInput) override;
-	void OnClientPredictedEarlyInput(int ClientID, void *pInput) override;
+	void OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId) override;
+	void OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientId, const CUnpacker *pUnpacker);
+	void OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientId);
+	void OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientId);
+	void OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientId);
+	void OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientId, CUnpacker *pUnpacker);
+	void OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientId);
+	void OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientId);
+	void OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientId);
+	void OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientId);
+	void OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientId);
+	void OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientId);
+	void OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientId);
+	void OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientId);
+
+	bool OnClientDataPersist(int ClientId, void *pData) override;
+	void OnClientConnected(int ClientId, void *pData) override;
+	void OnClientEnter(int ClientId) override;
+	void OnClientDrop(int ClientId, const char *pReason) override;
+	void OnClientPrepareInput(int ClientId, void *pInput) override;
+	void OnClientDirectInput(int ClientId, void *pInput) override;
+	void OnClientPredictedInput(int ClientId, void *pInput) override;
+	void OnClientPredictedEarlyInput(int ClientId, void *pInput) override;
 
 	void TeehistorianRecordAntibot(const void *pData, int DataSize) override;
-	void TeehistorianRecordPlayerJoin(int ClientID, bool Sixup) override;
-	void TeehistorianRecordPlayerDrop(int ClientID, const char *pReason) override;
-	void TeehistorianRecordPlayerRejoin(int ClientID) override;
-
-	bool IsClientReady(int ClientID) const override;
-	bool IsClientPlayer(int ClientID) const override;
+	void TeehistorianRecordPlayerJoin(int ClientId, bool Sixup) override;
+	void TeehistorianRecordPlayerDrop(int ClientId, const char *pReason) override;
+	void TeehistorianRecordPlayerRejoin(int ClientId) override;
+	void TeehistorianRecordPlayerName(int ClientId, const char *pName) override;
+	void TeehistorianRecordPlayerFinish(int ClientId, int TimeTicks) override;
+	void TeehistorianRecordTeamFinish(int TeamId, int TimeTicks) override;
+
+	bool IsClientReady(int ClientId) const override;
+	bool IsClientPlayer(int ClientId) const override;
 	int PersistentDataSize() const override { return sizeof(CPersistentData); }
 	int PersistentClientDataSize() const override { return sizeof(CPersistentClientData); }
 
@@ -336,31 +344,32 @@ class CGameContext : public IGameServer
 
 	// DDRace
 	void OnPreTickTeehistorian() override;
-	bool OnClientDDNetVersionKnown(int ClientID);
+	bool OnClientDDNetVersionKnown(int ClientId);
 	void FillAntibot(CAntibotRoundData *pData) override;
-	bool ProcessSpamProtection(int ClientID, bool RespectChatInitialDelay = true);
-	int GetDDRaceTeam(int ClientID) const;
+	bool ProcessSpamProtection(int ClientId, bool RespectChatInitialDelay = true);
+	int GetDDRaceTeam(int ClientId) const;
 	// Describes the time when the first player joined the server.
 	int64_t m_NonEmptySince;
 	int64_t m_LastMapVote;
-	int GetClientVersion(int ClientID) const;
+	int GetClientVersion(int ClientId) const;
 	CClientMask ClientsMaskExcludeClientVersionAndHigher(int Version) const;
-	bool PlayerExists(int ClientID) const override { return m_apPlayers[ClientID]; }
+	bool PlayerExists(int ClientId) const override { return m_apPlayers[ClientId]; }
 	// Returns true if someone is actively moderating.
 	bool PlayerModerating() const;
-	void ForceVote(int EnforcerID, bool Success);
+	void ForceVote(int EnforcerId, bool Success);
 
 	// Checks if player can vote and notify them about the reason
-	bool RateLimitPlayerVote(int ClientID);
-	bool RateLimitPlayerMapVote(int ClientID) const;
+	bool RateLimitPlayerVote(int ClientId);
+	bool RateLimitPlayerMapVote(int ClientId) const;
 
-	void OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID) override;
+	void OnUpdatePlayerServerInfo(CJsonStringWriter *pJSonWriter, int Id) override;
+	void ReadCensorList();
 
 	std::shared_ptr<CScoreRandomMapResult> m_SqlRandomMapResult;
 
 private:
 	// starting 1 to make 0 the special value "no client id"
-	uint32_t NextUniqueClientID = 1;
+	uint32_t NextUniqueClientId = 1;
 	bool m_VoteWillPass;
 	CScore *m_pScore;
 
@@ -386,6 +395,7 @@ class CGameContext : public IGameServer
 	static void ConGrenade(IConsole::IResult *pResult, void *pUserData);
 	static void ConLaser(IConsole::IResult *pResult, void *pUserData);
 	static void ConJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetJumps(IConsole::IResult *pResult, void *pUserData);
 	static void ConWeapons(IConsole::IResult *pResult, void *pUserData);
 	static void ConUnShotgun(IConsole::IResult *pResult, void *pUserData);
 	static void ConUnGrenade(IConsole::IResult *pResult, void *pUserData);
@@ -394,9 +404,8 @@ class CGameContext : public IGameServer
 	static void ConUnWeapons(IConsole::IResult *pResult, void *pUserData);
 	static void ConAddWeapon(IConsole::IResult *pResult, void *pUserData);
 	static void ConRemoveWeapon(IConsole::IResult *pResult, void *pUserData);
-
 	void ModifyWeapons(IConsole::IResult *pResult, void *pUserData, int Weapon, bool Remove);
-	void MoveCharacter(int ClientID, int X, int Y, bool Raw = false);
+	void MoveCharacter(int ClientId, int X, int Y, bool Raw = false);
 	static void ConGoLeft(IConsole::IResult *pResult, void *pUserData);
 	static void ConGoRight(IConsole::IResult *pResult, void *pUserData);
 	static void ConGoUp(IConsole::IResult *pResult, void *pUserData);
@@ -428,9 +437,11 @@ class CGameContext : public IGameServer
 	static void ConTimeCP(IConsole::IResult *pResult, void *pUserData);
 
 	static void ConDND(IConsole::IResult *pResult, void *pUserData);
+	static void ConWhispers(IConsole::IResult *pResult, void *pUserData);
 	static void ConMapInfo(IConsole::IResult *pResult, void *pUserData);
 	static void ConTimeout(IConsole::IResult *pResult, void *pUserData);
 	static void ConPractice(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeCmdList(IConsole::IResult *pResult, void *pUserData);
 	static void ConSwap(IConsole::IResult *pResult, void *pUserData);
 	static void ConSave(IConsole::IResult *pResult, void *pUserData);
 	static void ConLoad(IConsole::IResult *pResult, void *pUserData);
@@ -442,7 +453,7 @@ class CGameContext : public IGameServer
 	static void ConUnlock(IConsole::IResult *pResult, void *pUserData);
 	static void ConInvite(IConsole::IResult *pResult, void *pUserData);
 	static void ConJoin(IConsole::IResult *pResult, void *pUserData);
-	static void ConAccept(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeam0Mode(IConsole::IResult *pResult, void *pUserData);
 	static void ConMe(IConsole::IResult *pResult, void *pUserData);
 	static void ConWhisper(IConsole::IResult *pResult, void *pUserData);
 	static void ConConverse(IConsole::IResult *pResult, void *pUserData);
@@ -457,21 +468,44 @@ class CGameContext : public IGameServer
 	static void ConTime(IConsole::IResult *pResult, void *pUserData);
 	static void ConSetTimerType(IConsole::IResult *pResult, void *pUserData);
 	static void ConRescue(IConsole::IResult *pResult, void *pUserData);
-	static void ConTele(IConsole::IResult *pResult, void *pUserData);
+	static void ConRescueMode(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeleTo(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeleXY(IConsole::IResult *pResult, void *pUserData);
 	static void ConTeleCursor(IConsole::IResult *pResult, void *pUserData);
 	static void ConLastTele(IConsole::IResult *pResult, void *pUserData);
+
+	// Chat commands for practice mode
 	static void ConPracticeUnSolo(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeSolo(IConsole::IResult *pResult, void *pUserData);
 	static void ConPracticeUnDeep(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeDeep(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeShotgun(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeGrenade(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeLaser(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeSetJumps(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeWeapons(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnShotgun(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnGrenade(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnLaser(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnWeapons(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeNinja(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnNinja(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConPracticeAddWeapon(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeRemoveWeapon(IConsole::IResult *pResult, void *pUserData);
+
 	static void ConProtectedKill(IConsole::IResult *pResult, void *pUserData);
 
 	static void ConVoteMute(IConsole::IResult *pResult, void *pUserData);
 	static void ConVoteUnmute(IConsole::IResult *pResult, void *pUserData);
 	static void ConVoteMutes(IConsole::IResult *pResult, void *pUserData);
 	static void ConMute(IConsole::IResult *pResult, void *pUserData);
-	static void ConMuteID(IConsole::IResult *pResult, void *pUserData);
-	static void ConMuteIP(IConsole::IResult *pResult, void *pUserData);
+	static void ConMuteId(IConsole::IResult *pResult, void *pUserData);
+	static void ConMuteIp(IConsole::IResult *pResult, void *pUserData);
 	static void ConUnmute(IConsole::IResult *pResult, void *pUserData);
-	static void ConUnmuteID(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnmuteId(IConsole::IResult *pResult, void *pUserData);
 	static void ConMutes(IConsole::IResult *pResult, void *pUserData);
 	static void ConModerate(IConsole::IResult *pResult, void *pUserData);
 
@@ -481,6 +515,11 @@ class CGameContext : public IGameServer
 	static void ConFreezeHammer(IConsole::IResult *pResult, void *pUserData);
 	static void ConUnFreezeHammer(IConsole::IResult *pResult, void *pUserData);
 
+	static void ConReloadCensorlist(IConsole::IResult *pResult, void *pUserData);
+	static void ConReloadAnnouncement(IConsole::IResult *pResult, void *pUserData);
+
+	CCharacter *GetPracticeCharacter(IConsole::IResult *pResult);
+
 	enum
 	{
 		MAX_MUTES = 128,
@@ -501,14 +540,14 @@ class CGameContext : public IGameServer
 	bool TryMute(const NETADDR *pAddr, int Secs, const char *pReason, bool InitialChatDelay);
 	void Mute(const NETADDR *pAddr, int Secs, const char *pDisplayName, const char *pReason = "", bool InitialChatDelay = false);
 	bool TryVoteMute(const NETADDR *pAddr, int Secs, const char *pReason);
-	void VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedID);
-	bool VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedID);
-	void Whisper(int ClientID, char *pStr);
-	void WhisperID(int ClientID, int VictimID, const char *pMessage);
-	void Converse(int ClientID, char *pStr);
+	void VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedId);
+	bool VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedId);
+	void Whisper(int ClientId, char *pStr);
+	void WhisperId(int ClientId, int VictimId, const char *pMessage);
+	void Converse(int ClientId, char *pStr);
 	bool IsVersionBanned(int Version);
-	void UnlockTeam(int ClientID, int Team) const;
-	void AttemptJoinTeam(int ClientID, int Team);
+	void UnlockTeam(int ClientId, int Team) const;
+	void AttemptJoinTeam(int ClientId, int Team);
 
 	enum
 	{
@@ -527,7 +566,7 @@ class CGameContext : public IGameServer
 	CLog m_aLogs[MAX_LOGS];
 	int m_LatestLog;
 
-	void LogEvent(const char *Description, int ClientID);
+	void LogEvent(const char *Description, int ClientId);
 
 public:
 	CLayers *Layers() { return &m_Layers; }
@@ -535,23 +574,19 @@ class CGameContext : public IGameServer
 
 	enum
 	{
-		VOTE_ENFORCE_NO_ADMIN = VOTE_ENFORCE_YES + 1,
-		VOTE_ENFORCE_YES_ADMIN,
-
 		VOTE_TYPE_UNKNOWN = 0,
 		VOTE_TYPE_OPTION,
 		VOTE_TYPE_KICK,
 		VOTE_TYPE_SPECTATE,
 	};
 	int m_VoteVictim;
-	int m_VoteEnforcer;
 
 	inline bool IsOptionVote() const { return m_VoteType == VOTE_TYPE_OPTION; }
 	inline bool IsKickVote() const { return m_VoteType == VOTE_TYPE_KICK; }
 	inline bool IsSpecVote() const { return m_VoteType == VOTE_TYPE_SPECTATE; }
 
-	void SendRecord(int ClientID);
-	void OnSetAuthed(int ClientID, int Level) override;
+	void SendRecord(int ClientId);
+	void OnSetAuthed(int ClientId, int Level) override;
 
 	void ResetTuning();
 };
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 89f4f59122..ab5be9dd59 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/shared/config.h>
 
+#include <engine/shared/protocolglue.h>
 #include <game/generated/protocol.h>
 #include <game/mapitems.h>
 #include <game/server/score.h>
@@ -40,8 +41,6 @@ IGameController::IGameController(class CGameContext *pGameServer) :
 	m_ForceBalanced = false;
 
 	m_CurrentRecord = 0;
-
-	InitTeleporter();
 }
 
 IGameController::~IGameController() = default;
@@ -96,7 +95,7 @@ float IGameController::EvaluateSpawnPos(CSpawnEval *pEval, vec2 Pos, int DDTeam)
 	for(; pC; pC = (CCharacter *)pC->TypeNext())
 	{
 		// ignore players in other teams
-		if(GameServer()->GetDDRaceTeam(pC->GetPlayer()->GetCID()) != DDTeam)
+		if(GameServer()->GetDDRaceTeam(pC->GetPlayer()->GetCid()) != DDTeam)
 			continue;
 
 		float d = distance(Pos, pC->m_Pos);
@@ -390,31 +389,51 @@ bool IGameController::OnEntity(int Index, int x, int y, int Layer, int Flags, bo
 
 void IGameController::OnPlayerConnect(CPlayer *pPlayer)
 {
-	int ClientID = pPlayer->GetCID();
+	int ClientId = pPlayer->GetCid();
 	pPlayer->Respawn();
 
-	if(!Server()->ClientPrevIngame(ClientID))
+	if(!Server()->ClientPrevIngame(ClientId))
 	{
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' team=%d", ClientID, Server()->ClientName(ClientID), pPlayer->GetTeam());
+		str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' team=%d", ClientId, Server()->ClientName(ClientId), pPlayer->GetTeam());
 		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 	}
+
+	if(Server()->IsSixup(ClientId))
+	{
+		{
+			protocol7::CNetMsg_Sv_GameInfo Msg;
+			Msg.m_GameFlags = m_GameFlags;
+			Msg.m_MatchCurrent = 1;
+			Msg.m_MatchNum = 0;
+			Msg.m_ScoreLimit = 0;
+			Msg.m_TimeLimit = 0;
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
+		}
+
+		// /team is essential
+		{
+			protocol7::CNetMsg_Sv_CommandInfoRemove Msg;
+			Msg.m_pName = "team";
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientId);
+		}
+	}
 }
 
 void IGameController::OnPlayerDisconnect(class CPlayer *pPlayer, const char *pReason)
 {
 	pPlayer->OnDisconnect();
-	int ClientID = pPlayer->GetCID();
-	if(Server()->ClientIngame(ClientID))
+	int ClientId = pPlayer->GetCid();
+	if(Server()->ClientIngame(ClientId))
 	{
 		char aBuf[512];
 		if(pReason && *pReason)
-			str_format(aBuf, sizeof(aBuf), "'%s' has left the game (%s)", Server()->ClientName(ClientID), pReason);
+			str_format(aBuf, sizeof(aBuf), "'%s' has left the game (%s)", Server()->ClientName(ClientId), pReason);
 		else
-			str_format(aBuf, sizeof(aBuf), "'%s' has left the game", Server()->ClientName(ClientID));
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+			str_format(aBuf, sizeof(aBuf), "'%s' has left the game", Server()->ClientName(ClientId));
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf, -1, CGameContext::FLAG_SIX);
 
-		str_format(aBuf, sizeof(aBuf), "leave player='%d:%s'", ClientID, Server()->ClientName(ClientID));
+		str_format(aBuf, sizeof(aBuf), "leave player='%d:%s'", ClientId, Server()->ClientName(ClientId));
 		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "game", aBuf);
 	}
 }
@@ -476,7 +495,7 @@ int IGameController::OnCharacterDeath(class CCharacter *pVictim, class CPlayer *
 void IGameController::OnCharacterSpawn(class CCharacter *pChr)
 {
 	pChr->SetTeams(&Teams());
-	Teams().OnCharacterSpawn(pChr->GetPlayer()->GetCID());
+	Teams().OnCharacterSpawn(pChr->GetPlayer()->GetCid());
 
 	// default health
 	pChr->IncreaseHealth(10);
@@ -484,8 +503,6 @@ void IGameController::OnCharacterSpawn(class CCharacter *pChr)
 	// give default weapons
 	pChr->GiveWeapon(WEAPON_HAMMER);
 	pChr->GiveWeapon(WEAPON_GUN);
-
-	pChr->SetTeleports(&m_TeleOuts, &m_TeleCheckOuts);
 }
 
 void IGameController::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
@@ -506,7 +523,7 @@ bool IGameController::IsForceBalanced()
 	return false;
 }
 
-bool IGameController::CanBeMovedOnBalance(int ClientID)
+bool IGameController::CanBeMovedOnBalance(int ClientId)
 {
 	return true;
 }
@@ -557,7 +574,7 @@ void IGameController::Snap(int SnappingClient)
 	if(!pGameInfoObj)
 		return;
 
-	pGameInfoObj->m_GameFlags = m_GameFlags;
+	pGameInfoObj->m_GameFlags = GameFlags_ClampToSix(m_GameFlags);
 	pGameInfoObj->m_GameStateFlags = 0;
 	if(m_GameOverTick != -1)
 		pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_GAMEOVER;
@@ -577,7 +594,7 @@ void IGameController::Snap(int SnappingClient)
 
 	if(pPlayer && (pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER || pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST) && pPlayer->GetClientVersion() >= VERSION_DDNET_GAMETICK)
 	{
-		if((pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorID != SPEC_FREEVIEW && (pPlayer2 = GameServer()->m_apPlayers[pPlayer->m_SpectatorID]))
+		if((pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorId != SPEC_FREEVIEW && (pPlayer2 = GameServer()->m_apPlayers[pPlayer->m_SpectatorId]))
 		{
 			if((pChr = pPlayer2->GetCharacter()) && pChr->m_DDRaceState == DDRACE_STARTED)
 			{
@@ -642,18 +659,18 @@ void IGameController::Snap(int SnappingClient)
 
 		pRaceData->m_BestTime = round_to_int(m_CurrentRecord * 1000);
 		pRaceData->m_Precision = 2;
-		pRaceData->m_RaceFlags = protocol7::RACEFLAG_HIDE_KILLMSG | protocol7::RACEFLAG_KEEP_WANTED_WEAPON;
+		pRaceData->m_RaceFlags = protocol7::RACEFLAG_KEEP_WANTED_WEAPON;
 	}
 
 	GameServer()->SnapSwitchers(SnappingClient);
 }
 
-int IGameController::GetAutoTeam(int NotThisID)
+int IGameController::GetAutoTeam(int NotThisId)
 {
 	int aNumplayers[2] = {0, 0};
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(GameServer()->m_apPlayers[i] && i != NotThisID)
+		if(GameServer()->m_apPlayers[i] && i != NotThisId)
 		{
 			if(GameServer()->m_apPlayers[i]->GetTeam() >= TEAM_RED && GameServer()->m_apPlayers[i]->GetTeam() <= TEAM_BLUE)
 				aNumplayers[GameServer()->m_apPlayers[i]->GetTeam()]++;
@@ -662,14 +679,14 @@ int IGameController::GetAutoTeam(int NotThisID)
 
 	int Team = 0;
 
-	if(CanJoinTeam(Team, NotThisID, nullptr, 0))
+	if(CanJoinTeam(Team, NotThisId, nullptr, 0))
 		return Team;
 	return -1;
 }
 
-bool IGameController::CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize)
+bool IGameController::CanJoinTeam(int Team, int NotThisId, char *pErrorReason, int ErrorReasonSize)
 {
-	const CPlayer *pPlayer = GameServer()->m_apPlayers[NotThisID];
+	const CPlayer *pPlayer = GameServer()->m_apPlayers[NotThisId];
 	if(pPlayer && pPlayer->IsPaused())
 	{
 		if(pErrorReason)
@@ -682,7 +699,7 @@ bool IGameController::CanJoinTeam(int Team, int NotThisID, char *pErrorReason, i
 	int aNumplayers[2] = {0, 0};
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
-		if(GameServer()->m_apPlayers[i] && i != NotThisID)
+		if(GameServer()->m_apPlayers[i] && i != NotThisId)
 		{
 			if(GameServer()->m_apPlayers[i]->GetTeam() >= TEAM_RED && GameServer()->m_apPlayers[i]->GetTeam() <= TEAM_BLUE)
 				aNumplayers[GameServer()->m_apPlayers[i]->GetTeam()]++;
@@ -704,37 +721,12 @@ int IGameController::ClampTeam(int Team)
 	return 0;
 }
 
-CClientMask IGameController::GetMaskForPlayerWorldEvent(int Asker, int ExceptID)
+CClientMask IGameController::GetMaskForPlayerWorldEvent(int Asker, int ExceptId)
 {
 	if(Asker == -1)
-		return CClientMask().set().reset(ExceptID);
-
-	return Teams().TeamMask(GameServer()->GetDDRaceTeam(Asker), ExceptID, Asker);
-}
+		return CClientMask().set().reset(ExceptId);
 
-void IGameController::InitTeleporter()
-{
-	if(!GameServer()->Collision()->Layers()->TeleLayer())
-		return;
-	int Width = GameServer()->Collision()->Layers()->TeleLayer()->m_Width;
-	int Height = GameServer()->Collision()->Layers()->TeleLayer()->m_Height;
-
-	for(int i = 0; i < Width * Height; i++)
-	{
-		int Number = GameServer()->Collision()->TeleLayer()[i].m_Number;
-		int Type = GameServer()->Collision()->TeleLayer()[i].m_Type;
-		if(Number > 0)
-		{
-			if(Type == TILE_TELEOUT)
-			{
-				m_TeleOuts[Number - 1].emplace_back(i % Width * 32.0f + 16.0f, i / Width * 32.0f + 16.0f);
-			}
-			else if(Type == TILE_TELECHECKOUT)
-			{
-				m_TeleCheckOuts[Number - 1].emplace_back(i % Width * 32.0f + 16.0f, i / Width * 32.0f + 16.0f);
-			}
-		}
-	}
+	return Teams().TeamMask(GameServer()->GetDDRaceTeam(Asker), ExceptId, Asker);
 }
 
 void IGameController::DoTeamChange(CPlayer *pPlayer, int Team, bool DoChatMsg)
@@ -744,17 +736,17 @@ void IGameController::DoTeamChange(CPlayer *pPlayer, int Team, bool DoChatMsg)
 		return;
 
 	pPlayer->SetTeam(Team);
-	int ClientID = pPlayer->GetCID();
+	int ClientId = pPlayer->GetCid();
 
 	char aBuf[128];
 	DoChatMsg = false;
 	if(DoChatMsg)
 	{
-		str_format(aBuf, sizeof(aBuf), "'%s' joined the %s", Server()->ClientName(ClientID), GameServer()->m_pController->GetTeamName(Team));
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+		str_format(aBuf, sizeof(aBuf), "'%s' joined the %s", Server()->ClientName(ClientId), GameServer()->m_pController->GetTeamName(Team));
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf);
 	}
 
-	str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", ClientID, Server()->ClientName(ClientID), Team);
+	str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", ClientId, Server()->ClientName(ClientId), Team);
 	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 
 	// OnPlayerInfoChange(pPlayer);
diff --git a/src/game/server/gamecontroller.h b/src/game/server/gamecontroller.h
index a3044d151a..a732123b4e 100644
--- a/src/game/server/gamecontroller.h
+++ b/src/game/server/gamecontroller.h
@@ -8,9 +8,6 @@
 #include <engine/shared/protocol.h>
 #include <game/server/teams.h>
 
-#include <map>
-#include <vector>
-
 struct CScoreLoadBestTimeResult;
 
 /*
@@ -98,6 +95,7 @@ class IGameController
 	virtual void OnCharacterSpawn(class CCharacter *pChr);
 
 	virtual void HandleCharacterTiles(class CCharacter *pChr, int MapIndex);
+	virtual void SetArmorProgress(CCharacter *pCharacer, int Progress){};
 
 	/*
 		Function: OnEntity
@@ -130,7 +128,7 @@ class IGameController
 	/*
 
 	*/
-	virtual bool CanBeMovedOnBalance(int ClientID);
+	virtual bool CanBeMovedOnBalance(int ClientId);
 
 	virtual void Tick();
 
@@ -144,18 +142,16 @@ class IGameController
 
 	*/
 	virtual const char *GetTeamName(int Team);
-	virtual int GetAutoTeam(int NotThisID);
-	virtual bool CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize);
+	virtual int GetAutoTeam(int NotThisId);
+	virtual bool CanJoinTeam(int Team, int NotThisId, char *pErrorReason, int ErrorReasonSize);
 	int ClampTeam(int Team);
 
 	CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1);
-	virtual void InitTeleporter();
 
+	bool IsTeamPlay() { return m_GameFlags & GAMEFLAG_TEAMS; }
 	// DDRace
 
 	float m_CurrentRecord;
-	std::map<int, std::vector<vec2>> m_TeleOuts;
-	std::map<int, std::vector<vec2>> m_TeleCheckOuts;
 	CGameTeams &Teams() { return m_Teams; }
 	std::shared_ptr<CScoreLoadBestTimeResult> m_pLoadBestTimeResult;
 };
diff --git a/src/game/server/gamemodes/DDRace.cpp b/src/game/server/gamemodes/DDRace.cpp
index 48a6d71bd8..a2959a885d 100644
--- a/src/game/server/gamemodes/DDRace.cpp
+++ b/src/game/server/gamemodes/DDRace.cpp
@@ -18,6 +18,7 @@ CGameControllerDDRace::CGameControllerDDRace(class CGameContext *pGameServer) :
 	IGameController(pGameServer)
 {
 	m_pGameType = g_Config.m_SvTestingCommands ? TEST_TYPE_NAME : GAME_TYPE_NAME;
+	m_GameFlags = protocol7::GAMEFLAG_RACE;
 }
 
 CGameControllerDDRace::~CGameControllerDDRace() = default;
@@ -30,10 +31,10 @@ CScore *CGameControllerDDRace::Score()
 void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
 {
 	CPlayer *pPlayer = pChr->GetPlayer();
-	const int ClientID = pPlayer->GetCID();
+	const int ClientId = pPlayer->GetCid();
 
-	int m_TileIndex = GameServer()->Collision()->GetTileIndex(MapIndex);
-	int m_TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
+	int TileIndex = GameServer()->Collision()->GetTileIndex(MapIndex);
+	int TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
 
 	//Sensitivity
 	int S1 = GameServer()->Collision()->GetPureMapIndex(vec2(pChr->GetPos().x + pChr->GetProximityRadius() / 3.f, pChr->GetPos().y - pChr->GetProximityRadius() / 3.f));
@@ -50,35 +51,35 @@ void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
 	int FTile4 = GameServer()->Collision()->GetFTileIndex(S4);
 
 	const int PlayerDDRaceState = pChr->m_DDRaceState;
-	bool IsOnStartTile = (m_TileIndex == TILE_START) || (m_TileFIndex == TILE_START) || FTile1 == TILE_START || FTile2 == TILE_START || FTile3 == TILE_START || FTile4 == TILE_START || Tile1 == TILE_START || Tile2 == TILE_START || Tile3 == TILE_START || Tile4 == TILE_START;
+	bool IsOnStartTile = (TileIndex == TILE_START) || (TileFIndex == TILE_START) || FTile1 == TILE_START || FTile2 == TILE_START || FTile3 == TILE_START || FTile4 == TILE_START || Tile1 == TILE_START || Tile2 == TILE_START || Tile3 == TILE_START || Tile4 == TILE_START;
 	// start
 	if(IsOnStartTile && PlayerDDRaceState != DDRACE_CHEAT)
 	{
-		const int Team = GameServer()->GetDDRaceTeam(ClientID);
+		const int Team = GameServer()->GetDDRaceTeam(ClientId);
 		if(Teams().GetSaving(Team))
 		{
-			GameServer()->SendStartWarning(ClientID, "You can't start while loading/saving of team is in progress");
-			pChr->Die(ClientID, WEAPON_WORLD);
+			GameServer()->SendStartWarning(ClientId, "You can't start while loading/saving of team is in progress");
+			pChr->Die(ClientId, WEAPON_WORLD);
 			return;
 		}
 		if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && (Team == TEAM_FLOCK || Teams().Count(Team) <= 1))
 		{
-			GameServer()->SendStartWarning(ClientID, "You have to be in a team with other tees to start");
-			pChr->Die(ClientID, WEAPON_WORLD);
+			GameServer()->SendStartWarning(ClientId, "You have to be in a team with other tees to start");
+			pChr->Die(ClientId, WEAPON_WORLD);
 			return;
 		}
-		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team > TEAM_FLOCK && Team < TEAM_SUPER && Teams().Count(Team) < g_Config.m_SvMinTeamSize)
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team > TEAM_FLOCK && Team < TEAM_SUPER && Teams().Count(Team) < g_Config.m_SvMinTeamSize && !Teams().TeamFlock(Team))
 		{
 			char aBuf[128];
 			str_format(aBuf, sizeof(aBuf), "Your team has fewer than %d players, so your team rank won't count", g_Config.m_SvMinTeamSize);
-			GameServer()->SendStartWarning(ClientID, aBuf);
+			GameServer()->SendStartWarning(ClientId, aBuf);
 		}
 		if(g_Config.m_SvResetPickups)
 		{
 			pChr->ResetPickups();
 		}
 
-		Teams().OnCharacterStart(ClientID);
+		Teams().OnCharacterStart(ClientId);
 		pChr->m_LastTimeCp = -1;
 		pChr->m_LastTimeCpBroadcasted = -1;
 		for(float &CurrentTimeCp : pChr->m_aCurrentTimeCp)
@@ -88,64 +89,73 @@ void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
 	}
 
 	// finish
-	if(((m_TileIndex == TILE_FINISH) || (m_TileFIndex == TILE_FINISH) || FTile1 == TILE_FINISH || FTile2 == TILE_FINISH || FTile3 == TILE_FINISH || FTile4 == TILE_FINISH || Tile1 == TILE_FINISH || Tile2 == TILE_FINISH || Tile3 == TILE_FINISH || Tile4 == TILE_FINISH) && PlayerDDRaceState == DDRACE_STARTED)
-		Teams().OnCharacterFinish(ClientID);
+	if(((TileIndex == TILE_FINISH) || (TileFIndex == TILE_FINISH) || FTile1 == TILE_FINISH || FTile2 == TILE_FINISH || FTile3 == TILE_FINISH || FTile4 == TILE_FINISH || Tile1 == TILE_FINISH || Tile2 == TILE_FINISH || Tile3 == TILE_FINISH || Tile4 == TILE_FINISH) && PlayerDDRaceState == DDRACE_STARTED)
+		Teams().OnCharacterFinish(ClientId);
 
 	// unlock team
-	else if(((m_TileIndex == TILE_UNLOCK_TEAM) || (m_TileFIndex == TILE_UNLOCK_TEAM)) && Teams().TeamLocked(GameServer()->GetDDRaceTeam(ClientID)))
+	else if(((TileIndex == TILE_UNLOCK_TEAM) || (TileFIndex == TILE_UNLOCK_TEAM)) && Teams().TeamLocked(GameServer()->GetDDRaceTeam(ClientId)))
 	{
-		Teams().SetTeamLock(GameServer()->GetDDRaceTeam(ClientID), false);
-		GameServer()->SendChatTeam(GameServer()->GetDDRaceTeam(ClientID), "Your team was unlocked by an unlock team tile");
+		Teams().SetTeamLock(GameServer()->GetDDRaceTeam(ClientId), false);
+		GameServer()->SendChatTeam(GameServer()->GetDDRaceTeam(ClientId), "Your team was unlocked by an unlock team tile");
 	}
 
 	// solo part
-	if(((m_TileIndex == TILE_SOLO_ENABLE) || (m_TileFIndex == TILE_SOLO_ENABLE)) && !Teams().m_Core.GetSolo(ClientID))
+	if(((TileIndex == TILE_SOLO_ENABLE) || (TileFIndex == TILE_SOLO_ENABLE)) && !Teams().m_Core.GetSolo(ClientId))
 	{
-		GameServer()->SendChatTarget(ClientID, "You are now in a solo part");
+		GameServer()->SendChatTarget(ClientId, "You are now in a solo part");
 		pChr->SetSolo(true);
 	}
-	else if(((m_TileIndex == TILE_SOLO_DISABLE) || (m_TileFIndex == TILE_SOLO_DISABLE)) && Teams().m_Core.GetSolo(ClientID))
+	else if(((TileIndex == TILE_SOLO_DISABLE) || (TileFIndex == TILE_SOLO_DISABLE)) && Teams().m_Core.GetSolo(ClientId))
 	{
-		GameServer()->SendChatTarget(ClientID, "You are now out of the solo part");
+		GameServer()->SendChatTarget(ClientId, "You are now out of the solo part");
 		pChr->SetSolo(false);
 	}
 }
 
+void CGameControllerDDRace::SetArmorProgress(CCharacter *pCharacer, int Progress)
+{
+	pCharacer->SetArmor(clamp(10 - (Progress / 15), 0, 10));
+}
+
 void CGameControllerDDRace::OnPlayerConnect(CPlayer *pPlayer)
 {
 	IGameController::OnPlayerConnect(pPlayer);
-	int ClientID = pPlayer->GetCID();
+	int ClientId = pPlayer->GetCid();
 
 	// init the player
-	Score()->PlayerData(ClientID)->Reset();
+	Score()->PlayerData(ClientId)->Reset();
 
 	// Can't set score here as LoadScore() is threaded, run it in
 	// LoadScoreThreaded() instead
-	Score()->LoadPlayerData(ClientID);
+	Score()->LoadPlayerData(ClientId);
 
-	if(!Server()->ClientPrevIngame(ClientID))
+	if(!Server()->ClientPrevIngame(ClientId))
 	{
 		char aBuf[512];
-		str_format(aBuf, sizeof(aBuf), "'%s' entered and joined the %s", Server()->ClientName(ClientID), GetTeamName(pPlayer->GetTeam()));
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+		str_format(aBuf, sizeof(aBuf), "'%s' entered and joined the %s", Server()->ClientName(ClientId), GetTeamName(pPlayer->GetTeam()));
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf, -1, CGameContext::FLAG_SIX);
 
-		GameServer()->SendChatTarget(ClientID, "DDraceNetwork Mod. Version: " GAME_VERSION);
-		GameServer()->SendChatTarget(ClientID, "please visit DDNet.org or say /info and make sure to read our /rules");
+		GameServer()->SendChatTarget(ClientId, "DDraceNetwork Mod. Version: " GAME_VERSION);
+		GameServer()->SendChatTarget(ClientId, "please visit DDNet.org or say /info and make sure to read our /rules");
 	}
 }
 
 void CGameControllerDDRace::OnPlayerDisconnect(CPlayer *pPlayer, const char *pReason)
 {
-	int ClientID = pPlayer->GetCID();
-	bool WasModerator = pPlayer->m_Moderating && Server()->ClientIngame(ClientID);
+	int ClientId = pPlayer->GetCid();
+	bool WasModerator = pPlayer->m_Moderating && Server()->ClientIngame(ClientId);
 
 	IGameController::OnPlayerDisconnect(pPlayer, pReason);
 
 	if(!GameServer()->PlayerModerating() && WasModerator)
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Server kick/spec votes are no longer actively moderated.");
+		GameServer()->SendChat(-1, TEAM_ALL, "Server kick/spec votes are no longer actively moderated.");
 
 	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO)
-		Teams().SetForceCharacterTeam(ClientID, TEAM_FLOCK);
+		Teams().SetForceCharacterTeam(ClientId, TEAM_FLOCK);
+
+	for(int Team = TEAM_FLOCK + 1; Team < TEAM_SUPER; Team++)
+		if(Teams().IsInvited(Team, ClientId))
+			Teams().SetClientInvited(Team, ClientId, false);
 }
 
 void CGameControllerDDRace::OnReset()
@@ -176,7 +186,7 @@ void CGameControllerDDRace::DoTeamChange(class CPlayer *pPlayer, int Team, bool
 			// Joining spectators should not kill a locked team, but should still
 			// check if the team finished by you leaving it.
 			int DDRTeam = pCharacter->Team();
-			Teams().SetForceCharacterTeam(pPlayer->GetCID(), TEAM_FLOCK);
+			Teams().SetForceCharacterTeam(pPlayer->GetCid(), TEAM_FLOCK);
 			Teams().CheckTeamFinished(DDRTeam);
 		}
 	}
diff --git a/src/game/server/gamemodes/DDRace.h b/src/game/server/gamemodes/DDRace.h
index 17626f26a3..bc307e0538 100644
--- a/src/game/server/gamemodes/DDRace.h
+++ b/src/game/server/gamemodes/DDRace.h
@@ -13,6 +13,7 @@ class CGameControllerDDRace : public IGameController
 	CScore *Score();
 
 	void HandleCharacterTiles(class CCharacter *pChr, int MapIndex) override;
+	void SetArmorProgress(CCharacter *pCharacer, int Progress) override;
 
 	void OnPlayerConnect(class CPlayer *pPlayer) override;
 	void OnPlayerDisconnect(class CPlayer *pPlayer, const char *pReason) override;
diff --git a/src/game/server/gameworld.cpp b/src/game/server/gameworld.cpp
index 9247cca883..5f42290810 100644
--- a/src/game/server/gameworld.cpp
+++ b/src/game/server/gameworld.cpp
@@ -129,6 +129,19 @@ void CGameWorld::Snap(int SnappingClient)
 	}
 }
 
+void CGameWorld::PostSnap()
+{
+	for(auto *pEnt : m_apFirstEntityTypes)
+	{
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->PostSnap();
+			pEnt = m_pNextTraverseEntity;
+		}
+	}
+}
+
 void CGameWorld::Reset()
 {
 	// reset all entities
@@ -163,7 +176,7 @@ void CGameWorld::RemoveEntitiesFromPlayers(int PlayerIds[], int NumPlayers)
 			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
 			for(int i = 0; i < NumPlayers; i++)
 			{
-				if(pEnt->GetOwnerID() == PlayerIds[i])
+				if(pEnt->GetOwnerId() == PlayerIds[i])
 				{
 					RemoveEntity(pEnt);
 					pEnt->Destroy();
@@ -199,7 +212,7 @@ void CGameWorld::Tick()
 	if(!m_Paused)
 	{
 		if(GameServer()->m_pController->IsForceBalanced())
-			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Teams have been balanced");
+			GameServer()->SendChat(-1, TEAM_ALL, "Teams have been balanced");
 
 		// update all objects
 		for(int i = 0; i < NUM_ENTTYPES; i++)
@@ -249,14 +262,29 @@ void CGameWorld::Tick()
 	RemoveEntities();
 
 	// find the characters' strong/weak id
-	int StrongWeakID = 0;
+	int StrongWeakId = 0;
 	for(CCharacter *pChar = (CCharacter *)FindFirst(ENTTYPE_CHARACTER); pChar; pChar = (CCharacter *)pChar->TypeNext())
 	{
-		pChar->m_StrongWeakID = StrongWeakID;
-		StrongWeakID++;
+		pChar->m_StrongWeakId = StrongWeakId;
+		StrongWeakId++;
 	}
 }
 
+ESaveResult CGameWorld::BlocksSave(int ClientId)
+{
+	// check all objects
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			ESaveResult Result = pEnt->BlocksSave(ClientId);
+			if(Result != ESaveResult::SUCCESS)
+				return Result;
+			pEnt = m_pNextTraverseEntity;
+		}
+	return ESaveResult::SUCCESS;
+}
+
 void CGameWorld::SwapClients(int Client1, int Client2)
 {
 	// update all objects
@@ -356,17 +384,14 @@ std::vector<CCharacter *> CGameWorld::IntersectedCharacters(vec2 Pos0, vec2 Pos1
 	return vpCharacters;
 }
 
-void CGameWorld::ReleaseHooked(int ClientID)
+void CGameWorld::ReleaseHooked(int ClientId)
 {
 	CCharacter *pChr = (CCharacter *)CGameWorld::FindFirst(CGameWorld::ENTTYPE_CHARACTER);
 	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
 	{
-		CCharacterCore *pCore = pChr->Core();
-		if(pCore->HookedPlayer() == ClientID && !pChr->IsSuper())
+		if(pChr->Core()->HookedPlayer() == ClientId && !pChr->IsSuper())
 		{
-			pCore->SetHookedPlayer(-1);
-			pCore->m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
-			pCore->m_HookState = HOOK_RETRACTED;
+			pChr->ReleaseHook();
 		}
 	}
 }
diff --git a/src/game/server/gameworld.h b/src/game/server/gameworld.h
index c86af59fd1..758f23203a 100644
--- a/src/game/server/gameworld.h
+++ b/src/game/server/gameworld.h
@@ -5,6 +5,8 @@
 
 #include <game/gamecore.h>
 
+#include "save.h"
+
 #include <vector>
 
 class CEntity;
@@ -133,6 +135,12 @@ class CGameWorld
 	*/
 	void Snap(int SnappingClient);
 
+	/*
+		Function: PostSnap
+			Called after all clients received their snapshot.
+	*/
+	void PostSnap();
+
 	/*
 		Function: Tick
 			Calls Tick on all the entities in the world to progress
@@ -147,8 +155,14 @@ class CGameWorld
 	*/
 	void SwapClients(int Client1, int Client2);
 
+	/*
+		Function: BlocksSave
+			Checks if any entity would block /save
+	*/
+	ESaveResult BlocksSave(int ClientId);
+
 	// DDRace
-	void ReleaseHooked(int ClientID);
+	void ReleaseHooked(int ClientId);
 
 	/*
 		Function: IntersectedCharacters
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 77630471f5..f4c5404492 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -19,20 +19,20 @@ MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS)
 
 IServer *CPlayer::Server() const { return m_pGameServer->Server(); }
 
-CPlayer::CPlayer(CGameContext *pGameServer, uint32_t UniqueClientID, int ClientID, int Team) :
-	m_UniqueClientID(UniqueClientID)
+CPlayer::CPlayer(CGameContext *pGameServer, uint32_t UniqueClientId, int ClientId, int Team) :
+	m_UniqueClientId(UniqueClientId)
 {
 	m_pGameServer = pGameServer;
-	m_ClientID = ClientID;
+	m_ClientId = ClientId;
 	m_Team = GameServer()->m_pController->ClampTeam(Team);
 	m_NumInputs = 0;
 	Reset();
-	GameServer()->Antibot()->OnPlayerInit(m_ClientID);
+	GameServer()->Antibot()->OnPlayerInit(m_ClientId);
 }
 
 CPlayer::~CPlayer()
 {
-	GameServer()->Antibot()->OnPlayerDestroy(m_ClientID);
+	GameServer()->Antibot()->OnPlayerDestroy(m_ClientId);
 	delete m_pLastTarget;
 	delete m_pCharacter;
 	m_pCharacter = 0;
@@ -45,18 +45,19 @@ void CPlayer::Reset()
 	m_JoinTick = Server()->Tick();
 	delete m_pCharacter;
 	m_pCharacter = 0;
-	m_SpectatorID = SPEC_FREEVIEW;
+	m_SpectatorId = SPEC_FREEVIEW;
 	m_LastActionTick = Server()->Tick();
 	m_TeamChangeTick = Server()->Tick();
+	m_LastSetTeam = 0;
 	m_LastInvited = 0;
 	m_WeakHookSpawn = false;
 
-	int *pIdMap = Server()->GetIdMap(m_ClientID);
+	int *pIdMap = Server()->GetIdMap(m_ClientId);
 	for(int i = 1; i < VANILLA_MAX_CLIENTS; i++)
 	{
 		pIdMap[i] = -1;
 	}
-	pIdMap[0] = m_ClientID;
+	pIdMap[0] = m_ClientId;
 
 	// DDRace
 
@@ -65,7 +66,7 @@ void CPlayer::Reset()
 	m_ChatScore = 0;
 	m_Moderating = false;
 	m_EyeEmoteEnabled = true;
-	if(Server()->IsSixup(m_ClientID))
+	if(Server()->IsSixup(m_ClientId))
 		m_TimerType = TIMERTYPE_SIXUP;
 	else
 		m_TimerType = (g_Config.m_SvDefaultTimerType == TIMERTYPE_GAMETIMER || g_Config.m_SvDefaultTimerType == TIMERTYPE_GAMETIMER_AND_BROADCAST) ? TIMERTYPE_BROADCAST : g_Config.m_SvDefaultTimerType;
@@ -104,7 +105,7 @@ void CPlayer::Reset()
 	}
 	m_OverrideEmoteReset = -1;
 
-	GameServer()->Score()->PlayerData(m_ClientID)->Reset();
+	GameServer()->Score()->PlayerData(m_ClientId)->Reset();
 
 	m_Last_KickVote = 0;
 	m_Last_Team = 0;
@@ -116,13 +117,14 @@ void CPlayer::Reset()
 
 	m_Paused = PAUSE_NONE;
 	m_DND = false;
+	m_Whispers = true;
 
 	m_LastPause = 0;
 	m_Score.reset();
 
 	// Variable initialized:
 	m_Last_Team = 0;
-	m_LastSQLQuery = 0;
+	m_LastSqlQuery = 0;
 	m_ScoreQueryResult = nullptr;
 	m_ScoreFinishResult = nullptr;
 
@@ -141,8 +143,9 @@ void CPlayer::Reset()
 	m_NotEligibleForFinish = false;
 	m_EligibleForFinishCheck = 0;
 	m_VotedForPractice = false;
-	m_SwapTargetsClientID = -1;
+	m_SwapTargetsClientId = -1;
 	m_BirthdayAnnounced = false;
+	m_RescueMode = RESCUEMODE_AUTO;
 }
 
 static int PlayerFlags_SixToSeven(int Flags)
@@ -158,7 +161,7 @@ static int PlayerFlags_SixToSeven(int Flags)
 
 void CPlayer::Tick()
 {
-	if(m_ScoreQueryResult != nullptr && m_ScoreQueryResult->m_Completed)
+	if(m_ScoreQueryResult != nullptr && m_ScoreQueryResult->m_Completed && m_SentSnaps >= 3)
 	{
 		ProcessScoreResult(*m_ScoreQueryResult);
 		m_ScoreQueryResult = nullptr;
@@ -169,27 +172,27 @@ void CPlayer::Tick()
 		m_ScoreFinishResult = nullptr;
 	}
 
-	if(!Server()->ClientIngame(m_ClientID))
+	if(!Server()->ClientIngame(m_ClientId))
 		return;
 
 	if(m_ChatScore > 0)
 		m_ChatScore--;
 
-	Server()->SetClientScore(m_ClientID, m_Score);
+	Server()->SetClientScore(m_ClientId, m_Score);
 
 	if(m_Moderating && m_Afk)
 	{
 		m_Moderating = false;
-		GameServer()->SendChatTarget(m_ClientID, "Active moderator mode disabled because you are afk.");
+		GameServer()->SendChatTarget(m_ClientId, "Active moderator mode disabled because you are afk.");
 
 		if(!GameServer()->PlayerModerating())
-			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Server kick/spec votes are no longer actively moderated.");
+			GameServer()->SendChat(-1, TEAM_ALL, "Server kick/spec votes are no longer actively moderated.");
 	}
 
 	// do latency stuff
 	{
 		IServer::CClientInfo Info;
-		if(Server()->GetClientInfo(m_ClientID, &Info))
+		if(Server()->GetClientInfo(m_ClientId, &Info))
 		{
 			m_Latency.m_Accum += Info.m_Latency;
 			m_Latency.m_AccumMax = maximum(m_Latency.m_AccumMax, Info.m_Latency);
@@ -207,14 +210,14 @@ void CPlayer::Tick()
 		}
 	}
 
-	if(Server()->GetNetErrorString(m_ClientID)[0])
+	if(Server()->GetNetErrorString(m_ClientId)[0])
 	{
-		SetAfk(true);
+		SetInitialAfk(true);
 
 		char aBuf[512];
-		str_format(aBuf, sizeof(aBuf), "'%s' would have timed out, but can use timeout protection now", Server()->ClientName(m_ClientID));
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
-		Server()->ResetNetErrorString(m_ClientID);
+		str_format(aBuf, sizeof(aBuf), "'%s' would have timed out, but can use timeout protection now", Server()->ClientName(m_ClientId));
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf);
+		Server()->ResetNetErrorString(m_ClientId);
 	}
 
 	if(!GameServer()->m_World.m_Paused)
@@ -256,7 +259,7 @@ void CPlayer::Tick()
 
 	if(m_TuneZone != m_TuneZoneOld) // don't send tunings all the time
 	{
-		GameServer()->SendTuningParams(m_ClientID, m_TuneZone);
+		GameServer()->SendTuningParams(m_ClientId, m_TuneZone);
 	}
 
 	if(m_OverrideEmoteReset >= 0 && m_OverrideEmoteReset <= Server()->Tick())
@@ -268,7 +271,7 @@ void CPlayer::Tick()
 	{
 		if(1200 - ((Server()->Tick() - m_pCharacter->GetLastAction()) % (1200)) < 5)
 		{
-			GameServer()->SendEmoticon(GetCID(), EMOTICON_GHOST, -1);
+			GameServer()->SendEmoticon(GetCid(), EMOTICON_GHOST, -1);
 		}
 	}
 }
@@ -277,7 +280,7 @@ void CPlayer::PostTick()
 {
 	// update latency value
 	if(m_PlayerFlags & PLAYERFLAG_IN_MENU)
-		m_aCurLatency[m_ClientID] = GameServer()->m_apPlayers[m_ClientID]->m_Latency.m_Min;
+		m_aCurLatency[m_ClientId] = GameServer()->m_apPlayers[m_ClientId]->m_Latency.m_Min;
 
 	if(m_PlayerFlags & PLAYERFLAG_SCOREBOARD)
 	{
@@ -289,13 +292,13 @@ void CPlayer::PostTick()
 	}
 
 	// update view pos for spectators
-	if((m_Team == TEAM_SPECTATORS || m_Paused) && m_SpectatorID != SPEC_FREEVIEW && GameServer()->m_apPlayers[m_SpectatorID] && GameServer()->m_apPlayers[m_SpectatorID]->GetCharacter())
-		m_ViewPos = GameServer()->m_apPlayers[m_SpectatorID]->GetCharacter()->m_Pos;
+	if((m_Team == TEAM_SPECTATORS || m_Paused) && m_SpectatorId != SPEC_FREEVIEW && GameServer()->m_apPlayers[m_SpectatorId] && GameServer()->m_apPlayers[m_SpectatorId]->GetCharacter())
+		m_ViewPos = GameServer()->m_apPlayers[m_SpectatorId]->GetCharacter()->m_Pos;
 }
 
 void CPlayer::PostPostTick()
 {
-	if(!Server()->ClientIngame(m_ClientID))
+	if(!Server()->ClientIngame(m_ClientId))
 		return;
 
 	if(!GameServer()->m_World.m_Paused && !m_pCharacter && m_Spawning && m_WeakHookSpawn)
@@ -304,10 +307,10 @@ void CPlayer::PostPostTick()
 
 void CPlayer::Snap(int SnappingClient)
 {
-	if(!Server()->ClientIngame(m_ClientID))
+	if(!Server()->ClientIngame(m_ClientId))
 		return;
 
-	int id = m_ClientID;
+	int id = m_ClientId;
 	if(!Server()->Translate(id, SnappingClient))
 		return;
 
@@ -315,16 +318,16 @@ void CPlayer::Snap(int SnappingClient)
 	if(!pClientInfo)
 		return;
 
-	StrToInts(&pClientInfo->m_Name0, 4, Server()->ClientName(m_ClientID));
-	StrToInts(&pClientInfo->m_Clan0, 3, Server()->ClientClan(m_ClientID));
-	pClientInfo->m_Country = Server()->ClientCountry(m_ClientID);
+	StrToInts(&pClientInfo->m_Name0, 4, Server()->ClientName(m_ClientId));
+	StrToInts(&pClientInfo->m_Clan0, 3, Server()->ClientClan(m_ClientId));
+	pClientInfo->m_Country = Server()->ClientCountry(m_ClientId);
 	StrToInts(&pClientInfo->m_Skin0, 6, m_TeeInfos.m_aSkinName);
 	pClientInfo->m_UseCustomColor = m_TeeInfos.m_UseCustomColor;
 	pClientInfo->m_ColorBody = m_TeeInfos.m_ColorBody;
 	pClientInfo->m_ColorFeet = m_TeeInfos.m_ColorFeet;
 
 	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
-	int Latency = SnappingClient == SERVER_DEMO_CLIENT ? m_Latency.m_Min : GameServer()->m_apPlayers[SnappingClient]->m_aCurLatency[m_ClientID];
+	int Latency = SnappingClient == SERVER_DEMO_CLIENT ? m_Latency.m_Min : GameServer()->m_apPlayers[SnappingClient]->m_aCurLatency[m_ClientId];
 
 	int Score;
 	// This is the time sent to the player while ingame (do not confuse to the one reported to the master server).
@@ -346,7 +349,7 @@ void CPlayer::Snap(int SnappingClient)
 	}
 
 	// send 0 if times of others are not shown
-	if(SnappingClient != m_ClientID && g_Config.m_SvHideScore)
+	if(SnappingClient != m_ClientId && g_Config.m_SvHideScore)
 		Score = -9999;
 
 	if(!Server()->IsSixup(SnappingClient))
@@ -357,13 +360,13 @@ void CPlayer::Snap(int SnappingClient)
 
 		pPlayerInfo->m_Latency = Latency;
 		pPlayerInfo->m_Score = Score;
-		pPlayerInfo->m_Local = (int)(m_ClientID == SnappingClient && (m_Paused != PAUSE_PAUSED || SnappingClientVersion >= VERSION_DDNET_OLD));
-		pPlayerInfo->m_ClientID = id;
+		pPlayerInfo->m_Local = (int)(m_ClientId == SnappingClient && (m_Paused != PAUSE_PAUSED || SnappingClientVersion >= VERSION_DDNET_OLD));
+		pPlayerInfo->m_ClientId = id;
 		pPlayerInfo->m_Team = m_Team;
 		if(SnappingClientVersion < VERSION_DDNET_INDEPENDENT_SPECTATORS_TEAM)
 		{
 			// In older versions the SPECTATORS TEAM was also used if the own player is in PAUSE_PAUSED or if any player is in PAUSE_SPEC.
-			pPlayerInfo->m_Team = (m_Paused != PAUSE_PAUSED || m_ClientID != SnappingClient) && m_Paused < PAUSE_SPEC ? m_Team : TEAM_SPECTATORS;
+			pPlayerInfo->m_Team = (m_Paused != PAUSE_PAUSED || m_ClientId != SnappingClient) && m_Paused < PAUSE_SPEC ? m_Team : TEAM_SPECTATORS;
 		}
 	}
 	else
@@ -375,34 +378,34 @@ void CPlayer::Snap(int SnappingClient)
 		pPlayerInfo->m_PlayerFlags = PlayerFlags_SixToSeven(m_PlayerFlags);
 		if(SnappingClientVersion >= VERSION_DDRACE && (m_PlayerFlags & PLAYERFLAG_AIM))
 			pPlayerInfo->m_PlayerFlags |= protocol7::PLAYERFLAG_AIM;
-		if(Server()->ClientAuthed(m_ClientID))
+		if(Server()->ClientAuthed(m_ClientId))
 			pPlayerInfo->m_PlayerFlags |= protocol7::PLAYERFLAG_ADMIN;
 
 		// Times are in milliseconds for 0.7
-		pPlayerInfo->m_Score = m_Score.has_value() ? GameServer()->Score()->PlayerData(m_ClientID)->m_BestTime * 1000 : -1;
+		pPlayerInfo->m_Score = m_Score.has_value() ? GameServer()->Score()->PlayerData(m_ClientId)->m_BestTime * 1000 : -1;
 		pPlayerInfo->m_Latency = Latency;
 	}
 
-	if(m_ClientID == SnappingClient && (m_Team == TEAM_SPECTATORS || m_Paused))
+	if(m_ClientId == SnappingClient && (m_Team == TEAM_SPECTATORS || m_Paused))
 	{
 		if(!Server()->IsSixup(SnappingClient))
 		{
-			CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(m_ClientID);
+			CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(m_ClientId);
 			if(!pSpectatorInfo)
 				return;
 
-			pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+			pSpectatorInfo->m_SpectatorId = m_SpectatorId;
 			pSpectatorInfo->m_X = m_ViewPos.x;
 			pSpectatorInfo->m_Y = m_ViewPos.y;
 		}
 		else
 		{
-			protocol7::CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<protocol7::CNetObj_SpectatorInfo>(m_ClientID);
+			protocol7::CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<protocol7::CNetObj_SpectatorInfo>(m_ClientId);
 			if(!pSpectatorInfo)
 				return;
 
-			pSpectatorInfo->m_SpecMode = m_SpectatorID == SPEC_FREEVIEW ? protocol7::SPEC_FREEVIEW : protocol7::SPEC_PLAYER;
-			pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+			pSpectatorInfo->m_SpecMode = m_SpectatorId == SPEC_FREEVIEW ? protocol7::SPEC_FREEVIEW : protocol7::SPEC_PLAYER;
+			pSpectatorInfo->m_SpectatorId = m_SpectatorId;
 			pSpectatorInfo->m_X = m_ViewPos.x;
 			pSpectatorInfo->m_Y = m_ViewPos.y;
 		}
@@ -412,7 +415,7 @@ void CPlayer::Snap(int SnappingClient)
 	if(!pDDNetPlayer)
 		return;
 
-	pDDNetPlayer->m_AuthLevel = Server()->GetAuthedState(m_ClientID);
+	pDDNetPlayer->m_AuthLevel = Server()->GetAuthedState(m_ClientId);
 	pDDNetPlayer->m_Flags = 0;
 	if(m_Afk)
 		pDDNetPlayer->m_Flags |= EXPLAYERFLAG_AFK;
@@ -435,7 +438,7 @@ void CPlayer::Snap(int SnappingClient)
 	if(SnappingClient != SERVER_DEMO_CLIENT)
 	{
 		CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
-		ShowSpec = ShowSpec && (GameServer()->GetDDRaceTeam(m_ClientID) == GameServer()->GetDDRaceTeam(SnappingClient) || pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ON || (pSnapPlayer->GetTeam() == TEAM_SPECTATORS || pSnapPlayer->IsPaused()));
+		ShowSpec = ShowSpec && (GameServer()->GetDDRaceTeam(m_ClientId) == GameServer()->GetDDRaceTeam(SnappingClient) || pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ON || (pSnapPlayer->GetTeam() == TEAM_SPECTATORS || pSnapPlayer->IsPaused()));
 	}
 
 	if(ShowSpec)
@@ -451,15 +454,16 @@ void CPlayer::Snap(int SnappingClient)
 
 void CPlayer::FakeSnap()
 {
+	m_SentSnaps++;
 	if(GetClientVersion() >= VERSION_DDNET_OLD)
 		return;
 
-	if(Server()->IsSixup(m_ClientID))
+	if(Server()->IsSixup(m_ClientId))
 		return;
 
-	int FakeID = VANILLA_MAX_CLIENTS - 1;
+	int FakeId = VANILLA_MAX_CLIENTS - 1;
 
-	CNetObj_ClientInfo *pClientInfo = Server()->SnapNewItem<CNetObj_ClientInfo>(FakeID);
+	CNetObj_ClientInfo *pClientInfo = Server()->SnapNewItem<CNetObj_ClientInfo>(FakeId);
 
 	if(!pClientInfo)
 		return;
@@ -471,21 +475,21 @@ void CPlayer::FakeSnap()
 	if(m_Paused != PAUSE_PAUSED)
 		return;
 
-	CNetObj_PlayerInfo *pPlayerInfo = Server()->SnapNewItem<CNetObj_PlayerInfo>(FakeID);
+	CNetObj_PlayerInfo *pPlayerInfo = Server()->SnapNewItem<CNetObj_PlayerInfo>(FakeId);
 	if(!pPlayerInfo)
 		return;
 
 	pPlayerInfo->m_Latency = m_Latency.m_Min;
 	pPlayerInfo->m_Local = 1;
-	pPlayerInfo->m_ClientID = FakeID;
+	pPlayerInfo->m_ClientId = FakeId;
 	pPlayerInfo->m_Score = -9999;
 	pPlayerInfo->m_Team = TEAM_SPECTATORS;
 
-	CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(FakeID);
+	CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(FakeId);
 	if(!pSpectatorInfo)
 		return;
 
-	pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+	pSpectatorInfo->m_SpectatorId = m_SpectatorId;
 	pSpectatorInfo->m_X = m_ViewPos.x;
 	pSpectatorInfo->m_Y = m_ViewPos.y;
 }
@@ -512,18 +516,18 @@ void CPlayer::OnPredictedInput(CNetObj_PlayerInput *pNewInput)
 
 	// Magic number when we can hope that client has successfully identified itself
 	if(m_NumInputs == 20 && g_Config.m_SvClientSuggestion[0] != '\0' && GetClientVersion() <= VERSION_DDNET_OLD)
-		GameServer()->SendBroadcast(g_Config.m_SvClientSuggestion, m_ClientID);
-	else if(m_NumInputs == 200 && Server()->IsSixup(m_ClientID))
-		GameServer()->SendBroadcast("This server uses an experimental translation from Teeworlds 0.7 to 0.6. Please report bugs on ddnet.org/discord", m_ClientID);
+		GameServer()->SendBroadcast(g_Config.m_SvClientSuggestion, m_ClientId);
+	else if(m_NumInputs == 200 && Server()->IsSixup(m_ClientId))
+		GameServer()->SendBroadcast("This server uses an experimental translation from Teeworlds 0.7 to 0.6. Please report bugs on ddnet.org/discord", m_ClientId);
 }
 
 void CPlayer::OnDirectInput(CNetObj_PlayerInput *pNewInput)
 {
-	Server()->SetClientFlags(m_ClientID, pNewInput->m_PlayerFlags);
+	Server()->SetClientFlags(m_ClientId, pNewInput->m_PlayerFlags);
 
 	AfkTimer();
 
-	if(((!m_pCharacter && m_Team == TEAM_SPECTATORS) || m_Paused) && m_SpectatorID == SPEC_FREEVIEW)
+	if(((!m_pCharacter && m_Team == TEAM_SPECTATORS) || m_Paused) && m_SpectatorId == SPEC_FREEVIEW)
 		m_ViewPos = vec2(pNewInput->m_TargetX, pNewInput->m_TargetY);
 
 	// check for activity
@@ -555,7 +559,7 @@ void CPlayer::OnPredictedEarlyInput(CNetObj_PlayerInput *pNewInput)
 
 int CPlayer::GetClientVersion() const
 {
-	return m_pGameServer->GetClientVersion(m_ClientID);
+	return m_pGameServer->GetClientVersion(m_ClientId);
 }
 
 CCharacter *CPlayer::GetCharacter()
@@ -576,7 +580,7 @@ void CPlayer::KillCharacter(int Weapon, bool SendKillMsg)
 {
 	if(m_pCharacter)
 	{
-		m_pCharacter->Die(m_ClientID, Weapon, SendKillMsg);
+		m_pCharacter->Die(m_ClientId, Weapon, SendKillMsg);
 
 		delete m_pCharacter;
 		m_pCharacter = 0;
@@ -595,7 +599,7 @@ void CPlayer::Respawn(bool WeakHook)
 CCharacter *CPlayer::ForceSpawn(vec2 Pos)
 {
 	m_Spawning = false;
-	m_pCharacter = new(m_ClientID) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientID));
+	m_pCharacter = new(m_ClientId) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientId));
 	m_pCharacter->Spawn(this, Pos);
 	m_Team = 0;
 	return m_pCharacter;
@@ -608,10 +612,10 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
 	m_Team = Team;
 	m_LastSetTeam = Server()->Tick();
 	m_LastActionTick = Server()->Tick();
-	m_SpectatorID = SPEC_FREEVIEW;
+	m_SpectatorId = SPEC_FREEVIEW;
 
 	protocol7::CNetMsg_Sv_Team Msg;
-	Msg.m_ClientID = m_ClientID;
+	Msg.m_ClientId = m_ClientId;
 	Msg.m_Team = m_Team;
 	Msg.m_Silent = !DoChatMsg;
 	Msg.m_CooldownTick = m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay;
@@ -622,17 +626,19 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
 		// update spectator modes
 		for(auto &pPlayer : GameServer()->m_apPlayers)
 		{
-			if(pPlayer && pPlayer->m_SpectatorID == m_ClientID)
-				pPlayer->m_SpectatorID = SPEC_FREEVIEW;
+			if(pPlayer && pPlayer->m_SpectatorId == m_ClientId)
+				pPlayer->m_SpectatorId = SPEC_FREEVIEW;
 		}
 	}
+
+	Server()->ExpireServerInfo();
 }
 
 bool CPlayer::SetTimerType(int TimerType)
 {
 	if(TimerType == TIMERTYPE_DEFAULT)
 	{
-		if(Server()->IsSixup(m_ClientID))
+		if(Server()->IsSixup(m_ClientId))
 			m_TimerType = TIMERTYPE_SIXUP;
 		else
 			SetTimerType(g_Config.m_SvDefaultTimerType);
@@ -640,7 +646,7 @@ bool CPlayer::SetTimerType(int TimerType)
 		return true;
 	}
 
-	if(Server()->IsSixup(m_ClientID))
+	if(Server()->IsSixup(m_ClientId))
 	{
 		if(TimerType == TIMERTYPE_SIXUP || TimerType == TIMERTYPE_NONE)
 		{
@@ -678,15 +684,15 @@ void CPlayer::TryRespawn()
 {
 	vec2 SpawnPos;
 
-	if(!GameServer()->m_pController->CanSpawn(m_Team, &SpawnPos, GameServer()->GetDDRaceTeam(m_ClientID)))
+	if(!GameServer()->m_pController->CanSpawn(m_Team, &SpawnPos, GameServer()->GetDDRaceTeam(m_ClientId)))
 		return;
 
 	m_WeakHookSpawn = false;
 	m_Spawning = false;
-	m_pCharacter = new(m_ClientID) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientID));
+	m_pCharacter = new(m_ClientId) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientId));
 	m_ViewPos = SpawnPos;
 	m_pCharacter->Spawn(this, SpawnPos);
-	GameServer()->CreatePlayerSpawn(SpawnPos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+	GameServer()->CreatePlayerSpawn(SpawnPos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientId));
 
 	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
 		m_pCharacter->SetSolo(true);
@@ -748,6 +754,11 @@ bool CPlayer::CanOverrideDefaultEmote() const
 	return m_LastEyeEmote == 0 || m_LastEyeEmote + (int64_t)g_Config.m_SvEyeEmoteChangeDelay * Server()->TickSpeed() < Server()->Tick();
 }
 
+bool CPlayer::CanSpec() const
+{
+	return m_pCharacter->IsGrounded() && m_pCharacter->m_Pos == m_pCharacter->m_PrevPos;
+}
+
 void CPlayer::ProcessPause()
 {
 	if(m_ForcePauseTime && m_ForcePauseTime < Server()->Tick())
@@ -756,11 +767,11 @@ void CPlayer::ProcessPause()
 		Pause(PAUSE_NONE, true);
 	}
 
-	if(m_Paused == PAUSE_SPEC && !m_pCharacter->IsPaused() && m_pCharacter->IsGrounded() && m_pCharacter->m_Pos == m_pCharacter->m_PrevPos)
+	if(m_Paused == PAUSE_SPEC && !m_pCharacter->IsPaused() && CanSpec())
 	{
 		m_pCharacter->Pause(true);
-		GameServer()->CreateDeath(m_pCharacter->m_Pos, m_ClientID, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
-		GameServer()->CreateSound(m_pCharacter->m_Pos, SOUND_PLAYER_DIE, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+		GameServer()->CreateDeath(m_pCharacter->m_Pos, m_ClientId, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientId));
+		GameServer()->CreateSound(m_pCharacter->m_Pos, SOUND_PLAYER_DIE, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientId));
 	}
 }
 
@@ -784,19 +795,19 @@ int CPlayer::Pause(int State, bool Force)
 			{
 				if(!Force && m_LastPause && m_LastPause + (int64_t)g_Config.m_SvSpecFrequency * Server()->TickSpeed() > Server()->Tick())
 				{
-					GameServer()->SendChatTarget(m_ClientID, "Can't /spec that quickly.");
+					GameServer()->SendChatTarget(m_ClientId, "Can't /spec that quickly.");
 					return m_Paused; // Do not update state. Do not collect $200
 				}
 				m_pCharacter->Pause(false);
 				m_ViewPos = m_pCharacter->m_Pos;
-				GameServer()->CreatePlayerSpawn(m_pCharacter->m_Pos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+				GameServer()->CreatePlayerSpawn(m_pCharacter->m_Pos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientId));
 			}
 			[[fallthrough]];
 		case PAUSE_SPEC:
 			if(g_Config.m_SvPauseMessages)
 			{
-				str_format(aBuf, sizeof(aBuf), (State > PAUSE_NONE) ? "'%s' speced" : "'%s' resumed", Server()->ClientName(m_ClientID));
-				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+				str_format(aBuf, sizeof(aBuf), (State > PAUSE_NONE) ? "'%s' speced" : "'%s' resumed", Server()->ClientName(m_ClientId));
+				GameServer()->SendChat(-1, TEAM_ALL, aBuf);
 			}
 			break;
 		}
@@ -807,12 +818,12 @@ int CPlayer::Pause(int State, bool Force)
 
 		// Sixup needs a teamchange
 		protocol7::CNetMsg_Sv_Team Msg;
-		Msg.m_ClientID = m_ClientID;
+		Msg.m_ClientId = m_ClientId;
 		Msg.m_CooldownTick = Server()->Tick();
 		Msg.m_Silent = true;
 		Msg.m_Team = m_Paused ? protocol7::TEAM_SPECTATORS : m_Team;
 
-		GameServer()->Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, m_ClientID);
+		GameServer()->Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, m_ClientId);
 	}
 
 	return m_Paused;
@@ -825,8 +836,8 @@ int CPlayer::ForcePause(int Time)
 	if(g_Config.m_SvPauseMessages)
 	{
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "'%s' was force-paused for %ds", Server()->ClientName(m_ClientID), Time);
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+		str_format(aBuf, sizeof(aBuf), "'%s' was force-paused for %ds", Server()->ClientName(m_ClientId), Time);
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf);
 	}
 
 	return Pause(PAUSE_SPEC, true);
@@ -849,9 +860,9 @@ void CPlayer::SpectatePlayerName(const char *pName)
 
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
-		if(i != m_ClientID && Server()->ClientIngame(i) && !str_comp(pName, Server()->ClientName(i)))
+		if(i != m_ClientId && Server()->ClientIngame(i) && !str_comp(pName, Server()->ClientName(i)))
 		{
-			m_SpectatorID = i;
+			m_SpectatorId = i;
 			return;
 		}
 	}
@@ -868,7 +879,7 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
 			{
 				if(aMessage[0] == 0)
 					break;
-				GameServer()->SendChatTarget(m_ClientID, aMessage);
+				GameServer()->SendChatTarget(m_ClientId, aMessage);
 			}
 			break;
 		case CScorePlayerResult::ALL:
@@ -879,10 +890,10 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
 				if(aMessage[0] == 0)
 					break;
 
-				if(GameServer()->ProcessSpamProtection(m_ClientID) && PrimaryMessage)
+				if(GameServer()->ProcessSpamProtection(m_ClientId) && PrimaryMessage)
 					break;
 
-				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aMessage, -1);
+				GameServer()->SendChat(-1, TEAM_ALL, aMessage, -1);
 				PrimaryMessage = false;
 			}
 			break;
@@ -902,32 +913,43 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
 
 			char aChatmsg[512];
 			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)",
-				Server()->ClientName(m_ClientID), Result.m_Data.m_MapVote.m_aMap, "/map");
+				Server()->ClientName(m_ClientId), Result.m_Data.m_MapVote.m_aMap, "/map");
 
-			GameServer()->CallVote(m_ClientID, Result.m_Data.m_MapVote.m_aMap, aCmd, "/map", aChatmsg);
+			GameServer()->CallVote(m_ClientId, Result.m_Data.m_MapVote.m_aMap, aCmd, "/map", aChatmsg);
 			break;
 		case CScorePlayerResult::PLAYER_INFO:
+		{
 			if(Result.m_Data.m_Info.m_Time.has_value())
 			{
-				GameServer()->Score()->PlayerData(m_ClientID)->Set(Result.m_Data.m_Info.m_Time.value(), Result.m_Data.m_Info.m_aTimeCp);
+				GameServer()->Score()->PlayerData(m_ClientId)->Set(Result.m_Data.m_Info.m_Time.value(), Result.m_Data.m_Info.m_aTimeCp);
 				m_Score = Result.m_Data.m_Info.m_Time;
 			}
 			Server()->ExpireServerInfo();
 			int Birthday = Result.m_Data.m_Info.m_Birthday;
-			if(Birthday != 0 && !m_BirthdayAnnounced)
+			if(Birthday != 0 && !m_BirthdayAnnounced && GetCharacter())
 			{
 				char aBuf[512];
 				str_format(aBuf, sizeof(aBuf),
 					"Happy DDNet birthday to %s for finishing their first map %d year%s ago!",
-					Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : "");
-				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, m_ClientID);
+					Server()->ClientName(m_ClientId), Birthday, Birthday > 1 ? "s" : "");
+				GameServer()->SendChat(-1, TEAM_ALL, aBuf, m_ClientId);
 				str_format(aBuf, sizeof(aBuf),
 					"Happy DDNet birthday, %s!\nYou have finished your first map exactly %d year%s ago!",
-					Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : "");
-				GameServer()->SendBroadcast(aBuf, m_ClientID);
+					Server()->ClientName(m_ClientId), Birthday, Birthday > 1 ? "s" : "");
+				GameServer()->SendBroadcast(aBuf, m_ClientId);
 				m_BirthdayAnnounced = true;
+
+				GameServer()->CreateBirthdayEffect(GetCharacter()->m_Pos, GetCharacter()->TeamMask());
 			}
-			GameServer()->SendRecord(m_ClientID);
+			GameServer()->SendRecord(m_ClientId);
+			break;
+		}
+		case CScorePlayerResult::PLAYER_TIMECP:
+			GameServer()->Score()->PlayerData(m_ClientId)->SetBestTimeCp(Result.m_Data.m_Info.m_aTimeCp);
+			char aBuf[128], aTime[32];
+			str_time_float(Result.m_Data.m_Info.m_Time.value(), TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+			str_format(aBuf, sizeof(aBuf), "Showing the checkpoint times for '%s' with a race time of %s", Result.m_Data.m_Info.m_aRequestedPlayer, aTime);
+			GameServer()->SendChatTarget(m_ClientId, aBuf);
 			break;
 		}
 	}
diff --git a/src/game/server/player.h b/src/game/server/player.h
index 8afed78165..c281ac5b14 100644
--- a/src/game/server/player.h
+++ b/src/game/server/player.h
@@ -34,7 +34,7 @@ class CPlayer
 	MACRO_ALLOC_POOL_ID()
 
 public:
-	CPlayer(CGameContext *pGameServer, uint32_t UniqueClientID, int ClientID, int Team);
+	CPlayer(CGameContext *pGameServer, uint32_t UniqueClientId, int ClientId, int Team);
 	~CPlayer();
 
 	void Reset();
@@ -44,8 +44,8 @@ class CPlayer
 	CCharacter *ForceSpawn(vec2 Pos); // required for loading savegames
 	void SetTeam(int Team, bool DoChatMsg = true);
 	int GetTeam() const { return m_Team; }
-	int GetCID() const { return m_ClientID; }
-	uint32_t GetUniqueCID() const { return m_UniqueClientID; }
+	int GetCid() const { return m_ClientId; }
+	uint32_t GetUniqueCid() const { return m_UniqueClientId; }
 	int GetClientVersion() const;
 	bool SetTimerType(int TimerType);
 
@@ -80,8 +80,10 @@ class CPlayer
 	// used for snapping to just update latency if the scoreboard is active
 	int m_aCurLatency[MAX_CLIENTS];
 
+	int m_SentSnaps = 0;
+
 	// used for spectator mode
-	int m_SpectatorID;
+	int m_SpectatorId;
 
 	bool m_IsReady;
 
@@ -127,7 +129,7 @@ class CPlayer
 	} m_Latency;
 
 private:
-	const uint32_t m_UniqueClientID;
+	const uint32_t m_UniqueClientId;
 	CCharacter *m_pCharacter;
 	int m_NumInputs;
 	CGameContext *m_pGameServer;
@@ -138,7 +140,7 @@ class CPlayer
 	//
 	bool m_Spawning;
 	bool m_WeakHookSpawn;
-	int m_ClientID;
+	int m_ClientId;
 	int m_Team;
 
 	int m_Paused;
@@ -170,6 +172,7 @@ class CPlayer
 	};
 
 	bool m_DND;
+	bool m_Whispers;
 	int64_t m_FirstVoteTick;
 	char m_aTimeoutCode[64];
 
@@ -177,6 +180,7 @@ class CPlayer
 	int Pause(int State, bool Force);
 	int ForcePause(int Time);
 	int IsPaused() const;
+	bool CanSpec() const;
 
 	bool IsPlaying() const;
 	int64_t m_Last_KickVote;
@@ -213,16 +217,18 @@ class CPlayer
 	bool CanOverrideDefaultEmote() const;
 
 	bool m_FirstPacket;
-	int64_t m_LastSQLQuery;
+	int64_t m_LastSqlQuery;
 	void ProcessScoreResult(CScorePlayerResult &Result);
 	std::shared_ptr<CScorePlayerResult> m_ScoreQueryResult;
 	std::shared_ptr<CScorePlayerResult> m_ScoreFinishResult;
 	bool m_NotEligibleForFinish;
 	int64_t m_EligibleForFinishCheck;
 	bool m_VotedForPractice;
-	int m_SwapTargetsClientID; //Client ID of the swap target for the given player
+	int m_SwapTargetsClientId; //Client ID of the swap target for the given player
 	bool m_BirthdayAnnounced;
 
+	int m_RescueMode;
+
 	CSaveTee m_LastTeleTee;
 };
 
diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp
index c5b1841d4d..b519335a7a 100644
--- a/src/game/server/save.cpp
+++ b/src/game/server/save.cpp
@@ -11,17 +11,24 @@
 
 CSaveTee::CSaveTee() = default;
 
-void CSaveTee::Save(CCharacter *pChr)
+void CSaveTee::Save(CCharacter *pChr, bool AddPenalty)
 {
-	m_ClientID = pChr->m_pPlayer->GetCID();
-	str_copy(m_aName, pChr->Server()->ClientName(m_ClientID), sizeof(m_aName));
+	m_ClientId = pChr->m_pPlayer->GetCid();
+	str_copy(m_aName, pChr->Server()->ClientName(m_ClientId), sizeof(m_aName));
 
 	m_Alive = pChr->m_Alive;
+
+	// This is extremely suspect code, probably interacts badly with force pause
 	m_Paused = absolute(pChr->m_pPlayer->IsPaused());
+	if(m_Paused == CPlayer::PAUSE_SPEC && !pChr->m_Paused)
+	{
+		m_Paused = CPlayer::PAUSE_NONE;
+	}
+
 	m_NeededFaketuning = pChr->m_NeededFaketuning;
 
-	m_TeeStarted = pChr->Teams()->TeeStarted(m_ClientID);
-	m_TeeFinished = pChr->Teams()->TeeFinished(m_ClientID);
+	m_TeeStarted = pChr->Teams()->TeeStarted(m_ClientId);
+	m_TeeFinished = pChr->Teams()->TeeFinished(m_ClientId);
 	m_IsSolo = pChr->m_Core.m_Solo;
 
 	for(int i = 0; i < NUM_WEAPONS; i++)
@@ -68,10 +75,13 @@ void CSaveTee::Save(CCharacter *pChr)
 	m_TuneZoneOld = pChr->m_TuneZoneOld;
 
 	if(pChr->m_StartTime)
-		m_Time = pChr->Server()->Tick() - pChr->m_StartTime + g_Config.m_SvSaveSwapGamesPenalty * pChr->Server()->TickSpeed();
+		m_Time = pChr->Server()->Tick() - pChr->m_StartTime;
 	else
 		m_Time = 0;
 
+	if(AddPenalty && pChr->m_StartTime)
+		m_Time += g_Config.m_SvSaveSwapGamesPenalty * pChr->Server()->TickSpeed();
+
 	m_Pos = pChr->m_Pos;
 	m_PrevPos = pChr->m_PrevPos;
 	m_TeleCheckpoint = pChr->m_TeleCheckpoint;
@@ -121,8 +131,10 @@ void CSaveTee::Save(CCharacter *pChr)
 	FormatUuid(pChr->GameServer()->GameUuid(), m_aGameUuid, sizeof(m_aGameUuid));
 }
 
-void CSaveTee::Load(CCharacter *pChr, int Team, bool IsSwap)
+bool CSaveTee::Load(CCharacter *pChr, int Team, bool IsSwap)
 {
+	bool Valid = true;
+
 	pChr->m_pPlayer->Pause(m_Paused, true);
 
 	pChr->m_Alive = m_Alive;
@@ -130,9 +142,9 @@ void CSaveTee::Load(CCharacter *pChr, int Team, bool IsSwap)
 
 	if(!IsSwap)
 	{
-		pChr->Teams()->SetForceCharacterTeam(pChr->m_pPlayer->GetCID(), Team);
-		pChr->Teams()->SetStarted(pChr->m_pPlayer->GetCID(), m_TeeStarted);
-		pChr->Teams()->SetFinished(pChr->m_pPlayer->GetCID(), m_TeeFinished);
+		pChr->Teams()->SetForceCharacterTeam(pChr->m_pPlayer->GetCid(), Team);
+		pChr->Teams()->SetStarted(pChr->m_pPlayer->GetCid(), m_TeeStarted);
+		pChr->Teams()->SetFinished(pChr->m_pPlayer->GetCid(), m_TeeFinished);
 	}
 
 	for(int i = 0; i < NUM_WEAPONS; i++)
@@ -236,8 +248,16 @@ void CSaveTee::Load(CCharacter *pChr, int Team, bool IsSwap)
 	{
 		// Always create a rescue tee at the exact location we loaded from so that
 		// the old one gets overwritten.
-		pChr->SetRescue();
+		pChr->ForceSetRescue(RESCUEMODE_AUTO);
+		pChr->ForceSetRescue(RESCUEMODE_MANUAL);
 	}
+
+	if(pChr->m_pPlayer->IsPaused() == -1 * CPlayer::PAUSE_SPEC && !pChr->m_pPlayer->CanSpec())
+	{
+		Valid = false;
+	}
+
+	return Valid;
 }
 
 char *CSaveTee::GetString(const CSaveTeam *pTeam)
@@ -247,7 +267,7 @@ char *CSaveTee::GetString(const CSaveTeam *pTeam)
 	{
 		for(int n = 0; n < pTeam->GetMembersCount(); n++)
 		{
-			if(m_HookedPlayer == pTeam->m_pSavedTees[n].GetClientID())
+			if(m_HookedPlayer == pTeam->m_pSavedTees[n].GetClientId())
 			{
 				HookedPlayer = n;
 				break;
@@ -454,7 +474,7 @@ void CSaveTee::LoadHookedPlayer(const CSaveTeam *pTeam)
 {
 	if(m_HookedPlayer == -1)
 		return;
-	m_HookedPlayer = pTeam->m_pSavedTees[m_HookedPlayer].GetClientID();
+	m_HookedPlayer = pTeam->m_pSavedTees[m_HookedPlayer].GetClientId();
 }
 
 bool CSaveTee::IsHooking() const
@@ -473,25 +493,30 @@ CSaveTeam::~CSaveTeam()
 	delete[] m_pSavedTees;
 }
 
-int CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry)
+ESaveResult CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry, bool Force)
 {
-	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (Team <= 0 || MAX_CLIENTS <= Team))
-		return 1;
+	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (Team <= 0 || MAX_CLIENTS <= Team) && !Force)
+		return ESaveResult::TEAM_FLOCK;
 
 	IGameController *pController = pGameServer->m_pController;
 	CGameTeams *pTeams = &pController->Teams();
 
+	if(pTeams->TeamFlock(Team) && !Force)
+	{
+		return ESaveResult::TEAM_0_MODE;
+	}
+
 	m_MembersCount = pTeams->Count(Team);
-	if(m_MembersCount <= 0)
+	if(m_MembersCount <= 0 && !Force)
 	{
-		return 2;
+		return ESaveResult::TEAM_NOT_FOUND;
 	}
 
 	m_TeamState = pTeams->GetTeamState(Team);
 
-	if(m_TeamState != CGameTeams::TEAMSTATE_STARTED)
+	if(m_TeamState != CGameTeams::TEAMSTATE_STARTED && !Force)
 	{
-		return 4;
+		return ESaveResult::NOT_STARTED;
 	}
 
 	m_HighestSwitchNumber = pGameServer->Collision()->m_HighestSwitchNumber;
@@ -499,21 +524,24 @@ int CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry)
 	m_Practice = pTeams->IsPractice(Team);
 
 	m_pSavedTees = new CSaveTee[m_MembersCount];
-	int aPlayerCIDs[MAX_CLIENTS];
+	int aPlayerCids[MAX_CLIENTS];
 	int j = 0;
 	CCharacter *p = (CCharacter *)pGameServer->m_World.FindFirst(CGameWorld::ENTTYPE_CHARACTER);
 	for(; p; p = (CCharacter *)p->TypeNext())
 	{
-		if(pTeams->m_Core.Team(p->GetPlayer()->GetCID()) != Team)
+		if(pTeams->m_Core.Team(p->GetPlayer()->GetCid()) != Team && !Force)
 			continue;
-		if(m_MembersCount == j)
-			return 3;
+		if(m_MembersCount == j && !Force)
+			return ESaveResult::CHAR_NOT_FOUND;
+		ESaveResult Result = pGameServer->m_World.BlocksSave(p->GetPlayer()->GetCid());
+		if(Result != ESaveResult::SUCCESS && !Force)
+			return Result;
 		m_pSavedTees[j].Save(p);
-		aPlayerCIDs[j] = p->GetPlayer()->GetCID();
+		aPlayerCids[j] = p->GetPlayer()->GetCid();
 		j++;
 	}
-	if(m_MembersCount != j)
-		return 3;
+	if(m_MembersCount != j && !Force)
+		return ESaveResult::CHAR_NOT_FOUND;
 
 	if(pGameServer->Collision()->m_HighestSwitchNumber)
 	{
@@ -531,37 +559,40 @@ int CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry)
 	}
 	if(!Dry)
 	{
-		pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCIDs, m_MembersCount);
+		pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCids, m_MembersCount);
 	}
-	return 0;
+	return ESaveResult::SUCCESS;
 }
 
-bool CSaveTeam::HandleSaveError(int Result, int ClientID, CGameContext *pGameContext)
+bool CSaveTeam::HandleSaveError(ESaveResult Result, int ClientId, CGameContext *pGameContext)
 {
 	switch(Result)
 	{
-	case 0:
+	case ESaveResult::SUCCESS:
 		return false;
-	case 1:
-		pGameContext->SendChatTarget(ClientID, "You have to be in a team (from 1-63)");
+	case ESaveResult::TEAM_FLOCK:
+		pGameContext->SendChatTarget(ClientId, "You have to be in a team (from 1-63)");
 		break;
-	case 2:
-		pGameContext->SendChatTarget(ClientID, "Could not find your Team");
+	case ESaveResult::TEAM_NOT_FOUND:
+		pGameContext->SendChatTarget(ClientId, "Could not find your Team");
 		break;
-	case 3:
-		pGameContext->SendChatTarget(ClientID, "To save all players in your team have to be alive and not in '/spec'");
+	case ESaveResult::CHAR_NOT_FOUND:
+		pGameContext->SendChatTarget(ClientId, "To save all players in your team have to be alive and not in '/spec'");
 		break;
-	case 4:
-		pGameContext->SendChatTarget(ClientID, "Your team has not started yet");
+	case ESaveResult::NOT_STARTED:
+		pGameContext->SendChatTarget(ClientId, "Your team has not started yet");
 		break;
-	default: // this state should never be reached
-		pGameContext->SendChatTarget(ClientID, "Unknown error while saving");
+	case ESaveResult::TEAM_0_MODE:
+		pGameContext->SendChatTarget(ClientId, "Team can't be saved while in team 0 mode");
+		break;
+	case ESaveResult::DRAGGER_ACTIVE:
+		pGameContext->SendChatTarget(ClientId, "Team can't be saved while a dragger is active");
 		break;
 	}
 	return true;
 }
 
-void CSaveTeam::Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong)
+bool CSaveTeam::Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong, bool IgnorePlayers)
 {
 	IGameController *pController = pGameServer->m_pController;
 	CGameTeams *pTeams = &pController->Teams();
@@ -570,15 +601,20 @@ void CSaveTeam::Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakSt
 	pTeams->SetTeamLock(Team, m_TeamLocked);
 	pTeams->SetPractice(Team, m_Practice);
 
-	int aPlayerCIDs[MAX_CLIENTS];
-	for(int i = m_MembersCount; i-- > 0;)
+	bool ContainsInvalidPlayer = false;
+	int aPlayerCids[MAX_CLIENTS];
+
+	if(!IgnorePlayers)
 	{
-		int ClientID = m_pSavedTees[i].GetClientID();
-		aPlayerCIDs[i] = ClientID;
-		if(pGameServer->m_apPlayers[ClientID] && pTeams->m_Core.Team(ClientID) == Team)
+		for(int i = m_MembersCount; i-- > 0;)
 		{
-			CCharacter *pChr = MatchCharacter(pGameServer, m_pSavedTees[i].GetClientID(), i, KeepCurrentWeakStrong);
-			m_pSavedTees[i].Load(pChr, Team);
+			int ClientId = m_pSavedTees[i].GetClientId();
+			aPlayerCids[i] = ClientId;
+			if(pGameServer->m_apPlayers[ClientId] && pTeams->m_Core.Team(ClientId) == Team)
+			{
+				CCharacter *pChr = MatchCharacter(pGameServer, m_pSavedTees[i].GetClientId(), i, KeepCurrentWeakStrong);
+				ContainsInvalidPlayer |= !m_pSavedTees[i].Load(pChr, Team);
+			}
 		}
 	}
 
@@ -593,18 +629,21 @@ void CSaveTeam::Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakSt
 		}
 	}
 	// remove projectiles and laser
-	pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCIDs, m_MembersCount);
+	if(!IgnorePlayers)
+		pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCids, m_MembersCount);
+
+	return !ContainsInvalidPlayer;
 }
 
-CCharacter *CSaveTeam::MatchCharacter(CGameContext *pGameServer, int ClientID, int SaveID, bool KeepCurrentCharacter) const
+CCharacter *CSaveTeam::MatchCharacter(CGameContext *pGameServer, int ClientId, int SaveId, bool KeepCurrentCharacter) const
 {
-	if(KeepCurrentCharacter && pGameServer->m_apPlayers[ClientID]->GetCharacter())
+	if(KeepCurrentCharacter && pGameServer->m_apPlayers[ClientId]->GetCharacter())
 	{
 		// keep old character to retain current weak/strong order
-		return pGameServer->m_apPlayers[ClientID]->GetCharacter();
+		return pGameServer->m_apPlayers[ClientId]->GetCharacter();
 	}
-	pGameServer->m_apPlayers[ClientID]->KillCharacter(WEAPON_GAME);
-	return pGameServer->m_apPlayers[ClientID]->ForceSpawn(m_pSavedTees[SaveID].GetPos());
+	pGameServer->m_apPlayers[ClientId]->KillCharacter(WEAPON_GAME);
+	return pGameServer->m_apPlayers[ClientId]->ForceSpawn(m_pSavedTees[SaveId].GetPos());
 }
 
 char *CSaveTeam::GetString()
@@ -785,7 +824,7 @@ int CSaveTeam::FromString(const char *pString)
 	return 0;
 }
 
-bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const
+bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientId, int NumPlayer, char *pMessage, int MessageLen) const
 {
 	if(NumPlayer > m_MembersCount)
 	{
@@ -817,7 +856,7 @@ bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *
 		{
 			if(str_comp(m_pSavedTees[i].GetName(), paNames[j]) == 0)
 			{
-				m_pSavedTees[i].SetClientID(pClientID[j]);
+				m_pSavedTees[i].SetClientId(pClientId[j]);
 				Found = true;
 				break;
 			}
@@ -828,7 +867,7 @@ bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *
 			return false;
 		}
 	}
-	// match hook to correct ClientID
+	// match hook to correct ClientId
 	for(int n = 0; n < m_MembersCount; n++)
 		m_pSavedTees[n].LoadHookedPlayer(this);
 	return true;
diff --git a/src/game/server/save.h b/src/game/server/save.h
index 14abd7f373..cf35e807e1 100644
--- a/src/game/server/save.h
+++ b/src/game/server/save.h
@@ -12,21 +12,39 @@ class CGameWorld;
 class CCharacter;
 class CSaveTeam;
 
+enum
+{
+	RESCUEMODE_AUTO = 0,
+	RESCUEMODE_MANUAL,
+	NUM_RESCUEMODES
+};
+
+enum class ESaveResult
+{
+	SUCCESS,
+	TEAM_FLOCK,
+	TEAM_NOT_FOUND,
+	CHAR_NOT_FOUND,
+	NOT_STARTED,
+	TEAM_0_MODE,
+	DRAGGER_ACTIVE
+};
+
 class CSaveTee
 {
 public:
 	CSaveTee();
 	~CSaveTee() = default;
-	void Save(CCharacter *pchr);
-	void Load(CCharacter *pchr, int Team, bool IsSwap = false);
+	void Save(CCharacter *pchr, bool AddPenalty = true);
+	bool Load(CCharacter *pchr, int Team, bool IsSwap = false);
 	char *GetString(const CSaveTeam *pTeam);
 	int FromString(const char *pString);
 	void LoadHookedPlayer(const CSaveTeam *pTeam);
 	bool IsHooking() const;
 	vec2 GetPos() const { return m_Pos; }
 	const char *GetName() const { return m_aName; }
-	int GetClientID() const { return m_ClientID; }
-	void SetClientID(int ClientID) { m_ClientID = ClientID; }
+	int GetClientId() const { return m_ClientId; }
+	void SetClientId(int ClientId) { m_ClientId = ClientId; }
 
 	enum
 	{
@@ -38,7 +56,7 @@ class CSaveTee
 	};
 
 private:
-	int m_ClientID;
+	int m_ClientId;
 
 	char m_aString[2048];
 	char m_aName[16];
@@ -140,17 +158,17 @@ class CSaveTeam
 	// MatchPlayers has to be called afterwards
 	int FromString(const char *pString);
 	// returns true if a team can load, otherwise writes a nice error Message in pMessage
-	bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const;
-	int Save(CGameContext *pGameServer, int Team, bool Dry = false);
-	void Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong);
+	bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientId, int NumPlayer, char *pMessage, int MessageLen) const;
+	ESaveResult Save(CGameContext *pGameServer, int Team, bool Dry = false, bool Force = false);
+	bool Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong, bool IgnorePlayers = false);
 
 	CSaveTee *m_pSavedTees = nullptr;
 
 	// returns true if an error occurred
-	static bool HandleSaveError(int Result, int ClientID, CGameContext *pGameContext);
+	static bool HandleSaveError(ESaveResult Result, int ClientId, CGameContext *pGameContext);
 
 private:
-	CCharacter *MatchCharacter(CGameContext *pGameServer, int ClientID, int SaveID, bool KeepCurrentCharacter) const;
+	CCharacter *MatchCharacter(CGameContext *pGameServer, int ClientId, int SaveId, bool KeepCurrentCharacter) const;
 
 	char m_aString[65536];
 
diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp
index 610ebd1531..408ab62638 100644
--- a/src/game/server/score.cpp
+++ b/src/game/server/score.cpp
@@ -16,9 +16,9 @@
 
 class IDbConnection;
 
-std::shared_ptr<CScorePlayerResult> CScore::NewSqlPlayerResult(int ClientID)
+std::shared_ptr<CScorePlayerResult> CScore::NewSqlPlayerResult(int ClientId)
 {
-	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientID];
+	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientId];
 	if(pCurPlayer->m_ScoreQueryResult != nullptr) // TODO: send player a message: "too many requests"
 		return nullptr;
 	pCurPlayer->m_ScoreQueryResult = std::make_shared<CScorePlayerResult>();
@@ -28,31 +28,31 @@ std::shared_ptr<CScorePlayerResult> CScore::NewSqlPlayerResult(int ClientID)
 void CScore::ExecPlayerThread(
 	bool (*pFuncPtr)(IDbConnection *, const ISqlData *, char *pError, int ErrorSize),
 	const char *pThreadName,
-	int ClientID,
+	int ClientId,
 	const char *pName,
 	int Offset)
 {
-	auto pResult = NewSqlPlayerResult(ClientID);
+	auto pResult = NewSqlPlayerResult(ClientId);
 	if(pResult == nullptr)
 		return;
 	auto Tmp = std::make_unique<CSqlPlayerRequest>(pResult);
 	str_copy(Tmp->m_aName, pName, sizeof(Tmp->m_aName));
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
 	str_copy(Tmp->m_aServer, g_Config.m_SvSqlServerName, sizeof(Tmp->m_aServer));
-	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer));
 	Tmp->m_Offset = Offset;
 
 	m_pPool->Execute(pFuncPtr, std::move(Tmp), pThreadName);
 }
 
-bool CScore::RateLimitPlayer(int ClientID)
+bool CScore::RateLimitPlayer(int ClientId)
 {
-	CPlayer *pPlayer = GameServer()->m_apPlayers[ClientID];
+	CPlayer *pPlayer = GameServer()->m_apPlayers[ClientId];
 	if(pPlayer == 0)
 		return true;
-	if(pPlayer->m_LastSQLQuery + (int64_t)g_Config.m_SvSqlQueriesDelay * Server()->TickSpeed() >= Server()->Tick())
+	if(pPlayer->m_LastSqlQuery + (int64_t)g_Config.m_SvSqlQueriesDelay * Server()->TickSpeed() >= Server()->Tick())
 		return true;
-	pPlayer->m_LastSQLQuery = Server()->Tick();
+	pPlayer->m_LastSqlQuery = Server()->Tick();
 	return false;
 }
 
@@ -79,20 +79,16 @@ CScore::CScore(CGameContext *pGameServer, CDbConnectionPool *pPool) :
 	secure_random_fill(aSeed, sizeof(aSeed));
 	m_Prng.Seed(aSeed);
 
-	IOHANDLE File = GameServer()->Storage()->OpenFile("wordlist.txt", IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
-	if(File)
+	CLineReader LineReader;
+	if(LineReader.OpenFile(GameServer()->Storage()->OpenFile("wordlist.txt", IOFLAG_READ, IStorage::TYPE_ALL)))
 	{
-		CLineReader LineReader;
-		LineReader.Init(File);
-		char *pLine;
-		while((pLine = LineReader.Get()))
+		while(const char *pLine = LineReader.Get())
 		{
 			char aWord[32] = {0};
 			sscanf(pLine, "%*s %31s", aWord);
 			aWord[31] = 0;
 			m_vWordlist.emplace_back(aWord);
 		}
-		io_close(File);
 	}
 	else
 	{
@@ -116,46 +112,53 @@ void CScore::LoadBestTime()
 	auto LoadBestTimeResult = std::make_shared<CScoreLoadBestTimeResult>();
 	m_pGameServer->m_pController->m_pLoadBestTimeResult = LoadBestTimeResult;
 
-	auto Tmp = std::make_unique<CSqlLoadBestTimeData>(LoadBestTimeResult);
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	auto Tmp = std::make_unique<CSqlLoadBestTimeRequest>(LoadBestTimeResult);
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
 	m_pPool->Execute(CScoreWorker::LoadBestTime, std::move(Tmp), "load best time");
 }
 
-void CScore::LoadPlayerData(int ClientID, const char *pName)
+void CScore::LoadPlayerData(int ClientId, const char *pName)
 {
-	ExecPlayerThread(CScoreWorker::LoadPlayerData, "load player data", ClientID, pName, 0);
+	ExecPlayerThread(CScoreWorker::LoadPlayerData, "load player data", ClientId, pName, 0);
 }
 
-void CScore::MapVote(int ClientID, const char *pMapName)
+void CScore::LoadPlayerTimeCp(int ClientId, const char *pName)
 {
-	if(RateLimitPlayer(ClientID))
+	ExecPlayerThread(CScoreWorker::LoadPlayerTimeCp, "load player timecp", ClientId, pName, 0);
+}
+
+void CScore::MapVote(int ClientId, const char *pMapName)
+{
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::MapVote, "map vote", ClientID, pMapName, 0);
+	ExecPlayerThread(CScoreWorker::MapVote, "map vote", ClientId, pMapName, 0);
 }
 
-void CScore::MapInfo(int ClientID, const char *pMapName)
+void CScore::MapInfo(int ClientId, const char *pMapName)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::MapInfo, "map info", ClientID, pMapName, 0);
+	ExecPlayerThread(CScoreWorker::MapInfo, "map info", ClientId, pMapName, 0);
 }
 
-void CScore::SaveScore(int ClientID, float Time, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible)
+void CScore::SaveScore(int ClientId, int TimeTicks, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible)
 {
 	CConsole *pCon = (CConsole *)GameServer()->Console();
 	if(pCon->Cheated() || NotEligible)
 		return;
 
-	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientID];
+	GameServer()->TeehistorianRecordPlayerFinish(ClientId, TimeTicks);
+
+	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientId];
 	if(pCurPlayer->m_ScoreFinishResult != nullptr)
 		dbg_msg("sql", "WARNING: previous save score result didn't complete, overwriting it now");
 	pCurPlayer->m_ScoreFinishResult = std::make_shared<CScorePlayerResult>();
 	auto Tmp = std::make_unique<CSqlScoreData>(pCurPlayer->m_ScoreFinishResult);
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
 	FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid));
-	Tmp->m_ClientID = ClientID;
-	str_copy(Tmp->m_aName, Server()->ClientName(ClientID), sizeof(Tmp->m_aName));
-	Tmp->m_Time = Time;
+	Tmp->m_ClientId = ClientId;
+	str_copy(Tmp->m_aName, Server()->ClientName(ClientId), sizeof(Tmp->m_aName));
+	Tmp->m_Time = (float)(TimeTicks) / (float)Server()->TickSpeed();
 	str_copy(Tmp->m_aTimestamp, pTimestamp, sizeof(Tmp->m_aTimestamp));
 	for(int i = 0; i < NUM_CHECKPOINTS; i++)
 		Tmp->m_aCurrentTimeCp[i] = aTimeCp[i];
@@ -163,145 +166,156 @@ void CScore::SaveScore(int ClientID, float Time, const char *pTimestamp, const f
 	m_pPool->ExecuteWrite(CScoreWorker::SaveScore, std::move(Tmp), "save score");
 }
 
-void CScore::SaveTeamScore(int *pClientIDs, unsigned int Size, float Time, const char *pTimestamp)
+void CScore::SaveTeamScore(int Team, int *pClientIds, unsigned int Size, int TimeTicks, const char *pTimestamp)
 {
 	CConsole *pCon = (CConsole *)GameServer()->Console();
 	if(pCon->Cheated())
 		return;
 	for(unsigned int i = 0; i < Size; i++)
 	{
-		if(GameServer()->m_apPlayers[pClientIDs[i]]->m_NotEligibleForFinish)
+		if(GameServer()->m_apPlayers[pClientIds[i]]->m_NotEligibleForFinish)
 			return;
 	}
+
+	GameServer()->TeehistorianRecordTeamFinish(Team, TimeTicks);
+
 	auto Tmp = std::make_unique<CSqlTeamScoreData>();
 	for(unsigned int i = 0; i < Size; i++)
-		str_copy(Tmp->m_aaNames[i], Server()->ClientName(pClientIDs[i]), sizeof(Tmp->m_aaNames[i]));
+		str_copy(Tmp->m_aaNames[i], Server()->ClientName(pClientIds[i]), sizeof(Tmp->m_aaNames[i]));
 	Tmp->m_Size = Size;
-	Tmp->m_Time = Time;
+	Tmp->m_Time = (float)TimeTicks / (float)Server()->TickSpeed();
 	str_copy(Tmp->m_aTimestamp, pTimestamp, sizeof(Tmp->m_aTimestamp));
 	FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid));
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
 	Tmp->m_TeamrankUuid = RandomUuid();
 
 	m_pPool->ExecuteWrite(CScoreWorker::SaveTeamScore, std::move(Tmp), "save team score");
 }
 
-void CScore::ShowRank(int ClientID, const char *pName)
+void CScore::ShowRank(int ClientId, const char *pName)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowRank, "show rank", ClientID, pName, 0);
+	ExecPlayerThread(CScoreWorker::ShowRank, "show rank", ClientId, pName, 0);
 }
 
-void CScore::ShowTeamRank(int ClientID, const char *pName)
+void CScore::ShowTeamRank(int ClientId, const char *pName)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTeamRank, "show team rank", ClientID, pName, 0);
+	ExecPlayerThread(CScoreWorker::ShowTeamRank, "show team rank", ClientId, pName, 0);
 }
 
-void CScore::ShowTop(int ClientID, int Offset)
+void CScore::ShowTop(int ClientId, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTop, "show top5", ClientID, "", Offset);
+	ExecPlayerThread(CScoreWorker::ShowTop, "show top5", ClientId, "", Offset);
 }
 
-void CScore::ShowTeamTop5(int ClientID, int Offset)
+void CScore::ShowTeamTop5(int ClientId, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTeamTop5, "show team top5", ClientID, "", Offset);
+	ExecPlayerThread(CScoreWorker::ShowTeamTop5, "show team top5", ClientId, "", Offset);
 }
 
-void CScore::ShowPlayerTeamTop5(int ClientID, const char *pName, int Offset)
+void CScore::ShowPlayerTeamTop5(int ClientId, const char *pName, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowPlayerTeamTop5, "show team top5 player", ClientID, pName, Offset);
+	ExecPlayerThread(CScoreWorker::ShowPlayerTeamTop5, "show team top5 player", ClientId, pName, Offset);
 }
 
-void CScore::ShowTimes(int ClientID, int Offset)
+void CScore::ShowTimes(int ClientId, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientID, "", Offset);
+	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientId, "", Offset);
 }
 
-void CScore::ShowTimes(int ClientID, const char *pName, int Offset)
+void CScore::ShowTimes(int ClientId, const char *pName, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientID, pName, Offset);
+	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientId, pName, Offset);
 }
 
-void CScore::ShowPoints(int ClientID, const char *pName)
+void CScore::ShowPoints(int ClientId, const char *pName)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowPoints, "show points", ClientID, pName, 0);
+	ExecPlayerThread(CScoreWorker::ShowPoints, "show points", ClientId, pName, 0);
 }
 
-void CScore::ShowTopPoints(int ClientID, int Offset)
+void CScore::ShowTopPoints(int ClientId, int Offset)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::ShowTopPoints, "show top points", ClientID, "", Offset);
+	ExecPlayerThread(CScoreWorker::ShowTopPoints, "show top points", ClientId, "", Offset);
 }
 
-void CScore::RandomMap(int ClientID, int Stars)
+void CScore::RandomMap(int ClientId, int Stars)
 {
-	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientID);
+	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientId);
 	GameServer()->m_SqlRandomMapResult = pResult;
 
 	auto Tmp = std::make_unique<CSqlRandomMapRequest>(pResult);
 	Tmp->m_Stars = Stars;
-	str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap));
+	str_copy(Tmp->m_aCurrentMap, Server()->GetMapName(), sizeof(Tmp->m_aCurrentMap));
 	str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType));
-	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer));
 
 	m_pPool->Execute(CScoreWorker::RandomMap, std::move(Tmp), "random map");
 }
 
-void CScore::RandomUnfinishedMap(int ClientID, int Stars)
+void CScore::RandomUnfinishedMap(int ClientId, int Stars)
 {
-	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientID);
+	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientId);
 	GameServer()->m_SqlRandomMapResult = pResult;
 
 	auto Tmp = std::make_unique<CSqlRandomMapRequest>(pResult);
 	Tmp->m_Stars = Stars;
-	str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap));
+	str_copy(Tmp->m_aCurrentMap, Server()->GetMapName(), sizeof(Tmp->m_aCurrentMap));
 	str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType));
-	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer));
 
 	m_pPool->Execute(CScoreWorker::RandomUnfinishedMap, std::move(Tmp), "random unfinished map");
 }
 
-void CScore::SaveTeam(int ClientID, const char *pCode, const char *pServer)
+void CScore::SaveTeam(int ClientId, const char *pCode, const char *pServer)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
 	auto *pController = GameServer()->m_pController;
-	int Team = pController->Teams().m_Core.Team(ClientID);
+	int Team = pController->Teams().m_Core.Team(ClientId);
+	char aBuf[512];
 	if(pController->Teams().GetSaving(Team))
+	{
+		GameServer()->SendChatTarget(ClientId, "Team save already in progress");
+		return;
+	}
+	if(pController->Teams().IsPractice(Team))
+	{
+		GameServer()->SendChatTarget(ClientId, "Team save disabled for teams in practice mode");
 		return;
+	}
 
-	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientID);
-	SaveResult->m_SaveID = RandomUuid();
-	int Result = SaveResult->m_SavedTeam.Save(GameServer(), Team);
-	if(CSaveTeam::HandleSaveError(Result, ClientID, GameServer()))
+	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientId);
+	SaveResult->m_SaveId = RandomUuid();
+	ESaveResult Result = SaveResult->m_SavedTeam.Save(GameServer(), Team);
+	if(CSaveTeam::HandleSaveError(Result, ClientId, GameServer()))
 		return;
 	pController->Teams().SetSaving(Team, SaveResult);
 
-	auto Tmp = std::make_unique<CSqlTeamSave>(SaveResult);
+	auto Tmp = std::make_unique<CSqlTeamSaveData>(SaveResult);
 	str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode));
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
 	str_copy(Tmp->m_aServer, pServer, sizeof(Tmp->m_aServer));
-	str_copy(Tmp->m_aClientName, this->Server()->ClientName(ClientID), sizeof(Tmp->m_aClientName));
+	str_copy(Tmp->m_aClientName, this->Server()->ClientName(ClientId), sizeof(Tmp->m_aClientName));
 	Tmp->m_aGeneratedCode[0] = '\0';
 	GeneratePassphrase(Tmp->m_aGeneratedCode, sizeof(Tmp->m_aGeneratedCode));
 
-	char aBuf[512];
 	if(Tmp->m_aCode[0] == '\0')
 	{
 		str_format(aBuf,
@@ -317,37 +331,49 @@ void CScore::SaveTeam(int ClientID, const char *pCode, const char *pServer)
 			Tmp->m_aCode,
 			Tmp->m_aGeneratedCode);
 	}
-	pController->Teams().KillSavedTeam(ClientID, Team);
+	pController->Teams().KillSavedTeam(ClientId, Team);
 	GameServer()->SendChatTeam(Team, aBuf);
 	m_pPool->ExecuteWrite(CScoreWorker::SaveTeam, std::move(Tmp), "save team");
 }
 
-void CScore::LoadTeam(const char *pCode, int ClientID)
+void CScore::LoadTeam(const char *pCode, int ClientId)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
 	auto *pController = GameServer()->m_pController;
-	int Team = pController->Teams().m_Core.Team(ClientID);
+	int Team = pController->Teams().m_Core.Team(ClientId);
 	if(pController->Teams().GetSaving(Team))
+	{
+		GameServer()->SendChatTarget(ClientId, "Team load already in progress");
 		return;
+	}
 	if(Team < TEAM_FLOCK || Team >= MAX_CLIENTS || (g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team == TEAM_FLOCK))
 	{
-		GameServer()->SendChatTarget(ClientID, "You have to be in a team (from 1-63)");
+		GameServer()->SendChatTarget(ClientId, "You have to be in a team (from 1-63)");
 		return;
 	}
 	if(pController->Teams().GetTeamState(Team) != CGameTeams::TEAMSTATE_OPEN)
 	{
-		GameServer()->SendChatTarget(ClientID, "Team can't be loaded while racing");
+		GameServer()->SendChatTarget(ClientId, "Team can't be loaded while racing");
+		return;
+	}
+	if(pController->Teams().TeamFlock(Team))
+	{
+		GameServer()->SendChatTarget(ClientId, "Team can't be loaded while in team 0 mode");
+		return;
+	}
+	if(pController->Teams().IsPractice(Team))
+	{
+		GameServer()->SendChatTarget(ClientId, "Team can't be loaded while practice is enabled");
 		return;
 	}
-	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientID);
+	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientId);
 	SaveResult->m_Status = CScoreSaveResult::LOAD_FAILED;
 	pController->Teams().SetSaving(Team, SaveResult);
-	auto Tmp = std::make_unique<CSqlTeamLoad>(SaveResult);
+	auto Tmp = std::make_unique<CSqlTeamLoadRequest>(SaveResult);
 	str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode));
-	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
-	Tmp->m_ClientID = ClientID;
-	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	str_copy(Tmp->m_aMap, Server()->GetMapName(), sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientId), sizeof(Tmp->m_aRequestingPlayer));
 	Tmp->m_NumPlayer = 0;
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
@@ -355,16 +381,16 @@ void CScore::LoadTeam(const char *pCode, int ClientID)
 		{
 			// put all names at the beginning of the array
 			str_copy(Tmp->m_aClientNames[Tmp->m_NumPlayer], Server()->ClientName(i), sizeof(Tmp->m_aClientNames[Tmp->m_NumPlayer]));
-			Tmp->m_aClientID[Tmp->m_NumPlayer] = i;
+			Tmp->m_aClientId[Tmp->m_NumPlayer] = i;
 			Tmp->m_NumPlayer++;
 		}
 	}
 	m_pPool->ExecuteWrite(CScoreWorker::LoadTeam, std::move(Tmp), "load team");
 }
 
-void CScore::GetSaves(int ClientID)
+void CScore::GetSaves(int ClientId)
 {
-	if(RateLimitPlayer(ClientID))
+	if(RateLimitPlayer(ClientId))
 		return;
-	ExecPlayerThread(CScoreWorker::GetSaves, "get saves", ClientID, "", 0);
+	ExecPlayerThread(CScoreWorker::GetSaves, "get saves", ClientId, "", 0);
 }
diff --git a/src/game/server/score.h b/src/game/server/score.h
index 84380068bf..d3d4c7dc45 100644
--- a/src/game/server/score.h
+++ b/src/game/server/score.h
@@ -26,51 +26,52 @@ class CScore
 	void GeneratePassphrase(char *pBuf, int BufSize);
 
 	// returns new SqlResult bound to the player, if no current Thread is active for this player
-	std::shared_ptr<CScorePlayerResult> NewSqlPlayerResult(int ClientID);
+	std::shared_ptr<CScorePlayerResult> NewSqlPlayerResult(int ClientId);
 	// Creates for player database requests
 	void ExecPlayerThread(
 		bool (*pFuncPtr)(IDbConnection *, const ISqlData *, char *pError, int ErrorSize),
 		const char *pThreadName,
-		int ClientID,
+		int ClientId,
 		const char *pName,
 		int Offset);
 
 	// returns true if the player should be rate limited
-	bool RateLimitPlayer(int ClientID);
+	bool RateLimitPlayer(int ClientId);
 
 public:
 	CScore(CGameContext *pGameServer, CDbConnectionPool *pPool);
 	~CScore() {}
 
-	CPlayerData *PlayerData(int ID) { return &m_aPlayerData[ID]; }
+	CPlayerData *PlayerData(int Id) { return &m_aPlayerData[Id]; }
 
 	void LoadBestTime();
-	void MapInfo(int ClientID, const char *pMapName);
-	void MapVote(int ClientID, const char *pMapName);
-	void LoadPlayerData(int ClientID, const char *pName = "");
-	void SaveScore(int ClientID, float Time, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible);
+	void MapInfo(int ClientId, const char *pMapName);
+	void MapVote(int ClientId, const char *pMapName);
+	void LoadPlayerData(int ClientId, const char *pName = "");
+	void LoadPlayerTimeCp(int ClientId, const char *pName = "");
+	void SaveScore(int ClientId, int TimeTicks, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible);
 
-	void SaveTeamScore(int *pClientIDs, unsigned int Size, float Time, const char *pTimestamp);
+	void SaveTeamScore(int Team, int *pClientIds, unsigned int Size, int TimeTicks, const char *pTimestamp);
 
-	void ShowTop(int ClientID, int Offset = 1);
-	void ShowRank(int ClientID, const char *pName);
+	void ShowTop(int ClientId, int Offset = 1);
+	void ShowRank(int ClientId, const char *pName);
 
-	void ShowTeamTop5(int ClientID, int Offset = 1);
-	void ShowPlayerTeamTop5(int ClientID, const char *pName, int Offset = 1);
-	void ShowTeamRank(int ClientID, const char *pName);
+	void ShowTeamTop5(int ClientId, int Offset = 1);
+	void ShowPlayerTeamTop5(int ClientId, const char *pName, int Offset = 1);
+	void ShowTeamRank(int ClientId, const char *pName);
 
-	void ShowTopPoints(int ClientID, int Offset = 1);
-	void ShowPoints(int ClientID, const char *pName);
+	void ShowTopPoints(int ClientId, int Offset = 1);
+	void ShowPoints(int ClientId, const char *pName);
 
-	void ShowTimes(int ClientID, const char *pName, int Offset = 1);
-	void ShowTimes(int ClientID, int Offset = 1);
+	void ShowTimes(int ClientId, const char *pName, int Offset = 1);
+	void ShowTimes(int ClientId, int Offset = 1);
 
-	void RandomMap(int ClientID, int Stars);
-	void RandomUnfinishedMap(int ClientID, int Stars);
+	void RandomMap(int ClientId, int Stars);
+	void RandomUnfinishedMap(int ClientId, int Stars);
 
-	void SaveTeam(int ClientID, const char *pCode, const char *pServer);
-	void LoadTeam(const char *pCode, int ClientID);
-	void GetSaves(int ClientID);
+	void SaveTeam(int ClientId, const char *pCode, const char *pServer);
+	void LoadTeam(const char *pCode, int ClientId);
+	void GetSaves(int ClientId);
 };
 
 #endif // GAME_SERVER_SCORE_H
diff --git a/src/game/server/scoreworker.cpp b/src/game/server/scoreworker.cpp
index 393f1ca8e6..76d85f5a56 100644
--- a/src/game/server/scoreworker.cpp
+++ b/src/game/server/scoreworker.cpp
@@ -43,6 +43,13 @@ void CScorePlayerResult::SetVariant(Variant v)
 		m_Data.m_Info.m_Time.reset();
 		for(float &TimeCp : m_Data.m_Info.m_aTimeCp)
 			TimeCp = 0;
+		break;
+	case PLAYER_TIMECP:
+		m_Data.m_Info.m_aRequestedPlayer[0] = '\0';
+		m_Data.m_Info.m_Time.reset();
+		for(float &TimeCp : m_Data.m_Info.m_aTimeCp)
+			TimeCp = 0;
+		break;
 	}
 }
 
@@ -51,20 +58,20 @@ CTeamrank::CTeamrank() :
 {
 	for(auto &aName : m_aaNames)
 		aName[0] = '\0';
-	mem_zero(&m_TeamID.m_aData, sizeof(m_TeamID));
+	mem_zero(&m_TeamId.m_aData, sizeof(m_TeamId));
 }
 
 bool CTeamrank::NextSqlResult(IDbConnection *pSqlServer, bool *pEnd, char *pError, int ErrorSize)
 {
-	pSqlServer->GetBlob(1, m_TeamID.m_aData, sizeof(m_TeamID.m_aData));
+	pSqlServer->GetBlob(1, m_TeamId.m_aData, sizeof(m_TeamId.m_aData));
 	pSqlServer->GetString(2, m_aaNames[0], sizeof(m_aaNames[0]));
 	m_NumNames = 1;
 	bool End = false;
 	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
 	{
-		CUuid TeamID;
-		pSqlServer->GetBlob(1, TeamID.m_aData, sizeof(TeamID.m_aData));
-		if(m_TeamID != TeamID)
+		CUuid TeamId;
+		pSqlServer->GetBlob(1, TeamId.m_aData, sizeof(TeamId.m_aData));
+		if(m_TeamId != TeamId)
 		{
 			*pEnd = false;
 			return false;
@@ -94,7 +101,7 @@ bool CTeamrank::SamePlayers(const std::vector<std::string> *pvSortedNames)
 
 bool CScoreWorker::LoadBestTime(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
 {
-	const auto *pData = dynamic_cast<const CSqlLoadBestTimeData *>(pGameData);
+	const auto *pData = dynamic_cast<const CSqlLoadBestTimeRequest *>(pGameData);
 	auto *pResult = dynamic_cast<CScoreLoadBestTimeResult *>(pGameData->m_pResult.get());
 
 	char aBuf[512];
@@ -203,6 +210,56 @@ bool CScoreWorker::LoadPlayerData(IDbConnection *pSqlServer, const ISqlData *pGa
 	return false;
 }
 
+bool CScoreWorker::LoadPlayerTimeCp(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	char aBuf[1024];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT"
+		"  Time, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, "
+		"  cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25 "
+		"FROM %s_race "
+		"WHERE Map = ? AND Name = ? AND "
+		"  (cp1 + cp2 + cp3 + cp4 + cp5 + cp6 + cp7 + cp8 + cp9 + cp10 + cp11 + cp12 + cp13 + cp14 + "
+		"  cp15 + cp16 + cp17 + cp18 + cp19 + cp20 + cp21 + cp22 + cp23 + cp24 + cp25) > 0 "
+		"ORDER BY Time ASC "
+		"LIMIT 1",
+		pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+
+	const char *pPlayer = pData->m_aName[0] != '\0' ? pData->m_aName : pData->m_aRequestingPlayer;
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pPlayer);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		pResult->SetVariant(CScorePlayerResult::PLAYER_TIMECP);
+		pResult->m_Data.m_Info.m_Time = pSqlServer->GetFloat(1);
+		for(int i = 0; i < NUM_CHECKPOINTS; i++)
+		{
+			pResult->m_Data.m_Info.m_aTimeCp[i] = pSqlServer->GetFloat(i + 2);
+		}
+		str_copy(pResult->m_Data.m_Info.m_aRequestedPlayer, pPlayer, sizeof(pResult->m_Data.m_Info.m_aRequestedPlayer));
+	}
+	else
+	{
+		pResult->SetVariant(CScorePlayerResult::DIRECT);
+		str_format(paMessages[0], sizeof(paMessages[0]), "'%s' has no checkpoint times available", pPlayer);
+	}
+	return false;
+}
+
 bool CScoreWorker::MapVote(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
 {
 	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
@@ -517,7 +574,7 @@ bool CScoreWorker::SaveScore(IDbConnection *pSqlServer, const ISqlData *pGameDat
 		"	Map, Name, Timestamp, Time, Server, "
 		"	cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, "
 		"	cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25, "
-		"	GameID, DDNet7) "
+		"	GameId, DDNet7) "
 		"VALUES (?, ?, %s, %.2f, ?, "
 		"	%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, "
 		"	%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, "
@@ -558,7 +615,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 	if(w == Write::NORMAL_SUCCEEDED)
 	{
 		str_format(aBuf, sizeof(aBuf),
-			"DELETE FROM %s_teamrace_backup WHERE ID=?",
+			"DELETE FROM %s_teamrace_backup WHERE Id=?",
 			pSqlServer->GetPrefix());
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
@@ -586,7 +643,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 		CUuid TeamrankId = pData->m_TeamrankUuid;
 
 		str_format(aBuf, sizeof(aBuf),
-			"INSERT INTO %s_teamrace SELECT * FROM %s_teamrace_backup WHERE ID=?",
+			"INSERT INTO %s_teamrace SELECT * FROM %s_teamrace_backup WHERE Id=?",
 			pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
@@ -600,7 +657,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 		}
 
 		str_format(aBuf, sizeof(aBuf),
-			"DELETE FROM %s_teamrace_backup WHERE ID=?",
+			"DELETE FROM %s_teamrace_backup WHERE Id=?",
 			pSqlServer->GetPrefix());
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
@@ -620,13 +677,13 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 
 		std::sort(vNames.begin(), vNames.end());
 		str_format(aBuf, sizeof(aBuf),
-			"SELECT l.ID, Name, Time "
+			"SELECT l.Id, Name, Time "
 			"FROM (" // preselect teams with first name in team
 			"  SELECT ID "
 			"  FROM %s_teamrace "
 			"  WHERE Map = ? AND Name = ? AND DDNet7 = %s"
-			") as l INNER JOIN %s_teamrace AS r ON l.ID = r.ID "
-			"ORDER BY l.ID, Name COLLATE %s",
+			") as l INNER JOIN %s_teamrace AS r ON l.Id = r.Id "
+			"ORDER BY l.Id, Name COLLATE %s",
 			pSqlServer->GetPrefix(), pSqlServer->False(), pSqlServer->GetPrefix(), pSqlServer->BinaryCollate());
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
@@ -666,7 +723,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 			if(pData->m_Time < Time)
 			{
 				str_format(aBuf, sizeof(aBuf),
-					"UPDATE %s_teamrace SET Time=%.2f, Timestamp=%s, DDNet7=%s, GameID=? WHERE ID = ?",
+					"UPDATE %s_teamrace SET Time=%.2f, Timestamp=%s, DDNet7=%s, GameId=? WHERE Id = ?",
 					pSqlServer->GetPrefix(), pData->m_Time, pSqlServer->InsertTimestampAsUtc(), pSqlServer->False());
 				if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 				{
@@ -674,7 +731,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 				}
 				pSqlServer->BindString(1, pData->m_aTimestamp);
 				pSqlServer->BindString(2, pData->m_aGameUuid);
-				pSqlServer->BindBlob(3, Teamrank.m_TeamID.m_aData, sizeof(Teamrank.m_TeamID.m_aData));
+				pSqlServer->BindBlob(3, Teamrank.m_TeamId.m_aData, sizeof(Teamrank.m_TeamId.m_aData));
 				pSqlServer->Print();
 				int NumUpdated;
 				if(pSqlServer->ExecuteUpdate(&NumUpdated, pError, ErrorSize))
@@ -692,7 +749,7 @@ bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGam
 	{
 		// if no entry found... create a new one
 		str_format(aBuf, sizeof(aBuf),
-			"%s INTO %s_teamrace%s(Map, Name, Timestamp, Time, ID, GameID, DDNet7) "
+			"%s INTO %s_teamrace%s(Map, Name, Timestamp, Time, Id, GameId, DDNet7) "
 			"VALUES (?, ?, %s, %.2f, ?, ?, %s)",
 			pSqlServer->InsertIgnore(), pSqlServer->GetPrefix(),
 			w == Write::NORMAL ? "" : "_backup",
@@ -839,9 +896,9 @@ bool CScoreWorker::ShowTeamRank(IDbConnection *pSqlServer, const ISqlData *pGame
 	char aBuf[2400];
 
 	str_format(aBuf, sizeof(aBuf),
-		"SELECT l.ID, Name, Time, Ranking, PercentRank "
+		"SELECT l.Id, Name, Time, Ranking, PercentRank "
 		"FROM (" // teamrank score board
-		"  SELECT RANK() OVER w AS Ranking, PERCENT_RANK() OVER w AS PercentRank, ID "
+		"  SELECT RANK() OVER w AS Ranking, PERCENT_RANK() OVER w AS PercentRank, Id "
 		"  FROM %s_teamrace "
 		"  WHERE Map = ? "
 		"  GROUP BY ID "
@@ -852,8 +909,8 @@ bool CScoreWorker::ShowTeamRank(IDbConnection *pSqlServer, const ISqlData *pGame
 		"  WHERE Map = ? AND Name = ? "
 		"  ORDER BY Time "
 		"  LIMIT 1"
-		") AS l ON TeamRank.ID = l.ID "
-		"INNER JOIN %s_teamrace AS r ON l.ID = r.ID ",
+		") AS l ON TeamRank.Id = l.Id "
+		"INNER JOIN %s_teamrace AS r ON l.Id = r.Id ",
 		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
@@ -971,7 +1028,7 @@ bool CScoreWorker::ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData,
 
 	if(!g_Config.m_SvRegionalRankings)
 	{
-		str_copy(pResult->m_Data.m_aaMessages[Line], "----------------------------------------", sizeof(pResult->m_Data.m_aaMessages[Line]));
+		str_copy(pResult->m_Data.m_aaMessages[Line], "-----------------------------------------", sizeof(pResult->m_Data.m_aaMessages[Line]));
 		return !End;
 	}
 
@@ -1021,9 +1078,9 @@ bool CScoreWorker::ShowTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGame
 	str_format(aBuf, sizeof(aBuf),
 		"SELECT Name, Time, Ranking, TeamSize "
 		"FROM (" // limit to 5
-		"  SELECT TeamSize, Ranking, ID "
+		"  SELECT TeamSize, Ranking, Id "
 		"  FROM (" // teamrank score board
-		"    SELECT RANK() OVER w AS Ranking, COUNT(*) AS Teamsize, ID "
+		"    SELECT RANK() OVER w AS Ranking, COUNT(*) AS Teamsize, Id "
 		"    FROM %s_teamrace "
 		"    WHERE Map = ? "
 		"    GROUP BY ID "
@@ -1032,8 +1089,8 @@ bool CScoreWorker::ShowTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGame
 		"  ORDER BY Ranking %s "
 		"  LIMIT %d, 5"
 		") as l2 "
-		"INNER JOIN %s_teamrace as r ON l2.ID = r.ID "
-		"ORDER BY Ranking %s, r.ID, Name ASC",
+		"INNER JOIN %s_teamrace as r ON l2.Id = r.Id "
+		"ORDER BY Ranking %s, r.Id, Name ASC",
 		pSqlServer->GetPrefix(), pOrder, LimitStart, pSqlServer->GetPrefix(), pOrder);
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
@@ -1089,7 +1146,7 @@ bool CScoreWorker::ShowTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGame
 		}
 	}
 
-	str_copy(paMessages[Line], "-------------------------------", sizeof(paMessages[Line]));
+	str_copy(paMessages[Line], "---------------------------------", sizeof(paMessages[Line]));
 	return false;
 }
 
@@ -1106,9 +1163,9 @@ bool CScoreWorker::ShowPlayerTeamTop5(IDbConnection *pSqlServer, const ISqlData
 	char aBuf[2400];
 
 	str_format(aBuf, sizeof(aBuf),
-		"SELECT l.ID, Name, Time, Ranking "
+		"SELECT l.Id, Name, Time, Ranking "
 		"FROM (" // teamrank score board
-		"  SELECT RANK() OVER w AS Ranking, ID "
+		"  SELECT RANK() OVER w AS Ranking, Id "
 		"  FROM %s_teamrace "
 		"  WHERE Map = ? "
 		"  GROUP BY ID "
@@ -1119,9 +1176,9 @@ bool CScoreWorker::ShowPlayerTeamTop5(IDbConnection *pSqlServer, const ISqlData
 		"  WHERE Map = ? AND Name = ? "
 		"  ORDER BY Time %s "
 		"  LIMIT %d, 5 "
-		") AS l ON TeamRank.ID = l.ID "
-		"INNER JOIN %s_teamrace AS r ON l.ID = r.ID "
-		"ORDER BY Time %s, l.ID, Name ASC",
+		") AS l ON TeamRank.Id = l.Id "
+		"INNER JOIN %s_teamrace AS r ON l.Id = r.Id "
+		"ORDER BY Time %s, l.Id, Name ASC",
 		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pOrder, LimitStart, pSqlServer->GetPrefix(), pOrder);
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
@@ -1173,7 +1230,7 @@ bool CScoreWorker::ShowPlayerTeamTop5(IDbConnection *pSqlServer, const ISqlData
 				break;
 			}
 		}
-		str_copy(paMessages[Line], "-------------------------------", sizeof(paMessages[Line]));
+		str_copy(paMessages[Line], "---------------------------------", sizeof(paMessages[Line]));
 	}
 	else
 	{
@@ -1295,7 +1352,7 @@ bool CScoreWorker::ShowTimes(IDbConnection *pSqlServer, const ISqlData *pGameDat
 	{
 		return true;
 	}
-	str_copy(paMessages[Line], "----------------------------------------------------", sizeof(paMessages[Line]));
+	str_copy(paMessages[Line], "-------------------------------------------", sizeof(paMessages[Line]));
 
 	return false;
 }
@@ -1503,14 +1560,15 @@ bool CScoreWorker::RandomUnfinishedMap(IDbConnection *pSqlServer, const ISqlData
 	}
 	else
 	{
-		str_copy(pResult->m_aMessage, "You have no more unfinished maps on this server!", sizeof(pResult->m_aMessage));
+		str_format(aBuf, sizeof(aBuf), "%s has no more unfinished maps on this server!", pData->m_aRequestingPlayer);
+		str_copy(pResult->m_aMessage, aBuf, sizeof(pResult->m_aMessage));
 	}
 	return false;
 }
 
 bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize)
 {
-	const auto *pData = dynamic_cast<const CSqlTeamSave *>(pGameData);
+	const auto *pData = dynamic_cast<const CSqlTeamSaveData *>(pGameData);
 	auto *pResult = dynamic_cast<CScoreSaveResult *>(pGameData->m_pResult.get());
 
 	if(w == Write::NORMAL_SUCCEEDED)
@@ -1558,8 +1616,8 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 		return pSqlServer->Step(&End, pError, ErrorSize);
 	}
 
-	char aSaveID[UUID_MAXSTRSIZE];
-	FormatUuid(pResult->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
+	char aSaveId[UUID_MAXSTRSIZE];
+	FormatUuid(pResult->m_SaveId, aSaveId, UUID_MAXSTRSIZE);
 
 	char *pSaveState = pResult->m_SavedTeam.GetString();
 	char aBuf[65536];
@@ -1579,7 +1637,7 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 			str_copy(aCode, pData->m_aCode, sizeof(aCode));
 
 		str_format(aBuf, sizeof(aBuf),
-			"%s INTO %s_saves%s(Savegame, Map, Code, Timestamp, Server, SaveID, DDNet7) "
+			"%s INTO %s_saves%s(Savegame, Map, Code, Timestamp, Server, SaveId, DDNet7) "
 			"VALUES (?, ?, ?, CURRENT_TIMESTAMP, ?, ?, %s)",
 			pSqlServer->InsertIgnore(), pSqlServer->GetPrefix(),
 			w == Write::NORMAL ? "" : "_backup", pSqlServer->False());
@@ -1591,7 +1649,7 @@ bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 		pSqlServer->BindString(2, pData->m_aMap);
 		pSqlServer->BindString(3, aCode);
 		pSqlServer->BindString(4, pData->m_aServer);
-		pSqlServer->BindString(5, aSaveID);
+		pSqlServer->BindString(5, aSaveId);
 		pSqlServer->Print();
 		int NumInserted;
 		if(pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize))
@@ -1657,7 +1715,7 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 {
 	if(w == Write::NORMAL_SUCCEEDED || w == Write::BACKUP_FIRST)
 		return false;
-	const auto *pData = dynamic_cast<const CSqlTeamLoad *>(pGameData);
+	const auto *pData = dynamic_cast<const CSqlTeamLoadRequest *>(pGameData);
 	auto *pResult = dynamic_cast<CScoreSaveResult *>(pGameData->m_pResult.get());
 	pResult->m_Status = CScoreSaveResult::LOAD_FAILED;
 
@@ -1668,7 +1726,7 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 
 	char aBuf[512];
 	str_format(aBuf, sizeof(aBuf),
-		"SELECT Savegame, %s-%s AS Ago, SaveID "
+		"SELECT Savegame, %s-%s AS Ago, SaveId "
 		"FROM %s_saves "
 		"where Code = ? AND Map = ? AND DDNet7 = %s",
 		aCurrentTimestamp, aTimestamp,
@@ -1691,14 +1749,14 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 		return false;
 	}
 
-	pResult->m_SaveID = UUID_NO_SAVE_ID;
+	pResult->m_SaveId = UUID_NO_SAVE_ID;
 	if(!pSqlServer->IsNull(3))
 	{
-		char aSaveID[UUID_MAXSTRSIZE];
-		pSqlServer->GetString(3, aSaveID, sizeof(aSaveID));
-		if(ParseUuid(&pResult->m_SaveID, aSaveID) || pResult->m_SaveID == UUID_NO_SAVE_ID)
+		char aSaveId[UUID_MAXSTRSIZE];
+		pSqlServer->GetString(3, aSaveId, sizeof(aSaveId));
+		if(ParseUuid(&pResult->m_SaveId, aSaveId) || pResult->m_SaveId == UUID_NO_SAVE_ID)
 		{
-			str_copy(pResult->m_aMessage, "Unable to load savegame: SaveID corrupted", sizeof(pResult->m_aMessage));
+			str_copy(pResult->m_aMessage, "Unable to load savegame: SaveId corrupted", sizeof(pResult->m_aMessage));
 			return false;
 		}
 	}
@@ -1742,7 +1800,7 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 	}
 
 	bool CanLoad = pResult->m_SavedTeam.MatchPlayers(
-		pData->m_aClientNames, pData->m_aClientID, pData->m_NumPlayer,
+		pData->m_aClientNames, pData->m_aClientId, pData->m_NumPlayer,
 		pResult->m_aMessage, sizeof(pResult->m_aMessage));
 
 	if(!CanLoad)
@@ -1750,9 +1808,9 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 
 	str_format(aBuf, sizeof(aBuf),
 		"DELETE FROM %s_saves "
-		"WHERE Code = ? AND Map = ? AND SaveID %s",
+		"WHERE Code = ? AND Map = ? AND SaveId %s",
 		pSqlServer->GetPrefix(),
-		pResult->m_SaveID != UUID_NO_SAVE_ID ? "= ?" : "IS NULL");
+		pResult->m_SaveId != UUID_NO_SAVE_ID ? "= ?" : "IS NULL");
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
 		return true;
@@ -1760,9 +1818,9 @@ bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData
 	pSqlServer->BindString(1, pData->m_aCode);
 	pSqlServer->BindString(2, pData->m_aMap);
 	char aUuid[UUID_MAXSTRSIZE];
-	if(pResult->m_SaveID != UUID_NO_SAVE_ID)
+	if(pResult->m_SaveId != UUID_NO_SAVE_ID)
 	{
-		FormatUuid(pResult->m_SaveID, aUuid, sizeof(aUuid));
+		FormatUuid(pResult->m_SaveId, aUuid, sizeof(aUuid));
 		pSqlServer->BindString(3, aUuid);
 	}
 	pSqlServer->Print();
diff --git a/src/game/server/scoreworker.h b/src/game/server/scoreworker.h
index 411c25044c..3001bad236 100644
--- a/src/game/server/scoreworker.h
+++ b/src/game/server/scoreworker.h
@@ -39,6 +39,7 @@ struct CScorePlayerResult : ISqlResult
 		BROADCAST,
 		MAP_VOTE,
 		PLAYER_INFO,
+		PLAYER_TIMECP,
 	} m_MessageKind;
 	union
 	{
@@ -49,6 +50,7 @@ struct CScorePlayerResult : ISqlResult
 			std::optional<float> m_Time;
 			float m_aTimeCp[NUM_CHECKPOINTS];
 			int m_Birthday; // 0 indicates no birthday
+			char m_aRequestedPlayer[MAX_NAME_LENGTH];
 		} m_Info = {};
 		struct
 		{
@@ -70,9 +72,9 @@ struct CScoreLoadBestTimeResult : ISqlResult
 	float m_CurrentRecord;
 };
 
-struct CSqlLoadBestTimeData : ISqlData
+struct CSqlLoadBestTimeRequest : ISqlData
 {
-	CSqlLoadBestTimeData(std::shared_ptr<CScoreLoadBestTimeResult> pResult) :
+	CSqlLoadBestTimeRequest(std::shared_ptr<CScoreLoadBestTimeResult> pResult) :
 		ISqlData(std::move(pResult))
 	{
 	}
@@ -100,13 +102,13 @@ struct CSqlPlayerRequest : ISqlData
 
 struct CScoreRandomMapResult : ISqlResult
 {
-	CScoreRandomMapResult(int ClientID) :
-		m_ClientID(ClientID)
+	CScoreRandomMapResult(int ClientId) :
+		m_ClientId(ClientId)
 	{
 		m_aMap[0] = '\0';
 		m_aMessage[0] = '\0';
 	}
-	int m_ClientID;
+	int m_ClientId;
 	char m_aMap[MAX_MAP_LENGTH];
 	char m_aMessage[512];
 };
@@ -137,7 +139,7 @@ struct CSqlScoreData : ISqlData
 	char m_aGameUuid[UUID_MAXSTRSIZE];
 	char m_aName[MAX_MAP_LENGTH];
 
-	int m_ClientID;
+	int m_ClientId;
 	float m_Time;
 	char m_aTimestamp[TIMESTAMP_STR_LENGTH];
 	float m_aCurrentTimeCp[NUM_CHECKPOINTS];
@@ -148,9 +150,9 @@ struct CSqlScoreData : ISqlData
 
 struct CScoreSaveResult : ISqlResult
 {
-	CScoreSaveResult(int PlayerID) :
+	CScoreSaveResult(int PlayerId) :
 		m_Status(SAVE_FAILED),
-		m_RequestingPlayer(PlayerID)
+		m_RequestingPlayer(PlayerId)
 	{
 		m_aMessage[0] = '\0';
 		m_aBroadcast[0] = '\0';
@@ -167,7 +169,7 @@ struct CScoreSaveResult : ISqlResult
 	char m_aBroadcast[512];
 	CSaveTeam m_SavedTeam;
 	int m_RequestingPlayer;
-	CUuid m_SaveID;
+	CUuid m_SaveId;
 };
 
 struct CSqlTeamScoreData : ISqlData
@@ -186,13 +188,13 @@ struct CSqlTeamScoreData : ISqlData
 	CUuid m_TeamrankUuid;
 };
 
-struct CSqlTeamSave : ISqlData
+struct CSqlTeamSaveData : ISqlData
 {
-	CSqlTeamSave(std::shared_ptr<CScoreSaveResult> pResult) :
+	CSqlTeamSaveData(std::shared_ptr<CScoreSaveResult> pResult) :
 		ISqlData(std::move(pResult))
 	{
 	}
-	virtual ~CSqlTeamSave(){};
+	virtual ~CSqlTeamSaveData(){};
 
 	char m_aClientName[MAX_NAME_LENGTH];
 	char m_aMap[MAX_MAP_LENGTH];
@@ -201,21 +203,20 @@ struct CSqlTeamSave : ISqlData
 	char m_aServer[5];
 };
 
-struct CSqlTeamLoad : ISqlData
+struct CSqlTeamLoadRequest : ISqlData
 {
-	CSqlTeamLoad(std::shared_ptr<CScoreSaveResult> pResult) :
+	CSqlTeamLoadRequest(std::shared_ptr<CScoreSaveResult> pResult) :
 		ISqlData(std::move(pResult))
 	{
 	}
-	virtual ~CSqlTeamLoad(){};
+	virtual ~CSqlTeamLoadRequest(){};
 
 	char m_aCode[128];
 	char m_aMap[MAX_MAP_LENGTH];
 	char m_aRequestingPlayer[MAX_NAME_LENGTH];
-	int m_ClientID;
 	// struct holding all player names in the team or an empty string
 	char m_aClientNames[MAX_CLIENTS][MAX_NAME_LENGTH];
-	int m_aClientID[MAX_CLIENTS];
+	int m_aClientId[MAX_CLIENTS];
 	int m_NumPlayer;
 };
 
@@ -244,6 +245,12 @@ class CPlayerData
 			m_aBestTimeCp[i] = aTimeCp[i];
 	}
 
+	void SetBestTimeCp(const float aTimeCp[NUM_CHECKPOINTS])
+	{
+		for(int i = 0; i < NUM_CHECKPOINTS; i++)
+			m_aBestTimeCp[i] = aTimeCp[i];
+	}
+
 	float m_BestTime;
 	float m_aBestTimeCp[NUM_CHECKPOINTS];
 
@@ -253,16 +260,16 @@ class CPlayerData
 
 struct CTeamrank
 {
-	CUuid m_TeamID;
+	CUuid m_TeamId;
 	char m_aaNames[MAX_CLIENTS][MAX_NAME_LENGTH];
 	unsigned int m_NumNames;
 	CTeamrank();
 
 	// Assumes that a database query equivalent to
 	//
-	//     SELECT TeamID, Name [, ...] -- the order is important
+	//     SELECT TeamId, Name [, ...] -- the order is important
 	//     FROM record_teamrace
-	//     ORDER BY TeamID, Name
+	//     ORDER BY TeamId, Name
 	//
 	// was executed and that the result line of the first team member is already selected.
 	// Afterwards the team member of the next team is selected.
@@ -284,6 +291,7 @@ struct CScoreWorker
 	static bool MapVote(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
 
 	static bool LoadPlayerData(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool LoadPlayerTimeCp(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
 	static bool MapInfo(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
 	static bool ShowRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
 	static bool ShowTeamRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp
index aa0cd418ac..2f4b58bdf8 100644
--- a/src/game/server/teams.cpp
+++ b/src/game/server/teams.cpp
@@ -28,10 +28,11 @@ void CGameTeams::Reset()
 		SendTeamsState(i);
 	}
 
-	for(int i = 0; i < NUM_TEAMS; ++i)
+	for(int i = 0; i < NUM_DDRACE_TEAMS; ++i)
 	{
 		m_aTeamState[i] = TEAMSTATE_EMPTY;
 		m_aTeamLocked[i] = false;
+		m_aTeamFlock[i] = false;
 		m_apSaveTeamResult[i] = nullptr;
 		m_aTeamSentStartWarning[i] = false;
 		ResetRoundState(i);
@@ -51,7 +52,7 @@ void CGameTeams::ResetRoundState(int Team)
 		if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
 		{
 			GameServer()->m_apPlayers[i]->m_VotedForPractice = false;
-			GameServer()->m_apPlayers[i]->m_SwapTargetsClientID = -1;
+			GameServer()->m_apPlayers[i]->m_SwapTargetsClientId = -1;
 			m_aLastSwap[i] = 0;
 		}
 	}
@@ -67,20 +68,23 @@ void CGameTeams::ResetSwitchers(int Team)
 	}
 }
 
-void CGameTeams::OnCharacterStart(int ClientID)
+void CGameTeams::OnCharacterStart(int ClientId)
 {
 	int Tick = Server()->Tick();
-	CCharacter *pStartingChar = Character(ClientID);
+	CCharacter *pStartingChar = Character(ClientId);
 	if(!pStartingChar)
 		return;
 	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && pStartingChar->m_DDRaceState == DDRACE_STARTED)
 		return;
-	if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || m_Core.Team(ClientID) != TEAM_FLOCK) && pStartingChar->m_DDRaceState == DDRACE_FINISHED)
+	if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || (m_Core.Team(ClientId) != TEAM_FLOCK && !m_aTeamFlock[m_Core.Team(ClientId)])) && pStartingChar->m_DDRaceState == DDRACE_FINISHED)
 		return;
 	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO &&
-		(m_Core.Team(ClientID) == TEAM_FLOCK || m_Core.Team(ClientID) == TEAM_SUPER))
+		(m_Core.Team(ClientId) == TEAM_FLOCK || TeamFlock(m_Core.Team(ClientId)) || m_Core.Team(ClientId) == TEAM_SUPER))
 	{
-		m_aTeeStarted[ClientID] = true;
+		if(TeamFlock(m_Core.Team(ClientId)) && (m_aTeamState[m_Core.Team(ClientId)] < TEAMSTATE_STARTED))
+			ChangeTeamState(m_Core.Team(ClientId), TEAMSTATE_STARTED);
+
+		m_aTeeStarted[ClientId] = true;
 		pStartingChar->m_DDRaceState = DDRACE_STARTED;
 		pStartingChar->m_StartTime = Tick;
 		return;
@@ -88,7 +92,7 @@ void CGameTeams::OnCharacterStart(int ClientID)
 	bool Waiting = false;
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
-		if(m_Core.Team(ClientID) != m_Core.Team(i))
+		if(m_Core.Team(ClientId) != m_Core.Team(i))
 			continue;
 		CPlayer *pPlayer = GetPlayer(i);
 		if(!pPlayer || !pPlayer->IsPlaying())
@@ -99,7 +103,7 @@ void CGameTeams::OnCharacterStart(int ClientID)
 		Waiting = true;
 		pStartingChar->m_DDRaceState = DDRACE_NONE;
 
-		if(m_aLastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
+		if(m_aLastChat[ClientId] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
 		{
 			char aBuf[128];
 			str_format(
@@ -107,8 +111,8 @@ void CGameTeams::OnCharacterStart(int ClientID)
 				sizeof(aBuf),
 				"%s has finished and didn't go through start yet, wait for him or join another team.",
 				Server()->ClientName(i));
-			GameServer()->SendChatTarget(ClientID, aBuf);
-			m_aLastChat[ClientID] = Tick;
+			GameServer()->SendChatTarget(ClientId, aBuf);
+			m_aLastChat[ClientId] = Tick;
 		}
 		if(m_aLastChat[i] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
 		{
@@ -117,7 +121,7 @@ void CGameTeams::OnCharacterStart(int ClientID)
 				aBuf,
 				sizeof(aBuf),
 				"%s wants to start a new round, kill or walk to start.",
-				Server()->ClientName(ClientID));
+				Server()->ClientName(ClientId));
 			GameServer()->SendChatTarget(i, aBuf);
 			m_aLastChat[i] = Tick;
 		}
@@ -125,23 +129,23 @@ void CGameTeams::OnCharacterStart(int ClientID)
 
 	if(!Waiting)
 	{
-		m_aTeeStarted[ClientID] = true;
+		m_aTeeStarted[ClientId] = true;
 	}
 
-	if(m_aTeamState[m_Core.Team(ClientID)] < TEAMSTATE_STARTED && !Waiting)
+	if(m_aTeamState[m_Core.Team(ClientId)] < TEAMSTATE_STARTED && !Waiting)
 	{
-		ChangeTeamState(m_Core.Team(ClientID), TEAMSTATE_STARTED);
-		m_aTeamSentStartWarning[m_Core.Team(ClientID)] = false;
-		m_aTeamUnfinishableKillTick[m_Core.Team(ClientID)] = -1;
+		ChangeTeamState(m_Core.Team(ClientId), TEAMSTATE_STARTED);
+		m_aTeamSentStartWarning[m_Core.Team(ClientId)] = false;
+		m_aTeamUnfinishableKillTick[m_Core.Team(ClientId)] = -1;
 
-		int NumPlayers = Count(m_Core.Team(ClientID));
+		int NumPlayers = Count(m_Core.Team(ClientId));
 
 		char aBuf[512];
 		str_format(
 			aBuf,
 			sizeof(aBuf),
 			"Team %d started with %d player%s: ",
-			m_Core.Team(ClientID),
+			m_Core.Team(ClientId),
 			NumPlayers,
 			NumPlayers == 1 ? "" : "s");
 
@@ -149,11 +153,11 @@ void CGameTeams::OnCharacterStart(int ClientID)
 
 		for(int i = 0; i < MAX_CLIENTS; ++i)
 		{
-			if(m_Core.Team(ClientID) == m_Core.Team(i))
+			if(m_Core.Team(ClientId) == m_Core.Team(i))
 			{
 				CPlayer *pPlayer = GetPlayer(i);
 				// TODO: THE PROBLEM IS THAT THERE IS NO CHARACTER SO START TIME CAN'T BE SET!
-				if(pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientID))))
+				if(pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientId))))
 				{
 					SetDDRaceState(pPlayer, DDRACE_STARTED);
 					SetStartTime(pPlayer, Tick);
@@ -168,12 +172,12 @@ void CGameTeams::OnCharacterStart(int ClientID)
 			}
 		}
 
-		if(g_Config.m_SvTeam < SV_TEAM_FORCED_SOLO && g_Config.m_SvMaxTeamSize != 2 && g_Config.m_SvPauseable)
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && g_Config.m_SvMaxTeamSize != 2 && g_Config.m_SvPauseable)
 		{
 			for(int i = 0; i < MAX_CLIENTS; ++i)
 			{
 				CPlayer *pPlayer = GetPlayer(i);
-				if(m_Core.Team(ClientID) == m_Core.Team(i) && pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientID))))
+				if(m_Core.Team(ClientId) == m_Core.Team(i) && pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientId))))
 				{
 					GameServer()->SendChatTarget(i, aBuf);
 				}
@@ -182,29 +186,29 @@ void CGameTeams::OnCharacterStart(int ClientID)
 	}
 }
 
-void CGameTeams::OnCharacterFinish(int ClientID)
+void CGameTeams::OnCharacterFinish(int ClientId)
 {
-	if((m_Core.Team(ClientID) == TEAM_FLOCK && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || m_Core.Team(ClientID) == TEAM_SUPER)
+	if(((m_Core.Team(ClientId) == TEAM_FLOCK || m_aTeamFlock[m_Core.Team(ClientId)]) && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || m_Core.Team(ClientId) == TEAM_SUPER)
 	{
-		CPlayer *pPlayer = GetPlayer(ClientID);
+		CPlayer *pPlayer = GetPlayer(ClientId);
 		if(pPlayer && pPlayer->IsPlaying())
 		{
-			float Time = (float)(Server()->Tick() - GetStartTime(pPlayer)) / ((float)Server()->TickSpeed());
-			if(Time < 0.000001f)
+			int TimeTicks = Server()->Tick() - GetStartTime(pPlayer);
+			if(TimeTicks <= 0)
 				return;
 			char aTimestamp[TIMESTAMP_STR_LENGTH];
 			str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE); // 2019-04-02 19:41:58
 
-			OnFinish(pPlayer, Time, aTimestamp);
+			OnFinish(pPlayer, TimeTicks, aTimestamp);
 		}
 	}
 	else
 	{
-		if(m_aTeeStarted[ClientID])
+		if(m_aTeeStarted[ClientId])
 		{
-			m_aTeeFinished[ClientID] = true;
+			m_aTeeFinished[ClientId] = true;
 		}
-		CheckTeamFinished(m_Core.Team(ClientID));
+		CheckTeamFinished(m_Core.Team(ClientId));
 	}
 }
 
@@ -250,7 +254,7 @@ void CGameTeams::Tick()
 	{
 		CCharacter *pChar = GameServer()->m_apPlayers[i] ? GameServer()->m_apPlayers[i]->GetCharacter() : nullptr;
 		int Team = m_Core.Team(i);
-		if(!pChar || m_aTeamState[Team] != TEAMSTATE_STARTED || m_aTeeStarted[i] || m_aPractice[m_Core.Team(i)])
+		if(!pChar || m_aTeamState[Team] != TEAMSTATE_STARTED || m_aTeamFlock[Team] || m_aTeeStarted[i] || m_aPractice[m_Core.Team(i)])
 		{
 			continue;
 		}
@@ -274,11 +278,14 @@ void CGameTeams::Tick()
 		{
 			continue;
 		}
+		bool TeamHasCheatCharacter = false;
 		int NumPlayersNotStarted = 0;
 		char aPlayerNames[256];
 		aPlayerNames[0] = 0;
 		for(int j = 0; j < MAX_CLIENTS; j++)
 		{
+			if(Character(j) && Character(j)->m_DDRaceState == DDRACE_CHEAT)
+				TeamHasCheatCharacter = true;
 			if(m_Core.Team(j) == i && !m_aTeeStarted[j])
 			{
 				if(aPlayerNames[0])
@@ -289,7 +296,7 @@ void CGameTeams::Tick()
 				NumPlayersNotStarted += 1;
 			}
 		}
-		if(!aPlayerNames[0])
+		if(!aPlayerNames[0] || TeamHasCheatCharacter)
 		{
 			continue;
 		}
@@ -328,8 +335,9 @@ void CGameTeams::CheckTeamFinished(int Team)
 
 		if(PlayersCount > 0)
 		{
-			float Time = (float)(Server()->Tick() - GetStartTime(apTeamPlayers[0])) / ((float)Server()->TickSpeed());
-			if(Time < 0.000001f)
+			int TimeTicks = Server()->Tick() - GetStartTime(apTeamPlayers[0]);
+			float Time = (float)TimeTicks / (float)Server()->TickSpeed();
+			if(TimeTicks <= 0)
 			{
 				return;
 			}
@@ -338,10 +346,13 @@ void CGameTeams::CheckTeamFinished(int Team)
 			{
 				ChangeTeamState(Team, TEAMSTATE_FINISHED);
 
+				int min = (int)Time / 60;
+				float sec = Time - (min * 60.0f);
+
 				char aBuf[256];
 				str_format(aBuf, sizeof(aBuf),
 					"Your team would've finished in: %d minute(s) %5.2f second(s). Since you had practice mode enabled your rank doesn't count.",
-					(int)Time / 60, Time - ((int)Time / 60 * 60));
+					min, sec);
 				GameServer()->SendChatTeam(Team, aBuf);
 
 				for(unsigned int i = 0; i < PlayersCount; ++i)
@@ -356,49 +367,49 @@ void CGameTeams::CheckTeamFinished(int Team)
 			str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE); // 2019-04-02 19:41:58
 
 			for(unsigned int i = 0; i < PlayersCount; ++i)
-				OnFinish(apTeamPlayers[i], Time, aTimestamp);
+				OnFinish(apTeamPlayers[i], TimeTicks, aTimestamp);
 			ChangeTeamState(Team, TEAMSTATE_FINISHED); // TODO: Make it better
-			OnTeamFinish(apTeamPlayers, PlayersCount, Time, aTimestamp);
+			OnTeamFinish(Team, apTeamPlayers, PlayersCount, TimeTicks, aTimestamp);
 		}
 	}
 }
 
-const char *CGameTeams::SetCharacterTeam(int ClientID, int Team)
+const char *CGameTeams::SetCharacterTeam(int ClientId, int Team)
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS)
 		return "Invalid client ID";
 	if(Team < 0 || Team >= MAX_CLIENTS + 1)
 		return "Invalid team number";
-	if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN)
+	if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN && !m_aPractice[Team] && !m_aTeamFlock[Team])
 		return "This team started already";
-	if(m_Core.Team(ClientID) == Team)
+	if(m_Core.Team(ClientId) == Team)
 		return "You are in this team already";
-	if(!Character(ClientID))
+	if(!Character(ClientId))
 		return "Your character is not valid";
-	if(Team == TEAM_SUPER && !Character(ClientID)->IsSuper())
+	if(Team == TEAM_SUPER && !Character(ClientId)->IsSuper())
 		return "You can't join super team if you don't have super rights";
-	if(Team != TEAM_SUPER && Character(ClientID)->m_DDRaceState != DDRACE_NONE)
+	if(Team != TEAM_SUPER && Character(ClientId)->m_DDRaceState != DDRACE_NONE)
 		return "You have started racing already";
 	// No cheating through noob filter with practice and then leaving team
-	if(m_aPractice[m_Core.Team(ClientID)])
+	if(m_aPractice[m_Core.Team(ClientId)])
 		return "You have used practice mode already";
 
 	// you can not join a team which is currently in the process of saving,
 	// because the save-process can fail and then the team is reset into the game
 	if(Team != TEAM_SUPER && GetSaving(Team))
 		return "Your team is currently saving";
-	if(m_Core.Team(ClientID) != TEAM_SUPER && GetSaving(m_Core.Team(ClientID)))
+	if(m_Core.Team(ClientId) != TEAM_SUPER && GetSaving(m_Core.Team(ClientId)))
 		return "This team is currently saving";
 
-	SetForceCharacterTeam(ClientID, Team);
+	SetForceCharacterTeam(ClientId, Team);
 	return nullptr;
 }
 
-void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
+void CGameTeams::SetForceCharacterTeam(int ClientId, int Team)
 {
-	m_aTeeStarted[ClientID] = false;
-	m_aTeeFinished[ClientID] = false;
-	int OldTeam = m_Core.Team(ClientID);
+	m_aTeeStarted[ClientId] = false;
+	m_aTeeFinished[ClientId] = false;
+	int OldTeam = m_Core.Team(ClientId);
 
 	if(Team != OldTeam && (OldTeam != TEAM_FLOCK || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO) && OldTeam != TEAM_SUPER && m_aTeamState[OldTeam] != TEAMSTATE_EMPTY)
 	{
@@ -409,28 +420,29 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
 
 			// unlock team when last player leaves
 			SetTeamLock(OldTeam, false);
+			SetTeamFlock(OldTeam, false);
 			ResetRoundState(OldTeam);
 			// do not reset SaveTeamResult, because it should be logged into teehistorian even if the team leaves
 		}
 	}
 
-	m_Core.Team(ClientID, Team);
+	m_Core.Team(ClientId, Team);
 
 	if(OldTeam != Team)
 	{
-		for(int LoopClientID = 0; LoopClientID < MAX_CLIENTS; ++LoopClientID)
-			if(GetPlayer(LoopClientID))
-				SendTeamsState(LoopClientID);
+		for(int LoopClientId = 0; LoopClientId < MAX_CLIENTS; ++LoopClientId)
+			if(GetPlayer(LoopClientId))
+				SendTeamsState(LoopClientId);
 
-		if(GetPlayer(ClientID))
+		if(GetPlayer(ClientId))
 		{
-			GetPlayer(ClientID)->m_VotedForPractice = false;
-			GetPlayer(ClientID)->m_SwapTargetsClientID = -1;
+			GetPlayer(ClientId)->m_VotedForPractice = false;
+			GetPlayer(ClientId)->m_SwapTargetsClientId = -1;
 		}
-		m_pGameContext->m_World.RemoveEntitiesFromPlayer(ClientID);
+		m_pGameContext->m_World.RemoveEntitiesFromPlayer(ClientId);
 	}
 
-	if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || m_aTeamLocked[Team]))
+	if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || (m_aTeamLocked[Team] && !m_aTeamFlock[Team])))
 	{
 		if(!m_aTeamLocked[Team])
 			ChangeTeamState(Team, TEAMSTATE_OPEN);
@@ -458,17 +470,17 @@ void CGameTeams::ChangeTeamState(int Team, int State)
 	m_aTeamState[Team] = State;
 }
 
-void CGameTeams::KillTeam(int Team, int NewStrongID, int ExceptID)
+void CGameTeams::KillTeam(int Team, int NewStrongId, int ExceptId)
 {
 	for(int i = 0; i < MAX_CLIENTS; i++)
 	{
 		if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
 		{
 			GameServer()->m_apPlayers[i]->m_VotedForPractice = false;
-			if(i != ExceptID)
+			if(i != ExceptId)
 			{
 				GameServer()->m_apPlayers[i]->KillCharacter(WEAPON_SELF, false);
-				if(NewStrongID != -1 && i != NewStrongID)
+				if(NewStrongId != -1 && i != NewStrongId)
 				{
 					GameServer()->m_apPlayers[i]->Respawn(true); // spawn the rest of team with weak hook on the killer
 				}
@@ -479,7 +491,7 @@ void CGameTeams::KillTeam(int Team, int NewStrongID, int ExceptID)
 	// send the team kill message
 	CNetMsg_Sv_KillMsgTeam Msg;
 	Msg.m_Team = Team;
-	Msg.m_First = NewStrongID;
+	Msg.m_First = NewStrongId;
 	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, -1);
 }
 
@@ -495,22 +507,25 @@ bool CGameTeams::TeamFinished(int Team)
 	return true;
 }
 
-CClientMask CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
+CClientMask CGameTeams::TeamMask(int Team, int ExceptId, int Asker, int VersionFlags)
 {
 	if(Team == TEAM_SUPER)
 	{
-		if(ExceptID == -1)
+		if(ExceptId == -1)
 			return CClientMask().set();
-		return CClientMask().set().reset(ExceptID);
+		return CClientMask().set().reset(ExceptId);
 	}
 
 	CClientMask Mask;
 	for(int i = 0; i < MAX_CLIENTS; ++i)
 	{
-		if(i == ExceptID)
+		if(i == ExceptId)
 			continue; // Explicitly excluded
 		if(!GetPlayer(i))
 			continue; // Player doesn't exist
+		if(!((Server()->IsSixup(i) && (VersionFlags & CGameContext::FLAG_SIXUP)) ||
+			   (!Server()->IsSixup(i) && (VersionFlags & CGameContext::FLAG_SIX))))
+			continue;
 
 		if(!(GetPlayer(i)->GetTeam() == TEAM_SPECTATORS || GetPlayer(i)->IsPaused()))
 		{ // Not spectator
@@ -534,24 +549,24 @@ CClientMask CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
 				}
 			} // See everything of yourself
 		}
-		else if(GetPlayer(i)->m_SpectatorID != SPEC_FREEVIEW)
+		else if(GetPlayer(i)->m_SpectatorId != SPEC_FREEVIEW)
 		{ // Spectating specific player
-			if(GetPlayer(i)->m_SpectatorID != Asker)
+			if(GetPlayer(i)->m_SpectatorId != Asker)
 			{ // Actions of other players
-				if(!Character(GetPlayer(i)->m_SpectatorID))
+				if(!Character(GetPlayer(i)->m_SpectatorId))
 					continue; // Player is currently dead
 				if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM)
 				{
-					if(m_Core.Team(GetPlayer(i)->m_SpectatorID) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorID) != TEAM_SUPER)
+					if(m_Core.Team(GetPlayer(i)->m_SpectatorId) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorId) != TEAM_SUPER)
 						continue; // In different teams
 				}
 				else if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_OFF)
 				{
 					if(m_Core.GetSolo(Asker))
 						continue; // When in solo part don't show others
-					if(m_Core.GetSolo(GetPlayer(i)->m_SpectatorID))
+					if(m_Core.GetSolo(GetPlayer(i)->m_SpectatorId))
 						continue; // When in solo part don't show others
-					if(m_Core.Team(GetPlayer(i)->m_SpectatorID) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorID) != TEAM_SUPER)
+					if(m_Core.Team(GetPlayer(i)->m_SpectatorId) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorId) != TEAM_SUPER)
 						continue; // In different teams
 				}
 			} // See everything of player you're spectating
@@ -570,12 +585,12 @@ CClientMask CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
 	return Mask;
 }
 
-void CGameTeams::SendTeamsState(int ClientID)
+void CGameTeams::SendTeamsState(int ClientId)
 {
 	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
 		return;
 
-	if(!m_pGameContext->m_apPlayers[ClientID])
+	if(!m_pGameContext->m_apPlayers[ClientId])
 		return;
 
 	CMsgPacker Msg(NETMSGTYPE_SV_TEAMSSTATE);
@@ -587,11 +602,11 @@ void CGameTeams::SendTeamsState(int ClientID)
 		MsgLegacy.AddInt(m_Core.Team(i));
 	}
 
-	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
-	int ClientVersion = m_pGameContext->m_apPlayers[ClientID]->GetClientVersion();
-	if(!Server()->IsSixup(ClientID) && VERSION_DDRACE < ClientVersion && ClientVersion < VERSION_DDNET_MSG_LEGACY)
+	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientId);
+	int ClientVersion = m_pGameContext->m_apPlayers[ClientId]->GetClientVersion();
+	if(!Server()->IsSixup(ClientId) && VERSION_DDRACE < ClientVersion && ClientVersion < VERSION_DDNET_MSG_LEGACY)
 	{
-		Server()->SendMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+		Server()->SendMsg(&MsgLegacy, MSGFLAG_VITAL, ClientId);
 	}
 }
 
@@ -658,47 +673,50 @@ float *CGameTeams::GetCurrentTimeCp(CPlayer *Player)
 	return NULL;
 }
 
-void CGameTeams::OnTeamFinish(CPlayer **Players, unsigned int Size, float Time, const char *pTimestamp)
+void CGameTeams::OnTeamFinish(int Team, CPlayer **Players, unsigned int Size, int TimeTicks, const char *pTimestamp)
 {
-	int aPlayerCIDs[MAX_CLIENTS];
+	int aPlayerCids[MAX_CLIENTS];
 
 	for(unsigned int i = 0; i < Size; i++)
 	{
-		aPlayerCIDs[i] = Players[i]->GetCID();
+		aPlayerCids[i] = Players[i]->GetCid();
 
-		if(g_Config.m_SvRejoinTeam0 && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (m_Core.Team(Players[i]->GetCID()) >= TEAM_SUPER || !m_aTeamLocked[m_Core.Team(Players[i]->GetCID())]))
+		if(g_Config.m_SvRejoinTeam0 && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (m_Core.Team(Players[i]->GetCid()) >= TEAM_SUPER || !m_aTeamLocked[m_Core.Team(Players[i]->GetCid())]))
 		{
-			SetForceCharacterTeam(Players[i]->GetCID(), TEAM_FLOCK);
+			SetForceCharacterTeam(Players[i]->GetCid(), TEAM_FLOCK);
 			char aBuf[512];
 			str_format(aBuf, sizeof(aBuf), "'%s' joined team 0",
-				GameServer()->Server()->ClientName(Players[i]->GetCID()));
-			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+				GameServer()->Server()->ClientName(Players[i]->GetCid()));
+			GameServer()->SendChat(-1, TEAM_ALL, aBuf);
 		}
 	}
 
 	if(Size >= (unsigned int)g_Config.m_SvMinTeamSize)
-		GameServer()->Score()->SaveTeamScore(aPlayerCIDs, Size, Time, pTimestamp);
+		GameServer()->Score()->SaveTeamScore(Team, aPlayerCids, Size, TimeTicks, pTimestamp);
 }
 
-void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
+void CGameTeams::OnFinish(CPlayer *Player, int TimeTicks, const char *pTimestamp)
 {
 	if(!Player || !Player->IsPlaying())
 		return;
+
+	float Time = TimeTicks / (float)Server()->TickSpeed();
+
 	// TODO:DDRace:btd: this ugly
-	const int ClientID = Player->GetCID();
-	CPlayerData *pData = GameServer()->Score()->PlayerData(ClientID);
+	const int ClientId = Player->GetCid();
+	CPlayerData *pData = GameServer()->Score()->PlayerData(ClientId);
 
 	char aBuf[128];
 	SetLastTimeCp(Player, -1);
 	// Note that the "finished in" message is parsed by the client
 	str_format(aBuf, sizeof(aBuf),
 		"%s finished in: %d minute(s) %5.2f second(s)",
-		Server()->ClientName(ClientID), (int)Time / 60,
+		Server()->ClientName(ClientId), (int)Time / 60,
 		Time - ((int)Time / 60 * 60));
 	if(g_Config.m_SvHideScore || !g_Config.m_SvSaveWorseScores)
-		GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX);
+		GameServer()->SendChatTarget(ClientId, aBuf, CGameContext::FLAG_SIX);
 	else
-		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1., CGameContext::CHAT_SIX);
+		GameServer()->SendChat(-1, TEAM_ALL, aBuf, -1., CGameContext::FLAG_SIX);
 
 	float Diff = absolute(Time - pData->m_BestTime);
 
@@ -715,17 +733,17 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 			str_format(aBuf, sizeof(aBuf), "New record: %5.2f second(s) better.",
 				Diff);
 		if(g_Config.m_SvHideScore || !g_Config.m_SvSaveWorseScores)
-			GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX);
+			GameServer()->SendChatTarget(ClientId, aBuf, CGameContext::FLAG_SIX);
 		else
-			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+			GameServer()->SendChat(-1, TEAM_ALL, aBuf, -1, CGameContext::FLAG_SIX);
 	}
 	else if(pData->m_BestTime != 0) // tee has already finished?
 	{
-		Server()->StopRecord(ClientID);
+		Server()->StopRecord(ClientId);
 
 		if(Diff <= 0.005f)
 		{
-			GameServer()->SendChatTarget(ClientID,
+			GameServer()->SendChatTarget(ClientId,
 				"You finished with your best time.");
 		}
 		else
@@ -737,7 +755,7 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 				str_format(aBuf, sizeof(aBuf),
 					"%5.2f second(s) worse, better luck next time.",
 					Diff);
-			GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX); // this is private, sent only to the tee
+			GameServer()->SendChatTarget(ClientId, aBuf, CGameContext::FLAG_SIX); // this is private, sent only to the tee
 		}
 	}
 	else
@@ -746,7 +764,7 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 		pData->m_RecordFinishTime = Time;
 	}
 
-	if(!Server()->IsSixup(ClientID))
+	if(!Server()->IsSixup(ClientId))
 	{
 		CNetMsg_Sv_DDRaceTime Msg;
 		CNetMsg_Sv_DDRaceTimeLegacy MsgLegacy;
@@ -763,40 +781,26 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 		{
 			if(Player->GetClientVersion() < VERSION_DDNET_MSG_LEGACY)
 			{
-				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientId);
 			}
 			else
 			{
-				Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+				Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientId);
 			}
 		}
-
-		CNetMsg_Sv_RaceFinish RaceFinishMsg;
-		RaceFinishMsg.m_ClientID = ClientID;
-		RaceFinishMsg.m_Time = Time * 1000;
-		RaceFinishMsg.m_Diff = 0;
-		if(pData->m_BestTime)
-		{
-			RaceFinishMsg.m_Diff = Diff * 1000 * (Time < pData->m_BestTime ? -1 : 1);
-		}
-		RaceFinishMsg.m_RecordPersonal = (Time < pData->m_BestTime || !pData->m_BestTime);
-		RaceFinishMsg.m_RecordServer = Time < GameServer()->m_pController->m_CurrentRecord;
-		Server()->SendPackMsg(&RaceFinishMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
 	}
-	else
+
+	CNetMsg_Sv_RaceFinish RaceFinishMsg;
+	RaceFinishMsg.m_ClientId = ClientId;
+	RaceFinishMsg.m_Time = Time * 1000;
+	RaceFinishMsg.m_Diff = 0;
+	if(pData->m_BestTime)
 	{
-		protocol7::CNetMsg_Sv_RaceFinish Msg;
-		Msg.m_ClientID = ClientID;
-		Msg.m_Time = Time * 1000;
-		Msg.m_Diff = 0;
-		if(pData->m_BestTime)
-		{
-			Msg.m_Diff = Diff * 1000 * (Time < pData->m_BestTime ? -1 : 1);
-		}
-		Msg.m_RecordPersonal = (Time < pData->m_BestTime || !pData->m_BestTime);
-		Msg.m_RecordServer = Time < GameServer()->m_pController->m_CurrentRecord;
-		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+		RaceFinishMsg.m_Diff = Diff * 1000 * (Time < pData->m_BestTime ? -1 : 1);
 	}
+	RaceFinishMsg.m_RecordPersonal = (Time < pData->m_BestTime || !pData->m_BestTime);
+	RaceFinishMsg.m_RecordServer = Time < GameServer()->m_pController->m_CurrentRecord;
+	Server()->SendPackMsg(&RaceFinishMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
 
 	bool CallSaveScore = g_Config.m_SvSaveWorseScores;
 	bool NeedToSendNewPersonalRecord = false;
@@ -809,8 +813,8 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 	}
 
 	if(CallSaveScore)
-		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientID), "nameless tee"))
-			GameServer()->Score()->SaveScore(ClientID, Time, pTimestamp,
+		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientId), "nameless tee"))
+			GameServer()->Score()->SaveScore(ClientId, TimeTicks, pTimestamp,
 				GetCurrentTimeCp(Player), Player->m_NotEligibleForFinish);
 
 	bool NeedToSendNewServerRecord = false;
@@ -822,7 +826,7 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 	else if(Time < GameServer()->m_pController->m_CurrentRecord)
 	{
 		// check for nameless
-		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientID), "nameless tee"))
+		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientId), "nameless tee"))
 		{
 			GameServer()->m_pController->m_CurrentRecord = Time;
 			NeedToSendNewServerRecord = true;
@@ -842,7 +846,7 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 	}
 	if(!NeedToSendNewServerRecord && NeedToSendNewPersonalRecord && Player->GetClientVersion() >= VERSION_DDRACE)
 	{
-		GameServer()->SendRecord(ClientID);
+		GameServer()->SendRecord(ClientId);
 	}
 
 	int TTime = (int)Time;
@@ -850,6 +854,10 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
 	{
 		Player->m_Score = TTime;
 	}
+
+	// Confetti
+	CCharacter *pChar = Player->GetCharacter();
+	m_pGameContext->CreateFinishEffect(pChar->m_Pos, pChar->TeamMask());
 }
 
 void CGameTeams::RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team)
@@ -858,45 +866,45 @@ void CGameTeams::RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int T
 		return;
 
 	char aBuf[512];
-	if(pPlayer->m_SwapTargetsClientID == pTargetPlayer->GetCID())
+	if(pPlayer->m_SwapTargetsClientId == pTargetPlayer->GetCid())
 	{
 		str_format(aBuf, sizeof(aBuf),
-			"You have already requested to swap with %s.", Server()->ClientName(pTargetPlayer->GetCID()));
+			"You have already requested to swap with %s.", Server()->ClientName(pTargetPlayer->GetCid()));
 
-		GameServer()->SendChatTarget(pPlayer->GetCID(), aBuf);
+		GameServer()->SendChatTarget(pPlayer->GetCid(), aBuf);
 		return;
 	}
 
 	// Notification for the swap initiator
 	str_format(aBuf, sizeof(aBuf),
 		"You have requested to swap with %s.",
-		Server()->ClientName(pTargetPlayer->GetCID()));
-	GameServer()->SendChatTarget(pPlayer->GetCID(), aBuf);
+		Server()->ClientName(pTargetPlayer->GetCid()));
+	GameServer()->SendChatTarget(pPlayer->GetCid(), aBuf);
 
 	// Notification to the target swap player
 	str_format(aBuf, sizeof(aBuf),
 		"%s has requested to swap with you. To complete the swap process please wait %d seconds and then type /swap %s.",
-		Server()->ClientName(pPlayer->GetCID()), g_Config.m_SvSaveSwapGamesDelay, Server()->ClientName(pPlayer->GetCID()));
-	GameServer()->SendChatTarget(pTargetPlayer->GetCID(), aBuf);
+		Server()->ClientName(pPlayer->GetCid()), g_Config.m_SvSaveSwapGamesDelay, Server()->ClientName(pPlayer->GetCid()));
+	GameServer()->SendChatTarget(pTargetPlayer->GetCid(), aBuf);
 
 	// Notification for the remaining team
 	str_format(aBuf, sizeof(aBuf),
 		"%s has requested to swap with %s.",
-		Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
+		Server()->ClientName(pPlayer->GetCid()), Server()->ClientName(pTargetPlayer->GetCid()));
 	// Do not send the team notification for team 0
 	if(Team != 0)
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
-			if(m_Core.Team(i) == Team && i != pTargetPlayer->GetCID() && i != pPlayer->GetCID())
+			if(m_Core.Team(i) == Team && i != pTargetPlayer->GetCid() && i != pPlayer->GetCid())
 			{
 				GameServer()->SendChatTarget(i, aBuf);
 			}
 		}
 	}
 
-	pPlayer->m_SwapTargetsClientID = pTargetPlayer->GetCID();
-	m_aLastSwap[pPlayer->GetCID()] = Server()->Tick();
+	pPlayer->m_SwapTargetsClientId = pTargetPlayer->GetCid();
+	m_aLastSwap[pPlayer->GetCid()] = Server()->Tick();
 }
 
 void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPlayer, int Team)
@@ -906,20 +914,20 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPla
 
 	char aBuf[128];
 
-	int Since = (Server()->Tick() - m_aLastSwap[pTargetPlayer->GetCID()]) / Server()->TickSpeed();
+	int Since = (Server()->Tick() - m_aLastSwap[pTargetPlayer->GetCid()]) / Server()->TickSpeed();
 	if(Since < g_Config.m_SvSaveSwapGamesDelay)
 	{
 		str_format(aBuf, sizeof(aBuf),
 			"You have to wait %d seconds until you can swap.",
 			g_Config.m_SvSaveSwapGamesDelay - Since);
 
-		GameServer()->SendChatTarget(pPrimaryPlayer->GetCID(), aBuf);
+		GameServer()->SendChatTarget(pPrimaryPlayer->GetCid(), aBuf);
 
 		return;
 	}
 
-	pPrimaryPlayer->m_SwapTargetsClientID = -1;
-	pTargetPlayer->m_SwapTargetsClientID = -1;
+	pPrimaryPlayer->m_SwapTargetsClientId = -1;
+	pTargetPlayer->m_SwapTargetsClientId = -1;
 
 	int TimeoutAfterDelay = g_Config.m_SvSaveSwapGamesDelay + g_Config.m_SvSwapTimeout;
 	if(Since >= TimeoutAfterDelay)
@@ -928,7 +936,7 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPla
 			"Your swap request timed out %d seconds ago. Use /swap again to re-initiate it.",
 			Since - g_Config.m_SvSwapTimeout);
 
-		GameServer()->SendChatTarget(pPrimaryPlayer->GetCID(), aBuf);
+		GameServer()->SendChatTarget(pPrimaryPlayer->GetCid(), aBuf);
 
 		return;
 	}
@@ -942,7 +950,7 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPla
 	PrimarySavedTee.Load(pTargetPlayer->GetCharacter(), Team, true);
 	SecondarySavedTee.Load(pPrimaryPlayer->GetCharacter(), Team, true);
 
-	if(Team >= 1)
+	if(Team >= 1 && !m_aTeamFlock[Team])
 	{
 		for(const auto &pPlayer : GameServer()->m_apPlayers)
 		{
@@ -951,27 +959,28 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPla
 				pChar->m_StartTime = pPrimaryPlayer->GetCharacter()->m_StartTime;
 		}
 	}
-	std::swap(m_aTeeStarted[pPrimaryPlayer->GetCID()], m_aTeeStarted[pTargetPlayer->GetCID()]);
-	std::swap(m_aTeeFinished[pPrimaryPlayer->GetCID()], m_aTeeFinished[pTargetPlayer->GetCID()]);
-	std::swap(pPrimaryPlayer->GetCharacter()->GetRescueTeeRef(), pTargetPlayer->GetCharacter()->GetRescueTeeRef());
+	std::swap(m_aTeeStarted[pPrimaryPlayer->GetCid()], m_aTeeStarted[pTargetPlayer->GetCid()]);
+	std::swap(m_aTeeFinished[pPrimaryPlayer->GetCid()], m_aTeeFinished[pTargetPlayer->GetCid()]);
+	std::swap(pPrimaryPlayer->GetCharacter()->GetLastRescueTeeRef(RESCUEMODE_AUTO), pTargetPlayer->GetCharacter()->GetLastRescueTeeRef(RESCUEMODE_AUTO));
+	std::swap(pPrimaryPlayer->GetCharacter()->GetLastRescueTeeRef(RESCUEMODE_MANUAL), pTargetPlayer->GetCharacter()->GetLastRescueTeeRef(RESCUEMODE_MANUAL));
 
-	GameServer()->m_World.SwapClients(pPrimaryPlayer->GetCID(), pTargetPlayer->GetCID());
+	GameServer()->m_World.SwapClients(pPrimaryPlayer->GetCid(), pTargetPlayer->GetCid());
 
 	if(GameServer()->TeeHistorianActive())
 	{
-		GameServer()->TeeHistorian()->RecordPlayerSwap(pPrimaryPlayer->GetCID(), pTargetPlayer->GetCID());
+		GameServer()->TeeHistorian()->RecordPlayerSwap(pPrimaryPlayer->GetCid(), pTargetPlayer->GetCid());
 	}
 
 	str_format(aBuf, sizeof(aBuf),
 		"%s has swapped with %s.",
-		Server()->ClientName(pPrimaryPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
+		Server()->ClientName(pPrimaryPlayer->GetCid()), Server()->ClientName(pTargetPlayer->GetCid()));
 
 	GameServer()->SendChatTeam(Team, aBuf);
 }
 
 void CGameTeams::ProcessSaveTeam()
 {
-	for(int Team = 0; Team < NUM_TEAMS; Team++)
+	for(int Team = 0; Team < NUM_DDRACE_TEAMS; Team++)
 	{
 		if(m_apSaveTeamResult[Team] == nullptr || !m_apSaveTeamResult[Team]->m_Completed)
 			continue;
@@ -987,22 +996,22 @@ void CGameTeams::ProcessSaveTeam()
 			{
 				GameServer()->TeeHistorian()->RecordTeamSaveSuccess(
 					Team,
-					m_apSaveTeamResult[Team]->m_SaveID,
+					m_apSaveTeamResult[Team]->m_SaveId,
 					m_apSaveTeamResult[Team]->m_SavedTeam.GetString());
 			}
 			for(int i = 0; i < m_apSaveTeamResult[Team]->m_SavedTeam.GetMembersCount(); i++)
 			{
 				if(m_apSaveTeamResult[Team]->m_SavedTeam.m_pSavedTees->IsHooking())
 				{
-					int ClientID = m_apSaveTeamResult[Team]->m_SavedTeam.m_pSavedTees->GetClientID();
-					if(GameServer()->m_apPlayers[ClientID] != nullptr)
-						GameServer()->SendChatTarget(ClientID, "Start holding the hook before loading the savegame to keep the hook");
+					int ClientId = m_apSaveTeamResult[Team]->m_SavedTeam.m_pSavedTees->GetClientId();
+					if(GameServer()->m_apPlayers[ClientId] != nullptr)
+						GameServer()->SendChatTarget(ClientId, "Start holding the hook before loading the savegame to keep the hook");
 				}
 			}
 			ResetSavedTeam(m_apSaveTeamResult[Team]->m_RequestingPlayer, Team);
-			char aSaveID[UUID_MAXSTRSIZE];
-			FormatUuid(m_apSaveTeamResult[Team]->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
-			dbg_msg("save", "Save successful: %s", aSaveID);
+			char aSaveId[UUID_MAXSTRSIZE];
+			FormatUuid(m_apSaveTeamResult[Team]->m_SaveId, aSaveId, UUID_MAXSTRSIZE);
+			dbg_msg("save", "Save successful: %s", aSaveId);
 			break;
 		}
 		case CScoreSaveResult::SAVE_FAILED:
@@ -1020,17 +1029,26 @@ void CGameTeams::ProcessSaveTeam()
 			{
 				GameServer()->TeeHistorian()->RecordTeamLoadSuccess(
 					Team,
-					m_apSaveTeamResult[Team]->m_SaveID,
+					m_apSaveTeamResult[Team]->m_SaveId,
 					m_apSaveTeamResult[Team]->m_SavedTeam.GetString());
 			}
+
+			bool TeamValid = false;
 			if(Count(Team) > 0)
 			{
 				// keep current weak/strong order as on some maps there is no other way of switching
-				m_apSaveTeamResult[Team]->m_SavedTeam.Load(GameServer(), Team, true);
+				TeamValid = m_apSaveTeamResult[Team]->m_SavedTeam.Load(GameServer(), Team, true);
 			}
-			char aSaveID[UUID_MAXSTRSIZE];
-			FormatUuid(m_apSaveTeamResult[Team]->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
-			dbg_msg("save", "Load successful: %s", aSaveID);
+
+			if(!TeamValid)
+			{
+				GameServer()->SendChatTeam(Team, "Your team has been killed because it contains an invalid tee state");
+				KillTeam(Team, -1, -1);
+			}
+
+			char aSaveId[UUID_MAXSTRSIZE];
+			FormatUuid(m_apSaveTeamResult[Team]->m_SaveId, aSaveId, UUID_MAXSTRSIZE);
+			dbg_msg("save", "Load successful: %s", aSaveId);
 			break;
 		}
 		case CScoreSaveResult::LOAD_FAILED:
@@ -1044,29 +1062,30 @@ void CGameTeams::ProcessSaveTeam()
 	}
 }
 
-void CGameTeams::OnCharacterSpawn(int ClientID)
+void CGameTeams::OnCharacterSpawn(int ClientId)
 {
-	m_Core.SetSolo(ClientID, false);
-	int Team = m_Core.Team(ClientID);
+	m_Core.SetSolo(ClientId, false);
+	int Team = m_Core.Team(ClientId);
 
 	if(GetSaving(Team))
 		return;
 
-	if(m_Core.Team(ClientID) >= TEAM_SUPER || !m_aTeamLocked[Team])
+	if(m_Core.Team(ClientId) >= TEAM_SUPER || !m_aTeamLocked[Team])
 	{
 		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO)
-			SetForceCharacterTeam(ClientID, TEAM_FLOCK);
+			SetForceCharacterTeam(ClientId, TEAM_FLOCK);
 		else
-			SetForceCharacterTeam(ClientID, ClientID); // initialize team
-		CheckTeamFinished(Team);
+			SetForceCharacterTeam(ClientId, ClientId); // initialize team
+		if(!m_aTeamFlock[Team])
+			CheckTeamFinished(Team);
 	}
 }
 
-void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
+void CGameTeams::OnCharacterDeath(int ClientId, int Weapon)
 {
-	m_Core.SetSolo(ClientID, false);
+	m_Core.SetSolo(ClientId, false);
 
-	int Team = m_Core.Team(ClientID);
+	int Team = m_Core.Team(ClientId);
 	if(GetSaving(Team))
 		return;
 	bool Locked = TeamLocked(Team) && Weapon != WEAPON_GAME;
@@ -1076,7 +1095,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
 		ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
 		if(m_aPractice[Team])
 		{
-			if(Weapon == WEAPON_SELF)
+			if(Weapon != WEAPON_WORLD)
 			{
 				ResetRoundState(Team);
 			}
@@ -1092,9 +1111,9 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
 	}
 	else if(Locked)
 	{
-		SetForceCharacterTeam(ClientID, Team);
+		SetForceCharacterTeam(ClientId, Team);
 
-		if(GetTeamState(Team) != TEAMSTATE_OPEN)
+		if(GetTeamState(Team) != TEAMSTATE_OPEN && !m_aTeamFlock[m_Core.Team(ClientId)])
 		{
 			ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
 
@@ -1102,10 +1121,19 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
 
 			if(Count(Team) > 1)
 			{
-				KillTeam(Team, Weapon == WEAPON_SELF ? ClientID : -1, ClientID);
+				// Disband team if the team has more players than allowed.
+				if(Count(Team) > g_Config.m_SvMaxTeamSize)
+				{
+					GameServer()->SendChatTeam(Team, "This team was disbanded because there are more players than allowed in the team.");
+					SetTeamLock(Team, false);
+					KillTeam(Team, Weapon == WEAPON_SELF ? ClientId : -1, ClientId);
+					return;
+				}
+
+				KillTeam(Team, Weapon == WEAPON_SELF ? ClientId : -1, ClientId);
 
 				char aBuf[512];
-				str_format(aBuf, sizeof(aBuf), "Everyone in your locked team was killed because '%s' %s.", Server()->ClientName(ClientID), Weapon == WEAPON_SELF ? "killed" : "died");
+				str_format(aBuf, sizeof(aBuf), "Everyone in your locked team was killed because '%s' %s.", Server()->ClientName(ClientId), Weapon == WEAPON_SELF ? "killed" : "died");
 
 				GameServer()->SendChatTeam(Team, aBuf);
 			}
@@ -1113,18 +1141,19 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
 	}
 	else
 	{
-		if(m_aTeamState[m_Core.Team(ClientID)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientID])
+		if(m_aTeamState[m_Core.Team(ClientId)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientId] && !m_aTeamFlock[m_Core.Team(ClientId)])
 		{
 			char aBuf[128];
-			str_format(aBuf, sizeof(aBuf), "This team cannot finish anymore because '%s' left the team before hitting the start", Server()->ClientName(ClientID));
+			str_format(aBuf, sizeof(aBuf), "This team cannot finish anymore because '%s' left the team before hitting the start", Server()->ClientName(ClientId));
 			GameServer()->SendChatTeam(Team, aBuf);
 			GameServer()->SendChatTeam(Team, "Enter /practice mode or restart to avoid the entire team being killed in 60 seconds");
 
 			m_aTeamUnfinishableKillTick[Team] = Server()->Tick() + 60 * Server()->TickSpeed();
 			ChangeTeamState(Team, CGameTeams::TEAMSTATE_STARTED_UNFINISHABLE);
 		}
-		SetForceCharacterTeam(ClientID, TEAM_FLOCK);
-		CheckTeamFinished(Team);
+		SetForceCharacterTeam(ClientId, TEAM_FLOCK);
+		if(!m_aTeamFlock[m_Core.Team(ClientId)])
+			CheckTeamFinished(Team);
 	}
 }
 
@@ -1134,27 +1163,33 @@ void CGameTeams::SetTeamLock(int Team, bool Lock)
 		m_aTeamLocked[Team] = Lock;
 }
 
+void CGameTeams::SetTeamFlock(int Team, bool Mode)
+{
+	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
+		m_aTeamFlock[Team] = Mode;
+}
+
 void CGameTeams::ResetInvited(int Team)
 {
 	m_aInvited[Team].reset();
 }
 
-void CGameTeams::SetClientInvited(int Team, int ClientID, bool Invited)
+void CGameTeams::SetClientInvited(int Team, int ClientId, bool Invited)
 {
 	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
 	{
 		if(Invited)
-			m_aInvited[Team].set(ClientID);
+			m_aInvited[Team].set(ClientId);
 		else
-			m_aInvited[Team].reset(ClientID);
+			m_aInvited[Team].reset(ClientId);
 	}
 }
 
-void CGameTeams::KillSavedTeam(int ClientID, int Team)
+void CGameTeams::KillSavedTeam(int ClientId, int Team)
 {
 	if(g_Config.m_SvSoloServer || !g_Config.m_SvTeam)
 	{
-		GameServer()->m_apPlayers[ClientID]->KillCharacter(WEAPON_SELF, true);
+		GameServer()->m_apPlayers[ClientId]->KillCharacter(WEAPON_SELF, true);
 	}
 	else
 	{
@@ -1162,7 +1197,7 @@ void CGameTeams::KillSavedTeam(int ClientID, int Team)
 	}
 }
 
-void CGameTeams::ResetSavedTeam(int ClientID, int Team)
+void CGameTeams::ResetSavedTeam(int ClientId, int Team)
 {
 	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
 	{
diff --git a/src/game/server/teams.h b/src/game/server/teams.h
index 25a758fed2..a836dc71ef 100644
--- a/src/game/server/teams.h
+++ b/src/game/server/teams.h
@@ -23,31 +23,32 @@ class CGameTeams
 	bool m_aTeeFinished[MAX_CLIENTS];
 	int m_aLastChat[MAX_CLIENTS];
 
-	int m_aTeamState[NUM_TEAMS];
-	bool m_aTeamLocked[NUM_TEAMS];
-	CClientMask m_aInvited[NUM_TEAMS];
-	bool m_aPractice[NUM_TEAMS];
-	std::shared_ptr<CScoreSaveResult> m_apSaveTeamResult[NUM_TEAMS];
+	int m_aTeamState[NUM_DDRACE_TEAMS];
+	bool m_aTeamLocked[NUM_DDRACE_TEAMS];
+	bool m_aTeamFlock[NUM_DDRACE_TEAMS];
+	CClientMask m_aInvited[NUM_DDRACE_TEAMS];
+	bool m_aPractice[NUM_DDRACE_TEAMS];
+	std::shared_ptr<CScoreSaveResult> m_apSaveTeamResult[NUM_DDRACE_TEAMS];
 	uint64_t m_aLastSwap[MAX_CLIENTS]; // index is id of player who initiated swap
-	bool m_aTeamSentStartWarning[NUM_TEAMS];
+	bool m_aTeamSentStartWarning[NUM_DDRACE_TEAMS];
 	// `m_aTeamUnfinishableKillTick` is -1 by default and gets set when a
 	// team becomes unfinishable. If the team hasn't entered practice mode
 	// by that time, it'll get killed to prevent people not understanding
 	// the message from playing for a long time in an unfinishable team.
-	int m_aTeamUnfinishableKillTick[NUM_TEAMS];
+	int m_aTeamUnfinishableKillTick[NUM_DDRACE_TEAMS];
 
 	class CGameContext *m_pGameContext;
 
 	/**
 	* Kill the whole team.
 	* @param Team The team id to kill
-	* @param NewStrongID The player with that id will get strong hook on everyone else, -1 will set the normal spawning order
-	* @param ExceptID The player that should not get killed
+	* @param NewStrongId The player with that id will get strong hook on everyone else, -1 will set the normal spawning order
+	* @param ExceptId The player that should not get killed
 	*/
-	void KillTeam(int Team, int NewStrongID, int ExceptID = -1);
+	void KillTeam(int Team, int NewStrongId, int ExceptId = -1);
 	bool TeamFinished(int Team);
-	void OnTeamFinish(CPlayer **Players, unsigned int Size, float Time, const char *pTimestamp);
-	void OnFinish(CPlayer *Player, float Time, const char *pTimestamp);
+	void OnTeamFinish(int Team, CPlayer **Players, unsigned int Size, int TimeTicks, const char *pTimestamp);
+	void OnFinish(CPlayer *Player, int TimeTicks, const char *pTimestamp);
 
 public:
 	enum
@@ -66,13 +67,13 @@ class CGameTeams
 	CGameTeams(CGameContext *pGameContext);
 
 	// helper methods
-	CCharacter *Character(int ClientID)
+	CCharacter *Character(int ClientId)
 	{
-		return GameServer()->GetPlayerChar(ClientID);
+		return GameServer()->GetPlayerChar(ClientId);
 	}
-	CPlayer *GetPlayer(int ClientID)
+	CPlayer *GetPlayer(int ClientId)
 	{
-		return GameServer()->m_apPlayers[ClientID];
+		return GameServer()->m_apPlayers[ClientId];
 	}
 
 	class CGameContext *GameServer()
@@ -84,33 +85,34 @@ class CGameTeams
 		return m_pGameContext->Server();
 	}
 
-	void OnCharacterStart(int ClientID);
-	void OnCharacterFinish(int ClientID);
-	void OnCharacterSpawn(int ClientID);
-	void OnCharacterDeath(int ClientID, int Weapon);
+	void OnCharacterStart(int ClientId);
+	void OnCharacterFinish(int ClientId);
+	void OnCharacterSpawn(int ClientId);
+	void OnCharacterDeath(int ClientId, int Weapon);
 	void Tick();
 
 	// returns nullptr if successful, error string if failed
-	const char *SetCharacterTeam(int ClientID, int Team);
+	const char *SetCharacterTeam(int ClientId, int Team);
 	void CheckTeamFinished(int Team);
 
 	void ChangeTeamState(int Team, int State);
 
-	CClientMask TeamMask(int Team, int ExceptID = -1, int Asker = -1);
+	CClientMask TeamMask(int Team, int ExceptId = -1, int Asker = -1, int VersionFlags = CGameContext::FLAG_SIX | CGameContext::FLAG_SIXUP);
 
 	int Count(int Team) const;
 
 	// need to be very careful using this method. SERIOUSLY...
-	void SetForceCharacterTeam(int ClientID, int Team);
+	void SetForceCharacterTeam(int ClientId, int Team);
 
 	void Reset();
 	void ResetRoundState(int Team);
 	void ResetSwitchers(int Team);
 
-	void SendTeamsState(int ClientID);
+	void SendTeamsState(int ClientId);
 	void SetTeamLock(int Team, bool Lock);
+	void SetTeamFlock(int Team, bool Mode);
 	void ResetInvited(int Team);
-	void SetClientInvited(int Team, int ClientID, bool Invited);
+	void SetClientInvited(int Team, int ClientId, bool Invited);
 
 	int GetDDRaceState(CPlayer *Player);
 	int GetStartTime(CPlayer *Player);
@@ -118,22 +120,22 @@ class CGameTeams
 	void SetDDRaceState(CPlayer *Player, int DDRaceState);
 	void SetStartTime(CPlayer *Player, int StartTime);
 	void SetLastTimeCp(CPlayer *Player, int LastTimeCp);
-	void KillSavedTeam(int ClientID, int Team);
-	void ResetSavedTeam(int ClientID, int Team);
+	void KillSavedTeam(int ClientId, int Team);
+	void ResetSavedTeam(int ClientId, int Team);
 	void RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team);
 	void SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPlayer, int Team);
 	void ProcessSaveTeam();
 
 	int GetFirstEmptyTeam() const;
 
-	bool TeeStarted(int ClientID)
+	bool TeeStarted(int ClientId)
 	{
-		return m_aTeeStarted[ClientID];
+		return m_aTeeStarted[ClientId];
 	}
 
-	bool TeeFinished(int ClientID)
+	bool TeeFinished(int ClientId)
 	{
-		return m_aTeeFinished[ClientID];
+		return m_aTeeFinished[ClientId];
 	}
 
 	int GetTeamState(int Team)
@@ -149,9 +151,17 @@ class CGameTeams
 		return m_aTeamLocked[Team];
 	}
 
-	bool IsInvited(int Team, int ClientID)
+	bool TeamFlock(int Team)
 	{
-		return m_aInvited[Team].test(ClientID);
+		if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
+			return false;
+
+		return m_aTeamFlock[Team];
+	}
+
+	bool IsInvited(int Team, int ClientId)
+	{
+		return m_aInvited[Team].test(ClientId);
 	}
 
 	bool IsStarted(int Team)
@@ -159,29 +169,29 @@ class CGameTeams
 		return m_aTeamState[Team] == CGameTeams::TEAMSTATE_STARTED;
 	}
 
-	void SetStarted(int ClientID, bool Started)
+	void SetStarted(int ClientId, bool Started)
 	{
-		m_aTeeStarted[ClientID] = Started;
+		m_aTeeStarted[ClientId] = Started;
 	}
 
-	void SetFinished(int ClientID, bool Finished)
+	void SetFinished(int ClientId, bool Finished)
 	{
-		m_aTeeFinished[ClientID] = Finished;
+		m_aTeeFinished[ClientId] = Finished;
 	}
 
-	void SetSaving(int TeamID, std::shared_ptr<CScoreSaveResult> &SaveResult)
+	void SetSaving(int TeamId, std::shared_ptr<CScoreSaveResult> &SaveResult)
 	{
-		m_apSaveTeamResult[TeamID] = SaveResult;
+		m_apSaveTeamResult[TeamId] = SaveResult;
 	}
 
-	bool GetSaving(int TeamID)
+	bool GetSaving(int TeamId)
 	{
-		if(TeamID < TEAM_FLOCK || TeamID >= TEAM_SUPER)
+		if(TeamId < TEAM_FLOCK || TeamId >= TEAM_SUPER)
 			return false;
-		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && TeamID == TEAM_FLOCK)
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && TeamId == TEAM_FLOCK)
 			return false;
 
-		return m_apSaveTeamResult[TeamID] != nullptr;
+		return m_apSaveTeamResult[TeamId] != nullptr;
 	}
 
 	void SetPractice(int Team, bool Enabled)
diff --git a/src/game/server/teehistorian.cpp b/src/game/server/teehistorian.cpp
index 9fc9545c53..3316ae6d96 100644
--- a/src/game/server/teehistorian.cpp
+++ b/src/game/server/teehistorian.cpp
@@ -10,7 +10,7 @@
 static const char TEEHISTORIAN_NAME[] = "teehistorian@ddnet.tw";
 static const CUuid TEEHISTORIAN_UUID = CalculateUuid(TEEHISTORIAN_NAME);
 static const char TEEHISTORIAN_VERSION[] = "2";
-static const char TEEHISTORIAN_VERSION_MINOR[] = "6";
+static const char TEEHISTORIAN_VERSION_MINOR[] = "8";
 
 #define UUID(id, name) static const CUuid UUID_##id = CalculateUuid(name);
 #include <engine/shared/teehistorian_ex_chunks.h>
@@ -49,14 +49,14 @@ void CTeeHistorian::Reset(const CGameInfo *pGameInfo, WRITE_CALLBACK pfnWriteCal
 	m_LastWrittenTick = 0;
 	// Tick 0 is implicit at the start, game starts as tick 1.
 	m_TickWritten = true;
-	m_MaxClientID = MAX_CLIENTS;
+	m_MaxClientId = MAX_CLIENTS;
 
-	// `m_PrevMaxClientID` is initialized in `BeginPlayers`
+	// `m_PrevMaxClientId` is initialized in `BeginPlayers`
 	for(auto &PrevPlayer : m_aPrevPlayers)
 	{
 		PrevPlayer.m_Alive = false;
 		// zero means no id
-		PrevPlayer.m_UniqueClientID = 0;
+		PrevPlayer.m_UniqueClientId = 0;
 		PrevPlayer.m_Team = 0;
 	}
 	for(auto &PrevTeam : m_aPrevTeams)
@@ -243,20 +243,20 @@ void CTeeHistorian::BeginPlayers()
 {
 	dbg_assert(m_State == STATE_BEFORE_PLAYERS, "invalid teehistorian state");
 
-	m_PrevMaxClientID = m_MaxClientID;
+	m_PrevMaxClientId = m_MaxClientId;
 	// ensure that PLAYER_{DIFF, NEW, OLD} don't cause an implicit tick after a TICK_SKIP
-	// by not overwriting m_MaxClientID during RecordPlayer
-	m_MaxClientID = -1;
+	// by not overwriting m_MaxClientId during RecordPlayer
+	m_MaxClientId = -1;
 
 	m_State = STATE_PLAYERS;
 }
 
-void CTeeHistorian::EnsureTickWrittenPlayerData(int ClientID)
+void CTeeHistorian::EnsureTickWrittenPlayerData(int ClientId)
 {
-	dbg_assert(ClientID > m_MaxClientID, "invalid player data order");
-	m_MaxClientID = ClientID;
+	dbg_assert(ClientId > m_MaxClientId, "invalid player data order");
+	m_MaxClientId = ClientId;
 
-	if(!m_TickWritten && (ClientID > m_PrevMaxClientID || m_LastWrittenTick + 1 != m_Tick))
+	if(!m_TickWritten && (ClientId > m_PrevMaxClientId || m_LastWrittenTick + 1 != m_Tick))
 	{
 		WriteTick();
 	}
@@ -268,14 +268,14 @@ void CTeeHistorian::EnsureTickWrittenPlayerData(int ClientID)
 	}
 }
 
-void CTeeHistorian::RecordPlayer(int ClientID, const CNetObj_CharacterCore *pChar)
+void CTeeHistorian::RecordPlayer(int ClientId, const CNetObj_CharacterCore *pChar)
 {
 	dbg_assert(m_State == STATE_PLAYERS, "invalid teehistorian state");
 
-	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientId];
 	if(!pPrev->m_Alive || pPrev->m_X != pChar->m_X || pPrev->m_Y != pChar->m_Y)
 	{
-		EnsureTickWrittenPlayerData(ClientID);
+		EnsureTickWrittenPlayerData(ClientId);
 
 		CPacker Buffer;
 		Buffer.Reset();
@@ -283,12 +283,12 @@ void CTeeHistorian::RecordPlayer(int ClientID, const CNetObj_CharacterCore *pCha
 		{
 			int dx = pChar->m_X - pPrev->m_X;
 			int dy = pChar->m_Y - pPrev->m_Y;
-			Buffer.AddInt(ClientID);
+			Buffer.AddInt(ClientId);
 			Buffer.AddInt(dx);
 			Buffer.AddInt(dy);
 			if(m_Debug)
 			{
-				dbg_msg("teehistorian", "diff cid=%d dx=%d dy=%d", ClientID, dx, dy);
+				dbg_msg("teehistorian", "diff cid=%d dx=%d dy=%d", ClientId, dx, dy);
 			}
 		}
 		else
@@ -296,12 +296,12 @@ void CTeeHistorian::RecordPlayer(int ClientID, const CNetObj_CharacterCore *pCha
 			int x = pChar->m_X;
 			int y = pChar->m_Y;
 			Buffer.AddInt(-TEEHISTORIAN_PLAYER_NEW);
-			Buffer.AddInt(ClientID);
+			Buffer.AddInt(ClientId);
 			Buffer.AddInt(x);
 			Buffer.AddInt(y);
 			if(m_Debug)
 			{
-				dbg_msg("teehistorian", "new cid=%d x=%d y=%d", ClientID, x, y);
+				dbg_msg("teehistorian", "new cid=%d x=%d y=%d", ClientId, x, y);
 			}
 		}
 		Write(Buffer.Data(), Buffer.Size());
@@ -311,44 +311,44 @@ void CTeeHistorian::RecordPlayer(int ClientID, const CNetObj_CharacterCore *pCha
 	pPrev->m_Alive = true;
 }
 
-void CTeeHistorian::RecordDeadPlayer(int ClientID)
+void CTeeHistorian::RecordDeadPlayer(int ClientId)
 {
 	dbg_assert(m_State == STATE_PLAYERS, "invalid teehistorian state");
 
-	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientId];
 	if(pPrev->m_Alive)
 	{
-		EnsureTickWrittenPlayerData(ClientID);
+		EnsureTickWrittenPlayerData(ClientId);
 
 		CPacker Buffer;
 		Buffer.Reset();
 		Buffer.AddInt(-TEEHISTORIAN_PLAYER_OLD);
-		Buffer.AddInt(ClientID);
+		Buffer.AddInt(ClientId);
 		if(m_Debug)
 		{
-			dbg_msg("teehistorian", "old cid=%d", ClientID);
+			dbg_msg("teehistorian", "old cid=%d", ClientId);
 		}
 		Write(Buffer.Data(), Buffer.Size());
 	}
 	pPrev->m_Alive = false;
 }
 
-void CTeeHistorian::RecordPlayerTeam(int ClientID, int Team)
+void CTeeHistorian::RecordPlayerTeam(int ClientId, int Team)
 {
-	if(m_aPrevPlayers[ClientID].m_Team != Team)
+	if(m_aPrevPlayers[ClientId].m_Team != Team)
 	{
-		m_aPrevPlayers[ClientID].m_Team = Team;
+		m_aPrevPlayers[ClientId].m_Team = Team;
 
 		EnsureTickWritten();
 
 		CPacker Buffer;
 		Buffer.Reset();
-		Buffer.AddInt(ClientID);
+		Buffer.AddInt(ClientId);
 		Buffer.AddInt(Team);
 
 		if(m_Debug)
 		{
-			dbg_msg("teehistorian", "player_team cid=%d team=%d", ClientID, Team);
+			dbg_msg("teehistorian", "player_team cid=%d team=%d", ClientId, Team);
 		}
 
 		WriteExtra(UUID_TEEHISTORIAN_PLAYER_TEAM, Buffer.Data(), Buffer.Size());
@@ -422,13 +422,13 @@ void CTeeHistorian::BeginInputs()
 	m_State = STATE_INPUTS;
 }
 
-void CTeeHistorian::RecordPlayerInput(int ClientID, uint32_t UniqueClientID, const CNetObj_PlayerInput *pInput)
+void CTeeHistorian::RecordPlayerInput(int ClientId, uint32_t UniqueClientId, const CNetObj_PlayerInput *pInput)
 {
 	CPacker Buffer;
 
-	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientId];
 	CNetObj_PlayerInput DiffInput;
-	if(pPrev->m_UniqueClientID == UniqueClientID)
+	if(pPrev->m_UniqueClientId == UniqueClientId)
 	{
 		if(mem_comp(&pPrev->m_Input, pInput, sizeof(pPrev->m_Input)) == 0)
 		{
@@ -442,7 +442,7 @@ void CTeeHistorian::RecordPlayerInput(int ClientID, uint32_t UniqueClientID, con
 		if(m_Debug)
 		{
 			const int *pData = (const int *)&DiffInput;
-			dbg_msg("teehistorian", "diff_input cid=%d %d %d %d %d %d %d %d %d %d %d", ClientID,
+			dbg_msg("teehistorian", "diff_input cid=%d %d %d %d %d %d %d %d %d %d %d", ClientId,
 				pData[0], pData[1], pData[2], pData[3], pData[4],
 				pData[5], pData[6], pData[7], pData[8], pData[9]);
 		}
@@ -455,28 +455,28 @@ void CTeeHistorian::RecordPlayerInput(int ClientID, uint32_t UniqueClientID, con
 		DiffInput = *pInput;
 		if(m_Debug)
 		{
-			dbg_msg("teehistorian", "new_input cid=%d", ClientID);
+			dbg_msg("teehistorian", "new_input cid=%d", ClientId);
 		}
 	}
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	for(size_t i = 0; i < sizeof(DiffInput) / sizeof(int32_t); i++)
 	{
 		Buffer.AddInt(((int *)&DiffInput)[i]);
 	}
-	pPrev->m_UniqueClientID = UniqueClientID;
+	pPrev->m_UniqueClientId = UniqueClientId;
 	pPrev->m_Input = *pInput;
 
 	Write(Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordPlayerMessage(int ClientID, const void *pMsg, int MsgSize)
+void CTeeHistorian::RecordPlayerMessage(int ClientId, const void *pMsg, int MsgSize)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(-TEEHISTORIAN_MESSAGE);
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddInt(MsgSize);
 	Buffer.AddRaw(pMsg, MsgSize);
 
@@ -484,16 +484,16 @@ void CTeeHistorian::RecordPlayerMessage(int ClientID, const void *pMsg, int MsgS
 	{
 		CUnpacker Unpacker;
 		Unpacker.Reset(pMsg, MsgSize);
-		int MsgID = Unpacker.GetInt();
-		int Sys = MsgID & 1;
-		MsgID >>= 1;
-		dbg_msg("teehistorian", "msg cid=%d sys=%d msgid=%d", ClientID, Sys, MsgID);
+		int MsgId = Unpacker.GetInt();
+		int Sys = MsgId & 1;
+		MsgId >>= 1;
+		dbg_msg("teehistorian", "msg cid=%d sys=%d msgid=%d", ClientId, Sys, MsgId);
 	}
 
 	Write(Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordPlayerJoin(int ClientID, int Protocol)
+void CTeeHistorian::RecordPlayerJoin(int ClientId, int Protocol)
 {
 	dbg_assert(Protocol == PROTOCOL_6 || Protocol == PROTOCOL_7, "invalid version");
 	EnsureTickWritten();
@@ -501,10 +501,10 @@ void CTeeHistorian::RecordPlayerJoin(int ClientID, int Protocol)
 	{
 		CPacker Buffer;
 		Buffer.Reset();
-		Buffer.AddInt(ClientID);
+		Buffer.AddInt(ClientId);
 		if(m_Debug)
 		{
-			dbg_msg("teehistorian", "joinver%d cid=%d", Protocol == PROTOCOL_6 ? 6 : 7, ClientID);
+			dbg_msg("teehistorian", "joinver%d cid=%d", Protocol == PROTOCOL_6 ? 6 : 7, ClientId);
 		}
 		CUuid Uuid = Protocol == PROTOCOL_6 ? UUID_TEEHISTORIAN_JOINVER6 : UUID_TEEHISTORIAN_JOINVER7;
 		WriteExtra(Uuid, Buffer.Data(), Buffer.Size());
@@ -513,74 +513,91 @@ void CTeeHistorian::RecordPlayerJoin(int ClientID, int Protocol)
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(-TEEHISTORIAN_JOIN);
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "join cid=%d", ClientID);
+		dbg_msg("teehistorian", "join cid=%d", ClientId);
 	}
 
 	Write(Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordPlayerRejoin(int ClientID)
+void CTeeHistorian::RecordPlayerRejoin(int ClientId)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "player_rejoin cid=%d", ClientID);
+		dbg_msg("teehistorian", "player_rejoin cid=%d", ClientId);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_PLAYER_REJOIN, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordPlayerReady(int ClientID)
+void CTeeHistorian::RecordPlayerReady(int ClientId)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "player_ready cid=%d", ClientID);
+		dbg_msg("teehistorian", "player_ready cid=%d", ClientId);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_PLAYER_READY, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordPlayerDrop(int ClientID, const char *pReason)
+void CTeeHistorian::RecordPlayerDrop(int ClientId, const char *pReason)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(-TEEHISTORIAN_DROP);
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddString(pReason, 0);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "drop cid=%d reason='%s'", ClientID, pReason);
+		dbg_msg("teehistorian", "drop cid=%d reason='%s'", ClientId, pReason);
 	}
 
 	Write(Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordConsoleCommand(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult)
+void CTeeHistorian::RecordPlayerName(int ClientId, const char *pName)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientId);
+	Buffer.AddString(pName, 0);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "player_name cid=%d name='%s'", ClientId, pName);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_PLAYER_NAME, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordConsoleCommand(int ClientId, int FlagMask, const char *pCmd, IConsole::IResult *pResult)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(-TEEHISTORIAN_CONSOLE_COMMAND);
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddInt(FlagMask);
 	Buffer.AddString(pCmd, 0);
 	Buffer.AddInt(pResult->NumArguments());
@@ -591,7 +608,7 @@ void CTeeHistorian::RecordConsoleCommand(int ClientID, int FlagMask, const char
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "ccmd cid=%d cmd='%s'", ClientID, pCmd);
+		dbg_msg("teehistorian", "ccmd cid=%d cmd='%s'", ClientId, pCmd);
 	}
 
 	Write(Buffer.Data(), Buffer.Size());
@@ -607,33 +624,33 @@ void CTeeHistorian::RecordTestExtra()
 	WriteExtra(UUID_TEEHISTORIAN_TEST, "", 0);
 }
 
-void CTeeHistorian::RecordPlayerSwap(int ClientID1, int ClientID2)
+void CTeeHistorian::RecordPlayerSwap(int ClientId1, int ClientId2)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID1);
-	Buffer.AddInt(ClientID2);
+	Buffer.AddInt(ClientId1);
+	Buffer.AddInt(ClientId2);
 
 	WriteExtra(UUID_TEEHISTORIAN_PLAYER_SWITCH, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave)
+void CTeeHistorian::RecordTeamSaveSuccess(int Team, CUuid SaveId, const char *pTeamSave)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(Team);
-	Buffer.AddRaw(&SaveID, sizeof(SaveID));
+	Buffer.AddRaw(&SaveId, sizeof(SaveId));
 	Buffer.AddString(pTeamSave, 0);
 
 	if(m_Debug)
 	{
-		char aSaveID[UUID_MAXSTRSIZE];
-		FormatUuid(SaveID, aSaveID, sizeof(aSaveID));
-		dbg_msg("teehistorian", "save_success team=%d save_id=%s team_save='%s'", Team, aSaveID, pTeamSave);
+		char aSaveId[UUID_MAXSTRSIZE];
+		FormatUuid(SaveId, aSaveId, sizeof(aSaveId));
+		dbg_msg("teehistorian", "save_success team=%d save_id=%s team_save='%s'", Team, aSaveId, pTeamSave);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_SAVE_SUCCESS, Buffer.Data(), Buffer.Size());
@@ -655,21 +672,21 @@ void CTeeHistorian::RecordTeamSaveFailure(int Team)
 	WriteExtra(UUID_TEEHISTORIAN_SAVE_FAILURE, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordTeamLoadSuccess(int Team, CUuid SaveID, const char *pTeamSave)
+void CTeeHistorian::RecordTeamLoadSuccess(int Team, CUuid SaveId, const char *pTeamSave)
 {
 	EnsureTickWritten();
 
 	CPacker Buffer;
 	Buffer.Reset();
 	Buffer.AddInt(Team);
-	Buffer.AddRaw(&SaveID, sizeof(SaveID));
+	Buffer.AddRaw(&SaveId, sizeof(SaveId));
 	Buffer.AddString(pTeamSave, 0);
 
 	if(m_Debug)
 	{
-		char aSaveID[UUID_MAXSTRSIZE];
-		FormatUuid(SaveID, aSaveID, sizeof(aSaveID));
-		dbg_msg("teehistorian", "load_success team=%d save_id=%s team_save='%s'", Team, aSaveID, pTeamSave);
+		char aSaveId[UUID_MAXSTRSIZE];
+		FormatUuid(SaveId, aSaveId, sizeof(aSaveId));
+		dbg_msg("teehistorian", "load_success team=%d save_id=%s team_save='%s'", Team, aSaveId, pTeamSave);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_LOAD_SUCCESS, Buffer.Data(), Buffer.Size());
@@ -704,81 +721,81 @@ void CTeeHistorian::EndTick()
 	m_State = STATE_BEFORE_TICK;
 }
 
-void CTeeHistorian::RecordDDNetVersionOld(int ClientID, int DDNetVersion)
+void CTeeHistorian::RecordDDNetVersionOld(int ClientId, int DDNetVersion)
 {
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddInt(DDNetVersion);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "ddnetver_old cid=%d ddnet_version=%d", ClientID, DDNetVersion);
+		dbg_msg("teehistorian", "ddnetver_old cid=%d ddnet_version=%d", ClientId, DDNetVersion);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_DDNETVER_OLD, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordDDNetVersion(int ClientID, CUuid ConnectionID, int DDNetVersion, const char *pDDNetVersionStr)
+void CTeeHistorian::RecordDDNetVersion(int ClientId, CUuid ConnectionId, int DDNetVersion, const char *pDDNetVersionStr)
 {
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
-	Buffer.AddRaw(&ConnectionID, sizeof(ConnectionID));
+	Buffer.AddInt(ClientId);
+	Buffer.AddRaw(&ConnectionId, sizeof(ConnectionId));
 	Buffer.AddInt(DDNetVersion);
 	Buffer.AddString(pDDNetVersionStr, 0);
 
 	if(m_Debug)
 	{
-		char aConnnectionID[UUID_MAXSTRSIZE];
-		FormatUuid(ConnectionID, aConnnectionID, sizeof(aConnnectionID));
-		dbg_msg("teehistorian", "ddnetver cid=%d connection_id=%s ddnet_version=%d ddnet_version_str=%s", ClientID, aConnnectionID, DDNetVersion, pDDNetVersionStr);
+		char aConnnectionId[UUID_MAXSTRSIZE];
+		FormatUuid(ConnectionId, aConnnectionId, sizeof(aConnnectionId));
+		dbg_msg("teehistorian", "ddnetver cid=%d connection_id=%s ddnet_version=%d ddnet_version_str=%s", ClientId, aConnnectionId, DDNetVersion, pDDNetVersionStr);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_DDNETVER, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordAuthInitial(int ClientID, int Level, const char *pAuthName)
+void CTeeHistorian::RecordAuthInitial(int ClientId, int Level, const char *pAuthName)
 {
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddInt(Level);
 	Buffer.AddString(pAuthName, 0);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "auth_init cid=%d level=%d auth_name=%s", ClientID, Level, pAuthName);
+		dbg_msg("teehistorian", "auth_init cid=%d level=%d auth_name=%s", ClientId, Level, pAuthName);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_AUTH_INIT, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordAuthLogin(int ClientID, int Level, const char *pAuthName)
+void CTeeHistorian::RecordAuthLogin(int ClientId, int Level, const char *pAuthName)
 {
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 	Buffer.AddInt(Level);
 	Buffer.AddString(pAuthName, 0);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "auth_login cid=%d level=%d auth_name=%s", ClientID, Level, pAuthName);
+		dbg_msg("teehistorian", "auth_login cid=%d level=%d auth_name=%s", ClientId, Level, pAuthName);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_AUTH_LOGIN, Buffer.Data(), Buffer.Size());
 }
 
-void CTeeHistorian::RecordAuthLogout(int ClientID)
+void CTeeHistorian::RecordAuthLogout(int ClientId)
 {
 	CPacker Buffer;
 	Buffer.Reset();
-	Buffer.AddInt(ClientID);
+	Buffer.AddInt(ClientId);
 
 	if(m_Debug)
 	{
-		dbg_msg("teehistorian", "auth_logout cid=%d", ClientID);
+		dbg_msg("teehistorian", "auth_logout cid=%d", ClientId);
 	}
 
 	WriteExtra(UUID_TEEHISTORIAN_AUTH_LOGOUT, Buffer.Data(), Buffer.Size());
@@ -794,6 +811,34 @@ void CTeeHistorian::RecordAntibot(const void *pData, int DataSize)
 	WriteExtra(UUID_TEEHISTORIAN_ANTIBOT, pData, DataSize);
 }
 
+void CTeeHistorian::RecordPlayerFinish(int ClientId, int TimeTicks)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientId);
+	Buffer.AddInt(TimeTicks);
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "player_finish cid=%d time=%d", ClientId, TimeTicks);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_PLAYER_FINISH, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTeamFinish(int TeamId, int TimeTicks)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(TeamId);
+	Buffer.AddInt(TimeTicks);
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "team_finish cid=%d time=%d", TeamId, TimeTicks);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_TEAM_FINISH, Buffer.Data(), Buffer.Size());
+}
+
 void CTeeHistorian::Finish()
 {
 	dbg_assert(m_State == STATE_START || m_State == STATE_INPUTS || m_State == STATE_BEFORE_ENDTICK || m_State == STATE_BEFORE_TICK, "invalid teehistorian state");
diff --git a/src/game/server/teehistorian.h b/src/game/server/teehistorian.h
index d4bc8d0275..46e97862f8 100644
--- a/src/game/server/teehistorian.h
+++ b/src/game/server/teehistorian.h
@@ -57,45 +57,49 @@ class CTeeHistorian
 	void BeginTick(int Tick);
 
 	void BeginPlayers();
-	void RecordPlayer(int ClientID, const CNetObj_CharacterCore *pChar);
-	void RecordDeadPlayer(int ClientID);
-	void RecordPlayerTeam(int ClientID, int Team);
+	void RecordPlayer(int ClientId, const CNetObj_CharacterCore *pChar);
+	void RecordDeadPlayer(int ClientId);
+	void RecordPlayerTeam(int ClientId, int Team);
 	void RecordTeamPractice(int Team, bool Practice);
 	void EndPlayers();
 
 	void BeginInputs();
-	void RecordPlayerInput(int ClientID, uint32_t UniqueClientID, const CNetObj_PlayerInput *pInput);
-	void RecordPlayerMessage(int ClientID, const void *pMsg, int MsgSize);
-	void RecordPlayerJoin(int ClientID, int Protocol);
-	void RecordPlayerRejoin(int ClientID);
-	void RecordPlayerReady(int ClientID);
-	void RecordPlayerDrop(int ClientID, const char *pReason);
-	void RecordConsoleCommand(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult);
+	void RecordPlayerInput(int ClientId, uint32_t UniqueClientId, const CNetObj_PlayerInput *pInput);
+	void RecordPlayerMessage(int ClientId, const void *pMsg, int MsgSize);
+	void RecordPlayerJoin(int ClientId, int Protocol);
+	void RecordPlayerRejoin(int ClientId);
+	void RecordPlayerReady(int ClientId);
+	void RecordPlayerDrop(int ClientId, const char *pReason);
+	void RecordPlayerName(int ClientId, const char *pName);
+	void RecordConsoleCommand(int ClientId, int FlagMask, const char *pCmd, IConsole::IResult *pResult);
 	void RecordTestExtra();
-	void RecordPlayerSwap(int ClientID1, int ClientID2);
-	void RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave);
+	void RecordPlayerSwap(int ClientId1, int ClientId2);
+	void RecordTeamSaveSuccess(int Team, CUuid SaveId, const char *pTeamSave);
 	void RecordTeamSaveFailure(int Team);
-	void RecordTeamLoadSuccess(int Team, CUuid SaveID, const char *pTeamSave);
+	void RecordTeamLoadSuccess(int Team, CUuid SaveId, const char *pTeamSave);
 	void RecordTeamLoadFailure(int Team);
 	void EndInputs();
 
 	void EndTick();
 
-	void RecordDDNetVersionOld(int ClientID, int DDNetVersion);
-	void RecordDDNetVersion(int ClientID, CUuid ConnectionID, int DDNetVersion, const char *pDDNetVersionStr);
+	void RecordDDNetVersionOld(int ClientId, int DDNetVersion);
+	void RecordDDNetVersion(int ClientId, CUuid ConnectionId, int DDNetVersion, const char *pDDNetVersionStr);
 
-	void RecordAuthInitial(int ClientID, int Level, const char *pAuthName);
-	void RecordAuthLogin(int ClientID, int Level, const char *pAuthName);
-	void RecordAuthLogout(int ClientID);
+	void RecordAuthInitial(int ClientId, int Level, const char *pAuthName);
+	void RecordAuthLogin(int ClientId, int Level, const char *pAuthName);
+	void RecordAuthLogout(int ClientId);
 
 	void RecordAntibot(const void *pData, int DataSize);
 
+	void RecordPlayerFinish(int ClientId, int TimeTicks);
+	void RecordTeamFinish(int TeamId, int TimeTicks);
+
 	int m_Debug; // Possible values: 0, 1, 2.
 
 private:
 	void WriteHeader(const CGameInfo *pGameInfo);
 	void WriteExtra(CUuid Uuid, const void *pData, int DataSize);
-	void EnsureTickWrittenPlayerData(int ClientID);
+	void EnsureTickWrittenPlayerData(int ClientId);
 	void EnsureTickWritten();
 	void WriteTick();
 	void Write(const void *pData, int DataSize);
@@ -119,7 +123,7 @@ class CTeeHistorian
 		int m_Y;
 
 		CNetObj_PlayerInput m_Input;
-		uint32_t m_UniqueClientID;
+		uint32_t m_UniqueClientId;
 
 		// DDNet team
 		int m_Team;
@@ -138,8 +142,8 @@ class CTeeHistorian
 	int m_LastWrittenTick;
 	bool m_TickWritten;
 	int m_Tick;
-	int m_PrevMaxClientID;
-	int m_MaxClientID;
+	int m_PrevMaxClientId;
+	int m_MaxClientId;
 	CTeehistorianPlayer m_aPrevPlayers[MAX_CLIENTS];
 	CTeam m_aPrevTeams[MAX_CLIENTS];
 };
diff --git a/src/game/server/teeinfo.cpp b/src/game/server/teeinfo.cpp
index 62e457c08d..5d4713f1ed 100644
--- a/src/game/server/teeinfo.cpp
+++ b/src/game/server/teeinfo.cpp
@@ -1,26 +1,27 @@
 #include <base/color.h>
 #include <base/system.h>
+#include <game/generated/protocol7.h>
 
 #include "teeinfo.h"
 
 struct StdSkin
 {
-	char m_aSkinName[64];
+	char m_aSkinName[24];
 	// body, marking, decoration, hands, feet, eyes
-	char m_apSkinPartNames[6][24];
-	bool m_aUseCustomColors[6];
-	int m_aSkinPartColors[6];
+	char m_apSkinPartNames[protocol7::NUM_SKINPARTS][24];
+	bool m_aUseCustomColors[protocol7::NUM_SKINPARTS];
+	int m_aSkinPartColors[protocol7::NUM_SKINPARTS];
 };
 
 static StdSkin g_aStdSkins[] = {
 	{"default", {"standard", "", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {1798004, 0, 0, 1799582, 1869630, 0}},
-	{"bluekitty", {"kitty", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {8681144, -8229413, 0, 7885547, 7885547, 0}},
+	{"bluekitty", {"kitty", "whisker", "", "standard", "standard", "negative"}, {true, true, false, true, true, true}, {8681144, -8229413, 0, 7885547, 8868585, 9043712}},
 	{"bluestripe", {"standard", "stripes", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {10187898, 0, 0, 750848, 1944919, 0}},
 	{"brownbear", {"bear", "bear", "hair", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {1082745, -15634776, 0, 1082745, 1147174, 0}},
 	{"cammo", {"standard", "cammo2", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {5334342, -11771603, 0, 750848, 1944919, 0}},
 	{"cammostripes", {"standard", "cammostripes", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {5334342, -14840320, 0, 750848, 1944919, 0}},
 	{"coala", {"koala", "twinbelly", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {184, -15397662, 0, 184, 9765959, 0}},
-	{"limekitty", {"kitty", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {4612803, -12229920, 0, 3827951, 3827951, 0}},
+	{"limekitty", {"kitty", "whisker", "", "standard", "standard", "negative"}, {true, true, false, true, true, true}, {4612803, -12229920, 0, 3827951, 3827951, 8256000}},
 	{"pinky", {"standard", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {15911355, -801066, 0, 15043034, 15043034, 0}},
 	{"redbopp", {"standard", "donny", "unibop", "standard", "standard", "standard"}, {true, true, true, true, true, false}, {16177260, -16590390, 16177260, 16177260, 7624169, 0}},
 	{"redstripe", {"standard", "stripe", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {16307835, 0, 0, 184, 9765959, 0}},
@@ -38,9 +39,9 @@ CTeeInfo::CTeeInfo(const char *pSkinName, int UseCustomColor, int ColorBody, int
 	m_ColorFeet = ColorFeet;
 }
 
-CTeeInfo::CTeeInfo(const char *apSkinPartNames[6], const int *pUseCustomColors, const int *pSkinPartColors)
+CTeeInfo::CTeeInfo(const char *apSkinPartNames[protocol7::NUM_SKINPARTS], const int *pUseCustomColors, const int *pSkinPartColors)
 {
-	for(int i = 0; i < 6; i++)
+	for(int i = 0; i < protocol7::NUM_SKINPARTS; i++)
 	{
 		str_copy(m_apSkinPartNames[i], apSkinPartNames[i], sizeof(m_apSkinPartNames[i]));
 		m_aUseCustomColors[i] = pUseCustomColors[i];
@@ -51,7 +52,7 @@ CTeeInfo::CTeeInfo(const char *apSkinPartNames[6], const int *pUseCustomColors,
 void CTeeInfo::ToSixup()
 {
 	// reset to default skin
-	for(int p = 0; p < 6; p++)
+	for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 	{
 		str_copy(m_apSkinPartNames[p], g_aStdSkins[0].m_apSkinPartNames[p], 24);
 		m_aUseCustomColors[p] = g_aStdSkins[0].m_aUseCustomColors[p];
@@ -63,7 +64,7 @@ void CTeeInfo::ToSixup()
 	{
 		if(!str_comp(m_aSkinName, StdSkin.m_aSkinName))
 		{
-			for(int p = 0; p < 6; p++)
+			for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 			{
 				str_copy(m_apSkinPartNames[p], StdSkin.m_apSkinPartNames[p], 24);
 				m_aUseCustomColors[p] = StdSkin.m_aUseCustomColors[p];
@@ -75,18 +76,18 @@ void CTeeInfo::ToSixup()
 
 	if(m_UseCustomColor)
 	{
-		int ColorBody = ColorHSLA(m_ColorBody).UnclampLighting().Pack(ms_DarkestLGT7);
-		int ColorFeet = ColorHSLA(m_ColorFeet).UnclampLighting().Pack(ms_DarkestLGT7);
-		m_aUseCustomColors[0] = true;
-		m_aUseCustomColors[1] = true;
-		m_aUseCustomColors[2] = true;
-		m_aUseCustomColors[3] = true;
-		m_aUseCustomColors[4] = true;
-		m_aSkinPartColors[0] = ColorBody;
-		m_aSkinPartColors[1] = 0x22FFFFFF;
-		m_aSkinPartColors[2] = ColorBody;
-		m_aSkinPartColors[3] = ColorBody;
-		m_aSkinPartColors[4] = ColorFeet;
+		int ColorBody = ColorHSLA(m_ColorBody).UnclampLighting(ColorHSLA::DARKEST_LGT).Pack(ColorHSLA::DARKEST_LGT7);
+		int ColorFeet = ColorHSLA(m_ColorFeet).UnclampLighting(ColorHSLA::DARKEST_LGT).Pack(ColorHSLA::DARKEST_LGT7);
+		m_aUseCustomColors[protocol7::SKINPART_BODY] = true;
+		m_aUseCustomColors[protocol7::SKINPART_MARKING] = true;
+		m_aUseCustomColors[protocol7::SKINPART_DECORATION] = true;
+		m_aUseCustomColors[protocol7::SKINPART_HANDS] = true;
+		m_aUseCustomColors[protocol7::SKINPART_FEET] = true;
+		m_aSkinPartColors[protocol7::SKINPART_BODY] = ColorBody;
+		m_aSkinPartColors[protocol7::SKINPART_MARKING] = 0x22FFFFFF;
+		m_aSkinPartColors[protocol7::SKINPART_DECORATION] = ColorBody;
+		m_aSkinPartColors[protocol7::SKINPART_HANDS] = ColorBody;
+		m_aSkinPartColors[protocol7::SKINPART_FEET] = ColorFeet;
 	}
 }
 
@@ -102,7 +103,7 @@ void CTeeInfo::FromSixup()
 	for(auto &StdSkin : g_aStdSkins)
 	{
 		bool match = true;
-		for(int p = 0; p < 6; p++)
+		for(int p = 0; p < protocol7::NUM_SKINPARTS; p++)
 		{
 			if(str_comp(m_apSkinPartNames[p], StdSkin.m_apSkinPartNames[p]) || m_aUseCustomColors[p] != StdSkin.m_aUseCustomColors[p] || (m_aUseCustomColors[p] && m_aSkinPartColors[p] != StdSkin.m_aSkinPartColors[p]))
 			{
@@ -118,8 +119,8 @@ void CTeeInfo::FromSixup()
 	}
 
 	// find closest match
-	int best_skin = 0;
-	int best_matches = -1;
+	int BestSkin = 0;
+	int BestMatches = -1;
 	for(int s = 0; s < 16; s++)
 	{
 		int matches = 0;
@@ -127,15 +128,19 @@ void CTeeInfo::FromSixup()
 			if(str_comp(m_apSkinPartNames[p], g_aStdSkins[s].m_apSkinPartNames[p]) == 0)
 				matches++;
 
-		if(matches > best_matches)
+		if(matches > BestMatches)
 		{
-			best_matches = matches;
-			best_skin = s;
+			BestMatches = matches;
+			BestSkin = s;
 		}
 	}
 
-	str_copy(m_aSkinName, g_aStdSkins[best_skin].m_aSkinName, sizeof(m_aSkinName));
+	str_copy(m_aSkinName, g_aStdSkins[BestSkin].m_aSkinName, sizeof(m_aSkinName));
 	m_UseCustomColor = true;
-	m_ColorBody = ColorHSLA(m_aUseCustomColors[0] ? m_aSkinPartColors[0] : 255).UnclampLighting(ms_DarkestLGT7).Pack(ColorHSLA::DARKEST_LGT);
-	m_ColorFeet = ColorHSLA(m_aUseCustomColors[4] ? m_aSkinPartColors[4] : 255).UnclampLighting(ms_DarkestLGT7).Pack(ColorHSLA::DARKEST_LGT);
+	m_ColorBody = ColorHSLA(m_aUseCustomColors[protocol7::SKINPART_BODY] ? m_aSkinPartColors[protocol7::SKINPART_BODY] : 255)
+			      .UnclampLighting(ColorHSLA::DARKEST_LGT7)
+			      .Pack(ColorHSLA::DARKEST_LGT);
+	m_ColorFeet = ColorHSLA(m_aUseCustomColors[protocol7::SKINPART_FEET] ? m_aSkinPartColors[protocol7::SKINPART_FEET] : 255)
+			      .UnclampLighting(ColorHSLA::DARKEST_LGT7)
+			      .Pack(ColorHSLA::DARKEST_LGT);
 }
diff --git a/src/game/server/teeinfo.h b/src/game/server/teeinfo.h
index a2a72a46df..d3997cf420 100644
--- a/src/game/server/teeinfo.h
+++ b/src/game/server/teeinfo.h
@@ -4,9 +4,7 @@
 class CTeeInfo
 {
 public:
-	constexpr static const float ms_DarkestLGT7 = 61 / 255.0f;
-
-	char m_aSkinName[64] = {'\0'};
+	char m_aSkinName[24] = {'\0'};
 	int m_UseCustomColor = 0;
 	int m_ColorBody = 0;
 	int m_ColorFeet = 0;
diff --git a/src/game/teamscore.cpp b/src/game/teamscore.cpp
index 0835a9814b..e4eed461a5 100644
--- a/src/game/teamscore.cpp
+++ b/src/game/teamscore.cpp
@@ -8,36 +8,36 @@ CTeamsCore::CTeamsCore()
 	Reset();
 }
 
-bool CTeamsCore::SameTeam(int ClientID1, int ClientID2) const
+bool CTeamsCore::SameTeam(int ClientId1, int ClientId2) const
 {
-	return m_aTeam[ClientID1] == TEAM_SUPER || m_aTeam[ClientID2] == TEAM_SUPER || m_aTeam[ClientID1] == m_aTeam[ClientID2];
+	return m_aTeam[ClientId1] == TEAM_SUPER || m_aTeam[ClientId2] == TEAM_SUPER || m_aTeam[ClientId1] == m_aTeam[ClientId2];
 }
 
-int CTeamsCore::Team(int ClientID) const
+int CTeamsCore::Team(int ClientId) const
 {
-	return m_aTeam[ClientID];
+	return m_aTeam[ClientId];
 }
 
-void CTeamsCore::Team(int ClientID, int Team)
+void CTeamsCore::Team(int ClientId, int Team)
 {
 	dbg_assert(Team >= TEAM_FLOCK && Team <= TEAM_SUPER, "invalid team");
-	m_aTeam[ClientID] = Team;
+	m_aTeam[ClientId] = Team;
 }
 
-bool CTeamsCore::CanKeepHook(int ClientID1, int ClientID2) const
+bool CTeamsCore::CanKeepHook(int ClientId1, int ClientId2) const
 {
-	if(m_aTeam[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientID1 == ClientID2)
+	if(m_aTeam[ClientId1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientId2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientId1 == ClientId2)
 		return true;
-	return m_aTeam[ClientID1] == m_aTeam[ClientID2];
+	return m_aTeam[ClientId1] == m_aTeam[ClientId2];
 }
 
-bool CTeamsCore::CanCollide(int ClientID1, int ClientID2) const
+bool CTeamsCore::CanCollide(int ClientId1, int ClientId2) const
 {
-	if(m_aTeam[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientID1 == ClientID2)
+	if(m_aTeam[ClientId1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientId2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientId1 == ClientId2)
 		return true;
-	if(m_aIsSolo[ClientID1] || m_aIsSolo[ClientID2])
+	if(m_aIsSolo[ClientId1] || m_aIsSolo[ClientId2])
 		return false;
-	return m_aTeam[ClientID1] == m_aTeam[ClientID2];
+	return m_aTeam[ClientId1] == m_aTeam[ClientId2];
 }
 
 void CTeamsCore::Reset()
@@ -54,15 +54,15 @@ void CTeamsCore::Reset()
 	}
 }
 
-void CTeamsCore::SetSolo(int ClientID, bool Value)
+void CTeamsCore::SetSolo(int ClientId, bool Value)
 {
-	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "Invalid client id");
-	m_aIsSolo[ClientID] = Value;
+	dbg_assert(ClientId >= 0 && ClientId < MAX_CLIENTS, "Invalid client id");
+	m_aIsSolo[ClientId] = Value;
 }
 
-bool CTeamsCore::GetSolo(int ClientID) const
+bool CTeamsCore::GetSolo(int ClientId) const
 {
-	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+	if(ClientId < 0 || ClientId >= MAX_CLIENTS)
 		return false;
-	return m_aIsSolo[ClientID];
+	return m_aIsSolo[ClientId];
 }
diff --git a/src/game/teamscore.h b/src/game/teamscore.h
index a37ded2ca8..4c82294824 100644
--- a/src/game/teamscore.h
+++ b/src/game/teamscore.h
@@ -8,7 +8,7 @@ enum
 {
 	TEAM_FLOCK = 0,
 	TEAM_SUPER = MAX_CLIENTS,
-	NUM_TEAMS = TEAM_SUPER + 1,
+	NUM_DDRACE_TEAMS = TEAM_SUPER + 1,
 	VANILLA_TEAM_SUPER = VANILLA_MAX_CLIENTS
 };
 
@@ -31,17 +31,17 @@ class CTeamsCore
 
 	CTeamsCore();
 
-	bool SameTeam(int ClientID1, int ClientID2) const;
+	bool SameTeam(int ClientId1, int ClientId2) const;
 
-	bool CanKeepHook(int ClientID1, int ClientID2) const;
-	bool CanCollide(int ClientID1, int ClientID2) const;
+	bool CanKeepHook(int ClientId1, int ClientId2) const;
+	bool CanCollide(int ClientId1, int ClientId2) const;
 
-	int Team(int ClientID) const;
-	void Team(int ClientID, int Team);
+	int Team(int ClientId) const;
+	void Team(int ClientId, int Team);
 
 	void Reset();
-	void SetSolo(int ClientID, bool Value);
-	bool GetSolo(int ClientID) const;
+	void SetSolo(int ClientId, bool Value);
+	bool GetSolo(int ClientId) const;
 };
 
 #endif
diff --git a/src/game/version.h b/src/game/version.h
index 195134e14a..61533632a2 100644
--- a/src/game/version.h
+++ b/src/game/version.h
@@ -3,14 +3,17 @@
 #ifndef GAME_VERSION_H
 #define GAME_VERSION_H
 #ifndef GAME_RELEASE_VERSION
-#define GAME_RELEASE_VERSION "17.4.2"
+#define GAME_RELEASE_VERSION "18.7"
 #endif
+
+// teeworlds
+#define CLIENT_VERSION7 0x0705
 #define GAME_VERSION "0.6.4, " GAME_RELEASE_VERSION
 #define GAME_NETVERSION "0.6 626fce9a778df4d4"
-#define DDNET_VERSION_NUMBER 17042
-#define GAME_STA_VERSION 001
-#define STA_VERSION "0.0.1"
+#define GAME_NETVERSION7 "0.7 802f1be60a05665f"
+
+// ddnet
+#define DDNET_VERSION_NUMBER 18070
 extern const char *GIT_SHORTREV_HASH;
 #define GAME_NAME "DDNet"
-#define STA_BUILD_DATE __DATE__ ", " __TIME__
 #endif
diff --git a/src/masterping/Cargo.toml b/src/masterping/Cargo.toml
index d6bdc5dc21..0e1bf06123 100644
--- a/src/masterping/Cargo.toml
+++ b/src/masterping/Cargo.toml
@@ -2,7 +2,7 @@
 name = "masterping"
 version = "0.0.1"
 authors = ["heinrich5991 <heinrich5991@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
diff --git a/src/mastersrv/Cargo.lock b/src/mastersrv/Cargo.lock
index b5ba336209..ee42e554b3 100644
--- a/src/mastersrv/Cargo.lock
+++ b/src/mastersrv/Cargo.lock
@@ -11,6 +11,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -59,16 +74,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "bstr"
-version = "0.2.17"
+name = "bumpalo"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -76,12 +91,32 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
+[[package]]
+name = "cc"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
 [[package]]
 name = "clap"
 version = "2.34.0"
@@ -95,6 +130,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.2"
@@ -114,28 +155,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.3"
@@ -310,7 +329,7 @@ checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.1",
+ "itoa",
 ]
 
 [[package]]
@@ -357,7 +376,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.1",
+ "itoa",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -366,6 +385,29 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "idna"
 version = "0.2.3"
@@ -389,24 +431,24 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
-dependencies = [
- "serde",
-]
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "itoa"
-version = "0.4.8"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
-name = "itoa"
-version = "1.0.1"
+name = "js-sys"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "lazy_static"
@@ -416,9 +458,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.125"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloc"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "a2714dc2e1457b05760031b876cf46c7abf11b302278b59ebb7bbd37f8bc9145"
+dependencies = [
+ "chrono",
+ "ipnet",
+ "memmap2",
+ "yoke",
+ "yoke-derive",
+ "zerocopy",
+ "zerocopy-derive",
+]
 
 [[package]]
 name = "log"
@@ -437,12 +494,12 @@ dependencies = [
  "base64",
  "bytes",
  "clap",
- "csv",
  "env_logger",
  "headers",
  "hex",
- "ipnet",
+ "libloc",
  "log",
+ "mime",
  "rand",
  "serde",
  "serde_json",
@@ -465,6 +522,16 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -512,6 +579,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.1"
@@ -522,6 +598,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -545,7 +627,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.92",
 ]
 
 [[package]]
@@ -568,18 +650,18 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -625,12 +707,6 @@ dependencies = [
  "regex-syntax",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.25"
@@ -666,7 +742,7 @@ checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.92",
 ]
 
 [[package]]
@@ -676,7 +752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944"
 dependencies = [
  "indexmap",
- "itoa 1.0.1",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -688,7 +764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.1",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -731,6 +807,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -748,6 +830,28 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
 [[package]]
 name = "term_size"
 version = "0.3.2"
@@ -816,7 +920,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.92",
 ]
 
 [[package]]
@@ -885,7 +989,7 @@ checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.92",
 ]
 
 [[package]]
@@ -924,6 +1028,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.19"
@@ -1008,6 +1118,60 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1038,3 +1202,126 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
diff --git a/src/mastersrv/Cargo.toml b/src/mastersrv/Cargo.toml
index 6035363049..df249c2c54 100644
--- a/src/mastersrv/Cargo.toml
+++ b/src/mastersrv/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mastersrv"
 version = "0.0.1"
 authors = ["heinrich5991 <heinrich5991@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
@@ -16,12 +16,12 @@ clap = { version = "2.34.0", default-features = false, features = [
   "suggestions",
   "wrap_help",
 ] }
-csv = "1.1.6"
 env_logger = "0.8.3"
 headers = "0.3.7"
 hex = "0.4.3"
-ipnet = { version = "2.5.0", features = ["serde"] }
+libloc = "0.1.0"
 log = "0.4.17"
+mime = "0.3.16"
 rand = "0.8.4"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = { version = "1.0.64", features = [
diff --git a/src/mastersrv/src/locations.rs b/src/mastersrv/src/locations.rs
index 269384bd69..99870e1308 100644
--- a/src/mastersrv/src/locations.rs
+++ b/src/mastersrv/src/locations.rs
@@ -1,49 +1,40 @@
 use arrayvec::ArrayString;
-use ipnet::Ipv4Net;
-use serde::Deserialize;
 use std::net::IpAddr;
 use std::path::Path;
 
 pub type Location = ArrayString<[u8; 12]>;
 
-#[derive(Deserialize)]
-struct LocationRecord {
-    network: Ipv4Net,
-    location: Location,
-}
-
+#[allow(dead_code)] // only used for `Debug` impl
 #[derive(Debug)]
 pub struct LocationsError(String);
 
 pub struct Locations {
-    locations: Vec<LocationRecord>,
+    inner: Option<libloc::Locations>,
 }
 
 impl Locations {
     pub fn empty() -> Locations {
         Locations {
-            locations: Vec::new(),
+            inner: None,
         }
     }
     pub fn read(filename: &Path) -> Result<Locations, LocationsError> {
-        let mut reader = csv::Reader::from_path(filename)
+        let inner = libloc::Locations::open(filename)
             .map_err(|e| LocationsError(format!("error opening {:?}: {}", filename, e)))?;
-        let locations: Result<Vec<_>, _> = reader.deserialize().collect();
         Ok(Locations {
-            locations: locations
-                .map_err(|e| LocationsError(format!("error deserializing: {}", e)))?,
+            inner: Some(inner),
         })
     }
     pub fn lookup(&self, addr: IpAddr) -> Option<Location> {
-        let ipv4_addr = match addr {
-            IpAddr::V4(a) => a,
-            IpAddr::V6(_) => return None, // sad smiley
-        };
-        for LocationRecord { network, location } in &self.locations {
-            if network.contains(&ipv4_addr) {
-                return Some(*location);
-            }
-        }
-        None
+        self.inner.as_ref().and_then(|inner| {
+            let country_code = inner.lookup(addr)?.country_code();
+            let continent_code = inner.country(country_code)?.continent_code();
+            let mut result = ArrayString::new();
+            result.push_str(continent_code);
+            result.push_str(":");
+            result.push_str(country_code);
+            result.make_ascii_lowercase();
+            Some(result)
+        })
     }
 }
diff --git a/src/mastersrv/src/main.rs b/src/mastersrv/src/main.rs
index d608fa4159..c16f065969 100644
--- a/src/mastersrv/src/main.rs
+++ b/src/mastersrv/src/main.rs
@@ -408,7 +408,7 @@ impl Servers {
                 });
             }
             hash_map::Entry::Occupied(mut o) => {
-                let mut server = &mut o.get_mut();
+                let server = &mut o.get_mut();
                 if insert_addr {
                     server.addresses.push(addr);
                     server.addresses.sort_unstable();
@@ -823,8 +823,9 @@ fn register_from_headers(
         challenge_token: parse_opt(headers, "Challenge-Token")?,
         info_serial: parse(headers, "Info-Serial")?,
         info: if !info.is_empty() {
-            if headers.typed_get() != Some(headers::ContentType::json()) {
-                return Err(RegisterError::unsupported_media_type());
+            match headers.typed_get::<headers::ContentType>().map(mime::Mime::from) {
+                Some(mime) if mime.essence_str() == mime::APPLICATION_JSON => {}
+                _ => return Err(RegisterError::unsupported_media_type()),
             }
             Some(json::from_slice(info).map_err(|e| {
                 RegisterError::new(format!("Request body deserialize error: {}", e))
@@ -897,7 +898,7 @@ async fn main() {
         .arg(Arg::with_name("locations")
             .long("locations")
             .value_name("LOCATIONS")
-            .help("IP to continent locations database filename (CSV file with network,continent_code header).")
+            .help("IP to continent locations database filename (libloc format, can be obtained from https://location.ipfire.org/databases/1/location.db.xz).")
         )
         .arg(Arg::with_name("write-addresses")
             .long("write-addresses")
@@ -1008,11 +1009,8 @@ async fn main() {
             addr.unwrap().ip()
         };
         if let IpAddr::V6(v6) = addr {
-            if let Some(v4) = v6.to_ipv4() {
-                // TODO: switch to `to_ipv4_mapped` in the future.
-                if !v6.is_loopback() {
-                    addr = IpAddr::from(v4);
-                }
+            if let Some(v4) = v6.to_ipv4_mapped() {
+                addr = IpAddr::from(v4);
             }
         }
         Ok(addr)
diff --git a/src/rust-bridge/cpp/console.cpp b/src/rust-bridge/cpp/console.cpp
index f4eeaac143..368ec06330 100644
--- a/src/rust-bridge/cpp/console.cpp
+++ b/src/rust-bridge/cpp/console.cpp
@@ -1,5 +1,5 @@
-#include "engine/console.h"
 #include "base/rust.h"
+#include "engine/console.h"
 #include "engine/rust.h"
 #include <cstddef>
 #include <cstdint>
@@ -16,14 +16,10 @@ inline namespace cxxbridge1 {
 #define CXXBRIDGE1_IS_COMPLETE
 namespace detail {
 namespace {
-template<typename T, typename = std::size_t>
-struct is_complete : std::false_type
-{
-};
-template<typename T>
-struct is_complete<T, decltype(sizeof(T))> : std::true_type
-{
-};
+template <typename T, typename = std::size_t>
+struct is_complete : std::false_type {};
+template <typename T>
+struct is_complete<T, decltype(sizeof(T))> : std::true_type {};
 } // namespace
 } // namespace detail
 #endif // CXXBRIDGE1_IS_COMPLETE
@@ -31,67 +27,47 @@ struct is_complete<T, decltype(sizeof(T))> : std::true_type
 #ifndef CXXBRIDGE1_RELOCATABLE
 #define CXXBRIDGE1_RELOCATABLE
 namespace detail {
-template<typename... Ts>
-struct make_void
-{
-	using type = void;
+template <typename... Ts>
+struct make_void {
+  using type = void;
 };
 
-template<typename... Ts>
+template <typename... Ts>
 using void_t = typename make_void<Ts...>::type;
 
-template<typename Void, template<typename...> class, typename...>
-struct detect : std::false_type
-{
-};
-template<template<typename...> class T, typename... A>
-struct detect<void_t<T<A...>>, T, A...> : std::true_type
-{
-};
+template <typename Void, template <typename...> class, typename...>
+struct detect : std::false_type {};
+template <template <typename...> class T, typename... A>
+struct detect<void_t<T<A...>>, T, A...> : std::true_type {};
 
-template<template<typename...> class T, typename... A>
+template <template <typename...> class T, typename... A>
 using is_detected = detect<void, T, A...>;
 
-template<typename T>
+template <typename T>
 using detect_IsRelocatable = typename T::IsRelocatable;
 
-template<typename T>
+template <typename T>
 struct get_IsRelocatable
-	: std::is_same<typename T::IsRelocatable, std::true_type>
-{
-};
+    : std::is_same<typename T::IsRelocatable, std::true_type> {};
 } // namespace detail
 
-template<typename T>
+template <typename T>
 struct IsRelocatable
-	: std::conditional<
-		  detail::is_detected<detail::detect_IsRelocatable, T>::value,
-		  detail::get_IsRelocatable<T>,
-		  std::integral_constant<
-			  bool, std::is_trivially_move_constructible<T>::value &&
-					std::is_trivially_destructible<T>::value>>::type
-{
-};
+    : std::conditional<
+          detail::is_detected<detail::detect_IsRelocatable, T>::value,
+          detail::get_IsRelocatable<T>,
+          std::integral_constant<
+              bool, std::is_trivially_move_constructible<T>::value &&
+                        std::is_trivially_destructible<T>::value>>::type {};
 #endif // CXXBRIDGE1_RELOCATABLE
 
 namespace {
-template<bool>
-struct deleter_if
-{
-	template<typename T>
-	void operator()(T *)
-	{
-	}
+template <bool> struct deleter_if {
+  template <typename T> void operator()(T *) {}
 };
 
-template<>
-struct deleter_if<true>
-{
-	template<typename T>
-	void operator()(T *ptr)
-	{
-		ptr->~T();
-	}
+template <> struct deleter_if<true> {
+  template <typename T> void operator()(T *ptr) { ptr->~T(); }
 };
 } // namespace
 } // namespace cxxbridge1
@@ -101,103 +77,88 @@ using IConsole_IResult = ::IConsole_IResult;
 using IConsole = ::IConsole;
 
 static_assert(
-	::rust::IsRelocatable<::ColorRGBA>::value,
-	"type ColorRGBA should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Print` in Rust");
+    ::rust::IsRelocatable<::ColorRGBA>::value,
+    "type ColorRGBA should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Print` in Rust");
 static_assert(
-	::rust::IsRelocatable<::ColorHSLA>::value,
-	"type ColorHSLA should be trivially move constructible and trivially destructible in C++ to be used as a return value of `GetColor` in Rust");
+    ::rust::IsRelocatable<::ColorHSLA>::value,
+    "type ColorHSLA should be trivially move constructible and trivially destructible in C++ to be used as a return value of `GetColor` in Rust");
 static_assert(
-	::rust::IsRelocatable<::StrRef>::value,
-	"type StrRef should be trivially move constructible and trivially destructible in C++ to be used as an argument of `ExecuteLine`, `Print`, `Register` or return value of `GetString` in Rust");
+    ::rust::IsRelocatable<::StrRef>::value,
+    "type StrRef should be trivially move constructible and trivially destructible in C++ to be used as an argument of `ExecuteLine`, `Print`, `Register` or return value of `GetString` in Rust");
 static_assert(
-	::rust::IsRelocatable<::UserPtr>::value,
-	"type UserPtr should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
+    ::rust::IsRelocatable<::UserPtr>::value,
+    "type UserPtr should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
 static_assert(
-	::rust::IsRelocatable<::IConsole_FCommandCallback>::value,
-	"type IConsole_FCommandCallback should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
+    ::rust::IsRelocatable<::IConsole_FCommandCallback>::value,
+    "type IConsole_FCommandCallback should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
 
 extern "C" {
-::std::int32_t cxxbridge1$IConsole_IResult$GetInteger(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept
-{
-	::std::int32_t (::IConsole_IResult::*GetInteger$)(::std::uint32_t) const = &::IConsole_IResult::GetInteger;
-	return (self.*GetInteger$)(Index);
+::std::int32_t cxxbridge1$IConsole_IResult$GetInteger(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept {
+  ::std::int32_t (::IConsole_IResult::*GetInteger$)(::std::uint32_t) const = &::IConsole_IResult::GetInteger;
+  return (self.*GetInteger$)(Index);
 }
 
-float cxxbridge1$IConsole_IResult$GetFloat(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept
-{
-	float (::IConsole_IResult::*GetFloat$)(::std::uint32_t) const = &::IConsole_IResult::GetFloat;
-	return (self.*GetFloat$)(Index);
+float cxxbridge1$IConsole_IResult$GetFloat(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept {
+  float (::IConsole_IResult::*GetFloat$)(::std::uint32_t) const = &::IConsole_IResult::GetFloat;
+  return (self.*GetFloat$)(Index);
 }
 
-void cxxbridge1$IConsole_IResult$GetString(const ::IConsole_IResult &self, ::std::uint32_t Index, ::StrRef *return$) noexcept
-{
-	::StrRef (::IConsole_IResult::*GetString$)(::std::uint32_t) const = &::IConsole_IResult::GetString;
-	new(return$)::StrRef((self.*GetString$)(Index));
+void cxxbridge1$IConsole_IResult$GetString(const ::IConsole_IResult &self, ::std::uint32_t Index, ::StrRef *return$) noexcept {
+  ::StrRef (::IConsole_IResult::*GetString$)(::std::uint32_t) const = &::IConsole_IResult::GetString;
+  new (return$) ::StrRef((self.*GetString$)(Index));
 }
 
-void cxxbridge1$IConsole_IResult$GetColor(const ::IConsole_IResult &self, ::std::uint32_t Index, bool Light, ::ColorHSLA *return$) noexcept
-{
-	::ColorHSLA (::IConsole_IResult::*GetColor$)(::std::uint32_t, bool) const = &::IConsole_IResult::GetColor;
-	new(return$)::ColorHSLA((self.*GetColor$)(Index, Light));
+void cxxbridge1$IConsole_IResult$GetColor(const ::IConsole_IResult &self, ::std::uint32_t Index, float DarkestLighting, ::ColorHSLA *return$) noexcept {
+  std::optional<::ColorHSLA> (::IConsole_IResult::*GetColor$)(::std::uint32_t, float) const = &::IConsole_IResult::GetColor;
+  new(return$)::ColorHSLA((self.*GetColor$)(Index, DarkestLighting).value_or(::ColorHSLA(0, 0, 0)));
 }
 
-::std::int32_t cxxbridge1$IConsole_IResult$NumArguments(const ::IConsole_IResult &self) noexcept
-{
-	::std::int32_t (::IConsole_IResult::*NumArguments$)() const = &::IConsole_IResult::NumArguments;
-	return (self.*NumArguments$)();
+::std::int32_t cxxbridge1$IConsole_IResult$NumArguments(const ::IConsole_IResult &self) noexcept {
+  ::std::int32_t (::IConsole_IResult::*NumArguments$)() const = &::IConsole_IResult::NumArguments;
+  return (self.*NumArguments$)();
 }
 
-::std::int32_t cxxbridge1$IConsole_IResult$GetVictim(const ::IConsole_IResult &self) noexcept
-{
-	::std::int32_t (::IConsole_IResult::*GetVictim$)() const = &::IConsole_IResult::GetVictim;
-	return (self.*GetVictim$)();
+::std::int32_t cxxbridge1$IConsole_IResult$GetVictim(const ::IConsole_IResult &self) noexcept {
+  ::std::int32_t (::IConsole_IResult::*GetVictim$)() const = &::IConsole_IResult::GetVictim;
+  return (self.*GetVictim$)();
 }
 
-void cxxbridge1$IConsole$ExecuteLine(::IConsole &self, ::StrRef *pStr, ::std::int32_t ClientID, bool InterpretSemicolons) noexcept
-{
-	void (::IConsole::*ExecuteLine$)(::StrRef, ::std::int32_t, bool) = &::IConsole::ExecuteLine;
-	(self.*ExecuteLine$)(::std::move(*pStr), ClientID, InterpretSemicolons);
+void cxxbridge1$IConsole$ExecuteLine(::IConsole &self, ::StrRef *pStr, ::std::int32_t ClientId, bool InterpretSemicolons) noexcept {
+  void (::IConsole::*ExecuteLine$)(::StrRef, ::std::int32_t, bool) = &::IConsole::ExecuteLine;
+  (self.*ExecuteLine$)(::std::move(*pStr), ClientId, InterpretSemicolons);
 }
 
-void cxxbridge1$IConsole$Print(const ::IConsole &self, ::std::int32_t Level, ::StrRef *pFrom, ::StrRef *pStr, ::ColorRGBA *PrintColor) noexcept
-{
-	void (::IConsole::*Print$)(::std::int32_t, ::StrRef, ::StrRef, ::ColorRGBA) const = &::IConsole::Print;
-	(self.*Print$)(Level, ::std::move(*pFrom), ::std::move(*pStr), ::std::move(*PrintColor));
+void cxxbridge1$IConsole$Print(const ::IConsole &self, ::std::int32_t Level, ::StrRef *pFrom, ::StrRef *pStr, ::ColorRGBA *PrintColor) noexcept {
+  void (::IConsole::*Print$)(::std::int32_t, ::StrRef, ::StrRef, ::ColorRGBA) const = &::IConsole::Print;
+  (self.*Print$)(Level, ::std::move(*pFrom), ::std::move(*pStr), ::std::move(*PrintColor));
 }
 
-void cxxbridge1$IConsole$Register(::IConsole &self, ::StrRef *pName, ::StrRef *pParams, ::std::int32_t Flags, ::IConsole_FCommandCallback *pfnFunc, ::UserPtr *pUser, ::StrRef *pHelp) noexcept
-{
-	void (::IConsole::*Register$)(::StrRef, ::StrRef, ::std::int32_t, ::IConsole_FCommandCallback, ::UserPtr, ::StrRef) = &::IConsole::Register;
-	(self.*Register$)(::std::move(*pName), ::std::move(*pParams), Flags, ::std::move(*pfnFunc), ::std::move(*pUser), ::std::move(*pHelp));
+void cxxbridge1$IConsole$Register(::IConsole &self, ::StrRef *pName, ::StrRef *pParams, ::std::int32_t Flags, ::IConsole_FCommandCallback *pfnFunc, ::UserPtr *pUser, ::StrRef *pHelp) noexcept {
+  void (::IConsole::*Register$)(::StrRef, ::StrRef, ::std::int32_t, ::IConsole_FCommandCallback, ::UserPtr, ::StrRef) = &::IConsole::Register;
+  (self.*Register$)(::std::move(*pName), ::std::move(*pParams), Flags, ::std::move(*pfnFunc), ::std::move(*pUser), ::std::move(*pHelp));
 }
 
-::IConsole *cxxbridge1$CreateConsole(::std::int32_t FlagMask) noexcept
-{
-	::std::unique_ptr<::IConsole> (*CreateConsole$)(::std::int32_t) = ::CreateConsole;
-	return CreateConsole$(FlagMask).release();
+::IConsole *cxxbridge1$CreateConsole(::std::int32_t FlagMask) noexcept {
+  ::std::unique_ptr<::IConsole> (*CreateConsole$)(::std::int32_t) = ::CreateConsole;
+  return CreateConsole$(FlagMask).release();
 }
 
 static_assert(::rust::detail::is_complete<::IConsole>::value, "definition of IConsole is required");
 static_assert(sizeof(::std::unique_ptr<::IConsole>) == sizeof(void *), "");
 static_assert(alignof(::std::unique_ptr<::IConsole>) == alignof(void *), "");
-void cxxbridge1$unique_ptr$IConsole$null(::std::unique_ptr<::IConsole> *ptr) noexcept
-{
-	::new(ptr)::std::unique_ptr<::IConsole>();
+void cxxbridge1$unique_ptr$IConsole$null(::std::unique_ptr<::IConsole> *ptr) noexcept {
+  ::new (ptr) ::std::unique_ptr<::IConsole>();
 }
-void cxxbridge1$unique_ptr$IConsole$raw(::std::unique_ptr<::IConsole> *ptr, ::IConsole *raw) noexcept
-{
-	::new(ptr)::std::unique_ptr<::IConsole>(raw);
+void cxxbridge1$unique_ptr$IConsole$raw(::std::unique_ptr<::IConsole> *ptr, ::IConsole *raw) noexcept {
+  ::new (ptr) ::std::unique_ptr<::IConsole>(raw);
 }
-const ::IConsole *cxxbridge1$unique_ptr$IConsole$get(const ::std::unique_ptr<::IConsole> &ptr) noexcept
-{
-	return ptr.get();
+const ::IConsole *cxxbridge1$unique_ptr$IConsole$get(const ::std::unique_ptr<::IConsole>& ptr) noexcept {
+  return ptr.get();
 }
-::IConsole *cxxbridge1$unique_ptr$IConsole$release(::std::unique_ptr<::IConsole> &ptr) noexcept
-{
-	return ptr.release();
+::IConsole *cxxbridge1$unique_ptr$IConsole$release(::std::unique_ptr<::IConsole>& ptr) noexcept {
+  return ptr.release();
 }
-void cxxbridge1$unique_ptr$IConsole$drop(::std::unique_ptr<::IConsole> *ptr) noexcept
-{
-	::rust::deleter_if<::rust::detail::is_complete<::IConsole>::value>{}(ptr);
+void cxxbridge1$unique_ptr$IConsole$drop(::std::unique_ptr<::IConsole> *ptr) noexcept {
+  ::rust::deleter_if<::rust::detail::is_complete<::IConsole>::value>{}(ptr);
 }
 } // extern "C"
diff --git a/src/rust-bridge/engine/shared/rust_version.cpp b/src/rust-bridge/engine/shared/rust_version.cpp
index dd12f64d48..dbd568568d 100644
--- a/src/rust-bridge/engine/shared/rust_version.cpp
+++ b/src/rust-bridge/engine/shared/rust_version.cpp
@@ -7,12 +7,10 @@ void cxxbridge1$RustVersionPrint(const ::IConsole &console) noexcept;
 void cxxbridge1$RustVersionRegister(::IConsole &console) noexcept;
 } // extern "C"
 
-void RustVersionPrint(const ::IConsole &console) noexcept
-{
-	cxxbridge1$RustVersionPrint(console);
+void RustVersionPrint(const ::IConsole &console) noexcept {
+  cxxbridge1$RustVersionPrint(console);
 }
 
-void RustVersionRegister(::IConsole &console) noexcept
-{
-	cxxbridge1$RustVersionRegister(console);
+void RustVersionRegister(::IConsole &console) noexcept {
+  cxxbridge1$RustVersionRegister(console);
 }
diff --git a/src/rust-bridge/test/Cargo.toml b/src/rust-bridge/test/Cargo.toml
index 8909e584a5..f2b8aadf12 100644
--- a/src/rust-bridge/test/Cargo.toml
+++ b/src/rust-bridge/test/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ddnet-test"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Zlib"
 
diff --git a/src/steam/steam_api_flat.h b/src/steam/steam_api_flat.h
index 80197f3eaa..478953c798 100644
--- a/src/steam/steam_api_flat.h
+++ b/src/steam/steam_api_flat.h
@@ -11,7 +11,7 @@
 
 extern "C" {
 
-typedef uint64_t CSteamID;
+typedef uint64_t CSteamId;
 typedef int32_t HSteamPipe;
 typedef int32_t HSteamUser;
 
@@ -29,7 +29,7 @@ struct GameRichPresenceJoinRequested_t
 	{
 		k_iCallback = 337
 	};
-	CSteamID m_steamIDFriend;
+	CSteamId m_steamIdFriend;
 	char m_aRGCHConnect[256];
 };
 
diff --git a/src/test/datafile.cpp b/src/test/datafile.cpp
index 417ba65309..9063486abf 100644
--- a/src/test/datafile.cpp
+++ b/src/test/datafile.cpp
@@ -40,11 +40,11 @@ TEST(Datafile, ExtendedType)
 		ASSERT_GE(Index, 0);
 		ASSERT_EQ(Reader.GetItemSize(Index), (int)sizeof(ItemTest));
 
-		int Type, ID;
-		const CMapItemTest *pTest = (const CMapItemTest *)Reader.GetItem(Index, &Type, &ID);
+		int Type, Id;
+		const CMapItemTest *pTest = (const CMapItemTest *)Reader.GetItem(Index, &Type, &Id);
 		EXPECT_EQ(pTest, Reader.FindItem(MAPITEMTYPE_TEST, 0x8000));
 		EXPECT_EQ(Type, MAPITEMTYPE_TEST);
-		EXPECT_EQ(ID, 0x8000);
+		EXPECT_EQ(Id, 0x8000);
 
 		EXPECT_EQ(pTest->m_Version, ItemTest.m_Version);
 		EXPECT_EQ(pTest->m_aFields[0], ItemTest.m_aFields[0]);
diff --git a/src/test/editor.cpp b/src/test/editor.cpp
new file mode 100644
index 0000000000..4a5b72db0a
--- /dev/null
+++ b/src/test/editor.cpp
@@ -0,0 +1,103 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+bool is_letter(char c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); }
+
+bool IsValidEditorTooltip(const char *pTooltip, char *pErrorMsg, int ErrorMsgSize)
+{
+	pErrorMsg[0] = '\0';
+	char aHotkey[512];
+	aHotkey[0] = '\0';
+
+	if(pTooltip[0] == '[')
+	{
+		str_copy(aHotkey, pTooltip + 1);
+		const char *pHotkeyEnd = str_find(aHotkey, "]");
+		if(!pHotkeyEnd)
+		{
+			str_copy(pErrorMsg, "tooltip missing closing square bracket", ErrorMsgSize);
+			return false;
+		}
+		aHotkey[pHotkeyEnd - aHotkey] = '\0';
+
+		for(int i = 0; aHotkey[i]; i++)
+		{
+			bool ExpectLowerCase = true;
+			if(i == 0)
+			{
+				ExpectLowerCase = false;
+			}
+			else if(!is_letter(aHotkey[i - 1]))
+			{
+				// the first character of a word should be uppercase
+				ExpectLowerCase = false;
+			}
+
+			bool IsLower = aHotkey[i] >= 'a' && aHotkey[i] <= 'z';
+			bool IsUpper = aHotkey[i] >= 'A' && aHotkey[i] <= 'Z';
+
+			if(ExpectLowerCase && IsUpper)
+			{
+				str_format(pErrorMsg, ErrorMsgSize, "expected character '%c' at index %d to be lower case", aHotkey[i], i + 1);
+				return false;
+			}
+			if(!ExpectLowerCase && IsLower)
+			{
+				str_format(pErrorMsg, ErrorMsgSize, "expected character '%c' at index %d to be upper case", aHotkey[i], i + 1);
+				return false;
+			}
+		}
+	}
+
+	const char *pParenthesis = str_find(pTooltip, "(");
+	if(pParenthesis)
+	{
+		const char *pHotkey = str_find_nocase(pParenthesis, "ctrl");
+		if(!pHotkey)
+			pHotkey = str_find_nocase(pParenthesis, "shift");
+		if(!pHotkey)
+			pHotkey = str_find_nocase(pParenthesis, "home");
+
+		if(pHotkey)
+		{
+			int Offset = pHotkey - pTooltip;
+			str_format(pErrorMsg, ErrorMsgSize, "found hotkey at offset %d. Hotkeys must be defined at the start.", Offset);
+			return false;
+		}
+	}
+
+	if(!str_endswith(pTooltip, "."))
+	{
+		str_copy(pErrorMsg, "tooltip has to end with a dot", ErrorMsgSize);
+		return false;
+	}
+	return true;
+}
+
+void AssertTooltip(const char *pTooltip)
+{
+	char aError[512];
+	bool IsValid = IsValidEditorTooltip(pTooltip, aError, sizeof(aError));
+	if(!IsValid)
+	{
+		dbg_msg("test", "Invalid tooltip: %s", pTooltip);
+		dbg_msg("test", "ERROR: %s", aError);
+	}
+	EXPECT_TRUE(IsValid);
+}
+
+TEST(Editor, QuickActionNames)
+{
+	char aError[512];
+	EXPECT_TRUE(IsValidEditorTooltip("hello world.", aError, sizeof(aError)));
+	EXPECT_TRUE(IsValidEditorTooltip("[Ctrl+H] hello world.", aError, sizeof(aError)));
+	EXPECT_FALSE(IsValidEditorTooltip("[Ctrl+H hello world.", aError, sizeof(aError)));
+	EXPECT_FALSE(IsValidEditorTooltip("[ctrl+h] hello world.", aError, sizeof(aError)));
+	EXPECT_FALSE(IsValidEditorTooltip("hello world", aError, sizeof(aError)));
+	EXPECT_FALSE(IsValidEditorTooltip("hello world (Ctrl+H).", aError, sizeof(aError)));
+
+#define REGISTER_QUICK_ACTION(name, text, callback, disabled, active, button_color, description) AssertTooltip(description);
+#include <game/editor/quick_actions.h>
+#undef REGISTER_QUICK_ACTION
+}
diff --git a/src/test/io.cpp b/src/test/io.cpp
index 69ae0f673f..dde7c22ec6 100644
--- a/src/test/io.cpp
+++ b/src/test/io.cpp
@@ -3,18 +3,19 @@
 
 #include <base/system.h>
 
-void TestFileRead(const char *pWritten, bool SkipBom, const char *pRead)
+void TestFileRead(const char *pWritten)
 {
 	CTestInfo Info;
 	char aBuf[512] = {0};
 	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	const int WrittenLength = str_length(pWritten);
 	ASSERT_TRUE(File);
-	EXPECT_EQ(io_write(File, pWritten, str_length(pWritten)), str_length(pWritten));
+	EXPECT_EQ(io_write(File, pWritten, WrittenLength), WrittenLength);
 	EXPECT_FALSE(io_close(File));
-	File = io_open(Info.m_aFilename, IOFLAG_READ | (SkipBom ? IOFLAG_SKIP_BOM : 0));
+	File = io_open(Info.m_aFilename, IOFLAG_READ);
 	ASSERT_TRUE(File);
-	EXPECT_EQ(io_read(File, aBuf, sizeof(aBuf)), str_length(pRead));
-	EXPECT_TRUE(mem_comp(aBuf, pRead, str_length(pRead)) == 0);
+	EXPECT_EQ(io_read(File, aBuf, sizeof(aBuf)), WrittenLength);
+	EXPECT_TRUE(mem_comp(aBuf, pWritten, WrittenLength) == 0);
 	EXPECT_FALSE(io_close(File));
 
 	fs_remove(Info.m_aFilename);
@@ -22,45 +23,21 @@ void TestFileRead(const char *pWritten, bool SkipBom, const char *pRead)
 
 TEST(Io, Read1)
 {
-	TestFileRead("", false, "");
+	TestFileRead("");
 }
 TEST(Io, Read2)
 {
-	TestFileRead("abc", false, "abc");
+	TestFileRead("abc");
 }
 TEST(Io, Read3)
 {
-	TestFileRead("\xef\xbb\xbf", false, "\xef\xbb\xbf");
+	TestFileRead("\xef\xbb\xbf");
 }
 TEST(Io, Read4)
 {
-	TestFileRead("\xef\xbb\xbfxyz", false, "\xef\xbb\xbfxyz");
+	TestFileRead("\xef\xbb\xbfxyz");
 }
 
-TEST(Io, ReadBom1)
-{
-	TestFileRead("", true, "");
-}
-TEST(Io, ReadBom2)
-{
-	TestFileRead("abc", true, "abc");
-}
-TEST(Io, ReadBom3)
-{
-	TestFileRead("\xef\xbb\xbf", true, "");
-}
-TEST(Io, ReadBom4)
-{
-	TestFileRead("\xef\xbb\xbfxyz", true, "xyz");
-}
-TEST(Io, ReadBom5)
-{
-	TestFileRead("\xef\xbb\xbf\xef\xbb\xbf", true, "\xef\xbb\xbf");
-}
-TEST(Io, ReadBom6)
-{
-	TestFileRead("\xef\xbb\xbfxyz\xef\xbb\xbf", true, "xyz\xef\xbb\xbf");
-}
 TEST(Io, CurrentExe)
 {
 	IOHANDLE CurrentExe = io_current_exe();
@@ -78,3 +55,26 @@ TEST(Io, SyncWorks)
 	EXPECT_FALSE(io_close(File));
 	EXPECT_FALSE(fs_remove(Info.m_aFilename));
 }
+
+TEST(Io, WriteTruncatesFile)
+{
+	CTestInfo Info;
+
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_write(File, "0123456789", 10), 10);
+	EXPECT_FALSE(io_close(File));
+
+	File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	EXPECT_EQ(io_write(File, "ABCDE", 5), 5);
+	EXPECT_FALSE(io_close(File));
+
+	char aBuf[16];
+	File = io_open(Info.m_aFilename, IOFLAG_READ);
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_read(File, aBuf, sizeof(aBuf)), 5);
+	EXPECT_TRUE(mem_comp(aBuf, "ABCDE", 5) == 0);
+	EXPECT_FALSE(io_close(File));
+
+	EXPECT_FALSE(fs_remove(Info.m_aFilename));
+}
diff --git a/src/test/jobs.cpp b/src/test/jobs.cpp
index 9c8b49fd0b..3a3d3910df 100644
--- a/src/test/jobs.cpp
+++ b/src/test/jobs.cpp
@@ -15,18 +15,19 @@ class Jobs : public ::testing::Test
 protected:
 	CJobPool m_Pool;
 
-	Jobs()
+	void SetUp() override
 	{
 		m_Pool.Init(TEST_NUM_THREADS);
 	}
 
-	void Add(std::shared_ptr<IJob> pJob)
+	void TearDown() override
 	{
-		m_Pool.Add(std::move(pJob));
+		m_Pool.Shutdown();
 	}
-	void RunBlocking(IJob *pJob)
+
+	void Add(std::shared_ptr<IJob> pJob)
 	{
-		CJobPool::RunBlocking(pJob);
+		m_Pool.Add(std::move(pJob));
 	}
 };
 
@@ -38,6 +39,11 @@ class CJob : public IJob
 public:
 	CJob(std::function<void()> &&JobFunction) :
 		m_JobFunction(JobFunction) {}
+
+	void Abortable(bool Abortable)
+	{
+		IJob::Abortable(Abortable);
+	}
 };
 
 TEST_F(Jobs, Constructor)
@@ -49,15 +55,6 @@ TEST_F(Jobs, Simple)
 	Add(std::make_shared<CJob>([] {}));
 }
 
-TEST_F(Jobs, RunBlocking)
-{
-	int Result = 0;
-	CJob Job([&] { Result = 1; });
-	EXPECT_EQ(Result, 0);
-	RunBlocking(&Job);
-	EXPECT_EQ(Result, 1);
-}
-
 TEST_F(Jobs, Wait)
 {
 	SEMAPHORE sphore;
@@ -67,6 +64,26 @@ TEST_F(Jobs, Wait)
 	sphore_destroy(&sphore);
 }
 
+TEST_F(Jobs, AbortAbortable)
+{
+	auto pJob = std::make_shared<CJob>([&] {});
+	pJob->Abortable(true);
+	EXPECT_TRUE(pJob->IsAbortable());
+	Add(pJob);
+	EXPECT_TRUE(pJob->Abort());
+	EXPECT_EQ(pJob->State(), IJob::STATE_ABORTED);
+}
+
+TEST_F(Jobs, AbortUnabortable)
+{
+	auto pJob = std::make_shared<CJob>([&] {});
+	pJob->Abortable(false);
+	EXPECT_FALSE(pJob->IsAbortable());
+	Add(pJob);
+	EXPECT_FALSE(pJob->Abort());
+	EXPECT_NE(pJob->State(), IJob::STATE_ABORTED);
+}
+
 TEST_F(Jobs, LookupHost)
 {
 	static const char *HOST = "example.com";
@@ -77,7 +94,7 @@ TEST_F(Jobs, LookupHost)
 	EXPECT_EQ(pJob->Nettype(), NETTYPE);
 
 	Add(pJob);
-	while(pJob->Status() != IJob::STATE_DONE)
+	while(pJob->State() != IJob::STATE_DONE)
 	{
 		// yay, busy loop...
 		thread_yield();
@@ -101,7 +118,7 @@ TEST_F(Jobs, LookupHostWebsocket)
 	EXPECT_EQ(pJob->Nettype(), NETTYPE);
 
 	Add(pJob);
-	while(pJob->Status() != IJob::STATE_DONE)
+	while(pJob->State() != IJob::STATE_DONE)
 	{
 		// yay, busy loop...
 		thread_yield();
@@ -130,7 +147,7 @@ TEST_F(Jobs, Many)
 				sphore_signal(&sphore);
 			}
 		});
-		EXPECT_EQ(pJob->Status(), IJob::STATE_PENDING);
+		EXPECT_EQ(pJob->State(), IJob::STATE_QUEUED);
 		vpJobs.push_back(pJob);
 	}
 	for(auto &pJob : vpJobs)
@@ -139,10 +156,10 @@ TEST_F(Jobs, Many)
 	}
 	sphore_wait(&sphore);
 	sphore_destroy(&sphore);
-	m_Pool.~CJobPool();
+	TearDown();
 	for(auto &pJob : vpJobs)
 	{
-		EXPECT_EQ(pJob->Status(), IJob::STATE_DONE);
+		EXPECT_EQ(pJob->State(), IJob::STATE_DONE);
 	}
-	new(&m_Pool) CJobPool();
+	SetUp();
 }
diff --git a/src/test/jsonwriter.cpp b/src/test/jsonwriter.cpp
index c8bcede610..2131cb2e52 100644
--- a/src/test/jsonwriter.cpp
+++ b/src/test/jsonwriter.cpp
@@ -6,7 +6,7 @@
 #include <base/system.h>
 #include <engine/shared/jsonwriter.h>
 
-#include <climits>
+#include <limits>
 
 class JsonFileWriter
 {
@@ -201,12 +201,12 @@ TYPED_TEST(JsonWriters, MinusOne)
 
 TYPED_TEST(JsonWriters, Large)
 {
-	this->Impl.m_pJson->WriteIntValue(INT_MAX);
+	this->Impl.m_pJson->WriteIntValue(std::numeric_limits<int>::max());
 	this->Impl.Expect("2147483647\n");
 }
 
 TYPED_TEST(JsonWriters, Small)
 {
-	this->Impl.m_pJson->WriteIntValue(INT_MIN);
+	this->Impl.m_pJson->WriteIntValue(std::numeric_limits<int>::min());
 	this->Impl.Expect("-2147483648\n");
 }
diff --git a/src/test/linereader.cpp b/src/test/linereader.cpp
index 05d93627b7..8efd83e1f9 100644
--- a/src/test/linereader.cpp
+++ b/src/test/linereader.cpp
@@ -4,35 +4,89 @@
 #include <base/system.h>
 #include <engine/shared/linereader.h>
 
-void TestFileLineReader(const char *pWritten, bool SkipBom, std::initializer_list<const char *> pReads)
+void TestFileLineReaderRaw(const char *pWritten, unsigned WrittenLength, std::initializer_list<const char *> pReads, bool ExpectSuccess, bool WriteBom)
 {
 	CTestInfo Info;
 	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
 	ASSERT_TRUE(File);
-	EXPECT_EQ(io_write(File, pWritten, str_length(pWritten)), str_length(pWritten));
+	if(WriteBom)
+	{
+		constexpr const unsigned char UTF8_BOM[] = {0xEF, 0xBB, 0xBF};
+		EXPECT_EQ(io_write(File, UTF8_BOM, sizeof(UTF8_BOM)), sizeof(UTF8_BOM));
+	}
+	EXPECT_EQ(io_write(File, pWritten, WrittenLength), WrittenLength);
 	EXPECT_FALSE(io_close(File));
-	File = io_open(Info.m_aFilename, IOFLAG_READ | (SkipBom ? IOFLAG_SKIP_BOM : 0));
-	ASSERT_TRUE(File);
+
 	CLineReader LineReader;
-	LineReader.Init(File);
-	for(const char *pRead : pReads)
+	const bool ActualSuccess = LineReader.OpenFile(io_open(Info.m_aFilename, IOFLAG_READ));
+	ASSERT_EQ(ActualSuccess, ExpectSuccess);
+	if(ActualSuccess)
 	{
-		const char *pReadLine = LineReader.Get();
-		ASSERT_TRUE(pReadLine);
-		EXPECT_STREQ(pReadLine, pRead);
+		for(const char *pRead : pReads)
+		{
+			const char *pReadLine = LineReader.Get();
+			ASSERT_TRUE(pReadLine) << "Line reader returned less lines than expected";
+			EXPECT_STREQ(pReadLine, pRead) << "Line reader returned unexpected line";
+		}
+		EXPECT_FALSE(LineReader.Get()) << "Line reader returned more lines than expected";
 	}
-	EXPECT_FALSE(LineReader.Get());
-	EXPECT_FALSE(io_close(File));
 
 	fs_remove(Info.m_aFilename);
 }
 
+void TestFileLineReaderRaw(const char *pWritten, unsigned WrittenLength, std::initializer_list<const char *> pReads, bool ExpectSuccess)
+{
+	TestFileLineReaderRaw(pWritten, WrittenLength, pReads, ExpectSuccess, false);
+	TestFileLineReaderRaw(pWritten, WrittenLength, pReads, ExpectSuccess, true);
+}
+
+void TestFileLineReader(const char *pWritten, std::initializer_list<const char *> pReads)
+{
+	TestFileLineReaderRaw(pWritten, str_length(pWritten), pReads, true);
+}
+
 TEST(LineReader, NormalNewline)
 {
-	TestFileLineReader("foo\nbar\nbaz\n", false, {"foo", "bar", "baz"});
+	TestFileLineReader("foo\nbar\nbaz", {"foo", "bar", "baz"});
+	TestFileLineReader("foo\nbar\nbaz\n", {"foo", "bar", "baz"});
 }
 
 TEST(LineReader, CRLFNewline)
 {
-	TestFileLineReader("foo\r\nbar\r\nbaz", true, {"foo", "bar", "baz"});
+	TestFileLineReader("foo\r\nbar\r\nbaz", {"foo", "bar", "baz"});
+	TestFileLineReader("foo\r\nbar\r\nbaz\r\n", {"foo", "bar", "baz"});
+}
+
+TEST(LineReader, MixedNewline)
+{
+	TestFileLineReader("1\n2\r\n3\n4\n5\r\n6", {"1", "2", "3", "4", "5", "6"});
+	TestFileLineReader("1\n2\r\n3\n4\n5\r\n6\n", {"1", "2", "3", "4", "5", "6"});
+	TestFileLineReader("1\n2\r\n3\n4\n5\r\n6\r\n", {"1", "2", "3", "4", "5", "6"});
+	TestFileLineReader("1\n2\r\n3\n4\n5\r\n6\r", {"1", "2", "3", "4", "5", "6\r"});
+}
+
+TEST(LineReader, EmptyLines)
+{
+	TestFileLineReader("\n\r\n\n\n\r\n", {"", "", "", "", ""});
+	TestFileLineReader("\n\r\n\n\n\r\n\n", {"", "", "", "", "", ""});
+	TestFileLineReader("\n\r\n\n\n\r\n\r\n", {"", "", "", "", "", ""});
+	TestFileLineReader("\n\r\n\n\n\r\n\r", {"", "", "", "", "", "\r"});
+}
+
+TEST(LineReader, Invalid)
+{
+	// Lines containing invalid UTF-8 are skipped
+	TestFileLineReader("foo\xff\nbar\xff\nbaz\xff", {});
+	TestFileLineReader("foo\xff\nbar\nbaz", {"bar", "baz"});
+	TestFileLineReader("foo\nbar\xff\nbaz", {"foo", "baz"});
+	TestFileLineReader("foo\nbar\nbaz\xff", {"foo", "bar"});
+	TestFileLineReader("foo\nbar1\xff\nbar2\xff\nfoobar\nbar3\xff\nbaz", {"foo", "foobar", "baz"});
+}
+
+TEST(LineReader, NullBytes)
+{
+	// Line reader does not read any lines if the file contains null bytes
+	TestFileLineReaderRaw("foo\0\nbar\nbaz", 12, {}, false);
+	TestFileLineReaderRaw("foo\nbar\0\nbaz", 12, {}, false);
+	TestFileLineReaderRaw("foo\nbar\nbaz\0", 12, {}, false);
 }
diff --git a/src/test/netaddr.cpp b/src/test/netaddr.cpp
index ccbf09648d..7b199e3932 100644
--- a/src/test/netaddr.cpp
+++ b/src/test/netaddr.cpp
@@ -2,18 +2,28 @@
 
 #include <base/system.h>
 
-TEST(NetAddr, FromUrlString)
+TEST(NetAddr, FromUrlStringInvalid)
 {
 	NETADDR Addr;
-	char aBuf1[NETADDR_MAXSTRSIZE];
-	char aBuf2[NETADDR_MAXSTRSIZE];
 
 	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://127.0", nullptr, 0), -1); // invalid ip
 	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://ddnet.org", nullptr, 0), -1); // invalid ip
 	EXPECT_EQ(net_addr_from_url(&Addr, "127.0.0.1", nullptr, 0), 1); // not a URL
 	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.9+udp://127.0.0.1", nullptr, 0), 1); // invalid tw protocol
-	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.7+udp://127.0.0.1", nullptr, 0), 1); // unsupported tw protocol
 	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+tcp://127.0.0.1", nullptr, 0), 1); // invalid internet protocol
+}
+
+TEST(NetAddr, FromUrlStringValid)
+{
+	NETADDR Addr;
+	char aBuf1[NETADDR_MAXSTRSIZE];
+	char aBuf2[NETADDR_MAXSTRSIZE];
+
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.7+udp://127.0.0.1", nullptr, 0), 0);
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "127.0.0.1:0");
+	EXPECT_STREQ(aBuf2, "127.0.0.1");
 
 	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://127.0.0.1", nullptr, 0), 0);
 	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
diff --git a/src/test/score.cpp b/src/test/score.cpp
index 2a2d0ba2ea..4bd3dcdec6 100644
--- a/src/test/score.cpp
+++ b/src/test/score.cpp
@@ -25,7 +25,7 @@ int CSaveTeam::FromString(const char *)
 	return 1;
 }
 
-bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const
+bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientId, int NumPlayer, char *pMessage, int MessageLen) const
 {
 	// Dummy implementation for testing
 	return false;
@@ -70,9 +70,9 @@ struct Score : public testing::TestWithParam<IDbConnection *>
 
 	void LoadBestTime()
 	{
-		CSqlLoadBestTimeData loadBestTimeData(std::make_shared<CScoreLoadBestTimeResult>());
-		str_copy(loadBestTimeData.m_aMap, "Kobra 3", sizeof(loadBestTimeData.m_aMap));
-		ASSERT_FALSE(CScoreWorker::LoadBestTime(m_pConn, &loadBestTimeData, m_aError, sizeof(m_aError))) << m_aError;
+		CSqlLoadBestTimeRequest loadBestTimeReq(std::make_shared<CScoreLoadBestTimeResult>());
+		str_copy(loadBestTimeReq.m_aMap, "Kobra 3", sizeof(loadBestTimeReq.m_aMap));
+		ASSERT_FALSE(CScoreWorker::LoadBestTime(m_pConn, &loadBestTimeReq, m_aError, sizeof(m_aError))) << m_aError;
 	}
 
 	void InsertMap()
@@ -98,7 +98,7 @@ struct Score : public testing::TestWithParam<IDbConnection *>
 		str_copy(ScoreData.m_aMap, "Kobra 3", sizeof(ScoreData.m_aMap));
 		str_copy(ScoreData.m_aGameUuid, "8d300ecf-5873-4297-bee5-95668fdff320", sizeof(ScoreData.m_aGameUuid));
 		str_copy(ScoreData.m_aName, "nameless tee", sizeof(ScoreData.m_aName));
-		ScoreData.m_ClientID = 0;
+		ScoreData.m_ClientId = 0;
 		ScoreData.m_Time = Time;
 		str_copy(ScoreData.m_aTimestamp, "2021-11-24 19:24:08", sizeof(ScoreData.m_aTimestamp));
 		for(int i = 0; i < NUM_CHECKPOINTS; i++)
@@ -160,7 +160,7 @@ TEST_P(SingleScore, Top)
 	ExpectLines(m_pPlayerResult,
 		{"------------ Global Top ------------",
 			"1. nameless tee Time: 01:40.00",
-			"----------------------------------------"});
+			"-----------------------------------------"});
 }
 
 TEST_P(SingleScore, RankRegional)
@@ -197,7 +197,7 @@ TEST_P(SingleScore, TopServer)
 	ExpectLines(m_pPlayerResult,
 		{"------------ Global Top ------------",
 			"1. nameless tee Time: 01:40.00",
-			"----------------------------------------"});
+			"-----------------------------------------"});
 }
 
 TEST_P(SingleScore, RankServerRegional)
@@ -264,7 +264,7 @@ TEST_P(SingleScore, TimesExists)
 
 	str_copy(aBuf, m_pPlayerResult->m_Data.m_aaMessages[1] + str_length(m_pPlayerResult->m_Data.m_aaMessages[1]) - 10, 11);
 	EXPECT_STREQ(aBuf, ", 01:40.00");
-	EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[2], "----------------------------------------------------");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[2], "-------------------------------------------");
 	for(int i = 3; i < CScorePlayerResult::MAX_MESSAGES; i++)
 	{
 		EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[i], "");
@@ -321,7 +321,7 @@ TEST_P(TeamScore, All)
 	ExpectLines(m_pPlayerResult,
 		{"------- Team Top 5 -------",
 			"1. brainless tee & nameless tee Team Time: 01:40.00",
-			"-------------------------------"});
+			"---------------------------------"});
 }
 
 TEST_P(TeamScore, PlayerExists)
@@ -331,7 +331,7 @@ TEST_P(TeamScore, PlayerExists)
 	ExpectLines(m_pPlayerResult,
 		{"------- Team Top 5 -------",
 			"1. brainless tee & nameless tee Team Time: 01:40.00",
-			"-------------------------------"});
+			"---------------------------------"});
 }
 
 TEST_P(TeamScore, PlayerDoesntExist)
@@ -349,7 +349,7 @@ TEST_P(TeamScore, RankUpdates)
 	ExpectLines(m_pPlayerResult,
 		{"------- Team Top 5 -------",
 			"1. brainless tee & nameless tee Team Time: 01:38.00",
-			"-------------------------------"});
+			"---------------------------------"});
 }
 
 struct MapInfo : public Score
@@ -542,7 +542,7 @@ TEST_P(RandomMap, NoStars)
 {
 	m_RandomMapRequest.m_Stars = -1;
 	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
-	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
 	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
 	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
 }
@@ -551,7 +551,7 @@ TEST_P(RandomMap, StarsExists)
 {
 	m_RandomMapRequest.m_Stars = 5;
 	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
-	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
 	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
 	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
 }
@@ -560,7 +560,7 @@ TEST_P(RandomMap, StarsDoesntExist)
 {
 	m_RandomMapRequest.m_Stars = 3;
 	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
-	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
 	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "");
 	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "No maps found on this server!");
 }
@@ -569,7 +569,7 @@ TEST_P(RandomMap, UnfinishedExists)
 {
 	m_RandomMapRequest.m_Stars = -1;
 	ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
-	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
 	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
 	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
 }
@@ -578,9 +578,9 @@ TEST_P(RandomMap, UnfinishedDoesntExist)
 {
 	InsertRank();
 	ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
-	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_EQ(m_pRandomMapResult->m_ClientId, 0);
 	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "");
-	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "You have no more unfinished maps on this server!");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "nameless tee has no more unfinished maps on this server!");
 }
 
 auto g_pSqliteConn = CreateSqliteConnection(":memory:", true);
diff --git a/src/test/serverbrowser.cpp b/src/test/serverbrowser.cpp
index 7c466f3707..811e4c938e 100644
--- a/src/test/serverbrowser.cpp
+++ b/src/test/serverbrowser.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 #include <memory>
 
+#include <base/system.h>
+
 #include <engine/client/serverbrowser_ping_cache.h>
 #include <engine/console.h>
 #include <engine/engine.h>
diff --git a/src/test/snapshot.cpp b/src/test/snapshot.cpp
new file mode 100644
index 0000000000..6c818f57ec
--- /dev/null
+++ b/src/test/snapshot.cpp
@@ -0,0 +1,85 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/snapshot.h>
+#include <game/generated/protocol.h>
+
+TEST(Snapshot, CrcOneInt)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	CNetObj_Flag Flag;
+	void *pItem = Builder.NewItem(CNetObj_Flag::ms_MsgId, 0, sizeof(Flag));
+	ASSERT_FALSE(pItem == nullptr);
+	Flag.m_X = 4;
+	Flag.m_Y = 0;
+	Flag.m_Team = 0;
+	mem_copy(pItem, &Flag, sizeof(Flag));
+
+	char aData[CSnapshot::MAX_SIZE];
+	CSnapshot *pSnapshot = (CSnapshot *)aData;
+	Builder.Finish(pSnapshot);
+
+	ASSERT_EQ(pSnapshot->Crc(), 4);
+}
+
+TEST(Snapshot, CrcTwoInts)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	CNetObj_Flag Flag;
+	void *pItem = Builder.NewItem(CNetObj_Flag::ms_MsgId, 0, sizeof(Flag));
+	ASSERT_FALSE(pItem == nullptr);
+	Flag.m_X = 1;
+	Flag.m_Y = 1;
+	Flag.m_Team = 0;
+	mem_copy(pItem, &Flag, sizeof(Flag));
+
+	char aData[CSnapshot::MAX_SIZE];
+	CSnapshot *pSnapshot = (CSnapshot *)aData;
+	Builder.Finish(pSnapshot);
+
+	ASSERT_EQ(pSnapshot->Crc(), 2);
+}
+
+TEST(Snapshot, CrcBiggerInts)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	CNetObj_Flag Flag;
+	void *pItem = Builder.NewItem(CNetObj_Flag::ms_MsgId, 0, sizeof(Flag));
+	ASSERT_FALSE(pItem == nullptr);
+	Flag.m_X = 99999999;
+	Flag.m_Y = 1;
+	Flag.m_Team = 1;
+	mem_copy(pItem, &Flag, sizeof(Flag));
+
+	char aData[CSnapshot::MAX_SIZE];
+	CSnapshot *pSnapshot = (CSnapshot *)aData;
+	Builder.Finish(pSnapshot);
+
+	ASSERT_EQ(pSnapshot->Crc(), 100000001);
+}
+
+TEST(Snapshot, CrcOverflow)
+{
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	CNetObj_Flag Flag;
+	void *pItem = Builder.NewItem(CNetObj_Flag::ms_MsgId, 0, sizeof(Flag));
+	ASSERT_FALSE(pItem == nullptr);
+	Flag.m_X = 0xFFFFFFFF;
+	Flag.m_Y = 1;
+	Flag.m_Team = 1;
+	mem_copy(pItem, &Flag, sizeof(Flag));
+
+	char aData[CSnapshot::MAX_SIZE];
+	CSnapshot *pSnapshot = (CSnapshot *)aData;
+	Builder.Finish(pSnapshot);
+
+	ASSERT_EQ(pSnapshot->Crc(), 1);
+}
diff --git a/src/test/str.cpp b/src/test/str.cpp
index a586e81106..babadc2761 100644
--- a/src/test/str.cpp
+++ b/src/test/str.cpp
@@ -2,6 +2,90 @@
 
 #include <base/system.h>
 
+#include <game/gamecore.h>
+
+TEST(Str, StrDelim)
+{
+	int Start, End;
+	//                                      0123456
+	//                            01234567891111111
+	EXPECT_EQ(str_delimiters_around_offset("123;123456789;aaa", ";", 5, &Start, &End), true);
+	EXPECT_EQ(Start, 4);
+	EXPECT_EQ(End, 13);
+
+	EXPECT_EQ(str_delimiters_around_offset("123;123", ";", 1, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 3);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 1, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 0);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 2, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 0);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 3, &Start, &End), true);
+	EXPECT_EQ(Start, 3);
+	EXPECT_EQ(End, 6);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 4, &Start, &End), true);
+	EXPECT_EQ(Start, 3);
+	EXPECT_EQ(End, 6);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 9, &Start, &End), true);
+	EXPECT_EQ(Start, 9);
+	EXPECT_EQ(End, 12);
+
+	EXPECT_EQ(str_delimiters_around_offset("---foo---bar---baz---hello", "---", 22, &Start, &End), false);
+	EXPECT_EQ(Start, 21);
+	EXPECT_EQ(End, 26);
+
+	EXPECT_EQ(str_delimiters_around_offset("foo;;;;bar;;;;;;", ";", 2, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 3);
+
+	EXPECT_EQ(str_delimiters_around_offset("foo;;;;bar;;;;;;", ";", 3, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 3);
+
+	EXPECT_EQ(str_delimiters_around_offset("foo;;;;bar;;;;;;", ";", 4, &Start, &End), true);
+	EXPECT_EQ(Start, 4);
+	EXPECT_EQ(End, 4);
+
+	EXPECT_EQ(str_delimiters_around_offset("", ";", 4, &Start, &End), false);
+	EXPECT_EQ(Start, 0);
+	EXPECT_EQ(End, 0);
+}
+
+TEST(Str, StrIsNum)
+{
+	EXPECT_EQ(str_isnum('/'), false);
+	EXPECT_EQ(str_isnum('0'), true);
+	EXPECT_EQ(str_isnum('1'), true);
+	EXPECT_EQ(str_isnum('2'), true);
+	EXPECT_EQ(str_isnum('8'), true);
+	EXPECT_EQ(str_isnum('9'), true);
+	EXPECT_EQ(str_isnum(':'), false);
+	EXPECT_EQ(str_isnum(' '), false);
+}
+
+TEST(Str, StrIsAllNum)
+{
+	EXPECT_EQ(str_isallnum("/"), 0);
+	EXPECT_EQ(str_isallnum("0"), 1);
+	EXPECT_EQ(str_isallnum("1"), 1);
+	EXPECT_EQ(str_isallnum("2"), 1);
+	EXPECT_EQ(str_isallnum("8"), 1);
+	EXPECT_EQ(str_isallnum("9"), 1);
+	EXPECT_EQ(str_isallnum(":"), 0);
+	EXPECT_EQ(str_isallnum(" "), 0);
+
+	EXPECT_EQ(str_isallnum("123"), 1);
+	EXPECT_EQ(str_isallnum("123/"), 0);
+	EXPECT_EQ(str_isallnum("123:"), 0);
+}
+
 TEST(Str, Dist)
 {
 	EXPECT_EQ(str_utf8_dist("aaa", "aaa"), 0);
@@ -1083,6 +1167,158 @@ TEST(Str, CountChar)
 	EXPECT_EQ(str_countchr(pStr, 'y'), 0);
 }
 
+TEST(Str, StrToInts)
+{
+	int aInts[8];
+
+	StrToInts(aInts, 1, "a");
+	EXPECT_EQ(aInts[0], 0xE1808000);
+
+	StrToInts(aInts, 1, "ab");
+	EXPECT_EQ(aInts[0], 0xE1E28000);
+
+	StrToInts(aInts, 1, "abc");
+	EXPECT_EQ(aInts[0], 0xE1E2E300);
+
+	StrToInts(aInts, 2, "abcd");
+	EXPECT_EQ(aInts[0], 0xE1E2E3E4);
+	EXPECT_EQ(aInts[1], 0x80808000);
+
+	StrToInts(aInts, 2, "abcde");
+	EXPECT_EQ(aInts[0], 0xE1E2E3E4);
+	EXPECT_EQ(aInts[1], 0xE5808000);
+
+	StrToInts(aInts, 2, "abcdef");
+	EXPECT_EQ(aInts[0], 0xE1E2E3E4);
+	EXPECT_EQ(aInts[1], 0xE5E68000);
+
+	StrToInts(aInts, 2, "abcdefg");
+	EXPECT_EQ(aInts[0], 0xE1E2E3E4);
+	EXPECT_EQ(aInts[1], 0xE5E6E700);
+
+	StrToInts(aInts, 2, "öüä");
+	EXPECT_EQ(aInts[0], 0x4336433C);
+	EXPECT_EQ(aInts[1], 0x43248000);
+
+	StrToInts(aInts, 3, "aβい🐘");
+	EXPECT_EQ(aInts[0], 0xE14E3263);
+	EXPECT_EQ(aInts[1], 0x0104701F);
+	EXPECT_EQ(aInts[2], 0x10188000);
+
+	// long padding
+	StrToInts(aInts, 4, "abc");
+	EXPECT_EQ(aInts[0], 0xE1E2E380);
+	EXPECT_EQ(aInts[1], 0x80808080);
+	EXPECT_EQ(aInts[2], 0x80808080);
+	EXPECT_EQ(aInts[3], 0x80808000);
+}
+
+TEST(Str, IntsToStr)
+{
+	int aInts[8];
+	char aStr[sizeof(aInts)];
+
+	aInts[0] = 0xE1808000;
+	EXPECT_TRUE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "a");
+
+	aInts[0] = 0xE1E28000;
+	EXPECT_TRUE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "ab");
+
+	aInts[0] = 0xE1E2E300;
+	EXPECT_TRUE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abc");
+
+	aInts[0] = 0xE1E2E3E4;
+	aInts[1] = 0x80808000;
+	EXPECT_TRUE(IntsToStr(aInts, 2, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abcd");
+
+	aInts[0] = 0xE1E2E3E4;
+	aInts[1] = 0xE5808000;
+	EXPECT_TRUE(IntsToStr(aInts, 2, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abcde");
+
+	aInts[0] = 0xE1E2E3E4;
+	aInts[1] = 0xE5E68000;
+	EXPECT_TRUE(IntsToStr(aInts, 2, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abcdef");
+
+	aInts[0] = 0xE1E2E3E4;
+	aInts[1] = 0xE5E6E700;
+	EXPECT_TRUE(IntsToStr(aInts, 2, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abcdefg");
+
+	aInts[0] = 0x4336433C;
+	aInts[1] = 0x43248000;
+	EXPECT_TRUE(IntsToStr(aInts, 2, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "öüä");
+
+	aInts[0] = 0xE14E3263;
+	aInts[1] = 0x0104701F;
+	aInts[2] = 0x10188000;
+	EXPECT_TRUE(IntsToStr(aInts, 3, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "aβい🐘");
+
+	// long padding
+	aInts[0] = 0xE1E2E380;
+	aInts[1] = 0x80808080;
+	aInts[2] = 0x80808080;
+	aInts[3] = 0x80808000;
+	EXPECT_TRUE(IntsToStr(aInts, 4, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abc");
+
+	// early null character (0x80)
+	aInts[0] = 0xE1E2E380;
+	aInts[1] = 0xE1E2E3E4;
+	aInts[2] = 0xE1E2E3E4;
+	aInts[3] = 0xE1E2E300;
+	EXPECT_TRUE(IntsToStr(aInts, 4, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abc");
+
+	// invalid UTF-8
+	aInts[0] = 0xE17FE200;
+	EXPECT_FALSE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "");
+
+	// invalid UTF-8 (0x00 in string data, which is translated to '\x80')
+	aInts[0] = 0xE100E200;
+	EXPECT_FALSE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "");
+
+	// invalid UTF-8
+	aInts[0] = 0xE1E2E36F;
+	aInts[1] = 0x3F40E4E5;
+	aInts[2] = 0xE67FE700;
+	EXPECT_FALSE(IntsToStr(aInts, 3, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "");
+
+	// invalid UTF-8 and missing null-terminator
+	aInts[0] = 0x7F7F7F7F;
+	EXPECT_FALSE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "");
+
+	// missing null-terminator at the end is ignored
+	aInts[0] = 0xE1E2E3E4;
+	EXPECT_TRUE(IntsToStr(aInts, 1, aStr, std::size(aStr)));
+	EXPECT_STREQ(aStr, "abc");
+
+	// basic fuzzing: no input integer should result in invalid UTF-8 in the string
+	for(int i = 0; i <= 0xFFFFFF; i += 7) // checking all values takes a bit too long
+	{
+		mem_zero(aStr, std::size(aStr));
+		aInts[0] = 0xE1 << 24 | i;
+		aInts[1] = i << 8 | 0xE2;
+		aInts[2] = 0xE3 << 24 | i;
+		const bool ConversionResult = IntsToStr(aInts, 3, aStr, std::size(aStr));
+		// ensure null-termination before calling str_utf8_check
+		ASSERT_TRUE(mem_has_null(aStr, std::size(aStr)));
+		ASSERT_TRUE(str_utf8_check(aStr));
+		ASSERT_TRUE(ConversionResult || aStr[0] == '\0');
+	}
+}
+
 #if defined(CONF_FAMILY_WINDOWS)
 TEST(Str, WindowsUtf8WideConversion)
 {
diff --git a/src/test/teehistorian.cpp b/src/test/teehistorian.cpp
index 9e88e7e0f6..1a42e6f167 100644
--- a/src/test/teehistorian.cpp
+++ b/src/test/teehistorian.cpp
@@ -105,7 +105,7 @@ class TeeHistorian : public ::testing::Test
 	void Expect(const unsigned char *pOutput, size_t OutputSize)
 	{
 		static CUuid TEEHISTORIAN_UUID = CalculateUuid("teehistorian@ddnet.tw");
-		static const char PREFIX1[] = "{\"comment\":\"teehistorian@ddnet.tw\",\"version\":\"2\",\"version_minor\":\"6\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
+		static const char PREFIX1[] = "{\"comment\":\"teehistorian@ddnet.tw\",\"version\":\"2\",\"version_minor\":\"8\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
 		static const char PREFIX2[] = "\",\"server_name\":\"server name\",\"server_port\":\"8303\",\"game_type\":\"game type\",\"map_name\":\"Kobra 3 Solo\",\"map_size\":\"903514\",\"map_sha256\":\"0123456789012345678901234567890123456789012345678901234567890123\",\"map_crc\":\"eceaf25c\",\"prng_description\":\"test-prng:02468ace\",\"config\":{},\"tuning\":{},\"uuids\":[";
 		static const char PREFIX3[] = "]}";
 
@@ -211,17 +211,17 @@ class TeeHistorian : public ::testing::Test
 		}
 		m_TH.Finish();
 	}
-	void DeadPlayer(int ClientID)
+	void DeadPlayer(int ClientId)
 	{
-		m_TH.RecordDeadPlayer(ClientID);
+		m_TH.RecordDeadPlayer(ClientId);
 	}
-	void Player(int ClientID, int x, int y)
+	void Player(int ClientId, int x, int y)
 	{
 		CNetObj_CharacterCore Char;
 		mem_zero(&Char, sizeof(Char));
 		Char.m_X = x;
 		Char.m_Y = y;
-		m_TH.RecordPlayer(ClientID, &Char);
+		m_TH.RecordPlayer(ClientId, &Char);
 	}
 };
 
@@ -264,7 +264,7 @@ TEST_F(TeeHistorian, TickImplicitTwoTicks)
 	Expect(EXPECTED, sizeof(EXPECTED));
 }
 
-TEST_F(TeeHistorian, TickImplicitDescendingClientID)
+TEST_F(TeeHistorian, TickImplicitDescendingClientId)
 {
 	const unsigned char EXPECTED[] = {
 		0x42, 0x01, 0x02, 0x03, // PLAYER_NEW cid=1 x=2 y=3
@@ -281,7 +281,7 @@ TEST_F(TeeHistorian, TickImplicitDescendingClientID)
 	Expect(EXPECTED, sizeof(EXPECTED));
 }
 
-TEST_F(TeeHistorian, TickExplicitAscendingClientID)
+TEST_F(TeeHistorian, TickExplicitAscendingClientId)
 {
 	const unsigned char EXPECTED[] = {
 		0x42, 0x00, 0x04, 0x05, // PLAYER_NEW cid=0 x=4 y=5
@@ -388,10 +388,10 @@ TEST_F(TeeHistorian, DDNetVersion)
 		0x01, 0x92, 0xcb, 0x01,
 		0x40, // FINISH
 	};
-	CUuid ConnectionID = {
+	CUuid ConnectionId = {
 		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
 		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
-	m_TH.RecordDDNetVersion(0, ConnectionID, 13010, "DDNet 13.1 (3623f5e4cd184556)");
+	m_TH.RecordDDNetVersion(0, ConnectionId, 13010, "DDNet 13.1 (3623f5e4cd184556)");
 	m_TH.RecordDDNetVersionOld(1, 13010);
 	Finish();
 	Expect(EXPECTED, sizeof(EXPECTED));
@@ -482,16 +482,16 @@ TEST_F(TeeHistorian, Input)
 		0x41, 0x00,
 		// new player -> InputNew
 		0x45,
-		0x00, // ClientID 0
+		0x00, // ClientId 0
 		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
 		// same unique id, same input -> nothing
 		// same unique id, different input -> InputDiff
 		0x44,
-		0x00, // ClientID 0
+		0x00, // ClientId 0
 		0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		// different unique id, same input -> InputNew
 		0x45,
-		0x00, // ClientID 0
+		0x00, // ClientId 0
 		0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
 		// FINISH
 		0x40};
@@ -533,11 +533,11 @@ TEST_F(TeeHistorian, SaveSuccess)
 		// FINISH
 		0x40};
 
-	CUuid SaveID = {
+	CUuid SaveId = {
 		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
 		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
 	const char *pTeamSave = "2\tH.\nll0";
-	m_TH.RecordTeamSaveSuccess(21, SaveID, pTeamSave);
+	m_TH.RecordTeamSaveSuccess(21, SaveId, pTeamSave);
 	Finish();
 	Expect(EXPECTED, sizeof(EXPECTED));
 }
@@ -577,11 +577,11 @@ TEST_F(TeeHistorian, LoadSuccess)
 		// FINISH
 		0x40};
 
-	CUuid SaveID = {
+	CUuid SaveId = {
 		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
 		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
 	const char *pTeamSave = "2\tH.\nll0";
-	m_TH.RecordTeamLoadSuccess(21, SaveID, pTeamSave);
+	m_TH.RecordTeamLoadSuccess(21, SaveId, pTeamSave);
 	Finish();
 	Expect(EXPECTED, sizeof(EXPECTED));
 }
@@ -838,6 +838,53 @@ TEST_F(TeeHistorian, AntibotEmptyMessage)
 	Expect(EXPECTED, sizeof(EXPECTED));
 }
 
+TEST_F(TeeHistorian, PlayerName)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=d016f9b9-4151-3b87-87e5-3a6087eb5f26 datalen=14
+		0x4a,
+		0xd0, 0x16, 0xf9, 0xb9, 0x41, 0x51, 0x3b, 0x87,
+		0x87, 0xe5, 0x3a, 0x60, 0x87, 0xeb, 0x5f, 0x26,
+		0x0e,
+		// (PLAYER_NAME) id=21 name="nameless tee"
+		0x15,
+		0x6e, 0x61, 0x6d, 0x65, 0x6c, 0x65, 0x73, 0x73,
+		0x20, 0x74, 0x65, 0x65, 0x00};
+
+	m_TH.RecordPlayerName(21, "nameless tee");
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerFinish)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=68943c01-2348-3e01-9490-3f27f8269d94 datalen=4
+		0x4a,
+		0x68, 0x94, 0x3c, 0x01, 0x23, 0x48, 0x3e, 0x01,
+		0x94, 0x90, 0x3f, 0x27, 0xf8, 0x26, 0x9d, 0x94,
+		0x04,
+		// (PLAYER_FINISH) id=1 time=1000000
+		0x01, 0x80, 0x89, 0x7a};
+
+	m_TH.RecordPlayerFinish(1, 1000000);
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TeamFinish)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=9588b9af-3fdc-3760-8043-82deeee317a5 datalen=3
+		0x4a,
+		0x95, 0x88, 0xb9, 0xaf, 0x3f, 0xdc, 0x37, 0x60,
+		0x80, 0x43, 0x82, 0xde, 0xee, 0xe3, 0x17, 0xa5,
+		0x03,
+		// (TEAM_FINISH) team=63 Time=1000
+		0x3f, 0xa8, 0x0f};
+
+	m_TH.RecordTeamFinish(63, 1000);
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
 TEST_F(TeeHistorian, PrevGameUuid)
 {
 	m_GameInfo.m_HavePrevGameUuid = true;
diff --git a/src/test/timestamp.cpp b/src/test/timestamp.cpp
new file mode 100644
index 0000000000..0b69348b88
--- /dev/null
+++ b/src/test/timestamp.cpp
@@ -0,0 +1,61 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <cstdlib>
+
+class TimestampTest : public testing::Test
+{
+protected:
+	void SetUp() override
+	{
+#if defined(CONF_FAMILY_WINDOWS)
+		_putenv_s("TZ", "UTC");
+		_tzset();
+#else
+		setenv("TZ", "UTC", 1);
+		tzset();
+#endif
+	}
+};
+
+TEST_F(TimestampTest, FromStr)
+{
+	time_t Timestamp;
+	EXPECT_TRUE(timestamp_from_str("2023-12-31_12-58-55", FORMAT_NOSPACE, &Timestamp));
+	EXPECT_EQ(Timestamp, 1704027535);
+
+	EXPECT_TRUE(timestamp_from_str("2012-02-29_13-00-00", FORMAT_NOSPACE, &Timestamp));
+	EXPECT_EQ(Timestamp, 1330520400);
+
+	EXPECT_TRUE(timestamp_from_str("2004-05-15 18:13:53", FORMAT_SPACE, &Timestamp));
+	EXPECT_EQ(Timestamp, 1084644833);
+}
+
+TEST_F(TimestampTest, FromStrFailing)
+{
+	time_t Timestamp;
+	// Invalid time string
+	EXPECT_FALSE(timestamp_from_str("123 2023-12-31_12-58-55", FORMAT_NOSPACE, &Timestamp));
+
+	// Invalid time string
+	EXPECT_FALSE(timestamp_from_str("555-02-29_13-12-7", FORMAT_NOSPACE, &Timestamp));
+
+	// Time string does not fit the format
+	EXPECT_FALSE(timestamp_from_str("2004-05-15 18-13-53", FORMAT_SPACE, &Timestamp));
+
+	// Invalid time string
+	EXPECT_FALSE(timestamp_from_str("2000-01-01 00:00:00:00", FORMAT_SPACE, &Timestamp));
+}
+
+TEST_F(TimestampTest, WithSpecifiedFormatAndTimestamp)
+{
+	char aTimestamp[20];
+	str_timestamp_ex(1704027535, aTimestamp, sizeof(aTimestamp), FORMAT_NOSPACE);
+	EXPECT_STREQ(aTimestamp, "2023-12-31_12-58-55");
+
+	str_timestamp_ex(1330520400, aTimestamp, sizeof(aTimestamp), FORMAT_NOSPACE);
+	EXPECT_STREQ(aTimestamp, "2012-02-29_13-00-00");
+
+	str_timestamp_ex(1084644833, aTimestamp, sizeof(aTimestamp), FORMAT_SPACE);
+	EXPECT_STREQ(aTimestamp, "2004-05-15 18:13:53");
+}
diff --git a/src/tools/config_retrieve.cpp b/src/tools/config_retrieve.cpp
index cb98053893..c290a273c7 100644
--- a/src/tools/config_retrieve.cpp
+++ b/src/tools/config_retrieve.cpp
@@ -16,10 +16,10 @@ void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
 	Reader.GetType(MAPITEMTYPE_INFO, &Start, &Num);
 	for(int i = Start; i < Start + Num; i++)
 	{
-		int ID;
-		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)Reader.GetItem(i, nullptr, &ID);
+		int Id;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)Reader.GetItem(i, nullptr, &Id);
 		int ItemSize = Reader.GetItemSize(i);
-		if(!pItem || ID != 0)
+		if(!pItem || Id != 0)
 			continue;
 
 		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
diff --git a/src/tools/config_store.cpp b/src/tools/config_store.cpp
index 0c06d05893..f173f6f017 100644
--- a/src/tools/config_store.cpp
+++ b/src/tools/config_store.cpp
@@ -8,37 +8,28 @@
 
 void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
 {
-	IOHANDLE File = pStorage->OpenFile(pConfigName, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ABSOLUTE);
-	if(!File)
+	CLineReader LineReader;
+	if(!LineReader.OpenFile(pStorage->OpenFile(pConfigName, IOFLAG_READ, IStorage::TYPE_ABSOLUTE)))
 	{
 		dbg_msg("config_store", "config '%s' not found", pConfigName);
 		return;
 	}
 
-	CLineReader LineReader;
-	LineReader.Init(File);
-
-	char *pLine;
+	std::vector<const char *> vpLines;
 	int TotalLength = 0;
-	std::vector<char *> vLines;
-	while((pLine = LineReader.Get()))
+	while(const char *pLine = LineReader.Get())
 	{
-		int Length = str_length(pLine) + 1;
-		char *pCopy = (char *)malloc(Length);
-		mem_copy(pCopy, pLine, Length);
-		vLines.push_back(pCopy);
-		TotalLength += Length;
+		vpLines.push_back(pLine);
+		TotalLength += str_length(pLine) + 1;
 	}
-	io_close(File);
 
 	char *pSettings = (char *)malloc(maximum(1, TotalLength));
 	int Offset = 0;
-	for(auto &Line : vLines)
+	for(const char *pLine : vpLines)
 	{
-		int Length = str_length(Line) + 1;
-		mem_copy(pSettings + Offset, Line, Length);
+		int Length = str_length(pLine) + 1;
+		mem_copy(pSettings + Offset, pLine, Length);
 		Offset += Length;
-		free(Line);
 	}
 
 	CDataFileReader Reader;
@@ -50,11 +41,11 @@ void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
 	bool FoundInfo = false;
 	for(int i = 0; i < Reader.NumItems(); i++)
 	{
-		int Type, ID;
-		int *pItem = (int *)Reader.GetItem(i, &Type, &ID);
+		int Type, Id;
+		int *pItem = (int *)Reader.GetItem(i, &Type, &Id);
 		int Size = Reader.GetItemSize(i);
 		CMapItemInfoSettings MapInfo;
-		if(Type == MAPITEMTYPE_INFO && ID == 0)
+		if(Type == MAPITEMTYPE_INFO && Id == 0)
 		{
 			FoundInfo = true;
 			CMapItemInfoSettings *pInfo = (CMapItemInfoSettings *)pItem;
@@ -92,7 +83,7 @@ void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
 				Size = sizeof(MapInfo);
 			}
 		}
-		Writer.AddItem(Type, ID, Size, pItem);
+		Writer.AddItem(Type, Id, Size, pItem);
 	}
 
 	if(!FoundInfo)
diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp
index f7b6b1fc8d..77f34217d5 100644
--- a/src/tools/crapnet.cpp
+++ b/src/tools/crapnet.cpp
@@ -15,7 +15,7 @@ struct SPacket
 
 	NETADDR m_SendTo;
 	int64_t m_Timestamp;
-	int m_ID;
+	int m_Id;
 	int m_DataSize;
 	char m_aData[1];
 };
@@ -51,7 +51,7 @@ void Run(unsigned short Port, NETADDR Dest)
 	NETADDR Src = {NETTYPE_IPV4, {0, 0, 0, 0}, Port};
 	NETSOCKET Socket = net_udp_create(Src);
 
-	int ID = 0;
+	int Id = 0;
 	int Delaycounter = 0;
 
 	while(true)
@@ -108,10 +108,10 @@ void Run(unsigned short Port, NETADDR Dest)
 			// set data in packet
 			p->m_Timestamp = time_get();
 			p->m_DataSize = Bytes;
-			p->m_ID = ID++;
+			p->m_Id = Id++;
 			mem_copy(p->m_aData, pData, Bytes);
 
-			if(ID > 20 && Bytes > 6 && DataTrash)
+			if(Id > 20 && Bytes > 6 && DataTrash)
 			{
 				p->m_aData[6 + (rand() % (Bytes - 6))] = rand() & 255; // modify a byte
 				if((rand() % 10) == 0)
@@ -134,7 +134,7 @@ void Run(unsigned short Port, NETADDR Dest)
 			{
 				char aAddrStr[NETADDR_MAXSTRSIZE];
 				net_addr_str(&From, aAddrStr, sizeof(aAddrStr), true);
-				dbg_msg("crapnet", "<< %08d %s (%d)", p->m_ID, aAddrStr, p->m_DataSize);
+				dbg_msg("crapnet", "<< %08d %s (%d)", p->m_Id, aAddrStr, p->m_DataSize);
 			}
 		}
 
@@ -176,7 +176,7 @@ void Run(unsigned short Port, NETADDR Dest)
 				int MsPing = Ping.m_Base;
 				g_CurrentLatency = ((time_freq() * MsPing) / 1000) + (int64_t)(((time_freq() * MsFlux) / 1000) * Flux); // 50ms
 
-				if(MsSpike && (p->m_ID % 100) == 0)
+				if(MsSpike && (p->m_Id % 100) == 0)
 				{
 					g_CurrentLatency += (time_freq() * MsSpike) / 1000;
 					aFlags[1] = 'S';
@@ -186,7 +186,7 @@ void Run(unsigned short Port, NETADDR Dest)
 				{
 					char aAddrStr[NETADDR_MAXSTRSIZE];
 					net_addr_str(&p->m_SendTo, aAddrStr, sizeof(aAddrStr), true);
-					dbg_msg("crapnet", ">> %08d %s (%d) %s", p->m_ID, aAddrStr, p->m_DataSize, aFlags);
+					dbg_msg("crapnet", ">> %08d %s (%d) %s", p->m_Id, aAddrStr, p->m_DataSize, aFlags);
 				}
 
 				free(p);
diff --git a/src/tools/demo_extract_chat.cpp b/src/tools/demo_extract_chat.cpp
index 82f1879e3d..323b139c9f 100644
--- a/src/tools/demo_extract_chat.cpp
+++ b/src/tools/demo_extract_chat.cpp
@@ -20,23 +20,17 @@ class CClientSnapshotHandler
 	};
 	CClientData m_aClients[MAX_CLIENTS];
 
-	CSnapshotStorage::CHolder m_aDemoSnapshotHolders[IClient::NUM_SNAPSHOT_TYPES];
-	char m_aaaDemoSnapshotData[IClient::NUM_SNAPSHOT_TYPES][2][CSnapshot::MAX_SIZE];
-	CSnapshotStorage::CHolder *m_apSnapshots[IClient::NUM_SNAPSHOT_TYPES];
+	char m_aaDemoSnapshotData[IClient::NUM_SNAPSHOT_TYPES][CSnapshot::MAX_SIZE];
+	CSnapshot *m_apAltSnapshots[IClient::NUM_SNAPSHOT_TYPES];
 
 	CClientSnapshotHandler() :
-		m_aClients(), m_aDemoSnapshotHolders()
+		m_aClients()
 	{
-		mem_zero(m_aaaDemoSnapshotData, sizeof(m_aaaDemoSnapshotData));
+		mem_zero(m_aaDemoSnapshotData, sizeof(m_aaDemoSnapshotData));
 
 		for(int SnapshotType = 0; SnapshotType < IClient::NUM_SNAPSHOT_TYPES; SnapshotType++)
 		{
-			m_apSnapshots[SnapshotType] = &m_aDemoSnapshotHolders[SnapshotType];
-			m_apSnapshots[SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][0];
-			m_apSnapshots[SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][1];
-			m_apSnapshots[SnapshotType]->m_SnapSize = 0;
-			m_apSnapshots[SnapshotType]->m_AltSnapSize = 0;
-			m_apSnapshots[SnapshotType]->m_Tick = -1;
+			m_apAltSnapshots[SnapshotType] = (CSnapshot *)&m_aaDemoSnapshotData[SnapshotType];
 		}
 	}
 
@@ -61,7 +55,7 @@ class CClientSnapshotHandler
 				continue;
 
 			const int ItemSize = NetObjHandler.GetUnpackedObjSize(ItemType);
-			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->Id(), ItemSize);
 			if(!pObj)
 				return -4;
 
@@ -71,22 +65,23 @@ class CClientSnapshotHandler
 		return Builder.Finish(pTo);
 	}
 
-	int SnapNumItems(int SnapID)
+	int SnapNumItems(int SnapId)
 	{
-		dbg_assert(SnapID >= 0 && SnapID < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapID");
-		if(!m_apSnapshots[SnapID])
-			return 0;
-		return m_apSnapshots[SnapID]->m_pAltSnap->NumItems();
+		dbg_assert(SnapId >= 0 && SnapId < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapId");
+		return m_apAltSnapshots[SnapId]->NumItems();
 	}
 
-	void *SnapGetItem(int SnapID, int Index, IClient::CSnapItem *pItem)
+	IClient::CSnapItem SnapGetItem(int SnapId, int Index)
 	{
-		dbg_assert(SnapID >= 0 && SnapID < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapID");
-		const CSnapshotItem *pSnapshotItem = m_apSnapshots[SnapID]->m_pAltSnap->GetItem(Index);
-		pItem->m_DataSize = m_apSnapshots[SnapID]->m_pAltSnap->GetItemSize(Index);
-		pItem->m_Type = m_apSnapshots[SnapID]->m_pAltSnap->GetItemType(Index);
-		pItem->m_ID = pSnapshotItem->ID();
-		return (void *)pSnapshotItem->Data();
+		dbg_assert(SnapId >= 0 && SnapId < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapId");
+		const CSnapshot *pSnapshot = m_apAltSnapshots[SnapId];
+		const CSnapshotItem *pSnapshotItem = m_apAltSnapshots[SnapId]->GetItem(Index);
+		IClient::CSnapItem Item;
+		Item.m_Type = pSnapshot->GetItemType(Index);
+		Item.m_Id = pSnapshotItem->Id();
+		Item.m_pData = pSnapshotItem->Data();
+		Item.m_DataSize = pSnapshot->GetItemSize(Index);
+		return Item;
 	}
 
 	void OnNewSnapshot()
@@ -94,17 +89,16 @@ class CClientSnapshotHandler
 		int Num = SnapNumItems(IClient::SNAP_CURRENT);
 		for(int i = 0; i < Num; i++)
 		{
-			IClient::CSnapItem Item;
-			const void *pData = SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+			const IClient::CSnapItem Item = SnapGetItem(IClient::SNAP_CURRENT, i);
 
 			if(Item.m_Type == NETOBJTYPE_CLIENTINFO)
 			{
-				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)pData;
-				int ClientID = Item.m_ID;
-				if(ClientID < MAX_CLIENTS)
+				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)Item.m_pData;
+				int ClientId = Item.m_Id;
+				if(ClientId < MAX_CLIENTS)
 				{
-					CClientData *pClient = &m_aClients[ClientID];
-					IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName);
+					CClientData *pClient = &m_aClients[ClientId];
+					IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName, sizeof(pClient->m_aName));
 				}
 			}
 		}
@@ -118,9 +112,8 @@ class CClientSnapshotHandler
 		if(AltSnapSize < 0)
 			return;
 
-		std::swap(m_apSnapshots[IClient::SNAP_PREV], m_apSnapshots[IClient::SNAP_CURRENT]);
-		mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pSnap, pData, Size);
-		mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
+		std::swap(m_apAltSnapshots[IClient::SNAP_PREV], m_apAltSnapshots[IClient::SNAP_CURRENT]);
+		mem_copy(m_apAltSnapshots[IClient::SNAP_CURRENT], pAltSnapBuffer, AltSnapSize);
 
 		OnNewSnapshot();
 	}
@@ -147,7 +140,7 @@ class CDemoPlayerMessageListener : public CDemoPlayer::IListener
 		bool Sys;
 		CUuid Uuid;
 
-		int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+		int Result = UnpackMessageId(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
 		if(Result == UNPACKMESSAGE_ERROR)
 			return;
 
@@ -158,27 +151,31 @@ class CDemoPlayerMessageListener : public CDemoPlayer::IListener
 			if(!pRawMsg)
 				return;
 
+			const IDemoPlayer::CInfo &Info = m_pDemoPlayer->Info()->m_Info;
+			char aTime[20];
+			str_time((int64_t)(Info.m_CurrentTick - Info.m_FirstTick) / SERVER_TICK_SPEED * 100, TIME_HOURS, aTime, sizeof(aTime));
+
 			if(Msg == NETMSGTYPE_SV_CHAT)
 			{
 				CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
 
-				if(pMsg->m_ClientID > -1 && m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName[0] == '\0')
+				if(pMsg->m_ClientId > -1 && m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientId].m_aName[0] == '\0')
 					return;
 
 				const char *Prefix = pMsg->m_Team > 1 ? "whisper" : (pMsg->m_Team ? "teamchat" : "chat");
 
-				if(pMsg->m_ClientID < 0)
+				if(pMsg->m_ClientId < 0)
 				{
-					printf("%s: *** %s\n", Prefix, pMsg->m_pMessage);
+					printf("[%s] %s: *** %s\n", aTime, Prefix, pMsg->m_pMessage);
 					return;
 				}
 
-				if(pMsg->m_Team == 2) // WHISPER SEND
-					printf("%s: -> %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
-				else if(pMsg->m_Team == 3) // WHISPER RECEIVE
-					printf("%s: <- %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
+				if(pMsg->m_Team == TEAM_WHISPER_SEND)
+					printf("[%s] %s: -> %s: %s\n", aTime, Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientId].m_aName, pMsg->m_pMessage);
+				else if(pMsg->m_Team == TEAM_WHISPER_RECV)
+					printf("[%s] %s: <- %s: %s\n", aTime, Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientId].m_aName, pMsg->m_pMessage);
 				else
-					printf("%s: %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
+					printf("[%s] %s: %s: %s\n", aTime, Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientId].m_aName, pMsg->m_pMessage);
 			}
 			else if(Msg == NETMSGTYPE_SV_BROADCAST)
 			{
@@ -188,7 +185,7 @@ class CDemoPlayerMessageListener : public CDemoPlayer::IListener
 				{
 					if(aBroadcast[0] != '\0')
 					{
-						printf("broadcast: %s\n", aBroadcast);
+						printf("[%s] broadcast: %s\n", aTime, aBroadcast);
 					}
 				}
 			}
diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
index 73d3308746..d4246a26b9 100644
--- a/src/tools/dilate.cpp
+++ b/src/tools/dilate.cpp
@@ -1,91 +1,49 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
 #include <base/logger.h>
 #include <base/system.h>
+
 #include <engine/gfx/image_loader.h>
 #include <engine/gfx/image_manipulation.h>
-#include <engine/graphics.h>
 
-int DilateFile(const char *pFilename)
+static bool DilateFile(const char *pFilename)
 {
-	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
-	if(File)
-	{
-		io_seek(File, 0, IOSEEK_END);
-		unsigned int FileSize = io_tell(File);
-		io_seek(File, 0, IOSEEK_START);
-		TImageByteBuffer ByteBuffer;
-		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-		ByteBuffer.resize(FileSize);
-		io_read(File, &ByteBuffer.front(), FileSize);
-
-		io_close(File);
-
-		CImageInfo Img;
-
-		uint8_t *pImgBuffer = NULL;
-		EImageFormat ImageFormat;
-		int PngliteIncompatible;
-		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, Img.m_Width, Img.m_Height, pImgBuffer, ImageFormat))
-		{
-			if(ImageFormat != IMAGE_FORMAT_RGBA)
-			{
-				free(pImgBuffer);
-				dbg_msg("dilate", "%s: not an RGBA image", pFilename);
-				return -1;
-			}
-
-			Img.m_pData = pImgBuffer;
-
-			unsigned char *pBuffer = (unsigned char *)Img.m_pData;
-
-			int w = Img.m_Width;
-			int h = Img.m_Height;
-
-			DilateImage(pBuffer, w, h);
+	CImageInfo Image;
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(io_open(pFilename, IOFLAG_READ), pFilename, Image, PngliteIncompatible))
+		return false;
 
-			// save here
-			IOHANDLE SaveFile = io_open(pFilename, IOFLAG_WRITE);
-			if(SaveFile)
-			{
-				TImageByteBuffer ByteBuffer2;
-				SImageByteBuffer ImageByteBuffer2(&ByteBuffer2);
-
-				if(SavePNG(IMAGE_FORMAT_RGBA, (const uint8_t *)pBuffer, ImageByteBuffer2, w, h))
-					io_write(SaveFile, &ByteBuffer2.front(), ByteBuffer2.size());
-				io_close(SaveFile);
-
-				free(pBuffer);
-			}
-		}
-		else
-		{
-			dbg_msg("dilate", "failed unknown image format: %s", pFilename);
-			return -1;
-		}
-	}
-	else
+	if(Image.m_Format != CImageInfo::FORMAT_RGBA)
 	{
-		dbg_msg("dilate", "failed to open image file. filename='%s'", pFilename);
-		return -1;
+		log_error("dilate", "ERROR: only RGBA PNG images are supported");
+		Image.Free();
+		return false;
 	}
 
-	return 0;
+	DilateImage(Image);
+
+	const bool SaveResult = CImageLoader::SavePng(io_open(pFilename, IOFLAG_WRITE), pFilename, Image);
+	Image.Free();
+
+	return SaveResult;
 }
 
 int main(int argc, const char **argv)
 {
 	CCmdlineFix CmdlineFix(&argc, &argv);
 	log_set_global_logger_default();
+
 	if(argc == 1)
 	{
-		dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
+		log_error("dilate", "Usage: %s <image1.png> [<image2.png> ...]", argv[0]);
 		return -1;
 	}
 
+	bool Success = true;
 	for(int i = 1; i < argc; i++)
-		DilateFile(argv[i]);
-
-	return 0;
+	{
+		Success &= DilateFile(argv[i]);
+	}
+	return Success ? 0 : -1;
 }
diff --git a/src/tools/dummy_map.cpp b/src/tools/dummy_map.cpp
index db2f76f538..a211cc307c 100644
--- a/src/tools/dummy_map.cpp
+++ b/src/tools/dummy_map.cpp
@@ -7,6 +7,8 @@
 
 #include <game/mapitems.h>
 
+#include <zlib.h>
+
 void CreateEmptyMap(IStorage *pStorage)
 {
 	const char *pMapName = "maps/dummy3.map";
@@ -90,7 +92,7 @@ void CreateEmptyMap(IStorage *pStorage)
 	unsigned char *pDataChar = static_cast<unsigned char *>(pData);
 
 	unsigned Crc = crc32(0, pDataChar, DataSize);
-	SHA256_DIGEST Sha256 = sha256(&pDataChar, DataSize);
+	SHA256_DIGEST Sha256 = sha256(pDataChar, DataSize);
 
 	char aMapSha[SHA256_MAXSTRSIZE];
 	sha256_str(Sha256, aMapSha, sizeof(aMapSha));
diff --git a/src/tools/map_convert_07.cpp b/src/tools/map_convert_07.cpp
index ebd6f56787..b64d051dca 100644
--- a/src/tools/map_convert_07.cpp
+++ b/src/tools/map_convert_07.cpp
@@ -3,12 +3,14 @@
 
 #include <base/logger.h>
 #include <base/system.h>
+
 #include <engine/gfx/image_loader.h>
-#include <engine/graphics.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
+
 #include <game/gamecore.h>
 #include <game/mapitems.h>
+
 /*
 	Usage: map_convert_07 <source map filepath> <dest map filepath>
 */
@@ -21,50 +23,9 @@ int g_aNewDataSize[MAX_MAPIMAGES];
 void *g_apNewData[MAX_MAPIMAGES];
 
 int g_Index = 0;
-int g_NextDataItemID = -1;
-
-int g_aImageIDs[MAX_MAPIMAGES];
-
-int LoadPNG(CImageInfo *pImg, const char *pFilename)
-{
-	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
-	if(File)
-	{
-		io_seek(File, 0, IOSEEK_END);
-		unsigned int FileSize = io_tell(File);
-		io_seek(File, 0, IOSEEK_START);
-		TImageByteBuffer ByteBuffer;
-		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-		ByteBuffer.resize(FileSize);
-		io_read(File, &ByteBuffer.front(), FileSize);
-
-		io_close(File);
+int g_NextDataItemId = -1;
 
-		uint8_t *pImgBuffer = NULL;
-		EImageFormat ImageFormat;
-		int PngliteIncompatible;
-		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
-		{
-			pImg->m_pData = pImgBuffer;
-
-			if(ImageFormat == IMAGE_FORMAT_RGBA && pImg->m_Width <= (2 << 13) && pImg->m_Height <= (2 << 13))
-			{
-				pImg->m_Format = CImageInfo::FORMAT_RGBA;
-			}
-			else
-			{
-				dbg_msg("map_convert_07", "invalid image format. filename='%s'", pFilename);
-				return 0;
-			}
-		}
-		else
-			return 0;
-	}
-	else
-		return 0;
-	return 1;
-}
+int g_aImageIds[MAX_MAPIMAGES];
 
 bool CheckImageDimensions(void *pLayerItem, int LayerType, const char *pFilename)
 {
@@ -80,7 +41,7 @@ bool CheckImageDimensions(void *pLayerItem, int LayerType, const char *pFilename
 		return true;
 
 	int Type;
-	void *pItem = g_DataReader.GetItem(g_aImageIDs[pTMap->m_Image], &Type);
+	void *pItem = g_DataReader.GetItem(g_aImageIds[pTMap->m_Image], &Type);
 	if(Type != MAPITEMTYPE_IMAGE)
 		return true;
 
@@ -90,7 +51,7 @@ bool CheckImageDimensions(void *pLayerItem, int LayerType, const char *pFilename
 		return true;
 
 	char aTileLayerName[12];
-	IntsToStr(pTMap->m_aName, sizeof(pTMap->m_aName) / sizeof(int), aTileLayerName);
+	IntsToStr(pTMap->m_aName, std::size(pTMap->m_aName), aTileLayerName, std::size(aTileLayerName));
 
 	const char *pName = g_DataReader.GetDataString(pImgItem->m_ImageName);
 	dbg_msg("map_convert_07", "%s: Tile layer \"%s\" uses image \"%s\" with width %d, height %d, which is not divisible by 16. This is not supported in Teeworlds 0.7. Please scale the image and replace it manually.", pFilename, aTileLayerName, pName == nullptr ? "(error)" : pName, pImgItem->m_Width, pImgItem->m_Height);
@@ -111,15 +72,19 @@ void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, CMapItemImage *pNewIm
 
 	dbg_msg("map_convert_07", "embedding image '%s'", pName);
 
-	CImageInfo ImgInfo;
 	char aStr[IO_MAX_PATH_LENGTH];
 	str_format(aStr, sizeof(aStr), "data/mapres/%s.png", pName);
-	if(!LoadPNG(&ImgInfo, aStr))
+
+	CImageInfo ImgInfo;
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(io_open(aStr, IOFLAG_READ), aStr, ImgInfo, PngliteIncompatible))
 		return pImgItem; // keep as external if we don't have a mapres to replace
 
-	if(ImgInfo.m_Format != CImageInfo::FORMAT_RGBA)
+	const size_t MaxImageDimension = 1 << 13;
+	if(ImgInfo.m_Format != CImageInfo::FORMAT_RGBA || ImgInfo.m_Width > MaxImageDimension || ImgInfo.m_Height > MaxImageDimension)
 	{
-		dbg_msg("map_convert_07", "image '%s' is not in RGBA format", aStr);
+		dbg_msg("map_convert_07", "ERROR: only RGBA PNG images with maximum width/height %" PRIzu " are supported", MaxImageDimension);
+		ImgInfo.Free();
 		return pImgItem;
 	}
 
@@ -128,10 +93,10 @@ void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, CMapItemImage *pNewIm
 	pNewImgItem->m_Width = ImgInfo.m_Width;
 	pNewImgItem->m_Height = ImgInfo.m_Height;
 	pNewImgItem->m_External = false;
-	pNewImgItem->m_ImageData = g_NextDataItemID++;
+	pNewImgItem->m_ImageData = g_NextDataItemId++;
 
 	g_apNewData[g_Index] = ImgInfo.m_pData;
-	g_aNewDataSize[g_Index] = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * ImgInfo.PixelSize();
+	g_aNewDataSize[g_Index] = ImgInfo.DataSize();
 	g_Index++;
 
 	return (void *)pNewImgItem;
@@ -193,7 +158,7 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-	g_NextDataItemID = g_DataReader.NumData();
+	g_NextDataItemId = g_DataReader.NumData();
 
 	size_t i = 0;
 	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
@@ -207,7 +172,7 @@ int main(int argc, const char **argv)
 				dbg_msg("map_convert_07", "map uses more images than the client maximum of %" PRIzu ". filename='%s'", MAX_MAPIMAGES, pSourceFileName);
 				break;
 			}
-			g_aImageIDs[i] = Index;
+			g_aImageIds[i] = Index;
 			i++;
 		}
 	}
@@ -217,16 +182,17 @@ int main(int argc, const char **argv)
 	// add all items
 	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
 	{
-		int Type, ID;
-		void *pItem = g_DataReader.GetItem(Index, &Type, &ID);
-		int Size = g_DataReader.GetItemSize(Index);
+		int Type, Id;
+		CUuid Uuid;
+		void *pItem = g_DataReader.GetItem(Index, &Type, &Id, &Uuid);
 
-		// filter ITEMTYPE_EX items, they will be automatically added again
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
 		{
 			continue;
 		}
 
+		int Size = g_DataReader.GetItemSize(Index);
 		Success &= CheckImageDimensions(pItem, Type, pSourceFileName);
 
 		CMapItemImage NewImageItem;
@@ -238,7 +204,7 @@ int main(int argc, const char **argv)
 			Size = sizeof(CMapItemImage);
 			NewImageItem.m_Version = CMapItemImage::CURRENT_VERSION;
 		}
-		g_DataWriter.AddItem(Type, ID, Size, pItem);
+		g_DataWriter.AddItem(Type, Id, Size, pItem, &Uuid);
 	}
 
 	// add all data
diff --git a/src/tools/map_create_pixelart.cpp b/src/tools/map_create_pixelart.cpp
index 52d54d471e..3d3ae5edc3 100644
--- a/src/tools/map_create_pixelart.cpp
+++ b/src/tools/map_create_pixelart.cpp
@@ -1,37 +1,37 @@
 #include <base/logger.h>
 #include <base/system.h>
+
 #include <engine/gfx/image_loader.h>
-#include <engine/graphics.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
+
 #include <game/mapitems.h>
 
-bool CreatePixelArt(const char[3][64], const int[2], const int[2], int[2], const bool[2]);
+bool CreatePixelArt(const char[3][IO_MAX_PATH_LENGTH], const int[2], const int[2], int[2], const bool[2]);
 void InsertCurrentQuads(CDataFileReader &, CMapItemLayerQuads *, CQuad *);
 int InsertPixelArtQuads(CQuad *, int &, const CImageInfo &, const int[2], const int[2], const bool[2]);
 
-bool LoadPNG(CImageInfo *, const char *);
-bool OpenMaps(const char[2][64], CDataFileReader &, CDataFileWriter &);
+bool OpenMaps(const char[2][IO_MAX_PATH_LENGTH], CDataFileReader &, CDataFileWriter &);
 void SaveOutputMap(CDataFileReader &, CDataFileWriter &, CMapItemLayerQuads *, int, CQuad *, int);
 
 CMapItemLayerQuads *GetQuadLayer(CDataFileReader &, const int[2], int *);
 CQuad CreateNewQuad(float, float, int, int, const uint8_t[4], const int[2]);
 
-bool GetPixelClamped(const CImageInfo &, int, int, uint8_t[4]);
+bool GetPixelClamped(const CImageInfo &, size_t, size_t, uint8_t[4]);
 bool ComparePixel(const uint8_t[4], const uint8_t[4]);
-bool IsPixelOptimizable(const CImageInfo &, int, int, const uint8_t[4], const bool[]);
-void SetVisitedPixels(const CImageInfo &, int, int, int, int, bool[]);
+bool IsPixelOptimizable(const CImageInfo &, size_t, size_t, const uint8_t[4], const bool[]);
+void SetVisitedPixels(const CImageInfo &, size_t, size_t, size_t, size_t, bool[]);
 
-int GetImagePixelSize(const CImageInfo &);
-int FindSuperPixelSize(const CImageInfo &, const uint8_t[4], int, int, int, bool[]);
-void GetOptimizedQuadSize(const CImageInfo &, int, const uint8_t[4], int, int, int &, int &, bool[]);
+size_t GetImagePixelSize(const CImageInfo &);
+size_t FindSuperPixelSize(const CImageInfo &, const uint8_t[4], size_t, size_t, size_t, bool[]);
+void GetOptimizedQuadSize(const CImageInfo &, size_t, const uint8_t[4], size_t, size_t, size_t &, size_t &, bool[]);
 
 int main(int argc, const char **argv)
 {
 	CCmdlineFix CmdlineFix(&argc, &argv);
 	log_set_global_logger_default();
 
-	if(argc < 9 || argc > 12)
+	if(argc < 10 || argc > 12)
 	{
 		dbg_msg("map_create_pixelart", "Invalid arguments");
 		dbg_msg("map_create_pixelart", "Usage: %s <image.png> <img_pixelsize> <input_map> <layergroup_id> <layer_id> <pos_x> <pos_y> <quad_pixelsize> <output_map> [optimize=0|1] [centralize=0|1]", argv[0]);
@@ -45,29 +45,36 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-	char aFilenames[3][64];
+	char aFilenames[3][IO_MAX_PATH_LENGTH];
 	str_copy(aFilenames[0], argv[3]); //input_map
 	str_copy(aFilenames[1], argv[9]); //output_map
 	str_copy(aFilenames[2], argv[1]); //image_file
 
-	int aLayerID[2] = {str_toint(argv[4]), str_toint(argv[5])}; //layergroup_id, layer_id
+	if(str_comp_filenames(aFilenames[0], aFilenames[1]) == 0)
+	{
+		dbg_msg("map_create_pixelart", "Invalid usage: you can not use the same map as input and output");
+		return -1;
+	}
+
+	int aLayerId[2] = {str_toint(argv[4]), str_toint(argv[5])}; //layergroup_id, layer_id
 	int aStartingPos[2] = {str_toint(argv[6]) * 32, str_toint(argv[7]) * 32}; //pos_x, pos_y
 	int aPixelSizes[2] = {str_toint(argv[2]), str_toint(argv[8])}; //quad_pixelsize, img_pixelsize
 
 	bool aArtOptions[3];
-	aArtOptions[0] = argc >= 10 ? str_toint(argv[10]) : true; //optimize
-	aArtOptions[1] = argc >= 11 ? str_toint(argv[11]) : false; //centralize
+	aArtOptions[0] = argc > 10 ? str_toint(argv[10]) : true; //optimize
+	aArtOptions[1] = argc > 11 ? str_toint(argv[11]) : false; //centralize
 
 	dbg_msg("map_create_pixelart", "image_file='%s'; image_pixelsize='%dpx'; input_map='%s'; layergroup_id='#%d'; layer_id='#%d'; pos_x='#%dpx'; pos_y='%dpx'; quad_pixelsize='%dpx'; output_map='%s'; optimize='%d'; centralize='%d'",
-		aFilenames[2], aPixelSizes[0], aFilenames[1], aLayerID[0], aLayerID[1], aStartingPos[0], aStartingPos[1], aPixelSizes[1], aFilenames[2], aArtOptions[0], aArtOptions[1]);
+		aFilenames[2], aPixelSizes[0], aFilenames[0], aLayerId[0], aLayerId[1], aStartingPos[0], aStartingPos[1], aPixelSizes[1], aFilenames[1], aArtOptions[0], aArtOptions[1]);
 
-	return !CreatePixelArt(aFilenames, aLayerID, aStartingPos, aPixelSizes, aArtOptions);
+	return !CreatePixelArt(aFilenames, aLayerId, aStartingPos, aPixelSizes, aArtOptions);
 }
 
-bool CreatePixelArt(const char aFilenames[3][64], const int aLayerID[2], const int aStartingPos[2], int aPixelSizes[2], const bool aArtOptions[2])
+bool CreatePixelArt(const char aFilenames[3][IO_MAX_PATH_LENGTH], const int aLayerId[2], const int aStartingPos[2], int aPixelSizes[2], const bool aArtOptions[2])
 {
 	CImageInfo Img;
-	if(!LoadPNG(&Img, aFilenames[2]))
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(io_open(aFilenames[2], IOFLAG_READ), aFilenames[2], Img, PngliteIncompatible))
 		return false;
 
 	aPixelSizes[0] = aPixelSizes[0] ? aPixelSizes[0] : GetImagePixelSize(Img);
@@ -79,16 +86,16 @@ bool CreatePixelArt(const char aFilenames[3][64], const int aLayerID[2], const i
 		return false;
 
 	int ItemNumber = 0;
-	CMapItemLayerQuads *pQuadLayer = GetQuadLayer(InputMap, aLayerID, &ItemNumber);
+	CMapItemLayerQuads *pQuadLayer = GetQuadLayer(InputMap, aLayerId, &ItemNumber);
 	if(!pQuadLayer)
 		return false;
 
-	int MaxNewQuads = std::ceil((Img.m_Width * Img.m_Height) / aPixelSizes[0]);
+	size_t MaxNewQuads = std::ceil((Img.m_Width * Img.m_Height) / aPixelSizes[0]);
 	CQuad *pQuads = new CQuad[pQuadLayer->m_NumQuads + MaxNewQuads];
 
 	InsertCurrentQuads(InputMap, pQuadLayer, pQuads);
 	int QuadsCounter = InsertPixelArtQuads(pQuads, pQuadLayer->m_NumQuads, Img, aStartingPos, aPixelSizes, aArtOptions);
-	SaveOutputMap(InputMap, OutputMap, pQuadLayer, ItemNumber, pQuads, ((int)sizeof(CQuad)) * (pQuadLayer->m_NumQuads + 1));
+	SaveOutputMap(InputMap, OutputMap, pQuadLayer, ItemNumber, pQuads, (int)sizeof(CQuad) * pQuadLayer->m_NumQuads);
 	delete[] pQuads;
 
 	dbg_msg("map_create_pixelart", "INFO: successfully added %d new pixelart quads.", QuadsCounter);
@@ -104,19 +111,19 @@ void InsertCurrentQuads(CDataFileReader &InputMap, CMapItemLayerQuads *pQuadLaye
 
 int InsertPixelArtQuads(CQuad *pQuads, int &NumQuads, const CImageInfo &Img, const int aStartingPos[2], const int aPixelSizes[2], const bool aArtOptions[2])
 {
-	int ImgPixelSize = aPixelSizes[0], QuadPixelSize = aPixelSizes[1], OriginalNumQuads = NumQuads;
+	size_t ImgPixelSize = aPixelSizes[0], QuadPixelSize = aPixelSizes[1], OriginalNumQuads = NumQuads;
 	int aForcedPivot[2] = {std::numeric_limits<int>::max(), std::numeric_limits<int>::max()};
 	bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width];
 	mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width);
 
-	for(int y = 0; y < Img.m_Height; y += ImgPixelSize)
-		for(int x = 0; x < Img.m_Width; x += ImgPixelSize)
+	for(size_t y = 0; y < Img.m_Height; y += ImgPixelSize)
+		for(size_t x = 0; x < Img.m_Width; x += ImgPixelSize)
 		{
 			uint8_t aPixel[4];
 			if(aVisitedPixels[x + y * Img.m_Width] || !GetPixelClamped(Img, x, y, aPixel))
 				continue;
 
-			int Width = 1, Height = 1;
+			size_t Width = 1, Height = 1;
 			if(aArtOptions[0])
 				GetOptimizedQuadSize(Img, ImgPixelSize, aPixel, x, y, Width, Height, aVisitedPixels);
 
@@ -136,9 +143,9 @@ int InsertPixelArtQuads(CQuad *pQuads, int &NumQuads, const CImageInfo &Img, con
 	return NumQuads - OriginalNumQuads;
 }
 
-void GetOptimizedQuadSize(const CImageInfo &Img, const int ImgPixelSize, const uint8_t aPixel[4], const int PosX, const int PosY, int &Width, int &Height, bool aVisitedPixels[])
+void GetOptimizedQuadSize(const CImageInfo &Img, const size_t ImgPixelSize, const uint8_t aPixel[4], const size_t PosX, const size_t PosY, size_t &Width, size_t &Height, bool aVisitedPixels[])
 {
-	int w = 0, h = 0, OptimizedWidth = 0, OptimizedHeight = 0;
+	size_t w = 0, h = 0, OptimizedWidth = 0, OptimizedHeight = 0;
 
 	while(IsPixelOptimizable(Img, PosX + w, PosY + h, aPixel, aVisitedPixels))
 	{
@@ -158,31 +165,31 @@ void GetOptimizedQuadSize(const CImageInfo &Img, const int ImgPixelSize, const u
 	Height = OptimizedHeight / ImgPixelSize;
 }
 
-int GetImagePixelSize(const CImageInfo &Img)
+size_t GetImagePixelSize(const CImageInfo &Img)
 {
-	int ImgPixelSize = std::numeric_limits<int>::max();
+	size_t ImgPixelSize = std::numeric_limits<size_t>::max();
 	bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width];
 	mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width);
 
-	for(int y = 0; y < Img.m_Height && ImgPixelSize > 1; y++)
-		for(int x = 0; x < Img.m_Width && ImgPixelSize > 1; x++)
+	for(size_t y = 0; y < Img.m_Height && ImgPixelSize > 1; y++)
+		for(size_t x = 0; x < Img.m_Width && ImgPixelSize > 1; x++)
 		{
 			uint8_t aPixel[4];
 			if(aVisitedPixels[x + y * Img.m_Width])
 				continue;
 
 			GetPixelClamped(Img, x, y, aPixel);
-			int SuperPixelSize = FindSuperPixelSize(Img, aPixel, x, y, 1, aVisitedPixels);
+			size_t SuperPixelSize = FindSuperPixelSize(Img, aPixel, x, y, 1, aVisitedPixels);
 			if(SuperPixelSize < ImgPixelSize)
 				ImgPixelSize = SuperPixelSize;
 		}
 	delete[] aVisitedPixels;
 
-	dbg_msg("map_create_pixelart", "INFO: automatically detected img_pixelsize of %dpx", ImgPixelSize);
+	dbg_msg("map_create_pixelart", "INFO: automatically detected img_pixelsize of %" PRIzu "px", ImgPixelSize);
 	return ImgPixelSize;
 }
 
-int FindSuperPixelSize(const CImageInfo &Img, const uint8_t aPixel[4], const int PosX, const int PosY, const int CurrentSize, bool aVisitedPixels[])
+size_t FindSuperPixelSize(const CImageInfo &Img, const uint8_t aPixel[4], const size_t PosX, const size_t PosY, const size_t CurrentSize, bool aVisitedPixels[])
 {
 	if(PosX + CurrentSize >= Img.m_Width || PosY + CurrentSize >= Img.m_Height)
 	{
@@ -192,10 +199,10 @@ int FindSuperPixelSize(const CImageInfo &Img, const uint8_t aPixel[4], const int
 
 	for(int i = 0; i < 2; i++)
 	{
-		for(int j = 0; j < CurrentSize + 1; j++)
+		for(size_t j = 0; j < CurrentSize + 1; j++)
 		{
 			uint8_t aCheckPixel[4];
-			int x = PosX, y = PosY;
+			size_t x = PosX, y = PosY;
 			x += i == 0 ? j : CurrentSize;
 			y += i == 0 ? CurrentSize : j;
 
@@ -211,18 +218,18 @@ int FindSuperPixelSize(const CImageInfo &Img, const uint8_t aPixel[4], const int
 	return FindSuperPixelSize(Img, aPixel, PosX, PosY, CurrentSize + 1, aVisitedPixels);
 }
 
-bool GetPixelClamped(const CImageInfo &Img, int x, int y, uint8_t aPixel[4])
+bool GetPixelClamped(const CImageInfo &Img, size_t x, size_t y, uint8_t aPixel[4])
 {
-	x = clamp<int>(x, 0, (int)Img.m_Width - 1);
-	y = clamp<int>(y, 0, (int)Img.m_Height - 1);
+	x = clamp<size_t>(x, 0, Img.m_Width - 1);
+	y = clamp<size_t>(y, 0, Img.m_Height - 1);
 	aPixel[0] = 255;
 	aPixel[1] = 255;
 	aPixel[2] = 255;
 	aPixel[3] = 255;
 
 	const size_t PixelSize = Img.PixelSize();
-	for(size_t i = 0; i < PixelSize; i++)
-		aPixel[i] = ((uint8_t *)Img.m_pData)[x * PixelSize + (Img.m_Width * PixelSize * y) + i];
+	for(size_t i = 0; i < minimum<size_t>(4, PixelSize); i++) // minimum is used here to avoid false positive stringop-overflow warning
+		aPixel[i] = Img.m_pData[x * PixelSize + (Img.m_Width * PixelSize * y) + i];
 
 	return aPixel[3] > 0;
 }
@@ -235,45 +242,45 @@ bool ComparePixel(const uint8_t aPixel1[4], const uint8_t aPixel2[4])
 	return true;
 }
 
-bool IsPixelOptimizable(const CImageInfo &Img, const int PosX, const int PosY, const uint8_t aPixel[4], const bool aVisitedPixels[])
+bool IsPixelOptimizable(const CImageInfo &Img, const size_t PosX, const size_t PosY, const uint8_t aPixel[4], const bool aVisitedPixels[])
 {
 	uint8_t aCheckPixel[4];
 	return PosX < Img.m_Width && PosY < Img.m_Height && !aVisitedPixels[PosX + PosY * Img.m_Width] && GetPixelClamped(Img, PosX, PosY, aCheckPixel) && ComparePixel(aPixel, aCheckPixel);
 }
 
-void SetVisitedPixels(const CImageInfo &Img, int PosX, int PosY, int Width, int Height, bool aVisitedPixels[])
+void SetVisitedPixels(const CImageInfo &Img, size_t PosX, size_t PosY, size_t Width, size_t Height, bool aVisitedPixels[])
 {
-	for(int y = PosY; y < PosY + Height; y++)
-		for(int x = PosX; x < PosX + Width; x++)
+	for(size_t y = PosY; y < PosY + Height; y++)
+		for(size_t x = PosX; x < PosX + Width; x++)
 			aVisitedPixels[x + y * Img.m_Width] = true;
 }
 
-CMapItemLayerQuads *GetQuadLayer(CDataFileReader &InputMap, const int aLayerID[2], int *pItemNumber)
+CMapItemLayerQuads *GetQuadLayer(CDataFileReader &InputMap, const int aLayerId[2], int *pItemNumber)
 {
 	int Start, Num;
 	InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
 
-	CMapItemGroup *pGroupItem = aLayerID[0] >= Num ? 0x0 : (CMapItemGroup *)InputMap.GetItem(Start + aLayerID[0]);
+	CMapItemGroup *pGroupItem = aLayerId[0] >= Num ? 0x0 : (CMapItemGroup *)InputMap.GetItem(Start + aLayerId[0]);
 
 	if(!pGroupItem)
 	{
-		dbg_msg("map_create_pixelart", "ERROR: unable to find layergroup '#%d'", aLayerID[0]);
+		dbg_msg("map_create_pixelart", "ERROR: unable to find layergroup '#%d'", aLayerId[0]);
 		return 0x0;
 	}
 
 	InputMap.GetType(MAPITEMTYPE_LAYER, &Start, &Num);
-	*pItemNumber = Start + pGroupItem->m_StartLayer + aLayerID[1];
+	*pItemNumber = Start + pGroupItem->m_StartLayer + aLayerId[1];
 
-	CMapItemLayer *pLayerItem = aLayerID[1] >= pGroupItem->m_NumLayers ? 0x0 : (CMapItemLayer *)InputMap.GetItem(*pItemNumber);
+	CMapItemLayer *pLayerItem = aLayerId[1] >= pGroupItem->m_NumLayers ? 0x0 : (CMapItemLayer *)InputMap.GetItem(*pItemNumber);
 	if(!pLayerItem)
 	{
-		dbg_msg("map_create_pixelart", "ERROR: unable to find layer '#%d' in group '#%d'", aLayerID[1], aLayerID[0]);
+		dbg_msg("map_create_pixelart", "ERROR: unable to find layer '#%d' in group '#%d'", aLayerId[1], aLayerId[0]);
 		return 0x0;
 	}
 
 	if(pLayerItem->m_Type != LAYERTYPE_QUADS)
 	{
-		dbg_msg("map_create_pixelart", "ERROR: layer '#%d' in group '#%d' is not a quad layer", aLayerID[1], aLayerID[0]);
+		dbg_msg("map_create_pixelart", "ERROR: layer '#%d' in group '#%d' is not a quad layer", aLayerId[1], aLayerId[0]);
 		return 0x0;
 	}
 
@@ -309,49 +316,7 @@ CQuad CreateNewQuad(const float PosX, const float PosY, const int Width, const i
 	return Quad;
 }
 
-bool LoadPNG(CImageInfo *pImg, const char *pFilename)
-{
-	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
-	if(!File)
-	{
-		dbg_msg("map_create_pixelart", "ERROR: Unable to open file %s", pFilename);
-		return false;
-	}
-
-	io_seek(File, 0, IOSEEK_END);
-	unsigned int FileSize = io_tell(File);
-	io_seek(File, 0, IOSEEK_START);
-	TImageByteBuffer ByteBuffer;
-	SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-	ByteBuffer.resize(FileSize);
-	io_read(File, &ByteBuffer.front(), FileSize);
-	io_close(File);
-
-	uint8_t *pImgBuffer = NULL;
-	EImageFormat ImageFormat;
-	int PngliteIncompatible;
-
-	if(!LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
-	{
-		dbg_msg("map_create_pixelart", "ERROR: Unable to load a valid PNG from file %s", pFilename);
-		return false;
-	}
-
-	if(ImageFormat != IMAGE_FORMAT_RGBA && ImageFormat != IMAGE_FORMAT_RGB)
-	{
-		dbg_msg("map_create_pixelart", "ERROR: only RGB and RGBA PNG images are supported");
-		free(pImgBuffer);
-		return false;
-	}
-
-	pImg->m_pData = pImgBuffer;
-	pImg->m_Format = ImageFormat == IMAGE_FORMAT_RGB ? CImageInfo::FORMAT_RGB : CImageInfo::FORMAT_RGBA;
-
-	return true;
-}
-
-bool OpenMaps(const char pMapNames[2][64], CDataFileReader &InputMap, CDataFileWriter &OutputMap)
+bool OpenMaps(const char pMapNames[2][IO_MAX_PATH_LENGTH], CDataFileReader &InputMap, CDataFileWriter &OutputMap)
 {
 	IStorage *pStorage = CreateLocalStorage();
 
@@ -374,16 +339,21 @@ void SaveOutputMap(CDataFileReader &InputMap, CDataFileWriter &OutputMap, CMapIt
 {
 	for(int i = 0; i < InputMap.NumItems(); i++)
 	{
-		int ID, Type;
-		void *pItem = InputMap.GetItem(i, &Type, &ID);
+		int Id, Type;
+		CUuid Uuid;
+		void *pItem = InputMap.GetItem(i, &Type, &Id, &Uuid);
 
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
+		{
 			continue;
+		}
+
 		if(i == NewItemNumber)
 			pItem = pNewItem;
 
 		int Size = InputMap.GetItemSize(i);
-		OutputMap.AddItem(Type, ID, Size, pItem);
+		OutputMap.AddItem(Type, Id, Size, pItem, &Uuid);
 	}
 
 	for(int i = 0; i < InputMap.NumData(); i++)
diff --git a/src/tools/map_diff.cpp b/src/tools/map_diff.cpp
index 34155649eb..eb2ccb82b3 100644
--- a/src/tools/map_diff.cpp
+++ b/src/tools/map_diff.cpp
@@ -60,12 +60,12 @@ bool Process(IStorage *pStorage, const char **pMapNames)
 			continue;
 
 		CMapItemLayerTilemap *apTilemap[2];
-		char aaName[2][16];
+		char aaName[2][12];
 
 		for(int i = 0; i < 2; ++i)
 		{
 			apTilemap[i] = (CMapItemLayerTilemap *)apItem[i];
-			IntsToStr(apTilemap[i]->m_aName, sizeof(apTilemap[i]->m_aName) / sizeof(int), aaName[i]);
+			IntsToStr(apTilemap[i]->m_aName, std::size(apTilemap[i]->m_aName), aaName[i], std::size(aaName[i]));
 		}
 
 		if(str_comp(aaName[0], aaName[1]) != 0 || apTilemap[0]->m_Width != apTilemap[1]->m_Width || apTilemap[0]->m_Height != apTilemap[1]->m_Height)
@@ -99,7 +99,11 @@ int main(int argc, const char *argv[])
 {
 	CCmdlineFix CmdlineFix(&argc, &argv);
 	std::vector<std::shared_ptr<ILogger>> vpLoggers;
-	vpLoggers.push_back(std::shared_ptr<ILogger>(log_logger_stdout()));
+	std::shared_ptr<ILogger> pStdoutLogger = std::shared_ptr<ILogger>(log_logger_stdout());
+	if(pStdoutLogger)
+	{
+		vpLoggers.push_back(pStdoutLogger);
+	}
 	IOHANDLE LogFile = io_open("map_diff.txt", IOFLAG_WRITE);
 	if(LogFile)
 	{
diff --git a/src/tools/map_extract.cpp b/src/tools/map_extract.cpp
index d66bbf25ea..d38cc6b3aa 100644
--- a/src/tools/map_extract.cpp
+++ b/src/tools/map_extract.cpp
@@ -1,115 +1,130 @@
 // Adapted from TWMapImagesRecovery by Tardo: https://github.com/Tardo/TWMapImagesRecovery
+
 #include <base/logger.h>
 #include <base/system.h>
+
 #include <engine/gfx/image_loader.h>
-#include <engine/graphics.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
+
 #include <game/mapitems.h>
 
-bool Process(IStorage *pStorage, const char *pMapName, const char *pPathSave)
+static void PrintMapInfo(CDataFileReader &Reader)
 {
-	CDataFileReader Reader;
-	if(!Reader.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE))
-	{
-		dbg_msg("map_extract", "error opening map '%s'", pMapName);
-		return false;
-	}
-
-	const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(Reader.FindItem(MAPITEMTYPE_VERSION, 0));
-	if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
-	{
-		dbg_msg("map_extract", "unsupported map version '%s'", pMapName);
-		return false;
-	}
-
-	dbg_msg("map_extract", "Make sure you have the permission to use these images and sounds in your own maps");
-
-	CMapItemInfo *pInfo = (CMapItemInfo *)Reader.FindItem(MAPITEMTYPE_INFO, 0);
-
+	const CMapItemInfo *pInfo = static_cast<CMapItemInfo *>(Reader.FindItem(MAPITEMTYPE_INFO, 0));
 	if(pInfo)
 	{
 		const char *pAuthor = Reader.GetDataString(pInfo->m_Author);
-		dbg_msg("map_extract", "author:  %s", pAuthor == nullptr ? "(error)" : pAuthor);
+		log_info("map_extract", "author:  %s", pAuthor == nullptr ? "(error)" : pAuthor);
 		const char *pMapVersion = Reader.GetDataString(pInfo->m_MapVersion);
-		dbg_msg("map_extract", "version: %s", pMapVersion == nullptr ? "(error)" : pMapVersion);
+		log_info("map_extract", "version: %s", pMapVersion == nullptr ? "(error)" : pMapVersion);
 		const char *pCredits = Reader.GetDataString(pInfo->m_Credits);
-		dbg_msg("map_extract", "credits: %s", pCredits == nullptr ? "(error)" : pCredits);
+		log_info("map_extract", "credits: %s", pCredits == nullptr ? "(error)" : pCredits);
 		const char *pLicense = Reader.GetDataString(pInfo->m_License);
-		dbg_msg("map_extract", "license: %s", pLicense == nullptr ? "(error)" : pLicense);
+		log_info("map_extract", "license: %s", pLicense == nullptr ? "(error)" : pLicense);
 	}
+}
 
+static void ExtractMapImages(CDataFileReader &Reader, const char *pPathSave)
+{
 	int Start, Num;
-
-	// load images
 	Reader.GetType(MAPITEMTYPE_IMAGE, &Start, &Num);
-
 	for(int i = 0; i < Num; i++)
 	{
-		CMapItemImage_v2 *pItem = (CMapItemImage_v2 *)Reader.GetItem(Start + i);
+		const CMapItemImage_v2 *pItem = static_cast<CMapItemImage_v2 *>(Reader.GetItem(Start + i));
 		if(pItem->m_External)
 			continue;
 
 		const char *pName = Reader.GetDataString(pItem->m_ImageName);
 		if(pName == nullptr || pName[0] == '\0')
 		{
-			dbg_msg("map_extract", "failed to load name of image %d", i);
+			log_error("map_extract", "failed to load name of image %d", i);
 			continue;
 		}
 
 		char aBuf[IO_MAX_PATH_LENGTH];
 		str_format(aBuf, sizeof(aBuf), "%s/%s.png", pPathSave, pName);
-		dbg_msg("map_extract", "writing image: %s (%dx%d)", aBuf, pItem->m_Width, pItem->m_Height);
-
-		const int Format = pItem->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : pItem->m_Format;
-		EImageFormat OutputFormat;
-		if(Format == CImageInfo::FORMAT_RGBA)
-			OutputFormat = IMAGE_FORMAT_RGBA;
-		else if(Format == CImageInfo::FORMAT_RGB)
-			OutputFormat = IMAGE_FORMAT_RGB;
-		else
+		Reader.UnloadData(pItem->m_ImageName);
+
+		if(pItem->m_Version >= 2 && pItem->m_MustBe1 != 1)
 		{
-			dbg_msg("map_extract", "ignoring image '%s' with unknown format %d", aBuf, Format);
+			log_error("map_extract", "ignoring image '%s' with unknown format %d", aBuf, pItem->m_MustBe1);
 			continue;
 		}
 
-		// copy image data
-		IOHANDLE File = io_open(aBuf, IOFLAG_WRITE);
-		if(File)
-		{
-			TImageByteBuffer ByteBuffer;
-			SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+		CImageInfo Image;
+		Image.m_Width = pItem->m_Width;
+		Image.m_Height = pItem->m_Height;
+		Image.m_Format = CImageInfo::FORMAT_RGBA;
+		Image.m_pData = static_cast<uint8_t *>(Reader.GetData(pItem->m_ImageData));
 
-			if(SavePNG(OutputFormat, (const uint8_t *)Reader.GetData(pItem->m_ImageData), ImageByteBuffer, pItem->m_Width, pItem->m_Height))
-				io_write(File, &ByteBuffer.front(), ByteBuffer.size());
-			io_close(File);
+		log_info("map_extract", "writing image: %s (%dx%d)", aBuf, pItem->m_Width, pItem->m_Height);
+		if(!CImageLoader::SavePng(io_open(aBuf, IOFLAG_WRITE), aBuf, Image))
+		{
+			log_error("map_extract", "failed to write image file. filename='%s'", aBuf);
 		}
+		Reader.UnloadData(pItem->m_ImageData);
 	}
+}
 
-	// load sounds
+static void ExtractMapSounds(CDataFileReader &Reader, const char *pPathSave)
+{
+	int Start, Num;
 	Reader.GetType(MAPITEMTYPE_SOUND, &Start, &Num);
-
 	for(int i = 0; i < Num; i++)
 	{
-		CMapItemSound *pItem = (CMapItemSound *)Reader.GetItem(Start + i);
+		const CMapItemSound *pItem = static_cast<CMapItemSound *>(Reader.GetItem(Start + i));
 		if(pItem->m_External)
 			continue;
 
 		const char *pName = Reader.GetDataString(pItem->m_SoundName);
 		if(pName == nullptr || pName[0] == '\0')
 		{
-			dbg_msg("map_extract", "failed to load name of sound %d", i);
+			log_error("map_extract", "failed to load name of sound %d", i);
 			continue;
 		}
 
+		const int SoundDataSize = Reader.GetDataSize(pItem->m_SoundData);
 		char aBuf[IO_MAX_PATH_LENGTH];
 		str_format(aBuf, sizeof(aBuf), "%s/%s.opus", pPathSave, pName);
-		dbg_msg("map_extract", "writing sound: %s (%d B)", aBuf, pItem->m_SoundDataSize);
+		Reader.UnloadData(pItem->m_SoundName);
 
 		IOHANDLE Opus = io_open(aBuf, IOFLAG_WRITE);
-		io_write(Opus, (unsigned char *)Reader.GetData(pItem->m_SoundData), pItem->m_SoundDataSize);
-		io_close(Opus);
+		if(Opus)
+		{
+			log_info("map_extract", "writing sound: %s (%d B)", aBuf, SoundDataSize);
+			io_write(Opus, Reader.GetData(pItem->m_SoundData), SoundDataSize);
+			io_close(Opus);
+			Reader.UnloadData(pItem->m_SoundData);
+		}
+		else
+		{
+			log_error("map_extract", "failed to open sound file for writing. filename='%s'", aBuf);
+		}
 	}
+}
+
+static bool ExtractMap(IStorage *pStorage, const char *pMapName, const char *pPathSave)
+{
+	CDataFileReader Reader;
+	if(!Reader.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE))
+	{
+		log_error("map_extract", "error opening map '%s'", pMapName);
+		return false;
+	}
+
+	const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(Reader.FindItem(MAPITEMTYPE_VERSION, 0));
+	if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
+	{
+		log_error("map_extract", "unsupported map version '%s'", pMapName);
+		return false;
+	}
+
+	log_info("map_extract", "Make sure you have the permission to use these images and sounds in your own maps");
+
+	PrintMapInfo(Reader);
+	ExtractMapImages(Reader, pPathSave);
+	ExtractMapSounds(Reader, pPathSave);
 
 	return Reader.Close();
 }
@@ -134,16 +149,16 @@ int main(int argc, const char *argv[])
 	}
 	else
 	{
-		dbg_msg("usage", "%s map [directory]", argv[0]);
+		log_error("map_extract", "usage: %s <map> [directory]", argv[0]);
 		return -1;
 	}
 
 	if(!fs_is_dir(pDir))
 	{
-		dbg_msg("usage", "directory '%s' does not exist", pDir);
+		log_error("map_extract", "directory '%s' does not exist", pDir);
 		return -1;
 	}
 
-	int Result = Process(pStorage, argv[1], pDir) ? 0 : 1;
+	int Result = ExtractMap(pStorage, argv[1], pDir) ? 0 : 1;
 	return Result;
 }
diff --git a/src/tools/map_find_env.cpp b/src/tools/map_find_env.cpp
index db5ed7c951..853a975fe9 100644
--- a/src/tools/map_find_env.cpp
+++ b/src/tools/map_find_env.cpp
@@ -2,13 +2,13 @@
 #include <base/system.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
-#include <game/gamecore.h>
 #include <game/mapitems.h>
 
-struct EnvelopedQuad
+class CEnvelopedQuad
 {
-	int m_GroupID;
-	int m_LayerID;
+public:
+	int m_GroupId;
+	int m_LayerId;
 	int m_TilePosX;
 	int m_TilePosY;
 };
@@ -25,7 +25,7 @@ bool OpenMap(const char pMapName[64], CDataFileReader &InputMap)
 	return true;
 }
 
-bool GetLayerGroupIDs(CDataFileReader &InputMap, const int LayerNumber, int &GroupID, int &LayerRelativeID)
+bool GetLayerGroupIds(CDataFileReader &InputMap, const int LayerNumber, int &GroupId, int &LayerRelativeId)
 {
 	int Start, Num;
 	InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
@@ -35,8 +35,8 @@ bool GetLayerGroupIDs(CDataFileReader &InputMap, const int LayerNumber, int &Gro
 		CMapItemGroup *pItem = (CMapItemGroup *)InputMap.GetItem(Start + i);
 		if(LayerNumber >= pItem->m_StartLayer && LayerNumber <= pItem->m_StartLayer + pItem->m_NumLayers)
 		{
-			GroupID = i;
-			LayerRelativeID = LayerNumber - pItem->m_StartLayer - 1;
+			GroupId = i;
+			LayerRelativeId = LayerNumber - pItem->m_StartLayer - 1;
 			return true;
 		}
 	}
@@ -49,40 +49,40 @@ int FxToTilePos(const int FxPos)
 	return std::floor(fx2f(FxPos) / 32);
 }
 
-bool GetEnvelopedQuads(const CQuad *pQuads, const int NumQuads, const int EnvID, const int GroupID, const int LayerID, int &QuadsCounter, EnvelopedQuad pEnvQuads[1024])
+bool GetEnvelopedQuads(const CQuad *pQuads, const int NumQuads, const int EnvId, const int GroupId, const int LayerId, int &QuadsCounter, CEnvelopedQuad pEnvQuads[1024])
 {
-	bool bFound = false;
+	bool Found = false;
 	for(int i = 0; i < NumQuads; i++)
 	{
-		if(pQuads[i].m_PosEnv != EnvID && pQuads[i].m_ColorEnv != EnvID)
+		if(pQuads[i].m_PosEnv != EnvId && pQuads[i].m_ColorEnv != EnvId)
 			continue;
 
-		pEnvQuads[QuadsCounter].m_GroupID = GroupID;
-		pEnvQuads[QuadsCounter].m_LayerID = LayerID;
+		pEnvQuads[QuadsCounter].m_GroupId = GroupId;
+		pEnvQuads[QuadsCounter].m_LayerId = LayerId;
 		pEnvQuads[QuadsCounter].m_TilePosX = FxToTilePos(pQuads[i].m_aPoints[4].x);
 		pEnvQuads[QuadsCounter].m_TilePosY = FxToTilePos(pQuads[i].m_aPoints[4].y);
 
 		QuadsCounter++;
-		bFound = true;
+		Found = true;
 	}
 
-	return bFound;
+	return Found;
 }
 
-void PrintEnvelopedQuads(const EnvelopedQuad pEnvQuads[1024], const int EnvID, const int QuadsCounter)
+void PrintEnvelopedQuads(const CEnvelopedQuad pEnvQuads[1024], const int EnvId, const int QuadsCounter)
 {
 	if(!QuadsCounter)
 	{
-		dbg_msg("map_find_env", "No quads found with env number #%d", EnvID + 1);
+		dbg_msg("map_find_env", "No quads found with env number #%d", EnvId + 1);
 		return;
 	}
 
-	dbg_msg("map_find_env", "Found %d quads with env number #%d:", QuadsCounter, EnvID + 1);
+	dbg_msg("map_find_env", "Found %d quads with env number #%d:", QuadsCounter, EnvId + 1);
 	for(int i = 0; i < QuadsCounter; i++)
-		dbg_msg("map_find_env", "%*d. Group: #%d - Layer: #%d - Pos: %d,%d", (int)(std::log10(absolute(QuadsCounter))) + 1, i + 1, pEnvQuads[i].m_GroupID, pEnvQuads[i].m_LayerID, pEnvQuads[i].m_TilePosX, pEnvQuads[i].m_TilePosY);
+		dbg_msg("map_find_env", "%*d. Group: #%d - Layer: #%d - Pos: %d,%d", (int)(std::log10(absolute(QuadsCounter))) + 1, i + 1, pEnvQuads[i].m_GroupId, pEnvQuads[i].m_LayerId, pEnvQuads[i].m_TilePosX, pEnvQuads[i].m_TilePosY);
 }
 
-bool FindEnv(const char aFilename[64], const int EnvID)
+bool FindEnv(const char aFilename[64], const int EnvId)
 {
 	CDataFileReader InputMap;
 	if(!OpenMap(aFilename, InputMap))
@@ -90,7 +90,7 @@ bool FindEnv(const char aFilename[64], const int EnvID)
 
 	int LayersStart, LayersCount, QuadsCounter = 0;
 	InputMap.GetType(MAPITEMTYPE_LAYER, &LayersStart, &LayersCount);
-	EnvelopedQuad pEnvQuads[1024];
+	CEnvelopedQuad pEnvQuads[1024];
 
 	for(int i = 0; i < LayersCount; i++)
 	{
@@ -103,14 +103,14 @@ bool FindEnv(const char aFilename[64], const int EnvID)
 		CMapItemLayerQuads *pQuadLayer = (CMapItemLayerQuads *)pItem;
 		CQuad *pQuads = (CQuad *)InputMap.GetDataSwapped(pQuadLayer->m_Data);
 
-		int GroupID = 0, LayerRelativeID = 0;
-		if(!GetLayerGroupIDs(InputMap, i + 1, GroupID, LayerRelativeID))
+		int GroupId = 0, LayerRelativeId = 0;
+		if(!GetLayerGroupIds(InputMap, i + 1, GroupId, LayerRelativeId))
 			return false;
 
-		GetEnvelopedQuads(pQuads, pQuadLayer->m_NumQuads, EnvID, GroupID, LayerRelativeID, QuadsCounter, pEnvQuads);
+		GetEnvelopedQuads(pQuads, pQuadLayer->m_NumQuads, EnvId, GroupId, LayerRelativeId, QuadsCounter, pEnvQuads);
 	}
 
-	PrintEnvelopedQuads(pEnvQuads, EnvID, QuadsCounter);
+	PrintEnvelopedQuads(pEnvQuads, EnvId, QuadsCounter);
 
 	return true;
 }
@@ -131,8 +131,8 @@ int main(int argc, const char **argv)
 
 	char aFilename[64];
 	str_copy(aFilename, argv[1]);
-	int EnvID = str_toint(argv[2]) - 1;
-	dbg_msg("map_find_env", "input_map='%s'; env_number='#%d';", aFilename, EnvID + 1);
+	int EnvId = str_toint(argv[2]) - 1;
+	dbg_msg("map_find_env", "input_map='%s'; env_number='#%d';", aFilename, EnvId + 1);
 
-	return FindEnv(aFilename, EnvID);
+	return FindEnv(aFilename, EnvId);
 }
diff --git a/src/tools/map_optimize.cpp b/src/tools/map_optimize.cpp
index 2da28b1c09..bb81042333 100644
--- a/src/tools/map_optimize.cpp
+++ b/src/tools/map_optimize.cpp
@@ -138,15 +138,16 @@ int main(int argc, const char **argv)
 	// add all items
 	for(int Index = 0, i = 0; Index < Reader.NumItems(); Index++)
 	{
-		int Type, ID;
-		void *pPtr = Reader.GetItem(Index, &Type, &ID);
-		int Size = Reader.GetItemSize(Index);
+		int Type, Id;
+		CUuid Uuid;
+		void *pPtr = Reader.GetItem(Index, &Type, &Id, &Uuid);
 
-		// filter ITEMTYPE_EX items, they will be automatically added again
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
 		{
 			continue;
 		}
+
 		// for all layers, check if it uses a image and set the corresponding flag
 		if(Type == MAPITEMTYPE_LAYER)
 		{
@@ -203,7 +204,8 @@ int main(int argc, const char **argv)
 			++i;
 		}
 
-		Writer.AddItem(Type, ID, Size, pPtr);
+		int Size = Reader.GetItemSize(Index);
+		Writer.AddItem(Type, Id, Size, pPtr, &Uuid);
 	}
 
 	// add all data
@@ -306,7 +308,7 @@ int main(int argc, const char **argv)
 			}
 		}
 
-		Writer.AddData(Size, pPtr, Z_BEST_COMPRESSION);
+		Writer.AddData(Size, pPtr, CDataFileWriter::COMPRESSION_BEST);
 
 		if(DeletePtr)
 			free(pPtr);
diff --git a/src/tools/map_replace_area.cpp b/src/tools/map_replace_area.cpp
index f0d4aed3ae..143ccbdb6a 100644
--- a/src/tools/map_replace_area.cpp
+++ b/src/tools/map_replace_area.cpp
@@ -2,7 +2,6 @@
 #include <base/system.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
-#include <game/gamecore.h>
 #include <game/mapitems.h>
 
 // global new layers data (set by ReplaceAreaTiles and ReplaceAreaQuads)
@@ -10,8 +9,9 @@ void *g_apNewData[1024];
 void *g_apNewItem[1024];
 int g_aNewDataSize[1024];
 
-struct MapObject // quad pivot or tile layer
+class CMapObject // quad pivot or tile layer
 {
+public:
 	static constexpr float ms_aStandardScreen[2] = {1430 / 2.f, 1050 / 2.f};
 
 	float m_aLayerOffset[2];
@@ -33,22 +33,22 @@ const CMapItemGroup *GetLayerGroup(CDataFileReader &, int);
 void ReplaceAreaTiles(CDataFileReader[2], const float[][2][2], const CMapItemGroup *[2], CMapItemLayer *[2]);
 void RemoveDestinationTiles(CMapItemLayerTilemap *, CTile *, float[2][2]);
 void ReplaceDestinationTiles(CMapItemLayerTilemap *[2], CTile *[2], float[2][2][2]);
-bool AdaptVisibleAreas(const float[2][2][2], const MapObject[2], float[2][2][2]);
-bool AdaptReplaceableAreas(const float[2][2][2], const float[2][2][2], const MapObject[2], float[2][2][2]);
+bool AdaptVisibleAreas(const float[2][2][2], const CMapObject[2], float[2][2][2]);
+bool AdaptReplaceableAreas(const float[2][2][2], const float[2][2][2], const CMapObject[2], float[2][2][2]);
 
 void ReplaceAreaQuads(CDataFileReader[2], const float[][2][2], const CMapItemGroup *[2], CMapItemLayer *[2], int);
 bool RemoveDestinationQuads(const float[2][2], const CQuad *, int, const CMapItemGroup *, CQuad *, int &);
 bool InsertDestinationQuads(const float[2][2][2], const CQuad *, int, const CMapItemGroup *[2], CQuad *, int &);
-bool AdaptVisiblePoint(const float[2][2][2], const float[2][2], const MapObject[2], float[2]);
+bool AdaptVisiblePoint(const float[2][2][2], const float[2][2], const CMapObject[2], float[2]);
 
-MapObject CreateMapObject(const CMapItemGroup *, int, int, int, int);
-void SetExtendedArea(MapObject &);
-bool GetVisibleArea(const float[2][2], const MapObject &, float[2][2] = 0x0);
-bool GetReplaceableArea(const float[2][2], const MapObject &, float[2][2]);
+CMapObject CreateMapObject(const CMapItemGroup *, int, int, int, int);
+void SetExtendedArea(CMapObject &);
+bool GetVisibleArea(const float[2][2], const CMapObject &, float[2][2] = 0x0);
+bool GetReplaceableArea(const float[2][2], const CMapObject &, float[2][2]);
 
-void GetGameAreaDistance(const float[2][2][2], const MapObject[2], const float[2][2][2], float[2]);
-void GetGameAreaDistance(const float[2][2][2], const MapObject[2], const float[2][2], float[2]);
-void GetSignificantScreenPos(const MapObject &, const float[2][2], const float[2][2], float[2]);
+void GetGameAreaDistance(const float[2][2][2], const CMapObject[2], const float[2][2][2], float[2]);
+void GetGameAreaDistance(const float[2][2][2], const CMapObject[2], const float[2][2], float[2]);
+void GetSignificantScreenPos(const CMapObject &, const float[2][2], const float[2][2], float[2]);
 void ConvertToTiles(const float[2][2], int[2][2]);
 
 bool GetLineIntersection(const float[2], const float[2], float[2] = 0x0);
@@ -165,16 +165,21 @@ void SaveOutputMap(CDataFileReader &InputMap, CDataFileWriter &OutputMap)
 {
 	for(int i = 0; i < InputMap.NumItems(); i++)
 	{
-		int ID, Type;
-		void *pItem = InputMap.GetItem(i, &Type, &ID);
+		int Id, Type;
+		CUuid Uuid;
+		void *pItem = InputMap.GetItem(i, &Type, &Id, &Uuid);
 
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
+		{
 			continue;
+		}
+
 		if(g_apNewItem[i])
 			pItem = g_apNewItem[i];
 
 		int Size = InputMap.GetItemSize(i);
-		OutputMap.AddItem(Type, ID, Size, pItem);
+		OutputMap.AddItem(Type, Id, Size, pItem, &Uuid);
 	}
 
 	for(int i = 0; i < InputMap.NumData(); i++)
@@ -231,9 +236,9 @@ void CompareGroups(const char aaMapNames[3][64], CDataFileReader aInputMaps[2])
 		for(int j = 0; j < 2; j++)
 			apItem[j] = (CMapItemGroup *)aInputMaps[j].GetItem(aStart[j] + i);
 
-		bool bSameConfig = apItem[0]->m_ParallaxX == apItem[1]->m_ParallaxX && apItem[0]->m_ParallaxY == apItem[1]->m_ParallaxY && apItem[0]->m_OffsetX == apItem[1]->m_OffsetX && apItem[0]->m_OffsetY == apItem[1]->m_OffsetY && apItem[0]->m_UseClipping == apItem[1]->m_UseClipping && apItem[0]->m_ClipX == apItem[1]->m_ClipX && apItem[0]->m_ClipY == apItem[1]->m_ClipY && apItem[0]->m_ClipW == apItem[1]->m_ClipW && apItem[0]->m_ClipH == apItem[1]->m_ClipH;
+		bool SameConfig = apItem[0]->m_ParallaxX == apItem[1]->m_ParallaxX && apItem[0]->m_ParallaxY == apItem[1]->m_ParallaxY && apItem[0]->m_OffsetX == apItem[1]->m_OffsetX && apItem[0]->m_OffsetY == apItem[1]->m_OffsetY && apItem[0]->m_UseClipping == apItem[1]->m_UseClipping && apItem[0]->m_ClipX == apItem[1]->m_ClipX && apItem[0]->m_ClipY == apItem[1]->m_ClipY && apItem[0]->m_ClipW == apItem[1]->m_ClipW && apItem[0]->m_ClipH == apItem[1]->m_ClipH;
 
-		if(!bSameConfig)
+		if(!SameConfig)
 			dbg_msg("map_replace_area", "WARNING: different configuration on layergroup #%d, this might lead to unexpected results", i);
 	}
 }
@@ -258,7 +263,7 @@ void ReplaceAreaTiles(CDataFileReader aInputMaps[2], const float aaaGameAreas[][
 	CMapItemLayerTilemap *apTilemap[2];
 	CTile *apTile[2];
 	float aaaVisibleAreas[2][2][2], aaaReplaceableAreas[2][2][2];
-	MapObject aObs[2];
+	CMapObject aObs[2];
 
 	for(int i = 0; i < 2; i++)
 	{
@@ -309,7 +314,7 @@ void ReplaceDestinationTiles(CMapItemLayerTilemap *apTilemap[2], CTile *apTile[2
 			apTile[1][x1 + (y1 * apTilemap[1]->m_Width)] = apTile[0][x0 + (y0 * apTilemap[0]->m_Width)];
 }
 
-bool AdaptVisibleAreas(const float aaaGameAreas[2][2][2], const MapObject aObs[2], float aaaVisibleAreas[2][2][2])
+bool AdaptVisibleAreas(const float aaaGameAreas[2][2][2], const CMapObject aObs[2], float aaaVisibleAreas[2][2][2])
 {
 	float aDistance[2];
 	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
@@ -332,7 +337,7 @@ bool AdaptVisibleAreas(const float aaaGameAreas[2][2][2], const MapObject aObs[2
 	return true;
 }
 
-bool AdaptReplaceableAreas(const float aaaGameAreas[2][2][2], const float aaaVisibleAreas[2][2][2], const MapObject aObs[2], float aaaReplaceableAreas[2][2][2])
+bool AdaptReplaceableAreas(const float aaaGameAreas[2][2][2], const float aaaVisibleAreas[2][2][2], const CMapObject aObs[2], float aaaReplaceableAreas[2][2][2])
 {
 	float aDistance[2], aScreenPos[2];
 	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
@@ -374,10 +379,10 @@ void ReplaceAreaQuads(CDataFileReader aInputMaps[2], const float aaaGameAreas[][
 	apQuads[2] = new CQuad[apQuadLayer[0]->m_NumQuads + apQuadLayer[1]->m_NumQuads];
 	int QuadsCounter = 0;
 
-	bool bDataChanged = RemoveDestinationQuads(aaaGameAreas[1], apQuads[1], apQuadLayer[1]->m_NumQuads, apLayerGroups[1], apQuads[2], QuadsCounter);
-	bDataChanged |= InsertDestinationQuads(aaaGameAreas, apQuads[0], apQuadLayer[0]->m_NumQuads, apLayerGroups, apQuads[2], QuadsCounter);
+	bool DataChanged = RemoveDestinationQuads(aaaGameAreas[1], apQuads[1], apQuadLayer[1]->m_NumQuads, apLayerGroups[1], apQuads[2], QuadsCounter);
+	DataChanged |= InsertDestinationQuads(aaaGameAreas, apQuads[0], apQuadLayer[0]->m_NumQuads, apLayerGroups, apQuads[2], QuadsCounter);
 
-	if(bDataChanged)
+	if(DataChanged)
 	{
 		g_apNewData[apQuadLayer[1]->m_Data] = apQuads[2];
 		g_aNewDataSize[apQuadLayer[1]->m_Data] = ((int)sizeof(CQuad)) * QuadsCounter;
@@ -390,15 +395,15 @@ void ReplaceAreaQuads(CDataFileReader aInputMaps[2], const float aaaGameAreas[][
 
 bool RemoveDestinationQuads(const float aaGameArea[2][2], const CQuad *pQuads, const int NumQuads, const CMapItemGroup *pLayerGroup, CQuad *pDestQuads, int &QuadsCounter)
 {
-	bool bDataChanged = false;
+	bool DataChanged = false;
 
 	for(int i = 0; i < NumQuads; i++)
 	{
-		MapObject Ob = CreateMapObject(pLayerGroup, fx2f(pQuads[i].m_aPoints[4].x), fx2f(pQuads[i].m_aPoints[4].y), 0, 0);
+		CMapObject Ob = CreateMapObject(pLayerGroup, fx2f(pQuads[i].m_aPoints[4].x), fx2f(pQuads[i].m_aPoints[4].y), 0, 0);
 
 		if(GetVisibleArea(aaGameArea, Ob))
 		{
-			bDataChanged = true;
+			DataChanged = true;
 			continue;
 		}
 
@@ -406,16 +411,16 @@ bool RemoveDestinationQuads(const float aaGameArea[2][2], const CQuad *pQuads, c
 		QuadsCounter++;
 	}
 
-	return bDataChanged;
+	return DataChanged;
 }
 
 bool InsertDestinationQuads(const float aaaGameAreas[2][2][2], const CQuad *pQuads, const int NumQuads, const CMapItemGroup *apLayerGroups[2], CQuad *pDestQuads, int &QuadsCounter)
 {
-	bool bDataChanged = false;
+	bool DataChanged = false;
 
 	for(int i = 0; i < NumQuads; i++)
 	{
-		MapObject aObs[2];
+		CMapObject aObs[2];
 		aObs[0] = CreateMapObject(apLayerGroups[0], fx2f(pQuads[i].m_aPoints[4].x), fx2f(pQuads[i].m_aPoints[4].y), 0, 0);
 		float aaVisibleArea[2][2];
 
@@ -435,14 +440,14 @@ bool InsertDestinationQuads(const float aaaGameAreas[2][2][2], const CQuad *pQua
 			}
 
 			QuadsCounter++;
-			bDataChanged = true;
+			DataChanged = true;
 		}
 	}
 
-	return bDataChanged;
+	return DataChanged;
 }
 
-bool AdaptVisiblePoint(const float aaaGameAreas[2][2][2], const float aaVisibleArea[2][2], const MapObject aObs[2], float aPos[2])
+bool AdaptVisiblePoint(const float aaaGameAreas[2][2][2], const float aaVisibleArea[2][2], const CMapObject aObs[2], float aPos[2])
 {
 	float aDistance[2], aScreenPos[2];
 	GetGameAreaDistance(aaaGameAreas, aObs, aaVisibleArea, aDistance);
@@ -451,7 +456,7 @@ bool AdaptVisiblePoint(const float aaaGameAreas[2][2][2], const float aaVisibleA
 	for(int i = 0; i < 2; i++)
 		aPos[i] = aaVisibleArea[i][0] + aDistance[i] + aObs[1].m_aLayerOffset[i] - (aScreenPos[i] + aDistance[i]) * aObs[1].m_aSpeed[i];
 
-	MapObject FinalOb = aObs[1];
+	CMapObject FinalOb = aObs[1];
 	for(int i = 0; i < 2; i++)
 		FinalOb.m_aaBaseArea[i][0] = FinalOb.m_aaBaseArea[i][1] += aPos[i];
 	SetExtendedArea(FinalOb);
@@ -459,9 +464,9 @@ bool AdaptVisiblePoint(const float aaaGameAreas[2][2][2], const float aaVisibleA
 	return GetVisibleArea(aaaGameAreas[1], FinalOb);
 }
 
-MapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, const int PosY, const int Width, const int Height)
+CMapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, const int PosY, const int Width, const int Height)
 {
-	MapObject Ob;
+	CMapObject Ob;
 
 	Ob.m_aaBaseArea[0][0] = PosX - pLayerGroup->m_OffsetX;
 	Ob.m_aaBaseArea[1][0] = PosY - pLayerGroup->m_OffsetY;
@@ -479,8 +484,8 @@ MapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, cons
 
 	for(int i = 0; i < 2; i++)
 	{
-		Ob.m_aaScreenOffset[i][0] = -MapObject::ms_aStandardScreen[i];
-		Ob.m_aaScreenOffset[i][1] = MapObject::ms_aStandardScreen[i];
+		Ob.m_aaScreenOffset[i][0] = -CMapObject::ms_aStandardScreen[i];
+		Ob.m_aaScreenOffset[i][1] = CMapObject::ms_aStandardScreen[i];
 		if(Ob.m_aSpeed[i] < 0)
 			std::swap(Ob.m_aaScreenOffset[i][0], Ob.m_aaScreenOffset[i][1]);
 	}
@@ -489,7 +494,7 @@ MapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, cons
 	return Ob;
 }
 
-void SetExtendedArea(MapObject &Ob)
+void SetExtendedArea(CMapObject &Ob)
 {
 	SetInexistent((float *)Ob.m_aaExtendedArea, 4);
 
@@ -511,7 +516,7 @@ void SetExtendedArea(MapObject &Ob)
 	}
 }
 
-bool GetVisibleArea(const float aaGameArea[2][2], const MapObject &Ob, float aaVisibleArea[2][2])
+bool GetVisibleArea(const float aaGameArea[2][2], const CMapObject &Ob, float aaVisibleArea[2][2])
 {
 	if(IsInexistent((float *)Ob.m_aaExtendedArea, 4))
 		return false;
@@ -543,7 +548,7 @@ bool GetVisibleArea(const float aaGameArea[2][2], const MapObject &Ob, float aaV
 	return true;
 }
 
-bool GetReplaceableArea(const float aaVisibleArea[2][2], const MapObject &Ob, float aaReplaceableArea[2][2])
+bool GetReplaceableArea(const float aaVisibleArea[2][2], const CMapObject &Ob, float aaReplaceableArea[2][2])
 {
 	SetInexistent((float *)aaReplaceableArea, 4);
 	if(IsInexistent((float *)aaVisibleArea, 4))
@@ -576,7 +581,7 @@ bool GetReplaceableArea(const float aaVisibleArea[2][2], const MapObject &Ob, fl
 	return true;
 }
 
-void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs[2], const float aaaVisibleAreas[2][2][2], float aDistance[2])
+void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const CMapObject aObs[2], const float aaaVisibleAreas[2][2][2], float aDistance[2])
 {
 	for(int i = 0; i < 2; i++)
 	{
@@ -591,7 +596,7 @@ void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs
 	}
 }
 
-void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs[2], const float aaVisibleArea[2][2], float aDistance[2])
+void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const CMapObject aObs[2], const float aaVisibleArea[2][2], float aDistance[2])
 {
 	float aaaVisibleAreas[2][2][2];
 	mem_copy(aaaVisibleAreas[0], aaVisibleArea[0], sizeof(float[2][2]));
@@ -599,7 +604,7 @@ void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs
 	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
 }
 
-void GetSignificantScreenPos(const MapObject &Ob, const float aaVisibleArea[2][2], const float aaReplaceableArea[2][2], float aScreen[2])
+void GetSignificantScreenPos(const CMapObject &Ob, const float aaVisibleArea[2][2], const float aaReplaceableArea[2][2], float aScreen[2])
 {
 	for(int i = 0; i < 2; i++)
 	{
@@ -630,7 +635,7 @@ bool GetLineIntersection(const float aLine1[2], const float aLine2[2], float aIn
 		std::min(aLine1[1], aLine2[1])};
 
 	if(aIntersection)
-		SetInexistent((float *)aIntersection, 2);
+		SetInexistent(aIntersection, 2);
 
 	if(aBorders[0] - aBorders[1] > 0.01f)
 		return false;
diff --git a/src/tools/map_replace_image.cpp b/src/tools/map_replace_image.cpp
index b67ce18aed..2c2ba68a89 100644
--- a/src/tools/map_replace_image.cpp
+++ b/src/tools/map_replace_image.cpp
@@ -3,11 +3,13 @@
 
 #include <base/logger.h>
 #include <base/system.h>
+
 #include <engine/gfx/image_loader.h>
-#include <engine/graphics.h>
 #include <engine/shared/datafile.h>
 #include <engine/storage.h>
+
 #include <game/mapitems.h>
+
 /*
 	Usage: map_replace_image <source map filepath> <dest map filepath> <current image name> <new image filepath>
 	Notes: map filepath must be relative to user default teeworlds folder
@@ -17,56 +19,12 @@
 CDataFileReader g_DataReader;
 
 // global new image data (set by ReplaceImageItem)
-int g_NewNameID = -1;
+int g_NewNameId = -1;
 char g_aNewName[128];
-int g_NewDataID = -1;
+int g_NewDataId = -1;
 int g_NewDataSize = 0;
 void *g_pNewData = nullptr;
 
-bool LoadPNG(CImageInfo *pImg, const char *pFilename)
-{
-	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
-	if(File)
-	{
-		io_seek(File, 0, IOSEEK_END);
-		unsigned int FileSize = io_tell(File);
-		io_seek(File, 0, IOSEEK_START);
-		TImageByteBuffer ByteBuffer;
-		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
-
-		ByteBuffer.resize(FileSize);
-		io_read(File, &ByteBuffer.front(), FileSize);
-
-		io_close(File);
-
-		uint8_t *pImgBuffer = NULL;
-		EImageFormat ImageFormat;
-		int PngliteIncompatible;
-		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
-		{
-			if((ImageFormat == IMAGE_FORMAT_RGBA || ImageFormat == IMAGE_FORMAT_RGB) && pImg->m_Width <= (2 << 13) && pImg->m_Height <= (2 << 13))
-			{
-				pImg->m_pData = pImgBuffer;
-
-				if(ImageFormat == IMAGE_FORMAT_RGB)
-					pImg->m_Format = CImageInfo::FORMAT_RGB;
-				else if(ImageFormat == IMAGE_FORMAT_RGBA)
-					pImg->m_Format = CImageInfo::FORMAT_RGBA;
-				else
-				{
-					free(pImgBuffer);
-					return false;
-				}
-			}
-		}
-		else
-			return false;
-	}
-	else
-		return false;
-	return true;
-}
-
 void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, const char *pImgName, const char *pImgFile, CMapItemImage *pNewImgItem)
 {
 	const char *pName = g_DataReader.GetDataString(pImgItem->m_ImageName);
@@ -82,13 +40,15 @@ void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, const char *pImgName,
 	dbg_msg("map_replace_image", "found image '%s'", pImgName);
 
 	CImageInfo ImgInfo;
-	if(!LoadPNG(&ImgInfo, pImgFile))
-		return 0;
+	int PngliteIncompatible;
+	if(!CImageLoader::LoadPng(io_open(pImgName, IOFLAG_READ), pImgName, ImgInfo, PngliteIncompatible))
+		return nullptr;
 
 	if(ImgInfo.m_Format != CImageInfo::FORMAT_RGBA)
 	{
-		dbg_msg("map_replace_image", "image '%s' is not in RGBA format", pImgName);
-		return 0;
+		dbg_msg("map_replace_image", "ERROR: only RGBA PNG images are supported");
+		ImgInfo.Free();
+		return nullptr;
 	}
 
 	*pNewImgItem = *pImgItem;
@@ -96,11 +56,11 @@ void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, const char *pImgName,
 	pNewImgItem->m_Width = ImgInfo.m_Width;
 	pNewImgItem->m_Height = ImgInfo.m_Height;
 
-	g_NewNameID = pImgItem->m_ImageName;
+	g_NewNameId = pImgItem->m_ImageName;
 	IStorage::StripPathAndExtension(pImgFile, g_aNewName, sizeof(g_aNewName));
-	g_NewDataID = pImgItem->m_ImageData;
+	g_NewDataId = pImgItem->m_ImageData;
 	g_pNewData = ImgInfo.m_pData;
-	g_NewDataSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * ImgInfo.PixelSize();
+	g_NewDataSize = ImgInfo.DataSize();
 
 	return (void *)pNewImgItem;
 }
@@ -147,12 +107,15 @@ int main(int argc, const char **argv)
 	// add all items
 	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
 	{
-		int Type, ID;
-		void *pItem = g_DataReader.GetItem(Index, &Type, &ID);
+		int Type, Id;
+		CUuid Uuid;
+		void *pItem = g_DataReader.GetItem(Index, &Type, &Id, &Uuid);
 
-		// filter ITEMTYPE_EX items, they will be automatically added again
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
+		{
 			continue;
+		}
 
 		int Size = g_DataReader.GetItemSize(Index);
 
@@ -166,10 +129,10 @@ int main(int argc, const char **argv)
 			NewImageItem.m_Version = CMapItemImage::CURRENT_VERSION;
 		}
 
-		Writer.AddItem(Type, ID, Size, pItem);
+		Writer.AddItem(Type, Id, Size, pItem, &Uuid);
 	}
 
-	if(g_NewDataID == -1)
+	if(g_NewDataId == -1)
 	{
 		dbg_msg("map_replace_image", "image '%s' not found on source map '%s'.", pImageName, pSourceFileName);
 		return -1;
@@ -180,12 +143,12 @@ int main(int argc, const char **argv)
 	{
 		void *pData;
 		int Size;
-		if(Index == g_NewDataID)
+		if(Index == g_NewDataId)
 		{
 			pData = g_pNewData;
 			Size = g_NewDataSize;
 		}
-		else if(Index == g_NewNameID)
+		else if(Index == g_NewNameId)
 		{
 			pData = (void *)g_aNewName;
 			Size = str_length(g_aNewName) + 1;
diff --git a/src/tools/map_resave.cpp b/src/tools/map_resave.cpp
index 5ff2090504..cc16f16233 100644
--- a/src/tools/map_resave.cpp
+++ b/src/tools/map_resave.cpp
@@ -29,15 +29,18 @@ static int ResaveMap(const char *pSourceMap, const char *pDestinationMap, IStora
 	// add all items
 	for(int Index = 0; Index < Reader.NumItems(); Index++)
 	{
-		int Type, ID;
-		const void *pPtr = Reader.GetItem(Index, &Type, &ID);
+		int Type, Id;
+		CUuid Uuid;
+		const void *pPtr = Reader.GetItem(Index, &Type, &Id, &Uuid);
 
-		// filter ITEMTYPE_EX items, they will be automatically added again
+		// Filter ITEMTYPE_EX items, they will be automatically added again.
 		if(Type == ITEMTYPE_EX)
+		{
 			continue;
+		}
 
 		int Size = Reader.GetItemSize(Index);
-		Writer.AddItem(Type, ID, Size, pPtr);
+		Writer.AddItem(Type, Id, Size, pPtr, &Uuid);
 	}
 
 	// add all data
diff --git a/src/tools/stun.cpp b/src/tools/stun.cpp
index c735dec836..4329f575ed 100644
--- a/src/tools/stun.cpp
+++ b/src/tools/stun.cpp
@@ -6,8 +6,12 @@ int main(int argc, const char **argv)
 {
 	CCmdlineFix CmdlineFix(&argc, &argv);
 
-	secure_random_init();
 	log_set_global_logger_default();
+	if(secure_random_init() != 0)
+	{
+		log_error("stun", "could not initialize secure RNG");
+		return -1;
+	}
 
 	if(argc < 2)
 	{
diff --git a/src/tools/twping.cpp b/src/tools/twping.cpp
index 4456696df6..f24541a74a 100644
--- a/src/tools/twping.cpp
+++ b/src/tools/twping.cpp
@@ -11,8 +11,12 @@ int main(int argc, const char **argv)
 {
 	CCmdlineFix CmdlineFix(&argc, &argv);
 
-	secure_random_init();
 	log_set_global_logger_default();
+	if(secure_random_init() != 0)
+	{
+		log_error("twping", "could not initialize secure RNG");
+		return -1;
+	}
 
 	net_init();
 	NETADDR BindAddr;
@@ -44,7 +48,7 @@ int main(int argc, const char **argv)
 	aBuffer[sizeof(SERVERBROWSE_GETINFO)] = CurToken;
 
 	CNetChunk Packet;
-	Packet.m_ClientID = -1;
+	Packet.m_ClientId = -1;
 	Packet.m_Address = Addr;
 	Packet.m_Flags = NETSENDFLAG_CONNLESS;
 	Packet.m_DataSize = sizeof(aBuffer);
@@ -60,7 +64,8 @@ int main(int argc, const char **argv)
 
 	NetClient.Update();
 
-	while(NetClient.Recv(&Packet))
+	SECURITY_TOKEN ResponseToken;
+	while(NetClient.Recv(&Packet, &ResponseToken, false))
 	{
 		if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_INFO) && mem_comp(Packet.m_pData, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO)) == 0)
 		{
diff --git a/src_bkp/android/android_main.cpp b/src_bkp/android/android_main.cpp
new file mode 100644
index 0000000000..03b06beecf
--- /dev/null
+++ b/src_bkp/android/android_main.cpp
@@ -0,0 +1,159 @@
+#include <base/detect.h>
+
+#ifdef CONF_PLATFORM_ANDROID
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <SDL.h>
+
+#include <base/hash.h>
+#include <base/system.h>
+#include <engine/shared/linereader.h>
+#include <string>
+#include <vector>
+
+extern "C" __attribute__((visibility("default"))) void InitAndroid();
+
+static int gs_AndroidStarted = false;
+
+void InitAndroid()
+{
+	if(gs_AndroidStarted)
+	{
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "DDNet", "The app was started, but not closed properly, this causes bugs. Please restart or manually delete this task.", SDL_GL_GetCurrentWindow());
+		std::exit(0);
+	}
+
+	gs_AndroidStarted = true;
+
+	// change current path to a writable directory
+	const char *pPath = SDL_AndroidGetExternalStoragePath();
+	chdir(pPath);
+	dbg_msg("client", "changed path to %s", pPath);
+
+	// copy integrity files
+	{
+		SDL_RWops *pF = SDL_RWFromFile("asset_integrity_files/integrity.txt", "rb");
+		if(!pF)
+		{
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "DDNet", "integrity.txt not found, consider reinstalling", SDL_GL_GetCurrentWindow());
+			std::exit(0);
+		}
+
+		long int length;
+		SDL_RWseek(pF, 0, RW_SEEK_END);
+		length = SDL_RWtell(pF);
+		SDL_RWseek(pF, 0, RW_SEEK_SET);
+
+		char *pAl = (char *)malloc(length);
+		SDL_RWread(pF, pAl, 1, length);
+
+		SDL_RWclose(pF);
+
+		mkdir("data", 0755);
+
+		dbg_msg("integrity", "copying integrity.txt with size: %ld", length);
+
+		IOHANDLE pIO = io_open("integrity.txt", IOFLAG_WRITE);
+		io_write(pIO, pAl, length);
+		io_close(pIO);
+
+		free(pAl);
+	}
+
+	IOHANDLE pIO = io_open("integrity.txt", IOFLAG_READ);
+	CLineReader LineReader;
+	LineReader.Init(pIO);
+	const char *pReadLine = NULL;
+	std::vector<std::string> vLines;
+	while((pReadLine = LineReader.Get()))
+	{
+		vLines.push_back(pReadLine);
+	}
+	io_close(pIO);
+
+	// first line is the whole hash
+	std::string AllAsOne;
+	for(size_t i = 1; i < vLines.size(); ++i)
+	{
+		AllAsOne.append(vLines[i]);
+		AllAsOne.append("\n");
+	}
+	SHA256_DIGEST ShaAll;
+	bool GotSHA = false;
+	{
+		IOHANDLE pIOR = io_open("integrity_save.txt", IOFLAG_READ);
+		if(pIOR != NULL)
+		{
+			CLineReader LineReader;
+			LineReader.Init(pIOR);
+			const char *pLine = LineReader.Get();
+			if(pLine != NULL)
+			{
+				sha256_from_str(&ShaAll, pLine);
+				GotSHA = true;
+			}
+		}
+	}
+
+	SHA256_DIGEST ShaAllFile;
+	sha256_from_str(&ShaAllFile, vLines[0].c_str());
+
+	// TODO: check files individually
+	if(!GotSHA || ShaAllFile != ShaAll)
+	{
+		// then the files
+		for(size_t i = 1; i < vLines.size(); ++i)
+		{
+			std::string FileName, Hash;
+			std::string::size_type n = 0;
+			std::string::size_type c = 0;
+			while((c = vLines[i].find(' ', n)) != std::string::npos)
+				n = c + 1;
+			FileName = vLines[i].substr(0, n - 1);
+			Hash = vLines[i].substr(n + 1);
+
+			std::string AssetFileName = std::string("asset_integrity_files/") + FileName;
+			SDL_RWops *pF = SDL_RWFromFile(AssetFileName.c_str(), "rb");
+
+			dbg_msg("Integrity", "Copying from assets: %s", FileName.c_str());
+
+			std::string FileNamePath = FileName;
+			std::string FileNamePathSub;
+			c = 0;
+			while((c = FileNamePath.find('/', c)) != std::string::npos)
+			{
+				FileNamePathSub = FileNamePath.substr(0, c);
+				fs_makedir(FileNamePathSub.c_str());
+				++c;
+			}
+
+			long int length;
+			SDL_RWseek(pF, 0, RW_SEEK_END);
+			length = SDL_RWtell(pF);
+			SDL_RWseek(pF, 0, RW_SEEK_SET);
+
+			char *pAl = (char *)malloc(length);
+			SDL_RWread(pF, pAl, 1, length);
+
+			SDL_RWclose(pF);
+
+			IOHANDLE pIO = io_open(FileName.c_str(), IOFLAG_WRITE);
+			io_write(pIO, pAl, length);
+			io_close(pIO);
+
+			free(pAl);
+		}
+
+		IOHANDLE pIOR = io_open("integrity_save.txt", IOFLAG_WRITE);
+		if(pIOR != NULL)
+		{
+			char aFileSHA[SHA256_MAXSTRSIZE];
+			sha256_str(ShaAllFile, aFileSHA, sizeof(aFileSHA));
+			io_write(pIOR, aFileSHA, str_length(aFileSHA));
+			io_close(pIOR);
+		}
+	}
+}
+
+#endif
diff --git a/src_bkp/antibot/antibot_data.h b/src_bkp/antibot/antibot_data.h
new file mode 100644
index 0000000000..f65f626287
--- /dev/null
+++ b/src_bkp/antibot/antibot_data.h
@@ -0,0 +1,105 @@
+#ifndef ANTIBOT_ANTIBOT_DATA_H
+#define ANTIBOT_ANTIBOT_DATA_H
+
+#include <base/vmath.h>
+
+enum
+{
+	ANTIBOT_ABI_VERSION = 9,
+
+	ANTIBOT_MSGFLAG_NONVITAL = 1,
+	ANTIBOT_MSGFLAG_FLUSH = 2,
+
+	ANTIBOT_MAX_CLIENTS = 64,
+};
+
+struct CAntibotMapData
+{
+	int m_Width;
+	int m_Height;
+	unsigned char *m_pTiles;
+};
+
+struct CAntibotPlayerData
+{
+	char m_aAddress[64];
+};
+
+struct CAntibotInputData
+{
+	int m_TargetX;
+	int m_TargetY;
+};
+
+// Defined by the network protocol, unlikely to change.
+//enum
+//{
+//	TEAM_SPECTATORS=-1,
+//	TEAM_RED=0,
+//	TEAM_BLUE=1,
+//};
+
+struct CAntibotCharacterData
+{
+	char m_aName[16];
+	CAntibotInputData m_aLatestInputs[3];
+
+	bool m_Alive;
+	bool m_Pause;
+	int m_Team;
+
+	vec2 m_Pos;
+	vec2 m_Vel;
+	int m_Angle;
+	int m_HookedPlayer;
+	int m_SpawnTick;
+	int m_WeaponChangeTick;
+};
+
+struct CAntibotVersion
+{
+	int m_AbiVersion;
+	int m_Size;
+
+	int m_SizeData;
+	int m_SizePlayerData;
+	int m_SizeCharacterData;
+	int m_SizeInputData;
+	int m_SizeMapData;
+	int m_SizeRoundData;
+};
+
+#define ANTIBOT_VERSION \
+	{ \
+		ANTIBOT_ABI_VERSION, \
+			sizeof(CAntibotVersion), \
+			sizeof(CAntibotData), \
+			sizeof(CAntibotPlayerData), \
+			sizeof(CAntibotCharacterData), \
+			sizeof(CAntibotInputData), \
+			sizeof(CAntibotMapData), \
+			sizeof(CAntibotRoundData), \
+	}
+
+struct CAntibotData
+{
+	CAntibotVersion m_Version;
+
+	int64_t m_Now;
+	int64_t m_Freq;
+	void (*m_pfnKick)(int ClientID, const char *pMessage, void *pUser);
+	void (*m_pfnLog)(const char *pMessage, void *pUser);
+	void (*m_pfnReport)(int ClientID, const char *pMessage, void *pUser);
+	void (*m_pfnSend)(int ClientID, const void *pData, int DataSize, int Flags, void *pUser);
+	void (*m_pfnTeehistorian)(const void *pData, int DataSize, void *pUser);
+	void *m_pUser;
+};
+struct CAntibotRoundData
+{
+	int m_Tick;
+	CAntibotPlayerData m_aPlayers[ANTIBOT_MAX_CLIENTS];
+	CAntibotCharacterData m_aCharacters[ANTIBOT_MAX_CLIENTS];
+	CAntibotMapData m_Map;
+};
+
+#endif // ANTIBOT_ANTIBOT_DATA_H
diff --git a/src_bkp/antibot/antibot_interface.h b/src_bkp/antibot/antibot_interface.h
new file mode 100644
index 0000000000..a982802c9e
--- /dev/null
+++ b/src_bkp/antibot/antibot_interface.h
@@ -0,0 +1,39 @@
+#ifndef ANTIBOT_ANTIBOT_INTERFACE_H
+#define ANTIBOT_ANTIBOT_INTERFACE_H
+
+#include <base/dynamic.h>
+
+#ifndef ANTIBOTAPI
+#define ANTIBOTAPI DYNAMIC_IMPORT
+#endif
+
+#include "antibot_data.h"
+extern "C" {
+
+ANTIBOTAPI int AntibotAbiVersion();
+ANTIBOTAPI void AntibotInit(CAntibotData *pCallbackData);
+ANTIBOTAPI void AntibotRoundStart(CAntibotRoundData *pRoundData);
+ANTIBOTAPI void AntibotRoundEnd(void);
+ANTIBOTAPI void AntibotUpdateData(void);
+ANTIBOTAPI void AntibotDestroy(void);
+ANTIBOTAPI void AntibotConsoleCommand(const char *pCommand);
+ANTIBOTAPI void AntibotOnPlayerInit(int ClientID);
+ANTIBOTAPI void AntibotOnPlayerDestroy(int ClientID);
+ANTIBOTAPI void AntibotOnSpawn(int ClientID);
+ANTIBOTAPI void AntibotOnHammerFireReloading(int ClientID);
+ANTIBOTAPI void AntibotOnHammerFire(int ClientID);
+ANTIBOTAPI void AntibotOnHammerHit(int ClientID, int TargetID);
+ANTIBOTAPI void AntibotOnDirectInput(int ClientID);
+ANTIBOTAPI void AntibotOnCharacterTick(int ClientID);
+ANTIBOTAPI void AntibotOnHookAttach(int ClientID, bool Player);
+ANTIBOTAPI void AntibotOnEngineTick(void);
+ANTIBOTAPI void AntibotOnEngineClientJoin(int ClientID, bool Sixup);
+ANTIBOTAPI void AntibotOnEngineClientDrop(int ClientID, const char *pReason);
+// Returns true if the message shouldn't be processed by the server.
+ANTIBOTAPI bool AntibotOnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags);
+ANTIBOTAPI bool AntibotOnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags);
+// Returns true if the server should simulate receiving a client message.
+ANTIBOTAPI bool AntibotOnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags);
+}
+
+#endif // ANTIBOT_ANTIBOT_INTERFACE_H
diff --git a/src_bkp/antibot/antibot_null.cpp b/src_bkp/antibot/antibot_null.cpp
new file mode 100644
index 0000000000..6a70c0387a
--- /dev/null
+++ b/src_bkp/antibot/antibot_null.cpp
@@ -0,0 +1,50 @@
+#define ANTIBOTAPI DYNAMIC_EXPORT
+
+#include "antibot_interface.h"
+
+#include <cstring>
+
+static CAntibotData *g_pData;
+
+extern "C" {
+
+int AntibotAbiVersion()
+{
+	return ANTIBOT_ABI_VERSION;
+}
+void AntibotInit(CAntibotData *pData)
+{
+	g_pData = pData;
+	g_pData->m_pfnLog("null antibot initialized", g_pData->m_pUser);
+}
+void AntibotRoundStart(CAntibotRoundData *pRoundData){};
+void AntibotRoundEnd(void){};
+void AntibotUpdateData(void) {}
+void AntibotDestroy(void) { g_pData = 0; }
+void AntibotConsoleCommand(const char *pCommand)
+{
+	if(strcmp(pCommand, "dump") == 0)
+	{
+		g_pData->m_pfnLog("null antibot", g_pData->m_pUser);
+	}
+	else
+	{
+		g_pData->m_pfnLog("unknown command", g_pData->m_pUser);
+	}
+}
+void AntibotOnPlayerInit(int /*ClientID*/) {}
+void AntibotOnPlayerDestroy(int /*ClientID*/) {}
+void AntibotOnSpawn(int /*ClientID*/) {}
+void AntibotOnHammerFireReloading(int /*ClientID*/) {}
+void AntibotOnHammerFire(int /*ClientID*/) {}
+void AntibotOnHammerHit(int /*ClientID*/, int /*TargetID*/) {}
+void AntibotOnDirectInput(int /*ClientID*/) {}
+void AntibotOnCharacterTick(int /*ClientID*/) {}
+void AntibotOnHookAttach(int /*ClientID*/, bool /*Player*/) {}
+void AntibotOnEngineTick(void) {}
+void AntibotOnEngineClientJoin(int /*ClientID*/, bool /*Sixup*/) {}
+void AntibotOnEngineClientDrop(int /*ClientID*/, const char * /*pReason*/) {}
+bool AntibotOnEngineClientMessage(int /*ClientID*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
+bool AntibotOnEngineServerMessage(int /*ClientID*/, const void * /*pData*/, int /*Size*/, int /*Flags*/) { return false; }
+bool AntibotOnEngineSimulateClientMessage(int * /*pClientID*/, void * /*pBuffer*/, int /*BufferSize*/, int * /*pOutSize*/, int * /*pFlags*/) { return false; }
+}
diff --git a/src_bkp/base/Cargo.toml b/src_bkp/base/Cargo.toml
new file mode 100644
index 0000000000..709a35c8e3
--- /dev/null
+++ b/src_bkp/base/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "ddnet-base"
+version = "0.0.1"
+edition = "2018"
+publish = false
+license = "Zlib"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+cxx = "1.0"
+
+[dev-dependencies]
+ddnet-test = { path = "../rust-bridge/test", features = ["link-test-libraries"] }
diff --git a/src_bkp/base/bezier.cpp b/src_bkp/base/bezier.cpp
new file mode 100644
index 0000000000..a48fce6cf5
--- /dev/null
+++ b/src_bkp/base/bezier.cpp
@@ -0,0 +1,18 @@
+#include "bezier.h"
+
+CCubicBezier CCubicBezier::With(float Start, float StartDerivative, float EndDerivative, float End)
+{
+	return CCubicBezier(Start, Start + StartDerivative / 3, End - EndDerivative / 3, End);
+}
+
+// f(t) = (1-t)³ a + 3(1-t)²t b + 3(1-t)t² c + t³ d
+float CCubicBezier::Evaluate(float t) const
+{
+	return (1 - t) * (1 - t) * (1 - t) * a + 3 * (1 - t) * (1 - t) * t * b + 3 * (1 - t) * t * t * c + t * t * t * d;
+}
+
+// f(t) = 3(1-t)²(b-a) + 6(1-t)t(c-b) + 3t²(d-c)
+float CCubicBezier::Derivative(float t) const
+{
+	return 3 * (1 - t) * (1 - t) * (b - a) + 6 * (1 - t) * t * (c - b) + 3 * t * t * (d - c);
+}
diff --git a/src_bkp/base/bezier.h b/src_bkp/base/bezier.h
new file mode 100644
index 0000000000..e199c7caf9
--- /dev/null
+++ b/src_bkp/base/bezier.h
@@ -0,0 +1,27 @@
+#ifndef BASE_BEZIER_H
+#define BASE_BEZIER_H
+
+// Evaluates the Bernstein polynomial of degree 3/a one-dimensional Bezier curve
+//
+// https://en.wikipedia.org/w/index.php?title=Bernstein_polynomial&oldid=965314973
+//
+// f(t) = (1-t)³ a + 3(1-t)²t b + 3(1-t)t² c + t³ d
+class CCubicBezier
+{
+	float a;
+	float b;
+	float c;
+	float d;
+	CCubicBezier(float a_, float b_, float c_, float d_) :
+		a(a_), b(b_), c(c_), d(d_)
+	{
+	}
+
+public:
+	CCubicBezier() {}
+	float Evaluate(float t) const;
+	float Derivative(float t) const;
+	static CCubicBezier With(float Start, float StartDerivative, float EndDerivative, float End);
+};
+
+#endif // BASE_BEZIER_H
diff --git a/src_bkp/base/color.cpp b/src_bkp/base/color.cpp
new file mode 100644
index 0000000000..81edd0c61c
--- /dev/null
+++ b/src_bkp/base/color.cpp
@@ -0,0 +1,48 @@
+#include "color.h"
+#include "system.h"
+
+template<typename T>
+std::optional<T> color_parse(const char *pStr)
+{
+	if(!str_isallnum_hex(pStr))
+		return {};
+
+	const unsigned Num = str_toulong_base(pStr, 16);
+
+	T Color;
+	switch(str_length(pStr))
+	{
+	case 3:
+		Color.x = (((Num >> 8) & 0x0F) + ((Num >> 4) & 0xF0)) / 255.0f;
+		Color.y = (((Num >> 4) & 0x0F) + ((Num >> 0) & 0xF0)) / 255.0f;
+		Color.z = (((Num >> 0) & 0x0F) + ((Num << 4) & 0xF0)) / 255.0f;
+		Color.a = 1.0f;
+		return Color;
+
+	case 4:
+		Color.x = (((Num >> 12) & 0x0F) + ((Num >> 8) & 0xF0)) / 255.0f;
+		Color.y = (((Num >> 8) & 0x0F) + ((Num >> 4) & 0xF0)) / 255.0f;
+		Color.z = (((Num >> 4) & 0x0F) + ((Num >> 0) & 0xF0)) / 255.0f;
+		Color.a = (((Num >> 0) & 0x0F) + ((Num << 4) & 0xF0)) / 255.0f;
+		return Color;
+
+	case 6:
+		Color.x = ((Num >> 16) & 0xFF) / 255.0f;
+		Color.y = ((Num >> 8) & 0xFF) / 255.0f;
+		Color.z = ((Num >> 0) & 0xFF) / 255.0f;
+		Color.a = 1.0f;
+		return Color;
+
+	case 8:
+		Color.x = ((Num >> 24) & 0xFF) / 255.0f;
+		Color.y = ((Num >> 16) & 0xFF) / 255.0f;
+		Color.z = ((Num >> 8) & 0xFF) / 255.0f;
+		Color.a = ((Num >> 0) & 0xFF) / 255.0f;
+		return Color;
+
+	default:
+		return {};
+	}
+}
+
+template std::optional<ColorRGBA> color_parse<ColorRGBA>(const char *);
diff --git a/src_bkp/base/color.h b/src_bkp/base/color.h
new file mode 100644
index 0000000000..4e84645f43
--- /dev/null
+++ b/src_bkp/base/color.h
@@ -0,0 +1,305 @@
+
+#ifndef BASE_COLOR_H
+#define BASE_COLOR_H
+
+#include <base/math.h>
+#include <base/vmath.h>
+
+#include <optional>
+
+/*
+	Title: Color handling
+*/
+/*
+	Function: RgbToHue
+		Determines the hue from RGB values
+*/
+inline float RgbToHue(float r, float g, float b)
+{
+	float h_min = minimum(r, g, b);
+	float h_max = maximum(r, g, b);
+
+	float hue = 0.0f;
+	if(h_max != h_min)
+	{
+		float c = h_max - h_min;
+		if(h_max == r)
+			hue = (g - b) / c + (g < b ? 6 : 0);
+		else if(h_max == g)
+			hue = (b - r) / c + 2;
+		else
+			hue = (r - g) / c + 4;
+	}
+
+	return hue / 6.0f;
+}
+
+// Curiously Recurring Template Pattern for type safety
+template<typename DerivedT>
+class color4_base
+{
+public:
+	union
+	{
+		float x, r, h;
+	};
+	union
+	{
+		float y, g, s;
+	};
+	union
+	{
+		float z, b, l, v;
+	};
+	union
+	{
+		float w, a;
+	};
+
+	color4_base() :
+		x(), y(), z(), a()
+	{
+	}
+
+	color4_base(const vec4 &v4)
+	{
+		x = v4.x;
+		y = v4.y;
+		z = v4.z;
+		a = v4.w;
+	}
+
+	color4_base(const vec3 &v3)
+	{
+		x = v3.x;
+		y = v3.y;
+		z = v3.z;
+		a = 1.0f;
+	}
+
+	color4_base(float nx, float ny, float nz, float na)
+	{
+		x = nx;
+		y = ny;
+		z = nz;
+		a = na;
+	}
+
+	color4_base(float nx, float ny, float nz)
+	{
+		x = nx;
+		y = ny;
+		z = nz;
+		a = 1.0f;
+	}
+
+	color4_base(unsigned col, bool alpha = false)
+	{
+		a = alpha ? ((col >> 24) & 0xFF) / 255.0f : 1.0f;
+		x = ((col >> 16) & 0xFF) / 255.0f;
+		y = ((col >> 8) & 0xFF) / 255.0f;
+		z = ((col >> 0) & 0xFF) / 255.0f;
+	}
+
+	vec4 v4() const { return vec4(x, y, z, a); }
+	operator vec4() const { return vec4(x, y, z, a); }
+	float &operator[](int index)
+	{
+		return ((float *)this)[index];
+	}
+
+	bool operator==(const color4_base &col) const { return x == col.x && y == col.y && z == col.z && a == col.a; }
+	bool operator!=(const color4_base &col) const { return x != col.x || y != col.y || z != col.z || a != col.a; }
+
+	unsigned Pack(bool Alpha = true) const
+	{
+		return (Alpha ? ((unsigned)round_to_int(a * 255.0f) << 24) : 0) + ((unsigned)round_to_int(x * 255.0f) << 16) + ((unsigned)round_to_int(y * 255.0f) << 8) + (unsigned)round_to_int(z * 255.0f);
+	}
+
+	unsigned PackAlphaLast(bool Alpha = true) const
+	{
+		if(Alpha)
+			return ((unsigned)round_to_int(x * 255.0f) << 24) + ((unsigned)round_to_int(y * 255.0f) << 16) + ((unsigned)round_to_int(z * 255.0f) << 8) + (unsigned)round_to_int(a * 255.0f);
+		return ((unsigned)round_to_int(x * 255.0f) << 16) + ((unsigned)round_to_int(y * 255.0f) << 8) + (unsigned)round_to_int(z * 255.0f);
+	}
+
+	DerivedT WithAlpha(float alpha) const
+	{
+		DerivedT col(static_cast<const DerivedT &>(*this));
+		col.a = alpha;
+		return col;
+	}
+
+	DerivedT WithMultipliedAlpha(float alpha) const
+	{
+		DerivedT col(static_cast<const DerivedT &>(*this));
+		col.a *= alpha;
+		return col;
+	}
+
+	template<typename UnpackT>
+	static UnpackT UnpackAlphaLast(unsigned Color, bool Alpha = true)
+	{
+		UnpackT Result;
+		if(Alpha)
+		{
+			Result.x = ((Color >> 24) & 0xFF) / 255.0f;
+			Result.y = ((Color >> 16) & 0xFF) / 255.0f;
+			Result.z = ((Color >> 8) & 0xFF) / 255.0f;
+			Result.a = ((Color >> 0) & 0xFF) / 255.0f;
+		}
+		else
+		{
+			Result.x = ((Color >> 16) & 0xFF) / 255.0f;
+			Result.y = ((Color >> 8) & 0xFF) / 255.0f;
+			Result.z = ((Color >> 0) & 0xFF) / 255.0f;
+			Result.a = 1.0f;
+		}
+		return Result;
+	}
+};
+
+class ColorHSLA : public color4_base<ColorHSLA>
+{
+public:
+	using color4_base::color4_base;
+	ColorHSLA(){};
+
+	constexpr static const float DARKEST_LGT = 0.5f;
+
+	ColorHSLA UnclampLighting(float Darkest = DARKEST_LGT) const
+	{
+		ColorHSLA col = *this;
+		col.l = Darkest + col.l * (1.0f - Darkest);
+		return col;
+	}
+
+	unsigned Pack(bool Alpha = true) const
+	{
+		return color4_base::Pack(Alpha);
+	}
+
+	unsigned Pack(float Darkest, bool Alpha = false) const
+	{
+		ColorHSLA col = *this;
+		col.l = (l - Darkest) / (1 - Darkest);
+		col.l = clamp(col.l, 0.0f, 1.0f);
+		return col.Pack(Alpha);
+	}
+};
+
+class ColorHSVA : public color4_base<ColorHSVA>
+{
+public:
+	using color4_base::color4_base;
+	ColorHSVA(){};
+};
+
+class ColorRGBA : public color4_base<ColorRGBA>
+{
+public:
+	using color4_base::color4_base;
+	ColorRGBA(){};
+};
+
+template<typename T, typename F>
+T color_cast(const F &) = delete;
+
+template<>
+inline ColorHSLA color_cast(const ColorRGBA &rgb)
+{
+	float Min = minimum(rgb.r, rgb.g, rgb.b);
+	float Max = maximum(rgb.r, rgb.g, rgb.b);
+
+	float c = Max - Min;
+	float h = RgbToHue(rgb.r, rgb.g, rgb.b);
+	float l = 0.5f * (Max + Min);
+	float s = (Max != 0.0f && Min != 1.0f) ? (c / (1 - (absolute(2 * l - 1)))) : 0;
+
+	return ColorHSLA(h, s, l, rgb.a);
+}
+
+template<>
+inline ColorRGBA color_cast(const ColorHSLA &hsl)
+{
+	vec3 rgb = vec3(0, 0, 0);
+
+	float h1 = hsl.h * 6;
+	float c = (1.f - absolute(2 * hsl.l - 1)) * hsl.s;
+	float x = c * (1.f - absolute(std::fmod(h1, 2) - 1.f));
+
+	switch(round_truncate(h1))
+	{
+	case 0:
+		rgb.r = c;
+		rgb.g = x;
+		break;
+	case 1:
+		rgb.r = x;
+		rgb.g = c;
+		break;
+	case 2:
+		rgb.g = c;
+		rgb.b = x;
+		break;
+	case 3:
+		rgb.g = x;
+		rgb.b = c;
+		break;
+	case 4:
+		rgb.r = x;
+		rgb.b = c;
+		break;
+	case 5:
+	case 6:
+		rgb.r = c;
+		rgb.b = x;
+		break;
+	}
+
+	float m = hsl.l - (c / 2);
+	return ColorRGBA(rgb.r + m, rgb.g + m, rgb.b + m, hsl.a);
+}
+
+template<>
+inline ColorHSLA color_cast(const ColorHSVA &hsv)
+{
+	float l = hsv.v * (1 - hsv.s * 0.5f);
+	return ColorHSLA(hsv.h, (l == 0.0f || l == 1.0f) ? 0 : (hsv.v - l) / minimum(l, 1 - l), l, hsv.a);
+}
+
+template<>
+inline ColorHSVA color_cast(const ColorHSLA &hsl)
+{
+	float v = hsl.l + hsl.s * minimum(hsl.l, 1 - hsl.l);
+	return ColorHSVA(hsl.h, v == 0.0f ? 0 : 2 - (2 * hsl.l / v), v, hsl.a);
+}
+
+template<>
+inline ColorRGBA color_cast(const ColorHSVA &hsv)
+{
+	return color_cast<ColorRGBA>(color_cast<ColorHSLA>(hsv));
+}
+
+template<>
+inline ColorHSVA color_cast(const ColorRGBA &rgb)
+{
+	return color_cast<ColorHSVA>(color_cast<ColorHSLA>(rgb));
+}
+
+template<typename T>
+T color_scale(const T &col, float s)
+{
+	return T(col.x * s, col.y * s, col.z * s, col.a * s);
+}
+
+template<typename T>
+T color_invert(const T &col)
+{
+	return T(1.0f - col.x, 1.0f - col.y, 1.0f - col.z, 1.0f - col.a);
+}
+
+template<typename T>
+std::optional<T> color_parse(const char *pStr);
+
+#endif
diff --git a/src_bkp/base/color.rs b/src_bkp/base/color.rs
new file mode 100644
index 0000000000..5514c7e475
--- /dev/null
+++ b/src_bkp/base/color.rs
@@ -0,0 +1,77 @@
+/// Color, in RGBA format. Corresponds to the C++ type `ColorRGBA`.
+///
+/// The color is represented by red, green, blue and alpha values between `0.0`
+/// and `1.0`.
+///
+/// See also <https://en.wikipedia.org/wiki/RGBA_color_model>.
+///
+/// # Examples
+///
+/// ```
+/// use ddnet_base::ColorRGBA;
+///
+/// let white = ColorRGBA { r: 1.0, g: 1.0, b: 1.0, a: 1.0 };
+/// let black = ColorRGBA { r: 0.0, g: 0.0, b: 0.0, a: 1.0 };
+/// let red = ColorRGBA { r: 1.0, g: 0.0, b: 0.0, a: 1.0 };
+/// let transparent = ColorRGBA { r: 0.0, g: 0.0, b: 0.0, a: 0.0 };
+///
+/// // #ffa500
+/// let ddnet_logo_color = ColorRGBA { r: 1.0, g: 0.6470588235294118, b: 0.0, a: 1.0 };
+/// ```
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[repr(C)]
+pub struct ColorRGBA {
+    /// Red
+    pub r: f32,
+    /// Green
+    pub g: f32,
+    /// Blue
+    pub b: f32,
+    /// Alpha (i.e. opacity. `0.0` means fully transparent, `1.0`
+    /// nontransparent).
+    pub a: f32,
+}
+
+unsafe impl cxx::ExternType for ColorRGBA {
+    type Id = cxx::type_id!("ColorRGBA");
+    type Kind = cxx::kind::Trivial;
+}
+
+/// Color, in HSLA format. Corresponds to the C++ type `ColorHSLA`.
+///
+/// The color is represented by hue, saturation, lightness and alpha values
+/// between `0.0` and `1.0`.
+///
+/// See also <https://en.wikipedia.org/wiki/HSL_and_HSV>.
+///
+/// # Examples
+///
+/// ```
+/// use ddnet_base::ColorHSLA;
+///
+/// let white = ColorHSLA { h: 0.0, s: 0.0, l: 1.0, a: 1.0 };
+/// let black = ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 };
+/// let red = ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 1.0 };
+/// let transparent = ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 0.0 };
+///
+/// // #ffa500
+/// let ddnet_logo_color = ColorHSLA { h: 0.10784314, s: 1.0, l: 0.5, a: 1.0 };
+/// ```
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[repr(C)]
+pub struct ColorHSLA {
+    /// Hue
+    pub h: f32,
+    /// Saturation
+    pub s: f32,
+    /// Lightness
+    pub l: f32,
+    /// Alpha (i.e. opacity. `0.0` means fully transparent, `1.0`
+    /// nontransparent).
+    pub a: f32,
+}
+
+unsafe impl cxx::ExternType for ColorHSLA {
+    type Id = cxx::type_id!("ColorHSLA");
+    type Kind = cxx::kind::Trivial;
+}
diff --git a/src_bkp/base/detect.h b/src_bkp/base/detect.h
new file mode 100644
index 0000000000..8bceed0861
--- /dev/null
+++ b/src_bkp/base/detect.h
@@ -0,0 +1,206 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef BASE_DETECT_H
+#define BASE_DETECT_H
+
+/*
+	this file detected the family, platform and architecture
+	to compile for.
+*/
+
+/* platforms */
+
+/* windows Family */
+#if defined(WIN64) || defined(_WIN64)
+/* Hmm, is this IA64 or x86-64? */
+#define CONF_FAMILY_WINDOWS 1
+#define CONF_FAMILY_STRING "windows"
+#define CONF_PLATFORM_WIN64 1
+#define PLATFORM_STRING "win64"
+#elif defined(WIN32) || defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__)
+#define CONF_FAMILY_WINDOWS 1
+#define CONF_FAMILY_STRING "windows"
+#define CONF_PLATFORM_WIN32 1
+#define PLATFORM_STRING "win32"
+#endif
+
+/* unix family */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_FREEBSD 1
+#define PLATFORM_STRING "freebsd"
+#endif
+
+#if defined(__NetBSD__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_NETBSD 1
+#define PLATFORM_STRING "netbsd"
+#endif
+
+#if defined(__OpenBSD__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_OPENBSD 1
+#define PLATFORM_STRING "openbsd"
+#endif
+
+#if(defined(__LINUX__) || defined(__linux__) || defined(CONF_WEBASM)) && !defined(__ANDROID__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_LINUX 1
+#define PLATFORM_STRING "linux"
+#define CONF_BACKEND_OPENGL_ES3 1
+#ifdef CONF_WEBASM
+// GLES only
+#define CONF_BACKEND_OPENGL_ES 1
+#endif
+#endif
+
+#if defined(__ANDROID__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_ANDROID 1
+#define PLATFORM_STRING "android"
+#define CONF_BACKEND_OPENGL_ES 1
+#define CONF_BACKEND_OPENGL_ES3 1
+#endif
+
+#if defined(__GNU__) || defined(__gnu__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_HURD 1
+#define PLATFORM_STRING "gnu"
+#endif
+
+#if defined(MACOSX) || defined(__APPLE__) || defined(__DARWIN__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_MACOS 1
+#define PLATFORM_STRING "macos"
+#endif
+
+#if defined(__sun)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_SOLARIS 1
+#define PLATFORM_STRING "solaris"
+#endif
+
+/* beos family */
+#if defined(__BeOS) || defined(__BEOS__)
+#define CONF_FAMILY_BEOS 1
+#define CONF_FAMILY_STRING "beos"
+#define CONF_PLATFORM_BEOS 1
+#define PLATFORM_STRING "beos"
+#endif
+
+#if defined(__HAIKU__)
+#define CONF_FAMILY_UNIX 1
+#define CONF_FAMILY_STRING "unix"
+#define CONF_PLATFORM_HAIKU 1
+#define PLATFORM_STRING "haiku"
+#endif
+
+/* use gcc endianness definitions when available */
+#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__MINGW32__) && !defined(__sun)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#include <sys/endian.h>
+#else
+#include <endian.h>
+#endif
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define CONF_ARCH_ENDIAN_BIG 1
+#endif
+#endif
+
+/* architectures */
+#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(CONF_PLATFORM_WIN32)
+#define CONF_ARCH_IA32 1
+#define CONF_ARCH_STRING "ia32"
+#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#endif
+#endif
+
+#if defined(__ia64__) || defined(_M_IA64)
+#define CONF_ARCH_IA64 1
+#define CONF_ARCH_STRING "ia64"
+#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#endif
+#endif
+
+#if defined(__amd64__) || defined(__x86_64__) || defined(_M_X64)
+#define CONF_ARCH_AMD64 1
+#define CONF_ARCH_STRING "amd64"
+#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#endif
+#endif
+
+#if defined(__powerpc__) || defined(__ppc__)
+#define CONF_ARCH_PPC 1
+#define CONF_ARCH_STRING "ppc"
+#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_BIG 1
+#endif
+#endif
+
+#if defined(__sparc__)
+#define CONF_ARCH_SPARC 1
+#define CONF_ARCH_STRING "sparc"
+#if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_BIG 1
+#endif
+#endif
+
+#if defined(__ARMEB__)
+#define CONF_ARCH_ARM 1
+#define CONF_ARCH_STRING "arm"
+#define CONF_ARCH_ENDIAN_BIG 1
+#endif
+
+#if defined(__ARMEL__)
+#define CONF_ARCH_ARM 1
+#define CONF_ARCH_STRING "arm"
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#endif
+
+#if defined(__aarch64__) || defined(__arm64__)
+#define CONF_ARCH_ARM64 1
+#define CONF_ARCH_STRING "arm64"
+#define CONF_ARCH_ENDIAN_LITTLE 1
+#endif
+
+#ifndef CONF_FAMILY_STRING
+#define CONF_FAMILY_STRING "unknown"
+#endif
+
+#ifndef PLATFORM_STRING
+#define PLATFORM_STRING "unknown"
+#endif
+
+#ifndef PLATFORM_SUFFIX
+#define PLATFORM_SUFFIX ""
+#endif
+
+#define CONF_PLATFORM_STRING PLATFORM_STRING PLATFORM_SUFFIX
+
+#ifndef CONF_ARCH_STRING
+#define CONF_ARCH_STRING "unknown"
+#endif
+
+#if defined(CONF_ARCH_ENDIAN_LITTLE)
+#define CONF_ARCH_ENDIAN_STRING "little endian"
+#elif defined(CONF_ARCH_ENDIAN_BIG)
+#define CONF_ARCH_ENDIAN_STRING "big endian"
+#else
+#error "Unsupported endianness"
+#endif
+
+#endif
diff --git a/src_bkp/base/dynamic.h b/src_bkp/base/dynamic.h
new file mode 100644
index 0000000000..7db91ca7ca
--- /dev/null
+++ b/src_bkp/base/dynamic.h
@@ -0,0 +1,14 @@
+#ifndef BASE_DYNAMIC_H
+#define BASE_DYNAMIC_H
+
+#include "detect.h"
+
+#ifdef CONF_FAMILY_WINDOWS
+#define DYNAMIC_EXPORT __declspec(dllexport)
+#define DYNAMIC_IMPORT __declspec(dllimport)
+#else
+#define DYNAMIC_EXPORT
+#define DYNAMIC_IMPORT
+#endif
+
+#endif // BASE_DYNAMIC_H
diff --git a/src_bkp/base/hash.cpp b/src_bkp/base/hash.cpp
new file mode 100644
index 0000000000..79802829d2
--- /dev/null
+++ b/src_bkp/base/hash.cpp
@@ -0,0 +1,75 @@
+#include "hash.h"
+#include "hash_ctxt.h"
+
+#include "system.h"
+
+const SHA256_DIGEST SHA256_ZEROED = {{0}};
+
+static void digest_str(const unsigned char *digest, size_t digest_len, char *str, size_t max_len)
+{
+	if(max_len > digest_len * 2 + 1)
+	{
+		max_len = digest_len * 2 + 1;
+	}
+	str[max_len - 1] = 0;
+	max_len -= 1;
+	for(size_t i = 0; i < max_len; i++)
+	{
+		static const char HEX[] = "0123456789abcdef";
+		size_t index = i / 2;
+		if(i % 2 == 0)
+		{
+			str[i] = HEX[digest[index] >> 4];
+		}
+		else
+		{
+			str[i] = HEX[digest[index] & 0xf];
+		}
+	}
+}
+
+SHA256_DIGEST sha256(const void *message, size_t message_len)
+{
+	SHA256_CTX ctxt;
+	sha256_init(&ctxt);
+	sha256_update(&ctxt, message, message_len);
+	return sha256_finish(&ctxt);
+}
+
+void sha256_str(SHA256_DIGEST digest, char *str, size_t max_len)
+{
+	digest_str(digest.data, sizeof(digest.data), str, max_len);
+}
+
+int sha256_from_str(SHA256_DIGEST *out, const char *str)
+{
+	return str_hex_decode(out->data, sizeof(out->data), str);
+}
+
+int sha256_comp(SHA256_DIGEST digest1, SHA256_DIGEST digest2)
+{
+	return mem_comp(digest1.data, digest2.data, sizeof(digest1.data));
+}
+
+MD5_DIGEST md5(const void *message, size_t message_len)
+{
+	MD5_CTX ctxt;
+	md5_init(&ctxt);
+	md5_update(&ctxt, message, message_len);
+	return md5_finish(&ctxt);
+}
+
+void md5_str(MD5_DIGEST digest, char *str, size_t max_len)
+{
+	digest_str(digest.data, sizeof(digest.data), str, max_len);
+}
+
+int md5_from_str(MD5_DIGEST *out, const char *str)
+{
+	return str_hex_decode(out->data, sizeof(out->data), str);
+}
+
+int md5_comp(MD5_DIGEST digest1, MD5_DIGEST digest2)
+{
+	return mem_comp(digest1.data, digest2.data, sizeof(digest1.data));
+}
diff --git a/src_bkp/base/hash.h b/src_bkp/base/hash.h
new file mode 100644
index 0000000000..cb1d22a976
--- /dev/null
+++ b/src_bkp/base/hash.h
@@ -0,0 +1,53 @@
+#ifndef BASE_HASH_H
+#define BASE_HASH_H
+
+#include <cstddef> // size_t
+
+enum
+{
+	SHA256_DIGEST_LENGTH = 256 / 8,
+	SHA256_MAXSTRSIZE = 2 * SHA256_DIGEST_LENGTH + 1,
+	MD5_DIGEST_LENGTH = 128 / 8,
+	MD5_MAXSTRSIZE = 2 * MD5_DIGEST_LENGTH + 1,
+};
+
+struct SHA256_DIGEST
+{
+	unsigned char data[SHA256_DIGEST_LENGTH];
+};
+
+struct MD5_DIGEST
+{
+	unsigned char data[MD5_DIGEST_LENGTH];
+};
+
+SHA256_DIGEST sha256(const void *message, size_t message_len);
+void sha256_str(SHA256_DIGEST digest, char *str, size_t max_len);
+int sha256_from_str(SHA256_DIGEST *out, const char *str);
+int sha256_comp(SHA256_DIGEST digest1, SHA256_DIGEST digest2);
+
+MD5_DIGEST md5(const void *message, size_t message_len);
+void md5_str(MD5_DIGEST digest, char *str, size_t max_len);
+int md5_from_str(MD5_DIGEST *out, const char *str);
+int md5_comp(MD5_DIGEST digest1, MD5_DIGEST digest2);
+
+extern const SHA256_DIGEST SHA256_ZEROED;
+
+inline bool operator==(const SHA256_DIGEST &that, const SHA256_DIGEST &other)
+{
+	return sha256_comp(that, other) == 0;
+}
+inline bool operator!=(const SHA256_DIGEST &that, const SHA256_DIGEST &other)
+{
+	return !(that == other);
+}
+inline bool operator==(const MD5_DIGEST &that, const MD5_DIGEST &other)
+{
+	return md5_comp(that, other) == 0;
+}
+inline bool operator!=(const MD5_DIGEST &that, const MD5_DIGEST &other)
+{
+	return !(that == other);
+}
+
+#endif // BASE_HASH_H
diff --git a/src_bkp/base/hash_bundled.cpp b/src_bkp/base/hash_bundled.cpp
new file mode 100644
index 0000000000..4f4cd5557f
--- /dev/null
+++ b/src_bkp/base/hash_bundled.cpp
@@ -0,0 +1,19 @@
+#if !defined(CONF_OPENSSL)
+
+#include "hash_ctxt.h"
+
+#include <engine/external/md5/md5.h>
+
+void md5_update(MD5_CTX *ctxt, const void *data, size_t data_len)
+{
+	md5_append(ctxt, (const md5_byte_t *)data, data_len);
+}
+
+MD5_DIGEST md5_finish(MD5_CTX *ctxt)
+{
+	MD5_DIGEST result;
+	md5_finish_(ctxt, result.data);
+	return result;
+}
+
+#endif
diff --git a/src_bkp/base/hash_ctxt.h b/src_bkp/base/hash_ctxt.h
new file mode 100644
index 0000000000..e407f04c3f
--- /dev/null
+++ b/src_bkp/base/hash_ctxt.h
@@ -0,0 +1,35 @@
+#ifndef BASE_HASH_CTXT_H
+#define BASE_HASH_CTXT_H
+
+#include "hash.h"
+#include <cstdint>
+
+#if defined(CONF_OPENSSL)
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#else
+#include <engine/external/md5/md5.h>
+#endif
+
+#if defined(CONF_OPENSSL)
+// SHA256_CTX is defined in <openssl/sha.h>
+#else
+struct SHA256_CTX
+{
+	uint64_t length;
+	uint32_t state[8];
+	uint32_t curlen;
+	unsigned char buf[64];
+};
+typedef md5_state_t MD5_CTX;
+#endif
+
+void sha256_init(SHA256_CTX *ctxt);
+void sha256_update(SHA256_CTX *ctxt, const void *data, size_t data_len);
+SHA256_DIGEST sha256_finish(SHA256_CTX *ctxt);
+
+void md5_init(MD5_CTX *ctxt);
+void md5_update(MD5_CTX *ctxt, const void *data, size_t data_len);
+MD5_DIGEST md5_finish(MD5_CTX *ctxt);
+
+#endif // BASE_HASH_CTXT_H
diff --git a/src_bkp/base/hash_libtomcrypt.cpp b/src_bkp/base/hash_libtomcrypt.cpp
new file mode 100644
index 0000000000..165422cd78
--- /dev/null
+++ b/src_bkp/base/hash_libtomcrypt.cpp
@@ -0,0 +1,208 @@
+// SHA-256. Adapted from https://github.com/kalven/sha-2, which was adapted
+// from LibTomCrypt. This code is Public Domain.
+
+#if !defined(CONF_OPENSSL)
+
+#include "hash_ctxt.h"
+
+#include <cstdint>
+#include <cstring>
+
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef SHA256_CTX sha256_state;
+
+static const u32 K[64] =
+	{
+		0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
+		0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
+		0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
+		0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+		0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
+		0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
+		0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
+		0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+		0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
+		0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
+		0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
+		0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+		0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL};
+
+static u32 minimum(u32 x, u32 y)
+{
+	return x < y ? x : y;
+}
+
+static u32 load32(const unsigned char *y)
+{
+	return ((u32)y[0] << 24) | ((u32)y[1] << 16) | ((u32)y[2] << 8) | ((u32)y[3] << 0);
+}
+
+static void store64(u64 x, unsigned char *y)
+{
+	int i;
+	for(i = 0; i != 8; ++i)
+		y[i] = (x >> ((7 - i) * 8)) & 255;
+}
+
+static void store32(u32 x, unsigned char *y)
+{
+	int i;
+	for(i = 0; i != 4; ++i)
+		y[i] = (x >> ((3 - i) * 8)) & 255;
+}
+
+static u32 Ch(u32 x, u32 y, u32 z) { return z ^ (x & (y ^ z)); }
+static u32 Maj(u32 x, u32 y, u32 z) { return ((x | y) & z) | (x & y); }
+static u32 Rot(u32 x, u32 n) { return (x >> (n & 31)) | (x << (32 - (n & 31))); }
+static u32 Sh(u32 x, u32 n) { return x >> n; }
+static u32 Sigma0(u32 x) { return Rot(x, 2) ^ Rot(x, 13) ^ Rot(x, 22); }
+static u32 Sigma1(u32 x) { return Rot(x, 6) ^ Rot(x, 11) ^ Rot(x, 25); }
+static u32 Gamma0(u32 x) { return Rot(x, 7) ^ Rot(x, 18) ^ Sh(x, 3); }
+static u32 Gamma1(u32 x) { return Rot(x, 17) ^ Rot(x, 19) ^ Sh(x, 10); }
+
+static void sha_compress(sha256_state *md, const unsigned char *buf)
+{
+	u32 S[8], W[64], t;
+	int i;
+
+	// Copy state into S
+	for(i = 0; i < 8; i++)
+		S[i] = md->state[i];
+
+	// Copy the state into 512-bits into W[0..15]
+	for(i = 0; i < 16; i++)
+		W[i] = load32(buf + (4 * i));
+
+	// Fill W[16..63]
+	for(i = 16; i < 64; i++)
+		W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
+
+// Compress
+#define RND(a, b, c, d, e, f, g, h, i) \
+	do \
+	{ \
+		u32 t0 = (h) + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \
+		u32 t1 = Sigma0(a) + Maj(a, b, c); \
+		(d) += t0; \
+		(h) = t0 + t1; \
+	} while(0)
+
+	for(i = 0; i < 64; ++i)
+	{
+		RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i);
+		t = S[7];
+		S[7] = S[6];
+		S[6] = S[5];
+		S[5] = S[4];
+		S[4] = S[3];
+		S[3] = S[2];
+		S[2] = S[1];
+		S[1] = S[0];
+		S[0] = t;
+	}
+
+	// Feedback
+	for(i = 0; i < 8; i++)
+		md->state[i] = md->state[i] + S[i];
+}
+
+// Public interface
+
+static void sha_init(sha256_state *md)
+{
+	md->curlen = 0;
+	md->length = 0;
+	md->state[0] = 0x6A09E667UL;
+	md->state[1] = 0xBB67AE85UL;
+	md->state[2] = 0x3C6EF372UL;
+	md->state[3] = 0xA54FF53AUL;
+	md->state[4] = 0x510E527FUL;
+	md->state[5] = 0x9B05688CUL;
+	md->state[6] = 0x1F83D9ABUL;
+	md->state[7] = 0x5BE0CD19UL;
+}
+
+static void sha_process(sha256_state *md, const void *src, u32 inlen)
+{
+	const u32 block_size = 64;
+	const unsigned char *in = (const unsigned char *)src;
+
+	while(inlen > 0)
+	{
+		if(md->curlen == 0 && inlen >= block_size)
+		{
+			sha_compress(md, in);
+			md->length += block_size * 8;
+			in += block_size;
+			inlen -= block_size;
+		}
+		else
+		{
+			u32 n = minimum(inlen, (block_size - md->curlen));
+			memcpy(md->buf + md->curlen, in, n);
+			md->curlen += n;
+			in += n;
+			inlen -= n;
+
+			if(md->curlen == block_size)
+			{
+				sha_compress(md, md->buf);
+				md->length += 8 * block_size;
+				md->curlen = 0;
+			}
+		}
+	}
+}
+
+static void sha_done(sha256_state *md, void *out)
+{
+	int i;
+
+	// Increase the length of the message
+	md->length += md->curlen * 8;
+
+	// Append the '1' bit
+	md->buf[md->curlen++] = (unsigned char)0x80;
+
+	// If the length is currently above 56 bytes we append zeros then compress.
+	// Then we can fall back to padding zeros and length encoding like normal.
+	if(md->curlen > 56)
+	{
+		while(md->curlen < 64)
+			md->buf[md->curlen++] = 0;
+		sha_compress(md, md->buf);
+		md->curlen = 0;
+	}
+
+	// Pad up to 56 bytes of zeroes
+	while(md->curlen < 56)
+		md->buf[md->curlen++] = 0;
+
+	// Store length
+	store64(md->length, md->buf + 56);
+	sha_compress(md, md->buf);
+
+	// Copy output
+	for(i = 0; i < 8; i++)
+		store32(md->state[i], (unsigned char *)out + (4 * i));
+}
+
+void sha256_init(SHA256_CTX *ctxt)
+{
+	sha_init(ctxt);
+}
+
+void sha256_update(SHA256_CTX *ctxt, const void *data, size_t data_len)
+{
+	sha_process(ctxt, data, data_len);
+}
+
+SHA256_DIGEST sha256_finish(SHA256_CTX *ctxt)
+{
+	SHA256_DIGEST result;
+	sha_done(ctxt, result.data);
+	return result;
+}
+
+#endif
diff --git a/src_bkp/base/hash_openssl.cpp b/src_bkp/base/hash_openssl.cpp
new file mode 100644
index 0000000000..a3a7a6ea49
--- /dev/null
+++ b/src_bkp/base/hash_openssl.cpp
@@ -0,0 +1,42 @@
+#if defined(CONF_OPENSSL)
+#include "hash_ctxt.h"
+
+#ifdef __GNUC__
+// EVP requires heap allocations, let's postpone the replacement for now
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+void sha256_init(SHA256_CTX *ctxt)
+{
+	SHA256_Init(ctxt);
+}
+
+void sha256_update(SHA256_CTX *ctxt, const void *data, size_t data_len)
+{
+	SHA256_Update(ctxt, data, data_len);
+}
+
+SHA256_DIGEST sha256_finish(SHA256_CTX *ctxt)
+{
+	SHA256_DIGEST result;
+	SHA256_Final(result.data, ctxt);
+	return result;
+}
+
+void md5_init(MD5_CTX *ctxt)
+{
+	MD5_Init(ctxt);
+}
+
+void md5_update(MD5_CTX *ctxt, const void *data, size_t data_len)
+{
+	MD5_Update(ctxt, data, data_len);
+}
+
+MD5_DIGEST md5_finish(MD5_CTX *ctxt)
+{
+	MD5_DIGEST result;
+	MD5_Final(result.data, ctxt);
+	return result;
+}
+#endif
diff --git a/src_bkp/base/lib.rs b/src_bkp/base/lib.rs
new file mode 100644
index 0000000000..1816e4655d
--- /dev/null
+++ b/src_bkp/base/lib.rs
@@ -0,0 +1,19 @@
+//! DDNet's base library, Rust part.
+//!
+//! DDNet's code base is separated into three major parts, `base`, `engine` and
+//! `game`.
+//!
+//! The base library consists of operating system abstractions, and
+//! game-independent data structures such as color handling and math vectors.
+//! Additionally, it contains some types to support the C++-Rust-translation.
+
+#![warn(missing_docs)]
+
+#[cfg(test)]
+extern crate ddnet_test;
+
+mod color;
+mod rust;
+
+pub use color::*;
+pub use rust::*;
diff --git a/src_bkp/base/lock.h b/src_bkp/base/lock.h
new file mode 100644
index 0000000000..ecebfc2050
--- /dev/null
+++ b/src_bkp/base/lock.h
@@ -0,0 +1,135 @@
+#ifndef BASE_LOCK_H
+#define BASE_LOCK_H
+
+#include <mutex>
+
+// Enable thread safety attributes only with clang.
+// The attributes can be safely erased when compiling with other compilers.
+#if defined(__clang__) && (!defined(SWIG))
+#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
+#else
+#define THREAD_ANNOTATION_ATTRIBUTE__(x) // no-op
+#endif
+
+#define CAPABILITY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
+
+#define SCOPED_CAPABILITY \
+	THREAD_ANNOTATION_ATTRIBUTE__(scoped_lockable)
+
+#define GUARDED_BY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
+
+#define PT_GUARDED_BY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
+
+#define ACQUIRED_BEFORE(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(__VA_ARGS__))
+
+#define ACQUIRED_AFTER(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(acquired_after(__VA_ARGS__))
+
+#define REQUIRES(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(requires_capability(__VA_ARGS__))
+
+#define REQUIRES_SHARED(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(requires_shared_capability(__VA_ARGS__))
+
+#define ACQUIRE(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(acquire_capability(__VA_ARGS__))
+
+#define ACQUIRE_SHARED(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(acquire_shared_capability(__VA_ARGS__))
+
+#define RELEASE(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(release_capability(__VA_ARGS__))
+
+#define RELEASE_SHARED(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(release_shared_capability(__VA_ARGS__))
+
+#define RELEASE_GENERIC(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(release_generic_capability(__VA_ARGS__))
+
+#define TRY_ACQUIRE(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_capability(__VA_ARGS__))
+
+#define TRY_ACQUIRE_SHARED(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_shared_capability(__VA_ARGS__))
+
+#define EXCLUDES(...) \
+	THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
+
+#define ASSERT_CAPABILITY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))
+
+#define ASSERT_SHARED_CAPABILITY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
+
+#define RETURN_CAPABILITY(x) \
+	THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))
+
+#define NO_THREAD_SAFETY_ANALYSIS \
+	THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
+
+/**
+ * @defgroup Locks
+ * @see Threads
+ */
+
+/**
+ * Wrapper for `std::mutex`.
+ *
+ * @ingroup Locks
+ *
+ * @remark This wrapper is only necessary because the clang thread-safety attributes
+ * are not available for `std::mutex` except when explicitly using libc++.
+ */
+class CAPABILITY("mutex") CLock
+{
+public:
+	CLock() = default;
+
+	void lock() ACQUIRE()
+	{
+		m_Mutex.lock();
+	}
+
+	void unlock() RELEASE()
+	{
+		m_Mutex.unlock();
+	}
+
+	// To support negative capabilities, otherwise EXCLUDES(m_Lock) must be used instead of REQUIRES(!m_Lock)
+	const CLock &operator!() const { return *this; }
+
+private:
+	std::mutex m_Mutex;
+};
+
+/**
+ * RAII-style wrapper for owning a `CLock`.
+ *
+ * @ingroup Locks
+ * 
+ * @remark This wrapper is only necessary because the clang thread-safety attributes
+ * are not available for `std::lock_guard` except when explicitly using libc++.
+ */
+class SCOPED_CAPABILITY CLockScope
+{
+public:
+	explicit CLockScope(CLock &Lock) ACQUIRE(Lock, m_Lock) :
+		m_Lock(Lock)
+	{
+		m_Lock.lock();
+	}
+
+	~CLockScope() RELEASE() REQUIRES(m_Lock)
+	{
+		m_Lock.unlock();
+	}
+
+private:
+	CLock &m_Lock;
+};
+
+#endif
diff --git a/src_bkp/base/log.cpp b/src_bkp/base/log.cpp
new file mode 100644
index 0000000000..b0b167c68f
--- /dev/null
+++ b/src_bkp/base/log.cpp
@@ -0,0 +1,499 @@
+#include "logger.h"
+
+#include "color.h"
+#include "system.h"
+
+#include <atomic>
+#include <cstdio>
+#include <memory>
+
+#if defined(CONF_FAMILY_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501 /* required for mingw to get getaddrinfo to work */
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#if defined(CONF_PLATFORM_ANDROID)
+#include <android/log.h>
+#endif
+
+std::atomic<ILogger *> global_logger = nullptr;
+thread_local ILogger *scope_logger = nullptr;
+thread_local bool in_logger = false;
+
+void log_set_global_logger(ILogger *logger)
+{
+	ILogger *null = nullptr;
+	if(!global_logger.compare_exchange_strong(null, logger, std::memory_order_acq_rel))
+	{
+		dbg_assert(false, "global logger has already been set and can only be set once");
+	}
+	atexit(log_global_logger_finish);
+}
+
+void log_global_logger_finish()
+{
+	ILogger *logger = global_logger.load(std::memory_order_acquire);
+	if(logger)
+		logger->GlobalFinish();
+}
+
+void log_set_global_logger_default()
+{
+	std::unique_ptr<ILogger> logger;
+#if defined(CONF_PLATFORM_ANDROID)
+	logger = log_logger_android();
+#else
+	logger = log_logger_stdout();
+#endif
+	log_set_global_logger(logger.release());
+}
+
+ILogger *log_get_scope_logger()
+{
+	if(!scope_logger)
+	{
+		scope_logger = global_logger.load(std::memory_order_acquire);
+	}
+	return scope_logger;
+}
+
+void log_set_scope_logger(ILogger *logger)
+{
+	scope_logger = logger;
+	if(!scope_logger)
+	{
+		scope_logger = global_logger.load(std::memory_order_acquire);
+	}
+}
+
+// Separate declaration, as attributes are not allowed on function definitions
+void log_log_impl(LEVEL level, bool have_color, LOG_COLOR color, const char *sys, const char *fmt, va_list args)
+	GNUC_ATTRIBUTE((format(printf, 5, 0)));
+
+void log_log_impl(LEVEL level, bool have_color, LOG_COLOR color, const char *sys, const char *fmt, va_list args)
+{
+	// Make sure we're not logging recursively.
+	if(in_logger)
+	{
+		return;
+	}
+	in_logger = true;
+	if(!scope_logger)
+	{
+		scope_logger = global_logger.load(std::memory_order_acquire);
+	}
+	if(!scope_logger)
+	{
+		in_logger = false;
+		return;
+	}
+
+	CLogMessage Msg;
+	Msg.m_Level = level;
+	Msg.m_HaveColor = have_color;
+	Msg.m_Color = color;
+	str_timestamp_format(Msg.m_aTimestamp, sizeof(Msg.m_aTimestamp), FORMAT_SPACE);
+	Msg.m_TimestampLength = str_length(Msg.m_aTimestamp);
+	str_copy(Msg.m_aSystem, sys);
+	Msg.m_SystemLength = str_length(Msg.m_aSystem);
+
+	// TODO: Add level?
+	str_format(Msg.m_aLine, sizeof(Msg.m_aLine), "%s %c %s: ", Msg.m_aTimestamp, "EWIDT"[level], Msg.m_aSystem);
+	Msg.m_LineMessageOffset = str_length(Msg.m_aLine);
+
+	char *pMessage = Msg.m_aLine + Msg.m_LineMessageOffset;
+	int MessageSize = sizeof(Msg.m_aLine) - Msg.m_LineMessageOffset;
+	str_format_v(pMessage, MessageSize, fmt, args);
+	Msg.m_LineLength = str_length(Msg.m_aLine);
+	scope_logger->Log(&Msg);
+	in_logger = false;
+}
+
+void log_log_v(LEVEL level, const char *sys, const char *fmt, va_list args)
+{
+	log_log_impl(level, false, LOG_COLOR{0, 0, 0}, sys, fmt, args);
+}
+
+void log_log(LEVEL level, const char *sys, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	log_log_impl(level, false, LOG_COLOR{0, 0, 0}, sys, fmt, args);
+	va_end(args);
+}
+
+void log_log_color_v(LEVEL level, LOG_COLOR color, const char *sys, const char *fmt, va_list args)
+{
+	log_log_impl(level, true, color, sys, fmt, args);
+}
+
+void log_log_color(LEVEL level, LOG_COLOR color, const char *sys, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	log_log_impl(level, true, color, sys, fmt, args);
+	va_end(args);
+}
+
+bool CLogFilter::Filters(const CLogMessage *pMessage)
+{
+	return pMessage->m_Level > m_MaxLevel.load(std::memory_order_relaxed);
+}
+
+#if defined(CONF_PLATFORM_ANDROID)
+class CLoggerAndroid : public ILogger
+{
+public:
+	void Log(const CLogMessage *pMessage) override
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		int AndroidLevel;
+		switch(pMessage->m_Level)
+		{
+		case LEVEL_TRACE: AndroidLevel = ANDROID_LOG_VERBOSE; break;
+		case LEVEL_DEBUG: AndroidLevel = ANDROID_LOG_DEBUG; break;
+		case LEVEL_INFO: AndroidLevel = ANDROID_LOG_INFO; break;
+		case LEVEL_WARN: AndroidLevel = ANDROID_LOG_WARN; break;
+		case LEVEL_ERROR: AndroidLevel = ANDROID_LOG_ERROR; break;
+		}
+		__android_log_write(AndroidLevel, pMessage->m_aSystem, pMessage->Message());
+	}
+};
+std::unique_ptr<ILogger> log_logger_android()
+{
+	return std::make_unique<CLoggerAndroid>();
+}
+#else
+std::unique_ptr<ILogger> log_logger_android()
+{
+	dbg_assert(0, "Android logger on non-Android");
+	return nullptr;
+}
+#endif
+
+class CLoggerCollection : public ILogger
+{
+	std::vector<std::shared_ptr<ILogger>> m_vpLoggers;
+
+public:
+	CLoggerCollection(std::vector<std::shared_ptr<ILogger>> &&vpLoggers) :
+		m_vpLoggers(std::move(vpLoggers))
+	{
+		m_Filter.m_MaxLevel.store(LEVEL_TRACE, std::memory_order_relaxed);
+	}
+	void Log(const CLogMessage *pMessage) override
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		for(auto &pLogger : m_vpLoggers)
+		{
+			pLogger->Log(pMessage);
+		}
+	}
+	void GlobalFinish() override
+	{
+		for(auto &pLogger : m_vpLoggers)
+		{
+			pLogger->GlobalFinish();
+		}
+	}
+};
+
+std::unique_ptr<ILogger> log_logger_collection(std::vector<std::shared_ptr<ILogger>> &&vpLoggers)
+{
+	return std::make_unique<CLoggerCollection>(std::move(vpLoggers));
+}
+
+class CLoggerAsync : public ILogger
+{
+	ASYNCIO *m_pAio;
+	bool m_AnsiTruecolor;
+	bool m_Close;
+
+public:
+	CLoggerAsync(IOHANDLE File, bool AnsiTruecolor, bool Close) :
+		m_pAio(aio_new(File)),
+		m_AnsiTruecolor(AnsiTruecolor),
+		m_Close(Close)
+	{
+	}
+	void Log(const CLogMessage *pMessage) override
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		aio_lock(m_pAio);
+		if(m_AnsiTruecolor)
+		{
+			// https://en.wikipedia.org/w/index.php?title=ANSI_escape_code&oldid=1077146479#24-bit
+			char aAnsi[32];
+			if(pMessage->m_HaveColor)
+			{
+				str_format(aAnsi, sizeof(aAnsi),
+					"\x1b[38;2;%d;%d;%dm",
+					pMessage->m_Color.r,
+					pMessage->m_Color.g,
+					pMessage->m_Color.b);
+				aio_write_unlocked(m_pAio, aAnsi, str_length(aAnsi));
+			}
+		}
+		aio_write_unlocked(m_pAio, pMessage->m_aLine, pMessage->m_LineLength);
+		if(m_AnsiTruecolor && pMessage->m_HaveColor)
+		{
+			const char aResetColor[] = "\x1b[0m";
+			aio_write_unlocked(m_pAio, aResetColor, str_length(aResetColor)); // reset
+		}
+		aio_write_newline_unlocked(m_pAio);
+		aio_unlock(m_pAio);
+	}
+	~CLoggerAsync() override
+	{
+		if(m_Close)
+		{
+			aio_close(m_pAio);
+		}
+		aio_wait(m_pAio);
+		aio_free(m_pAio);
+	}
+	void GlobalFinish() override
+	{
+		if(m_Close)
+		{
+			aio_close(m_pAio);
+		}
+		aio_wait(m_pAio);
+	}
+};
+
+std::unique_ptr<ILogger> log_logger_file(IOHANDLE logfile)
+{
+	return std::make_unique<CLoggerAsync>(logfile, false, true);
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+static int color_hsv_to_windows_console_color(const ColorHSVA &Hsv)
+{
+	int h = Hsv.h * 255.0f;
+	int s = Hsv.s * 255.0f;
+	int v = Hsv.v * 255.0f;
+	if(s >= 0 && s <= 10)
+	{
+		if(v <= 150)
+			return FOREGROUND_INTENSITY;
+		return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
+	}
+	if(h < 0)
+		return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
+	else if(h < 15)
+		return FOREGROUND_RED | FOREGROUND_INTENSITY;
+	else if(h < 30)
+		return FOREGROUND_GREEN | FOREGROUND_RED;
+	else if(h < 60)
+		return FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
+	else if(h < 110)
+		return FOREGROUND_GREEN | FOREGROUND_INTENSITY;
+	else if(h < 140)
+		return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
+	else if(h < 170)
+		return FOREGROUND_BLUE | FOREGROUND_INTENSITY;
+	else if(h < 195)
+		return FOREGROUND_BLUE | FOREGROUND_RED;
+	else if(h < 240)
+		return FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY;
+	else
+		return FOREGROUND_RED | FOREGROUND_INTENSITY;
+}
+
+class CWindowsConsoleLogger : public ILogger
+{
+	HANDLE m_pConsole;
+	int m_BackgroundColor;
+	int m_ForegroundColor;
+	CLock m_OutputLock;
+	bool m_Finished = false;
+
+public:
+	CWindowsConsoleLogger(HANDLE pConsole) :
+		m_pConsole(pConsole)
+	{
+		CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo;
+		if(GetConsoleScreenBufferInfo(pConsole, &ConsoleInfo))
+		{
+			m_BackgroundColor = ConsoleInfo.wAttributes & (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY);
+			m_ForegroundColor = ConsoleInfo.wAttributes & (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY);
+		}
+		else
+		{
+			m_BackgroundColor = 0;
+			m_ForegroundColor = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
+		}
+	}
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_OutputLock)
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		const std::wstring WideMessage = windows_utf8_to_wide(pMessage->m_aLine) + L"\r\n";
+
+		int Color = m_BackgroundColor;
+		if(pMessage->m_HaveColor)
+		{
+			ColorRGBA Rgba(1.0, 1.0, 1.0, 1.0);
+			Rgba.r = pMessage->m_Color.r / 255.0;
+			Rgba.g = pMessage->m_Color.g / 255.0;
+			Rgba.b = pMessage->m_Color.b / 255.0;
+			Color |= color_hsv_to_windows_console_color(color_cast<ColorHSVA>(Rgba));
+		}
+		else
+			Color |= FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
+
+		const CLockScope LockScope(m_OutputLock);
+		if(!m_Finished)
+		{
+			SetConsoleTextAttribute(m_pConsole, Color);
+			WriteConsoleW(m_pConsole, WideMessage.c_str(), WideMessage.length(), NULL, NULL);
+		}
+	}
+	void GlobalFinish() override REQUIRES(!m_OutputLock)
+	{
+		// Restore original color
+		const CLockScope LockScope(m_OutputLock);
+		SetConsoleTextAttribute(m_pConsole, m_BackgroundColor | m_ForegroundColor);
+		m_Finished = true;
+	}
+};
+class CWindowsFileLogger : public ILogger
+{
+	HANDLE m_pFile;
+	CLock m_OutputLock;
+
+public:
+	CWindowsFileLogger(HANDLE pFile) :
+		m_pFile(pFile)
+	{
+	}
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_OutputLock)
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		const CLockScope LockScope(m_OutputLock);
+		DWORD Written; // we don't care about the value, but Windows 7 crashes if we pass NULL
+		WriteFile(m_pFile, pMessage->m_aLine, pMessage->m_LineLength, &Written, NULL);
+		WriteFile(m_pFile, "\r\n", 2, &Written, NULL);
+	}
+};
+#endif
+
+std::unique_ptr<ILogger> log_logger_stdout()
+{
+#if !defined(CONF_FAMILY_WINDOWS)
+	// TODO: Only enable true color when COLORTERM contains "truecolor".
+	// https://github.com/termstandard/colors/tree/65bf0cd1ece7c15fa33a17c17528b02c99f1ae0b#checking-for-colorterm
+	const bool colors = getenv("NO_COLOR") == nullptr && isatty(STDOUT_FILENO);
+	return std::make_unique<CLoggerAsync>(io_stdout(), colors, false);
+#else
+	if(GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)) == FILE_TYPE_UNKNOWN)
+		AttachConsole(ATTACH_PARENT_PROCESS);
+	HANDLE pOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+	switch(GetFileType(pOutput))
+	{
+	case FILE_TYPE_CHAR: return std::make_unique<CWindowsConsoleLogger>(pOutput);
+	case FILE_TYPE_PIPE: [[fallthrough]]; // writing to pipe works the same as writing to a file
+	case FILE_TYPE_DISK: return std::make_unique<CWindowsFileLogger>(pOutput);
+	default: return std::make_unique<CLoggerAsync>(io_stdout(), false, false);
+	}
+#endif
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+class CLoggerWindowsDebugger : public ILogger
+{
+public:
+	void Log(const CLogMessage *pMessage) override
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		const std::wstring WideMessage = windows_utf8_to_wide(pMessage->m_aLine);
+		OutputDebugStringW(WideMessage.c_str());
+	}
+};
+std::unique_ptr<ILogger> log_logger_windows_debugger()
+{
+	return std::make_unique<CLoggerWindowsDebugger>();
+}
+#else
+std::unique_ptr<ILogger> log_logger_windows_debugger()
+{
+	dbg_assert(0, "Windows Debug logger on non-Windows");
+	return nullptr;
+}
+#endif
+
+void CFutureLogger::Set(std::shared_ptr<ILogger> pLogger)
+{
+	const CLockScope LockScope(m_PendingLock);
+	std::shared_ptr<ILogger> pNullLogger;
+	if(!std::atomic_compare_exchange_strong_explicit(&m_pLogger, &pNullLogger, pLogger, std::memory_order_acq_rel, std::memory_order_acq_rel))
+	{
+		dbg_assert(false, "future logger has already been set and can only be set once");
+	}
+	m_pLogger = std::move(pLogger);
+
+	for(const auto &Pending : m_vPending)
+	{
+		m_pLogger->Log(&Pending);
+	}
+	m_vPending.clear();
+	m_vPending.shrink_to_fit();
+}
+
+void CFutureLogger::Log(const CLogMessage *pMessage)
+{
+	auto pLogger = std::atomic_load_explicit(&m_pLogger, std::memory_order_acquire);
+	if(pLogger)
+	{
+		pLogger->Log(pMessage);
+		return;
+	}
+	const CLockScope LockScope(m_PendingLock);
+	pLogger = std::atomic_load_explicit(&m_pLogger, std::memory_order_relaxed);
+	if(pLogger)
+	{
+		pLogger->Log(pMessage);
+		return;
+	}
+	m_vPending.push_back(*pMessage);
+}
+
+void CFutureLogger::GlobalFinish()
+{
+	auto pLogger = std::atomic_load_explicit(&m_pLogger, std::memory_order_acquire);
+	if(pLogger)
+	{
+		pLogger->GlobalFinish();
+	}
+}
+
+void CFutureLogger::OnFilterChange()
+{
+	auto pLogger = std::atomic_load_explicit(&m_pLogger, std::memory_order_acquire);
+	if(pLogger)
+	{
+		pLogger->SetFilter(m_Filter);
+	}
+}
diff --git a/src_bkp/base/log.h b/src_bkp/base/log.h
new file mode 100644
index 0000000000..059fae7470
--- /dev/null
+++ b/src_bkp/base/log.h
@@ -0,0 +1,92 @@
+#ifndef BASE_LOG_H
+#define BASE_LOG_H
+
+#include <cstdarg>
+#include <cstdint>
+
+#ifdef __GNUC__
+#define GNUC_ATTRIBUTE(x) __attribute__(x)
+#else
+#define GNUC_ATTRIBUTE(x)
+#endif
+
+enum LEVEL : char
+{
+	LEVEL_ERROR,
+	LEVEL_WARN,
+	LEVEL_INFO,
+	LEVEL_DEBUG,
+	LEVEL_TRACE,
+};
+
+struct LOG_COLOR
+{
+	uint8_t r;
+	uint8_t g;
+	uint8_t b;
+};
+
+#define log_error(sys, ...) log_log(LEVEL_ERROR, sys, __VA_ARGS__)
+#define log_warn(sys, ...) log_log(LEVEL_WARN, sys, __VA_ARGS__)
+#define log_info(sys, ...) log_log(LEVEL_INFO, sys, __VA_ARGS__)
+#define log_debug(sys, ...) log_log(LEVEL_DEBUG, sys, __VA_ARGS__)
+#define log_trace(sys, ...) log_log(LEVEL_TRACE, sys, __VA_ARGS__)
+
+/**
+ * @defgroup Log
+ *
+ * Methods for outputting log messages and way of handling them.
+ */
+
+/**
+ * @ingroup Log
+ *
+ * Prints a log message.
+ *
+ * @param level Severity of the log message.
+ * @param sys A string that describes what system the message belongs to.
+ * @param fmt A printf styled format string.
+ */
+void log_log(LEVEL level, const char *sys, const char *fmt, ...)
+	GNUC_ATTRIBUTE((format(printf, 3, 4)));
+
+/**
+ * @ingroup Log
+ *
+ * Prints a log message with a given color.
+ *
+ * @param level Severity of the log message.
+ * @param color Requested color for the log message output.
+ * @param sys A string that describes what system the message belongs to.
+ * @param fmt A printf styled format string.
+ */
+void log_log_color(LEVEL level, LOG_COLOR color, const char *sys, const char *fmt, ...)
+	GNUC_ATTRIBUTE((format(printf, 4, 5)));
+
+/**
+ * @ingroup Log
+ *
+ * Same as `log_log`, but takes a `va_list` instead.
+ *
+ * @param level Severity of the log message.
+ * @param sys A string that describes what system the message belongs to.
+ * @param fmt A printf styled format string.
+ * @param args The variable argument list.
+ */
+void log_log_v(LEVEL level, const char *sys, const char *fmt, va_list args)
+	GNUC_ATTRIBUTE((format(printf, 3, 0)));
+
+/**
+ * @ingroup Log
+ *
+ * Same as `log_log_color`, but takes a `va_list` instead.
+ *
+ * @param level Severity of the log message.
+ * @param color Requested color for the log message output.
+ * @param sys A string that describes what system the message belongs to.
+ * @param fmt A printf styled format string.
+ * @param args The variable argument list.
+ */
+void log_log_color_v(LEVEL level, LOG_COLOR color, const char *sys, const char *fmt, va_list args)
+	GNUC_ATTRIBUTE((format(printf, 4, 0)));
+#endif // BASE_LOG_H
diff --git a/src_bkp/base/logger.h b/src_bkp/base/logger.h
new file mode 100644
index 0000000000..cc6575b49a
--- /dev/null
+++ b/src_bkp/base/logger.h
@@ -0,0 +1,268 @@
+#ifndef BASE_LOGGER_H
+#define BASE_LOGGER_H
+
+#include "lock.h"
+#include "log.h"
+
+#include <atomic>
+#include <memory>
+#include <vector>
+
+typedef void *IOHANDLE;
+
+/**
+ * @ingroup Log
+ *
+ * Metadata and actual content of a log message.
+ */
+class CLogMessage
+{
+public:
+	/**
+	 * Severity
+	 */
+	LEVEL m_Level;
+	bool m_HaveColor;
+	/**
+	 * The requested color of the log message. Only useful if `m_HaveColor`
+	 * is set.
+	 */
+	LOG_COLOR m_Color;
+	char m_aTimestamp[80];
+	char m_aSystem[32];
+	/**
+	 * The actual log message including the timestamp and the system.
+	 */
+	char m_aLine[4096];
+	int m_TimestampLength;
+	int m_SystemLength;
+	/**
+	 * Length of the log message including timestamp and the system.
+	 */
+	int m_LineLength;
+	int m_LineMessageOffset;
+
+	/**
+	 * The actual log message excluding timestamp and the system.
+	 */
+	const char *Message() const
+	{
+		return m_aLine + m_LineMessageOffset;
+	}
+};
+
+class CLogFilter
+{
+public:
+	/**
+	 * The highest `LEVEL` that is still logged, -1 corresponds to no
+	 * printing at all.
+	 */
+	std::atomic_int m_MaxLevel{LEVEL_INFO};
+
+	bool Filters(const CLogMessage *pMessage);
+};
+
+class ILogger
+{
+protected:
+	CLogFilter m_Filter;
+
+public:
+	virtual ~ILogger() {}
+
+	/**
+	 * Set a new filter. It's up to the logger implementation to actually
+	 * use the filter.
+	 */
+	void SetFilter(const CLogFilter &Filter)
+	{
+		m_Filter.m_MaxLevel.store(Filter.m_MaxLevel.load(std::memory_order_relaxed), std::memory_order_relaxed);
+		OnFilterChange();
+	}
+
+	/**
+	 * Send the specified message to the logging backend.
+	 *
+	 * @param pMessage Struct describing the log message.
+	 */
+	virtual void Log(const CLogMessage *pMessage) = 0;
+	/**
+	 * Flushes output buffers and shuts down.
+	 * Global loggers cannot be destroyed because they might be accessed
+	 * from multiple threads concurrently.
+	 *
+	 * This function is called on the global logger by
+	 * `log_global_logger_finish` when the program is about to shut down
+	 * and loggers are supposed to finish writing the log messages they
+	 * have received so far.
+	 *
+	 * The destructor of this `ILogger` instance will not be called if this
+	 * function is called.
+	 *
+	 * @see log_global_logger_finish
+	 */
+	virtual void GlobalFinish() {}
+	/**
+	 * Notifies the logger of a changed `m_Filter`.
+	 */
+	virtual void OnFilterChange() {}
+};
+
+/**
+ * @ingroup Log
+ *
+ * Registers a logger instance as the default logger for all current and future
+ * threads. It will only be used if no thread-local logger is set via
+ * `log_set_scope_logger`.
+ *
+ * This function can only be called once. The passed logger instance will never
+ * be freed.
+ *
+ * @param logger The global logger default.
+ */
+void log_set_global_logger(ILogger *logger);
+
+/**
+ * @ingroup Log
+ *
+ * Registers a sane default as the default logger for all current and future
+ * threads.
+ *
+ * This is logging to stdout on most platforms and to the system log on
+ * Android.
+ *
+ * @see log_set_global_logger
+ */
+void log_set_global_logger_default();
+
+/**
+ * @ingroup Log
+ *
+ * Notify global loggers of impending abnormal exit.
+ *
+ * This function is automatically called on normal exit. It notifies the global
+ * logger of the impending shutdown via `GlobalFinish`, the logger is supposed
+ * to flush its buffers and shut down.
+ *
+ * Don't call this except right before an abnormal exit.
+ */
+void log_global_logger_finish();
+
+/**
+ * @ingroup Log
+ *
+ * Get the logger active in the current scope. This might be the global default
+ * logger or some other logger set via `log_set_scope_logger`.
+ */
+ILogger *log_get_scope_logger();
+
+/**
+ * @ingroup Log
+ *
+ * Set the logger for the current thread. The logger isn't managed by the
+ * logging system, it still needs to be kept alive or freed by the caller.
+ *
+ * Consider using `CLogScope` if you only want to set the logger temporarily.
+ *
+ * @see CLogScope
+ */
+void log_set_scope_logger(ILogger *logger);
+
+/**
+ * @ingroup Log
+ *
+ * Logger for sending logs to the Android system log.
+ *
+ * Should only be called when targeting the Android platform.
+ */
+std::unique_ptr<ILogger> log_logger_android();
+
+/**
+ * @ingroup Log
+ *
+ * Logger combining a vector of other loggers.
+ */
+std::unique_ptr<ILogger> log_logger_collection(std::vector<std::shared_ptr<ILogger>> &&vpLoggers);
+
+/**
+ * @ingroup Log
+ *
+ * Logger for writing logs to the given file.
+ *
+ * @param file File to write to, must be opened for writing.
+ */
+std::unique_ptr<ILogger> log_logger_file(IOHANDLE file);
+
+/**
+ * @ingroup Log
+ *
+ * Logger for writing logs to the standard output (stdout).
+ */
+std::unique_ptr<ILogger> log_logger_stdout();
+
+/**
+ * @ingroup Log
+ *
+ * Logger for sending logs to the debugger on Windows via `OutputDebugStringW`.
+ *
+ * Should only be called when targeting the Windows platform.
+ */
+std::unique_ptr<ILogger> log_logger_windows_debugger();
+
+/**
+ * @ingroup Log
+ *
+ * Logger that collects log messages in memory until it is replaced by another
+ * logger.
+ *
+ * Useful when you want to set a global logger without all logging targets
+ * being configured.
+ *
+ * This logger forwards `SetFilter` calls, `SetFilter` calls before a logger is
+ * set have no effect.
+ */
+class CFutureLogger : public ILogger
+{
+private:
+	std::shared_ptr<ILogger> m_pLogger;
+	std::vector<CLogMessage> m_vPending;
+	CLock m_PendingLock;
+
+public:
+	/**
+	 * Replace the `CFutureLogger` instance with the given logger. It'll
+	 * receive all log messages sent to the `CFutureLogger` so far.
+	 */
+	void Set(std::shared_ptr<ILogger> pLogger) REQUIRES(!m_PendingLock);
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_PendingLock);
+	void GlobalFinish() override;
+	void OnFilterChange() override;
+};
+
+/**
+ * @ingroup Log
+ *
+ * RAII guard for temporarily changing the logger via `log_set_scope_logger`.
+ *
+ * @see log_set_scope_logger
+ */
+class CLogScope
+{
+	ILogger *old_scope_logger;
+	ILogger *new_scope_logger;
+
+public:
+	CLogScope(ILogger *logger) :
+		old_scope_logger(log_get_scope_logger()),
+		new_scope_logger(logger)
+	{
+		log_set_scope_logger(new_scope_logger);
+	}
+	~CLogScope()
+	{
+		//dbg_assert(log_get_scope_logger() == new_scope_logger, "loggers weren't properly scoped");
+		log_set_scope_logger(old_scope_logger);
+	}
+};
+#endif // BASE_LOGGER_H
diff --git a/src_bkp/base/math.h b/src_bkp/base/math.h
new file mode 100644
index 0000000000..b4b553bbc4
--- /dev/null
+++ b/src_bkp/base/math.h
@@ -0,0 +1,156 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef BASE_MATH_H
+#define BASE_MATH_H
+
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+
+using std::clamp;
+
+constexpr float pi = 3.1415926535897932384626433f;
+
+constexpr inline int round_to_int(float f)
+{
+	return f > 0 ? (int)(f + 0.5f) : (int)(f - 0.5f);
+}
+
+constexpr inline int round_truncate(float f)
+{
+	return (int)f;
+}
+
+template<typename T, typename TB>
+constexpr inline T mix(const T a, const T b, TB amount)
+{
+	return a + (b - a) * amount;
+}
+
+template<typename T, typename TB>
+inline T bezier(const T p0, const T p1, const T p2, const T p3, TB amount)
+{
+	// De-Casteljau Algorithm
+	const T c10 = mix(p0, p1, amount);
+	const T c11 = mix(p1, p2, amount);
+	const T c12 = mix(p2, p3, amount);
+
+	const T c20 = mix(c10, c11, amount);
+	const T c21 = mix(c11, c12, amount);
+
+	return mix(c20, c21, amount); // c30
+}
+
+inline float random_float()
+{
+	return rand() / (float)(RAND_MAX);
+}
+
+inline float random_float(float min, float max)
+{
+	return min + random_float() * (max - min);
+}
+
+inline float random_float(float max)
+{
+	return random_float(0.0f, max);
+}
+
+inline float random_angle()
+{
+	return 2.0f * pi * (rand() / std::nextafter((float)RAND_MAX, std::numeric_limits<float>::max()));
+}
+
+constexpr int fxpscale = 1 << 10;
+
+// float to fixed
+constexpr inline int f2fx(float v)
+{
+	return round_to_int(v * fxpscale);
+}
+constexpr inline float fx2f(int v)
+{
+	return v / (float)fxpscale;
+}
+
+// int to fixed
+constexpr inline int i2fx(int v)
+{
+	return v * fxpscale;
+}
+constexpr inline int fx2i(int v)
+{
+	return v / fxpscale;
+}
+
+class fxp
+{
+	int value;
+
+public:
+	void set(int v)
+	{
+		value = v;
+	}
+	int get() const
+	{
+		return value;
+	}
+	fxp &operator=(int v)
+	{
+		value = i2fx(v);
+		return *this;
+	}
+	fxp &operator=(float v)
+	{
+		value = f2fx(v);
+		return *this;
+	}
+	operator int() const
+	{
+		return fx2i(value);
+	}
+	operator float() const
+	{
+		return fx2f(value);
+	}
+};
+
+template<typename T>
+constexpr inline T minimum(T a, T b)
+{
+	return std::min(a, b);
+}
+template<typename T>
+constexpr inline T minimum(T a, T b, T c)
+{
+	return std::min(std::min(a, b), c);
+}
+template<typename T>
+constexpr inline T maximum(T a, T b)
+{
+	return std::max(a, b);
+}
+template<typename T>
+constexpr inline T maximum(T a, T b, T c)
+{
+	return std::max(std::max(a, b), c);
+}
+template<typename T>
+constexpr inline T absolute(T a)
+{
+	return a < T(0) ? -a : a;
+}
+
+template<typename T>
+constexpr inline T in_range(T a, T lower, T upper)
+{
+	return lower <= a && a <= upper;
+}
+template<typename T>
+constexpr inline T in_range(T a, T upper)
+{
+	return in_range(a, 0, upper);
+}
+
+#endif // BASE_MATH_H
diff --git a/src_bkp/base/rust.h b/src_bkp/base/rust.h
new file mode 100644
index 0000000000..a1c41c1186
--- /dev/null
+++ b/src_bkp/base/rust.h
@@ -0,0 +1,5 @@
+#ifndef BASE_RUST_H
+#define BASE_RUST_H
+typedef const char *StrRef;
+typedef void *UserPtr;
+#endif // BASE_RUST_H
diff --git a/src_bkp/base/rust.rs b/src_bkp/base/rust.rs
new file mode 100644
index 0000000000..b666f11818
--- /dev/null
+++ b/src_bkp/base/rust.rs
@@ -0,0 +1,268 @@
+use std::cmp;
+use std::ffi::CStr;
+use std::fmt;
+use std::marker::PhantomData;
+use std::ops;
+use std::os::raw::c_char;
+use std::ptr;
+use std::str;
+
+/// User pointer, as used in callbacks. Corresponds to the C++ type `void *`.
+///
+/// Callbacks in C are usually represented by a function pointer and some
+/// "userdata" pointer that is also passed to the function pointer. This allows
+/// to hand data to the callback. This type represents such a userdata pointer.
+///
+/// It is `unsafe` to convert the `UserPtr` back to its original pointer using
+/// [`UserPtr::cast`] because its lifetime and type information was lost.
+///
+/// When dealing with Rust code exclusively, closures are preferred.
+///
+/// # Examples
+///
+/// ```
+/// use ddnet_base::UserPtr;
+///
+/// struct CallbackData {
+///     favorite_color: &'static str,
+/// }
+///
+/// let data = CallbackData {
+///     favorite_color: "green",
+/// };
+///
+/// callback(UserPtr::from(&data));
+///
+/// fn callback(pointer: UserPtr) {
+///     let data: &CallbackData = unsafe { pointer.cast() };
+///     println!("favorite color: {}", data.favorite_color);
+/// }
+/// ```
+#[repr(transparent)]
+#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub struct UserPtr(*mut ());
+
+unsafe impl cxx::ExternType for UserPtr {
+    type Id = cxx::type_id!("UserPtr");
+    type Kind = cxx::kind::Trivial;
+}
+
+impl UserPtr {
+    /// Create a null `UserPtr`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use ddnet_base::UserPtr;
+    ///
+    /// // Can't do anything useful with this.
+    /// let _user = UserPtr::null();
+    /// ```
+    pub fn null() -> UserPtr {
+        UserPtr(ptr::null_mut())
+    }
+
+    /// Cast `UserPtr` back to a reference to its real type.
+    ///
+    /// # Safety
+    ///
+    /// The caller is responsible for checking type and lifetime correctness.
+    /// Also, they must make sure that there are only immutable references or at
+    /// most one mutable reference live at the same time.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use ddnet_base::UserPtr;
+    ///
+    /// let the_answer = 42;
+    /// let user = UserPtr::from(&the_answer);
+    ///
+    /// assert_eq!(unsafe { *user.cast::<i32>() }, 42);
+    /// ```
+    pub unsafe fn cast<T>(&self) -> &T {
+        &*(self.0 as *const _)
+    }
+
+    /// Cast `UserPtr` back to a mutable reference to its real type.
+    ///
+    /// See [`UserPtr`] documentation for details and an example.
+    ///
+    /// # Safety
+    ///
+    /// The caller is responsible for checking type and lifetime correctness.
+    /// Also, they must make sure that there are only immutable references or at
+    /// most one mutable reference live at the same time.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use ddnet_base::UserPtr;
+    ///
+    /// let mut seen_it = false;
+    /// let mut user = UserPtr::from(&mut seen_it);
+    ///
+    /// unsafe {
+    ///     *user.cast_mut() = true;
+    /// }
+    ///
+    /// assert_eq!(seen_it, true);
+    /// ```
+    pub unsafe fn cast_mut<T>(&mut self) -> &mut T {
+        &mut *(self.0 as *mut _)
+    }
+}
+
+impl<'a, T> From<&'a T> for UserPtr {
+    fn from(t: &'a T) -> UserPtr {
+        UserPtr(t as *const _ as *mut _)
+    }
+}
+
+impl<'a, T> From<&'a mut T> for UserPtr {
+    fn from(t: &'a mut T) -> UserPtr {
+        UserPtr(t as *mut _ as *mut _)
+    }
+}
+
+/// C-style string pointer to UTF-8 data. Corresponds to the C++ type `const
+/// char *`.
+///
+/// The lifetime is the lifetime of the underlying string.
+///
+/// This is a separate type from [`std::ffi::CStr`] because that type is not
+/// FFI-safe and does not guarantee UTF-8.
+///
+/// In Rust code, [`String`] is preferred. For constructing C strings,
+/// [`std::ffi::CString`] or this crate's [`s!`](`crate::s!`) macro can be used.
+///
+/// # Examples
+///
+/// ```
+/// # fn some_c_function(_: StrRef<'_>) {}
+/// use ddnet_base::StrRef;
+/// use ddnet_base::s;
+/// use std::ffi::CStr;
+/// use std::ffi::CString;
+/// use std::process;
+///
+/// some_c_function(CStr::from_bytes_with_nul(b"Hello!\0").unwrap().into());
+///
+/// let string = CString::new(format!("Current PID is {}.", process::id())).unwrap();
+/// some_c_function(string.as_ref().into());
+///
+/// fn c_function_wrapper(s: &CStr) {
+///     some_c_function(s.into());
+/// }
+///
+/// some_c_function(s!("こんにちはＣ言語"));
+/// ```
+#[repr(transparent)]
+#[derive(Eq)]
+pub struct StrRef<'a>(*const c_char, PhantomData<&'a ()>);
+
+unsafe impl<'a> cxx::ExternType for StrRef<'a> {
+    type Id = cxx::type_id!("StrRef");
+    type Kind = cxx::kind::Trivial;
+}
+
+impl<'a> StrRef<'a> {
+    /// Get the wrapped string reference.
+    ///
+    /// This does the same as the `Deref` implementation, differing only in the
+    /// returned lifetime. `Deref`'s return type is bound by `self`'s lifetime,
+    /// this returns the more correct and longer lifetime.
+    ///
+    /// This is an O(n) operation as it needs to calculate the length of a C
+    /// string by finding the first NUL byte.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use ddnet_base::s;
+    ///
+    /// let str1: &'static str = s!("static string").to_str();
+    /// ```
+    ///
+    /// ```compile_fail
+    /// use ddnet_base::s;
+    ///
+    /// // Wrong lifetime.
+    /// let str2: &'static str = &*s!("another static string");
+    /// ```
+    ///
+    pub fn to_str(&self) -> &'a str {
+        unsafe { str::from_utf8_unchecked(CStr::from_ptr(self.0).to_bytes()) }
+    }
+}
+
+impl<'a> From<&'a CStr> for StrRef<'a> {
+    fn from(s: &'a CStr) -> StrRef<'a> {
+        let bytes = s.to_bytes_with_nul();
+        str::from_utf8(bytes).expect("valid UTF-8");
+        StrRef(bytes.as_ptr() as *const _, PhantomData)
+    }
+}
+
+impl<'a> fmt::Debug for StrRef<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.to_str().fmt(f)
+    }
+}
+
+impl<'a> fmt::Display for StrRef<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.to_str().fmt(f)
+    }
+}
+
+impl<'a> cmp::PartialEq for StrRef<'a> {
+    fn eq(&self, other: &StrRef<'a>) -> bool {
+        self.to_str().eq(other.to_str())
+    }
+}
+
+impl<'a> cmp::PartialEq<&'a str> for StrRef<'a> {
+    fn eq(&self, other: &&'a str) -> bool {
+        self.to_str().eq(*other)
+    }
+}
+
+impl<'a> cmp::PartialOrd for StrRef<'a> {
+    fn partial_cmp(&self, other: &StrRef<'a>) -> Option<cmp::Ordering> {
+        self.to_str().partial_cmp(other.to_str())
+    }
+}
+
+impl<'a> cmp::Ord for StrRef<'a> {
+    fn cmp(&self, other: &StrRef<'a>) -> cmp::Ordering {
+        self.to_str().cmp(other.to_str())
+    }
+}
+
+impl<'a> ops::Deref for StrRef<'a> {
+    type Target = str;
+    fn deref(&self) -> &str {
+        self.to_str()
+    }
+}
+
+/// Construct a [`StrRef`] statically.
+///
+/// # Examples
+///
+/// ```
+/// use ddnet_base::StrRef;
+/// use ddnet_base::s;
+///
+/// let greeting: StrRef<'static> = s!("Hallöchen, C!");
+/// let status: StrRef<'static> = s!(concat!("Current file: ", file!()));
+/// ```
+#[macro_export]
+macro_rules! s {
+    ($str:expr) => {
+        ::ddnet_base::StrRef::from(
+            ::std::ffi::CStr::from_bytes_with_nul(::std::concat!($str, "\0").as_bytes()).unwrap(),
+        )
+    };
+}
diff --git a/src_bkp/base/system.cpp b/src_bkp/base/system.cpp
new file mode 100644
index 0000000000..4255afa228
--- /dev/null
+++ b/src_bkp/base/system.cpp
@@ -0,0 +1,4955 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <atomic>
+#include <cctype>
+#include <charconv>
+#include <chrono>
+#include <cinttypes>
+#include <cmath>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
+#include <iterator> // std::size
+#include <string_view>
+
+#include "lock.h"
+#include "logger.h"
+#include "system.h"
+
+#include <sys/types.h>
+
+#if defined(CONF_WEBSOCKETS)
+#include <engine/shared/websockets.h>
+#endif
+
+#if defined(CONF_FAMILY_UNIX)
+#include <csignal>
+#include <locale>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+/* unix net includes */
+#include <arpa/inet.h>
+#include <cerrno>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <dirent.h>
+
+#if defined(CONF_PLATFORM_MACOS)
+// some lock and pthread functions are already defined in headers
+// included from Carbon.h
+// this prevents having duplicate definitions of those
+#define _lock_set_user_
+#define _task_user_
+
+#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <mach-o/dyld.h>
+#include <mach/mach_time.h>
+
+#if defined(__MAC_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10
+#include <pthread/qos.h>
+#endif
+#endif
+
+#elif defined(CONF_FAMILY_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#undef _WIN32_WINNT
+// 0x0501 (Windows XP) is required for mingw to get getaddrinfo to work
+// 0x0600 (Windows Vista) is required to use RegGetValueW and RegDeleteTreeW
+#define _WIN32_WINNT 0x0600
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#include <cerrno>
+#include <cfenv>
+#include <io.h>
+#include <objbase.h>
+#include <process.h>
+#include <share.h>
+#include <shellapi.h>
+#include <shlobj.h> // SHChangeNotify
+#include <shlwapi.h>
+#include <wincrypt.h>
+#else
+#error NOT IMPLEMENTED
+#endif
+
+#if defined(CONF_PLATFORM_SOLARIS)
+#include <sys/filio.h>
+#endif
+
+IOHANDLE io_stdin()
+{
+	return stdin;
+}
+
+IOHANDLE io_stdout()
+{
+	return stdout;
+}
+
+IOHANDLE io_stderr()
+{
+	return stderr;
+}
+
+IOHANDLE io_current_exe()
+{
+	// From https://stackoverflow.com/a/1024937.
+#if defined(CONF_FAMILY_WINDOWS)
+	wchar_t wide_path[IO_MAX_PATH_LENGTH];
+	if(GetModuleFileNameW(NULL, wide_path, std::size(wide_path)) == 0 || GetLastError() != ERROR_SUCCESS)
+	{
+		return 0;
+	}
+	const std::optional<std::string> path = windows_wide_to_utf8(wide_path);
+	return path.has_value() ? io_open(path.value().c_str(), IOFLAG_READ) : 0;
+#elif defined(CONF_PLATFORM_MACOS)
+	char path[IO_MAX_PATH_LENGTH];
+	uint32_t path_size = sizeof(path);
+	if(_NSGetExecutablePath(path, &path_size))
+	{
+		return 0;
+	}
+	return io_open(path, IOFLAG_READ);
+#else
+	static const char *NAMES[] = {
+		"/proc/self/exe", // Linux, Android
+		"/proc/curproc/exe", // NetBSD
+		"/proc/curproc/file", // DragonFly
+	};
+	for(auto &name : NAMES)
+	{
+		IOHANDLE result = io_open(name, IOFLAG_READ);
+		if(result)
+		{
+			return result;
+		}
+	}
+	return 0;
+#endif
+}
+
+static NETSTATS network_stats = {0};
+
+#define VLEN 128
+#define PACKETSIZE 1400
+typedef struct
+{
+#ifdef CONF_PLATFORM_LINUX
+	int pos;
+	int size;
+	struct mmsghdr msgs[VLEN];
+	struct iovec iovecs[VLEN];
+	char bufs[VLEN][PACKETSIZE];
+	char sockaddrs[VLEN][128];
+#else
+	char buf[PACKETSIZE];
+#endif
+} NETSOCKET_BUFFER;
+
+void net_buffer_init(NETSOCKET_BUFFER *buffer);
+void net_buffer_reinit(NETSOCKET_BUFFER *buffer);
+void net_buffer_simple(NETSOCKET_BUFFER *buffer, char **buf, int *size);
+
+struct NETSOCKET_INTERNAL
+{
+	int type;
+	int ipv4sock;
+	int ipv6sock;
+	int web_ipv4sock;
+
+	NETSOCKET_BUFFER buffer;
+};
+static NETSOCKET_INTERNAL invalid_socket = {NETTYPE_INVALID, -1, -1, -1};
+
+#define AF_WEBSOCKET_INET (0xee)
+
+std::atomic_bool dbg_assert_failing = false;
+DBG_ASSERT_HANDLER dbg_assert_handler;
+
+bool dbg_assert_has_failed()
+{
+	return dbg_assert_failing.load(std::memory_order_acquire);
+}
+
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg)
+{
+	if(!test)
+	{
+		const bool already_failing = dbg_assert_has_failed();
+		dbg_assert_failing.store(true, std::memory_order_release);
+		char error[512];
+		str_format(error, sizeof(error), "%s(%d): %s", filename, line, msg);
+		dbg_msg("assert", "%s", error);
+		if(!already_failing)
+		{
+			DBG_ASSERT_HANDLER handler = dbg_assert_handler;
+			if(handler)
+				handler(error);
+		}
+		log_global_logger_finish();
+		dbg_break();
+	}
+}
+
+void dbg_break()
+{
+#ifdef __GNUC__
+	__builtin_trap();
+#else
+	abort();
+#endif
+}
+
+void dbg_assert_set_handler(DBG_ASSERT_HANDLER handler)
+{
+	dbg_assert_handler = std::move(handler);
+}
+
+void dbg_msg(const char *sys, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	log_log_v(LEVEL_INFO, sys, fmt, args);
+	va_end(args);
+}
+
+/* */
+
+void mem_copy(void *dest, const void *source, size_t size)
+{
+	memcpy(dest, source, size);
+}
+
+void mem_move(void *dest, const void *source, size_t size)
+{
+	memmove(dest, source, size);
+}
+
+int mem_comp(const void *a, const void *b, size_t size)
+{
+	return memcmp(a, b, size);
+}
+
+bool mem_has_null(const void *block, size_t size)
+{
+	const unsigned char *bytes = (const unsigned char *)block;
+	for(size_t i = 0; i < size; i++)
+	{
+		if(bytes[i] == 0)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+IOHANDLE io_open_impl(const char *filename, int flags)
+{
+	dbg_assert(flags == (IOFLAG_READ | IOFLAG_SKIP_BOM) || flags == IOFLAG_READ || flags == IOFLAG_WRITE || flags == IOFLAG_APPEND, "flags must be read, read+skipbom, write or append");
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_filename = windows_utf8_to_wide(filename);
+	DWORD desired_access;
+	DWORD creation_disposition;
+	const char *open_mode;
+	if((flags & IOFLAG_READ) != 0)
+	{
+		desired_access = FILE_READ_DATA;
+		creation_disposition = OPEN_EXISTING;
+		open_mode = "rb";
+	}
+	else if(flags == IOFLAG_WRITE)
+	{
+		desired_access = FILE_WRITE_DATA;
+		creation_disposition = OPEN_ALWAYS;
+		open_mode = "wb";
+	}
+	else if(flags == IOFLAG_APPEND)
+	{
+		desired_access = FILE_APPEND_DATA;
+		creation_disposition = OPEN_ALWAYS;
+		open_mode = "ab";
+	}
+	else
+	{
+		dbg_assert(false, "logic error");
+		return nullptr;
+	}
+	HANDLE handle = CreateFileW(wide_filename.c_str(), desired_access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, creation_disposition, FILE_ATTRIBUTE_NORMAL, nullptr);
+	if(handle == INVALID_HANDLE_VALUE)
+		return nullptr;
+	const int file_descriptor = _open_osfhandle((intptr_t)handle, 0);
+	dbg_assert(file_descriptor != -1, "_open_osfhandle failure");
+	FILE *file_stream = _fdopen(file_descriptor, open_mode);
+	dbg_assert(file_stream != nullptr, "_fdopen failure");
+	return file_stream;
+#else
+	const char *open_mode;
+	if((flags & IOFLAG_READ) != 0)
+	{
+		open_mode = "rb";
+	}
+	else if(flags == IOFLAG_WRITE)
+	{
+		open_mode = "wb";
+	}
+	else if(flags == IOFLAG_APPEND)
+	{
+		open_mode = "ab";
+	}
+	else
+	{
+		dbg_assert(false, "logic error");
+		return nullptr;
+	}
+	return fopen(filename, open_mode);
+#endif
+}
+
+IOHANDLE io_open(const char *filename, int flags)
+{
+	IOHANDLE result = io_open_impl(filename, flags);
+	unsigned char buf[3];
+	if((flags & IOFLAG_SKIP_BOM) == 0 || !result)
+	{
+		return result;
+	}
+	if(io_read(result, buf, sizeof(buf)) != 3 || buf[0] != 0xef || buf[1] != 0xbb || buf[2] != 0xbf)
+	{
+		io_seek(result, 0, IOSEEK_START);
+	}
+	return result;
+}
+
+unsigned io_read(IOHANDLE io, void *buffer, unsigned size)
+{
+	return fread(buffer, 1, size, (FILE *)io);
+}
+
+void io_read_all(IOHANDLE io, void **result, unsigned *result_len)
+{
+	long signed_len = io_length(io);
+	unsigned len = signed_len < 0 ? 1024 : (unsigned)signed_len; // use default initial size if we couldn't get the length
+	char *buffer = (char *)malloc(len + 1);
+	unsigned read = io_read(io, buffer, len + 1); // +1 to check if the file size is larger than expected
+	if(read < len)
+	{
+		buffer = (char *)realloc(buffer, read + 1);
+		len = read;
+	}
+	else if(read > len)
+	{
+		unsigned cap = 2 * read;
+		len = read;
+		buffer = (char *)realloc(buffer, cap);
+		while((read = io_read(io, buffer + len, cap - len)) != 0)
+		{
+			len += read;
+			if(len == cap)
+			{
+				cap *= 2;
+				buffer = (char *)realloc(buffer, cap);
+			}
+		}
+		buffer = (char *)realloc(buffer, len + 1);
+	}
+	buffer[len] = 0;
+	*result = buffer;
+	*result_len = len;
+}
+
+char *io_read_all_str(IOHANDLE io)
+{
+	void *buffer;
+	unsigned len;
+	io_read_all(io, &buffer, &len);
+	if(mem_has_null(buffer, len))
+	{
+		free(buffer);
+		return nullptr;
+	}
+	return (char *)buffer;
+}
+
+int io_skip(IOHANDLE io, int size)
+{
+	return io_seek(io, size, IOSEEK_CUR);
+}
+
+int io_seek(IOHANDLE io, int offset, int origin)
+{
+	int real_origin;
+	switch(origin)
+	{
+	case IOSEEK_START:
+		real_origin = SEEK_SET;
+		break;
+	case IOSEEK_CUR:
+		real_origin = SEEK_CUR;
+		break;
+	case IOSEEK_END:
+		real_origin = SEEK_END;
+		break;
+	default:
+		dbg_assert(false, "origin invalid");
+		return -1;
+	}
+	return fseek((FILE *)io, offset, real_origin);
+}
+
+long int io_tell(IOHANDLE io)
+{
+	return ftell((FILE *)io);
+}
+
+long int io_length(IOHANDLE io)
+{
+	long int length;
+	io_seek(io, 0, IOSEEK_END);
+	length = io_tell(io);
+	io_seek(io, 0, IOSEEK_START);
+	return length;
+}
+
+int io_error(IOHANDLE io)
+{
+	return ferror((FILE *)io);
+}
+
+unsigned io_write(IOHANDLE io, const void *buffer, unsigned size)
+{
+	return fwrite(buffer, 1, size, (FILE *)io);
+}
+
+bool io_write_newline(IOHANDLE io)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return io_write(io, "\r\n", 2) == 2;
+#else
+	return io_write(io, "\n", 1) == 1;
+#endif
+}
+
+int io_close(IOHANDLE io)
+{
+	return fclose((FILE *)io) != 0;
+}
+
+int io_flush(IOHANDLE io)
+{
+	return fflush((FILE *)io);
+}
+
+int io_sync(IOHANDLE io)
+{
+	if(io_flush(io))
+	{
+		return 1;
+	}
+#if defined(CONF_FAMILY_WINDOWS)
+	return FlushFileBuffers((HANDLE)_get_osfhandle(_fileno((FILE *)io))) == FALSE;
+#else
+	return fsync(fileno((FILE *)io)) != 0;
+#endif
+}
+
+#define ASYNC_BUFSIZE (8 * 1024)
+#define ASYNC_LOCAL_BUFSIZE (64 * 1024)
+
+struct ASYNCIO
+{
+	CLock lock;
+	IOHANDLE io;
+	SEMAPHORE sphore;
+	void *thread;
+
+	unsigned char *buffer;
+	unsigned int buffer_size;
+	unsigned int read_pos;
+	unsigned int write_pos;
+
+	int error;
+	unsigned char finish;
+	unsigned char refcount;
+};
+
+enum
+{
+	ASYNCIO_RUNNING,
+	ASYNCIO_CLOSE,
+	ASYNCIO_EXIT,
+};
+
+struct BUFFERS
+{
+	unsigned char *buf1;
+	unsigned int len1;
+	unsigned char *buf2;
+	unsigned int len2;
+};
+
+static void buffer_ptrs(ASYNCIO *aio, struct BUFFERS *buffers)
+{
+	mem_zero(buffers, sizeof(*buffers));
+	if(aio->read_pos < aio->write_pos)
+	{
+		buffers->buf1 = aio->buffer + aio->read_pos;
+		buffers->len1 = aio->write_pos - aio->read_pos;
+	}
+	else if(aio->read_pos > aio->write_pos)
+	{
+		buffers->buf1 = aio->buffer + aio->read_pos;
+		buffers->len1 = aio->buffer_size - aio->read_pos;
+		buffers->buf2 = aio->buffer;
+		buffers->len2 = aio->write_pos;
+	}
+}
+
+static void aio_handle_free_and_unlock(ASYNCIO *aio) RELEASE(aio->lock)
+{
+	int do_free;
+	aio->refcount--;
+
+	do_free = aio->refcount == 0;
+	aio->lock.unlock();
+	if(do_free)
+	{
+		free(aio->buffer);
+		sphore_destroy(&aio->sphore);
+		delete aio;
+	}
+}
+
+static void aio_thread(void *user)
+{
+	ASYNCIO *aio = (ASYNCIO *)user;
+
+	aio->lock.lock();
+	while(true)
+	{
+		struct BUFFERS buffers;
+		int result_io_error;
+		unsigned char local_buffer[ASYNC_LOCAL_BUFSIZE];
+		unsigned int local_buffer_len = 0;
+
+		if(aio->read_pos == aio->write_pos)
+		{
+			if(aio->finish != ASYNCIO_RUNNING)
+			{
+				if(aio->finish == ASYNCIO_CLOSE)
+				{
+					io_close(aio->io);
+				}
+				aio_handle_free_and_unlock(aio);
+				break;
+			}
+			aio->lock.unlock();
+			sphore_wait(&aio->sphore);
+			aio->lock.lock();
+			continue;
+		}
+
+		buffer_ptrs(aio, &buffers);
+		if(buffers.buf1)
+		{
+			if(buffers.len1 > sizeof(local_buffer) - local_buffer_len)
+			{
+				buffers.len1 = sizeof(local_buffer) - local_buffer_len;
+			}
+			mem_copy(local_buffer + local_buffer_len, buffers.buf1, buffers.len1);
+			local_buffer_len += buffers.len1;
+			if(buffers.buf2)
+			{
+				if(buffers.len2 > sizeof(local_buffer) - local_buffer_len)
+				{
+					buffers.len2 = sizeof(local_buffer) - local_buffer_len;
+				}
+				mem_copy(local_buffer + local_buffer_len, buffers.buf2, buffers.len2);
+				local_buffer_len += buffers.len2;
+			}
+		}
+		aio->read_pos = (aio->read_pos + buffers.len1 + buffers.len2) % aio->buffer_size;
+		aio->lock.unlock();
+
+		io_write(aio->io, local_buffer, local_buffer_len);
+		io_flush(aio->io);
+		result_io_error = io_error(aio->io);
+
+		aio->lock.lock();
+		aio->error = result_io_error;
+	}
+}
+
+ASYNCIO *aio_new(IOHANDLE io)
+{
+	ASYNCIO *aio = new ASYNCIO;
+	if(!aio)
+	{
+		return 0;
+	}
+	aio->io = io;
+	sphore_init(&aio->sphore);
+	aio->thread = 0;
+
+	aio->buffer = (unsigned char *)malloc(ASYNC_BUFSIZE);
+	if(!aio->buffer)
+	{
+		sphore_destroy(&aio->sphore);
+		delete aio;
+		return 0;
+	}
+	aio->buffer_size = ASYNC_BUFSIZE;
+	aio->read_pos = 0;
+	aio->write_pos = 0;
+	aio->error = 0;
+	aio->finish = ASYNCIO_RUNNING;
+	aio->refcount = 2;
+
+	aio->thread = thread_init(aio_thread, aio, "aio");
+	if(!aio->thread)
+	{
+		free(aio->buffer);
+		sphore_destroy(&aio->sphore);
+		delete aio;
+		return 0;
+	}
+	return aio;
+}
+
+static unsigned int buffer_len(ASYNCIO *aio)
+{
+	if(aio->write_pos >= aio->read_pos)
+	{
+		return aio->write_pos - aio->read_pos;
+	}
+	else
+	{
+		return aio->buffer_size + aio->write_pos - aio->read_pos;
+	}
+}
+
+static unsigned int next_buffer_size(unsigned int cur_size, unsigned int need_size)
+{
+	while(cur_size < need_size)
+	{
+		cur_size *= 2;
+	}
+	return cur_size;
+}
+
+void aio_lock(ASYNCIO *aio) ACQUIRE(aio->lock)
+{
+	aio->lock.lock();
+}
+
+void aio_unlock(ASYNCIO *aio) RELEASE(aio->lock)
+{
+	aio->lock.unlock();
+	sphore_signal(&aio->sphore);
+}
+
+void aio_write_unlocked(ASYNCIO *aio, const void *buffer, unsigned size)
+{
+	unsigned int remaining;
+	remaining = aio->buffer_size - buffer_len(aio);
+
+	// Don't allow full queue to distinguish between empty and full queue.
+	if(size < remaining)
+	{
+		unsigned int remaining_contiguous = aio->buffer_size - aio->write_pos;
+		if(size > remaining_contiguous)
+		{
+			mem_copy(aio->buffer + aio->write_pos, buffer, remaining_contiguous);
+			size -= remaining_contiguous;
+			buffer = ((unsigned char *)buffer) + remaining_contiguous;
+			aio->write_pos = 0;
+		}
+		mem_copy(aio->buffer + aio->write_pos, buffer, size);
+		aio->write_pos = (aio->write_pos + size) % aio->buffer_size;
+	}
+	else
+	{
+		// Add 1 so the new buffer isn't completely filled.
+		unsigned int new_written = buffer_len(aio) + size + 1;
+		unsigned int next_size = next_buffer_size(aio->buffer_size, new_written);
+		unsigned int next_len = 0;
+		unsigned char *next_buffer = (unsigned char *)malloc(next_size);
+
+		struct BUFFERS buffers;
+		buffer_ptrs(aio, &buffers);
+		if(buffers.buf1)
+		{
+			mem_copy(next_buffer + next_len, buffers.buf1, buffers.len1);
+			next_len += buffers.len1;
+			if(buffers.buf2)
+			{
+				mem_copy(next_buffer + next_len, buffers.buf2, buffers.len2);
+				next_len += buffers.len2;
+			}
+		}
+		mem_copy(next_buffer + next_len, buffer, size);
+		next_len += size;
+
+		free(aio->buffer);
+		aio->buffer = next_buffer;
+		aio->buffer_size = next_size;
+		aio->read_pos = 0;
+		aio->write_pos = next_len;
+	}
+}
+
+void aio_write(ASYNCIO *aio, const void *buffer, unsigned size)
+{
+	aio_lock(aio);
+	aio_write_unlocked(aio, buffer, size);
+	aio_unlock(aio);
+}
+
+void aio_write_newline_unlocked(ASYNCIO *aio)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	aio_write_unlocked(aio, "\r\n", 2);
+#else
+	aio_write_unlocked(aio, "\n", 1);
+#endif
+}
+
+void aio_write_newline(ASYNCIO *aio)
+{
+	aio_lock(aio);
+	aio_write_newline_unlocked(aio);
+	aio_unlock(aio);
+}
+
+int aio_error(ASYNCIO *aio)
+{
+	CLockScope ls(aio->lock);
+	return aio->error;
+}
+
+void aio_free(ASYNCIO *aio)
+{
+	aio->lock.lock();
+	if(aio->thread)
+	{
+		thread_detach(aio->thread);
+		aio->thread = 0;
+	}
+	aio_handle_free_and_unlock(aio);
+}
+
+void aio_close(ASYNCIO *aio)
+{
+	{
+		CLockScope ls(aio->lock);
+		aio->finish = ASYNCIO_CLOSE;
+	}
+	sphore_signal(&aio->sphore);
+}
+
+void aio_wait(ASYNCIO *aio)
+{
+	void *thread;
+	{
+		CLockScope ls(aio->lock);
+		thread = aio->thread;
+		aio->thread = 0;
+		if(aio->finish == ASYNCIO_RUNNING)
+		{
+			aio->finish = ASYNCIO_EXIT;
+		}
+	}
+	sphore_signal(&aio->sphore);
+	thread_wait(thread);
+}
+
+struct THREAD_RUN
+{
+	void (*threadfunc)(void *);
+	void *u;
+};
+
+#if defined(CONF_FAMILY_UNIX)
+static void *thread_run(void *user)
+#elif defined(CONF_FAMILY_WINDOWS)
+static unsigned long __stdcall thread_run(void *user)
+#else
+#error not implemented
+#endif
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	CWindowsComLifecycle WindowsComLifecycle(false);
+#endif
+	struct THREAD_RUN *data = (THREAD_RUN *)user;
+	void (*threadfunc)(void *) = data->threadfunc;
+	void *u = data->u;
+	free(data);
+	threadfunc(u);
+	return 0;
+}
+
+void *thread_init(void (*threadfunc)(void *), void *u, const char *name)
+{
+	struct THREAD_RUN *data = (THREAD_RUN *)malloc(sizeof(*data));
+	data->threadfunc = threadfunc;
+	data->u = u;
+#if defined(CONF_FAMILY_UNIX)
+	{
+		pthread_t id;
+		pthread_attr_t attr;
+		pthread_attr_init(&attr);
+#if defined(CONF_PLATFORM_MACOS) && defined(__MAC_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10
+		pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0);
+#endif
+		dbg_assert(pthread_create(&id, &attr, thread_run, data) == 0, "pthread_create failure");
+		return (void *)id;
+	}
+#elif defined(CONF_FAMILY_WINDOWS)
+	HANDLE thread = CreateThread(nullptr, 0, thread_run, data, 0, nullptr);
+	dbg_assert(thread != nullptr, "CreateThread failure");
+	// TODO: Set thread name using SetThreadDescription (would require minimum Windows 10 version 1607)
+	return thread;
+#else
+#error not implemented
+#endif
+}
+
+void thread_wait(void *thread)
+{
+#if defined(CONF_FAMILY_UNIX)
+	int result = pthread_join((pthread_t)thread, NULL);
+	if(result != 0)
+		dbg_msg("thread", "!! %d", result);
+#elif defined(CONF_FAMILY_WINDOWS)
+	WaitForSingleObject((HANDLE)thread, INFINITE);
+	CloseHandle(thread);
+#else
+#error not implemented
+#endif
+}
+
+void thread_yield()
+{
+#if defined(CONF_FAMILY_UNIX)
+	int result = sched_yield();
+	if(result != 0)
+		dbg_msg("thread", "yield failed: %d", errno);
+#elif defined(CONF_FAMILY_WINDOWS)
+	Sleep(0);
+#else
+#error not implemented
+#endif
+}
+
+void thread_detach(void *thread)
+{
+#if defined(CONF_FAMILY_UNIX)
+	int result = pthread_detach((pthread_t)(thread));
+	if(result != 0)
+		dbg_msg("thread", "detach failed: %d", result);
+#elif defined(CONF_FAMILY_WINDOWS)
+	CloseHandle(thread);
+#else
+#error not implemented
+#endif
+}
+
+bool thread_init_and_detach(void (*threadfunc)(void *), void *u, const char *name)
+{
+	void *thread = thread_init(threadfunc, u, name);
+	if(thread)
+		thread_detach(thread);
+	return thread != nullptr;
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+void sphore_init(SEMAPHORE *sem)
+{
+	*sem = CreateSemaphore(0, 0, 10000, 0);
+}
+void sphore_wait(SEMAPHORE *sem) { WaitForSingleObject((HANDLE)*sem, INFINITE); }
+void sphore_signal(SEMAPHORE *sem) { ReleaseSemaphore((HANDLE)*sem, 1, NULL); }
+void sphore_destroy(SEMAPHORE *sem) { CloseHandle((HANDLE)*sem); }
+#elif defined(CONF_PLATFORM_MACOS)
+void sphore_init(SEMAPHORE *sem)
+{
+	char aBuf[64];
+	str_format(aBuf, sizeof(aBuf), "%p", (void *)sem);
+	*sem = sem_open(aBuf, O_CREAT | O_EXCL, S_IRWXU | S_IRWXG, 0);
+	if(*sem == SEM_FAILED)
+		dbg_msg("sphore", "init failed: %d", errno);
+}
+void sphore_wait(SEMAPHORE *sem) { sem_wait(*sem); }
+void sphore_signal(SEMAPHORE *sem) { sem_post(*sem); }
+void sphore_destroy(SEMAPHORE *sem)
+{
+	char aBuf[64];
+	sem_close(*sem);
+	str_format(aBuf, sizeof(aBuf), "%p", (void *)sem);
+	sem_unlink(aBuf);
+}
+#elif defined(CONF_FAMILY_UNIX)
+void sphore_init(SEMAPHORE *sem)
+{
+	if(sem_init(sem, 0, 0) != 0)
+		dbg_msg("sphore", "init failed: %d", errno);
+}
+
+void sphore_wait(SEMAPHORE *sem)
+{
+	do
+	{
+		errno = 0;
+		if(sem_wait(sem) != 0)
+			dbg_msg("sphore", "wait failed: %d", errno);
+	} while(errno == EINTR);
+}
+
+void sphore_signal(SEMAPHORE *sem)
+{
+	if(sem_post(sem) != 0)
+		dbg_msg("sphore", "post failed: %d", errno);
+}
+void sphore_destroy(SEMAPHORE *sem)
+{
+	if(sem_destroy(sem) != 0)
+		dbg_msg("sphore", "destroy failed: %d", errno);
+}
+#endif
+
+static int new_tick = -1;
+
+void set_new_tick()
+{
+	new_tick = 1;
+}
+
+/* -----  time ----- */
+static_assert(std::chrono::steady_clock::is_steady, "Compiler does not support steady clocks, it might be out of date.");
+static_assert(std::chrono::steady_clock::period::den / std::chrono::steady_clock::period::num >= 1000000000, "Compiler has a bad timer precision and might be out of date.");
+static const std::chrono::time_point<std::chrono::steady_clock> tw_start_time = std::chrono::steady_clock::now();
+
+int64_t time_get_impl()
+{
+	return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now() - tw_start_time).count();
+}
+
+int64_t time_get()
+{
+	static int64_t last = 0;
+	if(new_tick == 0)
+		return last;
+	if(new_tick != -1)
+		new_tick = 0;
+
+	last = time_get_impl();
+	return last;
+}
+
+int64_t time_freq()
+{
+	using namespace std::chrono_literals;
+	return std::chrono::nanoseconds(1s).count();
+}
+
+/* -----  network ----- */
+
+const NETADDR NETADDR_ZEROED = {NETTYPE_INVALID, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0};
+
+static void netaddr_to_sockaddr_in(const NETADDR *src, struct sockaddr_in *dest)
+{
+	mem_zero(dest, sizeof(struct sockaddr_in));
+	if(src->type != NETTYPE_IPV4 && src->type != NETTYPE_WEBSOCKET_IPV4)
+	{
+		dbg_msg("system", "couldn't convert NETADDR of type %d to ipv4", src->type);
+		return;
+	}
+
+	dest->sin_family = AF_INET;
+	dest->sin_port = htons(src->port);
+	mem_copy(&dest->sin_addr.s_addr, src->ip, 4);
+}
+
+static void netaddr_to_sockaddr_in6(const NETADDR *src, struct sockaddr_in6 *dest)
+{
+	mem_zero(dest, sizeof(struct sockaddr_in6));
+	if(src->type != NETTYPE_IPV6)
+	{
+		dbg_msg("system", "couldn't not convert NETADDR of type %d to ipv6", src->type);
+		return;
+	}
+
+	dest->sin6_family = AF_INET6;
+	dest->sin6_port = htons(src->port);
+	mem_copy(&dest->sin6_addr.s6_addr, src->ip, 16);
+}
+
+static void sockaddr_to_netaddr(const struct sockaddr *src, NETADDR *dst)
+{
+	if(src->sa_family == AF_INET)
+	{
+		mem_zero(dst, sizeof(NETADDR));
+		dst->type = NETTYPE_IPV4;
+		dst->port = htons(((struct sockaddr_in *)src)->sin_port);
+		mem_copy(dst->ip, &((struct sockaddr_in *)src)->sin_addr.s_addr, 4);
+	}
+	else if(src->sa_family == AF_WEBSOCKET_INET)
+	{
+		mem_zero(dst, sizeof(NETADDR));
+		dst->type = NETTYPE_WEBSOCKET_IPV4;
+		dst->port = htons(((struct sockaddr_in *)src)->sin_port);
+		mem_copy(dst->ip, &((struct sockaddr_in *)src)->sin_addr.s_addr, 4);
+	}
+	else if(src->sa_family == AF_INET6)
+	{
+		mem_zero(dst, sizeof(NETADDR));
+		dst->type = NETTYPE_IPV6;
+		dst->port = htons(((struct sockaddr_in6 *)src)->sin6_port);
+		mem_copy(dst->ip, &((struct sockaddr_in6 *)src)->sin6_addr.s6_addr, 16);
+	}
+	else
+	{
+		mem_zero(dst, sizeof(struct sockaddr));
+		dbg_msg("system", "couldn't convert sockaddr of family %d", src->sa_family);
+	}
+}
+
+int net_addr_comp(const NETADDR *a, const NETADDR *b)
+{
+	return mem_comp(a, b, sizeof(NETADDR));
+}
+
+bool NETADDR::operator==(const NETADDR &other) const
+{
+	return net_addr_comp(this, &other) == 0;
+}
+
+int net_addr_comp_noport(const NETADDR *a, const NETADDR *b)
+{
+	NETADDR ta = *a, tb = *b;
+	ta.port = tb.port = 0;
+
+	return net_addr_comp(&ta, &tb);
+}
+
+void net_addr_str_v6(const unsigned short ip[8], int port, char *buffer, int buffer_size)
+{
+	int longest_seq_len = 0;
+	int longest_seq_start = -1;
+	int w = 0;
+	int i;
+	{
+		int seq_len = 0;
+		int seq_start = -1;
+		// Determine longest sequence of zeros.
+		for(i = 0; i < 8 + 1; i++)
+		{
+			if(seq_start != -1)
+			{
+				if(i == 8 || ip[i] != 0)
+				{
+					if(longest_seq_len < seq_len)
+					{
+						longest_seq_len = seq_len;
+						longest_seq_start = seq_start;
+					}
+					seq_len = 0;
+					seq_start = -1;
+				}
+				else
+				{
+					seq_len += 1;
+				}
+			}
+			else
+			{
+				if(i != 8 && ip[i] == 0)
+				{
+					seq_start = i;
+					seq_len = 1;
+				}
+			}
+		}
+	}
+	if(longest_seq_len <= 1)
+	{
+		longest_seq_len = 0;
+		longest_seq_start = -1;
+	}
+	w += str_copy(buffer + w, "[", buffer_size - w);
+	for(i = 0; i < 8; i++)
+	{
+		if(longest_seq_start <= i && i < longest_seq_start + longest_seq_len)
+		{
+			if(i == longest_seq_start)
+			{
+				w += str_copy(buffer + w, "::", buffer_size - w);
+			}
+		}
+		else
+		{
+			const char *colon = (i == 0 || i == longest_seq_start + longest_seq_len) ? "" : ":";
+			w += str_format(buffer + w, buffer_size - w, "%s%x", colon, ip[i]);
+		}
+	}
+	w += str_copy(buffer + w, "]", buffer_size - w);
+	if(port >= 0)
+	{
+		str_format(buffer + w, buffer_size - w, ":%d", port);
+	}
+}
+
+void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port)
+{
+	if(addr->type == NETTYPE_IPV4 || addr->type == NETTYPE_WEBSOCKET_IPV4)
+	{
+		if(add_port != 0)
+			str_format(string, max_length, "%d.%d.%d.%d:%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3], addr->port);
+		else
+			str_format(string, max_length, "%d.%d.%d.%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
+	}
+	else if(addr->type == NETTYPE_IPV6)
+	{
+		int port = -1;
+		unsigned short ip[8];
+		int i;
+		if(add_port)
+		{
+			port = addr->port;
+		}
+		for(i = 0; i < 8; i++)
+		{
+			ip[i] = (addr->ip[i * 2] << 8) | (addr->ip[i * 2 + 1]);
+		}
+		net_addr_str_v6(ip, port, string, max_length);
+	}
+	else
+		str_format(string, max_length, "unknown type %d", addr->type);
+}
+
+static int priv_net_extract(const char *hostname, char *host, int max_host, int *port)
+{
+	int i;
+
+	*port = 0;
+	host[0] = 0;
+
+	if(hostname[0] == '[')
+	{
+		// ipv6 mode
+		for(i = 1; i < max_host && hostname[i] && hostname[i] != ']'; i++)
+			host[i - 1] = hostname[i];
+		host[i - 1] = 0;
+		if(hostname[i] != ']') // malformatted
+			return -1;
+
+		i++;
+		if(hostname[i] == ':')
+			*port = str_toint(hostname + i + 1);
+	}
+	else
+	{
+		// generic mode (ipv4, hostname etc)
+		for(i = 0; i < max_host - 1 && hostname[i] && hostname[i] != ':'; i++)
+			host[i] = hostname[i];
+		host[i] = 0;
+
+		if(hostname[i] == ':')
+			*port = str_toint(hostname + i + 1);
+	}
+
+	return 0;
+}
+
+int net_host_lookup_impl(const char *hostname, NETADDR *addr, int types)
+{
+	struct addrinfo hints;
+	struct addrinfo *result = NULL;
+	int e;
+	char host[256];
+	int port = 0;
+
+	if(priv_net_extract(hostname, host, sizeof(host), &port))
+		return -1;
+
+	dbg_msg("host_lookup", "host='%s' port=%d %d", host, port, types);
+
+	mem_zero(&hints, sizeof(hints));
+
+	hints.ai_family = AF_UNSPEC;
+
+	if(types == NETTYPE_IPV4)
+		hints.ai_family = AF_INET;
+	else if(types == NETTYPE_IPV6)
+		hints.ai_family = AF_INET6;
+
+	e = getaddrinfo(host, NULL, &hints, &result);
+
+	if(!result)
+		return -1;
+
+	if(e != 0)
+	{
+		freeaddrinfo(result);
+		return -1;
+	}
+
+	sockaddr_to_netaddr(result->ai_addr, addr);
+	addr->port = port;
+	freeaddrinfo(result);
+	return 0;
+}
+
+int net_host_lookup(const char *hostname, NETADDR *addr, int types)
+{
+	const char *ws_hostname = str_startswith(hostname, "ws://");
+	if(ws_hostname)
+	{
+		if((types & NETTYPE_WEBSOCKET_IPV4) == 0)
+		{
+			return -1;
+		}
+		int result = net_host_lookup_impl(ws_hostname, addr, NETTYPE_IPV4);
+		if(result == 0 && addr->type == NETTYPE_IPV4)
+		{
+			addr->type = NETTYPE_WEBSOCKET_IPV4;
+		}
+		return result;
+	}
+	return net_host_lookup_impl(hostname, addr, types & ~NETTYPE_WEBSOCKET_IPV4);
+}
+
+static int parse_int(int *out, const char **str)
+{
+	int i = 0;
+	*out = 0;
+	if(**str < '0' || **str > '9')
+		return -1;
+
+	i = **str - '0';
+	(*str)++;
+
+	while(true)
+	{
+		if(**str < '0' || **str > '9')
+		{
+			*out = i;
+			return 0;
+		}
+
+		i = (i * 10) + (**str - '0');
+		(*str)++;
+	}
+
+	return 0;
+}
+
+static int parse_char(char c, const char **str)
+{
+	if(**str != c)
+		return -1;
+	(*str)++;
+	return 0;
+}
+
+static int parse_uint8(unsigned char *out, const char **str)
+{
+	int i;
+	if(parse_int(&i, str) != 0)
+		return -1;
+	if(i < 0 || i > 0xff)
+		return -1;
+	*out = i;
+	return 0;
+}
+
+static int parse_uint16(unsigned short *out, const char **str)
+{
+	int i;
+	if(parse_int(&i, str) != 0)
+		return -1;
+	if(i < 0 || i > 0xffff)
+		return -1;
+	*out = i;
+	return 0;
+}
+
+int net_addr_from_url(NETADDR *addr, const char *string, char *host_buf, size_t host_buf_size)
+{
+	char host[128];
+	int length;
+	int start = 0;
+	int end;
+	int failure;
+	const char *str = str_startswith(string, "tw-0.6+udp://");
+	if(!str)
+		return 1;
+
+	mem_zero(addr, sizeof(*addr));
+
+	length = str_length(str);
+	end = length;
+	for(int i = 0; i < length; i++)
+	{
+		if(str[i] == '@')
+		{
+			if(start != 0)
+			{
+				// Two at signs.
+				return true;
+			}
+			start = i + 1;
+		}
+		else if(str[i] == '/' || str[i] == '?' || str[i] == '#')
+		{
+			end = i;
+			break;
+		}
+	}
+	str_truncate(host, sizeof(host), str + start, end - start);
+	if(host_buf)
+		str_copy(host_buf, host, host_buf_size);
+
+	if((failure = net_addr_from_str(addr, host)))
+		return failure;
+
+	return failure;
+}
+
+int net_addr_from_str(NETADDR *addr, const char *string)
+{
+	const char *str = string;
+	mem_zero(addr, sizeof(NETADDR));
+
+	if(str[0] == '[')
+	{
+		/* ipv6 */
+		struct sockaddr_in6 sa6;
+		char buf[128];
+		int i;
+		str++;
+		for(i = 0; i < 127 && str[i] && str[i] != ']'; i++)
+			buf[i] = str[i];
+		buf[i] = 0;
+		str += i;
+#if defined(CONF_FAMILY_WINDOWS)
+		{
+			int size;
+			sa6.sin6_family = AF_INET6;
+			size = (int)sizeof(sa6);
+			if(WSAStringToAddressA(buf, AF_INET6, NULL, (struct sockaddr *)&sa6, &size) != 0)
+				return -1;
+		}
+#else
+		sa6.sin6_family = AF_INET6;
+
+		if(inet_pton(AF_INET6, buf, &sa6.sin6_addr) != 1)
+			return -1;
+#endif
+		sockaddr_to_netaddr((struct sockaddr *)&sa6, addr);
+
+		if(*str == ']')
+		{
+			str++;
+			if(*str == ':')
+			{
+				str++;
+				if(parse_uint16(&addr->port, &str))
+					return -1;
+			}
+			else
+			{
+				addr->port = 0;
+			}
+		}
+		else
+			return -1;
+
+		return 0;
+	}
+	else
+	{
+		/* ipv4 */
+		if(parse_uint8(&addr->ip[0], &str))
+			return -1;
+		if(parse_char('.', &str))
+			return -1;
+		if(parse_uint8(&addr->ip[1], &str))
+			return -1;
+		if(parse_char('.', &str))
+			return -1;
+		if(parse_uint8(&addr->ip[2], &str))
+			return -1;
+		if(parse_char('.', &str))
+			return -1;
+		if(parse_uint8(&addr->ip[3], &str))
+			return -1;
+		if(*str == ':')
+		{
+			str++;
+			if(parse_uint16(&addr->port, &str))
+				return -1;
+		}
+		if(*str != '\0')
+			return -1;
+
+		addr->type = NETTYPE_IPV4;
+	}
+
+	return 0;
+}
+
+static void priv_net_close_socket(int sock)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	closesocket(sock);
+#else
+	if(close(sock) != 0)
+		dbg_msg("socket", "close failed: %d", errno);
+#endif
+}
+
+static int priv_net_close_all_sockets(NETSOCKET sock)
+{
+	/* close down ipv4 */
+	if(sock->ipv4sock >= 0)
+	{
+		priv_net_close_socket(sock->ipv4sock);
+		sock->ipv4sock = -1;
+		sock->type &= ~NETTYPE_IPV4;
+	}
+
+#if defined(CONF_WEBSOCKETS)
+	/* close down websocket_ipv4 */
+	if(sock->web_ipv4sock >= 0)
+	{
+		websocket_destroy(sock->web_ipv4sock);
+		sock->web_ipv4sock = -1;
+		sock->type &= ~NETTYPE_WEBSOCKET_IPV4;
+	}
+#endif
+
+	/* close down ipv6 */
+	if(sock->ipv6sock >= 0)
+	{
+		priv_net_close_socket(sock->ipv6sock);
+		sock->ipv6sock = -1;
+		sock->type &= ~NETTYPE_IPV6;
+	}
+
+	free(sock);
+	return 0;
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+std::string windows_format_system_message(unsigned long error)
+{
+	WCHAR *wide_message;
+	const DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK;
+	if(FormatMessageW(flags, NULL, error, 0, (LPWSTR)&wide_message, 0, NULL) == 0)
+		return "unknown error";
+
+	std::optional<std::string> message = windows_wide_to_utf8(wide_message);
+	LocalFree(wide_message);
+	return message.value_or("(invalid UTF-16 in error message)");
+}
+#endif
+
+static int priv_net_create_socket(int domain, int type, struct sockaddr *addr, int sockaddrlen)
+{
+	int sock, e;
+
+	/* create socket */
+	sock = socket(domain, type, 0);
+	if(sock < 0)
+	{
+#if defined(CONF_FAMILY_WINDOWS)
+		int error = WSAGetLastError();
+		const std::string message = windows_format_system_message(error);
+		dbg_msg("net", "failed to create socket with domain %d and type %d (%d '%s')", domain, type, error, message.c_str());
+#else
+		dbg_msg("net", "failed to create socket with domain %d and type %d (%d '%s')", domain, type, errno, strerror(errno));
+#endif
+		return -1;
+	}
+
+#if defined(CONF_FAMILY_UNIX)
+	/* on tcp sockets set SO_REUSEADDR
+		to fix port rebind on restart */
+	if(domain == AF_INET && type == SOCK_STREAM)
+	{
+		int option = 1;
+		if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)) != 0)
+			dbg_msg("socket", "Setting SO_REUSEADDR failed: %d", errno);
+	}
+#endif
+
+	/* set to IPv6 only if that's what we are creating */
+#if defined(IPV6_V6ONLY) /* windows sdk 6.1 and higher */
+	if(domain == AF_INET6)
+	{
+		int ipv6only = 1;
+		if(setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&ipv6only, sizeof(ipv6only)) != 0)
+			dbg_msg("socket", "Setting V6ONLY failed: %d", errno);
+	}
+#endif
+
+	/* bind the socket */
+	e = bind(sock, addr, sockaddrlen);
+	if(e != 0)
+	{
+#if defined(CONF_FAMILY_WINDOWS)
+		int error = WSAGetLastError();
+		const std::string message = windows_format_system_message(error);
+		dbg_msg("net", "failed to bind socket with domain %d and type %d (%d '%s')", domain, type, error, message.c_str());
+#else
+		dbg_msg("net", "failed to bind socket with domain %d and type %d (%d '%s')", domain, type, errno, strerror(errno));
+#endif
+		priv_net_close_socket(sock);
+		return -1;
+	}
+
+	/* return the newly created socket */
+	return sock;
+}
+
+int net_socket_type(NETSOCKET sock)
+{
+	return sock->type;
+}
+
+NETSOCKET net_udp_create(NETADDR bindaddr)
+{
+	NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
+	*sock = invalid_socket;
+	NETADDR tmpbindaddr = bindaddr;
+	int broadcast = 1;
+	int socket = -1;
+
+	if(bindaddr.type & NETTYPE_IPV4)
+	{
+		struct sockaddr_in addr;
+
+		/* bind, we should check for error */
+		tmpbindaddr.type = NETTYPE_IPV4;
+		netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
+		socket = priv_net_create_socket(AF_INET, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket >= 0)
+		{
+			sock->type |= NETTYPE_IPV4;
+			sock->ipv4sock = socket;
+
+			/* set broadcast */
+			if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
+				dbg_msg("socket", "Setting BROADCAST on ipv4 failed: %d", errno);
+
+			{
+				/* set DSCP/TOS */
+				int iptos = 0x10 /* IPTOS_LOWDELAY */;
+				//int iptos = 46; /* High Priority */
+				if(setsockopt(socket, IPPROTO_IP, IP_TOS, (char *)&iptos, sizeof(iptos)) != 0)
+					dbg_msg("socket", "Setting TOS on ipv4 failed: %d", errno);
+			}
+		}
+	}
+#if defined(CONF_WEBSOCKETS)
+	if(bindaddr.type & NETTYPE_WEBSOCKET_IPV4)
+	{
+		char addr_str[NETADDR_MAXSTRSIZE];
+
+		/* bind, we should check for error */
+		tmpbindaddr.type = NETTYPE_WEBSOCKET_IPV4;
+
+		net_addr_str(&tmpbindaddr, addr_str, sizeof(addr_str), 0);
+		socket = websocket_create(addr_str, tmpbindaddr.port);
+
+		if(socket >= 0)
+		{
+			sock->type |= NETTYPE_WEBSOCKET_IPV4;
+			sock->web_ipv4sock = socket;
+		}
+	}
+#endif
+
+	if(bindaddr.type & NETTYPE_IPV6)
+	{
+		struct sockaddr_in6 addr;
+
+		/* bind, we should check for error */
+		tmpbindaddr.type = NETTYPE_IPV6;
+		netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
+		socket = priv_net_create_socket(AF_INET6, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket >= 0)
+		{
+			sock->type |= NETTYPE_IPV6;
+			sock->ipv6sock = socket;
+
+			/* set broadcast */
+			if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
+				dbg_msg("socket", "Setting BROADCAST on ipv6 failed: %d", errno);
+
+			{
+				/* set DSCP/TOS */
+				int iptos = 0x10 /* IPTOS_LOWDELAY */;
+				//int iptos = 46; /* High Priority */
+				if(setsockopt(socket, IPPROTO_IP, IP_TOS, (char *)&iptos, sizeof(iptos)) != 0)
+					dbg_msg("socket", "Setting TOS on ipv6 failed: %d", errno);
+			}
+		}
+	}
+
+	if(socket < 0)
+	{
+		free(sock);
+		sock = nullptr;
+	}
+	else
+	{
+		/* set non-blocking */
+		net_set_non_blocking(sock);
+
+		net_buffer_init(&sock->buffer);
+	}
+
+	/* return */
+	return sock;
+}
+
+int net_udp_send(NETSOCKET sock, const NETADDR *addr, const void *data, int size)
+{
+	int d = -1;
+
+	if(addr->type & NETTYPE_IPV4)
+	{
+		if(sock->ipv4sock >= 0)
+		{
+			struct sockaddr_in sa;
+			if(addr->type & NETTYPE_LINK_BROADCAST)
+			{
+				mem_zero(&sa, sizeof(sa));
+				sa.sin_port = htons(addr->port);
+				sa.sin_family = AF_INET;
+				sa.sin_addr.s_addr = INADDR_BROADCAST;
+			}
+			else
+				netaddr_to_sockaddr_in(addr, &sa);
+
+			d = sendto((int)sock->ipv4sock, (const char *)data, size, 0, (struct sockaddr *)&sa, sizeof(sa));
+		}
+		else
+			dbg_msg("net", "can't send ipv4 traffic to this socket");
+	}
+
+#if defined(CONF_WEBSOCKETS)
+	if(addr->type & NETTYPE_WEBSOCKET_IPV4)
+	{
+		if(sock->web_ipv4sock >= 0)
+		{
+			char addr_str[NETADDR_MAXSTRSIZE];
+			str_format(addr_str, sizeof(addr_str), "%d.%d.%d.%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
+			d = websocket_send(sock->web_ipv4sock, (const unsigned char *)data, size, addr_str, addr->port);
+		}
+
+		else
+			dbg_msg("net", "can't send websocket_ipv4 traffic to this socket");
+	}
+#endif
+
+	if(addr->type & NETTYPE_IPV6)
+	{
+		if(sock->ipv6sock >= 0)
+		{
+			struct sockaddr_in6 sa;
+			if(addr->type & NETTYPE_LINK_BROADCAST)
+			{
+				mem_zero(&sa, sizeof(sa));
+				sa.sin6_port = htons(addr->port);
+				sa.sin6_family = AF_INET6;
+				sa.sin6_addr.s6_addr[0] = 0xff; /* multicast */
+				sa.sin6_addr.s6_addr[1] = 0x02; /* link local scope */
+				sa.sin6_addr.s6_addr[15] = 1; /* all nodes */
+			}
+			else
+				netaddr_to_sockaddr_in6(addr, &sa);
+
+			d = sendto((int)sock->ipv6sock, (const char *)data, size, 0, (struct sockaddr *)&sa, sizeof(sa));
+		}
+		else
+			dbg_msg("net", "can't send ipv6 traffic to this socket");
+	}
+	/*
+	else
+		dbg_msg("net", "can't send to network of type %d", addr->type);
+		*/
+
+	/*if(d < 0)
+	{
+		char addrstr[256];
+		net_addr_str(addr, addrstr, sizeof(addrstr));
+
+		dbg_msg("net", "sendto error (%d '%s')", errno, strerror(errno));
+		dbg_msg("net", "\tsock = %d %x", sock, sock);
+		dbg_msg("net", "\tsize = %d %x", size, size);
+		dbg_msg("net", "\taddr = %s", addrstr);
+
+	}*/
+	network_stats.sent_bytes += size;
+	network_stats.sent_packets++;
+	return d;
+}
+
+void net_buffer_init(NETSOCKET_BUFFER *buffer)
+{
+#if defined(CONF_PLATFORM_LINUX)
+	int i;
+	buffer->pos = 0;
+	buffer->size = 0;
+	mem_zero(buffer->msgs, sizeof(buffer->msgs));
+	mem_zero(buffer->iovecs, sizeof(buffer->iovecs));
+	mem_zero(buffer->sockaddrs, sizeof(buffer->sockaddrs));
+	for(i = 0; i < VLEN; ++i)
+	{
+		buffer->iovecs[i].iov_base = buffer->bufs[i];
+		buffer->iovecs[i].iov_len = PACKETSIZE;
+		buffer->msgs[i].msg_hdr.msg_iov = &(buffer->iovecs[i]);
+		buffer->msgs[i].msg_hdr.msg_iovlen = 1;
+		buffer->msgs[i].msg_hdr.msg_name = &(buffer->sockaddrs[i]);
+		buffer->msgs[i].msg_hdr.msg_namelen = sizeof(buffer->sockaddrs[i]);
+	}
+#endif
+}
+
+void net_buffer_reinit(NETSOCKET_BUFFER *buffer)
+{
+#if defined(CONF_PLATFORM_LINUX)
+	for(int i = 0; i < VLEN; i++)
+	{
+		buffer->msgs[i].msg_hdr.msg_namelen = sizeof(buffer->sockaddrs[i]);
+	}
+#endif
+}
+
+void net_buffer_simple(NETSOCKET_BUFFER *buffer, char **buf, int *size)
+{
+#if defined(CONF_PLATFORM_LINUX)
+	*buf = buffer->bufs[0];
+	*size = sizeof(buffer->bufs[0]);
+#else
+	*buf = buffer->buf;
+	*size = sizeof(buffer->buf);
+#endif
+}
+
+int net_udp_recv(NETSOCKET sock, NETADDR *addr, unsigned char **data)
+{
+	char sockaddrbuf[128];
+	int bytes = 0;
+
+#if defined(CONF_PLATFORM_LINUX)
+	if(sock->ipv4sock >= 0)
+	{
+		if(sock->buffer.pos >= sock->buffer.size)
+		{
+			net_buffer_reinit(&sock->buffer);
+			sock->buffer.size = recvmmsg(sock->ipv4sock, sock->buffer.msgs, VLEN, 0, NULL);
+			sock->buffer.pos = 0;
+		}
+	}
+
+	if(sock->ipv6sock >= 0)
+	{
+		if(sock->buffer.pos >= sock->buffer.size)
+		{
+			net_buffer_reinit(&sock->buffer);
+			sock->buffer.size = recvmmsg(sock->ipv6sock, sock->buffer.msgs, VLEN, 0, NULL);
+			sock->buffer.pos = 0;
+		}
+	}
+
+	if(sock->buffer.pos < sock->buffer.size)
+	{
+		sockaddr_to_netaddr((struct sockaddr *)&(sock->buffer.sockaddrs[sock->buffer.pos]), addr);
+		bytes = sock->buffer.msgs[sock->buffer.pos].msg_len;
+		*data = (unsigned char *)sock->buffer.bufs[sock->buffer.pos];
+		sock->buffer.pos++;
+		network_stats.recv_bytes += bytes;
+		network_stats.recv_packets++;
+		return bytes;
+	}
+#else
+	if(sock->ipv4sock >= 0)
+	{
+		socklen_t fromlen = sizeof(struct sockaddr_in);
+		bytes = recvfrom(sock->ipv4sock, sock->buffer.buf, sizeof(sock->buffer.buf), 0, (struct sockaddr *)&sockaddrbuf, &fromlen);
+		*data = (unsigned char *)sock->buffer.buf;
+	}
+
+	if(bytes <= 0 && sock->ipv6sock >= 0)
+	{
+		socklen_t fromlen = sizeof(struct sockaddr_in6);
+		bytes = recvfrom(sock->ipv6sock, sock->buffer.buf, sizeof(sock->buffer.buf), 0, (struct sockaddr *)&sockaddrbuf, &fromlen);
+		*data = (unsigned char *)sock->buffer.buf;
+	}
+#endif
+
+#if defined(CONF_WEBSOCKETS)
+	if(bytes <= 0 && sock->web_ipv4sock >= 0)
+	{
+		char *buf;
+		int size;
+		net_buffer_simple(&sock->buffer, &buf, &size);
+		socklen_t fromlen = sizeof(struct sockaddr);
+		struct sockaddr_in *sockaddrbuf_in = (struct sockaddr_in *)&sockaddrbuf;
+		bytes = websocket_recv(sock->web_ipv4sock, (unsigned char *)buf, size, sockaddrbuf_in, fromlen);
+		*data = (unsigned char *)buf;
+		sockaddrbuf_in->sin_family = AF_WEBSOCKET_INET;
+	}
+#endif
+
+	if(bytes > 0)
+	{
+		sockaddr_to_netaddr((struct sockaddr *)&sockaddrbuf, addr);
+		network_stats.recv_bytes += bytes;
+		network_stats.recv_packets++;
+		return bytes;
+	}
+	else if(bytes == 0)
+		return 0;
+	return -1; /* error */
+}
+
+int net_udp_close(NETSOCKET sock)
+{
+	return priv_net_close_all_sockets(sock);
+}
+
+NETSOCKET net_tcp_create(NETADDR bindaddr)
+{
+	NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
+	*sock = invalid_socket;
+	NETADDR tmpbindaddr = bindaddr;
+	int socket = -1;
+
+	if(bindaddr.type & NETTYPE_IPV4)
+	{
+		struct sockaddr_in addr;
+
+		/* bind, we should check for error */
+		tmpbindaddr.type = NETTYPE_IPV4;
+		netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
+		socket = priv_net_create_socket(AF_INET, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket >= 0)
+		{
+			sock->type |= NETTYPE_IPV4;
+			sock->ipv4sock = socket;
+		}
+	}
+
+	if(bindaddr.type & NETTYPE_IPV6)
+	{
+		struct sockaddr_in6 addr;
+
+		/* bind, we should check for error */
+		tmpbindaddr.type = NETTYPE_IPV6;
+		netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
+		socket = priv_net_create_socket(AF_INET6, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
+		if(socket >= 0)
+		{
+			sock->type |= NETTYPE_IPV6;
+			sock->ipv6sock = socket;
+		}
+	}
+
+	if(socket < 0)
+	{
+		free(sock);
+		sock = nullptr;
+	}
+
+	/* return */
+	return sock;
+}
+
+static int net_set_blocking_impl(NETSOCKET sock, bool blocking)
+{
+	unsigned long mode = blocking ? 0 : 1;
+	const char *mode_str = blocking ? "blocking" : "non-blocking";
+	int sockets[] = {sock->ipv4sock, sock->ipv6sock};
+	const char *socket_str[] = {"ipv4", "ipv6"};
+
+	for(size_t i = 0; i < std::size(sockets); ++i)
+	{
+		if(sockets[i] >= 0)
+		{
+#if defined(CONF_FAMILY_WINDOWS)
+			int result = ioctlsocket(sockets[i], FIONBIO, (unsigned long *)&mode);
+			if(result != NO_ERROR)
+				dbg_msg("socket", "setting %s %s failed: %d", socket_str[i], mode_str, result);
+#else
+			if(ioctl(sockets[i], FIONBIO, (unsigned long *)&mode) == -1)
+				dbg_msg("socket", "setting %s %s failed: %d", socket_str[i], mode_str, errno);
+#endif
+		}
+	}
+
+	return 0;
+}
+
+int net_set_non_blocking(NETSOCKET sock)
+{
+	return net_set_blocking_impl(sock, false);
+}
+
+int net_set_blocking(NETSOCKET sock)
+{
+	return net_set_blocking_impl(sock, true);
+}
+
+int net_tcp_listen(NETSOCKET sock, int backlog)
+{
+	int err = -1;
+	if(sock->ipv4sock >= 0)
+		err = listen(sock->ipv4sock, backlog);
+	if(sock->ipv6sock >= 0)
+		err = listen(sock->ipv6sock, backlog);
+	return err;
+}
+
+int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *a)
+{
+	int s;
+	socklen_t sockaddr_len;
+
+	*new_sock = nullptr;
+
+	if(sock->ipv4sock >= 0)
+	{
+		struct sockaddr_in addr;
+		sockaddr_len = sizeof(addr);
+
+		s = accept(sock->ipv4sock, (struct sockaddr *)&addr, &sockaddr_len);
+
+		if(s != -1)
+		{
+			sockaddr_to_netaddr((const struct sockaddr *)&addr, a);
+
+			*new_sock = (NETSOCKET_INTERNAL *)malloc(sizeof(**new_sock));
+			**new_sock = invalid_socket;
+			(*new_sock)->type = NETTYPE_IPV4;
+			(*new_sock)->ipv4sock = s;
+			return s;
+		}
+	}
+
+	if(sock->ipv6sock >= 0)
+	{
+		struct sockaddr_in6 addr;
+		sockaddr_len = sizeof(addr);
+
+		s = accept(sock->ipv6sock, (struct sockaddr *)&addr, &sockaddr_len);
+
+		if(s != -1)
+		{
+			*new_sock = (NETSOCKET_INTERNAL *)malloc(sizeof(**new_sock));
+			**new_sock = invalid_socket;
+			sockaddr_to_netaddr((const struct sockaddr *)&addr, a);
+			(*new_sock)->type = NETTYPE_IPV6;
+			(*new_sock)->ipv6sock = s;
+			return s;
+		}
+	}
+
+	return -1;
+}
+
+int net_tcp_connect(NETSOCKET sock, const NETADDR *a)
+{
+	if(a->type & NETTYPE_IPV4)
+	{
+		struct sockaddr_in addr;
+		netaddr_to_sockaddr_in(a, &addr);
+		return connect(sock->ipv4sock, (struct sockaddr *)&addr, sizeof(addr));
+	}
+
+	if(a->type & NETTYPE_IPV6)
+	{
+		struct sockaddr_in6 addr;
+		netaddr_to_sockaddr_in6(a, &addr);
+		return connect(sock->ipv6sock, (struct sockaddr *)&addr, sizeof(addr));
+	}
+
+	return -1;
+}
+
+int net_tcp_connect_non_blocking(NETSOCKET sock, NETADDR bindaddr)
+{
+	int res = 0;
+
+	net_set_non_blocking(sock);
+	res = net_tcp_connect(sock, &bindaddr);
+	net_set_blocking(sock);
+
+	return res;
+}
+
+int net_tcp_send(NETSOCKET sock, const void *data, int size)
+{
+	int bytes = -1;
+
+	if(sock->ipv4sock >= 0)
+		bytes = send((int)sock->ipv4sock, (const char *)data, size, 0);
+	if(sock->ipv6sock >= 0)
+		bytes = send((int)sock->ipv6sock, (const char *)data, size, 0);
+
+	return bytes;
+}
+
+int net_tcp_recv(NETSOCKET sock, void *data, int maxsize)
+{
+	int bytes = -1;
+
+	if(sock->ipv4sock >= 0)
+		bytes = recv((int)sock->ipv4sock, (char *)data, maxsize, 0);
+	if(sock->ipv6sock >= 0)
+		bytes = recv((int)sock->ipv6sock, (char *)data, maxsize, 0);
+
+	return bytes;
+}
+
+int net_tcp_close(NETSOCKET sock)
+{
+	return priv_net_close_all_sockets(sock);
+}
+
+int net_errno()
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return WSAGetLastError();
+#else
+	return errno;
+#endif
+}
+
+int net_would_block()
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return net_errno() == WSAEWOULDBLOCK;
+#else
+	return net_errno() == EWOULDBLOCK;
+#endif
+}
+
+void net_init()
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	WSADATA wsa_data;
+	dbg_assert(WSAStartup(MAKEWORD(1, 1), &wsa_data) == 0, "network initialization failed.");
+#endif
+}
+
+#if defined(CONF_FAMILY_UNIX)
+UNIXSOCKET net_unix_create_unnamed()
+{
+	return socket(AF_UNIX, SOCK_DGRAM, 0);
+}
+
+int net_unix_send(UNIXSOCKET sock, UNIXSOCKETADDR *addr, void *data, int size)
+{
+	return sendto(sock, data, size, 0, (struct sockaddr *)addr, sizeof(struct sockaddr_un));
+}
+
+void net_unix_set_addr(UNIXSOCKETADDR *addr, const char *path)
+{
+	mem_zero(addr, sizeof(*addr));
+	addr->sun_family = AF_UNIX;
+	str_copy(addr->sun_path, path);
+}
+
+void net_unix_close(UNIXSOCKET sock)
+{
+	close(sock);
+}
+#endif
+
+#if defined(CONF_FAMILY_WINDOWS)
+static inline time_t filetime_to_unixtime(LPFILETIME filetime)
+{
+	time_t t;
+	ULARGE_INTEGER li;
+	li.LowPart = filetime->dwLowDateTime;
+	li.HighPart = filetime->dwHighDateTime;
+
+	li.QuadPart /= 10000000; // 100ns to 1s
+	li.QuadPart -= 11644473600LL; // Windows epoch is in the past
+
+	t = li.QuadPart;
+	return t == (time_t)li.QuadPart ? t : (time_t)-1;
+}
+#endif
+
+void fs_listdir(const char *dir, FS_LISTDIR_CALLBACK cb, int type, void *user)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	char buffer[IO_MAX_PATH_LENGTH];
+	str_format(buffer, sizeof(buffer), "%s/*", dir);
+	const std::wstring wide_buffer = windows_utf8_to_wide(buffer);
+
+	WIN32_FIND_DATAW finddata;
+	HANDLE handle = FindFirstFileW(wide_buffer.c_str(), &finddata);
+	if(handle == INVALID_HANDLE_VALUE)
+		return;
+
+	do
+	{
+		const std::optional<std::string> current_entry = windows_wide_to_utf8(finddata.cFileName);
+		if(!current_entry.has_value())
+		{
+			log_error("filesystem", "ERROR: file/folder name containing invalid UTF-16 found in folder '%s'", dir);
+			continue;
+		}
+		if(cb(current_entry.value().c_str(), (finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0, type, user))
+			break;
+	} while(FindNextFileW(handle, &finddata));
+
+	FindClose(handle);
+#else
+	DIR *dir_handle = opendir(dir);
+	if(dir_handle == nullptr)
+		return;
+
+	char buffer[IO_MAX_PATH_LENGTH];
+	str_format(buffer, sizeof(buffer), "%s/", dir);
+	size_t length = str_length(buffer);
+	while(true)
+	{
+		struct dirent *entry = readdir(dir_handle);
+		if(entry == nullptr)
+			break;
+		if(!str_utf8_check(entry->d_name))
+		{
+			log_error("filesystem", "ERROR: file/folder name containing invalid UTF-8 found in folder '%s'", dir);
+			continue;
+		}
+		str_copy(buffer + length, entry->d_name, sizeof(buffer) - length);
+		if(cb(entry->d_name, fs_is_dir(buffer), type, user))
+			break;
+	}
+
+	closedir(dir_handle);
+#endif
+}
+
+void fs_listdir_fileinfo(const char *dir, FS_LISTDIR_CALLBACK_FILEINFO cb, int type, void *user)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	char buffer[IO_MAX_PATH_LENGTH];
+	str_format(buffer, sizeof(buffer), "%s/*", dir);
+	const std::wstring wide_buffer = windows_utf8_to_wide(buffer);
+
+	WIN32_FIND_DATAW finddata;
+	HANDLE handle = FindFirstFileW(wide_buffer.c_str(), &finddata);
+	if(handle == INVALID_HANDLE_VALUE)
+		return;
+
+	do
+	{
+		const std::optional<std::string> current_entry = windows_wide_to_utf8(finddata.cFileName);
+		if(!current_entry.has_value())
+		{
+			log_error("filesystem", "ERROR: file/folder name containing invalid UTF-16 found in folder '%s'", dir);
+			continue;
+		}
+
+		CFsFileInfo info;
+		info.m_pName = current_entry.value().c_str();
+		info.m_TimeCreated = filetime_to_unixtime(&finddata.ftCreationTime);
+		info.m_TimeModified = filetime_to_unixtime(&finddata.ftLastWriteTime);
+
+		if(cb(&info, (finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0, type, user))
+			break;
+	} while(FindNextFileW(handle, &finddata));
+
+	FindClose(handle);
+#else
+	DIR *dir_handle = opendir(dir);
+	if(dir_handle == nullptr)
+		return;
+
+	char buffer[IO_MAX_PATH_LENGTH];
+	str_format(buffer, sizeof(buffer), "%s/", dir);
+	size_t length = str_length(buffer);
+
+	while(true)
+	{
+		struct dirent *entry = readdir(dir_handle);
+		if(entry == nullptr)
+			break;
+		if(!str_utf8_check(entry->d_name))
+		{
+			log_error("filesystem", "ERROR: file/folder name containing invalid UTF-8 found in folder '%s'", dir);
+			continue;
+		}
+		str_copy(buffer + length, entry->d_name, sizeof(buffer) - length);
+		time_t created = -1, modified = -1;
+		fs_file_time(buffer, &created, &modified);
+
+		CFsFileInfo info;
+		info.m_pName = entry->d_name;
+		info.m_TimeCreated = created;
+		info.m_TimeModified = modified;
+
+		if(cb(&info, fs_is_dir(buffer), type, user))
+			break;
+	}
+
+	closedir(dir_handle);
+#endif
+}
+
+int fs_storage_path(const char *appname, char *path, int max)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	WCHAR *wide_home = _wgetenv(L"APPDATA");
+	if(!wide_home)
+	{
+		path[0] = '\0';
+		return -1;
+	}
+	const std::optional<std::string> home = windows_wide_to_utf8(wide_home);
+	if(!home.has_value())
+	{
+		log_error("filesystem", "ERROR: the APPDATA environment variable contains invalid UTF-16");
+		path[0] = '\0';
+		return -1;
+	}
+	str_format(path, max, "%s/%s", home.value().c_str(), appname);
+	return 0;
+#else
+	char *home = getenv("HOME");
+	if(!home)
+	{
+		path[0] = '\0';
+		return -1;
+	}
+
+	if(!str_utf8_check(home))
+	{
+		log_error("filesystem", "ERROR: the HOME environment variable contains invalid UTF-8");
+		path[0] = '\0';
+		return -1;
+	}
+
+#if defined(CONF_PLATFORM_HAIKU)
+	str_format(path, max, "%s/config/settings/%s", home, appname);
+#elif defined(CONF_PLATFORM_MACOS)
+	str_format(path, max, "%s/Library/Application Support/%s", home, appname);
+#else
+	if(str_comp(appname, "Teeworlds") == 0)
+	{
+		// fallback for old directory for Teeworlds compatibility
+		str_format(path, max, "%s/.%s", home, appname);
+	}
+	else
+	{
+		char *data_home = getenv("XDG_DATA_HOME");
+		if(data_home)
+		{
+			if(!str_utf8_check(data_home))
+			{
+				log_error("filesystem", "ERROR: the XDG_DATA_HOME environment variable contains invalid UTF-8");
+				path[0] = '\0';
+				return -1;
+			}
+			str_format(path, max, "%s/%s", data_home, appname);
+		}
+		else
+			str_format(path, max, "%s/.local/share/%s", home, appname);
+	}
+	for(int i = str_length(path) - str_length(appname); path[i]; i++)
+		path[i] = tolower((unsigned char)path[i]);
+#endif
+
+	return 0;
+#endif
+}
+
+int fs_makedir_rec_for(const char *path)
+{
+	char buffer[1024 * 2];
+	char *p;
+	str_copy(buffer, path);
+	for(p = buffer + 1; *p != '\0'; p++)
+	{
+		if(*p == '/' && *(p + 1) != '\0')
+		{
+			*p = '\0';
+			if(fs_makedir(buffer) < 0)
+				return -1;
+			*p = '/';
+		}
+	}
+	return 0;
+}
+
+int fs_makedir(const char *path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	if(CreateDirectoryW(wide_path.c_str(), NULL) != 0)
+		return 0;
+	if(GetLastError() == ERROR_ALREADY_EXISTS)
+		return 0;
+	return -1;
+#else
+#ifdef CONF_PLATFORM_HAIKU
+	struct stat st;
+	if(stat(path, &st) == 0)
+		return 0;
+#endif
+	if(mkdir(path, 0755) == 0)
+		return 0;
+	if(errno == EEXIST)
+		return 0;
+	return -1;
+#endif
+}
+
+int fs_removedir(const char *path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	if(RemoveDirectoryW(wide_path.c_str()) != 0)
+		return 0;
+	return -1;
+#else
+	if(rmdir(path) == 0)
+		return 0;
+	return -1;
+#endif
+}
+
+int fs_is_file(const char *path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	DWORD attributes = GetFileAttributesW(wide_path.c_str());
+	return attributes != INVALID_FILE_ATTRIBUTES && !(attributes & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0;
+#else
+	struct stat sb;
+	if(stat(path, &sb) == -1)
+		return 0;
+	return S_ISREG(sb.st_mode) ? 1 : 0;
+#endif
+}
+
+int fs_is_dir(const char *path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	DWORD attributes = GetFileAttributesW(wide_path.c_str());
+	return attributes != INVALID_FILE_ATTRIBUTES && (attributes & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0;
+#else
+	struct stat sb;
+	if(stat(path, &sb) == -1)
+		return 0;
+	return S_ISDIR(sb.st_mode) ? 1 : 0;
+#endif
+}
+
+int fs_is_relative_path(const char *path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_path = windows_utf8_to_wide(path);
+	return PathIsRelativeW(wide_path.c_str()) ? 1 : 0;
+#else
+	return path[0] == '/' ? 0 : 1; // yes, it's that simple
+#endif
+}
+
+int fs_chdir(const char *path)
+{
+	if(fs_is_dir(path))
+	{
+#if defined(CONF_FAMILY_WINDOWS)
+		const std::wstring wide_path = windows_utf8_to_wide(path);
+		return SetCurrentDirectoryW(wide_path.c_str()) != 0 ? 0 : 1;
+#else
+		return chdir(path) ? 1 : 0;
+#endif
+	}
+	else
+		return 1;
+}
+
+char *fs_getcwd(char *buffer, int buffer_size)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const DWORD size_needed = GetCurrentDirectoryW(0, nullptr);
+	std::wstring wide_current_dir(size_needed, L'0');
+	DWORD result = GetCurrentDirectoryW(size_needed, wide_current_dir.data());
+	if(result == 0)
+	{
+		const DWORD LastError = GetLastError();
+		const std::string ErrorMsg = windows_format_system_message(LastError);
+		dbg_msg("filesystem", "GetCurrentDirectoryW failed: %ld %s", LastError, ErrorMsg.c_str());
+		buffer[0] = '\0';
+		return nullptr;
+	}
+	const std::optional<std::string> current_dir = windows_wide_to_utf8(wide_current_dir.c_str());
+	if(!current_dir.has_value())
+	{
+		buffer[0] = '\0';
+		return nullptr;
+	}
+	str_copy(buffer, current_dir.value().c_str(), buffer_size);
+	return buffer;
+#else
+	char *result = getcwd(buffer, buffer_size);
+	if(result == nullptr || !str_utf8_check(result))
+	{
+		buffer[0] = '\0';
+		return nullptr;
+	}
+	return result;
+#endif
+}
+
+const char *fs_filename(const char *path)
+{
+	for(const char *filename = path + str_length(path); filename >= path; --filename)
+	{
+		if(filename[0] == '/' || filename[0] == '\\')
+			return filename + 1;
+	}
+	return path;
+}
+
+void fs_split_file_extension(const char *filename, char *name, size_t name_size, char *extension, size_t extension_size)
+{
+	dbg_assert(name != nullptr || extension != nullptr, "name or extension parameter required");
+	dbg_assert(name == nullptr || name_size > 0, "name_size invalid");
+	dbg_assert(extension == nullptr || extension_size > 0, "extension_size invalid");
+
+	const char *last_dot = str_rchr(filename, '.');
+	if(last_dot == nullptr || last_dot == filename)
+	{
+		if(extension != nullptr)
+			extension[0] = '\0';
+		if(name != nullptr)
+			str_copy(name, filename, name_size);
+	}
+	else
+	{
+		if(extension != nullptr)
+			str_copy(extension, last_dot + 1, extension_size);
+		if(name != nullptr)
+			str_truncate(name, name_size, filename, last_dot - filename);
+	}
+}
+
+int fs_parent_dir(char *path)
+{
+	char *parent = 0;
+	for(; *path; ++path)
+	{
+		if(*path == '/' || *path == '\\')
+			parent = path;
+	}
+
+	if(parent)
+	{
+		*parent = 0;
+		return 0;
+	}
+	return 1;
+}
+
+int fs_remove(const char *filename)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_filename = windows_utf8_to_wide(filename);
+	return DeleteFileW(wide_filename.c_str()) == 0;
+#else
+	return unlink(filename) != 0;
+#endif
+}
+
+int fs_rename(const char *oldname, const char *newname)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_oldname = windows_utf8_to_wide(oldname);
+	const std::wstring wide_newname = windows_utf8_to_wide(newname);
+	if(MoveFileExW(wide_oldname.c_str(), wide_newname.c_str(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) == 0)
+		return 1;
+#else
+	if(rename(oldname, newname) != 0)
+		return 1;
+#endif
+	return 0;
+}
+
+int fs_file_time(const char *name, time_t *created, time_t *modified)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	WIN32_FIND_DATAW finddata;
+	const std::wstring wide_name = windows_utf8_to_wide(name);
+	HANDLE handle = FindFirstFileW(wide_name.c_str(), &finddata);
+	if(handle == INVALID_HANDLE_VALUE)
+		return 1;
+
+	*created = filetime_to_unixtime(&finddata.ftCreationTime);
+	*modified = filetime_to_unixtime(&finddata.ftLastWriteTime);
+	FindClose(handle);
+#elif defined(CONF_FAMILY_UNIX)
+	struct stat sb;
+	if(stat(name, &sb))
+		return 1;
+
+	*created = sb.st_ctime;
+	*modified = sb.st_mtime;
+#else
+#error not implemented
+#endif
+
+	return 0;
+}
+
+void swap_endian(void *data, unsigned elem_size, unsigned num)
+{
+	char *src = (char *)data;
+	char *dst = src + (elem_size - 1);
+
+	while(num)
+	{
+		unsigned n = elem_size >> 1;
+		char tmp;
+		while(n)
+		{
+			tmp = *src;
+			*src = *dst;
+			*dst = tmp;
+
+			src++;
+			dst--;
+			n--;
+		}
+
+		src = src + (elem_size >> 1);
+		dst = src + (elem_size - 1);
+		num--;
+	}
+}
+
+int net_socket_read_wait(NETSOCKET sock, int time)
+{
+	struct timeval tv;
+	fd_set readfds;
+	int sockid;
+
+	tv.tv_sec = time / 1000000;
+	tv.tv_usec = time % 1000000;
+	sockid = 0;
+
+	FD_ZERO(&readfds);
+	if(sock->ipv4sock >= 0)
+	{
+		FD_SET(sock->ipv4sock, &readfds);
+		sockid = sock->ipv4sock;
+	}
+	if(sock->ipv6sock >= 0)
+	{
+		FD_SET(sock->ipv6sock, &readfds);
+		if(sock->ipv6sock > sockid)
+			sockid = sock->ipv6sock;
+	}
+#if defined(CONF_WEBSOCKETS)
+	if(sock->web_ipv4sock >= 0)
+	{
+		int maxfd = websocket_fd_set(sock->web_ipv4sock, &readfds);
+		if(maxfd > sockid)
+		{
+			sockid = maxfd;
+			FD_SET(sockid, &readfds);
+		}
+	}
+#endif
+
+	/* don't care about writefds and exceptfds */
+	if(time < 0)
+		select(sockid + 1, &readfds, NULL, NULL, NULL);
+	else
+		select(sockid + 1, &readfds, NULL, NULL, &tv);
+
+	if(sock->ipv4sock >= 0 && FD_ISSET(sock->ipv4sock, &readfds))
+		return 1;
+#if defined(CONF_WEBSOCKETS)
+	if(sock->web_ipv4sock >= 0 && FD_ISSET(sockid, &readfds))
+		return 1;
+#endif
+	if(sock->ipv6sock >= 0 && FD_ISSET(sock->ipv6sock, &readfds))
+		return 1;
+
+	return 0;
+}
+
+int time_timestamp()
+{
+	return time(0);
+}
+
+int time_houroftheday()
+{
+	time_t time_data;
+	struct tm *time_info;
+
+	time(&time_data);
+	time_info = localtime(&time_data);
+	return time_info->tm_hour;
+}
+
+static bool time_iseasterday(time_t time_data, struct tm *time_info)
+{
+	// compute Easter day (Sunday) using https://en.wikipedia.org/w/index.php?title=Computus&oldid=890710285#Anonymous_Gregorian_algorithm
+	int Y = time_info->tm_year + 1900;
+	int a = Y % 19;
+	int b = Y / 100;
+	int c = Y % 100;
+	int d = b / 4;
+	int e = b % 4;
+	int f = (b + 8) / 25;
+	int g = (b - f + 1) / 3;
+	int h = (19 * a + b - d - g + 15) % 30;
+	int i = c / 4;
+	int k = c % 4;
+	int L = (32 + 2 * e + 2 * i - h - k) % 7;
+	int m = (a + 11 * h + 22 * L) / 451;
+	int month = (h + L - 7 * m + 114) / 31;
+	int day = ((h + L - 7 * m + 114) % 31) + 1;
+
+	// (now-1d ≤ easter ≤ now+2d) <=> (easter-2d ≤ now ≤ easter+1d) <=> (Good Friday ≤ now ≤ Easter Monday)
+	for(int day_offset = -1; day_offset <= 2; day_offset++)
+	{
+		time_data = time_data + day_offset * 60 * 60 * 24;
+		time_info = localtime(&time_data);
+		if(time_info->tm_mon == month - 1 && time_info->tm_mday == day)
+			return true;
+	}
+	return false;
+}
+
+ETimeSeason time_season()
+{
+	time_t time_data;
+	time(&time_data);
+	struct tm *time_info = localtime(&time_data);
+
+	if((time_info->tm_mon == 11 && time_info->tm_mday == 31) || (time_info->tm_mon == 0 && time_info->tm_mday == 1))
+	{
+		return SEASON_NEWYEAR;
+	}
+	else if(time_info->tm_mon == 11 && time_info->tm_mday >= 24 && time_info->tm_mday <= 26)
+	{
+		return SEASON_XMAS;
+	}
+	else if((time_info->tm_mon == 9 && time_info->tm_mday == 31) || (time_info->tm_mon == 10 && time_info->tm_mday == 1))
+	{
+		return SEASON_HALLOWEEN;
+	}
+	else if(time_iseasterday(time_data, time_info))
+	{
+		return SEASON_EASTER;
+	}
+
+	switch(time_info->tm_mon)
+	{
+	case 11:
+	case 0:
+	case 1:
+		return SEASON_WINTER;
+	case 2:
+	case 3:
+	case 4:
+		return SEASON_SPRING;
+	case 5:
+	case 6:
+	case 7:
+		return SEASON_SUMMER;
+	case 8:
+	case 9:
+	case 10:
+		return SEASON_AUTUMN;
+	default:
+		dbg_assert(false, "Invalid month");
+		dbg_break();
+	}
+}
+
+void str_append(char *dst, const char *src, int dst_size)
+{
+	int s = str_length(dst);
+	int i = 0;
+	while(s < dst_size)
+	{
+		dst[s] = src[i];
+		if(!src[i]) /* check for null termination */
+			break;
+		s++;
+		i++;
+	}
+
+	dst[dst_size - 1] = 0; /* assure null termination */
+	str_utf8_fix_truncation(dst);
+}
+
+int str_copy(char *dst, const char *src, int dst_size)
+{
+	dst[0] = '\0';
+	strncat(dst, src, dst_size - 1);
+	return str_utf8_fix_truncation(dst);
+}
+
+void str_utf8_truncate(char *dst, int dst_size, const char *src, int truncation_len)
+{
+	int size = -1;
+	const char *cursor = src;
+	int pos = 0;
+	while(pos <= truncation_len && cursor - src < dst_size && size != cursor - src)
+	{
+		size = cursor - src;
+		if(str_utf8_decode(&cursor) == 0)
+		{
+			break;
+		}
+		pos++;
+	}
+	str_copy(dst, src, size + 1);
+}
+
+void str_truncate(char *dst, int dst_size, const char *src, int truncation_len)
+{
+	int size = dst_size;
+	if(truncation_len < size)
+	{
+		size = truncation_len + 1;
+	}
+	str_copy(dst, src, size);
+}
+
+int str_length(const char *str)
+{
+	return (int)strlen(str);
+}
+
+int str_format_v(char *buffer, int buffer_size, const char *format, va_list args)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	_vsprintf_p(buffer, buffer_size, format, args);
+	buffer[buffer_size - 1] = 0; /* assure null termination */
+#else
+	vsnprintf(buffer, buffer_size, format, args);
+	/* null termination is assured by definition of vsnprintf */
+#endif
+	return str_utf8_fix_truncation(buffer);
+}
+
+int str_format(char *buffer, int buffer_size, const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	int length = str_format_v(buffer, buffer_size, format, args);
+	va_end(args);
+	return length;
+}
+
+const char *str_trim_words(const char *str, int words)
+{
+	while(*str && str_isspace(*str))
+		str++;
+	while(words && *str)
+	{
+		if(str_isspace(*str) && !str_isspace(*(str + 1)))
+			words--;
+		str++;
+	}
+	return str;
+}
+
+bool str_has_cc(const char *str)
+{
+	unsigned char *s = (unsigned char *)str;
+	while(*s)
+	{
+		if(*s < 32)
+		{
+			return true;
+		}
+		s++;
+	}
+	return false;
+}
+
+/* makes sure that the string only contains the characters between 32 and 255 */
+void str_sanitize_cc(char *str_in)
+{
+	unsigned char *str = (unsigned char *)str_in;
+	while(*str)
+	{
+		if(*str < 32)
+			*str = ' ';
+		str++;
+	}
+}
+
+/* makes sure that the string only contains the characters between 32 and 255 + \r\n\t */
+void str_sanitize(char *str_in)
+{
+	unsigned char *str = (unsigned char *)str_in;
+	while(*str)
+	{
+		if(*str < 32 && !(*str == '\r') && !(*str == '\n') && !(*str == '\t'))
+			*str = ' ';
+		str++;
+	}
+}
+
+void str_sanitize_filename(char *str_in)
+{
+	unsigned char *str = (unsigned char *)str_in;
+	while(*str)
+	{
+		if(*str < 32 || *str == '\\' || *str == '/' || *str == '|' || *str == ':' || *str == '*' || *str == '?' || *str == '<' || *str == '>' || *str == '"')
+			*str = ' ';
+		str++;
+	}
+}
+
+/* removes leading and trailing spaces and limits the use of multiple spaces */
+void str_clean_whitespaces(char *str_in)
+{
+	char *read = str_in;
+	char *write = str_in;
+
+	/* skip initial whitespace */
+	while(*read == ' ')
+		read++;
+
+	/* end of read string is detected in the loop */
+	while(true)
+	{
+		/* skip whitespace */
+		int found_whitespace = 0;
+		for(; *read == ' '; read++)
+			found_whitespace = 1;
+		/* if not at the end of the string, put a found whitespace here */
+		if(*read)
+		{
+			if(found_whitespace)
+				*write++ = ' ';
+			*write++ = *read++;
+		}
+		else
+		{
+			*write = 0;
+			break;
+		}
+	}
+}
+
+char *str_skip_to_whitespace(char *str)
+{
+	while(*str && !str_isspace(*str))
+		str++;
+	return str;
+}
+
+const char *str_skip_to_whitespace_const(const char *str)
+{
+	while(*str && !str_isspace(*str))
+		str++;
+	return str;
+}
+
+char *str_skip_whitespaces(char *str)
+{
+	while(*str && str_isspace(*str))
+		str++;
+	return str;
+}
+
+const char *str_skip_whitespaces_const(const char *str)
+{
+	while(*str && str_isspace(*str))
+		str++;
+	return str;
+}
+
+/* case */
+int str_comp_nocase(const char *a, const char *b)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return _stricmp(a, b);
+#else
+	return strcasecmp(a, b);
+#endif
+}
+
+int str_comp_nocase_num(const char *a, const char *b, int num)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return _strnicmp(a, b, num);
+#else
+	return strncasecmp(a, b, num);
+#endif
+}
+
+int str_comp(const char *a, const char *b)
+{
+	return strcmp(a, b);
+}
+
+int str_comp_num(const char *a, const char *b, int num)
+{
+	return strncmp(a, b, num);
+}
+
+int str_comp_filenames(const char *a, const char *b)
+{
+	int result;
+
+	for(; *a && *b; ++a, ++b)
+	{
+		if(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9')
+		{
+			result = 0;
+			do
+			{
+				if(!result)
+					result = *a - *b;
+				++a;
+				++b;
+			} while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9');
+
+			if(*a >= '0' && *a <= '9')
+				return 1;
+			else if(*b >= '0' && *b <= '9')
+				return -1;
+			else if(result || *a == '\0' || *b == '\0')
+				return result;
+		}
+
+		result = tolower(*a) - tolower(*b);
+		if(result)
+			return result;
+	}
+	return *a - *b;
+}
+
+const char *str_startswith_nocase(const char *str, const char *prefix)
+{
+	int prefixl = str_length(prefix);
+	if(str_comp_nocase_num(str, prefix, prefixl) == 0)
+	{
+		return str + prefixl;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+const char *str_startswith(const char *str, const char *prefix)
+{
+	int prefixl = str_length(prefix);
+	if(str_comp_num(str, prefix, prefixl) == 0)
+	{
+		return str + prefixl;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+const char *str_endswith_nocase(const char *str, const char *suffix)
+{
+	int strl = str_length(str);
+	int suffixl = str_length(suffix);
+	const char *strsuffix;
+	if(strl < suffixl)
+	{
+		return 0;
+	}
+	strsuffix = str + strl - suffixl;
+	if(str_comp_nocase(strsuffix, suffix) == 0)
+	{
+		return strsuffix;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+const char *str_endswith(const char *str, const char *suffix)
+{
+	int strl = str_length(str);
+	int suffixl = str_length(suffix);
+	const char *strsuffix;
+	if(strl < suffixl)
+	{
+		return 0;
+	}
+	strsuffix = str + strl - suffixl;
+	if(str_comp(strsuffix, suffix) == 0)
+	{
+		return strsuffix;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+static int min3(int a, int b, int c)
+{
+	int min = a;
+	if(b < min)
+		min = b;
+	if(c < min)
+		min = c;
+	return min;
+}
+
+int str_utf8_dist(const char *a, const char *b)
+{
+	int buf_len = 2 * (str_length(a) + 1 + str_length(b) + 1);
+	int *buf = (int *)calloc(buf_len, sizeof(*buf));
+	int result = str_utf8_dist_buffer(a, b, buf, buf_len);
+	free(buf);
+	return result;
+}
+
+static int str_to_utf32_unchecked(const char *str, int **out)
+{
+	int out_len = 0;
+	while((**out = str_utf8_decode(&str)))
+	{
+		(*out)++;
+		out_len++;
+	}
+	return out_len;
+}
+
+int str_utf32_dist_buffer(const int *a, int a_len, const int *b, int b_len, int *buf, int buf_len)
+{
+	int i, j;
+	dbg_assert(buf_len >= (a_len + 1) + (b_len + 1), "buffer too small");
+	if(a_len > b_len)
+	{
+		int tmp1 = a_len;
+		const int *tmp2 = a;
+
+		a_len = b_len;
+		a = b;
+
+		b_len = tmp1;
+		b = tmp2;
+	}
+#define B(i, j) buf[((j)&1) * (a_len + 1) + (i)]
+	for(i = 0; i <= a_len; i++)
+	{
+		B(i, 0) = i;
+	}
+	for(j = 1; j <= b_len; j++)
+	{
+		B(0, j) = j;
+		for(i = 1; i <= a_len; i++)
+		{
+			int subst = (a[i - 1] != b[j - 1]);
+			B(i, j) = min3(
+				B(i - 1, j) + 1,
+				B(i, j - 1) + 1,
+				B(i - 1, j - 1) + subst);
+		}
+	}
+	return B(a_len, b_len);
+#undef B
+}
+
+int str_utf8_dist_buffer(const char *a_utf8, const char *b_utf8, int *buf, int buf_len)
+{
+	int a_utf8_len = str_length(a_utf8);
+	int b_utf8_len = str_length(b_utf8);
+	int *a, *b; // UTF-32
+	int a_len, b_len; // UTF-32 length
+	dbg_assert(buf_len >= 2 * (a_utf8_len + 1 + b_utf8_len + 1), "buffer too small");
+	if(a_utf8_len > b_utf8_len)
+	{
+		const char *tmp2 = a_utf8;
+		a_utf8 = b_utf8;
+		b_utf8 = tmp2;
+	}
+	a = buf;
+	a_len = str_to_utf32_unchecked(a_utf8, &buf);
+	b = buf;
+	b_len = str_to_utf32_unchecked(b_utf8, &buf);
+	return str_utf32_dist_buffer(a, a_len, b, b_len, buf, buf_len - b_len - a_len);
+}
+
+const char *str_find_nocase(const char *haystack, const char *needle)
+{
+	while(*haystack) /* native implementation */
+	{
+		const char *a = haystack;
+		const char *b = needle;
+		while(*a && *b && tolower((unsigned char)*a) == tolower((unsigned char)*b))
+		{
+			a++;
+			b++;
+		}
+		if(!(*b))
+			return haystack;
+		haystack++;
+	}
+
+	return 0;
+}
+
+const char *str_find(const char *haystack, const char *needle)
+{
+	while(*haystack) /* native implementation */
+	{
+		const char *a = haystack;
+		const char *b = needle;
+		while(*a && *b && *a == *b)
+		{
+			a++;
+			b++;
+		}
+		if(!(*b))
+			return haystack;
+		haystack++;
+	}
+
+	return 0;
+}
+
+const char *str_rchr(const char *haystack, char needle)
+{
+	return strrchr(haystack, needle);
+}
+
+int str_countchr(const char *haystack, char needle)
+{
+	int count = 0;
+	while(*haystack)
+	{
+		if(*haystack == needle)
+			count++;
+		haystack++;
+	}
+	return count;
+}
+
+void str_hex(char *dst, int dst_size, const void *data, int data_size)
+{
+	static const char hex[] = "0123456789ABCDEF";
+	int data_index;
+	int dst_index;
+	for(data_index = 0, dst_index = 0; data_index < data_size && dst_index < dst_size - 3; data_index++)
+	{
+		dst[data_index * 3] = hex[((const unsigned char *)data)[data_index] >> 4];
+		dst[data_index * 3 + 1] = hex[((const unsigned char *)data)[data_index] & 0xf];
+		dst[data_index * 3 + 2] = ' ';
+		dst_index += 3;
+	}
+	dst[dst_index] = '\0';
+}
+
+void str_hex_cstyle(char *dst, int dst_size, const void *data, int data_size, int bytes_per_line)
+{
+	static const char hex[] = "0123456789ABCDEF";
+	int data_index;
+	int dst_index;
+	int remaining_bytes_per_line = bytes_per_line;
+	for(data_index = 0, dst_index = 0; data_index < data_size && dst_index < dst_size - 6; data_index++)
+	{
+		--remaining_bytes_per_line;
+		dst[data_index * 6] = '0';
+		dst[data_index * 6 + 1] = 'x';
+		dst[data_index * 6 + 2] = hex[((const unsigned char *)data)[data_index] >> 4];
+		dst[data_index * 6 + 3] = hex[((const unsigned char *)data)[data_index] & 0xf];
+		dst[data_index * 6 + 4] = ',';
+		if(remaining_bytes_per_line == 0)
+		{
+			dst[data_index * 6 + 5] = '\n';
+			remaining_bytes_per_line = bytes_per_line;
+		}
+		else
+		{
+			dst[data_index * 6 + 5] = ' ';
+		}
+		dst_index += 6;
+	}
+	dst[dst_index] = '\0';
+	// Remove trailing comma and space/newline
+	if(dst_index >= 1)
+		dst[dst_index - 1] = '\0';
+	if(dst_index >= 2)
+		dst[dst_index - 2] = '\0';
+}
+
+static int hexval(char x)
+{
+	switch(x)
+	{
+	case '0': return 0;
+	case '1': return 1;
+	case '2': return 2;
+	case '3': return 3;
+	case '4': return 4;
+	case '5': return 5;
+	case '6': return 6;
+	case '7': return 7;
+	case '8': return 8;
+	case '9': return 9;
+	case 'a':
+	case 'A': return 10;
+	case 'b':
+	case 'B': return 11;
+	case 'c':
+	case 'C': return 12;
+	case 'd':
+	case 'D': return 13;
+	case 'e':
+	case 'E': return 14;
+	case 'f':
+	case 'F': return 15;
+	default: return -1;
+	}
+}
+
+static int byteval(const char *hex, unsigned char *dst)
+{
+	int v1 = hexval(hex[0]);
+	int v2 = hexval(hex[1]);
+
+	if(v1 < 0 || v2 < 0)
+		return 1;
+
+	*dst = v1 * 16 + v2;
+	return 0;
+}
+
+int str_hex_decode(void *dst, int dst_size, const char *src)
+{
+	unsigned char *cdst = (unsigned char *)dst;
+	int slen = str_length(src);
+	int len = slen / 2;
+	int i;
+	if(slen != dst_size * 2)
+		return 2;
+
+	for(i = 0; i < len && dst_size; i++, dst_size--)
+	{
+		if(byteval(src + i * 2, cdst++))
+			return 1;
+	}
+	return 0;
+}
+
+void str_base64(char *dst, int dst_size, const void *data_raw, int data_size)
+{
+	static const char DIGITS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+	const unsigned char *data = (const unsigned char *)data_raw;
+	unsigned value = 0;
+	int num_bits = 0;
+	int i = 0;
+	int o = 0;
+
+	dst_size -= 1;
+	dst[dst_size] = 0;
+	while(true)
+	{
+		if(num_bits < 6 && i < data_size)
+		{
+			value = (value << 8) | data[i];
+			num_bits += 8;
+			i += 1;
+		}
+		if(o == dst_size)
+		{
+			return;
+		}
+		if(num_bits > 0)
+		{
+			unsigned padded;
+			if(num_bits >= 6)
+			{
+				padded = (value >> (num_bits - 6)) & 0x3f;
+			}
+			else
+			{
+				padded = (value << (6 - num_bits)) & 0x3f;
+			}
+			dst[o] = DIGITS[padded];
+			num_bits -= 6;
+			o += 1;
+		}
+		else if(o % 4 != 0)
+		{
+			dst[o] = '=';
+			o += 1;
+		}
+		else
+		{
+			dst[o] = 0;
+			return;
+		}
+	}
+}
+
+static int base64_digit_value(char digit)
+{
+	if('A' <= digit && digit <= 'Z')
+	{
+		return digit - 'A';
+	}
+	else if('a' <= digit && digit <= 'z')
+	{
+		return digit - 'a' + 26;
+	}
+	else if('0' <= digit && digit <= '9')
+	{
+		return digit - '0' + 52;
+	}
+	else if(digit == '+')
+	{
+		return 62;
+	}
+	else if(digit == '/')
+	{
+		return 63;
+	}
+	return -1;
+}
+
+int str_base64_decode(void *dst_raw, int dst_size, const char *data)
+{
+	unsigned char *dst = (unsigned char *)dst_raw;
+	int data_len = str_length(data);
+
+	int i;
+	int o = 0;
+
+	if(data_len % 4 != 0)
+	{
+		return -3;
+	}
+	if(data_len / 4 * 3 > dst_size)
+	{
+		// Output buffer too small.
+		return -2;
+	}
+	for(i = 0; i < data_len; i += 4)
+	{
+		int num_output_bytes = 3;
+		char copy[4];
+		int d[4];
+		int value;
+		int b;
+		mem_copy(copy, data + i, sizeof(copy));
+		if(i == data_len - 4)
+		{
+			if(copy[3] == '=')
+			{
+				copy[3] = 'A';
+				num_output_bytes = 2;
+				if(copy[2] == '=')
+				{
+					copy[2] = 'A';
+					num_output_bytes = 1;
+				}
+			}
+		}
+		d[0] = base64_digit_value(copy[0]);
+		d[1] = base64_digit_value(copy[1]);
+		d[2] = base64_digit_value(copy[2]);
+		d[3] = base64_digit_value(copy[3]);
+		if(d[0] == -1 || d[1] == -1 || d[2] == -1 || d[3] == -1)
+		{
+			// Invalid digit.
+			return -1;
+		}
+		value = (d[0] << 18) | (d[1] << 12) | (d[2] << 6) | d[3];
+		for(b = 0; b < 3; b++)
+		{
+			unsigned char byte_value = (value >> (16 - 8 * b)) & 0xff;
+			if(b < num_output_bytes)
+			{
+				dst[o] = byte_value;
+				o += 1;
+			}
+			else
+			{
+				if(byte_value != 0)
+				{
+					// Padding not zeroed.
+					return -2;
+				}
+			}
+		}
+	}
+	return o;
+}
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
+void str_timestamp_ex(time_t time_data, char *buffer, int buffer_size, const char *format)
+{
+	struct tm *time_info;
+	time_info = localtime(&time_data);
+	strftime(buffer, buffer_size, format, time_info);
+	buffer[buffer_size - 1] = 0; /* assure null termination */
+}
+
+void str_timestamp_format(char *buffer, int buffer_size, const char *format)
+{
+	time_t time_data;
+	time(&time_data);
+	str_timestamp_ex(time_data, buffer, buffer_size, format);
+}
+
+void str_timestamp(char *buffer, int buffer_size)
+{
+	str_timestamp_format(buffer, buffer_size, FORMAT_NOSPACE);
+}
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+int str_time(int64_t centisecs, int format, char *buffer, int buffer_size)
+{
+	const int sec = 100;
+	const int min = 60 * sec;
+	const int hour = 60 * min;
+	const int day = 24 * hour;
+
+	if(buffer_size <= 0)
+		return -1;
+
+	if(centisecs < 0)
+		centisecs = 0;
+
+	buffer[0] = 0;
+
+	switch(format)
+	{
+	case TIME_DAYS:
+		if(centisecs >= day)
+			return str_format(buffer, buffer_size, "%" PRId64 "d %02" PRId64 ":%02" PRId64 ":%02" PRId64, centisecs / day,
+				(centisecs % day) / hour, (centisecs % hour) / min, (centisecs % min) / sec);
+		[[fallthrough]];
+	case TIME_HOURS:
+		if(centisecs >= hour)
+			return str_format(buffer, buffer_size, "%02" PRId64 ":%02" PRId64 ":%02" PRId64, centisecs / hour,
+				(centisecs % hour) / min, (centisecs % min) / sec);
+		[[fallthrough]];
+	case TIME_MINS:
+		return str_format(buffer, buffer_size, "%02" PRId64 ":%02" PRId64, centisecs / min,
+			(centisecs % min) / sec);
+	case TIME_HOURS_CENTISECS:
+		if(centisecs >= hour)
+			return str_format(buffer, buffer_size, "%02" PRId64 ":%02" PRId64 ":%02" PRId64 ".%02" PRId64, centisecs / hour,
+				(centisecs % hour) / min, (centisecs % min) / sec, centisecs % sec);
+		[[fallthrough]];
+	case TIME_MINS_CENTISECS:
+		if(centisecs >= min)
+			return str_format(buffer, buffer_size, "%02" PRId64 ":%02" PRId64 ".%02" PRId64, centisecs / min,
+				(centisecs % min) / sec, centisecs % sec);
+		[[fallthrough]];
+	case TIME_SECS_CENTISECS:
+		return str_format(buffer, buffer_size, "%02" PRId64 ".%02" PRId64, (centisecs % min) / sec, centisecs % sec);
+	}
+
+	return -1;
+}
+
+int str_time_float(float secs, int format, char *buffer, int buffer_size)
+{
+	return str_time(llroundf(secs * 1000) / 10, format, buffer, buffer_size);
+}
+
+void str_escape(char **dst, const char *src, const char *end)
+{
+	while(*src && *dst + 1 < end)
+	{
+		if(*src == '"' || *src == '\\') // escape \ and "
+		{
+			if(*dst + 2 < end)
+				*(*dst)++ = '\\';
+			else
+				break;
+		}
+		*(*dst)++ = *src++;
+	}
+	**dst = 0;
+}
+
+void net_stats(NETSTATS *stats_inout)
+{
+	*stats_inout = network_stats;
+}
+
+int str_isspace(char c)
+{
+	return c == ' ' || c == '\n' || c == '\r' || c == '\t';
+}
+
+char str_uppercase(char c)
+{
+	if(c >= 'a' && c <= 'z')
+		return 'A' + (c - 'a');
+	return c;
+}
+
+int str_isallnum(const char *str)
+{
+	while(*str)
+	{
+		if(!(*str >= '0' && *str <= '9'))
+			return 0;
+		str++;
+	}
+	return 1;
+}
+
+int str_isallnum_hex(const char *str)
+{
+	while(*str)
+	{
+		if(!(*str >= '0' && *str <= '9') && !(*str >= 'a' && *str <= 'f') && !(*str >= 'A' && *str <= 'F'))
+			return 0;
+		str++;
+	}
+	return 1;
+}
+
+int str_toint(const char *str)
+{
+	return str_toint_base(str, 10);
+}
+
+int str_toint_base(const char *str, int base)
+{
+	return strtol(str, nullptr, base);
+}
+
+unsigned long str_toulong_base(const char *str, int base)
+{
+	return strtoul(str, nullptr, base);
+}
+
+int64_t str_toint64_base(const char *str, int base)
+{
+	return strtoll(str, nullptr, base);
+}
+
+float str_tofloat(const char *str)
+{
+	return strtod(str, nullptr);
+}
+
+void str_from_int(int value, char *buffer, size_t buffer_size)
+{
+	buffer[0] = '\0'; // Fix false positive clang-analyzer-core.UndefinedBinaryOperatorResult when using result
+	auto result = std::to_chars(buffer, buffer + buffer_size - 1, value);
+	result.ptr[0] = '\0';
+}
+
+int str_utf8_comp_nocase(const char *a, const char *b)
+{
+	int code_a;
+	int code_b;
+
+	while(*a && *b)
+	{
+		code_a = str_utf8_tolower(str_utf8_decode(&a));
+		code_b = str_utf8_tolower(str_utf8_decode(&b));
+
+		if(code_a != code_b)
+			return code_a - code_b;
+	}
+	return (unsigned char)*a - (unsigned char)*b;
+}
+
+int str_utf8_comp_nocase_num(const char *a, const char *b, int num)
+{
+	int code_a;
+	int code_b;
+	const char *old_a = a;
+
+	if(num <= 0)
+		return 0;
+
+	while(*a && *b)
+	{
+		code_a = str_utf8_tolower(str_utf8_decode(&a));
+		code_b = str_utf8_tolower(str_utf8_decode(&b));
+
+		if(code_a != code_b)
+			return code_a - code_b;
+
+		if(a - old_a >= num)
+			return 0;
+	}
+
+	return (unsigned char)*a - (unsigned char)*b;
+}
+
+const char *str_utf8_find_nocase(const char *haystack, const char *needle, const char **end)
+{
+	while(*haystack) /* native implementation */
+	{
+		const char *a = haystack;
+		const char *b = needle;
+		const char *a_next = a;
+		const char *b_next = b;
+		while(*a && *b && str_utf8_tolower(str_utf8_decode(&a_next)) == str_utf8_tolower(str_utf8_decode(&b_next)))
+		{
+			a = a_next;
+			b = b_next;
+		}
+		if(!(*b))
+		{
+			if(end != nullptr)
+				*end = a_next;
+			return haystack;
+		}
+		str_utf8_decode(&haystack);
+	}
+
+	if(end != nullptr)
+		*end = nullptr;
+	return nullptr;
+}
+
+int str_utf8_isspace(int code)
+{
+	return code <= 0x0020 || code == 0x0085 || code == 0x00A0 || code == 0x034F ||
+	       code == 0x115F || code == 0x1160 || code == 0x1680 || code == 0x180E ||
+	       (code >= 0x2000 && code <= 0x200F) || (code >= 0x2028 && code <= 0x202F) ||
+	       (code >= 0x205F && code <= 0x2064) || (code >= 0x206A && code <= 0x206F) ||
+	       code == 0x2800 || code == 0x3000 || code == 0x3164 ||
+	       (code >= 0xFE00 && code <= 0xFE0F) || code == 0xFEFF || code == 0xFFA0 ||
+	       (code >= 0xFFF9 && code <= 0xFFFC);
+}
+
+const char *str_utf8_skip_whitespaces(const char *str)
+{
+	const char *str_old;
+	int code;
+
+	while(*str)
+	{
+		str_old = str;
+		code = str_utf8_decode(&str);
+
+		// check if unicode is not empty
+		if(!str_utf8_isspace(code))
+		{
+			return str_old;
+		}
+	}
+
+	return str;
+}
+
+void str_utf8_trim_right(char *param)
+{
+	const char *str = param;
+	char *end = 0;
+	while(*str)
+	{
+		char *str_old = (char *)str;
+		int code = str_utf8_decode(&str);
+
+		// check if unicode is not empty
+		if(!str_utf8_isspace(code))
+		{
+			end = 0;
+		}
+		else if(!end)
+		{
+			end = str_old;
+		}
+	}
+	if(end)
+	{
+		*end = 0;
+	}
+}
+
+int str_utf8_isstart(char c)
+{
+	if((c & 0xC0) == 0x80) /* 10xxxxxx */
+		return 0;
+	return 1;
+}
+
+int str_utf8_rewind(const char *str, int cursor)
+{
+	while(cursor)
+	{
+		cursor--;
+		if(str_utf8_isstart(*(str + cursor)))
+			break;
+	}
+	return cursor;
+}
+
+int str_utf8_fix_truncation(char *str)
+{
+	int len = str_length(str);
+	if(len > 0)
+	{
+		int last_char_index = str_utf8_rewind(str, len);
+		const char *last_char = str + last_char_index;
+		// Fix truncated UTF-8.
+		if(str_utf8_decode(&last_char) == -1)
+		{
+			str[last_char_index] = 0;
+			return last_char_index;
+		}
+	}
+	return len;
+}
+
+int str_utf8_forward(const char *str, int cursor)
+{
+	const char *ptr = str + cursor;
+	if(str_utf8_decode(&ptr) == 0)
+	{
+		return cursor;
+	}
+	return ptr - str;
+}
+
+int str_utf8_encode(char *ptr, int chr)
+{
+	/* encode */
+	if(chr <= 0x7F)
+	{
+		ptr[0] = (char)chr;
+		return 1;
+	}
+	else if(chr <= 0x7FF)
+	{
+		ptr[0] = 0xC0 | ((chr >> 6) & 0x1F);
+		ptr[1] = 0x80 | (chr & 0x3F);
+		return 2;
+	}
+	else if(chr <= 0xFFFF)
+	{
+		ptr[0] = 0xE0 | ((chr >> 12) & 0x0F);
+		ptr[1] = 0x80 | ((chr >> 6) & 0x3F);
+		ptr[2] = 0x80 | (chr & 0x3F);
+		return 3;
+	}
+	else if(chr <= 0x10FFFF)
+	{
+		ptr[0] = 0xF0 | ((chr >> 18) & 0x07);
+		ptr[1] = 0x80 | ((chr >> 12) & 0x3F);
+		ptr[2] = 0x80 | ((chr >> 6) & 0x3F);
+		ptr[3] = 0x80 | (chr & 0x3F);
+		return 4;
+	}
+
+	return 0;
+}
+
+static unsigned char str_byte_next(const char **ptr)
+{
+	unsigned char byte_value = **ptr;
+	(*ptr)++;
+	return byte_value;
+}
+
+static void str_byte_rewind(const char **ptr)
+{
+	(*ptr)--;
+}
+
+int str_utf8_decode(const char **ptr)
+{
+	// As per https://encoding.spec.whatwg.org/#utf-8-decoder.
+	unsigned char utf8_lower_boundary = 0x80;
+	unsigned char utf8_upper_boundary = 0xBF;
+	int utf8_code_point = 0;
+	int utf8_bytes_seen = 0;
+	int utf8_bytes_needed = 0;
+	while(true)
+	{
+		unsigned char byte_value = str_byte_next(ptr);
+		if(utf8_bytes_needed == 0)
+		{
+			if(byte_value <= 0x7F)
+			{
+				return byte_value;
+			}
+			else if(0xC2 <= byte_value && byte_value <= 0xDF)
+			{
+				utf8_bytes_needed = 1;
+				utf8_code_point = byte_value - 0xC0;
+			}
+			else if(0xE0 <= byte_value && byte_value <= 0xEF)
+			{
+				if(byte_value == 0xE0)
+					utf8_lower_boundary = 0xA0;
+				if(byte_value == 0xED)
+					utf8_upper_boundary = 0x9F;
+				utf8_bytes_needed = 2;
+				utf8_code_point = byte_value - 0xE0;
+			}
+			else if(0xF0 <= byte_value && byte_value <= 0xF4)
+			{
+				if(byte_value == 0xF0)
+					utf8_lower_boundary = 0x90;
+				if(byte_value == 0xF4)
+					utf8_upper_boundary = 0x8F;
+				utf8_bytes_needed = 3;
+				utf8_code_point = byte_value - 0xF0;
+			}
+			else
+			{
+				return -1; // Error.
+			}
+			utf8_code_point = utf8_code_point << (6 * utf8_bytes_needed);
+			continue;
+		}
+		if(!(utf8_lower_boundary <= byte_value && byte_value <= utf8_upper_boundary))
+		{
+			// Resetting variables not necessary, will be done when
+			// the function is called again.
+			str_byte_rewind(ptr);
+			return -1;
+		}
+		utf8_lower_boundary = 0x80;
+		utf8_upper_boundary = 0xBF;
+		utf8_bytes_seen += 1;
+		utf8_code_point = utf8_code_point + ((byte_value - 0x80) << (6 * (utf8_bytes_needed - utf8_bytes_seen)));
+		if(utf8_bytes_seen != utf8_bytes_needed)
+		{
+			continue;
+		}
+		// Resetting variables not necessary, see above.
+		return utf8_code_point;
+	}
+}
+
+int str_utf8_check(const char *str)
+{
+	int codepoint;
+	while((codepoint = str_utf8_decode(&str)))
+	{
+		if(codepoint == -1)
+		{
+			return 0;
+		}
+	}
+	return 1;
+}
+
+void str_utf8_stats(const char *str, size_t max_size, size_t max_count, size_t *size, size_t *count)
+{
+	const char *cursor = str;
+	*size = 0;
+	*count = 0;
+	while(*size < max_size && *count < max_count)
+	{
+		if(str_utf8_decode(&cursor) == 0)
+		{
+			break;
+		}
+		if((size_t)(cursor - str) >= max_size)
+		{
+			break;
+		}
+		*size = cursor - str;
+		++(*count);
+	}
+}
+
+size_t str_utf8_offset_bytes_to_chars(const char *str, size_t byte_offset)
+{
+	size_t char_offset = 0;
+	size_t current_offset = 0;
+	while(current_offset < byte_offset)
+	{
+		const size_t prev_byte_offset = current_offset;
+		current_offset = str_utf8_forward(str, current_offset);
+		if(current_offset == prev_byte_offset)
+			break;
+		char_offset++;
+	}
+	return char_offset;
+}
+
+size_t str_utf8_offset_chars_to_bytes(const char *str, size_t char_offset)
+{
+	size_t byte_offset = 0;
+	for(size_t i = 0; i < char_offset; i++)
+	{
+		const size_t prev_byte_offset = byte_offset;
+		byte_offset = str_utf8_forward(str, byte_offset);
+		if(byte_offset == prev_byte_offset)
+			break;
+	}
+	return byte_offset;
+}
+
+unsigned str_quickhash(const char *str)
+{
+	unsigned hash = 5381;
+	for(; *str; str++)
+		hash = ((hash << 5) + hash) + (*str); /* hash * 33 + c */
+	return hash;
+}
+
+static const char *str_token_get(const char *str, const char *delim, int *length)
+{
+	size_t len = strspn(str, delim);
+	if(len > 1)
+		str++;
+	else
+		str += len;
+	if(!*str)
+		return NULL;
+
+	*length = strcspn(str, delim);
+	return str;
+}
+
+int str_in_list(const char *list, const char *delim, const char *needle)
+{
+	const char *tok = list;
+	int len = 0, notfound = 1, needlelen = str_length(needle);
+
+	while(notfound && (tok = str_token_get(tok, delim, &len)))
+	{
+		notfound = needlelen != len || str_comp_num(tok, needle, len);
+		tok = tok + len;
+	}
+
+	return !notfound;
+}
+
+const char *str_next_token(const char *str, const char *delim, char *buffer, int buffer_size)
+{
+	int len = 0;
+	const char *tok = str_token_get(str, delim, &len);
+	if(len < 0 || tok == NULL)
+	{
+		buffer[0] = '\0';
+		return NULL;
+	}
+
+	len = buffer_size > len ? len : buffer_size - 1;
+	mem_copy(buffer, tok, len);
+	buffer[len] = '\0';
+
+	return tok + len;
+}
+
+static_assert(sizeof(unsigned) == 4, "unsigned must be 4 bytes in size");
+static_assert(sizeof(unsigned) == sizeof(int), "unsigned and int must have the same size");
+
+unsigned bytes_be_to_uint(const unsigned char *bytes)
+{
+	return ((bytes[0] & 0xffu) << 24u) | ((bytes[1] & 0xffu) << 16u) | ((bytes[2] & 0xffu) << 8u) | (bytes[3] & 0xffu);
+}
+
+void uint_to_bytes_be(unsigned char *bytes, unsigned value)
+{
+	bytes[0] = (value >> 24u) & 0xffu;
+	bytes[1] = (value >> 16u) & 0xffu;
+	bytes[2] = (value >> 8u) & 0xffu;
+	bytes[3] = value & 0xffu;
+}
+
+int pid()
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	return _getpid();
+#else
+	return getpid();
+#endif
+}
+
+void cmdline_fix(int *argc, const char ***argv)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	int wide_argc = 0;
+	WCHAR **wide_argv = CommandLineToArgvW(GetCommandLineW(), &wide_argc);
+	dbg_assert(wide_argv != NULL, "CommandLineToArgvW failure");
+	dbg_assert(wide_argc > 0, "Invalid argc value");
+
+	int total_size = 0;
+
+	for(int i = 0; i < wide_argc; i++)
+	{
+		int size = WideCharToMultiByte(CP_UTF8, 0, wide_argv[i], -1, NULL, 0, NULL, NULL);
+		dbg_assert(size != 0, "WideCharToMultiByte failure");
+		total_size += size;
+	}
+
+	char **new_argv = (char **)malloc((wide_argc + 1) * sizeof(*new_argv));
+	new_argv[0] = (char *)malloc(total_size);
+	mem_zero(new_argv[0], total_size);
+
+	int remaining_size = total_size;
+	for(int i = 0; i < wide_argc; i++)
+	{
+		int size = WideCharToMultiByte(CP_UTF8, 0, wide_argv[i], -1, new_argv[i], remaining_size, NULL, NULL);
+		dbg_assert(size != 0, "WideCharToMultiByte failure");
+
+		remaining_size -= size;
+		new_argv[i + 1] = new_argv[i] + size;
+	}
+
+	LocalFree(wide_argv);
+	new_argv[wide_argc] = 0;
+	*argc = wide_argc;
+	*argv = (const char **)new_argv;
+#endif
+}
+
+void cmdline_free(int argc, const char **argv)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	free((void *)*argv);
+	free((char **)argv);
+#endif
+}
+
+PROCESS shell_execute(const char *file)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_file = windows_utf8_to_wide(file);
+
+	SHELLEXECUTEINFOW info;
+	mem_zero(&info, sizeof(SHELLEXECUTEINFOW));
+	info.cbSize = sizeof(SHELLEXECUTEINFOW);
+	info.lpVerb = L"open";
+	info.lpFile = wide_file.c_str();
+	info.nShow = SW_SHOWMINNOACTIVE;
+	info.fMask = SEE_MASK_NOCLOSEPROCESS;
+	// Save and restore the FPU control word because ShellExecute might change it
+	fenv_t floating_point_environment;
+	int fegetenv_result = fegetenv(&floating_point_environment);
+	ShellExecuteExW(&info);
+	if(fegetenv_result == 0)
+		fesetenv(&floating_point_environment);
+	return info.hProcess;
+#elif defined(CONF_FAMILY_UNIX)
+	char *argv[2];
+	pid_t pid;
+	argv[0] = (char *)file;
+	argv[1] = NULL;
+	pid = fork();
+	if(pid == -1)
+	{
+		return 0;
+	}
+	if(pid == 0)
+	{
+		execvp(file, argv);
+		_exit(1);
+	}
+	return pid;
+#endif
+}
+
+int kill_process(PROCESS process)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	BOOL success = TerminateProcess(process, 0);
+	BOOL is_alive = is_process_alive(process);
+	if(success || !is_alive)
+	{
+		CloseHandle(process);
+		return true;
+	}
+	return false;
+#elif defined(CONF_FAMILY_UNIX)
+	if(!is_process_alive(process))
+		return true;
+	int status;
+	kill(process, SIGTERM);
+	return waitpid(process, &status, 0) != -1;
+#endif
+}
+
+bool is_process_alive(PROCESS process)
+{
+	if(process == INVALID_PROCESS)
+		return false;
+#if defined(CONF_FAMILY_WINDOWS)
+	DWORD exit_code;
+	GetExitCodeProcess(process, &exit_code);
+	return exit_code == STILL_ACTIVE;
+#else
+	return waitpid(process, nullptr, WNOHANG) == 0;
+#endif
+}
+
+int open_link(const char *link)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const std::wstring wide_link = windows_utf8_to_wide(link);
+
+	SHELLEXECUTEINFOW info;
+	mem_zero(&info, sizeof(SHELLEXECUTEINFOW));
+	info.cbSize = sizeof(SHELLEXECUTEINFOW);
+	info.lpVerb = NULL; // NULL to use the default verb, as "open" may not be available
+	info.lpFile = wide_link.c_str();
+	info.nShow = SW_SHOWNORMAL;
+	// The SEE_MASK_NOASYNC flag ensures that the ShellExecuteEx function
+	// finishes its DDE conversation before it returns, so it's not necessary
+	// to pump messages in the calling thread.
+	// The SEE_MASK_FLAG_NO_UI flag suppresses error messages that would pop up
+	// when the link cannot be opened, e.g. when a folder does not exist.
+	// The SEE_MASK_ASYNCOK flag is not used. It would allow the call to
+	// ShellExecuteEx to return earlier, but it also prevents us from doing
+	// our own error handling, as the function would always return TRUE.
+	info.fMask = SEE_MASK_NOASYNC | SEE_MASK_FLAG_NO_UI;
+	// Save and restore the FPU control word because ShellExecute might change it
+	fenv_t floating_point_environment;
+	int fegetenv_result = fegetenv(&floating_point_environment);
+	BOOL success = ShellExecuteExW(&info);
+	if(fegetenv_result == 0)
+		fesetenv(&floating_point_environment);
+	return success;
+#elif defined(CONF_PLATFORM_LINUX)
+	const int pid = fork();
+	if(pid == 0)
+		execlp("xdg-open", "xdg-open", link, nullptr);
+	return pid > 0;
+#elif defined(CONF_FAMILY_UNIX)
+	const int pid = fork();
+	if(pid == 0)
+		execlp("open", "open", link, nullptr);
+	return pid > 0;
+#endif
+}
+
+int open_file(const char *path)
+{
+#if defined(CONF_PLATFORM_MACOS)
+	return open_link(path);
+#else
+	// Create a file link so the path can contain forward and
+	// backward slashes. But the file link must be absolute.
+	char buf[512];
+	char workingDir[IO_MAX_PATH_LENGTH];
+	if(fs_is_relative_path(path))
+	{
+		if(!fs_getcwd(workingDir, sizeof(workingDir)))
+			return 0;
+		str_append(workingDir, "/");
+	}
+	else
+		workingDir[0] = '\0';
+	str_format(buf, sizeof(buf), "file://%s%s", workingDir, path);
+	return open_link(buf);
+#endif
+}
+
+struct SECURE_RANDOM_DATA
+{
+	int initialized;
+#if defined(CONF_FAMILY_WINDOWS)
+	HCRYPTPROV provider;
+#else
+	IOHANDLE urandom;
+#endif
+};
+
+static struct SECURE_RANDOM_DATA secure_random_data = {0};
+
+int secure_random_init()
+{
+	if(secure_random_data.initialized)
+	{
+		return 0;
+	}
+#if defined(CONF_FAMILY_WINDOWS)
+	if(CryptAcquireContext(&secure_random_data.provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+	{
+		secure_random_data.initialized = 1;
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+#else
+	secure_random_data.urandom = io_open("/dev/urandom", IOFLAG_READ);
+	if(secure_random_data.urandom)
+	{
+		secure_random_data.initialized = 1;
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+#endif
+}
+
+int secure_random_uninit()
+{
+	if(!secure_random_data.initialized)
+	{
+		return 0;
+	}
+#if defined(CONF_FAMILY_WINDOWS)
+	if(CryptReleaseContext(secure_random_data.provider, 0))
+	{
+		secure_random_data.initialized = 0;
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+#else
+	if(!io_close(secure_random_data.urandom))
+	{
+		secure_random_data.initialized = 0;
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+#endif
+}
+
+void generate_password(char *buffer, unsigned length, const unsigned short *random, unsigned random_length)
+{
+	static const char VALUES[] = "ABCDEFGHKLMNPRSTUVWXYZabcdefghjkmnopqt23456789";
+	static const size_t NUM_VALUES = sizeof(VALUES) - 1; // Disregard the '\0'.
+	unsigned i;
+	dbg_assert(length >= random_length * 2 + 1, "too small buffer");
+	dbg_assert(NUM_VALUES * NUM_VALUES >= 2048, "need at least 2048 possibilities for 2-character sequences");
+
+	buffer[random_length * 2] = 0;
+
+	for(i = 0; i < random_length; i++)
+	{
+		unsigned short random_number = random[i] % 2048;
+		buffer[2 * i + 0] = VALUES[random_number / NUM_VALUES];
+		buffer[2 * i + 1] = VALUES[random_number % NUM_VALUES];
+	}
+}
+
+#define MAX_PASSWORD_LENGTH 128
+
+void secure_random_password(char *buffer, unsigned length, unsigned pw_length)
+{
+	unsigned short random[MAX_PASSWORD_LENGTH / 2];
+	// With 6 characters, we get a password entropy of log(2048) * 6/2 = 33bit.
+	dbg_assert(length >= pw_length + 1, "too small buffer");
+	dbg_assert(pw_length >= 6, "too small password length");
+	dbg_assert(pw_length % 2 == 0, "need an even password length");
+	dbg_assert(pw_length <= MAX_PASSWORD_LENGTH, "too large password length");
+
+	secure_random_fill(random, pw_length);
+
+	generate_password(buffer, length, random, pw_length / 2);
+}
+
+#undef MAX_PASSWORD_LENGTH
+
+void secure_random_fill(void *bytes, unsigned length)
+{
+	if(!secure_random_data.initialized)
+	{
+		dbg_msg("secure", "called secure_random_fill before secure_random_init");
+		dbg_break();
+	}
+#if defined(CONF_FAMILY_WINDOWS)
+	if(!CryptGenRandom(secure_random_data.provider, length, (unsigned char *)bytes))
+	{
+		const DWORD LastError = GetLastError();
+		const std::string ErrorMsg = windows_format_system_message(LastError);
+		dbg_msg("secure", "CryptGenRandom failed: %ld %s", LastError, ErrorMsg.c_str());
+		dbg_break();
+	}
+#else
+	if(length != io_read(secure_random_data.urandom, bytes, length))
+	{
+		dbg_msg("secure", "io_read returned with a short read");
+		dbg_break();
+	}
+#endif
+}
+
+int secure_rand()
+{
+	unsigned int i;
+	secure_random_fill(&i, sizeof(i));
+	return (int)(i % RAND_MAX);
+}
+
+// From https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2.
+static unsigned int find_next_power_of_two_minus_one(unsigned int n)
+{
+	n--;
+	n |= n >> 1;
+	n |= n >> 2;
+	n |= n >> 4;
+	n |= n >> 4;
+	n |= n >> 16;
+	return n;
+}
+
+int secure_rand_below(int below)
+{
+	unsigned int mask = find_next_power_of_two_minus_one(below);
+	dbg_assert(below > 0, "below must be positive");
+	while(true)
+	{
+		unsigned int n;
+		secure_random_fill(&n, sizeof(n));
+		n &= mask;
+		if((int)n < below)
+		{
+			return n;
+		}
+	}
+}
+
+bool os_version_str(char *version, size_t length)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const WCHAR *module_path = L"kernel32.dll";
+	DWORD handle;
+	DWORD size = GetFileVersionInfoSizeW(module_path, &handle);
+	if(!size)
+	{
+		return false;
+	}
+	void *data = malloc(size);
+	if(!GetFileVersionInfoW(module_path, handle, size, data))
+	{
+		free(data);
+		return false;
+	}
+	VS_FIXEDFILEINFO *fileinfo;
+	UINT unused;
+	if(!VerQueryValueW(data, L"\\", (void **)&fileinfo, &unused))
+	{
+		free(data);
+		return false;
+	}
+	str_format(version, length, "Windows %hu.%hu.%hu.%hu",
+		HIWORD(fileinfo->dwProductVersionMS),
+		LOWORD(fileinfo->dwProductVersionMS),
+		HIWORD(fileinfo->dwProductVersionLS),
+		LOWORD(fileinfo->dwProductVersionLS));
+	free(data);
+	return true;
+#else
+	struct utsname u;
+	if(uname(&u))
+	{
+		return false;
+	}
+	char extra[128];
+	extra[0] = 0;
+
+	do
+	{
+		IOHANDLE os_release = io_open("/etc/os-release", IOFLAG_READ);
+		char buf[4096];
+		int read;
+		int offset;
+		char *newline;
+		if(!os_release)
+		{
+			break;
+		}
+		read = io_read(os_release, buf, sizeof(buf) - 1);
+		io_close(os_release);
+		buf[read] = 0;
+		if(str_startswith(buf, "PRETTY_NAME="))
+		{
+			offset = 0;
+		}
+		else
+		{
+			const char *found = str_find(buf, "\nPRETTY_NAME=");
+			if(!found)
+			{
+				break;
+			}
+			offset = found - buf + 1;
+		}
+		newline = (char *)str_find(buf + offset, "\n");
+		if(newline)
+		{
+			*newline = 0;
+		}
+		str_format(extra, sizeof(extra), "; %s", buf + offset + 12);
+	} while(false);
+
+	str_format(version, length, "%s %s (%s, %s)%s", u.sysname, u.release, u.machine, u.version, extra);
+	return true;
+#endif
+}
+
+void os_locale_str(char *locale, size_t length)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	wchar_t wide_buffer[LOCALE_NAME_MAX_LENGTH];
+	dbg_assert(GetUserDefaultLocaleName(wide_buffer, std::size(wide_buffer)) > 0, "GetUserDefaultLocaleName failure");
+
+	const std::optional<std::string> buffer = windows_wide_to_utf8(wide_buffer);
+	dbg_assert(buffer.has_value(), "GetUserDefaultLocaleName returned invalid UTF-16");
+	str_copy(locale, buffer.value().c_str(), length);
+#elif defined(CONF_PLATFORM_MACOS)
+	CFLocaleRef locale_ref = CFLocaleCopyCurrent();
+	CFStringRef locale_identifier_ref = static_cast<CFStringRef>(CFLocaleGetValue(locale_ref, kCFLocaleIdentifier));
+
+	// Count number of UTF16 codepoints, +1 for zero-termination.
+	// Assume maximum possible length for encoding as UTF-8.
+	CFIndex locale_identifier_size = (UTF8_BYTE_LENGTH * CFStringGetLength(locale_identifier_ref) + 1) * sizeof(char);
+	char *locale_identifier = (char *)malloc(locale_identifier_size);
+	dbg_assert(CFStringGetCString(locale_identifier_ref, locale_identifier, locale_identifier_size, kCFStringEncodingUTF8), "CFStringGetCString failure");
+
+	str_copy(locale, locale_identifier, length);
+
+	free(locale_identifier);
+	CFRelease(locale_ref);
+#else
+	static const char *ENV_VARIABLES[] = {
+		"LC_ALL",
+		"LC_MESSAGES",
+		"LANG",
+	};
+
+	locale[0] = '\0';
+	for(const char *env_variable : ENV_VARIABLES)
+	{
+		const char *env_value = getenv(env_variable);
+		if(env_value)
+		{
+			str_copy(locale, env_value, length);
+			break;
+		}
+	}
+#endif
+
+	// Ensure RFC 3066 format:
+	// - use hyphens instead of underscores
+	// - truncate locale string after first non-standard letter
+	for(int i = 0; i < str_length(locale); ++i)
+	{
+		if(locale[i] == '_')
+		{
+			locale[i] = '-';
+		}
+		else if(locale[i] != '-' && !(locale[i] >= 'a' && locale[i] <= 'z') && !(locale[i] >= 'A' && locale[i] <= 'Z') && !(locale[i] >= '0' && locale[i] <= '9'))
+		{
+			locale[i] = '\0';
+			break;
+		}
+	}
+
+	// Use default if we could not determine the locale,
+	// i.e. if only the C or POSIX locale is available.
+	if(locale[0] == '\0' || str_comp(locale, "C") == 0 || str_comp(locale, "POSIX") == 0)
+		str_copy(locale, "en-US", length);
+}
+
+#if defined(CONF_EXCEPTION_HANDLING)
+#if defined(CONF_FAMILY_WINDOWS)
+static HMODULE exception_handling_module = nullptr;
+#endif
+
+void init_exception_handler()
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	const char *module_name = "exchndl.dll";
+	exception_handling_module = LoadLibraryA(module_name);
+	if(exception_handling_module == nullptr)
+	{
+		const DWORD LastError = GetLastError();
+		const std::string ErrorMsg = windows_format_system_message(LastError);
+		dbg_msg("exception_handling", "failed to load exception handling library '%s' (error %ld %s)", module_name, LastError, ErrorMsg.c_str());
+	}
+#else
+#error exception handling not implemented
+#endif
+}
+
+void set_exception_handler_log_file(const char *log_file_path)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	if(exception_handling_module != nullptr)
+	{
+		const std::wstring wide_log_file_path = windows_utf8_to_wide(log_file_path);
+		// Intentional
+#ifdef __MINGW32__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+		const char *function_name = "ExcHndlSetLogFileNameW";
+		auto exception_log_file_path_func = (BOOL(APIENTRY *)(const WCHAR *))(GetProcAddress(exception_handling_module, function_name));
+#ifdef __MINGW32__
+#pragma GCC diagnostic pop
+#endif
+		if(exception_log_file_path_func == nullptr)
+		{
+			const DWORD LastError = GetLastError();
+			const std::string ErrorMsg = windows_format_system_message(LastError);
+			dbg_msg("exception_handling", "could not find function '%s' in exception handling library (error %ld %s)", function_name, LastError, ErrorMsg.c_str());
+		}
+		else
+			exception_log_file_path_func(wide_log_file_path.c_str());
+	}
+#else
+#error exception handling not implemented
+#endif
+}
+#endif
+
+std::chrono::nanoseconds time_get_nanoseconds()
+{
+	return std::chrono::nanoseconds(time_get_impl());
+}
+
+int net_socket_read_wait(NETSOCKET sock, std::chrono::nanoseconds nanoseconds)
+{
+	using namespace std::chrono_literals;
+	return ::net_socket_read_wait(sock, (nanoseconds / std::chrono::nanoseconds(1us).count()).count());
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+std::wstring windows_utf8_to_wide(const char *str)
+{
+	const int orig_length = str_length(str);
+	if(orig_length == 0)
+		return L"";
+	const int size_needed = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, orig_length, nullptr, 0);
+	dbg_assert(size_needed > 0, "Invalid UTF-8 passed to windows_utf8_to_wide");
+	std::wstring wide_string(size_needed, L'\0');
+	dbg_assert(MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, orig_length, wide_string.data(), size_needed) == size_needed, "MultiByteToWideChar failure");
+	return wide_string;
+}
+
+std::optional<std::string> windows_wide_to_utf8(const wchar_t *wide_str)
+{
+	const int orig_length = wcslen(wide_str);
+	if(orig_length == 0)
+		return "";
+	const int size_needed = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, wide_str, orig_length, nullptr, 0, nullptr, nullptr);
+	if(size_needed == 0)
+		return {};
+	std::string string(size_needed, '\0');
+	dbg_assert(WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, wide_str, orig_length, string.data(), size_needed, nullptr, nullptr) == size_needed, "WideCharToMultiByte failure");
+	return string;
+}
+
+// See https://learn.microsoft.com/en-us/windows/win32/learnwin32/initializing-the-com-library
+CWindowsComLifecycle::CWindowsComLifecycle(bool HasWindow)
+{
+	HRESULT result = CoInitializeEx(NULL, (HasWindow ? COINIT_APARTMENTTHREADED : COINIT_MULTITHREADED) | COINIT_DISABLE_OLE1DDE);
+	dbg_assert(result != S_FALSE, "COM library already initialized on this thread");
+	dbg_assert(result == S_OK, "COM library initialization failed");
+}
+CWindowsComLifecycle::~CWindowsComLifecycle()
+{
+	CoUninitialize();
+}
+
+static void windows_print_error(const char *system, const char *prefix, HRESULT error)
+{
+	const std::string message = windows_format_system_message(error);
+	dbg_msg(system, "%s: %s", prefix, message.c_str());
+}
+
+static std::wstring filename_from_path(const std::wstring &path)
+{
+	const size_t pos = path.find_last_of(L"/\\");
+	return pos == std::wstring::npos ? path : path.substr(pos + 1);
+}
+
+bool shell_register_protocol(const char *protocol_name, const char *executable, bool *updated)
+{
+	const std::wstring protocol_name_wide = windows_utf8_to_wide(protocol_name);
+	const std::wstring executable_wide = windows_utf8_to_wide(executable);
+
+	// Open registry key for protocol associations of the current user
+	HKEY handle_subkey_classes;
+	const LRESULT result_subkey_classes = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes", 0, KEY_ALL_ACCESS, &handle_subkey_classes);
+	if(result_subkey_classes != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error opening registry key", result_subkey_classes);
+		return false;
+	}
+
+	// Create the protocol key
+	HKEY handle_subkey_protocol;
+	const LRESULT result_subkey_protocol = RegCreateKeyExW(handle_subkey_classes, protocol_name_wide.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_protocol, NULL);
+	RegCloseKey(handle_subkey_classes);
+	if(result_subkey_protocol != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error creating registry key", result_subkey_protocol);
+		return false;
+	}
+
+	// Set the default value for the key, which specifies the name of the display name of the protocol
+	const std::wstring value_protocol = L"URL:" + protocol_name_wide + L" Protocol";
+	const LRESULT result_value_protocol = RegSetValueExW(handle_subkey_protocol, L"", 0, REG_SZ, (BYTE *)value_protocol.c_str(), (value_protocol.length() + 1) * sizeof(wchar_t));
+	if(result_value_protocol != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error setting registry value", result_value_protocol);
+		RegCloseKey(handle_subkey_protocol);
+		return false;
+	}
+
+	// Set the "URL Protocol" value, to specify that this key describes a URL protocol
+	const LRESULT result_value_empty = RegSetValueEx(handle_subkey_protocol, L"URL Protocol", 0, REG_SZ, (BYTE *)L"", sizeof(wchar_t));
+	if(result_value_empty != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error setting registry value", result_value_empty);
+		RegCloseKey(handle_subkey_protocol);
+		return false;
+	}
+
+	// Create the "DefaultIcon" subkey
+	HKEY handle_subkey_icon;
+	const LRESULT result_subkey_icon = RegCreateKeyExW(handle_subkey_protocol, L"DefaultIcon", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_icon, NULL);
+	if(result_subkey_icon != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error creating registry key", result_subkey_icon);
+		RegCloseKey(handle_subkey_protocol);
+		return false;
+	}
+
+	// Set the default value for the key, which specifies the icon associated with the protocol
+	const std::wstring value_icon = L"\"" + executable_wide + L"\",0";
+	const LRESULT result_value_icon = RegSetValueExW(handle_subkey_icon, L"", 0, REG_SZ, (BYTE *)value_icon.c_str(), (value_icon.length() + 1) * sizeof(wchar_t));
+	RegCloseKey(handle_subkey_icon);
+	if(result_value_icon != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error setting registry value", result_value_icon);
+		RegCloseKey(handle_subkey_protocol);
+		return false;
+	}
+
+	// Create the "shell\open\command" subkeys
+	HKEY handle_subkey_shell_open_command;
+	const LRESULT result_subkey_shell_open_command = RegCreateKeyExW(handle_subkey_protocol, L"shell\\open\\command", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_shell_open_command, NULL);
+	RegCloseKey(handle_subkey_protocol);
+	if(result_subkey_shell_open_command != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_protocol", "Error creating registry key", result_subkey_shell_open_command);
+		return false;
+	}
+
+	// Get the previous default value for the key, so we can determine if it changed
+	wchar_t old_value_executable[MAX_PATH + 16];
+	DWORD old_size_executable = sizeof(old_value_executable);
+	const LRESULT result_old_value_executable = RegGetValueW(handle_subkey_shell_open_command, NULL, L"", RRF_RT_REG_SZ, NULL, (BYTE *)old_value_executable, &old_size_executable);
+	const std::wstring value_executable = L"\"" + executable_wide + L"\" \"%1\"";
+	if(result_old_value_executable != ERROR_SUCCESS || wcscmp(old_value_executable, value_executable.c_str()) != 0)
+	{
+		// Set the default value for the key, which specifies the executable command associated with the protocol
+		const LRESULT result_value_executable = RegSetValueExW(handle_subkey_shell_open_command, L"", 0, REG_SZ, (BYTE *)value_executable.c_str(), (value_executable.length() + 1) * sizeof(wchar_t));
+		RegCloseKey(handle_subkey_shell_open_command);
+		if(result_value_executable != ERROR_SUCCESS)
+		{
+			windows_print_error("shell_register_protocol", "Error setting registry value", result_value_executable);
+			return false;
+		}
+
+		*updated = true;
+	}
+	else
+	{
+		RegCloseKey(handle_subkey_shell_open_command);
+	}
+
+	return true;
+}
+
+bool shell_register_extension(const char *extension, const char *description, const char *executable_name, const char *executable, bool *updated)
+{
+	const std::wstring extension_wide = windows_utf8_to_wide(extension);
+	const std::wstring executable_name_wide = windows_utf8_to_wide(executable_name);
+	const std::wstring description_wide = executable_name_wide + L" " + windows_utf8_to_wide(description);
+	const std::wstring program_id_wide = executable_name_wide + extension_wide;
+	const std::wstring executable_wide = windows_utf8_to_wide(executable);
+
+	// Open registry key for file associations of the current user
+	HKEY handle_subkey_classes;
+	const LRESULT result_subkey_classes = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes", 0, KEY_ALL_ACCESS, &handle_subkey_classes);
+	if(result_subkey_classes != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error opening registry key", result_subkey_classes);
+		return false;
+	}
+
+	// Create the program ID key
+	HKEY handle_subkey_program_id;
+	const LRESULT result_subkey_program_id = RegCreateKeyExW(handle_subkey_classes, program_id_wide.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_program_id, NULL);
+	if(result_subkey_program_id != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error creating registry key", result_subkey_program_id);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Set the default value for the key, which specifies the file type description for legacy applications
+	const LRESULT result_description_default = RegSetValueExW(handle_subkey_program_id, L"", 0, REG_SZ, (BYTE *)description_wide.c_str(), (description_wide.length() + 1) * sizeof(wchar_t));
+	if(result_description_default != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error setting registry value", result_description_default);
+		RegCloseKey(handle_subkey_program_id);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Set the "FriendlyTypeName" value, which specifies the file type description for modern applications
+	const LRESULT result_description_friendly = RegSetValueExW(handle_subkey_program_id, L"FriendlyTypeName", 0, REG_SZ, (BYTE *)description_wide.c_str(), (description_wide.length() + 1) * sizeof(wchar_t));
+	if(result_description_friendly != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error setting registry value", result_description_friendly);
+		RegCloseKey(handle_subkey_program_id);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Create the "DefaultIcon" subkey
+	HKEY handle_subkey_icon;
+	const LRESULT result_subkey_icon = RegCreateKeyExW(handle_subkey_program_id, L"DefaultIcon", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_icon, NULL);
+	if(result_subkey_icon != ERROR_SUCCESS)
+	{
+		windows_print_error("register_protocol", "Error creating registry key", result_subkey_icon);
+		RegCloseKey(handle_subkey_program_id);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Set the default value for the key, which specifies the icon associated with the program ID
+	const std::wstring value_icon = L"\"" + executable_wide + L"\",0";
+	const LRESULT result_value_icon = RegSetValueExW(handle_subkey_icon, L"", 0, REG_SZ, (BYTE *)value_icon.c_str(), (value_icon.length() + 1) * sizeof(wchar_t));
+	RegCloseKey(handle_subkey_icon);
+	if(result_value_icon != ERROR_SUCCESS)
+	{
+		windows_print_error("register_protocol", "Error setting registry value", result_value_icon);
+		RegCloseKey(handle_subkey_program_id);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Create the "shell\open\command" subkeys
+	HKEY handle_subkey_shell_open_command;
+	const LRESULT result_subkey_shell_open_command = RegCreateKeyExW(handle_subkey_program_id, L"shell\\open\\command", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_shell_open_command, NULL);
+	RegCloseKey(handle_subkey_program_id);
+	if(result_subkey_shell_open_command != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error creating registry key", result_subkey_shell_open_command);
+		RegCloseKey(handle_subkey_classes);
+		return false;
+	}
+
+	// Get the previous default value for the key, so we can determine if it changed
+	wchar_t old_value_executable[MAX_PATH + 16];
+	DWORD old_size_executable = sizeof(old_value_executable);
+	const LRESULT result_old_value_executable = RegGetValueW(handle_subkey_shell_open_command, NULL, L"", RRF_RT_REG_SZ, NULL, (BYTE *)old_value_executable, &old_size_executable);
+	const std::wstring value_executable = L"\"" + executable_wide + L"\" \"%1\"";
+	if(result_old_value_executable != ERROR_SUCCESS || wcscmp(old_value_executable, value_executable.c_str()) != 0)
+	{
+		// Set the default value for the key, which specifies the executable command associated with the application
+		const LRESULT result_value_executable = RegSetValueExW(handle_subkey_shell_open_command, L"", 0, REG_SZ, (BYTE *)value_executable.c_str(), (value_executable.length() + 1) * sizeof(wchar_t));
+		RegCloseKey(handle_subkey_shell_open_command);
+		if(result_value_executable != ERROR_SUCCESS)
+		{
+			windows_print_error("shell_register_extension", "Error setting registry value", result_value_executable);
+			RegCloseKey(handle_subkey_classes);
+			return false;
+		}
+
+		*updated = true;
+	}
+
+	// Create the file extension key
+	HKEY handle_subkey_extension;
+	const LRESULT result_subkey_extension = RegCreateKeyExW(handle_subkey_classes, extension_wide.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_extension, NULL);
+	RegCloseKey(handle_subkey_classes);
+	if(result_subkey_extension != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_extension", "Error creating registry key", result_subkey_extension);
+		return false;
+	}
+
+	// Get the previous default value for the key, so we can determine if it changed
+	wchar_t old_value_application[128];
+	DWORD old_size_application = sizeof(old_value_application);
+	const LRESULT result_old_value_application = RegGetValueW(handle_subkey_extension, NULL, L"", RRF_RT_REG_SZ, NULL, (BYTE *)old_value_application, &old_size_application);
+	if(result_old_value_application != ERROR_SUCCESS || wcscmp(old_value_application, program_id_wide.c_str()) != 0)
+	{
+		// Set the default value for the key, which associates the file extension with the program ID
+		const LRESULT result_value_application = RegSetValueExW(handle_subkey_extension, L"", 0, REG_SZ, (BYTE *)program_id_wide.c_str(), (program_id_wide.length() + 1) * sizeof(wchar_t));
+		RegCloseKey(handle_subkey_extension);
+		if(result_value_application != ERROR_SUCCESS)
+		{
+			windows_print_error("shell_register_extension", "Error setting registry value", result_value_application);
+			return false;
+		}
+
+		*updated = true;
+	}
+	else
+	{
+		RegCloseKey(handle_subkey_extension);
+	}
+
+	return true;
+}
+
+bool shell_register_application(const char *name, const char *executable, bool *updated)
+{
+	const std::wstring name_wide = windows_utf8_to_wide(name);
+	const std::wstring executable_filename = filename_from_path(windows_utf8_to_wide(executable));
+
+	// Open registry key for application registrations
+	HKEY handle_subkey_applications;
+	const LRESULT result_subkey_applications = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\Applications", 0, KEY_ALL_ACCESS, &handle_subkey_applications);
+	if(result_subkey_applications != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_application", "Error opening registry key", result_subkey_applications);
+		return false;
+	}
+
+	// Create the program key
+	HKEY handle_subkey_program;
+	const LRESULT result_subkey_program = RegCreateKeyExW(handle_subkey_applications, executable_filename.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &handle_subkey_program, NULL);
+	RegCloseKey(handle_subkey_applications);
+	if(result_subkey_program != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_register_application", "Error creating registry key", result_subkey_program);
+		return false;
+	}
+
+	// Get the previous default value for the key, so we can determine if it changed
+	wchar_t old_value_executable[MAX_PATH];
+	DWORD old_size_executable = sizeof(old_value_executable);
+	const LRESULT result_old_value_executable = RegGetValueW(handle_subkey_program, NULL, L"FriendlyAppName", RRF_RT_REG_SZ, NULL, (BYTE *)old_value_executable, &old_size_executable);
+	if(result_old_value_executable != ERROR_SUCCESS || wcscmp(old_value_executable, name_wide.c_str()) != 0)
+	{
+		// Set the "FriendlyAppName" value, which specifies the displayed name of the application
+		const LRESULT result_program_name = RegSetValueExW(handle_subkey_program, L"FriendlyAppName", 0, REG_SZ, (BYTE *)name_wide.c_str(), (name_wide.length() + 1) * sizeof(wchar_t));
+		RegCloseKey(handle_subkey_program);
+		if(result_program_name != ERROR_SUCCESS)
+		{
+			windows_print_error("shell_register_application", "Error setting registry value", result_program_name);
+			return false;
+		}
+
+		*updated = true;
+	}
+	else
+	{
+		RegCloseKey(handle_subkey_program);
+	}
+
+	return true;
+}
+
+bool shell_unregister_class(const char *shell_class, bool *updated)
+{
+	const std::wstring class_wide = windows_utf8_to_wide(shell_class);
+
+	// Open registry key for protocol and file associations of the current user
+	HKEY handle_subkey_classes;
+	const LRESULT result_subkey_classes = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes", 0, KEY_ALL_ACCESS, &handle_subkey_classes);
+	if(result_subkey_classes != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_unregister_class", "Error opening registry key", result_subkey_classes);
+		return false;
+	}
+
+	// Delete the registry keys for the shell class (protocol or program ID)
+	LRESULT result_delete = RegDeleteTreeW(handle_subkey_classes, class_wide.c_str());
+	RegCloseKey(handle_subkey_classes);
+	if(result_delete == ERROR_SUCCESS)
+	{
+		*updated = true;
+	}
+	else if(result_delete != ERROR_FILE_NOT_FOUND)
+	{
+		windows_print_error("shell_unregister_class", "Error deleting registry key", result_delete);
+		return false;
+	}
+
+	return true;
+}
+
+bool shell_unregister_application(const char *executable, bool *updated)
+{
+	const std::wstring executable_filename = filename_from_path(windows_utf8_to_wide(executable));
+
+	// Open registry key for application registrations
+	HKEY handle_subkey_applications;
+	const LRESULT result_subkey_applications = RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\Applications", 0, KEY_ALL_ACCESS, &handle_subkey_applications);
+	if(result_subkey_applications != ERROR_SUCCESS)
+	{
+		windows_print_error("shell_unregister_application", "Error opening registry key", result_subkey_applications);
+		return false;
+	}
+
+	// Delete the registry keys for the application description
+	LRESULT result_delete = RegDeleteTreeW(handle_subkey_applications, executable_filename.c_str());
+	RegCloseKey(handle_subkey_applications);
+	if(result_delete == ERROR_SUCCESS)
+	{
+		*updated = true;
+	}
+	else if(result_delete != ERROR_FILE_NOT_FOUND)
+	{
+		windows_print_error("shell_unregister_application", "Error deleting registry key", result_delete);
+		return false;
+	}
+
+	return true;
+}
+
+void shell_update()
+{
+	SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
+}
+#endif
+
+size_t std::hash<NETADDR>::operator()(const NETADDR &Addr) const noexcept
+{
+	return std::hash<std::string_view>{}(std::string_view((const char *)&Addr, sizeof(Addr)));
+}
diff --git a/src_bkp/base/system.h b/src_bkp/base/system.h
new file mode 100644
index 0000000000..c575949e62
--- /dev/null
+++ b/src_bkp/base/system.h
@@ -0,0 +1,2805 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+/*
+	Title: OS Abstraction
+*/
+
+#ifndef BASE_SYSTEM_H
+#define BASE_SYSTEM_H
+
+#include "detect.h"
+#include "types.h"
+
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
+
+#include <chrono>
+#include <cinttypes>
+#include <cstdarg>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+#include <functional>
+#include <mutex>
+#include <optional>
+#include <string>
+
+#ifdef __MINGW32__
+#undef PRId64
+#undef PRIu64
+#undef PRIX64
+#define PRId64 "I64d"
+#define PRIu64 "I64u"
+#define PRIX64 "I64X"
+#define PRIzu "Iu"
+#else
+#define PRIzu "zu"
+#endif
+
+#ifdef CONF_FAMILY_UNIX
+#include <sys/un.h>
+#endif
+
+#ifdef CONF_PLATFORM_LINUX
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
+
+#if __cplusplus >= 201703L
+#define MAYBE_UNUSED [[maybe_unused]]
+#elif defined(__GNUC__)
+#define MAYBE_UNUSED __attribute__((unused))
+#else
+#define MAYBE_UNUSED
+#endif
+
+/**
+ * @defgroup Debug
+ *
+ * Utilities for debugging.
+ */
+
+/**
+ * @ingroup Debug
+ *
+ * Breaks into the debugger based on a test.
+ *
+ * @param test Result of the test.
+ * @param msg Message that should be printed if the test fails.
+ *
+ * @remark Also works in release mode.
+ *
+ * @see dbg_break
+ */
+#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
+
+#ifdef __clang_analyzer__
+#include <cassert>
+#undef dbg_assert
+#define dbg_assert(test, msg) assert(test)
+#endif
+
+#ifdef __GNUC__
+#define GNUC_ATTRIBUTE(x) __attribute__(x)
+#else
+#define GNUC_ATTRIBUTE(x)
+#endif
+
+/**
+ * Checks whether the program is currently shutting down due to a failed
+ * assert.
+ *
+ * @ingroup Debug
+ *
+ * @return indication whether the program is currently shutting down due to a
+ * failed assert.
+ */
+bool dbg_assert_has_failed();
+
+/**
+ * Breaks into the debugger.
+ *
+ * @ingroup Debug
+ * @remark Also works in release mode.
+ *
+ * @see dbg_assert
+ */
+#if defined(__cplusplus)
+[[noreturn]]
+#endif
+void
+dbg_break();
+
+typedef std::function<void(const char *message)> DBG_ASSERT_HANDLER;
+void dbg_assert_set_handler(DBG_ASSERT_HANDLER handler);
+
+/**
+ * Prints a debug message.
+ *
+ * @ingroup Debug
+ *
+ * @param sys A string that describes what system the message belongs to.
+ * @param fmt A printf styled format string.
+ *
+ * @remark Also works in release mode.
+ *
+ * @see dbg_assert
+ */
+void dbg_msg(const char *sys, const char *fmt, ...)
+	GNUC_ATTRIBUTE((format(printf, 2, 3)));
+
+/**
+ * @defgroup Memory
+ * Memory management utilities.
+ */
+
+/**
+ * Copies a a memory block.
+ *
+ * @ingroup Memory
+ *
+ * @param dest Destination.
+ * @param source Source to copy.
+ * @param size Size of the block to copy.
+ *
+ * @remark This functions DOES NOT handle cases where the source and destination is overlapping.
+ *
+ * @see mem_move
+ */
+void mem_copy(void *dest, const void *source, size_t size);
+
+/**
+ * Copies a a memory block.
+ *
+ * @ingroup Memory
+ *
+ * @param dest Destination.
+ * @param source Source to copy.
+ * @param size Size of the block to copy.
+ *
+ * @remark This functions handles the cases where the source and destination is overlapping.
+ *
+ * @see mem_copy
+ */
+void mem_move(void *dest, const void *source, size_t size);
+
+/**
+ * Sets a complete memory block to 0.
+ *
+ * @ingroup Memory
+ *
+ * @param block Pointer to the block to zero out.
+ * @param size Size of the block.
+ */
+template<typename T>
+inline void mem_zero(T *block, size_t size)
+{
+	static_assert((std::is_trivially_constructible<T>::value && std::is_trivially_destructible<T>::value) || std::is_fundamental<T>::value);
+	memset(block, 0, size);
+}
+
+/**
+ * Compares two blocks of memory
+ *
+ * @ingroup Memory
+ *
+ * @param a First block of data
+ * @param b Second block of data
+ * @param size Size of the data to compare
+ *
+ * @return < 0 - Block a is less than block b.
+ * @return 0 - Block a is equal to block b.
+ * @return > 0 - Block a is greater than block b.
+ */
+int mem_comp(const void *a, const void *b, size_t size);
+
+/**
+ * Checks whether a block of memory contains null bytes.
+ *
+ * @ingroup Memory
+ *
+ * @param block Pointer to the block to check for nulls.
+ * @param size Size of the block.
+ *
+ * @return true if the block has a null byte, false otherwise.
+ */
+bool mem_has_null(const void *block, size_t size);
+
+/**
+ * @defgroup File-IO
+ *
+ * I/O related operations.
+ */
+
+/**
+ * @ingroup File-IO
+ */
+enum
+{
+	IOFLAG_READ = 1,
+	IOFLAG_WRITE = 2,
+	IOFLAG_APPEND = 4,
+	IOFLAG_SKIP_BOM = 8,
+
+	IOSEEK_START = 0,
+	IOSEEK_CUR = 1,
+	IOSEEK_END = 2,
+};
+
+/**
+ * Opens a file.
+ *
+ * @ingroup File-IO
+ *
+ * @param File to open.
+ * @param flags A set of IOFLAG flags.
+ *
+ * @sa IOFLAG_READ, IOFLAG_WRITE, IOFLAG_APPEND, IOFLAG_SKIP_BOM.
+ *
+ * @return A handle to the file on success and 0 on failure.
+ *
+ */
+IOHANDLE io_open(const char *filename, int flags);
+
+/**
+ * Reads data into a buffer from a file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file to read data from.
+ * @param buffer Pointer to the buffer that will receive the data.
+ * @param size Number of bytes to read from the file.
+ *
+ * @return Number of bytes read.
+ *
+ */
+unsigned io_read(IOHANDLE io, void *buffer, unsigned size);
+
+/**
+ * Reads the rest of the file into a buffer.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file to read data from.
+ * @param result Receives the file's remaining contents.
+ * @param result_len Receives the file's remaining length.
+ *
+ * @remark Does NOT guarantee that there are no internal null bytes.
+ * @remark The result must be freed after it has been used.
+ */
+void io_read_all(IOHANDLE io, void **result, unsigned *result_len);
+
+/**
+ * Reads the rest of the file into a zero-terminated buffer with
+ * no internal null bytes.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file to read data from.
+ *
+ * @return The file's remaining contents or null on failure.
+ *
+ * @remark Guarantees that there are no internal null bytes.
+ * @remark Guarantees that result will contain zero-termination.
+ * @remark The result must be freed after it has been used.
+ */
+char *io_read_all_str(IOHANDLE io);
+
+/**
+ * Skips data in a file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ * @param size Number of bytes to skip.
+ *
+ * @return 0 on success.
+ */
+int io_skip(IOHANDLE io, int size);
+
+/**
+ * Writes data from a buffer to file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ * @param buffer Pointer to the data that should be written.
+ * @param size Number of bytes to write.
+ *
+ * @return Number of bytes written.
+ */
+unsigned io_write(IOHANDLE io, const void *buffer, unsigned size);
+
+/**
+ * Writes a platform dependent newline to file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return true on success, false on failure.
+ */
+bool io_write_newline(IOHANDLE io);
+
+/**
+ * Seeks to a specified offset in the file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ * @param offset Offset from pos to stop.
+ * @param origin Position to start searching from.
+ *
+ * @return 0 on success.
+ */
+int io_seek(IOHANDLE io, int offset, int origin);
+
+/**
+ * Gets the current position in the file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return The current position. @c -1L if an error occurred.
+ */
+long int io_tell(IOHANDLE io);
+
+/**
+ * Gets the total length of the file. Resetting cursor to the beginning
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return The total size. @c -1L if an error occurred.
+ */
+long int io_length(IOHANDLE io);
+
+/**
+ * Closes a file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return 0 on success.
+ */
+int io_close(IOHANDLE io);
+
+/**
+ * Empties all buffers and writes all pending data.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return 0 on success.
+ */
+int io_flush(IOHANDLE io);
+
+/**
+ * Synchronize file changes to disk.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return 0 on success.
+ */
+int io_sync(IOHANDLE io);
+
+/**
+ * Checks whether an error occurred during I/O with the file.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return nonzero on error, 0 otherwise.
+ */
+int io_error(IOHANDLE io);
+
+/**
+ * @ingroup File-IO
+ * @return An <IOHANDLE> to the standard input.
+ */
+IOHANDLE io_stdin();
+
+/**
+ * @ingroup File-IO
+ * @return An <IOHANDLE> to the standard output.
+ */
+IOHANDLE io_stdout();
+
+/**
+ * @ingroup File-IO
+ * @return An <IOHANDLE> to the standard error.
+ */
+IOHANDLE io_stderr();
+
+/**
+ * @ingroup File-IO
+ * @return An <IOHANDLE> to the current executable.
+ */
+IOHANDLE io_current_exe();
+
+typedef struct ASYNCIO ASYNCIO;
+
+/**
+ * Wraps a @link IOHANDLE @endlink for asynchronous writing.
+ *
+ * @ingroup File-IO
+ *
+ * @param io Handle to the file.
+ *
+ * @return The handle for asynchronous writing.
+ *
+ */
+ASYNCIO *aio_new(IOHANDLE io);
+
+/**
+ * Locks the ASYNCIO structure so it can't be written into by
+ * other threads.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ */
+void aio_lock(ASYNCIO *aio);
+
+/**
+ * Unlocks the ASYNCIO structure after finishing the contiguous
+ * write.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ */
+void aio_unlock(ASYNCIO *aio);
+
+/**
+ * Queues a chunk of data for writing.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ * @param buffer Pointer to the data that should be written.
+ * @param size Number of bytes to write.
+ */
+void aio_write(ASYNCIO *aio, const void *buffer, unsigned size);
+
+/**
+ * Queues a newline for writing.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ */
+void aio_write_newline(ASYNCIO *aio);
+
+/**
+ * Queues a chunk of data for writing. The ASYNCIO struct must be
+ * locked using @link aio_lock @endlink first.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ * @param buffer Pointer to the data that should be written.
+ * @param size Number of bytes to write.
+ *
+ */
+void aio_write_unlocked(ASYNCIO *aio, const void *buffer, unsigned size);
+
+/**
+ * Queues a newline for writing. The ASYNCIO struct must be locked
+ * using @link aio_lock @endlink first.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ */
+void aio_write_newline_unlocked(ASYNCIO *aio);
+
+/**
+ * Checks whether errors have occurred during the asynchronous
+ * writing.
+ *
+ * Call this function regularly to see if there are errors. Call
+ * this function after <aio_wait> to see if the process of writing
+ * to the file succeeded.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ * @eturn 0 if no error occurred, and nonzero on error.
+ *
+ */
+int aio_error(ASYNCIO *aio);
+
+/**
+ * Queues file closing.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ */
+void aio_close(ASYNCIO *aio);
+
+/**
+ * Wait for the asynchronous operations to complete.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ */
+void aio_wait(ASYNCIO *aio);
+
+/**
+ * Frees the resources associated to the asynchronous file handle.
+ *
+ * @ingroup File-IO
+ *
+ * @param aio Handle to the file.
+ *
+ */
+void aio_free(ASYNCIO *aio);
+
+/**
+ * @defgroup Threads
+ * Threading related functions.
+ *
+ * @see Locks
+ */
+
+/**
+ * Creates a new thread.
+ *
+ * @ingroup Threads
+ *
+ * @param threadfunc Entry point for the new thread.
+ * @param user Pointer to pass to the thread.
+ * @param name name describing the use of the thread
+ */
+void *thread_init(void (*threadfunc)(void *), void *user, const char *name);
+
+/**
+ * Waits for a thread to be done or destroyed.
+ *
+ * @ingroup Threads
+ *
+ * @param thread Thread to wait for.
+ */
+void thread_wait(void *thread);
+
+/**
+ * Yield the current threads execution slice.
+ *
+ * @ingroup Threads
+ */
+void thread_yield();
+
+/**
+ * Puts the thread in the detached thread, guaranteeing that
+ * resources of the thread will be freed immediately when the
+ * thread terminates.
+ *
+ * @ingroup Threads
+ *
+ * @param thread Thread to detach
+ */
+void thread_detach(void *thread);
+
+/**
+ * Creates a new thread and if it succeeded detaches it.
+ *
+ * @ingroup Threads
+ *
+ * @param threadfunc Entry point for the new thread.
+ * @param user Pointer to pass to the thread.
+ * @param name Name describing the use of the thread
+ *
+ * @return true on success, false on failure.
+ */
+bool thread_init_and_detach(void (*threadfunc)(void *), void *user, const char *name);
+
+/**
+ * @defgroup Semaphore
+ * @see Threads
+ */
+
+#if defined(CONF_FAMILY_WINDOWS)
+typedef void *SEMAPHORE;
+#elif defined(CONF_PLATFORM_MACOS)
+#include <semaphore.h>
+typedef sem_t *SEMAPHORE;
+#elif defined(CONF_FAMILY_UNIX)
+#include <semaphore.h>
+typedef sem_t SEMAPHORE;
+#else
+#error not implemented on this platform
+#endif
+
+/**
+ * @ingroup Semaphore
+ */
+void sphore_init(SEMAPHORE *sem);
+/**
+ * @ingroup Semaphore
+ */
+void sphore_wait(SEMAPHORE *sem);
+/**
+ * @ingroup Semaphore
+ */
+void sphore_signal(SEMAPHORE *sem);
+/**
+ * @ingroup Semaphore
+ */
+void sphore_destroy(SEMAPHORE *sem);
+
+/**
+ * @defgroup Time
+ *
+ * Time utilities.
+ */
+
+/**
+ * @ingroup Time
+ */
+void set_new_tick();
+
+/**
+ * Fetches a sample from a high resolution timer.
+ *
+ * @ingroup Time
+ *
+ * @return Current value of the timer.
+ *
+ * @remark To know how fast the timer is ticking, see @link time_freq @endlink.
+ *
+ * @see time_freq
+ */
+int64_t time_get_impl();
+
+/**
+ * Fetches a sample from a high resolution timer.
+ *
+ * @ingroup Time
+ *
+ * @return Current value of the timer.
+ *
+ * @remark To know how fast the timer is ticking, see @link time_freq @endlink.
+ * @remark Uses @link time_get_impl @endlink to fetch the sample.
+ *
+ * @see time_freq time_get_impl
+ */
+int64_t time_get();
+
+/**
+ * @ingroup Time
+ *
+ * @return The frequency of the high resolution timer.
+ */
+int64_t time_freq();
+
+/**
+ * Retrieves the current time as a UNIX timestamp
+ *
+ * @ingroup Time
+ *
+ * @return The time as a UNIX timestamp
+ */
+int time_timestamp();
+
+/**
+ * Retrieves the hours since midnight (0..23)
+ *
+ * @ingroup Time
+ *
+ * @return The current hour of the day
+ */
+int time_houroftheday();
+
+/**
+ * @ingroup Time
+ */
+enum ETimeSeason
+{
+	SEASON_SPRING = 0,
+	SEASON_SUMMER,
+	SEASON_AUTUMN,
+	SEASON_WINTER,
+	SEASON_EASTER,
+	SEASON_HALLOWEEN,
+	SEASON_XMAS,
+	SEASON_NEWYEAR
+};
+
+/**
+ * Retrieves the current season of the year.
+ *
+ * @ingroup Time
+ *
+ * @return One of the SEASON_* enum literals
+ *
+ * @see SEASON_SPRING
+ */
+ETimeSeason time_season();
+
+/**
+ * @defgroup Network-General
+ */
+
+extern const NETADDR NETADDR_ZEROED;
+
+/**
+ * @ingroup Network-General
+ */
+
+#ifdef CONF_FAMILY_UNIX
+/**
+ * @ingroup Network-General
+ */
+typedef int UNIXSOCKET;
+/**
+ * @ingroup Network-General
+ */
+typedef struct sockaddr_un UNIXSOCKETADDR;
+#endif
+
+/**
+ * Initiates network functionality.
+ *
+ * @ingroup Network-General
+ *
+ * @remark You must call this function before using any other network functions.
+ */
+void net_init();
+
+/*
+	Function: net_host_lookup
+		Does a hostname lookup by name and fills out the passed
+		NETADDR struct with the received details.
+
+	Returns:
+		0 on success.
+*/
+int net_host_lookup(const char *hostname, NETADDR *addr, int types);
+
+/**
+ * Compares two network addresses.
+ *
+ * @ingroup Network-General
+ *
+ * @param a Address to compare
+ * @param b Address to compare to.
+ *
+ * @return `< 0` - Address a is less than address b
+ * @return `0` - Address a is equal to address b
+ * @return `> 0` - Address a is greater than address b
+ */
+int net_addr_comp(const NETADDR *a, const NETADDR *b);
+
+/**
+ * Compares two network addresses ignoring port.
+ *
+ * @ingroup Network-General
+ *
+ * @param a Address to compare
+ * @param b Address to compare to.
+ *
+ * @return `< 0` - Address a is less than address b
+ * @return `0` - Address a is equal to address b
+ * @return `> 0` - Address a is greater than address b
+ */
+int net_addr_comp_noport(const NETADDR *a, const NETADDR *b);
+
+/**
+ * Turns a network address into a representative string.
+ *
+ * @ingroup Network-General
+ *
+ * @param addr Address to turn into a string.
+ * @param string Buffer to fill with the string.
+ * @param max_length Maximum size of the string.
+ * @param add_port add port to string or not
+ *
+ * @remark The string will always be zero terminated
+ */
+void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port);
+
+/**
+ * Turns url string into a network address struct.
+ * The url format is tw-0.6+udp://{ipaddr}[:{port}]
+ * ipaddr: can be ipv4 or ipv6
+ * port: is a optional internet protocol port
+ *
+ * This format is used for parsing the master server, be careful before changing it.
+ *
+ * Examples:
+ *   tw-0.6+udp://127.0.0.1
+ *   tw-0.6+udp://127.0.0.1:8303
+ *
+ * @param addr Address to fill in.
+ * @param string String to parse.
+ * @param host_buf Pointer to a buffer to write the host to
+ *                 It will include the port if one is included in the url
+ *                 It can also be set to NULL then it will be ignored
+ * @param host_buf_size Size of the host buffer or 0 if no host_buf pointer is given
+ *
+ * @return 0 on success,
+ *         positive if the input wasn't a valid DDNet URL,
+ *         negative if the input is a valid DDNet URL but the host part was not a valid IPv4/IPv6 address
+ */
+int net_addr_from_url(NETADDR *addr, const char *string, char *host_buf, size_t host_buf_size);
+
+/**
+ * Turns string into a network address.
+ *
+ * @param addr Address to fill in.
+ * @param string String to parse.
+ *
+ * @return 0 on success
+ */
+int net_addr_from_str(NETADDR *addr, const char *string);
+
+/**
+ * @defgroup Network-UDP
+ * @ingroup Network-General
+ */
+
+/*
+	Function: net_socket_type
+		Determine a socket's type.
+
+	Parameters:
+		sock - Socket whose type should be determined.
+
+	Returns:
+		The socket type, a bitset of `NETTYPE_IPV4`, `NETTYPE_IPV6` and
+		`NETTYPE_WEBSOCKET_IPV4`.
+*/
+int net_socket_type(NETSOCKET sock);
+
+/*
+	Function: net_udp_create
+		Creates a UDP socket and binds it to a port.
+
+	Parameters:
+		bindaddr - Address to bind the socket to.
+
+	Returns:
+		On success it returns an handle to the socket. On failure it
+		returns NETSOCKET_INVALID.
+*/
+NETSOCKET net_udp_create(NETADDR bindaddr);
+
+/**
+ * Sends a packet over an UDP socket.
+ *
+ * @ingroup Network-UDP
+ *
+ * @param sock Socket to use.
+ * @param addr Where to send the packet.
+ * @param data Pointer to the packet data to send.
+ * @param size Size of the packet.
+ *
+ * @return On success it returns the number of bytes sent. Returns -1
+ * on error.
+ */
+int net_udp_send(NETSOCKET sock, const NETADDR *addr, const void *data, int size);
+
+/*
+	Function: net_udp_recv
+		Receives a packet over an UDP socket.
+
+	Parameters:
+		sock - Socket to use.
+		addr - Pointer to an NETADDR that will receive the address.
+		data - Received data. Will be invalidated when this function is
+		called again.
+
+	Returns:
+		On success it returns the number of bytes received. Returns -1
+		on error.
+*/
+int net_udp_recv(NETSOCKET sock, NETADDR *addr, unsigned char **data);
+
+/**
+ * Closes an UDP socket.
+ *
+ * @ingroup Network-UDP
+ *
+ * @param sock Socket to close.
+ *
+ * @return 0 on success. -1 on error.
+ */
+int net_udp_close(NETSOCKET sock);
+
+/**
+ * @defgroup Network-TCP
+ * @ingroup Network-General
+ */
+
+/**
+ * Creates a TCP socket.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param bindaddr Address to bind the socket to.
+ *
+ * @return On success it returns an handle to the socket. On failure it returns NETSOCKET_INVALID.
+ */
+NETSOCKET net_tcp_create(NETADDR bindaddr);
+
+/**
+ * Makes the socket start listening for new connections.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock Socket to start listen to.
+ * @param backlog Size of the queue of incoming connections to keep.
+ *
+ * @return 0 on success.
+ */
+int net_tcp_listen(NETSOCKET sock, int backlog);
+
+/**
+ * Polls a listning socket for a new connection.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock - Listning socket to poll.
+ * @param new_sock - Pointer to a socket to fill in with the new socket.
+ * @param addr - Pointer to an address that will be filled in the remote address (optional, can be NULL).
+ *
+ * @return A non-negative integer on success. Negative integer on failure.
+ */
+int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *addr);
+
+/**
+ * Connects one socket to another.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock Socket to connect.
+ * @param addr Address to connect to.
+ *
+ * @return 0 on success.
+ *
+ */
+int net_tcp_connect(NETSOCKET sock, const NETADDR *addr);
+
+/**
+ * Sends data to a TCP stream.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock Socket to send data to.
+ * @param data Pointer to the data to send.
+ * @param size Size of the data to send.
+ *
+ * @return Number of bytes sent. Negative value on failure.
+ */
+int net_tcp_send(NETSOCKET sock, const void *data, int size);
+
+/**
+ * Recvives data from a TCP stream.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock Socket to recvive data from.
+ * @param data Pointer to a buffer to write the data to
+ * @param max_size Maximum of data to write to the buffer.
+ *
+ * @return Number of bytes recvived. Negative value on failure. When in
+ * non-blocking mode, it returns 0 when there is no more data to
+ * be fetched.
+ */
+int net_tcp_recv(NETSOCKET sock, void *data, int maxsize);
+
+/**
+ * Closes a TCP socket.
+ *
+ * @ingroup Network-TCP
+ *
+ * @param sock Socket to close.
+ *
+ * @return 0 on success. Negative value on failure.
+ */
+int net_tcp_close(NETSOCKET sock);
+
+#if defined(CONF_FAMILY_UNIX)
+/**
+ * @defgroup Network-Unix-Sockets
+ * @ingroup Network-General
+ */
+
+/**
+ * Creates an unnamed unix datagram socket.
+ *
+ * @ingroup Network-Unix-Sockets
+ *
+ * @return On success it returns a handle to the socket. On failure it returns -1.
+ */
+UNIXSOCKET net_unix_create_unnamed();
+
+/**
+ * Sends data to a Unix socket.
+ *
+ * @ingroup Network-Unix-Sockets
+ *
+ * @param sock Socket to use.
+ * @param addr Where to send the packet.
+ * @param data Pointer to the packet data to send.
+ * @param size Size of the packet.
+ *
+ * @return Number of bytes sent. Negative value on failure.
+ */
+int net_unix_send(UNIXSOCKET sock, UNIXSOCKETADDR *addr, void *data, int size);
+
+/**
+ * Sets the unixsocketaddress for a path to a socket file.
+ *
+ * @ingroup Network-Unix-Sockets
+ *
+ * @param addr Pointer to the addressstruct to fill.
+ * @param path Path to the (named) unix socket.
+ */
+void net_unix_set_addr(UNIXSOCKETADDR *addr, const char *path);
+
+/**
+ * Closes a Unix socket.
+ *
+ * @ingroup Network-Unix-Sockets
+ *
+ * @param sock Socket to close.
+ */
+void net_unix_close(UNIXSOCKET sock);
+
+#elif defined(CONF_FAMILY_WINDOWS)
+
+/**
+ * Formats a Windows error code as a human-readable string.
+ *
+ * @param error The Windows error code.
+ *
+ * @return A new std::string representing the error code.
+ */
+std::string windows_format_system_message(unsigned long error);
+
+#endif
+
+/**
+ * @defgroup Strings
+ *
+ * String related functions.
+ */
+
+/**
+ * Appends a string to another.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Pointer to a buffer that contains a string.
+ * @param src String to append.
+ * @param dst_size Size of the buffer of the dst string.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+void str_append(char *dst, const char *src, int dst_size);
+
+/**
+ * Appends a string to a fixed-size array of chars.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Array that shall receive the string.
+ * @param src String to append.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+template<int N>
+void str_append(char (&dst)[N], const char *src)
+{
+	str_append(dst, src, N);
+}
+
+/**
+ * Copies a string to another.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Pointer to a buffer that shall receive the string.
+ * @param src String to be copied.
+ * @param dst_size Size of the buffer dst.
+ *
+ * @return Length of written string, even if it has been truncated
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+int str_copy(char *dst, const char *src, int dst_size);
+
+/**
+ * Copies a string to a fixed-size array of chars.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Array that shall receive the string.
+ * @param src String to be copied.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+template<int N>
+void str_copy(char (&dst)[N], const char *src)
+{
+	str_copy(dst, src, N);
+}
+
+/**
+ * Truncates a utf8 encoded string to a given length.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Pointer to a buffer that shall receive the string.
+ * @param dst_size Size of the buffer dst.
+ * @param str String to be truncated.
+ * @param truncation_len Maximum codepoints in the returned string.
+ *
+ * @remark The strings are treated as utf8-encoded zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+void str_utf8_truncate(char *dst, int dst_size, const char *src, int truncation_len);
+
+/**
+ * Truncates a string to a given length.
+ *
+ * @ingroup Strings
+ *
+ * @param dst Pointer to a buffer that shall receive the string.
+ * @param dst_size Size of the buffer dst.
+ * @param src String to be truncated.
+ * @param truncation_len Maximum length of the returned string (not
+ * counting the zero termination).
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that dst string will contain zero-termination.
+ */
+void str_truncate(char *dst, int dst_size, const char *src, int truncation_len);
+
+/**
+ * Returns the length of a zero terminated string.
+ *
+ * @ingroup Strings
+ *
+ * @param str Pointer to the string.
+ *
+ * @return Length of string in bytes excluding the zero termination.
+ */
+int str_length(const char *str);
+
+/**
+ * Performs printf formatting into a buffer.
+ *
+ * @ingroup Strings
+ *
+ * @param buffer Pointer to the buffer to receive the formatted string.
+ * @param buffer_size Size of the buffer.
+ * @param format printf formatting string.
+ * @param args The variable argument list.
+ *
+ * @return Length of written string, even if it has been truncated.
+ *
+ * @remark See the C manual for syntax for the printf formatting string.
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that buffer string will contain zero-termination.
+ */
+int str_format_v(char *buffer, int buffer_size, const char *format, va_list args)
+	GNUC_ATTRIBUTE((format(printf, 3, 0)));
+
+/**
+ * Performs printf formatting into a buffer.
+ *
+ * @ingroup Strings
+ *
+ * @param buffer Pointer to the buffer to receive the formatted string.
+ * @param buffer_size Size of the buffer.
+ * @param format printf formatting string.
+ * @param ... Parameters for the formatting.
+ *
+ * @return Length of written string, even if it has been truncated.
+ *
+ * @remark See the C manual for syntax for the printf formatting string.
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Guarantees that buffer string will contain zero-termination.
+ */
+int str_format(char *buffer, int buffer_size, const char *format, ...)
+	GNUC_ATTRIBUTE((format(printf, 3, 4)));
+
+/**
+ * Trims specific number of words at the start of a string.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to trim the words from.
+ * @param words Count of words to trim.
+ *
+ * @return Trimmed string
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Leading whitespace is always trimmed.
+ */
+const char *str_trim_words(const char *str, int words);
+
+/**
+ * Check whether string has ASCII control characters.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to check.
+ *
+ * @return Whether the string has ASCII control characters.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+bool str_has_cc(const char *str);
+
+/**
+ * Replaces all characters below 32 with whitespace.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to sanitize.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void str_sanitize_cc(char *str);
+
+/**
+ * Replaces all characters below 32 with whitespace with
+ * exception to \t, \n and \r.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to sanitize.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void str_sanitize(char *str);
+
+/**
+ * Replaces all invalid filename characters with whitespace.
+ *
+ * @param str String to sanitize.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void str_sanitize_filename(char *str);
+
+/**
+ * Removes leading and trailing spaces and limits the use of multiple spaces.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to clean up
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void str_clean_whitespaces(char *str);
+
+/**
+ * Skips leading non-whitespace characters.
+ *
+ * @ingroup Strings
+ *
+ * @param str Pointer to the string.
+ *
+ * @return Pointer to the first whitespace character found
+ *		   within the string.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Whitespace is defined according to str_isspace.
+ */
+char *str_skip_to_whitespace(char *str);
+
+/**
+ * @ingroup Strings
+ * @see str_skip_to_whitespace
+ */
+const char *str_skip_to_whitespace_const(const char *str);
+
+/**
+ * Skips leading whitespace characters.
+ *
+ * @ingroup Strings
+ *
+ * @param str Pointer to the string.
+ *
+ * Pointer to the first non-whitespace character found
+ * within the string.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Whitespace is defined according to str_isspace.
+ */
+char *str_skip_whitespaces(char *str);
+
+/**
+ * @ingroup Strings
+ * @see str_skip_whitespaces
+ */
+const char *str_skip_whitespaces_const(const char *str);
+
+/**
+ * Compares to strings case insensitively.
+ *
+ * @ingroup Strings
+ *
+ * @param a String to compare.
+ * @param b String to compare.
+ *
+ * @return `< 0` - String a is less than string b
+ * @return `0` - String a is equal to string b
+ * @return `> 0` - String a is greater than string b
+ *
+ * @remark Only guaranteed to work with a-z/A-Z.
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_comp_nocase(const char *a, const char *b);
+
+/**
+ * Compares up to num characters of two strings case insensitively.
+ *
+ * @ingroup Strings
+ *
+ * @param a String to compare.
+ * @param b String to compare.
+ * @param num Maximum characters to compare
+ *
+ * @return `< 0` - String a is less than string b
+ * @return `0` - String a is equal to string b
+ * @return `> 0` - String a is greater than string b
+ *
+ * @remark Only guaranteed to work with a-z/A-Z.
+ * (use str_utf8_comp_nocase_num for unicode support)
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_comp_nocase_num(const char *a, const char *b, int num);
+
+/**
+ * Compares two strings case sensitive.
+ *
+ * @ingroup Strings
+ *
+ * @param a String to compare.
+ * @param b String to compare.
+ *
+ * @return `< 0` - String a is less than string b
+ * @return `0` - String a is equal to string b
+ * @return `> 0` - String a is greater than string b
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_comp(const char *a, const char *b);
+
+/**
+ * Compares up to num characters of two strings case sensitive.
+ *
+ * @ingroup Strings
+ *
+ * @param a String to compare.
+ * @param b String to compare.
+ * @param num Maximum characters to compare
+ *
+ * @return `< 0` - String a is less than string b
+ * @return `0` - String a is equal to string b
+ * @return `> 0` - String a is greater than string b
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_comp_num(const char *a, const char *b, int num);
+
+/**
+ * Compares two strings case insensitive, digit chars will be compared as numbers.
+ *
+ * @ingroup Strings
+ *
+ * @param a String to compare.
+ * @param b String to compare.
+ *
+ * @return `< 0` - String a is less than string b
+ * @return `0` - String a is equal to string b
+ * @return `> 0` - String a is greater than string b
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_comp_filenames(const char *a, const char *b);
+
+/*
+       Function: str_startswith_nocase
+               Checks case insensitive whether the string begins with a certain prefix.
+
+       Parameter:
+               str - String to check.
+               prefix - Prefix to look for.
+
+       Returns:
+               A pointer to the string str after the string prefix, or 0 if
+               the string prefix isn't a prefix of the string str.
+
+       Remarks:
+               - The strings are treated as zero-terminated strings.
+*/
+const char *str_startswith_nocase(const char *str, const char *prefix);
+
+/**
+ * Checks case sensitive whether the string begins with a certain prefix.
+ *
+ * @ingroup Strings
+ *
+ * @param str String to check.
+ * @param prefix Prefix to look for.
+ *
+ * @return A pointer to the string str after the string prefix, or 0 if
+ *		   the string prefix isn't a prefix of the string str.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+const char *str_startswith(const char *str, const char *prefix);
+
+/*
+       Function: str_endswith_nocase
+               Checks case insensitive whether the string ends with a certain suffix.
+
+       Parameter:
+               str - String to check.
+               suffix - Suffix to look for.
+
+       Returns:
+               A pointer to the beginning of the suffix in the string str, or
+               0 if the string suffix isn't a suffix of the string str.
+
+       Remarks:
+               - The strings are treated as zero-terminated strings.
+*/
+const char *str_endswith_nocase(const char *str, const char *suffix);
+
+/*
+	Function: str_endswith
+		Checks case sensitive whether the string ends with a certain suffix.
+
+	Parameter:
+		str - String to check.
+		suffix - Suffix to look for.
+
+	Returns:
+		A pointer to the beginning of the suffix in the string str, or
+		0 if the string suffix isn't a suffix of the string str.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+const char *str_endswith(const char *str, const char *suffix);
+
+/**
+ * Computes the edit distance between two strings.
+ *
+ * @param a First string for the edit distance.
+ * @param b Second string for the edit distance.
+ *
+ * @return The edit distance between the both strings.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_utf8_dist(const char *a, const char *b);
+
+/**
+ * Computes the edit distance between two strings, allows buffers
+ * to be passed in.
+ *
+ * @ingroup Strings
+ *
+ * @param a - First string for the edit distance.
+ * @param b - Second string for the edit distance.
+ * @param buf - Buffer for the function.
+ * @param buf_len Length of the buffer, must be at least as long as
+ *				  twice the length of both strings combined plus two.
+ *
+ * @return The edit distance between the both strings.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int str_utf8_dist_buffer(const char *a, const char *b, int *buf, int buf_len);
+
+/*
+	Function: str_utf32_dist_buffer
+		Computes the edit distance between two strings, allows buffers
+		to be passed in.
+
+	Parameters:
+		a - First string for the edit distance.
+		a_len - Length of the first string.
+		b - Second string for the edit distance.
+		b_len - Length of the second string.
+		buf - Buffer for the function.
+		buf_len - Length of the buffer, must be at least as long as
+		          the length of both strings combined plus two.
+
+	Returns:
+		The edit distance between the both strings.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+int str_utf32_dist_buffer(const int *a, int a_len, const int *b, int b_len, int *buf, int buf_len);
+
+/*
+	Function: str_find_nocase
+		Finds a string inside another string case insensitively.
+
+	Parameters:
+		haystack - String to search in
+		needle - String to search for
+
+	Returns:
+		A pointer into haystack where the needle was found.
+		Returns NULL if needle could not be found.
+
+	Remarks:
+		- Only guaranteed to work with a-z/A-Z.
+		  (use str_utf8_find_nocase for unicode support)
+		- The strings are treated as zero-terminated strings.
+*/
+const char *str_find_nocase(const char *haystack, const char *needle);
+
+/*
+	Function: str_find
+		Finds a string inside another string case sensitive.
+
+	Parameters:
+		haystack - String to search in
+		needle - String to search for
+
+	Returns:
+		A pointer into haystack where the needle was found.
+		Returns NULL if needle could not be found.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+const char *str_find(const char *haystack, const char *needle);
+
+/**
+ * Finds the last occurrence of a character
+ *
+ * @ingroup Strings
+ *
+ * @param haystack String to search in
+ * @param needle Character to search for
+
+ * @return A pointer into haystack where the needle was found.
+ * Returns NULL if needle could not be found.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark The zero-terminator character can also be found with this function.
+ */
+const char *str_rchr(const char *haystack, char needle);
+
+/**
+ * Counts the number of occurrences of a character in a string.
+ *
+ * @ingroup Strings
+ *
+ * @param haystack String to count in
+ * @param needle Character to count
+
+ * @return The number of characters in the haystack string matching
+ * the needle character.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark The number of zero-terminator characters cannot be counted.
+ */
+int str_countchr(const char *haystack, char needle);
+
+/**
+ * Takes a datablock and generates a hex string of it, with spaces between bytes.
+ *
+ * @param dst Buffer to fill with hex data.
+ * @param dst_size Size of the buffer (at least 3 * data_size + 1 to contain all data).
+ * @param data Data to turn into hex.
+ * @param data_size Size of the data.
+ *
+ * @remark The destination buffer will be zero-terminated.
+ */
+void str_hex(char *dst, int dst_size, const void *data, int data_size);
+
+/**
+ * Takes a datablock and generates a hex string of it, in the C style array format,
+ * i.e. with bytes formatted in 0x00-0xFF notation and commas with spaces between the bytes.
+ * The output can be split over multiple lines by specifying the maximum number of bytes
+ * that should be printed per line.
+ *
+ * @param dst Buffer to fill with hex data.
+ * @param dst_size Size of the buffer (at least 6 * data_size + 1 to contain all data).
+ * @param data Data to turn into hex.
+ * @param data_size Size of the data.
+ * @param bytes_per_line After this many printed bytes a newline will be printed.
+ *
+ * @remark The destination buffer will be zero-terminated.
+ */
+void str_hex_cstyle(char *dst, int dst_size, const void *data, int data_size, int bytes_per_line = 12);
+
+/*
+	Function: str_hex_decode
+		Takes a hex string *without spaces between bytes* and returns a
+		byte array.
+
+	Parameters:
+		dst - Buffer for the byte array
+		dst_size - size of the buffer
+		data - String to decode
+
+	Returns:
+		2 - String doesn't exactly fit the buffer
+		1 - Invalid character in string
+		0 - Success
+
+	Remarks:
+		- The contents of the buffer is only valid on success
+*/
+int str_hex_decode(void *dst, int dst_size, const char *src);
+
+/*
+	Function: str_base64
+		Takes a datablock and generates the base64 encoding of it.
+
+	Parameters:
+		dst - Buffer to fill with base64 data
+		dst_size - Size of the buffer
+		data - Data to turn into base64
+		data - Size of the data
+
+	Remarks:
+		- The destination buffer will be zero-terminated
+*/
+void str_base64(char *dst, int dst_size, const void *data, int data_size);
+
+/*
+	Function: str_base64_decode
+		Takes a base64 string without any whitespace and correct
+		padding and returns a byte array.
+
+	Parameters:
+		dst - Buffer for the byte array
+		dst_size - Size of the buffer
+		data - String to decode
+
+	Returns:
+		<0 - Error
+		>= 0 - Success, length of the resulting byte buffer
+
+	Remarks:
+		- The contents of the buffer is only valid on success
+*/
+int str_base64_decode(void *dst, int dst_size, const char *data);
+
+/*
+	Function: str_timestamp
+		Copies a time stamp in the format year-month-day_hour-minute-second to the string.
+
+	Parameters:
+		buffer - Pointer to a buffer that shall receive the time stamp string.
+		buffer_size - Size of the buffer.
+
+	Remarks:
+		- Guarantees that buffer string will contain zero-termination.
+*/
+void str_timestamp(char *buffer, int buffer_size);
+void str_timestamp_format(char *buffer, int buffer_size, const char *format)
+	GNUC_ATTRIBUTE((format(strftime, 3, 0)));
+void str_timestamp_ex(time_t time, char *buffer, int buffer_size, const char *format)
+	GNUC_ATTRIBUTE((format(strftime, 4, 0)));
+
+#define FORMAT_TIME "%H:%M:%S"
+#define FORMAT_SPACE "%Y-%m-%d %H:%M:%S"
+#define FORMAT_NOSPACE "%Y-%m-%d_%H-%M-%S"
+
+enum
+{
+	TIME_DAYS,
+	TIME_HOURS,
+	TIME_MINS,
+	TIME_HOURS_CENTISECS,
+	TIME_MINS_CENTISECS,
+	TIME_SECS_CENTISECS,
+};
+
+/*
+	Function: str_times
+		Formats a time string.
+
+	Parameters:
+		centisecs - Time in centiseconds, minimum value clamped to 0
+		format - Format of the time string, see enum above, for example TIME_DAYS
+		buffer - Pointer to a buffer that shall receive the time stamp string.
+		buffer_size - Size of the buffer.
+
+	Returns:
+		Number of bytes written, -1 on invalid format or buffer_size <= 0
+
+	Remarks:
+		- Guarantees that buffer string will contain zero-termination, assuming
+		  buffer_size > 0.
+*/
+int str_time(int64_t centisecs, int format, char *buffer, int buffer_size);
+int str_time_float(float secs, int format, char *buffer, int buffer_size);
+
+/*
+	Function: str_escape
+		Escapes \ and " characters in a string.
+
+	Parameters:
+		dst - Destination array pointer, gets increased, will point to
+		      the terminating null.
+		src - Source array
+		end - End of destination array
+*/
+void str_escape(char **dst, const char *src, const char *end);
+
+/**
+ * @defgroup Filesystem
+ *
+ * Utilities for accessing the file system.
+ */
+
+/**
+ * Lists the files and folders in a directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param dir Directory to list.
+ * @param cb Callback function to call for each entry.
+ * @param type Type of the directory.
+ * @param user Pointer to give to the callback.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void fs_listdir(const char *dir, FS_LISTDIR_CALLBACK cb, int type, void *user);
+
+/**
+ * Lists the files and folders in a directory and gets additional file information.
+ *
+ * @ingroup Filesystem
+ *
+ * @param dir Directory to list.
+ * @param cb Callback function to call for each entry.
+ * @param type Type of the directory.
+ * @param user Pointer to give to the callback.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void fs_listdir_fileinfo(const char *dir, FS_LISTDIR_CALLBACK_FILEINFO cb, int type, void *user);
+
+/**
+ * Creates a directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path Directory to create.
+ *
+ * @return 0 on success. Negative value on failure.
+ *
+ * @remark Does not create several directories if needed. "a/b/c" will
+ * result in a failure if b or a does not exist.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_makedir(const char *path);
+
+/**
+ * Removes a directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path Directory to remove.
+ *
+ * @return 0 on success. Negative value on failure.
+ *
+ * @remark Cannot remove a non-empty directory.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_removedir(const char *path);
+
+/**
+ * Recursively create directories for a file.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path - File for which to create directories.
+ *
+ * @return 0 on success. Negative value on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_makedir_rec_for(const char *path);
+
+/**
+ * Fetches per user configuration directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param appname Name of the application.
+ * @param path Buffer that will receive the storage path.
+ * @param max Size of the buffer.
+ *
+ * @return 0 on success. Negative value on failure.
+ *
+ * @remark Returns ~/.appname on UNIX based systems.
+ * @remark Returns ~/Library/Applications Support/appname on macOS.
+ * @remark Returns %APPDATA%/Appname on Windows based systems.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_storage_path(const char *appname, char *path, int max);
+
+/**
+ * Checks if a file exists.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path the path to check.
+ *
+ * @return 1 if a file with the given path exists,
+ * 0 on failure or if the file does not exist.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_is_file(const char *path);
+
+/**
+ * Checks if a folder exists.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path the path to check.
+ *
+ * @return 1 if a folder with the given path exists,
+ * 0 on failure or if the folder does not exist.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_is_dir(const char *path);
+
+/**
+ * Checks whether a given path is relative or absolute.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path Path to check.
+ *
+ * @return 1 if relative, 0 if absolute.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_is_relative_path(const char *path);
+
+/**
+ * Changes the current working directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path New working directory path.
+ *
+ * @return 0 on success, 1 on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_chdir(const char *path);
+
+/**
+ * Gets the current working directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param buffer Buffer that will receive the current working directory.
+ * @param buffer_size Size of the buffer.
+ *
+ * @return Pointer to the buffer on success, nullptr on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+char *fs_getcwd(char *buffer, int buffer_size);
+
+/**
+ * Gets the name of a file or folder specified by a path,
+ * i.e. the last segment of the path.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path Path from which to retrieve the filename.
+ *
+ * @return Filename of the path.
+ *
+ * @remark Supports forward and backward slashes as path segment separator.
+ * @remark No distinction between files and folders is being made.
+ * @remark The strings are treated as zero-terminated strings.
+ */
+const char *fs_filename(const char *path);
+
+/**
+ * Splits a filename into name (without extension) and file extension.
+ *
+ * @ingroup Filesystem
+ *
+ * @param filename The filename to split.
+ * @param name Buffer that will receive the name without extension, may be nullptr.
+ * @param name_size Size of the name buffer (ignored if name is nullptr).
+ * @param extension Buffer that will receive the extension, may be nullptr.
+ * @param extension_size Size of the extension buffer (ignored if extension is nullptr).
+ *
+ * @remark Does NOT handle forward and backward slashes.
+ * @remark No distinction between files and folders is being made.
+ * @remark The strings are treated as zero-terminated strings.
+ */
+void fs_split_file_extension(const char *filename, char *name, size_t name_size, char *extension = nullptr, size_t extension_size = 0);
+
+/**
+ * Get the parent directory of a directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param path Path of the directory. The parent will be store in this buffer as well.
+ *
+ * @return 0 on success, 1 on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_parent_dir(char *path);
+
+/**
+ * Deletes a file.
+ *
+ * @ingroup Filesystem
+ *
+ * @param filename Path of the file to delete.
+ *
+ * @return 0 on success, 1 on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Returns an error if the path specifies a directory name.
+ */
+int fs_remove(const char *filename);
+
+/**
+ * Renames the file or directory. If the paths differ the file will be moved.
+ *
+ * @ingroup Filesystem
+ *
+ * @param oldname The current path of a file or directory.
+ * @param newname The new path for the file or directory.
+ *
+ * @return 0 on success, 1 on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ */
+int fs_rename(const char *oldname, const char *newname);
+
+/**
+ * Gets the creation and the last modification date of a file or directory.
+ *
+ * @ingroup Filesystem
+ *
+ * @param name Path of a file or directory.
+ * @param created Pointer where the creation time will be stored.
+ * @param modified Pointer where the modification time will be stored.
+ *
+ * @return 0 on success, non-zero on failure.
+ *
+ * @remark The strings are treated as zero-terminated strings.
+ * @remark Returned time is in seconds since UNIX Epoch.
+ */
+int fs_file_time(const char *name, time_t *created, time_t *modified);
+
+/*
+	Group: Undocumented
+*/
+
+/*
+	Function: net_tcp_connect_non_blocking
+
+	DOCTODO: serp
+*/
+int net_tcp_connect_non_blocking(NETSOCKET sock, NETADDR bindaddr);
+
+/*
+	Function: net_set_non_blocking
+
+	DOCTODO: serp
+*/
+int net_set_non_blocking(NETSOCKET sock);
+
+/*
+	Function: net_set_non_blocking
+
+	DOCTODO: serp
+*/
+int net_set_blocking(NETSOCKET sock);
+
+/*
+	Function: net_errno
+
+	DOCTODO: serp
+*/
+int net_errno();
+
+/*
+	Function: net_would_block
+
+	DOCTODO: serp
+*/
+int net_would_block();
+
+int net_socket_read_wait(NETSOCKET sock, int time);
+
+/*
+	Function: open_link
+		Opens a link in the browser.
+
+	Parameters:
+		link - The link to open in a browser.
+
+	Returns:
+		Returns 1 on success, 0 on failure.
+
+	Remarks:
+		This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+*/
+int open_link(const char *link);
+
+/*
+	Function: open_file
+		Opens a file or directory with default program.
+
+	Parameters:
+		path - The path to open.
+
+	Returns:
+		Returns 1 on success, 0 on failure.
+
+	Remarks:
+		This may not be called with untrusted input or it'll result in arbitrary code execution, especially on Windows.
+*/
+int open_file(const char *path);
+
+/**
+ * Swaps the endianness of data. Each element is swapped individually by reversing its bytes.
+ *
+ * @param data Pointer to data to be swapped.
+ * @param elem_size Size in bytes of each element.
+ * @param num Number of elements.
+ *
+ * @remark The caller must ensure that the data is at least `elem_size * num` bytes in size.
+ */
+void swap_endian(void *data, unsigned elem_size, unsigned num);
+
+typedef struct
+{
+	uint64_t sent_packets;
+	uint64_t sent_bytes;
+	uint64_t recv_packets;
+	uint64_t recv_bytes;
+} NETSTATS;
+
+void net_stats(NETSTATS *stats);
+
+int str_toint(const char *str);
+int str_toint_base(const char *str, int base);
+unsigned long str_toulong_base(const char *str, int base);
+int64_t str_toint64_base(const char *str, int base = 10);
+float str_tofloat(const char *str);
+
+void str_from_int(int value, char *buffer, size_t buffer_size);
+
+template<size_t N>
+void str_from_int(int value, char (&dst)[N])
+{
+	str_from_int(value, dst, N);
+}
+
+/**
+ * Determines whether a character is whitespace.
+ *
+ * @ingroup Strings
+ *
+ * @param c the character to check
+ *
+ * @return 1 if the character is whitespace, 0 otherwise.
+ *
+ * @remark The following characters are considered whitespace: ' ', '\n', '\r', '\t'
+ */
+int str_isspace(char c);
+
+char str_uppercase(char c);
+
+int str_isallnum(const char *str);
+
+int str_isallnum_hex(const char *str);
+
+unsigned str_quickhash(const char *str);
+
+int str_utf8_to_skeleton(const char *str, int *buf, int buf_len);
+
+/*
+	Function: str_utf8_comp_confusable
+		Compares two strings for visual appearance.
+
+	Parameters:
+		str1 - String to compare.
+		str2 - String to compare.
+
+	Returns:
+		0 if the strings are confusable.
+		!=0 otherwise.
+*/
+int str_utf8_comp_confusable(const char *str1, const char *str2);
+
+/*
+	Function: str_utf8_tolower
+		Converts the given Unicode codepoint to lowercase (locale insensitive).
+
+	Parameters:
+		code - Unicode codepoint to convert.
+
+	Returns:
+		Lowercase codepoint
+*/
+int str_utf8_tolower(int code);
+
+/*
+	Function: str_utf8_comp_nocase
+		Compares two utf8 strings case insensitively.
+
+	Parameters:
+		a - String to compare.
+		b - String to compare.
+
+	Returns:
+		<0 - String a is less than string b
+		0 - String a is equal to string b
+		>0 - String a is greater than string b
+*/
+int str_utf8_comp_nocase(const char *a, const char *b);
+
+/*
+	Function: str_utf8_comp_nocase_num
+		Compares up to num bytes of two utf8 strings case insensitively.
+
+	Parameters:
+		a - String to compare.
+		b - String to compare.
+		num - Maximum bytes to compare
+
+	Returns:
+		<0 - String a is less than string b
+		0 - String a is equal to string b
+		>0 - String a is greater than string b
+*/
+int str_utf8_comp_nocase_num(const char *a, const char *b, int num);
+
+/*
+	Function: str_utf8_find_nocase
+		Finds a utf8 string inside another utf8 string case insensitively.
+
+	Parameters:
+		haystack - String to search in
+		needle - String to search for
+        end - A pointer that will be set to a pointer into haystack directly behind the
+            last character where the needle was found. Will be set to nullptr if needle
+            could not be found. Optional parameter.
+
+	Returns:
+		A pointer into haystack where the needle was found.
+		Returns NULL if needle could not be found.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+const char *str_utf8_find_nocase(const char *haystack, const char *needle, const char **end = nullptr);
+
+/*
+	Function: str_utf8_isspace
+		Checks whether the given Unicode codepoint renders as space.
+
+	Parameters:
+		code - Unicode codepoint to check.
+
+	Returns:
+		0 if the codepoint does not render as space, != 0 if it does.
+*/
+int str_utf8_isspace(int code);
+
+int str_utf8_isstart(char c);
+
+/*
+	Function: str_utf8_skip_whitespaces
+		Skips leading characters that render as spaces.
+
+	Parameters:
+		str - Pointer to the string.
+
+	Returns:
+		Pointer to the first non-whitespace character found
+		within the string.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+const char *str_utf8_skip_whitespaces(const char *str);
+
+/*
+	Function: str_utf8_trim_right
+		Removes trailing characters that render as spaces by modifying
+		the string in-place.
+
+	Parameters:
+		param - Pointer to the string.
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+		- The string is modified in-place.
+*/
+void str_utf8_trim_right(char *param);
+
+/*
+	Function: str_utf8_rewind
+		Moves a cursor backwards in an utf8 string
+
+	Parameters:
+		str - utf8 string
+		cursor - position in the string
+
+	Returns:
+		New cursor position.
+
+	Remarks:
+		- Won't move the cursor less then 0
+*/
+int str_utf8_rewind(const char *str, int cursor);
+
+/*
+	Function: str_utf8_fix_truncation
+		Fixes truncation of a Unicode character at the end of a UTF-8
+		string.
+
+	Returns:
+		The new string length.
+
+	Parameters:
+		str - utf8 string
+*/
+int str_utf8_fix_truncation(char *str);
+
+/*
+	Function: str_utf8_forward
+		Moves a cursor forwards in an utf8 string
+
+	Parameters:
+		str - utf8 string
+		cursor - position in the string
+
+	Returns:
+		New cursor position.
+
+	Remarks:
+		- Won't move the cursor beyond the zero termination marker
+*/
+int str_utf8_forward(const char *str, int cursor);
+
+/*
+	Function: str_utf8_decode
+		Decodes a utf8 codepoint
+
+	Parameters:
+		ptr - Pointer to a utf8 string. This pointer will be moved forward.
+
+	Returns:
+		The Unicode codepoint. -1 for invalid input and 0 for end of string.
+
+	Remarks:
+		- This function will also move the pointer forward.
+		- You may call this function again after an error occurred.
+*/
+int str_utf8_decode(const char **ptr);
+
+/*
+	Function: str_utf8_encode
+		Encode an utf8 character
+
+	Parameters:
+		ptr - Pointer to a buffer that should receive the data. Should be able to hold at least 4 bytes.
+
+	Returns:
+		Number of bytes put into the buffer.
+
+	Remarks:
+		- Does not do zero termination of the string.
+*/
+int str_utf8_encode(char *ptr, int chr);
+
+/*
+	Function: str_utf8_check
+		Checks if a strings contains just valid utf8 characters.
+
+	Parameters:
+		str - Pointer to a possible utf8 string.
+
+	Returns:
+		0 - invalid characters found.
+		1 - only valid characters found.
+
+	Remarks:
+		- The string is treated as zero-terminated utf8 string.
+*/
+int str_utf8_check(const char *str);
+
+/*
+	Function: str_utf8_stats
+		Determines the byte size and utf8 character count of a utf8 string.
+
+	Parameters:
+		str - Pointer to the string.
+		max_size - Maximum number of bytes to count.
+		max_count - Maximum number of utf8 characters to count.
+		size - Pointer to store size (number of non-zero bytes) of the string.
+		count - Pointer to store count of utf8 characters of the string.
+
+	Remarks:
+		- The string is treated as zero-terminated utf8 string.
+		- It's the user's responsibility to make sure the bounds are aligned.
+*/
+void str_utf8_stats(const char *str, size_t max_size, size_t max_count, size_t *size, size_t *count);
+
+/**
+ * Converts a byte offset of a utf8 string to the utf8 character offset.
+ *
+ * @param text Pointer to the string.
+ * @param byte_offset Offset in bytes.
+ *
+ * @return Offset in utf8 characters. Clamped to the maximum length of the string in utf8 characters.
+ *
+ * @remark The string is treated as a zero-terminated utf8 string.
+ * @remark It's the user's responsibility to make sure the bounds are aligned.
+ */
+size_t str_utf8_offset_bytes_to_chars(const char *str, size_t byte_offset);
+
+/**
+ * Converts a utf8 character offset of a utf8 string to the byte offset.
+ *
+ * @param text Pointer to the string.
+ * @param char_offset Offset in utf8 characters.
+ *
+ * @return Offset in bytes. Clamped to the maximum length of the string in bytes.
+ *
+ * @remark The string is treated as a zero-terminated utf8 string.
+ * @remark It's the user's responsibility to make sure the bounds are aligned.
+ */
+size_t str_utf8_offset_chars_to_bytes(const char *str, size_t char_offset);
+
+/*
+	Function: str_next_token
+		Writes the next token after str into buf, returns the rest of the string.
+
+	Parameters:
+		str - Pointer to string.
+		delim - Delimiter for tokenization.
+		buffer - Buffer to store token in.
+		buffer_size - Size of the buffer.
+
+	Returns:
+		Pointer to rest of the string.
+
+	Remarks:
+		- The token is always null-terminated.
+*/
+const char *str_next_token(const char *str, const char *delim, char *buffer, int buffer_size);
+
+/*
+	Function: str_in_list
+		Checks if needle is in list delimited by delim
+
+	Parameters:
+		list - List
+		delim - List delimiter.
+		needle - Item that is being looked for.
+
+	Returns:
+		1 - Item is in list.
+		0 - Item isn't in list.
+*/
+int str_in_list(const char *list, const char *delim, const char *needle);
+
+/**
+ * Packs 4 big endian bytes into an unsigned.
+ *
+ * @param bytes Pointer to an array of bytes that will be packed.
+ *
+ * @return The packed unsigned.
+ *
+ * @remark Assumes the passed array is least 4 bytes in size.
+ * @remark Assumes unsigned is 4 bytes in size.
+ *
+ * @see uint_to_bytes_be
+ */
+unsigned bytes_be_to_uint(const unsigned char *bytes);
+
+/**
+ * Packs an unsigned into 4 big endian bytes.
+ *
+ * @param bytes Pointer to an array where the bytes will be stored.
+ * @param value The values that will be packed into the array.
+ *
+ * @remark Assumes the passed array is least 4 bytes in size.
+ * @remark Assumes unsigned is 4 bytes in size.
+ *
+ * @see bytes_be_to_uint
+ */
+void uint_to_bytes_be(unsigned char *bytes, unsigned value);
+
+/*
+	Function: pid
+		Returns the pid of the current process.
+
+	Returns:
+		pid of the current process
+*/
+int pid();
+
+/*
+	Function: cmdline_fix
+		Fixes the command line arguments to be encoded in UTF-8 on all
+		systems.
+
+	Parameters:
+		argc - A pointer to the argc parameter that was passed to the main function.
+		argv - A pointer to the argv parameter that was passed to the main function.
+
+	Remarks:
+		- You need to call cmdline_free once you're no longer using the
+		results.
+*/
+void cmdline_fix(int *argc, const char ***argv);
+
+/*
+	Function: cmdline_free
+		Frees memory that was allocated by cmdline_fix.
+
+	Parameters:
+		argc - The argc obtained from cmdline_fix.
+		argv - The argv obtained from cmdline_fix.
+
+*/
+void cmdline_free(int argc, const char **argv);
+
+#if defined(CONF_FAMILY_WINDOWS)
+typedef void *PROCESS;
+constexpr PROCESS INVALID_PROCESS = nullptr;
+#else
+typedef pid_t PROCESS;
+constexpr PROCESS INVALID_PROCESS = 0;
+#endif
+
+/*
+	Function: shell_execute
+		Executes a given file.
+
+	Returns:
+		handle/pid of the new process
+*/
+PROCESS shell_execute(const char *file);
+
+/*
+	Function: kill_process
+		Sends kill signal to a process.
+
+	Parameters:
+		process - handle/pid of the process
+
+	Returns:
+		0 - Error
+		1 - Success
+*/
+int kill_process(PROCESS process);
+
+/**
+ * Checks if a process is alive.
+ * 
+ * @param process Handle/PID of the process.
+ * 
+ * @return bool Returns true if the process is currently running, false if the process is not running (dead).
+ */
+bool is_process_alive(PROCESS process);
+
+/*
+	Function: generate_password
+		Generates a null-terminated password of length `2 *
+		random_length`.
+
+	Parameters:
+		buffer - Pointer to the start of the output buffer.
+		length - Length of the buffer.
+		random - Pointer to a randomly-initialized array of shorts.
+		random_length - Length of the short array.
+*/
+void generate_password(char *buffer, unsigned length, const unsigned short *random, unsigned random_length);
+
+/*
+	Function: secure_random_init
+		Initializes the secure random module.
+		You *MUST* check the return value of this function.
+
+	Returns:
+		0 - Initialization succeeded.
+		1 - Initialization failed.
+*/
+int secure_random_init();
+
+/*
+	Function: secure_random_uninit
+		Uninitializes the secure random module.
+
+	Returns:
+		0 - Uninitialization succeeded.
+		1 - Uninitialization failed.
+*/
+int secure_random_uninit();
+
+/*
+	Function: secure_random_password
+		Fills the buffer with the specified amount of random password
+		characters.
+
+		The desired password length must be greater or equal to 6, even
+		and smaller or equal to 128.
+
+	Parameters:
+		buffer - Pointer to the start of the buffer.
+		length - Length of the buffer.
+		pw_length - Length of the desired password.
+*/
+void secure_random_password(char *buffer, unsigned length, unsigned pw_length);
+
+/*
+	Function: secure_random_fill
+		Fills the buffer with the specified amount of random bytes.
+
+	Parameters:
+		buffer - Pointer to the start of the buffer.
+		length - Length of the buffer.
+*/
+void secure_random_fill(void *bytes, unsigned length);
+
+/*
+	Function: secure_rand
+		Returns random int (replacement for rand()).
+*/
+int secure_rand();
+
+/*
+	Function: secure_rand_below
+		Returns a random nonnegative integer below the given number,
+		with a uniform distribution.
+
+	Parameters:
+		below - Upper limit (exclusive) of integers to return.
+*/
+int secure_rand_below(int below);
+
+/**
+ * Returns a human-readable version string of the operating system.
+ *
+ * @param version Buffer to use for the output.
+ * @param length Length of the output buffer.
+ *
+ * @return true on success, false on failure.
+ */
+bool os_version_str(char *version, size_t length);
+
+/**
+ * Returns a string of the preferred locale of the user / operating system.
+ * The string conforms to [RFC 3066](https://www.ietf.org/rfc/rfc3066.txt)
+ * and only contains the characters `a`-`z`, `A`-`Z`, `0`-`9` and `-`.
+ * If the preferred locale could not be determined this function
+ * falls back to the locale `"en-US"`.
+ *
+ * @param locale Buffer to use for the output.
+ * @param length Length of the output buffer.
+ *
+ * @remark The destination buffer will be zero-terminated.
+ */
+void os_locale_str(char *locale, size_t length);
+
+#if defined(CONF_EXCEPTION_HANDLING)
+void init_exception_handler();
+void set_exception_handler_log_file(const char *log_file_path);
+#endif
+
+/**
+ * Fetches a sample from a high resolution timer and converts it in nanoseconds.
+ *
+ * @ingroup Time
+ *
+ * @return Current value of the timer in nanoseconds.
+ */
+std::chrono::nanoseconds time_get_nanoseconds();
+
+int net_socket_read_wait(NETSOCKET sock, std::chrono::nanoseconds nanoseconds);
+
+/**
+ * Fixes the command line arguments to be encoded in UTF-8 on all systems.
+ * This is a RAII wrapper for cmdline_fix and cmdline_free.
+ */
+class CCmdlineFix
+{
+	int m_Argc;
+	const char **m_ppArgv;
+
+public:
+	CCmdlineFix(int *pArgc, const char ***pppArgv)
+	{
+		cmdline_fix(pArgc, pppArgv);
+		m_Argc = *pArgc;
+		m_ppArgv = *pppArgv;
+	}
+	~CCmdlineFix()
+	{
+		cmdline_free(m_Argc, m_ppArgv);
+	}
+};
+
+#if defined(CONF_FAMILY_WINDOWS)
+/**
+ * Converts a utf8 encoded string to a wide character string
+ * for use with the Windows API.
+ *
+ * @param str The utf8 encoded string to convert.
+ *
+ * @return The argument as a wide character string.
+ *
+ * @remark The argument string must be zero-terminated.
+ * @remark Fails with assertion error if passed utf8 is invalid.
+ */
+std::wstring windows_utf8_to_wide(const char *str);
+
+/**
+ * Converts a wide character string obtained from the Windows API
+ * to a utf8 encoded string.
+ *
+ * @param wide_str The wide character string to convert.
+ *
+ * @return The argument as a utf8 encoded string, wrapped in an optional.
+ * The optional is empty, if the wide string contains invalid codepoints.
+ *
+ * @remark The argument string must be zero-terminated.
+ */
+std::optional<std::string> windows_wide_to_utf8(const wchar_t *wide_str);
+
+/**
+ * This is a RAII wrapper to initialize/uninitialize the Windows COM library,
+ * which may be necessary for using the open_file and open_link functions.
+ * Must be used on every thread. It's automatically used on threads created
+ * with thread_init. Pass true to the constructor on threads that own a
+ * window (i.e. pump a message queue).
+ */
+class CWindowsComLifecycle
+{
+public:
+	CWindowsComLifecycle(bool HasWindow);
+	~CWindowsComLifecycle();
+};
+
+/**
+ * Registers a protocol handler.
+ *
+ * @ingroup Shell
+ *
+ * @param protocol_name The name of the protocol.
+ * @param executable The absolute path of the executable that will be associated with the protocol.
+ * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ *
+ * @return true on success, false on failure.
+ *
+ * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ */
+bool shell_register_protocol(const char *protocol_name, const char *executable, bool *updated);
+
+/**
+ * Registers a file extension.
+ *
+ * @ingroup Shell
+ *
+ * @param extension The file extension, including the leading dot.
+ * @param description A readable description for the file extension.
+ * @param executable_name A unique name that will used to describe the application.
+ * @param executable The absolute path of the executable that will be associated with the file extension.
+ * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ *
+ * @return true on success, false on failure.
+ *
+ * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ */
+bool shell_register_extension(const char *extension, const char *description, const char *executable_name, const char *executable, bool *updated);
+
+/**
+ * Registers an application.
+ *
+ * @ingroup Shell
+ *
+ * @param name Readable name of the application.
+ * @param executable The absolute path of the executable being registered.
+ * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ *
+ * @return true on success, false on failure.
+ *
+ * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ */
+bool shell_register_application(const char *name, const char *executable, bool *updated);
+
+/**
+ * Unregisters a protocol or file extension handler.
+ *
+ * @ingroup Shell
+ *
+ * @param shell_class The shell class to delete.
+ * For protocols this is the name of the protocol.
+ * For file extensions this is the program ID associated with the file extension.
+ * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ *
+ * @return true on success, false on failure.
+ *
+ * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ */
+bool shell_unregister_class(const char *shell_class, bool *updated);
+
+/**
+ * Unregisters an application.
+ *
+ * @ingroup Shell
+ *
+ * @param executable The absolute path of the executable being unregistered.
+ * @param updated Pointer to a variable that will be set to true, iff the shell needs to be updated.
+ *
+ * @return true on success, false on failure.
+ *
+ * @remark The caller must later call shell_update, iff the shell needs to be updated.
+ */
+bool shell_unregister_application(const char *executable, bool *updated);
+
+/**
+ * Notifies the system that a protocol or file extension has been changed and the shell needs to be updated.
+ *
+ * @ingroup Shell
+ *
+ * @remark This is a potentially expensive operation, so it should only be called when necessary.
+ */
+void shell_update();
+#endif
+
+template<>
+struct std::hash<NETADDR>
+{
+	size_t operator()(const NETADDR &Addr) const noexcept;
+};
+
+#endif
diff --git a/src_bkp/base/tl/threading.h b/src_bkp/base/tl/threading.h
new file mode 100644
index 0000000000..c7225b9ea5
--- /dev/null
+++ b/src_bkp/base/tl/threading.h
@@ -0,0 +1,31 @@
+#ifndef BASE_TL_THREADING_H
+#define BASE_TL_THREADING_H
+
+#include "../system.h"
+#include <atomic>
+
+class CSemaphore
+{
+	SEMAPHORE m_Sem;
+	// implement the counter separately, because the `sem_getvalue`-API is
+	// deprecated on macOS: https://stackoverflow.com/a/16655541
+	std::atomic_int m_Count{0};
+
+public:
+	CSemaphore() { sphore_init(&m_Sem); }
+	~CSemaphore() { sphore_destroy(&m_Sem); }
+	CSemaphore(const CSemaphore &) = delete;
+	int GetApproximateValue() { return m_Count.load(); }
+	void Wait()
+	{
+		sphore_wait(&m_Sem);
+		m_Count.fetch_sub(1);
+	}
+	void Signal()
+	{
+		m_Count.fetch_add(1);
+		sphore_signal(&m_Sem);
+	}
+};
+
+#endif // BASE_TL_THREADING_H
diff --git a/src_bkp/base/types.h b/src_bkp/base/types.h
new file mode 100644
index 0000000000..ffa1b47ed2
--- /dev/null
+++ b/src_bkp/base/types.h
@@ -0,0 +1,65 @@
+#ifndef BASE_TYPES_H
+#define BASE_TYPES_H
+
+#include <ctime>
+
+enum class TRISTATE
+{
+	NONE,
+	SOME,
+	ALL,
+};
+
+typedef void *IOHANDLE;
+
+typedef int (*FS_LISTDIR_CALLBACK)(const char *name, int is_dir, int dir_type, void *user);
+
+typedef struct
+{
+	const char *m_pName;
+	time_t m_TimeCreated; // seconds since UNIX Epoch
+	time_t m_TimeModified; // seconds since UNIX Epoch
+} CFsFileInfo;
+
+typedef int (*FS_LISTDIR_CALLBACK_FILEINFO)(const CFsFileInfo *info, int is_dir, int dir_type, void *user);
+
+/**
+ * @ingroup Network-General
+ */
+typedef struct NETSOCKET_INTERNAL *NETSOCKET;
+
+enum
+{
+	/**
+	 * The maximum bytes necessary to encode one Unicode codepoint with UTF-8.
+	 */
+	UTF8_BYTE_LENGTH = 4,
+
+	IO_MAX_PATH_LENGTH = 512,
+
+	NETADDR_MAXSTRSIZE = 1 + (8 * 4 + 7) + 1 + 1 + 5 + 1, // [XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX]:XXXXX
+
+	NETTYPE_LINK_BROADCAST = 4,
+
+	NETTYPE_INVALID = 0,
+	NETTYPE_IPV4 = 1,
+	NETTYPE_IPV6 = 2,
+	NETTYPE_WEBSOCKET_IPV4 = 8,
+
+	NETTYPE_ALL = NETTYPE_IPV4 | NETTYPE_IPV6 | NETTYPE_WEBSOCKET_IPV4,
+	NETTYPE_MASK = NETTYPE_ALL | NETTYPE_LINK_BROADCAST,
+};
+
+/**
+ * @ingroup Network-General
+ */
+typedef struct NETADDR
+{
+	unsigned int type;
+	unsigned char ip[16];
+	unsigned short port;
+
+	bool operator==(const NETADDR &other) const;
+	bool operator!=(const NETADDR &other) const { return !(*this == other); }
+} NETADDR;
+#endif // BASE_TYPES_H
diff --git a/src_bkp/base/unicode/VERSION.txt b/src_bkp/base/unicode/VERSION.txt
new file mode 100644
index 0000000000..94188a7483
--- /dev/null
+++ b/src_bkp/base/unicode/VERSION.txt
@@ -0,0 +1 @@
+15.0.0
diff --git a/src_bkp/base/unicode/confusables.cpp b/src_bkp/base/unicode/confusables.cpp
new file mode 100644
index 0000000000..d12aaa8134
--- /dev/null
+++ b/src_bkp/base/unicode/confusables.cpp
@@ -0,0 +1,106 @@
+#include "confusables.h"
+
+#include <base/system.h>
+
+#include <cstddef>
+
+static int str_utf8_skeleton(int ch, const int **skeleton, int *skeleton_len)
+{
+	int i;
+	for(i = 0; i < NUM_DECOMPS; i++)
+	{
+		if(ch == decomp_chars[i])
+		{
+			int offset = decomp_slices[i].offset;
+			int length = decomp_lengths[decomp_slices[i].length];
+
+			*skeleton = &decomp_data[offset];
+			*skeleton_len = length;
+			return 1;
+		}
+		else if(ch < decomp_chars[i])
+		{
+			break;
+		}
+	}
+	*skeleton = NULL;
+	*skeleton_len = 1;
+	return 0;
+}
+
+struct SKELETON
+{
+	const int *skeleton;
+	int skeleton_len;
+	const char *str;
+};
+
+static void str_utf8_skeleton_begin(struct SKELETON *skel, const char *str)
+{
+	skel->skeleton = NULL;
+	skel->skeleton_len = 0;
+	skel->str = str;
+}
+
+static int str_utf8_skeleton_next(struct SKELETON *skel)
+{
+	int ch = 0;
+	while(skel->skeleton_len == 0)
+	{
+		ch = str_utf8_decode(&skel->str);
+		if(ch == 0)
+		{
+			return 0;
+		}
+		str_utf8_skeleton(ch, &skel->skeleton, &skel->skeleton_len);
+	}
+	skel->skeleton_len--;
+	if(skel->skeleton != NULL)
+	{
+		ch = *skel->skeleton;
+		skel->skeleton++;
+	}
+	return ch;
+}
+
+int str_utf8_to_skeleton(const char *str, int *buf, int buf_len)
+{
+	int i;
+	struct SKELETON skel;
+	str_utf8_skeleton_begin(&skel, str);
+	for(i = 0; i < buf_len; i++)
+	{
+		int ch = str_utf8_skeleton_next(&skel);
+		if(ch == 0)
+		{
+			break;
+		}
+		buf[i] = ch;
+	}
+	return i;
+}
+
+int str_utf8_comp_confusable(const char *str1, const char *str2)
+{
+	struct SKELETON skel1;
+	struct SKELETON skel2;
+
+	str_utf8_skeleton_begin(&skel1, str1);
+	str_utf8_skeleton_begin(&skel2, str2);
+
+	while(true)
+	{
+		int ch1 = str_utf8_skeleton_next(&skel1);
+		int ch2 = str_utf8_skeleton_next(&skel2);
+
+		if(ch1 == 0 || ch2 == 0)
+			return ch1 != ch2;
+
+		if(ch1 != ch2)
+			return 1;
+	}
+}
+
+#define CONFUSABLES_DATA
+#include "confusables_data.h"
+#undef CONFUSABLES_DATA
diff --git a/src_bkp/base/unicode/confusables.h b/src_bkp/base/unicode/confusables.h
new file mode 100644
index 0000000000..236833f6d2
--- /dev/null
+++ b/src_bkp/base/unicode/confusables.h
@@ -0,0 +1,18 @@
+#include <cstdint>
+
+struct DECOMP_SLICE
+{
+	uint16_t offset : 13;
+	uint16_t length : 3;
+};
+
+enum
+{
+	NUM_DECOMP_LENGTHS = 8,
+	NUM_DECOMPS = 9770,
+};
+
+extern const uint8_t decomp_lengths[NUM_DECOMP_LENGTHS];
+extern const int32_t decomp_chars[NUM_DECOMPS];
+extern const struct DECOMP_SLICE decomp_slices[NUM_DECOMPS];
+extern const int32_t decomp_data[];
diff --git a/src_bkp/base/unicode/confusables_data.h b/src_bkp/base/unicode/confusables_data.h
new file mode 100644
index 0000000000..e7aea5ee0f
--- /dev/null
+++ b/src_bkp/base/unicode/confusables_data.h
@@ -0,0 +1,24183 @@
+#ifndef CONFUSABLES_DATA
+#error "This file should only be included in `confusables.cpp`"
+#endif
+
+const uint8_t decomp_lengths[NUM_DECOMP_LENGTHS] = {
+	0,
+	1,
+	2,
+	3,
+	4,
+	5,
+	7,
+	15,
+};
+
+const int32_t decomp_chars[NUM_DECOMPS] = {
+	0x0,
+	0x1,
+	0x2,
+	0x3,
+	0x4,
+	0x5,
+	0x6,
+	0x7,
+	0x8,
+	0x9,
+	0xa,
+	0xb,
+	0xc,
+	0xd,
+	0xe,
+	0xf,
+	0x10,
+	0x11,
+	0x12,
+	0x13,
+	0x14,
+	0x15,
+	0x16,
+	0x17,
+	0x18,
+	0x19,
+	0x1a,
+	0x1b,
+	0x1c,
+	0x1d,
+	0x1e,
+	0x1f,
+	0x20,
+	0x22,
+	0x25,
+	0x30,
+	0x31,
+	0x49,
+	0x60,
+	0x6c,
+	0x6d,
+	0x7c,
+	0x7f,
+	0x80,
+	0x81,
+	0x82,
+	0x83,
+	0x84,
+	0x85,
+	0x86,
+	0x87,
+	0x88,
+	0x89,
+	0x8a,
+	0x8b,
+	0x8c,
+	0x8d,
+	0x8e,
+	0x8f,
+	0x90,
+	0x91,
+	0x92,
+	0x93,
+	0x94,
+	0x95,
+	0x96,
+	0x97,
+	0x98,
+	0x99,
+	0x9a,
+	0x9b,
+	0x9c,
+	0x9d,
+	0x9e,
+	0x9f,
+	0xa0,
+	0xa1,
+	0xa2,
+	0xa5,
+	0xad,
+	0xaf,
+	0xb4,
+	0xb5,
+	0xb8,
+	0xc0,
+	0xc1,
+	0xc2,
+	0xc3,
+	0xc4,
+	0xc5,
+	0xc6,
+	0xc7,
+	0xc8,
+	0xc9,
+	0xca,
+	0xcb,
+	0xcc,
+	0xcd,
+	0xce,
+	0xcf,
+	0xd0,
+	0xd1,
+	0xd2,
+	0xd3,
+	0xd4,
+	0xd5,
+	0xd6,
+	0xd7,
+	0xd8,
+	0xd9,
+	0xda,
+	0xdb,
+	0xdc,
+	0xdd,
+	0xe0,
+	0xe1,
+	0xe2,
+	0xe3,
+	0xe4,
+	0xe5,
+	0xe6,
+	0xe7,
+	0xe8,
+	0xe9,
+	0xea,
+	0xeb,
+	0xec,
+	0xed,
+	0xee,
+	0xef,
+	0xf0,
+	0xf1,
+	0xf2,
+	0xf3,
+	0xf4,
+	0xf5,
+	0xf6,
+	0xf8,
+	0xf9,
+	0xfa,
+	0xfb,
+	0xfc,
+	0xfd,
+	0xff,
+	0x100,
+	0x101,
+	0x102,
+	0x103,
+	0x104,
+	0x105,
+	0x106,
+	0x107,
+	0x108,
+	0x109,
+	0x10a,
+	0x10b,
+	0x10c,
+	0x10d,
+	0x10e,
+	0x10f,
+	0x110,
+	0x111,
+	0x112,
+	0x113,
+	0x114,
+	0x115,
+	0x116,
+	0x117,
+	0x118,
+	0x119,
+	0x11a,
+	0x11b,
+	0x11c,
+	0x11d,
+	0x11e,
+	0x11f,
+	0x120,
+	0x121,
+	0x122,
+	0x123,
+	0x124,
+	0x125,
+	0x126,
+	0x127,
+	0x128,
+	0x129,
+	0x12a,
+	0x12b,
+	0x12c,
+	0x12d,
+	0x12e,
+	0x12f,
+	0x130,
+	0x131,
+	0x132,
+	0x133,
+	0x134,
+	0x135,
+	0x136,
+	0x137,
+	0x139,
+	0x13a,
+	0x13b,
+	0x13c,
+	0x13d,
+	0x13e,
+	0x13f,
+	0x140,
+	0x141,
+	0x142,
+	0x143,
+	0x144,
+	0x145,
+	0x146,
+	0x147,
+	0x148,
+	0x149,
+	0x14c,
+	0x14d,
+	0x14e,
+	0x14f,
+	0x150,
+	0x151,
+	0x152,
+	0x153,
+	0x154,
+	0x155,
+	0x156,
+	0x157,
+	0x158,
+	0x159,
+	0x15a,
+	0x15b,
+	0x15c,
+	0x15d,
+	0x15e,
+	0x15f,
+	0x160,
+	0x161,
+	0x162,
+	0x163,
+	0x164,
+	0x165,
+	0x166,
+	0x167,
+	0x168,
+	0x169,
+	0x16a,
+	0x16b,
+	0x16c,
+	0x16d,
+	0x16e,
+	0x16f,
+	0x170,
+	0x171,
+	0x172,
+	0x173,
+	0x174,
+	0x175,
+	0x176,
+	0x177,
+	0x178,
+	0x179,
+	0x17a,
+	0x17b,
+	0x17c,
+	0x17d,
+	0x17e,
+	0x17f,
+	0x180,
+	0x181,
+	0x182,
+	0x183,
+	0x184,
+	0x187,
+	0x189,
+	0x18a,
+	0x18c,
+	0x18d,
+	0x191,
+	0x192,
+	0x193,
+	0x196,
+	0x197,
+	0x198,
+	0x199,
+	0x19a,
+	0x19d,
+	0x19e,
+	0x19f,
+	0x1a0,
+	0x1a1,
+	0x1a4,
+	0x1a5,
+	0x1a6,
+	0x1a7,
+	0x1ac,
+	0x1ad,
+	0x1ae,
+	0x1af,
+	0x1b0,
+	0x1b3,
+	0x1b4,
+	0x1b5,
+	0x1b6,
+	0x1b7,
+	0x1bb,
+	0x1bc,
+	0x1bd,
+	0x1bf,
+	0x1c0,
+	0x1c1,
+	0x1c3,
+	0x1c4,
+	0x1c5,
+	0x1c6,
+	0x1c7,
+	0x1c8,
+	0x1c9,
+	0x1ca,
+	0x1cb,
+	0x1cc,
+	0x1cd,
+	0x1ce,
+	0x1cf,
+	0x1d0,
+	0x1d1,
+	0x1d2,
+	0x1d3,
+	0x1d4,
+	0x1d5,
+	0x1d6,
+	0x1d7,
+	0x1d8,
+	0x1d9,
+	0x1da,
+	0x1db,
+	0x1dc,
+	0x1de,
+	0x1df,
+	0x1e0,
+	0x1e1,
+	0x1e2,
+	0x1e3,
+	0x1e4,
+	0x1e5,
+	0x1e6,
+	0x1e7,
+	0x1e8,
+	0x1e9,
+	0x1ea,
+	0x1eb,
+	0x1ec,
+	0x1ed,
+	0x1ee,
+	0x1ef,
+	0x1f0,
+	0x1f1,
+	0x1f2,
+	0x1f3,
+	0x1f4,
+	0x1f5,
+	0x1f8,
+	0x1f9,
+	0x1fa,
+	0x1fb,
+	0x1fc,
+	0x1fd,
+	0x1fe,
+	0x1ff,
+	0x200,
+	0x201,
+	0x202,
+	0x203,
+	0x204,
+	0x205,
+	0x206,
+	0x207,
+	0x208,
+	0x209,
+	0x20a,
+	0x20b,
+	0x20c,
+	0x20d,
+	0x20e,
+	0x20f,
+	0x210,
+	0x211,
+	0x212,
+	0x213,
+	0x214,
+	0x215,
+	0x216,
+	0x217,
+	0x218,
+	0x219,
+	0x21a,
+	0x21b,
+	0x21c,
+	0x21e,
+	0x21f,
+	0x222,
+	0x223,
+	0x224,
+	0x225,
+	0x226,
+	0x227,
+	0x228,
+	0x229,
+	0x22a,
+	0x22b,
+	0x22c,
+	0x22d,
+	0x22e,
+	0x22f,
+	0x230,
+	0x231,
+	0x232,
+	0x233,
+	0x23c,
+	0x23e,
+	0x241,
+	0x244,
+	0x246,
+	0x247,
+	0x248,
+	0x249,
+	0x24d,
+	0x24e,
+	0x24f,
+	0x251,
+	0x253,
+	0x256,
+	0x257,
+	0x259,
+	0x25a,
+	0x25b,
+	0x260,
+	0x261,
+	0x263,
+	0x266,
+	0x268,
+	0x269,
+	0x26a,
+	0x26b,
+	0x26d,
+	0x26e,
+	0x26f,
+	0x271,
+	0x273,
+	0x275,
+	0x276,
+	0x27c,
+	0x27d,
+	0x282,
+	0x28b,
+	0x28f,
+	0x290,
+	0x292,
+	0x294,
+	0x2a0,
+	0x2a3,
+	0x2a4,
+	0x2a5,
+	0x2a6,
+	0x2a7,
+	0x2a8,
+	0x2a9,
+	0x2aa,
+	0x2ab,
+	0x2b3,
+	0x2b9,
+	0x2ba,
+	0x2bb,
+	0x2bc,
+	0x2bd,
+	0x2be,
+	0x2bf,
+	0x2c2,
+	0x2c3,
+	0x2c4,
+	0x2c6,
+	0x2c8,
+	0x2ca,
+	0x2cb,
+	0x2d0,
+	0x2d3,
+	0x2d7,
+	0x2d8,
+	0x2d9,
+	0x2da,
+	0x2db,
+	0x2dc,
+	0x2dd,
+	0x2e1,
+	0x2e2,
+	0x2e4,
+	0x2ee,
+	0x2f4,
+	0x2f6,
+	0x2f8,
+	0x2fb,
+	0x300,
+	0x301,
+	0x302,
+	0x303,
+	0x304,
+	0x305,
+	0x306,
+	0x307,
+	0x308,
+	0x309,
+	0x30a,
+	0x30b,
+	0x30c,
+	0x30d,
+	0x30e,
+	0x30f,
+	0x310,
+	0x311,
+	0x312,
+	0x313,
+	0x314,
+	0x315,
+	0x316,
+	0x317,
+	0x318,
+	0x319,
+	0x31a,
+	0x31b,
+	0x31c,
+	0x31d,
+	0x31e,
+	0x31f,
+	0x320,
+	0x321,
+	0x322,
+	0x323,
+	0x324,
+	0x325,
+	0x326,
+	0x327,
+	0x328,
+	0x329,
+	0x32a,
+	0x32b,
+	0x32c,
+	0x32d,
+	0x32e,
+	0x32f,
+	0x330,
+	0x331,
+	0x332,
+	0x333,
+	0x334,
+	0x335,
+	0x336,
+	0x337,
+	0x338,
+	0x339,
+	0x33a,
+	0x33b,
+	0x33c,
+	0x33d,
+	0x33e,
+	0x33f,
+	0x340,
+	0x341,
+	0x342,
+	0x343,
+	0x344,
+	0x345,
+	0x346,
+	0x347,
+	0x348,
+	0x349,
+	0x34a,
+	0x34b,
+	0x34c,
+	0x34d,
+	0x34e,
+	0x34f,
+	0x350,
+	0x351,
+	0x352,
+	0x353,
+	0x354,
+	0x355,
+	0x356,
+	0x357,
+	0x358,
+	0x359,
+	0x35a,
+	0x35b,
+	0x35c,
+	0x35d,
+	0x35e,
+	0x35f,
+	0x360,
+	0x361,
+	0x362,
+	0x363,
+	0x364,
+	0x365,
+	0x366,
+	0x367,
+	0x368,
+	0x369,
+	0x36a,
+	0x36b,
+	0x36c,
+	0x36d,
+	0x36e,
+	0x36f,
+	0x370,
+	0x374,
+	0x375,
+	0x376,
+	0x377,
+	0x37a,
+	0x37b,
+	0x37d,
+	0x37e,
+	0x37f,
+	0x384,
+	0x385,
+	0x386,
+	0x387,
+	0x388,
+	0x389,
+	0x38a,
+	0x38c,
+	0x38e,
+	0x38f,
+	0x390,
+	0x391,
+	0x392,
+	0x395,
+	0x396,
+	0x397,
+	0x398,
+	0x399,
+	0x39a,
+	0x39b,
+	0x39c,
+	0x39d,
+	0x39f,
+	0x3a1,
+	0x3a3,
+	0x3a4,
+	0x3a5,
+	0x3a7,
+	0x3aa,
+	0x3ab,
+	0x3ac,
+	0x3ad,
+	0x3ae,
+	0x3af,
+	0x3b0,
+	0x3b1,
+	0x3b2,
+	0x3b3,
+	0x3b4,
+	0x3b5,
+	0x3b7,
+	0x3b8,
+	0x3b9,
+	0x3ba,
+	0x3bd,
+	0x3bf,
+	0x3c1,
+	0x3c3,
+	0x3c4,
+	0x3c5,
+	0x3c6,
+	0x3ca,
+	0x3cb,
+	0x3cc,
+	0x3cd,
+	0x3ce,
+	0x3d0,
+	0x3d1,
+	0x3d2,
+	0x3d3,
+	0x3d4,
+	0x3d5,
+	0x3d6,
+	0x3db,
+	0x3dc,
+	0x3e8,
+	0x3e9,
+	0x3f0,
+	0x3f1,
+	0x3f2,
+	0x3f3,
+	0x3f4,
+	0x3f5,
+	0x3f7,
+	0x3f8,
+	0x3f9,
+	0x3fa,
+	0x3fd,
+	0x3ff,
+	0x400,
+	0x401,
+	0x403,
+	0x404,
+	0x405,
+	0x406,
+	0x407,
+	0x408,
+	0x40c,
+	0x40d,
+	0x40e,
+	0x410,
+	0x411,
+	0x412,
+	0x413,
+	0x415,
+	0x417,
+	0x419,
+	0x41a,
+	0x41b,
+	0x41c,
+	0x41d,
+	0x41e,
+	0x41f,
+	0x420,
+	0x421,
+	0x422,
+	0x423,
+	0x424,
+	0x425,
+	0x42b,
+	0x42c,
+	0x42e,
+	0x430,
+	0x431,
+	0x432,
+	0x433,
+	0x435,
+	0x437,
+	0x438,
+	0x439,
+	0x43a,
+	0x43c,
+	0x43d,
+	0x43e,
+	0x43f,
+	0x440,
+	0x441,
+	0x442,
+	0x443,
+	0x444,
+	0x445,
+	0x44a,
+	0x44b,
+	0x44c,
+	0x44f,
+	0x450,
+	0x451,
+	0x453,
+	0x454,
+	0x455,
+	0x456,
+	0x457,
+	0x458,
+	0x45b,
+	0x45c,
+	0x45d,
+	0x45e,
+	0x461,
+	0x462,
+	0x463,
+	0x470,
+	0x471,
+	0x472,
+	0x473,
+	0x474,
+	0x475,
+	0x476,
+	0x477,
+	0x47c,
+	0x47d,
+	0x483,
+	0x484,
+	0x485,
+	0x486,
+	0x487,
+	0x488,
+	0x489,
+	0x48a,
+	0x48b,
+	0x48c,
+	0x48d,
+	0x490,
+	0x491,
+	0x492,
+	0x493,
+	0x496,
+	0x497,
+	0x498,
+	0x499,
+	0x49a,
+	0x49b,
+	0x49e,
+	0x49f,
+	0x4a2,
+	0x4a3,
+	0x4aa,
+	0x4ab,
+	0x4ac,
+	0x4ad,
+	0x4ae,
+	0x4af,
+	0x4b0,
+	0x4b1,
+	0x4b2,
+	0x4bb,
+	0x4bd,
+	0x4be,
+	0x4bf,
+	0x4c0,
+	0x4c1,
+	0x4c2,
+	0x4c5,
+	0x4c6,
+	0x4c7,
+	0x4c8,
+	0x4c9,
+	0x4ca,
+	0x4cb,
+	0x4cc,
+	0x4cd,
+	0x4ce,
+	0x4cf,
+	0x4d0,
+	0x4d1,
+	0x4d2,
+	0x4d3,
+	0x4d4,
+	0x4d5,
+	0x4d6,
+	0x4d7,
+	0x4d8,
+	0x4d9,
+	0x4da,
+	0x4db,
+	0x4dc,
+	0x4dd,
+	0x4de,
+	0x4df,
+	0x4e0,
+	0x4e1,
+	0x4e2,
+	0x4e3,
+	0x4e4,
+	0x4e5,
+	0x4e6,
+	0x4e7,
+	0x4e8,
+	0x4e9,
+	0x4ea,
+	0x4eb,
+	0x4ec,
+	0x4ed,
+	0x4ee,
+	0x4ef,
+	0x4f0,
+	0x4f1,
+	0x4f2,
+	0x4f3,
+	0x4f4,
+	0x4f5,
+	0x4f8,
+	0x4f9,
+	0x501,
+	0x50a,
+	0x50c,
+	0x50d,
+	0x510,
+	0x511,
+	0x51b,
+	0x51c,
+	0x51d,
+	0x53b,
+	0x544,
+	0x54a,
+	0x54c,
+	0x54d,
+	0x54f,
+	0x553,
+	0x555,
+	0x55a,
+	0x55d,
+	0x561,
+	0x563,
+	0x566,
+	0x56e,
+	0x570,
+	0x575,
+	0x578,
+	0x57a,
+	0x57c,
+	0x57d,
+	0x581,
+	0x584,
+	0x585,
+	0x587,
+	0x589,
+	0x591,
+	0x592,
+	0x593,
+	0x594,
+	0x595,
+	0x596,
+	0x597,
+	0x598,
+	0x599,
+	0x59a,
+	0x59b,
+	0x59c,
+	0x59d,
+	0x59e,
+	0x59f,
+	0x5a0,
+	0x5a1,
+	0x5a2,
+	0x5a3,
+	0x5a4,
+	0x5a5,
+	0x5a6,
+	0x5a7,
+	0x5a8,
+	0x5a9,
+	0x5aa,
+	0x5ab,
+	0x5ac,
+	0x5ad,
+	0x5ae,
+	0x5af,
+	0x5b0,
+	0x5b1,
+	0x5b2,
+	0x5b3,
+	0x5b4,
+	0x5b5,
+	0x5b6,
+	0x5b7,
+	0x5b8,
+	0x5b9,
+	0x5ba,
+	0x5bb,
+	0x5bc,
+	0x5bd,
+	0x5bf,
+	0x5c0,
+	0x5c1,
+	0x5c2,
+	0x5c3,
+	0x5c4,
+	0x5c5,
+	0x5c7,
+	0x5d5,
+	0x5d8,
+	0x5d9,
+	0x5df,
+	0x5e1,
+	0x5f0,
+	0x5f1,
+	0x5f2,
+	0x5f3,
+	0x5f4,
+	0x600,
+	0x601,
+	0x602,
+	0x603,
+	0x604,
+	0x605,
+	0x609,
+	0x60a,
+	0x60d,
+	0x60f,
+	0x610,
+	0x611,
+	0x612,
+	0x613,
+	0x614,
+	0x615,
+	0x616,
+	0x617,
+	0x618,
+	0x619,
+	0x61a,
+	0x61c,
+	0x622,
+	0x623,
+	0x624,
+	0x625,
+	0x626,
+	0x627,
+	0x62b,
+	0x634,
+	0x63d,
+	0x63f,
+	0x647,
+	0x64a,
+	0x64b,
+	0x64c,
+	0x64d,
+	0x64e,
+	0x64f,
+	0x650,
+	0x651,
+	0x652,
+	0x653,
+	0x654,
+	0x655,
+	0x656,
+	0x657,
+	0x658,
+	0x659,
+	0x65a,
+	0x65b,
+	0x65c,
+	0x65d,
+	0x65e,
+	0x65f,
+	0x660,
+	0x661,
+	0x665,
+	0x667,
+	0x668,
+	0x66a,
+	0x66b,
+	0x66c,
+	0x66d,
+	0x66e,
+	0x66f,
+	0x670,
+	0x672,
+	0x673,
+	0x675,
+	0x676,
+	0x677,
+	0x678,
+	0x679,
+	0x67e,
+	0x681,
+	0x685,
+	0x688,
+	0x68b,
+	0x68e,
+	0x691,
+	0x692,
+	0x698,
+	0x69e,
+	0x69f,
+	0x6a4,
+	0x6a7,
+	0x6a8,
+	0x6a9,
+	0x6aa,
+	0x6ad,
+	0x6b4,
+	0x6b5,
+	0x6b7,
+	0x6ba,
+	0x6bb,
+	0x6bd,
+	0x6be,
+	0x6c0,
+	0x6c1,
+	0x6c2,
+	0x6c3,
+	0x6c6,
+	0x6c7,
+	0x6c8,
+	0x6c9,
+	0x6cb,
+	0x6cc,
+	0x6ce,
+	0x6d0,
+	0x6d1,
+	0x6d2,
+	0x6d3,
+	0x6d4,
+	0x6d5,
+	0x6d6,
+	0x6d7,
+	0x6d8,
+	0x6d9,
+	0x6da,
+	0x6db,
+	0x6dc,
+	0x6dd,
+	0x6df,
+	0x6e0,
+	0x6e1,
+	0x6e2,
+	0x6e3,
+	0x6e4,
+	0x6e7,
+	0x6e8,
+	0x6ea,
+	0x6eb,
+	0x6ec,
+	0x6ed,
+	0x6ee,
+	0x6ef,
+	0x6f0,
+	0x6f1,
+	0x6f2,
+	0x6f3,
+	0x6f4,
+	0x6f5,
+	0x6f6,
+	0x6f7,
+	0x6f8,
+	0x6f9,
+	0x6fd,
+	0x6fe,
+	0x6ff,
+	0x701,
+	0x702,
+	0x703,
+	0x704,
+	0x70f,
+	0x711,
+	0x730,
+	0x731,
+	0x732,
+	0x733,
+	0x734,
+	0x735,
+	0x736,
+	0x737,
+	0x738,
+	0x739,
+	0x73a,
+	0x73b,
+	0x73c,
+	0x73d,
+	0x73e,
+	0x73f,
+	0x740,
+	0x741,
+	0x742,
+	0x743,
+	0x744,
+	0x745,
+	0x746,
+	0x747,
+	0x748,
+	0x749,
+	0x74a,
+	0x751,
+	0x756,
+	0x762,
+	0x763,
+	0x767,
+	0x768,
+	0x769,
+	0x76c,
+	0x771,
+	0x772,
+	0x77e,
+	0x7a6,
+	0x7a7,
+	0x7a8,
+	0x7a9,
+	0x7aa,
+	0x7ab,
+	0x7ac,
+	0x7ad,
+	0x7ae,
+	0x7af,
+	0x7b0,
+	0x7c0,
+	0x7ca,
+	0x7eb,
+	0x7ec,
+	0x7ed,
+	0x7ee,
+	0x7ef,
+	0x7f0,
+	0x7f1,
+	0x7f2,
+	0x7f3,
+	0x7f4,
+	0x7f5,
+	0x7fa,
+	0x7fd,
+	0x816,
+	0x817,
+	0x818,
+	0x819,
+	0x81b,
+	0x81c,
+	0x81d,
+	0x81e,
+	0x81f,
+	0x820,
+	0x821,
+	0x822,
+	0x823,
+	0x825,
+	0x826,
+	0x827,
+	0x829,
+	0x82a,
+	0x82b,
+	0x82c,
+	0x82d,
+	0x859,
+	0x85a,
+	0x85b,
+	0x890,
+	0x891,
+	0x898,
+	0x899,
+	0x89a,
+	0x89b,
+	0x89c,
+	0x89d,
+	0x89e,
+	0x89f,
+	0x8a1,
+	0x8a4,
+	0x8a7,
+	0x8a8,
+	0x8a9,
+	0x8ae,
+	0x8af,
+	0x8b0,
+	0x8b1,
+	0x8b2,
+	0x8b6,
+	0x8b7,
+	0x8b9,
+	0x8ba,
+	0x8bb,
+	0x8bc,
+	0x8bd,
+	0x8ca,
+	0x8cb,
+	0x8cc,
+	0x8cd,
+	0x8ce,
+	0x8cf,
+	0x8d0,
+	0x8d1,
+	0x8d2,
+	0x8d3,
+	0x8d4,
+	0x8d5,
+	0x8d6,
+	0x8d7,
+	0x8d8,
+	0x8d9,
+	0x8da,
+	0x8db,
+	0x8dc,
+	0x8dd,
+	0x8de,
+	0x8df,
+	0x8e0,
+	0x8e1,
+	0x8e2,
+	0x8e3,
+	0x8e4,
+	0x8e5,
+	0x8e6,
+	0x8e7,
+	0x8e8,
+	0x8e9,
+	0x8ea,
+	0x8eb,
+	0x8ec,
+	0x8ed,
+	0x8ee,
+	0x8ef,
+	0x8f0,
+	0x8f1,
+	0x8f2,
+	0x8f3,
+	0x8f4,
+	0x8f5,
+	0x8f6,
+	0x8f7,
+	0x8f8,
+	0x8f9,
+	0x8fa,
+	0x8fb,
+	0x8fc,
+	0x8fd,
+	0x8fe,
+	0x8ff,
+	0x900,
+	0x901,
+	0x902,
+	0x903,
+	0x904,
+	0x906,
+	0x908,
+	0x90d,
+	0x90e,
+	0x910,
+	0x911,
+	0x912,
+	0x913,
+	0x914,
+	0x929,
+	0x931,
+	0x934,
+	0x93a,
+	0x93b,
+	0x93c,
+	0x93e,
+	0x93f,
+	0x940,
+	0x941,
+	0x942,
+	0x943,
+	0x944,
+	0x945,
+	0x946,
+	0x947,
+	0x948,
+	0x949,
+	0x94a,
+	0x94b,
+	0x94c,
+	0x94d,
+	0x94e,
+	0x94f,
+	0x951,
+	0x952,
+	0x953,
+	0x954,
+	0x955,
+	0x956,
+	0x957,
+	0x958,
+	0x959,
+	0x95a,
+	0x95b,
+	0x95c,
+	0x95d,
+	0x95e,
+	0x95f,
+	0x962,
+	0x963,
+	0x965,
+	0x966,
+	0x967,
+	0x97d,
+	0x981,
+	0x982,
+	0x983,
+	0x986,
+	0x9bc,
+	0x9be,
+	0x9bf,
+	0x9c0,
+	0x9c1,
+	0x9c2,
+	0x9c3,
+	0x9c4,
+	0x9c7,
+	0x9c8,
+	0x9cb,
+	0x9cc,
+	0x9cd,
+	0x9d7,
+	0x9dc,
+	0x9dd,
+	0x9df,
+	0x9e0,
+	0x9e1,
+	0x9e2,
+	0x9e3,
+	0x9e6,
+	0x9ea,
+	0x9ed,
+	0x9fe,
+	0xa01,
+	0xa02,
+	0xa03,
+	0xa06,
+	0xa07,
+	0xa08,
+	0xa09,
+	0xa0a,
+	0xa0f,
+	0xa10,
+	0xa14,
+	0xa33,
+	0xa36,
+	0xa3c,
+	0xa3e,
+	0xa3f,
+	0xa40,
+	0xa41,
+	0xa42,
+	0xa47,
+	0xa48,
+	0xa4b,
+	0xa4c,
+	0xa4d,
+	0xa51,
+	0xa59,
+	0xa5a,
+	0xa5b,
+	0xa5e,
+	0xa66,
+	0xa67,
+	0xa6a,
+	0xa70,
+	0xa71,
+	0xa75,
+	0xa81,
+	0xa82,
+	0xa83,
+	0xa86,
+	0xa8d,
+	0xa8f,
+	0xa90,
+	0xa91,
+	0xa93,
+	0xa94,
+	0xabc,
+	0xabd,
+	0xabe,
+	0xabf,
+	0xac0,
+	0xac1,
+	0xac2,
+	0xac3,
+	0xac4,
+	0xac5,
+	0xac7,
+	0xac8,
+	0xac9,
+	0xacb,
+	0xacc,
+	0xacd,
+	0xae2,
+	0xae3,
+	0xae6,
+	0xae8,
+	0xae9,
+	0xaea,
+	0xaee,
+	0xaf0,
+	0xafa,
+	0xafb,
+	0xafc,
+	0xafd,
+	0xafe,
+	0xaff,
+	0xb01,
+	0xb02,
+	0xb03,
+	0xb06,
+	0xb20,
+	0xb3c,
+	0xb3e,
+	0xb3f,
+	0xb40,
+	0xb41,
+	0xb42,
+	0xb43,
+	0xb44,
+	0xb47,
+	0xb48,
+	0xb4b,
+	0xb4c,
+	0xb4d,
+	0xb55,
+	0xb56,
+	0xb57,
+	0xb5c,
+	0xb5d,
+	0xb62,
+	0xb63,
+	0xb66,
+	0xb68,
+	0xb82,
+	0xb8a,
+	0xb94,
+	0xb9c,
+	0xbb0,
+	0xbbe,
+	0xbbf,
+	0xbc0,
+	0xbc1,
+	0xbc2,
+	0xbc6,
+	0xbc7,
+	0xbc8,
+	0xbca,
+	0xbcb,
+	0xbcc,
+	0xbcd,
+	0xbd7,
+	0xbe6,
+	0xbe7,
+	0xbe8,
+	0xbea,
+	0xbeb,
+	0xbec,
+	0xbed,
+	0xbee,
+	0xbf0,
+	0xbf2,
+	0xbf4,
+	0xbf5,
+	0xbf7,
+	0xbf8,
+	0xbfa,
+	0xc00,
+	0xc01,
+	0xc02,
+	0xc03,
+	0xc04,
+	0xc13,
+	0xc14,
+	0xc20,
+	0xc22,
+	0xc25,
+	0xc2d,
+	0xc2e,
+	0xc37,
+	0xc39,
+	0xc3c,
+	0xc3e,
+	0xc3f,
+	0xc40,
+	0xc41,
+	0xc42,
+	0xc43,
+	0xc44,
+	0xc46,
+	0xc47,
+	0xc48,
+	0xc4a,
+	0xc4b,
+	0xc4c,
+	0xc4d,
+	0xc55,
+	0xc56,
+	0xc60,
+	0xc61,
+	0xc62,
+	0xc63,
+	0xc66,
+	0xc81,
+	0xc82,
+	0xc83,
+	0xc85,
+	0xc86,
+	0xc87,
+	0xc92,
+	0xc93,
+	0xc94,
+	0xc9c,
+	0xc9e,
+	0xca3,
+	0xcaf,
+	0xcb1,
+	0xcb2,
+	0xcbc,
+	0xcbe,
+	0xcbf,
+	0xcc0,
+	0xcc1,
+	0xcc2,
+	0xcc3,
+	0xcc4,
+	0xcc6,
+	0xcc7,
+	0xcc8,
+	0xcca,
+	0xccb,
+	0xccc,
+	0xccd,
+	0xcd5,
+	0xcd6,
+	0xce1,
+	0xce2,
+	0xce3,
+	0xce6,
+	0xce7,
+	0xce8,
+	0xcef,
+	0xcf3,
+	0xd00,
+	0xd01,
+	0xd02,
+	0xd03,
+	0xd08,
+	0xd09,
+	0xd0a,
+	0xd0c,
+	0xd10,
+	0xd13,
+	0xd14,
+	0xd19,
+	0xd1c,
+	0xd20,
+	0xd23,
+	0xd31,
+	0xd34,
+	0xd36,
+	0xd3a,
+	0xd3b,
+	0xd3c,
+	0xd3e,
+	0xd3f,
+	0xd40,
+	0xd41,
+	0xd42,
+	0xd43,
+	0xd44,
+	0xd46,
+	0xd47,
+	0xd48,
+	0xd4a,
+	0xd4b,
+	0xd4c,
+	0xd4d,
+	0xd4e,
+	0xd57,
+	0xd5a,
+	0xd5f,
+	0xd61,
+	0xd62,
+	0xd63,
+	0xd66,
+	0xd6a,
+	0xd6b,
+	0xd6c,
+	0xd6d,
+	0xd6e,
+	0xd6f,
+	0xd76,
+	0xd79,
+	0xd7b,
+	0xd7c,
+	0xd81,
+	0xd82,
+	0xd83,
+	0xdca,
+	0xdcf,
+	0xdd0,
+	0xdd1,
+	0xdd2,
+	0xdd3,
+	0xdd4,
+	0xdd6,
+	0xdd8,
+	0xdd9,
+	0xdda,
+	0xddb,
+	0xddc,
+	0xddd,
+	0xdde,
+	0xddf,
+	0xde9,
+	0xdea,
+	0xdeb,
+	0xdef,
+	0xdf2,
+	0xdf3,
+	0xe03,
+	0xe0b,
+	0xe0f,
+	0xe14,
+	0xe15,
+	0xe17,
+	0xe21,
+	0xe26,
+	0xe31,
+	0xe33,
+	0xe34,
+	0xe35,
+	0xe36,
+	0xe37,
+	0xe38,
+	0xe39,
+	0xe3a,
+	0xe41,
+	0xe45,
+	0xe47,
+	0xe48,
+	0xe49,
+	0xe4a,
+	0xe4b,
+	0xe4c,
+	0xe4d,
+	0xe4e,
+	0xe50,
+	0xe88,
+	0xe8d,
+	0xe9a,
+	0xe9b,
+	0xe9d,
+	0xe9e,
+	0xe9f,
+	0xeb1,
+	0xeb3,
+	0xeb4,
+	0xeb5,
+	0xeb6,
+	0xeb7,
+	0xeb8,
+	0xeb9,
+	0xeba,
+	0xebb,
+	0xebc,
+	0xec8,
+	0xec9,
+	0xeca,
+	0xecb,
+	0xecc,
+	0xecd,
+	0xece,
+	0xed0,
+	0xedc,
+	0xedd,
+	0xf00,
+	0xf02,
+	0xf03,
+	0xf0c,
+	0xf0e,
+	0xf18,
+	0xf19,
+	0xf1b,
+	0xf1e,
+	0xf1f,
+	0xf35,
+	0xf37,
+	0xf39,
+	0xf3e,
+	0xf3f,
+	0xf43,
+	0xf4d,
+	0xf52,
+	0xf57,
+	0xf5c,
+	0xf69,
+	0xf6a,
+	0xf71,
+	0xf72,
+	0xf73,
+	0xf74,
+	0xf75,
+	0xf76,
+	0xf77,
+	0xf78,
+	0xf79,
+	0xf7a,
+	0xf7b,
+	0xf7c,
+	0xf7d,
+	0xf7e,
+	0xf7f,
+	0xf80,
+	0xf81,
+	0xf82,
+	0xf83,
+	0xf84,
+	0xf86,
+	0xf87,
+	0xf8d,
+	0xf8e,
+	0xf8f,
+	0xf90,
+	0xf91,
+	0xf92,
+	0xf93,
+	0xf94,
+	0xf95,
+	0xf96,
+	0xf97,
+	0xf99,
+	0xf9a,
+	0xf9b,
+	0xf9c,
+	0xf9d,
+	0xf9e,
+	0xf9f,
+	0xfa0,
+	0xfa1,
+	0xfa2,
+	0xfa3,
+	0xfa4,
+	0xfa5,
+	0xfa6,
+	0xfa7,
+	0xfa8,
+	0xfa9,
+	0xfaa,
+	0xfab,
+	0xfac,
+	0xfad,
+	0xfae,
+	0xfaf,
+	0xfb0,
+	0xfb1,
+	0xfb2,
+	0xfb3,
+	0xfb4,
+	0xfb5,
+	0xfb6,
+	0xfb7,
+	0xfb8,
+	0xfb9,
+	0xfba,
+	0xfbb,
+	0xfbc,
+	0xfc6,
+	0xfce,
+	0xfd5,
+	0xfd6,
+	0x1000,
+	0x1010,
+	0x101d,
+	0x101f,
+	0x1026,
+	0x1029,
+	0x102a,
+	0x102b,
+	0x102c,
+	0x102d,
+	0x102e,
+	0x102f,
+	0x1030,
+	0x1031,
+	0x1032,
+	0x1033,
+	0x1034,
+	0x1035,
+	0x1036,
+	0x1037,
+	0x1038,
+	0x1039,
+	0x103a,
+	0x103b,
+	0x103c,
+	0x103d,
+	0x103e,
+	0x1040,
+	0x104b,
+	0x1056,
+	0x1057,
+	0x1058,
+	0x1059,
+	0x105e,
+	0x105f,
+	0x1060,
+	0x1062,
+	0x1063,
+	0x1064,
+	0x1065,
+	0x1066,
+	0x1067,
+	0x1068,
+	0x1069,
+	0x106a,
+	0x106b,
+	0x106c,
+	0x106d,
+	0x106f,
+	0x1070,
+	0x1071,
+	0x1072,
+	0x1073,
+	0x1074,
+	0x107e,
+	0x1081,
+	0x1082,
+	0x1083,
+	0x1084,
+	0x1085,
+	0x1086,
+	0x1087,
+	0x1088,
+	0x1089,
+	0x108a,
+	0x108b,
+	0x108c,
+	0x108d,
+	0x108f,
+	0x109a,
+	0x109b,
+	0x109c,
+	0x109d,
+	0x109e,
+	0x10a0,
+	0x10e7,
+	0x10f3,
+	0x10ff,
+	0x1101,
+	0x1104,
+	0x1108,
+	0x110a,
+	0x110d,
+	0x1113,
+	0x1114,
+	0x1115,
+	0x1116,
+	0x1117,
+	0x1118,
+	0x1119,
+	0x111a,
+	0x111b,
+	0x111c,
+	0x111d,
+	0x111e,
+	0x111f,
+	0x1120,
+	0x1121,
+	0x1122,
+	0x1123,
+	0x1124,
+	0x1125,
+	0x1126,
+	0x1127,
+	0x1128,
+	0x1129,
+	0x112a,
+	0x112b,
+	0x112c,
+	0x112d,
+	0x112e,
+	0x112f,
+	0x1130,
+	0x1131,
+	0x1132,
+	0x1133,
+	0x1134,
+	0x1135,
+	0x1136,
+	0x1137,
+	0x1138,
+	0x1139,
+	0x113a,
+	0x113b,
+	0x113d,
+	0x113f,
+	0x1141,
+	0x1142,
+	0x1143,
+	0x1144,
+	0x1145,
+	0x1146,
+	0x1147,
+	0x1148,
+	0x1149,
+	0x114a,
+	0x114b,
+	0x114d,
+	0x114f,
+	0x1151,
+	0x1152,
+	0x1153,
+	0x1156,
+	0x1157,
+	0x1158,
+	0x115a,
+	0x115b,
+	0x115c,
+	0x115d,
+	0x115e,
+	0x1162,
+	0x1164,
+	0x1166,
+	0x1168,
+	0x116a,
+	0x116b,
+	0x116c,
+	0x116f,
+	0x1170,
+	0x1171,
+	0x1173,
+	0x1174,
+	0x1175,
+	0x1176,
+	0x1177,
+	0x1178,
+	0x1179,
+	0x117a,
+	0x117b,
+	0x117c,
+	0x117d,
+	0x117e,
+	0x117f,
+	0x1180,
+	0x1181,
+	0x1182,
+	0x1183,
+	0x1184,
+	0x1185,
+	0x1186,
+	0x1187,
+	0x1188,
+	0x1189,
+	0x118a,
+	0x118b,
+	0x118c,
+	0x118d,
+	0x118e,
+	0x118f,
+	0x1190,
+	0x1191,
+	0x1192,
+	0x1193,
+	0x1194,
+	0x1195,
+	0x1196,
+	0x1197,
+	0x1198,
+	0x1199,
+	0x119a,
+	0x119b,
+	0x119c,
+	0x119d,
+	0x119f,
+	0x11a0,
+	0x11a1,
+	0x11a2,
+	0x11a3,
+	0x11a4,
+	0x11a5,
+	0x11a6,
+	0x11a7,
+	0x11a8,
+	0x11a9,
+	0x11aa,
+	0x11ab,
+	0x11ac,
+	0x11ad,
+	0x11ae,
+	0x11af,
+	0x11b0,
+	0x11b1,
+	0x11b2,
+	0x11b3,
+	0x11b4,
+	0x11b5,
+	0x11b6,
+	0x11b7,
+	0x11b8,
+	0x11b9,
+	0x11ba,
+	0x11bb,
+	0x11bc,
+	0x11bd,
+	0x11be,
+	0x11bf,
+	0x11c0,
+	0x11c1,
+	0x11c2,
+	0x11c3,
+	0x11c4,
+	0x11c5,
+	0x11c6,
+	0x11c7,
+	0x11c8,
+	0x11c9,
+	0x11ca,
+	0x11cb,
+	0x11cc,
+	0x11cd,
+	0x11ce,
+	0x11cf,
+	0x11d0,
+	0x11d1,
+	0x11d2,
+	0x11d3,
+	0x11d4,
+	0x11d5,
+	0x11d6,
+	0x11d7,
+	0x11d8,
+	0x11d9,
+	0x11da,
+	0x11db,
+	0x11dc,
+	0x11dd,
+	0x11de,
+	0x11df,
+	0x11e0,
+	0x11e1,
+	0x11e2,
+	0x11e3,
+	0x11e4,
+	0x11e5,
+	0x11e6,
+	0x11e7,
+	0x11e8,
+	0x11e9,
+	0x11ea,
+	0x11eb,
+	0x11ec,
+	0x11ed,
+	0x11ee,
+	0x11ef,
+	0x11f0,
+	0x11f1,
+	0x11f2,
+	0x11f3,
+	0x11f4,
+	0x11f5,
+	0x11f6,
+	0x11f7,
+	0x11f8,
+	0x11f9,
+	0x11fa,
+	0x11fb,
+	0x11fc,
+	0x11fd,
+	0x11fe,
+	0x11ff,
+	0x1200,
+	0x1223,
+	0x1240,
+	0x1260,
+	0x1294,
+	0x12d0,
+	0x135d,
+	0x135e,
+	0x135f,
+	0x13a0,
+	0x13a1,
+	0x13a2,
+	0x13a4,
+	0x13a5,
+	0x13a8,
+	0x13a9,
+	0x13aa,
+	0x13ab,
+	0x13ac,
+	0x13ae,
+	0x13b0,
+	0x13b1,
+	0x13b3,
+	0x13b7,
+	0x13bb,
+	0x13bd,
+	0x13be,
+	0x13bf,
+	0x13c0,
+	0x13c2,
+	0x13c3,
+	0x13c7,
+	0x13cb,
+	0x13cc,
+	0x13ce,
+	0x13cf,
+	0x13d2,
+	0x13d4,
+	0x13d5,
+	0x13d9,
+	0x13da,
+	0x13de,
+	0x13df,
+	0x13e2,
+	0x13e6,
+	0x13e7,
+	0x13eb,
+	0x13ee,
+	0x13f0,
+	0x13f2,
+	0x13f3,
+	0x13f4,
+	0x13fb,
+	0x13fc,
+	0x1400,
+	0x1403,
+	0x140c,
+	0x140d,
+	0x140e,
+	0x140f,
+	0x1410,
+	0x1411,
+	0x1412,
+	0x1413,
+	0x1414,
+	0x1415,
+	0x1417,
+	0x1418,
+	0x1419,
+	0x141a,
+	0x1427,
+	0x142b,
+	0x142c,
+	0x142d,
+	0x142e,
+	0x142f,
+	0x1431,
+	0x1433,
+	0x1437,
+	0x1438,
+	0x143a,
+	0x143b,
+	0x143c,
+	0x143d,
+	0x143e,
+	0x143f,
+	0x1440,
+	0x1441,
+	0x1442,
+	0x1443,
+	0x1444,
+	0x1445,
+	0x1446,
+	0x1447,
+	0x144a,
+	0x144c,
+	0x144e,
+	0x1454,
+	0x1457,
+	0x1458,
+	0x1459,
+	0x145a,
+	0x145b,
+	0x145c,
+	0x145d,
+	0x145e,
+	0x145f,
+	0x1460,
+	0x1461,
+	0x1462,
+	0x1463,
+	0x1464,
+	0x1467,
+	0x1468,
+	0x1469,
+	0x146a,
+	0x146d,
+	0x146f,
+	0x1472,
+	0x1473,
+	0x1474,
+	0x1475,
+	0x1476,
+	0x1477,
+	0x1478,
+	0x1479,
+	0x147a,
+	0x147b,
+	0x147c,
+	0x147d,
+	0x147e,
+	0x147f,
+	0x1480,
+	0x1481,
+	0x1485,
+	0x1486,
+	0x1487,
+	0x1488,
+	0x148d,
+	0x1492,
+	0x1493,
+	0x1494,
+	0x1495,
+	0x1496,
+	0x1497,
+	0x1498,
+	0x1499,
+	0x149a,
+	0x149b,
+	0x149c,
+	0x149d,
+	0x149e,
+	0x149f,
+	0x14a5,
+	0x14aa,
+	0x14ac,
+	0x14ad,
+	0x14ae,
+	0x14af,
+	0x14b0,
+	0x14b1,
+	0x14b2,
+	0x14b3,
+	0x14b4,
+	0x14b5,
+	0x14b6,
+	0x14b7,
+	0x14b8,
+	0x14b9,
+	0x14bf,
+	0x14c9,
+	0x14ca,
+	0x14cb,
+	0x14cc,
+	0x14cd,
+	0x14ce,
+	0x14d1,
+	0x14dc,
+	0x14dd,
+	0x14de,
+	0x14df,
+	0x14e0,
+	0x14e1,
+	0x14e2,
+	0x14e3,
+	0x14e4,
+	0x14e5,
+	0x14e6,
+	0x14e7,
+	0x14e8,
+	0x14e9,
+	0x14f6,
+	0x14f7,
+	0x14f8,
+	0x14f9,
+	0x14fa,
+	0x14fb,
+	0x14fc,
+	0x14fd,
+	0x14fe,
+	0x14ff,
+	0x1500,
+	0x1501,
+	0x1502,
+	0x1503,
+	0x150c,
+	0x150d,
+	0x150e,
+	0x150f,
+	0x1517,
+	0x1518,
+	0x1519,
+	0x151a,
+	0x151b,
+	0x151c,
+	0x151d,
+	0x151e,
+	0x151f,
+	0x1520,
+	0x1521,
+	0x1522,
+	0x1523,
+	0x1524,
+	0x152f,
+	0x1530,
+	0x1531,
+	0x1532,
+	0x1533,
+	0x1534,
+	0x1535,
+	0x1536,
+	0x1537,
+	0x1538,
+	0x1539,
+	0x153a,
+	0x153b,
+	0x153c,
+	0x1540,
+	0x1541,
+	0x154e,
+	0x154f,
+	0x155b,
+	0x155c,
+	0x1568,
+	0x1569,
+	0x1577,
+	0x157c,
+	0x157d,
+	0x157e,
+	0x157f,
+	0x1580,
+	0x1581,
+	0x1582,
+	0x1583,
+	0x1584,
+	0x1585,
+	0x1587,
+	0x158e,
+	0x158f,
+	0x1590,
+	0x1591,
+	0x1592,
+	0x1593,
+	0x1594,
+	0x15af,
+	0x15b4,
+	0x15b5,
+	0x15b7,
+	0x15c4,
+	0x15c5,
+	0x15de,
+	0x15ea,
+	0x15ef,
+	0x15f0,
+	0x15f7,
+	0x1602,
+	0x1603,
+	0x1604,
+	0x1607,
+	0x1622,
+	0x1623,
+	0x1624,
+	0x162e,
+	0x162f,
+	0x1634,
+	0x1635,
+	0x166d,
+	0x166e,
+	0x166f,
+	0x1670,
+	0x1671,
+	0x1672,
+	0x1673,
+	0x1674,
+	0x1675,
+	0x1676,
+	0x1677,
+	0x1678,
+	0x1679,
+	0x167a,
+	0x167b,
+	0x167c,
+	0x167d,
+	0x1680,
+	0x16b2,
+	0x16b7,
+	0x16c1,
+	0x16c2,
+	0x16cc,
+	0x16d5,
+	0x16d6,
+	0x16d8,
+	0x16e1,
+	0x16eb,
+	0x16ec,
+	0x16ed,
+	0x16f0,
+	0x1712,
+	0x1713,
+	0x1714,
+	0x1715,
+	0x1732,
+	0x1733,
+	0x1734,
+	0x1735,
+	0x1752,
+	0x1753,
+	0x1772,
+	0x1773,
+	0x17a3,
+	0x17b4,
+	0x17b5,
+	0x17b6,
+	0x17b7,
+	0x17b8,
+	0x17b9,
+	0x17ba,
+	0x17bb,
+	0x17bc,
+	0x17bd,
+	0x17be,
+	0x17bf,
+	0x17c0,
+	0x17c1,
+	0x17c2,
+	0x17c3,
+	0x17c4,
+	0x17c5,
+	0x17c6,
+	0x17c7,
+	0x17c8,
+	0x17c9,
+	0x17ca,
+	0x17cb,
+	0x17cc,
+	0x17cd,
+	0x17ce,
+	0x17cf,
+	0x17d0,
+	0x17d1,
+	0x17d2,
+	0x17d3,
+	0x17d4,
+	0x17d5,
+	0x17d9,
+	0x17da,
+	0x17dd,
+	0x1803,
+	0x1809,
+	0x180b,
+	0x180c,
+	0x180d,
+	0x180e,
+	0x180f,
+	0x1855,
+	0x1885,
+	0x1886,
+	0x1896,
+	0x18a9,
+	0x18b3,
+	0x18b6,
+	0x18b9,
+	0x18c2,
+	0x18c6,
+	0x18c7,
+	0x18c8,
+	0x18c9,
+	0x18ca,
+	0x18cb,
+	0x18cc,
+	0x18cd,
+	0x18ce,
+	0x18cf,
+	0x18d0,
+	0x18d1,
+	0x18d2,
+	0x18d3,
+	0x18db,
+	0x18dc,
+	0x18dd,
+	0x18e0,
+	0x18e3,
+	0x18e4,
+	0x18e5,
+	0x18e8,
+	0x18ea,
+	0x18ed,
+	0x18f0,
+	0x18f2,
+	0x1920,
+	0x1921,
+	0x1922,
+	0x1923,
+	0x1924,
+	0x1925,
+	0x1926,
+	0x1927,
+	0x1928,
+	0x1929,
+	0x192a,
+	0x192b,
+	0x1930,
+	0x1931,
+	0x1932,
+	0x1933,
+	0x1934,
+	0x1935,
+	0x1936,
+	0x1937,
+	0x1938,
+	0x1939,
+	0x193a,
+	0x193b,
+	0x19d0,
+	0x19d1,
+	0x1a17,
+	0x1a18,
+	0x1a19,
+	0x1a1a,
+	0x1a1b,
+	0x1a55,
+	0x1a56,
+	0x1a57,
+	0x1a58,
+	0x1a59,
+	0x1a5a,
+	0x1a5b,
+	0x1a5c,
+	0x1a5d,
+	0x1a5e,
+	0x1a60,
+	0x1a61,
+	0x1a62,
+	0x1a63,
+	0x1a64,
+	0x1a65,
+	0x1a66,
+	0x1a67,
+	0x1a68,
+	0x1a69,
+	0x1a6a,
+	0x1a6b,
+	0x1a6c,
+	0x1a6d,
+	0x1a6e,
+	0x1a6f,
+	0x1a70,
+	0x1a71,
+	0x1a72,
+	0x1a73,
+	0x1a74,
+	0x1a75,
+	0x1a76,
+	0x1a77,
+	0x1a78,
+	0x1a79,
+	0x1a7a,
+	0x1a7b,
+	0x1a7c,
+	0x1a7f,
+	0x1a80,
+	0x1a90,
+	0x1aa9,
+	0x1aab,
+	0x1ab0,
+	0x1ab1,
+	0x1ab2,
+	0x1ab3,
+	0x1ab4,
+	0x1ab5,
+	0x1ab6,
+	0x1ab7,
+	0x1ab8,
+	0x1ab9,
+	0x1aba,
+	0x1abb,
+	0x1abc,
+	0x1abd,
+	0x1abe,
+	0x1abf,
+	0x1ac0,
+	0x1ac1,
+	0x1ac2,
+	0x1ac3,
+	0x1ac4,
+	0x1ac5,
+	0x1ac6,
+	0x1ac7,
+	0x1ac8,
+	0x1ac9,
+	0x1aca,
+	0x1acb,
+	0x1acc,
+	0x1acd,
+	0x1ace,
+	0x1b00,
+	0x1b01,
+	0x1b02,
+	0x1b03,
+	0x1b04,
+	0x1b06,
+	0x1b08,
+	0x1b0a,
+	0x1b0c,
+	0x1b0e,
+	0x1b12,
+	0x1b34,
+	0x1b35,
+	0x1b36,
+	0x1b37,
+	0x1b38,
+	0x1b39,
+	0x1b3a,
+	0x1b3b,
+	0x1b3c,
+	0x1b3d,
+	0x1b3e,
+	0x1b3f,
+	0x1b40,
+	0x1b41,
+	0x1b42,
+	0x1b43,
+	0x1b44,
+	0x1b52,
+	0x1b53,
+	0x1b58,
+	0x1b5c,
+	0x1b5f,
+	0x1b6b,
+	0x1b6c,
+	0x1b6d,
+	0x1b6e,
+	0x1b6f,
+	0x1b70,
+	0x1b71,
+	0x1b72,
+	0x1b73,
+	0x1b80,
+	0x1b81,
+	0x1b82,
+	0x1ba1,
+	0x1ba2,
+	0x1ba3,
+	0x1ba4,
+	0x1ba5,
+	0x1ba6,
+	0x1ba7,
+	0x1ba8,
+	0x1ba9,
+	0x1baa,
+	0x1bab,
+	0x1bac,
+	0x1bad,
+	0x1be6,
+	0x1be7,
+	0x1be8,
+	0x1be9,
+	0x1bea,
+	0x1beb,
+	0x1bec,
+	0x1bed,
+	0x1bee,
+	0x1bef,
+	0x1bf0,
+	0x1bf1,
+	0x1bf2,
+	0x1bf3,
+	0x1c24,
+	0x1c25,
+	0x1c26,
+	0x1c27,
+	0x1c28,
+	0x1c29,
+	0x1c2a,
+	0x1c2b,
+	0x1c2c,
+	0x1c2d,
+	0x1c2e,
+	0x1c2f,
+	0x1c30,
+	0x1c31,
+	0x1c32,
+	0x1c33,
+	0x1c34,
+	0x1c35,
+	0x1c36,
+	0x1c37,
+	0x1c3c,
+	0x1c7f,
+	0x1cd0,
+	0x1cd1,
+	0x1cd2,
+	0x1cd3,
+	0x1cd4,
+	0x1cd5,
+	0x1cd6,
+	0x1cd7,
+	0x1cd8,
+	0x1cd9,
+	0x1cda,
+	0x1cdb,
+	0x1cdc,
+	0x1cdd,
+	0x1cde,
+	0x1cdf,
+	0x1ce0,
+	0x1ce1,
+	0x1ce2,
+	0x1ce3,
+	0x1ce4,
+	0x1ce5,
+	0x1ce6,
+	0x1ce7,
+	0x1ce8,
+	0x1ced,
+	0x1cf4,
+	0x1cf7,
+	0x1cf8,
+	0x1cf9,
+	0x1d04,
+	0x1d08,
+	0x1d0b,
+	0x1d0d,
+	0x1d0f,
+	0x1d10,
+	0x1d11,
+	0x1d14,
+	0x1d1c,
+	0x1d20,
+	0x1d21,
+	0x1d22,
+	0x1d24,
+	0x1d26,
+	0x1d27,
+	0x1d28,
+	0x1d29,
+	0x1d2b,
+	0x1d3e,
+	0x1d52,
+	0x1d6b,
+	0x1d6e,
+	0x1d6f,
+	0x1d70,
+	0x1d72,
+	0x1d73,
+	0x1d74,
+	0x1d75,
+	0x1d76,
+	0x1d78,
+	0x1d7b,
+	0x1d7c,
+	0x1d7d,
+	0x1d7e,
+	0x1d7f,
+	0x1d83,
+	0x1d8c,
+	0x1d90,
+	0x1d9f,
+	0x1da2,
+	0x1dba,
+	0x1dbb,
+	0x1dc0,
+	0x1dc1,
+	0x1dc2,
+	0x1dc3,
+	0x1dc4,
+	0x1dc5,
+	0x1dc6,
+	0x1dc7,
+	0x1dc8,
+	0x1dc9,
+	0x1dca,
+	0x1dcb,
+	0x1dcc,
+	0x1dcd,
+	0x1dce,
+	0x1dcf,
+	0x1dd0,
+	0x1dd1,
+	0x1dd2,
+	0x1dd3,
+	0x1dd4,
+	0x1dd5,
+	0x1dd6,
+	0x1dd7,
+	0x1dd8,
+	0x1dd9,
+	0x1dda,
+	0x1ddb,
+	0x1ddc,
+	0x1ddd,
+	0x1dde,
+	0x1ddf,
+	0x1de0,
+	0x1de1,
+	0x1de2,
+	0x1de3,
+	0x1de4,
+	0x1de5,
+	0x1de6,
+	0x1de7,
+	0x1de8,
+	0x1de9,
+	0x1dea,
+	0x1deb,
+	0x1dec,
+	0x1ded,
+	0x1dee,
+	0x1def,
+	0x1df0,
+	0x1df1,
+	0x1df2,
+	0x1df3,
+	0x1df4,
+	0x1df5,
+	0x1df6,
+	0x1df7,
+	0x1df8,
+	0x1df9,
+	0x1dfa,
+	0x1dfb,
+	0x1dfc,
+	0x1dfd,
+	0x1dfe,
+	0x1dff,
+	0x1e00,
+	0x1e01,
+	0x1e02,
+	0x1e03,
+	0x1e04,
+	0x1e05,
+	0x1e06,
+	0x1e07,
+	0x1e08,
+	0x1e09,
+	0x1e0a,
+	0x1e0b,
+	0x1e0c,
+	0x1e0d,
+	0x1e0e,
+	0x1e0f,
+	0x1e10,
+	0x1e11,
+	0x1e12,
+	0x1e13,
+	0x1e14,
+	0x1e15,
+	0x1e16,
+	0x1e17,
+	0x1e18,
+	0x1e19,
+	0x1e1a,
+	0x1e1b,
+	0x1e1c,
+	0x1e1d,
+	0x1e1e,
+	0x1e1f,
+	0x1e20,
+	0x1e21,
+	0x1e22,
+	0x1e23,
+	0x1e24,
+	0x1e25,
+	0x1e26,
+	0x1e27,
+	0x1e28,
+	0x1e29,
+	0x1e2a,
+	0x1e2b,
+	0x1e2c,
+	0x1e2d,
+	0x1e2e,
+	0x1e2f,
+	0x1e30,
+	0x1e31,
+	0x1e32,
+	0x1e33,
+	0x1e34,
+	0x1e35,
+	0x1e36,
+	0x1e37,
+	0x1e38,
+	0x1e39,
+	0x1e3a,
+	0x1e3b,
+	0x1e3c,
+	0x1e3d,
+	0x1e3e,
+	0x1e3f,
+	0x1e40,
+	0x1e41,
+	0x1e42,
+	0x1e43,
+	0x1e44,
+	0x1e45,
+	0x1e46,
+	0x1e47,
+	0x1e48,
+	0x1e49,
+	0x1e4a,
+	0x1e4b,
+	0x1e4c,
+	0x1e4d,
+	0x1e4e,
+	0x1e4f,
+	0x1e50,
+	0x1e51,
+	0x1e52,
+	0x1e53,
+	0x1e54,
+	0x1e55,
+	0x1e56,
+	0x1e57,
+	0x1e58,
+	0x1e59,
+	0x1e5a,
+	0x1e5b,
+	0x1e5c,
+	0x1e5d,
+	0x1e5e,
+	0x1e5f,
+	0x1e60,
+	0x1e61,
+	0x1e62,
+	0x1e63,
+	0x1e64,
+	0x1e65,
+	0x1e66,
+	0x1e67,
+	0x1e68,
+	0x1e69,
+	0x1e6a,
+	0x1e6b,
+	0x1e6c,
+	0x1e6d,
+	0x1e6e,
+	0x1e6f,
+	0x1e70,
+	0x1e71,
+	0x1e72,
+	0x1e73,
+	0x1e74,
+	0x1e75,
+	0x1e76,
+	0x1e77,
+	0x1e78,
+	0x1e79,
+	0x1e7a,
+	0x1e7b,
+	0x1e7c,
+	0x1e7d,
+	0x1e7e,
+	0x1e7f,
+	0x1e80,
+	0x1e81,
+	0x1e82,
+	0x1e83,
+	0x1e84,
+	0x1e85,
+	0x1e86,
+	0x1e87,
+	0x1e88,
+	0x1e89,
+	0x1e8a,
+	0x1e8b,
+	0x1e8c,
+	0x1e8d,
+	0x1e8e,
+	0x1e8f,
+	0x1e90,
+	0x1e91,
+	0x1e92,
+	0x1e93,
+	0x1e94,
+	0x1e95,
+	0x1e96,
+	0x1e97,
+	0x1e98,
+	0x1e99,
+	0x1e9a,
+	0x1e9b,
+	0x1e9d,
+	0x1ea0,
+	0x1ea1,
+	0x1ea2,
+	0x1ea3,
+	0x1ea4,
+	0x1ea5,
+	0x1ea6,
+	0x1ea7,
+	0x1ea8,
+	0x1ea9,
+	0x1eaa,
+	0x1eab,
+	0x1eac,
+	0x1ead,
+	0x1eae,
+	0x1eaf,
+	0x1eb0,
+	0x1eb1,
+	0x1eb2,
+	0x1eb3,
+	0x1eb4,
+	0x1eb5,
+	0x1eb6,
+	0x1eb7,
+	0x1eb8,
+	0x1eb9,
+	0x1eba,
+	0x1ebb,
+	0x1ebc,
+	0x1ebd,
+	0x1ebe,
+	0x1ebf,
+	0x1ec0,
+	0x1ec1,
+	0x1ec2,
+	0x1ec3,
+	0x1ec4,
+	0x1ec5,
+	0x1ec6,
+	0x1ec7,
+	0x1ec8,
+	0x1ec9,
+	0x1eca,
+	0x1ecb,
+	0x1ecc,
+	0x1ecd,
+	0x1ece,
+	0x1ecf,
+	0x1ed0,
+	0x1ed1,
+	0x1ed2,
+	0x1ed3,
+	0x1ed4,
+	0x1ed5,
+	0x1ed6,
+	0x1ed7,
+	0x1ed8,
+	0x1ed9,
+	0x1eda,
+	0x1edb,
+	0x1edc,
+	0x1edd,
+	0x1ede,
+	0x1edf,
+	0x1ee0,
+	0x1ee1,
+	0x1ee2,
+	0x1ee3,
+	0x1ee4,
+	0x1ee5,
+	0x1ee6,
+	0x1ee7,
+	0x1ee8,
+	0x1ee9,
+	0x1eea,
+	0x1eeb,
+	0x1eec,
+	0x1eed,
+	0x1eee,
+	0x1eef,
+	0x1ef0,
+	0x1ef1,
+	0x1ef2,
+	0x1ef3,
+	0x1ef4,
+	0x1ef5,
+	0x1ef6,
+	0x1ef7,
+	0x1ef8,
+	0x1ef9,
+	0x1eff,
+	0x1f00,
+	0x1f01,
+	0x1f02,
+	0x1f03,
+	0x1f04,
+	0x1f05,
+	0x1f06,
+	0x1f07,
+	0x1f08,
+	0x1f09,
+	0x1f0a,
+	0x1f0b,
+	0x1f0c,
+	0x1f0d,
+	0x1f0e,
+	0x1f0f,
+	0x1f10,
+	0x1f11,
+	0x1f12,
+	0x1f13,
+	0x1f14,
+	0x1f15,
+	0x1f18,
+	0x1f19,
+	0x1f1a,
+	0x1f1b,
+	0x1f1c,
+	0x1f1d,
+	0x1f20,
+	0x1f21,
+	0x1f22,
+	0x1f23,
+	0x1f24,
+	0x1f25,
+	0x1f26,
+	0x1f27,
+	0x1f28,
+	0x1f29,
+	0x1f2a,
+	0x1f2b,
+	0x1f2c,
+	0x1f2d,
+	0x1f2e,
+	0x1f2f,
+	0x1f30,
+	0x1f31,
+	0x1f32,
+	0x1f33,
+	0x1f34,
+	0x1f35,
+	0x1f36,
+	0x1f37,
+	0x1f38,
+	0x1f39,
+	0x1f3a,
+	0x1f3b,
+	0x1f3c,
+	0x1f3d,
+	0x1f3e,
+	0x1f3f,
+	0x1f40,
+	0x1f41,
+	0x1f42,
+	0x1f43,
+	0x1f44,
+	0x1f45,
+	0x1f48,
+	0x1f49,
+	0x1f4a,
+	0x1f4b,
+	0x1f4c,
+	0x1f4d,
+	0x1f50,
+	0x1f51,
+	0x1f52,
+	0x1f53,
+	0x1f54,
+	0x1f55,
+	0x1f56,
+	0x1f57,
+	0x1f59,
+	0x1f5b,
+	0x1f5d,
+	0x1f5f,
+	0x1f60,
+	0x1f61,
+	0x1f62,
+	0x1f63,
+	0x1f64,
+	0x1f65,
+	0x1f66,
+	0x1f67,
+	0x1f68,
+	0x1f69,
+	0x1f6a,
+	0x1f6b,
+	0x1f6c,
+	0x1f6d,
+	0x1f6e,
+	0x1f6f,
+	0x1f70,
+	0x1f71,
+	0x1f72,
+	0x1f73,
+	0x1f74,
+	0x1f75,
+	0x1f76,
+	0x1f77,
+	0x1f78,
+	0x1f79,
+	0x1f7a,
+	0x1f7b,
+	0x1f7c,
+	0x1f7d,
+	0x1f80,
+	0x1f81,
+	0x1f82,
+	0x1f83,
+	0x1f84,
+	0x1f85,
+	0x1f86,
+	0x1f87,
+	0x1f88,
+	0x1f89,
+	0x1f8a,
+	0x1f8b,
+	0x1f8c,
+	0x1f8d,
+	0x1f8e,
+	0x1f8f,
+	0x1f90,
+	0x1f91,
+	0x1f92,
+	0x1f93,
+	0x1f94,
+	0x1f95,
+	0x1f96,
+	0x1f97,
+	0x1f98,
+	0x1f99,
+	0x1f9a,
+	0x1f9b,
+	0x1f9c,
+	0x1f9d,
+	0x1f9e,
+	0x1f9f,
+	0x1fa0,
+	0x1fa1,
+	0x1fa2,
+	0x1fa3,
+	0x1fa4,
+	0x1fa5,
+	0x1fa6,
+	0x1fa7,
+	0x1fa8,
+	0x1fa9,
+	0x1faa,
+	0x1fab,
+	0x1fac,
+	0x1fad,
+	0x1fae,
+	0x1faf,
+	0x1fb0,
+	0x1fb1,
+	0x1fb2,
+	0x1fb3,
+	0x1fb4,
+	0x1fb6,
+	0x1fb7,
+	0x1fb8,
+	0x1fb9,
+	0x1fba,
+	0x1fbb,
+	0x1fbc,
+	0x1fbd,
+	0x1fbe,
+	0x1fbf,
+	0x1fc0,
+	0x1fc1,
+	0x1fc2,
+	0x1fc3,
+	0x1fc4,
+	0x1fc6,
+	0x1fc7,
+	0x1fc8,
+	0x1fc9,
+	0x1fca,
+	0x1fcb,
+	0x1fcc,
+	0x1fcd,
+	0x1fce,
+	0x1fcf,
+	0x1fd0,
+	0x1fd1,
+	0x1fd2,
+	0x1fd3,
+	0x1fd6,
+	0x1fd7,
+	0x1fd8,
+	0x1fd9,
+	0x1fda,
+	0x1fdb,
+	0x1fdd,
+	0x1fde,
+	0x1fdf,
+	0x1fe0,
+	0x1fe1,
+	0x1fe2,
+	0x1fe3,
+	0x1fe4,
+	0x1fe5,
+	0x1fe6,
+	0x1fe7,
+	0x1fe8,
+	0x1fe9,
+	0x1fea,
+	0x1feb,
+	0x1fec,
+	0x1fed,
+	0x1fee,
+	0x1fef,
+	0x1ff2,
+	0x1ff3,
+	0x1ff4,
+	0x1ff6,
+	0x1ff7,
+	0x1ff8,
+	0x1ff9,
+	0x1ffa,
+	0x1ffb,
+	0x1ffc,
+	0x1ffd,
+	0x1ffe,
+	0x2000,
+	0x2001,
+	0x2002,
+	0x2003,
+	0x2004,
+	0x2005,
+	0x2006,
+	0x2007,
+	0x2008,
+	0x2009,
+	0x200a,
+	0x200b,
+	0x200c,
+	0x200d,
+	0x200e,
+	0x200f,
+	0x2010,
+	0x2011,
+	0x2012,
+	0x2013,
+	0x2014,
+	0x2015,
+	0x2016,
+	0x2018,
+	0x2019,
+	0x201a,
+	0x201b,
+	0x201c,
+	0x201d,
+	0x201f,
+	0x2022,
+	0x2024,
+	0x2025,
+	0x2026,
+	0x2027,
+	0x2028,
+	0x2029,
+	0x202a,
+	0x202b,
+	0x202c,
+	0x202d,
+	0x202e,
+	0x202f,
+	0x2030,
+	0x2031,
+	0x2032,
+	0x2033,
+	0x2034,
+	0x2035,
+	0x2036,
+	0x2037,
+	0x2039,
+	0x203a,
+	0x203c,
+	0x203e,
+	0x2041,
+	0x2043,
+	0x2044,
+	0x2047,
+	0x2048,
+	0x2049,
+	0x204e,
+	0x2052,
+	0x2053,
+	0x2057,
+	0x205a,
+	0x205d,
+	0x205e,
+	0x205f,
+	0x2060,
+	0x2061,
+	0x2062,
+	0x2063,
+	0x2064,
+	0x2066,
+	0x2067,
+	0x2068,
+	0x2069,
+	0x206a,
+	0x206b,
+	0x206c,
+	0x206d,
+	0x206e,
+	0x206f,
+	0x2070,
+	0x2079,
+	0x20a1,
+	0x20a4,
+	0x20a5,
+	0x20a8,
+	0x20a9,
+	0x20ab,
+	0x20ac,
+	0x20ad,
+	0x20ae,
+	0x20b6,
+	0x20bd,
+	0x20d0,
+	0x20d1,
+	0x20d2,
+	0x20d3,
+	0x20d4,
+	0x20d5,
+	0x20d6,
+	0x20d7,
+	0x20d8,
+	0x20d9,
+	0x20da,
+	0x20db,
+	0x20dc,
+	0x20dd,
+	0x20de,
+	0x20df,
+	0x20e0,
+	0x20e1,
+	0x20e2,
+	0x20e3,
+	0x20e4,
+	0x20e5,
+	0x20e6,
+	0x20e7,
+	0x20e8,
+	0x20e9,
+	0x20ea,
+	0x20eb,
+	0x20ec,
+	0x20ed,
+	0x20ee,
+	0x20ef,
+	0x20f0,
+	0x2100,
+	0x2101,
+	0x2102,
+	0x2103,
+	0x2105,
+	0x2106,
+	0x2107,
+	0x2108,
+	0x2109,
+	0x210a,
+	0x210b,
+	0x210c,
+	0x210d,
+	0x210e,
+	0x210f,
+	0x2110,
+	0x2111,
+	0x2112,
+	0x2113,
+	0x2115,
+	0x2116,
+	0x2119,
+	0x211a,
+	0x211b,
+	0x211c,
+	0x211d,
+	0x2121,
+	0x2124,
+	0x2126,
+	0x2127,
+	0x2128,
+	0x2129,
+	0x212a,
+	0x212b,
+	0x212c,
+	0x212d,
+	0x212e,
+	0x212f,
+	0x2130,
+	0x2131,
+	0x2133,
+	0x2134,
+	0x2135,
+	0x2136,
+	0x2137,
+	0x2138,
+	0x2139,
+	0x213b,
+	0x213c,
+	0x213d,
+	0x213e,
+	0x213f,
+	0x2140,
+	0x2141,
+	0x2142,
+	0x2143,
+	0x2145,
+	0x2146,
+	0x2147,
+	0x2148,
+	0x2149,
+	0x2160,
+	0x2161,
+	0x2162,
+	0x2163,
+	0x2164,
+	0x2165,
+	0x2166,
+	0x2167,
+	0x2168,
+	0x2169,
+	0x216a,
+	0x216b,
+	0x216c,
+	0x216d,
+	0x216e,
+	0x216f,
+	0x2170,
+	0x2171,
+	0x2172,
+	0x2173,
+	0x2174,
+	0x2175,
+	0x2176,
+	0x2177,
+	0x2178,
+	0x2179,
+	0x217a,
+	0x217b,
+	0x217c,
+	0x217d,
+	0x217e,
+	0x217f,
+	0x2183,
+	0x2184,
+	0x2191,
+	0x2195,
+	0x219a,
+	0x219b,
+	0x21ae,
+	0x21b5,
+	0x21ba,
+	0x21be,
+	0x21bf,
+	0x21cd,
+	0x21ce,
+	0x21cf,
+	0x2200,
+	0x2203,
+	0x2204,
+	0x2206,
+	0x2209,
+	0x220c,
+	0x220f,
+	0x2211,
+	0x2212,
+	0x2214,
+	0x2215,
+	0x2216,
+	0x2217,
+	0x2218,
+	0x2219,
+	0x221e,
+	0x2223,
+	0x2224,
+	0x2225,
+	0x2226,
+	0x2228,
+	0x2229,
+	0x222a,
+	0x222b,
+	0x222c,
+	0x222d,
+	0x222f,
+	0x2230,
+	0x2236,
+	0x2238,
+	0x223c,
+	0x2241,
+	0x2244,
+	0x2247,
+	0x2249,
+	0x2250,
+	0x2251,
+	0x2257,
+	0x2259,
+	0x225a,
+	0x225e,
+	0x2260,
+	0x2262,
+	0x2263,
+	0x226a,
+	0x226b,
+	0x226d,
+	0x226e,
+	0x226f,
+	0x2270,
+	0x2271,
+	0x2274,
+	0x2275,
+	0x2278,
+	0x2279,
+	0x2280,
+	0x2281,
+	0x2282,
+	0x2283,
+	0x2284,
+	0x2285,
+	0x2288,
+	0x2289,
+	0x2295,
+	0x2296,
+	0x2299,
+	0x229d,
+	0x22a4,
+	0x22a5,
+	0x22ac,
+	0x22ad,
+	0x22ae,
+	0x22af,
+	0x22c0,
+	0x22c1,
+	0x22c2,
+	0x22c3,
+	0x22c4,
+	0x22c5,
+	0x22c8,
+	0x22d6,
+	0x22d7,
+	0x22d8,
+	0x22d9,
+	0x22e0,
+	0x22e1,
+	0x22e2,
+	0x22e3,
+	0x22ea,
+	0x22eb,
+	0x22ec,
+	0x22ed,
+	0x22ee,
+	0x22ef,
+	0x22f4,
+	0x22ff,
+	0x2300,
+	0x2325,
+	0x2329,
+	0x232a,
+	0x2341,
+	0x2359,
+	0x235a,
+	0x235c,
+	0x235f,
+	0x2361,
+	0x2362,
+	0x2363,
+	0x2364,
+	0x2365,
+	0x2368,
+	0x2369,
+	0x236b,
+	0x236c,
+	0x2373,
+	0x2374,
+	0x2375,
+	0x2376,
+	0x2377,
+	0x2378,
+	0x2379,
+	0x237a,
+	0x237f,
+	0x239c,
+	0x239f,
+	0x23a2,
+	0x23a5,
+	0x23aa,
+	0x23ae,
+	0x23c1,
+	0x23c2,
+	0x23c3,
+	0x23c6,
+	0x23e8,
+	0x23fc,
+	0x23fd,
+	0x23fe,
+	0x244a,
+	0x2460,
+	0x2461,
+	0x2462,
+	0x2463,
+	0x2464,
+	0x2465,
+	0x2466,
+	0x2467,
+	0x2468,
+	0x2469,
+	0x2474,
+	0x2475,
+	0x2476,
+	0x2477,
+	0x2478,
+	0x2479,
+	0x247a,
+	0x247b,
+	0x247c,
+	0x247d,
+	0x247e,
+	0x247f,
+	0x2480,
+	0x2481,
+	0x2482,
+	0x2483,
+	0x2484,
+	0x2485,
+	0x2486,
+	0x2487,
+	0x2488,
+	0x2489,
+	0x248a,
+	0x248b,
+	0x248c,
+	0x248d,
+	0x248e,
+	0x248f,
+	0x2490,
+	0x2491,
+	0x2492,
+	0x2493,
+	0x2494,
+	0x2495,
+	0x2496,
+	0x2497,
+	0x2498,
+	0x2499,
+	0x249a,
+	0x249b,
+	0x249c,
+	0x249d,
+	0x249e,
+	0x249f,
+	0x24a0,
+	0x24a1,
+	0x24a2,
+	0x24a3,
+	0x24a4,
+	0x24a5,
+	0x24a6,
+	0x24a7,
+	0x24a8,
+	0x24a9,
+	0x24aa,
+	0x24ab,
+	0x24ac,
+	0x24ad,
+	0x24ae,
+	0x24af,
+	0x24b0,
+	0x24b1,
+	0x24b2,
+	0x24b3,
+	0x24b4,
+	0x24b5,
+	0x24b8,
+	0x24c5,
+	0x24c7,
+	0x24db,
+	0x24ea,
+	0x2500,
+	0x2501,
+	0x2503,
+	0x250f,
+	0x2523,
+	0x2571,
+	0x2573,
+	0x2588,
+	0x2590,
+	0x2594,
+	0x2597,
+	0x259d,
+	0x25a0,
+	0x25b1,
+	0x25b3,
+	0x25b7,
+	0x25b8,
+	0x25ba,
+	0x25bd,
+	0x25c1,
+	0x25c7,
+	0x25ca,
+	0x25cb,
+	0x25ce,
+	0x25e0,
+	0x25e6,
+	0x2609,
+	0x2610,
+	0x2625,
+	0x2630,
+	0x2638,
+	0x264e,
+	0x2662,
+	0x2669,
+	0x266a,
+	0x26ac,
+	0x2768,
+	0x2769,
+	0x276e,
+	0x276f,
+	0x2772,
+	0x2773,
+	0x2774,
+	0x2775,
+	0x2795,
+	0x2796,
+	0x2797,
+	0x27c2,
+	0x27c8,
+	0x27c9,
+	0x27cb,
+	0x27cd,
+	0x27d9,
+	0x27e8,
+	0x27e9,
+	0x2800,
+	0x292b,
+	0x292c,
+	0x2963,
+	0x2965,
+	0x296e,
+	0x296f,
+	0x2999,
+	0x29b0,
+	0x29be,
+	0x29c4,
+	0x29c5,
+	0x29c7,
+	0x29d6,
+	0x29d9,
+	0x29f4,
+	0x29f5,
+	0x29f6,
+	0x29f8,
+	0x29f9,
+	0x2a00,
+	0x2a01,
+	0x2a02,
+	0x2a03,
+	0x2a04,
+	0x2a05,
+	0x2a06,
+	0x2a0c,
+	0x2a1d,
+	0x2a20,
+	0x2a21,
+	0x2a22,
+	0x2a23,
+	0x2a24,
+	0x2a25,
+	0x2a26,
+	0x2a27,
+	0x2a29,
+	0x2a2a,
+	0x2a2f,
+	0x2a30,
+	0x2a3d,
+	0x2a3e,
+	0x2a3f,
+	0x2a6a,
+	0x2a6e,
+	0x2a74,
+	0x2a75,
+	0x2a76,
+	0x2aa5,
+	0x2aaa,
+	0x2aab,
+	0x2ad7,
+	0x2adc,
+	0x2afb,
+	0x2afd,
+	0x2bec,
+	0x2bed,
+	0x2bee,
+	0x2bef,
+	0x2c67,
+	0x2c69,
+	0x2c84,
+	0x2c85,
+	0x2c86,
+	0x2c88,
+	0x2c89,
+	0x2c8e,
+	0x2c92,
+	0x2c94,
+	0x2c95,
+	0x2c96,
+	0x2c98,
+	0x2c9a,
+	0x2c9e,
+	0x2c9f,
+	0x2ca0,
+	0x2ca2,
+	0x2ca3,
+	0x2ca4,
+	0x2ca5,
+	0x2ca6,
+	0x2ca8,
+	0x2caa,
+	0x2cab,
+	0x2cac,
+	0x2cad,
+	0x2cae,
+	0x2cb1,
+	0x2cb4,
+	0x2cba,
+	0x2cbc,
+	0x2cbd,
+	0x2cc6,
+	0x2cca,
+	0x2ccc,
+	0x2ccd,
+	0x2cd0,
+	0x2cd1,
+	0x2cd2,
+	0x2cdc,
+	0x2ce4,
+	0x2ce9,
+	0x2cef,
+	0x2cf0,
+	0x2cf1,
+	0x2cf9,
+	0x2d31,
+	0x2d37,
+	0x2d38,
+	0x2d39,
+	0x2d3a,
+	0x2d41,
+	0x2d48,
+	0x2d49,
+	0x2d4f,
+	0x2d51,
+	0x2d54,
+	0x2d55,
+	0x2d59,
+	0x2d5d,
+	0x2d60,
+	0x2d63,
+	0x2d7f,
+	0x2de0,
+	0x2de1,
+	0x2de2,
+	0x2de3,
+	0x2de4,
+	0x2de5,
+	0x2de6,
+	0x2de7,
+	0x2de8,
+	0x2de9,
+	0x2dea,
+	0x2deb,
+	0x2dec,
+	0x2ded,
+	0x2dee,
+	0x2def,
+	0x2df0,
+	0x2df1,
+	0x2df2,
+	0x2df3,
+	0x2df4,
+	0x2df5,
+	0x2df6,
+	0x2df7,
+	0x2df8,
+	0x2df9,
+	0x2dfa,
+	0x2dfb,
+	0x2dfc,
+	0x2dfd,
+	0x2dfe,
+	0x2dff,
+	0x2e1a,
+	0x2e1e,
+	0x2e1f,
+	0x2e26,
+	0x2e27,
+	0x2e28,
+	0x2e29,
+	0x2e2a,
+	0x2e2b,
+	0x2e2c,
+	0x2e2e,
+	0x2e30,
+	0x2e31,
+	0x2e32,
+	0x2e35,
+	0x2e39,
+	0x2e3d,
+	0x2e3f,
+	0x2e40,
+	0x2e82,
+	0x2e83,
+	0x2e85,
+	0x2e89,
+	0x2e8b,
+	0x2e8e,
+	0x2e8f,
+	0x2e90,
+	0x2e92,
+	0x2e93,
+	0x2e94,
+	0x2e96,
+	0x2e97,
+	0x2e98,
+	0x2e99,
+	0x2e9b,
+	0x2e9e,
+	0x2e9f,
+	0x2ea0,
+	0x2ea1,
+	0x2ea2,
+	0x2ea3,
+	0x2ea4,
+	0x2ea6,
+	0x2ea8,
+	0x2eab,
+	0x2ead,
+	0x2eaf,
+	0x2eb1,
+	0x2eb2,
+	0x2eb9,
+	0x2eba,
+	0x2ebe,
+	0x2ebf,
+	0x2ec0,
+	0x2ec1,
+	0x2ec2,
+	0x2ec3,
+	0x2ec4,
+	0x2ec5,
+	0x2ec8,
+	0x2ec9,
+	0x2ecb,
+	0x2ecc,
+	0x2ecd,
+	0x2ecf,
+	0x2ed0,
+	0x2ed1,
+	0x2ed2,
+	0x2ed3,
+	0x2ed4,
+	0x2ed6,
+	0x2ed8,
+	0x2ed9,
+	0x2eda,
+	0x2edb,
+	0x2edc,
+	0x2edd,
+	0x2edf,
+	0x2ee0,
+	0x2ee2,
+	0x2ee4,
+	0x2ee5,
+	0x2ee8,
+	0x2ee9,
+	0x2eeb,
+	0x2eec,
+	0x2eed,
+	0x2eee,
+	0x2eef,
+	0x2ef0,
+	0x2ef2,
+	0x2ef3,
+	0x2f00,
+	0x2f01,
+	0x2f02,
+	0x2f03,
+	0x2f04,
+	0x2f05,
+	0x2f06,
+	0x2f07,
+	0x2f08,
+	0x2f09,
+	0x2f0a,
+	0x2f0b,
+	0x2f0c,
+	0x2f0d,
+	0x2f0e,
+	0x2f0f,
+	0x2f10,
+	0x2f11,
+	0x2f12,
+	0x2f13,
+	0x2f14,
+	0x2f15,
+	0x2f16,
+	0x2f17,
+	0x2f18,
+	0x2f19,
+	0x2f1a,
+	0x2f1b,
+	0x2f1c,
+	0x2f1d,
+	0x2f1e,
+	0x2f1f,
+	0x2f20,
+	0x2f21,
+	0x2f22,
+	0x2f23,
+	0x2f24,
+	0x2f25,
+	0x2f26,
+	0x2f27,
+	0x2f28,
+	0x2f29,
+	0x2f2a,
+	0x2f2b,
+	0x2f2c,
+	0x2f2d,
+	0x2f2e,
+	0x2f2f,
+	0x2f30,
+	0x2f31,
+	0x2f32,
+	0x2f33,
+	0x2f34,
+	0x2f35,
+	0x2f36,
+	0x2f37,
+	0x2f38,
+	0x2f39,
+	0x2f3a,
+	0x2f3b,
+	0x2f3c,
+	0x2f3d,
+	0x2f3e,
+	0x2f3f,
+	0x2f40,
+	0x2f41,
+	0x2f42,
+	0x2f43,
+	0x2f44,
+	0x2f45,
+	0x2f46,
+	0x2f47,
+	0x2f48,
+	0x2f49,
+	0x2f4a,
+	0x2f4b,
+	0x2f4c,
+	0x2f4d,
+	0x2f4e,
+	0x2f4f,
+	0x2f50,
+	0x2f51,
+	0x2f52,
+	0x2f53,
+	0x2f54,
+	0x2f55,
+	0x2f56,
+	0x2f57,
+	0x2f58,
+	0x2f59,
+	0x2f5a,
+	0x2f5b,
+	0x2f5c,
+	0x2f5d,
+	0x2f5e,
+	0x2f5f,
+	0x2f60,
+	0x2f61,
+	0x2f62,
+	0x2f63,
+	0x2f64,
+	0x2f65,
+	0x2f66,
+	0x2f67,
+	0x2f68,
+	0x2f69,
+	0x2f6a,
+	0x2f6b,
+	0x2f6c,
+	0x2f6d,
+	0x2f6e,
+	0x2f6f,
+	0x2f70,
+	0x2f71,
+	0x2f72,
+	0x2f73,
+	0x2f74,
+	0x2f75,
+	0x2f76,
+	0x2f77,
+	0x2f78,
+	0x2f79,
+	0x2f7a,
+	0x2f7b,
+	0x2f7c,
+	0x2f7d,
+	0x2f7e,
+	0x2f7f,
+	0x2f80,
+	0x2f81,
+	0x2f82,
+	0x2f83,
+	0x2f84,
+	0x2f85,
+	0x2f86,
+	0x2f87,
+	0x2f88,
+	0x2f89,
+	0x2f8a,
+	0x2f8b,
+	0x2f8c,
+	0x2f8d,
+	0x2f8e,
+	0x2f8f,
+	0x2f90,
+	0x2f91,
+	0x2f92,
+	0x2f93,
+	0x2f94,
+	0x2f95,
+	0x2f96,
+	0x2f97,
+	0x2f98,
+	0x2f99,
+	0x2f9a,
+	0x2f9b,
+	0x2f9c,
+	0x2f9d,
+	0x2f9e,
+	0x2f9f,
+	0x2fa0,
+	0x2fa1,
+	0x2fa2,
+	0x2fa3,
+	0x2fa4,
+	0x2fa5,
+	0x2fa6,
+	0x2fa7,
+	0x2fa8,
+	0x2fa9,
+	0x2faa,
+	0x2fab,
+	0x2fac,
+	0x2fad,
+	0x2fae,
+	0x2faf,
+	0x2fb0,
+	0x2fb1,
+	0x2fb2,
+	0x2fb3,
+	0x2fb4,
+	0x2fb5,
+	0x2fb6,
+	0x2fb7,
+	0x2fb8,
+	0x2fb9,
+	0x2fba,
+	0x2fbb,
+	0x2fbc,
+	0x2fbd,
+	0x2fbe,
+	0x2fbf,
+	0x2fc0,
+	0x2fc1,
+	0x2fc2,
+	0x2fc3,
+	0x2fc4,
+	0x2fc5,
+	0x2fc6,
+	0x2fc7,
+	0x2fc8,
+	0x2fc9,
+	0x2fca,
+	0x2fcb,
+	0x2fcc,
+	0x2fcd,
+	0x2fce,
+	0x2fcf,
+	0x2fd0,
+	0x2fd1,
+	0x2fd2,
+	0x2fd3,
+	0x2fd4,
+	0x2fd5,
+	0x3000,
+	0x3002,
+	0x3003,
+	0x3007,
+	0x3008,
+	0x3009,
+	0x3012,
+	0x3014,
+	0x3015,
+	0x301a,
+	0x301b,
+	0x302a,
+	0x302b,
+	0x302c,
+	0x302d,
+	0x302e,
+	0x302f,
+	0x3033,
+	0x3036,
+	0x3038,
+	0x3039,
+	0x303a,
+	0x304c,
+	0x304e,
+	0x304f,
+	0x3050,
+	0x3052,
+	0x3054,
+	0x3056,
+	0x3058,
+	0x305a,
+	0x305c,
+	0x305e,
+	0x3060,
+	0x3062,
+	0x3065,
+	0x3067,
+	0x3069,
+	0x3070,
+	0x3071,
+	0x3073,
+	0x3074,
+	0x3076,
+	0x3077,
+	0x3079,
+	0x307a,
+	0x307c,
+	0x307d,
+	0x3094,
+	0x3099,
+	0x309a,
+	0x309b,
+	0x309c,
+	0x309e,
+	0x30a0,
+	0x30a4,
+	0x30a8,
+	0x30ab,
+	0x30ac,
+	0x30ae,
+	0x30b0,
+	0x30b2,
+	0x30b4,
+	0x30b6,
+	0x30b8,
+	0x30ba,
+	0x30bc,
+	0x30be,
+	0x30bf,
+	0x30c0,
+	0x30c2,
+	0x30c5,
+	0x30c7,
+	0x30c8,
+	0x30c9,
+	0x30cb,
+	0x30ce,
+	0x30cf,
+	0x30d0,
+	0x30d1,
+	0x30d3,
+	0x30d4,
+	0x30d6,
+	0x30d7,
+	0x30d8,
+	0x30d9,
+	0x30da,
+	0x30dc,
+	0x30dd,
+	0x30ed,
+	0x30f4,
+	0x30f7,
+	0x30f8,
+	0x30f9,
+	0x30fa,
+	0x30fb,
+	0x30fe,
+	0x3131,
+	0x3132,
+	0x3133,
+	0x3134,
+	0x3135,
+	0x3136,
+	0x3137,
+	0x3138,
+	0x3139,
+	0x313a,
+	0x313b,
+	0x313c,
+	0x313d,
+	0x313e,
+	0x313f,
+	0x3140,
+	0x3141,
+	0x3142,
+	0x3143,
+	0x3144,
+	0x3145,
+	0x3146,
+	0x3147,
+	0x3148,
+	0x3149,
+	0x314a,
+	0x314b,
+	0x314c,
+	0x314d,
+	0x314e,
+	0x314f,
+	0x3150,
+	0x3151,
+	0x3152,
+	0x3153,
+	0x3154,
+	0x3155,
+	0x3156,
+	0x3157,
+	0x3158,
+	0x3159,
+	0x315a,
+	0x315b,
+	0x315c,
+	0x315d,
+	0x315e,
+	0x315f,
+	0x3160,
+	0x3161,
+	0x3162,
+	0x3163,
+	0x3164,
+	0x3165,
+	0x3166,
+	0x3167,
+	0x3168,
+	0x3169,
+	0x316a,
+	0x316b,
+	0x316c,
+	0x316d,
+	0x316e,
+	0x316f,
+	0x3170,
+	0x3171,
+	0x3172,
+	0x3173,
+	0x3174,
+	0x3175,
+	0x3176,
+	0x3177,
+	0x3178,
+	0x3179,
+	0x317a,
+	0x317b,
+	0x317c,
+	0x317d,
+	0x317e,
+	0x317f,
+	0x3180,
+	0x3181,
+	0x3182,
+	0x3183,
+	0x3184,
+	0x3185,
+	0x3186,
+	0x3187,
+	0x3188,
+	0x3189,
+	0x318a,
+	0x318b,
+	0x318c,
+	0x318d,
+	0x318e,
+	0x31d0,
+	0x31d1,
+	0x31d3,
+	0x31d4,
+	0x31d6,
+	0x31da,
+	0x31db,
+	0x31df,
+	0x31e0,
+	0x3200,
+	0x3201,
+	0x3202,
+	0x3203,
+	0x3204,
+	0x3205,
+	0x3206,
+	0x3207,
+	0x3208,
+	0x3209,
+	0x320a,
+	0x320b,
+	0x320c,
+	0x320d,
+	0x320e,
+	0x320f,
+	0x3210,
+	0x3211,
+	0x3212,
+	0x3213,
+	0x3214,
+	0x3215,
+	0x3216,
+	0x3217,
+	0x3218,
+	0x3219,
+	0x321a,
+	0x321b,
+	0x321c,
+	0x321d,
+	0x321e,
+	0x3220,
+	0x3221,
+	0x3222,
+	0x3223,
+	0x3224,
+	0x3225,
+	0x3226,
+	0x3227,
+	0x3228,
+	0x3229,
+	0x322a,
+	0x322b,
+	0x322c,
+	0x322d,
+	0x322e,
+	0x322f,
+	0x3230,
+	0x3231,
+	0x3232,
+	0x3233,
+	0x3234,
+	0x3235,
+	0x3236,
+	0x3237,
+	0x3238,
+	0x3239,
+	0x323a,
+	0x323b,
+	0x323c,
+	0x323d,
+	0x323e,
+	0x323f,
+	0x3240,
+	0x3241,
+	0x3242,
+	0x3243,
+	0x32c0,
+	0x32c1,
+	0x32c2,
+	0x32c3,
+	0x32c4,
+	0x32c5,
+	0x32c6,
+	0x32c7,
+	0x32c8,
+	0x32c9,
+	0x32ca,
+	0x32cb,
+	0x3358,
+	0x3359,
+	0x335a,
+	0x335b,
+	0x335c,
+	0x335d,
+	0x335e,
+	0x335f,
+	0x3360,
+	0x3361,
+	0x3362,
+	0x3363,
+	0x3364,
+	0x3365,
+	0x3366,
+	0x3367,
+	0x3368,
+	0x3369,
+	0x336a,
+	0x336b,
+	0x336c,
+	0x336d,
+	0x336e,
+	0x336f,
+	0x3370,
+	0x33e0,
+	0x33e1,
+	0x33e2,
+	0x33e3,
+	0x33e4,
+	0x33e5,
+	0x33e6,
+	0x33e7,
+	0x33e8,
+	0x33e9,
+	0x33ea,
+	0x33eb,
+	0x33ec,
+	0x33ed,
+	0x33ee,
+	0x33ef,
+	0x33f0,
+	0x33f1,
+	0x33f2,
+	0x33f3,
+	0x33f4,
+	0x33f5,
+	0x33f6,
+	0x33f7,
+	0x33f8,
+	0x33f9,
+	0x33fa,
+	0x33fb,
+	0x33fc,
+	0x33fd,
+	0x33fe,
+	0x39b3,
+	0x439b,
+	0x4420,
+	0x4e00,
+	0x4e36,
+	0x4e3f,
+	0x5002,
+	0x503c,
+	0x555f,
+	0x56d7,
+	0x586b,
+	0x58eb,
+	0x58ff,
+	0x5b00,
+	0x5e32,
+	0x5e50,
+	0x6238,
+	0x6409,
+	0x6663,
+	0x6669,
+	0x66f6,
+	0x6726,
+	0x67ff,
+	0x69e9,
+	0x6a27,
+	0x6f59,
+	0x784f,
+	0x7d76,
+	0x80a6,
+	0x80ca,
+	0x80d0,
+	0x80f6,
+	0x8101,
+	0x8127,
+	0x8141,
+	0x81a7,
+	0x853f,
+	0x8641,
+	0x8a1e,
+	0x8a7d,
+	0x8b8f,
+	0x8c63,
+	0x8d86,
+	0x8dfa,
+	0x8e9b,
+	0x8f27,
+	0x90de,
+	0x93ae,
+	0x96b8,
+	0x9e43,
+	0x9ed2,
+	0x9fc3,
+	0xa494,
+	0xa49c,
+	0xa49e,
+	0xa4a7,
+	0xa4a8,
+	0xa4ac,
+	0xa4b0,
+	0xa4ba,
+	0xa4be,
+	0xa4bf,
+	0xa4c0,
+	0xa4c2,
+	0xa4d0,
+	0xa4d1,
+	0xa4d2,
+	0xa4d3,
+	0xa4d4,
+	0xa4d6,
+	0xa4d7,
+	0xa4d9,
+	0xa4da,
+	0xa4db,
+	0xa4dc,
+	0xa4dd,
+	0xa4de,
+	0xa4df,
+	0xa4e0,
+	0xa4e1,
+	0xa4e2,
+	0xa4e3,
+	0xa4e5,
+	0xa4e6,
+	0xa4e7,
+	0xa4ea,
+	0xa4eb,
+	0xa4ec,
+	0xa4ed,
+	0xa4ee,
+	0xa4ef,
+	0xa4f0,
+	0xa4f1,
+	0xa4f2,
+	0xa4f3,
+	0xa4f4,
+	0xa4f5,
+	0xa4f7,
+	0xa4f8,
+	0xa4f9,
+	0xa4fa,
+	0xa4fb,
+	0xa4fd,
+	0xa4fe,
+	0xa4ff,
+	0xa60e,
+	0xa644,
+	0xa645,
+	0xa647,
+	0xa64d,
+	0xa650,
+	0xa651,
+	0xa668,
+	0xa66f,
+	0xa670,
+	0xa671,
+	0xa672,
+	0xa674,
+	0xa675,
+	0xa676,
+	0xa677,
+	0xa678,
+	0xa679,
+	0xa67a,
+	0xa67b,
+	0xa67c,
+	0xa67d,
+	0xa67e,
+	0xa695,
+	0xa698,
+	0xa699,
+	0xa69a,
+	0xa69e,
+	0xa69f,
+	0xa6a1,
+	0xa6b0,
+	0xa6b1,
+	0xa6cd,
+	0xa6ce,
+	0xa6db,
+	0xa6df,
+	0xa6eb,
+	0xa6ef,
+	0xa6f0,
+	0xa6f1,
+	0xa6f4,
+	0xa714,
+	0xa716,
+	0xa728,
+	0xa729,
+	0xa731,
+	0xa732,
+	0xa733,
+	0xa734,
+	0xa735,
+	0xa736,
+	0xa737,
+	0xa738,
+	0xa739,
+	0xa73a,
+	0xa73b,
+	0xa73c,
+	0xa73d,
+	0xa740,
+	0xa74a,
+	0xa74b,
+	0xa74e,
+	0xa74f,
+	0xa75a,
+	0xa761,
+	0xa76a,
+	0xa76b,
+	0xa76e,
+	0xa777,
+	0xa778,
+	0xa77a,
+	0xa789,
+	0xa78c,
+	0xa78f,
+	0xa795,
+	0xa798,
+	0xa799,
+	0xa79a,
+	0xa79b,
+	0xa79d,
+	0xa79e,
+	0xa79f,
+	0xa7ab,
+	0xa7b1,
+	0xa7b2,
+	0xa7b3,
+	0xa7b4,
+	0xa7b5,
+	0xa7b6,
+	0xa7b7,
+	0xa7f7,
+	0xa802,
+	0xa806,
+	0xa80b,
+	0xa823,
+	0xa824,
+	0xa825,
+	0xa826,
+	0xa827,
+	0xa82c,
+	0xa830,
+	0xa880,
+	0xa881,
+	0xa8b4,
+	0xa8b5,
+	0xa8b6,
+	0xa8b7,
+	0xa8b8,
+	0xa8b9,
+	0xa8ba,
+	0xa8bb,
+	0xa8bc,
+	0xa8bd,
+	0xa8be,
+	0xa8bf,
+	0xa8c0,
+	0xa8c1,
+	0xa8c2,
+	0xa8c3,
+	0xa8c4,
+	0xa8c5,
+	0xa8e0,
+	0xa8e1,
+	0xa8e2,
+	0xa8e3,
+	0xa8e4,
+	0xa8e5,
+	0xa8e6,
+	0xa8e7,
+	0xa8e8,
+	0xa8e9,
+	0xa8ea,
+	0xa8eb,
+	0xa8ec,
+	0xa8ed,
+	0xa8ee,
+	0xa8ef,
+	0xa8f0,
+	0xa8f1,
+	0xa8ff,
+	0xa926,
+	0xa927,
+	0xa928,
+	0xa929,
+	0xa92a,
+	0xa92b,
+	0xa92c,
+	0xa92d,
+	0xa947,
+	0xa948,
+	0xa949,
+	0xa94a,
+	0xa94b,
+	0xa94c,
+	0xa94d,
+	0xa94e,
+	0xa94f,
+	0xa950,
+	0xa951,
+	0xa952,
+	0xa953,
+	0xa960,
+	0xa961,
+	0xa962,
+	0xa963,
+	0xa964,
+	0xa965,
+	0xa966,
+	0xa967,
+	0xa968,
+	0xa969,
+	0xa96a,
+	0xa96b,
+	0xa96c,
+	0xa96d,
+	0xa96e,
+	0xa96f,
+	0xa970,
+	0xa971,
+	0xa972,
+	0xa973,
+	0xa974,
+	0xa975,
+	0xa976,
+	0xa977,
+	0xa978,
+	0xa979,
+	0xa97a,
+	0xa97b,
+	0xa97c,
+	0xa980,
+	0xa981,
+	0xa982,
+	0xa983,
+	0xa992,
+	0xa9a3,
+	0xa9b3,
+	0xa9b4,
+	0xa9b5,
+	0xa9b6,
+	0xa9b7,
+	0xa9b8,
+	0xa9b9,
+	0xa9ba,
+	0xa9bb,
+	0xa9bc,
+	0xa9bd,
+	0xa9be,
+	0xa9bf,
+	0xa9c0,
+	0xa9c6,
+	0xa9cf,
+	0xa9e5,
+	0xaa29,
+	0xaa2a,
+	0xaa2b,
+	0xaa2c,
+	0xaa2d,
+	0xaa2e,
+	0xaa2f,
+	0xaa30,
+	0xaa31,
+	0xaa32,
+	0xaa33,
+	0xaa34,
+	0xaa35,
+	0xaa36,
+	0xaa43,
+	0xaa4c,
+	0xaa4d,
+	0xaa53,
+	0xaa56,
+	0xaa7b,
+	0xaa7c,
+	0xaa7d,
+	0xaab0,
+	0xaab2,
+	0xaab3,
+	0xaab4,
+	0xaab7,
+	0xaab8,
+	0xaabe,
+	0xaabf,
+	0xaac1,
+	0xaaeb,
+	0xaaec,
+	0xaaed,
+	0xaaee,
+	0xaaef,
+	0xaaf5,
+	0xaaf6,
+	0xab32,
+	0xab35,
+	0xab3d,
+	0xab3e,
+	0xab3f,
+	0xab41,
+	0xab42,
+	0xab47,
+	0xab48,
+	0xab4d,
+	0xab4e,
+	0xab52,
+	0xab53,
+	0xab55,
+	0xab5a,
+	0xab60,
+	0xab62,
+	0xab63,
+	0xab70,
+	0xab71,
+	0xab72,
+	0xab74,
+	0xab75,
+	0xab7a,
+	0xab7b,
+	0xab7c,
+	0xab7e,
+	0xab80,
+	0xab81,
+	0xab83,
+	0xab87,
+	0xab8b,
+	0xab8e,
+	0xab90,
+	0xab93,
+	0xab9b,
+	0xab9c,
+	0xab9f,
+	0xaba2,
+	0xaba9,
+	0xabaa,
+	0xabae,
+	0xabaf,
+	0xabb2,
+	0xabb6,
+	0xabbb,
+	0xabe3,
+	0xabe4,
+	0xabe5,
+	0xabe6,
+	0xabe7,
+	0xabe8,
+	0xabe9,
+	0xabea,
+	0xabec,
+	0xabed,
+	0xd7b0,
+	0xd7b1,
+	0xd7b2,
+	0xd7b3,
+	0xd7b4,
+	0xd7b5,
+	0xd7b6,
+	0xd7b7,
+	0xd7b8,
+	0xd7b9,
+	0xd7ba,
+	0xd7bb,
+	0xd7bc,
+	0xd7bd,
+	0xd7be,
+	0xd7bf,
+	0xd7c0,
+	0xd7c1,
+	0xd7c2,
+	0xd7c3,
+	0xd7c4,
+	0xd7c5,
+	0xd7c6,
+	0xd7cb,
+	0xd7cc,
+	0xd7cd,
+	0xd7ce,
+	0xd7cf,
+	0xd7d0,
+	0xd7d1,
+	0xd7d2,
+	0xd7d3,
+	0xd7d4,
+	0xd7d5,
+	0xd7d6,
+	0xd7d7,
+	0xd7d8,
+	0xd7d9,
+	0xd7da,
+	0xd7db,
+	0xd7dc,
+	0xd7dd,
+	0xd7de,
+	0xd7df,
+	0xd7e0,
+	0xd7e1,
+	0xd7e2,
+	0xd7e3,
+	0xd7e4,
+	0xd7e5,
+	0xd7e6,
+	0xd7e7,
+	0xd7e8,
+	0xd7e9,
+	0xd7ea,
+	0xd7eb,
+	0xd7ec,
+	0xd7ed,
+	0xd7ee,
+	0xd7ef,
+	0xd7f0,
+	0xd7f1,
+	0xd7f2,
+	0xd7f3,
+	0xd7f4,
+	0xd7f5,
+	0xd7f6,
+	0xd7f7,
+	0xd7f8,
+	0xd7f9,
+	0xd7fa,
+	0xd7fb,
+	0xd800,
+	0xdb7f,
+	0xdb80,
+	0xdbff,
+	0xdc00,
+	0xdfff,
+	0xe000,
+	0xf8ff,
+	0xf900,
+	0xf901,
+	0xf902,
+	0xf903,
+	0xf904,
+	0xf905,
+	0xf906,
+	0xf907,
+	0xf908,
+	0xf909,
+	0xf90a,
+	0xf90b,
+	0xf90c,
+	0xf90d,
+	0xf90e,
+	0xf90f,
+	0xf910,
+	0xf911,
+	0xf912,
+	0xf913,
+	0xf914,
+	0xf915,
+	0xf916,
+	0xf917,
+	0xf918,
+	0xf919,
+	0xf91a,
+	0xf91b,
+	0xf91c,
+	0xf91d,
+	0xf91e,
+	0xf91f,
+	0xf920,
+	0xf921,
+	0xf922,
+	0xf923,
+	0xf924,
+	0xf925,
+	0xf926,
+	0xf927,
+	0xf928,
+	0xf929,
+	0xf92a,
+	0xf92b,
+	0xf92c,
+	0xf92d,
+	0xf92e,
+	0xf92f,
+	0xf930,
+	0xf931,
+	0xf932,
+	0xf933,
+	0xf934,
+	0xf935,
+	0xf936,
+	0xf937,
+	0xf938,
+	0xf939,
+	0xf93a,
+	0xf93b,
+	0xf93c,
+	0xf93d,
+	0xf93e,
+	0xf93f,
+	0xf940,
+	0xf941,
+	0xf942,
+	0xf943,
+	0xf944,
+	0xf945,
+	0xf946,
+	0xf947,
+	0xf948,
+	0xf949,
+	0xf94a,
+	0xf94b,
+	0xf94c,
+	0xf94d,
+	0xf94e,
+	0xf94f,
+	0xf950,
+	0xf951,
+	0xf952,
+	0xf953,
+	0xf954,
+	0xf955,
+	0xf956,
+	0xf957,
+	0xf958,
+	0xf959,
+	0xf95a,
+	0xf95b,
+	0xf95c,
+	0xf95d,
+	0xf95e,
+	0xf95f,
+	0xf960,
+	0xf961,
+	0xf962,
+	0xf963,
+	0xf964,
+	0xf965,
+	0xf966,
+	0xf967,
+	0xf968,
+	0xf969,
+	0xf96a,
+	0xf96b,
+	0xf96c,
+	0xf96d,
+	0xf96e,
+	0xf96f,
+	0xf970,
+	0xf971,
+	0xf972,
+	0xf973,
+	0xf974,
+	0xf975,
+	0xf976,
+	0xf977,
+	0xf978,
+	0xf979,
+	0xf97a,
+	0xf97b,
+	0xf97c,
+	0xf97d,
+	0xf97e,
+	0xf97f,
+	0xf980,
+	0xf981,
+	0xf982,
+	0xf983,
+	0xf984,
+	0xf985,
+	0xf986,
+	0xf987,
+	0xf988,
+	0xf989,
+	0xf98a,
+	0xf98b,
+	0xf98c,
+	0xf98d,
+	0xf98e,
+	0xf98f,
+	0xf990,
+	0xf991,
+	0xf992,
+	0xf993,
+	0xf994,
+	0xf995,
+	0xf996,
+	0xf997,
+	0xf998,
+	0xf999,
+	0xf99a,
+	0xf99b,
+	0xf99c,
+	0xf99d,
+	0xf99e,
+	0xf99f,
+	0xf9a0,
+	0xf9a1,
+	0xf9a2,
+	0xf9a3,
+	0xf9a4,
+	0xf9a5,
+	0xf9a6,
+	0xf9a7,
+	0xf9a8,
+	0xf9a9,
+	0xf9aa,
+	0xf9ab,
+	0xf9ac,
+	0xf9ad,
+	0xf9ae,
+	0xf9af,
+	0xf9b0,
+	0xf9b1,
+	0xf9b2,
+	0xf9b3,
+	0xf9b4,
+	0xf9b5,
+	0xf9b6,
+	0xf9b7,
+	0xf9b8,
+	0xf9b9,
+	0xf9ba,
+	0xf9bb,
+	0xf9bc,
+	0xf9bd,
+	0xf9be,
+	0xf9bf,
+	0xf9c0,
+	0xf9c1,
+	0xf9c2,
+	0xf9c3,
+	0xf9c4,
+	0xf9c5,
+	0xf9c6,
+	0xf9c7,
+	0xf9c8,
+	0xf9c9,
+	0xf9ca,
+	0xf9cb,
+	0xf9cc,
+	0xf9cd,
+	0xf9ce,
+	0xf9cf,
+	0xf9d0,
+	0xf9d1,
+	0xf9d2,
+	0xf9d3,
+	0xf9d4,
+	0xf9d5,
+	0xf9d6,
+	0xf9d7,
+	0xf9d8,
+	0xf9d9,
+	0xf9da,
+	0xf9db,
+	0xf9dc,
+	0xf9dd,
+	0xf9de,
+	0xf9df,
+	0xf9e0,
+	0xf9e1,
+	0xf9e2,
+	0xf9e3,
+	0xf9e4,
+	0xf9e5,
+	0xf9e6,
+	0xf9e7,
+	0xf9e8,
+	0xf9e9,
+	0xf9ea,
+	0xf9eb,
+	0xf9ec,
+	0xf9ed,
+	0xf9ee,
+	0xf9ef,
+	0xf9f0,
+	0xf9f1,
+	0xf9f2,
+	0xf9f3,
+	0xf9f4,
+	0xf9f5,
+	0xf9f6,
+	0xf9f7,
+	0xf9f8,
+	0xf9f9,
+	0xf9fa,
+	0xf9fb,
+	0xf9fc,
+	0xf9fd,
+	0xf9fe,
+	0xf9ff,
+	0xfa00,
+	0xfa01,
+	0xfa02,
+	0xfa03,
+	0xfa04,
+	0xfa05,
+	0xfa06,
+	0xfa07,
+	0xfa08,
+	0xfa09,
+	0xfa0a,
+	0xfa0b,
+	0xfa0c,
+	0xfa0d,
+	0xfa10,
+	0xfa12,
+	0xfa15,
+	0xfa16,
+	0xfa17,
+	0xfa18,
+	0xfa19,
+	0xfa1a,
+	0xfa1b,
+	0xfa1c,
+	0xfa1d,
+	0xfa1e,
+	0xfa20,
+	0xfa22,
+	0xfa25,
+	0xfa26,
+	0xfa2a,
+	0xfa2b,
+	0xfa2c,
+	0xfa2d,
+	0xfa2e,
+	0xfa2f,
+	0xfa30,
+	0xfa31,
+	0xfa32,
+	0xfa33,
+	0xfa34,
+	0xfa35,
+	0xfa36,
+	0xfa37,
+	0xfa38,
+	0xfa39,
+	0xfa3a,
+	0xfa3b,
+	0xfa3c,
+	0xfa3d,
+	0xfa3e,
+	0xfa3f,
+	0xfa40,
+	0xfa41,
+	0xfa42,
+	0xfa43,
+	0xfa44,
+	0xfa45,
+	0xfa46,
+	0xfa47,
+	0xfa48,
+	0xfa49,
+	0xfa4a,
+	0xfa4b,
+	0xfa4c,
+	0xfa4d,
+	0xfa4e,
+	0xfa4f,
+	0xfa50,
+	0xfa51,
+	0xfa52,
+	0xfa53,
+	0xfa54,
+	0xfa55,
+	0xfa56,
+	0xfa57,
+	0xfa58,
+	0xfa59,
+	0xfa5a,
+	0xfa5b,
+	0xfa5c,
+	0xfa5d,
+	0xfa5e,
+	0xfa5f,
+	0xfa60,
+	0xfa61,
+	0xfa62,
+	0xfa63,
+	0xfa64,
+	0xfa65,
+	0xfa66,
+	0xfa67,
+	0xfa68,
+	0xfa69,
+	0xfa6a,
+	0xfa6b,
+	0xfa6c,
+	0xfa6d,
+	0xfa70,
+	0xfa71,
+	0xfa72,
+	0xfa73,
+	0xfa74,
+	0xfa75,
+	0xfa76,
+	0xfa77,
+	0xfa78,
+	0xfa79,
+	0xfa7a,
+	0xfa7b,
+	0xfa7c,
+	0xfa7d,
+	0xfa7e,
+	0xfa7f,
+	0xfa80,
+	0xfa81,
+	0xfa82,
+	0xfa83,
+	0xfa84,
+	0xfa85,
+	0xfa86,
+	0xfa87,
+	0xfa88,
+	0xfa89,
+	0xfa8a,
+	0xfa8b,
+	0xfa8c,
+	0xfa8d,
+	0xfa8e,
+	0xfa8f,
+	0xfa90,
+	0xfa91,
+	0xfa92,
+	0xfa93,
+	0xfa94,
+	0xfa95,
+	0xfa96,
+	0xfa97,
+	0xfa98,
+	0xfa99,
+	0xfa9a,
+	0xfa9b,
+	0xfa9c,
+	0xfa9d,
+	0xfa9e,
+	0xfa9f,
+	0xfaa0,
+	0xfaa1,
+	0xfaa2,
+	0xfaa3,
+	0xfaa4,
+	0xfaa5,
+	0xfaa6,
+	0xfaa7,
+	0xfaa8,
+	0xfaa9,
+	0xfaaa,
+	0xfaab,
+	0xfaac,
+	0xfaad,
+	0xfaae,
+	0xfaaf,
+	0xfab0,
+	0xfab1,
+	0xfab2,
+	0xfab3,
+	0xfab4,
+	0xfab5,
+	0xfab6,
+	0xfab7,
+	0xfab8,
+	0xfab9,
+	0xfaba,
+	0xfabb,
+	0xfabc,
+	0xfabd,
+	0xfabe,
+	0xfabf,
+	0xfac0,
+	0xfac1,
+	0xfac2,
+	0xfac3,
+	0xfac4,
+	0xfac5,
+	0xfac6,
+	0xfac7,
+	0xfac8,
+	0xfac9,
+	0xfaca,
+	0xfacb,
+	0xfacc,
+	0xfacd,
+	0xface,
+	0xfacf,
+	0xfad0,
+	0xfad1,
+	0xfad2,
+	0xfad3,
+	0xfad4,
+	0xfad5,
+	0xfad6,
+	0xfad7,
+	0xfad8,
+	0xfad9,
+	0xfb00,
+	0xfb01,
+	0xfb02,
+	0xfb03,
+	0xfb04,
+	0xfb06,
+	0xfb13,
+	0xfb14,
+	0xfb15,
+	0xfb16,
+	0xfb17,
+	0xfb1d,
+	0xfb1e,
+	0xfb1f,
+	0xfb20,
+	0xfb21,
+	0xfb22,
+	0xfb23,
+	0xfb24,
+	0xfb25,
+	0xfb26,
+	0xfb27,
+	0xfb28,
+	0xfb29,
+	0xfb2a,
+	0xfb2b,
+	0xfb2c,
+	0xfb2d,
+	0xfb2e,
+	0xfb2f,
+	0xfb30,
+	0xfb31,
+	0xfb32,
+	0xfb33,
+	0xfb34,
+	0xfb35,
+	0xfb36,
+	0xfb38,
+	0xfb39,
+	0xfb3a,
+	0xfb3b,
+	0xfb3c,
+	0xfb3e,
+	0xfb40,
+	0xfb41,
+	0xfb43,
+	0xfb44,
+	0xfb46,
+	0xfb47,
+	0xfb48,
+	0xfb49,
+	0xfb4a,
+	0xfb4b,
+	0xfb4c,
+	0xfb4d,
+	0xfb4e,
+	0xfb4f,
+	0xfb50,
+	0xfb51,
+	0xfb52,
+	0xfb53,
+	0xfb54,
+	0xfb55,
+	0xfb56,
+	0xfb57,
+	0xfb58,
+	0xfb59,
+	0xfb5a,
+	0xfb5b,
+	0xfb5c,
+	0xfb5d,
+	0xfb5e,
+	0xfb5f,
+	0xfb60,
+	0xfb61,
+	0xfb62,
+	0xfb63,
+	0xfb64,
+	0xfb65,
+	0xfb66,
+	0xfb67,
+	0xfb68,
+	0xfb69,
+	0xfb6a,
+	0xfb6b,
+	0xfb6c,
+	0xfb6d,
+	0xfb6e,
+	0xfb6f,
+	0xfb70,
+	0xfb71,
+	0xfb72,
+	0xfb73,
+	0xfb74,
+	0xfb75,
+	0xfb76,
+	0xfb77,
+	0xfb78,
+	0xfb79,
+	0xfb7a,
+	0xfb7b,
+	0xfb7c,
+	0xfb7d,
+	0xfb7e,
+	0xfb7f,
+	0xfb80,
+	0xfb81,
+	0xfb82,
+	0xfb83,
+	0xfb84,
+	0xfb85,
+	0xfb86,
+	0xfb87,
+	0xfb88,
+	0xfb89,
+	0xfb8a,
+	0xfb8b,
+	0xfb8c,
+	0xfb8d,
+	0xfb8e,
+	0xfb8f,
+	0xfb90,
+	0xfb91,
+	0xfb92,
+	0xfb93,
+	0xfb94,
+	0xfb95,
+	0xfb96,
+	0xfb97,
+	0xfb98,
+	0xfb99,
+	0xfb9a,
+	0xfb9b,
+	0xfb9c,
+	0xfb9d,
+	0xfb9e,
+	0xfb9f,
+	0xfba0,
+	0xfba1,
+	0xfba2,
+	0xfba3,
+	0xfba4,
+	0xfba5,
+	0xfba6,
+	0xfba7,
+	0xfba8,
+	0xfba9,
+	0xfbaa,
+	0xfbab,
+	0xfbac,
+	0xfbad,
+	0xfbae,
+	0xfbaf,
+	0xfbb0,
+	0xfbb1,
+	0xfbd3,
+	0xfbd4,
+	0xfbd5,
+	0xfbd6,
+	0xfbd7,
+	0xfbd8,
+	0xfbd9,
+	0xfbda,
+	0xfbdb,
+	0xfbdc,
+	0xfbdd,
+	0xfbde,
+	0xfbdf,
+	0xfbe0,
+	0xfbe1,
+	0xfbe2,
+	0xfbe3,
+	0xfbe4,
+	0xfbe5,
+	0xfbe6,
+	0xfbe7,
+	0xfbe8,
+	0xfbe9,
+	0xfbea,
+	0xfbeb,
+	0xfbec,
+	0xfbed,
+	0xfbee,
+	0xfbef,
+	0xfbf0,
+	0xfbf1,
+	0xfbf2,
+	0xfbf3,
+	0xfbf4,
+	0xfbf5,
+	0xfbf6,
+	0xfbf7,
+	0xfbf8,
+	0xfbf9,
+	0xfbfa,
+	0xfbfb,
+	0xfbfc,
+	0xfbfd,
+	0xfbfe,
+	0xfbff,
+	0xfc00,
+	0xfc01,
+	0xfc02,
+	0xfc03,
+	0xfc04,
+	0xfc05,
+	0xfc06,
+	0xfc07,
+	0xfc08,
+	0xfc09,
+	0xfc0a,
+	0xfc0b,
+	0xfc0c,
+	0xfc0d,
+	0xfc0e,
+	0xfc0f,
+	0xfc10,
+	0xfc11,
+	0xfc12,
+	0xfc13,
+	0xfc14,
+	0xfc15,
+	0xfc16,
+	0xfc17,
+	0xfc18,
+	0xfc19,
+	0xfc1a,
+	0xfc1b,
+	0xfc1c,
+	0xfc1d,
+	0xfc1e,
+	0xfc1f,
+	0xfc20,
+	0xfc21,
+	0xfc22,
+	0xfc23,
+	0xfc24,
+	0xfc25,
+	0xfc26,
+	0xfc27,
+	0xfc28,
+	0xfc29,
+	0xfc2a,
+	0xfc2b,
+	0xfc2c,
+	0xfc2d,
+	0xfc2e,
+	0xfc2f,
+	0xfc30,
+	0xfc31,
+	0xfc32,
+	0xfc33,
+	0xfc34,
+	0xfc35,
+	0xfc36,
+	0xfc37,
+	0xfc38,
+	0xfc39,
+	0xfc3a,
+	0xfc3b,
+	0xfc3c,
+	0xfc3d,
+	0xfc3e,
+	0xfc3f,
+	0xfc40,
+	0xfc41,
+	0xfc42,
+	0xfc43,
+	0xfc44,
+	0xfc45,
+	0xfc46,
+	0xfc47,
+	0xfc48,
+	0xfc49,
+	0xfc4a,
+	0xfc4b,
+	0xfc4c,
+	0xfc4d,
+	0xfc4e,
+	0xfc4f,
+	0xfc50,
+	0xfc51,
+	0xfc52,
+	0xfc53,
+	0xfc54,
+	0xfc55,
+	0xfc56,
+	0xfc57,
+	0xfc58,
+	0xfc59,
+	0xfc5a,
+	0xfc5b,
+	0xfc5c,
+	0xfc5d,
+	0xfc5e,
+	0xfc5f,
+	0xfc60,
+	0xfc61,
+	0xfc62,
+	0xfc63,
+	0xfc64,
+	0xfc65,
+	0xfc66,
+	0xfc67,
+	0xfc68,
+	0xfc69,
+	0xfc6a,
+	0xfc6b,
+	0xfc6c,
+	0xfc6d,
+	0xfc6e,
+	0xfc6f,
+	0xfc70,
+	0xfc71,
+	0xfc72,
+	0xfc73,
+	0xfc74,
+	0xfc75,
+	0xfc76,
+	0xfc77,
+	0xfc78,
+	0xfc79,
+	0xfc7a,
+	0xfc7b,
+	0xfc7c,
+	0xfc7d,
+	0xfc7e,
+	0xfc7f,
+	0xfc80,
+	0xfc81,
+	0xfc82,
+	0xfc83,
+	0xfc84,
+	0xfc85,
+	0xfc86,
+	0xfc87,
+	0xfc88,
+	0xfc89,
+	0xfc8a,
+	0xfc8b,
+	0xfc8c,
+	0xfc8d,
+	0xfc8e,
+	0xfc8f,
+	0xfc90,
+	0xfc91,
+	0xfc92,
+	0xfc93,
+	0xfc94,
+	0xfc95,
+	0xfc96,
+	0xfc97,
+	0xfc98,
+	0xfc99,
+	0xfc9a,
+	0xfc9b,
+	0xfc9c,
+	0xfc9d,
+	0xfc9e,
+	0xfc9f,
+	0xfca0,
+	0xfca1,
+	0xfca2,
+	0xfca3,
+	0xfca4,
+	0xfca5,
+	0xfca6,
+	0xfca7,
+	0xfca8,
+	0xfca9,
+	0xfcaa,
+	0xfcab,
+	0xfcac,
+	0xfcad,
+	0xfcae,
+	0xfcaf,
+	0xfcb0,
+	0xfcb1,
+	0xfcb2,
+	0xfcb3,
+	0xfcb4,
+	0xfcb5,
+	0xfcb6,
+	0xfcb7,
+	0xfcb8,
+	0xfcb9,
+	0xfcba,
+	0xfcbb,
+	0xfcbc,
+	0xfcbd,
+	0xfcbe,
+	0xfcbf,
+	0xfcc0,
+	0xfcc1,
+	0xfcc2,
+	0xfcc3,
+	0xfcc4,
+	0xfcc5,
+	0xfcc6,
+	0xfcc7,
+	0xfcc8,
+	0xfcc9,
+	0xfcca,
+	0xfccb,
+	0xfccc,
+	0xfccd,
+	0xfcce,
+	0xfccf,
+	0xfcd0,
+	0xfcd1,
+	0xfcd2,
+	0xfcd3,
+	0xfcd4,
+	0xfcd5,
+	0xfcd6,
+	0xfcd7,
+	0xfcd8,
+	0xfcd9,
+	0xfcda,
+	0xfcdb,
+	0xfcdc,
+	0xfcdd,
+	0xfcde,
+	0xfcdf,
+	0xfce0,
+	0xfce1,
+	0xfce2,
+	0xfce3,
+	0xfce4,
+	0xfce5,
+	0xfce6,
+	0xfce7,
+	0xfce8,
+	0xfce9,
+	0xfcea,
+	0xfceb,
+	0xfcec,
+	0xfced,
+	0xfcee,
+	0xfcef,
+	0xfcf0,
+	0xfcf1,
+	0xfcf2,
+	0xfcf3,
+	0xfcf4,
+	0xfcf5,
+	0xfcf6,
+	0xfcf7,
+	0xfcf8,
+	0xfcf9,
+	0xfcfa,
+	0xfcfb,
+	0xfcfc,
+	0xfcfd,
+	0xfcfe,
+	0xfcff,
+	0xfd00,
+	0xfd01,
+	0xfd02,
+	0xfd03,
+	0xfd04,
+	0xfd05,
+	0xfd06,
+	0xfd07,
+	0xfd08,
+	0xfd09,
+	0xfd0a,
+	0xfd0b,
+	0xfd0c,
+	0xfd0d,
+	0xfd0e,
+	0xfd0f,
+	0xfd10,
+	0xfd11,
+	0xfd12,
+	0xfd13,
+	0xfd14,
+	0xfd15,
+	0xfd16,
+	0xfd17,
+	0xfd18,
+	0xfd19,
+	0xfd1a,
+	0xfd1b,
+	0xfd1c,
+	0xfd1d,
+	0xfd1e,
+	0xfd1f,
+	0xfd20,
+	0xfd21,
+	0xfd22,
+	0xfd23,
+	0xfd24,
+	0xfd25,
+	0xfd26,
+	0xfd27,
+	0xfd28,
+	0xfd29,
+	0xfd2a,
+	0xfd2b,
+	0xfd2c,
+	0xfd2d,
+	0xfd2e,
+	0xfd2f,
+	0xfd30,
+	0xfd31,
+	0xfd32,
+	0xfd33,
+	0xfd34,
+	0xfd35,
+	0xfd36,
+	0xfd37,
+	0xfd38,
+	0xfd39,
+	0xfd3a,
+	0xfd3b,
+	0xfd3c,
+	0xfd3d,
+	0xfd3e,
+	0xfd3f,
+	0xfd50,
+	0xfd51,
+	0xfd52,
+	0xfd53,
+	0xfd54,
+	0xfd55,
+	0xfd56,
+	0xfd57,
+	0xfd58,
+	0xfd59,
+	0xfd5a,
+	0xfd5b,
+	0xfd5c,
+	0xfd5d,
+	0xfd5e,
+	0xfd5f,
+	0xfd60,
+	0xfd61,
+	0xfd62,
+	0xfd63,
+	0xfd64,
+	0xfd65,
+	0xfd66,
+	0xfd67,
+	0xfd68,
+	0xfd69,
+	0xfd6a,
+	0xfd6b,
+	0xfd6c,
+	0xfd6d,
+	0xfd6e,
+	0xfd6f,
+	0xfd70,
+	0xfd71,
+	0xfd72,
+	0xfd73,
+	0xfd74,
+	0xfd75,
+	0xfd76,
+	0xfd77,
+	0xfd78,
+	0xfd79,
+	0xfd7a,
+	0xfd7b,
+	0xfd7c,
+	0xfd7d,
+	0xfd7e,
+	0xfd7f,
+	0xfd80,
+	0xfd81,
+	0xfd82,
+	0xfd83,
+	0xfd84,
+	0xfd85,
+	0xfd86,
+	0xfd87,
+	0xfd88,
+	0xfd89,
+	0xfd8a,
+	0xfd8b,
+	0xfd8c,
+	0xfd8d,
+	0xfd8e,
+	0xfd8f,
+	0xfd92,
+	0xfd93,
+	0xfd94,
+	0xfd95,
+	0xfd96,
+	0xfd97,
+	0xfd98,
+	0xfd99,
+	0xfd9a,
+	0xfd9b,
+	0xfd9c,
+	0xfd9d,
+	0xfd9e,
+	0xfd9f,
+	0xfda0,
+	0xfda1,
+	0xfda2,
+	0xfda3,
+	0xfda4,
+	0xfda5,
+	0xfda6,
+	0xfda7,
+	0xfda8,
+	0xfda9,
+	0xfdaa,
+	0xfdab,
+	0xfdac,
+	0xfdad,
+	0xfdae,
+	0xfdaf,
+	0xfdb0,
+	0xfdb1,
+	0xfdb2,
+	0xfdb3,
+	0xfdb4,
+	0xfdb5,
+	0xfdb6,
+	0xfdb7,
+	0xfdb8,
+	0xfdb9,
+	0xfdba,
+	0xfdbb,
+	0xfdbc,
+	0xfdbd,
+	0xfdbe,
+	0xfdbf,
+	0xfdc0,
+	0xfdc1,
+	0xfdc2,
+	0xfdc3,
+	0xfdc4,
+	0xfdc5,
+	0xfdc6,
+	0xfdc7,
+	0xfdf0,
+	0xfdf1,
+	0xfdf2,
+	0xfdf3,
+	0xfdf4,
+	0xfdf5,
+	0xfdf6,
+	0xfdf7,
+	0xfdf8,
+	0xfdf9,
+	0xfdfa,
+	0xfdfb,
+	0xfdfc,
+	0xfe00,
+	0xfe01,
+	0xfe02,
+	0xfe03,
+	0xfe04,
+	0xfe05,
+	0xfe06,
+	0xfe07,
+	0xfe08,
+	0xfe09,
+	0xfe0a,
+	0xfe0b,
+	0xfe0c,
+	0xfe0d,
+	0xfe0e,
+	0xfe0f,
+	0xfe19,
+	0xfe20,
+	0xfe21,
+	0xfe22,
+	0xfe23,
+	0xfe24,
+	0xfe25,
+	0xfe26,
+	0xfe27,
+	0xfe28,
+	0xfe29,
+	0xfe2a,
+	0xfe2b,
+	0xfe2c,
+	0xfe2d,
+	0xfe2e,
+	0xfe2f,
+	0xfe30,
+	0xfe31,
+	0xfe34,
+	0xfe35,
+	0xfe36,
+	0xfe37,
+	0xfe38,
+	0xfe39,
+	0xfe3a,
+	0xfe49,
+	0xfe4a,
+	0xfe4b,
+	0xfe4c,
+	0xfe4d,
+	0xfe4e,
+	0xfe4f,
+	0xfe58,
+	0xfe68,
+	0xfe80,
+	0xfe81,
+	0xfe82,
+	0xfe83,
+	0xfe84,
+	0xfe85,
+	0xfe86,
+	0xfe87,
+	0xfe88,
+	0xfe89,
+	0xfe8a,
+	0xfe8b,
+	0xfe8c,
+	0xfe8d,
+	0xfe8e,
+	0xfe8f,
+	0xfe90,
+	0xfe91,
+	0xfe92,
+	0xfe93,
+	0xfe94,
+	0xfe95,
+	0xfe96,
+	0xfe97,
+	0xfe98,
+	0xfe99,
+	0xfe9a,
+	0xfe9b,
+	0xfe9c,
+	0xfe9d,
+	0xfe9e,
+	0xfe9f,
+	0xfea0,
+	0xfea1,
+	0xfea2,
+	0xfea3,
+	0xfea4,
+	0xfea5,
+	0xfea6,
+	0xfea7,
+	0xfea8,
+	0xfea9,
+	0xfeaa,
+	0xfeab,
+	0xfeac,
+	0xfead,
+	0xfeae,
+	0xfeaf,
+	0xfeb0,
+	0xfeb1,
+	0xfeb2,
+	0xfeb3,
+	0xfeb4,
+	0xfeb5,
+	0xfeb6,
+	0xfeb7,
+	0xfeb8,
+	0xfeb9,
+	0xfeba,
+	0xfebb,
+	0xfebc,
+	0xfebd,
+	0xfebe,
+	0xfebf,
+	0xfec0,
+	0xfec1,
+	0xfec2,
+	0xfec3,
+	0xfec4,
+	0xfec5,
+	0xfec6,
+	0xfec7,
+	0xfec8,
+	0xfec9,
+	0xfeca,
+	0xfecb,
+	0xfecc,
+	0xfecd,
+	0xfece,
+	0xfecf,
+	0xfed0,
+	0xfed1,
+	0xfed2,
+	0xfed3,
+	0xfed4,
+	0xfed5,
+	0xfed6,
+	0xfed7,
+	0xfed8,
+	0xfed9,
+	0xfeda,
+	0xfedb,
+	0xfedc,
+	0xfedd,
+	0xfede,
+	0xfedf,
+	0xfee0,
+	0xfee1,
+	0xfee2,
+	0xfee3,
+	0xfee4,
+	0xfee5,
+	0xfee6,
+	0xfee7,
+	0xfee8,
+	0xfee9,
+	0xfeea,
+	0xfeeb,
+	0xfeec,
+	0xfeed,
+	0xfeee,
+	0xfeef,
+	0xfef0,
+	0xfef1,
+	0xfef2,
+	0xfef3,
+	0xfef4,
+	0xfef5,
+	0xfef6,
+	0xfef7,
+	0xfef8,
+	0xfef9,
+	0xfefa,
+	0xfefb,
+	0xfefc,
+	0xfeff,
+	0xff01,
+	0xff02,
+	0xff07,
+	0xff0d,
+	0xff1a,
+	0xff21,
+	0xff22,
+	0xff23,
+	0xff25,
+	0xff28,
+	0xff29,
+	0xff2a,
+	0xff2b,
+	0xff2d,
+	0xff2e,
+	0xff2f,
+	0xff30,
+	0xff33,
+	0xff34,
+	0xff38,
+	0xff39,
+	0xff3a,
+	0xff3b,
+	0xff3c,
+	0xff3d,
+	0xff3e,
+	0xff40,
+	0xff41,
+	0xff43,
+	0xff45,
+	0xff47,
+	0xff48,
+	0xff49,
+	0xff4a,
+	0xff4c,
+	0xff4f,
+	0xff50,
+	0xff53,
+	0xff56,
+	0xff58,
+	0xff59,
+	0xff5c,
+	0xff5e,
+	0xff65,
+	0xffe3,
+	0xffe8,
+	0xffed,
+	0xfff9,
+	0xfffa,
+	0xfffb,
+	0xfffc,
+	0x10101,
+	0x1018e,
+	0x10196,
+	0x10197,
+	0x10198,
+	0x10199,
+	0x101a0,
+	0x101fd,
+	0x10282,
+	0x10285,
+	0x10286,
+	0x10287,
+	0x1028a,
+	0x1028d,
+	0x10290,
+	0x10292,
+	0x10294,
+	0x10295,
+	0x10296,
+	0x10297,
+	0x1029b,
+	0x102a0,
+	0x102a1,
+	0x102a2,
+	0x102a3,
+	0x102a5,
+	0x102ab,
+	0x102ad,
+	0x102b0,
+	0x102b1,
+	0x102b2,
+	0x102b3,
+	0x102b4,
+	0x102b5,
+	0x102b6,
+	0x102b8,
+	0x102cf,
+	0x102e0,
+	0x102e1,
+	0x102e4,
+	0x102e8,
+	0x102f2,
+	0x102f5,
+	0x10301,
+	0x10302,
+	0x10309,
+	0x10311,
+	0x10312,
+	0x10315,
+	0x10317,
+	0x1031a,
+	0x1031f,
+	0x10320,
+	0x10322,
+	0x10376,
+	0x10377,
+	0x10378,
+	0x10379,
+	0x1037a,
+	0x103d1,
+	0x103d3,
+	0x10401,
+	0x10404,
+	0x10411,
+	0x10415,
+	0x1041b,
+	0x1041f,
+	0x10420,
+	0x10423,
+	0x10425,
+	0x10429,
+	0x1042a,
+	0x1042c,
+	0x1043d,
+	0x1043f,
+	0x10442,
+	0x10443,
+	0x10448,
+	0x1044b,
+	0x1044d,
+	0x104a0,
+	0x104b0,
+	0x104b4,
+	0x104bc,
+	0x104c2,
+	0x104c3,
+	0x104c4,
+	0x104cd,
+	0x104ce,
+	0x104d0,
+	0x104d1,
+	0x104d2,
+	0x104d8,
+	0x104db,
+	0x104ea,
+	0x104eb,
+	0x104f6,
+	0x104f9,
+	0x10513,
+	0x10516,
+	0x10518,
+	0x1051c,
+	0x1051d,
+	0x10525,
+	0x10526,
+	0x10527,
+	0x10a01,
+	0x10a02,
+	0x10a03,
+	0x10a05,
+	0x10a06,
+	0x10a0c,
+	0x10a0d,
+	0x10a0e,
+	0x10a0f,
+	0x10a38,
+	0x10a39,
+	0x10a3a,
+	0x10a3f,
+	0x10a50,
+	0x10a57,
+	0x10ae5,
+	0x10ae6,
+	0x10cfa,
+	0x10cfc,
+	0x10d24,
+	0x10d25,
+	0x10d26,
+	0x10d27,
+	0x10eab,
+	0x10eac,
+	0x10efd,
+	0x10efe,
+	0x10eff,
+	0x10f46,
+	0x10f47,
+	0x10f48,
+	0x10f49,
+	0x10f4a,
+	0x10f4b,
+	0x10f4c,
+	0x10f4d,
+	0x10f4e,
+	0x10f4f,
+	0x10f50,
+	0x10f82,
+	0x10f83,
+	0x10f84,
+	0x10f85,
+	0x11000,
+	0x11001,
+	0x11002,
+	0x11038,
+	0x11039,
+	0x1103a,
+	0x1103b,
+	0x1103c,
+	0x1103d,
+	0x1103e,
+	0x1103f,
+	0x11040,
+	0x11041,
+	0x11042,
+	0x11043,
+	0x11044,
+	0x11045,
+	0x11046,
+	0x11070,
+	0x11073,
+	0x11074,
+	0x1107f,
+	0x11080,
+	0x11081,
+	0x11082,
+	0x1109a,
+	0x1109c,
+	0x110ab,
+	0x110b0,
+	0x110b1,
+	0x110b2,
+	0x110b3,
+	0x110b4,
+	0x110b5,
+	0x110b6,
+	0x110b7,
+	0x110b8,
+	0x110b9,
+	0x110ba,
+	0x110bb,
+	0x110bd,
+	0x110c2,
+	0x110cd,
+	0x11100,
+	0x11101,
+	0x11102,
+	0x11127,
+	0x11128,
+	0x11129,
+	0x1112a,
+	0x1112b,
+	0x1112c,
+	0x1112d,
+	0x1112e,
+	0x1112f,
+	0x11130,
+	0x11131,
+	0x11132,
+	0x11133,
+	0x11134,
+	0x11145,
+	0x11146,
+	0x11173,
+	0x11180,
+	0x11181,
+	0x11182,
+	0x111b3,
+	0x111b4,
+	0x111b5,
+	0x111b6,
+	0x111b7,
+	0x111b8,
+	0x111b9,
+	0x111ba,
+	0x111bb,
+	0x111bc,
+	0x111bd,
+	0x111be,
+	0x111bf,
+	0x111c0,
+	0x111c7,
+	0x111c9,
+	0x111ca,
+	0x111cb,
+	0x111cc,
+	0x111ce,
+	0x111cf,
+	0x111db,
+	0x111dc,
+	0x111de,
+	0x1122c,
+	0x1122d,
+	0x1122e,
+	0x1122f,
+	0x11230,
+	0x11231,
+	0x11232,
+	0x11233,
+	0x11234,
+	0x11235,
+	0x11236,
+	0x11237,
+	0x1123e,
+	0x11241,
+	0x112df,
+	0x112e0,
+	0x112e1,
+	0x112e2,
+	0x112e3,
+	0x112e4,
+	0x112e5,
+	0x112e6,
+	0x112e7,
+	0x112e8,
+	0x112e9,
+	0x112ea,
+	0x11300,
+	0x11301,
+	0x11302,
+	0x11303,
+	0x1133b,
+	0x1133c,
+	0x1133e,
+	0x1133f,
+	0x11340,
+	0x11341,
+	0x11342,
+	0x11343,
+	0x11344,
+	0x11347,
+	0x11348,
+	0x1134b,
+	0x1134c,
+	0x1134d,
+	0x11357,
+	0x11362,
+	0x11363,
+	0x11366,
+	0x11367,
+	0x11368,
+	0x11369,
+	0x1136a,
+	0x1136b,
+	0x1136c,
+	0x11370,
+	0x11371,
+	0x11372,
+	0x11373,
+	0x11374,
+	0x11413,
+	0x11419,
+	0x11424,
+	0x1142a,
+	0x1142d,
+	0x1142f,
+	0x11435,
+	0x11436,
+	0x11437,
+	0x11438,
+	0x11439,
+	0x1143a,
+	0x1143b,
+	0x1143c,
+	0x1143d,
+	0x1143e,
+	0x1143f,
+	0x11440,
+	0x11441,
+	0x11442,
+	0x11443,
+	0x11444,
+	0x11445,
+	0x11446,
+	0x1144c,
+	0x1145e,
+	0x11492,
+	0x11494,
+	0x11496,
+	0x11498,
+	0x11499,
+	0x1149b,
+	0x1149d,
+	0x1149e,
+	0x1149f,
+	0x114a0,
+	0x114a1,
+	0x114a2,
+	0x114a3,
+	0x114a7,
+	0x114a8,
+	0x114a9,
+	0x114aa,
+	0x114ab,
+	0x114ad,
+	0x114ae,
+	0x114b0,
+	0x114b1,
+	0x114b2,
+	0x114b3,
+	0x114b4,
+	0x114b5,
+	0x114b6,
+	0x114b7,
+	0x114b8,
+	0x114b9,
+	0x114ba,
+	0x114bb,
+	0x114bc,
+	0x114bd,
+	0x114be,
+	0x114bf,
+	0x114c0,
+	0x114c1,
+	0x114c2,
+	0x114c3,
+	0x114c4,
+	0x114c5,
+	0x114d0,
+	0x114d1,
+	0x114d2,
+	0x114d6,
+	0x115af,
+	0x115b0,
+	0x115b1,
+	0x115b2,
+	0x115b3,
+	0x115b4,
+	0x115b5,
+	0x115b8,
+	0x115b9,
+	0x115ba,
+	0x115bb,
+	0x115bc,
+	0x115bd,
+	0x115be,
+	0x115bf,
+	0x115c0,
+	0x115d8,
+	0x115d9,
+	0x115da,
+	0x115db,
+	0x115dc,
+	0x115dd,
+	0x11630,
+	0x11631,
+	0x11632,
+	0x11633,
+	0x11634,
+	0x11635,
+	0x11636,
+	0x11637,
+	0x11638,
+	0x11639,
+	0x1163a,
+	0x1163b,
+	0x1163c,
+	0x1163d,
+	0x1163e,
+	0x1163f,
+	0x11640,
+	0x11642,
+	0x116ab,
+	0x116ac,
+	0x116ad,
+	0x116ae,
+	0x116af,
+	0x116b0,
+	0x116b1,
+	0x116b2,
+	0x116b3,
+	0x116b4,
+	0x116b5,
+	0x116b6,
+	0x116b7,
+	0x11700,
+	0x11706,
+	0x1170a,
+	0x1170e,
+	0x1170f,
+	0x1171d,
+	0x1171e,
+	0x1171f,
+	0x11720,
+	0x11721,
+	0x11722,
+	0x11723,
+	0x11724,
+	0x11725,
+	0x11726,
+	0x11727,
+	0x11728,
+	0x11729,
+	0x1172a,
+	0x1172b,
+	0x1182c,
+	0x1182d,
+	0x1182e,
+	0x1182f,
+	0x11830,
+	0x11831,
+	0x11832,
+	0x11833,
+	0x11834,
+	0x11835,
+	0x11836,
+	0x11837,
+	0x11838,
+	0x11839,
+	0x1183a,
+	0x118a0,
+	0x118a2,
+	0x118a3,
+	0x118a4,
+	0x118a6,
+	0x118a8,
+	0x118a9,
+	0x118ac,
+	0x118ae,
+	0x118af,
+	0x118b2,
+	0x118b5,
+	0x118b7,
+	0x118b8,
+	0x118bb,
+	0x118bc,
+	0x118c0,
+	0x118c1,
+	0x118c2,
+	0x118c3,
+	0x118c4,
+	0x118c6,
+	0x118c8,
+	0x118ca,
+	0x118cc,
+	0x118ce,
+	0x118d5,
+	0x118d6,
+	0x118d7,
+	0x118d8,
+	0x118dc,
+	0x118e0,
+	0x118e3,
+	0x118e4,
+	0x118e5,
+	0x118e6,
+	0x118e9,
+	0x118ec,
+	0x118ef,
+	0x118f2,
+	0x11930,
+	0x11931,
+	0x11932,
+	0x11933,
+	0x11934,
+	0x11935,
+	0x11937,
+	0x11938,
+	0x1193b,
+	0x1193c,
+	0x1193d,
+	0x1193e,
+	0x11940,
+	0x11942,
+	0x11943,
+	0x119d1,
+	0x119d2,
+	0x119d3,
+	0x119d4,
+	0x119d5,
+	0x119d6,
+	0x119d7,
+	0x119da,
+	0x119db,
+	0x119dc,
+	0x119dd,
+	0x119de,
+	0x119df,
+	0x119e0,
+	0x119e4,
+	0x11a01,
+	0x11a02,
+	0x11a03,
+	0x11a04,
+	0x11a05,
+	0x11a06,
+	0x11a07,
+	0x11a08,
+	0x11a09,
+	0x11a0a,
+	0x11a33,
+	0x11a34,
+	0x11a35,
+	0x11a36,
+	0x11a37,
+	0x11a38,
+	0x11a39,
+	0x11a3b,
+	0x11a3c,
+	0x11a3d,
+	0x11a3e,
+	0x11a47,
+	0x11a51,
+	0x11a52,
+	0x11a53,
+	0x11a54,
+	0x11a55,
+	0x11a56,
+	0x11a57,
+	0x11a58,
+	0x11a59,
+	0x11a5a,
+	0x11a5b,
+	0x11a8a,
+	0x11a8b,
+	0x11a8c,
+	0x11a8d,
+	0x11a8e,
+	0x11a8f,
+	0x11a90,
+	0x11a91,
+	0x11a92,
+	0x11a93,
+	0x11a94,
+	0x11a95,
+	0x11a96,
+	0x11a97,
+	0x11a98,
+	0x11a99,
+	0x11ae6,
+	0x11ae7,
+	0x11ae8,
+	0x11ae9,
+	0x11aea,
+	0x11aec,
+	0x11aed,
+	0x11aee,
+	0x11af4,
+	0x11af5,
+	0x11af6,
+	0x11af7,
+	0x11af8,
+	0x11c2f,
+	0x11c30,
+	0x11c31,
+	0x11c32,
+	0x11c33,
+	0x11c34,
+	0x11c35,
+	0x11c36,
+	0x11c38,
+	0x11c39,
+	0x11c3a,
+	0x11c3b,
+	0x11c3c,
+	0x11c3d,
+	0x11c3e,
+	0x11c3f,
+	0x11c42,
+	0x11c92,
+	0x11c93,
+	0x11c94,
+	0x11c95,
+	0x11c96,
+	0x11c97,
+	0x11c98,
+	0x11c99,
+	0x11c9a,
+	0x11c9b,
+	0x11c9c,
+	0x11c9d,
+	0x11c9e,
+	0x11c9f,
+	0x11ca0,
+	0x11ca1,
+	0x11ca2,
+	0x11ca3,
+	0x11ca4,
+	0x11ca5,
+	0x11ca6,
+	0x11ca7,
+	0x11ca9,
+	0x11caa,
+	0x11cab,
+	0x11cac,
+	0x11cad,
+	0x11cae,
+	0x11caf,
+	0x11cb0,
+	0x11cb1,
+	0x11cb2,
+	0x11cb3,
+	0x11cb4,
+	0x11cb5,
+	0x11cb6,
+	0x11d31,
+	0x11d32,
+	0x11d33,
+	0x11d34,
+	0x11d35,
+	0x11d36,
+	0x11d3a,
+	0x11d3c,
+	0x11d3d,
+	0x11d3f,
+	0x11d40,
+	0x11d41,
+	0x11d42,
+	0x11d43,
+	0x11d44,
+	0x11d45,
+	0x11d47,
+	0x11d8a,
+	0x11d8b,
+	0x11d8c,
+	0x11d8d,
+	0x11d8e,
+	0x11d90,
+	0x11d91,
+	0x11d93,
+	0x11d94,
+	0x11d95,
+	0x11d96,
+	0x11d97,
+	0x11ef3,
+	0x11ef4,
+	0x11ef5,
+	0x11ef6,
+	0x11f00,
+	0x11f01,
+	0x11f03,
+	0x11f34,
+	0x11f35,
+	0x11f36,
+	0x11f37,
+	0x11f38,
+	0x11f39,
+	0x11f3a,
+	0x11f3e,
+	0x11f3f,
+	0x11f40,
+	0x11f41,
+	0x11f42,
+	0x12038,
+	0x132f9,
+	0x13430,
+	0x13431,
+	0x13432,
+	0x13433,
+	0x13434,
+	0x13435,
+	0x13436,
+	0x13437,
+	0x13438,
+	0x13439,
+	0x1343a,
+	0x1343b,
+	0x1343c,
+	0x1343d,
+	0x1343e,
+	0x1343f,
+	0x13440,
+	0x13447,
+	0x13448,
+	0x13449,
+	0x1344a,
+	0x1344b,
+	0x1344c,
+	0x1344d,
+	0x1344e,
+	0x1344f,
+	0x13450,
+	0x13451,
+	0x13452,
+	0x13453,
+	0x13454,
+	0x13455,
+	0x16af0,
+	0x16af1,
+	0x16af2,
+	0x16af3,
+	0x16af4,
+	0x16b30,
+	0x16b31,
+	0x16b32,
+	0x16b33,
+	0x16b34,
+	0x16b35,
+	0x16b36,
+	0x16f07,
+	0x16f08,
+	0x16f0a,
+	0x16f16,
+	0x16f1a,
+	0x16f1c,
+	0x16f26,
+	0x16f28,
+	0x16f2d,
+	0x16f35,
+	0x16f3a,
+	0x16f3b,
+	0x16f3d,
+	0x16f3f,
+	0x16f40,
+	0x16f42,
+	0x16f43,
+	0x16f4f,
+	0x16f51,
+	0x16f52,
+	0x16f53,
+	0x16f54,
+	0x16f55,
+	0x16f56,
+	0x16f57,
+	0x16f58,
+	0x16f59,
+	0x16f5a,
+	0x16f5b,
+	0x16f5c,
+	0x16f5d,
+	0x16f5e,
+	0x16f5f,
+	0x16f60,
+	0x16f61,
+	0x16f62,
+	0x16f63,
+	0x16f64,
+	0x16f65,
+	0x16f66,
+	0x16f67,
+	0x16f68,
+	0x16f69,
+	0x16f6a,
+	0x16f6b,
+	0x16f6c,
+	0x16f6d,
+	0x16f6e,
+	0x16f6f,
+	0x16f70,
+	0x16f71,
+	0x16f72,
+	0x16f73,
+	0x16f74,
+	0x16f75,
+	0x16f76,
+	0x16f77,
+	0x16f78,
+	0x16f79,
+	0x16f7a,
+	0x16f7b,
+	0x16f7c,
+	0x16f7d,
+	0x16f7e,
+	0x16f7f,
+	0x16f80,
+	0x16f81,
+	0x16f82,
+	0x16f83,
+	0x16f84,
+	0x16f85,
+	0x16f86,
+	0x16f87,
+	0x16f8f,
+	0x16f90,
+	0x16f91,
+	0x16f92,
+	0x16fe4,
+	0x16ff0,
+	0x16ff1,
+	0x1bc9d,
+	0x1bc9e,
+	0x1bca0,
+	0x1bca1,
+	0x1bca2,
+	0x1bca3,
+	0x1cf00,
+	0x1cf01,
+	0x1cf02,
+	0x1cf03,
+	0x1cf04,
+	0x1cf05,
+	0x1cf06,
+	0x1cf07,
+	0x1cf08,
+	0x1cf09,
+	0x1cf0a,
+	0x1cf0b,
+	0x1cf0c,
+	0x1cf0d,
+	0x1cf0e,
+	0x1cf0f,
+	0x1cf10,
+	0x1cf11,
+	0x1cf12,
+	0x1cf13,
+	0x1cf14,
+	0x1cf15,
+	0x1cf16,
+	0x1cf17,
+	0x1cf18,
+	0x1cf19,
+	0x1cf1a,
+	0x1cf1b,
+	0x1cf1c,
+	0x1cf1d,
+	0x1cf1e,
+	0x1cf1f,
+	0x1cf20,
+	0x1cf21,
+	0x1cf22,
+	0x1cf23,
+	0x1cf24,
+	0x1cf25,
+	0x1cf26,
+	0x1cf27,
+	0x1cf28,
+	0x1cf29,
+	0x1cf2a,
+	0x1cf2b,
+	0x1cf2c,
+	0x1cf2d,
+	0x1cf30,
+	0x1cf31,
+	0x1cf32,
+	0x1cf33,
+	0x1cf34,
+	0x1cf35,
+	0x1cf36,
+	0x1cf37,
+	0x1cf38,
+	0x1cf39,
+	0x1cf3a,
+	0x1cf3b,
+	0x1cf3c,
+	0x1cf3d,
+	0x1cf3e,
+	0x1cf3f,
+	0x1cf40,
+	0x1cf41,
+	0x1cf42,
+	0x1cf43,
+	0x1cf44,
+	0x1cf45,
+	0x1cf46,
+	0x1d114,
+	0x1d15e,
+	0x1d15f,
+	0x1d160,
+	0x1d161,
+	0x1d162,
+	0x1d163,
+	0x1d164,
+	0x1d165,
+	0x1d166,
+	0x1d167,
+	0x1d168,
+	0x1d169,
+	0x1d16d,
+	0x1d16e,
+	0x1d16f,
+	0x1d170,
+	0x1d171,
+	0x1d172,
+	0x1d173,
+	0x1d174,
+	0x1d175,
+	0x1d176,
+	0x1d177,
+	0x1d178,
+	0x1d179,
+	0x1d17a,
+	0x1d17b,
+	0x1d17c,
+	0x1d17d,
+	0x1d17e,
+	0x1d17f,
+	0x1d180,
+	0x1d181,
+	0x1d182,
+	0x1d185,
+	0x1d186,
+	0x1d187,
+	0x1d188,
+	0x1d189,
+	0x1d18a,
+	0x1d18b,
+	0x1d1aa,
+	0x1d1ab,
+	0x1d1ac,
+	0x1d1ad,
+	0x1d1bb,
+	0x1d1bc,
+	0x1d1bd,
+	0x1d1be,
+	0x1d1bf,
+	0x1d1c0,
+	0x1d202,
+	0x1d206,
+	0x1d20b,
+	0x1d20d,
+	0x1d20f,
+	0x1d212,
+	0x1d213,
+	0x1d214,
+	0x1d215,
+	0x1d216,
+	0x1d217,
+	0x1d21a,
+	0x1d21b,
+	0x1d21c,
+	0x1d221,
+	0x1d222,
+	0x1d22a,
+	0x1d22b,
+	0x1d230,
+	0x1d236,
+	0x1d237,
+	0x1d238,
+	0x1d239,
+	0x1d23a,
+	0x1d23b,
+	0x1d23f,
+	0x1d242,
+	0x1d243,
+	0x1d244,
+	0x1d245,
+	0x1d400,
+	0x1d401,
+	0x1d402,
+	0x1d403,
+	0x1d404,
+	0x1d405,
+	0x1d406,
+	0x1d407,
+	0x1d408,
+	0x1d409,
+	0x1d40a,
+	0x1d40b,
+	0x1d40c,
+	0x1d40d,
+	0x1d40e,
+	0x1d40f,
+	0x1d410,
+	0x1d411,
+	0x1d412,
+	0x1d413,
+	0x1d414,
+	0x1d415,
+	0x1d416,
+	0x1d417,
+	0x1d418,
+	0x1d419,
+	0x1d41a,
+	0x1d41b,
+	0x1d41c,
+	0x1d41d,
+	0x1d41e,
+	0x1d41f,
+	0x1d420,
+	0x1d421,
+	0x1d422,
+	0x1d423,
+	0x1d424,
+	0x1d425,
+	0x1d426,
+	0x1d427,
+	0x1d428,
+	0x1d429,
+	0x1d42a,
+	0x1d42b,
+	0x1d42c,
+	0x1d42d,
+	0x1d42e,
+	0x1d42f,
+	0x1d430,
+	0x1d431,
+	0x1d432,
+	0x1d433,
+	0x1d434,
+	0x1d435,
+	0x1d436,
+	0x1d437,
+	0x1d438,
+	0x1d439,
+	0x1d43a,
+	0x1d43b,
+	0x1d43c,
+	0x1d43d,
+	0x1d43e,
+	0x1d43f,
+	0x1d440,
+	0x1d441,
+	0x1d442,
+	0x1d443,
+	0x1d444,
+	0x1d445,
+	0x1d446,
+	0x1d447,
+	0x1d448,
+	0x1d449,
+	0x1d44a,
+	0x1d44b,
+	0x1d44c,
+	0x1d44d,
+	0x1d44e,
+	0x1d44f,
+	0x1d450,
+	0x1d451,
+	0x1d452,
+	0x1d453,
+	0x1d454,
+	0x1d456,
+	0x1d457,
+	0x1d458,
+	0x1d459,
+	0x1d45a,
+	0x1d45b,
+	0x1d45c,
+	0x1d45d,
+	0x1d45e,
+	0x1d45f,
+	0x1d460,
+	0x1d461,
+	0x1d462,
+	0x1d463,
+	0x1d464,
+	0x1d465,
+	0x1d466,
+	0x1d467,
+	0x1d468,
+	0x1d469,
+	0x1d46a,
+	0x1d46b,
+	0x1d46c,
+	0x1d46d,
+	0x1d46e,
+	0x1d46f,
+	0x1d470,
+	0x1d471,
+	0x1d472,
+	0x1d473,
+	0x1d474,
+	0x1d475,
+	0x1d476,
+	0x1d477,
+	0x1d478,
+	0x1d479,
+	0x1d47a,
+	0x1d47b,
+	0x1d47c,
+	0x1d47d,
+	0x1d47e,
+	0x1d47f,
+	0x1d480,
+	0x1d481,
+	0x1d482,
+	0x1d483,
+	0x1d484,
+	0x1d485,
+	0x1d486,
+	0x1d487,
+	0x1d488,
+	0x1d489,
+	0x1d48a,
+	0x1d48b,
+	0x1d48c,
+	0x1d48d,
+	0x1d48e,
+	0x1d48f,
+	0x1d490,
+	0x1d491,
+	0x1d492,
+	0x1d493,
+	0x1d494,
+	0x1d495,
+	0x1d496,
+	0x1d497,
+	0x1d498,
+	0x1d499,
+	0x1d49a,
+	0x1d49b,
+	0x1d49c,
+	0x1d49e,
+	0x1d49f,
+	0x1d4a2,
+	0x1d4a5,
+	0x1d4a6,
+	0x1d4a9,
+	0x1d4aa,
+	0x1d4ab,
+	0x1d4ac,
+	0x1d4ae,
+	0x1d4af,
+	0x1d4b0,
+	0x1d4b1,
+	0x1d4b2,
+	0x1d4b3,
+	0x1d4b4,
+	0x1d4b5,
+	0x1d4b6,
+	0x1d4b7,
+	0x1d4b8,
+	0x1d4b9,
+	0x1d4bb,
+	0x1d4bd,
+	0x1d4be,
+	0x1d4bf,
+	0x1d4c0,
+	0x1d4c1,
+	0x1d4c2,
+	0x1d4c3,
+	0x1d4c5,
+	0x1d4c6,
+	0x1d4c7,
+	0x1d4c8,
+	0x1d4c9,
+	0x1d4ca,
+	0x1d4cb,
+	0x1d4cc,
+	0x1d4cd,
+	0x1d4ce,
+	0x1d4cf,
+	0x1d4d0,
+	0x1d4d1,
+	0x1d4d2,
+	0x1d4d3,
+	0x1d4d4,
+	0x1d4d5,
+	0x1d4d6,
+	0x1d4d7,
+	0x1d4d8,
+	0x1d4d9,
+	0x1d4da,
+	0x1d4db,
+	0x1d4dc,
+	0x1d4dd,
+	0x1d4de,
+	0x1d4df,
+	0x1d4e0,
+	0x1d4e1,
+	0x1d4e2,
+	0x1d4e3,
+	0x1d4e4,
+	0x1d4e5,
+	0x1d4e6,
+	0x1d4e7,
+	0x1d4e8,
+	0x1d4e9,
+	0x1d4ea,
+	0x1d4eb,
+	0x1d4ec,
+	0x1d4ed,
+	0x1d4ee,
+	0x1d4ef,
+	0x1d4f0,
+	0x1d4f1,
+	0x1d4f2,
+	0x1d4f3,
+	0x1d4f4,
+	0x1d4f5,
+	0x1d4f6,
+	0x1d4f7,
+	0x1d4f8,
+	0x1d4f9,
+	0x1d4fa,
+	0x1d4fb,
+	0x1d4fc,
+	0x1d4fd,
+	0x1d4fe,
+	0x1d4ff,
+	0x1d500,
+	0x1d501,
+	0x1d502,
+	0x1d503,
+	0x1d504,
+	0x1d505,
+	0x1d507,
+	0x1d508,
+	0x1d509,
+	0x1d50a,
+	0x1d50d,
+	0x1d50e,
+	0x1d50f,
+	0x1d510,
+	0x1d511,
+	0x1d512,
+	0x1d513,
+	0x1d514,
+	0x1d516,
+	0x1d517,
+	0x1d518,
+	0x1d519,
+	0x1d51a,
+	0x1d51b,
+	0x1d51c,
+	0x1d51e,
+	0x1d51f,
+	0x1d520,
+	0x1d521,
+	0x1d522,
+	0x1d523,
+	0x1d524,
+	0x1d525,
+	0x1d526,
+	0x1d527,
+	0x1d528,
+	0x1d529,
+	0x1d52a,
+	0x1d52b,
+	0x1d52c,
+	0x1d52d,
+	0x1d52e,
+	0x1d52f,
+	0x1d530,
+	0x1d531,
+	0x1d532,
+	0x1d533,
+	0x1d534,
+	0x1d535,
+	0x1d536,
+	0x1d537,
+	0x1d538,
+	0x1d539,
+	0x1d53b,
+	0x1d53c,
+	0x1d53d,
+	0x1d53e,
+	0x1d540,
+	0x1d541,
+	0x1d542,
+	0x1d543,
+	0x1d544,
+	0x1d546,
+	0x1d54a,
+	0x1d54b,
+	0x1d54c,
+	0x1d54d,
+	0x1d54e,
+	0x1d54f,
+	0x1d550,
+	0x1d552,
+	0x1d553,
+	0x1d554,
+	0x1d555,
+	0x1d556,
+	0x1d557,
+	0x1d558,
+	0x1d559,
+	0x1d55a,
+	0x1d55b,
+	0x1d55c,
+	0x1d55d,
+	0x1d55e,
+	0x1d55f,
+	0x1d560,
+	0x1d561,
+	0x1d562,
+	0x1d563,
+	0x1d564,
+	0x1d565,
+	0x1d566,
+	0x1d567,
+	0x1d568,
+	0x1d569,
+	0x1d56a,
+	0x1d56b,
+	0x1d56c,
+	0x1d56d,
+	0x1d56e,
+	0x1d56f,
+	0x1d570,
+	0x1d571,
+	0x1d572,
+	0x1d573,
+	0x1d574,
+	0x1d575,
+	0x1d576,
+	0x1d577,
+	0x1d578,
+	0x1d579,
+	0x1d57a,
+	0x1d57b,
+	0x1d57c,
+	0x1d57d,
+	0x1d57e,
+	0x1d57f,
+	0x1d580,
+	0x1d581,
+	0x1d582,
+	0x1d583,
+	0x1d584,
+	0x1d585,
+	0x1d586,
+	0x1d587,
+	0x1d588,
+	0x1d589,
+	0x1d58a,
+	0x1d58b,
+	0x1d58c,
+	0x1d58d,
+	0x1d58e,
+	0x1d58f,
+	0x1d590,
+	0x1d591,
+	0x1d592,
+	0x1d593,
+	0x1d594,
+	0x1d595,
+	0x1d596,
+	0x1d597,
+	0x1d598,
+	0x1d599,
+	0x1d59a,
+	0x1d59b,
+	0x1d59c,
+	0x1d59d,
+	0x1d59e,
+	0x1d59f,
+	0x1d5a0,
+	0x1d5a1,
+	0x1d5a2,
+	0x1d5a3,
+	0x1d5a4,
+	0x1d5a5,
+	0x1d5a6,
+	0x1d5a7,
+	0x1d5a8,
+	0x1d5a9,
+	0x1d5aa,
+	0x1d5ab,
+	0x1d5ac,
+	0x1d5ad,
+	0x1d5ae,
+	0x1d5af,
+	0x1d5b0,
+	0x1d5b1,
+	0x1d5b2,
+	0x1d5b3,
+	0x1d5b4,
+	0x1d5b5,
+	0x1d5b6,
+	0x1d5b7,
+	0x1d5b8,
+	0x1d5b9,
+	0x1d5ba,
+	0x1d5bb,
+	0x1d5bc,
+	0x1d5bd,
+	0x1d5be,
+	0x1d5bf,
+	0x1d5c0,
+	0x1d5c1,
+	0x1d5c2,
+	0x1d5c3,
+	0x1d5c4,
+	0x1d5c5,
+	0x1d5c6,
+	0x1d5c7,
+	0x1d5c8,
+	0x1d5c9,
+	0x1d5ca,
+	0x1d5cb,
+	0x1d5cc,
+	0x1d5cd,
+	0x1d5ce,
+	0x1d5cf,
+	0x1d5d0,
+	0x1d5d1,
+	0x1d5d2,
+	0x1d5d3,
+	0x1d5d4,
+	0x1d5d5,
+	0x1d5d6,
+	0x1d5d7,
+	0x1d5d8,
+	0x1d5d9,
+	0x1d5da,
+	0x1d5db,
+	0x1d5dc,
+	0x1d5dd,
+	0x1d5de,
+	0x1d5df,
+	0x1d5e0,
+	0x1d5e1,
+	0x1d5e2,
+	0x1d5e3,
+	0x1d5e4,
+	0x1d5e5,
+	0x1d5e6,
+	0x1d5e7,
+	0x1d5e8,
+	0x1d5e9,
+	0x1d5ea,
+	0x1d5eb,
+	0x1d5ec,
+	0x1d5ed,
+	0x1d5ee,
+	0x1d5ef,
+	0x1d5f0,
+	0x1d5f1,
+	0x1d5f2,
+	0x1d5f3,
+	0x1d5f4,
+	0x1d5f5,
+	0x1d5f6,
+	0x1d5f7,
+	0x1d5f8,
+	0x1d5f9,
+	0x1d5fa,
+	0x1d5fb,
+	0x1d5fc,
+	0x1d5fd,
+	0x1d5fe,
+	0x1d5ff,
+	0x1d600,
+	0x1d601,
+	0x1d602,
+	0x1d603,
+	0x1d604,
+	0x1d605,
+	0x1d606,
+	0x1d607,
+	0x1d608,
+	0x1d609,
+	0x1d60a,
+	0x1d60b,
+	0x1d60c,
+	0x1d60d,
+	0x1d60e,
+	0x1d60f,
+	0x1d610,
+	0x1d611,
+	0x1d612,
+	0x1d613,
+	0x1d614,
+	0x1d615,
+	0x1d616,
+	0x1d617,
+	0x1d618,
+	0x1d619,
+	0x1d61a,
+	0x1d61b,
+	0x1d61c,
+	0x1d61d,
+	0x1d61e,
+	0x1d61f,
+	0x1d620,
+	0x1d621,
+	0x1d622,
+	0x1d623,
+	0x1d624,
+	0x1d625,
+	0x1d626,
+	0x1d627,
+	0x1d628,
+	0x1d629,
+	0x1d62a,
+	0x1d62b,
+	0x1d62c,
+	0x1d62d,
+	0x1d62e,
+	0x1d62f,
+	0x1d630,
+	0x1d631,
+	0x1d632,
+	0x1d633,
+	0x1d634,
+	0x1d635,
+	0x1d636,
+	0x1d637,
+	0x1d638,
+	0x1d639,
+	0x1d63a,
+	0x1d63b,
+	0x1d63c,
+	0x1d63d,
+	0x1d63e,
+	0x1d63f,
+	0x1d640,
+	0x1d641,
+	0x1d642,
+	0x1d643,
+	0x1d644,
+	0x1d645,
+	0x1d646,
+	0x1d647,
+	0x1d648,
+	0x1d649,
+	0x1d64a,
+	0x1d64b,
+	0x1d64c,
+	0x1d64d,
+	0x1d64e,
+	0x1d64f,
+	0x1d650,
+	0x1d651,
+	0x1d652,
+	0x1d653,
+	0x1d654,
+	0x1d655,
+	0x1d656,
+	0x1d657,
+	0x1d658,
+	0x1d659,
+	0x1d65a,
+	0x1d65b,
+	0x1d65c,
+	0x1d65d,
+	0x1d65e,
+	0x1d65f,
+	0x1d660,
+	0x1d661,
+	0x1d662,
+	0x1d663,
+	0x1d664,
+	0x1d665,
+	0x1d666,
+	0x1d667,
+	0x1d668,
+	0x1d669,
+	0x1d66a,
+	0x1d66b,
+	0x1d66c,
+	0x1d66d,
+	0x1d66e,
+	0x1d66f,
+	0x1d670,
+	0x1d671,
+	0x1d672,
+	0x1d673,
+	0x1d674,
+	0x1d675,
+	0x1d676,
+	0x1d677,
+	0x1d678,
+	0x1d679,
+	0x1d67a,
+	0x1d67b,
+	0x1d67c,
+	0x1d67d,
+	0x1d67e,
+	0x1d67f,
+	0x1d680,
+	0x1d681,
+	0x1d682,
+	0x1d683,
+	0x1d684,
+	0x1d685,
+	0x1d686,
+	0x1d687,
+	0x1d688,
+	0x1d689,
+	0x1d68a,
+	0x1d68b,
+	0x1d68c,
+	0x1d68d,
+	0x1d68e,
+	0x1d68f,
+	0x1d690,
+	0x1d691,
+	0x1d692,
+	0x1d693,
+	0x1d694,
+	0x1d695,
+	0x1d696,
+	0x1d697,
+	0x1d698,
+	0x1d699,
+	0x1d69a,
+	0x1d69b,
+	0x1d69c,
+	0x1d69d,
+	0x1d69e,
+	0x1d69f,
+	0x1d6a0,
+	0x1d6a1,
+	0x1d6a2,
+	0x1d6a3,
+	0x1d6a4,
+	0x1d6a5,
+	0x1d6a8,
+	0x1d6a9,
+	0x1d6aa,
+	0x1d6ab,
+	0x1d6ac,
+	0x1d6ad,
+	0x1d6ae,
+	0x1d6af,
+	0x1d6b0,
+	0x1d6b1,
+	0x1d6b2,
+	0x1d6b3,
+	0x1d6b4,
+	0x1d6b5,
+	0x1d6b6,
+	0x1d6b7,
+	0x1d6b8,
+	0x1d6b9,
+	0x1d6ba,
+	0x1d6bb,
+	0x1d6bc,
+	0x1d6bd,
+	0x1d6be,
+	0x1d6bf,
+	0x1d6c0,
+	0x1d6c1,
+	0x1d6c2,
+	0x1d6c3,
+	0x1d6c4,
+	0x1d6c5,
+	0x1d6c6,
+	0x1d6c7,
+	0x1d6c8,
+	0x1d6c9,
+	0x1d6ca,
+	0x1d6cb,
+	0x1d6cc,
+	0x1d6cd,
+	0x1d6ce,
+	0x1d6cf,
+	0x1d6d0,
+	0x1d6d1,
+	0x1d6d2,
+	0x1d6d3,
+	0x1d6d4,
+	0x1d6d5,
+	0x1d6d6,
+	0x1d6d7,
+	0x1d6d8,
+	0x1d6d9,
+	0x1d6da,
+	0x1d6db,
+	0x1d6dc,
+	0x1d6dd,
+	0x1d6de,
+	0x1d6df,
+	0x1d6e0,
+	0x1d6e1,
+	0x1d6e2,
+	0x1d6e3,
+	0x1d6e4,
+	0x1d6e5,
+	0x1d6e6,
+	0x1d6e7,
+	0x1d6e8,
+	0x1d6e9,
+	0x1d6ea,
+	0x1d6eb,
+	0x1d6ec,
+	0x1d6ed,
+	0x1d6ee,
+	0x1d6ef,
+	0x1d6f0,
+	0x1d6f1,
+	0x1d6f2,
+	0x1d6f3,
+	0x1d6f4,
+	0x1d6f5,
+	0x1d6f6,
+	0x1d6f7,
+	0x1d6f8,
+	0x1d6f9,
+	0x1d6fa,
+	0x1d6fb,
+	0x1d6fc,
+	0x1d6fd,
+	0x1d6fe,
+	0x1d6ff,
+	0x1d700,
+	0x1d701,
+	0x1d702,
+	0x1d703,
+	0x1d704,
+	0x1d705,
+	0x1d706,
+	0x1d707,
+	0x1d708,
+	0x1d709,
+	0x1d70a,
+	0x1d70b,
+	0x1d70c,
+	0x1d70d,
+	0x1d70e,
+	0x1d70f,
+	0x1d710,
+	0x1d711,
+	0x1d712,
+	0x1d713,
+	0x1d714,
+	0x1d715,
+	0x1d716,
+	0x1d717,
+	0x1d718,
+	0x1d719,
+	0x1d71a,
+	0x1d71b,
+	0x1d71c,
+	0x1d71d,
+	0x1d71e,
+	0x1d71f,
+	0x1d720,
+	0x1d721,
+	0x1d722,
+	0x1d723,
+	0x1d724,
+	0x1d725,
+	0x1d726,
+	0x1d727,
+	0x1d728,
+	0x1d729,
+	0x1d72a,
+	0x1d72b,
+	0x1d72c,
+	0x1d72d,
+	0x1d72e,
+	0x1d72f,
+	0x1d730,
+	0x1d731,
+	0x1d732,
+	0x1d733,
+	0x1d734,
+	0x1d735,
+	0x1d736,
+	0x1d737,
+	0x1d738,
+	0x1d739,
+	0x1d73a,
+	0x1d73b,
+	0x1d73c,
+	0x1d73d,
+	0x1d73e,
+	0x1d73f,
+	0x1d740,
+	0x1d741,
+	0x1d742,
+	0x1d743,
+	0x1d744,
+	0x1d745,
+	0x1d746,
+	0x1d747,
+	0x1d748,
+	0x1d749,
+	0x1d74a,
+	0x1d74b,
+	0x1d74c,
+	0x1d74d,
+	0x1d74e,
+	0x1d74f,
+	0x1d750,
+	0x1d751,
+	0x1d752,
+	0x1d753,
+	0x1d754,
+	0x1d755,
+	0x1d756,
+	0x1d757,
+	0x1d758,
+	0x1d759,
+	0x1d75a,
+	0x1d75b,
+	0x1d75c,
+	0x1d75d,
+	0x1d75e,
+	0x1d75f,
+	0x1d760,
+	0x1d761,
+	0x1d762,
+	0x1d763,
+	0x1d764,
+	0x1d765,
+	0x1d766,
+	0x1d767,
+	0x1d768,
+	0x1d769,
+	0x1d76a,
+	0x1d76b,
+	0x1d76c,
+	0x1d76d,
+	0x1d76e,
+	0x1d76f,
+	0x1d770,
+	0x1d771,
+	0x1d772,
+	0x1d773,
+	0x1d774,
+	0x1d775,
+	0x1d776,
+	0x1d777,
+	0x1d778,
+	0x1d779,
+	0x1d77a,
+	0x1d77b,
+	0x1d77c,
+	0x1d77d,
+	0x1d77e,
+	0x1d77f,
+	0x1d780,
+	0x1d781,
+	0x1d782,
+	0x1d783,
+	0x1d784,
+	0x1d785,
+	0x1d786,
+	0x1d787,
+	0x1d788,
+	0x1d789,
+	0x1d78a,
+	0x1d78b,
+	0x1d78c,
+	0x1d78d,
+	0x1d78e,
+	0x1d78f,
+	0x1d790,
+	0x1d791,
+	0x1d792,
+	0x1d793,
+	0x1d794,
+	0x1d795,
+	0x1d796,
+	0x1d797,
+	0x1d798,
+	0x1d799,
+	0x1d79a,
+	0x1d79b,
+	0x1d79c,
+	0x1d79d,
+	0x1d79e,
+	0x1d79f,
+	0x1d7a0,
+	0x1d7a1,
+	0x1d7a2,
+	0x1d7a3,
+	0x1d7a4,
+	0x1d7a5,
+	0x1d7a6,
+	0x1d7a7,
+	0x1d7a8,
+	0x1d7a9,
+	0x1d7aa,
+	0x1d7ab,
+	0x1d7ac,
+	0x1d7ad,
+	0x1d7ae,
+	0x1d7af,
+	0x1d7b0,
+	0x1d7b1,
+	0x1d7b2,
+	0x1d7b3,
+	0x1d7b4,
+	0x1d7b5,
+	0x1d7b6,
+	0x1d7b7,
+	0x1d7b8,
+	0x1d7b9,
+	0x1d7ba,
+	0x1d7bb,
+	0x1d7bc,
+	0x1d7bd,
+	0x1d7be,
+	0x1d7bf,
+	0x1d7c0,
+	0x1d7c1,
+	0x1d7c2,
+	0x1d7c3,
+	0x1d7c4,
+	0x1d7c5,
+	0x1d7c6,
+	0x1d7c7,
+	0x1d7c8,
+	0x1d7c9,
+	0x1d7ca,
+	0x1d7cb,
+	0x1d7ce,
+	0x1d7cf,
+	0x1d7d0,
+	0x1d7d1,
+	0x1d7d2,
+	0x1d7d3,
+	0x1d7d4,
+	0x1d7d5,
+	0x1d7d6,
+	0x1d7d7,
+	0x1d7d8,
+	0x1d7d9,
+	0x1d7da,
+	0x1d7db,
+	0x1d7dc,
+	0x1d7dd,
+	0x1d7de,
+	0x1d7df,
+	0x1d7e0,
+	0x1d7e1,
+	0x1d7e2,
+	0x1d7e3,
+	0x1d7e4,
+	0x1d7e5,
+	0x1d7e6,
+	0x1d7e7,
+	0x1d7e8,
+	0x1d7e9,
+	0x1d7ea,
+	0x1d7eb,
+	0x1d7ec,
+	0x1d7ed,
+	0x1d7ee,
+	0x1d7ef,
+	0x1d7f0,
+	0x1d7f1,
+	0x1d7f2,
+	0x1d7f3,
+	0x1d7f4,
+	0x1d7f5,
+	0x1d7f6,
+	0x1d7f7,
+	0x1d7f8,
+	0x1d7f9,
+	0x1d7fa,
+	0x1d7fb,
+	0x1d7fc,
+	0x1d7fd,
+	0x1d7fe,
+	0x1d7ff,
+	0x1da00,
+	0x1da01,
+	0x1da02,
+	0x1da03,
+	0x1da04,
+	0x1da05,
+	0x1da06,
+	0x1da07,
+	0x1da08,
+	0x1da09,
+	0x1da0a,
+	0x1da0b,
+	0x1da0c,
+	0x1da0d,
+	0x1da0e,
+	0x1da0f,
+	0x1da10,
+	0x1da11,
+	0x1da12,
+	0x1da13,
+	0x1da14,
+	0x1da15,
+	0x1da16,
+	0x1da17,
+	0x1da18,
+	0x1da19,
+	0x1da1a,
+	0x1da1b,
+	0x1da1c,
+	0x1da1d,
+	0x1da1e,
+	0x1da1f,
+	0x1da20,
+	0x1da21,
+	0x1da22,
+	0x1da23,
+	0x1da24,
+	0x1da25,
+	0x1da26,
+	0x1da27,
+	0x1da28,
+	0x1da29,
+	0x1da2a,
+	0x1da2b,
+	0x1da2c,
+	0x1da2d,
+	0x1da2e,
+	0x1da2f,
+	0x1da30,
+	0x1da31,
+	0x1da32,
+	0x1da33,
+	0x1da34,
+	0x1da35,
+	0x1da36,
+	0x1da3b,
+	0x1da3c,
+	0x1da3d,
+	0x1da3e,
+	0x1da3f,
+	0x1da40,
+	0x1da41,
+	0x1da42,
+	0x1da43,
+	0x1da44,
+	0x1da45,
+	0x1da46,
+	0x1da47,
+	0x1da48,
+	0x1da49,
+	0x1da4a,
+	0x1da4b,
+	0x1da4c,
+	0x1da4d,
+	0x1da4e,
+	0x1da4f,
+	0x1da50,
+	0x1da51,
+	0x1da52,
+	0x1da53,
+	0x1da54,
+	0x1da55,
+	0x1da56,
+	0x1da57,
+	0x1da58,
+	0x1da59,
+	0x1da5a,
+	0x1da5b,
+	0x1da5c,
+	0x1da5d,
+	0x1da5e,
+	0x1da5f,
+	0x1da60,
+	0x1da61,
+	0x1da62,
+	0x1da63,
+	0x1da64,
+	0x1da65,
+	0x1da66,
+	0x1da67,
+	0x1da68,
+	0x1da69,
+	0x1da6a,
+	0x1da6b,
+	0x1da6c,
+	0x1da75,
+	0x1da84,
+	0x1da9b,
+	0x1da9c,
+	0x1da9d,
+	0x1da9e,
+	0x1da9f,
+	0x1daa1,
+	0x1daa2,
+	0x1daa3,
+	0x1daa4,
+	0x1daa5,
+	0x1daa6,
+	0x1daa7,
+	0x1daa8,
+	0x1daa9,
+	0x1daaa,
+	0x1daab,
+	0x1daac,
+	0x1daad,
+	0x1daae,
+	0x1daaf,
+	0x1e000,
+	0x1e001,
+	0x1e002,
+	0x1e003,
+	0x1e004,
+	0x1e005,
+	0x1e006,
+	0x1e008,
+	0x1e009,
+	0x1e00a,
+	0x1e00b,
+	0x1e00c,
+	0x1e00d,
+	0x1e00e,
+	0x1e00f,
+	0x1e010,
+	0x1e011,
+	0x1e012,
+	0x1e013,
+	0x1e014,
+	0x1e015,
+	0x1e016,
+	0x1e017,
+	0x1e018,
+	0x1e01b,
+	0x1e01c,
+	0x1e01d,
+	0x1e01e,
+	0x1e01f,
+	0x1e020,
+	0x1e021,
+	0x1e023,
+	0x1e024,
+	0x1e026,
+	0x1e027,
+	0x1e028,
+	0x1e029,
+	0x1e02a,
+	0x1e08f,
+	0x1e130,
+	0x1e131,
+	0x1e132,
+	0x1e133,
+	0x1e134,
+	0x1e135,
+	0x1e136,
+	0x1e2ae,
+	0x1e2ec,
+	0x1e2ed,
+	0x1e2ee,
+	0x1e2ef,
+	0x1e4ec,
+	0x1e4ed,
+	0x1e4ee,
+	0x1e4ef,
+	0x1e8c7,
+	0x1e8c8,
+	0x1e8c9,
+	0x1e8cb,
+	0x1e8cc,
+	0x1e8cd,
+	0x1e8d0,
+	0x1e8d1,
+	0x1e8d2,
+	0x1e8d3,
+	0x1e8d4,
+	0x1e8d5,
+	0x1e8d6,
+	0x1e944,
+	0x1e945,
+	0x1e946,
+	0x1e947,
+	0x1e948,
+	0x1e949,
+	0x1e94a,
+	0x1ee00,
+	0x1ee01,
+	0x1ee02,
+	0x1ee03,
+	0x1ee05,
+	0x1ee06,
+	0x1ee07,
+	0x1ee08,
+	0x1ee09,
+	0x1ee0a,
+	0x1ee0b,
+	0x1ee0c,
+	0x1ee0d,
+	0x1ee0e,
+	0x1ee0f,
+	0x1ee10,
+	0x1ee11,
+	0x1ee12,
+	0x1ee13,
+	0x1ee14,
+	0x1ee15,
+	0x1ee16,
+	0x1ee17,
+	0x1ee18,
+	0x1ee19,
+	0x1ee1a,
+	0x1ee1b,
+	0x1ee1c,
+	0x1ee1d,
+	0x1ee1e,
+	0x1ee1f,
+	0x1ee21,
+	0x1ee22,
+	0x1ee24,
+	0x1ee27,
+	0x1ee29,
+	0x1ee2a,
+	0x1ee2b,
+	0x1ee2c,
+	0x1ee2d,
+	0x1ee2e,
+	0x1ee2f,
+	0x1ee30,
+	0x1ee31,
+	0x1ee32,
+	0x1ee34,
+	0x1ee35,
+	0x1ee36,
+	0x1ee37,
+	0x1ee39,
+	0x1ee3b,
+	0x1ee42,
+	0x1ee47,
+	0x1ee49,
+	0x1ee4b,
+	0x1ee4d,
+	0x1ee4e,
+	0x1ee4f,
+	0x1ee51,
+	0x1ee52,
+	0x1ee54,
+	0x1ee57,
+	0x1ee59,
+	0x1ee5b,
+	0x1ee5d,
+	0x1ee5f,
+	0x1ee61,
+	0x1ee62,
+	0x1ee64,
+	0x1ee67,
+	0x1ee68,
+	0x1ee69,
+	0x1ee6a,
+	0x1ee6c,
+	0x1ee6d,
+	0x1ee6e,
+	0x1ee6f,
+	0x1ee70,
+	0x1ee71,
+	0x1ee72,
+	0x1ee74,
+	0x1ee75,
+	0x1ee76,
+	0x1ee77,
+	0x1ee79,
+	0x1ee7a,
+	0x1ee7b,
+	0x1ee7c,
+	0x1ee7e,
+	0x1ee80,
+	0x1ee81,
+	0x1ee82,
+	0x1ee83,
+	0x1ee84,
+	0x1ee85,
+	0x1ee86,
+	0x1ee87,
+	0x1ee88,
+	0x1ee89,
+	0x1ee8b,
+	0x1ee8c,
+	0x1ee8d,
+	0x1ee8e,
+	0x1ee8f,
+	0x1ee90,
+	0x1ee91,
+	0x1ee92,
+	0x1ee93,
+	0x1ee94,
+	0x1ee95,
+	0x1ee96,
+	0x1ee97,
+	0x1ee98,
+	0x1ee99,
+	0x1ee9a,
+	0x1ee9b,
+	0x1eea1,
+	0x1eea2,
+	0x1eea3,
+	0x1eea5,
+	0x1eea6,
+	0x1eea7,
+	0x1eea8,
+	0x1eea9,
+	0x1eeab,
+	0x1eeac,
+	0x1eead,
+	0x1eeae,
+	0x1eeaf,
+	0x1eeb0,
+	0x1eeb1,
+	0x1eeb2,
+	0x1eeb3,
+	0x1eeb4,
+	0x1eeb5,
+	0x1eeb6,
+	0x1eeb7,
+	0x1eeb8,
+	0x1eeb9,
+	0x1eeba,
+	0x1eebb,
+	0x1f100,
+	0x1f101,
+	0x1f102,
+	0x1f103,
+	0x1f104,
+	0x1f105,
+	0x1f106,
+	0x1f107,
+	0x1f108,
+	0x1f109,
+	0x1f10a,
+	0x1f10f,
+	0x1f110,
+	0x1f111,
+	0x1f112,
+	0x1f113,
+	0x1f114,
+	0x1f115,
+	0x1f116,
+	0x1f117,
+	0x1f118,
+	0x1f119,
+	0x1f11a,
+	0x1f11b,
+	0x1f11c,
+	0x1f11d,
+	0x1f11e,
+	0x1f11f,
+	0x1f120,
+	0x1f121,
+	0x1f122,
+	0x1f123,
+	0x1f124,
+	0x1f125,
+	0x1f126,
+	0x1f127,
+	0x1f128,
+	0x1f129,
+	0x1f12a,
+	0x1f16d,
+	0x1f16e,
+	0x1f240,
+	0x1f241,
+	0x1f242,
+	0x1f243,
+	0x1f244,
+	0x1f245,
+	0x1f246,
+	0x1f247,
+	0x1f248,
+	0x1f312,
+	0x1f318,
+	0x1f319,
+	0x1f700,
+	0x1f701,
+	0x1f702,
+	0x1f704,
+	0x1f707,
+	0x1f708,
+	0x1f70a,
+	0x1f714,
+	0x1f728,
+	0x1f73a,
+	0x1f74c,
+	0x1f754,
+	0x1f755,
+	0x1f75c,
+	0x1f75e,
+	0x1f768,
+	0x1f76b,
+	0x1f76c,
+	0x1f771,
+	0x1fbf0,
+	0x1fbf1,
+	0x1fbf2,
+	0x1fbf3,
+	0x1fbf4,
+	0x1fbf5,
+	0x1fbf6,
+	0x1fbf7,
+	0x1fbf8,
+	0x1fbf9,
+	0x21fe8,
+	0x2f800,
+	0x2f801,
+	0x2f802,
+	0x2f803,
+	0x2f804,
+	0x2f805,
+	0x2f806,
+	0x2f807,
+	0x2f808,
+	0x2f809,
+	0x2f80a,
+	0x2f80b,
+	0x2f80c,
+	0x2f80d,
+	0x2f80e,
+	0x2f80f,
+	0x2f810,
+	0x2f811,
+	0x2f812,
+	0x2f813,
+	0x2f814,
+	0x2f815,
+	0x2f816,
+	0x2f817,
+	0x2f818,
+	0x2f819,
+	0x2f81a,
+	0x2f81b,
+	0x2f81c,
+	0x2f81d,
+	0x2f81e,
+	0x2f81f,
+	0x2f820,
+	0x2f821,
+	0x2f822,
+	0x2f823,
+	0x2f824,
+	0x2f825,
+	0x2f826,
+	0x2f827,
+	0x2f828,
+	0x2f829,
+	0x2f82a,
+	0x2f82b,
+	0x2f82c,
+	0x2f82d,
+	0x2f82e,
+	0x2f82f,
+	0x2f830,
+	0x2f831,
+	0x2f832,
+	0x2f833,
+	0x2f834,
+	0x2f835,
+	0x2f836,
+	0x2f837,
+	0x2f838,
+	0x2f839,
+	0x2f83a,
+	0x2f83b,
+	0x2f83c,
+	0x2f83d,
+	0x2f83e,
+	0x2f83f,
+	0x2f840,
+	0x2f841,
+	0x2f842,
+	0x2f843,
+	0x2f844,
+	0x2f845,
+	0x2f846,
+	0x2f847,
+	0x2f848,
+	0x2f849,
+	0x2f84a,
+	0x2f84b,
+	0x2f84c,
+	0x2f84d,
+	0x2f84e,
+	0x2f84f,
+	0x2f850,
+	0x2f851,
+	0x2f852,
+	0x2f853,
+	0x2f854,
+	0x2f855,
+	0x2f856,
+	0x2f857,
+	0x2f858,
+	0x2f859,
+	0x2f85a,
+	0x2f85b,
+	0x2f85c,
+	0x2f85d,
+	0x2f85e,
+	0x2f85f,
+	0x2f860,
+	0x2f861,
+	0x2f862,
+	0x2f863,
+	0x2f864,
+	0x2f865,
+	0x2f866,
+	0x2f867,
+	0x2f868,
+	0x2f869,
+	0x2f86a,
+	0x2f86b,
+	0x2f86c,
+	0x2f86d,
+	0x2f86e,
+	0x2f86f,
+	0x2f870,
+	0x2f871,
+	0x2f872,
+	0x2f873,
+	0x2f874,
+	0x2f875,
+	0x2f876,
+	0x2f877,
+	0x2f878,
+	0x2f879,
+	0x2f87a,
+	0x2f87b,
+	0x2f87c,
+	0x2f87d,
+	0x2f87e,
+	0x2f87f,
+	0x2f880,
+	0x2f881,
+	0x2f882,
+	0x2f883,
+	0x2f884,
+	0x2f885,
+	0x2f886,
+	0x2f887,
+	0x2f888,
+	0x2f889,
+	0x2f88a,
+	0x2f88b,
+	0x2f88c,
+	0x2f88d,
+	0x2f88e,
+	0x2f88f,
+	0x2f890,
+	0x2f891,
+	0x2f892,
+	0x2f893,
+	0x2f894,
+	0x2f895,
+	0x2f896,
+	0x2f897,
+	0x2f898,
+	0x2f899,
+	0x2f89a,
+	0x2f89b,
+	0x2f89c,
+	0x2f89d,
+	0x2f89e,
+	0x2f89f,
+	0x2f8a0,
+	0x2f8a1,
+	0x2f8a2,
+	0x2f8a3,
+	0x2f8a4,
+	0x2f8a5,
+	0x2f8a6,
+	0x2f8a7,
+	0x2f8a8,
+	0x2f8a9,
+	0x2f8aa,
+	0x2f8ab,
+	0x2f8ac,
+	0x2f8ad,
+	0x2f8ae,
+	0x2f8af,
+	0x2f8b0,
+	0x2f8b1,
+	0x2f8b2,
+	0x2f8b3,
+	0x2f8b4,
+	0x2f8b5,
+	0x2f8b6,
+	0x2f8b7,
+	0x2f8b8,
+	0x2f8b9,
+	0x2f8ba,
+	0x2f8bb,
+	0x2f8bc,
+	0x2f8bd,
+	0x2f8be,
+	0x2f8bf,
+	0x2f8c0,
+	0x2f8c1,
+	0x2f8c2,
+	0x2f8c3,
+	0x2f8c4,
+	0x2f8c5,
+	0x2f8c6,
+	0x2f8c7,
+	0x2f8c8,
+	0x2f8c9,
+	0x2f8ca,
+	0x2f8cb,
+	0x2f8cc,
+	0x2f8cd,
+	0x2f8ce,
+	0x2f8cf,
+	0x2f8d0,
+	0x2f8d1,
+	0x2f8d2,
+	0x2f8d3,
+	0x2f8d4,
+	0x2f8d5,
+	0x2f8d6,
+	0x2f8d7,
+	0x2f8d8,
+	0x2f8d9,
+	0x2f8da,
+	0x2f8db,
+	0x2f8dc,
+	0x2f8dd,
+	0x2f8de,
+	0x2f8df,
+	0x2f8e0,
+	0x2f8e1,
+	0x2f8e2,
+	0x2f8e3,
+	0x2f8e4,
+	0x2f8e5,
+	0x2f8e6,
+	0x2f8e7,
+	0x2f8e8,
+	0x2f8e9,
+	0x2f8ea,
+	0x2f8eb,
+	0x2f8ec,
+	0x2f8ed,
+	0x2f8ee,
+	0x2f8ef,
+	0x2f8f0,
+	0x2f8f1,
+	0x2f8f2,
+	0x2f8f3,
+	0x2f8f4,
+	0x2f8f5,
+	0x2f8f6,
+	0x2f8f7,
+	0x2f8f8,
+	0x2f8f9,
+	0x2f8fa,
+	0x2f8fb,
+	0x2f8fc,
+	0x2f8fd,
+	0x2f8fe,
+	0x2f8ff,
+	0x2f900,
+	0x2f901,
+	0x2f902,
+	0x2f903,
+	0x2f904,
+	0x2f905,
+	0x2f906,
+	0x2f907,
+	0x2f908,
+	0x2f909,
+	0x2f90a,
+	0x2f90b,
+	0x2f90c,
+	0x2f90d,
+	0x2f90e,
+	0x2f90f,
+	0x2f910,
+	0x2f911,
+	0x2f912,
+	0x2f913,
+	0x2f914,
+	0x2f915,
+	0x2f916,
+	0x2f917,
+	0x2f918,
+	0x2f919,
+	0x2f91a,
+	0x2f91b,
+	0x2f91c,
+	0x2f91d,
+	0x2f91e,
+	0x2f91f,
+	0x2f920,
+	0x2f921,
+	0x2f922,
+	0x2f923,
+	0x2f924,
+	0x2f925,
+	0x2f926,
+	0x2f927,
+	0x2f928,
+	0x2f929,
+	0x2f92a,
+	0x2f92b,
+	0x2f92c,
+	0x2f92d,
+	0x2f92e,
+	0x2f92f,
+	0x2f930,
+	0x2f931,
+	0x2f932,
+	0x2f933,
+	0x2f934,
+	0x2f935,
+	0x2f936,
+	0x2f937,
+	0x2f938,
+	0x2f939,
+	0x2f93a,
+	0x2f93b,
+	0x2f93c,
+	0x2f93d,
+	0x2f93e,
+	0x2f93f,
+	0x2f940,
+	0x2f941,
+	0x2f942,
+	0x2f943,
+	0x2f944,
+	0x2f945,
+	0x2f946,
+	0x2f947,
+	0x2f948,
+	0x2f949,
+	0x2f94a,
+	0x2f94b,
+	0x2f94c,
+	0x2f94d,
+	0x2f94e,
+	0x2f94f,
+	0x2f950,
+	0x2f951,
+	0x2f952,
+	0x2f953,
+	0x2f954,
+	0x2f955,
+	0x2f956,
+	0x2f957,
+	0x2f958,
+	0x2f959,
+	0x2f95a,
+	0x2f95b,
+	0x2f95c,
+	0x2f95d,
+	0x2f95e,
+	0x2f95f,
+	0x2f960,
+	0x2f961,
+	0x2f962,
+	0x2f963,
+	0x2f964,
+	0x2f965,
+	0x2f966,
+	0x2f967,
+	0x2f968,
+	0x2f969,
+	0x2f96a,
+	0x2f96b,
+	0x2f96c,
+	0x2f96d,
+	0x2f96e,
+	0x2f96f,
+	0x2f970,
+	0x2f971,
+	0x2f972,
+	0x2f973,
+	0x2f974,
+	0x2f975,
+	0x2f976,
+	0x2f977,
+	0x2f978,
+	0x2f979,
+	0x2f97a,
+	0x2f97b,
+	0x2f97c,
+	0x2f97d,
+	0x2f97e,
+	0x2f97f,
+	0x2f980,
+	0x2f981,
+	0x2f982,
+	0x2f983,
+	0x2f984,
+	0x2f985,
+	0x2f986,
+	0x2f987,
+	0x2f988,
+	0x2f989,
+	0x2f98a,
+	0x2f98b,
+	0x2f98c,
+	0x2f98d,
+	0x2f98e,
+	0x2f98f,
+	0x2f990,
+	0x2f991,
+	0x2f992,
+	0x2f993,
+	0x2f994,
+	0x2f995,
+	0x2f996,
+	0x2f997,
+	0x2f998,
+	0x2f999,
+	0x2f99a,
+	0x2f99b,
+	0x2f99c,
+	0x2f99d,
+	0x2f99e,
+	0x2f99f,
+	0x2f9a0,
+	0x2f9a1,
+	0x2f9a2,
+	0x2f9a3,
+	0x2f9a4,
+	0x2f9a5,
+	0x2f9a6,
+	0x2f9a7,
+	0x2f9a8,
+	0x2f9a9,
+	0x2f9aa,
+	0x2f9ab,
+	0x2f9ac,
+	0x2f9ad,
+	0x2f9ae,
+	0x2f9af,
+	0x2f9b0,
+	0x2f9b1,
+	0x2f9b2,
+	0x2f9b3,
+	0x2f9b4,
+	0x2f9b5,
+	0x2f9b6,
+	0x2f9b7,
+	0x2f9b8,
+	0x2f9b9,
+	0x2f9ba,
+	0x2f9bb,
+	0x2f9bc,
+	0x2f9bd,
+	0x2f9be,
+	0x2f9bf,
+	0x2f9c0,
+	0x2f9c1,
+	0x2f9c2,
+	0x2f9c3,
+	0x2f9c4,
+	0x2f9c5,
+	0x2f9c6,
+	0x2f9c7,
+	0x2f9c8,
+	0x2f9c9,
+	0x2f9ca,
+	0x2f9cb,
+	0x2f9cc,
+	0x2f9cd,
+	0x2f9ce,
+	0x2f9cf,
+	0x2f9d0,
+	0x2f9d1,
+	0x2f9d2,
+	0x2f9d3,
+	0x2f9d4,
+	0x2f9d5,
+	0x2f9d6,
+	0x2f9d7,
+	0x2f9d8,
+	0x2f9d9,
+	0x2f9da,
+	0x2f9db,
+	0x2f9dc,
+	0x2f9dd,
+	0x2f9de,
+	0x2f9df,
+	0x2f9e0,
+	0x2f9e1,
+	0x2f9e2,
+	0x2f9e3,
+	0x2f9e4,
+	0x2f9e5,
+	0x2f9e6,
+	0x2f9e7,
+	0x2f9e8,
+	0x2f9e9,
+	0x2f9ea,
+	0x2f9eb,
+	0x2f9ec,
+	0x2f9ed,
+	0x2f9ee,
+	0x2f9ef,
+	0x2f9f0,
+	0x2f9f1,
+	0x2f9f2,
+	0x2f9f3,
+	0x2f9f4,
+	0x2f9f5,
+	0x2f9f6,
+	0x2f9f7,
+	0x2f9f8,
+	0x2f9f9,
+	0x2f9fa,
+	0x2f9fb,
+	0x2f9fc,
+	0x2f9fd,
+	0x2f9fe,
+	0x2f9ff,
+	0x2fa00,
+	0x2fa01,
+	0x2fa02,
+	0x2fa03,
+	0x2fa04,
+	0x2fa05,
+	0x2fa06,
+	0x2fa07,
+	0x2fa08,
+	0x2fa09,
+	0x2fa0a,
+	0x2fa0b,
+	0x2fa0c,
+	0x2fa0d,
+	0x2fa0e,
+	0x2fa0f,
+	0x2fa10,
+	0x2fa11,
+	0x2fa12,
+	0x2fa13,
+	0x2fa14,
+	0x2fa15,
+	0x2fa16,
+	0x2fa17,
+	0x2fa18,
+	0x2fa19,
+	0x2fa1a,
+	0x2fa1b,
+	0x2fa1c,
+	0x2fa1d,
+	0xe0001,
+	0xe0020,
+	0xe0021,
+	0xe0022,
+	0xe0023,
+	0xe0024,
+	0xe0025,
+	0xe0026,
+	0xe0027,
+	0xe0028,
+	0xe0029,
+	0xe002a,
+	0xe002b,
+	0xe002c,
+	0xe002d,
+	0xe002e,
+	0xe002f,
+	0xe0030,
+	0xe0031,
+	0xe0032,
+	0xe0033,
+	0xe0034,
+	0xe0035,
+	0xe0036,
+	0xe0037,
+	0xe0038,
+	0xe0039,
+	0xe003a,
+	0xe003b,
+	0xe003c,
+	0xe003d,
+	0xe003e,
+	0xe003f,
+	0xe0040,
+	0xe0041,
+	0xe0042,
+	0xe0043,
+	0xe0044,
+	0xe0045,
+	0xe0046,
+	0xe0047,
+	0xe0048,
+	0xe0049,
+	0xe004a,
+	0xe004b,
+	0xe004c,
+	0xe004d,
+	0xe004e,
+	0xe004f,
+	0xe0050,
+	0xe0051,
+	0xe0052,
+	0xe0053,
+	0xe0054,
+	0xe0055,
+	0xe0056,
+	0xe0057,
+	0xe0058,
+	0xe0059,
+	0xe005a,
+	0xe005b,
+	0xe005c,
+	0xe005d,
+	0xe005e,
+	0xe005f,
+	0xe0060,
+	0xe0061,
+	0xe0062,
+	0xe0063,
+	0xe0064,
+	0xe0065,
+	0xe0066,
+	0xe0067,
+	0xe0068,
+	0xe0069,
+	0xe006a,
+	0xe006b,
+	0xe006c,
+	0xe006d,
+	0xe006e,
+	0xe006f,
+	0xe0070,
+	0xe0071,
+	0xe0072,
+	0xe0073,
+	0xe0074,
+	0xe0075,
+	0xe0076,
+	0xe0077,
+	0xe0078,
+	0xe0079,
+	0xe007a,
+	0xe007b,
+	0xe007c,
+	0xe007d,
+	0xe007e,
+	0xe007f,
+	0xe0100,
+	0xe0101,
+	0xe0102,
+	0xe0103,
+	0xe0104,
+	0xe0105,
+	0xe0106,
+	0xe0107,
+	0xe0108,
+	0xe0109,
+	0xe010a,
+	0xe010b,
+	0xe010c,
+	0xe010d,
+	0xe010e,
+	0xe010f,
+	0xe0110,
+	0xe0111,
+	0xe0112,
+	0xe0113,
+	0xe0114,
+	0xe0115,
+	0xe0116,
+	0xe0117,
+	0xe0118,
+	0xe0119,
+	0xe011a,
+	0xe011b,
+	0xe011c,
+	0xe011d,
+	0xe011e,
+	0xe011f,
+	0xe0120,
+	0xe0121,
+	0xe0122,
+	0xe0123,
+	0xe0124,
+	0xe0125,
+	0xe0126,
+	0xe0127,
+	0xe0128,
+	0xe0129,
+	0xe012a,
+	0xe012b,
+	0xe012c,
+	0xe012d,
+	0xe012e,
+	0xe012f,
+	0xe0130,
+	0xe0131,
+	0xe0132,
+	0xe0133,
+	0xe0134,
+	0xe0135,
+	0xe0136,
+	0xe0137,
+	0xe0138,
+	0xe0139,
+	0xe013a,
+	0xe013b,
+	0xe013c,
+	0xe013d,
+	0xe013e,
+	0xe013f,
+	0xe0140,
+	0xe0141,
+	0xe0142,
+	0xe0143,
+	0xe0144,
+	0xe0145,
+	0xe0146,
+	0xe0147,
+	0xe0148,
+	0xe0149,
+	0xe014a,
+	0xe014b,
+	0xe014c,
+	0xe014d,
+	0xe014e,
+	0xe014f,
+	0xe0150,
+	0xe0151,
+	0xe0152,
+	0xe0153,
+	0xe0154,
+	0xe0155,
+	0xe0156,
+	0xe0157,
+	0xe0158,
+	0xe0159,
+	0xe015a,
+	0xe015b,
+	0xe015c,
+	0xe015d,
+	0xe015e,
+	0xe015f,
+	0xe0160,
+	0xe0161,
+	0xe0162,
+	0xe0163,
+	0xe0164,
+	0xe0165,
+	0xe0166,
+	0xe0167,
+	0xe0168,
+	0xe0169,
+	0xe016a,
+	0xe016b,
+	0xe016c,
+	0xe016d,
+	0xe016e,
+	0xe016f,
+	0xe0170,
+	0xe0171,
+	0xe0172,
+	0xe0173,
+	0xe0174,
+	0xe0175,
+	0xe0176,
+	0xe0177,
+	0xe0178,
+	0xe0179,
+	0xe017a,
+	0xe017b,
+	0xe017c,
+	0xe017d,
+	0xe017e,
+	0xe017f,
+	0xe0180,
+	0xe0181,
+	0xe0182,
+	0xe0183,
+	0xe0184,
+	0xe0185,
+	0xe0186,
+	0xe0187,
+	0xe0188,
+	0xe0189,
+	0xe018a,
+	0xe018b,
+	0xe018c,
+	0xe018d,
+	0xe018e,
+	0xe018f,
+	0xe0190,
+	0xe0191,
+	0xe0192,
+	0xe0193,
+	0xe0194,
+	0xe0195,
+	0xe0196,
+	0xe0197,
+	0xe0198,
+	0xe0199,
+	0xe019a,
+	0xe019b,
+	0xe019c,
+	0xe019d,
+	0xe019e,
+	0xe019f,
+	0xe01a0,
+	0xe01a1,
+	0xe01a2,
+	0xe01a3,
+	0xe01a4,
+	0xe01a5,
+	0xe01a6,
+	0xe01a7,
+	0xe01a8,
+	0xe01a9,
+	0xe01aa,
+	0xe01ab,
+	0xe01ac,
+	0xe01ad,
+	0xe01ae,
+	0xe01af,
+	0xe01b0,
+	0xe01b1,
+	0xe01b2,
+	0xe01b3,
+	0xe01b4,
+	0xe01b5,
+	0xe01b6,
+	0xe01b7,
+	0xe01b8,
+	0xe01b9,
+	0xe01ba,
+	0xe01bb,
+	0xe01bc,
+	0xe01bd,
+	0xe01be,
+	0xe01bf,
+	0xe01c0,
+	0xe01c1,
+	0xe01c2,
+	0xe01c3,
+	0xe01c4,
+	0xe01c5,
+	0xe01c6,
+	0xe01c7,
+	0xe01c8,
+	0xe01c9,
+	0xe01ca,
+	0xe01cb,
+	0xe01cc,
+	0xe01cd,
+	0xe01ce,
+	0xe01cf,
+	0xe01d0,
+	0xe01d1,
+	0xe01d2,
+	0xe01d3,
+	0xe01d4,
+	0xe01d5,
+	0xe01d6,
+	0xe01d7,
+	0xe01d8,
+	0xe01d9,
+	0xe01da,
+	0xe01db,
+	0xe01dc,
+	0xe01dd,
+	0xe01de,
+	0xe01df,
+	0xe01e0,
+	0xe01e1,
+	0xe01e2,
+	0xe01e3,
+	0xe01e4,
+	0xe01e5,
+	0xe01e6,
+	0xe01e7,
+	0xe01e8,
+	0xe01e9,
+	0xe01ea,
+	0xe01eb,
+	0xe01ec,
+	0xe01ed,
+	0xe01ee,
+	0xe01ef,
+	0xf0000,
+	0xffffd,
+	0x100000,
+	0x10fffd,
+};
+
+const struct DECOMP_SLICE decomp_slices[NUM_DECOMPS] = {
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{8, 2},
+	{1284, 3},
+	{734, 1},
+	{855, 1},
+	{855, 1},
+	{7, 1},
+	{855, 1},
+	{1045, 2},
+	{855, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{824, 1},
+	{789, 1},
+	{0, 0},
+	{1358, 1},
+	{7, 1},
+	{1385, 1},
+	{482, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{683, 2},
+	{696, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{699, 1},
+	{727, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{1080, 1},
+	{734, 1},
+	{763, 1},
+	{763, 1},
+	{763, 1},
+	{763, 1},
+	{789, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{807, 2},
+	{824, 1},
+	{842, 1},
+	{842, 1},
+	{842, 1},
+	{842, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{3093, 1},
+	{1011, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1086, 1},
+	{1086, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{696, 1},
+	{824, 1},
+	{696, 1},
+	{824, 1},
+	{696, 1},
+	{824, 1},
+	{696, 1},
+	{824, 1},
+	{699, 1},
+	{831, 1},
+	{699, 1},
+	{831, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{709, 1},
+	{853, 1},
+	{709, 1},
+	{853, 1},
+	{709, 1},
+	{853, 1},
+	{709, 1},
+	{853, 1},
+	{712, 1},
+	{854, 1},
+	{712, 1},
+	{854, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{937, 2},
+	{977, 2},
+	{713, 1},
+	{1009, 1},
+	{716, 1},
+	{1010, 1},
+	{719, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{989, 2},
+	{989, 2},
+	{719, 1},
+	{855, 1},
+	{727, 1},
+	{1011, 1},
+	{727, 1},
+	{1011, 1},
+	{727, 1},
+	{1011, 1},
+	{27, 2},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{741, 2},
+	{1017, 2},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{757, 1},
+	{1053, 1},
+	{757, 1},
+	{1053, 1},
+	{757, 1},
+	{1053, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{782, 1},
+	{1079, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{790, 1},
+	{1087, 1},
+	{790, 1},
+	{1087, 1},
+	{790, 1},
+	{1087, 1},
+	{843, 1},
+	{817, 1},
+	{17, 2},
+	{817, 1},
+	{817, 1},
+	{817, 1},
+	{697, 2},
+	{699, 1},
+	{19, 2},
+	{831, 1},
+	{853, 1},
+	{705, 1},
+	{843, 1},
+	{710, 2},
+	{855, 1},
+	{855, 1},
+	{717, 2},
+	{1010, 1},
+	{855, 1},
+	{727, 1},
+	{1011, 1},
+	{734, 1},
+	{734, 1},
+	{1014, 1},
+	{21, 2},
+	{1038, 1},
+	{753, 1},
+	{500, 1},
+	{23, 2},
+	{1053, 1},
+	{757, 1},
+	{763, 1},
+	{1064, 1},
+	{25, 2},
+	{1086, 1},
+	{790, 1},
+	{1087, 1},
+	{559, 1},
+	{500, 1},
+	{589, 1},
+	{1047, 1},
+	{1299, 1},
+	{855, 1},
+	{957, 2},
+	{0, 1},
+	{700, 2},
+	{702, 2},
+	{834, 2},
+	{720, 2},
+	{722, 2},
+	{977, 2},
+	{728, 2},
+	{730, 2},
+	{1012, 2},
+	{680, 1},
+	{798, 1},
+	{855, 1},
+	{855, 1},
+	{734, 1},
+	{1014, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{683, 2},
+	{807, 2},
+	{709, 1},
+	{853, 1},
+	{709, 1},
+	{853, 1},
+	{716, 1},
+	{1010, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{559, 1},
+	{1318, 1},
+	{1009, 1},
+	{700, 2},
+	{702, 2},
+	{834, 2},
+	{709, 1},
+	{853, 1},
+	{727, 1},
+	{1011, 1},
+	{680, 1},
+	{798, 1},
+	{683, 2},
+	{807, 2},
+	{734, 1},
+	{1014, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{756, 1},
+	{1047, 1},
+	{757, 1},
+	{1053, 1},
+	{559, 1},
+	{712, 1},
+	{854, 1},
+	{622, 1},
+	{622, 1},
+	{790, 1},
+	{1087, 1},
+	{680, 1},
+	{798, 1},
+	{704, 1},
+	{842, 1},
+	{734, 1},
+	{1489, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{789, 1},
+	{1086, 1},
+	{824, 1},
+	{757, 1},
+	{675, 1},
+	{763, 1},
+	{704, 1},
+	{842, 1},
+	{713, 1},
+	{1009, 1},
+	{1042, 1},
+	{789, 1},
+	{1086, 1},
+	{798, 1},
+	{817, 1},
+	{831, 1},
+	{831, 1},
+	{1312, 1},
+	{1315, 2},
+	{4414, 1},
+	{853, 1},
+	{853, 1},
+	{1086, 1},
+	{854, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{991, 2},
+	{1079, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1036, 2},
+	{1042, 1},
+	{1042, 1},
+	{1047, 1},
+	{1064, 1},
+	{1086, 1},
+	{1087, 1},
+	{1318, 1},
+	{675, 1},
+	{1041, 1},
+	{834, 2},
+	{838, 2},
+	{840, 2},
+	{1056, 2},
+	{1062, 2},
+	{1060, 2},
+	{851, 2},
+	{979, 2},
+	{987, 2},
+	{3037, 1},
+	{7, 1},
+	{8, 2},
+	{7, 1},
+	{7, 1},
+	{7, 1},
+	{7, 1},
+	{1424, 1},
+	{651, 1},
+	{665, 1},
+	{796, 1},
+	{796, 1},
+	{7, 1},
+	{7, 1},
+	{7, 1},
+	{644, 1},
+	{1424, 1},
+	{483, 1},
+	{1357, 1},
+	{2065, 1},
+	{1095, 1},
+	{855, 1},
+	{1090, 1},
+	{8, 2},
+	{3036, 1},
+	{3038, 1},
+	{1356, 1},
+	{8, 2},
+	{7, 1},
+	{8, 2},
+	{644, 1},
+	{1365, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3205, 1},
+	{7, 1},
+	{1364, 1},
+	{1398, 1},
+	{3064, 1},
+	{855, 1},
+	{1325, 1},
+	{4409, 1},
+	{650, 1},
+	{713, 1},
+	{7, 1},
+	{1092, 1},
+	{680, 1},
+	{1101, 1},
+	{704, 1},
+	{712, 1},
+	{855, 1},
+	{734, 1},
+	{789, 1},
+	{1382, 1},
+	{855, 1},
+	{680, 1},
+	{695, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{783, 1},
+	{855, 1},
+	{789, 1},
+	{798, 1},
+	{4414, 1},
+	{1011, 1},
+	{855, 1},
+	{1064, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1069, 1},
+	{1014, 1},
+	{1038, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{855, 1},
+	{1064, 1},
+	{1014, 1},
+	{1064, 1},
+	{1391, 1},
+	{1297, 1},
+	{734, 1},
+	{789, 1},
+	{789, 1},
+	{789, 1},
+	{1333, 1},
+	{1387, 1},
+	{1388, 1},
+	{705, 1},
+	{500, 1},
+	{1308, 1},
+	{1300, 1},
+	{1038, 1},
+	{824, 1},
+	{1009, 1},
+	{734, 1},
+	{4414, 1},
+	{1296, 1},
+	{1299, 1},
+	{696, 1},
+	{724, 1},
+	{1304, 1},
+	{4408, 1},
+	{704, 1},
+	{704, 1},
+	{1368, 1},
+	{4413, 1},
+	{756, 1},
+	{855, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{1398, 1},
+	{789, 1},
+	{680, 1},
+	{817, 1},
+	{695, 1},
+	{1368, 1},
+	{704, 1},
+	{559, 1},
+	{1398, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{712, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{696, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{820, 2},
+	{817, 1},
+	{939, 2},
+	{798, 1},
+	{600, 1},
+	{1351, 1},
+	{1042, 1},
+	{842, 1},
+	{1328, 1},
+	{3064, 1},
+	{3064, 1},
+	{1300, 1},
+	{1349, 1},
+	{1353, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{824, 1},
+	{3067, 1},
+	{1086, 1},
+	{1333, 1},
+	{1080, 1},
+	{1359, 2},
+	{1302, 2},
+	{1301, 1},
+	{3066, 1},
+	{842, 1},
+	{842, 1},
+	{1042, 1},
+	{4414, 1},
+	{1047, 1},
+	{855, 1},
+	{855, 1},
+	{1009, 1},
+	{854, 1},
+	{1300, 1},
+	{3064, 1},
+	{1086, 1},
+	{1079, 1},
+	{817, 1},
+	{817, 1},
+	{1381, 1},
+	{1390, 1},
+	{734, 1},
+	{1014, 1},
+	{768, 1},
+	{1069, 1},
+	{768, 1},
+	{1069, 1},
+	{1410, 1},
+	{1079, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1398, 1},
+	{3064, 1},
+	{817, 1},
+	{817, 1},
+	{1369, 2},
+	{1043, 2},
+	{1368, 1},
+	{1042, 1},
+	{1397, 1},
+	{1404, 1},
+	{559, 1},
+	{1328, 1},
+	{716, 1},
+	{1300, 1},
+	{716, 1},
+	{1300, 1},
+	{712, 1},
+	{1353, 1},
+	{696, 1},
+	{824, 1},
+	{757, 1},
+	{3067, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{783, 1},
+	{854, 1},
+	{842, 1},
+	{1415, 1},
+	{842, 1},
+	{855, 1},
+	{1397, 1},
+	{1404, 1},
+	{1321, 1},
+	{1405, 1},
+	{712, 1},
+	{1353, 1},
+	{712, 1},
+	{1353, 1},
+	{1413, 1},
+	{1414, 1},
+	{724, 1},
+	{1349, 1},
+	{855, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{683, 2},
+	{807, 2},
+	{704, 1},
+	{842, 1},
+	{1306, 1},
+	{1312, 1},
+	{1306, 1},
+	{1312, 1},
+	{1397, 1},
+	{1404, 1},
+	{559, 1},
+	{1328, 1},
+	{559, 1},
+	{1318, 1},
+	{1398, 1},
+	{3064, 1},
+	{1398, 1},
+	{3064, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{1403, 1},
+	{1408, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{1399, 1},
+	{1406, 1},
+	{820, 2},
+	{1302, 2},
+	{831, 1},
+	{1317, 1},
+	{709, 1},
+	{1330, 1},
+	{1307, 1},
+	{4414, 1},
+	{1041, 1},
+	{782, 1},
+	{1079, 1},
+	{2763, 1},
+	{2761, 1},
+	{2764, 1},
+	{2762, 1},
+	{763, 1},
+	{756, 1},
+	{1380, 1},
+	{734, 1},
+	{7, 1},
+	{7, 1},
+	{1079, 1},
+	{1041, 1},
+	{1041, 1},
+	{3071, 1},
+	{854, 1},
+	{1319, 1},
+	{1011, 1},
+	{1331, 1},
+	{1011, 1},
+	{1064, 1},
+	{853, 1},
+	{843, 1},
+	{1014, 1},
+	{1425, 2},
+	{644, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{0, 0},
+	{0, 0},
+	{644, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{1069, 1},
+	{7, 1},
+	{855, 1},
+	{1014, 1},
+	{957, 2},
+	{856, 2},
+	{8, 2},
+	{7, 1},
+	{8, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1287, 4},
+	{1291, 5},
+	{482, 1},
+	{1721, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{855, 1},
+	{1938, 1},
+	{855, 1},
+	{1945, 1},
+	{855, 1},
+	{1945, 1},
+	{1596, 1},
+	{1945, 1},
+	{1945, 1},
+	{1014, 1},
+	{1945, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{486, 1},
+	{855, 1},
+	{1014, 1},
+	{768, 1},
+	{1321, 1},
+	{1284, 3},
+	{482, 1},
+	{1460, 1},
+	{478, 1},
+	{1945, 1},
+	{2032, 1},
+	{0, 0},
+	{1001, 2},
+	{855, 1},
+	{1001, 2},
+	{1943, 2},
+	{1943, 2},
+	{1976, 2},
+	{1945, 1},
+	{1945, 1},
+	{1562, 1},
+	{1562, 1},
+	{1584, 1},
+	{2028, 1},
+	{1584, 1},
+	{1586, 1},
+	{1586, 1},
+	{1586, 1},
+	{1641, 1},
+	{1702, 1},
+	{2032, 1},
+	{1754, 1},
+	{2032, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{2036, 1},
+	{1811, 1},
+	{1811, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1489, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1945, 1},
+	{1945, 1},
+	{2021, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{483, 1},
+	{1014, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1584, 1},
+	{1586, 1},
+	{486, 1},
+	{855, 1},
+	{2014, 1},
+	{2015, 1},
+	{2016, 1},
+	{1014, 1},
+	{2017, 1},
+	{768, 1},
+	{1321, 1},
+	{2018, 1},
+	{1463, 1},
+	{1853, 1},
+	{1014, 1},
+	{486, 1},
+	{486, 1},
+	{644, 1},
+	{644, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1464, 1},
+	{1945, 1},
+	{2035, 1},
+	{1790, 1},
+	{2040, 1},
+	{1903, 1},
+	{1903, 1},
+	{1586, 1},
+	{2031, 1},
+	{1562, 1},
+	{1596, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{734, 1},
+	{855, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{7, 1},
+	{7, 1},
+	{797, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1464, 1},
+	{2033, 1},
+	{1853, 1},
+	{1945, 1},
+	{2040, 1},
+	{1584, 1},
+	{1641, 1},
+	{2036, 1},
+	{1938, 1},
+	{1595, 1},
+	{1464, 1},
+	{1945, 1},
+	{1586, 1},
+	{1945, 1},
+	{2032, 1},
+	{2032, 1},
+	{1945, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{644, 1},
+	{2041, 1},
+	{2041, 1},
+	{2053, 2},
+	{2042, 1},
+	{2042, 1},
+	{2042, 1},
+	{2041, 1},
+	{2041, 1},
+	{2041, 1},
+	{2041, 1},
+	{2049, 1},
+	{2052, 1},
+	{2055, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2043, 1},
+	{2044, 1},
+	{2045, 1},
+	{2046, 1},
+	{2047, 1},
+	{2048, 1},
+	{2050, 1},
+	{2051, 1},
+	{0, 0},
+	{0, 0},
+	{2058, 2},
+	{1014, 1},
+	{2018, 1},
+	{675, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2066, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2073, 1},
+	{2074, 1},
+	{2084, 1},
+	{2067, 1},
+	{2067, 1},
+	{0, 0},
+	{0, 0},
+	{734, 1},
+	{622, 1},
+	{633, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2093, 1},
+	{2100, 1},
+	{2100, 1},
+	{2101, 1},
+	{2101, 1},
+	{2100, 1},
+	{2093, 1},
+	{2093, 1},
+	{2098, 1},
+	{2099, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2094, 1},
+	{2095, 1},
+	{2096, 1},
+	{2097, 1},
+	{1014, 1},
+	{633, 1},
+	{622, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{644, 1},
+	{2102, 1},
+	{2102, 1},
+	{2102, 1},
+	{2102, 1},
+	{2102, 1},
+	{2102, 1},
+	{2102, 1},
+	{0, 0},
+	{2056, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2060, 1},
+	{2061, 1},
+	{2062, 1},
+	{2063, 1},
+	{2064, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{622, 1},
+	{2103, 1},
+	{734, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2104, 1},
+	{2105, 1},
+	{0, 0},
+	{0, 0},
+	{734, 1},
+	{633, 1},
+	{0, 0},
+	{2109, 2},
+	{2115, 2},
+	{2114, 1},
+	{2107, 1},
+	{2107, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2122, 1},
+	{2107, 1},
+	{2107, 1},
+	{2125, 1},
+	{0, 0},
+	{2125, 1},
+	{1014, 1},
+	{2117, 1},
+	{2108, 1},
+	{2118, 1},
+	{2107, 1},
+	{2118, 1},
+	{2111, 1},
+	{2106, 1},
+	{2124, 1},
+	{2118, 1},
+	{2123, 1},
+	{2129, 1},
+	{2112, 2},
+	{2128, 1},
+	{2121, 1},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{0, 0},
+	{0, 0},
+	{2135, 1},
+	{2135, 1},
+	{2143, 1},
+	{2138, 1},
+	{2140, 1},
+	{2141, 1},
+	{2146, 1},
+	{2146, 1},
+	{2146, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2133, 1},
+	{2134, 1},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{0, 0},
+	{1014, 1},
+	{0, 0},
+	{2130, 1},
+	{2131, 1},
+	{2132, 1},
+	{2135, 1},
+	{2135, 1},
+	{2135, 1},
+	{2136, 1},
+	{2137, 1},
+	{2139, 1},
+	{2142, 1},
+	{2144, 1},
+	{2145, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2150, 1},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2147, 1},
+	{2148, 1},
+	{2149, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{0, 0},
+	{2151, 1},
+	{2108, 1},
+	{2108, 1},
+	{2157, 1},
+	{2152, 1},
+	{2153, 1},
+	{2153, 1},
+	{2157, 1},
+	{2114, 1},
+	{1014, 1},
+	{2120, 1},
+	{2162, 1},
+	{2126, 1},
+	{2127, 1},
+	{2119, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2065, 1},
+	{0, 0},
+	{2160, 2},
+	{1033, 3},
+	{2154, 1},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2162, 1},
+	{2155, 2},
+	{2158, 2},
+	{633, 1},
+	{2163, 2},
+	{2157, 1},
+	{2165, 2},
+	{2157, 1},
+	{2157, 1},
+	{2162, 1},
+	{0, 0},
+	{1014, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2169, 1},
+	{2167, 1},
+	{2168, 1},
+	{2169, 1},
+	{0, 0},
+	{0, 0},
+	{2170, 1},
+	{2174, 1},
+	{2175, 1},
+	{2171, 1},
+	{2171, 1},
+	{2176, 1},
+	{2172, 1},
+	{2182, 1},
+	{0, 0},
+	{2185, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2186, 2},
+	{2185, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2173, 1},
+	{2183, 1},
+	{2177, 1},
+	{2178, 1},
+	{2179, 1},
+	{2180, 1},
+	{2181, 1},
+	{0, 0},
+	{2195, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2191, 2},
+	{2193, 2},
+	{2217, 1},
+	{2213, 1},
+	{2214, 2},
+	{2196, 1},
+	{2197, 2},
+	{0, 0},
+	{0, 0},
+	{2199, 2},
+	{2205, 2},
+	{2201, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2208, 1},
+	{2209, 1},
+	{2210, 1},
+	{2211, 1},
+	{2212, 1},
+	{2207, 1},
+	{2216, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2203, 2},
+	{3493, 1},
+	{3492, 1},
+	{2218, 1},
+	{1014, 1},
+	{1014, 1},
+	{2220, 1},
+	{2222, 1},
+	{2221, 1},
+	{2221, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1014, 1},
+	{2224, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2223, 1},
+	{2220, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2220, 1},
+	{2219, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2226, 1},
+	{2218, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4412, 1},
+	{1086, 1},
+	{1318, 1},
+	{1014, 1},
+	{2228, 2},
+	{2275, 2},
+	{2429, 2},
+	{2487, 2},
+	{2555, 2},
+	{2250, 2},
+	{2252, 2},
+	{2254, 2},
+	{2258, 2},
+	{2273, 2},
+	{2309, 2},
+	{2319, 2},
+	{2370, 2},
+	{2360, 2},
+	{2395, 2},
+	{2405, 2},
+	{2416, 2},
+	{2418, 2},
+	{2420, 2},
+	{2434, 2},
+	{2436, 3},
+	{2439, 3},
+	{2442, 3},
+	{2445, 3},
+	{2448, 3},
+	{2456, 2},
+	{2458, 2},
+	{2462, 2},
+	{2464, 2},
+	{2454, 2},
+	{2431, 3},
+	{2469, 2},
+	{2471, 2},
+	{2473, 2},
+	{2475, 2},
+	{2477, 2},
+	{2479, 2},
+	{2481, 3},
+	{2498, 3},
+	{2501, 2},
+	{2503, 2},
+	{2505, 2},
+	{2507, 2},
+	{2509, 2},
+	{2511, 2},
+	{2370, 2},
+	{2593, 2},
+	{2595, 2},
+	{2516, 2},
+	{2521, 2},
+	{2525, 2},
+	{2527, 2},
+	{2529, 2},
+	{2545, 2},
+	{2531, 2},
+	{2533, 2},
+	{2535, 2},
+	{2539, 2},
+	{2541, 2},
+	{2553, 2},
+	{2608, 2},
+	{2610, 2},
+	{2561, 2},
+	{2563, 2},
+	{2570, 2},
+	{2574, 2},
+	{2591, 2},
+	{2232, 2},
+	{2260, 2},
+	{2262, 2},
+	{2268, 2},
+	{2280, 2},
+	{2623, 2},
+	{2632, 2},
+	{2641, 2},
+	{2650, 2},
+	{2653, 2},
+	{2655, 3},
+	{2680, 2},
+	{2705, 2},
+	{2710, 3},
+	{2720, 2},
+	{3255, 1},
+	{3269, 2},
+	{3358, 1},
+	{2617, 2},
+	{2619, 2},
+	{2626, 2},
+	{2628, 2},
+	{2635, 2},
+	{2637, 2},
+	{2639, 2},
+	{2646, 2},
+	{2648, 2},
+	{2663, 2},
+	{2665, 3},
+	{2670, 3},
+	{2673, 2},
+	{2678, 2},
+	{2688, 2},
+	{2690, 3},
+	{2688, 2},
+	{2695, 2},
+	{2697, 2},
+	{2700, 2},
+	{2702, 3},
+	{2707, 3},
+	{2715, 3},
+	{2718, 2},
+	{2726, 2},
+	{2731, 2},
+	{2733, 3},
+	{2736, 2},
+	{2738, 3},
+	{2743, 2},
+	{2745, 2},
+	{3265, 2},
+	{3267, 2},
+	{3271, 3},
+	{3359, 2},
+	{3361, 2},
+	{3374, 2},
+	{3381, 2},
+	{3387, 2},
+	{3385, 2},
+	{2750, 2},
+	{2755, 2},
+	{2759, 2},
+	{2757, 2},
+	{2621, 2},
+	{2630, 2},
+	{2644, 2},
+	{2658, 2},
+	{2660, 3},
+	{2227, 1},
+	{2228, 2},
+	{2238, 2},
+	{2249, 1},
+	{2262, 2},
+	{2268, 2},
+	{2272, 1},
+	{2297, 1},
+	{2298, 2},
+	{2324, 2},
+	{2335, 2},
+	{2355, 2},
+	{2366, 2},
+	{2368, 2},
+	{2370, 2},
+	{2381, 1},
+	{2415, 1},
+	{2434, 2},
+	{2468, 1},
+	{2487, 2},
+	{2515, 1},
+	{2547, 1},
+	{2560, 1},
+	{2565, 1},
+	{2566, 1},
+	{2569, 1},
+	{2580, 1},
+	{2234, 2},
+	{2240, 3},
+	{2250, 2},
+	{2254, 2},
+	{2260, 2},
+	{2270, 2},
+	{2266, 2},
+	{2273, 2},
+	{2280, 2},
+	{2303, 3},
+	{2309, 2},
+	{2311, 2},
+	{2316, 3},
+	{2319, 2},
+	{2326, 3},
+	{2329, 3},
+	{2343, 3},
+	{2352, 3},
+	{2346, 3},
+	{2357, 3},
+	{2372, 2},
+	{2364, 2},
+	{2376, 2},
+	{2382, 2},
+	{2391, 2},
+	{2395, 2},
+	{2400, 2},
+	{2402, 3},
+	{2413, 2},
+	{2409, 2},
+	{2411, 2},
+	{2405, 2},
+	{2422, 2},
+	{2464, 2},
+	{2466, 2},
+	{2454, 2},
+	{2469, 2},
+	{2473, 2},
+	{2475, 2},
+	{2479, 2},
+	{2597, 1},
+	{2516, 2},
+	{2518, 3},
+	{2531, 2},
+	{2537, 2},
+	{2603, 1},
+	{2529, 2},
+	{2545, 2},
+	{2570, 2},
+	{2574, 2},
+	{2581, 2},
+	{2583, 2},
+	{2585, 2},
+	{2587, 2},
+	{2612, 1},
+	{2230, 2},
+	{2236, 2},
+	{2243, 2},
+	{2245, 2},
+	{2247, 2},
+	{2252, 2},
+	{763, 1},
+	{1331, 1},
+	{1380, 1},
+	{1418, 1},
+	{1427, 1},
+	{734, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{699, 1},
+	{753, 1},
+	{757, 1},
+	{735, 2},
+	{855, 1},
+	{3205, 1},
+	{789, 1},
+	{680, 1},
+	{713, 1},
+	{704, 1},
+	{675, 1},
+	{3205, 1},
+	{1368, 1},
+	{782, 1},
+	{724, 1},
+	{712, 1},
+	{789, 1},
+	{734, 1},
+	{1310, 1},
+	{709, 1},
+	{854, 1},
+	{790, 1},
+	{1410, 1},
+	{1307, 1},
+	{763, 1},
+	{576, 1},
+	{817, 1},
+	{753, 1},
+	{782, 1},
+	{756, 1},
+	{768, 1},
+	{756, 1},
+	{719, 1},
+	{696, 1},
+	{747, 1},
+	{716, 1},
+	{831, 1},
+	{734, 1},
+	{600, 1},
+	{1297, 1},
+	{854, 1},
+	{709, 1},
+	{695, 1},
+	{1330, 1},
+	{1351, 1},
+	{659, 1},
+	{1373, 1},
+	{1133, 2},
+	{2766, 2},
+	{1129, 2},
+	{1374, 2},
+	{1135, 2},
+	{2770, 2},
+	{1137, 2},
+	{2772, 2},
+	{1139, 2},
+	{2776, 2},
+	{1141, 2},
+	{2778, 2},
+	{1143, 2},
+	{2782, 2},
+	{1101, 1},
+	{2768, 2},
+	{1376, 2},
+	{2774, 2},
+	{2780, 2},
+	{768, 1},
+	{1321, 1},
+	{665, 1},
+	{1106, 2},
+	{651, 1},
+	{1116, 2},
+	{780, 2},
+	{1125, 2},
+	{1322, 2},
+	{1145, 2},
+	{2788, 2},
+	{1106, 2},
+	{673, 2},
+	{1147, 2},
+	{2790, 2},
+	{1104, 2},
+	{657, 2},
+	{1149, 2},
+	{2793, 2},
+	{7, 1},
+	{763, 1},
+	{1418, 1},
+	{1153, 2},
+	{1114, 2},
+	{766, 2},
+	{1131, 2},
+	{1421, 2},
+	{1151, 2},
+	{2795, 2},
+	{1153, 2},
+	{2802, 2},
+	{1155, 2},
+	{2806, 2},
+	{1157, 2},
+	{2811, 2},
+	{1159, 2},
+	{2813, 2},
+	{764, 2},
+	{1419, 2},
+	{2798, 2},
+	{2809, 2},
+	{747, 1},
+	{831, 1},
+	{817, 1},
+	{817, 1},
+	{1161, 2},
+	{2817, 2},
+	{1112, 2},
+	{1039, 2},
+	{1163, 2},
+	{2819, 2},
+	{1120, 2},
+	{836, 2},
+	{1165, 2},
+	{2821, 2},
+	{1118, 2},
+	{822, 2},
+	{1118, 2},
+	{822, 2},
+	{2815, 2},
+	{748, 2},
+	{832, 2},
+	{818, 2},
+	{713, 1},
+	{1167, 2},
+	{2824, 2},
+	{1169, 2},
+	{2826, 2},
+	{1171, 2},
+	{2828, 2},
+	{1108, 2},
+	{714, 2},
+	{1173, 2},
+	{2830, 2},
+	{1175, 2},
+	{2833, 2},
+	{1177, 2},
+	{2835, 2},
+	{1368, 1},
+	{719, 1},
+	{1179, 2},
+	{2837, 2},
+	{1127, 2},
+	{1371, 2},
+	{1181, 2},
+	{2839, 2},
+	{1183, 2},
+	{2841, 2},
+	{1185, 2},
+	{2843, 2},
+	{1110, 2},
+	{989, 2},
+	{1187, 2},
+	{2845, 2},
+	{500, 1},
+	{1189, 2},
+	{2847, 2},
+	{1199, 2},
+	{2857, 2},
+	{1201, 2},
+	{2859, 2},
+	{2786, 1},
+	{1203, 2},
+	{2862, 2},
+	{1205, 2},
+	{2864, 2},
+	{1207, 2},
+	{2866, 2},
+	{1209, 2},
+	{2868, 2},
+	{1211, 2},
+	{2870, 2},
+	{1213, 2},
+	{2873, 2},
+	{1215, 2},
+	{2875, 2},
+	{1217, 2},
+	{2877, 2},
+	{1219, 2},
+	{2879, 2},
+	{1221, 2},
+	{2881, 2},
+	{1223, 2},
+	{2883, 2},
+	{1225, 2},
+	{2885, 2},
+	{1227, 2},
+	{2887, 2},
+	{1229, 2},
+	{2889, 2},
+	{2891, 2},
+	{2895, 2},
+	{2893, 2},
+	{2897, 2},
+	{1231, 2},
+	{2899, 2},
+	{1233, 2},
+	{2901, 2},
+	{1235, 2},
+	{2903, 2},
+	{1237, 2},
+	{2905, 2},
+	{1239, 2},
+	{2907, 2},
+	{1241, 2},
+	{2909, 2},
+	{1243, 2},
+	{2911, 2},
+	{1102, 2},
+	{581, 2},
+	{1245, 2},
+	{2913, 2},
+	{1247, 2},
+	{2915, 2},
+	{1249, 2},
+	{2917, 2},
+	{1251, 2},
+	{2919, 2},
+	{1253, 2},
+	{2921, 2},
+	{1255, 2},
+	{2923, 2},
+	{2787, 1},
+	{1080, 1},
+	{1269, 2},
+	{2930, 2},
+	{1271, 2},
+	{2948, 2},
+	{1273, 2},
+	{2954, 2},
+	{3071, 1},
+	{712, 1},
+	{1080, 1},
+	{2940, 2},
+	{2932, 2},
+	{2942, 2},
+	{2936, 2},
+	{2944, 2},
+	{2934, 2},
+	{2934, 2},
+	{2946, 2},
+	{753, 1},
+	{2964, 2},
+	{2966, 2},
+	{2968, 2},
+	{2960, 2},
+	{2970, 2},
+	{2972, 2},
+	{2974, 2},
+	{817, 1},
+	{705, 1},
+	{3076, 1},
+	{4415, 1},
+	{3203, 1},
+	{680, 1},
+	{699, 1},
+	{699, 1},
+	{1410, 1},
+	{724, 1},
+	{695, 1},
+	{2832, 1},
+	{2823, 1},
+	{2861, 1},
+	{2872, 1},
+	{2925, 1},
+	{2928, 1},
+	{2929, 1},
+	{1311, 1},
+	{1382, 1},
+	{1311, 1},
+	{1382, 1},
+	{783, 1},
+	{1080, 1},
+	{2938, 2},
+	{2962, 2},
+	{2978, 2},
+	{2980, 2},
+	{2976, 2},
+	{2982, 2},
+	{2984, 2},
+	{2986, 2},
+	{2990, 2},
+	{2992, 2},
+	{2994, 2},
+	{2996, 2},
+	{2998, 2},
+	{3000, 2},
+	{3002, 2},
+	{0, 0},
+	{651, 1},
+	{783, 1},
+	{855, 1},
+	{3015, 1},
+	{7, 1},
+	{716, 1},
+	{724, 1},
+	{1381, 1},
+	{3014, 1},
+	{1101, 1},
+	{644, 1},
+	{479, 1},
+	{1380, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{494, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3029, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2184, 1},
+	{2189, 1},
+	{2188, 1},
+	{2190, 1},
+	{0, 0},
+	{644, 1},
+	{644, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3030, 1},
+	{0, 0},
+	{0, 0},
+	{3031, 1},
+	{0, 0},
+	{1275, 2},
+	{1277, 2},
+	{1279, 2},
+	{1281, 2},
+	{1191, 2},
+	{2849, 2},
+	{1193, 2},
+	{2851, 2},
+	{1195, 2},
+	{2853, 2},
+	{1197, 2},
+	{2855, 2},
+	{1257, 2},
+	{1259, 2},
+	{1261, 2},
+	{1263, 2},
+	{1265, 2},
+	{1267, 2},
+	{3038, 1},
+	{3034, 2},
+	{2784, 2},
+	{2926, 2},
+	{2950, 2},
+	{2952, 2},
+	{2956, 2},
+	{2958, 2},
+	{2988, 2},
+	{1411, 2},
+	{3007, 2},
+	{3009, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3039, 1},
+	{3040, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3041, 1},
+	{3041, 1},
+	{3042, 2},
+	{3044, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3046, 1},
+	{3047, 1},
+	{3048, 1},
+	{3049, 1},
+	{3050, 1},
+	{3051, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3050, 1},
+	{3051, 1},
+	{3052, 1},
+	{3053, 1},
+	{3054, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3056, 2},
+	{3058, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{8, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{824, 1},
+	{1328, 1},
+	{1300, 1},
+	{1349, 1},
+	{1014, 1},
+	{1325, 1},
+	{1014, 1},
+	{1313, 2},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1087, 1},
+	{1308, 1},
+	{1042, 1},
+	{1348, 1},
+	{1387, 1},
+	{3065, 1},
+	{1405, 1},
+	{3033, 1},
+	{1283, 1},
+	{1065, 2},
+	{843, 1},
+	{1045, 2},
+	{1011, 1},
+	{1042, 1},
+	{1334, 1},
+	{1047, 1},
+	{1053, 1},
+	{1087, 1},
+	{3068, 1},
+	{855, 1},
+	{855, 1},
+	{1038, 1},
+	{1064, 1},
+	{1347, 1},
+	{853, 1},
+	{1086, 1},
+	{1324, 1},
+	{3069, 1},
+	{3070, 1},
+	{3032, 1},
+	{3011, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{680, 1},
+	{798, 1},
+	{695, 1},
+	{817, 1},
+	{695, 1},
+	{817, 1},
+	{695, 1},
+	{817, 1},
+	{696, 1},
+	{824, 1},
+	{699, 1},
+	{831, 1},
+	{699, 1},
+	{831, 1},
+	{699, 1},
+	{831, 1},
+	{699, 1},
+	{831, 1},
+	{699, 1},
+	{831, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{705, 1},
+	{843, 1},
+	{709, 1},
+	{853, 1},
+	{712, 1},
+	{854, 1},
+	{712, 1},
+	{854, 1},
+	{712, 1},
+	{854, 1},
+	{712, 1},
+	{854, 1},
+	{712, 1},
+	{854, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{716, 1},
+	{1010, 1},
+	{716, 1},
+	{1010, 1},
+	{716, 1},
+	{1010, 1},
+	{719, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{724, 1},
+	{1045, 2},
+	{724, 1},
+	{1045, 2},
+	{724, 1},
+	{1045, 2},
+	{727, 1},
+	{1011, 1},
+	{727, 1},
+	{1011, 1},
+	{727, 1},
+	{1011, 1},
+	{727, 1},
+	{1011, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{747, 1},
+	{1038, 1},
+	{747, 1},
+	{1038, 1},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{753, 1},
+	{1042, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{756, 1},
+	{1047, 1},
+	{757, 1},
+	{1053, 1},
+	{757, 1},
+	{1053, 1},
+	{757, 1},
+	{1053, 1},
+	{757, 1},
+	{1053, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{768, 1},
+	{1069, 1},
+	{768, 1},
+	{1069, 1},
+	{782, 1},
+	{1079, 1},
+	{782, 1},
+	{1079, 1},
+	{782, 1},
+	{1079, 1},
+	{782, 1},
+	{1079, 1},
+	{782, 1},
+	{1079, 1},
+	{783, 1},
+	{1080, 1},
+	{783, 1},
+	{1080, 1},
+	{789, 1},
+	{1086, 1},
+	{790, 1},
+	{1087, 1},
+	{790, 1},
+	{1087, 1},
+	{790, 1},
+	{1087, 1},
+	{854, 1},
+	{1053, 1},
+	{1079, 1},
+	{1086, 1},
+	{798, 1},
+	{843, 1},
+	{843, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{680, 1},
+	{798, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{704, 1},
+	{842, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{734, 1},
+	{1014, 1},
+	{735, 2},
+	{1015, 2},
+	{735, 2},
+	{1015, 2},
+	{735, 2},
+	{1015, 2},
+	{735, 2},
+	{1015, 2},
+	{735, 2},
+	{1015, 2},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{763, 1},
+	{1064, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{789, 1},
+	{1086, 1},
+	{1086, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{4414, 1},
+	{4414, 1},
+	{4414, 1},
+	{4414, 1},
+	{4414, 1},
+	{4414, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{704, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{734, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{789, 1},
+	{789, 1},
+	{789, 1},
+	{789, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{798, 1},
+	{798, 1},
+	{4414, 1},
+	{4414, 1},
+	{1011, 1},
+	{1011, 1},
+	{855, 1},
+	{855, 1},
+	{1014, 1},
+	{1014, 1},
+	{1064, 1},
+	{1064, 1},
+	{1391, 1},
+	{1391, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{798, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{680, 1},
+	{7, 1},
+	{855, 1},
+	{7, 1},
+	{1090, 1},
+	{1092, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{1011, 1},
+	{704, 1},
+	{704, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{7, 1},
+	{7, 1},
+	{7, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{855, 1},
+	{7, 1},
+	{7, 1},
+	{7, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1064, 1},
+	{1038, 1},
+	{1038, 1},
+	{1064, 1},
+	{1064, 1},
+	{789, 1},
+	{789, 1},
+	{789, 1},
+	{789, 1},
+	{747, 1},
+	{1092, 1},
+	{1092, 1},
+	{7, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{1391, 1},
+	{2765, 1},
+	{734, 1},
+	{734, 1},
+	{1382, 1},
+	{1382, 1},
+	{1382, 1},
+	{7, 1},
+	{7, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{483, 1},
+	{483, 1},
+	{483, 1},
+	{483, 1},
+	{3255, 1},
+	{3255, 1},
+	{957, 2},
+	{7, 1},
+	{7, 1},
+	{482, 1},
+	{7, 1},
+	{8, 2},
+	{8, 2},
+	{8, 2},
+	{1101, 1},
+	{486, 1},
+	{489, 2},
+	{491, 3},
+	{1101, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1287, 4},
+	{1291, 5},
+	{7, 1},
+	{8, 2},
+	{10, 3},
+	{7, 1},
+	{8, 2},
+	{10, 3},
+	{651, 1},
+	{665, 1},
+	{1, 2},
+	{1358, 1},
+	{494, 1},
+	{483, 1},
+	{494, 1},
+	{678, 2},
+	{676, 2},
+	{3, 2},
+	{478, 1},
+	{1284, 3},
+	{1090, 1},
+	{13, 4},
+	{644, 1},
+	{3211, 1},
+	{3210, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1283, 1},
+	{4410, 1},
+	{696, 1},
+	{1091, 1},
+	{1045, 2},
+	{754, 2},
+	{782, 1},
+	{831, 1},
+	{4413, 1},
+	{716, 1},
+	{757, 1},
+	{981, 2},
+	{1423, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{799, 3},
+	{802, 3},
+	{696, 1},
+	{1096, 2},
+	{825, 3},
+	{828, 3},
+	{1307, 1},
+	{1403, 1},
+	{1098, 2},
+	{853, 1},
+	{712, 1},
+	{712, 1},
+	{712, 1},
+	{854, 1},
+	{854, 1},
+	{855, 1},
+	{855, 1},
+	{719, 1},
+	{855, 1},
+	{727, 1},
+	{732, 2},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{753, 1},
+	{753, 1},
+	{760, 3},
+	{790, 1},
+	{1382, 1},
+	{1311, 1},
+	{790, 1},
+	{1335, 1},
+	{716, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{842, 1},
+	{842, 1},
+	{704, 1},
+	{705, 1},
+	{724, 1},
+	{1014, 1},
+	{1438, 1},
+	{1441, 1},
+	{1442, 1},
+	{1443, 1},
+	{855, 1},
+	{706, 3},
+	{1387, 1},
+	{1086, 1},
+	{1368, 1},
+	{1379, 1},
+	{1309, 1},
+	{4400, 1},
+	{4401, 1},
+	{4503, 1},
+	{699, 1},
+	{831, 1},
+	{842, 1},
+	{855, 1},
+	{1009, 1},
+	{855, 1},
+	{957, 2},
+	{965, 3},
+	{953, 2},
+	{768, 1},
+	{771, 2},
+	{773, 3},
+	{776, 4},
+	{955, 2},
+	{783, 1},
+	{784, 2},
+	{786, 3},
+	{719, 1},
+	{696, 1},
+	{699, 1},
+	{724, 1},
+	{855, 1},
+	{957, 2},
+	{965, 3},
+	{983, 2},
+	{1069, 1},
+	{1070, 2},
+	{1072, 3},
+	{1075, 4},
+	{985, 2},
+	{1080, 1},
+	{1081, 2},
+	{1083, 3},
+	{855, 1},
+	{824, 1},
+	{831, 1},
+	{1045, 2},
+	{1304, 1},
+	{1325, 1},
+	{3017, 1},
+	{3027, 1},
+	{3078, 1},
+	{3079, 1},
+	{3080, 1},
+	{3085, 1},
+	{4509, 1},
+	{3023, 1},
+	{3018, 1},
+	{3090, 1},
+	{3092, 1},
+	{3091, 1},
+	{3203, 1},
+	{1305, 1},
+	{1305, 1},
+	{1373, 1},
+	{3096, 1},
+	{3097, 1},
+	{1379, 1},
+	{1309, 1},
+	{483, 1},
+	{479, 1},
+	{494, 1},
+	{791, 1},
+	{478, 1},
+	{1095, 1},
+	{1101, 1},
+	{1019, 2},
+	{855, 1},
+	{855, 1},
+	{957, 2},
+	{957, 2},
+	{1069, 1},
+	{1418, 1},
+	{763, 1},
+	{1337, 1},
+	{1338, 2},
+	{1340, 3},
+	{3102, 2},
+	{3104, 3},
+	{644, 1},
+	{483, 1},
+	{1090, 1},
+	{1090, 1},
+	{3110, 1},
+	{3111, 1},
+	{3112, 1},
+	{659, 1},
+	{659, 1},
+	{659, 1},
+	{659, 1},
+	{659, 1},
+	{659, 1},
+	{659, 1},
+	{3115, 1},
+	{3115, 1},
+	{652, 2},
+	{668, 2},
+	{3113, 1},
+	{651, 1},
+	{665, 1},
+	{3116, 1},
+	{3117, 1},
+	{3118, 1},
+	{3119, 1},
+	{3120, 1},
+	{3121, 1},
+	{3122, 1},
+	{3123, 1},
+	{2808, 1},
+	{2797, 1},
+	{2808, 1},
+	{2797, 1},
+	{3126, 1},
+	{3127, 1},
+	{4434, 1},
+	{734, 1},
+	{1350, 1},
+	{734, 1},
+	{757, 1},
+	{4398, 1},
+	{3140, 1},
+	{3141, 1},
+	{3142, 1},
+	{3143, 1},
+	{3101, 1},
+	{1069, 1},
+	{1418, 1},
+	{763, 1},
+	{3024, 1},
+	{1101, 1},
+	{3025, 1},
+	{657, 2},
+	{1106, 2},
+	{654, 3},
+	{670, 3},
+	{3124, 1},
+	{3125, 1},
+	{3132, 1},
+	{3133, 1},
+	{3144, 1},
+	{3145, 1},
+	{3146, 1},
+	{3147, 1},
+	{3211, 1},
+	{1122, 3},
+	{4414, 1},
+	{704, 1},
+	{3094, 1},
+	{3152, 1},
+	{3184, 1},
+	{3185, 1},
+	{3213, 1},
+	{1373, 1},
+	{3024, 1},
+	{1095, 1},
+	{3137, 1},
+	{757, 1},
+	{3095, 1},
+	{3148, 1},
+	{1095, 1},
+	{1489, 1},
+	{1090, 1},
+	{2792, 1},
+	{3095, 1},
+	{734, 1},
+	{855, 1},
+	{1038, 1},
+	{1391, 1},
+	{798, 1},
+	{4414, 1},
+	{855, 1},
+	{1391, 1},
+	{798, 1},
+	{3015, 1},
+	{3358, 1},
+	{3358, 1},
+	{3358, 1},
+	{3358, 1},
+	{3358, 1},
+	{3358, 1},
+	{3159, 1},
+	{3158, 1},
+	{3157, 1},
+	{3160, 1},
+	{3072, 2},
+	{3169, 1},
+	{855, 1},
+	{3183, 1},
+	{792, 2},
+	{3186, 1},
+	{3187, 1},
+	{3188, 1},
+	{3189, 1},
+	{3190, 1},
+	{3191, 1},
+	{3192, 1},
+	{3193, 1},
+	{3194, 1},
+	{3195, 1},
+	{159, 3},
+	{32, 3},
+	{39, 3},
+	{42, 3},
+	{45, 3},
+	{48, 3},
+	{51, 3},
+	{54, 3},
+	{57, 3},
+	{194, 4},
+	{198, 4},
+	{162, 4},
+	{166, 4},
+	{170, 4},
+	{174, 4},
+	{178, 4},
+	{182, 4},
+	{186, 4},
+	{190, 4},
+	{35, 4},
+	{860, 2},
+	{503, 2},
+	{562, 2},
+	{579, 2},
+	{592, 2},
+	{603, 2},
+	{614, 2},
+	{625, 2},
+	{636, 2},
+	{941, 3},
+	{959, 3},
+	{862, 3},
+	{874, 3},
+	{883, 3},
+	{892, 3},
+	{901, 3},
+	{910, 3},
+	{919, 3},
+	{928, 3},
+	{538, 3},
+	{135, 3},
+	{138, 3},
+	{141, 3},
+	{144, 3},
+	{147, 3},
+	{150, 3},
+	{153, 3},
+	{156, 3},
+	{159, 3},
+	{202, 3},
+	{205, 3},
+	{159, 3},
+	{223, 4},
+	{208, 3},
+	{211, 3},
+	{214, 3},
+	{217, 3},
+	{220, 3},
+	{227, 3},
+	{230, 3},
+	{233, 3},
+	{236, 3},
+	{239, 3},
+	{242, 3},
+	{245, 3},
+	{248, 3},
+	{1093, 1},
+	{3075, 1},
+	{1094, 1},
+	{3170, 1},
+	{4508, 1},
+	{3255, 1},
+	{3255, 1},
+	{3171, 1},
+	{3172, 1},
+	{3173, 1},
+	{494, 1},
+	{783, 1},
+	{3098, 1},
+	{3174, 1},
+	{1358, 1},
+	{3175, 1},
+	{3176, 1},
+	{3098, 1},
+	{3168, 1},
+	{1373, 1},
+	{3145, 1},
+	{3179, 1},
+	{3179, 1},
+	{4435, 1},
+	{3144, 1},
+	{3024, 1},
+	{3024, 1},
+	{1095, 1},
+	{3154, 1},
+	{3150, 1},
+	{1095, 1},
+	{1350, 1},
+	{3177, 1},
+	{4443, 1},
+	{3207, 1},
+	{3161, 1},
+	{3114, 1},
+	{3024, 1},
+	{4505, 1},
+	{4505, 1},
+	{2064, 1},
+	{29, 1},
+	{475, 1},
+	{651, 1},
+	{665, 1},
+	{29, 1},
+	{475, 1},
+	{1088, 1},
+	{1089, 1},
+	{479, 1},
+	{483, 1},
+	{1298, 1},
+	{4398, 1},
+	{794, 2},
+	{2800, 2},
+	{494, 1},
+	{791, 1},
+	{757, 1},
+	{3184, 1},
+	{3185, 1},
+	{0, 0},
+	{1080, 1},
+	{1080, 1},
+	{3019, 2},
+	{3088, 2},
+	{3021, 2},
+	{3086, 2},
+	{3210, 1},
+	{3156, 1},
+	{3154, 1},
+	{3213, 1},
+	{3155, 1},
+	{3153, 1},
+	{4436, 1},
+	{3198, 1},
+	{648, 2},
+	{791, 1},
+	{494, 1},
+	{494, 1},
+	{791, 1},
+	{1350, 1},
+	{4434, 1},
+	{3136, 1},
+	{3128, 1},
+	{3129, 1},
+	{3134, 1},
+	{3135, 1},
+	{1343, 4},
+	{3025, 1},
+	{668, 2},
+	{3023, 1},
+	{479, 1},
+	{479, 1},
+	{479, 1},
+	{479, 1},
+	{479, 1},
+	{480, 2},
+	{483, 1},
+	{483, 1},
+	{1080, 1},
+	{1080, 1},
+	{3151, 1},
+	{3200, 1},
+	{3099, 1},
+	{1090, 1},
+	{659, 1},
+	{645, 3},
+	{660, 2},
+	{662, 3},
+	{666, 2},
+	{3005, 1},
+	{3004, 1},
+	{2804, 2},
+	{3201, 1},
+	{497, 3},
+	{495, 2},
+	{3081, 1},
+	{3082, 1},
+	{3083, 1},
+	{3084, 1},
+	{712, 1},
+	{716, 1},
+	{1368, 1},
+	{1042, 1},
+	{1373, 1},
+	{4413, 1},
+	{4414, 1},
+	{712, 1},
+	{855, 1},
+	{716, 1},
+	{1300, 1},
+	{1384, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{1014, 1},
+	{1379, 1},
+	{747, 1},
+	{1038, 1},
+	{696, 1},
+	{824, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{1333, 1},
+	{783, 1},
+	{1389, 1},
+	{1381, 1},
+	{1391, 1},
+	{657, 2},
+	{483, 1},
+	{1400, 1},
+	{1407, 1},
+	{494, 1},
+	{633, 1},
+	{559, 1},
+	{1318, 1},
+	{719, 1},
+	{1354, 1},
+	{600, 1},
+	{1395, 1},
+	{1392, 1},
+	{3180, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{792, 2},
+	{734, 1},
+	{1321, 1},
+	{768, 1},
+	{704, 1},
+	{1305, 1},
+	{734, 1},
+	{1122, 3},
+	{1309, 1},
+	{855, 1},
+	{0, 1},
+	{734, 1},
+	{750, 1},
+	{1350, 1},
+	{783, 1},
+	{1373, 1},
+	{3028, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{483, 1},
+	{1090, 1},
+	{1090, 1},
+	{2808, 1},
+	{2797, 1},
+	{30, 2},
+	{476, 2},
+	{3108, 1},
+	{3107, 1},
+	{3109, 1},
+	{1462, 1},
+	{1095, 1},
+	{1101, 1},
+	{1460, 1},
+	{1461, 1},
+	{3071, 1},
+	{3210, 1},
+	{1100, 1},
+	{659, 1},
+	{3399, 1},
+	{3398, 1},
+	{3408, 1},
+	{3459, 1},
+	{3281, 1},
+	{3428, 1},
+	{3600, 1},
+	{3599, 1},
+	{3624, 1},
+	{3633, 1},
+	{3652, 1},
+	{3664, 1},
+	{3292, 1},
+	{3701, 1},
+	{3731, 1},
+	{3744, 1},
+	{3808, 1},
+	{3815, 1},
+	{3819, 1},
+	{3822, 1},
+	{3823, 1},
+	{3868, 1},
+	{3886, 1},
+	{3391, 1},
+	{3899, 1},
+	{4040, 1},
+	{3974, 1},
+	{4020, 1},
+	{4041, 1},
+	{4040, 1},
+	{4052, 1},
+	{4063, 1},
+	{4088, 1},
+	{4088, 1},
+	{4088, 1},
+	{4130, 1},
+	{4152, 1},
+	{4165, 1},
+	{4164, 1},
+	{4169, 1},
+	{4188, 1},
+	{4203, 1},
+	{4224, 1},
+	{4229, 1},
+	{4229, 1},
+	{4271, 1},
+	{4261, 1},
+	{4262, 1},
+	{4263, 1},
+	{4264, 1},
+	{4269, 1},
+	{4271, 1},
+	{4293, 1},
+	{4301, 1},
+	{4311, 1},
+	{4313, 1},
+	{4315, 1},
+	{4316, 1},
+	{4317, 1},
+	{4323, 1},
+	{4332, 1},
+	{4340, 1},
+	{4345, 1},
+	{4358, 1},
+	{4361, 1},
+	{3737, 1},
+	{4377, 1},
+	{3804, 1},
+	{4379, 1},
+	{4001, 1},
+	{4382, 1},
+	{3400, 1},
+	{4384, 1},
+	{3255, 1},
+	{3358, 1},
+	{791, 1},
+	{494, 1},
+	{3397, 1},
+	{3402, 1},
+	{3404, 1},
+	{3405, 1},
+	{3407, 1},
+	{3427, 1},
+	{3433, 1},
+	{3437, 1},
+	{3441, 1},
+	{3445, 1},
+	{3448, 1},
+	{3456, 1},
+	{3457, 1},
+	{3458, 1},
+	{3470, 1},
+	{3479, 1},
+	{3483, 1},
+	{3485, 1},
+	{3486, 1},
+	{3488, 1},
+	{3496, 1},
+	{3497, 1},
+	{3502, 1},
+	{3503, 1},
+	{3505, 1},
+	{3508, 1},
+	{3508, 1},
+	{3543, 1},
+	{3543, 1},
+	{3563, 1},
+	{3565, 1},
+	{3566, 1},
+	{3569, 1},
+	{3575, 1},
+	{3587, 1},
+	{3588, 1},
+	{3595, 1},
+	{3598, 1},
+	{3599, 1},
+	{3601, 1},
+	{3607, 1},
+	{3608, 1},
+	{3619, 1},
+	{3622, 1},
+	{3623, 1},
+	{3626, 1},
+	{3631, 1},
+	{3633, 1},
+	{3634, 1},
+	{3645, 1},
+	{3646, 1},
+	{3648, 1},
+	{3649, 1},
+	{3651, 1},
+	{3654, 1},
+	{3658, 1},
+	{3663, 1},
+	{3694, 1},
+	{3699, 1},
+	{3700, 1},
+	{3729, 1},
+	{3730, 1},
+	{3736, 1},
+	{3738, 1},
+	{3740, 1},
+	{3741, 1},
+	{3743, 1},
+	{3747, 1},
+	{3757, 1},
+	{3761, 1},
+	{3771, 1},
+	{3800, 1},
+	{3803, 1},
+	{3807, 1},
+	{3811, 1},
+	{3814, 1},
+	{3816, 1},
+	{3817, 1},
+	{3818, 1},
+	{3820, 1},
+	{3821, 1},
+	{3867, 1},
+	{3885, 1},
+	{3888, 1},
+	{3889, 1},
+	{3890, 1},
+	{3891, 1},
+	{3893, 1},
+	{3894, 1},
+	{3898, 1},
+	{3906, 1},
+	{3908, 1},
+	{3924, 1},
+	{3925, 1},
+	{3927, 1},
+	{3928, 1},
+	{3930, 1},
+	{3931, 1},
+	{3937, 1},
+	{3938, 1},
+	{3945, 1},
+	{3946, 1},
+	{3947, 1},
+	{3948, 1},
+	{3952, 1},
+	{3961, 1},
+	{3962, 1},
+	{3963, 1},
+	{3973, 1},
+	{3989, 1},
+	{3990, 1},
+	{3997, 1},
+	{4000, 1},
+	{4003, 1},
+	{4010, 1},
+	{4019, 1},
+	{4037, 1},
+	{4039, 1},
+	{4046, 1},
+	{4049, 1},
+	{4051, 1},
+	{4054, 1},
+	{4055, 1},
+	{4056, 1},
+	{4062, 1},
+	{4064, 1},
+	{4072, 1},
+	{4074, 1},
+	{4076, 1},
+	{4077, 1},
+	{4080, 1},
+	{4082, 1},
+	{4083, 1},
+	{4084, 1},
+	{4086, 1},
+	{4087, 1},
+	{4129, 1},
+	{4135, 1},
+	{4148, 1},
+	{4149, 1},
+	{4151, 1},
+	{4163, 1},
+	{4167, 1},
+	{4170, 1},
+	{4171, 1},
+	{4189, 1},
+	{4190, 1},
+	{4192, 1},
+	{4194, 1},
+	{4195, 1},
+	{4204, 1},
+	{4205, 1},
+	{4208, 1},
+	{4215, 1},
+	{4216, 1},
+	{4225, 1},
+	{4227, 1},
+	{4228, 1},
+	{4235, 1},
+	{4242, 1},
+	{4246, 1},
+	{4247, 1},
+	{4249, 1},
+	{4262, 1},
+	{4265, 1},
+	{4270, 1},
+	{4280, 1},
+	{4282, 1},
+	{4286, 1},
+	{4292, 1},
+	{4295, 1},
+	{4296, 1},
+	{4297, 1},
+	{4298, 1},
+	{4302, 1},
+	{4303, 1},
+	{4305, 1},
+	{4312, 1},
+	{4314, 1},
+	{4316, 1},
+	{4324, 1},
+	{4325, 1},
+	{4327, 1},
+	{4333, 1},
+	{4334, 1},
+	{4335, 1},
+	{4337, 1},
+	{4338, 1},
+	{4339, 1},
+	{4340, 1},
+	{4341, 1},
+	{4346, 1},
+	{4353, 1},
+	{4354, 1},
+	{4357, 1},
+	{4359, 1},
+	{4360, 1},
+	{4362, 1},
+	{4364, 1},
+	{4365, 1},
+	{4366, 1},
+	{4369, 1},
+	{4371, 1},
+	{4373, 1},
+	{4374, 1},
+	{4376, 1},
+	{4378, 1},
+	{4380, 1},
+	{4383, 1},
+	{4385, 1},
+	{0, 0},
+	{1367, 1},
+	{8, 2},
+	{734, 1},
+	{3184, 1},
+	{3185, 1},
+	{3074, 1},
+	{29, 1},
+	{475, 1},
+	{3196, 1},
+	{3197, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{494, 1},
+	{3074, 1},
+	{3488, 1},
+	{3489, 1},
+	{3490, 1},
+	{3215, 1},
+	{3216, 1},
+	{3184, 1},
+	{3184, 1},
+	{3217, 1},
+	{3218, 1},
+	{3219, 1},
+	{3220, 1},
+	{3221, 1},
+	{3222, 1},
+	{3223, 1},
+	{3224, 1},
+	{3225, 1},
+	{3226, 1},
+	{3227, 1},
+	{3228, 1},
+	{3229, 1},
+	{3229, 1},
+	{3230, 1},
+	{3230, 1},
+	{3231, 1},
+	{3231, 1},
+	{3232, 1},
+	{3232, 1},
+	{3233, 1},
+	{3233, 1},
+	{3214, 1},
+	{0, 0},
+	{0, 0},
+	{4432, 1},
+	{4433, 1},
+	{3234, 1},
+	{659, 1},
+	{3408, 1},
+	{3622, 1},
+	{3470, 1},
+	{3470, 1},
+	{3236, 1},
+	{3237, 1},
+	{3238, 1},
+	{3239, 1},
+	{3240, 1},
+	{3241, 1},
+	{3242, 1},
+	{3243, 1},
+	{3244, 1},
+	{3566, 1},
+	{3566, 1},
+	{3245, 1},
+	{3246, 1},
+	{3247, 1},
+	{3496, 1},
+	{3496, 1},
+	{3404, 1},
+	{494, 1},
+	{3437, 1},
+	{3437, 1},
+	{3437, 1},
+	{3248, 1},
+	{3248, 1},
+	{3249, 1},
+	{3249, 1},
+	{3232, 1},
+	{3232, 1},
+	{3232, 1},
+	{3250, 1},
+	{3250, 1},
+	{3508, 1},
+	{3235, 1},
+	{3251, 1},
+	{3252, 1},
+	{3253, 1},
+	{3254, 1},
+	{1101, 1},
+	{3274, 1},
+	{2227, 1},
+	{2228, 2},
+	{2238, 2},
+	{2249, 1},
+	{2262, 2},
+	{2268, 2},
+	{2272, 1},
+	{2275, 2},
+	{2297, 1},
+	{2298, 2},
+	{2324, 2},
+	{2335, 2},
+	{2355, 2},
+	{2366, 2},
+	{2368, 2},
+	{2370, 2},
+	{2381, 1},
+	{2415, 1},
+	{2429, 2},
+	{2434, 2},
+	{2468, 1},
+	{2487, 2},
+	{2515, 1},
+	{2547, 1},
+	{2555, 2},
+	{2560, 1},
+	{2565, 1},
+	{2566, 1},
+	{2569, 1},
+	{2580, 1},
+	{2616, 1},
+	{2623, 2},
+	{2625, 1},
+	{2632, 2},
+	{2634, 1},
+	{2641, 2},
+	{2643, 1},
+	{2650, 2},
+	{2652, 1},
+	{2653, 2},
+	{2655, 3},
+	{2680, 2},
+	{2682, 1},
+	{2699, 1},
+	{2705, 2},
+	{2710, 3},
+	{2720, 2},
+	{2725, 1},
+	{3255, 1},
+	{3269, 2},
+	{3358, 1},
+	{2615, 1},
+	{2252, 2},
+	{2254, 2},
+	{2260, 2},
+	{2270, 2},
+	{2303, 3},
+	{2311, 2},
+	{2343, 3},
+	{2372, 2},
+	{2376, 2},
+	{2395, 2},
+	{2400, 2},
+	{2413, 2},
+	{2405, 2},
+	{2416, 2},
+	{2420, 2},
+	{2436, 3},
+	{2439, 3},
+	{2456, 2},
+	{2462, 2},
+	{2454, 2},
+	{2431, 3},
+	{2469, 2},
+	{2471, 2},
+	{2473, 2},
+	{2479, 2},
+	{2503, 2},
+	{2597, 1},
+	{2531, 2},
+	{2603, 1},
+	{2529, 2},
+	{2545, 2},
+	{2574, 2},
+	{2591, 2},
+	{2612, 1},
+	{2688, 2},
+	{2690, 3},
+	{2697, 2},
+	{2736, 2},
+	{2738, 3},
+	{2745, 2},
+	{2747, 1},
+	{2759, 2},
+	{3255, 1},
+	{3358, 1},
+	{494, 1},
+	{791, 1},
+	{3399, 1},
+	{3402, 1},
+	{3184, 1},
+	{3398, 1},
+	{3397, 1},
+	{251, 3},
+	{254, 3},
+	{257, 3},
+	{260, 3},
+	{263, 3},
+	{266, 3},
+	{269, 3},
+	{272, 3},
+	{275, 3},
+	{278, 3},
+	{281, 3},
+	{284, 3},
+	{287, 3},
+	{290, 3},
+	{422, 3},
+	{425, 3},
+	{428, 3},
+	{431, 3},
+	{434, 3},
+	{437, 3},
+	{440, 3},
+	{443, 3},
+	{454, 3},
+	{460, 3},
+	{463, 3},
+	{466, 3},
+	{469, 3},
+	{472, 3},
+	{457, 3},
+	{446, 4},
+	{450, 4},
+	{293, 3},
+	{305, 3},
+	{299, 3},
+	{344, 3},
+	{308, 3},
+	{323, 3},
+	{296, 3},
+	{320, 3},
+	{302, 3},
+	{332, 3},
+	{365, 3},
+	{383, 3},
+	{380, 3},
+	{371, 3},
+	{419, 3},
+	{347, 3},
+	{362, 3},
+	{377, 3},
+	{368, 3},
+	{398, 3},
+	{338, 3},
+	{389, 3},
+	{413, 3},
+	{401, 3},
+	{326, 3},
+	{311, 3},
+	{341, 3},
+	{350, 3},
+	{395, 3},
+	{314, 3},
+	{416, 3},
+	{335, 3},
+	{404, 3},
+	{317, 3},
+	{407, 3},
+	{410, 3},
+	{1005, 2},
+	{555, 2},
+	{572, 2},
+	{585, 2},
+	{596, 2},
+	{607, 2},
+	{618, 2},
+	{629, 2},
+	{640, 2},
+	{947, 3},
+	{971, 3},
+	{868, 3},
+	{745, 2},
+	{1007, 2},
+	{557, 2},
+	{574, 2},
+	{587, 2},
+	{598, 2},
+	{609, 2},
+	{620, 2},
+	{631, 2},
+	{642, 2},
+	{950, 3},
+	{974, 3},
+	{871, 3},
+	{880, 3},
+	{889, 3},
+	{898, 3},
+	{907, 3},
+	{916, 3},
+	{925, 3},
+	{934, 3},
+	{544, 3},
+	{550, 3},
+	{508, 3},
+	{514, 3},
+	{520, 3},
+	{1003, 2},
+	{553, 2},
+	{570, 2},
+	{583, 2},
+	{594, 2},
+	{605, 2},
+	{616, 2},
+	{627, 2},
+	{638, 2},
+	{944, 3},
+	{968, 3},
+	{865, 3},
+	{877, 3},
+	{886, 3},
+	{895, 3},
+	{904, 3},
+	{913, 3},
+	{922, 3},
+	{931, 3},
+	{541, 3},
+	{547, 3},
+	{505, 3},
+	{511, 3},
+	{517, 3},
+	{523, 3},
+	{526, 3},
+	{529, 3},
+	{532, 3},
+	{535, 3},
+	{564, 3},
+	{567, 3},
+	{3283, 1},
+	{3282, 1},
+	{3304, 1},
+	{3255, 1},
+	{791, 1},
+	{494, 1},
+	{3413, 1},
+	{3420, 1},
+	{3524, 1},
+	{3508, 1},
+	{3553, 1},
+	{3543, 1},
+	{3555, 1},
+	{3582, 1},
+	{3627, 1},
+	{3303, 1},
+	{3699, 1},
+	{3296, 1},
+	{3319, 1},
+	{3750, 1},
+	{3298, 1},
+	{3333, 1},
+	{3776, 1},
+	{3307, 1},
+	{3791, 1},
+	{3849, 1},
+	{3964, 1},
+	{4025, 1},
+	{3762, 1},
+	{3764, 1},
+	{3763, 1},
+	{3302, 1},
+	{3765, 1},
+	{3767, 1},
+	{4068, 1},
+	{3770, 1},
+	{4115, 1},
+	{4127, 1},
+	{3342, 1},
+	{4172, 1},
+	{4186, 1},
+	{4193, 1},
+	{4207, 1},
+	{4211, 1},
+	{4214, 1},
+	{4218, 1},
+	{4237, 1},
+	{4258, 1},
+	{4281, 1},
+	{4352, 1},
+	{4364, 1},
+	{3318, 1},
+	{4392, 1},
+	{4388, 1},
+	{4386, 1},
+	{4397, 1},
+	{4389, 1},
+	{4387, 1},
+	{4396, 1},
+	{4395, 1},
+	{4391, 1},
+	{4390, 1},
+	{4393, 1},
+	{4394, 1},
+	{695, 1},
+	{747, 1},
+	{831, 1},
+	{699, 1},
+	{757, 1},
+	{709, 1},
+	{716, 1},
+	{713, 1},
+	{696, 1},
+	{1304, 1},
+	{790, 1},
+	{705, 1},
+	{3076, 1},
+	{724, 1},
+	{727, 1},
+	{719, 1},
+	{756, 1},
+	{753, 1},
+	{1321, 1},
+	{768, 1},
+	{712, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{3012, 1},
+	{680, 1},
+	{3203, 1},
+	{704, 1},
+	{1305, 1},
+	{855, 1},
+	{734, 1},
+	{763, 1},
+	{1418, 1},
+	{3006, 1},
+	{486, 1},
+	{482, 1},
+	{489, 2},
+	{487, 2},
+	{644, 1},
+	{484, 2},
+	{659, 1},
+	{486, 1},
+	{500, 1},
+	{1308, 1},
+	{855, 1},
+	{1391, 1},
+	{1401, 2},
+	{1361, 3},
+	{1350, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1357, 1},
+	{854, 1},
+	{743, 2},
+	{1019, 2},
+	{4434, 1},
+	{0, 0},
+	{0, 0},
+	{1398, 1},
+	{3013, 1},
+	{3205, 1},
+	{1355, 1},
+	{1321, 1},
+	{1379, 1},
+	{768, 1},
+	{675, 1},
+	{500, 1},
+	{0, 0},
+	{0, 0},
+	{4405, 2},
+	{1366, 1},
+	{1365, 1},
+	{758, 2},
+	{1058, 2},
+	{1047, 1},
+	{681, 2},
+	{805, 2},
+	{685, 2},
+	{809, 2},
+	{689, 2},
+	{811, 2},
+	{691, 2},
+	{813, 2},
+	{691, 2},
+	{813, 2},
+	{693, 2},
+	{815, 2},
+	{716, 1},
+	{734, 1},
+	{1014, 1},
+	{743, 2},
+	{1019, 2},
+	{500, 1},
+	{1079, 1},
+	{559, 1},
+	{1318, 1},
+	{633, 1},
+	{1054, 2},
+	{6, 1},
+	{4411, 1},
+	{644, 1},
+	{7, 1},
+	{1101, 1},
+	{4407, 1},
+	{705, 1},
+	{843, 1},
+	{4440, 1},
+	{4441, 1},
+	{1352, 1},
+	{4399, 1},
+	{1064, 1},
+	{559, 1},
+	{4398, 1},
+	{713, 1},
+	{783, 1},
+	{695, 1},
+	{1297, 1},
+	{4402, 1},
+	{1391, 1},
+	{3255, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2057, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2282, 2},
+	{2284, 2},
+	{2286, 2},
+	{2291, 2},
+	{2298, 2},
+	{2300, 3},
+	{2311, 2},
+	{2313, 3},
+	{2324, 2},
+	{2335, 2},
+	{2340, 3},
+	{2346, 3},
+	{2355, 2},
+	{2362, 2},
+	{2364, 2},
+	{2382, 2},
+	{2389, 2},
+	{2400, 2},
+	{2451, 3},
+	{2460, 2},
+	{2466, 2},
+	{2495, 3},
+	{2523, 2},
+	{2543, 2},
+	{2557, 3},
+	{2567, 2},
+	{2578, 2},
+	{2589, 2},
+	{2613, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3202, 1},
+	{4418, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4419, 1},
+	{2014, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4420, 1},
+	{4421, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{842, 1},
+	{843, 1},
+	{1014, 1},
+	{1014, 1},
+	{1325, 1},
+	{1313, 2},
+	{1313, 2},
+	{1042, 1},
+	{1042, 1},
+	{1337, 1},
+	{1064, 1},
+	{1064, 1},
+	{1389, 1},
+	{1389, 1},
+	{1086, 1},
+	{1409, 1},
+	{1326, 2},
+	{1067, 2},
+	{3061, 1},
+	{1336, 1},
+	{3067, 1},
+	{1014, 1},
+	{855, 1},
+	{3060, 1},
+	{3063, 1},
+	{3062, 1},
+	{1320, 1},
+	{3206, 1},
+	{1042, 1},
+	{1079, 1},
+	{1349, 1},
+	{1353, 1},
+	{1014, 1},
+	{1330, 1},
+	{1087, 1},
+	{4414, 1},
+	{1064, 1},
+	{1301, 1},
+	{1336, 1},
+	{1069, 1},
+	{1047, 1},
+	{1354, 1},
+	{824, 1},
+	{3065, 1},
+	{1300, 1},
+	{1014, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2668, 2},
+	{2675, 3},
+	{2683, 2},
+	{2685, 3},
+	{2693, 2},
+	{2713, 2},
+	{2722, 3},
+	{2728, 3},
+	{2741, 2},
+	{3256, 2},
+	{3258, 2},
+	{3260, 3},
+	{3263, 2},
+	{3363, 3},
+	{3366, 3},
+	{3369, 2},
+	{3371, 3},
+	{3376, 3},
+	{3379, 2},
+	{3383, 2},
+	{3389, 2},
+	{2748, 2},
+	{2752, 3},
+	{2256, 2},
+	{2264, 2},
+	{2275, 2},
+	{2277, 3},
+	{2284, 2},
+	{2286, 2},
+	{2288, 3},
+	{2291, 2},
+	{2293, 2},
+	{2295, 2},
+	{2300, 3},
+	{2306, 3},
+	{2321, 3},
+	{2332, 3},
+	{2337, 3},
+	{2349, 3},
+	{2374, 2},
+	{2378, 3},
+	{2360, 2},
+	{2384, 2},
+	{2386, 3},
+	{2393, 2},
+	{2397, 3},
+	{2407, 2},
+	{2420, 2},
+	{2424, 3},
+	{2427, 2},
+	{2429, 2},
+	{2439, 3},
+	{2456, 2},
+	{2458, 2},
+	{2477, 2},
+	{2484, 3},
+	{2489, 3},
+	{2492, 3},
+	{2513, 2},
+	{2503, 2},
+	{2505, 2},
+	{2509, 2},
+	{2370, 2},
+	{2598, 2},
+	{2600, 3},
+	{2604, 2},
+	{2606, 2},
+	{2548, 2},
+	{2550, 3},
+	{2555, 2},
+	{2572, 2},
+	{2576, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4191, 1},
+	{3758, 1},
+	{4216, 1},
+	{4199, 1},
+	{3854, 1},
+	{3392, 1},
+	{3509, 1},
+	{4383, 1},
+	{4383, 1},
+	{3572, 1},
+	{4249, 1},
+	{3528, 1},
+	{3571, 1},
+	{3692, 1},
+	{3944, 1},
+	{4045, 1},
+	{4128, 1},
+	{4144, 1},
+	{4158, 1},
+	{4234, 1},
+	{3794, 1},
+	{3832, 1},
+	{3875, 1},
+	{3912, 1},
+	{4112, 1},
+	{4243, 1},
+	{4329, 1},
+	{3401, 1},
+	{3499, 1},
+	{3799, 1},
+	{3883, 1},
+	{4126, 1},
+	{4351, 1},
+	{3613, 1},
+	{3861, 1},
+	{4122, 1},
+	{4162, 1},
+	{3704, 1},
+	{4071, 1},
+	{4147, 1},
+	{3640, 1},
+	{3766, 1},
+	{3838, 1},
+	{3902, 1},
+	{4237, 1},
+	{3415, 1},
+	{3451, 1},
+	{3476, 1},
+	{3728, 1},
+	{3797, 1},
+	{3882, 1},
+	{3951, 1},
+	{4051, 1},
+	{4124, 1},
+	{4132, 1},
+	{4212, 1},
+	{4290, 1},
+	{4342, 1},
+	{4350, 1},
+	{3967, 1},
+	{3984, 1},
+	{4028, 1},
+	{4105, 1},
+	{4256, 1},
+	{4354, 1},
+	{4178, 1},
+	{3559, 1},
+	{3647, 1},
+	{4009, 1},
+	{4061, 1},
+	{3895, 1},
+	{3969, 1},
+	{4198, 1},
+	{4288, 1},
+	{3558, 1},
+	{3604, 1},
+	{3795, 1},
+	{3843, 1},
+	{3856, 1},
+	{4024, 1},
+	{4034, 1},
+	{4273, 1},
+	{3475, 1},
+	{4065, 1},
+	{3454, 1},
+	{3453, 1},
+	{3993, 1},
+	{4029, 1},
+	{4111, 1},
+	{4275, 1},
+	{4185, 1},
+	{3705, 1},
+	{3794, 1},
+	{4181, 1},
+	{3394, 1},
+	{3592, 1},
+	{3669, 1},
+	{3907, 1},
+	{3936, 1},
+	{3484, 1},
+	{3971, 1},
+	{3419, 1},
+	{3661, 1},
+	{3356, 1},
+	{3828, 1},
+	{3735, 1},
+	{4023, 1},
+	{3504, 1},
+	{3552, 1},
+	{3954, 1},
+	{4113, 1},
+	{4174, 1},
+	{3812, 1},
+	{4227, 1},
+	{3826, 1},
+	{3709, 1},
+	{4095, 1},
+	{3715, 1},
+	{3935, 1},
+	{3406, 1},
+	{3436, 1},
+	{3452, 1},
+	{3785, 1},
+	{4017, 1},
+	{4085, 1},
+	{4177, 1},
+	{4248, 1},
+	{3478, 1},
+	{3516, 1},
+	{3575, 1},
+	{3644, 1},
+	{3742, 1},
+	{3862, 1},
+	{3972, 1},
+	{4267, 1},
+	{4331, 1},
+	{4355, 1},
+	{4363, 1},
+	{3470, 1},
+	{3756, 1},
+	{3806, 1},
+	{4223, 1},
+	{3632, 1},
+	{3686, 1},
+	{3693, 1},
+	{3726, 1},
+	{3858, 1},
+	{3877, 1},
+	{3921, 1},
+	{3991, 1},
+	{4031, 1},
+	{4059, 1},
+	{4219, 1},
+	{4116, 1},
+	{4230, 1},
+	{4257, 1},
+	{3462, 1},
+	{3471, 1},
+	{3521, 1},
+	{3874, 1},
+	{4153, 1},
+	{4174, 1},
+	{3639, 1},
+	{3667, 1},
+	{3713, 1},
+	{3810, 1},
+	{4008, 1},
+	{3904, 1},
+	{3411, 1},
+	{3540, 1},
+	{3592, 1},
+	{3618, 1},
+	{3670, 1},
+	{3911, 1},
+	{3918, 1},
+	{4048, 1},
+	{4057, 1},
+	{4250, 1},
+	{4287, 1},
+	{4291, 1},
+	{4307, 1},
+	{3416, 1},
+	{3988, 1},
+	{4245, 1},
+	{4281, 1},
+	{3676, 1},
+	{3403, 1},
+	{3425, 1},
+	{3593, 1},
+	{3602, 1},
+	{3739, 1},
+	{3794, 1},
+	{3880, 1},
+	{3943, 1},
+	{4119, 1},
+	{4233, 1},
+	{4380, 1},
+	{3752, 1},
+	{4272, 1},
+	{3469, 1},
+	{3777, 1},
+	{3780, 1},
+	{3836, 1},
+	{3850, 1},
+	{3914, 1},
+	{3934, 1},
+	{3966, 1},
+	{4022, 1},
+	{4310, 1},
+	{3438, 1},
+	{3697, 1},
+	{4276, 1},
+	{3421, 1},
+	{3611, 1},
+	{3844, 1},
+	{4220, 1},
+	{3659, 1},
+	{3678, 1},
+	{3782, 1},
+	{3907, 1},
+	{4278, 1},
+	{3463, 1},
+	{3513, 1},
+	{3606, 1},
+	{3748, 1},
+	{3772, 1},
+	{3788, 1},
+	{3830, 1},
+	{3913, 1},
+	{3939, 1},
+	{4043, 1},
+	{4154, 1},
+	{4157, 1},
+	{4247, 1},
+	{4284, 1},
+	{3487, 1},
+	{3851, 1},
+	{3514, 1},
+	{3881, 1},
+	{3922, 1},
+	{4123, 1},
+	{4279, 1},
+	{4344, 1},
+	{4356, 1},
+	{3779, 1},
+	{3842, 1},
+	{4073, 1},
+	{4000, 1},
+	{4004, 1},
+	{4012, 1},
+	{3901, 1},
+	{3872, 1},
+	{4184, 1},
+	{3409, 1},
+	{4099, 1},
+	{3464, 1},
+	{3461, 1},
+	{3635, 1},
+	{3706, 1},
+	{4015, 1},
+	{3589, 1},
+	{3833, 1},
+	{3755, 1},
+	{4222, 1},
+	{4149, 1},
+	{4274, 1},
+	{4167, 1},
+	{3642, 1},
+	{3428, 1},
+	{3533, 1},
+	{3551, 1},
+	{3751, 1},
+	{3455, 1},
+	{3903, 1},
+	{3949, 1},
+	{3975, 1},
+	{3982, 1},
+	{3983, 1},
+	{3987, 1},
+	{4294, 1},
+	{4013, 1},
+	{4049, 1},
+	{4125, 1},
+	{4180, 1},
+	{4231, 1},
+	{4239, 1},
+	{4319, 1},
+	{4320, 1},
+	{4321, 1},
+	{4349, 1},
+	{4237, 1},
+	{4281, 1},
+	{3417, 1},
+	{3426, 1},
+	{3430, 1},
+	{3474, 1},
+	{3477, 1},
+	{3494, 1},
+	{3530, 1},
+	{3536, 1},
+	{3538, 1},
+	{3550, 1},
+	{3554, 1},
+	{3605, 1},
+	{3607, 1},
+	{3673, 1},
+	{3683, 1},
+	{3685, 1},
+	{3691, 1},
+	{3732, 1},
+	{3745, 1},
+	{3753, 1},
+	{3786, 1},
+	{3839, 1},
+	{3846, 1},
+	{3857, 1},
+	{3878, 1},
+	{3886, 1},
+	{3915, 1},
+	{3968, 1},
+	{3976, 1},
+	{3978, 1},
+	{3977, 1},
+	{3979, 1},
+	{3980, 1},
+	{3981, 1},
+	{3985, 1},
+	{3986, 1},
+	{3994, 1},
+	{3998, 1},
+	{4005, 1},
+	{4031, 1},
+	{4033, 1},
+	{4035, 1},
+	{4042, 1},
+	{4053, 1},
+	{4075, 1},
+	{4088, 1},
+	{4088, 1},
+	{4114, 1},
+	{4160, 1},
+	{4168, 1},
+	{4182, 1},
+	{4183, 1},
+	{4200, 1},
+	{4201, 1},
+	{4229, 1},
+	{4231, 1},
+	{4285, 1},
+	{4304, 1},
+	{4309, 1},
+	{3671, 1},
+	{4553, 1},
+	{4081, 1},
+	{3357, 1},
+	{3450, 1},
+	{3435, 1},
+	{3414, 1},
+	{3429, 1},
+	{3440, 1},
+	{3473, 1},
+	{3480, 1},
+	{3530, 1},
+	{3525, 1},
+	{3529, 1},
+	{3535, 1},
+	{3551, 1},
+	{3557, 1},
+	{3570, 1},
+	{3573, 1},
+	{3580, 1},
+	{3585, 1},
+	{3641, 1},
+	{3643, 1},
+	{3656, 1},
+	{3662, 1},
+	{3675, 1},
+	{3681, 1},
+	{3677, 1},
+	{3685, 1},
+	{3682, 1},
+	{3691, 1},
+	{3698, 1},
+	{3717, 1},
+	{3720, 1},
+	{3722, 1},
+	{3733, 1},
+	{3751, 1},
+	{3766, 1},
+	{3768, 1},
+	{3774, 1},
+	{3807, 1},
+	{3812, 1},
+	{3836, 1},
+	{3855, 1},
+	{3853, 1},
+	{3857, 1},
+	{3864, 1},
+	{3878, 1},
+	{3960, 1},
+	{3887, 1},
+	{3900, 1},
+	{3903, 1},
+	{3919, 1},
+	{3926, 1},
+	{3932, 1},
+	{3941, 1},
+	{3942, 1},
+	{3949, 1},
+	{3950, 1},
+	{3953, 1},
+	{3958, 1},
+	{3957, 1},
+	{3970, 1},
+	{3999, 1},
+	{4005, 1},
+	{4011, 1},
+	{4026, 1},
+	{4031, 1},
+	{4038, 1},
+	{4053, 1},
+	{4100, 1},
+	{4110, 1},
+	{4142, 1},
+	{4161, 1},
+	{4166, 1},
+	{4168, 1},
+	{4175, 1},
+	{4180, 1},
+	{4176, 1},
+	{4182, 1},
+	{4181, 1},
+	{4179, 1},
+	{4183, 1},
+	{4187, 1},
+	{4201, 1},
+	{4221, 1},
+	{4232, 1},
+	{4244, 1},
+	{4252, 1},
+	{4277, 1},
+	{4285, 1},
+	{4294, 1},
+	{4299, 1},
+	{4304, 1},
+	{4306, 1},
+	{4309, 1},
+	{4336, 1},
+	{4383, 1},
+	{4532, 1},
+	{4531, 1},
+	{4541, 1},
+	{3306, 1},
+	{3317, 1},
+	{3318, 1},
+	{4567, 1},
+	{4576, 1},
+	{4600, 1},
+	{4375, 1},
+	{4381, 1},
+	{844, 2},
+	{849, 2},
+	{849, 2},
+	{846, 3},
+	{846, 3},
+	{1051, 2},
+	{1434, 2},
+	{1428, 2},
+	{1430, 2},
+	{1436, 2},
+	{1432, 2},
+	{7, 1},
+	{0, 0},
+	{8, 2},
+	{1452, 1},
+	{1438, 1},
+	{1443, 1},
+	{1444, 1},
+	{1447, 1},
+	{1448, 1},
+	{1449, 1},
+	{1457, 1},
+	{1459, 1},
+	{483, 1},
+	{1458, 1},
+	{1458, 1},
+	{1458, 1},
+	{1458, 1},
+	{1438, 1},
+	{1438, 1},
+	{1438, 1},
+	{1441, 1},
+	{1442, 1},
+	{1443, 1},
+	{1444, 1},
+	{855, 1},
+	{1445, 1},
+	{1069, 1},
+	{7, 1},
+	{1446, 1},
+	{1447, 1},
+	{1448, 1},
+	{1450, 1},
+	{1451, 1},
+	{1014, 1},
+	{1453, 1},
+	{1454, 1},
+	{1455, 1},
+	{1456, 1},
+	{1457, 1},
+	{1458, 1},
+	{1459, 1},
+	{855, 1},
+	{1441, 1},
+	{1447, 1},
+	{1454, 1},
+	{1439, 2},
+	{2019, 1},
+	{2019, 1},
+	{2021, 1},
+	{2021, 1},
+	{2021, 1},
+	{2021, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{2023, 1},
+	{2023, 1},
+	{2023, 1},
+	{2023, 1},
+	{2020, 1},
+	{2020, 1},
+	{2020, 1},
+	{2020, 1},
+	{2022, 1},
+	{2022, 1},
+	{2022, 1},
+	{2022, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{2032, 1},
+	{2032, 1},
+	{2032, 1},
+	{2032, 1},
+	{2034, 1},
+	{2034, 1},
+	{2034, 1},
+	{2034, 1},
+	{2025, 1},
+	{2025, 1},
+	{2025, 1},
+	{2025, 1},
+	{2024, 1},
+	{2024, 1},
+	{2024, 1},
+	{2024, 1},
+	{2026, 1},
+	{2026, 1},
+	{2026, 1},
+	{2026, 1},
+	{2027, 1},
+	{2027, 1},
+	{2027, 1},
+	{2027, 1},
+	{2030, 1},
+	{2030, 1},
+	{2029, 1},
+	{2029, 1},
+	{1584, 1},
+	{1584, 1},
+	{1584, 1},
+	{1584, 1},
+	{1586, 1},
+	{1586, 1},
+	{1586, 1},
+	{1586, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{2036, 1},
+	{2036, 1},
+	{2036, 1},
+	{2036, 1},
+	{2038, 1},
+	{2038, 1},
+	{2038, 1},
+	{2038, 1},
+	{2037, 1},
+	{2037, 1},
+	{2037, 1},
+	{2037, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1938, 1},
+	{1943, 2},
+	{1938, 1},
+	{1938, 1},
+	{2039, 1},
+	{2039, 1},
+	{1938, 1},
+	{1938, 1},
+	{2021, 1},
+	{2021, 1},
+	{2021, 1},
+	{2021, 1},
+	{1945, 1},
+	{1945, 1},
+	{1978, 3},
+	{1978, 3},
+	{1981, 3},
+	{1981, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2005, 3},
+	{2011, 3},
+	{2011, 3},
+	{2011, 3},
+	{2008, 3},
+	{2008, 3},
+	{2008, 3},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1984, 3},
+	{1987, 3},
+	{1999, 3},
+	{2008, 3},
+	{2008, 3},
+	{1467, 2},
+	{1469, 2},
+	{1474, 2},
+	{1483, 2},
+	{1487, 2},
+	{1487, 2},
+	{1493, 2},
+	{1501, 2},
+	{1509, 2},
+	{1521, 2},
+	{1537, 2},
+	{1537, 2},
+	{1948, 2},
+	{1964, 2},
+	{1974, 2},
+	{1974, 2},
+	{1540, 2},
+	{1552, 2},
+	{1563, 2},
+	{1568, 2},
+	{1576, 2},
+	{1578, 2},
+	{1580, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1625, 2},
+	{1642, 2},
+	{1676, 2},
+	{1684, 2},
+	{1686, 2},
+	{1691, 2},
+	{1698, 2},
+	{1703, 2},
+	{1705, 2},
+	{1719, 2},
+	{1722, 2},
+	{1731, 2},
+	{1742, 2},
+	{1744, 2},
+	{1755, 2},
+	{1757, 2},
+	{1759, 2},
+	{1764, 2},
+	{1769, 2},
+	{1769, 2},
+	{1772, 2},
+	{1777, 2},
+	{1788, 2},
+	{1788, 2},
+	{1791, 2},
+	{1793, 2},
+	{1795, 2},
+	{1797, 2},
+	{1799, 2},
+	{1801, 2},
+	{1809, 2},
+	{1809, 2},
+	{1819, 2},
+	{1830, 2},
+	{1838, 2},
+	{1843, 2},
+	{1851, 2},
+	{1851, 2},
+	{1856, 2},
+	{1870, 2},
+	{1885, 2},
+	{1896, 2},
+	{1901, 2},
+	{1901, 2},
+	{1474, 2},
+	{1915, 2},
+	{1923, 2},
+	{1929, 2},
+	{1936, 2},
+	{1936, 2},
+	{1021, 2},
+	{1023, 2},
+	{1031, 2},
+	{1031, 2},
+	{1948, 2},
+	{1953, 2},
+	{1958, 2},
+	{1964, 2},
+	{1974, 2},
+	{1974, 2},
+	{1585, 1},
+	{1586, 1},
+	{1945, 1},
+	{4423, 1},
+	{4424, 1},
+	{4425, 1},
+	{4427, 1},
+	{4429, 1},
+	{4431, 1},
+	{1993, 3},
+	{1996, 3},
+	{1999, 3},
+	{2002, 3},
+	{2008, 3},
+	{2008, 3},
+	{1479, 2},
+	{1481, 2},
+	{1483, 2},
+	{1485, 2},
+	{1487, 2},
+	{1487, 2},
+	{1517, 2},
+	{1519, 2},
+	{1521, 2},
+	{1535, 2},
+	{1537, 2},
+	{1537, 2},
+	{1960, 2},
+	{1962, 2},
+	{1964, 2},
+	{1972, 2},
+	{1974, 2},
+	{1974, 2},
+	{1769, 2},
+	{1769, 2},
+	{1788, 2},
+	{1788, 2},
+	{1791, 2},
+	{1799, 2},
+	{1801, 2},
+	{1809, 2},
+	{1809, 2},
+	{1843, 2},
+	{1851, 2},
+	{1851, 2},
+	{1854, 2},
+	{1896, 2},
+	{1925, 2},
+	{1927, 2},
+	{1929, 2},
+	{1934, 2},
+	{1936, 2},
+	{1936, 2},
+	{1945, 1},
+	{1960, 2},
+	{1962, 2},
+	{1964, 2},
+	{1972, 2},
+	{1974, 2},
+	{1974, 2},
+	{1984, 3},
+	{1987, 3},
+	{1990, 3},
+	{1999, 3},
+	{1981, 3},
+	{1467, 2},
+	{1469, 2},
+	{1474, 2},
+	{1483, 2},
+	{1465, 2},
+	{1493, 2},
+	{1501, 2},
+	{1509, 2},
+	{1521, 2},
+	{1491, 2},
+	{1964, 2},
+	{1540, 2},
+	{1552, 2},
+	{1563, 2},
+	{1568, 2},
+	{1576, 2},
+	{1580, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1625, 2},
+	{1642, 2},
+	{1650, 2},
+	{1676, 2},
+	{1684, 2},
+	{1686, 2},
+	{1691, 2},
+	{1698, 2},
+	{1703, 2},
+	{1719, 2},
+	{1722, 2},
+	{1731, 2},
+	{1742, 2},
+	{1744, 2},
+	{1755, 2},
+	{1757, 2},
+	{1759, 2},
+	{1764, 2},
+	{1772, 2},
+	{1777, 2},
+	{1793, 2},
+	{1795, 2},
+	{1797, 2},
+	{1799, 2},
+	{1801, 2},
+	{1819, 2},
+	{1830, 2},
+	{1838, 2},
+	{1843, 2},
+	{1817, 2},
+	{1856, 2},
+	{1870, 2},
+	{1885, 2},
+	{1896, 2},
+	{1474, 2},
+	{1915, 2},
+	{1923, 2},
+	{1929, 2},
+	{1904, 2},
+	{1021, 2},
+	{1023, 2},
+	{1014, 1},
+	{1948, 2},
+	{1953, 2},
+	{1958, 2},
+	{1964, 2},
+	{1946, 2},
+	{1999, 3},
+	{1981, 3},
+	{1483, 2},
+	{1465, 2},
+	{1521, 2},
+	{1491, 2},
+	{1964, 2},
+	{1946, 2},
+	{1625, 2},
+	{1597, 2},
+	{1625, 2},
+	{1597, 2},
+	{1799, 2},
+	{1801, 2},
+	{1843, 2},
+	{1929, 2},
+	{1904, 2},
+	{1964, 2},
+	{1946, 2},
+	{4426, 1},
+	{4428, 1},
+	{4430, 1},
+	{1716, 2},
+	{1716, 2},
+	{1739, 2},
+	{1739, 2},
+	{1752, 2},
+	{1752, 2},
+	{1639, 2},
+	{1639, 2},
+	{1639, 2},
+	{1639, 2},
+	{1573, 2},
+	{1573, 2},
+	{1560, 2},
+	{1560, 2},
+	{1582, 2},
+	{1582, 2},
+	{1681, 2},
+	{1681, 2},
+	{1700, 2},
+	{1700, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1625, 2},
+	{1623, 2},
+	{1623, 2},
+	{1652, 2},
+	{1696, 2},
+	{1716, 2},
+	{1716, 2},
+	{1739, 2},
+	{1739, 2},
+	{1752, 2},
+	{1752, 2},
+	{1639, 2},
+	{1639, 2},
+	{1639, 2},
+	{1639, 2},
+	{1573, 2},
+	{1573, 2},
+	{1560, 2},
+	{1560, 2},
+	{1582, 2},
+	{1582, 2},
+	{1681, 2},
+	{1681, 2},
+	{1700, 2},
+	{1700, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1625, 2},
+	{1623, 2},
+	{1623, 2},
+	{1652, 2},
+	{1696, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1625, 2},
+	{1597, 2},
+	{1597, 2},
+	{1705, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1599, 2},
+	{1607, 2},
+	{1618, 2},
+	{1705, 2},
+	{1719, 2},
+	{855, 1},
+	{855, 1},
+	{29, 1},
+	{475, 1},
+	{1495, 3},
+	{1503, 3},
+	{1503, 3},
+	{1506, 3},
+	{1511, 3},
+	{1523, 3},
+	{1526, 3},
+	{1529, 3},
+	{1554, 3},
+	{1554, 3},
+	{1570, 3},
+	{1570, 3},
+	{1609, 3},
+	{1601, 3},
+	{1604, 3},
+	{1630, 3},
+	{1630, 3},
+	{1627, 3},
+	{1636, 3},
+	{1636, 3},
+	{1644, 3},
+	{1644, 3},
+	{1678, 3},
+	{1612, 3},
+	{1612, 3},
+	{1604, 3},
+	{1633, 3},
+	{1633, 3},
+	{1636, 3},
+	{1636, 3},
+	{1688, 3},
+	{1693, 3},
+	{1693, 3},
+	{1707, 3},
+	{1707, 3},
+	{1710, 3},
+	{1713, 3},
+	{1724, 3},
+	{1733, 3},
+	{1733, 3},
+	{1736, 3},
+	{1746, 3},
+	{1749, 3},
+	{1749, 3},
+	{1761, 3},
+	{1761, 3},
+	{1779, 3},
+	{1782, 3},
+	{1832, 3},
+	{1835, 3},
+	{1835, 3},
+	{1821, 3},
+	{1821, 3},
+	{1840, 3},
+	{1840, 3},
+	{1845, 3},
+	{1845, 3},
+	{1872, 3},
+	{1875, 3},
+	{1882, 3},
+	{1858, 3},
+	{1864, 3},
+	{1887, 3},
+	{1890, 3},
+	{1861, 3},
+	{1025, 3},
+	{1028, 3},
+	{1917, 3},
+	{1920, 3},
+	{1909, 3},
+	{1909, 3},
+	{1912, 3},
+	{1931, 3},
+	{1931, 3},
+	{1966, 3},
+	{1966, 3},
+	{1476, 3},
+	{1498, 3},
+	{1498, 3},
+	{1514, 3},
+	{1514, 3},
+	{1532, 3},
+	{1532, 3},
+	{1557, 3},
+	{1542, 3},
+	{1557, 3},
+	{1620, 3},
+	{1647, 3},
+	{1615, 3},
+	{1688, 3},
+	{1827, 3},
+	{1848, 3},
+	{1955, 3},
+	{1950, 3},
+	{1969, 3},
+	{1898, 3},
+	{1785, 3},
+	{1920, 3},
+	{1779, 3},
+	{1832, 3},
+	{1736, 3},
+	{1806, 3},
+	{1906, 3},
+	{1893, 3},
+	{1824, 3},
+	{1803, 3},
+	{1824, 3},
+	{1906, 3},
+	{1542, 3},
+	{1565, 3},
+	{1867, 3},
+	{1766, 3},
+	{1471, 3},
+	{1803, 3},
+	{1724, 3},
+	{1678, 3},
+	{1620, 3},
+	{1912, 3},
+	{1658, 3},
+	{1774, 3},
+	{997, 4},
+	{993, 4},
+	{1878, 4},
+	{1654, 4},
+	{1587, 4},
+	{1727, 4},
+	{1939, 4},
+	{1658, 3},
+	{1661, 7},
+	{1545, 6},
+	{1591, 4},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{3211, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{644, 1},
+	{3171, 1},
+	{3149, 1},
+	{3162, 1},
+	{3163, 1},
+	{3164, 1},
+	{3165, 1},
+	{3166, 1},
+	{3167, 1},
+	{1358, 1},
+	{1358, 1},
+	{1358, 1},
+	{1358, 1},
+	{797, 1},
+	{797, 1},
+	{797, 1},
+	{483, 1},
+	{791, 1},
+	{1463, 1},
+	{855, 1},
+	{855, 1},
+	{1001, 2},
+	{1001, 2},
+	{1943, 2},
+	{1943, 2},
+	{855, 1},
+	{855, 1},
+	{1976, 2},
+	{1976, 2},
+	{1976, 2},
+	{1976, 2},
+	{855, 1},
+	{855, 1},
+	{1464, 1},
+	{1464, 1},
+	{1464, 1},
+	{1464, 1},
+	{1489, 1},
+	{1489, 1},
+	{1490, 1},
+	{1490, 1},
+	{1490, 1},
+	{1490, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1539, 1},
+	{1539, 1},
+	{1539, 1},
+	{1539, 1},
+	{1562, 1},
+	{1562, 1},
+	{1562, 1},
+	{1562, 1},
+	{1575, 1},
+	{1575, 1},
+	{1575, 1},
+	{1575, 1},
+	{1584, 1},
+	{1584, 1},
+	{1585, 1},
+	{1585, 1},
+	{1586, 1},
+	{1586, 1},
+	{1595, 1},
+	{1595, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1596, 1},
+	{1641, 1},
+	{1641, 1},
+	{1641, 1},
+	{1641, 1},
+	{1683, 1},
+	{1683, 1},
+	{1683, 1},
+	{1683, 1},
+	{1702, 1},
+	{1702, 1},
+	{1702, 1},
+	{1702, 1},
+	{1718, 1},
+	{1718, 1},
+	{1718, 1},
+	{1718, 1},
+	{1721, 1},
+	{1721, 1},
+	{1721, 1},
+	{1721, 1},
+	{1741, 1},
+	{1741, 1},
+	{1741, 1},
+	{1741, 1},
+	{1754, 1},
+	{1754, 1},
+	{1754, 1},
+	{1754, 1},
+	{1771, 1},
+	{1771, 1},
+	{1771, 1},
+	{1771, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{1790, 1},
+	{1811, 1},
+	{1811, 1},
+	{1811, 1},
+	{1811, 1},
+	{1853, 1},
+	{1853, 1},
+	{1853, 1},
+	{1853, 1},
+	{1903, 1},
+	{1903, 1},
+	{1903, 1},
+	{1903, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1014, 1},
+	{1938, 1},
+	{1938, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1945, 1},
+	{1812, 2},
+	{1812, 2},
+	{1814, 3},
+	{1814, 3},
+	{1812, 2},
+	{1812, 2},
+	{1812, 2},
+	{1812, 2},
+	{0, 0},
+	{0, 1},
+	{8, 2},
+	{7, 1},
+	{3255, 1},
+	{644, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{704, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{756, 1},
+	{757, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{29, 1},
+	{791, 1},
+	{475, 1},
+	{4422, 1},
+	{7, 1},
+	{798, 1},
+	{824, 1},
+	{842, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{855, 1},
+	{1014, 1},
+	{1038, 1},
+	{1047, 1},
+	{1069, 1},
+	{1080, 1},
+	{1086, 1},
+	{3171, 1},
+	{3212, 1},
+	{1101, 1},
+	{1358, 1},
+	{855, 1},
+	{3178, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1101, 1},
+	{727, 1},
+	{783, 1},
+	{768, 1},
+	{962, 3},
+	{957, 2},
+	{3208, 1},
+	{0, 0},
+	{695, 1},
+	{1373, 1},
+	{704, 1},
+	{705, 1},
+	{855, 1},
+	{1321, 1},
+	{783, 1},
+	{734, 1},
+	{3024, 1},
+	{747, 1},
+	{756, 1},
+	{757, 1},
+	{479, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{1373, 1},
+	{705, 1},
+	{734, 1},
+	{1393, 1},
+	{724, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3209, 1},
+	{712, 1},
+	{0, 0},
+	{1584, 1},
+	{1938, 1},
+	{1702, 1},
+	{1641, 1},
+	{790, 1},
+	{695, 1},
+	{696, 1},
+	{855, 1},
+	{724, 1},
+	{1393, 1},
+	{757, 1},
+	{783, 1},
+	{622, 1},
+	{478, 1},
+	{855, 1},
+	{783, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4437, 1},
+	{4438, 1},
+	{1307, 1},
+	{734, 1},
+	{4401, 1},
+	{696, 1},
+	{719, 1},
+	{3204, 1},
+	{756, 1},
+	{1304, 1},
+	{1398, 1},
+	{4414, 1},
+	{1352, 1},
+	{1014, 1},
+	{824, 1},
+	{1332, 1},
+	{1329, 1},
+	{1354, 1},
+	{1047, 1},
+	{1325, 1},
+	{3064, 1},
+	{4442, 1},
+	{1321, 1},
+	{753, 1},
+	{1416, 1},
+	{734, 1},
+	{1350, 1},
+	{1296, 1},
+	{1396, 1},
+	{763, 1},
+	{3026, 1},
+	{1381, 1},
+	{611, 1},
+	{1348, 1},
+	{1384, 1},
+	{1014, 1},
+	{4404, 1},
+	{1064, 1},
+	{1390, 1},
+	{727, 1},
+	{734, 1},
+	{716, 1},
+	{696, 1},
+	{768, 1},
+	{705, 1},
+	{719, 1},
+	{783, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{486, 1},
+	{4444, 2},
+	{0, 0},
+	{0, 0},
+	{4447, 1},
+	{4446, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4448, 1},
+	{4449, 1},
+	{4450, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2064, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2064, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4417, 1},
+	{4416, 1},
+	{3112, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4451, 2},
+	{4453, 2},
+	{4455, 2},
+	{4457, 2},
+	{4459, 2},
+	{4461, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4463, 2},
+	{0, 0},
+	{2068, 1},
+	{2069, 1},
+	{2070, 1},
+	{2071, 1},
+	{2072, 1},
+	{2073, 1},
+	{2086, 1},
+	{2076, 1},
+	{2077, 1},
+	{2078, 1},
+	{2079, 1},
+	{2080, 1},
+	{2081, 1},
+	{2083, 1},
+	{2084, 1},
+	{2082, 1},
+	{2075, 1},
+	{2085, 1},
+	{2087, 1},
+	{2088, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{2089, 1},
+	{1079, 1},
+	{734, 1},
+	{2090, 1},
+	{2091, 1},
+	{2092, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4465, 1},
+	{4465, 1},
+	{4466, 1},
+	{4467, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4468, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1045, 2},
+	{1069, 1},
+	{1079, 1},
+	{1079, 1},
+	{1079, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{768, 1},
+	{705, 1},
+	{719, 1},
+	{789, 1},
+	{704, 1},
+	{3095, 1},
+	{790, 1},
+	{633, 1},
+	{704, 1},
+	{576, 1},
+	{719, 1},
+	{734, 1},
+	{3024, 1},
+	{763, 1},
+	{589, 1},
+	{757, 1},
+	{1069, 1},
+	{1047, 1},
+	{705, 1},
+	{855, 1},
+	{1087, 1},
+	{611, 1},
+	{1014, 1},
+	{559, 1},
+	{633, 1},
+	{4414, 1},
+	{600, 1},
+	{633, 1},
+	{1014, 1},
+	{1064, 1},
+	{1086, 1},
+	{734, 1},
+	{1045, 2},
+	{2018, 1},
+	{790, 1},
+	{782, 1},
+	{696, 1},
+	{783, 1},
+	{782, 1},
+	{696, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4478, 2},
+	{4480, 2},
+	{4470, 2},
+	{4472, 3},
+	{4475, 3},
+	{4487, 2},
+	{4482, 2},
+	{4484, 3},
+	{4489, 2},
+	{4491, 2},
+	{4493, 2},
+	{4495, 3},
+	{4498, 3},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4501, 2},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4439, 1},
+	{4443, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1368, 1},
+	{768, 1},
+	{757, 1},
+	{719, 1},
+	{1373, 1},
+	{4403, 1},
+	{4401, 1},
+	{855, 1},
+	{1307, 1},
+	{753, 1},
+	{756, 1},
+	{559, 1},
+	{1321, 1},
+	{665, 1},
+	{680, 1},
+	{763, 1},
+	{789, 1},
+	{0, 0},
+	{7, 1},
+	{7, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1088, 1},
+	{4504, 1},
+	{4505, 1},
+	{4505, 1},
+	{4505, 1},
+	{4505, 1},
+	{4505, 1},
+	{4505, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{486, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{4506, 1},
+	{4507, 1},
+	{4506, 1},
+	{4507, 1},
+	{4506, 1},
+	{4507, 1},
+	{1417, 1},
+	{559, 1},
+	{1398, 1},
+	{768, 1},
+	{791, 1},
+	{611, 1},
+	{705, 1},
+	{4435, 1},
+	{4401, 1},
+	{753, 1},
+	{3203, 1},
+	{734, 1},
+	{3077, 1},
+	{4398, 1},
+	{1307, 1},
+	{1410, 1},
+	{719, 1},
+	{4401, 1},
+	{4415, 1},
+	{651, 1},
+	{665, 1},
+	{3130, 1},
+	{3131, 1},
+	{494, 1},
+	{791, 1},
+	{3016, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{1418, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{696, 1},
+	{699, 1},
+	{709, 1},
+	{713, 1},
+	{716, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{843, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{734, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{680, 1},
+	{695, 1},
+	{696, 1},
+	{699, 1},
+	{704, 1},
+	{705, 1},
+	{709, 1},
+	{712, 1},
+	{855, 1},
+	{713, 1},
+	{716, 1},
+	{719, 1},
+	{724, 1},
+	{727, 1},
+	{734, 1},
+	{747, 1},
+	{750, 1},
+	{753, 1},
+	{756, 1},
+	{757, 1},
+	{763, 1},
+	{768, 1},
+	{782, 1},
+	{783, 1},
+	{789, 1},
+	{790, 1},
+	{798, 1},
+	{817, 1},
+	{824, 1},
+	{831, 1},
+	{842, 1},
+	{843, 1},
+	{853, 1},
+	{854, 1},
+	{855, 1},
+	{1009, 1},
+	{1010, 1},
+	{855, 1},
+	{1045, 2},
+	{1011, 1},
+	{1014, 1},
+	{1038, 1},
+	{1041, 1},
+	{1042, 1},
+	{1047, 1},
+	{1053, 1},
+	{1064, 1},
+	{1069, 1},
+	{1079, 1},
+	{1080, 1},
+	{1086, 1},
+	{1087, 1},
+	{855, 1},
+	{1319, 1},
+	{680, 1},
+	{695, 1},
+	{1368, 1},
+	{1373, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{1378, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{734, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3095, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1383, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1384, 1},
+	{1385, 1},
+	{1069, 1},
+	{1386, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{1388, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{1389, 1},
+	{1390, 1},
+	{1391, 1},
+	{3093, 1},
+	{4414, 1},
+	{734, 1},
+	{1300, 1},
+	{1333, 1},
+	{1038, 1},
+	{1387, 1},
+	{680, 1},
+	{695, 1},
+	{1368, 1},
+	{1373, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{1378, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{734, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3095, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1383, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1384, 1},
+	{1385, 1},
+	{1069, 1},
+	{1386, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{1388, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{1389, 1},
+	{1390, 1},
+	{1391, 1},
+	{3093, 1},
+	{4414, 1},
+	{734, 1},
+	{1300, 1},
+	{1333, 1},
+	{1038, 1},
+	{1387, 1},
+	{680, 1},
+	{695, 1},
+	{1368, 1},
+	{1373, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{1378, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{734, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3095, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1383, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1384, 1},
+	{1385, 1},
+	{1069, 1},
+	{1386, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{1388, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{1389, 1},
+	{1390, 1},
+	{1391, 1},
+	{3093, 1},
+	{4414, 1},
+	{734, 1},
+	{1300, 1},
+	{1333, 1},
+	{1038, 1},
+	{1387, 1},
+	{680, 1},
+	{695, 1},
+	{1368, 1},
+	{1373, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{1378, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{734, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3095, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1383, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1384, 1},
+	{1385, 1},
+	{1069, 1},
+	{1386, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{1388, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{1389, 1},
+	{1390, 1},
+	{1391, 1},
+	{3093, 1},
+	{4414, 1},
+	{734, 1},
+	{1300, 1},
+	{1333, 1},
+	{1038, 1},
+	{1387, 1},
+	{680, 1},
+	{695, 1},
+	{1368, 1},
+	{1373, 1},
+	{704, 1},
+	{790, 1},
+	{712, 1},
+	{734, 1},
+	{855, 1},
+	{716, 1},
+	{1321, 1},
+	{724, 1},
+	{727, 1},
+	{1378, 1},
+	{734, 1},
+	{1379, 1},
+	{747, 1},
+	{734, 1},
+	{1309, 1},
+	{757, 1},
+	{789, 1},
+	{1380, 1},
+	{783, 1},
+	{1381, 1},
+	{1382, 1},
+	{3095, 1},
+	{798, 1},
+	{1297, 1},
+	{1086, 1},
+	{3071, 1},
+	{4414, 1},
+	{1383, 1},
+	{1011, 1},
+	{734, 1},
+	{855, 1},
+	{1300, 1},
+	{1384, 1},
+	{1385, 1},
+	{1069, 1},
+	{1386, 1},
+	{1014, 1},
+	{1387, 1},
+	{1038, 1},
+	{1388, 1},
+	{1014, 1},
+	{3067, 1},
+	{1064, 1},
+	{1333, 1},
+	{1389, 1},
+	{1390, 1},
+	{1391, 1},
+	{3093, 1},
+	{4414, 1},
+	{734, 1},
+	{1300, 1},
+	{1333, 1},
+	{1038, 1},
+	{1387, 1},
+	{705, 1},
+	{1394, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{3100, 1},
+	{2015, 1},
+	{622, 1},
+	{3093, 1},
+	{3093, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{855, 1},
+	{1464, 1},
+	{1539, 1},
+	{1584, 1},
+	{1938, 1},
+	{1595, 1},
+	{1562, 1},
+	{1702, 1},
+	{1945, 1},
+	{1790, 1},
+	{1811, 1},
+	{1853, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1754, 1},
+	{1641, 1},
+	{1771, 1},
+	{1586, 1},
+	{1596, 1},
+	{1490, 1},
+	{1945, 1},
+	{1575, 1},
+	{1585, 1},
+	{1683, 1},
+	{1718, 1},
+	{1741, 1},
+	{1945, 1},
+	{1945, 1},
+	{2032, 1},
+	{2032, 1},
+	{1464, 1},
+	{1539, 1},
+	{1014, 1},
+	{1562, 1},
+	{1945, 1},
+	{1790, 1},
+	{1811, 1},
+	{1853, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1754, 1},
+	{1641, 1},
+	{1771, 1},
+	{1596, 1},
+	{1490, 1},
+	{1945, 1},
+	{1575, 1},
+	{1683, 1},
+	{1741, 1},
+	{1539, 1},
+	{1562, 1},
+	{1945, 1},
+	{1811, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1641, 1},
+	{1771, 1},
+	{1596, 1},
+	{1575, 1},
+	{1683, 1},
+	{1741, 1},
+	{1945, 1},
+	{2032, 1},
+	{1464, 1},
+	{1539, 1},
+	{1014, 1},
+	{1562, 1},
+	{1702, 1},
+	{1945, 1},
+	{1790, 1},
+	{1853, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1754, 1},
+	{1641, 1},
+	{1771, 1},
+	{1596, 1},
+	{1490, 1},
+	{1945, 1},
+	{1575, 1},
+	{1683, 1},
+	{1718, 1},
+	{1741, 1},
+	{1945, 1},
+	{2032, 1},
+	{855, 1},
+	{1464, 1},
+	{1539, 1},
+	{1584, 1},
+	{1014, 1},
+	{1938, 1},
+	{1595, 1},
+	{1562, 1},
+	{1702, 1},
+	{1945, 1},
+	{1811, 1},
+	{1853, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1754, 1},
+	{1641, 1},
+	{1771, 1},
+	{1586, 1},
+	{1596, 1},
+	{1490, 1},
+	{1945, 1},
+	{1575, 1},
+	{1585, 1},
+	{1683, 1},
+	{1718, 1},
+	{1741, 1},
+	{1464, 1},
+	{1539, 1},
+	{1584, 1},
+	{1938, 1},
+	{1595, 1},
+	{1562, 1},
+	{1702, 1},
+	{1945, 1},
+	{1811, 1},
+	{1853, 1},
+	{1903, 1},
+	{1596, 1},
+	{1721, 1},
+	{1754, 1},
+	{1641, 1},
+	{1771, 1},
+	{1586, 1},
+	{1596, 1},
+	{1490, 1},
+	{1945, 1},
+	{1575, 1},
+	{1585, 1},
+	{1683, 1},
+	{1718, 1},
+	{1741, 1},
+	{739, 2},
+	{737, 2},
+	{858, 2},
+	{501, 2},
+	{560, 2},
+	{577, 2},
+	{590, 2},
+	{601, 2},
+	{612, 2},
+	{623, 2},
+	{634, 2},
+	{5, 1},
+	{60, 3},
+	{63, 3},
+	{66, 3},
+	{69, 3},
+	{72, 3},
+	{75, 3},
+	{78, 3},
+	{81, 3},
+	{159, 3},
+	{84, 3},
+	{87, 3},
+	{90, 3},
+	{93, 3},
+	{96, 3},
+	{99, 3},
+	{102, 3},
+	{105, 3},
+	{108, 3},
+	{111, 3},
+	{114, 3},
+	{117, 3},
+	{120, 3},
+	{123, 3},
+	{126, 3},
+	{129, 3},
+	{132, 3},
+	{111, 3},
+	{3275, 1},
+	{696, 1},
+	{374, 3},
+	{299, 3},
+	{305, 3},
+	{353, 3},
+	{386, 3},
+	{356, 3},
+	{392, 3},
+	{329, 3},
+	{359, 3},
+	{3182, 1},
+	{3183, 1},
+	{3182, 1},
+	{751, 2},
+	{4403, 1},
+	{1373, 1},
+	{4435, 1},
+	{687, 2},
+	{768, 1},
+	{3181, 1},
+	{734, 1},
+	{4434, 1},
+	{3199, 1},
+	{696, 1},
+	{3024, 1},
+	{3139, 1},
+	{1048, 3},
+	{3114, 1},
+	{757, 1},
+	{725, 2},
+	{769, 2},
+	{3138, 1},
+	{734, 1},
+	{855, 1},
+	{500, 1},
+	{559, 1},
+	{576, 1},
+	{589, 1},
+	{600, 1},
+	{611, 1},
+	{622, 1},
+	{633, 1},
+	{3184, 1},
+	{3395, 1},
+	{3393, 1},
+	{3396, 1},
+	{4510, 1},
+	{3412, 1},
+	{3417, 1},
+	{3418, 1},
+	{3413, 1},
+	{3422, 1},
+	{3423, 1},
+	{3426, 1},
+	{3424, 1},
+	{3276, 1},
+	{4514, 1},
+	{3430, 1},
+	{3431, 1},
+	{3432, 1},
+	{3439, 1},
+	{4511, 1},
+	{3277, 1},
+	{3434, 1},
+	{3442, 1},
+	{4513, 1},
+	{3446, 1},
+	{3447, 1},
+	{3410, 1},
+	{3449, 1},
+	{3450, 1},
+	{4608, 1},
+	{3457, 1},
+	{3460, 1},
+	{3279, 1},
+	{3465, 1},
+	{3466, 1},
+	{3467, 1},
+	{3468, 1},
+	{3280, 1},
+	{3473, 1},
+	{3474, 1},
+	{3477, 1},
+	{3480, 1},
+	{3481, 1},
+	{3482, 1},
+	{3484, 1},
+	{3491, 1},
+	{3494, 1},
+	{3495, 1},
+	{3498, 1},
+	{3500, 1},
+	{3501, 1},
+	{3501, 1},
+	{3501, 1},
+	{4517, 1},
+	{3869, 1},
+	{3506, 1},
+	{3507, 1},
+	{4518, 1},
+	{3510, 1},
+	{3511, 1},
+	{3512, 1},
+	{3519, 1},
+	{3515, 1},
+	{3517, 1},
+	{3518, 1},
+	{3520, 1},
+	{3522, 1},
+	{3523, 1},
+	{3524, 1},
+	{3526, 1},
+	{3527, 1},
+	{3527, 1},
+	{3529, 1},
+	{3531, 1},
+	{3532, 1},
+	{3534, 1},
+	{3541, 1},
+	{3536, 1},
+	{3542, 1},
+	{3537, 1},
+	{3539, 1},
+	{3461, 1},
+	{3560, 1},
+	{3545, 1},
+	{3546, 1},
+	{3547, 1},
+	{3544, 1},
+	{3549, 1},
+	{3548, 1},
+	{3556, 1},
+	{4519, 1},
+	{3561, 1},
+	{3562, 1},
+	{3564, 1},
+	{3567, 1},
+	{3568, 1},
+	{3574, 1},
+	{4520, 1},
+	{4521, 1},
+	{3577, 1},
+	{3578, 1},
+	{3579, 1},
+	{3576, 1},
+	{3581, 1},
+	{3284, 1},
+	{3285, 1},
+	{3584, 1},
+	{3586, 1},
+	{3586, 1},
+	{4522, 1},
+	{3590, 1},
+	{3591, 1},
+	{3592, 1},
+	{3594, 1},
+	{4523, 1},
+	{3596, 1},
+	{3597, 1},
+	{3653, 1},
+	{3599, 1},
+	{3286, 1},
+	{3603, 1},
+	{3607, 1},
+	{3610, 1},
+	{3609, 1},
+	{4525, 1},
+	{3612, 1},
+	{4526, 1},
+	{3615, 1},
+	{3614, 1},
+	{3616, 1},
+	{3620, 1},
+	{3621, 1},
+	{3287, 1},
+	{3625, 1},
+	{3628, 1},
+	{3629, 1},
+	{3630, 1},
+	{3288, 1},
+	{4527, 1},
+	{3289, 1},
+	{3636, 1},
+	{3637, 1},
+	{3638, 1},
+	{3640, 1},
+	{4618, 1},
+	{3646, 1},
+	{4529, 1},
+	{4529, 1},
+	{4078, 1},
+	{3650, 1},
+	{3650, 1},
+	{3290, 1},
+	{4536, 1},
+	{4578, 1},
+	{3655, 1},
+	{3657, 1},
+	{3291, 1},
+	{3660, 1},
+	{3665, 1},
+	{3666, 1},
+	{3668, 1},
+	{3672, 1},
+	{3294, 1},
+	{3293, 1},
+	{3673, 1},
+	{4530, 1},
+	{3674, 1},
+	{3679, 1},
+	{3680, 1},
+	{3681, 1},
+	{3680, 1},
+	{3684, 1},
+	{3685, 1},
+	{3689, 1},
+	{3687, 1},
+	{3688, 1},
+	{3690, 1},
+	{3691, 1},
+	{3692, 1},
+	{3695, 1},
+	{3696, 1},
+	{3702, 1},
+	{3703, 1},
+	{3707, 1},
+	{3711, 1},
+	{4533, 1},
+	{3710, 1},
+	{3708, 1},
+	{3712, 1},
+	{3714, 1},
+	{3719, 1},
+	{4534, 1},
+	{3721, 1},
+	{3718, 1},
+	{3716, 1},
+	{3295, 1},
+	{3723, 1},
+	{3725, 1},
+	{3727, 1},
+	{3724, 1},
+	{3297, 1},
+	{3732, 1},
+	{3734, 1},
+	{4535, 1},
+	{3746, 1},
+	{3759, 1},
+	{3749, 1},
+	{3301, 1},
+	{3753, 1},
+	{3300, 1},
+	{3299, 1},
+	{3443, 1},
+	{3444, 1},
+	{3760, 1},
+	{3754, 1},
+	{4066, 1},
+	{3331, 1},
+	{3766, 1},
+	{3768, 1},
+	{3769, 1},
+	{3775, 1},
+	{3773, 1},
+	{4540, 1},
+	{3305, 1},
+	{3781, 1},
+	{3778, 1},
+	{3784, 1},
+	{3786, 1},
+	{4542, 1},
+	{3787, 1},
+	{3783, 1},
+	{3789, 1},
+	{3306, 1},
+	{3790, 1},
+	{3792, 1},
+	{3793, 1},
+	{3796, 1},
+	{4543, 1},
+	{3798, 1},
+	{3308, 1},
+	{3801, 1},
+	{4544, 1},
+	{3802, 1},
+	{3309, 1},
+	{3805, 1},
+	{3809, 1},
+	{3812, 1},
+	{3813, 1},
+	{4545, 1},
+	{4524, 1},
+	{4546, 1},
+	{3824, 1},
+	{4547, 1},
+	{3827, 1},
+	{3829, 1},
+	{3825, 1},
+	{3831, 1},
+	{3835, 1},
+	{3839, 1},
+	{3836, 1},
+	{3837, 1},
+	{3840, 1},
+	{3841, 1},
+	{4548, 1},
+	{3834, 1},
+	{3847, 1},
+	{3848, 1},
+	{3310, 1},
+	{3853, 1},
+	{3852, 1},
+	{4549, 1},
+	{3845, 1},
+	{3859, 1},
+	{4550, 1},
+	{4551, 1},
+	{3860, 1},
+	{3865, 1},
+	{3864, 1},
+	{3863, 1},
+	{3311, 1},
+	{3866, 1},
+	{3871, 1},
+	{3870, 1},
+	{3873, 1},
+	{4512, 1},
+	{3876, 1},
+	{4552, 1},
+	{3879, 1},
+	{4554, 1},
+	{3884, 1},
+	{3887, 1},
+	{3892, 1},
+	{4555, 1},
+	{3896, 1},
+	{3897, 1},
+	{4556, 1},
+	{4557, 1},
+	{3905, 1},
+	{3909, 1},
+	{3312, 1},
+	{3910, 1},
+	{3313, 1},
+	{3313, 1},
+	{3916, 1},
+	{3917, 1},
+	{3919, 1},
+	{3920, 1},
+	{3923, 1},
+	{3314, 1},
+	{3929, 1},
+	{4558, 1},
+	{3933, 1},
+	{4559, 1},
+	{3936, 1},
+	{4528, 1},
+	{3940, 1},
+	{4560, 1},
+	{4561, 1},
+	{4562, 1},
+	{3315, 1},
+	{3316, 1},
+	{3953, 1},
+	{4564, 1},
+	{4563, 1},
+	{4565, 1},
+	{4566, 1},
+	{3955, 1},
+	{3956, 1},
+	{3956, 1},
+	{3958, 1},
+	{3318, 1},
+	{3959, 1},
+	{3320, 1},
+	{3321, 1},
+	{4568, 1},
+	{3965, 1},
+	{3967, 1},
+	{3970, 1},
+	{3322, 1},
+	{4569, 1},
+	{3980, 1},
+	{4570, 1},
+	{4571, 1},
+	{3987, 1},
+	{3992, 1},
+	{3323, 1},
+	{3994, 1},
+	{3995, 1},
+	{3996, 1},
+	{4572, 1},
+	{4573, 1},
+	{4573, 1},
+	{4002, 1},
+	{3324, 1},
+	{4574, 1},
+	{4006, 1},
+	{4007, 1},
+	{3325, 1},
+	{4575, 1},
+	{4014, 1},
+	{3326, 1},
+	{4018, 1},
+	{4016, 1},
+	{4021, 1},
+	{4577, 1},
+	{4027, 1},
+	{3327, 1},
+	{4030, 1},
+	{4032, 1},
+	{4036, 1},
+	{3328, 1},
+	{4579, 1},
+	{4580, 1},
+	{3329, 1},
+	{4581, 1},
+	{4044, 1},
+	{4582, 1},
+	{4047, 1},
+	{4050, 1},
+	{4053, 1},
+	{4583, 1},
+	{4584, 1},
+	{4058, 1},
+	{4585, 1},
+	{4060, 1},
+	{4537, 1},
+	{3330, 1},
+	{4067, 1},
+	{4069, 1},
+	{3332, 1},
+	{4070, 1},
+	{3583, 1},
+	{4586, 1},
+	{4587, 1},
+	{4538, 1},
+	{4539, 1},
+	{4078, 1},
+	{4079, 1},
+	{4226, 1},
+	{3334, 1},
+	{4090, 1},
+	{4089, 1},
+	{4091, 1},
+	{3472, 1},
+	{4092, 1},
+	{4093, 1},
+	{4094, 1},
+	{4096, 1},
+	{4588, 1},
+	{4095, 1},
+	{4097, 1},
+	{4102, 1},
+	{4103, 1},
+	{4098, 1},
+	{4104, 1},
+	{4109, 1},
+	{4114, 1},
+	{4101, 1},
+	{4106, 1},
+	{4107, 1},
+	{4108, 1},
+	{4589, 1},
+	{4591, 1},
+	{4590, 1},
+	{3335, 1},
+	{4117, 1},
+	{4118, 1},
+	{4120, 1},
+	{4595, 1},
+	{4121, 1},
+	{4592, 1},
+	{3336, 1},
+	{3337, 1},
+	{4593, 1},
+	{4594, 1},
+	{3338, 1},
+	{4131, 1},
+	{4132, 1},
+	{4133, 1},
+	{4134, 1},
+	{4137, 1},
+	{4136, 1},
+	{4139, 1},
+	{4138, 1},
+	{4142, 1},
+	{4140, 1},
+	{4141, 1},
+	{4143, 1},
+	{3339, 1},
+	{4145, 1},
+	{4146, 1},
+	{3340, 1},
+	{4150, 1},
+	{4151, 1},
+	{4596, 1},
+	{4155, 1},
+	{4156, 1},
+	{3341, 1},
+	{4159, 1},
+	{3278, 1},
+	{4597, 1},
+	{4598, 1},
+	{3343, 1},
+	{3344, 1},
+	{4173, 1},
+	{4179, 1},
+	{4187, 1},
+	{4192, 1},
+	{4599, 1},
+	{4196, 1},
+	{4197, 1},
+	{4202, 1},
+	{4206, 1},
+	{4601, 1},
+	{4515, 1},
+	{4210, 1},
+	{4209, 1},
+	{4213, 1},
+	{4516, 1},
+	{4217, 1},
+	{4221, 1},
+	{4602, 1},
+	{4603, 1},
+	{4236, 1},
+	{4238, 1},
+	{4240, 1},
+	{4604, 1},
+	{4241, 1},
+	{4251, 1},
+	{4254, 1},
+	{4255, 1},
+	{4253, 1},
+	{4259, 1},
+	{4260, 1},
+	{4605, 1},
+	{4266, 1},
+	{3345, 1},
+	{4268, 1},
+	{4606, 1},
+	{3346, 1},
+	{4283, 1},
+	{3617, 1},
+	{4289, 1},
+	{4607, 1},
+	{4609, 1},
+	{3347, 1},
+	{3348, 1},
+	{4300, 1},
+	{4610, 1},
+	{3349, 1},
+	{4611, 1},
+	{4306, 1},
+	{4306, 1},
+	{4308, 1},
+	{4612, 1},
+	{4318, 1},
+	{3350, 1},
+	{4322, 1},
+	{4326, 1},
+	{4328, 1},
+	{4330, 1},
+	{3351, 1},
+	{4613, 1},
+	{4336, 1},
+	{4343, 1},
+	{4347, 1},
+	{3352, 1},
+	{3353, 1},
+	{4348, 1},
+	{4614, 1},
+	{3354, 1},
+	{4615, 1},
+	{4616, 1},
+	{4617, 1},
+	{4359, 1},
+	{3355, 1},
+	{4365, 1},
+	{4367, 1},
+	{4368, 1},
+	{4370, 1},
+	{4372, 1},
+	{4374, 1},
+	{4619, 1},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+	{0, 0},
+};
+
+const int32_t decomp_data[] = {
+	0x21,
+	0x21,
+	0x21,
+	0x21,
+	0x3f,
+	0x24,
+	0x26,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x27,
+	0x42,
+	0x27,
+	0x44,
+	0x27,
+	0x50,
+	0x27,
+	0x54,
+	0x27,
+	0x59,
+	0x27,
+	0x6e,
+	0x28,
+	0x28,
+	0x28,
+	0x28,
+	0x32,
+	0x29,
+	0x28,
+	0x32,
+	0x4f,
+	0x29,
+	0x28,
+	0x33,
+	0x29,
+	0x28,
+	0x34,
+	0x29,
+	0x28,
+	0x35,
+	0x29,
+	0x28,
+	0x36,
+	0x29,
+	0x28,
+	0x37,
+	0x29,
+	0x28,
+	0x38,
+	0x29,
+	0x28,
+	0x39,
+	0x29,
+	0x28,
+	0x41,
+	0x29,
+	0x28,
+	0x42,
+	0x29,
+	0x28,
+	0x43,
+	0x29,
+	0x28,
+	0x44,
+	0x29,
+	0x28,
+	0x45,
+	0x29,
+	0x28,
+	0x46,
+	0x29,
+	0x28,
+	0x47,
+	0x29,
+	0x28,
+	0x48,
+	0x29,
+	0x28,
+	0x4a,
+	0x29,
+	0x28,
+	0x4b,
+	0x29,
+	0x28,
+	0x4c,
+	0x29,
+	0x28,
+	0x4d,
+	0x29,
+	0x28,
+	0x4e,
+	0x29,
+	0x28,
+	0x4f,
+	0x29,
+	0x28,
+	0x50,
+	0x29,
+	0x28,
+	0x51,
+	0x29,
+	0x28,
+	0x52,
+	0x29,
+	0x28,
+	0x53,
+	0x29,
+	0x28,
+	0x54,
+	0x29,
+	0x28,
+	0x55,
+	0x29,
+	0x28,
+	0x56,
+	0x29,
+	0x28,
+	0x57,
+	0x29,
+	0x28,
+	0x58,
+	0x29,
+	0x28,
+	0x59,
+	0x29,
+	0x28,
+	0x5a,
+	0x29,
+	0x28,
+	0x61,
+	0x29,
+	0x28,
+	0x62,
+	0x29,
+	0x28,
+	0x63,
+	0x29,
+	0x28,
+	0x64,
+	0x29,
+	0x28,
+	0x65,
+	0x29,
+	0x28,
+	0x66,
+	0x29,
+	0x28,
+	0x67,
+	0x29,
+	0x28,
+	0x68,
+	0x29,
+	0x28,
+	0x69,
+	0x29,
+	0x28,
+	0x69,
+	0x32,
+	0x29,
+	0x28,
+	0x69,
+	0x33,
+	0x29,
+	0x28,
+	0x69,
+	0x34,
+	0x29,
+	0x28,
+	0x69,
+	0x35,
+	0x29,
+	0x28,
+	0x69,
+	0x36,
+	0x29,
+	0x28,
+	0x69,
+	0x37,
+	0x29,
+	0x28,
+	0x69,
+	0x38,
+	0x29,
+	0x28,
+	0x69,
+	0x39,
+	0x29,
+	0x28,
+	0x69,
+	0x4f,
+	0x29,
+	0x28,
+	0x69,
+	0x69,
+	0x29,
+	0x28,
+	0x6a,
+	0x29,
+	0x28,
+	0x6b,
+	0x29,
+	0x28,
+	0x6e,
+	0x29,
+	0x28,
+	0x6f,
+	0x29,
+	0x28,
+	0x70,
+	0x29,
+	0x28,
+	0x71,
+	0x29,
+	0x28,
+	0x72,
+	0x29,
+	0x28,
+	0x72,
+	0x6e,
+	0x29,
+	0x28,
+	0x73,
+	0x29,
+	0x28,
+	0x74,
+	0x29,
+	0x28,
+	0x75,
+	0x29,
+	0x28,
+	0x76,
+	0x29,
+	0x28,
+	0x77,
+	0x29,
+	0x28,
+	0x78,
+	0x29,
+	0x28,
+	0x79,
+	0x29,
+	0x28,
+	0x7a,
+	0x29,
+	0x28,
+	0x1100,
+	0x29,
+	0x28,
+	0x1102,
+	0x29,
+	0x28,
+	0x1103,
+	0x29,
+	0x28,
+	0x1105,
+	0x29,
+	0x28,
+	0x1106,
+	0x29,
+	0x28,
+	0x1107,
+	0x29,
+	0x28,
+	0x1109,
+	0x29,
+	0x28,
+	0x110b,
+	0x29,
+	0x28,
+	0x110c,
+	0x29,
+	0x28,
+	0x110e,
+	0x29,
+	0x28,
+	0x110f,
+	0x29,
+	0x28,
+	0x1110,
+	0x29,
+	0x28,
+	0x1111,
+	0x29,
+	0x28,
+	0x1112,
+	0x29,
+	0x28,
+	0x30fc,
+	0x29,
+	0x28,
+	0x4e03,
+	0x29,
+	0x28,
+	0x4e09,
+	0x29,
+	0x28,
+	0x4e5d,
+	0x29,
+	0x28,
+	0x4e8c,
+	0x29,
+	0x28,
+	0x4e94,
+	0x29,
+	0x28,
+	0x4ee3,
+	0x29,
+	0x28,
+	0x4f01,
+	0x29,
+	0x28,
+	0x4f11,
+	0x29,
+	0x28,
+	0x516b,
+	0x29,
+	0x28,
+	0x516d,
+	0x29,
+	0x28,
+	0x52b4,
+	0x29,
+	0x28,
+	0x52dd,
+	0x29,
+	0x28,
+	0x5341,
+	0x29,
+	0x28,
+	0x5354,
+	0x29,
+	0x28,
+	0x540d,
+	0x29,
+	0x28,
+	0x547c,
+	0x29,
+	0x28,
+	0x56db,
+	0x29,
+	0x28,
+	0x571f,
+	0x29,
+	0x28,
+	0x5b66,
+	0x29,
+	0x28,
+	0x5b89,
+	0x29,
+	0x28,
+	0x6253,
+	0x29,
+	0x28,
+	0x6557,
+	0x29,
+	0x28,
+	0x65e5,
+	0x29,
+	0x28,
+	0x6708,
+	0x29,
+	0x28,
+	0x6709,
+	0x29,
+	0x28,
+	0x6728,
+	0x29,
+	0x28,
+	0x672c,
+	0x29,
+	0x28,
+	0x682a,
+	0x29,
+	0x28,
+	0x6c34,
+	0x29,
+	0x28,
+	0x706b,
+	0x29,
+	0x28,
+	0x70b9,
+	0x29,
+	0x28,
+	0x7279,
+	0x29,
+	0x28,
+	0x76d7,
+	0x29,
+	0x28,
+	0x76e3,
+	0x29,
+	0x28,
+	0x793e,
+	0x29,
+	0x28,
+	0x795d,
+	0x29,
+	0x28,
+	0x796d,
+	0x29,
+	0x28,
+	0x81ea,
+	0x29,
+	0x28,
+	0x81f3,
+	0x29,
+	0x28,
+	0x8ca1,
+	0x29,
+	0x28,
+	0x8cc7,
+	0x29,
+	0x28,
+	0x91d1,
+	0x29,
+	0x28,
+	0xac00,
+	0x29,
+	0x28,
+	0xb098,
+	0x29,
+	0x28,
+	0xb2e4,
+	0x29,
+	0x28,
+	0xb77c,
+	0x29,
+	0x28,
+	0xb9c8,
+	0x29,
+	0x28,
+	0xbc14,
+	0x29,
+	0x28,
+	0xc0ac,
+	0x29,
+	0x28,
+	0xc544,
+	0x29,
+	0x28,
+	0xc624,
+	0xc804,
+	0x29,
+	0x28,
+	0xc624,
+	0xd6c4,
+	0x29,
+	0x28,
+	0xc790,
+	0x29,
+	0x28,
+	0xc8fc,
+	0x29,
+	0x28,
+	0xcc28,
+	0x29,
+	0x28,
+	0xce74,
+	0x29,
+	0x28,
+	0xd0c0,
+	0x29,
+	0x28,
+	0xd30c,
+	0x29,
+	0x28,
+	0xd558,
+	0x29,
+	0x29,
+	0x29,
+	0x29,
+	0x2a,
+	0x2b,
+	0x2b,
+	0x2082,
+	0x2c,
+	0x2d,
+	0x2d,
+	0x2e,
+	0x2e,
+	0x2e,
+	0x2c,
+	0x2e,
+	0x2e,
+	0x2e,
+	0x2e,
+	0x2e,
+	0x2f,
+	0x2f,
+	0x2f,
+	0x2f,
+	0x2f,
+	0x2f,
+	0x32,
+	0x32,
+	0x2c,
+	0x32,
+	0x2e,
+	0x32,
+	0x32,
+	0x65e5,
+	0x32,
+	0x32,
+	0x70b9,
+	0x32,
+	0x33,
+	0x65e5,
+	0x32,
+	0x33,
+	0x70b9,
+	0x32,
+	0x34,
+	0x65e5,
+	0x32,
+	0x34,
+	0x70b9,
+	0x32,
+	0x35,
+	0x65e5,
+	0x32,
+	0x36,
+	0x65e5,
+	0x32,
+	0x37,
+	0x65e5,
+	0x32,
+	0x38,
+	0x65e5,
+	0x32,
+	0x39,
+	0x65e5,
+	0x32,
+	0x4f,
+	0x2e,
+	0x32,
+	0x4f,
+	0x65e5,
+	0x32,
+	0x4f,
+	0x70b9,
+	0x32,
+	0x69,
+	0x65e5,
+	0x32,
+	0x69,
+	0x70b9,
+	0x32,
+	0x65e5,
+	0x32,
+	0x6708,
+	0x32,
+	0x70b9,
+	0x33,
+	0x33,
+	0x2c,
+	0x33,
+	0x2e,
+	0x33,
+	0x4f,
+	0x65e5,
+	0x33,
+	0x69,
+	0x65e5,
+	0x33,
+	0x65e5,
+	0x33,
+	0x6708,
+	0x33,
+	0x70b9,
+	0x34,
+	0x34,
+	0x2c,
+	0x34,
+	0x2e,
+	0x34,
+	0xb7,
+	0x34,
+	0x65e5,
+	0x34,
+	0x6708,
+	0x34,
+	0x70b9,
+	0x35,
+	0x35,
+	0x2c,
+	0x35,
+	0x2e,
+	0x35,
+	0x65e5,
+	0x35,
+	0x6708,
+	0x35,
+	0x70b9,
+	0x36,
+	0x36,
+	0x2c,
+	0x36,
+	0x2e,
+	0x36,
+	0x65e5,
+	0x36,
+	0x6708,
+	0x36,
+	0x70b9,
+	0x37,
+	0x37,
+	0x2c,
+	0x37,
+	0x2e,
+	0x37,
+	0x65e5,
+	0x37,
+	0x6708,
+	0x37,
+	0x70b9,
+	0x38,
+	0x38,
+	0x2c,
+	0x38,
+	0x2e,
+	0x38,
+	0x65e5,
+	0x38,
+	0x6708,
+	0x38,
+	0x70b9,
+	0x39,
+	0x39,
+	0x2c,
+	0x39,
+	0x2e,
+	0x39,
+	0x65e5,
+	0x39,
+	0x6708,
+	0x39,
+	0x70b9,
+	0x3a,
+	0x3a,
+	0x3a,
+	0x3d,
+	0x3a,
+	0x2192,
+	0x3b,
+	0x3c,
+	0x3c,
+	0x3c,
+	0x3c,
+	0x3c,
+	0x3c,
+	0x3c,
+	0xb7,
+	0x3d,
+	0x3d,
+	0x3d,
+	0x3d,
+	0x3d,
+	0x3d,
+	0x3e,
+	0x3e,
+	0x3c,
+	0x3e,
+	0x3e,
+	0x3e,
+	0x3e,
+	0x3e,
+	0x3e,
+	0xb7,
+	0x3f,
+	0x3f,
+	0x21,
+	0x3f,
+	0x3f,
+	0x41,
+	0x41,
+	0x41,
+	0x41,
+	0x45,
+	0x41,
+	0x4f,
+	0x41,
+	0x52,
+	0x41,
+	0x55,
+	0x41,
+	0x56,
+	0x41,
+	0x59,
+	0x42,
+	0x43,
+	0x43,
+	0x27,
+	0x44,
+	0x44,
+	0x5a,
+	0x44,
+	0x7a,
+	0x45,
+	0x46,
+	0x46,
+	0x41,
+	0x58,
+	0x47,
+	0x47,
+	0x27,
+	0x48,
+	0x4a,
+	0x4a,
+	0xb7,
+	0x4b,
+	0x4b,
+	0x27,
+	0x4c,
+	0x4c,
+	0x4a,
+	0x4c,
+	0x6a,
+	0x4d,
+	0x4d,
+	0x42,
+	0x4e,
+	0x4e,
+	0x4a,
+	0x4e,
+	0x6a,
+	0x4e,
+	0x6f,
+	0x4f,
+	0x4f,
+	0x27,
+	0x4f,
+	0x2c,
+	0x4f,
+	0x2e,
+	0x4f,
+	0x45,
+	0x4f,
+	0x4f,
+	0x4f,
+	0x70b9,
+	0x50,
+	0x50,
+	0x27,
+	0x51,
+	0x51,
+	0x45,
+	0x52,
+	0x52,
+	0x73,
+	0x53,
+	0x54,
+	0x54,
+	0x33,
+	0x54,
+	0x45,
+	0x4c,
+	0x55,
+	0x55,
+	0x27,
+	0x55,
+	0xb7,
+	0x56,
+	0x56,
+	0x42,
+	0x56,
+	0x69,
+	0x56,
+	0x69,
+	0x69,
+	0x56,
+	0x69,
+	0x69,
+	0x69,
+	0x56,
+	0xb7,
+	0x57,
+	0x58,
+	0x58,
+	0x69,
+	0x58,
+	0x69,
+	0x69,
+	0x59,
+	0x5a,
+	0x5c,
+	0x5c,
+	0x5c,
+	0x5c,
+	0x1455,
+	0x5e,
+	0x5f,
+	0x61,
+	0x61,
+	0x2f,
+	0x63,
+	0x61,
+	0x2f,
+	0x73,
+	0x61,
+	0x61,
+	0x61,
+	0x65,
+	0x61,
+	0x6f,
+	0x61,
+	0x75,
+	0x61,
+	0x76,
+	0x61,
+	0x79,
+	0x62,
+	0x62,
+	0x27,
+	0x62,
+	0x69,
+	0x62,
+	0xb7,
+	0x63,
+	0x63,
+	0x2f,
+	0x6f,
+	0x63,
+	0x2f,
+	0x75,
+	0x64,
+	0x64,
+	0x27,
+	0x64,
+	0x7a,
+	0x64,
+	0xb7,
+	0x64,
+	0x21d,
+	0x64,
+	0x291,
+	0x65,
+	0x66,
+	0x66,
+	0x66,
+	0x66,
+	0x66,
+	0x69,
+	0x66,
+	0x69,
+	0x66,
+	0x14b,
+	0x67,
+	0x68,
+	0x69,
+	0x69,
+	0x27,
+	0x69,
+	0x2c,
+	0x69,
+	0x2e,
+	0x69,
+	0x32,
+	0x2e,
+	0x69,
+	0x32,
+	0x65e5,
+	0x69,
+	0x32,
+	0x6708,
+	0x69,
+	0x32,
+	0x70b9,
+	0x69,
+	0x33,
+	0x2e,
+	0x69,
+	0x33,
+	0x65e5,
+	0x69,
+	0x33,
+	0x70b9,
+	0x69,
+	0x34,
+	0x2e,
+	0x69,
+	0x34,
+	0x65e5,
+	0x69,
+	0x34,
+	0x70b9,
+	0x69,
+	0x35,
+	0x2e,
+	0x69,
+	0x35,
+	0x65e5,
+	0x69,
+	0x35,
+	0x70b9,
+	0x69,
+	0x36,
+	0x2e,
+	0x69,
+	0x36,
+	0x65e5,
+	0x69,
+	0x36,
+	0x70b9,
+	0x69,
+	0x37,
+	0x2e,
+	0x69,
+	0x37,
+	0x65e5,
+	0x69,
+	0x37,
+	0x70b9,
+	0x69,
+	0x38,
+	0x2e,
+	0x69,
+	0x38,
+	0x65e5,
+	0x69,
+	0x38,
+	0x70b9,
+	0x69,
+	0x39,
+	0x2e,
+	0x69,
+	0x39,
+	0x65e5,
+	0x69,
+	0x39,
+	0x70b9,
+	0x69,
+	0x4a,
+	0x69,
+	0x4f,
+	0x69,
+	0x4f,
+	0x2e,
+	0x69,
+	0x4f,
+	0x65e5,
+	0x69,
+	0x4f,
+	0x6708,
+	0x69,
+	0x4f,
+	0x70b9,
+	0x69,
+	0x56,
+	0x69,
+	0x58,
+	0x69,
+	0x69,
+	0x69,
+	0x69,
+	0x2e,
+	0x69,
+	0x69,
+	0x53,
+	0x69,
+	0x69,
+	0x69,
+	0x69,
+	0x69,
+	0x65e5,
+	0x69,
+	0x69,
+	0x6708,
+	0x69,
+	0x69,
+	0x70b9,
+	0x69,
+	0x6a,
+	0x69,
+	0x73,
+	0x69,
+	0x74,
+	0x69,
+	0x76,
+	0x69,
+	0x78,
+	0x69,
+	0x7a,
+	0x69,
+	0xb7,
+	0x69,
+	0x21d,
+	0x69,
+	0x643,
+	0x628,
+	0x631,
+	0x69,
+	0x644,
+	0x644,
+	0x6f,
+	0x69,
+	0x674,
+	0x69,
+	0x65e5,
+	0x69,
+	0x6708,
+	0x69,
+	0x70b9,
+	0x6a,
+	0x6b,
+	0x6e,
+	0x6e,
+	0x6a,
+	0x6f,
+	0x6f,
+	0x27,
+	0x6f,
+	0x65,
+	0x6f,
+	0x6f,
+	0x6f,
+	0x62c,
+	0x6f,
+	0x645,
+	0x6f,
+	0x645,
+	0x62c,
+	0x6f,
+	0x645,
+	0x645,
+	0x6f,
+	0x649,
+	0x6f,
+	0xd30,
+	0x6f,
+	0x6f,
+	0x1d07,
+	0x70,
+	0x70,
+	0xb7,
+	0x71,
+	0x72,
+	0x72,
+	0x27,
+	0x72,
+	0x6e,
+	0x73,
+	0x73,
+	0x73,
+	0x73,
+	0x73,
+	0x74,
+	0x74,
+	0x74,
+	0x66,
+	0x74,
+	0x73,
+	0x74,
+	0x21d,
+	0x74,
+	0x255,
+	0x74,
+	0x283,
+	0x75,
+	0x75,
+	0x65,
+	0x75,
+	0x6f,
+	0x76,
+	0x76,
+	0x69,
+	0x76,
+	0x69,
+	0x69,
+	0x76,
+	0x69,
+	0x69,
+	0x69,
+	0x77,
+	0x78,
+	0x78,
+	0x69,
+	0x78,
+	0x69,
+	0x69,
+	0x79,
+	0x7a,
+	0x7b,
+	0x7d,
+	0x7e,
+	0xa3,
+	0xa8,
+	0xa9,
+	0xae,
+	0xb0,
+	0xb0,
+	0x43,
+	0xb0,
+	0x46,
+	0xb6,
+	0xb7,
+	0xb7,
+	0x34,
+	0xb7,
+	0x3c,
+	0xb7,
+	0x3e,
+	0xb7,
+	0x4a,
+	0xb7,
+	0x4c,
+	0xb7,
+	0x50,
+	0xb7,
+	0x55,
+	0xb7,
+	0x56,
+	0xb7,
+	0x62,
+	0xb7,
+	0x64,
+	0xb7,
+	0xb7,
+	0xb7,
+	0xb7,
+	0x245,
+	0xb7,
+	0x393,
+	0xb7,
+	0x394,
+	0xb7,
+	0x548,
+	0xb7,
+	0x1401,
+	0xb7,
+	0x1404,
+	0xb7,
+	0x1405,
+	0xb7,
+	0x1406,
+	0xb7,
+	0x140a,
+	0xb7,
+	0x140b,
+	0xb7,
+	0x1432,
+	0xb7,
+	0x1434,
+	0xb7,
+	0x1439,
+	0xb7,
+	0x144f,
+	0xb7,
+	0x1450,
+	0xb7,
+	0x1451,
+	0xb7,
+	0x1455,
+	0xb7,
+	0x1456,
+	0xb7,
+	0x146b,
+	0xb7,
+	0x146e,
+	0xb7,
+	0x1470,
+	0xb7,
+	0x1489,
+	0xb7,
+	0x148b,
+	0xb7,
+	0x148c,
+	0xb7,
+	0x148e,
+	0xb7,
+	0x1490,
+	0xb7,
+	0x1491,
+	0xb7,
+	0x14a3,
+	0xb7,
+	0x14a6,
+	0xb7,
+	0x14a7,
+	0xb7,
+	0x14a8,
+	0xb7,
+	0x14ab,
+	0xb7,
+	0x14c0,
+	0xb7,
+	0x14c2,
+	0xb7,
+	0x14c3,
+	0xb7,
+	0x14c4,
+	0xb7,
+	0x14c5,
+	0xb7,
+	0x14c7,
+	0xb7,
+	0x14c8,
+	0xb7,
+	0x14d3,
+	0xb7,
+	0x14d5,
+	0xb7,
+	0x14d6,
+	0xb7,
+	0x14d7,
+	0xb7,
+	0x14d8,
+	0xb7,
+	0x14da,
+	0xb7,
+	0x14db,
+	0xb7,
+	0x14ed,
+	0xb7,
+	0x14ef,
+	0xb7,
+	0x14f0,
+	0xb7,
+	0x14f1,
+	0xb7,
+	0x14f2,
+	0xb7,
+	0x14f4,
+	0xb7,
+	0x14f5,
+	0xb7,
+	0x1510,
+	0xb7,
+	0x1511,
+	0xb7,
+	0x1512,
+	0xb7,
+	0x1513,
+	0xb7,
+	0x1514,
+	0xb7,
+	0x1515,
+	0xb7,
+	0x1516,
+	0xb7,
+	0x1528,
+	0xb7,
+	0x1529,
+	0xb7,
+	0x152a,
+	0xb7,
+	0x152b,
+	0xb7,
+	0x152d,
+	0xb7,
+	0x152e,
+	0xb7,
+	0x1543,
+	0xb7,
+	0x1546,
+	0xb7,
+	0x1547,
+	0xb7,
+	0x1548,
+	0xb7,
+	0x1549,
+	0xb7,
+	0x154b,
+	0xb7,
+	0x154c,
+	0xb7,
+	0x155a,
+	0xb7,
+	0x1567,
+	0xb7,
+	0x18b1,
+	0xb7,
+	0x18b4,
+	0xb7,
+	0x18b8,
+	0xb7,
+	0x18c0,
+	0xba,
+	0xba,
+	0x2f,
+	0x2080,
+	0xba,
+	0x2f,
+	0x2080,
+	0x2080,
+	0xba,
+	0x2f,
+	0x2080,
+	0x2080,
+	0x2080,
+	0xde,
+	0xdf,
+	0xf7,
+	0xfe,
+	0x138,
+	0x185,
+	0x185,
+	0x69,
+	0x186,
+	0x18e,
+	0x18f,
+	0x190,
+	0x1a8,
+	0x1a9,
+	0x1ab,
+	0x1b1,
+	0x1dd,
+	0x1dd,
+	0x6f,
+	0x1dd,
+	0x2de,
+	0x1f6,
+	0x21d,
+	0x237,
+	0x242,
+	0x245,
+	0x245,
+	0xb7,
+	0x24b,
+	0x254,
+	0x254,
+	0x65,
+	0x25c,
+	0x25e,
+	0x262,
+	0x270,
+	0x277,
+	0x278,
+	0x27e,
+	0x27f,
+	0x280,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x283,
+	0x28a,
+	0x28c,
+	0x28d,
+	0x298,
+	0x299,
+	0x29a,
+	0x29c,
+	0x29f,
+	0x2a1,
+	0x2c1,
+	0x2c7,
+	0x2c9,
+	0x2c9,
+	0x62,
+	0x2c9,
+	0x62,
+	0x69,
+	0x2cf,
+	0x2ea,
+	0x2eb,
+	0x2f3,
+	0x393,
+	0x393,
+	0x27,
+	0x393,
+	0xb7,
+	0x394,
+	0x394,
+	0xb7,
+	0x394,
+	0x1420,
+	0x39e,
+	0x3a0,
+	0x3a6,
+	0x3a8,
+	0x3a9,
+	0x3b6,
+	0x3bb,
+	0x3bc,
+	0x3be,
+	0x3c0,
+	0x3c2,
+	0x3c7,
+	0x3c8,
+	0x3c9,
+	0x3d7,
+	0x3d8,
+	0x3dd,
+	0x3ec,
+	0x40b,
+	0x416,
+	0x418,
+	0x427,
+	0x428,
+	0x42a,
+	0x69,
+	0x42d,
+	0x436,
+	0x43b,
+	0x447,
+	0x448,
+	0x44d,
+	0x459,
+	0x460,
+	0x460,
+	0xb7,
+	0x4b6,
+	0x4b7,
+	0x4bc,
+	0x4c3,
+	0x4fe,
+	0x548,
+	0x548,
+	0x27,
+	0x548,
+	0xb7,
+	0x554,
+	0x559,
+	0x565,
+	0x582,
+	0x571,
+	0x574,
+	0x565,
+	0x574,
+	0x56b,
+	0x574,
+	0x56d,
+	0x574,
+	0x576,
+	0x57e,
+	0x576,
+	0x5d0,
+	0x5d0,
+	0x5dc,
+	0x5d1,
+	0x5d2,
+	0x5d3,
+	0x5d4,
+	0x5d6,
+	0x5da,
+	0x5db,
+	0x5dc,
+	0x5dd,
+	0x5de,
+	0x5e0,
+	0x5e2,
+	0x5e3,
+	0x5e4,
+	0x5e6,
+	0x5e7,
+	0x5e8,
+	0x5e9,
+	0x5ea,
+	0x60c,
+	0x61b,
+	0x61f,
+	0x621,
+	0x628,
+	0x628,
+	0x6f,
+	0x628,
+	0x62c,
+	0x628,
+	0x62d,
+	0x628,
+	0x62d,
+	0x649,
+	0x628,
+	0x62e,
+	0x628,
+	0x62e,
+	0x649,
+	0x628,
+	0x631,
+	0x628,
+	0x632,
+	0x628,
+	0x645,
+	0x628,
+	0x646,
+	0x628,
+	0x649,
+	0x629,
+	0x62a,
+	0x62a,
+	0x6f,
+	0x62a,
+	0x62c,
+	0x62a,
+	0x62c,
+	0x645,
+	0x62a,
+	0x62c,
+	0x649,
+	0x62a,
+	0x62d,
+	0x62a,
+	0x62d,
+	0x62c,
+	0x62a,
+	0x62d,
+	0x645,
+	0x62a,
+	0x62e,
+	0x62a,
+	0x62e,
+	0x645,
+	0x62a,
+	0x62e,
+	0x649,
+	0x62a,
+	0x631,
+	0x62a,
+	0x632,
+	0x62a,
+	0x645,
+	0x62a,
+	0x645,
+	0x62c,
+	0x62a,
+	0x645,
+	0x62d,
+	0x62a,
+	0x645,
+	0x62e,
+	0x62a,
+	0x645,
+	0x649,
+	0x62a,
+	0x646,
+	0x62a,
+	0x649,
+	0x62c,
+	0x62c,
+	0x62d,
+	0x62c,
+	0x62d,
+	0x649,
+	0x62c,
+	0x644,
+	0x62c,
+	0x644,
+	0x69,
+	0x644,
+	0x6f,
+	0x62c,
+	0x645,
+	0x62c,
+	0x645,
+	0x62d,
+	0x62c,
+	0x645,
+	0x649,
+	0x62c,
+	0x649,
+	0x62d,
+	0x62d,
+	0x62c,
+	0x62d,
+	0x62c,
+	0x649,
+	0x62d,
+	0x645,
+	0x62d,
+	0x645,
+	0x649,
+	0x62d,
+	0x649,
+	0x62e,
+	0x62e,
+	0x62c,
+	0x62e,
+	0x62d,
+	0x62e,
+	0x645,
+	0x62e,
+	0x649,
+	0x62f,
+	0x630,
+	0x631,
+	0x631,
+	0x633,
+	0x648,
+	0x644,
+	0x631,
+	0x649,
+	0x69,
+	0x644,
+	0x632,
+	0x633,
+	0x633,
+	0x6f,
+	0x633,
+	0x62c,
+	0x633,
+	0x62c,
+	0x62d,
+	0x633,
+	0x62c,
+	0x649,
+	0x633,
+	0x62d,
+	0x633,
+	0x62d,
+	0x62c,
+	0x633,
+	0x62d,
+	0x645,
+	0x633,
+	0x62d,
+	0x649,
+	0x633,
+	0x62e,
+	0x633,
+	0x62e,
+	0x649,
+	0x633,
+	0x631,
+	0x633,
+	0x645,
+	0x633,
+	0x645,
+	0x62c,
+	0x633,
+	0x645,
+	0x62d,
+	0x633,
+	0x645,
+	0x62e,
+	0x633,
+	0x645,
+	0x645,
+	0x633,
+	0x649,
+	0x635,
+	0x635,
+	0x62d,
+	0x635,
+	0x62d,
+	0x62d,
+	0x635,
+	0x62d,
+	0x649,
+	0x635,
+	0x62e,
+	0x635,
+	0x631,
+	0x635,
+	0x644,
+	0x639,
+	0x645,
+	0x635,
+	0x644,
+	0x649,
+	0x635,
+	0x644,
+	0x649,
+	0x69,
+	0x644,
+	0x644,
+	0x6f,
+	0x639,
+	0x644,
+	0x649,
+	0x6f,
+	0x648,
+	0x633,
+	0x644,
+	0x645,
+	0x635,
+	0x645,
+	0x635,
+	0x645,
+	0x645,
+	0x635,
+	0x649,
+	0x636,
+	0x636,
+	0x62c,
+	0x636,
+	0x62d,
+	0x636,
+	0x62d,
+	0x649,
+	0x636,
+	0x62e,
+	0x636,
+	0x62e,
+	0x645,
+	0x636,
+	0x631,
+	0x636,
+	0x645,
+	0x636,
+	0x649,
+	0x637,
+	0x637,
+	0x62d,
+	0x637,
+	0x645,
+	0x637,
+	0x645,
+	0x62d,
+	0x637,
+	0x645,
+	0x645,
+	0x637,
+	0x645,
+	0x649,
+	0x637,
+	0x649,
+	0x638,
+	0x638,
+	0x645,
+	0x639,
+	0x639,
+	0x62c,
+	0x639,
+	0x62c,
+	0x645,
+	0x639,
+	0x644,
+	0x649,
+	0x6f,
+	0x639,
+	0x645,
+	0x639,
+	0x645,
+	0x645,
+	0x639,
+	0x645,
+	0x649,
+	0x639,
+	0x649,
+	0x63a,
+	0x63a,
+	0x62c,
+	0x63a,
+	0x645,
+	0x63a,
+	0x645,
+	0x645,
+	0x63a,
+	0x645,
+	0x649,
+	0x63a,
+	0x649,
+	0x641,
+	0x641,
+	0x62c,
+	0x641,
+	0x62d,
+	0x641,
+	0x62e,
+	0x641,
+	0x62e,
+	0x645,
+	0x641,
+	0x645,
+	0x641,
+	0x645,
+	0x649,
+	0x641,
+	0x649,
+	0x642,
+	0x642,
+	0x62d,
+	0x642,
+	0x644,
+	0x649,
+	0x642,
+	0x645,
+	0x642,
+	0x645,
+	0x62d,
+	0x642,
+	0x645,
+	0x645,
+	0x642,
+	0x645,
+	0x649,
+	0x642,
+	0x649,
+	0x643,
+	0x643,
+	0x69,
+	0x643,
+	0x62c,
+	0x643,
+	0x62d,
+	0x643,
+	0x62e,
+	0x643,
+	0x644,
+	0x643,
+	0x645,
+	0x643,
+	0x645,
+	0x645,
+	0x643,
+	0x645,
+	0x649,
+	0x643,
+	0x649,
+	0x644,
+	0x644,
+	0x69,
+	0x644,
+	0x69,
+	0x674,
+	0x644,
+	0x6f,
+	0x644,
+	0x62c,
+	0x644,
+	0x62c,
+	0x62c,
+	0x644,
+	0x62c,
+	0x645,
+	0x644,
+	0x62c,
+	0x649,
+	0x644,
+	0x62d,
+	0x644,
+	0x62d,
+	0x645,
+	0x644,
+	0x62d,
+	0x649,
+	0x644,
+	0x62e,
+	0x644,
+	0x62e,
+	0x645,
+	0x644,
+	0x645,
+	0x644,
+	0x645,
+	0x62d,
+	0x644,
+	0x645,
+	0x649,
+	0x644,
+	0x649,
+	0x645,
+	0x645,
+	0x69,
+	0x645,
+	0x62c,
+	0x645,
+	0x62c,
+	0x62d,
+	0x645,
+	0x62c,
+	0x62e,
+	0x645,
+	0x62c,
+	0x645,
+	0x645,
+	0x62c,
+	0x649,
+	0x645,
+	0x62d,
+	0x645,
+	0x62d,
+	0x62c,
+	0x645,
+	0x62d,
+	0x645,
+	0x645,
+	0x62d,
+	0x645,
+	0x62f,
+	0x645,
+	0x62d,
+	0x649,
+	0x645,
+	0x62e,
+	0x645,
+	0x62e,
+	0x62c,
+	0x645,
+	0x62e,
+	0x645,
+	0x645,
+	0x62e,
+	0x649,
+	0x645,
+	0x645,
+	0x645,
+	0x645,
+	0x649,
+	0x645,
+	0x649,
+	0x646,
+	0x646,
+	0x6f,
+	0x646,
+	0x62c,
+	0x62d,
+	0x646,
+	0x62c,
+	0x645,
+	0x646,
+	0x62c,
+	0x649,
+	0x646,
+	0x62d,
+	0x646,
+	0x62d,
+	0x645,
+	0x646,
+	0x62d,
+	0x649,
+	0x646,
+	0x62e,
+	0x646,
+	0x631,
+	0x646,
+	0x632,
+	0x646,
+	0x645,
+	0x646,
+	0x645,
+	0x649,
+	0x646,
+	0x646,
+	0x646,
+	0x649,
+	0x648,
+	0x648,
+	0x633,
+	0x644,
+	0x645,
+	0x648,
+	0x674,
+	0x649,
+	0x649,
+	0x6f,
+	0x649,
+	0x62c,
+	0x649,
+	0x62c,
+	0x649,
+	0x649,
+	0x62d,
+	0x649,
+	0x62d,
+	0x649,
+	0x649,
+	0x62e,
+	0x649,
+	0x631,
+	0x649,
+	0x632,
+	0x649,
+	0x645,
+	0x649,
+	0x645,
+	0x645,
+	0x649,
+	0x645,
+	0x649,
+	0x649,
+	0x646,
+	0x649,
+	0x649,
+	0x649,
+	0x674,
+	0x649,
+	0x674,
+	0x69,
+	0x649,
+	0x674,
+	0x6f,
+	0x649,
+	0x674,
+	0x62c,
+	0x649,
+	0x674,
+	0x62d,
+	0x649,
+	0x674,
+	0x62e,
+	0x649,
+	0x674,
+	0x631,
+	0x649,
+	0x674,
+	0x632,
+	0x649,
+	0x674,
+	0x645,
+	0x649,
+	0x674,
+	0x646,
+	0x649,
+	0x674,
+	0x648,
+	0x649,
+	0x674,
+	0x649,
+	0x649,
+	0x674,
+	0x67b,
+	0x662,
+	0x663,
+	0x664,
+	0x666,
+	0x669,
+	0x671,
+	0x67a,
+	0x67b,
+	0x67f,
+	0x680,
+	0x683,
+	0x684,
+	0x686,
+	0x687,
+	0x68a,
+	0x68c,
+	0x68d,
+	0x697,
+	0x6a1,
+	0x6a2,
+	0x6a6,
+	0x6ac,
+	0x6af,
+	0x6b1,
+	0x6b3,
+	0x6c5,
+	0x754,
+	0x905,
+	0x90f,
+	0x915,
+	0x916,
+	0x917,
+	0x91c,
+	0x921,
+	0x922,
+	0x928,
+	0x92b,
+	0x92f,
+	0x930,
+	0x930,
+	0x907,
+	0x933,
+	0x93d,
+	0x964,
+	0x964,
+	0x964,
+	0x968,
+	0x969,
+	0x96a,
+	0x96e,
+	0x970,
+	0x971,
+	0x985,
+	0x98b,
+	0x998,
+	0x99a,
+	0x99c,
+	0x99e,
+	0x99f,
+	0x9a1,
+	0x9a2,
+	0x9a3,
+	0x9a4,
+	0x9a5,
+	0x9a6,
+	0x9a7,
+	0x9a8,
+	0x9aa,
+	0x9ac,
+	0x9ae,
+	0x9af,
+	0x9b0,
+	0x9b2,
+	0x9b7,
+	0x9b8,
+	0x9bd,
+	0x9e7,
+	0x9e8,
+	0x9ec,
+	0xa05,
+	0xa16,
+	0xa17,
+	0xa1c,
+	0xa2b,
+	0xa32,
+	0xa38,
+	0xa72,
+	0xa73,
+	0xa85,
+	0xb05,
+	0xb21,
+	0xb22,
+	0xb85,
+	0xb88,
+	0xb89,
+	0xb89,
+	0xbb3,
+	0xb8e,
+	0xb8e,
+	0xbb5,
+	0xb90,
+	0xb92,
+	0xbb3,
+	0xb95,
+	0xb9a,
+	0xb9f,
+	0xba3,
+	0xba8,
+	0xba9,
+	0xbae,
+	0xbaf,
+	0xbb3,
+	0xbb4,
+	0xbb6,
+	0xbb7,
+	0xbf3,
+	0xc05,
+	0xc06,
+	0xc07,
+	0xc0b,
+	0xc0c,
+	0xc12,
+	0xc1c,
+	0xc1e,
+	0xc21,
+	0xc23,
+	0xc27,
+	0xc2c,
+	0xc2f,
+	0xc30,
+	0xc31,
+	0xc32,
+	0xc35,
+	0xc67,
+	0xc68,
+	0xc6f,
+	0xc8c,
+	0xd07,
+	0xd0e,
+	0xd12,
+	0xd1e,
+	0xd26,
+	0xd30,
+	0xd28,
+	0xd28,
+	0xd28,
+	0xd28,
+	0xd2e,
+	0xd30,
+	0xd35,
+	0xd30,
+	0xd39,
+	0xd2e,
+	0xda2,
+	0xdaf,
+	0xde8,
+	0xe02,
+	0xe04,
+	0xe06,
+	0xe08,
+	0xe0a,
+	0xe0e,
+	0xe11,
+	0xe1a,
+	0xe1b,
+	0xe1d,
+	0xe1e,
+	0xe1f,
+	0xe20,
+	0xe22,
+	0xe2f,
+	0xe32,
+	0xe40,
+	0xe40,
+	0xe4f,
+	0xe5a,
+	0xe5b,
+	0xeab,
+	0xe99,
+	0xeab,
+	0xea1,
+	0xeb2,
+	0xf0b,
+	0xf0d,
+	0xf0d,
+	0xf1a,
+	0xf1a,
+	0xf1a,
+	0xf1d,
+	0xf1d,
+	0xf1a,
+	0xf1d,
+	0xf1d,
+	0xf40,
+	0xf42,
+	0xf4c,
+	0xf51,
+	0xf56,
+	0xf5b,
+	0xf60,
+	0xf60,
+	0xf14,
+	0xf62,
+	0xf68,
+	0x1002,
+	0x1003,
+	0x1015,
+	0x101e,
+	0x1025,
+	0x1041,
+	0x104a,
+	0x104a,
+	0x107d,
+	0x1100,
+	0x1100,
+	0x1100,
+	0x1100,
+	0x1102,
+	0x1100,
+	0x1103,
+	0x1100,
+	0x1105,
+	0x1100,
+	0x1107,
+	0x1100,
+	0x1109,
+	0x1100,
+	0x1109,
+	0x1100,
+	0x1100,
+	0x110e,
+	0x1100,
+	0x110f,
+	0x1100,
+	0x1112,
+	0x1102,
+	0x1102,
+	0x1100,
+	0x1102,
+	0x1102,
+	0x1102,
+	0x1103,
+	0x1102,
+	0x1105,
+	0x1102,
+	0x1107,
+	0x1102,
+	0x1109,
+	0x1102,
+	0x110c,
+	0x1102,
+	0x110e,
+	0x1102,
+	0x1110,
+	0x1102,
+	0x1112,
+	0x1102,
+	0x1140,
+	0x1103,
+	0x1103,
+	0x1100,
+	0x1103,
+	0x1103,
+	0x1103,
+	0x1103,
+	0x1107,
+	0x1103,
+	0x1105,
+	0x1103,
+	0x1106,
+	0x1103,
+	0x1107,
+	0x1103,
+	0x1109,
+	0x1103,
+	0x1109,
+	0x1100,
+	0x1103,
+	0x110c,
+	0x1103,
+	0x110e,
+	0x1103,
+	0x1110,
+	0x1105,
+	0x1105,
+	0x1100,
+	0x1105,
+	0x1100,
+	0x1100,
+	0x1105,
+	0x1100,
+	0x1109,
+	0x1105,
+	0x1100,
+	0x1112,
+	0x1105,
+	0x1102,
+	0x1105,
+	0x1103,
+	0x1105,
+	0x1103,
+	0x1103,
+	0x1105,
+	0x1103,
+	0x1112,
+	0x1105,
+	0x1105,
+	0x1105,
+	0x1105,
+	0x110f,
+	0x1105,
+	0x1106,
+	0x1105,
+	0x1106,
+	0x1100,
+	0x1105,
+	0x1106,
+	0x1109,
+	0x1105,
+	0x1106,
+	0x1112,
+	0x1105,
+	0x1107,
+	0x1105,
+	0x1107,
+	0x1103,
+	0x1105,
+	0x1107,
+	0x1107,
+	0x1105,
+	0x1107,
+	0x1109,
+	0x1105,
+	0x1107,
+	0x110b,
+	0x1105,
+	0x1107,
+	0x1111,
+	0x1105,
+	0x1107,
+	0x1112,
+	0x1105,
+	0x1109,
+	0x1105,
+	0x1109,
+	0x1109,
+	0x1105,
+	0x110b,
+	0x1105,
+	0x110c,
+	0x1105,
+	0x110f,
+	0x1105,
+	0x1110,
+	0x1105,
+	0x1111,
+	0x1105,
+	0x1112,
+	0x1105,
+	0x1140,
+	0x1105,
+	0x114c,
+	0x1105,
+	0x1159,
+	0x1105,
+	0x1159,
+	0x1112,
+	0x1106,
+	0x1106,
+	0x1100,
+	0x1106,
+	0x1102,
+	0x1106,
+	0x1102,
+	0x1102,
+	0x1106,
+	0x1103,
+	0x1106,
+	0x1105,
+	0x1106,
+	0x1106,
+	0x1106,
+	0x1107,
+	0x1106,
+	0x1107,
+	0x1109,
+	0x1106,
+	0x1109,
+	0x1106,
+	0x1109,
+	0x1109,
+	0x1106,
+	0x110b,
+	0x1106,
+	0x110c,
+	0x1106,
+	0x110e,
+	0x1106,
+	0x1112,
+	0x1106,
+	0x1140,
+	0x1107,
+	0x1107,
+	0x1100,
+	0x1107,
+	0x1102,
+	0x1107,
+	0x1103,
+	0x1107,
+	0x1105,
+	0x1107,
+	0x1105,
+	0x1111,
+	0x1107,
+	0x1106,
+	0x1107,
+	0x1107,
+	0x1107,
+	0x1107,
+	0x110b,
+	0x1107,
+	0x1109,
+	0x1107,
+	0x1109,
+	0x1100,
+	0x1107,
+	0x1109,
+	0x1103,
+	0x1107,
+	0x1109,
+	0x1107,
+	0x1107,
+	0x1109,
+	0x1109,
+	0x1107,
+	0x1109,
+	0x110c,
+	0x1107,
+	0x1109,
+	0x1110,
+	0x1107,
+	0x110b,
+	0x1107,
+	0x110c,
+	0x1107,
+	0x110e,
+	0x1107,
+	0x110f,
+	0x1107,
+	0x1110,
+	0x1107,
+	0x1111,
+	0x1107,
+	0x1112,
+	0x1109,
+	0x1109,
+	0x1100,
+	0x1109,
+	0x1102,
+	0x1109,
+	0x1103,
+	0x1109,
+	0x1105,
+	0x1109,
+	0x1106,
+	0x1109,
+	0x1107,
+	0x1109,
+	0x1107,
+	0x1100,
+	0x1109,
+	0x1107,
+	0x110b,
+	0x1109,
+	0x1109,
+	0x1109,
+	0x1109,
+	0x1100,
+	0x1109,
+	0x1109,
+	0x1103,
+	0x1109,
+	0x1109,
+	0x1107,
+	0x1109,
+	0x1109,
+	0x1109,
+	0x1109,
+	0x110b,
+	0x1109,
+	0x110c,
+	0x1109,
+	0x110e,
+	0x1109,
+	0x110f,
+	0x1109,
+	0x1110,
+	0x1109,
+	0x1111,
+	0x1109,
+	0x1140,
+	0x110b,
+	0x110b,
+	0x1100,
+	0x110b,
+	0x1100,
+	0x1100,
+	0x110b,
+	0x1103,
+	0x110b,
+	0x1105,
+	0x110b,
+	0x1106,
+	0x110b,
+	0x1107,
+	0x110b,
+	0x1109,
+	0x110b,
+	0x110b,
+	0x110b,
+	0x110c,
+	0x110b,
+	0x110e,
+	0x110b,
+	0x110f,
+	0x110b,
+	0x1110,
+	0x110b,
+	0x1111,
+	0x110b,
+	0x1112,
+	0x110b,
+	0x1140,
+	0x110c,
+	0x110c,
+	0x1107,
+	0x110c,
+	0x1107,
+	0x1107,
+	0x110c,
+	0x110b,
+	0x110c,
+	0x110c,
+	0x110c,
+	0x110c,
+	0x1112,
+	0x110e,
+	0x110e,
+	0x110f,
+	0x110e,
+	0x1112,
+	0x110f,
+	0x1110,
+	0x1110,
+	0x1110,
+	0x1111,
+	0x1111,
+	0x1107,
+	0x1111,
+	0x1109,
+	0x1111,
+	0x110b,
+	0x1111,
+	0x1110,
+	0x1111,
+	0x1112,
+	0x1112,
+	0x1112,
+	0x1102,
+	0x1112,
+	0x1105,
+	0x1112,
+	0x1106,
+	0x1112,
+	0x1107,
+	0x1112,
+	0x1109,
+	0x1112,
+	0x1112,
+	0x113c,
+	0x113c,
+	0x113e,
+	0x113e,
+	0x1140,
+	0x1140,
+	0x1107,
+	0x1140,
+	0x1107,
+	0x110b,
+	0x114c,
+	0x114c,
+	0x1106,
+	0x114c,
+	0x1112,
+	0x114e,
+	0x114e,
+	0x1150,
+	0x1150,
+	0x1159,
+	0x1159,
+	0x1159,
+	0x1160,
+	0x1161,
+	0x1161,
+	0x1169,
+	0x1161,
+	0x116e,
+	0x1161,
+	0x30fc,
+	0x1161,
+	0x4e28,
+	0x1163,
+	0x1163,
+	0x1169,
+	0x1163,
+	0x116d,
+	0x1163,
+	0x116e,
+	0x1163,
+	0x4e28,
+	0x1165,
+	0x1165,
+	0x1169,
+	0x1165,
+	0x116e,
+	0x1165,
+	0x30fc,
+	0x1165,
+	0x4e28,
+	0x1167,
+	0x1167,
+	0x1163,
+	0x1167,
+	0x1169,
+	0x1167,
+	0x116e,
+	0x1167,
+	0x4e28,
+	0x1169,
+	0x1169,
+	0x1161,
+	0x1169,
+	0x1161,
+	0x4e28,
+	0x1169,
+	0x1163,
+	0x1169,
+	0x1163,
+	0x4e28,
+	0x1169,
+	0x1165,
+	0x1169,
+	0x1165,
+	0x4e28,
+	0x1169,
+	0x1167,
+	0x1169,
+	0x1167,
+	0x4e28,
+	0x1169,
+	0x1169,
+	0x1169,
+	0x1169,
+	0x4e28,
+	0x1169,
+	0x116e,
+	0x1169,
+	0x4e28,
+	0x116d,
+	0x116d,
+	0x1161,
+	0x116d,
+	0x1161,
+	0x4e28,
+	0x116d,
+	0x1163,
+	0x116d,
+	0x1163,
+	0x4e28,
+	0x116d,
+	0x1165,
+	0x116d,
+	0x1169,
+	0x116d,
+	0x4e28,
+	0x116e,
+	0x116e,
+	0x1161,
+	0x116e,
+	0x1161,
+	0x4e28,
+	0x116e,
+	0x1165,
+	0x116e,
+	0x1165,
+	0x30fc,
+	0x116e,
+	0x1165,
+	0x4e28,
+	0x116e,
+	0x1167,
+	0x116e,
+	0x1167,
+	0x4e28,
+	0x116e,
+	0x116e,
+	0x116e,
+	0x4e28,
+	0x116e,
+	0x4e28,
+	0x4e28,
+	0x1172,
+	0x1172,
+	0x1161,
+	0x1172,
+	0x1161,
+	0x4e28,
+	0x1172,
+	0x1165,
+	0x1172,
+	0x1165,
+	0x4e28,
+	0x1172,
+	0x1167,
+	0x1172,
+	0x1167,
+	0x4e28,
+	0x1172,
+	0x1169,
+	0x1172,
+	0x116e,
+	0x1172,
+	0x4e28,
+	0x119e,
+	0x119e,
+	0x1161,
+	0x119e,
+	0x1165,
+	0x119e,
+	0x1165,
+	0x4e28,
+	0x119e,
+	0x116e,
+	0x119e,
+	0x119e,
+	0x119e,
+	0x4e28,
+	0x1206,
+	0x1261,
+	0x12ae,
+	0x1323,
+	0x13ef,
+	0x1401,
+	0xb7,
+	0x1401,
+	0x1420,
+	0x1404,
+	0xb7,
+	0x1405,
+	0xb7,
+	0x1405,
+	0x1420,
+	0x1406,
+	0xb7,
+	0x140a,
+	0xb7,
+	0x140a,
+	0x1420,
+	0x140b,
+	0xb7,
+	0x141e,
+	0x18df,
+	0x1421,
+	0x1429,
+	0x1432,
+	0xb7,
+	0x1434,
+	0xb7,
+	0x1435,
+	0x1439,
+	0xb7,
+	0x144f,
+	0xb7,
+	0x1450,
+	0x1450,
+	0x27,
+	0x1450,
+	0x2f,
+	0x1450,
+	0xb7,
+	0x1450,
+	0x1455,
+	0x1451,
+	0xb7,
+	0x1455,
+	0x1455,
+	0x27,
+	0x1455,
+	0xb7,
+	0x1456,
+	0xb7,
+	0x146b,
+	0x27,
+	0x146b,
+	0xb7,
+	0x146e,
+	0xb7,
+	0x1470,
+	0xb7,
+	0x1489,
+	0x1489,
+	0xb7,
+	0x148b,
+	0xb7,
+	0x148c,
+	0xb7,
+	0x148e,
+	0xb7,
+	0x1490,
+	0x1490,
+	0xb7,
+	0x1491,
+	0xb7,
+	0x14a3,
+	0xb7,
+	0x14a6,
+	0xb7,
+	0x14a7,
+	0xb7,
+	0x14a8,
+	0xb7,
+	0x14ab,
+	0xb7,
+	0x14c0,
+	0xb7,
+	0x14c2,
+	0xb7,
+	0x14c3,
+	0xb7,
+	0x14c4,
+	0xb7,
+	0x14c5,
+	0xb7,
+	0x14c7,
+	0xb7,
+	0x14c8,
+	0xb7,
+	0x14d3,
+	0x14d3,
+	0xb7,
+	0x14d5,
+	0xb7,
+	0x14d6,
+	0xb7,
+	0x14d7,
+	0xb7,
+	0x14d8,
+	0xb7,
+	0x14da,
+	0x14da,
+	0xb7,
+	0x14db,
+	0xb7,
+	0x14ed,
+	0xb7,
+	0x14ef,
+	0xb7,
+	0x14f0,
+	0xb7,
+	0x14f1,
+	0xb7,
+	0x14f2,
+	0xb7,
+	0x14f4,
+	0xb7,
+	0x14f5,
+	0xb7,
+	0x150b,
+	0x3c,
+	0x150b,
+	0x62,
+	0x150b,
+	0x1455,
+	0x150b,
+	0x1490,
+	0x1510,
+	0xb7,
+	0x1511,
+	0xb7,
+	0x1512,
+	0xb7,
+	0x1513,
+	0xb7,
+	0x1514,
+	0xb7,
+	0x1515,
+	0xb7,
+	0x1516,
+	0xb7,
+	0x1528,
+	0xb7,
+	0x1529,
+	0xb7,
+	0x152a,
+	0xb7,
+	0x152b,
+	0xb7,
+	0x152d,
+	0xb7,
+	0x152e,
+	0xb7,
+	0x1543,
+	0x1543,
+	0xb7,
+	0x1546,
+	0x154a,
+	0x154c,
+	0xb7,
+	0x1550,
+	0x50,
+	0x1550,
+	0x62,
+	0x1550,
+	0x64,
+	0x1550,
+	0x146b,
+	0x1550,
+	0x146c,
+	0x1550,
+	0x146e,
+	0x1550,
+	0x1470,
+	0x1550,
+	0x1483,
+	0x155a,
+	0xb7,
+	0x155e,
+	0xb7,
+	0x1566,
+	0xb7,
+	0x1567,
+	0xb7,
+	0x156b,
+	0xb7,
+	0x1586,
+	0xb7,
+	0x1595,
+	0x4a,
+	0x1595,
+	0x1489,
+	0x1595,
+	0x148a,
+	0x1595,
+	0x148b,
+	0x1595,
+	0x148c,
+	0x1595,
+	0x148e,
+	0x1595,
+	0x1490,
+	0x1595,
+	0x1491,
+	0x1596,
+	0x4a,
+	0x1596,
+	0x148b,
+	0x1596,
+	0x148c,
+	0x1596,
+	0x148e,
+	0x1596,
+	0x1490,
+	0x1596,
+	0x1491,
+	0x1597,
+	0xb7,
+	0x15a7,
+	0xb7,
+	0x15a8,
+	0xb7,
+	0x15a9,
+	0xb7,
+	0x15aa,
+	0xb7,
+	0x15ab,
+	0xb7,
+	0x15ac,
+	0xb7,
+	0x15ad,
+	0xb7,
+	0x15d2,
+	0x15d5,
+	0x15e1,
+	0x15f4,
+	0xb7,
+	0x161b,
+	0xb7,
+	0x1646,
+	0x1660,
+	0x16b9,
+	0x16bc,
+	0x16bd,
+	0x16cb,
+	0x16cf,
+	0x16d0,
+	0x16d0,
+	0x16da,
+	0x16d0,
+	0x21c2,
+	0x16da,
+	0x16dc,
+	0x16de,
+	0x16e6,
+	0x16e8,
+	0x16ef,
+	0x17a2,
+	0x1835,
+	0x185c,
+	0x18d4,
+	0x18d6,
+	0x18df,
+	0x141e,
+	0x18f3,
+	0x18f4,
+	0x18f5,
+	0x199e,
+	0x19b1,
+	0x1a45,
+	0x1aa8,
+	0x1aa8,
+	0x1aaa,
+	0x1aa8,
+	0x1b05,
+	0x1b07,
+	0x1b09,
+	0x1b0b,
+	0x1b0d,
+	0x1b11,
+	0x1b28,
+	0x1b50,
+	0x1b5e,
+	0x1b5e,
+	0x1c3b,
+	0x1c3b,
+	0x1c7e,
+	0x1c7e,
+	0x1d00,
+	0x1d05,
+	0x1d07,
+	0x1d0a,
+	0x1d0e,
+	0x1d18,
+	0x1d19,
+	0x1d1b,
+	0x1d34,
+	0x1d4b,
+	0x1d4d,
+	0x1e9f,
+	0x2081,
+	0x2080,
+	0x20b8,
+	0x2117,
+	0x2132,
+	0x2144,
+	0x2190,
+	0x2192,
+	0x2194,
+	0x219e,
+	0x219f,
+	0x21a0,
+	0x21a1,
+	0x21b2,
+	0x21c3,
+	0x16da,
+	0x21c3,
+	0x21c2,
+	0x21d0,
+	0x21d2,
+	0x21d4,
+	0x2202,
+	0x2205,
+	0x2207,
+	0x2208,
+	0x220b,
+	0x220e,
+	0x2210,
+	0x2220,
+	0x2227,
+	0x222e,
+	0x222e,
+	0x222e,
+	0x222e,
+	0x222e,
+	0x2234,
+	0x2235,
+	0x2237,
+	0x2243,
+	0x2245,
+	0x2248,
+	0x224d,
+	0x224f,
+	0x2261,
+	0x2264,
+	0x2265,
+	0x2272,
+	0x2273,
+	0x2276,
+	0x2277,
+	0x227a,
+	0x227b,
+	0x227c,
+	0x227d,
+	0x2286,
+	0x2287,
+	0x228d,
+	0x228e,
+	0x228f,
+	0x2290,
+	0x2291,
+	0x2292,
+	0x2293,
+	0x2294,
+	0x2297,
+	0x229b,
+	0x22a0,
+	0x22a1,
+	0x22a2,
+	0x22a8,
+	0x22a9,
+	0x22ab,
+	0x22b2,
+	0x22b3,
+	0x22b4,
+	0x22b5,
+	0x22c6,
+	0x2307,
+	0x2312,
+	0x2319,
+	0x2324,
+	0x233b,
+	0x233e,
+	0x2342,
+	0x2349,
+	0x234b,
+	0x234e,
+	0x2355,
+	0x236d,
+	0x2388,
+	0x23dc,
+	0x23dd,
+	0x23de,
+	0x23df,
+	0x23e0,
+	0x23e1,
+	0x23e5,
+	0x23fb,
+	0x24be,
+	0x2502,
+	0x250c,
+	0x251c,
+	0x258c,
+	0x2596,
+	0x2598,
+	0x25a1,
+	0x25aa,
+	0x25b6,
+	0x2627,
+	0x2629,
+	0x263d,
+	0x263e,
+	0x276c,
+	0x276d,
+	0x2780,
+	0x2781,
+	0x2782,
+	0x2783,
+	0x2784,
+	0x2785,
+	0x2786,
+	0x2787,
+	0x2788,
+	0x2789,
+	0x27e6,
+	0x27e7,
+	0x299a,
+	0x29df,
+	0x2a1f,
+	0x2add,
+	0x2c3f,
+	0x2c6f,
+	0x2c70,
+	0x2c75,
+	0x2c76,
+	0x2cb6,
+	0x2ce8,
+	0x2d40,
+	0x2d42,
+	0x2d57,
+	0x301c,
+	0x303c,
+	0x3046,
+	0x304b,
+	0x304d,
+	0x3051,
+	0x3053,
+	0x3055,
+	0x3057,
+	0x3059,
+	0x305b,
+	0x305d,
+	0x305f,
+	0x3061,
+	0x3064,
+	0x3066,
+	0x3068,
+	0x306f,
+	0x3072,
+	0x3075,
+	0x3078,
+	0x307b,
+	0x309d,
+	0x30a6,
+	0x30ad,
+	0x30af,
+	0x30b1,
+	0x30b3,
+	0x30b5,
+	0x30b7,
+	0x30b9,
+	0x30bb,
+	0x30bd,
+	0x30c1,
+	0x30c4,
+	0x30c6,
+	0x30d2,
+	0x30d5,
+	0x30db,
+	0x30ef,
+	0x30f0,
+	0x30f1,
+	0x30f2,
+	0x30fc,
+	0x30fc,
+	0x1161,
+	0x30fc,
+	0x1165,
+	0x30fc,
+	0x1165,
+	0x4e28,
+	0x30fc,
+	0x1169,
+	0x30fc,
+	0x116e,
+	0x30fc,
+	0x30fc,
+	0x30fc,
+	0x4e28,
+	0x30fc,
+	0x4e28,
+	0x116e,
+	0x30fd,
+	0x33c4,
+	0x349e,
+	0x34b9,
+	0x34bb,
+	0x34df,
+	0x3515,
+	0x353e,
+	0x3588,
+	0x363d,
+	0x36ee,
+	0x36fc,
+	0x3781,
+	0x382f,
+	0x3862,
+	0x387c,
+	0x38c7,
+	0x38e3,
+	0x38fa,
+	0x391c,
+	0x393a,
+	0x3a2e,
+	0x3a41,
+	0x3a6c,
+	0x3ada,
+	0x3ae4,
+	0x3b08,
+	0x3b19,
+	0x3b35,
+	0x3b3a,
+	0x3b3b,
+	0x3b49,
+	0x3b9d,
+	0x3ba3,
+	0x3c18,
+	0x3c4e,
+	0x3d33,
+	0x3d96,
+	0x3eac,
+	0x3eb8,
+	0x3f1b,
+	0x3ffc,
+	0x4008,
+	0x4018,
+	0x4039,
+	0x403f,
+	0x4046,
+	0x4096,
+	0x40e3,
+	0x412f,
+	0x4202,
+	0x4227,
+	0x42a0,
+	0x4301,
+	0x4334,
+	0x4359,
+	0x43d5,
+	0x43d9,
+	0x440b,
+	0x4443,
+	0x446b,
+	0x452b,
+	0x455d,
+	0x4561,
+	0x456b,
+	0x45d7,
+	0x45f9,
+	0x4635,
+	0x46b6,
+	0x46be,
+	0x46c7,
+	0x4995,
+	0x49e6,
+	0x4a6e,
+	0x4a76,
+	0x4ab2,
+	0x4b33,
+	0x4bce,
+	0x4cce,
+	0x4ced,
+	0x4cf8,
+	0x4d56,
+	0x4e0d,
+	0x4e26,
+	0x4e28,
+	0x4e28,
+	0x1161,
+	0x4e28,
+	0x1163,
+	0x4e28,
+	0x1163,
+	0x1169,
+	0x4e28,
+	0x1163,
+	0x4e28,
+	0x4e28,
+	0x1167,
+	0x4e28,
+	0x1167,
+	0x4e28,
+	0x4e28,
+	0x1169,
+	0x4e28,
+	0x1169,
+	0x4e28,
+	0x4e28,
+	0x116d,
+	0x4e28,
+	0x116e,
+	0x4e28,
+	0x1172,
+	0x4e28,
+	0x119e,
+	0x4e28,
+	0x30fc,
+	0x4e28,
+	0x4e28,
+	0x4e2c,
+	0x4e32,
+	0x4e38,
+	0x4e39,
+	0x4e3d,
+	0x4e41,
+	0x4e59,
+	0x4e5a,
+	0x4e5b,
+	0x4e80,
+	0x4e82,
+	0x4e85,
+	0x4e86,
+	0x4e8c,
+	0x4ea0,
+	0x4eae,
+	0x4eba,
+	0x4ebb,
+	0x4ec0,
+	0x4ecc,
+	0x4ee4,
+	0x4f60,
+	0x4f75,
+	0x4f80,
+	0x4f86,
+	0x4f8b,
+	0x4fae,
+	0x4fbb,
+	0x4fbf,
+	0x5024,
+	0x502b,
+	0x507a,
+	0x5099,
+	0x50cf,
+	0x50da,
+	0x50e7,
+	0x513f,
+	0x5140,
+	0x5145,
+	0x514d,
+	0x5154,
+	0x5164,
+	0x5165,
+	0x5167,
+	0x5168,
+	0x5169,
+	0x516b,
+	0x516d,
+	0x5177,
+	0x5180,
+	0x5182,
+	0x518d,
+	0x5192,
+	0x5195,
+	0x5196,
+	0x5197,
+	0x51a4,
+	0x51ab,
+	0x51ac,
+	0x51b5,
+	0x51b7,
+	0x51c9,
+	0x51cc,
+	0x51dc,
+	0x51de,
+	0x51e0,
+	0x51f5,
+	0x5200,
+	0x5202,
+	0x5203,
+	0x5207,
+	0x5217,
+	0x5229,
+	0x523a,
+	0x523b,
+	0x5246,
+	0x5272,
+	0x5277,
+	0x5289,
+	0x529b,
+	0x52a3,
+	0x52b3,
+	0x52c7,
+	0x52c9,
+	0x52d2,
+	0x52de,
+	0x52e4,
+	0x52f5,
+	0x52f9,
+	0x52fa,
+	0x5305,
+	0x5306,
+	0x5315,
+	0x5317,
+	0x531a,
+	0x5338,
+	0x533f,
+	0x5341,
+	0x5344,
+	0x5345,
+	0x5349,
+	0x534d,
+	0x5350,
+	0x5351,
+	0x535a,
+	0x535c,
+	0x5369,
+	0x5373,
+	0x5375,
+	0x537d,
+	0x537f,
+	0x5382,
+	0x53b6,
+	0x53c3,
+	0x53c8,
+	0x53ca,
+	0x53df,
+	0x53e3,
+	0x53e5,
+	0x53eb,
+	0x53f1,
+	0x5406,
+	0x540f,
+	0x541d,
+	0x5438,
+	0x5442,
+	0x5448,
+	0x5468,
+	0x549e,
+	0x54a2,
+	0x54bd,
+	0x54f6,
+	0x5510,
+	0x5553,
+	0x5555,
+	0x5563,
+	0x5584,
+	0x5587,
+	0x5599,
+	0x559d,
+	0x55ab,
+	0x55b3,
+	0x55c0,
+	0x55c2,
+	0x55e2,
+	0x5606,
+	0x5651,
+	0x5668,
+	0x5674,
+	0x56f9,
+	0x5716,
+	0x5717,
+	0x571f,
+	0x578b,
+	0x57ce,
+	0x57f4,
+	0x580d,
+	0x5831,
+	0x5832,
+	0x5840,
+	0x585a,
+	0x585e,
+	0x5861,
+	0x58a8,
+	0x58ab,
+	0x58ac,
+	0x58b3,
+	0x58d8,
+	0x58df,
+	0x58ee,
+	0x58f2,
+	0x58f7,
+	0x5902,
+	0x5906,
+	0x590a,
+	0x5915,
+	0x591a,
+	0x5922,
+	0x5927,
+	0x5944,
+	0x5948,
+	0x5951,
+	0x5954,
+	0x5962,
+	0x5973,
+	0x59d8,
+	0x59ec,
+	0x5a1b,
+	0x5a27,
+	0x5a62,
+	0x5a66,
+	0x5aaf,
+	0x5ab5,
+	0x5b08,
+	0x5b28,
+	0x5b3e,
+	0x5b50,
+	0x5b80,
+	0x5b85,
+	0x5bc3,
+	0x5bd8,
+	0x5be7,
+	0x5bee,
+	0x5bf3,
+	0x5bf8,
+	0x5bff,
+	0x5c06,
+	0x5c0f,
+	0x5c22,
+	0x5c23,
+	0x5c38,
+	0x5c3f,
+	0x5c60,
+	0x5c62,
+	0x5c64,
+	0x5c65,
+	0x5c6e,
+	0x5c71,
+	0x5c8d,
+	0x5cc0,
+	0x5d19,
+	0x5d43,
+	0x5d50,
+	0x5d6b,
+	0x5d6e,
+	0x5d7c,
+	0x5db2,
+	0x5dba,
+	0x5ddb,
+	0x5de1,
+	0x5de2,
+	0x5de5,
+	0x5df1,
+	0x5df3,
+	0x5dfd,
+	0x5dfe,
+	0x5e21,
+	0x5e28,
+	0x5e3d,
+	0x5e69,
+	0x5e72,
+	0x5e74,
+	0x5e7a,
+	0x5e7f,
+	0x5ea6,
+	0x5eb0,
+	0x5eb3,
+	0x5eb6,
+	0x5ec9,
+	0x5eca,
+	0x5ed2,
+	0x5ed3,
+	0x5ed9,
+	0x5eec,
+	0x5ef4,
+	0x5efe,
+	0x5f04,
+	0x5f0b,
+	0x5f13,
+	0x5f22,
+	0x5f50,
+	0x5f51,
+	0x5f53,
+	0x5f61,
+	0x5f62,
+	0x5f69,
+	0x5f6b,
+	0x5f73,
+	0x5f8b,
+	0x5f9a,
+	0x5fa9,
+	0x5fad,
+	0x5fc3,
+	0x5fc4,
+	0x5fcd,
+	0x5fd7,
+	0x5ff5,
+	0x5ff9,
+	0x6012,
+	0x601c,
+	0x6075,
+	0x6081,
+	0x6094,
+	0x60c7,
+	0x60d8,
+	0x60e1,
+	0x6108,
+	0x6144,
+	0x6148,
+	0x614c,
+	0x614e,
+	0x6160,
+	0x6168,
+	0x617a,
+	0x618e,
+	0x6190,
+	0x61a4,
+	0x61af,
+	0x61b2,
+	0x61de,
+	0x61f2,
+	0x61f6,
+	0x6200,
+	0x6208,
+	0x6210,
+	0x621b,
+	0x622e,
+	0x6234,
+	0x6236,
+	0x624b,
+	0x624c,
+	0x625d,
+	0x62b1,
+	0x62c9,
+	0x62cf,
+	0x62d3,
+	0x62d4,
+	0x62fc,
+	0x62fe,
+	0x633d,
+	0x6350,
+	0x6368,
+	0x637b,
+	0x6383,
+	0x63a0,
+	0x63a9,
+	0x63c4,
+	0x63c5,
+	0x63e4,
+	0x641c,
+	0x6422,
+	0x6452,
+	0x6469,
+	0x6477,
+	0x647e,
+	0x649a,
+	0x649d,
+	0x64c4,
+	0x652f,
+	0x6534,
+	0x6535,
+	0x654f,
+	0x6556,
+	0x656c,
+	0x6578,
+	0x6587,
+	0x6589,
+	0x6597,
+	0x6599,
+	0x65a4,
+	0x65b9,
+	0x65c5,
+	0x65e0,
+	0x65e1,
+	0x65e2,
+	0x65e3,
+	0x65e5,
+	0x6613,
+	0x6649,
+	0x665a,
+	0x6674,
+	0x6688,
+	0x6691,
+	0x669c,
+	0x66b4,
+	0x66c6,
+	0x66f0,
+	0x66f4,
+	0x66f8,
+	0x6700,
+	0x6708,
+	0x670c,
+	0x670f,
+	0x6710,
+	0x6713,
+	0x6717,
+	0x6718,
+	0x671b,
+	0x6721,
+	0x6723,
+	0x6728,
+	0x674e,
+	0x6753,
+	0x6756,
+	0x675e,
+	0x676e,
+	0x677b,
+	0x6785,
+	0x6797,
+	0x67f3,
+	0x67fa,
+	0x6817,
+	0x681f,
+	0x6852,
+	0x6881,
+	0x6885,
+	0x688e,
+	0x68a8,
+	0x6914,
+	0x6942,
+	0x699d,
+	0x69a3,
+	0x69ea,
+	0x6a02,
+	0x6a13,
+	0x6aa8,
+	0x6ad3,
+	0x6adb,
+	0x6b04,
+	0x6b20,
+	0x6b21,
+	0x6b54,
+	0x6b62,
+	0x6b6f,
+	0x6b72,
+	0x6b77,
+	0x6b79,
+	0x6b7a,
+	0x6b9f,
+	0x6bae,
+	0x6bb3,
+	0x6bba,
+	0x6bbb,
+	0x6bcb,
+	0x6bcd,
+	0x6bd4,
+	0x6bdb,
+	0x6c0f,
+	0x6c11,
+	0x6c14,
+	0x6c34,
+	0x6c35,
+	0x6c3a,
+	0x6c4e,
+	0x6c67,
+	0x6c88,
+	0x6cbf,
+	0x6ccc,
+	0x6ccd,
+	0x6ce5,
+	0x6d16,
+	0x6d1b,
+	0x6d1e,
+	0x6d34,
+	0x6d3e,
+	0x6d41,
+	0x6d69,
+	0x6d6a,
+	0x6d77,
+	0x6d78,
+	0x6d85,
+	0x6dcb,
+	0x6dda,
+	0x6dea,
+	0x6df9,
+	0x6e1a,
+	0x6e2f,
+	0x6e6e,
+	0x6e88,
+	0x6e9c,
+	0x6eba,
+	0x6ec7,
+	0x6ecb,
+	0x6ed1,
+	0x6edb,
+	0x6f0f,
+	0x6f22,
+	0x6f23,
+	0x6f6e,
+	0x6fc6,
+	0x6feb,
+	0x6ffe,
+	0x701b,
+	0x701e,
+	0x7039,
+	0x704a,
+	0x706b,
+	0x706c,
+	0x7070,
+	0x7077,
+	0x707d,
+	0x7099,
+	0x70ad,
+	0x70c8,
+	0x70d9,
+	0x7145,
+	0x7149,
+	0x716e,
+	0x719c,
+	0x71ce,
+	0x71d0,
+	0x7210,
+	0x721b,
+	0x7228,
+	0x722a,
+	0x722b,
+	0x7235,
+	0x7236,
+	0x723b,
+	0x723f,
+	0x7247,
+	0x7250,
+	0x7259,
+	0x725b,
+	0x7262,
+	0x7280,
+	0x7295,
+	0x72ac,
+	0x72ad,
+	0x72af,
+	0x72c0,
+	0x72fc,
+	0x732a,
+	0x7375,
+	0x737a,
+	0x7384,
+	0x7387,
+	0x7389,
+	0x738b,
+	0x73a5,
+	0x73b2,
+	0x73de,
+	0x7406,
+	0x7409,
+	0x7422,
+	0x7447,
+	0x745c,
+	0x7469,
+	0x7471,
+	0x7485,
+	0x7489,
+	0x7498,
+	0x74ca,
+	0x74dc,
+	0x74e6,
+	0x7506,
+	0x7518,
+	0x751f,
+	0x7524,
+	0x7528,
+	0x7530,
+	0x753b,
+	0x753e,
+	0x7559,
+	0x7565,
+	0x7570,
+	0x758b,
+	0x7592,
+	0x75e2,
+	0x7610,
+	0x761d,
+	0x761f,
+	0x7642,
+	0x7669,
+	0x7676,
+	0x767d,
+	0x76ae,
+	0x76bf,
+	0x76ca,
+	0x76db,
+	0x76e7,
+	0x76ee,
+	0x76f4,
+	0x7701,
+	0x771e,
+	0x771f,
+	0x7740,
+	0x774a,
+	0x778b,
+	0x77a7,
+	0x77db,
+	0x77e2,
+	0x77f3,
+	0x7814,
+	0x784e,
+	0x786b,
+	0x788c,
+	0x7891,
+	0x78ca,
+	0x78cc,
+	0x78fb,
+	0x792a,
+	0x793a,
+	0x793b,
+	0x793c,
+	0x793e,
+	0x7948,
+	0x7949,
+	0x7950,
+	0x7956,
+	0x795d,
+	0x795e,
+	0x7965,
+	0x797f,
+	0x798d,
+	0x798e,
+	0x798f,
+	0x79ae,
+	0x79b8,
+	0x79be,
+	0x79ca,
+	0x79eb,
+	0x7a1c,
+	0x7a40,
+	0x7a4a,
+	0x7a4f,
+	0x7a74,
+	0x7a81,
+	0x7ab1,
+	0x7acb,
+	0x7adc,
+	0x7aee,
+	0x7af9,
+	0x7b20,
+	0x7bc0,
+	0x7bc6,
+	0x7bc9,
+	0x7c3e,
+	0x7c60,
+	0x7c73,
+	0x7c7b,
+	0x7c92,
+	0x7cbe,
+	0x7cd2,
+	0x7cd6,
+	0x7ce3,
+	0x7ce7,
+	0x7ce8,
+	0x7cf8,
+	0x7cf9,
+	0x7d00,
+	0x7d10,
+	0x7d22,
+	0x7d2f,
+	0x7d55,
+	0x7d5b,
+	0x7d63,
+	0x7da0,
+	0x7dbe,
+	0x7dc7,
+	0x7df4,
+	0x7e02,
+	0x7e09,
+	0x7e37,
+	0x7e41,
+	0x7e45,
+	0x7f36,
+	0x7f3e,
+	0x7f51,
+	0x7f52,
+	0x7f53,
+	0x7f72,
+	0x7f79,
+	0x7f7a,
+	0x7f85,
+	0x7f8a,
+	0x7f95,
+	0x7f9a,
+	0x7fbd,
+	0x7ffa,
+	0x8001,
+	0x8002,
+	0x8005,
+	0x800c,
+	0x8012,
+	0x8033,
+	0x8046,
+	0x8060,
+	0x806f,
+	0x8070,
+	0x807e,
+	0x807f,
+	0x8080,
+	0x8089,
+	0x808b,
+	0x80ad,
+	0x80b2,
+	0x80fc,
+	0x8103,
+	0x813e,
+	0x81d8,
+	0x81e3,
+	0x81e8,
+	0x81ea,
+	0x81ed,
+	0x81f3,
+	0x81fc,
+	0x8201,
+	0x8204,
+	0x820c,
+	0x8218,
+	0x821b,
+	0x821f,
+	0x826e,
+	0x826f,
+	0x8272,
+	0x8278,
+	0x8279,
+	0x828b,
+	0x8291,
+	0x829d,
+	0x82b1,
+	0x82b3,
+	0x82bd,
+	0x82e5,
+	0x82e6,
+	0x831d,
+	0x8323,
+	0x8336,
+	0x8352,
+	0x8353,
+	0x8363,
+	0x83ad,
+	0x83bd,
+	0x83c9,
+	0x83ca,
+	0x83cc,
+	0x83dc,
+	0x83e7,
+	0x83ef,
+	0x83f1,
+	0x843d,
+	0x8449,
+	0x8457,
+	0x848d,
+	0x84ee,
+	0x84f1,
+	0x84f3,
+	0x84fc,
+	0x8516,
+	0x8564,
+	0x85cd,
+	0x85fa,
+	0x8606,
+	0x8612,
+	0x862d,
+	0x8637,
+	0x863f,
+	0x864d,
+	0x864e,
+	0x8650,
+	0x865c,
+	0x8667,
+	0x8669,
+	0x866b,
+	0x8688,
+	0x86a9,
+	0x86e2,
+	0x870e,
+	0x8728,
+	0x876b,
+	0x8779,
+	0x8786,
+	0x87ba,
+	0x87e1,
+	0x8801,
+	0x881f,
+	0x8840,
+	0x884c,
+	0x8860,
+	0x8863,
+	0x8864,
+	0x88c2,
+	0x88cf,
+	0x88d7,
+	0x88de,
+	0x88e1,
+	0x88f8,
+	0x88fa,
+	0x8910,
+	0x8941,
+	0x8964,
+	0x897e,
+	0x897f,
+	0x8980,
+	0x8986,
+	0x898b,
+	0x8996,
+	0x89c1,
+	0x89d2,
+	0x8a00,
+	0x8a2e,
+	0x8aa0,
+	0x8aaa,
+	0x8abf,
+	0x8acb,
+	0x8ad2,
+	0x8ad6,
+	0x8aed,
+	0x8af8,
+	0x8afe,
+	0x8b01,
+	0x8b39,
+	0x8b58,
+	0x8b80,
+	0x8b86,
+	0x8b8a,
+	0x8ba0,
+	0x8c37,
+	0x8c46,
+	0x8c48,
+	0x8c55,
+	0x8c5c,
+	0x8c78,
+	0x8c9d,
+	0x8cab,
+	0x8cc1,
+	0x8cc2,
+	0x8cc8,
+	0x8cd3,
+	0x8d08,
+	0x8d1b,
+	0x8d1d,
+	0x8d64,
+	0x8d70,
+	0x8d77,
+	0x8d7f,
+	0x8db3,
+	0x8dbc,
+	0x8dcb,
+	0x8de5,
+	0x8def,
+	0x8df0,
+	0x8e97,
+	0x8eab,
+	0x8eca,
+	0x8ed4,
+	0x8eff,
+	0x8f26,
+	0x8f2a,
+	0x8f38,
+	0x8f3b,
+	0x8f62,
+	0x8f66,
+	0x8f9b,
+	0x8f9e,
+	0x8fb0,
+	0x8fb5,
+	0x8fb6,
+	0x9023,
+	0x9038,
+	0x9072,
+	0x907c,
+	0x908f,
+	0x9091,
+	0x9094,
+	0x90ce,
+	0x90f1,
+	0x90fd,
+	0x9111,
+	0x911b,
+	0x9149,
+	0x916a,
+	0x9199,
+	0x91b4,
+	0x91c6,
+	0x91cc,
+	0x91cf,
+	0x91d1,
+	0x9234,
+	0x9238,
+	0x9276,
+	0x927c,
+	0x92d7,
+	0x92d8,
+	0x9304,
+	0x934a,
+	0x93ad,
+	0x93f9,
+	0x9415,
+	0x9485,
+	0x9577,
+	0x9578,
+	0x957f,
+	0x9580,
+	0x958b,
+	0x95ad,
+	0x95b7,
+	0x95e8,
+	0x961c,
+	0x961d,
+	0x962e,
+	0x964b,
+	0x964d,
+	0x9675,
+	0x9678,
+	0x967c,
+	0x9686,
+	0x96a3,
+	0x96b6,
+	0x96b7,
+	0x96b9,
+	0x96c3,
+	0x96e2,
+	0x96e3,
+	0x96e8,
+	0x96f6,
+	0x96f7,
+	0x9723,
+	0x9732,
+	0x9748,
+	0x9751,
+	0x9752,
+	0x9756,
+	0x975e,
+	0x9762,
+	0x9769,
+	0x97cb,
+	0x97db,
+	0x97e0,
+	0x97e6,
+	0x97ed,
+	0x97f3,
+	0x97ff,
+	0x9801,
+	0x980b,
+	0x9818,
+	0x9829,
+	0x983b,
+	0x985e,
+	0x9875,
+	0x98a8,
+	0x98ce,
+	0x98db,
+	0x98de,
+	0x98df,
+	0x98e0,
+	0x98e2,
+	0x98ef,
+	0x98fc,
+	0x9928,
+	0x9929,
+	0x9963,
+	0x9996,
+	0x9999,
+	0x99a7,
+	0x99ac,
+	0x99c2,
+	0x99f1,
+	0x99fe,
+	0x9a6a,
+	0x9a6c,
+	0x9aa8,
+	0x9ad8,
+	0x9adf,
+	0x9b12,
+	0x9b25,
+	0x9b2f,
+	0x9b32,
+	0x9b3c,
+	0x9b5a,
+	0x9b6f,
+	0x9c40,
+	0x9c57,
+	0x9c7c,
+	0x9ce5,
+	0x9cfd,
+	0x9d67,
+	0x9db4,
+	0x9dfa,
+	0x9e1e,
+	0x9e42,
+	0x9e75,
+	0x9e7f,
+	0x9e97,
+	0x9e9f,
+	0x9ea5,
+	0x9ea6,
+	0x9ebb,
+	0x9ec3,
+	0x9ec4,
+	0x9ecd,
+	0x9ece,
+	0x9ed1,
+	0x9ef9,
+	0x9efd,
+	0x9efe,
+	0x9f05,
+	0x9f0e,
+	0x9f0f,
+	0x9f13,
+	0x9f16,
+	0x9f20,
+	0x9f3b,
+	0x9f43,
+	0x9f4a,
+	0x9f50,
+	0x9f52,
+	0x9f7f,
+	0x9f8d,
+	0x9f8e,
+	0x9f99,
+	0x9f9c,
+	0x9f9f,
+	0x9fa0,
+	0xa04a,
+	0xa050,
+	0xa0c0,
+	0xa132,
+	0xa259,
+	0xa2b1,
+	0xa2cd,
+	0xa3ab,
+	0xa3b5,
+	0xa3bf,
+	0xa3c2,
+	0xa458,
+	0xa4d5,
+	0xa4e4,
+	0xa4e8,
+	0xa4f6,
+	0xa64c,
+	0xa658,
+	0xa669,
+	0xa6f3,
+	0xa6f3,
+	0xa727,
+	0xa73e,
+	0xa73f,
+	0xa770,
+	0xa779,
+	0xa786,
+	0xa792,
+	0xa793,
+	0xa7fb,
+	0xa8fb,
+	0xa8fc,
+	0xa99d,
+	0xa9d0,
+	0xaa01,
+	0xaa23,
+	0xfe3f,
+	0xfe72,
+	0xfe74,
+	0xfe76,
+	0xfe77,
+	0xfe78,
+	0xfe79,
+	0xfe7a,
+	0xfe7b,
+	0xfe7c,
+	0xff9e,
+	0xff9f,
+	0x102a8,
+	0x102bc,
+	0x102c0,
+	0x10382,
+	0x10393,
+	0x1039a,
+	0x10412,
+	0x1043a,
+	0x10486,
+	0x1099e,
+	0x10a56,
+	0x10a56,
+	0x10c82,
+	0x10ca5,
+	0x11099,
+	0x1109b,
+	0x110a5,
+	0x11434,
+	0x11412,
+	0x11434,
+	0x11418,
+	0x11434,
+	0x11423,
+	0x11434,
+	0x11429,
+	0x11434,
+	0x1142c,
+	0x11434,
+	0x1142e,
+	0x1144b,
+	0x1144b,
+	0x11582,
+	0x11583,
+	0x11584,
+	0x11641,
+	0x11641,
+	0x11ae5,
+	0x11ae5,
+	0x11ae5,
+	0x11ae5,
+	0x11aef,
+	0x11ae5,
+	0x11ae5,
+	0x11af0,
+	0x11ae5,
+	0x11aef,
+	0x11ae5,
+	0x11af0,
+	0x11aeb,
+	0x11aeb,
+	0x11aeb,
+	0x11aeb,
+	0x11aef,
+	0x11aeb,
+	0x11aef,
+	0x11af3,
+	0x11aef,
+	0x11af3,
+	0x11af0,
+	0x11af3,
+	0x11af3,
+	0x11af3,
+	0x11af3,
+	0x11aef,
+	0x11af3,
+	0x11af3,
+	0x11af0,
+	0x11c41,
+	0x11c41,
+	0x16f00,
+	0x1d157,
+	0x1d158,
+	0x1d1b9,
+	0x1d1ba,
+	0x1f10d,
+	0x1f10e,
+	0x20122,
+	0x2051c,
+	0x20525,
+	0x2054b,
+	0x2063a,
+	0x20804,
+	0x208de,
+	0x20a2c,
+	0x20b63,
+	0x214e4,
+	0x216a8,
+	0x216ea,
+	0x219c8,
+	0x21b18,
+	0x21d0b,
+	0x21de4,
+	0x21de6,
+	0x22183,
+	0x2219f,
+	0x22331,
+	0x226d4,
+	0x22844,
+	0x2284a,
+	0x22b0c,
+	0x22bf1,
+	0x2300a,
+	0x232b8,
+	0x2335f,
+	0x23393,
+	0x2339c,
+	0x233c3,
+	0x233d5,
+	0x2346d,
+	0x236a3,
+	0x238a7,
+	0x23a8d,
+	0x23afa,
+	0x23cbc,
+	0x23d1e,
+	0x23ed1,
+	0x23f5e,
+	0x23f8e,
+	0x24263,
+	0x242ee,
+	0x243ab,
+	0x24608,
+	0x24735,
+	0x24814,
+	0x24c36,
+	0x24c92,
+	0x24fa1,
+	0x24fb8,
+	0x25044,
+	0x250f2,
+	0x250f3,
+	0x25119,
+	0x25133,
+	0x25249,
+	0x2541d,
+	0x25626,
+	0x2569a,
+	0x256c5,
+	0x2597c,
+	0x25aa7,
+	0x25bab,
+	0x25c80,
+	0x25cd0,
+	0x25f86,
+	0x261da,
+	0x26228,
+	0x26247,
+	0x262d9,
+	0x2633e,
+	0x264da,
+	0x26523,
+	0x265a8,
+	0x267a7,
+	0x267b5,
+	0x26b3c,
+	0x26c36,
+	0x26cd5,
+	0x26d6b,
+	0x26f2c,
+	0x26fb1,
+	0x270d2,
+	0x273ca,
+	0x27667,
+	0x278ae,
+	0x27966,
+	0x27ca8,
+	0x27ed3,
+	0x27f2f,
+	0x285d2,
+	0x285ed,
+	0x2872e,
+	0x28bfa,
+	0x28d77,
+	0x29145,
+	0x291df,
+	0x2921a,
+	0x2940a,
+	0x29496,
+	0x295b6,
+	0x29b30,
+	0x2a0ce,
+	0x2a105,
+	0x2a20e,
+	0x2a291,
+	0x2a392,
+	0x2a600,
+};
diff --git a/src_bkp/base/unicode/tolower.cpp b/src_bkp/base/unicode/tolower.cpp
new file mode 100644
index 0000000000..de46883f85
--- /dev/null
+++ b/src_bkp/base/unicode/tolower.cpp
@@ -0,0 +1,26 @@
+#include <cstdlib>
+
+#include "tolower.h"
+
+static int compul(const void *a, const void *b)
+{
+	struct UPPER_LOWER *ul_a = (struct UPPER_LOWER *)a;
+	struct UPPER_LOWER *ul_b = (struct UPPER_LOWER *)b;
+	return ul_a->upper - ul_b->upper;
+}
+
+int str_utf8_tolower(int code)
+{
+	struct UPPER_LOWER key;
+	struct UPPER_LOWER *res;
+	key.upper = code;
+	res = (UPPER_LOWER *)bsearch(&key, tolowermap, NUM_TOLOWER, sizeof(struct UPPER_LOWER), compul);
+
+	if(res == NULL)
+		return code;
+	return res->lower;
+}
+
+#define TOLOWER_DATA
+#include "tolower_data.h"
+#undef TOLOWER_DATA
diff --git a/src_bkp/base/unicode/tolower.h b/src_bkp/base/unicode/tolower.h
new file mode 100644
index 0000000000..4ddd8fa31c
--- /dev/null
+++ b/src_bkp/base/unicode/tolower.h
@@ -0,0 +1,14 @@
+#include <cstdint>
+
+struct UPPER_LOWER
+{
+	int32_t upper;
+	int32_t lower;
+};
+
+enum
+{
+	NUM_TOLOWER = 1433,
+};
+
+extern const struct UPPER_LOWER tolowermap[];
diff --git a/src_bkp/base/unicode/tolower_data.h b/src_bkp/base/unicode/tolower_data.h
new file mode 100644
index 0000000000..072553fa78
--- /dev/null
+++ b/src_bkp/base/unicode/tolower_data.h
@@ -0,0 +1,1439 @@
+#ifndef TOLOWER_DATA
+#error "This file must only be included in `tolower.cpp`"
+#endif
+
+const struct UPPER_LOWER tolowermap[] = {
+	{65, 97},
+	{66, 98},
+	{67, 99},
+	{68, 100},
+	{69, 101},
+	{70, 102},
+	{71, 103},
+	{72, 104},
+	{73, 105},
+	{74, 106},
+	{75, 107},
+	{76, 108},
+	{77, 109},
+	{78, 110},
+	{79, 111},
+	{80, 112},
+	{81, 113},
+	{82, 114},
+	{83, 115},
+	{84, 116},
+	{85, 117},
+	{86, 118},
+	{87, 119},
+	{88, 120},
+	{89, 121},
+	{90, 122},
+	{192, 224},
+	{193, 225},
+	{194, 226},
+	{195, 227},
+	{196, 228},
+	{197, 229},
+	{198, 230},
+	{199, 231},
+	{200, 232},
+	{201, 233},
+	{202, 234},
+	{203, 235},
+	{204, 236},
+	{205, 237},
+	{206, 238},
+	{207, 239},
+	{208, 240},
+	{209, 241},
+	{210, 242},
+	{211, 243},
+	{212, 244},
+	{213, 245},
+	{214, 246},
+	{216, 248},
+	{217, 249},
+	{218, 250},
+	{219, 251},
+	{220, 252},
+	{221, 253},
+	{222, 254},
+	{256, 257},
+	{258, 259},
+	{260, 261},
+	{262, 263},
+	{264, 265},
+	{266, 267},
+	{268, 269},
+	{270, 271},
+	{272, 273},
+	{274, 275},
+	{276, 277},
+	{278, 279},
+	{280, 281},
+	{282, 283},
+	{284, 285},
+	{286, 287},
+	{288, 289},
+	{290, 291},
+	{292, 293},
+	{294, 295},
+	{296, 297},
+	{298, 299},
+	{300, 301},
+	{302, 303},
+	{304, 105},
+	{306, 307},
+	{308, 309},
+	{310, 311},
+	{313, 314},
+	{315, 316},
+	{317, 318},
+	{319, 320},
+	{321, 322},
+	{323, 324},
+	{325, 326},
+	{327, 328},
+	{330, 331},
+	{332, 333},
+	{334, 335},
+	{336, 337},
+	{338, 339},
+	{340, 341},
+	{342, 343},
+	{344, 345},
+	{346, 347},
+	{348, 349},
+	{350, 351},
+	{352, 353},
+	{354, 355},
+	{356, 357},
+	{358, 359},
+	{360, 361},
+	{362, 363},
+	{364, 365},
+	{366, 367},
+	{368, 369},
+	{370, 371},
+	{372, 373},
+	{374, 375},
+	{376, 255},
+	{377, 378},
+	{379, 380},
+	{381, 382},
+	{385, 595},
+	{386, 387},
+	{388, 389},
+	{390, 596},
+	{391, 392},
+	{393, 598},
+	{394, 599},
+	{395, 396},
+	{398, 477},
+	{399, 601},
+	{400, 603},
+	{401, 402},
+	{403, 608},
+	{404, 611},
+	{406, 617},
+	{407, 616},
+	{408, 409},
+	{412, 623},
+	{413, 626},
+	{415, 629},
+	{416, 417},
+	{418, 419},
+	{420, 421},
+	{422, 640},
+	{423, 424},
+	{425, 643},
+	{428, 429},
+	{430, 648},
+	{431, 432},
+	{433, 650},
+	{434, 651},
+	{435, 436},
+	{437, 438},
+	{439, 658},
+	{440, 441},
+	{444, 445},
+	{452, 454},
+	{453, 454},
+	{455, 457},
+	{456, 457},
+	{458, 460},
+	{459, 460},
+	{461, 462},
+	{463, 464},
+	{465, 466},
+	{467, 468},
+	{469, 470},
+	{471, 472},
+	{473, 474},
+	{475, 476},
+	{478, 479},
+	{480, 481},
+	{482, 483},
+	{484, 485},
+	{486, 487},
+	{488, 489},
+	{490, 491},
+	{492, 493},
+	{494, 495},
+	{497, 499},
+	{498, 499},
+	{500, 501},
+	{502, 405},
+	{503, 447},
+	{504, 505},
+	{506, 507},
+	{508, 509},
+	{510, 511},
+	{512, 513},
+	{514, 515},
+	{516, 517},
+	{518, 519},
+	{520, 521},
+	{522, 523},
+	{524, 525},
+	{526, 527},
+	{528, 529},
+	{530, 531},
+	{532, 533},
+	{534, 535},
+	{536, 537},
+	{538, 539},
+	{540, 541},
+	{542, 543},
+	{544, 414},
+	{546, 547},
+	{548, 549},
+	{550, 551},
+	{552, 553},
+	{554, 555},
+	{556, 557},
+	{558, 559},
+	{560, 561},
+	{562, 563},
+	{570, 11365},
+	{571, 572},
+	{573, 410},
+	{574, 11366},
+	{577, 578},
+	{579, 384},
+	{580, 649},
+	{581, 652},
+	{582, 583},
+	{584, 585},
+	{586, 587},
+	{588, 589},
+	{590, 591},
+	{880, 881},
+	{882, 883},
+	{886, 887},
+	{895, 1011},
+	{902, 940},
+	{904, 941},
+	{905, 942},
+	{906, 943},
+	{908, 972},
+	{910, 973},
+	{911, 974},
+	{913, 945},
+	{914, 946},
+	{915, 947},
+	{916, 948},
+	{917, 949},
+	{918, 950},
+	{919, 951},
+	{920, 952},
+	{921, 953},
+	{922, 954},
+	{923, 955},
+	{924, 956},
+	{925, 957},
+	{926, 958},
+	{927, 959},
+	{928, 960},
+	{929, 961},
+	{931, 963},
+	{932, 964},
+	{933, 965},
+	{934, 966},
+	{935, 967},
+	{936, 968},
+	{937, 969},
+	{938, 970},
+	{939, 971},
+	{975, 983},
+	{984, 985},
+	{986, 987},
+	{988, 989},
+	{990, 991},
+	{992, 993},
+	{994, 995},
+	{996, 997},
+	{998, 999},
+	{1000, 1001},
+	{1002, 1003},
+	{1004, 1005},
+	{1006, 1007},
+	{1012, 952},
+	{1015, 1016},
+	{1017, 1010},
+	{1018, 1019},
+	{1021, 891},
+	{1022, 892},
+	{1023, 893},
+	{1024, 1104},
+	{1025, 1105},
+	{1026, 1106},
+	{1027, 1107},
+	{1028, 1108},
+	{1029, 1109},
+	{1030, 1110},
+	{1031, 1111},
+	{1032, 1112},
+	{1033, 1113},
+	{1034, 1114},
+	{1035, 1115},
+	{1036, 1116},
+	{1037, 1117},
+	{1038, 1118},
+	{1039, 1119},
+	{1040, 1072},
+	{1041, 1073},
+	{1042, 1074},
+	{1043, 1075},
+	{1044, 1076},
+	{1045, 1077},
+	{1046, 1078},
+	{1047, 1079},
+	{1048, 1080},
+	{1049, 1081},
+	{1050, 1082},
+	{1051, 1083},
+	{1052, 1084},
+	{1053, 1085},
+	{1054, 1086},
+	{1055, 1087},
+	{1056, 1088},
+	{1057, 1089},
+	{1058, 1090},
+	{1059, 1091},
+	{1060, 1092},
+	{1061, 1093},
+	{1062, 1094},
+	{1063, 1095},
+	{1064, 1096},
+	{1065, 1097},
+	{1066, 1098},
+	{1067, 1099},
+	{1068, 1100},
+	{1069, 1101},
+	{1070, 1102},
+	{1071, 1103},
+	{1120, 1121},
+	{1122, 1123},
+	{1124, 1125},
+	{1126, 1127},
+	{1128, 1129},
+	{1130, 1131},
+	{1132, 1133},
+	{1134, 1135},
+	{1136, 1137},
+	{1138, 1139},
+	{1140, 1141},
+	{1142, 1143},
+	{1144, 1145},
+	{1146, 1147},
+	{1148, 1149},
+	{1150, 1151},
+	{1152, 1153},
+	{1162, 1163},
+	{1164, 1165},
+	{1166, 1167},
+	{1168, 1169},
+	{1170, 1171},
+	{1172, 1173},
+	{1174, 1175},
+	{1176, 1177},
+	{1178, 1179},
+	{1180, 1181},
+	{1182, 1183},
+	{1184, 1185},
+	{1186, 1187},
+	{1188, 1189},
+	{1190, 1191},
+	{1192, 1193},
+	{1194, 1195},
+	{1196, 1197},
+	{1198, 1199},
+	{1200, 1201},
+	{1202, 1203},
+	{1204, 1205},
+	{1206, 1207},
+	{1208, 1209},
+	{1210, 1211},
+	{1212, 1213},
+	{1214, 1215},
+	{1216, 1231},
+	{1217, 1218},
+	{1219, 1220},
+	{1221, 1222},
+	{1223, 1224},
+	{1225, 1226},
+	{1227, 1228},
+	{1229, 1230},
+	{1232, 1233},
+	{1234, 1235},
+	{1236, 1237},
+	{1238, 1239},
+	{1240, 1241},
+	{1242, 1243},
+	{1244, 1245},
+	{1246, 1247},
+	{1248, 1249},
+	{1250, 1251},
+	{1252, 1253},
+	{1254, 1255},
+	{1256, 1257},
+	{1258, 1259},
+	{1260, 1261},
+	{1262, 1263},
+	{1264, 1265},
+	{1266, 1267},
+	{1268, 1269},
+	{1270, 1271},
+	{1272, 1273},
+	{1274, 1275},
+	{1276, 1277},
+	{1278, 1279},
+	{1280, 1281},
+	{1282, 1283},
+	{1284, 1285},
+	{1286, 1287},
+	{1288, 1289},
+	{1290, 1291},
+	{1292, 1293},
+	{1294, 1295},
+	{1296, 1297},
+	{1298, 1299},
+	{1300, 1301},
+	{1302, 1303},
+	{1304, 1305},
+	{1306, 1307},
+	{1308, 1309},
+	{1310, 1311},
+	{1312, 1313},
+	{1314, 1315},
+	{1316, 1317},
+	{1318, 1319},
+	{1320, 1321},
+	{1322, 1323},
+	{1324, 1325},
+	{1326, 1327},
+	{1329, 1377},
+	{1330, 1378},
+	{1331, 1379},
+	{1332, 1380},
+	{1333, 1381},
+	{1334, 1382},
+	{1335, 1383},
+	{1336, 1384},
+	{1337, 1385},
+	{1338, 1386},
+	{1339, 1387},
+	{1340, 1388},
+	{1341, 1389},
+	{1342, 1390},
+	{1343, 1391},
+	{1344, 1392},
+	{1345, 1393},
+	{1346, 1394},
+	{1347, 1395},
+	{1348, 1396},
+	{1349, 1397},
+	{1350, 1398},
+	{1351, 1399},
+	{1352, 1400},
+	{1353, 1401},
+	{1354, 1402},
+	{1355, 1403},
+	{1356, 1404},
+	{1357, 1405},
+	{1358, 1406},
+	{1359, 1407},
+	{1360, 1408},
+	{1361, 1409},
+	{1362, 1410},
+	{1363, 1411},
+	{1364, 1412},
+	{1365, 1413},
+	{1366, 1414},
+	{4256, 11520},
+	{4257, 11521},
+	{4258, 11522},
+	{4259, 11523},
+	{4260, 11524},
+	{4261, 11525},
+	{4262, 11526},
+	{4263, 11527},
+	{4264, 11528},
+	{4265, 11529},
+	{4266, 11530},
+	{4267, 11531},
+	{4268, 11532},
+	{4269, 11533},
+	{4270, 11534},
+	{4271, 11535},
+	{4272, 11536},
+	{4273, 11537},
+	{4274, 11538},
+	{4275, 11539},
+	{4276, 11540},
+	{4277, 11541},
+	{4278, 11542},
+	{4279, 11543},
+	{4280, 11544},
+	{4281, 11545},
+	{4282, 11546},
+	{4283, 11547},
+	{4284, 11548},
+	{4285, 11549},
+	{4286, 11550},
+	{4287, 11551},
+	{4288, 11552},
+	{4289, 11553},
+	{4290, 11554},
+	{4291, 11555},
+	{4292, 11556},
+	{4293, 11557},
+	{4295, 11559},
+	{4301, 11565},
+	{5024, 43888},
+	{5025, 43889},
+	{5026, 43890},
+	{5027, 43891},
+	{5028, 43892},
+	{5029, 43893},
+	{5030, 43894},
+	{5031, 43895},
+	{5032, 43896},
+	{5033, 43897},
+	{5034, 43898},
+	{5035, 43899},
+	{5036, 43900},
+	{5037, 43901},
+	{5038, 43902},
+	{5039, 43903},
+	{5040, 43904},
+	{5041, 43905},
+	{5042, 43906},
+	{5043, 43907},
+	{5044, 43908},
+	{5045, 43909},
+	{5046, 43910},
+	{5047, 43911},
+	{5048, 43912},
+	{5049, 43913},
+	{5050, 43914},
+	{5051, 43915},
+	{5052, 43916},
+	{5053, 43917},
+	{5054, 43918},
+	{5055, 43919},
+	{5056, 43920},
+	{5057, 43921},
+	{5058, 43922},
+	{5059, 43923},
+	{5060, 43924},
+	{5061, 43925},
+	{5062, 43926},
+	{5063, 43927},
+	{5064, 43928},
+	{5065, 43929},
+	{5066, 43930},
+	{5067, 43931},
+	{5068, 43932},
+	{5069, 43933},
+	{5070, 43934},
+	{5071, 43935},
+	{5072, 43936},
+	{5073, 43937},
+	{5074, 43938},
+	{5075, 43939},
+	{5076, 43940},
+	{5077, 43941},
+	{5078, 43942},
+	{5079, 43943},
+	{5080, 43944},
+	{5081, 43945},
+	{5082, 43946},
+	{5083, 43947},
+	{5084, 43948},
+	{5085, 43949},
+	{5086, 43950},
+	{5087, 43951},
+	{5088, 43952},
+	{5089, 43953},
+	{5090, 43954},
+	{5091, 43955},
+	{5092, 43956},
+	{5093, 43957},
+	{5094, 43958},
+	{5095, 43959},
+	{5096, 43960},
+	{5097, 43961},
+	{5098, 43962},
+	{5099, 43963},
+	{5100, 43964},
+	{5101, 43965},
+	{5102, 43966},
+	{5103, 43967},
+	{5104, 5112},
+	{5105, 5113},
+	{5106, 5114},
+	{5107, 5115},
+	{5108, 5116},
+	{5109, 5117},
+	{7312, 4304},
+	{7313, 4305},
+	{7314, 4306},
+	{7315, 4307},
+	{7316, 4308},
+	{7317, 4309},
+	{7318, 4310},
+	{7319, 4311},
+	{7320, 4312},
+	{7321, 4313},
+	{7322, 4314},
+	{7323, 4315},
+	{7324, 4316},
+	{7325, 4317},
+	{7326, 4318},
+	{7327, 4319},
+	{7328, 4320},
+	{7329, 4321},
+	{7330, 4322},
+	{7331, 4323},
+	{7332, 4324},
+	{7333, 4325},
+	{7334, 4326},
+	{7335, 4327},
+	{7336, 4328},
+	{7337, 4329},
+	{7338, 4330},
+	{7339, 4331},
+	{7340, 4332},
+	{7341, 4333},
+	{7342, 4334},
+	{7343, 4335},
+	{7344, 4336},
+	{7345, 4337},
+	{7346, 4338},
+	{7347, 4339},
+	{7348, 4340},
+	{7349, 4341},
+	{7350, 4342},
+	{7351, 4343},
+	{7352, 4344},
+	{7353, 4345},
+	{7354, 4346},
+	{7357, 4349},
+	{7358, 4350},
+	{7359, 4351},
+	{7680, 7681},
+	{7682, 7683},
+	{7684, 7685},
+	{7686, 7687},
+	{7688, 7689},
+	{7690, 7691},
+	{7692, 7693},
+	{7694, 7695},
+	{7696, 7697},
+	{7698, 7699},
+	{7700, 7701},
+	{7702, 7703},
+	{7704, 7705},
+	{7706, 7707},
+	{7708, 7709},
+	{7710, 7711},
+	{7712, 7713},
+	{7714, 7715},
+	{7716, 7717},
+	{7718, 7719},
+	{7720, 7721},
+	{7722, 7723},
+	{7724, 7725},
+	{7726, 7727},
+	{7728, 7729},
+	{7730, 7731},
+	{7732, 7733},
+	{7734, 7735},
+	{7736, 7737},
+	{7738, 7739},
+	{7740, 7741},
+	{7742, 7743},
+	{7744, 7745},
+	{7746, 7747},
+	{7748, 7749},
+	{7750, 7751},
+	{7752, 7753},
+	{7754, 7755},
+	{7756, 7757},
+	{7758, 7759},
+	{7760, 7761},
+	{7762, 7763},
+	{7764, 7765},
+	{7766, 7767},
+	{7768, 7769},
+	{7770, 7771},
+	{7772, 7773},
+	{7774, 7775},
+	{7776, 7777},
+	{7778, 7779},
+	{7780, 7781},
+	{7782, 7783},
+	{7784, 7785},
+	{7786, 7787},
+	{7788, 7789},
+	{7790, 7791},
+	{7792, 7793},
+	{7794, 7795},
+	{7796, 7797},
+	{7798, 7799},
+	{7800, 7801},
+	{7802, 7803},
+	{7804, 7805},
+	{7806, 7807},
+	{7808, 7809},
+	{7810, 7811},
+	{7812, 7813},
+	{7814, 7815},
+	{7816, 7817},
+	{7818, 7819},
+	{7820, 7821},
+	{7822, 7823},
+	{7824, 7825},
+	{7826, 7827},
+	{7828, 7829},
+	{7838, 223},
+	{7840, 7841},
+	{7842, 7843},
+	{7844, 7845},
+	{7846, 7847},
+	{7848, 7849},
+	{7850, 7851},
+	{7852, 7853},
+	{7854, 7855},
+	{7856, 7857},
+	{7858, 7859},
+	{7860, 7861},
+	{7862, 7863},
+	{7864, 7865},
+	{7866, 7867},
+	{7868, 7869},
+	{7870, 7871},
+	{7872, 7873},
+	{7874, 7875},
+	{7876, 7877},
+	{7878, 7879},
+	{7880, 7881},
+	{7882, 7883},
+	{7884, 7885},
+	{7886, 7887},
+	{7888, 7889},
+	{7890, 7891},
+	{7892, 7893},
+	{7894, 7895},
+	{7896, 7897},
+	{7898, 7899},
+	{7900, 7901},
+	{7902, 7903},
+	{7904, 7905},
+	{7906, 7907},
+	{7908, 7909},
+	{7910, 7911},
+	{7912, 7913},
+	{7914, 7915},
+	{7916, 7917},
+	{7918, 7919},
+	{7920, 7921},
+	{7922, 7923},
+	{7924, 7925},
+	{7926, 7927},
+	{7928, 7929},
+	{7930, 7931},
+	{7932, 7933},
+	{7934, 7935},
+	{7944, 7936},
+	{7945, 7937},
+	{7946, 7938},
+	{7947, 7939},
+	{7948, 7940},
+	{7949, 7941},
+	{7950, 7942},
+	{7951, 7943},
+	{7960, 7952},
+	{7961, 7953},
+	{7962, 7954},
+	{7963, 7955},
+	{7964, 7956},
+	{7965, 7957},
+	{7976, 7968},
+	{7977, 7969},
+	{7978, 7970},
+	{7979, 7971},
+	{7980, 7972},
+	{7981, 7973},
+	{7982, 7974},
+	{7983, 7975},
+	{7992, 7984},
+	{7993, 7985},
+	{7994, 7986},
+	{7995, 7987},
+	{7996, 7988},
+	{7997, 7989},
+	{7998, 7990},
+	{7999, 7991},
+	{8008, 8000},
+	{8009, 8001},
+	{8010, 8002},
+	{8011, 8003},
+	{8012, 8004},
+	{8013, 8005},
+	{8025, 8017},
+	{8027, 8019},
+	{8029, 8021},
+	{8031, 8023},
+	{8040, 8032},
+	{8041, 8033},
+	{8042, 8034},
+	{8043, 8035},
+	{8044, 8036},
+	{8045, 8037},
+	{8046, 8038},
+	{8047, 8039},
+	{8072, 8064},
+	{8073, 8065},
+	{8074, 8066},
+	{8075, 8067},
+	{8076, 8068},
+	{8077, 8069},
+	{8078, 8070},
+	{8079, 8071},
+	{8088, 8080},
+	{8089, 8081},
+	{8090, 8082},
+	{8091, 8083},
+	{8092, 8084},
+	{8093, 8085},
+	{8094, 8086},
+	{8095, 8087},
+	{8104, 8096},
+	{8105, 8097},
+	{8106, 8098},
+	{8107, 8099},
+	{8108, 8100},
+	{8109, 8101},
+	{8110, 8102},
+	{8111, 8103},
+	{8120, 8112},
+	{8121, 8113},
+	{8122, 8048},
+	{8123, 8049},
+	{8124, 8115},
+	{8136, 8050},
+	{8137, 8051},
+	{8138, 8052},
+	{8139, 8053},
+	{8140, 8131},
+	{8152, 8144},
+	{8153, 8145},
+	{8154, 8054},
+	{8155, 8055},
+	{8168, 8160},
+	{8169, 8161},
+	{8170, 8058},
+	{8171, 8059},
+	{8172, 8165},
+	{8184, 8056},
+	{8185, 8057},
+	{8186, 8060},
+	{8187, 8061},
+	{8188, 8179},
+	{8486, 969},
+	{8490, 107},
+	{8491, 229},
+	{8498, 8526},
+	{8544, 8560},
+	{8545, 8561},
+	{8546, 8562},
+	{8547, 8563},
+	{8548, 8564},
+	{8549, 8565},
+	{8550, 8566},
+	{8551, 8567},
+	{8552, 8568},
+	{8553, 8569},
+	{8554, 8570},
+	{8555, 8571},
+	{8556, 8572},
+	{8557, 8573},
+	{8558, 8574},
+	{8559, 8575},
+	{8579, 8580},
+	{9398, 9424},
+	{9399, 9425},
+	{9400, 9426},
+	{9401, 9427},
+	{9402, 9428},
+	{9403, 9429},
+	{9404, 9430},
+	{9405, 9431},
+	{9406, 9432},
+	{9407, 9433},
+	{9408, 9434},
+	{9409, 9435},
+	{9410, 9436},
+	{9411, 9437},
+	{9412, 9438},
+	{9413, 9439},
+	{9414, 9440},
+	{9415, 9441},
+	{9416, 9442},
+	{9417, 9443},
+	{9418, 9444},
+	{9419, 9445},
+	{9420, 9446},
+	{9421, 9447},
+	{9422, 9448},
+	{9423, 9449},
+	{11264, 11312},
+	{11265, 11313},
+	{11266, 11314},
+	{11267, 11315},
+	{11268, 11316},
+	{11269, 11317},
+	{11270, 11318},
+	{11271, 11319},
+	{11272, 11320},
+	{11273, 11321},
+	{11274, 11322},
+	{11275, 11323},
+	{11276, 11324},
+	{11277, 11325},
+	{11278, 11326},
+	{11279, 11327},
+	{11280, 11328},
+	{11281, 11329},
+	{11282, 11330},
+	{11283, 11331},
+	{11284, 11332},
+	{11285, 11333},
+	{11286, 11334},
+	{11287, 11335},
+	{11288, 11336},
+	{11289, 11337},
+	{11290, 11338},
+	{11291, 11339},
+	{11292, 11340},
+	{11293, 11341},
+	{11294, 11342},
+	{11295, 11343},
+	{11296, 11344},
+	{11297, 11345},
+	{11298, 11346},
+	{11299, 11347},
+	{11300, 11348},
+	{11301, 11349},
+	{11302, 11350},
+	{11303, 11351},
+	{11304, 11352},
+	{11305, 11353},
+	{11306, 11354},
+	{11307, 11355},
+	{11308, 11356},
+	{11309, 11357},
+	{11310, 11358},
+	{11311, 11359},
+	{11360, 11361},
+	{11362, 619},
+	{11363, 7549},
+	{11364, 637},
+	{11367, 11368},
+	{11369, 11370},
+	{11371, 11372},
+	{11373, 593},
+	{11374, 625},
+	{11375, 592},
+	{11376, 594},
+	{11378, 11379},
+	{11381, 11382},
+	{11390, 575},
+	{11391, 576},
+	{11392, 11393},
+	{11394, 11395},
+	{11396, 11397},
+	{11398, 11399},
+	{11400, 11401},
+	{11402, 11403},
+	{11404, 11405},
+	{11406, 11407},
+	{11408, 11409},
+	{11410, 11411},
+	{11412, 11413},
+	{11414, 11415},
+	{11416, 11417},
+	{11418, 11419},
+	{11420, 11421},
+	{11422, 11423},
+	{11424, 11425},
+	{11426, 11427},
+	{11428, 11429},
+	{11430, 11431},
+	{11432, 11433},
+	{11434, 11435},
+	{11436, 11437},
+	{11438, 11439},
+	{11440, 11441},
+	{11442, 11443},
+	{11444, 11445},
+	{11446, 11447},
+	{11448, 11449},
+	{11450, 11451},
+	{11452, 11453},
+	{11454, 11455},
+	{11456, 11457},
+	{11458, 11459},
+	{11460, 11461},
+	{11462, 11463},
+	{11464, 11465},
+	{11466, 11467},
+	{11468, 11469},
+	{11470, 11471},
+	{11472, 11473},
+	{11474, 11475},
+	{11476, 11477},
+	{11478, 11479},
+	{11480, 11481},
+	{11482, 11483},
+	{11484, 11485},
+	{11486, 11487},
+	{11488, 11489},
+	{11490, 11491},
+	{11499, 11500},
+	{11501, 11502},
+	{11506, 11507},
+	{42560, 42561},
+	{42562, 42563},
+	{42564, 42565},
+	{42566, 42567},
+	{42568, 42569},
+	{42570, 42571},
+	{42572, 42573},
+	{42574, 42575},
+	{42576, 42577},
+	{42578, 42579},
+	{42580, 42581},
+	{42582, 42583},
+	{42584, 42585},
+	{42586, 42587},
+	{42588, 42589},
+	{42590, 42591},
+	{42592, 42593},
+	{42594, 42595},
+	{42596, 42597},
+	{42598, 42599},
+	{42600, 42601},
+	{42602, 42603},
+	{42604, 42605},
+	{42624, 42625},
+	{42626, 42627},
+	{42628, 42629},
+	{42630, 42631},
+	{42632, 42633},
+	{42634, 42635},
+	{42636, 42637},
+	{42638, 42639},
+	{42640, 42641},
+	{42642, 42643},
+	{42644, 42645},
+	{42646, 42647},
+	{42648, 42649},
+	{42650, 42651},
+	{42786, 42787},
+	{42788, 42789},
+	{42790, 42791},
+	{42792, 42793},
+	{42794, 42795},
+	{42796, 42797},
+	{42798, 42799},
+	{42802, 42803},
+	{42804, 42805},
+	{42806, 42807},
+	{42808, 42809},
+	{42810, 42811},
+	{42812, 42813},
+	{42814, 42815},
+	{42816, 42817},
+	{42818, 42819},
+	{42820, 42821},
+	{42822, 42823},
+	{42824, 42825},
+	{42826, 42827},
+	{42828, 42829},
+	{42830, 42831},
+	{42832, 42833},
+	{42834, 42835},
+	{42836, 42837},
+	{42838, 42839},
+	{42840, 42841},
+	{42842, 42843},
+	{42844, 42845},
+	{42846, 42847},
+	{42848, 42849},
+	{42850, 42851},
+	{42852, 42853},
+	{42854, 42855},
+	{42856, 42857},
+	{42858, 42859},
+	{42860, 42861},
+	{42862, 42863},
+	{42873, 42874},
+	{42875, 42876},
+	{42877, 7545},
+	{42878, 42879},
+	{42880, 42881},
+	{42882, 42883},
+	{42884, 42885},
+	{42886, 42887},
+	{42891, 42892},
+	{42893, 613},
+	{42896, 42897},
+	{42898, 42899},
+	{42902, 42903},
+	{42904, 42905},
+	{42906, 42907},
+	{42908, 42909},
+	{42910, 42911},
+	{42912, 42913},
+	{42914, 42915},
+	{42916, 42917},
+	{42918, 42919},
+	{42920, 42921},
+	{42922, 614},
+	{42923, 604},
+	{42924, 609},
+	{42925, 620},
+	{42926, 618},
+	{42928, 670},
+	{42929, 647},
+	{42930, 669},
+	{42931, 43859},
+	{42932, 42933},
+	{42934, 42935},
+	{42936, 42937},
+	{42938, 42939},
+	{42940, 42941},
+	{42942, 42943},
+	{42944, 42945},
+	{42946, 42947},
+	{42948, 42900},
+	{42949, 642},
+	{42950, 7566},
+	{42951, 42952},
+	{42953, 42954},
+	{42960, 42961},
+	{42966, 42967},
+	{42968, 42969},
+	{42997, 42998},
+	{65313, 65345},
+	{65314, 65346},
+	{65315, 65347},
+	{65316, 65348},
+	{65317, 65349},
+	{65318, 65350},
+	{65319, 65351},
+	{65320, 65352},
+	{65321, 65353},
+	{65322, 65354},
+	{65323, 65355},
+	{65324, 65356},
+	{65325, 65357},
+	{65326, 65358},
+	{65327, 65359},
+	{65328, 65360},
+	{65329, 65361},
+	{65330, 65362},
+	{65331, 65363},
+	{65332, 65364},
+	{65333, 65365},
+	{65334, 65366},
+	{65335, 65367},
+	{65336, 65368},
+	{65337, 65369},
+	{65338, 65370},
+	{66560, 66600},
+	{66561, 66601},
+	{66562, 66602},
+	{66563, 66603},
+	{66564, 66604},
+	{66565, 66605},
+	{66566, 66606},
+	{66567, 66607},
+	{66568, 66608},
+	{66569, 66609},
+	{66570, 66610},
+	{66571, 66611},
+	{66572, 66612},
+	{66573, 66613},
+	{66574, 66614},
+	{66575, 66615},
+	{66576, 66616},
+	{66577, 66617},
+	{66578, 66618},
+	{66579, 66619},
+	{66580, 66620},
+	{66581, 66621},
+	{66582, 66622},
+	{66583, 66623},
+	{66584, 66624},
+	{66585, 66625},
+	{66586, 66626},
+	{66587, 66627},
+	{66588, 66628},
+	{66589, 66629},
+	{66590, 66630},
+	{66591, 66631},
+	{66592, 66632},
+	{66593, 66633},
+	{66594, 66634},
+	{66595, 66635},
+	{66596, 66636},
+	{66597, 66637},
+	{66598, 66638},
+	{66599, 66639},
+	{66736, 66776},
+	{66737, 66777},
+	{66738, 66778},
+	{66739, 66779},
+	{66740, 66780},
+	{66741, 66781},
+	{66742, 66782},
+	{66743, 66783},
+	{66744, 66784},
+	{66745, 66785},
+	{66746, 66786},
+	{66747, 66787},
+	{66748, 66788},
+	{66749, 66789},
+	{66750, 66790},
+	{66751, 66791},
+	{66752, 66792},
+	{66753, 66793},
+	{66754, 66794},
+	{66755, 66795},
+	{66756, 66796},
+	{66757, 66797},
+	{66758, 66798},
+	{66759, 66799},
+	{66760, 66800},
+	{66761, 66801},
+	{66762, 66802},
+	{66763, 66803},
+	{66764, 66804},
+	{66765, 66805},
+	{66766, 66806},
+	{66767, 66807},
+	{66768, 66808},
+	{66769, 66809},
+	{66770, 66810},
+	{66771, 66811},
+	{66928, 66967},
+	{66929, 66968},
+	{66930, 66969},
+	{66931, 66970},
+	{66932, 66971},
+	{66933, 66972},
+	{66934, 66973},
+	{66935, 66974},
+	{66936, 66975},
+	{66937, 66976},
+	{66938, 66977},
+	{66940, 66979},
+	{66941, 66980},
+	{66942, 66981},
+	{66943, 66982},
+	{66944, 66983},
+	{66945, 66984},
+	{66946, 66985},
+	{66947, 66986},
+	{66948, 66987},
+	{66949, 66988},
+	{66950, 66989},
+	{66951, 66990},
+	{66952, 66991},
+	{66953, 66992},
+	{66954, 66993},
+	{66956, 66995},
+	{66957, 66996},
+	{66958, 66997},
+	{66959, 66998},
+	{66960, 66999},
+	{66961, 67000},
+	{66962, 67001},
+	{66964, 67003},
+	{66965, 67004},
+	{68736, 68800},
+	{68737, 68801},
+	{68738, 68802},
+	{68739, 68803},
+	{68740, 68804},
+	{68741, 68805},
+	{68742, 68806},
+	{68743, 68807},
+	{68744, 68808},
+	{68745, 68809},
+	{68746, 68810},
+	{68747, 68811},
+	{68748, 68812},
+	{68749, 68813},
+	{68750, 68814},
+	{68751, 68815},
+	{68752, 68816},
+	{68753, 68817},
+	{68754, 68818},
+	{68755, 68819},
+	{68756, 68820},
+	{68757, 68821},
+	{68758, 68822},
+	{68759, 68823},
+	{68760, 68824},
+	{68761, 68825},
+	{68762, 68826},
+	{68763, 68827},
+	{68764, 68828},
+	{68765, 68829},
+	{68766, 68830},
+	{68767, 68831},
+	{68768, 68832},
+	{68769, 68833},
+	{68770, 68834},
+	{68771, 68835},
+	{68772, 68836},
+	{68773, 68837},
+	{68774, 68838},
+	{68775, 68839},
+	{68776, 68840},
+	{68777, 68841},
+	{68778, 68842},
+	{68779, 68843},
+	{68780, 68844},
+	{68781, 68845},
+	{68782, 68846},
+	{68783, 68847},
+	{68784, 68848},
+	{68785, 68849},
+	{68786, 68850},
+	{71840, 71872},
+	{71841, 71873},
+	{71842, 71874},
+	{71843, 71875},
+	{71844, 71876},
+	{71845, 71877},
+	{71846, 71878},
+	{71847, 71879},
+	{71848, 71880},
+	{71849, 71881},
+	{71850, 71882},
+	{71851, 71883},
+	{71852, 71884},
+	{71853, 71885},
+	{71854, 71886},
+	{71855, 71887},
+	{71856, 71888},
+	{71857, 71889},
+	{71858, 71890},
+	{71859, 71891},
+	{71860, 71892},
+	{71861, 71893},
+	{71862, 71894},
+	{71863, 71895},
+	{71864, 71896},
+	{71865, 71897},
+	{71866, 71898},
+	{71867, 71899},
+	{71868, 71900},
+	{71869, 71901},
+	{71870, 71902},
+	{71871, 71903},
+	{93760, 93792},
+	{93761, 93793},
+	{93762, 93794},
+	{93763, 93795},
+	{93764, 93796},
+	{93765, 93797},
+	{93766, 93798},
+	{93767, 93799},
+	{93768, 93800},
+	{93769, 93801},
+	{93770, 93802},
+	{93771, 93803},
+	{93772, 93804},
+	{93773, 93805},
+	{93774, 93806},
+	{93775, 93807},
+	{93776, 93808},
+	{93777, 93809},
+	{93778, 93810},
+	{93779, 93811},
+	{93780, 93812},
+	{93781, 93813},
+	{93782, 93814},
+	{93783, 93815},
+	{93784, 93816},
+	{93785, 93817},
+	{93786, 93818},
+	{93787, 93819},
+	{93788, 93820},
+	{93789, 93821},
+	{93790, 93822},
+	{93791, 93823},
+	{125184, 125218},
+	{125185, 125219},
+	{125186, 125220},
+	{125187, 125221},
+	{125188, 125222},
+	{125189, 125223},
+	{125190, 125224},
+	{125191, 125225},
+	{125192, 125226},
+	{125193, 125227},
+	{125194, 125228},
+	{125195, 125229},
+	{125196, 125230},
+	{125197, 125231},
+	{125198, 125232},
+	{125199, 125233},
+	{125200, 125234},
+	{125201, 125235},
+	{125202, 125236},
+	{125203, 125237},
+	{125204, 125238},
+	{125205, 125239},
+	{125206, 125240},
+	{125207, 125241},
+	{125208, 125242},
+	{125209, 125243},
+	{125210, 125244},
+	{125211, 125245},
+	{125212, 125246},
+	{125213, 125247},
+	{125214, 125248},
+	{125215, 125249},
+	{125216, 125250},
+	{125217, 125251},
+};
diff --git a/src_bkp/base/vmath.h b/src_bkp/base/vmath.h
new file mode 100644
index 0000000000..b83a1ae025
--- /dev/null
+++ b/src_bkp/base/vmath.h
@@ -0,0 +1,393 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef BASE_VMATH_H
+#define BASE_VMATH_H
+
+#include <cmath>
+#include <cstdint>
+
+#include "math.h"
+
+// ------------------------------------
+
+template<typename T>
+class vector2_base
+{
+public:
+	union
+	{
+		T x, u;
+	};
+	union
+	{
+		T y, v;
+	};
+
+	constexpr vector2_base() = default;
+	constexpr vector2_base(T nx, T ny) :
+		x(nx), y(ny)
+	{
+	}
+
+	vector2_base operator-() const { return vector2_base(-x, -y); }
+	vector2_base operator-(const vector2_base &vec) const { return vector2_base(x - vec.x, y - vec.y); }
+	vector2_base operator+(const vector2_base &vec) const { return vector2_base(x + vec.x, y + vec.y); }
+	vector2_base operator*(const T rhs) const { return vector2_base(x * rhs, y * rhs); }
+	vector2_base operator*(const vector2_base &vec) const { return vector2_base(x * vec.x, y * vec.y); }
+	vector2_base operator/(const T rhs) const { return vector2_base(x / rhs, y / rhs); }
+	vector2_base operator/(const vector2_base &vec) const { return vector2_base(x / vec.x, y / vec.y); }
+
+	const vector2_base &operator+=(const vector2_base &vec)
+	{
+		x += vec.x;
+		y += vec.y;
+		return *this;
+	}
+	const vector2_base &operator-=(const vector2_base &vec)
+	{
+		x -= vec.x;
+		y -= vec.y;
+		return *this;
+	}
+	const vector2_base &operator*=(const T rhs)
+	{
+		x *= rhs;
+		y *= rhs;
+		return *this;
+	}
+	const vector2_base &operator*=(const vector2_base &vec)
+	{
+		x *= vec.x;
+		y *= vec.y;
+		return *this;
+	}
+	const vector2_base &operator/=(const T rhs)
+	{
+		x /= rhs;
+		y /= rhs;
+		return *this;
+	}
+	const vector2_base &operator/=(const vector2_base &vec)
+	{
+		x /= vec.x;
+		y /= vec.y;
+		return *this;
+	}
+
+	bool operator==(const vector2_base &vec) const { return x == vec.x && y == vec.y; } //TODO: do this with an eps instead
+	bool operator!=(const vector2_base &vec) const { return x != vec.x || y != vec.y; }
+
+	T &operator[](const int index) { return index ? y : x; }
+};
+
+template<typename T>
+constexpr inline vector2_base<T> rotate(const vector2_base<T> &a, float angle)
+{
+	angle = angle * pi / 180.0f;
+	float s = std::sin(angle);
+	float c = std::cos(angle);
+	return vector2_base<T>((T)(c * a.x - s * a.y), (T)(s * a.x + c * a.y));
+}
+
+template<typename T>
+inline T distance(const vector2_base<T> a, const vector2_base<T> &b)
+{
+	return length(a - b);
+}
+
+template<typename T>
+constexpr inline T dot(const vector2_base<T> a, const vector2_base<T> &b)
+{
+	return a.x * b.x + a.y * b.y;
+}
+
+inline float length(const vector2_base<float> &a)
+{
+	return std::sqrt(dot(a, a));
+}
+
+inline float length(const vector2_base<int> &a)
+{
+	return std::sqrt(dot(a, a));
+}
+
+inline float length_squared(const vector2_base<float> &a)
+{
+	return dot(a, a);
+}
+
+constexpr inline float angle(const vector2_base<float> &a)
+{
+	if(a.x == 0 && a.y == 0)
+		return 0.0f;
+	else if(a.x == 0)
+		return a.y < 0 ? -pi / 2 : pi / 2;
+	float result = std::atan(a.y / a.x);
+	if(a.x < 0)
+		result = result + pi;
+	return result;
+}
+
+template<typename T>
+constexpr inline vector2_base<T> normalize_pre_length(const vector2_base<T> &v, T len)
+{
+	if(len == 0)
+		return vector2_base<T>();
+	return vector2_base<T>(v.x / len, v.y / len);
+}
+
+inline vector2_base<float> normalize(const vector2_base<float> &v)
+{
+	float divisor = length(v);
+	if(divisor == 0.0f)
+		return vector2_base<float>(0.0f, 0.0f);
+	float l = (float)(1.0f / divisor);
+	return vector2_base<float>(v.x * l, v.y * l);
+}
+
+inline vector2_base<float> direction(float angle)
+{
+	return vector2_base<float>(std::cos(angle), std::sin(angle));
+}
+
+inline vector2_base<float> random_direction()
+{
+	return direction(random_angle());
+}
+
+typedef vector2_base<float> vec2;
+typedef vector2_base<bool> bvec2;
+typedef vector2_base<int> ivec2;
+
+template<typename T>
+constexpr inline bool closest_point_on_line(vector2_base<T> line_pointA, vector2_base<T> line_pointB, vector2_base<T> target_point, vector2_base<T> &out_pos)
+{
+	vector2_base<T> AB = line_pointB - line_pointA;
+	T SquaredMagnitudeAB = dot(AB, AB);
+	if(SquaredMagnitudeAB > 0)
+	{
+		vector2_base<T> AP = target_point - line_pointA;
+		T APdotAB = dot(AP, AB);
+		T t = APdotAB / SquaredMagnitudeAB;
+		out_pos = line_pointA + AB * clamp(t, (T)0, (T)1);
+		return true;
+	}
+	else
+		return false;
+}
+
+// ------------------------------------
+template<typename T>
+class vector3_base
+{
+public:
+	union
+	{
+		T x, r, h, u;
+	};
+	union
+	{
+		T y, g, s, v;
+	};
+	union
+	{
+		T z, b, l, w;
+	};
+
+	constexpr vector3_base() = default;
+	constexpr vector3_base(T nx, T ny, T nz) :
+		x(nx), y(ny), z(nz)
+	{
+	}
+
+	vector3_base operator-(const vector3_base &vec) const { return vector3_base(x - vec.x, y - vec.y, z - vec.z); }
+	vector3_base operator-() const { return vector3_base(-x, -y, -z); }
+	vector3_base operator+(const vector3_base &vec) const { return vector3_base(x + vec.x, y + vec.y, z + vec.z); }
+	vector3_base operator*(const T rhs) const { return vector3_base(x * rhs, y * rhs, z * rhs); }
+	vector3_base operator*(const vector3_base &vec) const { return vector3_base(x * vec.x, y * vec.y, z * vec.z); }
+	vector3_base operator/(const T rhs) const { return vector3_base(x / rhs, y / rhs, z / rhs); }
+	vector3_base operator/(const vector3_base &vec) const { return vector3_base(x / vec.x, y / vec.y, z / vec.z); }
+
+	const vector3_base &operator+=(const vector3_base &vec)
+	{
+		x += vec.x;
+		y += vec.y;
+		z += vec.z;
+		return *this;
+	}
+	const vector3_base &operator-=(const vector3_base &vec)
+	{
+		x -= vec.x;
+		y -= vec.y;
+		z -= vec.z;
+		return *this;
+	}
+	const vector3_base &operator*=(const T rhs)
+	{
+		x *= rhs;
+		y *= rhs;
+		z *= rhs;
+		return *this;
+	}
+	const vector3_base &operator*=(const vector3_base &vec)
+	{
+		x *= vec.x;
+		y *= vec.y;
+		z *= vec.z;
+		return *this;
+	}
+	const vector3_base &operator/=(const T rhs)
+	{
+		x /= rhs;
+		y /= rhs;
+		z /= rhs;
+		return *this;
+	}
+	const vector3_base &operator/=(const vector3_base &vec)
+	{
+		x /= vec.x;
+		y /= vec.y;
+		z /= vec.z;
+		return *this;
+	}
+
+	bool operator==(const vector3_base &vec) const { return x == vec.x && y == vec.y && z == vec.z; } //TODO: do this with an eps instead
+	bool operator!=(const vector3_base &vec) const { return x != vec.x || y != vec.y || z != vec.z; }
+};
+
+template<typename T>
+inline T distance(const vector3_base<T> &a, const vector3_base<T> &b)
+{
+	return length(a - b);
+}
+
+template<typename T>
+constexpr inline T dot(const vector3_base<T> &a, const vector3_base<T> &b)
+{
+	return a.x * b.x + a.y * b.y + a.z * b.z;
+}
+
+template<typename T>
+constexpr inline vector3_base<T> cross(const vector3_base<T> &a, const vector3_base<T> &b)
+{
+	return vector3_base<T>(
+		a.y * b.z - a.z * b.y,
+		a.z * b.x - a.x * b.z,
+		a.x * b.y - a.y * b.x);
+}
+
+//
+inline float length(const vector3_base<float> &a)
+{
+	return std::sqrt(dot(a, a));
+}
+
+inline vector3_base<float> normalize(const vector3_base<float> &v)
+{
+	float divisor = length(v);
+	if(divisor == 0.0f)
+		return vector3_base<float>(0.0f, 0.0f, 0.0f);
+	float l = (float)(1.0f / divisor);
+	return vector3_base<float>(v.x * l, v.y * l, v.z * l);
+}
+
+typedef vector3_base<float> vec3;
+typedef vector3_base<bool> bvec3;
+typedef vector3_base<int> ivec3;
+
+// ------------------------------------
+
+template<typename T>
+class vector4_base
+{
+public:
+	union
+	{
+		T x, r, h;
+	};
+	union
+	{
+		T y, g, s;
+	};
+	union
+	{
+		T z, b, l;
+	};
+	union
+	{
+		T w, a;
+	};
+
+	constexpr vector4_base() = default;
+	constexpr vector4_base(T nx, T ny, T nz, T nw) :
+		x(nx), y(ny), z(nz), w(nw)
+	{
+	}
+
+	vector4_base operator+(const vector4_base &vec) const { return vector4_base(x + vec.x, y + vec.y, z + vec.z, w + vec.w); }
+	vector4_base operator-(const vector4_base &vec) const { return vector4_base(x - vec.x, y - vec.y, z - vec.z, w - vec.w); }
+	vector4_base operator-() const { return vector4_base(-x, -y, -z, -w); }
+	vector4_base operator*(const vector4_base &vec) const { return vector4_base(x * vec.x, y * vec.y, z * vec.z, w * vec.w); }
+	vector4_base operator*(const T rhs) const { return vector4_base(x * rhs, y * rhs, z * rhs, w * rhs); }
+	vector4_base operator/(const vector4_base &vec) const { return vector4_base(x / vec.x, y / vec.y, z / vec.z, w / vec.w); }
+	vector4_base operator/(const T vec) const { return vector4_base(x / vec, y / vec, z / vec, w / vec); }
+
+	const vector4_base &operator+=(const vector4_base &vec)
+	{
+		x += vec.x;
+		y += vec.y;
+		z += vec.z;
+		w += vec.w;
+		return *this;
+	}
+	const vector4_base &operator-=(const vector4_base &vec)
+	{
+		x -= vec.x;
+		y -= vec.y;
+		z -= vec.z;
+		w -= vec.w;
+		return *this;
+	}
+	const vector4_base &operator*=(const T rhs)
+	{
+		x *= rhs;
+		y *= rhs;
+		z *= rhs;
+		w *= rhs;
+		return *this;
+	}
+	const vector4_base &operator*=(const vector4_base &vec)
+	{
+		x *= vec.x;
+		y *= vec.y;
+		z *= vec.z;
+		w *= vec.w;
+		return *this;
+	}
+	const vector4_base &operator/=(const T rhs)
+	{
+		x /= rhs;
+		y /= rhs;
+		z /= rhs;
+		w /= rhs;
+		return *this;
+	}
+	const vector4_base &operator/=(const vector4_base &vec)
+	{
+		x /= vec.x;
+		y /= vec.y;
+		z /= vec.z;
+		w /= vec.w;
+		return *this;
+	}
+
+	bool operator==(const vector4_base &vec) const { return x == vec.x && y == vec.y && z == vec.z && w == vec.w; } //TODO: do this with an eps instead
+	bool operator!=(const vector4_base &vec) const { return x != vec.x || y != vec.y || z != vec.z || w != vec.w; }
+};
+
+typedef vector4_base<float> vec4;
+typedef vector4_base<bool> bvec4;
+typedef vector4_base<int> ivec4;
+typedef vector4_base<uint8_t> ubvec4;
+
+#endif
diff --git a/src_bkp/engine/Cargo.toml b/src_bkp/engine/Cargo.toml
new file mode 100644
index 0000000000..b6d484cd01
--- /dev/null
+++ b/src_bkp/engine/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "ddnet-engine"
+version = "0.0.1"
+edition = "2018"
+publish = false
+license = "Zlib"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+ddnet-base = { path = "../base" }
+
+cxx = "1.0"
+
+[dev-dependencies]
+ddnet-engine-shared = { path = "shared" }
+ddnet-test = { path = "../rust-bridge/test", features = ["link-test-libraries"] }
diff --git a/src_bkp/engine/antibot.h b/src_bkp/engine/antibot.h
new file mode 100644
index 0000000000..0b432bb78b
--- /dev/null
+++ b/src_bkp/engine/antibot.h
@@ -0,0 +1,47 @@
+#ifndef ENGINE_ANTIBOT_H
+#define ENGINE_ANTIBOT_H
+
+#include "kernel.h"
+
+class IAntibot : public IInterface
+{
+	MACRO_INTERFACE("antibot")
+public:
+	virtual void RoundStart(class IGameServer *pGameServer) = 0;
+	virtual void RoundEnd() = 0;
+
+	// Hooks
+	virtual void OnPlayerInit(int ClientID) = 0;
+	virtual void OnPlayerDestroy(int ClientID) = 0;
+	virtual void OnSpawn(int ClientID) = 0;
+	virtual void OnHammerFireReloading(int ClientID) = 0;
+	virtual void OnHammerFire(int ClientID) = 0;
+	virtual void OnHammerHit(int ClientID, int TargetID) = 0;
+	virtual void OnDirectInput(int ClientID) = 0;
+	virtual void OnCharacterTick(int ClientID) = 0;
+	virtual void OnHookAttach(int ClientID, bool Player) = 0;
+
+	// Commands
+	virtual void ConsoleCommand(const char *pCommand) = 0;
+
+	virtual ~IAntibot(){};
+};
+
+class IEngineAntibot : public IAntibot
+{
+	MACRO_INTERFACE("engineantibot")
+public:
+	virtual void Init() = 0;
+
+	// Hooks
+	virtual void OnEngineTick() = 0;
+	virtual void OnEngineClientJoin(int ClientID, bool Sixup) = 0;
+	virtual void OnEngineClientDrop(int ClientID, const char *pReason) = 0;
+	virtual bool OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) = 0;
+	virtual bool OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) = 0;
+	virtual bool OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) = 0;
+
+	virtual ~IEngineAntibot(){};
+};
+
+#endif //ENGINE_ANTIBOT_H
diff --git a/src_bkp/engine/client.h b/src_bkp/engine/client.h
new file mode 100644
index 0000000000..d4c9f3fd43
--- /dev/null
+++ b/src_bkp/engine/client.h
@@ -0,0 +1,347 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_H
+#define ENGINE_CLIENT_H
+#include "kernel.h"
+
+#include "graphics.h"
+#include "message.h"
+#include <base/hash.h>
+
+#include <game/generated/protocol.h>
+
+#include <engine/friends.h>
+#include <functional>
+
+struct SWarning;
+
+enum
+{
+	RECORDER_MANUAL = 0,
+	RECORDER_AUTO = 1,
+	RECORDER_RACE = 2,
+	RECORDER_REPLAYS = 3,
+	RECORDER_MAX = 4,
+
+	NUM_DUMMIES = 2,
+};
+
+typedef bool (*CLIENTFUNC_FILTER)(const void *pData, int DataSize, void *pUser);
+struct CChecksumData;
+
+class IClient : public IInterface
+{
+	MACRO_INTERFACE("client")
+public:
+	/* Constants: Client States
+		STATE_OFFLINE - The client is offline.
+		STATE_CONNECTING - The client is trying to connect to a server.
+		STATE_LOADING - The client has connected to a server and is loading resources.
+		STATE_ONLINE - The client is connected to a server and running the game.
+		STATE_DEMOPLAYBACK - The client is playing a demo
+		STATE_QUITTING - The client is quitting.
+	*/
+
+	enum EClientState
+	{
+		STATE_OFFLINE = 0,
+		STATE_CONNECTING,
+		STATE_LOADING,
+		STATE_ONLINE,
+		STATE_DEMOPLAYBACK,
+		STATE_QUITTING,
+		STATE_RESTARTING,
+	};
+
+	/**
+	* More precise state for @see STATE_LOADING
+	* Sets what is actually happening in the client right now
+	*/
+	enum ELoadingStateDetail
+	{
+		LOADING_STATE_DETAIL_INITIAL,
+		LOADING_STATE_DETAIL_LOADING_MAP,
+		LOADING_STATE_DETAIL_SENDING_READY,
+		LOADING_STATE_DETAIL_GETTING_READY,
+	};
+
+	typedef std::function<void()> TMapLoadingCallbackFunc;
+
+protected:
+	// quick access to state of the client
+	EClientState m_State = IClient::STATE_OFFLINE;
+	ELoadingStateDetail m_LoadingStateDetail = LOADING_STATE_DETAIL_INITIAL;
+	int64_t m_StateStartTime;
+
+	// quick access to time variables
+	int m_aPrevGameTick[NUM_DUMMIES] = {0, 0};
+	int m_aCurGameTick[NUM_DUMMIES] = {0, 0};
+	float m_aGameIntraTick[NUM_DUMMIES] = {0.0f, 0.0f};
+	float m_aGameTickTime[NUM_DUMMIES] = {0.0f, 0.0f};
+	float m_aGameIntraTickSincePrev[NUM_DUMMIES] = {0.0f, 0.0f};
+
+	int m_aPredTick[NUM_DUMMIES] = {0, 0};
+	float m_aPredIntraTick[NUM_DUMMIES] = {0.0f, 0.0f};
+
+	float m_LocalTime = 0.0f;
+	float m_GlobalTime = 0.0f;
+	float m_RenderFrameTime = 0.0001f;
+	float m_FrameTimeAvg = 0.0001f;
+
+	TMapLoadingCallbackFunc m_MapLoadingCBFunc = nullptr;
+
+	char m_aNews[3000] = "";
+	int m_Points = -1;
+	int64_t m_ReconnectTime = 0;
+
+public:
+	class CSnapItem
+	{
+	public:
+		int m_Type;
+		int m_ID;
+		int m_DataSize;
+	};
+
+	enum
+	{
+		CONN_MAIN = 0,
+		CONN_DUMMY,
+		CONN_CONTACT,
+		NUM_CONNS,
+	};
+
+	enum
+	{
+		CONNECTIVITY_UNKNOWN,
+		CONNECTIVITY_CHECKING,
+		CONNECTIVITY_UNREACHABLE,
+		CONNECTIVITY_REACHABLE,
+		// Different global IP address has been detected for UDP and
+		// TCP connections.
+		CONNECTIVITY_DIFFERING_UDP_TCP_IP_ADDRESSES,
+	};
+
+	//
+	inline EClientState State() const { return m_State; }
+	inline ELoadingStateDetail LoadingStateDetail() const { return m_LoadingStateDetail; }
+	inline int64_t StateStartTime() const { return m_StateStartTime; }
+	void SetLoadingStateDetail(ELoadingStateDetail LoadingStateDetail) { m_LoadingStateDetail = LoadingStateDetail; }
+
+	void SetMapLoadingCBFunc(TMapLoadingCallbackFunc &&Func) { m_MapLoadingCBFunc = std::move(Func); }
+
+	// tick time access
+	inline int PrevGameTick(int Conn) const { return m_aPrevGameTick[Conn]; }
+	inline int GameTick(int Conn) const { return m_aCurGameTick[Conn]; }
+	inline int PredGameTick(int Conn) const { return m_aPredTick[Conn]; }
+	inline float IntraGameTick(int Conn) const { return m_aGameIntraTick[Conn]; }
+	inline float PredIntraGameTick(int Conn) const { return m_aPredIntraTick[Conn]; }
+	inline float IntraGameTickSincePrev(int Conn) const { return m_aGameIntraTickSincePrev[Conn]; }
+	inline float GameTickTime(int Conn) const { return m_aGameTickTime[Conn]; }
+	inline int GameTickSpeed() const { return SERVER_TICK_SPEED; }
+
+	// other time access
+	inline float RenderFrameTime() const { return m_RenderFrameTime; }
+	inline float LocalTime() const { return m_LocalTime; }
+	inline float GlobalTime() const { return m_GlobalTime; }
+	inline float FrameTimeAvg() const { return m_FrameTimeAvg; }
+
+	// actions
+	virtual void Connect(const char *pAddress, const char *pPassword = nullptr) = 0;
+	virtual void Disconnect() = 0;
+
+	// dummy
+	virtual void DummyDisconnect(const char *pReason) = 0;
+	virtual void DummyConnect() = 0;
+	virtual bool DummyConnected() = 0;
+	virtual bool DummyConnecting() = 0;
+	virtual bool DummyAllowed() = 0;
+
+	virtual void Restart() = 0;
+	virtual void Quit() = 0;
+	virtual const char *DemoPlayer_Play(const char *pFilename, int StorageType) = 0;
+#if defined(CONF_VIDEORECORDER)
+	virtual const char *DemoPlayer_Render(const char *pFilename, int StorageType, const char *pVideoName, int SpeedIndex, bool StartPaused = false) = 0;
+#endif
+	virtual void DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int Recorder, bool Verbose = false) = 0;
+	virtual void DemoRecorder_HandleAutoStart() = 0;
+	virtual void DemoRecorder_Stop(int Recorder, bool RemoveFile = false) = 0;
+	virtual class IDemoRecorder *DemoRecorder(int Recorder) = 0;
+	virtual void AutoScreenshot_Start() = 0;
+	virtual void AutoStatScreenshot_Start() = 0;
+	virtual void AutoCSV_Start() = 0;
+	virtual void ServerBrowserUpdate() = 0;
+
+	// gfx
+	virtual void SwitchWindowScreen(int Index) = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual void ToggleWindowVSync() = 0;
+	virtual void Notify(const char *pTitle, const char *pMessage) = 0;
+	virtual void OnWindowResize() = 0;
+
+	virtual void UpdateAndSwap() = 0;
+
+	// networking
+	virtual void EnterGame(int Conn) = 0;
+
+	//
+	virtual const NETADDR &ServerAddress() const = 0;
+	virtual int ConnectNetTypes() const = 0;
+	virtual const char *ConnectAddressString() const = 0;
+	virtual const char *MapDownloadName() const = 0;
+	virtual int MapDownloadAmount() const = 0;
+	virtual int MapDownloadTotalsize() const = 0;
+
+	// input
+	virtual int *GetInput(int Tick, int IsDummy = 0) const = 0;
+
+	// remote console
+	virtual void RconAuth(const char *pUsername, const char *pPassword) = 0;
+	virtual bool RconAuthed() const = 0;
+	virtual bool UseTempRconCommands() const = 0;
+	virtual void Rcon(const char *pLine) = 0;
+
+	// server info
+	virtual void GetServerInfo(class CServerInfo *pServerInfo) const = 0;
+
+	virtual int GetPredictionTime() = 0;
+
+	// snapshot interface
+
+	enum
+	{
+		SNAP_CURRENT = 0,
+		SNAP_PREV = 1,
+		NUM_SNAPSHOT_TYPES = 2,
+	};
+
+	// TODO: Refactor: should redo this a bit i think, too many virtual calls
+	virtual int SnapNumItems(int SnapID) const = 0;
+	virtual const void *SnapFindItem(int SnapID, int Type, int ID) const = 0;
+	virtual void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const = 0;
+	virtual int SnapItemSize(int SnapID, int Index) const = 0;
+
+	virtual void SnapSetStaticsize(int ItemType, int Size) = 0;
+
+	virtual int SendMsg(int Conn, CMsgPacker *pMsg, int Flags) = 0;
+	virtual int SendMsgActive(CMsgPacker *pMsg, int Flags) = 0;
+
+	template<class T>
+	int SendPackMsgActive(T *pMsg, int Flags)
+	{
+		CMsgPacker Packer(T::ms_MsgID, false);
+		if(pMsg->Pack(&Packer))
+			return -1;
+		return SendMsgActive(&Packer, Flags);
+	}
+
+	//
+	virtual const char *PlayerName() const = 0;
+	virtual const char *DummyName() const = 0;
+	virtual const char *ErrorString() const = 0;
+	virtual const char *LatestVersion() const = 0;
+	virtual bool ConnectionProblems() const = 0;
+
+	virtual bool SoundInitFailed() const = 0;
+
+	virtual IGraphics::CTextureHandle GetDebugFont() const = 0; // TODO: remove this function
+
+	//DDRace
+
+	virtual const char *GetCurrentMap() const = 0;
+	virtual const char *GetCurrentMapPath() const = 0;
+	virtual SHA256_DIGEST GetCurrentMapSha256() const = 0;
+	virtual unsigned GetCurrentMapCrc() const = 0;
+
+	const char *News() const { return m_aNews; }
+	int Points() const { return m_Points; }
+	int64_t ReconnectTime() const { return m_ReconnectTime; }
+	void SetReconnectTime(int64_t ReconnectTime) { m_ReconnectTime = ReconnectTime; }
+	virtual int GetCurrentRaceTime() = 0;
+
+	virtual void RaceRecord_Start(const char *pFilename) = 0;
+	virtual void RaceRecord_Stop() = 0;
+	virtual bool RaceRecord_IsRecording() = 0;
+
+	virtual void DemoSliceBegin() = 0;
+	virtual void DemoSliceEnd() = 0;
+	virtual void DemoSlice(const char *pDstPath, CLIENTFUNC_FILTER pfnFilter, void *pUser) = 0;
+
+	virtual void RequestDDNetInfo() = 0;
+	virtual bool EditorHasUnsavedData() const = 0;
+
+	virtual void GenerateTimeoutSeed() = 0;
+
+	virtual IFriends *Foes() = 0;
+
+	virtual void GetSmoothTick(int *pSmoothTick, float *pSmoothIntraTick, float MixAmount) = 0;
+
+	virtual void AddWarning(const SWarning &Warning) = 0;
+	virtual SWarning *GetCurWarning() = 0;
+
+	virtual CChecksumData *ChecksumData() = 0;
+	virtual bool InfoTaskRunning() = 0;
+	virtual int UdpConnectivity(int NetType) = 0;
+
+#if defined(CONF_FAMILY_WINDOWS)
+	virtual void ShellRegister() = 0;
+	virtual void ShellUnregister() = 0;
+#endif
+
+	enum EMessageBoxType
+	{
+		MESSAGE_BOX_TYPE_ERROR,
+		MESSAGE_BOX_TYPE_WARNING,
+		MESSAGE_BOX_TYPE_INFO,
+	};
+	virtual void ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type = MESSAGE_BOX_TYPE_ERROR) = 0;
+	virtual void GetGPUInfoString(char (&aGPUInfo)[256]) = 0;
+};
+
+class IGameClient : public IInterface
+{
+	MACRO_INTERFACE("gameclient")
+protected:
+public:
+	virtual void OnConsoleInit() = 0;
+
+	virtual void OnRconType(bool UsernameReq) = 0;
+	virtual void OnRconLine(const char *pLine) = 0;
+	virtual void OnInit() = 0;
+	virtual void InvalidateSnapshot() = 0;
+	virtual void OnNewSnapshot() = 0;
+	virtual void OnEnterGame() = 0;
+	virtual void OnShutdown() = 0;
+	virtual void OnRender() = 0;
+	virtual void OnUpdate() = 0;
+	virtual void OnStateChange(int NewState, int OldState) = 0;
+	virtual void OnConnected() = 0;
+	virtual void OnMessage(int MsgID, CUnpacker *pUnpacker, int Conn, bool Dummy) = 0;
+	virtual void OnPredict() = 0;
+	virtual void OnActivateEditor() = 0;
+	virtual void OnWindowResize() = 0;
+
+	virtual int OnSnapInput(int *pData, bool Dummy, bool Force) = 0;
+	virtual void OnDummySwap() = 0;
+	virtual void SendDummyInfo(bool Start) = 0;
+	virtual int GetLastRaceTick() const = 0;
+
+	virtual const char *GetItemName(int Type) const = 0;
+	virtual const char *Version() const = 0;
+	virtual const char *NetVersion() const = 0;
+	virtual int DDNetVersion() const = 0;
+	virtual const char *DDNetVersionStr() const = 0;
+
+	virtual void OnDummyDisconnect() = 0;
+	virtual void DummyResetInput() = 0;
+	virtual void Echo(const char *pString) = 0;
+	virtual bool CanDisplayWarning() const = 0;
+	virtual bool IsDisplayingWarning() const = 0;
+
+	virtual CNetObjHandler *GetNetObjHandler() = 0;
+};
+
+void SnapshotRemoveExtraProjectileInfo(unsigned char *pData);
+
+extern IGameClient *CreateGameClient();
+#endif
diff --git a/src_bkp/engine/client/backend/backend_base.cpp b/src_bkp/engine/client/backend/backend_base.cpp
new file mode 100644
index 0000000000..168598064f
--- /dev/null
+++ b/src_bkp/engine/client/backend/backend_base.cpp
@@ -0,0 +1,35 @@
+#include "backend_base.h"
+#include <base/system.h>
+#include <engine/gfx/image_manipulation.h>
+
+void *CCommandProcessorFragment_GLBase::Resize(const unsigned char *pData, int Width, int Height, int NewWidth, int NewHeight, int BPP)
+{
+	return ResizeImage((const uint8_t *)pData, Width, Height, NewWidth, NewHeight, BPP);
+}
+
+bool CCommandProcessorFragment_GLBase::Texture2DTo3D(void *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, void *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight)
+{
+	Target3DImageWidth = ImageWidth / SplitCountWidth;
+	Target3DImageHeight = ImageHeight / SplitCountHeight;
+
+	const size_t FullImageWidth = (size_t)ImageWidth * PixelSize;
+
+	for(int Y = 0; Y < SplitCountHeight; ++Y)
+	{
+		for(int X = 0; X < SplitCountWidth; ++X)
+		{
+			for(int Y3D = 0; Y3D < Target3DImageHeight; ++Y3D)
+			{
+				int DepthIndex = X + Y * SplitCountWidth;
+
+				size_t TargetImageFullWidth = (size_t)Target3DImageWidth * PixelSize;
+				size_t TargetImageFullSize = (size_t)TargetImageFullWidth * Target3DImageHeight;
+				ptrdiff_t ImageOffset = (ptrdiff_t)(((size_t)Y * FullImageWidth * (size_t)Target3DImageHeight) + ((size_t)Y3D * FullImageWidth) + ((size_t)X * TargetImageFullWidth));
+				ptrdiff_t TargetImageOffset = (ptrdiff_t)(TargetImageFullSize * (size_t)DepthIndex + ((size_t)Y3D * TargetImageFullWidth));
+				mem_copy(((uint8_t *)pTarget3DImageData) + TargetImageOffset, ((uint8_t *)pImageBuffer) + (ptrdiff_t)(ImageOffset), TargetImageFullWidth);
+			}
+		}
+	}
+
+	return true;
+}
diff --git a/src_bkp/engine/client/backend/backend_base.h b/src_bkp/engine/client/backend/backend_base.h
new file mode 100644
index 0000000000..19b7eba6f2
--- /dev/null
+++ b/src_bkp/engine/client/backend/backend_base.h
@@ -0,0 +1,181 @@
+#ifndef ENGINE_CLIENT_BACKEND_BACKEND_BASE_H
+#define ENGINE_CLIENT_BACKEND_BACKEND_BASE_H
+
+#include <engine/graphics.h>
+
+#include <engine/client/graphics_threaded.h>
+
+#include <SDL_video.h>
+
+#include <atomic>
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+struct SBackendCapabilites;
+
+enum EDebugGfxModes
+{
+	DEBUG_GFX_MODE_NONE = 0,
+	DEBUG_GFX_MODE_MINIMUM,
+	DEBUG_GFX_MODE_AFFECTS_PERFORMANCE,
+	DEBUG_GFX_MODE_VERBOSE,
+	DEBUG_GFX_MODE_ALL,
+};
+
+enum ERunCommandReturnTypes
+{
+	RUN_COMMAND_COMMAND_HANDLED = 0,
+	RUN_COMMAND_COMMAND_UNHANDLED,
+	RUN_COMMAND_COMMAND_WARNING,
+	RUN_COMMAND_COMMAND_ERROR,
+};
+
+enum EGfxErrorType
+{
+	GFX_ERROR_TYPE_NONE = 0,
+	GFX_ERROR_TYPE_INIT,
+	GFX_ERROR_TYPE_OUT_OF_MEMORY_IMAGE,
+	GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER,
+	GFX_ERROR_TYPE_OUT_OF_MEMORY_STAGING,
+	GFX_ERROR_TYPE_RENDER_RECORDING,
+	GFX_ERROR_TYPE_RENDER_CMD_FAILED,
+	GFX_ERROR_TYPE_RENDER_SUBMIT_FAILED,
+	GFX_ERROR_TYPE_SWAP_FAILED,
+	GFX_ERROR_TYPE_UNKNOWN,
+};
+
+enum EGfxWarningType
+{
+	GFX_WARNING_TYPE_NONE = 0,
+	GFX_WARNING_TYPE_INIT_FAILED,
+	GFX_WARNING_TYPE_INIT_FAILED_MISSING_INTEGRATED_GPU_DRIVER,
+	GFX_WARNING_LOW_ON_MEMORY,
+	GFX_WARNING_MISSING_EXTENSION,
+	GFX_WARNING_TYPE_UNKNOWN,
+};
+
+struct SGfxErrorContainer
+{
+	struct SError
+	{
+		bool m_RequiresTranslation;
+		std::string m_Err;
+
+		bool operator==(const SError &Other) const
+		{
+			return m_RequiresTranslation == Other.m_RequiresTranslation && m_Err == Other.m_Err;
+		}
+	};
+	EGfxErrorType m_ErrorType = EGfxErrorType::GFX_ERROR_TYPE_NONE;
+	std::vector<SError> m_vErrors;
+};
+
+struct SGfxWarningContainer
+{
+	EGfxWarningType m_WarningType = EGfxWarningType::GFX_WARNING_TYPE_NONE;
+	std::vector<std::string> m_vWarnings;
+};
+
+class CCommandProcessorFragment_GLBase
+{
+protected:
+	SGfxErrorContainer m_Error;
+	SGfxWarningContainer m_Warning;
+
+	static void *Resize(const unsigned char *pData, int Width, int Height, int NewWidth, int NewHeight, int BPP);
+
+	static bool Texture2DTo3D(void *pImageBuffer, int ImageWidth, int ImageHeight, size_t PixelSize, int SplitCountWidth, int SplitCountHeight, void *pTarget3DImageData, int &Target3DImageWidth, int &Target3DImageHeight);
+
+	virtual bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) = 0;
+
+public:
+	virtual ~CCommandProcessorFragment_GLBase() = default;
+	virtual ERunCommandReturnTypes RunCommand(const CCommandBuffer::SCommand *pBaseCommand) = 0;
+
+	virtual void StartCommands(size_t CommandCount, size_t EstimatedRenderCallCount) {}
+	virtual void EndCommands() {}
+
+	const SGfxErrorContainer &GetError() { return m_Error; }
+	virtual void ErroneousCleanup() {}
+
+	const SGfxWarningContainer &GetWarning() { return m_Warning; }
+
+	enum
+	{
+		CMD_PRE_INIT = CCommandBuffer::CMDGROUP_PLATFORM_GL,
+		CMD_INIT,
+		CMD_SHUTDOWN,
+		CMD_POST_SHUTDOWN,
+	};
+
+	struct SCommand_PreInit : public CCommandBuffer::SCommand
+	{
+		SCommand_PreInit() :
+			SCommand(CMD_PRE_INIT) {}
+
+		SDL_Window *m_pWindow;
+		uint32_t m_Width;
+		uint32_t m_Height;
+
+		char *m_pVendorString;
+		char *m_pVersionString;
+		char *m_pRendererString;
+
+		TTWGraphicsGPUList *m_pGPUList;
+	};
+
+	struct SCommand_Init : public CCommandBuffer::SCommand
+	{
+		SCommand_Init() :
+			SCommand(CMD_INIT) {}
+
+		SDL_Window *m_pWindow;
+		uint32_t m_Width;
+		uint32_t m_Height;
+
+		class IStorage *m_pStorage;
+		std::atomic<uint64_t> *m_pTextureMemoryUsage;
+		std::atomic<uint64_t> *m_pBufferMemoryUsage;
+		std::atomic<uint64_t> *m_pStreamMemoryUsage;
+		std::atomic<uint64_t> *m_pStagingMemoryUsage;
+
+		TTWGraphicsGPUList *m_pGPUList;
+
+		TGLBackendReadPresentedImageData *m_pReadPresentedImageDataFunc;
+
+		SBackendCapabilites *m_pCapabilities;
+		int *m_pInitError;
+
+		const char **m_pErrStringPtr;
+
+		char *m_pVendorString;
+		char *m_pVersionString;
+		char *m_pRendererString;
+
+		int m_RequestedMajor;
+		int m_RequestedMinor;
+		int m_RequestedPatch;
+
+		EBackendType m_RequestedBackend;
+
+		int m_GlewMajor;
+		int m_GlewMinor;
+		int m_GlewPatch;
+	};
+
+	struct SCommand_Shutdown : public CCommandBuffer::SCommand
+	{
+		SCommand_Shutdown() :
+			SCommand(CMD_SHUTDOWN) {}
+	};
+
+	struct SCommand_PostShutdown : public CCommandBuffer::SCommand
+	{
+		SCommand_PostShutdown() :
+			SCommand(CMD_POST_SHUTDOWN) {}
+	};
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/glsl_shader_compiler.cpp b/src_bkp/engine/client/backend/glsl_shader_compiler.cpp
new file mode 100644
index 0000000000..f4c6fa095d
--- /dev/null
+++ b/src_bkp/engine/client/backend/glsl_shader_compiler.cpp
@@ -0,0 +1,246 @@
+#include "glsl_shader_compiler.h"
+
+#include <base/system.h>
+#include <engine/graphics.h>
+
+CGLSLCompiler::CGLSLCompiler(int OpenGLVersionMajor, int OpenGLVersionMinor, int OpenGLVersionPatch, bool IsOpenGLES, float TextureLODBias)
+{
+	m_OpenGLVersionMajor = OpenGLVersionMajor;
+	m_OpenGLVersionMinor = OpenGLVersionMinor;
+	m_OpenGLVersionPatch = OpenGLVersionPatch;
+
+	m_IsOpenGLES = IsOpenGLES;
+
+	m_TextureLODBias = TextureLODBias;
+
+	m_HasTextureArray = false;
+	m_TextureReplaceType = 0;
+}
+
+void CGLSLCompiler::AddDefine(const std::string &DefineName, const std::string &DefineValue)
+{
+	m_vDefines.emplace_back(DefineName, DefineValue);
+}
+
+void CGLSLCompiler::AddDefine(const char *pDefineName, const char *pDefineValue)
+{
+	AddDefine(std::string(pDefineName), std::string(pDefineValue));
+}
+
+void CGLSLCompiler::ClearDefines()
+{
+	m_vDefines.clear();
+}
+
+void CGLSLCompiler::ParseLine(std::string &Line, const char *pReadLine, EGLSLShaderCompilerType Type)
+{
+	EBackendType BackendType = m_IsOpenGLES ? BACKEND_TYPE_OPENGL_ES : BACKEND_TYPE_OPENGL;
+	bool IsNewOpenGL = (BackendType == BACKEND_TYPE_OPENGL ? (m_OpenGLVersionMajor >= 4 || (m_OpenGLVersionMajor == 3 && m_OpenGLVersionMinor == 3)) : m_OpenGLVersionMajor >= 3);
+	if(!IsNewOpenGL)
+	{
+		const char *pBuff = pReadLine;
+		char aTmpStr[1024];
+		size_t TmpStrSize = 0;
+		while(*pBuff)
+		{
+			while(*pBuff && str_isspace(*pBuff))
+			{
+				Line.append(1, *pBuff);
+				++pBuff;
+			}
+
+			while(*pBuff && !str_isspace(*pBuff) && *pBuff != '(' && *pBuff != '.')
+			{
+				aTmpStr[TmpStrSize++] = *pBuff;
+				++pBuff;
+			}
+
+			if(TmpStrSize > 0)
+			{
+				aTmpStr[TmpStrSize] = 0;
+				TmpStrSize = 0;
+				if(str_comp(aTmpStr, "layout") == 0)
+				{
+					//search for ' in'
+					while(*pBuff && (*pBuff != ' ' || (*(pBuff + 1) && *(pBuff + 1) != 'i') || *(pBuff + 2) != 'n'))
+					{
+						++pBuff;
+					}
+
+					if(*pBuff == ' ' && *(pBuff + 1) == 'i' && *(pBuff + 2) == 'n')
+					{
+						pBuff += 3;
+						Line.append("attribute");
+						Line.append(pBuff);
+						return;
+					}
+					else
+					{
+						dbg_msg("shadercompiler", "Fix shader for older OpenGL versions.");
+					}
+				}
+				else if(str_comp(aTmpStr, "noperspective") == 0 || str_comp(aTmpStr, "smooth") == 0 || str_comp(aTmpStr, "flat") == 0)
+				{
+					//search for 'in' or 'out'
+					while(*pBuff && ((*pBuff != 'i' || *(pBuff + 1) != 'n') && (*pBuff != 'o' || (*(pBuff + 1) && *(pBuff + 1) != 'u') || *(pBuff + 2) != 't')))
+					{
+						// append anything that is inbetween noperspective & in/out vars
+						Line.push_back(*pBuff);
+						++pBuff;
+					}
+
+					bool Found = false;
+					if(*pBuff)
+					{
+						if(*pBuff == 'i' && *(pBuff + 1) == 'n')
+						{
+							pBuff += 2;
+							Found = true;
+						}
+						else if(*pBuff == 'o' && *(pBuff + 1) == 'u' && *(pBuff + 2) == 't')
+						{
+							pBuff += 3;
+							Found = true;
+						}
+					}
+
+					if(!Found)
+					{
+						dbg_msg("shadercompiler", "Fix shader for older OpenGL versions.");
+					}
+
+					Line.append("varying");
+					Line.append(pBuff);
+					return;
+				}
+				else if(str_comp(aTmpStr, "out") == 0 || str_comp(aTmpStr, "in") == 0)
+				{
+					if(Type == GLSL_SHADER_COMPILER_TYPE_FRAGMENT && str_comp(aTmpStr, "out") == 0)
+						return;
+					Line.append("varying");
+					Line.append(pBuff);
+					return;
+				}
+				else if(str_comp(aTmpStr, "FragClr") == 0)
+				{
+					Line.append("gl_FragColor");
+					Line.append(pBuff);
+					return;
+				}
+				else if(str_comp(aTmpStr, "texture") == 0)
+				{
+					if(m_TextureReplaceType == GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D)
+						Line.append("texture2D");
+					else if(m_TextureReplaceType == GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D)
+						Line.append("texture3D");
+					else if(m_TextureReplaceType == GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY)
+						Line.append("texture2DArray");
+					std::string RestLine;
+					ParseLine(RestLine, pBuff, Type);
+					Line.append(RestLine);
+					return;
+				}
+				else
+				{
+					Line.append(aTmpStr);
+				}
+			}
+
+			if(*pBuff)
+			{
+				Line.append(1, *pBuff);
+				++pBuff;
+			}
+		}
+	}
+	else
+	{
+		if(BackendType == BACKEND_TYPE_OPENGL_ES)
+		{
+			const char *pBuff = pReadLine;
+			char aTmpStr[1024];
+			size_t TmpStrSize = 0;
+			while(*pBuff)
+			{
+				while(*pBuff && str_isspace(*pBuff))
+				{
+					Line.append(1, *pBuff);
+					++pBuff;
+				}
+
+				while(*pBuff && !str_isspace(*pBuff) && *pBuff != '(' && *pBuff != '.')
+				{
+					aTmpStr[TmpStrSize++] = *pBuff;
+					++pBuff;
+				}
+
+				if(TmpStrSize > 0)
+				{
+					aTmpStr[TmpStrSize] = 0;
+					TmpStrSize = 0;
+
+					if(str_comp(aTmpStr, "noperspective") == 0)
+					{
+						Line.append("smooth");
+						Line.append(pBuff);
+						return;
+					}
+					// since GLES doesn't support texture LOD bias as global state, use the shader function instead(since GLES 3.0 uses shaders only anyway)
+					else if(str_comp(aTmpStr, "texture") == 0)
+					{
+						Line.append("texture");
+						// check opening and closing brackets to find the end
+						int CurBrackets = 1;
+						while(*pBuff && *pBuff != '(')
+						{
+							Line.append(1, *pBuff);
+
+							++pBuff;
+						}
+
+						if(*pBuff)
+						{
+							Line.append(1, *pBuff);
+							++pBuff;
+						}
+
+						while(*pBuff)
+						{
+							if(*pBuff == '(')
+								++CurBrackets;
+							if(*pBuff == ')')
+								--CurBrackets;
+
+							if(CurBrackets == 0)
+							{
+								// found end
+								Line.append(std::string(", ") + std::to_string(m_TextureLODBias) + ")");
+								++pBuff;
+								break;
+							}
+							else
+								Line.append(1, *pBuff);
+							++pBuff;
+						}
+
+						Line.append(pBuff);
+
+						return;
+					}
+					else
+					{
+						Line.append(aTmpStr);
+					}
+				}
+
+				if(*pBuff)
+				{
+					Line.append(1, *pBuff);
+					++pBuff;
+				}
+			}
+		}
+		else
+			Line = pReadLine;
+	}
+}
diff --git a/src_bkp/engine/client/backend/glsl_shader_compiler.h b/src_bkp/engine/client/backend/glsl_shader_compiler.h
new file mode 100644
index 0000000000..d3917f46c9
--- /dev/null
+++ b/src_bkp/engine/client/backend/glsl_shader_compiler.h
@@ -0,0 +1,60 @@
+#ifndef ENGINE_CLIENT_BACKEND_GLSL_SHADER_COMPILER_H
+#define ENGINE_CLIENT_BACKEND_GLSL_SHADER_COMPILER_H
+
+#include <string>
+#include <vector>
+
+enum EGLSLShaderCompilerType
+{
+	GLSL_SHADER_COMPILER_TYPE_VERTEX = 0,
+	GLSL_SHADER_COMPILER_TYPE_FRAGMENT,
+};
+
+class CGLSLCompiler
+{
+private:
+	friend class CGLSL;
+
+	struct SGLSLCompilerDefine
+	{
+		SGLSLCompilerDefine(const std::string &DefineName, const std::string &DefineValue)
+		{
+			m_DefineName = DefineName;
+			m_DefineValue = DefineValue;
+		}
+		std::string m_DefineName;
+		std::string m_DefineValue;
+	};
+
+	std::vector<SGLSLCompilerDefine> m_vDefines;
+
+	int m_OpenGLVersionMajor;
+	int m_OpenGLVersionMinor;
+	int m_OpenGLVersionPatch;
+
+	bool m_IsOpenGLES;
+
+	float m_TextureLODBias;
+
+	bool m_HasTextureArray;
+	int m_TextureReplaceType; // @see EGLSLCompilerTextureReplaceType
+public:
+	CGLSLCompiler(int OpenGLVersionMajor, int OpenGLVersionMinor, int OpenGLVersionPatch, bool IsOpenGLES, float TextureLODBias);
+	void SetHasTextureArray(bool TextureArray) { m_HasTextureArray = TextureArray; }
+	void SetTextureReplaceType(int TextureReplaceType) { m_TextureReplaceType = TextureReplaceType; }
+
+	void AddDefine(const std::string &DefineName, const std::string &DefineValue);
+	void AddDefine(const char *pDefineName, const char *pDefineValue);
+	void ClearDefines();
+
+	void ParseLine(std::string &Line, const char *pReadLine, EGLSLShaderCompilerType Type);
+
+	enum EGLSLCompilerTextureReplaceType
+	{
+		GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D = 0,
+		GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D,
+		GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY,
+	};
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/null/backend_null.cpp b/src_bkp/engine/client/backend/null/backend_null.cpp
new file mode 100644
index 0000000000..409b6661b3
--- /dev/null
+++ b/src_bkp/engine/client/backend/null/backend_null.cpp
@@ -0,0 +1,61 @@
+#include "backend_null.h"
+
+#include <engine/client/backend_sdl.h>
+
+ERunCommandReturnTypes CCommandProcessorFragment_Null::RunCommand(const CCommandBuffer::SCommand *pBaseCommand)
+{
+	switch(pBaseCommand->m_Cmd)
+	{
+	case CCommandProcessorFragment_Null::CMD_INIT:
+		Cmd_Init(static_cast<const SCommand_Init *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXTURE_CREATE:
+		Cmd_Texture_Create(static_cast<const CCommandBuffer::SCommand_Texture_Create *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXT_TEXTURES_CREATE:
+		Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXT_TEXTURE_UPDATE:
+		Cmd_TextTexture_Update(static_cast<const CCommandBuffer::SCommand_TextTexture_Update *>(pBaseCommand));
+		break;
+	}
+	return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_HANDLED;
+}
+
+bool CCommandProcessorFragment_Null::Cmd_Init(const SCommand_Init *pCommand)
+{
+	pCommand->m_pCapabilities->m_TileBuffering = false;
+	pCommand->m_pCapabilities->m_QuadBuffering = false;
+	pCommand->m_pCapabilities->m_TextBuffering = false;
+	pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
+
+	pCommand->m_pCapabilities->m_MipMapping = false;
+	pCommand->m_pCapabilities->m_NPOTTextures = false;
+	pCommand->m_pCapabilities->m_3DTextures = false;
+	pCommand->m_pCapabilities->m_2DArrayTextures = false;
+	pCommand->m_pCapabilities->m_2DArrayTexturesAsExtension = false;
+	pCommand->m_pCapabilities->m_ShaderSupport = false;
+
+	pCommand->m_pCapabilities->m_TrianglesAsQuads = false;
+
+	pCommand->m_pCapabilities->m_ContextMajor = 0;
+	pCommand->m_pCapabilities->m_ContextMinor = 0;
+	pCommand->m_pCapabilities->m_ContextPatch = 0;
+	return false;
+}
+
+void CCommandProcessorFragment_Null::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
+{
+	free(pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_Null::Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand)
+{
+	free(pCommand->m_pTextData);
+	free(pCommand->m_pTextOutlineData);
+}
+
+void CCommandProcessorFragment_Null::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
+{
+	free(pCommand->m_pData);
+}
diff --git a/src_bkp/engine/client/backend/null/backend_null.h b/src_bkp/engine/client/backend/null/backend_null.h
new file mode 100644
index 0000000000..dd76703670
--- /dev/null
+++ b/src_bkp/engine/client/backend/null/backend_null.h
@@ -0,0 +1,16 @@
+#ifndef ENGINE_CLIENT_BACKEND_NULL_BACKEND_NULL_H
+#define ENGINE_CLIENT_BACKEND_NULL_BACKEND_NULL_H
+
+#include <engine/client/backend/backend_base.h>
+
+class CCommandProcessorFragment_Null : public CCommandProcessorFragment_GLBase
+{
+	bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) override { return false; };
+	ERunCommandReturnTypes RunCommand(const CCommandBuffer::SCommand *pBaseCommand) override;
+	bool Cmd_Init(const SCommand_Init *pCommand);
+	virtual void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand);
+	virtual void Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand);
+	virtual void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand);
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/backend_opengl.cpp b/src_bkp/engine/client/backend/opengl/backend_opengl.cpp
new file mode 100644
index 0000000000..a599a99037
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/backend_opengl.cpp
@@ -0,0 +1,2097 @@
+#include "backend_opengl.h"
+
+#include <engine/graphics.h>
+
+#include <engine/client/backend_sdl.h>
+
+#include <base/detect.h>
+
+#if defined(BACKEND_AS_OPENGL_ES) || !defined(CONF_BACKEND_OPENGL_ES)
+
+#include <engine/client/backend/opengl/opengl_sl.h>
+#include <engine/client/backend/opengl/opengl_sl_program.h>
+#include <engine/client/blocklist_driver.h>
+
+#include <engine/client/backend/glsl_shader_compiler.h>
+
+#include <engine/gfx/image_manipulation.h>
+
+#ifndef BACKEND_AS_OPENGL_ES
+#include <GL/glew.h>
+#else
+#include <GLES3/gl3.h>
+#define GL_TEXTURE_2D_ARRAY_EXT GL_TEXTURE_2D_ARRAY
+// GLES doesn't support GL_QUADS, but the code is also never executed
+#define GL_QUADS GL_TRIANGLES
+#ifndef CONF_BACKEND_OPENGL_ES3
+#include <GLES/gl.h>
+#define glOrtho glOrthof
+#else
+#define BACKEND_GL_MODERN_API 1
+#endif
+#endif
+
+// ------------ CCommandProcessorFragment_OpenGL
+void CCommandProcessorFragment_OpenGL::Cmd_Update_Viewport(const CCommandBuffer::SCommand_Update_Viewport *pCommand)
+{
+	if(pCommand->m_ByResize)
+	{
+		m_CanvasWidth = (uint32_t)pCommand->m_Width;
+		m_CanvasHeight = (uint32_t)pCommand->m_Height;
+	}
+	glViewport(pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height);
+}
+
+int CCommandProcessorFragment_OpenGL::TexFormatToOpenGLFormat(int TexFormat)
+{
+	if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
+		return GL_RGBA;
+	return GL_RGBA;
+}
+
+size_t CCommandProcessorFragment_OpenGL::GLFormatToPixelSize(int GLFormat)
+{
+	switch(GLFormat)
+	{
+	case GL_RGBA: return 4;
+	case GL_RGB: return 3;
+	case GL_RED: return 1;
+	case GL_ALPHA: return 1;
+	default: return 4;
+	}
+}
+
+bool CCommandProcessorFragment_OpenGL::IsTexturedState(const CCommandBuffer::SState &State)
+{
+	return State.m_Texture >= 0 && State.m_Texture < (int)m_vTextures.size();
+}
+
+void CCommandProcessorFragment_OpenGL::SetState(const CCommandBuffer::SState &State, bool Use2DArrayTextures)
+{
+#ifndef BACKEND_GL_MODERN_API
+	// blend
+	switch(State.m_BlendMode)
+	{
+	case CCommandBuffer::BLEND_NONE:
+		glDisable(GL_BLEND);
+		break;
+	case CCommandBuffer::BLEND_ALPHA:
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		break;
+	case CCommandBuffer::BLEND_ADDITIVE:
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+		break;
+	default:
+		dbg_msg("render", "unknown blendmode %d\n", State.m_BlendMode);
+	};
+	m_LastBlendMode = State.m_BlendMode;
+
+	// clip
+	if(State.m_ClipEnable)
+	{
+		glScissor(State.m_ClipX, State.m_ClipY, State.m_ClipW, State.m_ClipH);
+		glEnable(GL_SCISSOR_TEST);
+		m_LastClipEnable = true;
+	}
+	else if(m_LastClipEnable)
+	{
+		// Don't disable it always
+		glDisable(GL_SCISSOR_TEST);
+		m_LastClipEnable = false;
+	}
+
+	glDisable(GL_TEXTURE_2D);
+	if(!m_HasShaders)
+	{
+		if(m_Has3DTextures)
+			glDisable(GL_TEXTURE_3D);
+		if(m_Has2DArrayTextures)
+		{
+			glDisable(m_2DArrayTarget);
+		}
+	}
+
+	if(m_HasShaders && IsNewApi())
+	{
+		glBindSampler(0, 0);
+	}
+
+	// texture
+	if(IsTexturedState(State))
+	{
+		if(!Use2DArrayTextures)
+		{
+			glEnable(GL_TEXTURE_2D);
+			glBindTexture(GL_TEXTURE_2D, m_vTextures[State.m_Texture].m_Tex);
+
+			if(m_vTextures[State.m_Texture].m_LastWrapMode != State.m_WrapMode)
+			{
+				switch(State.m_WrapMode)
+				{
+				case CCommandBuffer::WRAP_REPEAT:
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+					break;
+				case CCommandBuffer::WRAP_CLAMP:
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+					break;
+				default:
+					dbg_msg("render", "unknown wrapmode %d\n", State.m_WrapMode);
+				};
+				m_vTextures[State.m_Texture].m_LastWrapMode = State.m_WrapMode;
+			}
+		}
+		else
+		{
+			if(m_Has2DArrayTextures)
+			{
+				if(!m_HasShaders)
+					glEnable(m_2DArrayTarget);
+				glBindTexture(m_2DArrayTarget, m_vTextures[State.m_Texture].m_Tex2DArray);
+			}
+			else if(m_Has3DTextures)
+			{
+				if(!m_HasShaders)
+					glEnable(GL_TEXTURE_3D);
+				glBindTexture(GL_TEXTURE_3D, m_vTextures[State.m_Texture].m_Tex2DArray);
+			}
+			else
+			{
+				dbg_msg("opengl", "ERROR: this call should not happen.");
+			}
+		}
+	}
+
+	// screen mapping
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(State.m_ScreenTL.x, State.m_ScreenBR.x, State.m_ScreenBR.y, State.m_ScreenTL.y, -10.0f, 10.f);
+#endif
+}
+
+static void ParseVersionString(EBackendType BackendType, const char *pStr, int &VersionMajor, int &VersionMinor, int &VersionPatch)
+{
+	if(pStr)
+	{
+		// if backend is GLES, it starts with "OpenGL ES " or OpenGL ES-CM for older contexts, rest is the same
+		if(BackendType == BACKEND_TYPE_OPENGL_ES)
+		{
+			int StrLenGLES = str_length("OpenGL ES ");
+			int StrLenGLESCM = str_length("OpenGL ES-CM ");
+			if(str_comp_num(pStr, "OpenGL ES ", StrLenGLES) == 0)
+				pStr += StrLenGLES;
+			else if(str_comp_num(pStr, "OpenGL ES-CM ", StrLenGLESCM) == 0)
+				pStr += StrLenGLESCM;
+		}
+
+		char aCurNumberStr[32];
+		size_t CurNumberStrLen = 0;
+		size_t TotalNumbersPassed = 0;
+		int aNumbers[3] = {0};
+		bool LastWasNumber = false;
+		while(*pStr && TotalNumbersPassed < 3)
+		{
+			if(*pStr >= '0' && *pStr <= '9')
+			{
+				aCurNumberStr[CurNumberStrLen++] = (char)*pStr;
+				LastWasNumber = true;
+			}
+			else if(LastWasNumber && (*pStr == '.' || *pStr == ' '))
+			{
+				if(CurNumberStrLen > 0)
+				{
+					aCurNumberStr[CurNumberStrLen] = 0;
+					aNumbers[TotalNumbersPassed++] = str_toint(aCurNumberStr);
+					CurNumberStrLen = 0;
+				}
+
+				LastWasNumber = false;
+
+				if(*pStr != '.')
+					break;
+			}
+			else
+			{
+				break;
+			}
+
+			++pStr;
+		}
+
+		VersionMajor = aNumbers[0];
+		VersionMinor = aNumbers[1];
+		VersionPatch = aNumbers[2];
+	}
+}
+
+#ifndef BACKEND_AS_OPENGL_ES
+static const char *GetGLErrorName(GLenum Type)
+{
+	if(Type == GL_DEBUG_TYPE_ERROR)
+		return "ERROR";
+	else if(Type == GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR)
+		return "DEPRECATED BEHAVIOR";
+	else if(Type == GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR)
+		return "UNDEFINED BEHAVIOR";
+	else if(Type == GL_DEBUG_TYPE_PORTABILITY)
+		return "PORTABILITY";
+	else if(Type == GL_DEBUG_TYPE_PERFORMANCE)
+		return "PERFORMANCE";
+	else if(Type == GL_DEBUG_TYPE_OTHER)
+		return "OTHER";
+	else if(Type == GL_DEBUG_TYPE_MARKER)
+		return "MARKER";
+	else if(Type == GL_DEBUG_TYPE_PUSH_GROUP)
+		return "PUSH_GROUP";
+	else if(Type == GL_DEBUG_TYPE_POP_GROUP)
+		return "POP_GROUP";
+	return "UNKNOWN";
+};
+
+static const char *GetGLSeverity(GLenum Type)
+{
+	if(Type == GL_DEBUG_SEVERITY_HIGH)
+		return "high"; // All OpenGL Errors, shader compilation/linking errors, or highly-dangerous undefined behavior
+	else if(Type == GL_DEBUG_SEVERITY_MEDIUM)
+		return "medium"; // Major performance warnings, shader compilation/linking warnings, or the use of deprecated functionality
+	else if(Type == GL_DEBUG_SEVERITY_LOW)
+		return "low"; // Redundant state change performance warning, or unimportant undefined behavior
+	else if(Type == GL_DEBUG_SEVERITY_NOTIFICATION)
+		return "notification"; // Anything that isn't an error or performance issue.
+
+	return "unknown";
+}
+
+static void GLAPIENTRY
+GfxOpenGLMessageCallback(GLenum Source,
+	GLenum Type,
+	GLuint Id,
+	GLenum Severity,
+	GLsizei Length,
+	const GLchar *pMsg,
+	const void *pUserParam)
+{
+	dbg_msg("gfx", "[%s] (importance: %s) %s", GetGLErrorName(Type), GetGLSeverity(Severity), pMsg);
+}
+#endif
+
+bool CCommandProcessorFragment_OpenGL::GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData)
+{
+	if(m_CanvasWidth == 0 || m_CanvasHeight == 0)
+	{
+		return false;
+	}
+	else
+	{
+		Width = m_CanvasWidth;
+		Height = m_CanvasHeight;
+		Format = CImageInfo::FORMAT_RGBA;
+		vDstData.resize((size_t)Width * (Height + 1) * 4); // +1 for flipping image
+		glReadBuffer(GL_FRONT);
+		GLint Alignment;
+		glGetIntegerv(GL_PACK_ALIGNMENT, &Alignment);
+		glPixelStorei(GL_PACK_ALIGNMENT, 1);
+		glReadPixels(0, 0, m_CanvasWidth, m_CanvasHeight, GL_RGBA, GL_UNSIGNED_BYTE, vDstData.data());
+		glPixelStorei(GL_PACK_ALIGNMENT, Alignment);
+
+		uint8_t *pTempRow = vDstData.data() + Width * Height * 4;
+		for(uint32_t Y = 0; Y < Height / 2; ++Y)
+		{
+			mem_copy(pTempRow, vDstData.data() + Y * Width * 4, Width * 4);
+			mem_copy(vDstData.data() + Y * Width * 4, vDstData.data() + ((Height - Y) - 1) * Width * 4, Width * 4);
+			mem_copy(vDstData.data() + ((Height - Y) - 1) * Width * 4, pTempRow, Width * 4);
+		}
+
+		return true;
+	}
+}
+
+bool CCommandProcessorFragment_OpenGL::InitOpenGL(const SCommand_Init *pCommand)
+{
+	m_IsOpenGLES = pCommand->m_RequestedBackend == BACKEND_TYPE_OPENGL_ES;
+
+	TGLBackendReadPresentedImageData &ReadPresentedImgDataFunc = *pCommand->m_pReadPresentedImageDataFunc;
+	ReadPresentedImgDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) { return GetPresentedImageData(Width, Height, Format, vDstData); };
+
+	const char *pVendorString = (const char *)glGetString(GL_VENDOR);
+	dbg_msg("opengl", "Vendor string: %s", pVendorString);
+
+	// check what this context can do
+	const char *pVersionString = (const char *)glGetString(GL_VERSION);
+	dbg_msg("opengl", "Version string: %s", pVersionString);
+
+	const char *pRendererString = (const char *)glGetString(GL_RENDERER);
+
+	str_copy(pCommand->m_pVendorString, pVendorString, gs_GPUInfoStringSize);
+	str_copy(pCommand->m_pVersionString, pVersionString, gs_GPUInfoStringSize);
+	str_copy(pCommand->m_pRendererString, pRendererString, gs_GPUInfoStringSize);
+
+	// parse version string
+	ParseVersionString(pCommand->m_RequestedBackend, pVersionString, pCommand->m_pCapabilities->m_ContextMajor, pCommand->m_pCapabilities->m_ContextMinor, pCommand->m_pCapabilities->m_ContextPatch);
+
+	*pCommand->m_pInitError = 0;
+
+	int BlocklistMajor = -1, BlocklistMinor = -1, BlocklistPatch = -1;
+	bool RequiresWarning = false;
+	const char *pErrString = ParseBlocklistDriverVersions(pVendorString, pVersionString, BlocklistMajor, BlocklistMinor, BlocklistPatch, RequiresWarning);
+	// if the driver is buggy, and the requested GL version is the default, fallback
+	if(pErrString != NULL && pCommand->m_RequestedMajor == 3 && pCommand->m_RequestedMinor == 0 && pCommand->m_RequestedPatch == 0)
+	{
+		// if not already in the error state, set the GL version
+		if(g_Config.m_GfxDriverIsBlocked == 0)
+		{
+			// fallback to known good GL version
+			pCommand->m_pCapabilities->m_ContextMajor = BlocklistMajor;
+			pCommand->m_pCapabilities->m_ContextMinor = BlocklistMinor;
+			pCommand->m_pCapabilities->m_ContextPatch = BlocklistPatch;
+
+			// set backend error string
+			if(RequiresWarning)
+				*pCommand->m_pErrStringPtr = pErrString;
+			*pCommand->m_pInitError = -2;
+
+			g_Config.m_GfxDriverIsBlocked = 1;
+		}
+	}
+	// if the driver was in a blocked error state, but is not anymore, reset all config variables
+	else if(pErrString == NULL && g_Config.m_GfxDriverIsBlocked == 1)
+	{
+		pCommand->m_pCapabilities->m_ContextMajor = 3;
+		pCommand->m_pCapabilities->m_ContextMinor = 0;
+		pCommand->m_pCapabilities->m_ContextPatch = 0;
+
+		// tell the caller to reinitialize the context
+		*pCommand->m_pInitError = -2;
+
+		g_Config.m_GfxDriverIsBlocked = 0;
+	}
+
+	int MajorV = pCommand->m_pCapabilities->m_ContextMajor;
+
+	if(pCommand->m_RequestedBackend == BACKEND_TYPE_OPENGL)
+	{
+#ifndef BACKEND_AS_OPENGL_ES
+		int MinorV = pCommand->m_pCapabilities->m_ContextMinor;
+		if(*pCommand->m_pInitError == 0)
+		{
+			if(MajorV < pCommand->m_RequestedMajor)
+			{
+				*pCommand->m_pInitError = -2;
+			}
+			else if(MajorV == pCommand->m_RequestedMajor)
+			{
+				if(MinorV < pCommand->m_RequestedMinor)
+				{
+					*pCommand->m_pInitError = -2;
+				}
+				else if(MinorV == pCommand->m_RequestedMinor)
+				{
+					int PatchV = pCommand->m_pCapabilities->m_ContextPatch;
+					if(PatchV < pCommand->m_RequestedPatch)
+					{
+						*pCommand->m_pInitError = -2;
+					}
+				}
+			}
+		}
+
+		if(*pCommand->m_pInitError == 0)
+		{
+			MajorV = pCommand->m_RequestedMajor;
+			MinorV = pCommand->m_RequestedMinor;
+
+			pCommand->m_pCapabilities->m_2DArrayTexturesAsExtension = false;
+			pCommand->m_pCapabilities->m_NPOTTextures = true;
+			pCommand->m_pCapabilities->m_TrianglesAsQuads = false;
+
+			if(MajorV >= 4 || (MajorV == 3 && MinorV == 3))
+			{
+				pCommand->m_pCapabilities->m_TileBuffering = true;
+				pCommand->m_pCapabilities->m_QuadBuffering = true;
+				pCommand->m_pCapabilities->m_TextBuffering = true;
+				pCommand->m_pCapabilities->m_QuadContainerBuffering = true;
+				pCommand->m_pCapabilities->m_ShaderSupport = true;
+
+				pCommand->m_pCapabilities->m_MipMapping = true;
+				pCommand->m_pCapabilities->m_3DTextures = true;
+				pCommand->m_pCapabilities->m_2DArrayTextures = true;
+
+				pCommand->m_pCapabilities->m_TrianglesAsQuads = true;
+			}
+			else if(MajorV == 3)
+			{
+				pCommand->m_pCapabilities->m_MipMapping = true;
+				// check for context native 2D array texture size
+				pCommand->m_pCapabilities->m_3DTextures = false;
+				pCommand->m_pCapabilities->m_2DArrayTextures = false;
+				pCommand->m_pCapabilities->m_ShaderSupport = true;
+
+				int TextureLayers = 0;
+				glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &TextureLayers);
+				if(TextureLayers >= 256)
+				{
+					pCommand->m_pCapabilities->m_2DArrayTextures = true;
+				}
+
+				int Texture3DSize = 0;
+				glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &Texture3DSize);
+				if(Texture3DSize >= 256)
+				{
+					pCommand->m_pCapabilities->m_3DTextures = true;
+				}
+
+				if(!pCommand->m_pCapabilities->m_3DTextures && !pCommand->m_pCapabilities->m_2DArrayTextures)
+				{
+					*pCommand->m_pInitError = -2;
+					pCommand->m_pCapabilities->m_ContextMajor = 1;
+					pCommand->m_pCapabilities->m_ContextMinor = 5;
+					pCommand->m_pCapabilities->m_ContextPatch = 0;
+				}
+
+				pCommand->m_pCapabilities->m_TileBuffering = pCommand->m_pCapabilities->m_2DArrayTextures;
+				pCommand->m_pCapabilities->m_QuadBuffering = false;
+				pCommand->m_pCapabilities->m_TextBuffering = false;
+				pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
+			}
+			else if(MajorV == 2)
+			{
+				pCommand->m_pCapabilities->m_MipMapping = true;
+				// check for context extension: 2D array texture and its max size
+				pCommand->m_pCapabilities->m_3DTextures = false;
+				pCommand->m_pCapabilities->m_2DArrayTextures = false;
+
+				pCommand->m_pCapabilities->m_ShaderSupport = false;
+
+				int Texture3DSize = 0;
+				glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &Texture3DSize);
+				if(Texture3DSize >= 256)
+				{
+					pCommand->m_pCapabilities->m_3DTextures = true;
+				}
+
+				pCommand->m_pCapabilities->m_TileBuffering = false;
+				pCommand->m_pCapabilities->m_QuadBuffering = false;
+				pCommand->m_pCapabilities->m_TextBuffering = false;
+				pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
+
+				pCommand->m_pCapabilities->m_NPOTTextures = GLEW_ARB_texture_non_power_of_two || pCommand->m_GlewMajor > 2;
+
+				if(!pCommand->m_pCapabilities->m_NPOTTextures || (!pCommand->m_pCapabilities->m_3DTextures && !pCommand->m_pCapabilities->m_2DArrayTextures))
+				{
+					*pCommand->m_pInitError = -2;
+					pCommand->m_pCapabilities->m_ContextMajor = 1;
+					pCommand->m_pCapabilities->m_ContextMinor = 5;
+					pCommand->m_pCapabilities->m_ContextPatch = 0;
+				}
+			}
+			else if(MajorV < 2)
+			{
+				pCommand->m_pCapabilities->m_TileBuffering = false;
+				pCommand->m_pCapabilities->m_QuadBuffering = false;
+				pCommand->m_pCapabilities->m_TextBuffering = false;
+				pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
+				pCommand->m_pCapabilities->m_ShaderSupport = false;
+
+				pCommand->m_pCapabilities->m_MipMapping = false;
+				pCommand->m_pCapabilities->m_3DTextures = false;
+				pCommand->m_pCapabilities->m_2DArrayTextures = false;
+				pCommand->m_pCapabilities->m_NPOTTextures = false;
+			}
+		}
+#endif
+	}
+	else if(pCommand->m_RequestedBackend == BACKEND_TYPE_OPENGL_ES)
+	{
+		if(MajorV < 3)
+		{
+			pCommand->m_pCapabilities->m_TileBuffering = false;
+			pCommand->m_pCapabilities->m_QuadBuffering = false;
+			pCommand->m_pCapabilities->m_TextBuffering = false;
+			pCommand->m_pCapabilities->m_QuadContainerBuffering = false;
+			pCommand->m_pCapabilities->m_ShaderSupport = false;
+
+			pCommand->m_pCapabilities->m_MipMapping = false;
+			pCommand->m_pCapabilities->m_3DTextures = false;
+			pCommand->m_pCapabilities->m_2DArrayTextures = false;
+			pCommand->m_pCapabilities->m_NPOTTextures = false;
+
+			pCommand->m_pCapabilities->m_TrianglesAsQuads = false;
+		}
+		else
+		{
+			pCommand->m_pCapabilities->m_TileBuffering = true;
+			pCommand->m_pCapabilities->m_QuadBuffering = true;
+			pCommand->m_pCapabilities->m_TextBuffering = true;
+			pCommand->m_pCapabilities->m_QuadContainerBuffering = true;
+			pCommand->m_pCapabilities->m_ShaderSupport = true;
+
+			pCommand->m_pCapabilities->m_MipMapping = true;
+			pCommand->m_pCapabilities->m_3DTextures = true;
+			pCommand->m_pCapabilities->m_2DArrayTextures = true;
+			pCommand->m_pCapabilities->m_NPOTTextures = true;
+
+			pCommand->m_pCapabilities->m_TrianglesAsQuads = true;
+		}
+	}
+
+	if(*pCommand->m_pInitError != -2)
+	{
+		// set some default settings
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glDisable(GL_CULL_FACE);
+		glDisable(GL_DEPTH_TEST);
+
+#ifndef BACKEND_GL_MODERN_API
+		if(!IsNewApi())
+		{
+			glAlphaFunc(GL_GREATER, 0);
+			glEnable(GL_ALPHA_TEST);
+		}
+#endif
+
+		glDepthMask(0);
+
+#ifndef BACKEND_AS_OPENGL_ES
+		if(g_Config.m_DbgGfx != DEBUG_GFX_MODE_NONE)
+		{
+			if(GLEW_KHR_debug || GLEW_ARB_debug_output)
+			{
+				// During init, enable debug output
+				if(GLEW_KHR_debug)
+				{
+					glEnable(GL_DEBUG_OUTPUT);
+					glDebugMessageCallback((GLDEBUGPROC)GfxOpenGLMessageCallback, 0);
+				}
+				else if(GLEW_ARB_debug_output)
+				{
+					glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
+					glDebugMessageCallbackARB((GLDEBUGPROC)GfxOpenGLMessageCallback, 0);
+				}
+				dbg_msg("gfx", "Enabled OpenGL debug mode");
+			}
+			else
+				dbg_msg("gfx", "Requested OpenGL debug mode, but the driver does not support the required extension");
+		}
+#endif
+
+		return true;
+	}
+	else
+		return false;
+}
+
+bool CCommandProcessorFragment_OpenGL::Cmd_Init(const SCommand_Init *pCommand)
+{
+	if(!InitOpenGL(pCommand))
+		return false;
+
+	m_pTextureMemoryUsage = pCommand->m_pTextureMemoryUsage;
+	m_pTextureMemoryUsage->store(0, std::memory_order_relaxed);
+	m_MaxTexSize = -1;
+
+	m_OpenGLTextureLodBIAS = 0;
+
+	m_Has2DArrayTextures = pCommand->m_pCapabilities->m_2DArrayTextures;
+	if(pCommand->m_pCapabilities->m_2DArrayTexturesAsExtension)
+	{
+		m_Has2DArrayTexturesAsExtension = true;
+		m_2DArrayTarget = GL_TEXTURE_2D_ARRAY_EXT;
+	}
+	else
+	{
+		m_Has2DArrayTexturesAsExtension = false;
+		m_2DArrayTarget = GL_TEXTURE_2D_ARRAY;
+	}
+
+	m_Has3DTextures = pCommand->m_pCapabilities->m_3DTextures;
+	m_HasMipMaps = pCommand->m_pCapabilities->m_MipMapping;
+	m_HasNPOTTextures = pCommand->m_pCapabilities->m_NPOTTextures;
+
+	m_LastBlendMode = CCommandBuffer::BLEND_ALPHA;
+	m_LastClipEnable = false;
+
+	return true;
+}
+
+void CCommandProcessorFragment_OpenGL::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData)
+{
+	glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
+
+	if(!m_HasNPOTTextures)
+	{
+		float ResizeW = m_vTextures[Slot].m_ResizeWidth;
+		float ResizeH = m_vTextures[Slot].m_ResizeHeight;
+		if(ResizeW > 0 && ResizeH > 0)
+		{
+			int ResizedW = (int)(Width * ResizeW);
+			int ResizedH = (int)(Height * ResizeH);
+
+			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, ResizedW, ResizedH, GLFormatToPixelSize(GLFormat));
+			free(pTexData);
+			pTexData = pTmpData;
+
+			Width = ResizedW;
+			Height = ResizedH;
+		}
+	}
+
+	if(m_vTextures[Slot].m_RescaleCount > 0)
+	{
+		int OldWidth = Width;
+		int OldHeight = Height;
+		for(int i = 0; i < m_vTextures[Slot].m_RescaleCount; ++i)
+		{
+			Width >>= 1;
+			Height >>= 1;
+
+			X /= 2;
+			Y /= 2;
+		}
+
+		void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
+		free(pTexData);
+		pTexData = pTmpData;
+	}
+
+	glTexSubImage2D(GL_TEXTURE_2D, 0, X, Y, Width, Height, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+	free(pTexData);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
+{
+	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL::DestroyTexture(int Slot)
+{
+	m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) - m_vTextures[Slot].m_MemSize, std::memory_order_relaxed);
+
+	if(m_vTextures[Slot].m_Tex != 0)
+	{
+		glDeleteTextures(1, &m_vTextures[Slot].m_Tex);
+	}
+
+	if(m_vTextures[Slot].m_Tex2DArray != 0)
+	{
+		glDeleteTextures(1, &m_vTextures[Slot].m_Tex2DArray);
+	}
+
+	if(IsNewApi())
+	{
+		if(m_vTextures[Slot].m_Sampler != 0)
+		{
+			glDeleteSamplers(1, &m_vTextures[Slot].m_Sampler);
+		}
+		if(m_vTextures[Slot].m_Sampler2DArray != 0)
+		{
+			glDeleteSamplers(1, &m_vTextures[Slot].m_Sampler2DArray);
+		}
+	}
+
+	m_vTextures[Slot].m_Tex = 0;
+	m_vTextures[Slot].m_Sampler = 0;
+	m_vTextures[Slot].m_Tex2DArray = 0;
+	m_vTextures[Slot].m_Sampler2DArray = 0;
+	m_vTextures[Slot].m_LastWrapMode = CCommandBuffer::WRAP_REPEAT;
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand)
+{
+	DestroyTexture(pCommand->m_Slot);
+}
+
+void CCommandProcessorFragment_OpenGL::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData)
+{
+#ifndef BACKEND_GL_MODERN_API
+
+	if(m_MaxTexSize == -1)
+	{
+		// fix the alignment to allow even 1byte changes, e.g. for alpha components
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_MaxTexSize);
+	}
+
+	while(Slot >= (int)m_vTextures.size())
+		m_vTextures.resize(m_vTextures.size() * 2);
+
+	m_vTextures[Slot].m_ResizeWidth = -1.f;
+	m_vTextures[Slot].m_ResizeHeight = -1.f;
+
+	if(!m_HasNPOTTextures)
+	{
+		int PowerOfTwoWidth = HighestBit(Width);
+		int PowerOfTwoHeight = HighestBit(Height);
+		if(Width != PowerOfTwoWidth || Height != PowerOfTwoHeight)
+		{
+			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, PowerOfTwoWidth, PowerOfTwoHeight, GLFormatToPixelSize(GLFormat));
+			free(pTexData);
+			pTexData = pTmpData;
+
+			m_vTextures[Slot].m_ResizeWidth = (float)PowerOfTwoWidth / (float)Width;
+			m_vTextures[Slot].m_ResizeHeight = (float)PowerOfTwoHeight / (float)Height;
+
+			Width = PowerOfTwoWidth;
+			Height = PowerOfTwoHeight;
+		}
+	}
+
+	int RescaleCount = 0;
+	if(GLFormat == GL_RGBA)
+	{
+		int OldWidth = Width;
+		int OldHeight = Height;
+		bool NeedsResize = false;
+
+		if(Width > m_MaxTexSize || Height > m_MaxTexSize)
+		{
+			do
+			{
+				Width >>= 1;
+				Height >>= 1;
+				++RescaleCount;
+			} while(Width > m_MaxTexSize || Height > m_MaxTexSize);
+			NeedsResize = true;
+		}
+
+		if(NeedsResize)
+		{
+			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), OldWidth, OldHeight, Width, Height, GLFormatToPixelSize(GLFormat));
+			free(pTexData);
+			pTexData = pTmpData;
+		}
+	}
+	m_vTextures[Slot].m_Width = Width;
+	m_vTextures[Slot].m_Height = Height;
+	m_vTextures[Slot].m_RescaleCount = RescaleCount;
+
+	const size_t PixelSize = GLFormatToPixelSize(GLFormat);
+
+	if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+	{
+		glGenTextures(1, &m_vTextures[Slot].m_Tex);
+		glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
+	}
+
+	if(Flags & CCommandBuffer::TEXFLAG_NOMIPMAPS || !m_HasMipMaps)
+	{
+		if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+		{
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexImage2D(GL_TEXTURE_2D, 0, GLStoreFormat, Width, Height, 0, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+		}
+	}
+	else
+	{
+		if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+		{
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+
+#ifndef BACKEND_AS_OPENGL_ES
+			if(m_OpenGLTextureLodBIAS != 0 && !m_IsOpenGLES)
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
+#endif
+
+			glTexImage2D(GL_TEXTURE_2D, 0, GLStoreFormat, Width, Height, 0, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+		}
+
+		int Flag2DArrayTexture = CCommandBuffer::TEXFLAG_TO_2D_ARRAY_TEXTURE;
+		int Flag3DTexture = CCommandBuffer::TEXFLAG_TO_3D_TEXTURE;
+		if((Flags & (Flag2DArrayTexture | Flag3DTexture)) != 0)
+		{
+			bool Is3DTexture = (Flags & Flag3DTexture) != 0;
+
+			glGenTextures(1, &m_vTextures[Slot].m_Tex2DArray);
+
+			GLenum Target = GL_TEXTURE_3D;
+
+			if(Is3DTexture)
+			{
+				Target = GL_TEXTURE_3D;
+			}
+			else
+			{
+				Target = m_2DArrayTarget;
+			}
+
+			glBindTexture(Target, m_vTextures[Slot].m_Tex2DArray);
+
+			if(IsNewApi())
+			{
+				glGenSamplers(1, &m_vTextures[Slot].m_Sampler2DArray);
+				glBindSampler(0, m_vTextures[Slot].m_Sampler2DArray);
+			}
+
+			glTexParameteri(Target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			if(Is3DTexture)
+			{
+				glTexParameteri(Target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+				if(IsNewApi())
+					glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			}
+			else
+			{
+				glTexParameteri(Target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+				glTexParameteri(Target, GL_GENERATE_MIPMAP, GL_TRUE);
+				if(IsNewApi())
+					glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			}
+
+			glTexParameteri(Target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			glTexParameteri(Target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			glTexParameteri(Target, GL_TEXTURE_WRAP_R, GL_MIRRORED_REPEAT);
+
+#ifndef BACKEND_AS_OPENGL_ES
+			if(m_OpenGLTextureLodBIAS != 0 && !m_IsOpenGLES)
+				glTexParameterf(Target, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
+#endif
+
+			if(IsNewApi())
+			{
+				glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+				glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+				glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_R, GL_MIRRORED_REPEAT);
+
+#ifndef BACKEND_AS_OPENGL_ES
+				if(m_OpenGLTextureLodBIAS != 0 && !m_IsOpenGLES)
+					glSamplerParameterf(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
+#endif
+
+				glBindSampler(0, 0);
+			}
+
+			uint8_t *p3DImageData = NULL;
+
+			p3DImageData = (uint8_t *)malloc((size_t)Width * Height * PixelSize);
+			int Image3DWidth, Image3DHeight;
+
+			int ConvertWidth = Width;
+			int ConvertHeight = Height;
+
+			if(ConvertWidth == 0 || (ConvertWidth % 16) != 0 || ConvertHeight == 0 || (ConvertHeight % 16) != 0)
+			{
+				dbg_msg("gfx", "3D/2D array texture was resized");
+				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
+				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
+				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
+
+				ConvertWidth = NewWidth;
+				ConvertHeight = NewHeight;
+
+				free(pTexData);
+				pTexData = pNewTexData;
+			}
+
+			if((Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight)))
+			{
+				glTexImage3D(Target, 0, GLStoreFormat, Image3DWidth, Image3DHeight, 256, 0, GLFormat, GL_UNSIGNED_BYTE, p3DImageData);
+			}
+
+			free(p3DImageData);
+		}
+	}
+
+	// This is the initial value for the wrap modes
+	m_vTextures[Slot].m_LastWrapMode = CCommandBuffer::WRAP_REPEAT;
+
+	// calculate memory usage
+	m_vTextures[Slot].m_MemSize = (size_t)Width * Height * PixelSize;
+	while(Width > 2 && Height > 2)
+	{
+		Width >>= 1;
+		Height >>= 1;
+		m_vTextures[Slot].m_MemSize += (size_t)Width * Height * PixelSize;
+	}
+	m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) + m_vTextures[Slot].m_MemSize, std::memory_order_relaxed);
+
+	free(pTexData);
+#endif
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
+{
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), TexFormatToOpenGLFormat(pCommand->m_StoreFormat), pCommand->m_Flags, pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
+{
+	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, GL_ALPHA, pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_TextTextures_Destroy(const CCommandBuffer::SCommand_TextTextures_Destroy *pCommand)
+{
+	DestroyTexture(pCommand->m_Slot);
+	DestroyTexture(pCommand->m_SlotOutline);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand)
+{
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, GL_ALPHA, GL_ALPHA, CCommandBuffer::TEXFLAG_NOMIPMAPS, pCommand->m_pTextData);
+	TextureCreate(pCommand->m_SlotOutline, pCommand->m_Width, pCommand->m_Height, GL_ALPHA, GL_ALPHA, CCommandBuffer::TEXFLAG_NOMIPMAPS, pCommand->m_pTextOutlineData);
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand)
+{
+	// if clip is still active, force disable it for clearing, enable it again afterwards
+	bool ClipWasEnabled = m_LastClipEnable;
+	if(ClipWasEnabled)
+	{
+		glDisable(GL_SCISSOR_TEST);
+	}
+	glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	if(ClipWasEnabled)
+	{
+		glEnable(GL_SCISSOR_TEST);
+	}
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand)
+{
+#ifndef BACKEND_GL_MODERN_API
+	SetState(pCommand->m_State);
+
+	glVertexPointer(2, GL_FLOAT, sizeof(CCommandBuffer::SVertex), (char *)pCommand->m_pVertices);
+	glTexCoordPointer(2, GL_FLOAT, sizeof(CCommandBuffer::SVertex), (char *)pCommand->m_pVertices + sizeof(float) * 2);
+	glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(CCommandBuffer::SVertex), (char *)pCommand->m_pVertices + sizeof(float) * 4);
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+
+	switch(pCommand->m_PrimType)
+	{
+	case CCommandBuffer::PRIMTYPE_QUADS:
+#ifndef BACKEND_AS_OPENGL_ES
+		glDrawArrays(GL_QUADS, 0, pCommand->m_PrimCount * 4);
+#endif
+		break;
+	case CCommandBuffer::PRIMTYPE_LINES:
+		glDrawArrays(GL_LINES, 0, pCommand->m_PrimCount * 2);
+		break;
+	case CCommandBuffer::PRIMTYPE_TRIANGLES:
+		glDrawArrays(GL_TRIANGLES, 0, pCommand->m_PrimCount * 3);
+		break;
+	default:
+		dbg_msg("render", "unknown primtype %d\n", pCommand->m_PrimType);
+	};
+#endif
+}
+
+void CCommandProcessorFragment_OpenGL::Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand)
+{
+	*pCommand->m_pSwapped = false;
+
+	// fetch image data
+	GLint aViewport[4] = {0, 0, 0, 0};
+	glGetIntegerv(GL_VIEWPORT, aViewport);
+
+	int w = aViewport[2];
+	int h = aViewport[3];
+
+	// we allocate one more row to use when we are flipping the texture
+	unsigned char *pPixelData = (unsigned char *)malloc((size_t)w * (h + 1) * 4);
+	unsigned char *pTempRow = pPixelData + w * h * 4;
+
+	// fetch the pixels
+	GLint Alignment;
+	glGetIntegerv(GL_PACK_ALIGNMENT, &Alignment);
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+	glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pPixelData);
+	glPixelStorei(GL_PACK_ALIGNMENT, Alignment);
+
+	// flip the pixel because opengl works from bottom left corner
+	for(int y = 0; y < h / 2; y++)
+	{
+		mem_copy(pTempRow, pPixelData + y * w * 4, w * 4);
+		mem_copy(pPixelData + y * w * 4, pPixelData + (h - y - 1) * w * 4, w * 4);
+		mem_copy(pPixelData + (h - y - 1) * w * 4, pTempRow, w * 4);
+		for(int x = 0; x < w; x++)
+		{
+			pPixelData[y * w * 4 + x * 4 + 3] = 255;
+			pPixelData[(h - y - 1) * w * 4 + x * 4 + 3] = 255;
+		}
+	}
+
+	// fill in the information
+	pCommand->m_pImage->m_Width = w;
+	pCommand->m_pImage->m_Height = h;
+	pCommand->m_pImage->m_Format = CImageInfo::FORMAT_RGBA;
+	pCommand->m_pImage->m_pData = pPixelData;
+}
+
+CCommandProcessorFragment_OpenGL::CCommandProcessorFragment_OpenGL()
+{
+	m_vTextures.resize(CCommandBuffer::MAX_TEXTURES);
+	m_HasShaders = false;
+}
+
+ERunCommandReturnTypes CCommandProcessorFragment_OpenGL::RunCommand(const CCommandBuffer::SCommand *pBaseCommand)
+{
+	switch(pBaseCommand->m_Cmd)
+	{
+	case CCommandProcessorFragment_OpenGL::CMD_INIT:
+		Cmd_Init(static_cast<const SCommand_Init *>(pBaseCommand));
+		break;
+	case CCommandProcessorFragment_OpenGL::CMD_SHUTDOWN:
+		Cmd_Shutdown(static_cast<const SCommand_Shutdown *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXTURE_CREATE:
+		Cmd_Texture_Create(static_cast<const CCommandBuffer::SCommand_Texture_Create *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXTURE_DESTROY:
+		Cmd_Texture_Destroy(static_cast<const CCommandBuffer::SCommand_Texture_Destroy *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXTURE_UPDATE:
+		Cmd_Texture_Update(static_cast<const CCommandBuffer::SCommand_Texture_Update *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXT_TEXTURES_CREATE:
+		Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXT_TEXTURES_DESTROY:
+		Cmd_TextTextures_Destroy(static_cast<const CCommandBuffer::SCommand_TextTextures_Destroy *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TEXT_TEXTURE_UPDATE:
+		Cmd_TextTexture_Update(static_cast<const CCommandBuffer::SCommand_TextTexture_Update *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_CLEAR:
+		Cmd_Clear(static_cast<const CCommandBuffer::SCommand_Clear *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_RENDER:
+		Cmd_Render(static_cast<const CCommandBuffer::SCommand_Render *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_RENDER_TEX3D:
+		Cmd_RenderTex3D(static_cast<const CCommandBuffer::SCommand_RenderTex3D *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_TRY_SWAP_AND_SCREENSHOT:
+		Cmd_Screenshot(static_cast<const CCommandBuffer::SCommand_TrySwapAndScreenshot *>(pBaseCommand));
+		break;
+	case CCommandBuffer::CMD_UPDATE_VIEWPORT:
+		Cmd_Update_Viewport(static_cast<const CCommandBuffer::SCommand_Update_Viewport *>(pBaseCommand));
+		break;
+
+	case CCommandBuffer::CMD_CREATE_BUFFER_OBJECT: Cmd_CreateBufferObject(static_cast<const CCommandBuffer::SCommand_CreateBufferObject *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_UPDATE_BUFFER_OBJECT: Cmd_UpdateBufferObject(static_cast<const CCommandBuffer::SCommand_UpdateBufferObject *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RECREATE_BUFFER_OBJECT: Cmd_RecreateBufferObject(static_cast<const CCommandBuffer::SCommand_RecreateBufferObject *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_COPY_BUFFER_OBJECT: Cmd_CopyBufferObject(static_cast<const CCommandBuffer::SCommand_CopyBufferObject *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_DELETE_BUFFER_OBJECT: Cmd_DeleteBufferObject(static_cast<const CCommandBuffer::SCommand_DeleteBufferObject *>(pBaseCommand)); break;
+
+	case CCommandBuffer::CMD_CREATE_BUFFER_CONTAINER: Cmd_CreateBufferContainer(static_cast<const CCommandBuffer::SCommand_CreateBufferContainer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_UPDATE_BUFFER_CONTAINER: Cmd_UpdateBufferContainer(static_cast<const CCommandBuffer::SCommand_UpdateBufferContainer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_DELETE_BUFFER_CONTAINER: Cmd_DeleteBufferContainer(static_cast<const CCommandBuffer::SCommand_DeleteBufferContainer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_INDICES_REQUIRED_NUM_NOTIFY: Cmd_IndicesRequiredNumNotify(static_cast<const CCommandBuffer::SCommand_IndicesRequiredNumNotify *>(pBaseCommand)); break;
+
+	case CCommandBuffer::CMD_RENDER_TILE_LAYER: Cmd_RenderTileLayer(static_cast<const CCommandBuffer::SCommand_RenderTileLayer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_BORDER_TILE: Cmd_RenderBorderTile(static_cast<const CCommandBuffer::SCommand_RenderBorderTile *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_QUAD_LAYER: Cmd_RenderQuadLayer(static_cast<const CCommandBuffer::SCommand_RenderQuadLayer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_TEXT: Cmd_RenderText(static_cast<const CCommandBuffer::SCommand_RenderText *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_QUAD_CONTAINER: Cmd_RenderQuadContainer(static_cast<const CCommandBuffer::SCommand_RenderQuadContainer *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_QUAD_CONTAINER_EX: Cmd_RenderQuadContainerEx(static_cast<const CCommandBuffer::SCommand_RenderQuadContainerEx *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_RENDER_QUAD_CONTAINER_SPRITE_MULTIPLE: Cmd_RenderQuadContainerAsSpriteMultiple(static_cast<const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *>(pBaseCommand)); break;
+	default: return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_UNHANDLED;
+	}
+
+	return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_HANDLED;
+}
+
+// ------------ CCommandProcessorFragment_OpenGL2
+
+void CCommandProcessorFragment_OpenGL2::UseProgram(CGLSLTWProgram *pProgram)
+{
+	pProgram->UseProgram();
+}
+
+void CCommandProcessorFragment_OpenGL2::SetState(const CCommandBuffer::SState &State, CGLSLTWProgram *pProgram, bool Use2DArrayTextures)
+{
+	if(m_LastBlendMode == CCommandBuffer::BLEND_NONE)
+	{
+		m_LastBlendMode = CCommandBuffer::BLEND_ALPHA;
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	if(State.m_BlendMode != m_LastBlendMode && State.m_BlendMode != CCommandBuffer::BLEND_NONE)
+	{
+		// blend
+		switch(State.m_BlendMode)
+		{
+		case CCommandBuffer::BLEND_NONE:
+			// We don't really need this anymore
+			// glDisable(GL_BLEND);
+			break;
+		case CCommandBuffer::BLEND_ALPHA:
+			// glEnable(GL_BLEND);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			break;
+		case CCommandBuffer::BLEND_ADDITIVE:
+			// glEnable(GL_BLEND);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+			break;
+		default:
+			dbg_msg("render", "unknown blendmode %d\n", State.m_BlendMode);
+		};
+
+		m_LastBlendMode = State.m_BlendMode;
+	}
+
+	// clip
+	if(State.m_ClipEnable)
+	{
+		glScissor(State.m_ClipX, State.m_ClipY, State.m_ClipW, State.m_ClipH);
+		glEnable(GL_SCISSOR_TEST);
+		m_LastClipEnable = true;
+	}
+	else if(m_LastClipEnable)
+	{
+		// Don't disable it always
+		glDisable(GL_SCISSOR_TEST);
+		m_LastClipEnable = false;
+	}
+
+	if(!IsNewApi())
+	{
+		glDisable(GL_TEXTURE_2D);
+		if(!m_HasShaders)
+		{
+			if(m_Has3DTextures)
+				glDisable(GL_TEXTURE_3D);
+			if(m_Has2DArrayTextures)
+			{
+				glDisable(m_2DArrayTarget);
+			}
+		}
+	}
+
+	// texture
+	if(IsTexturedState(State))
+	{
+		int Slot = 0;
+		if(!Use2DArrayTextures)
+		{
+			if(!IsNewApi() && !m_HasShaders)
+				glEnable(GL_TEXTURE_2D);
+			glBindTexture(GL_TEXTURE_2D, m_vTextures[State.m_Texture].m_Tex);
+			if(IsNewApi())
+				glBindSampler(Slot, m_vTextures[State.m_Texture].m_Sampler);
+		}
+		else
+		{
+			if(!m_Has2DArrayTextures)
+			{
+				if(!IsNewApi() && !m_HasShaders)
+					glEnable(GL_TEXTURE_3D);
+				glBindTexture(GL_TEXTURE_3D, m_vTextures[State.m_Texture].m_Tex2DArray);
+				if(IsNewApi())
+					glBindSampler(Slot, m_vTextures[State.m_Texture].m_Sampler2DArray);
+			}
+			else
+			{
+				if(!IsNewApi() && !m_HasShaders)
+					glEnable(m_2DArrayTarget);
+				glBindTexture(m_2DArrayTarget, m_vTextures[State.m_Texture].m_Tex2DArray);
+				if(IsNewApi())
+					glBindSampler(Slot, m_vTextures[State.m_Texture].m_Sampler2DArray);
+			}
+		}
+
+		if(pProgram->m_LastTextureSampler != Slot)
+		{
+			pProgram->SetUniform(pProgram->m_LocTextureSampler, Slot);
+			pProgram->m_LastTextureSampler = Slot;
+		}
+
+		if(m_vTextures[State.m_Texture].m_LastWrapMode != State.m_WrapMode && !Use2DArrayTextures)
+		{
+			switch(State.m_WrapMode)
+			{
+			case CCommandBuffer::WRAP_REPEAT:
+				if(IsNewApi())
+				{
+					glSamplerParameteri(m_vTextures[State.m_Texture].m_Sampler, GL_TEXTURE_WRAP_S, GL_REPEAT);
+					glSamplerParameteri(m_vTextures[State.m_Texture].m_Sampler, GL_TEXTURE_WRAP_T, GL_REPEAT);
+				}
+				break;
+			case CCommandBuffer::WRAP_CLAMP:
+				if(IsNewApi())
+				{
+					glSamplerParameteri(m_vTextures[State.m_Texture].m_Sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+					glSamplerParameteri(m_vTextures[State.m_Texture].m_Sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+				}
+				break;
+			default:
+				dbg_msg("render", "unknown wrapmode %d\n", State.m_WrapMode);
+			};
+			m_vTextures[State.m_Texture].m_LastWrapMode = State.m_WrapMode;
+		}
+	}
+
+	if(pProgram->m_LastScreenTL != State.m_ScreenTL || pProgram->m_LastScreenBR != State.m_ScreenBR)
+	{
+		pProgram->m_LastScreenTL = State.m_ScreenTL;
+		pProgram->m_LastScreenBR = State.m_ScreenBR;
+
+		// screen mapping
+		// orthographic projection matrix
+		// the z coordinate is the same for every vertex, so just ignore the z coordinate and set it in the shaders
+		float m[2 * 4] = {
+			2.f / (State.m_ScreenBR.x - State.m_ScreenTL.x),
+			0,
+			0,
+			-((State.m_ScreenBR.x + State.m_ScreenTL.x) / (State.m_ScreenBR.x - State.m_ScreenTL.x)),
+			0,
+			(2.f / (State.m_ScreenTL.y - State.m_ScreenBR.y)),
+			0,
+			-((State.m_ScreenTL.y + State.m_ScreenBR.y) / (State.m_ScreenTL.y - State.m_ScreenBR.y)),
+		};
+
+		// transpose bcs of column-major order of opengl
+		glUniformMatrix4x2fv(pProgram->m_LocPos, 1, true, (float *)&m);
+	}
+}
+
+#ifndef BACKEND_GL_MODERN_API
+bool CCommandProcessorFragment_OpenGL2::DoAnalyzeStep(size_t CheckCount, size_t VerticesCount, uint8_t aFakeTexture[], size_t SingleImageSize)
+{
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	int Slot = 0;
+	if(m_HasShaders)
+	{
+		CGLSLTWProgram *pProgram = m_pPrimitive3DProgramTextured;
+		UseProgram(pProgram);
+
+		pProgram->SetUniform(pProgram->m_LocTextureSampler, Slot);
+
+		float m[2 * 4] = {
+			1, 0, 0, 0,
+			0, 1, 0, 0};
+
+		// transpose bcs of column-major order of opengl
+		glUniformMatrix4x2fv(pProgram->m_LocPos, 1, true, (float *)&m);
+	}
+	else
+	{
+		glMatrixMode(GL_PROJECTION);
+		glLoadIdentity();
+		glOrtho(-1, 1, -1, 1, -10.0f, 10.f);
+	}
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	glVertexPointer(2, GL_FLOAT, sizeof(m_aStreamVertices[0]), m_aStreamVertices);
+	glColorPointer(4, GL_FLOAT, sizeof(m_aStreamVertices[0]), (uint8_t *)m_aStreamVertices + (ptrdiff_t)(sizeof(vec2)));
+	glTexCoordPointer(3, GL_FLOAT, sizeof(m_aStreamVertices[0]), (uint8_t *)m_aStreamVertices + (ptrdiff_t)(sizeof(vec2) + sizeof(vec4)));
+
+	glDrawArrays(GL_QUADS, 0, VerticesCount);
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	if(m_HasShaders)
+	{
+		glUseProgram(0);
+	}
+
+	glFinish();
+
+	GLint aViewport[4] = {0, 0, 0, 0};
+	glGetIntegerv(GL_VIEWPORT, aViewport);
+
+	int w = aViewport[2];
+	int h = aViewport[3];
+
+	size_t PixelDataSize = (size_t)w * h * 3;
+	if(PixelDataSize == 0)
+		return false;
+	uint8_t *pPixelData = (uint8_t *)malloc(PixelDataSize);
+
+	// fetch the pixels
+	GLint Alignment;
+	glGetIntegerv(GL_PACK_ALIGNMENT, &Alignment);
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+	glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, pPixelData);
+	glPixelStorei(GL_PACK_ALIGNMENT, Alignment);
+
+	// now analyse the image data
+	bool CheckFailed = false;
+	int WidthTile = w / 16;
+	int HeightTile = h / 16;
+	int StartX = WidthTile / 2;
+	int StartY = HeightTile / 2;
+	for(size_t d = 0; d < CheckCount; ++d)
+	{
+		int CurX = (int)d % 16;
+		int CurY = (int)d / 16;
+
+		int CheckX = StartX + CurX * WidthTile;
+		int CheckY = StartY + CurY * HeightTile;
+
+		ptrdiff_t OffsetPixelData = (CheckY * (w * 3)) + (CheckX * 3);
+		ptrdiff_t OffsetFakeTexture = SingleImageSize * d;
+		OffsetPixelData = clamp<ptrdiff_t>(OffsetPixelData, 0, (ptrdiff_t)PixelDataSize);
+		OffsetFakeTexture = clamp<ptrdiff_t>(OffsetFakeTexture, 0, (ptrdiff_t)(SingleImageSize * CheckCount));
+		uint8_t *pPixel = pPixelData + OffsetPixelData;
+		uint8_t *pPixelTex = aFakeTexture + OffsetFakeTexture;
+		for(size_t i = 0; i < 3; ++i)
+		{
+			if((pPixel[i] < pPixelTex[i] - 25) || (pPixel[i] > pPixelTex[i] + 25))
+			{
+				CheckFailed = true;
+				break;
+			}
+		}
+	}
+
+	free(pPixelData);
+	return !CheckFailed;
+}
+
+bool CCommandProcessorFragment_OpenGL2::IsTileMapAnalysisSucceeded()
+{
+	glClearColor(0, 0, 0, 1);
+
+	// create fake texture 1024x1024
+	const size_t ImageWidth = 1024;
+	const size_t ImageHeight = 1024;
+	uint8_t *pFakeTexture = (uint8_t *)malloc(sizeof(uint8_t) * ImageWidth * ImageHeight * 4);
+	// fill by colors stepping by 50 => (255 / 50 ~ 5) => 5 times 3(color channels) = 5 ^ 3 = 125 possibilities to check
+	size_t CheckCount = 5 * 5 * 5;
+	// always fill 4 pixels of the texture, so the sampling is accurate
+	int aCurColor[4] = {25, 25, 25, 255};
+	const size_t SingleImageWidth = 64;
+	const size_t SingleImageHeight = 64;
+	size_t SingleImageSize = SingleImageWidth * SingleImageHeight * 4;
+	for(size_t d = 0; d < CheckCount; ++d)
+	{
+		uint8_t *pCurFakeTexture = pFakeTexture + (ptrdiff_t)(SingleImageSize * d);
+
+		uint8_t aCurColorUint8[SingleImageWidth * SingleImageHeight * 4];
+		for(size_t y = 0; y < SingleImageHeight; ++y)
+		{
+			for(size_t x = 0; x < SingleImageWidth; ++x)
+			{
+				for(size_t i = 0; i < 4; ++i)
+				{
+					aCurColorUint8[(y * SingleImageWidth * 4) + (x * 4) + i] = (uint8_t)aCurColor[i];
+				}
+			}
+		}
+		mem_copy(pCurFakeTexture, aCurColorUint8, sizeof(aCurColorUint8));
+
+		aCurColor[2] += 50;
+		if(aCurColor[2] > 225)
+		{
+			aCurColor[2] -= 250;
+			aCurColor[1] += 50;
+		}
+		if(aCurColor[1] > 225)
+		{
+			aCurColor[1] -= 250;
+			aCurColor[0] += 50;
+		}
+		if(aCurColor[0] > 225)
+		{
+			break;
+		}
+	}
+
+	// upload the texture
+	GLuint FakeTexture;
+	glGenTextures(1, &FakeTexture);
+
+	GLenum Target = GL_TEXTURE_3D;
+	if(m_Has2DArrayTextures)
+	{
+		Target = m_2DArrayTarget;
+	}
+
+	glBindTexture(Target, FakeTexture);
+	glTexParameteri(Target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	if(!m_Has2DArrayTextures)
+	{
+		glTexParameteri(Target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	}
+	else
+	{
+		glTexParameteri(Target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+		glTexParameteri(Target, GL_GENERATE_MIPMAP, GL_TRUE);
+	}
+
+	glTexParameteri(Target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(Target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(Target, GL_TEXTURE_WRAP_R, GL_MIRRORED_REPEAT);
+
+	glTexImage3D(Target, 0, GL_RGBA, ImageWidth / 16, ImageHeight / 16, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, pFakeTexture);
+
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_SCISSOR_TEST);
+
+	if(!m_HasShaders)
+	{
+		glDisable(GL_TEXTURE_2D);
+		if(m_Has3DTextures)
+			glDisable(GL_TEXTURE_3D);
+		if(m_Has2DArrayTextures)
+		{
+			glDisable(m_2DArrayTarget);
+		}
+
+		if(!m_Has2DArrayTextures)
+		{
+			glEnable(GL_TEXTURE_3D);
+			glBindTexture(GL_TEXTURE_3D, FakeTexture);
+		}
+		else
+		{
+			glEnable(m_2DArrayTarget);
+			glBindTexture(m_2DArrayTarget, FakeTexture);
+		}
+	}
+
+	static_assert(sizeof(m_aStreamVertices) / sizeof(m_aStreamVertices[0]) >= 256 * 4, "Keep the number of stream vertices >= 256 * 4.");
+
+	size_t VertexCount = 0;
+	for(size_t i = 0; i < CheckCount; ++i)
+	{
+		float XPos = (float)(i % 16);
+		float YPos = (float)(i / 16);
+
+		GL_SVertexTex3D *pVertex = &m_aStreamVertices[VertexCount++];
+		GL_SVertexTex3D *pVertexBefore = pVertex;
+		pVertex->m_Pos.x = XPos / 16.f;
+		pVertex->m_Pos.y = YPos / 16.f;
+		pVertex->m_Color.r = 1;
+		pVertex->m_Color.g = 1;
+		pVertex->m_Color.b = 1;
+		pVertex->m_Color.a = 1;
+		pVertex->m_Tex.u = 0;
+		pVertex->m_Tex.v = 0;
+
+		pVertex = &m_aStreamVertices[VertexCount++];
+		pVertex->m_Pos.x = XPos / 16.f + 1.f / 16.f;
+		pVertex->m_Pos.y = YPos / 16.f;
+		pVertex->m_Color.r = 1;
+		pVertex->m_Color.g = 1;
+		pVertex->m_Color.b = 1;
+		pVertex->m_Color.a = 1;
+		pVertex->m_Tex.u = 1;
+		pVertex->m_Tex.v = 0;
+
+		pVertex = &m_aStreamVertices[VertexCount++];
+		pVertex->m_Pos.x = XPos / 16.f + 1.f / 16.f;
+		pVertex->m_Pos.y = YPos / 16.f + 1.f / 16.f;
+		pVertex->m_Color.r = 1;
+		pVertex->m_Color.g = 1;
+		pVertex->m_Color.b = 1;
+		pVertex->m_Color.a = 1;
+		pVertex->m_Tex.u = 1;
+		pVertex->m_Tex.v = 1;
+
+		pVertex = &m_aStreamVertices[VertexCount++];
+		pVertex->m_Pos.x = XPos / 16.f;
+		pVertex->m_Pos.y = YPos / 16.f + 1.f / 16.f;
+		pVertex->m_Color.r = 1;
+		pVertex->m_Color.g = 1;
+		pVertex->m_Color.b = 1;
+		pVertex->m_Color.a = 1;
+		pVertex->m_Tex.u = 0;
+		pVertex->m_Tex.v = 1;
+
+		for(size_t n = 0; n < 4; ++n)
+		{
+			pVertexBefore[n].m_Pos.x *= 2;
+			pVertexBefore[n].m_Pos.x -= 1;
+			pVertexBefore[n].m_Pos.y *= 2;
+			pVertexBefore[n].m_Pos.y -= 1;
+			if(m_Has2DArrayTextures)
+			{
+				pVertexBefore[n].m_Tex.w = i;
+			}
+			else
+			{
+				pVertexBefore[n].m_Tex.w = (i + 0.5f) / 256.f;
+			}
+		}
+	}
+
+	// everything build up, now do the analyze steps
+	bool NoError = DoAnalyzeStep(CheckCount, VertexCount, pFakeTexture, SingleImageSize);
+
+	glDeleteTextures(1, &FakeTexture);
+	free(pFakeTexture);
+
+	return NoError;
+}
+
+bool CCommandProcessorFragment_OpenGL2::Cmd_Init(const SCommand_Init *pCommand)
+{
+	if(!CCommandProcessorFragment_OpenGL::Cmd_Init(pCommand))
+		return false;
+
+	m_pTileProgram = nullptr;
+	m_pTileProgramTextured = nullptr;
+	m_pPrimitive3DProgram = nullptr;
+	m_pPrimitive3DProgramTextured = nullptr;
+
+	m_OpenGLTextureLodBIAS = g_Config.m_GfxGLTextureLODBIAS;
+
+	m_HasShaders = pCommand->m_pCapabilities->m_ShaderSupport;
+
+	bool HasAllFunc = true;
+#ifndef BACKEND_AS_OPENGL_ES
+	if(m_HasShaders)
+	{
+		HasAllFunc &= (glUniformMatrix4x2fv != NULL) && (glGenBuffers != NULL);
+		HasAllFunc &= (glBindBuffer != NULL) && (glBufferData != NULL);
+		HasAllFunc &= (glEnableVertexAttribArray != NULL) && (glVertexAttribPointer != NULL) && (glVertexAttribIPointer != NULL);
+		HasAllFunc &= (glDisableVertexAttribArray != NULL) && (glDeleteBuffers != NULL);
+		HasAllFunc &= (glUseProgram != NULL) && (glTexImage3D != NULL);
+		HasAllFunc &= (glBindAttribLocation != NULL) && (glTexImage3D != NULL);
+		HasAllFunc &= (glBufferSubData != NULL) && (glGetUniformLocation != NULL);
+		HasAllFunc &= (glUniform1i != NULL) && (glUniform1f != NULL);
+		HasAllFunc &= (glUniform1ui != NULL) && (glUniform1i != NULL);
+		HasAllFunc &= (glUniform1fv != NULL) && (glUniform2fv != NULL);
+		HasAllFunc &= (glUniform4fv != NULL) && (glGetAttachedShaders != NULL);
+		HasAllFunc &= (glGetProgramInfoLog != NULL) && (glGetProgramiv != NULL);
+		HasAllFunc &= (glLinkProgram != NULL) && (glDetachShader != NULL);
+		HasAllFunc &= (glAttachShader != NULL) && (glDeleteProgram != NULL);
+		HasAllFunc &= (glCreateProgram != NULL) && (glShaderSource != NULL);
+		HasAllFunc &= (glCompileShader != NULL) && (glGetShaderiv != NULL);
+		HasAllFunc &= (glGetShaderInfoLog != NULL) && (glDeleteShader != NULL);
+		HasAllFunc &= (glCreateShader != NULL);
+	}
+#endif
+
+	bool AnalysisCorrect = true;
+	if(HasAllFunc)
+	{
+		if(m_HasShaders)
+		{
+			m_pTileProgram = new CGLSLTileProgram;
+			m_pTileProgramTextured = new CGLSLTileProgram;
+			m_pBorderTileProgram = new CGLSLTileProgram;
+			m_pBorderTileProgramTextured = new CGLSLTileProgram;
+			m_pPrimitive3DProgram = new CGLSLPrimitiveProgram;
+			m_pPrimitive3DProgramTextured = new CGLSLPrimitiveProgram;
+
+			CGLSLCompiler ShaderCompiler(g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, m_IsOpenGLES, m_OpenGLTextureLodBIAS / 1000.0f);
+			ShaderCompiler.SetHasTextureArray(pCommand->m_pCapabilities->m_2DArrayTextures);
+
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL PrimitiveVertexShader;
+				CGLSL PrimitiveFragmentShader;
+				PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.vert", GL_VERTEX_SHADER);
+				PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.frag", GL_FRAGMENT_SHADER);
+
+				m_pPrimitive3DProgram->CreateProgram();
+				m_pPrimitive3DProgram->AddShader(&PrimitiveVertexShader);
+				m_pPrimitive3DProgram->AddShader(&PrimitiveFragmentShader);
+				m_pPrimitive3DProgram->LinkProgram();
+
+				UseProgram(m_pPrimitive3DProgram);
+
+				m_pPrimitive3DProgram->m_LocPos = m_pPrimitive3DProgram->GetUniformLoc("gPos");
+			}
+
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL PrimitiveVertexShader;
+				CGLSL PrimitiveFragmentShader;
+				ShaderCompiler.AddDefine("TW_TEXTURED", "");
+				if(!pCommand->m_pCapabilities->m_2DArrayTextures)
+					ShaderCompiler.AddDefine("TW_3D_TEXTURED", "");
+				PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.vert", GL_VERTEX_SHADER);
+				PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.frag", GL_FRAGMENT_SHADER);
+				ShaderCompiler.ClearDefines();
+
+				m_pPrimitive3DProgramTextured->CreateProgram();
+				m_pPrimitive3DProgramTextured->AddShader(&PrimitiveVertexShader);
+				m_pPrimitive3DProgramTextured->AddShader(&PrimitiveFragmentShader);
+				m_pPrimitive3DProgramTextured->LinkProgram();
+
+				UseProgram(m_pPrimitive3DProgramTextured);
+
+				m_pPrimitive3DProgramTextured->m_LocPos = m_pPrimitive3DProgramTextured->GetUniformLoc("gPos");
+				m_pPrimitive3DProgramTextured->m_LocTextureSampler = m_pPrimitive3DProgramTextured->GetUniformLoc("gTextureSampler");
+			}
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL VertexShader;
+				CGLSL FragmentShader;
+				VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.vert", GL_VERTEX_SHADER);
+				FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.frag", GL_FRAGMENT_SHADER);
+
+				m_pTileProgram->CreateProgram();
+				m_pTileProgram->AddShader(&VertexShader);
+				m_pTileProgram->AddShader(&FragmentShader);
+
+				glBindAttribLocation(m_pTileProgram->GetProgramID(), 0, "inVertex");
+
+				m_pTileProgram->LinkProgram();
+
+				UseProgram(m_pTileProgram);
+
+				m_pTileProgram->m_LocPos = m_pTileProgram->GetUniformLoc("gPos");
+				m_pTileProgram->m_LocColor = m_pTileProgram->GetUniformLoc("gVertColor");
+			}
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL VertexShader;
+				CGLSL FragmentShader;
+				ShaderCompiler.AddDefine("TW_TILE_TEXTURED", "");
+				if(!pCommand->m_pCapabilities->m_2DArrayTextures)
+					ShaderCompiler.AddDefine("TW_TILE_3D_TEXTURED", "");
+				VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.vert", GL_VERTEX_SHADER);
+				FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.frag", GL_FRAGMENT_SHADER);
+				ShaderCompiler.ClearDefines();
+
+				m_pTileProgramTextured->CreateProgram();
+				m_pTileProgramTextured->AddShader(&VertexShader);
+				m_pTileProgramTextured->AddShader(&FragmentShader);
+
+				glBindAttribLocation(m_pTileProgram->GetProgramID(), 0, "inVertex");
+				glBindAttribLocation(m_pTileProgram->GetProgramID(), 1, "inVertexTexCoord");
+
+				m_pTileProgramTextured->LinkProgram();
+
+				UseProgram(m_pTileProgramTextured);
+
+				m_pTileProgramTextured->m_LocPos = m_pTileProgramTextured->GetUniformLoc("gPos");
+				m_pTileProgramTextured->m_LocTextureSampler = m_pTileProgramTextured->GetUniformLoc("gTextureSampler");
+				m_pTileProgramTextured->m_LocColor = m_pTileProgramTextured->GetUniformLoc("gVertColor");
+			}
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL VertexShader;
+				CGLSL FragmentShader;
+				VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.vert", GL_VERTEX_SHADER);
+				FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.frag", GL_FRAGMENT_SHADER);
+				ShaderCompiler.ClearDefines();
+
+				m_pBorderTileProgram->CreateProgram();
+				m_pBorderTileProgram->AddShader(&VertexShader);
+				m_pBorderTileProgram->AddShader(&FragmentShader);
+
+				glBindAttribLocation(m_pBorderTileProgram->GetProgramID(), 0, "inVertex");
+
+				m_pBorderTileProgram->LinkProgram();
+
+				UseProgram(m_pBorderTileProgram);
+
+				m_pBorderTileProgram->m_LocPos = m_pBorderTileProgram->GetUniformLoc("gPos");
+				m_pBorderTileProgram->m_LocColor = m_pBorderTileProgram->GetUniformLoc("gVertColor");
+				m_pBorderTileProgram->m_LocOffset = m_pBorderTileProgram->GetUniformLoc("gOffset");
+				m_pBorderTileProgram->m_LocScale = m_pBorderTileProgram->GetUniformLoc("gScale");
+			}
+			if(pCommand->m_pCapabilities->m_2DArrayTextures)
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_2D_ARRAY);
+			else
+				ShaderCompiler.SetTextureReplaceType(CGLSLCompiler::GLSL_COMPILER_TEXTURE_REPLACE_TYPE_3D);
+			{
+				CGLSL VertexShader;
+				CGLSL FragmentShader;
+				ShaderCompiler.AddDefine("TW_TILE_TEXTURED", "");
+				if(!pCommand->m_pCapabilities->m_2DArrayTextures)
+					ShaderCompiler.AddDefine("TW_TILE_3D_TEXTURED", "");
+				VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.vert", GL_VERTEX_SHADER);
+				FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.frag", GL_FRAGMENT_SHADER);
+				ShaderCompiler.ClearDefines();
+
+				m_pBorderTileProgramTextured->CreateProgram();
+				m_pBorderTileProgramTextured->AddShader(&VertexShader);
+				m_pBorderTileProgramTextured->AddShader(&FragmentShader);
+
+				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramID(), 0, "inVertex");
+				glBindAttribLocation(m_pBorderTileProgramTextured->GetProgramID(), 1, "inVertexTexCoord");
+
+				m_pBorderTileProgramTextured->LinkProgram();
+
+				UseProgram(m_pBorderTileProgramTextured);
+
+				m_pBorderTileProgramTextured->m_LocPos = m_pBorderTileProgramTextured->GetUniformLoc("gPos");
+				m_pBorderTileProgramTextured->m_LocTextureSampler = m_pBorderTileProgramTextured->GetUniformLoc("gTextureSampler");
+				m_pBorderTileProgramTextured->m_LocColor = m_pBorderTileProgramTextured->GetUniformLoc("gVertColor");
+				m_pBorderTileProgramTextured->m_LocOffset = m_pBorderTileProgramTextured->GetUniformLoc("gOffset");
+				m_pBorderTileProgramTextured->m_LocScale = m_pBorderTileProgramTextured->GetUniformLoc("gScale");
+			}
+
+			glUseProgram(0);
+		}
+
+		if(g_Config.m_Gfx3DTextureAnalysisRan == 0 || str_comp(g_Config.m_Gfx3DTextureAnalysisRenderer, pCommand->m_pRendererString) != 0 || str_comp(g_Config.m_Gfx3DTextureAnalysisVersion, pCommand->m_pVersionString) != 0)
+		{
+			AnalysisCorrect = IsTileMapAnalysisSucceeded();
+			if(AnalysisCorrect)
+			{
+				g_Config.m_Gfx3DTextureAnalysisRan = 1;
+				str_copy(g_Config.m_Gfx3DTextureAnalysisRenderer, pCommand->m_pRendererString);
+				str_copy(g_Config.m_Gfx3DTextureAnalysisVersion, pCommand->m_pVersionString);
+			}
+		}
+	}
+
+	if(!AnalysisCorrect || !HasAllFunc)
+	{
+		// downgrade to opengl 1.5
+		*pCommand->m_pInitError = -2;
+		pCommand->m_pCapabilities->m_ContextMajor = 1;
+		pCommand->m_pCapabilities->m_ContextMinor = 5;
+		pCommand->m_pCapabilities->m_ContextPatch = 0;
+
+		return false;
+	}
+
+	return true;
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_Shutdown(const SCommand_Shutdown *pCommand)
+{
+	// TODO: cleanup the OpenGL context too
+	delete m_pTileProgram;
+	delete m_pTileProgramTextured;
+	delete m_pPrimitive3DProgram;
+	delete m_pPrimitive3DProgramTextured;
+	for(auto &BufferObject : m_vBufferObjectIndices)
+		free(BufferObject.m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand)
+{
+	if(m_HasShaders)
+	{
+		CGLSLPrimitiveProgram *pProgram = NULL;
+		if(IsTexturedState(pCommand->m_State))
+		{
+			pProgram = m_pPrimitive3DProgramTextured;
+		}
+		else
+			pProgram = m_pPrimitive3DProgram;
+
+		UseProgram(pProgram);
+
+		SetState(pCommand->m_State, pProgram, true);
+	}
+	else
+	{
+		CCommandProcessorFragment_OpenGL::SetState(pCommand->m_State, true);
+	}
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	glVertexPointer(2, GL_FLOAT, sizeof(pCommand->m_pVertices[0]), pCommand->m_pVertices);
+	glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(pCommand->m_pVertices[0]), (uint8_t *)pCommand->m_pVertices + (ptrdiff_t)(sizeof(vec2)));
+	glTexCoordPointer(3, GL_FLOAT, sizeof(pCommand->m_pVertices[0]), (uint8_t *)pCommand->m_pVertices + (ptrdiff_t)(sizeof(vec2) + sizeof(unsigned char) * 4));
+
+	switch(pCommand->m_PrimType)
+	{
+	case CCommandBuffer::PRIMTYPE_QUADS:
+		glDrawArrays(GL_QUADS, 0, pCommand->m_PrimCount * 4);
+		break;
+	case CCommandBuffer::PRIMTYPE_TRIANGLES:
+		glDrawArrays(GL_TRIANGLES, 0, pCommand->m_PrimCount * 3);
+		break;
+	default:
+		dbg_msg("render", "unknown primtype %d\n", pCommand->m_PrimType);
+	};
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	if(m_HasShaders)
+	{
+		glUseProgram(0);
+	}
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+	// create necessary space
+	if((size_t)Index >= m_vBufferObjectIndices.size())
+	{
+		for(int i = m_vBufferObjectIndices.size(); i < Index + 1; ++i)
+		{
+			m_vBufferObjectIndices.emplace_back(0);
+		}
+	}
+
+	GLuint VertBufferID = 0;
+
+	glGenBuffers(1, &VertBufferID);
+	glBindBuffer(GL_ARRAY_BUFFER, VertBufferID);
+	glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
+	BufferObject.m_BufferObjectID = VertBufferID;
+	BufferObject.m_DataSize = pCommand->m_DataSize;
+	BufferObject.m_pData = malloc(pCommand->m_DataSize);
+	if(pUploadData)
+		mem_copy(BufferObject.m_pData, pUploadData, pCommand->m_DataSize);
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
+
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	BufferObject.m_DataSize = pCommand->m_DataSize;
+	free(BufferObject.m_pData);
+	BufferObject.m_pData = malloc(pCommand->m_DataSize);
+	if(pUploadData)
+		mem_copy(BufferObject.m_pData, pUploadData, pCommand->m_DataSize);
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
+
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+	glBufferSubData(GL_ARRAY_BUFFER, (GLintptr)(pCommand->m_pOffset), (GLsizeiptr)(pCommand->m_DataSize), pUploadData);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	if(pUploadData)
+		mem_copy(((uint8_t *)BufferObject.m_pData) + (ptrdiff_t)pCommand->m_pOffset, pUploadData, pCommand->m_DataSize);
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand)
+{
+	int WriteIndex = pCommand->m_WriteBufferIndex;
+	int ReadIndex = pCommand->m_ReadBufferIndex;
+
+	SBufferObject &ReadBufferObject = m_vBufferObjectIndices[ReadIndex];
+	SBufferObject &WriteBufferObject = m_vBufferObjectIndices[WriteIndex];
+
+	mem_copy(((uint8_t *)WriteBufferObject.m_pData) + (ptrdiff_t)pCommand->m_WriteOffset, ((uint8_t *)ReadBufferObject.m_pData) + (ptrdiff_t)pCommand->m_ReadOffset, pCommand->m_CopySize);
+
+	glBindBuffer(GL_ARRAY_BUFFER, WriteBufferObject.m_BufferObjectID);
+	glBufferSubData(GL_ARRAY_BUFFER, (GLintptr)(pCommand->m_WriteOffset), (GLsizeiptr)(pCommand->m_CopySize), ((uint8_t *)WriteBufferObject.m_pData) + (ptrdiff_t)pCommand->m_WriteOffset);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand)
+{
+	int Index = pCommand->m_BufferIndex;
+	SBufferObject &BufferObject = m_vBufferObjectIndices[Index];
+
+	glDeleteBuffers(1, &BufferObject.m_BufferObjectID);
+
+	free(BufferObject.m_pData);
+	BufferObject.m_pData = NULL;
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// create necessary space
+	if((size_t)Index >= m_vBufferContainers.size())
+	{
+		for(int i = m_vBufferContainers.size(); i < Index + 1; ++i)
+		{
+			SBufferContainer Container;
+			Container.m_ContainerInfo.m_Stride = 0;
+			Container.m_ContainerInfo.m_VertBufferBindingIndex = -1;
+			m_vBufferContainers.push_back(Container);
+		}
+	}
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+
+	for(size_t i = 0; i < pCommand->m_AttrCount; ++i)
+	{
+		BufferContainer.m_ContainerInfo.m_vAttributes.push_back(pCommand->m_pAttributes[i]);
+	}
+
+	BufferContainer.m_ContainerInfo.m_Stride = pCommand->m_Stride;
+	BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex = pCommand->m_VertBufferBindingIndex;
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand)
+{
+	SBufferContainer &BufferContainer = m_vBufferContainers[pCommand->m_BufferContainerIndex];
+
+	BufferContainer.m_ContainerInfo.m_vAttributes.clear();
+
+	for(size_t i = 0; i < pCommand->m_AttrCount; ++i)
+	{
+		BufferContainer.m_ContainerInfo.m_vAttributes.push_back(pCommand->m_pAttributes[i]);
+	}
+
+	BufferContainer.m_ContainerInfo.m_Stride = pCommand->m_Stride;
+	BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex = pCommand->m_VertBufferBindingIndex;
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand)
+{
+	SBufferContainer &BufferContainer = m_vBufferContainers[pCommand->m_BufferContainerIndex];
+
+	if(pCommand->m_DestroyAllBO)
+	{
+		int VertBufferID = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
+		if(VertBufferID != -1)
+		{
+			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferID].m_BufferObjectID);
+
+			free(m_vBufferObjectIndices[VertBufferID].m_pData);
+			m_vBufferObjectIndices[VertBufferID].m_pData = NULL;
+		}
+	}
+
+	BufferContainer.m_ContainerInfo.m_vAttributes.clear();
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand)
+{
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+
+	CGLSLTileProgram *pProgram = NULL;
+	if(IsTexturedState(pCommand->m_State))
+		pProgram = m_pBorderTileProgramTextured;
+	else
+		pProgram = m_pBorderTileProgram;
+	UseProgram(pProgram);
+
+	SetState(pCommand->m_State, pProgram, true);
+	pProgram->SetUniformVec4(pProgram->m_LocColor, 1, (float *)&pCommand->m_Color);
+
+	pProgram->SetUniformVec2(pProgram->m_LocOffset, 1, (float *)&pCommand->m_Offset);
+	pProgram->SetUniformVec2(pProgram->m_LocScale, 1, (float *)&pCommand->m_Scale);
+
+	bool IsTextured = BufferContainer.m_ContainerInfo.m_vAttributes.size() == 2;
+
+	SBufferObject &BufferObject = m_vBufferObjectIndices[(size_t)BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex];
+
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(0, 2, GL_FLOAT, false, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[0].m_pOffset);
+	if(IsTextured)
+	{
+		glEnableVertexAttribArray(1);
+		glVertexAttribIPointer(1, 4, GL_UNSIGNED_BYTE, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[1].m_pOffset);
+	}
+
+	size_t RealDrawCount = pCommand->m_DrawNum * 4;
+	GLint RealOffset = (GLint)((((size_t)(uintptr_t)(pCommand->m_pIndicesOffset)) / (6 * sizeof(unsigned int))) * 4);
+	glDrawArrays(GL_QUADS, RealOffset, RealDrawCount);
+
+	glDisableVertexAttribArray(0);
+	if(IsTextured)
+		glDisableVertexAttribArray(1);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glUseProgram(0);
+}
+
+void CCommandProcessorFragment_OpenGL2::Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+
+	if(pCommand->m_IndicesDrawNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	CGLSLTileProgram *pProgram = NULL;
+	if(IsTexturedState(pCommand->m_State))
+	{
+		pProgram = m_pTileProgramTextured;
+	}
+	else
+		pProgram = m_pTileProgram;
+
+	UseProgram(pProgram);
+
+	SetState(pCommand->m_State, pProgram, true);
+	pProgram->SetUniformVec4(pProgram->m_LocColor, 1, (float *)&pCommand->m_Color);
+
+	bool IsTextured = BufferContainer.m_ContainerInfo.m_vAttributes.size() == 2;
+
+	SBufferObject &BufferObject = m_vBufferObjectIndices[(size_t)BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex];
+
+	glBindBuffer(GL_ARRAY_BUFFER, BufferObject.m_BufferObjectID);
+
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(0, 2, GL_FLOAT, false, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[0].m_pOffset);
+	if(IsTextured)
+	{
+		glEnableVertexAttribArray(1);
+		glVertexAttribIPointer(1, 4, GL_UNSIGNED_BYTE, BufferContainer.m_ContainerInfo.m_Stride, BufferContainer.m_ContainerInfo.m_vAttributes[1].m_pOffset);
+	}
+
+	for(int i = 0; i < pCommand->m_IndicesDrawNum; ++i)
+	{
+		size_t RealDrawCount = (pCommand->m_pDrawCount[i] / 6) * 4;
+		GLint RealOffset = (GLint)((((size_t)(uintptr_t)(pCommand->m_pIndicesOffsets[i])) / (6 * sizeof(unsigned int))) * 4);
+		glDrawArrays(GL_QUADS, RealOffset, RealDrawCount);
+	}
+
+	glDisableVertexAttribArray(0);
+	if(IsTextured)
+		glDisableVertexAttribArray(1);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glUseProgram(0);
+}
+
+#undef BACKEND_GL_MODERN_API
+
+#endif
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/backend_opengl.h b/src_bkp/engine/client/backend/opengl/backend_opengl.h
new file mode 100644
index 0000000000..2d339c0fdb
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/backend_opengl.h
@@ -0,0 +1,206 @@
+// This file can be included several times.
+#if(!defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H)) || \
+	(defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H_AS_ES))
+
+#if !defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H)
+#define ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H
+#endif
+
+#if defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H_AS_ES)
+#define ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL_H_AS_ES
+#endif
+
+#include <base/system.h>
+
+#include <engine/client/graphics_defines.h>
+
+#include <engine/client/backend/backend_base.h>
+
+class CGLSLTWProgram;
+class CGLSLPrimitiveProgram;
+class CGLSLTileProgram;
+
+#if defined(BACKEND_AS_OPENGL_ES) && defined(CONF_BACKEND_OPENGL_ES3)
+#define BACKEND_GL_MODERN_API 1
+#endif
+
+// takes care of opengl related rendering
+class CCommandProcessorFragment_OpenGL : public CCommandProcessorFragment_GLBase
+{
+protected:
+	struct CTexture
+	{
+		CTexture() :
+			m_Tex(0), m_Tex2DArray(0), m_Sampler(0), m_Sampler2DArray(0), m_LastWrapMode(CCommandBuffer::WRAP_REPEAT), m_MemSize(0), m_Width(0), m_Height(0), m_RescaleCount(0), m_ResizeWidth(0), m_ResizeHeight(0)
+		{
+		}
+
+		TWGLuint m_Tex;
+		TWGLuint m_Tex2DArray; // or 3D texture as fallback
+		TWGLuint m_Sampler;
+		TWGLuint m_Sampler2DArray; // or 3D texture as fallback
+		int m_LastWrapMode;
+
+		int m_MemSize;
+
+		int m_Width;
+		int m_Height;
+		int m_RescaleCount;
+		float m_ResizeWidth;
+		float m_ResizeHeight;
+	};
+	std::vector<CTexture> m_vTextures;
+	std::atomic<uint64_t> *m_pTextureMemoryUsage;
+
+	uint32_t m_CanvasWidth = 0;
+	uint32_t m_CanvasHeight = 0;
+
+	TWGLint m_MaxTexSize;
+
+	bool m_Has2DArrayTextures;
+	bool m_Has2DArrayTexturesAsExtension;
+	TWGLenum m_2DArrayTarget;
+	bool m_Has3DTextures;
+	bool m_HasMipMaps;
+	bool m_HasNPOTTextures;
+
+	bool m_HasShaders;
+	int m_LastBlendMode; // avoid all possible opengl state changes
+	bool m_LastClipEnable;
+
+	int m_OpenGLTextureLodBIAS;
+
+	bool m_IsOpenGLES;
+
+	bool IsTexturedState(const CCommandBuffer::SState &State);
+
+	bool InitOpenGL(const SCommand_Init *pCommand);
+
+	void SetState(const CCommandBuffer::SState &State, bool Use2DArrayTexture = false);
+	virtual bool IsNewApi() { return false; }
+	void DestroyTexture(int Slot);
+
+	bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) override;
+
+	static int TexFormatToOpenGLFormat(int TexFormat);
+	static size_t GLFormatToPixelSize(int GLFormat);
+
+	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData);
+	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData);
+
+	virtual bool Cmd_Init(const SCommand_Init *pCommand);
+	virtual void Cmd_Shutdown(const SCommand_Shutdown *pCommand) {}
+	virtual void Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand);
+	virtual void Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand);
+	virtual void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand);
+	virtual void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand);
+	virtual void Cmd_TextTextures_Destroy(const CCommandBuffer::SCommand_TextTextures_Destroy *pCommand);
+	virtual void Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand);
+	virtual void Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand);
+	virtual void Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand);
+	virtual void Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderTex3D"); }
+	virtual void Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand);
+
+	virtual void Cmd_Update_Viewport(const CCommandBuffer::SCommand_Update_Viewport *pCommand);
+
+	virtual void Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand) { dbg_assert(false, "Call of unsupported Cmd_CreateBufferObject"); }
+	virtual void Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RecreateBufferObject"); }
+	virtual void Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand) { dbg_assert(false, "Call of unsupported Cmd_UpdateBufferObject"); }
+	virtual void Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand) { dbg_assert(false, "Call of unsupported Cmd_CopyBufferObject"); }
+	virtual void Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand) { dbg_assert(false, "Call of unsupported Cmd_DeleteBufferObject"); }
+
+	virtual void Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_CreateBufferContainer"); }
+	virtual void Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_UpdateBufferContainer"); }
+	virtual void Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_DeleteBufferContainer"); }
+	virtual void Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand) { dbg_assert(false, "Call of unsupported Cmd_IndicesRequiredNumNotify"); }
+
+	virtual void Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderTileLayer"); }
+	virtual void Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderBorderTile"); }
+	virtual void Cmd_RenderQuadLayer(const CCommandBuffer::SCommand_RenderQuadLayer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderQuadLayer"); }
+	virtual void Cmd_RenderText(const CCommandBuffer::SCommand_RenderText *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderText"); }
+	virtual void Cmd_RenderQuadContainer(const CCommandBuffer::SCommand_RenderQuadContainer *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderQuadContainer"); }
+	virtual void Cmd_RenderQuadContainerEx(const CCommandBuffer::SCommand_RenderQuadContainerEx *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderQuadContainerEx"); }
+	virtual void Cmd_RenderQuadContainerAsSpriteMultiple(const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *pCommand) { dbg_assert(false, "Call of unsupported Cmd_RenderQuadContainerAsSpriteMultiple"); }
+
+public:
+	CCommandProcessorFragment_OpenGL();
+	virtual ~CCommandProcessorFragment_OpenGL() = default;
+
+	ERunCommandReturnTypes RunCommand(const CCommandBuffer::SCommand *pBaseCommand) override;
+};
+
+class CCommandProcessorFragment_OpenGL2 : public CCommandProcessorFragment_OpenGL
+{
+	struct SBufferContainer
+	{
+		SBufferContainerInfo m_ContainerInfo;
+	};
+	std::vector<SBufferContainer> m_vBufferContainers;
+
+#ifndef BACKEND_AS_OPENGL_ES
+	GL_SVertexTex3D m_aStreamVertices[1024 * 4];
+#endif
+
+	struct SBufferObject
+	{
+		SBufferObject(TWGLuint BufferObjectID) :
+			m_BufferObjectID(BufferObjectID)
+		{
+			m_pData = NULL;
+			m_DataSize = 0;
+		}
+		TWGLuint m_BufferObjectID;
+		void *m_pData;
+		size_t m_DataSize;
+	};
+
+	std::vector<SBufferObject> m_vBufferObjectIndices;
+
+#ifndef BACKEND_GL_MODERN_API
+	bool DoAnalyzeStep(size_t CheckCount, size_t VerticesCount, uint8_t aFakeTexture[], size_t SingleImageSize);
+	bool IsTileMapAnalysisSucceeded();
+#endif
+
+	void UseProgram(CGLSLTWProgram *pProgram);
+
+protected:
+	void SetState(const CCommandBuffer::SState &State, CGLSLTWProgram *pProgram, bool Use2DArrayTextures = false);
+
+#ifndef BACKEND_GL_MODERN_API
+	bool Cmd_Init(const SCommand_Init *pCommand) override;
+	void Cmd_Shutdown(const SCommand_Shutdown *pCommand) override;
+
+	void Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand) override;
+
+	void Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand) override;
+	void Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand) override;
+	void Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand) override;
+	void Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand) override;
+	void Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand) override;
+
+	void Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand) override;
+	void Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand) override;
+	void Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand) override;
+	void Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand) override;
+
+	void Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand) override;
+	void Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand) override;
+#endif
+
+	CGLSLTileProgram *m_pTileProgram;
+	CGLSLTileProgram *m_pTileProgramTextured;
+	CGLSLTileProgram *m_pBorderTileProgram;
+	CGLSLTileProgram *m_pBorderTileProgramTextured;
+	CGLSLPrimitiveProgram *m_pPrimitive3DProgram;
+	CGLSLPrimitiveProgram *m_pPrimitive3DProgramTextured;
+};
+
+class CCommandProcessorFragment_OpenGL3 : public CCommandProcessorFragment_OpenGL2
+{
+};
+
+#if defined(BACKEND_AS_OPENGL_ES) && defined(CONF_BACKEND_OPENGL_ES3)
+#undef BACKEND_GL_MODERN_API
+#endif
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/backend_opengl3.cpp b/src_bkp/engine/client/backend/opengl/backend_opengl3.cpp
new file mode 100644
index 0000000000..315dd887d7
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/backend_opengl3.cpp
@@ -0,0 +1,1375 @@
+#include "backend_opengl3.h"
+
+#include <base/detect.h>
+
+#if defined(BACKEND_AS_OPENGL_ES) || !defined(CONF_BACKEND_OPENGL_ES)
+
+#ifndef BACKEND_AS_OPENGL_ES
+#include <GL/glew.h>
+#else
+#include <GLES3/gl3.h>
+#endif
+
+#include <engine/client/backend_sdl.h>
+
+#include <engine/client/backend/opengl/opengl_sl.h>
+#include <engine/client/backend/opengl/opengl_sl_program.h>
+
+#include <engine/gfx/image_manipulation.h>
+
+#include <engine/client/backend/glsl_shader_compiler.h>
+
+#ifdef CONF_WEBASM
+// WebGL2 defines the type of a buffer at the first bind to a buffer target
+// this is different to GLES 3 (https://www.khronos.org/registry/webgl/specs/latest/2.0/#5.1)
+static constexpr GLenum BUFFER_INIT_INDEX_TARGET = GL_ELEMENT_ARRAY_BUFFER;
+static constexpr GLenum BUFFER_INIT_VERTEX_TARGET = GL_ARRAY_BUFFER;
+#else
+static constexpr GLenum BUFFER_INIT_INDEX_TARGET = GL_COPY_WRITE_BUFFER;
+static constexpr GLenum BUFFER_INIT_VERTEX_TARGET = GL_COPY_WRITE_BUFFER;
+#endif
+
+// ------------ CCommandProcessorFragment_OpenGL3_3
+int CCommandProcessorFragment_OpenGL3_3::TexFormatToNewOpenGLFormat(int TexFormat)
+{
+	if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
+		return GL_RGBA;
+	return GL_RGBA;
+}
+
+void CCommandProcessorFragment_OpenGL3_3::UseProgram(CGLSLTWProgram *pProgram)
+{
+	if(m_LastProgramID != pProgram->GetProgramID())
+	{
+		pProgram->UseProgram();
+		m_LastProgramID = pProgram->GetProgramID();
+	}
+}
+
+void CCommandProcessorFragment_OpenGL3_3::InitPrimExProgram(CGLSLPrimitiveExProgram *pProgram, CGLSLCompiler *pCompiler, IStorage *pStorage, bool Textured, bool Rotationless)
+{
+	CGLSL PrimitiveVertexShader;
+	CGLSL PrimitiveFragmentShader;
+	if(Textured)
+		pCompiler->AddDefine("TW_TEXTURED", "");
+	if(Rotationless)
+		pCompiler->AddDefine("TW_ROTATIONLESS", "");
+	PrimitiveVertexShader.LoadShader(pCompiler, pStorage, "shader/primex.vert", GL_VERTEX_SHADER);
+	PrimitiveFragmentShader.LoadShader(pCompiler, pStorage, "shader/primex.frag", GL_FRAGMENT_SHADER);
+	if(Textured || Rotationless)
+		pCompiler->ClearDefines();
+
+	pProgram->CreateProgram();
+	pProgram->AddShader(&PrimitiveVertexShader);
+	pProgram->AddShader(&PrimitiveFragmentShader);
+	pProgram->LinkProgram();
+
+	UseProgram(pProgram);
+
+	pProgram->m_LocPos = pProgram->GetUniformLoc("gPos");
+	pProgram->m_LocTextureSampler = pProgram->GetUniformLoc("gTextureSampler");
+	pProgram->m_LocRotation = pProgram->GetUniformLoc("gRotation");
+	pProgram->m_LocCenter = pProgram->GetUniformLoc("gCenter");
+	pProgram->m_LocVertciesColor = pProgram->GetUniformLoc("gVerticesColor");
+
+	pProgram->SetUniform(pProgram->m_LocRotation, 0.0f);
+	float aCenter[2] = {0.f, 0.f};
+	pProgram->SetUniformVec2(pProgram->m_LocCenter, 1, aCenter);
+}
+
+bool CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand)
+{
+	if(!InitOpenGL(pCommand))
+		return false;
+
+	m_OpenGLTextureLodBIAS = g_Config.m_GfxGLTextureLODBIAS;
+
+	glActiveTexture(GL_TEXTURE0);
+
+	m_Has2DArrayTextures = true;
+	m_Has2DArrayTexturesAsExtension = false;
+	m_2DArrayTarget = GL_TEXTURE_2D_ARRAY;
+	m_Has3DTextures = false;
+	m_HasMipMaps = true;
+	m_HasNPOTTextures = true;
+	m_HasShaders = true;
+
+	m_pTextureMemoryUsage = pCommand->m_pTextureMemoryUsage;
+	m_pTextureMemoryUsage->store(0, std::memory_order_relaxed);
+	m_LastBlendMode = CCommandBuffer::BLEND_ALPHA;
+	m_LastClipEnable = false;
+	m_pPrimitiveProgram = new CGLSLPrimitiveProgram;
+	m_pPrimitiveProgramTextured = new CGLSLPrimitiveProgram;
+	m_pTileProgram = new CGLSLTileProgram;
+	m_pTileProgramTextured = new CGLSLTileProgram;
+	m_pPrimitive3DProgram = new CGLSLPrimitiveProgram;
+	m_pPrimitive3DProgramTextured = new CGLSLPrimitiveProgram;
+	m_pBorderTileProgram = new CGLSLTileProgram;
+	m_pBorderTileProgramTextured = new CGLSLTileProgram;
+	m_pQuadProgram = new CGLSLQuadProgram;
+	m_pQuadProgramTextured = new CGLSLQuadProgram;
+	m_pTextProgram = new CGLSLTextProgram;
+	m_pPrimitiveExProgram = new CGLSLPrimitiveExProgram;
+	m_pPrimitiveExProgramTextured = new CGLSLPrimitiveExProgram;
+	m_pPrimitiveExProgramRotationless = new CGLSLPrimitiveExProgram;
+	m_pPrimitiveExProgramTexturedRotationless = new CGLSLPrimitiveExProgram;
+	m_pSpriteProgramMultiple = new CGLSLSpriteMultipleProgram;
+	m_LastProgramID = 0;
+
+	CGLSLCompiler ShaderCompiler(g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, m_IsOpenGLES, m_OpenGLTextureLodBIAS / 1000.0f);
+
+	GLint CapVal;
+	glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &CapVal);
+
+	m_MaxQuadsAtOnce = minimum<int>(((CapVal - 20) / (3 * 4)), ms_MaxQuadsPossible);
+
+	{
+		CGLSL PrimitiveVertexShader;
+		CGLSL PrimitiveFragmentShader;
+		PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/prim.vert", GL_VERTEX_SHADER);
+		PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/prim.frag", GL_FRAGMENT_SHADER);
+
+		m_pPrimitiveProgram->CreateProgram();
+		m_pPrimitiveProgram->AddShader(&PrimitiveVertexShader);
+		m_pPrimitiveProgram->AddShader(&PrimitiveFragmentShader);
+		m_pPrimitiveProgram->LinkProgram();
+
+		UseProgram(m_pPrimitiveProgram);
+
+		m_pPrimitiveProgram->m_LocPos = m_pPrimitiveProgram->GetUniformLoc("gPos");
+		m_pPrimitiveProgram->m_LocTextureSampler = m_pPrimitiveProgram->GetUniformLoc("gTextureSampler");
+	}
+	{
+		CGLSL PrimitiveVertexShader;
+		CGLSL PrimitiveFragmentShader;
+		ShaderCompiler.AddDefine("TW_TEXTURED", "");
+		PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/prim.vert", GL_VERTEX_SHADER);
+		PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/prim.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pPrimitiveProgramTextured->CreateProgram();
+		m_pPrimitiveProgramTextured->AddShader(&PrimitiveVertexShader);
+		m_pPrimitiveProgramTextured->AddShader(&PrimitiveFragmentShader);
+		m_pPrimitiveProgramTextured->LinkProgram();
+
+		UseProgram(m_pPrimitiveProgramTextured);
+
+		m_pPrimitiveProgramTextured->m_LocPos = m_pPrimitiveProgramTextured->GetUniformLoc("gPos");
+		m_pPrimitiveProgramTextured->m_LocTextureSampler = m_pPrimitiveProgramTextured->GetUniformLoc("gTextureSampler");
+	}
+
+	{
+		CGLSL PrimitiveVertexShader;
+		CGLSL PrimitiveFragmentShader;
+		ShaderCompiler.AddDefine("TW_MODERN_GL", "");
+		PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.vert", GL_VERTEX_SHADER);
+		PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pPrimitive3DProgram->CreateProgram();
+		m_pPrimitive3DProgram->AddShader(&PrimitiveVertexShader);
+		m_pPrimitive3DProgram->AddShader(&PrimitiveFragmentShader);
+		m_pPrimitive3DProgram->LinkProgram();
+
+		UseProgram(m_pPrimitive3DProgram);
+
+		m_pPrimitive3DProgram->m_LocPos = m_pPrimitive3DProgram->GetUniformLoc("gPos");
+	}
+	{
+		CGLSL PrimitiveVertexShader;
+		CGLSL PrimitiveFragmentShader;
+		ShaderCompiler.AddDefine("TW_MODERN_GL", "");
+		ShaderCompiler.AddDefine("TW_TEXTURED", "");
+		if(!pCommand->m_pCapabilities->m_2DArrayTextures)
+			ShaderCompiler.AddDefine("TW_3D_TEXTURED", "");
+		PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.vert", GL_VERTEX_SHADER);
+		PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/pipeline.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pPrimitive3DProgramTextured->CreateProgram();
+		m_pPrimitive3DProgramTextured->AddShader(&PrimitiveVertexShader);
+		m_pPrimitive3DProgramTextured->AddShader(&PrimitiveFragmentShader);
+		m_pPrimitive3DProgramTextured->LinkProgram();
+
+		UseProgram(m_pPrimitive3DProgramTextured);
+
+		m_pPrimitive3DProgramTextured->m_LocPos = m_pPrimitive3DProgramTextured->GetUniformLoc("gPos");
+		m_pPrimitive3DProgramTextured->m_LocTextureSampler = m_pPrimitive3DProgramTextured->GetUniformLoc("gTextureSampler");
+	}
+
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.frag", GL_FRAGMENT_SHADER);
+
+		m_pTileProgram->CreateProgram();
+		m_pTileProgram->AddShader(&VertexShader);
+		m_pTileProgram->AddShader(&FragmentShader);
+		m_pTileProgram->LinkProgram();
+
+		UseProgram(m_pTileProgram);
+
+		m_pTileProgram->m_LocPos = m_pTileProgram->GetUniformLoc("gPos");
+		m_pTileProgram->m_LocColor = m_pTileProgram->GetUniformLoc("gVertColor");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		ShaderCompiler.AddDefine("TW_TILE_TEXTURED", "");
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pTileProgramTextured->CreateProgram();
+		m_pTileProgramTextured->AddShader(&VertexShader);
+		m_pTileProgramTextured->AddShader(&FragmentShader);
+		m_pTileProgramTextured->LinkProgram();
+
+		UseProgram(m_pTileProgramTextured);
+
+		m_pTileProgramTextured->m_LocPos = m_pTileProgramTextured->GetUniformLoc("gPos");
+		m_pTileProgramTextured->m_LocTextureSampler = m_pTileProgramTextured->GetUniformLoc("gTextureSampler");
+		m_pTileProgramTextured->m_LocColor = m_pTileProgramTextured->GetUniformLoc("gVertColor");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pBorderTileProgram->CreateProgram();
+		m_pBorderTileProgram->AddShader(&VertexShader);
+		m_pBorderTileProgram->AddShader(&FragmentShader);
+		m_pBorderTileProgram->LinkProgram();
+
+		UseProgram(m_pBorderTileProgram);
+
+		m_pBorderTileProgram->m_LocPos = m_pBorderTileProgram->GetUniformLoc("gPos");
+		m_pBorderTileProgram->m_LocColor = m_pBorderTileProgram->GetUniformLoc("gVertColor");
+		m_pBorderTileProgram->m_LocOffset = m_pBorderTileProgram->GetUniformLoc("gOffset");
+		m_pBorderTileProgram->m_LocScale = m_pBorderTileProgram->GetUniformLoc("gScale");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		ShaderCompiler.AddDefine("TW_TILE_TEXTURED", "");
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/tile_border.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pBorderTileProgramTextured->CreateProgram();
+		m_pBorderTileProgramTextured->AddShader(&VertexShader);
+		m_pBorderTileProgramTextured->AddShader(&FragmentShader);
+		m_pBorderTileProgramTextured->LinkProgram();
+
+		UseProgram(m_pBorderTileProgramTextured);
+
+		m_pBorderTileProgramTextured->m_LocPos = m_pBorderTileProgramTextured->GetUniformLoc("gPos");
+		m_pBorderTileProgramTextured->m_LocTextureSampler = m_pBorderTileProgramTextured->GetUniformLoc("gTextureSampler");
+		m_pBorderTileProgramTextured->m_LocColor = m_pBorderTileProgramTextured->GetUniformLoc("gVertColor");
+		m_pBorderTileProgramTextured->m_LocOffset = m_pBorderTileProgramTextured->GetUniformLoc("gOffset");
+		m_pBorderTileProgramTextured->m_LocScale = m_pBorderTileProgramTextured->GetUniformLoc("gScale");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		ShaderCompiler.AddDefine("TW_MAX_QUADS", std::to_string(m_MaxQuadsAtOnce).c_str());
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/quad.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/quad.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pQuadProgram->CreateProgram();
+		m_pQuadProgram->AddShader(&VertexShader);
+		m_pQuadProgram->AddShader(&FragmentShader);
+		m_pQuadProgram->LinkProgram();
+
+		UseProgram(m_pQuadProgram);
+
+		m_pQuadProgram->m_LocPos = m_pQuadProgram->GetUniformLoc("gPos");
+		m_pQuadProgram->m_LocColors = m_pQuadProgram->GetUniformLoc("gVertColors");
+		m_pQuadProgram->m_LocRotations = m_pQuadProgram->GetUniformLoc("gRotations");
+		m_pQuadProgram->m_LocOffsets = m_pQuadProgram->GetUniformLoc("gOffsets");
+		m_pQuadProgram->m_LocQuadOffset = m_pQuadProgram->GetUniformLoc("gQuadOffset");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		ShaderCompiler.AddDefine("TW_QUAD_TEXTURED", "");
+		ShaderCompiler.AddDefine("TW_MAX_QUADS", std::to_string(m_MaxQuadsAtOnce).c_str());
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/quad.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/quad.frag", GL_FRAGMENT_SHADER);
+		ShaderCompiler.ClearDefines();
+
+		m_pQuadProgramTextured->CreateProgram();
+		m_pQuadProgramTextured->AddShader(&VertexShader);
+		m_pQuadProgramTextured->AddShader(&FragmentShader);
+		m_pQuadProgramTextured->LinkProgram();
+
+		UseProgram(m_pQuadProgramTextured);
+
+		m_pQuadProgramTextured->m_LocPos = m_pQuadProgramTextured->GetUniformLoc("gPos");
+		m_pQuadProgramTextured->m_LocTextureSampler = m_pQuadProgramTextured->GetUniformLoc("gTextureSampler");
+		m_pQuadProgramTextured->m_LocColors = m_pQuadProgramTextured->GetUniformLoc("gVertColors");
+		m_pQuadProgramTextured->m_LocRotations = m_pQuadProgramTextured->GetUniformLoc("gRotations");
+		m_pQuadProgramTextured->m_LocOffsets = m_pQuadProgramTextured->GetUniformLoc("gOffsets");
+		m_pQuadProgramTextured->m_LocQuadOffset = m_pQuadProgramTextured->GetUniformLoc("gQuadOffset");
+	}
+	{
+		CGLSL VertexShader;
+		CGLSL FragmentShader;
+		VertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/text.vert", GL_VERTEX_SHADER);
+		FragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/text.frag", GL_FRAGMENT_SHADER);
+
+		m_pTextProgram->CreateProgram();
+		m_pTextProgram->AddShader(&VertexShader);
+		m_pTextProgram->AddShader(&FragmentShader);
+		m_pTextProgram->LinkProgram();
+
+		UseProgram(m_pTextProgram);
+
+		m_pTextProgram->m_LocPos = m_pTextProgram->GetUniformLoc("gPos");
+		m_pTextProgram->m_LocTextureSampler = -1;
+		m_pTextProgram->m_LocTextSampler = m_pTextProgram->GetUniformLoc("gTextSampler");
+		m_pTextProgram->m_LocTextOutlineSampler = m_pTextProgram->GetUniformLoc("gTextOutlineSampler");
+		m_pTextProgram->m_LocColor = m_pTextProgram->GetUniformLoc("gVertColor");
+		m_pTextProgram->m_LocOutlineColor = m_pTextProgram->GetUniformLoc("gVertOutlineColor");
+		m_pTextProgram->m_LocTextureSize = m_pTextProgram->GetUniformLoc("gTextureSize");
+	}
+	InitPrimExProgram(m_pPrimitiveExProgram, &ShaderCompiler, pCommand->m_pStorage, false, false);
+	InitPrimExProgram(m_pPrimitiveExProgramTextured, &ShaderCompiler, pCommand->m_pStorage, true, false);
+	InitPrimExProgram(m_pPrimitiveExProgramRotationless, &ShaderCompiler, pCommand->m_pStorage, false, true);
+	InitPrimExProgram(m_pPrimitiveExProgramTexturedRotationless, &ShaderCompiler, pCommand->m_pStorage, true, true);
+	{
+		CGLSL PrimitiveVertexShader;
+		CGLSL PrimitiveFragmentShader;
+		PrimitiveVertexShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/spritemulti.vert", GL_VERTEX_SHADER);
+		PrimitiveFragmentShader.LoadShader(&ShaderCompiler, pCommand->m_pStorage, "shader/spritemulti.frag", GL_FRAGMENT_SHADER);
+
+		m_pSpriteProgramMultiple->CreateProgram();
+		m_pSpriteProgramMultiple->AddShader(&PrimitiveVertexShader);
+		m_pSpriteProgramMultiple->AddShader(&PrimitiveFragmentShader);
+		m_pSpriteProgramMultiple->LinkProgram();
+
+		UseProgram(m_pSpriteProgramMultiple);
+
+		m_pSpriteProgramMultiple->m_LocPos = m_pSpriteProgramMultiple->GetUniformLoc("gPos");
+		m_pSpriteProgramMultiple->m_LocTextureSampler = m_pSpriteProgramMultiple->GetUniformLoc("gTextureSampler");
+		m_pSpriteProgramMultiple->m_LocRSP = m_pSpriteProgramMultiple->GetUniformLoc("gRSP[0]");
+		m_pSpriteProgramMultiple->m_LocCenter = m_pSpriteProgramMultiple->GetUniformLoc("gCenter");
+		m_pSpriteProgramMultiple->m_LocVertciesColor = m_pSpriteProgramMultiple->GetUniformLoc("gVerticesColor");
+
+		float aCenter[2] = {0.f, 0.f};
+		m_pSpriteProgramMultiple->SetUniformVec2(m_pSpriteProgramMultiple->m_LocCenter, 1, aCenter);
+	}
+
+	m_LastStreamBuffer = 0;
+
+	glGenBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferID);
+	glGenVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexID);
+	glGenBuffers(1, &m_PrimitiveDrawBufferIDTex3D);
+	glGenVertexArrays(1, &m_PrimitiveDrawVertexIDTex3D);
+
+	for(int i = 0; i < MAX_STREAM_BUFFER_COUNT; ++i)
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferID[i]);
+		glBindVertexArray(m_aPrimitiveDrawVertexID[i]);
+		glEnableVertexAttribArray(0);
+		glEnableVertexAttribArray(1);
+		glEnableVertexAttribArray(2);
+
+		glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(CCommandBuffer::SVertex), 0);
+		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(CCommandBuffer::SVertex), (void *)(sizeof(float) * 2));
+		glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(CCommandBuffer::SVertex), (void *)(sizeof(float) * 4));
+
+		m_aLastIndexBufferBound[i] = 0;
+	}
+
+	glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIDTex3D);
+	glBindVertexArray(m_PrimitiveDrawVertexIDTex3D);
+	glEnableVertexAttribArray(0);
+	glEnableVertexAttribArray(1);
+	glEnableVertexAttribArray(2);
+
+	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(CCommandBuffer::SVertexTex3DStream), 0);
+	glVertexAttribPointer(1, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(CCommandBuffer::SVertexTex3DStream), (void *)(sizeof(float) * 2));
+	glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, sizeof(CCommandBuffer::SVertexTex3DStream), (void *)(sizeof(float) * 2 + sizeof(unsigned char) * 4));
+
+	// query the image max size only once
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &m_MaxTexSize);
+
+	glBindVertexArray(0);
+	glGenBuffers(1, &m_QuadDrawIndexBufferID);
+	glBindBuffer(BUFFER_INIT_INDEX_TARGET, m_QuadDrawIndexBufferID);
+
+	unsigned int aIndices[CCommandBuffer::MAX_VERTICES / 4 * 6];
+	int Primq = 0;
+	for(int i = 0; i < CCommandBuffer::MAX_VERTICES / 4 * 6; i += 6)
+	{
+		aIndices[i] = Primq;
+		aIndices[i + 1] = Primq + 1;
+		aIndices[i + 2] = Primq + 2;
+		aIndices[i + 3] = Primq;
+		aIndices[i + 4] = Primq + 2;
+		aIndices[i + 5] = Primq + 3;
+		Primq += 4;
+	}
+	glBufferData(BUFFER_INIT_INDEX_TARGET, sizeof(unsigned int) * CCommandBuffer::MAX_VERTICES / 4 * 6, aIndices, GL_STATIC_DRAW);
+
+	m_CurrentIndicesInBuffer = CCommandBuffer::MAX_VERTICES / 4 * 6;
+
+	m_vTextures.resize(CCommandBuffer::MAX_TEXTURES);
+
+	m_ClearColor.r = m_ClearColor.g = m_ClearColor.b = -1.f;
+
+	// fix the alignment to allow even 1byte changes, e.g. for alpha components
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+	return true;
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Shutdown(const SCommand_Shutdown *pCommand)
+{
+	glUseProgram(0);
+
+	m_pPrimitiveProgram->DeleteProgram();
+	m_pPrimitiveProgramTextured->DeleteProgram();
+	m_pBorderTileProgram->DeleteProgram();
+	m_pBorderTileProgramTextured->DeleteProgram();
+	m_pQuadProgram->DeleteProgram();
+	m_pQuadProgramTextured->DeleteProgram();
+	m_pTileProgram->DeleteProgram();
+	m_pTileProgramTextured->DeleteProgram();
+	m_pPrimitive3DProgram->DeleteProgram();
+	m_pPrimitive3DProgramTextured->DeleteProgram();
+	m_pTextProgram->DeleteProgram();
+	m_pPrimitiveExProgram->DeleteProgram();
+	m_pPrimitiveExProgramTextured->DeleteProgram();
+	m_pPrimitiveExProgramRotationless->DeleteProgram();
+	m_pPrimitiveExProgramTexturedRotationless->DeleteProgram();
+	m_pSpriteProgramMultiple->DeleteProgram();
+
+	// clean up everything
+	delete m_pPrimitiveProgram;
+	delete m_pPrimitiveProgramTextured;
+	delete m_pBorderTileProgram;
+	delete m_pBorderTileProgramTextured;
+	delete m_pQuadProgram;
+	delete m_pQuadProgramTextured;
+	delete m_pTileProgram;
+	delete m_pTileProgramTextured;
+	delete m_pPrimitive3DProgram;
+	delete m_pPrimitive3DProgramTextured;
+	delete m_pTextProgram;
+	delete m_pPrimitiveExProgram;
+	delete m_pPrimitiveExProgramTextured;
+	delete m_pPrimitiveExProgramRotationless;
+	delete m_pPrimitiveExProgramTexturedRotationless;
+	delete m_pSpriteProgramMultiple;
+
+	glBindVertexArray(0);
+	glDeleteBuffers(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawBufferID);
+	glDeleteBuffers(1, &m_QuadDrawIndexBufferID);
+	glDeleteVertexArrays(MAX_STREAM_BUFFER_COUNT, m_aPrimitiveDrawVertexID);
+	glDeleteBuffers(1, &m_PrimitiveDrawBufferIDTex3D);
+	glDeleteVertexArrays(1, &m_PrimitiveDrawVertexIDTex3D);
+
+	for(int i = 0; i < (int)m_vTextures.size(); ++i)
+	{
+		DestroyTexture(i);
+	}
+
+	for(size_t i = 0; i < m_vBufferContainers.size(); ++i)
+	{
+		DestroyBufferContainer(i);
+	}
+
+	m_vBufferContainers.clear();
+}
+
+void CCommandProcessorFragment_OpenGL3_3::TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData)
+{
+	glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
+
+	if(m_vTextures[Slot].m_RescaleCount > 0)
+	{
+		for(int i = 0; i < m_vTextures[Slot].m_RescaleCount; ++i)
+		{
+			Width >>= 1;
+			Height >>= 1;
+
+			X /= 2;
+			Y /= 2;
+		}
+
+		void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
+		free(pTexData);
+		pTexData = pTmpData;
+	}
+
+	glTexSubImage2D(GL_TEXTURE_2D, 0, X, Y, Width, Height, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+	free(pTexData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
+{
+	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand)
+{
+	int Slot = 0;
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glBindSampler(Slot, 0);
+	DestroyTexture(pCommand->m_Slot);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData)
+{
+	while(Slot >= (int)m_vTextures.size())
+		m_vTextures.resize(m_vTextures.size() * 2);
+
+	// resample if needed
+	int RescaleCount = 0;
+	if(GLFormat == GL_RGBA)
+	{
+		if(Width > m_MaxTexSize || Height > m_MaxTexSize)
+		{
+			do
+			{
+				Width >>= 1;
+				Height >>= 1;
+				++RescaleCount;
+			} while(Width > m_MaxTexSize || Height > m_MaxTexSize);
+
+			void *pTmpData = Resize(static_cast<const unsigned char *>(pTexData), Width, Height, Width, Height, GLFormatToPixelSize(GLFormat));
+			free(pTexData);
+			pTexData = pTmpData;
+		}
+	}
+	m_vTextures[Slot].m_Width = Width;
+	m_vTextures[Slot].m_Height = Height;
+	m_vTextures[Slot].m_RescaleCount = RescaleCount;
+
+	if(GLStoreFormat == GL_RED)
+		GLStoreFormat = GL_R8;
+	const size_t PixelSize = GLFormatToPixelSize(GLFormat);
+
+	int SamplerSlot = 0;
+
+	if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+	{
+		glGenTextures(1, &m_vTextures[Slot].m_Tex);
+		glBindTexture(GL_TEXTURE_2D, m_vTextures[Slot].m_Tex);
+
+		glGenSamplers(1, &m_vTextures[Slot].m_Sampler);
+		glBindSampler(SamplerSlot, m_vTextures[Slot].m_Sampler);
+	}
+
+	if(Flags & CCommandBuffer::TEXFLAG_NOMIPMAPS)
+	{
+		if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+		{
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexImage2D(GL_TEXTURE_2D, 0, GLStoreFormat, Width, Height, 0, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+		}
+	}
+	else
+	{
+		if((Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0)
+		{
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+
+#ifndef BACKEND_AS_OPENGL_ES
+			if(m_OpenGLTextureLodBIAS != 0 && !m_IsOpenGLES)
+				glSamplerParameterf(m_vTextures[Slot].m_Sampler, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
+#endif
+
+			// prevent mipmap display bugs, when zooming out far
+			if(Width >= 1024 && Height >= 1024)
+			{
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 5.f);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
+			}
+			glTexImage2D(GL_TEXTURE_2D, 0, GLStoreFormat, Width, Height, 0, GLFormat, GL_UNSIGNED_BYTE, pTexData);
+			glGenerateMipmap(GL_TEXTURE_2D);
+		}
+
+		if((Flags & (CCommandBuffer::TEXFLAG_TO_2D_ARRAY_TEXTURE)) != 0)
+		{
+			glGenTextures(1, &m_vTextures[Slot].m_Tex2DArray);
+			glBindTexture(GL_TEXTURE_2D_ARRAY, m_vTextures[Slot].m_Tex2DArray);
+
+			glGenSamplers(1, &m_vTextures[Slot].m_Sampler2DArray);
+			glBindSampler(SamplerSlot, m_vTextures[Slot].m_Sampler2DArray);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			glSamplerParameteri(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_WRAP_R, GL_MIRRORED_REPEAT);
+
+#ifndef BACKEND_AS_OPENGL_ES
+			if(m_OpenGLTextureLodBIAS != 0 && !m_IsOpenGLES)
+				glSamplerParameterf(m_vTextures[Slot].m_Sampler2DArray, GL_TEXTURE_LOD_BIAS, ((GLfloat)m_OpenGLTextureLodBIAS / 1000.0f));
+#endif
+
+			uint8_t *p3DImageData = NULL;
+
+			p3DImageData = (uint8_t *)malloc((size_t)Width * Height * PixelSize);
+			int Image3DWidth, Image3DHeight;
+
+			int ConvertWidth = Width;
+			int ConvertHeight = Height;
+
+			if(ConvertWidth == 0 || (ConvertWidth % 16) != 0 || ConvertHeight == 0 || (ConvertHeight % 16) != 0)
+			{
+				dbg_msg("gfx", "3D/2D array texture was resized");
+				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
+				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
+				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pTexData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, GLFormatToPixelSize(GLFormat));
+
+				ConvertWidth = NewWidth;
+				ConvertHeight = NewHeight;
+
+				free(pTexData);
+				pTexData = pNewTexData;
+			}
+
+			if((Texture2DTo3D(pTexData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DImageData, Image3DWidth, Image3DHeight)))
+			{
+				glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GLStoreFormat, Image3DWidth, Image3DHeight, 256, 0, GLFormat, GL_UNSIGNED_BYTE, p3DImageData);
+				glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
+			}
+
+			free(p3DImageData);
+		}
+	}
+
+	// This is the initial value for the wrap modes
+	m_vTextures[Slot].m_LastWrapMode = CCommandBuffer::WRAP_REPEAT;
+
+	// calculate memory usage
+	m_vTextures[Slot].m_MemSize = (size_t)Width * Height * PixelSize;
+	while(Width > 2 && Height > 2)
+	{
+		Width >>= 1;
+		Height >>= 1;
+		m_vTextures[Slot].m_MemSize += (size_t)Width * Height * PixelSize;
+	}
+	m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) + m_vTextures[Slot].m_MemSize, std::memory_order_relaxed);
+
+	free(pTexData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
+{
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, TexFormatToOpenGLFormat(pCommand->m_Format), TexFormatToOpenGLFormat(pCommand->m_StoreFormat), pCommand->m_Flags, pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
+{
+	TextureUpdate(pCommand->m_Slot, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height, GL_RED, pCommand->m_pData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_TextTextures_Destroy(const CCommandBuffer::SCommand_TextTextures_Destroy *pCommand)
+{
+	DestroyTexture(pCommand->m_Slot);
+	DestroyTexture(pCommand->m_SlotOutline);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand)
+{
+	TextureCreate(pCommand->m_Slot, pCommand->m_Width, pCommand->m_Height, GL_RED, GL_RED, CCommandBuffer::TEXFLAG_NOMIPMAPS, pCommand->m_pTextData);
+	TextureCreate(pCommand->m_SlotOutline, pCommand->m_Width, pCommand->m_Height, GL_RED, GL_RED, CCommandBuffer::TEXFLAG_NOMIPMAPS, pCommand->m_pTextOutlineData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand)
+{
+	// if clip is still active, force disable it for clearing, enable it again afterwards
+	bool ClipWasEnabled = m_LastClipEnable;
+	if(ClipWasEnabled)
+	{
+		glDisable(GL_SCISSOR_TEST);
+	}
+	if(pCommand->m_Color.r != m_ClearColor.r || pCommand->m_Color.g != m_ClearColor.g || pCommand->m_Color.b != m_ClearColor.b)
+	{
+		glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
+		m_ClearColor = pCommand->m_Color;
+	}
+	glClear(GL_COLOR_BUFFER_BIT);
+	if(ClipWasEnabled)
+	{
+		glEnable(GL_SCISSOR_TEST);
+	}
+}
+
+void CCommandProcessorFragment_OpenGL3_3::UploadStreamBufferData(unsigned int PrimitiveType, const void *pVertices, size_t VertSize, unsigned int PrimitiveCount, bool AsTex3D)
+{
+	int Count = 0;
+	switch(PrimitiveType)
+	{
+	case CCommandBuffer::PRIMTYPE_LINES:
+		Count = PrimitiveCount * 2;
+		break;
+	case CCommandBuffer::PRIMTYPE_TRIANGLES:
+		Count = PrimitiveCount * 3;
+		break;
+	case CCommandBuffer::PRIMTYPE_QUADS:
+		Count = PrimitiveCount * 4;
+		break;
+	default:
+		return;
+	};
+
+	if(AsTex3D)
+		glBindBuffer(GL_ARRAY_BUFFER, m_PrimitiveDrawBufferIDTex3D);
+	else
+		glBindBuffer(GL_ARRAY_BUFFER, m_aPrimitiveDrawBufferID[m_LastStreamBuffer]);
+
+	glBufferData(GL_ARRAY_BUFFER, VertSize * Count, pVertices, GL_STREAM_DRAW);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand)
+{
+	CGLSLTWProgram *pProgram = m_pPrimitiveProgram;
+	if(IsTexturedState(pCommand->m_State))
+		pProgram = m_pPrimitiveProgramTextured;
+	UseProgram(pProgram);
+	SetState(pCommand->m_State, pProgram);
+
+	UploadStreamBufferData(pCommand->m_PrimType, pCommand->m_pVertices, sizeof(CCommandBuffer::SVertex), pCommand->m_PrimCount);
+
+	glBindVertexArray(m_aPrimitiveDrawVertexID[m_LastStreamBuffer]);
+
+	switch(pCommand->m_PrimType)
+	{
+	// We don't support GL_QUADS due to core profile
+	case CCommandBuffer::PRIMTYPE_LINES:
+		glDrawArrays(GL_LINES, 0, pCommand->m_PrimCount * 2);
+		break;
+	case CCommandBuffer::PRIMTYPE_TRIANGLES:
+		glDrawArrays(GL_TRIANGLES, 0, pCommand->m_PrimCount * 3);
+		break;
+	case CCommandBuffer::PRIMTYPE_QUADS:
+		if(m_aLastIndexBufferBound[m_LastStreamBuffer] != m_QuadDrawIndexBufferID)
+		{
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+			m_aLastIndexBufferBound[m_LastStreamBuffer] = m_QuadDrawIndexBufferID;
+		}
+		glDrawElements(GL_TRIANGLES, pCommand->m_PrimCount * 6, GL_UNSIGNED_INT, 0);
+		break;
+	default:
+		dbg_msg("render", "unknown primtype %d\n", pCommand->m_PrimType);
+	};
+
+	m_LastStreamBuffer = (m_LastStreamBuffer + 1 >= MAX_STREAM_BUFFER_COUNT ? 0 : m_LastStreamBuffer + 1);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand)
+{
+	CGLSLPrimitiveProgram *pProg = m_pPrimitive3DProgram;
+	if(IsTexturedState(pCommand->m_State))
+		pProg = m_pPrimitive3DProgramTextured;
+	UseProgram(pProg);
+	SetState(pCommand->m_State, pProg, true);
+
+	UploadStreamBufferData(pCommand->m_PrimType, pCommand->m_pVertices, sizeof(CCommandBuffer::SVertexTex3DStream), pCommand->m_PrimCount, true);
+
+	glBindVertexArray(m_PrimitiveDrawVertexIDTex3D);
+
+	switch(pCommand->m_PrimType)
+	{
+	// We don't support GL_QUADS due to core profile
+	case CCommandBuffer::PRIMTYPE_LINES:
+		glDrawArrays(GL_LINES, 0, pCommand->m_PrimCount * 2);
+		break;
+	case CCommandBuffer::PRIMTYPE_QUADS:
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		glDrawElements(GL_TRIANGLES, pCommand->m_PrimCount * 6, GL_UNSIGNED_INT, 0);
+		break;
+	default:
+		dbg_msg("render", "unknown primtype %d\n", pCommand->m_PrimType);
+	};
+}
+
+void CCommandProcessorFragment_OpenGL3_3::DestroyBufferContainer(int Index, bool DeleteBOs)
+{
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID != 0)
+		glDeleteVertexArrays(1, &BufferContainer.m_VertArrayID);
+
+	// all buffer objects can deleted automatically, so the program doesn't need to deal with them (e.g. causing crashes because of driver bugs)
+	if(DeleteBOs)
+	{
+		int VertBufferID = BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex;
+		if(VertBufferID != -1)
+		{
+			glDeleteBuffers(1, &m_vBufferObjectIndices[VertBufferID]);
+		}
+	}
+
+	BufferContainer.m_LastIndexBufferBound = 0;
+	BufferContainer.m_ContainerInfo.m_vAttributes.clear();
+}
+
+void CCommandProcessorFragment_OpenGL3_3::AppendIndices(unsigned int NewIndicesCount)
+{
+	if(NewIndicesCount <= m_CurrentIndicesInBuffer)
+		return;
+	unsigned int AddCount = NewIndicesCount - m_CurrentIndicesInBuffer;
+	unsigned int *pIndices = new unsigned int[AddCount];
+	int Primq = (m_CurrentIndicesInBuffer / 6) * 4;
+	for(unsigned int i = 0; i < AddCount; i += 6)
+	{
+		pIndices[i] = Primq;
+		pIndices[i + 1] = Primq + 1;
+		pIndices[i + 2] = Primq + 2;
+		pIndices[i + 3] = Primq;
+		pIndices[i + 4] = Primq + 2;
+		pIndices[i + 5] = Primq + 3;
+		Primq += 4;
+	}
+
+	glBindBuffer(GL_COPY_READ_BUFFER, m_QuadDrawIndexBufferID);
+	GLuint NewIndexBufferID;
+	glGenBuffers(1, &NewIndexBufferID);
+	glBindBuffer(BUFFER_INIT_INDEX_TARGET, NewIndexBufferID);
+	GLsizeiptr size = sizeof(unsigned int);
+	glBufferData(BUFFER_INIT_INDEX_TARGET, (GLsizeiptr)NewIndicesCount * size, NULL, GL_STATIC_DRAW);
+	glCopyBufferSubData(GL_COPY_READ_BUFFER, BUFFER_INIT_INDEX_TARGET, 0, 0, (GLsizeiptr)m_CurrentIndicesInBuffer * size);
+	glBufferSubData(BUFFER_INIT_INDEX_TARGET, (GLsizeiptr)m_CurrentIndicesInBuffer * size, (GLsizeiptr)AddCount * size, pIndices);
+	glBindBuffer(BUFFER_INIT_INDEX_TARGET, 0);
+	glBindBuffer(GL_COPY_READ_BUFFER, 0);
+
+	glDeleteBuffers(1, &m_QuadDrawIndexBufferID);
+	m_QuadDrawIndexBufferID = NewIndexBufferID;
+
+	for(unsigned int &i : m_aLastIndexBufferBound)
+		i = 0;
+	for(auto &BufferContainer : m_vBufferContainers)
+	{
+		BufferContainer.m_LastIndexBufferBound = 0;
+	}
+
+	m_CurrentIndicesInBuffer = NewIndicesCount;
+	delete[] pIndices;
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+	// create necessary space
+	if((size_t)Index >= m_vBufferObjectIndices.size())
+	{
+		for(int i = m_vBufferObjectIndices.size(); i < Index + 1; ++i)
+		{
+			m_vBufferObjectIndices.push_back(0);
+		}
+	}
+
+	GLuint VertBufferID = 0;
+
+	glGenBuffers(1, &VertBufferID);
+	glBindBuffer(BUFFER_INIT_VERTEX_TARGET, VertBufferID);
+	glBufferData(BUFFER_INIT_VERTEX_TARGET, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
+
+	m_vBufferObjectIndices[Index] = VertBufferID;
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+
+	glBindBuffer(BUFFER_INIT_VERTEX_TARGET, m_vBufferObjectIndices[Index]);
+	glBufferData(BUFFER_INIT_VERTEX_TARGET, (GLsizeiptr)(pCommand->m_DataSize), pUploadData, GL_STATIC_DRAW);
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand)
+{
+	void *pUploadData = pCommand->m_pUploadData;
+	int Index = pCommand->m_BufferIndex;
+
+	glBindBuffer(BUFFER_INIT_VERTEX_TARGET, m_vBufferObjectIndices[Index]);
+	glBufferSubData(BUFFER_INIT_VERTEX_TARGET, (GLintptr)(pCommand->m_pOffset), (GLsizeiptr)(pCommand->m_DataSize), pUploadData);
+
+	if(pCommand->m_DeletePointer)
+		free(pUploadData);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand)
+{
+	int WriteIndex = pCommand->m_WriteBufferIndex;
+	int ReadIndex = pCommand->m_ReadBufferIndex;
+
+	glBindBuffer(GL_COPY_WRITE_BUFFER, m_vBufferObjectIndices[WriteIndex]);
+	glBindBuffer(GL_COPY_READ_BUFFER, m_vBufferObjectIndices[ReadIndex]);
+	glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, (GLsizeiptr)(pCommand->m_ReadOffset), (GLsizeiptr)(pCommand->m_WriteOffset), (GLsizeiptr)pCommand->m_CopySize);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand)
+{
+	int Index = pCommand->m_BufferIndex;
+
+	glDeleteBuffers(1, &m_vBufferObjectIndices[Index]);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// create necessary space
+	if((size_t)Index >= m_vBufferContainers.size())
+	{
+		for(int i = m_vBufferContainers.size(); i < Index + 1; ++i)
+		{
+			SBufferContainer Container;
+			Container.m_ContainerInfo.m_Stride = 0;
+			Container.m_ContainerInfo.m_VertBufferBindingIndex = -1;
+			m_vBufferContainers.push_back(Container);
+		}
+	}
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	glGenVertexArrays(1, &BufferContainer.m_VertArrayID);
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+
+	BufferContainer.m_LastIndexBufferBound = 0;
+
+	for(size_t i = 0; i < pCommand->m_AttrCount; ++i)
+	{
+		glEnableVertexAttribArray((GLuint)i);
+
+		glBindBuffer(GL_ARRAY_BUFFER, m_vBufferObjectIndices[pCommand->m_VertBufferBindingIndex]);
+
+		SBufferContainerInfo::SAttribute &Attr = pCommand->m_pAttributes[i];
+
+		if(Attr.m_FuncType == 0)
+			glVertexAttribPointer((GLuint)i, Attr.m_DataTypeCount, Attr.m_Type, (GLboolean)Attr.m_Normalized, pCommand->m_Stride, Attr.m_pOffset);
+		else if(Attr.m_FuncType == 1)
+			glVertexAttribIPointer((GLuint)i, Attr.m_DataTypeCount, Attr.m_Type, pCommand->m_Stride, Attr.m_pOffset);
+
+		BufferContainer.m_ContainerInfo.m_vAttributes.push_back(Attr);
+	}
+
+	BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex = pCommand->m_VertBufferBindingIndex;
+	BufferContainer.m_ContainerInfo.m_Stride = pCommand->m_Stride;
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand)
+{
+	SBufferContainer &BufferContainer = m_vBufferContainers[pCommand->m_BufferContainerIndex];
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+
+	// disable all old attributes
+	for(size_t i = 0; i < BufferContainer.m_ContainerInfo.m_vAttributes.size(); ++i)
+	{
+		glDisableVertexAttribArray((GLuint)i);
+	}
+	BufferContainer.m_ContainerInfo.m_vAttributes.clear();
+
+	for(size_t i = 0; i < pCommand->m_AttrCount; ++i)
+	{
+		glEnableVertexAttribArray((GLuint)i);
+
+		glBindBuffer(GL_ARRAY_BUFFER, m_vBufferObjectIndices[pCommand->m_VertBufferBindingIndex]);
+		SBufferContainerInfo::SAttribute &Attr = pCommand->m_pAttributes[i];
+		if(Attr.m_FuncType == 0)
+			glVertexAttribPointer((GLuint)i, Attr.m_DataTypeCount, Attr.m_Type, Attr.m_Normalized, pCommand->m_Stride, Attr.m_pOffset);
+		else if(Attr.m_FuncType == 1)
+			glVertexAttribIPointer((GLuint)i, Attr.m_DataTypeCount, Attr.m_Type, pCommand->m_Stride, Attr.m_pOffset);
+
+		BufferContainer.m_ContainerInfo.m_vAttributes.push_back(Attr);
+	}
+
+	BufferContainer.m_ContainerInfo.m_VertBufferBindingIndex = pCommand->m_VertBufferBindingIndex;
+	BufferContainer.m_ContainerInfo.m_Stride = pCommand->m_Stride;
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand)
+{
+	DestroyBufferContainer(pCommand->m_BufferContainerIndex, pCommand->m_DestroyAllBO);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand)
+{
+	if(pCommand->m_RequiredIndicesNum > m_CurrentIndicesInBuffer)
+		AppendIndices(pCommand->m_RequiredIndicesNum);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	CGLSLTileProgram *pProgram = NULL;
+	if(IsTexturedState(pCommand->m_State))
+		pProgram = m_pBorderTileProgramTextured;
+	else
+		pProgram = m_pBorderTileProgram;
+	UseProgram(pProgram);
+
+	SetState(pCommand->m_State, pProgram, true);
+	pProgram->SetUniformVec4(pProgram->m_LocColor, 1, (float *)&pCommand->m_Color);
+
+	pProgram->SetUniformVec2(pProgram->m_LocOffset, 1, (float *)&pCommand->m_Offset);
+	pProgram->SetUniformVec2(pProgram->m_LocScale, 1, (float *)&pCommand->m_Scale);
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+	glDrawElements(GL_TRIANGLES, pCommand->m_DrawNum * 6, GL_UNSIGNED_INT, pCommand->m_pIndicesOffset);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	if(pCommand->m_IndicesDrawNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	CGLSLTileProgram *pProgram = NULL;
+	if(IsTexturedState(pCommand->m_State))
+	{
+		pProgram = m_pTileProgramTextured;
+	}
+	else
+		pProgram = m_pTileProgram;
+
+	UseProgram(pProgram);
+
+	SetState(pCommand->m_State, pProgram, true);
+	pProgram->SetUniformVec4(pProgram->m_LocColor, 1, (float *)&pCommand->m_Color);
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+	for(int i = 0; i < pCommand->m_IndicesDrawNum; ++i)
+	{
+		glDrawElements(GL_TRIANGLES, pCommand->m_pDrawCount[i], GL_UNSIGNED_INT, pCommand->m_pIndicesOffsets[i]);
+	}
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadLayer(const CCommandBuffer::SCommand_RenderQuadLayer *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	if(pCommand->m_QuadNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	CGLSLQuadProgram *pProgram = NULL;
+	if(IsTexturedState(pCommand->m_State))
+	{
+		pProgram = m_pQuadProgramTextured;
+	}
+	else
+		pProgram = m_pQuadProgram;
+
+	UseProgram(pProgram);
+	SetState(pCommand->m_State, pProgram);
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+
+	int QuadsLeft = pCommand->m_QuadNum;
+	size_t QuadOffset = 0;
+	// the extra offset is not related to the information from the command, but an actual offset in the buffer
+	size_t QuadOffsetExtra = pCommand->m_QuadOffset;
+
+	vec4 aColors[ms_MaxQuadsPossible];
+	vec2 aOffsets[ms_MaxQuadsPossible];
+	float aRotations[ms_MaxQuadsPossible];
+
+	while(QuadsLeft > 0)
+	{
+		int ActualQuadCount = minimum<int>(QuadsLeft, m_MaxQuadsAtOnce);
+
+		for(size_t i = 0; i < (size_t)ActualQuadCount; ++i)
+		{
+			aColors[i] = pCommand->m_pQuadInfo[i + QuadOffset].m_Color;
+			aOffsets[i] = pCommand->m_pQuadInfo[i + QuadOffset].m_Offsets;
+			aRotations[i] = pCommand->m_pQuadInfo[i + QuadOffset].m_Rotation;
+		}
+
+		pProgram->SetUniformVec4(pProgram->m_LocColors, ActualQuadCount, (float *)aColors);
+		pProgram->SetUniformVec2(pProgram->m_LocOffsets, ActualQuadCount, (float *)aOffsets);
+		pProgram->SetUniform(pProgram->m_LocRotations, ActualQuadCount, (float *)aRotations);
+		pProgram->SetUniform(pProgram->m_LocQuadOffset, (int)(QuadOffset + QuadOffsetExtra));
+		glDrawElements(GL_TRIANGLES, ActualQuadCount * 6, GL_UNSIGNED_INT, (void *)((QuadOffset + QuadOffsetExtra) * 6 * sizeof(unsigned int)));
+
+		QuadsLeft -= ActualQuadCount;
+		QuadOffset += (size_t)ActualQuadCount;
+	}
+}
+
+void CCommandProcessorFragment_OpenGL3_3::RenderText(const CCommandBuffer::SState &State, int DrawNum, int TextTextureIndex, int TextOutlineTextureIndex, int TextureSize, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor)
+{
+	if(DrawNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	UseProgram(m_pTextProgram);
+
+	int SlotText = 0;
+	int SlotTextOutline = 1;
+	glBindTexture(GL_TEXTURE_2D, m_vTextures[TextTextureIndex].m_Tex);
+	glBindSampler(SlotText, m_vTextures[TextTextureIndex].m_Sampler);
+	glActiveTexture(GL_TEXTURE1);
+	glBindTexture(GL_TEXTURE_2D, m_vTextures[TextOutlineTextureIndex].m_Tex);
+	glBindSampler(SlotTextOutline, m_vTextures[TextOutlineTextureIndex].m_Sampler);
+	glActiveTexture(GL_TEXTURE0);
+
+	if(m_pTextProgram->m_LastTextSampler != SlotText)
+	{
+		m_pTextProgram->SetUniform(m_pTextProgram->m_LocTextSampler, SlotText);
+		m_pTextProgram->m_LastTextSampler = SlotText;
+	}
+
+	if(m_pTextProgram->m_LastTextOutlineSampler != SlotTextOutline)
+	{
+		m_pTextProgram->SetUniform(m_pTextProgram->m_LocTextOutlineSampler, SlotTextOutline);
+		m_pTextProgram->m_LastTextOutlineSampler = SlotTextOutline;
+	}
+
+	SetState(State, m_pTextProgram);
+
+	if(m_pTextProgram->m_LastTextureSize != TextureSize)
+	{
+		m_pTextProgram->SetUniform(m_pTextProgram->m_LocTextureSize, (float)TextureSize);
+		m_pTextProgram->m_LastTextureSize = TextureSize;
+	}
+
+	if(m_pTextProgram->m_LastOutlineColor != TextOutlineColor)
+	{
+		m_pTextProgram->SetUniformVec4(m_pTextProgram->m_LocOutlineColor, 1, (float *)&TextOutlineColor);
+		m_pTextProgram->m_LastOutlineColor = TextOutlineColor;
+	}
+
+	if(m_pTextProgram->m_LastColor != TextColor)
+	{
+		m_pTextProgram->SetUniformVec4(m_pTextProgram->m_LocColor, 1, (float *)&TextColor);
+		m_pTextProgram->m_LastColor = TextColor;
+	}
+
+	glDrawElements(GL_TRIANGLES, DrawNum, GL_UNSIGNED_INT, (void *)(0));
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderText(const CCommandBuffer::SCommand_RenderText *pCommand)
+{
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+
+	RenderText(pCommand->m_State, pCommand->m_DrawNum, pCommand->m_TextTextureIndex, pCommand->m_TextOutlineTextureIndex, pCommand->m_TextureSize, pCommand->m_TextColor, pCommand->m_TextOutlineColor);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainer(const CCommandBuffer::SCommand_RenderQuadContainer *pCommand)
+{
+	if(pCommand->m_DrawNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+
+	CGLSLTWProgram *pProgram = m_pPrimitiveProgram;
+	if(IsTexturedState(pCommand->m_State))
+		pProgram = m_pPrimitiveProgramTextured;
+	UseProgram(pProgram);
+	SetState(pCommand->m_State, pProgram);
+
+	glDrawElements(GL_TRIANGLES, pCommand->m_DrawNum, GL_UNSIGNED_INT, pCommand->m_pOffset);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainerEx(const CCommandBuffer::SCommand_RenderQuadContainerEx *pCommand)
+{
+	if(pCommand->m_DrawNum == 0)
+	{
+		return; // nothing to draw
+	}
+
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+
+	CGLSLPrimitiveExProgram *pProgram = m_pPrimitiveExProgramRotationless;
+	if(IsTexturedState(pCommand->m_State))
+	{
+		if(pCommand->m_Rotation != 0.0f)
+			pProgram = m_pPrimitiveExProgramTextured;
+		else
+			pProgram = m_pPrimitiveExProgramTexturedRotationless;
+	}
+	else
+	{
+		if(pCommand->m_Rotation != 0.0f)
+			pProgram = m_pPrimitiveExProgram;
+	}
+
+	UseProgram(pProgram);
+	SetState(pCommand->m_State, pProgram);
+
+	if(pCommand->m_Rotation != 0.0f && pProgram->m_LastCenter != pCommand->m_Center)
+	{
+		pProgram->SetUniformVec2(pProgram->m_LocCenter, 1, (float *)&pCommand->m_Center);
+		pProgram->m_LastCenter = pCommand->m_Center;
+	}
+
+	if(pProgram->m_LastRotation != pCommand->m_Rotation)
+	{
+		pProgram->SetUniform(pProgram->m_LocRotation, pCommand->m_Rotation);
+		pProgram->m_LastRotation = pCommand->m_Rotation;
+	}
+
+	if(pProgram->m_LastVerticesColor != pCommand->m_VertexColor)
+	{
+		pProgram->SetUniformVec4(pProgram->m_LocVertciesColor, 1, (float *)&pCommand->m_VertexColor);
+		pProgram->m_LastVerticesColor = pCommand->m_VertexColor;
+	}
+
+	glDrawElements(GL_TRIANGLES, pCommand->m_DrawNum, GL_UNSIGNED_INT, pCommand->m_pOffset);
+}
+
+void CCommandProcessorFragment_OpenGL3_3::Cmd_RenderQuadContainerAsSpriteMultiple(const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *pCommand)
+{
+	if(pCommand->m_DrawNum == 0 || pCommand->m_DrawCount == 0)
+	{
+		return; // nothing to draw
+	}
+
+	int Index = pCommand->m_BufferContainerIndex;
+	// if space not there return
+	if((size_t)Index >= m_vBufferContainers.size())
+		return;
+
+	SBufferContainer &BufferContainer = m_vBufferContainers[Index];
+	if(BufferContainer.m_VertArrayID == 0)
+		return;
+
+	glBindVertexArray(BufferContainer.m_VertArrayID);
+	if(BufferContainer.m_LastIndexBufferBound != m_QuadDrawIndexBufferID)
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_QuadDrawIndexBufferID);
+		BufferContainer.m_LastIndexBufferBound = m_QuadDrawIndexBufferID;
+	}
+
+	UseProgram(m_pSpriteProgramMultiple);
+	SetState(pCommand->m_State, m_pSpriteProgramMultiple);
+
+	if(m_pSpriteProgramMultiple->m_LastCenter != pCommand->m_Center)
+	{
+		m_pSpriteProgramMultiple->SetUniformVec2(m_pSpriteProgramMultiple->m_LocCenter, 1, (float *)&pCommand->m_Center);
+		m_pSpriteProgramMultiple->m_LastCenter = pCommand->m_Center;
+	}
+
+	if(m_pSpriteProgramMultiple->m_LastVerticesColor != pCommand->m_VertexColor)
+	{
+		m_pSpriteProgramMultiple->SetUniformVec4(m_pSpriteProgramMultiple->m_LocVertciesColor, 1, (float *)&pCommand->m_VertexColor);
+		m_pSpriteProgramMultiple->m_LastVerticesColor = pCommand->m_VertexColor;
+	}
+
+	int DrawCount = pCommand->m_DrawCount;
+	size_t RenderOffset = 0;
+
+	// 4 for the center (always use vec4) and 16 for the matrix(just to be sure), 4 for the sampler and vertex color
+	const int RSPCount = 256 - 4 - 16 - 8;
+
+	while(DrawCount > 0)
+	{
+		int UniformCount = (DrawCount > RSPCount ? RSPCount : DrawCount);
+
+		m_pSpriteProgramMultiple->SetUniformVec4(m_pSpriteProgramMultiple->m_LocRSP, UniformCount, (float *)(pCommand->m_pRenderInfo + RenderOffset));
+
+		glDrawElementsInstanced(GL_TRIANGLES, pCommand->m_DrawNum, GL_UNSIGNED_INT, pCommand->m_pOffset, UniformCount);
+
+		RenderOffset += RSPCount;
+		DrawCount -= RSPCount;
+	}
+}
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/backend_opengl3.h b/src_bkp/engine/client/backend/opengl/backend_opengl3.h
new file mode 100644
index 0000000000..5b3b883605
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/backend_opengl3.h
@@ -0,0 +1,119 @@
+// This file can be included several times.
+#if(!defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H)) || \
+	(defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H_AS_ES))
+
+#if !defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H)
+#define ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H
+#endif
+
+#if defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H_AS_ES)
+#define ENGINE_CLIENT_BACKEND_OPENGL_BACKEND_OPENGL3_H_AS_ES
+#endif
+
+#include "backend_opengl.h"
+
+class CGLSLPrimitiveExProgram;
+class CGLSLQuadProgram;
+class CGLSLSpriteMultipleProgram;
+class CGLSLTextProgram;
+
+#define MAX_STREAM_BUFFER_COUNT 10
+
+// takes care of opengl 3.3+ related rendering
+class CCommandProcessorFragment_OpenGL3_3 : public CCommandProcessorFragment_OpenGL3
+{
+protected:
+	int m_MaxQuadsAtOnce;
+	static const int ms_MaxQuadsPossible = 256;
+
+	CGLSLPrimitiveProgram *m_pPrimitiveProgram;
+	CGLSLPrimitiveProgram *m_pPrimitiveProgramTextured;
+	CGLSLQuadProgram *m_pQuadProgram;
+	CGLSLQuadProgram *m_pQuadProgramTextured;
+	CGLSLTextProgram *m_pTextProgram;
+	CGLSLPrimitiveExProgram *m_pPrimitiveExProgram;
+	CGLSLPrimitiveExProgram *m_pPrimitiveExProgramTextured;
+	CGLSLPrimitiveExProgram *m_pPrimitiveExProgramRotationless;
+	CGLSLPrimitiveExProgram *m_pPrimitiveExProgramTexturedRotationless;
+	CGLSLSpriteMultipleProgram *m_pSpriteProgramMultiple;
+
+	TWGLuint m_LastProgramID;
+
+	TWGLuint m_aPrimitiveDrawVertexID[MAX_STREAM_BUFFER_COUNT];
+	TWGLuint m_PrimitiveDrawVertexIDTex3D;
+	TWGLuint m_aPrimitiveDrawBufferID[MAX_STREAM_BUFFER_COUNT];
+	TWGLuint m_PrimitiveDrawBufferIDTex3D;
+
+	TWGLuint m_aLastIndexBufferBound[MAX_STREAM_BUFFER_COUNT];
+
+	int m_LastStreamBuffer;
+
+	TWGLuint m_QuadDrawIndexBufferID;
+	unsigned int m_CurrentIndicesInBuffer;
+
+	void DestroyBufferContainer(int Index, bool DeleteBOs = true);
+
+	void AppendIndices(unsigned int NewIndicesCount);
+
+	struct SBufferContainer
+	{
+		SBufferContainer() :
+			m_VertArrayID(0), m_LastIndexBufferBound(0) {}
+		TWGLuint m_VertArrayID;
+		TWGLuint m_LastIndexBufferBound;
+		SBufferContainerInfo m_ContainerInfo;
+	};
+	std::vector<SBufferContainer> m_vBufferContainers;
+
+	std::vector<TWGLuint> m_vBufferObjectIndices;
+
+	CCommandBuffer::SColorf m_ClearColor;
+
+	void InitPrimExProgram(CGLSLPrimitiveExProgram *pProgram, class CGLSLCompiler *pCompiler, class IStorage *pStorage, bool Textured, bool Rotationless);
+
+	static int TexFormatToNewOpenGLFormat(int TexFormat);
+	bool IsNewApi() override { return true; }
+
+	void UseProgram(CGLSLTWProgram *pProgram);
+	void UploadStreamBufferData(unsigned int PrimitiveType, const void *pVertices, size_t VertSize, unsigned int PrimitiveCount, bool AsTex3D = false);
+	void RenderText(const CCommandBuffer::SState &State, int DrawNum, int TextTextureIndex, int TextOutlineTextureIndex, int TextureSize, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor);
+
+	void TextureUpdate(int Slot, int X, int Y, int Width, int Height, int GLFormat, void *pTexData);
+	void TextureCreate(int Slot, int Width, int Height, int GLFormat, int GLStoreFormat, int Flags, void *pTexData);
+
+	bool Cmd_Init(const SCommand_Init *pCommand) override;
+	void Cmd_Shutdown(const SCommand_Shutdown *pCommand) override;
+	void Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand) override;
+	void Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand) override;
+	void Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand) override;
+	void Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand) override;
+	void Cmd_TextTextures_Destroy(const CCommandBuffer::SCommand_TextTextures_Destroy *pCommand) override;
+	void Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand) override;
+	void Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand) override;
+	void Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand) override;
+	void Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand) override;
+
+	void Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand) override;
+	void Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand) override;
+	void Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand) override;
+	void Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand) override;
+	void Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand) override;
+
+	void Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand) override;
+	void Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand) override;
+	void Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand) override;
+	void Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand) override;
+
+	void Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand) override;
+	void Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand) override;
+	void Cmd_RenderQuadLayer(const CCommandBuffer::SCommand_RenderQuadLayer *pCommand) override;
+	void Cmd_RenderText(const CCommandBuffer::SCommand_RenderText *pCommand) override;
+	void Cmd_RenderQuadContainer(const CCommandBuffer::SCommand_RenderQuadContainer *pCommand) override;
+	void Cmd_RenderQuadContainerEx(const CCommandBuffer::SCommand_RenderQuadContainerEx *pCommand) override;
+	void Cmd_RenderQuadContainerAsSpriteMultiple(const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *pCommand) override;
+
+public:
+	CCommandProcessorFragment_OpenGL3_3() = default;
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/opengl_sl.cpp b/src_bkp/engine/client/backend/opengl/opengl_sl.cpp
new file mode 100644
index 0000000000..046e4168d7
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/opengl_sl.cpp
@@ -0,0 +1,165 @@
+#include "opengl_sl.h"
+
+#include <base/detect.h>
+
+#if defined(BACKEND_AS_OPENGL_ES) || !defined(CONF_BACKEND_OPENGL_ES)
+
+#include <cstdio>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+#include <string>
+#include <vector>
+
+#include <engine/client/backend/glsl_shader_compiler.h>
+#include <engine/graphics.h>
+
+#ifndef BACKEND_AS_OPENGL_ES
+#include <GL/glew.h>
+#else
+#include <GLES3/gl3.h>
+#endif
+
+bool CGLSL::LoadShader(CGLSLCompiler *pCompiler, IStorage *pStorage, const char *pFile, int Type)
+{
+	if(m_IsLoaded)
+		return true;
+	IOHANDLE f = pStorage->OpenFile(pFile, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+
+	std::vector<std::string> vLines;
+	if(f)
+	{
+		EBackendType BackendType = pCompiler->m_IsOpenGLES ? BACKEND_TYPE_OPENGL_ES : BACKEND_TYPE_OPENGL;
+		bool IsNewOpenGL = (BackendType == BACKEND_TYPE_OPENGL ? (pCompiler->m_OpenGLVersionMajor >= 4 || (pCompiler->m_OpenGLVersionMajor == 3 && pCompiler->m_OpenGLVersionMinor == 3)) : pCompiler->m_OpenGLVersionMajor >= 3);
+		std::string GLShaderStringPostfix = std::string(" core\r\n");
+		if(BackendType == BACKEND_TYPE_OPENGL_ES)
+			GLShaderStringPostfix = std::string(" es\r\n");
+		//add compiler specific values
+		if(IsNewOpenGL)
+			vLines.push_back(std::string("#version ") + std::string(std::to_string(pCompiler->m_OpenGLVersionMajor)) + std::string(std::to_string(pCompiler->m_OpenGLVersionMinor)) + std::string(std::to_string(pCompiler->m_OpenGLVersionPatch)) + GLShaderStringPostfix);
+		else
+		{
+			if(pCompiler->m_OpenGLVersionMajor == 3)
+			{
+				if(pCompiler->m_OpenGLVersionMinor == 0)
+					vLines.emplace_back("#version 130 \r\n");
+				if(pCompiler->m_OpenGLVersionMinor == 1)
+					vLines.emplace_back("#version 140 \r\n");
+				if(pCompiler->m_OpenGLVersionMinor == 2)
+					vLines.emplace_back("#version 150 \r\n");
+			}
+			else if(pCompiler->m_OpenGLVersionMajor == 2)
+			{
+				if(pCompiler->m_OpenGLVersionMinor == 0)
+					vLines.emplace_back("#version 110 \r\n");
+				if(pCompiler->m_OpenGLVersionMinor == 1)
+					vLines.emplace_back("#version 120 \r\n");
+			}
+		}
+
+		if(BackendType == BACKEND_TYPE_OPENGL_ES)
+		{
+			if(Type == GL_FRAGMENT_SHADER)
+			{
+				vLines.emplace_back("precision highp float; \r\n");
+				vLines.emplace_back("precision highp sampler2D; \r\n");
+				vLines.emplace_back("precision highp sampler3D; \r\n");
+				vLines.emplace_back("precision highp samplerCube; \r\n");
+				vLines.emplace_back("precision highp samplerCubeShadow; \r\n");
+				vLines.emplace_back("precision highp sampler2DShadow; \r\n");
+				vLines.emplace_back("precision highp sampler2DArray; \r\n");
+				vLines.emplace_back("precision highp sampler2DArrayShadow; \r\n");
+			}
+		}
+
+		for(const CGLSLCompiler::SGLSLCompilerDefine &Define : pCompiler->m_vDefines)
+		{
+			vLines.push_back(std::string("#define ") + Define.m_DefineName + std::string(" ") + Define.m_DefineValue + std::string("\r\n"));
+		}
+
+		if(Type == GL_FRAGMENT_SHADER && !IsNewOpenGL && pCompiler->m_OpenGLVersionMajor <= 3 && pCompiler->m_HasTextureArray)
+		{
+			vLines.emplace_back("#extension GL_EXT_texture_array : enable\r\n");
+		}
+
+		CLineReader LineReader;
+		LineReader.Init(f);
+		char *pReadLine = NULL;
+		while((pReadLine = LineReader.Get()))
+		{
+			std::string Line;
+			pCompiler->ParseLine(Line, pReadLine, Type == GL_FRAGMENT_SHADER ? GLSL_SHADER_COMPILER_TYPE_FRAGMENT : GLSL_SHADER_COMPILER_TYPE_VERTEX);
+			Line.append("\r\n");
+			vLines.push_back(Line);
+		}
+		io_close(f);
+
+		const char **ShaderCode = new const char *[vLines.size()];
+
+		for(size_t i = 0; i < vLines.size(); ++i)
+		{
+			ShaderCode[i] = vLines[i].c_str();
+		}
+
+		TWGLuint shader = glCreateShader(Type);
+
+		glShaderSource(shader, vLines.size(), ShaderCode, NULL);
+		glCompileShader(shader);
+
+		delete[] ShaderCode;
+
+		int CompilationStatus;
+		glGetShaderiv(shader, GL_COMPILE_STATUS, &CompilationStatus);
+
+		if(CompilationStatus == GL_FALSE)
+		{
+			char aBuf[3000];
+
+			TWGLint maxLength = 0;
+			glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &maxLength);
+
+			glGetShaderInfoLog(shader, maxLength, &maxLength, aBuf);
+
+			dbg_msg("glsl", "%s: %s", pFile, aBuf);
+			glDeleteShader(shader);
+			return false;
+		}
+		m_Type = Type;
+		m_IsLoaded = true;
+
+		m_ShaderID = shader;
+
+		return true;
+	}
+	else
+		return false;
+}
+
+void CGLSL::DeleteShader()
+{
+	if(!IsLoaded())
+		return;
+	m_IsLoaded = false;
+	glDeleteShader(m_ShaderID);
+}
+
+bool CGLSL::IsLoaded() const
+{
+	return m_IsLoaded;
+}
+
+TWGLuint CGLSL::GetShaderID() const
+{
+	return m_ShaderID;
+}
+
+CGLSL::CGLSL()
+{
+	m_IsLoaded = false;
+}
+
+CGLSL::~CGLSL()
+{
+	DeleteShader();
+}
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/opengl_sl.h b/src_bkp/engine/client/backend/opengl/opengl_sl.h
new file mode 100644
index 0000000000..3c2a640023
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/opengl_sl.h
@@ -0,0 +1,35 @@
+// This file can be included several times.
+#if(!defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H)) || \
+	(defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H_AS_ES))
+
+#if !defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H)
+#define ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H
+#endif
+
+#if defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H_AS_ES)
+#define ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_H_AS_ES
+#endif
+
+#include <engine/client/graphics_defines.h>
+
+class CGLSLCompiler;
+
+class CGLSL
+{
+public:
+	bool LoadShader(CGLSLCompiler *pCompiler, class IStorage *pStorage, const char *pFile, int Type);
+	void DeleteShader();
+
+	bool IsLoaded() const;
+	TWGLuint GetShaderID() const;
+
+	CGLSL();
+	virtual ~CGLSL();
+
+private:
+	TWGLuint m_ShaderID;
+	int m_Type;
+	bool m_IsLoaded;
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/opengl_sl_program.cpp b/src_bkp/engine/client/backend/opengl/opengl_sl_program.cpp
new file mode 100644
index 0000000000..2ba94325b1
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/opengl_sl_program.cpp
@@ -0,0 +1,148 @@
+#include "opengl_sl_program.h"
+#include "opengl_sl.h"
+#include <base/system.h>
+
+#include <base/detect.h>
+
+#if defined(BACKEND_AS_OPENGL_ES) || !defined(CONF_BACKEND_OPENGL_ES)
+
+#ifndef BACKEND_AS_OPENGL_ES
+#include <GL/glew.h>
+#else
+#include <GLES3/gl3.h>
+#endif
+
+void CGLSLProgram::CreateProgram()
+{
+	m_ProgramID = glCreateProgram();
+}
+
+void CGLSLProgram::DeleteProgram()
+{
+	if(!m_IsLinked)
+		return;
+	m_IsLinked = false;
+	glDeleteProgram(m_ProgramID);
+}
+
+bool CGLSLProgram::AddShader(CGLSL *pShader) const
+{
+	if(pShader->IsLoaded())
+	{
+		glAttachShader(m_ProgramID, pShader->GetShaderID());
+		return true;
+	}
+	return false;
+}
+
+void CGLSLProgram::DetachShader(CGLSL *pShader) const
+{
+	if(pShader->IsLoaded())
+	{
+		DetachShaderByID(pShader->GetShaderID());
+	}
+}
+
+void CGLSLProgram::DetachShaderByID(TWGLuint ShaderID) const
+{
+	glDetachShader(m_ProgramID, ShaderID);
+}
+
+void CGLSLProgram::LinkProgram()
+{
+	glLinkProgram(m_ProgramID);
+	int LinkStatus;
+	glGetProgramiv(m_ProgramID, GL_LINK_STATUS, &LinkStatus);
+	m_IsLinked = LinkStatus == GL_TRUE;
+	if(!m_IsLinked)
+	{
+		char aInfoLog[1024];
+		char aFinalMessage[1536];
+		int iLogLength;
+		glGetProgramInfoLog(m_ProgramID, 1024, &iLogLength, aInfoLog);
+		str_format(aFinalMessage, sizeof(aFinalMessage), "Error! Shader program wasn't linked! The linker returned:\n\n%s", aInfoLog);
+		dbg_msg("glslprogram", "%s", aFinalMessage);
+	}
+
+	//detach all shaders attached to this program
+	DetachAllShaders();
+}
+
+void CGLSLProgram::DetachAllShaders() const
+{
+	TWGLuint aShaders[100];
+	GLsizei ReturnedCount = 0;
+	while(true)
+	{
+		glGetAttachedShaders(m_ProgramID, 100, &ReturnedCount, aShaders);
+
+		if(ReturnedCount > 0)
+		{
+			for(GLsizei i = 0; i < ReturnedCount; ++i)
+			{
+				DetachShaderByID(aShaders[i]);
+			}
+		}
+
+		if(ReturnedCount < 100)
+			break;
+	}
+}
+
+void CGLSLProgram::SetUniformVec4(int Loc, int Count, const float *pValues)
+{
+	glUniform4fv(Loc, Count, pValues);
+}
+
+void CGLSLProgram::SetUniformVec2(int Loc, int Count, const float *pValues)
+{
+	glUniform2fv(Loc, Count, pValues);
+}
+
+void CGLSLProgram::SetUniform(int Loc, int Count, const float *pValues)
+{
+	glUniform1fv(Loc, Count, pValues);
+}
+
+void CGLSLProgram::SetUniform(int Loc, const int Value)
+{
+	glUniform1i(Loc, Value);
+}
+
+void CGLSLProgram::SetUniform(int Loc, const float Value)
+{
+	glUniform1f(Loc, Value);
+}
+
+void CGLSLProgram::SetUniform(int Loc, const bool Value)
+{
+	glUniform1i(Loc, (int)Value);
+}
+
+int CGLSLProgram::GetUniformLoc(const char *pName) const
+{
+	return glGetUniformLocation(m_ProgramID, pName);
+}
+
+void CGLSLProgram::UseProgram() const
+{
+	if(m_IsLinked)
+		glUseProgram(m_ProgramID);
+}
+
+TWGLuint CGLSLProgram::GetProgramID() const
+{
+	return m_ProgramID;
+}
+
+CGLSLProgram::CGLSLProgram()
+{
+	m_IsLinked = false;
+}
+
+CGLSLProgram::~CGLSLProgram()
+{
+	DeleteProgram();
+}
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengl/opengl_sl_program.h b/src_bkp/engine/client/backend/opengl/opengl_sl_program.h
new file mode 100644
index 0000000000..f278731c86
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengl/opengl_sl_program.h
@@ -0,0 +1,163 @@
+// This file can be included several times.
+#if(!defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H)) || \
+	(defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H_AS_ES))
+
+#if !defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H)
+#define ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H
+#endif
+
+#if defined(BACKEND_AS_OPENGL_ES) && !defined(ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H_AS_ES)
+#define ENGINE_CLIENT_BACKEND_OPENGL_OPENGL_SL_PROGRAM_H_AS_ES
+#endif
+
+#include <base/color.h>
+#include <base/vmath.h>
+#include <engine/client/graphics_defines.h>
+
+class CGLSL;
+
+class CGLSLProgram
+{
+public:
+	void CreateProgram();
+	void DeleteProgram();
+
+	bool AddShader(CGLSL *pShader) const;
+
+	void LinkProgram();
+	void UseProgram() const;
+	TWGLuint GetProgramID() const;
+
+	void DetachShader(CGLSL *pShader) const;
+	void DetachShaderByID(TWGLuint ShaderID) const;
+	void DetachAllShaders() const;
+
+	//Support various types
+	void SetUniformVec2(int Loc, int Count, const float *pValue);
+	void SetUniformVec4(int Loc, int Count, const float *pValue);
+	void SetUniform(int Loc, int Value);
+	void SetUniform(int Loc, bool Value);
+	void SetUniform(int Loc, float Value);
+	void SetUniform(int Loc, int Count, const float *pValues);
+
+	//for performance reason we do not use SetUniform with using strings... save the Locations of the variables instead
+	int GetUniformLoc(const char *pName) const;
+
+	CGLSLProgram();
+	virtual ~CGLSLProgram();
+
+protected:
+	TWGLuint m_ProgramID;
+	bool m_IsLinked;
+};
+
+class CGLSLTWProgram : public CGLSLProgram
+{
+public:
+	CGLSLTWProgram() :
+		m_LocPos(-1), m_LocTextureSampler(-1), m_LastTextureSampler(-1), m_LastIsTextured(-1)
+	{
+		m_LastScreenTL = m_LastScreenBR = vec2(-1, -1);
+	}
+
+	int m_LocPos;
+	int m_LocTextureSampler;
+
+	int m_LastTextureSampler;
+	int m_LastIsTextured;
+	vec2 m_LastScreenTL;
+	vec2 m_LastScreenBR;
+};
+
+class CGLSLTextProgram : public CGLSLTWProgram
+{
+public:
+	CGLSLTextProgram()
+
+	{
+		m_LastColor[0] = m_LastColor[1] = m_LastColor[2] = m_LastColor[3] = -1.f;
+		m_LastOutlineColor[0] = m_LastOutlineColor[1] = m_LastOutlineColor[2] = m_LastOutlineColor[3] = -1.f;
+		m_LastTextSampler = m_LastTextOutlineSampler = -1;
+		m_LastTextureSize = -1;
+	}
+
+	int m_LocColor;
+	int m_LocOutlineColor;
+	int m_LocTextSampler;
+	int m_LocTextOutlineSampler;
+	int m_LocTextureSize;
+
+	ColorRGBA m_LastColor;
+	ColorRGBA m_LastOutlineColor;
+	int m_LastTextSampler;
+	int m_LastTextOutlineSampler;
+	int m_LastTextureSize;
+};
+
+class CGLSLPrimitiveProgram : public CGLSLTWProgram
+{
+public:
+};
+
+class CGLSLPrimitiveExProgram : public CGLSLTWProgram
+{
+public:
+	CGLSLPrimitiveExProgram()
+
+	{
+		m_LastRotation = 0.f;
+		m_LastCenter = vec2(0, 0);
+		m_LastVerticesColor = ColorRGBA(-1, -1, -1, -1);
+	}
+
+	int m_LocRotation;
+	int m_LocCenter;
+	int m_LocVertciesColor;
+
+	float m_LastRotation;
+	vec2 m_LastCenter;
+	ColorRGBA m_LastVerticesColor;
+};
+
+class CGLSLSpriteMultipleProgram : public CGLSLTWProgram
+{
+public:
+	CGLSLSpriteMultipleProgram()
+
+	{
+		m_LastCenter = vec2(0, 0);
+		m_LastVerticesColor = ColorRGBA(-1, -1, -1, -1);
+	}
+
+	int m_LocRSP;
+	int m_LocCenter;
+	int m_LocVertciesColor;
+
+	vec2 m_LastCenter;
+	ColorRGBA m_LastVerticesColor;
+};
+
+class CGLSLQuadProgram : public CGLSLTWProgram
+{
+public:
+	int m_LocColors;
+	int m_LocOffsets;
+	int m_LocRotations;
+	int m_LocQuadOffset;
+};
+
+class CGLSLTileProgram : public CGLSLTWProgram
+{
+public:
+	CGLSLTileProgram() :
+		m_LocColor(-1), m_LocOffset(-1), m_LocDir(-1), m_LocNum(-1), m_LocJumpIndex(-1) {}
+
+	int m_LocColor;
+	int m_LocOffset;
+	int m_LocDir;
+	int m_LocScale = -1;
+	int m_LocNum;
+	int m_LocJumpIndex;
+};
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/backend_opengles.cpp b/src_bkp/engine/client/backend/opengles/backend_opengles.cpp
new file mode 100644
index 0000000000..e2797c6a02
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/backend_opengles.cpp
@@ -0,0 +1,17 @@
+#include <base/detect.h>
+
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+
+#define GLES_CLASS_DEFINES_DO_DEFINE
+#include "gles_class_defines.h"
+#undef GLES_CLASS_DEFINES_DO_DEFINE
+
+#define BACKEND_AS_OPENGL_ES 1
+
+#include <engine/client/backend/opengl/backend_opengl.cpp>
+
+#undef BACKEND_AS_OPENGL_ES
+
+#include "gles_class_defines.h"
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/backend_opengles3.cpp b/src_bkp/engine/client/backend/opengles/backend_opengles3.cpp
new file mode 100644
index 0000000000..2b60a0ac5e
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/backend_opengles3.cpp
@@ -0,0 +1,17 @@
+#include <base/detect.h>
+
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+
+#define GLES_CLASS_DEFINES_DO_DEFINE
+#include "gles_class_defines.h"
+#undef GLES_CLASS_DEFINES_DO_DEFINE
+
+#define BACKEND_AS_OPENGL_ES 1
+
+#include <engine/client/backend/opengl/backend_opengl3.cpp>
+
+#undef BACKEND_AS_OPENGL_ES
+
+#include "gles_class_defines.h"
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/backend_opengles3.h b/src_bkp/engine/client/backend/opengles/backend_opengles3.h
new file mode 100644
index 0000000000..6e2227b678
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/backend_opengles3.h
@@ -0,0 +1,23 @@
+#ifndef ENGINE_CLIENT_BACKEND_OPENGLES_BACKEND_OPENGLES3_H
+#define ENGINE_CLIENT_BACKEND_OPENGLES_BACKEND_OPENGLES3_H
+
+#include <base/detect.h>
+
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+#include <engine/client/backend_sdl.h>
+
+#define GLES_CLASS_DEFINES_DO_DEFINE
+#include "gles_class_defines.h"
+#undef GLES_CLASS_DEFINES_DO_DEFINE
+
+#define BACKEND_AS_OPENGL_ES 1
+
+#include <engine/client/backend/opengl/backend_opengl3.h>
+
+#undef BACKEND_AS_OPENGL_ES
+
+#include "gles_class_defines.h"
+
+#endif
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/gles_class_defines.h b/src_bkp/engine/client/backend/opengles/gles_class_defines.h
new file mode 100644
index 0000000000..8f538f7e68
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/gles_class_defines.h
@@ -0,0 +1,36 @@
+#ifndef ENGINE_CLIENT_BACKEND_OPENGLES_GLES_CLASS_DEFINES_H
+#define ENGINE_CLIENT_BACKEND_OPENGLES_GLES_CLASS_DEFINES_H
+#undef ENGINE_CLIENT_BACKEND_OPENGLES_GLES_CLASS_DEFINES_H
+#endif
+
+#ifdef GLES_CLASS_DEFINES_DO_DEFINE
+#define CCommandProcessorFragment_OpenGL3_3 CCommandProcessorFragment_OpenGLES3
+#define CCommandProcessorFragment_OpenGL3 CCommandProcessorFragment_OpenGLES3Wrapper
+#define CCommandProcessorFragment_OpenGL2 CCommandProcessorFragment_OpenGLES2
+#define CCommandProcessorFragment_OpenGL CCommandProcessorFragment_OpenGLES
+
+#define CGLSL CGLSL_ES
+#define CGLSLProgram CGLSL_ESProgram
+#define CGLSLTWProgram CGLSL_ESTWProgram
+#define CGLSLTextProgram CGLSL_ESTextProgram
+#define CGLSLPrimitiveProgram CGLSL_ESPrimitiveProgram
+#define CGLSLPrimitiveExProgram CGLSL_ESPrimitiveExProgram
+#define CGLSLSpriteMultipleProgram CGLSL_ESSpriteMultipleProgram
+#define CGLSLQuadProgram CGLSL_ESQuadProgram
+#define CGLSLTileProgram CGLSL_ESTileProgram
+#else
+#undef CCommandProcessorFragment_OpenGL3_3
+#undef CCommandProcessorFragment_OpenGL3
+#undef CCommandProcessorFragment_OpenGL2
+#undef CCommandProcessorFragment_OpenGL
+
+#undef CGLSL
+#undef CGLSLProgram
+#undef CGLSLTWProgram
+#undef CGLSLTextProgram
+#undef CGLSLPrimitiveProgram
+#undef CGLSLPrimitiveExProgram
+#undef CGLSLSpriteMultipleProgram
+#undef CGLSLQuadProgram
+#undef CGLSLTileProgram
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/opengles_sl.cpp b/src_bkp/engine/client/backend/opengles/opengles_sl.cpp
new file mode 100644
index 0000000000..3509fe844e
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/opengles_sl.cpp
@@ -0,0 +1,16 @@
+#include <base/detect.h>
+
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+#define GLES_CLASS_DEFINES_DO_DEFINE
+#include "gles_class_defines.h"
+#undef GLES_CLASS_DEFINES_DO_DEFINE
+
+#define BACKEND_AS_OPENGL_ES 1
+
+#include <engine/client/backend/opengl/opengl_sl.cpp>
+
+#undef BACKEND_AS_OPENGL_ES
+
+#include "gles_class_defines.h"
+
+#endif
diff --git a/src_bkp/engine/client/backend/opengles/opengles_sl_program.cpp b/src_bkp/engine/client/backend/opengles/opengles_sl_program.cpp
new file mode 100644
index 0000000000..cdcbe73c2d
--- /dev/null
+++ b/src_bkp/engine/client/backend/opengles/opengles_sl_program.cpp
@@ -0,0 +1,16 @@
+#include <base/detect.h>
+
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+#define GLES_CLASS_DEFINES_DO_DEFINE
+#include "gles_class_defines.h"
+#undef GLES_CLASS_DEFINES_DO_DEFINE
+
+#define BACKEND_AS_OPENGL_ES 1
+
+#include <engine/client/backend/opengl/opengl_sl_program.cpp>
+
+#undef BACKEND_AS_OPENGL_ES
+
+#include "gles_class_defines.h"
+
+#endif
diff --git a/src_bkp/engine/client/backend/vulkan/backend_vulkan.cpp b/src_bkp/engine/client/backend/vulkan/backend_vulkan.cpp
new file mode 100644
index 0000000000..84a8b48d86
--- /dev/null
+++ b/src_bkp/engine/client/backend/vulkan/backend_vulkan.cpp
@@ -0,0 +1,7632 @@
+#if defined(CONF_BACKEND_VULKAN)
+
+#include <engine/client/backend/vulkan/backend_vulkan.h>
+
+#include <engine/client/backend/backend_base.h>
+#include <engine/client/backend_sdl.h>
+#include <engine/client/graphics_threaded.h>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/localization.h>
+#include <engine/storage.h>
+
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <array>
+#include <map>
+#include <set>
+#include <vector>
+
+#include <algorithm>
+
+#include <cstddef>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <string>
+
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+
+#include <cstdlib>
+
+#include <unordered_map>
+
+#include <SDL_video.h>
+#include <SDL_vulkan.h>
+
+#include <vulkan/vk_platform.h>
+#include <vulkan/vulkan_core.h>
+
+#ifndef VK_API_VERSION_MAJOR
+#define VK_API_VERSION_MAJOR VK_VERSION_MAJOR
+#define VK_API_VERSION_MINOR VK_VERSION_MINOR
+#define VK_API_VERSION_PATCH VK_VERSION_PATCH
+#endif
+
+using namespace std::chrono_literals;
+
+class CCommandProcessorFragment_Vulkan : public CCommandProcessorFragment_GLBase
+{
+	enum EMemoryBlockUsage
+	{
+		MEMORY_BLOCK_USAGE_TEXTURE = 0,
+		MEMORY_BLOCK_USAGE_BUFFER,
+		MEMORY_BLOCK_USAGE_STREAM,
+		MEMORY_BLOCK_USAGE_STAGING,
+
+		// whenever dummy is used, make sure to deallocate all memory
+		MEMORY_BLOCK_USAGE_DUMMY,
+	};
+
+	[[nodiscard]] bool IsVerbose()
+	{
+		return g_Config.m_DbgGfx == DEBUG_GFX_MODE_VERBOSE || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL;
+	}
+
+	void VerboseAllocatedMemory(VkDeviceSize Size, size_t FrameImageIndex, EMemoryBlockUsage MemUsage) const
+	{
+		const char *pUsage = "unknown";
+		switch(MemUsage)
+		{
+		case MEMORY_BLOCK_USAGE_TEXTURE:
+			pUsage = "texture";
+			break;
+		case MEMORY_BLOCK_USAGE_BUFFER:
+			pUsage = "buffer";
+			break;
+		case MEMORY_BLOCK_USAGE_STREAM:
+			pUsage = "stream";
+			break;
+		case MEMORY_BLOCK_USAGE_STAGING:
+			pUsage = "staging buffer";
+			break;
+		default: break;
+		}
+		dbg_msg("vulkan", "allocated chunk of memory with size: %" PRIzu " for frame %" PRIzu " (%s)", (size_t)Size, (size_t)m_CurImageIndex, pUsage);
+	}
+
+	void VerboseDeallocatedMemory(VkDeviceSize Size, size_t FrameImageIndex, EMemoryBlockUsage MemUsage) const
+	{
+		const char *pUsage = "unknown";
+		switch(MemUsage)
+		{
+		case MEMORY_BLOCK_USAGE_TEXTURE:
+			pUsage = "texture";
+			break;
+		case MEMORY_BLOCK_USAGE_BUFFER:
+			pUsage = "buffer";
+			break;
+		case MEMORY_BLOCK_USAGE_STREAM:
+			pUsage = "stream";
+			break;
+		case MEMORY_BLOCK_USAGE_STAGING:
+			pUsage = "staging buffer";
+			break;
+		default: break;
+		}
+		dbg_msg("vulkan", "deallocated chunk of memory with size: %" PRIzu " for frame %" PRIzu " (%s)", (size_t)Size, (size_t)m_CurImageIndex, pUsage);
+	}
+
+	/************************
+	* STRUCT DEFINITIONS
+	************************/
+
+	static constexpr size_t s_StagingBufferCacheID = 0;
+	static constexpr size_t s_StagingBufferImageCacheID = 1;
+	static constexpr size_t s_VertexBufferCacheID = 2;
+	static constexpr size_t s_ImageBufferCacheID = 3;
+
+	struct SDeviceMemoryBlock
+	{
+		VkDeviceMemory m_Mem = VK_NULL_HANDLE;
+		VkDeviceSize m_Size = 0;
+		EMemoryBlockUsage m_UsageType;
+	};
+
+	struct SDeviceDescriptorPools;
+
+	struct SDeviceDescriptorSet
+	{
+		VkDescriptorSet m_Descriptor = VK_NULL_HANDLE;
+		SDeviceDescriptorPools *m_pPools = nullptr;
+		size_t m_PoolIndex = std::numeric_limits<size_t>::max();
+	};
+
+	struct SDeviceDescriptorPool
+	{
+		VkDescriptorPool m_Pool;
+		VkDeviceSize m_Size = 0;
+		VkDeviceSize m_CurSize = 0;
+	};
+
+	struct SDeviceDescriptorPools
+	{
+		std::vector<SDeviceDescriptorPool> m_vPools;
+		VkDeviceSize m_DefaultAllocSize = 0;
+		bool m_IsUniformPool = false;
+	};
+
+	// some mix of queue and binary tree
+	struct SMemoryHeap
+	{
+		struct SMemoryHeapElement;
+		struct SMemoryHeapQueueElement
+		{
+			size_t m_AllocationSize;
+			// only useful information for the heap
+			size_t m_OffsetInHeap;
+			// useful for the user of this element
+			size_t m_OffsetToAlign;
+			SMemoryHeapElement *m_pElementInHeap;
+			[[nodiscard]] bool operator>(const SMemoryHeapQueueElement &Other) const { return m_AllocationSize > Other.m_AllocationSize; }
+		};
+
+		typedef std::multiset<SMemoryHeapQueueElement, std::greater<>> TMemoryHeapQueue;
+
+		struct SMemoryHeapElement
+		{
+			size_t m_AllocationSize;
+			size_t m_Offset;
+			SMemoryHeapElement *m_pParent;
+			std::unique_ptr<SMemoryHeapElement> m_pLeft;
+			std::unique_ptr<SMemoryHeapElement> m_pRight;
+
+			bool m_InUse;
+			TMemoryHeapQueue::iterator m_InQueue;
+		};
+
+		SMemoryHeapElement m_Root;
+		TMemoryHeapQueue m_Elements;
+
+		void Init(size_t Size, size_t Offset)
+		{
+			m_Root.m_AllocationSize = Size;
+			m_Root.m_Offset = Offset;
+			m_Root.m_pParent = nullptr;
+			m_Root.m_InUse = false;
+
+			SMemoryHeapQueueElement QueueEl;
+			QueueEl.m_AllocationSize = Size;
+			QueueEl.m_OffsetInHeap = Offset;
+			QueueEl.m_OffsetToAlign = Offset;
+			QueueEl.m_pElementInHeap = &m_Root;
+			m_Root.m_InQueue = m_Elements.insert(QueueEl);
+		}
+
+		[[nodiscard]] bool Allocate(size_t AllocSize, size_t AllocAlignment, SMemoryHeapQueueElement &AllocatedMemory)
+		{
+			if(m_Elements.empty())
+			{
+				return false;
+			}
+			else
+			{
+				// calculate the alignment
+				size_t ExtraSizeAlign = m_Elements.begin()->m_OffsetInHeap % AllocAlignment;
+				if(ExtraSizeAlign != 0)
+					ExtraSizeAlign = AllocAlignment - ExtraSizeAlign;
+				size_t RealAllocSize = AllocSize + ExtraSizeAlign;
+
+				// check if there is enough space in this instance
+				if(m_Elements.begin()->m_AllocationSize < RealAllocSize)
+				{
+					return false;
+				}
+				else
+				{
+					auto TopEl = *m_Elements.begin();
+					m_Elements.erase(TopEl.m_pElementInHeap->m_InQueue);
+
+					TopEl.m_pElementInHeap->m_InUse = true;
+
+					// the heap element gets children
+					TopEl.m_pElementInHeap->m_pLeft = std::make_unique<SMemoryHeapElement>();
+					TopEl.m_pElementInHeap->m_pLeft->m_AllocationSize = RealAllocSize;
+					TopEl.m_pElementInHeap->m_pLeft->m_Offset = TopEl.m_OffsetInHeap;
+					TopEl.m_pElementInHeap->m_pLeft->m_pParent = TopEl.m_pElementInHeap;
+					TopEl.m_pElementInHeap->m_pLeft->m_InUse = true;
+
+					if(RealAllocSize < TopEl.m_AllocationSize)
+					{
+						SMemoryHeapQueueElement RemainingEl;
+						RemainingEl.m_OffsetInHeap = TopEl.m_OffsetInHeap + RealAllocSize;
+						RemainingEl.m_AllocationSize = TopEl.m_AllocationSize - RealAllocSize;
+
+						TopEl.m_pElementInHeap->m_pRight = std::make_unique<SMemoryHeapElement>();
+						TopEl.m_pElementInHeap->m_pRight->m_AllocationSize = RemainingEl.m_AllocationSize;
+						TopEl.m_pElementInHeap->m_pRight->m_Offset = RemainingEl.m_OffsetInHeap;
+						TopEl.m_pElementInHeap->m_pRight->m_pParent = TopEl.m_pElementInHeap;
+						TopEl.m_pElementInHeap->m_pRight->m_InUse = false;
+
+						RemainingEl.m_pElementInHeap = TopEl.m_pElementInHeap->m_pRight.get();
+						RemainingEl.m_pElementInHeap->m_InQueue = m_Elements.insert(RemainingEl);
+					}
+
+					AllocatedMemory.m_pElementInHeap = TopEl.m_pElementInHeap->m_pLeft.get();
+					AllocatedMemory.m_AllocationSize = RealAllocSize;
+					AllocatedMemory.m_OffsetInHeap = TopEl.m_OffsetInHeap;
+					AllocatedMemory.m_OffsetToAlign = TopEl.m_OffsetInHeap + ExtraSizeAlign;
+					return true;
+				}
+			}
+		}
+
+		void Free(const SMemoryHeapQueueElement &AllocatedMemory)
+		{
+			bool ContinueFree = true;
+			SMemoryHeapQueueElement ThisEl = AllocatedMemory;
+			while(ContinueFree)
+			{
+				// first check if the other block is in use, if not merge them again
+				SMemoryHeapElement *pThisHeapObj = ThisEl.m_pElementInHeap;
+				SMemoryHeapElement *pThisParent = pThisHeapObj->m_pParent;
+				pThisHeapObj->m_InUse = false;
+				SMemoryHeapElement *pOtherHeapObj = nullptr;
+				if(pThisParent != nullptr && pThisHeapObj == pThisParent->m_pLeft.get())
+					pOtherHeapObj = pThisHeapObj->m_pParent->m_pRight.get();
+				else if(pThisParent != nullptr)
+					pOtherHeapObj = pThisHeapObj->m_pParent->m_pLeft.get();
+
+				if((pThisParent != nullptr && pOtherHeapObj == nullptr) || (pOtherHeapObj != nullptr && !pOtherHeapObj->m_InUse))
+				{
+					// merge them
+					if(pOtherHeapObj != nullptr)
+					{
+						m_Elements.erase(pOtherHeapObj->m_InQueue);
+						pOtherHeapObj->m_InUse = false;
+					}
+
+					SMemoryHeapQueueElement ParentEl;
+					ParentEl.m_OffsetInHeap = pThisParent->m_Offset;
+					ParentEl.m_AllocationSize = pThisParent->m_AllocationSize;
+					ParentEl.m_pElementInHeap = pThisParent;
+
+					pThisParent->m_pLeft = nullptr;
+					pThisParent->m_pRight = nullptr;
+
+					ThisEl = ParentEl;
+				}
+				else
+				{
+					// else just put this back into queue
+					ThisEl.m_pElementInHeap->m_InQueue = m_Elements.insert(ThisEl);
+					ContinueFree = false;
+				}
+			}
+		}
+
+		[[nodiscard]] bool IsUnused() const
+		{
+			return !m_Root.m_InUse;
+		}
+	};
+
+	template<size_t ID>
+	struct SMemoryBlock
+	{
+		SMemoryHeap::SMemoryHeapQueueElement m_HeapData;
+
+		VkDeviceSize m_UsedSize;
+
+		// optional
+		VkBuffer m_Buffer;
+
+		SDeviceMemoryBlock m_BufferMem;
+		void *m_pMappedBuffer;
+
+		bool m_IsCached;
+		SMemoryHeap *m_pHeap;
+	};
+
+	template<size_t ID>
+	struct SMemoryImageBlock : public SMemoryBlock<ID>
+	{
+		uint32_t m_ImageMemoryBits;
+	};
+
+	template<size_t ID>
+	struct SMemoryBlockCache
+	{
+		struct SMemoryCacheType
+		{
+			struct SMemoryCacheHeap
+			{
+				SMemoryHeap m_Heap;
+				VkBuffer m_Buffer;
+
+				SDeviceMemoryBlock m_BufferMem;
+				void *m_pMappedBuffer;
+			};
+			std::vector<SMemoryCacheHeap *> m_vpMemoryHeaps;
+		};
+		SMemoryCacheType m_MemoryCaches;
+		std::vector<std::vector<SMemoryBlock<ID>>> m_vvFrameDelayedCachedBufferCleanup;
+
+		bool m_CanShrink = false;
+
+		void Init(size_t SwapChainImageCount)
+		{
+			m_vvFrameDelayedCachedBufferCleanup.resize(SwapChainImageCount);
+		}
+
+		void DestroyFrameData(size_t ImageCount)
+		{
+			for(size_t i = 0; i < ImageCount; ++i)
+				Cleanup(i);
+			m_vvFrameDelayedCachedBufferCleanup.clear();
+		}
+
+		void Destroy(VkDevice &Device)
+		{
+			for(auto it = m_MemoryCaches.m_vpMemoryHeaps.begin(); it != m_MemoryCaches.m_vpMemoryHeaps.end();)
+			{
+				auto *pHeap = *it;
+				if(pHeap->m_pMappedBuffer != nullptr)
+					vkUnmapMemory(Device, pHeap->m_BufferMem.m_Mem);
+				if(pHeap->m_Buffer != VK_NULL_HANDLE)
+					vkDestroyBuffer(Device, pHeap->m_Buffer, nullptr);
+				vkFreeMemory(Device, pHeap->m_BufferMem.m_Mem, nullptr);
+
+				delete pHeap;
+				it = m_MemoryCaches.m_vpMemoryHeaps.erase(it);
+			}
+
+			m_MemoryCaches.m_vpMemoryHeaps.clear();
+			m_vvFrameDelayedCachedBufferCleanup.clear();
+		}
+
+		void Cleanup(size_t ImgIndex)
+		{
+			for(auto &MemBlock : m_vvFrameDelayedCachedBufferCleanup[ImgIndex])
+			{
+				MemBlock.m_UsedSize = 0;
+				MemBlock.m_pHeap->Free(MemBlock.m_HeapData);
+
+				m_CanShrink = true;
+			}
+			m_vvFrameDelayedCachedBufferCleanup[ImgIndex].clear();
+		}
+
+		void FreeMemBlock(SMemoryBlock<ID> &Block, size_t ImgIndex)
+		{
+			m_vvFrameDelayedCachedBufferCleanup[ImgIndex].push_back(Block);
+		}
+
+		// returns the total free'd memory
+		size_t Shrink(VkDevice &Device)
+		{
+			size_t FreeedMemory = 0;
+			if(m_CanShrink)
+			{
+				m_CanShrink = false;
+				if(m_MemoryCaches.m_vpMemoryHeaps.size() > 1)
+				{
+					for(auto it = m_MemoryCaches.m_vpMemoryHeaps.begin(); it != m_MemoryCaches.m_vpMemoryHeaps.end();)
+					{
+						auto *pHeap = *it;
+						if(pHeap->m_Heap.IsUnused())
+						{
+							if(pHeap->m_pMappedBuffer != nullptr)
+								vkUnmapMemory(Device, pHeap->m_BufferMem.m_Mem);
+							if(pHeap->m_Buffer != VK_NULL_HANDLE)
+								vkDestroyBuffer(Device, pHeap->m_Buffer, nullptr);
+							vkFreeMemory(Device, pHeap->m_BufferMem.m_Mem, nullptr);
+							FreeedMemory += pHeap->m_BufferMem.m_Size;
+
+							delete pHeap;
+							it = m_MemoryCaches.m_vpMemoryHeaps.erase(it);
+							if(m_MemoryCaches.m_vpMemoryHeaps.size() == 1)
+								break;
+						}
+						else
+							++it;
+					}
+				}
+			}
+
+			return FreeedMemory;
+		}
+	};
+
+	struct CTexture
+	{
+		VkImage m_Img = VK_NULL_HANDLE;
+		SMemoryImageBlock<s_ImageBufferCacheID> m_ImgMem;
+		VkImageView m_ImgView = VK_NULL_HANDLE;
+		VkSampler m_aSamplers[2] = {VK_NULL_HANDLE, VK_NULL_HANDLE};
+
+		VkImage m_Img3D = VK_NULL_HANDLE;
+		SMemoryImageBlock<s_ImageBufferCacheID> m_Img3DMem;
+		VkImageView m_Img3DView = VK_NULL_HANDLE;
+		VkSampler m_Sampler3D = VK_NULL_HANDLE;
+
+		uint32_t m_Width = 0;
+		uint32_t m_Height = 0;
+		uint32_t m_RescaleCount = 0;
+
+		uint32_t m_MipMapCount = 1;
+
+		std::array<SDeviceDescriptorSet, 2> m_aVKStandardTexturedDescrSets;
+		SDeviceDescriptorSet m_VKStandard3DTexturedDescrSet;
+		SDeviceDescriptorSet m_VKTextDescrSet;
+	};
+
+	struct SBufferObject
+	{
+		SMemoryBlock<s_VertexBufferCacheID> m_Mem;
+	};
+
+	struct SBufferObjectFrame
+	{
+		SBufferObject m_BufferObject;
+
+		// since stream buffers can be used the cur buffer should always be used for rendering
+		bool m_IsStreamedBuffer = false;
+		VkBuffer m_CurBuffer = VK_NULL_HANDLE;
+		size_t m_CurBufferOffset = 0;
+	};
+
+	struct SBufferContainer
+	{
+		int m_BufferObjectIndex;
+	};
+
+	struct SFrameBuffers
+	{
+		VkBuffer m_Buffer;
+		SDeviceMemoryBlock m_BufferMem;
+		size_t m_OffsetInBuffer = 0;
+		size_t m_Size;
+		size_t m_UsedSize;
+		void *m_pMappedBufferData;
+
+		SFrameBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, void *pMappedBufferData) :
+			m_Buffer(Buffer), m_BufferMem(BufferMem), m_OffsetInBuffer(OffsetInBuffer), m_Size(Size), m_UsedSize(UsedSize), m_pMappedBufferData(pMappedBufferData)
+		{
+		}
+	};
+
+	struct SFrameUniformBuffers : public SFrameBuffers
+	{
+		std::array<SDeviceDescriptorSet, 2> m_aUniformSets;
+
+		SFrameUniformBuffers(VkBuffer Buffer, SDeviceMemoryBlock BufferMem, size_t OffsetInBuffer, size_t Size, size_t UsedSize, void *pMappedBufferData) :
+			SFrameBuffers(Buffer, BufferMem, OffsetInBuffer, Size, UsedSize, pMappedBufferData) {}
+	};
+
+	template<typename TName>
+	struct SStreamMemory
+	{
+		typedef std::vector<std::vector<TName>> TBufferObjectsOfFrame;
+		typedef std::vector<std::vector<VkMappedMemoryRange>> TMemoryMapRangesOfFrame;
+		typedef std::vector<size_t> TStreamUseCount;
+		TBufferObjectsOfFrame m_vvBufferObjectsOfFrame;
+		TMemoryMapRangesOfFrame m_vvBufferObjectsOfFrameRangeData;
+		TStreamUseCount m_vCurrentUsedCount;
+
+		std::vector<TName> &GetBuffers(size_t FrameImageIndex)
+		{
+			return m_vvBufferObjectsOfFrame[FrameImageIndex];
+		}
+
+		std::vector<VkMappedMemoryRange> &GetRanges(size_t FrameImageIndex)
+		{
+			return m_vvBufferObjectsOfFrameRangeData[FrameImageIndex];
+		}
+
+		size_t GetUsedCount(size_t FrameImageIndex)
+		{
+			return m_vCurrentUsedCount[FrameImageIndex];
+		}
+
+		void IncreaseUsedCount(size_t FrameImageIndex)
+		{
+			++m_vCurrentUsedCount[FrameImageIndex];
+		}
+
+		[[nodiscard]] bool IsUsed(size_t FrameImageIndex)
+		{
+			return GetUsedCount(FrameImageIndex) > 0;
+		}
+
+		void ResetFrame(size_t FrameImageIndex)
+		{
+			m_vCurrentUsedCount[FrameImageIndex] = 0;
+		}
+
+		void Init(size_t FrameImageCount)
+		{
+			m_vvBufferObjectsOfFrame.resize(FrameImageCount);
+			m_vvBufferObjectsOfFrameRangeData.resize(FrameImageCount);
+			m_vCurrentUsedCount.resize(FrameImageCount);
+		}
+
+		typedef std::function<void(size_t, TName &)> TDestroyBufferFunc;
+
+		void Destroy(TDestroyBufferFunc &&DestroyBuffer)
+		{
+			size_t ImageIndex = 0;
+			for(auto &vBuffersOfFrame : m_vvBufferObjectsOfFrame)
+			{
+				for(auto &BufferOfFrame : vBuffersOfFrame)
+				{
+					VkDeviceMemory BufferMem = BufferOfFrame.m_BufferMem.m_Mem;
+					DestroyBuffer(ImageIndex, BufferOfFrame);
+
+					// delete similar buffers
+					for(auto &BufferOfFrameDel : vBuffersOfFrame)
+					{
+						if(BufferOfFrameDel.m_BufferMem.m_Mem == BufferMem)
+						{
+							BufferOfFrameDel.m_Buffer = VK_NULL_HANDLE;
+							BufferOfFrameDel.m_BufferMem.m_Mem = VK_NULL_HANDLE;
+						}
+					}
+				}
+				++ImageIndex;
+			}
+			m_vvBufferObjectsOfFrame.clear();
+			m_vvBufferObjectsOfFrameRangeData.clear();
+			m_vCurrentUsedCount.clear();
+		}
+	};
+
+	struct SShaderModule
+	{
+		VkShaderModule m_VertShaderModule = VK_NULL_HANDLE;
+		VkShaderModule m_FragShaderModule = VK_NULL_HANDLE;
+
+		VkDevice m_VKDevice = VK_NULL_HANDLE;
+
+		~SShaderModule()
+		{
+			if(m_VKDevice != VK_NULL_HANDLE)
+			{
+				if(m_VertShaderModule != VK_NULL_HANDLE)
+					vkDestroyShaderModule(m_VKDevice, m_VertShaderModule, nullptr);
+
+				if(m_FragShaderModule != VK_NULL_HANDLE)
+					vkDestroyShaderModule(m_VKDevice, m_FragShaderModule, nullptr);
+			}
+		}
+	};
+
+	enum EVulkanBackendAddressModes
+	{
+		VULKAN_BACKEND_ADDRESS_MODE_REPEAT = 0,
+		VULKAN_BACKEND_ADDRESS_MODE_CLAMP_EDGES,
+
+		VULKAN_BACKEND_ADDRESS_MODE_COUNT,
+	};
+
+	enum EVulkanBackendBlendModes
+	{
+		VULKAN_BACKEND_BLEND_MODE_ALPHA = 0,
+		VULKAN_BACKEND_BLEND_MODE_NONE,
+		VULKAN_BACKEND_BLEND_MODE_ADDITATIVE,
+
+		VULKAN_BACKEND_BLEND_MODE_COUNT,
+	};
+
+	enum EVulkanBackendClipModes
+	{
+		VULKAN_BACKEND_CLIP_MODE_NONE = 0,
+		VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT,
+
+		VULKAN_BACKEND_CLIP_MODE_COUNT,
+	};
+
+	enum EVulkanBackendTextureModes
+	{
+		VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED = 0,
+		VULKAN_BACKEND_TEXTURE_MODE_TEXTURED,
+
+		VULKAN_BACKEND_TEXTURE_MODE_COUNT,
+	};
+
+	struct SPipelineContainer
+	{
+		// 3 blend modes - 2 viewport & scissor modes - 2 texture modes
+		std::array<std::array<std::array<VkPipelineLayout, VULKAN_BACKEND_TEXTURE_MODE_COUNT>, VULKAN_BACKEND_CLIP_MODE_COUNT>, VULKAN_BACKEND_BLEND_MODE_COUNT> m_aaaPipelineLayouts;
+		std::array<std::array<std::array<VkPipeline, VULKAN_BACKEND_TEXTURE_MODE_COUNT>, VULKAN_BACKEND_CLIP_MODE_COUNT>, VULKAN_BACKEND_BLEND_MODE_COUNT> m_aaaPipelines;
+
+		SPipelineContainer()
+		{
+			for(auto &aaPipeLayouts : m_aaaPipelineLayouts)
+			{
+				for(auto &aPipeLayouts : aaPipeLayouts)
+				{
+					for(auto &PipeLayout : aPipeLayouts)
+					{
+						PipeLayout = VK_NULL_HANDLE;
+					}
+				}
+			}
+			for(auto &aaPipe : m_aaaPipelines)
+			{
+				for(auto &aPipe : aaPipe)
+				{
+					for(auto &Pipe : aPipe)
+					{
+						Pipe = VK_NULL_HANDLE;
+					}
+				}
+			}
+		}
+
+		void Destroy(VkDevice &Device)
+		{
+			for(auto &aaPipeLayouts : m_aaaPipelineLayouts)
+			{
+				for(auto &aPipeLayouts : aaPipeLayouts)
+				{
+					for(auto &PipeLayout : aPipeLayouts)
+					{
+						if(PipeLayout != VK_NULL_HANDLE)
+							vkDestroyPipelineLayout(Device, PipeLayout, nullptr);
+						PipeLayout = VK_NULL_HANDLE;
+					}
+				}
+			}
+			for(auto &aaPipe : m_aaaPipelines)
+			{
+				for(auto &aPipe : aaPipe)
+				{
+					for(auto &Pipe : aPipe)
+					{
+						if(Pipe != VK_NULL_HANDLE)
+							vkDestroyPipeline(Device, Pipe, nullptr);
+						Pipe = VK_NULL_HANDLE;
+					}
+				}
+			}
+		}
+	};
+
+	/*******************************
+	* UNIFORM PUSH CONSTANT LAYOUTS
+	********************************/
+
+	struct SUniformGPos
+	{
+		float m_aPos[4 * 2];
+	};
+
+	struct SUniformGTextPos
+	{
+		float m_aPos[4 * 2];
+		float m_TextureSize;
+	};
+
+	typedef vec3 SUniformTextGFragmentOffset;
+
+	struct SUniformTextGFragmentConstants
+	{
+		ColorRGBA m_TextColor;
+		ColorRGBA m_TextOutlineColor;
+	};
+
+	struct SUniformTextFragment
+	{
+		SUniformTextGFragmentConstants m_Constants;
+	};
+
+	struct SUniformTileGPos
+	{
+		float m_aPos[4 * 2];
+	};
+
+	struct SUniformTileGPosBorder : public SUniformTileGPos
+	{
+		vec2 m_Offset;
+		vec2 m_Scale;
+	};
+
+	typedef ColorRGBA SUniformTileGVertColor;
+
+	struct SUniformTileGVertColorAlign
+	{
+		float m_aPad[(64 - 48) / 4];
+	};
+
+	struct SUniformPrimExGPosRotationless
+	{
+		float m_aPos[4 * 2];
+	};
+
+	struct SUniformPrimExGPos : public SUniformPrimExGPosRotationless
+	{
+		vec2 m_Center;
+		float m_Rotation;
+	};
+
+	typedef ColorRGBA SUniformPrimExGVertColor;
+
+	struct SUniformPrimExGVertColorAlign
+	{
+		float m_aPad[(48 - 44) / 4];
+	};
+
+	struct SUniformSpriteMultiGPos
+	{
+		float m_aPos[4 * 2];
+		vec2 m_Center;
+	};
+
+	typedef ColorRGBA SUniformSpriteMultiGVertColor;
+
+	struct SUniformSpriteMultiGVertColorAlign
+	{
+		float m_aPad[(48 - 40) / 4];
+	};
+
+	struct SUniformSpriteMultiPushGPosBase
+	{
+		float m_aPos[4 * 2];
+		vec2 m_Center;
+		vec2 m_Padding;
+	};
+
+	struct SUniformSpriteMultiPushGPos : public SUniformSpriteMultiPushGPosBase
+	{
+		vec4 m_aPSR[1];
+	};
+
+	typedef ColorRGBA SUniformSpriteMultiPushGVertColor;
+
+	struct SUniformQuadGPosBase
+	{
+		float m_aPos[4 * 2];
+		int32_t m_QuadOffset;
+	};
+
+	struct SUniformQuadPushGBufferObject
+	{
+		vec4 m_VertColor;
+		vec2 m_Offset;
+		float m_Rotation;
+		float m_Padding;
+	};
+
+	struct SUniformQuadPushGPos
+	{
+		float m_aPos[4 * 2];
+		SUniformQuadPushGBufferObject m_BOPush;
+		int32_t m_QuadOffset;
+	};
+
+	struct SUniformQuadGPos
+	{
+		float m_aPos[4 * 2];
+		int32_t m_QuadOffset;
+	};
+
+	enum ESupportedSamplerTypes
+	{
+		SUPPORTED_SAMPLER_TYPE_REPEAT = 0,
+		SUPPORTED_SAMPLER_TYPE_CLAMP_TO_EDGE,
+		SUPPORTED_SAMPLER_TYPE_2D_TEXTURE_ARRAY,
+
+		SUPPORTED_SAMPLER_TYPE_COUNT,
+	};
+
+	struct SShaderFileCache
+	{
+		std::vector<uint8_t> m_vBinary;
+	};
+
+	struct SSwapImgViewportExtent
+	{
+		VkExtent2D m_SwapImageViewport;
+		bool m_HasForcedViewport = false;
+		VkExtent2D m_ForcedViewport;
+
+		// the viewport of the resulting presented image on the screen
+		// if there is a forced viewport the resulting image is smaller
+		// than the full swap image size
+		VkExtent2D GetPresentedImageViewport() const
+		{
+			uint32_t ViewportWidth = m_SwapImageViewport.width;
+			uint32_t ViewportHeight = m_SwapImageViewport.height;
+			if(m_HasForcedViewport)
+			{
+				ViewportWidth = m_ForcedViewport.width;
+				ViewportHeight = m_ForcedViewport.height;
+			}
+
+			return {ViewportWidth, ViewportHeight};
+		}
+	};
+
+	struct SSwapChainMultiSampleImage
+	{
+		VkImage m_Image = VK_NULL_HANDLE;
+		SMemoryImageBlock<s_ImageBufferCacheID> m_ImgMem;
+		VkImageView m_ImgView = VK_NULL_HANDLE;
+	};
+
+	/************************
+	* MEMBER VARIABLES
+	************************/
+
+	std::unordered_map<std::string, SShaderFileCache> m_ShaderFiles;
+
+	SMemoryBlockCache<s_StagingBufferCacheID> m_StagingBufferCache;
+	SMemoryBlockCache<s_StagingBufferImageCacheID> m_StagingBufferCacheImage;
+	SMemoryBlockCache<s_VertexBufferCacheID> m_VertexBufferCache;
+	std::map<uint32_t, SMemoryBlockCache<s_ImageBufferCacheID>> m_ImageBufferCaches;
+
+	std::vector<VkMappedMemoryRange> m_vNonFlushedStagingBufferRange;
+
+	std::vector<CTexture> m_vTextures;
+
+	std::atomic<uint64_t> *m_pTextureMemoryUsage;
+	std::atomic<uint64_t> *m_pBufferMemoryUsage;
+	std::atomic<uint64_t> *m_pStreamMemoryUsage;
+	std::atomic<uint64_t> *m_pStagingMemoryUsage;
+
+	TTWGraphicsGPUList *m_pGPUList;
+
+	int m_GlobalTextureLodBIAS;
+	uint32_t m_MultiSamplingCount = 1;
+
+	uint32_t m_NextMultiSamplingCount = std::numeric_limits<uint32_t>::max();
+
+	bool m_RecreateSwapChain = false;
+	bool m_SwapchainCreated = false;
+	bool m_RenderingPaused = false;
+	bool m_HasDynamicViewport = false;
+	VkOffset2D m_DynamicViewportOffset;
+	VkExtent2D m_DynamicViewportSize;
+
+	bool m_AllowsLinearBlitting = false;
+	bool m_OptimalSwapChainImageBlitting = false;
+	bool m_OptimalRGBAImageBlitting = false;
+	bool m_LinearRGBAImageBlitting = false;
+
+	VkBuffer m_IndexBuffer;
+	SDeviceMemoryBlock m_IndexBufferMemory;
+
+	VkBuffer m_RenderIndexBuffer;
+	SDeviceMemoryBlock m_RenderIndexBufferMemory;
+	size_t m_CurRenderIndexPrimitiveCount;
+
+	VkDeviceSize m_NonCoherentMemAlignment;
+	VkDeviceSize m_OptimalImageCopyMemAlignment;
+	uint32_t m_MaxTextureSize;
+	uint32_t m_MaxSamplerAnisotropy;
+	VkSampleCountFlags m_MaxMultiSample;
+
+	uint32_t m_MinUniformAlign;
+
+	std::vector<uint8_t> m_vScreenshotHelper;
+
+	SDeviceMemoryBlock m_GetPresentedImgDataHelperMem;
+	VkImage m_GetPresentedImgDataHelperImage = VK_NULL_HANDLE;
+	uint8_t *m_pGetPresentedImgDataHelperMappedMemory = nullptr;
+	VkDeviceSize m_GetPresentedImgDataHelperMappedLayoutOffset = 0;
+	VkDeviceSize m_GetPresentedImgDataHelperMappedLayoutPitch = 0;
+	uint32_t m_GetPresentedImgDataHelperWidth = 0;
+	uint32_t m_GetPresentedImgDataHelperHeight = 0;
+	VkFence m_GetPresentedImgDataHelperFence = VK_NULL_HANDLE;
+
+	std::array<VkSampler, SUPPORTED_SAMPLER_TYPE_COUNT> m_aSamplers;
+
+	class IStorage *m_pStorage;
+
+	struct SDelayedBufferCleanupItem
+	{
+		VkBuffer m_Buffer;
+		SDeviceMemoryBlock m_Mem;
+		void *m_pMappedData = nullptr;
+	};
+
+	std::vector<std::vector<SDelayedBufferCleanupItem>> m_vvFrameDelayedBufferCleanup;
+	std::vector<std::vector<CTexture>> m_vvFrameDelayedTextureCleanup;
+	std::vector<std::vector<std::pair<CTexture, CTexture>>> m_vvFrameDelayedTextTexturesCleanup;
+
+	size_t m_ThreadCount = 1;
+	static constexpr size_t ms_MainThreadIndex = 0;
+	size_t m_CurCommandInPipe = 0;
+	size_t m_CurRenderCallCountInPipe = 0;
+	size_t m_CommandsInPipe = 0;
+	size_t m_RenderCallsInPipe = 0;
+	size_t m_LastCommandsInPipeThreadIndex = 0;
+
+	struct SRenderThread
+	{
+		bool m_IsRendering = false;
+		std::thread m_Thread;
+		std::mutex m_Mutex;
+		std::condition_variable m_Cond;
+		bool m_Finished = false;
+		bool m_Started = false;
+	};
+	std::vector<std::unique_ptr<SRenderThread>> m_vpRenderThreads;
+
+private:
+	std::vector<VkImageView> m_vSwapChainImageViewList;
+	std::vector<SSwapChainMultiSampleImage> m_vSwapChainMultiSamplingImages;
+	std::vector<VkFramebuffer> m_vFramebufferList;
+	std::vector<VkCommandBuffer> m_vMainDrawCommandBuffers;
+
+	std::vector<std::vector<VkCommandBuffer>> m_vvThreadDrawCommandBuffers;
+	std::vector<VkCommandBuffer> m_vHelperThreadDrawCommandBuffers;
+	std::vector<std::vector<bool>> m_vvUsedThreadDrawCommandBuffer;
+
+	std::vector<VkCommandBuffer> m_vMemoryCommandBuffers;
+	std::vector<bool> m_vUsedMemoryCommandBuffer;
+
+	// swapped by use case
+	std::vector<VkSemaphore> m_vWaitSemaphores;
+	std::vector<VkSemaphore> m_vSigSemaphores;
+
+	std::vector<VkSemaphore> m_vMemorySemaphores;
+
+	std::vector<VkFence> m_vFrameFences;
+	std::vector<VkFence> m_vImagesFences;
+
+	uint64_t m_CurFrame = 0;
+	std::vector<uint64_t> m_vImageLastFrameCheck;
+
+	uint32_t m_LastPresentedSwapChainImageIndex;
+
+	std::vector<SBufferObjectFrame> m_vBufferObjects;
+
+	std::vector<SBufferContainer> m_vBufferContainers;
+
+	VkInstance m_VKInstance;
+	VkPhysicalDevice m_VKGPU;
+	uint32_t m_VKGraphicsQueueIndex = std::numeric_limits<uint32_t>::max();
+	VkDevice m_VKDevice;
+	VkQueue m_VKGraphicsQueue, m_VKPresentQueue;
+	VkSurfaceKHR m_VKPresentSurface;
+	SSwapImgViewportExtent m_VKSwapImgAndViewportExtent;
+
+#ifdef VK_EXT_debug_utils
+	VkDebugUtilsMessengerEXT m_DebugMessenger;
+#endif
+
+	VkDescriptorSetLayout m_StandardTexturedDescriptorSetLayout;
+	VkDescriptorSetLayout m_Standard3DTexturedDescriptorSetLayout;
+
+	VkDescriptorSetLayout m_TextDescriptorSetLayout;
+
+	VkDescriptorSetLayout m_SpriteMultiUniformDescriptorSetLayout;
+	VkDescriptorSetLayout m_QuadUniformDescriptorSetLayout;
+
+	SPipelineContainer m_StandardPipeline;
+	SPipelineContainer m_StandardLinePipeline;
+	SPipelineContainer m_Standard3DPipeline;
+	SPipelineContainer m_TextPipeline;
+	SPipelineContainer m_TilePipeline;
+	SPipelineContainer m_TileBorderPipeline;
+	SPipelineContainer m_PrimExPipeline;
+	SPipelineContainer m_PrimExRotationlessPipeline;
+	SPipelineContainer m_SpriteMultiPipeline;
+	SPipelineContainer m_SpriteMultiPushPipeline;
+	SPipelineContainer m_QuadPipeline;
+	SPipelineContainer m_QuadPushPipeline;
+
+	std::vector<VkPipeline> m_vLastPipeline;
+
+	std::vector<VkCommandPool> m_vCommandPools;
+
+	VkRenderPass m_VKRenderPass;
+
+	VkSurfaceFormatKHR m_VKSurfFormat;
+
+	SDeviceDescriptorPools m_StandardTextureDescrPool;
+	SDeviceDescriptorPools m_TextTextureDescrPool;
+
+	std::vector<SDeviceDescriptorPools> m_vUniformBufferDescrPools;
+
+	VkSwapchainKHR m_VKSwapChain = VK_NULL_HANDLE;
+	std::vector<VkImage> m_vSwapChainImages;
+	uint32_t m_SwapChainImageCount = 0;
+
+	std::vector<SStreamMemory<SFrameBuffers>> m_vStreamedVertexBuffers;
+	std::vector<SStreamMemory<SFrameUniformBuffers>> m_vStreamedUniformBuffers;
+
+	uint32_t m_CurFrames = 0;
+	uint32_t m_CurImageIndex = 0;
+
+	uint32_t m_CanvasWidth;
+	uint32_t m_CanvasHeight;
+
+	SDL_Window *m_pWindow;
+
+	std::array<float, 4> m_aClearColor = {0, 0, 0, 0};
+
+	struct SRenderCommandExecuteBuffer
+	{
+		CCommandBuffer::ECommandBufferCMD m_Command;
+		const CCommandBuffer::SCommand *m_pRawCommand;
+		uint32_t m_ThreadIndex;
+
+		// must be calculated when the buffer gets filled
+		size_t m_EstimatedRenderCallCount = 0;
+
+		// useful data
+		VkBuffer m_Buffer;
+		size_t m_BufferOff;
+		std::array<SDeviceDescriptorSet, 2> m_aDescriptors;
+
+		VkBuffer m_IndexBuffer;
+
+		bool m_ClearColorInRenderThread = false;
+
+		bool m_HasDynamicState = false;
+		VkViewport m_Viewport;
+		VkRect2D m_Scissor;
+	};
+
+	typedef std::vector<SRenderCommandExecuteBuffer> TCommandList;
+	typedef std::vector<TCommandList> TThreadCommandList;
+
+	TThreadCommandList m_vvThreadCommandLists;
+	std::vector<bool> m_vThreadHelperHadCommands;
+
+	typedef std::function<bool(const CCommandBuffer::SCommand *, SRenderCommandExecuteBuffer &)> TCommandBufferCommandCallback;
+	typedef std::function<void(SRenderCommandExecuteBuffer &, const CCommandBuffer::SCommand *)> TCommandBufferFillExecuteBufferFunc;
+
+	struct SCommandCallback
+	{
+		bool m_IsRenderCommand;
+		TCommandBufferFillExecuteBufferFunc m_FillExecuteBuffer;
+		TCommandBufferCommandCallback m_CommandCB;
+		// command should be considered handled after it executed
+		bool m_CMDIsHandled = true;
+	};
+	std::array<SCommandCallback, CCommandBuffer::CMD_COUNT - CCommandBuffer::CMD_FIRST> m_aCommandCallbacks;
+
+protected:
+	/************************
+	* ERROR MANAGEMENT
+	************************/
+	std::mutex m_ErrWarnMutex;
+	std::string m_ErrorHelper;
+
+	bool m_HasError = false;
+	bool m_CanAssert = false;
+
+	/**
+	 * After an error occurred, the rendering stop as soon as possible
+	 * Always stop the current code execution after a call to this function (e.g. return false)
+	 */
+	void SetError(EGfxErrorType ErrType, const char *pErr, const char *pErrStrExtra = nullptr)
+	{
+		std::unique_lock<std::mutex> Lock(m_ErrWarnMutex);
+		SGfxErrorContainer::SError Err = {false, pErr};
+		if(std::find(m_Error.m_vErrors.begin(), m_Error.m_vErrors.end(), Err) == m_Error.m_vErrors.end())
+			m_Error.m_vErrors.emplace_back(Err);
+		if(pErrStrExtra != nullptr)
+		{
+			SGfxErrorContainer::SError ErrExtra = {false, pErrStrExtra};
+			if(std::find(m_Error.m_vErrors.begin(), m_Error.m_vErrors.end(), ErrExtra) == m_Error.m_vErrors.end())
+				m_Error.m_vErrors.emplace_back(ErrExtra);
+		}
+		if(m_CanAssert)
+		{
+			if(pErrStrExtra != nullptr)
+				dbg_msg("vulkan", "vulkan error: %s: %s", pErr, pErrStrExtra);
+			else
+				dbg_msg("vulkan", "vulkan error: %s", pErr);
+			m_HasError = true;
+			m_Error.m_ErrorType = ErrType;
+		}
+		else
+		{
+			Lock.unlock();
+			// during initialization vulkan should not throw any errors but warnings instead
+			// since most code in the swapchain is shared with runtime code, add this extra code path
+			SetWarning(EGfxWarningType::GFX_WARNING_TYPE_INIT_FAILED, pErr);
+		}
+	}
+
+	void SetWarningPreMsg(const char *pWarningPre)
+	{
+		std::unique_lock<std::mutex> Lock(m_ErrWarnMutex);
+		if(std::find(m_Warning.m_vWarnings.begin(), m_Warning.m_vWarnings.end(), pWarningPre) == m_Warning.m_vWarnings.end())
+			m_Warning.m_vWarnings.emplace(m_Warning.m_vWarnings.begin(), pWarningPre);
+	}
+
+	void SetWarning(EGfxWarningType WarningType, const char *pWarning)
+	{
+		std::unique_lock<std::mutex> Lock(m_ErrWarnMutex);
+		dbg_msg("vulkan", "vulkan warning: %s", pWarning);
+		if(std::find(m_Warning.m_vWarnings.begin(), m_Warning.m_vWarnings.end(), pWarning) == m_Warning.m_vWarnings.end())
+			m_Warning.m_vWarnings.emplace_back(pWarning);
+		m_Warning.m_WarningType = WarningType;
+	}
+
+	const char *GetMemoryUsageShort()
+	{
+		m_ErrorHelper = std::string("Staging: ") +
+				std::to_string(m_pStagingMemoryUsage->load(std::memory_order_relaxed) / 1024) +
+				" KB, Buffer: " +
+				std::to_string(m_pBufferMemoryUsage->load(std::memory_order_relaxed) / 1024) +
+				" KB, Texture: " +
+				std::to_string(m_pTextureMemoryUsage->load(std::memory_order_relaxed) / 1024) +
+				" KB, Stream: " +
+				std::to_string(m_pStreamMemoryUsage->load(std::memory_order_relaxed) / 1024) +
+				" KB";
+		return m_ErrorHelper.c_str();
+	}
+
+	const char *CheckVulkanCriticalError(VkResult CallResult)
+	{
+		const char *pCriticalError = nullptr;
+		switch(CallResult)
+		{
+		case VK_ERROR_OUT_OF_HOST_MEMORY:
+			pCriticalError = "host ran out of memory";
+			dbg_msg("vulkan", "%s", pCriticalError);
+			break;
+		case VK_ERROR_OUT_OF_DEVICE_MEMORY:
+			pCriticalError = "device ran out of memory";
+			dbg_msg("vulkan", "%s", pCriticalError);
+			break;
+		case VK_ERROR_DEVICE_LOST:
+			pCriticalError = "device lost";
+			dbg_msg("vulkan", "%s", pCriticalError);
+			break;
+		case VK_ERROR_OUT_OF_DATE_KHR:
+		{
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "queueing swap chain recreation because the current is out of date");
+			}
+			m_RecreateSwapChain = true;
+			break;
+		}
+		case VK_ERROR_SURFACE_LOST_KHR:
+			dbg_msg("vulkan", "surface lost");
+			break;
+		/*case VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT:
+			dbg_msg("vulkan", "fullscreen exclusive mode lost");
+			break;*/
+		case VK_ERROR_INCOMPATIBLE_DRIVER:
+			pCriticalError = "no compatible driver found. Vulkan 1.1 is required.";
+			dbg_msg("vulkan", "%s", pCriticalError);
+			break;
+		case VK_ERROR_INITIALIZATION_FAILED:
+			pCriticalError = "initialization failed for unknown reason.";
+			dbg_msg("vulkan", "%s", pCriticalError);
+			break;
+		case VK_ERROR_LAYER_NOT_PRESENT:
+			SetWarning(EGfxWarningType::GFX_WARNING_MISSING_EXTENSION, "One Vulkan layer was not present. (try to disable them)");
+			break;
+		case VK_ERROR_EXTENSION_NOT_PRESENT:
+			SetWarning(EGfxWarningType::GFX_WARNING_MISSING_EXTENSION, "One Vulkan extension was not present. (try to disable them)");
+			break;
+		case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR:
+			dbg_msg("vulkan", "native window in use");
+			break;
+		case VK_SUCCESS:
+			break;
+		case VK_SUBOPTIMAL_KHR:
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "queueing swap chain recreation because the current is sub optimal");
+			}
+			m_RecreateSwapChain = true;
+			break;
+		default:
+			m_ErrorHelper = "unknown error: ";
+			m_ErrorHelper.append(std::to_string(CallResult));
+			pCriticalError = m_ErrorHelper.c_str();
+			break;
+		}
+
+		return pCriticalError;
+	}
+
+	void ErroneousCleanup() override
+	{
+		CleanupVulkanSDL();
+	}
+
+	/************************
+	* COMMAND CALLBACKS
+	************************/
+
+	size_t CommandBufferCMDOff(CCommandBuffer::ECommandBufferCMD CommandBufferCMD)
+	{
+		return (size_t)CommandBufferCMD - CCommandBuffer::ECommandBufferCMD::CMD_FIRST;
+	}
+
+	void RegisterCommands()
+	{
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_CREATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Create(static_cast<const CCommandBuffer::SCommand_Texture_Create *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_DESTROY)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Destroy(static_cast<const CCommandBuffer::SCommand_Texture_Destroy *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXTURE_UPDATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Texture_Update(static_cast<const CCommandBuffer::SCommand_Texture_Update *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURES_CREATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTextures_Create(static_cast<const CCommandBuffer::SCommand_TextTextures_Create *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURES_DESTROY)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTextures_Destroy(static_cast<const CCommandBuffer::SCommand_TextTextures_Destroy *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TEXT_TEXTURE_UPDATE)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_TextTexture_Update(static_cast<const CCommandBuffer::SCommand_TextTexture_Update *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_CLEAR)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_Clear_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_Clear *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Clear(ExecBuffer, static_cast<const CCommandBuffer::SCommand_Clear *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_Render_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_Render *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Render(static_cast<const CCommandBuffer::SCommand_Render *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_TEX3D)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderTex3D_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderTex3D *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderTex3D(static_cast<const CCommandBuffer::SCommand_RenderTex3D *>(pBaseCommand), ExecBuffer); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_CREATE_BUFFER_OBJECT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_CreateBufferObject(static_cast<const CCommandBuffer::SCommand_CreateBufferObject *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RECREATE_BUFFER_OBJECT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RecreateBufferObject(static_cast<const CCommandBuffer::SCommand_RecreateBufferObject *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_UPDATE_BUFFER_OBJECT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_UpdateBufferObject(static_cast<const CCommandBuffer::SCommand_UpdateBufferObject *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_COPY_BUFFER_OBJECT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_CopyBufferObject(static_cast<const CCommandBuffer::SCommand_CopyBufferObject *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_DELETE_BUFFER_OBJECT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_DeleteBufferObject(static_cast<const CCommandBuffer::SCommand_DeleteBufferObject *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_CREATE_BUFFER_CONTAINER)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_CreateBufferContainer(static_cast<const CCommandBuffer::SCommand_CreateBufferContainer *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_DELETE_BUFFER_CONTAINER)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_DeleteBufferContainer(static_cast<const CCommandBuffer::SCommand_DeleteBufferContainer *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_UPDATE_BUFFER_CONTAINER)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_UpdateBufferContainer(static_cast<const CCommandBuffer::SCommand_UpdateBufferContainer *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_INDICES_REQUIRED_NUM_NOTIFY)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_IndicesRequiredNumNotify(static_cast<const CCommandBuffer::SCommand_IndicesRequiredNumNotify *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_TILE_LAYER)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderTileLayer_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderTileLayer *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderTileLayer(static_cast<const CCommandBuffer::SCommand_RenderTileLayer *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_BORDER_TILE)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderBorderTile_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderBorderTile *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderBorderTile(static_cast<const CCommandBuffer::SCommand_RenderBorderTile *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_QUAD_LAYER)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderQuadLayer_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderQuadLayer *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderQuadLayer(static_cast<const CCommandBuffer::SCommand_RenderQuadLayer *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_TEXT)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderText_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderText *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderText(static_cast<const CCommandBuffer::SCommand_RenderText *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_QUAD_CONTAINER)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderQuadContainer_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderQuadContainer *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderQuadContainer(static_cast<const CCommandBuffer::SCommand_RenderQuadContainer *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_QUAD_CONTAINER_EX)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderQuadContainerEx_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderQuadContainerEx *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderQuadContainerEx(static_cast<const CCommandBuffer::SCommand_RenderQuadContainerEx *>(pBaseCommand), ExecBuffer); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_RENDER_QUAD_CONTAINER_SPRITE_MULTIPLE)] = {true, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_RenderQuadContainerAsSpriteMultiple_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_RenderQuadContainerAsSpriteMultiple(static_cast<const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *>(pBaseCommand), ExecBuffer); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_SWAP)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Swap(static_cast<const CCommandBuffer::SCommand_Swap *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_VSYNC)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_VSync(static_cast<const CCommandBuffer::SCommand_VSync *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_MULTISAMPLING)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_MultiSampling(static_cast<const CCommandBuffer::SCommand_MultiSampling *>(pBaseCommand)); }};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_TRY_SWAP_AND_SCREENSHOT)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Screenshot(static_cast<const CCommandBuffer::SCommand_TrySwapAndScreenshot *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_UPDATE_VIEWPORT)] = {false, [this](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) { Cmd_Update_Viewport_FillExecuteBuffer(ExecBuffer, static_cast<const CCommandBuffer::SCommand_Update_Viewport *>(pBaseCommand)); }, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_Update_Viewport(static_cast<const CCommandBuffer::SCommand_Update_Viewport *>(pBaseCommand)); }};
+
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_WINDOW_CREATE_NTF)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_WindowCreateNtf(static_cast<const CCommandBuffer::SCommand_WindowCreateNtf *>(pBaseCommand)); }, false};
+		m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::CMD_WINDOW_DESTROY_NTF)] = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [this](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return Cmd_WindowDestroyNtf(static_cast<const CCommandBuffer::SCommand_WindowDestroyNtf *>(pBaseCommand)); }, false};
+
+		for(auto &Callback : m_aCommandCallbacks)
+		{
+			if(!(bool)Callback.m_CommandCB)
+				Callback = {false, [](SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand *pBaseCommand) {}, [](const CCommandBuffer::SCommand *pBaseCommand, SRenderCommandExecuteBuffer &ExecBuffer) { return true; }};
+		}
+	}
+
+	/*****************************
+	* VIDEO AND SCREENSHOT HELPER
+	******************************/
+
+	[[nodiscard]] bool PreparePresentedImageDataImage(uint8_t *&pResImageData, uint32_t Width, uint32_t Height)
+	{
+		bool NeedsNewImg = Width != m_GetPresentedImgDataHelperWidth || Height != m_GetPresentedImgDataHelperHeight;
+		if(m_GetPresentedImgDataHelperImage == VK_NULL_HANDLE || NeedsNewImg)
+		{
+			if(m_GetPresentedImgDataHelperImage != VK_NULL_HANDLE)
+			{
+				DeletePresentedImageDataImage();
+			}
+			m_GetPresentedImgDataHelperWidth = Width;
+			m_GetPresentedImgDataHelperHeight = Height;
+
+			VkImageCreateInfo ImageInfo{};
+			ImageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
+			ImageInfo.imageType = VK_IMAGE_TYPE_2D;
+			ImageInfo.extent.width = Width;
+			ImageInfo.extent.height = Height;
+			ImageInfo.extent.depth = 1;
+			ImageInfo.mipLevels = 1;
+			ImageInfo.arrayLayers = 1;
+			ImageInfo.format = VK_FORMAT_R8G8B8A8_UNORM;
+			ImageInfo.tiling = VK_IMAGE_TILING_LINEAR;
+			ImageInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+			ImageInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+			ImageInfo.samples = VK_SAMPLE_COUNT_1_BIT;
+			ImageInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+
+			vkCreateImage(m_VKDevice, &ImageInfo, nullptr, &m_GetPresentedImgDataHelperImage);
+			// Create memory to back up the image
+			VkMemoryRequirements MemRequirements;
+			vkGetImageMemoryRequirements(m_VKDevice, m_GetPresentedImgDataHelperImage, &MemRequirements);
+
+			VkMemoryAllocateInfo MemAllocInfo{};
+			MemAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+			MemAllocInfo.allocationSize = MemRequirements.size;
+			MemAllocInfo.memoryTypeIndex = FindMemoryType(m_VKGPU, MemRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT);
+
+			vkAllocateMemory(m_VKDevice, &MemAllocInfo, nullptr, &m_GetPresentedImgDataHelperMem.m_Mem);
+			vkBindImageMemory(m_VKDevice, m_GetPresentedImgDataHelperImage, m_GetPresentedImgDataHelperMem.m_Mem, 0);
+
+			if(!ImageBarrier(m_GetPresentedImgDataHelperImage, 0, 1, 0, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL))
+				return false;
+
+			VkImageSubresource SubResource{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0};
+			VkSubresourceLayout SubResourceLayout;
+			vkGetImageSubresourceLayout(m_VKDevice, m_GetPresentedImgDataHelperImage, &SubResource, &SubResourceLayout);
+
+			vkMapMemory(m_VKDevice, m_GetPresentedImgDataHelperMem.m_Mem, 0, VK_WHOLE_SIZE, 0, (void **)&m_pGetPresentedImgDataHelperMappedMemory);
+			m_GetPresentedImgDataHelperMappedLayoutOffset = SubResourceLayout.offset;
+			m_GetPresentedImgDataHelperMappedLayoutPitch = SubResourceLayout.rowPitch;
+			m_pGetPresentedImgDataHelperMappedMemory += m_GetPresentedImgDataHelperMappedLayoutOffset;
+
+			VkFenceCreateInfo FenceInfo{};
+			FenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+			FenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+			vkCreateFence(m_VKDevice, &FenceInfo, nullptr, &m_GetPresentedImgDataHelperFence);
+		}
+		pResImageData = m_pGetPresentedImgDataHelperMappedMemory;
+		return true;
+	}
+
+	void DeletePresentedImageDataImage()
+	{
+		if(m_GetPresentedImgDataHelperImage != VK_NULL_HANDLE)
+		{
+			vkDestroyFence(m_VKDevice, m_GetPresentedImgDataHelperFence, nullptr);
+
+			m_GetPresentedImgDataHelperFence = VK_NULL_HANDLE;
+
+			vkDestroyImage(m_VKDevice, m_GetPresentedImgDataHelperImage, nullptr);
+			vkUnmapMemory(m_VKDevice, m_GetPresentedImgDataHelperMem.m_Mem);
+			vkFreeMemory(m_VKDevice, m_GetPresentedImgDataHelperMem.m_Mem, nullptr);
+
+			m_GetPresentedImgDataHelperImage = VK_NULL_HANDLE;
+			m_GetPresentedImgDataHelperMem = {};
+			m_pGetPresentedImgDataHelperMappedMemory = nullptr;
+
+			m_GetPresentedImgDataHelperWidth = 0;
+			m_GetPresentedImgDataHelperHeight = 0;
+		}
+	}
+
+	[[nodiscard]] bool GetPresentedImageDataImpl(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData, bool FlipImgData, bool ResetAlpha)
+	{
+		bool IsB8G8R8A8 = m_VKSurfFormat.format == VK_FORMAT_B8G8R8A8_UNORM;
+		bool UsesRGBALikeFormat = m_VKSurfFormat.format == VK_FORMAT_R8G8B8A8_UNORM || IsB8G8R8A8;
+		if(UsesRGBALikeFormat && m_LastPresentedSwapChainImageIndex != std::numeric_limits<decltype(m_LastPresentedSwapChainImageIndex)>::max())
+		{
+			auto Viewport = m_VKSwapImgAndViewportExtent.GetPresentedImageViewport();
+			Width = Viewport.width;
+			Height = Viewport.height;
+			Format = CImageInfo::FORMAT_RGBA;
+
+			const size_t ImageTotalSize = (size_t)Width * Height * CImageInfo::PixelSize(Format);
+
+			uint8_t *pResImageData;
+			if(!PreparePresentedImageDataImage(pResImageData, Width, Height))
+				return false;
+
+			VkCommandBuffer *pCommandBuffer;
+			if(!GetMemoryCommandBuffer(pCommandBuffer))
+				return false;
+			VkCommandBuffer &CommandBuffer = *pCommandBuffer;
+
+			VkBufferImageCopy Region{};
+			Region.bufferOffset = 0;
+			Region.bufferRowLength = 0;
+			Region.bufferImageHeight = 0;
+			Region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+			Region.imageSubresource.mipLevel = 0;
+			Region.imageSubresource.baseArrayLayer = 0;
+			Region.imageSubresource.layerCount = 1;
+			Region.imageOffset = {0, 0, 0};
+			Region.imageExtent = {Viewport.width, Viewport.height, 1};
+
+			auto &SwapImg = m_vSwapChainImages[m_LastPresentedSwapChainImageIndex];
+
+			if(!ImageBarrier(m_GetPresentedImgDataHelperImage, 0, 1, 0, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL))
+				return false;
+			if(!ImageBarrier(SwapImg, 0, 1, 0, 1, m_VKSurfFormat.format, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL))
+				return false;
+
+			// If source and destination support blit we'll blit as this also does automatic format conversion (e.g. from BGR to RGB)
+			if(m_OptimalSwapChainImageBlitting && m_LinearRGBAImageBlitting)
+			{
+				VkOffset3D BlitSize;
+				BlitSize.x = Width;
+				BlitSize.y = Height;
+				BlitSize.z = 1;
+				VkImageBlit ImageBlitRegion{};
+				ImageBlitRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+				ImageBlitRegion.srcSubresource.layerCount = 1;
+				ImageBlitRegion.srcOffsets[1] = BlitSize;
+				ImageBlitRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+				ImageBlitRegion.dstSubresource.layerCount = 1;
+				ImageBlitRegion.dstOffsets[1] = BlitSize;
+
+				// Issue the blit command
+				vkCmdBlitImage(CommandBuffer, SwapImg, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+					m_GetPresentedImgDataHelperImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+					1, &ImageBlitRegion, VK_FILTER_NEAREST);
+
+				// transformed to RGBA
+				IsB8G8R8A8 = false;
+			}
+			else
+			{
+				// Otherwise use image copy (requires us to manually flip components)
+				VkImageCopy ImageCopyRegion{};
+				ImageCopyRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+				ImageCopyRegion.srcSubresource.layerCount = 1;
+				ImageCopyRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+				ImageCopyRegion.dstSubresource.layerCount = 1;
+				ImageCopyRegion.extent.width = Width;
+				ImageCopyRegion.extent.height = Height;
+				ImageCopyRegion.extent.depth = 1;
+
+				// Issue the copy command
+				vkCmdCopyImage(CommandBuffer, SwapImg, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+					m_GetPresentedImgDataHelperImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+					1, &ImageCopyRegion);
+			}
+
+			if(!ImageBarrier(m_GetPresentedImgDataHelperImage, 0, 1, 0, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL))
+				return false;
+			if(!ImageBarrier(SwapImg, 0, 1, 0, 1, m_VKSurfFormat.format, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR))
+				return false;
+
+			vkEndCommandBuffer(CommandBuffer);
+			m_vUsedMemoryCommandBuffer[m_CurImageIndex] = false;
+
+			VkSubmitInfo SubmitInfo{};
+			SubmitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+
+			SubmitInfo.commandBufferCount = 1;
+			SubmitInfo.pCommandBuffers = &CommandBuffer;
+
+			vkResetFences(m_VKDevice, 1, &m_GetPresentedImgDataHelperFence);
+			vkQueueSubmit(m_VKGraphicsQueue, 1, &SubmitInfo, m_GetPresentedImgDataHelperFence);
+			vkWaitForFences(m_VKDevice, 1, &m_GetPresentedImgDataHelperFence, VK_TRUE, std::numeric_limits<uint64_t>::max());
+
+			VkMappedMemoryRange MemRange{};
+			MemRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+			MemRange.memory = m_GetPresentedImgDataHelperMem.m_Mem;
+			MemRange.offset = m_GetPresentedImgDataHelperMappedLayoutOffset;
+			MemRange.size = VK_WHOLE_SIZE;
+			vkInvalidateMappedMemoryRanges(m_VKDevice, 1, &MemRange);
+
+			size_t RealFullImageSize = maximum(ImageTotalSize, (size_t)(Height * m_GetPresentedImgDataHelperMappedLayoutPitch));
+			if(vDstData.size() < RealFullImageSize + (Width * 4))
+				vDstData.resize(RealFullImageSize + (Width * 4)); // extra space for flipping
+
+			mem_copy(vDstData.data(), pResImageData, RealFullImageSize);
+
+			// pack image data together without any offset that the driver might require
+			if(Width * 4 < m_GetPresentedImgDataHelperMappedLayoutPitch)
+			{
+				for(uint32_t Y = 0; Y < Height; ++Y)
+				{
+					size_t OffsetImagePacked = (Y * Width * 4);
+					size_t OffsetImageUnpacked = (Y * m_GetPresentedImgDataHelperMappedLayoutPitch);
+					mem_copy(vDstData.data() + OffsetImagePacked, vDstData.data() + OffsetImageUnpacked, Width * 4);
+				}
+			}
+
+			if(IsB8G8R8A8 || ResetAlpha)
+			{
+				// swizzle
+				for(uint32_t Y = 0; Y < Height; ++Y)
+				{
+					for(uint32_t X = 0; X < Width; ++X)
+					{
+						size_t ImgOff = (Y * Width * 4) + (X * 4);
+						if(IsB8G8R8A8)
+						{
+							std::swap(vDstData[ImgOff], vDstData[ImgOff + 2]);
+						}
+						vDstData[ImgOff + 3] = 255;
+					}
+				}
+			}
+
+			if(FlipImgData)
+			{
+				uint8_t *pTempRow = vDstData.data() + Width * Height * 4;
+				for(uint32_t Y = 0; Y < Height / 2; ++Y)
+				{
+					mem_copy(pTempRow, vDstData.data() + Y * Width * 4, Width * 4);
+					mem_copy(vDstData.data() + Y * Width * 4, vDstData.data() + ((Height - Y) - 1) * Width * 4, Width * 4);
+					mem_copy(vDstData.data() + ((Height - Y) - 1) * Width * 4, pTempRow, Width * 4);
+				}
+			}
+
+			return true;
+		}
+		else
+		{
+			if(!UsesRGBALikeFormat)
+			{
+				dbg_msg("vulkan", "swap chain image was not in a RGBA like format.");
+			}
+			else
+			{
+				dbg_msg("vulkan", "swap chain image was not ready to be copied.");
+			}
+			return false;
+		}
+	}
+
+	[[nodiscard]] bool GetPresentedImageData(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) override
+	{
+		return GetPresentedImageDataImpl(Width, Height, Format, vDstData, false, false);
+	}
+
+	/************************
+	* MEMORY MANAGEMENT
+	************************/
+
+	[[nodiscard]] bool AllocateVulkanMemory(const VkMemoryAllocateInfo *pAllocateInfo, VkDeviceMemory *pMemory)
+	{
+		VkResult Res = vkAllocateMemory(m_VKDevice, pAllocateInfo, nullptr, pMemory);
+		if(Res != VK_SUCCESS)
+		{
+			dbg_msg("vulkan", "vulkan memory allocation failed, trying to recover.");
+			if(Res == VK_ERROR_OUT_OF_HOST_MEMORY || Res == VK_ERROR_OUT_OF_DEVICE_MEMORY)
+			{
+				// aggressivly try to get more memory
+				vkDeviceWaitIdle(m_VKDevice);
+				for(size_t i = 0; i < m_SwapChainImageCount + 1; ++i)
+				{
+					if(!NextFrame())
+						return false;
+				}
+				Res = vkAllocateMemory(m_VKDevice, pAllocateInfo, nullptr, pMemory);
+			}
+			if(Res != VK_SUCCESS)
+			{
+				dbg_msg("vulkan", "vulkan memory allocation failed.");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	[[nodiscard]] bool GetBufferImpl(VkDeviceSize RequiredSize, EMemoryBlockUsage MemUsage, VkBuffer &Buffer, SDeviceMemoryBlock &BufferMemory, VkBufferUsageFlags BufferUsage, VkMemoryPropertyFlags BufferProperties)
+	{
+		return CreateBuffer(RequiredSize, MemUsage, BufferUsage, BufferProperties, Buffer, BufferMemory);
+	}
+
+	template<size_t ID,
+		int64_t MemoryBlockSize, size_t BlockCount,
+		bool RequiresMapping>
+	[[nodiscard]] bool GetBufferBlockImpl(SMemoryBlock<ID> &RetBlock, SMemoryBlockCache<ID> &MemoryCache, VkBufferUsageFlags BufferUsage, VkMemoryPropertyFlags BufferProperties, const void *pBufferData, VkDeviceSize RequiredSize, VkDeviceSize TargetAlignment)
+	{
+		bool Res = true;
+
+		auto &&CreateCacheBlock = [&]() -> bool {
+			bool FoundAllocation = false;
+			SMemoryHeap::SMemoryHeapQueueElement AllocatedMem;
+			SDeviceMemoryBlock TmpBufferMemory;
+			typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
+			auto &Heaps = MemoryCache.m_MemoryCaches.m_vpMemoryHeaps;
+			for(size_t i = 0; i < Heaps.size(); ++i)
+			{
+				auto *pHeap = Heaps[i];
+				if(pHeap->m_Heap.Allocate(RequiredSize, TargetAlignment, AllocatedMem))
+				{
+					TmpBufferMemory = pHeap->m_BufferMem;
+					FoundAllocation = true;
+					pCacheHeap = pHeap;
+					break;
+				}
+			}
+			if(!FoundAllocation)
+			{
+				typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap();
+
+				VkBuffer TmpBuffer;
+				if(!GetBufferImpl(MemoryBlockSize * BlockCount, RequiresMapping ? MEMORY_BLOCK_USAGE_STAGING : MEMORY_BLOCK_USAGE_BUFFER, TmpBuffer, TmpBufferMemory, BufferUsage, BufferProperties))
+				{
+					delete pNewHeap;
+					return false;
+				}
+
+				void *pMapData = nullptr;
+
+				if(RequiresMapping)
+				{
+					if(vkMapMemory(m_VKDevice, TmpBufferMemory.m_Mem, 0, VK_WHOLE_SIZE, 0, &pMapData) != VK_SUCCESS)
+					{
+						SetError(RequiresMapping ? EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_STAGING : EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER, "Failed to map buffer block memory.",
+							GetMemoryUsageShort());
+						delete pNewHeap;
+						return false;
+					}
+				}
+
+				pNewHeap->m_Buffer = TmpBuffer;
+
+				pNewHeap->m_BufferMem = TmpBufferMemory;
+				pNewHeap->m_pMappedBuffer = pMapData;
+
+				pCacheHeap = pNewHeap;
+				Heaps.emplace_back(pNewHeap);
+				Heaps.back()->m_Heap.Init(MemoryBlockSize * BlockCount, 0);
+				if(!Heaps.back()->m_Heap.Allocate(RequiredSize, TargetAlignment, AllocatedMem))
+				{
+					SetError(RequiresMapping ? EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_STAGING : EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER, "Heap allocation failed directly after creating fresh heap.",
+						GetMemoryUsageShort());
+					return false;
+				}
+			}
+
+			RetBlock.m_Buffer = pCacheHeap->m_Buffer;
+			RetBlock.m_BufferMem = TmpBufferMemory;
+			if(RequiresMapping)
+				RetBlock.m_pMappedBuffer = ((uint8_t *)pCacheHeap->m_pMappedBuffer) + AllocatedMem.m_OffsetToAlign;
+			else
+				RetBlock.m_pMappedBuffer = nullptr;
+			RetBlock.m_IsCached = true;
+			RetBlock.m_pHeap = &pCacheHeap->m_Heap;
+			RetBlock.m_HeapData = AllocatedMem;
+			RetBlock.m_UsedSize = RequiredSize;
+
+			if(RequiresMapping)
+				mem_copy(RetBlock.m_pMappedBuffer, pBufferData, RequiredSize);
+
+			return true;
+		};
+
+		if(RequiredSize < (VkDeviceSize)MemoryBlockSize)
+		{
+			Res = CreateCacheBlock();
+		}
+		else
+		{
+			VkBuffer TmpBuffer;
+			SDeviceMemoryBlock TmpBufferMemory;
+			if(!GetBufferImpl(RequiredSize, RequiresMapping ? MEMORY_BLOCK_USAGE_STAGING : MEMORY_BLOCK_USAGE_BUFFER, TmpBuffer, TmpBufferMemory, BufferUsage, BufferProperties))
+				return false;
+
+			void *pMapData = nullptr;
+			if(RequiresMapping)
+			{
+				vkMapMemory(m_VKDevice, TmpBufferMemory.m_Mem, 0, VK_WHOLE_SIZE, 0, &pMapData);
+				mem_copy(pMapData, pBufferData, static_cast<size_t>(RequiredSize));
+			}
+
+			RetBlock.m_Buffer = TmpBuffer;
+			RetBlock.m_BufferMem = TmpBufferMemory;
+			RetBlock.m_pMappedBuffer = pMapData;
+			RetBlock.m_pHeap = nullptr;
+			RetBlock.m_IsCached = false;
+			RetBlock.m_HeapData.m_OffsetToAlign = 0;
+			RetBlock.m_HeapData.m_AllocationSize = RequiredSize;
+			RetBlock.m_UsedSize = RequiredSize;
+		}
+
+		return Res;
+	}
+
+	[[nodiscard]] bool GetStagingBuffer(SMemoryBlock<s_StagingBufferCacheID> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
+	{
+		return GetBufferBlockImpl<s_StagingBufferCacheID, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCache, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16));
+	}
+
+	[[nodiscard]] bool GetStagingBufferImage(SMemoryBlock<s_StagingBufferImageCacheID> &ResBlock, const void *pBufferData, VkDeviceSize RequiredSize)
+	{
+		return GetBufferBlockImpl<s_StagingBufferImageCacheID, 8 * 1024 * 1024, 3, true>(ResBlock, m_StagingBufferCacheImage, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, pBufferData, RequiredSize, maximum<VkDeviceSize>(m_OptimalImageCopyMemAlignment, maximum<VkDeviceSize>(m_NonCoherentMemAlignment, 16)));
+	}
+
+	template<size_t ID>
+	void PrepareStagingMemRange(SMemoryBlock<ID> &Block)
+	{
+		VkMappedMemoryRange UploadRange{};
+		UploadRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+		UploadRange.memory = Block.m_BufferMem.m_Mem;
+		UploadRange.offset = Block.m_HeapData.m_OffsetToAlign;
+
+		auto AlignmentMod = ((VkDeviceSize)Block.m_HeapData.m_AllocationSize % m_NonCoherentMemAlignment);
+		auto AlignmentReq = (m_NonCoherentMemAlignment - AlignmentMod);
+		if(AlignmentMod == 0)
+			AlignmentReq = 0;
+		UploadRange.size = Block.m_HeapData.m_AllocationSize + AlignmentReq;
+
+		if(UploadRange.offset + UploadRange.size > Block.m_BufferMem.m_Size)
+			UploadRange.size = VK_WHOLE_SIZE;
+
+		m_vNonFlushedStagingBufferRange.push_back(UploadRange);
+	}
+
+	void UploadAndFreeStagingMemBlock(SMemoryBlock<s_StagingBufferCacheID> &Block)
+	{
+		PrepareStagingMemRange(Block);
+		if(!Block.m_IsCached)
+		{
+			m_vvFrameDelayedBufferCleanup[m_CurImageIndex].push_back({Block.m_Buffer, Block.m_BufferMem, Block.m_pMappedBuffer});
+		}
+		else
+		{
+			m_StagingBufferCache.FreeMemBlock(Block, m_CurImageIndex);
+		}
+	}
+
+	void UploadAndFreeStagingImageMemBlock(SMemoryBlock<s_StagingBufferImageCacheID> &Block)
+	{
+		PrepareStagingMemRange(Block);
+		if(!Block.m_IsCached)
+		{
+			m_vvFrameDelayedBufferCleanup[m_CurImageIndex].push_back({Block.m_Buffer, Block.m_BufferMem, Block.m_pMappedBuffer});
+		}
+		else
+		{
+			m_StagingBufferCacheImage.FreeMemBlock(Block, m_CurImageIndex);
+		}
+	}
+
+	[[nodiscard]] bool GetVertexBuffer(SMemoryBlock<s_VertexBufferCacheID> &ResBlock, VkDeviceSize RequiredSize)
+	{
+		return GetBufferBlockImpl<s_VertexBufferCacheID, 8 * 1024 * 1024, 3, false>(ResBlock, m_VertexBufferCache, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, nullptr, RequiredSize, 16);
+	}
+
+	void FreeVertexMemBlock(SMemoryBlock<s_VertexBufferCacheID> &Block)
+	{
+		if(!Block.m_IsCached)
+		{
+			m_vvFrameDelayedBufferCleanup[m_CurImageIndex].push_back({Block.m_Buffer, Block.m_BufferMem, nullptr});
+		}
+		else
+		{
+			m_VertexBufferCache.FreeMemBlock(Block, m_CurImageIndex);
+		}
+	}
+
+	static size_t ImageMipLevelCount(size_t Width, size_t Height, size_t Depth)
+	{
+		return std::floor(std::log2(maximum(Width, maximum(Height, Depth)))) + 1;
+	}
+
+	static size_t ImageMipLevelCount(const VkExtent3D &ImgExtent)
+	{
+		return ImageMipLevelCount(ImgExtent.width, ImgExtent.height, ImgExtent.depth);
+	}
+
+	// good approximation of 1024x1024 image with mipmaps
+	static constexpr int64_t s_1024x1024ImgSize = (1024 * 1024 * 4) * 2;
+
+	[[nodiscard]] bool GetImageMemoryImpl(VkDeviceSize RequiredSize, uint32_t RequiredMemoryTypeBits, SDeviceMemoryBlock &BufferMemory, VkMemoryPropertyFlags BufferProperties)
+	{
+		VkMemoryAllocateInfo MemAllocInfo{};
+		MemAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+		MemAllocInfo.allocationSize = RequiredSize;
+		MemAllocInfo.memoryTypeIndex = FindMemoryType(m_VKGPU, RequiredMemoryTypeBits, BufferProperties);
+
+		BufferMemory.m_Size = RequiredSize;
+		m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) + RequiredSize, std::memory_order_relaxed);
+
+		if(IsVerbose())
+		{
+			VerboseAllocatedMemory(RequiredSize, m_CurImageIndex, MEMORY_BLOCK_USAGE_TEXTURE);
+		}
+
+		if(!AllocateVulkanMemory(&MemAllocInfo, &BufferMemory.m_Mem))
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_IMAGE, "Allocation for image memory failed.",
+				GetMemoryUsageShort());
+			return false;
+		}
+
+		BufferMemory.m_UsageType = MEMORY_BLOCK_USAGE_TEXTURE;
+
+		return true;
+	}
+
+	template<size_t ID,
+		int64_t MemoryBlockSize, size_t BlockCount>
+	[[nodiscard]] bool GetImageMemoryBlockImpl(SMemoryImageBlock<ID> &RetBlock, SMemoryBlockCache<ID> &MemoryCache, VkMemoryPropertyFlags BufferProperties, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
+	{
+		auto &&CreateCacheBlock = [&]() -> bool {
+			bool FoundAllocation = false;
+			SMemoryHeap::SMemoryHeapQueueElement AllocatedMem;
+			SDeviceMemoryBlock TmpBufferMemory;
+			typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pCacheHeap = nullptr;
+			for(size_t i = 0; i < MemoryCache.m_MemoryCaches.m_vpMemoryHeaps.size(); ++i)
+			{
+				auto *pHeap = MemoryCache.m_MemoryCaches.m_vpMemoryHeaps[i];
+				if(pHeap->m_Heap.Allocate(RequiredSize, RequiredAlignment, AllocatedMem))
+				{
+					TmpBufferMemory = pHeap->m_BufferMem;
+					FoundAllocation = true;
+					pCacheHeap = pHeap;
+					break;
+				}
+			}
+			if(!FoundAllocation)
+			{
+				typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap *pNewHeap = new typename SMemoryBlockCache<ID>::SMemoryCacheType::SMemoryCacheHeap();
+
+				if(!GetImageMemoryImpl(MemoryBlockSize * BlockCount, RequiredMemoryTypeBits, TmpBufferMemory, BufferProperties))
+				{
+					delete pNewHeap;
+					return false;
+				}
+
+				pNewHeap->m_Buffer = VK_NULL_HANDLE;
+
+				pNewHeap->m_BufferMem = TmpBufferMemory;
+				pNewHeap->m_pMappedBuffer = nullptr;
+
+				auto &Heaps = MemoryCache.m_MemoryCaches.m_vpMemoryHeaps;
+				pCacheHeap = pNewHeap;
+				Heaps.emplace_back(pNewHeap);
+				Heaps.back()->m_Heap.Init(MemoryBlockSize * BlockCount, 0);
+				if(!Heaps.back()->m_Heap.Allocate(RequiredSize, RequiredAlignment, AllocatedMem))
+				{
+					dbg_assert(false, "Heap allocation failed directly after creating fresh heap for image");
+				}
+			}
+
+			RetBlock.m_Buffer = VK_NULL_HANDLE;
+			RetBlock.m_BufferMem = TmpBufferMemory;
+			RetBlock.m_pMappedBuffer = nullptr;
+			RetBlock.m_IsCached = true;
+			RetBlock.m_pHeap = &pCacheHeap->m_Heap;
+			RetBlock.m_HeapData = AllocatedMem;
+			RetBlock.m_UsedSize = RequiredSize;
+
+			return true;
+		};
+
+		if(RequiredSize < (VkDeviceSize)MemoryBlockSize)
+		{
+			if(!CreateCacheBlock())
+				return false;
+		}
+		else
+		{
+			SDeviceMemoryBlock TmpBufferMemory;
+			if(!GetImageMemoryImpl(RequiredSize, RequiredMemoryTypeBits, TmpBufferMemory, BufferProperties))
+				return false;
+
+			RetBlock.m_Buffer = VK_NULL_HANDLE;
+			RetBlock.m_BufferMem = TmpBufferMemory;
+			RetBlock.m_pMappedBuffer = nullptr;
+			RetBlock.m_IsCached = false;
+			RetBlock.m_pHeap = nullptr;
+			RetBlock.m_HeapData.m_OffsetToAlign = 0;
+			RetBlock.m_HeapData.m_AllocationSize = RequiredSize;
+			RetBlock.m_UsedSize = RequiredSize;
+		}
+
+		RetBlock.m_ImageMemoryBits = RequiredMemoryTypeBits;
+
+		return true;
+	}
+
+	[[nodiscard]] bool GetImageMemory(SMemoryImageBlock<s_ImageBufferCacheID> &RetBlock, VkDeviceSize RequiredSize, VkDeviceSize RequiredAlignment, uint32_t RequiredMemoryTypeBits)
+	{
+		auto it = m_ImageBufferCaches.find(RequiredMemoryTypeBits);
+		if(it == m_ImageBufferCaches.end())
+		{
+			it = m_ImageBufferCaches.insert({RequiredMemoryTypeBits, {}}).first;
+
+			it->second.Init(m_SwapChainImageCount);
+		}
+		return GetImageMemoryBlockImpl<s_ImageBufferCacheID, s_1024x1024ImgSize, 2>(RetBlock, it->second, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, RequiredSize, RequiredAlignment, RequiredMemoryTypeBits);
+	}
+
+	void FreeImageMemBlock(SMemoryImageBlock<s_ImageBufferCacheID> &Block)
+	{
+		if(!Block.m_IsCached)
+		{
+			m_vvFrameDelayedBufferCleanup[m_CurImageIndex].push_back({Block.m_Buffer, Block.m_BufferMem, nullptr});
+		}
+		else
+		{
+			m_ImageBufferCaches[Block.m_ImageMemoryBits].FreeMemBlock(Block, m_CurImageIndex);
+		}
+	}
+
+	template<bool FlushForRendering, typename TName>
+	void UploadStreamedBuffer(SStreamMemory<TName> &StreamedBuffer)
+	{
+		size_t RangeUpdateCount = 0;
+		if(StreamedBuffer.IsUsed(m_CurImageIndex))
+		{
+			for(size_t i = 0; i < StreamedBuffer.GetUsedCount(m_CurImageIndex); ++i)
+			{
+				auto &BufferOfFrame = StreamedBuffer.GetBuffers(m_CurImageIndex)[i];
+				auto &MemRange = StreamedBuffer.GetRanges(m_CurImageIndex)[RangeUpdateCount++];
+				MemRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+				MemRange.memory = BufferOfFrame.m_BufferMem.m_Mem;
+				MemRange.offset = BufferOfFrame.m_OffsetInBuffer;
+				auto AlignmentMod = ((VkDeviceSize)BufferOfFrame.m_UsedSize % m_NonCoherentMemAlignment);
+				auto AlignmentReq = (m_NonCoherentMemAlignment - AlignmentMod);
+				if(AlignmentMod == 0)
+					AlignmentReq = 0;
+				MemRange.size = BufferOfFrame.m_UsedSize + AlignmentReq;
+
+				if(MemRange.offset + MemRange.size > BufferOfFrame.m_BufferMem.m_Size)
+					MemRange.size = VK_WHOLE_SIZE;
+
+				BufferOfFrame.m_UsedSize = 0;
+			}
+			if(RangeUpdateCount > 0 && FlushForRendering)
+			{
+				vkFlushMappedMemoryRanges(m_VKDevice, RangeUpdateCount, StreamedBuffer.GetRanges(m_CurImageIndex).data());
+			}
+		}
+		StreamedBuffer.ResetFrame(m_CurImageIndex);
+	}
+
+	void CleanBufferPair(size_t ImageIndex, VkBuffer &Buffer, SDeviceMemoryBlock &BufferMem)
+	{
+		bool IsBuffer = Buffer != VK_NULL_HANDLE;
+		if(IsBuffer)
+		{
+			vkDestroyBuffer(m_VKDevice, Buffer, nullptr);
+
+			Buffer = VK_NULL_HANDLE;
+		}
+		if(BufferMem.m_Mem != VK_NULL_HANDLE)
+		{
+			vkFreeMemory(m_VKDevice, BufferMem.m_Mem, nullptr);
+			if(BufferMem.m_UsageType == MEMORY_BLOCK_USAGE_BUFFER)
+				m_pBufferMemoryUsage->store(m_pBufferMemoryUsage->load(std::memory_order_relaxed) - BufferMem.m_Size, std::memory_order_relaxed);
+			else if(BufferMem.m_UsageType == MEMORY_BLOCK_USAGE_TEXTURE)
+				m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) - BufferMem.m_Size, std::memory_order_relaxed);
+			else if(BufferMem.m_UsageType == MEMORY_BLOCK_USAGE_STREAM)
+				m_pStreamMemoryUsage->store(m_pStreamMemoryUsage->load(std::memory_order_relaxed) - BufferMem.m_Size, std::memory_order_relaxed);
+			else if(BufferMem.m_UsageType == MEMORY_BLOCK_USAGE_STAGING)
+				m_pStagingMemoryUsage->store(m_pStagingMemoryUsage->load(std::memory_order_relaxed) - BufferMem.m_Size, std::memory_order_relaxed);
+
+			if(IsVerbose())
+			{
+				VerboseDeallocatedMemory(BufferMem.m_Size, (size_t)ImageIndex, BufferMem.m_UsageType);
+			}
+
+			BufferMem.m_Mem = VK_NULL_HANDLE;
+		}
+	}
+
+	void DestroyTexture(CTexture &Texture)
+	{
+		if(Texture.m_Img != VK_NULL_HANDLE)
+		{
+			FreeImageMemBlock(Texture.m_ImgMem);
+			vkDestroyImage(m_VKDevice, Texture.m_Img, nullptr);
+
+			vkDestroyImageView(m_VKDevice, Texture.m_ImgView, nullptr);
+		}
+
+		if(Texture.m_Img3D != VK_NULL_HANDLE)
+		{
+			FreeImageMemBlock(Texture.m_Img3DMem);
+			vkDestroyImage(m_VKDevice, Texture.m_Img3D, nullptr);
+
+			vkDestroyImageView(m_VKDevice, Texture.m_Img3DView, nullptr);
+		}
+
+		DestroyTexturedStandardDescriptorSets(Texture, 0);
+		DestroyTexturedStandardDescriptorSets(Texture, 1);
+
+		DestroyTextured3DStandardDescriptorSets(Texture);
+	}
+
+	void DestroyTextTexture(CTexture &Texture, CTexture &TextureOutline)
+	{
+		if(Texture.m_Img != VK_NULL_HANDLE)
+		{
+			FreeImageMemBlock(Texture.m_ImgMem);
+			vkDestroyImage(m_VKDevice, Texture.m_Img, nullptr);
+
+			vkDestroyImageView(m_VKDevice, Texture.m_ImgView, nullptr);
+		}
+
+		if(TextureOutline.m_Img != VK_NULL_HANDLE)
+		{
+			FreeImageMemBlock(TextureOutline.m_ImgMem);
+			vkDestroyImage(m_VKDevice, TextureOutline.m_Img, nullptr);
+
+			vkDestroyImageView(m_VKDevice, TextureOutline.m_ImgView, nullptr);
+		}
+
+		DestroyTextDescriptorSets(Texture, TextureOutline);
+	}
+
+	void ClearFrameData(size_t FrameImageIndex)
+	{
+		UploadStagingBuffers();
+
+		// clear pending buffers, that require deletion
+		for(auto &BufferPair : m_vvFrameDelayedBufferCleanup[FrameImageIndex])
+		{
+			if(BufferPair.m_pMappedData != nullptr)
+			{
+				vkUnmapMemory(m_VKDevice, BufferPair.m_Mem.m_Mem);
+			}
+			CleanBufferPair(FrameImageIndex, BufferPair.m_Buffer, BufferPair.m_Mem);
+		}
+		m_vvFrameDelayedBufferCleanup[FrameImageIndex].clear();
+
+		// clear pending textures, that require deletion
+		for(auto &Texture : m_vvFrameDelayedTextureCleanup[FrameImageIndex])
+		{
+			DestroyTexture(Texture);
+		}
+		m_vvFrameDelayedTextureCleanup[FrameImageIndex].clear();
+
+		for(auto &TexturePair : m_vvFrameDelayedTextTexturesCleanup[FrameImageIndex])
+		{
+			DestroyTextTexture(TexturePair.first, TexturePair.second);
+		}
+		m_vvFrameDelayedTextTexturesCleanup[FrameImageIndex].clear();
+
+		m_StagingBufferCache.Cleanup(FrameImageIndex);
+		m_StagingBufferCacheImage.Cleanup(FrameImageIndex);
+		m_VertexBufferCache.Cleanup(FrameImageIndex);
+		for(auto &ImageBufferCache : m_ImageBufferCaches)
+			ImageBufferCache.second.Cleanup(FrameImageIndex);
+	}
+
+	void ShrinkUnusedCaches()
+	{
+		size_t FreeedMemory = 0;
+		FreeedMemory += m_StagingBufferCache.Shrink(m_VKDevice);
+		FreeedMemory += m_StagingBufferCacheImage.Shrink(m_VKDevice);
+		if(FreeedMemory > 0)
+		{
+			m_pStagingMemoryUsage->store(m_pStagingMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (staging buffer)", (size_t)FreeedMemory);
+			}
+		}
+		FreeedMemory = 0;
+		FreeedMemory += m_VertexBufferCache.Shrink(m_VKDevice);
+		if(FreeedMemory > 0)
+		{
+			m_pBufferMemoryUsage->store(m_pBufferMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (buffer)", (size_t)FreeedMemory);
+			}
+		}
+		FreeedMemory = 0;
+		for(auto &ImageBufferCache : m_ImageBufferCaches)
+			FreeedMemory += ImageBufferCache.second.Shrink(m_VKDevice);
+		if(FreeedMemory > 0)
+		{
+			m_pTextureMemoryUsage->store(m_pTextureMemoryUsage->load(std::memory_order_relaxed) - FreeedMemory, std::memory_order_relaxed);
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "deallocated chunks of memory with size: %" PRIzu " from all frames (texture)", (size_t)FreeedMemory);
+			}
+		}
+	}
+
+	[[nodiscard]] bool MemoryBarrier(VkBuffer Buffer, VkDeviceSize Offset, VkDeviceSize Size, VkAccessFlags BufferAccessType, bool BeforeCommand)
+	{
+		VkCommandBuffer *pMemCommandBuffer;
+		if(!GetMemoryCommandBuffer(pMemCommandBuffer))
+			return false;
+		auto &MemCommandBuffer = *pMemCommandBuffer;
+
+		VkBufferMemoryBarrier Barrier{};
+		Barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+		Barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.buffer = Buffer;
+		Barrier.offset = Offset;
+		Barrier.size = Size;
+
+		VkPipelineStageFlags SourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+		VkPipelineStageFlags DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+
+		if(BeforeCommand)
+		{
+			Barrier.srcAccessMask = BufferAccessType;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else
+		{
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+			Barrier.dstAccessMask = BufferAccessType;
+
+			SourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
+		}
+
+		vkCmdPipelineBarrier(
+			MemCommandBuffer,
+			SourceStage, DestinationStage,
+			0,
+			0, nullptr,
+			1, &Barrier,
+			0, nullptr);
+
+		return true;
+	}
+
+	/************************
+	* SWAPPING MECHANISM
+	************************/
+
+	void StartRenderThread(size_t ThreadIndex)
+	{
+		auto &List = m_vvThreadCommandLists[ThreadIndex];
+		if(!List.empty())
+		{
+			m_vThreadHelperHadCommands[ThreadIndex] = true;
+			auto *pThread = m_vpRenderThreads[ThreadIndex].get();
+			std::unique_lock<std::mutex> Lock(pThread->m_Mutex);
+			pThread->m_IsRendering = true;
+			pThread->m_Cond.notify_one();
+		}
+	}
+
+	void FinishRenderThreads()
+	{
+		if(m_ThreadCount > 1)
+		{
+			// execute threads
+
+			for(size_t ThreadIndex = 0; ThreadIndex < m_ThreadCount - 1; ++ThreadIndex)
+			{
+				if(!m_vThreadHelperHadCommands[ThreadIndex])
+				{
+					StartRenderThread(ThreadIndex);
+				}
+			}
+
+			for(size_t ThreadIndex = 0; ThreadIndex < m_ThreadCount - 1; ++ThreadIndex)
+			{
+				if(m_vThreadHelperHadCommands[ThreadIndex])
+				{
+					auto &pRenderThread = m_vpRenderThreads[ThreadIndex];
+					m_vThreadHelperHadCommands[ThreadIndex] = false;
+					std::unique_lock<std::mutex> Lock(pRenderThread->m_Mutex);
+					pRenderThread->m_Cond.wait(Lock, [&pRenderThread] { return !pRenderThread->m_IsRendering; });
+					m_vLastPipeline[ThreadIndex + 1] = VK_NULL_HANDLE;
+				}
+			}
+		}
+	}
+
+	void ExecuteMemoryCommandBuffer()
+	{
+		if(m_vUsedMemoryCommandBuffer[m_CurImageIndex])
+		{
+			auto &MemoryCommandBuffer = m_vMemoryCommandBuffers[m_CurImageIndex];
+			vkEndCommandBuffer(MemoryCommandBuffer);
+
+			VkSubmitInfo SubmitInfo{};
+			SubmitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+
+			SubmitInfo.commandBufferCount = 1;
+			SubmitInfo.pCommandBuffers = &MemoryCommandBuffer;
+			vkQueueSubmit(m_VKGraphicsQueue, 1, &SubmitInfo, VK_NULL_HANDLE);
+			vkQueueWaitIdle(m_VKGraphicsQueue);
+
+			m_vUsedMemoryCommandBuffer[m_CurImageIndex] = false;
+		}
+	}
+
+	void ClearFrameMemoryUsage()
+	{
+		ClearFrameData(m_CurImageIndex);
+		ShrinkUnusedCaches();
+	}
+
+	[[nodiscard]] bool WaitFrame()
+	{
+		FinishRenderThreads();
+		m_LastCommandsInPipeThreadIndex = 0;
+
+		UploadNonFlushedBuffers<true>();
+
+		auto &CommandBuffer = GetMainGraphicCommandBuffer();
+
+		// render threads
+		if(m_ThreadCount > 1)
+		{
+			size_t ThreadedCommandsUsedCount = 0;
+			size_t RenderThreadCount = m_ThreadCount - 1;
+			for(size_t i = 0; i < RenderThreadCount; ++i)
+			{
+				if(m_vvUsedThreadDrawCommandBuffer[i + 1][m_CurImageIndex])
+				{
+					const auto &GraphicThreadCommandBuffer = m_vvThreadDrawCommandBuffers[i + 1][m_CurImageIndex];
+					m_vHelperThreadDrawCommandBuffers[ThreadedCommandsUsedCount++] = GraphicThreadCommandBuffer;
+
+					m_vvUsedThreadDrawCommandBuffer[i + 1][m_CurImageIndex] = false;
+				}
+			}
+			if(ThreadedCommandsUsedCount > 0)
+			{
+				vkCmdExecuteCommands(CommandBuffer, ThreadedCommandsUsedCount, m_vHelperThreadDrawCommandBuffers.data());
+			}
+
+			// special case if swap chain was not completed in one runbuffer call
+
+			if(m_vvUsedThreadDrawCommandBuffer[0][m_CurImageIndex])
+			{
+				auto &GraphicThreadCommandBuffer = m_vvThreadDrawCommandBuffers[0][m_CurImageIndex];
+				vkEndCommandBuffer(GraphicThreadCommandBuffer);
+
+				vkCmdExecuteCommands(CommandBuffer, 1, &GraphicThreadCommandBuffer);
+
+				m_vvUsedThreadDrawCommandBuffer[0][m_CurImageIndex] = false;
+			}
+		}
+
+		vkCmdEndRenderPass(CommandBuffer);
+
+		if(vkEndCommandBuffer(CommandBuffer) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_RENDER_RECORDING, "Command buffer cannot be ended anymore.");
+			return false;
+		}
+
+		VkSemaphore WaitSemaphore = m_vWaitSemaphores[m_CurFrames];
+
+		VkSubmitInfo SubmitInfo{};
+		SubmitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+
+		SubmitInfo.commandBufferCount = 1;
+		SubmitInfo.pCommandBuffers = &CommandBuffer;
+
+		std::array<VkCommandBuffer, 2> aCommandBuffers = {};
+
+		if(m_vUsedMemoryCommandBuffer[m_CurImageIndex])
+		{
+			auto &MemoryCommandBuffer = m_vMemoryCommandBuffers[m_CurImageIndex];
+			vkEndCommandBuffer(MemoryCommandBuffer);
+
+			aCommandBuffers[0] = MemoryCommandBuffer;
+			aCommandBuffers[1] = CommandBuffer;
+			SubmitInfo.commandBufferCount = 2;
+			SubmitInfo.pCommandBuffers = aCommandBuffers.data();
+
+			m_vUsedMemoryCommandBuffer[m_CurImageIndex] = false;
+		}
+
+		std::array<VkSemaphore, 1> aWaitSemaphores = {WaitSemaphore};
+		std::array<VkPipelineStageFlags, 1> aWaitStages = {(VkPipelineStageFlags)VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT};
+		SubmitInfo.waitSemaphoreCount = aWaitSemaphores.size();
+		SubmitInfo.pWaitSemaphores = aWaitSemaphores.data();
+		SubmitInfo.pWaitDstStageMask = aWaitStages.data();
+
+		std::array<VkSemaphore, 1> aSignalSemaphores = {m_vSigSemaphores[m_CurFrames]};
+		SubmitInfo.signalSemaphoreCount = aSignalSemaphores.size();
+		SubmitInfo.pSignalSemaphores = aSignalSemaphores.data();
+
+		vkResetFences(m_VKDevice, 1, &m_vFrameFences[m_CurFrames]);
+
+		VkResult QueueSubmitRes = vkQueueSubmit(m_VKGraphicsQueue, 1, &SubmitInfo, m_vFrameFences[m_CurFrames]);
+		if(QueueSubmitRes != VK_SUCCESS)
+		{
+			const char *pCritErrorMsg = CheckVulkanCriticalError(QueueSubmitRes);
+			if(pCritErrorMsg != nullptr)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_RENDER_SUBMIT_FAILED, "Submitting to graphics queue failed.", pCritErrorMsg);
+				return false;
+			}
+		}
+
+		std::swap(m_vWaitSemaphores[m_CurFrames], m_vSigSemaphores[m_CurFrames]);
+
+		VkPresentInfoKHR PresentInfo{};
+		PresentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+
+		PresentInfo.waitSemaphoreCount = aSignalSemaphores.size();
+		PresentInfo.pWaitSemaphores = aSignalSemaphores.data();
+
+		std::array<VkSwapchainKHR, 1> aSwapChains = {m_VKSwapChain};
+		PresentInfo.swapchainCount = aSwapChains.size();
+		PresentInfo.pSwapchains = aSwapChains.data();
+
+		PresentInfo.pImageIndices = &m_CurImageIndex;
+
+		m_LastPresentedSwapChainImageIndex = m_CurImageIndex;
+
+		VkResult QueuePresentRes = vkQueuePresentKHR(m_VKPresentQueue, &PresentInfo);
+		if(QueuePresentRes != VK_SUCCESS && QueuePresentRes != VK_SUBOPTIMAL_KHR)
+		{
+			const char *pCritErrorMsg = CheckVulkanCriticalError(QueuePresentRes);
+			if(pCritErrorMsg != nullptr)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_SWAP_FAILED, "Presenting graphics queue failed.", pCritErrorMsg);
+				return false;
+			}
+		}
+
+		m_CurFrames = (m_CurFrames + 1) % m_SwapChainImageCount;
+		return true;
+	}
+
+	[[nodiscard]] bool PrepareFrame()
+	{
+		if(m_RecreateSwapChain)
+		{
+			m_RecreateSwapChain = false;
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "recreating swap chain requested by user (prepare frame).");
+			}
+			RecreateSwapChain();
+		}
+
+		auto AcqResult = vkAcquireNextImageKHR(m_VKDevice, m_VKSwapChain, std::numeric_limits<uint64_t>::max(), m_vSigSemaphores[m_CurFrames], VK_NULL_HANDLE, &m_CurImageIndex);
+		if(AcqResult != VK_SUCCESS)
+		{
+			if(AcqResult == VK_ERROR_OUT_OF_DATE_KHR || m_RecreateSwapChain)
+			{
+				m_RecreateSwapChain = false;
+				if(IsVerbose())
+				{
+					dbg_msg("vulkan", "recreating swap chain requested by acquire next image (prepare frame).");
+				}
+				RecreateSwapChain();
+				return PrepareFrame();
+			}
+			else
+			{
+				if(AcqResult != VK_SUBOPTIMAL_KHR)
+					dbg_msg("vulkan", "acquire next image failed %d", (int)AcqResult);
+
+				const char *pCritErrorMsg = CheckVulkanCriticalError(AcqResult);
+				if(pCritErrorMsg != nullptr)
+				{
+					SetError(EGfxErrorType::GFX_ERROR_TYPE_SWAP_FAILED, "Acquiring next image failed.", pCritErrorMsg);
+					return false;
+				}
+				else if(AcqResult == VK_ERROR_SURFACE_LOST_KHR)
+				{
+					m_RenderingPaused = true;
+					return true;
+				}
+			}
+		}
+		std::swap(m_vWaitSemaphores[m_CurFrames], m_vSigSemaphores[m_CurFrames]);
+
+		if(m_vImagesFences[m_CurImageIndex] != VK_NULL_HANDLE)
+		{
+			vkWaitForFences(m_VKDevice, 1, &m_vImagesFences[m_CurImageIndex], VK_TRUE, std::numeric_limits<uint64_t>::max());
+		}
+		m_vImagesFences[m_CurImageIndex] = m_vFrameFences[m_CurFrames];
+
+		// next frame
+		m_CurFrame++;
+		m_vImageLastFrameCheck[m_CurImageIndex] = m_CurFrame;
+
+		// check if older frames weren't used in a long time
+		for(size_t FrameImageIndex = 0; FrameImageIndex < m_vImageLastFrameCheck.size(); ++FrameImageIndex)
+		{
+			auto LastFrame = m_vImageLastFrameCheck[FrameImageIndex];
+			if(m_CurFrame - LastFrame > (uint64_t)m_SwapChainImageCount)
+			{
+				if(m_vImagesFences[FrameImageIndex] != VK_NULL_HANDLE)
+				{
+					vkWaitForFences(m_VKDevice, 1, &m_vImagesFences[FrameImageIndex], VK_TRUE, std::numeric_limits<uint64_t>::max());
+					ClearFrameData(FrameImageIndex);
+					m_vImagesFences[FrameImageIndex] = VK_NULL_HANDLE;
+				}
+				m_vImageLastFrameCheck[FrameImageIndex] = m_CurFrame;
+			}
+		}
+
+		// clear frame's memory data
+		ClearFrameMemoryUsage();
+
+		// clear frame
+		vkResetCommandBuffer(GetMainGraphicCommandBuffer(), VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT);
+
+		auto &CommandBuffer = GetMainGraphicCommandBuffer();
+		VkCommandBufferBeginInfo BeginInfo{};
+		BeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+		BeginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+
+		if(vkBeginCommandBuffer(CommandBuffer, &BeginInfo) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_RENDER_RECORDING, "Command buffer cannot be filled anymore.");
+			return false;
+		}
+
+		VkRenderPassBeginInfo RenderPassInfo{};
+		RenderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+		RenderPassInfo.renderPass = m_VKRenderPass;
+		RenderPassInfo.framebuffer = m_vFramebufferList[m_CurImageIndex];
+		RenderPassInfo.renderArea.offset = {0, 0};
+		RenderPassInfo.renderArea.extent = m_VKSwapImgAndViewportExtent.m_SwapImageViewport;
+
+		VkClearValue ClearColorVal = {{{m_aClearColor[0], m_aClearColor[1], m_aClearColor[2], m_aClearColor[3]}}};
+		RenderPassInfo.clearValueCount = 1;
+		RenderPassInfo.pClearValues = &ClearColorVal;
+
+		vkCmdBeginRenderPass(CommandBuffer, &RenderPassInfo, m_ThreadCount > 1 ? VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS : VK_SUBPASS_CONTENTS_INLINE);
+
+		for(auto &LastPipe : m_vLastPipeline)
+			LastPipe = VK_NULL_HANDLE;
+
+		return true;
+	}
+
+	void UploadStagingBuffers()
+	{
+		if(!m_vNonFlushedStagingBufferRange.empty())
+		{
+			vkFlushMappedMemoryRanges(m_VKDevice, m_vNonFlushedStagingBufferRange.size(), m_vNonFlushedStagingBufferRange.data());
+
+			m_vNonFlushedStagingBufferRange.clear();
+		}
+	}
+
+	template<bool FlushForRendering>
+	void UploadNonFlushedBuffers()
+	{
+		// streamed vertices
+		for(auto &StreamVertexBuffer : m_vStreamedVertexBuffers)
+			UploadStreamedBuffer<FlushForRendering>(StreamVertexBuffer);
+		// now the buffer objects
+		for(auto &StreamUniformBuffer : m_vStreamedUniformBuffers)
+			UploadStreamedBuffer<FlushForRendering>(StreamUniformBuffer);
+
+		UploadStagingBuffers();
+	}
+
+	[[nodiscard]] bool PureMemoryFrame()
+	{
+		ExecuteMemoryCommandBuffer();
+
+		// reset streamed data
+		UploadNonFlushedBuffers<false>();
+
+		ClearFrameMemoryUsage();
+
+		return true;
+	}
+
+	[[nodiscard]] bool NextFrame()
+	{
+		if(!m_RenderingPaused)
+		{
+			if(!WaitFrame())
+				return false;
+			if(!PrepareFrame())
+				return false;
+		}
+		// else only execute the memory command buffer
+		else
+		{
+			if(!PureMemoryFrame())
+				return false;
+		}
+
+		return true;
+	}
+
+	/************************
+	* TEXTURES
+	************************/
+
+	size_t VulkanFormatToPixelSize(VkFormat Format)
+	{
+		if(Format == VK_FORMAT_R8G8B8_UNORM)
+			return 3;
+		else if(Format == VK_FORMAT_R8G8B8A8_UNORM)
+			return 4;
+		else if(Format == VK_FORMAT_R8_UNORM)
+			return 1;
+		return 4;
+	}
+
+	[[nodiscard]] bool UpdateTexture(size_t TextureSlot, VkFormat Format, void *&pData, int64_t XOff, int64_t YOff, size_t Width, size_t Height)
+	{
+		const size_t ImageSize = Width * Height * VulkanFormatToPixelSize(Format);
+		SMemoryBlock<s_StagingBufferImageCacheID> StagingBuffer;
+		if(!GetStagingBufferImage(StagingBuffer, pData, ImageSize))
+			return false;
+
+		auto &Tex = m_vTextures[TextureSlot];
+
+		if(Tex.m_RescaleCount > 0)
+		{
+			for(uint32_t i = 0; i < Tex.m_RescaleCount; ++i)
+			{
+				Width >>= 1;
+				Height >>= 1;
+
+				XOff /= 2;
+				YOff /= 2;
+			}
+
+			void *pTmpData = Resize((const uint8_t *)pData, Width, Height, Width, Height, VulkanFormatToPixelSize(Format));
+			free(pData);
+			pData = pTmpData;
+		}
+
+		if(!ImageBarrier(Tex.m_Img, 0, Tex.m_MipMapCount, 0, 1, Format, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL))
+			return false;
+		if(!CopyBufferToImage(StagingBuffer.m_Buffer, StagingBuffer.m_HeapData.m_OffsetToAlign, Tex.m_Img, XOff, YOff, Width, Height, 1))
+			return false;
+
+		if(Tex.m_MipMapCount > 1)
+		{
+			if(!BuildMipmaps(Tex.m_Img, Format, Width, Height, 1, Tex.m_MipMapCount))
+				return false;
+		}
+		else
+		{
+			if(!ImageBarrier(Tex.m_Img, 0, 1, 0, 1, Format, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL))
+				return false;
+		}
+
+		UploadAndFreeStagingImageMemBlock(StagingBuffer);
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateTextureCMD(
+		int Slot,
+		int Width,
+		int Height,
+		VkFormat Format,
+		VkFormat StoreFormat,
+		int Flags,
+		void *&pData)
+	{
+		size_t ImageIndex = (size_t)Slot;
+		const size_t PixelSize = VulkanFormatToPixelSize(Format);
+
+		while(ImageIndex >= m_vTextures.size())
+		{
+			m_vTextures.resize((m_vTextures.size() * 2) + 1);
+		}
+
+		// resample if needed
+		uint32_t RescaleCount = 0;
+		if((size_t)Width > m_MaxTextureSize || (size_t)Height > m_MaxTextureSize)
+		{
+			do
+			{
+				Width >>= 1;
+				Height >>= 1;
+				++RescaleCount;
+			} while((size_t)Width > m_MaxTextureSize || (size_t)Height > m_MaxTextureSize);
+
+			void *pTmpData = Resize((const uint8_t *)(pData), Width, Height, Width, Height, PixelSize);
+			free(pData);
+			pData = pTmpData;
+		}
+
+		bool Requires2DTexture = (Flags & CCommandBuffer::TEXFLAG_NO_2D_TEXTURE) == 0;
+		bool Requires2DTextureArray = (Flags & (CCommandBuffer::TEXFLAG_TO_2D_ARRAY_TEXTURE)) != 0;
+		bool RequiresMipMaps = (Flags & CCommandBuffer::TEXFLAG_NOMIPMAPS) == 0;
+		size_t MipMapLevelCount = 1;
+		if(RequiresMipMaps)
+		{
+			VkExtent3D ImgSize{(uint32_t)Width, (uint32_t)Height, 1};
+			MipMapLevelCount = ImageMipLevelCount(ImgSize);
+			if(!m_OptimalRGBAImageBlitting)
+				MipMapLevelCount = 1;
+		}
+
+		CTexture &Texture = m_vTextures[ImageIndex];
+
+		Texture.m_Width = Width;
+		Texture.m_Height = Height;
+		Texture.m_RescaleCount = RescaleCount;
+		Texture.m_MipMapCount = MipMapLevelCount;
+
+		if(Requires2DTexture)
+		{
+			if(!CreateTextureImage(ImageIndex, Texture.m_Img, Texture.m_ImgMem, pData, Format, Width, Height, 1, PixelSize, MipMapLevelCount))
+				return false;
+			VkFormat ImgFormat = Format;
+			VkImageView ImgView = CreateTextureImageView(Texture.m_Img, ImgFormat, VK_IMAGE_VIEW_TYPE_2D, 1, MipMapLevelCount);
+			Texture.m_ImgView = ImgView;
+			VkSampler ImgSampler = GetTextureSampler(SUPPORTED_SAMPLER_TYPE_REPEAT);
+			Texture.m_aSamplers[0] = ImgSampler;
+			ImgSampler = GetTextureSampler(SUPPORTED_SAMPLER_TYPE_CLAMP_TO_EDGE);
+			Texture.m_aSamplers[1] = ImgSampler;
+
+			if(!CreateNewTexturedStandardDescriptorSets(ImageIndex, 0))
+				return false;
+			if(!CreateNewTexturedStandardDescriptorSets(ImageIndex, 1))
+				return false;
+		}
+
+		if(Requires2DTextureArray)
+		{
+			int Image3DWidth = Width;
+			int Image3DHeight = Height;
+
+			int ConvertWidth = Width;
+			int ConvertHeight = Height;
+
+			if(ConvertWidth == 0 || (ConvertWidth % 16) != 0 || ConvertHeight == 0 || (ConvertHeight % 16) != 0)
+			{
+				dbg_msg("vulkan", "3D/2D array texture was resized");
+				int NewWidth = maximum<int>(HighestBit(ConvertWidth), 16);
+				int NewHeight = maximum<int>(HighestBit(ConvertHeight), 16);
+				uint8_t *pNewTexData = (uint8_t *)Resize((const uint8_t *)pData, ConvertWidth, ConvertHeight, NewWidth, NewHeight, PixelSize);
+
+				ConvertWidth = NewWidth;
+				ConvertHeight = NewHeight;
+
+				free(pData);
+				pData = pNewTexData;
+			}
+
+			bool Needs3DTexDel = false;
+			void *p3DTexData = malloc((size_t)PixelSize * ConvertWidth * ConvertHeight);
+			if(!Texture2DTo3D(pData, ConvertWidth, ConvertHeight, PixelSize, 16, 16, p3DTexData, Image3DWidth, Image3DHeight))
+			{
+				free(p3DTexData);
+				p3DTexData = nullptr;
+			}
+			Needs3DTexDel = true;
+
+			if(p3DTexData != nullptr)
+			{
+				const size_t ImageDepth2DArray = (size_t)16 * 16;
+				VkExtent3D ImgSize{(uint32_t)Image3DWidth, (uint32_t)Image3DHeight, 1};
+				if(RequiresMipMaps)
+				{
+					MipMapLevelCount = ImageMipLevelCount(ImgSize);
+					if(!m_OptimalRGBAImageBlitting)
+						MipMapLevelCount = 1;
+				}
+
+				if(!CreateTextureImage(ImageIndex, Texture.m_Img3D, Texture.m_Img3DMem, p3DTexData, Format, Image3DWidth, Image3DHeight, ImageDepth2DArray, PixelSize, MipMapLevelCount))
+					return false;
+				VkFormat ImgFormat = Format;
+				VkImageView ImgView = CreateTextureImageView(Texture.m_Img3D, ImgFormat, VK_IMAGE_VIEW_TYPE_2D_ARRAY, ImageDepth2DArray, MipMapLevelCount);
+				Texture.m_Img3DView = ImgView;
+				VkSampler ImgSampler = GetTextureSampler(SUPPORTED_SAMPLER_TYPE_2D_TEXTURE_ARRAY);
+				Texture.m_Sampler3D = ImgSampler;
+
+				if(!CreateNew3DTexturedStandardDescriptorSets(ImageIndex))
+					return false;
+
+				if(Needs3DTexDel)
+					free(p3DTexData);
+			}
+		}
+		return true;
+	}
+
+	VkFormat TextureFormatToVulkanFormat(int TexFormat)
+	{
+		if(TexFormat == CCommandBuffer::TEXFORMAT_RGBA)
+			return VK_FORMAT_R8G8B8A8_UNORM;
+		return VK_FORMAT_R8G8B8A8_UNORM;
+	}
+
+	[[nodiscard]] bool BuildMipmaps(VkImage Image, VkFormat ImageFormat, size_t Width, size_t Height, size_t Depth, size_t MipMapLevelCount)
+	{
+		VkCommandBuffer *pMemCommandBuffer;
+		if(!GetMemoryCommandBuffer(pMemCommandBuffer))
+			return false;
+		auto &MemCommandBuffer = *pMemCommandBuffer;
+
+		VkImageMemoryBarrier Barrier{};
+		Barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		Barrier.image = Image;
+		Barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		Barrier.subresourceRange.levelCount = 1;
+		Barrier.subresourceRange.baseArrayLayer = 0;
+		Barrier.subresourceRange.layerCount = Depth;
+
+		int32_t TmpMipWidth = (int32_t)Width;
+		int32_t TmpMipHeight = (int32_t)Height;
+
+		for(size_t i = 1; i < MipMapLevelCount; ++i)
+		{
+			Barrier.subresourceRange.baseMipLevel = i - 1;
+			Barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+			Barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+
+			vkCmdPipelineBarrier(MemCommandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &Barrier);
+
+			VkImageBlit Blit{};
+			Blit.srcOffsets[0] = {0, 0, 0};
+			Blit.srcOffsets[1] = {TmpMipWidth, TmpMipHeight, 1};
+			Blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+			Blit.srcSubresource.mipLevel = i - 1;
+			Blit.srcSubresource.baseArrayLayer = 0;
+			Blit.srcSubresource.layerCount = Depth;
+			Blit.dstOffsets[0] = {0, 0, 0};
+			Blit.dstOffsets[1] = {TmpMipWidth > 1 ? TmpMipWidth / 2 : 1, TmpMipHeight > 1 ? TmpMipHeight / 2 : 1, 1};
+			Blit.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+			Blit.dstSubresource.mipLevel = i;
+			Blit.dstSubresource.baseArrayLayer = 0;
+			Blit.dstSubresource.layerCount = Depth;
+
+			vkCmdBlitImage(MemCommandBuffer,
+				Image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+				Image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+				1, &Blit,
+				m_AllowsLinearBlitting ? VK_FILTER_LINEAR : VK_FILTER_NEAREST);
+
+			Barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+			Barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
+			vkCmdPipelineBarrier(MemCommandBuffer,
+				VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0,
+				0, nullptr,
+				0, nullptr,
+				1, &Barrier);
+
+			if(TmpMipWidth > 1)
+				TmpMipWidth /= 2;
+			if(TmpMipHeight > 1)
+				TmpMipHeight /= 2;
+		}
+
+		Barrier.subresourceRange.baseMipLevel = MipMapLevelCount - 1;
+		Barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+		Barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		Barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+		Barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
+		vkCmdPipelineBarrier(MemCommandBuffer,
+			VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0,
+			0, nullptr,
+			0, nullptr,
+			1, &Barrier);
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateTextureImage(size_t ImageIndex, VkImage &NewImage, SMemoryImageBlock<s_ImageBufferCacheID> &NewImgMem, const void *pData, VkFormat Format, size_t Width, size_t Height, size_t Depth, size_t PixelSize, size_t MipMapLevelCount)
+	{
+		int ImageSize = Width * Height * Depth * PixelSize;
+
+		SMemoryBlock<s_StagingBufferImageCacheID> StagingBuffer;
+		if(!GetStagingBufferImage(StagingBuffer, pData, ImageSize))
+			return false;
+
+		VkFormat ImgFormat = Format;
+
+		if(!CreateImage(Width, Height, Depth, MipMapLevelCount, ImgFormat, VK_IMAGE_TILING_OPTIMAL, NewImage, NewImgMem))
+			return false;
+
+		if(!ImageBarrier(NewImage, 0, MipMapLevelCount, 0, Depth, ImgFormat, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL))
+			return false;
+		if(!CopyBufferToImage(StagingBuffer.m_Buffer, StagingBuffer.m_HeapData.m_OffsetToAlign, NewImage, 0, 0, static_cast<uint32_t>(Width), static_cast<uint32_t>(Height), Depth))
+			return false;
+
+		UploadAndFreeStagingImageMemBlock(StagingBuffer);
+
+		if(MipMapLevelCount > 1)
+		{
+			if(!BuildMipmaps(NewImage, ImgFormat, Width, Height, Depth, MipMapLevelCount))
+				return false;
+		}
+		else
+		{
+			if(!ImageBarrier(NewImage, 0, 1, 0, Depth, ImgFormat, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL))
+				return false;
+		}
+
+		return true;
+	}
+
+	VkImageView CreateTextureImageView(VkImage TexImage, VkFormat ImgFormat, VkImageViewType ViewType, size_t Depth, size_t MipMapLevelCount)
+	{
+		return CreateImageView(TexImage, ImgFormat, ViewType, Depth, MipMapLevelCount);
+	}
+
+	[[nodiscard]] bool CreateTextureSamplersImpl(VkSampler &CreatedSampler, VkSamplerAddressMode AddrModeU, VkSamplerAddressMode AddrModeV, VkSamplerAddressMode AddrModeW)
+	{
+		VkSamplerCreateInfo SamplerInfo{};
+		SamplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
+		SamplerInfo.magFilter = VK_FILTER_LINEAR;
+		SamplerInfo.minFilter = VK_FILTER_LINEAR;
+		SamplerInfo.addressModeU = AddrModeU;
+		SamplerInfo.addressModeV = AddrModeV;
+		SamplerInfo.addressModeW = AddrModeW;
+		SamplerInfo.anisotropyEnable = VK_FALSE;
+		SamplerInfo.maxAnisotropy = m_MaxSamplerAnisotropy;
+		SamplerInfo.borderColor = VK_BORDER_COLOR_INT_OPAQUE_BLACK;
+		SamplerInfo.unnormalizedCoordinates = VK_FALSE;
+		SamplerInfo.compareEnable = VK_FALSE;
+		SamplerInfo.compareOp = VK_COMPARE_OP_ALWAYS;
+		SamplerInfo.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
+		SamplerInfo.mipLodBias = (m_GlobalTextureLodBIAS / 1000.0f);
+		SamplerInfo.minLod = -1000;
+		SamplerInfo.maxLod = 1000;
+
+		if(vkCreateSampler(m_VKDevice, &SamplerInfo, nullptr, &CreatedSampler) != VK_SUCCESS)
+		{
+			dbg_msg("vulkan", "failed to create texture sampler!");
+			return false;
+		}
+		return true;
+	}
+
+	[[nodiscard]] bool CreateTextureSamplers()
+	{
+		bool Ret = true;
+		Ret &= CreateTextureSamplersImpl(m_aSamplers[SUPPORTED_SAMPLER_TYPE_REPEAT], VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_REPEAT, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_REPEAT, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_REPEAT);
+		Ret &= CreateTextureSamplersImpl(m_aSamplers[SUPPORTED_SAMPLER_TYPE_CLAMP_TO_EDGE], VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE);
+		Ret &= CreateTextureSamplersImpl(m_aSamplers[SUPPORTED_SAMPLER_TYPE_2D_TEXTURE_ARRAY], VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VkSamplerAddressMode::VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT);
+		return Ret;
+	}
+
+	void DestroyTextureSamplers()
+	{
+		vkDestroySampler(m_VKDevice, m_aSamplers[SUPPORTED_SAMPLER_TYPE_REPEAT], nullptr);
+		vkDestroySampler(m_VKDevice, m_aSamplers[SUPPORTED_SAMPLER_TYPE_CLAMP_TO_EDGE], nullptr);
+		vkDestroySampler(m_VKDevice, m_aSamplers[SUPPORTED_SAMPLER_TYPE_2D_TEXTURE_ARRAY], nullptr);
+	}
+
+	VkSampler GetTextureSampler(ESupportedSamplerTypes SamplerType)
+	{
+		return m_aSamplers[SamplerType];
+	}
+
+	VkImageView CreateImageView(VkImage Image, VkFormat Format, VkImageViewType ViewType, size_t Depth, size_t MipMapLevelCount)
+	{
+		VkImageViewCreateInfo ViewCreateInfo{};
+		ViewCreateInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+		ViewCreateInfo.image = Image;
+		ViewCreateInfo.viewType = ViewType;
+		ViewCreateInfo.format = Format;
+		ViewCreateInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		ViewCreateInfo.subresourceRange.baseMipLevel = 0;
+		ViewCreateInfo.subresourceRange.levelCount = MipMapLevelCount;
+		ViewCreateInfo.subresourceRange.baseArrayLayer = 0;
+		ViewCreateInfo.subresourceRange.layerCount = Depth;
+
+		VkImageView ImageView;
+		if(vkCreateImageView(m_VKDevice, &ViewCreateInfo, nullptr, &ImageView) != VK_SUCCESS)
+		{
+			return VK_NULL_HANDLE;
+		}
+
+		return ImageView;
+	}
+
+	[[nodiscard]] bool CreateImage(uint32_t Width, uint32_t Height, uint32_t Depth, size_t MipMapLevelCount, VkFormat Format, VkImageTiling Tiling, VkImage &Image, SMemoryImageBlock<s_ImageBufferCacheID> &ImageMemory, VkImageUsageFlags ImageUsage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT)
+	{
+		VkImageCreateInfo ImageInfo{};
+		ImageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
+		ImageInfo.imageType = VK_IMAGE_TYPE_2D;
+		ImageInfo.extent.width = Width;
+		ImageInfo.extent.height = Height;
+		ImageInfo.extent.depth = 1;
+		ImageInfo.mipLevels = MipMapLevelCount;
+		ImageInfo.arrayLayers = Depth;
+		ImageInfo.format = Format;
+		ImageInfo.tiling = Tiling;
+		ImageInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+		ImageInfo.usage = ImageUsage;
+		ImageInfo.samples = (ImageUsage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) == 0 ? VK_SAMPLE_COUNT_1_BIT : GetSampleCount();
+		ImageInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+
+		if(vkCreateImage(m_VKDevice, &ImageInfo, nullptr, &Image) != VK_SUCCESS)
+		{
+			dbg_msg("vulkan", "failed to create image!");
+		}
+
+		VkMemoryRequirements MemRequirements;
+		vkGetImageMemoryRequirements(m_VKDevice, Image, &MemRequirements);
+
+		if(!GetImageMemory(ImageMemory, MemRequirements.size, MemRequirements.alignment, MemRequirements.memoryTypeBits))
+			return false;
+
+		vkBindImageMemory(m_VKDevice, Image, ImageMemory.m_BufferMem.m_Mem, ImageMemory.m_HeapData.m_OffsetToAlign);
+
+		return true;
+	}
+
+	[[nodiscard]] bool ImageBarrier(const VkImage &Image, size_t MipMapBase, size_t MipMapCount, size_t LayerBase, size_t LayerCount, VkFormat Format, VkImageLayout OldLayout, VkImageLayout NewLayout)
+	{
+		VkCommandBuffer *pMemCommandBuffer;
+		if(!GetMemoryCommandBuffer(pMemCommandBuffer))
+			return false;
+		auto &MemCommandBuffer = *pMemCommandBuffer;
+
+		VkImageMemoryBarrier Barrier{};
+		Barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		Barrier.oldLayout = OldLayout;
+		Barrier.newLayout = NewLayout;
+		Barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		Barrier.image = Image;
+		Barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		Barrier.subresourceRange.baseMipLevel = MipMapBase;
+		Barrier.subresourceRange.levelCount = MipMapCount;
+		Barrier.subresourceRange.baseArrayLayer = LayerBase;
+		Barrier.subresourceRange.layerCount = LayerCount;
+
+		VkPipelineStageFlags SourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+		VkPipelineStageFlags DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+
+		if(OldLayout == VK_IMAGE_LAYOUT_UNDEFINED && NewLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
+		{
+			Barrier.srcAccessMask = 0;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL && NewLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL && NewLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_SHADER_READ_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL && NewLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR && NewLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_UNDEFINED && NewLayout == VK_IMAGE_LAYOUT_GENERAL)
+		{
+			Barrier.srcAccessMask = 0;
+			Barrier.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_GENERAL && NewLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else if(OldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL && NewLayout == VK_IMAGE_LAYOUT_GENERAL)
+		{
+			Barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+			Barrier.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+
+			SourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+			DestinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
+		}
+		else
+		{
+			dbg_msg("vulkan", "unsupported layout transition!");
+		}
+
+		vkCmdPipelineBarrier(
+			MemCommandBuffer,
+			SourceStage, DestinationStage,
+			0,
+			0, nullptr,
+			0, nullptr,
+			1, &Barrier);
+
+		return true;
+	}
+
+	[[nodiscard]] bool CopyBufferToImage(VkBuffer Buffer, VkDeviceSize BufferOffset, VkImage Image, int32_t X, int32_t Y, uint32_t Width, uint32_t Height, size_t Depth)
+	{
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetMemoryCommandBuffer(pCommandBuffer))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		VkBufferImageCopy Region{};
+		Region.bufferOffset = BufferOffset;
+		Region.bufferRowLength = 0;
+		Region.bufferImageHeight = 0;
+		Region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		Region.imageSubresource.mipLevel = 0;
+		Region.imageSubresource.baseArrayLayer = 0;
+		Region.imageSubresource.layerCount = Depth;
+		Region.imageOffset = {X, Y, 0};
+		Region.imageExtent = {
+			Width,
+			Height,
+			1};
+
+		vkCmdCopyBufferToImage(CommandBuffer, Buffer, Image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &Region);
+
+		return true;
+	}
+
+	/************************
+	* BUFFERS
+	************************/
+
+	[[nodiscard]] bool CreateBufferObject(size_t BufferIndex, const void *pUploadData, VkDeviceSize BufferDataSize, bool IsOneFrameBuffer)
+	{
+		std::vector<uint8_t> UploadDataTmp;
+		if(pUploadData == nullptr)
+		{
+			UploadDataTmp.resize(BufferDataSize);
+			pUploadData = UploadDataTmp.data();
+		}
+
+		while(BufferIndex >= m_vBufferObjects.size())
+		{
+			m_vBufferObjects.resize((m_vBufferObjects.size() * 2) + 1);
+		}
+		auto &BufferObject = m_vBufferObjects[BufferIndex];
+
+		VkBuffer VertexBuffer;
+		size_t BufferOffset = 0;
+		if(!IsOneFrameBuffer)
+		{
+			SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+			if(!GetStagingBuffer(StagingBuffer, pUploadData, BufferDataSize))
+				return false;
+
+			SMemoryBlock<s_VertexBufferCacheID> Mem;
+			if(!GetVertexBuffer(Mem, BufferDataSize))
+				return false;
+
+			BufferObject.m_BufferObject.m_Mem = Mem;
+			VertexBuffer = Mem.m_Buffer;
+			BufferOffset = Mem.m_HeapData.m_OffsetToAlign;
+
+			if(!MemoryBarrier(VertexBuffer, Mem.m_HeapData.m_OffsetToAlign, BufferDataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, true))
+				return false;
+			if(!CopyBuffer(StagingBuffer.m_Buffer, VertexBuffer, StagingBuffer.m_HeapData.m_OffsetToAlign, Mem.m_HeapData.m_OffsetToAlign, BufferDataSize))
+				return false;
+			if(!MemoryBarrier(VertexBuffer, Mem.m_HeapData.m_OffsetToAlign, BufferDataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, false))
+				return false;
+			UploadAndFreeStagingMemBlock(StagingBuffer);
+		}
+		else
+		{
+			SDeviceMemoryBlock VertexBufferMemory;
+			if(!CreateStreamVertexBuffer(ms_MainThreadIndex, VertexBuffer, VertexBufferMemory, BufferOffset, pUploadData, BufferDataSize))
+				return false;
+		}
+		BufferObject.m_IsStreamedBuffer = IsOneFrameBuffer;
+		BufferObject.m_CurBuffer = VertexBuffer;
+		BufferObject.m_CurBufferOffset = BufferOffset;
+
+		return true;
+	}
+
+	void DeleteBufferObject(size_t BufferIndex)
+	{
+		auto &BufferObject = m_vBufferObjects[BufferIndex];
+		if(!BufferObject.m_IsStreamedBuffer)
+		{
+			FreeVertexMemBlock(BufferObject.m_BufferObject.m_Mem);
+		}
+		BufferObject = {};
+	}
+
+	[[nodiscard]] bool CopyBuffer(VkBuffer SrcBuffer, VkBuffer DstBuffer, VkDeviceSize SrcOffset, VkDeviceSize DstOffset, VkDeviceSize CopySize)
+	{
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetMemoryCommandBuffer(pCommandBuffer))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+		VkBufferCopy CopyRegion{};
+		CopyRegion.srcOffset = SrcOffset;
+		CopyRegion.dstOffset = DstOffset;
+		CopyRegion.size = CopySize;
+		vkCmdCopyBuffer(CommandBuffer, SrcBuffer, DstBuffer, 1, &CopyRegion);
+
+		return true;
+	}
+
+	/************************
+	* RENDER STATES
+	************************/
+
+	void GetStateMatrix(const CCommandBuffer::SState &State, std::array<float, (size_t)4 * 2> &Matrix)
+	{
+		Matrix = {
+			// column 1
+			2.f / (State.m_ScreenBR.x - State.m_ScreenTL.x),
+			0,
+			// column 2
+			0,
+			2.f / (State.m_ScreenBR.y - State.m_ScreenTL.y),
+			// column 3
+			0,
+			0,
+			// column 4
+			-((State.m_ScreenTL.x + State.m_ScreenBR.x) / (State.m_ScreenBR.x - State.m_ScreenTL.x)),
+			-((State.m_ScreenTL.y + State.m_ScreenBR.y) / (State.m_ScreenBR.y - State.m_ScreenTL.y)),
+		};
+	}
+
+	[[nodiscard]] bool GetIsTextured(const CCommandBuffer::SState &State)
+	{
+		return State.m_Texture != -1;
+	}
+
+	size_t GetAddressModeIndex(const CCommandBuffer::SState &State)
+	{
+		return State.m_WrapMode == CCommandBuffer::WRAP_REPEAT ? VULKAN_BACKEND_ADDRESS_MODE_REPEAT : VULKAN_BACKEND_ADDRESS_MODE_CLAMP_EDGES;
+	}
+
+	size_t GetBlendModeIndex(const CCommandBuffer::SState &State)
+	{
+		return State.m_BlendMode == CCommandBuffer::BLEND_ADDITIVE ? VULKAN_BACKEND_BLEND_MODE_ADDITATIVE : (State.m_BlendMode == CCommandBuffer::BLEND_NONE ? VULKAN_BACKEND_BLEND_MODE_NONE : VULKAN_BACKEND_BLEND_MODE_ALPHA);
+	}
+
+	size_t GetDynamicModeIndexFromState(const CCommandBuffer::SState &State) const
+	{
+		return (State.m_ClipEnable || m_HasDynamicViewport || m_VKSwapImgAndViewportExtent.m_HasForcedViewport) ? VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT : VULKAN_BACKEND_CLIP_MODE_NONE;
+	}
+
+	size_t GetDynamicModeIndexFromExecBuffer(const SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		return (ExecBuffer.m_HasDynamicState) ? VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT : VULKAN_BACKEND_CLIP_MODE_NONE;
+	}
+
+	VkPipeline &GetPipeline(SPipelineContainer &Container, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		return Container.m_aaaPipelines[BlendModeIndex][DynamicIndex][(size_t)IsTextured];
+	}
+
+	VkPipelineLayout &GetPipeLayout(SPipelineContainer &Container, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		return Container.m_aaaPipelineLayouts[BlendModeIndex][DynamicIndex][(size_t)IsTextured];
+	}
+
+	VkPipelineLayout &GetStandardPipeLayout(bool IsLineGeometry, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		if(IsLineGeometry)
+			return GetPipeLayout(m_StandardLinePipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		else
+			return GetPipeLayout(m_StandardPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+	}
+
+	VkPipeline &GetStandardPipe(bool IsLineGeometry, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		if(IsLineGeometry)
+			return GetPipeline(m_StandardLinePipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		else
+			return GetPipeline(m_StandardPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+	}
+
+	VkPipelineLayout &GetTileLayerPipeLayout(bool IsBorder, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		if(!IsBorder)
+			return GetPipeLayout(m_TilePipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		else
+			return GetPipeLayout(m_TileBorderPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+	}
+
+	VkPipeline &GetTileLayerPipe(bool IsBorder, bool IsTextured, size_t BlendModeIndex, size_t DynamicIndex)
+	{
+		if(!IsBorder)
+			return GetPipeline(m_TilePipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		else
+			return GetPipeline(m_TileBorderPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+	}
+
+	void GetStateIndices(const SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SState &State, bool &IsTextured, size_t &BlendModeIndex, size_t &DynamicIndex, size_t &AddressModeIndex)
+	{
+		IsTextured = GetIsTextured(State);
+		AddressModeIndex = GetAddressModeIndex(State);
+		BlendModeIndex = GetBlendModeIndex(State);
+		DynamicIndex = GetDynamicModeIndexFromExecBuffer(ExecBuffer);
+	}
+
+	void ExecBufferFillDynamicStates(const CCommandBuffer::SState &State, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		size_t DynamicStateIndex = GetDynamicModeIndexFromState(State);
+		if(DynamicStateIndex == VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT)
+		{
+			VkViewport Viewport;
+			if(m_HasDynamicViewport)
+			{
+				Viewport.x = (float)m_DynamicViewportOffset.x;
+				Viewport.y = (float)m_DynamicViewportOffset.y;
+				Viewport.width = (float)m_DynamicViewportSize.width;
+				Viewport.height = (float)m_DynamicViewportSize.height;
+				Viewport.minDepth = 0.0f;
+				Viewport.maxDepth = 1.0f;
+			}
+			// else check if there is a forced viewport
+			else if(m_VKSwapImgAndViewportExtent.m_HasForcedViewport)
+			{
+				Viewport.x = 0.0f;
+				Viewport.y = 0.0f;
+				Viewport.width = (float)m_VKSwapImgAndViewportExtent.m_ForcedViewport.width;
+				Viewport.height = (float)m_VKSwapImgAndViewportExtent.m_ForcedViewport.height;
+				Viewport.minDepth = 0.0f;
+				Viewport.maxDepth = 1.0f;
+			}
+			else
+			{
+				Viewport.x = 0.0f;
+				Viewport.y = 0.0f;
+				Viewport.width = (float)m_VKSwapImgAndViewportExtent.m_SwapImageViewport.width;
+				Viewport.height = (float)m_VKSwapImgAndViewportExtent.m_SwapImageViewport.height;
+				Viewport.minDepth = 0.0f;
+				Viewport.maxDepth = 1.0f;
+			}
+
+			VkRect2D Scissor;
+			// convert from OGL to vulkan clip
+
+			// the scissor always assumes the presented viewport, because the front-end keeps the calculation
+			// for the forced viewport in sync
+			auto ScissorViewport = m_VKSwapImgAndViewportExtent.GetPresentedImageViewport();
+			if(State.m_ClipEnable)
+			{
+				int32_t ScissorY = (int32_t)ScissorViewport.height - ((int32_t)State.m_ClipY + (int32_t)State.m_ClipH);
+				uint32_t ScissorH = (int32_t)State.m_ClipH;
+				Scissor.offset = {(int32_t)State.m_ClipX, ScissorY};
+				Scissor.extent = {(uint32_t)State.m_ClipW, ScissorH};
+			}
+			else
+			{
+				Scissor.offset = {0, 0};
+				Scissor.extent = {(uint32_t)ScissorViewport.width, (uint32_t)ScissorViewport.height};
+			}
+
+			// if there is a dynamic viewport make sure the scissor data is scaled down to that
+			if(m_HasDynamicViewport)
+			{
+				Scissor.offset.x = (int32_t)(((float)Scissor.offset.x / (float)ScissorViewport.width) * (float)m_DynamicViewportSize.width) + m_DynamicViewportOffset.x;
+				Scissor.offset.y = (int32_t)(((float)Scissor.offset.y / (float)ScissorViewport.height) * (float)m_DynamicViewportSize.height) + m_DynamicViewportOffset.y;
+				Scissor.extent.width = (uint32_t)(((float)Scissor.extent.width / (float)ScissorViewport.width) * (float)m_DynamicViewportSize.width);
+				Scissor.extent.height = (uint32_t)(((float)Scissor.extent.height / (float)ScissorViewport.height) * (float)m_DynamicViewportSize.height);
+			}
+
+			Viewport.x = clamp(Viewport.x, 0.0f, std::numeric_limits<decltype(Viewport.x)>::max());
+			Viewport.y = clamp(Viewport.y, 0.0f, std::numeric_limits<decltype(Viewport.y)>::max());
+
+			Scissor.offset.x = clamp(Scissor.offset.x, 0, std::numeric_limits<decltype(Scissor.offset.x)>::max());
+			Scissor.offset.y = clamp(Scissor.offset.y, 0, std::numeric_limits<decltype(Scissor.offset.y)>::max());
+
+			ExecBuffer.m_HasDynamicState = true;
+			ExecBuffer.m_Viewport = Viewport;
+			ExecBuffer.m_Scissor = Scissor;
+		}
+		else
+		{
+			ExecBuffer.m_HasDynamicState = false;
+		}
+	}
+
+	void BindPipeline(size_t RenderThreadIndex, VkCommandBuffer &CommandBuffer, SRenderCommandExecuteBuffer &ExecBuffer, VkPipeline &BindingPipe, const CCommandBuffer::SState &State)
+	{
+		if(m_vLastPipeline[RenderThreadIndex] != BindingPipe)
+		{
+			vkCmdBindPipeline(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, BindingPipe);
+			m_vLastPipeline[RenderThreadIndex] = BindingPipe;
+		}
+
+		size_t DynamicStateIndex = GetDynamicModeIndexFromExecBuffer(ExecBuffer);
+		if(DynamicStateIndex == VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT)
+		{
+			vkCmdSetViewport(CommandBuffer, 0, 1, &ExecBuffer.m_Viewport);
+			vkCmdSetScissor(CommandBuffer, 0, 1, &ExecBuffer.m_Scissor);
+		}
+	}
+
+	/**************************
+	* RENDERING IMPLEMENTATION
+	***************************/
+
+	void RenderTileLayer_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, size_t DrawCalls, const CCommandBuffer::SState &State, size_t BufferContainerIndex)
+	{
+		size_t BufferObjectIndex = (size_t)m_vBufferContainers[BufferContainerIndex].m_BufferObjectIndex;
+		const auto &BufferObject = m_vBufferObjects[BufferObjectIndex];
+
+		ExecBuffer.m_Buffer = BufferObject.m_CurBuffer;
+		ExecBuffer.m_BufferOff = BufferObject.m_CurBufferOffset;
+
+		bool IsTextured = GetIsTextured(State);
+		if(IsTextured)
+		{
+			ExecBuffer.m_aDescriptors[0] = m_vTextures[State.m_Texture].m_VKStandard3DTexturedDescrSet;
+		}
+
+		ExecBuffer.m_IndexBuffer = m_RenderIndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = DrawCalls;
+
+		ExecBufferFillDynamicStates(State, ExecBuffer);
+	}
+
+	[[nodiscard]] bool RenderTileLayer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SState &State, bool IsBorder, const GL_SColorf &Color, const vec2 &Scale, const vec2 &Off, size_t IndicesDrawNum, char *const *pIndicesOffsets, const unsigned int *pDrawCount)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(State, m);
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = GetTileLayerPipeLayout(IsBorder, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetTileLayerPipe(IsBorder, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		if(IsTextured)
+		{
+			vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+		}
+
+		SUniformTileGPosBorder VertexPushConstants;
+		size_t VertexPushConstantSize = sizeof(SUniformTileGPos);
+		SUniformTileGVertColor FragPushConstants;
+		size_t FragPushConstantSize = sizeof(SUniformTileGVertColor);
+
+		mem_copy(VertexPushConstants.m_aPos, m.data(), m.size() * sizeof(float));
+		FragPushConstants = Color;
+
+		if(IsBorder)
+		{
+			VertexPushConstants.m_Scale = Scale;
+			VertexPushConstants.m_Offset = Off;
+			VertexPushConstantSize = sizeof(SUniformTileGPosBorder);
+		}
+
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, VertexPushConstantSize, &VertexPushConstants);
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformTileGPosBorder) + sizeof(SUniformTileGVertColorAlign), FragPushConstantSize, &FragPushConstants);
+
+		size_t DrawCount = (size_t)IndicesDrawNum;
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
+		for(size_t i = 0; i < DrawCount; ++i)
+		{
+			VkDeviceSize IndexOffset = (VkDeviceSize)((ptrdiff_t)pIndicesOffsets[i] / sizeof(uint32_t));
+
+			vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(pDrawCount[i]), 1, IndexOffset, 0, 0);
+		}
+
+		return true;
+	}
+
+	template<typename TName, bool Is3DTextured>
+	[[nodiscard]] bool RenderStandard(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SState &State, int PrimType, const TName *pVertices, int PrimitiveCount)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(State, m);
+
+		bool IsLineGeometry = PrimType == CCommandBuffer::PRIMTYPE_LINES;
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = Is3DTextured ? GetPipeLayout(m_Standard3DPipeline, IsTextured, BlendModeIndex, DynamicIndex) : GetStandardPipeLayout(IsLineGeometry, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = Is3DTextured ? GetPipeline(m_Standard3DPipeline, IsTextured, BlendModeIndex, DynamicIndex) : GetStandardPipe(IsLineGeometry, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, State);
+
+		size_t VertPerPrim = 2;
+		bool IsIndexed = false;
+		if(PrimType == CCommandBuffer::PRIMTYPE_QUADS)
+		{
+			VertPerPrim = 4;
+			IsIndexed = true;
+		}
+		else if(PrimType == CCommandBuffer::PRIMTYPE_TRIANGLES)
+		{
+			VertPerPrim = 3;
+		}
+
+		VkBuffer VKBuffer;
+		SDeviceMemoryBlock VKBufferMem;
+		size_t BufferOff = 0;
+		if(!CreateStreamVertexBuffer(ExecBuffer.m_ThreadIndex, VKBuffer, VKBufferMem, BufferOff, pVertices, VertPerPrim * sizeof(TName) * PrimitiveCount))
+			return false;
+
+		std::array<VkBuffer, 1> aVertexBuffers = {VKBuffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		if(IsIndexed)
+			vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
+
+		if(IsTextured)
+		{
+			vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+		}
+
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGPos), m.data());
+
+		if(IsIndexed)
+			vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(PrimitiveCount * 6), 1, 0, 0, 0);
+		else
+			vkCmdDraw(CommandBuffer, static_cast<uint32_t>(PrimitiveCount * VertPerPrim), 1, 0, 0);
+
+		return true;
+	}
+
+public:
+	CCommandProcessorFragment_Vulkan()
+	{
+		m_vTextures.reserve(CCommandBuffer::MAX_TEXTURES);
+	}
+
+	/************************
+	* VULKAN SETUP CODE
+	************************/
+
+	[[nodiscard]] bool GetVulkanExtensions(SDL_Window *pWindow, std::vector<std::string> &vVKExtensions)
+	{
+		unsigned int ExtCount = 0;
+		if(!SDL_Vulkan_GetInstanceExtensions(pWindow, &ExtCount, nullptr))
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get instance extensions from SDL.");
+			return false;
+		}
+
+		std::vector<const char *> vExtensionList(ExtCount);
+		if(!SDL_Vulkan_GetInstanceExtensions(pWindow, &ExtCount, vExtensionList.data()))
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get instance extensions from SDL.");
+			return false;
+		}
+
+		for(uint32_t i = 0; i < ExtCount; i++)
+		{
+			vVKExtensions.emplace_back(vExtensionList[i]);
+		}
+
+		return true;
+	}
+
+	std::set<std::string> OurVKLayers()
+	{
+		std::set<std::string> OurLayers;
+
+		if(g_Config.m_DbgGfx == DEBUG_GFX_MODE_MINIMUM || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL)
+		{
+			OurLayers.emplace("VK_LAYER_KHRONOS_validation");
+			// deprecated, but VK_LAYER_KHRONOS_validation was released after vulkan 1.1
+			OurLayers.emplace("VK_LAYER_LUNARG_standard_validation");
+		}
+
+		return OurLayers;
+	}
+
+	std::set<std::string> OurDeviceExtensions()
+	{
+		std::set<std::string> OurExt;
+		OurExt.emplace(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+		return OurExt;
+	}
+
+	std::vector<VkImageUsageFlags> OurImageUsages()
+	{
+		std::vector<VkImageUsageFlags> vImgUsages;
+
+		vImgUsages.emplace_back(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+		vImgUsages.emplace_back(VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
+
+		return vImgUsages;
+	}
+
+	[[nodiscard]] bool GetVulkanLayers(std::vector<std::string> &vVKLayers)
+	{
+		uint32_t LayerCount = 0;
+		VkResult Res = vkEnumerateInstanceLayerProperties(&LayerCount, NULL);
+		if(Res != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get vulkan layers.");
+			return false;
+		}
+
+		std::vector<VkLayerProperties> vVKInstanceLayers(LayerCount);
+		Res = vkEnumerateInstanceLayerProperties(&LayerCount, vVKInstanceLayers.data());
+		if(Res != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get vulkan layers.");
+			return false;
+		}
+
+		std::set<std::string> ReqLayerNames = OurVKLayers();
+		vVKLayers.clear();
+		for(const auto &LayerName : vVKInstanceLayers)
+		{
+			auto it = ReqLayerNames.find(std::string(LayerName.layerName));
+			if(it != ReqLayerNames.end())
+			{
+				vVKLayers.emplace_back(LayerName.layerName);
+			}
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateVulkanInstance(const std::vector<std::string> &vVKLayers, const std::vector<std::string> &vVKExtensions, bool TryDebugExtensions)
+	{
+		std::vector<const char *> vLayersCStr;
+		vLayersCStr.reserve(vVKLayers.size());
+		for(const auto &Layer : vVKLayers)
+			vLayersCStr.emplace_back(Layer.c_str());
+
+		std::vector<const char *> vExtCStr;
+		vExtCStr.reserve(vVKExtensions.size() + 1);
+		for(const auto &Ext : vVKExtensions)
+			vExtCStr.emplace_back(Ext.c_str());
+
+#ifdef VK_EXT_debug_utils
+		if(TryDebugExtensions && (g_Config.m_DbgGfx == DEBUG_GFX_MODE_MINIMUM || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL))
+		{
+			// debug message support
+			vExtCStr.emplace_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
+		}
+#endif
+
+		VkApplicationInfo VKAppInfo = {};
+		VKAppInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
+		VKAppInfo.pNext = NULL;
+		VKAppInfo.pApplicationName = "DDNet";
+		VKAppInfo.applicationVersion = 1;
+		VKAppInfo.pEngineName = "DDNet-Vulkan";
+		VKAppInfo.engineVersion = 1;
+		VKAppInfo.apiVersion = VK_API_VERSION_1_1;
+
+		void *pExt = nullptr;
+#if defined(VK_EXT_validation_features) && VK_EXT_VALIDATION_FEATURES_SPEC_VERSION >= 5
+		VkValidationFeaturesEXT Features = {};
+		std::array<VkValidationFeatureEnableEXT, 2> aEnables = {VK_VALIDATION_FEATURE_ENABLE_SYNCHRONIZATION_VALIDATION_EXT, VK_VALIDATION_FEATURE_ENABLE_BEST_PRACTICES_EXT};
+		if(TryDebugExtensions && (g_Config.m_DbgGfx == DEBUG_GFX_MODE_AFFECTS_PERFORMANCE || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL))
+		{
+			Features.sType = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT;
+			Features.enabledValidationFeatureCount = aEnables.size();
+			Features.pEnabledValidationFeatures = aEnables.data();
+
+			pExt = &Features;
+		}
+#endif
+
+		VkInstanceCreateInfo VKInstanceInfo = {};
+		VKInstanceInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+		VKInstanceInfo.pNext = pExt;
+		VKInstanceInfo.flags = 0;
+		VKInstanceInfo.pApplicationInfo = &VKAppInfo;
+		VKInstanceInfo.enabledExtensionCount = static_cast<uint32_t>(vExtCStr.size());
+		VKInstanceInfo.ppEnabledExtensionNames = vExtCStr.data();
+		VKInstanceInfo.enabledLayerCount = static_cast<uint32_t>(vLayersCStr.size());
+		VKInstanceInfo.ppEnabledLayerNames = vLayersCStr.data();
+
+		bool TryAgain = false;
+
+		VkResult Res = vkCreateInstance(&VKInstanceInfo, NULL, &m_VKInstance);
+		const char *pCritErrorMsg = CheckVulkanCriticalError(Res);
+		if(pCritErrorMsg != nullptr)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating instance failed.", pCritErrorMsg);
+			return false;
+		}
+		else if(Res == VK_ERROR_LAYER_NOT_PRESENT || Res == VK_ERROR_EXTENSION_NOT_PRESENT)
+			TryAgain = true;
+
+		if(TryAgain && TryDebugExtensions)
+			return CreateVulkanInstance(vVKLayers, vVKExtensions, false);
+
+		return true;
+	}
+
+	STWGraphicGPU::ETWGraphicsGPUType VKGPUTypeToGraphicsGPUType(VkPhysicalDeviceType VKGPUType)
+	{
+		if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU)
+			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_DISCRETE;
+		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)
+			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INTEGRATED;
+		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU)
+			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_VIRTUAL;
+		else if(VKGPUType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_CPU)
+			return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_CPU;
+
+		return STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_CPU;
+	}
+
+	// from: https://github.com/SaschaWillems/vulkan.gpuinfo.org/blob/5c3986798afc39d736b825bf8a5fbf92b8d9ed49/includes/functions.php#L364
+	const char *GetDriverVerson(char (&aBuff)[256], uint32_t DriverVersion, uint32_t VendorID)
+	{
+		// NVIDIA
+		if(VendorID == 4318)
+		{
+			str_format(aBuff, std::size(aBuff), "%d.%d.%d.%d",
+				(DriverVersion >> 22) & 0x3ff,
+				(DriverVersion >> 14) & 0x0ff,
+				(DriverVersion >> 6) & 0x0ff,
+				(DriverVersion)&0x003f);
+		}
+#ifdef CONF_FAMILY_WINDOWS
+		// windows only
+		else if(VendorID == 0x8086)
+		{
+			str_format(aBuff, std::size(aBuff),
+				"%d.%d",
+				(DriverVersion >> 14),
+				(DriverVersion)&0x3fff);
+		}
+#endif
+		else
+		{
+			// Use Vulkan version conventions if vendor mapping is not available
+			str_format(aBuff, std::size(aBuff),
+				"%d.%d.%d",
+				(DriverVersion >> 22),
+				(DriverVersion >> 12) & 0x3ff,
+				DriverVersion & 0xfff);
+		}
+
+		return aBuff;
+	}
+
+	[[nodiscard]] bool SelectGPU(char *pRendererName, char *pVendorName, char *pVersionName)
+	{
+		uint32_t DevicesCount = 0;
+		auto Res = vkEnumeratePhysicalDevices(m_VKInstance, &DevicesCount, nullptr);
+		if(Res != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, CheckVulkanCriticalError(Res));
+			return false;
+		}
+		if(DevicesCount == 0)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "No vulkan compatible devices found.");
+			return false;
+		}
+
+		std::vector<VkPhysicalDevice> vDeviceList(DevicesCount);
+		Res = vkEnumeratePhysicalDevices(m_VKInstance, &DevicesCount, vDeviceList.data());
+		if(Res != VK_SUCCESS && Res != VK_INCOMPLETE)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, CheckVulkanCriticalError(Res));
+			return false;
+		}
+		if(DevicesCount == 0)
+		{
+			SetWarning(EGfxWarningType::GFX_WARNING_TYPE_INIT_FAILED_MISSING_INTEGRATED_GPU_DRIVER, "No vulkan compatible devices found.");
+			return false;
+		}
+		// make sure to use the correct amount of devices available
+		// the amount of physical devices can be smaller than the amount of devices reported
+		// see vkEnumeratePhysicalDevices for details
+		vDeviceList.resize(DevicesCount);
+
+		size_t Index = 0;
+		std::vector<VkPhysicalDeviceProperties> vDevicePropList(vDeviceList.size());
+		m_pGPUList->m_vGPUs.reserve(vDeviceList.size());
+
+		size_t FoundDeviceIndex = 0;
+		size_t FoundGPUType = STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INVALID;
+
+		STWGraphicGPU::ETWGraphicsGPUType AutoGPUType = STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INVALID;
+
+		bool IsAutoGPU = str_comp(g_Config.m_GfxGPUName, "auto") == 0;
+
+		for(auto &CurDevice : vDeviceList)
+		{
+			vkGetPhysicalDeviceProperties(CurDevice, &(vDevicePropList[Index]));
+
+			auto &DeviceProp = vDevicePropList[Index];
+
+			STWGraphicGPU::ETWGraphicsGPUType GPUType = VKGPUTypeToGraphicsGPUType(DeviceProp.deviceType);
+
+			STWGraphicGPU::STWGraphicGPUItem NewGPU;
+			str_copy(NewGPU.m_aName, DeviceProp.deviceName);
+			NewGPU.m_GPUType = GPUType;
+			m_pGPUList->m_vGPUs.push_back(NewGPU);
+
+			Index++;
+
+			int DevAPIMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
+			int DevAPIMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
+
+			if(GPUType < AutoGPUType && (DevAPIMajor > gs_BackendVulkanMajor || (DevAPIMajor == gs_BackendVulkanMajor && DevAPIMinor >= gs_BackendVulkanMinor)))
+			{
+				str_copy(m_pGPUList->m_AutoGPU.m_aName, DeviceProp.deviceName);
+				m_pGPUList->m_AutoGPU.m_GPUType = GPUType;
+
+				AutoGPUType = GPUType;
+			}
+
+			if(((IsAutoGPU && (FoundGPUType > STWGraphicGPU::ETWGraphicsGPUType::GRAPHICS_GPU_TYPE_INTEGRATED && GPUType < FoundGPUType)) || str_comp(DeviceProp.deviceName, g_Config.m_GfxGPUName) == 0) && (DevAPIMajor > gs_BackendVulkanMajor || (DevAPIMajor == gs_BackendVulkanMajor && DevAPIMinor >= gs_BackendVulkanMinor)))
+			{
+				FoundDeviceIndex = Index;
+				FoundGPUType = GPUType;
+			}
+		}
+
+		if(FoundDeviceIndex == 0)
+			FoundDeviceIndex = 1;
+
+		{
+			auto &DeviceProp = vDevicePropList[FoundDeviceIndex - 1];
+
+			int DevAPIMajor = (int)VK_API_VERSION_MAJOR(DeviceProp.apiVersion);
+			int DevAPIMinor = (int)VK_API_VERSION_MINOR(DeviceProp.apiVersion);
+			int DevAPIPatch = (int)VK_API_VERSION_PATCH(DeviceProp.apiVersion);
+
+			str_copy(pRendererName, DeviceProp.deviceName, gs_GPUInfoStringSize);
+			const char *pVendorNameStr = NULL;
+			switch(DeviceProp.vendorID)
+			{
+			case 0x1002:
+				pVendorNameStr = "AMD";
+				break;
+			case 0x1010:
+				pVendorNameStr = "ImgTec";
+				break;
+			case 0x106B:
+				pVendorNameStr = "Apple";
+				break;
+			case 0x10DE:
+				pVendorNameStr = "NVIDIA";
+				break;
+			case 0x13B5:
+				pVendorNameStr = "ARM";
+				break;
+			case 0x5143:
+				pVendorNameStr = "Qualcomm";
+				break;
+			case 0x8086:
+				pVendorNameStr = "INTEL";
+				break;
+			case 0x10005:
+				pVendorNameStr = "Mesa";
+				break;
+			default:
+				dbg_msg("vulkan", "unknown gpu vendor %u", DeviceProp.vendorID);
+				pVendorNameStr = "unknown";
+				break;
+			}
+
+			char aBuff[256];
+			str_copy(pVendorName, pVendorNameStr, gs_GPUInfoStringSize);
+			str_format(pVersionName, gs_GPUInfoStringSize, "Vulkan %d.%d.%d (driver: %s)", DevAPIMajor, DevAPIMinor, DevAPIPatch, GetDriverVerson(aBuff, DeviceProp.driverVersion, DeviceProp.vendorID));
+
+			// get important device limits
+			m_NonCoherentMemAlignment = DeviceProp.limits.nonCoherentAtomSize;
+			m_OptimalImageCopyMemAlignment = DeviceProp.limits.optimalBufferCopyOffsetAlignment;
+			m_MaxTextureSize = DeviceProp.limits.maxImageDimension2D;
+			m_MaxSamplerAnisotropy = DeviceProp.limits.maxSamplerAnisotropy;
+
+			m_MinUniformAlign = DeviceProp.limits.minUniformBufferOffsetAlignment;
+			m_MaxMultiSample = DeviceProp.limits.framebufferColorSampleCounts;
+
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "device prop: non-coherent align: %" PRIzu ", optimal image copy align: %" PRIzu ", max texture size: %u, max sampler anisotropy: %u", (size_t)m_NonCoherentMemAlignment, (size_t)m_OptimalImageCopyMemAlignment, m_MaxTextureSize, m_MaxSamplerAnisotropy);
+				dbg_msg("vulkan", "device prop: min uniform align: %u, multi sample: %u", m_MinUniformAlign, (uint32_t)m_MaxMultiSample);
+			}
+		}
+
+		VkPhysicalDevice CurDevice = vDeviceList[FoundDeviceIndex - 1];
+
+		uint32_t FamQueueCount = 0;
+		vkGetPhysicalDeviceQueueFamilyProperties(CurDevice, &FamQueueCount, nullptr);
+		if(FamQueueCount == 0)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "No vulkan queue family properties found.");
+			return false;
+		}
+
+		std::vector<VkQueueFamilyProperties> vQueuePropList(FamQueueCount);
+		vkGetPhysicalDeviceQueueFamilyProperties(CurDevice, &FamQueueCount, vQueuePropList.data());
+
+		uint32_t QueueNodeIndex = std::numeric_limits<uint32_t>::max();
+		for(uint32_t i = 0; i < FamQueueCount; i++)
+		{
+			if(vQueuePropList[i].queueCount > 0 && (vQueuePropList[i].queueFlags & VK_QUEUE_GRAPHICS_BIT))
+			{
+				QueueNodeIndex = i;
+			}
+			/*if(vQueuePropList[i].queueCount > 0 && (vQueuePropList[i].queueFlags & VK_QUEUE_COMPUTE_BIT))
+			{
+				QueueNodeIndex = i;
+			}*/
+		}
+
+		if(QueueNodeIndex == std::numeric_limits<uint32_t>::max())
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "No vulkan queue found that matches the requirements: graphics queue.");
+			return false;
+		}
+
+		m_VKGPU = CurDevice;
+		m_VKGraphicsQueueIndex = QueueNodeIndex;
+		return true;
+	}
+
+	[[nodiscard]] bool CreateLogicalDevice(const std::vector<std::string> &vVKLayers)
+	{
+		std::vector<const char *> vLayerCNames;
+		vLayerCNames.reserve(vVKLayers.size());
+		for(const auto &Layer : vVKLayers)
+			vLayerCNames.emplace_back(Layer.c_str());
+
+		uint32_t DevPropCount = 0;
+		if(vkEnumerateDeviceExtensionProperties(m_VKGPU, NULL, &DevPropCount, NULL) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Querying logical device extension properties failed.");
+			return false;
+		}
+
+		std::vector<VkExtensionProperties> vDevPropList(DevPropCount);
+		if(vkEnumerateDeviceExtensionProperties(m_VKGPU, NULL, &DevPropCount, vDevPropList.data()) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Querying logical device extension properties failed.");
+			return false;
+		}
+
+		std::vector<const char *> vDevPropCNames;
+		std::set<std::string> OurDevExt = OurDeviceExtensions();
+
+		for(const auto &CurExtProp : vDevPropList)
+		{
+			auto it = OurDevExt.find(std::string(CurExtProp.extensionName));
+			if(it != OurDevExt.end())
+			{
+				vDevPropCNames.emplace_back(CurExtProp.extensionName);
+			}
+		}
+
+		VkDeviceQueueCreateInfo VKQueueCreateInfo;
+		VKQueueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+		VKQueueCreateInfo.queueFamilyIndex = m_VKGraphicsQueueIndex;
+		VKQueueCreateInfo.queueCount = 1;
+		float QueuePrio = 1.0f;
+		VKQueueCreateInfo.pQueuePriorities = &QueuePrio;
+		VKQueueCreateInfo.pNext = NULL;
+		VKQueueCreateInfo.flags = 0;
+
+		VkDeviceCreateInfo VKCreateInfo;
+		VKCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
+		VKCreateInfo.queueCreateInfoCount = 1;
+		VKCreateInfo.pQueueCreateInfos = &VKQueueCreateInfo;
+		VKCreateInfo.ppEnabledLayerNames = vLayerCNames.data();
+		VKCreateInfo.enabledLayerCount = static_cast<uint32_t>(vLayerCNames.size());
+		VKCreateInfo.ppEnabledExtensionNames = vDevPropCNames.data();
+		VKCreateInfo.enabledExtensionCount = static_cast<uint32_t>(vDevPropCNames.size());
+		VKCreateInfo.pNext = NULL;
+		VKCreateInfo.pEnabledFeatures = NULL;
+		VKCreateInfo.flags = 0;
+
+		VkResult res = vkCreateDevice(m_VKGPU, &VKCreateInfo, nullptr, &m_VKDevice);
+		if(res != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Logical device could not be created.");
+			return false;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateSurface(SDL_Window *pWindow)
+	{
+		if(!SDL_Vulkan_CreateSurface(pWindow, m_VKInstance, &m_VKPresentSurface))
+		{
+			dbg_msg("vulkan", "error from sdl: %s", SDL_GetError());
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating a vulkan surface for the SDL window failed.");
+			return false;
+		}
+
+		VkBool32 IsSupported = false;
+		vkGetPhysicalDeviceSurfaceSupportKHR(m_VKGPU, m_VKGraphicsQueueIndex, m_VKPresentSurface, &IsSupported);
+		if(!IsSupported)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface does not support presenting the framebuffer to a screen. (maybe the wrong GPU was selected?)");
+			return false;
+		}
+
+		return true;
+	}
+
+	void DestroySurface()
+	{
+		vkDestroySurfaceKHR(m_VKInstance, m_VKPresentSurface, nullptr);
+	}
+
+	[[nodiscard]] bool GetPresentationMode(VkPresentModeKHR &VKIOMode)
+	{
+		uint32_t PresentModeCount = 0;
+		if(vkGetPhysicalDeviceSurfacePresentModesKHR(m_VKGPU, m_VKPresentSurface, &PresentModeCount, NULL) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface presentation modes could not be fetched.");
+			return false;
+		}
+
+		std::vector<VkPresentModeKHR> vPresentModeList(PresentModeCount);
+		if(vkGetPhysicalDeviceSurfacePresentModesKHR(m_VKGPU, m_VKPresentSurface, &PresentModeCount, vPresentModeList.data()) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface presentation modes could not be fetched.");
+			return false;
+		}
+
+		VKIOMode = g_Config.m_GfxVsync ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_IMMEDIATE_KHR;
+		for(const auto &Mode : vPresentModeList)
+		{
+			if(Mode == VKIOMode)
+				return true;
+		}
+
+		dbg_msg("vulkan", "warning: requested presentation mode was not available. falling back to mailbox / fifo relaxed.");
+		VKIOMode = g_Config.m_GfxVsync ? VK_PRESENT_MODE_FIFO_RELAXED_KHR : VK_PRESENT_MODE_MAILBOX_KHR;
+		for(const auto &Mode : vPresentModeList)
+		{
+			if(Mode == VKIOMode)
+				return true;
+		}
+
+		dbg_msg("vulkan", "warning: requested presentation mode was not available. using first available.");
+		if(PresentModeCount > 0)
+			VKIOMode = vPresentModeList[0];
+
+		return true;
+	}
+
+	[[nodiscard]] bool GetSurfaceProperties(VkSurfaceCapabilitiesKHR &VKSurfCapabilities)
+	{
+		if(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(m_VKGPU, m_VKPresentSurface, &VKSurfCapabilities) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface capabilities could not be fetched.");
+			return false;
+		}
+		return true;
+	}
+
+	uint32_t GetNumberOfSwapImages(const VkSurfaceCapabilitiesKHR &VKCapabilities)
+	{
+		uint32_t ImgNumber = VKCapabilities.minImageCount + 1;
+		if(IsVerbose())
+		{
+			dbg_msg("vulkan", "minimal swap image count %u", VKCapabilities.minImageCount);
+		}
+		return (VKCapabilities.maxImageCount > 0 && ImgNumber > VKCapabilities.maxImageCount) ? VKCapabilities.maxImageCount : ImgNumber;
+	}
+
+	SSwapImgViewportExtent GetSwapImageSize(const VkSurfaceCapabilitiesKHR &VKCapabilities)
+	{
+		VkExtent2D RetSize = {m_CanvasWidth, m_CanvasHeight};
+
+		if(VKCapabilities.currentExtent.width == std::numeric_limits<uint32_t>::max())
+		{
+			RetSize.width = clamp<uint32_t>(RetSize.width, VKCapabilities.minImageExtent.width, VKCapabilities.maxImageExtent.width);
+			RetSize.height = clamp<uint32_t>(RetSize.height, VKCapabilities.minImageExtent.height, VKCapabilities.maxImageExtent.height);
+		}
+		else
+		{
+			RetSize = VKCapabilities.currentExtent;
+		}
+
+		VkExtent2D AutoViewportExtent = RetSize;
+		bool UsesForcedViewport = false;
+		// keep this in sync with graphics_threaded AdjustViewport's check
+		if(AutoViewportExtent.height > 4 * AutoViewportExtent.width / 5)
+		{
+			AutoViewportExtent.height = 4 * AutoViewportExtent.width / 5;
+			UsesForcedViewport = true;
+		}
+
+		SSwapImgViewportExtent Ext;
+		Ext.m_SwapImageViewport = RetSize;
+		Ext.m_ForcedViewport = AutoViewportExtent;
+		Ext.m_HasForcedViewport = UsesForcedViewport;
+
+		return Ext;
+	}
+
+	[[nodiscard]] bool GetImageUsage(const VkSurfaceCapabilitiesKHR &VKCapabilities, VkImageUsageFlags &VKOutUsage)
+	{
+		std::vector<VkImageUsageFlags> vOurImgUsages = OurImageUsages();
+		if(vOurImgUsages.empty())
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Framebuffer image attachment types not supported.");
+			return false;
+		}
+
+		VKOutUsage = vOurImgUsages[0];
+
+		for(const auto &ImgUsage : vOurImgUsages)
+		{
+			VkImageUsageFlags ImgUsageFlags = ImgUsage & VKCapabilities.supportedUsageFlags;
+			if(ImgUsageFlags != ImgUsage)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Framebuffer image attachment types not supported.");
+				return false;
+			}
+
+			VKOutUsage = (VKOutUsage | ImgUsage);
+		}
+
+		return true;
+	}
+
+	VkSurfaceTransformFlagBitsKHR GetTransform(const VkSurfaceCapabilitiesKHR &VKCapabilities)
+	{
+		if(VKCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+			return VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+		return VKCapabilities.currentTransform;
+	}
+
+	[[nodiscard]] bool GetFormat()
+	{
+		uint32_t SurfFormats = 0;
+		VkResult Res = vkGetPhysicalDeviceSurfaceFormatsKHR(m_VKGPU, m_VKPresentSurface, &SurfFormats, nullptr);
+		if(Res != VK_SUCCESS && Res != VK_INCOMPLETE)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface format fetching failed.");
+			return false;
+		}
+
+		std::vector<VkSurfaceFormatKHR> vSurfFormatList(SurfFormats);
+		Res = vkGetPhysicalDeviceSurfaceFormatsKHR(m_VKGPU, m_VKPresentSurface, &SurfFormats, vSurfFormatList.data());
+		if(Res != VK_SUCCESS && Res != VK_INCOMPLETE)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "The device surface format fetching failed.");
+			return false;
+		}
+
+		if(Res == VK_INCOMPLETE)
+		{
+			dbg_msg("vulkan", "warning: not all surface formats are requestable with your current settings.");
+		}
+
+		if(vSurfFormatList.size() == 1 && vSurfFormatList[0].format == VK_FORMAT_UNDEFINED)
+		{
+			m_VKSurfFormat.format = VK_FORMAT_B8G8R8A8_UNORM;
+			m_VKSurfFormat.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+			dbg_msg("vulkan", "warning: surface format was undefined. This can potentially cause bugs.");
+			return true;
+		}
+
+		for(const auto &FindFormat : vSurfFormatList)
+		{
+			if(FindFormat.format == VK_FORMAT_B8G8R8A8_UNORM && FindFormat.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
+			{
+				m_VKSurfFormat = FindFormat;
+				return true;
+			}
+			else if(FindFormat.format == VK_FORMAT_R8G8B8A8_UNORM && FindFormat.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
+			{
+				m_VKSurfFormat = FindFormat;
+				return true;
+			}
+		}
+
+		dbg_msg("vulkan", "warning: surface format was not RGBA(or variants of it). This can potentially cause weird looking images(too bright etc.).");
+		m_VKSurfFormat = vSurfFormatList[0];
+		return true;
+	}
+
+	[[nodiscard]] bool CreateSwapChain(VkSwapchainKHR &OldSwapChain)
+	{
+		VkSurfaceCapabilitiesKHR VKSurfCap;
+		if(!GetSurfaceProperties(VKSurfCap))
+			return false;
+
+		VkPresentModeKHR PresentMode = VK_PRESENT_MODE_IMMEDIATE_KHR;
+		if(!GetPresentationMode(PresentMode))
+			return false;
+
+		uint32_t SwapImgCount = GetNumberOfSwapImages(VKSurfCap);
+
+		m_VKSwapImgAndViewportExtent = GetSwapImageSize(VKSurfCap);
+
+		VkImageUsageFlags UsageFlags;
+		if(!GetImageUsage(VKSurfCap, UsageFlags))
+			return false;
+
+		VkSurfaceTransformFlagBitsKHR TransformFlagBits = GetTransform(VKSurfCap);
+
+		if(!GetFormat())
+			return false;
+
+		OldSwapChain = m_VKSwapChain;
+
+		VkSwapchainCreateInfoKHR SwapInfo;
+		SwapInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
+		SwapInfo.pNext = nullptr;
+		SwapInfo.flags = 0;
+		SwapInfo.surface = m_VKPresentSurface;
+		SwapInfo.minImageCount = SwapImgCount;
+		SwapInfo.imageFormat = m_VKSurfFormat.format;
+		SwapInfo.imageColorSpace = m_VKSurfFormat.colorSpace;
+		SwapInfo.imageExtent = m_VKSwapImgAndViewportExtent.m_SwapImageViewport;
+		SwapInfo.imageArrayLayers = 1;
+		SwapInfo.imageUsage = UsageFlags;
+		SwapInfo.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+		SwapInfo.queueFamilyIndexCount = 0;
+		SwapInfo.pQueueFamilyIndices = nullptr;
+		SwapInfo.preTransform = TransformFlagBits;
+		SwapInfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
+		SwapInfo.presentMode = PresentMode;
+		SwapInfo.clipped = true;
+		SwapInfo.oldSwapchain = OldSwapChain;
+
+		m_VKSwapChain = VK_NULL_HANDLE;
+		VkResult SwapchainCreateRes = vkCreateSwapchainKHR(m_VKDevice, &SwapInfo, nullptr, &m_VKSwapChain);
+		const char *pCritErrorMsg = CheckVulkanCriticalError(SwapchainCreateRes);
+		if(pCritErrorMsg != nullptr)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the swap chain failed.", pCritErrorMsg);
+			return false;
+		}
+		else if(SwapchainCreateRes == VK_ERROR_NATIVE_WINDOW_IN_USE_KHR)
+			return false;
+
+		return true;
+	}
+
+	void DestroySwapChain(bool ForceDestroy)
+	{
+		if(ForceDestroy)
+		{
+			vkDestroySwapchainKHR(m_VKDevice, m_VKSwapChain, nullptr);
+			m_VKSwapChain = VK_NULL_HANDLE;
+		}
+	}
+
+	[[nodiscard]] bool GetSwapChainImageHandles()
+	{
+		uint32_t ImgCount = 0;
+		VkResult res = vkGetSwapchainImagesKHR(m_VKDevice, m_VKSwapChain, &ImgCount, nullptr);
+		if(res != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get swap chain images.");
+			return false;
+		}
+
+		m_SwapChainImageCount = ImgCount;
+
+		m_vSwapChainImages.resize(ImgCount);
+		if(vkGetSwapchainImagesKHR(m_VKDevice, m_VKSwapChain, &ImgCount, m_vSwapChainImages.data()) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not get swap chain images.");
+			return false;
+		}
+
+		return true;
+	}
+
+	void ClearSwapChainImageHandles()
+	{
+		m_vSwapChainImages.clear();
+	}
+
+	void GetDeviceQueue()
+	{
+		vkGetDeviceQueue(m_VKDevice, m_VKGraphicsQueueIndex, 0, &m_VKGraphicsQueue);
+		vkGetDeviceQueue(m_VKDevice, m_VKGraphicsQueueIndex, 0, &m_VKPresentQueue);
+	}
+
+#ifdef VK_EXT_debug_utils
+	static VKAPI_ATTR VkBool32 VKAPI_CALL VKDebugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT MessageSeverity, VkDebugUtilsMessageTypeFlagsEXT MessageType, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, void *pUserData)
+	{
+		if((MessageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) != 0)
+		{
+			dbg_msg("vulkan_debug", "validation error: %s", pCallbackData->pMessage);
+		}
+		else
+		{
+			dbg_msg("vulkan_debug", "%s", pCallbackData->pMessage);
+		}
+
+		return VK_FALSE;
+	}
+
+	VkResult CreateDebugUtilsMessengerEXT(const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pDebugMessenger)
+	{
+		auto func = (PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(m_VKInstance, "vkCreateDebugUtilsMessengerEXT");
+		if(func != nullptr)
+		{
+			return func(m_VKInstance, pCreateInfo, pAllocator, pDebugMessenger);
+		}
+		else
+		{
+			return VK_ERROR_EXTENSION_NOT_PRESENT;
+		}
+	}
+
+	void DestroyDebugUtilsMessengerEXT(VkDebugUtilsMessengerEXT &DebugMessenger)
+	{
+		auto func = (PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(m_VKInstance, "vkDestroyDebugUtilsMessengerEXT");
+		if(func != nullptr)
+		{
+			func(m_VKInstance, DebugMessenger, nullptr);
+		}
+	}
+#endif
+
+	void SetupDebugCallback()
+	{
+#ifdef VK_EXT_debug_utils
+		VkDebugUtilsMessengerCreateInfoEXT CreateInfo = {};
+		CreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
+		CreateInfo.messageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
+		CreateInfo.messageType = VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT; // | VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT <- too annoying
+		CreateInfo.pfnUserCallback = VKDebugCallback;
+
+		if(CreateDebugUtilsMessengerEXT(&CreateInfo, nullptr, &m_DebugMessenger) != VK_SUCCESS)
+		{
+			m_DebugMessenger = VK_NULL_HANDLE;
+			dbg_msg("vulkan", "didn't find vulkan debug layer.");
+		}
+		else
+		{
+			dbg_msg("vulkan", "enabled vulkan debug context.");
+		}
+#endif
+	}
+
+	void UnregisterDebugCallback()
+	{
+#ifdef VK_EXT_debug_utils
+		if(m_DebugMessenger != VK_NULL_HANDLE)
+			DestroyDebugUtilsMessengerEXT(m_DebugMessenger);
+#endif
+	}
+
+	[[nodiscard]] bool CreateImageViews()
+	{
+		m_vSwapChainImageViewList.resize(m_SwapChainImageCount);
+
+		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		{
+			VkImageViewCreateInfo CreateInfo{};
+			CreateInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+			CreateInfo.image = m_vSwapChainImages[i];
+			CreateInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
+			CreateInfo.format = m_VKSurfFormat.format;
+			CreateInfo.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
+			CreateInfo.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
+			CreateInfo.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
+			CreateInfo.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
+			CreateInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+			CreateInfo.subresourceRange.baseMipLevel = 0;
+			CreateInfo.subresourceRange.levelCount = 1;
+			CreateInfo.subresourceRange.baseArrayLayer = 0;
+			CreateInfo.subresourceRange.layerCount = 1;
+
+			if(vkCreateImageView(m_VKDevice, &CreateInfo, nullptr, &m_vSwapChainImageViewList[i]) != VK_SUCCESS)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Could not create image views for the swap chain framebuffers.");
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	void DestroyImageViews()
+	{
+		for(auto &ImageView : m_vSwapChainImageViewList)
+		{
+			vkDestroyImageView(m_VKDevice, ImageView, nullptr);
+		}
+
+		m_vSwapChainImageViewList.clear();
+	}
+
+	[[nodiscard]] bool CreateMultiSamplerImageAttachments()
+	{
+		m_vSwapChainMultiSamplingImages.resize(m_SwapChainImageCount);
+		if(HasMultiSampling())
+		{
+			for(size_t i = 0; i < m_SwapChainImageCount; ++i)
+			{
+				if(!CreateImage(m_VKSwapImgAndViewportExtent.m_SwapImageViewport.width, m_VKSwapImgAndViewportExtent.m_SwapImageViewport.height, 1, 1, m_VKSurfFormat.format, VK_IMAGE_TILING_OPTIMAL, m_vSwapChainMultiSamplingImages[i].m_Image, m_vSwapChainMultiSamplingImages[i].m_ImgMem, VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT))
+					return false;
+				m_vSwapChainMultiSamplingImages[i].m_ImgView = CreateImageView(m_vSwapChainMultiSamplingImages[i].m_Image, m_VKSurfFormat.format, VK_IMAGE_VIEW_TYPE_2D, 1, 1);
+			}
+		}
+
+		return true;
+	}
+
+	void DestroyMultiSamplerImageAttachments()
+	{
+		if(HasMultiSampling())
+		{
+			m_vSwapChainMultiSamplingImages.resize(m_SwapChainImageCount);
+			for(size_t i = 0; i < m_SwapChainImageCount; ++i)
+			{
+				vkDestroyImage(m_VKDevice, m_vSwapChainMultiSamplingImages[i].m_Image, nullptr);
+				vkDestroyImageView(m_VKDevice, m_vSwapChainMultiSamplingImages[i].m_ImgView, nullptr);
+				FreeImageMemBlock(m_vSwapChainMultiSamplingImages[i].m_ImgMem);
+			}
+		}
+		m_vSwapChainMultiSamplingImages.clear();
+	}
+
+	[[nodiscard]] bool CreateRenderPass(bool ClearAttachs)
+	{
+		bool HasMultiSamplingTargets = HasMultiSampling();
+		VkAttachmentDescription MultiSamplingColorAttachment{};
+		MultiSamplingColorAttachment.format = m_VKSurfFormat.format;
+		MultiSamplingColorAttachment.samples = GetSampleCount();
+		MultiSamplingColorAttachment.loadOp = ClearAttachs ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+		MultiSamplingColorAttachment.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+		MultiSamplingColorAttachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+		MultiSamplingColorAttachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+		MultiSamplingColorAttachment.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+		MultiSamplingColorAttachment.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+		VkAttachmentDescription ColorAttachment{};
+		ColorAttachment.format = m_VKSurfFormat.format;
+		ColorAttachment.samples = VK_SAMPLE_COUNT_1_BIT;
+		ColorAttachment.loadOp = ClearAttachs && !HasMultiSamplingTargets ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+		ColorAttachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+		ColorAttachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+		ColorAttachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+		ColorAttachment.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+		ColorAttachment.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+
+		VkAttachmentReference MultiSamplingColorAttachmentRef{};
+		MultiSamplingColorAttachmentRef.attachment = 0;
+		MultiSamplingColorAttachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+		VkAttachmentReference ColorAttachmentRef{};
+		ColorAttachmentRef.attachment = HasMultiSamplingTargets ? 1 : 0;
+		ColorAttachmentRef.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+		VkSubpassDescription Subpass{};
+		Subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+		Subpass.colorAttachmentCount = 1;
+		Subpass.pColorAttachments = HasMultiSamplingTargets ? &MultiSamplingColorAttachmentRef : &ColorAttachmentRef;
+		Subpass.pResolveAttachments = HasMultiSamplingTargets ? &ColorAttachmentRef : nullptr;
+
+		std::array<VkAttachmentDescription, 2> aAttachments;
+		aAttachments[0] = MultiSamplingColorAttachment;
+		aAttachments[1] = ColorAttachment;
+
+		VkSubpassDependency Dependency{};
+		Dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
+		Dependency.dstSubpass = 0;
+		Dependency.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+		Dependency.srcAccessMask = 0;
+		Dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+		Dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+
+		VkRenderPassCreateInfo CreateRenderPassInfo{};
+		CreateRenderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
+		CreateRenderPassInfo.attachmentCount = HasMultiSamplingTargets ? 2 : 1;
+		CreateRenderPassInfo.pAttachments = HasMultiSamplingTargets ? aAttachments.data() : aAttachments.data() + 1;
+		CreateRenderPassInfo.subpassCount = 1;
+		CreateRenderPassInfo.pSubpasses = &Subpass;
+		CreateRenderPassInfo.dependencyCount = 1;
+		CreateRenderPassInfo.pDependencies = &Dependency;
+
+		if(vkCreateRenderPass(m_VKDevice, &CreateRenderPassInfo, nullptr, &m_VKRenderPass) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the render pass failed.");
+			return false;
+		}
+
+		return true;
+	}
+
+	void DestroyRenderPass()
+	{
+		vkDestroyRenderPass(m_VKDevice, m_VKRenderPass, nullptr);
+	}
+
+	[[nodiscard]] bool CreateFramebuffers()
+	{
+		m_vFramebufferList.resize(m_SwapChainImageCount);
+
+		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		{
+			std::array<VkImageView, 2> aAttachments = {
+				m_vSwapChainMultiSamplingImages[i].m_ImgView,
+				m_vSwapChainImageViewList[i]};
+
+			bool HasMultiSamplingTargets = HasMultiSampling();
+
+			VkFramebufferCreateInfo FramebufferInfo{};
+			FramebufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+			FramebufferInfo.renderPass = m_VKRenderPass;
+			FramebufferInfo.attachmentCount = HasMultiSamplingTargets ? aAttachments.size() : aAttachments.size() - 1;
+			FramebufferInfo.pAttachments = HasMultiSamplingTargets ? aAttachments.data() : aAttachments.data() + 1;
+			FramebufferInfo.width = m_VKSwapImgAndViewportExtent.m_SwapImageViewport.width;
+			FramebufferInfo.height = m_VKSwapImgAndViewportExtent.m_SwapImageViewport.height;
+			FramebufferInfo.layers = 1;
+
+			if(vkCreateFramebuffer(m_VKDevice, &FramebufferInfo, nullptr, &m_vFramebufferList[i]) != VK_SUCCESS)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the framebuffers failed.");
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	void DestroyFramebuffers()
+	{
+		for(auto &FrameBuffer : m_vFramebufferList)
+		{
+			vkDestroyFramebuffer(m_VKDevice, FrameBuffer, nullptr);
+		}
+
+		m_vFramebufferList.clear();
+	}
+
+	[[nodiscard]] bool CreateShaderModule(const std::vector<uint8_t> &vCode, VkShaderModule &ShaderModule)
+	{
+		VkShaderModuleCreateInfo CreateInfo{};
+		CreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
+		CreateInfo.codeSize = vCode.size();
+		CreateInfo.pCode = (const uint32_t *)(vCode.data());
+
+		if(vkCreateShaderModule(m_VKDevice, &CreateInfo, nullptr, &ShaderModule) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Shader module was not created.");
+			return false;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateDescriptorSetLayouts()
+	{
+		VkDescriptorSetLayoutBinding SamplerLayoutBinding{};
+		SamplerLayoutBinding.binding = 0;
+		SamplerLayoutBinding.descriptorCount = 1;
+		SamplerLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		SamplerLayoutBinding.pImmutableSamplers = nullptr;
+		SamplerLayoutBinding.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+
+		std::array<VkDescriptorSetLayoutBinding, 1> aBindings = {SamplerLayoutBinding};
+		VkDescriptorSetLayoutCreateInfo LayoutInfo{};
+		LayoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		LayoutInfo.bindingCount = aBindings.size();
+		LayoutInfo.pBindings = aBindings.data();
+
+		if(vkCreateDescriptorSetLayout(m_VKDevice, &LayoutInfo, nullptr, &m_StandardTexturedDescriptorSetLayout) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating descriptor layout failed.");
+			return false;
+		}
+
+		if(vkCreateDescriptorSetLayout(m_VKDevice, &LayoutInfo, nullptr, &m_Standard3DTexturedDescriptorSetLayout) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating descriptor layout failed.");
+			return false;
+		}
+		return true;
+	}
+
+	void DestroyDescriptorSetLayouts()
+	{
+		vkDestroyDescriptorSetLayout(m_VKDevice, m_StandardTexturedDescriptorSetLayout, nullptr);
+		vkDestroyDescriptorSetLayout(m_VKDevice, m_Standard3DTexturedDescriptorSetLayout, nullptr);
+	}
+
+	[[nodiscard]] bool LoadShader(const char *pFileName, std::vector<uint8_t> *&pvShaderData)
+	{
+		auto it = m_ShaderFiles.find(pFileName);
+		if(it == m_ShaderFiles.end())
+		{
+			void *pShaderBuff;
+			unsigned FileSize;
+			if(!m_pStorage->ReadFile(pFileName, IStorage::TYPE_ALL, &pShaderBuff, &FileSize))
+				return false;
+
+			std::vector<uint8_t> vShaderBuff;
+			vShaderBuff.resize(FileSize);
+			mem_copy(vShaderBuff.data(), pShaderBuff, FileSize);
+			free(pShaderBuff);
+
+			it = m_ShaderFiles.insert({pFileName, {std::move(vShaderBuff)}}).first;
+		}
+
+		pvShaderData = &it->second.m_vBinary;
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateShaders(const char *pVertName, const char *pFragName, VkPipelineShaderStageCreateInfo (&aShaderStages)[2], SShaderModule &ShaderModule)
+	{
+		bool ShaderLoaded = true;
+
+		std::vector<uint8_t> *pvVertBuff;
+		std::vector<uint8_t> *pvFragBuff;
+		ShaderLoaded &= LoadShader(pVertName, pvVertBuff);
+		ShaderLoaded &= LoadShader(pFragName, pvFragBuff);
+
+		ShaderModule.m_VKDevice = m_VKDevice;
+
+		if(!ShaderLoaded)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "A shader file could not load correctly.");
+			return false;
+		}
+
+		if(!CreateShaderModule(*pvVertBuff, ShaderModule.m_VertShaderModule))
+			return false;
+
+		if(!CreateShaderModule(*pvFragBuff, ShaderModule.m_FragShaderModule))
+			return false;
+
+		VkPipelineShaderStageCreateInfo &VertShaderStageInfo = aShaderStages[0];
+		VertShaderStageInfo = {};
+		VertShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+		VertShaderStageInfo.stage = VK_SHADER_STAGE_VERTEX_BIT;
+		VertShaderStageInfo.module = ShaderModule.m_VertShaderModule;
+		VertShaderStageInfo.pName = "main";
+
+		VkPipelineShaderStageCreateInfo &FragShaderStageInfo = aShaderStages[1];
+		FragShaderStageInfo = {};
+		FragShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+		FragShaderStageInfo.stage = VK_SHADER_STAGE_FRAGMENT_BIT;
+		FragShaderStageInfo.module = ShaderModule.m_FragShaderModule;
+		FragShaderStageInfo.pName = "main";
+		return true;
+	}
+
+	bool GetStandardPipelineInfo(VkPipelineInputAssemblyStateCreateInfo &InputAssembly,
+		VkViewport &Viewport,
+		VkRect2D &Scissor,
+		VkPipelineViewportStateCreateInfo &ViewportState,
+		VkPipelineRasterizationStateCreateInfo &Rasterizer,
+		VkPipelineMultisampleStateCreateInfo &Multisampling,
+		VkPipelineColorBlendAttachmentState &ColorBlendAttachment,
+		VkPipelineColorBlendStateCreateInfo &ColorBlending) const
+	{
+		InputAssembly.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
+		InputAssembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+		InputAssembly.primitiveRestartEnable = VK_FALSE;
+
+		Viewport.x = 0.0f;
+		Viewport.y = 0.0f;
+		Viewport.width = (float)m_VKSwapImgAndViewportExtent.m_SwapImageViewport.width;
+		Viewport.height = (float)m_VKSwapImgAndViewportExtent.m_SwapImageViewport.height;
+		Viewport.minDepth = 0.0f;
+		Viewport.maxDepth = 1.0f;
+
+		Scissor.offset = {0, 0};
+		Scissor.extent = m_VKSwapImgAndViewportExtent.m_SwapImageViewport;
+
+		ViewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
+		ViewportState.viewportCount = 1;
+		ViewportState.pViewports = &Viewport;
+		ViewportState.scissorCount = 1;
+		ViewportState.pScissors = &Scissor;
+
+		Rasterizer.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+		Rasterizer.depthClampEnable = VK_FALSE;
+		Rasterizer.rasterizerDiscardEnable = VK_FALSE;
+		Rasterizer.polygonMode = VK_POLYGON_MODE_FILL;
+		Rasterizer.lineWidth = 1.0f;
+		Rasterizer.cullMode = VK_CULL_MODE_NONE;
+		Rasterizer.frontFace = VK_FRONT_FACE_CLOCKWISE;
+		Rasterizer.depthBiasEnable = VK_FALSE;
+
+		Multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
+		Multisampling.sampleShadingEnable = VK_FALSE;
+		Multisampling.rasterizationSamples = GetSampleCount();
+
+		ColorBlendAttachment.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
+		ColorBlendAttachment.blendEnable = VK_TRUE;
+
+		ColorBlendAttachment.srcColorBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA;
+		ColorBlendAttachment.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
+		ColorBlendAttachment.colorBlendOp = VK_BLEND_OP_ADD;
+		ColorBlendAttachment.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA;
+		ColorBlendAttachment.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
+		ColorBlendAttachment.alphaBlendOp = VK_BLEND_OP_ADD;
+
+		ColorBlending.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
+		ColorBlending.logicOpEnable = VK_FALSE;
+		ColorBlending.logicOp = VK_LOGIC_OP_COPY;
+		ColorBlending.attachmentCount = 1;
+		ColorBlending.pAttachments = &ColorBlendAttachment;
+		ColorBlending.blendConstants[0] = 0.0f;
+		ColorBlending.blendConstants[1] = 0.0f;
+		ColorBlending.blendConstants[2] = 0.0f;
+		ColorBlending.blendConstants[3] = 0.0f;
+
+		return true;
+	}
+
+	template<bool ForceRequireDescriptors, size_t ArraySize, size_t DescrArraySize, size_t PushArraySize>
+	[[nodiscard]] bool CreateGraphicsPipeline(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, uint32_t Stride, std::array<VkVertexInputAttributeDescription, ArraySize> &aInputAttr,
+		std::array<VkDescriptorSetLayout, DescrArraySize> &aSetLayouts, std::array<VkPushConstantRange, PushArraySize> &aPushConstants, EVulkanBackendTextureModes TexMode,
+		EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode, bool IsLinePrim = false)
+	{
+		VkPipelineShaderStageCreateInfo aShaderStages[2];
+		SShaderModule Module;
+		if(!CreateShaders(pVertName, pFragName, aShaderStages, Module))
+			return false;
+
+		bool HasSampler = TexMode == VULKAN_BACKEND_TEXTURE_MODE_TEXTURED;
+
+		VkPipelineVertexInputStateCreateInfo VertexInputInfo{};
+		VertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
+		VkVertexInputBindingDescription BindingDescription{};
+		BindingDescription.binding = 0;
+		BindingDescription.stride = Stride;
+		BindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+
+		VertexInputInfo.vertexBindingDescriptionCount = 1;
+		VertexInputInfo.vertexAttributeDescriptionCount = aInputAttr.size();
+		VertexInputInfo.pVertexBindingDescriptions = &BindingDescription;
+		VertexInputInfo.pVertexAttributeDescriptions = aInputAttr.data();
+
+		VkPipelineInputAssemblyStateCreateInfo InputAssembly{};
+		VkViewport Viewport{};
+		VkRect2D Scissor{};
+		VkPipelineViewportStateCreateInfo ViewportState{};
+		VkPipelineRasterizationStateCreateInfo Rasterizer{};
+		VkPipelineMultisampleStateCreateInfo Multisampling{};
+		VkPipelineColorBlendAttachmentState ColorBlendAttachment{};
+		VkPipelineColorBlendStateCreateInfo ColorBlending{};
+
+		GetStandardPipelineInfo(InputAssembly, Viewport, Scissor, ViewportState, Rasterizer, Multisampling, ColorBlendAttachment, ColorBlending);
+		InputAssembly.topology = IsLinePrim ? VK_PRIMITIVE_TOPOLOGY_LINE_LIST : VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+
+		VkPipelineLayoutCreateInfo PipelineLayoutInfo{};
+		PipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+		PipelineLayoutInfo.setLayoutCount = (HasSampler || ForceRequireDescriptors) ? aSetLayouts.size() : 0;
+		PipelineLayoutInfo.pSetLayouts = (HasSampler || ForceRequireDescriptors) && !aSetLayouts.empty() ? aSetLayouts.data() : nullptr;
+
+		PipelineLayoutInfo.pushConstantRangeCount = aPushConstants.size();
+		PipelineLayoutInfo.pPushConstantRanges = !aPushConstants.empty() ? aPushConstants.data() : nullptr;
+
+		VkPipelineLayout &PipeLayout = GetPipeLayout(PipeContainer, HasSampler, size_t(BlendMode), size_t(DynamicMode));
+		VkPipeline &Pipeline = GetPipeline(PipeContainer, HasSampler, size_t(BlendMode), size_t(DynamicMode));
+
+		if(vkCreatePipelineLayout(m_VKDevice, &PipelineLayoutInfo, nullptr, &PipeLayout) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating pipeline layout failed.");
+			return false;
+		}
+
+		VkGraphicsPipelineCreateInfo PipelineInfo{};
+		PipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
+		PipelineInfo.stageCount = 2;
+		PipelineInfo.pStages = aShaderStages;
+		PipelineInfo.pVertexInputState = &VertexInputInfo;
+		PipelineInfo.pInputAssemblyState = &InputAssembly;
+		PipelineInfo.pViewportState = &ViewportState;
+		PipelineInfo.pRasterizationState = &Rasterizer;
+		PipelineInfo.pMultisampleState = &Multisampling;
+		PipelineInfo.pColorBlendState = &ColorBlending;
+		PipelineInfo.layout = PipeLayout;
+		PipelineInfo.renderPass = m_VKRenderPass;
+		PipelineInfo.subpass = 0;
+		PipelineInfo.basePipelineHandle = VK_NULL_HANDLE;
+
+		std::array<VkDynamicState, 2> aDynamicStates = {
+			VK_DYNAMIC_STATE_VIEWPORT,
+			VK_DYNAMIC_STATE_SCISSOR,
+		};
+
+		VkPipelineDynamicStateCreateInfo DynamicStateCreate{};
+		DynamicStateCreate.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
+		DynamicStateCreate.dynamicStateCount = aDynamicStates.size();
+		DynamicStateCreate.pDynamicStates = aDynamicStates.data();
+
+		if(DynamicMode == VULKAN_BACKEND_CLIP_MODE_DYNAMIC_SCISSOR_AND_VIEWPORT)
+		{
+			PipelineInfo.pDynamicState = &DynamicStateCreate;
+		}
+
+		if(vkCreateGraphicsPipelines(m_VKDevice, VK_NULL_HANDLE, 1, &PipelineInfo, nullptr, &Pipeline) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the graphic pipeline failed.");
+			return false;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateStandardGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode, bool IsLinePrim)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * (2 + 2)};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts = {m_StandardTexturedDescriptorSetLayout};
+
+		std::array<VkPushConstantRange, 1> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGPos)};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * (2 + 2) + sizeof(uint8_t) * 4, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode, IsLinePrim);
+	}
+
+	[[nodiscard]] bool CreateStandardGraphicsPipeline(const char *pVertName, const char *pFragName, bool HasSampler, bool IsLinePipe)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateStandardGraphicsPipelineImpl(pVertName, pFragName, IsLinePipe ? m_StandardLinePipeline : m_StandardPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j), IsLinePipe);
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreateStandard3DGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 2 + sizeof(uint8_t) * 4};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts = {m_Standard3DTexturedDescriptorSetLayout};
+
+		std::array<VkPushConstantRange, 1> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGPos)};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * 2 + sizeof(uint8_t) * 4 + sizeof(float) * 3, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	[[nodiscard]] bool CreateStandard3DGraphicsPipeline(const char *pVertName, const char *pFragName, bool HasSampler)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateStandard3DGraphicsPipelineImpl(pVertName, pFragName, m_Standard3DPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreateTextDescriptorSetLayout()
+	{
+		VkDescriptorSetLayoutBinding SamplerLayoutBinding{};
+		SamplerLayoutBinding.binding = 0;
+		SamplerLayoutBinding.descriptorCount = 1;
+		SamplerLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		SamplerLayoutBinding.pImmutableSamplers = nullptr;
+		SamplerLayoutBinding.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+
+		auto SamplerLayoutBinding2 = SamplerLayoutBinding;
+		SamplerLayoutBinding2.binding = 1;
+
+		std::array<VkDescriptorSetLayoutBinding, 2> aBindings = {SamplerLayoutBinding, SamplerLayoutBinding2};
+		VkDescriptorSetLayoutCreateInfo LayoutInfo{};
+		LayoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		LayoutInfo.bindingCount = aBindings.size();
+		LayoutInfo.pBindings = aBindings.data();
+
+		if(vkCreateDescriptorSetLayout(m_VKDevice, &LayoutInfo, nullptr, &m_TextDescriptorSetLayout) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating descriptor layout failed.");
+			return false;
+		}
+
+		return true;
+	}
+
+	void DestroyTextDescriptorSetLayout()
+	{
+		vkDestroyDescriptorSetLayout(m_VKDevice, m_TextDescriptorSetLayout, nullptr);
+	}
+
+	[[nodiscard]] bool CreateTextGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * (2 + 2)};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts = {m_TextDescriptorSetLayout};
+
+		std::array<VkPushConstantRange, 2> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGTextPos)};
+		aPushConstants[1] = {VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformGTextPos) + sizeof(SUniformTextGFragmentOffset), sizeof(SUniformTextGFragmentConstants)};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * (2 + 2) + sizeof(uint8_t) * 4, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	[[nodiscard]] bool CreateTextGraphicsPipeline(const char *pVertName, const char *pFragName)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = VULKAN_BACKEND_TEXTURE_MODE_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateTextGraphicsPipelineImpl(pVertName, pFragName, m_TextPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	template<bool HasSampler>
+	[[nodiscard]] bool CreateTileGraphicsPipelineImpl(const char *pVertName, const char *pFragName, bool IsBorder, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, HasSampler ? 2 : 1> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		if(HasSampler)
+			aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R8G8B8A8_UINT, sizeof(float) * 2};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts;
+		aSetLayouts[0] = m_Standard3DTexturedDescriptorSetLayout;
+
+		uint32_t VertPushConstantSize = sizeof(SUniformTileGPos);
+		if(IsBorder)
+			VertPushConstantSize = sizeof(SUniformTileGPosBorder);
+
+		uint32_t FragPushConstantSize = sizeof(SUniformTileGVertColor);
+
+		std::array<VkPushConstantRange, 2> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, VertPushConstantSize};
+		aPushConstants[1] = {VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformTileGPosBorder) + sizeof(SUniformTileGVertColorAlign), FragPushConstantSize};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, HasSampler ? (sizeof(float) * 2 + sizeof(uint8_t) * 4) : (sizeof(float) * 2), aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	template<bool HasSampler>
+	[[nodiscard]] bool CreateTileGraphicsPipeline(const char *pVertName, const char *pFragName, bool IsBorder)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateTileGraphicsPipelineImpl<HasSampler>(pVertName, pFragName, IsBorder, !IsBorder ? m_TilePipeline : m_TileBorderPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreatePrimExGraphicsPipelineImpl(const char *pVertName, const char *pFragName, bool Rotationless, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * (2 + 2)};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts;
+		aSetLayouts[0] = m_StandardTexturedDescriptorSetLayout;
+		uint32_t VertPushConstantSize = sizeof(SUniformPrimExGPos);
+		if(Rotationless)
+			VertPushConstantSize = sizeof(SUniformPrimExGPosRotationless);
+
+		uint32_t FragPushConstantSize = sizeof(SUniformPrimExGVertColor);
+
+		std::array<VkPushConstantRange, 2> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, VertPushConstantSize};
+		aPushConstants[1] = {VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformPrimExGPos) + sizeof(SUniformPrimExGVertColorAlign), FragPushConstantSize};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * (2 + 2) + sizeof(uint8_t) * 4, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	[[nodiscard]] bool CreatePrimExGraphicsPipeline(const char *pVertName, const char *pFragName, bool HasSampler, bool Rotationless)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreatePrimExGraphicsPipelineImpl(pVertName, pFragName, Rotationless, Rotationless ? m_PrimExRotationlessPipeline : m_PrimExPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreateUniformDescriptorSetLayout(VkDescriptorSetLayout &SetLayout, VkShaderStageFlags StageFlags)
+	{
+		VkDescriptorSetLayoutBinding SamplerLayoutBinding{};
+		SamplerLayoutBinding.binding = 1;
+		SamplerLayoutBinding.descriptorCount = 1;
+		SamplerLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		SamplerLayoutBinding.pImmutableSamplers = nullptr;
+		SamplerLayoutBinding.stageFlags = StageFlags;
+
+		std::array<VkDescriptorSetLayoutBinding, 1> aBindings = {SamplerLayoutBinding};
+		VkDescriptorSetLayoutCreateInfo LayoutInfo{};
+		LayoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		LayoutInfo.bindingCount = aBindings.size();
+		LayoutInfo.pBindings = aBindings.data();
+
+		if(vkCreateDescriptorSetLayout(m_VKDevice, &LayoutInfo, nullptr, &SetLayout) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating descriptor layout failed.");
+			return false;
+		}
+		return true;
+	}
+
+	[[nodiscard]] bool CreateSpriteMultiUniformDescriptorSetLayout()
+	{
+		return CreateUniformDescriptorSetLayout(m_SpriteMultiUniformDescriptorSetLayout, VK_SHADER_STAGE_VERTEX_BIT);
+	}
+
+	[[nodiscard]] bool CreateQuadUniformDescriptorSetLayout()
+	{
+		return CreateUniformDescriptorSetLayout(m_QuadUniformDescriptorSetLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT);
+	}
+
+	void DestroyUniformDescriptorSetLayouts()
+	{
+		vkDestroyDescriptorSetLayout(m_VKDevice, m_QuadUniformDescriptorSetLayout, nullptr);
+		vkDestroyDescriptorSetLayout(m_VKDevice, m_SpriteMultiUniformDescriptorSetLayout, nullptr);
+	}
+
+	[[nodiscard]] bool CreateUniformDescriptorSets(size_t RenderThreadIndex, VkDescriptorSetLayout &SetLayout, SDeviceDescriptorSet *pSets, size_t SetCount, VkBuffer BindBuffer, size_t SingleBufferInstanceSize, VkDeviceSize MemoryOffset)
+	{
+		VkDescriptorPool RetDescr;
+		if(!GetDescriptorPoolForAlloc(RetDescr, m_vUniformBufferDescrPools[RenderThreadIndex], pSets, SetCount))
+			return false;
+		VkDescriptorSetAllocateInfo DesAllocInfo{};
+		DesAllocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+		DesAllocInfo.descriptorSetCount = 1;
+		DesAllocInfo.pSetLayouts = &SetLayout;
+		for(size_t i = 0; i < SetCount; ++i)
+		{
+			DesAllocInfo.descriptorPool = pSets[i].m_pPools->m_vPools[pSets[i].m_PoolIndex].m_Pool;
+			if(vkAllocateDescriptorSets(m_VKDevice, &DesAllocInfo, &pSets[i].m_Descriptor) != VK_SUCCESS)
+			{
+				return false;
+			}
+
+			VkDescriptorBufferInfo BufferInfo{};
+			BufferInfo.buffer = BindBuffer;
+			BufferInfo.offset = MemoryOffset + SingleBufferInstanceSize * i;
+			BufferInfo.range = SingleBufferInstanceSize;
+
+			std::array<VkWriteDescriptorSet, 1> aDescriptorWrites{};
+
+			aDescriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+			aDescriptorWrites[0].dstSet = pSets[i].m_Descriptor;
+			aDescriptorWrites[0].dstBinding = 1;
+			aDescriptorWrites[0].dstArrayElement = 0;
+			aDescriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+			aDescriptorWrites[0].descriptorCount = 1;
+			aDescriptorWrites[0].pBufferInfo = &BufferInfo;
+
+			vkUpdateDescriptorSets(m_VKDevice, static_cast<uint32_t>(aDescriptorWrites.size()), aDescriptorWrites.data(), 0, nullptr);
+		}
+
+		return true;
+	}
+
+	void DestroyUniformDescriptorSets(SDeviceDescriptorSet *pSets, size_t SetCount)
+	{
+		for(size_t i = 0; i < SetCount; ++i)
+		{
+			vkFreeDescriptorSets(m_VKDevice, pSets[i].m_pPools->m_vPools[pSets[i].m_PoolIndex].m_Pool, 1, &pSets[i].m_Descriptor);
+			pSets[i].m_Descriptor = VK_NULL_HANDLE;
+		}
+	}
+
+	[[nodiscard]] bool CreateSpriteMultiGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * (2 + 2)};
+
+		std::array<VkDescriptorSetLayout, 2> aSetLayouts;
+		aSetLayouts[0] = m_StandardTexturedDescriptorSetLayout;
+		aSetLayouts[1] = m_SpriteMultiUniformDescriptorSetLayout;
+
+		uint32_t VertPushConstantSize = sizeof(SUniformSpriteMultiGPos);
+		uint32_t FragPushConstantSize = sizeof(SUniformSpriteMultiGVertColor);
+
+		std::array<VkPushConstantRange, 2> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, VertPushConstantSize};
+		aPushConstants[1] = {VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformSpriteMultiGPos) + sizeof(SUniformSpriteMultiGVertColorAlign), FragPushConstantSize};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * (2 + 2) + sizeof(uint8_t) * 4, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	[[nodiscard]] bool CreateSpriteMultiGraphicsPipeline(const char *pVertName, const char *pFragName)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = VULKAN_BACKEND_TEXTURE_MODE_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateSpriteMultiGraphicsPipelineImpl(pVertName, pFragName, m_SpriteMultiPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreateSpriteMultiPushGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, 3> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 2};
+		aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * (2 + 2)};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts;
+		aSetLayouts[0] = m_StandardTexturedDescriptorSetLayout;
+
+		uint32_t VertPushConstantSize = sizeof(SUniformSpriteMultiPushGPos);
+		uint32_t FragPushConstantSize = sizeof(SUniformSpriteMultiPushGVertColor);
+
+		std::array<VkPushConstantRange, 2> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, VertPushConstantSize};
+		aPushConstants[1] = {VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformSpriteMultiPushGPos), FragPushConstantSize};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * (2 + 2) + sizeof(uint8_t) * 4, aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	[[nodiscard]] bool CreateSpriteMultiPushGraphicsPipeline(const char *pVertName, const char *pFragName)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = VULKAN_BACKEND_TEXTURE_MODE_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateSpriteMultiPushGraphicsPipelineImpl(pVertName, pFragName, m_SpriteMultiPushPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	template<bool IsTextured>
+	[[nodiscard]] bool CreateQuadGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, IsTextured ? 3 : 2> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32B32A32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * 4};
+		if(IsTextured)
+			aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 4 + sizeof(uint8_t) * 4};
+
+		std::array<VkDescriptorSetLayout, IsTextured ? 2 : 1> aSetLayouts;
+		if(IsTextured)
+		{
+			aSetLayouts[0] = m_StandardTexturedDescriptorSetLayout;
+			aSetLayouts[1] = m_QuadUniformDescriptorSetLayout;
+		}
+		else
+		{
+			aSetLayouts[0] = m_QuadUniformDescriptorSetLayout;
+		}
+
+		uint32_t PushConstantSize = sizeof(SUniformQuadGPos);
+
+		std::array<VkPushConstantRange, 1> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT, 0, PushConstantSize};
+
+		return CreateGraphicsPipeline<true>(pVertName, pFragName, PipeContainer, sizeof(float) * 4 + sizeof(uint8_t) * 4 + (IsTextured ? (sizeof(float) * 2) : 0), aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	template<bool HasSampler>
+	[[nodiscard]] bool CreateQuadGraphicsPipeline(const char *pVertName, const char *pFragName)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateQuadGraphicsPipelineImpl<HasSampler>(pVertName, pFragName, m_QuadPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	template<bool IsTextured>
+	[[nodiscard]] bool CreateQuadPushGraphicsPipelineImpl(const char *pVertName, const char *pFragName, SPipelineContainer &PipeContainer, EVulkanBackendTextureModes TexMode, EVulkanBackendBlendModes BlendMode, EVulkanBackendClipModes DynamicMode)
+	{
+		std::array<VkVertexInputAttributeDescription, IsTextured ? 3 : 2> aAttributeDescriptions = {};
+		aAttributeDescriptions[0] = {0, 0, VK_FORMAT_R32G32B32A32_SFLOAT, 0};
+		aAttributeDescriptions[1] = {1, 0, VK_FORMAT_R8G8B8A8_UNORM, sizeof(float) * 4};
+		if(IsTextured)
+			aAttributeDescriptions[2] = {2, 0, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 4 + sizeof(uint8_t) * 4};
+
+		std::array<VkDescriptorSetLayout, 1> aSetLayouts;
+		aSetLayouts[0] = m_StandardTexturedDescriptorSetLayout;
+
+		uint32_t PushConstantSize = sizeof(SUniformQuadPushGPos);
+
+		std::array<VkPushConstantRange, 1> aPushConstants{};
+		aPushConstants[0] = {VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, PushConstantSize};
+
+		return CreateGraphicsPipeline<false>(pVertName, pFragName, PipeContainer, sizeof(float) * 4 + sizeof(uint8_t) * 4 + (IsTextured ? (sizeof(float) * 2) : 0), aAttributeDescriptions, aSetLayouts, aPushConstants, TexMode, BlendMode, DynamicMode);
+	}
+
+	template<bool HasSampler>
+	[[nodiscard]] bool CreateQuadPushGraphicsPipeline(const char *pVertName, const char *pFragName)
+	{
+		bool Ret = true;
+
+		EVulkanBackendTextureModes TexMode = HasSampler ? VULKAN_BACKEND_TEXTURE_MODE_TEXTURED : VULKAN_BACKEND_TEXTURE_MODE_NOT_TEXTURED;
+
+		for(size_t i = 0; i < VULKAN_BACKEND_BLEND_MODE_COUNT; ++i)
+		{
+			for(size_t j = 0; j < VULKAN_BACKEND_CLIP_MODE_COUNT; ++j)
+			{
+				Ret &= CreateQuadPushGraphicsPipelineImpl<HasSampler>(pVertName, pFragName, m_QuadPushPipeline, TexMode, EVulkanBackendBlendModes(i), EVulkanBackendClipModes(j));
+			}
+		}
+
+		return Ret;
+	}
+
+	[[nodiscard]] bool CreateCommandPool()
+	{
+		VkCommandPoolCreateInfo CreatePoolInfo{};
+		CreatePoolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
+		CreatePoolInfo.queueFamilyIndex = m_VKGraphicsQueueIndex;
+		CreatePoolInfo.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
+
+		m_vCommandPools.resize(m_ThreadCount);
+		for(size_t i = 0; i < m_ThreadCount; ++i)
+		{
+			if(vkCreateCommandPool(m_VKDevice, &CreatePoolInfo, nullptr, &m_vCommandPools[i]) != VK_SUCCESS)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the command pool failed.");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	void DestroyCommandPool()
+	{
+		for(size_t i = 0; i < m_ThreadCount; ++i)
+		{
+			vkDestroyCommandPool(m_VKDevice, m_vCommandPools[i], nullptr);
+		}
+	}
+
+	[[nodiscard]] bool CreateCommandBuffers()
+	{
+		m_vMainDrawCommandBuffers.resize(m_SwapChainImageCount);
+		if(m_ThreadCount > 1)
+		{
+			m_vvThreadDrawCommandBuffers.resize(m_ThreadCount);
+			m_vvUsedThreadDrawCommandBuffer.resize(m_ThreadCount);
+			m_vHelperThreadDrawCommandBuffers.resize(m_ThreadCount);
+			for(auto &ThreadDrawCommandBuffers : m_vvThreadDrawCommandBuffers)
+			{
+				ThreadDrawCommandBuffers.resize(m_SwapChainImageCount);
+			}
+			for(auto &UsedThreadDrawCommandBuffer : m_vvUsedThreadDrawCommandBuffer)
+			{
+				UsedThreadDrawCommandBuffer.resize(m_SwapChainImageCount, false);
+			}
+		}
+		m_vMemoryCommandBuffers.resize(m_SwapChainImageCount);
+		m_vUsedMemoryCommandBuffer.resize(m_SwapChainImageCount, false);
+
+		VkCommandBufferAllocateInfo AllocInfo{};
+		AllocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+		AllocInfo.commandPool = m_vCommandPools[0];
+		AllocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+		AllocInfo.commandBufferCount = (uint32_t)m_vMainDrawCommandBuffers.size();
+
+		if(vkAllocateCommandBuffers(m_VKDevice, &AllocInfo, m_vMainDrawCommandBuffers.data()) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Allocating command buffers failed.");
+			return false;
+		}
+
+		AllocInfo.commandBufferCount = (uint32_t)m_vMemoryCommandBuffers.size();
+
+		if(vkAllocateCommandBuffers(m_VKDevice, &AllocInfo, m_vMemoryCommandBuffers.data()) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Allocating memory command buffers failed.");
+			return false;
+		}
+
+		if(m_ThreadCount > 1)
+		{
+			size_t Count = 0;
+			for(auto &ThreadDrawCommandBuffers : m_vvThreadDrawCommandBuffers)
+			{
+				AllocInfo.commandPool = m_vCommandPools[Count];
+				++Count;
+				AllocInfo.commandBufferCount = (uint32_t)ThreadDrawCommandBuffers.size();
+				AllocInfo.level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
+				if(vkAllocateCommandBuffers(m_VKDevice, &AllocInfo, ThreadDrawCommandBuffers.data()) != VK_SUCCESS)
+				{
+					SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Allocating thread command buffers failed.");
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	void DestroyCommandBuffer()
+	{
+		if(m_ThreadCount > 1)
+		{
+			size_t Count = 0;
+			for(auto &ThreadDrawCommandBuffers : m_vvThreadDrawCommandBuffers)
+			{
+				vkFreeCommandBuffers(m_VKDevice, m_vCommandPools[Count], static_cast<uint32_t>(ThreadDrawCommandBuffers.size()), ThreadDrawCommandBuffers.data());
+				++Count;
+			}
+		}
+
+		vkFreeCommandBuffers(m_VKDevice, m_vCommandPools[0], static_cast<uint32_t>(m_vMemoryCommandBuffers.size()), m_vMemoryCommandBuffers.data());
+		vkFreeCommandBuffers(m_VKDevice, m_vCommandPools[0], static_cast<uint32_t>(m_vMainDrawCommandBuffers.size()), m_vMainDrawCommandBuffers.data());
+
+		m_vvThreadDrawCommandBuffers.clear();
+		m_vvUsedThreadDrawCommandBuffer.clear();
+		m_vHelperThreadDrawCommandBuffers.clear();
+
+		m_vMainDrawCommandBuffers.clear();
+		m_vMemoryCommandBuffers.clear();
+		m_vUsedMemoryCommandBuffer.clear();
+	}
+
+	[[nodiscard]] bool CreateSyncObjects()
+	{
+		m_vWaitSemaphores.resize(m_SwapChainImageCount);
+		m_vSigSemaphores.resize(m_SwapChainImageCount);
+
+		m_vMemorySemaphores.resize(m_SwapChainImageCount);
+
+		m_vFrameFences.resize(m_SwapChainImageCount);
+		m_vImagesFences.resize(m_SwapChainImageCount, VK_NULL_HANDLE);
+
+		VkSemaphoreCreateInfo CreateSemaphoreInfo{};
+		CreateSemaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+
+		VkFenceCreateInfo FenceInfo{};
+		FenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+		FenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+
+		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		{
+			if(vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vWaitSemaphores[i]) != VK_SUCCESS ||
+				vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vSigSemaphores[i]) != VK_SUCCESS ||
+				vkCreateSemaphore(m_VKDevice, &CreateSemaphoreInfo, nullptr, &m_vMemorySemaphores[i]) != VK_SUCCESS ||
+				vkCreateFence(m_VKDevice, &FenceInfo, nullptr, &m_vFrameFences[i]) != VK_SUCCESS)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating swap chain sync objects(fences, semaphores) failed.");
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	void DestroySyncObjects()
+	{
+		for(size_t i = 0; i < m_SwapChainImageCount; i++)
+		{
+			vkDestroySemaphore(m_VKDevice, m_vWaitSemaphores[i], nullptr);
+			vkDestroySemaphore(m_VKDevice, m_vSigSemaphores[i], nullptr);
+			vkDestroySemaphore(m_VKDevice, m_vMemorySemaphores[i], nullptr);
+			vkDestroyFence(m_VKDevice, m_vFrameFences[i], nullptr);
+		}
+
+		m_vWaitSemaphores.clear();
+		m_vSigSemaphores.clear();
+
+		m_vMemorySemaphores.clear();
+
+		m_vFrameFences.clear();
+		m_vImagesFences.clear();
+	}
+
+	void DestroyBufferOfFrame(size_t ImageIndex, SFrameBuffers &Buffer)
+	{
+		CleanBufferPair(ImageIndex, Buffer.m_Buffer, Buffer.m_BufferMem);
+	}
+
+	void DestroyUniBufferOfFrame(size_t ImageIndex, SFrameUniformBuffers &Buffer)
+	{
+		CleanBufferPair(ImageIndex, Buffer.m_Buffer, Buffer.m_BufferMem);
+		for(auto &DescrSet : Buffer.m_aUniformSets)
+		{
+			if(DescrSet.m_Descriptor != VK_NULL_HANDLE)
+			{
+				DestroyUniformDescriptorSets(&DescrSet, 1);
+			}
+		}
+	}
+
+	/*************
+	* SWAP CHAIN
+	**************/
+
+	void CleanupVulkanSwapChain(bool ForceSwapChainDestruct)
+	{
+		m_StandardPipeline.Destroy(m_VKDevice);
+		m_StandardLinePipeline.Destroy(m_VKDevice);
+		m_Standard3DPipeline.Destroy(m_VKDevice);
+		m_TextPipeline.Destroy(m_VKDevice);
+		m_TilePipeline.Destroy(m_VKDevice);
+		m_TileBorderPipeline.Destroy(m_VKDevice);
+		m_PrimExPipeline.Destroy(m_VKDevice);
+		m_PrimExRotationlessPipeline.Destroy(m_VKDevice);
+		m_SpriteMultiPipeline.Destroy(m_VKDevice);
+		m_SpriteMultiPushPipeline.Destroy(m_VKDevice);
+		m_QuadPipeline.Destroy(m_VKDevice);
+		m_QuadPushPipeline.Destroy(m_VKDevice);
+
+		DestroyFramebuffers();
+
+		DestroyRenderPass();
+
+		DestroyMultiSamplerImageAttachments();
+
+		DestroyImageViews();
+		ClearSwapChainImageHandles();
+
+		DestroySwapChain(ForceSwapChainDestruct);
+
+		m_SwapchainCreated = false;
+	}
+
+	template<bool IsLastCleanup>
+	void CleanupVulkan()
+	{
+		if(IsLastCleanup)
+		{
+			if(m_SwapchainCreated)
+				CleanupVulkanSwapChain(true);
+
+			// clean all images, buffers, buffer containers
+			for(auto &Texture : m_vTextures)
+			{
+				if(Texture.m_VKTextDescrSet.m_Descriptor != VK_NULL_HANDLE && IsVerbose())
+				{
+					dbg_msg("vulkan", "text textures not cleared over cmd.");
+				}
+				DestroyTexture(Texture);
+			}
+
+			for(auto &BufferObject : m_vBufferObjects)
+			{
+				if(!BufferObject.m_IsStreamedBuffer)
+					FreeVertexMemBlock(BufferObject.m_BufferObject.m_Mem);
+			}
+
+			m_vBufferContainers.clear();
+		}
+
+		m_vImageLastFrameCheck.clear();
+
+		m_vLastPipeline.clear();
+
+		for(size_t i = 0; i < m_ThreadCount; ++i)
+		{
+			m_vStreamedVertexBuffers[i].Destroy([&](size_t ImageIndex, SFrameBuffers &Buffer) { DestroyBufferOfFrame(ImageIndex, Buffer); });
+			m_vStreamedUniformBuffers[i].Destroy([&](size_t ImageIndex, SFrameUniformBuffers &Buffer) { DestroyUniBufferOfFrame(ImageIndex, Buffer); });
+		}
+		m_vStreamedVertexBuffers.clear();
+		m_vStreamedUniformBuffers.clear();
+
+		for(size_t i = 0; i < m_SwapChainImageCount; ++i)
+		{
+			ClearFrameData(i);
+		}
+
+		m_vvFrameDelayedBufferCleanup.clear();
+		m_vvFrameDelayedTextureCleanup.clear();
+		m_vvFrameDelayedTextTexturesCleanup.clear();
+
+		m_StagingBufferCache.DestroyFrameData(m_SwapChainImageCount);
+		m_StagingBufferCacheImage.DestroyFrameData(m_SwapChainImageCount);
+		m_VertexBufferCache.DestroyFrameData(m_SwapChainImageCount);
+		for(auto &ImageBufferCache : m_ImageBufferCaches)
+			ImageBufferCache.second.DestroyFrameData(m_SwapChainImageCount);
+
+		if(IsLastCleanup)
+		{
+			m_StagingBufferCache.Destroy(m_VKDevice);
+			m_StagingBufferCacheImage.Destroy(m_VKDevice);
+			m_VertexBufferCache.Destroy(m_VKDevice);
+			for(auto &ImageBufferCache : m_ImageBufferCaches)
+				ImageBufferCache.second.Destroy(m_VKDevice);
+
+			m_ImageBufferCaches.clear();
+
+			DestroyTextureSamplers();
+			DestroyDescriptorPools();
+
+			DeletePresentedImageDataImage();
+		}
+
+		DestroySyncObjects();
+		DestroyCommandBuffer();
+
+		if(IsLastCleanup)
+		{
+			DestroyCommandPool();
+		}
+
+		if(IsLastCleanup)
+		{
+			DestroyUniformDescriptorSetLayouts();
+			DestroyTextDescriptorSetLayout();
+			DestroyDescriptorSetLayouts();
+		}
+	}
+
+	void CleanupVulkanSDL()
+	{
+		if(m_VKInstance != VK_NULL_HANDLE)
+		{
+			DestroySurface();
+			vkDestroyDevice(m_VKDevice, nullptr);
+
+			if(g_Config.m_DbgGfx == DEBUG_GFX_MODE_MINIMUM || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL)
+			{
+				UnregisterDebugCallback();
+			}
+			vkDestroyInstance(m_VKInstance, nullptr);
+			m_VKInstance = VK_NULL_HANDLE;
+		}
+	}
+
+	int RecreateSwapChain()
+	{
+		int Ret = 0;
+		vkDeviceWaitIdle(m_VKDevice);
+
+		if(IsVerbose())
+		{
+			dbg_msg("vulkan", "recreating swap chain.");
+		}
+
+		VkSwapchainKHR OldSwapChain = VK_NULL_HANDLE;
+		uint32_t OldSwapChainImageCount = m_SwapChainImageCount;
+
+		if(m_SwapchainCreated)
+			CleanupVulkanSwapChain(false);
+
+		// set new multi sampling if it was requested
+		if(m_NextMultiSamplingCount != std::numeric_limits<uint32_t>::max())
+		{
+			m_MultiSamplingCount = m_NextMultiSamplingCount;
+			m_NextMultiSamplingCount = std::numeric_limits<uint32_t>::max();
+		}
+
+		if(!m_SwapchainCreated)
+			Ret = InitVulkanSwapChain(OldSwapChain);
+
+		if(OldSwapChainImageCount != m_SwapChainImageCount)
+		{
+			CleanupVulkan<false>();
+			InitVulkan<false>();
+		}
+
+		if(OldSwapChain != VK_NULL_HANDLE)
+		{
+			vkDestroySwapchainKHR(m_VKDevice, OldSwapChain, nullptr);
+		}
+
+		if(Ret != 0 && IsVerbose())
+		{
+			dbg_msg("vulkan", "recreating swap chain failed.");
+		}
+
+		return Ret;
+	}
+
+	int InitVulkanSDL(SDL_Window *pWindow, uint32_t CanvasWidth, uint32_t CanvasHeight, char *pRendererString, char *pVendorString, char *pVersionString)
+	{
+		std::vector<std::string> vVKExtensions;
+		std::vector<std::string> vVKLayers;
+
+		m_CanvasWidth = CanvasWidth;
+		m_CanvasHeight = CanvasHeight;
+
+		if(!GetVulkanExtensions(pWindow, vVKExtensions))
+			return -1;
+
+		if(!GetVulkanLayers(vVKLayers))
+			return -1;
+
+		if(!CreateVulkanInstance(vVKLayers, vVKExtensions, true))
+			return -1;
+
+		if(g_Config.m_DbgGfx == DEBUG_GFX_MODE_MINIMUM || g_Config.m_DbgGfx == DEBUG_GFX_MODE_ALL)
+		{
+			SetupDebugCallback();
+
+			for(auto &VKLayer : vVKLayers)
+			{
+				dbg_msg("vulkan", "Validation layer: %s", VKLayer.c_str());
+			}
+		}
+
+		if(!SelectGPU(pRendererString, pVendorString, pVersionString))
+			return -1;
+
+		if(!CreateLogicalDevice(vVKLayers))
+			return -1;
+
+		GetDeviceQueue();
+
+		if(!CreateSurface(pWindow))
+			return -1;
+
+		return 0;
+	}
+
+	/************************
+	* MEMORY MANAGEMENT
+	************************/
+
+	uint32_t FindMemoryType(VkPhysicalDevice PhyDevice, uint32_t TypeFilter, VkMemoryPropertyFlags Properties)
+	{
+		VkPhysicalDeviceMemoryProperties MemProperties;
+		vkGetPhysicalDeviceMemoryProperties(PhyDevice, &MemProperties);
+
+		for(uint32_t i = 0; i < MemProperties.memoryTypeCount; i++)
+		{
+			if((TypeFilter & (1 << i)) && (MemProperties.memoryTypes[i].propertyFlags & Properties) == Properties)
+			{
+				return i;
+			}
+		}
+
+		return 0;
+	}
+
+	[[nodiscard]] bool CreateBuffer(VkDeviceSize BufferSize, EMemoryBlockUsage MemUsage, VkBufferUsageFlags BufferUsage, VkMemoryPropertyFlags MemoryProperties, VkBuffer &VKBuffer, SDeviceMemoryBlock &VKBufferMemory)
+	{
+		VkBufferCreateInfo BufferInfo{};
+		BufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+		BufferInfo.size = BufferSize;
+		BufferInfo.usage = BufferUsage;
+		BufferInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+
+		if(vkCreateBuffer(m_VKDevice, &BufferInfo, nullptr, &VKBuffer) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER, "Buffer creation failed.",
+				GetMemoryUsageShort());
+			return false;
+		}
+
+		VkMemoryRequirements MemRequirements;
+		vkGetBufferMemoryRequirements(m_VKDevice, VKBuffer, &MemRequirements);
+
+		VkMemoryAllocateInfo MemAllocInfo{};
+		MemAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+		MemAllocInfo.allocationSize = MemRequirements.size;
+		MemAllocInfo.memoryTypeIndex = FindMemoryType(m_VKGPU, MemRequirements.memoryTypeBits, MemoryProperties);
+
+		VKBufferMemory.m_Size = MemRequirements.size;
+
+		if(MemUsage == MEMORY_BLOCK_USAGE_BUFFER)
+			m_pBufferMemoryUsage->store(m_pBufferMemoryUsage->load(std::memory_order_relaxed) + MemRequirements.size, std::memory_order_relaxed);
+		else if(MemUsage == MEMORY_BLOCK_USAGE_STAGING)
+			m_pStagingMemoryUsage->store(m_pStagingMemoryUsage->load(std::memory_order_relaxed) + MemRequirements.size, std::memory_order_relaxed);
+		else if(MemUsage == MEMORY_BLOCK_USAGE_STREAM)
+			m_pStreamMemoryUsage->store(m_pStreamMemoryUsage->load(std::memory_order_relaxed) + MemRequirements.size, std::memory_order_relaxed);
+
+		if(IsVerbose())
+		{
+			VerboseAllocatedMemory(MemRequirements.size, m_CurImageIndex, MemUsage);
+		}
+
+		if(!AllocateVulkanMemory(&MemAllocInfo, &VKBufferMemory.m_Mem))
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER, "Allocation for buffer object failed.",
+				GetMemoryUsageShort());
+			return false;
+		}
+
+		VKBufferMemory.m_UsageType = MemUsage;
+
+		if(vkBindBufferMemory(m_VKDevice, VKBuffer, VKBufferMemory.m_Mem, 0) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER, "Binding memory to buffer failed.",
+				GetMemoryUsageShort());
+			return false;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool AllocateDescriptorPool(SDeviceDescriptorPools &DescriptorPools, size_t AllocPoolSize)
+	{
+		SDeviceDescriptorPool NewPool;
+		NewPool.m_Size = AllocPoolSize;
+
+		VkDescriptorPoolSize PoolSize{};
+		if(DescriptorPools.m_IsUniformPool)
+			PoolSize.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		else
+			PoolSize.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		PoolSize.descriptorCount = AllocPoolSize;
+
+		VkDescriptorPoolCreateInfo PoolInfo{};
+		PoolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+		PoolInfo.poolSizeCount = 1;
+		PoolInfo.pPoolSizes = &PoolSize;
+		PoolInfo.maxSets = AllocPoolSize;
+		PoolInfo.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
+
+		if(vkCreateDescriptorPool(m_VKDevice, &PoolInfo, nullptr, &NewPool.m_Pool) != VK_SUCCESS)
+		{
+			SetError(EGfxErrorType::GFX_ERROR_TYPE_INIT, "Creating the descriptor pool failed.");
+			return false;
+		}
+
+		DescriptorPools.m_vPools.push_back(NewPool);
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateDescriptorPools()
+	{
+		m_StandardTextureDescrPool.m_IsUniformPool = false;
+		m_StandardTextureDescrPool.m_DefaultAllocSize = 1024;
+		m_TextTextureDescrPool.m_IsUniformPool = false;
+		m_TextTextureDescrPool.m_DefaultAllocSize = 8;
+
+		m_vUniformBufferDescrPools.resize(m_ThreadCount);
+		for(auto &UniformBufferDescrPool : m_vUniformBufferDescrPools)
+		{
+			UniformBufferDescrPool.m_IsUniformPool = true;
+			UniformBufferDescrPool.m_DefaultAllocSize = 512;
+		}
+
+		bool Ret = AllocateDescriptorPool(m_StandardTextureDescrPool, CCommandBuffer::MAX_TEXTURES);
+		Ret |= AllocateDescriptorPool(m_TextTextureDescrPool, 8);
+
+		for(auto &UniformBufferDescrPool : m_vUniformBufferDescrPools)
+		{
+			Ret |= AllocateDescriptorPool(UniformBufferDescrPool, 64);
+		}
+
+		return Ret;
+	}
+
+	void DestroyDescriptorPools()
+	{
+		for(auto &DescrPool : m_StandardTextureDescrPool.m_vPools)
+			vkDestroyDescriptorPool(m_VKDevice, DescrPool.m_Pool, nullptr);
+		for(auto &DescrPool : m_TextTextureDescrPool.m_vPools)
+			vkDestroyDescriptorPool(m_VKDevice, DescrPool.m_Pool, nullptr);
+
+		for(auto &UniformBufferDescrPool : m_vUniformBufferDescrPools)
+		{
+			for(auto &DescrPool : UniformBufferDescrPool.m_vPools)
+				vkDestroyDescriptorPool(m_VKDevice, DescrPool.m_Pool, nullptr);
+		}
+		m_vUniformBufferDescrPools.clear();
+	}
+
+	[[nodiscard]] bool GetDescriptorPoolForAlloc(VkDescriptorPool &RetDescr, SDeviceDescriptorPools &DescriptorPools, SDeviceDescriptorSet *pSets, size_t AllocNum)
+	{
+		size_t CurAllocNum = AllocNum;
+		size_t CurAllocOffset = 0;
+		RetDescr = VK_NULL_HANDLE;
+
+		while(CurAllocNum > 0)
+		{
+			size_t AllocatedInThisRun = 0;
+
+			bool Found = false;
+			size_t DescriptorPoolIndex = std::numeric_limits<size_t>::max();
+			for(size_t i = 0; i < DescriptorPools.m_vPools.size(); ++i)
+			{
+				auto &Pool = DescriptorPools.m_vPools[i];
+				if(Pool.m_CurSize + CurAllocNum < Pool.m_Size)
+				{
+					AllocatedInThisRun = CurAllocNum;
+					Pool.m_CurSize += CurAllocNum;
+					Found = true;
+					if(RetDescr == VK_NULL_HANDLE)
+						RetDescr = Pool.m_Pool;
+					DescriptorPoolIndex = i;
+					break;
+				}
+				else
+				{
+					size_t RemainingPoolCount = Pool.m_Size - Pool.m_CurSize;
+					if(RemainingPoolCount > 0)
+					{
+						AllocatedInThisRun = RemainingPoolCount;
+						Pool.m_CurSize += RemainingPoolCount;
+						Found = true;
+						if(RetDescr == VK_NULL_HANDLE)
+							RetDescr = Pool.m_Pool;
+						DescriptorPoolIndex = i;
+						break;
+					}
+				}
+			}
+
+			if(!Found)
+			{
+				DescriptorPoolIndex = DescriptorPools.m_vPools.size();
+
+				if(!AllocateDescriptorPool(DescriptorPools, DescriptorPools.m_DefaultAllocSize))
+					return false;
+
+				AllocatedInThisRun = minimum((size_t)DescriptorPools.m_DefaultAllocSize, CurAllocNum);
+
+				auto &Pool = DescriptorPools.m_vPools.back();
+				Pool.m_CurSize += AllocatedInThisRun;
+				if(RetDescr == VK_NULL_HANDLE)
+					RetDescr = Pool.m_Pool;
+			}
+
+			for(size_t i = CurAllocOffset; i < CurAllocOffset + AllocatedInThisRun; ++i)
+			{
+				pSets[i].m_pPools = &DescriptorPools;
+				pSets[i].m_PoolIndex = DescriptorPoolIndex;
+			}
+			CurAllocOffset += AllocatedInThisRun;
+			CurAllocNum -= AllocatedInThisRun;
+		}
+
+		return true;
+	}
+
+	void FreeDescriptorSetFromPool(SDeviceDescriptorSet &DescrSet)
+	{
+		if(DescrSet.m_PoolIndex != std::numeric_limits<size_t>::max())
+		{
+			vkFreeDescriptorSets(m_VKDevice, DescrSet.m_pPools->m_vPools[DescrSet.m_PoolIndex].m_Pool, 1, &DescrSet.m_Descriptor);
+			DescrSet.m_pPools->m_vPools[DescrSet.m_PoolIndex].m_CurSize -= 1;
+		}
+	}
+
+	[[nodiscard]] bool CreateNewTexturedStandardDescriptorSets(size_t TextureSlot, size_t DescrIndex)
+	{
+		auto &Texture = m_vTextures[TextureSlot];
+
+		auto &DescrSet = Texture.m_aVKStandardTexturedDescrSets[DescrIndex];
+
+		VkDescriptorSetAllocateInfo DesAllocInfo{};
+		DesAllocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+		if(!GetDescriptorPoolForAlloc(DesAllocInfo.descriptorPool, m_StandardTextureDescrPool, &DescrSet, 1))
+			return false;
+		DesAllocInfo.descriptorSetCount = 1;
+		DesAllocInfo.pSetLayouts = &m_StandardTexturedDescriptorSetLayout;
+
+		if(vkAllocateDescriptorSets(m_VKDevice, &DesAllocInfo, &DescrSet.m_Descriptor) != VK_SUCCESS)
+		{
+			return false;
+		}
+
+		VkDescriptorImageInfo ImageInfo{};
+		ImageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		ImageInfo.imageView = Texture.m_ImgView;
+		ImageInfo.sampler = Texture.m_aSamplers[DescrIndex];
+
+		std::array<VkWriteDescriptorSet, 1> aDescriptorWrites{};
+
+		aDescriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		aDescriptorWrites[0].dstSet = DescrSet.m_Descriptor;
+		aDescriptorWrites[0].dstBinding = 0;
+		aDescriptorWrites[0].dstArrayElement = 0;
+		aDescriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		aDescriptorWrites[0].descriptorCount = 1;
+		aDescriptorWrites[0].pImageInfo = &ImageInfo;
+
+		vkUpdateDescriptorSets(m_VKDevice, static_cast<uint32_t>(aDescriptorWrites.size()), aDescriptorWrites.data(), 0, nullptr);
+
+		return true;
+	}
+
+	void DestroyTexturedStandardDescriptorSets(CTexture &Texture, size_t DescrIndex)
+	{
+		auto &DescrSet = Texture.m_aVKStandardTexturedDescrSets[DescrIndex];
+		FreeDescriptorSetFromPool(DescrSet);
+		DescrSet = {};
+	}
+
+	[[nodiscard]] bool CreateNew3DTexturedStandardDescriptorSets(size_t TextureSlot)
+	{
+		auto &Texture = m_vTextures[TextureSlot];
+
+		auto &DescrSet = Texture.m_VKStandard3DTexturedDescrSet;
+
+		VkDescriptorSetAllocateInfo DesAllocInfo{};
+		DesAllocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+		if(!GetDescriptorPoolForAlloc(DesAllocInfo.descriptorPool, m_StandardTextureDescrPool, &DescrSet, 1))
+			return false;
+		DesAllocInfo.descriptorSetCount = 1;
+		DesAllocInfo.pSetLayouts = &m_Standard3DTexturedDescriptorSetLayout;
+
+		if(vkAllocateDescriptorSets(m_VKDevice, &DesAllocInfo, &DescrSet.m_Descriptor) != VK_SUCCESS)
+		{
+			return false;
+		}
+
+		VkDescriptorImageInfo ImageInfo{};
+		ImageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		ImageInfo.imageView = Texture.m_Img3DView;
+		ImageInfo.sampler = Texture.m_Sampler3D;
+
+		std::array<VkWriteDescriptorSet, 1> aDescriptorWrites{};
+
+		aDescriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		aDescriptorWrites[0].dstSet = DescrSet.m_Descriptor;
+		aDescriptorWrites[0].dstBinding = 0;
+		aDescriptorWrites[0].dstArrayElement = 0;
+		aDescriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		aDescriptorWrites[0].descriptorCount = 1;
+		aDescriptorWrites[0].pImageInfo = &ImageInfo;
+
+		vkUpdateDescriptorSets(m_VKDevice, static_cast<uint32_t>(aDescriptorWrites.size()), aDescriptorWrites.data(), 0, nullptr);
+
+		return true;
+	}
+
+	void DestroyTextured3DStandardDescriptorSets(CTexture &Texture)
+	{
+		auto &DescrSet = Texture.m_VKStandard3DTexturedDescrSet;
+		FreeDescriptorSetFromPool(DescrSet);
+	}
+
+	[[nodiscard]] bool CreateNewTextDescriptorSets(size_t Texture, size_t TextureOutline)
+	{
+		auto &TextureText = m_vTextures[Texture];
+		auto &TextureTextOutline = m_vTextures[TextureOutline];
+		auto &DescrSetText = TextureText.m_VKTextDescrSet;
+
+		VkDescriptorSetAllocateInfo DesAllocInfo{};
+		DesAllocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+		if(!GetDescriptorPoolForAlloc(DesAllocInfo.descriptorPool, m_TextTextureDescrPool, &DescrSetText, 1))
+			return false;
+		DesAllocInfo.descriptorSetCount = 1;
+		DesAllocInfo.pSetLayouts = &m_TextDescriptorSetLayout;
+
+		if(vkAllocateDescriptorSets(m_VKDevice, &DesAllocInfo, &DescrSetText.m_Descriptor) != VK_SUCCESS)
+		{
+			return false;
+		}
+
+		std::array<VkDescriptorImageInfo, 2> aImageInfo{};
+		aImageInfo[0].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		aImageInfo[0].imageView = TextureText.m_ImgView;
+		aImageInfo[0].sampler = TextureText.m_aSamplers[0];
+		aImageInfo[1].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		aImageInfo[1].imageView = TextureTextOutline.m_ImgView;
+		aImageInfo[1].sampler = TextureTextOutline.m_aSamplers[0];
+
+		std::array<VkWriteDescriptorSet, 2> aDescriptorWrites{};
+
+		aDescriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		aDescriptorWrites[0].dstSet = DescrSetText.m_Descriptor;
+		aDescriptorWrites[0].dstBinding = 0;
+		aDescriptorWrites[0].dstArrayElement = 0;
+		aDescriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		aDescriptorWrites[0].descriptorCount = 1;
+		aDescriptorWrites[0].pImageInfo = aImageInfo.data();
+		aDescriptorWrites[1] = aDescriptorWrites[0];
+		aDescriptorWrites[1].dstBinding = 1;
+		aDescriptorWrites[1].pImageInfo = &aImageInfo[1];
+
+		vkUpdateDescriptorSets(m_VKDevice, static_cast<uint32_t>(aDescriptorWrites.size()), aDescriptorWrites.data(), 0, nullptr);
+
+		return true;
+	}
+
+	void DestroyTextDescriptorSets(CTexture &Texture, CTexture &TextureOutline)
+	{
+		auto &DescrSet = Texture.m_VKTextDescrSet;
+		FreeDescriptorSetFromPool(DescrSet);
+	}
+
+	[[nodiscard]] bool HasMultiSampling() const
+	{
+		return GetSampleCount() != VK_SAMPLE_COUNT_1_BIT;
+	}
+
+	VkSampleCountFlagBits GetMaxSampleCount() const
+	{
+		if(m_MaxMultiSample & VK_SAMPLE_COUNT_64_BIT)
+			return VK_SAMPLE_COUNT_64_BIT;
+		else if(m_MaxMultiSample & VK_SAMPLE_COUNT_32_BIT)
+			return VK_SAMPLE_COUNT_32_BIT;
+		else if(m_MaxMultiSample & VK_SAMPLE_COUNT_16_BIT)
+			return VK_SAMPLE_COUNT_16_BIT;
+		else if(m_MaxMultiSample & VK_SAMPLE_COUNT_8_BIT)
+			return VK_SAMPLE_COUNT_8_BIT;
+		else if(m_MaxMultiSample & VK_SAMPLE_COUNT_4_BIT)
+			return VK_SAMPLE_COUNT_4_BIT;
+		else if(m_MaxMultiSample & VK_SAMPLE_COUNT_2_BIT)
+			return VK_SAMPLE_COUNT_2_BIT;
+
+		return VK_SAMPLE_COUNT_1_BIT;
+	}
+
+	VkSampleCountFlagBits GetSampleCount() const
+	{
+		auto MaxSampleCount = GetMaxSampleCount();
+		if(m_MultiSamplingCount >= 64 && MaxSampleCount >= VK_SAMPLE_COUNT_64_BIT)
+			return VK_SAMPLE_COUNT_64_BIT;
+		else if(m_MultiSamplingCount >= 32 && MaxSampleCount >= VK_SAMPLE_COUNT_32_BIT)
+			return VK_SAMPLE_COUNT_32_BIT;
+		else if(m_MultiSamplingCount >= 16 && MaxSampleCount >= VK_SAMPLE_COUNT_16_BIT)
+			return VK_SAMPLE_COUNT_16_BIT;
+		else if(m_MultiSamplingCount >= 8 && MaxSampleCount >= VK_SAMPLE_COUNT_8_BIT)
+			return VK_SAMPLE_COUNT_8_BIT;
+		else if(m_MultiSamplingCount >= 4 && MaxSampleCount >= VK_SAMPLE_COUNT_4_BIT)
+			return VK_SAMPLE_COUNT_4_BIT;
+		else if(m_MultiSamplingCount >= 2 && MaxSampleCount >= VK_SAMPLE_COUNT_2_BIT)
+			return VK_SAMPLE_COUNT_2_BIT;
+
+		return VK_SAMPLE_COUNT_1_BIT;
+	}
+
+	int InitVulkanSwapChain(VkSwapchainKHR &OldSwapChain)
+	{
+		OldSwapChain = VK_NULL_HANDLE;
+		if(!CreateSwapChain(OldSwapChain))
+			return -1;
+
+		if(!GetSwapChainImageHandles())
+			return -1;
+
+		if(!CreateImageViews())
+			return -1;
+
+		if(!CreateMultiSamplerImageAttachments())
+		{
+			return -1;
+		}
+
+		m_LastPresentedSwapChainImageIndex = std::numeric_limits<decltype(m_LastPresentedSwapChainImageIndex)>::max();
+
+		if(!CreateRenderPass(true))
+			return -1;
+
+		if(!CreateFramebuffers())
+			return -1;
+
+		if(!CreateStandardGraphicsPipeline("shader/vulkan/prim.vert.spv", "shader/vulkan/prim.frag.spv", false, false))
+			return -1;
+
+		if(!CreateStandardGraphicsPipeline("shader/vulkan/prim_textured.vert.spv", "shader/vulkan/prim_textured.frag.spv", true, false))
+			return -1;
+
+		if(!CreateStandardGraphicsPipeline("shader/vulkan/prim.vert.spv", "shader/vulkan/prim.frag.spv", false, true))
+			return -1;
+
+		if(!CreateStandard3DGraphicsPipeline("shader/vulkan/prim3d.vert.spv", "shader/vulkan/prim3d.frag.spv", false))
+			return -1;
+
+		if(!CreateStandard3DGraphicsPipeline("shader/vulkan/prim3d_textured.vert.spv", "shader/vulkan/prim3d_textured.frag.spv", true))
+			return -1;
+
+		if(!CreateTextGraphicsPipeline("shader/vulkan/text.vert.spv", "shader/vulkan/text.frag.spv"))
+			return -1;
+
+		if(!CreateTileGraphicsPipeline<false>("shader/vulkan/tile.vert.spv", "shader/vulkan/tile.frag.spv", false))
+			return -1;
+
+		if(!CreateTileGraphicsPipeline<true>("shader/vulkan/tile_textured.vert.spv", "shader/vulkan/tile_textured.frag.spv", false))
+			return -1;
+
+		if(!CreateTileGraphicsPipeline<false>("shader/vulkan/tile_border.vert.spv", "shader/vulkan/tile_border.frag.spv", true))
+			return -1;
+
+		if(!CreateTileGraphicsPipeline<true>("shader/vulkan/tile_border_textured.vert.spv", "shader/vulkan/tile_border_textured.frag.spv", true))
+			return -1;
+
+		if(!CreatePrimExGraphicsPipeline("shader/vulkan/primex_rotationless.vert.spv", "shader/vulkan/primex_rotationless.frag.spv", false, true))
+			return -1;
+
+		if(!CreatePrimExGraphicsPipeline("shader/vulkan/primex_tex_rotationless.vert.spv", "shader/vulkan/primex_tex_rotationless.frag.spv", true, true))
+			return -1;
+
+		if(!CreatePrimExGraphicsPipeline("shader/vulkan/primex.vert.spv", "shader/vulkan/primex.frag.spv", false, false))
+			return -1;
+
+		if(!CreatePrimExGraphicsPipeline("shader/vulkan/primex_tex.vert.spv", "shader/vulkan/primex_tex.frag.spv", true, false))
+			return -1;
+
+		if(!CreateSpriteMultiGraphicsPipeline("shader/vulkan/spritemulti.vert.spv", "shader/vulkan/spritemulti.frag.spv"))
+			return -1;
+
+		if(!CreateSpriteMultiPushGraphicsPipeline("shader/vulkan/spritemulti_push.vert.spv", "shader/vulkan/spritemulti_push.frag.spv"))
+			return -1;
+
+		if(!CreateQuadGraphicsPipeline<false>("shader/vulkan/quad.vert.spv", "shader/vulkan/quad.frag.spv"))
+			return -1;
+
+		if(!CreateQuadGraphicsPipeline<true>("shader/vulkan/quad_textured.vert.spv", "shader/vulkan/quad_textured.frag.spv"))
+			return -1;
+
+		if(!CreateQuadPushGraphicsPipeline<false>("shader/vulkan/quad_push.vert.spv", "shader/vulkan/quad_push.frag.spv"))
+			return -1;
+
+		if(!CreateQuadPushGraphicsPipeline<true>("shader/vulkan/quad_push_textured.vert.spv", "shader/vulkan/quad_push_textured.frag.spv"))
+			return -1;
+
+		m_SwapchainCreated = true;
+		return 0;
+	}
+
+	template<bool IsFirstInitialization>
+	int InitVulkan()
+	{
+		if(!CreateDescriptorSetLayouts())
+			return -1;
+
+		if(!CreateTextDescriptorSetLayout())
+			return -1;
+
+		if(!CreateSpriteMultiUniformDescriptorSetLayout())
+			return -1;
+
+		if(!CreateQuadUniformDescriptorSetLayout())
+			return -1;
+
+		if(IsFirstInitialization)
+		{
+			VkSwapchainKHR OldSwapChain = VK_NULL_HANDLE;
+			if(InitVulkanSwapChain(OldSwapChain) != 0)
+				return -1;
+		}
+
+		if(IsFirstInitialization)
+		{
+			if(!CreateCommandPool())
+				return -1;
+		}
+
+		if(!CreateCommandBuffers())
+			return -1;
+
+		if(!CreateSyncObjects())
+			return -1;
+
+		if(IsFirstInitialization)
+		{
+			if(!CreateDescriptorPools())
+				return -1;
+
+			if(!CreateTextureSamplers())
+				return -1;
+		}
+
+		m_vStreamedVertexBuffers.resize(m_ThreadCount);
+		m_vStreamedUniformBuffers.resize(m_ThreadCount);
+		for(size_t i = 0; i < m_ThreadCount; ++i)
+		{
+			m_vStreamedVertexBuffers[i].Init(m_SwapChainImageCount);
+			m_vStreamedUniformBuffers[i].Init(m_SwapChainImageCount);
+		}
+
+		m_vLastPipeline.resize(m_ThreadCount, VK_NULL_HANDLE);
+
+		m_vvFrameDelayedBufferCleanup.resize(m_SwapChainImageCount);
+		m_vvFrameDelayedTextureCleanup.resize(m_SwapChainImageCount);
+		m_vvFrameDelayedTextTexturesCleanup.resize(m_SwapChainImageCount);
+		m_StagingBufferCache.Init(m_SwapChainImageCount);
+		m_StagingBufferCacheImage.Init(m_SwapChainImageCount);
+		m_VertexBufferCache.Init(m_SwapChainImageCount);
+		for(auto &ImageBufferCache : m_ImageBufferCaches)
+			ImageBufferCache.second.Init(m_SwapChainImageCount);
+
+		m_vImageLastFrameCheck.resize(m_SwapChainImageCount, 0);
+
+		if(IsFirstInitialization)
+		{
+			// check if image format supports linear blitting
+			VkFormatProperties FormatProperties;
+			vkGetPhysicalDeviceFormatProperties(m_VKGPU, VK_FORMAT_R8G8B8A8_UNORM, &FormatProperties);
+			if((FormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT) != 0)
+			{
+				m_AllowsLinearBlitting = true;
+			}
+			if((FormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT) != 0 && (FormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT) != 0)
+			{
+				m_OptimalRGBAImageBlitting = true;
+			}
+			// check if image format supports blitting to linear tiled images
+			if((FormatProperties.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT) != 0)
+			{
+				m_LinearRGBAImageBlitting = true;
+			}
+
+			vkGetPhysicalDeviceFormatProperties(m_VKGPU, m_VKSurfFormat.format, &FormatProperties);
+			if((FormatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT) != 0)
+			{
+				m_OptimalSwapChainImageBlitting = true;
+			}
+		}
+
+		return 0;
+	}
+
+	[[nodiscard]] bool GetMemoryCommandBuffer(VkCommandBuffer *&pMemCommandBuffer)
+	{
+		auto &MemCommandBuffer = m_vMemoryCommandBuffers[m_CurImageIndex];
+		if(!m_vUsedMemoryCommandBuffer[m_CurImageIndex])
+		{
+			m_vUsedMemoryCommandBuffer[m_CurImageIndex] = true;
+
+			vkResetCommandBuffer(MemCommandBuffer, VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT);
+
+			VkCommandBufferBeginInfo BeginInfo{};
+			BeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+			BeginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+			if(vkBeginCommandBuffer(MemCommandBuffer, &BeginInfo) != VK_SUCCESS)
+			{
+				SetError(EGfxErrorType::GFX_ERROR_TYPE_RENDER_RECORDING, "Command buffer cannot be filled anymore.");
+				return false;
+			}
+		}
+		pMemCommandBuffer = &MemCommandBuffer;
+		return true;
+	}
+
+	[[nodiscard]] bool GetGraphicCommandBuffer(VkCommandBuffer *&pDrawCommandBuffer, size_t RenderThreadIndex)
+	{
+		if(m_ThreadCount < 2)
+		{
+			pDrawCommandBuffer = &m_vMainDrawCommandBuffers[m_CurImageIndex];
+			return true;
+		}
+		else
+		{
+			auto &DrawCommandBuffer = m_vvThreadDrawCommandBuffers[RenderThreadIndex][m_CurImageIndex];
+			if(!m_vvUsedThreadDrawCommandBuffer[RenderThreadIndex][m_CurImageIndex])
+			{
+				m_vvUsedThreadDrawCommandBuffer[RenderThreadIndex][m_CurImageIndex] = true;
+
+				vkResetCommandBuffer(DrawCommandBuffer, VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT);
+
+				VkCommandBufferBeginInfo BeginInfo{};
+				BeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+				BeginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
+
+				VkCommandBufferInheritanceInfo InheretInfo{};
+				InheretInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
+				InheretInfo.framebuffer = m_vFramebufferList[m_CurImageIndex];
+				InheretInfo.occlusionQueryEnable = VK_FALSE;
+				InheretInfo.renderPass = m_VKRenderPass;
+				InheretInfo.subpass = 0;
+
+				BeginInfo.pInheritanceInfo = &InheretInfo;
+
+				if(vkBeginCommandBuffer(DrawCommandBuffer, &BeginInfo) != VK_SUCCESS)
+				{
+					SetError(EGfxErrorType::GFX_ERROR_TYPE_RENDER_RECORDING, "Thread draw command buffer cannot be filled anymore.");
+					return false;
+				}
+			}
+			pDrawCommandBuffer = &DrawCommandBuffer;
+			return true;
+		}
+	}
+
+	VkCommandBuffer &GetMainGraphicCommandBuffer()
+	{
+		return m_vMainDrawCommandBuffers[m_CurImageIndex];
+	}
+
+	/************************
+	* STREAM BUFFERS SETUP
+	************************/
+
+	typedef std::function<bool(SFrameBuffers &, VkBuffer, VkDeviceSize)> TNewMemFunc;
+
+	// returns true, if the stream memory was just allocated
+	template<typename TStreamMemName, typename TInstanceTypeName, size_t InstanceTypeCount, size_t BufferCreateCount, bool UsesCurrentCountOffset>
+	[[nodiscard]] bool CreateStreamBuffer(TStreamMemName *&pBufferMem, TNewMemFunc &&NewMemFunc, SStreamMemory<TStreamMemName> &StreamUniformBuffer, VkBufferUsageFlagBits Usage, VkBuffer &NewBuffer, SDeviceMemoryBlock &NewBufferMem, size_t &BufferOffset, const void *pData, size_t DataSize)
+	{
+		VkBuffer Buffer = VK_NULL_HANDLE;
+		SDeviceMemoryBlock BufferMem;
+		size_t Offset = 0;
+
+		uint8_t *pMem = nullptr;
+
+		size_t it = 0;
+		if(UsesCurrentCountOffset)
+			it = StreamUniformBuffer.GetUsedCount(m_CurImageIndex);
+		for(; it < StreamUniformBuffer.GetBuffers(m_CurImageIndex).size(); ++it)
+		{
+			auto &BufferOfFrame = StreamUniformBuffer.GetBuffers(m_CurImageIndex)[it];
+			if(BufferOfFrame.m_Size >= DataSize + BufferOfFrame.m_UsedSize)
+			{
+				if(BufferOfFrame.m_UsedSize == 0)
+					StreamUniformBuffer.IncreaseUsedCount(m_CurImageIndex);
+				Buffer = BufferOfFrame.m_Buffer;
+				BufferMem = BufferOfFrame.m_BufferMem;
+				Offset = BufferOfFrame.m_UsedSize;
+				BufferOfFrame.m_UsedSize += DataSize;
+				pMem = (uint8_t *)BufferOfFrame.m_pMappedBufferData;
+				pBufferMem = &BufferOfFrame;
+				break;
+			}
+		}
+
+		if(BufferMem.m_Mem == VK_NULL_HANDLE)
+		{
+			// create memory
+			VkBuffer StreamBuffer;
+			SDeviceMemoryBlock StreamBufferMemory;
+			const VkDeviceSize NewBufferSingleSize = sizeof(TInstanceTypeName) * InstanceTypeCount;
+			const VkDeviceSize NewBufferSize = NewBufferSingleSize * BufferCreateCount;
+			if(!CreateBuffer(NewBufferSize, MEMORY_BLOCK_USAGE_STREAM, Usage, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT, StreamBuffer, StreamBufferMemory))
+				return false;
+
+			void *pMappedData = nullptr;
+			vkMapMemory(m_VKDevice, StreamBufferMemory.m_Mem, 0, VK_WHOLE_SIZE, 0, &pMappedData);
+
+			size_t NewBufferIndex = StreamUniformBuffer.GetBuffers(m_CurImageIndex).size();
+			for(size_t i = 0; i < BufferCreateCount; ++i)
+			{
+				StreamUniformBuffer.GetBuffers(m_CurImageIndex).push_back(TStreamMemName(StreamBuffer, StreamBufferMemory, NewBufferSingleSize * i, NewBufferSingleSize, 0, ((uint8_t *)pMappedData) + (NewBufferSingleSize * i)));
+				StreamUniformBuffer.GetRanges(m_CurImageIndex).push_back({});
+				if(!NewMemFunc(StreamUniformBuffer.GetBuffers(m_CurImageIndex).back(), StreamBuffer, NewBufferSingleSize * i))
+					return false;
+			}
+			auto &NewStreamBuffer = StreamUniformBuffer.GetBuffers(m_CurImageIndex)[NewBufferIndex];
+
+			Buffer = StreamBuffer;
+			BufferMem = StreamBufferMemory;
+
+			pBufferMem = &NewStreamBuffer;
+			pMem = (uint8_t *)NewStreamBuffer.m_pMappedBufferData;
+			Offset = NewStreamBuffer.m_OffsetInBuffer;
+			NewStreamBuffer.m_UsedSize += DataSize;
+
+			StreamUniformBuffer.IncreaseUsedCount(m_CurImageIndex);
+		}
+
+		{
+			mem_copy(pMem + Offset, pData, (size_t)DataSize);
+		}
+
+		NewBuffer = Buffer;
+		NewBufferMem = BufferMem;
+		BufferOffset = Offset;
+
+		return true;
+	}
+
+	[[nodiscard]] bool CreateStreamVertexBuffer(size_t RenderThreadIndex, VkBuffer &NewBuffer, SDeviceMemoryBlock &NewBufferMem, size_t &BufferOffset, const void *pData, size_t DataSize)
+	{
+		SFrameBuffers *pStreamBuffer;
+		return CreateStreamBuffer<SFrameBuffers, GL_SVertexTex3DStream, CCommandBuffer::MAX_VERTICES * 2, 1, false>(
+			pStreamBuffer, [](SFrameBuffers &, VkBuffer, VkDeviceSize) { return true; }, m_vStreamedVertexBuffers[RenderThreadIndex], VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, NewBuffer, NewBufferMem, BufferOffset, pData, DataSize);
+	}
+
+	template<typename TName, size_t InstanceMaxParticleCount, size_t MaxInstances>
+	[[nodiscard]] bool GetUniformBufferObjectImpl(size_t RenderThreadIndex, bool RequiresSharedStagesDescriptor, SStreamMemory<SFrameUniformBuffers> &StreamUniformBuffer, SDeviceDescriptorSet &DescrSet, const void *pData, size_t DataSize)
+	{
+		VkBuffer NewBuffer;
+		SDeviceMemoryBlock NewBufferMem;
+		size_t BufferOffset;
+		SFrameUniformBuffers *pMem;
+		if(!CreateStreamBuffer<SFrameUniformBuffers, TName, InstanceMaxParticleCount, MaxInstances, true>(
+			   pMem,
+			   [this, RenderThreadIndex](SFrameBuffers &Mem, VkBuffer Buffer, VkDeviceSize MemOffset) {
+				   if(!CreateUniformDescriptorSets(RenderThreadIndex, m_SpriteMultiUniformDescriptorSetLayout, ((SFrameUniformBuffers *)(&Mem))->m_aUniformSets.data(), 1, Buffer, InstanceMaxParticleCount * sizeof(TName), MemOffset))
+					   return false;
+				   if(!CreateUniformDescriptorSets(RenderThreadIndex, m_QuadUniformDescriptorSetLayout, &((SFrameUniformBuffers *)(&Mem))->m_aUniformSets[1], 1, Buffer, InstanceMaxParticleCount * sizeof(TName), MemOffset))
+					   return false;
+				   return true;
+			   },
+			   StreamUniformBuffer, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, NewBuffer, NewBufferMem, BufferOffset, pData, DataSize))
+			return false;
+
+		DescrSet = pMem->m_aUniformSets[RequiresSharedStagesDescriptor ? 1 : 0];
+		return true;
+	}
+
+	[[nodiscard]] bool GetUniformBufferObject(size_t RenderThreadIndex, bool RequiresSharedStagesDescriptor, SDeviceDescriptorSet &DescrSet, size_t ParticleCount, const void *pData, size_t DataSize)
+	{
+		return GetUniformBufferObjectImpl<IGraphics::SRenderSpriteInfo, 512, 128>(RenderThreadIndex, RequiresSharedStagesDescriptor, m_vStreamedUniformBuffers[RenderThreadIndex], DescrSet, pData, DataSize);
+	}
+
+	[[nodiscard]] bool CreateIndexBuffer(void *pData, size_t DataSize, VkBuffer &Buffer, SDeviceMemoryBlock &Memory)
+	{
+		VkDeviceSize BufferDataSize = DataSize;
+
+		SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+		if(!GetStagingBuffer(StagingBuffer, pData, DataSize))
+			return false;
+
+		SDeviceMemoryBlock VertexBufferMemory;
+		VkBuffer VertexBuffer;
+		if(!CreateBuffer(BufferDataSize, MEMORY_BLOCK_USAGE_BUFFER, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VertexBuffer, VertexBufferMemory))
+			return false;
+
+		if(!MemoryBarrier(VertexBuffer, 0, BufferDataSize, VK_ACCESS_INDEX_READ_BIT, true))
+			return false;
+		if(!CopyBuffer(StagingBuffer.m_Buffer, VertexBuffer, StagingBuffer.m_HeapData.m_OffsetToAlign, 0, BufferDataSize))
+			return false;
+		if(!MemoryBarrier(VertexBuffer, 0, BufferDataSize, VK_ACCESS_INDEX_READ_BIT, false))
+			return false;
+
+		UploadAndFreeStagingMemBlock(StagingBuffer);
+
+		Buffer = VertexBuffer;
+		Memory = VertexBufferMemory;
+		return true;
+	}
+
+	void DestroyIndexBuffer(VkBuffer &Buffer, SDeviceMemoryBlock &Memory)
+	{
+		CleanBufferPair(0, Buffer, Memory);
+	}
+
+	/************************
+	* COMMAND IMPLEMENTATION
+	************************/
+	template<typename TName>
+	[[nodiscard]] static bool IsInCommandRange(TName CMD, TName Min, TName Max)
+	{
+		return CMD >= Min && CMD < Max;
+	}
+
+	[[nodiscard]] ERunCommandReturnTypes RunCommand(const CCommandBuffer::SCommand *pBaseCommand) override
+	{
+		if(m_HasError)
+		{
+			// ignore all further commands
+			return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_ERROR;
+		}
+
+		if(IsInCommandRange<decltype(pBaseCommand->m_Cmd)>(pBaseCommand->m_Cmd, CCommandBuffer::CMD_FIRST, CCommandBuffer::CMD_COUNT))
+		{
+			auto &CallbackObj = m_aCommandCallbacks[CommandBufferCMDOff(CCommandBuffer::ECommandBufferCMD(pBaseCommand->m_Cmd))];
+			SRenderCommandExecuteBuffer Buffer;
+			Buffer.m_Command = (CCommandBuffer::ECommandBufferCMD)pBaseCommand->m_Cmd;
+			Buffer.m_pRawCommand = pBaseCommand;
+			Buffer.m_ThreadIndex = 0;
+
+			if(m_CurCommandInPipe + 1 == m_CommandsInPipe)
+			{
+				m_LastCommandsInPipeThreadIndex = std::numeric_limits<decltype(m_LastCommandsInPipeThreadIndex)>::max();
+			}
+
+			bool CanStartThread = false;
+			if(CallbackObj.m_IsRenderCommand)
+			{
+				bool ForceSingleThread = m_LastCommandsInPipeThreadIndex == std::numeric_limits<decltype(m_LastCommandsInPipeThreadIndex)>::max();
+
+				size_t PotentiallyNextThread = (((m_CurCommandInPipe * (m_ThreadCount - 1)) / m_CommandsInPipe) + 1);
+				if(PotentiallyNextThread - 1 > m_LastCommandsInPipeThreadIndex)
+				{
+					CanStartThread = true;
+					m_LastCommandsInPipeThreadIndex = PotentiallyNextThread - 1;
+				}
+				Buffer.m_ThreadIndex = m_ThreadCount > 1 && !ForceSingleThread ? (m_LastCommandsInPipeThreadIndex + 1) : 0;
+				CallbackObj.m_FillExecuteBuffer(Buffer, pBaseCommand);
+				m_CurRenderCallCountInPipe += Buffer.m_EstimatedRenderCallCount;
+			}
+			bool Ret = true;
+			if(!CallbackObj.m_IsRenderCommand || (Buffer.m_ThreadIndex == 0 && !m_RenderingPaused))
+			{
+				Ret = CallbackObj.m_CMDIsHandled;
+				if(!CallbackObj.m_CommandCB(pBaseCommand, Buffer))
+				{
+					// an error occurred, stop this command and ignore all further commands
+					return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_ERROR;
+				}
+			}
+			else if(!m_RenderingPaused)
+			{
+				if(CanStartThread)
+				{
+					StartRenderThread(m_LastCommandsInPipeThreadIndex - 1);
+				}
+				m_vvThreadCommandLists[Buffer.m_ThreadIndex - 1].push_back(Buffer);
+			}
+
+			++m_CurCommandInPipe;
+			return Ret ? ERunCommandReturnTypes::RUN_COMMAND_COMMAND_HANDLED : ERunCommandReturnTypes::RUN_COMMAND_COMMAND_UNHANDLED;
+		}
+
+		if(m_CurCommandInPipe + 1 == m_CommandsInPipe)
+		{
+			m_LastCommandsInPipeThreadIndex = std::numeric_limits<decltype(m_LastCommandsInPipeThreadIndex)>::max();
+		}
+		++m_CurCommandInPipe;
+
+		switch(pBaseCommand->m_Cmd)
+		{
+		case CCommandProcessorFragment_GLBase::CMD_INIT:
+			if(!Cmd_Init(static_cast<const SCommand_Init *>(pBaseCommand)))
+			{
+				SetWarningPreMsg("Could not initialize Vulkan: ");
+				return RUN_COMMAND_COMMAND_WARNING;
+			}
+			break;
+		case CCommandProcessorFragment_GLBase::CMD_SHUTDOWN:
+			if(!Cmd_Shutdown(static_cast<const SCommand_Shutdown *>(pBaseCommand)))
+			{
+				SetWarningPreMsg("Could not shutdown Vulkan: ");
+				return RUN_COMMAND_COMMAND_WARNING;
+			}
+			break;
+
+		case CCommandProcessorFragment_GLBase::CMD_PRE_INIT:
+			if(!Cmd_PreInit(static_cast<const CCommandProcessorFragment_GLBase::SCommand_PreInit *>(pBaseCommand)))
+			{
+				SetWarningPreMsg("Could not initialize Vulkan: ");
+				return RUN_COMMAND_COMMAND_WARNING;
+			}
+			break;
+		case CCommandProcessorFragment_GLBase::CMD_POST_SHUTDOWN:
+			if(!Cmd_PostShutdown(static_cast<const CCommandProcessorFragment_GLBase::SCommand_PostShutdown *>(pBaseCommand)))
+			{
+				SetWarningPreMsg("Could not shutdown Vulkan: ");
+				return RUN_COMMAND_COMMAND_WARNING;
+			}
+			break;
+		default:
+			return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_UNHANDLED;
+		}
+
+		return ERunCommandReturnTypes::RUN_COMMAND_COMMAND_HANDLED;
+	}
+
+	[[nodiscard]] bool Cmd_Init(const SCommand_Init *pCommand)
+	{
+		pCommand->m_pCapabilities->m_TileBuffering = true;
+		pCommand->m_pCapabilities->m_QuadBuffering = true;
+		pCommand->m_pCapabilities->m_TextBuffering = true;
+		pCommand->m_pCapabilities->m_QuadContainerBuffering = true;
+		pCommand->m_pCapabilities->m_ShaderSupport = true;
+
+		pCommand->m_pCapabilities->m_MipMapping = true;
+		pCommand->m_pCapabilities->m_3DTextures = false;
+		pCommand->m_pCapabilities->m_2DArrayTextures = true;
+		pCommand->m_pCapabilities->m_NPOTTextures = true;
+
+		pCommand->m_pCapabilities->m_ContextMajor = 1;
+		pCommand->m_pCapabilities->m_ContextMinor = 1;
+		pCommand->m_pCapabilities->m_ContextPatch = 0;
+
+		pCommand->m_pCapabilities->m_TrianglesAsQuads = true;
+
+		m_GlobalTextureLodBIAS = g_Config.m_GfxGLTextureLODBIAS;
+		m_pTextureMemoryUsage = pCommand->m_pTextureMemoryUsage;
+		m_pBufferMemoryUsage = pCommand->m_pBufferMemoryUsage;
+		m_pStreamMemoryUsage = pCommand->m_pStreamMemoryUsage;
+		m_pStagingMemoryUsage = pCommand->m_pStagingMemoryUsage;
+
+		m_MultiSamplingCount = (g_Config.m_GfxFsaaSamples & 0xFFFFFFFE); // ignore the uneven bit, only even multi sampling works
+
+		TGLBackendReadPresentedImageData &ReadPresentedImgDataFunc = *pCommand->m_pReadPresentedImageDataFunc;
+		ReadPresentedImgDataFunc = [this](uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData) { return GetPresentedImageData(Width, Height, Format, vDstData); };
+
+		m_pWindow = pCommand->m_pWindow;
+
+		*pCommand->m_pInitError = m_VKInstance != VK_NULL_HANDLE ? 0 : -1;
+
+		if(m_VKInstance == VK_NULL_HANDLE)
+		{
+			*pCommand->m_pInitError = -2;
+			return false;
+		}
+
+		m_pStorage = pCommand->m_pStorage;
+		if(InitVulkan<true>() != 0)
+		{
+			*pCommand->m_pInitError = -2;
+			return false;
+		}
+
+		std::array<uint32_t, (size_t)CCommandBuffer::MAX_VERTICES / 4 * 6> aIndices;
+		int Primq = 0;
+		for(int i = 0; i < CCommandBuffer::MAX_VERTICES / 4 * 6; i += 6)
+		{
+			aIndices[i] = Primq;
+			aIndices[i + 1] = Primq + 1;
+			aIndices[i + 2] = Primq + 2;
+			aIndices[i + 3] = Primq;
+			aIndices[i + 4] = Primq + 2;
+			aIndices[i + 5] = Primq + 3;
+			Primq += 4;
+		}
+
+		if(!PrepareFrame())
+			return false;
+		if(m_HasError)
+		{
+			*pCommand->m_pInitError = -2;
+			return false;
+		}
+
+		if(!CreateIndexBuffer(aIndices.data(), sizeof(uint32_t) * aIndices.size(), m_IndexBuffer, m_IndexBufferMemory))
+		{
+			*pCommand->m_pInitError = -2;
+			return false;
+		}
+		if(!CreateIndexBuffer(aIndices.data(), sizeof(uint32_t) * aIndices.size(), m_RenderIndexBuffer, m_RenderIndexBufferMemory))
+		{
+			*pCommand->m_pInitError = -2;
+			return false;
+		}
+		m_CurRenderIndexPrimitiveCount = CCommandBuffer::MAX_VERTICES / 4;
+
+		m_CanAssert = true;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_Shutdown(const SCommand_Shutdown *pCommand)
+	{
+		vkDeviceWaitIdle(m_VKDevice);
+
+		DestroyIndexBuffer(m_IndexBuffer, m_IndexBufferMemory);
+		DestroyIndexBuffer(m_RenderIndexBuffer, m_RenderIndexBufferMemory);
+
+		CleanupVulkan<true>();
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
+	{
+		size_t IndexTex = pCommand->m_Slot;
+
+		void *pData = pCommand->m_pData;
+
+		if(!UpdateTexture(IndexTex, VK_FORMAT_B8G8R8A8_UNORM, pData, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height))
+			return false;
+
+		free(pData);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand)
+	{
+		size_t ImageIndex = (size_t)pCommand->m_Slot;
+		auto &Texture = m_vTextures[ImageIndex];
+
+		m_vvFrameDelayedTextureCleanup[m_CurImageIndex].push_back(Texture);
+
+		Texture = CTexture{};
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_Texture_Create(const CCommandBuffer::SCommand_Texture_Create *pCommand)
+	{
+		int Slot = pCommand->m_Slot;
+		int Width = pCommand->m_Width;
+		int Height = pCommand->m_Height;
+		int Format = pCommand->m_Format;
+		int StoreFormat = pCommand->m_StoreFormat;
+		int Flags = pCommand->m_Flags;
+		void *pData = pCommand->m_pData;
+
+		if(!CreateTextureCMD(Slot, Width, Height, TextureFormatToVulkanFormat(Format), TextureFormatToVulkanFormat(StoreFormat), Flags, pData))
+			return false;
+
+		free(pData);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_TextTextures_Create(const CCommandBuffer::SCommand_TextTextures_Create *pCommand)
+	{
+		int Slot = pCommand->m_Slot;
+		int SlotOutline = pCommand->m_SlotOutline;
+		int Width = pCommand->m_Width;
+		int Height = pCommand->m_Height;
+
+		void *pTmpData = pCommand->m_pTextData;
+		void *pTmpData2 = pCommand->m_pTextOutlineData;
+
+		if(!CreateTextureCMD(Slot, Width, Height, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, CCommandBuffer::TEXFLAG_NOMIPMAPS, pTmpData))
+			return false;
+		if(!CreateTextureCMD(SlotOutline, Width, Height, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, CCommandBuffer::TEXFLAG_NOMIPMAPS, pTmpData2))
+			return false;
+
+		if(!CreateNewTextDescriptorSets(Slot, SlotOutline))
+			return false;
+
+		free(pTmpData);
+		free(pTmpData2);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_TextTextures_Destroy(const CCommandBuffer::SCommand_TextTextures_Destroy *pCommand)
+	{
+		size_t ImageIndex = (size_t)pCommand->m_Slot;
+		size_t ImageIndexOutline = (size_t)pCommand->m_SlotOutline;
+		auto &Texture = m_vTextures[ImageIndex];
+		auto &TextureOutline = m_vTextures[ImageIndexOutline];
+
+		m_vvFrameDelayedTextTexturesCleanup[m_CurImageIndex].emplace_back(Texture, TextureOutline);
+
+		Texture = {};
+		TextureOutline = {};
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_TextTexture_Update(const CCommandBuffer::SCommand_TextTexture_Update *pCommand)
+	{
+		size_t IndexTex = pCommand->m_Slot;
+
+		void *pData = pCommand->m_pData;
+
+		if(!UpdateTexture(IndexTex, VK_FORMAT_R8_UNORM, pData, pCommand->m_X, pCommand->m_Y, pCommand->m_Width, pCommand->m_Height))
+			return false;
+
+		free(pData);
+
+		return true;
+	}
+
+	void Cmd_Clear_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Clear *pCommand)
+	{
+		if(!pCommand->m_ForceClear)
+		{
+			bool ColorChanged = m_aClearColor[0] != pCommand->m_Color.r || m_aClearColor[1] != pCommand->m_Color.g ||
+					    m_aClearColor[2] != pCommand->m_Color.b || m_aClearColor[3] != pCommand->m_Color.a;
+			m_aClearColor[0] = pCommand->m_Color.r;
+			m_aClearColor[1] = pCommand->m_Color.g;
+			m_aClearColor[2] = pCommand->m_Color.b;
+			m_aClearColor[3] = pCommand->m_Color.a;
+			if(ColorChanged)
+				ExecBuffer.m_ClearColorInRenderThread = true;
+		}
+		else
+		{
+			ExecBuffer.m_ClearColorInRenderThread = true;
+		}
+		ExecBuffer.m_EstimatedRenderCallCount = 0;
+	}
+
+	[[nodiscard]] bool Cmd_Clear(const SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Clear *pCommand)
+	{
+		if(ExecBuffer.m_ClearColorInRenderThread)
+		{
+			std::array<VkClearAttachment, 1> aAttachments = {VkClearAttachment{VK_IMAGE_ASPECT_COLOR_BIT, 0, VkClearValue{VkClearColorValue{{pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, pCommand->m_Color.a}}}}};
+			std::array<VkClearRect, 1> aClearRects = {VkClearRect{{{0, 0}, m_VKSwapImgAndViewportExtent.m_SwapImageViewport}, 0, 1}};
+
+			VkCommandBuffer *pCommandBuffer;
+			if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+				return false;
+			auto &CommandBuffer = *pCommandBuffer;
+			vkCmdClearAttachments(CommandBuffer, aAttachments.size(), aAttachments.data(), aClearRects.size(), aClearRects.data());
+		}
+
+		return true;
+	}
+
+	void Cmd_Render_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Render *pCommand)
+	{
+		bool IsTextured = GetIsTextured(pCommand->m_State);
+		if(IsTextured)
+		{
+			size_t AddressModeIndex = GetAddressModeIndex(pCommand->m_State);
+			ExecBuffer.m_aDescriptors[0] = m_vTextures[pCommand->m_State.m_Texture].m_aVKStandardTexturedDescrSets[AddressModeIndex];
+		}
+
+		ExecBuffer.m_IndexBuffer = m_IndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = 1;
+
+		ExecBufferFillDynamicStates(pCommand->m_State, ExecBuffer);
+	}
+
+	[[nodiscard]] bool Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		return RenderStandard<CCommandBuffer::SVertex, false>(ExecBuffer, pCommand->m_State, pCommand->m_PrimType, pCommand->m_pVertices, pCommand->m_PrimCount);
+	}
+
+	[[nodiscard]] bool Cmd_Screenshot(const CCommandBuffer::SCommand_TrySwapAndScreenshot *pCommand)
+	{
+		if(!NextFrame())
+			return false;
+		*pCommand->m_pSwapped = true;
+
+		uint32_t Width;
+		uint32_t Height;
+		CImageInfo::EImageFormat Format;
+		if(GetPresentedImageDataImpl(Width, Height, Format, m_vScreenshotHelper, false, true))
+		{
+			size_t ImgSize = (size_t)Width * (size_t)Height * (size_t)4;
+			pCommand->m_pImage->m_pData = malloc(ImgSize);
+			mem_copy(pCommand->m_pImage->m_pData, m_vScreenshotHelper.data(), ImgSize);
+		}
+		else
+		{
+			pCommand->m_pImage->m_pData = nullptr;
+		}
+		pCommand->m_pImage->m_Width = (int)Width;
+		pCommand->m_pImage->m_Height = (int)Height;
+		pCommand->m_pImage->m_Format = Format;
+
+		return true;
+	}
+
+	void Cmd_RenderTex3D_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderTex3D *pCommand)
+	{
+		bool IsTextured = GetIsTextured(pCommand->m_State);
+		if(IsTextured)
+		{
+			ExecBuffer.m_aDescriptors[0] = m_vTextures[pCommand->m_State.m_Texture].m_VKStandard3DTexturedDescrSet;
+		}
+
+		ExecBuffer.m_IndexBuffer = m_IndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = 1;
+
+		ExecBufferFillDynamicStates(pCommand->m_State, ExecBuffer);
+	}
+
+	[[nodiscard]] bool Cmd_RenderTex3D(const CCommandBuffer::SCommand_RenderTex3D *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		return RenderStandard<CCommandBuffer::SVertexTex3DStream, true>(ExecBuffer, pCommand->m_State, pCommand->m_PrimType, pCommand->m_pVertices, pCommand->m_PrimCount);
+	}
+
+	void Cmd_Update_Viewport_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_Update_Viewport *pCommand)
+	{
+		ExecBuffer.m_EstimatedRenderCallCount = 0;
+	}
+
+	[[nodiscard]] bool Cmd_Update_Viewport(const CCommandBuffer::SCommand_Update_Viewport *pCommand)
+	{
+		if(pCommand->m_ByResize)
+		{
+			if(IsVerbose())
+			{
+				dbg_msg("vulkan", "queueing swap chain recreation because the viewport changed");
+			}
+			m_CanvasWidth = (uint32_t)pCommand->m_Width;
+			m_CanvasHeight = (uint32_t)pCommand->m_Height;
+			m_RecreateSwapChain = true;
+		}
+		else
+		{
+			auto Viewport = m_VKSwapImgAndViewportExtent.GetPresentedImageViewport();
+			if(pCommand->m_X != 0 || pCommand->m_Y != 0 || (uint32_t)pCommand->m_Width != Viewport.width || (uint32_t)pCommand->m_Height != Viewport.height)
+			{
+				m_HasDynamicViewport = true;
+
+				// convert viewport from OGL to vulkan
+				int32_t ViewportY = (int32_t)Viewport.height - ((int32_t)pCommand->m_Y + (int32_t)pCommand->m_Height);
+				uint32_t ViewportH = (int32_t)pCommand->m_Height;
+				m_DynamicViewportOffset = {(int32_t)pCommand->m_X, ViewportY};
+				m_DynamicViewportSize = {(uint32_t)pCommand->m_Width, ViewportH};
+			}
+			else
+			{
+				m_HasDynamicViewport = false;
+			}
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_VSync(const CCommandBuffer::SCommand_VSync *pCommand)
+	{
+		if(IsVerbose())
+		{
+			dbg_msg("vulkan", "queueing swap chain recreation because vsync was changed");
+		}
+		m_RecreateSwapChain = true;
+		*pCommand->m_pRetOk = true;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_MultiSampling(const CCommandBuffer::SCommand_MultiSampling *pCommand)
+	{
+		if(IsVerbose())
+		{
+			dbg_msg("vulkan", "queueing swap chain recreation because multi sampling was changed");
+		}
+		m_RecreateSwapChain = true;
+
+		uint32_t MSCount = (std::min(pCommand->m_RequestedMultiSamplingCount, (uint32_t)GetMaxSampleCount()) & 0xFFFFFFFE); // ignore the uneven bits
+		m_NextMultiSamplingCount = MSCount;
+
+		*pCommand->m_pRetMultiSamplingCount = MSCount;
+		*pCommand->m_pRetOk = true;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_Swap(const CCommandBuffer::SCommand_Swap *pCommand)
+	{
+		return NextFrame();
+	}
+
+	[[nodiscard]] bool Cmd_CreateBufferObject(const CCommandBuffer::SCommand_CreateBufferObject *pCommand)
+	{
+		bool IsOneFrameBuffer = (pCommand->m_Flags & IGraphics::EBufferObjectCreateFlags::BUFFER_OBJECT_CREATE_FLAGS_ONE_TIME_USE_BIT) != 0;
+		if(!CreateBufferObject((size_t)pCommand->m_BufferIndex, pCommand->m_pUploadData, (VkDeviceSize)pCommand->m_DataSize, IsOneFrameBuffer))
+			return false;
+		if(pCommand->m_DeletePointer)
+			free(pCommand->m_pUploadData);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_UpdateBufferObject(const CCommandBuffer::SCommand_UpdateBufferObject *pCommand)
+	{
+		size_t BufferIndex = (size_t)pCommand->m_BufferIndex;
+		bool DeletePointer = pCommand->m_DeletePointer;
+		VkDeviceSize Offset = (VkDeviceSize)((intptr_t)pCommand->m_pOffset);
+		void *pUploadData = pCommand->m_pUploadData;
+		VkDeviceSize DataSize = (VkDeviceSize)pCommand->m_DataSize;
+
+		SMemoryBlock<s_StagingBufferCacheID> StagingBuffer;
+		if(!GetStagingBuffer(StagingBuffer, pUploadData, DataSize))
+			return false;
+
+		const auto &MemBlock = m_vBufferObjects[BufferIndex].m_BufferObject.m_Mem;
+		VkBuffer VertexBuffer = MemBlock.m_Buffer;
+		if(!MemoryBarrier(VertexBuffer, Offset + MemBlock.m_HeapData.m_OffsetToAlign, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, true))
+			return false;
+		if(!CopyBuffer(StagingBuffer.m_Buffer, VertexBuffer, StagingBuffer.m_HeapData.m_OffsetToAlign, Offset + MemBlock.m_HeapData.m_OffsetToAlign, DataSize))
+			return false;
+		if(!MemoryBarrier(VertexBuffer, Offset + MemBlock.m_HeapData.m_OffsetToAlign, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, false))
+			return false;
+
+		UploadAndFreeStagingMemBlock(StagingBuffer);
+
+		if(DeletePointer)
+			free(pUploadData);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_RecreateBufferObject(const CCommandBuffer::SCommand_RecreateBufferObject *pCommand)
+	{
+		DeleteBufferObject((size_t)pCommand->m_BufferIndex);
+		bool IsOneFrameBuffer = (pCommand->m_Flags & IGraphics::EBufferObjectCreateFlags::BUFFER_OBJECT_CREATE_FLAGS_ONE_TIME_USE_BIT) != 0;
+		return CreateBufferObject((size_t)pCommand->m_BufferIndex, pCommand->m_pUploadData, (VkDeviceSize)pCommand->m_DataSize, IsOneFrameBuffer);
+	}
+
+	[[nodiscard]] bool Cmd_CopyBufferObject(const CCommandBuffer::SCommand_CopyBufferObject *pCommand)
+	{
+		size_t ReadBufferIndex = (size_t)pCommand->m_ReadBufferIndex;
+		size_t WriteBufferIndex = (size_t)pCommand->m_WriteBufferIndex;
+		auto &ReadMemBlock = m_vBufferObjects[ReadBufferIndex].m_BufferObject.m_Mem;
+		auto &WriteMemBlock = m_vBufferObjects[WriteBufferIndex].m_BufferObject.m_Mem;
+		VkBuffer ReadBuffer = ReadMemBlock.m_Buffer;
+		VkBuffer WriteBuffer = WriteMemBlock.m_Buffer;
+
+		VkDeviceSize DataSize = (VkDeviceSize)pCommand->m_CopySize;
+		VkDeviceSize ReadOffset = (VkDeviceSize)pCommand->m_ReadOffset + ReadMemBlock.m_HeapData.m_OffsetToAlign;
+		VkDeviceSize WriteOffset = (VkDeviceSize)pCommand->m_WriteOffset + WriteMemBlock.m_HeapData.m_OffsetToAlign;
+
+		if(!MemoryBarrier(ReadBuffer, ReadOffset, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, true))
+			return false;
+		if(!MemoryBarrier(WriteBuffer, WriteOffset, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, true))
+			return false;
+		if(!CopyBuffer(ReadBuffer, WriteBuffer, ReadOffset, WriteOffset, DataSize))
+			return false;
+		if(!MemoryBarrier(WriteBuffer, WriteOffset, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, false))
+			return false;
+		if(!MemoryBarrier(ReadBuffer, ReadOffset, DataSize, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, false))
+			return false;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_DeleteBufferObject(const CCommandBuffer::SCommand_DeleteBufferObject *pCommand)
+	{
+		size_t BufferIndex = (size_t)pCommand->m_BufferIndex;
+		DeleteBufferObject(BufferIndex);
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_CreateBufferContainer(const CCommandBuffer::SCommand_CreateBufferContainer *pCommand)
+	{
+		size_t ContainerIndex = (size_t)pCommand->m_BufferContainerIndex;
+		while(ContainerIndex >= m_vBufferContainers.size())
+			m_vBufferContainers.resize((m_vBufferContainers.size() * 2) + 1);
+
+		m_vBufferContainers[ContainerIndex].m_BufferObjectIndex = pCommand->m_VertBufferBindingIndex;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_UpdateBufferContainer(const CCommandBuffer::SCommand_UpdateBufferContainer *pCommand)
+	{
+		size_t ContainerIndex = (size_t)pCommand->m_BufferContainerIndex;
+		m_vBufferContainers[ContainerIndex].m_BufferObjectIndex = pCommand->m_VertBufferBindingIndex;
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_DeleteBufferContainer(const CCommandBuffer::SCommand_DeleteBufferContainer *pCommand)
+	{
+		size_t ContainerIndex = (size_t)pCommand->m_BufferContainerIndex;
+		bool DeleteAllBO = pCommand->m_DestroyAllBO;
+		if(DeleteAllBO)
+		{
+			size_t BufferIndex = (size_t)m_vBufferContainers[ContainerIndex].m_BufferObjectIndex;
+			DeleteBufferObject(BufferIndex);
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_IndicesRequiredNumNotify(const CCommandBuffer::SCommand_IndicesRequiredNumNotify *pCommand)
+	{
+		size_t IndicesCount = pCommand->m_RequiredIndicesNum;
+		if(m_CurRenderIndexPrimitiveCount < IndicesCount / 6)
+		{
+			m_vvFrameDelayedBufferCleanup[m_CurImageIndex].push_back({m_RenderIndexBuffer, m_RenderIndexBufferMemory});
+			std::vector<uint32_t> vIndices(IndicesCount);
+			uint32_t Primq = 0;
+			for(size_t i = 0; i < IndicesCount; i += 6)
+			{
+				vIndices[i] = Primq;
+				vIndices[i + 1] = Primq + 1;
+				vIndices[i + 2] = Primq + 2;
+				vIndices[i + 3] = Primq;
+				vIndices[i + 4] = Primq + 2;
+				vIndices[i + 5] = Primq + 3;
+				Primq += 4;
+			}
+			if(!CreateIndexBuffer(vIndices.data(), vIndices.size() * sizeof(uint32_t), m_RenderIndexBuffer, m_RenderIndexBufferMemory))
+				return false;
+			m_CurRenderIndexPrimitiveCount = IndicesCount / 6;
+		}
+
+		return true;
+	}
+
+	void Cmd_RenderTileLayer_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderTileLayer *pCommand)
+	{
+		RenderTileLayer_FillExecuteBuffer(ExecBuffer, pCommand->m_IndicesDrawNum, pCommand->m_State, pCommand->m_BufferContainerIndex);
+	}
+
+	[[nodiscard]] bool Cmd_RenderTileLayer(const CCommandBuffer::SCommand_RenderTileLayer *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		vec2 Scale{};
+		vec2 Off{};
+		return RenderTileLayer(ExecBuffer, pCommand->m_State, false, pCommand->m_Color, Scale, Off, (size_t)pCommand->m_IndicesDrawNum, pCommand->m_pIndicesOffsets, pCommand->m_pDrawCount);
+	}
+
+	void Cmd_RenderBorderTile_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderBorderTile *pCommand)
+	{
+		RenderTileLayer_FillExecuteBuffer(ExecBuffer, 1, pCommand->m_State, pCommand->m_BufferContainerIndex);
+	}
+
+	[[nodiscard]] bool Cmd_RenderBorderTile(const CCommandBuffer::SCommand_RenderBorderTile *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		vec2 Scale = pCommand->m_Scale;
+		vec2 Off = pCommand->m_Offset;
+		unsigned int DrawNum = pCommand->m_DrawNum * 6;
+		return RenderTileLayer(ExecBuffer, pCommand->m_State, true, pCommand->m_Color, Scale, Off, 1, &pCommand->m_pIndicesOffset, &DrawNum);
+	}
+
+	void Cmd_RenderQuadLayer_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderQuadLayer *pCommand)
+	{
+		size_t BufferContainerIndex = (size_t)pCommand->m_BufferContainerIndex;
+		size_t BufferObjectIndex = (size_t)m_vBufferContainers[BufferContainerIndex].m_BufferObjectIndex;
+		const auto &BufferObject = m_vBufferObjects[BufferObjectIndex];
+
+		ExecBuffer.m_Buffer = BufferObject.m_CurBuffer;
+		ExecBuffer.m_BufferOff = BufferObject.m_CurBufferOffset;
+
+		bool IsTextured = GetIsTextured(pCommand->m_State);
+		if(IsTextured)
+		{
+			size_t AddressModeIndex = GetAddressModeIndex(pCommand->m_State);
+			ExecBuffer.m_aDescriptors[0] = m_vTextures[pCommand->m_State.m_Texture].m_aVKStandardTexturedDescrSets[AddressModeIndex];
+		}
+
+		ExecBuffer.m_IndexBuffer = m_RenderIndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = ((pCommand->m_QuadNum - 1) / gs_GraphicsMaxQuadsRenderCount) + 1;
+
+		ExecBufferFillDynamicStates(pCommand->m_State, ExecBuffer);
+	}
+
+	[[nodiscard]] bool Cmd_RenderQuadLayer(const CCommandBuffer::SCommand_RenderQuadLayer *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(pCommand->m_State, m);
+
+		bool CanBePushed = pCommand->m_QuadNum == 1;
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, pCommand->m_State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = GetPipeLayout(CanBePushed ? m_QuadPushPipeline : m_QuadPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetPipeline(CanBePushed ? m_QuadPushPipeline : m_QuadPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, pCommand->m_State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
+
+		if(IsTextured)
+		{
+			vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+		}
+
+		if(CanBePushed)
+		{
+			SUniformQuadPushGPos PushConstantVertex;
+
+			mem_copy(&PushConstantVertex.m_BOPush, &pCommand->m_pQuadInfo[0], sizeof(PushConstantVertex.m_BOPush));
+
+			mem_copy(PushConstantVertex.m_aPos, m.data(), sizeof(PushConstantVertex.m_aPos));
+			PushConstantVertex.m_QuadOffset = pCommand->m_QuadOffset;
+
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(SUniformQuadPushGPos), &PushConstantVertex);
+		}
+		else
+		{
+			SUniformQuadGPos PushConstantVertex;
+			mem_copy(PushConstantVertex.m_aPos, m.data(), sizeof(PushConstantVertex.m_aPos));
+			PushConstantVertex.m_QuadOffset = pCommand->m_QuadOffset;
+
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(PushConstantVertex), &PushConstantVertex);
+		}
+
+		uint32_t DrawCount = (uint32_t)pCommand->m_QuadNum;
+		size_t RenderOffset = 0;
+
+		while(DrawCount > 0)
+		{
+			uint32_t RealDrawCount = (DrawCount > gs_GraphicsMaxQuadsRenderCount ? gs_GraphicsMaxQuadsRenderCount : DrawCount);
+
+			VkDeviceSize IndexOffset = (VkDeviceSize)((ptrdiff_t)(pCommand->m_QuadOffset + RenderOffset) * 6);
+			if(!CanBePushed)
+			{
+				// create uniform buffer
+				SDeviceDescriptorSet UniDescrSet;
+				if(!GetUniformBufferObject(ExecBuffer.m_ThreadIndex, true, UniDescrSet, RealDrawCount, (const float *)(pCommand->m_pQuadInfo + RenderOffset), RealDrawCount * sizeof(SQuadRenderInfo)))
+					return false;
+
+				vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, IsTextured ? 1 : 0, 1, &UniDescrSet.m_Descriptor, 0, nullptr);
+				if(RenderOffset > 0)
+				{
+					int32_t QuadOffset = pCommand->m_QuadOffset + RenderOffset;
+					vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, sizeof(SUniformQuadGPos) - sizeof(int32_t), sizeof(int32_t), &QuadOffset);
+				}
+			}
+
+			vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(RealDrawCount * 6), 1, IndexOffset, 0, 0);
+
+			RenderOffset += RealDrawCount;
+			DrawCount -= RealDrawCount;
+		}
+
+		return true;
+	}
+
+	void Cmd_RenderText_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderText *pCommand)
+	{
+		size_t BufferContainerIndex = (size_t)pCommand->m_BufferContainerIndex;
+		size_t BufferObjectIndex = (size_t)m_vBufferContainers[BufferContainerIndex].m_BufferObjectIndex;
+		const auto &BufferObject = m_vBufferObjects[BufferObjectIndex];
+
+		ExecBuffer.m_Buffer = BufferObject.m_CurBuffer;
+		ExecBuffer.m_BufferOff = BufferObject.m_CurBufferOffset;
+
+		ExecBuffer.m_aDescriptors[0] = m_vTextures[pCommand->m_TextTextureIndex].m_VKTextDescrSet;
+
+		ExecBuffer.m_IndexBuffer = m_RenderIndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = 1;
+
+		ExecBufferFillDynamicStates(pCommand->m_State, ExecBuffer);
+	}
+
+	[[nodiscard]] bool Cmd_RenderText(const CCommandBuffer::SCommand_RenderText *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(pCommand->m_State, m);
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, pCommand->m_State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		IsTextured = true; // text is always textured
+		auto &PipeLayout = GetPipeLayout(m_TextPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetPipeline(m_TextPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, pCommand->m_State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
+
+		vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+
+		SUniformGTextPos PosTexSizeConstant;
+		mem_copy(PosTexSizeConstant.m_aPos, m.data(), m.size() * sizeof(float));
+		PosTexSizeConstant.m_TextureSize = pCommand->m_TextureSize;
+
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGTextPos), &PosTexSizeConstant);
+
+		SUniformTextFragment FragmentConstants;
+
+		FragmentConstants.m_Constants.m_TextColor = pCommand->m_TextColor;
+		FragmentConstants.m_Constants.m_TextOutlineColor = pCommand->m_TextOutlineColor;
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformGTextPos) + sizeof(SUniformTextGFragmentOffset), sizeof(SUniformTextFragment), &FragmentConstants);
+
+		vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(pCommand->m_DrawNum), 1, 0, 0, 0);
+
+		return true;
+	}
+
+	void BufferContainer_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SState &State, size_t BufferContainerIndex, size_t DrawCalls)
+	{
+		size_t BufferObjectIndex = (size_t)m_vBufferContainers[BufferContainerIndex].m_BufferObjectIndex;
+		const auto &BufferObject = m_vBufferObjects[BufferObjectIndex];
+
+		ExecBuffer.m_Buffer = BufferObject.m_CurBuffer;
+		ExecBuffer.m_BufferOff = BufferObject.m_CurBufferOffset;
+
+		bool IsTextured = GetIsTextured(State);
+		if(IsTextured)
+		{
+			size_t AddressModeIndex = GetAddressModeIndex(State);
+			ExecBuffer.m_aDescriptors[0] = m_vTextures[State.m_Texture].m_aVKStandardTexturedDescrSets[AddressModeIndex];
+		}
+
+		ExecBuffer.m_IndexBuffer = m_RenderIndexBuffer;
+
+		ExecBuffer.m_EstimatedRenderCallCount = DrawCalls;
+
+		ExecBufferFillDynamicStates(State, ExecBuffer);
+	}
+
+	void Cmd_RenderQuadContainer_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderQuadContainer *pCommand)
+	{
+		BufferContainer_FillExecuteBuffer(ExecBuffer, pCommand->m_State, (size_t)pCommand->m_BufferContainerIndex, 1);
+	}
+
+	[[nodiscard]] bool Cmd_RenderQuadContainer(const CCommandBuffer::SCommand_RenderQuadContainer *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(pCommand->m_State, m);
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, pCommand->m_State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = GetStandardPipeLayout(false, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetStandardPipe(false, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, pCommand->m_State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		VkDeviceSize IndexOffset = (VkDeviceSize)((ptrdiff_t)pCommand->m_pOffset);
+
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, IndexOffset, VK_INDEX_TYPE_UINT32);
+
+		if(IsTextured)
+		{
+			vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+		}
+
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformGPos), m.data());
+
+		vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(pCommand->m_DrawNum), 1, 0, 0, 0);
+
+		return true;
+	}
+
+	void Cmd_RenderQuadContainerEx_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderQuadContainerEx *pCommand)
+	{
+		BufferContainer_FillExecuteBuffer(ExecBuffer, pCommand->m_State, (size_t)pCommand->m_BufferContainerIndex, 1);
+	}
+
+	[[nodiscard]] bool Cmd_RenderQuadContainerEx(const CCommandBuffer::SCommand_RenderQuadContainerEx *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(pCommand->m_State, m);
+
+		bool IsRotationless = !(pCommand->m_Rotation != 0);
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, pCommand->m_State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = GetPipeLayout(IsRotationless ? m_PrimExRotationlessPipeline : m_PrimExPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetPipeline(IsRotationless ? m_PrimExRotationlessPipeline : m_PrimExPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, pCommand->m_State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		VkDeviceSize IndexOffset = (VkDeviceSize)((ptrdiff_t)pCommand->m_pOffset);
+
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, IndexOffset, VK_INDEX_TYPE_UINT32);
+
+		if(IsTextured)
+		{
+			vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+		}
+
+		SUniformPrimExGVertColor PushConstantColor;
+		SUniformPrimExGPos PushConstantVertex;
+		size_t VertexPushConstantSize = sizeof(PushConstantVertex);
+
+		PushConstantColor = pCommand->m_VertexColor;
+		mem_copy(PushConstantVertex.m_aPos, m.data(), sizeof(PushConstantVertex.m_aPos));
+
+		if(!IsRotationless)
+		{
+			PushConstantVertex.m_Rotation = pCommand->m_Rotation;
+			PushConstantVertex.m_Center = {pCommand->m_Center.x, pCommand->m_Center.y};
+		}
+		else
+		{
+			VertexPushConstantSize = sizeof(SUniformPrimExGPosRotationless);
+		}
+
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, VertexPushConstantSize, &PushConstantVertex);
+		vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformPrimExGPos) + sizeof(SUniformPrimExGVertColorAlign), sizeof(PushConstantColor), &PushConstantColor);
+
+		vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(pCommand->m_DrawNum), 1, 0, 0, 0);
+
+		return true;
+	}
+
+	void Cmd_RenderQuadContainerAsSpriteMultiple_FillExecuteBuffer(SRenderCommandExecuteBuffer &ExecBuffer, const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *pCommand)
+	{
+		BufferContainer_FillExecuteBuffer(ExecBuffer, pCommand->m_State, (size_t)pCommand->m_BufferContainerIndex, ((pCommand->m_DrawCount - 1) / gs_GraphicsMaxParticlesRenderCount) + 1);
+	}
+
+	[[nodiscard]] bool Cmd_RenderQuadContainerAsSpriteMultiple(const CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple *pCommand, SRenderCommandExecuteBuffer &ExecBuffer)
+	{
+		std::array<float, (size_t)4 * 2> m;
+		GetStateMatrix(pCommand->m_State, m);
+
+		bool CanBePushed = pCommand->m_DrawCount <= 1;
+
+		bool IsTextured;
+		size_t BlendModeIndex;
+		size_t DynamicIndex;
+		size_t AddressModeIndex;
+		GetStateIndices(ExecBuffer, pCommand->m_State, IsTextured, BlendModeIndex, DynamicIndex, AddressModeIndex);
+		auto &PipeLayout = GetPipeLayout(CanBePushed ? m_SpriteMultiPushPipeline : m_SpriteMultiPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+		auto &PipeLine = GetPipeline(CanBePushed ? m_SpriteMultiPushPipeline : m_SpriteMultiPipeline, IsTextured, BlendModeIndex, DynamicIndex);
+
+		VkCommandBuffer *pCommandBuffer;
+		if(!GetGraphicCommandBuffer(pCommandBuffer, ExecBuffer.m_ThreadIndex))
+			return false;
+		auto &CommandBuffer = *pCommandBuffer;
+
+		BindPipeline(ExecBuffer.m_ThreadIndex, CommandBuffer, ExecBuffer, PipeLine, pCommand->m_State);
+
+		std::array<VkBuffer, 1> aVertexBuffers = {ExecBuffer.m_Buffer};
+		std::array<VkDeviceSize, 1> aOffsets = {(VkDeviceSize)ExecBuffer.m_BufferOff};
+		vkCmdBindVertexBuffers(CommandBuffer, 0, 1, aVertexBuffers.data(), aOffsets.data());
+
+		VkDeviceSize IndexOffset = (VkDeviceSize)((ptrdiff_t)pCommand->m_pOffset);
+		vkCmdBindIndexBuffer(CommandBuffer, ExecBuffer.m_IndexBuffer, IndexOffset, VK_INDEX_TYPE_UINT32);
+
+		vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 0, 1, &ExecBuffer.m_aDescriptors[0].m_Descriptor, 0, nullptr);
+
+		if(CanBePushed)
+		{
+			SUniformSpriteMultiPushGVertColor PushConstantColor;
+			SUniformSpriteMultiPushGPos PushConstantVertex;
+
+			PushConstantColor = pCommand->m_VertexColor;
+
+			mem_copy(PushConstantVertex.m_aPos, m.data(), sizeof(PushConstantVertex.m_aPos));
+			PushConstantVertex.m_Center = pCommand->m_Center;
+
+			for(size_t i = 0; i < pCommand->m_DrawCount; ++i)
+				PushConstantVertex.m_aPSR[i] = vec4(pCommand->m_pRenderInfo[i].m_Pos.x, pCommand->m_pRenderInfo[i].m_Pos.y, pCommand->m_pRenderInfo[i].m_Scale, pCommand->m_pRenderInfo[i].m_Rotation);
+
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(SUniformSpriteMultiPushGPosBase) + sizeof(vec4) * pCommand->m_DrawCount, &PushConstantVertex);
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformSpriteMultiPushGPos), sizeof(PushConstantColor), &PushConstantColor);
+		}
+		else
+		{
+			SUniformSpriteMultiGVertColor PushConstantColor;
+			SUniformSpriteMultiGPos PushConstantVertex;
+
+			PushConstantColor = pCommand->m_VertexColor;
+
+			mem_copy(PushConstantVertex.m_aPos, m.data(), sizeof(PushConstantVertex.m_aPos));
+			PushConstantVertex.m_Center = pCommand->m_Center;
+
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(PushConstantVertex), &PushConstantVertex);
+			vkCmdPushConstants(CommandBuffer, PipeLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(SUniformSpriteMultiGPos) + sizeof(SUniformSpriteMultiGVertColorAlign), sizeof(PushConstantColor), &PushConstantColor);
+		}
+
+		const int RSPCount = 512;
+		int DrawCount = pCommand->m_DrawCount;
+		size_t RenderOffset = 0;
+
+		while(DrawCount > 0)
+		{
+			int UniformCount = (DrawCount > RSPCount ? RSPCount : DrawCount);
+
+			if(!CanBePushed)
+			{
+				// create uniform buffer
+				SDeviceDescriptorSet UniDescrSet;
+				if(!GetUniformBufferObject(ExecBuffer.m_ThreadIndex, false, UniDescrSet, UniformCount, (const float *)(pCommand->m_pRenderInfo + RenderOffset), UniformCount * sizeof(IGraphics::SRenderSpriteInfo)))
+					return false;
+
+				vkCmdBindDescriptorSets(CommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, PipeLayout, 1, 1, &UniDescrSet.m_Descriptor, 0, nullptr);
+			}
+
+			vkCmdDrawIndexed(CommandBuffer, static_cast<uint32_t>(pCommand->m_DrawNum), UniformCount, 0, 0, 0);
+
+			RenderOffset += RSPCount;
+			DrawCount -= RSPCount;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_WindowCreateNtf(const CCommandBuffer::SCommand_WindowCreateNtf *pCommand)
+	{
+		log_debug("vulkan", "creating new surface.");
+		m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowID);
+		if(m_RenderingPaused)
+		{
+#ifdef CONF_PLATFORM_ANDROID
+			if(!CreateSurface(m_pWindow))
+				return false;
+			m_RecreateSwapChain = true;
+#endif
+			m_RenderingPaused = false;
+			if(!PureMemoryFrame())
+				return false;
+			if(!PrepareFrame())
+				return false;
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_WindowDestroyNtf(const CCommandBuffer::SCommand_WindowDestroyNtf *pCommand)
+	{
+		log_debug("vulkan", "surface got destroyed.");
+		if(!m_RenderingPaused)
+		{
+			if(!WaitFrame())
+				return false;
+			m_RenderingPaused = true;
+			vkDeviceWaitIdle(m_VKDevice);
+#ifdef CONF_PLATFORM_ANDROID
+			CleanupVulkanSwapChain(true);
+#endif
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_PreInit(const CCommandProcessorFragment_GLBase::SCommand_PreInit *pCommand)
+	{
+		m_pGPUList = pCommand->m_pGPUList;
+		if(InitVulkanSDL(pCommand->m_pWindow, pCommand->m_Width, pCommand->m_Height, pCommand->m_pRendererString, pCommand->m_pVendorString, pCommand->m_pVersionString) != 0)
+		{
+			m_VKInstance = VK_NULL_HANDLE;
+		}
+
+		RegisterCommands();
+
+		m_ThreadCount = g_Config.m_GfxRenderThreadCount;
+		if(m_ThreadCount <= 1)
+			m_ThreadCount = 1;
+		else
+		{
+			m_ThreadCount = clamp<decltype(m_ThreadCount)>(m_ThreadCount, 3, std::max<decltype(m_ThreadCount)>(3, std::thread::hardware_concurrency()));
+		}
+
+		// start threads
+		dbg_assert(m_ThreadCount != 2, "Either use 1 main thread or at least 2 extra rendering threads.");
+		if(m_ThreadCount > 1)
+		{
+			m_vvThreadCommandLists.resize(m_ThreadCount - 1);
+			m_vThreadHelperHadCommands.resize(m_ThreadCount - 1, false);
+			for(auto &ThreadCommandList : m_vvThreadCommandLists)
+			{
+				ThreadCommandList.reserve(256);
+			}
+
+			for(size_t i = 0; i < m_ThreadCount - 1; ++i)
+			{
+				auto *pRenderThread = new SRenderThread();
+				std::unique_lock<std::mutex> Lock(pRenderThread->m_Mutex);
+				m_vpRenderThreads.emplace_back(pRenderThread);
+				pRenderThread->m_Thread = std::thread([this, i]() { RunThread(i); });
+				// wait until thread started
+				pRenderThread->m_Cond.wait(Lock, [pRenderThread]() -> bool { return pRenderThread->m_Started; });
+			}
+		}
+
+		return true;
+	}
+
+	[[nodiscard]] bool Cmd_PostShutdown(const CCommandProcessorFragment_GLBase::SCommand_PostShutdown *pCommand)
+	{
+		for(size_t i = 0; i < m_ThreadCount - 1; ++i)
+		{
+			auto *pThread = m_vpRenderThreads[i].get();
+			{
+				std::unique_lock<std::mutex> Lock(pThread->m_Mutex);
+				pThread->m_Finished = true;
+				pThread->m_Cond.notify_one();
+			}
+			pThread->m_Thread.join();
+		}
+		m_vpRenderThreads.clear();
+		m_vvThreadCommandLists.clear();
+		m_vThreadHelperHadCommands.clear();
+
+		m_ThreadCount = 1;
+
+		CleanupVulkanSDL();
+
+		return true;
+	}
+
+	void StartCommands(size_t CommandCount, size_t EstimatedRenderCallCount) override
+	{
+		m_CommandsInPipe = CommandCount;
+		m_RenderCallsInPipe = EstimatedRenderCallCount;
+		m_CurCommandInPipe = 0;
+		m_CurRenderCallCountInPipe = 0;
+	}
+
+	void EndCommands() override
+	{
+		FinishRenderThreads();
+		m_CommandsInPipe = 0;
+		m_RenderCallsInPipe = 0;
+	}
+
+	/****************
+	* RENDER THREADS
+	*****************/
+
+	void RunThread(size_t ThreadIndex)
+	{
+		auto *pThread = m_vpRenderThreads[ThreadIndex].get();
+		std::unique_lock<std::mutex> Lock(pThread->m_Mutex);
+		pThread->m_Started = true;
+		pThread->m_Cond.notify_one();
+
+		while(!pThread->m_Finished)
+		{
+			pThread->m_Cond.wait(Lock, [pThread]() -> bool { return pThread->m_IsRendering || pThread->m_Finished; });
+			pThread->m_Cond.notify_one();
+
+			// set this to true, if you want to benchmark the render thread times
+			static constexpr bool s_BenchmarkRenderThreads = false;
+			std::chrono::nanoseconds ThreadRenderTime = 0ns;
+			if(IsVerbose() && s_BenchmarkRenderThreads)
+			{
+				ThreadRenderTime = time_get_nanoseconds();
+			}
+
+			if(!pThread->m_Finished)
+			{
+				bool HasErrorFromCmd = false;
+				for(auto &NextCmd : m_vvThreadCommandLists[ThreadIndex])
+				{
+					if(!m_aCommandCallbacks[CommandBufferCMDOff(NextCmd.m_Command)].m_CommandCB(NextCmd.m_pRawCommand, NextCmd))
+					{
+						// an error occurred, the thread will not continue execution
+						HasErrorFromCmd = true;
+						break;
+					}
+				}
+				m_vvThreadCommandLists[ThreadIndex].clear();
+
+				if(!HasErrorFromCmd && m_vvUsedThreadDrawCommandBuffer[ThreadIndex + 1][m_CurImageIndex])
+				{
+					auto &GraphicThreadCommandBuffer = m_vvThreadDrawCommandBuffers[ThreadIndex + 1][m_CurImageIndex];
+					vkEndCommandBuffer(GraphicThreadCommandBuffer);
+				}
+			}
+
+			if(IsVerbose() && s_BenchmarkRenderThreads)
+			{
+				dbg_msg("vulkan", "render thread %" PRIzu " took %d ns to finish", ThreadIndex, (int)(time_get_nanoseconds() - ThreadRenderTime).count());
+			}
+
+			pThread->m_IsRendering = false;
+		}
+	}
+};
+
+CCommandProcessorFragment_GLBase *CreateVulkanCommandProcessorFragment()
+{
+	return new CCommandProcessorFragment_Vulkan();
+}
+
+#endif
diff --git a/src_bkp/engine/client/backend/vulkan/backend_vulkan.h b/src_bkp/engine/client/backend/vulkan/backend_vulkan.h
new file mode 100644
index 0000000000..272414dd4b
--- /dev/null
+++ b/src_bkp/engine/client/backend/vulkan/backend_vulkan.h
@@ -0,0 +1,11 @@
+#ifndef ENGINE_CLIENT_BACKEND_VULKAN_BACKEND_VULKAN_H
+#define ENGINE_CLIENT_BACKEND_VULKAN_BACKEND_VULKAN_H
+
+class CCommandProcessorFragment_GLBase;
+
+static constexpr int gs_BackendVulkanMajor = 1;
+static constexpr int gs_BackendVulkanMinor = 1;
+
+CCommandProcessorFragment_GLBase *CreateVulkanCommandProcessorFragment();
+
+#endif
diff --git a/src_bkp/engine/client/backend_sdl.cpp b/src_bkp/engine/client/backend_sdl.cpp
new file mode 100644
index 0000000000..ab5c402d95
--- /dev/null
+++ b/src_bkp/engine/client/backend_sdl.cpp
@@ -0,0 +1,1635 @@
+#include <base/detect.h>
+
+#ifndef CONF_BACKEND_OPENGL_ES
+#include <GL/glew.h>
+#endif
+
+#include <SDL.h>
+#include <SDL_messagebox.h>
+
+#include <base/math.h>
+#include <cstdlib>
+
+#include <engine/shared/config.h>
+#include <engine/shared/localization.h>
+
+#include <base/tl/threading.h>
+
+#if defined(CONF_VIDEORECORDER)
+#include <engine/shared/video.h>
+#endif
+
+#include "backend_sdl.h"
+
+#if defined(CONF_HEADLESS_CLIENT)
+#include "backend/null/backend_null.h"
+#endif
+
+#if !defined(CONF_BACKEND_OPENGL_ES)
+#include "backend/opengl/backend_opengl3.h"
+#endif
+
+#if defined(CONF_BACKEND_OPENGL_ES3) || defined(CONF_BACKEND_OPENGL_ES)
+#include "backend/opengles/backend_opengles3.h"
+#endif
+
+#if defined(CONF_BACKEND_VULKAN)
+#include "backend/vulkan/backend_vulkan.h"
+#endif
+
+#include "graphics_threaded.h"
+
+#include <engine/graphics.h>
+
+class IStorage;
+
+// ------------ CGraphicsBackend_Threaded
+
+void CGraphicsBackend_Threaded::ThreadFunc(void *pUser)
+{
+	auto *pSelf = (CGraphicsBackend_Threaded *)pUser;
+	std::unique_lock<std::mutex> Lock(pSelf->m_BufferSwapMutex);
+	// notify, that the thread started
+	pSelf->m_Started = true;
+	pSelf->m_BufferSwapCond.notify_all();
+	while(!pSelf->m_Shutdown)
+	{
+		pSelf->m_BufferSwapCond.wait(Lock, [&pSelf] { return pSelf->m_pBuffer != nullptr || pSelf->m_Shutdown; });
+		if(pSelf->m_pBuffer)
+		{
+#ifdef CONF_PLATFORM_MACOS
+			CAutoreleasePool AutoreleasePool;
+#endif
+			pSelf->m_pProcessor->RunBuffer(pSelf->m_pBuffer);
+
+			pSelf->m_pBuffer = nullptr;
+			pSelf->m_BufferInProcess.store(false, std::memory_order_relaxed);
+			pSelf->m_BufferSwapCond.notify_all();
+
+#if defined(CONF_VIDEORECORDER)
+			if(IVideo::Current())
+				IVideo::Current()->NextVideoFrameThread();
+#endif
+		}
+	}
+}
+
+CGraphicsBackend_Threaded::CGraphicsBackend_Threaded(TTranslateFunc &&TranslateFunc) :
+	m_TranslateFunc(std::move(TranslateFunc))
+{
+	m_pBuffer = nullptr;
+	m_pProcessor = nullptr;
+	m_Shutdown = true;
+	m_BufferInProcess.store(false, std::memory_order_relaxed);
+}
+
+void CGraphicsBackend_Threaded::StartProcessor(ICommandProcessor *pProcessor)
+{
+	dbg_assert(m_Shutdown, "Processor was already not shut down.");
+	m_Shutdown = false;
+	m_pProcessor = pProcessor;
+	std::unique_lock<std::mutex> Lock(m_BufferSwapMutex);
+	m_pThread = thread_init(ThreadFunc, this, "Graphics thread");
+	// wait for the thread to start
+	m_BufferSwapCond.wait(Lock, [this]() -> bool { return m_Started; });
+}
+
+void CGraphicsBackend_Threaded::StopProcessor()
+{
+	dbg_assert(!m_Shutdown, "Processor was already shut down.");
+	m_Shutdown = true;
+	{
+		std::unique_lock<std::mutex> Lock(m_BufferSwapMutex);
+		m_Warning = m_pProcessor->GetWarning();
+		m_BufferSwapCond.notify_all();
+	}
+	thread_wait(m_pThread);
+}
+
+void CGraphicsBackend_Threaded::RunBuffer(CCommandBuffer *pBuffer)
+{
+	SGfxErrorContainer Error;
+#ifdef CONF_WEBASM
+	// run everything single threaded for now, context binding in a thread seems to not work as of now
+	Error = m_pProcessor->GetError();
+	if(Error.m_ErrorType == GFX_ERROR_TYPE_NONE)
+	{
+		RunBufferSingleThreadedUnsafe(pBuffer);
+	}
+#else
+	WaitForIdle();
+	{
+		std::unique_lock<std::mutex> Lock(m_BufferSwapMutex);
+		Error = m_pProcessor->GetError();
+		if(Error.m_ErrorType == GFX_ERROR_TYPE_NONE)
+		{
+			m_pBuffer = pBuffer;
+			m_BufferInProcess.store(true, std::memory_order_relaxed);
+			m_BufferSwapCond.notify_all();
+		}
+	}
+#endif
+
+	// Process error after lock is released to prevent deadlock
+	if(Error.m_ErrorType != GFX_ERROR_TYPE_NONE)
+	{
+		ProcessError(Error);
+	}
+}
+
+void CGraphicsBackend_Threaded::RunBufferSingleThreadedUnsafe(CCommandBuffer *pBuffer)
+{
+	m_pProcessor->RunBuffer(pBuffer);
+}
+
+bool CGraphicsBackend_Threaded::IsIdle() const
+{
+	return !m_BufferInProcess.load(std::memory_order_relaxed);
+}
+
+void CGraphicsBackend_Threaded::WaitForIdle()
+{
+	std::unique_lock<std::mutex> Lock(m_BufferSwapMutex);
+	m_BufferSwapCond.wait(Lock, [this]() { return m_pBuffer == nullptr; });
+}
+
+void CGraphicsBackend_Threaded::ProcessError(const SGfxErrorContainer &Error)
+{
+	std::string VerboseStr = "Graphics Assertion:";
+	for(const auto &ErrStr : Error.m_vErrors)
+	{
+		VerboseStr.append("\n");
+		if(ErrStr.m_RequiresTranslation)
+			VerboseStr.append(m_TranslateFunc(ErrStr.m_Err.c_str(), ""));
+		else
+			VerboseStr.append(ErrStr.m_Err);
+	}
+	dbg_assert(false, VerboseStr.c_str());
+}
+
+bool CGraphicsBackend_Threaded::GetWarning(std::vector<std::string> &WarningStrings)
+{
+	if(m_Warning.m_WarningType != GFX_WARNING_TYPE_NONE)
+	{
+		m_Warning.m_WarningType = GFX_WARNING_TYPE_NONE;
+		WarningStrings = m_Warning.m_vWarnings;
+		return true;
+	}
+	return false;
+}
+
+// ------------ CCommandProcessorFragment_General
+
+void CCommandProcessorFragment_General::Cmd_Signal(const CCommandBuffer::SCommand_Signal *pCommand)
+{
+	pCommand->m_pSemaphore->Signal();
+}
+
+bool CCommandProcessorFragment_General::RunCommand(const CCommandBuffer::SCommand *pBaseCommand)
+{
+	switch(pBaseCommand->m_Cmd)
+	{
+	case CCommandBuffer::CMD_NOP: break;
+	case CCommandBuffer::CMD_SIGNAL: Cmd_Signal(static_cast<const CCommandBuffer::SCommand_Signal *>(pBaseCommand)); break;
+	default: return false;
+	}
+
+	return true;
+}
+
+// ------------ CCommandProcessorFragment_SDL
+void CCommandProcessorFragment_SDL::Cmd_Init(const SCommand_Init *pCommand)
+{
+	m_GLContext = pCommand->m_GLContext;
+	m_pWindow = pCommand->m_pWindow;
+	if(m_GLContext)
+		SDL_GL_MakeCurrent(m_pWindow, m_GLContext);
+}
+
+void CCommandProcessorFragment_SDL::Cmd_Shutdown(const SCommand_Shutdown *pCommand)
+{
+	if(m_GLContext)
+		SDL_GL_MakeCurrent(NULL, NULL);
+}
+
+void CCommandProcessorFragment_SDL::Cmd_Swap(const CCommandBuffer::SCommand_Swap *pCommand)
+{
+	if(m_GLContext)
+		SDL_GL_SwapWindow(m_pWindow);
+}
+
+void CCommandProcessorFragment_SDL::Cmd_VSync(const CCommandBuffer::SCommand_VSync *pCommand)
+{
+	if(m_GLContext)
+		*pCommand->m_pRetOk = SDL_GL_SetSwapInterval(pCommand->m_VSync) == 0;
+}
+
+void CCommandProcessorFragment_SDL::Cmd_WindowCreateNtf(const CCommandBuffer::SCommand_WindowCreateNtf *pCommand)
+{
+	m_pWindow = SDL_GetWindowFromID(pCommand->m_WindowID);
+	// Android destroys windows when they are not visible, so we get the new one and work with that
+	// The graphic context does not need to be recreated, just unbound see @see SCommand_WindowDestroyNtf
+#ifdef CONF_PLATFORM_ANDROID
+	if(m_GLContext)
+		SDL_GL_MakeCurrent(m_pWindow, m_GLContext);
+	dbg_msg("gfx", "render surface created.");
+#endif
+}
+
+void CCommandProcessorFragment_SDL::Cmd_WindowDestroyNtf(const CCommandBuffer::SCommand_WindowDestroyNtf *pCommand)
+{
+	// Unbind the graphic context from the window, so it does not get destroyed
+#ifdef CONF_PLATFORM_ANDROID
+	dbg_msg("gfx", "render surface destroyed.");
+	if(m_GLContext)
+		SDL_GL_MakeCurrent(NULL, NULL);
+#endif
+}
+
+CCommandProcessorFragment_SDL::CCommandProcessorFragment_SDL() = default;
+
+bool CCommandProcessorFragment_SDL::RunCommand(const CCommandBuffer::SCommand *pBaseCommand)
+{
+	switch(pBaseCommand->m_Cmd)
+	{
+	case CCommandBuffer::CMD_WINDOW_CREATE_NTF: Cmd_WindowCreateNtf(static_cast<const CCommandBuffer::SCommand_WindowCreateNtf *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_WINDOW_DESTROY_NTF: Cmd_WindowDestroyNtf(static_cast<const CCommandBuffer::SCommand_WindowDestroyNtf *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_SWAP: Cmd_Swap(static_cast<const CCommandBuffer::SCommand_Swap *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_VSYNC: Cmd_VSync(static_cast<const CCommandBuffer::SCommand_VSync *>(pBaseCommand)); break;
+	case CCommandBuffer::CMD_MULTISAMPLING: break;
+	case CMD_INIT: Cmd_Init(static_cast<const SCommand_Init *>(pBaseCommand)); break;
+	case CMD_SHUTDOWN: Cmd_Shutdown(static_cast<const SCommand_Shutdown *>(pBaseCommand)); break;
+	case CCommandProcessorFragment_GLBase::CMD_PRE_INIT: break;
+	case CCommandProcessorFragment_GLBase::CMD_POST_SHUTDOWN: break;
+	default: return false;
+	}
+
+	return true;
+}
+
+// ------------ CCommandProcessor_SDL_GL
+
+void CCommandProcessor_SDL_GL::HandleError()
+{
+	switch(m_Error.m_ErrorType)
+	{
+	case GFX_ERROR_TYPE_INIT:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("Failed during initialization. Try to change gfx_backend to OpenGL or Vulkan in settings_ddnet.cfg in the config directory and try again.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_OUT_OF_MEMORY_IMAGE:
+		[[fallthrough]];
+	case GFX_ERROR_TYPE_OUT_OF_MEMORY_BUFFER:
+		[[fallthrough]];
+	case GFX_ERROR_TYPE_OUT_OF_MEMORY_STAGING:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("Out of VRAM. Try removing custom assets (skins, entities, etc.), especially those with high resolution.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_RENDER_RECORDING:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("An error during command recording occurred. Try to update your GPU drivers.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_RENDER_CMD_FAILED:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("A render command failed. Try to update your GPU drivers.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_RENDER_SUBMIT_FAILED:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("Submitting the render commands failed. Try to update your GPU drivers.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_SWAP_FAILED:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("Failed to swap framebuffers. Try to update your GPU drivers.", "Graphics error")});
+		break;
+	case GFX_ERROR_TYPE_UNKNOWN:
+		[[fallthrough]];
+	default:
+		m_Error.m_vErrors.emplace_back(SGfxErrorContainer::SError{true, Localizable("Unknown error. Try to change gfx_backend to OpenGL or Vulkan in settings_ddnet.cfg in the config directory and try again.", "Graphics error")});
+		break;
+	}
+}
+
+void CCommandProcessor_SDL_GL::HandleWarning()
+{
+	switch(m_Warning.m_WarningType)
+	{
+	case GFX_WARNING_TYPE_INIT_FAILED:
+		m_Warning.m_vWarnings.emplace_back(Localizable("Could not initialize the given graphics backend, reverting to the default backend now.", "Graphics error"));
+		break;
+	case GFX_WARNING_TYPE_INIT_FAILED_MISSING_INTEGRATED_GPU_DRIVER:
+		m_Warning.m_vWarnings.emplace_back(Localizable("Could not initialize the given graphics backend, this is probably because you didn't install the driver of the integrated graphics card.", "Graphics error"));
+		break;
+	case GFX_WARNING_MISSING_EXTENSION:
+		// ignore this warning for now
+		return;
+	case GFX_WARNING_LOW_ON_MEMORY:
+		// ignore this warning for now
+		return;
+	default:
+		dbg_msg("gfx", "unhandled warning %d", (int)m_Warning.m_WarningType);
+		break;
+	}
+}
+
+void CCommandProcessor_SDL_GL::RunBuffer(CCommandBuffer *pBuffer)
+{
+	m_pGLBackend->StartCommands(pBuffer->m_CommandCount, pBuffer->m_RenderCallCount);
+
+	for(CCommandBuffer::SCommand *pCommand = pBuffer->Head(); pCommand; pCommand = pCommand->m_pNext)
+	{
+		auto Res = m_pGLBackend->RunCommand(pCommand);
+		if(Res == ERunCommandReturnTypes::RUN_COMMAND_COMMAND_HANDLED)
+		{
+			continue;
+		}
+		else if(Res == ERunCommandReturnTypes::RUN_COMMAND_COMMAND_ERROR)
+		{
+			m_Error = m_pGLBackend->GetError();
+			HandleError();
+			return;
+		}
+		else if(Res == ERunCommandReturnTypes::RUN_COMMAND_COMMAND_WARNING)
+		{
+			m_Warning = m_pGLBackend->GetWarning();
+			HandleWarning();
+			return;
+		}
+
+		if(m_SDL.RunCommand(pCommand))
+			continue;
+
+		if(m_General.RunCommand(pCommand))
+			continue;
+
+		dbg_msg("gfx", "unknown command %d", pCommand->m_Cmd);
+	}
+
+	m_pGLBackend->EndCommands();
+}
+
+CCommandProcessor_SDL_GL::CCommandProcessor_SDL_GL(EBackendType BackendType, int GLMajor, int GLMinor, int GLPatch)
+{
+	m_BackendType = BackendType;
+
+#if defined(CONF_HEADLESS_CLIENT)
+	m_pGLBackend = new CCommandProcessorFragment_Null();
+#else
+	if(BackendType == BACKEND_TYPE_OPENGL_ES)
+	{
+#if defined(CONF_BACKEND_OPENGL_ES) || defined(CONF_BACKEND_OPENGL_ES3)
+		if(GLMajor < 3)
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGLES();
+		}
+		else
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGLES3();
+		}
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_OPENGL)
+	{
+#if !defined(CONF_BACKEND_OPENGL_ES)
+		if(GLMajor < 2)
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGL();
+		}
+		if(GLMajor == 2)
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGL2();
+		}
+		if(GLMajor == 3 && GLMinor == 0)
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGL3();
+		}
+		else if((GLMajor == 3 && GLMinor == 3) || GLMajor >= 4)
+		{
+			m_pGLBackend = new CCommandProcessorFragment_OpenGL3_3();
+		}
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_VULKAN)
+	{
+#if defined(CONF_BACKEND_VULKAN)
+		m_pGLBackend = CreateVulkanCommandProcessorFragment();
+#endif
+	}
+#endif
+}
+
+CCommandProcessor_SDL_GL::~CCommandProcessor_SDL_GL()
+{
+	delete m_pGLBackend;
+}
+
+const SGfxErrorContainer &CCommandProcessor_SDL_GL::GetError() const
+{
+	return m_Error;
+}
+
+void CCommandProcessor_SDL_GL::ErroneousCleanup()
+{
+	return m_pGLBackend->ErroneousCleanup();
+}
+
+const SGfxWarningContainer &CCommandProcessor_SDL_GL::GetWarning() const
+{
+	return m_Warning;
+}
+
+// ------------ CGraphicsBackend_SDL_GL
+
+static bool BackendInitGlew(EBackendType BackendType, int &GlewMajor, int &GlewMinor, int &GlewPatch)
+{
+	if(BackendType == BACKEND_TYPE_OPENGL)
+	{
+#ifndef CONF_BACKEND_OPENGL_ES
+		// support graphic cards that are pretty old(and linux)
+		glewExperimental = GL_TRUE;
+#ifdef CONF_GLEW_HAS_CONTEXT_INIT
+		if(GLEW_OK != glewContextInit())
+#else
+		if(GLEW_OK != glewInit())
+#endif
+			return false;
+
+#ifdef GLEW_VERSION_4_6
+		if(GLEW_VERSION_4_6)
+		{
+			GlewMajor = 4;
+			GlewMinor = 6;
+			GlewPatch = 0;
+			return true;
+		}
+#endif
+#ifdef GLEW_VERSION_4_5
+		if(GLEW_VERSION_4_5)
+		{
+			GlewMajor = 4;
+			GlewMinor = 5;
+			GlewPatch = 0;
+			return true;
+		}
+#endif
+// Don't allow GL 3.3, if the driver doesn't support at least OpenGL 4.5
+#ifndef CONF_FAMILY_WINDOWS
+		if(GLEW_VERSION_4_4)
+		{
+			GlewMajor = 4;
+			GlewMinor = 4;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_4_3)
+		{
+			GlewMajor = 4;
+			GlewMinor = 3;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_4_2)
+		{
+			GlewMajor = 4;
+			GlewMinor = 2;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_4_1)
+		{
+			GlewMajor = 4;
+			GlewMinor = 1;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_4_0)
+		{
+			GlewMajor = 4;
+			GlewMinor = 0;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_3_3)
+		{
+			GlewMajor = 3;
+			GlewMinor = 3;
+			GlewPatch = 0;
+			return true;
+		}
+#endif
+		if(GLEW_VERSION_3_0)
+		{
+			GlewMajor = 3;
+			GlewMinor = 0;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_2_1)
+		{
+			GlewMajor = 2;
+			GlewMinor = 1;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_2_0)
+		{
+			GlewMajor = 2;
+			GlewMinor = 0;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_1_5)
+		{
+			GlewMajor = 1;
+			GlewMinor = 5;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_1_4)
+		{
+			GlewMajor = 1;
+			GlewMinor = 4;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_1_3)
+		{
+			GlewMajor = 1;
+			GlewMinor = 3;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_1_2_1)
+		{
+			GlewMajor = 1;
+			GlewMinor = 2;
+			GlewPatch = 1;
+			return true;
+		}
+		if(GLEW_VERSION_1_2)
+		{
+			GlewMajor = 1;
+			GlewMinor = 2;
+			GlewPatch = 0;
+			return true;
+		}
+		if(GLEW_VERSION_1_1)
+		{
+			GlewMajor = 1;
+			GlewMinor = 1;
+			GlewPatch = 0;
+			return true;
+		}
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_OPENGL_ES)
+	{
+		// just assume the version we need
+		GlewMajor = 3;
+		GlewMinor = 0;
+		GlewPatch = 0;
+
+		return true;
+	}
+
+	return true;
+}
+
+static int IsVersionSupportedGlew(EBackendType BackendType, int VersionMajor, int VersionMinor, int VersionPatch, int GlewMajor, int GlewMinor, int GlewPatch)
+{
+	int InitError = 0;
+
+	if(BackendType == BACKEND_TYPE_OPENGL)
+	{
+		if(VersionMajor >= 4 && GlewMajor < 4)
+		{
+			InitError = -1;
+		}
+		else if(VersionMajor >= 3 && GlewMajor < 3)
+		{
+			InitError = -1;
+		}
+		else if(VersionMajor == 3 && GlewMajor == 3)
+		{
+			if(VersionMinor >= 3 && GlewMinor < 3)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 2 && GlewMinor < 2)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 1 && GlewMinor < 1)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 0 && GlewMinor < 0)
+			{
+				InitError = -1;
+			}
+		}
+		else if(VersionMajor >= 2 && GlewMajor < 2)
+		{
+			InitError = -1;
+		}
+		else if(VersionMajor == 2 && GlewMajor == 2)
+		{
+			if(VersionMinor >= 1 && GlewMinor < 1)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 0 && GlewMinor < 0)
+			{
+				InitError = -1;
+			}
+		}
+		else if(VersionMajor >= 1 && GlewMajor < 1)
+		{
+			InitError = -1;
+		}
+		else if(VersionMajor == 1 && GlewMajor == 1)
+		{
+			if(VersionMinor >= 5 && GlewMinor < 5)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 4 && GlewMinor < 4)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 3 && GlewMinor < 3)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 2 && GlewMinor < 2)
+			{
+				InitError = -1;
+			}
+			else if(VersionMinor == 2 && GlewMinor == 2)
+			{
+				if(VersionPatch >= 1 && GlewPatch < 1)
+				{
+					InitError = -1;
+				}
+				if(VersionPatch >= 0 && GlewPatch < 0)
+				{
+					InitError = -1;
+				}
+			}
+			if(VersionMinor >= 1 && GlewMinor < 1)
+			{
+				InitError = -1;
+			}
+			if(VersionMinor >= 0 && GlewMinor < 0)
+			{
+				InitError = -1;
+			}
+		}
+	}
+
+	return InitError;
+}
+
+EBackendType CGraphicsBackend_SDL_GL::DetectBackend()
+{
+	EBackendType RetBackendType = BACKEND_TYPE_OPENGL;
+#if defined(CONF_BACKEND_VULKAN)
+	const char *pEnvDriver = SDL_getenv("DDNET_DRIVER");
+	if(pEnvDriver && str_comp_nocase(pEnvDriver, "GLES") == 0)
+		RetBackendType = BACKEND_TYPE_OPENGL_ES;
+	else if(pEnvDriver && str_comp_nocase(pEnvDriver, "Vulkan") == 0)
+		RetBackendType = BACKEND_TYPE_VULKAN;
+	else if(pEnvDriver && str_comp_nocase(pEnvDriver, "OpenGL") == 0)
+		RetBackendType = BACKEND_TYPE_OPENGL;
+	else if(pEnvDriver == nullptr)
+	{
+		// load the config backend
+		const char *pConfBackend = g_Config.m_GfxBackend;
+		if(str_comp_nocase(pConfBackend, "GLES") == 0)
+			RetBackendType = BACKEND_TYPE_OPENGL_ES;
+		else if(str_comp_nocase(pConfBackend, "Vulkan") == 0)
+			RetBackendType = BACKEND_TYPE_VULKAN;
+		else if(str_comp_nocase(pConfBackend, "OpenGL") == 0)
+			RetBackendType = BACKEND_TYPE_OPENGL;
+	}
+#else
+	RetBackendType = BACKEND_TYPE_OPENGL;
+#endif
+#if !defined(CONF_BACKEND_OPENGL_ES) && !defined(CONF_BACKEND_OPENGL_ES3)
+	if(RetBackendType == BACKEND_TYPE_OPENGL_ES)
+		RetBackendType = BACKEND_TYPE_OPENGL;
+#elif defined(CONF_BACKEND_OPENGL_ES)
+	if(RetBackendType == BACKEND_TYPE_OPENGL)
+		RetBackendType = BACKEND_TYPE_OPENGL_ES;
+#endif
+	return RetBackendType;
+}
+
+void CGraphicsBackend_SDL_GL::ClampDriverVersion(EBackendType BackendType)
+{
+	if(BackendType == BACKEND_TYPE_OPENGL)
+	{
+		// clamp the versions to existing versions(only for OpenGL major <= 3)
+		if(g_Config.m_GfxGLMajor == 1)
+		{
+			g_Config.m_GfxGLMinor = clamp(g_Config.m_GfxGLMinor, 1, 5);
+			if(g_Config.m_GfxGLMinor == 2)
+				g_Config.m_GfxGLPatch = clamp(g_Config.m_GfxGLPatch, 0, 1);
+			else
+				g_Config.m_GfxGLPatch = 0;
+		}
+		else if(g_Config.m_GfxGLMajor == 2)
+		{
+			g_Config.m_GfxGLMinor = clamp(g_Config.m_GfxGLMinor, 0, 1);
+			g_Config.m_GfxGLPatch = 0;
+		}
+		else if(g_Config.m_GfxGLMajor == 3)
+		{
+			g_Config.m_GfxGLMinor = clamp(g_Config.m_GfxGLMinor, 0, 3);
+			if(g_Config.m_GfxGLMinor < 3)
+				g_Config.m_GfxGLMinor = 0;
+			g_Config.m_GfxGLPatch = 0;
+		}
+	}
+	else if(BackendType == BACKEND_TYPE_OPENGL_ES)
+	{
+#if !defined(CONF_BACKEND_OPENGL_ES3)
+		// Make sure GLES is set to 1.0 (which is equivalent to OpenGL 1.3), if its not set to >= 3.0(which is equivalent to OpenGL 3.3)
+		if(g_Config.m_GfxGLMajor < 3)
+		{
+			g_Config.m_GfxGLMajor = 1;
+			g_Config.m_GfxGLMinor = 0;
+			g_Config.m_GfxGLPatch = 0;
+
+			// GLES also doesn't know GL_QUAD
+			g_Config.m_GfxQuadAsTriangle = 1;
+		}
+#else
+		g_Config.m_GfxGLMajor = 3;
+		g_Config.m_GfxGLMinor = 0;
+		g_Config.m_GfxGLPatch = 0;
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_VULKAN)
+	{
+#if defined(CONF_BACKEND_VULKAN)
+		g_Config.m_GfxGLMajor = gs_BackendVulkanMajor;
+		g_Config.m_GfxGLMinor = gs_BackendVulkanMinor;
+		g_Config.m_GfxGLPatch = 0;
+#endif
+	}
+}
+
+bool CGraphicsBackend_SDL_GL::ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg)
+{
+	if(m_pProcessor != nullptr)
+	{
+		m_pProcessor->ErroneousCleanup();
+	}
+	// TODO: Remove this workaround when https://github.com/libsdl-org/SDL/issues/3750 is
+	// fixed and pass the window to SDL_ShowSimpleMessageBox to make the popup modal instead
+	// of destroying the window before opening the popup.
+	if(m_pWindow != nullptr)
+	{
+		SDL_DestroyWindow(m_pWindow);
+		m_pWindow = nullptr;
+	}
+	return SDL_ShowSimpleMessageBox(Type, pTitle, pMsg, nullptr) == 0;
+}
+
+bool CGraphicsBackend_SDL_GL::IsModernAPI(EBackendType BackendType)
+{
+	if(BackendType == BACKEND_TYPE_OPENGL)
+		return (g_Config.m_GfxGLMajor == 3 && g_Config.m_GfxGLMinor == 3) || g_Config.m_GfxGLMajor >= 4;
+	else if(BackendType == BACKEND_TYPE_OPENGL_ES)
+		return g_Config.m_GfxGLMajor >= 3;
+	else if(BackendType == BACKEND_TYPE_VULKAN)
+		return true;
+
+	return false;
+}
+
+bool CGraphicsBackend_SDL_GL::GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType)
+{
+	if(BackendType == BACKEND_TYPE_AUTO)
+		BackendType = m_BackendType;
+	if(BackendType == BACKEND_TYPE_OPENGL)
+	{
+		pName = "OpenGL";
+#ifndef CONF_BACKEND_OPENGL_ES
+		if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_LEGACY)
+		{
+			Major = 1;
+			Minor = 4;
+			Patch = 0;
+			return true;
+		}
+		else if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_DEFAULT)
+		{
+			Major = 3;
+			Minor = 0;
+			Patch = 0;
+			return true;
+		}
+		else if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_MODERN)
+		{
+			Major = 3;
+			Minor = 3;
+			Patch = 0;
+			return true;
+		}
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_OPENGL_ES)
+	{
+		pName = "GLES";
+#ifdef CONF_BACKEND_OPENGL_ES
+		if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_LEGACY)
+		{
+			Major = 1;
+			Minor = 0;
+			Patch = 0;
+			return true;
+		}
+		else if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_DEFAULT)
+		{
+			Major = 3;
+			Minor = 0;
+			Patch = 0;
+			// there isn't really a default one
+			return false;
+		}
+#endif
+#ifdef CONF_BACKEND_OPENGL_ES3
+		if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_MODERN)
+		{
+			Major = 3;
+			Minor = 0;
+			Patch = 0;
+			return true;
+		}
+#endif
+	}
+	else if(BackendType == BACKEND_TYPE_VULKAN)
+	{
+		pName = "Vulkan";
+#ifdef CONF_BACKEND_VULKAN
+		if(DriverAgeType == GRAPHICS_DRIVER_AGE_TYPE_DEFAULT)
+		{
+			Major = gs_BackendVulkanMajor;
+			Minor = gs_BackendVulkanMinor;
+			Patch = 0;
+			return true;
+		}
+#else
+		return false;
+#endif
+	}
+	return false;
+}
+
+const char *CGraphicsBackend_SDL_GL::GetScreenName(int Screen) const
+{
+	const char *pName = SDL_GetDisplayName(Screen);
+	return pName == nullptr ? "unknown/error" : pName;
+}
+
+static void DisplayToVideoMode(CVideoMode *pVMode, SDL_DisplayMode *pMode, int HiDPIScale, int RefreshRate)
+{
+	pVMode->m_CanvasWidth = pMode->w * HiDPIScale;
+	pVMode->m_CanvasHeight = pMode->h * HiDPIScale;
+	pVMode->m_WindowWidth = pMode->w;
+	pVMode->m_WindowHeight = pMode->h;
+	pVMode->m_RefreshRate = RefreshRate;
+	pVMode->m_Red = SDL_BITSPERPIXEL(pMode->format);
+	pVMode->m_Green = SDL_BITSPERPIXEL(pMode->format);
+	pVMode->m_Blue = SDL_BITSPERPIXEL(pMode->format);
+	pVMode->m_Format = pMode->format;
+}
+
+void CGraphicsBackend_SDL_GL::GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID)
+{
+	SDL_DisplayMode DesktopMode;
+	int maxModes = SDL_GetNumDisplayModes(ScreenID);
+	int numModes = 0;
+
+	// Only collect fullscreen modes when requested, that makes sure in windowed mode no refresh rates are shown that aren't supported without
+	// fullscreen anyway(except fullscreen desktop)
+	bool IsFullscreenDestkop = m_pWindow != NULL && (((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) || g_Config.m_GfxFullscreen == 3);
+	bool CollectFullscreenModes = m_pWindow == NULL || ((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN) != 0 && !IsFullscreenDestkop);
+
+	if(SDL_GetDesktopDisplayMode(ScreenID, &DesktopMode) < 0)
+	{
+		dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+	}
+
+	constexpr int ModeCount = 256;
+	SDL_DisplayMode aModes[ModeCount];
+	int NumModes = 0;
+	for(int i = 0; i < maxModes && NumModes < ModeCount; i++)
+	{
+		SDL_DisplayMode mode;
+		if(SDL_GetDisplayMode(ScreenID, i, &mode) < 0)
+		{
+			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+			continue;
+		}
+
+		aModes[NumModes] = mode;
+		++NumModes;
+	}
+
+	auto &&ModeInsert = [&](SDL_DisplayMode &mode) {
+		if(numModes < MaxModes)
+		{
+			// if last mode was equal, ignore this one --- in fullscreen this can really only happen if the screen
+			// supports different color modes
+			// in non fullscren these are the modes that show different refresh rate, but are basically the same
+			if(numModes > 0 && pModes[numModes - 1].m_WindowWidth == mode.w && pModes[numModes - 1].m_WindowHeight == mode.h && (pModes[numModes - 1].m_RefreshRate == mode.refresh_rate || (mode.refresh_rate != DesktopMode.refresh_rate && !CollectFullscreenModes)))
+				return;
+
+			DisplayToVideoMode(&pModes[numModes], &mode, HiDPIScale, !CollectFullscreenModes ? DesktopMode.refresh_rate : mode.refresh_rate);
+			numModes++;
+		}
+	};
+
+	for(int i = 0; i < NumModes; i++)
+	{
+		SDL_DisplayMode &mode = aModes[i];
+
+		if(mode.w > MaxWindowWidth || mode.h > MaxWindowHeight)
+			continue;
+
+		ModeInsert(mode);
+
+		if(IsFullscreenDestkop)
+			break;
+
+		if(numModes >= MaxModes)
+			break;
+	}
+	*pNumModes = numModes;
+}
+
+void CGraphicsBackend_SDL_GL::GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID)
+{
+	SDL_DisplayMode DPMode;
+	// if "real" fullscreen, obtain the video mode for that
+	if((SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN)
+	{
+		if(SDL_GetCurrentDisplayMode(ScreenID, &DPMode))
+		{
+			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+		}
+	}
+	else
+	{
+		if(SDL_GetDesktopDisplayMode(ScreenID, &DPMode) < 0)
+		{
+			dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+		}
+		else
+		{
+			int Width = 0;
+			int Height = 0;
+			SDL_GL_GetDrawableSize(m_pWindow, &Width, &Height);
+			DPMode.w = Width;
+			DPMode.h = Height;
+		}
+	}
+	DisplayToVideoMode(&CurMode, &DPMode, HiDPIScale, DPMode.refresh_rate);
+}
+
+CGraphicsBackend_SDL_GL::CGraphicsBackend_SDL_GL(TTranslateFunc &&TranslateFunc) :
+	CGraphicsBackend_Threaded(std::move(TranslateFunc))
+{
+	mem_zero(m_aErrorString, std::size(m_aErrorString));
+}
+
+int CGraphicsBackend_SDL_GL::Init(const char *pName, int *pScreen, int *pWidth, int *pHeight, int *pRefreshRate, int *pFsaaSamples, int Flags, int *pDesktopWidth, int *pDesktopHeight, int *pCurrentWidth, int *pCurrentHeight, IStorage *pStorage)
+{
+#if defined(CONF_HEADLESS_CLIENT)
+	int InitError = 0;
+	const char *pErrorStr = NULL;
+	int GlewMajor = 0;
+	int GlewMinor = 0;
+	int GlewPatch = 0;
+	IsVersionSupportedGlew(m_BackendType, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, GlewMajor, GlewMinor, GlewPatch);
+	BackendInitGlew(m_BackendType, GlewMajor, GlewMinor, GlewPatch);
+#else
+	// print sdl version
+	{
+		SDL_version Compiled;
+		SDL_version Linked;
+
+		SDL_VERSION(&Compiled);
+		SDL_GetVersion(&Linked);
+		dbg_msg("sdl", "SDL version %d.%d.%d (compiled = %d.%d.%d)", Linked.major, Linked.minor, Linked.patch,
+			Compiled.major, Compiled.minor, Compiled.patch);
+	}
+
+	if(!SDL_WasInit(SDL_INIT_VIDEO))
+	{
+		if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+		{
+			dbg_msg("gfx", "unable to init SDL video: %s", SDL_GetError());
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_SDL_INIT_FAILED;
+		}
+	}
+
+	EBackendType OldBackendType = m_BackendType;
+	m_BackendType = DetectBackend();
+	// little fallback for Vulkan
+	if(OldBackendType != BACKEND_TYPE_AUTO)
+	{
+		if(m_BackendType == BACKEND_TYPE_VULKAN)
+		{
+			// try default opengl settings
+			str_copy(g_Config.m_GfxBackend, "OpenGL");
+			g_Config.m_GfxGLMajor = 3;
+			g_Config.m_GfxGLMinor = 0;
+			g_Config.m_GfxGLPatch = 0;
+			// do another analysis round too, just in case
+			g_Config.m_Gfx3DTextureAnalysisRan = 0;
+			g_Config.m_GfxDriverIsBlocked = 0;
+
+			SDL_setenv("DDNET_DRIVER", "OpenGL", 1);
+			m_BackendType = DetectBackend();
+		}
+	}
+
+	ClampDriverVersion(m_BackendType);
+
+	bool UseModernGL = IsModernAPI(m_BackendType);
+
+	bool IsOpenGLFamilyBackend = m_BackendType == BACKEND_TYPE_OPENGL || m_BackendType == BACKEND_TYPE_OPENGL_ES;
+
+	if(IsOpenGLFamilyBackend)
+	{
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, g_Config.m_GfxGLMajor);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, g_Config.m_GfxGLMinor);
+	}
+
+	dbg_msg("gfx", "Created %s %d.%d context.", ((m_BackendType == BACKEND_TYPE_VULKAN) ? "Vulkan" : "OpenGL"), g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor);
+
+	if(m_BackendType == BACKEND_TYPE_OPENGL)
+	{
+		if(g_Config.m_GfxGLMajor == 3 && g_Config.m_GfxGLMinor == 0)
+		{
+			SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
+		}
+		else if(UseModernGL)
+		{
+			SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+		}
+	}
+	else if(m_BackendType == BACKEND_TYPE_OPENGL_ES)
+	{
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+	}
+
+	if(IsOpenGLFamilyBackend)
+	{
+		*pFsaaSamples = std::clamp(*pFsaaSamples, 0, 8);
+	}
+
+	// set screen
+	SDL_Rect ScreenPos;
+	m_NumScreens = SDL_GetNumVideoDisplays();
+	if(m_NumScreens > 0)
+	{
+		*pScreen = clamp(*pScreen, 0, m_NumScreens - 1);
+		if(SDL_GetDisplayBounds(*pScreen, &ScreenPos) != 0)
+		{
+			dbg_msg("gfx", "unable to retrieve screen information: %s", SDL_GetError());
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_INFO_REQUEST_FAILED;
+		}
+	}
+	else
+	{
+		dbg_msg("gfx", "unable to retrieve number of screens: %s", SDL_GetError());
+		return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_REQUEST_FAILED;
+	}
+
+	// store desktop resolution for settings reset button
+	SDL_DisplayMode DisplayMode;
+	if(SDL_GetDesktopDisplayMode(*pScreen, &DisplayMode))
+	{
+		dbg_msg("gfx", "unable to get desktop resolution: %s", SDL_GetError());
+		return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_RESOLUTION_REQUEST_FAILED;
+	}
+
+	bool IsDesktopChanged = *pDesktopWidth == 0 || *pDesktopHeight == 0 || *pDesktopWidth != DisplayMode.w || *pDesktopHeight != DisplayMode.h;
+
+	*pDesktopWidth = DisplayMode.w;
+	*pDesktopHeight = DisplayMode.h;
+
+	// fetch supported video modes
+	bool SupportedResolution = false;
+
+	CVideoMode aModes[256];
+	int ModesCount = 0;
+	int IndexOfResolution = -1;
+	GetVideoModes(aModes, std::size(aModes), &ModesCount, 1, *pDesktopWidth, *pDesktopHeight, *pScreen);
+
+	for(int i = 0; i < ModesCount; i++)
+	{
+		if(*pWidth == aModes[i].m_WindowWidth && *pHeight == aModes[i].m_WindowHeight && (*pRefreshRate == aModes[i].m_RefreshRate || *pRefreshRate == 0))
+		{
+			SupportedResolution = true;
+			IndexOfResolution = i;
+			break;
+		}
+	}
+
+	// set flags
+	int SdlFlags = SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS;
+	SdlFlags |= (IsOpenGLFamilyBackend) ? SDL_WINDOW_OPENGL : SDL_WINDOW_VULKAN;
+	if(Flags & IGraphicsBackend::INITFLAG_HIGHDPI)
+		SdlFlags |= SDL_WINDOW_ALLOW_HIGHDPI;
+	if(Flags & IGraphicsBackend::INITFLAG_RESIZABLE)
+		SdlFlags |= SDL_WINDOW_RESIZABLE;
+	if(Flags & IGraphicsBackend::INITFLAG_BORDERLESS)
+		SdlFlags |= SDL_WINDOW_BORDERLESS;
+	if(Flags & IGraphicsBackend::INITFLAG_FULLSCREEN)
+		SdlFlags |= SDL_WINDOW_FULLSCREEN;
+	else if(Flags & (IGraphicsBackend::INITFLAG_DESKTOP_FULLSCREEN))
+		SdlFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+
+	bool IsFullscreen = (SdlFlags & SDL_WINDOW_FULLSCREEN) != 0 || g_Config.m_GfxFullscreen == 3;
+	// use desktop resolution as default resolution, clamp resolution if users's display is smaller than we remembered
+	// if the user starts in fullscreen, and the resolution was not found use the desktop one
+	if((IsFullscreen && !SupportedResolution) || *pWidth == 0 || *pHeight == 0 || (IsDesktopChanged && (!SupportedResolution || !IsFullscreen) && (*pWidth > *pDesktopWidth || *pHeight > *pDesktopHeight)))
+	{
+		*pWidth = *pDesktopWidth;
+		*pHeight = *pDesktopHeight;
+		*pRefreshRate = DisplayMode.refresh_rate;
+	}
+
+	// if in fullscreen and refresh rate wasn't set yet, just use the one from the found list
+	if(*pRefreshRate == 0 && SupportedResolution)
+	{
+		*pRefreshRate = aModes[IndexOfResolution].m_RefreshRate;
+	}
+	else if(*pRefreshRate == 0)
+	{
+		*pRefreshRate = DisplayMode.refresh_rate;
+	}
+
+	// set gl attributes
+	if(IsOpenGLFamilyBackend)
+	{
+		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+		if(*pFsaaSamples)
+		{
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, *pFsaaSamples);
+		}
+		else
+		{
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
+		}
+	}
+
+	m_pWindow = SDL_CreateWindow(
+		pName,
+		SDL_WINDOWPOS_CENTERED_DISPLAY(*pScreen),
+		SDL_WINDOWPOS_CENTERED_DISPLAY(*pScreen),
+		*pWidth,
+		*pHeight,
+		SdlFlags);
+
+	// set caption
+	if(m_pWindow == NULL)
+	{
+		dbg_msg("gfx", "unable to create window: %s", SDL_GetError());
+		if(m_BackendType == BACKEND_TYPE_VULKAN)
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_CONTEXT_FAILED;
+		else
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_SDL_WINDOW_CREATE_FAILED;
+	}
+
+	int GlewMajor = 0;
+	int GlewMinor = 0;
+	int GlewPatch = 0;
+
+	if(IsOpenGLFamilyBackend)
+	{
+		m_GLContext = SDL_GL_CreateContext(m_pWindow);
+
+		if(m_GLContext == NULL)
+		{
+			SDL_DestroyWindow(m_pWindow);
+			m_pWindow = nullptr;
+			dbg_msg("gfx", "unable to create graphic context: %s", SDL_GetError());
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_CONTEXT_FAILED;
+		}
+
+		if(!BackendInitGlew(m_BackendType, GlewMajor, GlewMinor, GlewPatch))
+		{
+			SDL_GL_DeleteContext(m_GLContext);
+			SDL_DestroyWindow(m_pWindow);
+			m_pWindow = nullptr;
+			return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_UNKNOWN;
+		}
+	}
+
+	int InitError = 0;
+	const char *pErrorStr = NULL;
+
+	InitError = IsVersionSupportedGlew(m_BackendType, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch, GlewMajor, GlewMinor, GlewPatch);
+
+	// SDL_GL_GetDrawableSize reports HiDPI resolution even with SDL_WINDOW_ALLOW_HIGHDPI not set, which is wrong
+	if(SdlFlags & SDL_WINDOW_ALLOW_HIGHDPI && IsOpenGLFamilyBackend)
+		SDL_GL_GetDrawableSize(m_pWindow, pCurrentWidth, pCurrentHeight);
+	else
+		SDL_GetWindowSize(m_pWindow, pCurrentWidth, pCurrentHeight);
+
+	if(IsOpenGLFamilyBackend)
+	{
+		SDL_GL_SetSwapInterval(Flags & IGraphicsBackend::INITFLAG_VSYNC ? 1 : 0);
+		SDL_GL_MakeCurrent(NULL, NULL);
+	}
+
+	if(InitError != 0)
+	{
+		if(m_GLContext)
+			SDL_GL_DeleteContext(m_GLContext);
+		SDL_DestroyWindow(m_pWindow);
+		m_pWindow = nullptr;
+
+		// try setting to glew supported version
+		g_Config.m_GfxGLMajor = GlewMajor;
+		g_Config.m_GfxGLMinor = GlewMinor;
+		g_Config.m_GfxGLPatch = GlewPatch;
+
+		return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_VERSION_FAILED;
+	}
+#endif // CONF_HEADLESS_CLIENT
+
+	// start the command processor
+	dbg_assert(m_pProcessor == nullptr, "Processor was not cleaned up properly.");
+	m_pProcessor = new CCommandProcessor_SDL_GL(m_BackendType, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch);
+	StartProcessor(m_pProcessor);
+
+	// issue init commands for OpenGL and SDL
+	CCommandBuffer CmdBuffer(1024, 512);
+	CCommandProcessorFragment_GLBase::SCommand_PreInit CmdPre;
+	CmdPre.m_pWindow = m_pWindow;
+	CmdPre.m_Width = *pCurrentWidth;
+	CmdPre.m_Height = *pCurrentHeight;
+	CmdPre.m_pVendorString = m_aVendorString;
+	CmdPre.m_pVersionString = m_aVersionString;
+	CmdPre.m_pRendererString = m_aRendererString;
+	CmdPre.m_pGPUList = &m_GPUList;
+	CmdBuffer.AddCommandUnsafe(CmdPre);
+	RunBufferSingleThreadedUnsafe(&CmdBuffer);
+	CmdBuffer.Reset();
+
+	// run sdl first to have the context in the thread
+	CCommandProcessorFragment_SDL::SCommand_Init CmdSDL;
+	CmdSDL.m_pWindow = m_pWindow;
+	CmdSDL.m_GLContext = m_GLContext;
+	CmdBuffer.AddCommandUnsafe(CmdSDL);
+	RunBuffer(&CmdBuffer);
+	WaitForIdle();
+	CmdBuffer.Reset();
+
+	if(InitError == 0)
+	{
+		CCommandProcessorFragment_GLBase::SCommand_Init CmdGL;
+		CmdGL.m_pWindow = m_pWindow;
+		CmdGL.m_Width = *pCurrentWidth;
+		CmdGL.m_Height = *pCurrentHeight;
+		CmdGL.m_pTextureMemoryUsage = &m_TextureMemoryUsage;
+		CmdGL.m_pBufferMemoryUsage = &m_BufferMemoryUsage;
+		CmdGL.m_pStreamMemoryUsage = &m_StreamMemoryUsage;
+		CmdGL.m_pStagingMemoryUsage = &m_StagingMemoryUsage;
+		CmdGL.m_pGPUList = &m_GPUList;
+		CmdGL.m_pReadPresentedImageDataFunc = &m_ReadPresentedImageDataFunc;
+		CmdGL.m_pStorage = pStorage;
+		CmdGL.m_pCapabilities = &m_Capabilites;
+		CmdGL.m_pInitError = &InitError;
+		CmdGL.m_RequestedMajor = g_Config.m_GfxGLMajor;
+		CmdGL.m_RequestedMinor = g_Config.m_GfxGLMinor;
+		CmdGL.m_RequestedPatch = g_Config.m_GfxGLPatch;
+		CmdGL.m_GlewMajor = GlewMajor;
+		CmdGL.m_GlewMinor = GlewMinor;
+		CmdGL.m_GlewPatch = GlewPatch;
+		CmdGL.m_pErrStringPtr = &pErrorStr;
+		CmdGL.m_pVendorString = m_aVendorString;
+		CmdGL.m_pVersionString = m_aVersionString;
+		CmdGL.m_pRendererString = m_aRendererString;
+		CmdGL.m_RequestedBackend = m_BackendType;
+		CmdBuffer.AddCommandUnsafe(CmdGL);
+
+		RunBuffer(&CmdBuffer);
+		WaitForIdle();
+		CmdBuffer.Reset();
+	}
+
+	if(InitError != 0)
+	{
+		if(InitError != -2)
+		{
+			// shutdown the context, as it might have been initialized
+			CCommandProcessorFragment_GLBase::SCommand_Shutdown CmdGL;
+			CmdBuffer.AddCommandUnsafe(CmdGL);
+			RunBuffer(&CmdBuffer);
+			WaitForIdle();
+			CmdBuffer.Reset();
+		}
+
+		CCommandProcessorFragment_SDL::SCommand_Shutdown Cmd;
+		CmdBuffer.AddCommandUnsafe(Cmd);
+		RunBuffer(&CmdBuffer);
+		WaitForIdle();
+		CmdBuffer.Reset();
+
+		CCommandProcessorFragment_GLBase::SCommand_PostShutdown CmdPost;
+		CmdBuffer.AddCommandUnsafe(CmdPost);
+		RunBufferSingleThreadedUnsafe(&CmdBuffer);
+		CmdBuffer.Reset();
+
+		// stop and delete the processor
+		StopProcessor();
+		delete m_pProcessor;
+		m_pProcessor = nullptr;
+
+		if(m_GLContext)
+			SDL_GL_DeleteContext(m_GLContext);
+		SDL_DestroyWindow(m_pWindow);
+		m_pWindow = nullptr;
+
+		// try setting to version string's supported version
+		if(InitError == -2)
+		{
+			g_Config.m_GfxGLMajor = m_Capabilites.m_ContextMajor;
+			g_Config.m_GfxGLMinor = m_Capabilites.m_ContextMinor;
+			g_Config.m_GfxGLPatch = m_Capabilites.m_ContextPatch;
+		}
+
+		if(pErrorStr != NULL)
+		{
+			str_copy(m_aErrorString, pErrorStr);
+		}
+
+		return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_VERSION_FAILED;
+	}
+
+	{
+		CCommandBuffer::SCommand_Update_Viewport CmdSDL2;
+		CmdSDL2.m_X = 0;
+		CmdSDL2.m_Y = 0;
+
+		CmdSDL2.m_Width = *pCurrentWidth;
+		CmdSDL2.m_Height = *pCurrentHeight;
+		CmdSDL2.m_ByResize = true;
+		CmdBuffer.AddCommandUnsafe(CmdSDL2);
+		RunBuffer(&CmdBuffer);
+		WaitForIdle();
+		CmdBuffer.Reset();
+	}
+
+	// return
+	return EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_NONE;
+}
+
+int CGraphicsBackend_SDL_GL::Shutdown()
+{
+	// issue a shutdown command
+	CCommandBuffer CmdBuffer(1024, 512);
+	CCommandProcessorFragment_GLBase::SCommand_Shutdown CmdGL;
+	CmdBuffer.AddCommandUnsafe(CmdGL);
+	RunBuffer(&CmdBuffer);
+	WaitForIdle();
+	CmdBuffer.Reset();
+
+	CCommandProcessorFragment_SDL::SCommand_Shutdown Cmd;
+	CmdBuffer.AddCommandUnsafe(Cmd);
+	RunBuffer(&CmdBuffer);
+	WaitForIdle();
+	CmdBuffer.Reset();
+
+	CCommandProcessorFragment_GLBase::SCommand_PostShutdown CmdPost;
+	CmdBuffer.AddCommandUnsafe(CmdPost);
+	RunBufferSingleThreadedUnsafe(&CmdBuffer);
+	CmdBuffer.Reset();
+
+	// stop and delete the processor
+	StopProcessor();
+	delete m_pProcessor;
+	m_pProcessor = nullptr;
+
+	if(m_GLContext != nullptr)
+		SDL_GL_DeleteContext(m_GLContext);
+	SDL_DestroyWindow(m_pWindow);
+	m_pWindow = nullptr;
+
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+	return 0;
+}
+
+uint64_t CGraphicsBackend_SDL_GL::TextureMemoryUsage() const
+{
+	return m_TextureMemoryUsage;
+}
+
+uint64_t CGraphicsBackend_SDL_GL::BufferMemoryUsage() const
+{
+	return m_BufferMemoryUsage;
+}
+
+uint64_t CGraphicsBackend_SDL_GL::StreamedMemoryUsage() const
+{
+	return m_StreamMemoryUsage;
+}
+
+uint64_t CGraphicsBackend_SDL_GL::StagingMemoryUsage() const
+{
+	return m_StagingMemoryUsage;
+}
+
+const TTWGraphicsGPUList &CGraphicsBackend_SDL_GL::GetGPUs() const
+{
+	return m_GPUList;
+}
+
+void CGraphicsBackend_SDL_GL::Minimize()
+{
+	SDL_MinimizeWindow(m_pWindow);
+}
+
+void CGraphicsBackend_SDL_GL::Maximize()
+{
+	// TODO: SDL
+}
+
+void CGraphicsBackend_SDL_GL::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+{
+	if(FullscreenMode > 0)
+	{
+		bool IsDesktopFullscreen = FullscreenMode == 2;
+#ifndef CONF_FAMILY_WINDOWS
+		//  special mode for windows only
+		IsDesktopFullscreen |= FullscreenMode == 3;
+#endif
+		if(FullscreenMode == 1)
+		{
+#if defined(CONF_PLATFORM_MACOS) || defined(CONF_PLATFORM_HAIKU)
+			// Todo SDL: remove this when fixed (game freezes when losing focus in fullscreen)
+			SDL_SetWindowFullscreen(m_pWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
+#else
+			SDL_SetWindowFullscreen(m_pWindow, SDL_WINDOW_FULLSCREEN);
+#endif
+			SDL_SetWindowResizable(m_pWindow, SDL_TRUE);
+		}
+		else if(IsDesktopFullscreen)
+		{
+			SDL_SetWindowFullscreen(m_pWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
+			SDL_SetWindowResizable(m_pWindow, SDL_TRUE);
+		}
+		else
+		{
+			SDL_SetWindowFullscreen(m_pWindow, 0);
+			SDL_SetWindowBordered(m_pWindow, SDL_TRUE);
+			SDL_SetWindowResizable(m_pWindow, SDL_FALSE);
+			SDL_DisplayMode DPMode;
+			if(SDL_GetDesktopDisplayMode(g_Config.m_GfxScreen, &DPMode) < 0)
+			{
+				dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+			}
+			else
+			{
+				ResizeWindow(DPMode.w, DPMode.h, DPMode.refresh_rate);
+				SDL_SetWindowPosition(m_pWindow, SDL_WINDOWPOS_CENTERED_DISPLAY(g_Config.m_GfxScreen), SDL_WINDOWPOS_CENTERED_DISPLAY(g_Config.m_GfxScreen));
+			}
+		}
+	}
+	else
+	{
+		SDL_SetWindowFullscreen(m_pWindow, 0);
+		SDL_SetWindowBordered(m_pWindow, SDL_bool(!IsBorderless));
+		SDL_SetWindowResizable(m_pWindow, SDL_TRUE);
+	}
+}
+
+bool CGraphicsBackend_SDL_GL::SetWindowScreen(int Index)
+{
+	if(Index < 0 || Index >= m_NumScreens)
+	{
+		return false;
+	}
+
+	SDL_Rect ScreenPos;
+	if(SDL_GetDisplayBounds(Index, &ScreenPos) != 0)
+	{
+		return false;
+	}
+
+	SDL_SetWindowPosition(m_pWindow,
+		SDL_WINDOWPOS_CENTERED_DISPLAY(Index),
+		SDL_WINDOWPOS_CENTERED_DISPLAY(Index));
+
+	return UpdateDisplayMode(Index);
+}
+
+bool CGraphicsBackend_SDL_GL::UpdateDisplayMode(int Index)
+{
+	SDL_DisplayMode DisplayMode;
+	if(SDL_GetDesktopDisplayMode(Index, &DisplayMode) < 0)
+	{
+		dbg_msg("gfx", "unable to get display mode: %s", SDL_GetError());
+		return false;
+	}
+
+	g_Config.m_GfxDesktopWidth = DisplayMode.w;
+	g_Config.m_GfxDesktopHeight = DisplayMode.h;
+
+	return true;
+}
+
+int CGraphicsBackend_SDL_GL::GetWindowScreen()
+{
+	return SDL_GetWindowDisplayIndex(m_pWindow);
+}
+
+int CGraphicsBackend_SDL_GL::WindowActive()
+{
+	return m_pWindow && SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_INPUT_FOCUS;
+}
+
+int CGraphicsBackend_SDL_GL::WindowOpen()
+{
+	return m_pWindow && SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_SHOWN;
+}
+
+void CGraphicsBackend_SDL_GL::SetWindowGrab(bool Grab)
+{
+	SDL_SetWindowGrab(m_pWindow, Grab ? SDL_TRUE : SDL_FALSE);
+}
+
+bool CGraphicsBackend_SDL_GL::ResizeWindow(int w, int h, int RefreshRate)
+{
+	// don't call resize events when the window is at fullscreen desktop
+	if(!m_pWindow || (SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)
+		return false;
+
+	// if the window is at fullscreen use SDL_SetWindowDisplayMode instead, suggested by SDL
+	if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_FULLSCREEN)
+	{
+#ifdef CONF_FAMILY_WINDOWS
+		// in windows make the window windowed mode first, this prevents strange window glitches (other games probably do something similar)
+		SetWindowParams(0, true, true);
+#endif
+		SDL_DisplayMode SetMode = {};
+		SDL_DisplayMode ClosestMode = {};
+		SetMode.format = 0;
+		SetMode.w = w;
+		SetMode.h = h;
+		SetMode.refresh_rate = RefreshRate;
+		SDL_SetWindowDisplayMode(m_pWindow, SDL_GetClosestDisplayMode(g_Config.m_GfxScreen, &SetMode, &ClosestMode));
+#ifdef CONF_FAMILY_WINDOWS
+		// now change it back to fullscreen, this will restore the above set state, bcs SDL saves fullscreen modes apart from other video modes (as of SDL 2.0.16)
+		// see implementation of SDL_SetWindowDisplayMode
+		SetWindowParams(1, false, true);
+#endif
+		return true;
+	}
+	else
+	{
+		SDL_SetWindowSize(m_pWindow, w, h);
+		if(SDL_GetWindowFlags(m_pWindow) & SDL_WINDOW_MAXIMIZED)
+			// remove maximize flag
+			SDL_RestoreWindow(m_pWindow);
+	}
+
+	return false;
+}
+
+void CGraphicsBackend_SDL_GL::GetViewportSize(int &w, int &h)
+{
+	SDL_GL_GetDrawableSize(m_pWindow, &w, &h);
+}
+
+void CGraphicsBackend_SDL_GL::NotifyWindow()
+{
+	// Minimum version 2.0.16, after version 2.0.22 the naming is changed to 2.24.0 etc.
+#if SDL_MAJOR_VERSION > 2 || (SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION == 0 && SDL_PATCHLEVEL >= 16) || (SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION > 0)
+	if(SDL_FlashWindow(m_pWindow, SDL_FlashOperation::SDL_FLASH_UNTIL_FOCUSED) != 0)
+	{
+		// fails if SDL hasn't implemented it
+		return;
+	}
+#endif
+}
+
+void CGraphicsBackend_SDL_GL::WindowDestroyNtf(uint32_t WindowID)
+{
+}
+
+void CGraphicsBackend_SDL_GL::WindowCreateNtf(uint32_t WindowID)
+{
+	m_pWindow = SDL_GetWindowFromID(WindowID);
+}
+
+TGLBackendReadPresentedImageData &CGraphicsBackend_SDL_GL::GetReadPresentedImageDataFuncUnsafe()
+{
+	return m_ReadPresentedImageDataFunc;
+}
+
+IGraphicsBackend *CreateGraphicsBackend(TTranslateFunc &&TranslateFunc) { return new CGraphicsBackend_SDL_GL(std::move(TranslateFunc)); }
diff --git a/src_bkp/engine/client/backend_sdl.h b/src_bkp/engine/client/backend_sdl.h
new file mode 100644
index 0000000000..952ba052c9
--- /dev/null
+++ b/src_bkp/engine/client/backend_sdl.h
@@ -0,0 +1,307 @@
+#ifndef ENGINE_CLIENT_BACKEND_SDL_H
+#define ENGINE_CLIENT_BACKEND_SDL_H
+
+#include <SDL_video.h>
+
+#include <base/detect.h>
+
+#include <engine/graphics.h>
+
+#include <engine/client/graphics_threaded.h>
+
+#include <engine/client/backend/backend_base.h>
+
+#include <atomic>
+#include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <mutex>
+#include <vector>
+
+#if defined(CONF_PLATFORM_MACOS)
+#include <objc/objc-runtime.h>
+
+class CAutoreleasePool
+{
+private:
+	id m_Pool;
+
+public:
+	CAutoreleasePool()
+	{
+		Class NSAutoreleasePoolClass = (Class)objc_getClass("NSAutoreleasePool");
+		m_Pool = class_createInstance(NSAutoreleasePoolClass, 0);
+		SEL selector = sel_registerName("init");
+		((id(*)(id, SEL))objc_msgSend)(m_Pool, selector);
+	}
+
+	~CAutoreleasePool()
+	{
+		SEL selector = sel_registerName("drain");
+		((id(*)(id, SEL))objc_msgSend)(m_Pool, selector);
+	}
+};
+#endif
+
+// basic threaded backend, abstract, missing init and shutdown functions
+class CGraphicsBackend_Threaded : public IGraphicsBackend
+{
+private:
+	TTranslateFunc m_TranslateFunc;
+	SGfxWarningContainer m_Warning;
+
+public:
+	// constructed on the main thread, the rest of the functions is run on the render thread
+	class ICommandProcessor
+	{
+	public:
+		virtual ~ICommandProcessor() = default;
+		virtual void RunBuffer(CCommandBuffer *pBuffer) = 0;
+
+		virtual const SGfxErrorContainer &GetError() const = 0;
+		virtual void ErroneousCleanup() = 0;
+
+		virtual const SGfxWarningContainer &GetWarning() const = 0;
+	};
+
+	CGraphicsBackend_Threaded(TTranslateFunc &&TranslateFunc);
+
+	void RunBuffer(CCommandBuffer *pBuffer) override;
+	void RunBufferSingleThreadedUnsafe(CCommandBuffer *pBuffer) override;
+	bool IsIdle() const override;
+	void WaitForIdle() override;
+
+	void ProcessError(const SGfxErrorContainer &Error);
+
+protected:
+	void StartProcessor(ICommandProcessor *pProcessor);
+	void StopProcessor();
+
+	bool HasWarning()
+	{
+		return m_Warning.m_WarningType != GFX_WARNING_TYPE_NONE;
+	}
+
+private:
+	ICommandProcessor *m_pProcessor;
+	std::mutex m_BufferSwapMutex;
+	std::condition_variable m_BufferSwapCond;
+	CCommandBuffer *m_pBuffer;
+	std::atomic_bool m_Shutdown;
+	bool m_Started = false;
+	std::atomic_bool m_BufferInProcess;
+	void *m_pThread;
+
+	static void ThreadFunc(void *pUser);
+
+public:
+	bool GetWarning(std::vector<std::string> &WarningStrings) override;
+};
+
+// takes care of implementation independent operations
+class CCommandProcessorFragment_General
+{
+	void Cmd_Nop();
+	void Cmd_Signal(const CCommandBuffer::SCommand_Signal *pCommand);
+
+public:
+	bool RunCommand(const CCommandBuffer::SCommand *pBaseCommand);
+};
+
+struct SBackendCapabilites
+{
+	bool m_TileBuffering;
+	bool m_QuadBuffering;
+	bool m_TextBuffering;
+	bool m_QuadContainerBuffering;
+
+	bool m_MipMapping;
+	bool m_NPOTTextures;
+	bool m_3DTextures;
+	bool m_2DArrayTextures;
+	bool m_2DArrayTexturesAsExtension;
+	bool m_ShaderSupport;
+
+	// use quads as much as possible, even if the user config says otherwise
+	bool m_TrianglesAsQuads;
+
+	int m_ContextMajor;
+	int m_ContextMinor;
+	int m_ContextPatch;
+};
+
+// takes care of sdl related commands
+class CCommandProcessorFragment_SDL
+{
+	// SDL stuff
+	SDL_Window *m_pWindow = nullptr;
+	SDL_GLContext m_GLContext = nullptr;
+
+public:
+	enum
+	{
+		CMD_INIT = CCommandBuffer::CMDGROUP_PLATFORM_SDL,
+		CMD_SHUTDOWN,
+	};
+
+	struct SCommand_Init : public CCommandBuffer::SCommand
+	{
+		SCommand_Init() :
+			SCommand(CMD_INIT) {}
+		SDL_Window *m_pWindow;
+		SDL_GLContext m_GLContext;
+	};
+
+	struct SCommand_Shutdown : public CCommandBuffer::SCommand
+	{
+		SCommand_Shutdown() :
+			SCommand(CMD_SHUTDOWN) {}
+	};
+
+private:
+	void Cmd_Init(const SCommand_Init *pCommand);
+	void Cmd_Shutdown(const SCommand_Shutdown *pCommand);
+	void Cmd_Swap(const CCommandBuffer::SCommand_Swap *pCommand);
+	void Cmd_VSync(const CCommandBuffer::SCommand_VSync *pCommand);
+	void Cmd_WindowCreateNtf(const CCommandBuffer::SCommand_WindowCreateNtf *pCommand);
+	void Cmd_WindowDestroyNtf(const CCommandBuffer::SCommand_WindowDestroyNtf *pCommand);
+
+public:
+	CCommandProcessorFragment_SDL();
+
+	bool RunCommand(const CCommandBuffer::SCommand *pBaseCommand);
+};
+
+// command processor implementation, uses the fragments to combine into one processor
+class CCommandProcessor_SDL_GL : public CGraphicsBackend_Threaded::ICommandProcessor
+{
+	CCommandProcessorFragment_GLBase *m_pGLBackend;
+	CCommandProcessorFragment_SDL m_SDL;
+	CCommandProcessorFragment_General m_General;
+
+	EBackendType m_BackendType;
+
+	SGfxErrorContainer m_Error;
+	SGfxWarningContainer m_Warning;
+
+public:
+	CCommandProcessor_SDL_GL(EBackendType BackendType, int GLMajor, int GLMinor, int GLPatch);
+	virtual ~CCommandProcessor_SDL_GL();
+	void RunBuffer(CCommandBuffer *pBuffer) override;
+
+	const SGfxErrorContainer &GetError() const override;
+	void ErroneousCleanup() override;
+
+	const SGfxWarningContainer &GetWarning() const override;
+
+	void HandleError();
+	void HandleWarning();
+};
+
+static constexpr size_t gs_GPUInfoStringSize = 256;
+
+// graphics backend implemented with SDL and the graphics library @see EBackendType
+class CGraphicsBackend_SDL_GL : public CGraphicsBackend_Threaded
+{
+	SDL_Window *m_pWindow = nullptr;
+	SDL_GLContext m_GLContext = nullptr;
+	ICommandProcessor *m_pProcessor = nullptr;
+	std::atomic<uint64_t> m_TextureMemoryUsage{0};
+	std::atomic<uint64_t> m_BufferMemoryUsage{0};
+	std::atomic<uint64_t> m_StreamMemoryUsage{0};
+	std::atomic<uint64_t> m_StagingMemoryUsage{0};
+
+	TTWGraphicsGPUList m_GPUList;
+
+	TGLBackendReadPresentedImageData m_ReadPresentedImageDataFunc;
+
+	int m_NumScreens;
+
+	SBackendCapabilites m_Capabilites;
+
+	char m_aVendorString[gs_GPUInfoStringSize] = {};
+	char m_aVersionString[gs_GPUInfoStringSize] = {};
+	char m_aRendererString[gs_GPUInfoStringSize] = {};
+
+	EBackendType m_BackendType = BACKEND_TYPE_AUTO;
+
+	char m_aErrorString[256];
+
+	static EBackendType DetectBackend();
+	static void ClampDriverVersion(EBackendType BackendType);
+
+public:
+	CGraphicsBackend_SDL_GL(TTranslateFunc &&TranslateFunc);
+	int Init(const char *pName, int *pScreen, int *pWidth, int *pHeight, int *pRefreshRate, int *pFsaaSamples, int Flags, int *pDesktopWidth, int *pDesktopHeight, int *pCurrentWidth, int *pCurrentHeight, class IStorage *pStorage) override;
+	int Shutdown() override;
+
+	uint64_t TextureMemoryUsage() const override;
+	uint64_t BufferMemoryUsage() const override;
+	uint64_t StreamedMemoryUsage() const override;
+	uint64_t StagingMemoryUsage() const override;
+
+	const TTWGraphicsGPUList &GetGPUs() const override;
+
+	int GetNumScreens() const override { return m_NumScreens; }
+	const char *GetScreenName(int Screen) const override;
+
+	void GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID) override;
+	void GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int ScreenID) override;
+
+	void Minimize() override;
+	void Maximize() override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	bool SetWindowScreen(int Index) override;
+	bool UpdateDisplayMode(int Index) override;
+	int GetWindowScreen() override;
+	int WindowActive() override;
+	int WindowOpen() override;
+	void SetWindowGrab(bool Grab) override;
+	bool ResizeWindow(int w, int h, int RefreshRate) override;
+	void GetViewportSize(int &w, int &h) override;
+	void NotifyWindow() override;
+
+	void WindowDestroyNtf(uint32_t WindowID) override;
+	void WindowCreateNtf(uint32_t WindowID) override;
+
+	bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) override;
+	bool IsConfigModernAPI() override { return IsModernAPI(m_BackendType); }
+	bool UseTrianglesAsQuad() override { return m_Capabilites.m_TrianglesAsQuads; }
+	bool HasTileBuffering() override { return m_Capabilites.m_TileBuffering; }
+	bool HasQuadBuffering() override { return m_Capabilites.m_QuadBuffering; }
+	bool HasTextBuffering() override { return m_Capabilites.m_TextBuffering; }
+	bool HasQuadContainerBuffering() override { return m_Capabilites.m_QuadContainerBuffering; }
+	bool Uses2DTextureArrays() override { return m_Capabilites.m_2DArrayTextures; }
+	bool HasTextureArraysSupport() override { return m_Capabilites.m_2DArrayTextures || m_Capabilites.m_3DTextures; }
+
+	const char *GetErrorString() override
+	{
+		if(m_aErrorString[0] != '\0')
+			return m_aErrorString;
+
+		return NULL;
+	}
+
+	const char *GetVendorString() override
+	{
+		return m_aVendorString;
+	}
+
+	const char *GetVersionString() override
+	{
+		return m_aVersionString;
+	}
+
+	const char *GetRendererString() override
+	{
+		return m_aRendererString;
+	}
+
+	TGLBackendReadPresentedImageData &GetReadPresentedImageDataFuncUnsafe() override;
+
+	bool ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg) override;
+
+	static bool IsModernAPI(EBackendType BackendType);
+};
+
+#endif // ENGINE_CLIENT_BACKEND_SDL_H
diff --git a/src_bkp/engine/client/blocklist_driver.cpp b/src_bkp/engine/client/blocklist_driver.cpp
new file mode 100644
index 0000000000..4e3feb6f70
--- /dev/null
+++ b/src_bkp/engine/client/blocklist_driver.cpp
@@ -0,0 +1,112 @@
+#include "blocklist_driver.h"
+
+#include <base/system.h>
+
+#include <cstddef>
+
+#define VERSION_PARTS 4
+
+struct SVersion
+{
+	int m_aParts[VERSION_PARTS];
+
+	bool operator<=(const SVersion &Other) const
+	{
+		for(int i = 0; i < VERSION_PARTS; i++)
+		{
+			if(m_aParts[i] < Other.m_aParts[i])
+				return true;
+			if(m_aParts[i] > Other.m_aParts[i])
+				return false;
+		}
+		return true;
+	}
+};
+
+enum EBackendDriverBlockListType
+{
+	BACKEND_DRIVER_BLOCKLIST_TYPE_VERSION = 0,
+	BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR,
+};
+
+/* TODO: generalize it more for other drivers / vendors */
+struct SBackEndDriverBlockList
+{
+	EBackendDriverBlockListType m_BlockListType;
+
+	SVersion m_VersionMin;
+	SVersion m_VersionMax;
+
+	const char *m_pVendorName;
+
+	// the OpenGL version, that is supported
+	int m_AllowedMajor;
+	int m_AllowedMinor;
+	int m_AllowedPatch;
+
+	const char *m_pReason;
+
+	bool m_DisplayReason;
+	const char *m_pOSName;
+};
+
+static SBackEndDriverBlockList gs_aBlockList[] = {
+	{BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR, {26, 20, 100, 7800}, {27, 20, 100, 8853}, "Intel", 2, 0, 0, "This Intel driver version can cause crashes, please update it to a newer version.", false, "windows"}};
+
+const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch, bool &RequiresWarning)
+{
+	if(str_find_nocase(pVendorStr, "Intel") == NULL)
+		return NULL;
+
+	const char *pVersionStrStart = str_find_nocase(pVersionStr, "Build ");
+	if(pVersionStrStart == NULL)
+		return NULL;
+
+	// ignore "Build ", after that, it should directly start with the driver version
+	pVersionStrStart += (ptrdiff_t)str_length("Build ");
+
+	char aVersionStrHelper[512]; // the size is random, but shouldn't be too small probably
+
+	SVersion Version;
+	for(int &VersionPart : Version.m_aParts)
+	{
+		pVersionStrStart = str_next_token(pVersionStrStart, ".", aVersionStrHelper, sizeof(aVersionStrHelper));
+		if(pVersionStrStart == NULL)
+			return NULL;
+
+		VersionPart = str_toint(aVersionStrHelper);
+	}
+
+	for(const auto &BlockListItem : gs_aBlockList)
+	{
+		if(str_comp(BlockListItem.m_pOSName, CONF_FAMILY_STRING) == 0)
+		{
+			bool DriverBlocked = false;
+			if(BlockListItem.m_BlockListType == BACKEND_DRIVER_BLOCKLIST_TYPE_VENDOR)
+			{
+				if(str_find_nocase(pVendorStr, BlockListItem.m_pVendorName) != NULL)
+				{
+					DriverBlocked = true;
+				}
+			}
+			else if(BlockListItem.m_BlockListType == BACKEND_DRIVER_BLOCKLIST_TYPE_VERSION)
+			{
+				if(BlockListItem.m_VersionMin <= Version && Version <= BlockListItem.m_VersionMax)
+				{
+					DriverBlocked = true;
+				}
+			}
+
+			if(DriverBlocked)
+			{
+				RequiresWarning = BlockListItem.m_DisplayReason;
+				BlocklistMajor = BlockListItem.m_AllowedMajor;
+				BlocklistMinor = BlockListItem.m_AllowedMinor;
+				BlocklistPatch = BlockListItem.m_AllowedPatch;
+				return BlockListItem.m_pReason;
+			}
+		}
+	}
+
+	return NULL;
+}
diff --git a/src_bkp/engine/client/blocklist_driver.h b/src_bkp/engine/client/blocklist_driver.h
new file mode 100644
index 0000000000..7dddec31ad
--- /dev/null
+++ b/src_bkp/engine/client/blocklist_driver.h
@@ -0,0 +1,6 @@
+#ifndef ENGINE_CLIENT_BLOCKLIST_DRIVER_H
+#define ENGINE_CLIENT_BLOCKLIST_DRIVER_H
+
+const char *ParseBlocklistDriverVersions(const char *pVendorStr, const char *pVersionStr, int &BlocklistMajor, int &BlocklistMinor, int &BlocklistPatch, bool &RequiresWarning);
+
+#endif // ENGINE_CLIENT_BLOCKLIST_DRIVER_H
diff --git a/src_bkp/engine/client/checksum.h b/src_bkp/engine/client/checksum.h
new file mode 100644
index 0000000000..94173f8802
--- /dev/null
+++ b/src_bkp/engine/client/checksum.h
@@ -0,0 +1,36 @@
+#ifndef ENGINE_CLIENT_CHECKSUM_H
+#define ENGINE_CLIENT_CHECKSUM_H
+
+#include <engine/shared/config.h>
+
+struct CChecksumData
+{
+	int m_SizeofData;
+	char m_aVersionStr[128];
+	int m_Version;
+	char m_aOsVersion[256];
+	int64_t m_Start;
+	int m_Random;
+	int m_SizeofClient;
+	int m_SizeofGameClient;
+	float m_Zoom;
+	int m_SizeofConfig;
+	CConfig m_Config;
+	int m_NumCommands;
+	int m_aCommandsChecksum[1024];
+	int m_NumComponents;
+	int m_aComponentsChecksum[64];
+	int m_NumFiles;
+	int m_NumExtra;
+	unsigned m_aFiles[1024];
+
+	void InitFiles();
+};
+
+union CChecksum
+{
+	char m_aBytes[sizeof(CChecksumData)];
+	CChecksumData m_Data;
+};
+
+#endif // ENGINE_CLIENT_CHECKSUM_H
diff --git a/src_bkp/engine/client/client.cpp b/src_bkp/engine/client/client.cpp
new file mode 100644
index 0000000000..ef40081005
--- /dev/null
+++ b/src_bkp/engine/client/client.cpp
@@ -0,0 +1,4782 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#define _WIN32_WINNT 0x0501
+
+#include <base/hash.h>
+#include <base/hash_ctxt.h>
+#include <base/logger.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/external/json-parser/json.h>
+
+#include <engine/config.h>
+#include <engine/console.h>
+#include <engine/discord.h>
+#include <engine/editor.h>
+#include <engine/engine.h>
+#include <engine/favorites.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/keys.h>
+#include <engine/map.h>
+#include <engine/serverbrowser.h>
+#include <engine/sound.h>
+#include <engine/steam.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <engine/shared/assertion_logger.h>
+#include <engine/shared/compression.h>
+#include <engine/shared/config.h>
+#include <engine/shared/demo.h>
+#include <engine/shared/fifo.h>
+#include <engine/shared/filecollection.h>
+#include <engine/shared/http.h>
+#include <engine/shared/masterserver.h>
+#include <engine/shared/network.h>
+#include <engine/shared/packer.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/protocol_ex.h>
+#include <engine/shared/rust_version.h>
+#include <engine/shared/snapshot.h>
+#include <engine/shared/uuid_manager.h>
+
+#include <game/generated/protocol.h>
+#include <game/localization.h>
+#include <game/version.h>
+
+#include "client.h"
+#include "demoedit.h"
+#include "friends.h"
+#include "notifications.h"
+#include "serverbrowser.h"
+
+#if defined(CONF_VIDEORECORDER)
+#include "video.h"
+#endif
+
+#include "SDL.h"
+#ifdef main
+#undef main
+#endif
+
+#include <chrono>
+#include <climits>
+#include <new>
+#include <stack>
+#include <thread>
+#include <tuple>
+
+using namespace std::chrono_literals;
+
+static const ColorRGBA gs_ClientNetworkPrintColor{0.7f, 1, 0.7f, 1.0f};
+static const ColorRGBA gs_ClientNetworkErrPrintColor{1.0f, 0.25f, 0.25f, 1.0f};
+
+CClient::CClient() :
+	m_DemoPlayer(&m_SnapshotDelta, true, [&]() { UpdateDemoIntraTimers(); })
+{
+	m_StateStartTime = time_get();
+	for(auto &DemoRecorder : m_aDemoRecorder)
+		DemoRecorder = CDemoRecorder(&m_SnapshotDelta);
+	m_LastRenderTime = time_get();
+	IStorage::FormatTmpPath(m_aDDNetInfoTmp, sizeof(m_aDDNetInfoTmp), DDNET_INFO_FILE);
+	mem_zero(m_aInputs, sizeof(m_aInputs));
+	mem_zero(m_aapSnapshots, sizeof(m_aapSnapshots));
+	for(auto &SnapshotStorage : m_aSnapshotStorage)
+		SnapshotStorage.Init();
+	mem_zero(m_aDemorecSnapshotHolders, sizeof(m_aDemorecSnapshotHolders));
+	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
+	mem_zero(&m_Checksum, sizeof(m_Checksum));
+	for(auto &GameTime : m_aGameTime)
+		GameTime.Init(0);
+	m_PredictedTime.Init(0);
+}
+
+// ----- send functions -----
+static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer)
+{
+	Packer.Reset();
+	if(pMsg->m_MsgID < OFFSET_UUID)
+	{
+		Packer.AddInt((pMsg->m_MsgID << 1) | (pMsg->m_System ? 1 : 0));
+	}
+	else
+	{
+		Packer.AddInt(pMsg->m_System ? 1 : 0); // NETMSG_EX, NETMSGTYPE_EX
+		g_UuidManager.PackUuid(pMsg->m_MsgID, &Packer);
+	}
+	Packer.AddRaw(pMsg->Data(), pMsg->Size());
+
+	return false;
+}
+
+int CClient::SendMsg(int Conn, CMsgPacker *pMsg, int Flags)
+{
+	CNetChunk Packet;
+
+	if(State() == IClient::STATE_OFFLINE)
+		return 0;
+
+	// repack message (inefficient)
+	CPacker Pack;
+	if(RepackMsg(pMsg, Pack))
+		return 0;
+
+	mem_zero(&Packet, sizeof(CNetChunk));
+	Packet.m_ClientID = 0;
+	Packet.m_pData = Pack.Data();
+	Packet.m_DataSize = Pack.Size();
+
+	if(Flags & MSGFLAG_VITAL)
+		Packet.m_Flags |= NETSENDFLAG_VITAL;
+	if(Flags & MSGFLAG_FLUSH)
+		Packet.m_Flags |= NETSENDFLAG_FLUSH;
+
+	if((Flags & MSGFLAG_RECORD) && Conn == g_Config.m_ClDummy)
+	{
+		for(auto &i : m_aDemoRecorder)
+			if(i.IsRecording())
+				i.RecordMessage(Packet.m_pData, Packet.m_DataSize);
+	}
+
+	if(!(Flags & MSGFLAG_NOSEND))
+	{
+		m_aNetClient[Conn].Send(&Packet);
+	}
+
+	return 0;
+}
+
+int CClient::SendMsgActive(CMsgPacker *pMsg, int Flags)
+{
+	return SendMsg(g_Config.m_ClDummy, pMsg, Flags);
+}
+
+void CClient::SendStA(bool Dummy)
+{
+	CMsgPacker Msg(NETMSG_IAMSTA, true);
+	Msg.AddInt(GAME_STA_VERSION);
+	Msg.AddString(
+		"StA " STA_VERSION
+		" (Teeworlds " GAME_VERSION
+		", DDNet " GAME_VERSION
+		", built on " STA_BUILD_DATE
+		")",
+		0);
+	Msg.AddInt(Dummy);
+	SendMsg(Dummy, &Msg, MSGFLAG_VITAL);
+}
+
+void CClient::SendInfo(int Conn)
+{
+	SendStA(false);
+	CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
+	MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
+	MsgVer.AddInt(GameClient()->DDNetVersion());
+	MsgVer.AddString(GameClient()->DDNetVersionStr());
+	SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
+
+	CMsgPacker Msg(NETMSG_INFO, true);
+	Msg.AddString(GameClient()->NetVersion());
+	Msg.AddString(m_aPassword);
+	SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+}
+
+void CClient::SendEnterGame(int Conn)
+{
+	CMsgPacker Msg(NETMSG_ENTERGAME, true);
+	SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+}
+
+void CClient::SendReady(int Conn)
+{
+	CMsgPacker Msg(NETMSG_READY, true);
+	SendMsg(Conn, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+}
+
+void CClient::SendMapRequest()
+{
+	if(m_MapdownloadFileTemp)
+	{
+		io_close(m_MapdownloadFileTemp);
+		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+	}
+	m_MapdownloadFileTemp = Storage()->OpenFile(m_aMapdownloadFilenameTemp, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	CMsgPacker Msg(NETMSG_REQUEST_MAP_DATA, true);
+	Msg.AddInt(m_MapdownloadChunk);
+	SendMsg(CONN_MAIN, &Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+}
+
+void CClient::RconAuth(const char *pName, const char *pPassword)
+{
+	if(RconAuthed())
+		return;
+
+	if(pName != m_aRconUsername)
+		str_copy(m_aRconUsername, pName);
+	if(pPassword != m_aRconPassword)
+		str_copy(m_aRconPassword, pPassword);
+
+	CMsgPacker Msg(NETMSG_RCON_AUTH, true);
+	Msg.AddString(pName);
+	Msg.AddString(pPassword);
+	Msg.AddInt(1);
+	SendMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+void CClient::Rcon(const char *pCmd)
+{
+	CMsgPacker Msg(NETMSG_RCON_CMD, true);
+	Msg.AddString(pCmd);
+	SendMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+bool CClient::ConnectionProblems() const
+{
+	return m_aNetClient[g_Config.m_ClDummy].GotProblems(MaxLatencyTicks() * time_freq() / GameTickSpeed()) != 0;
+}
+
+void CClient::DirectInput(int *pInput, int Size)
+{
+	CMsgPacker Msg(NETMSG_INPUT, true);
+	Msg.AddInt(m_aAckGameTick[g_Config.m_ClDummy]);
+	Msg.AddInt(m_aPredTick[g_Config.m_ClDummy]);
+	Msg.AddInt(Size);
+
+	for(int i = 0; i < Size / 4; i++)
+		Msg.AddInt(pInput[i]);
+
+	SendMsgActive(&Msg, 0);
+}
+
+void CClient::SendInput()
+{
+	int64_t Now = time_get();
+
+	if(m_aPredTick[g_Config.m_ClDummy] <= 0)
+		return;
+
+	bool Force = false;
+	// fetch input
+	for(int Dummy = 0; Dummy < NUM_DUMMIES; Dummy++)
+	{
+		if(!m_DummyConnected && Dummy != 0)
+		{
+			break;
+		}
+		int i = g_Config.m_ClDummy ^ Dummy;
+		int Size = GameClient()->OnSnapInput(m_aInputs[i][m_aCurrentInput[i]].m_aData, Dummy, Force);
+
+		if(Size)
+		{
+			// pack input
+			CMsgPacker Msg(NETMSG_INPUT, true);
+			Msg.AddInt(m_aAckGameTick[i]);
+			Msg.AddInt(m_aPredTick[g_Config.m_ClDummy]);
+			Msg.AddInt(Size);
+
+			m_aInputs[i][m_aCurrentInput[i]].m_Tick = m_aPredTick[g_Config.m_ClDummy];
+			m_aInputs[i][m_aCurrentInput[i]].m_PredictedTime = m_PredictedTime.Get(Now);
+			m_aInputs[i][m_aCurrentInput[i]].m_PredictionMargin = PredictionMargin() * time_freq() / 1000;
+			m_aInputs[i][m_aCurrentInput[i]].m_Time = Now;
+
+			// pack it
+			for(int k = 0; k < Size / 4; k++)
+				Msg.AddInt(m_aInputs[i][m_aCurrentInput[i]].m_aData[k]);
+
+			m_aCurrentInput[i]++;
+			m_aCurrentInput[i] %= 200;
+
+			SendMsg(i, &Msg, MSGFLAG_FLUSH);
+			// ugly workaround for dummy. we need to send input with dummy to prevent
+			// prediction time resets. but if we do it too often, then it's
+			// impossible to use grenade with frozen dummy that gets hammered...
+			if(g_Config.m_ClDummyCopyMoves || m_aCurrentInput[i] % 2)
+				Force = true;
+		}
+	}
+}
+
+const char *CClient::LatestVersion() const
+{
+	return m_aVersionStr;
+}
+
+// TODO: OPT: do this a lot smarter!
+int *CClient::GetInput(int Tick, int IsDummy) const
+{
+	int Best = -1;
+	const int d = IsDummy ^ g_Config.m_ClDummy;
+	for(int i = 0; i < 200; i++)
+	{
+		if(m_aInputs[d][i].m_Tick <= Tick && (Best == -1 || m_aInputs[d][Best].m_Tick < m_aInputs[d][i].m_Tick))
+			Best = i;
+	}
+
+	if(Best != -1)
+		return (int *)m_aInputs[d][Best].m_aData;
+	return 0;
+}
+
+// ------ state handling -----
+void CClient::SetState(EClientState s)
+{
+	if(m_State == IClient::STATE_QUITTING || m_State == IClient::STATE_RESTARTING)
+		return;
+
+	int Old = m_State;
+	if(g_Config.m_Debug)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "state change. last=%d current=%d", m_State, s);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", aBuf);
+	}
+	m_State = s;
+	if(Old != s)
+	{
+		m_StateStartTime = time_get();
+		GameClient()->OnStateChange(m_State, Old);
+
+		if(s == IClient::STATE_OFFLINE && m_ReconnectTime == 0)
+		{
+			if(g_Config.m_ClReconnectFull > 0 && (str_find_nocase(ErrorString(), "full") || str_find_nocase(ErrorString(), "reserved")))
+				m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectFull;
+			else if(g_Config.m_ClReconnectTimeout > 0 && (str_find_nocase(ErrorString(), "Timeout") || str_find_nocase(ErrorString(), "Too weak connection")))
+				m_ReconnectTime = time_get() + time_freq() * g_Config.m_ClReconnectTimeout;
+		}
+
+		if(s == IClient::STATE_ONLINE)
+		{
+			const bool AnnounceAddr = m_ServerBrowser.IsRegistered(ServerAddress());
+			Discord()->Start();
+			Discord()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr, "Playing", "greenline", "");
+			Steam()->SetGameInfo(ServerAddress(), m_aCurrentMap, AnnounceAddr);
+		}
+		else if(Old == IClient::STATE_ONLINE)
+		{
+			Discord()->ClearGameInfo();
+			Steam()->ClearGameInfo();
+		}
+	}
+}
+
+// called when the map is loaded and we should init for a new round
+void CClient::OnEnterGame(bool Dummy)
+{
+	// reset input
+	for(int i = 0; i < 200; i++)
+	{
+		m_aInputs[Dummy][i].m_Tick = -1;
+	}
+	m_aCurrentInput[Dummy] = 0;
+
+	// reset snapshots
+	m_aapSnapshots[Dummy][SNAP_CURRENT] = 0;
+	m_aapSnapshots[Dummy][SNAP_PREV] = 0;
+	m_aSnapshotStorage[Dummy].PurgeAll();
+	// Also make gameclient aware that snapshots have been purged
+	GameClient()->InvalidateSnapshot();
+	m_aReceivedSnapshots[Dummy] = 0;
+	m_aSnapshotParts[Dummy] = 0;
+	m_aPredTick[Dummy] = 0;
+	m_aAckGameTick[Dummy] = -1;
+	m_aCurrentRecvTick[Dummy] = 0;
+	m_aCurGameTick[Dummy] = 0;
+	m_aPrevGameTick[Dummy] = 0;
+
+	if(Dummy == 0)
+	{
+		m_LastDummyConnectTime = 0;
+	}
+
+	GameClient()->OnEnterGame();
+}
+
+void CClient::EnterGame(int Conn)
+{
+	if(State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	m_aCodeRunAfterJoin[Conn] = false;
+
+	// now we will wait for two snapshots
+	// to finish the connection
+	SendEnterGame(Conn);
+	OnEnterGame(Conn);
+
+	ServerInfoRequest(); // fresh one for timeout protection
+	m_CurrentServerNextPingTime = time_get() + time_freq() / 2;
+}
+
+void GenerateTimeoutCode(char *pBuffer, unsigned Size, char *pSeed, const NETADDR *pAddrs, int NumAddrs, bool Dummy)
+{
+	MD5_CTX Md5;
+	md5_init(&Md5);
+	const char *pDummy = Dummy ? "dummy" : "normal";
+	md5_update(&Md5, (unsigned char *)pDummy, str_length(pDummy) + 1);
+	md5_update(&Md5, (unsigned char *)pSeed, str_length(pSeed) + 1);
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		md5_update(&Md5, (unsigned char *)&pAddrs[i], sizeof(pAddrs[i]));
+	}
+	MD5_DIGEST Digest = md5_finish(&Md5);
+
+	unsigned short aRandom[8];
+	mem_copy(aRandom, Digest.data, sizeof(aRandom));
+	generate_password(pBuffer, Size, aRandom, 8);
+}
+
+void CClient::GenerateTimeoutSeed()
+{
+	secure_random_password(g_Config.m_ClTimeoutSeed, sizeof(g_Config.m_ClTimeoutSeed), 16);
+}
+
+void CClient::GenerateTimeoutCodes(const NETADDR *pAddrs, int NumAddrs)
+{
+	if(g_Config.m_ClTimeoutSeed[0])
+	{
+		for(int i = 0; i < 2; i++)
+		{
+			GenerateTimeoutCode(m_aTimeoutCodes[i], sizeof(m_aTimeoutCodes[i]), g_Config.m_ClTimeoutSeed, pAddrs, NumAddrs, i);
+
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "timeout code '%s' (%s)", m_aTimeoutCodes[i], i == 0 ? "normal" : "dummy");
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+		}
+	}
+	else
+	{
+		str_copy(m_aTimeoutCodes[0], g_Config.m_ClTimeoutCode);
+		str_copy(m_aTimeoutCodes[1], g_Config.m_ClDummyTimeoutCode);
+	}
+}
+
+void CClient::Connect(const char *pAddress, const char *pPassword)
+{
+	Disconnect();
+
+	m_ConnectionID = RandomUuid();
+	if(pAddress != m_aConnectAddressStr)
+		str_copy(m_aConnectAddressStr, pAddress);
+
+	char aMsg[512];
+	str_format(aMsg, sizeof(aMsg), "Joining... '%s'", m_aConnectAddressStr);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aMsg, gs_ClientNetworkPrintColor);
+
+	ServerInfoRequest();
+
+	int NumConnectAddrs = 0;
+	NETADDR aConnectAddrs[MAX_SERVER_ADDRESSES];
+	mem_zero(aConnectAddrs, sizeof(aConnectAddrs));
+	const char *pNextAddr = pAddress;
+	char aBuffer[128];
+	while((pNextAddr = str_next_token(pNextAddr, ",", aBuffer, sizeof(aBuffer))))
+	{
+		NETADDR NextAddr;
+		char aHost[128];
+		int url = net_addr_from_url(&NextAddr, aBuffer, aHost, sizeof(aHost));
+		if(url > 0)
+			str_copy(aHost, aBuffer);
+
+		if(net_host_lookup(aHost, &NextAddr, m_aNetClient[CONN_MAIN].NetType()) != 0)
+		{
+			log_error("client", "could not find address of %s", aHost);
+			continue;
+		}
+		if(NumConnectAddrs == (int)std::size(aConnectAddrs))
+		{
+			log_warn("client", "too many connect addresses, ignoring %s", aHost);
+			continue;
+		}
+		if(NextAddr.port == 0)
+		{
+			NextAddr.port = 8303;
+		}
+		char aNextAddr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&NextAddr, aNextAddr, sizeof(aNextAddr), true);
+		log_debug("client", "resolved connect address '%s' to %s", aBuffer, aNextAddr);
+		aConnectAddrs[NumConnectAddrs] = NextAddr;
+		NumConnectAddrs += 1;
+	}
+
+	if(NumConnectAddrs == 0)
+	{
+		log_error("client", "could not find any connect address, defaulting to localhost for whatever reason...");
+		net_host_lookup("localhost", &aConnectAddrs[0], m_aNetClient[CONN_MAIN].NetType());
+		NumConnectAddrs = 1;
+	}
+
+	if(m_SendPassword)
+	{
+		str_copy(m_aPassword, g_Config.m_Password);
+		m_SendPassword = false;
+	}
+	else if(!pPassword)
+		m_aPassword[0] = 0;
+	else
+		str_copy(m_aPassword, pPassword);
+
+	m_CanReceiveServerCapabilities = true;
+	// Deregister Rcon commands from last connected server, might not have called
+	// DisconnectWithReason if the server was shut down
+	m_aRconAuthed[0] = 0;
+	m_UseTempRconCommands = 0;
+	m_pConsole->DeregisterTempAll();
+
+	m_aNetClient[CONN_MAIN].Connect(aConnectAddrs, NumConnectAddrs);
+	m_aNetClient[CONN_MAIN].RefreshStun();
+	SetState(IClient::STATE_CONNECTING);
+
+	for(int i = 0; i < RECORDER_MAX; i++)
+		if(m_aDemoRecorder[i].IsRecording())
+			DemoRecorder_Stop(i);
+
+	m_InputtimeMarginGraph.Init(-150.0f, 150.0f);
+	m_GametimeMarginGraph.Init(-150.0f, 150.0f);
+
+	GenerateTimeoutCodes(aConnectAddrs, NumConnectAddrs);
+}
+
+void CClient::DisconnectWithReason(const char *pReason)
+{
+	if(pReason != nullptr && pReason[0] == '\0')
+		pReason = nullptr;
+
+	DummyDisconnect(pReason);
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "disconnecting. reason='%s'", pReason ? pReason : "unknown");
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkPrintColor);
+
+	// stop demo playback and recorder
+	m_DemoPlayer.Stop();
+	for(int i = 0; i < RECORDER_MAX; i++)
+		DemoRecorder_Stop(i);
+
+	//
+	m_aRconAuthed[0] = 0;
+	mem_zero(m_aRconUsername, sizeof(m_aRconUsername));
+	mem_zero(m_aRconPassword, sizeof(m_aRconPassword));
+	m_ServerSentCapabilities = false;
+	m_UseTempRconCommands = 0;
+	m_pConsole->DeregisterTempAll();
+	m_aNetClient[CONN_MAIN].Disconnect(pReason);
+	SetState(IClient::STATE_OFFLINE);
+	m_pMap->Unload();
+	m_CurrentServerPingInfoType = -1;
+	m_CurrentServerPingBasicToken = -1;
+	m_CurrentServerPingToken = -1;
+	mem_zero(&m_CurrentServerPingUuid, sizeof(m_CurrentServerPingUuid));
+	m_CurrentServerCurrentPingTime = -1;
+	m_CurrentServerNextPingTime = -1;
+
+	// disable all downloads
+	m_MapdownloadChunk = 0;
+	if(m_pMapdownloadTask)
+		m_pMapdownloadTask->Abort();
+	if(m_MapdownloadFileTemp)
+	{
+		io_close(m_MapdownloadFileTemp);
+		Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+	}
+	m_MapdownloadFileTemp = 0;
+	m_MapdownloadSha256Present = false;
+	m_MapdownloadSha256 = SHA256_ZEROED;
+	m_MapdownloadCrc = 0;
+	m_MapdownloadTotalsize = -1;
+	m_MapdownloadAmount = 0;
+	m_MapDetailsPresent = false;
+
+	// clear the current server info
+	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
+
+	// clear snapshots
+	m_aapSnapshots[0][SNAP_CURRENT] = 0;
+	m_aapSnapshots[0][SNAP_PREV] = 0;
+	m_aReceivedSnapshots[0] = 0;
+}
+
+void CClient::Disconnect()
+{
+	m_ButtonRender = false;
+	if(m_State != IClient::STATE_OFFLINE)
+		DisconnectWithReason(0);
+
+	// make sure to remove replay tmp demo
+	if(g_Config.m_ClReplays)
+	{
+		DemoRecorder_Stop(RECORDER_REPLAYS, true);
+	}
+}
+
+bool CClient::DummyConnected()
+{
+	return m_DummyConnected;
+}
+
+bool CClient::DummyConnecting()
+{
+	return !m_DummyConnected && m_LastDummyConnectTime > 0 && m_LastDummyConnectTime + GameTickSpeed() * 5 > GameTick(g_Config.m_ClDummy);
+}
+
+void CClient::DummyConnect()
+{
+	if(m_LastDummyConnectTime > 0 && m_LastDummyConnectTime + GameTickSpeed() * 5 > GameTick(g_Config.m_ClDummy))
+		return;
+
+	if(m_aNetClient[CONN_MAIN].State() != NETSTATE_ONLINE)
+		return;
+
+	if(m_DummyConnected || !DummyAllowed())
+		return;
+
+	m_LastDummyConnectTime = GameTick(g_Config.m_ClDummy);
+
+	m_aRconAuthed[1] = 0;
+
+	m_DummySendConnInfo = true;
+
+	g_Config.m_ClDummyCopyMoves = 0;
+	g_Config.m_ClDummyHammer = 0;
+
+	// connect to the server
+	m_aNetClient[CONN_DUMMY].Connect(m_aNetClient[CONN_MAIN].ServerAddress(), 1);
+}
+
+void CClient::DummyDisconnect(const char *pReason)
+{
+	if(!m_DummyConnected)
+		return;
+
+	m_aNetClient[CONN_DUMMY].Disconnect(pReason);
+	g_Config.m_ClDummy = 0;
+
+	if(!m_aRconAuthed[0] && m_aRconAuthed[1])
+	{
+		RconAuth(m_aRconUsername, m_aRconPassword);
+	}
+	m_aRconAuthed[1] = 0;
+
+	m_aapSnapshots[1][SNAP_CURRENT] = 0;
+	m_aapSnapshots[1][SNAP_PREV] = 0;
+	m_aReceivedSnapshots[1] = 0;
+	m_DummyConnected = false;
+	GameClient()->OnDummyDisconnect();
+}
+
+bool CClient::DummyAllowed()
+{
+	return m_ServerCapabilities.m_AllowDummy;
+}
+
+int CClient::GetCurrentRaceTime()
+{
+	if(GameClient()->GetLastRaceTick() < 0)
+		return 0;
+	return (GameTick(g_Config.m_ClDummy) - GameClient()->GetLastRaceTick()) / GameTickSpeed();
+}
+
+void CClient::GetServerInfo(CServerInfo *pServerInfo) const
+{
+	mem_copy(pServerInfo, &m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
+
+	if(m_DemoPlayer.IsPlaying() && g_Config.m_ClDemoAssumeRace)
+		str_copy(pServerInfo->m_aGameType, "DDraceNetwork");
+}
+
+void CClient::ServerInfoRequest()
+{
+	mem_zero(&m_CurrentServerInfo, sizeof(m_CurrentServerInfo));
+	m_CurrentServerInfoRequestTime = 0;
+}
+
+void CClient::LoadDebugFont()
+{
+	m_DebugFont = Graphics()->LoadTexture("debug_font.png", IStorage::TYPE_ALL);
+}
+
+// ---
+
+void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const
+{
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	const CSnapshot *pSnapshot = m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap;
+	const CSnapshotItem *pSnapshotItem = pSnapshot->GetItem(Index);
+	pItem->m_DataSize = pSnapshot->GetItemSize(Index);
+	pItem->m_Type = pSnapshot->GetItemType(Index);
+	pItem->m_ID = pSnapshotItem->ID();
+	return (void *)pSnapshotItem->Data();
+}
+
+int CClient::SnapItemSize(int SnapID, int Index) const
+{
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->GetItemSize(Index);
+}
+
+const void *CClient::SnapFindItem(int SnapID, int Type, int ID) const
+{
+	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapID])
+		return nullptr;
+
+	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->FindItem(Type, ID);
+}
+
+int CClient::SnapNumItems(int SnapID) const
+{
+	dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID");
+	if(!m_aapSnapshots[g_Config.m_ClDummy][SnapID])
+		return 0;
+	return m_aapSnapshots[g_Config.m_ClDummy][SnapID]->m_pAltSnap->NumItems();
+}
+
+void CClient::SnapSetStaticsize(int ItemType, int Size)
+{
+	m_SnapshotDelta.SetStaticsize(ItemType, Size);
+}
+
+void CClient::DebugRender()
+{
+	if(!g_Config.m_Debug)
+		return;
+
+	static NETSTATS s_Prev, s_Current;
+	static int64_t s_LastSnapTime = 0;
+	static float s_FrameTimeAvg = 0;
+	char aBuffer[512];
+
+	Graphics()->TextureSet(m_DebugFont);
+	Graphics()->MapScreen(0, 0, Graphics()->ScreenWidth(), Graphics()->ScreenHeight());
+	Graphics()->QuadsBegin();
+
+	if(time_get() - s_LastSnapTime > time_freq())
+	{
+		s_LastSnapTime = time_get();
+		s_Prev = s_Current;
+		net_stats(&s_Current);
+	}
+
+	/*
+		eth = 14
+		ip = 20
+		udp = 8
+		total = 42
+	*/
+	s_FrameTimeAvg = s_FrameTimeAvg * 0.9f + m_RenderFrameTime * 0.1f;
+	str_format(aBuffer, sizeof(aBuffer), "ticks: %8d %8d gfx mem(tex/buff/stream/staging): (%" PRIu64 "k/%" PRIu64 "k/%" PRIu64 "k/%" PRIu64 "k) fps: %3d",
+		m_aCurGameTick[g_Config.m_ClDummy], m_aPredTick[g_Config.m_ClDummy],
+		(Graphics()->TextureMemoryUsage() / 1024),
+		(Graphics()->BufferMemoryUsage() / 1024),
+		(Graphics()->StreamedMemoryUsage() / 1024),
+		(Graphics()->StagingMemoryUsage() / 1024),
+		(int)(1.0f / s_FrameTimeAvg + 0.5f));
+	Graphics()->QuadsText(2, 2, 16, aBuffer);
+
+	{
+		uint64_t SendPackets = (s_Current.sent_packets - s_Prev.sent_packets);
+		uint64_t SendBytes = (s_Current.sent_bytes - s_Prev.sent_bytes);
+		uint64_t SendTotal = SendBytes + SendPackets * 42;
+		uint64_t RecvPackets = (s_Current.recv_packets - s_Prev.recv_packets);
+		uint64_t RecvBytes = (s_Current.recv_bytes - s_Prev.recv_bytes);
+		uint64_t RecvTotal = RecvBytes + RecvPackets * 42;
+
+		if(!SendPackets)
+			SendPackets++;
+		if(!RecvPackets)
+			RecvPackets++;
+		str_format(aBuffer, sizeof(aBuffer), "send: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " kbps) avg: %5" PRIu64 "\nrecv: %3" PRIu64 " %5" PRIu64 "+%4" PRIu64 "=%5" PRIu64 " (%3" PRIu64 " kbps) avg: %5" PRIu64,
+			SendPackets, SendBytes, SendPackets * 42, SendTotal, (SendTotal * 8) / 1024, SendBytes / SendPackets,
+			RecvPackets, RecvBytes, RecvPackets * 42, RecvTotal, (RecvTotal * 8) / 1024, RecvBytes / RecvPackets);
+		Graphics()->QuadsText(2, 14, 16, aBuffer);
+	}
+
+	// render rates
+	{
+		int y = 0;
+		str_format(aBuffer, sizeof(aBuffer), "%5s %20s: %8s %8s %8s", "ID", "Name", "Rate", "Updates", "R/U");
+		Graphics()->QuadsText(2, 100 + y * 12, 16, aBuffer);
+		y++;
+		for(int i = 0; i < NUM_NETOBJTYPES; i++)
+		{
+			if(m_SnapshotDelta.GetDataRate(i))
+			{
+				str_format(aBuffer, sizeof(aBuffer), "%5d %20s: %8d %8d %8d", i, GameClient()->GetItemName(i), m_SnapshotDelta.GetDataRate(i) / 8, m_SnapshotDelta.GetDataUpdates(i),
+					(m_SnapshotDelta.GetDataRate(i) / m_SnapshotDelta.GetDataUpdates(i)) / 8);
+				Graphics()->QuadsText(2, 100 + y * 12, 16, aBuffer);
+				y++;
+			}
+		}
+		for(int i = CSnapshot::MAX_TYPE; i > (CSnapshot::MAX_TYPE - 64); i--)
+		{
+			if(m_SnapshotDelta.GetDataRate(i) && m_aapSnapshots[g_Config.m_ClDummy][IClient::SNAP_CURRENT])
+			{
+				int Type = m_aapSnapshots[g_Config.m_ClDummy][IClient::SNAP_CURRENT]->m_pAltSnap->GetExternalItemType(i);
+				if(Type == UUID_INVALID)
+				{
+					str_format(aBuffer, sizeof(aBuffer), "%5d %20s: %8d %8d %8d", i, "Unknown UUID", m_SnapshotDelta.GetDataRate(i) / 8, m_SnapshotDelta.GetDataUpdates(i),
+						(m_SnapshotDelta.GetDataRate(i) / m_SnapshotDelta.GetDataUpdates(i)) / 8);
+					Graphics()->QuadsText(2, 100 + y * 12, 16, aBuffer);
+					y++;
+				}
+				else if(Type != i)
+				{
+					str_format(aBuffer, sizeof(aBuffer), "%5d %20s: %8d %8d %8d", Type, GameClient()->GetItemName(Type), m_SnapshotDelta.GetDataRate(i) / 8, m_SnapshotDelta.GetDataUpdates(i),
+						(m_SnapshotDelta.GetDataRate(i) / m_SnapshotDelta.GetDataUpdates(i)) / 8);
+					Graphics()->QuadsText(2, 100 + y * 12, 16, aBuffer);
+					y++;
+				}
+			}
+		}
+	}
+
+	str_format(aBuffer, sizeof(aBuffer), "pred: %d ms", GetPredictionTime());
+	Graphics()->QuadsText(2, 70, 16, aBuffer);
+	Graphics()->QuadsEnd();
+
+	// render graphs
+	if(g_Config.m_DbgGraphs)
+	{
+		float w = Graphics()->ScreenWidth() / 4.0f;
+		float h = Graphics()->ScreenHeight() / 6.0f;
+		float sp = Graphics()->ScreenWidth() / 100.0f;
+		float x = Graphics()->ScreenWidth() - w - sp;
+
+		m_FpsGraph.Scale();
+		m_FpsGraph.Render(Graphics(), TextRender(), x, sp * 5, w, h, "FPS");
+		m_InputtimeMarginGraph.Scale();
+		m_InputtimeMarginGraph.Render(Graphics(), TextRender(), x, sp * 6 + h, w, h, "Prediction Margin");
+		m_GametimeMarginGraph.Scale();
+		m_GametimeMarginGraph.Render(Graphics(), TextRender(), x, sp * 7 + h * 2, w, h, "Gametime Margin");
+	}
+}
+
+void CClient::Restart()
+{
+	SetState(IClient::STATE_RESTARTING);
+}
+
+void CClient::Quit()
+{
+	SetState(IClient::STATE_QUITTING);
+}
+
+const char *CClient::PlayerName() const
+{
+	if(g_Config.m_PlayerName[0])
+	{
+		return g_Config.m_PlayerName;
+	}
+	if(g_Config.m_SteamName[0])
+	{
+		return g_Config.m_SteamName;
+	}
+	return "nameless tee";
+}
+
+const char *CClient::DummyName() const
+{
+	if(g_Config.m_ClDummyName[0])
+	{
+		return g_Config.m_ClDummyName;
+	}
+	const char *pBase = 0;
+	if(g_Config.m_PlayerName[0])
+	{
+		pBase = g_Config.m_PlayerName;
+	}
+	else if(g_Config.m_SteamName[0])
+	{
+		pBase = g_Config.m_SteamName;
+	}
+	if(pBase)
+	{
+		static char aDummyNameBuf[16];
+		str_format(aDummyNameBuf, sizeof(aDummyNameBuf), "[D] %s", pBase);
+		return aDummyNameBuf;
+	}
+	return "brainless tee";
+}
+
+const char *CClient::ErrorString() const
+{
+	return m_aNetClient[CONN_MAIN].ErrorString();
+}
+
+void CClient::Render()
+{
+	if(g_Config.m_ClOverlayEntities)
+	{
+		ColorRGBA bg = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundEntitiesColor));
+		Graphics()->Clear(bg.r, bg.g, bg.b);
+	}
+	else
+	{
+		ColorRGBA bg = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClBackgroundColor));
+		Graphics()->Clear(bg.r, bg.g, bg.b);
+	}
+
+	GameClient()->OnRender();
+	DebugRender();
+
+	if(State() == IClient::STATE_ONLINE && g_Config.m_ClAntiPingLimit)
+	{
+		int64_t Now = time_get();
+		g_Config.m_ClAntiPing = (m_PredictedTime.Get(Now) - m_aGameTime[g_Config.m_ClDummy].Get(Now)) * 1000 / (float)time_freq() > g_Config.m_ClAntiPingLimit;
+	}
+}
+
+const char *CClient::LoadMap(const char *pName, const char *pFilename, SHA256_DIGEST *pWantedSha256, unsigned WantedCrc)
+{
+	static char s_aErrorMsg[128];
+
+	SetState(IClient::STATE_LOADING);
+	SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_LOADING_MAP);
+
+	if((bool)m_MapLoadingCBFunc)
+		m_MapLoadingCBFunc();
+
+	if(!m_pMap->Load(pFilename))
+	{
+		str_format(s_aErrorMsg, sizeof(s_aErrorMsg), "map '%s' not found", pFilename);
+		return s_aErrorMsg;
+	}
+
+	if(pWantedSha256 && m_pMap->Sha256() != *pWantedSha256)
+	{
+		char aWanted[SHA256_MAXSTRSIZE];
+		char aGot[SHA256_MAXSTRSIZE];
+		sha256_str(*pWantedSha256, aWanted, sizeof(aWanted));
+		sha256_str(m_pMap->Sha256(), aGot, sizeof(aWanted));
+		str_format(s_aErrorMsg, sizeof(s_aErrorMsg), "map differs from the server. %s != %s", aGot, aWanted);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", s_aErrorMsg);
+		m_pMap->Unload();
+		return s_aErrorMsg;
+	}
+
+	// Only check CRC if we don't have the secure SHA256.
+	if(!pWantedSha256 && m_pMap->Crc() != WantedCrc)
+	{
+		str_format(s_aErrorMsg, sizeof(s_aErrorMsg), "map differs from the server. %08x != %08x", m_pMap->Crc(), WantedCrc);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", s_aErrorMsg);
+		m_pMap->Unload();
+		return s_aErrorMsg;
+	}
+
+	// stop demo recording if we loaded a new map
+	for(int i = 0; i < RECORDER_MAX; i++)
+		DemoRecorder_Stop(i, i == RECORDER_REPLAYS);
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "loaded map '%s'", pFilename);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+	m_aReceivedSnapshots[g_Config.m_ClDummy] = 0;
+
+	str_copy(m_aCurrentMap, pName);
+	str_copy(m_aCurrentMapPath, pFilename);
+
+	return 0;
+}
+
+static void FormatMapDownloadFilename(const char *pName, const SHA256_DIGEST *pSha256, int Crc, bool Temp, char *pBuffer, int BufferSize)
+{
+	char aSuffix[32];
+	if(Temp)
+	{
+		IStorage::FormatTmpPath(aSuffix, sizeof(aSuffix), "");
+	}
+	else
+	{
+		str_copy(aSuffix, ".map");
+	}
+
+	if(pSha256)
+	{
+		char aSha256[SHA256_MAXSTRSIZE];
+		sha256_str(*pSha256, aSha256, sizeof(aSha256));
+		str_format(pBuffer, BufferSize, "downloadedmaps/%s_%s%s", pName, aSha256, aSuffix);
+	}
+	else
+	{
+		str_format(pBuffer, BufferSize, "downloadedmaps/%s_%08x%s", pName, Crc, aSuffix);
+	}
+}
+
+const char *CClient::LoadMapSearch(const char *pMapName, SHA256_DIGEST *pWantedSha256, int WantedCrc)
+{
+	char aBuf[512];
+	char aWanted[SHA256_MAXSTRSIZE + 16];
+	aWanted[0] = 0;
+	if(pWantedSha256)
+	{
+		char aWantedSha256[SHA256_MAXSTRSIZE];
+		sha256_str(*pWantedSha256, aWantedSha256, sizeof(aWantedSha256));
+		str_format(aWanted, sizeof(aWanted), "sha256=%s ", aWantedSha256);
+	}
+	str_format(aBuf, sizeof(aBuf), "loading map, map=%s wanted %scrc=%08x", pMapName, aWanted, WantedCrc);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+	SetState(IClient::STATE_LOADING);
+	SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_LOADING_MAP);
+
+	// try the normal maps folder
+	str_format(aBuf, sizeof(aBuf), "maps/%s.map", pMapName);
+	const char *pError = LoadMap(pMapName, aBuf, pWantedSha256, WantedCrc);
+	if(!pError)
+		return nullptr;
+
+	// try the downloaded maps
+	FormatMapDownloadFilename(pMapName, pWantedSha256, WantedCrc, false, aBuf, sizeof(aBuf));
+	pError = LoadMap(pMapName, aBuf, pWantedSha256, WantedCrc);
+	if(!pError)
+		return nullptr;
+
+	// backward compatibility with old names
+	if(pWantedSha256)
+	{
+		FormatMapDownloadFilename(pMapName, 0, WantedCrc, false, aBuf, sizeof(aBuf));
+		pError = LoadMap(pMapName, aBuf, pWantedSha256, WantedCrc);
+		if(!pError)
+			return nullptr;
+	}
+
+	// search for the map within subfolders
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), "%s.map", pMapName);
+	if(Storage()->FindFile(aFilename, "maps", IStorage::TYPE_ALL, aBuf, sizeof(aBuf)))
+	{
+		pError = LoadMap(pMapName, aBuf, pWantedSha256, WantedCrc);
+		if(!pError)
+			return nullptr;
+	}
+
+	static char s_aErrorMsg[256];
+	str_format(s_aErrorMsg, sizeof(s_aErrorMsg), "Could not find map '%s'", pMapName);
+	return s_aErrorMsg;
+}
+
+void CClient::ProcessConnlessPacket(CNetChunk *pPacket)
+{
+	// server info
+	if(pPacket->m_DataSize >= (int)sizeof(SERVERBROWSE_INFO))
+	{
+		int Type = -1;
+		if(mem_comp(pPacket->m_pData, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO)) == 0)
+			Type = SERVERINFO_VANILLA;
+		else if(mem_comp(pPacket->m_pData, SERVERBROWSE_INFO_EXTENDED, sizeof(SERVERBROWSE_INFO_EXTENDED)) == 0)
+			Type = SERVERINFO_EXTENDED;
+		else if(mem_comp(pPacket->m_pData, SERVERBROWSE_INFO_EXTENDED_MORE, sizeof(SERVERBROWSE_INFO_EXTENDED_MORE)) == 0)
+			Type = SERVERINFO_EXTENDED_MORE;
+
+		if(Type != -1)
+		{
+			void *pData = (unsigned char *)pPacket->m_pData + sizeof(SERVERBROWSE_INFO);
+			int DataSize = pPacket->m_DataSize - sizeof(SERVERBROWSE_INFO);
+			ProcessServerInfo(Type, &pPacket->m_Address, pData, DataSize);
+		}
+	}
+}
+
+static int SavedServerInfoType(int Type)
+{
+	if(Type == SERVERINFO_EXTENDED_MORE)
+		return SERVERINFO_EXTENDED;
+
+	return Type;
+}
+
+void CClient::ProcessServerInfo(int RawType, NETADDR *pFrom, const void *pData, int DataSize)
+{
+	CServerBrowser::CServerEntry *pEntry = m_ServerBrowser.Find(*pFrom);
+
+	CServerInfo Info = {0};
+	int SavedType = SavedServerInfoType(RawType);
+	if(SavedType == SERVERINFO_EXTENDED && pEntry && pEntry->m_GotInfo && SavedType == pEntry->m_Info.m_Type)
+	{
+		Info = pEntry->m_Info;
+	}
+
+	Info.m_Type = SavedType;
+
+	net_addr_str(pFrom, Info.m_aAddress, sizeof(Info.m_aAddress), true);
+
+	CUnpacker Up;
+	Up.Reset(pData, DataSize);
+
+#define GET_STRING(array) str_copy(array, Up.GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES), sizeof(array))
+#define GET_INT(integer) (integer) = str_toint(Up.GetString())
+
+	int Token;
+	int PacketNo = 0; // Only used if SavedType == SERVERINFO_EXTENDED
+
+	GET_INT(Token);
+	if(RawType != SERVERINFO_EXTENDED_MORE)
+	{
+		GET_STRING(Info.m_aVersion);
+		GET_STRING(Info.m_aName);
+		GET_STRING(Info.m_aMap);
+
+		if(SavedType == SERVERINFO_EXTENDED)
+		{
+			GET_INT(Info.m_MapCrc);
+			GET_INT(Info.m_MapSize);
+		}
+
+		GET_STRING(Info.m_aGameType);
+		GET_INT(Info.m_Flags);
+		GET_INT(Info.m_NumPlayers);
+		GET_INT(Info.m_MaxPlayers);
+		GET_INT(Info.m_NumClients);
+		GET_INT(Info.m_MaxClients);
+
+		// don't add invalid info to the server browser list
+		if(Info.m_NumClients < 0 || Info.m_MaxClients < 0 ||
+			Info.m_NumPlayers < 0 || Info.m_MaxPlayers < 0 ||
+			Info.m_NumPlayers > Info.m_NumClients || Info.m_MaxPlayers > Info.m_MaxClients)
+		{
+			return;
+		}
+
+		m_ServerBrowser.UpdateServerCommunity(&Info);
+		m_ServerBrowser.UpdateServerRank(&Info);
+
+		switch(SavedType)
+		{
+		case SERVERINFO_VANILLA:
+			if(Info.m_MaxPlayers > VANILLA_MAX_CLIENTS ||
+				Info.m_MaxClients > VANILLA_MAX_CLIENTS)
+			{
+				return;
+			}
+			break;
+		case SERVERINFO_64_LEGACY:
+			if(Info.m_MaxPlayers > MAX_CLIENTS ||
+				Info.m_MaxClients > MAX_CLIENTS)
+			{
+				return;
+			}
+			break;
+		case SERVERINFO_EXTENDED:
+			if(Info.m_NumPlayers > Info.m_NumClients)
+				return;
+			break;
+		default:
+			dbg_assert(false, "unknown serverinfo type");
+		}
+
+		if(SavedType == SERVERINFO_EXTENDED)
+			PacketNo = 0;
+	}
+	else
+	{
+		GET_INT(PacketNo);
+		// 0 needs to be excluded because that's reserved for the main packet.
+		if(PacketNo <= 0 || PacketNo >= 64)
+			return;
+	}
+
+	bool DuplicatedPacket = false;
+	if(SavedType == SERVERINFO_EXTENDED)
+	{
+		Up.GetString(); // extra info, reserved
+
+		uint64_t Flag = (uint64_t)1 << PacketNo;
+		DuplicatedPacket = Info.m_ReceivedPackets & Flag;
+		Info.m_ReceivedPackets |= Flag;
+	}
+
+	bool IgnoreError = false;
+	for(int i = 0; i < MAX_CLIENTS && Info.m_NumReceivedClients < MAX_CLIENTS && !Up.Error(); i++)
+	{
+		CServerInfo::CClient *pClient = &Info.m_aClients[Info.m_NumReceivedClients];
+		GET_STRING(pClient->m_aName);
+		if(Up.Error())
+		{
+			// Packet end, no problem unless it happens during one
+			// player info, so ignore the error.
+			IgnoreError = true;
+			break;
+		}
+		GET_STRING(pClient->m_aClan);
+		GET_INT(pClient->m_Country);
+		GET_INT(pClient->m_Score);
+		GET_INT(pClient->m_Player);
+		if(SavedType == SERVERINFO_EXTENDED)
+		{
+			Up.GetString(); // extra info, reserved
+		}
+		if(!Up.Error())
+		{
+			if(SavedType == SERVERINFO_64_LEGACY)
+			{
+				uint64_t Flag = (uint64_t)1 << i;
+				if(!(Info.m_ReceivedPackets & Flag))
+				{
+					Info.m_ReceivedPackets |= Flag;
+					Info.m_NumReceivedClients++;
+				}
+			}
+			else
+			{
+				Info.m_NumReceivedClients++;
+			}
+		}
+	}
+
+	str_clean_whitespaces(Info.m_aName);
+
+	if(!Up.Error() || IgnoreError)
+	{
+		if(!DuplicatedPacket && (!pEntry || !pEntry->m_GotInfo || SavedType >= pEntry->m_Info.m_Type))
+		{
+			m_ServerBrowser.OnServerInfoUpdate(*pFrom, Token, &Info);
+		}
+
+		// Player info is irrelevant for the client (while connected),
+		// it gets its info from elsewhere.
+		//
+		// SERVERINFO_EXTENDED_MORE doesn't carry any server
+		// information, so just skip it.
+		if(net_addr_comp(&ServerAddress(), pFrom) == 0 && RawType != SERVERINFO_EXTENDED_MORE)
+		{
+			// Only accept server info that has a type that is
+			// newer or equal to something the server already sent
+			// us.
+			if(SavedType >= m_CurrentServerInfo.m_Type)
+			{
+				mem_copy(&m_CurrentServerInfo, &Info, sizeof(m_CurrentServerInfo));
+				m_CurrentServerInfo.m_NumAddresses = 1;
+				m_CurrentServerInfo.m_aAddresses[0] = ServerAddress();
+				m_CurrentServerInfoRequestTime = -1;
+			}
+
+			bool ValidPong = false;
+			if(!m_ServerCapabilities.m_PingEx && m_CurrentServerCurrentPingTime >= 0 && SavedType >= m_CurrentServerPingInfoType)
+			{
+				if(RawType == SERVERINFO_VANILLA)
+				{
+					ValidPong = Token == m_CurrentServerPingBasicToken;
+				}
+				else if(RawType == SERVERINFO_EXTENDED)
+				{
+					ValidPong = Token == m_CurrentServerPingToken;
+				}
+			}
+			if(ValidPong)
+			{
+				int LatencyMs = (time_get() - m_CurrentServerCurrentPingTime) * 1000 / time_freq();
+				m_ServerBrowser.SetCurrentServerPing(ServerAddress(), LatencyMs);
+				m_CurrentServerPingInfoType = SavedType;
+				m_CurrentServerCurrentPingTime = -1;
+
+				char aBuf[64];
+				str_format(aBuf, sizeof(aBuf), "got pong from current server, latency=%dms", LatencyMs);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf);
+			}
+		}
+	}
+
+#undef GET_STRING
+#undef GET_INT
+}
+
+static CServerCapabilities GetServerCapabilities(int Version, int Flags)
+{
+	CServerCapabilities Result;
+	bool DDNet = false;
+	if(Version >= 1)
+	{
+		DDNet = Flags & SERVERCAPFLAG_DDNET;
+	}
+	Result.m_ChatTimeoutCode = DDNet;
+	Result.m_AnyPlayerFlag = DDNet;
+	Result.m_PingEx = false;
+	Result.m_AllowDummy = true;
+	Result.m_SyncWeaponInput = false;
+	if(Version >= 1)
+	{
+		Result.m_ChatTimeoutCode = Flags & SERVERCAPFLAG_CHATTIMEOUTCODE;
+	}
+	if(Version >= 2)
+	{
+		Result.m_AnyPlayerFlag = Flags & SERVERCAPFLAG_ANYPLAYERFLAG;
+	}
+	if(Version >= 3)
+	{
+		Result.m_PingEx = Flags & SERVERCAPFLAG_PINGEX;
+	}
+	if(Version >= 4)
+	{
+		Result.m_AllowDummy = Flags & SERVERCAPFLAG_ALLOWDUMMY;
+	}
+	if(Version >= 5)
+	{
+		Result.m_SyncWeaponInput = Flags & SERVERCAPFLAG_SYNCWEAPONINPUT;
+	}
+	return Result;
+}
+
+void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
+{
+	CUnpacker Unpacker;
+	Unpacker.Reset(pPacket->m_pData, pPacket->m_DataSize);
+	CMsgPacker Packer(NETMSG_EX, true);
+
+	// unpack msgid and system flag
+	int Msg;
+	bool Sys;
+	CUuid Uuid;
+
+	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	if(Result == UNPACKMESSAGE_ERROR)
+	{
+		return;
+	}
+	else if(Result == UNPACKMESSAGE_ANSWER)
+	{
+		SendMsg(Conn, &Packer, MSGFLAG_VITAL);
+	}
+
+	if(Sys)
+	{
+		// system message
+		if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_MAP_DETAILS)
+		{
+			const char *pMap = Unpacker.GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES);
+			SHA256_DIGEST *pMapSha256 = (SHA256_DIGEST *)Unpacker.GetRaw(sizeof(*pMapSha256));
+			int MapCrc = Unpacker.GetInt();
+			int MapSize = Unpacker.GetInt();
+			if(Unpacker.Error())
+			{
+				return;
+			}
+
+			const char *pMapUrl = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			if(Unpacker.Error())
+			{
+				pMapUrl = "";
+			}
+
+			m_MapDetailsPresent = true;
+			(void)MapSize;
+			str_copy(m_aMapDetailsName, pMap);
+			m_MapDetailsSha256 = *pMapSha256;
+			m_MapDetailsCrc = MapCrc;
+			str_copy(m_aMapDetailsUrl, pMapUrl);
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_CAPABILITIES)
+		{
+			if(!m_CanReceiveServerCapabilities)
+			{
+				return;
+			}
+			int Version = Unpacker.GetInt();
+			int Flags = Unpacker.GetInt();
+			if(Unpacker.Error() || Version <= 0)
+			{
+				return;
+			}
+			m_ServerCapabilities = GetServerCapabilities(Version, Flags);
+			m_CanReceiveServerCapabilities = false;
+			m_ServerSentCapabilities = true;
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_MAP_CHANGE)
+		{
+			if(m_CanReceiveServerCapabilities)
+			{
+				m_ServerCapabilities = GetServerCapabilities(0, 0);
+				m_CanReceiveServerCapabilities = false;
+			}
+			bool MapDetailsWerePresent = m_MapDetailsPresent;
+			m_MapDetailsPresent = false;
+
+			const char *pMap = Unpacker.GetString(CUnpacker::SANITIZE_CC | CUnpacker::SKIP_START_WHITESPACES);
+			int MapCrc = Unpacker.GetInt();
+			int MapSize = Unpacker.GetInt();
+			if(Unpacker.Error() || MapSize < 0)
+			{
+				return;
+			}
+
+			for(int i = 0; pMap[i]; i++) // protect the player from nasty map names
+			{
+				if(pMap[i] == '/' || pMap[i] == '\\')
+				{
+					return;
+				}
+			}
+
+			if(m_DummyConnected)
+			{
+				DummyDisconnect(0);
+			}
+
+			SHA256_DIGEST *pMapSha256 = nullptr;
+			const char *pMapUrl = nullptr;
+			if(MapDetailsWerePresent && str_comp(m_aMapDetailsName, pMap) == 0 && m_MapDetailsCrc == MapCrc)
+			{
+				pMapSha256 = &m_MapDetailsSha256;
+				pMapUrl = m_aMapDetailsUrl[0] ? m_aMapDetailsUrl : nullptr;
+			}
+
+			if(LoadMapSearch(pMap, pMapSha256, MapCrc) == nullptr)
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
+				SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_SENDING_READY);
+				SendReady(CONN_MAIN);
+			}
+			else
+			{
+				if(m_MapdownloadFileTemp)
+				{
+					io_close(m_MapdownloadFileTemp);
+					Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+				}
+
+				// start map download
+				FormatMapDownloadFilename(pMap, pMapSha256, MapCrc, false, m_aMapdownloadFilename, sizeof(m_aMapdownloadFilename));
+				FormatMapDownloadFilename(pMap, pMapSha256, MapCrc, true, m_aMapdownloadFilenameTemp, sizeof(m_aMapdownloadFilenameTemp));
+
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "starting to download map to '%s'", m_aMapdownloadFilenameTemp);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", aBuf);
+
+				m_MapdownloadChunk = 0;
+				str_copy(m_aMapdownloadName, pMap);
+
+				m_MapdownloadSha256Present = (bool)pMapSha256;
+				m_MapdownloadSha256 = pMapSha256 ? *pMapSha256 : SHA256_ZEROED;
+				m_MapdownloadCrc = MapCrc;
+				m_MapdownloadTotalsize = MapSize;
+				m_MapdownloadAmount = 0;
+
+				ResetMapDownload();
+
+				if(pMapSha256)
+				{
+					char aUrl[256];
+					char aEscaped[256];
+					EscapeUrl(aEscaped, sizeof(aEscaped), m_aMapdownloadFilename + 15); // cut off downloadedmaps/
+					bool UseConfigUrl = str_comp(g_Config.m_ClMapDownloadUrl, "https://maps.ddnet.org") != 0 || m_aMapDownloadUrl[0] == '\0';
+					str_format(aUrl, sizeof(aUrl), "%s/%s", UseConfigUrl ? g_Config.m_ClMapDownloadUrl : m_aMapDownloadUrl, aEscaped);
+
+					m_pMapdownloadTask = HttpGetFile(pMapUrl ? pMapUrl : aUrl, Storage(), m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+					m_pMapdownloadTask->Timeout(CTimeout{g_Config.m_ClMapDownloadConnectTimeoutMs, 0, g_Config.m_ClMapDownloadLowSpeedLimit, g_Config.m_ClMapDownloadLowSpeedTime});
+					m_pMapdownloadTask->MaxResponseSize(1024 * 1024 * 1024); // 1 GiB
+					m_pMapdownloadTask->ExpectSha256(*pMapSha256);
+					Engine()->AddJob(m_pMapdownloadTask);
+				}
+				else
+				{
+					SendMapRequest();
+				}
+			}
+		}
+		else if(Conn == CONN_MAIN && Msg == NETMSG_MAP_DATA)
+		{
+			int Last = Unpacker.GetInt();
+			int MapCRC = Unpacker.GetInt();
+			int Chunk = Unpacker.GetInt();
+			int Size = Unpacker.GetInt();
+			const unsigned char *pData = Unpacker.GetRaw(Size);
+			if(Unpacker.Error() || Size <= 0 || MapCRC != m_MapdownloadCrc || Chunk != m_MapdownloadChunk || !m_MapdownloadFileTemp)
+			{
+				return;
+			}
+
+			io_write(m_MapdownloadFileTemp, pData, Size);
+
+			m_MapdownloadAmount += Size;
+
+			if(Last)
+			{
+				if(m_MapdownloadFileTemp)
+				{
+					io_close(m_MapdownloadFileTemp);
+					m_MapdownloadFileTemp = 0;
+				}
+				FinishMapDownload();
+			}
+			else
+			{
+				// request new chunk
+				m_MapdownloadChunk++;
+
+				CMsgPacker MsgP(NETMSG_REQUEST_MAP_DATA, true);
+				MsgP.AddInt(m_MapdownloadChunk);
+				SendMsg(CONN_MAIN, &MsgP, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+
+				if(g_Config.m_Debug)
+				{
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "requested chunk %d", m_MapdownloadChunk);
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client/network", aBuf);
+				}
+			}
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_CON_READY)
+		{
+			GameClient()->OnConnected();
+		}
+		else if(Conn == CONN_DUMMY && Msg == NETMSG_CON_READY)
+		{
+			m_DummyConnected = true;
+			g_Config.m_ClDummy = 1;
+			Rcon("crashmeplx");
+			if(m_aRconAuthed[0])
+				RconAuth(m_aRconUsername, m_aRconPassword);
+		}
+		else if(Msg == NETMSG_PING)
+		{
+			CMsgPacker MsgP(NETMSG_PING_REPLY, true);
+			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH);
+		}
+		else if(Msg == NETMSG_PINGEX)
+		{
+			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			CMsgPacker MsgP(NETMSG_PONGEX, true);
+			MsgP.AddRaw(pID, sizeof(*pID));
+			SendMsg(Conn, &MsgP, MSGFLAG_FLUSH);
+		}
+		else if(Conn == CONN_MAIN && Msg == NETMSG_PONGEX)
+		{
+			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			if(m_ServerCapabilities.m_PingEx && m_CurrentServerCurrentPingTime >= 0 && *pID == m_CurrentServerPingUuid)
+			{
+				int LatencyMs = (time_get() - m_CurrentServerCurrentPingTime) * 1000 / time_freq();
+				m_ServerBrowser.SetCurrentServerPing(ServerAddress(), LatencyMs);
+				m_CurrentServerCurrentPingTime = -1;
+
+				char aBuf[64];
+				str_format(aBuf, sizeof(aBuf), "got pong from current server, latency=%dms", LatencyMs);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf);
+			}
+		}
+		else if(Msg == NETMSG_CHECKSUM_REQUEST)
+		{
+			CUuid *pUuid = (CUuid *)Unpacker.GetRaw(sizeof(*pUuid));
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			int ResultCheck = HandleChecksum(Conn, *pUuid, &Unpacker);
+			if(ResultCheck)
+			{
+				CMsgPacker MsgP(NETMSG_CHECKSUM_ERROR, true);
+				MsgP.AddRaw(pUuid, sizeof(*pUuid));
+				MsgP.AddInt(ResultCheck);
+				SendMsg(Conn, &MsgP, MSGFLAG_VITAL);
+			}
+		}
+		else if(Msg == NETMSG_REDIRECT)
+		{
+			int RedirectPort = Unpacker.GetInt();
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			char aAddr[128];
+			char aIP[64];
+			NETADDR ServerAddr = ServerAddress();
+			net_addr_str(&ServerAddr, aIP, sizeof(aIP), 0);
+			str_format(aAddr, sizeof(aAddr), "%s:%d", aIP, RedirectPort);
+			Connect(aAddr);
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_ADD)
+		{
+			const char *pName = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			const char *pHelp = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			const char *pParams = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			if(!Unpacker.Error())
+			{
+				m_pConsole->RegisterTemp(pName, pParams, CFGFLAG_SERVER, pHelp);
+			}
+		}
+		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_CMD_REM)
+		{
+			const char *pName = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			if(!Unpacker.Error())
+			{
+				m_pConsole->DeregisterTemp(pName);
+			}
+		}
+		else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_AUTH_STATUS)
+		{
+			int ResultInt = Unpacker.GetInt();
+			if(!Unpacker.Error())
+			{
+				m_aRconAuthed[Conn] = ResultInt;
+			}
+			if(Conn == CONN_MAIN)
+			{
+				int Old = m_UseTempRconCommands;
+				m_UseTempRconCommands = Unpacker.GetInt();
+				if(Unpacker.Error())
+				{
+					m_UseTempRconCommands = 0;
+				}
+				if(Old != 0 && m_UseTempRconCommands == 0)
+				{
+					m_pConsole->DeregisterTempAll();
+				}
+			}
+		}
+		else if(!Dummy && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_RCON_LINE)
+		{
+			const char *pLine = Unpacker.GetString();
+			if(!Unpacker.Error())
+			{
+				GameClient()->OnRconLine(pLine);
+			}
+		}
+		else if(Conn == CONN_MAIN && Msg == NETMSG_PING_REPLY)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "latency %.2f", (time_get() - m_PingStartTime) * 1000 / (float)time_freq());
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client/network", aBuf);
+		}
+		else if(Msg == NETMSG_INPUTTIMING)
+		{
+			int InputPredTick = Unpacker.GetInt();
+			int TimeLeft = Unpacker.GetInt();
+			if(Unpacker.Error())
+			{
+				return;
+			}
+
+			int64_t Now = time_get();
+
+			// adjust our prediction time
+			int64_t Target = 0;
+			for(int k = 0; k < 200; k++)
+			{
+				if(m_aInputs[Conn][k].m_Tick == InputPredTick)
+				{
+					Target = m_aInputs[Conn][k].m_PredictedTime + (Now - m_aInputs[Conn][k].m_Time);
+					Target = Target - (int64_t)((TimeLeft / 1000.0f) * time_freq());
+					break;
+				}
+			}
+
+			if(Target)
+				m_PredictedTime.Update(&m_InputtimeMarginGraph, Target, TimeLeft, CSmoothTime::ADJUSTDIRECTION_UP);
+		}
+		else if(Msg == NETMSG_SNAP || Msg == NETMSG_SNAPSINGLE || Msg == NETMSG_SNAPEMPTY)
+		{
+			// only allow packets from the server we actually want
+			if(net_addr_comp(&pPacket->m_Address, &ServerAddress()))
+			{
+				return;
+			}
+
+			// we are not allowed to process snapshot yet
+			if(State() < IClient::STATE_LOADING)
+			{
+				return;
+			}
+
+			int GameTick = Unpacker.GetInt();
+			int DeltaTick = GameTick - Unpacker.GetInt();
+
+			int NumParts = 1;
+			int Part = 0;
+			if(Msg == NETMSG_SNAP)
+			{
+				NumParts = Unpacker.GetInt();
+				Part = Unpacker.GetInt();
+			}
+
+			unsigned int Crc = 0;
+			int PartSize = 0;
+			if(Msg != NETMSG_SNAPEMPTY)
+			{
+				Crc = Unpacker.GetInt();
+				PartSize = Unpacker.GetInt();
+			}
+
+			const char *pData = (const char *)Unpacker.GetRaw(PartSize);
+			if(Unpacker.Error() || NumParts < 1 || NumParts > CSnapshot::MAX_PARTS || Part < 0 || Part >= NumParts || PartSize < 0 || PartSize > MAX_SNAPSHOT_PACKSIZE)
+			{
+				return;
+			}
+
+			// Check m_aAckGameTick to see if we already got a snapshot for that tick
+			if(GameTick >= m_aCurrentRecvTick[Conn] && GameTick > m_aAckGameTick[Conn])
+			{
+				if(GameTick != m_aCurrentRecvTick[Conn])
+				{
+					m_aSnapshotParts[Conn] = 0;
+					m_aCurrentRecvTick[Conn] = GameTick;
+					m_aSnapshotIncomingDataSize[Conn] = 0;
+				}
+
+				mem_copy((char *)m_aaSnapshotIncomingData[Conn] + Part * MAX_SNAPSHOT_PACKSIZE, pData, clamp(PartSize, 0, (int)sizeof(m_aaSnapshotIncomingData[Conn]) - Part * MAX_SNAPSHOT_PACKSIZE));
+				m_aSnapshotParts[Conn] |= (uint64_t)(1) << Part;
+
+				if(Part == NumParts - 1)
+				{
+					m_aSnapshotIncomingDataSize[Conn] = (NumParts - 1) * MAX_SNAPSHOT_PACKSIZE + PartSize;
+				}
+
+				if((NumParts < CSnapshot::MAX_PARTS && m_aSnapshotParts[Conn] == (((uint64_t)(1) << NumParts) - 1)) ||
+					(NumParts == CSnapshot::MAX_PARTS && m_aSnapshotParts[Conn] == std::numeric_limits<uint64_t>::max()))
+				{
+					unsigned char aTmpBuffer2[CSnapshot::MAX_SIZE];
+					unsigned char aTmpBuffer3[CSnapshot::MAX_SIZE];
+					CSnapshot *pTmpBuffer3 = (CSnapshot *)aTmpBuffer3; // Fix compiler warning for strict-aliasing
+
+					// reset snapshoting
+					m_aSnapshotParts[Conn] = 0;
+
+					// find snapshot that we should use as delta
+					const CSnapshot *pDeltaShot = CSnapshot::EmptySnapshot();
+					if(DeltaTick >= 0)
+					{
+						int DeltashotSize = m_aSnapshotStorage[Conn].Get(DeltaTick, nullptr, &pDeltaShot, nullptr);
+
+						if(DeltashotSize < 0)
+						{
+							// couldn't find the delta snapshots that the server used
+							// to compress this snapshot. force the server to resync
+							if(g_Config.m_Debug)
+							{
+								m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "error, couldn't find the delta snapshot");
+							}
+
+							// ack snapshot
+							m_aAckGameTick[Conn] = -1;
+							SendInput();
+							return;
+						}
+					}
+
+					// decompress snapshot
+					const void *pDeltaData = m_SnapshotDelta.EmptyDelta();
+					int DeltaSize = sizeof(int) * 3;
+
+					if(m_aSnapshotIncomingDataSize[Conn])
+					{
+						int IntSize = CVariableInt::Decompress(m_aaSnapshotIncomingData[Conn], m_aSnapshotIncomingDataSize[Conn], aTmpBuffer2, sizeof(aTmpBuffer2));
+
+						if(IntSize < 0) // failure during decompression
+							return;
+
+						pDeltaData = aTmpBuffer2;
+						DeltaSize = IntSize;
+					}
+
+					// unpack delta
+					const int SnapSize = m_SnapshotDelta.UnpackDelta(pDeltaShot, pTmpBuffer3, pDeltaData, DeltaSize);
+					if(SnapSize < 0)
+					{
+						dbg_msg("client", "delta unpack failed. error=%d", SnapSize);
+						return;
+					}
+					if(!pTmpBuffer3->IsValid(SnapSize))
+					{
+						dbg_msg("client", "snapshot invalid. SnapSize=%d, DeltaSize=%d", SnapSize, DeltaSize);
+						return;
+					}
+
+					if(Msg != NETMSG_SNAPEMPTY && pTmpBuffer3->Crc() != Crc)
+					{
+						if(g_Config.m_Debug)
+						{
+							char aBuf[256];
+							str_format(aBuf, sizeof(aBuf), "snapshot crc error #%d - tick=%d wantedcrc=%d gotcrc=%d compressed_size=%d delta_tick=%d",
+								m_SnapCrcErrors, GameTick, Crc, pTmpBuffer3->Crc(), m_aSnapshotIncomingDataSize[Conn], DeltaTick);
+							m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", aBuf);
+						}
+
+						m_SnapCrcErrors++;
+						if(m_SnapCrcErrors > 10)
+						{
+							// to many errors, send reset
+							m_aAckGameTick[Conn] = -1;
+							SendInput();
+							m_SnapCrcErrors = 0;
+						}
+						return;
+					}
+					else
+					{
+						if(m_SnapCrcErrors)
+							m_SnapCrcErrors--;
+					}
+
+					// purge old snapshots
+					int PurgeTick = DeltaTick;
+					if(m_aapSnapshots[Conn][SNAP_PREV] && m_aapSnapshots[Conn][SNAP_PREV]->m_Tick < PurgeTick)
+						PurgeTick = m_aapSnapshots[Conn][SNAP_PREV]->m_Tick;
+					if(m_aapSnapshots[Conn][SNAP_CURRENT] && m_aapSnapshots[Conn][SNAP_CURRENT]->m_Tick < PurgeTick)
+						PurgeTick = m_aapSnapshots[Conn][SNAP_CURRENT]->m_Tick;
+					m_aSnapshotStorage[Conn].PurgeUntil(PurgeTick);
+
+					// create a verified and unpacked snapshot
+					unsigned char aAltSnapBuffer[CSnapshot::MAX_SIZE];
+					CSnapshot *pAltSnapBuffer = (CSnapshot *)aAltSnapBuffer;
+					const int AltSnapSize = UnpackAndValidateSnapshot(pTmpBuffer3, pAltSnapBuffer);
+					if(AltSnapSize < 0)
+					{
+						dbg_msg("client", "unpack snapshot and validate failed. error=%d", AltSnapSize);
+						return;
+					}
+
+					// add new
+					m_aSnapshotStorage[Conn].Add(GameTick, time_get(), SnapSize, pTmpBuffer3, AltSnapSize, pAltSnapBuffer);
+
+					if(!Dummy)
+					{
+						// for antiping: if the projectile netobjects from the server contains extra data, this is removed and the original content restored before recording demo
+						unsigned char aExtraInfoRemoved[CSnapshot::MAX_SIZE];
+						mem_copy(aExtraInfoRemoved, pTmpBuffer3, SnapSize);
+						SnapshotRemoveExtraProjectileInfo(aExtraInfoRemoved);
+
+						// add snapshot to demo
+						for(auto &DemoRecorder : m_aDemoRecorder)
+						{
+							if(DemoRecorder.IsRecording())
+							{
+								// write snapshot
+								DemoRecorder.RecordSnapshot(GameTick, aExtraInfoRemoved, SnapSize);
+							}
+						}
+					}
+
+					// apply snapshot, cycle pointers
+					m_aReceivedSnapshots[Conn]++;
+
+					// we got two snapshots until we see us self as connected
+					if(m_aReceivedSnapshots[Conn] == 2)
+					{
+						// start at 200ms and work from there
+						if(!Dummy)
+						{
+							m_PredictedTime.Init(GameTick * time_freq() / GameTickSpeed());
+							m_PredictedTime.SetAdjustSpeed(CSmoothTime::ADJUSTDIRECTION_UP, 1000.0f);
+							m_PredictedTime.UpdateMargin(PredictionMargin() * time_freq() / 1000);
+						}
+						m_aGameTime[Conn].Init((GameTick - 1) * time_freq() / GameTickSpeed());
+						m_aapSnapshots[Conn][SNAP_PREV] = m_aSnapshotStorage[Conn].m_pFirst;
+						m_aapSnapshots[Conn][SNAP_CURRENT] = m_aSnapshotStorage[Conn].m_pLast;
+						if(!Dummy)
+						{
+							m_LocalStartTime = time_get();
+#if defined(CONF_VIDEORECORDER)
+							IVideo::SetLocalStartTime(m_LocalStartTime);
+#endif
+							GameClient()->OnNewSnapshot();
+						}
+						SetState(IClient::STATE_ONLINE);
+						if(!Dummy)
+						{
+							DemoRecorder_HandleAutoStart();
+						}
+					}
+
+					// adjust game time
+					if(m_aReceivedSnapshots[Conn] > 2)
+					{
+						int64_t Now = m_aGameTime[Conn].Get(time_get());
+						int64_t TickStart = GameTick * time_freq() / GameTickSpeed();
+						int64_t TimeLeft = (TickStart - Now) * 1000 / time_freq();
+						m_aGameTime[Conn].Update(&m_GametimeMarginGraph, (GameTick - 1) * time_freq() / GameTickSpeed(), TimeLeft, CSmoothTime::ADJUSTDIRECTION_DOWN);
+					}
+
+					if(m_aReceivedSnapshots[Conn] > GameTickSpeed() && !m_aCodeRunAfterJoin[Conn])
+					{
+						if(m_ServerCapabilities.m_ChatTimeoutCode)
+						{
+							CNetMsg_Cl_Say MsgP;
+							MsgP.m_Team = 0;
+							char aBuf[128];
+							char aBufMsg[256];
+							if(!g_Config.m_ClRunOnJoin[0] && !g_Config.m_ClDummyDefaultEyes && !g_Config.m_ClPlayerDefaultEyes)
+								str_format(aBufMsg, sizeof(aBufMsg), "/timeout %s", m_aTimeoutCodes[Conn]);
+							else
+								str_format(aBufMsg, sizeof(aBufMsg), "/mc;timeout %s", m_aTimeoutCodes[Conn]);
+
+							if(g_Config.m_ClRunOnJoin[0])
+							{
+								str_format(aBuf, sizeof(aBuf), ";%s", g_Config.m_ClRunOnJoin);
+								str_append(aBufMsg, aBuf);
+							}
+							if(g_Config.m_ClDummyDefaultEyes || g_Config.m_ClPlayerDefaultEyes)
+							{
+								int Emote = ((g_Config.m_ClDummy) ? !Dummy : Dummy) ? g_Config.m_ClDummyDefaultEyes : g_Config.m_ClPlayerDefaultEyes;
+								char aBufEmote[128];
+								aBufEmote[0] = '\0';
+								switch(Emote)
+								{
+								case EMOTE_NORMAL:
+									break;
+								case EMOTE_PAIN:
+									str_format(aBufEmote, sizeof(aBufEmote), "emote pain %d", g_Config.m_ClEyeDuration);
+									break;
+								case EMOTE_HAPPY:
+									str_format(aBufEmote, sizeof(aBufEmote), "emote happy %d", g_Config.m_ClEyeDuration);
+									break;
+								case EMOTE_SURPRISE:
+									str_format(aBufEmote, sizeof(aBufEmote), "emote surprise %d", g_Config.m_ClEyeDuration);
+									break;
+								case EMOTE_ANGRY:
+									str_format(aBufEmote, sizeof(aBufEmote), "emote angry %d", g_Config.m_ClEyeDuration);
+									break;
+								case EMOTE_BLINK:
+									str_format(aBufEmote, sizeof(aBufEmote), "emote blink %d", g_Config.m_ClEyeDuration);
+									break;
+								}
+								if(aBufEmote[0])
+								{
+									str_format(aBuf, sizeof(aBuf), ";%s", aBufEmote);
+									str_append(aBufMsg, aBuf);
+								}
+							}
+							MsgP.m_pMessage = aBufMsg;
+							CMsgPacker PackerTimeout(&MsgP);
+							MsgP.Pack(&PackerTimeout);
+							SendMsg(Conn, &PackerTimeout, MSGFLAG_VITAL);
+						}
+						m_aCodeRunAfterJoin[Conn] = true;
+					}
+
+					// ack snapshot
+					m_aAckGameTick[Conn] = GameTick;
+				}
+			}
+		}
+		else if(Conn == CONN_MAIN && Msg == NETMSG_RCONTYPE)
+		{
+			bool UsernameReq = Unpacker.GetInt() & 1;
+			if(!Unpacker.Error())
+			{
+				GameClient()->OnRconType(UsernameReq);
+			}
+		}
+	}
+	else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0)
+	{
+		// game message
+		if(!Dummy)
+		{
+			for(auto &DemoRecorder : m_aDemoRecorder)
+				if(DemoRecorder.IsRecording())
+					DemoRecorder.RecordMessage(pPacket->m_pData, pPacket->m_DataSize);
+		}
+
+		GameClient()->OnMessage(Msg, &Unpacker, Conn, Dummy);
+	}
+}
+
+int CClient::UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo)
+{
+	CUnpacker Unpacker;
+	CSnapshotBuilder Builder;
+	Builder.Init();
+	CNetObjHandler *pNetObjHandler = GameClient()->GetNetObjHandler();
+
+	int Num = pFrom->NumItems();
+	for(int Index = 0; Index < Num; Index++)
+	{
+		const CSnapshotItem *pFromItem = pFrom->GetItem(Index);
+		const int FromItemSize = pFrom->GetItemSize(Index);
+		const int ItemType = pFrom->GetItemType(Index);
+		const void *pData = pFromItem->Data();
+		Unpacker.Reset(pData, FromItemSize);
+
+		void *pRawObj = pNetObjHandler->SecureUnpackObj(ItemType, &Unpacker);
+		if(!pRawObj)
+		{
+			if(g_Config.m_Debug && ItemType != UUID_UNKNOWN)
+			{
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "dropped weird object '%s' (%d), failed on '%s'", pNetObjHandler->GetObjName(ItemType), ItemType, pNetObjHandler->FailedObjOn());
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+			}
+			continue;
+		}
+		const int ItemSize = pNetObjHandler->GetUnpackedObjSize(ItemType);
+
+		void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+		if(!pObj)
+			return -4;
+
+		mem_copy(pObj, pRawObj, ItemSize);
+	}
+
+	return Builder.Finish(pTo);
+}
+
+void CClient::ResetMapDownload()
+{
+	if(m_pMapdownloadTask)
+	{
+		m_pMapdownloadTask->Abort();
+		m_pMapdownloadTask = NULL;
+	}
+	m_MapdownloadFileTemp = 0;
+	m_MapdownloadAmount = 0;
+}
+
+void CClient::FinishMapDownload()
+{
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "download complete, loading map");
+
+	int Prev = m_MapdownloadTotalsize;
+	m_MapdownloadTotalsize = -1;
+	SHA256_DIGEST *pSha256 = m_MapdownloadSha256Present ? &m_MapdownloadSha256 : 0;
+
+	bool FileSuccess = true;
+	if(Storage()->FileExists(m_aMapdownloadFilename, IStorage::TYPE_SAVE))
+		FileSuccess &= Storage()->RemoveFile(m_aMapdownloadFilename, IStorage::TYPE_SAVE);
+	FileSuccess &= Storage()->RenameFile(m_aMapdownloadFilenameTemp, m_aMapdownloadFilename, IStorage::TYPE_SAVE);
+	if(!FileSuccess)
+	{
+		ResetMapDownload();
+		char aError[128 + IO_MAX_PATH_LENGTH];
+		str_format(aError, sizeof(aError), Localize("Could not save downloaded map. Try manually deleting this file: %s"), m_aMapdownloadFilename);
+		DisconnectWithReason(aError);
+		return;
+	}
+
+	// load map
+	const char *pError = LoadMap(m_aMapdownloadName, m_aMapdownloadFilename, pSha256, m_MapdownloadCrc);
+	if(!pError)
+	{
+		ResetMapDownload();
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client/network", "loading done");
+		SendReady(CONN_MAIN);
+	}
+	else if(m_pMapdownloadTask) // fallback
+	{
+		ResetMapDownload();
+		m_MapdownloadTotalsize = Prev;
+		SendMapRequest();
+	}
+	else
+	{
+		if(m_MapdownloadFileTemp)
+		{
+			io_close(m_MapdownloadFileTemp);
+			m_MapdownloadFileTemp = 0;
+			Storage()->RemoveFile(m_aMapdownloadFilenameTemp, IStorage::TYPE_SAVE);
+		}
+		ResetMapDownload();
+		DisconnectWithReason(pError);
+	}
+}
+
+void CClient::ResetDDNetInfo()
+{
+	if(m_pDDNetInfoTask)
+	{
+		m_pDDNetInfoTask->Abort();
+		m_pDDNetInfoTask = NULL;
+	}
+}
+
+bool CClient::IsDDNetInfoChanged()
+{
+	IOHANDLE OldFile = m_pStorage->OpenFile(DDNET_INFO_FILE, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_SAVE);
+
+	if(!OldFile)
+		return true;
+
+	IOHANDLE NewFile = m_pStorage->OpenFile(m_aDDNetInfoTmp, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_SAVE);
+
+	if(NewFile)
+	{
+		char aOldData[4096];
+		char aNewData[4096];
+		unsigned OldBytes;
+		unsigned NewBytes;
+
+		do
+		{
+			OldBytes = io_read(OldFile, aOldData, sizeof(aOldData));
+			NewBytes = io_read(NewFile, aNewData, sizeof(aNewData));
+
+			if(OldBytes != NewBytes || mem_comp(aOldData, aNewData, OldBytes) != 0)
+			{
+				io_close(NewFile);
+				io_close(OldFile);
+				return true;
+			}
+		} while(OldBytes > 0);
+
+		io_close(NewFile);
+	}
+
+	io_close(OldFile);
+	return false;
+}
+
+void CClient::FinishDDNetInfo()
+{
+	ResetDDNetInfo();
+	if(IsDDNetInfoChanged())
+	{
+		m_pStorage->RenameFile(m_aDDNetInfoTmp, DDNET_INFO_FILE, IStorage::TYPE_SAVE);
+		LoadDDNetInfo();
+		if(m_ServerBrowser.GetCurrentType() == IServerBrowser::TYPE_INTERNET || m_ServerBrowser.GetCurrentType() == IServerBrowser::TYPE_FAVORITES)
+			m_ServerBrowser.Refresh(m_ServerBrowser.GetCurrentType());
+	}
+	else
+	{
+		m_pStorage->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+	}
+}
+
+typedef std::tuple<int, int, int> TVersion;
+static const TVersion gs_InvalidVersion = std::make_tuple(-1, -1, -1);
+
+TVersion ToVersion(char *pStr)
+{
+	int aVersion[3] = {0, 0, 0};
+	const char *p = strtok(pStr, ".");
+
+	for(int i = 0; i < 3 && p; ++i)
+	{
+		if(!str_isallnum(p))
+			return gs_InvalidVersion;
+
+		aVersion[i] = str_toint(p);
+		p = strtok(NULL, ".");
+	}
+
+	if(p)
+		return gs_InvalidVersion;
+
+	return std::make_tuple(aVersion[0], aVersion[1], aVersion[2]);
+}
+
+void CClient::LoadDDNetInfo()
+{
+	const json_value *pDDNetInfo = m_ServerBrowser.LoadDDNetInfo();
+
+	if(!pDDNetInfo)
+		return;
+
+	const json_value &DDNetInfo = *pDDNetInfo;
+	const json_value &CurrentVersion = DDNetInfo["version"];
+	if(CurrentVersion.type == json_string)
+	{
+		char aNewVersionStr[64];
+		str_copy(aNewVersionStr, CurrentVersion);
+		char aCurVersionStr[64];
+		str_copy(aCurVersionStr, GAME_RELEASE_VERSION);
+		if(ToVersion(aNewVersionStr) > ToVersion(aCurVersionStr))
+		{
+			str_copy(m_aVersionStr, CurrentVersion);
+		}
+		else
+		{
+			m_aVersionStr[0] = '0';
+			m_aVersionStr[1] = '\0';
+		}
+	}
+
+	const json_value &News = DDNetInfo["news"];
+	if(News.type == json_string)
+	{
+		// Only mark news button if something new was added to the news
+		if(m_aNews[0] && str_find(m_aNews, News) == nullptr)
+			g_Config.m_UiUnreadNews = true;
+
+		str_copy(m_aNews, News);
+	}
+
+	const json_value &MapDownloadUrl = DDNetInfo["map-download-url"];
+	if(MapDownloadUrl.type == json_string)
+	{
+		str_copy(m_aMapDownloadUrl, MapDownloadUrl);
+	}
+
+	const json_value &Points = DDNetInfo["points"];
+	if(Points.type == json_integer)
+	{
+		m_Points = Points.u.integer;
+	}
+
+	const json_value &StunServersIpv6 = DDNetInfo["stun-servers-ipv6"];
+	if(StunServersIpv6.type == json_array && StunServersIpv6[0].type == json_string)
+	{
+		NETADDR Addr;
+		if(!net_addr_from_str(&Addr, StunServersIpv6[0]))
+		{
+			m_aNetClient->FeedStunServer(Addr);
+		}
+	}
+	const json_value &StunServersIpv4 = DDNetInfo["stun-servers-ipv4"];
+	if(StunServersIpv4.type == json_array && StunServersIpv4[0].type == json_string)
+	{
+		NETADDR Addr;
+		if(!net_addr_from_str(&Addr, StunServersIpv4[0]))
+		{
+			m_aNetClient->FeedStunServer(Addr);
+		}
+	}
+	const json_value &ConnectingIp = DDNetInfo["connecting-ip"];
+	if(ConnectingIp.type == json_string)
+	{
+		NETADDR Addr;
+		if(!net_addr_from_str(&Addr, ConnectingIp))
+		{
+			m_HaveGlobalTcpAddr = true;
+			m_GlobalTcpAddr = Addr;
+			log_debug("info", "got global tcp ip address: %s", (const char *)ConnectingIp);
+		}
+	}
+	const json_value &WarnPngliteIncompatibleImages = DDNetInfo["warn-pnglite-incompatible-images"];
+	Graphics()->WarnPngliteIncompatibleImages(WarnPngliteIncompatibleImages.type == json_boolean && (bool)WarnPngliteIncompatibleImages);
+}
+
+int CClient::ConnectNetTypes() const
+{
+	const NETADDR *pConnectAddrs;
+	int NumConnectAddrs;
+	m_aNetClient[CONN_MAIN].ConnectAddresses(&pConnectAddrs, &NumConnectAddrs);
+	int NetType = 0;
+	for(int i = 0; i < NumConnectAddrs; i++)
+	{
+		NetType |= pConnectAddrs[i].type;
+	}
+	return NetType;
+}
+
+void CClient::PumpNetwork()
+{
+	for(auto &NetClient : m_aNetClient)
+	{
+		NetClient.Update();
+	}
+
+	if(State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		// check for errors
+		if(State() != IClient::STATE_OFFLINE && State() < IClient::STATE_QUITTING && m_aNetClient[CONN_MAIN].State() == NETSTATE_OFFLINE)
+		{
+			Disconnect();
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "offline error='%s'", m_aNetClient[CONN_MAIN].ErrorString());
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
+		}
+
+		if(State() != IClient::STATE_OFFLINE && State() < IClient::STATE_QUITTING && m_DummyConnected &&
+			m_aNetClient[CONN_DUMMY].State() == NETSTATE_OFFLINE)
+		{
+			DummyDisconnect(0);
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "offline dummy error='%s'", m_aNetClient[CONN_DUMMY].ErrorString());
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, gs_ClientNetworkErrPrintColor);
+		}
+
+		//
+		if(State() == IClient::STATE_CONNECTING && m_aNetClient[CONN_MAIN].State() == NETSTATE_ONLINE)
+		{
+			// we switched to online
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", "connected, sending info", gs_ClientNetworkPrintColor);
+			SetState(IClient::STATE_LOADING);
+			SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_INITIAL);
+			SendInfo(CONN_MAIN);
+		}
+	}
+
+	// process packets
+	CNetChunk Packet;
+	for(int i = 0; i < NUM_CONNS; i++)
+	{
+		while(m_aNetClient[i].Recv(&Packet))
+		{
+			if(Packet.m_ClientID == -1)
+			{
+				ProcessConnlessPacket(&Packet);
+				continue;
+			}
+			if(i > 1)
+			{
+				continue;
+			}
+			ProcessServerPacket(&Packet, i, g_Config.m_ClDummy ^ i);
+		}
+	}
+}
+
+void CClient::OnDemoPlayerSnapshot(void *pData, int Size)
+{
+	// update ticks, they could have changed
+	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
+	m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
+	m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
+
+	// create a verified and unpacked snapshot
+	unsigned char aAltSnapBuffer[CSnapshot::MAX_SIZE];
+	CSnapshot *pAltSnapBuffer = (CSnapshot *)aAltSnapBuffer;
+	const int AltSnapSize = UnpackAndValidateSnapshot((CSnapshot *)pData, pAltSnapBuffer);
+	if(AltSnapSize < 0)
+	{
+		dbg_msg("client", "unpack snapshot and validate failed. error=%d", AltSnapSize);
+		return;
+	}
+
+	// handle snapshots after validation
+	std::swap(m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV], m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]);
+	mem_copy(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pSnap, pData, Size);
+	mem_copy(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
+
+	GameClient()->OnNewSnapshot();
+}
+
+void CClient::OnDemoPlayerMessage(void *pData, int Size)
+{
+	CUnpacker Unpacker;
+	Unpacker.Reset(pData, Size);
+	CMsgPacker Packer(NETMSG_EX, true);
+
+	// unpack msgid and system flag
+	int Msg;
+	bool Sys;
+	CUuid Uuid;
+
+	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	if(Result == UNPACKMESSAGE_ERROR)
+	{
+		return;
+	}
+
+	if(!Sys)
+		GameClient()->OnMessage(Msg, &Unpacker, CONN_MAIN, false);
+}
+
+void CClient::UpdateDemoIntraTimers()
+{
+	// update timers
+	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
+	m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
+	m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
+	m_aGameIntraTick[g_Config.m_ClDummy] = pInfo->m_IntraTick;
+	m_aGameTickTime[g_Config.m_ClDummy] = pInfo->m_TickTime;
+	m_aGameIntraTickSincePrev[g_Config.m_ClDummy] = pInfo->m_IntraTickSincePrev;
+};
+
+void CClient::Update()
+{
+	if(State() == IClient::STATE_DEMOPLAYBACK)
+	{
+#if defined(CONF_VIDEORECORDER)
+		if(m_DemoPlayer.IsPlaying() && IVideo::Current())
+		{
+			IVideo::Current()->NextVideoFrame();
+			IVideo::Current()->NextAudioFrameTimeline([this](short *pFinalOut, unsigned Frames) {
+				Sound()->Mix(pFinalOut, Frames);
+			});
+		}
+		else if(m_ButtonRender)
+			Disconnect();
+#endif
+
+		m_DemoPlayer.Update();
+
+		if(m_DemoPlayer.IsPlaying())
+		{
+			// update timers
+			const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
+			m_aCurGameTick[g_Config.m_ClDummy] = pInfo->m_Info.m_CurrentTick;
+			m_aPrevGameTick[g_Config.m_ClDummy] = pInfo->m_PreviousTick;
+			m_aGameIntraTick[g_Config.m_ClDummy] = pInfo->m_IntraTick;
+			m_aGameTickTime[g_Config.m_ClDummy] = pInfo->m_TickTime;
+		}
+		else
+		{
+			// disconnect on error
+			DisconnectWithReason(m_DemoPlayer.ErrorMessage());
+			if(m_DemoPlayer.ErrorMessage()[0] != '\0')
+			{
+				SWarning Warning(Localize("Error playing demo"), m_DemoPlayer.ErrorMessage());
+				Warning.m_AutoHide = false;
+				m_vWarnings.emplace_back(Warning);
+			}
+		}
+	}
+	else if(State() == IClient::STATE_ONLINE)
+	{
+		if(m_LastDummy != (bool)g_Config.m_ClDummy)
+		{
+			// Invalidate references to !m_ClDummy snapshots
+			GameClient()->InvalidateSnapshot();
+			GameClient()->OnDummySwap();
+		}
+
+		if(m_aReceivedSnapshots[!g_Config.m_ClDummy] >= 3)
+		{
+			// switch dummy snapshot
+			int64_t Now = m_aGameTime[!g_Config.m_ClDummy].Get(time_get());
+			while(true)
+			{
+				CSnapshotStorage::CHolder *pCur = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT];
+				int64_t TickStart = (pCur->m_Tick) * time_freq() / GameTickSpeed();
+
+				if(TickStart < Now)
+				{
+					CSnapshotStorage::CHolder *pNext = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
+					if(pNext)
+					{
+						m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT];
+						m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT] = pNext;
+
+						// set ticks
+						m_aCurGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
+						m_aPrevGameTick[!g_Config.m_ClDummy] = m_aapSnapshots[!g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
+					}
+					else
+						break;
+				}
+				else
+					break;
+			}
+		}
+
+		if(m_aReceivedSnapshots[g_Config.m_ClDummy] >= 3)
+		{
+			// switch snapshot
+			bool Repredict = false;
+			int64_t Now = m_aGameTime[g_Config.m_ClDummy].Get(time_get());
+			int64_t PredNow = m_PredictedTime.Get(time_get());
+
+			if(m_LastDummy != (bool)g_Config.m_ClDummy && m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
+			{
+				// Load snapshot for m_ClDummy
+				GameClient()->OnNewSnapshot();
+				Repredict = true;
+			}
+
+			while(true)
+			{
+				CSnapshotStorage::CHolder *pCur = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT];
+				int64_t TickStart = (pCur->m_Tick) * time_freq() / GameTickSpeed();
+
+				if(TickStart < Now)
+				{
+					CSnapshotStorage::CHolder *pNext = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_pNext;
+					if(pNext)
+					{
+						m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT];
+						m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] = pNext;
+
+						// set ticks
+						m_aCurGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick;
+						m_aPrevGameTick[g_Config.m_ClDummy] = m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick;
+
+						if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
+						{
+							GameClient()->OnNewSnapshot();
+							Repredict = true;
+						}
+					}
+					else
+						break;
+				}
+				else
+					break;
+			}
+
+			if(m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT] && m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV])
+			{
+				int64_t CurTickStart = m_aapSnapshots[g_Config.m_ClDummy][SNAP_CURRENT]->m_Tick * time_freq() / GameTickSpeed();
+				int64_t PrevTickStart = m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick * time_freq() / GameTickSpeed();
+				int PrevPredTick = (int)(PredNow * GameTickSpeed() / time_freq());
+				int NewPredTick = PrevPredTick + 1;
+
+				m_aGameIntraTick[g_Config.m_ClDummy] = (Now - PrevTickStart) / (float)(CurTickStart - PrevTickStart);
+				m_aGameTickTime[g_Config.m_ClDummy] = (Now - PrevTickStart) / (float)time_freq();
+				m_aGameIntraTickSincePrev[g_Config.m_ClDummy] = (Now - PrevTickStart) / (float)(time_freq() / GameTickSpeed());
+
+				int64_t CurPredTickStart = NewPredTick * time_freq() / GameTickSpeed();
+				int64_t PrevPredTickStart = PrevPredTick * time_freq() / GameTickSpeed();
+				m_aPredIntraTick[g_Config.m_ClDummy] = (PredNow - PrevPredTickStart) / (float)(CurPredTickStart - PrevPredTickStart);
+
+				if(absolute(NewPredTick - m_aapSnapshots[g_Config.m_ClDummy][SNAP_PREV]->m_Tick) > MaxLatencyTicks())
+				{
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", "prediction time reset!");
+					m_PredictedTime.Init(CurTickStart + 2 * time_freq() / GameTickSpeed());
+				}
+
+				if(NewPredTick > m_aPredTick[g_Config.m_ClDummy])
+				{
+					m_aPredTick[g_Config.m_ClDummy] = NewPredTick;
+					Repredict = true;
+
+					// send input
+					SendInput();
+				}
+			}
+
+			// only do sane predictions
+			if(Repredict)
+			{
+				if(m_aPredTick[g_Config.m_ClDummy] > m_aCurGameTick[g_Config.m_ClDummy] && m_aPredTick[g_Config.m_ClDummy] < m_aCurGameTick[g_Config.m_ClDummy] + MaxLatencyTicks())
+					GameClient()->OnPredict();
+			}
+
+			// fetch server info if we don't have it
+			if(State() >= IClient::STATE_LOADING &&
+				m_CurrentServerInfoRequestTime >= 0 &&
+				time_get() > m_CurrentServerInfoRequestTime)
+			{
+				m_ServerBrowser.RequestCurrentServer(ServerAddress());
+				m_CurrentServerInfoRequestTime = time_get() + time_freq() * 2;
+			}
+
+			// periodically ping server
+			if(State() == IClient::STATE_ONLINE &&
+				m_CurrentServerNextPingTime >= 0 &&
+				time_get() > m_CurrentServerNextPingTime)
+			{
+				int64_t NowPing = time_get();
+				int64_t Freq = time_freq();
+
+				char aBuf[64];
+				str_format(aBuf, sizeof(aBuf), "pinging current server%s", !m_ServerCapabilities.m_PingEx ? ", using fallback via server info" : "");
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+
+				m_CurrentServerPingUuid = RandomUuid();
+				if(!m_ServerCapabilities.m_PingEx)
+				{
+					m_ServerBrowser.RequestCurrentServerWithRandomToken(ServerAddress(), &m_CurrentServerPingBasicToken, &m_CurrentServerPingToken);
+				}
+				else
+				{
+					CMsgPacker Msg(NETMSG_PINGEX, true);
+					Msg.AddRaw(&m_CurrentServerPingUuid, sizeof(m_CurrentServerPingUuid));
+					SendMsg(CONN_MAIN, &Msg, MSGFLAG_FLUSH);
+				}
+				m_CurrentServerCurrentPingTime = NowPing;
+				m_CurrentServerNextPingTime = NowPing + 600 * Freq; // ping every 10 minutes
+			}
+		}
+
+		m_LastDummy = (bool)g_Config.m_ClDummy;
+	}
+
+	// STRESS TEST: join the server again
+#ifdef CONF_DEBUG
+	if(g_Config.m_DbgStress)
+	{
+		static int64_t ActionTaken = 0;
+		int64_t Now = time_get();
+		if(State() == IClient::STATE_OFFLINE)
+		{
+			if(Now > ActionTaken + time_freq() * 2)
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "stress", "reconnecting!");
+				Connect(g_Config.m_DbgStressServer);
+				ActionTaken = Now;
+			}
+		}
+		else
+		{
+			if(Now > ActionTaken + time_freq() * (10 + g_Config.m_DbgStress))
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "stress", "disconnecting!");
+				Disconnect();
+				ActionTaken = Now;
+			}
+		}
+	}
+#endif
+
+	// pump the network
+	PumpNetwork();
+
+	if(m_pMapdownloadTask)
+	{
+		if(m_pMapdownloadTask->State() == HTTP_DONE)
+			FinishMapDownload();
+		else if(m_pMapdownloadTask->State() == HTTP_ERROR || m_pMapdownloadTask->State() == HTTP_ABORTED)
+		{
+			dbg_msg("webdl", "http failed, falling back to gameserver");
+			ResetMapDownload();
+			SendMapRequest();
+		}
+	}
+
+	if(m_pDDNetInfoTask)
+	{
+		if(m_pDDNetInfoTask->State() == HTTP_DONE)
+			FinishDDNetInfo();
+		else if(m_pDDNetInfoTask->State() == HTTP_ERROR)
+		{
+			Storage()->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+			ResetDDNetInfo();
+		}
+		else if(m_pDDNetInfoTask->State() == HTTP_ABORTED)
+		{
+			Storage()->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+			m_pDDNetInfoTask = NULL;
+		}
+	}
+
+	if(State() == IClient::STATE_ONLINE)
+	{
+		if(!m_EditJobs.empty())
+		{
+			std::shared_ptr<CDemoEdit> pJob = m_EditJobs.front();
+			if(pJob->Status() == IJob::STATE_DONE)
+			{
+				char aBuf[IO_MAX_PATH_LENGTH + 64];
+				str_format(aBuf, sizeof(aBuf), "Successfully saved the replay to %s!", pJob->Destination());
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", aBuf);
+
+				GameClient()->Echo(Localize("Successfully saved the replay!"));
+
+				m_EditJobs.pop_front();
+			}
+		}
+	}
+
+	// update the server browser
+	m_ServerBrowser.Update();
+
+	// update editor/gameclient
+	if(m_EditorActive)
+		m_pEditor->OnUpdate();
+	else
+		GameClient()->OnUpdate();
+
+	Discord()->Update();
+	Steam()->Update();
+	if(Steam()->GetConnectAddress())
+	{
+		HandleConnectAddress(Steam()->GetConnectAddress());
+		Steam()->ClearConnectAddress();
+	}
+
+	if(m_ReconnectTime > 0 && time_get() > m_ReconnectTime)
+	{
+		if(State() != STATE_ONLINE)
+			Connect(m_aConnectAddressStr);
+		m_ReconnectTime = 0;
+	}
+
+	m_PredictedTime.UpdateMargin(PredictionMargin() * time_freq() / 1000);
+}
+
+void CClient::RegisterInterfaces()
+{
+	Kernel()->RegisterInterface(static_cast<IDemoRecorder *>(&m_aDemoRecorder[RECORDER_MANUAL]), false);
+	Kernel()->RegisterInterface(static_cast<IDemoPlayer *>(&m_DemoPlayer), false);
+	Kernel()->RegisterInterface(static_cast<IGhostRecorder *>(&m_GhostRecorder), false);
+	Kernel()->RegisterInterface(static_cast<IGhostLoader *>(&m_GhostLoader), false);
+	Kernel()->RegisterInterface(static_cast<IServerBrowser *>(&m_ServerBrowser), false);
+#if defined(CONF_AUTOUPDATE)
+	Kernel()->RegisterInterface(static_cast<IUpdater *>(&m_Updater), false);
+#endif
+	Kernel()->RegisterInterface(static_cast<IFriends *>(&m_Friends), false);
+	Kernel()->ReregisterInterface(static_cast<IFriends *>(&m_Foes));
+}
+
+void CClient::InitInterfaces()
+{
+	// fetch interfaces
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pEditor = Kernel()->RequestInterface<IEditor>();
+	m_pFavorites = Kernel()->RequestInterface<IFavorites>();
+	m_pSound = Kernel()->RequestInterface<IEngineSound>();
+	m_pGameClient = Kernel()->RequestInterface<IGameClient>();
+	m_pInput = Kernel()->RequestInterface<IEngineInput>();
+	m_pMap = Kernel()->RequestInterface<IEngineMap>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pConfig = m_pConfigManager->Values();
+#if defined(CONF_AUTOUPDATE)
+	m_pUpdater = Kernel()->RequestInterface<IUpdater>();
+#endif
+	m_pDiscord = Kernel()->RequestInterface<IDiscord>();
+	m_pSteam = Kernel()->RequestInterface<ISteam>();
+	m_pNotifications = Kernel()->RequestInterface<INotifications>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+
+	m_DemoEditor.Init(m_pGameClient->NetVersion(), &m_SnapshotDelta, m_pConsole, m_pStorage);
+
+	m_ServerBrowser.SetBaseInfo(&m_aNetClient[CONN_CONTACT], m_pGameClient->NetVersion());
+
+	HttpInit(m_pStorage);
+
+#if defined(CONF_AUTOUPDATE)
+	m_Updater.Init();
+#endif
+
+	m_pConfigManager->RegisterCallback(IFavorites::ConfigSaveCallback, m_pFavorites);
+	m_Friends.Init();
+	m_Foes.Init(true);
+
+	m_GhostRecorder.Init();
+	m_GhostLoader.Init();
+}
+
+void CClient::Run()
+{
+	m_LocalStartTime = m_GlobalStartTime = time_get();
+#if defined(CONF_VIDEORECORDER)
+	IVideo::SetLocalStartTime(m_LocalStartTime);
+#endif
+	m_aSnapshotParts[0] = 0;
+	m_aSnapshotParts[1] = 0;
+
+	if(m_GenerateTimeoutSeed)
+	{
+		GenerateTimeoutSeed();
+	}
+
+	unsigned int Seed;
+	secure_random_fill(&Seed, sizeof(Seed));
+	srand(Seed);
+
+	if(g_Config.m_Debug)
+	{
+		g_UuidManager.DebugDump();
+	}
+
+	// init graphics
+	m_pGraphics = CreateEngineGraphicsThreaded();
+	Kernel()->RegisterInterface(m_pGraphics); // IEngineGraphics
+	Kernel()->RegisterInterface(static_cast<IGraphics *>(m_pGraphics), false);
+	if(m_pGraphics->Init() != 0)
+	{
+		dbg_msg("client", "couldn't init graphics");
+		ShowMessageBox("Graphics Error", "The graphics could not be initialized.");
+		return;
+	}
+
+	// make sure the first frame just clears everything to prevent undesired colors when waiting for io
+	Graphics()->Clear(0, 0, 0);
+	Graphics()->Swap();
+
+	// init sound, allowed to fail
+	m_SoundInitFailed = Sound()->Init() != 0;
+
+#if defined(CONF_VIDEORECORDER)
+	// init video recorder aka ffmpeg
+	CVideo::Init();
+#endif
+
+#ifndef CONF_WEBASM
+	char aNetworkError[256];
+	if(!InitNetworkClient(aNetworkError, sizeof(aNetworkError)))
+	{
+		dbg_msg("client", "%s", aNetworkError);
+		ShowMessageBox("Network Error", aNetworkError);
+		return;
+	}
+#endif
+
+	// init text render
+	m_pTextRender = Kernel()->RequestInterface<IEngineTextRender>();
+	m_pTextRender->Init();
+
+	// init the input
+	Input()->Init();
+
+	// init the editor
+	m_pEditor->Init();
+
+	m_ServerBrowser.OnInit();
+	// loads the existing ddnet info file if it exists
+	LoadDDNetInfo();
+
+	LoadDebugFont();
+
+	if(Steam()->GetPlayerName())
+	{
+		str_copy(g_Config.m_SteamName, Steam()->GetPlayerName());
+	}
+
+	Graphics()->AddWindowResizeListener([this] { OnWindowResize(); });
+
+	GameClient()->OnInit();
+
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", "version " GAME_RELEASE_VERSION " on " CONF_PLATFORM_STRING " " CONF_ARCH_STRING, ColorRGBA(0.7f, 0.7f, 1.0f, 1.0f));
+	if(GIT_SHORTREV_HASH)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "git revision hash: %s", GIT_SHORTREV_HASH);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, ColorRGBA(0.7f, 0.7f, 1.0f, 1.0f));
+	}
+
+	//
+	m_FpsGraph.Init(0.0f, 120.0f);
+
+	// never start with the editor
+	g_Config.m_ClEditor = 0;
+
+	// process pending commands
+	m_pConsole->StoreCommands(false);
+
+	m_Fifo.Init(m_pConsole, g_Config.m_ClInputFifo, CFGFLAG_CLIENT);
+
+	InitChecksum();
+	m_pConsole->InitChecksum(ChecksumData());
+
+	// request the new ddnet info from server if already past the welcome dialog
+	if(g_Config.m_ClShowWelcome)
+		g_Config.m_ClShowWelcome = 0;
+	else
+		RequestDDNetInfo();
+
+	bool LastD = false;
+	bool LastE = false;
+	bool LastG = false;
+
+	auto LastTime = time_get_nanoseconds();
+	int64_t LastRenderTime = time_get();
+
+	while(true)
+	{
+		set_new_tick();
+
+		// handle pending connects
+		if(m_aCmdConnect[0])
+		{
+			str_copy(g_Config.m_UiServerAddress, m_aCmdConnect);
+			Connect(m_aCmdConnect);
+			m_aCmdConnect[0] = 0;
+		}
+
+		// handle pending demo play
+		if(m_aCmdPlayDemo[0])
+		{
+			const char *pError = DemoPlayer_Play(m_aCmdPlayDemo, IStorage::TYPE_ALL_OR_ABSOLUTE);
+			if(pError)
+				dbg_msg("demo_player", "playing passed demo file '%s' failed: %s", m_aCmdPlayDemo, pError);
+			m_aCmdPlayDemo[0] = 0;
+		}
+
+		// handle pending map edits
+		if(m_aCmdEditMap[0])
+		{
+			int Result = m_pEditor->HandleMapDrop(m_aCmdEditMap, IStorage::TYPE_ALL_OR_ABSOLUTE);
+			if(Result)
+				g_Config.m_ClEditor = true;
+			else
+				dbg_msg("editor", "editing passed map file '%s' failed", m_aCmdEditMap);
+			m_aCmdEditMap[0] = 0;
+		}
+
+		// progress on dummy connect if security token handshake skipped/passed
+		if(m_DummySendConnInfo && !m_aNetClient[CONN_DUMMY].SecurityTokenUnknown())
+		{
+			m_DummySendConnInfo = false;
+			SendInfo(CONN_DUMMY);
+			m_aNetClient[CONN_DUMMY].Update();
+			SendReady(CONN_DUMMY);
+			GameClient()->SendDummyInfo(true);
+			SendEnterGame(CONN_DUMMY);
+		}
+
+		// update input
+		if(Input()->Update())
+		{
+			if(State() == IClient::STATE_QUITTING)
+				break;
+			else
+				SetState(IClient::STATE_QUITTING); // SDL_QUIT
+		}
+
+		char aFile[IO_MAX_PATH_LENGTH];
+		if(Input()->GetDropFile(aFile, sizeof(aFile)))
+		{
+			if(str_startswith(aFile, CONNECTLINK_NO_SLASH))
+				HandleConnectLink(aFile);
+			else if(str_endswith(aFile, ".demo"))
+				HandleDemoPath(aFile);
+			else if(str_endswith(aFile, ".map"))
+				HandleMapPath(aFile);
+		}
+
+#if defined(CONF_AUTOUPDATE)
+		Updater()->Update();
+#endif
+
+		// update sound
+		Sound()->Update();
+
+		if(CtrlShiftKey(KEY_D, LastD))
+			g_Config.m_Debug ^= 1;
+
+		if(CtrlShiftKey(KEY_G, LastG))
+			g_Config.m_DbgGraphs ^= 1;
+
+		if(CtrlShiftKey(KEY_E, LastE))
+		{
+			if(g_Config.m_ClEditor)
+				m_pEditor->OnClose();
+			g_Config.m_ClEditor = g_Config.m_ClEditor ^ 1;
+		}
+
+		// render
+		{
+			if(g_Config.m_ClEditor)
+			{
+				if(!m_EditorActive)
+				{
+					Input()->MouseModeRelative();
+					GameClient()->OnActivateEditor();
+					m_pEditor->OnActivate();
+					m_EditorActive = true;
+				}
+			}
+			else if(m_EditorActive)
+			{
+				m_EditorActive = false;
+			}
+
+			Update();
+			int64_t Now = time_get();
+
+			bool IsRenderActive = (g_Config.m_GfxBackgroundRender || m_pGraphics->WindowOpen());
+
+			bool AsyncRenderOld = g_Config.m_GfxAsyncRenderOld;
+
+			int GfxRefreshRate = g_Config.m_GfxRefreshRate;
+
+#if defined(CONF_VIDEORECORDER)
+			// keep rendering synced
+			if(IVideo::Current())
+			{
+				AsyncRenderOld = false;
+				GfxRefreshRate = 0;
+			}
+#endif
+
+			if(IsRenderActive &&
+				(!AsyncRenderOld || m_pGraphics->IsIdle()) &&
+				(!GfxRefreshRate || (time_freq() / (int64_t)g_Config.m_GfxRefreshRate) <= Now - LastRenderTime))
+			{
+				// update frametime
+				m_RenderFrameTime = (Now - m_LastRenderTime) / (float)time_freq();
+				m_FpsGraph.Add(1.0f / m_RenderFrameTime);
+
+				if(m_BenchmarkFile)
+				{
+					char aBuf[64];
+					str_format(aBuf, sizeof(aBuf), "Frametime %d us\n", (int)(m_RenderFrameTime * 1000000));
+					io_write(m_BenchmarkFile, aBuf, str_length(aBuf));
+					if(time_get() > m_BenchmarkStopTime)
+					{
+						io_close(m_BenchmarkFile);
+						m_BenchmarkFile = 0;
+						Quit();
+					}
+				}
+
+				m_FrameTimeAvg = m_FrameTimeAvg * 0.9f + m_RenderFrameTime * 0.1f;
+
+				// keep the overflow time - it's used to make sure the gfx refreshrate is reached
+				int64_t AdditionalTime = g_Config.m_GfxRefreshRate ? ((Now - LastRenderTime) - (time_freq() / (int64_t)g_Config.m_GfxRefreshRate)) : 0;
+				// if the value is over the frametime of a 60 fps frame, reset the additional time (drop the frames, that are lost already)
+				if(AdditionalTime > (time_freq() / 60))
+					AdditionalTime = (time_freq() / 60);
+				LastRenderTime = Now - AdditionalTime;
+				m_LastRenderTime = Now;
+
+				if(!m_EditorActive)
+					Render();
+				else
+				{
+					m_pEditor->OnRender();
+					DebugRender();
+				}
+				m_pGraphics->Swap();
+			}
+			else if(!IsRenderActive)
+			{
+				// if the client does not render, it should reset its render time to a time where it would render the first frame, when it wakes up again
+				LastRenderTime = g_Config.m_GfxRefreshRate ? (Now - (time_freq() / (int64_t)g_Config.m_GfxRefreshRate)) : Now;
+			}
+		}
+
+		AutoScreenshot_Cleanup();
+		AutoStatScreenshot_Cleanup();
+		AutoCSV_Cleanup();
+
+		// check conditions
+		if(State() == IClient::STATE_QUITTING || State() == IClient::STATE_RESTARTING)
+		{
+			static bool s_SavedConfig = false;
+			if(!s_SavedConfig)
+			{
+				// write down the config and quit
+				if(!m_pConfigManager->Save())
+					m_vWarnings.emplace_back(Localize("Saving ddnet-settings.cfg failed"));
+				s_SavedConfig = true;
+			}
+
+			if(m_pStorage->FileExists(m_aDDNetInfoTmp, IStorage::TYPE_SAVE))
+			{
+				m_pStorage->RemoveFile(m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+			}
+
+			if(m_vWarnings.empty() && !GameClient()->IsDisplayingWarning())
+				break;
+		}
+
+		m_Fifo.Update();
+
+		// beNice
+		auto Now = time_get_nanoseconds();
+		decltype(Now) SleepTimeInNanoSeconds{0};
+		bool Slept = false;
+		if(g_Config.m_ClRefreshRateInactive && !m_pGraphics->WindowActive())
+		{
+			SleepTimeInNanoSeconds = (std::chrono::nanoseconds(1s) / (int64_t)g_Config.m_ClRefreshRateInactive) - (Now - LastTime);
+			std::this_thread::sleep_for(SleepTimeInNanoSeconds);
+			Slept = true;
+		}
+		else if(g_Config.m_ClRefreshRate)
+		{
+			SleepTimeInNanoSeconds = (std::chrono::nanoseconds(1s) / (int64_t)g_Config.m_ClRefreshRate) - (Now - LastTime);
+			auto SleepTimeInNanoSecondsInner = SleepTimeInNanoSeconds;
+			auto NowInner = Now;
+			while((SleepTimeInNanoSecondsInner / std::chrono::nanoseconds(1us).count()) > 0ns)
+			{
+				net_socket_read_wait(m_aNetClient[CONN_MAIN].m_Socket, SleepTimeInNanoSecondsInner);
+				auto NowInnerCalc = time_get_nanoseconds();
+				SleepTimeInNanoSecondsInner -= (NowInnerCalc - NowInner);
+				NowInner = NowInnerCalc;
+			}
+			Slept = true;
+		}
+		if(Slept)
+		{
+			// if the diff gets too small it shouldn't get even smaller (drop the updates, that could not be handled)
+			if(SleepTimeInNanoSeconds < -16666666ns)
+				SleepTimeInNanoSeconds = -16666666ns;
+			// don't go higher than the frametime of a 60 fps frame
+			else if(SleepTimeInNanoSeconds > 16666666ns)
+				SleepTimeInNanoSeconds = 16666666ns;
+			// the time diff between the time that was used actually used and the time the thread should sleep/wait
+			// will be calculated in the sleep time of the next update tick by faking the time it should have slept/wait.
+			// so two cases (and the case it slept exactly the time it should):
+			//	- the thread slept/waited too long, then it adjust the time to sleep/wait less in the next update tick
+			//	- the thread slept/waited too less, then it adjust the time to sleep/wait more in the next update tick
+			LastTime = Now + SleepTimeInNanoSeconds;
+		}
+		else
+			LastTime = Now;
+
+		// update local and global time
+		m_LocalTime = (time_get() - m_LocalStartTime) / (float)time_freq();
+		m_GlobalTime = (time_get() - m_GlobalStartTime) / (float)time_freq();
+	}
+
+	m_Fifo.Shutdown();
+
+	GameClient()->OnShutdown();
+	Disconnect();
+
+	// close socket
+	for(unsigned int i = 0; i < std::size(m_aNetClient); i++)
+		m_aNetClient[i].Close();
+
+	delete m_pEditor;
+
+	// shutdown text render while graphics are still available
+	m_pTextRender->Shutdown();
+}
+
+bool CClient::InitNetworkClient(char *pError, size_t ErrorSize)
+{
+	NETADDR BindAddr;
+	if(g_Config.m_Bindaddr[0] == '\0')
+	{
+		mem_zero(&BindAddr, sizeof(BindAddr));
+	}
+	else if(net_host_lookup(g_Config.m_Bindaddr, &BindAddr, NETTYPE_ALL) != 0)
+	{
+		str_format(pError, ErrorSize, "The configured bindaddr '%s' cannot be resolved.", g_Config.m_Bindaddr);
+		return false;
+	}
+	BindAddr.type = NETTYPE_ALL;
+	for(unsigned int i = 0; i < std::size(m_aNetClient); i++)
+	{
+		int &PortRef = i == CONN_MAIN ? g_Config.m_ClPort : i == CONN_DUMMY ? g_Config.m_ClDummyPort : g_Config.m_ClContactPort;
+		if(PortRef < 1024) // Reject users setting ports that we don't want to use
+		{
+			PortRef = 0;
+		}
+		BindAddr.port = PortRef;
+		unsigned RemainingAttempts = 25;
+		while(BindAddr.port == 0 || !m_aNetClient[i].Open(BindAddr))
+		{
+			if(BindAddr.port != 0)
+			{
+				--RemainingAttempts;
+				if(RemainingAttempts == 0)
+				{
+					if(g_Config.m_Bindaddr[0])
+						str_format(pError, ErrorSize, "Could not open the network client, try changing or unsetting the bindaddr '%s'.", g_Config.m_Bindaddr);
+					else
+						str_format(pError, ErrorSize, "Could not open the network client.");
+					return false;
+				}
+			}
+			BindAddr.port = (secure_rand() % 64511) + 1024;
+		}
+	}
+	return true;
+}
+
+bool CClient::CtrlShiftKey(int Key, bool &Last)
+{
+	if(Input()->ModifierIsPressed() && Input()->ShiftIsPressed() && !Last && Input()->KeyIsPressed(Key))
+	{
+		Last = true;
+		return true;
+	}
+	else if(Last && !Input()->KeyIsPressed(Key))
+		Last = false;
+
+	return false;
+}
+
+void CClient::Con_Connect(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->HandleConnectLink(pResult->GetString(0));
+}
+
+void CClient::Con_Disconnect(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Disconnect();
+}
+
+void CClient::Con_DummyConnect(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->DummyConnect();
+}
+
+void CClient::Con_DummyDisconnect(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->DummyDisconnect(0);
+}
+
+void CClient::Con_DummyResetInput(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->GameClient()->DummyResetInput();
+}
+
+void CClient::Con_Quit(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Quit();
+}
+
+void CClient::Con_Restart(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Restart();
+}
+
+void CClient::Con_Minimize(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Graphics()->Minimize();
+}
+
+void CClient::Con_Ping(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+
+	CMsgPacker Msg(NETMSG_PING, true);
+	pSelf->SendMsg(CONN_MAIN, &Msg, MSGFLAG_FLUSH);
+	pSelf->m_PingStartTime = time_get();
+}
+
+void CClient::AutoScreenshot_Start()
+{
+	if(g_Config.m_ClAutoScreenshot)
+	{
+		Graphics()->TakeScreenshot("auto/autoscreen");
+		m_AutoScreenshotRecycle = true;
+	}
+}
+
+void CClient::AutoStatScreenshot_Start()
+{
+	if(g_Config.m_ClAutoStatboardScreenshot)
+	{
+		Graphics()->TakeScreenshot("auto/stats/autoscreen");
+		m_AutoStatScreenshotRecycle = true;
+	}
+}
+
+void CClient::AutoScreenshot_Cleanup()
+{
+	if(m_AutoScreenshotRecycle)
+	{
+		if(g_Config.m_ClAutoScreenshotMax)
+		{
+			// clean up auto taken screens
+			CFileCollection AutoScreens;
+			AutoScreens.Init(Storage(), "screenshots/auto", "autoscreen", ".png", g_Config.m_ClAutoScreenshotMax);
+		}
+		m_AutoScreenshotRecycle = false;
+	}
+}
+
+void CClient::AutoStatScreenshot_Cleanup()
+{
+	if(m_AutoStatScreenshotRecycle)
+	{
+		if(g_Config.m_ClAutoStatboardScreenshotMax)
+		{
+			// clean up auto taken screens
+			CFileCollection AutoScreens;
+			AutoScreens.Init(Storage(), "screenshots/auto/stats", "autoscreen", ".png", g_Config.m_ClAutoStatboardScreenshotMax);
+		}
+		m_AutoStatScreenshotRecycle = false;
+	}
+}
+
+void CClient::AutoCSV_Start()
+{
+	if(g_Config.m_ClAutoCSV)
+		m_AutoCSVRecycle = true;
+}
+
+void CClient::AutoCSV_Cleanup()
+{
+	if(m_AutoCSVRecycle)
+	{
+		if(g_Config.m_ClAutoCSVMax)
+		{
+			// clean up auto csvs
+			CFileCollection AutoRecord;
+			AutoRecord.Init(Storage(), "record/csv", "autorecord", ".csv", g_Config.m_ClAutoCSVMax);
+		}
+		m_AutoCSVRecycle = false;
+	}
+}
+
+void CClient::Con_Screenshot(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Graphics()->TakeScreenshot(0);
+}
+
+#if defined(CONF_VIDEORECORDER)
+
+void CClient::Con_StartVideo(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+
+	if(pSelf->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Can not start videorecorder outside of demoplayer.");
+		return;
+	}
+
+	if(!IVideo::Current())
+	{
+		// wait for idle, so there is no data race
+		pSelf->Graphics()->WaitForIdle();
+		// pause the sound device while creating the video instance
+		pSelf->Sound()->PauseAudioDevice();
+		new CVideo((CGraphics_Threaded *)pSelf->m_pGraphics, pSelf->Sound(), pSelf->Storage(), pSelf->Graphics()->ScreenWidth(), pSelf->Graphics()->ScreenHeight(), "");
+		pSelf->Sound()->UnpauseAudioDevice();
+		IVideo::Current()->Start();
+		bool paused = pSelf->m_DemoPlayer.Info()->m_Info.m_Paused;
+		if(paused)
+			IVideo::Current()->Pause(true);
+	}
+	else
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Videorecorder already running.");
+}
+
+void CClient::StartVideo(IConsole::IResult *pResult, void *pUserData, const char *pVideoName)
+{
+	CClient *pSelf = (CClient *)pUserData;
+
+	if(pSelf->State() != IClient::STATE_DEMOPLAYBACK)
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Can not start videorecorder outside of demoplayer.");
+
+	pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "demo_render", pVideoName);
+	if(!IVideo::Current())
+	{
+		// wait for idle, so there is no data race
+		pSelf->Graphics()->WaitForIdle();
+		// pause the sound device while creating the video instance
+		pSelf->Sound()->PauseAudioDevice();
+		new CVideo((CGraphics_Threaded *)pSelf->m_pGraphics, pSelf->Sound(), pSelf->Storage(), pSelf->Graphics()->ScreenWidth(), pSelf->Graphics()->ScreenHeight(), pVideoName);
+		pSelf->Sound()->UnpauseAudioDevice();
+		IVideo::Current()->Start();
+	}
+	else
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "videorecorder", "Videorecorder already running.");
+}
+
+void CClient::Con_StopVideo(IConsole::IResult *pResult, void *pUserData)
+{
+	if(IVideo::Current())
+		IVideo::Current()->Stop();
+}
+
+#endif
+
+void CClient::Con_Rcon(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->Rcon(pResult->GetString(0));
+}
+
+void CClient::Con_RconAuth(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->RconAuth("", pResult->GetString(0));
+}
+
+void CClient::Con_RconLogin(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->RconAuth(pResult->GetString(0), pResult->GetString(1));
+}
+
+void CClient::Con_BeginFavoriteGroup(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->m_FavoritesGroup)
+	{
+		log_error("client", "opening favorites group while there is already one, discarding old one");
+		for(int i = 0; i < pSelf->m_FavoritesGroupNum; i++)
+		{
+			char aAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&pSelf->m_aFavoritesGroupAddresses[i], aAddr, sizeof(aAddr), true);
+			log_warn("client", "discarding %s", aAddr);
+		}
+	}
+	pSelf->m_FavoritesGroup = true;
+	pSelf->m_FavoritesGroupAllowPing = false;
+	pSelf->m_FavoritesGroupNum = 0;
+}
+
+void CClient::Con_EndFavoriteGroup(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(!pSelf->m_FavoritesGroup)
+	{
+		log_error("client", "closing favorites group while there is none, ignoring");
+		return;
+	}
+	log_info("client", "adding group of %d favorites", pSelf->m_FavoritesGroupNum);
+	pSelf->m_pFavorites->Add(pSelf->m_aFavoritesGroupAddresses, pSelf->m_FavoritesGroupNum);
+	if(pSelf->m_FavoritesGroupAllowPing)
+	{
+		pSelf->m_pFavorites->AllowPing(pSelf->m_aFavoritesGroupAddresses, pSelf->m_FavoritesGroupNum, true);
+	}
+	pSelf->m_FavoritesGroup = false;
+}
+
+void CClient::Con_AddFavorite(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	NETADDR Addr;
+	if(net_addr_from_str(&Addr, pResult->GetString(0)) != 0)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "invalid address '%s'", pResult->GetString(0));
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf);
+		return;
+	}
+	bool AllowPing = pResult->NumArguments() > 1 && str_find(pResult->GetString(1), "allow_ping");
+	char aAddr[NETADDR_MAXSTRSIZE];
+	net_addr_str(&Addr, aAddr, sizeof(aAddr), true);
+	if(pSelf->m_FavoritesGroup)
+	{
+		if(pSelf->m_FavoritesGroupNum == (int)std::size(pSelf->m_aFavoritesGroupAddresses))
+		{
+			log_error("client", "discarding %s because groups can have at most a size of %d", aAddr, pSelf->m_FavoritesGroupNum);
+			return;
+		}
+		log_info("client", "adding %s to favorites group", aAddr);
+		pSelf->m_aFavoritesGroupAddresses[pSelf->m_FavoritesGroupNum] = Addr;
+		pSelf->m_FavoritesGroupAllowPing = pSelf->m_FavoritesGroupAllowPing || AllowPing;
+		pSelf->m_FavoritesGroupNum += 1;
+	}
+	else
+	{
+		log_info("client", "adding %s to favorites", aAddr);
+		pSelf->m_pFavorites->Add(&Addr, 1);
+		if(AllowPing)
+		{
+			pSelf->m_pFavorites->AllowPing(&Addr, 1, true);
+		}
+	}
+}
+
+void CClient::Con_RemoveFavorite(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	NETADDR Addr;
+	if(net_addr_from_str(&Addr, pResult->GetString(0)) == 0)
+		pSelf->m_pFavorites->Remove(&Addr, 1);
+}
+
+void CClient::DemoSliceBegin()
+{
+	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
+	g_Config.m_ClDemoSliceBegin = pInfo->m_Info.m_CurrentTick;
+}
+
+void CClient::DemoSliceEnd()
+{
+	const CDemoPlayer::CPlaybackInfo *pInfo = m_DemoPlayer.Info();
+	g_Config.m_ClDemoSliceEnd = pInfo->m_Info.m_CurrentTick;
+}
+
+void CClient::Con_DemoSliceBegin(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->DemoSliceBegin();
+}
+
+void CClient::Con_DemoSliceEnd(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->DemoSliceEnd();
+}
+
+void CClient::Con_SaveReplay(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pResult->NumArguments())
+	{
+		int Length = pResult->GetInteger(0);
+		if(Length <= 0)
+			pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: length must be greater than 0 second.");
+		else
+		{
+			if(pResult->NumArguments() >= 2)
+				pSelf->SaveReplay(Length, pResult->GetString(1));
+			else
+				pSelf->SaveReplay(Length);
+		}
+	}
+	else
+		pSelf->SaveReplay(g_Config.m_ClReplayLength);
+}
+
+void CClient::SaveReplay(const int Length, const char *pFilename)
+{
+	if(!g_Config.m_ClReplays)
+	{
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Feature is disabled. Please enable it via configuration.");
+		GameClient()->Echo(Localize("Replay feature is disabled!"));
+		return;
+	}
+
+	if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording())
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: demorecorder isn't recording. Try to rejoin to fix that.");
+	else if(DemoRecorder(RECORDER_REPLAYS)->Length() < 1)
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "ERROR: demorecorder isn't recording for at least 1 second.");
+	else
+	{
+		// First we stop the recorder to slice correctly the demo after
+		DemoRecorder_Stop(RECORDER_REPLAYS);
+
+		char aDate[64];
+		str_timestamp(aDate, sizeof(aDate));
+
+		char aFilename[IO_MAX_PATH_LENGTH];
+		if(str_comp(pFilename, "") == 0)
+			str_format(aFilename, sizeof(aFilename), "demos/replays/%s_%s (replay).demo", m_aCurrentMap, aDate);
+		else
+			str_format(aFilename, sizeof(aFilename), "demos/replays/%s.demo", pFilename);
+
+		char *pSrc = m_aDemoRecorder[RECORDER_REPLAYS].GetCurrentFilename();
+
+		// Slice the demo to get only the last cl_replay_length seconds
+		const int EndTick = GameTick(g_Config.m_ClDummy);
+		const int StartTick = EndTick - Length * GameTickSpeed();
+
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "replay", "Saving replay...");
+
+		// Create a job to do this slicing in background because it can be a bit long depending on the file size
+		std::shared_ptr<CDemoEdit> pDemoEditTask = std::make_shared<CDemoEdit>(GameClient()->NetVersion(), &m_SnapshotDelta, m_pStorage, pSrc, aFilename, StartTick, EndTick);
+		Engine()->AddJob(pDemoEditTask);
+		m_EditJobs.push_back(pDemoEditTask);
+
+		// And we restart the recorder
+		DemoRecorder_StartReplayRecorder();
+	}
+}
+
+void CClient::DemoSlice(const char *pDstPath, CLIENTFUNC_FILTER pfnFilter, void *pUser)
+{
+	if(m_DemoPlayer.IsPlaying())
+	{
+		m_DemoEditor.Slice(m_DemoPlayer.Filename(), pDstPath, g_Config.m_ClDemoSliceBegin, g_Config.m_ClDemoSliceEnd, pfnFilter, pUser);
+	}
+}
+
+const char *CClient::DemoPlayer_Play(const char *pFilename, int StorageType)
+{
+	// Don't disconnect unless the file exists (only for play command)
+	if(!Storage()->FileExists(pFilename, StorageType))
+		return "No demo with this filename exists";
+
+	Disconnect();
+	m_aNetClient[CONN_MAIN].ResetErrorString();
+
+	// try to start playback
+	m_DemoPlayer.SetListener(this);
+	if(m_DemoPlayer.Load(Storage(), m_pConsole, pFilename, StorageType))
+		return m_DemoPlayer.ErrorMessage();
+
+	// load map
+	const CMapInfo *pMapInfo = m_DemoPlayer.GetMapInfo();
+	int Crc = pMapInfo->m_Crc;
+	SHA256_DIGEST Sha = pMapInfo->m_Sha256;
+	const char *pError = LoadMapSearch(pMapInfo->m_aName, Sha != SHA256_ZEROED ? &Sha : nullptr, Crc);
+	if(pError)
+	{
+		if(!m_DemoPlayer.ExtractMap(Storage()))
+		{
+			DisconnectWithReason(pError);
+			return pError;
+		}
+
+		Sha = m_DemoPlayer.GetMapInfo()->m_Sha256;
+		pError = LoadMapSearch(pMapInfo->m_aName, &Sha, Crc);
+		if(pError)
+		{
+			DisconnectWithReason(pError);
+			return pError;
+		}
+	}
+
+	// setup current info
+	str_copy(m_CurrentServerInfo.m_aMap, pMapInfo->m_aName);
+	m_CurrentServerInfo.m_MapCrc = pMapInfo->m_Crc;
+	m_CurrentServerInfo.m_MapSize = pMapInfo->m_Size;
+
+	GameClient()->OnConnected();
+
+	// setup buffers
+	mem_zero(m_aaaDemorecSnapshotData, sizeof(m_aaaDemorecSnapshotData));
+
+	for(int SnapshotType = 0; SnapshotType < NUM_SNAPSHOT_TYPES; SnapshotType++)
+	{
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType] = &m_aDemorecSnapshotHolders[SnapshotType];
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][0];
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemorecSnapshotData[SnapshotType][1];
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_SnapSize = 0;
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_AltSnapSize = 0;
+		m_aapSnapshots[g_Config.m_ClDummy][SnapshotType]->m_Tick = -1;
+	}
+
+	// enter demo playback state
+	SetState(IClient::STATE_DEMOPLAYBACK);
+
+	m_DemoPlayer.Play();
+	GameClient()->OnEnterGame();
+
+	return 0;
+}
+
+#if defined(CONF_VIDEORECORDER)
+const char *CClient::DemoPlayer_Render(const char *pFilename, int StorageType, const char *pVideoName, int SpeedIndex, bool StartPaused)
+{
+	const char *pError = DemoPlayer_Play(pFilename, StorageType);
+	if(pError)
+		return pError;
+	m_ButtonRender = true;
+
+	this->CClient::StartVideo(NULL, this, pVideoName);
+	m_DemoPlayer.Play();
+	m_DemoPlayer.SetSpeedIndex(SpeedIndex);
+	if(StartPaused)
+	{
+		m_DemoPlayer.Pause();
+	}
+	return nullptr;
+}
+#endif
+
+void CClient::Con_Play(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->HandleDemoPath(pResult->GetString(0));
+}
+
+void CClient::Con_DemoPlay(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->m_DemoPlayer.IsPlaying())
+	{
+		if(pSelf->m_DemoPlayer.BaseInfo()->m_Paused)
+		{
+			pSelf->m_DemoPlayer.Unpause();
+		}
+		else
+		{
+			pSelf->m_DemoPlayer.Pause();
+		}
+	}
+}
+
+void CClient::Con_DemoSpeed(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->m_DemoPlayer.SetSpeed(pResult->GetFloat(0));
+}
+
+void CClient::DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int Recorder, bool Verbose)
+{
+	if(State() != IClient::STATE_ONLINE)
+	{
+		if(Verbose)
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demorec/record", "client is not online");
+	}
+	else
+	{
+		char aFilename[IO_MAX_PATH_LENGTH];
+		if(WithTimestamp)
+		{
+			char aDate[20];
+			str_timestamp(aDate, sizeof(aDate));
+			str_format(aFilename, sizeof(aFilename), "demos/%s_%s.demo", pFilename, aDate);
+		}
+		else
+			str_format(aFilename, sizeof(aFilename), "demos/%s.demo", pFilename);
+
+		m_aDemoRecorder[Recorder].Start(Storage(), m_pConsole, aFilename, GameClient()->NetVersion(), m_aCurrentMap, m_pMap->Sha256(), m_pMap->Crc(), "client", m_pMap->MapSize(), 0, m_pMap->File());
+	}
+}
+
+void CClient::DemoRecorder_HandleAutoStart()
+{
+	if(g_Config.m_ClAutoDemoRecord)
+	{
+		DemoRecorder_Stop(RECORDER_AUTO);
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "auto/%s", m_aCurrentMap);
+		DemoRecorder_Start(aBuf, true, RECORDER_AUTO);
+		if(g_Config.m_ClAutoDemoMax)
+		{
+			// clean up auto recorded demos
+			CFileCollection AutoDemos;
+			AutoDemos.Init(Storage(), "demos/auto", "" /* empty for wild card */, ".demo", g_Config.m_ClAutoDemoMax);
+		}
+	}
+	if(!DemoRecorder(RECORDER_REPLAYS)->IsRecording())
+	{
+		DemoRecorder_StartReplayRecorder();
+	}
+}
+
+void CClient::DemoRecorder_StartReplayRecorder()
+{
+	if(g_Config.m_ClReplays)
+	{
+		DemoRecorder_Stop(RECORDER_REPLAYS);
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "replays/replay_tmp-%s", m_aCurrentMap);
+		DemoRecorder_Start(aBuf, true, RECORDER_REPLAYS);
+	}
+}
+
+void CClient::DemoRecorder_Stop(int Recorder, bool RemoveFile)
+{
+	m_aDemoRecorder[Recorder].Stop();
+	if(RemoveFile)
+	{
+		const char *pFilename = m_aDemoRecorder[Recorder].GetCurrentFilename();
+		if(pFilename[0] != '\0')
+		{
+			Storage()->RemoveFile(pFilename, IStorage::TYPE_SAVE);
+			m_aDemoRecorder[Recorder].ClearCurrentFilename();
+		}
+	}
+}
+
+void CClient::DemoRecorder_AddDemoMarker(int Recorder)
+{
+	m_aDemoRecorder[Recorder].AddDemoMarker();
+}
+
+class IDemoRecorder *CClient::DemoRecorder(int Recorder)
+{
+	return &m_aDemoRecorder[Recorder];
+}
+
+void CClient::Con_Record(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+
+	if(pSelf->m_aDemoRecorder[RECORDER_MANUAL].IsRecording())
+	{
+		pSelf->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Demo recorder already recording");
+		return;
+	}
+
+	if(pResult->NumArguments())
+		pSelf->DemoRecorder_Start(pResult->GetString(0), false, RECORDER_MANUAL, true);
+	else
+		pSelf->DemoRecorder_Start(pSelf->m_aCurrentMap, true, RECORDER_MANUAL, true);
+}
+
+void CClient::Con_StopRecord(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pSelf->DemoRecorder_Stop(RECORDER_MANUAL);
+}
+
+void CClient::Con_AddDemoMarker(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	for(int Recorder = 0; Recorder < RECORDER_MAX; Recorder++)
+		pSelf->DemoRecorder_AddDemoMarker(Recorder);
+}
+
+void CClient::Con_BenchmarkQuit(IConsole::IResult *pResult, void *pUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	int Seconds = pResult->GetInteger(0);
+	const char *pFilename = pResult->GetString(1);
+	pSelf->BenchmarkQuit(Seconds, pFilename);
+}
+
+void CClient::BenchmarkQuit(int Seconds, const char *pFilename)
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	m_BenchmarkFile = Storage()->OpenFile(pFilename, IOFLAG_WRITE, IStorage::TYPE_ABSOLUTE, aBuf, sizeof(aBuf));
+	m_BenchmarkStopTime = time_get() + time_freq() * Seconds;
+}
+
+void CClient::UpdateAndSwap()
+{
+	Input()->Update();
+	Graphics()->Swap();
+	Graphics()->Clear(0, 0, 0);
+}
+
+void CClient::ServerBrowserUpdate()
+{
+	m_ServerBrowser.RequestResort();
+}
+
+void CClient::ConchainServerBrowserUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		((CClient *)pUserData)->ServerBrowserUpdate();
+}
+
+void CClient::InitChecksum()
+{
+	CChecksumData *pData = &m_Checksum.m_Data;
+	pData->m_SizeofData = sizeof(*pData);
+	str_copy(pData->m_aVersionStr, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
+	pData->m_Start = time_get();
+	os_version_str(pData->m_aOsVersion, sizeof(pData->m_aOsVersion));
+	secure_random_fill(&pData->m_Random, sizeof(pData->m_Random));
+	pData->m_Version = GameClient()->DDNetVersion();
+	pData->m_SizeofClient = sizeof(*this);
+	pData->m_SizeofConfig = sizeof(pData->m_Config);
+	pData->InitFiles();
+}
+
+#ifndef DDNET_CHECKSUM_SALT
+// salt@checksum.ddnet.tw: db877f2b-2ddb-3ba6-9f67-a6d169ec671d
+#define DDNET_CHECKSUM_SALT \
+	{ \
+		{ \
+			0xdb, 0x87, 0x7f, 0x2b, 0x2d, 0xdb, 0x3b, 0xa6, \
+				0x9f, 0x67, 0xa6, 0xd1, 0x69, 0xec, 0x67, 0x1d, \
+		} \
+	}
+#endif
+
+int CClient::HandleChecksum(int Conn, CUuid Uuid, CUnpacker *pUnpacker)
+{
+	int Start = pUnpacker->GetInt();
+	int Length = pUnpacker->GetInt();
+	if(pUnpacker->Error())
+	{
+		return 1;
+	}
+	if(Start < 0 || Length < 0 || Start > INT_MAX - Length)
+	{
+		return 2;
+	}
+	int End = Start + Length;
+	int ChecksumBytesEnd = minimum(End, (int)sizeof(m_Checksum.m_aBytes));
+	int FileStart = maximum(Start, (int)sizeof(m_Checksum.m_aBytes));
+	unsigned char aStartBytes[sizeof(int32_t)];
+	unsigned char aEndBytes[sizeof(int32_t)];
+	uint_to_bytes_be(aStartBytes, Start);
+	uint_to_bytes_be(aEndBytes, End);
+
+	if(Start <= (int)sizeof(m_Checksum.m_aBytes))
+	{
+		mem_zero(&m_Checksum.m_Data.m_Config, sizeof(m_Checksum.m_Data.m_Config));
+#define CHECKSUM_RECORD(Flags) (((Flags)&CFGFLAG_CLIENT) == 0 || ((Flags)&CFGFLAG_INSENSITIVE) != 0)
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \
+	if(CHECKSUM_RECORD(Flags)) \
+	{ \
+		m_Checksum.m_Data.m_Config.m_##Name = g_Config.m_##Name; \
+	}
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Flags, Desc) \
+	if(CHECKSUM_RECORD(Flags)) \
+	{ \
+		m_Checksum.m_Data.m_Config.m_##Name = g_Config.m_##Name; \
+	}
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Flags, Desc) \
+	if(CHECKSUM_RECORD(Flags)) \
+	{ \
+		str_copy(m_Checksum.m_Data.m_Config.m_##Name, g_Config.m_##Name, sizeof(m_Checksum.m_Data.m_Config.m_##Name)); \
+	}
+#include <engine/shared/config_variables.h>
+#undef CHECKSUM_RECORD
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_COL
+#undef MACRO_CONFIG_STR
+	}
+	if(End > (int)sizeof(m_Checksum.m_aBytes))
+	{
+		if(m_OwnExecutableSize == 0)
+		{
+			m_OwnExecutable = io_current_exe();
+			// io_length returns -1 on error.
+			m_OwnExecutableSize = m_OwnExecutable ? io_length(m_OwnExecutable) : -1;
+		}
+		// Own executable not available.
+		if(m_OwnExecutableSize < 0)
+		{
+			return 3;
+		}
+		if(End - (int)sizeof(m_Checksum.m_aBytes) > m_OwnExecutableSize)
+		{
+			return 4;
+		}
+	}
+
+	SHA256_CTX Sha256Ctxt;
+	sha256_init(&Sha256Ctxt);
+	CUuid Salt = DDNET_CHECKSUM_SALT;
+	sha256_update(&Sha256Ctxt, &Salt, sizeof(Salt));
+	sha256_update(&Sha256Ctxt, &Uuid, sizeof(Uuid));
+	sha256_update(&Sha256Ctxt, aStartBytes, sizeof(aStartBytes));
+	sha256_update(&Sha256Ctxt, aEndBytes, sizeof(aEndBytes));
+	if(Start < (int)sizeof(m_Checksum.m_aBytes))
+	{
+		sha256_update(&Sha256Ctxt, m_Checksum.m_aBytes + Start, ChecksumBytesEnd - Start);
+	}
+	if(End > (int)sizeof(m_Checksum.m_aBytes))
+	{
+		unsigned char aBuf[2048];
+		if(io_seek(m_OwnExecutable, FileStart - sizeof(m_Checksum.m_aBytes), IOSEEK_START))
+		{
+			return 5;
+		}
+		for(int i = FileStart; i < End; i += sizeof(aBuf))
+		{
+			int Read = io_read(m_OwnExecutable, aBuf, minimum((int)sizeof(aBuf), End - i));
+			sha256_update(&Sha256Ctxt, aBuf, Read);
+		}
+	}
+	SHA256_DIGEST Sha256 = sha256_finish(&Sha256Ctxt);
+
+	CMsgPacker Msg(NETMSG_CHECKSUM_RESPONSE, true);
+	Msg.AddRaw(&Uuid, sizeof(Uuid));
+	Msg.AddRaw(&Sha256, sizeof(Sha256));
+	SendMsg(Conn, &Msg, MSGFLAG_VITAL);
+
+	return 0;
+}
+
+void CClient::SwitchWindowScreen(int Index)
+{
+	// Todo SDL: remove this when fixed (changing screen when in fullscreen is bugged)
+	if(g_Config.m_GfxFullscreen)
+	{
+		SetWindowParams(0, g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
+		if(Graphics()->SetWindowScreen(Index))
+			g_Config.m_GfxScreen = Index;
+		SetWindowParams(g_Config.m_GfxFullscreen, g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
+	}
+	else
+	{
+		if(Graphics()->SetWindowScreen(Index))
+			g_Config.m_GfxScreen = Index;
+	}
+}
+
+void CClient::ConchainWindowScreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->Graphics() && pResult->NumArguments())
+	{
+		if(g_Config.m_GfxScreen != pResult->GetInteger(0))
+			pSelf->SwitchWindowScreen(pResult->GetInteger(0));
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CClient::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+{
+	g_Config.m_GfxFullscreen = clamp(FullscreenMode, 0, 3);
+	g_Config.m_GfxBorderless = (int)IsBorderless;
+	Graphics()->SetWindowParams(FullscreenMode, IsBorderless, AllowResizing);
+}
+
+void CClient::ConchainFullscreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->Graphics() && pResult->NumArguments())
+	{
+		if(g_Config.m_GfxFullscreen != pResult->GetInteger(0))
+			pSelf->SetWindowParams(pResult->GetInteger(0), g_Config.m_GfxBorderless, pResult->GetInteger(0) != 3);
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CClient::ConchainWindowBordered(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->Graphics() && pResult->NumArguments())
+	{
+		if(!g_Config.m_GfxFullscreen && (g_Config.m_GfxBorderless != pResult->GetInteger(0)))
+			pSelf->SetWindowParams(g_Config.m_GfxFullscreen, !g_Config.m_GfxBorderless, g_Config.m_GfxFullscreen != 3);
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CClient::ToggleWindowVSync()
+{
+	if(Graphics()->SetVSync(g_Config.m_GfxVsync ^ 1))
+		g_Config.m_GfxVsync ^= 1;
+}
+
+void CClient::Notify(const char *pTitle, const char *pMessage)
+{
+	if(m_pGraphics->WindowActive() || !g_Config.m_ClShowNotifications)
+		return;
+
+	Notifications()->Notify(pTitle, pMessage);
+	Graphics()->NotifyWindow();
+}
+
+void CClient::OnWindowResize()
+{
+	TextRender()->OnPreWindowResize();
+	GameClient()->OnWindowResize();
+	m_pEditor->OnWindowResize();
+	TextRender()->OnWindowResize();
+}
+
+void CClient::ConchainWindowVSync(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	if(pSelf->Graphics() && pResult->NumArguments())
+	{
+		if(g_Config.m_GfxVsync != pResult->GetInteger(0))
+			pSelf->ToggleWindowVSync();
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CClient::ConchainWindowResize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pSelf->Graphics() && pResult->NumArguments())
+	{
+		pSelf->Graphics()->Resize(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+	}
+}
+
+void CClient::ConchainTimeoutSeed(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		pSelf->m_GenerateTimeoutSeed = false;
+}
+
+void CClient::ConchainPassword(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() && pSelf->m_LocalStartTime) //won't set m_SendPassword before game has started
+		pSelf->m_SendPassword = true;
+}
+
+void CClient::ConchainReplays(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		int Status = pResult->GetInteger(0);
+		if(Status == 0)
+		{
+			// stop recording and remove the tmp demo file
+			pSelf->DemoRecorder_Stop(RECORDER_REPLAYS, true);
+		}
+		else
+		{
+			// start recording
+			pSelf->DemoRecorder_HandleAutoStart();
+		}
+	}
+}
+
+void CClient::ConchainLoglevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		pSelf->m_pFileLogger->SetFilter(CLogFilter{IConsole::ToLogLevelFilter(g_Config.m_Loglevel)});
+	}
+}
+
+void CClient::ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CClient *pSelf = (CClient *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() && pSelf->m_pStdoutLogger)
+	{
+		pSelf->m_pStdoutLogger->SetFilter(CLogFilter{IConsole::ToLogLevelFilter(g_Config.m_StdoutOutputLevel)});
+	}
+}
+
+void CClient::RegisterCommands()
+{
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	// register server dummy commands for tab completion
+	m_pConsole->Register("kick", "i[id] ?r[reason]", CFGFLAG_SERVER, 0, 0, "Kick player with specified id for any reason");
+	m_pConsole->Register("ban", "s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER, 0, 0, "Ban player with ip/id for x minutes for any reason");
+	m_pConsole->Register("unban", "r[ip]", CFGFLAG_SERVER, 0, 0, "Unban ip");
+	m_pConsole->Register("bans", "?i[page]", CFGFLAG_SERVER, 0, 0, "Show banlist (page 0 by default, 20 entries per page)");
+	m_pConsole->Register("status", "?r[name]", CFGFLAG_SERVER, 0, 0, "List players containing name or all players");
+	m_pConsole->Register("shutdown", "", CFGFLAG_SERVER, 0, 0, "Shut down");
+	m_pConsole->Register("record", "r[file]", CFGFLAG_SERVER, 0, 0, "Record to a file");
+	m_pConsole->Register("stoprecord", "", CFGFLAG_SERVER, 0, 0, "Stop recording");
+	m_pConsole->Register("reload", "", CFGFLAG_SERVER, 0, 0, "Reload the map");
+
+	m_pConsole->Register("dummy_connect", "", CFGFLAG_CLIENT, Con_DummyConnect, this, "Connect dummy");
+	m_pConsole->Register("dummy_disconnect", "", CFGFLAG_CLIENT, Con_DummyDisconnect, this, "Disconnect dummy");
+	m_pConsole->Register("dummy_reset", "", CFGFLAG_CLIENT, Con_DummyResetInput, this, "Reset dummy");
+
+	m_pConsole->Register("quit", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Quit, this, "Quit the client");
+	m_pConsole->Register("exit", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Quit, this, "Quit the client");
+	m_pConsole->Register("restart", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Restart, this, "Restart the client");
+	m_pConsole->Register("minimize", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Minimize, this, "Minimize the client");
+	m_pConsole->Register("connect", "r[host|ip]", CFGFLAG_CLIENT, Con_Connect, this, "Connect to the specified host/ip");
+	m_pConsole->Register("disconnect", "", CFGFLAG_CLIENT, Con_Disconnect, this, "Disconnect from the server");
+	m_pConsole->Register("ping", "", CFGFLAG_CLIENT, Con_Ping, this, "Ping the current server");
+	m_pConsole->Register("screenshot", "", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Screenshot, this, "Take a screenshot");
+
+#if defined(CONF_VIDEORECORDER)
+	m_pConsole->Register("start_video", "", CFGFLAG_CLIENT, Con_StartVideo, this, "Start recording a video");
+	m_pConsole->Register("stop_video", "", CFGFLAG_CLIENT, Con_StopVideo, this, "Stop recording a video");
+#endif
+
+	m_pConsole->Register("rcon", "r[rcon-command]", CFGFLAG_CLIENT, Con_Rcon, this, "Send specified command to rcon");
+	m_pConsole->Register("rcon_auth", "r[password]", CFGFLAG_CLIENT, Con_RconAuth, this, "Authenticate to rcon");
+	m_pConsole->Register("rcon_login", "s[username] r[password]", CFGFLAG_CLIENT, Con_RconLogin, this, "Authenticate to rcon with a username");
+	m_pConsole->Register("play", "r[file]", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Play, this, "Play the file specified");
+	m_pConsole->Register("record", "?r[file]", CFGFLAG_CLIENT, Con_Record, this, "Record to the file");
+	m_pConsole->Register("stoprecord", "", CFGFLAG_CLIENT, Con_StopRecord, this, "Stop recording");
+	m_pConsole->Register("add_demomarker", "", CFGFLAG_CLIENT, Con_AddDemoMarker, this, "Add demo timeline marker");
+	m_pConsole->Register("begin_favorite_group", "", CFGFLAG_CLIENT, Con_BeginFavoriteGroup, this, "Use this before `add_favorite` to group favorites. End with `end_favorite_group`");
+	m_pConsole->Register("end_favorite_group", "", CFGFLAG_CLIENT, Con_EndFavoriteGroup, this, "Use this after `add_favorite` to group favorites. Start with `begin_favorite_group`");
+	m_pConsole->Register("add_favorite", "s[host|ip] ?s['allow_ping']", CFGFLAG_CLIENT, Con_AddFavorite, this, "Add a server as a favorite");
+	m_pConsole->Register("remove_favorite", "r[host|ip]", CFGFLAG_CLIENT, Con_RemoveFavorite, this, "Remove a server from favorites");
+	m_pConsole->Register("demo_slice_start", "", CFGFLAG_CLIENT, Con_DemoSliceBegin, this, "Mark the beginning of a cut");
+	m_pConsole->Register("demo_slice_end", "", CFGFLAG_CLIENT, Con_DemoSliceEnd, this, "Mark the end of a cut");
+	m_pConsole->Register("demo_play", "", CFGFLAG_CLIENT, Con_DemoPlay, this, "Play demo");
+	m_pConsole->Register("demo_speed", "i[speed]", CFGFLAG_CLIENT, Con_DemoSpeed, this, "Set demo speed");
+
+	m_pConsole->Register("save_replay", "?i[length] ?r[filename]", CFGFLAG_CLIENT, Con_SaveReplay, this, "Save a replay of the last defined amount of seconds");
+	m_pConsole->Register("benchmark_quit", "i[seconds] r[file]", CFGFLAG_CLIENT | CFGFLAG_STORE, Con_BenchmarkQuit, this, "Benchmark frame times for number of seconds to file, then quit");
+
+	RustVersionRegister(*m_pConsole);
+
+	m_pConsole->Chain("cl_timeout_seed", ConchainTimeoutSeed, this);
+	m_pConsole->Chain("cl_replays", ConchainReplays, this);
+
+	m_pConsole->Chain("password", ConchainPassword, this);
+
+	// used for server browser update
+	m_pConsole->Chain("br_filter_string", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_gametype", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("br_filter_serveraddress", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("add_favorite", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("remove_favorite", ConchainServerBrowserUpdate, this);
+	m_pConsole->Chain("end_favorite_group", ConchainServerBrowserUpdate, this);
+
+	m_pConsole->Chain("gfx_screen", ConchainWindowScreen, this);
+	m_pConsole->Chain("gfx_screen_width", ConchainWindowResize, this);
+	m_pConsole->Chain("gfx_screen_height", ConchainWindowResize, this);
+	m_pConsole->Chain("gfx_screen_refresh_rate", ConchainWindowResize, this);
+	m_pConsole->Chain("gfx_fullscreen", ConchainFullscreen, this);
+	m_pConsole->Chain("gfx_borderless", ConchainWindowBordered, this);
+	m_pConsole->Chain("gfx_vsync", ConchainWindowVSync, this);
+
+	m_pConsole->Chain("loglevel", ConchainLoglevel, this);
+	m_pConsole->Chain("stdout_output_level", ConchainStdoutOutputLevel, this);
+
+	// DDRace
+
+#define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, 0, 0, help);
+#include <game/ddracecommands.h>
+#undef CONSOLE_COMMAND
+}
+
+static CClient *CreateClient()
+{
+	return new CClient;
+}
+
+void CClient::HandleConnectAddress(const NETADDR *pAddr)
+{
+	net_addr_str(pAddr, m_aCmdConnect, sizeof(m_aCmdConnect), true);
+}
+
+void CClient::HandleConnectLink(const char *pLink)
+{
+	// Chrome works fine with ddnet:// but not with ddnet:
+	// Check ddnet:// before ddnet: because we don't want the // as part of connect command
+	if(str_startswith(pLink, CONNECTLINK_DOUBLE_SLASH))
+		str_copy(m_aCmdConnect, pLink + sizeof(CONNECTLINK_DOUBLE_SLASH) - 1);
+	else if(str_startswith(pLink, CONNECTLINK_NO_SLASH))
+		str_copy(m_aCmdConnect, pLink + sizeof(CONNECTLINK_NO_SLASH) - 1);
+	else
+		str_copy(m_aCmdConnect, pLink);
+	// Edge appends / to the URL
+	const int len = str_length(m_aCmdConnect);
+	if(m_aCmdConnect[len - 1] == '/')
+		m_aCmdConnect[len - 1] = '\0';
+}
+
+void CClient::HandleDemoPath(const char *pPath)
+{
+	str_copy(m_aCmdPlayDemo, pPath);
+}
+
+void CClient::HandleMapPath(const char *pPath)
+{
+	str_copy(m_aCmdEditMap, pPath);
+}
+
+static bool UnknownArgumentCallback(const char *pCommand, void *pUser)
+{
+	CClient *pClient = static_cast<CClient *>(pUser);
+	if(str_startswith(pCommand, CONNECTLINK_NO_SLASH))
+	{
+		pClient->HandleConnectLink(pCommand);
+		return true;
+	}
+	else if(str_endswith(pCommand, ".demo"))
+	{
+		pClient->HandleDemoPath(pCommand);
+		return true;
+	}
+	else if(str_endswith(pCommand, ".map"))
+	{
+		pClient->HandleMapPath(pCommand);
+		return true;
+	}
+	return false;
+}
+
+static bool SaveUnknownCommandCallback(const char *pCommand, void *pUser)
+{
+	CClient *pClient = static_cast<CClient *>(pUser);
+	pClient->ConfigManager()->StoreUnknownCommand(pCommand);
+	return true;
+}
+
+/*
+	Server Time
+	Client Mirror Time
+	Client Predicted Time
+
+	Snapshot Latency
+		Downstream latency
+
+	Prediction Latency
+		Upstream latency
+*/
+
+#if defined(CONF_PLATFORM_MACOS)
+extern "C" int TWMain(int argc, const char **argv)
+#elif defined(CONF_PLATFORM_ANDROID)
+extern "C" __attribute__((visibility("default"))) int SDL_main(int argc, char *argv[]);
+extern "C" void InitAndroid();
+
+int SDL_main(int argc, char *argv2[])
+#else
+int main(int argc, const char **argv)
+#endif
+{
+#if defined(CONF_PLATFORM_ANDROID)
+	const char **argv = const_cast<const char **>(argv2);
+#elif defined(CONF_FAMILY_WINDOWS)
+	CWindowsComLifecycle WindowsComLifecycle(true);
+#endif
+	CCmdlineFix CmdlineFix(&argc, &argv);
+
+	bool Silent = false;
+
+	for(int i = 1; i < argc; i++)
+	{
+		if(str_comp("-s", argv[i]) == 0 || str_comp("--silent", argv[i]) == 0)
+		{
+			Silent = true;
+		}
+	}
+
+#if defined(CONF_PLATFORM_ANDROID)
+	InitAndroid();
+#endif
+
+#if defined(CONF_EXCEPTION_HANDLING)
+	init_exception_handler();
+#endif
+
+	std::vector<std::shared_ptr<ILogger>> vpLoggers;
+	std::shared_ptr<ILogger> pStdoutLogger = nullptr;
+#if defined(CONF_PLATFORM_ANDROID)
+	pStdoutLogger = std::shared_ptr<ILogger>(log_logger_android());
+#else
+	if(!Silent)
+	{
+		pStdoutLogger = std::shared_ptr<ILogger>(log_logger_stdout());
+	}
+#endif
+	if(pStdoutLogger)
+	{
+		vpLoggers.push_back(pStdoutLogger);
+	}
+	std::shared_ptr<CFutureLogger> pFutureFileLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureFileLogger);
+	std::shared_ptr<CFutureLogger> pFutureConsoleLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureConsoleLogger);
+	std::shared_ptr<CFutureLogger> pFutureAssertionLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureAssertionLogger);
+	log_set_global_logger(log_logger_collection(std::move(vpLoggers)).release());
+
+	std::stack<std::function<void()>> CleanerFunctions;
+	std::function<void()> PerformCleanup = [&CleanerFunctions]() mutable {
+		while(!CleanerFunctions.empty())
+		{
+			CleanerFunctions.top()();
+			CleanerFunctions.pop();
+		}
+	};
+	std::function<void()> PerformFinalCleanup = []() {
+#ifdef CONF_PLATFORM_ANDROID
+		// properly close this native thread, so globals are destructed
+		std::exit(0);
+#endif
+	};
+	std::function<void()> PerformAllCleanup = [PerformCleanup, PerformFinalCleanup]() mutable {
+		PerformCleanup();
+		PerformFinalCleanup();
+	};
+
+	const bool RandInitFailed = secure_random_init() != 0;
+	if(!RandInitFailed)
+		CleanerFunctions.emplace([]() { secure_random_uninit(); });
+
+	// Register SDL for cleanup before creating the kernel and client,
+	// so SDL is shutdown after kernel and client. Otherwise the client
+	// may crash when shutting down after SDL is already shutdown.
+	CleanerFunctions.emplace([]() { SDL_Quit(); });
+
+	CClient *pClient = CreateClient();
+	pClient->SetLoggers(pFutureFileLogger, std::move(pStdoutLogger));
+
+	IKernel *pKernel = IKernel::Create();
+	pKernel->RegisterInterface(pClient, false);
+	pClient->RegisterInterfaces();
+	CleanerFunctions.emplace([pKernel, pClient]() {
+		pKernel->Shutdown();
+		delete pKernel;
+		delete pClient;
+	});
+
+	const std::thread::id MainThreadId = std::this_thread::get_id();
+	dbg_assert_set_handler([MainThreadId, pClient](const char *pMsg) {
+		if(MainThreadId != std::this_thread::get_id())
+			return;
+		char aVersionStr[128];
+		if(!os_version_str(aVersionStr, sizeof(aVersionStr)))
+			str_copy(aVersionStr, "unknown");
+		char aGPUInfo[256];
+		pClient->GetGPUInfoString(aGPUInfo);
+		char aMessage[768];
+		str_format(aMessage, sizeof(aMessage),
+			"An assertion error occurred. Please write down or take a screenshot of the following information and report this error.\n"
+			"Please also share the assert log which you should find in the 'dumps' folder in your config directory.\n\n"
+			"%s\n\n"
+			"Platform: %s\n"
+			"Game version: %s %s\n"
+			"OS version: %s\n\n"
+			"%s", // GPU info
+			pMsg, CONF_PLATFORM_STRING, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH != nullptr ? GIT_SHORTREV_HASH : "", aVersionStr,
+			aGPUInfo);
+		pClient->ShowMessageBox("Assertion Error", aMessage);
+		// Client will crash due to assertion, don't call PerformAllCleanup in this inconsistent state
+	});
+
+	// create the components
+	IEngine *pEngine = CreateEngine(GAME_NAME, pFutureConsoleLogger, 2 * std::thread::hardware_concurrency() + 2);
+	pKernel->RegisterInterface(pEngine, false);
+	CleanerFunctions.emplace([pEngine]() {
+		// Engine has to be destroyed before the graphics so that skin download thread can finish
+		delete pEngine;
+	});
+
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_CLIENT, argc, (const char **)argv);
+	pKernel->RegisterInterface(pStorage);
+
+	pFutureAssertionLogger->Set(CreateAssertionLogger(pStorage, GAME_NAME));
+
+#if defined(CONF_EXCEPTION_HANDLING)
+	char aBufPath[IO_MAX_PATH_LENGTH];
+	char aBufName[IO_MAX_PATH_LENGTH];
+	char aDate[64];
+	str_timestamp(aDate, sizeof(aDate));
+	str_format(aBufName, sizeof(aBufName), "dumps/" GAME_NAME "_%s_crash_log_%s_%d_%s.RTP", CONF_PLATFORM_STRING, aDate, pid(), GIT_SHORTREV_HASH != nullptr ? GIT_SHORTREV_HASH : "");
+	pStorage->GetCompletePath(IStorage::TYPE_SAVE, aBufName, aBufPath, sizeof(aBufPath));
+	set_exception_handler_log_file(aBufPath);
+#endif
+
+	if(RandInitFailed)
+	{
+		const char *pError = "Failed to initialize the secure RNG.";
+		dbg_msg("secure", "%s", pError);
+		pClient->ShowMessageBox("Secure RNG Error", pError);
+		PerformAllCleanup();
+		return -1;
+	}
+
+	IConsole *pConsole = CreateConsole(CFGFLAG_CLIENT).release();
+	pKernel->RegisterInterface(pConsole);
+
+	IConfigManager *pConfigManager = CreateConfigManager();
+	pKernel->RegisterInterface(pConfigManager);
+
+	IEngineSound *pEngineSound = CreateEngineSound();
+	pKernel->RegisterInterface(pEngineSound); // IEngineSound
+	pKernel->RegisterInterface(static_cast<ISound *>(pEngineSound), false);
+
+	IEngineInput *pEngineInput = CreateEngineInput();
+	pKernel->RegisterInterface(pEngineInput); // IEngineInput
+	pKernel->RegisterInterface(static_cast<IInput *>(pEngineInput), false);
+
+	IEngineTextRender *pEngineTextRender = CreateEngineTextRender();
+	pKernel->RegisterInterface(pEngineTextRender); // IEngineTextRender
+	pKernel->RegisterInterface(static_cast<ITextRender *>(pEngineTextRender), false);
+
+	IEngineMap *pEngineMap = CreateEngineMap();
+	pKernel->RegisterInterface(pEngineMap); // IEngineMap
+	pKernel->RegisterInterface(static_cast<IMap *>(pEngineMap), false);
+
+	IDiscord *pDiscord = CreateDiscord();
+	pKernel->RegisterInterface(pDiscord);
+
+	ISteam *pSteam = CreateSteam();
+	pKernel->RegisterInterface(pSteam);
+
+	INotifications *pNotifications = CreateNotifications();
+	pKernel->RegisterInterface(pNotifications);
+
+	pKernel->RegisterInterface(CreateEditor(), false);
+	pKernel->RegisterInterface(CreateFavorites().release());
+	pKernel->RegisterInterface(CreateGameClient());
+
+	pEngine->Init();
+	pConsole->Init();
+	pConfigManager->Init();
+	pNotifications->Init(GAME_NAME " Client");
+
+	// register all console commands
+	pClient->RegisterCommands();
+
+	pKernel->RequestInterface<IGameClient>()->OnConsoleInit();
+
+	// init client's interfaces
+	pClient->InitInterfaces();
+
+	// execute config file
+	if(pStorage->FileExists(CONFIG_FILE, IStorage::TYPE_ALL))
+	{
+		pConsole->SetUnknownCommandCallback(SaveUnknownCommandCallback, pClient);
+		if(!pConsole->ExecuteFile(CONFIG_FILE))
+		{
+			const char *pError = "Failed to load config from '" CONFIG_FILE "'.";
+			dbg_msg("client", "%s", pError);
+			pClient->ShowMessageBox("Config File Error", pError);
+			PerformAllCleanup();
+			return -1;
+		}
+		pConsole->SetUnknownCommandCallback(IConsole::EmptyUnknownCommandCallback, nullptr);
+	}
+
+	// execute autoexec file
+	if(pStorage->FileExists(AUTOEXEC_CLIENT_FILE, IStorage::TYPE_ALL))
+	{
+		pConsole->ExecuteFile(AUTOEXEC_CLIENT_FILE);
+	}
+	else // fallback
+	{
+		pConsole->ExecuteFile(AUTOEXEC_FILE);
+	}
+
+	if(g_Config.m_ClConfigVersion < 1)
+	{
+		if(g_Config.m_ClAntiPing == 0)
+		{
+			g_Config.m_ClAntiPingPlayers = 1;
+			g_Config.m_ClAntiPingGrenade = 1;
+			g_Config.m_ClAntiPingWeapons = 1;
+		}
+	}
+	g_Config.m_ClConfigVersion = 1;
+
+	// parse the command line arguments
+	pConsole->SetUnknownCommandCallback(UnknownArgumentCallback, pClient);
+	pConsole->ParseArguments(argc - 1, (const char **)&argv[1]);
+	pConsole->SetUnknownCommandCallback(IConsole::EmptyUnknownCommandCallback, nullptr);
+
+	if(pSteam->GetConnectAddress())
+	{
+		pClient->HandleConnectAddress(pSteam->GetConnectAddress());
+		pSteam->ClearConnectAddress();
+	}
+
+	const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
+	if(g_Config.m_Logfile[0])
+	{
+		IOHANDLE Logfile = pStorage->OpenFile(g_Config.m_Logfile, Mode, IStorage::TYPE_SAVE_OR_ABSOLUTE);
+		if(Logfile)
+		{
+			pFutureFileLogger->Set(log_logger_file(Logfile));
+		}
+		else
+		{
+			dbg_msg("client", "failed to open '%s' for logging", g_Config.m_Logfile);
+		}
+	}
+
+	// Register protocol and file extensions
+#if defined(CONF_FAMILY_WINDOWS)
+	pClient->ShellRegister();
+#endif
+
+#if defined(CONF_PLATFORM_MACOS)
+	// Hints will not be set if there is an existing override hint or environment variable that takes precedence.
+	// So this respects cli environment overrides.
+	SDL_SetHint("SDL_MAC_OPENGL_ASYNC_DISPATCH", "1");
+#endif
+
+#if defined(CONF_FAMILY_WINDOWS)
+	SDL_SetHint("SDL_IME_SHOW_UI", g_Config.m_InpImeNativeUi ? "1" : "0");
+#else
+	SDL_SetHint("SDL_IME_SHOW_UI", "1");
+#endif
+
+	// init SDL
+	if(SDL_Init(0) < 0)
+	{
+		char aError[256];
+		str_format(aError, sizeof(aError), "Unable to initialize SDL base: %s", SDL_GetError());
+		dbg_msg("client", "%s", aError);
+		pClient->ShowMessageBox("SDL Error", aError);
+		PerformAllCleanup();
+		return -1;
+	}
+
+	// run the client
+	dbg_msg("client", "starting...");
+	pClient->Run();
+
+	const bool Restarting = pClient->State() == CClient::STATE_RESTARTING;
+	char aRestartBinaryPath[IO_MAX_PATH_LENGTH];
+	if(Restarting)
+	{
+		pStorage->GetBinaryPath(PLAT_CLIENT_EXEC, aRestartBinaryPath, sizeof(aRestartBinaryPath));
+	}
+
+	PerformCleanup();
+
+	if(Restarting)
+	{
+		shell_execute(aRestartBinaryPath);
+	}
+
+	PerformFinalCleanup();
+
+	return 0;
+}
+
+// DDRace
+
+const char *CClient::GetCurrentMap() const
+{
+	return m_aCurrentMap;
+}
+
+const char *CClient::GetCurrentMapPath() const
+{
+	return m_aCurrentMapPath;
+}
+
+SHA256_DIGEST CClient::GetCurrentMapSha256() const
+{
+	return m_pMap->Sha256();
+}
+
+unsigned CClient::GetCurrentMapCrc() const
+{
+	return m_pMap->Crc();
+}
+
+void CClient::RaceRecord_Start(const char *pFilename)
+{
+	if(State() != IClient::STATE_ONLINE)
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demorec/record", "client is not online");
+	else
+		m_aDemoRecorder[RECORDER_RACE].Start(Storage(), m_pConsole, pFilename, GameClient()->NetVersion(), m_aCurrentMap, m_pMap->Sha256(), m_pMap->Crc(), "client", m_pMap->MapSize(), 0, m_pMap->File());
+}
+
+void CClient::RaceRecord_Stop()
+{
+	if(m_aDemoRecorder[RECORDER_RACE].IsRecording())
+		m_aDemoRecorder[RECORDER_RACE].Stop();
+}
+
+bool CClient::RaceRecord_IsRecording()
+{
+	return m_aDemoRecorder[RECORDER_RACE].IsRecording();
+}
+
+void CClient::RequestDDNetInfo()
+{
+	char aUrl[256];
+	str_copy(aUrl, DDNET_INFO_URL);
+
+	if(g_Config.m_BrIndicateFinished)
+	{
+		char aEscaped[128];
+		EscapeUrl(aEscaped, sizeof(aEscaped), PlayerName());
+		str_append(aUrl, "?name=");
+		str_append(aUrl, aEscaped);
+	}
+
+	// Use ipv4 so we can know the ingame ip addresses of players before they join game servers
+	m_pDDNetInfoTask = HttpGetFile(aUrl, Storage(), m_aDDNetInfoTmp, IStorage::TYPE_SAVE);
+	m_pDDNetInfoTask->Timeout(CTimeout{10000, 0, 500, 10});
+	m_pDDNetInfoTask->IpResolve(IPRESOLVE::V4);
+	Engine()->AddJob(m_pDDNetInfoTask);
+}
+
+int CClient::GetPredictionTime()
+{
+	int64_t Now = time_get();
+	return (int)((m_PredictedTime.Get(Now) - m_aGameTime[g_Config.m_ClDummy].Get(Now)) * 1000 / (float)time_freq());
+}
+
+void CClient::GetSmoothTick(int *pSmoothTick, float *pSmoothIntraTick, float MixAmount)
+{
+	int64_t GameTime = m_aGameTime[g_Config.m_ClDummy].Get(time_get());
+	int64_t PredTime = m_PredictedTime.Get(time_get());
+	int64_t SmoothTime = clamp(GameTime + (int64_t)(MixAmount * (PredTime - GameTime)), GameTime, PredTime);
+
+	*pSmoothTick = (int)(SmoothTime * GameTickSpeed() / time_freq()) + 1;
+	*pSmoothIntraTick = (SmoothTime - (*pSmoothTick - 1) * time_freq() / GameTickSpeed()) / (float)(time_freq() / GameTickSpeed());
+}
+
+void CClient::AddWarning(const SWarning &Warning)
+{
+	m_vWarnings.emplace_back(Warning);
+}
+
+SWarning *CClient::GetCurWarning()
+{
+	if(m_vWarnings.empty())
+	{
+		return NULL;
+	}
+	else if(m_vWarnings[0].m_WasShown)
+	{
+		m_vWarnings.erase(m_vWarnings.begin());
+		return NULL;
+	}
+	else
+	{
+		return m_vWarnings.data();
+	}
+}
+
+int CClient::MaxLatencyTicks() const
+{
+	return GameTickSpeed() + (PredictionMargin() * GameTickSpeed()) / 1000;
+}
+
+int CClient::PredictionMargin() const
+{
+	return m_ServerCapabilities.m_SyncWeaponInput ? g_Config.m_ClPredictionMargin : 10;
+}
+
+int CClient::UdpConnectivity(int NetType)
+{
+	static const int NETTYPES[2] = {NETTYPE_IPV6, NETTYPE_IPV4};
+	int Connectivity = CONNECTIVITY_UNKNOWN;
+	for(int PossibleNetType : NETTYPES)
+	{
+		if((NetType & PossibleNetType) == 0)
+		{
+			continue;
+		}
+		NETADDR GlobalUdpAddr;
+		int NewConnectivity;
+		switch(m_aNetClient[CONN_MAIN].GetConnectivity(PossibleNetType, &GlobalUdpAddr))
+		{
+		case CONNECTIVITY::UNKNOWN:
+			NewConnectivity = CONNECTIVITY_UNKNOWN;
+			break;
+		case CONNECTIVITY::CHECKING:
+			NewConnectivity = CONNECTIVITY_CHECKING;
+			break;
+		case CONNECTIVITY::UNREACHABLE:
+			NewConnectivity = CONNECTIVITY_UNREACHABLE;
+			break;
+		case CONNECTIVITY::REACHABLE:
+			NewConnectivity = CONNECTIVITY_REACHABLE;
+			break;
+		case CONNECTIVITY::ADDRESS_KNOWN:
+			GlobalUdpAddr.port = 0;
+			if(m_HaveGlobalTcpAddr && NetType == (int)m_GlobalTcpAddr.type && net_addr_comp(&m_GlobalTcpAddr, &GlobalUdpAddr) != 0)
+			{
+				NewConnectivity = CONNECTIVITY_DIFFERING_UDP_TCP_IP_ADDRESSES;
+				break;
+			}
+			NewConnectivity = CONNECTIVITY_REACHABLE;
+			break;
+		default:
+			dbg_assert(0, "invalid connectivity value");
+			return CONNECTIVITY_UNKNOWN;
+		}
+		Connectivity = std::max(Connectivity, NewConnectivity);
+	}
+	return Connectivity;
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+void CClient::ShellRegister()
+{
+	char aFullPath[IO_MAX_PATH_LENGTH];
+	Storage()->GetBinaryPathAbsolute(PLAT_CLIENT_EXEC, aFullPath, sizeof(aFullPath));
+	if(!aFullPath[0])
+	{
+		dbg_msg("client", "Failed to register protocol and file extensions: could not determine absolute path");
+		return;
+	}
+
+	bool Updated = false;
+	if(!shell_register_protocol("ddnet", aFullPath, &Updated))
+		dbg_msg("client", "Failed to register ddnet protocol");
+	if(!shell_register_extension(".map", "Map File", GAME_NAME, aFullPath, &Updated))
+		dbg_msg("client", "Failed to register .map file extension");
+	if(!shell_register_extension(".demo", "Demo File", GAME_NAME, aFullPath, &Updated))
+		dbg_msg("client", "Failed to register .demo file extension");
+	if(!shell_register_application(GAME_NAME, aFullPath, &Updated))
+		dbg_msg("client", "Failed to register application");
+	if(Updated)
+		shell_update();
+}
+
+void CClient::ShellUnregister()
+{
+	char aFullPath[IO_MAX_PATH_LENGTH];
+	Storage()->GetBinaryPathAbsolute(PLAT_CLIENT_EXEC, aFullPath, sizeof(aFullPath));
+	if(!aFullPath[0])
+	{
+		dbg_msg("client", "Failed to unregister protocol and file extensions: could not determine absolute path");
+		return;
+	}
+
+	bool Updated = false;
+	if(!shell_unregister_class("ddnet", &Updated))
+		dbg_msg("client", "Failed to unregister ddnet protocol");
+	if(!shell_unregister_class(GAME_NAME ".map", &Updated))
+		dbg_msg("client", "Failed to unregister .map file extension");
+	if(!shell_unregister_class(GAME_NAME ".demo", &Updated))
+		dbg_msg("client", "Failed to unregister .demo file extension");
+	if(!shell_unregister_application(aFullPath, &Updated))
+		dbg_msg("client", "Failed to unregister application");
+	if(Updated)
+		shell_update();
+}
+#endif
+
+static Uint32 GetSdlMessageBoxFlags(IClient::EMessageBoxType Type)
+{
+	switch(Type)
+	{
+	case IClient::MESSAGE_BOX_TYPE_ERROR:
+		return SDL_MESSAGEBOX_ERROR;
+	case IClient::MESSAGE_BOX_TYPE_WARNING:
+		return SDL_MESSAGEBOX_WARNING;
+	case IClient::MESSAGE_BOX_TYPE_INFO:
+		return SDL_MESSAGEBOX_INFORMATION;
+	}
+	dbg_assert(false, "Type invalid");
+	return 0;
+}
+
+void CClient::ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type)
+{
+	if(m_pGraphics == nullptr || !m_pGraphics->ShowMessageBox(GetSdlMessageBoxFlags(Type), pTitle, pMessage))
+		SDL_ShowSimpleMessageBox(GetSdlMessageBoxFlags(Type), pTitle, pMessage, nullptr);
+}
+
+void CClient::GetGPUInfoString(char (&aGPUInfo)[256])
+{
+	if(m_pGraphics != nullptr && m_pGraphics->IsBackendInitialized())
+	{
+		str_format(aGPUInfo, std::size(aGPUInfo), "GPU: %s - %s - %s", m_pGraphics->GetVendorString(), m_pGraphics->GetRendererString(), m_pGraphics->GetVersionString());
+	}
+	else
+	{
+		str_copy(aGPUInfo, "Graphics backend was not yet initialized.");
+	}
+}
+
+void CClient::SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger)
+{
+	m_pFileLogger = pFileLogger;
+	m_pStdoutLogger = pStdoutLogger;
+}
diff --git a/src_bkp/engine/client/client.h b/src_bkp/engine/client/client.h
new file mode 100644
index 0000000000..7317ff52df
--- /dev/null
+++ b/src_bkp/engine/client/client.h
@@ -0,0 +1,515 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_CLIENT_H
+#define ENGINE_CLIENT_CLIENT_H
+
+#include <deque>
+#include <memory>
+
+#include <base/hash.h>
+
+#include <engine/client.h>
+#include <engine/client/checksum.h>
+#include <engine/client/friends.h>
+#include <engine/client/ghost.h>
+#include <engine/client/serverbrowser.h>
+#include <engine/client/updater.h>
+#include <engine/editor.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/demo.h>
+#include <engine/shared/fifo.h>
+#include <engine/shared/http.h>
+#include <engine/shared/network.h>
+#include <engine/warning.h>
+
+#include "graph.h"
+#include "smooth_time.h"
+
+class CDemoEdit;
+class IDemoRecorder;
+class CMsgPacker;
+class CUnpacker;
+class IConfigManager;
+class IDiscord;
+class IEngine;
+class IEngineInput;
+class IEngineMap;
+class IEngineSound;
+class IFriends;
+class ILogger;
+class ISteam;
+class INotifications;
+class IStorage;
+class IUpdater;
+
+#define CONNECTLINK_DOUBLE_SLASH "ddnet://"
+#define CONNECTLINK_NO_SLASH "ddnet:"
+
+class CServerCapabilities
+{
+public:
+	bool m_ChatTimeoutCode = false;
+	bool m_AnyPlayerFlag = false;
+	bool m_PingEx = false;
+	bool m_AllowDummy = false;
+	bool m_SyncWeaponInput = false;
+};
+
+class CClient : public IClient, public CDemoPlayer::IListener
+{
+	// needed interfaces
+	IConfigManager *m_pConfigManager = nullptr;
+	CConfig *m_pConfig = nullptr;
+	IConsole *m_pConsole = nullptr;
+	IDiscord *m_pDiscord = nullptr;
+	IEditor *m_pEditor = nullptr;
+	IEngine *m_pEngine = nullptr;
+	IFavorites *m_pFavorites = nullptr;
+	IGameClient *m_pGameClient = nullptr;
+	IEngineGraphics *m_pGraphics = nullptr;
+	IEngineInput *m_pInput = nullptr;
+	IEngineMap *m_pMap = nullptr;
+	IEngineSound *m_pSound = nullptr;
+	ISteam *m_pSteam = nullptr;
+	INotifications *m_pNotifications = nullptr;
+	IStorage *m_pStorage = nullptr;
+	IEngineTextRender *m_pTextRender = nullptr;
+	IUpdater *m_pUpdater = nullptr;
+
+	CNetClient m_aNetClient[NUM_CONNS];
+	CDemoPlayer m_DemoPlayer;
+	CDemoRecorder m_aDemoRecorder[RECORDER_MAX];
+	CDemoEditor m_DemoEditor;
+	CGhostRecorder m_GhostRecorder;
+	CGhostLoader m_GhostLoader;
+	CServerBrowser m_ServerBrowser;
+	CUpdater m_Updater;
+	CFriends m_Friends;
+	CFriends m_Foes;
+
+	char m_aConnectAddressStr[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE] = "";
+
+	CUuid m_ConnectionID = UUID_ZEROED;
+
+	bool m_HaveGlobalTcpAddr = false;
+	NETADDR m_GlobalTcpAddr = NETADDR_ZEROED;
+
+	uint64_t m_aSnapshotParts[NUM_DUMMIES] = {0, 0};
+	int64_t m_LocalStartTime = 0;
+	int64_t m_GlobalStartTime = 0;
+
+	IGraphics::CTextureHandle m_DebugFont;
+
+	int64_t m_LastRenderTime;
+
+	int m_SnapCrcErrors = 0;
+	bool m_AutoScreenshotRecycle = false;
+	bool m_AutoStatScreenshotRecycle = false;
+	bool m_AutoCSVRecycle = false;
+	bool m_EditorActive = false;
+	bool m_SoundInitFailed = false;
+
+	int m_aAckGameTick[NUM_DUMMIES] = {-1, -1};
+	int m_aCurrentRecvTick[NUM_DUMMIES] = {0, 0};
+	int m_aRconAuthed[NUM_DUMMIES] = {0, 0};
+	char m_aRconUsername[32] = "";
+	char m_aRconPassword[sizeof(g_Config.m_SvRconPassword)] = "";
+	int m_UseTempRconCommands = 0;
+	char m_aPassword[sizeof(g_Config.m_Password)] = "";
+	bool m_SendPassword = false;
+	bool m_ButtonRender = false;
+
+	// version-checking
+	char m_aVersionStr[10] = "0";
+
+	// pinging
+	int64_t m_PingStartTime = 0;
+
+	char m_aCurrentMap[IO_MAX_PATH_LENGTH] = "";
+	char m_aCurrentMapPath[IO_MAX_PATH_LENGTH] = "";
+
+	char m_aTimeoutCodes[NUM_DUMMIES][32] = {"", ""};
+	bool m_aCodeRunAfterJoin[NUM_DUMMIES] = {false, false};
+	bool m_GenerateTimeoutSeed = true;
+
+	char m_aCmdConnect[256] = "";
+	char m_aCmdPlayDemo[IO_MAX_PATH_LENGTH] = "";
+	char m_aCmdEditMap[IO_MAX_PATH_LENGTH] = "";
+
+	// map download
+	char m_aMapDownloadUrl[256] = "";
+	std::shared_ptr<CHttpRequest> m_pMapdownloadTask = nullptr;
+	char m_aMapdownloadFilename[256] = "";
+	char m_aMapdownloadFilenameTemp[256] = "";
+	char m_aMapdownloadName[256] = "";
+	IOHANDLE m_MapdownloadFileTemp = 0;
+	int m_MapdownloadChunk = 0;
+	int m_MapdownloadCrc = 0;
+	int m_MapdownloadAmount = -1;
+	int m_MapdownloadTotalsize = -1;
+	bool m_MapdownloadSha256Present = false;
+	SHA256_DIGEST m_MapdownloadSha256 = SHA256_ZEROED;
+
+	bool m_MapDetailsPresent = false;
+	char m_aMapDetailsName[256] = "";
+	int m_MapDetailsCrc = 0;
+	SHA256_DIGEST m_MapDetailsSha256 = SHA256_ZEROED;
+	char m_aMapDetailsUrl[256] = "";
+
+	char m_aDDNetInfoTmp[64];
+	std::shared_ptr<CHttpRequest> m_pDDNetInfoTask = nullptr;
+
+	// time
+	CSmoothTime m_aGameTime[NUM_DUMMIES];
+	CSmoothTime m_PredictedTime;
+
+	// input
+	struct // TODO: handle input better
+	{
+		int m_aData[MAX_INPUT_SIZE]; // the input data
+		int m_Tick; // the tick that the input is for
+		int64_t m_PredictedTime; // prediction latency when we sent this input
+		int64_t m_PredictionMargin; // prediction margin when we sent this input
+		int64_t m_Time;
+	} m_aInputs[NUM_DUMMIES][200];
+
+	int m_aCurrentInput[NUM_DUMMIES] = {0, 0};
+	bool m_LastDummy = false;
+	bool m_DummySendConnInfo = false;
+	bool m_DummyConnected = false;
+	int m_LastDummyConnectTime = 0;
+
+	// graphs
+	CGraph m_InputtimeMarginGraph;
+	CGraph m_GametimeMarginGraph;
+	CGraph m_FpsGraph;
+
+	// the game snapshots are modifiable by the game
+	CSnapshotStorage m_aSnapshotStorage[NUM_DUMMIES];
+	CSnapshotStorage::CHolder *m_aapSnapshots[NUM_DUMMIES][NUM_SNAPSHOT_TYPES];
+
+	int m_aReceivedSnapshots[NUM_DUMMIES] = {0, 0};
+	char m_aaSnapshotIncomingData[NUM_DUMMIES][CSnapshot::MAX_SIZE];
+	int m_aSnapshotIncomingDataSize[NUM_DUMMIES] = {0, 0};
+
+	CSnapshotStorage::CHolder m_aDemorecSnapshotHolders[NUM_SNAPSHOT_TYPES];
+	char m_aaaDemorecSnapshotData[NUM_SNAPSHOT_TYPES][2][CSnapshot::MAX_SIZE];
+
+	CSnapshotDelta m_SnapshotDelta;
+
+	std::deque<std::shared_ptr<CDemoEdit>> m_EditJobs;
+
+	//
+	bool m_CanReceiveServerCapabilities = false;
+	bool m_ServerSentCapabilities = false;
+	CServerCapabilities m_ServerCapabilities;
+
+	CServerInfo m_CurrentServerInfo;
+	int64_t m_CurrentServerInfoRequestTime = -1; // >= 0 should request, == -1 got info
+
+	int m_CurrentServerPingInfoType = -1;
+	int m_CurrentServerPingBasicToken = -1;
+	int m_CurrentServerPingToken = -1;
+	CUuid m_CurrentServerPingUuid = UUID_ZEROED;
+	int64_t m_CurrentServerCurrentPingTime = -1; // >= 0 request running
+	int64_t m_CurrentServerNextPingTime = -1; // >= 0 should request
+
+	// version info
+	struct CVersionInfo
+	{
+		enum
+		{
+			STATE_INIT = 0,
+			STATE_START,
+			STATE_READY,
+		};
+
+		int m_State = STATE_INIT;
+	} m_VersionInfo;
+
+	std::vector<SWarning> m_vWarnings;
+
+	CFifo m_Fifo;
+
+	IOHANDLE m_BenchmarkFile = 0;
+	int64_t m_BenchmarkStopTime = 0;
+
+	CChecksum m_Checksum;
+	int m_OwnExecutableSize = 0;
+	IOHANDLE m_OwnExecutable = 0;
+
+	// favorite command handling
+	bool m_FavoritesGroup = false;
+	bool m_FavoritesGroupAllowPing = false;
+	int m_FavoritesGroupNum = 0;
+	NETADDR m_aFavoritesGroupAddresses[MAX_SERVER_ADDRESSES];
+
+	void UpdateDemoIntraTimers();
+	int MaxLatencyTicks() const;
+	int PredictionMargin() const;
+
+	std::shared_ptr<ILogger> m_pFileLogger = nullptr;
+	std::shared_ptr<ILogger> m_pStdoutLogger = nullptr;
+
+public:
+	IConfigManager *ConfigManager() { return m_pConfigManager; }
+	CConfig *Config() { return m_pConfig; }
+	IDiscord *Discord() { return m_pDiscord; }
+	IEngine *Engine() { return m_pEngine; }
+	IGameClient *GameClient() { return m_pGameClient; }
+	IEngineGraphics *Graphics() { return m_pGraphics; }
+	IEngineInput *Input() { return m_pInput; }
+	IEngineSound *Sound() { return m_pSound; }
+	ISteam *Steam() { return m_pSteam; }
+	INotifications *Notifications() { return m_pNotifications; }
+	IStorage *Storage() { return m_pStorage; }
+	IEngineTextRender *TextRender() { return m_pTextRender; }
+	IUpdater *Updater() { return m_pUpdater; }
+
+	CClient();
+
+	// ----- send functions -----
+	int SendMsg(int Conn, CMsgPacker *pMsg, int Flags) override;
+	// Send via the currently active client (main/dummy)
+	int SendMsgActive(CMsgPacker *pMsg, int Flags) override;
+	void SendStA(bool Dummy);
+	void SendInfo(int Conn);
+	void SendEnterGame(int Conn);
+	void SendReady(int Conn);
+	void SendMapRequest();
+
+	bool RconAuthed() const override { return m_aRconAuthed[g_Config.m_ClDummy] != 0; }
+	bool UseTempRconCommands() const override { return m_UseTempRconCommands != 0; }
+	void RconAuth(const char *pName, const char *pPassword) override;
+	void Rcon(const char *pCmd) override;
+
+	bool ConnectionProblems() const override;
+
+	bool SoundInitFailed() const override { return m_SoundInitFailed; }
+
+	IGraphics::CTextureHandle GetDebugFont() const override { return m_DebugFont; }
+
+	void DirectInput(int *pInput, int Size);
+	void SendInput();
+
+	// TODO: OPT: do this a lot smarter!
+	int *GetInput(int Tick, int IsDummy) const override;
+
+	const char *LatestVersion() const override;
+
+	// ------ state handling -----
+	void SetState(EClientState s);
+
+	// called when the map is loaded and we should init for a new round
+	void OnEnterGame(bool Dummy);
+	void EnterGame(int Conn) override;
+
+	void Connect(const char *pAddress, const char *pPassword = nullptr) override;
+	void DisconnectWithReason(const char *pReason);
+	void Disconnect() override;
+
+	void DummyDisconnect(const char *pReason) override;
+	void DummyConnect() override;
+	bool DummyConnected() override;
+	bool DummyConnecting() override;
+	bool DummyAllowed() override;
+
+	void GetServerInfo(CServerInfo *pServerInfo) const override;
+	void ServerInfoRequest();
+
+	void LoadDebugFont();
+
+	// ---
+
+	int GetPredictionTime() override;
+	void *SnapGetItem(int SnapID, int Index, CSnapItem *pItem) const override;
+	int SnapItemSize(int SnapID, int Index) const override;
+	const void *SnapFindItem(int SnapID, int Type, int ID) const override;
+	int SnapNumItems(int SnapID) const override;
+	void SnapSetStaticsize(int ItemType, int Size) override;
+
+	void Render();
+	void DebugRender();
+
+	void Restart() override;
+	void Quit() override;
+
+	const char *PlayerName() const override;
+	const char *DummyName() const override;
+	const char *ErrorString() const override;
+
+	const char *LoadMap(const char *pName, const char *pFilename, SHA256_DIGEST *pWantedSha256, unsigned WantedCrc);
+	const char *LoadMapSearch(const char *pMapName, SHA256_DIGEST *pWantedSha256, int WantedCrc);
+
+	void ProcessConnlessPacket(CNetChunk *pPacket);
+	void ProcessServerInfo(int Type, NETADDR *pFrom, const void *pData, int DataSize);
+	void ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy);
+
+	int UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo);
+
+	void ResetMapDownload();
+	void FinishMapDownload();
+
+	void RequestDDNetInfo() override;
+	void ResetDDNetInfo();
+	bool IsDDNetInfoChanged();
+	void FinishDDNetInfo();
+	void LoadDDNetInfo();
+
+	const NETADDR &ServerAddress() const override { return *m_aNetClient[CONN_MAIN].ServerAddress(); }
+	int ConnectNetTypes() const override;
+	const char *ConnectAddressString() const override { return m_aConnectAddressStr; }
+	const char *MapDownloadName() const override { return m_aMapdownloadName; }
+	int MapDownloadAmount() const override { return !m_pMapdownloadTask ? m_MapdownloadAmount : (int)m_pMapdownloadTask->Current(); }
+	int MapDownloadTotalsize() const override { return !m_pMapdownloadTask ? m_MapdownloadTotalsize : (int)m_pMapdownloadTask->Size(); }
+
+	void PumpNetwork();
+
+	void OnDemoPlayerSnapshot(void *pData, int Size) override;
+	void OnDemoPlayerMessage(void *pData, int Size) override;
+
+	void Update();
+
+	void RegisterInterfaces();
+	void InitInterfaces();
+
+	void Run();
+
+	bool InitNetworkClient(char *pError, size_t ErrorSize);
+	bool CtrlShiftKey(int Key, bool &Last);
+
+	static void Con_Connect(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Disconnect(IConsole::IResult *pResult, void *pUserData);
+
+	static void Con_DummyConnect(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DummyDisconnect(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DummyResetInput(IConsole::IResult *pResult, void *pUserData);
+
+	static void Con_Quit(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Restart(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DemoPlay(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DemoSpeed(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Minimize(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Ping(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Screenshot(IConsole::IResult *pResult, void *pUserData);
+
+#if defined(CONF_VIDEORECORDER)
+	static void StartVideo(IConsole::IResult *pResult, void *pUserData, const char *pVideoName);
+	static void Con_StartVideo(IConsole::IResult *pResult, void *pUserData);
+	static void Con_StopVideo(IConsole::IResult *pResult, void *pUserData);
+	const char *DemoPlayer_Render(const char *pFilename, int StorageType, const char *pVideoName, int SpeedIndex, bool StartPaused = false) override;
+#endif
+
+	static void Con_Rcon(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RconAuth(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RconLogin(IConsole::IResult *pResult, void *pUserData);
+	static void Con_BeginFavoriteGroup(IConsole::IResult *pResult, void *pUserData);
+	static void Con_EndFavoriteGroup(IConsole::IResult *pResult, void *pUserData);
+	static void Con_AddFavorite(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemoveFavorite(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Play(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Record(IConsole::IResult *pResult, void *pUserData);
+	static void Con_StopRecord(IConsole::IResult *pResult, void *pUserData);
+	static void Con_AddDemoMarker(IConsole::IResult *pResult, void *pUserData);
+	static void Con_BenchmarkQuit(IConsole::IResult *pResult, void *pUserData);
+	static void ConchainServerBrowserUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainFullscreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainWindowBordered(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainWindowScreen(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainWindowVSync(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainWindowResize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainTimeoutSeed(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainPassword(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainReplays(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainLoglevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	static void Con_DemoSlice(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DemoSliceBegin(IConsole::IResult *pResult, void *pUserData);
+	static void Con_DemoSliceEnd(IConsole::IResult *pResult, void *pUserData);
+	static void Con_SaveReplay(IConsole::IResult *pResult, void *pUserData);
+
+	void RegisterCommands();
+
+	const char *DemoPlayer_Play(const char *pFilename, int StorageType) override;
+	void DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int Recorder, bool Verbose = false) override;
+	void DemoRecorder_HandleAutoStart() override;
+	void DemoRecorder_StartReplayRecorder();
+	void DemoRecorder_Stop(int Recorder, bool RemoveFile = false) override;
+	void DemoRecorder_AddDemoMarker(int Recorder);
+	IDemoRecorder *DemoRecorder(int Recorder) override;
+
+	void AutoScreenshot_Start() override;
+	void AutoStatScreenshot_Start() override;
+	void AutoScreenshot_Cleanup();
+	void AutoStatScreenshot_Cleanup();
+
+	void AutoCSV_Start() override;
+	void AutoCSV_Cleanup();
+
+	void ServerBrowserUpdate() override;
+
+	void HandleConnectAddress(const NETADDR *pAddr);
+	void HandleConnectLink(const char *pLink);
+	void HandleDemoPath(const char *pPath);
+	void HandleMapPath(const char *pPath);
+
+	virtual void InitChecksum();
+	virtual int HandleChecksum(int Conn, CUuid Uuid, CUnpacker *pUnpacker);
+
+	// gfx
+	void SwitchWindowScreen(int Index) override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	void ToggleWindowVSync() override;
+	void Notify(const char *pTitle, const char *pMessage) override;
+	void OnWindowResize() override;
+	void BenchmarkQuit(int Seconds, const char *pFilename);
+
+	void UpdateAndSwap() override;
+
+	// DDRace
+
+	void GenerateTimeoutSeed() override;
+	void GenerateTimeoutCodes(const NETADDR *pAddrs, int NumAddrs);
+
+	int GetCurrentRaceTime() override;
+
+	const char *GetCurrentMap() const override;
+	const char *GetCurrentMapPath() const override;
+	SHA256_DIGEST GetCurrentMapSha256() const override;
+	unsigned GetCurrentMapCrc() const override;
+
+	void RaceRecord_Start(const char *pFilename) override;
+	void RaceRecord_Stop() override;
+	bool RaceRecord_IsRecording() override;
+
+	void DemoSliceBegin() override;
+	void DemoSliceEnd() override;
+	void DemoSlice(const char *pDstPath, CLIENTFUNC_FILTER pfnFilter, void *pUser) override;
+	virtual void SaveReplay(int Length, const char *pFilename = "");
+
+	bool EditorHasUnsavedData() const override { return m_pEditor->HasUnsavedData(); }
+
+	IFriends *Foes() override { return &m_Foes; }
+
+	void GetSmoothTick(int *pSmoothTick, float *pSmoothIntraTick, float MixAmount) override;
+
+	void AddWarning(const SWarning &Warning) override;
+	SWarning *GetCurWarning() override;
+
+	CChecksumData *ChecksumData() override { return &m_Checksum.m_Data; }
+	bool InfoTaskRunning() override { return m_pDDNetInfoTask != nullptr; }
+	int UdpConnectivity(int NetType) override;
+
+#if defined(CONF_FAMILY_WINDOWS)
+	void ShellRegister() override;
+	void ShellUnregister() override;
+#endif
+
+	void ShowMessageBox(const char *pTitle, const char *pMessage, EMessageBoxType Type = MESSAGE_BOX_TYPE_ERROR) override;
+	void GetGPUInfoString(char (&aGPUInfo)[256]) override;
+	void SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger);
+};
+
+#endif
diff --git a/src_bkp/engine/client/demoedit.cpp b/src_bkp/engine/client/demoedit.cpp
new file mode 100644
index 0000000000..2872fa31f4
--- /dev/null
+++ b/src_bkp/engine/client/demoedit.cpp
@@ -0,0 +1,26 @@
+#include "demoedit.h"
+
+#include <engine/shared/demo.h>
+#include <engine/storage.h>
+
+CDemoEdit::CDemoEdit(const char *pNetVersion, class CSnapshotDelta *pSnapshotDelta, IStorage *pStorage, const char *pDemo, const char *pDst, int StartTick, int EndTick) :
+	m_SnapshotDelta(*pSnapshotDelta),
+	m_pStorage(pStorage)
+{
+	str_copy(m_aDemo, pDemo);
+	str_copy(m_aDst, pDst);
+
+	m_StartTick = StartTick;
+	m_EndTick = EndTick;
+
+	// Init the demoeditor
+	m_DemoEditor.Init(pNetVersion, &m_SnapshotDelta, NULL, pStorage);
+}
+
+void CDemoEdit::Run()
+{
+	// Slice the current demo
+	m_DemoEditor.Slice(m_aDemo, m_aDst, m_StartTick, m_EndTick, NULL, 0);
+	// We remove the temporary demo file
+	m_pStorage->RemoveFile(m_aDemo, IStorage::TYPE_SAVE);
+}
diff --git a/src_bkp/engine/client/demoedit.h b/src_bkp/engine/client/demoedit.h
new file mode 100644
index 0000000000..a186fc249b
--- /dev/null
+++ b/src_bkp/engine/client/demoedit.h
@@ -0,0 +1,27 @@
+#ifndef ENGINE_CLIENT_DEMOEDIT_H
+#define ENGINE_CLIENT_DEMOEDIT_H
+
+#include <engine/shared/demo.h>
+#include <engine/shared/jobs.h>
+#include <engine/shared/snapshot.h>
+
+class IStorage;
+
+class CDemoEdit : public IJob
+{
+	CSnapshotDelta m_SnapshotDelta;
+	IStorage *m_pStorage;
+
+	CDemoEditor m_DemoEditor;
+
+	char m_aDemo[256];
+	char m_aDst[256];
+	int m_StartTick;
+	int m_EndTick;
+
+public:
+	CDemoEdit(const char *pNetVersion, CSnapshotDelta *pSnapshotDelta, IStorage *pStorage, const char *pDemo, const char *pDst, int StartTick, int EndTick);
+	void Run() override;
+	char *Destination() { return m_aDst; }
+};
+#endif
diff --git a/src_bkp/engine/client/discord.cpp b/src_bkp/engine/client/discord.cpp
new file mode 100644
index 0000000000..a65c38d258
--- /dev/null
+++ b/src_bkp/engine/client/discord.cpp
@@ -0,0 +1,206 @@
+#include <base/system.h>
+#include <engine/discord.h>
+// Hack for universal binary builds on macOS: Ignore arm64 until Discord
+// releases a native arm64 SDK for macOS.
+#include "game/client/component.h"
+#if defined(CONF_DISCORD) && !(defined(CONF_ARCH_ARM64) && defined(CONF_PLATFORM_MACOS))
+#include <discord_game_sdk.h>
+
+typedef enum EDiscordResult DISCORD_API (*FDiscordCreate)(DiscordVersion, struct DiscordCreateParams *, struct IDiscordCore **);
+
+#if defined(CONF_DISCORD_DYNAMIC)
+#include <dlfcn.h>
+FDiscordCreate GetDiscordCreate()
+{
+	void *pSdk = dlopen("discord_game_sdk.so", RTLD_NOW);
+	if(!pSdk)
+	{
+		return nullptr;
+	}
+	return (FDiscordCreate)dlsym(pSdk, "DiscordCreate");
+}
+#else
+FDiscordCreate GetDiscordCreate()
+{
+	return DiscordCreate;
+}
+#endif
+
+class CDiscord : public IDiscord
+{
+	IDiscordCore *m_pCore;
+	IDiscordActivityEvents m_ActivityEvents;
+	IDiscordActivityManager *m_pActivityManager;
+
+	int m_StartTime;
+
+public:
+	bool Init(FDiscordCreate pfnDiscordCreate)
+	{
+		m_pCore = 0;
+		mem_zero(&m_ActivityEvents, sizeof(m_ActivityEvents));
+		m_pActivityManager = 0;
+
+		DiscordCreateParams Params;
+		DiscordCreateParamsSetDefault(&Params);
+
+		Params.client_id = 1089816029913436171; // DDNet
+		Params.flags = EDiscordCreateFlags::DiscordCreateFlags_NoRequireDiscord;
+		Params.event_data = this;
+		Params.activity_events = &m_ActivityEvents;
+		int Error = pfnDiscordCreate(DISCORD_VERSION, &Params, &m_pCore);
+		if(Error != DiscordResult_Ok)
+		{
+			dbg_msg("discord", "error initializing discord instance, error=%d", Error);
+			return true;
+		}
+
+		m_pActivityManager = m_pCore->get_activity_manager(m_pCore);
+		m_StartTime = time_timestamp();
+		return false;
+	}
+	void Update() override
+	{
+		m_pCore->run_callbacks(m_pCore);
+	}
+	void Start() override
+	{
+		m_StartTime = time_timestamp();
+	}
+
+	void ClearGameInfo() override
+	{
+		m_pActivityManager->clear_activity(m_pActivityManager, 0, 0);
+	}
+
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) override
+	{
+		DiscordActivity Activity;
+
+		mem_zero(&Activity, sizeof(DiscordActivity));
+		/*
+		 if(strcmp(pMapName, "Stronghold") == 0)
+		{
+			str_copy(Activity.assets.large_image, "stronghold1",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Multeasymap") == 0)
+		{
+			str_copy(Activity.assets.large_image, "multeasy",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Multeasymap") == 0)
+		{
+			str_copy(Activity.assets.large_image, "multeasy",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Copy Love Box 2s") == 0)
+		{
+			str_copy(Activity.assets.large_image, "CLB2s",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Copy Love Box") == 0)
+		{
+			str_copy(Activity.assets.large_image, "CLB",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Tutorial") == 0)
+		{
+			str_copy(Activity.assets.large_image, "tutorial",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Simple Down") == 0)
+		{
+			str_copy(Activity.assets.large_image, "simpledown",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Baby Aim 1.0") == 0)
+		{
+			str_copy(Activity.assets.large_image, "babyaim1",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Baby Aim 2.0") == 0)
+		{
+			str_copy(Activity.assets.large_image, "babyaim2",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Baby Aim 3.0") == 0)
+		{
+			str_copy(Activity.assets.large_image, "babyaim3",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Back in Time 3") == 0)
+		{
+			str_copy(Activity.assets.large_image, "bit3",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Back in Time 3") == 0)
+		{
+			str_copy(Activity.assets.large_image, "bit3",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Grandma") == 0)
+		{
+			str_copy(Activity.assets.large_image, "grandma",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Luxis") == 0)
+		{
+			str_copy(Activity.assets.large_image, "luxis",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Stronghold 2") == 0)
+		{
+			str_copy(Activity.assets.large_image, "stronghold2",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Stronghold 3") == 0)
+		{
+			str_copy(Activity.assets.large_image, "stronghold3",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Stronghold 4[Final]") == 0)
+		{
+			str_copy(Activity.assets.large_image, "strongholdF",sizeof(Activity.assets.large_image));
+		}
+		if(strcmp(pMapName, "Grandma") == 0)
+		{
+			str_copy(Activity.assets.large_image, "grandma",sizeof(Activity.assets.large_image));
+		}
+		fuck off */
+		str_copy(Activity.assets.large_text, "StA-Client", sizeof(Activity.assets.large_text));
+		str_copy(Activity.assets.small_image, pImage, sizeof(Activity.assets.large_image));
+		str_copy(Activity.assets.small_text, pText, sizeof(Activity.assets.large_text));
+		Activity.timestamps.start = m_StartTime;
+		str_copy(Activity.assets.large_image, "150e4e96-9c83-4309-b692-b212c08e1934",sizeof(Activity.assets.large_image));
+		str_copy(Activity.state, pPlayerName);
+		str_copy(Activity.state, pMapName, sizeof(Activity.state));
+		m_pActivityManager->update_activity(m_pActivityManager, &Activity, 0, 0);
+
+
+	}
+};
+
+IDiscord *CreateDiscordImpl()
+{
+	FDiscordCreate pfnDiscordCreate = GetDiscordCreate();
+	if(!pfnDiscordCreate)
+	{
+		return 0;
+	}
+	CDiscord *pDiscord = new CDiscord();
+	if(pDiscord->Init(pfnDiscordCreate))
+	{
+		delete pDiscord;
+		return 0;
+	}
+	return pDiscord;
+}
+#else
+IDiscord *CreateDiscordImpl()
+{
+	return 0;
+}
+#endif
+
+class CDiscordStub : public IDiscord
+{
+	void Start() override {}
+	void Update() override {}
+	void ClearGameInfo() override {}
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) override {}
+};
+
+IDiscord *CreateDiscord()
+{
+	IDiscord *pDiscord = CreateDiscordImpl();
+	if(pDiscord)
+	{
+		return pDiscord;
+	}
+	return new CDiscordStub();
+}
\ No newline at end of file
diff --git a/src_bkp/engine/client/favorites.cpp b/src_bkp/engine/client/favorites.cpp
new file mode 100644
index 0000000000..9df4e42aff
--- /dev/null
+++ b/src_bkp/engine/client/favorites.cpp
@@ -0,0 +1,251 @@
+#include <base/system.h>
+#include <engine/favorites.h>
+#include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
+
+#include <algorithm>
+#include <unordered_map>
+#include <vector>
+
+class CFavorites : public IFavorites
+{
+protected:
+	void OnConfigSave(IConfigManager *pConfigManager) override;
+
+public:
+	TRISTATE IsFavorite(const NETADDR *pAddrs, int NumAddrs) const override;
+	TRISTATE IsPingAllowed(const NETADDR *pAddrs, int NumAddrs) const override;
+	void Add(const NETADDR *pAddrs, int NumAddrs) override;
+	void AllowPing(const NETADDR *pAddrs, int NumAddrs, bool AllowPing) override;
+	void Remove(const NETADDR *pAddrs, int NumAddrs) override;
+	void AllEntries(const CEntry **ppEntries, int *pNumEntries) override;
+
+private:
+	std::vector<CEntry> m_vEntries;
+	std::unordered_map<NETADDR, int> m_ByAddr;
+
+	CEntry *Entry(const NETADDR &Addr);
+	const CEntry *Entry(const NETADDR &Addr) const;
+	// `pEntry` must come from the `m_vEntries` vector.
+	void RemoveEntry(CEntry *pEntry);
+};
+
+void CFavorites::OnConfigSave(IConfigManager *pConfigManager)
+{
+	for(const auto &Entry : m_vEntries)
+	{
+		if(Entry.m_NumAddrs > 1)
+		{
+			pConfigManager->WriteLine("begin_favorite_group");
+		}
+		for(int i = 0; i < Entry.m_NumAddrs; i++)
+		{
+			char aAddr[NETADDR_MAXSTRSIZE];
+			char aBuffer[128];
+			net_addr_str(&Entry.m_aAddrs[i], aAddr, sizeof(aAddr), true);
+			if(!Entry.m_AllowPing)
+			{
+				str_format(aBuffer, sizeof(aBuffer), "add_favorite %s", aAddr);
+			}
+			else
+			{
+				// Add quotes to the first parameter for backward
+				// compatibility with versions that took a `r` console
+				// parameter.
+				str_format(aBuffer, sizeof(aBuffer), "add_favorite \"%s\" allow_ping", aAddr);
+			}
+			pConfigManager->WriteLine(aBuffer);
+		}
+		if(Entry.m_NumAddrs > 1)
+		{
+			pConfigManager->WriteLine("end_favorite_group");
+		}
+	}
+}
+
+TRISTATE CFavorites::IsFavorite(const NETADDR *pAddrs, int NumAddrs) const
+{
+	bool All = true;
+	bool None = true;
+	for(int i = 0; i < NumAddrs && (All || None); i++)
+	{
+		const CEntry *pEntry = Entry(pAddrs[i]);
+		if(pEntry)
+		{
+			None = false;
+		}
+		else
+		{
+			All = false;
+		}
+	}
+	// Return ALL if no addresses were passed.
+	if(All)
+	{
+		return TRISTATE::ALL;
+	}
+	else if(None)
+	{
+		return TRISTATE::NONE;
+	}
+	else
+	{
+		return TRISTATE::SOME;
+	}
+}
+
+TRISTATE CFavorites::IsPingAllowed(const NETADDR *pAddrs, int NumAddrs) const
+{
+	bool All = true;
+	bool None = true;
+	for(int i = 0; i < NumAddrs && (All || None); i++)
+	{
+		const CEntry *pEntry = Entry(pAddrs[i]);
+		if(pEntry == nullptr)
+		{
+			continue;
+		}
+		if(pEntry->m_AllowPing)
+		{
+			None = false;
+		}
+		else
+		{
+			All = false;
+		}
+	}
+	// Return ALL if no addresses were passed.
+	if(All)
+	{
+		return TRISTATE::ALL;
+	}
+	else if(None)
+	{
+		return TRISTATE::NONE;
+	}
+	else
+	{
+		return TRISTATE::SOME;
+	}
+}
+
+void CFavorites::Add(const NETADDR *pAddrs, int NumAddrs)
+{
+	// First make sure that all the addresses are not registered for some
+	// other favorite.
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		CEntry *pEntry = Entry(pAddrs[i]);
+		if(pEntry == nullptr)
+		{
+			continue;
+		}
+		for(int j = 0; j < pEntry->m_NumAddrs; j++)
+		{
+			if(pEntry->m_aAddrs[j] == pAddrs[i])
+			{
+				pEntry->m_aAddrs[j] = pEntry->m_aAddrs[pEntry->m_NumAddrs - 1];
+				pEntry->m_NumAddrs -= 1;
+				break;
+			}
+		}
+		// If the entry has become empty due to the cleaning, remove it
+		// completely.
+		if(pEntry->m_NumAddrs == 0)
+		{
+			RemoveEntry(pEntry);
+		}
+	}
+	// Add the new entry.
+	CEntry NewEntry;
+	mem_zero(&NewEntry, sizeof(NewEntry));
+	NewEntry.m_NumAddrs = std::min(NumAddrs, (int)std::size(NewEntry.m_aAddrs));
+	for(int i = 0; i < NewEntry.m_NumAddrs; i++)
+	{
+		NewEntry.m_aAddrs[i] = pAddrs[i];
+		m_ByAddr[pAddrs[i]] = m_vEntries.size();
+	}
+	NewEntry.m_AllowPing = false;
+	m_vEntries.push_back(NewEntry);
+}
+
+void CFavorites::AllowPing(const NETADDR *pAddrs, int NumAddrs, bool AllowPing)
+{
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		CEntry *pEntry = Entry(pAddrs[i]);
+		if(pEntry == nullptr)
+		{
+			continue;
+		}
+		pEntry->m_AllowPing = AllowPing;
+	}
+}
+
+void CFavorites::Remove(const NETADDR *pAddrs, int NumAddrs)
+{
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		CEntry *pEntry = Entry(pAddrs[i]);
+		if(pEntry == nullptr)
+		{
+			continue;
+		}
+		for(int j = 0; j < pEntry->m_NumAddrs; j++)
+		{
+			m_ByAddr.erase(pEntry->m_aAddrs[j]);
+		}
+		RemoveEntry(pEntry);
+	}
+}
+
+void CFavorites::AllEntries(const CEntry **ppEntries, int *pNumEntries)
+{
+	*ppEntries = m_vEntries.data();
+	*pNumEntries = m_vEntries.size();
+}
+
+CFavorites::CEntry *CFavorites::Entry(const NETADDR &Addr)
+{
+	auto Entry = m_ByAddr.find(Addr);
+	if(Entry == m_ByAddr.end())
+	{
+		return nullptr;
+	}
+	return &m_vEntries[Entry->second];
+}
+
+const CFavorites::CEntry *CFavorites::Entry(const NETADDR &Addr) const
+{
+	auto Entry = m_ByAddr.find(Addr);
+	if(Entry == m_ByAddr.end())
+	{
+		return nullptr;
+	}
+	return &m_vEntries[Entry->second];
+}
+
+void CFavorites::RemoveEntry(CEntry *pEntry)
+{
+	// Replace the entry
+	int Index = pEntry - m_vEntries.data();
+	*pEntry = m_vEntries[m_vEntries.size() - 1];
+	m_vEntries.pop_back();
+	if(Index != (int)m_vEntries.size())
+	{
+		for(int i = 0; i < pEntry->m_NumAddrs; i++)
+		{
+			m_ByAddr.at(pEntry->m_aAddrs[i]) = Index;
+		}
+	}
+}
+
+void IFavorites::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
+{
+	((IFavorites *)pUserData)->OnConfigSave(pConfigManager);
+}
+
+std::unique_ptr<IFavorites> CreateFavorites()
+{
+	return std::make_unique<CFavorites>();
+}
diff --git a/src_bkp/engine/client/friends.cpp b/src_bkp/engine/client/friends.cpp
new file mode 100644
index 0000000000..925ecc2424
--- /dev/null
+++ b/src_bkp/engine/client/friends.cpp
@@ -0,0 +1,181 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/config.h>
+#include <engine/console.h>
+#include <engine/shared/config.h>
+
+#include "friends.h"
+
+CFriends::CFriends()
+{
+	mem_zero(m_aFriends, sizeof(m_aFriends));
+	m_NumFriends = 0;
+	m_Foes = false;
+}
+
+void CFriends::ConAddFriend(IConsole::IResult *pResult, void *pUserData)
+{
+	CFriends *pSelf = (CFriends *)pUserData;
+	pSelf->AddFriend(pResult->GetString(0), pResult->GetString(1));
+}
+
+void CFriends::ConRemoveFriend(IConsole::IResult *pResult, void *pUserData)
+{
+	CFriends *pSelf = (CFriends *)pUserData;
+	pSelf->RemoveFriend(pResult->GetString(0), pResult->GetString(1));
+}
+
+void CFriends::ConFriends(IConsole::IResult *pResult, void *pUserData)
+{
+	CFriends *pSelf = (CFriends *)pUserData;
+	pSelf->Friends();
+}
+
+void CFriends::Init(bool Foes)
+{
+	m_Foes = Foes;
+
+	IConfigManager *pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	if(pConfigManager)
+		pConfigManager->RegisterCallback(ConfigSaveCallback, this);
+
+	IConsole *pConsole = Kernel()->RequestInterface<IConsole>();
+	if(pConsole)
+	{
+		if(Foes)
+		{
+			pConsole->Register("add_foe", "s[name] ?s[clan]", CFGFLAG_CLIENT, ConAddFriend, this, "Add a foe");
+			pConsole->Register("remove_foe", "s[name] ?s[clan]", CFGFLAG_CLIENT, ConRemoveFriend, this, "Remove a foe");
+			pConsole->Register("foes", "", CFGFLAG_CLIENT, ConFriends, this, "List foes");
+		}
+		else
+		{
+			pConsole->Register("add_friend", "s[name] ?s[clan]", CFGFLAG_CLIENT, ConAddFriend, this, "Add a friend");
+			pConsole->Register("remove_friend", "s[name] ?s[clan]", CFGFLAG_CLIENT, ConRemoveFriend, this, "Remove a friend");
+			pConsole->Register("friends", "", CFGFLAG_CLIENT, ConFriends, this, "List friends");
+		}
+	}
+}
+
+const CFriendInfo *CFriends::GetFriend(int Index) const
+{
+	return &m_aFriends[maximum(0, Index % m_NumFriends)];
+}
+
+int CFriends::GetFriendState(const char *pName, const char *pClan) const
+{
+	int Result = FRIEND_NO;
+	unsigned NameHash = str_quickhash(pName);
+	unsigned ClanHash = str_quickhash(pClan);
+	for(int i = 0; i < m_NumFriends; ++i)
+	{
+		if((g_Config.m_ClFriendsIgnoreClan && m_aFriends[i].m_aName[0]) || (m_aFriends[i].m_ClanHash == ClanHash && !str_comp(m_aFriends[i].m_aClan, pClan)))
+		{
+			if(m_aFriends[i].m_aName[0] == 0)
+				Result = FRIEND_CLAN;
+			else if(m_aFriends[i].m_NameHash == NameHash && !str_comp(m_aFriends[i].m_aName, pName))
+			{
+				Result = FRIEND_PLAYER;
+				break;
+			}
+		}
+	}
+	return Result;
+}
+
+bool CFriends::IsFriend(const char *pName, const char *pClan, bool PlayersOnly) const
+{
+	unsigned NameHash = str_quickhash(pName);
+	unsigned ClanHash = str_quickhash(pClan);
+	for(int i = 0; i < m_NumFriends; ++i)
+	{
+		if(((g_Config.m_ClFriendsIgnoreClan && m_aFriends[i].m_aName[0]) || (m_aFriends[i].m_ClanHash == ClanHash && !str_comp(m_aFriends[i].m_aClan, pClan))) &&
+			((!PlayersOnly && m_aFriends[i].m_aName[0] == 0) || (m_aFriends[i].m_NameHash == NameHash && !str_comp(m_aFriends[i].m_aName, pName))))
+			return true;
+	}
+	return false;
+}
+
+void CFriends::AddFriend(const char *pName, const char *pClan)
+{
+	if(m_NumFriends == MAX_FRIENDS || (pName[0] == 0 && pClan[0] == 0))
+		return;
+
+	// make sure we don't have the friend already
+	unsigned NameHash = str_quickhash(pName);
+	unsigned ClanHash = str_quickhash(pClan);
+	for(int i = 0; i < m_NumFriends; ++i)
+	{
+		if((m_aFriends[i].m_NameHash == NameHash && !str_comp(m_aFriends[i].m_aName, pName)) && ((g_Config.m_ClFriendsIgnoreClan && m_aFriends[i].m_aName[0]) || (m_aFriends[i].m_ClanHash == ClanHash && !str_comp(m_aFriends[i].m_aClan, pClan))))
+			return;
+	}
+
+	str_copy(m_aFriends[m_NumFriends].m_aName, pName);
+	str_copy(m_aFriends[m_NumFriends].m_aClan, pClan);
+	m_aFriends[m_NumFriends].m_NameHash = NameHash;
+	m_aFriends[m_NumFriends].m_ClanHash = ClanHash;
+	++m_NumFriends;
+}
+
+void CFriends::RemoveFriend(const char *pName, const char *pClan)
+{
+	unsigned NameHash = str_quickhash(pName);
+	unsigned ClanHash = str_quickhash(pClan);
+	for(int i = 0; i < m_NumFriends; ++i)
+	{
+		if((m_aFriends[i].m_NameHash == NameHash && !str_comp(m_aFriends[i].m_aName, pName)) &&
+			((g_Config.m_ClFriendsIgnoreClan && m_aFriends[i].m_aName[0]) || (m_aFriends[i].m_ClanHash == ClanHash && !str_comp(m_aFriends[i].m_aClan, pClan))))
+		{
+			RemoveFriend(i);
+			return;
+		}
+	}
+}
+
+void CFriends::RemoveFriend(int Index)
+{
+	if(Index >= 0 && Index < m_NumFriends)
+	{
+		mem_move(&m_aFriends[Index], &m_aFriends[Index + 1], sizeof(CFriendInfo) * (m_NumFriends - (Index + 1)));
+		--m_NumFriends;
+	}
+}
+
+void CFriends::Friends()
+{
+	char aBuf[128];
+	IConsole *pConsole = Kernel()->RequestInterface<IConsole>();
+	if(pConsole)
+	{
+		for(int i = 0; i < m_NumFriends; ++i)
+		{
+			str_format(aBuf, sizeof(aBuf), "Name: %s, Clan: %s", m_aFriends[i].m_aName, m_aFriends[i].m_aClan);
+
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, m_Foes ? "foes" : "friends", aBuf, color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor)));
+		}
+	}
+}
+
+void CFriends::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
+{
+	CFriends *pSelf = (CFriends *)pUserData;
+	char aBuf[128];
+	const char *pEnd = aBuf + sizeof(aBuf) - 4;
+	for(int i = 0; i < pSelf->m_NumFriends; ++i)
+	{
+		str_copy(aBuf, pSelf->m_Foes ? "add_foe " : "add_friend ");
+
+		str_append(aBuf, "\"");
+		char *pDst = aBuf + str_length(aBuf);
+		str_escape(&pDst, pSelf->m_aFriends[i].m_aName, pEnd);
+		str_append(aBuf, "\" \"");
+		pDst = aBuf + str_length(aBuf);
+		str_escape(&pDst, pSelf->m_aFriends[i].m_aClan, pEnd);
+		str_append(aBuf, "\"");
+
+		pConfigManager->WriteLine(aBuf);
+	}
+}
diff --git a/src_bkp/engine/client/friends.h b/src_bkp/engine/client/friends.h
new file mode 100644
index 0000000000..cd3e9a1d8f
--- /dev/null
+++ b/src_bkp/engine/client/friends.h
@@ -0,0 +1,39 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_FRIENDS_H
+#define ENGINE_CLIENT_FRIENDS_H
+
+#include <engine/console.h>
+#include <engine/friends.h>
+
+class IConfigManager;
+
+class CFriends : public IFriends
+{
+	CFriendInfo m_aFriends[MAX_FRIENDS];
+	int m_Foes;
+	int m_NumFriends;
+
+	static void ConAddFriend(IConsole::IResult *pResult, void *pUserData);
+	static void ConRemoveFriend(IConsole::IResult *pResult, void *pUserData);
+	static void ConFriends(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
+
+public:
+	CFriends();
+
+	void Init(bool Foes = false) override;
+
+	int NumFriends() const override { return m_NumFriends; }
+	const CFriendInfo *GetFriend(int Index) const override;
+	int GetFriendState(const char *pName, const char *pClan) const override;
+	bool IsFriend(const char *pName, const char *pClan, bool PlayersOnly) const override;
+
+	void AddFriend(const char *pName, const char *pClan) override;
+	void RemoveFriend(const char *pName, const char *pClan) override;
+	void RemoveFriend(int Index);
+	void Friends();
+};
+
+#endif
diff --git a/src_bkp/engine/client/ghost.cpp b/src_bkp/engine/client/ghost.cpp
new file mode 100644
index 0000000000..a0def9efcd
--- /dev/null
+++ b/src_bkp/engine/client/ghost.cpp
@@ -0,0 +1,404 @@
+#include "ghost.h"
+
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/shared/compression.h>
+#include <engine/shared/config.h>
+#include <engine/shared/network.h>
+#include <engine/storage.h>
+
+static const unsigned char gs_aHeaderMarker[8] = {'T', 'W', 'G', 'H', 'O', 'S', 'T', 0};
+static const unsigned char gs_CurVersion = 6;
+static const int gs_NumTicksOffset = 93;
+
+static const ColorRGBA gs_GhostPrintColor{0.65f, 0.6f, 0.6f, 1.0f};
+
+CGhostRecorder::CGhostRecorder()
+{
+	m_File = 0;
+	ResetBuffer();
+}
+
+void CGhostRecorder::Init()
+{
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+}
+
+// Record
+int CGhostRecorder::Start(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, const char *pName)
+{
+	m_File = m_pStorage->OpenFile(pFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!m_File)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "Unable to open '%s' for ghost recording", pFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_recorder", aBuf, gs_GhostPrintColor);
+		return -1;
+	}
+
+	// write header
+	CGhostHeader Header;
+	mem_zero(&Header, sizeof(Header));
+	mem_copy(Header.m_aMarker, gs_aHeaderMarker, sizeof(Header.m_aMarker));
+	Header.m_Version = gs_CurVersion;
+	str_copy(Header.m_aOwner, pName);
+	str_copy(Header.m_aMap, pMap);
+	Header.m_MapSha256 = MapSha256;
+	io_write(m_File, &Header, sizeof(Header));
+
+	m_LastItem.Reset();
+	ResetBuffer();
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "ghost recording to '%s'", pFilename);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_recorder", aBuf, gs_GhostPrintColor);
+	return 0;
+}
+
+void CGhostRecorder::ResetBuffer()
+{
+	m_pBufferPos = m_aBuffer;
+	m_BufferNumItems = 0;
+}
+
+static void DiffItem(int *pPast, int *pCurrent, int *pOut, int Size)
+{
+	while(Size)
+	{
+		*pOut = *pCurrent - *pPast;
+		pOut++;
+		pPast++;
+		pCurrent++;
+		Size--;
+	}
+}
+
+void CGhostRecorder::WriteData(int Type, const void *pData, int Size)
+{
+	if(!m_File || (unsigned)Size > MAX_ITEM_SIZE || Size <= 0 || Type == -1)
+		return;
+
+	CGhostItem Data(Type);
+	mem_copy(Data.m_aData, pData, Size);
+
+	if(m_LastItem.m_Type == Data.m_Type)
+		DiffItem((int *)m_LastItem.m_aData, (int *)Data.m_aData, (int *)m_pBufferPos, Size / sizeof(int32_t));
+	else
+	{
+		FlushChunk();
+		mem_copy(m_pBufferPos, Data.m_aData, Size);
+	}
+
+	m_LastItem = Data;
+	m_pBufferPos += Size;
+	m_BufferNumItems++;
+	if(m_BufferNumItems >= NUM_ITEMS_PER_CHUNK)
+		FlushChunk();
+}
+
+void CGhostRecorder::FlushChunk()
+{
+	static char s_aBuffer[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	static char s_aBuffer2[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	unsigned char aChunk[4];
+
+	int Size = m_pBufferPos - m_aBuffer;
+	int Type = m_LastItem.m_Type;
+
+	if(!m_File || Size == 0)
+		return;
+
+	while(Size & 3)
+		m_aBuffer[Size++] = 0;
+
+	Size = CVariableInt::Compress(m_aBuffer, Size, s_aBuffer, sizeof(s_aBuffer));
+	if(Size < 0)
+		return;
+
+	Size = CNetBase::Compress(s_aBuffer, Size, s_aBuffer2, sizeof(s_aBuffer2));
+	if(Size < 0)
+		return;
+
+	aChunk[0] = Type & 0xff;
+	aChunk[1] = m_BufferNumItems & 0xff;
+	aChunk[2] = (Size >> 8) & 0xff;
+	aChunk[3] = (Size)&0xff;
+
+	io_write(m_File, aChunk, sizeof(aChunk));
+	io_write(m_File, s_aBuffer2, Size);
+
+	m_LastItem.Reset();
+	ResetBuffer();
+}
+
+int CGhostRecorder::Stop(int Ticks, int Time)
+{
+	if(!m_File)
+		return -1;
+
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_recorder", "Stopped ghost recording", gs_GhostPrintColor);
+
+	FlushChunk();
+
+	// write down num shots and time
+	io_seek(m_File, gs_NumTicksOffset, IOSEEK_START);
+
+	unsigned char aNumTicks[sizeof(int32_t)];
+	uint_to_bytes_be(aNumTicks, Ticks);
+	io_write(m_File, aNumTicks, sizeof(aNumTicks));
+
+	unsigned char aTime[sizeof(int32_t)];
+	uint_to_bytes_be(aTime, Time);
+	io_write(m_File, aTime, sizeof(aTime));
+
+	io_close(m_File);
+	m_File = 0;
+	return 0;
+}
+
+CGhostLoader::CGhostLoader()
+{
+	m_File = 0;
+	ResetBuffer();
+}
+
+void CGhostLoader::Init()
+{
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+}
+
+void CGhostLoader::ResetBuffer()
+{
+	m_pBufferPos = m_aBuffer;
+	m_BufferNumItems = 0;
+	m_BufferCurItem = 0;
+	m_BufferPrevItem = -1;
+}
+
+int CGhostLoader::Load(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc)
+{
+	m_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_SAVE);
+	if(!m_File)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "could not open '%s'", pFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+		return -1;
+	}
+
+	// read the header
+	mem_zero(&m_Header, sizeof(m_Header));
+	io_read(m_File, &m_Header, sizeof(CGhostHeader));
+	if(mem_comp(m_Header.m_aMarker, gs_aHeaderMarker, sizeof(gs_aHeaderMarker)) != 0)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "'%s' is not a ghost file", pFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+		io_close(m_File);
+		m_File = 0;
+		return -1;
+	}
+
+	if(!(4 <= m_Header.m_Version && m_Header.m_Version <= gs_CurVersion))
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "ghost version %d is not supported", m_Header.m_Version);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+		io_close(m_File);
+		m_File = 0;
+		return -1;
+	}
+
+	if(str_comp(m_Header.m_aMap, pMap) != 0)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "ghost map name '%s' does not match current map '%s'", m_Header.m_aMap, pMap);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+		io_close(m_File);
+		m_File = 0;
+		return -1;
+	}
+
+	if(m_Header.m_Version >= 6)
+	{
+		if(m_Header.m_MapSha256 != MapSha256 && g_Config.m_ClRaceGhostStrictMap)
+		{
+			char aGhostSha256[SHA256_MAXSTRSIZE];
+			sha256_str(m_Header.m_MapSha256, aGhostSha256, sizeof(aGhostSha256));
+			char aMapSha256[SHA256_MAXSTRSIZE];
+			sha256_str(MapSha256, aMapSha256, sizeof(aMapSha256));
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "ghost map '%s' sha256 mismatch, wanted=%s ghost=%s", pMap, aMapSha256, aGhostSha256);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+			io_close(m_File);
+			m_File = 0;
+			return -1;
+		}
+	}
+	else
+	{
+		io_skip(m_File, -(int)sizeof(SHA256_DIGEST));
+		unsigned GhostMapCrc = bytes_be_to_uint(m_Header.m_aZeroes);
+		if(GhostMapCrc != MapCrc && g_Config.m_ClRaceGhostStrictMap)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "ghost map '%s' crc mismatch, wanted=%08x ghost=%08x", pMap, MapCrc, GhostMapCrc);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost_loader", aBuf);
+			io_close(m_File);
+			m_File = 0;
+			return -1;
+		}
+	}
+
+	m_Info = m_Header.ToGhostInfo();
+	m_LastItem.Reset();
+	ResetBuffer();
+
+	return 0;
+}
+
+int CGhostLoader::ReadChunk(int *pType)
+{
+	static char s_aCompresseddata[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	static char s_aDecompressed[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	unsigned char aChunk[4];
+
+	if(m_Header.m_Version != 4)
+		m_LastItem.Reset();
+	ResetBuffer();
+
+	if(io_read(m_File, aChunk, sizeof(aChunk)) != sizeof(aChunk))
+		return -1;
+
+	*pType = aChunk[0];
+	int Size = (aChunk[2] << 8) | aChunk[3];
+	m_BufferNumItems = aChunk[1];
+
+	if(Size > MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK || Size <= 0)
+		return -1;
+
+	if(io_read(m_File, s_aCompresseddata, Size) != (unsigned)Size)
+	{
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost", "error reading chunk");
+		return -1;
+	}
+
+	Size = CNetBase::Decompress(s_aCompresseddata, Size, s_aDecompressed, sizeof(s_aDecompressed));
+	if(Size < 0)
+	{
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost", "error during network decompression");
+		return -1;
+	}
+
+	Size = CVariableInt::Decompress(s_aDecompressed, Size, m_aBuffer, sizeof(m_aBuffer));
+	if(Size < 0)
+	{
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost", "error during intpack decompression");
+		return -1;
+	}
+
+	return 0;
+}
+
+bool CGhostLoader::ReadNextType(int *pType)
+{
+	if(!m_File)
+		return false;
+
+	if(m_BufferCurItem != m_BufferPrevItem && m_BufferCurItem < m_BufferNumItems)
+	{
+		*pType = m_LastItem.m_Type;
+	}
+	else
+	{
+		if(ReadChunk(pType))
+			return false; // error or eof
+	}
+
+	m_BufferPrevItem = m_BufferCurItem;
+
+	return true;
+}
+
+static void UndiffItem(int *pPast, int *pDiff, int *pOut, int Size)
+{
+	while(Size)
+	{
+		*pOut = *pPast + *pDiff;
+		pOut++;
+		pPast++;
+		pDiff++;
+		Size--;
+	}
+}
+
+bool CGhostLoader::ReadData(int Type, void *pData, int Size)
+{
+	if(!m_File || Size > MAX_ITEM_SIZE || Size <= 0 || Type == -1)
+		return false;
+
+	CGhostItem Data(Type);
+
+	if(m_LastItem.m_Type == Data.m_Type)
+		UndiffItem((int *)m_LastItem.m_aData, (int *)m_pBufferPos, (int *)Data.m_aData, Size / sizeof(int32_t));
+	else
+		mem_copy(Data.m_aData, m_pBufferPos, Size);
+
+	mem_copy(pData, Data.m_aData, Size);
+
+	m_LastItem = Data;
+	m_pBufferPos += Size;
+	m_BufferCurItem++;
+	return true;
+}
+
+void CGhostLoader::Close()
+{
+	if(!m_File)
+		return;
+	io_close(m_File);
+	m_File = 0;
+}
+
+bool CGhostLoader::GetGhostInfo(const char *pFilename, CGhostInfo *pGhostInfo, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc)
+{
+	CGhostHeader Header;
+	mem_zero(&Header, sizeof(Header));
+
+	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_SAVE);
+	if(!File)
+		return false;
+
+	io_read(File, &Header, sizeof(Header));
+	io_close(File);
+
+	if(mem_comp(Header.m_aMarker, gs_aHeaderMarker, sizeof(gs_aHeaderMarker)) || !(4 <= Header.m_Version && Header.m_Version <= gs_CurVersion))
+		return false;
+
+	if(str_comp(Header.m_aMap, pMap) != 0)
+	{
+		return false;
+	}
+
+	if(Header.m_Version >= 6 && g_Config.m_ClRaceGhostStrictMap)
+	{
+		if(Header.m_MapSha256 != MapSha256)
+		{
+			return false;
+		}
+	}
+	else if(g_Config.m_ClRaceGhostStrictMap)
+	{
+		unsigned GhostMapCrc = bytes_be_to_uint(Header.m_aZeroes);
+		if(GhostMapCrc != MapCrc)
+		{
+			return false;
+		}
+	}
+	*pGhostInfo = Header.ToGhostInfo();
+
+	return true;
+}
diff --git a/src_bkp/engine/client/ghost.h b/src_bkp/engine/client/ghost.h
new file mode 100644
index 0000000000..544b7d0444
--- /dev/null
+++ b/src_bkp/engine/client/ghost.h
@@ -0,0 +1,122 @@
+#ifndef ENGINE_CLIENT_GHOST_H
+#define ENGINE_CLIENT_GHOST_H
+
+#include <engine/ghost.h>
+
+#include <base/system.h>
+
+enum
+{
+	MAX_ITEM_SIZE = 128,
+	NUM_ITEMS_PER_CHUNK = 50,
+};
+
+// version 4-6
+struct CGhostHeader
+{
+	unsigned char m_aMarker[8];
+	unsigned char m_Version;
+	char m_aOwner[MAX_NAME_LENGTH];
+	char m_aMap[64];
+	unsigned char m_aZeroes[sizeof(int32_t)]; // Crc before version 6
+	unsigned char m_aNumTicks[sizeof(int32_t)];
+	unsigned char m_aTime[sizeof(int32_t)];
+	SHA256_DIGEST m_MapSha256;
+
+	int GetTicks() const
+	{
+		return bytes_be_to_uint(m_aNumTicks);
+	}
+
+	int GetTime() const
+	{
+		return bytes_be_to_uint(m_aTime);
+	}
+
+	CGhostInfo ToGhostInfo() const
+	{
+		CGhostInfo Result;
+		mem_zero(&Result, sizeof(Result));
+		str_copy(Result.m_aOwner, m_aOwner);
+		str_copy(Result.m_aMap, m_aMap);
+		Result.m_NumTicks = GetTicks();
+		Result.m_Time = GetTime();
+		return Result;
+	}
+};
+
+class CGhostItem
+{
+public:
+	unsigned char m_aData[MAX_ITEM_SIZE];
+	int m_Type;
+
+	CGhostItem() :
+		m_Type(-1) {}
+	CGhostItem(int Type) :
+		m_Type(Type) {}
+	void Reset() { m_Type = -1; }
+};
+
+class CGhostRecorder : public IGhostRecorder
+{
+	IOHANDLE m_File;
+	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+
+	CGhostItem m_LastItem;
+
+	char m_aBuffer[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	char *m_pBufferPos;
+	int m_BufferNumItems;
+
+	void ResetBuffer();
+	void FlushChunk();
+
+public:
+	CGhostRecorder();
+
+	void Init();
+
+	int Start(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, const char *pName) override;
+	int Stop(int Ticks, int Time) override;
+
+	void WriteData(int Type, const void *pData, int Size) override;
+	bool IsRecording() const override { return m_File != nullptr; }
+};
+
+class CGhostLoader : public IGhostLoader
+{
+	IOHANDLE m_File;
+	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+
+	CGhostHeader m_Header;
+	CGhostInfo m_Info;
+
+	CGhostItem m_LastItem;
+
+	char m_aBuffer[MAX_ITEM_SIZE * NUM_ITEMS_PER_CHUNK];
+	char *m_pBufferPos;
+	int m_BufferNumItems;
+	int m_BufferCurItem;
+	int m_BufferPrevItem;
+
+	void ResetBuffer();
+	int ReadChunk(int *pType);
+
+public:
+	CGhostLoader();
+
+	void Init();
+
+	int Load(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc) override;
+	void Close() override;
+	const CGhostInfo *GetInfo() const override { return &m_Info; }
+
+	bool ReadNextType(int *pType) override;
+	bool ReadData(int Type, void *pData, int Size) override;
+
+	bool GetGhostInfo(const char *pFilename, CGhostInfo *pGhostInfo, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc) override;
+};
+#endif
diff --git a/src_bkp/engine/client/graph.cpp b/src_bkp/engine/client/graph.cpp
new file mode 100644
index 0000000000..95f62ed8e5
--- /dev/null
+++ b/src_bkp/engine/client/graph.cpp
@@ -0,0 +1,105 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <engine/graphics.h>
+#include <engine/textrender.h>
+
+#include "graph.h"
+
+void CGraph::Init(float Min, float Max)
+{
+	SetMin(Min);
+	SetMax(Max);
+	m_Index = 0;
+	for(auto &Entry : m_aEntries)
+		Entry.m_Initialized = false;
+}
+
+void CGraph::SetMin(float Min)
+{
+	m_MinRange = m_Min = Min;
+}
+
+void CGraph::SetMax(float Max)
+{
+	m_MaxRange = m_Max = Max;
+}
+
+void CGraph::Scale()
+{
+	m_Min = m_MinRange;
+	m_Max = m_MaxRange;
+	for(auto &Entry : m_aEntries)
+	{
+		if(Entry.m_Value > m_Max)
+			m_Max = Entry.m_Value;
+		else if(Entry.m_Value < m_Min)
+			m_Min = Entry.m_Value;
+	}
+}
+
+void CGraph::Add(float Value, ColorRGBA Color)
+{
+	InsertAt(m_Index, Value, Color);
+	m_Index = (m_Index + 1) % MAX_VALUES;
+}
+
+void CGraph::InsertAt(size_t Index, float Value, ColorRGBA Color)
+{
+	dbg_assert(Index < MAX_VALUES, "Index out of bounds");
+	m_aEntries[Index].m_Initialized = true;
+	m_aEntries[Index].m_Value = Value;
+	m_aEntries[Index].m_Color = Color;
+}
+
+void CGraph::Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription) const
+{
+	pGraphics->TextureClear();
+
+	pGraphics->QuadsBegin();
+	pGraphics->SetColor(0.0f, 0.0f, 0.0f, 0.75f);
+	IGraphics::CQuadItem QuadItem(x, y, w, h);
+	pGraphics->QuadsDrawTL(&QuadItem, 1);
+	pGraphics->QuadsEnd();
+
+	pGraphics->LinesBegin();
+	pGraphics->SetColor(0.95f, 0.95f, 0.95f, 1.0f);
+	IGraphics::CLineItem LineItem(x, y + h / 2, x + w, y + h / 2);
+	pGraphics->LinesDraw(&LineItem, 1);
+	pGraphics->SetColor(0.5f, 0.5f, 0.5f, 0.75f);
+	IGraphics::CLineItem aLineItems[2] = {
+		IGraphics::CLineItem(x, y + (h * 3) / 4, x + w, y + (h * 3) / 4),
+		IGraphics::CLineItem(x, y + h / 4, x + w, y + h / 4)};
+	pGraphics->LinesDraw(aLineItems, std::size(aLineItems));
+	for(int i = 1; i < MAX_VALUES; i++)
+	{
+		const auto &Entry0 = m_aEntries[(m_Index + i - 1) % MAX_VALUES];
+		const auto &Entry1 = m_aEntries[(m_Index + i) % MAX_VALUES];
+		if(!Entry0.m_Initialized || !Entry1.m_Initialized)
+			continue;
+		float a0 = (i - 1) / (float)(MAX_VALUES - 1);
+		float a1 = i / (float)(MAX_VALUES - 1);
+		float v0 = (Entry0.m_Value - m_Min) / (m_Max - m_Min);
+		float v1 = (Entry1.m_Value - m_Min) / (m_Max - m_Min);
+
+		IGraphics::CColorVertex aColorVertices[2] = {
+			IGraphics::CColorVertex(0, Entry0.m_Color.r, Entry0.m_Color.g, Entry0.m_Color.b, Entry0.m_Color.a),
+			IGraphics::CColorVertex(1, Entry1.m_Color.r, Entry1.m_Color.g, Entry1.m_Color.b, Entry1.m_Color.a)};
+		pGraphics->SetColorVertex(aColorVertices, std::size(aColorVertices));
+		IGraphics::CLineItem LineItem2(x + a0 * w, y + h - v0 * h, x + a1 * w, y + h - v1 * h);
+		pGraphics->LinesDraw(&LineItem2, 1);
+	}
+	pGraphics->LinesEnd();
+
+	const float FontSize = 12.0f;
+	const float Spacing = 2.0f;
+
+	pTextRender->Text(x + Spacing, y + h - FontSize - Spacing, FontSize, pDescription);
+
+	char aBuf[32];
+	str_format(aBuf, sizeof(aBuf), "%.2f", m_Max);
+	pTextRender->Text(x + w - pTextRender->TextWidth(FontSize, aBuf) - Spacing, y + Spacing, FontSize, aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.2f", m_Min);
+	pTextRender->Text(x + w - pTextRender->TextWidth(FontSize, aBuf) - Spacing, y + h - FontSize - Spacing, FontSize, aBuf);
+}
diff --git a/src_bkp/engine/client/graph.h b/src_bkp/engine/client/graph.h
new file mode 100644
index 0000000000..296c6ff9aa
--- /dev/null
+++ b/src_bkp/engine/client/graph.h
@@ -0,0 +1,45 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#ifndef ENGINE_CLIENT_GRAPH_H
+#define ENGINE_CLIENT_GRAPH_H
+
+#include <base/color.h>
+
+#include <cstddef>
+
+class IGraphics;
+class ITextRender;
+
+class CGraph
+{
+public:
+	enum
+	{
+		MAX_VALUES = 128,
+	};
+
+private:
+	struct SEntry
+	{
+		bool m_Initialized;
+		float m_Value;
+		ColorRGBA m_Color;
+	};
+	float m_Min, m_Max;
+	float m_MinRange, m_MaxRange;
+	SEntry m_aEntries[MAX_VALUES];
+	size_t m_Index;
+
+public:
+	void Init(float Min, float Max);
+	void SetMin(float Min);
+	void SetMax(float Max);
+
+	void Scale();
+	void Add(float Value, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f));
+	void InsertAt(size_t Index, float Value, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f));
+	void Render(IGraphics *pGraphics, ITextRender *pTextRender, float x, float y, float w, float h, const char *pDescription) const;
+};
+
+#endif
diff --git a/src_bkp/engine/client/graphics_defines.h b/src_bkp/engine/client/graphics_defines.h
new file mode 100644
index 0000000000..acc01629ff
--- /dev/null
+++ b/src_bkp/engine/client/graphics_defines.h
@@ -0,0 +1,12 @@
+#ifndef ENGINE_CLIENT_GRAPHICS_DEFINES_H
+#define ENGINE_CLIENT_GRAPHICS_DEFINES_H
+
+#include <cstddef>
+#include <cstdint>
+
+typedef uint32_t TWGLuint;
+typedef int32_t TWGLint;
+typedef uint32_t TWGLenum;
+typedef uint8_t TWGLubyte;
+
+#endif
diff --git a/src_bkp/engine/client/graphics_threaded.cpp b/src_bkp/engine/client/graphics_threaded.cpp
new file mode 100644
index 0000000000..ab22ddeebd
--- /dev/null
+++ b/src_bkp/engine/client/graphics_threaded.cpp
@@ -0,0 +1,3003 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/detect.h>
+#include <base/log.h>
+#include <base/math.h>
+
+#if defined(CONF_FAMILY_UNIX)
+#include <pthread.h>
+#endif
+
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/jobs.h>
+#include <engine/storage.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/client_data7.h>
+#include <game/localization.h>
+
+#if defined(CONF_VIDEORECORDER)
+#include <engine/shared/video.h>
+#endif
+
+#include "graphics_threaded.h"
+
+class CSemaphore;
+
+static CVideoMode g_aFakeModes[] = {
+	{8192, 4320, 8192, 4320, 0, 8, 8, 8, 0}, {7680, 4320, 7680, 4320, 0, 8, 8, 8, 0}, {5120, 2880, 5120, 2880, 0, 8, 8, 8, 0},
+	{4096, 2160, 4096, 2160, 0, 8, 8, 8, 0}, {3840, 2160, 3840, 2160, 0, 8, 8, 8, 0}, {2560, 1440, 2560, 1440, 0, 8, 8, 8, 0},
+	{2048, 1536, 2048, 1536, 0, 8, 8, 8, 0}, {1920, 2400, 1920, 2400, 0, 8, 8, 8, 0}, {1920, 1440, 1920, 1440, 0, 8, 8, 8, 0},
+	{1920, 1200, 1920, 1200, 0, 8, 8, 8, 0}, {1920, 1080, 1920, 1080, 0, 8, 8, 8, 0}, {1856, 1392, 1856, 1392, 0, 8, 8, 8, 0},
+	{1800, 1440, 1800, 1440, 0, 8, 8, 8, 0}, {1792, 1344, 1792, 1344, 0, 8, 8, 8, 0}, {1680, 1050, 1680, 1050, 0, 8, 8, 8, 0},
+	{1600, 1200, 1600, 1200, 0, 8, 8, 8, 0}, {1600, 1000, 1600, 1000, 0, 8, 8, 8, 0}, {1440, 1050, 1440, 1050, 0, 8, 8, 8, 0},
+	{1440, 900, 1440, 900, 0, 8, 8, 8, 0}, {1400, 1050, 1400, 1050, 0, 8, 8, 8, 0}, {1368, 768, 1368, 768, 0, 8, 8, 8, 0},
+	{1280, 1024, 1280, 1024, 0, 8, 8, 8, 0}, {1280, 960, 1280, 960, 0, 8, 8, 8, 0}, {1280, 800, 1280, 800, 0, 8, 8, 8, 0},
+	{1280, 768, 1280, 768, 0, 8, 8, 8, 0}, {1152, 864, 1152, 864, 0, 8, 8, 8, 0}, {1024, 768, 1024, 768, 0, 8, 8, 8, 0},
+	{1024, 600, 1024, 600, 0, 8, 8, 8, 0}, {800, 600, 800, 600, 0, 8, 8, 8, 0}, {768, 576, 768, 576, 0, 8, 8, 8, 0},
+	{720, 400, 720, 400, 0, 8, 8, 8, 0}, {640, 480, 640, 480, 0, 8, 8, 8, 0}, {400, 300, 400, 300, 0, 8, 8, 8, 0},
+	{320, 240, 320, 240, 0, 8, 8, 8, 0},
+
+	{8192, 4320, 8192, 4320, 0, 5, 6, 5, 0}, {7680, 4320, 7680, 4320, 0, 5, 6, 5, 0}, {5120, 2880, 5120, 2880, 0, 5, 6, 5, 0},
+	{4096, 2160, 4096, 2160, 0, 5, 6, 5, 0}, {3840, 2160, 3840, 2160, 0, 5, 6, 5, 0}, {2560, 1440, 2560, 1440, 0, 5, 6, 5, 0},
+	{2048, 1536, 2048, 1536, 0, 5, 6, 5, 0}, {1920, 2400, 1920, 2400, 0, 5, 6, 5, 0}, {1920, 1440, 1920, 1440, 0, 5, 6, 5, 0},
+	{1920, 1200, 1920, 1200, 0, 5, 6, 5, 0}, {1920, 1080, 1920, 1080, 0, 5, 6, 5, 0}, {1856, 1392, 1856, 1392, 0, 5, 6, 5, 0},
+	{1800, 1440, 1800, 1440, 0, 5, 6, 5, 0}, {1792, 1344, 1792, 1344, 0, 5, 6, 5, 0}, {1680, 1050, 1680, 1050, 0, 5, 6, 5, 0},
+	{1600, 1200, 1600, 1200, 0, 5, 6, 5, 0}, {1600, 1000, 1600, 1000, 0, 5, 6, 5, 0}, {1440, 1050, 1440, 1050, 0, 5, 6, 5, 0},
+	{1440, 900, 1440, 900, 0, 5, 6, 5, 0}, {1400, 1050, 1400, 1050, 0, 5, 6, 5, 0}, {1368, 768, 1368, 768, 0, 5, 6, 5, 0},
+	{1280, 1024, 1280, 1024, 0, 5, 6, 5, 0}, {1280, 960, 1280, 960, 0, 5, 6, 5, 0}, {1280, 800, 1280, 800, 0, 5, 6, 5, 0},
+	{1280, 768, 1280, 768, 0, 5, 6, 5, 0}, {1152, 864, 1152, 864, 0, 5, 6, 5, 0}, {1024, 768, 1024, 768, 0, 5, 6, 5, 0},
+	{1024, 600, 1024, 600, 0, 5, 6, 5, 0}, {800, 600, 800, 600, 0, 5, 6, 5, 0}, {768, 576, 768, 576, 0, 5, 6, 5, 0},
+	{720, 400, 720, 400, 0, 5, 6, 5, 0}, {640, 480, 640, 480, 0, 5, 6, 5, 0}, {400, 300, 400, 300, 0, 5, 6, 5, 0},
+	{320, 240, 320, 240, 0, 5, 6, 5, 0}};
+
+void CGraphics_Threaded::FlushVertices(bool KeepVertices)
+{
+	CCommandBuffer::SCommand_Render Cmd;
+	int PrimType;
+	size_t PrimCount, NumVerts;
+	FlushVerticesImpl(KeepVertices, PrimType, PrimCount, NumVerts, Cmd, sizeof(CCommandBuffer::SVertex));
+
+	if(Cmd.m_pVertices != nullptr)
+	{
+		mem_copy(Cmd.m_pVertices, m_aVertices, sizeof(CCommandBuffer::SVertex) * NumVerts);
+	}
+}
+
+void CGraphics_Threaded::FlushVerticesTex3D()
+{
+	CCommandBuffer::SCommand_RenderTex3D Cmd;
+	int PrimType;
+	size_t PrimCount, NumVerts;
+	FlushVerticesImpl(false, PrimType, PrimCount, NumVerts, Cmd, sizeof(CCommandBuffer::SVertexTex3DStream));
+
+	if(Cmd.m_pVertices != nullptr)
+	{
+		mem_copy(Cmd.m_pVertices, m_aVerticesTex3D, sizeof(CCommandBuffer::SVertexTex3DStream) * NumVerts);
+	}
+}
+
+void CGraphics_Threaded::AddVertices(int Count)
+{
+	m_NumVertices += Count;
+	if((m_NumVertices + Count) >= CCommandBuffer::MAX_VERTICES)
+		FlushVertices();
+}
+
+void CGraphics_Threaded::AddVertices(int Count, CCommandBuffer::SVertex *pVertices)
+{
+	AddVertices(Count);
+}
+
+void CGraphics_Threaded::AddVertices(int Count, CCommandBuffer::SVertexTex3DStream *pVertices)
+{
+	m_NumVertices += Count;
+	if((m_NumVertices + Count) >= CCommandBuffer::MAX_VERTICES)
+		FlushVerticesTex3D();
+}
+
+CGraphics_Threaded::CGraphics_Threaded()
+{
+	m_State.m_ScreenTL.x = 0;
+	m_State.m_ScreenTL.y = 0;
+	m_State.m_ScreenBR.x = 0;
+	m_State.m_ScreenBR.y = 0;
+	m_State.m_ClipEnable = false;
+	m_State.m_ClipX = 0;
+	m_State.m_ClipY = 0;
+	m_State.m_ClipW = 0;
+	m_State.m_ClipH = 0;
+	m_State.m_Texture = -1;
+	m_State.m_BlendMode = CCommandBuffer::BLEND_NONE;
+	m_State.m_WrapMode = CCommandBuffer::WRAP_REPEAT;
+
+	m_CurrentCommandBuffer = 0;
+	m_pCommandBuffer = 0x0;
+	m_apCommandBuffers[0] = 0x0;
+	m_apCommandBuffers[1] = 0x0;
+
+	m_NumVertices = 0;
+
+	m_ScreenWidth = -1;
+	m_ScreenHeight = -1;
+	m_ScreenRefreshRate = -1;
+
+	m_Rotation = 0;
+	m_Drawing = 0;
+
+	m_TextureMemoryUsage = 0;
+
+	m_RenderEnable = true;
+	m_DoScreenshot = false;
+}
+
+void CGraphics_Threaded::ClipEnable(int x, int y, int w, int h)
+{
+	if(x < 0)
+		w += x;
+	if(y < 0)
+		h += y;
+
+	x = clamp(x, 0, ScreenWidth());
+	y = clamp(y, 0, ScreenHeight());
+	w = clamp(w, 0, ScreenWidth() - x);
+	h = clamp(h, 0, ScreenHeight() - y);
+
+	m_State.m_ClipEnable = true;
+	m_State.m_ClipX = x;
+	m_State.m_ClipY = ScreenHeight() - (y + h);
+	m_State.m_ClipW = w;
+	m_State.m_ClipH = h;
+}
+
+void CGraphics_Threaded::ClipDisable()
+{
+	m_State.m_ClipEnable = false;
+}
+
+void CGraphics_Threaded::BlendNone()
+{
+	m_State.m_BlendMode = CCommandBuffer::BLEND_NONE;
+}
+
+void CGraphics_Threaded::BlendNormal()
+{
+	m_State.m_BlendMode = CCommandBuffer::BLEND_ALPHA;
+}
+
+void CGraphics_Threaded::BlendAdditive()
+{
+	m_State.m_BlendMode = CCommandBuffer::BLEND_ADDITIVE;
+}
+
+void CGraphics_Threaded::WrapNormal()
+{
+	m_State.m_WrapMode = CCommandBuffer::WRAP_REPEAT;
+}
+
+void CGraphics_Threaded::WrapClamp()
+{
+	m_State.m_WrapMode = CCommandBuffer::WRAP_CLAMP;
+}
+
+uint64_t CGraphics_Threaded::TextureMemoryUsage() const
+{
+	return m_pBackend->TextureMemoryUsage();
+}
+
+uint64_t CGraphics_Threaded::BufferMemoryUsage() const
+{
+	return m_pBackend->BufferMemoryUsage();
+}
+
+uint64_t CGraphics_Threaded::StreamedMemoryUsage() const
+{
+	return m_pBackend->StreamedMemoryUsage();
+}
+
+uint64_t CGraphics_Threaded::StagingMemoryUsage() const
+{
+	return m_pBackend->StagingMemoryUsage();
+}
+
+const TTWGraphicsGPUList &CGraphics_Threaded::GetGPUs() const
+{
+	return m_pBackend->GetGPUs();
+}
+
+void CGraphics_Threaded::MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY)
+{
+	m_State.m_ScreenTL.x = TopLeftX;
+	m_State.m_ScreenTL.y = TopLeftY;
+	m_State.m_ScreenBR.x = BottomRightX;
+	m_State.m_ScreenBR.y = BottomRightY;
+}
+
+void CGraphics_Threaded::GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY)
+{
+	*pTopLeftX = m_State.m_ScreenTL.x;
+	*pTopLeftY = m_State.m_ScreenTL.y;
+	*pBottomRightX = m_State.m_ScreenBR.x;
+	*pBottomRightY = m_State.m_ScreenBR.y;
+}
+
+void CGraphics_Threaded::LinesBegin()
+{
+	dbg_assert(m_Drawing == 0, "called Graphics()->LinesBegin twice");
+	m_Drawing = DRAWING_LINES;
+	SetColor(1, 1, 1, 1);
+}
+
+void CGraphics_Threaded::LinesEnd()
+{
+	dbg_assert(m_Drawing == DRAWING_LINES, "called Graphics()->LinesEnd without begin");
+	FlushVertices();
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::LinesDraw(const CLineItem *pArray, int Num)
+{
+	dbg_assert(m_Drawing == DRAWING_LINES, "called Graphics()->LinesDraw without begin");
+
+	for(int i = 0; i < Num; ++i)
+	{
+		m_aVertices[m_NumVertices + 2 * i].m_Pos.x = pArray[i].m_X0;
+		m_aVertices[m_NumVertices + 2 * i].m_Pos.y = pArray[i].m_Y0;
+		m_aVertices[m_NumVertices + 2 * i].m_Tex = m_aTexture[0];
+		SetColor(&m_aVertices[m_NumVertices + 2 * i], 0);
+
+		m_aVertices[m_NumVertices + 2 * i + 1].m_Pos.x = pArray[i].m_X1;
+		m_aVertices[m_NumVertices + 2 * i + 1].m_Pos.y = pArray[i].m_Y1;
+		m_aVertices[m_NumVertices + 2 * i + 1].m_Tex = m_aTexture[1];
+		SetColor(&m_aVertices[m_NumVertices + 2 * i + 1], 1);
+	}
+
+	AddVertices(2 * Num);
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::FindFreeTextureIndex()
+{
+	const size_t CurSize = m_vTextureIndices.size();
+	if(m_FirstFreeTexture == CurSize)
+	{
+		m_vTextureIndices.resize(CurSize * 2);
+		for(size_t i = 0; i < CurSize; ++i)
+			m_vTextureIndices[CurSize + i] = CurSize + i + 1;
+	}
+	const size_t Tex = m_FirstFreeTexture;
+	m_FirstFreeTexture = m_vTextureIndices[Tex];
+	m_vTextureIndices[Tex] = -1;
+	return CreateTextureHandle(Tex);
+}
+
+void CGraphics_Threaded::FreeTextureIndex(CTextureHandle *pIndex)
+{
+	dbg_assert(pIndex->IsValid(), "Cannot free invalid texture index");
+	dbg_assert(m_vTextureIndices[pIndex->Id()] == -1, "Cannot free already freed texture index");
+
+	m_vTextureIndices[pIndex->Id()] = m_FirstFreeTexture;
+	m_FirstFreeTexture = pIndex->Id();
+	pIndex->Invalidate();
+}
+
+int CGraphics_Threaded::UnloadTexture(CTextureHandle *pIndex)
+{
+	if(pIndex->Id() == m_NullTexture.Id())
+		return 0;
+
+	if(!pIndex->IsValid())
+		return 0;
+
+	CCommandBuffer::SCommand_Texture_Destroy Cmd;
+	Cmd.m_Slot = pIndex->Id();
+	AddCmd(Cmd);
+
+	FreeTextureIndex(pIndex);
+	return 0;
+}
+
+static bool ConvertToRGBA(uint8_t *pDest, const uint8_t *pSrc, size_t SrcWidth, size_t SrcHeight, CImageInfo::EImageFormat SrcFormat)
+{
+	if(SrcFormat == CImageInfo::FORMAT_RGBA)
+	{
+		mem_copy(pDest, pSrc, SrcWidth * SrcHeight * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA));
+		return true;
+	}
+	else
+	{
+		const size_t SrcChannelCount = CImageInfo::PixelSize(SrcFormat);
+		const size_t DstChannelCount = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+		for(size_t Y = 0; Y < SrcHeight; ++Y)
+		{
+			for(size_t X = 0; X < SrcWidth; ++X)
+			{
+				size_t ImgOffsetSrc = (Y * SrcWidth * SrcChannelCount) + (X * SrcChannelCount);
+				size_t ImgOffsetDest = (Y * SrcWidth * DstChannelCount) + (X * DstChannelCount);
+				size_t CopySize = SrcChannelCount;
+				if(SrcFormat == CImageInfo::FORMAT_RGB)
+				{
+					mem_copy(&pDest[ImgOffsetDest], &pSrc[ImgOffsetSrc], CopySize);
+					pDest[ImgOffsetDest + 3] = 255;
+				}
+				else if(SrcFormat == CImageInfo::FORMAT_SINGLE_COMPONENT)
+				{
+					pDest[ImgOffsetDest + 0] = 255;
+					pDest[ImgOffsetDest + 1] = 255;
+					pDest[ImgOffsetDest + 2] = 255;
+					pDest[ImgOffsetDest + 3] = pSrc[ImgOffsetSrc];
+				}
+			}
+		}
+		return false;
+	}
+}
+
+int CGraphics_Threaded::LoadTextureRawSub(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData)
+{
+	dbg_assert(TextureID.IsValid(), "Invalid texture handle used with LoadTextureRawSub.");
+
+	CCommandBuffer::SCommand_Texture_Update Cmd;
+	Cmd.m_Slot = TextureID.Id();
+	Cmd.m_X = x;
+	Cmd.m_Y = y;
+	Cmd.m_Width = Width;
+	Cmd.m_Height = Height;
+	Cmd.m_Format = CCommandBuffer::TEXFORMAT_RGBA;
+
+	// calculate memory usage
+	const size_t MemSize = Width * Height * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+
+	// copy texture data
+	void *pTmpData = malloc(MemSize);
+	ConvertToRGBA((uint8_t *)pTmpData, (const uint8_t *)pData, Width, Height, Format);
+	Cmd.m_pData = pTmpData;
+	AddCmd(Cmd);
+
+	return 0;
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::LoadSpriteTextureImpl(CImageInfo &FromImageInfo, int x, int y, size_t w, size_t h)
+{
+	const size_t PixelSize = FromImageInfo.PixelSize();
+	m_vSpriteHelper.resize(w * h * PixelSize);
+	CopyTextureFromTextureBufferSub(m_vSpriteHelper.data(), w, h, (uint8_t *)FromImageInfo.m_pData, FromImageInfo.m_Width, FromImageInfo.m_Height, PixelSize, x, y, w, h);
+	return LoadTextureRaw(w, h, FromImageInfo.m_Format, m_vSpriteHelper.data(), 0);
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::LoadSpriteTexture(CImageInfo &FromImageInfo, CDataSprite *pSprite)
+{
+	int imggx = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
+	int imggy = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
+	int x = pSprite->m_X * imggx;
+	int y = pSprite->m_Y * imggy;
+	int w = pSprite->m_W * imggx;
+	int h = pSprite->m_H * imggy;
+	return LoadSpriteTextureImpl(FromImageInfo, x, y, w, h);
+}
+
+bool CGraphics_Threaded::IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h)
+{
+	if(FromImageInfo.m_Format == CImageInfo::FORMAT_SINGLE_COMPONENT || FromImageInfo.m_Format == CImageInfo::FORMAT_RGBA)
+	{
+		uint8_t *pImgData = (uint8_t *)FromImageInfo.m_pData;
+		const size_t PixelSize = FromImageInfo.PixelSize();
+		for(int iy = 0; iy < h; ++iy)
+		{
+			for(int ix = 0; ix < w; ++ix)
+			{
+				const size_t RealOffset = (x + ix) * PixelSize + (y + iy) * PixelSize * FromImageInfo.m_Width;
+				if(pImgData[RealOffset + (PixelSize - 1)] > 0)
+					return false;
+			}
+		}
+
+		return true;
+	}
+	return false;
+}
+
+bool CGraphics_Threaded::IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, CDataSprite *pSprite)
+{
+	int imggx = FromImageInfo.m_Width / pSprite->m_pSet->m_Gridx;
+	int imggy = FromImageInfo.m_Height / pSprite->m_pSet->m_Gridy;
+	int x = pSprite->m_X * imggx;
+	int y = pSprite->m_Y * imggy;
+	int w = pSprite->m_W * imggx;
+	int h = pSprite->m_H * imggy;
+
+	return IsImageSubFullyTransparent(FromImageInfo, x, y, w, h);
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName)
+{
+	if((Flags & IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE) != 0 || (Flags & IGraphics::TEXLOAD_TO_3D_TEXTURE) != 0)
+	{
+		if(Width == 0 || (Width % 16) != 0 || Height == 0 || (Height % 16) != 0)
+		{
+			SWarning NewWarning;
+			char aText[128];
+			aText[0] = '\0';
+			if(pTexName)
+			{
+				str_format(aText, sizeof(aText), "\"%s\"", pTexName);
+			}
+			str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), aText, 16, 16);
+
+			m_vWarnings.emplace_back(NewWarning);
+		}
+	}
+
+	if(Width == 0 || Height == 0)
+		return IGraphics::CTextureHandle();
+
+	IGraphics::CTextureHandle TextureHandle = FindFreeTextureIndex();
+
+	CCommandBuffer::SCommand_Texture_Create Cmd;
+	Cmd.m_Slot = TextureHandle.Id();
+	Cmd.m_Width = Width;
+	Cmd.m_Height = Height;
+	Cmd.m_Format = CCommandBuffer::TEXFORMAT_RGBA;
+	Cmd.m_StoreFormat = CCommandBuffer::TEXFORMAT_RGBA;
+
+	// flags
+	Cmd.m_Flags = 0;
+	if(Flags & IGraphics::TEXLOAD_NOMIPMAPS)
+		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_NOMIPMAPS;
+	if((Flags & IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE) != 0)
+		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_TO_2D_ARRAY_TEXTURE;
+	if((Flags & IGraphics::TEXLOAD_TO_3D_TEXTURE) != 0)
+		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_TO_3D_TEXTURE;
+	if((Flags & IGraphics::TEXLOAD_NO_2D_TEXTURE) != 0)
+		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_NO_2D_TEXTURE;
+
+	// copy texture data
+	const size_t MemSize = Width * Height * CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+	void *pTmpData = malloc(MemSize);
+	if(!ConvertToRGBA((uint8_t *)pTmpData, (const uint8_t *)pData, Width, Height, Format))
+	{
+		dbg_msg("graphics", "converted image %s to RGBA, consider making its file format RGBA", pTexName ? pTexName : "(no name)");
+	}
+	Cmd.m_pData = pTmpData;
+	AddCmd(Cmd);
+
+	return TextureHandle;
+}
+
+// simple uncompressed RGBA loaders
+IGraphics::CTextureHandle CGraphics_Threaded::LoadTexture(const char *pFilename, int StorageType, int Flags)
+{
+	dbg_assert(pFilename[0] != '\0', "Cannot load texture from file with empty filename"); // would cause Valgrind to crash otherwise
+
+	CImageInfo Img;
+	if(LoadPNG(&Img, pFilename, StorageType))
+	{
+		CTextureHandle ID = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, Flags, pFilename);
+		FreePNG(&Img);
+		if(ID.IsValid())
+		{
+			if(g_Config.m_Debug)
+				dbg_msg("graphics/texture", "loaded %s", pFilename);
+			return ID;
+		}
+	}
+
+	return m_NullTexture;
+}
+
+IGraphics::CTextureHandle CGraphics_Threaded::NullTexture() const
+{
+	return m_NullTexture;
+}
+
+bool CGraphics_Threaded::LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData)
+{
+	if(Width == 0 || Height == 0)
+		return false;
+
+	TextTexture = FindFreeTextureIndex();
+	TextOutlineTexture = FindFreeTextureIndex();
+
+	CCommandBuffer::SCommand_TextTextures_Create Cmd;
+	Cmd.m_Slot = TextTexture.Id();
+	Cmd.m_SlotOutline = TextOutlineTexture.Id();
+	Cmd.m_Width = Width;
+	Cmd.m_Height = Height;
+	Cmd.m_pTextData = pTextData;
+	Cmd.m_pTextOutlineData = pTextOutlineData;
+	AddCmd(Cmd);
+
+	return true;
+}
+
+bool CGraphics_Threaded::UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture)
+{
+	CCommandBuffer::SCommand_TextTextures_Destroy Cmd;
+	Cmd.m_Slot = TextTexture.Id();
+	Cmd.m_SlotOutline = TextOutlineTexture.Id();
+	AddCmd(Cmd);
+
+	if(TextTexture.IsValid())
+		FreeTextureIndex(&TextTexture);
+	if(TextOutlineTexture.IsValid())
+		FreeTextureIndex(&TextOutlineTexture);
+	return true;
+}
+
+bool CGraphics_Threaded::UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData)
+{
+	CCommandBuffer::SCommand_TextTexture_Update Cmd;
+	Cmd.m_Slot = TextureID.Id();
+	Cmd.m_X = x;
+	Cmd.m_Y = y;
+	Cmd.m_Width = Width;
+	Cmd.m_Height = Height;
+
+	// calculate memory usage
+	const size_t MemSize = Width * Height;
+
+	// copy texture data
+	void *pTmpData = malloc(MemSize);
+	mem_copy(pTmpData, pData, MemSize);
+	Cmd.m_pData = pTmpData;
+	AddCmd(Cmd);
+
+	return true;
+}
+
+bool CGraphics_Threaded::LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType)
+{
+	char aCompleteFilename[IO_MAX_PATH_LENGTH];
+	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType, aCompleteFilename, sizeof(aCompleteFilename));
+	if(File)
+	{
+		io_seek(File, 0, IOSEEK_END);
+		unsigned int FileSize = io_tell(File);
+		io_seek(File, 0, IOSEEK_START);
+
+		TImageByteBuffer ByteBuffer;
+		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+		ByteBuffer.resize(FileSize);
+		io_read(File, &ByteBuffer.front(), FileSize);
+
+		io_close(File);
+
+		uint8_t *pImgBuffer = NULL;
+		EImageFormat ImageFormat;
+		int PngliteIncompatible;
+		if(::LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
+		{
+			if(ImageFormat == IMAGE_FORMAT_RGB)
+				pImg->m_Format = CImageInfo::FORMAT_RGB;
+			else if(ImageFormat == IMAGE_FORMAT_RGBA)
+				pImg->m_Format = CImageInfo::FORMAT_RGBA;
+			else
+			{
+				free(pImgBuffer);
+				log_error("game/png", "image had unsupported image format. filename='%s' format='%d'", pFilename, (int)ImageFormat);
+				return false;
+			}
+			pImg->m_pData = pImgBuffer;
+
+			if(m_WarnPngliteIncompatibleImages && PngliteIncompatible != 0)
+			{
+				SWarning Warning;
+				str_format(Warning.m_aWarningMsg, sizeof(Warning.m_aWarningMsg), Localize("\"%s\" is not compatible with pnglite and cannot be loaded by old DDNet versions: "), pFilename);
+				static const int FLAGS[] = {PNGLITE_COLOR_TYPE, PNGLITE_BIT_DEPTH, PNGLITE_INTERLACE_TYPE, PNGLITE_COMPRESSION_TYPE, PNGLITE_FILTER_TYPE};
+				static const char *EXPLANATION[] = {"color type", "bit depth", "interlace type", "compression type", "filter type"};
+
+				bool First = true;
+				for(size_t i = 0; i < std::size(FLAGS); ++i)
+				{
+					if((PngliteIncompatible & FLAGS[i]) != 0)
+					{
+						if(!First)
+						{
+							str_append(Warning.m_aWarningMsg, ", ");
+						}
+						str_append(Warning.m_aWarningMsg, EXPLANATION[i]);
+						First = false;
+					}
+				}
+				str_append(Warning.m_aWarningMsg, " unsupported");
+				m_vWarnings.emplace_back(Warning);
+			}
+		}
+		else
+		{
+			log_error("game/png", "failed to load file. filename='%s'", pFilename);
+			return false;
+		}
+	}
+	else
+	{
+		log_error("game/png", "failed to open file. filename='%s'", pFilename);
+		return false;
+	}
+
+	return true;
+}
+
+void CGraphics_Threaded::FreePNG(CImageInfo *pImg)
+{
+	free(pImg->m_pData);
+	pImg->m_pData = NULL;
+}
+
+bool CGraphics_Threaded::CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize)
+{
+	dbg_assert(DivX != 0 && DivY != 0, "Passing 0 to this function is not allowed.");
+	bool ImageIsValid = true;
+	bool WidthBroken = Img.m_Width == 0 || (Img.m_Width % DivX) != 0;
+	bool HeightBroken = Img.m_Height == 0 || (Img.m_Height % DivY) != 0;
+	if(WidthBroken || HeightBroken)
+	{
+		SWarning NewWarning;
+		str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), pFileName, DivX, DivY);
+
+		m_vWarnings.emplace_back(NewWarning);
+
+		ImageIsValid = false;
+	}
+
+	if(AllowResize && !ImageIsValid && Img.m_Width > 0 && Img.m_Height > 0)
+	{
+		int NewWidth = DivX;
+		int NewHeight = DivY;
+		if(WidthBroken)
+		{
+			NewWidth = maximum<int>(HighestBit(Img.m_Width), DivX);
+			NewHeight = (NewWidth / DivX) * DivY;
+		}
+		else
+		{
+			NewHeight = maximum<int>(HighestBit(Img.m_Height), DivY);
+			NewWidth = (NewHeight / DivY) * DivX;
+		}
+
+		uint8_t *pNewImg = ResizeImage((uint8_t *)Img.m_pData, Img.m_Width, Img.m_Height, NewWidth, NewHeight, Img.PixelSize());
+		free(Img.m_pData);
+		Img.m_pData = pNewImg;
+		Img.m_Width = NewWidth;
+		Img.m_Height = NewHeight;
+		ImageIsValid = true;
+	}
+
+	return ImageIsValid;
+}
+
+bool CGraphics_Threaded::IsImageFormatRGBA(const char *pFileName, CImageInfo &Img)
+{
+	if(Img.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		SWarning NewWarning;
+		char aText[128];
+		aText[0] = '\0';
+		if(pFileName)
+		{
+			str_format(aText, sizeof(aText), "\"%s\"", pFileName);
+		}
+		str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg),
+			Localize("The format of texture %s is not RGBA which will cause visual bugs."), aText);
+		m_vWarnings.emplace_back(NewWarning);
+		return false;
+	}
+	return true;
+}
+
+void CGraphics_Threaded::CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight)
+{
+	for(size_t Y = 0; Y < SubCopyHeight; ++Y)
+	{
+		const size_t ImgOffset = ((SubOffsetY + Y) * FullWidth * PixelSize) + (SubOffsetX * PixelSize);
+		const size_t CopySize = SubCopyWidth * PixelSize;
+		mem_copy(&pDestBuffer[ImgOffset], &pSourceBuffer[ImgOffset], CopySize);
+	}
+}
+
+void CGraphics_Threaded::CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight)
+{
+	for(size_t Y = 0; Y < SrcSubCopyHeight; ++Y)
+	{
+		const size_t SrcImgOffset = ((SrcSubOffsetY + Y) * SrcWidth * PixelSize) + (SrcSubOffsetX * PixelSize);
+		const size_t DstImgOffset = (Y * DestWidth * PixelSize);
+		const size_t CopySize = SrcSubCopyWidth * PixelSize;
+		mem_copy(&pDestBuffer[DstImgOffset], &pSourceBuffer[SrcImgOffset], CopySize);
+	}
+}
+
+void CGraphics_Threaded::KickCommandBuffer()
+{
+	m_pBackend->RunBuffer(m_pCommandBuffer);
+
+	std::vector<std::string> WarningStrings;
+	if(m_pBackend->GetWarning(WarningStrings))
+	{
+		SWarning NewWarning;
+		std::string WarningStr;
+		for(const auto &WarnStr : WarningStrings)
+			WarningStr.append((WarnStr + "\n"));
+		str_copy(NewWarning.m_aWarningMsg, WarningStr.c_str());
+		m_vWarnings.emplace_back(NewWarning);
+	}
+
+	// swap buffer
+	m_CurrentCommandBuffer ^= 1;
+	m_pCommandBuffer = m_apCommandBuffers[m_CurrentCommandBuffer];
+	m_pCommandBuffer->Reset();
+}
+
+class CScreenshotSaveJob : public IJob
+{
+	IStorage *m_pStorage;
+	IConsole *m_pConsole;
+	char m_aName[IO_MAX_PATH_LENGTH];
+	int m_Width;
+	int m_Height;
+	void *m_pData;
+
+	void Run() override
+	{
+		char aWholePath[IO_MAX_PATH_LENGTH];
+		char aBuf[64 + IO_MAX_PATH_LENGTH];
+		IOHANDLE File = m_pStorage->OpenFile(m_aName, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath));
+		if(File)
+		{
+			TImageByteBuffer ByteBuffer;
+			SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+			if(SavePNG(IMAGE_FORMAT_RGBA, (const uint8_t *)m_pData, ImageByteBuffer, m_Width, m_Height))
+				io_write(File, &ByteBuffer.front(), ByteBuffer.size());
+			io_close(File);
+
+			str_format(aBuf, sizeof(aBuf), "saved screenshot to '%s'", aWholePath);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "failed to save screenshot to '%s'", aWholePath);
+		}
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf, ColorRGBA(1.0f, 0.6f, 0.3f, 1.0f));
+	}
+
+public:
+	CScreenshotSaveJob(IStorage *pStorage, IConsole *pConsole, const char *pName, int Width, int Height, void *pData) :
+		m_pStorage(pStorage),
+		m_pConsole(pConsole),
+		m_Width(Width),
+		m_Height(Height),
+		m_pData(pData)
+	{
+		str_copy(m_aName, pName);
+	}
+
+	~CScreenshotSaveJob() override
+	{
+		free(m_pData);
+	}
+};
+
+bool CGraphics_Threaded::ScreenshotDirect()
+{
+	// add swap command
+	CImageInfo Image;
+
+	bool DidSwap = false;
+
+	CCommandBuffer::SCommand_TrySwapAndScreenshot Cmd;
+	Cmd.m_pImage = &Image;
+	Cmd.m_pSwapped = &DidSwap;
+	AddCmd(Cmd);
+
+	// kick the buffer and wait for the result
+	KickCommandBuffer();
+	WaitForIdle();
+
+	if(Image.m_pData)
+	{
+		m_pEngine->AddJob(std::make_shared<CScreenshotSaveJob>(m_pStorage, m_pConsole, m_aScreenshotName, Image.m_Width, Image.m_Height, Image.m_pData));
+	}
+
+	return DidSwap;
+}
+
+void CGraphics_Threaded::TextureSet(CTextureHandle TextureID)
+{
+	dbg_assert(m_Drawing == 0, "called Graphics()->TextureSet within begin");
+	dbg_assert(!TextureID.IsValid() || m_vTextureIndices[TextureID.Id()] == -1, "Texture handle was not invalid, but also did not correlate to an existing texture.");
+	m_State.m_Texture = TextureID.Id();
+}
+
+void CGraphics_Threaded::Clear(float r, float g, float b, bool ForceClearNow)
+{
+	CCommandBuffer::SCommand_Clear Cmd;
+	Cmd.m_Color.r = r;
+	Cmd.m_Color.g = g;
+	Cmd.m_Color.b = b;
+	Cmd.m_Color.a = 0;
+	Cmd.m_ForceClear = ForceClearNow;
+	AddCmd(Cmd);
+}
+
+void CGraphics_Threaded::QuadsBegin()
+{
+	dbg_assert(m_Drawing == 0, "called Graphics()->QuadsBegin twice");
+	m_Drawing = DRAWING_QUADS;
+
+	QuadsSetSubset(0, 0, 1, 1);
+	QuadsSetRotation(0);
+	SetColor(1, 1, 1, 1);
+}
+
+void CGraphics_Threaded::QuadsEnd()
+{
+	dbg_assert(m_Drawing == DRAWING_QUADS, "called Graphics()->QuadsEnd without begin");
+	FlushVertices();
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::QuadsTex3DBegin()
+{
+	QuadsBegin();
+}
+
+void CGraphics_Threaded::QuadsTex3DEnd()
+{
+	dbg_assert(m_Drawing == DRAWING_QUADS, "called Graphics()->QuadsEnd without begin");
+	FlushVerticesTex3D();
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::TrianglesBegin()
+{
+	dbg_assert(m_Drawing == 0, "called Graphics()->TrianglesBegin twice");
+	m_Drawing = DRAWING_TRIANGLES;
+
+	QuadsSetSubset(0, 0, 1, 1);
+	QuadsSetRotation(0);
+	SetColor(1, 1, 1, 1);
+}
+
+void CGraphics_Threaded::TrianglesEnd()
+{
+	dbg_assert(m_Drawing == DRAWING_TRIANGLES, "called Graphics()->TrianglesEnd without begin");
+	FlushVertices();
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::QuadsEndKeepVertices()
+{
+	dbg_assert(m_Drawing == DRAWING_QUADS, "called Graphics()->QuadsEndKeepVertices without begin");
+	FlushVertices(true);
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::QuadsDrawCurrentVertices(bool KeepVertices)
+{
+	m_Drawing = DRAWING_QUADS;
+	FlushVertices(KeepVertices);
+	m_Drawing = 0;
+}
+
+void CGraphics_Threaded::QuadsSetRotation(float Angle)
+{
+	m_Rotation = Angle;
+}
+
+inline void clampf(float &Value, float Min, float Max)
+{
+	if(Value > Max)
+		Value = Max;
+	else if(Value < Min)
+		Value = Min;
+}
+
+void CGraphics_Threaded::SetColorVertex(const CColorVertex *pArray, int Num)
+{
+	dbg_assert(m_Drawing != 0, "called Graphics()->SetColorVertex without begin");
+
+	for(int i = 0; i < Num; ++i)
+	{
+		float r = pArray[i].m_R, g = pArray[i].m_G, b = pArray[i].m_B, a = pArray[i].m_A;
+		clampf(r, 0.f, 1.f);
+		clampf(g, 0.f, 1.f);
+		clampf(b, 0.f, 1.f);
+		clampf(a, 0.f, 1.f);
+		m_aColor[pArray[i].m_Index].r = (unsigned char)(r * 255.f);
+		m_aColor[pArray[i].m_Index].g = (unsigned char)(g * 255.f);
+		m_aColor[pArray[i].m_Index].b = (unsigned char)(b * 255.f);
+		m_aColor[pArray[i].m_Index].a = (unsigned char)(a * 255.f);
+	}
+}
+
+void CGraphics_Threaded::SetColor(float r, float g, float b, float a)
+{
+	clampf(r, 0.f, 1.f);
+	clampf(g, 0.f, 1.f);
+	clampf(b, 0.f, 1.f);
+	clampf(a, 0.f, 1.f);
+	r *= 255.f;
+	g *= 255.f;
+	b *= 255.f;
+	a *= 255.f;
+
+	for(auto &Color : m_aColor)
+	{
+		Color.r = (unsigned char)(r);
+		Color.g = (unsigned char)(g);
+		Color.b = (unsigned char)(b);
+		Color.a = (unsigned char)(a);
+	}
+}
+
+void CGraphics_Threaded::SetColor(ColorRGBA Color)
+{
+	SetColor(Color.r, Color.g, Color.b, Color.a);
+}
+
+void CGraphics_Threaded::SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight)
+{
+	dbg_assert(m_Drawing != 0, "called Graphics()->SetColor without begin");
+	CColorVertex Array[4] = {
+		CColorVertex(0, TopLeft.r, TopLeft.g, TopLeft.b, TopLeft.a),
+		CColorVertex(1, TopRight.r, TopRight.g, TopRight.b, TopRight.a),
+		CColorVertex(2, BottomRight.r, BottomRight.g, BottomRight.b, BottomRight.a),
+		CColorVertex(3, BottomLeft.r, BottomLeft.g, BottomLeft.b, BottomLeft.a)};
+	SetColorVertex(Array, 4);
+}
+
+void CGraphics_Threaded::ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a)
+{
+	clampf(r, 0.f, 1.f);
+	clampf(g, 0.f, 1.f);
+	clampf(b, 0.f, 1.f);
+	clampf(a, 0.f, 1.f);
+	m_aColor[0].r = (unsigned char)(r * 255.f);
+	m_aColor[0].g = (unsigned char)(g * 255.f);
+	m_aColor[0].b = (unsigned char)(b * 255.f);
+	m_aColor[0].a = (unsigned char)(a * 255.f);
+
+	for(int i = 0; i < m_NumVertices; ++i)
+	{
+		SetColor(&m_aVertices[i], 0);
+	}
+}
+
+void CGraphics_Threaded::ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+{
+	if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
+	{
+		m_aVertices[QuadOffset * 6].m_Color.r = r;
+		m_aVertices[QuadOffset * 6].m_Color.g = g;
+		m_aVertices[QuadOffset * 6].m_Color.b = b;
+		m_aVertices[QuadOffset * 6].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 6 + 1].m_Color.r = r;
+		m_aVertices[QuadOffset * 6 + 1].m_Color.g = g;
+		m_aVertices[QuadOffset * 6 + 1].m_Color.b = b;
+		m_aVertices[QuadOffset * 6 + 1].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 6 + 2].m_Color.r = r;
+		m_aVertices[QuadOffset * 6 + 2].m_Color.g = g;
+		m_aVertices[QuadOffset * 6 + 2].m_Color.b = b;
+		m_aVertices[QuadOffset * 6 + 2].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 6 + 3].m_Color.r = r;
+		m_aVertices[QuadOffset * 6 + 3].m_Color.g = g;
+		m_aVertices[QuadOffset * 6 + 3].m_Color.b = b;
+		m_aVertices[QuadOffset * 6 + 3].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 6 + 4].m_Color.r = r;
+		m_aVertices[QuadOffset * 6 + 4].m_Color.g = g;
+		m_aVertices[QuadOffset * 6 + 4].m_Color.b = b;
+		m_aVertices[QuadOffset * 6 + 4].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 6 + 5].m_Color.r = r;
+		m_aVertices[QuadOffset * 6 + 5].m_Color.g = g;
+		m_aVertices[QuadOffset * 6 + 5].m_Color.b = b;
+		m_aVertices[QuadOffset * 6 + 5].m_Color.a = a;
+	}
+	else
+	{
+		m_aVertices[QuadOffset * 4].m_Color.r = r;
+		m_aVertices[QuadOffset * 4].m_Color.g = g;
+		m_aVertices[QuadOffset * 4].m_Color.b = b;
+		m_aVertices[QuadOffset * 4].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 4 + 1].m_Color.r = r;
+		m_aVertices[QuadOffset * 4 + 1].m_Color.g = g;
+		m_aVertices[QuadOffset * 4 + 1].m_Color.b = b;
+		m_aVertices[QuadOffset * 4 + 1].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 4 + 2].m_Color.r = r;
+		m_aVertices[QuadOffset * 4 + 2].m_Color.g = g;
+		m_aVertices[QuadOffset * 4 + 2].m_Color.b = b;
+		m_aVertices[QuadOffset * 4 + 2].m_Color.a = a;
+
+		m_aVertices[QuadOffset * 4 + 3].m_Color.r = r;
+		m_aVertices[QuadOffset * 4 + 3].m_Color.g = g;
+		m_aVertices[QuadOffset * 4 + 3].m_Color.b = b;
+		m_aVertices[QuadOffset * 4 + 3].m_Color.a = a;
+	}
+}
+
+void CGraphics_Threaded::QuadsSetSubset(float TlU, float TlV, float BrU, float BrV)
+{
+	m_aTexture[0].u = TlU;
+	m_aTexture[1].u = BrU;
+	m_aTexture[0].v = TlV;
+	m_aTexture[1].v = TlV;
+
+	m_aTexture[3].u = TlU;
+	m_aTexture[2].u = BrU;
+	m_aTexture[3].v = BrV;
+	m_aTexture[2].v = BrV;
+}
+
+void CGraphics_Threaded::QuadsSetSubsetFree(
+	float x0, float y0, float x1, float y1,
+	float x2, float y2, float x3, float y3, int Index)
+{
+	m_aTexture[0].u = x0;
+	m_aTexture[0].v = y0;
+	m_aTexture[1].u = x1;
+	m_aTexture[1].v = y1;
+	m_aTexture[2].u = x2;
+	m_aTexture[2].v = y2;
+	m_aTexture[3].u = x3;
+	m_aTexture[3].v = y3;
+	m_CurIndex = Index;
+}
+
+void CGraphics_Threaded::QuadsDraw(CQuadItem *pArray, int Num)
+{
+	for(int i = 0; i < Num; ++i)
+	{
+		pArray[i].m_X -= pArray[i].m_Width / 2;
+		pArray[i].m_Y -= pArray[i].m_Height / 2;
+	}
+
+	QuadsDrawTL(pArray, Num);
+}
+
+void CGraphics_Threaded::QuadsDrawTL(const CQuadItem *pArray, int Num)
+{
+	QuadsDrawTLImpl(m_aVertices, pArray, Num);
+}
+
+void CGraphics_Threaded::QuadsTex3DDrawTL(const CQuadItem *pArray, int Num)
+{
+	int CurNumVert = m_NumVertices;
+
+	int VertNum = 0;
+	if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
+	{
+		VertNum = 6;
+	}
+	else
+	{
+		VertNum = 4;
+	}
+
+	for(int i = 0; i < Num; ++i)
+	{
+		for(int n = 0; n < VertNum; ++n)
+		{
+			if(Uses2DTextureArrays())
+				m_aVerticesTex3D[CurNumVert + VertNum * i + n].m_Tex.w = (float)m_CurIndex;
+			else
+				m_aVerticesTex3D[CurNumVert + VertNum * i + n].m_Tex.w = ((float)m_CurIndex + 0.5f) / 256.f;
+		}
+	}
+
+	QuadsDrawTLImpl(m_aVerticesTex3D, pArray, Num);
+}
+
+void CGraphics_Threaded::QuadsDrawFreeform(const CFreeformItem *pArray, int Num)
+{
+	dbg_assert(m_Drawing == DRAWING_QUADS || m_Drawing == DRAWING_TRIANGLES, "called Graphics()->QuadsDrawFreeform without begin");
+
+	if((g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad) || m_Drawing == DRAWING_TRIANGLES)
+	{
+		for(int i = 0; i < Num; ++i)
+		{
+			m_aVertices[m_NumVertices + 6 * i].m_Pos.x = pArray[i].m_X0;
+			m_aVertices[m_NumVertices + 6 * i].m_Pos.y = pArray[i].m_Y0;
+			m_aVertices[m_NumVertices + 6 * i].m_Tex = m_aTexture[0];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i], 0);
+
+			m_aVertices[m_NumVertices + 6 * i + 1].m_Pos.x = pArray[i].m_X1;
+			m_aVertices[m_NumVertices + 6 * i + 1].m_Pos.y = pArray[i].m_Y1;
+			m_aVertices[m_NumVertices + 6 * i + 1].m_Tex = m_aTexture[1];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i + 1], 1);
+
+			m_aVertices[m_NumVertices + 6 * i + 2].m_Pos.x = pArray[i].m_X3;
+			m_aVertices[m_NumVertices + 6 * i + 2].m_Pos.y = pArray[i].m_Y3;
+			m_aVertices[m_NumVertices + 6 * i + 2].m_Tex = m_aTexture[3];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i + 2], 3);
+
+			m_aVertices[m_NumVertices + 6 * i + 3].m_Pos.x = pArray[i].m_X0;
+			m_aVertices[m_NumVertices + 6 * i + 3].m_Pos.y = pArray[i].m_Y0;
+			m_aVertices[m_NumVertices + 6 * i + 3].m_Tex = m_aTexture[0];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i + 3], 0);
+
+			m_aVertices[m_NumVertices + 6 * i + 4].m_Pos.x = pArray[i].m_X3;
+			m_aVertices[m_NumVertices + 6 * i + 4].m_Pos.y = pArray[i].m_Y3;
+			m_aVertices[m_NumVertices + 6 * i + 4].m_Tex = m_aTexture[3];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i + 4], 3);
+
+			m_aVertices[m_NumVertices + 6 * i + 5].m_Pos.x = pArray[i].m_X2;
+			m_aVertices[m_NumVertices + 6 * i + 5].m_Pos.y = pArray[i].m_Y2;
+			m_aVertices[m_NumVertices + 6 * i + 5].m_Tex = m_aTexture[2];
+			SetColor(&m_aVertices[m_NumVertices + 6 * i + 5], 2);
+		}
+
+		AddVertices(3 * 2 * Num);
+	}
+	else
+	{
+		for(int i = 0; i < Num; ++i)
+		{
+			m_aVertices[m_NumVertices + 4 * i].m_Pos.x = pArray[i].m_X0;
+			m_aVertices[m_NumVertices + 4 * i].m_Pos.y = pArray[i].m_Y0;
+			m_aVertices[m_NumVertices + 4 * i].m_Tex = m_aTexture[0];
+			SetColor(&m_aVertices[m_NumVertices + 4 * i], 0);
+
+			m_aVertices[m_NumVertices + 4 * i + 1].m_Pos.x = pArray[i].m_X1;
+			m_aVertices[m_NumVertices + 4 * i + 1].m_Pos.y = pArray[i].m_Y1;
+			m_aVertices[m_NumVertices + 4 * i + 1].m_Tex = m_aTexture[1];
+			SetColor(&m_aVertices[m_NumVertices + 4 * i + 1], 1);
+
+			m_aVertices[m_NumVertices + 4 * i + 2].m_Pos.x = pArray[i].m_X3;
+			m_aVertices[m_NumVertices + 4 * i + 2].m_Pos.y = pArray[i].m_Y3;
+			m_aVertices[m_NumVertices + 4 * i + 2].m_Tex = m_aTexture[3];
+			SetColor(&m_aVertices[m_NumVertices + 4 * i + 2], 3);
+
+			m_aVertices[m_NumVertices + 4 * i + 3].m_Pos.x = pArray[i].m_X2;
+			m_aVertices[m_NumVertices + 4 * i + 3].m_Pos.y = pArray[i].m_Y2;
+			m_aVertices[m_NumVertices + 4 * i + 3].m_Tex = m_aTexture[2];
+			SetColor(&m_aVertices[m_NumVertices + 4 * i + 3], 2);
+		}
+
+		AddVertices(4 * Num);
+	}
+}
+
+void CGraphics_Threaded::QuadsText(float x, float y, float Size, const char *pText)
+{
+	float StartX = x;
+
+	while(*pText)
+	{
+		char c = *pText;
+		pText++;
+
+		if(c == '\n')
+		{
+			x = StartX;
+			y += Size;
+		}
+		else
+		{
+			QuadsSetSubset(
+				(c % 16) / 16.0f,
+				(c / 16) / 16.0f,
+				(c % 16) / 16.0f + 1.0f / 16.0f,
+				(c / 16) / 16.0f + 1.0f / 16.0f);
+
+			CQuadItem QuadItem(x, y, Size, Size);
+			QuadsDrawTL(&QuadItem, 1);
+			x += Size / 2;
+		}
+	}
+}
+
+void CGraphics_Threaded::DrawRectExt(float x, float y, float w, float h, float r, int Corners)
+{
+	const int NumSegments = 8;
+	const float SegmentsAngle = pi / 2 / NumSegments;
+	IGraphics::CFreeformItem aFreeform[NumSegments * 4];
+	size_t NumItems = 0;
+
+	for(int i = 0; i < NumSegments; i += 2)
+	{
+		float a1 = i * SegmentsAngle;
+		float a2 = (i + 1) * SegmentsAngle;
+		float a3 = (i + 2) * SegmentsAngle;
+		float Ca1 = std::cos(a1);
+		float Ca2 = std::cos(a2);
+		float Ca3 = std::cos(a3);
+		float Sa1 = std::sin(a1);
+		float Sa2 = std::sin(a2);
+		float Sa3 = std::sin(a3);
+
+		if(Corners & CORNER_TL)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + r, y + r,
+				x + (1 - Ca1) * r, y + (1 - Sa1) * r,
+				x + (1 - Ca3) * r, y + (1 - Sa3) * r,
+				x + (1 - Ca2) * r, y + (1 - Sa2) * r);
+
+		if(Corners & CORNER_TR)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + w - r, y + r,
+				x + w - r + Ca1 * r, y + (1 - Sa1) * r,
+				x + w - r + Ca3 * r, y + (1 - Sa3) * r,
+				x + w - r + Ca2 * r, y + (1 - Sa2) * r);
+
+		if(Corners & CORNER_BL)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + r, y + h - r,
+				x + (1 - Ca1) * r, y + h - r + Sa1 * r,
+				x + (1 - Ca3) * r, y + h - r + Sa3 * r,
+				x + (1 - Ca2) * r, y + h - r + Sa2 * r);
+
+		if(Corners & CORNER_BR)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + w - r, y + h - r,
+				x + w - r + Ca1 * r, y + h - r + Sa1 * r,
+				x + w - r + Ca3 * r, y + h - r + Sa3 * r,
+				x + w - r + Ca2 * r, y + h - r + Sa2 * r);
+	}
+	QuadsDrawFreeform(aFreeform, NumItems);
+
+	CQuadItem aQuads[9];
+	NumItems = 0;
+	aQuads[NumItems++] = CQuadItem(x + r, y + r, w - r * 2, h - r * 2); // center
+	aQuads[NumItems++] = CQuadItem(x + r, y, w - r * 2, r); // top
+	aQuads[NumItems++] = CQuadItem(x + r, y + h - r, w - r * 2, r); // bottom
+	aQuads[NumItems++] = CQuadItem(x, y + r, r, h - r * 2); // left
+	aQuads[NumItems++] = CQuadItem(x + w - r, y + r, r, h - r * 2); // right
+
+	if(!(Corners & CORNER_TL))
+		aQuads[NumItems++] = CQuadItem(x, y, r, r);
+	if(!(Corners & CORNER_TR))
+		aQuads[NumItems++] = CQuadItem(x + w, y, -r, r);
+	if(!(Corners & CORNER_BL))
+		aQuads[NumItems++] = CQuadItem(x, y + h, r, -r);
+	if(!(Corners & CORNER_BR))
+		aQuads[NumItems++] = CQuadItem(x + w, y + h, -r, -r);
+
+	QuadsDrawTL(aQuads, NumItems);
+}
+
+void CGraphics_Threaded::DrawRectExt4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, float r, int Corners)
+{
+	if(Corners == 0 || r == 0.0f)
+	{
+		SetColor4(ColorTopLeft, ColorTopRight, ColorBottomLeft, ColorBottomRight);
+		CQuadItem ItemQ = CQuadItem(x, y, w, h);
+		QuadsDrawTL(&ItemQ, 1);
+		return;
+	}
+
+	const int NumSegments = 8;
+	const float SegmentsAngle = pi / 2 / NumSegments;
+	for(int i = 0; i < NumSegments; i += 2)
+	{
+		float a1 = i * SegmentsAngle;
+		float a2 = (i + 1) * SegmentsAngle;
+		float a3 = (i + 2) * SegmentsAngle;
+		float Ca1 = std::cos(a1);
+		float Ca2 = std::cos(a2);
+		float Ca3 = std::cos(a3);
+		float Sa1 = std::sin(a1);
+		float Sa2 = std::sin(a2);
+		float Sa3 = std::sin(a3);
+
+		if(Corners & CORNER_TL)
+		{
+			SetColor(ColorTopLeft);
+			IGraphics::CFreeformItem ItemF = IGraphics::CFreeformItem(
+				x + r, y + r,
+				x + (1 - Ca1) * r, y + (1 - Sa1) * r,
+				x + (1 - Ca3) * r, y + (1 - Sa3) * r,
+				x + (1 - Ca2) * r, y + (1 - Sa2) * r);
+			QuadsDrawFreeform(&ItemF, 1);
+		}
+
+		if(Corners & CORNER_TR)
+		{
+			SetColor(ColorTopRight);
+			IGraphics::CFreeformItem ItemF = IGraphics::CFreeformItem(
+				x + w - r, y + r,
+				x + w - r + Ca1 * r, y + (1 - Sa1) * r,
+				x + w - r + Ca3 * r, y + (1 - Sa3) * r,
+				x + w - r + Ca2 * r, y + (1 - Sa2) * r);
+			QuadsDrawFreeform(&ItemF, 1);
+		}
+
+		if(Corners & CORNER_BL)
+		{
+			SetColor(ColorBottomLeft);
+			IGraphics::CFreeformItem ItemF = IGraphics::CFreeformItem(
+				x + r, y + h - r,
+				x + (1 - Ca1) * r, y + h - r + Sa1 * r,
+				x + (1 - Ca3) * r, y + h - r + Sa3 * r,
+				x + (1 - Ca2) * r, y + h - r + Sa2 * r);
+			QuadsDrawFreeform(&ItemF, 1);
+		}
+
+		if(Corners & CORNER_BR)
+		{
+			SetColor(ColorBottomRight);
+			IGraphics::CFreeformItem ItemF = IGraphics::CFreeformItem(
+				x + w - r, y + h - r,
+				x + w - r + Ca1 * r, y + h - r + Sa1 * r,
+				x + w - r + Ca3 * r, y + h - r + Sa3 * r,
+				x + w - r + Ca2 * r, y + h - r + Sa2 * r);
+			QuadsDrawFreeform(&ItemF, 1);
+		}
+	}
+
+	SetColor4(ColorTopLeft, ColorTopRight, ColorBottomLeft, ColorBottomRight);
+	CQuadItem ItemQ = CQuadItem(x + r, y + r, w - r * 2, h - r * 2); // center
+	QuadsDrawTL(&ItemQ, 1);
+
+	SetColor4(ColorTopLeft, ColorTopRight, ColorTopLeft, ColorTopRight);
+	ItemQ = CQuadItem(x + r, y, w - r * 2, r); // top
+	QuadsDrawTL(&ItemQ, 1);
+
+	SetColor4(ColorBottomLeft, ColorBottomRight, ColorBottomLeft, ColorBottomRight);
+	ItemQ = CQuadItem(x + r, y + h - r, w - r * 2, r); // bottom
+	QuadsDrawTL(&ItemQ, 1);
+
+	SetColor4(ColorTopLeft, ColorTopLeft, ColorBottomLeft, ColorBottomLeft);
+	ItemQ = CQuadItem(x, y + r, r, h - r * 2); // left
+	QuadsDrawTL(&ItemQ, 1);
+
+	SetColor4(ColorTopRight, ColorTopRight, ColorBottomRight, ColorBottomRight);
+	ItemQ = CQuadItem(x + w - r, y + r, r, h - r * 2); // right
+	QuadsDrawTL(&ItemQ, 1);
+
+	if(!(Corners & CORNER_TL))
+	{
+		SetColor(ColorTopLeft);
+		ItemQ = CQuadItem(x, y, r, r);
+		QuadsDrawTL(&ItemQ, 1);
+	}
+
+	if(!(Corners & CORNER_TR))
+	{
+		SetColor(ColorTopRight);
+		ItemQ = CQuadItem(x + w, y, -r, r);
+		QuadsDrawTL(&ItemQ, 1);
+	}
+
+	if(!(Corners & CORNER_BL))
+	{
+		SetColor(ColorBottomLeft);
+		ItemQ = CQuadItem(x, y + h, r, -r);
+		QuadsDrawTL(&ItemQ, 1);
+	}
+
+	if(!(Corners & CORNER_BR))
+	{
+		SetColor(ColorBottomRight);
+		ItemQ = CQuadItem(x + w, y + h, -r, -r);
+		QuadsDrawTL(&ItemQ, 1);
+	}
+}
+
+int CGraphics_Threaded::CreateRectQuadContainer(float x, float y, float w, float h, float r, int Corners)
+{
+	int ContainerIndex = CreateQuadContainer(false);
+
+	if(Corners == 0 || r == 0.0f)
+	{
+		CQuadItem ItemQ = CQuadItem(x, y, w, h);
+		QuadContainerAddQuads(ContainerIndex, &ItemQ, 1);
+		QuadContainerUpload(ContainerIndex);
+		QuadContainerChangeAutomaticUpload(ContainerIndex, true);
+		return ContainerIndex;
+	}
+
+	const int NumSegments = 8;
+	const float SegmentsAngle = pi / 2 / NumSegments;
+	IGraphics::CFreeformItem aFreeform[NumSegments * 4];
+	size_t NumItems = 0;
+
+	for(int i = 0; i < NumSegments; i += 2)
+	{
+		float a1 = i * SegmentsAngle;
+		float a2 = (i + 1) * SegmentsAngle;
+		float a3 = (i + 2) * SegmentsAngle;
+		float Ca1 = std::cos(a1);
+		float Ca2 = std::cos(a2);
+		float Ca3 = std::cos(a3);
+		float Sa1 = std::sin(a1);
+		float Sa2 = std::sin(a2);
+		float Sa3 = std::sin(a3);
+
+		if(Corners & CORNER_TL)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + r, y + r,
+				x + (1 - Ca1) * r, y + (1 - Sa1) * r,
+				x + (1 - Ca3) * r, y + (1 - Sa3) * r,
+				x + (1 - Ca2) * r, y + (1 - Sa2) * r);
+
+		if(Corners & CORNER_TR)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + w - r, y + r,
+				x + w - r + Ca1 * r, y + (1 - Sa1) * r,
+				x + w - r + Ca3 * r, y + (1 - Sa3) * r,
+				x + w - r + Ca2 * r, y + (1 - Sa2) * r);
+
+		if(Corners & CORNER_BL)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + r, y + h - r,
+				x + (1 - Ca1) * r, y + h - r + Sa1 * r,
+				x + (1 - Ca3) * r, y + h - r + Sa3 * r,
+				x + (1 - Ca2) * r, y + h - r + Sa2 * r);
+
+		if(Corners & CORNER_BR)
+			aFreeform[NumItems++] = IGraphics::CFreeformItem(
+				x + w - r, y + h - r,
+				x + w - r + Ca1 * r, y + h - r + Sa1 * r,
+				x + w - r + Ca3 * r, y + h - r + Sa3 * r,
+				x + w - r + Ca2 * r, y + h - r + Sa2 * r);
+	}
+
+	if(NumItems > 0)
+		QuadContainerAddQuads(ContainerIndex, aFreeform, NumItems);
+
+	CQuadItem aQuads[9];
+	NumItems = 0;
+	aQuads[NumItems++] = CQuadItem(x + r, y + r, w - r * 2, h - r * 2); // center
+	aQuads[NumItems++] = CQuadItem(x + r, y, w - r * 2, r); // top
+	aQuads[NumItems++] = CQuadItem(x + r, y + h - r, w - r * 2, r); // bottom
+	aQuads[NumItems++] = CQuadItem(x, y + r, r, h - r * 2); // left
+	aQuads[NumItems++] = CQuadItem(x + w - r, y + r, r, h - r * 2); // right
+
+	if(!(Corners & CORNER_TL))
+		aQuads[NumItems++] = CQuadItem(x, y, r, r);
+	if(!(Corners & CORNER_TR))
+		aQuads[NumItems++] = CQuadItem(x + w, y, -r, r);
+	if(!(Corners & CORNER_BL))
+		aQuads[NumItems++] = CQuadItem(x, y + h, r, -r);
+	if(!(Corners & CORNER_BR))
+		aQuads[NumItems++] = CQuadItem(x + w, y + h, -r, -r);
+
+	if(NumItems > 0)
+		QuadContainerAddQuads(ContainerIndex, aQuads, NumItems);
+
+	QuadContainerUpload(ContainerIndex);
+	QuadContainerChangeAutomaticUpload(ContainerIndex, true);
+
+	return ContainerIndex;
+}
+
+void CGraphics_Threaded::DrawRect(float x, float y, float w, float h, ColorRGBA Color, int Corners, float Rounding)
+{
+	TextureClear();
+	QuadsBegin();
+	SetColor(Color);
+	DrawRectExt(x, y, w, h, Rounding, Corners);
+	QuadsEnd();
+}
+
+void CGraphics_Threaded::DrawRect4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding)
+{
+	TextureClear();
+	QuadsBegin();
+	DrawRectExt4(x, y, w, h, ColorTopLeft, ColorTopRight, ColorBottomLeft, ColorBottomRight, Rounding, Corners);
+	QuadsEnd();
+}
+
+void CGraphics_Threaded::DrawCircle(float CenterX, float CenterY, float Radius, int Segments)
+{
+	IGraphics::CFreeformItem aItems[32];
+	size_t NumItems = 0;
+	const float SegmentsAngle = 2 * pi / Segments;
+	for(int i = 0; i < Segments; i += 2)
+	{
+		const float a1 = i * SegmentsAngle;
+		const float a2 = (i + 1) * SegmentsAngle;
+		const float a3 = (i + 2) * SegmentsAngle;
+		aItems[NumItems++] = IGraphics::CFreeformItem(
+			CenterX, CenterY,
+			CenterX + std::cos(a1) * Radius, CenterY + std::sin(a1) * Radius,
+			CenterX + std::cos(a3) * Radius, CenterY + std::sin(a3) * Radius,
+			CenterX + std::cos(a2) * Radius, CenterY + std::sin(a2) * Radius);
+		if(NumItems == std::size(aItems))
+		{
+			QuadsDrawFreeform(aItems, std::size(aItems));
+			NumItems = 0;
+		}
+	}
+	if(NumItems)
+		QuadsDrawFreeform(aItems, NumItems);
+}
+
+void CGraphics_Threaded::RenderTileLayer(int BufferContainerIndex, const ColorRGBA &Color, char **pOffsets, unsigned int *pIndicedVertexDrawNum, size_t NumIndicesOffset)
+{
+	if(NumIndicesOffset == 0)
+		return;
+
+	// add the VertexArrays and draw
+	CCommandBuffer::SCommand_RenderTileLayer Cmd;
+	Cmd.m_State = m_State;
+	Cmd.m_IndicesDrawNum = NumIndicesOffset;
+	Cmd.m_BufferContainerIndex = BufferContainerIndex;
+	Cmd.m_Color = Color;
+
+	void *pData = m_pCommandBuffer->AllocData((sizeof(char *) + sizeof(unsigned int)) * NumIndicesOffset);
+	if(pData == 0x0)
+	{
+		// kick command buffer and try again
+		KickCommandBuffer();
+
+		pData = m_pCommandBuffer->AllocData((sizeof(char *) + sizeof(unsigned int)) * NumIndicesOffset);
+		if(pData == 0x0)
+		{
+			dbg_msg("graphics", "failed to allocate data for vertices");
+			return;
+		}
+	}
+	Cmd.m_pIndicesOffsets = (char **)pData;
+	Cmd.m_pDrawCount = (unsigned int *)(((char *)pData) + (sizeof(char *) * NumIndicesOffset));
+
+	AddCmd(Cmd, [&] {
+		pData = m_pCommandBuffer->AllocData((sizeof(char *) + sizeof(unsigned int)) * NumIndicesOffset);
+		if(pData == nullptr)
+			return false;
+		Cmd.m_pIndicesOffsets = (char **)pData;
+		Cmd.m_pDrawCount = (unsigned int *)(((char *)pData) + (sizeof(char *) * NumIndicesOffset));
+		return true;
+	});
+
+	mem_copy(Cmd.m_pIndicesOffsets, pOffsets, sizeof(char *) * NumIndicesOffset);
+	mem_copy(Cmd.m_pDrawCount, pIndicedVertexDrawNum, sizeof(unsigned int) * NumIndicesOffset);
+
+	m_pCommandBuffer->AddRenderCalls(NumIndicesOffset);
+	// todo max indices group check!!
+}
+
+void CGraphics_Threaded::RenderBorderTiles(int BufferContainerIndex, const ColorRGBA &Color, char *pIndexBufferOffset, const vec2 &Offset, const vec2 &Scale, uint32_t DrawNum)
+{
+	if(DrawNum == 0)
+		return;
+	// Draw a border tile a lot of times
+	CCommandBuffer::SCommand_RenderBorderTile Cmd;
+	Cmd.m_State = m_State;
+	Cmd.m_DrawNum = DrawNum;
+	Cmd.m_BufferContainerIndex = BufferContainerIndex;
+	Cmd.m_Color = Color;
+
+	Cmd.m_pIndicesOffset = pIndexBufferOffset;
+
+	Cmd.m_Offset = Offset;
+	Cmd.m_Scale = Scale;
+
+	AddCmd(Cmd);
+
+	m_pCommandBuffer->AddRenderCalls(1);
+}
+
+void CGraphics_Threaded::RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo *pQuadInfo, size_t QuadNum, int QuadOffset)
+{
+	if(QuadNum == 0)
+		return;
+
+	// add the VertexArrays and draw
+	CCommandBuffer::SCommand_RenderQuadLayer Cmd;
+	Cmd.m_State = m_State;
+	Cmd.m_QuadNum = QuadNum;
+	Cmd.m_QuadOffset = QuadOffset;
+	Cmd.m_BufferContainerIndex = BufferContainerIndex;
+	Cmd.m_pQuadInfo = (SQuadRenderInfo *)AllocCommandBufferData(Cmd.m_QuadNum * sizeof(SQuadRenderInfo));
+
+	AddCmd(Cmd, [&] {
+		Cmd.m_pQuadInfo = (SQuadRenderInfo *)m_pCommandBuffer->AllocData(QuadNum * sizeof(SQuadRenderInfo));
+		return Cmd.m_pQuadInfo != nullptr;
+	});
+
+	mem_copy(Cmd.m_pQuadInfo, pQuadInfo, sizeof(SQuadRenderInfo) * QuadNum);
+
+	m_pCommandBuffer->AddRenderCalls(((QuadNum - 1) / gs_GraphicsMaxQuadsRenderCount) + 1);
+}
+
+void CGraphics_Threaded::RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor)
+{
+	if(BufferContainerIndex == -1)
+		return;
+
+	CCommandBuffer::SCommand_RenderText Cmd;
+	Cmd.m_State = m_State;
+	Cmd.m_BufferContainerIndex = BufferContainerIndex;
+	Cmd.m_DrawNum = TextQuadNum * 6;
+	Cmd.m_TextureSize = TextureSize;
+	Cmd.m_TextTextureIndex = TextureTextIndex;
+	Cmd.m_TextOutlineTextureIndex = TextureTextOutlineIndex;
+	Cmd.m_TextColor = TextColor;
+	Cmd.m_TextOutlineColor = TextOutlineColor;
+
+	AddCmd(Cmd);
+
+	m_pCommandBuffer->AddRenderCalls(1);
+}
+
+int CGraphics_Threaded::CreateQuadContainer(bool AutomaticUpload)
+{
+	int Index = -1;
+	if(m_FirstFreeQuadContainer == -1)
+	{
+		Index = m_vQuadContainers.size();
+		m_vQuadContainers.emplace_back(AutomaticUpload);
+	}
+	else
+	{
+		Index = m_FirstFreeQuadContainer;
+		m_FirstFreeQuadContainer = m_vQuadContainers[Index].m_FreeIndex;
+		m_vQuadContainers[Index].m_FreeIndex = Index;
+	}
+
+	return Index;
+}
+
+void CGraphics_Threaded::QuadContainerChangeAutomaticUpload(int ContainerIndex, bool AutomaticUpload)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+	Container.m_AutomaticUpload = AutomaticUpload;
+}
+
+void CGraphics_Threaded::QuadContainerUpload(int ContainerIndex)
+{
+	if(IsQuadContainerBufferingEnabled())
+	{
+		SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+		if(!Container.m_vQuads.empty())
+		{
+			if(Container.m_QuadBufferObjectIndex == -1)
+			{
+				size_t UploadDataSize = Container.m_vQuads.size() * sizeof(SQuadContainer::SQuad);
+				Container.m_QuadBufferObjectIndex = CreateBufferObject(UploadDataSize, Container.m_vQuads.data(), 0);
+			}
+			else
+			{
+				size_t UploadDataSize = Container.m_vQuads.size() * sizeof(SQuadContainer::SQuad);
+				RecreateBufferObject(Container.m_QuadBufferObjectIndex, UploadDataSize, Container.m_vQuads.data(), 0);
+			}
+
+			if(Container.m_QuadBufferContainerIndex == -1)
+			{
+				SBufferContainerInfo Info;
+				Info.m_Stride = sizeof(CCommandBuffer::SVertex);
+				Info.m_VertBufferBindingIndex = Container.m_QuadBufferObjectIndex;
+
+				Info.m_vAttributes.emplace_back();
+				SBufferContainerInfo::SAttribute *pAttr = &Info.m_vAttributes.back();
+				pAttr->m_DataTypeCount = 2;
+				pAttr->m_FuncType = 0;
+				pAttr->m_Normalized = false;
+				pAttr->m_pOffset = 0;
+				pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+				Info.m_vAttributes.emplace_back();
+				pAttr = &Info.m_vAttributes.back();
+				pAttr->m_DataTypeCount = 2;
+				pAttr->m_FuncType = 0;
+				pAttr->m_Normalized = false;
+				pAttr->m_pOffset = (void *)(sizeof(float) * 2);
+				pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+				Info.m_vAttributes.emplace_back();
+				pAttr = &Info.m_vAttributes.back();
+				pAttr->m_DataTypeCount = 4;
+				pAttr->m_FuncType = 0;
+				pAttr->m_Normalized = true;
+				pAttr->m_pOffset = (void *)(sizeof(float) * 2 + sizeof(float) * 2);
+				pAttr->m_Type = GRAPHICS_TYPE_UNSIGNED_BYTE;
+
+				Container.m_QuadBufferContainerIndex = CreateBufferContainer(&Info);
+			}
+		}
+	}
+}
+
+int CGraphics_Threaded::QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+
+	if((int)Container.m_vQuads.size() > Num + CCommandBuffer::CCommandBuffer::MAX_VERTICES)
+		return -1;
+
+	int RetOff = (int)Container.m_vQuads.size();
+
+	for(int i = 0; i < Num; ++i)
+	{
+		Container.m_vQuads.emplace_back();
+		SQuadContainer::SQuad &Quad = Container.m_vQuads.back();
+
+		Quad.m_aVertices[0].m_Pos.x = pArray[i].m_X;
+		Quad.m_aVertices[0].m_Pos.y = pArray[i].m_Y;
+		Quad.m_aVertices[0].m_Tex = m_aTexture[0];
+		SetColor(&Quad.m_aVertices[0], 0);
+
+		Quad.m_aVertices[1].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+		Quad.m_aVertices[1].m_Pos.y = pArray[i].m_Y;
+		Quad.m_aVertices[1].m_Tex = m_aTexture[1];
+		SetColor(&Quad.m_aVertices[1], 1);
+
+		Quad.m_aVertices[2].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+		Quad.m_aVertices[2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+		Quad.m_aVertices[2].m_Tex = m_aTexture[2];
+		SetColor(&Quad.m_aVertices[2], 2);
+
+		Quad.m_aVertices[3].m_Pos.x = pArray[i].m_X;
+		Quad.m_aVertices[3].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+		Quad.m_aVertices[3].m_Tex = m_aTexture[3];
+		SetColor(&Quad.m_aVertices[3], 3);
+
+		if(m_Rotation != 0)
+		{
+			CCommandBuffer::SPoint Center;
+			Center.x = pArray[i].m_X + pArray[i].m_Width / 2;
+			Center.y = pArray[i].m_Y + pArray[i].m_Height / 2;
+
+			Rotate(Center, Quad.m_aVertices, 4);
+		}
+	}
+
+	if(Container.m_AutomaticUpload)
+		QuadContainerUpload(ContainerIndex);
+
+	return RetOff;
+}
+
+int CGraphics_Threaded::QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+
+	if((int)Container.m_vQuads.size() > Num + CCommandBuffer::CCommandBuffer::MAX_VERTICES)
+		return -1;
+
+	int RetOff = (int)Container.m_vQuads.size();
+
+	for(int i = 0; i < Num; ++i)
+	{
+		Container.m_vQuads.emplace_back();
+		SQuadContainer::SQuad &Quad = Container.m_vQuads.back();
+
+		Quad.m_aVertices[0].m_Pos.x = pArray[i].m_X0;
+		Quad.m_aVertices[0].m_Pos.y = pArray[i].m_Y0;
+		Quad.m_aVertices[0].m_Tex = m_aTexture[0];
+		SetColor(&Quad.m_aVertices[0], 0);
+
+		Quad.m_aVertices[1].m_Pos.x = pArray[i].m_X1;
+		Quad.m_aVertices[1].m_Pos.y = pArray[i].m_Y1;
+		Quad.m_aVertices[1].m_Tex = m_aTexture[1];
+		SetColor(&Quad.m_aVertices[1], 1);
+
+		Quad.m_aVertices[2].m_Pos.x = pArray[i].m_X3;
+		Quad.m_aVertices[2].m_Pos.y = pArray[i].m_Y3;
+		Quad.m_aVertices[2].m_Tex = m_aTexture[3];
+		SetColor(&Quad.m_aVertices[2], 3);
+
+		Quad.m_aVertices[3].m_Pos.x = pArray[i].m_X2;
+		Quad.m_aVertices[3].m_Pos.y = pArray[i].m_Y2;
+		Quad.m_aVertices[3].m_Tex = m_aTexture[2];
+		SetColor(&Quad.m_aVertices[3], 2);
+	}
+
+	if(Container.m_AutomaticUpload)
+		QuadContainerUpload(ContainerIndex);
+
+	return RetOff;
+}
+
+void CGraphics_Threaded::QuadContainerReset(int ContainerIndex)
+{
+	if(ContainerIndex == -1)
+		return;
+
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+	if(IsQuadContainerBufferingEnabled())
+		DeleteBufferContainer(Container.m_QuadBufferContainerIndex, true);
+	Container.m_vQuads.clear();
+	Container.m_QuadBufferObjectIndex = -1;
+}
+
+void CGraphics_Threaded::DeleteQuadContainer(int &ContainerIndex)
+{
+	if(ContainerIndex == -1)
+		return;
+
+	QuadContainerReset(ContainerIndex);
+
+	// also clear the container index
+	m_vQuadContainers[ContainerIndex].m_FreeIndex = m_FirstFreeQuadContainer;
+	m_FirstFreeQuadContainer = ContainerIndex;
+	ContainerIndex = -1;
+}
+
+void CGraphics_Threaded::RenderQuadContainer(int ContainerIndex, int QuadDrawNum)
+{
+	RenderQuadContainer(ContainerIndex, 0, QuadDrawNum);
+}
+
+void CGraphics_Threaded::RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum, bool ChangeWrapMode)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+
+	if(QuadDrawNum == -1)
+		QuadDrawNum = (int)Container.m_vQuads.size() - QuadOffset;
+
+	if((int)Container.m_vQuads.size() < QuadOffset + QuadDrawNum || QuadDrawNum == 0)
+		return;
+
+	if(IsQuadContainerBufferingEnabled())
+	{
+		if(Container.m_QuadBufferContainerIndex == -1)
+			return;
+
+		if(ChangeWrapMode)
+			WrapClamp();
+
+		CCommandBuffer::SCommand_RenderQuadContainer Cmd;
+		Cmd.m_State = m_State;
+		Cmd.m_DrawNum = (unsigned int)QuadDrawNum * 6;
+		Cmd.m_pOffset = (void *)(QuadOffset * 6 * sizeof(unsigned int));
+		Cmd.m_BufferContainerIndex = Container.m_QuadBufferContainerIndex;
+
+		AddCmd(Cmd);
+		m_pCommandBuffer->AddRenderCalls(1);
+	}
+	else
+	{
+		if(g_Config.m_GfxQuadAsTriangle)
+		{
+			for(int i = 0; i < QuadDrawNum; ++i)
+			{
+				SQuadContainer::SQuad &Quad = Container.m_vQuads[QuadOffset + i];
+				m_aVertices[i * 6] = Quad.m_aVertices[0];
+				m_aVertices[i * 6 + 1] = Quad.m_aVertices[1];
+				m_aVertices[i * 6 + 2] = Quad.m_aVertices[2];
+				m_aVertices[i * 6 + 3] = Quad.m_aVertices[0];
+				m_aVertices[i * 6 + 4] = Quad.m_aVertices[2];
+				m_aVertices[i * 6 + 5] = Quad.m_aVertices[3];
+				m_NumVertices += 6;
+			}
+		}
+		else
+		{
+			mem_copy(m_aVertices, &Container.m_vQuads[QuadOffset], sizeof(CCommandBuffer::SVertex) * 4 * QuadDrawNum);
+			m_NumVertices += 4 * QuadDrawNum;
+		}
+		m_Drawing = DRAWING_QUADS;
+		if(ChangeWrapMode)
+			WrapClamp();
+		FlushVertices(false);
+		m_Drawing = 0;
+	}
+	WrapNormal();
+}
+
+void CGraphics_Threaded::RenderQuadContainerEx(int ContainerIndex, int QuadOffset, int QuadDrawNum, float X, float Y, float ScaleX, float ScaleY)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+
+	if((int)Container.m_vQuads.size() < QuadOffset + 1)
+		return;
+
+	if(QuadDrawNum == -1)
+		QuadDrawNum = (int)Container.m_vQuads.size() - QuadOffset;
+
+	if(IsQuadContainerBufferingEnabled())
+	{
+		if(Container.m_QuadBufferContainerIndex == -1)
+			return;
+
+		SQuadContainer::SQuad &Quad = Container.m_vQuads[QuadOffset];
+		CCommandBuffer::SCommand_RenderQuadContainerEx Cmd;
+
+		WrapClamp();
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+		MapScreen((ScreenX0 - X) / ScaleX, (ScreenY0 - Y) / ScaleY, (ScreenX1 - X) / ScaleX, (ScreenY1 - Y) / ScaleY);
+		Cmd.m_State = m_State;
+		MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+
+		Cmd.m_DrawNum = QuadDrawNum * 6;
+		Cmd.m_pOffset = (void *)(QuadOffset * 6 * sizeof(unsigned int));
+		Cmd.m_BufferContainerIndex = Container.m_QuadBufferContainerIndex;
+
+		Cmd.m_VertexColor.r = (float)m_aColor[0].r / 255.f;
+		Cmd.m_VertexColor.g = (float)m_aColor[0].g / 255.f;
+		Cmd.m_VertexColor.b = (float)m_aColor[0].b / 255.f;
+		Cmd.m_VertexColor.a = (float)m_aColor[0].a / 255.f;
+
+		Cmd.m_Rotation = m_Rotation;
+
+		// rotate before positioning
+		Cmd.m_Center.x = Quad.m_aVertices[0].m_Pos.x + (Quad.m_aVertices[1].m_Pos.x - Quad.m_aVertices[0].m_Pos.x) / 2.f;
+		Cmd.m_Center.y = Quad.m_aVertices[0].m_Pos.y + (Quad.m_aVertices[2].m_Pos.y - Quad.m_aVertices[0].m_Pos.y) / 2.f;
+
+		AddCmd(Cmd);
+		m_pCommandBuffer->AddRenderCalls(1);
+	}
+	else
+	{
+		if(g_Config.m_GfxQuadAsTriangle)
+		{
+			for(int i = 0; i < QuadDrawNum; ++i)
+			{
+				SQuadContainer::SQuad &Quad = Container.m_vQuads[QuadOffset + i];
+				m_aVertices[i * 6 + 0] = Quad.m_aVertices[0];
+				m_aVertices[i * 6 + 1] = Quad.m_aVertices[1];
+				m_aVertices[i * 6 + 2] = Quad.m_aVertices[2];
+				m_aVertices[i * 6 + 3] = Quad.m_aVertices[0];
+				m_aVertices[i * 6 + 4] = Quad.m_aVertices[2];
+				m_aVertices[i * 6 + 5] = Quad.m_aVertices[3];
+
+				for(int n = 0; n < 6; ++n)
+				{
+					m_aVertices[i * 6 + n].m_Pos.x *= ScaleX;
+					m_aVertices[i * 6 + n].m_Pos.y *= ScaleY;
+
+					SetColor(&m_aVertices[i * 6 + n], 0);
+				}
+
+				if(m_Rotation != 0)
+				{
+					CCommandBuffer::SPoint Center;
+					Center.x = m_aVertices[i * 6 + 0].m_Pos.x + (m_aVertices[i * 6 + 1].m_Pos.x - m_aVertices[i * 6 + 0].m_Pos.x) / 2.f;
+					Center.y = m_aVertices[i * 6 + 0].m_Pos.y + (m_aVertices[i * 6 + 2].m_Pos.y - m_aVertices[i * 6 + 0].m_Pos.y) / 2.f;
+
+					Rotate(Center, &m_aVertices[i * 6 + 0], 6);
+				}
+
+				for(int n = 0; n < 6; ++n)
+				{
+					m_aVertices[i * 6 + n].m_Pos.x += X;
+					m_aVertices[i * 6 + n].m_Pos.y += Y;
+				}
+				m_NumVertices += 6;
+			}
+		}
+		else
+		{
+			mem_copy(m_aVertices, &Container.m_vQuads[QuadOffset], sizeof(CCommandBuffer::SVertex) * 4 * QuadDrawNum);
+			for(int i = 0; i < QuadDrawNum; ++i)
+			{
+				for(int n = 0; n < 4; ++n)
+				{
+					m_aVertices[i * 4 + n].m_Pos.x *= ScaleX;
+					m_aVertices[i * 4 + n].m_Pos.y *= ScaleY;
+					SetColor(&m_aVertices[i * 4 + n], 0);
+				}
+
+				if(m_Rotation != 0)
+				{
+					CCommandBuffer::SPoint Center;
+					Center.x = m_aVertices[i * 4 + 0].m_Pos.x + (m_aVertices[i * 4 + 1].m_Pos.x - m_aVertices[i * 4 + 0].m_Pos.x) / 2.f;
+					Center.y = m_aVertices[i * 4 + 0].m_Pos.y + (m_aVertices[i * 4 + 2].m_Pos.y - m_aVertices[i * 4 + 0].m_Pos.y) / 2.f;
+
+					Rotate(Center, &m_aVertices[i * 4 + 0], 4);
+				}
+
+				for(int n = 0; n < 4; ++n)
+				{
+					m_aVertices[i * 4 + n].m_Pos.x += X;
+					m_aVertices[i * 4 + n].m_Pos.y += Y;
+				}
+				m_NumVertices += 4;
+			}
+		}
+		m_Drawing = DRAWING_QUADS;
+		WrapClamp();
+		FlushVertices(false);
+		m_Drawing = 0;
+	}
+	WrapNormal();
+}
+
+void CGraphics_Threaded::RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX, float ScaleY)
+{
+	RenderQuadContainerEx(ContainerIndex, QuadOffset, 1, X, Y, ScaleX, ScaleY);
+}
+
+void CGraphics_Threaded::RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo)
+{
+	SQuadContainer &Container = m_vQuadContainers[ContainerIndex];
+
+	if(DrawCount == 0)
+		return;
+
+	if(IsQuadContainerBufferingEnabled())
+	{
+		if(Container.m_QuadBufferContainerIndex == -1)
+			return;
+
+		WrapClamp();
+		SQuadContainer::SQuad &Quad = Container.m_vQuads[0];
+		CCommandBuffer::SCommand_RenderQuadContainerAsSpriteMultiple Cmd;
+
+		Cmd.m_State = m_State;
+
+		Cmd.m_DrawNum = 1 * 6;
+		Cmd.m_DrawCount = DrawCount;
+		Cmd.m_pOffset = (void *)(QuadOffset * 6 * sizeof(unsigned int));
+		Cmd.m_BufferContainerIndex = Container.m_QuadBufferContainerIndex;
+
+		Cmd.m_VertexColor.r = (float)m_aColor[0].r / 255.f;
+		Cmd.m_VertexColor.g = (float)m_aColor[0].g / 255.f;
+		Cmd.m_VertexColor.b = (float)m_aColor[0].b / 255.f;
+		Cmd.m_VertexColor.a = (float)m_aColor[0].a / 255.f;
+
+		// rotate before positioning
+		Cmd.m_Center.x = Quad.m_aVertices[0].m_Pos.x + (Quad.m_aVertices[1].m_Pos.x - Quad.m_aVertices[0].m_Pos.x) / 2.f;
+		Cmd.m_Center.y = Quad.m_aVertices[0].m_Pos.y + (Quad.m_aVertices[2].m_Pos.y - Quad.m_aVertices[0].m_Pos.y) / 2.f;
+
+		Cmd.m_pRenderInfo = (IGraphics::SRenderSpriteInfo *)m_pCommandBuffer->AllocData(sizeof(IGraphics::SRenderSpriteInfo) * DrawCount);
+		if(Cmd.m_pRenderInfo == 0x0)
+		{
+			// kick command buffer and try again
+			KickCommandBuffer();
+
+			Cmd.m_pRenderInfo = (IGraphics::SRenderSpriteInfo *)m_pCommandBuffer->AllocData(sizeof(IGraphics::SRenderSpriteInfo) * DrawCount);
+			if(Cmd.m_pRenderInfo == 0x0)
+			{
+				dbg_msg("graphics", "failed to allocate data for render info");
+				return;
+			}
+		}
+
+		AddCmd(Cmd, [&] {
+			Cmd.m_pRenderInfo = (IGraphics::SRenderSpriteInfo *)m_pCommandBuffer->AllocData(sizeof(IGraphics::SRenderSpriteInfo) * DrawCount);
+			return Cmd.m_pRenderInfo != nullptr;
+		});
+
+		mem_copy(Cmd.m_pRenderInfo, pRenderInfo, sizeof(IGraphics::SRenderSpriteInfo) * DrawCount);
+
+		m_pCommandBuffer->AddRenderCalls(((DrawCount - 1) / gs_GraphicsMaxParticlesRenderCount) + 1);
+
+		WrapNormal();
+	}
+	else
+	{
+		for(int i = 0; i < DrawCount; ++i)
+		{
+			QuadsSetRotation(pRenderInfo[i].m_Rotation);
+			RenderQuadContainerAsSprite(ContainerIndex, QuadOffset, pRenderInfo[i].m_Pos.x, pRenderInfo[i].m_Pos.y, pRenderInfo[i].m_Scale, pRenderInfo[i].m_Scale);
+		}
+	}
+}
+
+void *CGraphics_Threaded::AllocCommandBufferData(size_t AllocSize)
+{
+	void *pData = m_pCommandBuffer->AllocData(AllocSize);
+	if(pData == nullptr)
+	{
+		// kick command buffer and try again
+		KickCommandBuffer();
+
+		pData = m_pCommandBuffer->AllocData(AllocSize);
+		if(pData == nullptr)
+		{
+			char aError[256];
+			str_format(aError, sizeof(aError), "graphics: failed to allocate data (size %" PRIzu ") for command buffer", (size_t)AllocSize);
+			dbg_assert(false, aError);
+		}
+	}
+	return pData;
+}
+
+int CGraphics_Threaded::CreateBufferObject(size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer)
+{
+	int Index = -1;
+	if(m_FirstFreeBufferObjectIndex == -1)
+	{
+		Index = m_vBufferObjectIndices.size();
+		m_vBufferObjectIndices.push_back(Index);
+	}
+	else
+	{
+		Index = m_FirstFreeBufferObjectIndex;
+		m_FirstFreeBufferObjectIndex = m_vBufferObjectIndices[Index];
+		m_vBufferObjectIndices[Index] = Index;
+	}
+
+	CCommandBuffer::SCommand_CreateBufferObject Cmd;
+	Cmd.m_BufferIndex = Index;
+	Cmd.m_DataSize = UploadDataSize;
+	Cmd.m_DeletePointer = IsMovedPointer;
+	Cmd.m_Flags = CreateFlags;
+
+	if(IsMovedPointer)
+	{
+		Cmd.m_pUploadData = pUploadData;
+		AddCmd(Cmd);
+	}
+	else
+	{
+		if(UploadDataSize <= CMD_BUFFER_DATA_BUFFER_SIZE)
+		{
+			Cmd.m_pUploadData = AllocCommandBufferData(UploadDataSize);
+
+			AddCmd(Cmd, [&] {
+				Cmd.m_pUploadData = m_pCommandBuffer->AllocData(UploadDataSize);
+				return Cmd.m_pUploadData != nullptr;
+			});
+			mem_copy(Cmd.m_pUploadData, pUploadData, UploadDataSize);
+		}
+		else
+		{
+			Cmd.m_pUploadData = nullptr;
+			AddCmd(Cmd);
+
+			// update the buffer instead
+			size_t UploadDataOffset = 0;
+			while(UploadDataSize > 0)
+			{
+				size_t UpdateSize = (UploadDataSize > CMD_BUFFER_DATA_BUFFER_SIZE ? CMD_BUFFER_DATA_BUFFER_SIZE : UploadDataSize);
+
+				UpdateBufferObjectInternal(Index, UpdateSize, (((char *)pUploadData) + UploadDataOffset), (void *)UploadDataOffset);
+
+				UploadDataOffset += UpdateSize;
+				UploadDataSize -= UpdateSize;
+			}
+		}
+	}
+
+	return Index;
+}
+
+void CGraphics_Threaded::RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer)
+{
+	CCommandBuffer::SCommand_RecreateBufferObject Cmd;
+	Cmd.m_BufferIndex = BufferIndex;
+	Cmd.m_DataSize = UploadDataSize;
+	Cmd.m_DeletePointer = IsMovedPointer;
+	Cmd.m_Flags = CreateFlags;
+
+	if(IsMovedPointer)
+	{
+		Cmd.m_pUploadData = pUploadData;
+		AddCmd(Cmd);
+	}
+	else
+	{
+		if(UploadDataSize <= CMD_BUFFER_DATA_BUFFER_SIZE)
+		{
+			Cmd.m_pUploadData = AllocCommandBufferData(UploadDataSize);
+
+			AddCmd(Cmd, [&] {
+				Cmd.m_pUploadData = m_pCommandBuffer->AllocData(UploadDataSize);
+				return Cmd.m_pUploadData != nullptr;
+			});
+
+			mem_copy(Cmd.m_pUploadData, pUploadData, UploadDataSize);
+		}
+		else
+		{
+			Cmd.m_pUploadData = nullptr;
+			AddCmd(Cmd);
+
+			// update the buffer instead
+			size_t UploadDataOffset = 0;
+			while(UploadDataSize > 0)
+			{
+				size_t UpdateSize = (UploadDataSize > CMD_BUFFER_DATA_BUFFER_SIZE ? CMD_BUFFER_DATA_BUFFER_SIZE : UploadDataSize);
+
+				UpdateBufferObjectInternal(BufferIndex, UpdateSize, (((char *)pUploadData) + UploadDataOffset), (void *)UploadDataOffset);
+
+				UploadDataOffset += UpdateSize;
+				UploadDataSize -= UpdateSize;
+			}
+		}
+	}
+}
+
+void CGraphics_Threaded::UpdateBufferObjectInternal(int BufferIndex, size_t UploadDataSize, void *pUploadData, void *pOffset, bool IsMovedPointer)
+{
+	CCommandBuffer::SCommand_UpdateBufferObject Cmd;
+	Cmd.m_BufferIndex = BufferIndex;
+	Cmd.m_DataSize = UploadDataSize;
+	Cmd.m_pOffset = pOffset;
+	Cmd.m_DeletePointer = IsMovedPointer;
+
+	if(IsMovedPointer)
+	{
+		Cmd.m_pUploadData = pUploadData;
+		AddCmd(Cmd);
+	}
+	else
+	{
+		Cmd.m_pUploadData = AllocCommandBufferData(UploadDataSize);
+
+		AddCmd(Cmd, [&] {
+			Cmd.m_pUploadData = m_pCommandBuffer->AllocData(UploadDataSize);
+			return Cmd.m_pUploadData != nullptr;
+		});
+
+		mem_copy(Cmd.m_pUploadData, pUploadData, UploadDataSize);
+	}
+}
+
+void CGraphics_Threaded::CopyBufferObjectInternal(int WriteBufferIndex, int ReadBufferIndex, size_t WriteOffset, size_t ReadOffset, size_t CopyDataSize)
+{
+	CCommandBuffer::SCommand_CopyBufferObject Cmd;
+	Cmd.m_WriteBufferIndex = WriteBufferIndex;
+	Cmd.m_ReadBufferIndex = ReadBufferIndex;
+	Cmd.m_WriteOffset = WriteOffset;
+	Cmd.m_ReadOffset = ReadOffset;
+	Cmd.m_CopySize = CopyDataSize;
+	AddCmd(Cmd);
+}
+
+void CGraphics_Threaded::DeleteBufferObject(int BufferIndex)
+{
+	if(BufferIndex == -1)
+		return;
+
+	CCommandBuffer::SCommand_DeleteBufferObject Cmd;
+	Cmd.m_BufferIndex = BufferIndex;
+	AddCmd(Cmd);
+
+	// also clear the buffer object index
+	m_vBufferObjectIndices[BufferIndex] = m_FirstFreeBufferObjectIndex;
+	m_FirstFreeBufferObjectIndex = BufferIndex;
+}
+
+int CGraphics_Threaded::CreateBufferContainer(SBufferContainerInfo *pContainerInfo)
+{
+	int Index = -1;
+	if(m_FirstFreeVertexArrayInfo == -1)
+	{
+		Index = m_vVertexArrayInfo.size();
+		m_vVertexArrayInfo.emplace_back();
+	}
+	else
+	{
+		Index = m_FirstFreeVertexArrayInfo;
+		m_FirstFreeVertexArrayInfo = m_vVertexArrayInfo[Index].m_FreeIndex;
+		m_vVertexArrayInfo[Index].m_FreeIndex = Index;
+	}
+
+	CCommandBuffer::SCommand_CreateBufferContainer Cmd;
+	Cmd.m_BufferContainerIndex = Index;
+	Cmd.m_AttrCount = pContainerInfo->m_vAttributes.size();
+	Cmd.m_Stride = pContainerInfo->m_Stride;
+	Cmd.m_VertBufferBindingIndex = pContainerInfo->m_VertBufferBindingIndex;
+	Cmd.m_pAttributes = (SBufferContainerInfo::SAttribute *)AllocCommandBufferData(Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+
+	AddCmd(Cmd, [&] {
+		Cmd.m_pAttributes = (SBufferContainerInfo::SAttribute *)m_pCommandBuffer->AllocData(Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+		return Cmd.m_pAttributes != nullptr;
+	});
+
+	mem_copy(Cmd.m_pAttributes, pContainerInfo->m_vAttributes.data(), Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+
+	m_vVertexArrayInfo[Index].m_AssociatedBufferObjectIndex = pContainerInfo->m_VertBufferBindingIndex;
+
+	return Index;
+}
+
+void CGraphics_Threaded::DeleteBufferContainer(int &ContainerIndex, bool DestroyAllBO)
+{
+	if(ContainerIndex == -1)
+		return;
+
+	CCommandBuffer::SCommand_DeleteBufferContainer Cmd;
+	Cmd.m_BufferContainerIndex = ContainerIndex;
+	Cmd.m_DestroyAllBO = DestroyAllBO;
+	AddCmd(Cmd);
+
+	if(DestroyAllBO)
+	{
+		// delete all associated references
+		int BufferObjectIndex = m_vVertexArrayInfo[ContainerIndex].m_AssociatedBufferObjectIndex;
+		if(BufferObjectIndex != -1)
+		{
+			// clear the buffer object index
+			m_vBufferObjectIndices[BufferObjectIndex] = m_FirstFreeBufferObjectIndex;
+			m_FirstFreeBufferObjectIndex = BufferObjectIndex;
+		}
+	}
+	m_vVertexArrayInfo[ContainerIndex].m_AssociatedBufferObjectIndex = -1;
+
+	// also clear the buffer object index
+	m_vVertexArrayInfo[ContainerIndex].m_FreeIndex = m_FirstFreeVertexArrayInfo;
+	m_FirstFreeVertexArrayInfo = ContainerIndex;
+	ContainerIndex = -1;
+}
+
+void CGraphics_Threaded::UpdateBufferContainerInternal(int ContainerIndex, SBufferContainerInfo *pContainerInfo)
+{
+	CCommandBuffer::SCommand_UpdateBufferContainer Cmd;
+	Cmd.m_BufferContainerIndex = ContainerIndex;
+	Cmd.m_AttrCount = pContainerInfo->m_vAttributes.size();
+	Cmd.m_Stride = pContainerInfo->m_Stride;
+	Cmd.m_VertBufferBindingIndex = pContainerInfo->m_VertBufferBindingIndex;
+	Cmd.m_pAttributes = (SBufferContainerInfo::SAttribute *)AllocCommandBufferData(Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+
+	AddCmd(Cmd, [&] {
+		Cmd.m_pAttributes = (SBufferContainerInfo::SAttribute *)m_pCommandBuffer->AllocData(Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+		return Cmd.m_pAttributes != nullptr;
+	});
+
+	mem_copy(Cmd.m_pAttributes, pContainerInfo->m_vAttributes.data(), Cmd.m_AttrCount * sizeof(SBufferContainerInfo::SAttribute));
+
+	m_vVertexArrayInfo[ContainerIndex].m_AssociatedBufferObjectIndex = pContainerInfo->m_VertBufferBindingIndex;
+}
+
+void CGraphics_Threaded::IndicesNumRequiredNotify(unsigned int RequiredIndicesCount)
+{
+	CCommandBuffer::SCommand_IndicesRequiredNumNotify Cmd;
+	Cmd.m_RequiredIndicesNum = RequiredIndicesCount;
+	AddCmd(Cmd);
+}
+
+int CGraphics_Threaded::IssueInit()
+{
+	int Flags = 0;
+
+	bool IsPurlyWindowed = g_Config.m_GfxFullscreen == 0;
+	bool IsExclusiveFullscreen = g_Config.m_GfxFullscreen == 1;
+	bool IsDesktopFullscreen = g_Config.m_GfxFullscreen == 2;
+#ifndef CONF_FAMILY_WINDOWS
+	//  special mode for windows only
+	IsDesktopFullscreen |= g_Config.m_GfxFullscreen == 3;
+#endif
+
+	if(g_Config.m_GfxBorderless)
+		Flags |= IGraphicsBackend::INITFLAG_BORDERLESS;
+	if(IsExclusiveFullscreen)
+		Flags |= IGraphicsBackend::INITFLAG_FULLSCREEN;
+	else if(IsDesktopFullscreen)
+		Flags |= IGraphicsBackend::INITFLAG_DESKTOP_FULLSCREEN;
+	if(IsPurlyWindowed || IsExclusiveFullscreen || IsDesktopFullscreen)
+		Flags |= IGraphicsBackend::INITFLAG_RESIZABLE;
+	if(g_Config.m_GfxVsync)
+		Flags |= IGraphicsBackend::INITFLAG_VSYNC;
+	if(g_Config.m_GfxHighdpi)
+		Flags |= IGraphicsBackend::INITFLAG_HIGHDPI;
+
+	int r = m_pBackend->Init("StormA Client", &g_Config.m_GfxScreen, &g_Config.m_GfxScreenWidth, &g_Config.m_GfxScreenHeight, &g_Config.m_GfxScreenRefreshRate, &g_Config.m_GfxFsaaSamples, Flags, &g_Config.m_GfxDesktopWidth, &g_Config.m_GfxDesktopHeight, &m_ScreenWidth, &m_ScreenHeight, m_pStorage);
+	AddBackEndWarningIfExists();
+	if(r == 0)
+	{
+		m_GLUseTrianglesAsQuad = m_pBackend->UseTrianglesAsQuad();
+		m_GLTileBufferingEnabled = m_pBackend->HasTileBuffering();
+		m_GLQuadBufferingEnabled = m_pBackend->HasQuadBuffering();
+		m_GLQuadContainerBufferingEnabled = m_pBackend->HasQuadContainerBuffering();
+		m_GLTextBufferingEnabled = (m_GLQuadContainerBufferingEnabled && m_pBackend->HasTextBuffering());
+		m_GLUses2DTextureArrays = m_pBackend->Uses2DTextureArrays();
+		m_GLHasTextureArraysSupport = m_pBackend->HasTextureArraysSupport();
+		m_ScreenHiDPIScale = m_ScreenWidth / (float)g_Config.m_GfxScreenWidth;
+		m_ScreenRefreshRate = g_Config.m_GfxScreenRefreshRate;
+	}
+	return r;
+}
+
+void CGraphics_Threaded::AdjustViewport(bool SendViewportChangeToBackend)
+{
+	// adjust the viewport to only allow certain aspect ratios
+	// keep this in sync with backend_vulkan GetSwapImageSize's check
+	if(m_ScreenHeight > 4 * m_ScreenWidth / 5)
+	{
+		m_IsForcedViewport = true;
+		m_ScreenHeight = 4 * m_ScreenWidth / 5;
+
+		if(SendViewportChangeToBackend)
+		{
+			UpdateViewport(0, 0, m_ScreenWidth, m_ScreenHeight, true);
+		}
+	}
+	else
+	{
+		m_IsForcedViewport = false;
+	}
+}
+
+void CGraphics_Threaded::UpdateViewport(int X, int Y, int W, int H, bool ByResize)
+{
+	CCommandBuffer::SCommand_Update_Viewport Cmd;
+	Cmd.m_X = X;
+	Cmd.m_Y = Y;
+	Cmd.m_Width = W;
+	Cmd.m_Height = H;
+	Cmd.m_ByResize = ByResize;
+	AddCmd(Cmd);
+}
+
+void CGraphics_Threaded::AddBackEndWarningIfExists()
+{
+	const char *pErrStr = m_pBackend->GetErrorString();
+	if(pErrStr != NULL)
+	{
+		SWarning NewWarning;
+		str_copy(NewWarning.m_aWarningMsg, Localize(pErrStr));
+		m_vWarnings.emplace_back(NewWarning);
+	}
+}
+
+int CGraphics_Threaded::InitWindow()
+{
+	int ErrorCode = IssueInit();
+	if(ErrorCode == 0)
+		return 0;
+
+	// try disabling fsaa
+	while(g_Config.m_GfxFsaaSamples)
+	{
+		// 4 is the minimum required by OpenGL ES spec (GL_MAX_SAMPLES - https://www.khronos.org/registry/OpenGL-Refpages/es3.0/html/glGet.xhtml), so can probably also be assumed for OpenGL
+		if(g_Config.m_GfxFsaaSamples > 4)
+			g_Config.m_GfxFsaaSamples = 4;
+		else
+			g_Config.m_GfxFsaaSamples = 0;
+
+		if(g_Config.m_GfxFsaaSamples)
+			dbg_msg("gfx", "lowering FSAA to %d and trying again", g_Config.m_GfxFsaaSamples);
+		else
+			dbg_msg("gfx", "disabling FSAA and trying again");
+
+		ErrorCode = IssueInit();
+		if(ErrorCode == 0)
+			return 0;
+	}
+
+	size_t GLInitTryCount = 0;
+	while(ErrorCode == EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_CONTEXT_FAILED || ErrorCode == EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_VERSION_FAILED)
+	{
+		if(ErrorCode == EGraphicsBackendErrorCodes::GRAPHICS_BACKEND_ERROR_CODE_GL_CONTEXT_FAILED)
+		{
+			// try next smaller major/minor or patch version
+			if(g_Config.m_GfxGLMajor >= 4)
+			{
+				g_Config.m_GfxGLMajor = 3;
+				g_Config.m_GfxGLMinor = 3;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 3 && g_Config.m_GfxGLMinor >= 1)
+			{
+				g_Config.m_GfxGLMajor = 3;
+				g_Config.m_GfxGLMinor = 0;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 3 && g_Config.m_GfxGLMinor == 0)
+			{
+				g_Config.m_GfxGLMajor = 2;
+				g_Config.m_GfxGLMinor = 1;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 2 && g_Config.m_GfxGLMinor >= 1)
+			{
+				g_Config.m_GfxGLMajor = 2;
+				g_Config.m_GfxGLMinor = 0;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 2 && g_Config.m_GfxGLMinor == 0)
+			{
+				g_Config.m_GfxGLMajor = 1;
+				g_Config.m_GfxGLMinor = 5;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 1 && g_Config.m_GfxGLMinor == 5)
+			{
+				g_Config.m_GfxGLMajor = 1;
+				g_Config.m_GfxGLMinor = 4;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 1 && g_Config.m_GfxGLMinor == 4)
+			{
+				g_Config.m_GfxGLMajor = 1;
+				g_Config.m_GfxGLMinor = 3;
+				g_Config.m_GfxGLPatch = 0;
+			}
+			else if(g_Config.m_GfxGLMajor == 1 && g_Config.m_GfxGLMinor == 3)
+			{
+				g_Config.m_GfxGLMajor = 1;
+				g_Config.m_GfxGLMinor = 2;
+				g_Config.m_GfxGLPatch = 1;
+			}
+			else if(g_Config.m_GfxGLMajor == 1 && g_Config.m_GfxGLMinor == 2)
+			{
+				g_Config.m_GfxGLMajor = 1;
+				g_Config.m_GfxGLMinor = 1;
+				g_Config.m_GfxGLPatch = 0;
+			}
+		}
+
+		// new gl version was set by backend, try again
+		ErrorCode = IssueInit();
+		if(ErrorCode == 0)
+		{
+			return 0;
+		}
+
+		if(++GLInitTryCount >= 9)
+		{
+			// try something else
+			break;
+		}
+	}
+
+	// try lowering the resolution
+	if(g_Config.m_GfxScreenWidth != 640 || g_Config.m_GfxScreenHeight != 480)
+	{
+		dbg_msg("gfx", "setting resolution to 640x480 and trying again");
+		g_Config.m_GfxScreenWidth = 640;
+		g_Config.m_GfxScreenHeight = 480;
+
+		if(IssueInit() == 0)
+			return 0;
+	}
+
+	// at the very end, just try to set to gl 1.4
+	{
+		g_Config.m_GfxGLMajor = 1;
+		g_Config.m_GfxGLMinor = 4;
+		g_Config.m_GfxGLPatch = 0;
+
+		if(IssueInit() == 0)
+			return 0;
+	}
+
+	dbg_msg("gfx", "out of ideas. failed to init graphics");
+
+	return -1;
+}
+
+int CGraphics_Threaded::Init()
+{
+	// fetch pointers
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+
+	// init textures
+	m_FirstFreeTexture = 0;
+	m_vTextureIndices.resize(CCommandBuffer::MAX_TEXTURES);
+	for(size_t i = 0; i < m_vTextureIndices.size(); ++i)
+		m_vTextureIndices[i] = i + 1;
+
+	m_FirstFreeVertexArrayInfo = -1;
+	m_FirstFreeBufferObjectIndex = -1;
+	m_FirstFreeQuadContainer = -1;
+
+	m_pBackend = CreateGraphicsBackend(Localize);
+	if(InitWindow() != 0)
+		return -1;
+
+	for(auto &FakeMode : g_aFakeModes)
+	{
+		FakeMode.m_WindowWidth = FakeMode.m_CanvasWidth / m_ScreenHiDPIScale;
+		FakeMode.m_WindowHeight = FakeMode.m_CanvasHeight / m_ScreenHiDPIScale;
+		FakeMode.m_RefreshRate = g_Config.m_GfxScreenRefreshRate;
+	}
+
+	// create command buffers
+	for(auto &pCommandBuffer : m_apCommandBuffers)
+		pCommandBuffer = new CCommandBuffer(CMD_BUFFER_CMD_BUFFER_SIZE, CMD_BUFFER_DATA_BUFFER_SIZE);
+	m_pCommandBuffer = m_apCommandBuffers[0];
+
+	// create null texture, will get id=0
+	{
+		const size_t PixelSize = 4;
+		const unsigned char aRed[] = {0xff, 0x00, 0x00, 0xff};
+		const unsigned char aGreen[] = {0x00, 0xff, 0x00, 0xff};
+		const unsigned char aBlue[] = {0x00, 0x00, 0xff, 0xff};
+		const unsigned char aYellow[] = {0xff, 0xff, 0x00, 0xff};
+		constexpr size_t NullTextureDimension = 16;
+		unsigned char aNullTextureData[NullTextureDimension * NullTextureDimension * PixelSize];
+		for(size_t y = 0; y < NullTextureDimension; ++y)
+		{
+			for(size_t x = 0; x < NullTextureDimension; ++x)
+			{
+				const unsigned char *pColor;
+				if(x < NullTextureDimension / 2 && y < NullTextureDimension / 2)
+					pColor = aRed;
+				else if(x >= NullTextureDimension / 2 && y < NullTextureDimension / 2)
+					pColor = aGreen;
+				else if(x < NullTextureDimension / 2 && y >= NullTextureDimension / 2)
+					pColor = aBlue;
+				else
+					pColor = aYellow;
+				mem_copy(&aNullTextureData[(y * NullTextureDimension + x) * PixelSize], pColor, PixelSize);
+			}
+		}
+		const int TextureLoadFlags = Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+		m_NullTexture.Invalidate();
+		m_NullTexture = LoadTextureRaw(NullTextureDimension, NullTextureDimension, CImageInfo::FORMAT_RGBA, aNullTextureData, TextureLoadFlags);
+		dbg_assert(m_NullTexture.IsNullTexture(), "Null texture invalid");
+	}
+
+	ColorRGBA GPUInfoPrintColor{0.6f, 0.5f, 1.0f, 1.0f};
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "GPU vendor: %s", GetVendorString());
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gfx", aBuf, GPUInfoPrintColor);
+
+	str_format(aBuf, sizeof(aBuf), "GPU renderer: %s", GetRendererString());
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gfx", aBuf, GPUInfoPrintColor);
+
+	str_format(aBuf, sizeof(aBuf), "GPU version: %s", GetVersionString());
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gfx", aBuf, GPUInfoPrintColor);
+
+	AdjustViewport(true);
+
+	return 0;
+}
+
+void CGraphics_Threaded::Shutdown()
+{
+	// shutdown the backend
+	m_pBackend->Shutdown();
+	delete m_pBackend;
+	m_pBackend = 0x0;
+
+	// delete the command buffers
+	for(auto &pCommandBuffer : m_apCommandBuffers)
+		delete pCommandBuffer;
+}
+
+int CGraphics_Threaded::GetNumScreens() const
+{
+	return m_pBackend->GetNumScreens();
+}
+
+const char *CGraphics_Threaded::GetScreenName(int Screen) const
+{
+	return m_pBackend->GetScreenName(Screen);
+}
+
+void CGraphics_Threaded::Minimize()
+{
+	m_pBackend->Minimize();
+
+	for(auto &PropChangedListener : m_vPropChangeListeners)
+		PropChangedListener();
+}
+
+void CGraphics_Threaded::Maximize()
+{
+	// TODO: SDL
+	m_pBackend->Maximize();
+
+	for(auto &PropChangedListener : m_vPropChangeListeners)
+		PropChangedListener();
+}
+
+void CGraphics_Threaded::WarnPngliteIncompatibleImages(bool Warn)
+{
+	m_WarnPngliteIncompatibleImages = Warn;
+}
+
+void CGraphics_Threaded::SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing)
+{
+	m_pBackend->SetWindowParams(FullscreenMode, IsBorderless, AllowResizing);
+	CVideoMode CurMode;
+	m_pBackend->GetCurrentVideoMode(CurMode, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, g_Config.m_GfxScreen);
+	GotResized(CurMode.m_WindowWidth, CurMode.m_WindowHeight, CurMode.m_RefreshRate);
+
+	for(auto &PropChangedListener : m_vPropChangeListeners)
+		PropChangedListener();
+}
+
+bool CGraphics_Threaded::SetWindowScreen(int Index)
+{
+	if(!m_pBackend->SetWindowScreen(Index))
+	{
+		return false;
+	}
+
+	// send a got resized event so that the current canvas size is requested
+	GotResized(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+
+	for(auto &PropChangedListener : m_vPropChangeListeners)
+		PropChangedListener();
+	return true;
+}
+
+void CGraphics_Threaded::Move(int x, int y)
+{
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current() && IVideo::Current()->IsRecording())
+		return;
+#endif
+
+	// Only handling CurScreen != m_GfxScreen doesn't work reliably
+	const int CurScreen = m_pBackend->GetWindowScreen();
+	m_pBackend->UpdateDisplayMode(CurScreen);
+
+	// send a got resized event so that the current canvas size is requested
+	GotResized(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+
+	for(auto &PropChangedListener : m_vPropChangeListeners)
+		PropChangedListener();
+}
+
+void CGraphics_Threaded::Resize(int w, int h, int RefreshRate)
+{
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current() && IVideo::Current()->IsRecording())
+		return;
+#endif
+
+	if(WindowWidth() == w && WindowHeight() == h && RefreshRate == m_ScreenRefreshRate)
+		return;
+
+	// if the size is changed manually, only set the window resize, a window size changed event is triggered anyway
+	if(m_pBackend->ResizeWindow(w, h, RefreshRate))
+	{
+		CVideoMode CurMode;
+		m_pBackend->GetCurrentVideoMode(CurMode, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, g_Config.m_GfxScreen);
+		GotResized(w, h, RefreshRate);
+	}
+}
+
+void CGraphics_Threaded::GotResized(int w, int h, int RefreshRate)
+{
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current() && IVideo::Current()->IsRecording())
+		return;
+#endif
+
+	// if RefreshRate is -1 use the current config refresh rate
+	if(RefreshRate == -1)
+		RefreshRate = g_Config.m_GfxScreenRefreshRate;
+
+	// if the size change event is triggered, set all parameters and change the viewport
+	auto PrevCanvasWidth = m_ScreenWidth;
+	auto PrevCanvasHeight = m_ScreenHeight;
+	m_pBackend->GetViewportSize(m_ScreenWidth, m_ScreenHeight);
+
+	AdjustViewport(false);
+
+	m_ScreenRefreshRate = RefreshRate;
+
+	g_Config.m_GfxScreenWidth = w;
+	g_Config.m_GfxScreenHeight = h;
+	g_Config.m_GfxScreenRefreshRate = m_ScreenRefreshRate;
+	m_ScreenHiDPIScale = m_ScreenWidth / (float)g_Config.m_GfxScreenWidth;
+
+	UpdateViewport(0, 0, m_ScreenWidth, m_ScreenHeight, true);
+
+	// kick the command buffer and wait
+	KickCommandBuffer();
+	WaitForIdle();
+
+	if(PrevCanvasWidth != m_ScreenWidth || PrevCanvasHeight != m_ScreenHeight)
+	{
+		for(auto &ResizeListener : m_vResizeListeners)
+			ResizeListener();
+	}
+}
+
+void CGraphics_Threaded::AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc)
+{
+	m_vResizeListeners.emplace_back(pFunc);
+}
+
+void CGraphics_Threaded::AddWindowPropChangeListener(WINDOW_PROPS_CHANGED_FUNC pFunc)
+{
+	m_vPropChangeListeners.emplace_back(pFunc);
+}
+
+int CGraphics_Threaded::GetWindowScreen()
+{
+	return m_pBackend->GetWindowScreen();
+}
+
+void CGraphics_Threaded::WindowDestroyNtf(uint32_t WindowID)
+{
+	m_pBackend->WindowDestroyNtf(WindowID);
+
+	CCommandBuffer::SCommand_WindowDestroyNtf Cmd;
+	Cmd.m_WindowID = WindowID;
+	AddCmd(Cmd);
+
+	// wait
+	KickCommandBuffer();
+	WaitForIdle();
+}
+
+void CGraphics_Threaded::WindowCreateNtf(uint32_t WindowID)
+{
+	m_pBackend->WindowCreateNtf(WindowID);
+
+	CCommandBuffer::SCommand_WindowCreateNtf Cmd;
+	Cmd.m_WindowID = WindowID;
+	AddCmd(Cmd);
+
+	// wait
+	KickCommandBuffer();
+	WaitForIdle();
+}
+
+int CGraphics_Threaded::WindowActive()
+{
+	return m_pBackend->WindowActive();
+}
+
+int CGraphics_Threaded::WindowOpen()
+{
+	return m_pBackend->WindowOpen();
+}
+
+void CGraphics_Threaded::SetWindowGrab(bool Grab)
+{
+	return m_pBackend->SetWindowGrab(Grab);
+}
+
+void CGraphics_Threaded::NotifyWindow()
+{
+	return m_pBackend->NotifyWindow();
+}
+
+void CGraphics_Threaded::TakeScreenshot(const char *pFilename)
+{
+	// TODO: screenshot support
+	char aDate[20];
+	str_timestamp(aDate, sizeof(aDate));
+	str_format(m_aScreenshotName, sizeof(m_aScreenshotName), "screenshots/%s_%s.png", pFilename ? pFilename : "screenshot", aDate);
+	m_DoScreenshot = true;
+}
+
+void CGraphics_Threaded::TakeCustomScreenshot(const char *pFilename)
+{
+	str_copy(m_aScreenshotName, pFilename);
+	m_DoScreenshot = true;
+}
+
+void CGraphics_Threaded::Swap()
+{
+	if(!m_vWarnings.empty())
+	{
+		SWarning *pCurWarning = GetCurWarning();
+		if(pCurWarning->m_WasShown)
+		{
+			m_vWarnings.erase(m_vWarnings.begin());
+		}
+	}
+
+	bool TookScreenshotAndSwapped = false;
+
+	if(m_DoScreenshot)
+	{
+		if(WindowActive())
+			TookScreenshotAndSwapped = ScreenshotDirect();
+		m_DoScreenshot = false;
+	}
+
+	if(!TookScreenshotAndSwapped)
+	{
+		// add swap command
+		CCommandBuffer::SCommand_Swap Cmd;
+		AddCmd(Cmd);
+	}
+
+	// kick the command buffer
+	KickCommandBuffer();
+	// TODO: Remove when https://github.com/libsdl-org/SDL/issues/5203 is fixed
+#ifdef CONF_PLATFORM_MACOS
+	if(str_find(GetVersionString(), "Metal"))
+		WaitForIdle();
+#endif
+}
+
+bool CGraphics_Threaded::SetVSync(bool State)
+{
+	if(!m_pCommandBuffer)
+		return true;
+
+	// add vsync command
+	bool RetOk = false;
+	CCommandBuffer::SCommand_VSync Cmd;
+	Cmd.m_VSync = State ? 1 : 0;
+	Cmd.m_pRetOk = &RetOk;
+	AddCmd(Cmd);
+
+	// kick the command buffer
+	KickCommandBuffer();
+	WaitForIdle();
+	return RetOk;
+}
+
+bool CGraphics_Threaded::SetMultiSampling(uint32_t ReqMultiSamplingCount, uint32_t &MultiSamplingCountBackend)
+{
+	if(!m_pCommandBuffer)
+		return true;
+
+	// add multisampling command
+	bool RetOk = false;
+	CCommandBuffer::SCommand_MultiSampling Cmd;
+	Cmd.m_RequestedMultiSamplingCount = ReqMultiSamplingCount;
+	Cmd.m_pRetMultiSamplingCount = &MultiSamplingCountBackend;
+	Cmd.m_pRetOk = &RetOk;
+	AddCmd(Cmd);
+
+	// kick the command buffer
+	KickCommandBuffer();
+	WaitForIdle();
+	return RetOk;
+}
+
+// synchronization
+void CGraphics_Threaded::InsertSignal(CSemaphore *pSemaphore)
+{
+	CCommandBuffer::SCommand_Signal Cmd;
+	Cmd.m_pSemaphore = pSemaphore;
+	AddCmd(Cmd);
+}
+
+bool CGraphics_Threaded::IsIdle() const
+{
+	return m_pBackend->IsIdle();
+}
+
+void CGraphics_Threaded::WaitForIdle()
+{
+	m_pBackend->WaitForIdle();
+}
+
+SWarning *CGraphics_Threaded::GetCurWarning()
+{
+	if(m_vWarnings.empty())
+		return NULL;
+	else
+	{
+		SWarning *pCurWarning = m_vWarnings.data();
+		return pCurWarning;
+	}
+}
+
+bool CGraphics_Threaded::ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg)
+{
+	if(m_pBackend == nullptr)
+		return false;
+	m_pBackend->WaitForIdle();
+	return m_pBackend->ShowMessageBox(Type, pTitle, pMsg);
+}
+
+bool CGraphics_Threaded::IsBackendInitialized()
+{
+	return m_pBackend != nullptr;
+}
+
+const char *CGraphics_Threaded::GetVendorString()
+{
+	return m_pBackend->GetVendorString();
+}
+
+const char *CGraphics_Threaded::GetVersionString()
+{
+	return m_pBackend->GetVersionString();
+}
+
+const char *CGraphics_Threaded::GetRendererString()
+{
+	return m_pBackend->GetRendererString();
+}
+
+TGLBackendReadPresentedImageData &CGraphics_Threaded::GetReadPresentedImageDataFuncUnsafe()
+{
+	return m_pBackend->GetReadPresentedImageDataFuncUnsafe();
+}
+
+int CGraphics_Threaded::GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen)
+{
+	if(g_Config.m_GfxDisplayAllVideoModes)
+	{
+		const int Count = minimum<size_t>(std::size(g_aFakeModes), MaxModes);
+		mem_copy(pModes, g_aFakeModes, Count * sizeof(CVideoMode));
+		return Count;
+	}
+
+	int NumModes = 0;
+	m_pBackend->GetVideoModes(pModes, MaxModes, &NumModes, m_ScreenHiDPIScale, g_Config.m_GfxDesktopWidth, g_Config.m_GfxDesktopHeight, Screen);
+	return NumModes;
+}
+
+extern IEngineGraphics *CreateEngineGraphicsThreaded()
+{
+	return new CGraphics_Threaded();
+}
diff --git a/src_bkp/engine/client/graphics_threaded.h b/src_bkp/engine/client/graphics_threaded.h
new file mode 100644
index 0000000000..eaf0570d66
--- /dev/null
+++ b/src_bkp/engine/client/graphics_threaded.h
@@ -0,0 +1,1285 @@
+#ifndef ENGINE_CLIENT_GRAPHICS_THREADED_H
+#define ENGINE_CLIENT_GRAPHICS_THREADED_H
+
+#include <base/system.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+constexpr int CMD_BUFFER_DATA_BUFFER_SIZE = 1024 * 1024 * 2;
+constexpr int CMD_BUFFER_CMD_BUFFER_SIZE = 1024 * 256;
+
+class CCommandBuffer
+{
+	class CBuffer
+	{
+		unsigned char *m_pData;
+		unsigned m_Size;
+		unsigned m_Used;
+
+	public:
+		CBuffer(unsigned BufferSize)
+		{
+			m_Size = BufferSize;
+			m_pData = new unsigned char[m_Size];
+			m_Used = 0;
+		}
+
+		~CBuffer()
+		{
+			delete[] m_pData;
+			m_pData = 0x0;
+			m_Used = 0;
+			m_Size = 0;
+		}
+
+		void Reset()
+		{
+			m_Used = 0;
+		}
+
+		void *Alloc(unsigned Requested, unsigned Alignment = alignof(std::max_align_t))
+		{
+			size_t Offset = reinterpret_cast<uintptr_t>(m_pData + m_Used) % Alignment;
+			if(Offset)
+				Offset = Alignment - Offset;
+
+			if(Requested + Offset + m_Used > m_Size)
+				return 0;
+
+			void *pPtr = &m_pData[m_Used + Offset];
+			m_Used += Requested + Offset;
+			return pPtr;
+		}
+
+		unsigned char *DataPtr() { return m_pData; }
+		unsigned DataSize() const { return m_Size; }
+		unsigned DataUsed() const { return m_Used; }
+	};
+
+public:
+	CBuffer m_CmdBuffer;
+	size_t m_CommandCount = 0;
+	size_t m_RenderCallCount = 0;
+
+	CBuffer m_DataBuffer;
+
+	enum
+	{
+		MAX_TEXTURES = 1024 * 8,
+		MAX_VERTICES = 32 * 1024,
+	};
+
+	enum ECommandBufferCMD
+	{
+		// command groups
+		CMDGROUP_CORE = 0, // commands that everyone has to implement
+		CMDGROUP_PLATFORM_GL = 10000, // commands specific to a platform
+		CMDGROUP_PLATFORM_SDL = 20000,
+
+		//
+		CMD_FIRST = CMDGROUP_CORE,
+		CMD_NOP = CMD_FIRST,
+
+		//
+		CMD_RUNBUFFER,
+
+		// synchronization
+		CMD_SIGNAL,
+
+		// texture commands
+		CMD_TEXTURE_CREATE,
+		CMD_TEXTURE_DESTROY,
+		CMD_TEXTURE_UPDATE,
+		CMD_TEXT_TEXTURES_CREATE,
+		CMD_TEXT_TEXTURES_DESTROY,
+		CMD_TEXT_TEXTURE_UPDATE,
+
+		// rendering
+		CMD_CLEAR,
+		CMD_RENDER,
+		CMD_RENDER_TEX3D,
+
+		// opengl 2.0+ commands (some are just emulated and only exist in opengl 3.3+)
+		CMD_CREATE_BUFFER_OBJECT, // create vbo
+		CMD_RECREATE_BUFFER_OBJECT, // recreate vbo
+		CMD_UPDATE_BUFFER_OBJECT, // update vbo
+		CMD_COPY_BUFFER_OBJECT, // copy vbo to another
+		CMD_DELETE_BUFFER_OBJECT, // delete vbo
+
+		CMD_CREATE_BUFFER_CONTAINER, // create vao
+		CMD_DELETE_BUFFER_CONTAINER, // delete vao
+		CMD_UPDATE_BUFFER_CONTAINER, // update vao
+
+		CMD_INDICES_REQUIRED_NUM_NOTIFY, // create indices that are required
+
+		CMD_RENDER_TILE_LAYER, // render a tilelayer
+		CMD_RENDER_BORDER_TILE, // render one tile multiple times
+		CMD_RENDER_QUAD_LAYER, // render a quad layer
+		CMD_RENDER_TEXT, // render text
+		CMD_RENDER_QUAD_CONTAINER, // render a quad buffer container
+		CMD_RENDER_QUAD_CONTAINER_EX, // render a quad buffer container with extended parameters
+		CMD_RENDER_QUAD_CONTAINER_SPRITE_MULTIPLE, // render a quad buffer container as sprite multiple times
+
+		// swap
+		CMD_SWAP,
+
+		// misc
+		CMD_MULTISAMPLING,
+		CMD_VSYNC,
+		CMD_TRY_SWAP_AND_SCREENSHOT,
+		CMD_UPDATE_VIEWPORT,
+
+		// in Android a window that minimizes gets destroyed
+		CMD_WINDOW_CREATE_NTF,
+		CMD_WINDOW_DESTROY_NTF,
+
+		CMD_COUNT,
+	};
+
+	enum
+	{
+		TEXFORMAT_INVALID = 0,
+		TEXFORMAT_RGBA,
+
+		TEXFLAG_NOMIPMAPS = 1,
+		TEXFLAG_TO_3D_TEXTURE = (1 << 3),
+		TEXFLAG_TO_2D_ARRAY_TEXTURE = (1 << 4),
+		TEXFLAG_NO_2D_TEXTURE = (1 << 5),
+	};
+
+	enum
+	{
+		//
+		PRIMTYPE_INVALID = 0,
+		PRIMTYPE_LINES,
+		PRIMTYPE_QUADS,
+		PRIMTYPE_TRIANGLES,
+	};
+
+	enum
+	{
+		BLEND_NONE = 0,
+		BLEND_ALPHA,
+		BLEND_ADDITIVE,
+	};
+
+	enum
+	{
+		WRAP_REPEAT = 0,
+		WRAP_CLAMP,
+	};
+
+	typedef vec2 SPoint;
+	typedef vec2 STexCoord;
+	typedef GL_SColorf SColorf;
+	typedef GL_SColor SColor;
+	typedef GL_SVertex SVertex;
+	typedef GL_SVertexTex3D SVertexTex3D;
+	typedef GL_SVertexTex3DStream SVertexTex3DStream;
+
+	struct SCommand
+	{
+	public:
+		SCommand(unsigned Cmd) :
+			m_Cmd(Cmd), m_pNext(nullptr) {}
+		unsigned m_Cmd;
+		SCommand *m_pNext;
+	};
+	SCommand *m_pCmdBufferHead;
+	SCommand *m_pCmdBufferTail;
+
+	struct SState
+	{
+		int m_BlendMode;
+		int m_WrapMode;
+		int m_Texture;
+		SPoint m_ScreenTL;
+		SPoint m_ScreenBR;
+
+		// clip
+		bool m_ClipEnable;
+		int m_ClipX;
+		int m_ClipY;
+		int m_ClipW;
+		int m_ClipH;
+	};
+
+	struct SCommand_Clear : public SCommand
+	{
+		SCommand_Clear() :
+			SCommand(CMD_CLEAR) {}
+		SColorf m_Color;
+		bool m_ForceClear;
+	};
+
+	struct SCommand_Signal : public SCommand
+	{
+		SCommand_Signal() :
+			SCommand(CMD_SIGNAL) {}
+		CSemaphore *m_pSemaphore;
+	};
+
+	struct SCommand_RunBuffer : public SCommand
+	{
+		SCommand_RunBuffer() :
+			SCommand(CMD_RUNBUFFER) {}
+		CCommandBuffer *m_pOtherBuffer;
+	};
+
+	struct SCommand_Render : public SCommand
+	{
+		SCommand_Render() :
+			SCommand(CMD_RENDER) {}
+		SState m_State;
+		unsigned m_PrimType;
+		unsigned m_PrimCount;
+		SVertex *m_pVertices; // you should use the command buffer data to allocate vertices for this command
+	};
+
+	struct SCommand_RenderTex3D : public SCommand
+	{
+		SCommand_RenderTex3D() :
+			SCommand(CMD_RENDER_TEX3D) {}
+		SState m_State;
+		unsigned m_PrimType;
+		unsigned m_PrimCount;
+		SVertexTex3DStream *m_pVertices; // you should use the command buffer data to allocate vertices for this command
+	};
+
+	struct SCommand_CreateBufferObject : public SCommand
+	{
+		SCommand_CreateBufferObject() :
+			SCommand(CMD_CREATE_BUFFER_OBJECT) {}
+
+		int m_BufferIndex;
+
+		bool m_DeletePointer;
+		void *m_pUploadData;
+		size_t m_DataSize;
+
+		int m_Flags; // @see EBufferObjectCreateFlags
+	};
+
+	struct SCommand_RecreateBufferObject : public SCommand
+	{
+		SCommand_RecreateBufferObject() :
+			SCommand(CMD_RECREATE_BUFFER_OBJECT) {}
+
+		int m_BufferIndex;
+
+		bool m_DeletePointer;
+		void *m_pUploadData;
+		size_t m_DataSize;
+
+		int m_Flags; // @see EBufferObjectCreateFlags
+	};
+
+	struct SCommand_UpdateBufferObject : public SCommand
+	{
+		SCommand_UpdateBufferObject() :
+			SCommand(CMD_UPDATE_BUFFER_OBJECT) {}
+
+		int m_BufferIndex;
+
+		bool m_DeletePointer;
+		void *m_pOffset;
+		void *m_pUploadData;
+		size_t m_DataSize;
+	};
+
+	struct SCommand_CopyBufferObject : public SCommand
+	{
+		SCommand_CopyBufferObject() :
+			SCommand(CMD_COPY_BUFFER_OBJECT) {}
+
+		int m_WriteBufferIndex;
+		int m_ReadBufferIndex;
+
+		size_t m_ReadOffset;
+		size_t m_WriteOffset;
+		size_t m_CopySize;
+	};
+
+	struct SCommand_DeleteBufferObject : public SCommand
+	{
+		SCommand_DeleteBufferObject() :
+			SCommand(CMD_DELETE_BUFFER_OBJECT) {}
+
+		int m_BufferIndex;
+	};
+
+	struct SCommand_CreateBufferContainer : public SCommand
+	{
+		SCommand_CreateBufferContainer() :
+			SCommand(CMD_CREATE_BUFFER_CONTAINER) {}
+
+		int m_BufferContainerIndex;
+
+		int m_Stride;
+		int m_VertBufferBindingIndex;
+
+		size_t m_AttrCount;
+		SBufferContainerInfo::SAttribute *m_pAttributes;
+	};
+
+	struct SCommand_UpdateBufferContainer : public SCommand
+	{
+		SCommand_UpdateBufferContainer() :
+			SCommand(CMD_UPDATE_BUFFER_CONTAINER) {}
+
+		int m_BufferContainerIndex;
+
+		int m_Stride;
+		int m_VertBufferBindingIndex;
+
+		size_t m_AttrCount;
+		SBufferContainerInfo::SAttribute *m_pAttributes;
+	};
+
+	struct SCommand_DeleteBufferContainer : public SCommand
+	{
+		SCommand_DeleteBufferContainer() :
+			SCommand(CMD_DELETE_BUFFER_CONTAINER) {}
+
+		int m_BufferContainerIndex;
+		bool m_DestroyAllBO;
+	};
+
+	struct SCommand_IndicesRequiredNumNotify : public SCommand
+	{
+		SCommand_IndicesRequiredNumNotify() :
+			SCommand(CMD_INDICES_REQUIRED_NUM_NOTIFY) {}
+
+		unsigned int m_RequiredIndicesNum;
+	};
+
+	struct SCommand_RenderTileLayer : public SCommand
+	{
+		SCommand_RenderTileLayer() :
+			SCommand(CMD_RENDER_TILE_LAYER) {}
+		SState m_State;
+		SColorf m_Color; // the color of the whole tilelayer -- already enveloped
+
+		// the char offset of all indices that should be rendered, and the amount of renders
+		char **m_pIndicesOffsets;
+		unsigned int *m_pDrawCount;
+
+		int m_IndicesDrawNum;
+		int m_BufferContainerIndex;
+	};
+
+	struct SCommand_RenderBorderTile : public SCommand
+	{
+		SCommand_RenderBorderTile() :
+			SCommand(CMD_RENDER_BORDER_TILE) {}
+		SState m_State;
+		SColorf m_Color; // the color of the whole tilelayer -- already enveloped
+		char *m_pIndicesOffset;
+		uint32_t m_DrawNum;
+		int m_BufferContainerIndex;
+
+		vec2 m_Offset;
+		vec2 m_Scale;
+	};
+
+	struct SCommand_RenderQuadLayer : public SCommand
+	{
+		SCommand_RenderQuadLayer() :
+			SCommand(CMD_RENDER_QUAD_LAYER) {}
+		SState m_State;
+
+		int m_BufferContainerIndex;
+		SQuadRenderInfo *m_pQuadInfo;
+		size_t m_QuadNum;
+		int m_QuadOffset;
+	};
+
+	struct SCommand_RenderText : public SCommand
+	{
+		SCommand_RenderText() :
+			SCommand(CMD_RENDER_TEXT) {}
+		SState m_State;
+
+		int m_BufferContainerIndex;
+		int m_TextureSize;
+
+		int m_TextTextureIndex;
+		int m_TextOutlineTextureIndex;
+
+		int m_DrawNum;
+		ColorRGBA m_TextColor;
+		ColorRGBA m_TextOutlineColor;
+	};
+
+	struct SCommand_RenderQuadContainer : public SCommand
+	{
+		SCommand_RenderQuadContainer() :
+			SCommand(CMD_RENDER_QUAD_CONTAINER) {}
+		SState m_State;
+
+		int m_BufferContainerIndex;
+
+		unsigned int m_DrawNum;
+		void *m_pOffset;
+	};
+
+	struct SCommand_RenderQuadContainerEx : public SCommand
+	{
+		SCommand_RenderQuadContainerEx() :
+			SCommand(CMD_RENDER_QUAD_CONTAINER_EX) {}
+		SState m_State;
+
+		int m_BufferContainerIndex;
+
+		float m_Rotation;
+		SPoint m_Center;
+
+		SColorf m_VertexColor;
+
+		unsigned int m_DrawNum;
+		void *m_pOffset;
+	};
+
+	struct SCommand_RenderQuadContainerAsSpriteMultiple : public SCommand
+	{
+		SCommand_RenderQuadContainerAsSpriteMultiple() :
+			SCommand(CMD_RENDER_QUAD_CONTAINER_SPRITE_MULTIPLE) {}
+		SState m_State;
+
+		int m_BufferContainerIndex;
+
+		IGraphics::SRenderSpriteInfo *m_pRenderInfo;
+
+		SPoint m_Center;
+		SColorf m_VertexColor;
+
+		unsigned int m_DrawNum;
+		unsigned int m_DrawCount;
+		void *m_pOffset;
+	};
+
+	struct SCommand_TrySwapAndScreenshot : public SCommand
+	{
+		SCommand_TrySwapAndScreenshot() :
+			SCommand(CMD_TRY_SWAP_AND_SCREENSHOT) {}
+		CImageInfo *m_pImage; // processor will fill this out, the one who adds this command must free the data as well
+		bool *m_pSwapped;
+	};
+
+	struct SCommand_Swap : public SCommand
+	{
+		SCommand_Swap() :
+			SCommand(CMD_SWAP) {}
+	};
+
+	struct SCommand_VSync : public SCommand
+	{
+		SCommand_VSync() :
+			SCommand(CMD_VSYNC) {}
+
+		int m_VSync;
+		bool *m_pRetOk;
+	};
+
+	struct SCommand_MultiSampling : public SCommand
+	{
+		SCommand_MultiSampling() :
+			SCommand(CMD_MULTISAMPLING) {}
+
+		uint32_t m_RequestedMultiSamplingCount;
+		uint32_t *m_pRetMultiSamplingCount;
+		bool *m_pRetOk;
+	};
+
+	struct SCommand_Update_Viewport : public SCommand
+	{
+		SCommand_Update_Viewport() :
+			SCommand(CMD_UPDATE_VIEWPORT) {}
+
+		int m_X;
+		int m_Y;
+		int m_Width;
+		int m_Height;
+		bool m_ByResize; // resized by an resize event.. a hint to make clear that the viewport update can be deferred if wanted
+	};
+
+	struct SCommand_Texture_Create : public SCommand
+	{
+		SCommand_Texture_Create() :
+			SCommand(CMD_TEXTURE_CREATE) {}
+
+		// texture information
+		int m_Slot;
+
+		size_t m_Width;
+		size_t m_Height;
+		int m_Format;
+		int m_StoreFormat;
+		int m_Flags;
+		void *m_pData; // will be freed by the command processor
+	};
+
+	struct SCommand_Texture_Update : public SCommand
+	{
+		SCommand_Texture_Update() :
+			SCommand(CMD_TEXTURE_UPDATE) {}
+
+		// texture information
+		int m_Slot;
+
+		int m_X;
+		int m_Y;
+		size_t m_Width;
+		size_t m_Height;
+		int m_Format;
+		void *m_pData; // will be freed by the command processor
+	};
+
+	struct SCommand_Texture_Destroy : public SCommand
+	{
+		SCommand_Texture_Destroy() :
+			SCommand(CMD_TEXTURE_DESTROY) {}
+
+		// texture information
+		int m_Slot;
+	};
+
+	struct SCommand_TextTextures_Create : public SCommand
+	{
+		SCommand_TextTextures_Create() :
+			SCommand(CMD_TEXT_TEXTURES_CREATE) {}
+
+		// texture information
+		int m_Slot;
+		int m_SlotOutline;
+
+		size_t m_Width;
+		size_t m_Height;
+
+		void *m_pTextData;
+		void *m_pTextOutlineData;
+	};
+
+	struct SCommand_TextTextures_Destroy : public SCommand
+	{
+		SCommand_TextTextures_Destroy() :
+			SCommand(CMD_TEXT_TEXTURES_DESTROY) {}
+
+		// texture information
+		int m_Slot;
+		int m_SlotOutline;
+	};
+
+	struct SCommand_TextTexture_Update : public SCommand
+	{
+		SCommand_TextTexture_Update() :
+			SCommand(CMD_TEXT_TEXTURE_UPDATE) {}
+
+		// texture information
+		int m_Slot;
+
+		int m_X;
+		int m_Y;
+		size_t m_Width;
+		size_t m_Height;
+		void *m_pData; // will be freed by the command processor
+	};
+
+	struct SCommand_WindowCreateNtf : public CCommandBuffer::SCommand
+	{
+		SCommand_WindowCreateNtf() :
+			SCommand(CMD_WINDOW_CREATE_NTF) {}
+
+		uint32_t m_WindowID;
+	};
+
+	struct SCommand_WindowDestroyNtf : public CCommandBuffer::SCommand
+	{
+		SCommand_WindowDestroyNtf() :
+			SCommand(CMD_WINDOW_DESTROY_NTF) {}
+
+		uint32_t m_WindowID;
+	};
+
+	//
+	CCommandBuffer(unsigned CmdBufferSize, unsigned DataBufferSize) :
+		m_CmdBuffer(CmdBufferSize), m_DataBuffer(DataBufferSize), m_pCmdBufferHead(nullptr), m_pCmdBufferTail(nullptr)
+	{
+	}
+
+	void *AllocData(unsigned WantedSize)
+	{
+		return m_DataBuffer.Alloc(WantedSize);
+	}
+
+	template<class T>
+	bool AddCommandUnsafe(const T &Command)
+	{
+		// make sure that we don't do something stupid like ->AddCommand(&Cmd);
+		(void)static_cast<const SCommand *>(&Command);
+
+		// allocate and copy the command into the buffer
+		T *pCmd = (T *)m_CmdBuffer.Alloc(sizeof(*pCmd), alignof(T));
+		if(!pCmd)
+			return false;
+		*pCmd = Command;
+		pCmd->m_pNext = nullptr;
+
+		if(m_pCmdBufferTail)
+			m_pCmdBufferTail->m_pNext = pCmd;
+		if(!m_pCmdBufferHead)
+			m_pCmdBufferHead = pCmd;
+		m_pCmdBufferTail = pCmd;
+
+		++m_CommandCount;
+
+		return true;
+	}
+
+	SCommand *Head()
+	{
+		return m_pCmdBufferHead;
+	}
+
+	void Reset()
+	{
+		m_pCmdBufferHead = m_pCmdBufferTail = nullptr;
+		m_CmdBuffer.Reset();
+		m_DataBuffer.Reset();
+
+		m_CommandCount = 0;
+		m_RenderCallCount = 0;
+	}
+
+	void AddRenderCalls(size_t RenderCallCountToAdd)
+	{
+		m_RenderCallCount += RenderCallCountToAdd;
+	}
+};
+
+enum EGraphicsBackendErrorCodes
+{
+	GRAPHICS_BACKEND_ERROR_CODE_UNKNOWN = -1,
+	GRAPHICS_BACKEND_ERROR_CODE_NONE = 0,
+	GRAPHICS_BACKEND_ERROR_CODE_GL_CONTEXT_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_GL_VERSION_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_SDL_INIT_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_REQUEST_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_INFO_REQUEST_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_SDL_SCREEN_RESOLUTION_REQUEST_FAILED,
+	GRAPHICS_BACKEND_ERROR_CODE_SDL_WINDOW_CREATE_FAILED,
+};
+
+// interface for the graphics backend
+// all these functions are called on the main thread
+class IGraphicsBackend
+{
+public:
+	enum
+	{
+		INITFLAG_FULLSCREEN = 1 << 0,
+		INITFLAG_VSYNC = 1 << 1,
+		INITFLAG_RESIZABLE = 1 << 2,
+		INITFLAG_BORDERLESS = 1 << 3,
+		INITFLAG_HIGHDPI = 1 << 4,
+		INITFLAG_DESKTOP_FULLSCREEN = 1 << 5,
+	};
+
+	virtual ~IGraphicsBackend() = default;
+
+	virtual int Init(const char *pName, int *pScreen, int *pWidth, int *pHeight, int *pRefreshRate, int *pFsaaSamples, int Flags, int *pDesktopWidth, int *pDesktopHeight, int *pCurrentWidth, int *pCurrentHeight, class IStorage *pStorage) = 0;
+	virtual int Shutdown() = 0;
+
+	virtual uint64_t TextureMemoryUsage() const = 0;
+	virtual uint64_t BufferMemoryUsage() const = 0;
+	virtual uint64_t StreamedMemoryUsage() const = 0;
+	virtual uint64_t StagingMemoryUsage() const = 0;
+
+	virtual const TTWGraphicsGPUList &GetGPUs() const = 0;
+
+	virtual void GetVideoModes(CVideoMode *pModes, int MaxModes, int *pNumModes, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int Screen) = 0;
+	virtual void GetCurrentVideoMode(CVideoMode &CurMode, int HiDPIScale, int MaxWindowWidth, int MaxWindowHeight, int Screen) = 0;
+
+	virtual int GetNumScreens() const = 0;
+	virtual const char *GetScreenName(int Screen) const = 0;
+
+	virtual void Minimize() = 0;
+	virtual void Maximize() = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual bool SetWindowScreen(int Index) = 0;
+	virtual bool UpdateDisplayMode(int Index) = 0;
+	virtual int GetWindowScreen() = 0;
+	virtual int WindowActive() = 0;
+	virtual int WindowOpen() = 0;
+	virtual void SetWindowGrab(bool Grab) = 0;
+	// returns true, if the video mode changed
+	virtual bool ResizeWindow(int w, int h, int RefreshRate) = 0;
+	virtual void GetViewportSize(int &w, int &h) = 0;
+	virtual void NotifyWindow() = 0;
+
+	virtual void WindowDestroyNtf(uint32_t WindowID) = 0;
+	virtual void WindowCreateNtf(uint32_t WindowID) = 0;
+
+	virtual void RunBuffer(CCommandBuffer *pBuffer) = 0;
+	virtual void RunBufferSingleThreadedUnsafe(CCommandBuffer *pBuffer) = 0;
+	virtual bool IsIdle() const = 0;
+	virtual void WaitForIdle() = 0;
+
+	virtual bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) = 0;
+	// checks if the current values of the config are a graphics modern API
+	virtual bool IsConfigModernAPI() { return false; }
+	virtual bool UseTrianglesAsQuad() { return false; }
+	virtual bool HasTileBuffering() { return false; }
+	virtual bool HasQuadBuffering() { return false; }
+	virtual bool HasTextBuffering() { return false; }
+	virtual bool HasQuadContainerBuffering() { return false; }
+	virtual bool Uses2DTextureArrays() { return false; }
+	virtual bool HasTextureArraysSupport() { return false; }
+	virtual const char *GetErrorString() { return NULL; }
+
+	virtual const char *GetVendorString() = 0;
+	virtual const char *GetVersionString() = 0;
+	virtual const char *GetRendererString() = 0;
+
+	// be aware that this function should only be called from the graphics thread, and even then you should really know what you are doing
+	virtual TGLBackendReadPresentedImageData &GetReadPresentedImageDataFuncUnsafe() = 0;
+
+	virtual bool GetWarning(std::vector<std::string> &WarningStrings) = 0;
+
+	// returns true if the error msg was shown
+	virtual bool ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg) = 0;
+};
+
+class CGraphics_Threaded : public IEngineGraphics
+{
+	enum
+	{
+		NUM_CMDBUFFERS = 2,
+
+		DRAWING_QUADS = 1,
+		DRAWING_LINES = 2,
+		DRAWING_TRIANGLES = 3
+	};
+
+	CCommandBuffer::SState m_State;
+	IGraphicsBackend *m_pBackend;
+	bool m_GLTileBufferingEnabled;
+	bool m_GLQuadBufferingEnabled;
+	bool m_GLTextBufferingEnabled;
+	bool m_GLQuadContainerBufferingEnabled;
+	bool m_GLUses2DTextureArrays;
+	bool m_GLHasTextureArraysSupport;
+	bool m_GLUseTrianglesAsQuad;
+
+	CCommandBuffer *m_apCommandBuffers[NUM_CMDBUFFERS];
+	CCommandBuffer *m_pCommandBuffer;
+	unsigned m_CurrentCommandBuffer;
+
+	//
+	class IStorage *m_pStorage;
+	class IConsole *m_pConsole;
+	class IEngine *m_pEngine;
+
+	int m_CurIndex;
+
+	CCommandBuffer::SVertex m_aVertices[CCommandBuffer::MAX_VERTICES];
+	CCommandBuffer::SVertexTex3DStream m_aVerticesTex3D[CCommandBuffer::MAX_VERTICES];
+	int m_NumVertices;
+
+	CCommandBuffer::SColor m_aColor[4];
+	CCommandBuffer::STexCoord m_aTexture[4];
+
+	bool m_RenderEnable;
+
+	float m_Rotation;
+	int m_Drawing;
+	bool m_DoScreenshot;
+	char m_aScreenshotName[IO_MAX_PATH_LENGTH];
+
+	CTextureHandle m_NullTexture;
+
+	std::vector<int> m_vTextureIndices;
+	size_t m_FirstFreeTexture;
+	int m_TextureMemoryUsage;
+
+	std::vector<uint8_t> m_vSpriteHelper;
+
+	bool m_WarnPngliteIncompatibleImages = false;
+
+	std::vector<SWarning> m_vWarnings;
+
+	// is a non full windowed (in a sense that the viewport won't include the whole window),
+	// forced viewport, so that it justifies our UI ratio needs
+	bool m_IsForcedViewport = false;
+
+	struct SVertexArrayInfo
+	{
+		SVertexArrayInfo() :
+			m_FreeIndex(-1) {}
+		// keep a reference to it, so we can free the ID
+		int m_AssociatedBufferObjectIndex;
+
+		int m_FreeIndex;
+	};
+	std::vector<SVertexArrayInfo> m_vVertexArrayInfo;
+	int m_FirstFreeVertexArrayInfo;
+
+	std::vector<int> m_vBufferObjectIndices;
+	int m_FirstFreeBufferObjectIndex;
+
+	struct SQuadContainer
+	{
+		SQuadContainer(bool AutomaticUpload = true)
+		{
+			m_vQuads.clear();
+			m_QuadBufferObjectIndex = m_QuadBufferContainerIndex = -1;
+			m_FreeIndex = -1;
+
+			m_AutomaticUpload = AutomaticUpload;
+		}
+
+		struct SQuad
+		{
+			CCommandBuffer::SVertex m_aVertices[4];
+		};
+
+		std::vector<SQuad> m_vQuads;
+
+		int m_QuadBufferObjectIndex;
+		int m_QuadBufferContainerIndex;
+
+		int m_FreeIndex;
+
+		bool m_AutomaticUpload;
+	};
+	std::vector<SQuadContainer> m_vQuadContainers;
+	int m_FirstFreeQuadContainer;
+
+	std::vector<WINDOW_RESIZE_FUNC> m_vResizeListeners;
+	std::vector<WINDOW_PROPS_CHANGED_FUNC> m_vPropChangeListeners;
+
+	void *AllocCommandBufferData(size_t AllocSize);
+
+	void AddVertices(int Count);
+	void AddVertices(int Count, CCommandBuffer::SVertex *pVertices);
+	void AddVertices(int Count, CCommandBuffer::SVertexTex3DStream *pVertices);
+
+	template<typename TName>
+	void Rotate(const CCommandBuffer::SPoint &rCenter, TName *pPoints, int NumPoints)
+	{
+		float c = std::cos(m_Rotation);
+		float s = std::sin(m_Rotation);
+		float x, y;
+		int i;
+
+		TName *pVertices = pPoints;
+		for(i = 0; i < NumPoints; i++)
+		{
+			x = pVertices[i].m_Pos.x - rCenter.x;
+			y = pVertices[i].m_Pos.y - rCenter.y;
+			pVertices[i].m_Pos.x = x * c - y * s + rCenter.x;
+			pVertices[i].m_Pos.y = x * s + y * c + rCenter.y;
+		}
+	}
+
+	template<typename TName>
+	void AddCmd(
+		TName &Cmd, std::function<bool()> FailFunc = [] { return true; })
+	{
+		if(m_pCommandBuffer->AddCommandUnsafe(Cmd))
+			return;
+
+		// kick command buffer and try again
+		KickCommandBuffer();
+
+		if(!FailFunc())
+		{
+			char aError[256];
+			str_format(aError, sizeof(aError), "graphics: failed to run fail handler for command '%s'", typeid(TName).name());
+			dbg_assert(false, aError);
+		}
+
+		if(!m_pCommandBuffer->AddCommandUnsafe(Cmd))
+		{
+			char aError[256];
+			str_format(aError, sizeof(aError), "graphics: failed to add command '%s' to command buffer", typeid(TName).name());
+			dbg_assert(false, aError);
+		}
+	}
+
+	void KickCommandBuffer();
+
+	void AddBackEndWarningIfExists();
+
+	void AdjustViewport(bool SendViewportChangeToBackend);
+
+	int IssueInit();
+	int InitWindow();
+
+public:
+	CGraphics_Threaded();
+
+	void ClipEnable(int x, int y, int w, int h) override;
+	void ClipDisable() override;
+
+	void BlendNone() override;
+	void BlendNormal() override;
+	void BlendAdditive() override;
+
+	void WrapNormal() override;
+	void WrapClamp() override;
+
+	uint64_t TextureMemoryUsage() const override;
+	uint64_t BufferMemoryUsage() const override;
+	uint64_t StreamedMemoryUsage() const override;
+	uint64_t StagingMemoryUsage() const override;
+
+	const TTWGraphicsGPUList &GetGPUs() const override;
+
+	void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY) override;
+	void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY) override;
+
+	void LinesBegin() override;
+	void LinesEnd() override;
+	void LinesDraw(const CLineItem *pArray, int Num) override;
+
+	IGraphics::CTextureHandle FindFreeTextureIndex();
+	void FreeTextureIndex(CTextureHandle *pIndex);
+	int UnloadTexture(IGraphics::CTextureHandle *pIndex) override;
+	IGraphics::CTextureHandle LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName = nullptr) override;
+	int LoadTextureRawSub(IGraphics::CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData) override;
+	IGraphics::CTextureHandle NullTexture() const override;
+
+	bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData) override;
+	bool UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture) override;
+	bool UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData) override;
+
+	CTextureHandle LoadSpriteTextureImpl(CImageInfo &FromImageInfo, int x, int y, size_t w, size_t h);
+	CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) override;
+
+	bool IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h) override;
+	bool IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) override;
+
+	// simple uncompressed RGBA loaders
+	IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) override;
+	bool LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) override;
+	void FreePNG(CImageInfo *pImg) override;
+
+	bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) override;
+	bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override;
+
+	void CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override;
+	void CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight) override;
+
+	bool ScreenshotDirect();
+
+	void TextureSet(CTextureHandle TextureID) override;
+
+	void Clear(float r, float g, float b, bool ForceClearNow = false) override;
+
+	void QuadsBegin() override;
+	void QuadsEnd() override;
+	void QuadsTex3DBegin() override;
+	void QuadsTex3DEnd() override;
+	void TrianglesBegin() override;
+	void TrianglesEnd() override;
+	void QuadsEndKeepVertices() override;
+	void QuadsDrawCurrentVertices(bool KeepVertices = true) override;
+	void QuadsSetRotation(float Angle) override;
+
+	template<typename TName>
+	void SetColor(TName *pVertex, int ColorIndex)
+	{
+		TName *pVert = pVertex;
+		pVert->m_Color = m_aColor[ColorIndex];
+	}
+
+	void SetColorVertex(const CColorVertex *pArray, int Num) override;
+	void SetColor(float r, float g, float b, float a) override;
+	void SetColor(ColorRGBA Color) override;
+	void SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight) override;
+
+	// go through all vertices and change their color (only works for quads)
+	void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) override;
+	void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
+
+	void QuadsSetSubset(float TlU, float TlV, float BrU, float BrV) override;
+	void QuadsSetSubsetFree(
+		float x0, float y0, float x1, float y1,
+		float x2, float y2, float x3, float y3, int Index = -1) override;
+
+	void QuadsDraw(CQuadItem *pArray, int Num) override;
+
+	template<typename TName>
+	void QuadsDrawTLImpl(TName *pVertices, const CQuadItem *pArray, int Num)
+	{
+		CCommandBuffer::SPoint Center;
+
+		dbg_assert(m_Drawing == DRAWING_QUADS, "called Graphics()->QuadsDrawTL without begin");
+
+		if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
+		{
+			for(int i = 0; i < Num; ++i)
+			{
+				// first triangle
+				pVertices[m_NumVertices + 6 * i].m_Pos.x = pArray[i].m_X;
+				pVertices[m_NumVertices + 6 * i].m_Pos.y = pArray[i].m_Y;
+				pVertices[m_NumVertices + 6 * i].m_Tex = m_aTexture[0];
+				SetColor(&pVertices[m_NumVertices + 6 * i], 0);
+
+				pVertices[m_NumVertices + 6 * i + 1].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+				pVertices[m_NumVertices + 6 * i + 1].m_Pos.y = pArray[i].m_Y;
+				pVertices[m_NumVertices + 6 * i + 1].m_Tex = m_aTexture[1];
+				SetColor(&pVertices[m_NumVertices + 6 * i + 1], 1);
+
+				pVertices[m_NumVertices + 6 * i + 2].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+				pVertices[m_NumVertices + 6 * i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+				pVertices[m_NumVertices + 6 * i + 2].m_Tex = m_aTexture[2];
+				SetColor(&pVertices[m_NumVertices + 6 * i + 2], 2);
+
+				// second triangle
+				pVertices[m_NumVertices + 6 * i + 3].m_Pos.x = pArray[i].m_X;
+				pVertices[m_NumVertices + 6 * i + 3].m_Pos.y = pArray[i].m_Y;
+				pVertices[m_NumVertices + 6 * i + 3].m_Tex = m_aTexture[0];
+				SetColor(&pVertices[m_NumVertices + 6 * i + 3], 0);
+
+				pVertices[m_NumVertices + 6 * i + 4].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+				pVertices[m_NumVertices + 6 * i + 4].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+				pVertices[m_NumVertices + 6 * i + 4].m_Tex = m_aTexture[2];
+				SetColor(&pVertices[m_NumVertices + 6 * i + 4], 2);
+
+				pVertices[m_NumVertices + 6 * i + 5].m_Pos.x = pArray[i].m_X;
+				pVertices[m_NumVertices + 6 * i + 5].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+				pVertices[m_NumVertices + 6 * i + 5].m_Tex = m_aTexture[3];
+				SetColor(&pVertices[m_NumVertices + 6 * i + 5], 3);
+
+				if(m_Rotation != 0)
+				{
+					Center.x = pArray[i].m_X + pArray[i].m_Width / 2;
+					Center.y = pArray[i].m_Y + pArray[i].m_Height / 2;
+
+					Rotate(Center, &pVertices[m_NumVertices + 6 * i], 6);
+				}
+			}
+
+			AddVertices(3 * 2 * Num, pVertices);
+		}
+		else
+		{
+			for(int i = 0; i < Num; ++i)
+			{
+				pVertices[m_NumVertices + 4 * i].m_Pos.x = pArray[i].m_X;
+				pVertices[m_NumVertices + 4 * i].m_Pos.y = pArray[i].m_Y;
+				pVertices[m_NumVertices + 4 * i].m_Tex = m_aTexture[0];
+				SetColor(&pVertices[m_NumVertices + 4 * i], 0);
+
+				pVertices[m_NumVertices + 4 * i + 1].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+				pVertices[m_NumVertices + 4 * i + 1].m_Pos.y = pArray[i].m_Y;
+				pVertices[m_NumVertices + 4 * i + 1].m_Tex = m_aTexture[1];
+				SetColor(&pVertices[m_NumVertices + 4 * i + 1], 1);
+
+				pVertices[m_NumVertices + 4 * i + 2].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
+				pVertices[m_NumVertices + 4 * i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+				pVertices[m_NumVertices + 4 * i + 2].m_Tex = m_aTexture[2];
+				SetColor(&pVertices[m_NumVertices + 4 * i + 2], 2);
+
+				pVertices[m_NumVertices + 4 * i + 3].m_Pos.x = pArray[i].m_X;
+				pVertices[m_NumVertices + 4 * i + 3].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
+				pVertices[m_NumVertices + 4 * i + 3].m_Tex = m_aTexture[3];
+				SetColor(&pVertices[m_NumVertices + 4 * i + 3], 3);
+
+				if(m_Rotation != 0)
+				{
+					Center.x = pArray[i].m_X + pArray[i].m_Width / 2;
+					Center.y = pArray[i].m_Y + pArray[i].m_Height / 2;
+
+					Rotate(Center, &pVertices[m_NumVertices + 4 * i], 4);
+				}
+			}
+
+			AddVertices(4 * Num, pVertices);
+		}
+	}
+
+	void QuadsDrawTL(const CQuadItem *pArray, int Num) override;
+
+	void QuadsTex3DDrawTL(const CQuadItem *pArray, int Num) override;
+
+	void QuadsDrawFreeform(const CFreeformItem *pArray, int Num) override;
+	void QuadsText(float x, float y, float Size, const char *pText) override;
+
+	void DrawRectExt(float x, float y, float w, float h, float r, int Corners) override;
+	void DrawRectExt4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, float r, int Corners) override;
+	int CreateRectQuadContainer(float x, float y, float w, float h, float r, int Corners) override;
+	void DrawRect(float x, float y, float w, float h, ColorRGBA Color, int Corners, float Rounding) override;
+	void DrawRect4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding) override;
+	void DrawCircle(float CenterX, float CenterY, float Radius, int Segments) override;
+
+	const GL_STexCoord *GetCurTextureCoordinates() override
+	{
+		return m_aTexture;
+	}
+
+	const GL_SColor *GetCurColor() override
+	{
+		return m_aColor;
+	}
+
+	int CreateQuadContainer(bool AutomaticUpload = true) override;
+	void QuadContainerChangeAutomaticUpload(int ContainerIndex, bool AutomaticUpload) override;
+	void QuadContainerUpload(int ContainerIndex) override;
+	int QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num) override;
+	int QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num) override;
+	void QuadContainerReset(int ContainerIndex) override;
+	void DeleteQuadContainer(int &ContainerIndex) override;
+	void RenderQuadContainer(int ContainerIndex, int QuadDrawNum) override;
+	void RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum, bool ChangeWrapMode = true) override;
+	void RenderQuadContainerEx(int ContainerIndex, int QuadOffset, int QuadDrawNum, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) override;
+	void RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) override;
+	void RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo) override;
+
+	template<typename TName>
+	void FlushVerticesImpl(bool KeepVertices, int &PrimType, size_t &PrimCount, size_t &NumVerts, TName &Command, size_t VertSize)
+	{
+		Command.m_pVertices = nullptr;
+		if(m_NumVertices == 0)
+			return;
+
+		NumVerts = m_NumVertices;
+
+		if(!KeepVertices)
+			m_NumVertices = 0;
+
+		if(m_Drawing == DRAWING_QUADS)
+		{
+			if(g_Config.m_GfxQuadAsTriangle && !m_GLUseTrianglesAsQuad)
+			{
+				PrimType = CCommandBuffer::PRIMTYPE_TRIANGLES;
+				PrimCount = NumVerts / 3;
+			}
+			else
+			{
+				PrimType = CCommandBuffer::PRIMTYPE_QUADS;
+				PrimCount = NumVerts / 4;
+			}
+		}
+		else if(m_Drawing == DRAWING_LINES)
+		{
+			PrimType = CCommandBuffer::PRIMTYPE_LINES;
+			PrimCount = NumVerts / 2;
+		}
+		else if(m_Drawing == DRAWING_TRIANGLES)
+		{
+			PrimType = CCommandBuffer::PRIMTYPE_TRIANGLES;
+			PrimCount = NumVerts / 3;
+		}
+		else
+			return;
+
+		Command.m_pVertices = (decltype(Command.m_pVertices))AllocCommandBufferData(VertSize * NumVerts);
+		Command.m_State = m_State;
+
+		Command.m_PrimType = PrimType;
+		Command.m_PrimCount = PrimCount;
+
+		AddCmd(Command, [&] {
+			Command.m_pVertices = (decltype(Command.m_pVertices))m_pCommandBuffer->AllocData(VertSize * NumVerts);
+			return Command.m_pVertices != nullptr;
+		});
+
+		m_pCommandBuffer->AddRenderCalls(1);
+	}
+
+	void FlushVertices(bool KeepVertices = false) override;
+	void FlushVerticesTex3D() override;
+
+	void RenderTileLayer(int BufferContainerIndex, const ColorRGBA &Color, char **pOffsets, unsigned int *pIndicedVertexDrawNum, size_t NumIndicesOffset) override;
+	virtual void RenderBorderTiles(int BufferContainerIndex, const ColorRGBA &Color, char *pIndexBufferOffset, const vec2 &Offset, const vec2 &Scale, uint32_t DrawNum) override;
+	void RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo *pQuadInfo, size_t QuadNum, int QuadOffset) override;
+	void RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor) override;
+
+	// modern GL functions
+	int CreateBufferObject(size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) override;
+	void RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) override;
+	void UpdateBufferObjectInternal(int BufferIndex, size_t UploadDataSize, void *pUploadData, void *pOffset, bool IsMovedPointer = false);
+	void CopyBufferObjectInternal(int WriteBufferIndex, int ReadBufferIndex, size_t WriteOffset, size_t ReadOffset, size_t CopyDataSize);
+	void DeleteBufferObject(int BufferIndex) override;
+
+	int CreateBufferContainer(SBufferContainerInfo *pContainerInfo) override;
+	// destroying all buffer objects means, that all referenced VBOs are destroyed automatically, so the user does not need to save references to them
+	void DeleteBufferContainer(int &ContainerIndex, bool DestroyAllBO = true) override;
+	void UpdateBufferContainerInternal(int ContainerIndex, SBufferContainerInfo *pContainerInfo);
+	void IndicesNumRequiredNotify(unsigned int RequiredIndicesCount) override;
+
+	int GetNumScreens() const override;
+	const char *GetScreenName(int Screen) const override;
+
+	void Minimize() override;
+	void Maximize() override;
+	void WarnPngliteIncompatibleImages(bool Warn) override;
+	void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) override;
+	bool SetWindowScreen(int Index) override;
+	void Move(int x, int y) override;
+	void Resize(int w, int h, int RefreshRate) override;
+	void GotResized(int w, int h, int RefreshRate) override;
+	void UpdateViewport(int X, int Y, int W, int H, bool ByResize) override;
+	void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc) override;
+	void AddWindowPropChangeListener(WINDOW_PROPS_CHANGED_FUNC pFunc) override;
+	int GetWindowScreen() override;
+
+	void WindowDestroyNtf(uint32_t WindowID) override;
+	void WindowCreateNtf(uint32_t WindowID) override;
+
+	int WindowActive() override;
+	int WindowOpen() override;
+
+	void SetWindowGrab(bool Grab) override;
+	void NotifyWindow() override;
+
+	int Init() override;
+	void Shutdown() override;
+
+	void TakeScreenshot(const char *pFilename) override;
+	void TakeCustomScreenshot(const char *pFilename) override;
+	void Swap() override;
+	bool SetVSync(bool State) override;
+	bool SetMultiSampling(uint32_t ReqMultiSamplingCount, uint32_t &MultiSamplingCountBackend) override;
+
+	int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) override;
+
+	virtual int GetDesktopScreenWidth() const { return g_Config.m_GfxDesktopWidth; }
+	virtual int GetDesktopScreenHeight() const { return g_Config.m_GfxDesktopHeight; }
+
+	// synchronization
+	void InsertSignal(CSemaphore *pSemaphore) override;
+	bool IsIdle() const override;
+	void WaitForIdle() override;
+
+	SWarning *GetCurWarning() override;
+	bool ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg) override;
+	bool IsBackendInitialized() override;
+
+	bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) override { return m_pBackend->GetDriverVersion(DriverAgeType, Major, Minor, Patch, pName, BackendType); }
+	bool IsConfigModernAPI() override { return m_pBackend->IsConfigModernAPI(); }
+	bool IsTileBufferingEnabled() override { return m_GLTileBufferingEnabled; }
+	bool IsQuadBufferingEnabled() override { return m_GLQuadBufferingEnabled; }
+	bool IsTextBufferingEnabled() override { return m_GLTextBufferingEnabled; }
+	bool IsQuadContainerBufferingEnabled() override { return m_GLQuadContainerBufferingEnabled; }
+	bool Uses2DTextureArrays() override { return m_GLUses2DTextureArrays; }
+	bool HasTextureArraysSupport() override { return m_GLHasTextureArraysSupport; }
+
+	const char *GetVendorString() override;
+	const char *GetVersionString() override;
+	const char *GetRendererString() override;
+
+	TGLBackendReadPresentedImageData &GetReadPresentedImageDataFuncUnsafe() override;
+};
+
+typedef std::function<const char *(const char *, const char *)> TTranslateFunc;
+extern IGraphicsBackend *CreateGraphicsBackend(TTranslateFunc &&TranslateFunc);
+
+#endif // ENGINE_CLIENT_GRAPHICS_THREADED_H
diff --git a/src_bkp/engine/client/input.cpp b/src_bkp/engine/client/input.cpp
new file mode 100644
index 0000000000..7de5a9e31d
--- /dev/null
+++ b/src_bkp/engine/client/input.cpp
@@ -0,0 +1,838 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <SDL.h>
+
+#include <base/system.h>
+#include <engine/console.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+
+#include "input.h"
+
+// this header is protected so you don't include it from anywhere
+#define KEYS_INCLUDE
+#include "keynames.h"
+#undef KEYS_INCLUDE
+
+// support older SDL version (pre 2.0.6)
+#ifndef SDL_JOYSTICK_AXIS_MIN
+#define SDL_JOYSTICK_AXIS_MIN (-32768)
+#endif
+#ifndef SDL_JOYSTICK_AXIS_MAX
+#define SDL_JOYSTICK_AXIS_MAX 32767
+#endif
+
+#if defined(CONF_FAMILY_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+// windows.h must be included before imm.h, but clang-format requires includes to be sorted alphabetically, hence this comment.
+#include <imm.h>
+#endif
+
+// for platform specific features that aren't available or are broken in SDL
+#include <SDL_syswm.h>
+
+void CInput::AddEvent(char *pText, int Key, int Flags)
+{
+	if(m_NumEvents != INPUT_BUFFER_SIZE)
+	{
+		m_aInputEvents[m_NumEvents].m_Key = Key;
+		m_aInputEvents[m_NumEvents].m_Flags = Flags;
+		if(pText == nullptr)
+			m_aInputEvents[m_NumEvents].m_aText[0] = '\0';
+		else
+			str_copy(m_aInputEvents[m_NumEvents].m_aText, pText);
+		m_aInputEvents[m_NumEvents].m_InputCount = m_InputCounter;
+		m_NumEvents++;
+	}
+}
+
+CInput::CInput()
+{
+	mem_zero(m_aInputCount, sizeof(m_aInputCount));
+	mem_zero(m_aInputState, sizeof(m_aInputState));
+
+	m_LastUpdate = 0;
+	m_UpdateTime = 0.0f;
+
+	m_InputCounter = 1;
+	m_InputGrabbed = false;
+
+	m_MouseDoubleClick = false;
+
+	m_NumEvents = 0;
+	m_MouseFocus = true;
+
+	m_pClipboardText = nullptr;
+
+	m_CompositionLength = COMP_LENGTH_INACTIVE;
+	m_CompositionCursor = 0;
+	m_CandidateSelectedIndex = -1;
+
+	m_aDropFile[0] = '\0';
+}
+
+void CInput::Init()
+{
+	StopTextInput();
+
+	m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+
+	MouseModeRelative();
+
+	InitJoysticks();
+}
+
+void CInput::Shutdown()
+{
+	SDL_free(m_pClipboardText);
+	CloseJoysticks();
+}
+
+void CInput::InitJoysticks()
+{
+	if(!SDL_WasInit(SDL_INIT_JOYSTICK))
+	{
+		if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
+		{
+			dbg_msg("joystick", "Unable to init SDL joystick system: %s", SDL_GetError());
+			return;
+		}
+	}
+
+	const int NumJoysticks = SDL_NumJoysticks();
+	dbg_msg("joystick", "%d joystick(s) found", NumJoysticks);
+	for(int i = 0; i < NumJoysticks; i++)
+		OpenJoystick(i);
+	UpdateActiveJoystick();
+
+	Console()->Chain("inp_controller_guid", ConchainJoystickGuidChanged, this);
+}
+
+bool CInput::OpenJoystick(int JoystickIndex)
+{
+	SDL_Joystick *pJoystick = SDL_JoystickOpen(JoystickIndex);
+	if(!pJoystick)
+	{
+		dbg_msg("joystick", "Could not open joystick %d: '%s'", JoystickIndex, SDL_GetError());
+		return false;
+	}
+	if(std::find_if(m_vJoysticks.begin(), m_vJoysticks.end(), [pJoystick](const CJoystick &Joystick) -> bool { return Joystick.m_pDelegate == pJoystick; }) != m_vJoysticks.end())
+	{
+		// Joystick has already been added
+		return false;
+	}
+	m_vJoysticks.emplace_back(this, m_vJoysticks.size(), pJoystick);
+	const CJoystick &Joystick = m_vJoysticks[m_vJoysticks.size() - 1];
+	dbg_msg("joystick", "Opened joystick %d '%s' (%d axes, %d buttons, %d balls, %d hats)", JoystickIndex, Joystick.GetName(),
+		Joystick.GetNumAxes(), Joystick.GetNumButtons(), Joystick.GetNumBalls(), Joystick.GetNumHats());
+	return true;
+}
+
+void CInput::UpdateActiveJoystick()
+{
+	m_pActiveJoystick = nullptr;
+	if(m_vJoysticks.empty())
+		return;
+	for(auto &Joystick : m_vJoysticks)
+	{
+		if(str_comp(Joystick.GetGUID(), g_Config.m_InpControllerGUID) == 0)
+		{
+			m_pActiveJoystick = &Joystick;
+			return;
+		}
+	}
+	// Fall back to first joystick if no match was found
+	if(!m_pActiveJoystick)
+		m_pActiveJoystick = &m_vJoysticks.front();
+}
+
+void CInput::ConchainJoystickGuidChanged(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() == 1)
+	{
+		static_cast<CInput *>(pUserData)->UpdateActiveJoystick();
+	}
+}
+
+float CInput::GetJoystickDeadzone()
+{
+	return minimum(g_Config.m_InpControllerTolerance / 50.0f, 0.995f);
+}
+
+CInput::CJoystick::CJoystick(CInput *pInput, int Index, SDL_Joystick *pDelegate)
+{
+	m_pInput = pInput;
+	m_Index = Index;
+	m_pDelegate = pDelegate;
+	m_NumAxes = SDL_JoystickNumAxes(pDelegate);
+	m_NumButtons = SDL_JoystickNumButtons(pDelegate);
+	m_NumBalls = SDL_JoystickNumBalls(pDelegate);
+	m_NumHats = SDL_JoystickNumHats(pDelegate);
+	str_copy(m_aName, SDL_JoystickName(pDelegate));
+	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(pDelegate), m_aGUID, sizeof(m_aGUID));
+	m_InstanceID = SDL_JoystickInstanceID(pDelegate);
+}
+
+void CInput::CloseJoysticks()
+{
+	if(SDL_WasInit(SDL_INIT_JOYSTICK))
+		SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+
+	m_vJoysticks.clear();
+	m_pActiveJoystick = nullptr;
+}
+
+void CInput::SetActiveJoystick(size_t Index)
+{
+	m_pActiveJoystick = &m_vJoysticks[Index];
+	str_copy(g_Config.m_InpControllerGUID, m_pActiveJoystick->GetGUID());
+}
+
+float CInput::CJoystick::GetAxisValue(int Axis)
+{
+	return (SDL_JoystickGetAxis(m_pDelegate, Axis) - SDL_JOYSTICK_AXIS_MIN) / (float)(SDL_JOYSTICK_AXIS_MAX - SDL_JOYSTICK_AXIS_MIN) * 2.0f - 1.0f;
+}
+
+void CInput::CJoystick::GetJoystickHatKeys(int Hat, int HatValue, int (&HatKeys)[2])
+{
+	if(HatValue & SDL_HAT_UP)
+		HatKeys[0] = KEY_JOY_HAT0_UP + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT;
+	else if(HatValue & SDL_HAT_DOWN)
+		HatKeys[0] = KEY_JOY_HAT0_DOWN + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT;
+	else
+		HatKeys[0] = KEY_UNKNOWN;
+
+	if(HatValue & SDL_HAT_LEFT)
+		HatKeys[1] = KEY_JOY_HAT0_LEFT + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT;
+	else if(HatValue & SDL_HAT_RIGHT)
+		HatKeys[1] = KEY_JOY_HAT0_RIGHT + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT;
+	else
+		HatKeys[1] = KEY_UNKNOWN;
+}
+
+void CInput::CJoystick::GetHatValue(int Hat, int (&HatKeys)[2])
+{
+	return GetJoystickHatKeys(Hat, SDL_JoystickGetHat(m_pDelegate, Hat), HatKeys);
+}
+
+bool CInput::CJoystick::Relative(float *pX, float *pY)
+{
+	if(!Input()->m_MouseFocus || !Input()->m_InputGrabbed || !g_Config.m_InpControllerEnable)
+		return false;
+
+	const vec2 RawJoystickPos = vec2(GetAxisValue(g_Config.m_InpControllerX), GetAxisValue(g_Config.m_InpControllerY));
+	const float Len = length(RawJoystickPos);
+	const float DeadZone = Input()->GetJoystickDeadzone();
+	if(Len > DeadZone)
+	{
+		const float Factor = 2500.0f * Input()->GetUpdateTime() * maximum((Len - DeadZone) / (1.0f - DeadZone), 0.001f) / Len;
+		*pX = RawJoystickPos.x * Factor;
+		*pY = RawJoystickPos.y * Factor;
+		return true;
+	}
+	return false;
+}
+
+bool CInput::CJoystick::Absolute(float *pX, float *pY)
+{
+	if(!Input()->m_MouseFocus || !Input()->m_InputGrabbed || !g_Config.m_InpControllerEnable)
+		return false;
+
+	const vec2 RawJoystickPos = vec2(GetAxisValue(g_Config.m_InpControllerX), GetAxisValue(g_Config.m_InpControllerY));
+	const float DeadZone = Input()->GetJoystickDeadzone();
+	if(dot(RawJoystickPos, RawJoystickPos) > DeadZone * DeadZone)
+	{
+		*pX = RawJoystickPos.x;
+		*pY = RawJoystickPos.y;
+		return true;
+	}
+	return false;
+}
+
+bool CInput::MouseRelative(float *pX, float *pY)
+{
+	if(!m_MouseFocus || !m_InputGrabbed)
+		return false;
+
+	ivec2 Relative;
+#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
+	ivec2 CurrentPos;
+	SDL_GetMouseState(&CurrentPos.x, &CurrentPos.y);
+	Relative = CurrentPos - m_LastMousePos;
+	m_LastMousePos = CurrentPos;
+#else
+	SDL_GetRelativeMouseState(&Relative.x, &Relative.y);
+#endif
+
+	*pX = Relative.x;
+	*pY = Relative.y;
+	return *pX != 0.0f || *pY != 0.0f;
+}
+
+void CInput::MouseModeAbsolute()
+{
+	m_InputGrabbed = false;
+	SDL_SetRelativeMouseMode(SDL_FALSE);
+	Graphics()->SetWindowGrab(false);
+}
+
+void CInput::MouseModeRelative()
+{
+	m_InputGrabbed = true;
+#if !defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
+	SDL_SetRelativeMouseMode(SDL_TRUE);
+#endif
+	Graphics()->SetWindowGrab(true);
+	// Clear pending relative mouse motion
+	SDL_GetRelativeMouseState(nullptr, nullptr);
+}
+
+void CInput::NativeMousePos(int *pX, int *pY) const
+{
+	SDL_GetMouseState(pX, pY);
+}
+
+bool CInput::NativeMousePressed(int Index)
+{
+	int i = SDL_GetMouseState(nullptr, nullptr);
+	return (i & SDL_BUTTON(Index)) != 0;
+}
+
+bool CInput::MouseDoubleClick()
+{
+	if(m_MouseDoubleClick)
+	{
+		m_MouseDoubleClick = false;
+		return true;
+	}
+	return false;
+}
+
+const char *CInput::GetClipboardText()
+{
+	SDL_free(m_pClipboardText);
+	m_pClipboardText = SDL_GetClipboardText();
+	return m_pClipboardText;
+}
+
+void CInput::SetClipboardText(const char *pText)
+{
+	SDL_SetClipboardText(pText);
+}
+
+void CInput::StartTextInput()
+{
+	// enable system messages for IME
+	SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
+	SDL_StartTextInput();
+}
+
+void CInput::StopTextInput()
+{
+	SDL_StopTextInput();
+	// disable system messages for performance
+	SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE);
+	m_CompositionLength = COMP_LENGTH_INACTIVE;
+	m_CompositionCursor = 0;
+	m_aComposition[0] = '\0';
+	m_vCandidates.clear();
+}
+
+void CInput::Clear()
+{
+	mem_zero(m_aInputState, sizeof(m_aInputState));
+	mem_zero(m_aInputCount, sizeof(m_aInputCount));
+	m_NumEvents = 0;
+}
+
+bool CInput::KeyState(int Key) const
+{
+	if(Key < KEY_FIRST || Key >= KEY_LAST)
+		return false;
+	return m_aInputState[Key];
+}
+
+void CInput::UpdateMouseState()
+{
+	const int MouseState = SDL_GetMouseState(nullptr, nullptr);
+	if(MouseState & SDL_BUTTON(SDL_BUTTON_LEFT))
+		m_aInputState[KEY_MOUSE_1] = 1;
+	if(MouseState & SDL_BUTTON(SDL_BUTTON_RIGHT))
+		m_aInputState[KEY_MOUSE_2] = 1;
+	if(MouseState & SDL_BUTTON(SDL_BUTTON_MIDDLE))
+		m_aInputState[KEY_MOUSE_3] = 1;
+	if(MouseState & SDL_BUTTON(SDL_BUTTON_X1))
+		m_aInputState[KEY_MOUSE_4] = 1;
+	if(MouseState & SDL_BUTTON(SDL_BUTTON_X2))
+		m_aInputState[KEY_MOUSE_5] = 1;
+	if(MouseState & SDL_BUTTON(6))
+		m_aInputState[KEY_MOUSE_6] = 1;
+	if(MouseState & SDL_BUTTON(7))
+		m_aInputState[KEY_MOUSE_7] = 1;
+	if(MouseState & SDL_BUTTON(8))
+		m_aInputState[KEY_MOUSE_8] = 1;
+	if(MouseState & SDL_BUTTON(9))
+		m_aInputState[KEY_MOUSE_9] = 1;
+}
+
+void CInput::UpdateJoystickState()
+{
+	if(!g_Config.m_InpControllerEnable)
+		return;
+	IJoystick *pJoystick = GetActiveJoystick();
+	if(!pJoystick)
+		return;
+
+	const float DeadZone = GetJoystickDeadzone();
+	for(int Axis = 0; Axis < pJoystick->GetNumAxes(); Axis++)
+	{
+		const float Value = pJoystick->GetAxisValue(Axis);
+		const int LeftKey = KEY_JOY_AXIS_0_LEFT + 2 * Axis;
+		const int RightKey = LeftKey + 1;
+		m_aInputState[LeftKey] = Value <= -DeadZone;
+		m_aInputState[RightKey] = Value >= DeadZone;
+	}
+
+	for(int Hat = 0; Hat < pJoystick->GetNumHats(); Hat++)
+	{
+		int HatKeys[2];
+		pJoystick->GetHatValue(Hat, HatKeys);
+		for(int Key = KEY_JOY_HAT0_UP + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT; Key <= KEY_JOY_HAT0_DOWN + Hat * NUM_JOYSTICK_BUTTONS_PER_HAT; Key++)
+			m_aInputState[Key] = HatKeys[0] == Key || HatKeys[1] == Key;
+	}
+}
+
+void CInput::HandleJoystickAxisMotionEvent(const SDL_JoyAxisEvent &Event)
+{
+	if(!g_Config.m_InpControllerEnable)
+		return;
+	CJoystick *pJoystick = GetActiveJoystick();
+	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+		return;
+	if(Event.axis >= NUM_JOYSTICK_AXES)
+		return;
+
+	const int LeftKey = KEY_JOY_AXIS_0_LEFT + 2 * Event.axis;
+	const int RightKey = LeftKey + 1;
+	const float DeadZone = GetJoystickDeadzone();
+
+	if(Event.value <= SDL_JOYSTICK_AXIS_MIN * DeadZone && !m_aInputState[LeftKey])
+	{
+		m_aInputState[LeftKey] = true;
+		m_aInputCount[LeftKey] = m_InputCounter;
+		AddEvent(nullptr, LeftKey, IInput::FLAG_PRESS);
+	}
+	else if(Event.value > SDL_JOYSTICK_AXIS_MIN * DeadZone && m_aInputState[LeftKey])
+	{
+		m_aInputState[LeftKey] = false;
+		AddEvent(nullptr, LeftKey, IInput::FLAG_RELEASE);
+	}
+
+	if(Event.value >= SDL_JOYSTICK_AXIS_MAX * DeadZone && !m_aInputState[RightKey])
+	{
+		m_aInputState[RightKey] = true;
+		m_aInputCount[RightKey] = m_InputCounter;
+		AddEvent(nullptr, RightKey, IInput::FLAG_PRESS);
+	}
+	else if(Event.value < SDL_JOYSTICK_AXIS_MAX * DeadZone && m_aInputState[RightKey])
+	{
+		m_aInputState[RightKey] = false;
+		AddEvent(nullptr, RightKey, IInput::FLAG_RELEASE);
+	}
+}
+
+void CInput::HandleJoystickButtonEvent(const SDL_JoyButtonEvent &Event)
+{
+	if(!g_Config.m_InpControllerEnable)
+		return;
+	CJoystick *pJoystick = GetActiveJoystick();
+	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+		return;
+	if(Event.button >= NUM_JOYSTICK_BUTTONS)
+		return;
+
+	const int Key = Event.button + KEY_JOYSTICK_BUTTON_0;
+
+	if(Event.type == SDL_JOYBUTTONDOWN)
+	{
+		m_aInputState[Key] = true;
+		m_aInputCount[Key] = m_InputCounter;
+		AddEvent(nullptr, Key, IInput::FLAG_PRESS);
+	}
+	else if(Event.type == SDL_JOYBUTTONUP)
+	{
+		m_aInputState[Key] = false;
+		AddEvent(nullptr, Key, IInput::FLAG_RELEASE);
+	}
+}
+
+void CInput::HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event)
+{
+	if(!g_Config.m_InpControllerEnable)
+		return;
+	CJoystick *pJoystick = GetActiveJoystick();
+	if(!pJoystick || pJoystick->GetInstanceID() != Event.which)
+		return;
+	if(Event.hat >= NUM_JOYSTICK_HATS)
+		return;
+
+	int HatKeys[2];
+	CJoystick::GetJoystickHatKeys(Event.hat, Event.value, HatKeys);
+
+	for(int Key = KEY_JOY_HAT0_UP + Event.hat * NUM_JOYSTICK_BUTTONS_PER_HAT; Key <= KEY_JOY_HAT0_DOWN + Event.hat * NUM_JOYSTICK_BUTTONS_PER_HAT; Key++)
+	{
+		if(Key != HatKeys[0] && Key != HatKeys[1] && m_aInputState[Key])
+		{
+			m_aInputState[Key] = false;
+			AddEvent(nullptr, Key, IInput::FLAG_RELEASE);
+		}
+	}
+
+	for(int CurrentKey : HatKeys)
+	{
+		if(CurrentKey != KEY_UNKNOWN && !m_aInputState[CurrentKey])
+		{
+			m_aInputState[CurrentKey] = true;
+			m_aInputCount[CurrentKey] = m_InputCounter;
+			AddEvent(nullptr, CurrentKey, IInput::FLAG_PRESS);
+		}
+	}
+}
+
+void CInput::HandleJoystickAddedEvent(const SDL_JoyDeviceEvent &Event)
+{
+	if(OpenJoystick(Event.which))
+	{
+		UpdateActiveJoystick();
+	}
+}
+
+void CInput::HandleJoystickRemovedEvent(const SDL_JoyDeviceEvent &Event)
+{
+	auto RemovedJoystick = std::find_if(m_vJoysticks.begin(), m_vJoysticks.end(), [Event](const CJoystick &Joystick) -> bool { return Joystick.GetInstanceID() == Event.which; });
+	if(RemovedJoystick != m_vJoysticks.end())
+	{
+		dbg_msg("joystick", "Closed joystick %d '%s'", (*RemovedJoystick).GetIndex(), (*RemovedJoystick).GetName());
+		auto NextJoystick = m_vJoysticks.erase(RemovedJoystick);
+		// Adjust indices of following joysticks
+		while(NextJoystick != m_vJoysticks.end())
+		{
+			(*NextJoystick).m_Index--;
+			++NextJoystick;
+		}
+		UpdateActiveJoystick();
+	}
+}
+
+void CInput::SetCompositionWindowPosition(float X, float Y, float H)
+{
+	SDL_Rect Rect;
+	Rect.x = X / m_pGraphics->ScreenHiDPIScale();
+	Rect.y = Y / m_pGraphics->ScreenHiDPIScale();
+	Rect.h = H / m_pGraphics->ScreenHiDPIScale();
+	Rect.w = 0;
+	SDL_SetTextInputRect(&Rect);
+}
+
+int CInput::Update()
+{
+	const int64_t Now = time_get();
+	if(m_LastUpdate != 0)
+	{
+		const float Diff = (Now - m_LastUpdate) / (float)time_freq();
+		m_UpdateTime = m_UpdateTime == 0.0f ? Diff : (m_UpdateTime * 0.8f + Diff * 0.2f);
+	}
+	m_LastUpdate = Now;
+
+	// keep the counter between 1..0xFFFF, 0 means not pressed
+	m_InputCounter = (m_InputCounter % 0xFFFF) + 1;
+
+	// Ensure that we have the latest keyboard, mouse and joystick state
+	SDL_PumpEvents();
+
+	int NumKeyStates;
+	const Uint8 *pState = SDL_GetKeyboardState(&NumKeyStates);
+	if(NumKeyStates >= KEY_MOUSE_1)
+		NumKeyStates = KEY_MOUSE_1;
+	mem_copy(m_aInputState, pState, NumKeyStates);
+	mem_zero(m_aInputState + NumKeyStates, KEY_LAST - NumKeyStates);
+
+	// these states must always be updated manually because they are not in the SDL_GetKeyboardState from SDL
+	UpdateMouseState();
+	UpdateJoystickState();
+
+	SDL_Event Event;
+	bool IgnoreKeys = false;
+	while(SDL_PollEvent(&Event))
+	{
+		int Scancode = 0;
+		int Action = IInput::FLAG_PRESS;
+		switch(Event.type)
+		{
+		case SDL_SYSWMEVENT:
+			ProcessSystemMessage(Event.syswm.msg);
+			break;
+
+		case SDL_TEXTEDITING:
+		{
+			m_CompositionLength = str_length(Event.edit.text);
+			if(m_CompositionLength)
+			{
+				str_copy(m_aComposition, Event.edit.text);
+				m_CompositionCursor = 0;
+				for(int i = 0; i < Event.edit.start; i++)
+					m_CompositionCursor = str_utf8_forward(m_aComposition, m_CompositionCursor);
+				// Event.edit.length is currently unused on Windows and will always be 0, so we don't support selecting composition text
+				AddEvent(nullptr, KEY_UNKNOWN, IInput::FLAG_TEXT);
+			}
+			else
+			{
+				m_aComposition[0] = '\0';
+				m_CompositionLength = 0;
+				m_CompositionCursor = 0;
+			}
+			break;
+		}
+
+		case SDL_TEXTINPUT:
+			m_aComposition[0] = '\0';
+			m_CompositionLength = COMP_LENGTH_INACTIVE;
+			m_CompositionCursor = 0;
+			AddEvent(Event.text.text, KEY_UNKNOWN, IInput::FLAG_TEXT);
+			break;
+
+		// handle keys
+		case SDL_KEYDOWN:
+			// See SDL_Keymod for possible modifiers:
+			// NONE   =     0
+			// LSHIFT =     1
+			// RSHIFT =     2
+			// LCTRL  =    64
+			// RCTRL  =   128
+			// LALT   =   256
+			// RALT   =   512
+			// LGUI   =  1024
+			// RGUI   =  2048
+			// NUM    =  4096
+			// CAPS   =  8192
+			// MODE   = 16384
+			// Sum if you want to ignore multiple modifiers.
+			if(!(Event.key.keysym.mod & g_Config.m_InpIgnoredModifiers))
+			{
+				Scancode = g_Config.m_InpTranslatedKeys ? SDL_GetScancodeFromKey(Event.key.keysym.sym) : Event.key.keysym.scancode;
+			}
+			break;
+		case SDL_KEYUP:
+			Action = IInput::FLAG_RELEASE;
+			Scancode = g_Config.m_InpTranslatedKeys ? SDL_GetScancodeFromKey(Event.key.keysym.sym) : Event.key.keysym.scancode;
+			break;
+
+		// handle the joystick events
+		case SDL_JOYAXISMOTION:
+			HandleJoystickAxisMotionEvent(Event.jaxis);
+			break;
+
+		case SDL_JOYBUTTONUP:
+		case SDL_JOYBUTTONDOWN:
+			HandleJoystickButtonEvent(Event.jbutton);
+			break;
+
+		case SDL_JOYHATMOTION:
+			HandleJoystickHatMotionEvent(Event.jhat);
+			break;
+
+		case SDL_JOYDEVICEADDED:
+			HandleJoystickAddedEvent(Event.jdevice);
+			break;
+
+		case SDL_JOYDEVICEREMOVED:
+			HandleJoystickRemovedEvent(Event.jdevice);
+			break;
+
+		// handle mouse buttons
+		case SDL_MOUSEBUTTONUP:
+			Action = IInput::FLAG_RELEASE;
+
+			[[fallthrough]];
+		case SDL_MOUSEBUTTONDOWN:
+			if(Event.button.button == SDL_BUTTON_LEFT)
+				Scancode = KEY_MOUSE_1;
+			if(Event.button.button == SDL_BUTTON_RIGHT)
+				Scancode = KEY_MOUSE_2;
+			if(Event.button.button == SDL_BUTTON_MIDDLE)
+				Scancode = KEY_MOUSE_3;
+			if(Event.button.button == SDL_BUTTON_X1)
+				Scancode = KEY_MOUSE_4;
+			if(Event.button.button == SDL_BUTTON_X2)
+				Scancode = KEY_MOUSE_5;
+			if(Event.button.button == 6)
+				Scancode = KEY_MOUSE_6;
+			if(Event.button.button == 7)
+				Scancode = KEY_MOUSE_7;
+			if(Event.button.button == 8)
+				Scancode = KEY_MOUSE_8;
+			if(Event.button.button == 9)
+				Scancode = KEY_MOUSE_9;
+			if(Event.button.button == SDL_BUTTON_LEFT)
+			{
+				if(Event.button.clicks % 2 == 0)
+					m_MouseDoubleClick = true;
+				if(Event.button.clicks == 1)
+					m_MouseDoubleClick = false;
+			}
+			break;
+
+		case SDL_MOUSEWHEEL:
+			if(Event.wheel.y > 0)
+				Scancode = KEY_MOUSE_WHEEL_UP;
+			if(Event.wheel.y < 0)
+				Scancode = KEY_MOUSE_WHEEL_DOWN;
+			if(Event.wheel.x > 0)
+				Scancode = KEY_MOUSE_WHEEL_LEFT;
+			if(Event.wheel.x < 0)
+				Scancode = KEY_MOUSE_WHEEL_RIGHT;
+			Action |= IInput::FLAG_RELEASE;
+			break;
+
+		case SDL_WINDOWEVENT:
+			// Ignore keys following a focus gain as they may be part of global
+			// shortcuts
+			switch(Event.window.event)
+			{
+			case SDL_WINDOWEVENT_MOVED:
+				Graphics()->Move(Event.window.data1, Event.window.data2);
+				break;
+			// listen to size changes, this includes our manual changes and the ones by the window manager
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
+				Graphics()->GotResized(Event.window.data1, Event.window.data2, -1);
+				break;
+			case SDL_WINDOWEVENT_FOCUS_GAINED:
+				if(m_InputGrabbed)
+				{
+					MouseModeRelative();
+					// Clear pending relative mouse motion
+					SDL_GetRelativeMouseState(nullptr, nullptr);
+				}
+				m_MouseFocus = true;
+				IgnoreKeys = true;
+				break;
+			case SDL_WINDOWEVENT_FOCUS_LOST:
+				m_MouseFocus = false;
+				IgnoreKeys = true;
+				if(m_InputGrabbed)
+				{
+					MouseModeAbsolute();
+					// Remember that we had relative mouse
+					m_InputGrabbed = true;
+				}
+				break;
+			case SDL_WINDOWEVENT_MINIMIZED:
+				Graphics()->WindowDestroyNtf(Event.window.windowID);
+				break;
+
+			case SDL_WINDOWEVENT_MAXIMIZED:
+#if defined(CONF_PLATFORM_MACOS) // Todo: remove this when fixed in SDL
+				MouseModeAbsolute();
+				MouseModeRelative();
+#endif
+				[[fallthrough]];
+			case SDL_WINDOWEVENT_RESTORED:
+				Graphics()->WindowCreateNtf(Event.window.windowID);
+				break;
+			}
+			break;
+
+		// other messages
+		case SDL_QUIT:
+			return 1;
+
+		case SDL_DROPFILE:
+			str_copy(m_aDropFile, Event.drop.file);
+			SDL_free(Event.drop.file);
+			break;
+		}
+
+		if(Scancode > KEY_FIRST && Scancode < g_MaxKeys && !IgnoreKeys && !HasComposition())
+		{
+			if(Action & IInput::FLAG_PRESS)
+			{
+				m_aInputState[Scancode] = 1;
+				m_aInputCount[Scancode] = m_InputCounter;
+			}
+			AddEvent(nullptr, Scancode, Action);
+		}
+	}
+
+	if(m_CompositionLength == 0)
+		m_CompositionLength = COMP_LENGTH_INACTIVE;
+
+	return 0;
+}
+
+void CInput::ProcessSystemMessage(SDL_SysWMmsg *pMsg)
+{
+#if defined(CONF_FAMILY_WINDOWS)
+	// Todo SDL: remove this after SDL2 supports IME candidates
+	if(pMsg->subsystem == SDL_SYSWM_WINDOWS && pMsg->msg.win.msg == WM_IME_NOTIFY)
+	{
+		switch(pMsg->msg.win.wParam)
+		{
+		case IMN_OPENCANDIDATE:
+		case IMN_CHANGECANDIDATE:
+		{
+			HWND WindowHandle = pMsg->msg.win.hwnd;
+			HIMC ImeContext = ImmGetContext(WindowHandle);
+			DWORD Size = ImmGetCandidateListW(ImeContext, 0, nullptr, 0);
+			LPCANDIDATELIST pCandidateList = nullptr;
+			if(Size > 0)
+			{
+				pCandidateList = (LPCANDIDATELIST)malloc(Size);
+				Size = ImmGetCandidateListW(ImeContext, 0, pCandidateList, Size);
+			}
+			m_vCandidates.clear();
+			if(pCandidateList && Size > 0)
+			{
+				for(DWORD i = pCandidateList->dwPageStart; i < pCandidateList->dwCount && (int)m_vCandidates.size() < (int)pCandidateList->dwPageSize; i++)
+				{
+					LPCWSTR pCandidate = (LPCWSTR)((DWORD_PTR)pCandidateList + pCandidateList->dwOffset[i]);
+					m_vCandidates.push_back(std::move(windows_wide_to_utf8(pCandidate).value_or("<invalid candidate>")));
+				}
+				m_CandidateSelectedIndex = pCandidateList->dwSelection - pCandidateList->dwPageStart;
+			}
+			else
+			{
+				m_CandidateSelectedIndex = -1;
+			}
+			free(pCandidateList);
+			ImmReleaseContext(WindowHandle, ImeContext);
+			break;
+		}
+		case IMN_CLOSECANDIDATE:
+			m_vCandidates.clear();
+			m_CandidateSelectedIndex = -1;
+			break;
+		}
+	}
+#endif
+}
+
+bool CInput::GetDropFile(char *aBuf, int Len)
+{
+	if(m_aDropFile[0] != '\0')
+	{
+		str_copy(aBuf, m_aDropFile, Len);
+		m_aDropFile[0] = '\0';
+		return true;
+	}
+	return false;
+}
+
+IEngineInput *CreateEngineInput()
+{
+	return new CInput;
+}
diff --git a/src_bkp/engine/client/input.h b/src_bkp/engine/client/input.h
new file mode 100644
index 0000000000..b0576b52c4
--- /dev/null
+++ b/src_bkp/engine/client/input.h
@@ -0,0 +1,156 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_INPUT_H
+#define ENGINE_CLIENT_INPUT_H
+
+#include <SDL_events.h>
+#include <SDL_joystick.h>
+
+#include <engine/input.h>
+#include <engine/keys.h>
+
+#include <string>
+#include <vector>
+
+class IEngineGraphics;
+
+class CInput : public IEngineInput
+{
+public:
+	class CJoystick : public IJoystick
+	{
+		friend class CInput;
+
+		CInput *m_pInput;
+		int m_Index;
+		char m_aName[64];
+		char m_aGUID[34];
+		SDL_JoystickID m_InstanceID;
+		int m_NumAxes;
+		int m_NumButtons;
+		int m_NumBalls;
+		int m_NumHats;
+		SDL_Joystick *m_pDelegate;
+
+		CInput *Input() { return m_pInput; }
+
+	public:
+		CJoystick() {}
+		CJoystick(CInput *pInput, int Index, SDL_Joystick *pDelegate);
+		virtual ~CJoystick() = default;
+
+		int GetIndex() const override { return m_Index; }
+		const char *GetName() const override { return m_aName; }
+		const char *GetGUID() const { return m_aGUID; }
+		SDL_JoystickID GetInstanceID() const { return m_InstanceID; }
+		int GetNumAxes() const override { return m_NumAxes; }
+		int GetNumButtons() const override { return m_NumButtons; }
+		int GetNumBalls() const override { return m_NumBalls; }
+		int GetNumHats() const override { return m_NumHats; }
+		float GetAxisValue(int Axis) override;
+		void GetHatValue(int Hat, int (&HatKeys)[2]) override;
+		bool Relative(float *pX, float *pY) override;
+		bool Absolute(float *pX, float *pY) override;
+
+		static void GetJoystickHatKeys(int Hat, int HatValue, int (&HatKeys)[2]);
+	};
+
+private:
+	IEngineGraphics *m_pGraphics;
+	IConsole *m_pConsole;
+
+	IEngineGraphics *Graphics() { return m_pGraphics; }
+	IConsole *Console() { return m_pConsole; }
+
+	// joystick
+	std::vector<CJoystick> m_vJoysticks;
+	CJoystick *m_pActiveJoystick = nullptr;
+	void InitJoysticks();
+	bool OpenJoystick(int JoystickIndex);
+	void CloseJoysticks();
+	void UpdateActiveJoystick();
+	static void ConchainJoystickGuidChanged(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	float GetJoystickDeadzone();
+
+	bool m_InputGrabbed;
+	char *m_pClipboardText;
+
+	bool m_MouseFocus;
+	bool m_MouseDoubleClick;
+#if defined(CONF_PLATFORM_ANDROID) // No relative mouse on Android
+	ivec2 m_LastMousePos = ivec2(0, 0);
+#endif
+
+	// IME support
+	char m_aComposition[MAX_COMPOSITION_ARRAY_SIZE];
+	int m_CompositionCursor;
+	int m_CompositionLength;
+	std::vector<std::string> m_vCandidates;
+	int m_CandidateSelectedIndex;
+
+	void AddEvent(char *pText, int Key, int Flags);
+	void Clear() override;
+	bool IsEventValid(const CEvent &Event) const override { return Event.m_InputCount == m_InputCounter; }
+
+	// quick access to input
+	unsigned short m_aInputCount[g_MaxKeys]; // tw-KEY
+	unsigned char m_aInputState[g_MaxKeys]; // SDL_SCANCODE
+	int m_InputCounter;
+
+	void UpdateMouseState();
+	void UpdateJoystickState();
+	void HandleJoystickAxisMotionEvent(const SDL_JoyAxisEvent &Event);
+	void HandleJoystickButtonEvent(const SDL_JoyButtonEvent &Event);
+	void HandleJoystickHatMotionEvent(const SDL_JoyHatEvent &Event);
+	void HandleJoystickAddedEvent(const SDL_JoyDeviceEvent &Event);
+	void HandleJoystickRemovedEvent(const SDL_JoyDeviceEvent &Event);
+
+	char m_aDropFile[IO_MAX_PATH_LENGTH];
+
+	bool KeyState(int Key) const;
+
+	void ProcessSystemMessage(SDL_SysWMmsg *pMsg);
+
+public:
+	CInput();
+
+	void Init() override;
+	int Update() override;
+	void Shutdown() override;
+
+	bool ModifierIsPressed() const override { return KeyState(KEY_LCTRL) || KeyState(KEY_RCTRL) || KeyState(KEY_LGUI) || KeyState(KEY_RGUI); }
+	bool ShiftIsPressed() const override { return KeyState(KEY_LSHIFT) || KeyState(KEY_RSHIFT); }
+	bool AltIsPressed() const override { return KeyState(KEY_LALT) || KeyState(KEY_RALT); }
+	bool KeyIsPressed(int Key) const override { return KeyState(Key); }
+	bool KeyPress(int Key, bool CheckCounter) const override { return CheckCounter ? (m_aInputCount[Key] == m_InputCounter) : m_aInputCount[Key]; }
+
+	size_t NumJoysticks() const override { return m_vJoysticks.size(); }
+	CJoystick *GetJoystick(size_t Index) override { return &m_vJoysticks[Index]; }
+	CJoystick *GetActiveJoystick() override { return m_pActiveJoystick; }
+	void SetActiveJoystick(size_t Index) override;
+
+	bool MouseRelative(float *pX, float *pY) override;
+	void MouseModeAbsolute() override;
+	void MouseModeRelative() override;
+	void NativeMousePos(int *pX, int *pY) const override;
+	bool NativeMousePressed(int Index) override;
+	bool MouseDoubleClick() override;
+
+	const char *GetClipboardText() override;
+	void SetClipboardText(const char *pText) override;
+
+	void StartTextInput() override;
+	void StopTextInput() override;
+	const char *GetComposition() const override { return m_aComposition; }
+	bool HasComposition() const override { return m_CompositionLength != COMP_LENGTH_INACTIVE; }
+	int GetCompositionCursor() const override { return m_CompositionCursor; }
+	int GetCompositionLength() const override { return m_CompositionLength; }
+	const char *GetCandidate(int Index) const override { return m_vCandidates[Index].c_str(); }
+	int GetCandidateCount() const override { return m_vCandidates.size(); }
+	int GetCandidateSelectedIndex() const override { return m_CandidateSelectedIndex; }
+	void SetCompositionWindowPosition(float X, float Y, float H) override;
+
+	bool GetDropFile(char *aBuf, int Len) override;
+};
+
+#endif
diff --git a/src_bkp/engine/client/keynames.h b/src_bkp/engine/client/keynames.h
new file mode 100644
index 0000000000..57005ff873
--- /dev/null
+++ b/src_bkp/engine/client/keynames.h
@@ -0,0 +1,521 @@
+/* AUTO GENERATED! DO NOT EDIT MANUALLY! */
+
+#ifndef KEYS_INCLUDE
+#error do not include this header!
+#endif
+
+const char g_aaKeyStrings[512][20] = // NOLINT(misc-definitions-in-headers)
+	{
+		"unknown",
+		"&1",
+		"&2",
+		"&3",
+		"a",
+		"b",
+		"c",
+		"d",
+		"e",
+		"f",
+		"g",
+		"h",
+		"i",
+		"j",
+		"k",
+		"l",
+		"m",
+		"n",
+		"o",
+		"p",
+		"q",
+		"r",
+		"s",
+		"t",
+		"u",
+		"v",
+		"w",
+		"x",
+		"y",
+		"z",
+		"1",
+		"2",
+		"3",
+		"4",
+		"5",
+		"6",
+		"7",
+		"8",
+		"9",
+		"0",
+		"return",
+		"escape",
+		"backspace",
+		"tab",
+		"space",
+		"minus",
+		"equals",
+		"leftbracket",
+		"rightbracket",
+		"backslash",
+		"nonushash",
+		"semicolon",
+		"apostrophe",
+		"grave",
+		"comma",
+		"period",
+		"slash",
+		"capslock",
+		"f1",
+		"f2",
+		"f3",
+		"f4",
+		"f5",
+		"f6",
+		"f7",
+		"f8",
+		"f9",
+		"f10",
+		"f11",
+		"f12",
+		"printscreen",
+		"scrolllock",
+		"pause",
+		"insert",
+		"home",
+		"pageup",
+		"delete",
+		"end",
+		"pagedown",
+		"right",
+		"left",
+		"down",
+		"up",
+		"numlockclear",
+		"kp_divide",
+		"kp_multiply",
+		"kp_minus",
+		"kp_plus",
+		"kp_enter",
+		"kp_1",
+		"kp_2",
+		"kp_3",
+		"kp_4",
+		"kp_5",
+		"kp_6",
+		"kp_7",
+		"kp_8",
+		"kp_9",
+		"kp_0",
+		"kp_period",
+		"nonusbackslash",
+		"application",
+		"power",
+		"kp_equals",
+		"f13",
+		"f14",
+		"f15",
+		"f16",
+		"f17",
+		"f18",
+		"f19",
+		"f20",
+		"f21",
+		"f22",
+		"f23",
+		"f24",
+		"execute",
+		"help",
+		"menu",
+		"select",
+		"stop",
+		"again",
+		"undo",
+		"cut",
+		"copy",
+		"paste",
+		"find",
+		"mute",
+		"volumeup",
+		"volumedown",
+		"&130",
+		"&131",
+		"&132",
+		"kp_comma",
+		"kp_equalsas400",
+		"international1",
+		"international2",
+		"international3",
+		"international4",
+		"international5",
+		"international6",
+		"international7",
+		"international8",
+		"international9",
+		"lang1",
+		"lang2",
+		"lang3",
+		"lang4",
+		"lang5",
+		"lang6",
+		"lang7",
+		"lang8",
+		"lang9",
+		"alterase",
+		"sysreq",
+		"cancel",
+		"clear",
+		"prior",
+		"return2",
+		"separator",
+		"out",
+		"oper",
+		"clearagain",
+		"crsel",
+		"exsel",
+		"&165",
+		"&166",
+		"&167",
+		"&168",
+		"&169",
+		"&170",
+		"&171",
+		"&172",
+		"&173",
+		"&174",
+		"&175",
+		"kp_00",
+		"kp_000",
+		"thousandsseparator",
+		"decimalseparator",
+		"currencyunit",
+		"currencysubunit",
+		"kp_leftparen",
+		"kp_rightparen",
+		"kp_leftbrace",
+		"kp_rightbrace",
+		"kp_tab",
+		"kp_backspace",
+		"kp_a",
+		"kp_b",
+		"kp_c",
+		"kp_d",
+		"kp_e",
+		"kp_f",
+		"kp_xor",
+		"kp_power",
+		"kp_percent",
+		"kp_less",
+		"kp_greater",
+		"kp_ampersand",
+		"kp_dblampersand",
+		"kp_verticalbar",
+		"kp_dblverticalbar",
+		"kp_colon",
+		"kp_hash",
+		"kp_space",
+		"kp_at",
+		"kp_exclam",
+		"kp_memstore",
+		"kp_memrecall",
+		"kp_memclear",
+		"kp_memadd",
+		"kp_memsubtract",
+		"kp_memmultiply",
+		"kp_memdivide",
+		"kp_plusminus",
+		"kp_clear",
+		"kp_clearentry",
+		"kp_binary",
+		"kp_octal",
+		"kp_decimal",
+		"kp_hexadecimal",
+		"&222",
+		"&223",
+		"lctrl",
+		"lshift",
+		"lalt",
+		"lgui",
+		"rctrl",
+		"rshift",
+		"ralt",
+		"rgui",
+		"&232",
+		"&233",
+		"&234",
+		"&235",
+		"&236",
+		"&237",
+		"&238",
+		"&239",
+		"&240",
+		"&241",
+		"&242",
+		"&243",
+		"&244",
+		"&245",
+		"&246",
+		"&247",
+		"&248",
+		"&249",
+		"&250",
+		"&251",
+		"&252",
+		"&253",
+		"&254",
+		"&255",
+		"&256",
+		"mode",
+		"audionext",
+		"audioprev",
+		"audiostop",
+		"audioplay",
+		"audiomute",
+		"mediaselect",
+		"www",
+		"mail",
+		"calculator",
+		"computer",
+		"ac_search",
+		"ac_home",
+		"ac_back",
+		"ac_forward",
+		"ac_stop",
+		"ac_refresh",
+		"ac_bookmarks",
+		"brightnessdown",
+		"brightnessup",
+		"displayswitch",
+		"kbdillumtoggle",
+		"kbdillumdown",
+		"kbdillumup",
+		"eject",
+		"sleep",
+		"app1",
+		"app2",
+		"audiorewind",
+		"audiofastforward",
+		"softleft",
+		"softright",
+		"call",
+		"endcall",
+		"mouse1",
+		"mouse2",
+		"mouse3",
+		"mouse4",
+		"mouse5",
+		"mouse6",
+		"mouse7",
+		"mouse8",
+		"mouse9",
+		"mousewheelup",
+		"mousewheeldown",
+		"mousewheelleft",
+		"mousewheelright",
+		"joystick0",
+		"joystick1",
+		"joystick2",
+		"joystick3",
+		"joystick4",
+		"joystick5",
+		"joystick6",
+		"joystick7",
+		"joystick8",
+		"joystick9",
+		"joystick10",
+		"joystick11",
+		"joy_hat0_up",
+		"joy_hat0_left",
+		"joy_hat0_right",
+		"joy_hat0_down",
+		"joy_hat1_up",
+		"joy_hat1_left",
+		"joy_hat1_right",
+		"joy_hat1_down",
+		"joy_axis0_left",
+		"joy_axis0_right",
+		"joy_axis1_left",
+		"joy_axis1_right",
+		"joy_axis2_left",
+		"joy_axis2_right",
+		"joy_axis3_left",
+		"joy_axis3_right",
+		"joy_axis4_left",
+		"joy_axis4_right",
+		"joy_axis5_left",
+		"joy_axis5_right",
+		"joy_axis6_left",
+		"joy_axis6_right",
+		"joy_axis7_left",
+		"joy_axis7_right",
+		"joy_axis8_left",
+		"joy_axis8_right",
+		"joy_axis9_left",
+		"joy_axis9_right",
+		"joy_axis10_left",
+		"joy_axis10_right",
+		"joy_axis11_left",
+		"joy_axis11_right",
+		"&348",
+		"&349",
+		"&350",
+		"&351",
+		"&352",
+		"&353",
+		"&354",
+		"&355",
+		"&356",
+		"&357",
+		"&358",
+		"&359",
+		"&360",
+		"&361",
+		"&362",
+		"&363",
+		"&364",
+		"&365",
+		"&366",
+		"&367",
+		"&368",
+		"&369",
+		"&370",
+		"&371",
+		"&372",
+		"&373",
+		"&374",
+		"&375",
+		"&376",
+		"&377",
+		"&378",
+		"&379",
+		"&380",
+		"&381",
+		"&382",
+		"&383",
+		"&384",
+		"&385",
+		"&386",
+		"&387",
+		"&388",
+		"&389",
+		"&390",
+		"&391",
+		"&392",
+		"&393",
+		"&394",
+		"&395",
+		"&396",
+		"&397",
+		"&398",
+		"&399",
+		"&400",
+		"&401",
+		"&402",
+		"&403",
+		"&404",
+		"&405",
+		"&406",
+		"&407",
+		"&408",
+		"&409",
+		"&410",
+		"&411",
+		"&412",
+		"&413",
+		"&414",
+		"&415",
+		"&416",
+		"&417",
+		"&418",
+		"&419",
+		"&420",
+		"&421",
+		"&422",
+		"&423",
+		"&424",
+		"&425",
+		"&426",
+		"&427",
+		"&428",
+		"&429",
+		"&430",
+		"&431",
+		"&432",
+		"&433",
+		"&434",
+		"&435",
+		"&436",
+		"&437",
+		"&438",
+		"&439",
+		"&440",
+		"&441",
+		"&442",
+		"&443",
+		"&444",
+		"&445",
+		"&446",
+		"&447",
+		"&448",
+		"&449",
+		"&450",
+		"&451",
+		"&452",
+		"&453",
+		"&454",
+		"&455",
+		"&456",
+		"&457",
+		"&458",
+		"&459",
+		"&460",
+		"&461",
+		"&462",
+		"&463",
+		"&464",
+		"&465",
+		"&466",
+		"&467",
+		"&468",
+		"&469",
+		"&470",
+		"&471",
+		"&472",
+		"&473",
+		"&474",
+		"&475",
+		"&476",
+		"&477",
+		"&478",
+		"&479",
+		"&480",
+		"&481",
+		"&482",
+		"&483",
+		"&484",
+		"&485",
+		"&486",
+		"&487",
+		"&488",
+		"&489",
+		"&490",
+		"&491",
+		"&492",
+		"&493",
+		"&494",
+		"&495",
+		"&496",
+		"&497",
+		"&498",
+		"&499",
+		"&500",
+		"&501",
+		"&502",
+		"&503",
+		"&504",
+		"&505",
+		"&506",
+		"&507",
+		"&508",
+		"&509",
+		"&510",
+		"&511",
+};
diff --git a/src_bkp/engine/client/notifications.cpp b/src_bkp/engine/client/notifications.cpp
new file mode 100644
index 0000000000..577b4f4256
--- /dev/null
+++ b/src_bkp/engine/client/notifications.cpp
@@ -0,0 +1,44 @@
+#include "notifications.h"
+
+#include <base/detect.h>
+
+#if defined(CONF_PLATFORM_MACOS)
+// Code is in src/macos/notification.mm.
+void NotificationsNotifyMacOsInternal(const char *pTitle, const char *pMessage);
+#elif defined(CONF_FAMILY_UNIX) && !defined(CONF_PLATFORM_ANDROID) && !defined(CONF_PLATFORM_HAIKU) && !defined(CONF_WEBASM)
+#include <libnotify/notify.h>
+#define NOTIFICATIONS_USE_LIBNOTIFY
+#endif
+
+void CNotifications::Init(const char *pAppname)
+{
+#if defined(NOTIFICATIONS_USE_LIBNOTIFY)
+	notify_init(pAppname);
+#endif
+}
+
+void CNotifications::Shutdown()
+{
+#if defined(NOTIFICATIONS_USE_LIBNOTIFY)
+	notify_uninit();
+#endif
+}
+
+void CNotifications::Notify(const char *pTitle, const char *pMessage)
+{
+#if defined(CONF_PLATFORM_MACOS)
+	NotificationsNotifyMacOsInternal(pTitle, pMessage);
+#elif defined(NOTIFICATIONS_USE_LIBNOTIFY)
+	NotifyNotification *pNotif = notify_notification_new(pTitle, pMessage, "ddnet");
+	if(pNotif)
+	{
+		notify_notification_show(pNotif, NULL);
+		g_object_unref(G_OBJECT(pNotif));
+	}
+#endif
+}
+
+INotifications *CreateNotifications()
+{
+	return new CNotifications();
+}
diff --git a/src_bkp/engine/client/notifications.h b/src_bkp/engine/client/notifications.h
new file mode 100644
index 0000000000..02463535e4
--- /dev/null
+++ b/src_bkp/engine/client/notifications.h
@@ -0,0 +1,14 @@
+#ifndef ENGINE_CLIENT_NOTIFICATIONS_H
+#define ENGINE_CLIENT_NOTIFICATIONS_H
+
+#include <engine/notifications.h>
+
+class CNotifications : public INotifications
+{
+public:
+	void Init(const char *pAppname) override;
+	void Shutdown() override;
+	void Notify(const char *pTitle, const char *pMessage) override;
+};
+
+#endif // ENGINE_CLIENT_NOTIFICATIONS_H
diff --git a/src_bkp/engine/client/serverbrowser.cpp b/src_bkp/engine/client/serverbrowser.cpp
new file mode 100644
index 0000000000..22939fe1fa
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser.cpp
@@ -0,0 +1,1664 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "serverbrowser.h"
+
+#include "serverbrowser_http.h"
+#include "serverbrowser_ping_cache.h"
+
+#include <algorithm>
+#include <climits>
+#include <unordered_set>
+#include <vector>
+
+#include <base/hash_ctxt.h>
+#include <base/log.h>
+#include <base/system.h>
+
+#include <engine/shared/config.h>
+#include <engine/shared/json.h>
+#include <engine/shared/masterserver.h>
+#include <engine/shared/network.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/serverinfo.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/favorites.h>
+#include <engine/friends.h>
+#include <engine/storage.h>
+
+class CSortWrap
+{
+	typedef bool (CServerBrowser::*SortFunc)(int, int) const;
+	SortFunc m_pfnSort;
+	CServerBrowser *m_pThis;
+
+public:
+	CSortWrap(CServerBrowser *pServer, SortFunc Func) :
+		m_pfnSort(Func), m_pThis(pServer) {}
+	bool operator()(int a, int b) { return (g_Config.m_BrSortOrder ? (m_pThis->*m_pfnSort)(b, a) : (m_pThis->*m_pfnSort)(a, b)); }
+};
+
+bool matchesPart(const char *a, const char *b)
+{
+	return str_utf8_find_nocase(a, b) != nullptr;
+}
+
+bool matchesExactly(const char *a, const char *b)
+{
+	return str_comp(a, &b[1]) == 0;
+}
+
+CServerBrowser::CServerBrowser() :
+	m_CommunitiesFilter(g_Config.m_BrFilterExcludeCommunities, sizeof(g_Config.m_BrFilterExcludeCommunities)),
+	m_CountriesFilter(g_Config.m_BrFilterExcludeCountries, sizeof(g_Config.m_BrFilterExcludeCountries)),
+	m_TypesFilter(g_Config.m_BrFilterExcludeTypes, sizeof(g_Config.m_BrFilterExcludeTypes))
+{
+	m_ppServerlist = nullptr;
+	m_pSortedServerlist = nullptr;
+
+	m_NeedResort = false;
+	m_Sorthash = 0;
+
+	m_NumSortedServersCapacity = 0;
+	m_NumServerCapacity = 0;
+
+	m_ServerlistType = 0;
+	m_BroadcastTime = 0;
+	secure_random_fill(m_aTokenSeed, sizeof(m_aTokenSeed));
+
+	m_pDDNetInfo = nullptr;
+	m_DDNetInfoUpdateTime = 0;
+
+	CleanUp();
+}
+
+CServerBrowser::~CServerBrowser()
+{
+	free(m_ppServerlist);
+	free(m_pSortedServerlist);
+	json_value_free(m_pDDNetInfo);
+
+	delete m_pHttp;
+	m_pHttp = nullptr;
+	delete m_pPingCache;
+	m_pPingCache = nullptr;
+}
+
+void CServerBrowser::SetBaseInfo(class CNetClient *pClient, const char *pNetVersion)
+{
+	m_pNetClient = pClient;
+	str_copy(m_aNetVersion, pNetVersion);
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pFavorites = Kernel()->RequestInterface<IFavorites>();
+	m_pFriends = Kernel()->RequestInterface<IFriends>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pPingCache = CreateServerBrowserPingCache(m_pConsole, m_pStorage);
+
+	RegisterCommands();
+}
+
+void CServerBrowser::OnInit()
+{
+	m_pHttp = CreateServerBrowserHttp(m_pEngine, m_pConsole, m_pStorage, g_Config.m_BrCachedBestServerinfoUrl);
+}
+
+void CServerBrowser::RegisterCommands()
+{
+	m_pConsole->Register("leak_ip_address_to_all_servers", "", CFGFLAG_CLIENT, Con_LeakIpAddress, this, "Leaks your IP address to all servers by pinging each of them, also acquiring the latency in the process");
+}
+
+void CServerBrowser::Con_LeakIpAddress(IConsole::IResult *pResult, void *pUserData)
+{
+	CServerBrowser *pThis = (CServerBrowser *)pUserData;
+
+	// We only consider the first address of every server.
+
+	std::vector<int> vSortedServers;
+	// Sort servers by IP address, ignoring port.
+	class CAddrComparer
+	{
+	public:
+		CServerBrowser *m_pThis;
+		bool operator()(int i, int j) const
+		{
+			NETADDR Addr1 = m_pThis->m_ppServerlist[i]->m_Info.m_aAddresses[0];
+			NETADDR Addr2 = m_pThis->m_ppServerlist[j]->m_Info.m_aAddresses[0];
+			Addr1.port = 0;
+			Addr2.port = 0;
+			return net_addr_comp(&Addr1, &Addr2) < 0;
+		}
+	};
+	vSortedServers.reserve(pThis->m_NumServers);
+	for(int i = 0; i < pThis->m_NumServers; i++)
+	{
+		vSortedServers.push_back(i);
+	}
+	std::sort(vSortedServers.begin(), vSortedServers.end(), CAddrComparer{pThis});
+
+	// Group the servers into those with same IP address (but differing
+	// port).
+	NETADDR Addr;
+	int Start = -1;
+	for(int i = 0; i <= (int)vSortedServers.size(); i++)
+	{
+		NETADDR NextAddr;
+		if(i < (int)vSortedServers.size())
+		{
+			NextAddr = pThis->m_ppServerlist[vSortedServers[i]]->m_Info.m_aAddresses[0];
+			NextAddr.port = 0;
+		}
+		bool New = Start == -1 || i == (int)vSortedServers.size() || net_addr_comp(&Addr, &NextAddr) != 0;
+		if(Start != -1 && New)
+		{
+			int Chosen = Start + secure_rand_below(i - Start);
+			CServerEntry *pChosen = pThis->m_ppServerlist[vSortedServers[Chosen]];
+			pChosen->m_RequestIgnoreInfo = true;
+			pThis->QueueRequest(pChosen);
+			char aAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&pChosen->m_Info.m_aAddresses[0], aAddr, sizeof(aAddr), true);
+			dbg_msg("serverbrowser", "queuing ping request for %s", aAddr);
+		}
+		if(i < (int)vSortedServers.size() && New)
+		{
+			Start = i;
+			Addr = NextAddr;
+		}
+	}
+}
+
+int CServerBrowser::Players(const CServerInfo &Item) const
+{
+	return g_Config.m_BrFilterSpectators ? Item.m_NumPlayers : Item.m_NumClients;
+}
+
+int CServerBrowser::Max(const CServerInfo &Item) const
+{
+	return g_Config.m_BrFilterSpectators ? Item.m_MaxPlayers : Item.m_MaxClients;
+}
+
+const CServerInfo *CServerBrowser::SortedGet(int Index) const
+{
+	if(Index < 0 || Index >= m_NumSortedServers)
+		return nullptr;
+	return &m_ppServerlist[m_pSortedServerlist[Index]]->m_Info;
+}
+
+int CServerBrowser::GenerateToken(const NETADDR &Addr) const
+{
+	SHA256_CTX Sha256;
+	sha256_init(&Sha256);
+	sha256_update(&Sha256, m_aTokenSeed, sizeof(m_aTokenSeed));
+	sha256_update(&Sha256, (unsigned char *)&Addr, sizeof(Addr));
+	SHA256_DIGEST Digest = sha256_finish(&Sha256);
+	return (Digest.data[0] << 16) | (Digest.data[1] << 8) | Digest.data[2];
+}
+
+int CServerBrowser::GetBasicToken(int Token)
+{
+	return Token & 0xff;
+}
+
+int CServerBrowser::GetExtraToken(int Token)
+{
+	return Token >> 8;
+}
+
+bool CServerBrowser::SortCompareName(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	//	make sure empty entries are listed last
+	return (pIndex1->m_GotInfo && pIndex2->m_GotInfo) || (!pIndex1->m_GotInfo && !pIndex2->m_GotInfo) ? str_comp(pIndex1->m_Info.m_aName, pIndex2->m_Info.m_aName) < 0 :
+													    pIndex1->m_GotInfo != 0;
+}
+
+bool CServerBrowser::SortCompareMap(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	return str_comp(pIndex1->m_Info.m_aMap, pIndex2->m_Info.m_aMap) < 0;
+}
+
+bool CServerBrowser::SortComparePing(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	return pIndex1->m_Info.m_Latency < pIndex2->m_Info.m_Latency;
+}
+
+bool CServerBrowser::SortCompareGametype(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	return str_comp(pIndex1->m_Info.m_aGameType, pIndex2->m_Info.m_aGameType) < 0;
+}
+
+bool CServerBrowser::SortCompareNumPlayers(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	return pIndex1->m_Info.m_NumFilteredPlayers > pIndex2->m_Info.m_NumFilteredPlayers;
+}
+
+bool CServerBrowser::SortCompareNumClients(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+	return pIndex1->m_Info.m_NumClients > pIndex2->m_Info.m_NumClients;
+}
+
+bool CServerBrowser::SortCompareNumPlayersAndPing(int Index1, int Index2) const
+{
+	CServerEntry *pIndex1 = m_ppServerlist[Index1];
+	CServerEntry *pIndex2 = m_ppServerlist[Index2];
+
+	if(pIndex1->m_Info.m_NumFilteredPlayers == pIndex2->m_Info.m_NumFilteredPlayers)
+		return pIndex1->m_Info.m_Latency > pIndex2->m_Info.m_Latency;
+	else if(pIndex1->m_Info.m_NumFilteredPlayers == 0 || pIndex2->m_Info.m_NumFilteredPlayers == 0 || pIndex1->m_Info.m_Latency / 100 == pIndex2->m_Info.m_Latency / 100)
+		return pIndex1->m_Info.m_NumFilteredPlayers < pIndex2->m_Info.m_NumFilteredPlayers;
+	else
+		return pIndex1->m_Info.m_Latency > pIndex2->m_Info.m_Latency;
+}
+
+void CServerBrowser::Filter()
+{
+	m_NumSortedServers = 0;
+	m_NumSortedPlayers = 0;
+
+	// allocate the sorted list
+	if(m_NumSortedServersCapacity < m_NumServers)
+	{
+		free(m_pSortedServerlist);
+		m_NumSortedServersCapacity = m_NumServers;
+		m_pSortedServerlist = (int *)calloc(m_NumSortedServersCapacity, sizeof(int));
+	}
+
+	// filter the servers
+	for(int i = 0; i < m_NumServers; i++)
+	{
+		CServerInfo &Info = m_ppServerlist[i]->m_Info;
+		bool Filtered = false;
+
+		if(g_Config.m_BrFilterEmpty && Info.m_NumFilteredPlayers == 0)
+			Filtered = true;
+		else if(g_Config.m_BrFilterFull && Players(Info) == Max(Info))
+			Filtered = true;
+		else if(g_Config.m_BrFilterPw && Info.m_Flags & SERVER_FLAG_PASSWORD)
+			Filtered = true;
+		else if(g_Config.m_BrFilterServerAddress[0] && !str_find_nocase(Info.m_aAddress, g_Config.m_BrFilterServerAddress))
+			Filtered = true;
+		else if(g_Config.m_BrFilterGametypeStrict && g_Config.m_BrFilterGametype[0] && str_comp_nocase(Info.m_aGameType, g_Config.m_BrFilterGametype))
+			Filtered = true;
+		else if(!g_Config.m_BrFilterGametypeStrict && g_Config.m_BrFilterGametype[0] && !str_utf8_find_nocase(Info.m_aGameType, g_Config.m_BrFilterGametype))
+			Filtered = true;
+		else if(g_Config.m_BrFilterUnfinishedMap && Info.m_HasRank == CServerInfo::RANK_RANKED)
+			Filtered = true;
+		else
+		{
+			if(m_ServerlistType == IServerBrowser::TYPE_INTERNET || m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+			{
+				Filtered = CommunitiesFilter().Filtered(Info.m_aCommunityId);
+				Filtered = Filtered || CountriesFilter().Filtered(Info.m_aCommunityCountry);
+				Filtered = Filtered || TypesFilter().Filtered(Info.m_aCommunityType);
+			}
+
+			if(!Filtered && g_Config.m_BrFilterCountry)
+			{
+				Filtered = true;
+				// match against player country
+				for(int p = 0; p < minimum(Info.m_NumClients, (int)MAX_CLIENTS); p++)
+				{
+					if(Info.m_aClients[p].m_Country == g_Config.m_BrFilterCountryIndex)
+					{
+						Filtered = false;
+						break;
+					}
+				}
+			}
+
+			if(!Filtered && g_Config.m_BrFilterString[0] != '\0')
+			{
+				Info.m_QuickSearchHit = 0;
+
+				const char *pStr = g_Config.m_BrFilterString;
+				char aFilterStr[sizeof(g_Config.m_BrFilterString)];
+				while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aFilterStr, sizeof(aFilterStr))))
+				{
+					if(aFilterStr[0] == '\0')
+					{
+						continue;
+					}
+					auto MatchesFn = matchesPart;
+					const int FilterLen = str_length(aFilterStr);
+					if(aFilterStr[0] == '"' && aFilterStr[FilterLen - 1] == '"')
+					{
+						aFilterStr[FilterLen - 1] = '\0';
+						MatchesFn = matchesExactly;
+					}
+
+					// match against server name
+					if(MatchesFn(Info.m_aName, aFilterStr))
+					{
+						Info.m_QuickSearchHit |= IServerBrowser::QUICK_SERVERNAME;
+					}
+
+					// match against players
+					for(int p = 0; p < minimum(Info.m_NumClients, (int)MAX_CLIENTS); p++)
+					{
+						if(MatchesFn(Info.m_aClients[p].m_aName, aFilterStr) ||
+							MatchesFn(Info.m_aClients[p].m_aClan, aFilterStr))
+						{
+							if(g_Config.m_BrFilterConnectingPlayers &&
+								str_comp(Info.m_aClients[p].m_aName, "(connecting)") == 0 &&
+								Info.m_aClients[p].m_aClan[0] == '\0')
+							{
+								continue;
+							}
+							Info.m_QuickSearchHit |= IServerBrowser::QUICK_PLAYER;
+							break;
+						}
+					}
+
+					// match against map
+					if(MatchesFn(Info.m_aMap, aFilterStr))
+					{
+						Info.m_QuickSearchHit |= IServerBrowser::QUICK_MAPNAME;
+					}
+				}
+
+				if(!Info.m_QuickSearchHit)
+					Filtered = true;
+			}
+
+			if(!Filtered && g_Config.m_BrExcludeString[0] != '\0')
+			{
+				const char *pStr = g_Config.m_BrExcludeString;
+				char aExcludeStr[sizeof(g_Config.m_BrExcludeString)];
+				while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aExcludeStr, sizeof(aExcludeStr))))
+				{
+					if(aExcludeStr[0] == '\0')
+					{
+						continue;
+					}
+					auto MatchesFn = matchesPart;
+					const int FilterLen = str_length(aExcludeStr);
+					if(aExcludeStr[0] == '"' && aExcludeStr[FilterLen - 1] == '"')
+					{
+						aExcludeStr[FilterLen - 1] = '\0';
+						MatchesFn = matchesExactly;
+					}
+
+					// match against server name
+					if(MatchesFn(Info.m_aName, aExcludeStr))
+					{
+						Filtered = true;
+						break;
+					}
+
+					// match against map
+					if(MatchesFn(Info.m_aMap, aExcludeStr))
+					{
+						Filtered = true;
+						break;
+					}
+
+					// match against gametype
+					if(MatchesFn(Info.m_aGameType, aExcludeStr))
+					{
+						Filtered = true;
+						break;
+					}
+				}
+			}
+		}
+
+		if(!Filtered)
+		{
+			UpdateServerFriends(&Info);
+
+			if(!g_Config.m_BrFilterFriends || Info.m_FriendState != IFriends::FRIEND_NO)
+			{
+				m_NumSortedPlayers += Info.m_NumFilteredPlayers;
+				m_pSortedServerlist[m_NumSortedServers++] = i;
+			}
+		}
+	}
+}
+
+int CServerBrowser::SortHash() const
+{
+	int i = g_Config.m_BrSort & 0xff;
+	i |= g_Config.m_BrFilterEmpty << 4;
+	i |= g_Config.m_BrFilterFull << 5;
+	i |= g_Config.m_BrFilterSpectators << 6;
+	i |= g_Config.m_BrFilterFriends << 7;
+	i |= g_Config.m_BrFilterPw << 8;
+	i |= g_Config.m_BrSortOrder << 9;
+	i |= g_Config.m_BrFilterGametypeStrict << 12;
+	i |= g_Config.m_BrFilterUnfinishedMap << 13;
+	i |= g_Config.m_BrFilterCountry << 14;
+	i |= g_Config.m_BrFilterConnectingPlayers << 15;
+	return i;
+}
+
+void CServerBrowser::Sort()
+{
+	// update number of filtered players
+	for(int i = 0; i < m_NumServers; i++)
+	{
+		UpdateServerFilteredPlayers(&m_ppServerlist[i]->m_Info);
+	}
+
+	// create filtered list
+	Filter();
+
+	// sort
+	if(g_Config.m_BrSortOrder == 2 && (g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS || g_Config.m_BrSort == IServerBrowser::SORT_PING))
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareNumPlayersAndPing));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_NAME)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareName));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_PING)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortComparePing));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_MAP)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareMap));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareNumPlayers));
+	else if(g_Config.m_BrSort == IServerBrowser::SORT_GAMETYPE)
+		std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareGametype));
+
+	m_Sorthash = SortHash();
+}
+
+void CServerBrowser::RemoveRequest(CServerEntry *pEntry)
+{
+	if(pEntry->m_pPrevReq || pEntry->m_pNextReq || m_pFirstReqServer == pEntry)
+	{
+		if(pEntry->m_pPrevReq)
+			pEntry->m_pPrevReq->m_pNextReq = pEntry->m_pNextReq;
+		else
+			m_pFirstReqServer = pEntry->m_pNextReq;
+
+		if(pEntry->m_pNextReq)
+			pEntry->m_pNextReq->m_pPrevReq = pEntry->m_pPrevReq;
+		else
+			m_pLastReqServer = pEntry->m_pPrevReq;
+
+		pEntry->m_pPrevReq = nullptr;
+		pEntry->m_pNextReq = nullptr;
+		m_NumRequests--;
+	}
+}
+
+CServerBrowser::CServerEntry *CServerBrowser::Find(const NETADDR &Addr)
+{
+	auto Entry = m_ByAddr.find(Addr);
+	if(Entry == m_ByAddr.end())
+	{
+		return nullptr;
+	}
+	return m_ppServerlist[Entry->second];
+}
+
+void CServerBrowser::QueueRequest(CServerEntry *pEntry)
+{
+	// add it to the list of servers that we should request info from
+	pEntry->m_pPrevReq = m_pLastReqServer;
+	if(m_pLastReqServer)
+		m_pLastReqServer->m_pNextReq = pEntry;
+	else
+		m_pFirstReqServer = pEntry;
+	m_pLastReqServer = pEntry;
+	pEntry->m_pNextReq = nullptr;
+	m_NumRequests++;
+}
+
+void ServerBrowserFormatAddresses(char *pBuffer, int BufferSize, NETADDR *pAddrs, int NumAddrs)
+{
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		if(i != 0)
+		{
+			if(BufferSize <= 1)
+			{
+				return;
+			}
+			pBuffer[0] = ',';
+			pBuffer[1] = '\0';
+			pBuffer += 1;
+			BufferSize -= 1;
+		}
+		if(BufferSize <= 1)
+		{
+			return;
+		}
+		net_addr_str(&pAddrs[i], pBuffer, BufferSize, true);
+		int Length = str_length(pBuffer);
+		pBuffer += Length;
+		BufferSize -= Length;
+	}
+}
+
+void CServerBrowser::SetInfo(CServerEntry *pEntry, const CServerInfo &Info) const
+{
+	const CServerInfo TmpInfo = pEntry->m_Info;
+	pEntry->m_Info = Info;
+	pEntry->m_Info.m_Favorite = TmpInfo.m_Favorite;
+	pEntry->m_Info.m_FavoriteAllowPing = TmpInfo.m_FavoriteAllowPing;
+	mem_copy(pEntry->m_Info.m_aAddresses, TmpInfo.m_aAddresses, sizeof(pEntry->m_Info.m_aAddresses));
+	pEntry->m_Info.m_NumAddresses = TmpInfo.m_NumAddresses;
+	ServerBrowserFormatAddresses(pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aAddress), pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
+	UpdateServerCommunity(&pEntry->m_Info);
+	UpdateServerRank(&pEntry->m_Info);
+
+	if(pEntry->m_Info.m_ClientScoreKind == CServerInfo::CLIENT_SCORE_KIND_UNSPECIFIED)
+	{
+		if((str_find_nocase(pEntry->m_Info.m_aGameType, "race") || str_find_nocase(pEntry->m_Info.m_aGameType, "fastcap")) && g_Config.m_ClDDRaceScoreBoard)
+		{
+			pEntry->m_Info.m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT;
+		}
+		else
+		{
+			pEntry->m_Info.m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_POINTS;
+		}
+	}
+
+	class CPlayerScoreNameLess
+	{
+		const int ScoreKind;
+
+	public:
+		CPlayerScoreNameLess(int ClientScoreKind) :
+			ScoreKind(ClientScoreKind)
+		{
+		}
+
+		bool operator()(const CServerInfo::CClient &p0, const CServerInfo::CClient &p1) const
+		{
+			// Sort players before non players
+			if(p0.m_Player && !p1.m_Player)
+				return true;
+			if(!p0.m_Player && p1.m_Player)
+				return false;
+
+			int Score0 = p0.m_Score;
+			int Score1 = p1.m_Score;
+
+			if(ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME || ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT)
+			{
+				// Sort unfinished (-9999) and still connecting players (-1) after others
+				if(Score0 < 0 && Score1 >= 0)
+					return false;
+				if(Score0 >= 0 && Score1 < 0)
+					return true;
+			}
+
+			if(Score0 != Score1)
+			{
+				// Handle the sign change introduced with CLIENT_SCORE_KIND_TIME
+				if(ScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME)
+					return Score0 < Score1;
+				else
+					return Score0 > Score1;
+			}
+
+			return str_comp_nocase(p0.m_aName, p1.m_aName) < 0;
+		}
+	};
+
+	std::sort(pEntry->m_Info.m_aClients, pEntry->m_Info.m_aClients + Info.m_NumReceivedClients, CPlayerScoreNameLess(pEntry->m_Info.m_ClientScoreKind));
+
+	pEntry->m_GotInfo = 1;
+}
+
+void CServerBrowser::SetLatency(NETADDR Addr, int Latency)
+{
+	m_pPingCache->CachePing(Addr, Latency);
+
+	Addr.port = 0;
+	for(int i = 0; i < m_NumServers; i++)
+	{
+		if(!m_ppServerlist[i]->m_GotInfo)
+		{
+			continue;
+		}
+		bool Found = false;
+		for(int j = 0; j < m_ppServerlist[i]->m_Info.m_NumAddresses; j++)
+		{
+			NETADDR Other = m_ppServerlist[i]->m_Info.m_aAddresses[j];
+			Other.port = 0;
+			if(Addr == Other)
+			{
+				Found = true;
+				break;
+			}
+		}
+		if(!Found)
+		{
+			continue;
+		}
+		int Ping = m_pPingCache->GetPing(m_ppServerlist[i]->m_Info.m_aAddresses, m_ppServerlist[i]->m_Info.m_NumAddresses);
+		if(Ping == -1)
+		{
+			continue;
+		}
+		m_ppServerlist[i]->m_Info.m_Latency = Ping;
+		m_ppServerlist[i]->m_Info.m_LatencyIsEstimated = false;
+	}
+}
+
+CServerBrowser::CServerEntry *CServerBrowser::Add(const NETADDR *pAddrs, int NumAddrs)
+{
+	// create new pEntry
+	CServerEntry *pEntry = m_ServerlistHeap.Allocate<CServerEntry>();
+	mem_zero(pEntry, sizeof(CServerEntry));
+
+	// set the info
+	mem_copy(pEntry->m_Info.m_aAddresses, pAddrs, NumAddrs * sizeof(pAddrs[0]));
+	pEntry->m_Info.m_NumAddresses = NumAddrs;
+
+	pEntry->m_Info.m_Latency = 999;
+	pEntry->m_Info.m_HasRank = CServerInfo::RANK_UNAVAILABLE;
+	ServerBrowserFormatAddresses(pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aAddress), pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
+	str_copy(pEntry->m_Info.m_aName, pEntry->m_Info.m_aAddress, sizeof(pEntry->m_Info.m_aName));
+
+	// check if it's a favorite
+	pEntry->m_Info.m_Favorite = m_pFavorites->IsFavorite(pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
+	pEntry->m_Info.m_FavoriteAllowPing = m_pFavorites->IsPingAllowed(pEntry->m_Info.m_aAddresses, pEntry->m_Info.m_NumAddresses);
+
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		m_ByAddr[pAddrs[i]] = m_NumServers;
+	}
+
+	if(m_NumServers == m_NumServerCapacity)
+	{
+		CServerEntry **ppNewlist;
+		m_NumServerCapacity += 100;
+		ppNewlist = (CServerEntry **)calloc(m_NumServerCapacity, sizeof(CServerEntry *)); // NOLINT(bugprone-sizeof-expression)
+		if(m_NumServers > 0)
+			mem_copy(ppNewlist, m_ppServerlist, m_NumServers * sizeof(CServerEntry *)); // NOLINT(bugprone-sizeof-expression)
+		free(m_ppServerlist);
+		m_ppServerlist = ppNewlist;
+	}
+
+	// add to list
+	m_ppServerlist[m_NumServers] = pEntry;
+	pEntry->m_Info.m_ServerIndex = m_NumServers;
+	m_NumServers++;
+
+	return pEntry;
+}
+
+void CServerBrowser::OnServerInfoUpdate(const NETADDR &Addr, int Token, const CServerInfo *pInfo)
+{
+	int BasicToken = Token;
+	int ExtraToken = 0;
+	if(pInfo->m_Type == SERVERINFO_EXTENDED)
+	{
+		BasicToken = Token & 0xff;
+		ExtraToken = Token >> 8;
+	}
+
+	CServerEntry *pEntry = Find(Addr);
+
+	if(m_ServerlistType == IServerBrowser::TYPE_LAN)
+	{
+		NETADDR Broadcast;
+		mem_zero(&Broadcast, sizeof(Broadcast));
+		Broadcast.type = m_pNetClient->NetType() | NETTYPE_LINK_BROADCAST;
+		int TokenBC = GenerateToken(Broadcast);
+		bool Drop = false;
+		Drop = Drop || BasicToken != GetBasicToken(TokenBC);
+		Drop = Drop || (pInfo->m_Type == SERVERINFO_EXTENDED && ExtraToken != GetExtraToken(TokenBC));
+		if(Drop)
+		{
+			return;
+		}
+
+		if(!pEntry)
+			pEntry = Add(&Addr, 1);
+	}
+	else
+	{
+		if(!pEntry)
+		{
+			return;
+		}
+		int TokenAddr = GenerateToken(Addr);
+		bool Drop = false;
+		Drop = Drop || BasicToken != GetBasicToken(TokenAddr);
+		Drop = Drop || (pInfo->m_Type == SERVERINFO_EXTENDED && ExtraToken != GetExtraToken(TokenAddr));
+		if(Drop)
+		{
+			return;
+		}
+	}
+
+	if(m_ServerlistType == IServerBrowser::TYPE_LAN)
+	{
+		SetInfo(pEntry, *pInfo);
+		pEntry->m_Info.m_Latency = minimum(static_cast<int>((time_get() - m_BroadcastTime) * 1000 / time_freq()), 999);
+	}
+	else if(pEntry->m_RequestTime > 0)
+	{
+		if(!pEntry->m_RequestIgnoreInfo)
+		{
+			SetInfo(pEntry, *pInfo);
+		}
+
+		int Latency = minimum(static_cast<int>((time_get() - pEntry->m_RequestTime) * 1000 / time_freq()), 999);
+		if(!pEntry->m_RequestIgnoreInfo)
+		{
+			pEntry->m_Info.m_Latency = Latency;
+		}
+		else
+		{
+			char aAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&Addr, aAddr, sizeof(aAddr), true);
+			dbg_msg("serverbrowser", "received ping response from %s", aAddr);
+			SetLatency(Addr, Latency);
+		}
+		pEntry->m_RequestTime = -1; // Request has been answered
+	}
+	RemoveRequest(pEntry);
+	RequestResort();
+}
+
+void CServerBrowser::Refresh(int Type)
+{
+	bool ServerListTypeChanged = m_ServerlistType != Type;
+	int OldServerListType = m_ServerlistType;
+	m_ServerlistType = Type;
+	secure_random_fill(m_aTokenSeed, sizeof(m_aTokenSeed));
+
+	if(Type == IServerBrowser::TYPE_LAN || (ServerListTypeChanged && OldServerListType == IServerBrowser::TYPE_LAN))
+		CleanUp();
+
+	if(Type == IServerBrowser::TYPE_LAN)
+	{
+		unsigned char aBuffer[sizeof(SERVERBROWSE_GETINFO) + 1];
+		CNetChunk Packet;
+
+		/* do the broadcast version */
+		Packet.m_ClientID = -1;
+		mem_zero(&Packet, sizeof(Packet));
+		Packet.m_Address.type = m_pNetClient->NetType() | NETTYPE_LINK_BROADCAST;
+		Packet.m_Flags = NETSENDFLAG_CONNLESS | NETSENDFLAG_EXTENDED;
+		Packet.m_DataSize = sizeof(aBuffer);
+		Packet.m_pData = aBuffer;
+		mem_zero(&Packet.m_aExtraData, sizeof(Packet.m_aExtraData));
+
+		int Token = GenerateToken(Packet.m_Address);
+		mem_copy(aBuffer, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO));
+		aBuffer[sizeof(SERVERBROWSE_GETINFO)] = GetBasicToken(Token);
+
+		Packet.m_aExtraData[0] = GetExtraToken(Token) >> 8;
+		Packet.m_aExtraData[1] = GetExtraToken(Token) & 0xff;
+
+		m_BroadcastTime = time_get();
+
+		for(int i = 8303; i <= 8310; i++)
+		{
+			Packet.m_Address.port = i;
+			m_pNetClient->Send(&Packet);
+		}
+
+		if(g_Config.m_Debug)
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "serverbrowser", "broadcasting for servers");
+	}
+	else if(Type == IServerBrowser::TYPE_FAVORITES || Type == IServerBrowser::TYPE_INTERNET)
+	{
+		m_pHttp->Refresh();
+		m_pPingCache->Load();
+		m_RefreshingHttp = true;
+
+		if(ServerListTypeChanged && m_pHttp->NumServers() > 0)
+		{
+			CleanUp();
+			UpdateFromHttp();
+			Sort();
+		}
+	}
+}
+
+void CServerBrowser::RequestImpl(const NETADDR &Addr, CServerEntry *pEntry, int *pBasicToken, int *pToken, bool RandomToken) const
+{
+	if(g_Config.m_Debug)
+	{
+		char aAddrStr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&Addr, aAddrStr, sizeof(aAddrStr), true);
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "requesting server info from %s", aAddrStr);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "serverbrowser", aBuf);
+	}
+
+	int Token = GenerateToken(Addr);
+	if(RandomToken)
+	{
+		int AvoidBasicToken = GetBasicToken(Token);
+		do
+		{
+			secure_random_fill(&Token, sizeof(Token));
+			Token &= 0xffffff;
+		} while(GetBasicToken(Token) == AvoidBasicToken);
+	}
+	if(pToken)
+	{
+		*pToken = Token;
+	}
+	if(pBasicToken)
+	{
+		*pBasicToken = GetBasicToken(Token);
+	}
+
+	unsigned char aBuffer[sizeof(SERVERBROWSE_GETINFO) + 1];
+	mem_copy(aBuffer, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO));
+	aBuffer[sizeof(SERVERBROWSE_GETINFO)] = GetBasicToken(Token);
+
+	CNetChunk Packet;
+	Packet.m_ClientID = -1;
+	Packet.m_Address = Addr;
+	Packet.m_Flags = NETSENDFLAG_CONNLESS | NETSENDFLAG_EXTENDED;
+	Packet.m_DataSize = sizeof(aBuffer);
+	Packet.m_pData = aBuffer;
+	mem_zero(&Packet.m_aExtraData, sizeof(Packet.m_aExtraData));
+	Packet.m_aExtraData[0] = GetExtraToken(Token) >> 8;
+	Packet.m_aExtraData[1] = GetExtraToken(Token) & 0xff;
+
+	m_pNetClient->Send(&Packet);
+
+	if(pEntry)
+		pEntry->m_RequestTime = time_get();
+}
+
+void CServerBrowser::RequestCurrentServer(const NETADDR &Addr) const
+{
+	RequestImpl(Addr, nullptr, nullptr, nullptr, false);
+}
+
+void CServerBrowser::RequestCurrentServerWithRandomToken(const NETADDR &Addr, int *pBasicToken, int *pToken) const
+{
+	RequestImpl(Addr, nullptr, pBasicToken, pToken, true);
+}
+
+void CServerBrowser::SetCurrentServerPing(const NETADDR &Addr, int Ping)
+{
+	SetLatency(Addr, minimum(Ping, 999));
+}
+
+void CServerBrowser::UpdateFromHttp()
+{
+	int OwnLocation;
+	if(str_comp(g_Config.m_BrLocation, "auto") == 0)
+	{
+		OwnLocation = m_OwnLocation;
+	}
+	else
+	{
+		if(CServerInfo::ParseLocation(&OwnLocation, g_Config.m_BrLocation))
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "cannot parse br_location: '%s'", g_Config.m_BrLocation);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowser", aBuf);
+		}
+	}
+
+	int NumServers = m_pHttp->NumServers();
+	int NumLegacyServers = m_pHttp->NumLegacyServers();
+	std::function<bool(const NETADDR *, int)> Want = [](const NETADDR *pAddrs, int NumAddrs) { return true; };
+	if(m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+	{
+		Want = [&](const NETADDR *pAddrs, int NumAddrs) -> bool { return m_pFavorites->IsFavorite(pAddrs, NumAddrs) != TRISTATE::NONE; };
+	}
+
+	for(int i = 0; i < NumServers; i++)
+	{
+		CServerInfo Info = m_pHttp->Server(i);
+		if(!Want(Info.m_aAddresses, Info.m_NumAddresses))
+		{
+			continue;
+		}
+		int Ping = m_pPingCache->GetPing(Info.m_aAddresses, Info.m_NumAddresses);
+		Info.m_LatencyIsEstimated = Ping == -1;
+		if(Info.m_LatencyIsEstimated)
+		{
+			Info.m_Latency = CServerInfo::EstimateLatency(OwnLocation, Info.m_Location);
+		}
+		else
+		{
+			Info.m_Latency = Ping;
+		}
+		CServerEntry *pEntry = Add(Info.m_aAddresses, Info.m_NumAddresses);
+		SetInfo(pEntry, Info);
+		pEntry->m_RequestIgnoreInfo = true;
+	}
+
+	for(int i = 0; i < NumLegacyServers; i++)
+	{
+		NETADDR Addr = m_pHttp->LegacyServer(i);
+		if(!Want(&Addr, 1))
+		{
+			continue;
+		}
+		QueueRequest(Add(&Addr, 1));
+	}
+
+	if(m_ServerlistType == IServerBrowser::TYPE_FAVORITES)
+	{
+		const IFavorites::CEntry *pFavorites;
+		int NumFavorites;
+		m_pFavorites->AllEntries(&pFavorites, &NumFavorites);
+		for(int i = 0; i < NumFavorites; i++)
+		{
+			bool Found = false;
+			for(int j = 0; j < pFavorites[i].m_NumAddrs; j++)
+			{
+				if(Find(pFavorites[i].m_aAddrs[j]))
+				{
+					Found = true;
+					break;
+				}
+			}
+			if(Found)
+			{
+				continue;
+			}
+			// (Also add favorites we're not allowed to ping.)
+			CServerEntry *pEntry = Add(pFavorites[i].m_aAddrs, pFavorites[i].m_NumAddrs);
+			if(pFavorites->m_AllowPing)
+			{
+				QueueRequest(pEntry);
+			}
+		}
+	}
+
+	RequestResort();
+}
+
+void CServerBrowser::CleanUp()
+{
+	// clear out everything
+	m_ServerlistHeap.Reset();
+	m_NumServers = 0;
+	m_NumSortedServers = 0;
+	m_NumSortedPlayers = 0;
+	m_ByAddr.clear();
+	m_pFirstReqServer = nullptr;
+	m_pLastReqServer = nullptr;
+	m_NumRequests = 0;
+	m_CurrentMaxRequests = g_Config.m_BrMaxRequests;
+}
+
+void CServerBrowser::Update()
+{
+	int64_t Timeout = time_freq();
+	int64_t Now = time_get();
+
+	const char *pHttpBestUrl;
+	if(!m_pHttp->GetBestUrl(&pHttpBestUrl) && pHttpBestUrl != m_pHttpPrevBestUrl)
+	{
+		str_copy(g_Config.m_BrCachedBestServerinfoUrl, pHttpBestUrl);
+		m_pHttpPrevBestUrl = pHttpBestUrl;
+	}
+
+	m_pHttp->Update();
+
+	if(m_ServerlistType != TYPE_LAN && m_RefreshingHttp && !m_pHttp->IsRefreshing())
+	{
+		m_RefreshingHttp = false;
+		CleanUp();
+		UpdateFromHttp();
+		// TODO: move this somewhere else
+		Sort();
+		return;
+	}
+
+	CServerEntry *pEntry = m_pFirstReqServer;
+	int Count = 0;
+	while(true)
+	{
+		if(!pEntry) // no more entries
+			break;
+		if(pEntry->m_RequestTime && pEntry->m_RequestTime + Timeout < Now)
+		{
+			pEntry = pEntry->m_pNextReq;
+			continue;
+		}
+		// no more than 10 concurrent requests
+		if(Count == m_CurrentMaxRequests)
+			break;
+
+		if(pEntry->m_RequestTime == 0)
+		{
+			RequestImpl(pEntry->m_Info.m_aAddresses[0], pEntry, nullptr, nullptr, false);
+		}
+
+		Count++;
+		pEntry = pEntry->m_pNextReq;
+	}
+
+	if(m_pFirstReqServer && Count == 0 && m_CurrentMaxRequests > 1) //NO More current Server Requests
+	{
+		//reset old ones
+		pEntry = m_pFirstReqServer;
+		while(true)
+		{
+			if(!pEntry) // no more entries
+				break;
+			pEntry->m_RequestTime = 0;
+			pEntry = pEntry->m_pNextReq;
+		}
+
+		//update max-requests
+		m_CurrentMaxRequests = m_CurrentMaxRequests / 2;
+		if(m_CurrentMaxRequests < 1)
+			m_CurrentMaxRequests = 1;
+	}
+	else if(Count == 0 && m_CurrentMaxRequests == 1) //we reached the limit, just release all left requests. IF a server sends us a packet, a new request will be added automatically, so we can delete all
+	{
+		pEntry = m_pFirstReqServer;
+		while(true)
+		{
+			if(!pEntry) // no more entries
+				break;
+			CServerEntry *pNext = pEntry->m_pNextReq;
+			RemoveRequest(pEntry); //release request
+			pEntry = pNext;
+		}
+	}
+
+	// check if we need to resort
+	if(m_Sorthash != SortHash() || m_NeedResort)
+	{
+		for(int i = 0; i < m_NumServers; i++)
+		{
+			CServerInfo *pInfo = &m_ppServerlist[i]->m_Info;
+			pInfo->m_Favorite = m_pFavorites->IsFavorite(pInfo->m_aAddresses, pInfo->m_NumAddresses);
+			pInfo->m_FavoriteAllowPing = m_pFavorites->IsPingAllowed(pInfo->m_aAddresses, pInfo->m_NumAddresses);
+		}
+		Sort();
+		m_NeedResort = false;
+	}
+}
+
+const json_value *CServerBrowser::LoadDDNetInfo()
+{
+	LoadDDNetInfoJson();
+	LoadDDNetLocation();
+	LoadDDNetServers();
+	for(int i = 0; i < m_NumServers; i++)
+	{
+		UpdateServerCommunity(&m_ppServerlist[i]->m_Info);
+		UpdateServerRank(&m_ppServerlist[i]->m_Info);
+	}
+	m_DDNetInfoUpdateTime = time_get();
+	return m_pDDNetInfo;
+}
+
+void CServerBrowser::LoadDDNetInfoJson()
+{
+	void *pBuf;
+	unsigned Length;
+	if(!m_pStorage->ReadFile(DDNET_INFO_FILE, IStorage::TYPE_SAVE, &pBuf, &Length))
+		return;
+
+	json_value_free(m_pDDNetInfo);
+	json_settings JsonSettings{};
+	char aError[256];
+	m_pDDNetInfo = json_parse_ex(&JsonSettings, static_cast<json_char *>(pBuf), Length, aError);
+	free(pBuf);
+
+	if(m_pDDNetInfo == nullptr)
+	{
+		log_error("serverbrowser", "invalid info json: '%s'", aError);
+	}
+	else if(m_pDDNetInfo->type != json_object)
+	{
+		log_error("serverbrowser", "invalid info root");
+		json_value_free(m_pDDNetInfo);
+		m_pDDNetInfo = nullptr;
+	}
+}
+
+void CServerBrowser::LoadDDNetLocation()
+{
+	m_OwnLocation = CServerInfo::LOC_UNKNOWN;
+	if(m_pDDNetInfo)
+	{
+		const json_value &Location = (*m_pDDNetInfo)["location"];
+		if(Location.type != json_string || CServerInfo::ParseLocation(&m_OwnLocation, Location))
+		{
+			log_error("serverbrowser", "invalid location");
+		}
+	}
+}
+
+bool CServerBrowser::ParseCommunityServers(CCommunity *pCommunity, const json_value &Servers)
+{
+	for(unsigned ServerIndex = 0; ServerIndex < Servers.u.array.length; ++ServerIndex)
+	{
+		// pServer - { name, flagId, servers }
+		const json_value &Server = Servers[ServerIndex];
+		if(Server.type != json_object)
+		{
+			log_error("serverbrowser", "invalid server (ServerIndex=%u)", ServerIndex);
+			return false;
+		}
+
+		const json_value &Name = Server["name"];
+		const json_value &FlagId = Server["flagId"];
+		const json_value &Types = Server["servers"];
+		if(Name.type != json_string || FlagId.type != json_integer || Types.type != json_object)
+		{
+			log_error("serverbrowser", "invalid server attribute (ServerIndex=%u)", ServerIndex);
+			return false;
+		}
+		if(Types.u.object.length == 0)
+			continue;
+
+		pCommunity->m_vCountries.emplace_back(Name.u.string.ptr, FlagId.u.integer);
+		CCommunityCountry *pCountry = &pCommunity->m_vCountries.back();
+
+		for(unsigned TypeIndex = 0; TypeIndex < Types.u.object.length; ++TypeIndex)
+		{
+			const json_value &Addresses = *Types.u.object.values[TypeIndex].value;
+			if(Addresses.type != json_array)
+			{
+				log_error("serverbrowser", "invalid addresses (ServerIndex=%u, TypeIndex=%u)", ServerIndex, TypeIndex);
+				return false;
+			}
+			if(Addresses.u.array.length == 0)
+				continue;
+
+			const char *pTypeName = Types.u.object.values[TypeIndex].name;
+
+			// add type if it doesn't exist already
+			const auto CommunityType = std::find_if(pCommunity->m_vTypes.begin(), pCommunity->m_vTypes.end(), [pTypeName](const auto &Elem) {
+				return str_comp(Elem.Name(), pTypeName) == 0;
+			});
+			if(CommunityType == pCommunity->m_vTypes.end())
+			{
+				pCommunity->m_vTypes.emplace_back(pTypeName);
+			}
+
+			// add addresses
+			for(unsigned AddressIndex = 0; AddressIndex < Addresses.u.array.length; ++AddressIndex)
+			{
+				const json_value &Address = Addresses[AddressIndex];
+				if(Address.type != json_string)
+				{
+					log_error("serverbrowser", "invalid address (ServerIndex=%u, TypeIndex=%u, AddressIndex=%u)", ServerIndex, TypeIndex, AddressIndex);
+					return false;
+				}
+				NETADDR NetAddr;
+				if(net_addr_from_str(&NetAddr, Address.u.string.ptr))
+				{
+					log_error("serverbrowser", "invalid address (ServerIndex=%u, TypeIndex=%u, AddressIndex=%u)", ServerIndex, TypeIndex, AddressIndex);
+					continue;
+				}
+				pCountry->m_vServers.emplace_back(NetAddr, pTypeName);
+			}
+		}
+	}
+	return true;
+}
+
+bool CServerBrowser::ParseCommunityFinishes(CCommunity *pCommunity, const json_value &Finishes)
+{
+	for(unsigned FinishIndex = 0; FinishIndex < Finishes.u.array.length; ++FinishIndex)
+	{
+		const json_value &Finish = Finishes[FinishIndex];
+		if(Finish.type != json_string)
+		{
+			log_error("serverbrowser", "invalid rank (FinishIndex=%u)", FinishIndex);
+			return false;
+		}
+		pCommunity->m_FinishedMaps.emplace((const char *)Finish);
+	}
+	return true;
+}
+
+void CServerBrowser::LoadDDNetServers()
+{
+	// Parse communities
+	m_vCommunities.clear();
+	m_CommunityServersByAddr.clear();
+
+	if(!m_pDDNetInfo)
+	{
+		CleanFilters();
+		return;
+	}
+
+	const json_value &Communities = (*m_pDDNetInfo)["communities"];
+	if(Communities.type != json_array)
+	{
+		CleanFilters();
+		return;
+	}
+
+	for(unsigned CommunityIndex = 0; CommunityIndex < Communities.u.array.length; ++CommunityIndex)
+	{
+		const json_value &Community = Communities[CommunityIndex];
+		if(Community.type != json_object)
+		{
+			log_error("serverbrowser", "invalid community (CommunityIndex=%d)", (int)CommunityIndex);
+			continue;
+		}
+		const json_value &Id = Community["id"];
+		if(Id.type != json_string)
+		{
+			log_error("serverbrowser", "invalid community id (CommunityIndex=%d)", (int)CommunityIndex);
+			continue;
+		}
+		const json_value &Icon = Community["icon"];
+		const json_value &IconSha256 = Icon["sha256"];
+		const json_value &IconUrl = Icon["url"];
+		const json_value &Name = Community["name"];
+		const json_value *pFinishes = &Icon["finishes"];
+		const json_value *pServers = &Icon["servers"];
+		if(pFinishes->type == json_none)
+		{
+			if(str_comp(Id, COMMUNITY_DDNET) == 0)
+			{
+				pFinishes = &(*m_pDDNetInfo)["maps"];
+			}
+		}
+		// Backward compatibility.
+		if(pServers->type == json_none)
+		{
+			if(str_comp(Id, COMMUNITY_DDNET) == 0)
+			{
+				pServers = &(*m_pDDNetInfo)["servers"];
+			}
+			else if(str_comp(Id, "kog") == 0)
+			{
+				pServers = &(*m_pDDNetInfo)["servers-kog"];
+			}
+		}
+		if(false ||
+			Icon.type != json_object ||
+			IconSha256.type != json_string ||
+			IconUrl.type != json_string ||
+			Name.type != json_string ||
+			(pFinishes->type != json_array && pFinishes->type != json_none) ||
+			pServers->type != json_array)
+		{
+			log_error("serverbrowser", "invalid community attribute (CommunityId=%s)", (const char *)Id);
+			continue;
+		}
+		SHA256_DIGEST ParsedIconSha256;
+		if(sha256_from_str(&ParsedIconSha256, IconSha256) != 0)
+		{
+			log_error("serverbrowser", "invalid community icon sha256 (CommunityId=%s)", (const char *)Id);
+			continue;
+		}
+		CCommunity NewCommunity(Id, Name, ParsedIconSha256, IconUrl);
+		if(!ParseCommunityServers(&NewCommunity, *pServers))
+		{
+			log_error("serverbrowser", "invalid community servers (CommunityId=%s)", NewCommunity.Id());
+			continue;
+		}
+		NewCommunity.m_HasFinishes = pFinishes->type == json_array;
+		if(NewCommunity.m_HasFinishes && !ParseCommunityFinishes(&NewCommunity, *pFinishes))
+		{
+			log_error("serverbrowser", "invalid community finishes (CommunityId=%s)", NewCommunity.Id());
+			continue;
+		}
+
+		for(const auto &Country : NewCommunity.Countries())
+		{
+			for(const auto &Server : Country.Servers())
+			{
+				m_CommunityServersByAddr.emplace(Server.Address(), CCommunityServer(NewCommunity.Id(), Country.Name(), Server.TypeName()));
+			}
+		}
+		m_vCommunities.push_back(std::move(NewCommunity));
+	}
+
+	// Add default none community
+	m_vCommunities.emplace_back(COMMUNITY_NONE, "None", SHA256_ZEROED, "");
+
+	// Remove unknown elements from exclude lists
+	CleanFilters();
+}
+
+void CServerBrowser::UpdateServerFilteredPlayers(CServerInfo *pInfo) const
+{
+	pInfo->m_NumFilteredPlayers = g_Config.m_BrFilterSpectators ? pInfo->m_NumPlayers : pInfo->m_NumClients;
+	if(g_Config.m_BrFilterConnectingPlayers)
+	{
+		for(const auto &Client : pInfo->m_aClients)
+		{
+			if((!g_Config.m_BrFilterSpectators || Client.m_Player) && str_comp(Client.m_aName, "(connecting)") == 0 && Client.m_aClan[0] == '\0')
+				pInfo->m_NumFilteredPlayers--;
+		}
+	}
+}
+
+void CServerBrowser::UpdateServerFriends(CServerInfo *pInfo) const
+{
+	pInfo->m_FriendState = IFriends::FRIEND_NO;
+	pInfo->m_FriendNum = 0;
+	for(int ClientIndex = 0; ClientIndex < minimum(pInfo->m_NumReceivedClients, (int)MAX_CLIENTS); ClientIndex++)
+	{
+		pInfo->m_aClients[ClientIndex].m_FriendState = m_pFriends->GetFriendState(pInfo->m_aClients[ClientIndex].m_aName, pInfo->m_aClients[ClientIndex].m_aClan);
+		pInfo->m_FriendState = maximum(pInfo->m_FriendState, pInfo->m_aClients[ClientIndex].m_FriendState);
+		if(pInfo->m_aClients[ClientIndex].m_FriendState != IFriends::FRIEND_NO)
+			pInfo->m_FriendNum++;
+	}
+}
+
+void CServerBrowser::UpdateServerCommunity(CServerInfo *pInfo) const
+{
+	for(int AddressIndex = 0; AddressIndex < pInfo->m_NumAddresses; AddressIndex++)
+	{
+		const auto Community = m_CommunityServersByAddr.find(pInfo->m_aAddresses[AddressIndex]);
+		if(Community != m_CommunityServersByAddr.end())
+		{
+			str_copy(pInfo->m_aCommunityId, Community->second.CommunityId());
+			str_copy(pInfo->m_aCommunityCountry, Community->second.CountryName());
+			str_copy(pInfo->m_aCommunityType, Community->second.TypeName());
+			return;
+		}
+	}
+	str_copy(pInfo->m_aCommunityId, COMMUNITY_NONE);
+	str_copy(pInfo->m_aCommunityCountry, "");
+	str_copy(pInfo->m_aCommunityType, "");
+}
+
+void CServerBrowser::UpdateServerRank(CServerInfo *pInfo) const
+{
+	const CCommunity *pCommunity = Community(pInfo->m_aCommunityId);
+	pInfo->m_HasRank = pCommunity == nullptr ? CServerInfo::RANK_UNAVAILABLE : pCommunity->HasRank(pInfo->m_aMap);
+}
+
+const char *CServerBrowser::GetTutorialServer()
+{
+	// Use internet tab as default after joining tutorial, also makes sure Find() actually works.
+	// Note that when no server info has been loaded yet, this will not return a result immediately.
+	m_pConfigManager->Reset("ui_page");
+	Refresh(IServerBrowser::TYPE_INTERNET);
+
+	const CCommunity *pCommunity = Community(COMMUNITY_DDNET);
+	if(pCommunity == nullptr)
+		return nullptr;
+
+	const char *pBestAddr = nullptr;
+	int BestLatency = std::numeric_limits<int>::max();
+	for(const auto &Country : pCommunity->Countries())
+	{
+		for(const auto &Server : Country.Servers())
+		{
+			CServerEntry *pEntry = Find(Server.Address());
+			if(!pEntry)
+				continue;
+			if(str_find(pEntry->m_Info.m_aName, "(Tutorial)") == 0)
+				continue;
+			if(pEntry->m_Info.m_NumPlayers > pEntry->m_Info.m_MaxPlayers - 10)
+				continue;
+			if(pEntry->m_Info.m_Latency >= BestLatency)
+				continue;
+			BestLatency = pEntry->m_Info.m_Latency;
+			pBestAddr = pEntry->m_Info.m_aAddress;
+		}
+	}
+	return pBestAddr;
+}
+
+bool CServerBrowser::IsRefreshing() const
+{
+	return m_pFirstReqServer != nullptr;
+}
+
+bool CServerBrowser::IsGettingServerlist() const
+{
+	return m_pHttp->IsRefreshing();
+}
+
+int CServerBrowser::LoadingProgression() const
+{
+	if(m_NumServers == 0)
+		return 0;
+
+	int Servers = m_NumServers;
+	int Loaded = m_NumServers - m_NumRequests;
+	return 100.0f * Loaded / Servers;
+}
+
+CServerInfo::ERankState CCommunity::HasRank(const char *pMap) const
+{
+	if(!HasRanks())
+		return CServerInfo::RANK_UNAVAILABLE;
+	const CCommunityMap Needle(pMap);
+	return m_FinishedMaps.count(Needle) == 0 ? CServerInfo::RANK_UNRANKED : CServerInfo::RANK_RANKED;
+}
+
+const std::vector<CCommunity> &CServerBrowser::Communities() const
+{
+	return m_vCommunities;
+}
+
+const CCommunity *CServerBrowser::Community(const char *pCommunityId) const
+{
+	const auto Community = std::find_if(Communities().begin(), Communities().end(), [pCommunityId](const auto &Elem) {
+		return str_comp(Elem.Id(), pCommunityId) == 0;
+	});
+	return Community == Communities().end() ? nullptr : &(*Community);
+}
+
+std::vector<const CCommunity *> CServerBrowser::SelectedCommunities() const
+{
+	std::vector<const CCommunity *> vpSelected;
+	for(const auto &Community : Communities())
+	{
+		if(!CommunitiesFilter().Filtered(Community.Id()))
+		{
+			vpSelected.push_back(&Community);
+		}
+	}
+	return vpSelected;
+}
+
+void CFilterList::Add(const char *pElement)
+{
+	if(Filtered(pElement))
+		return;
+
+	if(m_pFilter[0] != '\0')
+		str_append(m_pFilter, ",", m_FilterSize);
+	str_append(m_pFilter, pElement, m_FilterSize);
+}
+
+void CFilterList::Remove(const char *pElement)
+{
+	if(!Filtered(pElement))
+		return;
+
+	// rewrite exclude/filter list
+	char aBuf[512];
+
+	str_copy(aBuf, m_pFilter);
+	m_pFilter[0] = '\0';
+
+	char aToken[512];
+	for(const char *pTok = aBuf; (pTok = str_next_token(pTok, ",", aToken, sizeof(aToken)));)
+	{
+		if(str_comp_nocase(pElement, aToken) != 0)
+		{
+			if(m_pFilter[0] != '\0')
+				str_append(m_pFilter, ",", m_FilterSize);
+			str_append(m_pFilter, aToken, m_FilterSize);
+		}
+	}
+}
+
+void CFilterList::Clear()
+{
+	m_pFilter[0] = '\0';
+}
+
+bool CFilterList::Filtered(const char *pElement) const
+{
+	// If the needle is not defined, we exclude it if there is any other
+	// exclusion, i.e. we only show those elements when the filter is empty.
+	if(pElement[0] == '\0')
+		return !Empty();
+
+	// Special case: "*element" means anything except that element is excluded.
+	// Necessary because the default filter cannot exclude unknown elements,
+	// but we want to select only the DDNet community by default.
+	if(m_pFilter[0] == '*')
+		return str_comp(m_pFilter + 1, pElement) != 0;
+
+	// Comma separated list of excluded elements.
+	return str_in_list(m_pFilter, ",", pElement);
+}
+
+bool CFilterList::Empty() const
+{
+	return m_pFilter[0] == '\0';
+}
+
+void CFilterList::Clean(const std::vector<const char *> &vpAllowedElements)
+{
+	size_t NumFiltered = 0;
+	char aNewList[512];
+	aNewList[0] = '\0';
+
+	for(const char *pElement : vpAllowedElements)
+	{
+		if(Filtered(pElement))
+		{
+			if(aNewList[0] != '\0')
+				str_append(aNewList, ",");
+			str_append(aNewList, pElement);
+			++NumFiltered;
+		}
+	}
+
+	// Prevent filter that would exclude all allowed elements
+	if(NumFiltered == vpAllowedElements.size())
+		m_pFilter[0] = '\0';
+	else
+		str_copy(m_pFilter, aNewList, m_FilterSize);
+}
+
+void CServerBrowser::CleanFilters()
+{
+	CommunitiesFilterClean();
+	CountriesFilterClean();
+	TypesFilterClean();
+}
+
+void CServerBrowser::CommunitiesFilterClean()
+{
+	std::vector<const char *> vpCommunityNames;
+	for(const auto &Community : Communities())
+		vpCommunityNames.push_back(Community.Id());
+	m_CommunitiesFilter.Clean(vpCommunityNames);
+}
+
+void CServerBrowser::CountriesFilterClean()
+{
+	std::vector<const char *> vpCountryNames;
+	for(const auto &Community : Communities())
+		for(const auto &Country : Community.Countries())
+			vpCountryNames.push_back(Country.Name());
+	m_CountriesFilter.Clean(vpCountryNames);
+}
+
+void CServerBrowser::TypesFilterClean()
+{
+	std::vector<const char *> vpTypeNames;
+	for(const auto &Community : Communities())
+		for(const auto &Type : Community.Types())
+			vpTypeNames.push_back(Type.Name());
+	m_TypesFilter.Clean(vpTypeNames);
+}
+
+bool CServerBrowser::IsRegistered(const NETADDR &Addr)
+{
+	const int NumServers = m_pHttp->NumServers();
+	for(int i = 0; i < NumServers; i++)
+	{
+		const CServerInfo Info = m_pHttp->Server(i);
+		for(int j = 0; j < Info.m_NumAddresses; j++)
+		{
+			if(net_addr_comp(&Info.m_aAddresses[j], &Addr) == 0)
+			{
+				return true;
+			}
+		}
+	}
+
+	const int NumLegacyServers = m_pHttp->NumLegacyServers();
+	for(int i = 0; i < NumLegacyServers; i++)
+	{
+		if(net_addr_comp(&m_pHttp->LegacyServer(i), &Addr) == 0)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+int CServerInfo::EstimateLatency(int Loc1, int Loc2)
+{
+	if(Loc1 == LOC_UNKNOWN || Loc2 == LOC_UNKNOWN)
+	{
+		return 999;
+	}
+	if(Loc1 != Loc2)
+	{
+		return 199;
+	}
+	return 99;
+}
+
+bool CServerInfo::ParseLocation(int *pResult, const char *pString)
+{
+	*pResult = LOC_UNKNOWN;
+	int Length = str_length(pString);
+	if(Length < 2)
+	{
+		return true;
+	}
+	// ISO continent code. Allow antarctica, but treat it as unknown.
+	static const char s_apLocations[NUM_LOCS][6] = {
+		"an", // LOC_UNKNOWN
+		"af", // LOC_AFRICA
+		"as", // LOC_ASIA
+		"oc", // LOC_AUSTRALIA
+		"eu", // LOC_EUROPE
+		"na", // LOC_NORTH_AMERICA
+		"sa", // LOC_SOUTH_AMERICA
+		"as:cn", // LOC_CHINA
+	};
+	for(int i = std::size(s_apLocations) - 1; i >= 0; i--)
+	{
+		if(str_startswith(pString, s_apLocations[i]))
+		{
+			*pResult = i;
+			return false;
+		}
+	}
+	return true;
+}
+
+void CServerInfo::InfoToString(char *pBuffer, int BufferSize) const
+{
+	str_format(
+		pBuffer,
+		BufferSize,
+		"%s\n"
+		"Address: ddnet://%s\n"
+		"My IGN: %s\n",
+		m_aName,
+		m_aAddress,
+		g_Config.m_PlayerName);
+}
diff --git a/src_bkp/engine/client/serverbrowser.h b/src_bkp/engine/client/serverbrowser.h
new file mode 100644
index 0000000000..1920b6c744
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser.h
@@ -0,0 +1,227 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_SERVERBROWSER_H
+#define ENGINE_CLIENT_SERVERBROWSER_H
+
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/memheap.h>
+
+#include <unordered_map>
+
+typedef struct _json_value json_value;
+class CNetClient;
+class IConfigManager;
+class IConsole;
+class IEngine;
+class IFavorites;
+class IFriends;
+class IServerBrowserHttp;
+class IServerBrowserPingCache;
+class IStorage;
+
+class CCommunityServer
+{
+	char m_aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	char m_aCountryName[CServerInfo::MAX_COMMUNITY_COUNTRY_LENGTH];
+	char m_aTypeName[CServerInfo::MAX_COMMUNITY_TYPE_LENGTH];
+
+public:
+	CCommunityServer(const char *pCommunityId, const char *pCountryName, const char *pTypeName)
+	{
+		str_copy(m_aCommunityId, pCommunityId);
+		str_copy(m_aCountryName, pCountryName);
+		str_copy(m_aTypeName, pTypeName);
+	}
+
+	const char *CommunityId() const { return m_aCommunityId; }
+	const char *CountryName() const { return m_aCountryName; }
+	const char *TypeName() const { return m_aTypeName; }
+};
+
+class CFilterList : public IFilterList
+{
+	char *m_pFilter;
+	size_t m_FilterSize;
+
+public:
+	CFilterList(char *pFilter, size_t FilterSize) :
+		m_pFilter(pFilter), m_FilterSize(FilterSize)
+	{
+	}
+
+	void Add(const char *pElement) override;
+	void Remove(const char *pElement) override;
+	void Clear() override;
+	bool Filtered(const char *pElement) const override;
+	bool Empty() const override;
+	void Clean(const std::vector<const char *> &vpAllowedElements);
+};
+
+class CServerBrowser : public IServerBrowser
+{
+public:
+	class CServerEntry
+	{
+	public:
+		int64_t m_RequestTime;
+		bool m_RequestIgnoreInfo;
+		int m_GotInfo;
+		CServerInfo m_Info;
+
+		CServerEntry *m_pPrevReq; // request list
+		CServerEntry *m_pNextReq;
+	};
+
+	CServerBrowser();
+	virtual ~CServerBrowser();
+
+	// interface functions
+	void Refresh(int Type) override;
+	bool IsRefreshing() const override;
+	bool IsGettingServerlist() const override;
+	int LoadingProgression() const override;
+	void RequestResort() { m_NeedResort = true; }
+
+	int NumServers() const override { return m_NumServers; }
+	int Players(const CServerInfo &Item) const override;
+	int Max(const CServerInfo &Item) const override;
+	int NumSortedServers() const override { return m_NumSortedServers; }
+	int NumSortedPlayers() const override { return m_NumSortedPlayers; }
+	const CServerInfo *SortedGet(int Index) const override;
+
+	const json_value *LoadDDNetInfo();
+	void LoadDDNetInfoJson();
+	void LoadDDNetLocation();
+	void LoadDDNetServers();
+	void UpdateServerFilteredPlayers(CServerInfo *pInfo) const;
+	void UpdateServerFriends(CServerInfo *pInfo) const;
+	void UpdateServerCommunity(CServerInfo *pInfo) const;
+	void UpdateServerRank(CServerInfo *pInfo) const;
+	const char *GetTutorialServer() override;
+
+	const std::vector<CCommunity> &Communities() const override;
+	const CCommunity *Community(const char *pCommunityId) const override;
+	std::vector<const CCommunity *> SelectedCommunities() const override;
+	int64_t DDNetInfoUpdateTime() const override { return m_DDNetInfoUpdateTime; }
+
+	CFilterList &CommunitiesFilter() override { return m_CommunitiesFilter; }
+	CFilterList &CountriesFilter() override { return m_CountriesFilter; }
+	CFilterList &TypesFilter() override { return m_TypesFilter; }
+	const CFilterList &CommunitiesFilter() const override { return m_CommunitiesFilter; }
+	const CFilterList &CountriesFilter() const override { return m_CountriesFilter; }
+	const CFilterList &TypesFilter() const override { return m_TypesFilter; }
+	void CleanFilters() override;
+
+	void CommunitiesFilterClean();
+	void CountriesFilterClean();
+	void TypesFilterClean();
+
+	//
+	void Update();
+	void OnServerInfoUpdate(const NETADDR &Addr, int Token, const CServerInfo *pInfo);
+	void SetHttpInfo(const CServerInfo *pInfo);
+	void RequestCurrentServer(const NETADDR &Addr) const;
+	void RequestCurrentServerWithRandomToken(const NETADDR &Addr, int *pBasicToken, int *pToken) const;
+	void SetCurrentServerPing(const NETADDR &Addr, int Ping);
+
+	void SetBaseInfo(class CNetClient *pClient, const char *pNetVersion);
+	void OnInit();
+
+	void QueueRequest(CServerEntry *pEntry);
+	CServerEntry *Find(const NETADDR &Addr);
+	int GetCurrentType() override { return m_ServerlistType; }
+	bool IsRegistered(const NETADDR &Addr);
+
+private:
+	CNetClient *m_pNetClient = nullptr;
+	IConfigManager *m_pConfigManager = nullptr;
+	IConsole *m_pConsole = nullptr;
+	IEngine *m_pEngine = nullptr;
+	IFriends *m_pFriends = nullptr;
+	IFavorites *m_pFavorites = nullptr;
+	IStorage *m_pStorage = nullptr;
+	char m_aNetVersion[128];
+
+	bool m_RefreshingHttp = false;
+	IServerBrowserHttp *m_pHttp = nullptr;
+	IServerBrowserPingCache *m_pPingCache = nullptr;
+	const char *m_pHttpPrevBestUrl = nullptr;
+
+	CHeap m_ServerlistHeap;
+	CServerEntry **m_ppServerlist;
+	int *m_pSortedServerlist;
+	std::unordered_map<NETADDR, int> m_ByAddr;
+
+	std::vector<CCommunity> m_vCommunities;
+	std::unordered_map<NETADDR, CCommunityServer> m_CommunityServersByAddr;
+
+	int m_OwnLocation = CServerInfo::LOC_UNKNOWN;
+
+	CFilterList m_CommunitiesFilter;
+	CFilterList m_CountriesFilter;
+	CFilterList m_TypesFilter;
+
+	json_value *m_pDDNetInfo;
+	int64_t m_DDNetInfoUpdateTime;
+
+	CServerEntry *m_pFirstReqServer; // request list
+	CServerEntry *m_pLastReqServer;
+	int m_NumRequests;
+
+	bool m_NeedResort;
+	int m_Sorthash;
+
+	// used instead of g_Config.br_max_requests to get more servers
+	int m_CurrentMaxRequests;
+
+	int m_NumSortedServers;
+	int m_NumSortedServersCapacity;
+	int m_NumSortedPlayers;
+	int m_NumServers;
+	int m_NumServerCapacity;
+
+	int m_ServerlistType;
+	int64_t m_BroadcastTime;
+	unsigned char m_aTokenSeed[16];
+
+	int GenerateToken(const NETADDR &Addr) const;
+	static int GetBasicToken(int Token);
+	static int GetExtraToken(int Token);
+
+	// sorting criteria
+	bool SortCompareName(int Index1, int Index2) const;
+	bool SortCompareMap(int Index1, int Index2) const;
+	bool SortComparePing(int Index1, int Index2) const;
+	bool SortCompareGametype(int Index1, int Index2) const;
+	bool SortCompareNumPlayers(int Index1, int Index2) const;
+	bool SortCompareNumClients(int Index1, int Index2) const;
+	bool SortCompareNumPlayersAndPing(int Index1, int Index2) const;
+
+	//
+	void Filter();
+	void Sort();
+	int SortHash() const;
+
+	void CleanUp();
+
+	void UpdateFromHttp();
+	CServerEntry *Add(const NETADDR *pAddrs, int NumAddrs);
+
+	void RemoveRequest(CServerEntry *pEntry);
+
+	void RequestImpl(const NETADDR &Addr, CServerEntry *pEntry, int *pBasicToken, int *pToken, bool RandomToken) const;
+
+	void RegisterCommands();
+	static void Con_LeakIpAddress(IConsole::IResult *pResult, void *pUserData);
+
+	void SetInfo(CServerEntry *pEntry, const CServerInfo &Info) const;
+	void SetLatency(NETADDR Addr, int Latency);
+
+	static bool ParseCommunityFinishes(CCommunity *pCommunity, const json_value &Finishes);
+	static bool ParseCommunityServers(CCommunity *pCommunity, const json_value &Servers);
+};
+
+#endif
diff --git a/src_bkp/engine/client/serverbrowser_http.cpp b/src_bkp/engine/client/serverbrowser_http.cpp
new file mode 100644
index 0000000000..df92212920
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser_http.cpp
@@ -0,0 +1,510 @@
+#include "serverbrowser_http.h"
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/external/json-parser/json.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/http.h>
+#include <engine/shared/jobs.h>
+#include <engine/shared/linereader.h>
+#include <engine/shared/serverinfo.h>
+#include <engine/storage.h>
+
+#include <base/lock.h>
+#include <base/system.h>
+
+#include <memory>
+#include <vector>
+
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+class CChooseMaster
+{
+public:
+	typedef bool (*VALIDATOR)(json_value *pJson);
+
+	enum
+	{
+		MAX_URLS = 16,
+	};
+	CChooseMaster(IEngine *pEngine, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex);
+	virtual ~CChooseMaster();
+
+	bool GetBestUrl(const char **pBestUrl) const;
+	void Reset();
+	bool IsRefreshing() const { return m_pJob && m_pJob->Status() != IJob::STATE_DONE; }
+	void Refresh();
+
+private:
+	int GetBestIndex() const;
+
+	class CData
+	{
+	public:
+		std::atomic_int m_BestIndex{-1};
+		// Constant after construction.
+		VALIDATOR m_pfnValidator;
+		int m_NumUrls;
+		char m_aaUrls[MAX_URLS][256];
+	};
+	class CJob : public IJob
+	{
+		CLock m_Lock;
+		std::shared_ptr<CData> m_pData;
+		std::unique_ptr<CHttpRequest> m_pHead PT_GUARDED_BY(m_Lock);
+		std::unique_ptr<CHttpRequest> m_pGet PT_GUARDED_BY(m_Lock);
+		void Run() override REQUIRES(!m_Lock);
+
+	public:
+		CJob(std::shared_ptr<CData> pData) :
+			m_pData(std::move(pData)) {}
+		void Abort() REQUIRES(!m_Lock);
+	};
+
+	IEngine *m_pEngine;
+	int m_PreviousBestIndex;
+	std::shared_ptr<CData> m_pData;
+	std::shared_ptr<CJob> m_pJob;
+};
+
+CChooseMaster::CChooseMaster(IEngine *pEngine, VALIDATOR pfnValidator, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
+	m_pEngine(pEngine),
+	m_PreviousBestIndex(PreviousBestIndex)
+{
+	dbg_assert(NumUrls >= 0, "no master URLs");
+	dbg_assert(NumUrls <= MAX_URLS, "too many master URLs");
+	dbg_assert(PreviousBestIndex >= -1, "previous best index negative and not -1");
+	dbg_assert(PreviousBestIndex < NumUrls, "previous best index too high");
+	m_pData = std::make_shared<CData>();
+	m_pData->m_pfnValidator = pfnValidator;
+	m_pData->m_NumUrls = NumUrls;
+	for(int i = 0; i < m_pData->m_NumUrls; i++)
+	{
+		str_copy(m_pData->m_aaUrls[i], ppUrls[i]);
+	}
+}
+
+CChooseMaster::~CChooseMaster()
+{
+	if(m_pJob)
+	{
+		m_pJob->Abort();
+	}
+}
+
+int CChooseMaster::GetBestIndex() const
+{
+	int BestIndex = m_pData->m_BestIndex.load();
+	if(BestIndex >= 0)
+	{
+		return BestIndex;
+	}
+	else
+	{
+		return m_PreviousBestIndex;
+	}
+}
+
+bool CChooseMaster::GetBestUrl(const char **ppBestUrl) const
+{
+	int Index = GetBestIndex();
+	if(Index < 0)
+	{
+		*ppBestUrl = nullptr;
+		return true;
+	}
+	*ppBestUrl = m_pData->m_aaUrls[Index];
+	return false;
+}
+
+void CChooseMaster::Reset()
+{
+	m_PreviousBestIndex = -1;
+	m_pData->m_BestIndex.store(-1);
+}
+
+void CChooseMaster::Refresh()
+{
+	if(m_pJob == nullptr || m_pJob->Status() == IJob::STATE_DONE)
+		m_pEngine->AddJob(m_pJob = std::make_shared<CJob>(m_pData));
+}
+
+void CChooseMaster::CJob::Abort()
+{
+	CLockScope ls(m_Lock);
+	if(m_pHead != nullptr)
+	{
+		m_pHead->Abort();
+	}
+
+	if(m_pGet != nullptr)
+	{
+		m_pGet->Abort();
+	}
+}
+
+void CChooseMaster::CJob::Run()
+{
+	// Check masters in a random order.
+	int aRandomized[MAX_URLS] = {0};
+	for(int i = 0; i < m_pData->m_NumUrls; i++)
+	{
+		aRandomized[i] = i;
+	}
+	// https://en.wikipedia.org/w/index.php?title=Fisher%E2%80%93Yates_shuffle&oldid=1002922479#The_modern_algorithm
+	// The equivalent version.
+	for(int i = 0; i <= m_pData->m_NumUrls - 2; i++)
+	{
+		int j = i + secure_rand_below(m_pData->m_NumUrls - i);
+		std::swap(aRandomized[i], aRandomized[j]);
+	}
+	// Do a HEAD request to ensure that a connection is established and
+	// then do a GET request to check how fast we can get the server list.
+	//
+	// 10 seconds connection timeout, lower than 8KB/s for 10 seconds to
+	// fail.
+	CTimeout Timeout{10000, 0, 8000, 10};
+	int aTimeMs[MAX_URLS];
+	for(int i = 0; i < m_pData->m_NumUrls; i++)
+	{
+		aTimeMs[i] = -1;
+		const char *pUrl = m_pData->m_aaUrls[aRandomized[i]];
+		CHttpRequest *pHead = HttpHead(pUrl).release();
+		pHead->Timeout(Timeout);
+		pHead->LogProgress(HTTPLOG::FAILURE);
+		{
+			CLockScope ls(m_Lock);
+			m_pHead = std::unique_ptr<CHttpRequest>(pHead);
+		}
+		IEngine::RunJobBlocking(pHead);
+		if(pHead->State() == HTTP_ABORTED)
+		{
+			dbg_msg("serverbrowse_http", "master chooser aborted");
+			return;
+		}
+		if(pHead->State() != HTTP_DONE)
+		{
+			continue;
+		}
+		auto StartTime = time_get_nanoseconds();
+		CHttpRequest *pGet = HttpGet(pUrl).release();
+		pGet->Timeout(Timeout);
+		pGet->LogProgress(HTTPLOG::FAILURE);
+		{
+			CLockScope ls(m_Lock);
+			m_pGet = std::unique_ptr<CHttpRequest>(pGet);
+		}
+		IEngine::RunJobBlocking(pGet);
+		auto Time = std::chrono::duration_cast<std::chrono::milliseconds>(time_get_nanoseconds() - StartTime);
+		if(pHead->State() == HTTP_ABORTED)
+		{
+			dbg_msg("serverbrowse_http", "master chooser aborted");
+			return;
+		}
+		if(pGet->State() != HTTP_DONE)
+		{
+			continue;
+		}
+		json_value *pJson = pGet->ResultJson();
+		if(!pJson)
+		{
+			continue;
+		}
+		bool ParseFailure = m_pData->m_pfnValidator(pJson);
+		json_value_free(pJson);
+		if(ParseFailure)
+		{
+			continue;
+		}
+		dbg_msg("serverbrowse_http", "found master, url='%s' time=%dms", pUrl, (int)Time.count());
+		aTimeMs[i] = Time.count();
+	}
+	// Determine index of the minimum time.
+	int BestIndex = -1;
+	int BestTime = 0;
+	for(int i = 0; i < m_pData->m_NumUrls; i++)
+	{
+		if(aTimeMs[i] < 0)
+		{
+			continue;
+		}
+		if(BestIndex == -1 || aTimeMs[i] < BestTime)
+		{
+			BestTime = aTimeMs[i];
+			BestIndex = aRandomized[i];
+		}
+	}
+	if(BestIndex == -1)
+	{
+		dbg_msg("serverbrowse_http", "WARNING: no usable masters found");
+		return;
+	}
+	dbg_msg("serverbrowse_http", "determined best master, url='%s' time=%dms", m_pData->m_aaUrls[BestIndex], BestTime);
+	m_pData->m_BestIndex.store(BestIndex);
+}
+
+class CServerBrowserHttp : public IServerBrowserHttp
+{
+public:
+	CServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, const char **ppUrls, int NumUrls, int PreviousBestIndex);
+	~CServerBrowserHttp() override;
+	void Update() override;
+	bool IsRefreshing() override { return m_State != STATE_DONE; }
+	void Refresh() override;
+	bool GetBestUrl(const char **pBestUrl) const override { return m_pChooseMaster->GetBestUrl(pBestUrl); }
+
+	int NumServers() const override
+	{
+		return m_vServers.size();
+	}
+	const CServerInfo &Server(int Index) const override
+	{
+		return m_vServers[Index];
+	}
+	int NumLegacyServers() const override
+	{
+		return m_vLegacyServers.size();
+	}
+	const NETADDR &LegacyServer(int Index) const override
+	{
+		return m_vLegacyServers[Index];
+	}
+
+private:
+	enum
+	{
+		STATE_DONE,
+		STATE_WANTREFRESH,
+		STATE_REFRESHING,
+		STATE_NO_MASTER,
+	};
+
+	static bool Validate(json_value *pJson);
+	static bool Parse(json_value *pJson, std::vector<CServerInfo> *pvServers, std::vector<NETADDR> *pvLegacyServers);
+
+	IEngine *m_pEngine;
+	IConsole *m_pConsole;
+
+	int m_State = STATE_DONE;
+	std::shared_ptr<CHttpRequest> m_pGetServers;
+	std::unique_ptr<CChooseMaster> m_pChooseMaster;
+
+	std::vector<CServerInfo> m_vServers;
+	std::vector<NETADDR> m_vLegacyServers;
+};
+
+CServerBrowserHttp::CServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, const char **ppUrls, int NumUrls, int PreviousBestIndex) :
+	m_pEngine(pEngine),
+	m_pConsole(pConsole),
+	m_pChooseMaster(new CChooseMaster(pEngine, Validate, ppUrls, NumUrls, PreviousBestIndex))
+{
+	m_pChooseMaster->Refresh();
+}
+
+CServerBrowserHttp::~CServerBrowserHttp()
+{
+	if(m_pGetServers != nullptr)
+	{
+		m_pGetServers->Abort();
+	}
+}
+
+void CServerBrowserHttp::Update()
+{
+	if(m_State == STATE_WANTREFRESH)
+	{
+		const char *pBestUrl;
+		if(m_pChooseMaster->GetBestUrl(&pBestUrl))
+		{
+			if(!m_pChooseMaster->IsRefreshing())
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_http", "no working serverlist URL found");
+				m_State = STATE_NO_MASTER;
+			}
+			return;
+		}
+		m_pGetServers = HttpGet(pBestUrl);
+		// 10 seconds connection timeout, lower than 8KB/s for 10 seconds to fail.
+		m_pGetServers->Timeout(CTimeout{10000, 0, 8000, 10});
+		m_pEngine->AddJob(m_pGetServers);
+		m_State = STATE_REFRESHING;
+	}
+	else if(m_State == STATE_REFRESHING)
+	{
+		if(m_pGetServers->State() == HTTP_QUEUED || m_pGetServers->State() == HTTP_RUNNING)
+		{
+			return;
+		}
+		m_State = STATE_DONE;
+		std::shared_ptr<CHttpRequest> pGetServers = nullptr;
+		std::swap(m_pGetServers, pGetServers);
+
+		bool Success = true;
+		json_value *pJson = pGetServers->ResultJson();
+		Success = Success && pJson;
+		Success = Success && !Parse(pJson, &m_vServers, &m_vLegacyServers);
+		json_value_free(pJson);
+		if(!Success)
+		{
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_http", "failed getting serverlist, trying to find best URL");
+			m_pChooseMaster->Reset();
+			m_pChooseMaster->Refresh();
+		}
+	}
+}
+void CServerBrowserHttp::Refresh()
+{
+	if(m_State == STATE_WANTREFRESH || m_State == STATE_REFRESHING || m_State == STATE_NO_MASTER)
+	{
+		if(m_State == STATE_NO_MASTER)
+			m_State = STATE_WANTREFRESH;
+		m_pChooseMaster->Refresh();
+	}
+	if(m_State == STATE_DONE)
+		m_State = STATE_WANTREFRESH;
+	Update();
+}
+bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
+{
+	return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
+}
+bool CServerBrowserHttp::Validate(json_value *pJson)
+{
+	std::vector<CServerInfo> vServers;
+	std::vector<NETADDR> vLegacyServers;
+	return Parse(pJson, &vServers, &vLegacyServers);
+}
+bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvServers, std::vector<NETADDR> *pvLegacyServers)
+{
+	std::vector<CServerInfo> vServers;
+	std::vector<NETADDR> vLegacyServers;
+
+	const json_value &Json = *pJson;
+	const json_value &Servers = Json["servers"];
+	const json_value &LegacyServers = Json["servers_legacy"];
+	if(Servers.type != json_array || (LegacyServers.type != json_array && LegacyServers.type != json_none))
+	{
+		return true;
+	}
+	for(unsigned int i = 0; i < Servers.u.array.length; i++)
+	{
+		const json_value &Server = Servers[i];
+		const json_value &Addresses = Server["addresses"];
+		const json_value &Info = Server["info"];
+		const json_value &Location = Server["location"];
+		int ParsedLocation = CServerInfo::LOC_UNKNOWN;
+		CServerInfo2 ParsedInfo;
+		if(Addresses.type != json_array || (Location.type != json_string && Location.type != json_none))
+		{
+			return true;
+		}
+		if(Location.type == json_string)
+		{
+			if(CServerInfo::ParseLocation(&ParsedLocation, Location))
+			{
+				return true;
+			}
+		}
+		if(CServerInfo2::FromJson(&ParsedInfo, &Info))
+		{
+			//dbg_msg("dbg/serverbrowser", "skipped due to info, i=%d", i);
+			// Only skip the current server on parsing
+			// failure; the server info is "user input" by
+			// the game server and can be set to arbitrary
+			// values.
+			continue;
+		}
+		CServerInfo SetInfo = ParsedInfo;
+		SetInfo.m_Location = ParsedLocation;
+		SetInfo.m_NumAddresses = 0;
+		for(unsigned int a = 0; a < Addresses.u.array.length; a++)
+		{
+			const json_value &Address = Addresses[a];
+			if(Address.type != json_string)
+			{
+				return true;
+			}
+			NETADDR ParsedAddr;
+			if(ServerbrowserParseUrl(&ParsedAddr, Addresses[a]))
+			{
+				//dbg_msg("dbg/serverbrowser", "unknown address, i=%d a=%d", i, a);
+				// Skip unknown addresses.
+				continue;
+			}
+			if(SetInfo.m_NumAddresses < (int)std::size(SetInfo.m_aAddresses))
+			{
+				SetInfo.m_aAddresses[SetInfo.m_NumAddresses] = ParsedAddr;
+				SetInfo.m_NumAddresses += 1;
+			}
+		}
+		if(SetInfo.m_NumAddresses > 0)
+		{
+			vServers.push_back(SetInfo);
+		}
+	}
+	if(LegacyServers.type == json_array)
+	{
+		for(unsigned int i = 0; i < LegacyServers.u.array.length; i++)
+		{
+			const json_value &Address = LegacyServers[i];
+			NETADDR ParsedAddr;
+			if(Address.type != json_string || net_addr_from_str(&ParsedAddr, Address))
+			{
+				return true;
+			}
+			vLegacyServers.push_back(ParsedAddr);
+		}
+	}
+	*pvServers = vServers;
+	*pvLegacyServers = vLegacyServers;
+	return false;
+}
+
+static const char *DEFAULT_SERVERLIST_URLS[] = {
+	"https://master1.ddnet.org/ddnet/15/servers.json",
+	"https://master2.ddnet.org/ddnet/15/servers.json",
+	"https://master3.ddnet.org/ddnet/15/servers.json",
+	"https://master4.ddnet.org/ddnet/15/servers.json",
+};
+
+IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, IStorage *pStorage, const char *pPreviousBestUrl)
+{
+	char aaUrls[CChooseMaster::MAX_URLS][256];
+	const char *apUrls[CChooseMaster::MAX_URLS] = {0};
+	const char **ppUrls = apUrls;
+	int NumUrls = 0;
+	IOHANDLE File = pStorage->OpenFile("ddnet-serverlist-urls.cfg", IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(File)
+	{
+		CLineReader Lines;
+		Lines.Init(File);
+		while(NumUrls < CChooseMaster::MAX_URLS)
+		{
+			const char *pLine = Lines.Get();
+			if(!pLine)
+			{
+				break;
+			}
+			str_copy(aaUrls[NumUrls], pLine);
+			apUrls[NumUrls] = aaUrls[NumUrls];
+			NumUrls += 1;
+		}
+	}
+	if(NumUrls == 0)
+	{
+		ppUrls = DEFAULT_SERVERLIST_URLS;
+		NumUrls = std::size(DEFAULT_SERVERLIST_URLS);
+	}
+	int PreviousBestIndex = -1;
+	for(int i = 0; i < NumUrls; i++)
+	{
+		if(str_comp(ppUrls[i], pPreviousBestUrl) == 0)
+		{
+			PreviousBestIndex = i;
+			break;
+		}
+	}
+	return new CServerBrowserHttp(pEngine, pConsole, ppUrls, NumUrls, PreviousBestIndex);
+}
diff --git a/src_bkp/engine/client/serverbrowser_http.h b/src_bkp/engine/client/serverbrowser_http.h
new file mode 100644
index 0000000000..b6884f869a
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser_http.h
@@ -0,0 +1,29 @@
+#ifndef ENGINE_CLIENT_SERVERBROWSER_HTTP_H
+#define ENGINE_CLIENT_SERVERBROWSER_HTTP_H
+#include <base/types.h>
+
+class CServerInfo;
+class IConsole;
+class IEngine;
+class IStorage;
+
+class IServerBrowserHttp
+{
+public:
+	virtual ~IServerBrowserHttp() {}
+
+	virtual void Update() = 0;
+
+	virtual bool IsRefreshing() = 0;
+	virtual void Refresh() = 0;
+
+	virtual bool GetBestUrl(const char **pBestUrl) const = 0;
+
+	virtual int NumServers() const = 0;
+	virtual const CServerInfo &Server(int Index) const = 0;
+	virtual int NumLegacyServers() const = 0;
+	virtual const NETADDR &LegacyServer(int Index) const = 0;
+};
+
+IServerBrowserHttp *CreateServerBrowserHttp(IEngine *pEngine, IConsole *pConsole, IStorage *pStorage, const char *pPreviousBestUrl);
+#endif // ENGINE_CLIENT_SERVERBROWSER_HTTP_H
diff --git a/src_bkp/engine/client/serverbrowser_ping_cache.cpp b/src_bkp/engine/client/serverbrowser_ping_cache.cpp
new file mode 100644
index 0000000000..d59f1bd834
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser_ping_cache.cpp
@@ -0,0 +1,168 @@
+#include "serverbrowser_ping_cache.h"
+
+#include <base/system.h>
+#include <engine/console.h>
+#include <engine/sqlite.h>
+
+#include <sqlite3.h>
+
+#include <unordered_map>
+#include <vector>
+
+class CServerBrowserPingCache : public IServerBrowserPingCache
+{
+public:
+	class CEntry
+	{
+	public:
+		NETADDR m_Addr;
+		int m_Ping;
+	};
+
+	CServerBrowserPingCache(IConsole *pConsole, IStorage *pStorage);
+	~CServerBrowserPingCache() override = default;
+
+	void Load() override;
+
+	int NumEntries() const override;
+	void CachePing(const NETADDR &Addr, int Ping) override;
+	int GetPing(const NETADDR *pAddrs, int NumAddrs) const override;
+
+private:
+	IConsole *m_pConsole;
+
+	CSqlite m_pDisk;
+	CSqliteStmt m_pLoadStmt;
+	CSqliteStmt m_pStoreStmt;
+
+	std::unordered_map<NETADDR, int> m_Entries;
+};
+
+CServerBrowserPingCache::CServerBrowserPingCache(IConsole *pConsole, IStorage *pStorage) :
+	m_pConsole(pConsole)
+{
+	m_pDisk = SqliteOpen(pConsole, pStorage, "ddnet-cache.sqlite3");
+	if(!m_pDisk)
+	{
+		pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_ping_cache", "failed to open ddnet-cache.sqlite3");
+		return;
+	}
+	sqlite3 *pSqlite = m_pDisk.get();
+	static const char TABLE[] = "CREATE TABLE IF NOT EXISTS server_pings (ip_address TEXT PRIMARY KEY NOT NULL, ping INTEGER NOT NULL, utc_timestamp TEXT NOT NULL)";
+	if(SQLITE_HANDLE_ERROR(sqlite3_exec(pSqlite, TABLE, nullptr, nullptr, nullptr)))
+	{
+		m_pDisk = nullptr;
+		pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_ping_cache", "failed to create server_pings table");
+		return;
+	}
+	m_pLoadStmt = SqlitePrepare(pConsole, pSqlite, "SELECT ip_address, ping FROM server_pings");
+	m_pStoreStmt = SqlitePrepare(pConsole, pSqlite, "INSERT OR REPLACE INTO server_pings (ip_address, ping, utc_timestamp) VALUES (?, ?, datetime('now'))");
+}
+
+void CServerBrowserPingCache::Load()
+{
+	if(m_pDisk)
+	{
+		std::vector<CEntry> vNewEntries;
+
+		sqlite3 *pSqlite = m_pDisk.get();
+		IConsole *pConsole = m_pConsole;
+		bool Error = false;
+		bool WarnedForBadAddress = false;
+		Error = Error || !m_pLoadStmt;
+		while(!Error)
+		{
+			int StepResult = SQLITE_HANDLE_ERROR(sqlite3_step(m_pLoadStmt.get()));
+			if(StepResult == SQLITE_DONE)
+			{
+				break;
+			}
+			else if(StepResult == SQLITE_ROW)
+			{
+				const char *pIpAddress = (const char *)sqlite3_column_text(m_pLoadStmt.get(), 0);
+				int Ping = sqlite3_column_int(m_pLoadStmt.get(), 1);
+				NETADDR Addr;
+				if(net_addr_from_str(&Addr, pIpAddress))
+				{
+					if(!WarnedForBadAddress)
+					{
+						char aBuf[64];
+						str_format(aBuf, sizeof(aBuf), "invalid address: %s", pIpAddress);
+						pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_ping_cache", aBuf);
+						WarnedForBadAddress = true;
+					}
+					continue;
+				}
+				vNewEntries.push_back(CEntry{Addr, Ping});
+			}
+			else
+			{
+				Error = true;
+			}
+		}
+		if(Error)
+		{
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_ping_cache", "failed to load ping cache");
+			return;
+		}
+		for(const auto &Entry : vNewEntries)
+		{
+			m_Entries[Entry.m_Addr] = Entry.m_Ping;
+		}
+	}
+}
+
+int CServerBrowserPingCache::NumEntries() const
+{
+	return m_Entries.size();
+}
+
+void CServerBrowserPingCache::CachePing(const NETADDR &Addr, int Ping)
+{
+	NETADDR AddrWithoutPort = Addr;
+	AddrWithoutPort.port = 0;
+	m_Entries[AddrWithoutPort] = Ping;
+	if(m_pDisk)
+	{
+		sqlite3 *pSqlite = m_pDisk.get();
+		IConsole *pConsole = m_pConsole;
+		char aAddr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&AddrWithoutPort, aAddr, sizeof(aAddr), false);
+
+		bool Error = false;
+		Error = Error || !m_pStoreStmt;
+		Error = Error || SQLITE_HANDLE_ERROR(sqlite3_reset(m_pStoreStmt.get())) != SQLITE_OK;
+		Error = Error || SQLITE_HANDLE_ERROR(sqlite3_bind_text(m_pStoreStmt.get(), 1, aAddr, -1, SQLITE_STATIC)) != SQLITE_OK;
+		Error = Error || SQLITE_HANDLE_ERROR(sqlite3_bind_int(m_pStoreStmt.get(), 2, Ping)) != SQLITE_OK;
+		Error = Error || SQLITE_HANDLE_ERROR(sqlite3_step(m_pStoreStmt.get())) != SQLITE_DONE;
+		if(Error)
+		{
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "serverbrowse_ping_cache", "failed to store ping");
+		}
+	}
+}
+
+int CServerBrowserPingCache::GetPing(const NETADDR *pAddrs, int NumAddrs) const
+{
+	int Ping = -1;
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		NETADDR Addr = pAddrs[i];
+		Addr.port = 0;
+		auto Entry = m_Entries.find(Addr);
+		if(Entry == m_Entries.end())
+		{
+			continue;
+		}
+		if(Ping == -1 || Entry->second < Ping)
+		{
+			Ping = Entry->second;
+		}
+	}
+	return Ping;
+}
+
+IServerBrowserPingCache *CreateServerBrowserPingCache(IConsole *pConsole, IStorage *pStorage)
+{
+	return new CServerBrowserPingCache(pConsole, pStorage);
+}
diff --git a/src_bkp/engine/client/serverbrowser_ping_cache.h b/src_bkp/engine/client/serverbrowser_ping_cache.h
new file mode 100644
index 0000000000..5c81e939f8
--- /dev/null
+++ b/src_bkp/engine/client/serverbrowser_ping_cache.h
@@ -0,0 +1,22 @@
+#ifndef ENGINE_CLIENT_SERVERBROWSER_PING_CACHE_H
+#define ENGINE_CLIENT_SERVERBROWSER_PING_CACHE_H
+#include <base/types.h>
+
+class IConsole;
+class IStorage;
+
+class IServerBrowserPingCache
+{
+public:
+	virtual ~IServerBrowserPingCache() {}
+
+	virtual void Load() = 0;
+
+	virtual int NumEntries() const = 0;
+	virtual void CachePing(const NETADDR &Addr, int Ping) = 0;
+	// Returns -1 if the ping isn't cached.
+	virtual int GetPing(const NETADDR *pAddrs, int NumAddrs) const = 0;
+};
+
+IServerBrowserPingCache *CreateServerBrowserPingCache(IConsole *pConsole, IStorage *pStorage);
+#endif // ENGINE_CLIENT_SERVERBROWSER_PING_CACHE_H
diff --git a/src_bkp/engine/client/smooth_time.cpp b/src_bkp/engine/client/smooth_time.cpp
new file mode 100644
index 0000000000..e917f1a19e
--- /dev/null
+++ b/src_bkp/engine/client/smooth_time.cpp
@@ -0,0 +1,102 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include "graph.h"
+#include "smooth_time.h"
+
+void CSmoothTime::Init(int64_t Target)
+{
+	m_Snap = time_get();
+	m_Current = Target;
+	m_Target = Target;
+	m_Margin = 0;
+	m_SpikeCounter = 0;
+	m_aAdjustSpeed[ADJUSTDIRECTION_DOWN] = 0.3f;
+	m_aAdjustSpeed[ADJUSTDIRECTION_UP] = 0.3f;
+}
+
+void CSmoothTime::SetAdjustSpeed(EAdjustDirection Direction, float Value)
+{
+	m_aAdjustSpeed[Direction] = Value;
+}
+
+int64_t CSmoothTime::Get(int64_t Now) const
+{
+	int64_t c = m_Current + (Now - m_Snap);
+	int64_t t = m_Target + (Now - m_Snap);
+
+	// it's faster to adjust upward instead of downward
+	// we might need to adjust these abit
+
+	float AdjustSpeed = m_aAdjustSpeed[ADJUSTDIRECTION_DOWN];
+	if(t > c)
+		AdjustSpeed = m_aAdjustSpeed[ADJUSTDIRECTION_UP];
+
+	float a = ((Now - m_Snap) / (float)time_freq()) * AdjustSpeed;
+	if(a > 1.0f)
+		a = 1.0f;
+
+	int64_t r = c + (int64_t)((t - c) * a);
+	return r + m_Margin;
+}
+
+void CSmoothTime::UpdateInt(int64_t Target)
+{
+	int64_t Now = time_get();
+	m_Current = Get(Now) - m_Margin;
+	m_Snap = Now;
+	m_Target = Target;
+}
+
+void CSmoothTime::Update(CGraph *pGraph, int64_t Target, int TimeLeft, EAdjustDirection AdjustDirection)
+{
+	bool UpdateTimer = true;
+
+	if(TimeLeft < 0)
+	{
+		bool IsSpike = false;
+		if(TimeLeft < -50)
+		{
+			IsSpike = true;
+
+			m_SpikeCounter += 5;
+			if(m_SpikeCounter > 50)
+				m_SpikeCounter = 50;
+		}
+
+		if(IsSpike && m_SpikeCounter < 15)
+		{
+			// ignore this ping spike
+			UpdateTimer = false;
+			pGraph->Add(TimeLeft, ColorRGBA(1.0f, 1.0f, 0.0f, 0.75f));
+		}
+		else
+		{
+			pGraph->Add(TimeLeft, ColorRGBA(1.0f, 0.0f, 0.0f, 0.75f));
+			if(m_aAdjustSpeed[AdjustDirection] < 30.0f)
+				m_aAdjustSpeed[AdjustDirection] *= 2.0f;
+		}
+	}
+	else
+	{
+		if(m_SpikeCounter)
+			m_SpikeCounter--;
+
+		pGraph->Add(TimeLeft, ColorRGBA(0.0f, 1.0f, 0.0f, 0.75f));
+
+		m_aAdjustSpeed[AdjustDirection] *= 0.95f;
+		if(m_aAdjustSpeed[AdjustDirection] < 2.0f)
+			m_aAdjustSpeed[AdjustDirection] = 2.0f;
+	}
+
+	if(UpdateTimer)
+		UpdateInt(Target);
+}
+
+void CSmoothTime::UpdateMargin(int64_t Margin)
+{
+	m_Margin = Margin;
+}
diff --git a/src_bkp/engine/client/smooth_time.h b/src_bkp/engine/client/smooth_time.h
new file mode 100644
index 0000000000..efd41e8c4f
--- /dev/null
+++ b/src_bkp/engine/client/smooth_time.h
@@ -0,0 +1,42 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#ifndef ENGINE_CLIENT_SMOOTH_TIME_H
+#define ENGINE_CLIENT_SMOOTH_TIME_H
+
+#include <cstdint>
+
+class CGraph;
+
+class CSmoothTime
+{
+public:
+	enum EAdjustDirection
+	{
+		ADJUSTDIRECTION_DOWN = 0,
+		ADJUSTDIRECTION_UP,
+		NUM_ADJUSTDIRECTIONS,
+	};
+
+private:
+	int64_t m_Snap;
+	int64_t m_Current;
+	int64_t m_Target;
+	int64_t m_Margin;
+
+	int m_SpikeCounter;
+	float m_aAdjustSpeed[NUM_ADJUSTDIRECTIONS];
+
+public:
+	void Init(int64_t Target);
+	void SetAdjustSpeed(EAdjustDirection Direction, float Value);
+
+	int64_t Get(int64_t Now) const;
+
+	void UpdateInt(int64_t Target);
+	void Update(CGraph *pGraph, int64_t Target, int TimeLeft, EAdjustDirection AdjustDirection);
+
+	void UpdateMargin(int64_t Margin);
+};
+
+#endif
diff --git a/src_bkp/engine/client/sound.cpp b/src_bkp/engine/client/sound.cpp
new file mode 100644
index 0000000000..8654077305
--- /dev/null
+++ b/src_bkp/engine/client/sound.cpp
@@ -0,0 +1,934 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <SDL.h>
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include "sound.h"
+
+#if defined(CONF_VIDEORECORDER)
+#include <engine/shared/video.h>
+#endif
+extern "C" {
+#include <opusfile.h>
+#include <wavpack.h>
+}
+
+#include <cmath>
+
+void CSound::Mix(short *pFinalOut, unsigned Frames)
+{
+	Frames = minimum(Frames, m_MaxFrames);
+	mem_zero(m_pMixBuffer, Frames * 2 * sizeof(int));
+
+	// acquire lock while we are mixing
+	m_SoundLock.lock();
+
+	const int MasterVol = m_SoundVolume.load(std::memory_order_relaxed);
+
+	for(auto &Voice : m_aVoices)
+	{
+		if(!Voice.m_pSample)
+			continue;
+
+		// mix voice
+		int *pOut = m_pMixBuffer;
+
+		const int Step = Voice.m_pSample->m_Channels; // setup input sources
+		short *pInL = &Voice.m_pSample->m_pData[Voice.m_Tick * Step];
+		short *pInR = &Voice.m_pSample->m_pData[Voice.m_Tick * Step + 1];
+
+		unsigned End = Voice.m_pSample->m_NumFrames - Voice.m_Tick;
+
+		int VolumeR = round_truncate(Voice.m_pChannel->m_Vol * (Voice.m_Vol / 255.0f));
+		int VolumeL = VolumeR;
+
+		// make sure that we don't go outside the sound data
+		if(Frames < End)
+			End = Frames;
+
+		// check if we have a mono sound
+		if(Voice.m_pSample->m_Channels == 1)
+			pInR = pInL;
+
+		// volume calculation
+		if(Voice.m_Flags & ISound::FLAG_POS && Voice.m_pChannel->m_Pan)
+		{
+			// TODO: we should respect the channel panning value
+			const int dx = Voice.m_X - m_CenterX.load(std::memory_order_relaxed);
+			const int dy = Voice.m_Y - m_CenterY.load(std::memory_order_relaxed);
+			float FalloffX = 0.0f;
+			float FalloffY = 0.0f;
+
+			int RangeX = 0; // for panning
+			bool InVoiceField = false;
+
+			switch(Voice.m_Shape)
+			{
+			case ISound::SHAPE_CIRCLE:
+			{
+				const float Radius = Voice.m_Circle.m_Radius;
+				RangeX = Radius;
+
+				// dx and dy can be larger than 46341 and thus the calculation would go beyond the limits of a integer,
+				// therefore we cast them into float
+				const int Dist = (int)length(vec2(dx, dy));
+				if(Dist < Radius)
+				{
+					InVoiceField = true;
+
+					// falloff
+					int FalloffDistance = Radius * Voice.m_Falloff;
+					if(Dist > FalloffDistance)
+						FalloffX = FalloffY = (Radius - Dist) / (Radius - FalloffDistance);
+					else
+						FalloffX = FalloffY = 1.0f;
+				}
+				else
+					InVoiceField = false;
+
+				break;
+			}
+
+			case ISound::SHAPE_RECTANGLE:
+			{
+				RangeX = Voice.m_Rectangle.m_Width / 2.0f;
+
+				const int abs_dx = absolute(dx);
+				const int abs_dy = absolute(dy);
+
+				const int w = Voice.m_Rectangle.m_Width / 2.0f;
+				const int h = Voice.m_Rectangle.m_Height / 2.0f;
+
+				if(abs_dx < w && abs_dy < h)
+				{
+					InVoiceField = true;
+
+					// falloff
+					int fx = Voice.m_Falloff * w;
+					int fy = Voice.m_Falloff * h;
+
+					FalloffX = abs_dx > fx ? (float)(w - abs_dx) / (w - fx) : 1.0f;
+					FalloffY = abs_dy > fy ? (float)(h - abs_dy) / (h - fy) : 1.0f;
+				}
+				else
+					InVoiceField = false;
+
+				break;
+			}
+			};
+
+			if(InVoiceField)
+			{
+				// panning
+				if(!(Voice.m_Flags & ISound::FLAG_NO_PANNING))
+				{
+					if(dx > 0)
+						VolumeL = ((RangeX - absolute(dx)) * VolumeL) / RangeX;
+					else
+						VolumeR = ((RangeX - absolute(dx)) * VolumeR) / RangeX;
+				}
+
+				{
+					VolumeL *= FalloffX * FalloffY;
+					VolumeR *= FalloffX * FalloffY;
+				}
+			}
+			else
+			{
+				VolumeL = 0;
+				VolumeR = 0;
+			}
+		}
+
+		// process all frames
+		for(unsigned s = 0; s < End; s++)
+		{
+			*pOut++ += (*pInL) * VolumeL;
+			*pOut++ += (*pInR) * VolumeR;
+			pInL += Step;
+			pInR += Step;
+			Voice.m_Tick++;
+		}
+
+		// free voice if not used any more
+		if(Voice.m_Tick == Voice.m_pSample->m_NumFrames)
+		{
+			if(Voice.m_Flags & ISound::FLAG_LOOP)
+				Voice.m_Tick = 0;
+			else
+			{
+				Voice.m_pSample = nullptr;
+				Voice.m_Age++;
+			}
+		}
+	}
+
+	m_SoundLock.unlock();
+
+	// clamp accumulated values
+	for(unsigned i = 0; i < Frames * 2; i++)
+		pFinalOut[i] = clamp<int>(((m_pMixBuffer[i] * MasterVol) / 101) >> 8, std::numeric_limits<short>::min(), std::numeric_limits<short>::max());
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+	swap_endian(pFinalOut, sizeof(short), Frames * 2);
+#endif
+}
+
+static void SdlCallback(void *pUser, Uint8 *pStream, int Len)
+{
+	CSound *pSound = static_cast<CSound *>(pUser);
+
+#if defined(CONF_VIDEORECORDER)
+	if(!(IVideo::Current() && g_Config.m_ClVideoSndEnable))
+	{
+		pSound->Mix((short *)pStream, Len / sizeof(short) / 2);
+	}
+	else
+	{
+		mem_zero(pStream, Len);
+	}
+#else
+	pSound->Mix((short *)pStream, Len / sizeof(short) / 2);
+#endif
+}
+
+int CSound::Init()
+{
+	m_SoundEnabled = false;
+	m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+
+	if(!g_Config.m_SndEnable)
+		return 0;
+
+	if(SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+	{
+		dbg_msg("sound", "unable to init SDL audio: %s", SDL_GetError());
+		return -1;
+	}
+
+	m_MixingRate = g_Config.m_SndRate;
+
+	SDL_AudioSpec Format, FormatOut;
+	Format.freq = m_MixingRate;
+	Format.format = AUDIO_S16;
+	Format.channels = 2;
+	Format.samples = g_Config.m_SndBufferSize;
+	Format.callback = SdlCallback;
+	Format.userdata = this;
+
+	// Open the audio device and start playing sound!
+	m_Device = SDL_OpenAudioDevice(nullptr, 0, &Format, &FormatOut, 0);
+
+	if(m_Device == 0)
+	{
+		dbg_msg("sound", "unable to open audio: %s", SDL_GetError());
+		return -1;
+	}
+	else
+		dbg_msg("sound", "sound init successful using audio driver '%s'", SDL_GetCurrentAudioDriver());
+
+	m_MaxFrames = FormatOut.samples * 2;
+#if defined(CONF_VIDEORECORDER)
+	m_MaxFrames = maximum<uint32_t>(m_MaxFrames, 1024 * 2); // make the buffer bigger just in case
+#endif
+	m_pMixBuffer = (int *)calloc(m_MaxFrames * 2, sizeof(int));
+
+	SDL_PauseAudioDevice(m_Device, 0);
+
+	m_SoundEnabled = true;
+	Update();
+	return 0;
+}
+
+int CSound::Update()
+{
+	UpdateVolume();
+	return 0;
+}
+
+void CSound::UpdateVolume()
+{
+	int WantedVolume = g_Config.m_SndVolume;
+	if(!m_pGraphics->WindowActive() && g_Config.m_SndNonactiveMute)
+		WantedVolume = 0;
+	m_SoundVolume.store(WantedVolume, std::memory_order_relaxed);
+}
+
+void CSound::Shutdown()
+{
+	for(unsigned SampleID = 0; SampleID < NUM_SAMPLES; SampleID++)
+	{
+		UnloadSample(SampleID);
+	}
+
+	SDL_CloseAudioDevice(m_Device);
+	SDL_QuitSubSystem(SDL_INIT_AUDIO);
+	free(m_pMixBuffer);
+	m_pMixBuffer = nullptr;
+}
+
+int CSound::AllocID()
+{
+	// TODO: linear search, get rid of it
+	for(unsigned SampleID = 0; SampleID < NUM_SAMPLES; SampleID++)
+	{
+		if(m_aSamples[SampleID].m_pData == nullptr)
+			return SampleID;
+	}
+
+	return -1;
+}
+
+void CSound::RateConvert(CSample &Sample) const
+{
+	// make sure that we need to convert this sound
+	if(!Sample.m_pData || Sample.m_Rate == m_MixingRate)
+		return;
+
+	// allocate new data
+	const int NumFrames = (int)((Sample.m_NumFrames / (float)Sample.m_Rate) * m_MixingRate);
+	short *pNewData = (short *)calloc((size_t)NumFrames * Sample.m_Channels, sizeof(short));
+
+	for(int i = 0; i < NumFrames; i++)
+	{
+		// resample TODO: this should be done better, like linear at least
+		float a = i / (float)NumFrames;
+		int f = (int)(a * Sample.m_NumFrames);
+		if(f >= Sample.m_NumFrames)
+			f = Sample.m_NumFrames - 1;
+
+		// set new data
+		if(Sample.m_Channels == 1)
+			pNewData[i] = Sample.m_pData[f];
+		else if(Sample.m_Channels == 2)
+		{
+			pNewData[i * 2] = Sample.m_pData[f * 2];
+			pNewData[i * 2 + 1] = Sample.m_pData[f * 2 + 1];
+		}
+	}
+
+	// free old data and apply new
+	free(Sample.m_pData);
+	Sample.m_pData = pNewData;
+	Sample.m_NumFrames = NumFrames;
+	Sample.m_Rate = m_MixingRate;
+}
+
+bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) const
+{
+	OggOpusFile *pOpusFile = op_open_memory((const unsigned char *)pData, DataSize, nullptr);
+	if(pOpusFile)
+	{
+		const int NumChannels = op_channel_count(pOpusFile, -1);
+		const int NumSamples = op_pcm_total(pOpusFile, -1); // per channel!
+
+		Sample.m_Channels = NumChannels;
+
+		if(Sample.m_Channels > 2)
+		{
+			dbg_msg("sound/opus", "file is not mono or stereo.");
+			return false;
+		}
+
+		Sample.m_pData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
+
+		int Pos = 0;
+		while(Pos < NumSamples)
+		{
+			const int Read = op_read(pOpusFile, Sample.m_pData + Pos * NumChannels, NumSamples * NumChannels, nullptr);
+			if(Read < 0)
+			{
+				free(Sample.m_pData);
+				dbg_msg("sound/opus", "op_read error %d at %d", Read, Pos);
+				return false;
+			}
+			else if(Read == 0) // EOF
+				break;
+			Pos += Read;
+		}
+
+		Sample.m_NumFrames = Pos;
+		Sample.m_Rate = 48000;
+		Sample.m_LoopStart = -1;
+		Sample.m_LoopEnd = -1;
+		Sample.m_PausedAt = 0;
+	}
+	else
+	{
+		dbg_msg("sound/opus", "failed to decode sample");
+		return false;
+	}
+
+	return true;
+}
+
+// TODO: Update WavPack to get rid of these global variables
+static const void *s_pWVBuffer = nullptr;
+static int s_WVBufferPosition = 0;
+static int s_WVBufferSize = 0;
+
+static int ReadDataOld(void *pBuffer, int Size)
+{
+	int ChunkSize = minimum(Size, s_WVBufferSize - s_WVBufferPosition);
+	mem_copy(pBuffer, (const char *)s_pWVBuffer + s_WVBufferPosition, ChunkSize);
+	s_WVBufferPosition += ChunkSize;
+	return ChunkSize;
+}
+
+#if defined(CONF_WAVPACK_OPEN_FILE_INPUT_EX)
+static int ReadData(void *pId, void *pBuffer, int Size)
+{
+	(void)pId;
+	return ReadDataOld(pBuffer, Size);
+}
+
+static int ReturnFalse(void *pId)
+{
+	(void)pId;
+	return 0;
+}
+
+static unsigned int GetPos(void *pId)
+{
+	(void)pId;
+	return s_WVBufferPosition;
+}
+
+static unsigned int GetLength(void *pId)
+{
+	(void)pId;
+	return s_WVBufferSize;
+}
+
+static int PushBackByte(void *pId, int Char)
+{
+	s_WVBufferPosition -= 1;
+	return 0;
+}
+#endif
+
+bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) const
+{
+	char aError[100];
+
+	dbg_assert(s_pWVBuffer == nullptr, "DecodeWV already in use");
+	s_pWVBuffer = pData;
+	s_WVBufferSize = DataSize;
+	s_WVBufferPosition = 0;
+
+#if defined(CONF_WAVPACK_OPEN_FILE_INPUT_EX)
+	WavpackStreamReader Callback = {0};
+	Callback.can_seek = ReturnFalse;
+	Callback.get_length = GetLength;
+	Callback.get_pos = GetPos;
+	Callback.push_back_byte = PushBackByte;
+	Callback.read_bytes = ReadData;
+	WavpackContext *pContext = WavpackOpenFileInputEx(&Callback, (void *)1, 0, aError, 0, 0);
+#else
+	WavpackContext *pContext = WavpackOpenFileInput(ReadDataOld, aError);
+#endif
+	if(pContext)
+	{
+		const int NumSamples = WavpackGetNumSamples(pContext);
+		const int BitsPerSample = WavpackGetBitsPerSample(pContext);
+		const unsigned int SampleRate = WavpackGetSampleRate(pContext);
+		const int NumChannels = WavpackGetNumChannels(pContext);
+
+		Sample.m_Channels = NumChannels;
+		Sample.m_Rate = SampleRate;
+
+		if(Sample.m_Channels > 2)
+		{
+			dbg_msg("sound/wv", "file is not mono or stereo.");
+			s_pWVBuffer = nullptr;
+			return false;
+		}
+
+		if(BitsPerSample != 16)
+		{
+			dbg_msg("sound/wv", "bps is %d, not 16", BitsPerSample);
+			s_pWVBuffer = nullptr;
+			return false;
+		}
+
+		int *pBuffer = (int *)calloc((size_t)NumSamples * NumChannels, sizeof(int));
+		if(!WavpackUnpackSamples(pContext, pBuffer, NumSamples))
+		{
+			free(pBuffer);
+			dbg_msg("sound/wv", "WavpackUnpackSamples failed. NumSamples=%d, NumChannels=%d", NumSamples, NumChannels);
+			s_pWVBuffer = nullptr;
+			return false;
+		}
+
+		Sample.m_pData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
+
+		int *pSrc = pBuffer;
+		short *pDst = Sample.m_pData;
+		for(int i = 0; i < NumSamples * NumChannels; i++)
+			*pDst++ = (short)*pSrc++;
+
+		free(pBuffer);
+#ifdef CONF_WAVPACK_CLOSE_FILE
+		WavpackCloseFile(pContext);
+#endif
+
+		Sample.m_NumFrames = NumSamples;
+		Sample.m_LoopStart = -1;
+		Sample.m_LoopEnd = -1;
+		Sample.m_PausedAt = 0;
+
+		s_pWVBuffer = nullptr;
+	}
+	else
+	{
+		dbg_msg("sound/wv", "failed to decode sample (%s)", aError);
+		s_pWVBuffer = nullptr;
+		return false;
+	}
+
+	return true;
+}
+
+int CSound::LoadOpus(const char *pFilename, int StorageType)
+{
+	// no need to load sound when we are running with no sound
+	if(!m_SoundEnabled)
+		return -1;
+
+	if(!m_pStorage)
+		return -1;
+
+	const int SampleID = AllocID();
+	if(SampleID < 0)
+	{
+		dbg_msg("sound/opus", "failed to allocate sample ID. filename='%s'", pFilename);
+		return -1;
+	}
+
+	void *pData;
+	unsigned DataSize;
+	if(!m_pStorage->ReadFile(pFilename, StorageType, &pData, &DataSize))
+	{
+		dbg_msg("sound/opus", "failed to open file. filename='%s'", pFilename);
+		return -1;
+	}
+
+	const bool DecodeSuccess = DecodeOpus(m_aSamples[SampleID], pData, DataSize);
+	free(pData);
+	if(!DecodeSuccess)
+		return -1;
+
+	if(g_Config.m_Debug)
+		dbg_msg("sound/opus", "loaded %s", pFilename);
+
+	RateConvert(m_aSamples[SampleID]);
+	return SampleID;
+}
+
+int CSound::LoadWV(const char *pFilename, int StorageType)
+{
+	// no need to load sound when we are running with no sound
+	if(!m_SoundEnabled)
+		return -1;
+
+	if(!m_pStorage)
+		return -1;
+
+	const int SampleID = AllocID();
+	if(SampleID < 0)
+	{
+		dbg_msg("sound/wv", "failed to allocate sample ID. filename='%s'", pFilename);
+		return -1;
+	}
+
+	void *pData;
+	unsigned DataSize;
+	if(!m_pStorage->ReadFile(pFilename, StorageType, &pData, &DataSize))
+	{
+		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
+		return -1;
+	}
+
+	const bool DecodeSuccess = DecodeWV(m_aSamples[SampleID], pData, DataSize);
+	free(pData);
+	if(!DecodeSuccess)
+		return -1;
+
+	if(g_Config.m_Debug)
+		dbg_msg("sound/wv", "loaded %s", pFilename);
+
+	RateConvert(m_aSamples[SampleID]);
+	return SampleID;
+}
+
+int CSound::LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor = false)
+{
+	// no need to load sound when we are running with no sound
+	if(!m_SoundEnabled && !FromEditor)
+		return -1;
+
+	if(!pData)
+		return -1;
+
+	const int SampleID = AllocID();
+	if(SampleID < 0)
+		return -1;
+
+	if(!DecodeOpus(m_aSamples[SampleID], pData, DataSize))
+		return -1;
+
+	RateConvert(m_aSamples[SampleID]);
+	return SampleID;
+}
+
+int CSound::LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor = false)
+{
+	// no need to load sound when we are running with no sound
+	if(!m_SoundEnabled && !FromEditor)
+		return -1;
+
+	if(!pData)
+		return -1;
+
+	const int SampleID = AllocID();
+	if(SampleID < 0)
+		return -1;
+
+	if(!DecodeWV(m_aSamples[SampleID], pData, DataSize))
+		return -1;
+
+	RateConvert(m_aSamples[SampleID]);
+	return SampleID;
+}
+
+void CSound::UnloadSample(int SampleID)
+{
+	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+		return;
+
+	Stop(SampleID);
+	free(m_aSamples[SampleID].m_pData);
+	m_aSamples[SampleID].m_pData = nullptr;
+}
+
+float CSound::GetSampleTotalTime(int SampleID)
+{
+	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+		return 0.0f;
+
+	return (m_aSamples[SampleID].m_NumFrames / (float)m_aSamples[SampleID].m_Rate);
+}
+
+float CSound::GetSampleCurrentTime(int SampleID)
+{
+	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+		return 0.0f;
+
+	CSample *pSample = &m_aSamples[SampleID];
+	if(IsPlaying(SampleID))
+	{
+		for(auto &Voice : m_aVoices)
+		{
+			if(Voice.m_pSample == pSample)
+			{
+				return (Voice.m_Tick / (float)pSample->m_Rate);
+			}
+		}
+	}
+
+	return (pSample->m_PausedAt / (float)pSample->m_Rate);
+}
+
+void CSound::SetSampleCurrentTime(int SampleID, float Time)
+{
+	if(SampleID == -1 || SampleID >= NUM_SAMPLES)
+		return;
+
+	CSample *pSample = &m_aSamples[SampleID];
+	if(IsPlaying(SampleID))
+	{
+		for(auto &Voice : m_aVoices)
+		{
+			if(Voice.m_pSample == pSample)
+			{
+				Voice.m_Tick = pSample->m_NumFrames * Time;
+			}
+		}
+	}
+	else
+	{
+		pSample->m_PausedAt = pSample->m_NumFrames * Time;
+	}
+}
+
+void CSound::SetChannel(int ChannelID, float Vol, float Pan)
+{
+	m_aChannels[ChannelID].m_Vol = (int)(Vol * 255.0f);
+	m_aChannels[ChannelID].m_Pan = (int)(Pan * 255.0f); // TODO: this is only on and off right now
+}
+
+void CSound::SetListenerPos(float x, float y)
+{
+	m_CenterX.store((int)x, std::memory_order_relaxed);
+	m_CenterY.store((int)y, std::memory_order_relaxed);
+}
+
+void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	Volume = clamp(Volume, 0.0f, 1.0f);
+	m_aVoices[VoiceID].m_Vol = (int)(Volume * 255.0f);
+}
+
+void CSound::SetVoiceFalloff(CVoiceHandle Voice, float Falloff)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	Falloff = clamp(Falloff, 0.0f, 1.0f);
+	m_aVoices[VoiceID].m_Falloff = Falloff;
+}
+
+void CSound::SetVoiceLocation(CVoiceHandle Voice, float x, float y)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	m_aVoices[VoiceID].m_X = x;
+	m_aVoices[VoiceID].m_Y = y;
+}
+
+void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	if(!m_aVoices[VoiceID].m_pSample)
+		return;
+
+	int Tick = 0;
+	bool IsLooping = m_aVoices[VoiceID].m_Flags & ISound::FLAG_LOOP;
+	uint64_t TickOffset = m_aVoices[VoiceID].m_pSample->m_Rate * TimeOffset;
+	if(m_aVoices[VoiceID].m_pSample->m_NumFrames > 0 && IsLooping)
+		Tick = TickOffset % m_aVoices[VoiceID].m_pSample->m_NumFrames;
+	else
+		Tick = clamp(TickOffset, (uint64_t)0, (uint64_t)m_aVoices[VoiceID].m_pSample->m_NumFrames);
+
+	// at least 200msec off, else depend on buffer size
+	float Threshold = maximum(0.2f * m_aVoices[VoiceID].m_pSample->m_Rate, (float)m_MaxFrames);
+	if(absolute(m_aVoices[VoiceID].m_Tick - Tick) > Threshold)
+	{
+		// take care of looping (modulo!)
+		if(!(IsLooping && (minimum(m_aVoices[VoiceID].m_Tick, Tick) + m_aVoices[VoiceID].m_pSample->m_NumFrames - maximum(m_aVoices[VoiceID].m_Tick, Tick)) <= Threshold))
+		{
+			m_aVoices[VoiceID].m_Tick = Tick;
+		}
+	}
+}
+
+void CSound::SetVoiceCircle(CVoiceHandle Voice, float Radius)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	m_aVoices[VoiceID].m_Shape = ISound::SHAPE_CIRCLE;
+	m_aVoices[VoiceID].m_Circle.m_Radius = maximum(0.0f, Radius);
+}
+
+void CSound::SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	m_aVoices[VoiceID].m_Shape = ISound::SHAPE_RECTANGLE;
+	m_aVoices[VoiceID].m_Rectangle.m_Width = maximum(0.0f, Width);
+	m_aVoices[VoiceID].m_Rectangle.m_Height = maximum(0.0f, Height);
+}
+
+ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
+{
+	const CLockScope LockScope(m_SoundLock);
+
+	// search for voice
+	int VoiceID = -1;
+	for(int i = 0; i < NUM_VOICES; i++)
+	{
+		int NextID = (m_NextVoice + i) % NUM_VOICES;
+		if(!m_aVoices[NextID].m_pSample)
+		{
+			VoiceID = NextID;
+			m_NextVoice = NextID + 1;
+			break;
+		}
+	}
+
+	// voice found, use it
+	int Age = -1;
+	if(VoiceID != -1)
+	{
+		m_aVoices[VoiceID].m_pSample = &m_aSamples[SampleID];
+		m_aVoices[VoiceID].m_pChannel = &m_aChannels[ChannelID];
+		if(Flags & FLAG_LOOP)
+		{
+			m_aVoices[VoiceID].m_Tick = m_aSamples[SampleID].m_PausedAt;
+		}
+		else if(Flags & FLAG_PREVIEW)
+		{
+			m_aVoices[VoiceID].m_Tick = m_aSamples[SampleID].m_PausedAt;
+			m_aSamples[SampleID].m_PausedAt = 0;
+		}
+		else
+		{
+			m_aVoices[VoiceID].m_Tick = 0;
+		}
+		m_aVoices[VoiceID].m_Vol = 255;
+		m_aVoices[VoiceID].m_Flags = Flags;
+		m_aVoices[VoiceID].m_X = (int)x;
+		m_aVoices[VoiceID].m_Y = (int)y;
+		m_aVoices[VoiceID].m_Falloff = 0.0f;
+		m_aVoices[VoiceID].m_Shape = ISound::SHAPE_CIRCLE;
+		m_aVoices[VoiceID].m_Circle.m_Radius = 1500;
+		Age = m_aVoices[VoiceID].m_Age;
+	}
+
+	return CreateVoiceHandle(VoiceID, Age);
+}
+
+ISound::CVoiceHandle CSound::PlayAt(int ChannelID, int SampleID, int Flags, float x, float y)
+{
+	return Play(ChannelID, SampleID, Flags | ISound::FLAG_POS, x, y);
+}
+
+ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags)
+{
+	return Play(ChannelID, SampleID, Flags, 0, 0);
+}
+
+void CSound::Pause(int SampleID)
+{
+	// TODO: a nice fade out
+	const CLockScope LockScope(m_SoundLock);
+	CSample *pSample = &m_aSamples[SampleID];
+	for(auto &Voice : m_aVoices)
+	{
+		if(Voice.m_pSample == pSample)
+		{
+			Voice.m_pSample->m_PausedAt = Voice.m_Tick;
+			Voice.m_pSample = nullptr;
+		}
+	}
+}
+
+void CSound::Stop(int SampleID)
+{
+	// TODO: a nice fade out
+	const CLockScope LockScope(m_SoundLock);
+	CSample *pSample = &m_aSamples[SampleID];
+	for(auto &Voice : m_aVoices)
+	{
+		if(Voice.m_pSample == pSample)
+		{
+			if(Voice.m_Flags & FLAG_LOOP)
+				Voice.m_pSample->m_PausedAt = Voice.m_Tick;
+			else
+				Voice.m_pSample->m_PausedAt = 0;
+			Voice.m_pSample = nullptr;
+		}
+	}
+}
+
+void CSound::StopAll()
+{
+	// TODO: a nice fade out
+	const CLockScope LockScope(m_SoundLock);
+	for(auto &Voice : m_aVoices)
+	{
+		if(Voice.m_pSample)
+		{
+			if(Voice.m_Flags & FLAG_LOOP)
+				Voice.m_pSample->m_PausedAt = Voice.m_Tick;
+			else
+				Voice.m_pSample->m_PausedAt = 0;
+		}
+		Voice.m_pSample = nullptr;
+	}
+}
+
+void CSound::StopVoice(CVoiceHandle Voice)
+{
+	if(!Voice.IsValid())
+		return;
+
+	int VoiceID = Voice.Id();
+
+	const CLockScope LockScope(m_SoundLock);
+	if(m_aVoices[VoiceID].m_Age != Voice.Age())
+		return;
+
+	m_aVoices[VoiceID].m_pSample = nullptr;
+	m_aVoices[VoiceID].m_Age++;
+}
+
+bool CSound::IsPlaying(int SampleID)
+{
+	const CLockScope LockScope(m_SoundLock);
+	const CSample *pSample = &m_aSamples[SampleID];
+	return std::any_of(std::begin(m_aVoices), std::end(m_aVoices), [pSample](const auto &Voice) { return Voice.m_pSample == pSample; });
+}
+
+void CSound::PauseAudioDevice()
+{
+	SDL_PauseAudioDevice(m_Device, 1);
+}
+
+void CSound::UnpauseAudioDevice()
+{
+	SDL_PauseAudioDevice(m_Device, 0);
+}
+
+IEngineSound *CreateEngineSound() { return new CSound; }
diff --git a/src_bkp/engine/client/sound.h b/src_bkp/engine/client/sound.h
new file mode 100644
index 0000000000..ea5eb5766f
--- /dev/null
+++ b/src_bkp/engine/client/sound.h
@@ -0,0 +1,129 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CLIENT_SOUND_H
+#define ENGINE_CLIENT_SOUND_H
+
+#include <base/lock.h>
+
+#include <engine/sound.h>
+
+#include <SDL_audio.h>
+
+#include <atomic>
+
+struct CSample
+{
+	short *m_pData;
+	int m_NumFrames;
+	int m_Rate;
+	int m_Channels;
+	int m_LoopStart;
+	int m_LoopEnd;
+	int m_PausedAt;
+};
+
+struct CChannel
+{
+	int m_Vol;
+	int m_Pan;
+};
+
+struct CVoice
+{
+	CSample *m_pSample;
+	CChannel *m_pChannel;
+	int m_Age; // increases when reused
+	int m_Tick;
+	int m_Vol; // 0 - 255
+	int m_Flags;
+	int m_X, m_Y;
+	float m_Falloff; // [0.0, 1.0]
+
+	int m_Shape;
+	union
+	{
+		ISound::CVoiceShapeCircle m_Circle;
+		ISound::CVoiceShapeRectangle m_Rectangle;
+	};
+};
+
+class CSound : public IEngineSound
+{
+	enum
+	{
+		NUM_SAMPLES = 512,
+		NUM_VOICES = 256,
+		NUM_CHANNELS = 16,
+	};
+
+	bool m_SoundEnabled = false;
+	SDL_AudioDeviceID m_Device = 0;
+	CLock m_SoundLock;
+
+	CSample m_aSamples[NUM_SAMPLES] = {{0}};
+	CVoice m_aVoices[NUM_VOICES] = {{0}};
+	CChannel m_aChannels[NUM_CHANNELS] = {{255, 0}};
+	int m_NextVoice = 0;
+	uint32_t m_MaxFrames = 0;
+
+	std::atomic<int> m_CenterX = 0;
+	std::atomic<int> m_CenterY = 0;
+	std::atomic<int> m_SoundVolume = 100;
+	int m_MixingRate = 48000;
+
+	class IEngineGraphics *m_pGraphics = nullptr;
+	IStorage *m_pStorage = nullptr;
+
+	int *m_pMixBuffer = nullptr;
+
+	int AllocID();
+	void RateConvert(CSample &Sample) const;
+
+	bool DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) const;
+	bool DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) const;
+
+	void UpdateVolume();
+
+public:
+	int Init() override;
+	int Update() override;
+	void Shutdown() override REQUIRES(!m_SoundLock);
+
+	bool IsSoundEnabled() override { return m_SoundEnabled; }
+
+	int LoadOpus(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override;
+	int LoadWV(const char *pFilename, int StorageType = IStorage::TYPE_ALL) override;
+	int LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor) override;
+	int LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor) override;
+	void UnloadSample(int SampleID) override REQUIRES(!m_SoundLock);
+
+	float GetSampleTotalTime(int SampleID) override; // in s
+	float GetSampleCurrentTime(int SampleID) override REQUIRES(!m_SoundLock); // in s
+	void SetSampleCurrentTime(int SampleID, float Time) override REQUIRES(!m_SoundLock);
+
+	void SetChannel(int ChannelID, float Vol, float Pan) override;
+	void SetListenerPos(float x, float y) override;
+
+	void SetVoiceVolume(CVoiceHandle Voice, float Volume) override REQUIRES(!m_SoundLock);
+	void SetVoiceFalloff(CVoiceHandle Voice, float Falloff) override REQUIRES(!m_SoundLock);
+	void SetVoiceLocation(CVoiceHandle Voice, float x, float y) override REQUIRES(!m_SoundLock);
+	void SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset) override REQUIRES(!m_SoundLock); // in s
+
+	void SetVoiceCircle(CVoiceHandle Voice, float Radius) override REQUIRES(!m_SoundLock);
+	void SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height) override REQUIRES(!m_SoundLock);
+
+	CVoiceHandle Play(int ChannelID, int SampleID, int Flags, float x, float y) REQUIRES(!m_SoundLock);
+	CVoiceHandle PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) override REQUIRES(!m_SoundLock);
+	CVoiceHandle Play(int ChannelID, int SampleID, int Flags) override REQUIRES(!m_SoundLock);
+	void Pause(int SampleID) override REQUIRES(!m_SoundLock);
+	void Stop(int SampleID) override REQUIRES(!m_SoundLock);
+	void StopAll() override REQUIRES(!m_SoundLock);
+	void StopVoice(CVoiceHandle Voice) override REQUIRES(!m_SoundLock);
+	bool IsPlaying(int SampleID) override REQUIRES(!m_SoundLock);
+
+	void Mix(short *pFinalOut, unsigned Frames) override REQUIRES(!m_SoundLock);
+	void PauseAudioDevice() override;
+	void UnpauseAudioDevice() override;
+};
+
+#endif
diff --git a/src_bkp/engine/client/sqlite.cpp b/src_bkp/engine/client/sqlite.cpp
new file mode 100644
index 0000000000..41638b8cf7
--- /dev/null
+++ b/src_bkp/engine/client/sqlite.cpp
@@ -0,0 +1,60 @@
+#include <base/system.h>
+#include <engine/console.h>
+#include <engine/sqlite.h>
+
+#include <sqlite3.h>
+
+void CSqliteDeleter::operator()(sqlite3 *pSqlite)
+{
+	sqlite3_close(pSqlite);
+}
+
+void CSqliteStmtDeleter::operator()(sqlite3_stmt *pStmt)
+{
+	sqlite3_finalize(pStmt);
+}
+
+int SqliteHandleError(IConsole *pConsole, int Error, sqlite3 *pSqlite, const char *pContext)
+{
+	if(Error != SQLITE_OK && Error != SQLITE_DONE && Error != SQLITE_ROW)
+	{
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "%s at %s", sqlite3_errmsg(pSqlite), pContext);
+		pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "sqlite3", aBuf);
+	}
+	return Error;
+}
+
+CSqlite SqliteOpen(IConsole *pConsole, IStorage *pStorage, const char *pPath)
+{
+	char aFullPath[IO_MAX_PATH_LENGTH];
+	pStorage->GetCompletePath(IStorage::TYPE_SAVE, pPath, aFullPath, sizeof(aFullPath));
+	sqlite3 *pSqlite = nullptr;
+	const bool ErrorOpening = SQLITE_HANDLE_ERROR(sqlite3_open(aFullPath, &pSqlite)) != SQLITE_OK;
+	// Even on error, the database is initialized and needs to be freed.
+	// Except on allocation failure, but then it'll be nullptr which is
+	// also fine.
+	CSqlite pResult{pSqlite};
+	if(ErrorOpening)
+	{
+		return nullptr;
+	}
+	bool Error = false;
+	Error = Error || SQLITE_HANDLE_ERROR(sqlite3_exec(pSqlite, "PRAGMA journal_mode = WAL", nullptr, nullptr, nullptr));
+	Error = Error || SQLITE_HANDLE_ERROR(sqlite3_exec(pSqlite, "PRAGMA synchronous = NORMAL", nullptr, nullptr, nullptr));
+	if(Error)
+	{
+		return nullptr;
+	}
+	return pResult;
+}
+
+CSqliteStmt SqlitePrepare(IConsole *pConsole, sqlite3 *pSqlite, const char *pStatement)
+{
+	sqlite3_stmt *pTemp;
+	if(SQLITE_HANDLE_ERROR(sqlite3_prepare_v2(pSqlite, pStatement, -1, &pTemp, nullptr)))
+	{
+		return nullptr;
+	}
+	return CSqliteStmt{pTemp};
+}
diff --git a/src_bkp/engine/client/steam.cpp b/src_bkp/engine/client/steam.cpp
new file mode 100644
index 0000000000..6c1cd20ea1
--- /dev/null
+++ b/src_bkp/engine/client/steam.cpp
@@ -0,0 +1,149 @@
+#include <engine/steam.h>
+
+#include <base/system.h>
+#include <engine/shared/config.h>
+
+#include <steam/steam_api_flat.h>
+
+class CSteam : public ISteam
+{
+	HSteamPipe m_SteamPipe;
+	ISteamApps *m_pSteamApps;
+	ISteamFriends *m_pSteamFriends;
+	char m_aPlayerName[16];
+	bool m_GotConnectAddr;
+	NETADDR m_ConnectAddr;
+
+public:
+	CSteam()
+	{
+		SteamAPI_ManualDispatch_Init();
+		m_SteamPipe = SteamAPI_GetHSteamPipe();
+		m_pSteamApps = SteamAPI_SteamApps_v008();
+		m_pSteamFriends = SteamAPI_SteamFriends_v017();
+
+		ReadLaunchCommandLine();
+		str_copy(m_aPlayerName, SteamAPI_ISteamFriends_GetPersonaName(m_pSteamFriends));
+	}
+	~CSteam() override
+	{
+		SteamAPI_Shutdown();
+	}
+
+	void ParseConnectString(const char *pConnect)
+	{
+		if(pConnect[0])
+		{
+			NETADDR Connect;
+			if(net_host_lookup(pConnect, &Connect, NETTYPE_ALL) == 0)
+			{
+				m_ConnectAddr = Connect;
+				m_GotConnectAddr = true;
+			}
+			else
+			{
+				dbg_msg("steam", "got unparsable connect string: '%s'", pConnect);
+			}
+		}
+	}
+
+	void ReadLaunchCommandLine()
+	{
+		char aConnect[NETADDR_MAXSTRSIZE];
+		int ConnectSize = SteamAPI_ISteamApps_GetLaunchCommandLine(m_pSteamApps, aConnect, sizeof(aConnect));
+		if(ConnectSize >= NETADDR_MAXSTRSIZE)
+		{
+			ConnectSize = NETADDR_MAXSTRSIZE - 1;
+		}
+		aConnect[ConnectSize] = 0;
+		m_GotConnectAddr = false;
+		ParseConnectString(aConnect);
+	}
+
+	void OnGameRichPresenceJoinRequested(GameRichPresenceJoinRequested_t *pEvent)
+	{
+		ParseConnectString(pEvent->m_aRGCHConnect);
+	}
+
+	const char *GetPlayerName() override
+	{
+		return m_aPlayerName;
+	}
+
+	const NETADDR *GetConnectAddress() override
+	{
+		if(m_GotConnectAddr)
+		{
+			return &m_ConnectAddr;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	void ClearConnectAddress() override
+	{
+		m_GotConnectAddr = false;
+	}
+
+	void Update() override
+	{
+		SteamAPI_ManualDispatch_RunFrame(m_SteamPipe);
+		CallbackMsg_t Callback;
+		while(SteamAPI_ManualDispatch_GetNextCallback(m_SteamPipe, &Callback))
+		{
+			switch(Callback.m_iCallback)
+			{
+			case NewUrlLaunchParameters_t::k_iCallback:
+				ReadLaunchCommandLine();
+				break;
+			case GameRichPresenceJoinRequested_t::k_iCallback:
+				OnGameRichPresenceJoinRequested((GameRichPresenceJoinRequested_t *)Callback.m_pubParam);
+				break;
+			default:
+				if(g_Config.m_Debug)
+				{
+					dbg_msg("steam/dbg", "unhandled callback id=%d", Callback.m_iCallback);
+				}
+			}
+			SteamAPI_ManualDispatch_FreeLastCallback(m_SteamPipe);
+		}
+	}
+	void ClearGameInfo() override
+	{
+		SteamAPI_ISteamFriends_ClearRichPresence(m_pSteamFriends);
+	}
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) override
+	{
+		if(AnnounceAddr)
+		{
+			char aServerAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&ServerAddr, aServerAddr, sizeof(aServerAddr), true);
+			SteamAPI_ISteamFriends_SetRichPresence(m_pSteamFriends, "connect", aServerAddr);
+			SteamAPI_ISteamFriends_SetRichPresence(m_pSteamFriends, "steam_player_group", aServerAddr);
+		}
+
+		SteamAPI_ISteamFriends_SetRichPresence(m_pSteamFriends, "map", pMapName);
+		SteamAPI_ISteamFriends_SetRichPresence(m_pSteamFriends, "status", pMapName);
+		SteamAPI_ISteamFriends_SetRichPresence(m_pSteamFriends, "steam_display", "#Status");
+	}
+};
+
+class CSteamStub : public ISteam
+{
+	const char *GetPlayerName() override { return 0; }
+	const NETADDR *GetConnectAddress() override { return 0; }
+	void ClearConnectAddress() override {}
+	void Update() override {}
+	void ClearGameInfo() override {}
+	void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) override {}
+};
+
+ISteam *CreateSteam()
+{
+	if(!SteamAPI_Init())
+	{
+		return new CSteamStub();
+	}
+	return new CSteam();
+}
diff --git a/src_bkp/engine/client/text.cpp b/src_bkp/engine/client/text.cpp
new file mode 100644
index 0000000000..91457099dd
--- /dev/null
+++ b/src_bkp/engine/client/text.cpp
@@ -0,0 +1,2272 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/graphics.h>
+#include <engine/shared/json.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+// ft2 texture
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#include <chrono>
+#include <cstddef>
+#include <limits>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
+
+using namespace std::chrono_literals;
+
+enum
+{
+	FONT_NAME_SIZE = 128,
+};
+
+struct SGlyph
+{
+	enum class EState
+	{
+		UNINITIALIZED,
+		RENDERED,
+		ERROR,
+	};
+	EState m_State = EState::UNINITIALIZED;
+
+	int m_FontSize;
+	FT_Face m_Face;
+	int m_Chr;
+	FT_UInt m_GlyphIndex;
+
+	// these values are scaled to the font size
+	// width * font_size == real_size
+	float m_Width;
+	float m_Height;
+	float m_CharWidth;
+	float m_CharHeight;
+	float m_OffsetX;
+	float m_OffsetY;
+	float m_AdvanceX;
+
+	float m_aUVs[4];
+};
+
+struct SGlyphKeyHash
+{
+	size_t operator()(const std::tuple<FT_Face, int, int> &Key) const
+	{
+		size_t Hash = 17;
+		Hash = Hash * 31 + std::hash<FT_Face>()(std::get<0>(Key));
+		Hash = Hash * 31 + std::hash<int>()(std::get<1>(Key));
+		Hash = Hash * 31 + std::hash<int>()(std::get<2>(Key));
+		return Hash;
+	}
+};
+
+struct SGlyphKeyEquals
+{
+	bool operator()(const std::tuple<FT_Face, int, int> &Lhs, const std::tuple<FT_Face, int, int> &Rhs) const
+	{
+		return std::get<0>(Lhs) == std::get<0>(Rhs) && std::get<1>(Lhs) == std::get<1>(Rhs) && std::get<2>(Lhs) == std::get<2>(Rhs);
+	}
+};
+
+class CAtlas
+{
+	struct SSectionKeyHash
+	{
+		size_t operator()(const std::tuple<size_t, size_t> &Key) const
+		{
+			// Width and height should never be above 2^16 so this hash should cause no collisions
+			return (std::get<0>(Key) << 16) ^ std::get<1>(Key);
+		}
+	};
+
+	struct SSectionKeyEquals
+	{
+		bool operator()(const std::tuple<size_t, size_t> &Lhs, const std::tuple<size_t, size_t> &Rhs) const
+		{
+			return std::get<0>(Lhs) == std::get<0>(Rhs) && std::get<1>(Lhs) == std::get<1>(Rhs);
+		}
+	};
+
+	struct SSection
+	{
+		size_t m_X;
+		size_t m_Y;
+		size_t m_W;
+		size_t m_H;
+
+		SSection() = default;
+
+		SSection(size_t X, size_t Y, size_t W, size_t H) :
+			m_X(X), m_Y(Y), m_W(W), m_H(H)
+		{
+		}
+	};
+
+	/**
+	 * Sections with a smaller width or height will not be created
+	 * when cutting larger sections, to prevent collecting many
+	 * small, mostly unusable sections.
+	 */
+	static constexpr size_t MIN_SECTION_DIMENSION = 6;
+
+	/**
+	 * Sections with larger width or height will be stored in m_vSections.
+	 * Sections with width and height equal or smaller will be stored in m_SectionsMap.
+	 * This achieves a good balance between the size of the vector storing all large
+	 * sections and the map storing vectors of all sections with specific small sizes.
+	 * Lowering this value will result in the size of m_vSections becoming the bottleneck.
+	 * Increasing this value will result in the map becoming the bottleneck.
+	 */
+	static constexpr size_t MAX_SECTION_DIMENSION_MAPPED = 8 * MIN_SECTION_DIMENSION;
+
+	size_t m_TextureDimension;
+	std::vector<SSection> m_vSections;
+	std::unordered_map<std::tuple<size_t, size_t>, std::vector<SSection>, SSectionKeyHash, SSectionKeyEquals> m_SectionsMap;
+
+	void AddSection(size_t X, size_t Y, size_t W, size_t H)
+	{
+		std::vector<SSection> &vSections = W <= MAX_SECTION_DIMENSION_MAPPED && H <= MAX_SECTION_DIMENSION_MAPPED ? m_SectionsMap[std::make_tuple(W, H)] : m_vSections;
+		vSections.emplace_back(X, Y, W, H);
+	}
+
+	void UseSection(const SSection &Section, size_t Width, size_t Height, int &PosX, int &PosY)
+	{
+		PosX = Section.m_X;
+		PosY = Section.m_Y;
+
+		// Create cut sections
+		const size_t CutW = Section.m_W - Width;
+		const size_t CutH = Section.m_H - Height;
+		if(CutW == 0)
+		{
+			if(CutH >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X, Section.m_Y + Height, Section.m_W, CutH);
+		}
+		else if(CutH == 0)
+		{
+			if(CutW >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X + Width, Section.m_Y, CutW, Section.m_H);
+		}
+		else if(CutW > CutH)
+		{
+			if(CutW >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X + Width, Section.m_Y, CutW, Section.m_H);
+			if(CutH >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X, Section.m_Y + Height, Width, CutH);
+		}
+		else
+		{
+			if(CutH >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X, Section.m_Y + Height, Section.m_W, CutH);
+			if(CutW >= MIN_SECTION_DIMENSION)
+				AddSection(Section.m_X + Width, Section.m_Y, CutW, Height);
+		}
+	}
+
+public:
+	void Clear(size_t TextureDimension)
+	{
+		m_TextureDimension = TextureDimension;
+		m_vSections.clear();
+		m_vSections.emplace_back(0, 0, m_TextureDimension, m_TextureDimension);
+		m_SectionsMap.clear();
+	}
+
+	void IncreaseDimension(size_t NewTextureDimension)
+	{
+		dbg_assert(NewTextureDimension == m_TextureDimension * 2, "New atlas dimension must be twice the old one");
+		// Create 3 square sections to cover the new area, add the sections
+		// to the beginning of the vector so they are considered last.
+		m_vSections.emplace_back(m_TextureDimension, m_TextureDimension, m_TextureDimension, m_TextureDimension);
+		m_vSections.emplace_back(m_TextureDimension, 0, m_TextureDimension, m_TextureDimension);
+		m_vSections.emplace_back(0, m_TextureDimension, m_TextureDimension, m_TextureDimension);
+		std::rotate(m_vSections.rbegin(), m_vSections.rbegin() + 3, m_vSections.rend());
+		m_TextureDimension = NewTextureDimension;
+	}
+
+	bool Add(size_t Width, size_t Height, int &PosX, int &PosY)
+	{
+		if(m_vSections.empty() || m_TextureDimension < Width || m_TextureDimension < Height)
+			return false;
+
+		// Find small section more efficiently by using maps
+		if(Width <= MAX_SECTION_DIMENSION_MAPPED && Height <= MAX_SECTION_DIMENSION_MAPPED)
+		{
+			const auto UseSectionFromVector = [&](std::vector<SSection> &vSections) {
+				if(!vSections.empty())
+				{
+					const SSection Section = vSections.back();
+					vSections.pop_back();
+					UseSection(Section, Width, Height, PosX, PosY);
+					return true;
+				}
+				return false;
+			};
+
+			if(UseSectionFromVector(m_SectionsMap[std::make_tuple(Width, Height)]))
+				return true;
+
+			for(size_t CheckWidth = Width + 1; CheckWidth <= MAX_SECTION_DIMENSION_MAPPED; ++CheckWidth)
+			{
+				if(UseSectionFromVector(m_SectionsMap[std::make_tuple(CheckWidth, Height)]))
+					return true;
+			}
+
+			for(size_t CheckHeight = Height + 1; CheckHeight <= MAX_SECTION_DIMENSION_MAPPED; ++CheckHeight)
+			{
+				if(UseSectionFromVector(m_SectionsMap[std::make_tuple(Width, CheckHeight)]))
+					return true;
+			}
+
+			// We don't iterate sections in the map with increasing width and height at the same time,
+			// because it's slower and doesn't noticeable increase the atlas utilization.
+		}
+
+		// Check vector for larger section
+		size_t SmallestLossValue = std::numeric_limits<size_t>::max();
+		size_t SmallestLossIndex = m_vSections.size();
+		size_t SectionIndex = m_vSections.size();
+		do
+		{
+			--SectionIndex;
+			const SSection &Section = m_vSections[SectionIndex];
+			if(Section.m_W < Width || Section.m_H < Height)
+				continue;
+
+			const size_t LossW = Section.m_W - Width;
+			const size_t LossH = Section.m_H - Height;
+
+			size_t Loss;
+			if(LossW == 0)
+				Loss = LossH;
+			else if(LossH == 0)
+				Loss = LossW;
+			else
+				Loss = LossW * LossH;
+
+			if(Loss < SmallestLossValue)
+			{
+				SmallestLossValue = Loss;
+				SmallestLossIndex = SectionIndex;
+				if(SmallestLossValue == 0)
+					break;
+			}
+		} while(SectionIndex > 0);
+		if(SmallestLossIndex == m_vSections.size())
+			return false; // No usable section found in vector
+
+		// Use the section with the smallest loss
+		const SSection Section = m_vSections[SmallestLossIndex];
+		m_vSections.erase(m_vSections.begin() + SmallestLossIndex);
+		UseSection(Section, Width, Height, PosX, PosY);
+		return true;
+	}
+};
+
+class CGlyphMap
+{
+public:
+	enum
+	{
+		FONT_TEXTURE_FILL = 0, // the main text body
+		FONT_TEXTURE_OUTLINE, // the text outline
+		NUM_FONT_TEXTURES,
+	};
+
+private:
+	/**
+	 * The initial dimension of the atlas textures.
+	 * Results in 1 MB of memory being used per texture.
+	 */
+	static constexpr int INITIAL_ATLAS_DIMENSION = 1024;
+
+	/**
+	 * The maximum dimension of the atlas textures.
+	 * Results in 256 MB of memory being used per texture.
+	 */
+	static constexpr int MAXIMUM_ATLAS_DIMENSION = 16 * 1024;
+
+	/**
+	 * The minimum supported font size.
+	 */
+	static constexpr int MIN_FONT_SIZE = 6;
+
+	/**
+	 * The maximum supported font size.
+	 */
+	static constexpr int MAX_FONT_SIZE = 128;
+
+	/**
+	 * White square to indicate missing glyph.
+	 */
+	static constexpr int REPLACEMENT_CHARACTER = 0x25a1;
+
+	IGraphics *m_pGraphics;
+	IGraphics *Graphics() { return m_pGraphics; }
+
+	// Atlas textures and data
+	IGraphics::CTextureHandle m_aTextures[NUM_FONT_TEXTURES];
+	// Width and height are the same, all font textures have the same dimensions
+	size_t m_TextureDimension = INITIAL_ATLAS_DIMENSION;
+	// Keep the full texture data, because OpenGL doesn't provide texture copying
+	uint8_t *m_apTextureData[NUM_FONT_TEXTURES];
+	CAtlas m_TextureAtlas;
+	std::unordered_map<std::tuple<FT_Face, int, int>, SGlyph, SGlyphKeyHash, SGlyphKeyEquals> m_Glyphs;
+
+	// Data used for rendering glyphs
+	uint8_t m_aaGlyphData[NUM_FONT_TEXTURES][64 * 1024];
+
+	// Font faces
+	FT_Face m_DefaultFace = nullptr;
+	FT_Face m_IconFace = nullptr;
+	FT_Face m_VariantFace = nullptr;
+	FT_Face m_SelectedFace = nullptr;
+	std::vector<FT_Face> m_vFallbackFaces;
+	std::vector<FT_Face> m_vFtFaces;
+
+	FT_Face GetFaceByName(const char *pFamilyName)
+	{
+		if(pFamilyName == nullptr || pFamilyName[0] == '\0')
+			return nullptr;
+
+		FT_Face FamilyNameMatch = nullptr;
+		char aFamilyStyleName[FONT_NAME_SIZE];
+
+		for(const auto &CurrentFace : m_vFtFaces)
+		{
+			// Best match: font face with matching family and style name
+			str_format(aFamilyStyleName, sizeof(aFamilyStyleName), "%s %s", CurrentFace->family_name, CurrentFace->style_name);
+			if(str_comp(pFamilyName, aFamilyStyleName) == 0)
+			{
+				return CurrentFace;
+			}
+
+			// Second best match: font face with matching family
+			if(!FamilyNameMatch && str_comp(pFamilyName, CurrentFace->family_name) == 0)
+			{
+				FamilyNameMatch = CurrentFace;
+			}
+		}
+
+		return FamilyNameMatch;
+	}
+
+	bool IncreaseGlyphMapSize()
+	{
+		if(m_TextureDimension >= MAXIMUM_ATLAS_DIMENSION)
+			return false;
+
+		const size_t NewTextureDimension = m_TextureDimension * 2;
+		log_debug("textrender", "Increasing atlas dimension to %" PRIzu " (%" PRIzu " MB used for textures)", NewTextureDimension, (NewTextureDimension / 1024) * (NewTextureDimension / 1024) * NUM_FONT_TEXTURES);
+		UnloadTextures();
+
+		for(auto &pTextureData : m_apTextureData)
+		{
+			uint8_t *pTmpTexBuffer = new uint8_t[NewTextureDimension * NewTextureDimension];
+			mem_zero(pTmpTexBuffer, NewTextureDimension * NewTextureDimension * sizeof(uint8_t));
+			for(size_t y = 0; y < m_TextureDimension; ++y)
+			{
+				mem_copy(&pTmpTexBuffer[y * NewTextureDimension], &pTextureData[y * m_TextureDimension], m_TextureDimension);
+			}
+			delete[] pTextureData;
+			pTextureData = pTmpTexBuffer;
+		}
+
+		m_TextureAtlas.IncreaseDimension(NewTextureDimension);
+
+		m_TextureDimension = NewTextureDimension;
+
+		UploadTextures();
+		return true;
+	}
+
+	void UploadTextures()
+	{
+		const size_t NewTextureSize = m_TextureDimension * m_TextureDimension;
+		void *pTmpTextFillData = malloc(NewTextureSize);
+		void *pTmpTextOutlineData = malloc(NewTextureSize);
+		mem_copy(pTmpTextFillData, m_apTextureData[FONT_TEXTURE_FILL], NewTextureSize);
+		mem_copy(pTmpTextOutlineData, m_apTextureData[FONT_TEXTURE_OUTLINE], NewTextureSize);
+		Graphics()->LoadTextTextures(m_TextureDimension, m_TextureDimension, m_aTextures[FONT_TEXTURE_FILL], m_aTextures[FONT_TEXTURE_OUTLINE], pTmpTextFillData, pTmpTextOutlineData);
+	}
+
+	void UnloadTextures()
+	{
+		Graphics()->UnloadTextTextures(m_aTextures[FONT_TEXTURE_FILL], m_aTextures[FONT_TEXTURE_OUTLINE]);
+	}
+
+	FT_UInt GetCharGlyph(int Chr, FT_Face *pFace, bool AllowReplacementCharacter)
+	{
+		for(FT_Face Face : {m_SelectedFace, m_DefaultFace, m_VariantFace})
+		{
+			if(Face && Face->charmap)
+			{
+				FT_UInt GlyphIndex = FT_Get_Char_Index(Face, (FT_ULong)Chr);
+				if(GlyphIndex)
+				{
+					*pFace = Face;
+					return GlyphIndex;
+				}
+			}
+		}
+
+		for(const auto &FallbackFace : m_vFallbackFaces)
+		{
+			if(FallbackFace->charmap)
+			{
+				FT_UInt GlyphIndex = FT_Get_Char_Index(FallbackFace, (FT_ULong)Chr);
+				if(GlyphIndex)
+				{
+					*pFace = FallbackFace;
+					return GlyphIndex;
+				}
+			}
+		}
+
+		if(!m_DefaultFace || !m_DefaultFace->charmap || !AllowReplacementCharacter)
+		{
+			*pFace = nullptr;
+			return 0;
+		}
+
+		FT_UInt GlyphIndex = FT_Get_Char_Index(m_DefaultFace, (FT_ULong)REPLACEMENT_CHARACTER);
+		*pFace = m_DefaultFace;
+
+		if(GlyphIndex == 0)
+		{
+			log_debug("textrender", "Default font has no glyph for either %d or replacement char %d.", Chr, REPLACEMENT_CHARACTER);
+		}
+
+		return GlyphIndex;
+	}
+
+	void Grow(const unsigned char *pIn, unsigned char *pOut, int w, int h, int OutlineCount) const
+	{
+		for(int y = 0; y < h; y++)
+		{
+			for(int x = 0; x < w; x++)
+			{
+				int c = pIn[y * w + x];
+
+				for(int sy = -OutlineCount; sy <= OutlineCount; sy++)
+				{
+					for(int sx = -OutlineCount; sx <= OutlineCount; sx++)
+					{
+						int GetX = x + sx;
+						int GetY = y + sy;
+						if(GetX >= 0 && GetY >= 0 && GetX < w && GetY < h)
+						{
+							int Index = GetY * w + GetX;
+							if(pIn[Index] > c)
+								c = pIn[Index];
+						}
+					}
+				}
+
+				pOut[y * w + x] = c;
+			}
+		}
+	}
+
+	int AdjustOutlineThicknessToFontSize(int OutlineThickness, int FontSize) const
+	{
+		if(FontSize > 48)
+			OutlineThickness *= 4;
+		else if(FontSize >= 18)
+			OutlineThickness *= 2;
+		return OutlineThickness;
+	}
+
+	void UploadGlyph(int TextureIndex, int PosX, int PosY, size_t Width, size_t Height, const unsigned char *pData)
+	{
+		for(size_t y = 0; y < Height; ++y)
+		{
+			mem_copy(&m_apTextureData[TextureIndex][PosX + ((y + PosY) * m_TextureDimension)], &pData[y * Width], Width);
+		}
+		Graphics()->UpdateTextTexture(m_aTextures[TextureIndex], PosX, PosY, Width, Height, pData);
+	}
+
+	bool FitGlyph(size_t Width, size_t Height, int &PosX, int &PosY)
+	{
+		return m_TextureAtlas.Add(Width, Height, PosX, PosY);
+	}
+
+	bool RenderGlyph(SGlyph &Glyph)
+	{
+		FT_Set_Pixel_Sizes(Glyph.m_Face, 0, Glyph.m_FontSize);
+
+		if(FT_Load_Glyph(Glyph.m_Face, Glyph.m_GlyphIndex, FT_LOAD_RENDER | FT_LOAD_NO_BITMAP))
+		{
+			log_debug("textrender", "Error loading glyph. Chr=%d GlyphIndex=%u", Glyph.m_Chr, Glyph.m_GlyphIndex);
+			return false;
+		}
+
+		const FT_Bitmap *pBitmap = &Glyph.m_Face->glyph->bitmap;
+
+		const unsigned RealWidth = pBitmap->width;
+		const unsigned RealHeight = pBitmap->rows;
+
+		// adjust spacing
+		int OutlineThickness = 0;
+		int x = 0;
+		int y = 0;
+		if(RealWidth > 0)
+		{
+			OutlineThickness = AdjustOutlineThicknessToFontSize(1, Glyph.m_FontSize);
+			x += (OutlineThickness + 1);
+			y += (OutlineThickness + 1);
+		}
+
+		const unsigned Width = RealWidth + x * 2;
+		const unsigned Height = RealHeight + y * 2;
+
+		int X = 0;
+		int Y = 0;
+
+		if(Width > 0 && Height > 0)
+		{
+			// find space in atlas, or increase size if necessary
+			while(!FitGlyph(Width, Height, X, Y))
+			{
+				if(!IncreaseGlyphMapSize())
+				{
+					log_debug("textrender", "Cannot fit glyph into atlas, which is already at maximum size. Chr=%d GlyphIndex=%u", Glyph.m_Chr, Glyph.m_GlyphIndex);
+					return false;
+				}
+			}
+
+			// prepare glyph data
+			mem_zero(m_aaGlyphData[FONT_TEXTURE_FILL], (size_t)Width * Height * sizeof(uint8_t));
+			for(unsigned py = 0; py < pBitmap->rows; ++py)
+			{
+				mem_copy(&m_aaGlyphData[FONT_TEXTURE_FILL][(py + y) * Width + x], &pBitmap->buffer[py * pBitmap->width], pBitmap->width);
+			}
+
+			// upload the glyph
+			UploadGlyph(FONT_TEXTURE_FILL, X, Y, Width, Height, m_aaGlyphData[FONT_TEXTURE_FILL]);
+			Grow(m_aaGlyphData[FONT_TEXTURE_FILL], m_aaGlyphData[FONT_TEXTURE_OUTLINE], Width, Height, OutlineThickness);
+			UploadGlyph(FONT_TEXTURE_OUTLINE, X, Y, Width, Height, m_aaGlyphData[FONT_TEXTURE_OUTLINE]);
+		}
+
+		// set glyph info
+		{
+			const int BmpWidth = pBitmap->width + x * 2;
+			const int BmpHeight = pBitmap->rows + y * 2;
+
+			Glyph.m_Height = Height;
+			Glyph.m_Width = Width;
+			Glyph.m_CharHeight = RealHeight;
+			Glyph.m_CharWidth = RealWidth;
+			Glyph.m_OffsetX = (Glyph.m_Face->glyph->metrics.horiBearingX >> 6);
+			Glyph.m_OffsetY = -((Glyph.m_Face->glyph->metrics.height >> 6) - (Glyph.m_Face->glyph->metrics.horiBearingY >> 6));
+			Glyph.m_AdvanceX = (Glyph.m_Face->glyph->advance.x >> 6);
+
+			Glyph.m_aUVs[0] = X;
+			Glyph.m_aUVs[1] = Y;
+			Glyph.m_aUVs[2] = Glyph.m_aUVs[0] + BmpWidth;
+			Glyph.m_aUVs[3] = Glyph.m_aUVs[1] + BmpHeight;
+
+			Glyph.m_State = SGlyph::EState::RENDERED;
+		}
+		return true;
+	}
+
+public:
+	CGlyphMap(IGraphics *pGraphics)
+	{
+		m_pGraphics = pGraphics;
+		for(auto &pTextureData : m_apTextureData)
+		{
+			pTextureData = new uint8_t[m_TextureDimension * m_TextureDimension];
+			mem_zero(pTextureData, m_TextureDimension * m_TextureDimension * sizeof(uint8_t));
+		}
+
+		m_TextureAtlas.Clear(m_TextureDimension);
+		UploadTextures();
+	}
+
+	~CGlyphMap()
+	{
+		UnloadTextures();
+		for(auto &pTextureData : m_apTextureData)
+		{
+			delete[] pTextureData;
+		}
+	}
+
+	FT_Face DefaultFace() const
+	{
+		return m_DefaultFace;
+	}
+
+	FT_Face IconFace() const
+	{
+		return m_IconFace;
+	}
+
+	void AddFace(FT_Face Face)
+	{
+		m_vFtFaces.push_back(Face);
+		if(!m_DefaultFace)
+			m_DefaultFace = Face;
+	}
+
+	void SetDefaultFaceByName(const char *pFamilyName)
+	{
+		m_DefaultFace = GetFaceByName(pFamilyName);
+	}
+
+	void SetIconFaceByName(const char *pFamilyName)
+	{
+		m_IconFace = GetFaceByName(pFamilyName);
+	}
+
+	void AddFallbackFaceByName(const char *pFamilyName)
+	{
+		FT_Face Face = GetFaceByName(pFamilyName);
+		if(Face != nullptr && std::find(m_vFallbackFaces.begin(), m_vFallbackFaces.end(), Face) == m_vFallbackFaces.end())
+		{
+			m_vFallbackFaces.push_back(Face);
+		}
+	}
+
+	void SetVariantFaceByName(const char *pFamilyName)
+	{
+		FT_Face Face = GetFaceByName(pFamilyName);
+		if(m_VariantFace != Face)
+		{
+			m_VariantFace = Face;
+			Clear(); // rebuild atlas after changing variant font
+		}
+	}
+
+	void SetFontPreset(EFontPreset FontPreset)
+	{
+		switch(FontPreset)
+		{
+		case EFontPreset::DEFAULT_FONT:
+			m_SelectedFace = nullptr;
+			break;
+		case EFontPreset::ICON_FONT:
+			m_SelectedFace = m_IconFace;
+			break;
+		}
+	}
+
+	void Clear()
+	{
+		for(size_t TextureIndex = 0; TextureIndex < NUM_FONT_TEXTURES; ++TextureIndex)
+		{
+			mem_zero(m_apTextureData[TextureIndex], m_TextureDimension * m_TextureDimension * sizeof(uint8_t));
+			Graphics()->UpdateTextTexture(m_aTextures[TextureIndex], 0, 0, m_TextureDimension, m_TextureDimension, m_apTextureData[TextureIndex]);
+		}
+
+		m_TextureAtlas.Clear(m_TextureDimension);
+		m_Glyphs.clear();
+	}
+
+	const SGlyph *GetGlyph(int Chr, int FontSize)
+	{
+		FontSize = clamp(FontSize, MIN_FONT_SIZE, MAX_FONT_SIZE);
+
+		// Find glyph index and most appropriate font face.
+		FT_Face Face;
+		FT_UInt GlyphIndex = GetCharGlyph(Chr, &Face, false);
+		if(GlyphIndex == 0)
+		{
+			// Use replacement character if glyph could not be found,
+			// also retrieve replacement character from the atlas.
+			return Chr == REPLACEMENT_CHARACTER ? nullptr : GetGlyph(REPLACEMENT_CHARACTER, FontSize);
+		}
+
+		// Check if glyph for this (font face, character, font size)-combination was already rendered.
+		SGlyph &Glyph = m_Glyphs[std::make_tuple(Face, Chr, FontSize)];
+		if(Glyph.m_State == SGlyph::EState::RENDERED)
+			return &Glyph;
+		else if(Glyph.m_State == SGlyph::EState::ERROR)
+			return nullptr;
+
+		// Else, render it.
+		Glyph.m_FontSize = FontSize;
+		Glyph.m_Face = Face;
+		Glyph.m_Chr = Chr;
+		Glyph.m_GlyphIndex = GlyphIndex;
+		if(RenderGlyph(Glyph))
+			return &Glyph;
+
+		// Use replacement character if the glyph could not be rendered,
+		// also retrieve replacement character from the atlas.
+		const SGlyph *pReplacementCharacter = Chr == REPLACEMENT_CHARACTER ? nullptr : GetGlyph(REPLACEMENT_CHARACTER, FontSize);
+		if(pReplacementCharacter)
+		{
+			Glyph = *pReplacementCharacter;
+			return &Glyph;
+		}
+
+		// Keep failed glyph in the cache so we don't attempt to render it again,
+		// but set its state to ERROR so we don't return it to the text render.
+		Glyph.m_State = SGlyph::EState::ERROR;
+		return nullptr;
+	}
+
+	vec2 Kerning(const SGlyph *pLeft, const SGlyph *pRight) const
+	{
+		if(pLeft != nullptr && pRight != nullptr && pLeft->m_Face == pRight->m_Face && pLeft->m_FontSize == pRight->m_FontSize)
+		{
+			FT_Vector Kerning = {0, 0};
+			FT_Set_Pixel_Sizes(pLeft->m_Face, 0, pLeft->m_FontSize);
+			FT_Get_Kerning(pLeft->m_Face, pLeft->m_Chr, pRight->m_Chr, FT_KERNING_DEFAULT, &Kerning);
+			return vec2(Kerning.x >> 6, Kerning.y >> 6);
+		}
+		return vec2(0.0f, 0.0f);
+	}
+
+	void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize)
+	{
+		if(FontSize < 1)
+			return;
+
+		const char *pCurrent = pText;
+		const char *pEnd = pCurrent + Length;
+		int WidthLastChars = 0;
+
+		while(pCurrent < pEnd)
+		{
+			const char *pTmp = pCurrent;
+			const int NextCharacter = str_utf8_decode(&pTmp);
+
+			if(NextCharacter)
+			{
+				FT_Face Face;
+				FT_UInt GlyphIndex = GetCharGlyph(NextCharacter, &Face, true);
+				if(GlyphIndex == 0)
+				{
+					pCurrent = pTmp;
+					continue;
+				}
+
+				FT_Set_Pixel_Sizes(Face, 0, FontSize);
+				if(FT_Load_Char(Face, NextCharacter, FT_LOAD_RENDER | FT_LOAD_NO_BITMAP))
+				{
+					log_debug("textrender", "Error loading glyph. Chr=%d GlyphIndex=%u", NextCharacter, GlyphIndex);
+					pCurrent = pTmp;
+					continue;
+				}
+
+				const FT_Bitmap *pBitmap = &Face->glyph->bitmap;
+
+				// prepare glyph data
+				const size_t GlyphDataSize = (size_t)pBitmap->width * pBitmap->rows * sizeof(uint8_t);
+				if(pBitmap->pixel_mode == FT_PIXEL_MODE_GRAY)
+					mem_copy(m_aaGlyphData[FONT_TEXTURE_FILL], pBitmap->buffer, GlyphDataSize);
+				else
+					mem_zero(m_aaGlyphData[FONT_TEXTURE_FILL], GlyphDataSize);
+
+				uint8_t *pImageBuff = (uint8_t *)pTexBuff;
+				for(unsigned OffY = 0; OffY < pBitmap->rows; ++OffY)
+				{
+					for(unsigned OffX = 0; OffX < pBitmap->width; ++OffX)
+					{
+						const int ImgOffX = clamp(x + OffX + WidthLastChars, x, (x + TexSubWidth) - 1);
+						const int ImgOffY = clamp(y + OffY, y, (y + TexSubHeight) - 1);
+						const size_t ImageOffset = ImgOffY * (TexWidth * PixelSize) + ImgOffX * PixelSize;
+						const size_t GlyphOffset = OffY * pBitmap->width + OffX;
+						for(size_t i = 0; i < PixelSize; ++i)
+						{
+							if(i != PixelSize - 1)
+							{
+								*(pImageBuff + ImageOffset + i) = 255;
+							}
+							else
+							{
+								*(pImageBuff + ImageOffset + i) = *(m_aaGlyphData[FONT_TEXTURE_FILL] + GlyphOffset);
+							}
+						}
+					}
+				}
+
+				WidthLastChars += (pBitmap->width + 1);
+			}
+			pCurrent = pTmp;
+		}
+	}
+
+	size_t TextureDimension() const
+	{
+		return m_TextureDimension;
+	}
+
+	IGraphics::CTextureHandle Texture(size_t TextureIndex) const
+	{
+		return m_aTextures[TextureIndex];
+	}
+};
+
+typedef vector4_base<unsigned char> STextCharQuadVertexColor;
+
+struct STextCharQuadVertex
+{
+	STextCharQuadVertex()
+	{
+		m_Color.r = m_Color.g = m_Color.b = m_Color.a = 255;
+	}
+	float m_X, m_Y;
+	// do not use normalized floats as coordinates, since the texture might grow
+	float m_U, m_V;
+	STextCharQuadVertexColor m_Color;
+};
+
+struct STextCharQuad
+{
+	STextCharQuadVertex m_aVertices[4];
+};
+
+struct SStringInfo
+{
+	int m_QuadBufferObjectIndex;
+	int m_QuadBufferContainerIndex;
+	int m_SelectionQuadContainerIndex;
+
+	std::vector<STextCharQuad> m_vCharacterQuads;
+};
+
+struct STextContainer
+{
+	STextContainer()
+	{
+		Reset();
+	}
+
+	SStringInfo m_StringInfo;
+
+	// keep these values to calculate offsets
+	float m_AlignedStartX;
+	float m_AlignedStartY;
+	float m_X;
+	float m_Y;
+
+	int m_Flags;
+	int m_LineCount;
+	int m_GlyphCount;
+	int m_CharCount;
+	int m_MaxLines;
+	float m_LineWidth;
+
+	unsigned m_RenderFlags;
+
+	bool m_HasCursor;
+	bool m_ForceCursorRendering;
+	bool m_HasSelection;
+
+	bool m_SingleTimeUse;
+
+	STextBoundingBox m_BoundingBox;
+
+	// prefix of the container's text stored for debugging purposes
+	char m_aDebugText[32];
+
+	STextContainerIndex m_ContainerIndex;
+
+	void Reset()
+	{
+		m_StringInfo.m_QuadBufferObjectIndex = m_StringInfo.m_QuadBufferContainerIndex = m_StringInfo.m_SelectionQuadContainerIndex = -1;
+		m_StringInfo.m_vCharacterQuads.clear();
+
+		m_AlignedStartX = m_AlignedStartY = m_X = m_Y = 0.0f;
+		m_Flags = m_LineCount = m_CharCount = m_GlyphCount = 0;
+		m_MaxLines = -1;
+		m_LineWidth = -1.0f;
+
+		m_RenderFlags = 0;
+
+		m_HasCursor = false;
+		m_ForceCursorRendering = false;
+		m_HasSelection = false;
+
+		m_SingleTimeUse = false;
+
+		m_BoundingBox = {0.0f, 0.0f, 0.0f, 0.0f};
+
+		m_aDebugText[0] = '\0';
+
+		m_ContainerIndex = STextContainerIndex{};
+	}
+};
+
+struct SFontLanguageVariant
+{
+	char m_aLanguageFile[IO_MAX_PATH_LENGTH];
+	char m_aFamilyName[FONT_NAME_SIZE];
+};
+
+class CTextRender : public IEngineTextRender
+{
+	IConsole *m_pConsole;
+	IGraphics *m_pGraphics;
+	IStorage *m_pStorage;
+	IConsole *Console() { return m_pConsole; }
+	IGraphics *Graphics() { return m_pGraphics; }
+	IStorage *Storage() { return m_pStorage; }
+
+	CGlyphMap *m_pGlyphMap;
+	std::vector<void *> m_vpFontData;
+
+	std::vector<SFontLanguageVariant> m_vVariants;
+
+	unsigned m_RenderFlags;
+
+	ColorRGBA m_Color;
+	ColorRGBA m_OutlineColor;
+	ColorRGBA m_SelectionColor;
+
+	FT_Library m_FTLibrary;
+
+	std::vector<STextContainer *> m_vpTextContainers;
+	std::vector<int> m_vTextContainerIndices;
+	int m_FirstFreeTextContainerIndex;
+
+	SBufferContainerInfo m_DefaultTextContainerInfo;
+
+	std::chrono::nanoseconds m_CursorRenderTime;
+
+	int GetFreeTextContainerIndex()
+	{
+		if(m_FirstFreeTextContainerIndex == -1)
+		{
+			const int Index = (int)m_vTextContainerIndices.size();
+			m_vTextContainerIndices.push_back(Index);
+			return Index;
+		}
+		else
+		{
+			const int Index = m_FirstFreeTextContainerIndex;
+			m_FirstFreeTextContainerIndex = m_vTextContainerIndices[Index];
+			m_vTextContainerIndices[Index] = Index;
+			return Index;
+		}
+	}
+
+	void FreeTextContainerIndex(STextContainerIndex &Index)
+	{
+		m_vTextContainerIndices[Index.m_Index] = m_FirstFreeTextContainerIndex;
+		m_FirstFreeTextContainerIndex = Index.m_Index;
+		Index.Reset();
+	}
+
+	void FreeTextContainer(STextContainerIndex &Index)
+	{
+		m_vpTextContainers[Index.m_Index]->Reset();
+		FreeTextContainerIndex(Index);
+	}
+
+	STextContainer &GetTextContainer(const STextContainerIndex &Index)
+	{
+		dbg_assert(Index.Valid(), "Text container index was invalid.");
+		if(Index.m_Index >= (int)m_vpTextContainers.size())
+		{
+			for(int i = 0; i < Index.m_Index + 1 - (int)m_vpTextContainers.size(); ++i)
+				m_vpTextContainers.push_back(new STextContainer());
+		}
+
+		if(m_vpTextContainers[Index.m_Index]->m_ContainerIndex.m_UseCount.get() != Index.m_UseCount.get())
+		{
+			m_vpTextContainers[Index.m_Index]->m_ContainerIndex = Index;
+		}
+		return *m_vpTextContainers[Index.m_Index];
+	}
+
+	int WordLength(const char *pText) const
+	{
+		const char *pCursor = pText;
+		while(true)
+		{
+			if(*pCursor == '\0')
+				return pCursor - pText;
+			if(*pCursor == '\n' || *pCursor == '\t' || *pCursor == ' ')
+				return pCursor - pText + 1;
+			str_utf8_decode(&pCursor);
+		}
+	}
+
+	bool LoadFontCollection(const char *pFontName, const FT_Byte *pFontData, FT_Long FontDataSize)
+	{
+		FT_Face FtFace;
+		FT_Error CollectionLoadError = FT_New_Memory_Face(m_FTLibrary, pFontData, FontDataSize, -1, &FtFace);
+		if(CollectionLoadError)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Failed to load font file '%s': %s", pFontName, FT_Error_String(CollectionLoadError));
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aBuf);
+			return false;
+		}
+
+		const FT_Long NumFaces = FtFace->num_faces;
+		FT_Done_Face(FtFace);
+
+		bool LoadedAny = false;
+		for(FT_Long FaceIndex = 0; FaceIndex < NumFaces; ++FaceIndex)
+		{
+			FT_Error FaceLoadError = FT_New_Memory_Face(m_FTLibrary, pFontData, FontDataSize, FaceIndex, &FtFace);
+			if(FaceLoadError)
+			{
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "Failed to load font face %ld from font file '%s': %s", FaceIndex, pFontName, FT_Error_String(FaceLoadError));
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aBuf);
+				FT_Done_Face(FtFace);
+				continue;
+			}
+
+			m_pGlyphMap->AddFace(FtFace);
+
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Loaded font face %ld '%s %s' from font file '%s'", FaceIndex, FtFace->family_name, FtFace->style_name, pFontName);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "textrender", aBuf);
+			LoadedAny = true;
+		}
+
+		if(!LoadedAny)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Failed to load font file '%s': no font faces could be loaded", pFontName);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aBuf);
+			return false;
+		}
+
+		return true;
+	}
+
+	void SetRenderFlags(unsigned Flags) override
+	{
+		m_RenderFlags = Flags;
+	}
+
+	unsigned GetRenderFlags() const override
+	{
+		return m_RenderFlags;
+	}
+
+public:
+	CTextRender()
+	{
+		m_pConsole = nullptr;
+		m_pGraphics = nullptr;
+		m_pStorage = nullptr;
+		m_pGlyphMap = nullptr;
+
+		m_Color = DefaultTextColor();
+		m_OutlineColor = DefaultTextOutlineColor();
+		m_SelectionColor = DefaultTextSelectionColor();
+
+		m_FTLibrary = nullptr;
+
+		m_RenderFlags = 0;
+		m_CursorRenderTime = time_get_nanoseconds();
+	}
+
+	void Init() override
+	{
+		m_pConsole = Kernel()->RequestInterface<IConsole>();
+		m_pGraphics = Kernel()->RequestInterface<IGraphics>();
+		m_pStorage = Kernel()->RequestInterface<IStorage>();
+		FT_Init_FreeType(&m_FTLibrary);
+		m_pGlyphMap = new CGlyphMap(m_pGraphics);
+
+		// print freetype version
+		{
+			int LMajor, LMinor, LPatch;
+			FT_Library_Version(m_FTLibrary, &LMajor, &LMinor, &LPatch);
+			char aFreetypeVersion[128];
+			str_format(aFreetypeVersion, sizeof(aFreetypeVersion), "Freetype version %d.%d.%d (compiled = %d.%d.%d)", LMajor, LMinor, LPatch, FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aFreetypeVersion);
+		}
+
+		m_FirstFreeTextContainerIndex = -1;
+
+		m_DefaultTextContainerInfo.m_Stride = sizeof(STextCharQuadVertex);
+		m_DefaultTextContainerInfo.m_VertBufferBindingIndex = -1;
+
+		m_DefaultTextContainerInfo.m_vAttributes.emplace_back();
+		SBufferContainerInfo::SAttribute *pAttr = &m_DefaultTextContainerInfo.m_vAttributes.back();
+		pAttr->m_DataTypeCount = 2;
+		pAttr->m_FuncType = 0;
+		pAttr->m_Normalized = false;
+		pAttr->m_pOffset = nullptr;
+		pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+
+		m_DefaultTextContainerInfo.m_vAttributes.emplace_back();
+		pAttr = &m_DefaultTextContainerInfo.m_vAttributes.back();
+		pAttr->m_DataTypeCount = 2;
+		pAttr->m_FuncType = 0;
+		pAttr->m_Normalized = false;
+		pAttr->m_pOffset = (void *)(sizeof(float) * 2);
+		pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+
+		m_DefaultTextContainerInfo.m_vAttributes.emplace_back();
+		pAttr = &m_DefaultTextContainerInfo.m_vAttributes.back();
+		pAttr->m_DataTypeCount = 4;
+		pAttr->m_FuncType = 0;
+		pAttr->m_Normalized = true;
+		pAttr->m_pOffset = (void *)(sizeof(float) * 2 + sizeof(float) * 2);
+		pAttr->m_Type = GRAPHICS_TYPE_UNSIGNED_BYTE;
+	}
+
+	void Shutdown() override
+	{
+		for(auto *pTextCont : m_vpTextContainers)
+			delete pTextCont;
+		m_vpTextContainers.clear();
+
+		delete m_pGlyphMap;
+		m_pGlyphMap = nullptr;
+
+		if(m_FTLibrary != nullptr)
+			FT_Done_FreeType(m_FTLibrary);
+		m_FTLibrary = nullptr;
+
+		for(auto *pFontData : m_vpFontData)
+			free(pFontData);
+		m_vpFontData.clear();
+
+		m_DefaultTextContainerInfo.m_vAttributes.clear();
+
+		m_pConsole = nullptr;
+		m_pGraphics = nullptr;
+		m_pStorage = nullptr;
+	}
+
+	void LoadFonts() override
+	{
+		// read file data into buffer
+		const char *pFilename = "fonts/index.json";
+		void *pFileData;
+		unsigned JsonFileSize;
+		if(!Storage()->ReadFile(pFilename, IStorage::TYPE_ALL, &pFileData, &JsonFileSize))
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Failed to open/read font index file '%s'", pFilename);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aBuf);
+			return;
+		}
+
+		// parse json data
+		json_settings JsonSettings{};
+		char aError[256];
+		json_value *pJsonData = json_parse_ex(&JsonSettings, static_cast<const json_char *>(pFileData), JsonFileSize, aError);
+		free(pFileData);
+		if(pJsonData == nullptr)
+		{
+			char aBuf[512];
+			str_format(aBuf, sizeof(aBuf), "Failed to parse font index file '%s': %s", pFilename, aError);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "textrender", aBuf);
+			return;
+		}
+
+		// extract font file definitions
+		const json_value &FontFiles = (*pJsonData)["font files"];
+		if(FontFiles.type == json_array)
+		{
+			for(unsigned FontFileIndex = 0; FontFileIndex < FontFiles.u.array.length; ++FontFileIndex)
+			{
+				if(FontFiles[FontFileIndex].type != json_string)
+					continue;
+
+				char aFontName[IO_MAX_PATH_LENGTH];
+				str_format(aFontName, sizeof(aFontName), "fonts/%s", FontFiles[FontFileIndex].u.string.ptr);
+				void *pFontData;
+				unsigned FontDataSize;
+				if(Storage()->ReadFile(aFontName, IStorage::TYPE_ALL, &pFontData, &FontDataSize))
+				{
+					if(LoadFontCollection(aFontName, static_cast<FT_Byte *>(pFontData), (FT_Long)FontDataSize))
+					{
+						m_vpFontData.push_back(pFontData);
+					}
+					else
+					{
+						free(pFontData);
+					}
+				}
+			}
+		}
+
+		// extract default family name
+		const json_value &DefaultFace = (*pJsonData)["default"];
+		if(DefaultFace.type == json_string)
+		{
+			m_pGlyphMap->SetDefaultFaceByName(DefaultFace.u.string.ptr);
+		}
+
+		// extract language variant family names
+		const json_value &Variants = (*pJsonData)["language variants"];
+		if(Variants.type == json_object)
+		{
+			m_vVariants.resize(Variants.u.object.length);
+			for(size_t i = 0; i < Variants.u.object.length; ++i)
+			{
+				str_format(m_vVariants[i].m_aLanguageFile, sizeof(m_vVariants[i].m_aLanguageFile), "languages/%s.txt", Variants.u.object.values[i].name);
+
+				const json_value *pFamilyName = Variants.u.object.values[i].value;
+				if(pFamilyName->type == json_string)
+					str_copy(m_vVariants[i].m_aFamilyName, pFamilyName->u.string.ptr);
+				else
+					m_vVariants[i].m_aFamilyName[0] = '\0';
+			}
+		}
+
+		// extract fallback family names
+		const json_value &FallbackFaces = (*pJsonData)["fallbacks"];
+		if(FallbackFaces.type == json_array)
+		{
+			for(unsigned i = 0; i < FallbackFaces.u.array.length; ++i)
+			{
+				if(FallbackFaces[i].type == json_string)
+				{
+					m_pGlyphMap->AddFallbackFaceByName(FallbackFaces[i].u.string.ptr);
+				}
+			}
+		}
+
+		// extract icon font family name
+		const json_value &IconFace = (*pJsonData)["icon"];
+		if(IconFace.type == json_string)
+		{
+			m_pGlyphMap->SetIconFaceByName(IconFace.u.string.ptr);
+		}
+
+		json_value_free(pJsonData);
+	}
+
+	void SetFontPreset(EFontPreset FontPreset) override
+	{
+		m_pGlyphMap->SetFontPreset(FontPreset);
+	}
+
+	void SetFontLanguageVariant(const char *pLanguageFile) override
+	{
+		for(const auto &Variant : m_vVariants)
+		{
+			if(str_comp(pLanguageFile, Variant.m_aLanguageFile) == 0)
+			{
+				m_pGlyphMap->SetVariantFaceByName(Variant.m_aFamilyName);
+				return;
+			}
+		}
+		m_pGlyphMap->SetVariantFaceByName(nullptr);
+	}
+
+	void SetCursor(CTextCursor *pCursor, float x, float y, float FontSize, int Flags) const override
+	{
+		pCursor->m_Flags = Flags;
+		pCursor->m_LineCount = 1;
+		pCursor->m_GlyphCount = 0;
+		pCursor->m_CharCount = 0;
+		pCursor->m_MaxLines = 0;
+		pCursor->m_LineSpacing = 0;
+
+		pCursor->m_StartX = x;
+		pCursor->m_StartY = y;
+		pCursor->m_LineWidth = -1.0f;
+		pCursor->m_X = x;
+		pCursor->m_Y = y;
+		pCursor->m_MaxCharacterHeight = 0.0f;
+		pCursor->m_LongestLineWidth = 0.0f;
+
+		pCursor->m_FontSize = FontSize;
+		pCursor->m_AlignedFontSize = FontSize;
+
+		pCursor->m_CalculateSelectionMode = TEXT_CURSOR_SELECTION_MODE_NONE;
+		pCursor->m_SelectionHeightFactor = 1.0f;
+		pCursor->m_PressMouse = vec2(0.0f, 0.0f);
+		pCursor->m_ReleaseMouse = vec2(0.0f, 0.0f);
+		pCursor->m_SelectionStart = 0;
+		pCursor->m_SelectionEnd = 0;
+
+		pCursor->m_CursorMode = TEXT_CURSOR_CURSOR_MODE_NONE;
+		pCursor->m_ForceCursorRendering = false;
+		pCursor->m_CursorCharacter = -1;
+		pCursor->m_CursorRenderedPosition = vec2(-1.0f, -1.0f);
+
+		pCursor->m_vColorSplits = {};
+	}
+
+	void MoveCursor(CTextCursor *pCursor, float x, float y) const override
+	{
+		pCursor->m_X += x;
+		pCursor->m_Y += y;
+	}
+
+	void SetCursorPosition(CTextCursor *pCursor, float x, float y) const override
+	{
+		pCursor->m_X = x;
+		pCursor->m_Y = y;
+	}
+	void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) override
+	{
+		CTextCursor Cursor;
+		SetCursor(&Cursor, x, y, Size, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = LineWidth;
+		TextEx(&Cursor, pText, -1);
+	}
+	float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, const STextSizeProperties &TextSizeProps = {}) override
+	{
+		CTextCursor Cursor;
+		SetCursor(&Cursor, 0, 0, Size, Flags);
+		Cursor.m_LineWidth = LineWidth;
+		TextEx(&Cursor, pText, StrLength);
+		if(TextSizeProps.m_pHeight != nullptr)
+			*TextSizeProps.m_pHeight = Cursor.Height();
+		if(TextSizeProps.m_pAlignedFontSize != nullptr)
+			*TextSizeProps.m_pAlignedFontSize = Cursor.m_AlignedFontSize;
+		if(TextSizeProps.m_pMaxCharacterHeightInLine != nullptr)
+			*TextSizeProps.m_pMaxCharacterHeightInLine = Cursor.m_MaxCharacterHeight;
+		if(TextSizeProps.m_pLineCount != nullptr)
+			*TextSizeProps.m_pLineCount = Cursor.m_LineCount;
+		return Cursor.m_LongestLineWidth;
+	}
+
+	STextBoundingBox TextBoundingBox(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, float LineSpacing = 0.0f, int Flags = 0) override
+	{
+		CTextCursor Cursor;
+		SetCursor(&Cursor, 0, 0, Size, Flags);
+		Cursor.m_LineWidth = LineWidth;
+		Cursor.m_LineSpacing = LineSpacing;
+		TextEx(&Cursor, pText, StrLength);
+		return Cursor.BoundingBox();
+	}
+
+	void TextColor(float r, float g, float b, float a) override
+	{
+		m_Color.r = r;
+		m_Color.g = g;
+		m_Color.b = b;
+		m_Color.a = a;
+	}
+
+	void TextColor(ColorRGBA rgb) override
+	{
+		m_Color = rgb;
+	}
+
+	void TextOutlineColor(float r, float g, float b, float a) override
+	{
+		m_OutlineColor.r = r;
+		m_OutlineColor.g = g;
+		m_OutlineColor.b = b;
+		m_OutlineColor.a = a;
+	}
+
+	void TextOutlineColor(ColorRGBA rgb) override
+	{
+		m_OutlineColor = rgb;
+	}
+
+	void TextSelectionColor(float r, float g, float b, float a) override
+	{
+		m_SelectionColor.r = r;
+		m_SelectionColor.g = g;
+		m_SelectionColor.b = b;
+		m_SelectionColor.a = a;
+	}
+
+	void TextSelectionColor(ColorRGBA rgb) override
+	{
+		m_SelectionColor = rgb;
+	}
+
+	ColorRGBA GetTextColor() const override
+	{
+		return m_Color;
+	}
+
+	ColorRGBA GetTextOutlineColor() const override
+	{
+		return m_OutlineColor;
+	}
+
+	ColorRGBA GetTextSelectionColor() const override
+	{
+		return m_SelectionColor;
+	}
+
+	void TextEx(CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		const unsigned OldRenderFlags = m_RenderFlags;
+		m_RenderFlags |= TEXT_RENDER_FLAG_ONE_TIME_USE;
+		STextContainerIndex TextCont;
+		CreateTextContainer(TextCont, pCursor, pText, Length);
+		m_RenderFlags = OldRenderFlags;
+		if(TextCont.Valid())
+		{
+			if((pCursor->m_Flags & TEXTFLAG_RENDER) != 0)
+			{
+				ColorRGBA TextColor = DefaultTextColor();
+				ColorRGBA TextColorOutline = DefaultTextOutlineColor();
+				RenderTextContainer(TextCont, TextColor, TextColorOutline);
+			}
+			DeleteTextContainer(TextCont);
+		}
+	}
+
+	bool CreateTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		dbg_assert(!TextContainerIndex.Valid(), "Text container index was not cleared.");
+
+		TextContainerIndex.Reset();
+		TextContainerIndex.m_Index = GetFreeTextContainerIndex();
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+		STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+		TextContainer.m_SingleTimeUse = (m_RenderFlags & TEXT_RENDER_FLAG_ONE_TIME_USE) != 0;
+		const vec2 FakeToScreen = vec2(Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0), Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
+		TextContainer.m_AlignedStartX = round_to_int(pCursor->m_X * FakeToScreen.x) / FakeToScreen.x;
+		TextContainer.m_AlignedStartY = round_to_int(pCursor->m_Y * FakeToScreen.y) / FakeToScreen.y;
+		TextContainer.m_X = pCursor->m_X;
+		TextContainer.m_Y = pCursor->m_Y;
+		TextContainer.m_Flags = pCursor->m_Flags;
+
+		if(pCursor->m_LineWidth <= 0)
+			TextContainer.m_RenderFlags = m_RenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE;
+		else
+			TextContainer.m_RenderFlags = m_RenderFlags;
+
+		AppendTextContainer(TextContainerIndex, pCursor, pText, Length);
+
+		const bool IsRendered = (pCursor->m_Flags & TEXTFLAG_RENDER) != 0;
+
+		if(TextContainer.m_StringInfo.m_vCharacterQuads.empty() && TextContainer.m_StringInfo.m_SelectionQuadContainerIndex == -1 && IsRendered)
+		{
+			FreeTextContainer(TextContainerIndex);
+			return false;
+		}
+		else
+		{
+			if(Graphics()->IsTextBufferingEnabled() && IsRendered && !TextContainer.m_StringInfo.m_vCharacterQuads.empty())
+			{
+				if((TextContainer.m_RenderFlags & TEXT_RENDER_FLAG_NO_AUTOMATIC_QUAD_UPLOAD) == 0)
+				{
+					UploadTextContainer(TextContainerIndex);
+				}
+			}
+
+			TextContainer.m_LineCount = pCursor->m_LineCount;
+			TextContainer.m_GlyphCount = pCursor->m_GlyphCount;
+			TextContainer.m_CharCount = pCursor->m_CharCount;
+			TextContainer.m_MaxLines = pCursor->m_MaxLines;
+			TextContainer.m_LineWidth = pCursor->m_LineWidth;
+			return true;
+		}
+	}
+
+	void AppendTextContainer(STextContainerIndex TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+		str_append(TextContainer.m_aDebugText, pText);
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+		const vec2 FakeToScreen = vec2(Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0), Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
+		const float CursorX = round_to_int(pCursor->m_X * FakeToScreen.x) / FakeToScreen.x;
+		const float CursorY = round_to_int(pCursor->m_Y * FakeToScreen.y) / FakeToScreen.y;
+		const int ActualSize = round_truncate(pCursor->m_FontSize * FakeToScreen.y);
+		pCursor->m_AlignedFontSize = ActualSize / FakeToScreen.y;
+		const float LineSpacing = pCursor->m_LineSpacing;
+
+		// string length
+		if(Length < 0)
+			Length = str_length(pText);
+		else
+			Length = minimum(Length, str_length(pText));
+
+		const char *pCurrent = pText;
+		const char *pEnd = pCurrent + Length;
+		const char *pEllipsis = "…";
+		const SGlyph *pEllipsisGlyph = nullptr;
+		if(pCursor->m_Flags & TEXTFLAG_ELLIPSIS_AT_END)
+		{
+			if(pCursor->m_LineWidth != -1 && pCursor->m_LineWidth < TextWidth(pCursor->m_FontSize, pText, -1, -1.0f))
+			{
+				pEllipsisGlyph = m_pGlyphMap->GetGlyph(0x2026, ActualSize); // …
+				if(pEllipsisGlyph == nullptr)
+				{
+					// no ellipsis char in font, just stop at end instead
+					pCursor->m_Flags &= ~TEXTFLAG_ELLIPSIS_AT_END;
+					pCursor->m_Flags |= TEXTFLAG_STOP_AT_END;
+				}
+			}
+		}
+
+		const unsigned RenderFlags = TextContainer.m_RenderFlags;
+
+		float DrawX = 0.0f, DrawY = 0.0f;
+		if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) != 0)
+		{
+			DrawX = pCursor->m_X;
+			DrawY = pCursor->m_Y;
+		}
+		else
+		{
+			DrawX = CursorX;
+			DrawY = CursorY;
+		}
+
+		int LineCount = pCursor->m_LineCount;
+
+		const bool IsRendered = (pCursor->m_Flags & TEXTFLAG_RENDER) != 0;
+
+		const float CursorInnerWidth = (((ScreenX1 - ScreenX0) / Graphics()->ScreenWidth())) * 2;
+		const float CursorOuterWidth = CursorInnerWidth * 2;
+		const float CursorOuterInnerDiff = (CursorOuterWidth - CursorInnerWidth) / 2;
+
+		std::vector<IGraphics::CQuadItem> vSelectionQuads;
+		bool SelectionStarted = false;
+		bool SelectionUsedPress = false;
+		bool SelectionUsedRelease = false;
+		int SelectionStartChar = -1;
+		int SelectionEndChar = -1;
+
+		const auto &&CheckInsideChar = [&](bool CheckOuter, vec2 CursorPos, float LastCharX, float LastCharWidth, float CharX, float CharWidth, float CharY) -> bool {
+			return (LastCharX - LastCharWidth / 2 <= CursorPos.x &&
+				       CharX + CharWidth / 2 > CursorPos.x &&
+				       CharY - pCursor->m_AlignedFontSize - LineSpacing <= CursorPos.y &&
+				       CharY + LineSpacing > CursorPos.y) ||
+			       (CheckOuter &&
+				       CharY - pCursor->m_AlignedFontSize + LineSpacing > CursorPos.y);
+		};
+		const auto &&CheckSelectionStart = [&](bool CheckOuter, vec2 CursorPos, int &SelectionChar, bool &SelectionUsedCase, float LastCharX, float LastCharWidth, float CharX, float CharWidth, float CharY) {
+			if(!SelectionStarted && !SelectionUsedCase)
+			{
+				if(CheckInsideChar(CheckOuter, CursorPos, LastCharX, LastCharWidth, CharX, CharWidth, CharY))
+				{
+					SelectionChar = pCursor->m_GlyphCount;
+					SelectionStarted = !SelectionStarted;
+					SelectionUsedCase = true;
+				}
+			}
+		};
+		const auto &&CheckOutsideChar = [&](bool CheckOuter, vec2 CursorPos, float CharX, float CharWidth, float CharY) -> bool {
+			return (CharX + CharWidth / 2 > CursorPos.x &&
+				       CharY - pCursor->m_AlignedFontSize - LineSpacing <= CursorPos.y &&
+				       CharY + LineSpacing > CursorPos.y) ||
+			       (CheckOuter &&
+				       CharY - LineSpacing <= CursorPos.y);
+		};
+		const auto &&CheckSelectionEnd = [&](bool CheckOuter, vec2 CursorPos, int &SelectionChar, bool &SelectionUsedCase, float CharX, float CharWidth, float CharY) {
+			if(SelectionStarted && !SelectionUsedCase)
+			{
+				if(CheckOutsideChar(CheckOuter, CursorPos, CharX, CharWidth, CharY))
+				{
+					SelectionChar = pCursor->m_GlyphCount;
+					SelectionStarted = !SelectionStarted;
+					SelectionUsedCase = true;
+				}
+			}
+		};
+
+		float LastSelX = DrawX;
+		float LastSelWidth = 0;
+		float LastCharX = DrawX;
+		float LastCharWidth = 0;
+
+		// Returns true if line was started
+		const auto &&StartNewLine = [&]() {
+			if(pCursor->m_MaxLines > 0 && LineCount >= pCursor->m_MaxLines)
+				return false;
+
+			DrawX = pCursor->m_StartX;
+			DrawY += pCursor->m_AlignedFontSize + pCursor->m_LineSpacing;
+			if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
+			{
+				DrawX = round_to_int(DrawX * FakeToScreen.x) / FakeToScreen.x; // realign
+				DrawY = round_to_int(DrawY * FakeToScreen.y) / FakeToScreen.y;
+			}
+			LastSelX = DrawX;
+			LastSelWidth = 0;
+			LastCharX = DrawX;
+			LastCharWidth = 0;
+			++LineCount;
+			return true;
+		};
+
+		if(pCursor->m_CalculateSelectionMode != TEXT_CURSOR_SELECTION_MODE_NONE || pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE)
+		{
+			if(IsRendered)
+				Graphics()->QuadContainerReset(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex);
+
+			// if in calculate mode, also calculate the cursor
+			if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE)
+				pCursor->m_CursorCharacter = -1;
+		}
+
+		IGraphics::CQuadItem aCursorQuads[2];
+		bool HasCursor = false;
+
+		const SGlyph *pLastGlyph = nullptr;
+		bool GotNewLine = false;
+		bool GotNewLineLast = false;
+
+		int ColorOption = 0;
+
+		while(pCurrent < pEnd && pCurrent != pEllipsis)
+		{
+			bool NewLine = false;
+			const char *pBatchEnd = pEnd;
+			if(pCursor->m_LineWidth > 0 && !(pCursor->m_Flags & TEXTFLAG_STOP_AT_END) && !(pCursor->m_Flags & TEXTFLAG_ELLIPSIS_AT_END))
+			{
+				int Wlen = minimum(WordLength(pCurrent), (int)(pEnd - pCurrent));
+				CTextCursor Compare = *pCursor;
+				Compare.m_CalculateSelectionMode = TEXT_CURSOR_SELECTION_MODE_NONE;
+				Compare.m_CursorMode = TEXT_CURSOR_CURSOR_MODE_NONE;
+				Compare.m_X = DrawX;
+				Compare.m_Y = DrawY;
+				Compare.m_Flags &= ~TEXTFLAG_RENDER;
+				Compare.m_Flags |= TEXTFLAG_DISALLOW_NEWLINE;
+				Compare.m_LineWidth = -1;
+				TextEx(&Compare, pCurrent, Wlen);
+
+				if(Compare.m_X - DrawX > pCursor->m_LineWidth)
+				{
+					// word can't be fitted in one line, cut it
+					CTextCursor Cutter = *pCursor;
+					Cutter.m_CalculateSelectionMode = TEXT_CURSOR_SELECTION_MODE_NONE;
+					Cutter.m_CursorMode = TEXT_CURSOR_CURSOR_MODE_NONE;
+					Cutter.m_GlyphCount = 0;
+					Cutter.m_CharCount = 0;
+					Cutter.m_X = DrawX;
+					Cutter.m_Y = DrawY;
+					Cutter.m_Flags &= ~TEXTFLAG_RENDER;
+					Cutter.m_Flags |= TEXTFLAG_STOP_AT_END | TEXTFLAG_DISALLOW_NEWLINE;
+
+					TextEx(&Cutter, pCurrent, Wlen);
+					Wlen = str_utf8_rewind(pCurrent, Cutter.m_CharCount); // rewind once to skip the last character that did not fit
+					NewLine = true;
+
+					if(Cutter.m_GlyphCount <= 3 && !GotNewLineLast) // if we can't place 3 chars of the word on this line, take the next
+						Wlen = 0;
+				}
+				else if(Compare.m_X - pCursor->m_StartX > pCursor->m_LineWidth && !GotNewLineLast)
+				{
+					NewLine = true;
+					Wlen = 0;
+				}
+
+				pBatchEnd = pCurrent + Wlen;
+			}
+
+			const char *pTmp = pCurrent;
+			int NextCharacter = str_utf8_decode(&pTmp);
+
+			while(pCurrent < pBatchEnd && pCurrent != pEllipsis)
+			{
+				const int PrevCharCount = pCursor->m_CharCount;
+				pCursor->m_CharCount += pTmp - pCurrent;
+				pCurrent = pTmp;
+				int Character = NextCharacter;
+				NextCharacter = str_utf8_decode(&pTmp);
+
+				if(Character == '\n')
+				{
+					if((pCursor->m_Flags & TEXTFLAG_DISALLOW_NEWLINE) == 0)
+					{
+						pLastGlyph = nullptr;
+						if(!StartNewLine())
+							break;
+						continue;
+					}
+					else
+					{
+						Character = ' ';
+					}
+				}
+
+				const SGlyph *pGlyph = m_pGlyphMap->GetGlyph(Character, ActualSize);
+				if(pGlyph)
+				{
+					const float Scale = 1.0f / pGlyph->m_FontSize;
+
+					const bool ApplyBearingX = !(((RenderFlags & TEXT_RENDER_FLAG_NO_X_BEARING) != 0) || (pCursor->m_GlyphCount == 0 && (RenderFlags & TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING) != 0));
+					const float Advance = ((((RenderFlags & TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH) != 0) ? (pGlyph->m_Width) : (pGlyph->m_AdvanceX + ((!ApplyBearingX) ? (-pGlyph->m_OffsetX) : 0.f)))) * Scale * pCursor->m_AlignedFontSize;
+
+					const float OutLineRealDiff = (pGlyph->m_Width - pGlyph->m_CharWidth) * Scale * pCursor->m_AlignedFontSize;
+
+					float CharKerning = 0.0f;
+					if((RenderFlags & TEXT_RENDER_FLAG_KERNING) != 0)
+						CharKerning = m_pGlyphMap->Kerning(pLastGlyph, pGlyph).x * Scale * pCursor->m_AlignedFontSize;
+					pLastGlyph = pGlyph;
+
+					if(pEllipsisGlyph != nullptr && pCursor->m_Flags & TEXTFLAG_ELLIPSIS_AT_END && pCurrent < pBatchEnd && pCurrent != pEllipsis)
+					{
+						float AdvanceEllipsis = ((((RenderFlags & TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH) != 0) ? (pEllipsisGlyph->m_Width) : (pEllipsisGlyph->m_AdvanceX + ((!ApplyBearingX) ? (-pEllipsisGlyph->m_OffsetX) : 0.f)))) * Scale * pCursor->m_AlignedFontSize;
+						float CharKerningEllipsis = 0.0f;
+						if((RenderFlags & TEXT_RENDER_FLAG_KERNING) != 0)
+						{
+							CharKerningEllipsis = m_pGlyphMap->Kerning(pGlyph, pEllipsisGlyph).x * Scale * pCursor->m_AlignedFontSize;
+						}
+						if(DrawX + CharKerning + Advance + CharKerningEllipsis + AdvanceEllipsis - pCursor->m_StartX > pCursor->m_LineWidth)
+						{
+							// we hit the end, only render ellipsis and finish
+							pTmp = pEllipsis;
+							NextCharacter = 0x2026;
+							continue;
+						}
+					}
+
+					if(pCursor->m_Flags & TEXTFLAG_STOP_AT_END && (DrawX + CharKerning) + Advance - pCursor->m_StartX > pCursor->m_LineWidth)
+					{
+						// we hit the end of the line, no more to render or count
+						pCurrent = pEnd;
+						break;
+					}
+
+					float BearingX = (!ApplyBearingX ? 0.f : pGlyph->m_OffsetX) * Scale * pCursor->m_AlignedFontSize;
+					float CharWidth = pGlyph->m_Width * Scale * pCursor->m_AlignedFontSize;
+
+					float BearingY = (((RenderFlags & TEXT_RENDER_FLAG_NO_Y_BEARING) != 0) ? 0.f : (pGlyph->m_OffsetY * Scale * pCursor->m_AlignedFontSize));
+					float CharHeight = pGlyph->m_Height * Scale * pCursor->m_AlignedFontSize;
+
+					if((RenderFlags & TEXT_RENDER_FLAG_NO_OVERSIZE) != 0)
+					{
+						if(CharHeight + BearingY > pCursor->m_AlignedFontSize)
+						{
+							BearingY = 0;
+							float ScaleChar = (CharHeight + BearingY) / pCursor->m_AlignedFontSize;
+							CharHeight = pCursor->m_AlignedFontSize;
+							CharWidth /= ScaleChar;
+						}
+					}
+
+					const float TmpY = (DrawY + pCursor->m_AlignedFontSize);
+					const float CharX = (DrawX + CharKerning) + BearingX;
+					const float CharY = TmpY - BearingY;
+
+					// Check if we have any color split
+					ColorRGBA Color = m_Color;
+					if(ColorOption < (int)pCursor->m_vColorSplits.size())
+					{
+						STextColorSplit &Split = pCursor->m_vColorSplits.at(ColorOption);
+						if(PrevCharCount >= Split.m_CharIndex && PrevCharCount < Split.m_CharIndex + Split.m_Length)
+							Color = Split.m_Color;
+						if(PrevCharCount >= (Split.m_CharIndex + Split.m_Length - 1))
+							ColorOption++;
+					}
+
+					// don't add text that isn't drawn, the color overwrite is used for that
+					if(Color.a != 0.f && IsRendered)
+					{
+						TextContainer.m_StringInfo.m_vCharacterQuads.emplace_back();
+						STextCharQuad &TextCharQuad = TextContainer.m_StringInfo.m_vCharacterQuads.back();
+
+						TextCharQuad.m_aVertices[0].m_X = CharX;
+						TextCharQuad.m_aVertices[0].m_Y = CharY;
+						TextCharQuad.m_aVertices[0].m_U = pGlyph->m_aUVs[0];
+						TextCharQuad.m_aVertices[0].m_V = pGlyph->m_aUVs[3];
+						TextCharQuad.m_aVertices[0].m_Color.r = (unsigned char)(Color.r * 255.f);
+						TextCharQuad.m_aVertices[0].m_Color.g = (unsigned char)(Color.g * 255.f);
+						TextCharQuad.m_aVertices[0].m_Color.b = (unsigned char)(Color.b * 255.f);
+						TextCharQuad.m_aVertices[0].m_Color.a = (unsigned char)(Color.a * 255.f);
+
+						TextCharQuad.m_aVertices[1].m_X = CharX + CharWidth;
+						TextCharQuad.m_aVertices[1].m_Y = CharY;
+						TextCharQuad.m_aVertices[1].m_U = pGlyph->m_aUVs[2];
+						TextCharQuad.m_aVertices[1].m_V = pGlyph->m_aUVs[3];
+						TextCharQuad.m_aVertices[1].m_Color.r = (unsigned char)(Color.r * 255.f);
+						TextCharQuad.m_aVertices[1].m_Color.g = (unsigned char)(Color.g * 255.f);
+						TextCharQuad.m_aVertices[1].m_Color.b = (unsigned char)(Color.b * 255.f);
+						TextCharQuad.m_aVertices[1].m_Color.a = (unsigned char)(Color.a * 255.f);
+
+						TextCharQuad.m_aVertices[2].m_X = CharX + CharWidth;
+						TextCharQuad.m_aVertices[2].m_Y = CharY - CharHeight;
+						TextCharQuad.m_aVertices[2].m_U = pGlyph->m_aUVs[2];
+						TextCharQuad.m_aVertices[2].m_V = pGlyph->m_aUVs[1];
+						TextCharQuad.m_aVertices[2].m_Color.r = (unsigned char)(Color.r * 255.f);
+						TextCharQuad.m_aVertices[2].m_Color.g = (unsigned char)(Color.g * 255.f);
+						TextCharQuad.m_aVertices[2].m_Color.b = (unsigned char)(Color.b * 255.f);
+						TextCharQuad.m_aVertices[2].m_Color.a = (unsigned char)(Color.a * 255.f);
+
+						TextCharQuad.m_aVertices[3].m_X = CharX;
+						TextCharQuad.m_aVertices[3].m_Y = CharY - CharHeight;
+						TextCharQuad.m_aVertices[3].m_U = pGlyph->m_aUVs[0];
+						TextCharQuad.m_aVertices[3].m_V = pGlyph->m_aUVs[1];
+						TextCharQuad.m_aVertices[3].m_Color.r = (unsigned char)(Color.r * 255.f);
+						TextCharQuad.m_aVertices[3].m_Color.g = (unsigned char)(Color.g * 255.f);
+						TextCharQuad.m_aVertices[3].m_Color.b = (unsigned char)(Color.b * 255.f);
+						TextCharQuad.m_aVertices[3].m_Color.a = (unsigned char)(Color.a * 255.f);
+					}
+
+					// calculate the full width from the last selection point to the end of this selection draw on screen
+					const float SelWidth = (CharX + maximum(Advance, CharWidth - OutLineRealDiff / 2)) - (LastSelX + LastSelWidth);
+					const float SelX = (LastSelX + LastSelWidth);
+
+					if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE)
+					{
+						if(pCursor->m_CursorCharacter == -1 && CheckInsideChar(pCursor->m_GlyphCount == 0, pCursor->m_ReleaseMouse, pCursor->m_GlyphCount == 0 ? std::numeric_limits<float>::lowest() : LastCharX, LastCharWidth, CharX, CharWidth, TmpY))
+						{
+							pCursor->m_CursorCharacter = pCursor->m_GlyphCount;
+						}
+					}
+
+					if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE)
+					{
+						if(pCursor->m_GlyphCount == 0)
+						{
+							CheckSelectionStart(true, pCursor->m_PressMouse, SelectionStartChar, SelectionUsedPress, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY);
+							CheckSelectionStart(true, pCursor->m_ReleaseMouse, SelectionEndChar, SelectionUsedRelease, std::numeric_limits<float>::lowest(), 0, CharX, CharWidth, TmpY);
+						}
+
+						// if selection didn't start and the mouse pos is at least on 50% of the right side of the character start
+						CheckSelectionStart(false, pCursor->m_PressMouse, SelectionStartChar, SelectionUsedPress, LastCharX, LastCharWidth, CharX, CharWidth, TmpY);
+						CheckSelectionStart(false, pCursor->m_ReleaseMouse, SelectionEndChar, SelectionUsedRelease, LastCharX, LastCharWidth, CharX, CharWidth, TmpY);
+						CheckSelectionEnd(false, pCursor->m_ReleaseMouse, SelectionEndChar, SelectionUsedRelease, CharX, CharWidth, TmpY);
+						CheckSelectionEnd(false, pCursor->m_PressMouse, SelectionStartChar, SelectionUsedPress, CharX, CharWidth, TmpY);
+					}
+					if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
+					{
+						if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
+						{
+							SelectionStarted = !SelectionStarted;
+							SelectionStartChar = pCursor->m_GlyphCount;
+							SelectionUsedPress = true;
+						}
+						if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
+						{
+							SelectionStarted = !SelectionStarted;
+							SelectionEndChar = pCursor->m_GlyphCount;
+							SelectionUsedRelease = true;
+						}
+					}
+
+					if(pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE)
+					{
+						if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
+						{
+							HasCursor = true;
+							aCursorQuads[0] = IGraphics::CQuadItem(SelX - CursorOuterInnerDiff, DrawY, CursorOuterWidth, pCursor->m_AlignedFontSize);
+							aCursorQuads[1] = IGraphics::CQuadItem(SelX, DrawY + CursorOuterInnerDiff, CursorInnerWidth, pCursor->m_AlignedFontSize - CursorOuterInnerDiff * 2);
+							pCursor->m_CursorRenderedPosition = vec2(SelX, DrawY);
+						}
+					}
+
+					pCursor->m_MaxCharacterHeight = maximum(pCursor->m_MaxCharacterHeight, CharHeight + BearingY);
+
+					if(NextCharacter == 0 && (RenderFlags & TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE) != 0 && Character != ' ')
+						DrawX += BearingX + CharKerning + CharWidth;
+					else
+						DrawX += Advance + CharKerning;
+
+					pCursor->m_GlyphCount++;
+
+					if(SelectionStarted && IsRendered)
+					{
+						vSelectionQuads.emplace_back(SelX, DrawY + (1.0f - pCursor->m_SelectionHeightFactor) * pCursor->m_AlignedFontSize, SelWidth, pCursor->m_SelectionHeightFactor * pCursor->m_AlignedFontSize);
+					}
+
+					LastSelX = SelX;
+					LastSelWidth = SelWidth;
+					LastCharX = CharX;
+					LastCharWidth = CharWidth;
+				}
+
+				pCursor->m_LongestLineWidth = maximum(pCursor->m_LongestLineWidth, DrawX - pCursor->m_StartX);
+			}
+
+			if(NewLine)
+			{
+				if(!StartNewLine())
+					break;
+				GotNewLine = true;
+				GotNewLineLast = true;
+			}
+			else
+				GotNewLineLast = false;
+		}
+
+		if(!TextContainer.m_StringInfo.m_vCharacterQuads.empty() && IsRendered)
+		{
+			// setup the buffers
+			if(Graphics()->IsTextBufferingEnabled())
+			{
+				const size_t DataSize = TextContainer.m_StringInfo.m_vCharacterQuads.size() * sizeof(STextCharQuad);
+				void *pUploadData = TextContainer.m_StringInfo.m_vCharacterQuads.data();
+
+				if(TextContainer.m_StringInfo.m_QuadBufferObjectIndex != -1 && (TextContainer.m_RenderFlags & TEXT_RENDER_FLAG_NO_AUTOMATIC_QUAD_UPLOAD) == 0)
+				{
+					Graphics()->RecreateBufferObject(TextContainer.m_StringInfo.m_QuadBufferObjectIndex, DataSize, pUploadData, TextContainer.m_SingleTimeUse ? IGraphics::EBufferObjectCreateFlags::BUFFER_OBJECT_CREATE_FLAGS_ONE_TIME_USE_BIT : 0);
+					Graphics()->IndicesNumRequiredNotify(TextContainer.m_StringInfo.m_vCharacterQuads.size() * 6);
+				}
+			}
+		}
+
+		if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE)
+		{
+			pCursor->m_SelectionStart = -1;
+			pCursor->m_SelectionEnd = -1;
+
+			if(SelectionStarted)
+			{
+				CheckSelectionEnd(true, pCursor->m_ReleaseMouse, SelectionEndChar, SelectionUsedRelease, std::numeric_limits<float>::max(), 0, DrawY + pCursor->m_AlignedFontSize);
+				CheckSelectionEnd(true, pCursor->m_PressMouse, SelectionStartChar, SelectionUsedPress, std::numeric_limits<float>::max(), 0, DrawY + pCursor->m_AlignedFontSize);
+			}
+		}
+		else if(pCursor->m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_SET)
+		{
+			if((int)pCursor->m_GlyphCount == pCursor->m_SelectionStart)
+			{
+				SelectionStarted = !SelectionStarted;
+				SelectionStartChar = pCursor->m_GlyphCount;
+				SelectionUsedPress = true;
+			}
+			if((int)pCursor->m_GlyphCount == pCursor->m_SelectionEnd)
+			{
+				SelectionStarted = !SelectionStarted;
+				SelectionEndChar = pCursor->m_GlyphCount;
+				SelectionUsedRelease = true;
+			}
+		}
+
+		if(pCursor->m_CursorMode != TEXT_CURSOR_CURSOR_MODE_NONE)
+		{
+			if(pCursor->m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE && pCursor->m_CursorCharacter == -1 && CheckOutsideChar(true, pCursor->m_ReleaseMouse, std::numeric_limits<float>::max(), 0, DrawY + pCursor->m_AlignedFontSize))
+			{
+				pCursor->m_CursorCharacter = pCursor->m_GlyphCount;
+			}
+
+			if((int)pCursor->m_GlyphCount == pCursor->m_CursorCharacter)
+			{
+				HasCursor = true;
+				aCursorQuads[0] = IGraphics::CQuadItem((LastSelX + LastSelWidth) - CursorOuterInnerDiff, DrawY, CursorOuterWidth, pCursor->m_AlignedFontSize);
+				aCursorQuads[1] = IGraphics::CQuadItem((LastSelX + LastSelWidth), DrawY + CursorOuterInnerDiff, CursorInnerWidth, pCursor->m_AlignedFontSize - CursorOuterInnerDiff * 2);
+				pCursor->m_CursorRenderedPosition = vec2(LastSelX + LastSelWidth, DrawY);
+			}
+		}
+
+		const bool HasSelection = !vSelectionQuads.empty() && SelectionUsedPress && SelectionUsedRelease;
+		if((HasSelection || HasCursor) && IsRendered)
+		{
+			Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+			if(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex == -1)
+				TextContainer.m_StringInfo.m_SelectionQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+			if(HasCursor)
+				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, aCursorQuads, 2);
+			if(HasSelection)
+				Graphics()->QuadContainerAddQuads(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, vSelectionQuads.data(), (int)vSelectionQuads.size());
+			Graphics()->QuadContainerUpload(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex);
+
+			TextContainer.m_HasCursor = HasCursor;
+			TextContainer.m_HasSelection = HasSelection;
+			TextContainer.m_ForceCursorRendering = pCursor->m_ForceCursorRendering;
+
+			if(HasSelection)
+			{
+				pCursor->m_SelectionStart = SelectionStartChar;
+				pCursor->m_SelectionEnd = SelectionEndChar;
+			}
+			else
+			{
+				pCursor->m_SelectionStart = -1;
+				pCursor->m_SelectionEnd = -1;
+			}
+		}
+
+		// even if no text is drawn the cursor position will be adjusted
+		pCursor->m_X = DrawX;
+		pCursor->m_LineCount = LineCount;
+
+		if(GotNewLine)
+			pCursor->m_Y = DrawY;
+
+		TextContainer.m_BoundingBox = pCursor->BoundingBox();
+	}
+
+	bool CreateOrAppendTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		if(TextContainerIndex.Valid())
+		{
+			AppendTextContainer(TextContainerIndex, pCursor, pText, Length);
+			return true;
+		}
+		else
+		{
+			return CreateTextContainer(TextContainerIndex, pCursor, pText, Length);
+		}
+	}
+
+	// just deletes and creates text container
+	void RecreateTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		DeleteTextContainer(TextContainerIndex);
+		CreateTextContainer(TextContainerIndex, pCursor, pText, Length);
+	}
+
+	void RecreateTextContainerSoft(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) override
+	{
+		STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+		TextContainer.m_StringInfo.m_vCharacterQuads.clear();
+		// the text buffer gets then recreated by the appended quads
+		AppendTextContainer(TextContainerIndex, pCursor, pText, Length);
+	}
+
+	void DeleteTextContainer(STextContainerIndex &TextContainerIndex) override
+	{
+		if(!TextContainerIndex.Valid())
+			return;
+
+		STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+		if(Graphics()->IsTextBufferingEnabled())
+			Graphics()->DeleteBufferContainer(TextContainer.m_StringInfo.m_QuadBufferContainerIndex, true);
+		Graphics()->DeleteQuadContainer(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex);
+		FreeTextContainer(TextContainerIndex);
+	}
+
+	void UploadTextContainer(STextContainerIndex TextContainerIndex) override
+	{
+		if(Graphics()->IsTextBufferingEnabled())
+		{
+			STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+			size_t DataSize = TextContainer.m_StringInfo.m_vCharacterQuads.size() * sizeof(STextCharQuad);
+			void *pUploadData = TextContainer.m_StringInfo.m_vCharacterQuads.data();
+			TextContainer.m_StringInfo.m_QuadBufferObjectIndex = Graphics()->CreateBufferObject(DataSize, pUploadData, TextContainer.m_SingleTimeUse ? IGraphics::EBufferObjectCreateFlags::BUFFER_OBJECT_CREATE_FLAGS_ONE_TIME_USE_BIT : 0);
+
+			m_DefaultTextContainerInfo.m_VertBufferBindingIndex = TextContainer.m_StringInfo.m_QuadBufferObjectIndex;
+
+			TextContainer.m_StringInfo.m_QuadBufferContainerIndex = Graphics()->CreateBufferContainer(&m_DefaultTextContainerInfo);
+			Graphics()->IndicesNumRequiredNotify(TextContainer.m_StringInfo.m_vCharacterQuads.size() * 6);
+		}
+	}
+
+	void RenderTextContainer(STextContainerIndex TextContainerIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor) override
+	{
+		const STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+
+		if(!TextContainer.m_StringInfo.m_vCharacterQuads.empty())
+		{
+			if(Graphics()->IsTextBufferingEnabled())
+			{
+				Graphics()->TextureClear();
+				// render buffered text
+				Graphics()->RenderText(TextContainer.m_StringInfo.m_QuadBufferContainerIndex, TextContainer.m_StringInfo.m_vCharacterQuads.size(), m_pGlyphMap->TextureDimension(), m_pGlyphMap->Texture(CGlyphMap::FONT_TEXTURE_FILL).Id(), m_pGlyphMap->Texture(CGlyphMap::FONT_TEXTURE_OUTLINE).Id(), TextColor, TextOutlineColor);
+			}
+			else
+			{
+				// render tiles
+				const float UVScale = 1.0f / m_pGlyphMap->TextureDimension();
+
+				Graphics()->FlushVertices();
+				Graphics()->TextureSet(m_pGlyphMap->Texture(CGlyphMap::FONT_TEXTURE_OUTLINE));
+
+				Graphics()->QuadsBegin();
+
+				for(const STextCharQuad &TextCharQuad : TextContainer.m_StringInfo.m_vCharacterQuads)
+				{
+					Graphics()->SetColor(TextCharQuad.m_aVertices[0].m_Color.r / 255.f * TextOutlineColor.r, TextCharQuad.m_aVertices[0].m_Color.g / 255.f * TextOutlineColor.g, TextCharQuad.m_aVertices[0].m_Color.b / 255.f * TextOutlineColor.b, TextCharQuad.m_aVertices[0].m_Color.a / 255.f * TextOutlineColor.a);
+					Graphics()->QuadsSetSubset(TextCharQuad.m_aVertices[0].m_U * UVScale, TextCharQuad.m_aVertices[0].m_V * UVScale, TextCharQuad.m_aVertices[2].m_U * UVScale, TextCharQuad.m_aVertices[2].m_V * UVScale);
+					IGraphics::CQuadItem QuadItem(TextCharQuad.m_aVertices[0].m_X, TextCharQuad.m_aVertices[0].m_Y, TextCharQuad.m_aVertices[1].m_X - TextCharQuad.m_aVertices[0].m_X, TextCharQuad.m_aVertices[2].m_Y - TextCharQuad.m_aVertices[0].m_Y);
+					Graphics()->QuadsDrawTL(&QuadItem, 1);
+				}
+
+				if(TextColor.a != 0)
+				{
+					Graphics()->QuadsEndKeepVertices();
+					Graphics()->TextureSet(m_pGlyphMap->Texture(CGlyphMap::FONT_TEXTURE_FILL));
+
+					int TextCharQuadIndex = 0;
+					for(const STextCharQuad &TextCharQuad : TextContainer.m_StringInfo.m_vCharacterQuads)
+					{
+						unsigned char CR = (unsigned char)((float)(TextCharQuad.m_aVertices[0].m_Color.r) * TextColor.r);
+						unsigned char CG = (unsigned char)((float)(TextCharQuad.m_aVertices[0].m_Color.g) * TextColor.g);
+						unsigned char CB = (unsigned char)((float)(TextCharQuad.m_aVertices[0].m_Color.b) * TextColor.b);
+						unsigned char CA = (unsigned char)((float)(TextCharQuad.m_aVertices[0].m_Color.a) * TextColor.a);
+						Graphics()->ChangeColorOfQuadVertices(TextCharQuadIndex, CR, CG, CB, CA);
+						++TextCharQuadIndex;
+					}
+
+					// render non outlined
+					Graphics()->QuadsDrawCurrentVertices(false);
+				}
+				else
+					Graphics()->QuadsEnd();
+
+				// reset
+				Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+			}
+		}
+
+		if(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex != -1)
+		{
+			if(TextContainer.m_HasSelection)
+			{
+				Graphics()->TextureClear();
+				Graphics()->SetColor(m_SelectionColor);
+				Graphics()->RenderQuadContainerEx(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, TextContainer.m_HasCursor ? 2 : 0, -1, 0, 0);
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+
+			if(TextContainer.m_HasCursor)
+			{
+				const auto CurTime = time_get_nanoseconds();
+
+				Graphics()->TextureClear();
+				if(TextContainer.m_ForceCursorRendering || (CurTime - m_CursorRenderTime) > 500ms)
+				{
+					Graphics()->SetColor(TextOutlineColor);
+					Graphics()->RenderQuadContainerEx(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, 0, 1, 0, 0);
+					Graphics()->SetColor(TextColor);
+					Graphics()->RenderQuadContainerEx(TextContainer.m_StringInfo.m_SelectionQuadContainerIndex, 1, 1, 0, 0);
+				}
+				if(TextContainer.m_ForceCursorRendering)
+					m_CursorRenderTime = CurTime - 501ms;
+				else if((CurTime - m_CursorRenderTime) > 1s)
+					m_CursorRenderTime = time_get_nanoseconds();
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+	}
+
+	void RenderTextContainer(STextContainerIndex TextContainerIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor, float X, float Y) override
+	{
+		STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+
+		// remap the current screen, after render revert the change again
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+		if((TextContainer.m_RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
+		{
+			const vec2 FakeToScreen = vec2(Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0), Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
+			const float AlignedX = round_to_int((TextContainer.m_X + X) * FakeToScreen.x) / FakeToScreen.x;
+			const float AlignedY = round_to_int((TextContainer.m_Y + Y) * FakeToScreen.y) / FakeToScreen.y;
+			X = AlignedX - TextContainer.m_AlignedStartX;
+			Y = AlignedY - TextContainer.m_AlignedStartY;
+		}
+
+		TextContainer.m_BoundingBox.m_X = X;
+		TextContainer.m_BoundingBox.m_Y = Y;
+
+		Graphics()->MapScreen(ScreenX0 - X, ScreenY0 - Y, ScreenX1 - X, ScreenY1 - Y);
+		RenderTextContainer(TextContainerIndex, TextColor, TextOutlineColor);
+		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	}
+
+	STextBoundingBox GetBoundingBoxTextContainer(STextContainerIndex TextContainerIndex) override
+	{
+		const STextContainer &TextContainer = GetTextContainer(TextContainerIndex);
+		return TextContainer.m_BoundingBox;
+	}
+
+	void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) override
+	{
+		m_pGlyphMap->UploadEntityLayerText(pTexBuff, PixelSize, TexWidth, TexHeight, TexSubWidth, TexSubHeight, pText, Length, x, y, FontSize);
+	}
+
+	int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth) const override
+	{
+		const int WidthOfText = CalculateTextWidth(pText, TextLength, 0, 100);
+
+		int FontSize = 100.0f / ((float)WidthOfText / (float)MaxWidth);
+		if(MaxSize > 0 && FontSize > MaxSize)
+			FontSize = MaxSize;
+
+		return FontSize;
+	}
+
+	float GetGlyphOffsetX(int FontSize, char TextCharacter) const override
+	{
+		if(m_pGlyphMap->DefaultFace() == nullptr)
+			return -1.0f;
+
+		FT_Set_Pixel_Sizes(m_pGlyphMap->DefaultFace(), 0, FontSize);
+		const char *pTmp = &TextCharacter;
+		const int NextCharacter = str_utf8_decode(&pTmp);
+
+		if(NextCharacter)
+		{
+#if FREETYPE_MAJOR >= 2 && FREETYPE_MINOR >= 7 && (FREETYPE_MINOR > 7 || FREETYPE_PATCH >= 1)
+			const FT_Int32 FTFlags = FT_LOAD_BITMAP_METRICS_ONLY | FT_LOAD_NO_BITMAP;
+#else
+			const FT_Int32 FTFlags = FT_LOAD_RENDER | FT_LOAD_NO_BITMAP;
+#endif
+			if(FT_Load_Char(m_pGlyphMap->DefaultFace(), NextCharacter, FTFlags))
+			{
+				log_debug("textrender", "Error loading glyph. Chr=%d", NextCharacter);
+				return -1.0f;
+			}
+
+			return (float)(m_pGlyphMap->DefaultFace()->glyph->metrics.horiBearingX >> 6);
+		}
+		return 0.0f;
+	}
+
+	int CalculateTextWidth(const char *pText, int TextLength, int FontWidth, int FontHeight) const override
+	{
+		if(m_pGlyphMap->DefaultFace() == nullptr)
+			return 0;
+
+		const char *pCurrent = pText;
+		const char *pEnd = pCurrent + TextLength;
+
+		int WidthOfText = 0;
+		FT_Set_Pixel_Sizes(m_pGlyphMap->DefaultFace(), FontWidth, FontHeight);
+		while(pCurrent < pEnd)
+		{
+			const char *pTmp = pCurrent;
+			const int NextCharacter = str_utf8_decode(&pTmp);
+			if(NextCharacter)
+			{
+#if FREETYPE_MAJOR >= 2 && FREETYPE_MINOR >= 7 && (FREETYPE_MINOR > 7 || FREETYPE_PATCH >= 1)
+				const FT_Int32 FTFlags = FT_LOAD_BITMAP_METRICS_ONLY | FT_LOAD_NO_BITMAP;
+#else
+				const FT_Int32 FTFlags = FT_LOAD_RENDER | FT_LOAD_NO_BITMAP;
+#endif
+				if(FT_Load_Char(m_pGlyphMap->DefaultFace(), NextCharacter, FTFlags))
+				{
+					log_debug("textrender", "Error loading glyph. Chr=%d", NextCharacter);
+					pCurrent = pTmp;
+					continue;
+				}
+
+				WidthOfText += (m_pGlyphMap->DefaultFace()->glyph->metrics.width >> 6) + 1;
+			}
+			pCurrent = pTmp;
+		}
+
+		return WidthOfText;
+	}
+
+	void OnPreWindowResize() override
+	{
+		for(auto *pTextContainer : m_vpTextContainers)
+		{
+			if(pTextContainer->m_ContainerIndex.Valid() && pTextContainer->m_ContainerIndex.m_UseCount.use_count() <= 1)
+			{
+				log_error("textrender", "Found non empty text container with index %d with %" PRIzu " quads '%s'", pTextContainer->m_StringInfo.m_QuadBufferContainerIndex, pTextContainer->m_StringInfo.m_vCharacterQuads.size(), pTextContainer->m_aDebugText);
+				dbg_assert(false, "Text container was forgotten by the implementation (the index was overwritten).");
+			}
+		}
+	}
+
+	void OnWindowResize() override
+	{
+		bool HasNonEmptyTextContainer = false;
+		for(auto *pTextContainer : m_vpTextContainers)
+		{
+			if(pTextContainer->m_StringInfo.m_QuadBufferContainerIndex != -1)
+			{
+				log_error("textrender", "Found non empty text container with index %d with %" PRIzu " quads '%s'", pTextContainer->m_StringInfo.m_QuadBufferContainerIndex, pTextContainer->m_StringInfo.m_vCharacterQuads.size(), pTextContainer->m_aDebugText);
+				log_error("textrender", "The text container index was in use by %d ", (int)pTextContainer->m_ContainerIndex.m_UseCount.use_count());
+				HasNonEmptyTextContainer = true;
+			}
+		}
+
+		dbg_assert(!HasNonEmptyTextContainer, "text container was not empty");
+	}
+};
+
+IEngineTextRender *CreateEngineTextRender() { return new CTextRender; }
diff --git a/src_bkp/engine/client/updater.cpp b/src_bkp/engine/client/updater.cpp
new file mode 100644
index 0000000000..3a6b6e389b
--- /dev/null
+++ b/src_bkp/engine/client/updater.cpp
@@ -0,0 +1,375 @@
+#include "updater.h"
+
+#include <base/system.h>
+
+#include <engine/client.h>
+#include <engine/engine.h>
+#include <engine/external/json-parser/json.h>
+#include <engine/shared/http.h>
+#include <engine/shared/json.h>
+#include <engine/storage.h>
+
+#include <game/version.h>
+
+#include <cstdlib> // system
+
+using std::map;
+using std::string;
+
+class CUpdaterFetchTask : public CHttpRequest
+{
+	char m_aBuf[256];
+	char m_aBuf2[256];
+	CUpdater *m_pUpdater;
+
+	void OnProgress() override;
+
+protected:
+	int OnCompletion(int State) override;
+
+public:
+	CUpdaterFetchTask(CUpdater *pUpdater, const char *pFile, const char *pDestPath);
+};
+
+static const char *GetUpdaterUrl(char *pBuf, int BufSize, const char *pFile)
+{
+	str_format(pBuf, BufSize, "https://update.ddnet.org/%s", pFile);
+	return pBuf;
+}
+
+static const char *GetUpdaterDestPath(char *pBuf, int BufSize, const char *pFile, const char *pDestPath)
+{
+	if(!pDestPath)
+	{
+		pDestPath = pFile;
+	}
+	str_format(pBuf, BufSize, "update/%s", pDestPath);
+	return pBuf;
+}
+
+CUpdaterFetchTask::CUpdaterFetchTask(CUpdater *pUpdater, const char *pFile, const char *pDestPath) :
+	CHttpRequest(GetUpdaterUrl(m_aBuf, sizeof(m_aBuf), pFile)),
+	m_pUpdater(pUpdater)
+{
+	WriteToFile(pUpdater->m_pStorage, GetUpdaterDestPath(m_aBuf2, sizeof(m_aBuf2), pFile, pDestPath), -2);
+}
+
+void CUpdaterFetchTask::OnProgress()
+{
+	CLockScope ls(m_pUpdater->m_Lock);
+	str_copy(m_pUpdater->m_aStatus, Dest());
+	m_pUpdater->m_Percent = Progress();
+}
+
+int CUpdaterFetchTask::OnCompletion(int State)
+{
+	State = CHttpRequest::OnCompletion(State);
+
+	const char *pFileName = 0;
+	for(const char *pPath = Dest(); *pPath; pPath++)
+		if(*pPath == '/')
+			pFileName = pPath + 1;
+	pFileName = pFileName ? pFileName : Dest();
+	if(!str_comp(pFileName, "update.json"))
+	{
+		if(State == HTTP_DONE)
+			m_pUpdater->SetCurrentState(IUpdater::GOT_MANIFEST);
+		else if(State == HTTP_ERROR)
+			m_pUpdater->SetCurrentState(IUpdater::FAIL);
+	}
+	else if(!str_comp(pFileName, m_pUpdater->m_aLastFile))
+	{
+		if(State == HTTP_DONE)
+			m_pUpdater->SetCurrentState(IUpdater::MOVE_FILES);
+		else if(State == HTTP_ERROR)
+			m_pUpdater->SetCurrentState(IUpdater::FAIL);
+	}
+
+	return State;
+}
+
+CUpdater::CUpdater()
+{
+	m_pClient = NULL;
+	m_pStorage = NULL;
+	m_pEngine = NULL;
+	m_State = CLEAN;
+	m_Percent = 0;
+
+	IStorage::FormatTmpPath(m_aClientExecTmp, sizeof(m_aClientExecTmp), CLIENT_EXEC);
+	IStorage::FormatTmpPath(m_aServerExecTmp, sizeof(m_aServerExecTmp), SERVER_EXEC);
+}
+
+void CUpdater::Init()
+{
+	m_pClient = Kernel()->RequestInterface<IClient>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+}
+
+void CUpdater::SetCurrentState(int NewState)
+{
+	CLockScope ls(m_Lock);
+	m_State = NewState;
+}
+
+int CUpdater::GetCurrentState()
+{
+	CLockScope ls(m_Lock);
+	return m_State;
+}
+
+void CUpdater::GetCurrentFile(char *pBuf, int BufSize)
+{
+	CLockScope ls(m_Lock);
+	str_copy(pBuf, m_aStatus, BufSize);
+}
+
+int CUpdater::GetCurrentPercent()
+{
+	CLockScope ls(m_Lock);
+	return m_Percent;
+}
+
+void CUpdater::FetchFile(const char *pFile, const char *pDestPath)
+{
+	m_pEngine->AddJob(std::make_shared<CUpdaterFetchTask>(this, pFile, pDestPath));
+}
+
+bool CUpdater::MoveFile(const char *pFile)
+{
+	char aBuf[256];
+	size_t len = str_length(pFile);
+	bool Success = true;
+
+#if !defined(CONF_FAMILY_WINDOWS)
+	if(!str_comp_nocase(pFile + len - 4, ".dll"))
+		return Success;
+#endif
+
+#if !defined(CONF_PLATFORM_LINUX)
+	if(!str_comp_nocase(pFile + len - 3, ".so"))
+		return Success;
+#endif
+
+	if(!str_comp_nocase(pFile + len - 4, ".dll") || !str_comp_nocase(pFile + len - 4, ".ttf") || !str_comp_nocase(pFile + len - 3, ".so"))
+	{
+		str_format(aBuf, sizeof(aBuf), "%s.old", pFile);
+		m_pStorage->RenameBinaryFile(pFile, aBuf);
+		str_format(aBuf, sizeof(aBuf), "update/%s", pFile);
+		Success &= m_pStorage->RenameBinaryFile(aBuf, pFile);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf), "update/%s", pFile);
+		Success &= m_pStorage->RenameBinaryFile(aBuf, pFile);
+	}
+
+	return Success;
+}
+
+void CUpdater::Update()
+{
+	switch(m_State)
+	{
+	case IUpdater::GOT_MANIFEST:
+		PerformUpdate();
+		break;
+	case IUpdater::MOVE_FILES:
+		CommitUpdate();
+		break;
+	default:
+		return;
+	}
+}
+
+void CUpdater::AddFileJob(const char *pFile, bool Job)
+{
+	m_FileJobs[string(pFile)] = Job;
+}
+
+bool CUpdater::ReplaceClient()
+{
+	dbg_msg("updater", "replacing " PLAT_CLIENT_EXEC);
+	bool Success = true;
+	char aPath[IO_MAX_PATH_LENGTH];
+
+	// Replace running executable by renaming twice...
+	m_pStorage->RemoveBinaryFile(CLIENT_EXEC ".old");
+	Success &= m_pStorage->RenameBinaryFile(PLAT_CLIENT_EXEC, CLIENT_EXEC ".old");
+	str_format(aPath, sizeof(aPath), "update/%s", m_aClientExecTmp);
+	Success &= m_pStorage->RenameBinaryFile(aPath, PLAT_CLIENT_EXEC);
+#if !defined(CONF_FAMILY_WINDOWS)
+	m_pStorage->GetBinaryPath(PLAT_CLIENT_EXEC, aPath, sizeof(aPath));
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "chmod +x %s", aPath);
+	if(system(aBuf))
+	{
+		dbg_msg("updater", "ERROR: failed to set client executable bit");
+		Success = false;
+	}
+#endif
+	return Success;
+}
+
+bool CUpdater::ReplaceServer()
+{
+	dbg_msg("updater", "replacing " PLAT_SERVER_EXEC);
+	bool Success = true;
+	char aPath[IO_MAX_PATH_LENGTH];
+
+	//Replace running executable by renaming twice...
+	m_pStorage->RemoveBinaryFile(SERVER_EXEC ".old");
+	Success &= m_pStorage->RenameBinaryFile(PLAT_SERVER_EXEC, SERVER_EXEC ".old");
+	str_format(aPath, sizeof(aPath), "update/%s", m_aServerExecTmp);
+	Success &= m_pStorage->RenameBinaryFile(aPath, PLAT_SERVER_EXEC);
+#if !defined(CONF_FAMILY_WINDOWS)
+	m_pStorage->GetBinaryPath(PLAT_SERVER_EXEC, aPath, sizeof(aPath));
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "chmod +x %s", aPath);
+	if(system(aBuf))
+	{
+		dbg_msg("updater", "ERROR: failed to set server executable bit");
+		Success = false;
+	}
+#endif
+	return Success;
+}
+
+void CUpdater::ParseUpdate()
+{
+	char aPath[IO_MAX_PATH_LENGTH];
+	void *pBuf;
+	unsigned Length;
+	if(!m_pStorage->ReadFile(m_pStorage->GetBinaryPath("update/update.json", aPath, sizeof(aPath)), IStorage::TYPE_ABSOLUTE, &pBuf, &Length))
+		return;
+
+	json_value *pVersions = json_parse((json_char *)pBuf, Length);
+	free(pBuf);
+
+	if(pVersions && pVersions->type == json_array)
+	{
+		for(int i = 0; i < json_array_length(pVersions); i++)
+		{
+			const json_value *pTemp;
+			const json_value *pCurrent = json_array_get(pVersions, i);
+			if(str_comp(json_string_get(json_object_get(pCurrent, "version")), GAME_RELEASE_VERSION))
+			{
+				if(json_boolean_get(json_object_get(pCurrent, "client")))
+					m_ClientUpdate = true;
+				if(json_boolean_get(json_object_get(pCurrent, "server")))
+					m_ServerUpdate = true;
+				if((pTemp = json_object_get(pCurrent, "download"))->type == json_array)
+				{
+					for(int j = 0; j < json_array_length(pTemp); j++)
+						AddFileJob(json_string_get(json_array_get(pTemp, j)), true);
+				}
+				if((pTemp = json_object_get(pCurrent, "remove"))->type == json_array)
+				{
+					for(int j = 0; j < json_array_length(pTemp); j++)
+						AddFileJob(json_string_get(json_array_get(pTemp, j)), false);
+				}
+			}
+			else
+				break;
+		}
+	}
+}
+
+void CUpdater::InitiateUpdate()
+{
+	m_State = GETTING_MANIFEST;
+	FetchFile("update.json");
+}
+
+void CUpdater::PerformUpdate()
+{
+	m_State = PARSING_UPDATE;
+	dbg_msg("updater", "parsing update.json");
+	ParseUpdate();
+	m_State = DOWNLOADING;
+
+	const char *pLastFile;
+	pLastFile = "";
+	for(map<string, bool>::reverse_iterator it = m_FileJobs.rbegin(); it != m_FileJobs.rend(); ++it)
+	{
+		if(it->second)
+		{
+			pLastFile = it->first.c_str();
+			break;
+		}
+	}
+
+	for(auto &FileJob : m_FileJobs)
+	{
+		if(FileJob.second)
+		{
+			const char *pFile = FileJob.first.c_str();
+			size_t len = str_length(pFile);
+			if(!str_comp_nocase(pFile + len - 4, ".dll"))
+			{
+#if defined(CONF_FAMILY_WINDOWS)
+				char aBuf[512];
+				str_copy(aBuf, pFile, sizeof(aBuf)); // SDL
+				str_copy(aBuf + len - 4, "-" PLAT_NAME, sizeof(aBuf) - len + 4); // -win32
+				str_append(aBuf, pFile + len - 4); // .dll
+				FetchFile(aBuf, pFile);
+#endif
+				// Ignore DLL downloads on other platforms
+			}
+			else if(!str_comp_nocase(pFile + len - 3, ".so"))
+			{
+#if defined(CONF_PLATFORM_LINUX)
+				char aBuf[512];
+				str_copy(aBuf, pFile, sizeof(aBuf)); // libsteam_api
+				str_copy(aBuf + len - 3, "-" PLAT_NAME, sizeof(aBuf) - len + 3); // -linux-x86_64
+				str_append(aBuf, pFile + len - 3); // .so
+				FetchFile(aBuf, pFile);
+#endif
+				// Ignore DLL downloads on other platforms, on Linux we statically link anyway
+			}
+			else
+			{
+				FetchFile(pFile);
+			}
+			pLastFile = pFile;
+		}
+		else
+			m_pStorage->RemoveBinaryFile(FileJob.first.c_str());
+	}
+
+	if(m_ServerUpdate)
+	{
+		FetchFile(PLAT_SERVER_DOWN, m_aServerExecTmp);
+		pLastFile = m_aServerExecTmp;
+	}
+	if(m_ClientUpdate)
+	{
+		FetchFile(PLAT_CLIENT_DOWN, m_aClientExecTmp);
+		pLastFile = m_aClientExecTmp;
+	}
+
+	str_copy(m_aLastFile, pLastFile);
+}
+
+void CUpdater::CommitUpdate()
+{
+	bool Success = true;
+
+	for(auto &FileJob : m_FileJobs)
+		if(FileJob.second)
+			Success &= MoveFile(FileJob.first.c_str());
+
+	if(m_ClientUpdate)
+		Success &= ReplaceClient();
+	if(m_ServerUpdate)
+		Success &= ReplaceServer();
+	if(!Success)
+		m_State = FAIL;
+	else if(m_pClient->State() == IClient::STATE_ONLINE || m_pClient->EditorHasUnsavedData())
+		m_State = NEED_RESTART;
+	else
+	{
+		m_pClient->Restart();
+	}
+}
diff --git a/src_bkp/engine/client/updater.h b/src_bkp/engine/client/updater.h
new file mode 100644
index 0000000000..0b5c71c1d5
--- /dev/null
+++ b/src_bkp/engine/client/updater.h
@@ -0,0 +1,84 @@
+#ifndef ENGINE_CLIENT_UPDATER_H
+#define ENGINE_CLIENT_UPDATER_H
+
+#include <base/lock.h>
+
+#include <engine/updater.h>
+
+#include <map>
+#include <string>
+
+#define CLIENT_EXEC "DDNet"
+#define SERVER_EXEC "DDNet-Server"
+
+#if defined(CONF_FAMILY_WINDOWS)
+#define PLAT_EXT ".exe"
+#define PLAT_NAME CONF_PLATFORM_STRING
+#elif defined(CONF_FAMILY_UNIX)
+#define PLAT_EXT ""
+#if defined(CONF_ARCH_IA32)
+#define PLAT_NAME CONF_PLATFORM_STRING "-x86"
+#elif defined(CONF_ARCH_AMD64)
+#define PLAT_NAME CONF_PLATFORM_STRING "-x86_64"
+#else
+#define PLAT_NAME CONF_PLATFORM_STRING "-unsupported"
+#endif
+#else
+#define PLAT_EXT ""
+#define PLAT_NAME "unsupported-unsupported"
+#endif
+
+#define PLAT_CLIENT_DOWN CLIENT_EXEC "-" PLAT_NAME PLAT_EXT
+#define PLAT_SERVER_DOWN SERVER_EXEC "-" PLAT_NAME PLAT_EXT
+
+#define PLAT_CLIENT_EXEC CLIENT_EXEC PLAT_EXT
+#define PLAT_SERVER_EXEC SERVER_EXEC PLAT_EXT
+
+class CUpdater : public IUpdater
+{
+	friend class CUpdaterFetchTask;
+
+	class IClient *m_pClient;
+	class IStorage *m_pStorage;
+	class IEngine *m_pEngine;
+
+	CLock m_Lock;
+
+	int m_State;
+	char m_aStatus[256] GUARDED_BY(m_Lock);
+	int m_Percent GUARDED_BY(m_Lock);
+	char m_aLastFile[256];
+	char m_aClientExecTmp[64];
+	char m_aServerExecTmp[64];
+
+	bool m_ClientUpdate;
+	bool m_ServerUpdate;
+
+	std::map<std::string, bool> m_FileJobs;
+
+	void AddFileJob(const char *pFile, bool Job);
+	void FetchFile(const char *pFile, const char *pDestPath = nullptr);
+	bool MoveFile(const char *pFile);
+
+	void ParseUpdate();
+	void PerformUpdate();
+	void CommitUpdate();
+
+	bool ReplaceClient();
+	bool ReplaceServer();
+
+	void SetCurrentState(int NewState) REQUIRES(!m_Lock);
+
+public:
+	CUpdater();
+
+	int GetCurrentState() override REQUIRES(!m_Lock);
+	void GetCurrentFile(char *pBuf, int BufSize) override REQUIRES(!m_Lock);
+	int GetCurrentPercent() override REQUIRES(!m_Lock);
+
+	void InitiateUpdate() override;
+	void Init();
+	void Update() override;
+};
+
+#endif
diff --git a/src_bkp/engine/client/video.cpp b/src_bkp/engine/client/video.cpp
new file mode 100644
index 0000000000..62eeaf8598
--- /dev/null
+++ b/src_bkp/engine/client/video.cpp
@@ -0,0 +1,1029 @@
+#if defined(CONF_VIDEORECORDER)
+
+#include "video.h"
+
+#include <engine/client/graphics_threaded.h>
+#include <engine/shared/config.h>
+#include <engine/sound.h>
+#include <engine/storage.h>
+
+extern "C" {
+#include <libavutil/avutil.h>
+#include <libavutil/opt.h>
+#include <libswresample/swresample.h>
+#include <libswscale/swscale.h>
+};
+
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <thread>
+
+using namespace std::chrono_literals;
+
+// This code is mostly stolen from https://github.com/FFmpeg/FFmpeg/blob/master/doc/examples/muxing.c
+
+#define STREAM_PIX_FMT AV_PIX_FMT_YUV420P /* default pix_fmt */
+
+#if LIBAVCODEC_VERSION_MAJOR >= 60
+#define FRAME_NUM frame_num
+#else
+#define FRAME_NUM frame_number
+#endif
+
+const size_t FORMAT_GL_NCHANNELS = 4;
+CLock g_WriteLock;
+
+CVideo::CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName) :
+	m_pGraphics(pGraphics),
+	m_pStorage(pStorage),
+	m_pSound(pSound)
+{
+	m_pFormatContext = 0;
+	m_pFormat = 0;
+	m_pOptDict = 0;
+
+	m_pVideoCodec = 0;
+	m_pAudioCodec = 0;
+
+	m_Width = Width;
+	m_Height = Height;
+	str_copy(m_aName, pName);
+
+	m_FPS = g_Config.m_ClVideoRecorderFPS;
+
+	m_Recording = false;
+	m_Started = false;
+	m_ProcessingVideoFrame = 0;
+	m_ProcessingAudioFrame = 0;
+
+	m_HasAudio = g_Config.m_ClVideoSndEnable;
+
+	dbg_assert(ms_pCurrentVideo == 0, "ms_pCurrentVideo is NOT set to NULL while creating a new Video.");
+
+	ms_TickTime = time_freq() / m_FPS;
+	ms_pCurrentVideo = this;
+}
+
+CVideo::~CVideo()
+{
+	ms_pCurrentVideo = 0;
+}
+
+void CVideo::Start()
+{
+	// wait for the graphic thread to idle
+	m_pGraphics->WaitForIdle();
+
+	m_AudioStream = {};
+	m_VideoStream = {};
+
+	char aDate[20];
+	str_timestamp(aDate, sizeof(aDate));
+	char aBuf[256];
+	if(str_length(m_aName) != 0)
+		str_format(aBuf, sizeof(aBuf), "videos/%s", m_aName);
+	else
+		str_format(aBuf, sizeof(aBuf), "videos/%s.mp4", aDate);
+
+	char aWholePath[1024];
+	IOHANDLE File = m_pStorage->OpenFile(aBuf, IOFLAG_WRITE, IStorage::TYPE_SAVE, aWholePath, sizeof(aWholePath));
+
+	if(File)
+	{
+		io_close(File);
+	}
+	else
+	{
+		dbg_msg("video_recorder", "Failed to open file for recoding video.");
+		return;
+	}
+	avformat_alloc_output_context2(&m_pFormatContext, 0, "mp4", aWholePath);
+
+	if(!m_pFormatContext)
+	{
+		dbg_msg("video_recorder", "Failed to create formatcontext for recoding video.");
+		return;
+	}
+
+	m_pFormat = m_pFormatContext->oformat;
+
+#if defined(CONF_ARCH_IA32) || defined(CONF_ARCH_ARM)
+	// use only the minimum of 2 threads on 32-bit to save memory
+	m_VideoThreads = 2;
+	m_AudioThreads = 2;
+#else
+	m_VideoThreads = std::thread::hardware_concurrency() + 2;
+	// audio gets a bit less
+	m_AudioThreads = (std::thread::hardware_concurrency() / 2) + 2;
+#endif
+
+	m_CurVideoThreadIndex = 0;
+	m_CurAudioThreadIndex = 0;
+
+	size_t GLNVals = FORMAT_GL_NCHANNELS * m_Width * m_Height;
+	m_vPixelHelper.resize(m_VideoThreads);
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		m_vPixelHelper[i].resize(GLNVals * sizeof(uint8_t));
+	}
+
+	m_vBuffer.resize(m_AudioThreads);
+
+	/* Add the audio and video streams using the default format codecs
+	 * and initialize the codecs. */
+	if(m_pFormat->video_codec != AV_CODEC_ID_NONE)
+	{
+		if(!AddStream(&m_VideoStream, m_pFormatContext, &m_pVideoCodec, m_pFormat->video_codec))
+			return;
+	}
+	else
+	{
+		dbg_msg("video_recorder", "Failed to add VideoStream for recoding video.");
+	}
+
+	if(m_HasAudio && m_pFormat->audio_codec != AV_CODEC_ID_NONE)
+	{
+		if(!AddStream(&m_AudioStream, m_pFormatContext, &m_pAudioCodec, m_pFormat->audio_codec))
+			return;
+	}
+	else
+	{
+		dbg_msg("video_recorder", "No audio.");
+	}
+
+	m_vVideoThreads.resize(m_VideoThreads);
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		m_vVideoThreads[i] = std::make_unique<SVideoRecorderThread>();
+	}
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		std::unique_lock<std::mutex> Lock(m_vVideoThreads[i]->m_Mutex);
+		m_vVideoThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunVideoThread(i == 0 ? (m_VideoThreads - 1) : (i - 1), i); });
+		m_vVideoThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vVideoThreads[i]->m_Started; });
+	}
+
+	m_vAudioThreads.resize(m_AudioThreads);
+	for(size_t i = 0; i < m_AudioThreads; ++i)
+	{
+		m_vAudioThreads[i] = std::make_unique<SAudioRecorderThread>();
+	}
+	for(size_t i = 0; i < m_AudioThreads; ++i)
+	{
+		std::unique_lock<std::mutex> Lock(m_vAudioThreads[i]->m_Mutex);
+		m_vAudioThreads[i]->m_Thread = std::thread([this, i]() REQUIRES(!g_WriteLock) { RunAudioThread(i == 0 ? (m_AudioThreads - 1) : (i - 1), i); });
+		m_vAudioThreads[i]->m_Cond.wait(Lock, [this, i]() -> bool { return m_vAudioThreads[i]->m_Started; });
+	}
+
+	/* Now that all the parameters are set, we can open the audio and
+	 * video codecs and allocate the necessary encode buffers. */
+	if(!OpenVideo())
+		return;
+
+	if(m_HasAudio)
+		if(!OpenAudio())
+			return;
+
+	// TODO: remove/comment:
+	av_dump_format(m_pFormatContext, 0, aWholePath, 1);
+
+	/* open the output file, if needed */
+	if(!(m_pFormat->flags & AVFMT_NOFILE))
+	{
+		int Ret = avio_open(&m_pFormatContext->pb, aWholePath, AVIO_FLAG_WRITE);
+		if(Ret < 0)
+		{
+			char aError[AV_ERROR_MAX_STRING_SIZE];
+			av_strerror(Ret, aError, sizeof(aError));
+			dbg_msg("video_recorder", "Could not open '%s': %s", aWholePath, aError);
+			return;
+		}
+	}
+
+	m_VideoStream.m_vpSwsCtxs.reserve(m_VideoThreads);
+
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		if(m_VideoStream.m_vpSwsCtxs.size() <= i)
+			m_VideoStream.m_vpSwsCtxs.emplace_back(nullptr);
+
+		if(!m_VideoStream.m_vpSwsCtxs[i])
+		{
+			m_VideoStream.m_vpSwsCtxs[i] = sws_getCachedContext(
+				m_VideoStream.m_vpSwsCtxs[i],
+				m_VideoStream.pEnc->width, m_VideoStream.pEnc->height, AV_PIX_FMT_RGBA,
+				m_VideoStream.pEnc->width, m_VideoStream.pEnc->height, AV_PIX_FMT_YUV420P,
+				0, 0, 0, 0);
+		}
+	}
+
+	/* Write the stream header, if any. */
+	int Ret = avformat_write_header(m_pFormatContext, &m_pOptDict);
+	if(Ret < 0)
+	{
+		char aError[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(Ret, aError, sizeof(aError));
+		dbg_msg("video_recorder", "Error occurred when opening output file: %s", aError);
+		return;
+	}
+	m_Recording = true;
+	m_Started = true;
+	ms_Time = time_get();
+	m_Vframe = 0;
+}
+
+void CVideo::Pause(bool Pause)
+{
+	if(ms_pCurrentVideo)
+		m_Recording = !Pause;
+}
+
+void CVideo::Stop()
+{
+	m_pGraphics->WaitForIdle();
+
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		{
+			std::unique_lock<std::mutex> Lock(m_vVideoThreads[i]->m_Mutex);
+			m_vVideoThreads[i]->m_Finished = true;
+			m_vVideoThreads[i]->m_Cond.notify_all();
+		}
+
+		m_vVideoThreads[i]->m_Thread.join();
+	}
+	m_vVideoThreads.clear();
+
+	for(size_t i = 0; i < m_AudioThreads; ++i)
+	{
+		{
+			std::unique_lock<std::mutex> Lock(m_vAudioThreads[i]->m_Mutex);
+			m_vAudioThreads[i]->m_Finished = true;
+			m_vAudioThreads[i]->m_Cond.notify_all();
+		}
+
+		m_vAudioThreads[i]->m_Thread.join();
+	}
+	m_vAudioThreads.clear();
+
+	while(m_ProcessingVideoFrame > 0 || m_ProcessingAudioFrame > 0)
+		std::this_thread::sleep_for(10us);
+
+	m_Recording = false;
+
+	FinishFrames(&m_VideoStream);
+
+	if(m_HasAudio)
+		FinishFrames(&m_AudioStream);
+
+	av_write_trailer(m_pFormatContext);
+
+	CloseStream(&m_VideoStream);
+
+	if(m_HasAudio)
+		CloseStream(&m_AudioStream);
+	//fclose(m_dbgfile);
+
+	if(!(m_pFormat->flags & AVFMT_NOFILE))
+		avio_closep(&m_pFormatContext->pb);
+
+	if(m_pFormatContext)
+		avformat_free_context(m_pFormatContext);
+
+	ISound *volatile pSound = m_pSound;
+
+	pSound->PauseAudioDevice();
+	delete ms_pCurrentVideo;
+	pSound->UnpauseAudioDevice();
+}
+
+void CVideo::NextVideoFrameThread()
+{
+	if(m_Recording)
+	{
+		// #ifdef CONF_PLATFORM_MACOS
+		// 	CAutoreleasePool AutoreleasePool;
+		// #endif
+		m_VSeq += 1;
+		if(m_VSeq >= 2)
+		{
+			m_ProcessingVideoFrame.fetch_add(1);
+
+			size_t NextVideoThreadIndex = m_CurVideoThreadIndex + 1;
+			if(NextVideoThreadIndex == m_VideoThreads)
+				NextVideoThreadIndex = 0;
+
+			// always wait for the next video thread too, to prevent a dead lock
+
+			{
+				auto *pVideoThread = m_vVideoThreads[NextVideoThreadIndex].get();
+				std::unique_lock<std::mutex> Lock(pVideoThread->m_Mutex);
+
+				if(pVideoThread->m_HasVideoFrame)
+				{
+					pVideoThread->m_Cond.wait(Lock, [&pVideoThread]() -> bool { return !pVideoThread->m_HasVideoFrame; });
+				}
+			}
+
+			//dbg_msg("video_recorder", "vframe: %d", m_VideoStream.pEnc->FRAME_NUM);
+
+			// after reading the graphic libraries' frame buffer, go threaded
+			{
+				auto *pVideoThread = m_vVideoThreads[m_CurVideoThreadIndex].get();
+				std::unique_lock<std::mutex> Lock(pVideoThread->m_Mutex);
+
+				if(pVideoThread->m_HasVideoFrame)
+				{
+					pVideoThread->m_Cond.wait(Lock, [&pVideoThread]() -> bool { return !pVideoThread->m_HasVideoFrame; });
+				}
+
+				ReadRGBFromGL(m_CurVideoThreadIndex);
+
+				pVideoThread->m_HasVideoFrame = true;
+				{
+					std::unique_lock<std::mutex> LockParent(pVideoThread->m_VideoFillMutex);
+					pVideoThread->m_VideoFrameToFill = m_VSeq;
+				}
+				pVideoThread->m_Cond.notify_all();
+			}
+
+			++m_CurVideoThreadIndex;
+			if(m_CurVideoThreadIndex == m_VideoThreads)
+				m_CurVideoThreadIndex = 0;
+		}
+
+		// sync_barrier();
+		// m_Semaphore.signal();
+	}
+}
+
+void CVideo::NextVideoFrame()
+{
+	if(m_Recording)
+	{
+		ms_Time += ms_TickTime;
+		ms_LocalTime = (ms_Time - ms_LocalStartTime) / (float)time_freq();
+		m_Vframe += 1;
+	}
+}
+
+void CVideo::NextAudioFrameTimeline(ISoundMixFunc Mix)
+{
+	if(m_Recording && m_HasAudio)
+	{
+		//if(m_VideoStream.pEnc->FRAME_NUM * (double)m_AudioStream.pEnc->sample_rate / m_FPS >= (double)m_AudioStream.pEnc->FRAME_NUM * m_AudioStream.pEnc->frame_size)
+		double SamplesPerFrame = (double)m_AudioStream.pEnc->sample_rate / m_FPS;
+		while(m_AudioStream.m_SamplesFrameCount >= m_AudioStream.m_SamplesCount)
+		{
+			NextAudioFrame(Mix);
+		}
+		m_AudioStream.m_SamplesFrameCount += SamplesPerFrame;
+	}
+}
+
+void CVideo::NextAudioFrame(ISoundMixFunc Mix)
+{
+	if(m_Recording && m_HasAudio)
+	{
+		m_ASeq += 1;
+
+		m_ProcessingAudioFrame.fetch_add(1);
+
+		size_t NextAudioThreadIndex = m_CurAudioThreadIndex + 1;
+		if(NextAudioThreadIndex == m_AudioThreads)
+			NextAudioThreadIndex = 0;
+
+		// always wait for the next Audio thread too, to prevent a dead lock
+
+		{
+			auto *pAudioThread = m_vAudioThreads[NextAudioThreadIndex].get();
+			std::unique_lock<std::mutex> Lock(pAudioThread->m_Mutex);
+
+			if(pAudioThread->m_HasAudioFrame)
+			{
+				pAudioThread->m_Cond.wait(Lock, [&pAudioThread]() -> bool { return !pAudioThread->m_HasAudioFrame; });
+			}
+		}
+
+		// after reading the graphic libraries' frame buffer, go threaded
+		{
+			auto *pAudioThread = m_vAudioThreads[m_CurAudioThreadIndex].get();
+
+			std::unique_lock<std::mutex> Lock(pAudioThread->m_Mutex);
+
+			if(pAudioThread->m_HasAudioFrame)
+			{
+				pAudioThread->m_Cond.wait(Lock, [&pAudioThread]() -> bool { return !pAudioThread->m_HasAudioFrame; });
+			}
+
+			Mix(m_vBuffer[m_CurAudioThreadIndex].m_aBuffer, ALEN / 2); // two channels
+
+			int64_t DstNbSamples = av_rescale_rnd(
+				swr_get_delay(m_AudioStream.m_vpSwrCtxs[m_CurAudioThreadIndex], m_AudioStream.pEnc->sample_rate) +
+					m_AudioStream.m_vpFrames[m_CurAudioThreadIndex]->nb_samples,
+				m_AudioStream.pEnc->sample_rate,
+				m_AudioStream.pEnc->sample_rate, AV_ROUND_UP);
+
+			pAudioThread->m_SampleCountStart = m_AudioStream.m_SamplesCount;
+			m_AudioStream.m_SamplesCount += DstNbSamples;
+
+			pAudioThread->m_HasAudioFrame = true;
+			{
+				std::unique_lock<std::mutex> LockParent(pAudioThread->m_AudioFillMutex);
+				pAudioThread->m_AudioFrameToFill = m_ASeq;
+			}
+			pAudioThread->m_Cond.notify_all();
+		}
+
+		++m_CurAudioThreadIndex;
+		if(m_CurAudioThreadIndex == m_AudioThreads)
+			m_CurAudioThreadIndex = 0;
+	}
+}
+
+void CVideo::RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex)
+{
+	auto *pThreadData = m_vAudioThreads[ThreadIndex].get();
+	auto *pParentThreadData = m_vAudioThreads[ParentThreadIndex].get();
+	std::unique_lock<std::mutex> Lock(pThreadData->m_Mutex);
+	pThreadData->m_Started = true;
+	pThreadData->m_Cond.notify_all();
+
+	while(!pThreadData->m_Finished)
+	{
+		pThreadData->m_Cond.wait(Lock, [&pThreadData]() -> bool { return pThreadData->m_HasAudioFrame || pThreadData->m_Finished; });
+		pThreadData->m_Cond.notify_all();
+
+		if(pThreadData->m_HasAudioFrame)
+		{
+			FillAudioFrame(ThreadIndex);
+			// check if we need to wait for the parent to finish
+			{
+				std::unique_lock<std::mutex> LockParent(pParentThreadData->m_AudioFillMutex);
+				if(pParentThreadData->m_AudioFrameToFill != 0 && pThreadData->m_AudioFrameToFill >= pParentThreadData->m_AudioFrameToFill)
+				{
+					// wait for the parent to finish its frame
+					pParentThreadData->m_AudioFillCond.wait(LockParent, [&pParentThreadData]() -> bool { return pParentThreadData->m_AudioFrameToFill == 0; });
+				}
+			}
+			{
+				std::unique_lock<std::mutex> LockAudio(pThreadData->m_AudioFillMutex);
+
+				{
+					CLockScope ls(g_WriteLock);
+					m_AudioStream.m_vpFrames[ThreadIndex]->pts = av_rescale_q(pThreadData->m_SampleCountStart, AVRational{1, m_AudioStream.pEnc->sample_rate}, m_AudioStream.pEnc->time_base);
+					WriteFrame(&m_AudioStream, ThreadIndex);
+				}
+
+				pThreadData->m_AudioFrameToFill = 0;
+				pThreadData->m_AudioFillCond.notify_all();
+				pThreadData->m_Cond.notify_all();
+			}
+			m_ProcessingAudioFrame.fetch_sub(1);
+
+			pThreadData->m_HasAudioFrame = false;
+		}
+	}
+}
+
+void CVideo::FillAudioFrame(size_t ThreadIndex)
+{
+	av_samples_fill_arrays(
+		(uint8_t **)m_AudioStream.m_vpTmpFrames[ThreadIndex]->data,
+		0, // pointer to linesize (int*)
+		(const uint8_t *)m_vBuffer[ThreadIndex].m_aBuffer,
+		2, // channels
+		m_AudioStream.m_vpTmpFrames[ThreadIndex]->nb_samples,
+		AV_SAMPLE_FMT_S16,
+		0 // align
+	);
+
+	// dbg_msg("video_recorder", "DstNbSamples: %d", DstNbSamples);
+	// fwrite(m_aBuffer, sizeof(short), 2048, m_dbgfile);
+
+	int Ret = av_frame_make_writable(m_AudioStream.m_vpFrames[ThreadIndex]);
+	if(Ret < 0)
+	{
+		dbg_msg("video_recorder", "Error making frame writable");
+		return;
+	}
+
+	/* convert to destination format */
+	Ret = swr_convert(
+		m_AudioStream.m_vpSwrCtxs[ThreadIndex],
+		m_AudioStream.m_vpFrames[ThreadIndex]->data,
+		m_AudioStream.m_vpFrames[ThreadIndex]->nb_samples,
+		(const uint8_t **)m_AudioStream.m_vpTmpFrames[ThreadIndex]->data,
+		m_AudioStream.m_vpTmpFrames[ThreadIndex]->nb_samples);
+
+	if(Ret < 0)
+	{
+		dbg_msg("video_recorder", "Error while converting");
+		return;
+	}
+}
+
+void CVideo::RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex)
+{
+	auto *pThreadData = m_vVideoThreads[ThreadIndex].get();
+	auto *pParentThreadData = m_vVideoThreads[ParentThreadIndex].get();
+	std::unique_lock<std::mutex> Lock(pThreadData->m_Mutex);
+	pThreadData->m_Started = true;
+	pThreadData->m_Cond.notify_all();
+
+	while(!pThreadData->m_Finished)
+	{
+		pThreadData->m_Cond.wait(Lock, [&pThreadData]() -> bool { return pThreadData->m_HasVideoFrame || pThreadData->m_Finished; });
+		pThreadData->m_Cond.notify_all();
+
+		if(pThreadData->m_HasVideoFrame)
+		{
+			FillVideoFrame(ThreadIndex);
+			// check if we need to wait for the parent to finish
+			{
+				std::unique_lock<std::mutex> LockParent(pParentThreadData->m_VideoFillMutex);
+				if(pParentThreadData->m_VideoFrameToFill != 0 && pThreadData->m_VideoFrameToFill >= pParentThreadData->m_VideoFrameToFill)
+				{
+					// wait for the parent to finish its frame
+					pParentThreadData->m_VideoFillCond.wait(LockParent, [&pParentThreadData]() -> bool { return pParentThreadData->m_VideoFrameToFill == 0; });
+				}
+			}
+			{
+				std::unique_lock<std::mutex> LockVideo(pThreadData->m_VideoFillMutex);
+				{
+					CLockScope ls(g_WriteLock);
+					m_VideoStream.m_vpFrames[ThreadIndex]->pts = (int64_t)m_VideoStream.pEnc->FRAME_NUM;
+					WriteFrame(&m_VideoStream, ThreadIndex);
+				}
+
+				pThreadData->m_VideoFrameToFill = 0;
+				pThreadData->m_VideoFillCond.notify_all();
+				pThreadData->m_Cond.notify_all();
+			}
+			m_ProcessingVideoFrame.fetch_sub(1);
+
+			pThreadData->m_HasVideoFrame = false;
+		}
+	}
+}
+
+void CVideo::FillVideoFrame(size_t ThreadIndex)
+{
+	const int InLineSize = 4 * m_VideoStream.pEnc->width;
+	auto *pRGBAData = m_vPixelHelper[ThreadIndex].data();
+	sws_scale(m_VideoStream.m_vpSwsCtxs[ThreadIndex], (const uint8_t *const *)&pRGBAData, &InLineSize, 0,
+		m_VideoStream.pEnc->height, m_VideoStream.m_vpFrames[ThreadIndex]->data, m_VideoStream.m_vpFrames[ThreadIndex]->linesize);
+}
+
+void CVideo::ReadRGBFromGL(size_t ThreadIndex)
+{
+	uint32_t Width;
+	uint32_t Height;
+	CImageInfo::EImageFormat Format;
+	m_pGraphics->GetReadPresentedImageDataFuncUnsafe()(Width, Height, Format, m_vPixelHelper[ThreadIndex]);
+}
+
+AVFrame *CVideo::AllocPicture(enum AVPixelFormat PixFmt, int Width, int Height)
+{
+	AVFrame *pPicture;
+	int Ret;
+
+	pPicture = av_frame_alloc();
+	if(!pPicture)
+		return NULL;
+
+	pPicture->format = PixFmt;
+	pPicture->width = Width;
+	pPicture->height = Height;
+
+	/* allocate the buffers for the frame data */
+	Ret = av_frame_get_buffer(pPicture, 32);
+	if(Ret < 0)
+	{
+		dbg_msg("video_recorder", "Could not allocate frame data.");
+		return nullptr;
+	}
+
+	return pPicture;
+}
+
+AVFrame *CVideo::AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t ChannelLayout, int SampleRate, int NbSamples)
+{
+	AVFrame *pFrame = av_frame_alloc();
+	int Ret;
+
+	if(!pFrame)
+	{
+		dbg_msg("video_recorder", "Error allocating an audio frame");
+		return nullptr;
+	}
+
+	pFrame->format = SampleFmt;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+	dbg_assert(av_channel_layout_from_mask(&pFrame->ch_layout, ChannelLayout) == 0, "Failed to set channel layout");
+#else
+	pFrame->channel_layout = ChannelLayout;
+#endif
+	pFrame->sample_rate = SampleRate;
+	pFrame->nb_samples = NbSamples;
+
+	if(NbSamples)
+	{
+		Ret = av_frame_get_buffer(pFrame, 0);
+		if(Ret < 0)
+		{
+			dbg_msg("video_recorder", "Error allocating an audio buffer");
+			return nullptr;
+		}
+	}
+
+	return pFrame;
+}
+
+bool CVideo::OpenVideo()
+{
+	int Ret;
+	AVCodecContext *pContext = m_VideoStream.pEnc;
+	AVDictionary *pOptions = 0;
+
+	av_dict_copy(&pOptions, m_pOptDict, 0);
+
+	/* open the codec */
+	Ret = avcodec_open2(pContext, m_pVideoCodec, &pOptions);
+	av_dict_free(&pOptions);
+	if(Ret < 0)
+	{
+		char aBuf[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(Ret, aBuf, sizeof(aBuf));
+		dbg_msg("video_recorder", "Could not open video codec: %s", aBuf);
+		return false;
+	}
+
+	m_VideoStream.m_vpFrames.clear();
+	m_VideoStream.m_vpFrames.reserve(m_VideoThreads);
+
+	/* allocate and init a re-usable frame */
+	for(size_t i = 0; i < m_VideoThreads; ++i)
+	{
+		m_VideoStream.m_vpFrames.emplace_back(nullptr);
+		m_VideoStream.m_vpFrames[i] = AllocPicture(pContext->pix_fmt, pContext->width, pContext->height);
+		if(!m_VideoStream.m_vpFrames[i])
+		{
+			dbg_msg("video_recorder", "Could not allocate video frame");
+			return false;
+		}
+	}
+
+	/* If the output format is not YUV420P, then a temporary YUV420P
+	 * picture is needed too. It is then converted to the required
+	 * output format. */
+	m_VideoStream.m_vpTmpFrames.clear();
+	m_VideoStream.m_vpTmpFrames.reserve(m_VideoThreads);
+
+	if(pContext->pix_fmt != AV_PIX_FMT_YUV420P)
+	{
+		/* allocate and init a re-usable frame */
+		for(size_t i = 0; i < m_VideoThreads; ++i)
+		{
+			m_VideoStream.m_vpTmpFrames.emplace_back(nullptr);
+			m_VideoStream.m_vpTmpFrames[i] = AllocPicture(AV_PIX_FMT_YUV420P, pContext->width, pContext->height);
+			if(!m_VideoStream.m_vpTmpFrames[i])
+			{
+				dbg_msg("video_recorder", "Could not allocate temporary video frame");
+				return false;
+			}
+		}
+	}
+
+	/* copy the stream parameters to the muxer */
+	Ret = avcodec_parameters_from_context(m_VideoStream.pSt->codecpar, pContext);
+	if(Ret < 0)
+	{
+		dbg_msg("video_recorder", "Could not copy the stream parameters");
+		return false;
+	}
+	m_VSeq = 0;
+	return true;
+}
+
+bool CVideo::OpenAudio()
+{
+	AVCodecContext *pContext;
+	int NbSamples;
+	int Ret;
+	AVDictionary *pOptions = NULL;
+
+	pContext = m_AudioStream.pEnc;
+
+	/* open it */
+	//m_dbgfile = fopen("/tmp/pcm_dbg", "wb");
+	av_dict_copy(&pOptions, m_pOptDict, 0);
+	Ret = avcodec_open2(pContext, m_pAudioCodec, &pOptions);
+	av_dict_free(&pOptions);
+	if(Ret < 0)
+	{
+		char aBuf[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror(Ret, aBuf, sizeof(aBuf));
+		dbg_msg("video_recorder", "Could not open audio codec: %s", aBuf);
+		return false;
+	}
+
+	if(pContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
+		NbSamples = 10000;
+	else
+		NbSamples = pContext->frame_size;
+
+	m_AudioStream.m_vpFrames.clear();
+	m_AudioStream.m_vpFrames.reserve(m_AudioThreads);
+
+	m_AudioStream.m_vpTmpFrames.clear();
+	m_AudioStream.m_vpTmpFrames.reserve(m_AudioThreads);
+
+	/* allocate and init a re-usable frame */
+	for(size_t i = 0; i < m_AudioThreads; ++i)
+	{
+		m_AudioStream.m_vpFrames.emplace_back(nullptr);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+		m_AudioStream.m_vpFrames[i] = AllocAudioFrame(pContext->sample_fmt, pContext->ch_layout.u.mask, pContext->sample_rate, NbSamples);
+#else
+		m_AudioStream.m_vpFrames[i] = AllocAudioFrame(pContext->sample_fmt, pContext->channel_layout, pContext->sample_rate, NbSamples);
+#endif
+		if(!m_AudioStream.m_vpFrames[i])
+		{
+			dbg_msg("video_recorder", "Could not allocate audio frame");
+			return false;
+		}
+
+		m_AudioStream.m_vpTmpFrames.emplace_back(nullptr);
+		m_AudioStream.m_vpTmpFrames[i] = AllocAudioFrame(AV_SAMPLE_FMT_S16, AV_CH_LAYOUT_STEREO, g_Config.m_SndRate, NbSamples);
+		if(!m_AudioStream.m_vpTmpFrames[i])
+		{
+			dbg_msg("video_recorder", "Could not allocate audio frame");
+			return false;
+		}
+	}
+
+	/* copy the stream parameters to the muxer */
+	Ret = avcodec_parameters_from_context(m_AudioStream.pSt->codecpar, pContext);
+	if(Ret < 0)
+	{
+		dbg_msg("video_recorder", "Could not copy the stream parameters");
+		return false;
+	}
+
+	/* create resampler context */
+	m_AudioStream.m_vpSwrCtxs.clear();
+	m_AudioStream.m_vpSwrCtxs.resize(m_AudioThreads);
+	for(size_t i = 0; i < m_AudioThreads; ++i)
+	{
+		m_AudioStream.m_vpSwrCtxs[i] = swr_alloc();
+		if(!m_AudioStream.m_vpSwrCtxs[i])
+		{
+			dbg_msg("video_recorder", "Could not allocate resampler context");
+			return false;
+		}
+
+		/* set options */
+		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "in_channel_count", 2, 0);
+		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "in_sample_rate", g_Config.m_SndRate, 0);
+		av_opt_set_sample_fmt(m_AudioStream.m_vpSwrCtxs[i], "in_sample_fmt", AV_SAMPLE_FMT_S16, 0);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_channel_count", pContext->ch_layout.nb_channels, 0);
+#else
+		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_channel_count", pContext->channels, 0);
+#endif
+		av_opt_set_int(m_AudioStream.m_vpSwrCtxs[i], "out_sample_rate", pContext->sample_rate, 0);
+		av_opt_set_sample_fmt(m_AudioStream.m_vpSwrCtxs[i], "out_sample_fmt", pContext->sample_fmt, 0);
+
+		/* initialize the resampling context */
+		if(swr_init(m_AudioStream.m_vpSwrCtxs[i]) < 0)
+		{
+			dbg_msg("video_recorder", "Failed to initialize the resampling context");
+			return false;
+		}
+	}
+
+	m_ASeq = 0;
+	return true;
+}
+
+/* Add an output stream. */
+bool CVideo::AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCodec **ppCodec, enum AVCodecID CodecId) const
+{
+	AVCodecContext *pContext;
+
+	/* find the encoder */
+	*ppCodec = avcodec_find_encoder(CodecId);
+	if(!(*ppCodec))
+	{
+		dbg_msg("video_recorder", "Could not find encoder for '%s'",
+			avcodec_get_name(CodecId));
+		return false;
+	}
+
+	pStream->pSt = avformat_new_stream(pOC, NULL);
+	if(!pStream->pSt)
+	{
+		dbg_msg("video_recorder", "Could not allocate stream");
+		return false;
+	}
+	pStream->pSt->id = pOC->nb_streams - 1;
+	pContext = avcodec_alloc_context3(*ppCodec);
+	if(!pContext)
+	{
+		dbg_msg("video_recorder", "Could not alloc an encoding context");
+		return false;
+	}
+	pStream->pEnc = pContext;
+
+#if defined(CONF_ARCH_IA32) || defined(CONF_ARCH_ARM)
+	// use only 1 ffmpeg thread on 32-bit to save memory
+	pContext->thread_count = 1;
+#endif
+
+	switch((*ppCodec)->type)
+	{
+	case AVMEDIA_TYPE_AUDIO:
+		pContext->sample_fmt = (*ppCodec)->sample_fmts ? (*ppCodec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+		pContext->bit_rate = g_Config.m_SndRate * 2 * 16;
+		pContext->sample_rate = g_Config.m_SndRate;
+		if((*ppCodec)->supported_samplerates)
+		{
+			pContext->sample_rate = (*ppCodec)->supported_samplerates[0];
+			for(int i = 0; (*ppCodec)->supported_samplerates[i]; i++)
+			{
+				if((*ppCodec)->supported_samplerates[i] == g_Config.m_SndRate)
+				{
+					pContext->sample_rate = g_Config.m_SndRate;
+					break;
+				}
+			}
+		}
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100)
+		dbg_assert(av_channel_layout_from_mask(&pContext->ch_layout, AV_CH_LAYOUT_STEREO) == 0, "Failed to set channel layout");
+#else
+		pContext->channels = 2;
+		pContext->channel_layout = AV_CH_LAYOUT_STEREO;
+#endif
+
+		pStream->pSt->time_base.num = 1;
+		pStream->pSt->time_base.den = pContext->sample_rate;
+		break;
+
+	case AVMEDIA_TYPE_VIDEO:
+		pContext->codec_id = CodecId;
+
+		pContext->bit_rate = 400000;
+		/* Resolution must be a multiple of two. */
+		pContext->width = m_Width;
+		pContext->height = m_Height % 2 == 0 ? m_Height : m_Height - 1;
+		/* timebase: This is the fundamental unit of time (in seconds) in terms
+			 * of which frame timestamps are represented. For fixed-fps content,
+			 * timebase should be 1/framerate and timestamp increments should be
+			 * identical to 1. */
+		pStream->pSt->time_base.num = 1;
+		pStream->pSt->time_base.den = m_FPS;
+		pContext->time_base = pStream->pSt->time_base;
+
+		pContext->gop_size = 12; /* emit one intra frame every twelve frames at most */
+		pContext->pix_fmt = STREAM_PIX_FMT;
+		if(pContext->codec_id == AV_CODEC_ID_MPEG2VIDEO)
+		{
+			/* just for testing, we also add B-frames */
+			pContext->max_b_frames = 2;
+		}
+		if(pContext->codec_id == AV_CODEC_ID_MPEG1VIDEO)
+		{
+			/* Needed to avoid using macroblocks in which some coeffs overflow.
+				 * This does not happen with normal video, it just happens here as
+				 * the motion of the chroma plane does not match the luma plane. */
+			pContext->mb_decision = 2;
+		}
+		if(CodecId == AV_CODEC_ID_H264)
+		{
+			static const char *s_apPresets[10] = {"ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo"};
+			av_opt_set(pContext->priv_data, "preset", s_apPresets[g_Config.m_ClVideoX264Preset], 0);
+			av_opt_set_int(pContext->priv_data, "crf", g_Config.m_ClVideoX264Crf, 0);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	/* Some formats want stream headers to be separate. */
+	if(pOC->oformat->flags & AVFMT_GLOBALHEADER)
+		pContext->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+	return true;
+}
+
+void CVideo::WriteFrame(OutputStream *pStream, size_t ThreadIndex)
+{
+	int RetRecv = 0;
+
+	AVPacket *pPacket = av_packet_alloc();
+	if(pPacket == nullptr)
+	{
+		dbg_msg("video_recorder", "Failed allocating packet");
+		return;
+	}
+
+	pPacket->data = 0;
+	pPacket->size = 0;
+
+	avcodec_send_frame(pStream->pEnc, pStream->m_vpFrames[ThreadIndex]);
+	do
+	{
+		RetRecv = avcodec_receive_packet(pStream->pEnc, pPacket);
+		if(!RetRecv)
+		{
+			/* rescale output packet timestamp values from codec to stream timebase */
+			av_packet_rescale_ts(pPacket, pStream->pEnc->time_base, pStream->pSt->time_base);
+			pPacket->stream_index = pStream->pSt->index;
+
+			if(int Ret = av_interleaved_write_frame(m_pFormatContext, pPacket))
+			{
+				char aBuf[AV_ERROR_MAX_STRING_SIZE];
+				av_strerror(Ret, aBuf, sizeof(aBuf));
+				dbg_msg("video_recorder", "Error while writing video frame: %s", aBuf);
+			}
+		}
+		else
+			break;
+	} while(true);
+
+	if(RetRecv && RetRecv != AVERROR(EAGAIN))
+	{
+		dbg_msg("video_recorder", "Error encoding frame, error: %d", RetRecv);
+	}
+
+	av_packet_free(&pPacket);
+}
+
+void CVideo::FinishFrames(OutputStream *pStream)
+{
+	dbg_msg("video_recorder", "------------");
+	int RetRecv = 0;
+
+	AVPacket *pPacket = av_packet_alloc();
+	if(pPacket == nullptr)
+	{
+		dbg_msg("video_recorder", "Failed allocating packet");
+		return;
+	}
+
+	pPacket->data = 0;
+	pPacket->size = 0;
+
+	avcodec_send_frame(pStream->pEnc, 0);
+	do
+	{
+		RetRecv = avcodec_receive_packet(pStream->pEnc, pPacket);
+		if(!RetRecv)
+		{
+			/* rescale output packet timestamp values from codec to stream timebase */
+			av_packet_rescale_ts(pPacket, pStream->pEnc->time_base, pStream->pSt->time_base);
+			pPacket->stream_index = pStream->pSt->index;
+
+			if(int Ret = av_interleaved_write_frame(m_pFormatContext, pPacket))
+			{
+				char aBuf[AV_ERROR_MAX_STRING_SIZE];
+				av_strerror(Ret, aBuf, sizeof(aBuf));
+				dbg_msg("video_recorder", "Error while writing video frame: %s", aBuf);
+			}
+		}
+		else
+			break;
+	} while(true);
+
+	if(RetRecv && RetRecv != AVERROR_EOF)
+	{
+		dbg_msg("video_recorder", "failed to finish recoding, error: %d", RetRecv);
+	}
+
+	av_packet_free(&pPacket);
+}
+
+void CVideo::CloseStream(OutputStream *pStream)
+{
+	avcodec_free_context(&pStream->pEnc);
+	for(auto *pFrame : pStream->m_vpFrames)
+		av_frame_free(&pFrame);
+	pStream->m_vpFrames.clear();
+
+	for(auto *pFrame : pStream->m_vpTmpFrames)
+		av_frame_free(&pFrame);
+	pStream->m_vpTmpFrames.clear();
+
+	for(auto *pSwsContext : pStream->m_vpSwsCtxs)
+		sws_freeContext(pSwsContext);
+	pStream->m_vpSwsCtxs.clear();
+
+	for(auto *pSwrContext : pStream->m_vpSwrCtxs)
+		swr_free(&pSwrContext);
+	pStream->m_vpSwrCtxs.clear();
+}
+
+#endif
diff --git a/src_bkp/engine/client/video.h b/src_bkp/engine/client/video.h
new file mode 100644
index 0000000000..0575cdee7e
--- /dev/null
+++ b/src_bkp/engine/client/video.h
@@ -0,0 +1,165 @@
+#ifndef ENGINE_CLIENT_VIDEO_H
+#define ENGINE_CLIENT_VIDEO_H
+
+#include <base/lock.h>
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+};
+
+#include <engine/shared/video.h>
+
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#include <vector>
+#define ALEN 2048
+
+class CGraphics_Threaded;
+class ISound;
+class IStorage;
+
+extern CLock g_WriteLock;
+
+// a wrapper around a single output AVStream
+struct OutputStream
+{
+	AVStream *pSt = nullptr;
+	AVCodecContext *pEnc = nullptr;
+
+	/* pts of the next frame that will be generated */
+	int64_t NextPts = 0;
+	int64_t m_SamplesCount = 0;
+	int64_t m_SamplesFrameCount = 0;
+
+	std::vector<AVFrame *> m_vpFrames;
+	std::vector<AVFrame *> m_vpTmpFrames;
+
+	std::vector<struct SwsContext *> m_vpSwsCtxs;
+	std::vector<struct SwrContext *> m_vpSwrCtxs;
+};
+
+class CVideo : public IVideo
+{
+public:
+	CVideo(CGraphics_Threaded *pGraphics, ISound *pSound, IStorage *pStorage, int Width, int Height, const char *pName);
+	~CVideo();
+
+	void Start() override REQUIRES(!g_WriteLock);
+	void Stop() override;
+	void Pause(bool Pause) override;
+	bool IsRecording() override { return m_Recording; }
+
+	void NextVideoFrame() override;
+	void NextVideoFrameThread() override;
+
+	void NextAudioFrame(ISoundMixFunc Mix) override;
+	void NextAudioFrameTimeline(ISoundMixFunc Mix) override;
+
+	static IVideo *Current() { return IVideo::ms_pCurrentVideo; }
+
+	static void Init() { av_log_set_level(AV_LOG_DEBUG); }
+
+private:
+	void RunVideoThread(size_t ParentThreadIndex, size_t ThreadIndex) REQUIRES(!g_WriteLock);
+	void FillVideoFrame(size_t ThreadIndex) REQUIRES(!g_WriteLock);
+	void ReadRGBFromGL(size_t ThreadIndex);
+
+	void RunAudioThread(size_t ParentThreadIndex, size_t ThreadIndex) REQUIRES(!g_WriteLock);
+	void FillAudioFrame(size_t ThreadIndex);
+
+	bool OpenVideo();
+	bool OpenAudio();
+	AVFrame *AllocPicture(enum AVPixelFormat PixFmt, int Width, int Height);
+	AVFrame *AllocAudioFrame(enum AVSampleFormat SampleFmt, uint64_t ChannelLayout, int SampleRate, int NbSamples);
+
+	void WriteFrame(OutputStream *pStream, size_t ThreadIndex) REQUIRES(g_WriteLock);
+	void FinishFrames(OutputStream *pStream);
+	void CloseStream(OutputStream *pStream);
+
+	bool AddStream(OutputStream *pStream, AVFormatContext *pOC, const AVCodec **ppCodec, enum AVCodecID CodecId) const;
+
+	CGraphics_Threaded *m_pGraphics;
+	IStorage *m_pStorage;
+	ISound *m_pSound;
+
+	int m_Width;
+	int m_Height;
+	char m_aName[256];
+	//FILE *m_dbgfile;
+	uint64_t m_VSeq = 0;
+	uint64_t m_ASeq = 0;
+	uint64_t m_Vframe;
+
+	int m_FPS;
+
+	bool m_Started;
+	bool m_Recording;
+
+	size_t m_VideoThreads = 2;
+	size_t m_CurVideoThreadIndex = 0;
+	size_t m_AudioThreads = 2;
+	size_t m_CurAudioThreadIndex = 0;
+
+	struct SVideoRecorderThread
+	{
+		std::thread m_Thread;
+		std::mutex m_Mutex;
+		std::condition_variable m_Cond;
+
+		bool m_Started = false;
+		bool m_Finished = false;
+		bool m_HasVideoFrame = false;
+
+		std::mutex m_VideoFillMutex;
+		std::condition_variable m_VideoFillCond;
+		uint64_t m_VideoFrameToFill = 0;
+	};
+
+	std::vector<std::unique_ptr<SVideoRecorderThread>> m_vVideoThreads;
+
+	struct SAudioRecorderThread
+	{
+		std::thread m_Thread;
+		std::mutex m_Mutex;
+		std::condition_variable m_Cond;
+
+		bool m_Started = false;
+		bool m_Finished = false;
+		bool m_HasAudioFrame = false;
+
+		std::mutex m_AudioFillMutex;
+		std::condition_variable m_AudioFillCond;
+		uint64_t m_AudioFrameToFill = 0;
+		int64_t m_SampleCountStart = 0;
+	};
+
+	std::vector<std::unique_ptr<SAudioRecorderThread>> m_vAudioThreads;
+
+	std::atomic<int32_t> m_ProcessingVideoFrame;
+	std::atomic<int32_t> m_ProcessingAudioFrame;
+
+	bool m_HasAudio;
+
+	struct SVideoSoundBuffer
+	{
+		int16_t m_aBuffer[ALEN * 2];
+	};
+	std::vector<SVideoSoundBuffer> m_vBuffer;
+	std::vector<std::vector<uint8_t>> m_vPixelHelper;
+
+	OutputStream m_VideoStream;
+	OutputStream m_AudioStream;
+
+	const AVCodec *m_pVideoCodec;
+	const AVCodec *m_pAudioCodec;
+
+	AVDictionary *m_pOptDict;
+
+	AVFormatContext *m_pFormatContext;
+	const AVOutputFormat *m_pFormat;
+};
+
+#endif
diff --git a/src_bkp/engine/client/warning.cpp b/src_bkp/engine/client/warning.cpp
new file mode 100644
index 0000000000..0ed4a9daae
--- /dev/null
+++ b/src_bkp/engine/client/warning.cpp
@@ -0,0 +1,14 @@
+#include <engine/warning.h>
+
+#include <base/system.h>
+
+SWarning::SWarning(const char *pMsg)
+{
+	str_copy(m_aWarningTitle, "");
+	str_copy(m_aWarningMsg, pMsg);
+}
+SWarning::SWarning(const char *pTitle, const char *pMsg)
+{
+	str_copy(m_aWarningTitle, pTitle);
+	str_copy(m_aWarningMsg, pMsg);
+}
diff --git a/src_bkp/engine/config.h b/src_bkp/engine/config.h
new file mode 100644
index 0000000000..bccf50437b
--- /dev/null
+++ b/src_bkp/engine/config.h
@@ -0,0 +1,30 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CONFIG_H
+#define ENGINE_CONFIG_H
+
+#include "kernel.h"
+
+class IConfigManager : public IInterface
+{
+	MACRO_INTERFACE("config")
+public:
+	typedef void (*SAVECALLBACKFUNC)(IConfigManager *pConfig, void *pUserData);
+
+	virtual void Init() = 0;
+	virtual void Reset(const char *pScriptName) = 0;
+	virtual void ResetGameSettings() = 0;
+	virtual void SetReadOnly(const char *pScriptName, bool ReadOnly) = 0;
+	virtual bool Save() = 0;
+	virtual class CConfig *Values() = 0;
+
+	virtual void RegisterCallback(SAVECALLBACKFUNC pfnFunc, void *pUserData) = 0;
+
+	virtual void WriteLine(const char *pLine) = 0;
+
+	virtual void StoreUnknownCommand(const char *pCommand) = 0;
+};
+
+extern IConfigManager *CreateConfigManager();
+
+#endif
diff --git a/src_bkp/engine/console.h b/src_bkp/engine/console.h
new file mode 100644
index 0000000000..774e063583
--- /dev/null
+++ b/src_bkp/engine/console.h
@@ -0,0 +1,135 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_CONSOLE_H
+#define ENGINE_CONSOLE_H
+
+#include "kernel.h"
+#include <base/color.h>
+#include <engine/storage.h>
+
+#include <memory>
+
+static const ColorRGBA gs_ConsoleDefaultColor(1, 1, 1, 1);
+
+enum LEVEL : char;
+struct CChecksumData;
+
+class IConsole : public IInterface
+{
+	MACRO_INTERFACE("console")
+public:
+	//	TODO: rework/cleanup
+	enum
+	{
+		OUTPUT_LEVEL_STANDARD = 0,
+		OUTPUT_LEVEL_ADDINFO,
+		OUTPUT_LEVEL_DEBUG,
+
+		ACCESS_LEVEL_ADMIN = 0,
+		ACCESS_LEVEL_MOD,
+		ACCESS_LEVEL_HELPER,
+		ACCESS_LEVEL_USER,
+
+		TEMPCMD_NAME_LENGTH = 32,
+		TEMPCMD_HELP_LENGTH = 192,
+		TEMPCMD_PARAMS_LENGTH = 96,
+
+		CMDLINE_LENGTH = 512,
+
+		CLIENT_ID_GAME = -2,
+		CLIENT_ID_NO_GAME = -3,
+	};
+
+	// TODO: rework this interface to reduce the amount of virtual calls
+	class IResult
+	{
+	protected:
+		unsigned m_NumArgs;
+
+	public:
+		IResult() { m_NumArgs = 0; }
+		virtual ~IResult() {}
+
+		virtual int GetInteger(unsigned Index) const = 0;
+		virtual float GetFloat(unsigned Index) const = 0;
+		virtual const char *GetString(unsigned Index) const = 0;
+		virtual ColorHSLA GetColor(unsigned Index, bool Light) const = 0;
+
+		virtual void RemoveArgument(unsigned Index) = 0;
+
+		int NumArguments() const { return m_NumArgs; }
+		int m_ClientID;
+
+		// DDRace
+
+		virtual int GetVictim() const = 0;
+	};
+
+	class CCommandInfo
+	{
+	protected:
+		int m_AccessLevel;
+
+	public:
+		CCommandInfo() { m_AccessLevel = ACCESS_LEVEL_ADMIN; }
+		virtual ~CCommandInfo() {}
+		const char *m_pName;
+		const char *m_pHelp;
+		const char *m_pParams;
+
+		virtual const CCommandInfo *NextCommandInfo(int AccessLevel, int FlagMask) const = 0;
+
+		int GetAccessLevel() const { return m_AccessLevel; }
+	};
+
+	typedef void (*FTeeHistorianCommandCallback)(int ClientID, int FlagMask, const char *pCmd, IResult *pResult, void *pUser);
+	typedef void (*FPrintCallback)(const char *pStr, void *pUser, ColorRGBA PrintColor);
+	typedef void (*FPossibleCallback)(int Index, const char *pCmd, void *pUser);
+	typedef void (*FCommandCallback)(IResult *pResult, void *pUserData);
+	typedef void (*FChainCommandCallback)(IResult *pResult, void *pUserData, FCommandCallback pfnCallback, void *pCallbackUserData);
+	typedef bool (*FUnknownCommandCallback)(const char *pCommand, void *pUser); // returns true if the callback has handled the argument
+
+	static void EmptyPossibleCommandCallback(int Index, const char *pCmd, void *pUser) {}
+	static bool EmptyUnknownCommandCallback(const char *pCommand, void *pUser) { return false; }
+
+	virtual void Init() = 0;
+	virtual const CCommandInfo *FirstCommandInfo(int AccessLevel, int Flagmask) const = 0;
+	virtual const CCommandInfo *GetCommandInfo(const char *pName, int FlagMask, bool Temp) = 0;
+	virtual int PossibleCommands(const char *pStr, int FlagMask, bool Temp, FPossibleCallback pfnCallback = EmptyPossibleCommandCallback, void *pUser = nullptr) = 0;
+	virtual void ParseArguments(int NumArgs, const char **ppArguments) = 0;
+
+	virtual void Register(const char *pName, const char *pParams, int Flags, FCommandCallback pfnFunc, void *pUser, const char *pHelp) = 0;
+	virtual void RegisterTemp(const char *pName, const char *pParams, int Flags, const char *pHelp) = 0;
+	virtual void DeregisterTemp(const char *pName) = 0;
+	virtual void DeregisterTempAll() = 0;
+	virtual void Chain(const char *pName, FChainCommandCallback pfnChainFunc, void *pUser) = 0;
+	virtual void StoreCommands(bool Store) = 0;
+
+	virtual bool LineIsValid(const char *pStr) = 0;
+	virtual void ExecuteLine(const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) = 0;
+	virtual void ExecuteLineFlag(const char *pStr, int FlasgMask, int ClientID = -1, bool InterpretSemicolons = true) = 0;
+	virtual void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) = 0;
+	virtual bool ExecuteFile(const char *pFilename, int ClientID = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) = 0;
+
+	virtual char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr) = 0;
+	virtual void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor) const = 0;
+	virtual void SetTeeHistorianCommandCallback(FTeeHistorianCommandCallback pfnCallback, void *pUser) = 0;
+	virtual void SetUnknownCommandCallback(FUnknownCommandCallback pfnCallback, void *pUser) = 0;
+	virtual void InitChecksum(CChecksumData *pData) const = 0;
+
+	virtual void SetAccessLevel(int AccessLevel) = 0;
+
+	static LEVEL ToLogLevel(int ConsoleLevel);
+	static int ToLogLevelFilter(int ConsoleLevel);
+
+	// DDRace
+
+	virtual bool Cheated() const = 0;
+
+	virtual int FlagMask() const = 0;
+	virtual void SetFlagMask(int FlagMask) = 0;
+};
+
+std::unique_ptr<IConsole> CreateConsole(int FlagMask);
+
+#endif // FILE_ENGINE_CONSOLE_H
diff --git a/src_bkp/engine/console.rs b/src_bkp/engine/console.rs
new file mode 100644
index 0000000000..055c0802fa
--- /dev/null
+++ b/src_bkp/engine/console.rs
@@ -0,0 +1,550 @@
+use ddnet_base::ColorRGBA;
+use ddnet_base::UserPtr;
+
+pub use self::ffi::CreateConsole;
+pub use self::ffi::IConsole;
+pub use self::ffi::IConsole_IResult;
+
+/// Command callback for `IConsole`.
+///
+/// See [`IConsole::Register`] for an example.
+#[allow(non_camel_case_types)]
+#[repr(transparent)]
+pub struct IConsole_FCommandCallback(pub extern "C" fn(result: &IConsole_IResult, user: UserPtr));
+
+unsafe impl cxx::ExternType for IConsole_FCommandCallback {
+    type Id = cxx::type_id!("IConsole_FCommandCallback");
+    type Kind = cxx::kind::Trivial;
+}
+
+#[cxx::bridge]
+mod ffi {
+    unsafe extern "C++" {
+        include!("base/rust.h");
+        include!("engine/console.h");
+        include!("engine/rust.h");
+
+        type ColorRGBA = ddnet_base::ColorRGBA;
+        type ColorHSLA = ddnet_base::ColorHSLA;
+        type StrRef<'a> = ddnet_base::StrRef<'a>;
+        type UserPtr = ddnet_base::UserPtr;
+        type IConsole_FCommandCallback = super::IConsole_FCommandCallback;
+
+        /// Represents the arguments to a console command for [`IConsole`].
+        ///
+        /// You can only obtain this type in the command callback
+        /// [`IConsole_FCommandCallback`] specified in [`IConsole::Register`].
+        type IConsole_IResult;
+
+        /// Get the n-th parameter of the command as an integer.
+        ///
+        /// If the index is out of range, this returns 0. If the parameter
+        /// cannot be parsed as an integer, this also returns 0.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed = false;
+        /// # console.pin_mut().Register(s!("command"), s!("sss"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command "1337" abc -7331def"#), -1, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # unsafe { *user.cast_mut::<bool>() = true; }
+        /// let result: &IConsole_IResult /* = `command "1337" abc -7331def` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetInteger(0), 1337);
+        /// assert_eq!(result.GetInteger(1), 0); // unparsable
+        /// assert_eq!(result.GetInteger(2), -7331); // parsable start
+        /// assert_eq!(result.GetInteger(3), 0); // out of range
+        /// # }
+        /// # assert!(executed);
+        /// ```
+        pub fn GetInteger(self: &IConsole_IResult, Index: u32) -> i32;
+
+        /// Get the n-th parameter of the command as a floating point number.
+        ///
+        /// If the index is out of range, this returns 0.0. If the parameter
+        /// cannot be parsed as a floating point number, this also returns 0.0.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed = false;
+        /// # console.pin_mut().Register(s!("command"), s!("sss"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command "13.37" abc -73.31def"#), -1, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # unsafe { *user.cast_mut::<bool>() = true; }
+        /// let result: &IConsole_IResult /* = `command "13.37" abc -73.31def` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetFloat(0), 13.37);
+        /// assert_eq!(result.GetFloat(1), 0.0); // unparsable
+        /// assert_eq!(result.GetFloat(2), -73.31); // parsable start
+        /// assert_eq!(result.GetFloat(3), 0.0); // out of range
+        /// # }
+        /// # assert!(executed);
+        /// ```
+        pub fn GetFloat(self: &IConsole_IResult, Index: u32) -> f32;
+
+        /// Get the n-th parameter of the command as a string.
+        ///
+        /// If the index is out of range, this returns the empty string `""`.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed = false;
+        /// # console.pin_mut().Register(s!("command"), s!("sss"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command "I'm in space" '' "\"\\Escapes\?\"\n""#), -1, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # unsafe { *user.cast_mut::<bool>() = true; }
+        /// let result: &IConsole_IResult /* = `command "I'm in space" '' "\"\\Escapes\?\"\n"` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetString(0), "I'm in space");
+        /// assert_eq!(result.GetString(1), "''");
+        /// assert_eq!(result.GetString(2), r#""\Escapes\?"\n"#); // only \\ and \" escapes
+        /// assert_eq!(result.GetString(3), ""); // out of range
+        /// # }
+        /// # assert!(executed);
+        /// ```
+        pub fn GetString(self: &IConsole_IResult, Index: u32) -> StrRef<'_>;
+
+        /// Get the n-th parameter of the command as a color.
+        ///
+        /// If the index is out of range, this returns black. If the parameter
+        /// cannot be parsed as a color, this also returns black.
+        ///
+        /// It supports the following formats:
+        /// - `$XXX` (RGB, e.g. `$f00` for red)
+        /// - `$XXXX` (RGBA, e.g. `$f00f` for red with maximum opacity)
+        /// - `$XXXXXX` (RGB, e.g. `$ffa500` for DDNet's logo color)
+        /// - `$XXXXXXXX` (RGBA, e.g. `$ffa500ff` for DDNet's logo color with maximum opacity)
+        /// - base 10 integers (24/32 bit HSL in base 10, e.g. `0` for black)
+        /// - the following color names: `red`, `yellow`, `green`, `cyan`,
+        /// `blue`, `magenta`, `white`, `gray`, `black`.
+        ///
+        /// The `Light` parameter influences the interpretation of base 10
+        /// integers, if it is set, the lightness channel is divided by 2 and
+        /// 0.5 is added, making 0.5 the darkest and 1.0 the lightest possible
+        /// value.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::ColorHSLA;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed = false;
+        /// # console.pin_mut().Register(s!("command"), s!("ssssssss"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command "$f00" $ffa500 $12345 shiny cyan -16777216 $f008 $00ffff80"#), -1, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # unsafe { *user.cast_mut::<bool>() = true; }
+        /// let result: &IConsole_IResult /* = `command "$f00" $ffa500 $12345 shiny cyan -16777216 $f008 $00ffff80` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetColor(0, false), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 1.0 }); // red
+        /// assert_eq!(result.GetColor(1, false), ColorHSLA { h: 0.10784314, s: 1.0, l: 0.5, a: 1.0 }); // DDNet logo color
+        /// assert_eq!(result.GetColor(2, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // cannot be parsed => black
+        /// assert_eq!(result.GetColor(3, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // unknown color name => black
+        /// assert_eq!(result.GetColor(4, false), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 1.0 }); // cyan
+        /// assert_eq!(result.GetColor(5, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // black
+        /// assert_eq!(result.GetColor(6, false), ColorHSLA { h: 0.0, s: 1.0, l: 0.5, a: 0.53333336 }); // red with alpha specified
+        /// assert_eq!(result.GetColor(7, false), ColorHSLA { h: 0.5, s: 1.0, l: 0.5, a: 0.5019608 }); // cyan with alpha specified
+        /// assert_eq!(result.GetColor(8, false), ColorHSLA { h: 0.0, s: 0.0, l: 0.0, a: 1.0 }); // out of range => black
+        ///
+        /// assert_eq!(result.GetColor(0, true), result.GetColor(0, false));
+        /// assert_eq!(result.GetColor(1, true), result.GetColor(1, false));
+        /// assert_eq!(result.GetColor(2, true), result.GetColor(2, false));
+        /// assert_eq!(result.GetColor(3, true), result.GetColor(3, false));
+        /// assert_eq!(result.GetColor(4, true), result.GetColor(4, false));
+        /// assert_eq!(result.GetColor(5, true), ColorHSLA { h: 0.0, s: 0.0, l: 0.5, a: 1.0 }); // black, but has the `Light` parameter set
+        /// assert_eq!(result.GetColor(6, true), result.GetColor(6, false));
+        /// assert_eq!(result.GetColor(7, true), result.GetColor(7, false));
+        /// assert_eq!(result.GetColor(8, true), result.GetColor(8, false));
+        /// # }
+        /// # assert!(executed);
+        /// ```
+        pub fn GetColor(self: &IConsole_IResult, Index: u32, Light: bool) -> ColorHSLA;
+
+        /// Get the number of parameters passed.
+        ///
+        /// This is mostly important for commands that have optional parameters
+        /// (`?`) and thus support variable numbers of arguments.
+        ///
+        /// See [`IConsole::Register`] for more details.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::ColorHSLA;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed: u32 = 0;
+        /// # console.pin_mut().Register(s!("command"), s!("s?ss"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command one two three"#), -1, true);
+        /// # console.pin_mut().ExecuteLine(s!(r#"command "one two" "three four""#), -1, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # let executed;
+        /// # unsafe { executed = *user.cast_mut::<u32>(); *user.cast_mut::<u32>() += 1; }
+        /// # if executed == 0 {
+        /// let result: &IConsole_IResult /* = `command one two three` */;
+        /// # result = result_param;
+        /// assert_eq!(result.NumArguments(), 3);
+        ///
+        /// # } else if executed == 1 {
+        /// let result: &IConsole_IResult /* = `command "one two" "three four"` */;
+        /// # result = result_param;
+        /// assert_eq!(result.NumArguments(), 2);
+        /// # }
+        /// # }
+        /// # assert!(executed == 2);
+        /// ```
+        pub fn NumArguments(self: &IConsole_IResult) -> i32;
+
+        /// Get the value of the sole victim (`v`) parameter.
+        ///
+        /// This is mostly important for commands that have optional parameters
+        /// and thus support variable numbers of arguments.
+        ///
+        /// See [`IConsole::Register`] for more details.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// # use ddnet_base::UserPtr;
+        /// # use ddnet_base::s;
+        /// # use ddnet_engine::CreateConsole;
+        /// # use ddnet_engine::IConsole;
+        /// # use ddnet_engine::IConsole_FCommandCallback;
+        /// # use ddnet_engine::IConsole_IResult;
+        /// # use ddnet_engine_shared::CFGFLAG_SERVER;
+        /// #
+        /// # let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// # let mut executed: u32 = 0;
+        /// # console.pin_mut().Register(s!("command"), s!("v"), CFGFLAG_SERVER, IConsole_FCommandCallback(callback), UserPtr::from(&mut executed), s!(""));
+        /// # console.pin_mut().ExecuteLine(s!(r#"command me"#), 33, true);
+        /// # console.pin_mut().ExecuteLine(s!(r#"command string"#), 33, true);
+        /// # console.pin_mut().ExecuteLine(s!(r#"command 42"#), 33, true);
+        /// # console.pin_mut().ExecuteLine(s!(r#"command all"#), 33, true);
+        /// # extern "C" fn callback(result_param: &IConsole_IResult, mut user: UserPtr) {
+        /// # let executed;
+        /// # unsafe { executed = *user.cast_mut::<u32>(); *user.cast_mut::<u32>() += 1; }
+        /// # match executed {
+        /// # 0 => {
+        /// let result: &IConsole_IResult /* = `command me` */;
+        /// # result = result_param;
+        /// // Assume the executing client ID is 33.
+        /// assert_eq!(result.GetVictim(), 33);
+        ///
+        /// # }
+        /// # 1 => {
+        /// let result: &IConsole_IResult /* = `command string` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetVictim(), 0);
+        ///
+        /// # }
+        /// # 2 => {
+        /// let result: &IConsole_IResult /* = `command 42` */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetVictim(), 42);
+        ///
+        /// # }
+        /// # 3 => {
+        /// let result: &IConsole_IResult /* = `command all` first invocation */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetVictim(), 0);
+        /// # }
+        /// # 4 => {
+        /// let result: &IConsole_IResult /* = `command all` second invocation */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetVictim(), 1);
+        /// # }
+        /// // …
+        /// # 66 => {
+        /// let result: &IConsole_IResult /* = `command all` last invocation */;
+        /// # result = result_param;
+        /// assert_eq!(result.GetVictim(), 63);
+        /// # }
+        /// # _ => {}
+        /// # }
+        /// # }
+        /// # assert!(executed == 67);
+        /// ```
+        pub fn GetVictim(self: &IConsole_IResult) -> i32;
+
+        /// Console interface, consists of logging output and command execution.
+        ///
+        /// This is used for the local console in the client and the remote
+        /// console of the server. It handles commands, their inputs and
+        /// outputs, command completion and also command and log output.
+        ///
+        /// Call [`CreateConsole`] to obtain an instance.
+        type IConsole;
+
+        /// Execute a command in the console.
+        ///
+        /// Commands can be separated by semicolons (`;`), everything after a
+        /// hash sign (`#`) is treated as a comment and discarded. Parameters
+        /// are separated by spaces (` `). By quoting arguments with double
+        /// quotes (`"`), the special meaning of the other characters can be
+        /// disabled. Double quotes can be escaped as `\"` and backslashes can
+        /// be escaped as `\\` inside double quotes.
+        ///
+        /// When `InterpretSemicolons` is `false`, semicolons are not
+        /// interpreted unless the command starts with `mc;`.
+        ///
+        /// The `ClientID` parameter defaults to -1, `InterpretSemicolons` to
+        /// `true` in C++.
+        pub fn ExecuteLine(
+            self: Pin<&mut IConsole>,
+            pStr: StrRef<'_>,
+            ClientID: i32,
+            InterpretSemicolons: bool,
+        );
+
+        /// Log a message.
+        ///
+        /// `Level` is one of
+        /// - [`IConsole_OUTPUT_LEVEL_STANDARD`](constant.IConsole_OUTPUT_LEVEL_STANDARD.html)
+        /// - [`IConsole_OUTPUT_LEVEL_ADDINFO`](constant.IConsole_OUTPUT_LEVEL_ADDINFO.html)
+        /// - [`IConsole_OUTPUT_LEVEL_DEBUG`](constant.IConsole_OUTPUT_LEVEL_DEBUG.html)
+        ///
+        /// `pFrom` is some sort of module name, e.g. for code in the console,
+        /// it is usually "console". Other examples include "client",
+        /// "client/network", …
+        ///
+        /// `pStr` is the actual log message.
+        ///
+        /// `PrintColor` is the intended log color.
+        ///
+        /// `PrintColor` defaults to [`gs_ConsoleDefaultColor`] in C++.
+        pub fn Print(
+            self: &IConsole,
+            Level: i32,
+            pFrom: StrRef<'_>,
+            pStr: StrRef<'_>,
+            PrintColor: ColorRGBA,
+        );
+
+        /// Register a command.
+        ///
+        /// This function needs a command name, a parameter shortcode, some
+        /// flags that specify metadata about the command, a callback function
+        /// with associated `UserPtr` and a help string.
+        ///
+        /// `Flags` must be a combination of
+        /// - [`CFGFLAG_SAVE`](../ddnet_engine_shared/constant.CFGFLAG_SAVE.html)
+        /// - [`CFGFLAG_CLIENT`](../ddnet_engine_shared/constant.CFGFLAG_CLIENT.html)
+        /// - [`CFGFLAG_SERVER`](../ddnet_engine_shared/constant.CFGFLAG_SERVER.html)
+        /// - [`CFGFLAG_STORE`](../ddnet_engine_shared/constant.CFGFLAG_STORE.html)
+        /// - [`CFGFLAG_MASTER`](../ddnet_engine_shared/constant.CFGFLAG_MASTER.html)
+        /// - [`CFGFLAG_ECON`](../ddnet_engine_shared/constant.CFGFLAG_ECON.html)
+        /// - [`CMDFLAG_TEST`](../ddnet_engine_shared/constant.CMDFLAG_TEST.html)
+        /// - [`CFGFLAG_CHAT`](../ddnet_engine_shared/constant.CFGFLAG_CHAT.html)
+        /// - [`CFGFLAG_GAME`](../ddnet_engine_shared/constant.CFGFLAG_GAME.html)
+        /// - [`CFGFLAG_NONTEEHISTORIC`](../ddnet_engine_shared/constant.CFGFLAG_NONTEEHISTORIC.html)
+        /// - [`CFGFLAG_COLLIGHT`](../ddnet_engine_shared/constant.CFGFLAG_COLLIGHT.html)
+        /// - [`CFGFLAG_INSENSITIVE`](../ddnet_engine_shared/constant.CFGFLAG_INSENSITIVE.html)
+        ///
+        /// # Parameter shortcode
+        ///
+        /// The following parameter types are supported:
+        ///
+        /// - `i`, `f`, `s`: **I**nteger, **f**loat, and **s**tring parameter,
+        ///   respectively.  Since they're not type-checked, they're all the
+        ///   same, one word delimited by whitespace or any quoted string.
+        ///   Examples: `12`, `example`, `"Hello, World!"`.
+        /// - `r`: **R**est of the command line, possibly multiple word, until
+        ///   the next command or the end of line. Alternatively one quoted
+        ///   parameter. Examples: `multiple words even without quotes`,
+        ///   `"quotes are fine, too"`.
+        /// - `v`: **V**ictim client ID for this command. Supports the special
+        ///   parameters `me` for the executing client ID, and `all` to target
+        ///   all players. Examples: `0`, `63`, `words` (gets parsed as `0`),
+        ///   `me`, `all`.
+        ///
+        /// The parameter shortcode is now a string consisting of any number of
+        /// these parameter type characters, a question mark `?` to mark the
+        /// beginning of optional parameters and `[<string>]` help strings after
+        /// each parameter that can have a short explanation.
+        ///
+        /// Examples:
+        ///
+        /// - `echo` has `r[text]`: Takes the whole command line as the first
+        ///   parameter. This means we get the following arguments:
+        ///   ```text
+        ///   ## "1"
+        ///   echo 1
+        ///
+        ///   ## "multiple words"
+        ///   echo multiple words
+        ///
+        ///   ## error: missing argument
+        ///   echo
+        ///
+        ///   ## "multiple"
+        ///   echo "multiple" "quoted" "arguments"
+        ///
+        ///   ## "comments"
+        ///   echo comments # work too
+        ///
+        ///   ## "multiple"; "commands"
+        ///   echo multiple; echo commands
+        ///   ```
+        /// - `muteid` has `v[id] i[seconds] ?r[reason]`. Assume the local
+        ///   player has client ID 33, then we get the following
+        ///   arguments:
+        ///   ```text
+        ///   ## "33" "60"
+        ///   muteid me 60
+        ///
+        ///   ## "12" "120" "You're a wonderful person"
+        ///   muteid 12 120 You're a wonderful person
+        ///
+        ///   ## "0" "180"; "1" "180"; …, "63" "180"
+        ///   muteid all 180
+        ///   ```
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// use ddnet_base::UserPtr;
+        /// use ddnet_base::s;
+        /// use ddnet_engine::CreateConsole;
+        /// use ddnet_engine::IConsole;
+        /// use ddnet_engine::IConsole_FCommandCallback;
+        /// use ddnet_engine::IConsole_IResult;
+        /// use ddnet_engine::IConsole_OUTPUT_LEVEL_STANDARD;
+        /// use ddnet_engine::gs_ConsoleDefaultColor;
+        /// use ddnet_engine_shared::CFGFLAG_SERVER;
+        ///
+        /// extern "C" fn print_callback(_: &IConsole_IResult, user: UserPtr) {
+        ///     let console: &IConsole = unsafe { user.cast() };
+        ///     console.Print(IConsole_OUTPUT_LEVEL_STANDARD, s!("example"), s!("print callback"), gs_ConsoleDefaultColor);
+        /// }
+        ///
+        /// let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// let user = (&*console).into();
+        /// console.pin_mut().Register(s!("example"), s!(""), CFGFLAG_SERVER, IConsole_FCommandCallback(print_callback), user, s!("Example command outputting a single line into the console"));
+        /// console.pin_mut().ExecuteLine(s!("example"), -1, true);
+        /// ```
+        pub fn Register(
+            self: Pin<&mut IConsole>,
+            pName: StrRef<'_>,
+            pParams: StrRef<'_>,
+            Flags: i32,
+            pfnFunc: IConsole_FCommandCallback,
+            pUser: UserPtr,
+            pHelp: StrRef<'_>,
+        );
+
+        /// Create a console instance.
+        ///
+        /// It comes with a few registered commands by default. Only the
+        /// commands sharing a bit with the `FlagMask` parameter are considered
+        /// when executing commands.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # extern crate ddnet_test;
+        /// use ddnet_base::s;
+        /// use ddnet_engine::CreateConsole;
+        /// use ddnet_engine_shared::CFGFLAG_SERVER;
+        ///
+        /// let mut console = CreateConsole(CFGFLAG_SERVER);
+        /// console.pin_mut().ExecuteLine(s!("cmdlist; echo hi!"), -1, true);
+        /// ```
+        pub fn CreateConsole(FlagMask: i32) -> UniquePtr<IConsole>;
+    }
+}
+
+/// Default console output color. White.
+///
+/// Corresponds to the `gs_ConsoleDefaultColor` constant of the same name in
+/// C++.
+///
+/// Used as a last parameter in [`IConsole::Print`].
+///
+/// It is treated as "no color" in the console code, meaning that the default
+/// color of the output medium isn't overridden.
+#[allow(non_upper_case_globals)]
+pub const gs_ConsoleDefaultColor: ColorRGBA = ColorRGBA {
+    r: 1.0,
+    g: 1.0,
+    b: 1.0,
+    a: 1.0,
+};
+
+/// Default console output level.
+///
+/// Corresponds to the `IConsole::OUTPUT_LEVEL_STANDARD` enum value in C++.
+///
+/// Used as a first parameter in [`IConsole::Print`].
+///
+/// This is the only level that is shown by default.
+#[allow(non_upper_case_globals)]
+pub const IConsole_OUTPUT_LEVEL_STANDARD: i32 = 0;
+/// First more verbose console output level.
+///
+/// Corresponds to the `IConsole::OUTPUT_LEVEL_ADDINFO` enum value in C++.
+///
+/// Used as a first parameter in [`IConsole::Print`].
+///
+/// This output level is not shown by default.
+#[allow(non_upper_case_globals)]
+pub const IConsole_OUTPUT_LEVEL_ADDINFO: i32 = 1;
+/// Most verbose console output level.
+///
+/// Corresponds to the `IConsole::OUTPUT_LEVEL_DEBUG` enum value in C++.
+///
+/// Used as a first parameter in [`IConsole::Print`].
+///
+/// This output level is not shown by default.
+#[allow(non_upper_case_globals)]
+pub const IConsole_OUTPUT_LEVEL_DEBUG: i32 = 2;
diff --git a/src_bkp/engine/demo.h b/src_bkp/engine/demo.h
new file mode 100644
index 0000000000..f42193e9b0
--- /dev/null
+++ b/src_bkp/engine/demo.h
@@ -0,0 +1,118 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_DEMO_H
+#define ENGINE_DEMO_H
+
+#include "kernel.h"
+#include <base/hash.h>
+#include <engine/map.h>
+#include <engine/shared/uuid_manager.h>
+
+#include <cstdint>
+
+enum
+{
+	MAX_TIMELINE_MARKERS = 64
+};
+
+static const unsigned char gs_aHeaderMarker[7] = {'T', 'W', 'D', 'E', 'M', 'O', 0};
+
+constexpr int g_DemoSpeeds = 22;
+extern const double g_aSpeeds[g_DemoSpeeds];
+
+typedef bool (*DEMOFUNC_FILTER)(const void *pData, int DataSize, void *pUser);
+
+// TODO: Properly extend demo format using uuids
+// "6be6da4a-cebd-380c-9b5b-1289c842d780"
+// "demoitem-sha256@ddnet.tw"
+extern const CUuid SHA256_EXTENSION;
+
+struct CDemoHeader
+{
+	unsigned char m_aMarker[7];
+	unsigned char m_Version;
+	char m_aNetversion[64];
+	char m_aMapName[64];
+	unsigned char m_aMapSize[sizeof(int32_t)];
+	unsigned char m_aMapCrc[sizeof(int32_t)];
+	char m_aType[8];
+	unsigned char m_aLength[sizeof(int32_t)];
+	char m_aTimestamp[20];
+
+	bool Valid() const;
+};
+
+struct CTimelineMarkers
+{
+	unsigned char m_aNumTimelineMarkers[sizeof(int32_t)];
+	unsigned char m_aTimelineMarkers[MAX_TIMELINE_MARKERS][sizeof(int32_t)];
+};
+
+struct CMapInfo
+{
+	char m_aName[MAX_MAP_LENGTH];
+	SHA256_DIGEST m_Sha256;
+	unsigned m_Crc;
+	unsigned m_Size;
+};
+
+class IDemoPlayer : public IInterface
+{
+	MACRO_INTERFACE("demoplayer")
+public:
+	class CInfo
+	{
+	public:
+		bool m_Paused;
+		float m_Speed;
+
+		int m_FirstTick;
+		int m_CurrentTick;
+		int m_LastTick;
+
+		int m_NumTimelineMarkers;
+		int m_aTimelineMarkers[MAX_TIMELINE_MARKERS];
+	};
+
+	enum ETickOffset
+	{
+		TICK_CURRENT, // update the current tick again
+		TICK_PREVIOUS, // go to the previous tick
+		TICK_NEXT, // go to the next tick
+	};
+
+	virtual ~IDemoPlayer() {}
+	virtual void SetSpeed(float Speed) = 0;
+	virtual void SetSpeedIndex(int SpeedIndex) = 0;
+	virtual void AdjustSpeedIndex(int Offset) = 0;
+	virtual int SeekPercent(float Percent) = 0;
+	virtual int SeekTime(float Seconds) = 0;
+	virtual int SeekTick(ETickOffset TickOffset) = 0;
+	virtual int SetPos(int WantedTick) = 0;
+	virtual void Pause() = 0;
+	virtual void Unpause() = 0;
+	virtual bool IsPlaying() const = 0;
+	virtual const CInfo *BaseInfo() const = 0;
+	virtual void GetDemoName(char *pBuffer, size_t BufferSize) const = 0;
+	virtual bool GetDemoInfo(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo, IOHANDLE *pFile = nullptr, char *pErrorMessage = nullptr, size_t ErrorMessageSize = 0) const = 0;
+};
+
+class IDemoRecorder : public IInterface
+{
+	MACRO_INTERFACE("demorecorder")
+public:
+	virtual ~IDemoRecorder() {}
+	virtual bool IsRecording() const = 0;
+	virtual int Stop() = 0;
+	virtual int Length() const = 0;
+	virtual char *GetCurrentFilename() = 0;
+};
+
+class IDemoEditor : public IInterface
+{
+	MACRO_INTERFACE("demoeditor")
+public:
+	virtual void Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) = 0;
+};
+
+#endif
diff --git a/src_bkp/engine/discord.h b/src_bkp/engine/discord.h
new file mode 100644
index 0000000000..aed8a15f2e
--- /dev/null
+++ b/src_bkp/engine/discord.h
@@ -0,0 +1,20 @@
+#ifndef ENGINE_DISCORD_H
+#define ENGINE_DISCORD_H
+
+#include "kernel.h"
+#include <base/types.h>
+
+class IDiscord : public IInterface
+{
+	MACRO_INTERFACE("discord")
+public:
+	virtual void Update() = 0;
+	virtual void Start() = 0;
+
+	virtual void ClearGameInfo() = 0;
+	virtual void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr, const char *pText, const char *pImage, const char *pPlayerName) = 0;
+};
+
+IDiscord *CreateDiscord();
+
+#endif // ENGINE_DISCORD_H
\ No newline at end of file
diff --git a/src_bkp/engine/editor.h b/src_bkp/engine/editor.h
new file mode 100644
index 0000000000..745868062a
--- /dev/null
+++ b/src_bkp/engine/editor.h
@@ -0,0 +1,30 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_EDITOR_H
+#define ENGINE_EDITOR_H
+#include "kernel.h"
+
+class IEditor : public IInterface
+{
+	MACRO_INTERFACE("editor")
+public:
+	virtual ~IEditor() {}
+	virtual void Init() = 0;
+	virtual void OnUpdate() = 0;
+	virtual void OnRender() = 0;
+	virtual void OnActivate() = 0;
+	virtual void OnWindowResize() = 0;
+	virtual void OnClose() = 0;
+	virtual void OnDialogClose() = 0;
+	virtual bool HasUnsavedData() const = 0;
+	virtual bool HandleMapDrop(const char *pFilename, int StorageType) = 0;
+	virtual bool Load(const char *pFilename, int StorageType) = 0;
+	virtual bool Save(const char *pFilename) = 0;
+	virtual void UpdateMentions() = 0;
+	virtual void ResetMentions() = 0;
+	virtual void OnIngameMoved() = 0;
+	virtual void ResetIngameMoved() = 0;
+};
+
+extern IEditor *CreateEditor();
+#endif
diff --git a/src_bkp/engine/engine.h b/src_bkp/engine/engine.h
new file mode 100644
index 0000000000..937a2a2722
--- /dev/null
+++ b/src_bkp/engine/engine.h
@@ -0,0 +1,31 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_ENGINE_H
+#define ENGINE_ENGINE_H
+
+#include "kernel.h"
+#include <engine/shared/jobs.h>
+
+class CFutureLogger;
+class ILogger;
+
+class IEngine : public IInterface
+{
+	MACRO_INTERFACE("engine")
+
+protected:
+	class CJobPool m_JobPool;
+
+public:
+	virtual ~IEngine() = default;
+
+	virtual void Init() = 0;
+	virtual void AddJob(std::shared_ptr<IJob> pJob) = 0;
+	virtual void SetAdditionalLogger(std::shared_ptr<ILogger> &&pLogger) = 0;
+	static void RunJobBlocking(IJob *pJob);
+};
+
+extern IEngine *CreateEngine(const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs);
+extern IEngine *CreateTestEngine(const char *pAppname, int Jobs);
+
+#endif
diff --git a/src_bkp/engine/external/.clang-format b/src_bkp/engine/external/.clang-format
new file mode 100644
index 0000000000..259fe7fbec
--- /dev/null
+++ b/src_bkp/engine/external/.clang-format
@@ -0,0 +1,3 @@
+DisableFormat: true
+# clang-format bug: still sorts includes even if disabled
+SortIncludes: false
diff --git a/src_bkp/engine/external/.clang-tidy b/src_bkp/engine/external/.clang-tidy
new file mode 100644
index 0000000000..d550bc98a4
--- /dev/null
+++ b/src_bkp/engine/external/.clang-tidy
@@ -0,0 +1,3 @@
+# Need at least one check, otherwise clang-tidy fails, use one that can't
+# happen in our code since we don't use OpenMP API.
+Checks: '-*,openmp-exception-escape'
diff --git a/src_bkp/engine/external/glew/GL/eglew.h b/src_bkp/engine/external/glew/GL/eglew.h
new file mode 100644
index 0000000000..4670147948
--- /dev/null
+++ b/src_bkp/engine/external/glew/GL/eglew.h
@@ -0,0 +1,2618 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2008-2017, Nigel Stewart <nigels[]users sourceforge net>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.0
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#ifndef __eglew_h__
+#define __eglew_h__
+#define __EGLEW_H__
+
+#ifdef __eglext_h_
+#error eglext.h included before eglew.h
+#endif
+
+#if defined(__egl_h_)
+#error egl.h included before eglew.h
+#endif
+
+#define __eglext_h_
+
+#define __egl_h_
+
+#ifndef EGLAPIENTRY
+#define EGLAPIENTRY
+#endif
+#ifndef EGLAPI
+#define EGLAPI extern
+#endif
+
+/* EGL Types */
+#include <sys/types.h>
+
+#include <KHR/khrplatform.h>
+#include <EGL/eglplatform.h>
+
+#include <GL/glew.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int32_t EGLint;
+
+typedef unsigned int EGLBoolean;
+typedef void *EGLDisplay;
+typedef void *EGLConfig;
+typedef void *EGLSurface;
+typedef void *EGLContext;
+typedef void (*__eglMustCastToProperFunctionPointerType)(void);
+
+typedef unsigned int EGLenum;
+typedef void *EGLClientBuffer;
+
+typedef void *EGLSync;
+typedef intptr_t EGLAttrib;
+typedef khronos_utime_nanoseconds_t EGLTime;
+typedef void *EGLImage;
+
+typedef void *EGLSyncKHR;
+typedef intptr_t EGLAttribKHR;
+typedef void *EGLLabelKHR;
+typedef void *EGLObjectKHR;
+typedef void (EGLAPIENTRY  *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message);
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+typedef void *EGLImageKHR;
+typedef void *EGLStreamKHR;
+typedef khronos_uint64_t EGLuint64KHR;
+typedef int EGLNativeFileDescriptorKHR;
+typedef khronos_ssize_t EGLsizeiANDROID;
+typedef void (*EGLSetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize);
+typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, void *value, EGLsizeiANDROID valueSize);
+typedef void *EGLDeviceEXT;
+typedef void *EGLOutputLayerEXT;
+typedef void *EGLOutputPortEXT;
+typedef void *EGLSyncNV;
+typedef khronos_utime_nanoseconds_t EGLTimeNV;
+typedef khronos_utime_nanoseconds_t EGLuint64NV;
+typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
+
+struct EGLClientPixmapHI;
+
+#define EGL_DONT_CARE                     ((EGLint)-1)
+
+#define EGL_NO_CONTEXT                    ((EGLContext)0)
+#define EGL_NO_DISPLAY                    ((EGLDisplay)0)
+#define EGL_NO_IMAGE                      ((EGLImage)0)
+#define EGL_NO_SURFACE                    ((EGLSurface)0)
+#define EGL_NO_SYNC                       ((EGLSync)0)
+
+#define EGL_UNKNOWN                       ((EGLint)-1)
+
+#define EGL_DEFAULT_DISPLAY               ((EGLNativeDisplayType)0)
+
+EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress (const char *procname);
+/* ---------------------------- EGL_VERSION_1_0 ---------------------------- */
+
+#ifndef EGL_VERSION_1_0
+#define EGL_VERSION_1_0 1
+
+#define EGL_FALSE 0
+#define EGL_PBUFFER_BIT 0x0001
+#define EGL_TRUE 1
+#define EGL_PIXMAP_BIT 0x0002
+#define EGL_WINDOW_BIT 0x0004
+#define EGL_SUCCESS 0x3000
+#define EGL_NOT_INITIALIZED 0x3001
+#define EGL_BAD_ACCESS 0x3002
+#define EGL_BAD_ALLOC 0x3003
+#define EGL_BAD_ATTRIBUTE 0x3004
+#define EGL_BAD_CONFIG 0x3005
+#define EGL_BAD_CONTEXT 0x3006
+#define EGL_BAD_CURRENT_SURFACE 0x3007
+#define EGL_BAD_DISPLAY 0x3008
+#define EGL_BAD_MATCH 0x3009
+#define EGL_BAD_NATIVE_PIXMAP 0x300A
+#define EGL_BAD_NATIVE_WINDOW 0x300B
+#define EGL_BAD_PARAMETER 0x300C
+#define EGL_BAD_SURFACE 0x300D
+#define EGL_BUFFER_SIZE 0x3020
+#define EGL_ALPHA_SIZE 0x3021
+#define EGL_BLUE_SIZE 0x3022
+#define EGL_GREEN_SIZE 0x3023
+#define EGL_RED_SIZE 0x3024
+#define EGL_DEPTH_SIZE 0x3025
+#define EGL_STENCIL_SIZE 0x3026
+#define EGL_CONFIG_CAVEAT 0x3027
+#define EGL_CONFIG_ID 0x3028
+#define EGL_LEVEL 0x3029
+#define EGL_MAX_PBUFFER_HEIGHT 0x302A
+#define EGL_MAX_PBUFFER_PIXELS 0x302B
+#define EGL_MAX_PBUFFER_WIDTH 0x302C
+#define EGL_NATIVE_RENDERABLE 0x302D
+#define EGL_NATIVE_VISUAL_ID 0x302E
+#define EGL_NATIVE_VISUAL_TYPE 0x302F
+#define EGL_SAMPLES 0x3031
+#define EGL_SAMPLE_BUFFERS 0x3032
+#define EGL_SURFACE_TYPE 0x3033
+#define EGL_TRANSPARENT_TYPE 0x3034
+#define EGL_TRANSPARENT_BLUE_VALUE 0x3035
+#define EGL_TRANSPARENT_GREEN_VALUE 0x3036
+#define EGL_TRANSPARENT_RED_VALUE 0x3037
+#define EGL_NONE 0x3038
+#define EGL_SLOW_CONFIG 0x3050
+#define EGL_NON_CONFORMANT_CONFIG 0x3051
+#define EGL_TRANSPARENT_RGB 0x3052
+#define EGL_VENDOR 0x3053
+#define EGL_VERSION 0x3054
+#define EGL_EXTENSIONS 0x3055
+#define EGL_HEIGHT 0x3056
+#define EGL_WIDTH 0x3057
+#define EGL_LARGEST_PBUFFER 0x3058
+#define EGL_DRAW 0x3059
+#define EGL_READ 0x305A
+#define EGL_CORE_NATIVE_ENGINE 0x305B
+
+typedef EGLBoolean  ( * PFNEGLCHOOSECONFIGPROC) (EGLDisplay  dpy, const EGLint * attrib_list, EGLConfig * configs, EGLint  config_size, EGLint * num_config);
+typedef EGLBoolean  ( * PFNEGLCOPYBUFFERSPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLNativePixmapType  target);
+typedef EGLContext  ( * PFNEGLCREATECONTEXTPROC) (EGLDisplay  dpy, EGLConfig  config, EGLContext  share_context, const EGLint * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay  dpy, EGLConfig  config, const EGLint * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay  dpy, EGLConfig  config, EGLNativePixmapType  pixmap, const EGLint * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay  dpy, EGLConfig  config, EGLNativeWindowType  win, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYCONTEXTPROC) (EGLDisplay  dpy, EGLContext  ctx);
+typedef EGLBoolean  ( * PFNEGLDESTROYSURFACEPROC) (EGLDisplay  dpy, EGLSurface  surface);
+typedef EGLBoolean  ( * PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay  dpy, EGLConfig  config, EGLint  attribute, EGLint * value);
+typedef EGLBoolean  ( * PFNEGLGETCONFIGSPROC) (EGLDisplay  dpy, EGLConfig * configs, EGLint  config_size, EGLint * num_config);
+typedef EGLDisplay  ( * PFNEGLGETCURRENTDISPLAYPROC) ( void );
+typedef EGLSurface  ( * PFNEGLGETCURRENTSURFACEPROC) (EGLint  readdraw);
+typedef EGLDisplay  ( * PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType  display_id);
+typedef EGLint  ( * PFNEGLGETERRORPROC) ( void );
+typedef EGLBoolean  ( * PFNEGLINITIALIZEPROC) (EGLDisplay  dpy, EGLint * major, EGLint * minor);
+typedef EGLBoolean  ( * PFNEGLMAKECURRENTPROC) (EGLDisplay  dpy, EGLSurface  draw, EGLSurface  read, EGLContext  ctx);
+typedef EGLBoolean  ( * PFNEGLQUERYCONTEXTPROC) (EGLDisplay  dpy, EGLContext  ctx, EGLint  attribute, EGLint * value);
+typedef const char * ( * PFNEGLQUERYSTRINGPROC) (EGLDisplay  dpy, EGLint  name);
+typedef EGLBoolean  ( * PFNEGLQUERYSURFACEPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  attribute, EGLint * value);
+typedef EGLBoolean  ( * PFNEGLSWAPBUFFERSPROC) (EGLDisplay  dpy, EGLSurface  surface);
+typedef EGLBoolean  ( * PFNEGLTERMINATEPROC) (EGLDisplay  dpy);
+typedef EGLBoolean  ( * PFNEGLWAITGLPROC) ( void );
+typedef EGLBoolean  ( * PFNEGLWAITNATIVEPROC) (EGLint  engine);
+
+#define eglChooseConfig EGLEW_GET_FUN(__eglewChooseConfig)
+#define eglCopyBuffers EGLEW_GET_FUN(__eglewCopyBuffers)
+#define eglCreateContext EGLEW_GET_FUN(__eglewCreateContext)
+#define eglCreatePbufferSurface EGLEW_GET_FUN(__eglewCreatePbufferSurface)
+#define eglCreatePixmapSurface EGLEW_GET_FUN(__eglewCreatePixmapSurface)
+#define eglCreateWindowSurface EGLEW_GET_FUN(__eglewCreateWindowSurface)
+#define eglDestroyContext EGLEW_GET_FUN(__eglewDestroyContext)
+#define eglDestroySurface EGLEW_GET_FUN(__eglewDestroySurface)
+#define eglGetConfigAttrib EGLEW_GET_FUN(__eglewGetConfigAttrib)
+#define eglGetConfigs EGLEW_GET_FUN(__eglewGetConfigs)
+#define eglGetCurrentDisplay EGLEW_GET_FUN(__eglewGetCurrentDisplay)
+#define eglGetCurrentSurface EGLEW_GET_FUN(__eglewGetCurrentSurface)
+#define eglGetDisplay EGLEW_GET_FUN(__eglewGetDisplay)
+#define eglGetError EGLEW_GET_FUN(__eglewGetError)
+#define eglInitialize EGLEW_GET_FUN(__eglewInitialize)
+#define eglMakeCurrent EGLEW_GET_FUN(__eglewMakeCurrent)
+#define eglQueryContext EGLEW_GET_FUN(__eglewQueryContext)
+#define eglQueryString EGLEW_GET_FUN(__eglewQueryString)
+#define eglQuerySurface EGLEW_GET_FUN(__eglewQuerySurface)
+#define eglSwapBuffers EGLEW_GET_FUN(__eglewSwapBuffers)
+#define eglTerminate EGLEW_GET_FUN(__eglewTerminate)
+#define eglWaitGL EGLEW_GET_FUN(__eglewWaitGL)
+#define eglWaitNative EGLEW_GET_FUN(__eglewWaitNative)
+
+#define EGLEW_VERSION_1_0 EGLEW_GET_VAR(__EGLEW_VERSION_1_0)
+
+#endif /* EGL_VERSION_1_0 */
+
+/* ---------------------------- EGL_VERSION_1_1 ---------------------------- */
+
+#ifndef EGL_VERSION_1_1
+#define EGL_VERSION_1_1 1
+
+#define EGL_CONTEXT_LOST 0x300E
+#define EGL_BIND_TO_TEXTURE_RGB 0x3039
+#define EGL_BIND_TO_TEXTURE_RGBA 0x303A
+#define EGL_MIN_SWAP_INTERVAL 0x303B
+#define EGL_MAX_SWAP_INTERVAL 0x303C
+#define EGL_NO_TEXTURE 0x305C
+#define EGL_TEXTURE_RGB 0x305D
+#define EGL_TEXTURE_RGBA 0x305E
+#define EGL_TEXTURE_2D 0x305F
+#define EGL_TEXTURE_FORMAT 0x3080
+#define EGL_TEXTURE_TARGET 0x3081
+#define EGL_MIPMAP_TEXTURE 0x3082
+#define EGL_MIPMAP_LEVEL 0x3083
+#define EGL_BACK_BUFFER 0x3084
+
+typedef EGLBoolean  ( * PFNEGLBINDTEXIMAGEPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  buffer);
+typedef EGLBoolean  ( * PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  buffer);
+typedef EGLBoolean  ( * PFNEGLSURFACEATTRIBPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  attribute, EGLint  value);
+typedef EGLBoolean  ( * PFNEGLSWAPINTERVALPROC) (EGLDisplay  dpy, EGLint  interval);
+
+#define eglBindTexImage EGLEW_GET_FUN(__eglewBindTexImage)
+#define eglReleaseTexImage EGLEW_GET_FUN(__eglewReleaseTexImage)
+#define eglSurfaceAttrib EGLEW_GET_FUN(__eglewSurfaceAttrib)
+#define eglSwapInterval EGLEW_GET_FUN(__eglewSwapInterval)
+
+#define EGLEW_VERSION_1_1 EGLEW_GET_VAR(__EGLEW_VERSION_1_1)
+
+#endif /* EGL_VERSION_1_1 */
+
+/* ---------------------------- EGL_VERSION_1_2 ---------------------------- */
+
+#ifndef EGL_VERSION_1_2
+#define EGL_VERSION_1_2 1
+
+#define EGL_OPENGL_ES_BIT 0x0001
+#define EGL_OPENVG_BIT 0x0002
+#define EGL_LUMINANCE_SIZE 0x303D
+#define EGL_ALPHA_MASK_SIZE 0x303E
+#define EGL_COLOR_BUFFER_TYPE 0x303F
+#define EGL_RENDERABLE_TYPE 0x3040
+#define EGL_SINGLE_BUFFER 0x3085
+#define EGL_RENDER_BUFFER 0x3086
+#define EGL_COLORSPACE 0x3087
+#define EGL_ALPHA_FORMAT 0x3088
+#define EGL_COLORSPACE_LINEAR 0x308A
+#define EGL_ALPHA_FORMAT_NONPRE 0x308B
+#define EGL_ALPHA_FORMAT_PRE 0x308C
+#define EGL_CLIENT_APIS 0x308D
+#define EGL_RGB_BUFFER 0x308E
+#define EGL_LUMINANCE_BUFFER 0x308F
+#define EGL_HORIZONTAL_RESOLUTION 0x3090
+#define EGL_VERTICAL_RESOLUTION 0x3091
+#define EGL_PIXEL_ASPECT_RATIO 0x3092
+#define EGL_SWAP_BEHAVIOR 0x3093
+#define EGL_BUFFER_PRESERVED 0x3094
+#define EGL_BUFFER_DESTROYED 0x3095
+#define EGL_OPENVG_IMAGE 0x3096
+#define EGL_CONTEXT_CLIENT_TYPE 0x3097
+#define EGL_OPENGL_ES_API 0x30A0
+#define EGL_OPENVG_API 0x30A1
+#define EGL_DISPLAY_SCALING 10000
+
+typedef EGLBoolean  ( * PFNEGLBINDAPIPROC) (EGLenum  api);
+typedef EGLSurface  ( * PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay  dpy, EGLenum  buftype, EGLClientBuffer  buffer, EGLConfig  config, const EGLint * attrib_list);
+typedef EGLenum  ( * PFNEGLQUERYAPIPROC) ( void );
+typedef EGLBoolean  ( * PFNEGLRELEASETHREADPROC) ( void );
+typedef EGLBoolean  ( * PFNEGLWAITCLIENTPROC) ( void );
+
+#define eglBindAPI EGLEW_GET_FUN(__eglewBindAPI)
+#define eglCreatePbufferFromClientBuffer EGLEW_GET_FUN(__eglewCreatePbufferFromClientBuffer)
+#define eglQueryAPI EGLEW_GET_FUN(__eglewQueryAPI)
+#define eglReleaseThread EGLEW_GET_FUN(__eglewReleaseThread)
+#define eglWaitClient EGLEW_GET_FUN(__eglewWaitClient)
+
+#define EGLEW_VERSION_1_2 EGLEW_GET_VAR(__EGLEW_VERSION_1_2)
+
+#endif /* EGL_VERSION_1_2 */
+
+/* ---------------------------- EGL_VERSION_1_3 ---------------------------- */
+
+#ifndef EGL_VERSION_1_3
+#define EGL_VERSION_1_3 1
+
+#define EGL_OPENGL_ES2_BIT 0x0004
+#define EGL_VG_COLORSPACE_LINEAR_BIT 0x0020
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT 0x0040
+#define EGL_MATCH_NATIVE_PIXMAP 0x3041
+#define EGL_CONFORMANT 0x3042
+#define EGL_VG_COLORSPACE 0x3087
+#define EGL_VG_ALPHA_FORMAT 0x3088
+#define EGL_VG_COLORSPACE_LINEAR 0x308A
+#define EGL_VG_ALPHA_FORMAT_NONPRE 0x308B
+#define EGL_VG_ALPHA_FORMAT_PRE 0x308C
+#define EGL_CONTEXT_CLIENT_VERSION 0x3098
+
+#define EGLEW_VERSION_1_3 EGLEW_GET_VAR(__EGLEW_VERSION_1_3)
+
+#endif /* EGL_VERSION_1_3 */
+
+/* ---------------------------- EGL_VERSION_1_4 ---------------------------- */
+
+#ifndef EGL_VERSION_1_4
+#define EGL_VERSION_1_4 1
+
+#define EGL_OPENGL_BIT 0x0008
+#define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200
+#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400
+#define EGL_MULTISAMPLE_RESOLVE 0x3099
+#define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A
+#define EGL_MULTISAMPLE_RESOLVE_BOX 0x309B
+#define EGL_OPENGL_API 0x30A2
+
+typedef EGLContext  ( * PFNEGLGETCURRENTCONTEXTPROC) ( void );
+
+#define eglGetCurrentContext EGLEW_GET_FUN(__eglewGetCurrentContext)
+
+#define EGLEW_VERSION_1_4 EGLEW_GET_VAR(__EGLEW_VERSION_1_4)
+
+#endif /* EGL_VERSION_1_4 */
+
+/* ---------------------------- EGL_VERSION_1_5 ---------------------------- */
+
+#ifndef EGL_VERSION_1_5
+#define EGL_VERSION_1_5 1
+
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT 0x00000001
+#define EGL_SYNC_FLUSH_COMMANDS_BIT 0x0001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define EGL_OPENGL_ES3_BIT 0x00000040
+#define EGL_GL_COLORSPACE_SRGB 0x3089
+#define EGL_GL_COLORSPACE_LINEAR 0x308A
+#define EGL_CONTEXT_MAJOR_VERSION 0x3098
+#define EGL_CL_EVENT_HANDLE 0x309C
+#define EGL_GL_COLORSPACE 0x309D
+#define EGL_GL_TEXTURE_2D 0x30B1
+#define EGL_GL_TEXTURE_3D 0x30B2
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x30B3
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x30B4
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x30B5
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x30B6
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8
+#define EGL_GL_RENDERBUFFER 0x30B9
+#define EGL_GL_TEXTURE_LEVEL 0x30BC
+#define EGL_GL_TEXTURE_ZOFFSET 0x30BD
+#define EGL_IMAGE_PRESERVED 0x30D2
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE 0x30F0
+#define EGL_SYNC_STATUS 0x30F1
+#define EGL_SIGNALED 0x30F2
+#define EGL_UNSIGNALED 0x30F3
+#define EGL_TIMEOUT_EXPIRED 0x30F5
+#define EGL_CONDITION_SATISFIED 0x30F6
+#define EGL_SYNC_TYPE 0x30F7
+#define EGL_SYNC_CONDITION 0x30F8
+#define EGL_SYNC_FENCE 0x30F9
+#define EGL_CONTEXT_MINOR_VERSION 0x30FB
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK 0x30FD
+#define EGL_SYNC_CL_EVENT 0x30FE
+#define EGL_SYNC_CL_EVENT_COMPLETE 0x30FF
+#define EGL_CONTEXT_OPENGL_DEBUG 0x31B0
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE 0x31B1
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS 0x31B2
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY 0x31BD
+#define EGL_NO_RESET_NOTIFICATION 0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET 0x31BF
+#define EGL_FOREVER 0xFFFFFFFFFFFFFFFF
+
+typedef EGLint  ( * PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay  dpy, EGLSync  sync, EGLint  flags, EGLTime  timeout);
+typedef EGLImage  ( * PFNEGLCREATEIMAGEPROC) (EGLDisplay  dpy, EGLContext  ctx, EGLenum  target, EGLClientBuffer  buffer, const EGLAttrib * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay  dpy, EGLConfig  config, void * native_pixmap, const EGLAttrib * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay  dpy, EGLConfig  config, void * native_window, const EGLAttrib * attrib_list);
+typedef EGLSync  ( * PFNEGLCREATESYNCPROC) (EGLDisplay  dpy, EGLenum  type, const EGLAttrib * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYIMAGEPROC) (EGLDisplay  dpy, EGLImage  image);
+typedef EGLBoolean  ( * PFNEGLDESTROYSYNCPROC) (EGLDisplay  dpy, EGLSync  sync);
+typedef EGLDisplay  ( * PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum  platform, void * native_display, const EGLAttrib * attrib_list);
+typedef EGLBoolean  ( * PFNEGLGETSYNCATTRIBPROC) (EGLDisplay  dpy, EGLSync  sync, EGLint  attribute, EGLAttrib * value);
+typedef EGLBoolean  ( * PFNEGLWAITSYNCPROC) (EGLDisplay  dpy, EGLSync  sync, EGLint  flags);
+
+#define eglClientWaitSync EGLEW_GET_FUN(__eglewClientWaitSync)
+#define eglCreateImage EGLEW_GET_FUN(__eglewCreateImage)
+#define eglCreatePlatformPixmapSurface EGLEW_GET_FUN(__eglewCreatePlatformPixmapSurface)
+#define eglCreatePlatformWindowSurface EGLEW_GET_FUN(__eglewCreatePlatformWindowSurface)
+#define eglCreateSync EGLEW_GET_FUN(__eglewCreateSync)
+#define eglDestroyImage EGLEW_GET_FUN(__eglewDestroyImage)
+#define eglDestroySync EGLEW_GET_FUN(__eglewDestroySync)
+#define eglGetPlatformDisplay EGLEW_GET_FUN(__eglewGetPlatformDisplay)
+#define eglGetSyncAttrib EGLEW_GET_FUN(__eglewGetSyncAttrib)
+#define eglWaitSync EGLEW_GET_FUN(__eglewWaitSync)
+
+#define EGLEW_VERSION_1_5 EGLEW_GET_VAR(__EGLEW_VERSION_1_5)
+
+#endif /* EGL_VERSION_1_5 */
+
+/* ------------------------- EGL_ANDROID_blob_cache ------------------------ */
+
+#ifndef EGL_ANDROID_blob_cache
+#define EGL_ANDROID_blob_cache 1
+
+typedef void  ( * PFNEGLSETBLOBCACHEFUNCSANDROIDPROC) (EGLDisplay  dpy, EGLSetBlobFuncANDROID  set, EGLGetBlobFuncANDROID  get);
+
+#define eglSetBlobCacheFuncsANDROID EGLEW_GET_FUN(__eglewSetBlobCacheFuncsANDROID)
+
+#define EGLEW_ANDROID_blob_cache EGLEW_GET_VAR(__EGLEW_ANDROID_blob_cache)
+
+#endif /* EGL_ANDROID_blob_cache */
+
+/* ---------------- EGL_ANDROID_create_native_client_buffer ---------------- */
+
+#ifndef EGL_ANDROID_create_native_client_buffer
+#define EGL_ANDROID_create_native_client_buffer 1
+
+#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001
+#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002
+#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID 0x00000004
+#define EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143
+
+typedef EGLClientBuffer  ( * PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC) (const EGLint * attrib_list);
+
+#define eglCreateNativeClientBufferANDROID EGLEW_GET_FUN(__eglewCreateNativeClientBufferANDROID)
+
+#define EGLEW_ANDROID_create_native_client_buffer EGLEW_GET_VAR(__EGLEW_ANDROID_create_native_client_buffer)
+
+#endif /* EGL_ANDROID_create_native_client_buffer */
+
+/* --------------------- EGL_ANDROID_framebuffer_target -------------------- */
+
+#ifndef EGL_ANDROID_framebuffer_target
+#define EGL_ANDROID_framebuffer_target 1
+
+#define EGL_FRAMEBUFFER_TARGET_ANDROID 0x3147
+
+#define EGLEW_ANDROID_framebuffer_target EGLEW_GET_VAR(__EGLEW_ANDROID_framebuffer_target)
+
+#endif /* EGL_ANDROID_framebuffer_target */
+
+/* ----------------- EGL_ANDROID_front_buffer_auto_refresh ----------------- */
+
+#ifndef EGL_ANDROID_front_buffer_auto_refresh
+#define EGL_ANDROID_front_buffer_auto_refresh 1
+
+#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C
+
+#define EGLEW_ANDROID_front_buffer_auto_refresh EGLEW_GET_VAR(__EGLEW_ANDROID_front_buffer_auto_refresh)
+
+#endif /* EGL_ANDROID_front_buffer_auto_refresh */
+
+/* -------------------- EGL_ANDROID_image_native_buffer -------------------- */
+
+#ifndef EGL_ANDROID_image_native_buffer
+#define EGL_ANDROID_image_native_buffer 1
+
+#define EGL_NATIVE_BUFFER_ANDROID 0x3140
+
+#define EGLEW_ANDROID_image_native_buffer EGLEW_GET_VAR(__EGLEW_ANDROID_image_native_buffer)
+
+#endif /* EGL_ANDROID_image_native_buffer */
+
+/* --------------------- EGL_ANDROID_native_fence_sync --------------------- */
+
+#ifndef EGL_ANDROID_native_fence_sync
+#define EGL_ANDROID_native_fence_sync 1
+
+#define EGL_SYNC_NATIVE_FENCE_ANDROID 0x3144
+#define EGL_SYNC_NATIVE_FENCE_FD_ANDROID 0x3145
+#define EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID 0x3146
+
+typedef EGLint  ( * PFNEGLDUPNATIVEFENCEFDANDROIDPROC) (EGLDisplay  dpy, EGLSyncKHR  sync);
+
+#define eglDupNativeFenceFDANDROID EGLEW_GET_FUN(__eglewDupNativeFenceFDANDROID)
+
+#define EGLEW_ANDROID_native_fence_sync EGLEW_GET_VAR(__EGLEW_ANDROID_native_fence_sync)
+
+#endif /* EGL_ANDROID_native_fence_sync */
+
+/* --------------------- EGL_ANDROID_presentation_time --------------------- */
+
+#ifndef EGL_ANDROID_presentation_time
+#define EGL_ANDROID_presentation_time 1
+
+typedef EGLBoolean  ( * PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLnsecsANDROID  time);
+
+#define eglPresentationTimeANDROID EGLEW_GET_FUN(__eglewPresentationTimeANDROID)
+
+#define EGLEW_ANDROID_presentation_time EGLEW_GET_VAR(__EGLEW_ANDROID_presentation_time)
+
+#endif /* EGL_ANDROID_presentation_time */
+
+/* ------------------------- EGL_ANDROID_recordable ------------------------ */
+
+#ifndef EGL_ANDROID_recordable
+#define EGL_ANDROID_recordable 1
+
+#define EGL_RECORDABLE_ANDROID 0x3142
+
+#define EGLEW_ANDROID_recordable EGLEW_GET_VAR(__EGLEW_ANDROID_recordable)
+
+#endif /* EGL_ANDROID_recordable */
+
+/* ---------------- EGL_ANGLE_d3d_share_handle_client_buffer --------------- */
+
+#ifndef EGL_ANGLE_d3d_share_handle_client_buffer
+#define EGL_ANGLE_d3d_share_handle_client_buffer 1
+
+#define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE 0x3200
+
+#define EGLEW_ANGLE_d3d_share_handle_client_buffer EGLEW_GET_VAR(__EGLEW_ANGLE_d3d_share_handle_client_buffer)
+
+#endif /* EGL_ANGLE_d3d_share_handle_client_buffer */
+
+/* -------------------------- EGL_ANGLE_device_d3d ------------------------- */
+
+#ifndef EGL_ANGLE_device_d3d
+#define EGL_ANGLE_device_d3d 1
+
+#define EGL_D3D9_DEVICE_ANGLE 0x33A0
+#define EGL_D3D11_DEVICE_ANGLE 0x33A1
+
+#define EGLEW_ANGLE_device_d3d EGLEW_GET_VAR(__EGLEW_ANGLE_device_d3d)
+
+#endif /* EGL_ANGLE_device_d3d */
+
+/* -------------------- EGL_ANGLE_query_surface_pointer -------------------- */
+
+#ifndef EGL_ANGLE_query_surface_pointer
+#define EGL_ANGLE_query_surface_pointer 1
+
+typedef EGLBoolean  ( * PFNEGLQUERYSURFACEPOINTERANGLEPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  attribute, void ** value);
+
+#define eglQuerySurfacePointerANGLE EGLEW_GET_FUN(__eglewQuerySurfacePointerANGLE)
+
+#define EGLEW_ANGLE_query_surface_pointer EGLEW_GET_VAR(__EGLEW_ANGLE_query_surface_pointer)
+
+#endif /* EGL_ANGLE_query_surface_pointer */
+
+/* ------------- EGL_ANGLE_surface_d3d_texture_2d_share_handle ------------- */
+
+#ifndef EGL_ANGLE_surface_d3d_texture_2d_share_handle
+#define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1
+
+#define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE 0x3200
+
+#define EGLEW_ANGLE_surface_d3d_texture_2d_share_handle EGLEW_GET_VAR(__EGLEW_ANGLE_surface_d3d_texture_2d_share_handle)
+
+#endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */
+
+/* ---------------------- EGL_ANGLE_window_fixed_size ---------------------- */
+
+#ifndef EGL_ANGLE_window_fixed_size
+#define EGL_ANGLE_window_fixed_size 1
+
+#define EGL_FIXED_SIZE_ANGLE 0x3201
+
+#define EGLEW_ANGLE_window_fixed_size EGLEW_GET_VAR(__EGLEW_ANGLE_window_fixed_size)
+
+#endif /* EGL_ANGLE_window_fixed_size */
+
+/* --------------------- EGL_ARM_implicit_external_sync -------------------- */
+
+#ifndef EGL_ARM_implicit_external_sync
+#define EGL_ARM_implicit_external_sync 1
+
+#define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A
+
+#define EGLEW_ARM_implicit_external_sync EGLEW_GET_VAR(__EGLEW_ARM_implicit_external_sync)
+
+#endif /* EGL_ARM_implicit_external_sync */
+
+/* ------------------- EGL_ARM_pixmap_multisample_discard ------------------ */
+
+#ifndef EGL_ARM_pixmap_multisample_discard
+#define EGL_ARM_pixmap_multisample_discard 1
+
+#define EGL_DISCARD_SAMPLES_ARM 0x3286
+
+#define EGLEW_ARM_pixmap_multisample_discard EGLEW_GET_VAR(__EGLEW_ARM_pixmap_multisample_discard)
+
+#endif /* EGL_ARM_pixmap_multisample_discard */
+
+/* --------------------------- EGL_EXT_buffer_age -------------------------- */
+
+#ifndef EGL_EXT_buffer_age
+#define EGL_EXT_buffer_age 1
+
+#define EGL_BUFFER_AGE_EXT 0x313D
+
+#define EGLEW_EXT_buffer_age EGLEW_GET_VAR(__EGLEW_EXT_buffer_age)
+
+#endif /* EGL_EXT_buffer_age */
+
+/* ----------------------- EGL_EXT_client_extensions ----------------------- */
+
+#ifndef EGL_EXT_client_extensions
+#define EGL_EXT_client_extensions 1
+
+#define EGLEW_EXT_client_extensions EGLEW_GET_VAR(__EGLEW_EXT_client_extensions)
+
+#endif /* EGL_EXT_client_extensions */
+
+/* ------------------- EGL_EXT_create_context_robustness ------------------- */
+
+#ifndef EGL_EXT_create_context_robustness
+#define EGL_EXT_create_context_robustness 1
+
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT 0x3138
+#define EGL_NO_RESET_NOTIFICATION_EXT 0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_EXT 0x31BF
+
+#define EGLEW_EXT_create_context_robustness EGLEW_GET_VAR(__EGLEW_EXT_create_context_robustness)
+
+#endif /* EGL_EXT_create_context_robustness */
+
+/* -------------------------- EGL_EXT_device_base -------------------------- */
+
+#ifndef EGL_EXT_device_base
+#define EGL_EXT_device_base 1
+
+#define EGL_BAD_DEVICE_EXT 0x322B
+#define EGL_DEVICE_EXT 0x322C
+
+#define EGLEW_EXT_device_base EGLEW_GET_VAR(__EGLEW_EXT_device_base)
+
+#endif /* EGL_EXT_device_base */
+
+/* --------------------------- EGL_EXT_device_drm -------------------------- */
+
+#ifndef EGL_EXT_device_drm
+#define EGL_EXT_device_drm 1
+
+#define EGL_DRM_DEVICE_FILE_EXT 0x3233
+
+#define EGLEW_EXT_device_drm EGLEW_GET_VAR(__EGLEW_EXT_device_drm)
+
+#endif /* EGL_EXT_device_drm */
+
+/* ----------------------- EGL_EXT_device_enumeration ---------------------- */
+
+#ifndef EGL_EXT_device_enumeration
+#define EGL_EXT_device_enumeration 1
+
+typedef EGLBoolean  ( * PFNEGLQUERYDEVICESEXTPROC) (EGLint  max_devices, EGLDeviceEXT * devices, EGLint * num_devices);
+
+#define eglQueryDevicesEXT EGLEW_GET_FUN(__eglewQueryDevicesEXT)
+
+#define EGLEW_EXT_device_enumeration EGLEW_GET_VAR(__EGLEW_EXT_device_enumeration)
+
+#endif /* EGL_EXT_device_enumeration */
+
+/* ------------------------- EGL_EXT_device_openwf ------------------------- */
+
+#ifndef EGL_EXT_device_openwf
+#define EGL_EXT_device_openwf 1
+
+#define EGL_OPENWF_DEVICE_ID_EXT 0x3237
+
+#define EGLEW_EXT_device_openwf EGLEW_GET_VAR(__EGLEW_EXT_device_openwf)
+
+#endif /* EGL_EXT_device_openwf */
+
+/* -------------------------- EGL_EXT_device_query ------------------------- */
+
+#ifndef EGL_EXT_device_query
+#define EGL_EXT_device_query 1
+
+#define EGL_BAD_DEVICE_EXT 0x322B
+#define EGL_DEVICE_EXT 0x322C
+
+typedef EGLBoolean  ( * PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT  device, EGLint  attribute, EGLAttrib * value);
+typedef const char * ( * PFNEGLQUERYDEVICESTRINGEXTPROC) (EGLDeviceEXT  device, EGLint  name);
+typedef EGLBoolean  ( * PFNEGLQUERYDISPLAYATTRIBEXTPROC) (EGLDisplay  dpy, EGLint  attribute, EGLAttrib * value);
+
+#define eglQueryDeviceAttribEXT EGLEW_GET_FUN(__eglewQueryDeviceAttribEXT)
+#define eglQueryDeviceStringEXT EGLEW_GET_FUN(__eglewQueryDeviceStringEXT)
+#define eglQueryDisplayAttribEXT EGLEW_GET_FUN(__eglewQueryDisplayAttribEXT)
+
+#define EGLEW_EXT_device_query EGLEW_GET_VAR(__EGLEW_EXT_device_query)
+
+#endif /* EGL_EXT_device_query */
+
+/* ------------------ EGL_EXT_gl_colorspace_bt2020_linear ------------------ */
+
+#ifndef EGL_EXT_gl_colorspace_bt2020_linear
+#define EGL_EXT_gl_colorspace_bt2020_linear 1
+
+#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F
+
+#define EGLEW_EXT_gl_colorspace_bt2020_linear EGLEW_GET_VAR(__EGLEW_EXT_gl_colorspace_bt2020_linear)
+
+#endif /* EGL_EXT_gl_colorspace_bt2020_linear */
+
+/* -------------------- EGL_EXT_gl_colorspace_bt2020_pq -------------------- */
+
+#ifndef EGL_EXT_gl_colorspace_bt2020_pq
+#define EGL_EXT_gl_colorspace_bt2020_pq 1
+
+#define EGL_GL_COLORSPACE_BT2020_PQ_EXT 0x3340
+
+#define EGLEW_EXT_gl_colorspace_bt2020_pq EGLEW_GET_VAR(__EGLEW_EXT_gl_colorspace_bt2020_pq)
+
+#endif /* EGL_EXT_gl_colorspace_bt2020_pq */
+
+/* ------------------- EGL_EXT_gl_colorspace_scrgb_linear ------------------ */
+
+#ifndef EGL_EXT_gl_colorspace_scrgb_linear
+#define EGL_EXT_gl_colorspace_scrgb_linear 1
+
+#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350
+
+#define EGLEW_EXT_gl_colorspace_scrgb_linear EGLEW_GET_VAR(__EGLEW_EXT_gl_colorspace_scrgb_linear)
+
+#endif /* EGL_EXT_gl_colorspace_scrgb_linear */
+
+/* ---------------------- EGL_EXT_image_dma_buf_import --------------------- */
+
+#ifndef EGL_EXT_image_dma_buf_import
+#define EGL_EXT_image_dma_buf_import 1
+
+#define EGL_LINUX_DMA_BUF_EXT 0x3270
+#define EGL_LINUX_DRM_FOURCC_EXT 0x3271
+#define EGL_DMA_BUF_PLANE0_FD_EXT 0x3272
+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT 0x3273
+#define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274
+#define EGL_DMA_BUF_PLANE1_FD_EXT 0x3275
+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT 0x3276
+#define EGL_DMA_BUF_PLANE1_PITCH_EXT 0x3277
+#define EGL_DMA_BUF_PLANE2_FD_EXT 0x3278
+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT 0x3279
+#define EGL_DMA_BUF_PLANE2_PITCH_EXT 0x327A
+#define EGL_YUV_COLOR_SPACE_HINT_EXT 0x327B
+#define EGL_SAMPLE_RANGE_HINT_EXT 0x327C
+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E
+#define EGL_ITU_REC601_EXT 0x327F
+#define EGL_ITU_REC709_EXT 0x3280
+#define EGL_ITU_REC2020_EXT 0x3281
+#define EGL_YUV_FULL_RANGE_EXT 0x3282
+#define EGL_YUV_NARROW_RANGE_EXT 0x3283
+#define EGL_YUV_CHROMA_SITING_0_EXT 0x3284
+#define EGL_YUV_CHROMA_SITING_0_5_EXT 0x3285
+
+#define EGLEW_EXT_image_dma_buf_import EGLEW_GET_VAR(__EGLEW_EXT_image_dma_buf_import)
+
+#endif /* EGL_EXT_image_dma_buf_import */
+
+/* ----------------- EGL_EXT_image_dma_buf_import_modifiers ---------------- */
+
+#ifndef EGL_EXT_image_dma_buf_import_modifiers
+#define EGL_EXT_image_dma_buf_import_modifiers 1
+
+#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440
+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441
+#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442
+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443
+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444
+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445
+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446
+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447
+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448
+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449
+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A
+
+typedef EGLBoolean  ( * PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay  dpy, EGLint  max_formats, EGLint  *formats, EGLint  *num_formats);
+typedef EGLBoolean  ( * PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay  dpy, EGLint  format, EGLint  max_modifiers, EGLuint64KHR  *modifiers, EGLBoolean  *external_only, EGLint  *num_modifiers);
+
+#define eglQueryDmaBufFormatsEXT EGLEW_GET_FUN(__eglewQueryDmaBufFormatsEXT)
+#define eglQueryDmaBufModifiersEXT EGLEW_GET_FUN(__eglewQueryDmaBufModifiersEXT)
+
+#define EGLEW_EXT_image_dma_buf_import_modifiers EGLEW_GET_VAR(__EGLEW_EXT_image_dma_buf_import_modifiers)
+
+#endif /* EGL_EXT_image_dma_buf_import_modifiers */
+
+/* ------------------------ EGL_EXT_multiview_window ----------------------- */
+
+#ifndef EGL_EXT_multiview_window
+#define EGL_EXT_multiview_window 1
+
+#define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134
+
+#define EGLEW_EXT_multiview_window EGLEW_GET_VAR(__EGLEW_EXT_multiview_window)
+
+#endif /* EGL_EXT_multiview_window */
+
+/* -------------------------- EGL_EXT_output_base -------------------------- */
+
+#ifndef EGL_EXT_output_base
+#define EGL_EXT_output_base 1
+
+#define EGL_BAD_OUTPUT_LAYER_EXT 0x322D
+#define EGL_BAD_OUTPUT_PORT_EXT 0x322E
+#define EGL_SWAP_INTERVAL_EXT 0x322F
+
+typedef EGLBoolean  ( * PFNEGLGETOUTPUTLAYERSEXTPROC) (EGLDisplay  dpy, const EGLAttrib * attrib_list, EGLOutputLayerEXT * layers, EGLint  max_layers, EGLint * num_layers);
+typedef EGLBoolean  ( * PFNEGLGETOUTPUTPORTSEXTPROC) (EGLDisplay  dpy, const EGLAttrib * attrib_list, EGLOutputPortEXT * ports, EGLint  max_ports, EGLint * num_ports);
+typedef EGLBoolean  ( * PFNEGLOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay  dpy, EGLOutputLayerEXT  layer, EGLint  attribute, EGLAttrib  value);
+typedef EGLBoolean  ( * PFNEGLOUTPUTPORTATTRIBEXTPROC) (EGLDisplay  dpy, EGLOutputPortEXT  port, EGLint  attribute, EGLAttrib  value);
+typedef EGLBoolean  ( * PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay  dpy, EGLOutputLayerEXT  layer, EGLint  attribute, EGLAttrib * value);
+typedef const char * ( * PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC) (EGLDisplay  dpy, EGLOutputLayerEXT  layer, EGLint  name);
+typedef EGLBoolean  ( * PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC) (EGLDisplay  dpy, EGLOutputPortEXT  port, EGLint  attribute, EGLAttrib * value);
+typedef const char * ( * PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC) (EGLDisplay  dpy, EGLOutputPortEXT  port, EGLint  name);
+
+#define eglGetOutputLayersEXT EGLEW_GET_FUN(__eglewGetOutputLayersEXT)
+#define eglGetOutputPortsEXT EGLEW_GET_FUN(__eglewGetOutputPortsEXT)
+#define eglOutputLayerAttribEXT EGLEW_GET_FUN(__eglewOutputLayerAttribEXT)
+#define eglOutputPortAttribEXT EGLEW_GET_FUN(__eglewOutputPortAttribEXT)
+#define eglQueryOutputLayerAttribEXT EGLEW_GET_FUN(__eglewQueryOutputLayerAttribEXT)
+#define eglQueryOutputLayerStringEXT EGLEW_GET_FUN(__eglewQueryOutputLayerStringEXT)
+#define eglQueryOutputPortAttribEXT EGLEW_GET_FUN(__eglewQueryOutputPortAttribEXT)
+#define eglQueryOutputPortStringEXT EGLEW_GET_FUN(__eglewQueryOutputPortStringEXT)
+
+#define EGLEW_EXT_output_base EGLEW_GET_VAR(__EGLEW_EXT_output_base)
+
+#endif /* EGL_EXT_output_base */
+
+/* --------------------------- EGL_EXT_output_drm -------------------------- */
+
+#ifndef EGL_EXT_output_drm
+#define EGL_EXT_output_drm 1
+
+#define EGL_DRM_CRTC_EXT 0x3234
+#define EGL_DRM_PLANE_EXT 0x3235
+#define EGL_DRM_CONNECTOR_EXT 0x3236
+
+#define EGLEW_EXT_output_drm EGLEW_GET_VAR(__EGLEW_EXT_output_drm)
+
+#endif /* EGL_EXT_output_drm */
+
+/* ------------------------- EGL_EXT_output_openwf ------------------------- */
+
+#ifndef EGL_EXT_output_openwf
+#define EGL_EXT_output_openwf 1
+
+#define EGL_OPENWF_PIPELINE_ID_EXT 0x3238
+#define EGL_OPENWF_PORT_ID_EXT 0x3239
+
+#define EGLEW_EXT_output_openwf EGLEW_GET_VAR(__EGLEW_EXT_output_openwf)
+
+#endif /* EGL_EXT_output_openwf */
+
+/* ----------------------- EGL_EXT_pixel_format_float ---------------------- */
+
+#ifndef EGL_EXT_pixel_format_float
+#define EGL_EXT_pixel_format_float 1
+
+#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339
+#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A
+#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B
+
+#define EGLEW_EXT_pixel_format_float EGLEW_GET_VAR(__EGLEW_EXT_pixel_format_float)
+
+#endif /* EGL_EXT_pixel_format_float */
+
+/* ------------------------- EGL_EXT_platform_base ------------------------- */
+
+#ifndef EGL_EXT_platform_base
+#define EGL_EXT_platform_base 1
+
+typedef EGLSurface  ( * PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC) (EGLDisplay  dpy, EGLConfig  config, void * native_pixmap, const EGLint * attrib_list);
+typedef EGLSurface  ( * PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay  dpy, EGLConfig  config, void * native_window, const EGLint * attrib_list);
+typedef EGLDisplay  ( * PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum  platform, void * native_display, const EGLint * attrib_list);
+
+#define eglCreatePlatformPixmapSurfaceEXT EGLEW_GET_FUN(__eglewCreatePlatformPixmapSurfaceEXT)
+#define eglCreatePlatformWindowSurfaceEXT EGLEW_GET_FUN(__eglewCreatePlatformWindowSurfaceEXT)
+#define eglGetPlatformDisplayEXT EGLEW_GET_FUN(__eglewGetPlatformDisplayEXT)
+
+#define EGLEW_EXT_platform_base EGLEW_GET_VAR(__EGLEW_EXT_platform_base)
+
+#endif /* EGL_EXT_platform_base */
+
+/* ------------------------ EGL_EXT_platform_device ------------------------ */
+
+#ifndef EGL_EXT_platform_device
+#define EGL_EXT_platform_device 1
+
+#define EGL_PLATFORM_DEVICE_EXT 0x313F
+
+#define EGLEW_EXT_platform_device EGLEW_GET_VAR(__EGLEW_EXT_platform_device)
+
+#endif /* EGL_EXT_platform_device */
+
+/* ------------------------ EGL_EXT_platform_wayland ----------------------- */
+
+#ifndef EGL_EXT_platform_wayland
+#define EGL_EXT_platform_wayland 1
+
+#define EGL_PLATFORM_WAYLAND_EXT 0x31D8
+
+#define EGLEW_EXT_platform_wayland EGLEW_GET_VAR(__EGLEW_EXT_platform_wayland)
+
+#endif /* EGL_EXT_platform_wayland */
+
+/* -------------------------- EGL_EXT_platform_x11 ------------------------- */
+
+#ifndef EGL_EXT_platform_x11
+#define EGL_EXT_platform_x11 1
+
+#define EGL_PLATFORM_X11_EXT 0x31D5
+#define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6
+
+#define EGLEW_EXT_platform_x11 EGLEW_GET_VAR(__EGLEW_EXT_platform_x11)
+
+#endif /* EGL_EXT_platform_x11 */
+
+/* ----------------------- EGL_EXT_protected_content ----------------------- */
+
+#ifndef EGL_EXT_protected_content
+#define EGL_EXT_protected_content 1
+
+#define EGL_PROTECTED_CONTENT_EXT 0x32C0
+
+#define EGLEW_EXT_protected_content EGLEW_GET_VAR(__EGLEW_EXT_protected_content)
+
+#endif /* EGL_EXT_protected_content */
+
+/* ----------------------- EGL_EXT_protected_surface ----------------------- */
+
+#ifndef EGL_EXT_protected_surface
+#define EGL_EXT_protected_surface 1
+
+#define EGL_PROTECTED_CONTENT_EXT 0x32C0
+
+#define EGLEW_EXT_protected_surface EGLEW_GET_VAR(__EGLEW_EXT_protected_surface)
+
+#endif /* EGL_EXT_protected_surface */
+
+/* ------------------- EGL_EXT_stream_consumer_egloutput ------------------- */
+
+#ifndef EGL_EXT_stream_consumer_egloutput
+#define EGL_EXT_stream_consumer_egloutput 1
+
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLOutputLayerEXT  layer);
+
+#define eglStreamConsumerOutputEXT EGLEW_GET_FUN(__eglewStreamConsumerOutputEXT)
+
+#define EGLEW_EXT_stream_consumer_egloutput EGLEW_GET_VAR(__EGLEW_EXT_stream_consumer_egloutput)
+
+#endif /* EGL_EXT_stream_consumer_egloutput */
+
+/* ------------------- EGL_EXT_surface_SMPTE2086_metadata ------------------ */
+
+#ifndef EGL_EXT_surface_SMPTE2086_metadata
+#define EGL_EXT_surface_SMPTE2086_metadata 1
+
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT 0x3342
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT 0x3343
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT 0x3344
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT 0x3345
+#define EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT 0x3346
+#define EGL_SMPTE2086_WHITE_POINT_X_EXT 0x3347
+#define EGL_SMPTE2086_WHITE_POINT_Y_EXT 0x3348
+#define EGL_SMPTE2086_MAX_LUMINANCE_EXT 0x3349
+#define EGL_SMPTE2086_MIN_LUMINANCE_EXT 0x334A
+
+#define EGLEW_EXT_surface_SMPTE2086_metadata EGLEW_GET_VAR(__EGLEW_EXT_surface_SMPTE2086_metadata)
+
+#endif /* EGL_EXT_surface_SMPTE2086_metadata */
+
+/* -------------------- EGL_EXT_swap_buffers_with_damage ------------------- */
+
+#ifndef EGL_EXT_swap_buffers_with_damage
+#define EGL_EXT_swap_buffers_with_damage 1
+
+typedef EGLBoolean  ( * PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint * rects, EGLint  n_rects);
+
+#define eglSwapBuffersWithDamageEXT EGLEW_GET_FUN(__eglewSwapBuffersWithDamageEXT)
+
+#define EGLEW_EXT_swap_buffers_with_damage EGLEW_GET_VAR(__EGLEW_EXT_swap_buffers_with_damage)
+
+#endif /* EGL_EXT_swap_buffers_with_damage */
+
+/* -------------------------- EGL_EXT_yuv_surface -------------------------- */
+
+#ifndef EGL_EXT_yuv_surface
+#define EGL_EXT_yuv_surface 1
+
+#define EGL_YUV_BUFFER_EXT 0x3300
+#define EGL_YUV_ORDER_EXT 0x3301
+#define EGL_YUV_ORDER_YUV_EXT 0x3302
+#define EGL_YUV_ORDER_YVU_EXT 0x3303
+#define EGL_YUV_ORDER_YUYV_EXT 0x3304
+#define EGL_YUV_ORDER_UYVY_EXT 0x3305
+#define EGL_YUV_ORDER_YVYU_EXT 0x3306
+#define EGL_YUV_ORDER_VYUY_EXT 0x3307
+#define EGL_YUV_ORDER_AYUV_EXT 0x3308
+#define EGL_YUV_CSC_STANDARD_EXT 0x330A
+#define EGL_YUV_CSC_STANDARD_601_EXT 0x330B
+#define EGL_YUV_CSC_STANDARD_709_EXT 0x330C
+#define EGL_YUV_CSC_STANDARD_2020_EXT 0x330D
+#define EGL_YUV_NUMBER_OF_PLANES_EXT 0x3311
+#define EGL_YUV_SUBSAMPLE_EXT 0x3312
+#define EGL_YUV_SUBSAMPLE_4_2_0_EXT 0x3313
+#define EGL_YUV_SUBSAMPLE_4_2_2_EXT 0x3314
+#define EGL_YUV_SUBSAMPLE_4_4_4_EXT 0x3315
+#define EGL_YUV_DEPTH_RANGE_EXT 0x3317
+#define EGL_YUV_DEPTH_RANGE_LIMITED_EXT 0x3318
+#define EGL_YUV_DEPTH_RANGE_FULL_EXT 0x3319
+#define EGL_YUV_PLANE_BPP_EXT 0x331A
+#define EGL_YUV_PLANE_BPP_0_EXT 0x331B
+#define EGL_YUV_PLANE_BPP_8_EXT 0x331C
+#define EGL_YUV_PLANE_BPP_10_EXT 0x331D
+
+#define EGLEW_EXT_yuv_surface EGLEW_GET_VAR(__EGLEW_EXT_yuv_surface)
+
+#endif /* EGL_EXT_yuv_surface */
+
+/* -------------------------- EGL_HI_clientpixmap -------------------------- */
+
+#ifndef EGL_HI_clientpixmap
+#define EGL_HI_clientpixmap 1
+
+#define EGL_CLIENT_PIXMAP_POINTER_HI 0x8F74
+
+typedef EGLSurface  ( * PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay  dpy, EGLConfig  config, struct EGLClientPixmapHI * pixmap);
+
+#define eglCreatePixmapSurfaceHI EGLEW_GET_FUN(__eglewCreatePixmapSurfaceHI)
+
+#define EGLEW_HI_clientpixmap EGLEW_GET_VAR(__EGLEW_HI_clientpixmap)
+
+#endif /* EGL_HI_clientpixmap */
+
+/* -------------------------- EGL_HI_colorformats -------------------------- */
+
+#ifndef EGL_HI_colorformats
+#define EGL_HI_colorformats 1
+
+#define EGL_COLOR_FORMAT_HI 0x8F70
+#define EGL_COLOR_RGB_HI 0x8F71
+#define EGL_COLOR_RGBA_HI 0x8F72
+#define EGL_COLOR_ARGB_HI 0x8F73
+
+#define EGLEW_HI_colorformats EGLEW_GET_VAR(__EGLEW_HI_colorformats)
+
+#endif /* EGL_HI_colorformats */
+
+/* ------------------------ EGL_IMG_context_priority ----------------------- */
+
+#ifndef EGL_IMG_context_priority
+#define EGL_IMG_context_priority 1
+
+#define EGL_CONTEXT_PRIORITY_LEVEL_IMG 0x3100
+#define EGL_CONTEXT_PRIORITY_HIGH_IMG 0x3101
+#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG 0x3102
+#define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103
+
+#define EGLEW_IMG_context_priority EGLEW_GET_VAR(__EGLEW_IMG_context_priority)
+
+#endif /* EGL_IMG_context_priority */
+
+/* ---------------------- EGL_IMG_image_plane_attribs ---------------------- */
+
+#ifndef EGL_IMG_image_plane_attribs
+#define EGL_IMG_image_plane_attribs 1
+
+#define EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG 0x3105
+#define EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG 0x3106
+
+#define EGLEW_IMG_image_plane_attribs EGLEW_GET_VAR(__EGLEW_IMG_image_plane_attribs)
+
+#endif /* EGL_IMG_image_plane_attribs */
+
+/* ---------------------------- EGL_KHR_cl_event --------------------------- */
+
+#ifndef EGL_KHR_cl_event
+#define EGL_KHR_cl_event 1
+
+#define EGL_CL_EVENT_HANDLE_KHR 0x309C
+#define EGL_SYNC_CL_EVENT_KHR 0x30FE
+#define EGL_SYNC_CL_EVENT_COMPLETE_KHR 0x30FF
+
+#define EGLEW_KHR_cl_event EGLEW_GET_VAR(__EGLEW_KHR_cl_event)
+
+#endif /* EGL_KHR_cl_event */
+
+/* --------------------------- EGL_KHR_cl_event2 --------------------------- */
+
+#ifndef EGL_KHR_cl_event2
+#define EGL_KHR_cl_event2 1
+
+#define EGL_CL_EVENT_HANDLE_KHR 0x309C
+#define EGL_SYNC_CL_EVENT_KHR 0x30FE
+#define EGL_SYNC_CL_EVENT_COMPLETE_KHR 0x30FF
+
+typedef EGLSyncKHR  ( * PFNEGLCREATESYNC64KHRPROC) (EGLDisplay  dpy, EGLenum  type, const EGLAttribKHR * attrib_list);
+
+#define eglCreateSync64KHR EGLEW_GET_FUN(__eglewCreateSync64KHR)
+
+#define EGLEW_KHR_cl_event2 EGLEW_GET_VAR(__EGLEW_KHR_cl_event2)
+
+#endif /* EGL_KHR_cl_event2 */
+
+/* ----------------- EGL_KHR_client_get_all_proc_addresses ----------------- */
+
+#ifndef EGL_KHR_client_get_all_proc_addresses
+#define EGL_KHR_client_get_all_proc_addresses 1
+
+#define EGLEW_KHR_client_get_all_proc_addresses EGLEW_GET_VAR(__EGLEW_KHR_client_get_all_proc_addresses)
+
+#endif /* EGL_KHR_client_get_all_proc_addresses */
+
+/* ------------------------- EGL_KHR_config_attribs ------------------------ */
+
+#ifndef EGL_KHR_config_attribs
+#define EGL_KHR_config_attribs 1
+
+#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR 0x0020
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040
+#define EGL_CONFORMANT_KHR 0x3042
+
+#define EGLEW_KHR_config_attribs EGLEW_GET_VAR(__EGLEW_KHR_config_attribs)
+
+#endif /* EGL_KHR_config_attribs */
+
+/* --------------------- EGL_KHR_context_flush_control --------------------- */
+
+#ifndef EGL_KHR_context_flush_control
+#define EGL_KHR_context_flush_control 1
+
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x2097
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098
+
+#define EGLEW_KHR_context_flush_control EGLEW_GET_VAR(__EGLEW_KHR_context_flush_control)
+
+#endif /* EGL_KHR_context_flush_control */
+
+/* ------------------------- EGL_KHR_create_context ------------------------ */
+
+#ifndef EGL_KHR_create_context
+#define EGL_KHR_create_context 1
+
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001
+#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR 0x00000001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR 0x00000002
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR 0x00000004
+#define EGL_OPENGL_ES3_BIT 0x00000040
+#define EGL_OPENGL_ES3_BIT_KHR 0x00000040
+#define EGL_CONTEXT_MAJOR_VERSION_KHR 0x3098
+#define EGL_CONTEXT_MINOR_VERSION_KHR 0x30FB
+#define EGL_CONTEXT_FLAGS_KHR 0x30FC
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR 0x30FD
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR 0x31BD
+#define EGL_NO_RESET_NOTIFICATION_KHR 0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_KHR 0x31BF
+
+#define EGLEW_KHR_create_context EGLEW_GET_VAR(__EGLEW_KHR_create_context)
+
+#endif /* EGL_KHR_create_context */
+
+/* -------------------- EGL_KHR_create_context_no_error -------------------- */
+
+#ifndef EGL_KHR_create_context_no_error
+#define EGL_KHR_create_context_no_error 1
+
+#define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3
+
+#define EGLEW_KHR_create_context_no_error EGLEW_GET_VAR(__EGLEW_KHR_create_context_no_error)
+
+#endif /* EGL_KHR_create_context_no_error */
+
+/* ----------------------------- EGL_KHR_debug ----------------------------- */
+
+#ifndef EGL_KHR_debug
+#define EGL_KHR_debug 1
+
+#define EGL_OBJECT_THREAD_KHR 0x33B0
+#define EGL_OBJECT_DISPLAY_KHR 0x33B1
+#define EGL_OBJECT_CONTEXT_KHR 0x33B2
+#define EGL_OBJECT_SURFACE_KHR 0x33B3
+#define EGL_OBJECT_IMAGE_KHR 0x33B4
+#define EGL_OBJECT_SYNC_KHR 0x33B5
+#define EGL_OBJECT_STREAM_KHR 0x33B6
+#define EGL_DEBUG_CALLBACK_KHR 0x33B8
+#define EGL_DEBUG_MSG_CRITICAL_KHR 0x33B9
+#define EGL_DEBUG_MSG_ERROR_KHR 0x33BA
+#define EGL_DEBUG_MSG_WARN_KHR 0x33BB
+#define EGL_DEBUG_MSG_INFO_KHR 0x33BC
+
+typedef EGLint  ( * PFNEGLDEBUGMESSAGECONTROLKHRPROC) (EGLDEBUGPROCKHR  callback, const EGLAttrib * attrib_list);
+typedef EGLint  ( * PFNEGLLABELOBJECTKHRPROC) (EGLDisplay  display, EGLenum  objectType, EGLObjectKHR  object, EGLLabelKHR  label);
+typedef EGLBoolean  ( * PFNEGLQUERYDEBUGKHRPROC) (EGLint  attribute, EGLAttrib * value);
+
+#define eglDebugMessageControlKHR EGLEW_GET_FUN(__eglewDebugMessageControlKHR)
+#define eglLabelObjectKHR EGLEW_GET_FUN(__eglewLabelObjectKHR)
+#define eglQueryDebugKHR EGLEW_GET_FUN(__eglewQueryDebugKHR)
+
+#define EGLEW_KHR_debug EGLEW_GET_VAR(__EGLEW_KHR_debug)
+
+#endif /* EGL_KHR_debug */
+
+/* --------------------------- EGL_KHR_fence_sync -------------------------- */
+
+#ifndef EGL_KHR_fence_sync
+#define EGL_KHR_fence_sync 1
+
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR 0x30F0
+#define EGL_SYNC_CONDITION_KHR 0x30F8
+#define EGL_SYNC_FENCE_KHR 0x30F9
+
+#define EGLEW_KHR_fence_sync EGLEW_GET_VAR(__EGLEW_KHR_fence_sync)
+
+#endif /* EGL_KHR_fence_sync */
+
+/* --------------------- EGL_KHR_get_all_proc_addresses -------------------- */
+
+#ifndef EGL_KHR_get_all_proc_addresses
+#define EGL_KHR_get_all_proc_addresses 1
+
+#define EGLEW_KHR_get_all_proc_addresses EGLEW_GET_VAR(__EGLEW_KHR_get_all_proc_addresses)
+
+#endif /* EGL_KHR_get_all_proc_addresses */
+
+/* ------------------------- EGL_KHR_gl_colorspace ------------------------- */
+
+#ifndef EGL_KHR_gl_colorspace
+#define EGL_KHR_gl_colorspace 1
+
+#define EGL_GL_COLORSPACE_SRGB_KHR 0x3089
+#define EGL_GL_COLORSPACE_LINEAR_KHR 0x308A
+#define EGL_GL_COLORSPACE_KHR 0x309D
+
+#define EGLEW_KHR_gl_colorspace EGLEW_GET_VAR(__EGLEW_KHR_gl_colorspace)
+
+#endif /* EGL_KHR_gl_colorspace */
+
+/* --------------------- EGL_KHR_gl_renderbuffer_image --------------------- */
+
+#ifndef EGL_KHR_gl_renderbuffer_image
+#define EGL_KHR_gl_renderbuffer_image 1
+
+#define EGL_GL_RENDERBUFFER_KHR 0x30B9
+
+#define EGLEW_KHR_gl_renderbuffer_image EGLEW_GET_VAR(__EGLEW_KHR_gl_renderbuffer_image)
+
+#endif /* EGL_KHR_gl_renderbuffer_image */
+
+/* ---------------------- EGL_KHR_gl_texture_2D_image ---------------------- */
+
+#ifndef EGL_KHR_gl_texture_2D_image
+#define EGL_KHR_gl_texture_2D_image 1
+
+#define EGL_GL_TEXTURE_2D_KHR 0x30B1
+#define EGL_GL_TEXTURE_LEVEL_KHR 0x30BC
+
+#define EGLEW_KHR_gl_texture_2D_image EGLEW_GET_VAR(__EGLEW_KHR_gl_texture_2D_image)
+
+#endif /* EGL_KHR_gl_texture_2D_image */
+
+/* ---------------------- EGL_KHR_gl_texture_3D_image ---------------------- */
+
+#ifndef EGL_KHR_gl_texture_3D_image
+#define EGL_KHR_gl_texture_3D_image 1
+
+#define EGL_GL_TEXTURE_3D_KHR 0x30B2
+#define EGL_GL_TEXTURE_ZOFFSET_KHR 0x30BD
+
+#define EGLEW_KHR_gl_texture_3D_image EGLEW_GET_VAR(__EGLEW_KHR_gl_texture_3D_image)
+
+#endif /* EGL_KHR_gl_texture_3D_image */
+
+/* -------------------- EGL_KHR_gl_texture_cubemap_image ------------------- */
+
+#ifndef EGL_KHR_gl_texture_cubemap_image
+#define EGL_KHR_gl_texture_cubemap_image 1
+
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR 0x30B3
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR 0x30B4
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR 0x30B5
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR 0x30B6
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR 0x30B7
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR 0x30B8
+
+#define EGLEW_KHR_gl_texture_cubemap_image EGLEW_GET_VAR(__EGLEW_KHR_gl_texture_cubemap_image)
+
+#endif /* EGL_KHR_gl_texture_cubemap_image */
+
+/* ----------------------------- EGL_KHR_image ----------------------------- */
+
+#ifndef EGL_KHR_image
+#define EGL_KHR_image 1
+
+#define EGL_NATIVE_PIXMAP_KHR 0x30B0
+
+typedef EGLImageKHR  ( * PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay  dpy, EGLContext  ctx, EGLenum  target, EGLClientBuffer  buffer, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay  dpy, EGLImageKHR  image);
+
+#define eglCreateImageKHR EGLEW_GET_FUN(__eglewCreateImageKHR)
+#define eglDestroyImageKHR EGLEW_GET_FUN(__eglewDestroyImageKHR)
+
+#define EGLEW_KHR_image EGLEW_GET_VAR(__EGLEW_KHR_image)
+
+#endif /* EGL_KHR_image */
+
+/* --------------------------- EGL_KHR_image_base -------------------------- */
+
+#ifndef EGL_KHR_image_base
+#define EGL_KHR_image_base 1
+
+#define EGL_IMAGE_PRESERVED_KHR 0x30D2
+
+#define EGLEW_KHR_image_base EGLEW_GET_VAR(__EGLEW_KHR_image_base)
+
+#endif /* EGL_KHR_image_base */
+
+/* -------------------------- EGL_KHR_image_pixmap ------------------------- */
+
+#ifndef EGL_KHR_image_pixmap
+#define EGL_KHR_image_pixmap 1
+
+#define EGL_NATIVE_PIXMAP_KHR 0x30B0
+
+#define EGLEW_KHR_image_pixmap EGLEW_GET_VAR(__EGLEW_KHR_image_pixmap)
+
+#endif /* EGL_KHR_image_pixmap */
+
+/* -------------------------- EGL_KHR_lock_surface ------------------------- */
+
+#ifndef EGL_KHR_lock_surface
+#define EGL_KHR_lock_surface 1
+
+#define EGL_READ_SURFACE_BIT_KHR 0x0001
+#define EGL_WRITE_SURFACE_BIT_KHR 0x0002
+#define EGL_LOCK_SURFACE_BIT_KHR 0x0080
+#define EGL_OPTIMAL_FORMAT_BIT_KHR 0x0100
+#define EGL_MATCH_FORMAT_KHR 0x3043
+#define EGL_FORMAT_RGB_565_EXACT_KHR 0x30C0
+#define EGL_FORMAT_RGB_565_KHR 0x30C1
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR 0x30C2
+#define EGL_FORMAT_RGBA_8888_KHR 0x30C3
+#define EGL_MAP_PRESERVE_PIXELS_KHR 0x30C4
+#define EGL_LOCK_USAGE_HINT_KHR 0x30C5
+#define EGL_BITMAP_POINTER_KHR 0x30C6
+#define EGL_BITMAP_PITCH_KHR 0x30C7
+#define EGL_BITMAP_ORIGIN_KHR 0x30C8
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR 0x30C9
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR 0x30CA
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR 0x30CB
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR 0x30CC
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR 0x30CD
+#define EGL_LOWER_LEFT_KHR 0x30CE
+#define EGL_UPPER_LEFT_KHR 0x30CF
+
+typedef EGLBoolean  ( * PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay  dpy, EGLSurface  surface, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay  dpy, EGLSurface  surface);
+
+#define eglLockSurfaceKHR EGLEW_GET_FUN(__eglewLockSurfaceKHR)
+#define eglUnlockSurfaceKHR EGLEW_GET_FUN(__eglewUnlockSurfaceKHR)
+
+#define EGLEW_KHR_lock_surface EGLEW_GET_VAR(__EGLEW_KHR_lock_surface)
+
+#endif /* EGL_KHR_lock_surface */
+
+/* ------------------------- EGL_KHR_lock_surface2 ------------------------- */
+
+#ifndef EGL_KHR_lock_surface2
+#define EGL_KHR_lock_surface2 1
+
+#define EGL_BITMAP_PIXEL_SIZE_KHR 0x3110
+
+#define EGLEW_KHR_lock_surface2 EGLEW_GET_VAR(__EGLEW_KHR_lock_surface2)
+
+#endif /* EGL_KHR_lock_surface2 */
+
+/* ------------------------- EGL_KHR_lock_surface3 ------------------------- */
+
+#ifndef EGL_KHR_lock_surface3
+#define EGL_KHR_lock_surface3 1
+
+#define EGL_READ_SURFACE_BIT_KHR 0x0001
+#define EGL_WRITE_SURFACE_BIT_KHR 0x0002
+#define EGL_LOCK_SURFACE_BIT_KHR 0x0080
+#define EGL_OPTIMAL_FORMAT_BIT_KHR 0x0100
+#define EGL_MATCH_FORMAT_KHR 0x3043
+#define EGL_FORMAT_RGB_565_EXACT_KHR 0x30C0
+#define EGL_FORMAT_RGB_565_KHR 0x30C1
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR 0x30C2
+#define EGL_FORMAT_RGBA_8888_KHR 0x30C3
+#define EGL_MAP_PRESERVE_PIXELS_KHR 0x30C4
+#define EGL_LOCK_USAGE_HINT_KHR 0x30C5
+#define EGL_BITMAP_POINTER_KHR 0x30C6
+#define EGL_BITMAP_PITCH_KHR 0x30C7
+#define EGL_BITMAP_ORIGIN_KHR 0x30C8
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR 0x30C9
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR 0x30CA
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR 0x30CB
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR 0x30CC
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR 0x30CD
+#define EGL_LOWER_LEFT_KHR 0x30CE
+#define EGL_UPPER_LEFT_KHR 0x30CF
+#define EGL_BITMAP_PIXEL_SIZE_KHR 0x3110
+
+typedef EGLBoolean  ( * PFNEGLQUERYSURFACE64KHRPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  attribute, EGLAttribKHR * value);
+
+#define eglQuerySurface64KHR EGLEW_GET_FUN(__eglewQuerySurface64KHR)
+
+#define EGLEW_KHR_lock_surface3 EGLEW_GET_VAR(__EGLEW_KHR_lock_surface3)
+
+#endif /* EGL_KHR_lock_surface3 */
+
+/* --------------------- EGL_KHR_mutable_render_buffer --------------------- */
+
+#ifndef EGL_KHR_mutable_render_buffer
+#define EGL_KHR_mutable_render_buffer 1
+
+#define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000
+
+#define EGLEW_KHR_mutable_render_buffer EGLEW_GET_VAR(__EGLEW_KHR_mutable_render_buffer)
+
+#endif /* EGL_KHR_mutable_render_buffer */
+
+/* ----------------------- EGL_KHR_no_config_context ----------------------- */
+
+#ifndef EGL_KHR_no_config_context
+#define EGL_KHR_no_config_context 1
+
+#define EGLEW_KHR_no_config_context EGLEW_GET_VAR(__EGLEW_KHR_no_config_context)
+
+#endif /* EGL_KHR_no_config_context */
+
+/* ------------------------- EGL_KHR_partial_update ------------------------ */
+
+#ifndef EGL_KHR_partial_update
+#define EGL_KHR_partial_update 1
+
+#define EGL_BUFFER_AGE_KHR 0x313D
+
+typedef EGLBoolean  ( * PFNEGLSETDAMAGEREGIONKHRPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint * rects, EGLint  n_rects);
+
+#define eglSetDamageRegionKHR EGLEW_GET_FUN(__eglewSetDamageRegionKHR)
+
+#define EGLEW_KHR_partial_update EGLEW_GET_VAR(__EGLEW_KHR_partial_update)
+
+#endif /* EGL_KHR_partial_update */
+
+/* ------------------------ EGL_KHR_platform_android ----------------------- */
+
+#ifndef EGL_KHR_platform_android
+#define EGL_KHR_platform_android 1
+
+#define EGL_PLATFORM_ANDROID_KHR 0x3141
+
+#define EGLEW_KHR_platform_android EGLEW_GET_VAR(__EGLEW_KHR_platform_android)
+
+#endif /* EGL_KHR_platform_android */
+
+/* -------------------------- EGL_KHR_platform_gbm ------------------------- */
+
+#ifndef EGL_KHR_platform_gbm
+#define EGL_KHR_platform_gbm 1
+
+#define EGL_PLATFORM_GBM_KHR 0x31D7
+
+#define EGLEW_KHR_platform_gbm EGLEW_GET_VAR(__EGLEW_KHR_platform_gbm)
+
+#endif /* EGL_KHR_platform_gbm */
+
+/* ------------------------ EGL_KHR_platform_wayland ----------------------- */
+
+#ifndef EGL_KHR_platform_wayland
+#define EGL_KHR_platform_wayland 1
+
+#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
+
+#define EGLEW_KHR_platform_wayland EGLEW_GET_VAR(__EGLEW_KHR_platform_wayland)
+
+#endif /* EGL_KHR_platform_wayland */
+
+/* -------------------------- EGL_KHR_platform_x11 ------------------------- */
+
+#ifndef EGL_KHR_platform_x11
+#define EGL_KHR_platform_x11 1
+
+#define EGL_PLATFORM_X11_KHR 0x31D5
+#define EGL_PLATFORM_X11_SCREEN_KHR 0x31D6
+
+#define EGLEW_KHR_platform_x11 EGLEW_GET_VAR(__EGLEW_KHR_platform_x11)
+
+#endif /* EGL_KHR_platform_x11 */
+
+/* ------------------------- EGL_KHR_reusable_sync ------------------------- */
+
+#ifndef EGL_KHR_reusable_sync
+#define EGL_KHR_reusable_sync 1
+
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001
+#define EGL_SYNC_STATUS_KHR 0x30F1
+#define EGL_SIGNALED_KHR 0x30F2
+#define EGL_UNSIGNALED_KHR 0x30F3
+#define EGL_TIMEOUT_EXPIRED_KHR 0x30F5
+#define EGL_CONDITION_SATISFIED_KHR 0x30F6
+#define EGL_SYNC_TYPE_KHR 0x30F7
+#define EGL_SYNC_REUSABLE_KHR 0x30FA
+#define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFF
+
+typedef EGLint  ( * PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay  dpy, EGLSyncKHR  sync, EGLint  flags, EGLTimeKHR  timeout);
+typedef EGLSyncKHR  ( * PFNEGLCREATESYNCKHRPROC) (EGLDisplay  dpy, EGLenum  type, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay  dpy, EGLSyncKHR  sync);
+typedef EGLBoolean  ( * PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay  dpy, EGLSyncKHR  sync, EGLint  attribute, EGLint * value);
+typedef EGLBoolean  ( * PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay  dpy, EGLSyncKHR  sync, EGLenum  mode);
+
+#define eglClientWaitSyncKHR EGLEW_GET_FUN(__eglewClientWaitSyncKHR)
+#define eglCreateSyncKHR EGLEW_GET_FUN(__eglewCreateSyncKHR)
+#define eglDestroySyncKHR EGLEW_GET_FUN(__eglewDestroySyncKHR)
+#define eglGetSyncAttribKHR EGLEW_GET_FUN(__eglewGetSyncAttribKHR)
+#define eglSignalSyncKHR EGLEW_GET_FUN(__eglewSignalSyncKHR)
+
+#define EGLEW_KHR_reusable_sync EGLEW_GET_VAR(__EGLEW_KHR_reusable_sync)
+
+#endif /* EGL_KHR_reusable_sync */
+
+/* ----------------------------- EGL_KHR_stream ---------------------------- */
+
+#ifndef EGL_KHR_stream
+#define EGL_KHR_stream 1
+
+#define EGL_CONSUMER_LATENCY_USEC_KHR 0x3210
+#define EGL_PRODUCER_FRAME_KHR 0x3212
+#define EGL_CONSUMER_FRAME_KHR 0x3213
+#define EGL_STREAM_STATE_KHR 0x3214
+#define EGL_STREAM_STATE_CREATED_KHR 0x3215
+#define EGL_STREAM_STATE_CONNECTING_KHR 0x3216
+#define EGL_STREAM_STATE_EMPTY_KHR 0x3217
+#define EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR 0x3218
+#define EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR 0x3219
+#define EGL_STREAM_STATE_DISCONNECTED_KHR 0x321A
+#define EGL_BAD_STREAM_KHR 0x321B
+#define EGL_BAD_STATE_KHR 0x321C
+
+typedef EGLStreamKHR  ( * PFNEGLCREATESTREAMKHRPROC) (EGLDisplay  dpy, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYSTREAMKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+typedef EGLBoolean  ( * PFNEGLQUERYSTREAMKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLint * value);
+typedef EGLBoolean  ( * PFNEGLQUERYSTREAMU64KHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLuint64KHR * value);
+typedef EGLBoolean  ( * PFNEGLSTREAMATTRIBKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLint  value);
+
+#define eglCreateStreamKHR EGLEW_GET_FUN(__eglewCreateStreamKHR)
+#define eglDestroyStreamKHR EGLEW_GET_FUN(__eglewDestroyStreamKHR)
+#define eglQueryStreamKHR EGLEW_GET_FUN(__eglewQueryStreamKHR)
+#define eglQueryStreamu64KHR EGLEW_GET_FUN(__eglewQueryStreamu64KHR)
+#define eglStreamAttribKHR EGLEW_GET_FUN(__eglewStreamAttribKHR)
+
+#define EGLEW_KHR_stream EGLEW_GET_VAR(__EGLEW_KHR_stream)
+
+#endif /* EGL_KHR_stream */
+
+/* ------------------------- EGL_KHR_stream_attrib ------------------------- */
+
+#ifndef EGL_KHR_stream_attrib
+#define EGL_KHR_stream_attrib 1
+
+#define EGL_CONSUMER_LATENCY_USEC_KHR 0x3210
+#define EGL_STREAM_STATE_KHR 0x3214
+#define EGL_STREAM_STATE_CREATED_KHR 0x3215
+#define EGL_STREAM_STATE_CONNECTING_KHR 0x3216
+
+typedef EGLStreamKHR  ( * PFNEGLCREATESTREAMATTRIBKHRPROC) (EGLDisplay  dpy, const EGLAttrib * attrib_list);
+typedef EGLBoolean  ( * PFNEGLQUERYSTREAMATTRIBKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLAttrib * value);
+typedef EGLBoolean  ( * PFNEGLSETSTREAMATTRIBKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLAttrib  value);
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, const EGLAttrib * attrib_list);
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, const EGLAttrib * attrib_list);
+
+#define eglCreateStreamAttribKHR EGLEW_GET_FUN(__eglewCreateStreamAttribKHR)
+#define eglQueryStreamAttribKHR EGLEW_GET_FUN(__eglewQueryStreamAttribKHR)
+#define eglSetStreamAttribKHR EGLEW_GET_FUN(__eglewSetStreamAttribKHR)
+#define eglStreamConsumerAcquireAttribKHR EGLEW_GET_FUN(__eglewStreamConsumerAcquireAttribKHR)
+#define eglStreamConsumerReleaseAttribKHR EGLEW_GET_FUN(__eglewStreamConsumerReleaseAttribKHR)
+
+#define EGLEW_KHR_stream_attrib EGLEW_GET_VAR(__EGLEW_KHR_stream_attrib)
+
+#endif /* EGL_KHR_stream_attrib */
+
+/* ------------------- EGL_KHR_stream_consumer_gltexture ------------------- */
+
+#ifndef EGL_KHR_stream_consumer_gltexture
+#define EGL_KHR_stream_consumer_gltexture 1
+
+#define EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR 0x321E
+
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERACQUIREKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERRELEASEKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+
+#define eglStreamConsumerAcquireKHR EGLEW_GET_FUN(__eglewStreamConsumerAcquireKHR)
+#define eglStreamConsumerGLTextureExternalKHR EGLEW_GET_FUN(__eglewStreamConsumerGLTextureExternalKHR)
+#define eglStreamConsumerReleaseKHR EGLEW_GET_FUN(__eglewStreamConsumerReleaseKHR)
+
+#define EGLEW_KHR_stream_consumer_gltexture EGLEW_GET_VAR(__EGLEW_KHR_stream_consumer_gltexture)
+
+#endif /* EGL_KHR_stream_consumer_gltexture */
+
+/* -------------------- EGL_KHR_stream_cross_process_fd -------------------- */
+
+#ifndef EGL_KHR_stream_cross_process_fd
+#define EGL_KHR_stream_cross_process_fd 1
+
+typedef EGLStreamKHR  ( * PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay  dpy, EGLNativeFileDescriptorKHR  file_descriptor);
+typedef EGLNativeFileDescriptorKHR  ( * PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+
+#define eglCreateStreamFromFileDescriptorKHR EGLEW_GET_FUN(__eglewCreateStreamFromFileDescriptorKHR)
+#define eglGetStreamFileDescriptorKHR EGLEW_GET_FUN(__eglewGetStreamFileDescriptorKHR)
+
+#define EGLEW_KHR_stream_cross_process_fd EGLEW_GET_VAR(__EGLEW_KHR_stream_cross_process_fd)
+
+#endif /* EGL_KHR_stream_cross_process_fd */
+
+/* -------------------------- EGL_KHR_stream_fifo -------------------------- */
+
+#ifndef EGL_KHR_stream_fifo
+#define EGL_KHR_stream_fifo 1
+
+#define EGL_STREAM_FIFO_LENGTH_KHR 0x31FC
+#define EGL_STREAM_TIME_NOW_KHR 0x31FD
+#define EGL_STREAM_TIME_CONSUMER_KHR 0x31FE
+#define EGL_STREAM_TIME_PRODUCER_KHR 0x31FF
+
+typedef EGLBoolean  ( * PFNEGLQUERYSTREAMTIMEKHRPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  attribute, EGLTimeKHR * value);
+
+#define eglQueryStreamTimeKHR EGLEW_GET_FUN(__eglewQueryStreamTimeKHR)
+
+#define EGLEW_KHR_stream_fifo EGLEW_GET_VAR(__EGLEW_KHR_stream_fifo)
+
+#endif /* EGL_KHR_stream_fifo */
+
+/* ----------------- EGL_KHR_stream_producer_aldatalocator ----------------- */
+
+#ifndef EGL_KHR_stream_producer_aldatalocator
+#define EGL_KHR_stream_producer_aldatalocator 1
+
+#define EGLEW_KHR_stream_producer_aldatalocator EGLEW_GET_VAR(__EGLEW_KHR_stream_producer_aldatalocator)
+
+#endif /* EGL_KHR_stream_producer_aldatalocator */
+
+/* ------------------- EGL_KHR_stream_producer_eglsurface ------------------ */
+
+#ifndef EGL_KHR_stream_producer_eglsurface
+#define EGL_KHR_stream_producer_eglsurface 1
+
+#define EGL_STREAM_BIT_KHR 0x0800
+
+typedef EGLSurface  ( * PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC) (EGLDisplay  dpy, EGLConfig  config, EGLStreamKHR  stream, const EGLint * attrib_list);
+
+#define eglCreateStreamProducerSurfaceKHR EGLEW_GET_FUN(__eglewCreateStreamProducerSurfaceKHR)
+
+#define EGLEW_KHR_stream_producer_eglsurface EGLEW_GET_VAR(__EGLEW_KHR_stream_producer_eglsurface)
+
+#endif /* EGL_KHR_stream_producer_eglsurface */
+
+/* ---------------------- EGL_KHR_surfaceless_context ---------------------- */
+
+#ifndef EGL_KHR_surfaceless_context
+#define EGL_KHR_surfaceless_context 1
+
+#define EGLEW_KHR_surfaceless_context EGLEW_GET_VAR(__EGLEW_KHR_surfaceless_context)
+
+#endif /* EGL_KHR_surfaceless_context */
+
+/* -------------------- EGL_KHR_swap_buffers_with_damage ------------------- */
+
+#ifndef EGL_KHR_swap_buffers_with_damage
+#define EGL_KHR_swap_buffers_with_damage 1
+
+typedef EGLBoolean  ( * PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint * rects, EGLint  n_rects);
+
+#define eglSwapBuffersWithDamageKHR EGLEW_GET_FUN(__eglewSwapBuffersWithDamageKHR)
+
+#define EGLEW_KHR_swap_buffers_with_damage EGLEW_GET_VAR(__EGLEW_KHR_swap_buffers_with_damage)
+
+#endif /* EGL_KHR_swap_buffers_with_damage */
+
+/* ------------------------ EGL_KHR_vg_parent_image ------------------------ */
+
+#ifndef EGL_KHR_vg_parent_image
+#define EGL_KHR_vg_parent_image 1
+
+#define EGL_VG_PARENT_IMAGE_KHR 0x30BA
+
+#define EGLEW_KHR_vg_parent_image EGLEW_GET_VAR(__EGLEW_KHR_vg_parent_image)
+
+#endif /* EGL_KHR_vg_parent_image */
+
+/* --------------------------- EGL_KHR_wait_sync --------------------------- */
+
+#ifndef EGL_KHR_wait_sync
+#define EGL_KHR_wait_sync 1
+
+typedef EGLint  ( * PFNEGLWAITSYNCKHRPROC) (EGLDisplay  dpy, EGLSyncKHR  sync, EGLint  flags);
+
+#define eglWaitSyncKHR EGLEW_GET_FUN(__eglewWaitSyncKHR)
+
+#define EGLEW_KHR_wait_sync EGLEW_GET_VAR(__EGLEW_KHR_wait_sync)
+
+#endif /* EGL_KHR_wait_sync */
+
+/* --------------------------- EGL_MESA_drm_image -------------------------- */
+
+#ifndef EGL_MESA_drm_image
+#define EGL_MESA_drm_image 1
+
+#define EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x00000001
+#define EGL_DRM_BUFFER_USE_SHARE_MESA 0x00000002
+#define EGL_DRM_BUFFER_FORMAT_MESA 0x31D0
+#define EGL_DRM_BUFFER_USE_MESA 0x31D1
+#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA 0x31D2
+#define EGL_DRM_BUFFER_MESA 0x31D3
+#define EGL_DRM_BUFFER_STRIDE_MESA 0x31D4
+
+typedef EGLImageKHR  ( * PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay  dpy, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay  dpy, EGLImageKHR  image, EGLint * name, EGLint * handle, EGLint * stride);
+
+#define eglCreateDRMImageMESA EGLEW_GET_FUN(__eglewCreateDRMImageMESA)
+#define eglExportDRMImageMESA EGLEW_GET_FUN(__eglewExportDRMImageMESA)
+
+#define EGLEW_MESA_drm_image EGLEW_GET_VAR(__EGLEW_MESA_drm_image)
+
+#endif /* EGL_MESA_drm_image */
+
+/* --------------------- EGL_MESA_image_dma_buf_export --------------------- */
+
+#ifndef EGL_MESA_image_dma_buf_export
+#define EGL_MESA_image_dma_buf_export 1
+
+typedef EGLBoolean  ( * PFNEGLEXPORTDMABUFIMAGEMESAPROC) (EGLDisplay  dpy, EGLImageKHR  image, int * fds, EGLint * strides, EGLint * offsets);
+typedef EGLBoolean  ( * PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC) (EGLDisplay  dpy, EGLImageKHR  image, int * fourcc, int * num_planes, EGLuint64KHR * modifiers);
+
+#define eglExportDMABUFImageMESA EGLEW_GET_FUN(__eglewExportDMABUFImageMESA)
+#define eglExportDMABUFImageQueryMESA EGLEW_GET_FUN(__eglewExportDMABUFImageQueryMESA)
+
+#define EGLEW_MESA_image_dma_buf_export EGLEW_GET_VAR(__EGLEW_MESA_image_dma_buf_export)
+
+#endif /* EGL_MESA_image_dma_buf_export */
+
+/* ------------------------- EGL_MESA_platform_gbm ------------------------- */
+
+#ifndef EGL_MESA_platform_gbm
+#define EGL_MESA_platform_gbm 1
+
+#define EGL_PLATFORM_GBM_MESA 0x31D7
+
+#define EGLEW_MESA_platform_gbm EGLEW_GET_VAR(__EGLEW_MESA_platform_gbm)
+
+#endif /* EGL_MESA_platform_gbm */
+
+/* --------------------- EGL_MESA_platform_surfaceless --------------------- */
+
+#ifndef EGL_MESA_platform_surfaceless
+#define EGL_MESA_platform_surfaceless 1
+
+#define EGL_PLATFORM_SURFACELESS_MESA 0x31DD
+
+#define EGLEW_MESA_platform_surfaceless EGLEW_GET_VAR(__EGLEW_MESA_platform_surfaceless)
+
+#endif /* EGL_MESA_platform_surfaceless */
+
+/* -------------------------- EGL_NOK_swap_region -------------------------- */
+
+#ifndef EGL_NOK_swap_region
+#define EGL_NOK_swap_region 1
+
+typedef EGLBoolean  ( * PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  numRects, const EGLint * rects);
+
+#define eglSwapBuffersRegionNOK EGLEW_GET_FUN(__eglewSwapBuffersRegionNOK)
+
+#define EGLEW_NOK_swap_region EGLEW_GET_VAR(__EGLEW_NOK_swap_region)
+
+#endif /* EGL_NOK_swap_region */
+
+/* -------------------------- EGL_NOK_swap_region2 ------------------------- */
+
+#ifndef EGL_NOK_swap_region2
+#define EGL_NOK_swap_region2 1
+
+typedef EGLBoolean  ( * PFNEGLSWAPBUFFERSREGION2NOKPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  numRects, const EGLint * rects);
+
+#define eglSwapBuffersRegion2NOK EGLEW_GET_FUN(__eglewSwapBuffersRegion2NOK)
+
+#define EGLEW_NOK_swap_region2 EGLEW_GET_VAR(__EGLEW_NOK_swap_region2)
+
+#endif /* EGL_NOK_swap_region2 */
+
+/* ---------------------- EGL_NOK_texture_from_pixmap ---------------------- */
+
+#ifndef EGL_NOK_texture_from_pixmap
+#define EGL_NOK_texture_from_pixmap 1
+
+#define EGL_Y_INVERTED_NOK 0x307F
+
+#define EGLEW_NOK_texture_from_pixmap EGLEW_GET_VAR(__EGLEW_NOK_texture_from_pixmap)
+
+#endif /* EGL_NOK_texture_from_pixmap */
+
+/* ------------------------ EGL_NV_3dvision_surface ------------------------ */
+
+#ifndef EGL_NV_3dvision_surface
+#define EGL_NV_3dvision_surface 1
+
+#define EGL_AUTO_STEREO_NV 0x3136
+
+#define EGLEW_NV_3dvision_surface EGLEW_GET_VAR(__EGLEW_NV_3dvision_surface)
+
+#endif /* EGL_NV_3dvision_surface */
+
+/* ------------------------- EGL_NV_coverage_sample ------------------------ */
+
+#ifndef EGL_NV_coverage_sample
+#define EGL_NV_coverage_sample 1
+
+#define EGL_COVERAGE_BUFFERS_NV 0x30E0
+#define EGL_COVERAGE_SAMPLES_NV 0x30E1
+
+#define EGLEW_NV_coverage_sample EGLEW_GET_VAR(__EGLEW_NV_coverage_sample)
+
+#endif /* EGL_NV_coverage_sample */
+
+/* --------------------- EGL_NV_coverage_sample_resolve -------------------- */
+
+#ifndef EGL_NV_coverage_sample_resolve
+#define EGL_NV_coverage_sample_resolve 1
+
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NV 0x3131
+#define EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV 0x3132
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV 0x3133
+
+#define EGLEW_NV_coverage_sample_resolve EGLEW_GET_VAR(__EGLEW_NV_coverage_sample_resolve)
+
+#endif /* EGL_NV_coverage_sample_resolve */
+
+/* --------------------------- EGL_NV_cuda_event --------------------------- */
+
+#ifndef EGL_NV_cuda_event
+#define EGL_NV_cuda_event 1
+
+#define EGL_CUDA_EVENT_HANDLE_NV 0x323B
+#define EGL_SYNC_CUDA_EVENT_NV 0x323C
+#define EGL_SYNC_CUDA_EVENT_COMPLETE_NV 0x323D
+
+#define EGLEW_NV_cuda_event EGLEW_GET_VAR(__EGLEW_NV_cuda_event)
+
+#endif /* EGL_NV_cuda_event */
+
+/* ------------------------- EGL_NV_depth_nonlinear ------------------------ */
+
+#ifndef EGL_NV_depth_nonlinear
+#define EGL_NV_depth_nonlinear 1
+
+#define EGL_DEPTH_ENCODING_NONE_NV 0
+#define EGL_DEPTH_ENCODING_NV 0x30E2
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3
+
+#define EGLEW_NV_depth_nonlinear EGLEW_GET_VAR(__EGLEW_NV_depth_nonlinear)
+
+#endif /* EGL_NV_depth_nonlinear */
+
+/* --------------------------- EGL_NV_device_cuda -------------------------- */
+
+#ifndef EGL_NV_device_cuda
+#define EGL_NV_device_cuda 1
+
+#define EGL_CUDA_DEVICE_NV 0x323A
+
+#define EGLEW_NV_device_cuda EGLEW_GET_VAR(__EGLEW_NV_device_cuda)
+
+#endif /* EGL_NV_device_cuda */
+
+/* -------------------------- EGL_NV_native_query -------------------------- */
+
+#ifndef EGL_NV_native_query
+#define EGL_NV_native_query 1
+
+typedef EGLBoolean  ( * PFNEGLQUERYNATIVEDISPLAYNVPROC) (EGLDisplay  dpy, EGLNativeDisplayType * display_id);
+typedef EGLBoolean  ( * PFNEGLQUERYNATIVEPIXMAPNVPROC) (EGLDisplay  dpy, EGLSurface  surf, EGLNativePixmapType * pixmap);
+typedef EGLBoolean  ( * PFNEGLQUERYNATIVEWINDOWNVPROC) (EGLDisplay  dpy, EGLSurface  surf, EGLNativeWindowType * window);
+
+#define eglQueryNativeDisplayNV EGLEW_GET_FUN(__eglewQueryNativeDisplayNV)
+#define eglQueryNativePixmapNV EGLEW_GET_FUN(__eglewQueryNativePixmapNV)
+#define eglQueryNativeWindowNV EGLEW_GET_FUN(__eglewQueryNativeWindowNV)
+
+#define EGLEW_NV_native_query EGLEW_GET_VAR(__EGLEW_NV_native_query)
+
+#endif /* EGL_NV_native_query */
+
+/* ---------------------- EGL_NV_post_convert_rounding --------------------- */
+
+#ifndef EGL_NV_post_convert_rounding
+#define EGL_NV_post_convert_rounding 1
+
+#define EGLEW_NV_post_convert_rounding EGLEW_GET_VAR(__EGLEW_NV_post_convert_rounding)
+
+#endif /* EGL_NV_post_convert_rounding */
+
+/* ------------------------- EGL_NV_post_sub_buffer ------------------------ */
+
+#ifndef EGL_NV_post_sub_buffer
+#define EGL_NV_post_sub_buffer 1
+
+#define EGL_POST_SUB_BUFFER_SUPPORTED_NV 0x30BE
+
+typedef EGLBoolean  ( * PFNEGLPOSTSUBBUFFERNVPROC) (EGLDisplay  dpy, EGLSurface  surface, EGLint  x, EGLint  y, EGLint  width, EGLint  height);
+
+#define eglPostSubBufferNV EGLEW_GET_FUN(__eglewPostSubBufferNV)
+
+#define EGLEW_NV_post_sub_buffer EGLEW_GET_VAR(__EGLEW_NV_post_sub_buffer)
+
+#endif /* EGL_NV_post_sub_buffer */
+
+/* ------------------ EGL_NV_robustness_video_memory_purge ----------------- */
+
+#ifndef EGL_NV_robustness_video_memory_purge
+#define EGL_NV_robustness_video_memory_purge 1
+
+#define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C
+
+#define EGLEW_NV_robustness_video_memory_purge EGLEW_GET_VAR(__EGLEW_NV_robustness_video_memory_purge)
+
+#endif /* EGL_NV_robustness_video_memory_purge */
+
+/* ------------------ EGL_NV_stream_consumer_gltexture_yuv ----------------- */
+
+#ifndef EGL_NV_stream_consumer_gltexture_yuv
+#define EGL_NV_stream_consumer_gltexture_yuv 1
+
+#define EGL_YUV_BUFFER_EXT 0x3300
+#define EGL_YUV_NUMBER_OF_PLANES_EXT 0x3311
+#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C
+#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV 0x332D
+#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV 0x332E
+
+typedef EGLBoolean  ( * PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLAttrib  *attrib_list);
+
+#define eglStreamConsumerGLTextureExternalAttribsNV EGLEW_GET_FUN(__eglewStreamConsumerGLTextureExternalAttribsNV)
+
+#define EGLEW_NV_stream_consumer_gltexture_yuv EGLEW_GET_VAR(__EGLEW_NV_stream_consumer_gltexture_yuv)
+
+#endif /* EGL_NV_stream_consumer_gltexture_yuv */
+
+/* ---------------------- EGL_NV_stream_cross_display ---------------------- */
+
+#ifndef EGL_NV_stream_cross_display
+#define EGL_NV_stream_cross_display 1
+
+#define EGL_STREAM_CROSS_DISPLAY_NV 0x334E
+
+#define EGLEW_NV_stream_cross_display EGLEW_GET_VAR(__EGLEW_NV_stream_cross_display)
+
+#endif /* EGL_NV_stream_cross_display */
+
+/* ----------------------- EGL_NV_stream_cross_object ---------------------- */
+
+#ifndef EGL_NV_stream_cross_object
+#define EGL_NV_stream_cross_object 1
+
+#define EGL_STREAM_CROSS_OBJECT_NV 0x334D
+
+#define EGLEW_NV_stream_cross_object EGLEW_GET_VAR(__EGLEW_NV_stream_cross_object)
+
+#endif /* EGL_NV_stream_cross_object */
+
+/* --------------------- EGL_NV_stream_cross_partition --------------------- */
+
+#ifndef EGL_NV_stream_cross_partition
+#define EGL_NV_stream_cross_partition 1
+
+#define EGL_STREAM_CROSS_PARTITION_NV 0x323F
+
+#define EGLEW_NV_stream_cross_partition EGLEW_GET_VAR(__EGLEW_NV_stream_cross_partition)
+
+#endif /* EGL_NV_stream_cross_partition */
+
+/* ---------------------- EGL_NV_stream_cross_process ---------------------- */
+
+#ifndef EGL_NV_stream_cross_process
+#define EGL_NV_stream_cross_process 1
+
+#define EGL_STREAM_CROSS_PROCESS_NV 0x3245
+
+#define EGLEW_NV_stream_cross_process EGLEW_GET_VAR(__EGLEW_NV_stream_cross_process)
+
+#endif /* EGL_NV_stream_cross_process */
+
+/* ----------------------- EGL_NV_stream_cross_system ---------------------- */
+
+#ifndef EGL_NV_stream_cross_system
+#define EGL_NV_stream_cross_system 1
+
+#define EGL_STREAM_CROSS_SYSTEM_NV 0x334F
+
+#define EGLEW_NV_stream_cross_system EGLEW_GET_VAR(__EGLEW_NV_stream_cross_system)
+
+#endif /* EGL_NV_stream_cross_system */
+
+/* ------------------------ EGL_NV_stream_fifo_next ------------------------ */
+
+#ifndef EGL_NV_stream_fifo_next
+#define EGL_NV_stream_fifo_next 1
+
+#define EGL_PENDING_FRAME_NV 0x3329
+#define EGL_STREAM_TIME_PENDING_NV 0x332A
+
+#define EGLEW_NV_stream_fifo_next EGLEW_GET_VAR(__EGLEW_NV_stream_fifo_next)
+
+#endif /* EGL_NV_stream_fifo_next */
+
+/* --------------------- EGL_NV_stream_fifo_synchronous -------------------- */
+
+#ifndef EGL_NV_stream_fifo_synchronous
+#define EGL_NV_stream_fifo_synchronous 1
+
+#define EGL_STREAM_FIFO_SYNCHRONOUS_NV 0x3336
+
+#define EGLEW_NV_stream_fifo_synchronous EGLEW_GET_VAR(__EGLEW_NV_stream_fifo_synchronous)
+
+#endif /* EGL_NV_stream_fifo_synchronous */
+
+/* ----------------------- EGL_NV_stream_frame_limits ---------------------- */
+
+#ifndef EGL_NV_stream_frame_limits
+#define EGL_NV_stream_frame_limits 1
+
+#define EGL_PRODUCER_MAX_FRAME_HINT_NV 0x3337
+#define EGL_CONSUMER_MAX_FRAME_HINT_NV 0x3338
+
+#define EGLEW_NV_stream_frame_limits EGLEW_GET_VAR(__EGLEW_NV_stream_frame_limits)
+
+#endif /* EGL_NV_stream_frame_limits */
+
+/* ------------------------- EGL_NV_stream_metadata ------------------------ */
+
+#ifndef EGL_NV_stream_metadata
+#define EGL_NV_stream_metadata 1
+
+#define EGL_MAX_STREAM_METADATA_BLOCKS_NV 0x3250
+#define EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV 0x3251
+#define EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV 0x3252
+#define EGL_PRODUCER_METADATA_NV 0x3253
+#define EGL_CONSUMER_METADATA_NV 0x3254
+#define EGL_METADATA0_SIZE_NV 0x3255
+#define EGL_METADATA1_SIZE_NV 0x3256
+#define EGL_METADATA2_SIZE_NV 0x3257
+#define EGL_METADATA3_SIZE_NV 0x3258
+#define EGL_METADATA0_TYPE_NV 0x3259
+#define EGL_METADATA1_TYPE_NV 0x325A
+#define EGL_METADATA2_TYPE_NV 0x325B
+#define EGL_METADATA3_TYPE_NV 0x325C
+#define EGL_PENDING_METADATA_NV 0x3328
+
+typedef EGLBoolean  ( * PFNEGLQUERYDISPLAYATTRIBNVPROC) (EGLDisplay  dpy, EGLint  attribute, EGLAttrib * value);
+typedef EGLBoolean  ( * PFNEGLQUERYSTREAMMETADATANVPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  name, EGLint  n, EGLint  offset, EGLint  size, void * data);
+typedef EGLBoolean  ( * PFNEGLSETSTREAMMETADATANVPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLint  n, EGLint  offset, EGLint  size, const void * data);
+
+#define eglQueryDisplayAttribNV EGLEW_GET_FUN(__eglewQueryDisplayAttribNV)
+#define eglQueryStreamMetadataNV EGLEW_GET_FUN(__eglewQueryStreamMetadataNV)
+#define eglSetStreamMetadataNV EGLEW_GET_FUN(__eglewSetStreamMetadataNV)
+
+#define EGLEW_NV_stream_metadata EGLEW_GET_VAR(__EGLEW_NV_stream_metadata)
+
+#endif /* EGL_NV_stream_metadata */
+
+/* -------------------------- EGL_NV_stream_remote ------------------------- */
+
+#ifndef EGL_NV_stream_remote
+#define EGL_NV_stream_remote 1
+
+#define EGL_STREAM_STATE_INITIALIZING_NV 0x3240
+#define EGL_STREAM_TYPE_NV 0x3241
+#define EGL_STREAM_PROTOCOL_NV 0x3242
+#define EGL_STREAM_ENDPOINT_NV 0x3243
+#define EGL_STREAM_LOCAL_NV 0x3244
+#define EGL_STREAM_PROTOCOL_FD_NV 0x3246
+#define EGL_STREAM_PRODUCER_NV 0x3247
+#define EGL_STREAM_CONSUMER_NV 0x3248
+
+#define EGLEW_NV_stream_remote EGLEW_GET_VAR(__EGLEW_NV_stream_remote)
+
+#endif /* EGL_NV_stream_remote */
+
+/* -------------------------- EGL_NV_stream_reset -------------------------- */
+
+#ifndef EGL_NV_stream_reset
+#define EGL_NV_stream_reset 1
+
+#define EGL_SUPPORT_RESET_NV 0x3334
+#define EGL_SUPPORT_REUSE_NV 0x3335
+
+typedef EGLBoolean  ( * PFNEGLRESETSTREAMNVPROC) (EGLDisplay  dpy, EGLStreamKHR  stream);
+
+#define eglResetStreamNV EGLEW_GET_FUN(__eglewResetStreamNV)
+
+#define EGLEW_NV_stream_reset EGLEW_GET_VAR(__EGLEW_NV_stream_reset)
+
+#endif /* EGL_NV_stream_reset */
+
+/* -------------------------- EGL_NV_stream_socket ------------------------- */
+
+#ifndef EGL_NV_stream_socket
+#define EGL_NV_stream_socket 1
+
+#define EGL_STREAM_PROTOCOL_SOCKET_NV 0x324B
+#define EGL_SOCKET_HANDLE_NV 0x324C
+#define EGL_SOCKET_TYPE_NV 0x324D
+
+#define EGLEW_NV_stream_socket EGLEW_GET_VAR(__EGLEW_NV_stream_socket)
+
+#endif /* EGL_NV_stream_socket */
+
+/* ----------------------- EGL_NV_stream_socket_inet ----------------------- */
+
+#ifndef EGL_NV_stream_socket_inet
+#define EGL_NV_stream_socket_inet 1
+
+#define EGL_SOCKET_TYPE_INET_NV 0x324F
+
+#define EGLEW_NV_stream_socket_inet EGLEW_GET_VAR(__EGLEW_NV_stream_socket_inet)
+
+#endif /* EGL_NV_stream_socket_inet */
+
+/* ----------------------- EGL_NV_stream_socket_unix ----------------------- */
+
+#ifndef EGL_NV_stream_socket_unix
+#define EGL_NV_stream_socket_unix 1
+
+#define EGL_SOCKET_TYPE_UNIX_NV 0x324E
+
+#define EGLEW_NV_stream_socket_unix EGLEW_GET_VAR(__EGLEW_NV_stream_socket_unix)
+
+#endif /* EGL_NV_stream_socket_unix */
+
+/* --------------------------- EGL_NV_stream_sync -------------------------- */
+
+#ifndef EGL_NV_stream_sync
+#define EGL_NV_stream_sync 1
+
+#define EGL_SYNC_TYPE_KHR 0x30F7
+#define EGL_SYNC_NEW_FRAME_NV 0x321F
+
+typedef EGLSyncKHR  ( * PFNEGLCREATESTREAMSYNCNVPROC) (EGLDisplay  dpy, EGLStreamKHR  stream, EGLenum  type, const EGLint * attrib_list);
+
+#define eglCreateStreamSyncNV EGLEW_GET_FUN(__eglewCreateStreamSyncNV)
+
+#define EGLEW_NV_stream_sync EGLEW_GET_VAR(__EGLEW_NV_stream_sync)
+
+#endif /* EGL_NV_stream_sync */
+
+/* ------------------------------ EGL_NV_sync ------------------------------ */
+
+#ifndef EGL_NV_sync
+#define EGL_NV_sync 1
+
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV 0x0001
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV 0x30E6
+#define EGL_SYNC_STATUS_NV 0x30E7
+#define EGL_SIGNALED_NV 0x30E8
+#define EGL_UNSIGNALED_NV 0x30E9
+#define EGL_ALREADY_SIGNALED_NV 0x30EA
+#define EGL_TIMEOUT_EXPIRED_NV 0x30EB
+#define EGL_CONDITION_SATISFIED_NV 0x30EC
+#define EGL_SYNC_TYPE_NV 0x30ED
+#define EGL_SYNC_CONDITION_NV 0x30EE
+#define EGL_SYNC_FENCE_NV 0x30EF
+#define EGL_FOREVER_NV 0xFFFFFFFFFFFFFFFF
+
+typedef EGLint  ( * PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV  sync, EGLint  flags, EGLTimeNV  timeout);
+typedef EGLSyncNV  ( * PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay  dpy, EGLenum  condition, const EGLint * attrib_list);
+typedef EGLBoolean  ( * PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV  sync);
+typedef EGLBoolean  ( * PFNEGLFENCENVPROC) (EGLSyncNV  sync);
+typedef EGLBoolean  ( * PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV  sync, EGLint  attribute, EGLint * value);
+typedef EGLBoolean  ( * PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV  sync, EGLenum  mode);
+
+#define eglClientWaitSyncNV EGLEW_GET_FUN(__eglewClientWaitSyncNV)
+#define eglCreateFenceSyncNV EGLEW_GET_FUN(__eglewCreateFenceSyncNV)
+#define eglDestroySyncNV EGLEW_GET_FUN(__eglewDestroySyncNV)
+#define eglFenceNV EGLEW_GET_FUN(__eglewFenceNV)
+#define eglGetSyncAttribNV EGLEW_GET_FUN(__eglewGetSyncAttribNV)
+#define eglSignalSyncNV EGLEW_GET_FUN(__eglewSignalSyncNV)
+
+#define EGLEW_NV_sync EGLEW_GET_VAR(__EGLEW_NV_sync)
+
+#endif /* EGL_NV_sync */
+
+/* --------------------------- EGL_NV_system_time -------------------------- */
+
+#ifndef EGL_NV_system_time
+#define EGL_NV_system_time 1
+
+typedef EGLuint64NV  ( * PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC) ( void );
+typedef EGLuint64NV  ( * PFNEGLGETSYSTEMTIMENVPROC) ( void );
+
+#define eglGetSystemTimeFrequencyNV EGLEW_GET_FUN(__eglewGetSystemTimeFrequencyNV)
+#define eglGetSystemTimeNV EGLEW_GET_FUN(__eglewGetSystemTimeNV)
+
+#define EGLEW_NV_system_time EGLEW_GET_VAR(__EGLEW_NV_system_time)
+
+#endif /* EGL_NV_system_time */
+
+/* --------------------- EGL_TIZEN_image_native_buffer --------------------- */
+
+#ifndef EGL_TIZEN_image_native_buffer
+#define EGL_TIZEN_image_native_buffer 1
+
+#define EGL_NATIVE_BUFFER_TIZEN 0x32A0
+
+#define EGLEW_TIZEN_image_native_buffer EGLEW_GET_VAR(__EGLEW_TIZEN_image_native_buffer)
+
+#endif /* EGL_TIZEN_image_native_buffer */
+
+/* --------------------- EGL_TIZEN_image_native_surface -------------------- */
+
+#ifndef EGL_TIZEN_image_native_surface
+#define EGL_TIZEN_image_native_surface 1
+
+#define EGL_NATIVE_SURFACE_TIZEN 0x32A1
+
+#define EGLEW_TIZEN_image_native_surface EGLEW_GET_VAR(__EGLEW_TIZEN_image_native_surface)
+
+#endif /* EGL_TIZEN_image_native_surface */
+
+/* ------------------------------------------------------------------------- */
+
+#define EGLEW_FUN_EXPORT GLEW_FUN_EXPORT
+#define EGLEW_VAR_EXPORT GLEW_VAR_EXPORT
+
+EGLEW_FUN_EXPORT PFNEGLCHOOSECONFIGPROC __eglewChooseConfig;
+EGLEW_FUN_EXPORT PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers;
+EGLEW_FUN_EXPORT PFNEGLCREATECONTEXTPROC __eglewCreateContext;
+EGLEW_FUN_EXPORT PFNEGLCREATEPBUFFERSURFACEPROC __eglewCreatePbufferSurface;
+EGLEW_FUN_EXPORT PFNEGLCREATEPIXMAPSURFACEPROC __eglewCreatePixmapSurface;
+EGLEW_FUN_EXPORT PFNEGLCREATEWINDOWSURFACEPROC __eglewCreateWindowSurface;
+EGLEW_FUN_EXPORT PFNEGLDESTROYCONTEXTPROC __eglewDestroyContext;
+EGLEW_FUN_EXPORT PFNEGLDESTROYSURFACEPROC __eglewDestroySurface;
+EGLEW_FUN_EXPORT PFNEGLGETCONFIGATTRIBPROC __eglewGetConfigAttrib;
+EGLEW_FUN_EXPORT PFNEGLGETCONFIGSPROC __eglewGetConfigs;
+EGLEW_FUN_EXPORT PFNEGLGETCURRENTDISPLAYPROC __eglewGetCurrentDisplay;
+EGLEW_FUN_EXPORT PFNEGLGETCURRENTSURFACEPROC __eglewGetCurrentSurface;
+EGLEW_FUN_EXPORT PFNEGLGETDISPLAYPROC __eglewGetDisplay;
+EGLEW_FUN_EXPORT PFNEGLGETERRORPROC __eglewGetError;
+EGLEW_FUN_EXPORT PFNEGLINITIALIZEPROC __eglewInitialize;
+EGLEW_FUN_EXPORT PFNEGLMAKECURRENTPROC __eglewMakeCurrent;
+EGLEW_FUN_EXPORT PFNEGLQUERYCONTEXTPROC __eglewQueryContext;
+EGLEW_FUN_EXPORT PFNEGLQUERYSTRINGPROC __eglewQueryString;
+EGLEW_FUN_EXPORT PFNEGLQUERYSURFACEPROC __eglewQuerySurface;
+EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSPROC __eglewSwapBuffers;
+EGLEW_FUN_EXPORT PFNEGLTERMINATEPROC __eglewTerminate;
+EGLEW_FUN_EXPORT PFNEGLWAITGLPROC __eglewWaitGL;
+EGLEW_FUN_EXPORT PFNEGLWAITNATIVEPROC __eglewWaitNative;
+
+EGLEW_FUN_EXPORT PFNEGLBINDTEXIMAGEPROC __eglewBindTexImage;
+EGLEW_FUN_EXPORT PFNEGLRELEASETEXIMAGEPROC __eglewReleaseTexImage;
+EGLEW_FUN_EXPORT PFNEGLSURFACEATTRIBPROC __eglewSurfaceAttrib;
+EGLEW_FUN_EXPORT PFNEGLSWAPINTERVALPROC __eglewSwapInterval;
+
+EGLEW_FUN_EXPORT PFNEGLBINDAPIPROC __eglewBindAPI;
+EGLEW_FUN_EXPORT PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC __eglewCreatePbufferFromClientBuffer;
+EGLEW_FUN_EXPORT PFNEGLQUERYAPIPROC __eglewQueryAPI;
+EGLEW_FUN_EXPORT PFNEGLRELEASETHREADPROC __eglewReleaseThread;
+EGLEW_FUN_EXPORT PFNEGLWAITCLIENTPROC __eglewWaitClient;
+
+EGLEW_FUN_EXPORT PFNEGLGETCURRENTCONTEXTPROC __eglewGetCurrentContext;
+
+EGLEW_FUN_EXPORT PFNEGLCLIENTWAITSYNCPROC __eglewClientWaitSync;
+EGLEW_FUN_EXPORT PFNEGLCREATEIMAGEPROC __eglewCreateImage;
+EGLEW_FUN_EXPORT PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC __eglewCreatePlatformPixmapSurface;
+EGLEW_FUN_EXPORT PFNEGLCREATEPLATFORMWINDOWSURFACEPROC __eglewCreatePlatformWindowSurface;
+EGLEW_FUN_EXPORT PFNEGLCREATESYNCPROC __eglewCreateSync;
+EGLEW_FUN_EXPORT PFNEGLDESTROYIMAGEPROC __eglewDestroyImage;
+EGLEW_FUN_EXPORT PFNEGLDESTROYSYNCPROC __eglewDestroySync;
+EGLEW_FUN_EXPORT PFNEGLGETPLATFORMDISPLAYPROC __eglewGetPlatformDisplay;
+EGLEW_FUN_EXPORT PFNEGLGETSYNCATTRIBPROC __eglewGetSyncAttrib;
+EGLEW_FUN_EXPORT PFNEGLWAITSYNCPROC __eglewWaitSync;
+
+EGLEW_FUN_EXPORT PFNEGLSETBLOBCACHEFUNCSANDROIDPROC __eglewSetBlobCacheFuncsANDROID;
+
+EGLEW_FUN_EXPORT PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC __eglewCreateNativeClientBufferANDROID;
+
+EGLEW_FUN_EXPORT PFNEGLDUPNATIVEFENCEFDANDROIDPROC __eglewDupNativeFenceFDANDROID;
+
+EGLEW_FUN_EXPORT PFNEGLPRESENTATIONTIMEANDROIDPROC __eglewPresentationTimeANDROID;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYSURFACEPOINTERANGLEPROC __eglewQuerySurfacePointerANGLE;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYDEVICESEXTPROC __eglewQueryDevicesEXT;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYDEVICEATTRIBEXTPROC __eglewQueryDeviceAttribEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYDEVICESTRINGEXTPROC __eglewQueryDeviceStringEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYDISPLAYATTRIBEXTPROC __eglewQueryDisplayAttribEXT;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYDMABUFFORMATSEXTPROC __eglewQueryDmaBufFormatsEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYDMABUFMODIFIERSEXTPROC __eglewQueryDmaBufModifiersEXT;
+
+EGLEW_FUN_EXPORT PFNEGLGETOUTPUTLAYERSEXTPROC __eglewGetOutputLayersEXT;
+EGLEW_FUN_EXPORT PFNEGLGETOUTPUTPORTSEXTPROC __eglewGetOutputPortsEXT;
+EGLEW_FUN_EXPORT PFNEGLOUTPUTLAYERATTRIBEXTPROC __eglewOutputLayerAttribEXT;
+EGLEW_FUN_EXPORT PFNEGLOUTPUTPORTATTRIBEXTPROC __eglewOutputPortAttribEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC __eglewQueryOutputLayerAttribEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC __eglewQueryOutputLayerStringEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC __eglewQueryOutputPortAttribEXT;
+EGLEW_FUN_EXPORT PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC __eglewQueryOutputPortStringEXT;
+
+EGLEW_FUN_EXPORT PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC __eglewCreatePlatformPixmapSurfaceEXT;
+EGLEW_FUN_EXPORT PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC __eglewCreatePlatformWindowSurfaceEXT;
+EGLEW_FUN_EXPORT PFNEGLGETPLATFORMDISPLAYEXTPROC __eglewGetPlatformDisplayEXT;
+
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMEROUTPUTEXTPROC __eglewStreamConsumerOutputEXT;
+
+EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC __eglewSwapBuffersWithDamageEXT;
+
+EGLEW_FUN_EXPORT PFNEGLCREATEPIXMAPSURFACEHIPROC __eglewCreatePixmapSurfaceHI;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESYNC64KHRPROC __eglewCreateSync64KHR;
+
+EGLEW_FUN_EXPORT PFNEGLDEBUGMESSAGECONTROLKHRPROC __eglewDebugMessageControlKHR;
+EGLEW_FUN_EXPORT PFNEGLLABELOBJECTKHRPROC __eglewLabelObjectKHR;
+EGLEW_FUN_EXPORT PFNEGLQUERYDEBUGKHRPROC __eglewQueryDebugKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATEIMAGEKHRPROC __eglewCreateImageKHR;
+EGLEW_FUN_EXPORT PFNEGLDESTROYIMAGEKHRPROC __eglewDestroyImageKHR;
+
+EGLEW_FUN_EXPORT PFNEGLLOCKSURFACEKHRPROC __eglewLockSurfaceKHR;
+EGLEW_FUN_EXPORT PFNEGLUNLOCKSURFACEKHRPROC __eglewUnlockSurfaceKHR;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYSURFACE64KHRPROC __eglewQuerySurface64KHR;
+
+EGLEW_FUN_EXPORT PFNEGLSETDAMAGEREGIONKHRPROC __eglewSetDamageRegionKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCLIENTWAITSYNCKHRPROC __eglewClientWaitSyncKHR;
+EGLEW_FUN_EXPORT PFNEGLCREATESYNCKHRPROC __eglewCreateSyncKHR;
+EGLEW_FUN_EXPORT PFNEGLDESTROYSYNCKHRPROC __eglewDestroySyncKHR;
+EGLEW_FUN_EXPORT PFNEGLGETSYNCATTRIBKHRPROC __eglewGetSyncAttribKHR;
+EGLEW_FUN_EXPORT PFNEGLSIGNALSYNCKHRPROC __eglewSignalSyncKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESTREAMKHRPROC __eglewCreateStreamKHR;
+EGLEW_FUN_EXPORT PFNEGLDESTROYSTREAMKHRPROC __eglewDestroyStreamKHR;
+EGLEW_FUN_EXPORT PFNEGLQUERYSTREAMKHRPROC __eglewQueryStreamKHR;
+EGLEW_FUN_EXPORT PFNEGLQUERYSTREAMU64KHRPROC __eglewQueryStreamu64KHR;
+EGLEW_FUN_EXPORT PFNEGLSTREAMATTRIBKHRPROC __eglewStreamAttribKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESTREAMATTRIBKHRPROC __eglewCreateStreamAttribKHR;
+EGLEW_FUN_EXPORT PFNEGLQUERYSTREAMATTRIBKHRPROC __eglewQueryStreamAttribKHR;
+EGLEW_FUN_EXPORT PFNEGLSETSTREAMATTRIBKHRPROC __eglewSetStreamAttribKHR;
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC __eglewStreamConsumerAcquireAttribKHR;
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC __eglewStreamConsumerReleaseAttribKHR;
+
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERACQUIREKHRPROC __eglewStreamConsumerAcquireKHR;
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC __eglewStreamConsumerGLTextureExternalKHR;
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERRELEASEKHRPROC __eglewStreamConsumerReleaseKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC __eglewCreateStreamFromFileDescriptorKHR;
+EGLEW_FUN_EXPORT PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC __eglewGetStreamFileDescriptorKHR;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYSTREAMTIMEKHRPROC __eglewQueryStreamTimeKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC __eglewCreateStreamProducerSurfaceKHR;
+
+EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC __eglewSwapBuffersWithDamageKHR;
+
+EGLEW_FUN_EXPORT PFNEGLWAITSYNCKHRPROC __eglewWaitSyncKHR;
+
+EGLEW_FUN_EXPORT PFNEGLCREATEDRMIMAGEMESAPROC __eglewCreateDRMImageMESA;
+EGLEW_FUN_EXPORT PFNEGLEXPORTDRMIMAGEMESAPROC __eglewExportDRMImageMESA;
+
+EGLEW_FUN_EXPORT PFNEGLEXPORTDMABUFIMAGEMESAPROC __eglewExportDMABUFImageMESA;
+EGLEW_FUN_EXPORT PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC __eglewExportDMABUFImageQueryMESA;
+
+EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSREGIONNOKPROC __eglewSwapBuffersRegionNOK;
+
+EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSREGION2NOKPROC __eglewSwapBuffersRegion2NOK;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYNATIVEDISPLAYNVPROC __eglewQueryNativeDisplayNV;
+EGLEW_FUN_EXPORT PFNEGLQUERYNATIVEPIXMAPNVPROC __eglewQueryNativePixmapNV;
+EGLEW_FUN_EXPORT PFNEGLQUERYNATIVEWINDOWNVPROC __eglewQueryNativeWindowNV;
+
+EGLEW_FUN_EXPORT PFNEGLPOSTSUBBUFFERNVPROC __eglewPostSubBufferNV;
+
+EGLEW_FUN_EXPORT PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC __eglewStreamConsumerGLTextureExternalAttribsNV;
+
+EGLEW_FUN_EXPORT PFNEGLQUERYDISPLAYATTRIBNVPROC __eglewQueryDisplayAttribNV;
+EGLEW_FUN_EXPORT PFNEGLQUERYSTREAMMETADATANVPROC __eglewQueryStreamMetadataNV;
+EGLEW_FUN_EXPORT PFNEGLSETSTREAMMETADATANVPROC __eglewSetStreamMetadataNV;
+
+EGLEW_FUN_EXPORT PFNEGLRESETSTREAMNVPROC __eglewResetStreamNV;
+
+EGLEW_FUN_EXPORT PFNEGLCREATESTREAMSYNCNVPROC __eglewCreateStreamSyncNV;
+
+EGLEW_FUN_EXPORT PFNEGLCLIENTWAITSYNCNVPROC __eglewClientWaitSyncNV;
+EGLEW_FUN_EXPORT PFNEGLCREATEFENCESYNCNVPROC __eglewCreateFenceSyncNV;
+EGLEW_FUN_EXPORT PFNEGLDESTROYSYNCNVPROC __eglewDestroySyncNV;
+EGLEW_FUN_EXPORT PFNEGLFENCENVPROC __eglewFenceNV;
+EGLEW_FUN_EXPORT PFNEGLGETSYNCATTRIBNVPROC __eglewGetSyncAttribNV;
+EGLEW_FUN_EXPORT PFNEGLSIGNALSYNCNVPROC __eglewSignalSyncNV;
+
+EGLEW_FUN_EXPORT PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC __eglewGetSystemTimeFrequencyNV;
+EGLEW_FUN_EXPORT PFNEGLGETSYSTEMTIMENVPROC __eglewGetSystemTimeNV;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_0;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_1;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_2;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_3;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_4;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_VERSION_1_5;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_blob_cache;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_create_native_client_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_framebuffer_target;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_front_buffer_auto_refresh;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_image_native_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_native_fence_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_presentation_time;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANDROID_recordable;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANGLE_d3d_share_handle_client_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANGLE_device_d3d;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANGLE_query_surface_pointer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANGLE_surface_d3d_texture_2d_share_handle;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ANGLE_window_fixed_size;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ARM_implicit_external_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_ARM_pixmap_multisample_discard;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_buffer_age;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_client_extensions;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_create_context_robustness;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_device_base;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_device_drm;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_device_enumeration;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_device_openwf;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_device_query;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_gl_colorspace_bt2020_linear;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_gl_colorspace_bt2020_pq;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_gl_colorspace_scrgb_linear;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_image_dma_buf_import;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_image_dma_buf_import_modifiers;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_multiview_window;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_output_base;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_output_drm;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_output_openwf;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_pixel_format_float;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_platform_base;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_platform_device;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_platform_wayland;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_platform_x11;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_protected_content;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_protected_surface;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_stream_consumer_egloutput;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_surface_SMPTE2086_metadata;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_swap_buffers_with_damage;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_EXT_yuv_surface;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_HI_clientpixmap;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_HI_colorformats;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_IMG_context_priority;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_IMG_image_plane_attribs;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_cl_event;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_cl_event2;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_client_get_all_proc_addresses;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_config_attribs;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_context_flush_control;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_create_context;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_create_context_no_error;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_debug;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_fence_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_get_all_proc_addresses;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_gl_colorspace;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_gl_renderbuffer_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_gl_texture_2D_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_gl_texture_3D_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_gl_texture_cubemap_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_image_base;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_image_pixmap;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_lock_surface;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_lock_surface2;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_lock_surface3;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_mutable_render_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_no_config_context;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_partial_update;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_platform_android;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_platform_gbm;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_platform_wayland;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_platform_x11;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_reusable_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_attrib;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_consumer_gltexture;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_cross_process_fd;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_fifo;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_producer_aldatalocator;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_stream_producer_eglsurface;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_surfaceless_context;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_swap_buffers_with_damage;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_vg_parent_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_KHR_wait_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_drm_image;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_image_dma_buf_export;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_platform_gbm;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_platform_surfaceless;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_swap_region;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_swap_region2;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_texture_from_pixmap;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_3dvision_surface;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_coverage_sample;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_coverage_sample_resolve;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_cuda_event;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_depth_nonlinear;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_device_cuda;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_native_query;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_post_convert_rounding;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_post_sub_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_robustness_video_memory_purge;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_consumer_gltexture_yuv;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_cross_display;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_cross_object;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_cross_partition;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_cross_process;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_cross_system;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_fifo_next;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_fifo_synchronous;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_frame_limits;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_metadata;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_remote;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_reset;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_socket;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_socket_inet;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_socket_unix;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_stream_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_sync;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_NV_system_time;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_TIZEN_image_native_buffer;
+EGLEW_VAR_EXPORT GLboolean __EGLEW_TIZEN_image_native_surface;
+/* ------------------------------------------------------------------------ */
+
+GLEWAPI GLenum GLEWAPIENTRY eglewInit (EGLDisplay display);
+GLEWAPI GLboolean GLEWAPIENTRY eglewIsSupported (const char *name);
+
+#define EGLEW_GET_VAR(x) (*(const GLboolean*)&x)
+#define EGLEW_GET_FUN(x) x
+
+GLEWAPI GLboolean GLEWAPIENTRY eglewGetExtension (const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __eglew_h__ */
diff --git a/src_bkp/engine/external/glew/GL/glew.h b/src_bkp/engine/external/glew/GL/glew.h
new file mode 100644
index 0000000000..3155f39c7d
--- /dev/null
+++ b/src_bkp/engine/external/glew/GL/glew.h
@@ -0,0 +1,23687 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2008-2017, Nigel Stewart <nigels[]users sourceforge net>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.0
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#ifndef __glew_h__
+#define __glew_h__
+#define __GLEW_H__
+
+#if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H)
+#error gl.h included before glew.h
+#endif
+#if defined(__gl2_h_)
+#error gl2.h included before glew.h
+#endif
+#if defined(__gltypes_h_)
+#error gltypes.h included before glew.h
+#endif
+#if defined(__REGAL_H__)
+#error Regal.h included before glew.h
+#endif
+#if defined(__glext_h_) || defined(__GLEXT_H_)
+#error glext.h included before glew.h
+#endif
+#if defined(__gl_ATI_h_)
+#error glATI.h included before glew.h
+#endif
+
+#define __gl_h_
+#define __gl2_h_
+#define __GL_H__
+#define _GL_H
+#define __gltypes_h_
+#define __REGAL_H__
+#define __X_GL_H
+#define __glext_h_
+#define __GLEXT_H_
+#define __gl_ATI_h_
+
+#if defined(_WIN32)
+
+/*
+ * GLEW does not include <windows.h> to avoid name space pollution.
+ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
+ * defined properly.
+ */
+/* <windef.h> and <gl.h>*/
+#ifdef APIENTRY
+#  ifndef GLAPIENTRY
+#    define GLAPIENTRY APIENTRY
+#  endif
+#  ifndef GLEWAPIENTRY
+#    define GLEWAPIENTRY APIENTRY
+#  endif
+#else
+#define GLEW_APIENTRY_DEFINED
+#  if defined(__MINGW32__) || defined(__CYGWIN__) || (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+#    define APIENTRY __stdcall
+#    ifndef GLAPIENTRY
+#      define GLAPIENTRY __stdcall
+#    endif
+#    ifndef GLEWAPIENTRY
+#      define GLEWAPIENTRY __stdcall
+#    endif
+#  else
+#    define APIENTRY
+#  endif
+#endif
+#ifndef GLAPI
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#    define GLAPI extern
+#  endif
+#endif
+/* <winnt.h> */
+#ifndef CALLBACK
+#define GLEW_CALLBACK_DEFINED
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#    define CALLBACK __attribute__ ((__stdcall__))
+#  elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#    define CALLBACK __stdcall
+#  else
+#    define CALLBACK
+#  endif
+#endif
+/* <wingdi.h> and <winnt.h> */
+#ifndef WINGDIAPI
+#define GLEW_WINGDIAPI_DEFINED
+#define WINGDIAPI __declspec(dllimport)
+#endif
+/* <ctype.h> */
+#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
+typedef unsigned short wchar_t;
+#  define _WCHAR_T_DEFINED
+#endif
+/* <stddef.h> */
+#if !defined(_W64)
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300
+#    define _W64 __w64
+#  else
+#    define _W64
+#  endif
+#endif
+#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__)
+#  ifdef _WIN64
+typedef __int64 ptrdiff_t;
+#  else
+typedef _W64 int ptrdiff_t;
+#  endif
+#  define _PTRDIFF_T_DEFINED
+#  define _PTRDIFF_T_
+#endif
+
+#ifndef GLAPI
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#    define GLAPI extern
+#  else
+#    define GLAPI WINGDIAPI
+#  endif
+#endif
+
+/*
+ * GLEW_STATIC is defined for static library.
+ * GLEW_BUILD  is defined for building the DLL library.
+ */
+
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  ifdef GLEW_BUILD
+#    define GLEWAPI extern __declspec(dllexport)
+#  else
+#    define GLEWAPI extern __declspec(dllimport)
+#  endif
+#endif
+
+#else /* _UNIX */
+
+/*
+ * Needed for ptrdiff_t in turn needed by VBO.  This is defined by ISO
+ * C.  On my system, this amounts to _3 lines_ of included code, all of
+ * them pretty much harmless.  If you know of a way of detecting 32 vs
+ * 64 _targets_ at compile time you are free to replace this with
+ * something that's portable.  For now, _this_ is the portable solution.
+ * (mem, 2004-01-04)
+ */
+
+#include <stddef.h>
+
+/* SGI MIPSPro doesn't like stdint.h in C++ mode          */
+/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */
+
+#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
+#define GLEW_APIENTRY_DEFINED
+#define APIENTRY
+
+/*
+ * GLEW_STATIC is defined for static library.
+ */
+
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  if defined(__GNUC__) && __GNUC__>=4
+#   define GLEWAPI extern __attribute__ ((visibility("default")))
+#  elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#   define GLEWAPI extern __global
+#  else
+#   define GLEWAPI extern
+#  endif
+#endif
+
+/* <glu.h> */
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#endif /* _WIN32 */
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef GLEWAPIENTRY
+#define GLEWAPIENTRY
+#endif
+
+#define GLEW_VAR_EXPORT GLEWAPI
+#define GLEW_FUN_EXPORT GLEWAPI
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ----------------------------- GL_VERSION_1_1 ---------------------------- */
+
+#ifndef GL_VERSION_1_1
+#define GL_VERSION_1_1 1
+
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+typedef unsigned char GLboolean;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef unsigned long GLulong;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+#if defined(_MSC_VER) && _MSC_VER < 1400
+typedef __int64 GLint64EXT;
+typedef unsigned __int64 GLuint64EXT;
+#elif defined(_MSC_VER) || defined(__BORLANDC__)
+typedef signed long long GLint64EXT;
+typedef unsigned long long GLuint64EXT;
+#else
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#include <inttypes.h>
+#  endif
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+typedef GLint64EXT  GLint64;
+typedef GLuint64EXT GLuint64;
+typedef struct __GLsync *GLsync;
+
+typedef char GLchar;
+
+#define GL_ZERO 0
+#define GL_FALSE 0
+#define GL_LOGIC_OP 0x0BF1
+#define GL_NONE 0
+#define GL_TEXTURE_COMPONENTS 0x1003
+#define GL_NO_ERROR 0
+#define GL_POINTS 0x0000
+#define GL_CURRENT_BIT 0x00000001
+#define GL_TRUE 1
+#define GL_ONE 1
+#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
+#define GL_LINES 0x0001
+#define GL_LINE_LOOP 0x0002
+#define GL_POINT_BIT 0x00000002
+#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
+#define GL_LINE_STRIP 0x0003
+#define GL_LINE_BIT 0x00000004
+#define GL_TRIANGLES 0x0004
+#define GL_TRIANGLE_STRIP 0x0005
+#define GL_TRIANGLE_FAN 0x0006
+#define GL_QUADS 0x0007
+#define GL_QUAD_STRIP 0x0008
+#define GL_POLYGON_BIT 0x00000008
+#define GL_POLYGON 0x0009
+#define GL_POLYGON_STIPPLE_BIT 0x00000010
+#define GL_PIXEL_MODE_BIT 0x00000020
+#define GL_LIGHTING_BIT 0x00000040
+#define GL_FOG_BIT 0x00000080
+#define GL_DEPTH_BUFFER_BIT 0x00000100
+#define GL_ACCUM 0x0100
+#define GL_LOAD 0x0101
+#define GL_RETURN 0x0102
+#define GL_MULT 0x0103
+#define GL_ADD 0x0104
+#define GL_NEVER 0x0200
+#define GL_ACCUM_BUFFER_BIT 0x00000200
+#define GL_LESS 0x0201
+#define GL_EQUAL 0x0202
+#define GL_LEQUAL 0x0203
+#define GL_GREATER 0x0204
+#define GL_NOTEQUAL 0x0205
+#define GL_GEQUAL 0x0206
+#define GL_ALWAYS 0x0207
+#define GL_SRC_COLOR 0x0300
+#define GL_ONE_MINUS_SRC_COLOR 0x0301
+#define GL_SRC_ALPHA 0x0302
+#define GL_ONE_MINUS_SRC_ALPHA 0x0303
+#define GL_DST_ALPHA 0x0304
+#define GL_ONE_MINUS_DST_ALPHA 0x0305
+#define GL_DST_COLOR 0x0306
+#define GL_ONE_MINUS_DST_COLOR 0x0307
+#define GL_SRC_ALPHA_SATURATE 0x0308
+#define GL_STENCIL_BUFFER_BIT 0x00000400
+#define GL_FRONT_LEFT 0x0400
+#define GL_FRONT_RIGHT 0x0401
+#define GL_BACK_LEFT 0x0402
+#define GL_BACK_RIGHT 0x0403
+#define GL_FRONT 0x0404
+#define GL_BACK 0x0405
+#define GL_LEFT 0x0406
+#define GL_RIGHT 0x0407
+#define GL_FRONT_AND_BACK 0x0408
+#define GL_AUX0 0x0409
+#define GL_AUX1 0x040A
+#define GL_AUX2 0x040B
+#define GL_AUX3 0x040C
+#define GL_INVALID_ENUM 0x0500
+#define GL_INVALID_VALUE 0x0501
+#define GL_INVALID_OPERATION 0x0502
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_OUT_OF_MEMORY 0x0505
+#define GL_2D 0x0600
+#define GL_3D 0x0601
+#define GL_3D_COLOR 0x0602
+#define GL_3D_COLOR_TEXTURE 0x0603
+#define GL_4D_COLOR_TEXTURE 0x0604
+#define GL_PASS_THROUGH_TOKEN 0x0700
+#define GL_POINT_TOKEN 0x0701
+#define GL_LINE_TOKEN 0x0702
+#define GL_POLYGON_TOKEN 0x0703
+#define GL_BITMAP_TOKEN 0x0704
+#define GL_DRAW_PIXEL_TOKEN 0x0705
+#define GL_COPY_PIXEL_TOKEN 0x0706
+#define GL_LINE_RESET_TOKEN 0x0707
+#define GL_EXP 0x0800
+#define GL_VIEWPORT_BIT 0x00000800
+#define GL_EXP2 0x0801
+#define GL_CW 0x0900
+#define GL_CCW 0x0901
+#define GL_COEFF 0x0A00
+#define GL_ORDER 0x0A01
+#define GL_DOMAIN 0x0A02
+#define GL_CURRENT_COLOR 0x0B00
+#define GL_CURRENT_INDEX 0x0B01
+#define GL_CURRENT_NORMAL 0x0B02
+#define GL_CURRENT_TEXTURE_COORDS 0x0B03
+#define GL_CURRENT_RASTER_COLOR 0x0B04
+#define GL_CURRENT_RASTER_INDEX 0x0B05
+#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
+#define GL_CURRENT_RASTER_POSITION 0x0B07
+#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
+#define GL_CURRENT_RASTER_DISTANCE 0x0B09
+#define GL_POINT_SMOOTH 0x0B10
+#define GL_POINT_SIZE 0x0B11
+#define GL_POINT_SIZE_RANGE 0x0B12
+#define GL_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_LINE_SMOOTH 0x0B20
+#define GL_LINE_WIDTH 0x0B21
+#define GL_LINE_WIDTH_RANGE 0x0B22
+#define GL_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_LINE_STIPPLE 0x0B24
+#define GL_LINE_STIPPLE_PATTERN 0x0B25
+#define GL_LINE_STIPPLE_REPEAT 0x0B26
+#define GL_LIST_MODE 0x0B30
+#define GL_MAX_LIST_NESTING 0x0B31
+#define GL_LIST_BASE 0x0B32
+#define GL_LIST_INDEX 0x0B33
+#define GL_POLYGON_MODE 0x0B40
+#define GL_POLYGON_SMOOTH 0x0B41
+#define GL_POLYGON_STIPPLE 0x0B42
+#define GL_EDGE_FLAG 0x0B43
+#define GL_CULL_FACE 0x0B44
+#define GL_CULL_FACE_MODE 0x0B45
+#define GL_FRONT_FACE 0x0B46
+#define GL_LIGHTING 0x0B50
+#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
+#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
+#define GL_LIGHT_MODEL_AMBIENT 0x0B53
+#define GL_SHADE_MODEL 0x0B54
+#define GL_COLOR_MATERIAL_FACE 0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
+#define GL_COLOR_MATERIAL 0x0B57
+#define GL_FOG 0x0B60
+#define GL_FOG_INDEX 0x0B61
+#define GL_FOG_DENSITY 0x0B62
+#define GL_FOG_START 0x0B63
+#define GL_FOG_END 0x0B64
+#define GL_FOG_MODE 0x0B65
+#define GL_FOG_COLOR 0x0B66
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_DEPTH_TEST 0x0B71
+#define GL_DEPTH_WRITEMASK 0x0B72
+#define GL_DEPTH_CLEAR_VALUE 0x0B73
+#define GL_DEPTH_FUNC 0x0B74
+#define GL_ACCUM_CLEAR_VALUE 0x0B80
+#define GL_STENCIL_TEST 0x0B90
+#define GL_STENCIL_CLEAR_VALUE 0x0B91
+#define GL_STENCIL_FUNC 0x0B92
+#define GL_STENCIL_VALUE_MASK 0x0B93
+#define GL_STENCIL_FAIL 0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
+#define GL_STENCIL_REF 0x0B97
+#define GL_STENCIL_WRITEMASK 0x0B98
+#define GL_MATRIX_MODE 0x0BA0
+#define GL_NORMALIZE 0x0BA1
+#define GL_VIEWPORT 0x0BA2
+#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
+#define GL_PROJECTION_STACK_DEPTH 0x0BA4
+#define GL_TEXTURE_STACK_DEPTH 0x0BA5
+#define GL_MODELVIEW_MATRIX 0x0BA6
+#define GL_PROJECTION_MATRIX 0x0BA7
+#define GL_TEXTURE_MATRIX 0x0BA8
+#define GL_ATTRIB_STACK_DEPTH 0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
+#define GL_ALPHA_TEST 0x0BC0
+#define GL_ALPHA_TEST_FUNC 0x0BC1
+#define GL_ALPHA_TEST_REF 0x0BC2
+#define GL_DITHER 0x0BD0
+#define GL_BLEND_DST 0x0BE0
+#define GL_BLEND_SRC 0x0BE1
+#define GL_BLEND 0x0BE2
+#define GL_LOGIC_OP_MODE 0x0BF0
+#define GL_INDEX_LOGIC_OP 0x0BF1
+#define GL_COLOR_LOGIC_OP 0x0BF2
+#define GL_AUX_BUFFERS 0x0C00
+#define GL_DRAW_BUFFER 0x0C01
+#define GL_READ_BUFFER 0x0C02
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_INDEX_CLEAR_VALUE 0x0C20
+#define GL_INDEX_WRITEMASK 0x0C21
+#define GL_COLOR_CLEAR_VALUE 0x0C22
+#define GL_COLOR_WRITEMASK 0x0C23
+#define GL_INDEX_MODE 0x0C30
+#define GL_RGBA_MODE 0x0C31
+#define GL_DOUBLEBUFFER 0x0C32
+#define GL_STEREO 0x0C33
+#define GL_RENDER_MODE 0x0C40
+#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
+#define GL_POINT_SMOOTH_HINT 0x0C51
+#define GL_LINE_SMOOTH_HINT 0x0C52
+#define GL_POLYGON_SMOOTH_HINT 0x0C53
+#define GL_FOG_HINT 0x0C54
+#define GL_TEXTURE_GEN_S 0x0C60
+#define GL_TEXTURE_GEN_T 0x0C61
+#define GL_TEXTURE_GEN_R 0x0C62
+#define GL_TEXTURE_GEN_Q 0x0C63
+#define GL_PIXEL_MAP_I_TO_I 0x0C70
+#define GL_PIXEL_MAP_S_TO_S 0x0C71
+#define GL_PIXEL_MAP_I_TO_R 0x0C72
+#define GL_PIXEL_MAP_I_TO_G 0x0C73
+#define GL_PIXEL_MAP_I_TO_B 0x0C74
+#define GL_PIXEL_MAP_I_TO_A 0x0C75
+#define GL_PIXEL_MAP_R_TO_R 0x0C76
+#define GL_PIXEL_MAP_G_TO_G 0x0C77
+#define GL_PIXEL_MAP_B_TO_B 0x0C78
+#define GL_PIXEL_MAP_A_TO_A 0x0C79
+#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
+#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
+#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
+#define GL_UNPACK_SWAP_BYTES 0x0CF0
+#define GL_UNPACK_LSB_FIRST 0x0CF1
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#define GL_UNPACK_ALIGNMENT 0x0CF5
+#define GL_PACK_SWAP_BYTES 0x0D00
+#define GL_PACK_LSB_FIRST 0x0D01
+#define GL_PACK_ROW_LENGTH 0x0D02
+#define GL_PACK_SKIP_ROWS 0x0D03
+#define GL_PACK_SKIP_PIXELS 0x0D04
+#define GL_PACK_ALIGNMENT 0x0D05
+#define GL_MAP_COLOR 0x0D10
+#define GL_MAP_STENCIL 0x0D11
+#define GL_INDEX_SHIFT 0x0D12
+#define GL_INDEX_OFFSET 0x0D13
+#define GL_RED_SCALE 0x0D14
+#define GL_RED_BIAS 0x0D15
+#define GL_ZOOM_X 0x0D16
+#define GL_ZOOM_Y 0x0D17
+#define GL_GREEN_SCALE 0x0D18
+#define GL_GREEN_BIAS 0x0D19
+#define GL_BLUE_SCALE 0x0D1A
+#define GL_BLUE_BIAS 0x0D1B
+#define GL_ALPHA_SCALE 0x0D1C
+#define GL_ALPHA_BIAS 0x0D1D
+#define GL_DEPTH_SCALE 0x0D1E
+#define GL_DEPTH_BIAS 0x0D1F
+#define GL_MAX_EVAL_ORDER 0x0D30
+#define GL_MAX_LIGHTS 0x0D31
+#define GL_MAX_CLIP_PLANES 0x0D32
+#define GL_MAX_TEXTURE_SIZE 0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
+#define GL_MAX_NAME_STACK_DEPTH 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
+#define GL_MAX_VIEWPORT_DIMS 0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
+#define GL_SUBPIXEL_BITS 0x0D50
+#define GL_INDEX_BITS 0x0D51
+#define GL_RED_BITS 0x0D52
+#define GL_GREEN_BITS 0x0D53
+#define GL_BLUE_BITS 0x0D54
+#define GL_ALPHA_BITS 0x0D55
+#define GL_DEPTH_BITS 0x0D56
+#define GL_STENCIL_BITS 0x0D57
+#define GL_ACCUM_RED_BITS 0x0D58
+#define GL_ACCUM_GREEN_BITS 0x0D59
+#define GL_ACCUM_BLUE_BITS 0x0D5A
+#define GL_ACCUM_ALPHA_BITS 0x0D5B
+#define GL_NAME_STACK_DEPTH 0x0D70
+#define GL_AUTO_NORMAL 0x0D80
+#define GL_MAP1_COLOR_4 0x0D90
+#define GL_MAP1_INDEX 0x0D91
+#define GL_MAP1_NORMAL 0x0D92
+#define GL_MAP1_TEXTURE_COORD_1 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4 0x0D96
+#define GL_MAP1_VERTEX_3 0x0D97
+#define GL_MAP1_VERTEX_4 0x0D98
+#define GL_MAP2_COLOR_4 0x0DB0
+#define GL_MAP2_INDEX 0x0DB1
+#define GL_MAP2_NORMAL 0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
+#define GL_MAP2_VERTEX_3 0x0DB7
+#define GL_MAP2_VERTEX_4 0x0DB8
+#define GL_MAP1_GRID_DOMAIN 0x0DD0
+#define GL_MAP1_GRID_SEGMENTS 0x0DD1
+#define GL_MAP2_GRID_DOMAIN 0x0DD2
+#define GL_MAP2_GRID_SEGMENTS 0x0DD3
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
+#define GL_SELECTION_BUFFER_POINTER 0x0DF3
+#define GL_SELECTION_BUFFER_SIZE 0x0DF4
+#define GL_TEXTURE_WIDTH 0x1000
+#define GL_TRANSFORM_BIT 0x00001000
+#define GL_TEXTURE_HEIGHT 0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
+#define GL_TEXTURE_BORDER_COLOR 0x1004
+#define GL_TEXTURE_BORDER 0x1005
+#define GL_DONT_CARE 0x1100
+#define GL_FASTEST 0x1101
+#define GL_NICEST 0x1102
+#define GL_AMBIENT 0x1200
+#define GL_DIFFUSE 0x1201
+#define GL_SPECULAR 0x1202
+#define GL_POSITION 0x1203
+#define GL_SPOT_DIRECTION 0x1204
+#define GL_SPOT_EXPONENT 0x1205
+#define GL_SPOT_CUTOFF 0x1206
+#define GL_CONSTANT_ATTENUATION 0x1207
+#define GL_LINEAR_ATTENUATION 0x1208
+#define GL_QUADRATIC_ATTENUATION 0x1209
+#define GL_COMPILE 0x1300
+#define GL_COMPILE_AND_EXECUTE 0x1301
+#define GL_BYTE 0x1400
+#define GL_UNSIGNED_BYTE 0x1401
+#define GL_SHORT 0x1402
+#define GL_UNSIGNED_SHORT 0x1403
+#define GL_INT 0x1404
+#define GL_UNSIGNED_INT 0x1405
+#define GL_FLOAT 0x1406
+#define GL_2_BYTES 0x1407
+#define GL_3_BYTES 0x1408
+#define GL_4_BYTES 0x1409
+#define GL_DOUBLE 0x140A
+#define GL_CLEAR 0x1500
+#define GL_AND 0x1501
+#define GL_AND_REVERSE 0x1502
+#define GL_COPY 0x1503
+#define GL_AND_INVERTED 0x1504
+#define GL_NOOP 0x1505
+#define GL_XOR 0x1506
+#define GL_OR 0x1507
+#define GL_NOR 0x1508
+#define GL_EQUIV 0x1509
+#define GL_INVERT 0x150A
+#define GL_OR_REVERSE 0x150B
+#define GL_COPY_INVERTED 0x150C
+#define GL_OR_INVERTED 0x150D
+#define GL_NAND 0x150E
+#define GL_SET 0x150F
+#define GL_EMISSION 0x1600
+#define GL_SHININESS 0x1601
+#define GL_AMBIENT_AND_DIFFUSE 0x1602
+#define GL_COLOR_INDEXES 0x1603
+#define GL_MODELVIEW 0x1700
+#define GL_PROJECTION 0x1701
+#define GL_TEXTURE 0x1702
+#define GL_COLOR 0x1800
+#define GL_DEPTH 0x1801
+#define GL_STENCIL 0x1802
+#define GL_COLOR_INDEX 0x1900
+#define GL_STENCIL_INDEX 0x1901
+#define GL_DEPTH_COMPONENT 0x1902
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_RGB 0x1907
+#define GL_RGBA 0x1908
+#define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE_ALPHA 0x190A
+#define GL_BITMAP 0x1A00
+#define GL_POINT 0x1B00
+#define GL_LINE 0x1B01
+#define GL_FILL 0x1B02
+#define GL_RENDER 0x1C00
+#define GL_FEEDBACK 0x1C01
+#define GL_SELECT 0x1C02
+#define GL_FLAT 0x1D00
+#define GL_SMOOTH 0x1D01
+#define GL_KEEP 0x1E00
+#define GL_REPLACE 0x1E01
+#define GL_INCR 0x1E02
+#define GL_DECR 0x1E03
+#define GL_VENDOR 0x1F00
+#define GL_RENDERER 0x1F01
+#define GL_VERSION 0x1F02
+#define GL_EXTENSIONS 0x1F03
+#define GL_S 0x2000
+#define GL_ENABLE_BIT 0x00002000
+#define GL_T 0x2001
+#define GL_R 0x2002
+#define GL_Q 0x2003
+#define GL_MODULATE 0x2100
+#define GL_DECAL 0x2101
+#define GL_TEXTURE_ENV_MODE 0x2200
+#define GL_TEXTURE_ENV_COLOR 0x2201
+#define GL_TEXTURE_ENV 0x2300
+#define GL_EYE_LINEAR 0x2400
+#define GL_OBJECT_LINEAR 0x2401
+#define GL_SPHERE_MAP 0x2402
+#define GL_TEXTURE_GEN_MODE 0x2500
+#define GL_OBJECT_PLANE 0x2501
+#define GL_EYE_PLANE 0x2502
+#define GL_NEAREST 0x2600
+#define GL_LINEAR 0x2601
+#define GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GL_LINEAR_MIPMAP_NEAREST 0x2701
+#define GL_NEAREST_MIPMAP_LINEAR 0x2702
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
+#define GL_TEXTURE_MAG_FILTER 0x2800
+#define GL_TEXTURE_MIN_FILTER 0x2801
+#define GL_TEXTURE_WRAP_S 0x2802
+#define GL_TEXTURE_WRAP_T 0x2803
+#define GL_CLAMP 0x2900
+#define GL_REPEAT 0x2901
+#define GL_POLYGON_OFFSET_UNITS 0x2A00
+#define GL_POLYGON_OFFSET_POINT 0x2A01
+#define GL_POLYGON_OFFSET_LINE 0x2A02
+#define GL_R3_G3_B2 0x2A10
+#define GL_V2F 0x2A20
+#define GL_V3F 0x2A21
+#define GL_C4UB_V2F 0x2A22
+#define GL_C4UB_V3F 0x2A23
+#define GL_C3F_V3F 0x2A24
+#define GL_N3F_V3F 0x2A25
+#define GL_C4F_N3F_V3F 0x2A26
+#define GL_T2F_V3F 0x2A27
+#define GL_T4F_V4F 0x2A28
+#define GL_T2F_C4UB_V3F 0x2A29
+#define GL_T2F_C3F_V3F 0x2A2A
+#define GL_T2F_N3F_V3F 0x2A2B
+#define GL_T2F_C4F_N3F_V3F 0x2A2C
+#define GL_T4F_C4F_N3F_V4F 0x2A2D
+#define GL_CLIP_PLANE0 0x3000
+#define GL_CLIP_PLANE1 0x3001
+#define GL_CLIP_PLANE2 0x3002
+#define GL_CLIP_PLANE3 0x3003
+#define GL_CLIP_PLANE4 0x3004
+#define GL_CLIP_PLANE5 0x3005
+#define GL_LIGHT0 0x4000
+#define GL_COLOR_BUFFER_BIT 0x00004000
+#define GL_LIGHT1 0x4001
+#define GL_LIGHT2 0x4002
+#define GL_LIGHT3 0x4003
+#define GL_LIGHT4 0x4004
+#define GL_LIGHT5 0x4005
+#define GL_LIGHT6 0x4006
+#define GL_LIGHT7 0x4007
+#define GL_HINT_BIT 0x00008000
+#define GL_POLYGON_OFFSET_FILL 0x8037
+#define GL_POLYGON_OFFSET_FACTOR 0x8038
+#define GL_ALPHA4 0x803B
+#define GL_ALPHA8 0x803C
+#define GL_ALPHA12 0x803D
+#define GL_ALPHA16 0x803E
+#define GL_LUMINANCE4 0x803F
+#define GL_LUMINANCE8 0x8040
+#define GL_LUMINANCE12 0x8041
+#define GL_LUMINANCE16 0x8042
+#define GL_LUMINANCE4_ALPHA4 0x8043
+#define GL_LUMINANCE6_ALPHA2 0x8044
+#define GL_LUMINANCE8_ALPHA8 0x8045
+#define GL_LUMINANCE12_ALPHA4 0x8046
+#define GL_LUMINANCE12_ALPHA12 0x8047
+#define GL_LUMINANCE16_ALPHA16 0x8048
+#define GL_INTENSITY 0x8049
+#define GL_INTENSITY4 0x804A
+#define GL_INTENSITY8 0x804B
+#define GL_INTENSITY12 0x804C
+#define GL_INTENSITY16 0x804D
+#define GL_RGB4 0x804F
+#define GL_RGB5 0x8050
+#define GL_RGB8 0x8051
+#define GL_RGB10 0x8052
+#define GL_RGB12 0x8053
+#define GL_RGB16 0x8054
+#define GL_RGBA2 0x8055
+#define GL_RGBA4 0x8056
+#define GL_RGB5_A1 0x8057
+#define GL_RGBA8 0x8058
+#define GL_RGB10_A2 0x8059
+#define GL_RGBA12 0x805A
+#define GL_RGBA16 0x805B
+#define GL_TEXTURE_RED_SIZE 0x805C
+#define GL_TEXTURE_GREEN_SIZE 0x805D
+#define GL_TEXTURE_BLUE_SIZE 0x805E
+#define GL_TEXTURE_ALPHA_SIZE 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE 0x8061
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_PRIORITY 0x8066
+#define GL_TEXTURE_RESIDENT 0x8067
+#define GL_TEXTURE_BINDING_1D 0x8068
+#define GL_TEXTURE_BINDING_2D 0x8069
+#define GL_VERTEX_ARRAY 0x8074
+#define GL_NORMAL_ARRAY 0x8075
+#define GL_COLOR_ARRAY 0x8076
+#define GL_INDEX_ARRAY 0x8077
+#define GL_TEXTURE_COORD_ARRAY 0x8078
+#define GL_EDGE_FLAG_ARRAY 0x8079
+#define GL_VERTEX_ARRAY_SIZE 0x807A
+#define GL_VERTEX_ARRAY_TYPE 0x807B
+#define GL_VERTEX_ARRAY_STRIDE 0x807C
+#define GL_NORMAL_ARRAY_TYPE 0x807E
+#define GL_NORMAL_ARRAY_STRIDE 0x807F
+#define GL_COLOR_ARRAY_SIZE 0x8081
+#define GL_COLOR_ARRAY_TYPE 0x8082
+#define GL_COLOR_ARRAY_STRIDE 0x8083
+#define GL_INDEX_ARRAY_TYPE 0x8085
+#define GL_INDEX_ARRAY_STRIDE 0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
+#define GL_VERTEX_ARRAY_POINTER 0x808E
+#define GL_NORMAL_ARRAY_POINTER 0x808F
+#define GL_COLOR_ARRAY_POINTER 0x8090
+#define GL_INDEX_ARRAY_POINTER 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
+#define GL_COLOR_INDEX1_EXT 0x80E2
+#define GL_COLOR_INDEX2_EXT 0x80E3
+#define GL_COLOR_INDEX4_EXT 0x80E4
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#define GL_COLOR_INDEX12_EXT 0x80E6
+#define GL_COLOR_INDEX16_EXT 0x80E7
+#define GL_EVAL_BIT 0x00010000
+#define GL_LIST_BIT 0x00020000
+#define GL_TEXTURE_BIT 0x00040000
+#define GL_SCISSOR_BIT 0x00080000
+#define GL_ALL_ATTRIB_BITS 0x000fffff
+#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff
+
+GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value);
+GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref);
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void GLAPIENTRY glArrayElement (GLint i);
+GLAPI void GLAPIENTRY glBegin (GLenum mode);
+GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
+GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
+GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GLAPI void GLAPIENTRY glCallList (GLuint list);
+GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const void *lists);
+GLAPI void GLAPIENTRY glClear (GLbitfield mask);
+GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void GLAPIENTRY glClearDepth (GLclampd depth);
+GLAPI void GLAPIENTRY glClearIndex (GLfloat c);
+GLAPI void GLAPIENTRY glClearStencil (GLint s);
+GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation);
+GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue);
+GLAPI void GLAPIENTRY glColor3iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void GLAPIENTRY glColor3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void GLAPIENTRY glColor3usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
+GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
+GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void GLAPIENTRY glColor4iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha);
+GLAPI void GLAPIENTRY glColor4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
+GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha);
+GLAPI void GLAPIENTRY glColor4usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
+GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glCullFace (GLenum mode);
+GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range);
+GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
+GLAPI void GLAPIENTRY glDepthFunc (GLenum func);
+GLAPI void GLAPIENTRY glDepthMask (GLboolean flag);
+GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar);
+GLAPI void GLAPIENTRY glDisable (GLenum cap);
+GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
+GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices);
+GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag);
+GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag);
+GLAPI void GLAPIENTRY glEnable (GLenum cap);
+GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
+GLAPI void GLAPIENTRY glEnd (void);
+GLAPI void GLAPIENTRY glEndList (void);
+GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u);
+GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u);
+GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v);
+GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v);
+GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2);
+GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
+GLAPI void GLAPIENTRY glEvalPoint1 (GLint i);
+GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j);
+GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer);
+GLAPI void GLAPIENTRY glFinish (void);
+GLAPI void GLAPIENTRY glFlush (void);
+GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glFrontFace (GLenum mode);
+GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range);
+GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures);
+GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
+GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation);
+GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params);
+GLAPI GLenum GLAPIENTRY glGetError (void);
+GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v);
+GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v);
+GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v);
+GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
+GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
+GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
+GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, void* *params);
+GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask);
+GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
+GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
+GLAPI void GLAPIENTRY glIndexMask (GLuint mask);
+GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glIndexd (GLdouble c);
+GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c);
+GLAPI void GLAPIENTRY glIndexf (GLfloat c);
+GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c);
+GLAPI void GLAPIENTRY glIndexi (GLint c);
+GLAPI void GLAPIENTRY glIndexiv (const GLint *c);
+GLAPI void GLAPIENTRY glIndexs (GLshort c);
+GLAPI void GLAPIENTRY glIndexsv (const GLshort *c);
+GLAPI void GLAPIENTRY glIndexub (GLubyte c);
+GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c);
+GLAPI void GLAPIENTRY glInitNames (void);
+GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const void *pointer);
+GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap);
+GLAPI GLboolean GLAPIENTRY glIsList (GLuint list);
+GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture);
+GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern);
+GLAPI void GLAPIENTRY glLineWidth (GLfloat width);
+GLAPI void GLAPIENTRY glListBase (GLuint base);
+GLAPI void GLAPIENTRY glLoadIdentity (void);
+GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glLoadName (GLuint name);
+GLAPI void GLAPIENTRY glLogicOp (GLenum opcode);
+GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2);
+GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2);
+GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
+GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
+GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glMatrixMode (GLenum mode);
+GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode);
+GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
+GLAPI void GLAPIENTRY glNormal3iv (const GLint *v);
+GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
+GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY glPassThrough (GLfloat token);
+GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
+GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values);
+GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values);
+GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor);
+GLAPI void GLAPIENTRY glPointSize (GLfloat size);
+GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask);
+GLAPI void GLAPIENTRY glPopAttrib (void);
+GLAPI void GLAPIENTRY glPopClientAttrib (void);
+GLAPI void GLAPIENTRY glPopMatrix (void);
+GLAPI void GLAPIENTRY glPopName (void);
+GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushMatrix (void);
+GLAPI void GLAPIENTRY glPushName (GLuint name);
+GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glReadBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
+GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
+GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
+GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2);
+GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2);
+GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2);
+GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2);
+GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode);
+GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer);
+GLAPI void GLAPIENTRY glShadeModel (GLenum mode);
+GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GLAPI void GLAPIENTRY glStencilMask (GLuint mask);
+GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s);
+GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s);
+GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord1i (GLint s);
+GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord1s (GLshort s);
+GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t);
+GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param);
+GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glVertex2iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glVertex3iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glVertex4iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1)
+
+#endif /* GL_VERSION_1_1 */
+
+/* ---------------------------------- GLU ---------------------------------- */
+
+#ifndef GLEW_NO_GLU
+#  ifdef __APPLE__
+#    include <Availability.h>
+#    if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#      define GLEW_NO_GLU
+#    endif
+#  endif
+#endif
+
+#ifndef GLEW_NO_GLU
+/* this is where we can safely include GLU */
+#  if defined(__APPLE__) && defined(__MACH__)
+#    include <OpenGL/glu.h>
+#  else
+#    include <GL/glu.h>
+#  endif
+#endif
+
+/* ----------------------------- GL_VERSION_1_2 ---------------------------- */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+
+#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D)
+#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements)
+#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D)
+#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D)
+
+#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2)
+
+#endif /* GL_VERSION_1_2 */
+
+/* ---------------------------- GL_VERSION_1_2_1 --------------------------- */
+
+#ifndef GL_VERSION_1_2_1
+#define GL_VERSION_1_2_1 1
+
+#define GLEW_VERSION_1_2_1 GLEW_GET_VAR(__GLEW_VERSION_1_2_1)
+
+#endif /* GL_VERSION_1_2_1 */
+
+/* ----------------------------- GL_VERSION_1_3 ---------------------------- */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_SUBTRACT 0x84E7
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#define GL_MULTISAMPLE_BIT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, void *img);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+
+#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture)
+#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture)
+#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D)
+#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D)
+#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D)
+#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D)
+#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D)
+#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D)
+#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage)
+#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd)
+#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf)
+#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd)
+#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf)
+#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d)
+#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv)
+#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f)
+#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv)
+#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i)
+#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv)
+#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s)
+#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv)
+#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d)
+#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv)
+#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f)
+#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv)
+#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i)
+#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv)
+#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s)
+#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv)
+#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d)
+#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv)
+#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f)
+#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv)
+#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i)
+#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv)
+#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s)
+#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv)
+#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d)
+#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv)
+#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f)
+#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv)
+#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i)
+#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv)
+#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s)
+#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv)
+#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage)
+
+#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3)
+
+#endif /* GL_VERSION_1_3 */
+
+/* ----------------------------- GL_VERSION_1_4 ---------------------------- */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+
+typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p);
+
+#define glBlendColor GLEW_GET_FUN(__glewBlendColor)
+#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation)
+#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate)
+#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer)
+#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd)
+#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv)
+#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf)
+#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv)
+#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays)
+#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements)
+#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf)
+#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
+#define glPointParameteri GLEW_GET_FUN(__glewPointParameteri)
+#define glPointParameteriv GLEW_GET_FUN(__glewPointParameteriv)
+#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b)
+#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv)
+#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d)
+#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv)
+#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f)
+#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv)
+#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i)
+#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv)
+#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s)
+#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv)
+#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub)
+#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv)
+#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui)
+#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv)
+#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us)
+#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv)
+#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer)
+#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d)
+#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv)
+#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f)
+#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv)
+#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i)
+#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv)
+#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s)
+#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv)
+#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d)
+#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv)
+#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f)
+#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv)
+#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i)
+#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv)
+#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s)
+#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv)
+
+#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4)
+
+#endif /* GL_VERSION_1_4 */
+
+/* ----------------------------- GL_VERSION_1_5 ---------------------------- */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void* data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void** params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void* data);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id);
+typedef void* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target);
+
+#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery)
+#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer)
+#define glBufferData GLEW_GET_FUN(__glewBufferData)
+#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData)
+#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers)
+#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries)
+#define glEndQuery GLEW_GET_FUN(__glewEndQuery)
+#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers)
+#define glGenQueries GLEW_GET_FUN(__glewGenQueries)
+#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv)
+#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv)
+#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData)
+#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv)
+#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv)
+#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv)
+#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer)
+#define glIsQuery GLEW_GET_FUN(__glewIsQuery)
+#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer)
+#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer)
+
+#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5)
+
+#endif /* GL_VERSION_1_5 */
+
+/* ----------------------------- GL_VERSION_2_0 ---------------------------- */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+
+typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders);
+typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
+typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void** pointer);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const* string, const GLint* length);
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer);
+
+#define glAttachShader GLEW_GET_FUN(__glewAttachShader)
+#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
+#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
+#define glCompileShader GLEW_GET_FUN(__glewCompileShader)
+#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram)
+#define glCreateShader GLEW_GET_FUN(__glewCreateShader)
+#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram)
+#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader)
+#define glDetachShader GLEW_GET_FUN(__glewDetachShader)
+#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray)
+#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers)
+#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray)
+#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib)
+#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform)
+#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders)
+#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation)
+#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog)
+#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv)
+#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog)
+#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource)
+#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv)
+#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation)
+#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv)
+#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv)
+#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv)
+#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv)
+#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv)
+#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv)
+#define glIsProgram GLEW_GET_FUN(__glewIsProgram)
+#define glIsShader GLEW_GET_FUN(__glewIsShader)
+#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram)
+#define glShaderSource GLEW_GET_FUN(__glewShaderSource)
+#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate)
+#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate)
+#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate)
+#define glUniform1f GLEW_GET_FUN(__glewUniform1f)
+#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv)
+#define glUniform1i GLEW_GET_FUN(__glewUniform1i)
+#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv)
+#define glUniform2f GLEW_GET_FUN(__glewUniform2f)
+#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv)
+#define glUniform2i GLEW_GET_FUN(__glewUniform2i)
+#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv)
+#define glUniform3f GLEW_GET_FUN(__glewUniform3f)
+#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv)
+#define glUniform3i GLEW_GET_FUN(__glewUniform3i)
+#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv)
+#define glUniform4f GLEW_GET_FUN(__glewUniform4f)
+#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv)
+#define glUniform4i GLEW_GET_FUN(__glewUniform4i)
+#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv)
+#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv)
+#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv)
+#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv)
+#define glUseProgram GLEW_GET_FUN(__glewUseProgram)
+#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram)
+#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d)
+#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv)
+#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f)
+#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv)
+#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s)
+#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv)
+#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d)
+#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv)
+#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f)
+#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv)
+#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s)
+#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv)
+#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d)
+#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv)
+#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f)
+#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv)
+#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s)
+#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv)
+#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv)
+#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv)
+#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv)
+#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub)
+#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv)
+#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv)
+#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv)
+#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv)
+#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d)
+#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv)
+#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f)
+#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv)
+#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv)
+#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s)
+#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv)
+#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv)
+#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
+#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
+#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
+
+#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
+
+#endif /* GL_VERSION_2_0 */
+
+/* ----------------------------- GL_VERSION_2_1 ---------------------------- */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#define GL_FLOAT_MAT2x3 0x8B65
+#define GL_FLOAT_MAT2x4 0x8B66
+#define GL_FLOAT_MAT3x2 0x8B67
+#define GL_FLOAT_MAT3x4 0x8B68
+#define GL_FLOAT_MAT4x2 0x8B69
+#define GL_FLOAT_MAT4x3 0x8B6A
+#define GL_SRGB 0x8C40
+#define GL_SRGB8 0x8C41
+#define GL_SRGB_ALPHA 0x8C42
+#define GL_SRGB8_ALPHA8 0x8C43
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#define GL_SLUMINANCE 0x8C46
+#define GL_SLUMINANCE8 0x8C47
+#define GL_COMPRESSED_SRGB 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+
+#define glUniformMatrix2x3fv GLEW_GET_FUN(__glewUniformMatrix2x3fv)
+#define glUniformMatrix2x4fv GLEW_GET_FUN(__glewUniformMatrix2x4fv)
+#define glUniformMatrix3x2fv GLEW_GET_FUN(__glewUniformMatrix3x2fv)
+#define glUniformMatrix3x4fv GLEW_GET_FUN(__glewUniformMatrix3x4fv)
+#define glUniformMatrix4x2fv GLEW_GET_FUN(__glewUniformMatrix4x2fv)
+#define glUniformMatrix4x3fv GLEW_GET_FUN(__glewUniformMatrix4x3fv)
+
+#define GLEW_VERSION_2_1 GLEW_GET_VAR(__GLEW_VERSION_2_1)
+
+#endif /* GL_VERSION_2_1 */
+
+/* ----------------------------- GL_VERSION_3_0 ---------------------------- */
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+
+#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0
+#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1
+#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2
+#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3
+#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4
+#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5
+#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB
+#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES
+#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_MAJOR_VERSION 0x821B
+#define GL_MINOR_VERSION 0x821C
+#define GL_NUM_EXTENSIONS 0x821D
+#define GL_CONTEXT_FLAGS 0x821E
+#define GL_DEPTH_BUFFER 0x8223
+#define GL_STENCIL_BUFFER 0x8224
+#define GL_RGBA32F 0x8814
+#define GL_RGB32F 0x8815
+#define GL_RGBA16F 0x881A
+#define GL_RGB16F 0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
+#define GL_CLAMP_VERTEX_COLOR 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR 0x891B
+#define GL_CLAMP_READ_COLOR 0x891C
+#define GL_FIXED_ONLY 0x891D
+#define GL_TEXTURE_RED_TYPE 0x8C10
+#define GL_TEXTURE_GREEN_TYPE 0x8C11
+#define GL_TEXTURE_BLUE_TYPE 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE 0x8C16
+#define GL_TEXTURE_1D_ARRAY 0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
+#define GL_TEXTURE_2D_ARRAY 0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
+#define GL_R11F_G11F_B10F 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
+#define GL_RGB9_E5 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
+#define GL_TEXTURE_SHARED_SIZE 0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS 0x8C8C
+#define GL_SEPARATE_ATTRIBS 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI 0x8D70
+#define GL_RGB32UI 0x8D71
+#define GL_RGBA16UI 0x8D76
+#define GL_RGB16UI 0x8D77
+#define GL_RGBA8UI 0x8D7C
+#define GL_RGB8UI 0x8D7D
+#define GL_RGBA32I 0x8D82
+#define GL_RGB32I 0x8D83
+#define GL_RGBA16I 0x8D88
+#define GL_RGB16I 0x8D89
+#define GL_RGBA8I 0x8D8E
+#define GL_RGB8I 0x8D8F
+#define GL_RED_INTEGER 0x8D94
+#define GL_GREEN_INTEGER 0x8D95
+#define GL_BLUE_INTEGER 0x8D96
+#define GL_ALPHA_INTEGER 0x8D97
+#define GL_RGB_INTEGER 0x8D98
+#define GL_RGBA_INTEGER 0x8D99
+#define GL_BGR_INTEGER 0x8D9A
+#define GL_BGRA_INTEGER 0x8D9B
+#define GL_SAMPLER_1D_ARRAY 0x8DC0
+#define GL_SAMPLER_2D_ARRAY 0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
+#define GL_UNSIGNED_INT_VEC2 0x8DC6
+#define GL_UNSIGNED_INT_VEC3 0x8DC7
+#define GL_UNSIGNED_INT_VEC4 0x8DC8
+#define GL_INT_SAMPLER_1D 0x8DC9
+#define GL_INT_SAMPLER_2D 0x8DCA
+#define GL_INT_SAMPLER_3D 0x8DCB
+#define GL_INT_SAMPLER_CUBE 0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
+#define GL_QUERY_WAIT 0x8E13
+#define GL_QUERY_NO_WAIT 0x8E14
+#define GL_QUERY_BY_REGION_WAIT 0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
+
+typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint colorNumber, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawBuffer, GLfloat depth, GLint stencil);
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawBuffer, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawBuffer, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawBuffer, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLCOLORMASKIPROC) (GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+typedef void (GLAPIENTRY * PFNGLDISABLEIPROC) (GLenum cap, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEIPROC) (GLenum cap, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGETBOOLEANI_VPROC) (GLenum pname, GLuint index, GLboolean* data);
+typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar* name);
+typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDIPROC) (GLenum cap, GLuint index);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const* varyings, GLenum bufferMode);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint v0, GLuint v1);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort* v0);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void*pointer);
+
+#define glBeginConditionalRender GLEW_GET_FUN(__glewBeginConditionalRender)
+#define glBeginTransformFeedback GLEW_GET_FUN(__glewBeginTransformFeedback)
+#define glBindFragDataLocation GLEW_GET_FUN(__glewBindFragDataLocation)
+#define glClampColor GLEW_GET_FUN(__glewClampColor)
+#define glClearBufferfi GLEW_GET_FUN(__glewClearBufferfi)
+#define glClearBufferfv GLEW_GET_FUN(__glewClearBufferfv)
+#define glClearBufferiv GLEW_GET_FUN(__glewClearBufferiv)
+#define glClearBufferuiv GLEW_GET_FUN(__glewClearBufferuiv)
+#define glColorMaski GLEW_GET_FUN(__glewColorMaski)
+#define glDisablei GLEW_GET_FUN(__glewDisablei)
+#define glEnablei GLEW_GET_FUN(__glewEnablei)
+#define glEndConditionalRender GLEW_GET_FUN(__glewEndConditionalRender)
+#define glEndTransformFeedback GLEW_GET_FUN(__glewEndTransformFeedback)
+#define glGetBooleani_v GLEW_GET_FUN(__glewGetBooleani_v)
+#define glGetFragDataLocation GLEW_GET_FUN(__glewGetFragDataLocation)
+#define glGetStringi GLEW_GET_FUN(__glewGetStringi)
+#define glGetTexParameterIiv GLEW_GET_FUN(__glewGetTexParameterIiv)
+#define glGetTexParameterIuiv GLEW_GET_FUN(__glewGetTexParameterIuiv)
+#define glGetTransformFeedbackVarying GLEW_GET_FUN(__glewGetTransformFeedbackVarying)
+#define glGetUniformuiv GLEW_GET_FUN(__glewGetUniformuiv)
+#define glGetVertexAttribIiv GLEW_GET_FUN(__glewGetVertexAttribIiv)
+#define glGetVertexAttribIuiv GLEW_GET_FUN(__glewGetVertexAttribIuiv)
+#define glIsEnabledi GLEW_GET_FUN(__glewIsEnabledi)
+#define glTexParameterIiv GLEW_GET_FUN(__glewTexParameterIiv)
+#define glTexParameterIuiv GLEW_GET_FUN(__glewTexParameterIuiv)
+#define glTransformFeedbackVaryings GLEW_GET_FUN(__glewTransformFeedbackVaryings)
+#define glUniform1ui GLEW_GET_FUN(__glewUniform1ui)
+#define glUniform1uiv GLEW_GET_FUN(__glewUniform1uiv)
+#define glUniform2ui GLEW_GET_FUN(__glewUniform2ui)
+#define glUniform2uiv GLEW_GET_FUN(__glewUniform2uiv)
+#define glUniform3ui GLEW_GET_FUN(__glewUniform3ui)
+#define glUniform3uiv GLEW_GET_FUN(__glewUniform3uiv)
+#define glUniform4ui GLEW_GET_FUN(__glewUniform4ui)
+#define glUniform4uiv GLEW_GET_FUN(__glewUniform4uiv)
+#define glVertexAttribI1i GLEW_GET_FUN(__glewVertexAttribI1i)
+#define glVertexAttribI1iv GLEW_GET_FUN(__glewVertexAttribI1iv)
+#define glVertexAttribI1ui GLEW_GET_FUN(__glewVertexAttribI1ui)
+#define glVertexAttribI1uiv GLEW_GET_FUN(__glewVertexAttribI1uiv)
+#define glVertexAttribI2i GLEW_GET_FUN(__glewVertexAttribI2i)
+#define glVertexAttribI2iv GLEW_GET_FUN(__glewVertexAttribI2iv)
+#define glVertexAttribI2ui GLEW_GET_FUN(__glewVertexAttribI2ui)
+#define glVertexAttribI2uiv GLEW_GET_FUN(__glewVertexAttribI2uiv)
+#define glVertexAttribI3i GLEW_GET_FUN(__glewVertexAttribI3i)
+#define glVertexAttribI3iv GLEW_GET_FUN(__glewVertexAttribI3iv)
+#define glVertexAttribI3ui GLEW_GET_FUN(__glewVertexAttribI3ui)
+#define glVertexAttribI3uiv GLEW_GET_FUN(__glewVertexAttribI3uiv)
+#define glVertexAttribI4bv GLEW_GET_FUN(__glewVertexAttribI4bv)
+#define glVertexAttribI4i GLEW_GET_FUN(__glewVertexAttribI4i)
+#define glVertexAttribI4iv GLEW_GET_FUN(__glewVertexAttribI4iv)
+#define glVertexAttribI4sv GLEW_GET_FUN(__glewVertexAttribI4sv)
+#define glVertexAttribI4ubv GLEW_GET_FUN(__glewVertexAttribI4ubv)
+#define glVertexAttribI4ui GLEW_GET_FUN(__glewVertexAttribI4ui)
+#define glVertexAttribI4uiv GLEW_GET_FUN(__glewVertexAttribI4uiv)
+#define glVertexAttribI4usv GLEW_GET_FUN(__glewVertexAttribI4usv)
+#define glVertexAttribIPointer GLEW_GET_FUN(__glewVertexAttribIPointer)
+
+#define GLEW_VERSION_3_0 GLEW_GET_VAR(__GLEW_VERSION_3_0)
+
+#endif /* GL_VERSION_3_0 */
+
+/* ----------------------------- GL_VERSION_3_1 ---------------------------- */
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+
+#define GL_TEXTURE_RECTANGLE 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8
+#define GL_SAMPLER_2D_RECT 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64
+#define GL_TEXTURE_BUFFER 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER 0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E
+#define GL_SAMPLER_BUFFER 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT 0x8DCD
+#define GL_INT_SAMPLER_BUFFER 0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8
+#define GL_RED_SNORM 0x8F90
+#define GL_RG_SNORM 0x8F91
+#define GL_RGB_SNORM 0x8F92
+#define GL_RGBA_SNORM 0x8F93
+#define GL_R8_SNORM 0x8F94
+#define GL_RG8_SNORM 0x8F95
+#define GL_RGB8_SNORM 0x8F96
+#define GL_RGBA8_SNORM 0x8F97
+#define GL_R16_SNORM 0x8F98
+#define GL_RG16_SNORM 0x8F99
+#define GL_RGB16_SNORM 0x8F9A
+#define GL_RGBA16_SNORM 0x8F9B
+#define GL_SIGNED_NORMALIZED 0x8F9C
+#define GL_PRIMITIVE_RESTART 0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E
+#define GL_BUFFER_ACCESS_FLAGS 0x911F
+#define GL_BUFFER_MAP_LENGTH 0x9120
+#define GL_BUFFER_MAP_OFFSET 0x9121
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalFormat, GLuint buffer);
+
+#define glDrawArraysInstanced GLEW_GET_FUN(__glewDrawArraysInstanced)
+#define glDrawElementsInstanced GLEW_GET_FUN(__glewDrawElementsInstanced)
+#define glPrimitiveRestartIndex GLEW_GET_FUN(__glewPrimitiveRestartIndex)
+#define glTexBuffer GLEW_GET_FUN(__glewTexBuffer)
+
+#define GLEW_VERSION_3_1 GLEW_GET_VAR(__GLEW_VERSION_3_1)
+
+#endif /* GL_VERSION_3_1 */
+
+/* ----------------------------- GL_VERSION_3_2 ---------------------------- */
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+
+#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY 0x000A
+#define GL_LINE_STRIP_ADJACENCY 0x000B
+#define GL_TRIANGLES_ADJACENCY 0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D
+#define GL_PROGRAM_POINT_SIZE 0x8642
+#define GL_GEOMETRY_VERTICES_OUT 0x8916
+#define GL_GEOMETRY_INPUT_TYPE 0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE 0x8918
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER 0x8DD9
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125
+#define GL_CONTEXT_PROFILE_MASK 0x9126
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum value, GLint64 * data);
+typedef void (GLAPIENTRY * PFNGLGETINTEGER64I_VPROC) (GLenum pname, GLuint index, GLint64 * data);
+
+#define glFramebufferTexture GLEW_GET_FUN(__glewFramebufferTexture)
+#define glGetBufferParameteri64v GLEW_GET_FUN(__glewGetBufferParameteri64v)
+#define glGetInteger64i_v GLEW_GET_FUN(__glewGetInteger64i_v)
+
+#define GLEW_VERSION_3_2 GLEW_GET_VAR(__GLEW_VERSION_3_2)
+
+#endif /* GL_VERSION_3_2 */
+
+/* ----------------------------- GL_VERSION_3_3 ---------------------------- */
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE
+#define GL_RGB10_A2UI 0x906F
+
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+
+#define glVertexAttribDivisor GLEW_GET_FUN(__glewVertexAttribDivisor)
+
+#define GLEW_VERSION_3_3 GLEW_GET_VAR(__GLEW_VERSION_3_3)
+
+#endif /* GL_VERSION_3_3 */
+
+/* ----------------------------- GL_VERSION_4_0 ---------------------------- */
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+
+#define GL_SAMPLE_SHADING 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F
+#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
+
+#define glBlendEquationSeparatei GLEW_GET_FUN(__glewBlendEquationSeparatei)
+#define glBlendEquationi GLEW_GET_FUN(__glewBlendEquationi)
+#define glBlendFuncSeparatei GLEW_GET_FUN(__glewBlendFuncSeparatei)
+#define glBlendFunci GLEW_GET_FUN(__glewBlendFunci)
+#define glMinSampleShading GLEW_GET_FUN(__glewMinSampleShading)
+
+#define GLEW_VERSION_4_0 GLEW_GET_VAR(__GLEW_VERSION_4_0)
+
+#endif /* GL_VERSION_4_0 */
+
+/* ----------------------------- GL_VERSION_4_1 ---------------------------- */
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+
+#define GLEW_VERSION_4_1 GLEW_GET_VAR(__GLEW_VERSION_4_1)
+
+#endif /* GL_VERSION_4_1 */
+
+/* ----------------------------- GL_VERSION_4_2 ---------------------------- */
+
+#ifndef GL_VERSION_4_2
+#define GL_VERSION_4_2 1
+
+#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24
+#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GL_COPY_READ_BUFFER_BINDING 0x8F36
+#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37
+
+#define GLEW_VERSION_4_2 GLEW_GET_VAR(__GLEW_VERSION_4_2)
+
+#endif /* GL_VERSION_4_2 */
+
+/* ----------------------------- GL_VERSION_4_3 ---------------------------- */
+
+#ifndef GL_VERSION_4_3
+#define GL_VERSION_4_3 1
+
+#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9
+#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E
+
+#define GLEW_VERSION_4_3 GLEW_GET_VAR(__GLEW_VERSION_4_3)
+
+#endif /* GL_VERSION_4_3 */
+
+/* ----------------------------- GL_VERSION_4_4 ---------------------------- */
+
+#ifndef GL_VERSION_4_4
+#define GL_VERSION_4_4 1
+
+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221
+#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5
+#define GL_TEXTURE_BUFFER_BINDING 0x8C2A
+
+#define GLEW_VERSION_4_4 GLEW_GET_VAR(__GLEW_VERSION_4_4)
+
+#endif /* GL_VERSION_4_4 */
+
+/* ----------------------------- GL_VERSION_4_5 ---------------------------- */
+
+#ifndef GL_VERSION_4_5
+#define GL_VERSION_4_5 1
+
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004
+
+typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *pixels);
+typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEPROC) (GLenum tex, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+
+#define glGetGraphicsResetStatus GLEW_GET_FUN(__glewGetGraphicsResetStatus)
+#define glGetnCompressedTexImage GLEW_GET_FUN(__glewGetnCompressedTexImage)
+#define glGetnTexImage GLEW_GET_FUN(__glewGetnTexImage)
+#define glGetnUniformdv GLEW_GET_FUN(__glewGetnUniformdv)
+
+#define GLEW_VERSION_4_5 GLEW_GET_VAR(__GLEW_VERSION_4_5)
+
+#endif /* GL_VERSION_4_5 */
+
+/* ----------------------------- GL_VERSION_4_6 ---------------------------- */
+
+#ifndef GL_VERSION_4_6
+#define GL_VERSION_4_6 1
+
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT 0x00000008
+#define GL_PARAMETER_BUFFER 0x80EE
+#define GL_PARAMETER_BUFFER_BINDING 0x80EF
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW 0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED
+#define GL_VERTICES_SUBMITTED 0x82EE
+#define GL_PRIMITIVES_SUBMITTED 0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS 0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES 0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS 0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS 0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES 0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES 0x82F7
+#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF
+#define GL_POLYGON_OFFSET_CLAMP 0x8E1B
+#define GL_SHADER_BINARY_FORMAT_SPIR_V 0x9551
+#define GL_SPIR_V_BINARY 0x9552
+#define GL_SPIR_V_EXTENSIONS 0x9553
+#define GL_NUM_SPIR_V_EXTENSIONS 0x9554
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC) (GLenum mode, const GLvoid *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC) (GLenum mode, GLenum type, const GLvoid *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLSPECIALIZESHADERPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+
+#define glMultiDrawArraysIndirectCount GLEW_GET_FUN(__glewMultiDrawArraysIndirectCount)
+#define glMultiDrawElementsIndirectCount GLEW_GET_FUN(__glewMultiDrawElementsIndirectCount)
+#define glSpecializeShader GLEW_GET_FUN(__glewSpecializeShader)
+
+#define GLEW_VERSION_4_6 GLEW_GET_VAR(__GLEW_VERSION_4_6)
+
+#endif /* GL_VERSION_4_6 */
+
+/* -------------------------- GL_3DFX_multisample -------------------------- */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+
+#define GL_MULTISAMPLE_3DFX 0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX 0x86B3
+#define GL_SAMPLES_3DFX 0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX 0x20000000
+
+#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample)
+
+#endif /* GL_3DFX_multisample */
+
+/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+
+typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+
+#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX)
+
+#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer)
+
+#endif /* GL_3DFX_tbuffer */
+
+/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+
+#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1
+
+#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1)
+
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+/* ----------------------- GL_AMD_blend_minmax_factor ---------------------- */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+
+#define GL_FACTOR_MIN_AMD 0x901C
+#define GL_FACTOR_MAX_AMD 0x901D
+
+#define GLEW_AMD_blend_minmax_factor GLEW_GET_VAR(__GLEW_AMD_blend_minmax_factor)
+
+#endif /* GL_AMD_blend_minmax_factor */
+
+/* --------------------- GL_AMD_compressed_3DC_texture --------------------- */
+
+#ifndef GL_AMD_compressed_3DC_texture
+#define GL_AMD_compressed_3DC_texture 1
+
+#define GL_3DC_X_AMD 0x87F9
+#define GL_3DC_XY_AMD 0x87FA
+
+#define GLEW_AMD_compressed_3DC_texture GLEW_GET_VAR(__GLEW_AMD_compressed_3DC_texture)
+
+#endif /* GL_AMD_compressed_3DC_texture */
+
+/* --------------------- GL_AMD_compressed_ATC_texture --------------------- */
+
+#ifndef GL_AMD_compressed_ATC_texture
+#define GL_AMD_compressed_ATC_texture 1
+
+#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
+#define GL_ATC_RGB_AMD 0x8C92
+#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93
+
+#define GLEW_AMD_compressed_ATC_texture GLEW_GET_VAR(__GLEW_AMD_compressed_ATC_texture)
+
+#endif /* GL_AMD_compressed_ATC_texture */
+
+/* ----------------------- GL_AMD_conservative_depth ----------------------- */
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+
+#define GLEW_AMD_conservative_depth GLEW_GET_VAR(__GLEW_AMD_conservative_depth)
+
+#endif /* GL_AMD_conservative_depth */
+
+/* -------------------------- GL_AMD_debug_output -------------------------- */
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150
+
+typedef void (GLAPIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, void* userParam);
+
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf);
+typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message);
+
+#define glDebugMessageCallbackAMD GLEW_GET_FUN(__glewDebugMessageCallbackAMD)
+#define glDebugMessageEnableAMD GLEW_GET_FUN(__glewDebugMessageEnableAMD)
+#define glDebugMessageInsertAMD GLEW_GET_FUN(__glewDebugMessageInsertAMD)
+#define glGetDebugMessageLogAMD GLEW_GET_FUN(__glewGetDebugMessageLogAMD)
+
+#define GLEW_AMD_debug_output GLEW_GET_VAR(__GLEW_AMD_debug_output)
+
+#endif /* GL_AMD_debug_output */
+
+/* ---------------------- GL_AMD_depth_clamp_separate ---------------------- */
+
+#ifndef GL_AMD_depth_clamp_separate
+#define GL_AMD_depth_clamp_separate 1
+
+#define GL_DEPTH_CLAMP_NEAR_AMD 0x901E
+#define GL_DEPTH_CLAMP_FAR_AMD 0x901F
+
+#define GLEW_AMD_depth_clamp_separate GLEW_GET_VAR(__GLEW_AMD_depth_clamp_separate)
+
+#endif /* GL_AMD_depth_clamp_separate */
+
+/* ----------------------- GL_AMD_draw_buffers_blend ----------------------- */
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+
+#define glBlendEquationIndexedAMD GLEW_GET_FUN(__glewBlendEquationIndexedAMD)
+#define glBlendEquationSeparateIndexedAMD GLEW_GET_FUN(__glewBlendEquationSeparateIndexedAMD)
+#define glBlendFuncIndexedAMD GLEW_GET_FUN(__glewBlendFuncIndexedAMD)
+#define glBlendFuncSeparateIndexedAMD GLEW_GET_FUN(__glewBlendFuncSeparateIndexedAMD)
+
+#define GLEW_AMD_draw_buffers_blend GLEW_GET_VAR(__GLEW_AMD_draw_buffers_blend)
+
+#endif /* GL_AMD_draw_buffers_blend */
+
+/* ------------------ GL_AMD_framebuffer_sample_positions ------------------ */
+
+#ifndef GL_AMD_framebuffer_sample_positions
+#define GL_AMD_framebuffer_sample_positions 1
+
+#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F
+#define GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD 0x91AE
+#define GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD 0x91AF
+#define GL_ALL_PIXELS_AMD 0xFFFFFFFF
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat* values);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC) (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat* values);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC) (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat* values);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat* values);
+
+#define glFramebufferSamplePositionsfvAMD GLEW_GET_FUN(__glewFramebufferSamplePositionsfvAMD)
+#define glGetFramebufferParameterfvAMD GLEW_GET_FUN(__glewGetFramebufferParameterfvAMD)
+#define glGetNamedFramebufferParameterfvAMD GLEW_GET_FUN(__glewGetNamedFramebufferParameterfvAMD)
+#define glNamedFramebufferSamplePositionsfvAMD GLEW_GET_FUN(__glewNamedFramebufferSamplePositionsfvAMD)
+
+#define GLEW_AMD_framebuffer_sample_positions GLEW_GET_VAR(__GLEW_AMD_framebuffer_sample_positions)
+
+#endif /* GL_AMD_framebuffer_sample_positions */
+
+/* --------------------------- GL_AMD_gcn_shader --------------------------- */
+
+#ifndef GL_AMD_gcn_shader
+#define GL_AMD_gcn_shader 1
+
+#define GLEW_AMD_gcn_shader GLEW_GET_VAR(__GLEW_AMD_gcn_shader)
+
+#endif /* GL_AMD_gcn_shader */
+
+/* ---------------------- GL_AMD_gpu_shader_half_float --------------------- */
+
+#ifndef GL_AMD_gpu_shader_half_float
+#define GL_AMD_gpu_shader_half_float 1
+
+#define GL_FLOAT16_NV 0x8FF8
+#define GL_FLOAT16_VEC2_NV 0x8FF9
+#define GL_FLOAT16_VEC3_NV 0x8FFA
+#define GL_FLOAT16_VEC4_NV 0x8FFB
+#define GL_FLOAT16_MAT2_AMD 0x91C5
+#define GL_FLOAT16_MAT3_AMD 0x91C6
+#define GL_FLOAT16_MAT4_AMD 0x91C7
+#define GL_FLOAT16_MAT2x3_AMD 0x91C8
+#define GL_FLOAT16_MAT2x4_AMD 0x91C9
+#define GL_FLOAT16_MAT3x2_AMD 0x91CA
+#define GL_FLOAT16_MAT3x4_AMD 0x91CB
+#define GL_FLOAT16_MAT4x2_AMD 0x91CC
+#define GL_FLOAT16_MAT4x3_AMD 0x91CD
+
+#define GLEW_AMD_gpu_shader_half_float GLEW_GET_VAR(__GLEW_AMD_gpu_shader_half_float)
+
+#endif /* GL_AMD_gpu_shader_half_float */
+
+/* ------------------------ GL_AMD_gpu_shader_int16 ------------------------ */
+
+#ifndef GL_AMD_gpu_shader_int16
+#define GL_AMD_gpu_shader_int16 1
+
+#define GLEW_AMD_gpu_shader_int16 GLEW_GET_VAR(__GLEW_AMD_gpu_shader_int16)
+
+#endif /* GL_AMD_gpu_shader_int16 */
+
+/* ------------------------ GL_AMD_gpu_shader_int64 ------------------------ */
+
+#ifndef GL_AMD_gpu_shader_int64
+#define GL_AMD_gpu_shader_int64 1
+
+#define GLEW_AMD_gpu_shader_int64 GLEW_GET_VAR(__GLEW_AMD_gpu_shader_int64)
+
+#endif /* GL_AMD_gpu_shader_int64 */
+
+/* ---------------------- GL_AMD_interleaved_elements ---------------------- */
+
+#ifndef GL_AMD_interleaved_elements
+#define GL_AMD_interleaved_elements 1
+
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_RG8UI 0x8238
+#define GL_RG16UI 0x823A
+#define GL_RGBA8UI 0x8D7C
+#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4
+#define GL_VERTEX_ID_SWIZZLE_AMD 0x91A5
+
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param);
+
+#define glVertexAttribParameteriAMD GLEW_GET_FUN(__glewVertexAttribParameteriAMD)
+
+#define GLEW_AMD_interleaved_elements GLEW_GET_VAR(__GLEW_AMD_interleaved_elements)
+
+#endif /* GL_AMD_interleaved_elements */
+
+/* ----------------------- GL_AMD_multi_draw_indirect ---------------------- */
+
+#ifndef GL_AMD_multi_draw_indirect
+#define GL_AMD_multi_draw_indirect 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+
+#define glMultiDrawArraysIndirectAMD GLEW_GET_FUN(__glewMultiDrawArraysIndirectAMD)
+#define glMultiDrawElementsIndirectAMD GLEW_GET_FUN(__glewMultiDrawElementsIndirectAMD)
+
+#define GLEW_AMD_multi_draw_indirect GLEW_GET_VAR(__GLEW_AMD_multi_draw_indirect)
+
+#endif /* GL_AMD_multi_draw_indirect */
+
+/* ------------------------- GL_AMD_name_gen_delete ------------------------ */
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+
+#define GL_DATA_BUFFER_AMD 0x9151
+#define GL_PERFORMANCE_MONITOR_AMD 0x9152
+#define GL_QUERY_OBJECT_AMD 0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154
+#define GL_SAMPLER_OBJECT_AMD 0x9155
+
+typedef void (GLAPIENTRY * PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint* names);
+typedef void (GLAPIENTRY * PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint* names);
+typedef GLboolean (GLAPIENTRY * PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+
+#define glDeleteNamesAMD GLEW_GET_FUN(__glewDeleteNamesAMD)
+#define glGenNamesAMD GLEW_GET_FUN(__glewGenNamesAMD)
+#define glIsNameAMD GLEW_GET_FUN(__glewIsNameAMD)
+
+#define GLEW_AMD_name_gen_delete GLEW_GET_VAR(__GLEW_AMD_name_gen_delete)
+
+#endif /* GL_AMD_name_gen_delete */
+
+/* ---------------------- GL_AMD_occlusion_query_event --------------------- */
+
+#ifndef GL_AMD_occlusion_query_event
+#define GL_AMD_occlusion_query_event 1
+
+#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001
+#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002
+#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004
+#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008
+#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F
+#define GL_QUERY_ALL_EVENT_BITS_AMD 0xFFFFFFFF
+
+typedef void (GLAPIENTRY * PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param);
+
+#define glQueryObjectParameteruiAMD GLEW_GET_FUN(__glewQueryObjectParameteruiAMD)
+
+#define GLEW_AMD_occlusion_query_event GLEW_GET_VAR(__GLEW_AMD_occlusion_query_event)
+
+#endif /* GL_AMD_occlusion_query_event */
+
+/* ----------------------- GL_AMD_performance_monitor ---------------------- */
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+
+#define GL_COUNTER_TYPE_AMD 0x8BC0
+#define GL_COUNTER_RANGE_AMD 0x8BC1
+#define GL_UNSIGNED_INT64_AMD 0x8BC2
+#define GL_PERCENTAGE_AMD 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5
+#define GL_PERFMON_RESULT_AMD 0x8BC6
+
+typedef void (GLAPIENTRY * PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GLAPIENTRY * PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors);
+typedef void (GLAPIENTRY * PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GLAPIENTRY * PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint *bytesWritten);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar *counterString);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint* numCounters, GLint *maxActiveCounters, GLsizei countersSize, GLuint *counters);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei* length, GLchar *groupString);
+typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint* numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (GLAPIENTRY * PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* counterList);
+
+#define glBeginPerfMonitorAMD GLEW_GET_FUN(__glewBeginPerfMonitorAMD)
+#define glDeletePerfMonitorsAMD GLEW_GET_FUN(__glewDeletePerfMonitorsAMD)
+#define glEndPerfMonitorAMD GLEW_GET_FUN(__glewEndPerfMonitorAMD)
+#define glGenPerfMonitorsAMD GLEW_GET_FUN(__glewGenPerfMonitorsAMD)
+#define glGetPerfMonitorCounterDataAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterDataAMD)
+#define glGetPerfMonitorCounterInfoAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterInfoAMD)
+#define glGetPerfMonitorCounterStringAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterStringAMD)
+#define glGetPerfMonitorCountersAMD GLEW_GET_FUN(__glewGetPerfMonitorCountersAMD)
+#define glGetPerfMonitorGroupStringAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupStringAMD)
+#define glGetPerfMonitorGroupsAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupsAMD)
+#define glSelectPerfMonitorCountersAMD GLEW_GET_FUN(__glewSelectPerfMonitorCountersAMD)
+
+#define GLEW_AMD_performance_monitor GLEW_GET_VAR(__GLEW_AMD_performance_monitor)
+
+#endif /* GL_AMD_performance_monitor */
+
+/* -------------------------- GL_AMD_pinned_memory ------------------------- */
+
+#ifndef GL_AMD_pinned_memory
+#define GL_AMD_pinned_memory 1
+
+#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
+
+#define GLEW_AMD_pinned_memory GLEW_GET_VAR(__GLEW_AMD_pinned_memory)
+
+#endif /* GL_AMD_pinned_memory */
+
+/* ----------------------- GL_AMD_program_binary_Z400 ---------------------- */
+
+#ifndef GL_AMD_program_binary_Z400
+#define GL_AMD_program_binary_Z400 1
+
+#define GL_Z400_BINARY_AMD 0x8740
+
+#define GLEW_AMD_program_binary_Z400 GLEW_GET_VAR(__GLEW_AMD_program_binary_Z400)
+
+#endif /* GL_AMD_program_binary_Z400 */
+
+/* ----------------------- GL_AMD_query_buffer_object ---------------------- */
+
+#ifndef GL_AMD_query_buffer_object
+#define GL_AMD_query_buffer_object 1
+
+#define GL_QUERY_BUFFER_AMD 0x9192
+#define GL_QUERY_BUFFER_BINDING_AMD 0x9193
+#define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194
+
+#define GLEW_AMD_query_buffer_object GLEW_GET_VAR(__GLEW_AMD_query_buffer_object)
+
+#endif /* GL_AMD_query_buffer_object */
+
+/* ------------------------ GL_AMD_sample_positions ------------------------ */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+
+#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F
+
+typedef void (GLAPIENTRY * PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat* val);
+
+#define glSetMultisamplefvAMD GLEW_GET_FUN(__glewSetMultisamplefvAMD)
+
+#define GLEW_AMD_sample_positions GLEW_GET_VAR(__GLEW_AMD_sample_positions)
+
+#endif /* GL_AMD_sample_positions */
+
+/* ------------------ GL_AMD_seamless_cubemap_per_texture ------------------ */
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
+
+#define GLEW_AMD_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_AMD_seamless_cubemap_per_texture)
+
+#endif /* GL_AMD_seamless_cubemap_per_texture */
+
+/* -------------------- GL_AMD_shader_atomic_counter_ops ------------------- */
+
+#ifndef GL_AMD_shader_atomic_counter_ops
+#define GL_AMD_shader_atomic_counter_ops 1
+
+#define GLEW_AMD_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_AMD_shader_atomic_counter_ops)
+
+#endif /* GL_AMD_shader_atomic_counter_ops */
+
+/* -------------------------- GL_AMD_shader_ballot ------------------------- */
+
+#ifndef GL_AMD_shader_ballot
+#define GL_AMD_shader_ballot 1
+
+#define GLEW_AMD_shader_ballot GLEW_GET_VAR(__GLEW_AMD_shader_ballot)
+
+#endif /* GL_AMD_shader_ballot */
+
+/* ---------------- GL_AMD_shader_explicit_vertex_parameter ---------------- */
+
+#ifndef GL_AMD_shader_explicit_vertex_parameter
+#define GL_AMD_shader_explicit_vertex_parameter 1
+
+#define GLEW_AMD_shader_explicit_vertex_parameter GLEW_GET_VAR(__GLEW_AMD_shader_explicit_vertex_parameter)
+
+#endif /* GL_AMD_shader_explicit_vertex_parameter */
+
+/* ---------------------- GL_AMD_shader_stencil_export --------------------- */
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+
+#define GLEW_AMD_shader_stencil_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_export)
+
+#endif /* GL_AMD_shader_stencil_export */
+
+/* ------------------- GL_AMD_shader_stencil_value_export ------------------ */
+
+#ifndef GL_AMD_shader_stencil_value_export
+#define GL_AMD_shader_stencil_value_export 1
+
+#define GLEW_AMD_shader_stencil_value_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_value_export)
+
+#endif /* GL_AMD_shader_stencil_value_export */
+
+/* ---------------------- GL_AMD_shader_trinary_minmax --------------------- */
+
+#ifndef GL_AMD_shader_trinary_minmax
+#define GL_AMD_shader_trinary_minmax 1
+
+#define GLEW_AMD_shader_trinary_minmax GLEW_GET_VAR(__GLEW_AMD_shader_trinary_minmax)
+
+#endif /* GL_AMD_shader_trinary_minmax */
+
+/* ------------------------- GL_AMD_sparse_texture ------------------------- */
+
+#ifndef GL_AMD_sparse_texture
+#define GL_AMD_sparse_texture 1
+
+#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001
+#define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A
+#define GL_MIN_SPARSE_LEVEL_AMD 0x919B
+#define GL_MIN_LOD_WARNING_AMD 0x919C
+
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+
+#define glTexStorageSparseAMD GLEW_GET_FUN(__glewTexStorageSparseAMD)
+#define glTextureStorageSparseAMD GLEW_GET_FUN(__glewTextureStorageSparseAMD)
+
+#define GLEW_AMD_sparse_texture GLEW_GET_VAR(__GLEW_AMD_sparse_texture)
+
+#endif /* GL_AMD_sparse_texture */
+
+/* ------------------- GL_AMD_stencil_operation_extended ------------------- */
+
+#ifndef GL_AMD_stencil_operation_extended
+#define GL_AMD_stencil_operation_extended 1
+
+#define GL_SET_AMD 0x874A
+#define GL_REPLACE_VALUE_AMD 0x874B
+#define GL_STENCIL_OP_VALUE_AMD 0x874C
+#define GL_STENCIL_BACK_OP_VALUE_AMD 0x874D
+
+typedef void (GLAPIENTRY * PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
+
+#define glStencilOpValueAMD GLEW_GET_FUN(__glewStencilOpValueAMD)
+
+#define GLEW_AMD_stencil_operation_extended GLEW_GET_VAR(__GLEW_AMD_stencil_operation_extended)
+
+#endif /* GL_AMD_stencil_operation_extended */
+
+/* --------------------- GL_AMD_texture_gather_bias_lod -------------------- */
+
+#ifndef GL_AMD_texture_gather_bias_lod
+#define GL_AMD_texture_gather_bias_lod 1
+
+#define GLEW_AMD_texture_gather_bias_lod GLEW_GET_VAR(__GLEW_AMD_texture_gather_bias_lod)
+
+#endif /* GL_AMD_texture_gather_bias_lod */
+
+/* ------------------------ GL_AMD_texture_texture4 ------------------------ */
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+
+#define GLEW_AMD_texture_texture4 GLEW_GET_VAR(__GLEW_AMD_texture_texture4)
+
+#endif /* GL_AMD_texture_texture4 */
+
+/* --------------- GL_AMD_transform_feedback3_lines_triangles -------------- */
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+
+#define GLEW_AMD_transform_feedback3_lines_triangles GLEW_GET_VAR(__GLEW_AMD_transform_feedback3_lines_triangles)
+
+#endif /* GL_AMD_transform_feedback3_lines_triangles */
+
+/* ----------------------- GL_AMD_transform_feedback4 ---------------------- */
+
+#ifndef GL_AMD_transform_feedback4
+#define GL_AMD_transform_feedback4 1
+
+#define GL_STREAM_RASTERIZATION_AMD 0x91A0
+
+#define GLEW_AMD_transform_feedback4 GLEW_GET_VAR(__GLEW_AMD_transform_feedback4)
+
+#endif /* GL_AMD_transform_feedback4 */
+
+/* ----------------------- GL_AMD_vertex_shader_layer ---------------------- */
+
+#ifndef GL_AMD_vertex_shader_layer
+#define GL_AMD_vertex_shader_layer 1
+
+#define GLEW_AMD_vertex_shader_layer GLEW_GET_VAR(__GLEW_AMD_vertex_shader_layer)
+
+#endif /* GL_AMD_vertex_shader_layer */
+
+/* -------------------- GL_AMD_vertex_shader_tessellator ------------------- */
+
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+
+#define GL_SAMPLER_BUFFER_AMD 0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD 0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD 0x9004
+#define GL_TESSELLATION_FACTOR_AMD 0x9005
+#define GL_DISCRETE_AMD 0x9006
+#define GL_CONTINUOUS_AMD 0x9007
+
+typedef void (GLAPIENTRY * PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (GLAPIENTRY * PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+
+#define glTessellationFactorAMD GLEW_GET_FUN(__glewTessellationFactorAMD)
+#define glTessellationModeAMD GLEW_GET_FUN(__glewTessellationModeAMD)
+
+#define GLEW_AMD_vertex_shader_tessellator GLEW_GET_VAR(__GLEW_AMD_vertex_shader_tessellator)
+
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+/* ------------------ GL_AMD_vertex_shader_viewport_index ------------------ */
+
+#ifndef GL_AMD_vertex_shader_viewport_index
+#define GL_AMD_vertex_shader_viewport_index 1
+
+#define GLEW_AMD_vertex_shader_viewport_index GLEW_GET_VAR(__GLEW_AMD_vertex_shader_viewport_index)
+
+#endif /* GL_AMD_vertex_shader_viewport_index */
+
+/* -------------------- GL_ANDROID_extension_pack_es31a -------------------- */
+
+#ifndef GL_ANDROID_extension_pack_es31a
+#define GL_ANDROID_extension_pack_es31a 1
+
+#define GLEW_ANDROID_extension_pack_es31a GLEW_GET_VAR(__GLEW_ANDROID_extension_pack_es31a)
+
+#endif /* GL_ANDROID_extension_pack_es31a */
+
+/* ------------------------- GL_ANGLE_depth_texture ------------------------ */
+
+#ifndef GL_ANGLE_depth_texture
+#define GL_ANGLE_depth_texture 1
+
+#define GLEW_ANGLE_depth_texture GLEW_GET_VAR(__GLEW_ANGLE_depth_texture)
+
+#endif /* GL_ANGLE_depth_texture */
+
+/* ----------------------- GL_ANGLE_framebuffer_blit ----------------------- */
+
+#ifndef GL_ANGLE_framebuffer_blit
+#define GL_ANGLE_framebuffer_blit 1
+
+#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6
+#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8
+#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA
+
+typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+
+#define glBlitFramebufferANGLE GLEW_GET_FUN(__glewBlitFramebufferANGLE)
+
+#define GLEW_ANGLE_framebuffer_blit GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_blit)
+
+#endif /* GL_ANGLE_framebuffer_blit */
+
+/* -------------------- GL_ANGLE_framebuffer_multisample ------------------- */
+
+#ifndef GL_ANGLE_framebuffer_multisample
+#define GL_ANGLE_framebuffer_multisample 1
+
+#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56
+#define GL_MAX_SAMPLES_ANGLE 0x8D57
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glRenderbufferStorageMultisampleANGLE GLEW_GET_FUN(__glewRenderbufferStorageMultisampleANGLE)
+
+#define GLEW_ANGLE_framebuffer_multisample GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_multisample)
+
+#endif /* GL_ANGLE_framebuffer_multisample */
+
+/* ----------------------- GL_ANGLE_instanced_arrays ----------------------- */
+
+#ifndef GL_ANGLE_instanced_arrays
+#define GL_ANGLE_instanced_arrays 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
+
+#define glDrawArraysInstancedANGLE GLEW_GET_FUN(__glewDrawArraysInstancedANGLE)
+#define glDrawElementsInstancedANGLE GLEW_GET_FUN(__glewDrawElementsInstancedANGLE)
+#define glVertexAttribDivisorANGLE GLEW_GET_FUN(__glewVertexAttribDivisorANGLE)
+
+#define GLEW_ANGLE_instanced_arrays GLEW_GET_VAR(__GLEW_ANGLE_instanced_arrays)
+
+#endif /* GL_ANGLE_instanced_arrays */
+
+/* -------------------- GL_ANGLE_pack_reverse_row_order -------------------- */
+
+#ifndef GL_ANGLE_pack_reverse_row_order
+#define GL_ANGLE_pack_reverse_row_order 1
+
+#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4
+
+#define GLEW_ANGLE_pack_reverse_row_order GLEW_GET_VAR(__GLEW_ANGLE_pack_reverse_row_order)
+
+#endif /* GL_ANGLE_pack_reverse_row_order */
+
+/* ------------------------ GL_ANGLE_program_binary ------------------------ */
+
+#ifndef GL_ANGLE_program_binary
+#define GL_ANGLE_program_binary 1
+
+#define GL_PROGRAM_BINARY_ANGLE 0x93A6
+
+#define GLEW_ANGLE_program_binary GLEW_GET_VAR(__GLEW_ANGLE_program_binary)
+
+#endif /* GL_ANGLE_program_binary */
+
+/* ------------------- GL_ANGLE_texture_compression_dxt1 ------------------- */
+
+#ifndef GL_ANGLE_texture_compression_dxt1
+#define GL_ANGLE_texture_compression_dxt1 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3
+
+#define GLEW_ANGLE_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt1)
+
+#endif /* GL_ANGLE_texture_compression_dxt1 */
+
+/* ------------------- GL_ANGLE_texture_compression_dxt3 ------------------- */
+
+#ifndef GL_ANGLE_texture_compression_dxt3
+#define GL_ANGLE_texture_compression_dxt3 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3
+
+#define GLEW_ANGLE_texture_compression_dxt3 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt3)
+
+#endif /* GL_ANGLE_texture_compression_dxt3 */
+
+/* ------------------- GL_ANGLE_texture_compression_dxt5 ------------------- */
+
+#ifndef GL_ANGLE_texture_compression_dxt5
+#define GL_ANGLE_texture_compression_dxt5 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3
+
+#define GLEW_ANGLE_texture_compression_dxt5 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt5)
+
+#endif /* GL_ANGLE_texture_compression_dxt5 */
+
+/* ------------------------- GL_ANGLE_texture_usage ------------------------ */
+
+#ifndef GL_ANGLE_texture_usage
+#define GL_ANGLE_texture_usage 1
+
+#define GL_TEXTURE_USAGE_ANGLE 0x93A2
+#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3
+
+#define GLEW_ANGLE_texture_usage GLEW_GET_VAR(__GLEW_ANGLE_texture_usage)
+
+#endif /* GL_ANGLE_texture_usage */
+
+/* -------------------------- GL_ANGLE_timer_query ------------------------- */
+
+#ifndef GL_ANGLE_timer_query
+#define GL_ANGLE_timer_query 1
+
+#define GL_QUERY_COUNTER_BITS_ANGLE 0x8864
+#define GL_CURRENT_QUERY_ANGLE 0x8865
+#define GL_QUERY_RESULT_ANGLE 0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ANGLE 0x8867
+#define GL_TIME_ELAPSED_ANGLE 0x88BF
+#define GL_TIMESTAMP_ANGLE 0x8E28
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYANGLEPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESANGLEPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYANGLEPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESANGLEPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VANGLEPROC) (GLuint id, GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVANGLEPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VANGLEPROC) (GLuint id, GLenum pname, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVANGLEPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVANGLEPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYANGLEPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERANGLEPROC) (GLuint id, GLenum target);
+
+#define glBeginQueryANGLE GLEW_GET_FUN(__glewBeginQueryANGLE)
+#define glDeleteQueriesANGLE GLEW_GET_FUN(__glewDeleteQueriesANGLE)
+#define glEndQueryANGLE GLEW_GET_FUN(__glewEndQueryANGLE)
+#define glGenQueriesANGLE GLEW_GET_FUN(__glewGenQueriesANGLE)
+#define glGetQueryObjecti64vANGLE GLEW_GET_FUN(__glewGetQueryObjecti64vANGLE)
+#define glGetQueryObjectivANGLE GLEW_GET_FUN(__glewGetQueryObjectivANGLE)
+#define glGetQueryObjectui64vANGLE GLEW_GET_FUN(__glewGetQueryObjectui64vANGLE)
+#define glGetQueryObjectuivANGLE GLEW_GET_FUN(__glewGetQueryObjectuivANGLE)
+#define glGetQueryivANGLE GLEW_GET_FUN(__glewGetQueryivANGLE)
+#define glIsQueryANGLE GLEW_GET_FUN(__glewIsQueryANGLE)
+#define glQueryCounterANGLE GLEW_GET_FUN(__glewQueryCounterANGLE)
+
+#define GLEW_ANGLE_timer_query GLEW_GET_VAR(__GLEW_ANGLE_timer_query)
+
+#endif /* GL_ANGLE_timer_query */
+
+/* ------------------- GL_ANGLE_translated_shader_source ------------------- */
+
+#ifndef GL_ANGLE_translated_shader_source
+#define GL_ANGLE_translated_shader_source 1
+
+#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0
+
+typedef void (GLAPIENTRY * PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
+
+#define glGetTranslatedShaderSourceANGLE GLEW_GET_FUN(__glewGetTranslatedShaderSourceANGLE)
+
+#define GLEW_ANGLE_translated_shader_source GLEW_GET_VAR(__GLEW_ANGLE_translated_shader_source)
+
+#endif /* GL_ANGLE_translated_shader_source */
+
+/* ----------------------- GL_APPLE_aux_depth_stencil ---------------------- */
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+
+#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14
+
+#define GLEW_APPLE_aux_depth_stencil GLEW_GET_VAR(__GLEW_APPLE_aux_depth_stencil)
+
+#endif /* GL_APPLE_aux_depth_stencil */
+
+/* ------------------------ GL_APPLE_client_storage ------------------------ */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+
+#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2
+
+#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage)
+
+#endif /* GL_APPLE_client_storage */
+
+/* ------------------------- GL_APPLE_clip_distance ------------------------ */
+
+#ifndef GL_APPLE_clip_distance
+#define GL_APPLE_clip_distance 1
+
+#define GL_MAX_CLIP_DISTANCES_APPLE 0x0D32
+#define GL_CLIP_DISTANCE0_APPLE 0x3000
+#define GL_CLIP_DISTANCE1_APPLE 0x3001
+#define GL_CLIP_DISTANCE2_APPLE 0x3002
+#define GL_CLIP_DISTANCE3_APPLE 0x3003
+#define GL_CLIP_DISTANCE4_APPLE 0x3004
+#define GL_CLIP_DISTANCE5_APPLE 0x3005
+#define GL_CLIP_DISTANCE6_APPLE 0x3006
+#define GL_CLIP_DISTANCE7_APPLE 0x3007
+
+#define GLEW_APPLE_clip_distance GLEW_GET_VAR(__GLEW_APPLE_clip_distance)
+
+#endif /* GL_APPLE_clip_distance */
+
+/* ------------------- GL_APPLE_color_buffer_packed_float ------------------ */
+
+#ifndef GL_APPLE_color_buffer_packed_float
+#define GL_APPLE_color_buffer_packed_float 1
+
+#define GLEW_APPLE_color_buffer_packed_float GLEW_GET_VAR(__GLEW_APPLE_color_buffer_packed_float)
+
+#endif /* GL_APPLE_color_buffer_packed_float */
+
+/* ---------------------- GL_APPLE_copy_texture_levels --------------------- */
+
+#ifndef GL_APPLE_copy_texture_levels
+#define GL_APPLE_copy_texture_levels 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
+
+#define glCopyTextureLevelsAPPLE GLEW_GET_FUN(__glewCopyTextureLevelsAPPLE)
+
+#define GLEW_APPLE_copy_texture_levels GLEW_GET_VAR(__GLEW_APPLE_copy_texture_levels)
+
+#endif /* GL_APPLE_copy_texture_levels */
+
+/* ------------------------- GL_APPLE_element_array ------------------------ */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+
+#define GL_ELEMENT_ARRAY_APPLE 0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount);
+
+#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE)
+#define glDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewDrawRangeElementArrayAPPLE)
+#define glElementPointerAPPLE GLEW_GET_FUN(__glewElementPointerAPPLE)
+#define glMultiDrawElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawElementArrayAPPLE)
+#define glMultiDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawRangeElementArrayAPPLE)
+
+#define GLEW_APPLE_element_array GLEW_GET_VAR(__GLEW_APPLE_element_array)
+
+#endif /* GL_APPLE_element_array */
+
+/* ----------------------------- GL_APPLE_fence ---------------------------- */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+
+#define GL_DRAW_PIXELS_APPLE 0x8A0A
+#define GL_FENCE_APPLE 0x8A0B
+
+typedef void (GLAPIENTRY * PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+typedef void (GLAPIENTRY * PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint* fences);
+typedef GLboolean (GLAPIENTRY * PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+
+#define glDeleteFencesAPPLE GLEW_GET_FUN(__glewDeleteFencesAPPLE)
+#define glFinishFenceAPPLE GLEW_GET_FUN(__glewFinishFenceAPPLE)
+#define glFinishObjectAPPLE GLEW_GET_FUN(__glewFinishObjectAPPLE)
+#define glGenFencesAPPLE GLEW_GET_FUN(__glewGenFencesAPPLE)
+#define glIsFenceAPPLE GLEW_GET_FUN(__glewIsFenceAPPLE)
+#define glSetFenceAPPLE GLEW_GET_FUN(__glewSetFenceAPPLE)
+#define glTestFenceAPPLE GLEW_GET_FUN(__glewTestFenceAPPLE)
+#define glTestObjectAPPLE GLEW_GET_FUN(__glewTestObjectAPPLE)
+
+#define GLEW_APPLE_fence GLEW_GET_VAR(__GLEW_APPLE_fence)
+
+#endif /* GL_APPLE_fence */
+
+/* ------------------------- GL_APPLE_float_pixels ------------------------- */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+
+#define GL_HALF_APPLE 0x140B
+#define GL_RGBA_FLOAT32_APPLE 0x8814
+#define GL_RGB_FLOAT32_APPLE 0x8815
+#define GL_ALPHA_FLOAT32_APPLE 0x8816
+#define GL_INTENSITY_FLOAT32_APPLE 0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE 0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819
+#define GL_RGBA_FLOAT16_APPLE 0x881A
+#define GL_RGB_FLOAT16_APPLE 0x881B
+#define GL_ALPHA_FLOAT16_APPLE 0x881C
+#define GL_INTENSITY_FLOAT16_APPLE 0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE 0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F
+#define GL_COLOR_FLOAT_APPLE 0x8A0F
+
+#define GLEW_APPLE_float_pixels GLEW_GET_VAR(__GLEW_APPLE_float_pixels)
+
+#endif /* GL_APPLE_float_pixels */
+
+/* ---------------------- GL_APPLE_flush_buffer_range ---------------------- */
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13
+
+typedef void (GLAPIENTRY * PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+
+#define glBufferParameteriAPPLE GLEW_GET_FUN(__glewBufferParameteriAPPLE)
+#define glFlushMappedBufferRangeAPPLE GLEW_GET_FUN(__glewFlushMappedBufferRangeAPPLE)
+
+#define GLEW_APPLE_flush_buffer_range GLEW_GET_VAR(__GLEW_APPLE_flush_buffer_range)
+
+#endif /* GL_APPLE_flush_buffer_range */
+
+/* -------------------- GL_APPLE_framebuffer_multisample ------------------- */
+
+#ifndef GL_APPLE_framebuffer_multisample
+#define GL_APPLE_framebuffer_multisample 1
+
+#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6
+#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8
+#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA
+#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56
+#define GL_MAX_SAMPLES_APPLE 0x8D57
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
+
+#define glRenderbufferStorageMultisampleAPPLE GLEW_GET_FUN(__glewRenderbufferStorageMultisampleAPPLE)
+#define glResolveMultisampleFramebufferAPPLE GLEW_GET_FUN(__glewResolveMultisampleFramebufferAPPLE)
+
+#define GLEW_APPLE_framebuffer_multisample GLEW_GET_VAR(__GLEW_APPLE_framebuffer_multisample)
+
+#endif /* GL_APPLE_framebuffer_multisample */
+
+/* ----------------------- GL_APPLE_object_purgeable ----------------------- */
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+
+#define GL_BUFFER_OBJECT_APPLE 0x85B3
+#define GL_RELEASED_APPLE 0x8A19
+#define GL_VOLATILE_APPLE 0x8A1A
+#define GL_RETAINED_APPLE 0x8A1B
+#define GL_UNDEFINED_APPLE 0x8A1C
+#define GL_PURGEABLE_APPLE 0x8A1D
+
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint* params);
+typedef GLenum (GLAPIENTRY * PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (GLAPIENTRY * PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+
+#define glGetObjectParameterivAPPLE GLEW_GET_FUN(__glewGetObjectParameterivAPPLE)
+#define glObjectPurgeableAPPLE GLEW_GET_FUN(__glewObjectPurgeableAPPLE)
+#define glObjectUnpurgeableAPPLE GLEW_GET_FUN(__glewObjectUnpurgeableAPPLE)
+
+#define GLEW_APPLE_object_purgeable GLEW_GET_VAR(__GLEW_APPLE_object_purgeable)
+
+#endif /* GL_APPLE_object_purgeable */
+
+/* ------------------------- GL_APPLE_pixel_buffer ------------------------- */
+
+#ifndef GL_APPLE_pixel_buffer
+#define GL_APPLE_pixel_buffer 1
+
+#define GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10
+
+#define GLEW_APPLE_pixel_buffer GLEW_GET_VAR(__GLEW_APPLE_pixel_buffer)
+
+#endif /* GL_APPLE_pixel_buffer */
+
+/* ---------------------------- GL_APPLE_rgb_422 --------------------------- */
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+
+#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB
+#define GL_RGB_422_APPLE 0x8A1F
+#define GL_RGB_RAW_422_APPLE 0x8A51
+
+#define GLEW_APPLE_rgb_422 GLEW_GET_VAR(__GLEW_APPLE_rgb_422)
+
+#endif /* GL_APPLE_rgb_422 */
+
+/* --------------------------- GL_APPLE_row_bytes -------------------------- */
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+
+#define GL_PACK_ROW_BYTES_APPLE 0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16
+
+#define GLEW_APPLE_row_bytes GLEW_GET_VAR(__GLEW_APPLE_row_bytes)
+
+#endif /* GL_APPLE_row_bytes */
+
+/* ------------------------ GL_APPLE_specular_vector ----------------------- */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+
+#define GLEW_APPLE_specular_vector GLEW_GET_VAR(__GLEW_APPLE_specular_vector)
+
+#endif /* GL_APPLE_specular_vector */
+
+/* ----------------------------- GL_APPLE_sync ----------------------------- */
+
+#ifndef GL_APPLE_sync
+#define GL_APPLE_sync 1
+
+#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001
+#define GL_SYNC_OBJECT_APPLE 0x8A53
+#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111
+#define GL_OBJECT_TYPE_APPLE 0x9112
+#define GL_SYNC_CONDITION_APPLE 0x9113
+#define GL_SYNC_STATUS_APPLE 0x9114
+#define GL_SYNC_FLAGS_APPLE 0x9115
+#define GL_SYNC_FENCE_APPLE 0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117
+#define GL_UNSIGNALED_APPLE 0x9118
+#define GL_SIGNALED_APPLE 0x9119
+#define GL_ALREADY_SIGNALED_APPLE 0x911A
+#define GL_TIMEOUT_EXPIRED_APPLE 0x911B
+#define GL_CONDITION_SATISFIED_APPLE 0x911C
+#define GL_WAIT_FAILED_APPLE 0x911D
+#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull
+
+typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync GLsync, GLbitfield flags, GLuint64 timeout);
+typedef void (GLAPIENTRY * PFNGLDELETESYNCAPPLEPROC) (GLsync GLsync);
+typedef GLsync (GLAPIENTRY * PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETSYNCIVAPPLEPROC) (GLsync GLsync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values);
+typedef GLboolean (GLAPIENTRY * PFNGLISSYNCAPPLEPROC) (GLsync GLsync);
+typedef void (GLAPIENTRY * PFNGLWAITSYNCAPPLEPROC) (GLsync GLsync, GLbitfield flags, GLuint64 timeout);
+
+#define glClientWaitSyncAPPLE GLEW_GET_FUN(__glewClientWaitSyncAPPLE)
+#define glDeleteSyncAPPLE GLEW_GET_FUN(__glewDeleteSyncAPPLE)
+#define glFenceSyncAPPLE GLEW_GET_FUN(__glewFenceSyncAPPLE)
+#define glGetInteger64vAPPLE GLEW_GET_FUN(__glewGetInteger64vAPPLE)
+#define glGetSyncivAPPLE GLEW_GET_FUN(__glewGetSyncivAPPLE)
+#define glIsSyncAPPLE GLEW_GET_FUN(__glewIsSyncAPPLE)
+#define glWaitSyncAPPLE GLEW_GET_FUN(__glewWaitSyncAPPLE)
+
+#define GLEW_APPLE_sync GLEW_GET_VAR(__GLEW_APPLE_sync)
+
+#endif /* GL_APPLE_sync */
+
+/* -------------------- GL_APPLE_texture_2D_limited_npot ------------------- */
+
+#ifndef GL_APPLE_texture_2D_limited_npot
+#define GL_APPLE_texture_2D_limited_npot 1
+
+#define GLEW_APPLE_texture_2D_limited_npot GLEW_GET_VAR(__GLEW_APPLE_texture_2D_limited_npot)
+
+#endif /* GL_APPLE_texture_2D_limited_npot */
+
+/* -------------------- GL_APPLE_texture_format_BGRA8888 ------------------- */
+
+#ifndef GL_APPLE_texture_format_BGRA8888
+#define GL_APPLE_texture_format_BGRA8888 1
+
+#define GL_BGRA_EXT 0x80E1
+#define GL_BGRA8_EXT 0x93A1
+
+#define GLEW_APPLE_texture_format_BGRA8888 GLEW_GET_VAR(__GLEW_APPLE_texture_format_BGRA8888)
+
+#endif /* GL_APPLE_texture_format_BGRA8888 */
+
+/* ----------------------- GL_APPLE_texture_max_level ---------------------- */
+
+#ifndef GL_APPLE_texture_max_level
+#define GL_APPLE_texture_max_level 1
+
+#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D
+
+#define GLEW_APPLE_texture_max_level GLEW_GET_VAR(__GLEW_APPLE_texture_max_level)
+
+#endif /* GL_APPLE_texture_max_level */
+
+/* --------------------- GL_APPLE_texture_packed_float --------------------- */
+
+#ifndef GL_APPLE_texture_packed_float
+#define GL_APPLE_texture_packed_float 1
+
+#define GL_R11F_G11F_B10F_APPLE 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE 0x8C3B
+#define GL_RGB9_E5_APPLE 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_APPLE 0x8C3E
+
+#define GLEW_APPLE_texture_packed_float GLEW_GET_VAR(__GLEW_APPLE_texture_packed_float)
+
+#endif /* GL_APPLE_texture_packed_float */
+
+/* ------------------------- GL_APPLE_texture_range ------------------------ */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+
+#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
+#define GL_STORAGE_PRIVATE_APPLE 0x85BD
+#define GL_STORAGE_CACHED_APPLE 0x85BE
+#define GL_STORAGE_SHARED_APPLE 0x85BF
+
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params);
+typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, void *pointer);
+
+#define glGetTexParameterPointervAPPLE GLEW_GET_FUN(__glewGetTexParameterPointervAPPLE)
+#define glTextureRangeAPPLE GLEW_GET_FUN(__glewTextureRangeAPPLE)
+
+#define GLEW_APPLE_texture_range GLEW_GET_VAR(__GLEW_APPLE_texture_range)
+
+#endif /* GL_APPLE_texture_range */
+
+/* ------------------------ GL_APPLE_transform_hint ------------------------ */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+
+#define GL_TRANSFORM_HINT_APPLE 0x85B1
+
+#define GLEW_APPLE_transform_hint GLEW_GET_VAR(__GLEW_APPLE_transform_hint)
+
+#endif /* GL_APPLE_transform_hint */
+
+/* ---------------------- GL_APPLE_vertex_array_object --------------------- */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+
+#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5
+
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
+typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
+typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+
+#define glBindVertexArrayAPPLE GLEW_GET_FUN(__glewBindVertexArrayAPPLE)
+#define glDeleteVertexArraysAPPLE GLEW_GET_FUN(__glewDeleteVertexArraysAPPLE)
+#define glGenVertexArraysAPPLE GLEW_GET_FUN(__glewGenVertexArraysAPPLE)
+#define glIsVertexArrayAPPLE GLEW_GET_FUN(__glewIsVertexArrayAPPLE)
+
+#define GLEW_APPLE_vertex_array_object GLEW_GET_VAR(__GLEW_APPLE_vertex_array_object)
+
+#endif /* GL_APPLE_vertex_array_object */
+
+/* ---------------------- GL_APPLE_vertex_array_range ---------------------- */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+
+#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_APPLE 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE 0x85B4
+#define GL_STORAGE_CACHED_APPLE 0x85BE
+#define GL_STORAGE_SHARED_APPLE 0x85BF
+
+typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+
+#define glFlushVertexArrayRangeAPPLE GLEW_GET_FUN(__glewFlushVertexArrayRangeAPPLE)
+#define glVertexArrayParameteriAPPLE GLEW_GET_FUN(__glewVertexArrayParameteriAPPLE)
+#define glVertexArrayRangeAPPLE GLEW_GET_FUN(__glewVertexArrayRangeAPPLE)
+
+#define GLEW_APPLE_vertex_array_range GLEW_GET_VAR(__GLEW_APPLE_vertex_array_range)
+
+#endif /* GL_APPLE_vertex_array_range */
+
+/* ------------------- GL_APPLE_vertex_program_evaluators ------------------ */
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+
+#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble* points);
+typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble* points);
+typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat* points);
+
+#define glDisableVertexAttribAPPLE GLEW_GET_FUN(__glewDisableVertexAttribAPPLE)
+#define glEnableVertexAttribAPPLE GLEW_GET_FUN(__glewEnableVertexAttribAPPLE)
+#define glIsVertexAttribEnabledAPPLE GLEW_GET_FUN(__glewIsVertexAttribEnabledAPPLE)
+#define glMapVertexAttrib1dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1dAPPLE)
+#define glMapVertexAttrib1fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1fAPPLE)
+#define glMapVertexAttrib2dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2dAPPLE)
+#define glMapVertexAttrib2fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2fAPPLE)
+
+#define GLEW_APPLE_vertex_program_evaluators GLEW_GET_VAR(__GLEW_APPLE_vertex_program_evaluators)
+
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+/* --------------------------- GL_APPLE_ycbcr_422 -------------------------- */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+
+#define GL_YCBCR_422_APPLE 0x85B9
+
+#define GLEW_APPLE_ycbcr_422 GLEW_GET_VAR(__GLEW_APPLE_ycbcr_422)
+
+#endif /* GL_APPLE_ycbcr_422 */
+
+/* ------------------------ GL_ARB_ES2_compatibility ----------------------- */
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+
+#define GL_FIXED 0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_RGB565 0x8D62
+#define GL_LOW_FLOAT 0x8DF0
+#define GL_MEDIUM_FLOAT 0x8DF1
+#define GL_HIGH_FLOAT 0x8DF2
+#define GL_LOW_INT 0x8DF3
+#define GL_MEDIUM_INT 0x8DF4
+#define GL_HIGH_INT 0x8DF5
+#define GL_SHADER_BINARY_FORMATS 0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
+#define GL_SHADER_COMPILER 0x8DFA
+#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
+#define GL_MAX_VARYING_VECTORS 0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
+
+typedef int GLfixed;
+
+typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFPROC) (GLclampf d);
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f);
+typedef void (GLAPIENTRY * PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint* range, GLint *precision);
+typedef void (GLAPIENTRY * PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (GLAPIENTRY * PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint* shaders, GLenum binaryformat, const void*binary, GLsizei length);
+
+#define glClearDepthf GLEW_GET_FUN(__glewClearDepthf)
+#define glDepthRangef GLEW_GET_FUN(__glewDepthRangef)
+#define glGetShaderPrecisionFormat GLEW_GET_FUN(__glewGetShaderPrecisionFormat)
+#define glReleaseShaderCompiler GLEW_GET_FUN(__glewReleaseShaderCompiler)
+#define glShaderBinary GLEW_GET_FUN(__glewShaderBinary)
+
+#define GLEW_ARB_ES2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES2_compatibility)
+
+#endif /* GL_ARB_ES2_compatibility */
+
+/* ----------------------- GL_ARB_ES3_1_compatibility ---------------------- */
+
+#ifndef GL_ARB_ES3_1_compatibility
+#define GL_ARB_ES3_1_compatibility 1
+
+typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers);
+
+#define glMemoryBarrierByRegion GLEW_GET_FUN(__glewMemoryBarrierByRegion)
+
+#define GLEW_ARB_ES3_1_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_1_compatibility)
+
+#endif /* GL_ARB_ES3_1_compatibility */
+
+/* ----------------------- GL_ARB_ES3_2_compatibility ---------------------- */
+
+#ifndef GL_ARB_ES3_2_compatibility
+#define GL_ARB_ES3_2_compatibility 1
+
+#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE
+#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381
+#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382
+
+typedef void (GLAPIENTRY * PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+
+#define glPrimitiveBoundingBoxARB GLEW_GET_FUN(__glewPrimitiveBoundingBoxARB)
+
+#define GLEW_ARB_ES3_2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_2_compatibility)
+
+#endif /* GL_ARB_ES3_2_compatibility */
+
+/* ------------------------ GL_ARB_ES3_compatibility ----------------------- */
+
+#ifndef GL_ARB_ES3_compatibility
+#define GL_ARB_ES3_compatibility 1
+
+#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
+#define GL_MAX_ELEMENT_INDEX 0x8D6B
+#define GL_COMPRESSED_R11_EAC 0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271
+#define GL_COMPRESSED_RG11_EAC 0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
+#define GL_COMPRESSED_RGB8_ETC2 0x9274
+#define GL_COMPRESSED_SRGB8_ETC2 0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
+
+#define GLEW_ARB_ES3_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_compatibility)
+
+#endif /* GL_ARB_ES3_compatibility */
+
+/* ------------------------ GL_ARB_arrays_of_arrays ------------------------ */
+
+#ifndef GL_ARB_arrays_of_arrays
+#define GL_ARB_arrays_of_arrays 1
+
+#define GLEW_ARB_arrays_of_arrays GLEW_GET_VAR(__GLEW_ARB_arrays_of_arrays)
+
+#endif /* GL_ARB_arrays_of_arrays */
+
+/* -------------------------- GL_ARB_base_instance ------------------------- */
+
+#ifndef GL_ARB_base_instance
+#define GL_ARB_base_instance 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLuint baseinstance);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance);
+
+#define glDrawArraysInstancedBaseInstance GLEW_GET_FUN(__glewDrawArraysInstancedBaseInstance)
+#define glDrawElementsInstancedBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseInstance)
+#define glDrawElementsInstancedBaseVertexBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexBaseInstance)
+
+#define GLEW_ARB_base_instance GLEW_GET_VAR(__GLEW_ARB_base_instance)
+
+#endif /* GL_ARB_base_instance */
+
+/* ------------------------ GL_ARB_bindless_texture ------------------------ */
+
+#ifndef GL_ARB_bindless_texture
+#define GL_ARB_bindless_texture 1
+
+#define GL_UNSIGNED_INT64_ARB 0x140F
+
+typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
+typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
+typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values);
+typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT* v);
+
+#define glGetImageHandleARB GLEW_GET_FUN(__glewGetImageHandleARB)
+#define glGetTextureHandleARB GLEW_GET_FUN(__glewGetTextureHandleARB)
+#define glGetTextureSamplerHandleARB GLEW_GET_FUN(__glewGetTextureSamplerHandleARB)
+#define glGetVertexAttribLui64vARB GLEW_GET_FUN(__glewGetVertexAttribLui64vARB)
+#define glIsImageHandleResidentARB GLEW_GET_FUN(__glewIsImageHandleResidentARB)
+#define glIsTextureHandleResidentARB GLEW_GET_FUN(__glewIsTextureHandleResidentARB)
+#define glMakeImageHandleNonResidentARB GLEW_GET_FUN(__glewMakeImageHandleNonResidentARB)
+#define glMakeImageHandleResidentARB GLEW_GET_FUN(__glewMakeImageHandleResidentARB)
+#define glMakeTextureHandleNonResidentARB GLEW_GET_FUN(__glewMakeTextureHandleNonResidentARB)
+#define glMakeTextureHandleResidentARB GLEW_GET_FUN(__glewMakeTextureHandleResidentARB)
+#define glProgramUniformHandleui64ARB GLEW_GET_FUN(__glewProgramUniformHandleui64ARB)
+#define glProgramUniformHandleui64vARB GLEW_GET_FUN(__glewProgramUniformHandleui64vARB)
+#define glUniformHandleui64ARB GLEW_GET_FUN(__glewUniformHandleui64ARB)
+#define glUniformHandleui64vARB GLEW_GET_FUN(__glewUniformHandleui64vARB)
+#define glVertexAttribL1ui64ARB GLEW_GET_FUN(__glewVertexAttribL1ui64ARB)
+#define glVertexAttribL1ui64vARB GLEW_GET_FUN(__glewVertexAttribL1ui64vARB)
+
+#define GLEW_ARB_bindless_texture GLEW_GET_VAR(__GLEW_ARB_bindless_texture)
+
+#endif /* GL_ARB_bindless_texture */
+
+/* ----------------------- GL_ARB_blend_func_extended ---------------------- */
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+
+#define GL_SRC1_COLOR 0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR 0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name);
+typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar * name);
+
+#define glBindFragDataLocationIndexed GLEW_GET_FUN(__glewBindFragDataLocationIndexed)
+#define glGetFragDataIndex GLEW_GET_FUN(__glewGetFragDataIndex)
+
+#define GLEW_ARB_blend_func_extended GLEW_GET_VAR(__GLEW_ARB_blend_func_extended)
+
+#endif /* GL_ARB_blend_func_extended */
+
+/* ------------------------- GL_ARB_buffer_storage ------------------------- */
+
+#ifndef GL_ARB_buffer_storage
+#define GL_ARB_buffer_storage 1
+
+#define GL_MAP_READ_BIT 0x0001
+#define GL_MAP_WRITE_BIT 0x0002
+#define GL_MAP_PERSISTENT_BIT 0x00000040
+#define GL_MAP_COHERENT_BIT 0x00000080
+#define GL_DYNAMIC_STORAGE_BIT 0x0100
+#define GL_CLIENT_STORAGE_BIT 0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F
+#define GL_BUFFER_STORAGE_FLAGS 0x8220
+
+typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+
+#define glBufferStorage GLEW_GET_FUN(__glewBufferStorage)
+
+#define GLEW_ARB_buffer_storage GLEW_GET_VAR(__GLEW_ARB_buffer_storage)
+
+#endif /* GL_ARB_buffer_storage */
+
+/* ---------------------------- GL_ARB_cl_event ---------------------------- */
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+
+#define GL_SYNC_CL_EVENT_ARB 0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241
+
+typedef struct _cl_context *cl_context;
+typedef struct _cl_event *cl_event;
+
+typedef GLsync (GLAPIENTRY * PFNGLCREATESYNCFROMCLEVENTARBPROC) (cl_context context, cl_event event, GLbitfield flags);
+
+#define glCreateSyncFromCLeventARB GLEW_GET_FUN(__glewCreateSyncFromCLeventARB)
+
+#define GLEW_ARB_cl_event GLEW_GET_VAR(__GLEW_ARB_cl_event)
+
+#endif /* GL_ARB_cl_event */
+
+/* ----------------------- GL_ARB_clear_buffer_object ---------------------- */
+
+#ifndef GL_ARB_clear_buffer_object
+#define GL_ARB_clear_buffer_object 1
+
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+
+#define glClearBufferData GLEW_GET_FUN(__glewClearBufferData)
+#define glClearBufferSubData GLEW_GET_FUN(__glewClearBufferSubData)
+#define glClearNamedBufferDataEXT GLEW_GET_FUN(__glewClearNamedBufferDataEXT)
+#define glClearNamedBufferSubDataEXT GLEW_GET_FUN(__glewClearNamedBufferSubDataEXT)
+
+#define GLEW_ARB_clear_buffer_object GLEW_GET_VAR(__GLEW_ARB_clear_buffer_object)
+
+#endif /* GL_ARB_clear_buffer_object */
+
+/* -------------------------- GL_ARB_clear_texture ------------------------- */
+
+#ifndef GL_ARB_clear_texture
+#define GL_ARB_clear_texture 1
+
+#define GL_CLEAR_TEXTURE 0x9365
+
+typedef void (GLAPIENTRY * PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+
+#define glClearTexImage GLEW_GET_FUN(__glewClearTexImage)
+#define glClearTexSubImage GLEW_GET_FUN(__glewClearTexSubImage)
+
+#define GLEW_ARB_clear_texture GLEW_GET_VAR(__GLEW_ARB_clear_texture)
+
+#endif /* GL_ARB_clear_texture */
+
+/* -------------------------- GL_ARB_clip_control -------------------------- */
+
+#ifndef GL_ARB_clip_control
+#define GL_ARB_clip_control 1
+
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_CLIP_ORIGIN 0x935C
+#define GL_CLIP_DEPTH_MODE 0x935D
+#define GL_NEGATIVE_ONE_TO_ONE 0x935E
+#define GL_ZERO_TO_ONE 0x935F
+
+typedef void (GLAPIENTRY * PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
+
+#define glClipControl GLEW_GET_FUN(__glewClipControl)
+
+#define GLEW_ARB_clip_control GLEW_GET_VAR(__GLEW_ARB_clip_control)
+
+#endif /* GL_ARB_clip_control */
+
+/* ----------------------- GL_ARB_color_buffer_float ----------------------- */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+
+#define GL_RGBA_FLOAT_MODE_ARB 0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B
+#define GL_CLAMP_READ_COLOR_ARB 0x891C
+#define GL_FIXED_ONLY_ARB 0x891D
+
+typedef void (GLAPIENTRY * PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+
+#define glClampColorARB GLEW_GET_FUN(__glewClampColorARB)
+
+#define GLEW_ARB_color_buffer_float GLEW_GET_VAR(__GLEW_ARB_color_buffer_float)
+
+#endif /* GL_ARB_color_buffer_float */
+
+/* -------------------------- GL_ARB_compatibility ------------------------- */
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+
+#define GLEW_ARB_compatibility GLEW_GET_VAR(__GLEW_ARB_compatibility)
+
+#endif /* GL_ARB_compatibility */
+
+/* ---------------- GL_ARB_compressed_texture_pixel_storage ---------------- */
+
+#ifndef GL_ARB_compressed_texture_pixel_storage
+#define GL_ARB_compressed_texture_pixel_storage 1
+
+#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127
+#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
+#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129
+#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A
+#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B
+#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C
+#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D
+#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E
+
+#define GLEW_ARB_compressed_texture_pixel_storage GLEW_GET_VAR(__GLEW_ARB_compressed_texture_pixel_storage)
+
+#endif /* GL_ARB_compressed_texture_pixel_storage */
+
+/* ------------------------- GL_ARB_compute_shader ------------------------- */
+
+#ifndef GL_ARB_compute_shader
+#define GL_ARB_compute_shader 1
+
+#define GL_COMPUTE_SHADER_BIT 0x00000020
+#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
+#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
+#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
+#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265
+#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
+#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267
+#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
+#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE
+#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
+#define GL_COMPUTE_SHADER 0x91B9
+#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB
+#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
+#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD
+#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE
+#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF
+
+typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
+
+#define glDispatchCompute GLEW_GET_FUN(__glewDispatchCompute)
+#define glDispatchComputeIndirect GLEW_GET_FUN(__glewDispatchComputeIndirect)
+
+#define GLEW_ARB_compute_shader GLEW_GET_VAR(__GLEW_ARB_compute_shader)
+
+#endif /* GL_ARB_compute_shader */
+
+/* ------------------- GL_ARB_compute_variable_group_size ------------------ */
+
+#ifndef GL_ARB_compute_variable_group_size
+#define GL_ARB_compute_variable_group_size 1
+
+#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB
+#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345
+
+typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+
+#define glDispatchComputeGroupSizeARB GLEW_GET_FUN(__glewDispatchComputeGroupSizeARB)
+
+#define GLEW_ARB_compute_variable_group_size GLEW_GET_VAR(__GLEW_ARB_compute_variable_group_size)
+
+#endif /* GL_ARB_compute_variable_group_size */
+
+/* ------------------- GL_ARB_conditional_render_inverted ------------------ */
+
+#ifndef GL_ARB_conditional_render_inverted
+#define GL_ARB_conditional_render_inverted 1
+
+#define GL_QUERY_WAIT_INVERTED 0x8E17
+#define GL_QUERY_NO_WAIT_INVERTED 0x8E18
+#define GL_QUERY_BY_REGION_WAIT_INVERTED 0x8E19
+#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A
+
+#define GLEW_ARB_conditional_render_inverted GLEW_GET_VAR(__GLEW_ARB_conditional_render_inverted)
+
+#endif /* GL_ARB_conditional_render_inverted */
+
+/* ----------------------- GL_ARB_conservative_depth ----------------------- */
+
+#ifndef GL_ARB_conservative_depth
+#define GL_ARB_conservative_depth 1
+
+#define GLEW_ARB_conservative_depth GLEW_GET_VAR(__GLEW_ARB_conservative_depth)
+
+#endif /* GL_ARB_conservative_depth */
+
+/* --------------------------- GL_ARB_copy_buffer -------------------------- */
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+
+#define GL_COPY_READ_BUFFER 0x8F36
+#define GL_COPY_WRITE_BUFFER 0x8F37
+
+typedef void (GLAPIENTRY * PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size);
+
+#define glCopyBufferSubData GLEW_GET_FUN(__glewCopyBufferSubData)
+
+#define GLEW_ARB_copy_buffer GLEW_GET_VAR(__GLEW_ARB_copy_buffer)
+
+#endif /* GL_ARB_copy_buffer */
+
+/* --------------------------- GL_ARB_copy_image --------------------------- */
+
+#ifndef GL_ARB_copy_image
+#define GL_ARB_copy_image 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+
+#define glCopyImageSubData GLEW_GET_FUN(__glewCopyImageSubData)
+
+#define GLEW_ARB_copy_image GLEW_GET_VAR(__GLEW_ARB_copy_image)
+
+#endif /* GL_ARB_copy_image */
+
+/* -------------------------- GL_ARB_cull_distance ------------------------- */
+
+#ifndef GL_ARB_cull_distance
+#define GL_ARB_cull_distance 1
+
+#define GL_MAX_CULL_DISTANCES 0x82F9
+#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA
+
+#define GLEW_ARB_cull_distance GLEW_GET_VAR(__GLEW_ARB_cull_distance)
+
+#endif /* GL_ARB_cull_distance */
+
+/* -------------------------- GL_ARB_debug_output -------------------------- */
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245
+#define GL_DEBUG_SOURCE_API_ARB 0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB 0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB 0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148
+
+typedef void (GLAPIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam);
+
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
+typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
+
+#define glDebugMessageCallbackARB GLEW_GET_FUN(__glewDebugMessageCallbackARB)
+#define glDebugMessageControlARB GLEW_GET_FUN(__glewDebugMessageControlARB)
+#define glDebugMessageInsertARB GLEW_GET_FUN(__glewDebugMessageInsertARB)
+#define glGetDebugMessageLogARB GLEW_GET_FUN(__glewGetDebugMessageLogARB)
+
+#define GLEW_ARB_debug_output GLEW_GET_VAR(__GLEW_ARB_debug_output)
+
+#endif /* GL_ARB_debug_output */
+
+/* ----------------------- GL_ARB_depth_buffer_float ----------------------- */
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+
+#define GL_DEPTH_COMPONENT32F 0x8CAC
+#define GL_DEPTH32F_STENCIL8 0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+
+#define GLEW_ARB_depth_buffer_float GLEW_GET_VAR(__GLEW_ARB_depth_buffer_float)
+
+#endif /* GL_ARB_depth_buffer_float */
+
+/* --------------------------- GL_ARB_depth_clamp -------------------------- */
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+
+#define GL_DEPTH_CLAMP 0x864F
+
+#define GLEW_ARB_depth_clamp GLEW_GET_VAR(__GLEW_ARB_depth_clamp)
+
+#endif /* GL_ARB_depth_clamp */
+
+/* -------------------------- GL_ARB_depth_texture ------------------------- */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_ARB 0x81A5
+#define GL_DEPTH_COMPONENT24_ARB 0x81A6
+#define GL_DEPTH_COMPONENT32_ARB 0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
+
+#define GLEW_ARB_depth_texture GLEW_GET_VAR(__GLEW_ARB_depth_texture)
+
+#endif /* GL_ARB_depth_texture */
+
+/* ----------------------- GL_ARB_derivative_control ----------------------- */
+
+#ifndef GL_ARB_derivative_control
+#define GL_ARB_derivative_control 1
+
+#define GLEW_ARB_derivative_control GLEW_GET_VAR(__GLEW_ARB_derivative_control)
+
+#endif /* GL_ARB_derivative_control */
+
+/* ----------------------- GL_ARB_direct_state_access ---------------------- */
+
+#ifndef GL_ARB_direct_state_access
+#define GL_ARB_direct_state_access 1
+
+#define GL_TEXTURE_TARGET 0x1006
+#define GL_QUERY_TARGET 0x82EA
+
+typedef void (GLAPIENTRY * PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture);
+typedef void (GLAPIENTRY * PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines);
+typedef void (GLAPIENTRY * PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint* samplers);
+typedef void (GLAPIENTRY * PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint* textures);
+typedef void (GLAPIENTRY * PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void** params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64* param);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64* param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments);
+typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access);
+typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat* param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint* param);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides);
+
+#define glBindTextureUnit GLEW_GET_FUN(__glewBindTextureUnit)
+#define glBlitNamedFramebuffer GLEW_GET_FUN(__glewBlitNamedFramebuffer)
+#define glCheckNamedFramebufferStatus GLEW_GET_FUN(__glewCheckNamedFramebufferStatus)
+#define glClearNamedBufferData GLEW_GET_FUN(__glewClearNamedBufferData)
+#define glClearNamedBufferSubData GLEW_GET_FUN(__glewClearNamedBufferSubData)
+#define glClearNamedFramebufferfi GLEW_GET_FUN(__glewClearNamedFramebufferfi)
+#define glClearNamedFramebufferfv GLEW_GET_FUN(__glewClearNamedFramebufferfv)
+#define glClearNamedFramebufferiv GLEW_GET_FUN(__glewClearNamedFramebufferiv)
+#define glClearNamedFramebufferuiv GLEW_GET_FUN(__glewClearNamedFramebufferuiv)
+#define glCompressedTextureSubImage1D GLEW_GET_FUN(__glewCompressedTextureSubImage1D)
+#define glCompressedTextureSubImage2D GLEW_GET_FUN(__glewCompressedTextureSubImage2D)
+#define glCompressedTextureSubImage3D GLEW_GET_FUN(__glewCompressedTextureSubImage3D)
+#define glCopyNamedBufferSubData GLEW_GET_FUN(__glewCopyNamedBufferSubData)
+#define glCopyTextureSubImage1D GLEW_GET_FUN(__glewCopyTextureSubImage1D)
+#define glCopyTextureSubImage2D GLEW_GET_FUN(__glewCopyTextureSubImage2D)
+#define glCopyTextureSubImage3D GLEW_GET_FUN(__glewCopyTextureSubImage3D)
+#define glCreateBuffers GLEW_GET_FUN(__glewCreateBuffers)
+#define glCreateFramebuffers GLEW_GET_FUN(__glewCreateFramebuffers)
+#define glCreateProgramPipelines GLEW_GET_FUN(__glewCreateProgramPipelines)
+#define glCreateQueries GLEW_GET_FUN(__glewCreateQueries)
+#define glCreateRenderbuffers GLEW_GET_FUN(__glewCreateRenderbuffers)
+#define glCreateSamplers GLEW_GET_FUN(__glewCreateSamplers)
+#define glCreateTextures GLEW_GET_FUN(__glewCreateTextures)
+#define glCreateTransformFeedbacks GLEW_GET_FUN(__glewCreateTransformFeedbacks)
+#define glCreateVertexArrays GLEW_GET_FUN(__glewCreateVertexArrays)
+#define glDisableVertexArrayAttrib GLEW_GET_FUN(__glewDisableVertexArrayAttrib)
+#define glEnableVertexArrayAttrib GLEW_GET_FUN(__glewEnableVertexArrayAttrib)
+#define glFlushMappedNamedBufferRange GLEW_GET_FUN(__glewFlushMappedNamedBufferRange)
+#define glGenerateTextureMipmap GLEW_GET_FUN(__glewGenerateTextureMipmap)
+#define glGetCompressedTextureImage GLEW_GET_FUN(__glewGetCompressedTextureImage)
+#define glGetNamedBufferParameteri64v GLEW_GET_FUN(__glewGetNamedBufferParameteri64v)
+#define glGetNamedBufferParameteriv GLEW_GET_FUN(__glewGetNamedBufferParameteriv)
+#define glGetNamedBufferPointerv GLEW_GET_FUN(__glewGetNamedBufferPointerv)
+#define glGetNamedBufferSubData GLEW_GET_FUN(__glewGetNamedBufferSubData)
+#define glGetNamedFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameteriv)
+#define glGetNamedFramebufferParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferParameteriv)
+#define glGetNamedRenderbufferParameteriv GLEW_GET_FUN(__glewGetNamedRenderbufferParameteriv)
+#define glGetQueryBufferObjecti64v GLEW_GET_FUN(__glewGetQueryBufferObjecti64v)
+#define glGetQueryBufferObjectiv GLEW_GET_FUN(__glewGetQueryBufferObjectiv)
+#define glGetQueryBufferObjectui64v GLEW_GET_FUN(__glewGetQueryBufferObjectui64v)
+#define glGetQueryBufferObjectuiv GLEW_GET_FUN(__glewGetQueryBufferObjectuiv)
+#define glGetTextureImage GLEW_GET_FUN(__glewGetTextureImage)
+#define glGetTextureLevelParameterfv GLEW_GET_FUN(__glewGetTextureLevelParameterfv)
+#define glGetTextureLevelParameteriv GLEW_GET_FUN(__glewGetTextureLevelParameteriv)
+#define glGetTextureParameterIiv GLEW_GET_FUN(__glewGetTextureParameterIiv)
+#define glGetTextureParameterIuiv GLEW_GET_FUN(__glewGetTextureParameterIuiv)
+#define glGetTextureParameterfv GLEW_GET_FUN(__glewGetTextureParameterfv)
+#define glGetTextureParameteriv GLEW_GET_FUN(__glewGetTextureParameteriv)
+#define glGetTransformFeedbacki64_v GLEW_GET_FUN(__glewGetTransformFeedbacki64_v)
+#define glGetTransformFeedbacki_v GLEW_GET_FUN(__glewGetTransformFeedbacki_v)
+#define glGetTransformFeedbackiv GLEW_GET_FUN(__glewGetTransformFeedbackiv)
+#define glGetVertexArrayIndexed64iv GLEW_GET_FUN(__glewGetVertexArrayIndexed64iv)
+#define glGetVertexArrayIndexediv GLEW_GET_FUN(__glewGetVertexArrayIndexediv)
+#define glGetVertexArrayiv GLEW_GET_FUN(__glewGetVertexArrayiv)
+#define glInvalidateNamedFramebufferData GLEW_GET_FUN(__glewInvalidateNamedFramebufferData)
+#define glInvalidateNamedFramebufferSubData GLEW_GET_FUN(__glewInvalidateNamedFramebufferSubData)
+#define glMapNamedBuffer GLEW_GET_FUN(__glewMapNamedBuffer)
+#define glMapNamedBufferRange GLEW_GET_FUN(__glewMapNamedBufferRange)
+#define glNamedBufferData GLEW_GET_FUN(__glewNamedBufferData)
+#define glNamedBufferStorage GLEW_GET_FUN(__glewNamedBufferStorage)
+#define glNamedBufferSubData GLEW_GET_FUN(__glewNamedBufferSubData)
+#define glNamedFramebufferDrawBuffer GLEW_GET_FUN(__glewNamedFramebufferDrawBuffer)
+#define glNamedFramebufferDrawBuffers GLEW_GET_FUN(__glewNamedFramebufferDrawBuffers)
+#define glNamedFramebufferParameteri GLEW_GET_FUN(__glewNamedFramebufferParameteri)
+#define glNamedFramebufferReadBuffer GLEW_GET_FUN(__glewNamedFramebufferReadBuffer)
+#define glNamedFramebufferRenderbuffer GLEW_GET_FUN(__glewNamedFramebufferRenderbuffer)
+#define glNamedFramebufferTexture GLEW_GET_FUN(__glewNamedFramebufferTexture)
+#define glNamedFramebufferTextureLayer GLEW_GET_FUN(__glewNamedFramebufferTextureLayer)
+#define glNamedRenderbufferStorage GLEW_GET_FUN(__glewNamedRenderbufferStorage)
+#define glNamedRenderbufferStorageMultisample GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisample)
+#define glTextureBuffer GLEW_GET_FUN(__glewTextureBuffer)
+#define glTextureBufferRange GLEW_GET_FUN(__glewTextureBufferRange)
+#define glTextureParameterIiv GLEW_GET_FUN(__glewTextureParameterIiv)
+#define glTextureParameterIuiv GLEW_GET_FUN(__glewTextureParameterIuiv)
+#define glTextureParameterf GLEW_GET_FUN(__glewTextureParameterf)
+#define glTextureParameterfv GLEW_GET_FUN(__glewTextureParameterfv)
+#define glTextureParameteri GLEW_GET_FUN(__glewTextureParameteri)
+#define glTextureParameteriv GLEW_GET_FUN(__glewTextureParameteriv)
+#define glTextureStorage1D GLEW_GET_FUN(__glewTextureStorage1D)
+#define glTextureStorage2D GLEW_GET_FUN(__glewTextureStorage2D)
+#define glTextureStorage2DMultisample GLEW_GET_FUN(__glewTextureStorage2DMultisample)
+#define glTextureStorage3D GLEW_GET_FUN(__glewTextureStorage3D)
+#define glTextureStorage3DMultisample GLEW_GET_FUN(__glewTextureStorage3DMultisample)
+#define glTextureSubImage1D GLEW_GET_FUN(__glewTextureSubImage1D)
+#define glTextureSubImage2D GLEW_GET_FUN(__glewTextureSubImage2D)
+#define glTextureSubImage3D GLEW_GET_FUN(__glewTextureSubImage3D)
+#define glTransformFeedbackBufferBase GLEW_GET_FUN(__glewTransformFeedbackBufferBase)
+#define glTransformFeedbackBufferRange GLEW_GET_FUN(__glewTransformFeedbackBufferRange)
+#define glUnmapNamedBuffer GLEW_GET_FUN(__glewUnmapNamedBuffer)
+#define glVertexArrayAttribBinding GLEW_GET_FUN(__glewVertexArrayAttribBinding)
+#define glVertexArrayAttribFormat GLEW_GET_FUN(__glewVertexArrayAttribFormat)
+#define glVertexArrayAttribIFormat GLEW_GET_FUN(__glewVertexArrayAttribIFormat)
+#define glVertexArrayAttribLFormat GLEW_GET_FUN(__glewVertexArrayAttribLFormat)
+#define glVertexArrayBindingDivisor GLEW_GET_FUN(__glewVertexArrayBindingDivisor)
+#define glVertexArrayElementBuffer GLEW_GET_FUN(__glewVertexArrayElementBuffer)
+#define glVertexArrayVertexBuffer GLEW_GET_FUN(__glewVertexArrayVertexBuffer)
+#define glVertexArrayVertexBuffers GLEW_GET_FUN(__glewVertexArrayVertexBuffers)
+
+#define GLEW_ARB_direct_state_access GLEW_GET_VAR(__GLEW_ARB_direct_state_access)
+
+#endif /* GL_ARB_direct_state_access */
+
+/* -------------------------- GL_ARB_draw_buffers -------------------------- */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_ARB 0x8824
+#define GL_DRAW_BUFFER0_ARB 0x8825
+#define GL_DRAW_BUFFER1_ARB 0x8826
+#define GL_DRAW_BUFFER2_ARB 0x8827
+#define GL_DRAW_BUFFER3_ARB 0x8828
+#define GL_DRAW_BUFFER4_ARB 0x8829
+#define GL_DRAW_BUFFER5_ARB 0x882A
+#define GL_DRAW_BUFFER6_ARB 0x882B
+#define GL_DRAW_BUFFER7_ARB 0x882C
+#define GL_DRAW_BUFFER8_ARB 0x882D
+#define GL_DRAW_BUFFER9_ARB 0x882E
+#define GL_DRAW_BUFFER10_ARB 0x882F
+#define GL_DRAW_BUFFER11_ARB 0x8830
+#define GL_DRAW_BUFFER12_ARB 0x8831
+#define GL_DRAW_BUFFER13_ARB 0x8832
+#define GL_DRAW_BUFFER14_ARB 0x8833
+#define GL_DRAW_BUFFER15_ARB 0x8834
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersARB GLEW_GET_FUN(__glewDrawBuffersARB)
+
+#define GLEW_ARB_draw_buffers GLEW_GET_VAR(__GLEW_ARB_draw_buffers)
+
+#endif /* GL_ARB_draw_buffers */
+
+/* ----------------------- GL_ARB_draw_buffers_blend ----------------------- */
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+
+#define glBlendEquationSeparateiARB GLEW_GET_FUN(__glewBlendEquationSeparateiARB)
+#define glBlendEquationiARB GLEW_GET_FUN(__glewBlendEquationiARB)
+#define glBlendFuncSeparateiARB GLEW_GET_FUN(__glewBlendFuncSeparateiARB)
+#define glBlendFunciARB GLEW_GET_FUN(__glewBlendFunciARB)
+
+#define GLEW_ARB_draw_buffers_blend GLEW_GET_VAR(__GLEW_ARB_draw_buffers_blend)
+
+#endif /* GL_ARB_draw_buffers_blend */
+
+/* -------------------- GL_ARB_draw_elements_base_vertex ------------------- */
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, void *indices, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, void *indices, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei* count, GLenum type, void**indices, GLsizei primcount, GLint *basevertex);
+
+#define glDrawElementsBaseVertex GLEW_GET_FUN(__glewDrawElementsBaseVertex)
+#define glDrawElementsInstancedBaseVertex GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertex)
+#define glDrawRangeElementsBaseVertex GLEW_GET_FUN(__glewDrawRangeElementsBaseVertex)
+#define glMultiDrawElementsBaseVertex GLEW_GET_FUN(__glewMultiDrawElementsBaseVertex)
+
+#define GLEW_ARB_draw_elements_base_vertex GLEW_GET_VAR(__GLEW_ARB_draw_elements_base_vertex)
+
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+/* -------------------------- GL_ARB_draw_indirect ------------------------- */
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+
+#define GL_DRAW_INDIRECT_BUFFER 0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
+
+#define glDrawArraysIndirect GLEW_GET_FUN(__glewDrawArraysIndirect)
+#define glDrawElementsIndirect GLEW_GET_FUN(__glewDrawElementsIndirect)
+
+#define GLEW_ARB_draw_indirect GLEW_GET_VAR(__GLEW_ARB_draw_indirect)
+
+#endif /* GL_ARB_draw_indirect */
+
+/* ------------------------- GL_ARB_draw_instanced ------------------------- */
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+
+#define GLEW_ARB_draw_instanced GLEW_GET_VAR(__GLEW_ARB_draw_instanced)
+
+#endif /* GL_ARB_draw_instanced */
+
+/* ------------------------ GL_ARB_enhanced_layouts ------------------------ */
+
+#ifndef GL_ARB_enhanced_layouts
+#define GL_ARB_enhanced_layouts 1
+
+#define GL_LOCATION_COMPONENT 0x934A
+#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B
+#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C
+
+#define GLEW_ARB_enhanced_layouts GLEW_GET_VAR(__GLEW_ARB_enhanced_layouts)
+
+#endif /* GL_ARB_enhanced_layouts */
+
+/* -------------------- GL_ARB_explicit_attrib_location -------------------- */
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+
+#define GLEW_ARB_explicit_attrib_location GLEW_GET_VAR(__GLEW_ARB_explicit_attrib_location)
+
+#endif /* GL_ARB_explicit_attrib_location */
+
+/* -------------------- GL_ARB_explicit_uniform_location ------------------- */
+
+#ifndef GL_ARB_explicit_uniform_location
+#define GL_ARB_explicit_uniform_location 1
+
+#define GL_MAX_UNIFORM_LOCATIONS 0x826E
+
+#define GLEW_ARB_explicit_uniform_location GLEW_GET_VAR(__GLEW_ARB_explicit_uniform_location)
+
+#endif /* GL_ARB_explicit_uniform_location */
+
+/* ------------------- GL_ARB_fragment_coord_conventions ------------------- */
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+
+#define GLEW_ARB_fragment_coord_conventions GLEW_GET_VAR(__GLEW_ARB_fragment_coord_conventions)
+
+#endif /* GL_ARB_fragment_coord_conventions */
+
+/* --------------------- GL_ARB_fragment_layer_viewport -------------------- */
+
+#ifndef GL_ARB_fragment_layer_viewport
+#define GL_ARB_fragment_layer_viewport 1
+
+#define GLEW_ARB_fragment_layer_viewport GLEW_GET_VAR(__GLEW_ARB_fragment_layer_viewport)
+
+#endif /* GL_ARB_fragment_layer_viewport */
+
+/* ------------------------ GL_ARB_fragment_program ------------------------ */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+
+#define GL_FRAGMENT_PROGRAM_ARB 0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872
+
+#define GLEW_ARB_fragment_program GLEW_GET_VAR(__GLEW_ARB_fragment_program)
+
+#endif /* GL_ARB_fragment_program */
+
+/* --------------------- GL_ARB_fragment_program_shadow -------------------- */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+
+#define GLEW_ARB_fragment_program_shadow GLEW_GET_VAR(__GLEW_ARB_fragment_program_shadow)
+
+#endif /* GL_ARB_fragment_program_shadow */
+
+/* ------------------------- GL_ARB_fragment_shader ------------------------ */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+
+#define GL_FRAGMENT_SHADER_ARB 0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+
+#define GLEW_ARB_fragment_shader GLEW_GET_VAR(__GLEW_ARB_fragment_shader)
+
+#endif /* GL_ARB_fragment_shader */
+
+/* -------------------- GL_ARB_fragment_shader_interlock ------------------- */
+
+#ifndef GL_ARB_fragment_shader_interlock
+#define GL_ARB_fragment_shader_interlock 1
+
+#define GLEW_ARB_fragment_shader_interlock GLEW_GET_VAR(__GLEW_ARB_fragment_shader_interlock)
+
+#endif /* GL_ARB_fragment_shader_interlock */
+
+/* ------------------- GL_ARB_framebuffer_no_attachments ------------------- */
+
+#ifndef GL_ARB_framebuffer_no_attachments
+#define GL_ARB_framebuffer_no_attachments 1
+
+#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310
+#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312
+#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313
+#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
+#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315
+#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316
+#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317
+#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
+
+#define glFramebufferParameteri GLEW_GET_FUN(__glewFramebufferParameteri)
+#define glGetFramebufferParameteriv GLEW_GET_FUN(__glewGetFramebufferParameteriv)
+#define glGetNamedFramebufferParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferParameterivEXT)
+#define glNamedFramebufferParameteriEXT GLEW_GET_FUN(__glewNamedFramebufferParameteriEXT)
+
+#define GLEW_ARB_framebuffer_no_attachments GLEW_GET_VAR(__GLEW_ARB_framebuffer_no_attachments)
+
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+/* ----------------------- GL_ARB_framebuffer_object ----------------------- */
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT 0x8218
+#define GL_FRAMEBUFFER_UNDEFINED 0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
+#define GL_INDEX 0x8222
+#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
+#define GL_DEPTH_STENCIL 0x84F9
+#define GL_UNSIGNED_INT_24_8 0x84FA
+#define GL_DEPTH24_STENCIL8 0x88F0
+#define GL_TEXTURE_STENCIL_SIZE 0x88F1
+#define GL_UNSIGNED_NORMALIZED 0x8C17
+#define GL_SRGB 0x8C40
+#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6
+#define GL_FRAMEBUFFER_BINDING 0x8CA6
+#define GL_RENDERBUFFER_BINDING 0x8CA7
+#define GL_READ_FRAMEBUFFER 0x8CA8
+#define GL_DRAW_FRAMEBUFFER 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA
+#define GL_RENDERBUFFER_SAMPLES 0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF
+#define GL_COLOR_ATTACHMENT0 0x8CE0
+#define GL_COLOR_ATTACHMENT1 0x8CE1
+#define GL_COLOR_ATTACHMENT2 0x8CE2
+#define GL_COLOR_ATTACHMENT3 0x8CE3
+#define GL_COLOR_ATTACHMENT4 0x8CE4
+#define GL_COLOR_ATTACHMENT5 0x8CE5
+#define GL_COLOR_ATTACHMENT6 0x8CE6
+#define GL_COLOR_ATTACHMENT7 0x8CE7
+#define GL_COLOR_ATTACHMENT8 0x8CE8
+#define GL_COLOR_ATTACHMENT9 0x8CE9
+#define GL_COLOR_ATTACHMENT10 0x8CEA
+#define GL_COLOR_ATTACHMENT11 0x8CEB
+#define GL_COLOR_ATTACHMENT12 0x8CEC
+#define GL_COLOR_ATTACHMENT13 0x8CED
+#define GL_COLOR_ATTACHMENT14 0x8CEE
+#define GL_COLOR_ATTACHMENT15 0x8CEF
+#define GL_DEPTH_ATTACHMENT 0x8D00
+#define GL_STENCIL_ATTACHMENT 0x8D20
+#define GL_FRAMEBUFFER 0x8D40
+#define GL_RENDERBUFFER 0x8D41
+#define GL_RENDERBUFFER_WIDTH 0x8D42
+#define GL_RENDERBUFFER_HEIGHT 0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
+#define GL_STENCIL_INDEX1 0x8D46
+#define GL_STENCIL_INDEX4 0x8D47
+#define GL_STENCIL_INDEX8 0x8D48
+#define GL_STENCIL_INDEX16 0x8D49
+#define GL_RENDERBUFFER_RED_SIZE 0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES 0x8D57
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer);
+typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glBindFramebuffer GLEW_GET_FUN(__glewBindFramebuffer)
+#define glBindRenderbuffer GLEW_GET_FUN(__glewBindRenderbuffer)
+#define glBlitFramebuffer GLEW_GET_FUN(__glewBlitFramebuffer)
+#define glCheckFramebufferStatus GLEW_GET_FUN(__glewCheckFramebufferStatus)
+#define glDeleteFramebuffers GLEW_GET_FUN(__glewDeleteFramebuffers)
+#define glDeleteRenderbuffers GLEW_GET_FUN(__glewDeleteRenderbuffers)
+#define glFramebufferRenderbuffer GLEW_GET_FUN(__glewFramebufferRenderbuffer)
+#define glFramebufferTexture1D GLEW_GET_FUN(__glewFramebufferTexture1D)
+#define glFramebufferTexture2D GLEW_GET_FUN(__glewFramebufferTexture2D)
+#define glFramebufferTexture3D GLEW_GET_FUN(__glewFramebufferTexture3D)
+#define glFramebufferTextureLayer GLEW_GET_FUN(__glewFramebufferTextureLayer)
+#define glGenFramebuffers GLEW_GET_FUN(__glewGenFramebuffers)
+#define glGenRenderbuffers GLEW_GET_FUN(__glewGenRenderbuffers)
+#define glGenerateMipmap GLEW_GET_FUN(__glewGenerateMipmap)
+#define glGetFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetFramebufferAttachmentParameteriv)
+#define glGetRenderbufferParameteriv GLEW_GET_FUN(__glewGetRenderbufferParameteriv)
+#define glIsFramebuffer GLEW_GET_FUN(__glewIsFramebuffer)
+#define glIsRenderbuffer GLEW_GET_FUN(__glewIsRenderbuffer)
+#define glRenderbufferStorage GLEW_GET_FUN(__glewRenderbufferStorage)
+#define glRenderbufferStorageMultisample GLEW_GET_FUN(__glewRenderbufferStorageMultisample)
+
+#define GLEW_ARB_framebuffer_object GLEW_GET_VAR(__GLEW_ARB_framebuffer_object)
+
+#endif /* GL_ARB_framebuffer_object */
+
+/* ------------------------ GL_ARB_framebuffer_sRGB ------------------------ */
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+
+#define GL_FRAMEBUFFER_SRGB 0x8DB9
+
+#define GLEW_ARB_framebuffer_sRGB GLEW_GET_VAR(__GLEW_ARB_framebuffer_sRGB)
+
+#endif /* GL_ARB_framebuffer_sRGB */
+
+/* ------------------------ GL_ARB_geometry_shader4 ------------------------ */
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+
+#define GL_LINES_ADJACENCY_ARB 0xA
+#define GL_LINE_STRIP_ADJACENCY_ARB 0xB
+#define GL_TRIANGLES_ADJACENCY_ARB 0xC
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0xD
+#define GL_PROGRAM_POINT_SIZE_ARB 0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB 0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+
+#define glFramebufferTextureARB GLEW_GET_FUN(__glewFramebufferTextureARB)
+#define glFramebufferTextureFaceARB GLEW_GET_FUN(__glewFramebufferTextureFaceARB)
+#define glFramebufferTextureLayerARB GLEW_GET_FUN(__glewFramebufferTextureLayerARB)
+#define glProgramParameteriARB GLEW_GET_FUN(__glewProgramParameteriARB)
+
+#define GLEW_ARB_geometry_shader4 GLEW_GET_VAR(__GLEW_ARB_geometry_shader4)
+
+#endif /* GL_ARB_geometry_shader4 */
+
+/* ----------------------- GL_ARB_get_program_binary ----------------------- */
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH 0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE
+#define GL_PROGRAM_BINARY_FORMATS 0x87FF
+
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, void*binary);
+typedef void (GLAPIENTRY * PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+
+#define glGetProgramBinary GLEW_GET_FUN(__glewGetProgramBinary)
+#define glProgramBinary GLEW_GET_FUN(__glewProgramBinary)
+#define glProgramParameteri GLEW_GET_FUN(__glewProgramParameteri)
+
+#define GLEW_ARB_get_program_binary GLEW_GET_VAR(__GLEW_ARB_get_program_binary)
+
+#endif /* GL_ARB_get_program_binary */
+
+/* ---------------------- GL_ARB_get_texture_sub_image --------------------- */
+
+#ifndef GL_ARB_get_texture_sub_image
+#define GL_ARB_get_texture_sub_image 1
+
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+
+#define glGetCompressedTextureSubImage GLEW_GET_FUN(__glewGetCompressedTextureSubImage)
+#define glGetTextureSubImage GLEW_GET_FUN(__glewGetTextureSubImage)
+
+#define GLEW_ARB_get_texture_sub_image GLEW_GET_VAR(__GLEW_ARB_get_texture_sub_image)
+
+#endif /* GL_ARB_get_texture_sub_image */
+
+/* ---------------------------- GL_ARB_gl_spirv ---------------------------- */
+
+#ifndef GL_ARB_gl_spirv
+#define GL_ARB_gl_spirv 1
+
+#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551
+#define GL_SPIR_V_BINARY_ARB 0x9552
+
+typedef void (GLAPIENTRY * PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar* pEntryPoint, GLuint numSpecializationConstants, const GLuint* pConstantIndex, const GLuint* pConstantValue);
+
+#define glSpecializeShaderARB GLEW_GET_FUN(__glewSpecializeShaderARB)
+
+#define GLEW_ARB_gl_spirv GLEW_GET_VAR(__GLEW_ARB_gl_spirv)
+
+#endif /* GL_ARB_gl_spirv */
+
+/* --------------------------- GL_ARB_gpu_shader5 -------------------------- */
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+
+#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS 0x8E71
+
+#define GLEW_ARB_gpu_shader5 GLEW_GET_VAR(__GLEW_ARB_gpu_shader5)
+
+#endif /* GL_ARB_gpu_shader5 */
+
+/* ------------------------- GL_ARB_gpu_shader_fp64 ------------------------ */
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+
+#define GL_DOUBLE_MAT2 0x8F46
+#define GL_DOUBLE_MAT3 0x8F47
+#define GL_DOUBLE_MAT4 0x8F48
+#define GL_DOUBLE_MAT2x3 0x8F49
+#define GL_DOUBLE_MAT2x4 0x8F4A
+#define GL_DOUBLE_MAT3x2 0x8F4B
+#define GL_DOUBLE_MAT3x4 0x8F4C
+#define GL_DOUBLE_MAT4x2 0x8F4D
+#define GL_DOUBLE_MAT4x3 0x8F4E
+#define GL_DOUBLE_VEC2 0x8FFC
+#define GL_DOUBLE_VEC3 0x8FFD
+#define GL_DOUBLE_VEC4 0x8FFE
+
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+
+#define glGetUniformdv GLEW_GET_FUN(__glewGetUniformdv)
+#define glUniform1d GLEW_GET_FUN(__glewUniform1d)
+#define glUniform1dv GLEW_GET_FUN(__glewUniform1dv)
+#define glUniform2d GLEW_GET_FUN(__glewUniform2d)
+#define glUniform2dv GLEW_GET_FUN(__glewUniform2dv)
+#define glUniform3d GLEW_GET_FUN(__glewUniform3d)
+#define glUniform3dv GLEW_GET_FUN(__glewUniform3dv)
+#define glUniform4d GLEW_GET_FUN(__glewUniform4d)
+#define glUniform4dv GLEW_GET_FUN(__glewUniform4dv)
+#define glUniformMatrix2dv GLEW_GET_FUN(__glewUniformMatrix2dv)
+#define glUniformMatrix2x3dv GLEW_GET_FUN(__glewUniformMatrix2x3dv)
+#define glUniformMatrix2x4dv GLEW_GET_FUN(__glewUniformMatrix2x4dv)
+#define glUniformMatrix3dv GLEW_GET_FUN(__glewUniformMatrix3dv)
+#define glUniformMatrix3x2dv GLEW_GET_FUN(__glewUniformMatrix3x2dv)
+#define glUniformMatrix3x4dv GLEW_GET_FUN(__glewUniformMatrix3x4dv)
+#define glUniformMatrix4dv GLEW_GET_FUN(__glewUniformMatrix4dv)
+#define glUniformMatrix4x2dv GLEW_GET_FUN(__glewUniformMatrix4x2dv)
+#define glUniformMatrix4x3dv GLEW_GET_FUN(__glewUniformMatrix4x3dv)
+
+#define GLEW_ARB_gpu_shader_fp64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_fp64)
+
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+/* ------------------------ GL_ARB_gpu_shader_int64 ------------------------ */
+
+#ifndef GL_ARB_gpu_shader_int64
+#define GL_ARB_gpu_shader_int64 1
+
+#define GL_INT64_ARB 0x140E
+#define GL_UNSIGNED_INT64_ARB 0x140F
+#define GL_INT64_VEC2_ARB 0x8FE9
+#define GL_INT64_VEC3_ARB 0x8FEA
+#define GL_INT64_VEC4_ARB 0x8FEB
+#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7
+
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value);
+
+#define glGetUniformi64vARB GLEW_GET_FUN(__glewGetUniformi64vARB)
+#define glGetUniformui64vARB GLEW_GET_FUN(__glewGetUniformui64vARB)
+#define glGetnUniformi64vARB GLEW_GET_FUN(__glewGetnUniformi64vARB)
+#define glGetnUniformui64vARB GLEW_GET_FUN(__glewGetnUniformui64vARB)
+#define glProgramUniform1i64ARB GLEW_GET_FUN(__glewProgramUniform1i64ARB)
+#define glProgramUniform1i64vARB GLEW_GET_FUN(__glewProgramUniform1i64vARB)
+#define glProgramUniform1ui64ARB GLEW_GET_FUN(__glewProgramUniform1ui64ARB)
+#define glProgramUniform1ui64vARB GLEW_GET_FUN(__glewProgramUniform1ui64vARB)
+#define glProgramUniform2i64ARB GLEW_GET_FUN(__glewProgramUniform2i64ARB)
+#define glProgramUniform2i64vARB GLEW_GET_FUN(__glewProgramUniform2i64vARB)
+#define glProgramUniform2ui64ARB GLEW_GET_FUN(__glewProgramUniform2ui64ARB)
+#define glProgramUniform2ui64vARB GLEW_GET_FUN(__glewProgramUniform2ui64vARB)
+#define glProgramUniform3i64ARB GLEW_GET_FUN(__glewProgramUniform3i64ARB)
+#define glProgramUniform3i64vARB GLEW_GET_FUN(__glewProgramUniform3i64vARB)
+#define glProgramUniform3ui64ARB GLEW_GET_FUN(__glewProgramUniform3ui64ARB)
+#define glProgramUniform3ui64vARB GLEW_GET_FUN(__glewProgramUniform3ui64vARB)
+#define glProgramUniform4i64ARB GLEW_GET_FUN(__glewProgramUniform4i64ARB)
+#define glProgramUniform4i64vARB GLEW_GET_FUN(__glewProgramUniform4i64vARB)
+#define glProgramUniform4ui64ARB GLEW_GET_FUN(__glewProgramUniform4ui64ARB)
+#define glProgramUniform4ui64vARB GLEW_GET_FUN(__glewProgramUniform4ui64vARB)
+#define glUniform1i64ARB GLEW_GET_FUN(__glewUniform1i64ARB)
+#define glUniform1i64vARB GLEW_GET_FUN(__glewUniform1i64vARB)
+#define glUniform1ui64ARB GLEW_GET_FUN(__glewUniform1ui64ARB)
+#define glUniform1ui64vARB GLEW_GET_FUN(__glewUniform1ui64vARB)
+#define glUniform2i64ARB GLEW_GET_FUN(__glewUniform2i64ARB)
+#define glUniform2i64vARB GLEW_GET_FUN(__glewUniform2i64vARB)
+#define glUniform2ui64ARB GLEW_GET_FUN(__glewUniform2ui64ARB)
+#define glUniform2ui64vARB GLEW_GET_FUN(__glewUniform2ui64vARB)
+#define glUniform3i64ARB GLEW_GET_FUN(__glewUniform3i64ARB)
+#define glUniform3i64vARB GLEW_GET_FUN(__glewUniform3i64vARB)
+#define glUniform3ui64ARB GLEW_GET_FUN(__glewUniform3ui64ARB)
+#define glUniform3ui64vARB GLEW_GET_FUN(__glewUniform3ui64vARB)
+#define glUniform4i64ARB GLEW_GET_FUN(__glewUniform4i64ARB)
+#define glUniform4i64vARB GLEW_GET_FUN(__glewUniform4i64vARB)
+#define glUniform4ui64ARB GLEW_GET_FUN(__glewUniform4ui64ARB)
+#define glUniform4ui64vARB GLEW_GET_FUN(__glewUniform4ui64vARB)
+
+#define GLEW_ARB_gpu_shader_int64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_int64)
+
+#endif /* GL_ARB_gpu_shader_int64 */
+
+/* ------------------------ GL_ARB_half_float_pixel ------------------------ */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+
+#define GL_HALF_FLOAT_ARB 0x140B
+
+#define GLEW_ARB_half_float_pixel GLEW_GET_VAR(__GLEW_ARB_half_float_pixel)
+
+#endif /* GL_ARB_half_float_pixel */
+
+/* ------------------------ GL_ARB_half_float_vertex ----------------------- */
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+
+#define GL_HALF_FLOAT 0x140B
+
+#define GLEW_ARB_half_float_vertex GLEW_GET_VAR(__GLEW_ARB_half_float_vertex)
+
+#endif /* GL_ARB_half_float_vertex */
+
+/* ----------------------------- GL_ARB_imaging ---------------------------- */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_IGNORE_BORDER 0x8150
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_WRAP_BORDER 0x8152
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+
+typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, void *values);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (GLAPIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+
+#define glColorSubTable GLEW_GET_FUN(__glewColorSubTable)
+#define glColorTable GLEW_GET_FUN(__glewColorTable)
+#define glColorTableParameterfv GLEW_GET_FUN(__glewColorTableParameterfv)
+#define glColorTableParameteriv GLEW_GET_FUN(__glewColorTableParameteriv)
+#define glConvolutionFilter1D GLEW_GET_FUN(__glewConvolutionFilter1D)
+#define glConvolutionFilter2D GLEW_GET_FUN(__glewConvolutionFilter2D)
+#define glConvolutionParameterf GLEW_GET_FUN(__glewConvolutionParameterf)
+#define glConvolutionParameterfv GLEW_GET_FUN(__glewConvolutionParameterfv)
+#define glConvolutionParameteri GLEW_GET_FUN(__glewConvolutionParameteri)
+#define glConvolutionParameteriv GLEW_GET_FUN(__glewConvolutionParameteriv)
+#define glCopyColorSubTable GLEW_GET_FUN(__glewCopyColorSubTable)
+#define glCopyColorTable GLEW_GET_FUN(__glewCopyColorTable)
+#define glCopyConvolutionFilter1D GLEW_GET_FUN(__glewCopyConvolutionFilter1D)
+#define glCopyConvolutionFilter2D GLEW_GET_FUN(__glewCopyConvolutionFilter2D)
+#define glGetColorTable GLEW_GET_FUN(__glewGetColorTable)
+#define glGetColorTableParameterfv GLEW_GET_FUN(__glewGetColorTableParameterfv)
+#define glGetColorTableParameteriv GLEW_GET_FUN(__glewGetColorTableParameteriv)
+#define glGetConvolutionFilter GLEW_GET_FUN(__glewGetConvolutionFilter)
+#define glGetConvolutionParameterfv GLEW_GET_FUN(__glewGetConvolutionParameterfv)
+#define glGetConvolutionParameteriv GLEW_GET_FUN(__glewGetConvolutionParameteriv)
+#define glGetHistogram GLEW_GET_FUN(__glewGetHistogram)
+#define glGetHistogramParameterfv GLEW_GET_FUN(__glewGetHistogramParameterfv)
+#define glGetHistogramParameteriv GLEW_GET_FUN(__glewGetHistogramParameteriv)
+#define glGetMinmax GLEW_GET_FUN(__glewGetMinmax)
+#define glGetMinmaxParameterfv GLEW_GET_FUN(__glewGetMinmaxParameterfv)
+#define glGetMinmaxParameteriv GLEW_GET_FUN(__glewGetMinmaxParameteriv)
+#define glGetSeparableFilter GLEW_GET_FUN(__glewGetSeparableFilter)
+#define glHistogram GLEW_GET_FUN(__glewHistogram)
+#define glMinmax GLEW_GET_FUN(__glewMinmax)
+#define glResetHistogram GLEW_GET_FUN(__glewResetHistogram)
+#define glResetMinmax GLEW_GET_FUN(__glewResetMinmax)
+#define glSeparableFilter2D GLEW_GET_FUN(__glewSeparableFilter2D)
+
+#define GLEW_ARB_imaging GLEW_GET_VAR(__GLEW_ARB_imaging)
+
+#endif /* GL_ARB_imaging */
+
+/* ----------------------- GL_ARB_indirect_parameters ---------------------- */
+
+#ifndef GL_ARB_indirect_parameters
+#define GL_ARB_indirect_parameters 1
+
+#define GL_PARAMETER_BUFFER_ARB 0x80EE
+#define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+
+#define glMultiDrawArraysIndirectCountARB GLEW_GET_FUN(__glewMultiDrawArraysIndirectCountARB)
+#define glMultiDrawElementsIndirectCountARB GLEW_GET_FUN(__glewMultiDrawElementsIndirectCountARB)
+
+#define GLEW_ARB_indirect_parameters GLEW_GET_VAR(__GLEW_ARB_indirect_parameters)
+
+#endif /* GL_ARB_indirect_parameters */
+
+/* ------------------------ GL_ARB_instanced_arrays ------------------------ */
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+
+#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB)
+#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB)
+#define glVertexAttribDivisorARB GLEW_GET_FUN(__glewVertexAttribDivisorARB)
+
+#define GLEW_ARB_instanced_arrays GLEW_GET_VAR(__GLEW_ARB_instanced_arrays)
+
+#endif /* GL_ARB_instanced_arrays */
+
+/* ---------------------- GL_ARB_internalformat_query ---------------------- */
+
+#ifndef GL_ARB_internalformat_query
+#define GL_ARB_internalformat_query 1
+
+#define GL_NUM_SAMPLE_COUNTS 0x9380
+
+typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
+
+#define glGetInternalformativ GLEW_GET_FUN(__glewGetInternalformativ)
+
+#define GLEW_ARB_internalformat_query GLEW_GET_VAR(__GLEW_ARB_internalformat_query)
+
+#endif /* GL_ARB_internalformat_query */
+
+/* ---------------------- GL_ARB_internalformat_query2 --------------------- */
+
+#ifndef GL_ARB_internalformat_query2
+#define GL_ARB_internalformat_query2 1
+
+#define GL_INTERNALFORMAT_SUPPORTED 0x826F
+#define GL_INTERNALFORMAT_PREFERRED 0x8270
+#define GL_INTERNALFORMAT_RED_SIZE 0x8271
+#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272
+#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273
+#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274
+#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275
+#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276
+#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277
+#define GL_INTERNALFORMAT_RED_TYPE 0x8278
+#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279
+#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A
+#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B
+#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C
+#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D
+#define GL_MAX_WIDTH 0x827E
+#define GL_MAX_HEIGHT 0x827F
+#define GL_MAX_DEPTH 0x8280
+#define GL_MAX_LAYERS 0x8281
+#define GL_MAX_COMBINED_DIMENSIONS 0x8282
+#define GL_COLOR_COMPONENTS 0x8283
+#define GL_DEPTH_COMPONENTS 0x8284
+#define GL_STENCIL_COMPONENTS 0x8285
+#define GL_COLOR_RENDERABLE 0x8286
+#define GL_DEPTH_RENDERABLE 0x8287
+#define GL_STENCIL_RENDERABLE 0x8288
+#define GL_FRAMEBUFFER_RENDERABLE 0x8289
+#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
+#define GL_FRAMEBUFFER_BLEND 0x828B
+#define GL_READ_PIXELS 0x828C
+#define GL_READ_PIXELS_FORMAT 0x828D
+#define GL_READ_PIXELS_TYPE 0x828E
+#define GL_TEXTURE_IMAGE_FORMAT 0x828F
+#define GL_TEXTURE_IMAGE_TYPE 0x8290
+#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291
+#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292
+#define GL_MIPMAP 0x8293
+#define GL_MANUAL_GENERATE_MIPMAP 0x8294
+#define GL_AUTO_GENERATE_MIPMAP 0x8295
+#define GL_COLOR_ENCODING 0x8296
+#define GL_SRGB_READ 0x8297
+#define GL_SRGB_WRITE 0x8298
+#define GL_SRGB_DECODE_ARB 0x8299
+#define GL_FILTER 0x829A
+#define GL_VERTEX_TEXTURE 0x829B
+#define GL_TESS_CONTROL_TEXTURE 0x829C
+#define GL_TESS_EVALUATION_TEXTURE 0x829D
+#define GL_GEOMETRY_TEXTURE 0x829E
+#define GL_FRAGMENT_TEXTURE 0x829F
+#define GL_COMPUTE_TEXTURE 0x82A0
+#define GL_TEXTURE_SHADOW 0x82A1
+#define GL_TEXTURE_GATHER 0x82A2
+#define GL_TEXTURE_GATHER_SHADOW 0x82A3
+#define GL_SHADER_IMAGE_LOAD 0x82A4
+#define GL_SHADER_IMAGE_STORE 0x82A5
+#define GL_SHADER_IMAGE_ATOMIC 0x82A6
+#define GL_IMAGE_TEXEL_SIZE 0x82A7
+#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8
+#define GL_IMAGE_PIXEL_FORMAT 0x82A9
+#define GL_IMAGE_PIXEL_TYPE 0x82AA
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
+#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
+#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
+#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3
+#define GL_CLEAR_BUFFER 0x82B4
+#define GL_TEXTURE_VIEW 0x82B5
+#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6
+#define GL_FULL_SUPPORT 0x82B7
+#define GL_CAVEAT_SUPPORT 0x82B8
+#define GL_IMAGE_CLASS_4_X_32 0x82B9
+#define GL_IMAGE_CLASS_2_X_32 0x82BA
+#define GL_IMAGE_CLASS_1_X_32 0x82BB
+#define GL_IMAGE_CLASS_4_X_16 0x82BC
+#define GL_IMAGE_CLASS_2_X_16 0x82BD
+#define GL_IMAGE_CLASS_1_X_16 0x82BE
+#define GL_IMAGE_CLASS_4_X_8 0x82BF
+#define GL_IMAGE_CLASS_2_X_8 0x82C0
+#define GL_IMAGE_CLASS_1_X_8 0x82C1
+#define GL_IMAGE_CLASS_11_11_10 0x82C2
+#define GL_IMAGE_CLASS_10_10_10_2 0x82C3
+#define GL_VIEW_CLASS_128_BITS 0x82C4
+#define GL_VIEW_CLASS_96_BITS 0x82C5
+#define GL_VIEW_CLASS_64_BITS 0x82C6
+#define GL_VIEW_CLASS_48_BITS 0x82C7
+#define GL_VIEW_CLASS_32_BITS 0x82C8
+#define GL_VIEW_CLASS_24_BITS 0x82C9
+#define GL_VIEW_CLASS_16_BITS 0x82CA
+#define GL_VIEW_CLASS_8_BITS 0x82CB
+#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC
+#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD
+#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE
+#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF
+#define GL_VIEW_CLASS_RGTC1_RED 0x82D0
+#define GL_VIEW_CLASS_RGTC2_RG 0x82D1
+#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2
+#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3
+
+typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params);
+
+#define glGetInternalformati64v GLEW_GET_FUN(__glewGetInternalformati64v)
+
+#define GLEW_ARB_internalformat_query2 GLEW_GET_VAR(__GLEW_ARB_internalformat_query2)
+
+#endif /* GL_ARB_internalformat_query2 */
+
+/* ----------------------- GL_ARB_invalidate_subdata ----------------------- */
+
+#ifndef GL_ARB_invalidate_subdata
+#define GL_ARB_invalidate_subdata 1
+
+typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (GLAPIENTRY * PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments);
+typedef void (GLAPIENTRY * PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+
+#define glInvalidateBufferData GLEW_GET_FUN(__glewInvalidateBufferData)
+#define glInvalidateBufferSubData GLEW_GET_FUN(__glewInvalidateBufferSubData)
+#define glInvalidateFramebuffer GLEW_GET_FUN(__glewInvalidateFramebuffer)
+#define glInvalidateSubFramebuffer GLEW_GET_FUN(__glewInvalidateSubFramebuffer)
+#define glInvalidateTexImage GLEW_GET_FUN(__glewInvalidateTexImage)
+#define glInvalidateTexSubImage GLEW_GET_FUN(__glewInvalidateTexSubImage)
+
+#define GLEW_ARB_invalidate_subdata GLEW_GET_VAR(__GLEW_ARB_invalidate_subdata)
+
+#endif /* GL_ARB_invalidate_subdata */
+
+/* ---------------------- GL_ARB_map_buffer_alignment ---------------------- */
+
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+
+#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC
+
+#define GLEW_ARB_map_buffer_alignment GLEW_GET_VAR(__GLEW_ARB_map_buffer_alignment)
+
+#endif /* GL_ARB_map_buffer_alignment */
+
+/* ------------------------ GL_ARB_map_buffer_range ------------------------ */
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+
+#define GL_MAP_READ_BIT 0x0001
+#define GL_MAP_WRITE_BIT 0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020
+
+typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void * (GLAPIENTRY * PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+
+#define glFlushMappedBufferRange GLEW_GET_FUN(__glewFlushMappedBufferRange)
+#define glMapBufferRange GLEW_GET_FUN(__glewMapBufferRange)
+
+#define GLEW_ARB_map_buffer_range GLEW_GET_VAR(__GLEW_ARB_map_buffer_range)
+
+#endif /* GL_ARB_map_buffer_range */
+
+/* ------------------------- GL_ARB_matrix_palette ------------------------- */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+
+#define GL_MATRIX_PALETTE_ARB 0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+
+typedef void (GLAPIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, GLubyte *indices);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, GLuint *indices);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, GLushort *indices);
+
+#define glCurrentPaletteMatrixARB GLEW_GET_FUN(__glewCurrentPaletteMatrixARB)
+#define glMatrixIndexPointerARB GLEW_GET_FUN(__glewMatrixIndexPointerARB)
+#define glMatrixIndexubvARB GLEW_GET_FUN(__glewMatrixIndexubvARB)
+#define glMatrixIndexuivARB GLEW_GET_FUN(__glewMatrixIndexuivARB)
+#define glMatrixIndexusvARB GLEW_GET_FUN(__glewMatrixIndexusvARB)
+
+#define GLEW_ARB_matrix_palette GLEW_GET_VAR(__GLEW_ARB_matrix_palette)
+
+#endif /* GL_ARB_matrix_palette */
+
+/* --------------------------- GL_ARB_multi_bind --------------------------- */
+
+#ifndef GL_ARB_multi_bind
+#define GL_ARB_multi_bind 1
+
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures);
+typedef void (GLAPIENTRY * PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint* samplers);
+typedef void (GLAPIENTRY * PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures);
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides);
+
+#define glBindBuffersBase GLEW_GET_FUN(__glewBindBuffersBase)
+#define glBindBuffersRange GLEW_GET_FUN(__glewBindBuffersRange)
+#define glBindImageTextures GLEW_GET_FUN(__glewBindImageTextures)
+#define glBindSamplers GLEW_GET_FUN(__glewBindSamplers)
+#define glBindTextures GLEW_GET_FUN(__glewBindTextures)
+#define glBindVertexBuffers GLEW_GET_FUN(__glewBindVertexBuffers)
+
+#define GLEW_ARB_multi_bind GLEW_GET_VAR(__GLEW_ARB_multi_bind)
+
+#endif /* GL_ARB_multi_bind */
+
+/* ----------------------- GL_ARB_multi_draw_indirect ---------------------- */
+
+#ifndef GL_ARB_multi_draw_indirect
+#define GL_ARB_multi_draw_indirect 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+
+#define glMultiDrawArraysIndirect GLEW_GET_FUN(__glewMultiDrawArraysIndirect)
+#define glMultiDrawElementsIndirect GLEW_GET_FUN(__glewMultiDrawElementsIndirect)
+
+#define GLEW_ARB_multi_draw_indirect GLEW_GET_VAR(__GLEW_ARB_multi_draw_indirect)
+
+#endif /* GL_ARB_multi_draw_indirect */
+
+/* --------------------------- GL_ARB_multisample -------------------------- */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+
+#define GL_MULTISAMPLE_ARB 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
+#define GL_SAMPLE_COVERAGE_ARB 0x80A0
+#define GL_SAMPLE_BUFFERS_ARB 0x80A8
+#define GL_SAMPLES_ARB 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
+#define GL_MULTISAMPLE_BIT_ARB 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+
+#define glSampleCoverageARB GLEW_GET_FUN(__glewSampleCoverageARB)
+
+#define GLEW_ARB_multisample GLEW_GET_VAR(__GLEW_ARB_multisample)
+
+#endif /* GL_ARB_multisample */
+
+/* -------------------------- GL_ARB_multitexture -------------------------- */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+
+typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#define glActiveTextureARB GLEW_GET_FUN(__glewActiveTextureARB)
+#define glClientActiveTextureARB GLEW_GET_FUN(__glewClientActiveTextureARB)
+#define glMultiTexCoord1dARB GLEW_GET_FUN(__glewMultiTexCoord1dARB)
+#define glMultiTexCoord1dvARB GLEW_GET_FUN(__glewMultiTexCoord1dvARB)
+#define glMultiTexCoord1fARB GLEW_GET_FUN(__glewMultiTexCoord1fARB)
+#define glMultiTexCoord1fvARB GLEW_GET_FUN(__glewMultiTexCoord1fvARB)
+#define glMultiTexCoord1iARB GLEW_GET_FUN(__glewMultiTexCoord1iARB)
+#define glMultiTexCoord1ivARB GLEW_GET_FUN(__glewMultiTexCoord1ivARB)
+#define glMultiTexCoord1sARB GLEW_GET_FUN(__glewMultiTexCoord1sARB)
+#define glMultiTexCoord1svARB GLEW_GET_FUN(__glewMultiTexCoord1svARB)
+#define glMultiTexCoord2dARB GLEW_GET_FUN(__glewMultiTexCoord2dARB)
+#define glMultiTexCoord2dvARB GLEW_GET_FUN(__glewMultiTexCoord2dvARB)
+#define glMultiTexCoord2fARB GLEW_GET_FUN(__glewMultiTexCoord2fARB)
+#define glMultiTexCoord2fvARB GLEW_GET_FUN(__glewMultiTexCoord2fvARB)
+#define glMultiTexCoord2iARB GLEW_GET_FUN(__glewMultiTexCoord2iARB)
+#define glMultiTexCoord2ivARB GLEW_GET_FUN(__glewMultiTexCoord2ivARB)
+#define glMultiTexCoord2sARB GLEW_GET_FUN(__glewMultiTexCoord2sARB)
+#define glMultiTexCoord2svARB GLEW_GET_FUN(__glewMultiTexCoord2svARB)
+#define glMultiTexCoord3dARB GLEW_GET_FUN(__glewMultiTexCoord3dARB)
+#define glMultiTexCoord3dvARB GLEW_GET_FUN(__glewMultiTexCoord3dvARB)
+#define glMultiTexCoord3fARB GLEW_GET_FUN(__glewMultiTexCoord3fARB)
+#define glMultiTexCoord3fvARB GLEW_GET_FUN(__glewMultiTexCoord3fvARB)
+#define glMultiTexCoord3iARB GLEW_GET_FUN(__glewMultiTexCoord3iARB)
+#define glMultiTexCoord3ivARB GLEW_GET_FUN(__glewMultiTexCoord3ivARB)
+#define glMultiTexCoord3sARB GLEW_GET_FUN(__glewMultiTexCoord3sARB)
+#define glMultiTexCoord3svARB GLEW_GET_FUN(__glewMultiTexCoord3svARB)
+#define glMultiTexCoord4dARB GLEW_GET_FUN(__glewMultiTexCoord4dARB)
+#define glMultiTexCoord4dvARB GLEW_GET_FUN(__glewMultiTexCoord4dvARB)
+#define glMultiTexCoord4fARB GLEW_GET_FUN(__glewMultiTexCoord4fARB)
+#define glMultiTexCoord4fvARB GLEW_GET_FUN(__glewMultiTexCoord4fvARB)
+#define glMultiTexCoord4iARB GLEW_GET_FUN(__glewMultiTexCoord4iARB)
+#define glMultiTexCoord4ivARB GLEW_GET_FUN(__glewMultiTexCoord4ivARB)
+#define glMultiTexCoord4sARB GLEW_GET_FUN(__glewMultiTexCoord4sARB)
+#define glMultiTexCoord4svARB GLEW_GET_FUN(__glewMultiTexCoord4svARB)
+
+#define GLEW_ARB_multitexture GLEW_GET_VAR(__GLEW_ARB_multitexture)
+
+#endif /* GL_ARB_multitexture */
+
+/* ------------------------- GL_ARB_occlusion_query ------------------------ */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+
+#define GL_QUERY_COUNTER_BITS_ARB 0x8864
+#define GL_CURRENT_QUERY_ARB 0x8865
+#define GL_QUERY_RESULT_ARB 0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867
+#define GL_SAMPLES_PASSED_ARB 0x8914
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYARBPROC) (GLuint id);
+
+#define glBeginQueryARB GLEW_GET_FUN(__glewBeginQueryARB)
+#define glDeleteQueriesARB GLEW_GET_FUN(__glewDeleteQueriesARB)
+#define glEndQueryARB GLEW_GET_FUN(__glewEndQueryARB)
+#define glGenQueriesARB GLEW_GET_FUN(__glewGenQueriesARB)
+#define glGetQueryObjectivARB GLEW_GET_FUN(__glewGetQueryObjectivARB)
+#define glGetQueryObjectuivARB GLEW_GET_FUN(__glewGetQueryObjectuivARB)
+#define glGetQueryivARB GLEW_GET_FUN(__glewGetQueryivARB)
+#define glIsQueryARB GLEW_GET_FUN(__glewIsQueryARB)
+
+#define GLEW_ARB_occlusion_query GLEW_GET_VAR(__GLEW_ARB_occlusion_query)
+
+#endif /* GL_ARB_occlusion_query */
+
+/* ------------------------ GL_ARB_occlusion_query2 ------------------------ */
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+
+#define GL_ANY_SAMPLES_PASSED 0x8C2F
+
+#define GLEW_ARB_occlusion_query2 GLEW_GET_VAR(__GLEW_ARB_occlusion_query2)
+
+#endif /* GL_ARB_occlusion_query2 */
+
+/* --------------------- GL_ARB_parallel_shader_compile -------------------- */
+
+#ifndef GL_ARB_parallel_shader_compile
+#define GL_ARB_parallel_shader_compile 1
+
+#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0
+#define GL_COMPLETION_STATUS_ARB 0x91B1
+
+typedef void (GLAPIENTRY * PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count);
+
+#define glMaxShaderCompilerThreadsARB GLEW_GET_FUN(__glewMaxShaderCompilerThreadsARB)
+
+#define GLEW_ARB_parallel_shader_compile GLEW_GET_VAR(__GLEW_ARB_parallel_shader_compile)
+
+#endif /* GL_ARB_parallel_shader_compile */
+
+/* -------------------- GL_ARB_pipeline_statistics_query ------------------- */
+
+#ifndef GL_ARB_pipeline_statistics_query
+#define GL_ARB_pipeline_statistics_query 1
+
+#define GL_VERTICES_SUBMITTED_ARB 0x82EE
+#define GL_PRIMITIVES_SUBMITTED_ARB 0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS_ARB 0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES_ARB 0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7
+#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F
+
+#define GLEW_ARB_pipeline_statistics_query GLEW_GET_VAR(__GLEW_ARB_pipeline_statistics_query)
+
+#endif /* GL_ARB_pipeline_statistics_query */
+
+/* ----------------------- GL_ARB_pixel_buffer_object ---------------------- */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+
+#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+
+#define GLEW_ARB_pixel_buffer_object GLEW_GET_VAR(__GLEW_ARB_pixel_buffer_object)
+
+#endif /* GL_ARB_pixel_buffer_object */
+
+/* ------------------------ GL_ARB_point_parameters ------------------------ */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat* params);
+
+#define glPointParameterfARB GLEW_GET_FUN(__glewPointParameterfARB)
+#define glPointParameterfvARB GLEW_GET_FUN(__glewPointParameterfvARB)
+
+#define GLEW_ARB_point_parameters GLEW_GET_VAR(__GLEW_ARB_point_parameters)
+
+#endif /* GL_ARB_point_parameters */
+
+/* -------------------------- GL_ARB_point_sprite -------------------------- */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+
+#define GL_POINT_SPRITE_ARB 0x8861
+#define GL_COORD_REPLACE_ARB 0x8862
+
+#define GLEW_ARB_point_sprite GLEW_GET_VAR(__GLEW_ARB_point_sprite)
+
+#endif /* GL_ARB_point_sprite */
+
+/* ---------------------- GL_ARB_polygon_offset_clamp ---------------------- */
+
+#ifndef GL_ARB_polygon_offset_clamp
+#define GL_ARB_polygon_offset_clamp 1
+
+#define GL_POLYGON_OFFSET_CLAMP 0x8E1B
+
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETCLAMPPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+
+#define glPolygonOffsetClamp GLEW_GET_FUN(__glewPolygonOffsetClamp)
+
+#define GLEW_ARB_polygon_offset_clamp GLEW_GET_VAR(__GLEW_ARB_polygon_offset_clamp)
+
+#endif /* GL_ARB_polygon_offset_clamp */
+
+/* ----------------------- GL_ARB_post_depth_coverage ---------------------- */
+
+#ifndef GL_ARB_post_depth_coverage
+#define GL_ARB_post_depth_coverage 1
+
+#define GLEW_ARB_post_depth_coverage GLEW_GET_VAR(__GLEW_ARB_post_depth_coverage)
+
+#endif /* GL_ARB_post_depth_coverage */
+
+/* --------------------- GL_ARB_program_interface_query -------------------- */
+
+#ifndef GL_ARB_program_interface_query
+#define GL_ARB_program_interface_query 1
+
+#define GL_UNIFORM 0x92E1
+#define GL_UNIFORM_BLOCK 0x92E2
+#define GL_PROGRAM_INPUT 0x92E3
+#define GL_PROGRAM_OUTPUT 0x92E4
+#define GL_BUFFER_VARIABLE 0x92E5
+#define GL_SHADER_STORAGE_BLOCK 0x92E6
+#define GL_IS_PER_PATCH 0x92E7
+#define GL_VERTEX_SUBROUTINE 0x92E8
+#define GL_TESS_CONTROL_SUBROUTINE 0x92E9
+#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA
+#define GL_GEOMETRY_SUBROUTINE 0x92EB
+#define GL_FRAGMENT_SUBROUTINE 0x92EC
+#define GL_COMPUTE_SUBROUTINE 0x92ED
+#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE
+#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
+#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
+#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1
+#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2
+#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3
+#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4
+#define GL_ACTIVE_RESOURCES 0x92F5
+#define GL_MAX_NAME_LENGTH 0x92F6
+#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7
+#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
+#define GL_NAME_LENGTH 0x92F9
+#define GL_TYPE 0x92FA
+#define GL_ARRAY_SIZE 0x92FB
+#define GL_OFFSET 0x92FC
+#define GL_BLOCK_INDEX 0x92FD
+#define GL_ARRAY_STRIDE 0x92FE
+#define GL_MATRIX_STRIDE 0x92FF
+#define GL_IS_ROW_MAJOR 0x9300
+#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301
+#define GL_BUFFER_BINDING 0x9302
+#define GL_BUFFER_DATA_SIZE 0x9303
+#define GL_NUM_ACTIVE_VARIABLES 0x9304
+#define GL_ACTIVE_VARIABLES 0x9305
+#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306
+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
+#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309
+#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A
+#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B
+#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C
+#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D
+#define GL_LOCATION 0x930E
+#define GL_LOCATION_INDEX 0x930F
+
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint* params);
+typedef GLuint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name);
+typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar* name);
+typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar *name);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLint *params);
+
+#define glGetProgramInterfaceiv GLEW_GET_FUN(__glewGetProgramInterfaceiv)
+#define glGetProgramResourceIndex GLEW_GET_FUN(__glewGetProgramResourceIndex)
+#define glGetProgramResourceLocation GLEW_GET_FUN(__glewGetProgramResourceLocation)
+#define glGetProgramResourceLocationIndex GLEW_GET_FUN(__glewGetProgramResourceLocationIndex)
+#define glGetProgramResourceName GLEW_GET_FUN(__glewGetProgramResourceName)
+#define glGetProgramResourceiv GLEW_GET_FUN(__glewGetProgramResourceiv)
+
+#define GLEW_ARB_program_interface_query GLEW_GET_VAR(__GLEW_ARB_program_interface_query)
+
+#endif /* GL_ARB_program_interface_query */
+
+/* ------------------------ GL_ARB_provoking_vertex ------------------------ */
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION 0x8E4D
+#define GL_LAST_VERTEX_CONVENTION 0x8E4E
+#define GL_PROVOKING_VERTEX 0x8E4F
+
+typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+
+#define glProvokingVertex GLEW_GET_FUN(__glewProvokingVertex)
+
+#define GLEW_ARB_provoking_vertex GLEW_GET_VAR(__GLEW_ARB_provoking_vertex)
+
+#endif /* GL_ARB_provoking_vertex */
+
+/* ----------------------- GL_ARB_query_buffer_object ---------------------- */
+
+#ifndef GL_ARB_query_buffer_object
+#define GL_ARB_query_buffer_object 1
+
+#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000
+#define GL_QUERY_BUFFER 0x9192
+#define GL_QUERY_BUFFER_BINDING 0x9193
+#define GL_QUERY_RESULT_NO_WAIT 0x9194
+
+#define GLEW_ARB_query_buffer_object GLEW_GET_VAR(__GLEW_ARB_query_buffer_object)
+
+#endif /* GL_ARB_query_buffer_object */
+
+/* ------------------ GL_ARB_robust_buffer_access_behavior ----------------- */
+
+#ifndef GL_ARB_robust_buffer_access_behavior
+#define GL_ARB_robust_buffer_access_behavior 1
+
+#define GLEW_ARB_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_ARB_robust_buffer_access_behavior)
+
+#endif /* GL_ARB_robust_buffer_access_behavior */
+
+/* --------------------------- GL_ARB_robustness --------------------------- */
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB 0x8261
+
+typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* table);
+typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void* img);
+typedef void (GLAPIENTRY * PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* image);
+typedef void (GLAPIENTRY * PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values);
+typedef void (GLAPIENTRY * PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint* v);
+typedef void (GLAPIENTRY * PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values);
+typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat* values);
+typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint* values);
+typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort* values);
+typedef void (GLAPIENTRY * PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte* pattern);
+typedef void (GLAPIENTRY * PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, void*column, void*span);
+typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void* data);
+
+#define glGetGraphicsResetStatusARB GLEW_GET_FUN(__glewGetGraphicsResetStatusARB)
+#define glGetnColorTableARB GLEW_GET_FUN(__glewGetnColorTableARB)
+#define glGetnCompressedTexImageARB GLEW_GET_FUN(__glewGetnCompressedTexImageARB)
+#define glGetnConvolutionFilterARB GLEW_GET_FUN(__glewGetnConvolutionFilterARB)
+#define glGetnHistogramARB GLEW_GET_FUN(__glewGetnHistogramARB)
+#define glGetnMapdvARB GLEW_GET_FUN(__glewGetnMapdvARB)
+#define glGetnMapfvARB GLEW_GET_FUN(__glewGetnMapfvARB)
+#define glGetnMapivARB GLEW_GET_FUN(__glewGetnMapivARB)
+#define glGetnMinmaxARB GLEW_GET_FUN(__glewGetnMinmaxARB)
+#define glGetnPixelMapfvARB GLEW_GET_FUN(__glewGetnPixelMapfvARB)
+#define glGetnPixelMapuivARB GLEW_GET_FUN(__glewGetnPixelMapuivARB)
+#define glGetnPixelMapusvARB GLEW_GET_FUN(__glewGetnPixelMapusvARB)
+#define glGetnPolygonStippleARB GLEW_GET_FUN(__glewGetnPolygonStippleARB)
+#define glGetnSeparableFilterARB GLEW_GET_FUN(__glewGetnSeparableFilterARB)
+#define glGetnTexImageARB GLEW_GET_FUN(__glewGetnTexImageARB)
+#define glGetnUniformdvARB GLEW_GET_FUN(__glewGetnUniformdvARB)
+#define glGetnUniformfvARB GLEW_GET_FUN(__glewGetnUniformfvARB)
+#define glGetnUniformivARB GLEW_GET_FUN(__glewGetnUniformivARB)
+#define glGetnUniformuivARB GLEW_GET_FUN(__glewGetnUniformuivARB)
+#define glReadnPixelsARB GLEW_GET_FUN(__glewReadnPixelsARB)
+
+#define GLEW_ARB_robustness GLEW_GET_VAR(__GLEW_ARB_robustness)
+
+#endif /* GL_ARB_robustness */
+
+/* ---------------- GL_ARB_robustness_application_isolation ---------------- */
+
+#ifndef GL_ARB_robustness_application_isolation
+#define GL_ARB_robustness_application_isolation 1
+
+#define GLEW_ARB_robustness_application_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_application_isolation)
+
+#endif /* GL_ARB_robustness_application_isolation */
+
+/* ---------------- GL_ARB_robustness_share_group_isolation ---------------- */
+
+#ifndef GL_ARB_robustness_share_group_isolation
+#define GL_ARB_robustness_share_group_isolation 1
+
+#define GLEW_ARB_robustness_share_group_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_share_group_isolation)
+
+#endif /* GL_ARB_robustness_share_group_isolation */
+
+/* ------------------------ GL_ARB_sample_locations ------------------------ */
+
+#ifndef GL_ARB_sample_locations
+#define GL_ARB_sample_locations 1
+
+#define GL_SAMPLE_LOCATION_ARB 0x8E50
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v);
+
+#define glFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewFramebufferSampleLocationsfvARB)
+#define glNamedFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvARB)
+
+#define GLEW_ARB_sample_locations GLEW_GET_VAR(__GLEW_ARB_sample_locations)
+
+#endif /* GL_ARB_sample_locations */
+
+/* ------------------------- GL_ARB_sample_shading ------------------------- */
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+
+#define GL_SAMPLE_SHADING_ARB 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37
+
+typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value);
+
+#define glMinSampleShadingARB GLEW_GET_FUN(__glewMinSampleShadingARB)
+
+#define GLEW_ARB_sample_shading GLEW_GET_VAR(__GLEW_ARB_sample_shading)
+
+#endif /* GL_ARB_sample_shading */
+
+/* ------------------------- GL_ARB_sampler_objects ------------------------ */
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+
+#define GL_SAMPLER_BINDING 0x8919
+
+typedef void (GLAPIENTRY * PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers);
+typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers);
+typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint* params);
+
+#define glBindSampler GLEW_GET_FUN(__glewBindSampler)
+#define glDeleteSamplers GLEW_GET_FUN(__glewDeleteSamplers)
+#define glGenSamplers GLEW_GET_FUN(__glewGenSamplers)
+#define glGetSamplerParameterIiv GLEW_GET_FUN(__glewGetSamplerParameterIiv)
+#define glGetSamplerParameterIuiv GLEW_GET_FUN(__glewGetSamplerParameterIuiv)
+#define glGetSamplerParameterfv GLEW_GET_FUN(__glewGetSamplerParameterfv)
+#define glGetSamplerParameteriv GLEW_GET_FUN(__glewGetSamplerParameteriv)
+#define glIsSampler GLEW_GET_FUN(__glewIsSampler)
+#define glSamplerParameterIiv GLEW_GET_FUN(__glewSamplerParameterIiv)
+#define glSamplerParameterIuiv GLEW_GET_FUN(__glewSamplerParameterIuiv)
+#define glSamplerParameterf GLEW_GET_FUN(__glewSamplerParameterf)
+#define glSamplerParameterfv GLEW_GET_FUN(__glewSamplerParameterfv)
+#define glSamplerParameteri GLEW_GET_FUN(__glewSamplerParameteri)
+#define glSamplerParameteriv GLEW_GET_FUN(__glewSamplerParameteriv)
+
+#define GLEW_ARB_sampler_objects GLEW_GET_VAR(__GLEW_ARB_sampler_objects)
+
+#endif /* GL_ARB_sampler_objects */
+
+/* ------------------------ GL_ARB_seamless_cube_map ----------------------- */
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
+
+#define GLEW_ARB_seamless_cube_map GLEW_GET_VAR(__GLEW_ARB_seamless_cube_map)
+
+#endif /* GL_ARB_seamless_cube_map */
+
+/* ------------------ GL_ARB_seamless_cubemap_per_texture ------------------ */
+
+#ifndef GL_ARB_seamless_cubemap_per_texture
+#define GL_ARB_seamless_cubemap_per_texture 1
+
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
+
+#define GLEW_ARB_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_ARB_seamless_cubemap_per_texture)
+
+#endif /* GL_ARB_seamless_cubemap_per_texture */
+
+/* --------------------- GL_ARB_separate_shader_objects -------------------- */
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+
+#define GL_VERTEX_SHADER_BIT 0x00000001
+#define GL_FRAGMENT_SHADER_BIT 0x00000002
+#define GL_GEOMETRY_SHADER_BIT 0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT 0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010
+#define GL_PROGRAM_SEPARABLE 0x8258
+#define GL_ACTIVE_PROGRAM 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING 0x825A
+#define GL_ALL_SHADER_BITS 0xFFFFFFFF
+
+typedef void (GLAPIENTRY * PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef void (GLAPIENTRY * PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar * const * strings);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint* pipelines);
+typedef void (GLAPIENTRY * PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar *infoLog);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint x, GLuint y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+
+#define glActiveShaderProgram GLEW_GET_FUN(__glewActiveShaderProgram)
+#define glBindProgramPipeline GLEW_GET_FUN(__glewBindProgramPipeline)
+#define glCreateShaderProgramv GLEW_GET_FUN(__glewCreateShaderProgramv)
+#define glDeleteProgramPipelines GLEW_GET_FUN(__glewDeleteProgramPipelines)
+#define glGenProgramPipelines GLEW_GET_FUN(__glewGenProgramPipelines)
+#define glGetProgramPipelineInfoLog GLEW_GET_FUN(__glewGetProgramPipelineInfoLog)
+#define glGetProgramPipelineiv GLEW_GET_FUN(__glewGetProgramPipelineiv)
+#define glIsProgramPipeline GLEW_GET_FUN(__glewIsProgramPipeline)
+#define glProgramUniform1d GLEW_GET_FUN(__glewProgramUniform1d)
+#define glProgramUniform1dv GLEW_GET_FUN(__glewProgramUniform1dv)
+#define glProgramUniform1f GLEW_GET_FUN(__glewProgramUniform1f)
+#define glProgramUniform1fv GLEW_GET_FUN(__glewProgramUniform1fv)
+#define glProgramUniform1i GLEW_GET_FUN(__glewProgramUniform1i)
+#define glProgramUniform1iv GLEW_GET_FUN(__glewProgramUniform1iv)
+#define glProgramUniform1ui GLEW_GET_FUN(__glewProgramUniform1ui)
+#define glProgramUniform1uiv GLEW_GET_FUN(__glewProgramUniform1uiv)
+#define glProgramUniform2d GLEW_GET_FUN(__glewProgramUniform2d)
+#define glProgramUniform2dv GLEW_GET_FUN(__glewProgramUniform2dv)
+#define glProgramUniform2f GLEW_GET_FUN(__glewProgramUniform2f)
+#define glProgramUniform2fv GLEW_GET_FUN(__glewProgramUniform2fv)
+#define glProgramUniform2i GLEW_GET_FUN(__glewProgramUniform2i)
+#define glProgramUniform2iv GLEW_GET_FUN(__glewProgramUniform2iv)
+#define glProgramUniform2ui GLEW_GET_FUN(__glewProgramUniform2ui)
+#define glProgramUniform2uiv GLEW_GET_FUN(__glewProgramUniform2uiv)
+#define glProgramUniform3d GLEW_GET_FUN(__glewProgramUniform3d)
+#define glProgramUniform3dv GLEW_GET_FUN(__glewProgramUniform3dv)
+#define glProgramUniform3f GLEW_GET_FUN(__glewProgramUniform3f)
+#define glProgramUniform3fv GLEW_GET_FUN(__glewProgramUniform3fv)
+#define glProgramUniform3i GLEW_GET_FUN(__glewProgramUniform3i)
+#define glProgramUniform3iv GLEW_GET_FUN(__glewProgramUniform3iv)
+#define glProgramUniform3ui GLEW_GET_FUN(__glewProgramUniform3ui)
+#define glProgramUniform3uiv GLEW_GET_FUN(__glewProgramUniform3uiv)
+#define glProgramUniform4d GLEW_GET_FUN(__glewProgramUniform4d)
+#define glProgramUniform4dv GLEW_GET_FUN(__glewProgramUniform4dv)
+#define glProgramUniform4f GLEW_GET_FUN(__glewProgramUniform4f)
+#define glProgramUniform4fv GLEW_GET_FUN(__glewProgramUniform4fv)
+#define glProgramUniform4i GLEW_GET_FUN(__glewProgramUniform4i)
+#define glProgramUniform4iv GLEW_GET_FUN(__glewProgramUniform4iv)
+#define glProgramUniform4ui GLEW_GET_FUN(__glewProgramUniform4ui)
+#define glProgramUniform4uiv GLEW_GET_FUN(__glewProgramUniform4uiv)
+#define glProgramUniformMatrix2dv GLEW_GET_FUN(__glewProgramUniformMatrix2dv)
+#define glProgramUniformMatrix2fv GLEW_GET_FUN(__glewProgramUniformMatrix2fv)
+#define glProgramUniformMatrix2x3dv GLEW_GET_FUN(__glewProgramUniformMatrix2x3dv)
+#define glProgramUniformMatrix2x3fv GLEW_GET_FUN(__glewProgramUniformMatrix2x3fv)
+#define glProgramUniformMatrix2x4dv GLEW_GET_FUN(__glewProgramUniformMatrix2x4dv)
+#define glProgramUniformMatrix2x4fv GLEW_GET_FUN(__glewProgramUniformMatrix2x4fv)
+#define glProgramUniformMatrix3dv GLEW_GET_FUN(__glewProgramUniformMatrix3dv)
+#define glProgramUniformMatrix3fv GLEW_GET_FUN(__glewProgramUniformMatrix3fv)
+#define glProgramUniformMatrix3x2dv GLEW_GET_FUN(__glewProgramUniformMatrix3x2dv)
+#define glProgramUniformMatrix3x2fv GLEW_GET_FUN(__glewProgramUniformMatrix3x2fv)
+#define glProgramUniformMatrix3x4dv GLEW_GET_FUN(__glewProgramUniformMatrix3x4dv)
+#define glProgramUniformMatrix3x4fv GLEW_GET_FUN(__glewProgramUniformMatrix3x4fv)
+#define glProgramUniformMatrix4dv GLEW_GET_FUN(__glewProgramUniformMatrix4dv)
+#define glProgramUniformMatrix4fv GLEW_GET_FUN(__glewProgramUniformMatrix4fv)
+#define glProgramUniformMatrix4x2dv GLEW_GET_FUN(__glewProgramUniformMatrix4x2dv)
+#define glProgramUniformMatrix4x2fv GLEW_GET_FUN(__glewProgramUniformMatrix4x2fv)
+#define glProgramUniformMatrix4x3dv GLEW_GET_FUN(__glewProgramUniformMatrix4x3dv)
+#define glProgramUniformMatrix4x3fv GLEW_GET_FUN(__glewProgramUniformMatrix4x3fv)
+#define glUseProgramStages GLEW_GET_FUN(__glewUseProgramStages)
+#define glValidateProgramPipeline GLEW_GET_FUN(__glewValidateProgramPipeline)
+
+#define GLEW_ARB_separate_shader_objects GLEW_GET_VAR(__GLEW_ARB_separate_shader_objects)
+
+#endif /* GL_ARB_separate_shader_objects */
+
+/* -------------------- GL_ARB_shader_atomic_counter_ops ------------------- */
+
+#ifndef GL_ARB_shader_atomic_counter_ops
+#define GL_ARB_shader_atomic_counter_ops 1
+
+#define GLEW_ARB_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counter_ops)
+
+#endif /* GL_ARB_shader_atomic_counter_ops */
+
+/* --------------------- GL_ARB_shader_atomic_counters --------------------- */
+
+#ifndef GL_ARB_shader_atomic_counters
+#define GL_ARB_shader_atomic_counters 1
+
+#define GL_ATOMIC_COUNTER_BUFFER 0x92C0
+#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1
+#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2
+#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3
+#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
+#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
+#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
+#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6
+#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
+#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9
+#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
+#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
+
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint* params);
+
+#define glGetActiveAtomicCounterBufferiv GLEW_GET_FUN(__glewGetActiveAtomicCounterBufferiv)
+
+#define GLEW_ARB_shader_atomic_counters GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counters)
+
+#endif /* GL_ARB_shader_atomic_counters */
+
+/* -------------------------- GL_ARB_shader_ballot ------------------------- */
+
+#ifndef GL_ARB_shader_ballot
+#define GL_ARB_shader_ballot 1
+
+#define GLEW_ARB_shader_ballot GLEW_GET_VAR(__GLEW_ARB_shader_ballot)
+
+#endif /* GL_ARB_shader_ballot */
+
+/* ----------------------- GL_ARB_shader_bit_encoding ---------------------- */
+
+#ifndef GL_ARB_shader_bit_encoding
+#define GL_ARB_shader_bit_encoding 1
+
+#define GLEW_ARB_shader_bit_encoding GLEW_GET_VAR(__GLEW_ARB_shader_bit_encoding)
+
+#endif /* GL_ARB_shader_bit_encoding */
+
+/* -------------------------- GL_ARB_shader_clock -------------------------- */
+
+#ifndef GL_ARB_shader_clock
+#define GL_ARB_shader_clock 1
+
+#define GLEW_ARB_shader_clock GLEW_GET_VAR(__GLEW_ARB_shader_clock)
+
+#endif /* GL_ARB_shader_clock */
+
+/* --------------------- GL_ARB_shader_draw_parameters --------------------- */
+
+#ifndef GL_ARB_shader_draw_parameters
+#define GL_ARB_shader_draw_parameters 1
+
+#define GLEW_ARB_shader_draw_parameters GLEW_GET_VAR(__GLEW_ARB_shader_draw_parameters)
+
+#endif /* GL_ARB_shader_draw_parameters */
+
+/* ------------------------ GL_ARB_shader_group_vote ----------------------- */
+
+#ifndef GL_ARB_shader_group_vote
+#define GL_ARB_shader_group_vote 1
+
+#define GLEW_ARB_shader_group_vote GLEW_GET_VAR(__GLEW_ARB_shader_group_vote)
+
+#endif /* GL_ARB_shader_group_vote */
+
+/* --------------------- GL_ARB_shader_image_load_store -------------------- */
+
+#ifndef GL_ARB_shader_image_load_store
+#define GL_ARB_shader_image_load_store 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002
+#define GL_UNIFORM_BARRIER_BIT 0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
+#define GL_COMMAND_BARRIER_BIT 0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000
+#define GL_MAX_IMAGE_UNITS 0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
+#define GL_IMAGE_BINDING_NAME 0x8F3A
+#define GL_IMAGE_BINDING_LEVEL 0x8F3B
+#define GL_IMAGE_BINDING_LAYERED 0x8F3C
+#define GL_IMAGE_BINDING_LAYER 0x8F3D
+#define GL_IMAGE_BINDING_ACCESS 0x8F3E
+#define GL_IMAGE_1D 0x904C
+#define GL_IMAGE_2D 0x904D
+#define GL_IMAGE_3D 0x904E
+#define GL_IMAGE_2D_RECT 0x904F
+#define GL_IMAGE_CUBE 0x9050
+#define GL_IMAGE_BUFFER 0x9051
+#define GL_IMAGE_1D_ARRAY 0x9052
+#define GL_IMAGE_2D_ARRAY 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054
+#define GL_IMAGE_2D_MULTISAMPLE 0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056
+#define GL_INT_IMAGE_1D 0x9057
+#define GL_INT_IMAGE_2D 0x9058
+#define GL_INT_IMAGE_3D 0x9059
+#define GL_INT_IMAGE_2D_RECT 0x905A
+#define GL_INT_IMAGE_CUBE 0x905B
+#define GL_INT_IMAGE_BUFFER 0x905C
+#define GL_INT_IMAGE_1D_ARRAY 0x905D
+#define GL_INT_IMAGE_2D_ARRAY 0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D 0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D 0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D 0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
+#define GL_MAX_IMAGE_SAMPLES 0x906D
+#define GL_IMAGE_BINDING_FORMAT 0x906E
+#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
+#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA
+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD
+#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE
+#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF
+#define GL_ALL_BARRIER_BITS 0xFFFFFFFF
+
+typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
+
+#define glBindImageTexture GLEW_GET_FUN(__glewBindImageTexture)
+#define glMemoryBarrier GLEW_GET_FUN(__glewMemoryBarrier)
+
+#define GLEW_ARB_shader_image_load_store GLEW_GET_VAR(__GLEW_ARB_shader_image_load_store)
+
+#endif /* GL_ARB_shader_image_load_store */
+
+/* ------------------------ GL_ARB_shader_image_size ----------------------- */
+
+#ifndef GL_ARB_shader_image_size
+#define GL_ARB_shader_image_size 1
+
+#define GLEW_ARB_shader_image_size GLEW_GET_VAR(__GLEW_ARB_shader_image_size)
+
+#endif /* GL_ARB_shader_image_size */
+
+/* ------------------------- GL_ARB_shader_objects ------------------------- */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+
+#define GL_PROGRAM_OBJECT_ARB 0x8B40
+#define GL_SHADER_OBJECT_ARB 0x8B48
+#define GL_OBJECT_TYPE_ARB 0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB 0x8B4F
+#define GL_FLOAT_VEC2_ARB 0x8B50
+#define GL_FLOAT_VEC3_ARB 0x8B51
+#define GL_FLOAT_VEC4_ARB 0x8B52
+#define GL_INT_VEC2_ARB 0x8B53
+#define GL_INT_VEC3_ARB 0x8B54
+#define GL_INT_VEC4_ARB 0x8B55
+#define GL_BOOL_ARB 0x8B56
+#define GL_BOOL_VEC2_ARB 0x8B57
+#define GL_BOOL_VEC3_ARB 0x8B58
+#define GL_BOOL_VEC4_ARB 0x8B59
+#define GL_FLOAT_MAT2_ARB 0x8B5A
+#define GL_FLOAT_MAT3_ARB 0x8B5B
+#define GL_FLOAT_MAT4_ARB 0x8B5C
+#define GL_SAMPLER_1D_ARB 0x8B5D
+#define GL_SAMPLER_2D_ARB 0x8B5E
+#define GL_SAMPLER_3D_ARB 0x8B5F
+#define GL_SAMPLER_CUBE_ARB 0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62
+#define GL_SAMPLER_2D_RECT_ARB 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+
+typedef void (GLAPIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (GLAPIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef GLhandleARB (GLAPIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (GLAPIENTRY * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef void (GLAPIENTRY * PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (GLAPIENTRY * PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB *obj);
+typedef GLhandleARB (GLAPIENTRY * PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (GLAPIENTRY * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *infoLog);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *source);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint* params);
+typedef void (GLAPIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (GLAPIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint *length);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+
+#define glAttachObjectARB GLEW_GET_FUN(__glewAttachObjectARB)
+#define glCompileShaderARB GLEW_GET_FUN(__glewCompileShaderARB)
+#define glCreateProgramObjectARB GLEW_GET_FUN(__glewCreateProgramObjectARB)
+#define glCreateShaderObjectARB GLEW_GET_FUN(__glewCreateShaderObjectARB)
+#define glDeleteObjectARB GLEW_GET_FUN(__glewDeleteObjectARB)
+#define glDetachObjectARB GLEW_GET_FUN(__glewDetachObjectARB)
+#define glGetActiveUniformARB GLEW_GET_FUN(__glewGetActiveUniformARB)
+#define glGetAttachedObjectsARB GLEW_GET_FUN(__glewGetAttachedObjectsARB)
+#define glGetHandleARB GLEW_GET_FUN(__glewGetHandleARB)
+#define glGetInfoLogARB GLEW_GET_FUN(__glewGetInfoLogARB)
+#define glGetObjectParameterfvARB GLEW_GET_FUN(__glewGetObjectParameterfvARB)
+#define glGetObjectParameterivARB GLEW_GET_FUN(__glewGetObjectParameterivARB)
+#define glGetShaderSourceARB GLEW_GET_FUN(__glewGetShaderSourceARB)
+#define glGetUniformLocationARB GLEW_GET_FUN(__glewGetUniformLocationARB)
+#define glGetUniformfvARB GLEW_GET_FUN(__glewGetUniformfvARB)
+#define glGetUniformivARB GLEW_GET_FUN(__glewGetUniformivARB)
+#define glLinkProgramARB GLEW_GET_FUN(__glewLinkProgramARB)
+#define glShaderSourceARB GLEW_GET_FUN(__glewShaderSourceARB)
+#define glUniform1fARB GLEW_GET_FUN(__glewUniform1fARB)
+#define glUniform1fvARB GLEW_GET_FUN(__glewUniform1fvARB)
+#define glUniform1iARB GLEW_GET_FUN(__glewUniform1iARB)
+#define glUniform1ivARB GLEW_GET_FUN(__glewUniform1ivARB)
+#define glUniform2fARB GLEW_GET_FUN(__glewUniform2fARB)
+#define glUniform2fvARB GLEW_GET_FUN(__glewUniform2fvARB)
+#define glUniform2iARB GLEW_GET_FUN(__glewUniform2iARB)
+#define glUniform2ivARB GLEW_GET_FUN(__glewUniform2ivARB)
+#define glUniform3fARB GLEW_GET_FUN(__glewUniform3fARB)
+#define glUniform3fvARB GLEW_GET_FUN(__glewUniform3fvARB)
+#define glUniform3iARB GLEW_GET_FUN(__glewUniform3iARB)
+#define glUniform3ivARB GLEW_GET_FUN(__glewUniform3ivARB)
+#define glUniform4fARB GLEW_GET_FUN(__glewUniform4fARB)
+#define glUniform4fvARB GLEW_GET_FUN(__glewUniform4fvARB)
+#define glUniform4iARB GLEW_GET_FUN(__glewUniform4iARB)
+#define glUniform4ivARB GLEW_GET_FUN(__glewUniform4ivARB)
+#define glUniformMatrix2fvARB GLEW_GET_FUN(__glewUniformMatrix2fvARB)
+#define glUniformMatrix3fvARB GLEW_GET_FUN(__glewUniformMatrix3fvARB)
+#define glUniformMatrix4fvARB GLEW_GET_FUN(__glewUniformMatrix4fvARB)
+#define glUseProgramObjectARB GLEW_GET_FUN(__glewUseProgramObjectARB)
+#define glValidateProgramARB GLEW_GET_FUN(__glewValidateProgramARB)
+
+#define GLEW_ARB_shader_objects GLEW_GET_VAR(__GLEW_ARB_shader_objects)
+
+#endif /* GL_ARB_shader_objects */
+
+/* ------------------------ GL_ARB_shader_precision ------------------------ */
+
+#ifndef GL_ARB_shader_precision
+#define GL_ARB_shader_precision 1
+
+#define GLEW_ARB_shader_precision GLEW_GET_VAR(__GLEW_ARB_shader_precision)
+
+#endif /* GL_ARB_shader_precision */
+
+/* ---------------------- GL_ARB_shader_stencil_export --------------------- */
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+
+#define GLEW_ARB_shader_stencil_export GLEW_GET_VAR(__GLEW_ARB_shader_stencil_export)
+
+#endif /* GL_ARB_shader_stencil_export */
+
+/* ------------------ GL_ARB_shader_storage_buffer_object ------------------ */
+
+#ifndef GL_ARB_shader_storage_buffer_object
+#define GL_ARB_shader_storage_buffer_object 1
+
+#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000
+#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
+#define GL_SHADER_STORAGE_BUFFER 0x90D2
+#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3
+#define GL_SHADER_STORAGE_BUFFER_START 0x90D4
+#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5
+#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
+#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
+#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
+#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
+#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
+#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE
+#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
+
+typedef void (GLAPIENTRY * PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+
+#define glShaderStorageBlockBinding GLEW_GET_FUN(__glewShaderStorageBlockBinding)
+
+#define GLEW_ARB_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_ARB_shader_storage_buffer_object)
+
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+/* ------------------------ GL_ARB_shader_subroutine ----------------------- */
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+
+#define GL_ACTIVE_SUBROUTINES 0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6
+#define GL_MAX_SUBROUTINES 0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES 0x8E4B
+
+typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint* values);
+typedef GLuint (GLAPIENTRY * PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar* name);
+typedef GLint (GLAPIENTRY * PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint* indices);
+
+#define glGetActiveSubroutineName GLEW_GET_FUN(__glewGetActiveSubroutineName)
+#define glGetActiveSubroutineUniformName GLEW_GET_FUN(__glewGetActiveSubroutineUniformName)
+#define glGetActiveSubroutineUniformiv GLEW_GET_FUN(__glewGetActiveSubroutineUniformiv)
+#define glGetProgramStageiv GLEW_GET_FUN(__glewGetProgramStageiv)
+#define glGetSubroutineIndex GLEW_GET_FUN(__glewGetSubroutineIndex)
+#define glGetSubroutineUniformLocation GLEW_GET_FUN(__glewGetSubroutineUniformLocation)
+#define glGetUniformSubroutineuiv GLEW_GET_FUN(__glewGetUniformSubroutineuiv)
+#define glUniformSubroutinesuiv GLEW_GET_FUN(__glewUniformSubroutinesuiv)
+
+#define GLEW_ARB_shader_subroutine GLEW_GET_VAR(__GLEW_ARB_shader_subroutine)
+
+#endif /* GL_ARB_shader_subroutine */
+
+/* ------------------ GL_ARB_shader_texture_image_samples ------------------ */
+
+#ifndef GL_ARB_shader_texture_image_samples
+#define GL_ARB_shader_texture_image_samples 1
+
+#define GLEW_ARB_shader_texture_image_samples GLEW_GET_VAR(__GLEW_ARB_shader_texture_image_samples)
+
+#endif /* GL_ARB_shader_texture_image_samples */
+
+/* ----------------------- GL_ARB_shader_texture_lod ----------------------- */
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+
+#define GLEW_ARB_shader_texture_lod GLEW_GET_VAR(__GLEW_ARB_shader_texture_lod)
+
+#endif /* GL_ARB_shader_texture_lod */
+
+/* ------------------- GL_ARB_shader_viewport_layer_array ------------------ */
+
+#ifndef GL_ARB_shader_viewport_layer_array
+#define GL_ARB_shader_viewport_layer_array 1
+
+#define GLEW_ARB_shader_viewport_layer_array GLEW_GET_VAR(__GLEW_ARB_shader_viewport_layer_array)
+
+#endif /* GL_ARB_shader_viewport_layer_array */
+
+/* ---------------------- GL_ARB_shading_language_100 ---------------------- */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+
+#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
+
+#define GLEW_ARB_shading_language_100 GLEW_GET_VAR(__GLEW_ARB_shading_language_100)
+
+#endif /* GL_ARB_shading_language_100 */
+
+/* -------------------- GL_ARB_shading_language_420pack -------------------- */
+
+#ifndef GL_ARB_shading_language_420pack
+#define GL_ARB_shading_language_420pack 1
+
+#define GLEW_ARB_shading_language_420pack GLEW_GET_VAR(__GLEW_ARB_shading_language_420pack)
+
+#endif /* GL_ARB_shading_language_420pack */
+
+/* -------------------- GL_ARB_shading_language_include -------------------- */
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+
+#define GL_SHADER_INCLUDE_ARB 0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB 0x8DEA
+
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* const *path, const GLint *length);
+typedef void (GLAPIENTRY * PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar* name, GLenum pname, GLint *params);
+typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar *string);
+
+#define glCompileShaderIncludeARB GLEW_GET_FUN(__glewCompileShaderIncludeARB)
+#define glDeleteNamedStringARB GLEW_GET_FUN(__glewDeleteNamedStringARB)
+#define glGetNamedStringARB GLEW_GET_FUN(__glewGetNamedStringARB)
+#define glGetNamedStringivARB GLEW_GET_FUN(__glewGetNamedStringivARB)
+#define glIsNamedStringARB GLEW_GET_FUN(__glewIsNamedStringARB)
+#define glNamedStringARB GLEW_GET_FUN(__glewNamedStringARB)
+
+#define GLEW_ARB_shading_language_include GLEW_GET_VAR(__GLEW_ARB_shading_language_include)
+
+#endif /* GL_ARB_shading_language_include */
+
+/* -------------------- GL_ARB_shading_language_packing -------------------- */
+
+#ifndef GL_ARB_shading_language_packing
+#define GL_ARB_shading_language_packing 1
+
+#define GLEW_ARB_shading_language_packing GLEW_GET_VAR(__GLEW_ARB_shading_language_packing)
+
+#endif /* GL_ARB_shading_language_packing */
+
+/* ----------------------------- GL_ARB_shadow ----------------------------- */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+
+#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E
+
+#define GLEW_ARB_shadow GLEW_GET_VAR(__GLEW_ARB_shadow)
+
+#endif /* GL_ARB_shadow */
+
+/* ------------------------- GL_ARB_shadow_ambient ------------------------- */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+
+#define GLEW_ARB_shadow_ambient GLEW_GET_VAR(__GLEW_ARB_shadow_ambient)
+
+#endif /* GL_ARB_shadow_ambient */
+
+/* -------------------------- GL_ARB_sparse_buffer ------------------------- */
+
+#ifndef GL_ARB_sparse_buffer
+#define GL_ARB_sparse_buffer 1
+
+#define GL_SPARSE_STORAGE_BIT_ARB 0x0400
+#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB 0x82F8
+
+typedef void (GLAPIENTRY * PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+
+#define glBufferPageCommitmentARB GLEW_GET_FUN(__glewBufferPageCommitmentARB)
+
+#define GLEW_ARB_sparse_buffer GLEW_GET_VAR(__GLEW_ARB_sparse_buffer)
+
+#endif /* GL_ARB_sparse_buffer */
+
+/* ------------------------- GL_ARB_sparse_texture ------------------------- */
+
+#ifndef GL_ARB_sparse_texture
+#define GL_ARB_sparse_texture 1
+
+#define GL_VIRTUAL_PAGE_SIZE_X_ARB 0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_ARB 0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_ARB 0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB 0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A
+#define GL_TEXTURE_SPARSE_ARB 0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB 0x91A7
+#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB 0x91A8
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9
+#define GL_NUM_SPARSE_LEVELS_ARB 0x91AA
+
+typedef void (GLAPIENTRY * PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+
+#define glTexPageCommitmentARB GLEW_GET_FUN(__glewTexPageCommitmentARB)
+
+#define GLEW_ARB_sparse_texture GLEW_GET_VAR(__GLEW_ARB_sparse_texture)
+
+#endif /* GL_ARB_sparse_texture */
+
+/* ------------------------- GL_ARB_sparse_texture2 ------------------------ */
+
+#ifndef GL_ARB_sparse_texture2
+#define GL_ARB_sparse_texture2 1
+
+#define GLEW_ARB_sparse_texture2 GLEW_GET_VAR(__GLEW_ARB_sparse_texture2)
+
+#endif /* GL_ARB_sparse_texture2 */
+
+/* ---------------------- GL_ARB_sparse_texture_clamp ---------------------- */
+
+#ifndef GL_ARB_sparse_texture_clamp
+#define GL_ARB_sparse_texture_clamp 1
+
+#define GLEW_ARB_sparse_texture_clamp GLEW_GET_VAR(__GLEW_ARB_sparse_texture_clamp)
+
+#endif /* GL_ARB_sparse_texture_clamp */
+
+/* ------------------------ GL_ARB_spirv_extensions ------------------------ */
+
+#ifndef GL_ARB_spirv_extensions
+#define GL_ARB_spirv_extensions 1
+
+#define GL_SPIR_V_EXTENSIONS 0x9553
+#define GL_NUM_SPIR_V_EXTENSIONS 0x9554
+
+#define GLEW_ARB_spirv_extensions GLEW_GET_VAR(__GLEW_ARB_spirv_extensions)
+
+#endif /* GL_ARB_spirv_extensions */
+
+/* ------------------------ GL_ARB_stencil_texturing ----------------------- */
+
+#ifndef GL_ARB_stencil_texturing
+#define GL_ARB_stencil_texturing 1
+
+#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA
+
+#define GLEW_ARB_stencil_texturing GLEW_GET_VAR(__GLEW_ARB_stencil_texturing)
+
+#endif /* GL_ARB_stencil_texturing */
+
+/* ------------------------------ GL_ARB_sync ------------------------------ */
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+
+#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001
+#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111
+#define GL_OBJECT_TYPE 0x9112
+#define GL_SYNC_CONDITION 0x9113
+#define GL_SYNC_STATUS 0x9114
+#define GL_SYNC_FLAGS 0x9115
+#define GL_SYNC_FENCE 0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
+#define GL_UNSIGNALED 0x9118
+#define GL_SIGNALED 0x9119
+#define GL_ALREADY_SIGNALED 0x911A
+#define GL_TIMEOUT_EXPIRED 0x911B
+#define GL_CONDITION_SATISFIED 0x911C
+#define GL_WAIT_FAILED 0x911D
+#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull
+
+typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
+typedef void (GLAPIENTRY * PFNGLDELETESYNCPROC) (GLsync GLsync);
+typedef GLsync (GLAPIENTRY * PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETSYNCIVPROC) (GLsync GLsync,GLenum pname,GLsizei bufSize,GLsizei* length, GLint *values);
+typedef GLboolean (GLAPIENTRY * PFNGLISSYNCPROC) (GLsync GLsync);
+typedef void (GLAPIENTRY * PFNGLWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
+
+#define glClientWaitSync GLEW_GET_FUN(__glewClientWaitSync)
+#define glDeleteSync GLEW_GET_FUN(__glewDeleteSync)
+#define glFenceSync GLEW_GET_FUN(__glewFenceSync)
+#define glGetInteger64v GLEW_GET_FUN(__glewGetInteger64v)
+#define glGetSynciv GLEW_GET_FUN(__glewGetSynciv)
+#define glIsSync GLEW_GET_FUN(__glewIsSync)
+#define glWaitSync GLEW_GET_FUN(__glewWaitSync)
+
+#define GLEW_ARB_sync GLEW_GET_VAR(__GLEW_ARB_sync)
+
+#endif /* GL_ARB_sync */
+
+/* ----------------------- GL_ARB_tessellation_shader ---------------------- */
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+
+#define GL_PATCHES 0xE
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_PATCH_VERTICES 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75
+#define GL_TESS_GEN_MODE 0x8E76
+#define GL_TESS_GEN_SPACING 0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER 0x8E78
+#define GL_TESS_GEN_POINT_MODE 0x8E79
+#define GL_ISOLINES 0x8E7A
+#define GL_FRACTIONAL_ODD 0x8E7B
+#define GL_FRACTIONAL_EVEN 0x8E7C
+#define GL_MAX_PATCH_VERTICES 0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL 0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_TESS_EVALUATION_SHADER 0x8E87
+#define GL_TESS_CONTROL_SHADER 0x8E88
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+
+typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat* values);
+typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+
+#define glPatchParameterfv GLEW_GET_FUN(__glewPatchParameterfv)
+#define glPatchParameteri GLEW_GET_FUN(__glewPatchParameteri)
+
+#define GLEW_ARB_tessellation_shader GLEW_GET_VAR(__GLEW_ARB_tessellation_shader)
+
+#endif /* GL_ARB_tessellation_shader */
+
+/* ------------------------- GL_ARB_texture_barrier ------------------------ */
+
+#ifndef GL_ARB_texture_barrier
+#define GL_ARB_texture_barrier 1
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERPROC) (void);
+
+#define glTextureBarrier GLEW_GET_FUN(__glewTextureBarrier)
+
+#define GLEW_ARB_texture_barrier GLEW_GET_VAR(__GLEW_ARB_texture_barrier)
+
+#endif /* GL_ARB_texture_barrier */
+
+/* ---------------------- GL_ARB_texture_border_clamp ---------------------- */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+
+#define GL_CLAMP_TO_BORDER_ARB 0x812D
+
+#define GLEW_ARB_texture_border_clamp GLEW_GET_VAR(__GLEW_ARB_texture_border_clamp)
+
+#endif /* GL_ARB_texture_border_clamp */
+
+/* ---------------------- GL_ARB_texture_buffer_object --------------------- */
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+
+#define GL_TEXTURE_BUFFER_ARB 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E
+
+typedef void (GLAPIENTRY * PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+
+#define glTexBufferARB GLEW_GET_FUN(__glewTexBufferARB)
+
+#define GLEW_ARB_texture_buffer_object GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object)
+
+#endif /* GL_ARB_texture_buffer_object */
+
+/* ------------------- GL_ARB_texture_buffer_object_rgb32 ------------------ */
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+
+#define GLEW_ARB_texture_buffer_object_rgb32 GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object_rgb32)
+
+#endif /* GL_ARB_texture_buffer_object_rgb32 */
+
+/* ---------------------- GL_ARB_texture_buffer_range ---------------------- */
+
+#ifndef GL_ARB_texture_buffer_range
+#define GL_ARB_texture_buffer_range 1
+
+#define GL_TEXTURE_BUFFER_OFFSET 0x919D
+#define GL_TEXTURE_BUFFER_SIZE 0x919E
+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
+
+typedef void (GLAPIENTRY * PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+
+#define glTexBufferRange GLEW_GET_FUN(__glewTexBufferRange)
+#define glTextureBufferRangeEXT GLEW_GET_FUN(__glewTextureBufferRangeEXT)
+
+#define GLEW_ARB_texture_buffer_range GLEW_GET_VAR(__GLEW_ARB_texture_buffer_range)
+
+#endif /* GL_ARB_texture_buffer_range */
+
+/* ----------------------- GL_ARB_texture_compression ---------------------- */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+
+#define GL_COMPRESSED_ALPHA_ARB 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
+#define GL_COMPRESSED_RGB_ARB 0x84ED
+#define GL_COMPRESSED_RGBA_ARB 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, void *img);
+
+#define glCompressedTexImage1DARB GLEW_GET_FUN(__glewCompressedTexImage1DARB)
+#define glCompressedTexImage2DARB GLEW_GET_FUN(__glewCompressedTexImage2DARB)
+#define glCompressedTexImage3DARB GLEW_GET_FUN(__glewCompressedTexImage3DARB)
+#define glCompressedTexSubImage1DARB GLEW_GET_FUN(__glewCompressedTexSubImage1DARB)
+#define glCompressedTexSubImage2DARB GLEW_GET_FUN(__glewCompressedTexSubImage2DARB)
+#define glCompressedTexSubImage3DARB GLEW_GET_FUN(__glewCompressedTexSubImage3DARB)
+#define glGetCompressedTexImageARB GLEW_GET_FUN(__glewGetCompressedTexImageARB)
+
+#define GLEW_ARB_texture_compression GLEW_GET_VAR(__GLEW_ARB_texture_compression)
+
+#endif /* GL_ARB_texture_compression */
+
+/* -------------------- GL_ARB_texture_compression_bptc -------------------- */
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+
+#define GLEW_ARB_texture_compression_bptc GLEW_GET_VAR(__GLEW_ARB_texture_compression_bptc)
+
+#endif /* GL_ARB_texture_compression_bptc */
+
+/* -------------------- GL_ARB_texture_compression_rgtc -------------------- */
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+
+#define GL_COMPRESSED_RED_RGTC1 0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
+#define GL_COMPRESSED_RG_RGTC2 0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE
+
+#define GLEW_ARB_texture_compression_rgtc GLEW_GET_VAR(__GLEW_ARB_texture_compression_rgtc)
+
+#endif /* GL_ARB_texture_compression_rgtc */
+
+/* ------------------------ GL_ARB_texture_cube_map ------------------------ */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+
+#define GL_NORMAL_MAP_ARB 0x8511
+#define GL_REFLECTION_MAP_ARB 0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
+
+#define GLEW_ARB_texture_cube_map GLEW_GET_VAR(__GLEW_ARB_texture_cube_map)
+
+#endif /* GL_ARB_texture_cube_map */
+
+/* --------------------- GL_ARB_texture_cube_map_array --------------------- */
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+
+#define GLEW_ARB_texture_cube_map_array GLEW_GET_VAR(__GLEW_ARB_texture_cube_map_array)
+
+#endif /* GL_ARB_texture_cube_map_array */
+
+/* ------------------------- GL_ARB_texture_env_add ------------------------ */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+
+#define GLEW_ARB_texture_env_add GLEW_GET_VAR(__GLEW_ARB_texture_env_add)
+
+#endif /* GL_ARB_texture_env_add */
+
+/* ----------------------- GL_ARB_texture_env_combine ---------------------- */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+
+#define GL_SUBTRACT_ARB 0x84E7
+#define GL_COMBINE_ARB 0x8570
+#define GL_COMBINE_RGB_ARB 0x8571
+#define GL_COMBINE_ALPHA_ARB 0x8572
+#define GL_RGB_SCALE_ARB 0x8573
+#define GL_ADD_SIGNED_ARB 0x8574
+#define GL_INTERPOLATE_ARB 0x8575
+#define GL_CONSTANT_ARB 0x8576
+#define GL_PRIMARY_COLOR_ARB 0x8577
+#define GL_PREVIOUS_ARB 0x8578
+#define GL_SOURCE0_RGB_ARB 0x8580
+#define GL_SOURCE1_RGB_ARB 0x8581
+#define GL_SOURCE2_RGB_ARB 0x8582
+#define GL_SOURCE0_ALPHA_ARB 0x8588
+#define GL_SOURCE1_ALPHA_ARB 0x8589
+#define GL_SOURCE2_ALPHA_ARB 0x858A
+#define GL_OPERAND0_RGB_ARB 0x8590
+#define GL_OPERAND1_RGB_ARB 0x8591
+#define GL_OPERAND2_RGB_ARB 0x8592
+#define GL_OPERAND0_ALPHA_ARB 0x8598
+#define GL_OPERAND1_ALPHA_ARB 0x8599
+#define GL_OPERAND2_ALPHA_ARB 0x859A
+
+#define GLEW_ARB_texture_env_combine GLEW_GET_VAR(__GLEW_ARB_texture_env_combine)
+
+#endif /* GL_ARB_texture_env_combine */
+
+/* ---------------------- GL_ARB_texture_env_crossbar ---------------------- */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+
+#define GLEW_ARB_texture_env_crossbar GLEW_GET_VAR(__GLEW_ARB_texture_env_crossbar)
+
+#endif /* GL_ARB_texture_env_crossbar */
+
+/* ------------------------ GL_ARB_texture_env_dot3 ------------------------ */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+
+#define GL_DOT3_RGB_ARB 0x86AE
+#define GL_DOT3_RGBA_ARB 0x86AF
+
+#define GLEW_ARB_texture_env_dot3 GLEW_GET_VAR(__GLEW_ARB_texture_env_dot3)
+
+#endif /* GL_ARB_texture_env_dot3 */
+
+/* ------------------- GL_ARB_texture_filter_anisotropic ------------------- */
+
+#ifndef GL_ARB_texture_filter_anisotropic
+#define GL_ARB_texture_filter_anisotropic 1
+
+#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF
+
+#define GLEW_ARB_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_ARB_texture_filter_anisotropic)
+
+#endif /* GL_ARB_texture_filter_anisotropic */
+
+/* ---------------------- GL_ARB_texture_filter_minmax --------------------- */
+
+#ifndef GL_ARB_texture_filter_minmax
+#define GL_ARB_texture_filter_minmax 1
+
+#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366
+#define GL_WEIGHTED_AVERAGE_ARB 0x9367
+
+#define GLEW_ARB_texture_filter_minmax GLEW_GET_VAR(__GLEW_ARB_texture_filter_minmax)
+
+#endif /* GL_ARB_texture_filter_minmax */
+
+/* -------------------------- GL_ARB_texture_float ------------------------- */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+
+#define GL_RGBA32F_ARB 0x8814
+#define GL_RGB32F_ARB 0x8815
+#define GL_ALPHA32F_ARB 0x8816
+#define GL_INTENSITY32F_ARB 0x8817
+#define GL_LUMINANCE32F_ARB 0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB 0x8819
+#define GL_RGBA16F_ARB 0x881A
+#define GL_RGB16F_ARB 0x881B
+#define GL_ALPHA16F_ARB 0x881C
+#define GL_INTENSITY16F_ARB 0x881D
+#define GL_LUMINANCE16F_ARB 0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB 0x881F
+#define GL_TEXTURE_RED_TYPE_ARB 0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17
+
+#define GLEW_ARB_texture_float GLEW_GET_VAR(__GLEW_ARB_texture_float)
+
+#endif /* GL_ARB_texture_float */
+
+/* ------------------------- GL_ARB_texture_gather ------------------------- */
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
+
+#define GLEW_ARB_texture_gather GLEW_GET_VAR(__GLEW_ARB_texture_gather)
+
+#endif /* GL_ARB_texture_gather */
+
+/* ------------------ GL_ARB_texture_mirror_clamp_to_edge ------------------ */
+
+#ifndef GL_ARB_texture_mirror_clamp_to_edge
+#define GL_ARB_texture_mirror_clamp_to_edge 1
+
+#define GL_MIRROR_CLAMP_TO_EDGE 0x8743
+
+#define GLEW_ARB_texture_mirror_clamp_to_edge GLEW_GET_VAR(__GLEW_ARB_texture_mirror_clamp_to_edge)
+
+#endif /* GL_ARB_texture_mirror_clamp_to_edge */
+
+/* --------------------- GL_ARB_texture_mirrored_repeat -------------------- */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+
+#define GL_MIRRORED_REPEAT_ARB 0x8370
+
+#define GLEW_ARB_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_ARB_texture_mirrored_repeat)
+
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+/* ----------------------- GL_ARB_texture_multisample ---------------------- */
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+
+#define GL_SAMPLE_POSITION 0x8E50
+#define GL_SAMPLE_MASK 0x8E51
+#define GL_SAMPLE_MASK_VALUE 0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES 0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE 0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F
+#define GL_MAX_INTEGER_SAMPLES 0x9110
+
+typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat* val);
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+
+#define glGetMultisamplefv GLEW_GET_FUN(__glewGetMultisamplefv)
+#define glSampleMaski GLEW_GET_FUN(__glewSampleMaski)
+#define glTexImage2DMultisample GLEW_GET_FUN(__glewTexImage2DMultisample)
+#define glTexImage3DMultisample GLEW_GET_FUN(__glewTexImage3DMultisample)
+
+#define GLEW_ARB_texture_multisample GLEW_GET_VAR(__GLEW_ARB_texture_multisample)
+
+#endif /* GL_ARB_texture_multisample */
+
+/* -------------------- GL_ARB_texture_non_power_of_two -------------------- */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+
+#define GLEW_ARB_texture_non_power_of_two GLEW_GET_VAR(__GLEW_ARB_texture_non_power_of_two)
+
+#endif /* GL_ARB_texture_non_power_of_two */
+
+/* ---------------------- GL_ARB_texture_query_levels ---------------------- */
+
+#ifndef GL_ARB_texture_query_levels
+#define GL_ARB_texture_query_levels 1
+
+#define GLEW_ARB_texture_query_levels GLEW_GET_VAR(__GLEW_ARB_texture_query_levels)
+
+#endif /* GL_ARB_texture_query_levels */
+
+/* ------------------------ GL_ARB_texture_query_lod ----------------------- */
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+
+#define GLEW_ARB_texture_query_lod GLEW_GET_VAR(__GLEW_ARB_texture_query_lod)
+
+#endif /* GL_ARB_texture_query_lod */
+
+/* ------------------------ GL_ARB_texture_rectangle ----------------------- */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#define GL_SAMPLER_2D_RECT_ARB 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
+
+#define GLEW_ARB_texture_rectangle GLEW_GET_VAR(__GLEW_ARB_texture_rectangle)
+
+#endif /* GL_ARB_texture_rectangle */
+
+/* --------------------------- GL_ARB_texture_rg --------------------------- */
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+
+#define GL_COMPRESSED_RED 0x8225
+#define GL_COMPRESSED_RG 0x8226
+#define GL_RG 0x8227
+#define GL_RG_INTEGER 0x8228
+#define GL_R8 0x8229
+#define GL_R16 0x822A
+#define GL_RG8 0x822B
+#define GL_RG16 0x822C
+#define GL_R16F 0x822D
+#define GL_R32F 0x822E
+#define GL_RG16F 0x822F
+#define GL_RG32F 0x8230
+#define GL_R8I 0x8231
+#define GL_R8UI 0x8232
+#define GL_R16I 0x8233
+#define GL_R16UI 0x8234
+#define GL_R32I 0x8235
+#define GL_R32UI 0x8236
+#define GL_RG8I 0x8237
+#define GL_RG8UI 0x8238
+#define GL_RG16I 0x8239
+#define GL_RG16UI 0x823A
+#define GL_RG32I 0x823B
+#define GL_RG32UI 0x823C
+
+#define GLEW_ARB_texture_rg GLEW_GET_VAR(__GLEW_ARB_texture_rg)
+
+#endif /* GL_ARB_texture_rg */
+
+/* ----------------------- GL_ARB_texture_rgb10_a2ui ----------------------- */
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+
+#define GL_RGB10_A2UI 0x906F
+
+#define GLEW_ARB_texture_rgb10_a2ui GLEW_GET_VAR(__GLEW_ARB_texture_rgb10_a2ui)
+
+#endif /* GL_ARB_texture_rgb10_a2ui */
+
+/* ------------------------ GL_ARB_texture_stencil8 ------------------------ */
+
+#ifndef GL_ARB_texture_stencil8
+#define GL_ARB_texture_stencil8 1
+
+#define GL_STENCIL_INDEX 0x1901
+#define GL_STENCIL_INDEX8 0x8D48
+
+#define GLEW_ARB_texture_stencil8 GLEW_GET_VAR(__GLEW_ARB_texture_stencil8)
+
+#endif /* GL_ARB_texture_stencil8 */
+
+/* ------------------------- GL_ARB_texture_storage ------------------------ */
+
+#ifndef GL_ARB_texture_storage
+#define GL_ARB_texture_storage 1
+
+#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F
+
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+
+#define glTexStorage1D GLEW_GET_FUN(__glewTexStorage1D)
+#define glTexStorage2D GLEW_GET_FUN(__glewTexStorage2D)
+#define glTexStorage3D GLEW_GET_FUN(__glewTexStorage3D)
+
+#define GLEW_ARB_texture_storage GLEW_GET_VAR(__GLEW_ARB_texture_storage)
+
+#endif /* GL_ARB_texture_storage */
+
+/* ------------------- GL_ARB_texture_storage_multisample ------------------ */
+
+#ifndef GL_ARB_texture_storage_multisample
+#define GL_ARB_texture_storage_multisample 1
+
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+
+#define glTexStorage2DMultisample GLEW_GET_FUN(__glewTexStorage2DMultisample)
+#define glTexStorage3DMultisample GLEW_GET_FUN(__glewTexStorage3DMultisample)
+#define glTextureStorage2DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage2DMultisampleEXT)
+#define glTextureStorage3DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage3DMultisampleEXT)
+
+#define GLEW_ARB_texture_storage_multisample GLEW_GET_VAR(__GLEW_ARB_texture_storage_multisample)
+
+#endif /* GL_ARB_texture_storage_multisample */
+
+/* ------------------------- GL_ARB_texture_swizzle ------------------------ */
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+
+#define GL_TEXTURE_SWIZZLE_R 0x8E42
+#define GL_TEXTURE_SWIZZLE_G 0x8E43
+#define GL_TEXTURE_SWIZZLE_B 0x8E44
+#define GL_TEXTURE_SWIZZLE_A 0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
+
+#define GLEW_ARB_texture_swizzle GLEW_GET_VAR(__GLEW_ARB_texture_swizzle)
+
+#endif /* GL_ARB_texture_swizzle */
+
+/* -------------------------- GL_ARB_texture_view -------------------------- */
+
+#ifndef GL_ARB_texture_view
+#define GL_ARB_texture_view 1
+
+#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+
+#define glTextureView GLEW_GET_FUN(__glewTextureView)
+
+#define GLEW_ARB_texture_view GLEW_GET_VAR(__GLEW_ARB_texture_view)
+
+#endif /* GL_ARB_texture_view */
+
+/* --------------------------- GL_ARB_timer_query -------------------------- */
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+
+#define GL_TIME_ELAPSED 0x88BF
+#define GL_TIMESTAMP 0x8E28
+
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+
+#define glGetQueryObjecti64v GLEW_GET_FUN(__glewGetQueryObjecti64v)
+#define glGetQueryObjectui64v GLEW_GET_FUN(__glewGetQueryObjectui64v)
+#define glQueryCounter GLEW_GET_FUN(__glewQueryCounter)
+
+#define GLEW_ARB_timer_query GLEW_GET_VAR(__GLEW_ARB_timer_query)
+
+#endif /* GL_ARB_timer_query */
+
+/* ----------------------- GL_ARB_transform_feedback2 ---------------------- */
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+
+#define GL_TRANSFORM_FEEDBACK 0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25
+
+typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids);
+typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+
+#define glBindTransformFeedback GLEW_GET_FUN(__glewBindTransformFeedback)
+#define glDeleteTransformFeedbacks GLEW_GET_FUN(__glewDeleteTransformFeedbacks)
+#define glDrawTransformFeedback GLEW_GET_FUN(__glewDrawTransformFeedback)
+#define glGenTransformFeedbacks GLEW_GET_FUN(__glewGenTransformFeedbacks)
+#define glIsTransformFeedback GLEW_GET_FUN(__glewIsTransformFeedback)
+#define glPauseTransformFeedback GLEW_GET_FUN(__glewPauseTransformFeedback)
+#define glResumeTransformFeedback GLEW_GET_FUN(__glewResumeTransformFeedback)
+
+#define GLEW_ARB_transform_feedback2 GLEW_GET_VAR(__GLEW_ARB_transform_feedback2)
+
+#endif /* GL_ARB_transform_feedback2 */
+
+/* ----------------------- GL_ARB_transform_feedback3 ---------------------- */
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+#define GL_MAX_VERTEX_STREAMS 0x8E71
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (GLAPIENTRY * PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params);
+
+#define glBeginQueryIndexed GLEW_GET_FUN(__glewBeginQueryIndexed)
+#define glDrawTransformFeedbackStream GLEW_GET_FUN(__glewDrawTransformFeedbackStream)
+#define glEndQueryIndexed GLEW_GET_FUN(__glewEndQueryIndexed)
+#define glGetQueryIndexediv GLEW_GET_FUN(__glewGetQueryIndexediv)
+
+#define GLEW_ARB_transform_feedback3 GLEW_GET_VAR(__GLEW_ARB_transform_feedback3)
+
+#endif /* GL_ARB_transform_feedback3 */
+
+/* ------------------ GL_ARB_transform_feedback_instanced ------------------ */
+
+#ifndef GL_ARB_transform_feedback_instanced
+#define GL_ARB_transform_feedback_instanced 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei primcount);
+
+#define glDrawTransformFeedbackInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackInstanced)
+#define glDrawTransformFeedbackStreamInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackStreamInstanced)
+
+#define GLEW_ARB_transform_feedback_instanced GLEW_GET_VAR(__GLEW_ARB_transform_feedback_instanced)
+
+#endif /* GL_ARB_transform_feedback_instanced */
+
+/* ---------------- GL_ARB_transform_feedback_overflow_query --------------- */
+
+#ifndef GL_ARB_transform_feedback_overflow_query
+#define GL_ARB_transform_feedback_overflow_query 1
+
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED
+
+#define GLEW_ARB_transform_feedback_overflow_query GLEW_GET_VAR(__GLEW_ARB_transform_feedback_overflow_query)
+
+#endif /* GL_ARB_transform_feedback_overflow_query */
+
+/* ------------------------ GL_ARB_transpose_matrix ------------------------ */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
+
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
+
+#define glLoadTransposeMatrixdARB GLEW_GET_FUN(__glewLoadTransposeMatrixdARB)
+#define glLoadTransposeMatrixfARB GLEW_GET_FUN(__glewLoadTransposeMatrixfARB)
+#define glMultTransposeMatrixdARB GLEW_GET_FUN(__glewMultTransposeMatrixdARB)
+#define glMultTransposeMatrixfARB GLEW_GET_FUN(__glewMultTransposeMatrixfARB)
+
+#define GLEW_ARB_transpose_matrix GLEW_GET_VAR(__GLEW_ARB_transpose_matrix)
+
+#endif /* GL_ARB_transpose_matrix */
+
+/* ---------------------- GL_ARB_uniform_buffer_object --------------------- */
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+
+#define GL_UNIFORM_BUFFER 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING 0x8A28
+#define GL_UNIFORM_BUFFER_START 0x8A29
+#define GL_UNIFORM_BUFFER_SIZE 0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36
+#define GL_UNIFORM_TYPE 0x8A37
+#define GL_UNIFORM_SIZE 0x8A38
+#define GL_UNIFORM_NAME_LENGTH 0x8A39
+#define GL_UNIFORM_BLOCK_INDEX 0x8A3A
+#define GL_UNIFORM_OFFSET 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING 0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX 0xFFFFFFFFu
+
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint* data);
+typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* const * uniformNames, GLuint* uniformIndices);
+typedef void (GLAPIENTRY * PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+
+#define glBindBufferBase GLEW_GET_FUN(__glewBindBufferBase)
+#define glBindBufferRange GLEW_GET_FUN(__glewBindBufferRange)
+#define glGetActiveUniformBlockName GLEW_GET_FUN(__glewGetActiveUniformBlockName)
+#define glGetActiveUniformBlockiv GLEW_GET_FUN(__glewGetActiveUniformBlockiv)
+#define glGetActiveUniformName GLEW_GET_FUN(__glewGetActiveUniformName)
+#define glGetActiveUniformsiv GLEW_GET_FUN(__glewGetActiveUniformsiv)
+#define glGetIntegeri_v GLEW_GET_FUN(__glewGetIntegeri_v)
+#define glGetUniformBlockIndex GLEW_GET_FUN(__glewGetUniformBlockIndex)
+#define glGetUniformIndices GLEW_GET_FUN(__glewGetUniformIndices)
+#define glUniformBlockBinding GLEW_GET_FUN(__glewUniformBlockBinding)
+
+#define GLEW_ARB_uniform_buffer_object GLEW_GET_VAR(__GLEW_ARB_uniform_buffer_object)
+
+#endif /* GL_ARB_uniform_buffer_object */
+
+/* ------------------------ GL_ARB_vertex_array_bgra ----------------------- */
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+
+#define GL_BGRA 0x80E1
+
+#define GLEW_ARB_vertex_array_bgra GLEW_GET_VAR(__GLEW_ARB_vertex_array_bgra)
+
+#endif /* GL_ARB_vertex_array_bgra */
+
+/* ----------------------- GL_ARB_vertex_array_object ---------------------- */
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+
+#define GL_VERTEX_ARRAY_BINDING 0x85B5
+
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays);
+typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
+typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYPROC) (GLuint array);
+
+#define glBindVertexArray GLEW_GET_FUN(__glewBindVertexArray)
+#define glDeleteVertexArrays GLEW_GET_FUN(__glewDeleteVertexArrays)
+#define glGenVertexArrays GLEW_GET_FUN(__glewGenVertexArrays)
+#define glIsVertexArray GLEW_GET_FUN(__glewIsVertexArray)
+
+#define GLEW_ARB_vertex_array_object GLEW_GET_VAR(__GLEW_ARB_vertex_array_object)
+
+#endif /* GL_ARB_vertex_array_object */
+
+/* ----------------------- GL_ARB_vertex_attrib_64bit ---------------------- */
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer);
+
+#define glGetVertexAttribLdv GLEW_GET_FUN(__glewGetVertexAttribLdv)
+#define glVertexAttribL1d GLEW_GET_FUN(__glewVertexAttribL1d)
+#define glVertexAttribL1dv GLEW_GET_FUN(__glewVertexAttribL1dv)
+#define glVertexAttribL2d GLEW_GET_FUN(__glewVertexAttribL2d)
+#define glVertexAttribL2dv GLEW_GET_FUN(__glewVertexAttribL2dv)
+#define glVertexAttribL3d GLEW_GET_FUN(__glewVertexAttribL3d)
+#define glVertexAttribL3dv GLEW_GET_FUN(__glewVertexAttribL3dv)
+#define glVertexAttribL4d GLEW_GET_FUN(__glewVertexAttribL4d)
+#define glVertexAttribL4dv GLEW_GET_FUN(__glewVertexAttribL4dv)
+#define glVertexAttribLPointer GLEW_GET_FUN(__glewVertexAttribLPointer)
+
+#define GLEW_ARB_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_64bit)
+
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+/* ---------------------- GL_ARB_vertex_attrib_binding --------------------- */
+
+#ifndef GL_ARB_vertex_attrib_binding
+#define GL_ARB_vertex_attrib_binding 1
+
+#define GL_VERTEX_ATTRIB_BINDING 0x82D4
+#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5
+#define GL_VERTEX_BINDING_DIVISOR 0x82D6
+#define GL_VERTEX_BINDING_OFFSET 0x82D7
+#define GL_VERTEX_BINDING_STRIDE 0x82D8
+#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
+#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA
+#define GL_VERTEX_BINDING_BUFFER 0x8F4F
+
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (GLAPIENTRY * PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
+
+#define glBindVertexBuffer GLEW_GET_FUN(__glewBindVertexBuffer)
+#define glVertexArrayBindVertexBufferEXT GLEW_GET_FUN(__glewVertexArrayBindVertexBufferEXT)
+#define glVertexArrayVertexAttribBindingEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribBindingEXT)
+#define glVertexArrayVertexAttribFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribFormatEXT)
+#define glVertexArrayVertexAttribIFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIFormatEXT)
+#define glVertexArrayVertexAttribLFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLFormatEXT)
+#define glVertexArrayVertexBindingDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexBindingDivisorEXT)
+#define glVertexAttribBinding GLEW_GET_FUN(__glewVertexAttribBinding)
+#define glVertexAttribFormat GLEW_GET_FUN(__glewVertexAttribFormat)
+#define glVertexAttribIFormat GLEW_GET_FUN(__glewVertexAttribIFormat)
+#define glVertexAttribLFormat GLEW_GET_FUN(__glewVertexAttribLFormat)
+#define glVertexBindingDivisor GLEW_GET_FUN(__glewVertexBindingDivisor)
+
+#define GLEW_ARB_vertex_attrib_binding GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_binding)
+
+#endif /* GL_ARB_vertex_attrib_binding */
+
+/* -------------------------- GL_ARB_vertex_blend -------------------------- */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+
+#define GL_MODELVIEW0_ARB 0x1700
+#define GL_MODELVIEW1_ARB 0x850A
+#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
+#define GL_VERTEX_BLEND_ARB 0x86A7
+#define GL_CURRENT_WEIGHT_ARB 0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
+#define GL_WEIGHT_ARRAY_ARB 0x86AD
+#define GL_MODELVIEW2_ARB 0x8722
+#define GL_MODELVIEW3_ARB 0x8723
+#define GL_MODELVIEW4_ARB 0x8724
+#define GL_MODELVIEW5_ARB 0x8725
+#define GL_MODELVIEW6_ARB 0x8726
+#define GL_MODELVIEW7_ARB 0x8727
+#define GL_MODELVIEW8_ARB 0x8728
+#define GL_MODELVIEW9_ARB 0x8729
+#define GL_MODELVIEW10_ARB 0x872A
+#define GL_MODELVIEW11_ARB 0x872B
+#define GL_MODELVIEW12_ARB 0x872C
+#define GL_MODELVIEW13_ARB 0x872D
+#define GL_MODELVIEW14_ARB 0x872E
+#define GL_MODELVIEW15_ARB 0x872F
+#define GL_MODELVIEW16_ARB 0x8730
+#define GL_MODELVIEW17_ARB 0x8731
+#define GL_MODELVIEW18_ARB 0x8732
+#define GL_MODELVIEW19_ARB 0x8733
+#define GL_MODELVIEW20_ARB 0x8734
+#define GL_MODELVIEW21_ARB 0x8735
+#define GL_MODELVIEW22_ARB 0x8736
+#define GL_MODELVIEW23_ARB 0x8737
+#define GL_MODELVIEW24_ARB 0x8738
+#define GL_MODELVIEW25_ARB 0x8739
+#define GL_MODELVIEW26_ARB 0x873A
+#define GL_MODELVIEW27_ARB 0x873B
+#define GL_MODELVIEW28_ARB 0x873C
+#define GL_MODELVIEW29_ARB 0x873D
+#define GL_MODELVIEW30_ARB 0x873E
+#define GL_MODELVIEW31_ARB 0x873F
+
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count);
+typedef void (GLAPIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer);
+typedef void (GLAPIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, GLbyte *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, GLdouble *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, GLfloat *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, GLint *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, GLshort *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, GLubyte *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, GLuint *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, GLushort *weights);
+
+#define glVertexBlendARB GLEW_GET_FUN(__glewVertexBlendARB)
+#define glWeightPointerARB GLEW_GET_FUN(__glewWeightPointerARB)
+#define glWeightbvARB GLEW_GET_FUN(__glewWeightbvARB)
+#define glWeightdvARB GLEW_GET_FUN(__glewWeightdvARB)
+#define glWeightfvARB GLEW_GET_FUN(__glewWeightfvARB)
+#define glWeightivARB GLEW_GET_FUN(__glewWeightivARB)
+#define glWeightsvARB GLEW_GET_FUN(__glewWeightsvARB)
+#define glWeightubvARB GLEW_GET_FUN(__glewWeightubvARB)
+#define glWeightuivARB GLEW_GET_FUN(__glewWeightuivARB)
+#define glWeightusvARB GLEW_GET_FUN(__glewWeightusvARB)
+
+#define GLEW_ARB_vertex_blend GLEW_GET_VAR(__GLEW_ARB_vertex_blend)
+
+#endif /* GL_ARB_vertex_blend */
+
+/* ---------------------- GL_ARB_vertex_buffer_object ---------------------- */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+
+#define GL_BUFFER_SIZE_ARB 0x8764
+#define GL_BUFFER_USAGE_ARB 0x8765
+#define GL_ARRAY_BUFFER_ARB 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB 0x88B8
+#define GL_WRITE_ONLY_ARB 0x88B9
+#define GL_READ_WRITE_ARB 0x88BA
+#define GL_BUFFER_ACCESS_ARB 0x88BB
+#define GL_BUFFER_MAPPED_ARB 0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB 0x88BD
+#define GL_STREAM_DRAW_ARB 0x88E0
+#define GL_STREAM_READ_ARB 0x88E1
+#define GL_STREAM_COPY_ARB 0x88E2
+#define GL_STATIC_DRAW_ARB 0x88E4
+#define GL_STATIC_READ_ARB 0x88E5
+#define GL_STATIC_COPY_ARB 0x88E6
+#define GL_DYNAMIC_DRAW_ARB 0x88E8
+#define GL_DYNAMIC_READ_ARB 0x88E9
+#define GL_DYNAMIC_COPY_ARB 0x88EA
+
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void** params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void * (GLAPIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+
+#define glBindBufferARB GLEW_GET_FUN(__glewBindBufferARB)
+#define glBufferDataARB GLEW_GET_FUN(__glewBufferDataARB)
+#define glBufferSubDataARB GLEW_GET_FUN(__glewBufferSubDataARB)
+#define glDeleteBuffersARB GLEW_GET_FUN(__glewDeleteBuffersARB)
+#define glGenBuffersARB GLEW_GET_FUN(__glewGenBuffersARB)
+#define glGetBufferParameterivARB GLEW_GET_FUN(__glewGetBufferParameterivARB)
+#define glGetBufferPointervARB GLEW_GET_FUN(__glewGetBufferPointervARB)
+#define glGetBufferSubDataARB GLEW_GET_FUN(__glewGetBufferSubDataARB)
+#define glIsBufferARB GLEW_GET_FUN(__glewIsBufferARB)
+#define glMapBufferARB GLEW_GET_FUN(__glewMapBufferARB)
+#define glUnmapBufferARB GLEW_GET_FUN(__glewUnmapBufferARB)
+
+#define GLEW_ARB_vertex_buffer_object GLEW_GET_VAR(__GLEW_ARB_vertex_buffer_object)
+
+#endif /* GL_ARB_vertex_buffer_object */
+
+/* ------------------------- GL_ARB_vertex_program ------------------------- */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+
+#define GL_COLOR_SUM_ARB 0x8458
+#define GL_VERTEX_PROGRAM_ARB 0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626
+#define GL_PROGRAM_LENGTH_ARB 0x8627
+#define GL_PROGRAM_STRING_ARB 0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB 0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B
+#define GL_PROGRAM_BINDING_ARB 0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB 0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
+#define GL_PROGRAM_FORMAT_ARB 0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB 0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB 0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7
+#define GL_MATRIX0_ARB 0x88C0
+#define GL_MATRIX1_ARB 0x88C1
+#define GL_MATRIX2_ARB 0x88C2
+#define GL_MATRIX3_ARB 0x88C3
+#define GL_MATRIX4_ARB 0x88C4
+#define GL_MATRIX5_ARB 0x88C5
+#define GL_MATRIX6_ARB 0x88C6
+#define GL_MATRIX7_ARB 0x88C7
+#define GL_MATRIX8_ARB 0x88C8
+#define GL_MATRIX9_ARB 0x88C9
+#define GL_MATRIX10_ARB 0x88CA
+#define GL_MATRIX11_ARB 0x88CB
+#define GL_MATRIX12_ARB 0x88CC
+#define GL_MATRIX13_ARB 0x88CD
+#define GL_MATRIX14_ARB 0x88CE
+#define GL_MATRIX15_ARB 0x88CF
+#define GL_MATRIX16_ARB 0x88D0
+#define GL_MATRIX17_ARB 0x88D1
+#define GL_MATRIX18_ARB 0x88D2
+#define GL_MATRIX19_ARB 0x88D3
+#define GL_MATRIX20_ARB 0x88D4
+#define GL_MATRIX21_ARB 0x88D5
+#define GL_MATRIX22_ARB 0x88D6
+#define GL_MATRIX23_ARB 0x88D7
+#define GL_MATRIX24_ARB 0x88D8
+#define GL_MATRIX25_ARB 0x88D9
+#define GL_MATRIX26_ARB 0x88DA
+#define GL_MATRIX27_ARB 0x88DB
+#define GL_MATRIX28_ARB 0x88DC
+#define GL_MATRIX29_ARB 0x88DD
+#define GL_MATRIX30_ARB 0x88DE
+#define GL_MATRIX31_ARB 0x88DF
+
+typedef void (GLAPIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint* programs);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint* programs);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void** pointer);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMARBPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+
+#define glBindProgramARB GLEW_GET_FUN(__glewBindProgramARB)
+#define glDeleteProgramsARB GLEW_GET_FUN(__glewDeleteProgramsARB)
+#define glDisableVertexAttribArrayARB GLEW_GET_FUN(__glewDisableVertexAttribArrayARB)
+#define glEnableVertexAttribArrayARB GLEW_GET_FUN(__glewEnableVertexAttribArrayARB)
+#define glGenProgramsARB GLEW_GET_FUN(__glewGenProgramsARB)
+#define glGetProgramEnvParameterdvARB GLEW_GET_FUN(__glewGetProgramEnvParameterdvARB)
+#define glGetProgramEnvParameterfvARB GLEW_GET_FUN(__glewGetProgramEnvParameterfvARB)
+#define glGetProgramLocalParameterdvARB GLEW_GET_FUN(__glewGetProgramLocalParameterdvARB)
+#define glGetProgramLocalParameterfvARB GLEW_GET_FUN(__glewGetProgramLocalParameterfvARB)
+#define glGetProgramStringARB GLEW_GET_FUN(__glewGetProgramStringARB)
+#define glGetProgramivARB GLEW_GET_FUN(__glewGetProgramivARB)
+#define glGetVertexAttribPointervARB GLEW_GET_FUN(__glewGetVertexAttribPointervARB)
+#define glGetVertexAttribdvARB GLEW_GET_FUN(__glewGetVertexAttribdvARB)
+#define glGetVertexAttribfvARB GLEW_GET_FUN(__glewGetVertexAttribfvARB)
+#define glGetVertexAttribivARB GLEW_GET_FUN(__glewGetVertexAttribivARB)
+#define glIsProgramARB GLEW_GET_FUN(__glewIsProgramARB)
+#define glProgramEnvParameter4dARB GLEW_GET_FUN(__glewProgramEnvParameter4dARB)
+#define glProgramEnvParameter4dvARB GLEW_GET_FUN(__glewProgramEnvParameter4dvARB)
+#define glProgramEnvParameter4fARB GLEW_GET_FUN(__glewProgramEnvParameter4fARB)
+#define glProgramEnvParameter4fvARB GLEW_GET_FUN(__glewProgramEnvParameter4fvARB)
+#define glProgramLocalParameter4dARB GLEW_GET_FUN(__glewProgramLocalParameter4dARB)
+#define glProgramLocalParameter4dvARB GLEW_GET_FUN(__glewProgramLocalParameter4dvARB)
+#define glProgramLocalParameter4fARB GLEW_GET_FUN(__glewProgramLocalParameter4fARB)
+#define glProgramLocalParameter4fvARB GLEW_GET_FUN(__glewProgramLocalParameter4fvARB)
+#define glProgramStringARB GLEW_GET_FUN(__glewProgramStringARB)
+#define glVertexAttrib1dARB GLEW_GET_FUN(__glewVertexAttrib1dARB)
+#define glVertexAttrib1dvARB GLEW_GET_FUN(__glewVertexAttrib1dvARB)
+#define glVertexAttrib1fARB GLEW_GET_FUN(__glewVertexAttrib1fARB)
+#define glVertexAttrib1fvARB GLEW_GET_FUN(__glewVertexAttrib1fvARB)
+#define glVertexAttrib1sARB GLEW_GET_FUN(__glewVertexAttrib1sARB)
+#define glVertexAttrib1svARB GLEW_GET_FUN(__glewVertexAttrib1svARB)
+#define glVertexAttrib2dARB GLEW_GET_FUN(__glewVertexAttrib2dARB)
+#define glVertexAttrib2dvARB GLEW_GET_FUN(__glewVertexAttrib2dvARB)
+#define glVertexAttrib2fARB GLEW_GET_FUN(__glewVertexAttrib2fARB)
+#define glVertexAttrib2fvARB GLEW_GET_FUN(__glewVertexAttrib2fvARB)
+#define glVertexAttrib2sARB GLEW_GET_FUN(__glewVertexAttrib2sARB)
+#define glVertexAttrib2svARB GLEW_GET_FUN(__glewVertexAttrib2svARB)
+#define glVertexAttrib3dARB GLEW_GET_FUN(__glewVertexAttrib3dARB)
+#define glVertexAttrib3dvARB GLEW_GET_FUN(__glewVertexAttrib3dvARB)
+#define glVertexAttrib3fARB GLEW_GET_FUN(__glewVertexAttrib3fARB)
+#define glVertexAttrib3fvARB GLEW_GET_FUN(__glewVertexAttrib3fvARB)
+#define glVertexAttrib3sARB GLEW_GET_FUN(__glewVertexAttrib3sARB)
+#define glVertexAttrib3svARB GLEW_GET_FUN(__glewVertexAttrib3svARB)
+#define glVertexAttrib4NbvARB GLEW_GET_FUN(__glewVertexAttrib4NbvARB)
+#define glVertexAttrib4NivARB GLEW_GET_FUN(__glewVertexAttrib4NivARB)
+#define glVertexAttrib4NsvARB GLEW_GET_FUN(__glewVertexAttrib4NsvARB)
+#define glVertexAttrib4NubARB GLEW_GET_FUN(__glewVertexAttrib4NubARB)
+#define glVertexAttrib4NubvARB GLEW_GET_FUN(__glewVertexAttrib4NubvARB)
+#define glVertexAttrib4NuivARB GLEW_GET_FUN(__glewVertexAttrib4NuivARB)
+#define glVertexAttrib4NusvARB GLEW_GET_FUN(__glewVertexAttrib4NusvARB)
+#define glVertexAttrib4bvARB GLEW_GET_FUN(__glewVertexAttrib4bvARB)
+#define glVertexAttrib4dARB GLEW_GET_FUN(__glewVertexAttrib4dARB)
+#define glVertexAttrib4dvARB GLEW_GET_FUN(__glewVertexAttrib4dvARB)
+#define glVertexAttrib4fARB GLEW_GET_FUN(__glewVertexAttrib4fARB)
+#define glVertexAttrib4fvARB GLEW_GET_FUN(__glewVertexAttrib4fvARB)
+#define glVertexAttrib4ivARB GLEW_GET_FUN(__glewVertexAttrib4ivARB)
+#define glVertexAttrib4sARB GLEW_GET_FUN(__glewVertexAttrib4sARB)
+#define glVertexAttrib4svARB GLEW_GET_FUN(__glewVertexAttrib4svARB)
+#define glVertexAttrib4ubvARB GLEW_GET_FUN(__glewVertexAttrib4ubvARB)
+#define glVertexAttrib4uivARB GLEW_GET_FUN(__glewVertexAttrib4uivARB)
+#define glVertexAttrib4usvARB GLEW_GET_FUN(__glewVertexAttrib4usvARB)
+#define glVertexAttribPointerARB GLEW_GET_FUN(__glewVertexAttribPointerARB)
+
+#define GLEW_ARB_vertex_program GLEW_GET_VAR(__GLEW_ARB_vertex_program)
+
+#endif /* GL_ARB_vertex_program */
+
+/* -------------------------- GL_ARB_vertex_shader ------------------------- */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+
+#define GL_VERTEX_SHADER_ARB 0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+
+typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB* name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
+
+#define glBindAttribLocationARB GLEW_GET_FUN(__glewBindAttribLocationARB)
+#define glGetActiveAttribARB GLEW_GET_FUN(__glewGetActiveAttribARB)
+#define glGetAttribLocationARB GLEW_GET_FUN(__glewGetAttribLocationARB)
+
+#define GLEW_ARB_vertex_shader GLEW_GET_VAR(__GLEW_ARB_vertex_shader)
+
+#endif /* GL_ARB_vertex_shader */
+
+/* ------------------- GL_ARB_vertex_type_10f_11f_11f_rev ------------------ */
+
+#ifndef GL_ARB_vertex_type_10f_11f_11f_rev
+#define GL_ARB_vertex_type_10f_11f_11f_rev 1
+
+#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
+
+#define GLEW_ARB_vertex_type_10f_11f_11f_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_10f_11f_11f_rev)
+
+#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */
+
+/* ------------------- GL_ARB_vertex_type_2_10_10_10_rev ------------------- */
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_INT_2_10_10_10_REV 0x8D9F
+
+typedef void (GLAPIENTRY * PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (GLAPIENTRY * PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint* color);
+typedef void (GLAPIENTRY * PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (GLAPIENTRY * PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint* color);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint* color);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint* coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (GLAPIENTRY * PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint* value);
+
+#define glColorP3ui GLEW_GET_FUN(__glewColorP3ui)
+#define glColorP3uiv GLEW_GET_FUN(__glewColorP3uiv)
+#define glColorP4ui GLEW_GET_FUN(__glewColorP4ui)
+#define glColorP4uiv GLEW_GET_FUN(__glewColorP4uiv)
+#define glMultiTexCoordP1ui GLEW_GET_FUN(__glewMultiTexCoordP1ui)
+#define glMultiTexCoordP1uiv GLEW_GET_FUN(__glewMultiTexCoordP1uiv)
+#define glMultiTexCoordP2ui GLEW_GET_FUN(__glewMultiTexCoordP2ui)
+#define glMultiTexCoordP2uiv GLEW_GET_FUN(__glewMultiTexCoordP2uiv)
+#define glMultiTexCoordP3ui GLEW_GET_FUN(__glewMultiTexCoordP3ui)
+#define glMultiTexCoordP3uiv GLEW_GET_FUN(__glewMultiTexCoordP3uiv)
+#define glMultiTexCoordP4ui GLEW_GET_FUN(__glewMultiTexCoordP4ui)
+#define glMultiTexCoordP4uiv GLEW_GET_FUN(__glewMultiTexCoordP4uiv)
+#define glNormalP3ui GLEW_GET_FUN(__glewNormalP3ui)
+#define glNormalP3uiv GLEW_GET_FUN(__glewNormalP3uiv)
+#define glSecondaryColorP3ui GLEW_GET_FUN(__glewSecondaryColorP3ui)
+#define glSecondaryColorP3uiv GLEW_GET_FUN(__glewSecondaryColorP3uiv)
+#define glTexCoordP1ui GLEW_GET_FUN(__glewTexCoordP1ui)
+#define glTexCoordP1uiv GLEW_GET_FUN(__glewTexCoordP1uiv)
+#define glTexCoordP2ui GLEW_GET_FUN(__glewTexCoordP2ui)
+#define glTexCoordP2uiv GLEW_GET_FUN(__glewTexCoordP2uiv)
+#define glTexCoordP3ui GLEW_GET_FUN(__glewTexCoordP3ui)
+#define glTexCoordP3uiv GLEW_GET_FUN(__glewTexCoordP3uiv)
+#define glTexCoordP4ui GLEW_GET_FUN(__glewTexCoordP4ui)
+#define glTexCoordP4uiv GLEW_GET_FUN(__glewTexCoordP4uiv)
+#define glVertexAttribP1ui GLEW_GET_FUN(__glewVertexAttribP1ui)
+#define glVertexAttribP1uiv GLEW_GET_FUN(__glewVertexAttribP1uiv)
+#define glVertexAttribP2ui GLEW_GET_FUN(__glewVertexAttribP2ui)
+#define glVertexAttribP2uiv GLEW_GET_FUN(__glewVertexAttribP2uiv)
+#define glVertexAttribP3ui GLEW_GET_FUN(__glewVertexAttribP3ui)
+#define glVertexAttribP3uiv GLEW_GET_FUN(__glewVertexAttribP3uiv)
+#define glVertexAttribP4ui GLEW_GET_FUN(__glewVertexAttribP4ui)
+#define glVertexAttribP4uiv GLEW_GET_FUN(__glewVertexAttribP4uiv)
+#define glVertexP2ui GLEW_GET_FUN(__glewVertexP2ui)
+#define glVertexP2uiv GLEW_GET_FUN(__glewVertexP2uiv)
+#define glVertexP3ui GLEW_GET_FUN(__glewVertexP3ui)
+#define glVertexP3uiv GLEW_GET_FUN(__glewVertexP3uiv)
+#define glVertexP4ui GLEW_GET_FUN(__glewVertexP4ui)
+#define glVertexP4uiv GLEW_GET_FUN(__glewVertexP4uiv)
+
+#define GLEW_ARB_vertex_type_2_10_10_10_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_2_10_10_10_rev)
+
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+/* ------------------------- GL_ARB_viewport_array ------------------------- */
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_VIEWPORT 0x0BA2
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_MAX_VIEWPORTS 0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE 0x825D
+#define GL_LAYER_PROVOKING_VERTEX 0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX 0x8260
+#define GL_FIRST_VERTEX_CONVENTION 0x8E4D
+#define GL_LAST_VERTEX_CONVENTION 0x8E4E
+#define GL_PROVOKING_VERTEX 0x8E4F
+
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd * v);
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f);
+typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble* data);
+typedef void (GLAPIENTRY * PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat* data);
+typedef void (GLAPIENTRY * PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint * v);
+typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint * v);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat * v);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat * v);
+
+#define glDepthRangeArrayv GLEW_GET_FUN(__glewDepthRangeArrayv)
+#define glDepthRangeIndexed GLEW_GET_FUN(__glewDepthRangeIndexed)
+#define glGetDoublei_v GLEW_GET_FUN(__glewGetDoublei_v)
+#define glGetFloati_v GLEW_GET_FUN(__glewGetFloati_v)
+#define glScissorArrayv GLEW_GET_FUN(__glewScissorArrayv)
+#define glScissorIndexed GLEW_GET_FUN(__glewScissorIndexed)
+#define glScissorIndexedv GLEW_GET_FUN(__glewScissorIndexedv)
+#define glViewportArrayv GLEW_GET_FUN(__glewViewportArrayv)
+#define glViewportIndexedf GLEW_GET_FUN(__glewViewportIndexedf)
+#define glViewportIndexedfv GLEW_GET_FUN(__glewViewportIndexedfv)
+
+#define GLEW_ARB_viewport_array GLEW_GET_VAR(__GLEW_ARB_viewport_array)
+
+#endif /* GL_ARB_viewport_array */
+
+/* --------------------------- GL_ARB_window_pos --------------------------- */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort* p);
+
+#define glWindowPos2dARB GLEW_GET_FUN(__glewWindowPos2dARB)
+#define glWindowPos2dvARB GLEW_GET_FUN(__glewWindowPos2dvARB)
+#define glWindowPos2fARB GLEW_GET_FUN(__glewWindowPos2fARB)
+#define glWindowPos2fvARB GLEW_GET_FUN(__glewWindowPos2fvARB)
+#define glWindowPos2iARB GLEW_GET_FUN(__glewWindowPos2iARB)
+#define glWindowPos2ivARB GLEW_GET_FUN(__glewWindowPos2ivARB)
+#define glWindowPos2sARB GLEW_GET_FUN(__glewWindowPos2sARB)
+#define glWindowPos2svARB GLEW_GET_FUN(__glewWindowPos2svARB)
+#define glWindowPos3dARB GLEW_GET_FUN(__glewWindowPos3dARB)
+#define glWindowPos3dvARB GLEW_GET_FUN(__glewWindowPos3dvARB)
+#define glWindowPos3fARB GLEW_GET_FUN(__glewWindowPos3fARB)
+#define glWindowPos3fvARB GLEW_GET_FUN(__glewWindowPos3fvARB)
+#define glWindowPos3iARB GLEW_GET_FUN(__glewWindowPos3iARB)
+#define glWindowPos3ivARB GLEW_GET_FUN(__glewWindowPos3ivARB)
+#define glWindowPos3sARB GLEW_GET_FUN(__glewWindowPos3sARB)
+#define glWindowPos3svARB GLEW_GET_FUN(__glewWindowPos3svARB)
+
+#define GLEW_ARB_window_pos GLEW_GET_VAR(__GLEW_ARB_window_pos)
+
+#endif /* GL_ARB_window_pos */
+
+/* ----------------------- GL_ARM_mali_program_binary ---------------------- */
+
+#ifndef GL_ARM_mali_program_binary
+#define GL_ARM_mali_program_binary 1
+
+#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61
+
+#define GLEW_ARM_mali_program_binary GLEW_GET_VAR(__GLEW_ARM_mali_program_binary)
+
+#endif /* GL_ARM_mali_program_binary */
+
+/* ----------------------- GL_ARM_mali_shader_binary ----------------------- */
+
+#ifndef GL_ARM_mali_shader_binary
+#define GL_ARM_mali_shader_binary 1
+
+#define GL_MALI_SHADER_BINARY_ARM 0x8F60
+
+#define GLEW_ARM_mali_shader_binary GLEW_GET_VAR(__GLEW_ARM_mali_shader_binary)
+
+#endif /* GL_ARM_mali_shader_binary */
+
+/* ------------------------------ GL_ARM_rgba8 ----------------------------- */
+
+#ifndef GL_ARM_rgba8
+#define GL_ARM_rgba8 1
+
+#define GL_RGBA8_OES 0x8058
+
+#define GLEW_ARM_rgba8 GLEW_GET_VAR(__GLEW_ARM_rgba8)
+
+#endif /* GL_ARM_rgba8 */
+
+/* -------------------- GL_ARM_shader_framebuffer_fetch -------------------- */
+
+#ifndef GL_ARM_shader_framebuffer_fetch
+#define GL_ARM_shader_framebuffer_fetch 1
+
+#define GL_FETCH_PER_SAMPLE_ARM 0x8F65
+#define GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM 0x8F66
+
+#define GLEW_ARM_shader_framebuffer_fetch GLEW_GET_VAR(__GLEW_ARM_shader_framebuffer_fetch)
+
+#endif /* GL_ARM_shader_framebuffer_fetch */
+
+/* ------------- GL_ARM_shader_framebuffer_fetch_depth_stencil ------------- */
+
+#ifndef GL_ARM_shader_framebuffer_fetch_depth_stencil
+#define GL_ARM_shader_framebuffer_fetch_depth_stencil 1
+
+#define GLEW_ARM_shader_framebuffer_fetch_depth_stencil GLEW_GET_VAR(__GLEW_ARM_shader_framebuffer_fetch_depth_stencil)
+
+#endif /* GL_ARM_shader_framebuffer_fetch_depth_stencil */
+
+/* ------------------------- GL_ATIX_point_sprites ------------------------- */
+
+#ifndef GL_ATIX_point_sprites
+#define GL_ATIX_point_sprites 1
+
+#define GL_TEXTURE_POINT_MODE_ATIX 0x60B0
+#define GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60B1
+#define GL_TEXTURE_POINT_SPRITE_ATIX 0x60B2
+#define GL_POINT_SPRITE_CULL_MODE_ATIX 0x60B3
+#define GL_POINT_SPRITE_CULL_CENTER_ATIX 0x60B4
+#define GL_POINT_SPRITE_CULL_CLIP_ATIX 0x60B5
+
+#define GLEW_ATIX_point_sprites GLEW_GET_VAR(__GLEW_ATIX_point_sprites)
+
+#endif /* GL_ATIX_point_sprites */
+
+/* ---------------------- GL_ATIX_texture_env_combine3 --------------------- */
+
+#ifndef GL_ATIX_texture_env_combine3
+#define GL_ATIX_texture_env_combine3 1
+
+#define GL_MODULATE_ADD_ATIX 0x8744
+#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745
+#define GL_MODULATE_SUBTRACT_ATIX 0x8746
+
+#define GLEW_ATIX_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATIX_texture_env_combine3)
+
+#endif /* GL_ATIX_texture_env_combine3 */
+
+/* ----------------------- GL_ATIX_texture_env_route ----------------------- */
+
+#ifndef GL_ATIX_texture_env_route
+#define GL_ATIX_texture_env_route 1
+
+#define GL_SECONDARY_COLOR_ATIX 0x8747
+#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748
+#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749
+
+#define GLEW_ATIX_texture_env_route GLEW_GET_VAR(__GLEW_ATIX_texture_env_route)
+
+#endif /* GL_ATIX_texture_env_route */
+
+/* ---------------- GL_ATIX_vertex_shader_output_point_size ---------------- */
+
+#ifndef GL_ATIX_vertex_shader_output_point_size
+#define GL_ATIX_vertex_shader_output_point_size 1
+
+#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E
+
+#define GLEW_ATIX_vertex_shader_output_point_size GLEW_GET_VAR(__GLEW_ATIX_vertex_shader_output_point_size)
+
+#endif /* GL_ATIX_vertex_shader_output_point_size */
+
+/* -------------------------- GL_ATI_draw_buffers -------------------------- */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_ATI 0x8824
+#define GL_DRAW_BUFFER0_ATI 0x8825
+#define GL_DRAW_BUFFER1_ATI 0x8826
+#define GL_DRAW_BUFFER2_ATI 0x8827
+#define GL_DRAW_BUFFER3_ATI 0x8828
+#define GL_DRAW_BUFFER4_ATI 0x8829
+#define GL_DRAW_BUFFER5_ATI 0x882A
+#define GL_DRAW_BUFFER6_ATI 0x882B
+#define GL_DRAW_BUFFER7_ATI 0x882C
+#define GL_DRAW_BUFFER8_ATI 0x882D
+#define GL_DRAW_BUFFER9_ATI 0x882E
+#define GL_DRAW_BUFFER10_ATI 0x882F
+#define GL_DRAW_BUFFER11_ATI 0x8830
+#define GL_DRAW_BUFFER12_ATI 0x8831
+#define GL_DRAW_BUFFER13_ATI 0x8832
+#define GL_DRAW_BUFFER14_ATI 0x8833
+#define GL_DRAW_BUFFER15_ATI 0x8834
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersATI GLEW_GET_FUN(__glewDrawBuffersATI)
+
+#define GLEW_ATI_draw_buffers GLEW_GET_VAR(__GLEW_ATI_draw_buffers)
+
+#endif /* GL_ATI_draw_buffers */
+
+/* -------------------------- GL_ATI_element_array ------------------------- */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+
+#define GL_ELEMENT_ARRAY_ATI 0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer);
+
+#define glDrawElementArrayATI GLEW_GET_FUN(__glewDrawElementArrayATI)
+#define glDrawRangeElementArrayATI GLEW_GET_FUN(__glewDrawRangeElementArrayATI)
+#define glElementPointerATI GLEW_GET_FUN(__glewElementPointerATI)
+
+#define GLEW_ATI_element_array GLEW_GET_VAR(__GLEW_ATI_element_array)
+
+#endif /* GL_ATI_element_array */
+
+/* ------------------------- GL_ATI_envmap_bumpmap ------------------------- */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+
+#define GL_BUMP_ROT_MATRIX_ATI 0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777
+#define GL_BUMP_TEX_UNITS_ATI 0x8778
+#define GL_DUDV_ATI 0x8779
+#define GL_DU8DV8_ATI 0x877A
+#define GL_BUMP_ENVMAP_ATI 0x877B
+#define GL_BUMP_TARGET_ATI 0x877C
+
+typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+
+#define glGetTexBumpParameterfvATI GLEW_GET_FUN(__glewGetTexBumpParameterfvATI)
+#define glGetTexBumpParameterivATI GLEW_GET_FUN(__glewGetTexBumpParameterivATI)
+#define glTexBumpParameterfvATI GLEW_GET_FUN(__glewTexBumpParameterfvATI)
+#define glTexBumpParameterivATI GLEW_GET_FUN(__glewTexBumpParameterivATI)
+
+#define GLEW_ATI_envmap_bumpmap GLEW_GET_VAR(__GLEW_ATI_envmap_bumpmap)
+
+#endif /* GL_ATI_envmap_bumpmap */
+
+/* ------------------------- GL_ATI_fragment_shader ------------------------ */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+
+#define GL_2X_BIT_ATI 0x00000001
+#define GL_RED_BIT_ATI 0x00000001
+#define GL_4X_BIT_ATI 0x00000002
+#define GL_COMP_BIT_ATI 0x00000002
+#define GL_GREEN_BIT_ATI 0x00000002
+#define GL_8X_BIT_ATI 0x00000004
+#define GL_BLUE_BIT_ATI 0x00000004
+#define GL_NEGATE_BIT_ATI 0x00000004
+#define GL_BIAS_BIT_ATI 0x00000008
+#define GL_HALF_BIT_ATI 0x00000008
+#define GL_QUARTER_BIT_ATI 0x00000010
+#define GL_EIGHTH_BIT_ATI 0x00000020
+#define GL_SATURATE_BIT_ATI 0x00000040
+#define GL_FRAGMENT_SHADER_ATI 0x8920
+#define GL_REG_0_ATI 0x8921
+#define GL_REG_1_ATI 0x8922
+#define GL_REG_2_ATI 0x8923
+#define GL_REG_3_ATI 0x8924
+#define GL_REG_4_ATI 0x8925
+#define GL_REG_5_ATI 0x8926
+#define GL_CON_0_ATI 0x8941
+#define GL_CON_1_ATI 0x8942
+#define GL_CON_2_ATI 0x8943
+#define GL_CON_3_ATI 0x8944
+#define GL_CON_4_ATI 0x8945
+#define GL_CON_5_ATI 0x8946
+#define GL_CON_6_ATI 0x8947
+#define GL_CON_7_ATI 0x8948
+#define GL_MOV_ATI 0x8961
+#define GL_ADD_ATI 0x8963
+#define GL_MUL_ATI 0x8964
+#define GL_SUB_ATI 0x8965
+#define GL_DOT3_ATI 0x8966
+#define GL_DOT4_ATI 0x8967
+#define GL_MAD_ATI 0x8968
+#define GL_LERP_ATI 0x8969
+#define GL_CND_ATI 0x896A
+#define GL_CND0_ATI 0x896B
+#define GL_DOT2_ADD_ATI 0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F
+#define GL_NUM_PASSES_ATI 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975
+#define GL_SWIZZLE_STR_ATI 0x8976
+#define GL_SWIZZLE_STQ_ATI 0x8977
+#define GL_SWIZZLE_STR_DR_ATI 0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI 0x8979
+#define GL_SWIZZLE_STRQ_ATI 0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B
+
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (GLAPIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (GLAPIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (GLAPIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (GLAPIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (GLAPIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (GLAPIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat* value);
+
+#define glAlphaFragmentOp1ATI GLEW_GET_FUN(__glewAlphaFragmentOp1ATI)
+#define glAlphaFragmentOp2ATI GLEW_GET_FUN(__glewAlphaFragmentOp2ATI)
+#define glAlphaFragmentOp3ATI GLEW_GET_FUN(__glewAlphaFragmentOp3ATI)
+#define glBeginFragmentShaderATI GLEW_GET_FUN(__glewBeginFragmentShaderATI)
+#define glBindFragmentShaderATI GLEW_GET_FUN(__glewBindFragmentShaderATI)
+#define glColorFragmentOp1ATI GLEW_GET_FUN(__glewColorFragmentOp1ATI)
+#define glColorFragmentOp2ATI GLEW_GET_FUN(__glewColorFragmentOp2ATI)
+#define glColorFragmentOp3ATI GLEW_GET_FUN(__glewColorFragmentOp3ATI)
+#define glDeleteFragmentShaderATI GLEW_GET_FUN(__glewDeleteFragmentShaderATI)
+#define glEndFragmentShaderATI GLEW_GET_FUN(__glewEndFragmentShaderATI)
+#define glGenFragmentShadersATI GLEW_GET_FUN(__glewGenFragmentShadersATI)
+#define glPassTexCoordATI GLEW_GET_FUN(__glewPassTexCoordATI)
+#define glSampleMapATI GLEW_GET_FUN(__glewSampleMapATI)
+#define glSetFragmentShaderConstantATI GLEW_GET_FUN(__glewSetFragmentShaderConstantATI)
+
+#define GLEW_ATI_fragment_shader GLEW_GET_VAR(__GLEW_ATI_fragment_shader)
+
+#endif /* GL_ATI_fragment_shader */
+
+/* ------------------------ GL_ATI_map_object_buffer ----------------------- */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+
+typedef void * (GLAPIENTRY * PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+
+#define glMapObjectBufferATI GLEW_GET_FUN(__glewMapObjectBufferATI)
+#define glUnmapObjectBufferATI GLEW_GET_FUN(__glewUnmapObjectBufferATI)
+
+#define GLEW_ATI_map_object_buffer GLEW_GET_VAR(__GLEW_ATI_map_object_buffer)
+
+#endif /* GL_ATI_map_object_buffer */
+
+/* ----------------------------- GL_ATI_meminfo ---------------------------- */
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+
+#define GL_VBO_FREE_MEMORY_ATI 0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD
+
+#define GLEW_ATI_meminfo GLEW_GET_VAR(__GLEW_ATI_meminfo)
+
+#endif /* GL_ATI_meminfo */
+
+/* -------------------------- GL_ATI_pn_triangles -------------------------- */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+
+#define GL_PN_TRIANGLES_ATI 0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+
+typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+
+#define glPNTrianglesfATI GLEW_GET_FUN(__glewPNTrianglesfATI)
+#define glPNTrianglesiATI GLEW_GET_FUN(__glewPNTrianglesiATI)
+
+#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles)
+
+#endif /* GL_ATI_pn_triangles */
+
+/* ------------------------ GL_ATI_separate_stencil ------------------------ */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+
+#define GL_STENCIL_BACK_FUNC_ATI 0x8800
+#define GL_STENCIL_BACK_FAIL_ATI 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+
+#define glStencilFuncSeparateATI GLEW_GET_FUN(__glewStencilFuncSeparateATI)
+#define glStencilOpSeparateATI GLEW_GET_FUN(__glewStencilOpSeparateATI)
+
+#define GLEW_ATI_separate_stencil GLEW_GET_VAR(__GLEW_ATI_separate_stencil)
+
+#endif /* GL_ATI_separate_stencil */
+
+/* ----------------------- GL_ATI_shader_texture_lod ----------------------- */
+
+#ifndef GL_ATI_shader_texture_lod
+#define GL_ATI_shader_texture_lod 1
+
+#define GLEW_ATI_shader_texture_lod GLEW_GET_VAR(__GLEW_ATI_shader_texture_lod)
+
+#endif /* GL_ATI_shader_texture_lod */
+
+/* ---------------------- GL_ATI_text_fragment_shader ---------------------- */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+
+#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200
+
+#define GLEW_ATI_text_fragment_shader GLEW_GET_VAR(__GLEW_ATI_text_fragment_shader)
+
+#endif /* GL_ATI_text_fragment_shader */
+
+/* --------------------- GL_ATI_texture_compression_3dc -------------------- */
+
+#ifndef GL_ATI_texture_compression_3dc
+#define GL_ATI_texture_compression_3dc 1
+
+#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837
+
+#define GLEW_ATI_texture_compression_3dc GLEW_GET_VAR(__GLEW_ATI_texture_compression_3dc)
+
+#endif /* GL_ATI_texture_compression_3dc */
+
+/* ---------------------- GL_ATI_texture_env_combine3 ---------------------- */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+
+#define GL_MODULATE_ADD_ATI 0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI 0x8745
+#define GL_MODULATE_SUBTRACT_ATI 0x8746
+
+#define GLEW_ATI_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATI_texture_env_combine3)
+
+#endif /* GL_ATI_texture_env_combine3 */
+
+/* -------------------------- GL_ATI_texture_float ------------------------- */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+
+#define GL_RGBA_FLOAT32_ATI 0x8814
+#define GL_RGB_FLOAT32_ATI 0x8815
+#define GL_ALPHA_FLOAT32_ATI 0x8816
+#define GL_INTENSITY_FLOAT32_ATI 0x8817
+#define GL_LUMINANCE_FLOAT32_ATI 0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819
+#define GL_RGBA_FLOAT16_ATI 0x881A
+#define GL_RGB_FLOAT16_ATI 0x881B
+#define GL_ALPHA_FLOAT16_ATI 0x881C
+#define GL_INTENSITY_FLOAT16_ATI 0x881D
+#define GL_LUMINANCE_FLOAT16_ATI 0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F
+
+#define GLEW_ATI_texture_float GLEW_GET_VAR(__GLEW_ATI_texture_float)
+
+#endif /* GL_ATI_texture_float */
+
+/* ----------------------- GL_ATI_texture_mirror_once ---------------------- */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+
+#define GL_MIRROR_CLAMP_ATI 0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743
+
+#define GLEW_ATI_texture_mirror_once GLEW_GET_VAR(__GLEW_ATI_texture_mirror_once)
+
+#endif /* GL_ATI_texture_mirror_once */
+
+/* ----------------------- GL_ATI_vertex_array_object ---------------------- */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+
+#define GL_STATIC_ATI 0x8760
+#define GL_DYNAMIC_ATI 0x8761
+#define GL_PRESERVE_ATI 0x8762
+#define GL_DISCARD_ATI 0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767
+
+typedef void (GLAPIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (GLAPIENTRY * PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef GLuint (GLAPIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+typedef void (GLAPIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+
+#define glArrayObjectATI GLEW_GET_FUN(__glewArrayObjectATI)
+#define glFreeObjectBufferATI GLEW_GET_FUN(__glewFreeObjectBufferATI)
+#define glGetArrayObjectfvATI GLEW_GET_FUN(__glewGetArrayObjectfvATI)
+#define glGetArrayObjectivATI GLEW_GET_FUN(__glewGetArrayObjectivATI)
+#define glGetObjectBufferfvATI GLEW_GET_FUN(__glewGetObjectBufferfvATI)
+#define glGetObjectBufferivATI GLEW_GET_FUN(__glewGetObjectBufferivATI)
+#define glGetVariantArrayObjectfvATI GLEW_GET_FUN(__glewGetVariantArrayObjectfvATI)
+#define glGetVariantArrayObjectivATI GLEW_GET_FUN(__glewGetVariantArrayObjectivATI)
+#define glIsObjectBufferATI GLEW_GET_FUN(__glewIsObjectBufferATI)
+#define glNewObjectBufferATI GLEW_GET_FUN(__glewNewObjectBufferATI)
+#define glUpdateObjectBufferATI GLEW_GET_FUN(__glewUpdateObjectBufferATI)
+#define glVariantArrayObjectATI GLEW_GET_FUN(__glewVariantArrayObjectATI)
+
+#define GLEW_ATI_vertex_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_array_object)
+
+#endif /* GL_ATI_vertex_array_object */
+
+/* ------------------- GL_ATI_vertex_attrib_array_object ------------------- */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+
+#define glGetVertexAttribArrayObjectfvATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectfvATI)
+#define glGetVertexAttribArrayObjectivATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectivATI)
+#define glVertexAttribArrayObjectATI GLEW_GET_FUN(__glewVertexAttribArrayObjectATI)
+
+#define GLEW_ATI_vertex_attrib_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_attrib_array_object)
+
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+/* ------------------------- GL_ATI_vertex_streams ------------------------- */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+
+#define GL_MAX_VERTEX_STREAMS_ATI 0x876B
+#define GL_VERTEX_SOURCE_ATI 0x876C
+#define GL_VERTEX_STREAM0_ATI 0x876D
+#define GL_VERTEX_STREAM1_ATI 0x876E
+#define GL_VERTEX_STREAM2_ATI 0x876F
+#define GL_VERTEX_STREAM3_ATI 0x8770
+#define GL_VERTEX_STREAM4_ATI 0x8771
+#define GL_VERTEX_STREAM5_ATI 0x8772
+#define GL_VERTEX_STREAM6_ATI 0x8773
+#define GL_VERTEX_STREAM7_ATI 0x8774
+
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+
+#define glClientActiveVertexStreamATI GLEW_GET_FUN(__glewClientActiveVertexStreamATI)
+#define glNormalStream3bATI GLEW_GET_FUN(__glewNormalStream3bATI)
+#define glNormalStream3bvATI GLEW_GET_FUN(__glewNormalStream3bvATI)
+#define glNormalStream3dATI GLEW_GET_FUN(__glewNormalStream3dATI)
+#define glNormalStream3dvATI GLEW_GET_FUN(__glewNormalStream3dvATI)
+#define glNormalStream3fATI GLEW_GET_FUN(__glewNormalStream3fATI)
+#define glNormalStream3fvATI GLEW_GET_FUN(__glewNormalStream3fvATI)
+#define glNormalStream3iATI GLEW_GET_FUN(__glewNormalStream3iATI)
+#define glNormalStream3ivATI GLEW_GET_FUN(__glewNormalStream3ivATI)
+#define glNormalStream3sATI GLEW_GET_FUN(__glewNormalStream3sATI)
+#define glNormalStream3svATI GLEW_GET_FUN(__glewNormalStream3svATI)
+#define glVertexBlendEnvfATI GLEW_GET_FUN(__glewVertexBlendEnvfATI)
+#define glVertexBlendEnviATI GLEW_GET_FUN(__glewVertexBlendEnviATI)
+#define glVertexStream1dATI GLEW_GET_FUN(__glewVertexStream1dATI)
+#define glVertexStream1dvATI GLEW_GET_FUN(__glewVertexStream1dvATI)
+#define glVertexStream1fATI GLEW_GET_FUN(__glewVertexStream1fATI)
+#define glVertexStream1fvATI GLEW_GET_FUN(__glewVertexStream1fvATI)
+#define glVertexStream1iATI GLEW_GET_FUN(__glewVertexStream1iATI)
+#define glVertexStream1ivATI GLEW_GET_FUN(__glewVertexStream1ivATI)
+#define glVertexStream1sATI GLEW_GET_FUN(__glewVertexStream1sATI)
+#define glVertexStream1svATI GLEW_GET_FUN(__glewVertexStream1svATI)
+#define glVertexStream2dATI GLEW_GET_FUN(__glewVertexStream2dATI)
+#define glVertexStream2dvATI GLEW_GET_FUN(__glewVertexStream2dvATI)
+#define glVertexStream2fATI GLEW_GET_FUN(__glewVertexStream2fATI)
+#define glVertexStream2fvATI GLEW_GET_FUN(__glewVertexStream2fvATI)
+#define glVertexStream2iATI GLEW_GET_FUN(__glewVertexStream2iATI)
+#define glVertexStream2ivATI GLEW_GET_FUN(__glewVertexStream2ivATI)
+#define glVertexStream2sATI GLEW_GET_FUN(__glewVertexStream2sATI)
+#define glVertexStream2svATI GLEW_GET_FUN(__glewVertexStream2svATI)
+#define glVertexStream3dATI GLEW_GET_FUN(__glewVertexStream3dATI)
+#define glVertexStream3dvATI GLEW_GET_FUN(__glewVertexStream3dvATI)
+#define glVertexStream3fATI GLEW_GET_FUN(__glewVertexStream3fATI)
+#define glVertexStream3fvATI GLEW_GET_FUN(__glewVertexStream3fvATI)
+#define glVertexStream3iATI GLEW_GET_FUN(__glewVertexStream3iATI)
+#define glVertexStream3ivATI GLEW_GET_FUN(__glewVertexStream3ivATI)
+#define glVertexStream3sATI GLEW_GET_FUN(__glewVertexStream3sATI)
+#define glVertexStream3svATI GLEW_GET_FUN(__glewVertexStream3svATI)
+#define glVertexStream4dATI GLEW_GET_FUN(__glewVertexStream4dATI)
+#define glVertexStream4dvATI GLEW_GET_FUN(__glewVertexStream4dvATI)
+#define glVertexStream4fATI GLEW_GET_FUN(__glewVertexStream4fATI)
+#define glVertexStream4fvATI GLEW_GET_FUN(__glewVertexStream4fvATI)
+#define glVertexStream4iATI GLEW_GET_FUN(__glewVertexStream4iATI)
+#define glVertexStream4ivATI GLEW_GET_FUN(__glewVertexStream4ivATI)
+#define glVertexStream4sATI GLEW_GET_FUN(__glewVertexStream4sATI)
+#define glVertexStream4svATI GLEW_GET_FUN(__glewVertexStream4svATI)
+
+#define GLEW_ATI_vertex_streams GLEW_GET_VAR(__GLEW_ATI_vertex_streams)
+
+#endif /* GL_ATI_vertex_streams */
+
+/* -------------------- GL_EGL_KHR_context_flush_control ------------------- */
+
+#ifndef GL_EGL_KHR_context_flush_control
+#define GL_EGL_KHR_context_flush_control 1
+
+#define GLEW_EGL_KHR_context_flush_control GLEW_GET_VAR(__GLEW_EGL_KHR_context_flush_control)
+
+#endif /* GL_EGL_KHR_context_flush_control */
+
+/* ---------------- GL_EGL_NV_robustness_video_memory_purge ---------------- */
+
+#ifndef GL_EGL_NV_robustness_video_memory_purge
+#define GL_EGL_NV_robustness_video_memory_purge 1
+
+#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C
+#define GL_PURGED_CONTEXT_RESET_NV 0x92BB
+
+#define GLEW_EGL_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_EGL_NV_robustness_video_memory_purge)
+
+#endif /* GL_EGL_NV_robustness_video_memory_purge */
+
+/* --------------------------- GL_EXT_422_pixels --------------------------- */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+
+#define GL_422_EXT 0x80CC
+#define GL_422_REV_EXT 0x80CD
+#define GL_422_AVERAGE_EXT 0x80CE
+#define GL_422_REV_AVERAGE_EXT 0x80CF
+
+#define GLEW_EXT_422_pixels GLEW_GET_VAR(__GLEW_EXT_422_pixels)
+
+#endif /* GL_EXT_422_pixels */
+
+/* ---------------------------- GL_EXT_Cg_shader --------------------------- */
+
+#ifndef GL_EXT_Cg_shader
+#define GL_EXT_Cg_shader 1
+
+#define GL_CG_VERTEX_SHADER_EXT 0x890E
+#define GL_CG_FRAGMENT_SHADER_EXT 0x890F
+
+#define GLEW_EXT_Cg_shader GLEW_GET_VAR(__GLEW_EXT_Cg_shader)
+
+#endif /* GL_EXT_Cg_shader */
+
+/* ------------------------- GL_EXT_EGL_image_array ------------------------ */
+
+#ifndef GL_EXT_EGL_image_array
+#define GL_EXT_EGL_image_array 1
+
+#define GLEW_EXT_EGL_image_array GLEW_GET_VAR(__GLEW_EXT_EGL_image_array)
+
+#endif /* GL_EXT_EGL_image_array */
+
+/* --------------------------- GL_EXT_YUV_target --------------------------- */
+
+#ifndef GL_EXT_YUV_target
+#define GL_EXT_YUV_target 1
+
+#define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT 0x8BE7
+
+#define GLEW_EXT_YUV_target GLEW_GET_VAR(__GLEW_EXT_YUV_target)
+
+#endif /* GL_EXT_YUV_target */
+
+/* ------------------------------ GL_EXT_abgr ------------------------------ */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+
+#define GL_ABGR_EXT 0x8000
+
+#define GLEW_EXT_abgr GLEW_GET_VAR(__GLEW_EXT_abgr)
+
+#endif /* GL_EXT_abgr */
+
+/* -------------------------- GL_EXT_base_instance ------------------------- */
+
+#ifndef GL_EXT_base_instance
+#define GL_EXT_base_instance 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+
+#define glDrawArraysInstancedBaseInstanceEXT GLEW_GET_FUN(__glewDrawArraysInstancedBaseInstanceEXT)
+#define glDrawElementsInstancedBaseInstanceEXT GLEW_GET_FUN(__glewDrawElementsInstancedBaseInstanceEXT)
+#define glDrawElementsInstancedBaseVertexBaseInstanceEXT GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexBaseInstanceEXT)
+
+#define GLEW_EXT_base_instance GLEW_GET_VAR(__GLEW_EXT_base_instance)
+
+#endif /* GL_EXT_base_instance */
+
+/* ------------------------------ GL_EXT_bgra ------------------------------ */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+
+#define GL_BGR_EXT 0x80E0
+#define GL_BGRA_EXT 0x80E1
+
+#define GLEW_EXT_bgra GLEW_GET_VAR(__GLEW_EXT_bgra)
+
+#endif /* GL_EXT_bgra */
+
+/* ------------------------ GL_EXT_bindable_uniform ------------------------ */
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED
+#define GL_UNIFORM_BUFFER_EXT 0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF
+
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (GLAPIENTRY * PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+typedef void (GLAPIENTRY * PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+
+#define glGetUniformBufferSizeEXT GLEW_GET_FUN(__glewGetUniformBufferSizeEXT)
+#define glGetUniformOffsetEXT GLEW_GET_FUN(__glewGetUniformOffsetEXT)
+#define glUniformBufferEXT GLEW_GET_FUN(__glewUniformBufferEXT)
+
+#define GLEW_EXT_bindable_uniform GLEW_GET_VAR(__GLEW_EXT_bindable_uniform)
+
+#endif /* GL_EXT_bindable_uniform */
+
+/* --------------------------- GL_EXT_blend_color -------------------------- */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+
+#define GL_CONSTANT_COLOR_EXT 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002
+#define GL_CONSTANT_ALPHA_EXT 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004
+#define GL_BLEND_COLOR_EXT 0x8005
+
+typedef void (GLAPIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+
+#define glBlendColorEXT GLEW_GET_FUN(__glewBlendColorEXT)
+
+#define GLEW_EXT_blend_color GLEW_GET_VAR(__GLEW_EXT_blend_color)
+
+#endif /* GL_EXT_blend_color */
+
+/* --------------------- GL_EXT_blend_equation_separate -------------------- */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+
+#define GL_BLEND_EQUATION_RGB_EXT 0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+
+#define glBlendEquationSeparateEXT GLEW_GET_FUN(__glewBlendEquationSeparateEXT)
+
+#define GLEW_EXT_blend_equation_separate GLEW_GET_VAR(__GLEW_EXT_blend_equation_separate)
+
+#endif /* GL_EXT_blend_equation_separate */
+
+/* ----------------------- GL_EXT_blend_func_extended ---------------------- */
+
+#ifndef GL_EXT_blend_func_extended
+#define GL_EXT_blend_func_extended 1
+
+#define GL_SRC_ALPHA_SATURATE_EXT 0x0308
+#define GL_SRC1_ALPHA_EXT 0x8589
+#define GL_SRC1_COLOR_EXT 0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR_EXT 0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA_EXT 0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT 0x88FC
+#define GL_LOCATION_INDEX_EXT 0x930F
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name);
+typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATAINDEXEXTPROC) (GLuint program, const GLchar * name);
+typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC) (GLuint program, GLenum programInterface, const GLchar* name);
+
+#define glBindFragDataLocationIndexedEXT GLEW_GET_FUN(__glewBindFragDataLocationIndexedEXT)
+#define glGetFragDataIndexEXT GLEW_GET_FUN(__glewGetFragDataIndexEXT)
+#define glGetProgramResourceLocationIndexEXT GLEW_GET_FUN(__glewGetProgramResourceLocationIndexEXT)
+
+#define GLEW_EXT_blend_func_extended GLEW_GET_VAR(__GLEW_EXT_blend_func_extended)
+
+#endif /* GL_EXT_blend_func_extended */
+
+/* ----------------------- GL_EXT_blend_func_separate ---------------------- */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+
+#define GL_BLEND_DST_RGB_EXT 0x80C8
+#define GL_BLEND_SRC_RGB_EXT 0x80C9
+#define GL_BLEND_DST_ALPHA_EXT 0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT 0x80CB
+
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+
+#define glBlendFuncSeparateEXT GLEW_GET_FUN(__glewBlendFuncSeparateEXT)
+
+#define GLEW_EXT_blend_func_separate GLEW_GET_VAR(__GLEW_EXT_blend_func_separate)
+
+#endif /* GL_EXT_blend_func_separate */
+
+/* ------------------------- GL_EXT_blend_logic_op ------------------------- */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+
+#define GLEW_EXT_blend_logic_op GLEW_GET_VAR(__GLEW_EXT_blend_logic_op)
+
+#endif /* GL_EXT_blend_logic_op */
+
+/* -------------------------- GL_EXT_blend_minmax -------------------------- */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+
+#define GL_FUNC_ADD_EXT 0x8006
+#define GL_MIN_EXT 0x8007
+#define GL_MAX_EXT 0x8008
+#define GL_BLEND_EQUATION_EXT 0x8009
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+
+#define glBlendEquationEXT GLEW_GET_FUN(__glewBlendEquationEXT)
+
+#define GLEW_EXT_blend_minmax GLEW_GET_VAR(__GLEW_EXT_blend_minmax)
+
+#endif /* GL_EXT_blend_minmax */
+
+/* ------------------------- GL_EXT_blend_subtract ------------------------- */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+
+#define GL_FUNC_SUBTRACT_EXT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B
+
+#define GLEW_EXT_blend_subtract GLEW_GET_VAR(__GLEW_EXT_blend_subtract)
+
+#endif /* GL_EXT_blend_subtract */
+
+/* ------------------------- GL_EXT_buffer_storage ------------------------- */
+
+#ifndef GL_EXT_buffer_storage
+#define GL_EXT_buffer_storage 1
+
+#define GL_MAP_READ_BIT 0x0001
+#define GL_MAP_WRITE_BIT 0x0002
+#define GL_MAP_PERSISTENT_BIT_EXT 0x0040
+#define GL_MAP_COHERENT_BIT_EXT 0x0080
+#define GL_DYNAMIC_STORAGE_BIT_EXT 0x0100
+#define GL_CLIENT_STORAGE_BIT_EXT 0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE_EXT 0x821F
+#define GL_BUFFER_STORAGE_FLAGS_EXT 0x8220
+
+typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEEXTPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+
+#define glBufferStorageEXT GLEW_GET_FUN(__glewBufferStorageEXT)
+#define glNamedBufferStorageEXT GLEW_GET_FUN(__glewNamedBufferStorageEXT)
+
+#define GLEW_EXT_buffer_storage GLEW_GET_VAR(__GLEW_EXT_buffer_storage)
+
+#endif /* GL_EXT_buffer_storage */
+
+/* -------------------------- GL_EXT_clear_texture ------------------------- */
+
+#ifndef GL_EXT_clear_texture
+#define GL_EXT_clear_texture 1
+
+typedef void (GLAPIENTRY * PFNGLCLEARTEXIMAGEEXTPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCLEARTEXSUBIMAGEEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+
+#define glClearTexImageEXT GLEW_GET_FUN(__glewClearTexImageEXT)
+#define glClearTexSubImageEXT GLEW_GET_FUN(__glewClearTexSubImageEXT)
+
+#define GLEW_EXT_clear_texture GLEW_GET_VAR(__GLEW_EXT_clear_texture)
+
+#endif /* GL_EXT_clear_texture */
+
+/* ----------------------- GL_EXT_clip_cull_distance ----------------------- */
+
+#ifndef GL_EXT_clip_cull_distance
+#define GL_EXT_clip_cull_distance 1
+
+#define GL_MAX_CLIP_DISTANCES_EXT 0x0D32
+#define GL_CLIP_DISTANCE0_EXT 0x3000
+#define GL_CLIP_DISTANCE1_EXT 0x3001
+#define GL_CLIP_DISTANCE2_EXT 0x3002
+#define GL_CLIP_DISTANCE3_EXT 0x3003
+#define GL_CLIP_DISTANCE4_EXT 0x3004
+#define GL_CLIP_DISTANCE5_EXT 0x3005
+#define GL_CLIP_DISTANCE6_EXT 0x3006
+#define GL_CLIP_DISTANCE7_EXT 0x3007
+#define GL_MAX_CULL_DISTANCES_EXT 0x82F9
+#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES_EXT 0x82FA
+
+#define GLEW_EXT_clip_cull_distance GLEW_GET_VAR(__GLEW_EXT_clip_cull_distance)
+
+#endif /* GL_EXT_clip_cull_distance */
+
+/* ------------------------ GL_EXT_clip_volume_hint ------------------------ */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0
+
+#define GLEW_EXT_clip_volume_hint GLEW_GET_VAR(__GLEW_EXT_clip_volume_hint)
+
+#endif /* GL_EXT_clip_volume_hint */
+
+/* ------------------------------ GL_EXT_cmyka ----------------------------- */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+
+#define GL_CMYK_EXT 0x800C
+#define GL_CMYKA_EXT 0x800D
+#define GL_PACK_CMYK_HINT_EXT 0x800E
+#define GL_UNPACK_CMYK_HINT_EXT 0x800F
+
+#define GLEW_EXT_cmyka GLEW_GET_VAR(__GLEW_EXT_cmyka)
+
+#endif /* GL_EXT_cmyka */
+
+/* ----------------------- GL_EXT_color_buffer_float ----------------------- */
+
+#ifndef GL_EXT_color_buffer_float
+#define GL_EXT_color_buffer_float 1
+
+#define GLEW_EXT_color_buffer_float GLEW_GET_VAR(__GLEW_EXT_color_buffer_float)
+
+#endif /* GL_EXT_color_buffer_float */
+
+/* --------------------- GL_EXT_color_buffer_half_float -------------------- */
+
+#ifndef GL_EXT_color_buffer_half_float
+#define GL_EXT_color_buffer_half_float 1
+
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211
+#define GL_R16F_EXT 0x822D
+#define GL_RG16F_EXT 0x822F
+#define GL_RGBA16F_EXT 0x881A
+#define GL_RGB16F_EXT 0x881B
+#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17
+
+#define GLEW_EXT_color_buffer_half_float GLEW_GET_VAR(__GLEW_EXT_color_buffer_half_float)
+
+#endif /* GL_EXT_color_buffer_half_float */
+
+/* ------------------------- GL_EXT_color_subtable ------------------------- */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+
+typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+
+#define glColorSubTableEXT GLEW_GET_FUN(__glewColorSubTableEXT)
+#define glCopyColorSubTableEXT GLEW_GET_FUN(__glewCopyColorSubTableEXT)
+
+#define GLEW_EXT_color_subtable GLEW_GET_VAR(__GLEW_EXT_color_subtable)
+
+#endif /* GL_EXT_color_subtable */
+
+/* ---------------------- GL_EXT_compiled_vertex_array --------------------- */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9
+
+typedef void (GLAPIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
+
+#define glLockArraysEXT GLEW_GET_FUN(__glewLockArraysEXT)
+#define glUnlockArraysEXT GLEW_GET_FUN(__glewUnlockArraysEXT)
+
+#define GLEW_EXT_compiled_vertex_array GLEW_GET_VAR(__GLEW_EXT_compiled_vertex_array)
+
+#endif /* GL_EXT_compiled_vertex_array */
+
+/* ---------------- GL_EXT_compressed_ETC1_RGB8_sub_texture ---------------- */
+
+#ifndef GL_EXT_compressed_ETC1_RGB8_sub_texture
+#define GL_EXT_compressed_ETC1_RGB8_sub_texture 1
+
+#define GLEW_EXT_compressed_ETC1_RGB8_sub_texture GLEW_GET_VAR(__GLEW_EXT_compressed_ETC1_RGB8_sub_texture)
+
+#endif /* GL_EXT_compressed_ETC1_RGB8_sub_texture */
+
+/* ----------------------- GL_EXT_conservative_depth ----------------------- */
+
+#ifndef GL_EXT_conservative_depth
+#define GL_EXT_conservative_depth 1
+
+#define GLEW_EXT_conservative_depth GLEW_GET_VAR(__GLEW_EXT_conservative_depth)
+
+#endif /* GL_EXT_conservative_depth */
+
+/* --------------------------- GL_EXT_convolution -------------------------- */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+
+#define GL_CONVOLUTION_1D_EXT 0x8010
+#define GL_CONVOLUTION_2D_EXT 0x8011
+#define GL_SEPARABLE_2D_EXT 0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015
+#define GL_REDUCE_EXT 0x8016
+#define GL_CONVOLUTION_FORMAT_EXT 0x8017
+#define GL_CONVOLUTION_WIDTH_EXT 0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+
+#define glConvolutionFilter1DEXT GLEW_GET_FUN(__glewConvolutionFilter1DEXT)
+#define glConvolutionFilter2DEXT GLEW_GET_FUN(__glewConvolutionFilter2DEXT)
+#define glConvolutionParameterfEXT GLEW_GET_FUN(__glewConvolutionParameterfEXT)
+#define glConvolutionParameterfvEXT GLEW_GET_FUN(__glewConvolutionParameterfvEXT)
+#define glConvolutionParameteriEXT GLEW_GET_FUN(__glewConvolutionParameteriEXT)
+#define glConvolutionParameterivEXT GLEW_GET_FUN(__glewConvolutionParameterivEXT)
+#define glCopyConvolutionFilter1DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter1DEXT)
+#define glCopyConvolutionFilter2DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter2DEXT)
+#define glGetConvolutionFilterEXT GLEW_GET_FUN(__glewGetConvolutionFilterEXT)
+#define glGetConvolutionParameterfvEXT GLEW_GET_FUN(__glewGetConvolutionParameterfvEXT)
+#define glGetConvolutionParameterivEXT GLEW_GET_FUN(__glewGetConvolutionParameterivEXT)
+#define glGetSeparableFilterEXT GLEW_GET_FUN(__glewGetSeparableFilterEXT)
+#define glSeparableFilter2DEXT GLEW_GET_FUN(__glewSeparableFilter2DEXT)
+
+#define GLEW_EXT_convolution GLEW_GET_VAR(__GLEW_EXT_convolution)
+
+#endif /* GL_EXT_convolution */
+
+/* ------------------------ GL_EXT_coordinate_frame ------------------------ */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+
+#define GL_TANGENT_ARRAY_EXT 0x8439
+#define GL_BINORMAL_ARRAY_EXT 0x843A
+#define GL_CURRENT_TANGENT_EXT 0x843B
+#define GL_CURRENT_BINORMAL_EXT 0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443
+#define GL_MAP1_TANGENT_EXT 0x8444
+#define GL_MAP2_TANGENT_EXT 0x8445
+#define GL_MAP1_BINORMAL_EXT 0x8446
+#define GL_MAP2_BINORMAL_EXT 0x8447
+
+typedef void (GLAPIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer);
+typedef void (GLAPIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer);
+
+#define glBinormalPointerEXT GLEW_GET_FUN(__glewBinormalPointerEXT)
+#define glTangentPointerEXT GLEW_GET_FUN(__glewTangentPointerEXT)
+
+#define GLEW_EXT_coordinate_frame GLEW_GET_VAR(__GLEW_EXT_coordinate_frame)
+
+#endif /* GL_EXT_coordinate_frame */
+
+/* --------------------------- GL_EXT_copy_image --------------------------- */
+
+#ifndef GL_EXT_copy_image
+#define GL_EXT_copy_image 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAEXTPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+
+#define glCopyImageSubDataEXT GLEW_GET_FUN(__glewCopyImageSubDataEXT)
+
+#define GLEW_EXT_copy_image GLEW_GET_VAR(__GLEW_EXT_copy_image)
+
+#endif /* GL_EXT_copy_image */
+
+/* -------------------------- GL_EXT_copy_texture -------------------------- */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glCopyTexImage1DEXT GLEW_GET_FUN(__glewCopyTexImage1DEXT)
+#define glCopyTexImage2DEXT GLEW_GET_FUN(__glewCopyTexImage2DEXT)
+#define glCopyTexSubImage1DEXT GLEW_GET_FUN(__glewCopyTexSubImage1DEXT)
+#define glCopyTexSubImage2DEXT GLEW_GET_FUN(__glewCopyTexSubImage2DEXT)
+#define glCopyTexSubImage3DEXT GLEW_GET_FUN(__glewCopyTexSubImage3DEXT)
+
+#define GLEW_EXT_copy_texture GLEW_GET_VAR(__GLEW_EXT_copy_texture)
+
+#endif /* GL_EXT_copy_texture */
+
+/* --------------------------- GL_EXT_cull_vertex -------------------------- */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+
+#define GL_CULL_VERTEX_EXT 0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+
+typedef void (GLAPIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params);
+
+#define glCullParameterdvEXT GLEW_GET_FUN(__glewCullParameterdvEXT)
+#define glCullParameterfvEXT GLEW_GET_FUN(__glewCullParameterfvEXT)
+
+#define GLEW_EXT_cull_vertex GLEW_GET_VAR(__GLEW_EXT_cull_vertex)
+
+#endif /* GL_EXT_cull_vertex */
+
+/* --------------------------- GL_EXT_debug_label -------------------------- */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F
+#define GL_PROGRAM_OBJECT_EXT 0x8B40
+#define GL_SHADER_OBJECT_EXT 0x8B48
+#define GL_BUFFER_OBJECT_EXT 0x9151
+#define GL_QUERY_OBJECT_EXT 0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154
+
+typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar* label);
+
+#define glGetObjectLabelEXT GLEW_GET_FUN(__glewGetObjectLabelEXT)
+#define glLabelObjectEXT GLEW_GET_FUN(__glewLabelObjectEXT)
+
+#define GLEW_EXT_debug_label GLEW_GET_VAR(__GLEW_EXT_debug_label)
+
+#endif /* GL_EXT_debug_label */
+
+/* -------------------------- GL_EXT_debug_marker -------------------------- */
+
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+
+typedef void (GLAPIENTRY * PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar* marker);
+typedef void (GLAPIENTRY * PFNGLPOPGROUPMARKEREXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar* marker);
+
+#define glInsertEventMarkerEXT GLEW_GET_FUN(__glewInsertEventMarkerEXT)
+#define glPopGroupMarkerEXT GLEW_GET_FUN(__glewPopGroupMarkerEXT)
+#define glPushGroupMarkerEXT GLEW_GET_FUN(__glewPushGroupMarkerEXT)
+
+#define GLEW_EXT_debug_marker GLEW_GET_VAR(__GLEW_EXT_debug_marker)
+
+#endif /* GL_EXT_debug_marker */
+
+/* ------------------------ GL_EXT_depth_bounds_test ----------------------- */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+
+#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890
+#define GL_DEPTH_BOUNDS_EXT 0x8891
+
+typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+
+#define glDepthBoundsEXT GLEW_GET_FUN(__glewDepthBoundsEXT)
+
+#define GLEW_EXT_depth_bounds_test GLEW_GET_VAR(__GLEW_EXT_depth_bounds_test)
+
+#endif /* GL_EXT_depth_bounds_test */
+
+/* ----------------------- GL_EXT_direct_state_access ---------------------- */
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+
+#define GL_PROGRAM_MATRIX_EXT 0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+
+typedef void (GLAPIENTRY * PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (GLAPIENTRY * PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, void *img);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, void *img);
+typedef void (GLAPIENTRY * PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void** params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void** params);
+typedef void (GLAPIENTRY * PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void** params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void** param);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void** param);
+typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (GLAPIENTRY * PFNGLMATRIXFRUSTUMEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum matrixMode);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADDEXTPROC) (GLenum matrixMode, const GLdouble* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADFEXTPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULTDEXTPROC) (GLenum matrixMode, const GLdouble* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULTFEXTPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXORTHOEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f);
+typedef void (GLAPIENTRY * PFNGLMATRIXPOPEXTPROC) (GLenum matrixMode);
+typedef void (GLAPIENTRY * PFNGLMATRIXPUSHEXTPROC) (GLenum matrixMode);
+typedef void (GLAPIENTRY * PFNGLMATRIXROTATEDEXTPROC) (GLenum matrixMode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLMATRIXROTATEFEXTPROC) (GLenum matrixMode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLMATRIXSCALEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLMATRIXSCALEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* param);
+typedef void (GLAPIENTRY * PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (GLAPIENTRY * PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint* params);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat* param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* param);
+typedef void (GLAPIENTRY * PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+
+#define glBindMultiTextureEXT GLEW_GET_FUN(__glewBindMultiTextureEXT)
+#define glCheckNamedFramebufferStatusEXT GLEW_GET_FUN(__glewCheckNamedFramebufferStatusEXT)
+#define glClientAttribDefaultEXT GLEW_GET_FUN(__glewClientAttribDefaultEXT)
+#define glCompressedMultiTexImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage1DEXT)
+#define glCompressedMultiTexImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage2DEXT)
+#define glCompressedMultiTexImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage3DEXT)
+#define glCompressedMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage1DEXT)
+#define glCompressedMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage2DEXT)
+#define glCompressedMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage3DEXT)
+#define glCompressedTextureImage1DEXT GLEW_GET_FUN(__glewCompressedTextureImage1DEXT)
+#define glCompressedTextureImage2DEXT GLEW_GET_FUN(__glewCompressedTextureImage2DEXT)
+#define glCompressedTextureImage3DEXT GLEW_GET_FUN(__glewCompressedTextureImage3DEXT)
+#define glCompressedTextureSubImage1DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage1DEXT)
+#define glCompressedTextureSubImage2DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage2DEXT)
+#define glCompressedTextureSubImage3DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage3DEXT)
+#define glCopyMultiTexImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexImage1DEXT)
+#define glCopyMultiTexImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexImage2DEXT)
+#define glCopyMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage1DEXT)
+#define glCopyMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage2DEXT)
+#define glCopyMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage3DEXT)
+#define glCopyTextureImage1DEXT GLEW_GET_FUN(__glewCopyTextureImage1DEXT)
+#define glCopyTextureImage2DEXT GLEW_GET_FUN(__glewCopyTextureImage2DEXT)
+#define glCopyTextureSubImage1DEXT GLEW_GET_FUN(__glewCopyTextureSubImage1DEXT)
+#define glCopyTextureSubImage2DEXT GLEW_GET_FUN(__glewCopyTextureSubImage2DEXT)
+#define glCopyTextureSubImage3DEXT GLEW_GET_FUN(__glewCopyTextureSubImage3DEXT)
+#define glDisableClientStateIndexedEXT GLEW_GET_FUN(__glewDisableClientStateIndexedEXT)
+#define glDisableClientStateiEXT GLEW_GET_FUN(__glewDisableClientStateiEXT)
+#define glDisableVertexArrayAttribEXT GLEW_GET_FUN(__glewDisableVertexArrayAttribEXT)
+#define glDisableVertexArrayEXT GLEW_GET_FUN(__glewDisableVertexArrayEXT)
+#define glEnableClientStateIndexedEXT GLEW_GET_FUN(__glewEnableClientStateIndexedEXT)
+#define glEnableClientStateiEXT GLEW_GET_FUN(__glewEnableClientStateiEXT)
+#define glEnableVertexArrayAttribEXT GLEW_GET_FUN(__glewEnableVertexArrayAttribEXT)
+#define glEnableVertexArrayEXT GLEW_GET_FUN(__glewEnableVertexArrayEXT)
+#define glFlushMappedNamedBufferRangeEXT GLEW_GET_FUN(__glewFlushMappedNamedBufferRangeEXT)
+#define glFramebufferDrawBufferEXT GLEW_GET_FUN(__glewFramebufferDrawBufferEXT)
+#define glFramebufferDrawBuffersEXT GLEW_GET_FUN(__glewFramebufferDrawBuffersEXT)
+#define glFramebufferReadBufferEXT GLEW_GET_FUN(__glewFramebufferReadBufferEXT)
+#define glGenerateMultiTexMipmapEXT GLEW_GET_FUN(__glewGenerateMultiTexMipmapEXT)
+#define glGenerateTextureMipmapEXT GLEW_GET_FUN(__glewGenerateTextureMipmapEXT)
+#define glGetCompressedMultiTexImageEXT GLEW_GET_FUN(__glewGetCompressedMultiTexImageEXT)
+#define glGetCompressedTextureImageEXT GLEW_GET_FUN(__glewGetCompressedTextureImageEXT)
+#define glGetDoubleIndexedvEXT GLEW_GET_FUN(__glewGetDoubleIndexedvEXT)
+#define glGetDoublei_vEXT GLEW_GET_FUN(__glewGetDoublei_vEXT)
+#define glGetFloatIndexedvEXT GLEW_GET_FUN(__glewGetFloatIndexedvEXT)
+#define glGetFloati_vEXT GLEW_GET_FUN(__glewGetFloati_vEXT)
+#define glGetFramebufferParameterivEXT GLEW_GET_FUN(__glewGetFramebufferParameterivEXT)
+#define glGetMultiTexEnvfvEXT GLEW_GET_FUN(__glewGetMultiTexEnvfvEXT)
+#define glGetMultiTexEnvivEXT GLEW_GET_FUN(__glewGetMultiTexEnvivEXT)
+#define glGetMultiTexGendvEXT GLEW_GET_FUN(__glewGetMultiTexGendvEXT)
+#define glGetMultiTexGenfvEXT GLEW_GET_FUN(__glewGetMultiTexGenfvEXT)
+#define glGetMultiTexGenivEXT GLEW_GET_FUN(__glewGetMultiTexGenivEXT)
+#define glGetMultiTexImageEXT GLEW_GET_FUN(__glewGetMultiTexImageEXT)
+#define glGetMultiTexLevelParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterfvEXT)
+#define glGetMultiTexLevelParameterivEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterivEXT)
+#define glGetMultiTexParameterIivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIivEXT)
+#define glGetMultiTexParameterIuivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIuivEXT)
+#define glGetMultiTexParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexParameterfvEXT)
+#define glGetMultiTexParameterivEXT GLEW_GET_FUN(__glewGetMultiTexParameterivEXT)
+#define glGetNamedBufferParameterivEXT GLEW_GET_FUN(__glewGetNamedBufferParameterivEXT)
+#define glGetNamedBufferPointervEXT GLEW_GET_FUN(__glewGetNamedBufferPointervEXT)
+#define glGetNamedBufferSubDataEXT GLEW_GET_FUN(__glewGetNamedBufferSubDataEXT)
+#define glGetNamedFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameterivEXT)
+#define glGetNamedProgramLocalParameterIivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIivEXT)
+#define glGetNamedProgramLocalParameterIuivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIuivEXT)
+#define glGetNamedProgramLocalParameterdvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterdvEXT)
+#define glGetNamedProgramLocalParameterfvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterfvEXT)
+#define glGetNamedProgramStringEXT GLEW_GET_FUN(__glewGetNamedProgramStringEXT)
+#define glGetNamedProgramivEXT GLEW_GET_FUN(__glewGetNamedProgramivEXT)
+#define glGetNamedRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetNamedRenderbufferParameterivEXT)
+#define glGetPointerIndexedvEXT GLEW_GET_FUN(__glewGetPointerIndexedvEXT)
+#define glGetPointeri_vEXT GLEW_GET_FUN(__glewGetPointeri_vEXT)
+#define glGetTextureImageEXT GLEW_GET_FUN(__glewGetTextureImageEXT)
+#define glGetTextureLevelParameterfvEXT GLEW_GET_FUN(__glewGetTextureLevelParameterfvEXT)
+#define glGetTextureLevelParameterivEXT GLEW_GET_FUN(__glewGetTextureLevelParameterivEXT)
+#define glGetTextureParameterIivEXT GLEW_GET_FUN(__glewGetTextureParameterIivEXT)
+#define glGetTextureParameterIuivEXT GLEW_GET_FUN(__glewGetTextureParameterIuivEXT)
+#define glGetTextureParameterfvEXT GLEW_GET_FUN(__glewGetTextureParameterfvEXT)
+#define glGetTextureParameterivEXT GLEW_GET_FUN(__glewGetTextureParameterivEXT)
+#define glGetVertexArrayIntegeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayIntegeri_vEXT)
+#define glGetVertexArrayIntegervEXT GLEW_GET_FUN(__glewGetVertexArrayIntegervEXT)
+#define glGetVertexArrayPointeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayPointeri_vEXT)
+#define glGetVertexArrayPointervEXT GLEW_GET_FUN(__glewGetVertexArrayPointervEXT)
+#define glMapNamedBufferEXT GLEW_GET_FUN(__glewMapNamedBufferEXT)
+#define glMapNamedBufferRangeEXT GLEW_GET_FUN(__glewMapNamedBufferRangeEXT)
+#define glMatrixFrustumEXT GLEW_GET_FUN(__glewMatrixFrustumEXT)
+#define glMatrixLoadIdentityEXT GLEW_GET_FUN(__glewMatrixLoadIdentityEXT)
+#define glMatrixLoadTransposedEXT GLEW_GET_FUN(__glewMatrixLoadTransposedEXT)
+#define glMatrixLoadTransposefEXT GLEW_GET_FUN(__glewMatrixLoadTransposefEXT)
+#define glMatrixLoaddEXT GLEW_GET_FUN(__glewMatrixLoaddEXT)
+#define glMatrixLoadfEXT GLEW_GET_FUN(__glewMatrixLoadfEXT)
+#define glMatrixMultTransposedEXT GLEW_GET_FUN(__glewMatrixMultTransposedEXT)
+#define glMatrixMultTransposefEXT GLEW_GET_FUN(__glewMatrixMultTransposefEXT)
+#define glMatrixMultdEXT GLEW_GET_FUN(__glewMatrixMultdEXT)
+#define glMatrixMultfEXT GLEW_GET_FUN(__glewMatrixMultfEXT)
+#define glMatrixOrthoEXT GLEW_GET_FUN(__glewMatrixOrthoEXT)
+#define glMatrixPopEXT GLEW_GET_FUN(__glewMatrixPopEXT)
+#define glMatrixPushEXT GLEW_GET_FUN(__glewMatrixPushEXT)
+#define glMatrixRotatedEXT GLEW_GET_FUN(__glewMatrixRotatedEXT)
+#define glMatrixRotatefEXT GLEW_GET_FUN(__glewMatrixRotatefEXT)
+#define glMatrixScaledEXT GLEW_GET_FUN(__glewMatrixScaledEXT)
+#define glMatrixScalefEXT GLEW_GET_FUN(__glewMatrixScalefEXT)
+#define glMatrixTranslatedEXT GLEW_GET_FUN(__glewMatrixTranslatedEXT)
+#define glMatrixTranslatefEXT GLEW_GET_FUN(__glewMatrixTranslatefEXT)
+#define glMultiTexBufferEXT GLEW_GET_FUN(__glewMultiTexBufferEXT)
+#define glMultiTexCoordPointerEXT GLEW_GET_FUN(__glewMultiTexCoordPointerEXT)
+#define glMultiTexEnvfEXT GLEW_GET_FUN(__glewMultiTexEnvfEXT)
+#define glMultiTexEnvfvEXT GLEW_GET_FUN(__glewMultiTexEnvfvEXT)
+#define glMultiTexEnviEXT GLEW_GET_FUN(__glewMultiTexEnviEXT)
+#define glMultiTexEnvivEXT GLEW_GET_FUN(__glewMultiTexEnvivEXT)
+#define glMultiTexGendEXT GLEW_GET_FUN(__glewMultiTexGendEXT)
+#define glMultiTexGendvEXT GLEW_GET_FUN(__glewMultiTexGendvEXT)
+#define glMultiTexGenfEXT GLEW_GET_FUN(__glewMultiTexGenfEXT)
+#define glMultiTexGenfvEXT GLEW_GET_FUN(__glewMultiTexGenfvEXT)
+#define glMultiTexGeniEXT GLEW_GET_FUN(__glewMultiTexGeniEXT)
+#define glMultiTexGenivEXT GLEW_GET_FUN(__glewMultiTexGenivEXT)
+#define glMultiTexImage1DEXT GLEW_GET_FUN(__glewMultiTexImage1DEXT)
+#define glMultiTexImage2DEXT GLEW_GET_FUN(__glewMultiTexImage2DEXT)
+#define glMultiTexImage3DEXT GLEW_GET_FUN(__glewMultiTexImage3DEXT)
+#define glMultiTexParameterIivEXT GLEW_GET_FUN(__glewMultiTexParameterIivEXT)
+#define glMultiTexParameterIuivEXT GLEW_GET_FUN(__glewMultiTexParameterIuivEXT)
+#define glMultiTexParameterfEXT GLEW_GET_FUN(__glewMultiTexParameterfEXT)
+#define glMultiTexParameterfvEXT GLEW_GET_FUN(__glewMultiTexParameterfvEXT)
+#define glMultiTexParameteriEXT GLEW_GET_FUN(__glewMultiTexParameteriEXT)
+#define glMultiTexParameterivEXT GLEW_GET_FUN(__glewMultiTexParameterivEXT)
+#define glMultiTexRenderbufferEXT GLEW_GET_FUN(__glewMultiTexRenderbufferEXT)
+#define glMultiTexSubImage1DEXT GLEW_GET_FUN(__glewMultiTexSubImage1DEXT)
+#define glMultiTexSubImage2DEXT GLEW_GET_FUN(__glewMultiTexSubImage2DEXT)
+#define glMultiTexSubImage3DEXT GLEW_GET_FUN(__glewMultiTexSubImage3DEXT)
+#define glNamedBufferDataEXT GLEW_GET_FUN(__glewNamedBufferDataEXT)
+#define glNamedBufferSubDataEXT GLEW_GET_FUN(__glewNamedBufferSubDataEXT)
+#define glNamedCopyBufferSubDataEXT GLEW_GET_FUN(__glewNamedCopyBufferSubDataEXT)
+#define glNamedFramebufferRenderbufferEXT GLEW_GET_FUN(__glewNamedFramebufferRenderbufferEXT)
+#define glNamedFramebufferTexture1DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture1DEXT)
+#define glNamedFramebufferTexture2DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture2DEXT)
+#define glNamedFramebufferTexture3DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture3DEXT)
+#define glNamedFramebufferTextureEXT GLEW_GET_FUN(__glewNamedFramebufferTextureEXT)
+#define glNamedFramebufferTextureFaceEXT GLEW_GET_FUN(__glewNamedFramebufferTextureFaceEXT)
+#define glNamedFramebufferTextureLayerEXT GLEW_GET_FUN(__glewNamedFramebufferTextureLayerEXT)
+#define glNamedProgramLocalParameter4dEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dEXT)
+#define glNamedProgramLocalParameter4dvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dvEXT)
+#define glNamedProgramLocalParameter4fEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fEXT)
+#define glNamedProgramLocalParameter4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fvEXT)
+#define glNamedProgramLocalParameterI4iEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4iEXT)
+#define glNamedProgramLocalParameterI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4ivEXT)
+#define glNamedProgramLocalParameterI4uiEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uiEXT)
+#define glNamedProgramLocalParameterI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uivEXT)
+#define glNamedProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameters4fvEXT)
+#define glNamedProgramLocalParametersI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4ivEXT)
+#define glNamedProgramLocalParametersI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4uivEXT)
+#define glNamedProgramStringEXT GLEW_GET_FUN(__glewNamedProgramStringEXT)
+#define glNamedRenderbufferStorageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageEXT)
+#define glNamedRenderbufferStorageMultisampleCoverageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleCoverageEXT)
+#define glNamedRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleEXT)
+#define glProgramUniform1fEXT GLEW_GET_FUN(__glewProgramUniform1fEXT)
+#define glProgramUniform1fvEXT GLEW_GET_FUN(__glewProgramUniform1fvEXT)
+#define glProgramUniform1iEXT GLEW_GET_FUN(__glewProgramUniform1iEXT)
+#define glProgramUniform1ivEXT GLEW_GET_FUN(__glewProgramUniform1ivEXT)
+#define glProgramUniform1uiEXT GLEW_GET_FUN(__glewProgramUniform1uiEXT)
+#define glProgramUniform1uivEXT GLEW_GET_FUN(__glewProgramUniform1uivEXT)
+#define glProgramUniform2fEXT GLEW_GET_FUN(__glewProgramUniform2fEXT)
+#define glProgramUniform2fvEXT GLEW_GET_FUN(__glewProgramUniform2fvEXT)
+#define glProgramUniform2iEXT GLEW_GET_FUN(__glewProgramUniform2iEXT)
+#define glProgramUniform2ivEXT GLEW_GET_FUN(__glewProgramUniform2ivEXT)
+#define glProgramUniform2uiEXT GLEW_GET_FUN(__glewProgramUniform2uiEXT)
+#define glProgramUniform2uivEXT GLEW_GET_FUN(__glewProgramUniform2uivEXT)
+#define glProgramUniform3fEXT GLEW_GET_FUN(__glewProgramUniform3fEXT)
+#define glProgramUniform3fvEXT GLEW_GET_FUN(__glewProgramUniform3fvEXT)
+#define glProgramUniform3iEXT GLEW_GET_FUN(__glewProgramUniform3iEXT)
+#define glProgramUniform3ivEXT GLEW_GET_FUN(__glewProgramUniform3ivEXT)
+#define glProgramUniform3uiEXT GLEW_GET_FUN(__glewProgramUniform3uiEXT)
+#define glProgramUniform3uivEXT GLEW_GET_FUN(__glewProgramUniform3uivEXT)
+#define glProgramUniform4fEXT GLEW_GET_FUN(__glewProgramUniform4fEXT)
+#define glProgramUniform4fvEXT GLEW_GET_FUN(__glewProgramUniform4fvEXT)
+#define glProgramUniform4iEXT GLEW_GET_FUN(__glewProgramUniform4iEXT)
+#define glProgramUniform4ivEXT GLEW_GET_FUN(__glewProgramUniform4ivEXT)
+#define glProgramUniform4uiEXT GLEW_GET_FUN(__glewProgramUniform4uiEXT)
+#define glProgramUniform4uivEXT GLEW_GET_FUN(__glewProgramUniform4uivEXT)
+#define glProgramUniformMatrix2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2fvEXT)
+#define glProgramUniformMatrix2x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x3fvEXT)
+#define glProgramUniformMatrix2x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x4fvEXT)
+#define glProgramUniformMatrix3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3fvEXT)
+#define glProgramUniformMatrix3x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x2fvEXT)
+#define glProgramUniformMatrix3x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x4fvEXT)
+#define glProgramUniformMatrix4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4fvEXT)
+#define glProgramUniformMatrix4x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x2fvEXT)
+#define glProgramUniformMatrix4x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x3fvEXT)
+#define glPushClientAttribDefaultEXT GLEW_GET_FUN(__glewPushClientAttribDefaultEXT)
+#define glTextureBufferEXT GLEW_GET_FUN(__glewTextureBufferEXT)
+#define glTextureImage1DEXT GLEW_GET_FUN(__glewTextureImage1DEXT)
+#define glTextureImage2DEXT GLEW_GET_FUN(__glewTextureImage2DEXT)
+#define glTextureImage3DEXT GLEW_GET_FUN(__glewTextureImage3DEXT)
+#define glTextureParameterIivEXT GLEW_GET_FUN(__glewTextureParameterIivEXT)
+#define glTextureParameterIuivEXT GLEW_GET_FUN(__glewTextureParameterIuivEXT)
+#define glTextureParameterfEXT GLEW_GET_FUN(__glewTextureParameterfEXT)
+#define glTextureParameterfvEXT GLEW_GET_FUN(__glewTextureParameterfvEXT)
+#define glTextureParameteriEXT GLEW_GET_FUN(__glewTextureParameteriEXT)
+#define glTextureParameterivEXT GLEW_GET_FUN(__glewTextureParameterivEXT)
+#define glTextureRenderbufferEXT GLEW_GET_FUN(__glewTextureRenderbufferEXT)
+#define glTextureSubImage1DEXT GLEW_GET_FUN(__glewTextureSubImage1DEXT)
+#define glTextureSubImage2DEXT GLEW_GET_FUN(__glewTextureSubImage2DEXT)
+#define glTextureSubImage3DEXT GLEW_GET_FUN(__glewTextureSubImage3DEXT)
+#define glUnmapNamedBufferEXT GLEW_GET_FUN(__glewUnmapNamedBufferEXT)
+#define glVertexArrayColorOffsetEXT GLEW_GET_FUN(__glewVertexArrayColorOffsetEXT)
+#define glVertexArrayEdgeFlagOffsetEXT GLEW_GET_FUN(__glewVertexArrayEdgeFlagOffsetEXT)
+#define glVertexArrayFogCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayFogCoordOffsetEXT)
+#define glVertexArrayIndexOffsetEXT GLEW_GET_FUN(__glewVertexArrayIndexOffsetEXT)
+#define glVertexArrayMultiTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayMultiTexCoordOffsetEXT)
+#define glVertexArrayNormalOffsetEXT GLEW_GET_FUN(__glewVertexArrayNormalOffsetEXT)
+#define glVertexArraySecondaryColorOffsetEXT GLEW_GET_FUN(__glewVertexArraySecondaryColorOffsetEXT)
+#define glVertexArrayTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayTexCoordOffsetEXT)
+#define glVertexArrayVertexAttribDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribDivisorEXT)
+#define glVertexArrayVertexAttribIOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIOffsetEXT)
+#define glVertexArrayVertexAttribOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribOffsetEXT)
+#define glVertexArrayVertexOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexOffsetEXT)
+
+#define GLEW_EXT_direct_state_access GLEW_GET_VAR(__GLEW_EXT_direct_state_access)
+
+#endif /* GL_EXT_direct_state_access */
+
+/* ----------------------- GL_EXT_discard_framebuffer ---------------------- */
+
+#ifndef GL_EXT_discard_framebuffer
+#define GL_EXT_discard_framebuffer 1
+
+#define GL_COLOR_EXT 0x1800
+#define GL_DEPTH_EXT 0x1801
+#define GL_STENCIL_EXT 0x1802
+
+typedef void (GLAPIENTRY * PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments);
+
+#define glDiscardFramebufferEXT GLEW_GET_FUN(__glewDiscardFramebufferEXT)
+
+#define GLEW_EXT_discard_framebuffer GLEW_GET_VAR(__GLEW_EXT_discard_framebuffer)
+
+#endif /* GL_EXT_discard_framebuffer */
+
+/* -------------------------- GL_EXT_draw_buffers -------------------------- */
+
+#ifndef GL_EXT_draw_buffers
+#define GL_EXT_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_EXT 0x8824
+#define GL_DRAW_BUFFER0_EXT 0x8825
+#define GL_DRAW_BUFFER1_EXT 0x8826
+#define GL_DRAW_BUFFER2_EXT 0x8827
+#define GL_DRAW_BUFFER3_EXT 0x8828
+#define GL_DRAW_BUFFER4_EXT 0x8829
+#define GL_DRAW_BUFFER5_EXT 0x882A
+#define GL_DRAW_BUFFER6_EXT 0x882B
+#define GL_DRAW_BUFFER7_EXT 0x882C
+#define GL_DRAW_BUFFER8_EXT 0x882D
+#define GL_DRAW_BUFFER9_EXT 0x882E
+#define GL_DRAW_BUFFER10_EXT 0x882F
+#define GL_DRAW_BUFFER11_EXT 0x8830
+#define GL_DRAW_BUFFER12_EXT 0x8831
+#define GL_DRAW_BUFFER13_EXT 0x8832
+#define GL_DRAW_BUFFER14_EXT 0x8833
+#define GL_DRAW_BUFFER15_EXT 0x8834
+#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersEXT GLEW_GET_FUN(__glewDrawBuffersEXT)
+
+#define GLEW_EXT_draw_buffers GLEW_GET_VAR(__GLEW_EXT_draw_buffers)
+
+#endif /* GL_EXT_draw_buffers */
+
+/* -------------------------- GL_EXT_draw_buffers2 ------------------------- */
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+
+typedef void (GLAPIENTRY * PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (GLAPIENTRY * PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum value, GLuint index, GLboolean* data);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum value, GLuint index, GLint* data);
+typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+
+#define glColorMaskIndexedEXT GLEW_GET_FUN(__glewColorMaskIndexedEXT)
+#define glDisableIndexedEXT GLEW_GET_FUN(__glewDisableIndexedEXT)
+#define glEnableIndexedEXT GLEW_GET_FUN(__glewEnableIndexedEXT)
+#define glGetBooleanIndexedvEXT GLEW_GET_FUN(__glewGetBooleanIndexedvEXT)
+#define glGetIntegerIndexedvEXT GLEW_GET_FUN(__glewGetIntegerIndexedvEXT)
+#define glIsEnabledIndexedEXT GLEW_GET_FUN(__glewIsEnabledIndexedEXT)
+
+#define GLEW_EXT_draw_buffers2 GLEW_GET_VAR(__GLEW_EXT_draw_buffers2)
+
+#endif /* GL_EXT_draw_buffers2 */
+
+/* ---------------------- GL_EXT_draw_buffers_indexed ---------------------- */
+
+#ifndef GL_EXT_draw_buffers_indexed
+#define GL_EXT_draw_buffers_indexed 1
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (GLAPIENTRY * PFNGLCOLORMASKIEXTPROC) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (GLAPIENTRY * PFNGLDISABLEIEXTPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEIEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDIEXTPROC) (GLenum target, GLuint index);
+
+#define glBlendEquationSeparateiEXT GLEW_GET_FUN(__glewBlendEquationSeparateiEXT)
+#define glBlendEquationiEXT GLEW_GET_FUN(__glewBlendEquationiEXT)
+#define glBlendFuncSeparateiEXT GLEW_GET_FUN(__glewBlendFuncSeparateiEXT)
+#define glBlendFunciEXT GLEW_GET_FUN(__glewBlendFunciEXT)
+#define glColorMaskiEXT GLEW_GET_FUN(__glewColorMaskiEXT)
+#define glDisableiEXT GLEW_GET_FUN(__glewDisableiEXT)
+#define glEnableiEXT GLEW_GET_FUN(__glewEnableiEXT)
+#define glIsEnablediEXT GLEW_GET_FUN(__glewIsEnablediEXT)
+
+#define GLEW_EXT_draw_buffers_indexed GLEW_GET_VAR(__GLEW_EXT_draw_buffers_indexed)
+
+#endif /* GL_EXT_draw_buffers_indexed */
+
+/* -------------------- GL_EXT_draw_elements_base_vertex ------------------- */
+
+#ifndef GL_EXT_draw_elements_base_vertex
+#define GL_EXT_draw_elements_base_vertex 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex);
+
+#define glDrawElementsBaseVertexEXT GLEW_GET_FUN(__glewDrawElementsBaseVertexEXT)
+#define glDrawElementsInstancedBaseVertexEXT GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexEXT)
+#define glDrawRangeElementsBaseVertexEXT GLEW_GET_FUN(__glewDrawRangeElementsBaseVertexEXT)
+#define glMultiDrawElementsBaseVertexEXT GLEW_GET_FUN(__glewMultiDrawElementsBaseVertexEXT)
+
+#define GLEW_EXT_draw_elements_base_vertex GLEW_GET_VAR(__GLEW_EXT_draw_elements_base_vertex)
+
+#endif /* GL_EXT_draw_elements_base_vertex */
+
+/* ------------------------- GL_EXT_draw_instanced ------------------------- */
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+
+#define glDrawArraysInstancedEXT GLEW_GET_FUN(__glewDrawArraysInstancedEXT)
+#define glDrawElementsInstancedEXT GLEW_GET_FUN(__glewDrawElementsInstancedEXT)
+
+#define GLEW_EXT_draw_instanced GLEW_GET_VAR(__GLEW_EXT_draw_instanced)
+
+#endif /* GL_EXT_draw_instanced */
+
+/* ----------------------- GL_EXT_draw_range_elements ---------------------- */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+
+#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9
+
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+
+#define glDrawRangeElementsEXT GLEW_GET_FUN(__glewDrawRangeElementsEXT)
+
+#define GLEW_EXT_draw_range_elements GLEW_GET_VAR(__GLEW_EXT_draw_range_elements)
+
+#endif /* GL_EXT_draw_range_elements */
+
+/* ------------------------- GL_EXT_external_buffer ------------------------ */
+
+#ifndef GL_EXT_external_buffer
+#define GL_EXT_external_buffer 1
+
+typedef void* GLeglClientBufferEXT;
+
+typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+
+#define glBufferStorageExternalEXT GLEW_GET_FUN(__glewBufferStorageExternalEXT)
+#define glNamedBufferStorageExternalEXT GLEW_GET_FUN(__glewNamedBufferStorageExternalEXT)
+
+#define GLEW_EXT_external_buffer GLEW_GET_VAR(__GLEW_EXT_external_buffer)
+
+#endif /* GL_EXT_external_buffer */
+
+/* --------------------------- GL_EXT_float_blend -------------------------- */
+
+#ifndef GL_EXT_float_blend
+#define GL_EXT_float_blend 1
+
+#define GLEW_EXT_float_blend GLEW_GET_VAR(__GLEW_EXT_float_blend)
+
+#endif /* GL_EXT_float_blend */
+
+/* ---------------------------- GL_EXT_fog_coord --------------------------- */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+
+#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450
+#define GL_FOG_COORDINATE_EXT 0x8451
+#define GL_FRAGMENT_DEPTH_EXT 0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457
+
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+
+#define glFogCoordPointerEXT GLEW_GET_FUN(__glewFogCoordPointerEXT)
+#define glFogCoorddEXT GLEW_GET_FUN(__glewFogCoorddEXT)
+#define glFogCoorddvEXT GLEW_GET_FUN(__glewFogCoorddvEXT)
+#define glFogCoordfEXT GLEW_GET_FUN(__glewFogCoordfEXT)
+#define glFogCoordfvEXT GLEW_GET_FUN(__glewFogCoordfvEXT)
+
+#define GLEW_EXT_fog_coord GLEW_GET_VAR(__GLEW_EXT_fog_coord)
+
+#endif /* GL_EXT_fog_coord */
+
+/* --------------------------- GL_EXT_frag_depth --------------------------- */
+
+#ifndef GL_EXT_frag_depth
+#define GL_EXT_frag_depth 1
+
+#define GLEW_EXT_frag_depth GLEW_GET_VAR(__GLEW_EXT_frag_depth)
+
+#endif /* GL_EXT_frag_depth */
+
+/* ------------------------ GL_EXT_fragment_lighting ----------------------- */
+
+#ifndef GL_EXT_fragment_lighting
+#define GL_EXT_fragment_lighting 1
+
+#define GL_FRAGMENT_LIGHTING_EXT 0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_EXT 0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_EXT 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_EXT 0x8404
+#define GL_MAX_ACTIVE_LIGHTS_EXT 0x8405
+#define GL_CURRENT_RASTER_NORMAL_EXT 0x8406
+#define GL_LIGHT_ENV_MODE_EXT 0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_EXT 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT 0x840B
+#define GL_FRAGMENT_LIGHT0_EXT 0x840C
+#define GL_FRAGMENT_LIGHT7_EXT 0x8413
+
+typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALEXTPROC) (GLenum face, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVEXTPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIEXTPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVEXTPROC) (GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFEXTPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIEXTPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFEXTPROC) (GLenum face, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIEXTPROC) (GLenum face, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLLIGHTENVIEXTPROC) (GLenum pname, GLint param);
+
+#define glFragmentColorMaterialEXT GLEW_GET_FUN(__glewFragmentColorMaterialEXT)
+#define glFragmentLightModelfEXT GLEW_GET_FUN(__glewFragmentLightModelfEXT)
+#define glFragmentLightModelfvEXT GLEW_GET_FUN(__glewFragmentLightModelfvEXT)
+#define glFragmentLightModeliEXT GLEW_GET_FUN(__glewFragmentLightModeliEXT)
+#define glFragmentLightModelivEXT GLEW_GET_FUN(__glewFragmentLightModelivEXT)
+#define glFragmentLightfEXT GLEW_GET_FUN(__glewFragmentLightfEXT)
+#define glFragmentLightfvEXT GLEW_GET_FUN(__glewFragmentLightfvEXT)
+#define glFragmentLightiEXT GLEW_GET_FUN(__glewFragmentLightiEXT)
+#define glFragmentLightivEXT GLEW_GET_FUN(__glewFragmentLightivEXT)
+#define glFragmentMaterialfEXT GLEW_GET_FUN(__glewFragmentMaterialfEXT)
+#define glFragmentMaterialfvEXT GLEW_GET_FUN(__glewFragmentMaterialfvEXT)
+#define glFragmentMaterialiEXT GLEW_GET_FUN(__glewFragmentMaterialiEXT)
+#define glFragmentMaterialivEXT GLEW_GET_FUN(__glewFragmentMaterialivEXT)
+#define glGetFragmentLightfvEXT GLEW_GET_FUN(__glewGetFragmentLightfvEXT)
+#define glGetFragmentLightivEXT GLEW_GET_FUN(__glewGetFragmentLightivEXT)
+#define glGetFragmentMaterialfvEXT GLEW_GET_FUN(__glewGetFragmentMaterialfvEXT)
+#define glGetFragmentMaterialivEXT GLEW_GET_FUN(__glewGetFragmentMaterialivEXT)
+#define glLightEnviEXT GLEW_GET_FUN(__glewLightEnviEXT)
+
+#define GLEW_EXT_fragment_lighting GLEW_GET_VAR(__GLEW_EXT_fragment_lighting)
+
+#endif /* GL_EXT_fragment_lighting */
+
+/* ------------------------ GL_EXT_framebuffer_blit ------------------------ */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6
+#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA
+
+typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+
+#define glBlitFramebufferEXT GLEW_GET_FUN(__glewBlitFramebufferEXT)
+
+#define GLEW_EXT_framebuffer_blit GLEW_GET_VAR(__GLEW_EXT_framebuffer_blit)
+
+#endif /* GL_EXT_framebuffer_blit */
+
+/* --------------------- GL_EXT_framebuffer_multisample -------------------- */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+
+#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT 0x8D57
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewRenderbufferStorageMultisampleEXT)
+
+#define GLEW_EXT_framebuffer_multisample GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample)
+
+#endif /* GL_EXT_framebuffer_multisample */
+
+/* --------------- GL_EXT_framebuffer_multisample_blit_scaled -------------- */
+
+#ifndef GL_EXT_framebuffer_multisample_blit_scaled
+#define GL_EXT_framebuffer_multisample_blit_scaled 1
+
+#define GL_SCALED_RESOLVE_FASTEST_EXT 0x90BA
+#define GL_SCALED_RESOLVE_NICEST_EXT 0x90BB
+
+#define GLEW_EXT_framebuffer_multisample_blit_scaled GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample_blit_scaled)
+
+#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
+
+/* ----------------------- GL_EXT_framebuffer_object ----------------------- */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT 0x8D20
+#define GL_FRAMEBUFFER_EXT 0x8D40
+#define GL_RENDERBUFFER_EXT 0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT 0x8D46
+#define GL_STENCIL_INDEX4_EXT 0x8D47
+#define GL_STENCIL_INDEX8_EXT 0x8D48
+#define GL_STENCIL_INDEX16_EXT 0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glBindFramebufferEXT GLEW_GET_FUN(__glewBindFramebufferEXT)
+#define glBindRenderbufferEXT GLEW_GET_FUN(__glewBindRenderbufferEXT)
+#define glCheckFramebufferStatusEXT GLEW_GET_FUN(__glewCheckFramebufferStatusEXT)
+#define glDeleteFramebuffersEXT GLEW_GET_FUN(__glewDeleteFramebuffersEXT)
+#define glDeleteRenderbuffersEXT GLEW_GET_FUN(__glewDeleteRenderbuffersEXT)
+#define glFramebufferRenderbufferEXT GLEW_GET_FUN(__glewFramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT GLEW_GET_FUN(__glewFramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT GLEW_GET_FUN(__glewFramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT GLEW_GET_FUN(__glewFramebufferTexture3DEXT)
+#define glGenFramebuffersEXT GLEW_GET_FUN(__glewGenFramebuffersEXT)
+#define glGenRenderbuffersEXT GLEW_GET_FUN(__glewGenRenderbuffersEXT)
+#define glGenerateMipmapEXT GLEW_GET_FUN(__glewGenerateMipmapEXT)
+#define glGetFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetFramebufferAttachmentParameterivEXT)
+#define glGetRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetRenderbufferParameterivEXT)
+#define glIsFramebufferEXT GLEW_GET_FUN(__glewIsFramebufferEXT)
+#define glIsRenderbufferEXT GLEW_GET_FUN(__glewIsRenderbufferEXT)
+#define glRenderbufferStorageEXT GLEW_GET_FUN(__glewRenderbufferStorageEXT)
+
+#define GLEW_EXT_framebuffer_object GLEW_GET_VAR(__GLEW_EXT_framebuffer_object)
+
+#endif /* GL_EXT_framebuffer_object */
+
+/* ------------------------ GL_EXT_framebuffer_sRGB ------------------------ */
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+
+#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA
+
+#define GLEW_EXT_framebuffer_sRGB GLEW_GET_VAR(__GLEW_EXT_framebuffer_sRGB)
+
+#endif /* GL_EXT_framebuffer_sRGB */
+
+/* ----------------------- GL_EXT_geometry_point_size ---------------------- */
+
+#ifndef GL_EXT_geometry_point_size
+#define GL_EXT_geometry_point_size 1
+
+#define GL_GEOMETRY_SHADER_BIT_EXT 0x00000004
+#define GL_LINES_ADJACENCY_EXT 0xA
+#define GL_LINE_STRIP_ADJACENCY_EXT 0xB
+#define GL_TRIANGLES_ADJACENCY_EXT 0xC
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
+#define GL_LAYER_PROVOKING_VERTEX_EXT 0x825E
+#define GL_UNDEFINED_VERTEX_EXT 0x8260
+#define GL_GEOMETRY_SHADER_INVOCATIONS_EXT 0x887F
+#define GL_GEOMETRY_LINKED_VERTICES_OUT_EXT 0x8916
+#define GL_GEOMETRY_LINKED_INPUT_TYPE_EXT 0x8917
+#define GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT 0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT 0x8A2C
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8A32
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_PRIMITIVES_GENERATED_EXT 0x8C87
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_GEOMETRY_SHADER_EXT 0x8DD9
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT 0x8E5A
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT 0x90CD
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT 0x90D7
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT 0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT 0x9124
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT 0x92CF
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT 0x92D5
+#define GL_REFERENCED_BY_GEOMETRY_SHADER_EXT 0x9309
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT 0x9312
+#define GL_MAX_FRAMEBUFFER_LAYERS_EXT 0x9317
+
+#define GLEW_EXT_geometry_point_size GLEW_GET_VAR(__GLEW_EXT_geometry_point_size)
+
+#endif /* GL_EXT_geometry_point_size */
+
+/* ------------------------- GL_EXT_geometry_shader ------------------------ */
+
+#ifndef GL_EXT_geometry_shader
+#define GL_EXT_geometry_shader 1
+
+#define GL_GEOMETRY_SHADER_BIT_EXT 0x00000004
+#define GL_LINES_ADJACENCY_EXT 0xA
+#define GL_LINE_STRIP_ADJACENCY_EXT 0xB
+#define GL_TRIANGLES_ADJACENCY_EXT 0xC
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
+#define GL_LAYER_PROVOKING_VERTEX_EXT 0x825E
+#define GL_UNDEFINED_VERTEX_EXT 0x8260
+#define GL_GEOMETRY_SHADER_INVOCATIONS_EXT 0x887F
+#define GL_GEOMETRY_LINKED_VERTICES_OUT_EXT 0x8916
+#define GL_GEOMETRY_LINKED_INPUT_TYPE_EXT 0x8917
+#define GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT 0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT 0x8A2C
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8A32
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_PRIMITIVES_GENERATED_EXT 0x8C87
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_GEOMETRY_SHADER_EXT 0x8DD9
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT 0x8E5A
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT 0x90CD
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT 0x90D7
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT 0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT 0x9124
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT 0x92CF
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT 0x92D5
+#define GL_REFERENCED_BY_GEOMETRY_SHADER_EXT 0x9309
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT 0x9312
+#define GL_MAX_FRAMEBUFFER_LAYERS_EXT 0x9317
+
+#define GLEW_EXT_geometry_shader GLEW_GET_VAR(__GLEW_EXT_geometry_shader)
+
+#endif /* GL_EXT_geometry_shader */
+
+/* ------------------------ GL_EXT_geometry_shader4 ------------------------ */
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+
+#define GL_LINES_ADJACENCY_EXT 0xA
+#define GL_LINE_STRIP_ADJACENCY_EXT 0xB
+#define GL_TRIANGLES_ADJACENCY_EXT 0xC
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
+#define GL_PROGRAM_POINT_SIZE_EXT 0x8642
+#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_GEOMETRY_SHADER_EXT 0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+
+#define glFramebufferTextureEXT GLEW_GET_FUN(__glewFramebufferTextureEXT)
+#define glFramebufferTextureFaceEXT GLEW_GET_FUN(__glewFramebufferTextureFaceEXT)
+#define glProgramParameteriEXT GLEW_GET_FUN(__glewProgramParameteriEXT)
+
+#define GLEW_EXT_geometry_shader4 GLEW_GET_VAR(__GLEW_EXT_geometry_shader4)
+
+#endif /* GL_EXT_geometry_shader4 */
+
+/* --------------------- GL_EXT_gpu_program_parameters --------------------- */
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params);
+
+#define glProgramEnvParameters4fvEXT GLEW_GET_FUN(__glewProgramEnvParameters4fvEXT)
+#define glProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewProgramLocalParameters4fvEXT)
+
+#define GLEW_EXT_gpu_program_parameters GLEW_GET_VAR(__GLEW_EXT_gpu_program_parameters)
+
+#endif /* GL_EXT_gpu_program_parameters */
+
+/* --------------------------- GL_EXT_gpu_shader4 -------------------------- */
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
+#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1
+#define GL_SAMPLER_BUFFER_EXT 0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8
+#define GL_INT_SAMPLER_1D_EXT 0x8DC9
+#define GL_INT_SAMPLER_2D_EXT 0x8DCA
+#define GL_INT_SAMPLER_3D_EXT 0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+
+#define glBindFragDataLocationEXT GLEW_GET_FUN(__glewBindFragDataLocationEXT)
+#define glGetFragDataLocationEXT GLEW_GET_FUN(__glewGetFragDataLocationEXT)
+#define glGetUniformuivEXT GLEW_GET_FUN(__glewGetUniformuivEXT)
+#define glGetVertexAttribIivEXT GLEW_GET_FUN(__glewGetVertexAttribIivEXT)
+#define glGetVertexAttribIuivEXT GLEW_GET_FUN(__glewGetVertexAttribIuivEXT)
+#define glUniform1uiEXT GLEW_GET_FUN(__glewUniform1uiEXT)
+#define glUniform1uivEXT GLEW_GET_FUN(__glewUniform1uivEXT)
+#define glUniform2uiEXT GLEW_GET_FUN(__glewUniform2uiEXT)
+#define glUniform2uivEXT GLEW_GET_FUN(__glewUniform2uivEXT)
+#define glUniform3uiEXT GLEW_GET_FUN(__glewUniform3uiEXT)
+#define glUniform3uivEXT GLEW_GET_FUN(__glewUniform3uivEXT)
+#define glUniform4uiEXT GLEW_GET_FUN(__glewUniform4uiEXT)
+#define glUniform4uivEXT GLEW_GET_FUN(__glewUniform4uivEXT)
+#define glVertexAttribI1iEXT GLEW_GET_FUN(__glewVertexAttribI1iEXT)
+#define glVertexAttribI1ivEXT GLEW_GET_FUN(__glewVertexAttribI1ivEXT)
+#define glVertexAttribI1uiEXT GLEW_GET_FUN(__glewVertexAttribI1uiEXT)
+#define glVertexAttribI1uivEXT GLEW_GET_FUN(__glewVertexAttribI1uivEXT)
+#define glVertexAttribI2iEXT GLEW_GET_FUN(__glewVertexAttribI2iEXT)
+#define glVertexAttribI2ivEXT GLEW_GET_FUN(__glewVertexAttribI2ivEXT)
+#define glVertexAttribI2uiEXT GLEW_GET_FUN(__glewVertexAttribI2uiEXT)
+#define glVertexAttribI2uivEXT GLEW_GET_FUN(__glewVertexAttribI2uivEXT)
+#define glVertexAttribI3iEXT GLEW_GET_FUN(__glewVertexAttribI3iEXT)
+#define glVertexAttribI3ivEXT GLEW_GET_FUN(__glewVertexAttribI3ivEXT)
+#define glVertexAttribI3uiEXT GLEW_GET_FUN(__glewVertexAttribI3uiEXT)
+#define glVertexAttribI3uivEXT GLEW_GET_FUN(__glewVertexAttribI3uivEXT)
+#define glVertexAttribI4bvEXT GLEW_GET_FUN(__glewVertexAttribI4bvEXT)
+#define glVertexAttribI4iEXT GLEW_GET_FUN(__glewVertexAttribI4iEXT)
+#define glVertexAttribI4ivEXT GLEW_GET_FUN(__glewVertexAttribI4ivEXT)
+#define glVertexAttribI4svEXT GLEW_GET_FUN(__glewVertexAttribI4svEXT)
+#define glVertexAttribI4ubvEXT GLEW_GET_FUN(__glewVertexAttribI4ubvEXT)
+#define glVertexAttribI4uiEXT GLEW_GET_FUN(__glewVertexAttribI4uiEXT)
+#define glVertexAttribI4uivEXT GLEW_GET_FUN(__glewVertexAttribI4uivEXT)
+#define glVertexAttribI4usvEXT GLEW_GET_FUN(__glewVertexAttribI4usvEXT)
+#define glVertexAttribIPointerEXT GLEW_GET_FUN(__glewVertexAttribIPointerEXT)
+
+#define GLEW_EXT_gpu_shader4 GLEW_GET_VAR(__GLEW_EXT_gpu_shader4)
+
+#endif /* GL_EXT_gpu_shader4 */
+
+/* --------------------------- GL_EXT_gpu_shader5 -------------------------- */
+
+#ifndef GL_EXT_gpu_shader5
+#define GL_EXT_gpu_shader5 1
+
+#define GLEW_EXT_gpu_shader5 GLEW_GET_VAR(__GLEW_EXT_gpu_shader5)
+
+#endif /* GL_EXT_gpu_shader5 */
+
+/* ---------------------------- GL_EXT_histogram --------------------------- */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+
+#define GL_HISTOGRAM_EXT 0x8024
+#define GL_PROXY_HISTOGRAM_EXT 0x8025
+#define GL_HISTOGRAM_WIDTH_EXT 0x8026
+#define GL_HISTOGRAM_FORMAT_EXT 0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C
+#define GL_HISTOGRAM_SINK_EXT 0x802D
+#define GL_MINMAX_EXT 0x802E
+#define GL_MINMAX_FORMAT_EXT 0x802F
+#define GL_MINMAX_SINK_EXT 0x8030
+
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
+
+#define glGetHistogramEXT GLEW_GET_FUN(__glewGetHistogramEXT)
+#define glGetHistogramParameterfvEXT GLEW_GET_FUN(__glewGetHistogramParameterfvEXT)
+#define glGetHistogramParameterivEXT GLEW_GET_FUN(__glewGetHistogramParameterivEXT)
+#define glGetMinmaxEXT GLEW_GET_FUN(__glewGetMinmaxEXT)
+#define glGetMinmaxParameterfvEXT GLEW_GET_FUN(__glewGetMinmaxParameterfvEXT)
+#define glGetMinmaxParameterivEXT GLEW_GET_FUN(__glewGetMinmaxParameterivEXT)
+#define glHistogramEXT GLEW_GET_FUN(__glewHistogramEXT)
+#define glMinmaxEXT GLEW_GET_FUN(__glewMinmaxEXT)
+#define glResetHistogramEXT GLEW_GET_FUN(__glewResetHistogramEXT)
+#define glResetMinmaxEXT GLEW_GET_FUN(__glewResetMinmaxEXT)
+
+#define GLEW_EXT_histogram GLEW_GET_VAR(__GLEW_EXT_histogram)
+
+#endif /* GL_EXT_histogram */
+
+/* ----------------------- GL_EXT_index_array_formats ---------------------- */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+
+#define GLEW_EXT_index_array_formats GLEW_GET_VAR(__GLEW_EXT_index_array_formats)
+
+#endif /* GL_EXT_index_array_formats */
+
+/* --------------------------- GL_EXT_index_func --------------------------- */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+
+typedef void (GLAPIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref);
+
+#define glIndexFuncEXT GLEW_GET_FUN(__glewIndexFuncEXT)
+
+#define GLEW_EXT_index_func GLEW_GET_VAR(__GLEW_EXT_index_func)
+
+#endif /* GL_EXT_index_func */
+
+/* ------------------------- GL_EXT_index_material ------------------------- */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+
+typedef void (GLAPIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+
+#define glIndexMaterialEXT GLEW_GET_FUN(__glewIndexMaterialEXT)
+
+#define GLEW_EXT_index_material GLEW_GET_VAR(__GLEW_EXT_index_material)
+
+#endif /* GL_EXT_index_material */
+
+/* -------------------------- GL_EXT_index_texture ------------------------- */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+
+#define GLEW_EXT_index_texture GLEW_GET_VAR(__GLEW_EXT_index_texture)
+
+#endif /* GL_EXT_index_texture */
+
+/* ------------------------ GL_EXT_instanced_arrays ------------------------ */
+
+#ifndef GL_EXT_instanced_arrays
+#define GL_EXT_instanced_arrays 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT 0x88FE
+
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor);
+
+#define glVertexAttribDivisorEXT GLEW_GET_FUN(__glewVertexAttribDivisorEXT)
+
+#define GLEW_EXT_instanced_arrays GLEW_GET_VAR(__GLEW_EXT_instanced_arrays)
+
+#endif /* GL_EXT_instanced_arrays */
+
+/* -------------------------- GL_EXT_light_texture ------------------------- */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+
+#define GL_FRAGMENT_MATERIAL_EXT 0x8349
+#define GL_FRAGMENT_NORMAL_EXT 0x834A
+#define GL_FRAGMENT_COLOR_EXT 0x834C
+#define GL_ATTENUATION_EXT 0x834D
+#define GL_SHADOW_ATTENUATION_EXT 0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F
+#define GL_TEXTURE_LIGHT_EXT 0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+
+typedef void (GLAPIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (GLAPIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+
+#define glApplyTextureEXT GLEW_GET_FUN(__glewApplyTextureEXT)
+#define glTextureLightEXT GLEW_GET_FUN(__glewTextureLightEXT)
+#define glTextureMaterialEXT GLEW_GET_FUN(__glewTextureMaterialEXT)
+
+#define GLEW_EXT_light_texture GLEW_GET_VAR(__GLEW_EXT_light_texture)
+
+#endif /* GL_EXT_light_texture */
+
+/* ------------------------ GL_EXT_map_buffer_range ------------------------ */
+
+#ifndef GL_EXT_map_buffer_range
+#define GL_EXT_map_buffer_range 1
+
+#define GL_MAP_READ_BIT_EXT 0x0001
+#define GL_MAP_WRITE_BIT_EXT 0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020
+
+typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void * (GLAPIENTRY * PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+
+#define glFlushMappedBufferRangeEXT GLEW_GET_FUN(__glewFlushMappedBufferRangeEXT)
+#define glMapBufferRangeEXT GLEW_GET_FUN(__glewMapBufferRangeEXT)
+
+#define GLEW_EXT_map_buffer_range GLEW_GET_VAR(__GLEW_EXT_map_buffer_range)
+
+#endif /* GL_EXT_map_buffer_range */
+
+/* -------------------------- GL_EXT_memory_object ------------------------- */
+
+#ifndef GL_EXT_memory_object
+#define GL_EXT_memory_object 1
+
+#define GL_UUID_SIZE_EXT 16
+#define GL_TEXTURE_TILING_EXT 0x9580
+#define GL_DEDICATED_MEMORY_OBJECT_EXT 0x9581
+#define GL_NUM_TILING_TYPES_EXT 0x9582
+#define GL_TILING_TYPES_EXT 0x9583
+#define GL_OPTIMAL_TILING_EXT 0x9584
+#define GL_LINEAR_TILING_EXT 0x9585
+#define GL_LAYOUT_GENERAL_EXT 0x958D
+#define GL_LAYOUT_COLOR_ATTACHMENT_EXT 0x958E
+#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
+#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
+#define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591
+#define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592
+#define GL_LAYOUT_TRANSFER_DST_EXT 0x9593
+#define GL_NUM_DEVICE_UUIDS_EXT 0x9596
+#define GL_DEVICE_UUID_EXT 0x9597
+#define GL_DRIVER_UUID_EXT 0x9598
+#define GL_PROTECTED_MEMORY_OBJECT_EXT 0x959B
+
+typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEMEMEXTPROC) (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLCREATEMEMORYOBJECTSEXTPROC) (GLsizei n, GLuint* memoryObjects);
+typedef void (GLAPIENTRY * PFNGLDELETEMEMORYOBJECTSEXTPROC) (GLsizei n, const GLuint* memoryObjects);
+typedef void (GLAPIENTRY * PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETUNSIGNEDBYTEI_VEXTPROC) (GLenum target, GLuint index, GLubyte* data);
+typedef void (GLAPIENTRY * PFNGLGETUNSIGNEDBYTEVEXTPROC) (GLenum pname, GLubyte* data);
+typedef GLboolean (GLAPIENTRY * PFNGLISMEMORYOBJECTEXTPROC) (GLuint memoryObject);
+typedef void (GLAPIENTRY * PFNGLMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC) (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGEMEM1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGEMEM2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGEMEM3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGEMEM1DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGEMEM2DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGEMEM3DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+
+#define glBufferStorageMemEXT GLEW_GET_FUN(__glewBufferStorageMemEXT)
+#define glCreateMemoryObjectsEXT GLEW_GET_FUN(__glewCreateMemoryObjectsEXT)
+#define glDeleteMemoryObjectsEXT GLEW_GET_FUN(__glewDeleteMemoryObjectsEXT)
+#define glGetMemoryObjectParameterivEXT GLEW_GET_FUN(__glewGetMemoryObjectParameterivEXT)
+#define glGetUnsignedBytei_vEXT GLEW_GET_FUN(__glewGetUnsignedBytei_vEXT)
+#define glGetUnsignedBytevEXT GLEW_GET_FUN(__glewGetUnsignedBytevEXT)
+#define glIsMemoryObjectEXT GLEW_GET_FUN(__glewIsMemoryObjectEXT)
+#define glMemoryObjectParameterivEXT GLEW_GET_FUN(__glewMemoryObjectParameterivEXT)
+#define glNamedBufferStorageMemEXT GLEW_GET_FUN(__glewNamedBufferStorageMemEXT)
+#define glTexStorageMem1DEXT GLEW_GET_FUN(__glewTexStorageMem1DEXT)
+#define glTexStorageMem2DEXT GLEW_GET_FUN(__glewTexStorageMem2DEXT)
+#define glTexStorageMem2DMultisampleEXT GLEW_GET_FUN(__glewTexStorageMem2DMultisampleEXT)
+#define glTexStorageMem3DEXT GLEW_GET_FUN(__glewTexStorageMem3DEXT)
+#define glTexStorageMem3DMultisampleEXT GLEW_GET_FUN(__glewTexStorageMem3DMultisampleEXT)
+#define glTextureStorageMem1DEXT GLEW_GET_FUN(__glewTextureStorageMem1DEXT)
+#define glTextureStorageMem2DEXT GLEW_GET_FUN(__glewTextureStorageMem2DEXT)
+#define glTextureStorageMem2DMultisampleEXT GLEW_GET_FUN(__glewTextureStorageMem2DMultisampleEXT)
+#define glTextureStorageMem3DEXT GLEW_GET_FUN(__glewTextureStorageMem3DEXT)
+#define glTextureStorageMem3DMultisampleEXT GLEW_GET_FUN(__glewTextureStorageMem3DMultisampleEXT)
+
+#define GLEW_EXT_memory_object GLEW_GET_VAR(__GLEW_EXT_memory_object)
+
+#endif /* GL_EXT_memory_object */
+
+/* ------------------------ GL_EXT_memory_object_fd ------------------------ */
+
+#ifndef GL_EXT_memory_object_fd
+#define GL_EXT_memory_object_fd 1
+
+#define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
+
+typedef void (GLAPIENTRY * PFNGLIMPORTMEMORYFDEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+
+#define glImportMemoryFdEXT GLEW_GET_FUN(__glewImportMemoryFdEXT)
+
+#define GLEW_EXT_memory_object_fd GLEW_GET_VAR(__GLEW_EXT_memory_object_fd)
+
+#endif /* GL_EXT_memory_object_fd */
+
+/* ----------------------- GL_EXT_memory_object_win32 ---------------------- */
+
+#ifndef GL_EXT_memory_object_win32
+#define GL_EXT_memory_object_win32 1
+
+#define GL_LUID_SIZE_EXT 8
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_EXT 0x9587
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT 0x9588
+#define GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT 0x9589
+#define GL_HANDLE_TYPE_D3D12_RESOURCE_EXT 0x958A
+#define GL_HANDLE_TYPE_D3D11_IMAGE_EXT 0x958B
+#define GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT 0x958C
+#define GL_HANDLE_TYPE_D3D12_FENCE_EXT 0x9594
+#define GL_D3D12_FENCE_VALUE_EXT 0x9595
+#define GL_DEVICE_LUID_EXT 0x9599
+#define GL_DEVICE_NODE_MASK_EXT 0x959A
+
+typedef void (GLAPIENTRY * PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+typedef void (GLAPIENTRY * PFNGLIMPORTMEMORYWIN32NAMEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+
+#define glImportMemoryWin32HandleEXT GLEW_GET_FUN(__glewImportMemoryWin32HandleEXT)
+#define glImportMemoryWin32NameEXT GLEW_GET_FUN(__glewImportMemoryWin32NameEXT)
+
+#define GLEW_EXT_memory_object_win32 GLEW_GET_VAR(__GLEW_EXT_memory_object_win32)
+
+#endif /* GL_EXT_memory_object_win32 */
+
+/* ------------------------- GL_EXT_misc_attribute ------------------------- */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+
+#define GLEW_EXT_misc_attribute GLEW_GET_VAR(__GLEW_EXT_misc_attribute)
+
+#endif /* GL_EXT_misc_attribute */
+
+/* ------------------------ GL_EXT_multi_draw_arrays ----------------------- */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount);
+
+#define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT)
+#define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT)
+
+#define GLEW_EXT_multi_draw_arrays GLEW_GET_VAR(__GLEW_EXT_multi_draw_arrays)
+
+#endif /* GL_EXT_multi_draw_arrays */
+
+/* ----------------------- GL_EXT_multi_draw_indirect ---------------------- */
+
+#ifndef GL_EXT_multi_draw_indirect
+#define GL_EXT_multi_draw_indirect 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTEXTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+
+#define glMultiDrawArraysIndirectEXT GLEW_GET_FUN(__glewMultiDrawArraysIndirectEXT)
+#define glMultiDrawElementsIndirectEXT GLEW_GET_FUN(__glewMultiDrawElementsIndirectEXT)
+
+#define GLEW_EXT_multi_draw_indirect GLEW_GET_VAR(__GLEW_EXT_multi_draw_indirect)
+
+#endif /* GL_EXT_multi_draw_indirect */
+
+/* ------------------------ GL_EXT_multiple_textures ----------------------- */
+
+#ifndef GL_EXT_multiple_textures
+#define GL_EXT_multiple_textures 1
+
+#define GLEW_EXT_multiple_textures GLEW_GET_VAR(__GLEW_EXT_multiple_textures)
+
+#endif /* GL_EXT_multiple_textures */
+
+/* --------------------------- GL_EXT_multisample -------------------------- */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+
+#define GL_MULTISAMPLE_EXT 0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F
+#define GL_SAMPLE_MASK_EXT 0x80A0
+#define GL_1PASS_EXT 0x80A1
+#define GL_2PASS_0_EXT 0x80A2
+#define GL_2PASS_1_EXT 0x80A3
+#define GL_4PASS_0_EXT 0x80A4
+#define GL_4PASS_1_EXT 0x80A5
+#define GL_4PASS_2_EXT 0x80A6
+#define GL_4PASS_3_EXT 0x80A7
+#define GL_SAMPLE_BUFFERS_EXT 0x80A8
+#define GL_SAMPLES_EXT 0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB
+#define GL_SAMPLE_PATTERN_EXT 0x80AC
+#define GL_MULTISAMPLE_BIT_EXT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+
+#define glSampleMaskEXT GLEW_GET_FUN(__glewSampleMaskEXT)
+#define glSamplePatternEXT GLEW_GET_FUN(__glewSamplePatternEXT)
+
+#define GLEW_EXT_multisample GLEW_GET_VAR(__GLEW_EXT_multisample)
+
+#endif /* GL_EXT_multisample */
+
+/* -------------------- GL_EXT_multisample_compatibility ------------------- */
+
+#ifndef GL_EXT_multisample_compatibility
+#define GL_EXT_multisample_compatibility 1
+
+#define GL_MULTISAMPLE_EXT 0x809D
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F
+
+#define GLEW_EXT_multisample_compatibility GLEW_GET_VAR(__GLEW_EXT_multisample_compatibility)
+
+#endif /* GL_EXT_multisample_compatibility */
+
+/* ----------------- GL_EXT_multisampled_render_to_texture ----------------- */
+
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_EXT_multisampled_render_to_texture 1
+
+#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT 0x8D57
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+
+#define glFramebufferTexture2DMultisampleEXT GLEW_GET_FUN(__glewFramebufferTexture2DMultisampleEXT)
+
+#define GLEW_EXT_multisampled_render_to_texture GLEW_GET_VAR(__GLEW_EXT_multisampled_render_to_texture)
+
+#endif /* GL_EXT_multisampled_render_to_texture */
+
+/* ----------------- GL_EXT_multisampled_render_to_texture2 ---------------- */
+
+#ifndef GL_EXT_multisampled_render_to_texture2
+#define GL_EXT_multisampled_render_to_texture2 1
+
+#define GLEW_EXT_multisampled_render_to_texture2 GLEW_GET_VAR(__GLEW_EXT_multisampled_render_to_texture2)
+
+#endif /* GL_EXT_multisampled_render_to_texture2 */
+
+/* --------------------- GL_EXT_multiview_draw_buffers --------------------- */
+
+#ifndef GL_EXT_multiview_draw_buffers
+#define GL_EXT_multiview_draw_buffers 1
+
+#define GL_DRAW_BUFFER_EXT 0x0C01
+#define GL_READ_BUFFER_EXT 0x0C02
+#define GL_COLOR_ATTACHMENT_EXT 0x90F0
+#define GL_MULTIVIEW_EXT 0x90F1
+#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum* location, const GLint *indices);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint* data);
+typedef void (GLAPIENTRY * PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
+
+#define glDrawBuffersIndexedEXT GLEW_GET_FUN(__glewDrawBuffersIndexedEXT)
+#define glGetIntegeri_vEXT GLEW_GET_FUN(__glewGetIntegeri_vEXT)
+#define glReadBufferIndexedEXT GLEW_GET_FUN(__glewReadBufferIndexedEXT)
+
+#define GLEW_EXT_multiview_draw_buffers GLEW_GET_VAR(__GLEW_EXT_multiview_draw_buffers)
+
+#endif /* GL_EXT_multiview_draw_buffers */
+
+/* ---------------------- GL_EXT_packed_depth_stencil ---------------------- */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_EXT 0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
+#define GL_DEPTH24_STENCIL8_EXT 0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
+
+#define GLEW_EXT_packed_depth_stencil GLEW_GET_VAR(__GLEW_EXT_packed_depth_stencil)
+
+#endif /* GL_EXT_packed_depth_stencil */
+
+/* -------------------------- GL_EXT_packed_float -------------------------- */
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+
+#define GL_R11F_G11F_B10F_EXT 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C
+
+#define GLEW_EXT_packed_float GLEW_GET_VAR(__GLEW_EXT_packed_float)
+
+#endif /* GL_EXT_packed_float */
+
+/* -------------------------- GL_EXT_packed_pixels ------------------------- */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+
+#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036
+
+#define GLEW_EXT_packed_pixels GLEW_GET_VAR(__GLEW_EXT_packed_pixels)
+
+#endif /* GL_EXT_packed_pixels */
+
+/* ------------------------ GL_EXT_paletted_texture ------------------------ */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_COLOR_TABLE_FORMAT_EXT 0x80D8
+#define GL_COLOR_TABLE_WIDTH_EXT 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_EXT 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_EXT 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_EXT 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_EXT 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF
+#define GL_COLOR_INDEX1_EXT 0x80E2
+#define GL_COLOR_INDEX2_EXT 0x80E3
+#define GL_COLOR_INDEX4_EXT 0x80E4
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#define GL_COLOR_INDEX12_EXT 0x80E6
+#define GL_COLOR_INDEX16_EXT 0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+
+#define glColorTableEXT GLEW_GET_FUN(__glewColorTableEXT)
+#define glGetColorTableEXT GLEW_GET_FUN(__glewGetColorTableEXT)
+#define glGetColorTableParameterfvEXT GLEW_GET_FUN(__glewGetColorTableParameterfvEXT)
+#define glGetColorTableParameterivEXT GLEW_GET_FUN(__glewGetColorTableParameterivEXT)
+
+#define GLEW_EXT_paletted_texture GLEW_GET_VAR(__GLEW_EXT_paletted_texture)
+
+#endif /* GL_EXT_paletted_texture */
+
+/* ----------------------- GL_EXT_pixel_buffer_object ---------------------- */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+
+#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+
+#define GLEW_EXT_pixel_buffer_object GLEW_GET_VAR(__GLEW_EXT_pixel_buffer_object)
+
+#endif /* GL_EXT_pixel_buffer_object */
+
+/* ------------------------- GL_EXT_pixel_transform ------------------------ */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+
+#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330
+#define GL_PIXEL_MAG_FILTER_EXT 0x8331
+#define GL_PIXEL_MIN_FILTER_EXT 0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333
+#define GL_CUBIC_EXT 0x8334
+#define GL_AVERAGE_EXT 0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338
+
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glGetPixelTransformParameterfvEXT GLEW_GET_FUN(__glewGetPixelTransformParameterfvEXT)
+#define glGetPixelTransformParameterivEXT GLEW_GET_FUN(__glewGetPixelTransformParameterivEXT)
+#define glPixelTransformParameterfEXT GLEW_GET_FUN(__glewPixelTransformParameterfEXT)
+#define glPixelTransformParameterfvEXT GLEW_GET_FUN(__glewPixelTransformParameterfvEXT)
+#define glPixelTransformParameteriEXT GLEW_GET_FUN(__glewPixelTransformParameteriEXT)
+#define glPixelTransformParameterivEXT GLEW_GET_FUN(__glewPixelTransformParameterivEXT)
+
+#define GLEW_EXT_pixel_transform GLEW_GET_VAR(__GLEW_EXT_pixel_transform)
+
+#endif /* GL_EXT_pixel_transform */
+
+/* ------------------- GL_EXT_pixel_transform_color_table ------------------ */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+
+#define GLEW_EXT_pixel_transform_color_table GLEW_GET_VAR(__GLEW_EXT_pixel_transform_color_table)
+
+#endif /* GL_EXT_pixel_transform_color_table */
+
+/* ------------------------ GL_EXT_point_parameters ------------------------ */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_EXT 0x8126
+#define GL_POINT_SIZE_MAX_EXT 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128
+#define GL_DISTANCE_ATTENUATION_EXT 0x8129
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat* params);
+
+#define glPointParameterfEXT GLEW_GET_FUN(__glewPointParameterfEXT)
+#define glPointParameterfvEXT GLEW_GET_FUN(__glewPointParameterfvEXT)
+
+#define GLEW_EXT_point_parameters GLEW_GET_VAR(__GLEW_EXT_point_parameters)
+
+#endif /* GL_EXT_point_parameters */
+
+/* ------------------------- GL_EXT_polygon_offset ------------------------- */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+
+#define GL_POLYGON_OFFSET_EXT 0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039
+
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+
+#define glPolygonOffsetEXT GLEW_GET_FUN(__glewPolygonOffsetEXT)
+
+#define GLEW_EXT_polygon_offset GLEW_GET_VAR(__GLEW_EXT_polygon_offset)
+
+#endif /* GL_EXT_polygon_offset */
+
+/* ---------------------- GL_EXT_polygon_offset_clamp ---------------------- */
+
+#ifndef GL_EXT_polygon_offset_clamp
+#define GL_EXT_polygon_offset_clamp 1
+
+#define GL_POLYGON_OFFSET_CLAMP_EXT 0x8E1B
+
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+
+#define glPolygonOffsetClampEXT GLEW_GET_FUN(__glewPolygonOffsetClampEXT)
+
+#define GLEW_EXT_polygon_offset_clamp GLEW_GET_VAR(__GLEW_EXT_polygon_offset_clamp)
+
+#endif /* GL_EXT_polygon_offset_clamp */
+
+/* ----------------------- GL_EXT_post_depth_coverage ---------------------- */
+
+#ifndef GL_EXT_post_depth_coverage
+#define GL_EXT_post_depth_coverage 1
+
+#define GLEW_EXT_post_depth_coverage GLEW_GET_VAR(__GLEW_EXT_post_depth_coverage)
+
+#endif /* GL_EXT_post_depth_coverage */
+
+/* ------------------------ GL_EXT_provoking_vertex ------------------------ */
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E
+#define GL_PROVOKING_VERTEX_EXT 0x8E4F
+
+typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+
+#define glProvokingVertexEXT GLEW_GET_FUN(__glewProvokingVertexEXT)
+
+#define GLEW_EXT_provoking_vertex GLEW_GET_VAR(__GLEW_EXT_provoking_vertex)
+
+#endif /* GL_EXT_provoking_vertex */
+
+/* --------------------------- GL_EXT_pvrtc_sRGB --------------------------- */
+
+#ifndef GL_EXT_pvrtc_sRGB
+#define GL_EXT_pvrtc_sRGB 1
+
+#define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54
+#define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55
+#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56
+#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57
+
+#define GLEW_EXT_pvrtc_sRGB GLEW_GET_VAR(__GLEW_EXT_pvrtc_sRGB)
+
+#endif /* GL_EXT_pvrtc_sRGB */
+
+/* ----------------------- GL_EXT_raster_multisample ----------------------- */
+
+#ifndef GL_EXT_raster_multisample
+#define GL_EXT_raster_multisample 1
+
+#define GL_COLOR_SAMPLES_NV 0x8E20
+#define GL_RASTER_MULTISAMPLE_EXT 0x9327
+#define GL_RASTER_SAMPLES_EXT 0x9328
+#define GL_MAX_RASTER_SAMPLES_EXT 0x9329
+#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A
+#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B
+#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C
+#define GL_DEPTH_SAMPLES_NV 0x932D
+#define GL_STENCIL_SAMPLES_NV 0x932E
+#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F
+#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330
+#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331
+#define GL_COVERAGE_MODULATION_NV 0x9332
+#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333
+
+typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components);
+typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
+
+#define glCoverageModulationNV GLEW_GET_FUN(__glewCoverageModulationNV)
+#define glCoverageModulationTableNV GLEW_GET_FUN(__glewCoverageModulationTableNV)
+#define glGetCoverageModulationTableNV GLEW_GET_FUN(__glewGetCoverageModulationTableNV)
+#define glRasterSamplesEXT GLEW_GET_FUN(__glewRasterSamplesEXT)
+
+#define GLEW_EXT_raster_multisample GLEW_GET_VAR(__GLEW_EXT_raster_multisample)
+
+#endif /* GL_EXT_raster_multisample */
+
+/* ------------------------ GL_EXT_read_format_bgra ------------------------ */
+
+#ifndef GL_EXT_read_format_bgra
+#define GL_EXT_read_format_bgra 1
+
+#define GL_BGRA_EXT 0x80E1
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366
+
+#define GLEW_EXT_read_format_bgra GLEW_GET_VAR(__GLEW_EXT_read_format_bgra)
+
+#endif /* GL_EXT_read_format_bgra */
+
+/* -------------------------- GL_EXT_render_snorm -------------------------- */
+
+#ifndef GL_EXT_render_snorm
+#define GL_EXT_render_snorm 1
+
+#define GL_BYTE 0x1400
+#define GL_SHORT 0x1402
+#define GL_R8_SNORM 0x8F94
+#define GL_RG8_SNORM 0x8F95
+#define GL_RGBA8_SNORM 0x8F97
+#define GL_R16_SNORM_EXT 0x8F98
+#define GL_RG16_SNORM_EXT 0x8F99
+#define GL_RGBA16_SNORM_EXT 0x8F9B
+
+#define GLEW_EXT_render_snorm GLEW_GET_VAR(__GLEW_EXT_render_snorm)
+
+#endif /* GL_EXT_render_snorm */
+
+/* ------------------------- GL_EXT_rescale_normal ------------------------- */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+
+#define GL_RESCALE_NORMAL_EXT 0x803A
+
+#define GLEW_EXT_rescale_normal GLEW_GET_VAR(__GLEW_EXT_rescale_normal)
+
+#endif /* GL_EXT_rescale_normal */
+
+/* ------------------------------ GL_EXT_sRGB ------------------------------ */
+
+#ifndef GL_EXT_sRGB
+#define GL_EXT_sRGB 1
+
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210
+#define GL_SRGB_EXT 0x8C40
+#define GL_SRGB_ALPHA_EXT 0x8C42
+#define GL_SRGB8_ALPHA8_EXT 0x8C43
+
+#define GLEW_EXT_sRGB GLEW_GET_VAR(__GLEW_EXT_sRGB)
+
+#endif /* GL_EXT_sRGB */
+
+/* ----------------------- GL_EXT_sRGB_write_control ----------------------- */
+
+#ifndef GL_EXT_sRGB_write_control
+#define GL_EXT_sRGB_write_control 1
+
+#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9
+
+#define GLEW_EXT_sRGB_write_control GLEW_GET_VAR(__GLEW_EXT_sRGB_write_control)
+
+#endif /* GL_EXT_sRGB_write_control */
+
+/* -------------------------- GL_EXT_scene_marker -------------------------- */
+
+#ifndef GL_EXT_scene_marker
+#define GL_EXT_scene_marker 1
+
+typedef void (GLAPIENTRY * PFNGLBEGINSCENEEXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLENDSCENEEXTPROC) (void);
+
+#define glBeginSceneEXT GLEW_GET_FUN(__glewBeginSceneEXT)
+#define glEndSceneEXT GLEW_GET_FUN(__glewEndSceneEXT)
+
+#define GLEW_EXT_scene_marker GLEW_GET_VAR(__GLEW_EXT_scene_marker)
+
+#endif /* GL_EXT_scene_marker */
+
+/* ------------------------- GL_EXT_secondary_color ------------------------ */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+
+#define GL_COLOR_SUM_EXT 0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E
+
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+
+#define glSecondaryColor3bEXT GLEW_GET_FUN(__glewSecondaryColor3bEXT)
+#define glSecondaryColor3bvEXT GLEW_GET_FUN(__glewSecondaryColor3bvEXT)
+#define glSecondaryColor3dEXT GLEW_GET_FUN(__glewSecondaryColor3dEXT)
+#define glSecondaryColor3dvEXT GLEW_GET_FUN(__glewSecondaryColor3dvEXT)
+#define glSecondaryColor3fEXT GLEW_GET_FUN(__glewSecondaryColor3fEXT)
+#define glSecondaryColor3fvEXT GLEW_GET_FUN(__glewSecondaryColor3fvEXT)
+#define glSecondaryColor3iEXT GLEW_GET_FUN(__glewSecondaryColor3iEXT)
+#define glSecondaryColor3ivEXT GLEW_GET_FUN(__glewSecondaryColor3ivEXT)
+#define glSecondaryColor3sEXT GLEW_GET_FUN(__glewSecondaryColor3sEXT)
+#define glSecondaryColor3svEXT GLEW_GET_FUN(__glewSecondaryColor3svEXT)
+#define glSecondaryColor3ubEXT GLEW_GET_FUN(__glewSecondaryColor3ubEXT)
+#define glSecondaryColor3ubvEXT GLEW_GET_FUN(__glewSecondaryColor3ubvEXT)
+#define glSecondaryColor3uiEXT GLEW_GET_FUN(__glewSecondaryColor3uiEXT)
+#define glSecondaryColor3uivEXT GLEW_GET_FUN(__glewSecondaryColor3uivEXT)
+#define glSecondaryColor3usEXT GLEW_GET_FUN(__glewSecondaryColor3usEXT)
+#define glSecondaryColor3usvEXT GLEW_GET_FUN(__glewSecondaryColor3usvEXT)
+#define glSecondaryColorPointerEXT GLEW_GET_FUN(__glewSecondaryColorPointerEXT)
+
+#define GLEW_EXT_secondary_color GLEW_GET_VAR(__GLEW_EXT_secondary_color)
+
+#endif /* GL_EXT_secondary_color */
+
+/* ---------------------------- GL_EXT_semaphore --------------------------- */
+
+#ifndef GL_EXT_semaphore
+#define GL_EXT_semaphore 1
+
+typedef void (GLAPIENTRY * PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint* semaphores);
+typedef void (GLAPIENTRY * PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint* semaphores);
+typedef void (GLAPIENTRY * PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, GLuint64* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
+typedef void (GLAPIENTRY * PFNGLSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, const GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLSIGNALSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint* buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+typedef void (GLAPIENTRY * PFNGLWAITSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint* buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+
+#define glDeleteSemaphoresEXT GLEW_GET_FUN(__glewDeleteSemaphoresEXT)
+#define glGenSemaphoresEXT GLEW_GET_FUN(__glewGenSemaphoresEXT)
+#define glGetSemaphoreParameterui64vEXT GLEW_GET_FUN(__glewGetSemaphoreParameterui64vEXT)
+#define glIsSemaphoreEXT GLEW_GET_FUN(__glewIsSemaphoreEXT)
+#define glSemaphoreParameterui64vEXT GLEW_GET_FUN(__glewSemaphoreParameterui64vEXT)
+#define glSignalSemaphoreEXT GLEW_GET_FUN(__glewSignalSemaphoreEXT)
+#define glWaitSemaphoreEXT GLEW_GET_FUN(__glewWaitSemaphoreEXT)
+
+#define GLEW_EXT_semaphore GLEW_GET_VAR(__GLEW_EXT_semaphore)
+
+#endif /* GL_EXT_semaphore */
+
+/* -------------------------- GL_EXT_semaphore_fd -------------------------- */
+
+#ifndef GL_EXT_semaphore_fd
+#define GL_EXT_semaphore_fd 1
+
+typedef void (GLAPIENTRY * PFNGLIMPORTSEMAPHOREFDEXTPROC) (GLuint semaphore, GLenum handleType, GLint fd);
+
+#define glImportSemaphoreFdEXT GLEW_GET_FUN(__glewImportSemaphoreFdEXT)
+
+#define GLEW_EXT_semaphore_fd GLEW_GET_VAR(__GLEW_EXT_semaphore_fd)
+
+#endif /* GL_EXT_semaphore_fd */
+
+/* ------------------------- GL_EXT_semaphore_win32 ------------------------ */
+
+#ifndef GL_EXT_semaphore_win32
+#define GL_EXT_semaphore_win32 1
+
+typedef void (GLAPIENTRY * PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC) (GLuint semaphore, GLenum handleType, void *handle);
+typedef void (GLAPIENTRY * PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC) (GLuint semaphore, GLenum handleType, const void *name);
+
+#define glImportSemaphoreWin32HandleEXT GLEW_GET_FUN(__glewImportSemaphoreWin32HandleEXT)
+#define glImportSemaphoreWin32NameEXT GLEW_GET_FUN(__glewImportSemaphoreWin32NameEXT)
+
+#define GLEW_EXT_semaphore_win32 GLEW_GET_VAR(__GLEW_EXT_semaphore_win32)
+
+#endif /* GL_EXT_semaphore_win32 */
+
+/* --------------------- GL_EXT_separate_shader_objects -------------------- */
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+
+#define GL_ACTIVE_PROGRAM_EXT 0x8B8D
+
+typedef void (GLAPIENTRY * PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar* string);
+typedef void (GLAPIENTRY * PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+
+#define glActiveProgramEXT GLEW_GET_FUN(__glewActiveProgramEXT)
+#define glCreateShaderProgramEXT GLEW_GET_FUN(__glewCreateShaderProgramEXT)
+#define glUseShaderProgramEXT GLEW_GET_FUN(__glewUseShaderProgramEXT)
+
+#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects)
+
+#endif /* GL_EXT_separate_shader_objects */
+
+/* --------------------- GL_EXT_separate_specular_color -------------------- */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8
+#define GL_SINGLE_COLOR_EXT 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA
+
+#define GLEW_EXT_separate_specular_color GLEW_GET_VAR(__GLEW_EXT_separate_specular_color)
+
+#endif /* GL_EXT_separate_specular_color */
+
+/* -------------------- GL_EXT_shader_framebuffer_fetch -------------------- */
+
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_EXT_shader_framebuffer_fetch 1
+
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
+
+#define GLEW_EXT_shader_framebuffer_fetch GLEW_GET_VAR(__GLEW_EXT_shader_framebuffer_fetch)
+
+#endif /* GL_EXT_shader_framebuffer_fetch */
+
+/* ------------------------ GL_EXT_shader_group_vote ----------------------- */
+
+#ifndef GL_EXT_shader_group_vote
+#define GL_EXT_shader_group_vote 1
+
+#define GLEW_EXT_shader_group_vote GLEW_GET_VAR(__GLEW_EXT_shader_group_vote)
+
+#endif /* GL_EXT_shader_group_vote */
+
+/* ------------------- GL_EXT_shader_image_load_formatted ------------------ */
+
+#ifndef GL_EXT_shader_image_load_formatted
+#define GL_EXT_shader_image_load_formatted 1
+
+#define GLEW_EXT_shader_image_load_formatted GLEW_GET_VAR(__GLEW_EXT_shader_image_load_formatted)
+
+#endif /* GL_EXT_shader_image_load_formatted */
+
+/* --------------------- GL_EXT_shader_image_load_store -------------------- */
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_MAX_IMAGE_UNITS_EXT 0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E
+#define GL_IMAGE_1D_EXT 0x904C
+#define GL_IMAGE_2D_EXT 0x904D
+#define GL_IMAGE_3D_EXT 0x904E
+#define GL_IMAGE_2D_RECT_EXT 0x904F
+#define GL_IMAGE_CUBE_EXT 0x9050
+#define GL_IMAGE_BUFFER_EXT 0x9051
+#define GL_IMAGE_1D_ARRAY_EXT 0x9052
+#define GL_IMAGE_2D_ARRAY_EXT 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT 0x9057
+#define GL_INT_IMAGE_2D_EXT 0x9058
+#define GL_INT_IMAGE_3D_EXT 0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT 0x905A
+#define GL_INT_IMAGE_CUBE_EXT 0x905B
+#define GL_INT_IMAGE_BUFFER_EXT 0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E
+#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF
+
+typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+
+#define glBindImageTextureEXT GLEW_GET_FUN(__glewBindImageTextureEXT)
+#define glMemoryBarrierEXT GLEW_GET_FUN(__glewMemoryBarrierEXT)
+
+#define GLEW_EXT_shader_image_load_store GLEW_GET_VAR(__GLEW_EXT_shader_image_load_store)
+
+#endif /* GL_EXT_shader_image_load_store */
+
+/* ------------------- GL_EXT_shader_implicit_conversions ------------------ */
+
+#ifndef GL_EXT_shader_implicit_conversions
+#define GL_EXT_shader_implicit_conversions 1
+
+#define GLEW_EXT_shader_implicit_conversions GLEW_GET_VAR(__GLEW_EXT_shader_implicit_conversions)
+
+#endif /* GL_EXT_shader_implicit_conversions */
+
+/* ----------------------- GL_EXT_shader_integer_mix ----------------------- */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+
+#define GLEW_EXT_shader_integer_mix GLEW_GET_VAR(__GLEW_EXT_shader_integer_mix)
+
+#endif /* GL_EXT_shader_integer_mix */
+
+/* ------------------------ GL_EXT_shader_io_blocks ------------------------ */
+
+#ifndef GL_EXT_shader_io_blocks
+#define GL_EXT_shader_io_blocks 1
+
+#define GLEW_EXT_shader_io_blocks GLEW_GET_VAR(__GLEW_EXT_shader_io_blocks)
+
+#endif /* GL_EXT_shader_io_blocks */
+
+/* ------------- GL_EXT_shader_non_constant_global_initializers ------------ */
+
+#ifndef GL_EXT_shader_non_constant_global_initializers
+#define GL_EXT_shader_non_constant_global_initializers 1
+
+#define GLEW_EXT_shader_non_constant_global_initializers GLEW_GET_VAR(__GLEW_EXT_shader_non_constant_global_initializers)
+
+#endif /* GL_EXT_shader_non_constant_global_initializers */
+
+/* ------------------- GL_EXT_shader_pixel_local_storage ------------------- */
+
+#ifndef GL_EXT_shader_pixel_local_storage
+#define GL_EXT_shader_pixel_local_storage 1
+
+#define GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT 0x8F63
+#define GL_SHADER_PIXEL_LOCAL_STORAGE_EXT 0x8F64
+#define GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_SIZE_EXT 0x8F67
+
+#define GLEW_EXT_shader_pixel_local_storage GLEW_GET_VAR(__GLEW_EXT_shader_pixel_local_storage)
+
+#endif /* GL_EXT_shader_pixel_local_storage */
+
+/* ------------------- GL_EXT_shader_pixel_local_storage2 ------------------ */
+
+#ifndef GL_EXT_shader_pixel_local_storage2
+#define GL_EXT_shader_pixel_local_storage2 1
+
+#define GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_FAST_SIZE_EXT 0x9650
+#define GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_SIZE_EXT 0x9651
+#define GL_FRAMEBUFFER_INCOMPLETE_INSUFFICIENT_SHADER_COMBINED_LOCAL_STORAGE_EXT 0x9652
+
+typedef void (GLAPIENTRY * PFNGLCLEARPIXELLOCALSTORAGEUIEXTPROC) (GLsizei offset, GLsizei n, const GLuint* values);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target, GLsizei size);
+typedef GLsizei (GLAPIENTRY * PFNGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target);
+
+#define glClearPixelLocalStorageuiEXT GLEW_GET_FUN(__glewClearPixelLocalStorageuiEXT)
+#define glFramebufferPixelLocalStorageSizeEXT GLEW_GET_FUN(__glewFramebufferPixelLocalStorageSizeEXT)
+#define glGetFramebufferPixelLocalStorageSizeEXT GLEW_GET_FUN(__glewGetFramebufferPixelLocalStorageSizeEXT)
+
+#define GLEW_EXT_shader_pixel_local_storage2 GLEW_GET_VAR(__GLEW_EXT_shader_pixel_local_storage2)
+
+#endif /* GL_EXT_shader_pixel_local_storage2 */
+
+/* ----------------------- GL_EXT_shader_texture_lod ----------------------- */
+
+#ifndef GL_EXT_shader_texture_lod
+#define GL_EXT_shader_texture_lod 1
+
+#define GLEW_EXT_shader_texture_lod GLEW_GET_VAR(__GLEW_EXT_shader_texture_lod)
+
+#endif /* GL_EXT_shader_texture_lod */
+
+/* -------------------------- GL_EXT_shadow_funcs -------------------------- */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+
+#define GLEW_EXT_shadow_funcs GLEW_GET_VAR(__GLEW_EXT_shadow_funcs)
+
+#endif /* GL_EXT_shadow_funcs */
+
+/* ------------------------- GL_EXT_shadow_samplers ------------------------ */
+
+#ifndef GL_EXT_shadow_samplers
+#define GL_EXT_shadow_samplers 1
+
+#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C
+#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D
+#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E
+#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62
+
+#define GLEW_EXT_shadow_samplers GLEW_GET_VAR(__GLEW_EXT_shadow_samplers)
+
+#endif /* GL_EXT_shadow_samplers */
+
+/* --------------------- GL_EXT_shared_texture_palette --------------------- */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+
+#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB
+
+#define GLEW_EXT_shared_texture_palette GLEW_GET_VAR(__GLEW_EXT_shared_texture_palette)
+
+#endif /* GL_EXT_shared_texture_palette */
+
+/* ------------------------- GL_EXT_sparse_texture ------------------------- */
+
+#ifndef GL_EXT_sparse_texture
+#define GL_EXT_sparse_texture 1
+
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_TEXTURE_3D 0x806F
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_2D_ARRAY 0x8C1A
+#define GL_TEXTURE_CUBE_MAP_ARRAY_OES 0x9009
+#define GL_VIRTUAL_PAGE_SIZE_X_EXT 0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_EXT 0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_EXT 0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_EXT 0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_EXT 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_EXT 0x919A
+#define GL_TEXTURE_SPARSE_EXT 0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_EXT 0x91A7
+#define GL_NUM_VIRTUAL_PAGE_SIZES_EXT 0x91A8
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_EXT 0x91A9
+#define GL_NUM_SPARSE_LEVELS_EXT 0x91AA
+
+typedef void (GLAPIENTRY * PFNGLTEXPAGECOMMITMENTEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+typedef void (GLAPIENTRY * PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+
+#define glTexPageCommitmentEXT GLEW_GET_FUN(__glewTexPageCommitmentEXT)
+#define glTexturePageCommitmentEXT GLEW_GET_FUN(__glewTexturePageCommitmentEXT)
+
+#define GLEW_EXT_sparse_texture GLEW_GET_VAR(__GLEW_EXT_sparse_texture)
+
+#endif /* GL_EXT_sparse_texture */
+
+/* ------------------------- GL_EXT_sparse_texture2 ------------------------ */
+
+#ifndef GL_EXT_sparse_texture2
+#define GL_EXT_sparse_texture2 1
+
+#define GLEW_EXT_sparse_texture2 GLEW_GET_VAR(__GLEW_EXT_sparse_texture2)
+
+#endif /* GL_EXT_sparse_texture2 */
+
+/* ------------------------ GL_EXT_stencil_clear_tag ----------------------- */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+
+#define GL_STENCIL_TAG_BITS_EXT 0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3
+
+#define GLEW_EXT_stencil_clear_tag GLEW_GET_VAR(__GLEW_EXT_stencil_clear_tag)
+
+#endif /* GL_EXT_stencil_clear_tag */
+
+/* ------------------------ GL_EXT_stencil_two_side ------------------------ */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+
+#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911
+
+typedef void (GLAPIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+
+#define glActiveStencilFaceEXT GLEW_GET_FUN(__glewActiveStencilFaceEXT)
+
+#define GLEW_EXT_stencil_two_side GLEW_GET_VAR(__GLEW_EXT_stencil_two_side)
+
+#endif /* GL_EXT_stencil_two_side */
+
+/* -------------------------- GL_EXT_stencil_wrap -------------------------- */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+
+#define GL_INCR_WRAP_EXT 0x8507
+#define GL_DECR_WRAP_EXT 0x8508
+
+#define GLEW_EXT_stencil_wrap GLEW_GET_VAR(__GLEW_EXT_stencil_wrap)
+
+#endif /* GL_EXT_stencil_wrap */
+
+/* --------------------------- GL_EXT_subtexture --------------------------- */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+
+#define glTexSubImage1DEXT GLEW_GET_FUN(__glewTexSubImage1DEXT)
+#define glTexSubImage2DEXT GLEW_GET_FUN(__glewTexSubImage2DEXT)
+#define glTexSubImage3DEXT GLEW_GET_FUN(__glewTexSubImage3DEXT)
+
+#define GLEW_EXT_subtexture GLEW_GET_VAR(__GLEW_EXT_subtexture)
+
+#endif /* GL_EXT_subtexture */
+
+/* ----------------------------- GL_EXT_texture ---------------------------- */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+
+#define GL_ALPHA4_EXT 0x803B
+#define GL_ALPHA8_EXT 0x803C
+#define GL_ALPHA12_EXT 0x803D
+#define GL_ALPHA16_EXT 0x803E
+#define GL_LUMINANCE4_EXT 0x803F
+#define GL_LUMINANCE8_EXT 0x8040
+#define GL_LUMINANCE12_EXT 0x8041
+#define GL_LUMINANCE16_EXT 0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT 0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT 0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT 0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT 0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT 0x8048
+#define GL_INTENSITY_EXT 0x8049
+#define GL_INTENSITY4_EXT 0x804A
+#define GL_INTENSITY8_EXT 0x804B
+#define GL_INTENSITY12_EXT 0x804C
+#define GL_INTENSITY16_EXT 0x804D
+#define GL_RGB2_EXT 0x804E
+#define GL_RGB4_EXT 0x804F
+#define GL_RGB5_EXT 0x8050
+#define GL_RGB8_EXT 0x8051
+#define GL_RGB10_EXT 0x8052
+#define GL_RGB12_EXT 0x8053
+#define GL_RGB16_EXT 0x8054
+#define GL_RGBA2_EXT 0x8055
+#define GL_RGBA4_EXT 0x8056
+#define GL_RGB5_A1_EXT 0x8057
+#define GL_RGBA8_EXT 0x8058
+#define GL_RGB10_A2_EXT 0x8059
+#define GL_RGBA12_EXT 0x805A
+#define GL_RGBA16_EXT 0x805B
+#define GL_TEXTURE_RED_SIZE_EXT 0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061
+#define GL_REPLACE_EXT 0x8062
+#define GL_PROXY_TEXTURE_1D_EXT 0x8063
+#define GL_PROXY_TEXTURE_2D_EXT 0x8064
+
+#define GLEW_EXT_texture GLEW_GET_VAR(__GLEW_EXT_texture)
+
+#endif /* GL_EXT_texture */
+
+/* ---------------------------- GL_EXT_texture3D --------------------------- */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+
+#define GL_PACK_SKIP_IMAGES_EXT 0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E
+#define GL_TEXTURE_3D_EXT 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT 0x8070
+#define GL_TEXTURE_DEPTH_EXT 0x8071
+#define GL_TEXTURE_WRAP_R_EXT 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073
+
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+
+#define glTexImage3DEXT GLEW_GET_FUN(__glewTexImage3DEXT)
+
+#define GLEW_EXT_texture3D GLEW_GET_VAR(__GLEW_EXT_texture3D)
+
+#endif /* GL_EXT_texture3D */
+
+/* -------------------------- GL_EXT_texture_array ------------------------- */
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
+#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+
+#define glFramebufferTextureLayerEXT GLEW_GET_FUN(__glewFramebufferTextureLayerEXT)
+
+#define GLEW_EXT_texture_array GLEW_GET_VAR(__GLEW_EXT_texture_array)
+
+#endif /* GL_EXT_texture_array */
+
+/* ---------------------- GL_EXT_texture_buffer_object --------------------- */
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+
+#define GL_TEXTURE_BUFFER_EXT 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E
+
+typedef void (GLAPIENTRY * PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+
+#define glTexBufferEXT GLEW_GET_FUN(__glewTexBufferEXT)
+
+#define GLEW_EXT_texture_buffer_object GLEW_GET_VAR(__GLEW_EXT_texture_buffer_object)
+
+#endif /* GL_EXT_texture_buffer_object */
+
+/* -------------- GL_EXT_texture_compression_astc_decode_mode -------------- */
+
+#ifndef GL_EXT_texture_compression_astc_decode_mode
+#define GL_EXT_texture_compression_astc_decode_mode 1
+
+#define GL_TEXTURE_ASTC_DECODE_PRECISION_EXT 0x8F69
+
+#define GLEW_EXT_texture_compression_astc_decode_mode GLEW_GET_VAR(__GLEW_EXT_texture_compression_astc_decode_mode)
+
+#endif /* GL_EXT_texture_compression_astc_decode_mode */
+
+/* ----------- GL_EXT_texture_compression_astc_decode_mode_rgb9e5 ---------- */
+
+#ifndef GL_EXT_texture_compression_astc_decode_mode_rgb9e5
+#define GL_EXT_texture_compression_astc_decode_mode_rgb9e5 1
+
+#define GL_TEXTURE_ASTC_DECODE_PRECISION_EXT 0x8F69
+
+#define GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5 GLEW_GET_VAR(__GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5)
+
+#endif /* GL_EXT_texture_compression_astc_decode_mode_rgb9e5 */
+
+/* -------------------- GL_EXT_texture_compression_bptc -------------------- */
+
+#ifndef GL_EXT_texture_compression_bptc
+#define GL_EXT_texture_compression_bptc 1
+
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_EXT 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT 0x8E8F
+
+#define GLEW_EXT_texture_compression_bptc GLEW_GET_VAR(__GLEW_EXT_texture_compression_bptc)
+
+#endif /* GL_EXT_texture_compression_bptc */
+
+/* -------------------- GL_EXT_texture_compression_dxt1 -------------------- */
+
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_EXT_texture_compression_dxt1 1
+
+#define GLEW_EXT_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_EXT_texture_compression_dxt1)
+
+#endif /* GL_EXT_texture_compression_dxt1 */
+
+/* -------------------- GL_EXT_texture_compression_latc -------------------- */
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+
+#define GLEW_EXT_texture_compression_latc GLEW_GET_VAR(__GLEW_EXT_texture_compression_latc)
+
+#endif /* GL_EXT_texture_compression_latc */
+
+/* -------------------- GL_EXT_texture_compression_rgtc -------------------- */
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+
+#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+
+#define GLEW_EXT_texture_compression_rgtc GLEW_GET_VAR(__GLEW_EXT_texture_compression_rgtc)
+
+#endif /* GL_EXT_texture_compression_rgtc */
+
+/* -------------------- GL_EXT_texture_compression_s3tc -------------------- */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
+
+#define GLEW_EXT_texture_compression_s3tc GLEW_GET_VAR(__GLEW_EXT_texture_compression_s3tc)
+
+#endif /* GL_EXT_texture_compression_s3tc */
+
+/* ------------------------ GL_EXT_texture_cube_map ------------------------ */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+
+#define GL_NORMAL_MAP_EXT 0x8511
+#define GL_REFLECTION_MAP_EXT 0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C
+
+#define GLEW_EXT_texture_cube_map GLEW_GET_VAR(__GLEW_EXT_texture_cube_map)
+
+#endif /* GL_EXT_texture_cube_map */
+
+/* --------------------- GL_EXT_texture_cube_map_array --------------------- */
+
+#ifndef GL_EXT_texture_cube_map_array
+#define GL_EXT_texture_cube_map_array 1
+
+#define GL_TEXTURE_CUBE_MAP_ARRAY_EXT 0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT 0x900A
+#define GL_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900F
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+
+#define GLEW_EXT_texture_cube_map_array GLEW_GET_VAR(__GLEW_EXT_texture_cube_map_array)
+
+#endif /* GL_EXT_texture_cube_map_array */
+
+/* ----------------------- GL_EXT_texture_edge_clamp ----------------------- */
+
+#ifndef GL_EXT_texture_edge_clamp
+#define GL_EXT_texture_edge_clamp 1
+
+#define GL_CLAMP_TO_EDGE_EXT 0x812F
+
+#define GLEW_EXT_texture_edge_clamp GLEW_GET_VAR(__GLEW_EXT_texture_edge_clamp)
+
+#endif /* GL_EXT_texture_edge_clamp */
+
+/* --------------------------- GL_EXT_texture_env -------------------------- */
+
+#ifndef GL_EXT_texture_env
+#define GL_EXT_texture_env 1
+
+#define GLEW_EXT_texture_env GLEW_GET_VAR(__GLEW_EXT_texture_env)
+
+#endif /* GL_EXT_texture_env */
+
+/* ------------------------- GL_EXT_texture_env_add ------------------------ */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+
+#define GLEW_EXT_texture_env_add GLEW_GET_VAR(__GLEW_EXT_texture_env_add)
+
+#endif /* GL_EXT_texture_env_add */
+
+/* ----------------------- GL_EXT_texture_env_combine ---------------------- */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+
+#define GL_COMBINE_EXT 0x8570
+#define GL_COMBINE_RGB_EXT 0x8571
+#define GL_COMBINE_ALPHA_EXT 0x8572
+#define GL_RGB_SCALE_EXT 0x8573
+#define GL_ADD_SIGNED_EXT 0x8574
+#define GL_INTERPOLATE_EXT 0x8575
+#define GL_CONSTANT_EXT 0x8576
+#define GL_PRIMARY_COLOR_EXT 0x8577
+#define GL_PREVIOUS_EXT 0x8578
+#define GL_SOURCE0_RGB_EXT 0x8580
+#define GL_SOURCE1_RGB_EXT 0x8581
+#define GL_SOURCE2_RGB_EXT 0x8582
+#define GL_SOURCE0_ALPHA_EXT 0x8588
+#define GL_SOURCE1_ALPHA_EXT 0x8589
+#define GL_SOURCE2_ALPHA_EXT 0x858A
+#define GL_OPERAND0_RGB_EXT 0x8590
+#define GL_OPERAND1_RGB_EXT 0x8591
+#define GL_OPERAND2_RGB_EXT 0x8592
+#define GL_OPERAND0_ALPHA_EXT 0x8598
+#define GL_OPERAND1_ALPHA_EXT 0x8599
+#define GL_OPERAND2_ALPHA_EXT 0x859A
+
+#define GLEW_EXT_texture_env_combine GLEW_GET_VAR(__GLEW_EXT_texture_env_combine)
+
+#endif /* GL_EXT_texture_env_combine */
+
+/* ------------------------ GL_EXT_texture_env_dot3 ------------------------ */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+
+#define GL_DOT3_RGB_EXT 0x8740
+#define GL_DOT3_RGBA_EXT 0x8741
+
+#define GLEW_EXT_texture_env_dot3 GLEW_GET_VAR(__GLEW_EXT_texture_env_dot3)
+
+#endif /* GL_EXT_texture_env_dot3 */
+
+/* ------------------- GL_EXT_texture_filter_anisotropic ------------------- */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+
+#define GLEW_EXT_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_EXT_texture_filter_anisotropic)
+
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+/* ---------------------- GL_EXT_texture_filter_minmax --------------------- */
+
+#ifndef GL_EXT_texture_filter_minmax
+#define GL_EXT_texture_filter_minmax 1
+
+#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366
+#define GL_WEIGHTED_AVERAGE_EXT 0x9367
+
+#define GLEW_EXT_texture_filter_minmax GLEW_GET_VAR(__GLEW_EXT_texture_filter_minmax)
+
+#endif /* GL_EXT_texture_filter_minmax */
+
+/* --------------------- GL_EXT_texture_format_BGRA8888 -------------------- */
+
+#ifndef GL_EXT_texture_format_BGRA8888
+#define GL_EXT_texture_format_BGRA8888 1
+
+#define GL_BGRA_EXT 0x80E1
+
+#define GLEW_EXT_texture_format_BGRA8888 GLEW_GET_VAR(__GLEW_EXT_texture_format_BGRA8888)
+
+#endif /* GL_EXT_texture_format_BGRA8888 */
+
+/* ------------------------- GL_EXT_texture_integer ------------------------ */
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+
+#define GL_RGBA32UI_EXT 0x8D70
+#define GL_RGB32UI_EXT 0x8D71
+#define GL_ALPHA32UI_EXT 0x8D72
+#define GL_INTENSITY32UI_EXT 0x8D73
+#define GL_LUMINANCE32UI_EXT 0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75
+#define GL_RGBA16UI_EXT 0x8D76
+#define GL_RGB16UI_EXT 0x8D77
+#define GL_ALPHA16UI_EXT 0x8D78
+#define GL_INTENSITY16UI_EXT 0x8D79
+#define GL_LUMINANCE16UI_EXT 0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B
+#define GL_RGBA8UI_EXT 0x8D7C
+#define GL_RGB8UI_EXT 0x8D7D
+#define GL_ALPHA8UI_EXT 0x8D7E
+#define GL_INTENSITY8UI_EXT 0x8D7F
+#define GL_LUMINANCE8UI_EXT 0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81
+#define GL_RGBA32I_EXT 0x8D82
+#define GL_RGB32I_EXT 0x8D83
+#define GL_ALPHA32I_EXT 0x8D84
+#define GL_INTENSITY32I_EXT 0x8D85
+#define GL_LUMINANCE32I_EXT 0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87
+#define GL_RGBA16I_EXT 0x8D88
+#define GL_RGB16I_EXT 0x8D89
+#define GL_ALPHA16I_EXT 0x8D8A
+#define GL_INTENSITY16I_EXT 0x8D8B
+#define GL_LUMINANCE16I_EXT 0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D
+#define GL_RGBA8I_EXT 0x8D8E
+#define GL_RGB8I_EXT 0x8D8F
+#define GL_ALPHA8I_EXT 0x8D90
+#define GL_INTENSITY8I_EXT 0x8D91
+#define GL_LUMINANCE8I_EXT 0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93
+#define GL_RED_INTEGER_EXT 0x8D94
+#define GL_GREEN_INTEGER_EXT 0x8D95
+#define GL_BLUE_INTEGER_EXT 0x8D96
+#define GL_ALPHA_INTEGER_EXT 0x8D97
+#define GL_RGB_INTEGER_EXT 0x8D98
+#define GL_RGBA_INTEGER_EXT 0x8D99
+#define GL_BGR_INTEGER_EXT 0x8D9A
+#define GL_BGRA_INTEGER_EXT 0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT 0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E
+
+typedef void (GLAPIENTRY * PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (GLAPIENTRY * PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+
+#define glClearColorIiEXT GLEW_GET_FUN(__glewClearColorIiEXT)
+#define glClearColorIuiEXT GLEW_GET_FUN(__glewClearColorIuiEXT)
+#define glGetTexParameterIivEXT GLEW_GET_FUN(__glewGetTexParameterIivEXT)
+#define glGetTexParameterIuivEXT GLEW_GET_FUN(__glewGetTexParameterIuivEXT)
+#define glTexParameterIivEXT GLEW_GET_FUN(__glewTexParameterIivEXT)
+#define glTexParameterIuivEXT GLEW_GET_FUN(__glewTexParameterIuivEXT)
+
+#define GLEW_EXT_texture_integer GLEW_GET_VAR(__GLEW_EXT_texture_integer)
+
+#endif /* GL_EXT_texture_integer */
+
+/* ------------------------ GL_EXT_texture_lod_bias ------------------------ */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT 0x8501
+
+#define GLEW_EXT_texture_lod_bias GLEW_GET_VAR(__GLEW_EXT_texture_lod_bias)
+
+#endif /* GL_EXT_texture_lod_bias */
+
+/* ---------------------- GL_EXT_texture_mirror_clamp ---------------------- */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+
+#define GL_MIRROR_CLAMP_EXT 0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912
+
+#define GLEW_EXT_texture_mirror_clamp GLEW_GET_VAR(__GLEW_EXT_texture_mirror_clamp)
+
+#endif /* GL_EXT_texture_mirror_clamp */
+
+/* ------------------------- GL_EXT_texture_norm16 ------------------------- */
+
+#ifndef GL_EXT_texture_norm16
+#define GL_EXT_texture_norm16 1
+
+#define GL_RGB16_EXT 0x8054
+#define GL_RGBA16_EXT 0x805B
+#define GL_R16_EXT 0x822A
+#define GL_RG16_EXT 0x822C
+#define GL_R16_SNORM_EXT 0x8F98
+#define GL_RG16_SNORM_EXT 0x8F99
+#define GL_RGB16_SNORM_EXT 0x8F9A
+#define GL_RGBA16_SNORM_EXT 0x8F9B
+
+#define GLEW_EXT_texture_norm16 GLEW_GET_VAR(__GLEW_EXT_texture_norm16)
+
+#endif /* GL_EXT_texture_norm16 */
+
+/* ------------------------- GL_EXT_texture_object ------------------------- */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+
+#define GL_TEXTURE_PRIORITY_EXT 0x8066
+#define GL_TEXTURE_RESIDENT_EXT 0x8067
+#define GL_TEXTURE_1D_BINDING_EXT 0x8068
+#define GL_TEXTURE_2D_BINDING_EXT 0x8069
+#define GL_TEXTURE_3D_BINDING_EXT 0x806A
+
+typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint* textures, GLboolean* residences);
+typedef void (GLAPIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (GLAPIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint* textures);
+typedef void (GLAPIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint* textures);
+typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint* textures, const GLclampf* priorities);
+
+#define glAreTexturesResidentEXT GLEW_GET_FUN(__glewAreTexturesResidentEXT)
+#define glBindTextureEXT GLEW_GET_FUN(__glewBindTextureEXT)
+#define glDeleteTexturesEXT GLEW_GET_FUN(__glewDeleteTexturesEXT)
+#define glGenTexturesEXT GLEW_GET_FUN(__glewGenTexturesEXT)
+#define glIsTextureEXT GLEW_GET_FUN(__glewIsTextureEXT)
+#define glPrioritizeTexturesEXT GLEW_GET_FUN(__glewPrioritizeTexturesEXT)
+
+#define GLEW_EXT_texture_object GLEW_GET_VAR(__GLEW_EXT_texture_object)
+
+#endif /* GL_EXT_texture_object */
+
+/* --------------------- GL_EXT_texture_perturb_normal --------------------- */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+
+#define GL_PERTURB_EXT 0x85AE
+#define GL_TEXTURE_NORMAL_EXT 0x85AF
+
+typedef void (GLAPIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+
+#define glTextureNormalEXT GLEW_GET_FUN(__glewTextureNormalEXT)
+
+#define GLEW_EXT_texture_perturb_normal GLEW_GET_VAR(__GLEW_EXT_texture_perturb_normal)
+
+#endif /* GL_EXT_texture_perturb_normal */
+
+/* ------------------------ GL_EXT_texture_rectangle ----------------------- */
+
+#ifndef GL_EXT_texture_rectangle
+#define GL_EXT_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT 0x84F8
+
+#define GLEW_EXT_texture_rectangle GLEW_GET_VAR(__GLEW_EXT_texture_rectangle)
+
+#endif /* GL_EXT_texture_rectangle */
+
+/* --------------------------- GL_EXT_texture_rg --------------------------- */
+
+#ifndef GL_EXT_texture_rg
+#define GL_EXT_texture_rg 1
+
+#define GL_RED_EXT 0x1903
+#define GL_RG_EXT 0x8227
+#define GL_R8_EXT 0x8229
+#define GL_RG8_EXT 0x822B
+
+#define GLEW_EXT_texture_rg GLEW_GET_VAR(__GLEW_EXT_texture_rg)
+
+#endif /* GL_EXT_texture_rg */
+
+/* -------------------------- GL_EXT_texture_sRGB -------------------------- */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+
+#define GL_SRGB_EXT 0x8C40
+#define GL_SRGB8_EXT 0x8C41
+#define GL_SRGB_ALPHA_EXT 0x8C42
+#define GL_SRGB8_ALPHA8_EXT 0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT 0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45
+#define GL_SLUMINANCE_EXT 0x8C46
+#define GL_SLUMINANCE8_EXT 0x8C47
+#define GL_COMPRESSED_SRGB_EXT 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+
+#define GLEW_EXT_texture_sRGB GLEW_GET_VAR(__GLEW_EXT_texture_sRGB)
+
+#endif /* GL_EXT_texture_sRGB */
+
+/* ------------------------- GL_EXT_texture_sRGB_R8 ------------------------ */
+
+#ifndef GL_EXT_texture_sRGB_R8
+#define GL_EXT_texture_sRGB_R8 1
+
+#define GL_SR8_EXT 0x8FBD
+
+#define GLEW_EXT_texture_sRGB_R8 GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_R8)
+
+#endif /* GL_EXT_texture_sRGB_R8 */
+
+/* ------------------------ GL_EXT_texture_sRGB_RG8 ------------------------ */
+
+#ifndef GL_EXT_texture_sRGB_RG8
+#define GL_EXT_texture_sRGB_RG8 1
+
+#define GL_SRG8_EXT 0x8FBE
+
+#define GLEW_EXT_texture_sRGB_RG8 GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_RG8)
+
+#endif /* GL_EXT_texture_sRGB_RG8 */
+
+/* ----------------------- GL_EXT_texture_sRGB_decode ---------------------- */
+
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+
+#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
+#define GL_DECODE_EXT 0x8A49
+#define GL_SKIP_DECODE_EXT 0x8A4A
+
+#define GLEW_EXT_texture_sRGB_decode GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_decode)
+
+#endif /* GL_EXT_texture_sRGB_decode */
+
+/* --------------------- GL_EXT_texture_shared_exponent -------------------- */
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+
+#define GL_RGB9_E5_EXT 0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F
+
+#define GLEW_EXT_texture_shared_exponent GLEW_GET_VAR(__GLEW_EXT_texture_shared_exponent)
+
+#endif /* GL_EXT_texture_shared_exponent */
+
+/* -------------------------- GL_EXT_texture_snorm ------------------------- */
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+
+#define GL_RED_SNORM 0x8F90
+#define GL_RG_SNORM 0x8F91
+#define GL_RGB_SNORM 0x8F92
+#define GL_RGBA_SNORM 0x8F93
+#define GL_R8_SNORM 0x8F94
+#define GL_RG8_SNORM 0x8F95
+#define GL_RGB8_SNORM 0x8F96
+#define GL_RGBA8_SNORM 0x8F97
+#define GL_R16_SNORM 0x8F98
+#define GL_RG16_SNORM 0x8F99
+#define GL_RGB16_SNORM 0x8F9A
+#define GL_RGBA16_SNORM 0x8F9B
+#define GL_SIGNED_NORMALIZED 0x8F9C
+#define GL_ALPHA_SNORM 0x9010
+#define GL_LUMINANCE_SNORM 0x9011
+#define GL_LUMINANCE_ALPHA_SNORM 0x9012
+#define GL_INTENSITY_SNORM 0x9013
+#define GL_ALPHA8_SNORM 0x9014
+#define GL_LUMINANCE8_SNORM 0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016
+#define GL_INTENSITY8_SNORM 0x9017
+#define GL_ALPHA16_SNORM 0x9018
+#define GL_LUMINANCE16_SNORM 0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A
+#define GL_INTENSITY16_SNORM 0x901B
+
+#define GLEW_EXT_texture_snorm GLEW_GET_VAR(__GLEW_EXT_texture_snorm)
+
+#endif /* GL_EXT_texture_snorm */
+
+/* ------------------------- GL_EXT_texture_storage ------------------------ */
+
+#ifndef GL_EXT_texture_storage
+#define GL_EXT_texture_storage 1
+
+#define GL_ALPHA8_EXT 0x803C
+#define GL_LUMINANCE8_EXT 0x8040
+#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
+#define GL_RGB10_EXT 0x8052
+#define GL_RGB10_A2_EXT 0x8059
+#define GL_R8_EXT 0x8229
+#define GL_RG8_EXT 0x822B
+#define GL_R16F_EXT 0x822D
+#define GL_R32F_EXT 0x822E
+#define GL_RG16F_EXT 0x822F
+#define GL_RG32F_EXT 0x8230
+#define GL_RGBA32F_EXT 0x8814
+#define GL_RGB32F_EXT 0x8815
+#define GL_ALPHA32F_EXT 0x8816
+#define GL_LUMINANCE32F_EXT 0x8818
+#define GL_LUMINANCE_ALPHA32F_EXT 0x8819
+#define GL_RGBA16F_EXT 0x881A
+#define GL_RGB16F_EXT 0x881B
+#define GL_ALPHA16F_EXT 0x881C
+#define GL_LUMINANCE16F_EXT 0x881E
+#define GL_LUMINANCE_ALPHA16F_EXT 0x881F
+#define GL_RGB_RAW_422_APPLE 0x8A51
+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F
+#define GL_BGRA8_EXT 0x93A1
+
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+
+#define glTexStorage1DEXT GLEW_GET_FUN(__glewTexStorage1DEXT)
+#define glTexStorage2DEXT GLEW_GET_FUN(__glewTexStorage2DEXT)
+#define glTexStorage3DEXT GLEW_GET_FUN(__glewTexStorage3DEXT)
+#define glTextureStorage1DEXT GLEW_GET_FUN(__glewTextureStorage1DEXT)
+#define glTextureStorage2DEXT GLEW_GET_FUN(__glewTextureStorage2DEXT)
+#define glTextureStorage3DEXT GLEW_GET_FUN(__glewTextureStorage3DEXT)
+
+#define GLEW_EXT_texture_storage GLEW_GET_VAR(__GLEW_EXT_texture_storage)
+
+#endif /* GL_EXT_texture_storage */
+
+/* ------------------------- GL_EXT_texture_swizzle ------------------------ */
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+
+#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46
+
+#define GLEW_EXT_texture_swizzle GLEW_GET_VAR(__GLEW_EXT_texture_swizzle)
+
+#endif /* GL_EXT_texture_swizzle */
+
+/* ------------------- GL_EXT_texture_type_2_10_10_10_REV ------------------ */
+
+#ifndef GL_EXT_texture_type_2_10_10_10_REV
+#define GL_EXT_texture_type_2_10_10_10_REV 1
+
+#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368
+
+#define GLEW_EXT_texture_type_2_10_10_10_REV GLEW_GET_VAR(__GLEW_EXT_texture_type_2_10_10_10_REV)
+
+#endif /* GL_EXT_texture_type_2_10_10_10_REV */
+
+/* -------------------------- GL_EXT_texture_view -------------------------- */
+
+#ifndef GL_EXT_texture_view
+#define GL_EXT_texture_view 1
+
+#define GL_TEXTURE_VIEW_MIN_LEVEL_EXT 0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS_EXT 0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER_EXT 0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS_EXT 0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+
+#define glTextureViewEXT GLEW_GET_FUN(__glewTextureViewEXT)
+
+#define GLEW_EXT_texture_view GLEW_GET_VAR(__GLEW_EXT_texture_view)
+
+#endif /* GL_EXT_texture_view */
+
+/* --------------------------- GL_EXT_timer_query -------------------------- */
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+
+#define GL_TIME_ELAPSED_EXT 0x88BF
+
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+
+#define glGetQueryObjecti64vEXT GLEW_GET_FUN(__glewGetQueryObjecti64vEXT)
+#define glGetQueryObjectui64vEXT GLEW_GET_FUN(__glewGetQueryObjectui64vEXT)
+
+#define GLEW_EXT_timer_query GLEW_GET_VAR(__GLEW_EXT_timer_query)
+
+#endif /* GL_EXT_timer_query */
+
+/* ----------------------- GL_EXT_transform_feedback ----------------------- */
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_PRIMITIVES_GENERATED_EXT 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+
+typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar * const* varyings, GLenum bufferMode);
+
+#define glBeginTransformFeedbackEXT GLEW_GET_FUN(__glewBeginTransformFeedbackEXT)
+#define glBindBufferBaseEXT GLEW_GET_FUN(__glewBindBufferBaseEXT)
+#define glBindBufferOffsetEXT GLEW_GET_FUN(__glewBindBufferOffsetEXT)
+#define glBindBufferRangeEXT GLEW_GET_FUN(__glewBindBufferRangeEXT)
+#define glEndTransformFeedbackEXT GLEW_GET_FUN(__glewEndTransformFeedbackEXT)
+#define glGetTransformFeedbackVaryingEXT GLEW_GET_FUN(__glewGetTransformFeedbackVaryingEXT)
+#define glTransformFeedbackVaryingsEXT GLEW_GET_FUN(__glewTransformFeedbackVaryingsEXT)
+
+#define GLEW_EXT_transform_feedback GLEW_GET_VAR(__GLEW_EXT_transform_feedback)
+
+#endif /* GL_EXT_transform_feedback */
+
+/* ------------------------- GL_EXT_unpack_subimage ------------------------ */
+
+#ifndef GL_EXT_unpack_subimage
+#define GL_EXT_unpack_subimage 1
+
+#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2
+#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3
+#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4
+
+#define GLEW_EXT_unpack_subimage GLEW_GET_VAR(__GLEW_EXT_unpack_subimage)
+
+#endif /* GL_EXT_unpack_subimage */
+
+/* -------------------------- GL_EXT_vertex_array -------------------------- */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+
+#define GL_DOUBLE_EXT 0x140A
+#define GL_VERTEX_ARRAY_EXT 0x8074
+#define GL_NORMAL_ARRAY_EXT 0x8075
+#define GL_COLOR_ARRAY_EXT 0x8076
+#define GL_INDEX_ARRAY_EXT 0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT 0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT 0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT 0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT 0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT 0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT 0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT 0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093
+
+typedef void (GLAPIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean* pointer);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+
+#define glArrayElementEXT GLEW_GET_FUN(__glewArrayElementEXT)
+#define glColorPointerEXT GLEW_GET_FUN(__glewColorPointerEXT)
+#define glDrawArraysEXT GLEW_GET_FUN(__glewDrawArraysEXT)
+#define glEdgeFlagPointerEXT GLEW_GET_FUN(__glewEdgeFlagPointerEXT)
+#define glIndexPointerEXT GLEW_GET_FUN(__glewIndexPointerEXT)
+#define glNormalPointerEXT GLEW_GET_FUN(__glewNormalPointerEXT)
+#define glTexCoordPointerEXT GLEW_GET_FUN(__glewTexCoordPointerEXT)
+#define glVertexPointerEXT GLEW_GET_FUN(__glewVertexPointerEXT)
+
+#define GLEW_EXT_vertex_array GLEW_GET_VAR(__GLEW_EXT_vertex_array)
+
+#endif /* GL_EXT_vertex_array */
+
+/* ------------------------ GL_EXT_vertex_array_bgra ----------------------- */
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+
+#define GL_BGRA 0x80E1
+
+#define GLEW_EXT_vertex_array_bgra GLEW_GET_VAR(__GLEW_EXT_vertex_array_bgra)
+
+#endif /* GL_EXT_vertex_array_bgra */
+
+/* ----------------------- GL_EXT_vertex_array_setXXX ---------------------- */
+
+#ifndef GL_EXT_vertex_array_setXXX
+#define GL_EXT_vertex_array_setXXX 1
+
+typedef void (GLAPIENTRY * PFNGLBINDARRAYSETEXTPROC) (const void *arrayset);
+typedef const void * (GLAPIENTRY * PFNGLCREATEARRAYSETEXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLDELETEARRAYSETSEXTPROC) (GLsizei n, const void *arrayset[]);
+
+#define glBindArraySetEXT GLEW_GET_FUN(__glewBindArraySetEXT)
+#define glCreateArraySetExt GLEW_GET_FUN(__glewCreateArraySetExt)
+#define glDeleteArraySetsEXT GLEW_GET_FUN(__glewDeleteArraySetsEXT)
+
+#define GLEW_EXT_vertex_array_setXXX GLEW_GET_VAR(__GLEW_EXT_vertex_array_setXXX)
+
+#endif /* GL_EXT_vertex_array_setXXX */
+
+/* ----------------------- GL_EXT_vertex_attrib_64bit ---------------------- */
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+
+#define GL_DOUBLE_MAT2_EXT 0x8F46
+#define GL_DOUBLE_MAT3_EXT 0x8F47
+#define GL_DOUBLE_MAT4_EXT 0x8F48
+#define GL_DOUBLE_MAT2x3_EXT 0x8F49
+#define GL_DOUBLE_MAT2x4_EXT 0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT 0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT 0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT 0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT 0x8F4E
+#define GL_DOUBLE_VEC2_EXT 0x8FFC
+#define GL_DOUBLE_VEC3_EXT 0x8FFD
+#define GL_DOUBLE_VEC4_EXT 0x8FFE
+
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+
+#define glGetVertexAttribLdvEXT GLEW_GET_FUN(__glewGetVertexAttribLdvEXT)
+#define glVertexArrayVertexAttribLOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLOffsetEXT)
+#define glVertexAttribL1dEXT GLEW_GET_FUN(__glewVertexAttribL1dEXT)
+#define glVertexAttribL1dvEXT GLEW_GET_FUN(__glewVertexAttribL1dvEXT)
+#define glVertexAttribL2dEXT GLEW_GET_FUN(__glewVertexAttribL2dEXT)
+#define glVertexAttribL2dvEXT GLEW_GET_FUN(__glewVertexAttribL2dvEXT)
+#define glVertexAttribL3dEXT GLEW_GET_FUN(__glewVertexAttribL3dEXT)
+#define glVertexAttribL3dvEXT GLEW_GET_FUN(__glewVertexAttribL3dvEXT)
+#define glVertexAttribL4dEXT GLEW_GET_FUN(__glewVertexAttribL4dEXT)
+#define glVertexAttribL4dvEXT GLEW_GET_FUN(__glewVertexAttribL4dvEXT)
+#define glVertexAttribLPointerEXT GLEW_GET_FUN(__glewVertexAttribLPointerEXT)
+
+#define GLEW_EXT_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_EXT_vertex_attrib_64bit)
+
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+/* -------------------------- GL_EXT_vertex_shader ------------------------- */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+
+#define GL_VERTEX_SHADER_EXT 0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT 0x8781
+#define GL_OP_INDEX_EXT 0x8782
+#define GL_OP_NEGATE_EXT 0x8783
+#define GL_OP_DOT3_EXT 0x8784
+#define GL_OP_DOT4_EXT 0x8785
+#define GL_OP_MUL_EXT 0x8786
+#define GL_OP_ADD_EXT 0x8787
+#define GL_OP_MADD_EXT 0x8788
+#define GL_OP_FRAC_EXT 0x8789
+#define GL_OP_MAX_EXT 0x878A
+#define GL_OP_MIN_EXT 0x878B
+#define GL_OP_SET_GE_EXT 0x878C
+#define GL_OP_SET_LT_EXT 0x878D
+#define GL_OP_CLAMP_EXT 0x878E
+#define GL_OP_FLOOR_EXT 0x878F
+#define GL_OP_ROUND_EXT 0x8790
+#define GL_OP_EXP_BASE_2_EXT 0x8791
+#define GL_OP_LOG_BASE_2_EXT 0x8792
+#define GL_OP_POWER_EXT 0x8793
+#define GL_OP_RECIP_EXT 0x8794
+#define GL_OP_RECIP_SQRT_EXT 0x8795
+#define GL_OP_SUB_EXT 0x8796
+#define GL_OP_CROSS_PRODUCT_EXT 0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798
+#define GL_OP_MOV_EXT 0x8799
+#define GL_OUTPUT_VERTEX_EXT 0x879A
+#define GL_OUTPUT_COLOR0_EXT 0x879B
+#define GL_OUTPUT_COLOR1_EXT 0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC
+#define GL_OUTPUT_FOG_EXT 0x87BD
+#define GL_SCALAR_EXT 0x87BE
+#define GL_VECTOR_EXT 0x87BF
+#define GL_MATRIX_EXT 0x87C0
+#define GL_VARIANT_EXT 0x87C1
+#define GL_INVARIANT_EXT 0x87C2
+#define GL_LOCAL_CONSTANT_EXT 0x87C3
+#define GL_LOCAL_EXT 0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4
+#define GL_X_EXT 0x87D5
+#define GL_Y_EXT 0x87D6
+#define GL_Z_EXT 0x87D7
+#define GL_W_EXT 0x87D8
+#define GL_NEGATIVE_X_EXT 0x87D9
+#define GL_NEGATIVE_Y_EXT 0x87DA
+#define GL_NEGATIVE_Z_EXT 0x87DB
+#define GL_NEGATIVE_W_EXT 0x87DC
+#define GL_ZERO_EXT 0x87DD
+#define GL_ONE_EXT 0x87DE
+#define GL_NEGATIVE_ONE_EXT 0x87DF
+#define GL_NORMALIZED_RANGE_EXT 0x87E0
+#define GL_FULL_RANGE_EXT 0x87E1
+#define GL_CURRENT_VERTEX_EXT 0x87E2
+#define GL_MVP_MATRIX_EXT 0x87E3
+#define GL_VARIANT_VALUE_EXT 0x87E4
+#define GL_VARIANT_DATATYPE_EXT 0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7
+#define GL_VARIANT_ARRAY_EXT 0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9
+#define GL_INVARIANT_VALUE_EXT 0x87EA
+#define GL_INVARIANT_DATATYPE_EXT 0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED
+
+typedef void (GLAPIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (GLAPIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components);
+typedef GLuint (GLAPIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data);
+typedef void (GLAPIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLboolean (GLAPIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (GLAPIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, void *addr);
+typedef void (GLAPIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, void *addr);
+typedef void (GLAPIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (GLAPIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (GLAPIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (GLAPIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (GLAPIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, void *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, GLbyte *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, GLdouble *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, GLfloat *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, GLint *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, GLshort *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, GLubyte *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, GLuint *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, GLushort *addr);
+typedef void (GLAPIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+
+#define glBeginVertexShaderEXT GLEW_GET_FUN(__glewBeginVertexShaderEXT)
+#define glBindLightParameterEXT GLEW_GET_FUN(__glewBindLightParameterEXT)
+#define glBindMaterialParameterEXT GLEW_GET_FUN(__glewBindMaterialParameterEXT)
+#define glBindParameterEXT GLEW_GET_FUN(__glewBindParameterEXT)
+#define glBindTexGenParameterEXT GLEW_GET_FUN(__glewBindTexGenParameterEXT)
+#define glBindTextureUnitParameterEXT GLEW_GET_FUN(__glewBindTextureUnitParameterEXT)
+#define glBindVertexShaderEXT GLEW_GET_FUN(__glewBindVertexShaderEXT)
+#define glDeleteVertexShaderEXT GLEW_GET_FUN(__glewDeleteVertexShaderEXT)
+#define glDisableVariantClientStateEXT GLEW_GET_FUN(__glewDisableVariantClientStateEXT)
+#define glEnableVariantClientStateEXT GLEW_GET_FUN(__glewEnableVariantClientStateEXT)
+#define glEndVertexShaderEXT GLEW_GET_FUN(__glewEndVertexShaderEXT)
+#define glExtractComponentEXT GLEW_GET_FUN(__glewExtractComponentEXT)
+#define glGenSymbolsEXT GLEW_GET_FUN(__glewGenSymbolsEXT)
+#define glGenVertexShadersEXT GLEW_GET_FUN(__glewGenVertexShadersEXT)
+#define glGetInvariantBooleanvEXT GLEW_GET_FUN(__glewGetInvariantBooleanvEXT)
+#define glGetInvariantFloatvEXT GLEW_GET_FUN(__glewGetInvariantFloatvEXT)
+#define glGetInvariantIntegervEXT GLEW_GET_FUN(__glewGetInvariantIntegervEXT)
+#define glGetLocalConstantBooleanvEXT GLEW_GET_FUN(__glewGetLocalConstantBooleanvEXT)
+#define glGetLocalConstantFloatvEXT GLEW_GET_FUN(__glewGetLocalConstantFloatvEXT)
+#define glGetLocalConstantIntegervEXT GLEW_GET_FUN(__glewGetLocalConstantIntegervEXT)
+#define glGetVariantBooleanvEXT GLEW_GET_FUN(__glewGetVariantBooleanvEXT)
+#define glGetVariantFloatvEXT GLEW_GET_FUN(__glewGetVariantFloatvEXT)
+#define glGetVariantIntegervEXT GLEW_GET_FUN(__glewGetVariantIntegervEXT)
+#define glGetVariantPointervEXT GLEW_GET_FUN(__glewGetVariantPointervEXT)
+#define glInsertComponentEXT GLEW_GET_FUN(__glewInsertComponentEXT)
+#define glIsVariantEnabledEXT GLEW_GET_FUN(__glewIsVariantEnabledEXT)
+#define glSetInvariantEXT GLEW_GET_FUN(__glewSetInvariantEXT)
+#define glSetLocalConstantEXT GLEW_GET_FUN(__glewSetLocalConstantEXT)
+#define glShaderOp1EXT GLEW_GET_FUN(__glewShaderOp1EXT)
+#define glShaderOp2EXT GLEW_GET_FUN(__glewShaderOp2EXT)
+#define glShaderOp3EXT GLEW_GET_FUN(__glewShaderOp3EXT)
+#define glSwizzleEXT GLEW_GET_FUN(__glewSwizzleEXT)
+#define glVariantPointerEXT GLEW_GET_FUN(__glewVariantPointerEXT)
+#define glVariantbvEXT GLEW_GET_FUN(__glewVariantbvEXT)
+#define glVariantdvEXT GLEW_GET_FUN(__glewVariantdvEXT)
+#define glVariantfvEXT GLEW_GET_FUN(__glewVariantfvEXT)
+#define glVariantivEXT GLEW_GET_FUN(__glewVariantivEXT)
+#define glVariantsvEXT GLEW_GET_FUN(__glewVariantsvEXT)
+#define glVariantubvEXT GLEW_GET_FUN(__glewVariantubvEXT)
+#define glVariantuivEXT GLEW_GET_FUN(__glewVariantuivEXT)
+#define glVariantusvEXT GLEW_GET_FUN(__glewVariantusvEXT)
+#define glWriteMaskEXT GLEW_GET_FUN(__glewWriteMaskEXT)
+
+#define GLEW_EXT_vertex_shader GLEW_GET_VAR(__GLEW_EXT_vertex_shader)
+
+#endif /* GL_EXT_vertex_shader */
+
+/* ------------------------ GL_EXT_vertex_weighting ------------------------ */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+
+#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3
+#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6
+#define GL_MODELVIEW0_EXT 0x1700
+#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502
+#define GL_MODELVIEW1_MATRIX_EXT 0x8506
+#define GL_VERTEX_WEIGHTING_EXT 0x8509
+#define GL_MODELVIEW1_EXT 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, void *pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight);
+
+#define glVertexWeightPointerEXT GLEW_GET_FUN(__glewVertexWeightPointerEXT)
+#define glVertexWeightfEXT GLEW_GET_FUN(__glewVertexWeightfEXT)
+#define glVertexWeightfvEXT GLEW_GET_FUN(__glewVertexWeightfvEXT)
+
+#define GLEW_EXT_vertex_weighting GLEW_GET_VAR(__GLEW_EXT_vertex_weighting)
+
+#endif /* GL_EXT_vertex_weighting */
+
+/* ------------------------ GL_EXT_win32_keyed_mutex ----------------------- */
+
+#ifndef GL_EXT_win32_keyed_mutex
+#define GL_EXT_win32_keyed_mutex 1
+
+typedef GLboolean (GLAPIENTRY * PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key, GLuint timeout);
+typedef GLboolean (GLAPIENTRY * PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key);
+
+#define glAcquireKeyedMutexWin32EXT GLEW_GET_FUN(__glewAcquireKeyedMutexWin32EXT)
+#define glReleaseKeyedMutexWin32EXT GLEW_GET_FUN(__glewReleaseKeyedMutexWin32EXT)
+
+#define GLEW_EXT_win32_keyed_mutex GLEW_GET_VAR(__GLEW_EXT_win32_keyed_mutex)
+
+#endif /* GL_EXT_win32_keyed_mutex */
+
+/* ------------------------ GL_EXT_window_rectangles ----------------------- */
+
+#ifndef GL_EXT_window_rectangles
+#define GL_EXT_window_rectangles 1
+
+#define GL_INCLUSIVE_EXT 0x8F10
+#define GL_EXCLUSIVE_EXT 0x8F11
+#define GL_WINDOW_RECTANGLE_EXT 0x8F12
+#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13
+#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14
+#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15
+
+typedef void (GLAPIENTRY * PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint box[]);
+
+#define glWindowRectanglesEXT GLEW_GET_FUN(__glewWindowRectanglesEXT)
+
+#define GLEW_EXT_window_rectangles GLEW_GET_VAR(__GLEW_EXT_window_rectangles)
+
+#endif /* GL_EXT_window_rectangles */
+
+/* ------------------------- GL_EXT_x11_sync_object ------------------------ */
+
+#ifndef GL_EXT_x11_sync_object
+#define GL_EXT_x11_sync_object 1
+
+#define GL_SYNC_X11_FENCE_EXT 0x90E1
+
+typedef GLsync (GLAPIENTRY * PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+
+#define glImportSyncEXT GLEW_GET_FUN(__glewImportSyncEXT)
+
+#define GLEW_EXT_x11_sync_object GLEW_GET_VAR(__GLEW_EXT_x11_sync_object)
+
+#endif /* GL_EXT_x11_sync_object */
+
+/* ---------------------- GL_GREMEDY_frame_terminator ---------------------- */
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+
+typedef void (GLAPIENTRY * PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+
+#define glFrameTerminatorGREMEDY GLEW_GET_FUN(__glewFrameTerminatorGREMEDY)
+
+#define GLEW_GREMEDY_frame_terminator GLEW_GET_VAR(__GLEW_GREMEDY_frame_terminator)
+
+#endif /* GL_GREMEDY_frame_terminator */
+
+/* ------------------------ GL_GREMEDY_string_marker ----------------------- */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+
+typedef void (GLAPIENTRY * PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string);
+
+#define glStringMarkerGREMEDY GLEW_GET_FUN(__glewStringMarkerGREMEDY)
+
+#define GLEW_GREMEDY_string_marker GLEW_GET_VAR(__GLEW_GREMEDY_string_marker)
+
+#endif /* GL_GREMEDY_string_marker */
+
+/* --------------------- GL_HP_convolution_border_modes -------------------- */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+
+#define GLEW_HP_convolution_border_modes GLEW_GET_VAR(__GLEW_HP_convolution_border_modes)
+
+#endif /* GL_HP_convolution_border_modes */
+
+/* ------------------------- GL_HP_image_transform ------------------------- */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+
+typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glGetImageTransformParameterfvHP GLEW_GET_FUN(__glewGetImageTransformParameterfvHP)
+#define glGetImageTransformParameterivHP GLEW_GET_FUN(__glewGetImageTransformParameterivHP)
+#define glImageTransformParameterfHP GLEW_GET_FUN(__glewImageTransformParameterfHP)
+#define glImageTransformParameterfvHP GLEW_GET_FUN(__glewImageTransformParameterfvHP)
+#define glImageTransformParameteriHP GLEW_GET_FUN(__glewImageTransformParameteriHP)
+#define glImageTransformParameterivHP GLEW_GET_FUN(__glewImageTransformParameterivHP)
+
+#define GLEW_HP_image_transform GLEW_GET_VAR(__GLEW_HP_image_transform)
+
+#endif /* GL_HP_image_transform */
+
+/* -------------------------- GL_HP_occlusion_test ------------------------- */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+
+#define GLEW_HP_occlusion_test GLEW_GET_VAR(__GLEW_HP_occlusion_test)
+
+#endif /* GL_HP_occlusion_test */
+
+/* ------------------------- GL_HP_texture_lighting ------------------------ */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+
+#define GLEW_HP_texture_lighting GLEW_GET_VAR(__GLEW_HP_texture_lighting)
+
+#endif /* GL_HP_texture_lighting */
+
+/* --------------------------- GL_IBM_cull_vertex -------------------------- */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+
+#define GL_CULL_VERTEX_IBM 103050
+
+#define GLEW_IBM_cull_vertex GLEW_GET_VAR(__GLEW_IBM_cull_vertex)
+
+#endif /* GL_IBM_cull_vertex */
+
+/* ---------------------- GL_IBM_multimode_draw_arrays --------------------- */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount, GLint modestride);
+
+#define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM)
+#define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM)
+
+#define GLEW_IBM_multimode_draw_arrays GLEW_GET_VAR(__GLEW_IBM_multimode_draw_arrays)
+
+#endif /* GL_IBM_multimode_draw_arrays */
+
+/* ------------------------- GL_IBM_rasterpos_clip ------------------------- */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+
+#define GL_RASTER_POSITION_UNCLIPPED_IBM 103010
+
+#define GLEW_IBM_rasterpos_clip GLEW_GET_VAR(__GLEW_IBM_rasterpos_clip)
+
+#endif /* GL_IBM_rasterpos_clip */
+
+/* --------------------------- GL_IBM_static_data -------------------------- */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+
+#define GL_ALL_STATIC_DATA_IBM 103060
+#define GL_STATIC_VERTEX_ARRAY_IBM 103061
+
+#define GLEW_IBM_static_data GLEW_GET_VAR(__GLEW_IBM_static_data)
+
+#endif /* GL_IBM_static_data */
+
+/* --------------------- GL_IBM_texture_mirrored_repeat -------------------- */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+
+#define GL_MIRRORED_REPEAT_IBM 0x8370
+
+#define GLEW_IBM_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_IBM_texture_mirrored_repeat)
+
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+/* ----------------------- GL_IBM_vertex_array_lists ----------------------- */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+
+#define GL_VERTEX_ARRAY_LIST_IBM 103070
+#define GL_NORMAL_ARRAY_LIST_IBM 103071
+#define GL_COLOR_ARRAY_LIST_IBM 103072
+#define GL_INDEX_ARRAY_LIST_IBM 103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride);
+
+#define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM)
+#define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM)
+#define glFogCoordPointerListIBM GLEW_GET_FUN(__glewFogCoordPointerListIBM)
+#define glIndexPointerListIBM GLEW_GET_FUN(__glewIndexPointerListIBM)
+#define glNormalPointerListIBM GLEW_GET_FUN(__glewNormalPointerListIBM)
+#define glSecondaryColorPointerListIBM GLEW_GET_FUN(__glewSecondaryColorPointerListIBM)
+#define glTexCoordPointerListIBM GLEW_GET_FUN(__glewTexCoordPointerListIBM)
+#define glVertexPointerListIBM GLEW_GET_FUN(__glewVertexPointerListIBM)
+
+#define GLEW_IBM_vertex_array_lists GLEW_GET_VAR(__GLEW_IBM_vertex_array_lists)
+
+#endif /* GL_IBM_vertex_array_lists */
+
+/* -------------------------- GL_INGR_color_clamp -------------------------- */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+
+#define GL_RED_MIN_CLAMP_INGR 0x8560
+#define GL_GREEN_MIN_CLAMP_INGR 0x8561
+#define GL_BLUE_MIN_CLAMP_INGR 0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR 0x8563
+#define GL_RED_MAX_CLAMP_INGR 0x8564
+#define GL_GREEN_MAX_CLAMP_INGR 0x8565
+#define GL_BLUE_MAX_CLAMP_INGR 0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR 0x8567
+
+#define GLEW_INGR_color_clamp GLEW_GET_VAR(__GLEW_INGR_color_clamp)
+
+#endif /* GL_INGR_color_clamp */
+
+/* ------------------------- GL_INGR_interlace_read ------------------------ */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+
+#define GL_INTERLACE_READ_INGR 0x8568
+
+#define GLEW_INGR_interlace_read GLEW_GET_VAR(__GLEW_INGR_interlace_read)
+
+#endif /* GL_INGR_interlace_read */
+
+/* ------------------ GL_INTEL_conservative_rasterization ------------------ */
+
+#ifndef GL_INTEL_conservative_rasterization
+#define GL_INTEL_conservative_rasterization 1
+
+#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
+
+#define GLEW_INTEL_conservative_rasterization GLEW_GET_VAR(__GLEW_INTEL_conservative_rasterization)
+
+#endif /* GL_INTEL_conservative_rasterization */
+
+/* ------------------- GL_INTEL_fragment_shader_ordering ------------------- */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+
+#define GLEW_INTEL_fragment_shader_ordering GLEW_GET_VAR(__GLEW_INTEL_fragment_shader_ordering)
+
+#endif /* GL_INTEL_fragment_shader_ordering */
+
+/* ----------------------- GL_INTEL_framebuffer_CMAA ----------------------- */
+
+#ifndef GL_INTEL_framebuffer_CMAA
+#define GL_INTEL_framebuffer_CMAA 1
+
+#define GLEW_INTEL_framebuffer_CMAA GLEW_GET_VAR(__GLEW_INTEL_framebuffer_CMAA)
+
+#endif /* GL_INTEL_framebuffer_CMAA */
+
+/* -------------------------- GL_INTEL_map_texture ------------------------- */
+
+#ifndef GL_INTEL_map_texture
+#define GL_INTEL_map_texture 1
+
+#define GL_LAYOUT_DEFAULT_INTEL 0
+#define GL_LAYOUT_LINEAR_INTEL 1
+#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2
+#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF
+
+typedef void * (GLAPIENTRY * PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint* stride, GLenum *layout);
+typedef void (GLAPIENTRY * PFNGLSYNCTEXTUREINTELPROC) (GLuint texture);
+typedef void (GLAPIENTRY * PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level);
+
+#define glMapTexture2DINTEL GLEW_GET_FUN(__glewMapTexture2DINTEL)
+#define glSyncTextureINTEL GLEW_GET_FUN(__glewSyncTextureINTEL)
+#define glUnmapTexture2DINTEL GLEW_GET_FUN(__glewUnmapTexture2DINTEL)
+
+#define GLEW_INTEL_map_texture GLEW_GET_VAR(__GLEW_INTEL_map_texture)
+
+#endif /* GL_INTEL_map_texture */
+
+/* ------------------------ GL_INTEL_parallel_arrays ----------------------- */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+
+#define GL_PARALLEL_ARRAYS_INTEL 0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+
+#define glColorPointervINTEL GLEW_GET_FUN(__glewColorPointervINTEL)
+#define glNormalPointervINTEL GLEW_GET_FUN(__glewNormalPointervINTEL)
+#define glTexCoordPointervINTEL GLEW_GET_FUN(__glewTexCoordPointervINTEL)
+#define glVertexPointervINTEL GLEW_GET_FUN(__glewVertexPointervINTEL)
+
+#define GLEW_INTEL_parallel_arrays GLEW_GET_VAR(__GLEW_INTEL_parallel_arrays)
+
+#endif /* GL_INTEL_parallel_arrays */
+
+/* ----------------------- GL_INTEL_performance_query ---------------------- */
+
+#ifndef GL_INTEL_performance_query
+#define GL_INTEL_performance_query 1
+
+#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x0000
+#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x0001
+#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9
+#define GL_PERFQUERY_FLUSH_INTEL 0x83FA
+#define GL_PERFQUERY_WAIT_INTEL 0x83FB
+#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0
+#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
+#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
+#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
+#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4
+#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
+#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
+#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
+#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
+#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
+#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
+#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
+#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
+#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
+#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
+
+typedef void (GLAPIENTRY * PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (GLAPIENTRY * PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint* queryHandle);
+typedef void (GLAPIENTRY * PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (GLAPIENTRY * PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (GLAPIENTRY * PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint* queryId);
+typedef void (GLAPIENTRY * PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint* nextQueryId);
+typedef void (GLAPIENTRY * PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar* counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+typedef void (GLAPIENTRY * PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+typedef void (GLAPIENTRY * PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar* queryName, GLuint *queryId);
+typedef void (GLAPIENTRY * PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar* queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+
+#define glBeginPerfQueryINTEL GLEW_GET_FUN(__glewBeginPerfQueryINTEL)
+#define glCreatePerfQueryINTEL GLEW_GET_FUN(__glewCreatePerfQueryINTEL)
+#define glDeletePerfQueryINTEL GLEW_GET_FUN(__glewDeletePerfQueryINTEL)
+#define glEndPerfQueryINTEL GLEW_GET_FUN(__glewEndPerfQueryINTEL)
+#define glGetFirstPerfQueryIdINTEL GLEW_GET_FUN(__glewGetFirstPerfQueryIdINTEL)
+#define glGetNextPerfQueryIdINTEL GLEW_GET_FUN(__glewGetNextPerfQueryIdINTEL)
+#define glGetPerfCounterInfoINTEL GLEW_GET_FUN(__glewGetPerfCounterInfoINTEL)
+#define glGetPerfQueryDataINTEL GLEW_GET_FUN(__glewGetPerfQueryDataINTEL)
+#define glGetPerfQueryIdByNameINTEL GLEW_GET_FUN(__glewGetPerfQueryIdByNameINTEL)
+#define glGetPerfQueryInfoINTEL GLEW_GET_FUN(__glewGetPerfQueryInfoINTEL)
+
+#define GLEW_INTEL_performance_query GLEW_GET_VAR(__GLEW_INTEL_performance_query)
+
+#endif /* GL_INTEL_performance_query */
+
+/* ------------------------ GL_INTEL_texture_scissor ----------------------- */
+
+#ifndef GL_INTEL_texture_scissor
+#define GL_INTEL_texture_scissor 1
+
+typedef void (GLAPIENTRY * PFNGLTEXSCISSORFUNCINTELPROC) (GLenum target, GLenum lfunc, GLenum hfunc);
+typedef void (GLAPIENTRY * PFNGLTEXSCISSORINTELPROC) (GLenum target, GLclampf tlow, GLclampf thigh);
+
+#define glTexScissorFuncINTEL GLEW_GET_FUN(__glewTexScissorFuncINTEL)
+#define glTexScissorINTEL GLEW_GET_FUN(__glewTexScissorINTEL)
+
+#define GLEW_INTEL_texture_scissor GLEW_GET_VAR(__GLEW_INTEL_texture_scissor)
+
+#endif /* GL_INTEL_texture_scissor */
+
+/* --------------------- GL_KHR_blend_equation_advanced -------------------- */
+
+#ifndef GL_KHR_blend_equation_advanced
+#define GL_KHR_blend_equation_advanced 1
+
+#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285
+#define GL_MULTIPLY_KHR 0x9294
+#define GL_SCREEN_KHR 0x9295
+#define GL_OVERLAY_KHR 0x9296
+#define GL_DARKEN_KHR 0x9297
+#define GL_LIGHTEN_KHR 0x9298
+#define GL_COLORDODGE_KHR 0x9299
+#define GL_COLORBURN_KHR 0x929A
+#define GL_HARDLIGHT_KHR 0x929B
+#define GL_SOFTLIGHT_KHR 0x929C
+#define GL_DIFFERENCE_KHR 0x929E
+#define GL_EXCLUSION_KHR 0x92A0
+#define GL_HSL_HUE_KHR 0x92AD
+#define GL_HSL_SATURATION_KHR 0x92AE
+#define GL_HSL_COLOR_KHR 0x92AF
+#define GL_HSL_LUMINOSITY_KHR 0x92B0
+
+typedef void (GLAPIENTRY * PFNGLBLENDBARRIERKHRPROC) (void);
+
+#define glBlendBarrierKHR GLEW_GET_FUN(__glewBlendBarrierKHR)
+
+#define GLEW_KHR_blend_equation_advanced GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced)
+
+#endif /* GL_KHR_blend_equation_advanced */
+
+/* ---------------- GL_KHR_blend_equation_advanced_coherent ---------------- */
+
+#ifndef GL_KHR_blend_equation_advanced_coherent
+#define GL_KHR_blend_equation_advanced_coherent 1
+
+#define GLEW_KHR_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced_coherent)
+
+#endif /* GL_KHR_blend_equation_advanced_coherent */
+
+/* ---------------------- GL_KHR_context_flush_control --------------------- */
+
+#ifndef GL_KHR_context_flush_control
+#define GL_KHR_context_flush_control 1
+
+#define GLEW_KHR_context_flush_control GLEW_GET_VAR(__GLEW_KHR_context_flush_control)
+
+#endif /* GL_KHR_context_flush_control */
+
+/* ------------------------------ GL_KHR_debug ----------------------------- */
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+
+#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
+#define GL_DEBUG_SOURCE_API 0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
+#define GL_DEBUG_SOURCE_APPLICATION 0x824A
+#define GL_DEBUG_SOURCE_OTHER 0x824B
+#define GL_DEBUG_TYPE_ERROR 0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY 0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
+#define GL_DEBUG_TYPE_OTHER 0x8251
+#define GL_DEBUG_TYPE_MARKER 0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
+#define GL_DEBUG_TYPE_POP_GROUP 0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D
+#define GL_BUFFER 0x82E0
+#define GL_SHADER 0x82E1
+#define GL_PROGRAM 0x82E2
+#define GL_QUERY 0x82E3
+#define GL_PROGRAM_PIPELINE 0x82E4
+#define GL_SAMPLER 0x82E6
+#define GL_DISPLAY_LIST 0x82E7
+#define GL_MAX_LABEL_LENGTH 0x82E8
+#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
+#define GL_DEBUG_LOGGED_MESSAGES 0x9145
+#define GL_DEBUG_SEVERITY_HIGH 0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
+#define GL_DEBUG_SEVERITY_LOW 0x9148
+#define GL_DEBUG_OUTPUT 0x92E0
+
+typedef void (GLAPIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam);
+
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
+typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPTRLABELPROC) (void* ptr, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar* label);
+typedef void (GLAPIENTRY * PFNGLOBJECTPTRLABELPROC) (void* ptr, GLsizei length, const GLchar* label);
+typedef void (GLAPIENTRY * PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
+
+#define glDebugMessageCallback GLEW_GET_FUN(__glewDebugMessageCallback)
+#define glDebugMessageControl GLEW_GET_FUN(__glewDebugMessageControl)
+#define glDebugMessageInsert GLEW_GET_FUN(__glewDebugMessageInsert)
+#define glGetDebugMessageLog GLEW_GET_FUN(__glewGetDebugMessageLog)
+#define glGetObjectLabel GLEW_GET_FUN(__glewGetObjectLabel)
+#define glGetObjectPtrLabel GLEW_GET_FUN(__glewGetObjectPtrLabel)
+#define glObjectLabel GLEW_GET_FUN(__glewObjectLabel)
+#define glObjectPtrLabel GLEW_GET_FUN(__glewObjectPtrLabel)
+#define glPopDebugGroup GLEW_GET_FUN(__glewPopDebugGroup)
+#define glPushDebugGroup GLEW_GET_FUN(__glewPushDebugGroup)
+
+#define GLEW_KHR_debug GLEW_GET_VAR(__GLEW_KHR_debug)
+
+#endif /* GL_KHR_debug */
+
+/* ---------------------------- GL_KHR_no_error ---------------------------- */
+
+#ifndef GL_KHR_no_error
+#define GL_KHR_no_error 1
+
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
+
+#define GLEW_KHR_no_error GLEW_GET_VAR(__GLEW_KHR_no_error)
+
+#endif /* GL_KHR_no_error */
+
+/* --------------------- GL_KHR_parallel_shader_compile -------------------- */
+
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR 0x91B1
+
+typedef void (GLAPIENTRY * PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+
+#define glMaxShaderCompilerThreadsKHR GLEW_GET_FUN(__glewMaxShaderCompilerThreadsKHR)
+
+#define GLEW_KHR_parallel_shader_compile GLEW_GET_VAR(__GLEW_KHR_parallel_shader_compile)
+
+#endif /* GL_KHR_parallel_shader_compile */
+
+/* ------------------ GL_KHR_robust_buffer_access_behavior ----------------- */
+
+#ifndef GL_KHR_robust_buffer_access_behavior
+#define GL_KHR_robust_buffer_access_behavior 1
+
+#define GLEW_KHR_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_KHR_robust_buffer_access_behavior)
+
+#endif /* GL_KHR_robust_buffer_access_behavior */
+
+/* --------------------------- GL_KHR_robustness --------------------------- */
+
+#ifndef GL_KHR_robustness
+#define GL_KHR_robustness 1
+
+#define GL_CONTEXT_LOST 0x0507
+#define GL_LOSE_CONTEXT_ON_RESET 0x8252
+#define GL_GUILTY_CONTEXT_RESET 0x8253
+#define GL_INNOCENT_CONTEXT_RESET 0x8254
+#define GL_UNKNOWN_CONTEXT_RESET 0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY 0x8256
+#define GL_NO_RESET_NOTIFICATION 0x8261
+#define GL_CONTEXT_ROBUST_ACCESS 0x90F3
+
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+
+#define glGetnUniformfv GLEW_GET_FUN(__glewGetnUniformfv)
+#define glGetnUniformiv GLEW_GET_FUN(__glewGetnUniformiv)
+#define glGetnUniformuiv GLEW_GET_FUN(__glewGetnUniformuiv)
+#define glReadnPixels GLEW_GET_FUN(__glewReadnPixels)
+
+#define GLEW_KHR_robustness GLEW_GET_VAR(__GLEW_KHR_robustness)
+
+#endif /* GL_KHR_robustness */
+
+/* ------------------ GL_KHR_texture_compression_astc_hdr ------------------ */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+
+#define GLEW_KHR_texture_compression_astc_hdr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_hdr)
+
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
+/* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+
+#define GLEW_KHR_texture_compression_astc_ldr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_ldr)
+
+#endif /* GL_KHR_texture_compression_astc_ldr */
+
+/* --------------- GL_KHR_texture_compression_astc_sliced_3d --------------- */
+
+#ifndef GL_KHR_texture_compression_astc_sliced_3d
+#define GL_KHR_texture_compression_astc_sliced_3d 1
+
+#define GLEW_KHR_texture_compression_astc_sliced_3d GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_sliced_3d)
+
+#endif /* GL_KHR_texture_compression_astc_sliced_3d */
+
+/* -------------------------- GL_KTX_buffer_region ------------------------- */
+
+#ifndef GL_KTX_buffer_region
+#define GL_KTX_buffer_region 1
+
+#define GL_KTX_FRONT_REGION 0x0
+#define GL_KTX_BACK_REGION 0x1
+#define GL_KTX_Z_REGION 0x2
+#define GL_KTX_STENCIL_REGION 0x3
+
+typedef GLuint (GLAPIENTRY * PFNGLBUFFERREGIONENABLEDPROC) (void);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERREGIONPROC) (GLenum region);
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height, GLint xDest, GLint yDest);
+typedef GLuint (GLAPIENTRY * PFNGLNEWBUFFERREGIONPROC) (GLenum region);
+typedef void (GLAPIENTRY * PFNGLREADBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glBufferRegionEnabled GLEW_GET_FUN(__glewBufferRegionEnabled)
+#define glDeleteBufferRegion GLEW_GET_FUN(__glewDeleteBufferRegion)
+#define glDrawBufferRegion GLEW_GET_FUN(__glewDrawBufferRegion)
+#define glNewBufferRegion GLEW_GET_FUN(__glewNewBufferRegion)
+#define glReadBufferRegion GLEW_GET_FUN(__glewReadBufferRegion)
+
+#define GLEW_KTX_buffer_region GLEW_GET_VAR(__GLEW_KTX_buffer_region)
+
+#endif /* GL_KTX_buffer_region */
+
+/* ------------------------- GL_MESAX_texture_stack ------------------------ */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+
+#define GL_TEXTURE_1D_STACK_MESAX 0x8759
+#define GL_TEXTURE_2D_STACK_MESAX 0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+
+#define GLEW_MESAX_texture_stack GLEW_GET_VAR(__GLEW_MESAX_texture_stack)
+
+#endif /* GL_MESAX_texture_stack */
+
+/* -------------------------- GL_MESA_pack_invert -------------------------- */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+
+#define GL_PACK_INVERT_MESA 0x8758
+
+#define GLEW_MESA_pack_invert GLEW_GET_VAR(__GLEW_MESA_pack_invert)
+
+#endif /* GL_MESA_pack_invert */
+
+/* ------------------------- GL_MESA_resize_buffers ------------------------ */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+
+typedef void (GLAPIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
+
+#define glResizeBuffersMESA GLEW_GET_FUN(__glewResizeBuffersMESA)
+
+#define GLEW_MESA_resize_buffers GLEW_GET_VAR(__GLEW_MESA_resize_buffers)
+
+#endif /* GL_MESA_resize_buffers */
+
+/* -------------------- GL_MESA_shader_integer_functions ------------------- */
+
+#ifndef GL_MESA_shader_integer_functions
+#define GL_MESA_shader_integer_functions 1
+
+#define GLEW_MESA_shader_integer_functions GLEW_GET_VAR(__GLEW_MESA_shader_integer_functions)
+
+#endif /* GL_MESA_shader_integer_functions */
+
+/* --------------------------- GL_MESA_window_pos -------------------------- */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort* p);
+
+#define glWindowPos2dMESA GLEW_GET_FUN(__glewWindowPos2dMESA)
+#define glWindowPos2dvMESA GLEW_GET_FUN(__glewWindowPos2dvMESA)
+#define glWindowPos2fMESA GLEW_GET_FUN(__glewWindowPos2fMESA)
+#define glWindowPos2fvMESA GLEW_GET_FUN(__glewWindowPos2fvMESA)
+#define glWindowPos2iMESA GLEW_GET_FUN(__glewWindowPos2iMESA)
+#define glWindowPos2ivMESA GLEW_GET_FUN(__glewWindowPos2ivMESA)
+#define glWindowPos2sMESA GLEW_GET_FUN(__glewWindowPos2sMESA)
+#define glWindowPos2svMESA GLEW_GET_FUN(__glewWindowPos2svMESA)
+#define glWindowPos3dMESA GLEW_GET_FUN(__glewWindowPos3dMESA)
+#define glWindowPos3dvMESA GLEW_GET_FUN(__glewWindowPos3dvMESA)
+#define glWindowPos3fMESA GLEW_GET_FUN(__glewWindowPos3fMESA)
+#define glWindowPos3fvMESA GLEW_GET_FUN(__glewWindowPos3fvMESA)
+#define glWindowPos3iMESA GLEW_GET_FUN(__glewWindowPos3iMESA)
+#define glWindowPos3ivMESA GLEW_GET_FUN(__glewWindowPos3ivMESA)
+#define glWindowPos3sMESA GLEW_GET_FUN(__glewWindowPos3sMESA)
+#define glWindowPos3svMESA GLEW_GET_FUN(__glewWindowPos3svMESA)
+#define glWindowPos4dMESA GLEW_GET_FUN(__glewWindowPos4dMESA)
+#define glWindowPos4dvMESA GLEW_GET_FUN(__glewWindowPos4dvMESA)
+#define glWindowPos4fMESA GLEW_GET_FUN(__glewWindowPos4fMESA)
+#define glWindowPos4fvMESA GLEW_GET_FUN(__glewWindowPos4fvMESA)
+#define glWindowPos4iMESA GLEW_GET_FUN(__glewWindowPos4iMESA)
+#define glWindowPos4ivMESA GLEW_GET_FUN(__glewWindowPos4ivMESA)
+#define glWindowPos4sMESA GLEW_GET_FUN(__glewWindowPos4sMESA)
+#define glWindowPos4svMESA GLEW_GET_FUN(__glewWindowPos4svMESA)
+
+#define GLEW_MESA_window_pos GLEW_GET_VAR(__GLEW_MESA_window_pos)
+
+#endif /* GL_MESA_window_pos */
+
+/* ------------------------- GL_MESA_ycbcr_texture ------------------------- */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+
+#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB
+#define GL_YCBCR_MESA 0x8757
+
+#define GLEW_MESA_ycbcr_texture GLEW_GET_VAR(__GLEW_MESA_ycbcr_texture)
+
+#endif /* GL_MESA_ycbcr_texture */
+
+/* ----------- GL_NVX_blend_equation_advanced_multi_draw_buffers ----------- */
+
+#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers
+#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1
+
+#define GLEW_NVX_blend_equation_advanced_multi_draw_buffers GLEW_GET_VAR(__GLEW_NVX_blend_equation_advanced_multi_draw_buffers)
+
+#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */
+
+/* ----------------------- GL_NVX_conditional_render ----------------------- */
+
+#ifndef GL_NVX_conditional_render
+#define GL_NVX_conditional_render 1
+
+typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVXPROC) (void);
+
+#define glBeginConditionalRenderNVX GLEW_GET_FUN(__glewBeginConditionalRenderNVX)
+#define glEndConditionalRenderNVX GLEW_GET_FUN(__glewEndConditionalRenderNVX)
+
+#define GLEW_NVX_conditional_render GLEW_GET_VAR(__GLEW_NVX_conditional_render)
+
+#endif /* GL_NVX_conditional_render */
+
+/* ------------------------- GL_NVX_gpu_memory_info ------------------------ */
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_NVX_gpu_memory_info 1
+
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+
+#define GLEW_NVX_gpu_memory_info GLEW_GET_VAR(__GLEW_NVX_gpu_memory_info)
+
+#endif /* GL_NVX_gpu_memory_info */
+
+/* ---------------------- GL_NVX_linked_gpu_multicast ---------------------- */
+
+#ifndef GL_NVX_linked_gpu_multicast
+#define GL_NVX_linked_gpu_multicast 1
+
+#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX 0x0800
+#define GL_MAX_LGPU_GPUS_NVX 0x92BA
+
+typedef void (GLAPIENTRY * PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (GLAPIENTRY * PFNGLLGPUINTERLOCKNVXPROC) (void);
+typedef void (GLAPIENTRY * PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+
+#define glLGPUCopyImageSubDataNVX GLEW_GET_FUN(__glewLGPUCopyImageSubDataNVX)
+#define glLGPUInterlockNVX GLEW_GET_FUN(__glewLGPUInterlockNVX)
+#define glLGPUNamedBufferSubDataNVX GLEW_GET_FUN(__glewLGPUNamedBufferSubDataNVX)
+
+#define GLEW_NVX_linked_gpu_multicast GLEW_GET_VAR(__GLEW_NVX_linked_gpu_multicast)
+
+#endif /* GL_NVX_linked_gpu_multicast */
+
+/* ------------------------ GL_NV_3dvision_settings ------------------------ */
+
+#ifndef GL_NV_3dvision_settings
+#define GL_NV_3dvision_settings 1
+
+#define GL_3DVISION_STEREO_NV 0x90F4
+#define GL_STEREO_SEPARATION_NV 0x90F5
+#define GL_STEREO_CONVERGENCE_NV 0x90F6
+#define GL_STEREO_CUTOFF_NV 0x90F7
+#define GL_STEREO_PROJECTION_NV 0x90F8
+#define GL_STEREO_PROJECTION_PERSPECTIVE_NV 0x90F9
+#define GL_STEREO_PROJECTION_ORTHO_NV 0x90FA
+
+typedef void (GLAPIENTRY * PFNGLSTEREOPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLSTEREOPARAMETERINVPROC) (GLenum pname, GLint param);
+
+#define glStereoParameterfNV GLEW_GET_FUN(__glewStereoParameterfNV)
+#define glStereoParameteriNV GLEW_GET_FUN(__glewStereoParameteriNV)
+
+#define GLEW_NV_3dvision_settings GLEW_GET_VAR(__GLEW_NV_3dvision_settings)
+
+#endif /* GL_NV_3dvision_settings */
+
+/* ------------------- GL_NV_EGL_stream_consumer_external ------------------ */
+
+#ifndef GL_NV_EGL_stream_consumer_external
+#define GL_NV_EGL_stream_consumer_external 1
+
+#define GL_TEXTURE_EXTERNAL_OES 0x8D65
+#define GL_SAMPLER_EXTERNAL_OES 0x8D66
+#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67
+#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68
+
+#define GLEW_NV_EGL_stream_consumer_external GLEW_GET_VAR(__GLEW_NV_EGL_stream_consumer_external)
+
+#endif /* GL_NV_EGL_stream_consumer_external */
+
+/* ----------------- GL_NV_alpha_to_coverage_dither_control ---------------- */
+
+#ifndef GL_NV_alpha_to_coverage_dither_control
+#define GL_NV_alpha_to_coverage_dither_control 1
+
+#define GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV 0x92BF
+#define GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV 0x934D
+#define GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV 0x934E
+#define GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV 0x934F
+
+#define GLEW_NV_alpha_to_coverage_dither_control GLEW_GET_VAR(__GLEW_NV_alpha_to_coverage_dither_control)
+
+#endif /* GL_NV_alpha_to_coverage_dither_control */
+
+/* ------------------------------- GL_NV_bgr ------------------------------- */
+
+#ifndef GL_NV_bgr
+#define GL_NV_bgr 1
+
+#define GL_BGR_NV 0x80E0
+
+#define GLEW_NV_bgr GLEW_GET_VAR(__GLEW_NV_bgr)
+
+#endif /* GL_NV_bgr */
+
+/* ------------------- GL_NV_bindless_multi_draw_indirect ------------------ */
+
+#ifndef GL_NV_bindless_multi_draw_indirect
+#define GL_NV_bindless_multi_draw_indirect 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+
+#define glMultiDrawArraysIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessNV)
+#define glMultiDrawElementsIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessNV)
+
+#define GLEW_NV_bindless_multi_draw_indirect GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect)
+
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+/* ---------------- GL_NV_bindless_multi_draw_indirect_count --------------- */
+
+#ifndef GL_NV_bindless_multi_draw_indirect_count
+#define GL_NV_bindless_multi_draw_indirect_count 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+
+#define glMultiDrawArraysIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessCountNV)
+#define glMultiDrawElementsIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessCountNV)
+
+#define GLEW_NV_bindless_multi_draw_indirect_count GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect_count)
+
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+
+/* ------------------------- GL_NV_bindless_texture ------------------------ */
+
+#ifndef GL_NV_bindless_texture
+#define GL_NV_bindless_texture 1
+
+typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
+typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
+typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
+typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values);
+typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64* value);
+
+#define glGetImageHandleNV GLEW_GET_FUN(__glewGetImageHandleNV)
+#define glGetTextureHandleNV GLEW_GET_FUN(__glewGetTextureHandleNV)
+#define glGetTextureSamplerHandleNV GLEW_GET_FUN(__glewGetTextureSamplerHandleNV)
+#define glIsImageHandleResidentNV GLEW_GET_FUN(__glewIsImageHandleResidentNV)
+#define glIsTextureHandleResidentNV GLEW_GET_FUN(__glewIsTextureHandleResidentNV)
+#define glMakeImageHandleNonResidentNV GLEW_GET_FUN(__glewMakeImageHandleNonResidentNV)
+#define glMakeImageHandleResidentNV GLEW_GET_FUN(__glewMakeImageHandleResidentNV)
+#define glMakeTextureHandleNonResidentNV GLEW_GET_FUN(__glewMakeTextureHandleNonResidentNV)
+#define glMakeTextureHandleResidentNV GLEW_GET_FUN(__glewMakeTextureHandleResidentNV)
+#define glProgramUniformHandleui64NV GLEW_GET_FUN(__glewProgramUniformHandleui64NV)
+#define glProgramUniformHandleui64vNV GLEW_GET_FUN(__glewProgramUniformHandleui64vNV)
+#define glUniformHandleui64NV GLEW_GET_FUN(__glewUniformHandleui64NV)
+#define glUniformHandleui64vNV GLEW_GET_FUN(__glewUniformHandleui64vNV)
+
+#define GLEW_NV_bindless_texture GLEW_GET_VAR(__GLEW_NV_bindless_texture)
+
+#endif /* GL_NV_bindless_texture */
+
+/* --------------------- GL_NV_blend_equation_advanced --------------------- */
+
+#ifndef GL_NV_blend_equation_advanced
+#define GL_NV_blend_equation_advanced 1
+
+#define GL_XOR_NV 0x1506
+#define GL_RED_NV 0x1903
+#define GL_GREEN_NV 0x1904
+#define GL_BLUE_NV 0x1905
+#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280
+#define GL_BLEND_OVERLAP_NV 0x9281
+#define GL_UNCORRELATED_NV 0x9282
+#define GL_DISJOINT_NV 0x9283
+#define GL_CONJOINT_NV 0x9284
+#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285
+#define GL_SRC_NV 0x9286
+#define GL_DST_NV 0x9287
+#define GL_SRC_OVER_NV 0x9288
+#define GL_DST_OVER_NV 0x9289
+#define GL_SRC_IN_NV 0x928A
+#define GL_DST_IN_NV 0x928B
+#define GL_SRC_OUT_NV 0x928C
+#define GL_DST_OUT_NV 0x928D
+#define GL_SRC_ATOP_NV 0x928E
+#define GL_DST_ATOP_NV 0x928F
+#define GL_PLUS_NV 0x9291
+#define GL_PLUS_DARKER_NV 0x9292
+#define GL_MULTIPLY_NV 0x9294
+#define GL_SCREEN_NV 0x9295
+#define GL_OVERLAY_NV 0x9296
+#define GL_DARKEN_NV 0x9297
+#define GL_LIGHTEN_NV 0x9298
+#define GL_COLORDODGE_NV 0x9299
+#define GL_COLORBURN_NV 0x929A
+#define GL_HARDLIGHT_NV 0x929B
+#define GL_SOFTLIGHT_NV 0x929C
+#define GL_DIFFERENCE_NV 0x929E
+#define GL_MINUS_NV 0x929F
+#define GL_EXCLUSION_NV 0x92A0
+#define GL_CONTRAST_NV 0x92A1
+#define GL_INVERT_RGB_NV 0x92A3
+#define GL_LINEARDODGE_NV 0x92A4
+#define GL_LINEARBURN_NV 0x92A5
+#define GL_VIVIDLIGHT_NV 0x92A6
+#define GL_LINEARLIGHT_NV 0x92A7
+#define GL_PINLIGHT_NV 0x92A8
+#define GL_HARDMIX_NV 0x92A9
+#define GL_HSL_HUE_NV 0x92AD
+#define GL_HSL_SATURATION_NV 0x92AE
+#define GL_HSL_COLOR_NV 0x92AF
+#define GL_HSL_LUMINOSITY_NV 0x92B0
+#define GL_PLUS_CLAMPED_NV 0x92B1
+#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2
+#define GL_MINUS_CLAMPED_NV 0x92B3
+#define GL_INVERT_OVG_NV 0x92B4
+
+typedef void (GLAPIENTRY * PFNGLBLENDBARRIERNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value);
+
+#define glBlendBarrierNV GLEW_GET_FUN(__glewBlendBarrierNV)
+#define glBlendParameteriNV GLEW_GET_FUN(__glewBlendParameteriNV)
+
+#define GLEW_NV_blend_equation_advanced GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced)
+
+#endif /* GL_NV_blend_equation_advanced */
+
+/* ----------------- GL_NV_blend_equation_advanced_coherent ---------------- */
+
+#ifndef GL_NV_blend_equation_advanced_coherent
+#define GL_NV_blend_equation_advanced_coherent 1
+
+#define GLEW_NV_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced_coherent)
+
+#endif /* GL_NV_blend_equation_advanced_coherent */
+
+/* ----------------------- GL_NV_blend_minmax_factor ----------------------- */
+
+#ifndef GL_NV_blend_minmax_factor
+#define GL_NV_blend_minmax_factor 1
+
+#define GL_FACTOR_MIN_AMD 0x901C
+#define GL_FACTOR_MAX_AMD 0x901D
+
+#define GLEW_NV_blend_minmax_factor GLEW_GET_VAR(__GLEW_NV_blend_minmax_factor)
+
+#endif /* GL_NV_blend_minmax_factor */
+
+/* --------------------------- GL_NV_blend_square -------------------------- */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+
+#define GLEW_NV_blend_square GLEW_GET_VAR(__GLEW_NV_blend_square)
+
+#endif /* GL_NV_blend_square */
+
+/* ----------------------- GL_NV_clip_space_w_scaling ---------------------- */
+
+#ifndef GL_NV_clip_space_w_scaling
+#define GL_NV_clip_space_w_scaling 1
+
+#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C
+#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
+#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
+
+typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+
+#define glViewportPositionWScaleNV GLEW_GET_FUN(__glewViewportPositionWScaleNV)
+
+#define GLEW_NV_clip_space_w_scaling GLEW_GET_VAR(__GLEW_NV_clip_space_w_scaling)
+
+#endif /* GL_NV_clip_space_w_scaling */
+
+/* --------------------------- GL_NV_command_list -------------------------- */
+
+#ifndef GL_NV_command_list
+#define GL_NV_command_list 1
+
+#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000
+#define GL_NOP_COMMAND_NV 0x0001
+#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002
+#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003
+#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004
+#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005
+#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006
+#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007
+#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008
+#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009
+#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000a
+#define GL_BLEND_COLOR_COMMAND_NV 0x000b
+#define GL_STENCIL_REF_COMMAND_NV 0x000c
+#define GL_LINE_WIDTH_COMMAND_NV 0x000d
+#define GL_POLYGON_OFFSET_COMMAND_NV 0x000e
+#define GL_ALPHA_REF_COMMAND_NV 0x000f
+#define GL_VIEWPORT_COMMAND_NV 0x0010
+#define GL_SCISSOR_COMMAND_NV 0x0011
+#define GL_FRONT_FACE_COMMAND_NV 0x0012
+
+typedef void (GLAPIENTRY * PFNGLCALLCOMMANDLISTNVPROC) (GLuint list);
+typedef void (GLAPIENTRY * PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments);
+typedef void (GLAPIENTRY * PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list);
+typedef void (GLAPIENTRY * PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint* lists);
+typedef void (GLAPIENTRY * PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint* states);
+typedef void (GLAPIENTRY * PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint* lists);
+typedef void (GLAPIENTRY * PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint* states);
+typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64* indirects, const GLsizei* sizes, GLuint count);
+typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, GLuint count);
+typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count);
+typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count);
+typedef GLuint (GLAPIENTRY * PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size);
+typedef GLushort (GLAPIENTRY * PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype);
+typedef GLboolean (GLAPIENTRY * PFNGLISCOMMANDLISTNVPROC) (GLuint list);
+typedef GLboolean (GLAPIENTRY * PFNGLISSTATENVPROC) (GLuint state);
+typedef void (GLAPIENTRY * PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void** indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count);
+typedef void (GLAPIENTRY * PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode);
+
+#define glCallCommandListNV GLEW_GET_FUN(__glewCallCommandListNV)
+#define glCommandListSegmentsNV GLEW_GET_FUN(__glewCommandListSegmentsNV)
+#define glCompileCommandListNV GLEW_GET_FUN(__glewCompileCommandListNV)
+#define glCreateCommandListsNV GLEW_GET_FUN(__glewCreateCommandListsNV)
+#define glCreateStatesNV GLEW_GET_FUN(__glewCreateStatesNV)
+#define glDeleteCommandListsNV GLEW_GET_FUN(__glewDeleteCommandListsNV)
+#define glDeleteStatesNV GLEW_GET_FUN(__glewDeleteStatesNV)
+#define glDrawCommandsAddressNV GLEW_GET_FUN(__glewDrawCommandsAddressNV)
+#define glDrawCommandsNV GLEW_GET_FUN(__glewDrawCommandsNV)
+#define glDrawCommandsStatesAddressNV GLEW_GET_FUN(__glewDrawCommandsStatesAddressNV)
+#define glDrawCommandsStatesNV GLEW_GET_FUN(__glewDrawCommandsStatesNV)
+#define glGetCommandHeaderNV GLEW_GET_FUN(__glewGetCommandHeaderNV)
+#define glGetStageIndexNV GLEW_GET_FUN(__glewGetStageIndexNV)
+#define glIsCommandListNV GLEW_GET_FUN(__glewIsCommandListNV)
+#define glIsStateNV GLEW_GET_FUN(__glewIsStateNV)
+#define glListDrawCommandsStatesClientNV GLEW_GET_FUN(__glewListDrawCommandsStatesClientNV)
+#define glStateCaptureNV GLEW_GET_FUN(__glewStateCaptureNV)
+
+#define GLEW_NV_command_list GLEW_GET_VAR(__GLEW_NV_command_list)
+
+#endif /* GL_NV_command_list */
+
+/* ------------------------- GL_NV_compute_program5 ------------------------ */
+
+#ifndef GL_NV_compute_program5
+#define GL_NV_compute_program5 1
+
+#define GL_COMPUTE_PROGRAM_NV 0x90FB
+#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
+
+#define GLEW_NV_compute_program5 GLEW_GET_VAR(__GLEW_NV_compute_program5)
+
+#endif /* GL_NV_compute_program5 */
+
+/* ------------------------ GL_NV_conditional_render ----------------------- */
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+
+#define GL_QUERY_WAIT_NV 0x8E13
+#define GL_QUERY_NO_WAIT_NV 0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16
+
+typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVPROC) (void);
+
+#define glBeginConditionalRenderNV GLEW_GET_FUN(__glewBeginConditionalRenderNV)
+#define glEndConditionalRenderNV GLEW_GET_FUN(__glewEndConditionalRenderNV)
+
+#define GLEW_NV_conditional_render GLEW_GET_VAR(__GLEW_NV_conditional_render)
+
+#endif /* GL_NV_conditional_render */
+
+/* ----------------------- GL_NV_conservative_raster ----------------------- */
+
+#ifndef GL_NV_conservative_raster
+#define GL_NV_conservative_raster 1
+
+#define GL_CONSERVATIVE_RASTERIZATION_NV 0x9346
+#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347
+#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348
+#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349
+
+typedef void (GLAPIENTRY * PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits);
+
+#define glSubpixelPrecisionBiasNV GLEW_GET_FUN(__glewSubpixelPrecisionBiasNV)
+
+#define GLEW_NV_conservative_raster GLEW_GET_VAR(__GLEW_NV_conservative_raster)
+
+#endif /* GL_NV_conservative_raster */
+
+/* -------------------- GL_NV_conservative_raster_dilate ------------------- */
+
+#ifndef GL_NV_conservative_raster_dilate
+#define GL_NV_conservative_raster_dilate 1
+
+#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379
+#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A
+#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B
+
+typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value);
+
+#define glConservativeRasterParameterfNV GLEW_GET_FUN(__glewConservativeRasterParameterfNV)
+
+#define GLEW_NV_conservative_raster_dilate GLEW_GET_VAR(__GLEW_NV_conservative_raster_dilate)
+
+#endif /* GL_NV_conservative_raster_dilate */
+
+/* -------------- GL_NV_conservative_raster_pre_snap_triangles ------------- */
+
+#ifndef GL_NV_conservative_raster_pre_snap_triangles
+#define GL_NV_conservative_raster_pre_snap_triangles 1
+
+#define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D
+#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F
+
+typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param);
+
+#define glConservativeRasterParameteriNV GLEW_GET_FUN(__glewConservativeRasterParameteriNV)
+
+#define GLEW_NV_conservative_raster_pre_snap_triangles GLEW_GET_VAR(__GLEW_NV_conservative_raster_pre_snap_triangles)
+
+#endif /* GL_NV_conservative_raster_pre_snap_triangles */
+
+/* --------------------------- GL_NV_copy_buffer --------------------------- */
+
+#ifndef GL_NV_copy_buffer
+#define GL_NV_copy_buffer 1
+
+#define GL_COPY_READ_BUFFER_NV 0x8F36
+#define GL_COPY_WRITE_BUFFER_NV 0x8F37
+
+typedef void (GLAPIENTRY * PFNGLCOPYBUFFERSUBDATANVPROC) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size);
+
+#define glCopyBufferSubDataNV GLEW_GET_FUN(__glewCopyBufferSubDataNV)
+
+#define GLEW_NV_copy_buffer GLEW_GET_VAR(__GLEW_NV_copy_buffer)
+
+#endif /* GL_NV_copy_buffer */
+
+/* ----------------------- GL_NV_copy_depth_to_color ----------------------- */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+
+#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F
+
+#define GLEW_NV_copy_depth_to_color GLEW_GET_VAR(__GLEW_NV_copy_depth_to_color)
+
+#endif /* GL_NV_copy_depth_to_color */
+
+/* ---------------------------- GL_NV_copy_image --------------------------- */
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+
+#define glCopyImageSubDataNV GLEW_GET_FUN(__glewCopyImageSubDataNV)
+
+#define GLEW_NV_copy_image GLEW_GET_VAR(__GLEW_NV_copy_image)
+
+#endif /* GL_NV_copy_image */
+
+/* -------------------------- GL_NV_deep_texture3D ------------------------- */
+
+#ifndef GL_NV_deep_texture3D
+#define GL_NV_deep_texture3D 1
+
+#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0
+#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1
+
+#define GLEW_NV_deep_texture3D GLEW_GET_VAR(__GLEW_NV_deep_texture3D)
+
+#endif /* GL_NV_deep_texture3D */
+
+/* ------------------------ GL_NV_depth_buffer_float ----------------------- */
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+
+#define GL_DEPTH_COMPONENT32F_NV 0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF
+
+typedef void (GLAPIENTRY * PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+
+#define glClearDepthdNV GLEW_GET_FUN(__glewClearDepthdNV)
+#define glDepthBoundsdNV GLEW_GET_FUN(__glewDepthBoundsdNV)
+#define glDepthRangedNV GLEW_GET_FUN(__glewDepthRangedNV)
+
+#define GLEW_NV_depth_buffer_float GLEW_GET_VAR(__GLEW_NV_depth_buffer_float)
+
+#endif /* GL_NV_depth_buffer_float */
+
+/* --------------------------- GL_NV_depth_clamp --------------------------- */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+
+#define GL_DEPTH_CLAMP_NV 0x864F
+
+#define GLEW_NV_depth_clamp GLEW_GET_VAR(__GLEW_NV_depth_clamp)
+
+#endif /* GL_NV_depth_clamp */
+
+/* ---------------------- GL_NV_depth_range_unclamped ---------------------- */
+
+#ifndef GL_NV_depth_range_unclamped
+#define GL_NV_depth_range_unclamped 1
+
+#define GL_SAMPLE_COUNT_BITS_NV 0x8864
+#define GL_CURRENT_SAMPLE_COUNT_QUERY_NV 0x8865
+#define GL_QUERY_RESULT_NV 0x8866
+#define GL_QUERY_RESULT_AVAILABLE_NV 0x8867
+#define GL_SAMPLE_COUNT_NV 0x8914
+
+#define GLEW_NV_depth_range_unclamped GLEW_GET_VAR(__GLEW_NV_depth_range_unclamped)
+
+#endif /* GL_NV_depth_range_unclamped */
+
+/* --------------------------- GL_NV_draw_buffers -------------------------- */
+
+#ifndef GL_NV_draw_buffers
+#define GL_NV_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_NV 0x8824
+#define GL_DRAW_BUFFER0_NV 0x8825
+#define GL_DRAW_BUFFER1_NV 0x8826
+#define GL_DRAW_BUFFER2_NV 0x8827
+#define GL_DRAW_BUFFER3_NV 0x8828
+#define GL_DRAW_BUFFER4_NV 0x8829
+#define GL_DRAW_BUFFER5_NV 0x882A
+#define GL_DRAW_BUFFER6_NV 0x882B
+#define GL_DRAW_BUFFER7_NV 0x882C
+#define GL_DRAW_BUFFER8_NV 0x882D
+#define GL_DRAW_BUFFER9_NV 0x882E
+#define GL_DRAW_BUFFER10_NV 0x882F
+#define GL_DRAW_BUFFER11_NV 0x8830
+#define GL_DRAW_BUFFER12_NV 0x8831
+#define GL_DRAW_BUFFER13_NV 0x8832
+#define GL_DRAW_BUFFER14_NV 0x8833
+#define GL_DRAW_BUFFER15_NV 0x8834
+#define GL_COLOR_ATTACHMENT0_NV 0x8CE0
+#define GL_COLOR_ATTACHMENT1_NV 0x8CE1
+#define GL_COLOR_ATTACHMENT2_NV 0x8CE2
+#define GL_COLOR_ATTACHMENT3_NV 0x8CE3
+#define GL_COLOR_ATTACHMENT4_NV 0x8CE4
+#define GL_COLOR_ATTACHMENT5_NV 0x8CE5
+#define GL_COLOR_ATTACHMENT6_NV 0x8CE6
+#define GL_COLOR_ATTACHMENT7_NV 0x8CE7
+#define GL_COLOR_ATTACHMENT8_NV 0x8CE8
+#define GL_COLOR_ATTACHMENT9_NV 0x8CE9
+#define GL_COLOR_ATTACHMENT10_NV 0x8CEA
+#define GL_COLOR_ATTACHMENT11_NV 0x8CEB
+#define GL_COLOR_ATTACHMENT12_NV 0x8CEC
+#define GL_COLOR_ATTACHMENT13_NV 0x8CED
+#define GL_COLOR_ATTACHMENT14_NV 0x8CEE
+#define GL_COLOR_ATTACHMENT15_NV 0x8CEF
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersNV GLEW_GET_FUN(__glewDrawBuffersNV)
+
+#define GLEW_NV_draw_buffers GLEW_GET_VAR(__GLEW_NV_draw_buffers)
+
+#endif /* GL_NV_draw_buffers */
+
+/* -------------------------- GL_NV_draw_instanced ------------------------- */
+
+#ifndef GL_NV_draw_instanced
+#define GL_NV_draw_instanced 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDNVPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDNVPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+
+#define glDrawArraysInstancedNV GLEW_GET_FUN(__glewDrawArraysInstancedNV)
+#define glDrawElementsInstancedNV GLEW_GET_FUN(__glewDrawElementsInstancedNV)
+
+#define GLEW_NV_draw_instanced GLEW_GET_VAR(__GLEW_NV_draw_instanced)
+
+#endif /* GL_NV_draw_instanced */
+
+/* --------------------------- GL_NV_draw_texture -------------------------- */
+
+#ifndef GL_NV_draw_texture
+#define GL_NV_draw_texture 1
+
+typedef void (GLAPIENTRY * PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+
+#define glDrawTextureNV GLEW_GET_FUN(__glewDrawTextureNV)
+
+#define GLEW_NV_draw_texture GLEW_GET_VAR(__GLEW_NV_draw_texture)
+
+#endif /* GL_NV_draw_texture */
+
+/* ------------------------ GL_NV_draw_vulkan_image ------------------------ */
+
+#ifndef GL_NV_draw_vulkan_image
+#define GL_NV_draw_vulkan_image 1
+
+typedef void (APIENTRY *GLVULKANPROCNV)(void);
+
+typedef void (GLAPIENTRY * PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+typedef GLVULKANPROCNV (GLAPIENTRY * PFNGLGETVKPROCADDRNVPROC) (const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
+typedef void (GLAPIENTRY * PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
+typedef void (GLAPIENTRY * PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
+
+#define glDrawVkImageNV GLEW_GET_FUN(__glewDrawVkImageNV)
+#define glGetVkProcAddrNV GLEW_GET_FUN(__glewGetVkProcAddrNV)
+#define glSignalVkFenceNV GLEW_GET_FUN(__glewSignalVkFenceNV)
+#define glSignalVkSemaphoreNV GLEW_GET_FUN(__glewSignalVkSemaphoreNV)
+#define glWaitVkSemaphoreNV GLEW_GET_FUN(__glewWaitVkSemaphoreNV)
+
+#define GLEW_NV_draw_vulkan_image GLEW_GET_VAR(__GLEW_NV_draw_vulkan_image)
+
+#endif /* GL_NV_draw_vulkan_image */
+
+/* ---------------------------- GL_NV_evaluators --------------------------- */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+
+#define GL_EVAL_2D_NV 0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1
+#define GL_MAP_TESSELLATION_NV 0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV 0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7
+
+typedef void (GLAPIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+typedef void (GLAPIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glEvalMapsNV GLEW_GET_FUN(__glewEvalMapsNV)
+#define glGetMapAttribParameterfvNV GLEW_GET_FUN(__glewGetMapAttribParameterfvNV)
+#define glGetMapAttribParameterivNV GLEW_GET_FUN(__glewGetMapAttribParameterivNV)
+#define glGetMapControlPointsNV GLEW_GET_FUN(__glewGetMapControlPointsNV)
+#define glGetMapParameterfvNV GLEW_GET_FUN(__glewGetMapParameterfvNV)
+#define glGetMapParameterivNV GLEW_GET_FUN(__glewGetMapParameterivNV)
+#define glMapControlPointsNV GLEW_GET_FUN(__glewMapControlPointsNV)
+#define glMapParameterfvNV GLEW_GET_FUN(__glewMapParameterfvNV)
+#define glMapParameterivNV GLEW_GET_FUN(__glewMapParameterivNV)
+
+#define GLEW_NV_evaluators GLEW_GET_VAR(__GLEW_NV_evaluators)
+
+#endif /* GL_NV_evaluators */
+
+/* --------------------- GL_NV_explicit_attrib_location -------------------- */
+
+#ifndef GL_NV_explicit_attrib_location
+#define GL_NV_explicit_attrib_location 1
+
+#define GLEW_NV_explicit_attrib_location GLEW_GET_VAR(__GLEW_NV_explicit_attrib_location)
+
+#endif /* GL_NV_explicit_attrib_location */
+
+/* ----------------------- GL_NV_explicit_multisample ---------------------- */
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+
+#define GL_SAMPLE_POSITION_NV 0x8E50
+#define GL_SAMPLE_MASK_NV 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV 0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59
+
+typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat* val);
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (GLAPIENTRY * PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+
+#define glGetMultisamplefvNV GLEW_GET_FUN(__glewGetMultisamplefvNV)
+#define glSampleMaskIndexedNV GLEW_GET_FUN(__glewSampleMaskIndexedNV)
+#define glTexRenderbufferNV GLEW_GET_FUN(__glewTexRenderbufferNV)
+
+#define GLEW_NV_explicit_multisample GLEW_GET_VAR(__GLEW_NV_explicit_multisample)
+
+#endif /* GL_NV_explicit_multisample */
+
+/* ---------------------- GL_NV_fbo_color_attachments ---------------------- */
+
+#ifndef GL_NV_fbo_color_attachments
+#define GL_NV_fbo_color_attachments 1
+
+#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF
+#define GL_COLOR_ATTACHMENT0_NV 0x8CE0
+#define GL_COLOR_ATTACHMENT1_NV 0x8CE1
+#define GL_COLOR_ATTACHMENT2_NV 0x8CE2
+#define GL_COLOR_ATTACHMENT3_NV 0x8CE3
+#define GL_COLOR_ATTACHMENT4_NV 0x8CE4
+#define GL_COLOR_ATTACHMENT5_NV 0x8CE5
+#define GL_COLOR_ATTACHMENT6_NV 0x8CE6
+#define GL_COLOR_ATTACHMENT7_NV 0x8CE7
+#define GL_COLOR_ATTACHMENT8_NV 0x8CE8
+#define GL_COLOR_ATTACHMENT9_NV 0x8CE9
+#define GL_COLOR_ATTACHMENT10_NV 0x8CEA
+#define GL_COLOR_ATTACHMENT11_NV 0x8CEB
+#define GL_COLOR_ATTACHMENT12_NV 0x8CEC
+#define GL_COLOR_ATTACHMENT13_NV 0x8CED
+#define GL_COLOR_ATTACHMENT14_NV 0x8CEE
+#define GL_COLOR_ATTACHMENT15_NV 0x8CEF
+
+#define GLEW_NV_fbo_color_attachments GLEW_GET_VAR(__GLEW_NV_fbo_color_attachments)
+
+#endif /* GL_NV_fbo_color_attachments */
+
+/* ------------------------------ GL_NV_fence ------------------------------ */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+
+#define GL_ALL_COMPLETED_NV 0x84F2
+#define GL_FENCE_STATUS_NV 0x84F3
+#define GL_FENCE_CONDITION_NV 0x84F4
+
+typedef void (GLAPIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISFENCENVPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence);
+
+#define glDeleteFencesNV GLEW_GET_FUN(__glewDeleteFencesNV)
+#define glFinishFenceNV GLEW_GET_FUN(__glewFinishFenceNV)
+#define glGenFencesNV GLEW_GET_FUN(__glewGenFencesNV)
+#define glGetFenceivNV GLEW_GET_FUN(__glewGetFenceivNV)
+#define glIsFenceNV GLEW_GET_FUN(__glewIsFenceNV)
+#define glSetFenceNV GLEW_GET_FUN(__glewSetFenceNV)
+#define glTestFenceNV GLEW_GET_FUN(__glewTestFenceNV)
+
+#define GLEW_NV_fence GLEW_GET_VAR(__GLEW_NV_fence)
+
+#endif /* GL_NV_fence */
+
+/* -------------------------- GL_NV_fill_rectangle ------------------------- */
+
+#ifndef GL_NV_fill_rectangle
+#define GL_NV_fill_rectangle 1
+
+#define GL_FILL_RECTANGLE_NV 0x933C
+
+#define GLEW_NV_fill_rectangle GLEW_GET_VAR(__GLEW_NV_fill_rectangle)
+
+#endif /* GL_NV_fill_rectangle */
+
+/* --------------------------- GL_NV_float_buffer -------------------------- */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+
+#define GL_FLOAT_R_NV 0x8880
+#define GL_FLOAT_RG_NV 0x8881
+#define GL_FLOAT_RGB_NV 0x8882
+#define GL_FLOAT_RGBA_NV 0x8883
+#define GL_FLOAT_R16_NV 0x8884
+#define GL_FLOAT_R32_NV 0x8885
+#define GL_FLOAT_RG16_NV 0x8886
+#define GL_FLOAT_RG32_NV 0x8887
+#define GL_FLOAT_RGB16_NV 0x8888
+#define GL_FLOAT_RGB32_NV 0x8889
+#define GL_FLOAT_RGBA16_NV 0x888A
+#define GL_FLOAT_RGBA32_NV 0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D
+#define GL_FLOAT_RGBA_MODE_NV 0x888E
+
+#define GLEW_NV_float_buffer GLEW_GET_VAR(__GLEW_NV_float_buffer)
+
+#endif /* GL_NV_float_buffer */
+
+/* --------------------------- GL_NV_fog_distance -------------------------- */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+
+#define GL_FOG_DISTANCE_MODE_NV 0x855A
+#define GL_EYE_RADIAL_NV 0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C
+
+#define GLEW_NV_fog_distance GLEW_GET_VAR(__GLEW_NV_fog_distance)
+
+#endif /* GL_NV_fog_distance */
+
+/* -------------------- GL_NV_fragment_coverage_to_color ------------------- */
+
+#ifndef GL_NV_fragment_coverage_to_color
+#define GL_NV_fragment_coverage_to_color 1
+
+#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV 0x92DD
+#define GL_FRAGMENT_COVERAGE_COLOR_NV 0x92DE
+
+typedef void (GLAPIENTRY * PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color);
+
+#define glFragmentCoverageColorNV GLEW_GET_FUN(__glewFragmentCoverageColorNV)
+
+#define GLEW_NV_fragment_coverage_to_color GLEW_GET_VAR(__GLEW_NV_fragment_coverage_to_color)
+
+#endif /* GL_NV_fragment_coverage_to_color */
+
+/* ------------------------- GL_NV_fragment_program ------------------------ */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV 0x8870
+#define GL_MAX_TEXTURE_COORDS_NV 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873
+#define GL_PROGRAM_ERROR_STRING_NV 0x8874
+
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble *params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLdouble v[]);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLfloat v[]);
+
+#define glGetProgramNamedParameterdvNV GLEW_GET_FUN(__glewGetProgramNamedParameterdvNV)
+#define glGetProgramNamedParameterfvNV GLEW_GET_FUN(__glewGetProgramNamedParameterfvNV)
+#define glProgramNamedParameter4dNV GLEW_GET_FUN(__glewProgramNamedParameter4dNV)
+#define glProgramNamedParameter4dvNV GLEW_GET_FUN(__glewProgramNamedParameter4dvNV)
+#define glProgramNamedParameter4fNV GLEW_GET_FUN(__glewProgramNamedParameter4fNV)
+#define glProgramNamedParameter4fvNV GLEW_GET_FUN(__glewProgramNamedParameter4fvNV)
+
+#define GLEW_NV_fragment_program GLEW_GET_VAR(__GLEW_NV_fragment_program)
+
+#endif /* GL_NV_fragment_program */
+
+/* ------------------------ GL_NV_fragment_program2 ------------------------ */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8
+
+#define GLEW_NV_fragment_program2 GLEW_GET_VAR(__GLEW_NV_fragment_program2)
+
+#endif /* GL_NV_fragment_program2 */
+
+/* ------------------------ GL_NV_fragment_program4 ------------------------ */
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+
+#define GLEW_NV_fragment_program4 GLEW_GET_VAR(__GLEW_NV_fragment_program4)
+
+#endif /* GL_NV_fragment_program4 */
+
+/* --------------------- GL_NV_fragment_program_option --------------------- */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+
+#define GLEW_NV_fragment_program_option GLEW_GET_VAR(__GLEW_NV_fragment_program_option)
+
+#endif /* GL_NV_fragment_program_option */
+
+/* -------------------- GL_NV_fragment_shader_interlock -------------------- */
+
+#ifndef GL_NV_fragment_shader_interlock
+#define GL_NV_fragment_shader_interlock 1
+
+#define GLEW_NV_fragment_shader_interlock GLEW_GET_VAR(__GLEW_NV_fragment_shader_interlock)
+
+#endif /* GL_NV_fragment_shader_interlock */
+
+/* ------------------------- GL_NV_framebuffer_blit ------------------------ */
+
+#ifndef GL_NV_framebuffer_blit
+#define GL_NV_framebuffer_blit 1
+
+#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6
+#define GL_READ_FRAMEBUFFER_NV 0x8CA8
+#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA
+
+typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERNVPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+
+#define glBlitFramebufferNV GLEW_GET_FUN(__glewBlitFramebufferNV)
+
+#define GLEW_NV_framebuffer_blit GLEW_GET_VAR(__GLEW_NV_framebuffer_blit)
+
+#endif /* GL_NV_framebuffer_blit */
+
+/* -------------------- GL_NV_framebuffer_mixed_samples -------------------- */
+
+#ifndef GL_NV_framebuffer_mixed_samples
+#define GL_NV_framebuffer_mixed_samples 1
+
+#define GL_COLOR_SAMPLES_NV 0x8E20
+#define GL_RASTER_MULTISAMPLE_EXT 0x9327
+#define GL_RASTER_SAMPLES_EXT 0x9328
+#define GL_MAX_RASTER_SAMPLES_EXT 0x9329
+#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A
+#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B
+#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C
+#define GL_DEPTH_SAMPLES_NV 0x932D
+#define GL_STENCIL_SAMPLES_NV 0x932E
+#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F
+#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330
+#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331
+#define GL_COVERAGE_MODULATION_NV 0x9332
+#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333
+
+#define GLEW_NV_framebuffer_mixed_samples GLEW_GET_VAR(__GLEW_NV_framebuffer_mixed_samples)
+
+#endif /* GL_NV_framebuffer_mixed_samples */
+
+/* --------------------- GL_NV_framebuffer_multisample --------------------- */
+
+#ifndef GL_NV_framebuffer_multisample
+#define GL_NV_framebuffer_multisample 1
+
+#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56
+#define GL_MAX_SAMPLES_NV 0x8D57
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glRenderbufferStorageMultisampleNV GLEW_GET_FUN(__glewRenderbufferStorageMultisampleNV)
+
+#define GLEW_NV_framebuffer_multisample GLEW_GET_VAR(__GLEW_NV_framebuffer_multisample)
+
+#endif /* GL_NV_framebuffer_multisample */
+
+/* ----------------- GL_NV_framebuffer_multisample_coverage ---------------- */
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glRenderbufferStorageMultisampleCoverageNV GLEW_GET_FUN(__glewRenderbufferStorageMultisampleCoverageNV)
+
+#define GLEW_NV_framebuffer_multisample_coverage GLEW_GET_VAR(__GLEW_NV_framebuffer_multisample_coverage)
+
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+/* ----------------------- GL_NV_generate_mipmap_sRGB ---------------------- */
+
+#ifndef GL_NV_generate_mipmap_sRGB
+#define GL_NV_generate_mipmap_sRGB 1
+
+#define GLEW_NV_generate_mipmap_sRGB GLEW_GET_VAR(__GLEW_NV_generate_mipmap_sRGB)
+
+#endif /* GL_NV_generate_mipmap_sRGB */
+
+/* ------------------------ GL_NV_geometry_program4 ------------------------ */
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+
+#define GL_GEOMETRY_PROGRAM_NV 0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+
+typedef void (GLAPIENTRY * PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+
+#define glProgramVertexLimitNV GLEW_GET_FUN(__glewProgramVertexLimitNV)
+
+#define GLEW_NV_geometry_program4 GLEW_GET_VAR(__GLEW_NV_geometry_program4)
+
+#endif /* GL_NV_geometry_program4 */
+
+/* ------------------------- GL_NV_geometry_shader4 ------------------------ */
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+
+#define GLEW_NV_geometry_shader4 GLEW_GET_VAR(__GLEW_NV_geometry_shader4)
+
+#endif /* GL_NV_geometry_shader4 */
+
+/* ------------------- GL_NV_geometry_shader_passthrough ------------------- */
+
+#ifndef GL_NV_geometry_shader_passthrough
+#define GL_NV_geometry_shader_passthrough 1
+
+#define GLEW_NV_geometry_shader_passthrough GLEW_GET_VAR(__GLEW_NV_geometry_shader_passthrough)
+
+#endif /* GL_NV_geometry_shader_passthrough */
+
+/* -------------------------- GL_NV_gpu_multicast -------------------------- */
+
+#ifndef GL_NV_gpu_multicast
+#define GL_NV_gpu_multicast 1
+
+#define GL_PER_GPU_STORAGE_BIT_NV 0x0800
+#define GL_MULTICAST_GPUS_NV 0x92BA
+#define GL_PER_GPU_STORAGE_NV 0x9548
+#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
+#define GL_RENDER_GPU_MASK_NV 0x9558
+
+typedef void (GLAPIENTRY * PFNGLMULTICASTBARRIERNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (GLAPIENTRY * PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (GLAPIENTRY * PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask);
+typedef void (GLAPIENTRY * PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
+
+#define glMulticastBarrierNV GLEW_GET_FUN(__glewMulticastBarrierNV)
+#define glMulticastBlitFramebufferNV GLEW_GET_FUN(__glewMulticastBlitFramebufferNV)
+#define glMulticastBufferSubDataNV GLEW_GET_FUN(__glewMulticastBufferSubDataNV)
+#define glMulticastCopyBufferSubDataNV GLEW_GET_FUN(__glewMulticastCopyBufferSubDataNV)
+#define glMulticastCopyImageSubDataNV GLEW_GET_FUN(__glewMulticastCopyImageSubDataNV)
+#define glMulticastFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewMulticastFramebufferSampleLocationsfvNV)
+#define glMulticastGetQueryObjecti64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjecti64vNV)
+#define glMulticastGetQueryObjectivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectivNV)
+#define glMulticastGetQueryObjectui64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjectui64vNV)
+#define glMulticastGetQueryObjectuivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectuivNV)
+#define glMulticastWaitSyncNV GLEW_GET_FUN(__glewMulticastWaitSyncNV)
+#define glRenderGpuMaskNV GLEW_GET_FUN(__glewRenderGpuMaskNV)
+
+#define GLEW_NV_gpu_multicast GLEW_GET_VAR(__GLEW_NV_gpu_multicast)
+
+#endif /* GL_NV_gpu_multicast */
+
+/* --------------------------- GL_NV_gpu_program4 -------------------------- */
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+
+#define glProgramEnvParameterI4iNV GLEW_GET_FUN(__glewProgramEnvParameterI4iNV)
+#define glProgramEnvParameterI4ivNV GLEW_GET_FUN(__glewProgramEnvParameterI4ivNV)
+#define glProgramEnvParameterI4uiNV GLEW_GET_FUN(__glewProgramEnvParameterI4uiNV)
+#define glProgramEnvParameterI4uivNV GLEW_GET_FUN(__glewProgramEnvParameterI4uivNV)
+#define glProgramEnvParametersI4ivNV GLEW_GET_FUN(__glewProgramEnvParametersI4ivNV)
+#define glProgramEnvParametersI4uivNV GLEW_GET_FUN(__glewProgramEnvParametersI4uivNV)
+#define glProgramLocalParameterI4iNV GLEW_GET_FUN(__glewProgramLocalParameterI4iNV)
+#define glProgramLocalParameterI4ivNV GLEW_GET_FUN(__glewProgramLocalParameterI4ivNV)
+#define glProgramLocalParameterI4uiNV GLEW_GET_FUN(__glewProgramLocalParameterI4uiNV)
+#define glProgramLocalParameterI4uivNV GLEW_GET_FUN(__glewProgramLocalParameterI4uivNV)
+#define glProgramLocalParametersI4ivNV GLEW_GET_FUN(__glewProgramLocalParametersI4ivNV)
+#define glProgramLocalParametersI4uivNV GLEW_GET_FUN(__glewProgramLocalParametersI4uivNV)
+
+#define GLEW_NV_gpu_program4 GLEW_GET_VAR(__GLEW_NV_gpu_program4)
+
+#endif /* GL_NV_gpu_program4 */
+
+/* --------------------------- GL_NV_gpu_program5 -------------------------- */
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
+
+#define GLEW_NV_gpu_program5 GLEW_GET_VAR(__GLEW_NV_gpu_program5)
+
+#endif /* GL_NV_gpu_program5 */
+
+/* -------------------- GL_NV_gpu_program5_mem_extended -------------------- */
+
+#ifndef GL_NV_gpu_program5_mem_extended
+#define GL_NV_gpu_program5_mem_extended 1
+
+#define GLEW_NV_gpu_program5_mem_extended GLEW_GET_VAR(__GLEW_NV_gpu_program5_mem_extended)
+
+#endif /* GL_NV_gpu_program5_mem_extended */
+
+/* ------------------------- GL_NV_gpu_program_fp64 ------------------------ */
+
+#ifndef GL_NV_gpu_program_fp64
+#define GL_NV_gpu_program_fp64 1
+
+#define GLEW_NV_gpu_program_fp64 GLEW_GET_VAR(__GLEW_NV_gpu_program_fp64)
+
+#endif /* GL_NV_gpu_program_fp64 */
+
+/* --------------------------- GL_NV_gpu_shader5 --------------------------- */
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+
+#define GL_INT64_NV 0x140E
+#define GL_UNSIGNED_INT64_NV 0x140F
+#define GL_INT8_NV 0x8FE0
+#define GL_INT8_VEC2_NV 0x8FE1
+#define GL_INT8_VEC3_NV 0x8FE2
+#define GL_INT8_VEC4_NV 0x8FE3
+#define GL_INT16_NV 0x8FE4
+#define GL_INT16_VEC2_NV 0x8FE5
+#define GL_INT16_VEC3_NV 0x8FE6
+#define GL_INT16_VEC4_NV 0x8FE7
+#define GL_INT64_VEC2_NV 0x8FE9
+#define GL_INT64_VEC3_NV 0x8FEA
+#define GL_INT64_VEC4_NV 0x8FEB
+#define GL_UNSIGNED_INT8_NV 0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF
+#define GL_UNSIGNED_INT16_NV 0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7
+#define GL_FLOAT16_NV 0x8FF8
+#define GL_FLOAT16_VEC2_NV 0x8FF9
+#define GL_FLOAT16_VEC3_NV 0x8FFA
+#define GL_FLOAT16_VEC4_NV 0x8FFB
+
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
+
+#define glGetUniformi64vNV GLEW_GET_FUN(__glewGetUniformi64vNV)
+#define glGetUniformui64vNV GLEW_GET_FUN(__glewGetUniformui64vNV)
+#define glProgramUniform1i64NV GLEW_GET_FUN(__glewProgramUniform1i64NV)
+#define glProgramUniform1i64vNV GLEW_GET_FUN(__glewProgramUniform1i64vNV)
+#define glProgramUniform1ui64NV GLEW_GET_FUN(__glewProgramUniform1ui64NV)
+#define glProgramUniform1ui64vNV GLEW_GET_FUN(__glewProgramUniform1ui64vNV)
+#define glProgramUniform2i64NV GLEW_GET_FUN(__glewProgramUniform2i64NV)
+#define glProgramUniform2i64vNV GLEW_GET_FUN(__glewProgramUniform2i64vNV)
+#define glProgramUniform2ui64NV GLEW_GET_FUN(__glewProgramUniform2ui64NV)
+#define glProgramUniform2ui64vNV GLEW_GET_FUN(__glewProgramUniform2ui64vNV)
+#define glProgramUniform3i64NV GLEW_GET_FUN(__glewProgramUniform3i64NV)
+#define glProgramUniform3i64vNV GLEW_GET_FUN(__glewProgramUniform3i64vNV)
+#define glProgramUniform3ui64NV GLEW_GET_FUN(__glewProgramUniform3ui64NV)
+#define glProgramUniform3ui64vNV GLEW_GET_FUN(__glewProgramUniform3ui64vNV)
+#define glProgramUniform4i64NV GLEW_GET_FUN(__glewProgramUniform4i64NV)
+#define glProgramUniform4i64vNV GLEW_GET_FUN(__glewProgramUniform4i64vNV)
+#define glProgramUniform4ui64NV GLEW_GET_FUN(__glewProgramUniform4ui64NV)
+#define glProgramUniform4ui64vNV GLEW_GET_FUN(__glewProgramUniform4ui64vNV)
+#define glUniform1i64NV GLEW_GET_FUN(__glewUniform1i64NV)
+#define glUniform1i64vNV GLEW_GET_FUN(__glewUniform1i64vNV)
+#define glUniform1ui64NV GLEW_GET_FUN(__glewUniform1ui64NV)
+#define glUniform1ui64vNV GLEW_GET_FUN(__glewUniform1ui64vNV)
+#define glUniform2i64NV GLEW_GET_FUN(__glewUniform2i64NV)
+#define glUniform2i64vNV GLEW_GET_FUN(__glewUniform2i64vNV)
+#define glUniform2ui64NV GLEW_GET_FUN(__glewUniform2ui64NV)
+#define glUniform2ui64vNV GLEW_GET_FUN(__glewUniform2ui64vNV)
+#define glUniform3i64NV GLEW_GET_FUN(__glewUniform3i64NV)
+#define glUniform3i64vNV GLEW_GET_FUN(__glewUniform3i64vNV)
+#define glUniform3ui64NV GLEW_GET_FUN(__glewUniform3ui64NV)
+#define glUniform3ui64vNV GLEW_GET_FUN(__glewUniform3ui64vNV)
+#define glUniform4i64NV GLEW_GET_FUN(__glewUniform4i64NV)
+#define glUniform4i64vNV GLEW_GET_FUN(__glewUniform4i64vNV)
+#define glUniform4ui64NV GLEW_GET_FUN(__glewUniform4ui64NV)
+#define glUniform4ui64vNV GLEW_GET_FUN(__glewUniform4ui64vNV)
+
+#define GLEW_NV_gpu_shader5 GLEW_GET_VAR(__GLEW_NV_gpu_shader5)
+
+#endif /* GL_NV_gpu_shader5 */
+
+/* ---------------------------- GL_NV_half_float --------------------------- */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+
+#define GL_HALF_FLOAT_NV 0x140B
+
+typedef unsigned short GLhalf;
+
+typedef void (GLAPIENTRY * PFNGLCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
+typedef void (GLAPIENTRY * PFNGLCOLOR3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4HNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha);
+typedef void (GLAPIENTRY * PFNGLCOLOR4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDHNVPROC) (GLhalf fog);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDHVNVPROC) (const GLhalf* fog);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalf s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalf s, GLhalf t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLNORMAL3HNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz);
+typedef void (GLAPIENTRY * PFNGLNORMAL3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1HNVPROC) (GLhalf s);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2HNVPROC) (GLhalf s, GLhalf t);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3HNVPROC) (GLhalf s, GLhalf t, GLhalf r);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4HNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX2HNVPROC) (GLhalf x, GLhalf y);
+typedef void (GLAPIENTRY * PFNGLVERTEX2HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX3HNVPROC) (GLhalf x, GLhalf y, GLhalf z);
+typedef void (GLAPIENTRY * PFNGLVERTEX3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX4HNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w);
+typedef void (GLAPIENTRY * PFNGLVERTEX4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalf x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalf x, GLhalf y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHNVPROC) (GLhalf weight);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalf* weight);
+
+#define glColor3hNV GLEW_GET_FUN(__glewColor3hNV)
+#define glColor3hvNV GLEW_GET_FUN(__glewColor3hvNV)
+#define glColor4hNV GLEW_GET_FUN(__glewColor4hNV)
+#define glColor4hvNV GLEW_GET_FUN(__glewColor4hvNV)
+#define glFogCoordhNV GLEW_GET_FUN(__glewFogCoordhNV)
+#define glFogCoordhvNV GLEW_GET_FUN(__glewFogCoordhvNV)
+#define glMultiTexCoord1hNV GLEW_GET_FUN(__glewMultiTexCoord1hNV)
+#define glMultiTexCoord1hvNV GLEW_GET_FUN(__glewMultiTexCoord1hvNV)
+#define glMultiTexCoord2hNV GLEW_GET_FUN(__glewMultiTexCoord2hNV)
+#define glMultiTexCoord2hvNV GLEW_GET_FUN(__glewMultiTexCoord2hvNV)
+#define glMultiTexCoord3hNV GLEW_GET_FUN(__glewMultiTexCoord3hNV)
+#define glMultiTexCoord3hvNV GLEW_GET_FUN(__glewMultiTexCoord3hvNV)
+#define glMultiTexCoord4hNV GLEW_GET_FUN(__glewMultiTexCoord4hNV)
+#define glMultiTexCoord4hvNV GLEW_GET_FUN(__glewMultiTexCoord4hvNV)
+#define glNormal3hNV GLEW_GET_FUN(__glewNormal3hNV)
+#define glNormal3hvNV GLEW_GET_FUN(__glewNormal3hvNV)
+#define glSecondaryColor3hNV GLEW_GET_FUN(__glewSecondaryColor3hNV)
+#define glSecondaryColor3hvNV GLEW_GET_FUN(__glewSecondaryColor3hvNV)
+#define glTexCoord1hNV GLEW_GET_FUN(__glewTexCoord1hNV)
+#define glTexCoord1hvNV GLEW_GET_FUN(__glewTexCoord1hvNV)
+#define glTexCoord2hNV GLEW_GET_FUN(__glewTexCoord2hNV)
+#define glTexCoord2hvNV GLEW_GET_FUN(__glewTexCoord2hvNV)
+#define glTexCoord3hNV GLEW_GET_FUN(__glewTexCoord3hNV)
+#define glTexCoord3hvNV GLEW_GET_FUN(__glewTexCoord3hvNV)
+#define glTexCoord4hNV GLEW_GET_FUN(__glewTexCoord4hNV)
+#define glTexCoord4hvNV GLEW_GET_FUN(__glewTexCoord4hvNV)
+#define glVertex2hNV GLEW_GET_FUN(__glewVertex2hNV)
+#define glVertex2hvNV GLEW_GET_FUN(__glewVertex2hvNV)
+#define glVertex3hNV GLEW_GET_FUN(__glewVertex3hNV)
+#define glVertex3hvNV GLEW_GET_FUN(__glewVertex3hvNV)
+#define glVertex4hNV GLEW_GET_FUN(__glewVertex4hNV)
+#define glVertex4hvNV GLEW_GET_FUN(__glewVertex4hvNV)
+#define glVertexAttrib1hNV GLEW_GET_FUN(__glewVertexAttrib1hNV)
+#define glVertexAttrib1hvNV GLEW_GET_FUN(__glewVertexAttrib1hvNV)
+#define glVertexAttrib2hNV GLEW_GET_FUN(__glewVertexAttrib2hNV)
+#define glVertexAttrib2hvNV GLEW_GET_FUN(__glewVertexAttrib2hvNV)
+#define glVertexAttrib3hNV GLEW_GET_FUN(__glewVertexAttrib3hNV)
+#define glVertexAttrib3hvNV GLEW_GET_FUN(__glewVertexAttrib3hvNV)
+#define glVertexAttrib4hNV GLEW_GET_FUN(__glewVertexAttrib4hNV)
+#define glVertexAttrib4hvNV GLEW_GET_FUN(__glewVertexAttrib4hvNV)
+#define glVertexAttribs1hvNV GLEW_GET_FUN(__glewVertexAttribs1hvNV)
+#define glVertexAttribs2hvNV GLEW_GET_FUN(__glewVertexAttribs2hvNV)
+#define glVertexAttribs3hvNV GLEW_GET_FUN(__glewVertexAttribs3hvNV)
+#define glVertexAttribs4hvNV GLEW_GET_FUN(__glewVertexAttribs4hvNV)
+#define glVertexWeighthNV GLEW_GET_FUN(__glewVertexWeighthNV)
+#define glVertexWeighthvNV GLEW_GET_FUN(__glewVertexWeighthvNV)
+
+#define GLEW_NV_half_float GLEW_GET_VAR(__GLEW_NV_half_float)
+
+#endif /* GL_NV_half_float */
+
+/* -------------------------- GL_NV_image_formats -------------------------- */
+
+#ifndef GL_NV_image_formats
+#define GL_NV_image_formats 1
+
+#define GLEW_NV_image_formats GLEW_GET_VAR(__GLEW_NV_image_formats)
+
+#endif /* GL_NV_image_formats */
+
+/* ------------------------- GL_NV_instanced_arrays ------------------------ */
+
+#ifndef GL_NV_instanced_arrays
+#define GL_NV_instanced_arrays 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE
+
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORNVPROC) (GLuint index, GLuint divisor);
+
+#define glVertexAttribDivisorNV GLEW_GET_FUN(__glewVertexAttribDivisorNV)
+
+#define GLEW_NV_instanced_arrays GLEW_GET_VAR(__GLEW_NV_instanced_arrays)
+
+#endif /* GL_NV_instanced_arrays */
+
+/* ------------------- GL_NV_internalformat_sample_query ------------------- */
+
+#ifndef GL_NV_internalformat_sample_query
+#define GL_NV_internalformat_sample_query 1
+
+#define GL_MULTISAMPLES_NV 0x9371
+#define GL_SUPERSAMPLE_SCALE_X_NV 0x9372
+#define GL_SUPERSAMPLE_SCALE_Y_NV 0x9373
+#define GL_CONFORMANT_NV 0x9374
+
+typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint* params);
+
+#define glGetInternalformatSampleivNV GLEW_GET_FUN(__glewGetInternalformatSampleivNV)
+
+#define GLEW_NV_internalformat_sample_query GLEW_GET_VAR(__GLEW_NV_internalformat_sample_query)
+
+#endif /* GL_NV_internalformat_sample_query */
+
+/* ------------------------ GL_NV_light_max_exponent ----------------------- */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+
+#define GL_MAX_SHININESS_NV 0x8504
+#define GL_MAX_SPOT_EXPONENT_NV 0x8505
+
+#define GLEW_NV_light_max_exponent GLEW_GET_VAR(__GLEW_NV_light_max_exponent)
+
+#endif /* GL_NV_light_max_exponent */
+
+/* ----------------------- GL_NV_multisample_coverage ---------------------- */
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+
+#define GL_COLOR_SAMPLES_NV 0x8E20
+
+#define GLEW_NV_multisample_coverage GLEW_GET_VAR(__GLEW_NV_multisample_coverage)
+
+#endif /* GL_NV_multisample_coverage */
+
+/* --------------------- GL_NV_multisample_filter_hint --------------------- */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+
+#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534
+
+#define GLEW_NV_multisample_filter_hint GLEW_GET_VAR(__GLEW_NV_multisample_filter_hint)
+
+#endif /* GL_NV_multisample_filter_hint */
+
+/* ----------------------- GL_NV_non_square_matrices ----------------------- */
+
+#ifndef GL_NV_non_square_matrices
+#define GL_NV_non_square_matrices 1
+
+#define GL_FLOAT_MAT2x3_NV 0x8B65
+#define GL_FLOAT_MAT2x4_NV 0x8B66
+#define GL_FLOAT_MAT3x2_NV 0x8B67
+#define GL_FLOAT_MAT3x4_NV 0x8B68
+#define GL_FLOAT_MAT4x2_NV 0x8B69
+#define GL_FLOAT_MAT4x3_NV 0x8B6A
+
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVNVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+
+#define glUniformMatrix2x3fvNV GLEW_GET_FUN(__glewUniformMatrix2x3fvNV)
+#define glUniformMatrix2x4fvNV GLEW_GET_FUN(__glewUniformMatrix2x4fvNV)
+#define glUniformMatrix3x2fvNV GLEW_GET_FUN(__glewUniformMatrix3x2fvNV)
+#define glUniformMatrix3x4fvNV GLEW_GET_FUN(__glewUniformMatrix3x4fvNV)
+#define glUniformMatrix4x2fvNV GLEW_GET_FUN(__glewUniformMatrix4x2fvNV)
+#define glUniformMatrix4x3fvNV GLEW_GET_FUN(__glewUniformMatrix4x3fvNV)
+
+#define GLEW_NV_non_square_matrices GLEW_GET_VAR(__GLEW_NV_non_square_matrices)
+
+#endif /* GL_NV_non_square_matrices */
+
+/* ------------------------- GL_NV_occlusion_query ------------------------- */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+
+#define GL_PIXEL_COUNTER_BITS_NV 0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865
+#define GL_PIXEL_COUNT_NV 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867
+
+typedef void (GLAPIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+
+#define glBeginOcclusionQueryNV GLEW_GET_FUN(__glewBeginOcclusionQueryNV)
+#define glDeleteOcclusionQueriesNV GLEW_GET_FUN(__glewDeleteOcclusionQueriesNV)
+#define glEndOcclusionQueryNV GLEW_GET_FUN(__glewEndOcclusionQueryNV)
+#define glGenOcclusionQueriesNV GLEW_GET_FUN(__glewGenOcclusionQueriesNV)
+#define glGetOcclusionQueryivNV GLEW_GET_FUN(__glewGetOcclusionQueryivNV)
+#define glGetOcclusionQueryuivNV GLEW_GET_FUN(__glewGetOcclusionQueryuivNV)
+#define glIsOcclusionQueryNV GLEW_GET_FUN(__glewIsOcclusionQueryNV)
+
+#define GLEW_NV_occlusion_query GLEW_GET_VAR(__GLEW_NV_occlusion_query)
+
+#endif /* GL_NV_occlusion_query */
+
+/* -------------------------- GL_NV_pack_subimage -------------------------- */
+
+#ifndef GL_NV_pack_subimage
+#define GL_NV_pack_subimage 1
+
+#define GL_PACK_ROW_LENGTH_NV 0x0D02
+#define GL_PACK_SKIP_ROWS_NV 0x0D03
+#define GL_PACK_SKIP_PIXELS_NV 0x0D04
+
+#define GLEW_NV_pack_subimage GLEW_GET_VAR(__GLEW_NV_pack_subimage)
+
+#endif /* GL_NV_pack_subimage */
+
+/* ----------------------- GL_NV_packed_depth_stencil ---------------------- */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_NV 0x84F9
+#define GL_UNSIGNED_INT_24_8_NV 0x84FA
+
+#define GLEW_NV_packed_depth_stencil GLEW_GET_VAR(__GLEW_NV_packed_depth_stencil)
+
+#endif /* GL_NV_packed_depth_stencil */
+
+/* --------------------------- GL_NV_packed_float -------------------------- */
+
+#ifndef GL_NV_packed_float
+#define GL_NV_packed_float 1
+
+#define GL_R11F_G11F_B10F_NV 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_NV 0x8C3B
+
+#define GLEW_NV_packed_float GLEW_GET_VAR(__GLEW_NV_packed_float)
+
+#endif /* GL_NV_packed_float */
+
+/* ----------------------- GL_NV_packed_float_linear ----------------------- */
+
+#ifndef GL_NV_packed_float_linear
+#define GL_NV_packed_float_linear 1
+
+#define GL_R11F_G11F_B10F_NV 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_NV 0x8C3B
+
+#define GLEW_NV_packed_float_linear GLEW_GET_VAR(__GLEW_NV_packed_float_linear)
+
+#endif /* GL_NV_packed_float_linear */
+
+/* --------------------- GL_NV_parameter_buffer_object --------------------- */
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+
+typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+
+#define glProgramBufferParametersIivNV GLEW_GET_FUN(__glewProgramBufferParametersIivNV)
+#define glProgramBufferParametersIuivNV GLEW_GET_FUN(__glewProgramBufferParametersIuivNV)
+#define glProgramBufferParametersfvNV GLEW_GET_FUN(__glewProgramBufferParametersfvNV)
+
+#define GLEW_NV_parameter_buffer_object GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object)
+
+#endif /* GL_NV_parameter_buffer_object */
+
+/* --------------------- GL_NV_parameter_buffer_object2 -------------------- */
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+
+#define GLEW_NV_parameter_buffer_object2 GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object2)
+
+#endif /* GL_NV_parameter_buffer_object2 */
+
+/* -------------------------- GL_NV_path_rendering ------------------------- */
+
+#ifndef GL_NV_path_rendering
+#define GL_NV_path_rendering 1
+
+#define GL_CLOSE_PATH_NV 0x00
+#define GL_BOLD_BIT_NV 0x01
+#define GL_GLYPH_WIDTH_BIT_NV 0x01
+#define GL_GLYPH_HEIGHT_BIT_NV 0x02
+#define GL_ITALIC_BIT_NV 0x02
+#define GL_MOVE_TO_NV 0x02
+#define GL_RELATIVE_MOVE_TO_NV 0x03
+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
+#define GL_LINE_TO_NV 0x04
+#define GL_RELATIVE_LINE_TO_NV 0x05
+#define GL_HORIZONTAL_LINE_TO_NV 0x06
+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
+#define GL_VERTICAL_LINE_TO_NV 0x08
+#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09
+#define GL_QUADRATIC_CURVE_TO_NV 0x0A
+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
+#define GL_CUBIC_CURVE_TO_NV 0x0C
+#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D
+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E
+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
+#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10
+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
+#define GL_SMALL_CCW_ARC_TO_NV 0x12
+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13
+#define GL_SMALL_CW_ARC_TO_NV 0x14
+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15
+#define GL_LARGE_CCW_ARC_TO_NV 0x16
+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17
+#define GL_LARGE_CW_ARC_TO_NV 0x18
+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19
+#define GL_CONIC_CURVE_TO_NV 0x1A
+#define GL_RELATIVE_CONIC_CURVE_TO_NV 0x1B
+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
+#define GL_ROUNDED_RECT_NV 0xE8
+#define GL_RELATIVE_ROUNDED_RECT_NV 0xE9
+#define GL_ROUNDED_RECT2_NV 0xEA
+#define GL_RELATIVE_ROUNDED_RECT2_NV 0xEB
+#define GL_ROUNDED_RECT4_NV 0xEC
+#define GL_RELATIVE_ROUNDED_RECT4_NV 0xED
+#define GL_ROUNDED_RECT8_NV 0xEE
+#define GL_RELATIVE_ROUNDED_RECT8_NV 0xEF
+#define GL_RESTART_PATH_NV 0xF0
+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2
+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4
+#define GL_RECT_NV 0xF6
+#define GL_RELATIVE_RECT_NV 0xF7
+#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8
+#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA
+#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC
+#define GL_ARC_TO_NV 0xFE
+#define GL_RELATIVE_ARC_TO_NV 0xFF
+#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100
+#define GL_PRIMARY_COLOR_NV 0x852C
+#define GL_SECONDARY_COLOR_NV 0x852D
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PATH_FORMAT_SVG_NV 0x9070
+#define GL_PATH_FORMAT_PS_NV 0x9071
+#define GL_STANDARD_FONT_NAME_NV 0x9072
+#define GL_SYSTEM_FONT_NAME_NV 0x9073
+#define GL_FILE_NAME_NV 0x9074
+#define GL_PATH_STROKE_WIDTH_NV 0x9075
+#define GL_PATH_END_CAPS_NV 0x9076
+#define GL_PATH_INITIAL_END_CAP_NV 0x9077
+#define GL_PATH_TERMINAL_END_CAP_NV 0x9078
+#define GL_PATH_JOIN_STYLE_NV 0x9079
+#define GL_PATH_MITER_LIMIT_NV 0x907A
+#define GL_PATH_DASH_CAPS_NV 0x907B
+#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C
+#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D
+#define GL_PATH_DASH_OFFSET_NV 0x907E
+#define GL_PATH_CLIENT_LENGTH_NV 0x907F
+#define GL_PATH_FILL_MODE_NV 0x9080
+#define GL_PATH_FILL_MASK_NV 0x9081
+#define GL_PATH_FILL_COVER_MODE_NV 0x9082
+#define GL_PATH_STROKE_COVER_MODE_NV 0x9083
+#define GL_PATH_STROKE_MASK_NV 0x9084
+#define GL_PATH_STROKE_BOUND_NV 0x9086
+#define GL_COUNT_UP_NV 0x9088
+#define GL_COUNT_DOWN_NV 0x9089
+#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A
+#define GL_CONVEX_HULL_NV 0x908B
+#define GL_BOUNDING_BOX_NV 0x908D
+#define GL_TRANSLATE_X_NV 0x908E
+#define GL_TRANSLATE_Y_NV 0x908F
+#define GL_TRANSLATE_2D_NV 0x9090
+#define GL_TRANSLATE_3D_NV 0x9091
+#define GL_AFFINE_2D_NV 0x9092
+#define GL_AFFINE_3D_NV 0x9094
+#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096
+#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098
+#define GL_UTF8_NV 0x909A
+#define GL_UTF16_NV 0x909B
+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
+#define GL_PATH_COMMAND_COUNT_NV 0x909D
+#define GL_PATH_COORD_COUNT_NV 0x909E
+#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F
+#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0
+#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1
+#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2
+#define GL_SQUARE_NV 0x90A3
+#define GL_ROUND_NV 0x90A4
+#define GL_TRIANGULAR_NV 0x90A5
+#define GL_BEVEL_NV 0x90A6
+#define GL_MITER_REVERT_NV 0x90A7
+#define GL_MITER_TRUNCATE_NV 0x90A8
+#define GL_SKIP_MISSING_GLYPH_NV 0x90A9
+#define GL_USE_MISSING_GLYPH_NV 0x90AA
+#define GL_PATH_ERROR_POSITION_NV 0x90AB
+#define GL_PATH_FOG_GEN_MODE_NV 0x90AC
+#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD
+#define GL_ADJACENT_PAIRS_NV 0x90AE
+#define GL_FIRST_TO_REST_NV 0x90AF
+#define GL_PATH_GEN_MODE_NV 0x90B0
+#define GL_PATH_GEN_COEFF_NV 0x90B1
+#define GL_PATH_GEN_COLOR_FORMAT_NV 0x90B2
+#define GL_PATH_GEN_COMPONENTS_NV 0x90B3
+#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4
+#define GL_MOVE_TO_RESETS_NV 0x90B5
+#define GL_MOVE_TO_CONTINUES_NV 0x90B6
+#define GL_PATH_STENCIL_FUNC_NV 0x90B7
+#define GL_PATH_STENCIL_REF_NV 0x90B8
+#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9
+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
+#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF
+#define GL_FONT_GLYPHS_AVAILABLE_NV 0x9368
+#define GL_FONT_TARGET_UNAVAILABLE_NV 0x9369
+#define GL_FONT_UNAVAILABLE_NV 0x936A
+#define GL_FONT_UNINTELLIGIBLE_NV 0x936B
+#define GL_STANDARD_FONT_FORMAT_NV 0x936C
+#define GL_FRAGMENT_INPUT_NV 0x936D
+#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000
+#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000
+#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000
+#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000
+#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000
+#define GL_FONT_ASCENDER_BIT_NV 0x00200000
+#define GL_FONT_DESCENDER_BIT_NV 0x00400000
+#define GL_FONT_HEIGHT_BIT_NV 0x00800000
+#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000
+#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
+#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
+#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
+#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000
+#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
+typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (GLAPIENTRY * PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
+typedef GLuint (GLAPIENTRY * PFNGLGENPATHSNVPROC) (GLsizei range);
+typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint* value);
+typedef void (GLAPIENTRY * PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte* commands);
+typedef void (GLAPIENTRY * PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat* coords);
+typedef void (GLAPIENTRY * PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat* dashArray);
+typedef GLfloat (GLAPIENTRY * PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
+typedef void (GLAPIENTRY * PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat* metrics);
+typedef void (GLAPIENTRY * PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint* value);
+typedef void (GLAPIENTRY * PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint* value);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+typedef GLboolean (GLAPIENTRY * PFNGLISPATHNVPROC) (GLuint path);
+typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m);
+typedef void (GLAPIENTRY * PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs);
+typedef void (GLAPIENTRY * PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords);
+typedef void (GLAPIENTRY * PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (GLAPIENTRY * PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum zfunc);
+typedef void (GLAPIENTRY * PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat* dashArray);
+typedef void (GLAPIENTRY * PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+typedef void (GLAPIENTRY * PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (GLAPIENTRY * PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef GLenum (GLAPIENTRY * PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
+typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
+typedef void (GLAPIENTRY * PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
+typedef void (GLAPIENTRY * PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString);
+typedef void (GLAPIENTRY * PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords);
+typedef void (GLAPIENTRY * PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (GLAPIENTRY * PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat* coeffs);
+typedef GLboolean (GLAPIENTRY * PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat* coeffs);
+typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat* transformValues);
+typedef void (GLAPIENTRY * PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint paths[], const GLfloat weights[]);
+
+#define glCopyPathNV GLEW_GET_FUN(__glewCopyPathNV)
+#define glCoverFillPathInstancedNV GLEW_GET_FUN(__glewCoverFillPathInstancedNV)
+#define glCoverFillPathNV GLEW_GET_FUN(__glewCoverFillPathNV)
+#define glCoverStrokePathInstancedNV GLEW_GET_FUN(__glewCoverStrokePathInstancedNV)
+#define glCoverStrokePathNV GLEW_GET_FUN(__glewCoverStrokePathNV)
+#define glDeletePathsNV GLEW_GET_FUN(__glewDeletePathsNV)
+#define glGenPathsNV GLEW_GET_FUN(__glewGenPathsNV)
+#define glGetPathColorGenfvNV GLEW_GET_FUN(__glewGetPathColorGenfvNV)
+#define glGetPathColorGenivNV GLEW_GET_FUN(__glewGetPathColorGenivNV)
+#define glGetPathCommandsNV GLEW_GET_FUN(__glewGetPathCommandsNV)
+#define glGetPathCoordsNV GLEW_GET_FUN(__glewGetPathCoordsNV)
+#define glGetPathDashArrayNV GLEW_GET_FUN(__glewGetPathDashArrayNV)
+#define glGetPathLengthNV GLEW_GET_FUN(__glewGetPathLengthNV)
+#define glGetPathMetricRangeNV GLEW_GET_FUN(__glewGetPathMetricRangeNV)
+#define glGetPathMetricsNV GLEW_GET_FUN(__glewGetPathMetricsNV)
+#define glGetPathParameterfvNV GLEW_GET_FUN(__glewGetPathParameterfvNV)
+#define glGetPathParameterivNV GLEW_GET_FUN(__glewGetPathParameterivNV)
+#define glGetPathSpacingNV GLEW_GET_FUN(__glewGetPathSpacingNV)
+#define glGetPathTexGenfvNV GLEW_GET_FUN(__glewGetPathTexGenfvNV)
+#define glGetPathTexGenivNV GLEW_GET_FUN(__glewGetPathTexGenivNV)
+#define glGetProgramResourcefvNV GLEW_GET_FUN(__glewGetProgramResourcefvNV)
+#define glInterpolatePathsNV GLEW_GET_FUN(__glewInterpolatePathsNV)
+#define glIsPathNV GLEW_GET_FUN(__glewIsPathNV)
+#define glIsPointInFillPathNV GLEW_GET_FUN(__glewIsPointInFillPathNV)
+#define glIsPointInStrokePathNV GLEW_GET_FUN(__glewIsPointInStrokePathNV)
+#define glMatrixLoad3x2fNV GLEW_GET_FUN(__glewMatrixLoad3x2fNV)
+#define glMatrixLoad3x3fNV GLEW_GET_FUN(__glewMatrixLoad3x3fNV)
+#define glMatrixLoadTranspose3x3fNV GLEW_GET_FUN(__glewMatrixLoadTranspose3x3fNV)
+#define glMatrixMult3x2fNV GLEW_GET_FUN(__glewMatrixMult3x2fNV)
+#define glMatrixMult3x3fNV GLEW_GET_FUN(__glewMatrixMult3x3fNV)
+#define glMatrixMultTranspose3x3fNV GLEW_GET_FUN(__glewMatrixMultTranspose3x3fNV)
+#define glPathColorGenNV GLEW_GET_FUN(__glewPathColorGenNV)
+#define glPathCommandsNV GLEW_GET_FUN(__glewPathCommandsNV)
+#define glPathCoordsNV GLEW_GET_FUN(__glewPathCoordsNV)
+#define glPathCoverDepthFuncNV GLEW_GET_FUN(__glewPathCoverDepthFuncNV)
+#define glPathDashArrayNV GLEW_GET_FUN(__glewPathDashArrayNV)
+#define glPathFogGenNV GLEW_GET_FUN(__glewPathFogGenNV)
+#define glPathGlyphIndexArrayNV GLEW_GET_FUN(__glewPathGlyphIndexArrayNV)
+#define glPathGlyphIndexRangeNV GLEW_GET_FUN(__glewPathGlyphIndexRangeNV)
+#define glPathGlyphRangeNV GLEW_GET_FUN(__glewPathGlyphRangeNV)
+#define glPathGlyphsNV GLEW_GET_FUN(__glewPathGlyphsNV)
+#define glPathMemoryGlyphIndexArrayNV GLEW_GET_FUN(__glewPathMemoryGlyphIndexArrayNV)
+#define glPathParameterfNV GLEW_GET_FUN(__glewPathParameterfNV)
+#define glPathParameterfvNV GLEW_GET_FUN(__glewPathParameterfvNV)
+#define glPathParameteriNV GLEW_GET_FUN(__glewPathParameteriNV)
+#define glPathParameterivNV GLEW_GET_FUN(__glewPathParameterivNV)
+#define glPathStencilDepthOffsetNV GLEW_GET_FUN(__glewPathStencilDepthOffsetNV)
+#define glPathStencilFuncNV GLEW_GET_FUN(__glewPathStencilFuncNV)
+#define glPathStringNV GLEW_GET_FUN(__glewPathStringNV)
+#define glPathSubCommandsNV GLEW_GET_FUN(__glewPathSubCommandsNV)
+#define glPathSubCoordsNV GLEW_GET_FUN(__glewPathSubCoordsNV)
+#define glPathTexGenNV GLEW_GET_FUN(__glewPathTexGenNV)
+#define glPointAlongPathNV GLEW_GET_FUN(__glewPointAlongPathNV)
+#define glProgramPathFragmentInputGenNV GLEW_GET_FUN(__glewProgramPathFragmentInputGenNV)
+#define glStencilFillPathInstancedNV GLEW_GET_FUN(__glewStencilFillPathInstancedNV)
+#define glStencilFillPathNV GLEW_GET_FUN(__glewStencilFillPathNV)
+#define glStencilStrokePathInstancedNV GLEW_GET_FUN(__glewStencilStrokePathInstancedNV)
+#define glStencilStrokePathNV GLEW_GET_FUN(__glewStencilStrokePathNV)
+#define glStencilThenCoverFillPathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverFillPathInstancedNV)
+#define glStencilThenCoverFillPathNV GLEW_GET_FUN(__glewStencilThenCoverFillPathNV)
+#define glStencilThenCoverStrokePathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathInstancedNV)
+#define glStencilThenCoverStrokePathNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathNV)
+#define glTransformPathNV GLEW_GET_FUN(__glewTransformPathNV)
+#define glWeightPathsNV GLEW_GET_FUN(__glewWeightPathsNV)
+
+#define GLEW_NV_path_rendering GLEW_GET_VAR(__GLEW_NV_path_rendering)
+
+#endif /* GL_NV_path_rendering */
+
+/* -------------------- GL_NV_path_rendering_shared_edge ------------------- */
+
+#ifndef GL_NV_path_rendering_shared_edge
+#define GL_NV_path_rendering_shared_edge 1
+
+#define GL_SHARED_EDGE_NV 0xC0
+
+#define GLEW_NV_path_rendering_shared_edge GLEW_GET_VAR(__GLEW_NV_path_rendering_shared_edge)
+
+#endif /* GL_NV_path_rendering_shared_edge */
+
+/* ----------------------- GL_NV_pixel_buffer_object ----------------------- */
+
+#ifndef GL_NV_pixel_buffer_object
+#define GL_NV_pixel_buffer_object 1
+
+#define GL_PIXEL_PACK_BUFFER_NV 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_NV 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_NV 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_NV 0x88EF
+
+#define GLEW_NV_pixel_buffer_object GLEW_GET_VAR(__GLEW_NV_pixel_buffer_object)
+
+#endif /* GL_NV_pixel_buffer_object */
+
+/* ------------------------- GL_NV_pixel_data_range ------------------------ */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+
+#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+
+typedef void (GLAPIENTRY * PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, void *pointer);
+
+#define glFlushPixelDataRangeNV GLEW_GET_FUN(__glewFlushPixelDataRangeNV)
+#define glPixelDataRangeNV GLEW_GET_FUN(__glewPixelDataRangeNV)
+
+#define GLEW_NV_pixel_data_range GLEW_GET_VAR(__GLEW_NV_pixel_data_range)
+
+#endif /* GL_NV_pixel_data_range */
+
+/* ------------------------- GL_NV_platform_binary ------------------------- */
+
+#ifndef GL_NV_platform_binary
+#define GL_NV_platform_binary 1
+
+#define GL_NVIDIA_PLATFORM_BINARY_NV 0x890B
+
+#define GLEW_NV_platform_binary GLEW_GET_VAR(__GLEW_NV_platform_binary)
+
+#endif /* GL_NV_platform_binary */
+
+/* --------------------------- GL_NV_point_sprite -------------------------- */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+
+#define GL_POINT_SPRITE_NV 0x8861
+#define GL_COORD_REPLACE_NV 0x8862
+#define GL_POINT_SPRITE_R_MODE_NV 0x8863
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
+
+#define glPointParameteriNV GLEW_GET_FUN(__glewPointParameteriNV)
+#define glPointParameterivNV GLEW_GET_FUN(__glewPointParameterivNV)
+
+#define GLEW_NV_point_sprite GLEW_GET_VAR(__GLEW_NV_point_sprite)
+
+#endif /* GL_NV_point_sprite */
+
+/* --------------------------- GL_NV_polygon_mode -------------------------- */
+
+#ifndef GL_NV_polygon_mode
+#define GL_NV_polygon_mode 1
+
+#define GL_POLYGON_MODE_NV 0x0B40
+#define GL_POINT_NV 0x1B00
+#define GL_LINE_NV 0x1B01
+#define GL_FILL_NV 0x1B02
+#define GL_POLYGON_OFFSET_POINT_NV 0x2A01
+#define GL_POLYGON_OFFSET_LINE_NV 0x2A02
+
+typedef void (GLAPIENTRY * PFNGLPOLYGONMODENVPROC) (GLenum face, GLenum mode);
+
+#define glPolygonModeNV GLEW_GET_FUN(__glewPolygonModeNV)
+
+#define GLEW_NV_polygon_mode GLEW_GET_VAR(__GLEW_NV_polygon_mode)
+
+#endif /* GL_NV_polygon_mode */
+
+/* -------------------------- GL_NV_present_video -------------------------- */
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+
+#define GL_FRAME_NV 0x8E26
+#define GL_FIELDS_NV 0x8E27
+#define GL_CURRENT_TIME_NV 0x8E28
+#define GL_NUM_FILL_STREAMS_NV 0x8E29
+#define GL_PRESENT_TIME_NV 0x8E2A
+#define GL_PRESENT_DURATION_NV 0x8E2B
+
+typedef void (GLAPIENTRY * PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+
+#define glGetVideoi64vNV GLEW_GET_FUN(__glewGetVideoi64vNV)
+#define glGetVideoivNV GLEW_GET_FUN(__glewGetVideoivNV)
+#define glGetVideoui64vNV GLEW_GET_FUN(__glewGetVideoui64vNV)
+#define glGetVideouivNV GLEW_GET_FUN(__glewGetVideouivNV)
+#define glPresentFrameDualFillNV GLEW_GET_FUN(__glewPresentFrameDualFillNV)
+#define glPresentFrameKeyedNV GLEW_GET_FUN(__glewPresentFrameKeyedNV)
+
+#define GLEW_NV_present_video GLEW_GET_VAR(__GLEW_NV_present_video)
+
+#endif /* GL_NV_present_video */
+
+/* ------------------------ GL_NV_primitive_restart ------------------------ */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+
+#define GL_PRIMITIVE_RESTART_NV 0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559
+
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void);
+
+#define glPrimitiveRestartIndexNV GLEW_GET_FUN(__glewPrimitiveRestartIndexNV)
+#define glPrimitiveRestartNV GLEW_GET_FUN(__glewPrimitiveRestartNV)
+
+#define GLEW_NV_primitive_restart GLEW_GET_VAR(__GLEW_NV_primitive_restart)
+
+#endif /* GL_NV_primitive_restart */
+
+/* ---------------------------- GL_NV_read_depth --------------------------- */
+
+#ifndef GL_NV_read_depth
+#define GL_NV_read_depth 1
+
+#define GLEW_NV_read_depth GLEW_GET_VAR(__GLEW_NV_read_depth)
+
+#endif /* GL_NV_read_depth */
+
+/* ------------------------ GL_NV_read_depth_stencil ----------------------- */
+
+#ifndef GL_NV_read_depth_stencil
+#define GL_NV_read_depth_stencil 1
+
+#define GLEW_NV_read_depth_stencil GLEW_GET_VAR(__GLEW_NV_read_depth_stencil)
+
+#endif /* GL_NV_read_depth_stencil */
+
+/* --------------------------- GL_NV_read_stencil -------------------------- */
+
+#ifndef GL_NV_read_stencil
+#define GL_NV_read_stencil 1
+
+#define GLEW_NV_read_stencil GLEW_GET_VAR(__GLEW_NV_read_stencil)
+
+#endif /* GL_NV_read_stencil */
+
+/* ------------------------ GL_NV_register_combiners ----------------------- */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+
+#define GL_REGISTER_COMBINERS_NV 0x8522
+#define GL_VARIABLE_A_NV 0x8523
+#define GL_VARIABLE_B_NV 0x8524
+#define GL_VARIABLE_C_NV 0x8525
+#define GL_VARIABLE_D_NV 0x8526
+#define GL_VARIABLE_E_NV 0x8527
+#define GL_VARIABLE_F_NV 0x8528
+#define GL_VARIABLE_G_NV 0x8529
+#define GL_CONSTANT_COLOR0_NV 0x852A
+#define GL_CONSTANT_COLOR1_NV 0x852B
+#define GL_PRIMARY_COLOR_NV 0x852C
+#define GL_SECONDARY_COLOR_NV 0x852D
+#define GL_SPARE0_NV 0x852E
+#define GL_SPARE1_NV 0x852F
+#define GL_DISCARD_NV 0x8530
+#define GL_E_TIMES_F_NV 0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV 0x8536
+#define GL_UNSIGNED_INVERT_NV 0x8537
+#define GL_EXPAND_NORMAL_NV 0x8538
+#define GL_EXPAND_NEGATE_NV 0x8539
+#define GL_HALF_BIAS_NORMAL_NV 0x853A
+#define GL_HALF_BIAS_NEGATE_NV 0x853B
+#define GL_SIGNED_IDENTITY_NV 0x853C
+#define GL_SIGNED_NEGATE_NV 0x853D
+#define GL_SCALE_BY_TWO_NV 0x853E
+#define GL_SCALE_BY_FOUR_NV 0x853F
+#define GL_SCALE_BY_ONE_HALF_NV 0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541
+#define GL_COMBINER_INPUT_NV 0x8542
+#define GL_COMBINER_MAPPING_NV 0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546
+#define GL_COMBINER_MUX_SUM_NV 0x8547
+#define GL_COMBINER_SCALE_NV 0x8548
+#define GL_COMBINER_BIAS_NV 0x8549
+#define GL_COMBINER_AB_OUTPUT_NV 0x854A
+#define GL_COMBINER_CD_OUTPUT_NV 0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV 0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV 0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV 0x854E
+#define GL_COLOR_SUM_CLAMP_NV 0x854F
+#define GL_COMBINER0_NV 0x8550
+#define GL_COMBINER1_NV 0x8551
+#define GL_COMBINER2_NV 0x8552
+#define GL_COMBINER3_NV 0x8553
+#define GL_COMBINER4_NV 0x8554
+#define GL_COMBINER5_NV 0x8555
+#define GL_COMBINER6_NV 0x8556
+#define GL_COMBINER7_NV 0x8557
+
+typedef void (GLAPIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (GLAPIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint* params);
+
+#define glCombinerInputNV GLEW_GET_FUN(__glewCombinerInputNV)
+#define glCombinerOutputNV GLEW_GET_FUN(__glewCombinerOutputNV)
+#define glCombinerParameterfNV GLEW_GET_FUN(__glewCombinerParameterfNV)
+#define glCombinerParameterfvNV GLEW_GET_FUN(__glewCombinerParameterfvNV)
+#define glCombinerParameteriNV GLEW_GET_FUN(__glewCombinerParameteriNV)
+#define glCombinerParameterivNV GLEW_GET_FUN(__glewCombinerParameterivNV)
+#define glFinalCombinerInputNV GLEW_GET_FUN(__glewFinalCombinerInputNV)
+#define glGetCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetCombinerInputParameterfvNV)
+#define glGetCombinerInputParameterivNV GLEW_GET_FUN(__glewGetCombinerInputParameterivNV)
+#define glGetCombinerOutputParameterfvNV GLEW_GET_FUN(__glewGetCombinerOutputParameterfvNV)
+#define glGetCombinerOutputParameterivNV GLEW_GET_FUN(__glewGetCombinerOutputParameterivNV)
+#define glGetFinalCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterfvNV)
+#define glGetFinalCombinerInputParameterivNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterivNV)
+
+#define GLEW_NV_register_combiners GLEW_GET_VAR(__GLEW_NV_register_combiners)
+
+#endif /* GL_NV_register_combiners */
+
+/* ----------------------- GL_NV_register_combiners2 ----------------------- */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+
+#define GL_PER_STAGE_CONSTANTS_NV 0x8535
+
+typedef void (GLAPIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat* params);
+
+#define glCombinerStageParameterfvNV GLEW_GET_FUN(__glewCombinerStageParameterfvNV)
+#define glGetCombinerStageParameterfvNV GLEW_GET_FUN(__glewGetCombinerStageParameterfvNV)
+
+#define GLEW_NV_register_combiners2 GLEW_GET_VAR(__GLEW_NV_register_combiners2)
+
+#endif /* GL_NV_register_combiners2 */
+
+/* ------------------ GL_NV_robustness_video_memory_purge ------------------ */
+
+#ifndef GL_NV_robustness_video_memory_purge
+#define GL_NV_robustness_video_memory_purge 1
+
+#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C
+#define GL_PURGED_CONTEXT_RESET_NV 0x92BB
+
+#define GLEW_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_NV_robustness_video_memory_purge)
+
+#endif /* GL_NV_robustness_video_memory_purge */
+
+/* --------------------------- GL_NV_sRGB_formats -------------------------- */
+
+#ifndef GL_NV_sRGB_formats
+#define GL_NV_sRGB_formats 1
+
+#define GL_ETC1_SRGB8_NV 0x88EE
+#define GL_SRGB8_NV 0x8C41
+#define GL_SLUMINANCE_ALPHA_NV 0x8C44
+#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45
+#define GL_SLUMINANCE_NV 0x8C46
+#define GL_SLUMINANCE8_NV 0x8C47
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F
+
+#define GLEW_NV_sRGB_formats GLEW_GET_VAR(__GLEW_NV_sRGB_formats)
+
+#endif /* GL_NV_sRGB_formats */
+
+/* ------------------------- GL_NV_sample_locations ------------------------ */
+
+#ifndef GL_NV_sample_locations
+#define GL_NV_sample_locations 1
+
+#define GL_SAMPLE_LOCATION_NV 0x8E50
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v);
+
+#define glFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewFramebufferSampleLocationsfvNV)
+#define glNamedFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvNV)
+
+#define GLEW_NV_sample_locations GLEW_GET_VAR(__GLEW_NV_sample_locations)
+
+#endif /* GL_NV_sample_locations */
+
+/* ------------------ GL_NV_sample_mask_override_coverage ------------------ */
+
+#ifndef GL_NV_sample_mask_override_coverage
+#define GL_NV_sample_mask_override_coverage 1
+
+#define GLEW_NV_sample_mask_override_coverage GLEW_GET_VAR(__GLEW_NV_sample_mask_override_coverage)
+
+#endif /* GL_NV_sample_mask_override_coverage */
+
+/* ---------------------- GL_NV_shader_atomic_counters --------------------- */
+
+#ifndef GL_NV_shader_atomic_counters
+#define GL_NV_shader_atomic_counters 1
+
+#define GLEW_NV_shader_atomic_counters GLEW_GET_VAR(__GLEW_NV_shader_atomic_counters)
+
+#endif /* GL_NV_shader_atomic_counters */
+
+/* ----------------------- GL_NV_shader_atomic_float ----------------------- */
+
+#ifndef GL_NV_shader_atomic_float
+#define GL_NV_shader_atomic_float 1
+
+#define GLEW_NV_shader_atomic_float GLEW_GET_VAR(__GLEW_NV_shader_atomic_float)
+
+#endif /* GL_NV_shader_atomic_float */
+
+/* ---------------------- GL_NV_shader_atomic_float64 ---------------------- */
+
+#ifndef GL_NV_shader_atomic_float64
+#define GL_NV_shader_atomic_float64 1
+
+#define GLEW_NV_shader_atomic_float64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_float64)
+
+#endif /* GL_NV_shader_atomic_float64 */
+
+/* -------------------- GL_NV_shader_atomic_fp16_vector -------------------- */
+
+#ifndef GL_NV_shader_atomic_fp16_vector
+#define GL_NV_shader_atomic_fp16_vector 1
+
+#define GLEW_NV_shader_atomic_fp16_vector GLEW_GET_VAR(__GLEW_NV_shader_atomic_fp16_vector)
+
+#endif /* GL_NV_shader_atomic_fp16_vector */
+
+/* ----------------------- GL_NV_shader_atomic_int64 ----------------------- */
+
+#ifndef GL_NV_shader_atomic_int64
+#define GL_NV_shader_atomic_int64 1
+
+#define GLEW_NV_shader_atomic_int64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_int64)
+
+#endif /* GL_NV_shader_atomic_int64 */
+
+/* ------------------------ GL_NV_shader_buffer_load ----------------------- */
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+
+#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D
+#define GL_GPU_ADDRESS_NV 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35
+
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT* result);
+typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
+
+#define glGetBufferParameterui64vNV GLEW_GET_FUN(__glewGetBufferParameterui64vNV)
+#define glGetIntegerui64vNV GLEW_GET_FUN(__glewGetIntegerui64vNV)
+#define glGetNamedBufferParameterui64vNV GLEW_GET_FUN(__glewGetNamedBufferParameterui64vNV)
+#define glIsBufferResidentNV GLEW_GET_FUN(__glewIsBufferResidentNV)
+#define glIsNamedBufferResidentNV GLEW_GET_FUN(__glewIsNamedBufferResidentNV)
+#define glMakeBufferNonResidentNV GLEW_GET_FUN(__glewMakeBufferNonResidentNV)
+#define glMakeBufferResidentNV GLEW_GET_FUN(__glewMakeBufferResidentNV)
+#define glMakeNamedBufferNonResidentNV GLEW_GET_FUN(__glewMakeNamedBufferNonResidentNV)
+#define glMakeNamedBufferResidentNV GLEW_GET_FUN(__glewMakeNamedBufferResidentNV)
+#define glProgramUniformui64NV GLEW_GET_FUN(__glewProgramUniformui64NV)
+#define glProgramUniformui64vNV GLEW_GET_FUN(__glewProgramUniformui64vNV)
+#define glUniformui64NV GLEW_GET_FUN(__glewUniformui64NV)
+#define glUniformui64vNV GLEW_GET_FUN(__glewUniformui64vNV)
+
+#define GLEW_NV_shader_buffer_load GLEW_GET_VAR(__GLEW_NV_shader_buffer_load)
+
+#endif /* GL_NV_shader_buffer_load */
+
+/* ---------------- GL_NV_shader_noperspective_interpolation --------------- */
+
+#ifndef GL_NV_shader_noperspective_interpolation
+#define GL_NV_shader_noperspective_interpolation 1
+
+#define GLEW_NV_shader_noperspective_interpolation GLEW_GET_VAR(__GLEW_NV_shader_noperspective_interpolation)
+
+#endif /* GL_NV_shader_noperspective_interpolation */
+
+/* ------------------- GL_NV_shader_storage_buffer_object ------------------ */
+
+#ifndef GL_NV_shader_storage_buffer_object
+#define GL_NV_shader_storage_buffer_object 1
+
+#define GLEW_NV_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_NV_shader_storage_buffer_object)
+
+#endif /* GL_NV_shader_storage_buffer_object */
+
+/* ----------------------- GL_NV_shader_thread_group ----------------------- */
+
+#ifndef GL_NV_shader_thread_group
+#define GL_NV_shader_thread_group 1
+
+#define GL_WARP_SIZE_NV 0x9339
+#define GL_WARPS_PER_SM_NV 0x933A
+#define GL_SM_COUNT_NV 0x933B
+
+#define GLEW_NV_shader_thread_group GLEW_GET_VAR(__GLEW_NV_shader_thread_group)
+
+#endif /* GL_NV_shader_thread_group */
+
+/* ---------------------- GL_NV_shader_thread_shuffle ---------------------- */
+
+#ifndef GL_NV_shader_thread_shuffle
+#define GL_NV_shader_thread_shuffle 1
+
+#define GLEW_NV_shader_thread_shuffle GLEW_GET_VAR(__GLEW_NV_shader_thread_shuffle)
+
+#endif /* GL_NV_shader_thread_shuffle */
+
+/* ---------------------- GL_NV_shadow_samplers_array ---------------------- */
+
+#ifndef GL_NV_shadow_samplers_array
+#define GL_NV_shadow_samplers_array 1
+
+#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4
+
+#define GLEW_NV_shadow_samplers_array GLEW_GET_VAR(__GLEW_NV_shadow_samplers_array)
+
+#endif /* GL_NV_shadow_samplers_array */
+
+/* ----------------------- GL_NV_shadow_samplers_cube ---------------------- */
+
+#ifndef GL_NV_shadow_samplers_cube
+#define GL_NV_shadow_samplers_cube 1
+
+#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5
+
+#define GLEW_NV_shadow_samplers_cube GLEW_GET_VAR(__GLEW_NV_shadow_samplers_cube)
+
+#endif /* GL_NV_shadow_samplers_cube */
+
+/* ---------------------- GL_NV_stereo_view_rendering ---------------------- */
+
+#ifndef GL_NV_stereo_view_rendering
+#define GL_NV_stereo_view_rendering 1
+
+#define GLEW_NV_stereo_view_rendering GLEW_GET_VAR(__GLEW_NV_stereo_view_rendering)
+
+#endif /* GL_NV_stereo_view_rendering */
+
+/* ---------------------- GL_NV_tessellation_program5 ---------------------- */
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV 0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+
+#define GLEW_NV_tessellation_program5 GLEW_GET_VAR(__GLEW_NV_tessellation_program5)
+
+#endif /* GL_NV_tessellation_program5 */
+
+/* -------------------------- GL_NV_texgen_emboss -------------------------- */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+
+#define GL_EMBOSS_LIGHT_NV 0x855D
+#define GL_EMBOSS_CONSTANT_NV 0x855E
+#define GL_EMBOSS_MAP_NV 0x855F
+
+#define GLEW_NV_texgen_emboss GLEW_GET_VAR(__GLEW_NV_texgen_emboss)
+
+#endif /* GL_NV_texgen_emboss */
+
+/* ------------------------ GL_NV_texgen_reflection ------------------------ */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+
+#define GL_NORMAL_MAP_NV 0x8511
+#define GL_REFLECTION_MAP_NV 0x8512
+
+#define GLEW_NV_texgen_reflection GLEW_GET_VAR(__GLEW_NV_texgen_reflection)
+
+#endif /* GL_NV_texgen_reflection */
+
+/* -------------------------- GL_NV_texture_array -------------------------- */
+
+#ifndef GL_NV_texture_array
+#define GL_NV_texture_array 1
+
+#define GL_UNPACK_SKIP_IMAGES_NV 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_NV 0x806E
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_NV 0x88FF
+#define GL_TEXTURE_2D_ARRAY_NV 0x8C1A
+#define GL_TEXTURE_BINDING_2D_ARRAY_NV 0x8C1D
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_NV 0x8CD4
+#define GL_SAMPLER_2D_ARRAY_NV 0x8DC1
+
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DNVPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DNVPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DNVPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERNVPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DNVPROC) (GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DNVPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+
+#define glCompressedTexImage3DNV GLEW_GET_FUN(__glewCompressedTexImage3DNV)
+#define glCompressedTexSubImage3DNV GLEW_GET_FUN(__glewCompressedTexSubImage3DNV)
+#define glCopyTexSubImage3DNV GLEW_GET_FUN(__glewCopyTexSubImage3DNV)
+#define glFramebufferTextureLayerNV GLEW_GET_FUN(__glewFramebufferTextureLayerNV)
+#define glTexImage3DNV GLEW_GET_FUN(__glewTexImage3DNV)
+#define glTexSubImage3DNV GLEW_GET_FUN(__glewTexSubImage3DNV)
+
+#define GLEW_NV_texture_array GLEW_GET_VAR(__GLEW_NV_texture_array)
+
+#endif /* GL_NV_texture_array */
+
+/* ------------------------- GL_NV_texture_barrier ------------------------- */
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERNVPROC) (void);
+
+#define glTextureBarrierNV GLEW_GET_FUN(__glewTextureBarrierNV)
+
+#define GLEW_NV_texture_barrier GLEW_GET_VAR(__GLEW_NV_texture_barrier)
+
+#endif /* GL_NV_texture_barrier */
+
+/* ----------------------- GL_NV_texture_border_clamp ---------------------- */
+
+#ifndef GL_NV_texture_border_clamp
+#define GL_NV_texture_border_clamp 1
+
+#define GL_TEXTURE_BORDER_COLOR_NV 0x1004
+#define GL_CLAMP_TO_BORDER_NV 0x812D
+
+#define GLEW_NV_texture_border_clamp GLEW_GET_VAR(__GLEW_NV_texture_border_clamp)
+
+#endif /* GL_NV_texture_border_clamp */
+
+/* --------------------- GL_NV_texture_compression_latc -------------------- */
+
+#ifndef GL_NV_texture_compression_latc
+#define GL_NV_texture_compression_latc 1
+
+#define GL_COMPRESSED_LUMINANCE_LATC1_NV 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_NV 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_NV 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_NV 0x8C73
+
+#define GLEW_NV_texture_compression_latc GLEW_GET_VAR(__GLEW_NV_texture_compression_latc)
+
+#endif /* GL_NV_texture_compression_latc */
+
+/* --------------------- GL_NV_texture_compression_s3tc -------------------- */
+
+#ifndef GL_NV_texture_compression_s3tc
+#define GL_NV_texture_compression_s3tc 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_NV 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_NV 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_NV 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_NV 0x83F3
+
+#define GLEW_NV_texture_compression_s3tc GLEW_GET_VAR(__GLEW_NV_texture_compression_s3tc)
+
+#endif /* GL_NV_texture_compression_s3tc */
+
+/* ----------------- GL_NV_texture_compression_s3tc_update ----------------- */
+
+#ifndef GL_NV_texture_compression_s3tc_update
+#define GL_NV_texture_compression_s3tc_update 1
+
+#define GLEW_NV_texture_compression_s3tc_update GLEW_GET_VAR(__GLEW_NV_texture_compression_s3tc_update)
+
+#endif /* GL_NV_texture_compression_s3tc_update */
+
+/* --------------------- GL_NV_texture_compression_vtc --------------------- */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+
+#define GLEW_NV_texture_compression_vtc GLEW_GET_VAR(__GLEW_NV_texture_compression_vtc)
+
+#endif /* GL_NV_texture_compression_vtc */
+
+/* ----------------------- GL_NV_texture_env_combine4 ---------------------- */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+
+#define GL_COMBINE4_NV 0x8503
+#define GL_SOURCE3_RGB_NV 0x8583
+#define GL_SOURCE3_ALPHA_NV 0x858B
+#define GL_OPERAND3_RGB_NV 0x8593
+#define GL_OPERAND3_ALPHA_NV 0x859B
+
+#define GLEW_NV_texture_env_combine4 GLEW_GET_VAR(__GLEW_NV_texture_env_combine4)
+
+#endif /* GL_NV_texture_env_combine4 */
+
+/* ---------------------- GL_NV_texture_expand_normal ---------------------- */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+
+#define GLEW_NV_texture_expand_normal GLEW_GET_VAR(__GLEW_NV_texture_expand_normal)
+
+#endif /* GL_NV_texture_expand_normal */
+
+/* ----------------------- GL_NV_texture_multisample ----------------------- */
+
+#ifndef GL_NV_texture_multisample
+#define GL_NV_texture_multisample 1
+
+#define GL_TEXTURE_COVERAGE_SAMPLES_NV 0x9045
+#define GL_TEXTURE_COLOR_SAMPLES_NV 0x9046
+
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+
+#define glTexImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage2DMultisampleCoverageNV)
+#define glTexImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage3DMultisampleCoverageNV)
+#define glTextureImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage2DMultisampleCoverageNV)
+#define glTextureImage2DMultisampleNV GLEW_GET_FUN(__glewTextureImage2DMultisampleNV)
+#define glTextureImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage3DMultisampleCoverageNV)
+#define glTextureImage3DMultisampleNV GLEW_GET_FUN(__glewTextureImage3DMultisampleNV)
+
+#define GLEW_NV_texture_multisample GLEW_GET_VAR(__GLEW_NV_texture_multisample)
+
+#endif /* GL_NV_texture_multisample */
+
+/* ---------------------- GL_NV_texture_npot_2D_mipmap --------------------- */
+
+#ifndef GL_NV_texture_npot_2D_mipmap
+#define GL_NV_texture_npot_2D_mipmap 1
+
+#define GLEW_NV_texture_npot_2D_mipmap GLEW_GET_VAR(__GLEW_NV_texture_npot_2D_mipmap)
+
+#endif /* GL_NV_texture_npot_2D_mipmap */
+
+/* ------------------------ GL_NV_texture_rectangle ------------------------ */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_NV 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8
+
+#define GLEW_NV_texture_rectangle GLEW_GET_VAR(__GLEW_NV_texture_rectangle)
+
+#endif /* GL_NV_texture_rectangle */
+
+/* ------------------- GL_NV_texture_rectangle_compressed ------------------ */
+
+#ifndef GL_NV_texture_rectangle_compressed
+#define GL_NV_texture_rectangle_compressed 1
+
+#define GLEW_NV_texture_rectangle_compressed GLEW_GET_VAR(__GLEW_NV_texture_rectangle_compressed)
+
+#endif /* GL_NV_texture_rectangle_compressed */
+
+/* -------------------------- GL_NV_texture_shader ------------------------- */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
+#define GL_SHADER_CONSISTENT_NV 0x86DD
+#define GL_TEXTURE_SHADER_NV 0x86DE
+#define GL_SHADER_OPERATION_NV 0x86DF
+#define GL_CULL_MODES_NV 0x86E0
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1
+#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2
+#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3
+#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4
+#define GL_CONST_EYE_NV 0x86E5
+#define GL_PASS_THROUGH_NV 0x86E6
+#define GL_CULL_FRAGMENT_NV 0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV 0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA
+#define GL_DOT_PRODUCT_NV 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV 0x86F4
+#define GL_DSDT_NV 0x86F5
+#define GL_DSDT_MAG_NV 0x86F6
+#define GL_DSDT_MAG_VIB_NV 0x86F7
+#define GL_HILO16_NV 0x86F8
+#define GL_SIGNED_HILO_NV 0x86F9
+#define GL_SIGNED_HILO16_NV 0x86FA
+#define GL_SIGNED_RGBA_NV 0x86FB
+#define GL_SIGNED_RGBA8_NV 0x86FC
+#define GL_SIGNED_RGB_NV 0x86FE
+#define GL_SIGNED_RGB8_NV 0x86FF
+#define GL_SIGNED_LUMINANCE_NV 0x8701
+#define GL_SIGNED_LUMINANCE8_NV 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
+#define GL_SIGNED_ALPHA_NV 0x8705
+#define GL_SIGNED_ALPHA8_NV 0x8706
+#define GL_SIGNED_INTENSITY_NV 0x8707
+#define GL_SIGNED_INTENSITY8_NV 0x8708
+#define GL_DSDT8_NV 0x8709
+#define GL_DSDT8_MAG8_NV 0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV 0x870E
+#define GL_LO_SCALE_NV 0x870F
+#define GL_DS_SCALE_NV 0x8710
+#define GL_DT_SCALE_NV 0x8711
+#define GL_MAGNITUDE_SCALE_NV 0x8712
+#define GL_VIBRANCE_SCALE_NV 0x8713
+#define GL_HI_BIAS_NV 0x8714
+#define GL_LO_BIAS_NV 0x8715
+#define GL_DS_BIAS_NV 0x8716
+#define GL_DT_BIAS_NV 0x8717
+#define GL_MAGNITUDE_BIAS_NV 0x8718
+#define GL_VIBRANCE_BIAS_NV 0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV 0x871A
+#define GL_TEXTURE_HI_SIZE_NV 0x871B
+#define GL_TEXTURE_LO_SIZE_NV 0x871C
+#define GL_TEXTURE_DS_SIZE_NV 0x871D
+#define GL_TEXTURE_DT_SIZE_NV 0x871E
+#define GL_TEXTURE_MAG_SIZE_NV 0x871F
+
+#define GLEW_NV_texture_shader GLEW_GET_VAR(__GLEW_NV_texture_shader)
+
+#endif /* GL_NV_texture_shader */
+
+/* ------------------------- GL_NV_texture_shader2 ------------------------- */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF
+#define GL_HILO_NV 0x86F4
+#define GL_DSDT_NV 0x86F5
+#define GL_DSDT_MAG_NV 0x86F6
+#define GL_DSDT_MAG_VIB_NV 0x86F7
+#define GL_HILO16_NV 0x86F8
+#define GL_SIGNED_HILO_NV 0x86F9
+#define GL_SIGNED_HILO16_NV 0x86FA
+#define GL_SIGNED_RGBA_NV 0x86FB
+#define GL_SIGNED_RGBA8_NV 0x86FC
+#define GL_SIGNED_RGB_NV 0x86FE
+#define GL_SIGNED_RGB8_NV 0x86FF
+#define GL_SIGNED_LUMINANCE_NV 0x8701
+#define GL_SIGNED_LUMINANCE8_NV 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
+#define GL_SIGNED_ALPHA_NV 0x8705
+#define GL_SIGNED_ALPHA8_NV 0x8706
+#define GL_SIGNED_INTENSITY_NV 0x8707
+#define GL_SIGNED_INTENSITY8_NV 0x8708
+#define GL_DSDT8_NV 0x8709
+#define GL_DSDT8_MAG8_NV 0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+
+#define GLEW_NV_texture_shader2 GLEW_GET_VAR(__GLEW_NV_texture_shader2)
+
+#endif /* GL_NV_texture_shader2 */
+
+/* ------------------------- GL_NV_texture_shader3 ------------------------- */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV 0x885E
+#define GL_SIGNED_HILO8_NV 0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV 0x8860
+
+#define GLEW_NV_texture_shader3 GLEW_GET_VAR(__GLEW_NV_texture_shader3)
+
+#endif /* GL_NV_texture_shader3 */
+
+/* ------------------------ GL_NV_transform_feedback ----------------------- */
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+
+#define GL_BACK_PRIMARY_COLOR_NV 0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV 0x8C78
+#define GL_TEXTURE_COORD_NV 0x8C79
+#define GL_CLIP_DISTANCE_NV 0x8C7A
+#define GL_VERTEX_ID_NV 0x8C7B
+#define GL_PRIMITIVE_ID_NV 0x8C7C
+#define GL_GENERIC_ATTRIB_NV 0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV 0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86
+#define GL_PRIMITIVES_GENERATED_NV 0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV 0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV 0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+
+typedef void (GLAPIENTRY * PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef GLint (GLAPIENTRY * PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+
+#define glActiveVaryingNV GLEW_GET_FUN(__glewActiveVaryingNV)
+#define glBeginTransformFeedbackNV GLEW_GET_FUN(__glewBeginTransformFeedbackNV)
+#define glBindBufferBaseNV GLEW_GET_FUN(__glewBindBufferBaseNV)
+#define glBindBufferOffsetNV GLEW_GET_FUN(__glewBindBufferOffsetNV)
+#define glBindBufferRangeNV GLEW_GET_FUN(__glewBindBufferRangeNV)
+#define glEndTransformFeedbackNV GLEW_GET_FUN(__glewEndTransformFeedbackNV)
+#define glGetActiveVaryingNV GLEW_GET_FUN(__glewGetActiveVaryingNV)
+#define glGetTransformFeedbackVaryingNV GLEW_GET_FUN(__glewGetTransformFeedbackVaryingNV)
+#define glGetVaryingLocationNV GLEW_GET_FUN(__glewGetVaryingLocationNV)
+#define glTransformFeedbackAttribsNV GLEW_GET_FUN(__glewTransformFeedbackAttribsNV)
+#define glTransformFeedbackVaryingsNV GLEW_GET_FUN(__glewTransformFeedbackVaryingsNV)
+
+#define GLEW_NV_transform_feedback GLEW_GET_VAR(__GLEW_NV_transform_feedback)
+
+#endif /* GL_NV_transform_feedback */
+
+/* ----------------------- GL_NV_transform_feedback2 ----------------------- */
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+
+#define GL_TRANSFORM_FEEDBACK_NV 0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25
+
+typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint* ids);
+typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+
+#define glBindTransformFeedbackNV GLEW_GET_FUN(__glewBindTransformFeedbackNV)
+#define glDeleteTransformFeedbacksNV GLEW_GET_FUN(__glewDeleteTransformFeedbacksNV)
+#define glDrawTransformFeedbackNV GLEW_GET_FUN(__glewDrawTransformFeedbackNV)
+#define glGenTransformFeedbacksNV GLEW_GET_FUN(__glewGenTransformFeedbacksNV)
+#define glIsTransformFeedbackNV GLEW_GET_FUN(__glewIsTransformFeedbackNV)
+#define glPauseTransformFeedbackNV GLEW_GET_FUN(__glewPauseTransformFeedbackNV)
+#define glResumeTransformFeedbackNV GLEW_GET_FUN(__glewResumeTransformFeedbackNV)
+
+#define GLEW_NV_transform_feedback2 GLEW_GET_VAR(__GLEW_NV_transform_feedback2)
+
+#endif /* GL_NV_transform_feedback2 */
+
+/* ------------------ GL_NV_uniform_buffer_unified_memory ------------------ */
+
+#ifndef GL_NV_uniform_buffer_unified_memory
+#define GL_NV_uniform_buffer_unified_memory 1
+
+#define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E
+#define GL_UNIFORM_BUFFER_ADDRESS_NV 0x936F
+#define GL_UNIFORM_BUFFER_LENGTH_NV 0x9370
+
+#define GLEW_NV_uniform_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_uniform_buffer_unified_memory)
+
+#endif /* GL_NV_uniform_buffer_unified_memory */
+
+/* -------------------------- GL_NV_vdpau_interop -------------------------- */
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+
+#define GL_SURFACE_STATE_NV 0x86EB
+#define GL_SURFACE_REGISTERED_NV 0x86FD
+#define GL_SURFACE_MAPPED_NV 0x8700
+#define GL_WRITE_DISCARD_NV 0x88BE
+
+typedef GLintptr GLvdpauSurfaceNV;
+
+typedef void (GLAPIENTRY * PFNGLVDPAUFININVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values);
+typedef void (GLAPIENTRY * PFNGLVDPAUINITNVPROC) (const void* vdpDevice, const void*getProcAddress);
+typedef void (GLAPIENTRY * PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (GLAPIENTRY * PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces);
+typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef void (GLAPIENTRY * PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (GLAPIENTRY * PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV* surfaces);
+typedef void (GLAPIENTRY * PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+
+#define glVDPAUFiniNV GLEW_GET_FUN(__glewVDPAUFiniNV)
+#define glVDPAUGetSurfaceivNV GLEW_GET_FUN(__glewVDPAUGetSurfaceivNV)
+#define glVDPAUInitNV GLEW_GET_FUN(__glewVDPAUInitNV)
+#define glVDPAUIsSurfaceNV GLEW_GET_FUN(__glewVDPAUIsSurfaceNV)
+#define glVDPAUMapSurfacesNV GLEW_GET_FUN(__glewVDPAUMapSurfacesNV)
+#define glVDPAURegisterOutputSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterOutputSurfaceNV)
+#define glVDPAURegisterVideoSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterVideoSurfaceNV)
+#define glVDPAUSurfaceAccessNV GLEW_GET_FUN(__glewVDPAUSurfaceAccessNV)
+#define glVDPAUUnmapSurfacesNV GLEW_GET_FUN(__glewVDPAUUnmapSurfacesNV)
+#define glVDPAUUnregisterSurfaceNV GLEW_GET_FUN(__glewVDPAUUnregisterSurfaceNV)
+
+#define GLEW_NV_vdpau_interop GLEW_GET_VAR(__GLEW_NV_vdpau_interop)
+
+#endif /* GL_NV_vdpau_interop */
+
+/* ------------------------ GL_NV_vertex_array_range ----------------------- */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+
+#define GL_VERTEX_ARRAY_RANGE_NV 0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521
+
+typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, void *pointer);
+
+#define glFlushVertexArrayRangeNV GLEW_GET_FUN(__glewFlushVertexArrayRangeNV)
+#define glVertexArrayRangeNV GLEW_GET_FUN(__glewVertexArrayRangeNV)
+
+#define GLEW_NV_vertex_array_range GLEW_GET_VAR(__GLEW_NV_vertex_array_range)
+
+#endif /* GL_NV_vertex_array_range */
+
+/* ----------------------- GL_NV_vertex_array_range2 ----------------------- */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+
+#define GLEW_NV_vertex_array_range2 GLEW_GET_VAR(__GLEW_NV_vertex_array_range2)
+
+#endif /* GL_NV_vertex_array_range2 */
+
+/* ------------------- GL_NV_vertex_attrib_integer_64bit ------------------- */
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+
+#define GL_INT64_NV 0x140E
+#define GL_UNSIGNED_INT64_NV 0x140F
+
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT* params);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+
+#define glGetVertexAttribLi64vNV GLEW_GET_FUN(__glewGetVertexAttribLi64vNV)
+#define glGetVertexAttribLui64vNV GLEW_GET_FUN(__glewGetVertexAttribLui64vNV)
+#define glVertexAttribL1i64NV GLEW_GET_FUN(__glewVertexAttribL1i64NV)
+#define glVertexAttribL1i64vNV GLEW_GET_FUN(__glewVertexAttribL1i64vNV)
+#define glVertexAttribL1ui64NV GLEW_GET_FUN(__glewVertexAttribL1ui64NV)
+#define glVertexAttribL1ui64vNV GLEW_GET_FUN(__glewVertexAttribL1ui64vNV)
+#define glVertexAttribL2i64NV GLEW_GET_FUN(__glewVertexAttribL2i64NV)
+#define glVertexAttribL2i64vNV GLEW_GET_FUN(__glewVertexAttribL2i64vNV)
+#define glVertexAttribL2ui64NV GLEW_GET_FUN(__glewVertexAttribL2ui64NV)
+#define glVertexAttribL2ui64vNV GLEW_GET_FUN(__glewVertexAttribL2ui64vNV)
+#define glVertexAttribL3i64NV GLEW_GET_FUN(__glewVertexAttribL3i64NV)
+#define glVertexAttribL3i64vNV GLEW_GET_FUN(__glewVertexAttribL3i64vNV)
+#define glVertexAttribL3ui64NV GLEW_GET_FUN(__glewVertexAttribL3ui64NV)
+#define glVertexAttribL3ui64vNV GLEW_GET_FUN(__glewVertexAttribL3ui64vNV)
+#define glVertexAttribL4i64NV GLEW_GET_FUN(__glewVertexAttribL4i64NV)
+#define glVertexAttribL4i64vNV GLEW_GET_FUN(__glewVertexAttribL4i64vNV)
+#define glVertexAttribL4ui64NV GLEW_GET_FUN(__glewVertexAttribL4ui64NV)
+#define glVertexAttribL4ui64vNV GLEW_GET_FUN(__glewVertexAttribL4ui64vNV)
+#define glVertexAttribLFormatNV GLEW_GET_FUN(__glewVertexAttribLFormatNV)
+
+#define GLEW_NV_vertex_attrib_integer_64bit GLEW_GET_VAR(__GLEW_NV_vertex_attrib_integer_64bit)
+
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+/* ------------------- GL_NV_vertex_buffer_unified_memory ------------------ */
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42
+
+typedef void (GLAPIENTRY * PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (GLAPIENTRY * PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT result[]);
+typedef void (GLAPIENTRY * PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (GLAPIENTRY * PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+
+#define glBufferAddressRangeNV GLEW_GET_FUN(__glewBufferAddressRangeNV)
+#define glColorFormatNV GLEW_GET_FUN(__glewColorFormatNV)
+#define glEdgeFlagFormatNV GLEW_GET_FUN(__glewEdgeFlagFormatNV)
+#define glFogCoordFormatNV GLEW_GET_FUN(__glewFogCoordFormatNV)
+#define glGetIntegerui64i_vNV GLEW_GET_FUN(__glewGetIntegerui64i_vNV)
+#define glIndexFormatNV GLEW_GET_FUN(__glewIndexFormatNV)
+#define glNormalFormatNV GLEW_GET_FUN(__glewNormalFormatNV)
+#define glSecondaryColorFormatNV GLEW_GET_FUN(__glewSecondaryColorFormatNV)
+#define glTexCoordFormatNV GLEW_GET_FUN(__glewTexCoordFormatNV)
+#define glVertexAttribFormatNV GLEW_GET_FUN(__glewVertexAttribFormatNV)
+#define glVertexAttribIFormatNV GLEW_GET_FUN(__glewVertexAttribIFormatNV)
+#define glVertexFormatNV GLEW_GET_FUN(__glewVertexFormatNV)
+
+#define GLEW_NV_vertex_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_vertex_buffer_unified_memory)
+
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+/* -------------------------- GL_NV_vertex_program ------------------------- */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+
+#define GL_VERTEX_PROGRAM_NV 0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV 0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625
+#define GL_CURRENT_ATTRIB_NV 0x8626
+#define GL_PROGRAM_LENGTH_NV 0x8627
+#define GL_PROGRAM_STRING_NV 0x8628
+#define GL_MODELVIEW_PROJECTION_NV 0x8629
+#define GL_IDENTITY_NV 0x862A
+#define GL_INVERSE_NV 0x862B
+#define GL_TRANSPOSE_NV 0x862C
+#define GL_INVERSE_TRANSPOSE_NV 0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV 0x862F
+#define GL_MATRIX0_NV 0x8630
+#define GL_MATRIX1_NV 0x8631
+#define GL_MATRIX2_NV 0x8632
+#define GL_MATRIX3_NV 0x8633
+#define GL_MATRIX4_NV 0x8634
+#define GL_MATRIX5_NV 0x8635
+#define GL_MATRIX6_NV 0x8636
+#define GL_MATRIX7_NV 0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640
+#define GL_CURRENT_MATRIX_NV 0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643
+#define GL_PROGRAM_PARAMETER_NV 0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645
+#define GL_PROGRAM_TARGET_NV 0x8646
+#define GL_PROGRAM_RESIDENT_NV 0x8647
+#define GL_TRACK_MATRIX_NV 0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV 0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F
+
+typedef GLboolean (GLAPIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint* ids, GLboolean *residences);
+typedef void (GLAPIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte* program);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void** pointer);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte* program);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei n, const GLubyte* v);
+
+#define glAreProgramsResidentNV GLEW_GET_FUN(__glewAreProgramsResidentNV)
+#define glBindProgramNV GLEW_GET_FUN(__glewBindProgramNV)
+#define glDeleteProgramsNV GLEW_GET_FUN(__glewDeleteProgramsNV)
+#define glExecuteProgramNV GLEW_GET_FUN(__glewExecuteProgramNV)
+#define glGenProgramsNV GLEW_GET_FUN(__glewGenProgramsNV)
+#define glGetProgramParameterdvNV GLEW_GET_FUN(__glewGetProgramParameterdvNV)
+#define glGetProgramParameterfvNV GLEW_GET_FUN(__glewGetProgramParameterfvNV)
+#define glGetProgramStringNV GLEW_GET_FUN(__glewGetProgramStringNV)
+#define glGetProgramivNV GLEW_GET_FUN(__glewGetProgramivNV)
+#define glGetTrackMatrixivNV GLEW_GET_FUN(__glewGetTrackMatrixivNV)
+#define glGetVertexAttribPointervNV GLEW_GET_FUN(__glewGetVertexAttribPointervNV)
+#define glGetVertexAttribdvNV GLEW_GET_FUN(__glewGetVertexAttribdvNV)
+#define glGetVertexAttribfvNV GLEW_GET_FUN(__glewGetVertexAttribfvNV)
+#define glGetVertexAttribivNV GLEW_GET_FUN(__glewGetVertexAttribivNV)
+#define glIsProgramNV GLEW_GET_FUN(__glewIsProgramNV)
+#define glLoadProgramNV GLEW_GET_FUN(__glewLoadProgramNV)
+#define glProgramParameter4dNV GLEW_GET_FUN(__glewProgramParameter4dNV)
+#define glProgramParameter4dvNV GLEW_GET_FUN(__glewProgramParameter4dvNV)
+#define glProgramParameter4fNV GLEW_GET_FUN(__glewProgramParameter4fNV)
+#define glProgramParameter4fvNV GLEW_GET_FUN(__glewProgramParameter4fvNV)
+#define glProgramParameters4dvNV GLEW_GET_FUN(__glewProgramParameters4dvNV)
+#define glProgramParameters4fvNV GLEW_GET_FUN(__glewProgramParameters4fvNV)
+#define glRequestResidentProgramsNV GLEW_GET_FUN(__glewRequestResidentProgramsNV)
+#define glTrackMatrixNV GLEW_GET_FUN(__glewTrackMatrixNV)
+#define glVertexAttrib1dNV GLEW_GET_FUN(__glewVertexAttrib1dNV)
+#define glVertexAttrib1dvNV GLEW_GET_FUN(__glewVertexAttrib1dvNV)
+#define glVertexAttrib1fNV GLEW_GET_FUN(__glewVertexAttrib1fNV)
+#define glVertexAttrib1fvNV GLEW_GET_FUN(__glewVertexAttrib1fvNV)
+#define glVertexAttrib1sNV GLEW_GET_FUN(__glewVertexAttrib1sNV)
+#define glVertexAttrib1svNV GLEW_GET_FUN(__glewVertexAttrib1svNV)
+#define glVertexAttrib2dNV GLEW_GET_FUN(__glewVertexAttrib2dNV)
+#define glVertexAttrib2dvNV GLEW_GET_FUN(__glewVertexAttrib2dvNV)
+#define glVertexAttrib2fNV GLEW_GET_FUN(__glewVertexAttrib2fNV)
+#define glVertexAttrib2fvNV GLEW_GET_FUN(__glewVertexAttrib2fvNV)
+#define glVertexAttrib2sNV GLEW_GET_FUN(__glewVertexAttrib2sNV)
+#define glVertexAttrib2svNV GLEW_GET_FUN(__glewVertexAttrib2svNV)
+#define glVertexAttrib3dNV GLEW_GET_FUN(__glewVertexAttrib3dNV)
+#define glVertexAttrib3dvNV GLEW_GET_FUN(__glewVertexAttrib3dvNV)
+#define glVertexAttrib3fNV GLEW_GET_FUN(__glewVertexAttrib3fNV)
+#define glVertexAttrib3fvNV GLEW_GET_FUN(__glewVertexAttrib3fvNV)
+#define glVertexAttrib3sNV GLEW_GET_FUN(__glewVertexAttrib3sNV)
+#define glVertexAttrib3svNV GLEW_GET_FUN(__glewVertexAttrib3svNV)
+#define glVertexAttrib4dNV GLEW_GET_FUN(__glewVertexAttrib4dNV)
+#define glVertexAttrib4dvNV GLEW_GET_FUN(__glewVertexAttrib4dvNV)
+#define glVertexAttrib4fNV GLEW_GET_FUN(__glewVertexAttrib4fNV)
+#define glVertexAttrib4fvNV GLEW_GET_FUN(__glewVertexAttrib4fvNV)
+#define glVertexAttrib4sNV GLEW_GET_FUN(__glewVertexAttrib4sNV)
+#define glVertexAttrib4svNV GLEW_GET_FUN(__glewVertexAttrib4svNV)
+#define glVertexAttrib4ubNV GLEW_GET_FUN(__glewVertexAttrib4ubNV)
+#define glVertexAttrib4ubvNV GLEW_GET_FUN(__glewVertexAttrib4ubvNV)
+#define glVertexAttribPointerNV GLEW_GET_FUN(__glewVertexAttribPointerNV)
+#define glVertexAttribs1dvNV GLEW_GET_FUN(__glewVertexAttribs1dvNV)
+#define glVertexAttribs1fvNV GLEW_GET_FUN(__glewVertexAttribs1fvNV)
+#define glVertexAttribs1svNV GLEW_GET_FUN(__glewVertexAttribs1svNV)
+#define glVertexAttribs2dvNV GLEW_GET_FUN(__glewVertexAttribs2dvNV)
+#define glVertexAttribs2fvNV GLEW_GET_FUN(__glewVertexAttribs2fvNV)
+#define glVertexAttribs2svNV GLEW_GET_FUN(__glewVertexAttribs2svNV)
+#define glVertexAttribs3dvNV GLEW_GET_FUN(__glewVertexAttribs3dvNV)
+#define glVertexAttribs3fvNV GLEW_GET_FUN(__glewVertexAttribs3fvNV)
+#define glVertexAttribs3svNV GLEW_GET_FUN(__glewVertexAttribs3svNV)
+#define glVertexAttribs4dvNV GLEW_GET_FUN(__glewVertexAttribs4dvNV)
+#define glVertexAttribs4fvNV GLEW_GET_FUN(__glewVertexAttribs4fvNV)
+#define glVertexAttribs4svNV GLEW_GET_FUN(__glewVertexAttribs4svNV)
+#define glVertexAttribs4ubvNV GLEW_GET_FUN(__glewVertexAttribs4ubvNV)
+
+#define GLEW_NV_vertex_program GLEW_GET_VAR(__GLEW_NV_vertex_program)
+
+#endif /* GL_NV_vertex_program */
+
+/* ------------------------ GL_NV_vertex_program1_1 ------------------------ */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+
+#define GLEW_NV_vertex_program1_1 GLEW_GET_VAR(__GLEW_NV_vertex_program1_1)
+
+#endif /* GL_NV_vertex_program1_1 */
+
+/* ------------------------- GL_NV_vertex_program2 ------------------------- */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+
+#define GLEW_NV_vertex_program2 GLEW_GET_VAR(__GLEW_NV_vertex_program2)
+
+#endif /* GL_NV_vertex_program2 */
+
+/* ---------------------- GL_NV_vertex_program2_option --------------------- */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
+
+#define GLEW_NV_vertex_program2_option GLEW_GET_VAR(__GLEW_NV_vertex_program2_option)
+
+#endif /* GL_NV_vertex_program2_option */
+
+/* ------------------------- GL_NV_vertex_program3 ------------------------- */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+
+#define MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+
+#define GLEW_NV_vertex_program3 GLEW_GET_VAR(__GLEW_NV_vertex_program3)
+
+#endif /* GL_NV_vertex_program3 */
+
+/* ------------------------- GL_NV_vertex_program4 ------------------------- */
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+
+#define GLEW_NV_vertex_program4 GLEW_GET_VAR(__GLEW_NV_vertex_program4)
+
+#endif /* GL_NV_vertex_program4 */
+
+/* -------------------------- GL_NV_video_capture -------------------------- */
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+
+#define GL_VIDEO_BUFFER_NV 0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV 0x9021
+#define GL_FIELD_UPPER_NV 0x9022
+#define GL_FIELD_LOWER_NV 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV 0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV 0x902E
+#define GL_SUCCESS_NV 0x902F
+#define GL_FAILURE_NV 0x9030
+#define GL_YCBYCR8_422_NV 0x9031
+#define GL_YCBAYCR8A_4224_NV 0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+
+typedef void (GLAPIENTRY * PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (GLAPIENTRY * PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint* params);
+typedef GLenum (GLAPIENTRY * PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT *capture_time);
+typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params);
+
+#define glBeginVideoCaptureNV GLEW_GET_FUN(__glewBeginVideoCaptureNV)
+#define glBindVideoCaptureStreamBufferNV GLEW_GET_FUN(__glewBindVideoCaptureStreamBufferNV)
+#define glBindVideoCaptureStreamTextureNV GLEW_GET_FUN(__glewBindVideoCaptureStreamTextureNV)
+#define glEndVideoCaptureNV GLEW_GET_FUN(__glewEndVideoCaptureNV)
+#define glGetVideoCaptureStreamdvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamdvNV)
+#define glGetVideoCaptureStreamfvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamfvNV)
+#define glGetVideoCaptureStreamivNV GLEW_GET_FUN(__glewGetVideoCaptureStreamivNV)
+#define glGetVideoCaptureivNV GLEW_GET_FUN(__glewGetVideoCaptureivNV)
+#define glVideoCaptureNV GLEW_GET_FUN(__glewVideoCaptureNV)
+#define glVideoCaptureStreamParameterdvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterdvNV)
+#define glVideoCaptureStreamParameterfvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterfvNV)
+#define glVideoCaptureStreamParameterivNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterivNV)
+
+#define GLEW_NV_video_capture GLEW_GET_VAR(__GLEW_NV_video_capture)
+
+#endif /* GL_NV_video_capture */
+
+/* -------------------------- GL_NV_viewport_array ------------------------- */
+
+#ifndef GL_NV_viewport_array
+#define GL_NV_viewport_array 1
+
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_VIEWPORT 0x0BA2
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_MAX_VIEWPORTS_NV 0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS_NV 0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE_NV 0x825D
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX_NV 0x825F
+
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEARRAYFVNVPROC) (GLuint first, GLsizei count, const GLfloat * v);
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEINDEXEDFNVPROC) (GLuint index, GLfloat n, GLfloat f);
+typedef void (GLAPIENTRY * PFNGLDISABLEINVPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEINVPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLGETFLOATI_VNVPROC) (GLenum target, GLuint index, GLfloat* data);
+typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDINVPROC) (GLenum target, GLuint index);
+typedef void (GLAPIENTRY * PFNGLSCISSORARRAYVNVPROC) (GLuint first, GLsizei count, const GLint * v);
+typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDNVPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDVNVPROC) (GLuint index, const GLint * v);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTARRAYVNVPROC) (GLuint first, GLsizei count, const GLfloat * v);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFVNVPROC) (GLuint index, const GLfloat * v);
+
+#define glDepthRangeArrayfvNV GLEW_GET_FUN(__glewDepthRangeArrayfvNV)
+#define glDepthRangeIndexedfNV GLEW_GET_FUN(__glewDepthRangeIndexedfNV)
+#define glDisableiNV GLEW_GET_FUN(__glewDisableiNV)
+#define glEnableiNV GLEW_GET_FUN(__glewEnableiNV)
+#define glGetFloati_vNV GLEW_GET_FUN(__glewGetFloati_vNV)
+#define glIsEnablediNV GLEW_GET_FUN(__glewIsEnablediNV)
+#define glScissorArrayvNV GLEW_GET_FUN(__glewScissorArrayvNV)
+#define glScissorIndexedNV GLEW_GET_FUN(__glewScissorIndexedNV)
+#define glScissorIndexedvNV GLEW_GET_FUN(__glewScissorIndexedvNV)
+#define glViewportArrayvNV GLEW_GET_FUN(__glewViewportArrayvNV)
+#define glViewportIndexedfNV GLEW_GET_FUN(__glewViewportIndexedfNV)
+#define glViewportIndexedfvNV GLEW_GET_FUN(__glewViewportIndexedfvNV)
+
+#define GLEW_NV_viewport_array GLEW_GET_VAR(__GLEW_NV_viewport_array)
+
+#endif /* GL_NV_viewport_array */
+
+/* ------------------------- GL_NV_viewport_array2 ------------------------- */
+
+#ifndef GL_NV_viewport_array2
+#define GL_NV_viewport_array2 1
+
+#define GLEW_NV_viewport_array2 GLEW_GET_VAR(__GLEW_NV_viewport_array2)
+
+#endif /* GL_NV_viewport_array2 */
+
+/* ------------------------- GL_NV_viewport_swizzle ------------------------ */
+
+#ifndef GL_NV_viewport_swizzle
+#define GL_NV_viewport_swizzle 1
+
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357
+#define GL_VIEWPORT_SWIZZLE_X_NV 0x9358
+#define GL_VIEWPORT_SWIZZLE_Y_NV 0x9359
+#define GL_VIEWPORT_SWIZZLE_Z_NV 0x935A
+#define GL_VIEWPORT_SWIZZLE_W_NV 0x935B
+
+typedef void (GLAPIENTRY * PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
+
+#define glViewportSwizzleNV GLEW_GET_FUN(__glewViewportSwizzleNV)
+
+#define GLEW_NV_viewport_swizzle GLEW_GET_VAR(__GLEW_NV_viewport_swizzle)
+
+#endif /* GL_NV_viewport_swizzle */
+
+/* ------------------------ GL_OES_byte_coordinates ------------------------ */
+
+#ifndef GL_OES_byte_coordinates
+#define GL_OES_byte_coordinates 1
+
+#define GLEW_OES_byte_coordinates GLEW_GET_VAR(__GLEW_OES_byte_coordinates)
+
+#endif /* GL_OES_byte_coordinates */
+
+/* ---------------------------- GL_OML_interlace --------------------------- */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+
+#define GL_INTERLACE_OML 0x8980
+#define GL_INTERLACE_READ_OML 0x8981
+
+#define GLEW_OML_interlace GLEW_GET_VAR(__GLEW_OML_interlace)
+
+#endif /* GL_OML_interlace */
+
+/* ---------------------------- GL_OML_resample ---------------------------- */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+
+#define GL_PACK_RESAMPLE_OML 0x8984
+#define GL_UNPACK_RESAMPLE_OML 0x8985
+#define GL_RESAMPLE_REPLICATE_OML 0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML 0x8987
+#define GL_RESAMPLE_AVERAGE_OML 0x8988
+#define GL_RESAMPLE_DECIMATE_OML 0x8989
+
+#define GLEW_OML_resample GLEW_GET_VAR(__GLEW_OML_resample)
+
+#endif /* GL_OML_resample */
+
+/* ---------------------------- GL_OML_subsample --------------------------- */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+
+#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983
+
+#define GLEW_OML_subsample GLEW_GET_VAR(__GLEW_OML_subsample)
+
+#endif /* GL_OML_subsample */
+
+/* ---------------------------- GL_OVR_multiview --------------------------- */
+
+#ifndef GL_OVR_multiview
+#define GL_OVR_multiview 1
+
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
+#define GL_MAX_VIEWS_OVR 0x9631
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
+#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+
+#define glFramebufferTextureMultiviewOVR GLEW_GET_FUN(__glewFramebufferTextureMultiviewOVR)
+
+#define GLEW_OVR_multiview GLEW_GET_VAR(__GLEW_OVR_multiview)
+
+#endif /* GL_OVR_multiview */
+
+/* --------------------------- GL_OVR_multiview2 --------------------------- */
+
+#ifndef GL_OVR_multiview2
+#define GL_OVR_multiview2 1
+
+#define GLEW_OVR_multiview2 GLEW_GET_VAR(__GLEW_OVR_multiview2)
+
+#endif /* GL_OVR_multiview2 */
+
+/* ------------ GL_OVR_multiview_multisampled_render_to_texture ------------ */
+
+#ifndef GL_OVR_multiview_multisampled_render_to_texture
+#define GL_OVR_multiview_multisampled_render_to_texture 1
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei samples, GLint baseViewIndex, GLsizei numViews);
+
+#define glFramebufferTextureMultisampleMultiviewOVR GLEW_GET_FUN(__glewFramebufferTextureMultisampleMultiviewOVR)
+
+#define GLEW_OVR_multiview_multisampled_render_to_texture GLEW_GET_VAR(__GLEW_OVR_multiview_multisampled_render_to_texture)
+
+#endif /* GL_OVR_multiview_multisampled_render_to_texture */
+
+/* --------------------------- GL_PGI_misc_hints --------------------------- */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 107000
+#define GL_CONSERVE_MEMORY_HINT_PGI 107005
+#define GL_RECLAIM_MEMORY_HINT_PGI 107006
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI 107010
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 107011
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI 107012
+#define GL_ALWAYS_FAST_HINT_PGI 107020
+#define GL_ALWAYS_SOFT_HINT_PGI 107021
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI 107022
+#define GL_ALLOW_DRAW_WIN_HINT_PGI 107023
+#define GL_ALLOW_DRAW_FRG_HINT_PGI 107024
+#define GL_ALLOW_DRAW_MEM_HINT_PGI 107025
+#define GL_STRICT_DEPTHFUNC_HINT_PGI 107030
+#define GL_STRICT_LIGHTING_HINT_PGI 107031
+#define GL_STRICT_SCISSOR_HINT_PGI 107032
+#define GL_FULL_STIPPLE_HINT_PGI 107033
+#define GL_CLIP_NEAR_HINT_PGI 107040
+#define GL_CLIP_FAR_HINT_PGI 107041
+#define GL_WIDE_LINE_HINT_PGI 107042
+#define GL_BACK_NORMALS_HINT_PGI 107043
+
+#define GLEW_PGI_misc_hints GLEW_GET_VAR(__GLEW_PGI_misc_hints)
+
+#endif /* GL_PGI_misc_hints */
+
+/* -------------------------- GL_PGI_vertex_hints -------------------------- */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+
+#define GL_VERTEX23_BIT_PGI 0x00000004
+#define GL_VERTEX4_BIT_PGI 0x00000008
+#define GL_COLOR3_BIT_PGI 0x00010000
+#define GL_COLOR4_BIT_PGI 0x00020000
+#define GL_EDGEFLAG_BIT_PGI 0x00040000
+#define GL_INDEX_BIT_PGI 0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI 0x00100000
+#define GL_VERTEX_DATA_HINT_PGI 107050
+#define GL_VERTEX_CONSISTENT_HINT_PGI 107051
+#define GL_MATERIAL_SIDE_HINT_PGI 107052
+#define GL_MAX_VERTEX_HINT_PGI 107053
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000
+#define GL_MAT_EMISSION_BIT_PGI 0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000
+#define GL_MAT_SHININESS_BIT_PGI 0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI 0x04000000
+#define GL_NORMAL_BIT_PGI 0x08000000
+#define GL_TEXCOORD1_BIT_PGI 0x10000000
+#define GL_TEXCOORD2_BIT_PGI 0x20000000
+#define GL_TEXCOORD3_BIT_PGI 0x40000000
+#define GL_TEXCOORD4_BIT_PGI 0x80000000
+
+#define GLEW_PGI_vertex_hints GLEW_GET_VAR(__GLEW_PGI_vertex_hints)
+
+#endif /* GL_PGI_vertex_hints */
+
+/* --------------------------- GL_QCOM_alpha_test -------------------------- */
+
+#ifndef GL_QCOM_alpha_test
+#define GL_QCOM_alpha_test 1
+
+#define GL_ALPHA_TEST_QCOM 0x0BC0
+#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1
+#define GL_ALPHA_TEST_REF_QCOM 0x0BC2
+
+typedef void (GLAPIENTRY * PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref);
+
+#define glAlphaFuncQCOM GLEW_GET_FUN(__glewAlphaFuncQCOM)
+
+#define GLEW_QCOM_alpha_test GLEW_GET_VAR(__GLEW_QCOM_alpha_test)
+
+#endif /* GL_QCOM_alpha_test */
+
+/* ------------------------ GL_QCOM_binning_control ------------------------ */
+
+#ifndef GL_QCOM_binning_control
+#define GL_QCOM_binning_control 1
+
+#define GL_DONT_CARE 0x1100
+#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0
+#define GL_CPU_OPTIMIZED_QCOM 0x8FB1
+#define GL_GPU_OPTIMIZED_QCOM 0x8FB2
+#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3
+
+#define GLEW_QCOM_binning_control GLEW_GET_VAR(__GLEW_QCOM_binning_control)
+
+#endif /* GL_QCOM_binning_control */
+
+/* ------------------------- GL_QCOM_driver_control ------------------------ */
+
+#ifndef GL_QCOM_driver_control
+#define GL_QCOM_driver_control 1
+
+typedef void (GLAPIENTRY * PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+typedef void (GLAPIENTRY * PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+typedef void (GLAPIENTRY * PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei* length, GLchar *driverControlString);
+typedef void (GLAPIENTRY * PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint* num, GLsizei size, GLuint *driverControls);
+
+#define glDisableDriverControlQCOM GLEW_GET_FUN(__glewDisableDriverControlQCOM)
+#define glEnableDriverControlQCOM GLEW_GET_FUN(__glewEnableDriverControlQCOM)
+#define glGetDriverControlStringQCOM GLEW_GET_FUN(__glewGetDriverControlStringQCOM)
+#define glGetDriverControlsQCOM GLEW_GET_FUN(__glewGetDriverControlsQCOM)
+
+#define GLEW_QCOM_driver_control GLEW_GET_VAR(__GLEW_QCOM_driver_control)
+
+#endif /* GL_QCOM_driver_control */
+
+/* -------------------------- GL_QCOM_extended_get ------------------------- */
+
+#ifndef GL_QCOM_extended_get
+#define GL_QCOM_extended_get 1
+
+#define GL_TEXTURE_WIDTH_QCOM 0x8BD2
+#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3
+#define GL_TEXTURE_DEPTH_QCOM 0x8BD4
+#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5
+#define GL_TEXTURE_FORMAT_QCOM 0x8BD6
+#define GL_TEXTURE_TYPE_QCOM 0x8BD7
+#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8
+#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9
+#define GL_TEXTURE_TARGET_QCOM 0x8BDA
+#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB
+#define GL_STATE_RESTORE 0x8BDC
+
+typedef void (GLAPIENTRY * PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, void** params);
+typedef void (GLAPIENTRY * PFNGLEXTGETBUFFERSQCOMPROC) (GLuint* buffers, GLint maxBuffers, GLint* numBuffers);
+typedef void (GLAPIENTRY * PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint* framebuffers, GLint maxFramebuffers, GLint* numFramebuffers);
+typedef void (GLAPIENTRY * PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint* renderbuffers, GLint maxRenderbuffers, GLint* numRenderbuffers);
+typedef void (GLAPIENTRY * PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void *texels);
+typedef void (GLAPIENTRY * PFNGLEXTGETTEXTURESQCOMPROC) (GLuint* textures, GLint maxTextures, GLint* numTextures);
+typedef void (GLAPIENTRY * PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param);
+
+#define glExtGetBufferPointervQCOM GLEW_GET_FUN(__glewExtGetBufferPointervQCOM)
+#define glExtGetBuffersQCOM GLEW_GET_FUN(__glewExtGetBuffersQCOM)
+#define glExtGetFramebuffersQCOM GLEW_GET_FUN(__glewExtGetFramebuffersQCOM)
+#define glExtGetRenderbuffersQCOM GLEW_GET_FUN(__glewExtGetRenderbuffersQCOM)
+#define glExtGetTexLevelParameterivQCOM GLEW_GET_FUN(__glewExtGetTexLevelParameterivQCOM)
+#define glExtGetTexSubImageQCOM GLEW_GET_FUN(__glewExtGetTexSubImageQCOM)
+#define glExtGetTexturesQCOM GLEW_GET_FUN(__glewExtGetTexturesQCOM)
+#define glExtTexObjectStateOverrideiQCOM GLEW_GET_FUN(__glewExtTexObjectStateOverrideiQCOM)
+
+#define GLEW_QCOM_extended_get GLEW_GET_VAR(__GLEW_QCOM_extended_get)
+
+#endif /* GL_QCOM_extended_get */
+
+/* ------------------------- GL_QCOM_extended_get2 ------------------------- */
+
+#ifndef GL_QCOM_extended_get2
+#define GL_QCOM_extended_get2 1
+
+typedef void (GLAPIENTRY * PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar* source, GLint* length);
+typedef void (GLAPIENTRY * PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint* programs, GLint maxPrograms, GLint* numPrograms);
+typedef void (GLAPIENTRY * PFNGLEXTGETSHADERSQCOMPROC) (GLuint* shaders, GLint maxShaders, GLint* numShaders);
+typedef GLboolean (GLAPIENTRY * PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program);
+
+#define glExtGetProgramBinarySourceQCOM GLEW_GET_FUN(__glewExtGetProgramBinarySourceQCOM)
+#define glExtGetProgramsQCOM GLEW_GET_FUN(__glewExtGetProgramsQCOM)
+#define glExtGetShadersQCOM GLEW_GET_FUN(__glewExtGetShadersQCOM)
+#define glExtIsProgramBinaryQCOM GLEW_GET_FUN(__glewExtIsProgramBinaryQCOM)
+
+#define GLEW_QCOM_extended_get2 GLEW_GET_VAR(__GLEW_QCOM_extended_get2)
+
+#endif /* GL_QCOM_extended_get2 */
+
+/* ---------------------- GL_QCOM_framebuffer_foveated --------------------- */
+
+#ifndef GL_QCOM_framebuffer_foveated
+#define GL_QCOM_framebuffer_foveated 1
+
+#define GL_FOVEATION_ENABLE_BIT_QCOM 0x1
+#define GL_FOVEATION_SCALED_BIN_METHOD_BIT_QCOM 0x2
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERFOVEATIONCONFIGQCOMPROC) (GLuint fbo, GLuint numLayers, GLuint focalPointsPerLayer, GLuint requestedFeatures, GLuint* providedFeatures);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERFOVEATIONPARAMETERSQCOMPROC) (GLuint fbo, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
+
+#define glFramebufferFoveationConfigQCOM GLEW_GET_FUN(__glewFramebufferFoveationConfigQCOM)
+#define glFramebufferFoveationParametersQCOM GLEW_GET_FUN(__glewFramebufferFoveationParametersQCOM)
+
+#define GLEW_QCOM_framebuffer_foveated GLEW_GET_VAR(__GLEW_QCOM_framebuffer_foveated)
+
+#endif /* GL_QCOM_framebuffer_foveated */
+
+/* ---------------------- GL_QCOM_perfmon_global_mode ---------------------- */
+
+#ifndef GL_QCOM_perfmon_global_mode
+#define GL_QCOM_perfmon_global_mode 1
+
+#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0
+
+#define GLEW_QCOM_perfmon_global_mode GLEW_GET_VAR(__GLEW_QCOM_perfmon_global_mode)
+
+#endif /* GL_QCOM_perfmon_global_mode */
+
+/* -------------- GL_QCOM_shader_framebuffer_fetch_noncoherent ------------- */
+
+#ifndef GL_QCOM_shader_framebuffer_fetch_noncoherent
+#define GL_QCOM_shader_framebuffer_fetch_noncoherent 1
+
+#define GL_FRAMEBUFFER_FETCH_NONCOHERENT_QCOM 0x96A2
+
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERFETCHBARRIERQCOMPROC) (void);
+
+#define glFramebufferFetchBarrierQCOM GLEW_GET_FUN(__glewFramebufferFetchBarrierQCOM)
+
+#define GLEW_QCOM_shader_framebuffer_fetch_noncoherent GLEW_GET_VAR(__GLEW_QCOM_shader_framebuffer_fetch_noncoherent)
+
+#endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
+
+/* ------------------------ GL_QCOM_tiled_rendering ------------------------ */
+
+#ifndef GL_QCOM_tiled_rendering
+#define GL_QCOM_tiled_rendering 1
+
+#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001
+#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002
+#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004
+#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008
+#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010
+#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020
+#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040
+#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080
+#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100
+#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200
+#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400
+#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800
+#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000
+#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000
+#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000
+#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000
+#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000
+#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000
+#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000
+#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000
+#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000
+#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000
+#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000
+#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000
+#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000
+#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000
+#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000
+#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000
+#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000
+#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000
+#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000
+#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000
+
+typedef void (GLAPIENTRY * PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
+typedef void (GLAPIENTRY * PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
+
+#define glEndTilingQCOM GLEW_GET_FUN(__glewEndTilingQCOM)
+#define glStartTilingQCOM GLEW_GET_FUN(__glewStartTilingQCOM)
+
+#define GLEW_QCOM_tiled_rendering GLEW_GET_VAR(__GLEW_QCOM_tiled_rendering)
+
+#endif /* GL_QCOM_tiled_rendering */
+
+/* ---------------------- GL_QCOM_writeonly_rendering ---------------------- */
+
+#ifndef GL_QCOM_writeonly_rendering
+#define GL_QCOM_writeonly_rendering 1
+
+#define GL_WRITEONLY_RENDERING_QCOM 0x8823
+
+#define GLEW_QCOM_writeonly_rendering GLEW_GET_VAR(__GLEW_QCOM_writeonly_rendering)
+
+#endif /* GL_QCOM_writeonly_rendering */
+
+/* ---------------------- GL_REGAL_ES1_0_compatibility --------------------- */
+
+#ifndef GL_REGAL_ES1_0_compatibility
+#define GL_REGAL_ES1_0_compatibility 1
+
+typedef int GLclampx;
+
+typedef void (GLAPIENTRY * PFNGLALPHAFUNCXPROC) (GLenum func, GLclampx ref);
+typedef void (GLAPIENTRY * PFNGLCLEARCOLORXPROC) (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+typedef void (GLAPIENTRY * PFNGLCLEARDEPTHXPROC) (GLclampx depth);
+typedef void (GLAPIENTRY * PFNGLCOLOR4XPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEXPROC) (GLclampx zNear, GLclampx zFar);
+typedef void (GLAPIENTRY * PFNGLFOGXPROC) (GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLFOGXVPROC) (GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLFRUSTUMFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+typedef void (GLAPIENTRY * PFNGLFRUSTUMXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELXPROC) (GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELXVPROC) (GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLLIGHTXPROC) (GLenum light, GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLLIGHTXVPROC) (GLenum light, GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLLINEWIDTHXPROC) (GLfixed width);
+typedef void (GLAPIENTRY * PFNGLLOADMATRIXXPROC) (const GLfixed* m);
+typedef void (GLAPIENTRY * PFNGLMATERIALXPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLMATERIALXVPROC) (GLenum face, GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLMULTMATRIXXPROC) (const GLfixed* m);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4XPROC) (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (GLAPIENTRY * PFNGLNORMAL3XPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
+typedef void (GLAPIENTRY * PFNGLORTHOFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+typedef void (GLAPIENTRY * PFNGLORTHOXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+typedef void (GLAPIENTRY * PFNGLPOINTSIZEXPROC) (GLfixed size);
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETXPROC) (GLfixed factor, GLfixed units);
+typedef void (GLAPIENTRY * PFNGLROTATEXPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEXPROC) (GLclampx value, GLboolean invert);
+typedef void (GLAPIENTRY * PFNGLSCALEXPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (GLAPIENTRY * PFNGLTEXENVXPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLTEXENVXVPROC) (GLenum target, GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLTRANSLATEXPROC) (GLfixed x, GLfixed y, GLfixed z);
+
+#define glAlphaFuncx GLEW_GET_FUN(__glewAlphaFuncx)
+#define glClearColorx GLEW_GET_FUN(__glewClearColorx)
+#define glClearDepthx GLEW_GET_FUN(__glewClearDepthx)
+#define glColor4x GLEW_GET_FUN(__glewColor4x)
+#define glDepthRangex GLEW_GET_FUN(__glewDepthRangex)
+#define glFogx GLEW_GET_FUN(__glewFogx)
+#define glFogxv GLEW_GET_FUN(__glewFogxv)
+#define glFrustumf GLEW_GET_FUN(__glewFrustumf)
+#define glFrustumx GLEW_GET_FUN(__glewFrustumx)
+#define glLightModelx GLEW_GET_FUN(__glewLightModelx)
+#define glLightModelxv GLEW_GET_FUN(__glewLightModelxv)
+#define glLightx GLEW_GET_FUN(__glewLightx)
+#define glLightxv GLEW_GET_FUN(__glewLightxv)
+#define glLineWidthx GLEW_GET_FUN(__glewLineWidthx)
+#define glLoadMatrixx GLEW_GET_FUN(__glewLoadMatrixx)
+#define glMaterialx GLEW_GET_FUN(__glewMaterialx)
+#define glMaterialxv GLEW_GET_FUN(__glewMaterialxv)
+#define glMultMatrixx GLEW_GET_FUN(__glewMultMatrixx)
+#define glMultiTexCoord4x GLEW_GET_FUN(__glewMultiTexCoord4x)
+#define glNormal3x GLEW_GET_FUN(__glewNormal3x)
+#define glOrthof GLEW_GET_FUN(__glewOrthof)
+#define glOrthox GLEW_GET_FUN(__glewOrthox)
+#define glPointSizex GLEW_GET_FUN(__glewPointSizex)
+#define glPolygonOffsetx GLEW_GET_FUN(__glewPolygonOffsetx)
+#define glRotatex GLEW_GET_FUN(__glewRotatex)
+#define glSampleCoveragex GLEW_GET_FUN(__glewSampleCoveragex)
+#define glScalex GLEW_GET_FUN(__glewScalex)
+#define glTexEnvx GLEW_GET_FUN(__glewTexEnvx)
+#define glTexEnvxv GLEW_GET_FUN(__glewTexEnvxv)
+#define glTexParameterx GLEW_GET_FUN(__glewTexParameterx)
+#define glTranslatex GLEW_GET_FUN(__glewTranslatex)
+
+#define GLEW_REGAL_ES1_0_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_0_compatibility)
+
+#endif /* GL_REGAL_ES1_0_compatibility */
+
+/* ---------------------- GL_REGAL_ES1_1_compatibility --------------------- */
+
+#ifndef GL_REGAL_ES1_1_compatibility
+#define GL_REGAL_ES1_1_compatibility 1
+
+typedef void (GLAPIENTRY * PFNGLCLIPPLANEFPROC) (GLenum plane, const GLfloat* equation);
+typedef void (GLAPIENTRY * PFNGLCLIPPLANEXPROC) (GLenum plane, const GLfixed* equation);
+typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFPROC) (GLenum pname, GLfloat eqn[4]);
+typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEXPROC) (GLenum pname, GLfixed eqn[4]);
+typedef void (GLAPIENTRY * PFNGLGETFIXEDVPROC) (GLenum pname, GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLGETLIGHTXVPROC) (GLenum light, GLenum pname, GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLGETMATERIALXVPROC) (GLenum face, GLenum pname, GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXENVXVPROC) (GLenum env, GLenum pname, GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERXVPROC) (GLenum target, GLenum pname, GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXPROC) (GLenum pname, GLfixed param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXVPROC) (GLenum pname, const GLfixed* params);
+typedef void (GLAPIENTRY * PFNGLPOINTSIZEPOINTEROESPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXVPROC) (GLenum target, GLenum pname, const GLfixed* params);
+
+#define glClipPlanef GLEW_GET_FUN(__glewClipPlanef)
+#define glClipPlanex GLEW_GET_FUN(__glewClipPlanex)
+#define glGetClipPlanef GLEW_GET_FUN(__glewGetClipPlanef)
+#define glGetClipPlanex GLEW_GET_FUN(__glewGetClipPlanex)
+#define glGetFixedv GLEW_GET_FUN(__glewGetFixedv)
+#define glGetLightxv GLEW_GET_FUN(__glewGetLightxv)
+#define glGetMaterialxv GLEW_GET_FUN(__glewGetMaterialxv)
+#define glGetTexEnvxv GLEW_GET_FUN(__glewGetTexEnvxv)
+#define glGetTexParameterxv GLEW_GET_FUN(__glewGetTexParameterxv)
+#define glPointParameterx GLEW_GET_FUN(__glewPointParameterx)
+#define glPointParameterxv GLEW_GET_FUN(__glewPointParameterxv)
+#define glPointSizePointerOES GLEW_GET_FUN(__glewPointSizePointerOES)
+#define glTexParameterxv GLEW_GET_FUN(__glewTexParameterxv)
+
+#define GLEW_REGAL_ES1_1_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_1_compatibility)
+
+#endif /* GL_REGAL_ES1_1_compatibility */
+
+/* ---------------------------- GL_REGAL_enable ---------------------------- */
+
+#ifndef GL_REGAL_enable
+#define GL_REGAL_enable 1
+
+#define GL_ERROR_REGAL 0x9322
+#define GL_DEBUG_REGAL 0x9323
+#define GL_LOG_REGAL 0x9324
+#define GL_EMULATION_REGAL 0x9325
+#define GL_DRIVER_REGAL 0x9326
+#define GL_MISSING_REGAL 0x9360
+#define GL_TRACE_REGAL 0x9361
+#define GL_CACHE_REGAL 0x9362
+#define GL_CODE_REGAL 0x9363
+#define GL_STATISTICS_REGAL 0x9364
+
+#define GLEW_REGAL_enable GLEW_GET_VAR(__GLEW_REGAL_enable)
+
+#endif /* GL_REGAL_enable */
+
+/* ------------------------- GL_REGAL_error_string ------------------------- */
+
+#ifndef GL_REGAL_error_string
+#define GL_REGAL_error_string 1
+
+typedef const GLchar* (GLAPIENTRY * PFNGLERRORSTRINGREGALPROC) (GLenum error);
+
+#define glErrorStringREGAL GLEW_GET_FUN(__glewErrorStringREGAL)
+
+#define GLEW_REGAL_error_string GLEW_GET_VAR(__GLEW_REGAL_error_string)
+
+#endif /* GL_REGAL_error_string */
+
+/* ------------------------ GL_REGAL_extension_query ----------------------- */
+
+#ifndef GL_REGAL_extension_query
+#define GL_REGAL_extension_query 1
+
+typedef GLboolean (GLAPIENTRY * PFNGLGETEXTENSIONREGALPROC) (const GLchar* ext);
+typedef GLboolean (GLAPIENTRY * PFNGLISSUPPORTEDREGALPROC) (const GLchar* ext);
+
+#define glGetExtensionREGAL GLEW_GET_FUN(__glewGetExtensionREGAL)
+#define glIsSupportedREGAL GLEW_GET_FUN(__glewIsSupportedREGAL)
+
+#define GLEW_REGAL_extension_query GLEW_GET_VAR(__GLEW_REGAL_extension_query)
+
+#endif /* GL_REGAL_extension_query */
+
+/* ------------------------------ GL_REGAL_log ----------------------------- */
+
+#ifndef GL_REGAL_log
+#define GL_REGAL_log 1
+
+#define GL_LOG_ERROR_REGAL 0x9319
+#define GL_LOG_WARNING_REGAL 0x931A
+#define GL_LOG_INFO_REGAL 0x931B
+#define GL_LOG_APP_REGAL 0x931C
+#define GL_LOG_DRIVER_REGAL 0x931D
+#define GL_LOG_INTERNAL_REGAL 0x931E
+#define GL_LOG_DEBUG_REGAL 0x931F
+#define GL_LOG_STATUS_REGAL 0x9320
+#define GL_LOG_HTTP_REGAL 0x9321
+
+typedef void (APIENTRY *GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, void *context);
+
+typedef void (GLAPIENTRY * PFNGLLOGMESSAGECALLBACKREGALPROC) (GLLOGPROCREGAL callback);
+
+#define glLogMessageCallbackREGAL GLEW_GET_FUN(__glewLogMessageCallbackREGAL)
+
+#define GLEW_REGAL_log GLEW_GET_VAR(__GLEW_REGAL_log)
+
+#endif /* GL_REGAL_log */
+
+/* ------------------------- GL_REGAL_proc_address ------------------------- */
+
+#ifndef GL_REGAL_proc_address
+#define GL_REGAL_proc_address 1
+
+typedef void * (GLAPIENTRY * PFNGLGETPROCADDRESSREGALPROC) (const GLchar *name);
+
+#define glGetProcAddressREGAL GLEW_GET_FUN(__glewGetProcAddressREGAL)
+
+#define GLEW_REGAL_proc_address GLEW_GET_VAR(__GLEW_REGAL_proc_address)
+
+#endif /* GL_REGAL_proc_address */
+
+/* ----------------------- GL_REND_screen_coordinates ---------------------- */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+
+#define GL_SCREEN_COORDINATES_REND 0x8490
+#define GL_INVERTED_SCREEN_W_REND 0x8491
+
+#define GLEW_REND_screen_coordinates GLEW_GET_VAR(__GLEW_REND_screen_coordinates)
+
+#endif /* GL_REND_screen_coordinates */
+
+/* ------------------------------- GL_S3_s3tc ------------------------------ */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+
+#define GL_RGB_S3TC 0x83A0
+#define GL_RGB4_S3TC 0x83A1
+#define GL_RGBA_S3TC 0x83A2
+#define GL_RGBA4_S3TC 0x83A3
+#define GL_RGBA_DXT5_S3TC 0x83A4
+#define GL_RGBA4_DXT5_S3TC 0x83A5
+
+#define GLEW_S3_s3tc GLEW_GET_VAR(__GLEW_S3_s3tc)
+
+#endif /* GL_S3_s3tc */
+
+/* ------------------------- GL_SGIS_clip_band_hint ------------------------ */
+
+#ifndef GL_SGIS_clip_band_hint
+#define GL_SGIS_clip_band_hint 1
+
+#define GLEW_SGIS_clip_band_hint GLEW_GET_VAR(__GLEW_SGIS_clip_band_hint)
+
+#endif /* GL_SGIS_clip_band_hint */
+
+/* -------------------------- GL_SGIS_color_range -------------------------- */
+
+#ifndef GL_SGIS_color_range
+#define GL_SGIS_color_range 1
+
+#define GL_EXTENDED_RANGE_SGIS 0x85A5
+#define GL_MIN_RED_SGIS 0x85A6
+#define GL_MAX_RED_SGIS 0x85A7
+#define GL_MIN_GREEN_SGIS 0x85A8
+#define GL_MAX_GREEN_SGIS 0x85A9
+#define GL_MIN_BLUE_SGIS 0x85AA
+#define GL_MAX_BLUE_SGIS 0x85AB
+#define GL_MIN_ALPHA_SGIS 0x85AC
+#define GL_MAX_ALPHA_SGIS 0x85AD
+
+#define GLEW_SGIS_color_range GLEW_GET_VAR(__GLEW_SGIS_color_range)
+
+#endif /* GL_SGIS_color_range */
+
+/* ------------------------- GL_SGIS_detail_texture ------------------------ */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+
+typedef void (GLAPIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
+
+#define glDetailTexFuncSGIS GLEW_GET_FUN(__glewDetailTexFuncSGIS)
+#define glGetDetailTexFuncSGIS GLEW_GET_FUN(__glewGetDetailTexFuncSGIS)
+
+#define GLEW_SGIS_detail_texture GLEW_GET_VAR(__GLEW_SGIS_detail_texture)
+
+#endif /* GL_SGIS_detail_texture */
+
+/* -------------------------- GL_SGIS_fog_function ------------------------- */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+
+typedef void (GLAPIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat* points);
+
+#define glFogFuncSGIS GLEW_GET_FUN(__glewFogFuncSGIS)
+#define glGetFogFuncSGIS GLEW_GET_FUN(__glewGetFogFuncSGIS)
+
+#define GLEW_SGIS_fog_function GLEW_GET_VAR(__GLEW_SGIS_fog_function)
+
+#endif /* GL_SGIS_fog_function */
+
+/* ------------------------ GL_SGIS_generate_mipmap ------------------------ */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+
+#define GL_GENERATE_MIPMAP_SGIS 0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
+
+#define GLEW_SGIS_generate_mipmap GLEW_GET_VAR(__GLEW_SGIS_generate_mipmap)
+
+#endif /* GL_SGIS_generate_mipmap */
+
+/* -------------------------- GL_SGIS_line_texgen -------------------------- */
+
+#ifndef GL_SGIS_line_texgen
+#define GL_SGIS_line_texgen 1
+
+#define GLEW_SGIS_line_texgen GLEW_GET_VAR(__GLEW_SGIS_line_texgen)
+
+#endif /* GL_SGIS_line_texgen */
+
+/* -------------------------- GL_SGIS_multisample -------------------------- */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+
+#define GL_MULTISAMPLE_SGIS 0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F
+#define GL_SAMPLE_MASK_SGIS 0x80A0
+#define GL_1PASS_SGIS 0x80A1
+#define GL_2PASS_0_SGIS 0x80A2
+#define GL_2PASS_1_SGIS 0x80A3
+#define GL_4PASS_0_SGIS 0x80A4
+#define GL_4PASS_1_SGIS 0x80A5
+#define GL_4PASS_2_SGIS 0x80A6
+#define GL_4PASS_3_SGIS 0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS 0x80A8
+#define GL_SAMPLES_SGIS 0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB
+#define GL_SAMPLE_PATTERN_SGIS 0x80AC
+
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+
+#define glSampleMaskSGIS GLEW_GET_FUN(__glewSampleMaskSGIS)
+#define glSamplePatternSGIS GLEW_GET_FUN(__glewSamplePatternSGIS)
+
+#define GLEW_SGIS_multisample GLEW_GET_VAR(__GLEW_SGIS_multisample)
+
+#endif /* GL_SGIS_multisample */
+
+/* -------------------------- GL_SGIS_multitexture ------------------------- */
+
+#ifndef GL_SGIS_multitexture
+#define GL_SGIS_multitexture 1
+
+#define GL_SELECTED_TEXTURE_SGIS 0x83C0
+#define GL_SELECTED_TEXTURE_COORD_SET_SGIS 0x83C1
+#define GL_SELECTED_TEXTURE_TRANSFORM_SGIS 0x83C2
+#define GL_MAX_TEXTURES_SGIS 0x83C3
+#define GL_MAX_TEXTURE_COORD_SETS_SGIS 0x83C4
+#define GL_TEXTURE_COORD_SET_INTERLEAVE_FACTOR_SGIS 0x83C5
+#define GL_TEXTURE_ENV_COORD_SET_SGIS 0x83C6
+#define GL_TEXTURE0_SGIS 0x83C7
+#define GL_TEXTURE1_SGIS 0x83C8
+#define GL_TEXTURE2_SGIS 0x83C9
+#define GL_TEXTURE3_SGIS 0x83CA
+
+typedef void (GLAPIENTRY * PFNGLINTERLEAVEDTEXTURECOORDSETSSGISPROC) (GLint factor);
+typedef void (GLAPIENTRY * PFNGLSELECTTEXTURECOORDSETSGISPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLSELECTTEXTURESGISPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLSELECTTEXTURETRANSFORMSGISPROC) (GLenum target);
+
+#define glInterleavedTextureCoordSetsSGIS GLEW_GET_FUN(__glewInterleavedTextureCoordSetsSGIS)
+#define glSelectTextureCoordSetSGIS GLEW_GET_FUN(__glewSelectTextureCoordSetSGIS)
+#define glSelectTextureSGIS GLEW_GET_FUN(__glewSelectTextureSGIS)
+#define glSelectTextureTransformSGIS GLEW_GET_FUN(__glewSelectTextureTransformSGIS)
+
+#define GLEW_SGIS_multitexture GLEW_GET_VAR(__GLEW_SGIS_multitexture)
+
+#endif /* GL_SGIS_multitexture */
+
+/* ------------------------- GL_SGIS_pixel_texture ------------------------- */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+
+#define GLEW_SGIS_pixel_texture GLEW_GET_VAR(__GLEW_SGIS_pixel_texture)
+
+#endif /* GL_SGIS_pixel_texture */
+
+/* ----------------------- GL_SGIS_point_line_texgen ----------------------- */
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+
+#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3
+#define GL_EYE_POINT_SGIS 0x81F4
+#define GL_OBJECT_POINT_SGIS 0x81F5
+#define GL_EYE_LINE_SGIS 0x81F6
+#define GL_OBJECT_LINE_SGIS 0x81F7
+
+#define GLEW_SGIS_point_line_texgen GLEW_GET_VAR(__GLEW_SGIS_point_line_texgen)
+
+#endif /* GL_SGIS_point_line_texgen */
+
+/* ----------------------- GL_SGIS_shared_multisample ---------------------- */
+
+#ifndef GL_SGIS_shared_multisample
+#define GL_SGIS_shared_multisample 1
+
+typedef void (GLAPIENTRY * PFNGLMULTISAMPLESUBRECTPOSSGISPROC) (GLint x, GLint y);
+
+#define glMultisampleSubRectPosSGIS GLEW_GET_FUN(__glewMultisampleSubRectPosSGIS)
+
+#define GLEW_SGIS_shared_multisample GLEW_GET_VAR(__GLEW_SGIS_shared_multisample)
+
+#endif /* GL_SGIS_shared_multisample */
+
+/* ------------------------ GL_SGIS_sharpen_texture ------------------------ */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+
+typedef void (GLAPIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
+
+#define glGetSharpenTexFuncSGIS GLEW_GET_FUN(__glewGetSharpenTexFuncSGIS)
+#define glSharpenTexFuncSGIS GLEW_GET_FUN(__glewSharpenTexFuncSGIS)
+
+#define GLEW_SGIS_sharpen_texture GLEW_GET_VAR(__GLEW_SGIS_sharpen_texture)
+
+#endif /* GL_SGIS_sharpen_texture */
+
+/* --------------------------- GL_SGIS_texture4D --------------------------- */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels);
+
+#define glTexImage4DSGIS GLEW_GET_FUN(__glewTexImage4DSGIS)
+#define glTexSubImage4DSGIS GLEW_GET_FUN(__glewTexSubImage4DSGIS)
+
+#define GLEW_SGIS_texture4D GLEW_GET_VAR(__GLEW_SGIS_texture4D)
+
+#endif /* GL_SGIS_texture4D */
+
+/* ---------------------- GL_SGIS_texture_border_clamp --------------------- */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+
+#define GL_CLAMP_TO_BORDER_SGIS 0x812D
+
+#define GLEW_SGIS_texture_border_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_border_clamp)
+
+#endif /* GL_SGIS_texture_border_clamp */
+
+/* ----------------------- GL_SGIS_texture_edge_clamp ---------------------- */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+
+#define GL_CLAMP_TO_EDGE_SGIS 0x812F
+
+#define GLEW_SGIS_texture_edge_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_edge_clamp)
+
+#endif /* GL_SGIS_texture_edge_clamp */
+
+/* ------------------------ GL_SGIS_texture_filter4 ------------------------ */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+
+typedef void (GLAPIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat* weights);
+typedef void (GLAPIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat* weights);
+
+#define glGetTexFilterFuncSGIS GLEW_GET_FUN(__glewGetTexFilterFuncSGIS)
+#define glTexFilterFuncSGIS GLEW_GET_FUN(__glewTexFilterFuncSGIS)
+
+#define GLEW_SGIS_texture_filter4 GLEW_GET_VAR(__GLEW_SGIS_texture_filter4)
+
+#endif /* GL_SGIS_texture_filter4 */
+
+/* -------------------------- GL_SGIS_texture_lod -------------------------- */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+
+#define GL_TEXTURE_MIN_LOD_SGIS 0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS 0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D
+
+#define GLEW_SGIS_texture_lod GLEW_GET_VAR(__GLEW_SGIS_texture_lod)
+
+#endif /* GL_SGIS_texture_lod */
+
+/* ------------------------- GL_SGIS_texture_select ------------------------ */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+
+#define GLEW_SGIS_texture_select GLEW_GET_VAR(__GLEW_SGIS_texture_select)
+
+#endif /* GL_SGIS_texture_select */
+
+/* ----------------------------- GL_SGIX_async ----------------------------- */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+
+#define GL_ASYNC_MARKER_SGIX 0x8329
+
+typedef void (GLAPIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef void (GLAPIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLint (GLAPIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint* markerp);
+typedef GLuint (GLAPIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef GLboolean (GLAPIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (GLAPIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint* markerp);
+
+#define glAsyncMarkerSGIX GLEW_GET_FUN(__glewAsyncMarkerSGIX)
+#define glDeleteAsyncMarkersSGIX GLEW_GET_FUN(__glewDeleteAsyncMarkersSGIX)
+#define glFinishAsyncSGIX GLEW_GET_FUN(__glewFinishAsyncSGIX)
+#define glGenAsyncMarkersSGIX GLEW_GET_FUN(__glewGenAsyncMarkersSGIX)
+#define glIsAsyncMarkerSGIX GLEW_GET_FUN(__glewIsAsyncMarkerSGIX)
+#define glPollAsyncSGIX GLEW_GET_FUN(__glewPollAsyncSGIX)
+
+#define GLEW_SGIX_async GLEW_GET_VAR(__GLEW_SGIX_async)
+
+#endif /* GL_SGIX_async */
+
+/* ------------------------ GL_SGIX_async_histogram ------------------------ */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+
+#define GL_ASYNC_HISTOGRAM_SGIX 0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D
+
+#define GLEW_SGIX_async_histogram GLEW_GET_VAR(__GLEW_SGIX_async_histogram)
+
+#endif /* GL_SGIX_async_histogram */
+
+/* -------------------------- GL_SGIX_async_pixel -------------------------- */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+
+#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX 0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361
+
+#define GLEW_SGIX_async_pixel GLEW_GET_VAR(__GLEW_SGIX_async_pixel)
+
+#endif /* GL_SGIX_async_pixel */
+
+/* ----------------------- GL_SGIX_bali_g_instruments ---------------------- */
+
+#ifndef GL_SGIX_bali_g_instruments
+#define GL_SGIX_bali_g_instruments 1
+
+#define GL_BALI_NUM_TRIS_CULLED_INSTRUMENT 0x6080
+#define GL_BALI_NUM_PRIMS_CLIPPED_INSTRUMENT 0x6081
+#define GL_BALI_NUM_PRIMS_REJECT_INSTRUMENT 0x6082
+#define GL_BALI_NUM_PRIMS_CLIP_RESULT_INSTRUMENT 0x6083
+
+#define GLEW_SGIX_bali_g_instruments GLEW_GET_VAR(__GLEW_SGIX_bali_g_instruments)
+
+#endif /* GL_SGIX_bali_g_instruments */
+
+/* ----------------------- GL_SGIX_bali_r_instruments ---------------------- */
+
+#ifndef GL_SGIX_bali_r_instruments
+#define GL_SGIX_bali_r_instruments 1
+
+#define GL_BALI_FRAGMENTS_GENERATED_INSTRUMENT 0x6090
+#define GL_BALI_DEPTH_PASS_INSTRUMENT 0x6091
+#define GL_BALI_R_CHIP_COUNT 0x6092
+
+#define GLEW_SGIX_bali_r_instruments GLEW_GET_VAR(__GLEW_SGIX_bali_r_instruments)
+
+#endif /* GL_SGIX_bali_r_instruments */
+
+/* --------------------- GL_SGIX_bali_timer_instruments -------------------- */
+
+#ifndef GL_SGIX_bali_timer_instruments
+#define GL_SGIX_bali_timer_instruments 1
+
+#define GLEW_SGIX_bali_timer_instruments GLEW_GET_VAR(__GLEW_SGIX_bali_timer_instruments)
+
+#endif /* GL_SGIX_bali_timer_instruments */
+
+/* ----------------------- GL_SGIX_blend_alpha_minmax ---------------------- */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+
+#define GL_ALPHA_MIN_SGIX 0x8320
+#define GL_ALPHA_MAX_SGIX 0x8321
+
+#define GLEW_SGIX_blend_alpha_minmax GLEW_GET_VAR(__GLEW_SGIX_blend_alpha_minmax)
+
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+/* --------------------------- GL_SGIX_blend_cadd -------------------------- */
+
+#ifndef GL_SGIX_blend_cadd
+#define GL_SGIX_blend_cadd 1
+
+#define GL_FUNC_COMPLEX_ADD_EXT 0x601C
+
+#define GLEW_SGIX_blend_cadd GLEW_GET_VAR(__GLEW_SGIX_blend_cadd)
+
+#endif /* GL_SGIX_blend_cadd */
+
+/* ------------------------ GL_SGIX_blend_cmultiply ------------------------ */
+
+#ifndef GL_SGIX_blend_cmultiply
+#define GL_SGIX_blend_cmultiply 1
+
+#define GL_FUNC_COMPLEX_MULTIPLY_EXT 0x601B
+
+#define GLEW_SGIX_blend_cmultiply GLEW_GET_VAR(__GLEW_SGIX_blend_cmultiply)
+
+#endif /* GL_SGIX_blend_cmultiply */
+
+/* --------------------- GL_SGIX_calligraphic_fragment --------------------- */
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+
+#define GLEW_SGIX_calligraphic_fragment GLEW_GET_VAR(__GLEW_SGIX_calligraphic_fragment)
+
+#endif /* GL_SGIX_calligraphic_fragment */
+
+/* ---------------------------- GL_SGIX_clipmap ---------------------------- */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+
+#define GLEW_SGIX_clipmap GLEW_GET_VAR(__GLEW_SGIX_clipmap)
+
+#endif /* GL_SGIX_clipmap */
+
+/* --------------------- GL_SGIX_color_matrix_accuracy --------------------- */
+
+#ifndef GL_SGIX_color_matrix_accuracy
+#define GL_SGIX_color_matrix_accuracy 1
+
+#define GL_COLOR_MATRIX_HINT 0x8317
+
+#define GLEW_SGIX_color_matrix_accuracy GLEW_GET_VAR(__GLEW_SGIX_color_matrix_accuracy)
+
+#endif /* GL_SGIX_color_matrix_accuracy */
+
+/* --------------------- GL_SGIX_color_table_index_mode -------------------- */
+
+#ifndef GL_SGIX_color_table_index_mode
+#define GL_SGIX_color_table_index_mode 1
+
+#define GLEW_SGIX_color_table_index_mode GLEW_GET_VAR(__GLEW_SGIX_color_table_index_mode)
+
+#endif /* GL_SGIX_color_table_index_mode */
+
+/* ------------------------- GL_SGIX_complex_polar ------------------------- */
+
+#ifndef GL_SGIX_complex_polar
+#define GL_SGIX_complex_polar 1
+
+#define GLEW_SGIX_complex_polar GLEW_GET_VAR(__GLEW_SGIX_complex_polar)
+
+#endif /* GL_SGIX_complex_polar */
+
+/* ---------------------- GL_SGIX_convolution_accuracy --------------------- */
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+
+#define GL_CONVOLUTION_HINT_SGIX 0x8316
+
+#define GLEW_SGIX_convolution_accuracy GLEW_GET_VAR(__GLEW_SGIX_convolution_accuracy)
+
+#endif /* GL_SGIX_convolution_accuracy */
+
+/* ---------------------------- GL_SGIX_cube_map --------------------------- */
+
+#ifndef GL_SGIX_cube_map
+#define GL_SGIX_cube_map 1
+
+#define GL_ENV_MAP_SGIX 0x8340
+#define GL_CUBE_MAP_SGIX 0x8341
+#define GL_CUBE_MAP_ZP_SGIX 0x8342
+#define GL_CUBE_MAP_ZN_SGIX 0x8343
+#define GL_CUBE_MAP_XN_SGIX 0x8344
+#define GL_CUBE_MAP_XP_SGIX 0x8345
+#define GL_CUBE_MAP_YN_SGIX 0x8346
+#define GL_CUBE_MAP_YP_SGIX 0x8347
+#define GL_CUBE_MAP_BINDING_SGIX 0x8348
+
+#define GLEW_SGIX_cube_map GLEW_GET_VAR(__GLEW_SGIX_cube_map)
+
+#endif /* GL_SGIX_cube_map */
+
+/* ------------------------ GL_SGIX_cylinder_texgen ------------------------ */
+
+#ifndef GL_SGIX_cylinder_texgen
+#define GL_SGIX_cylinder_texgen 1
+
+#define GLEW_SGIX_cylinder_texgen GLEW_GET_VAR(__GLEW_SGIX_cylinder_texgen)
+
+#endif /* GL_SGIX_cylinder_texgen */
+
+/* ---------------------------- GL_SGIX_datapipe --------------------------- */
+
+#ifndef GL_SGIX_datapipe
+#define GL_SGIX_datapipe 1
+
+#define GL_GEOMETRY_BIT 0x1
+#define GL_IMAGE_BIT 0x2
+
+typedef void (GLAPIENTRY * PFNGLADDRESSSPACEPROC) (GLenum space, GLbitfield mask);
+typedef GLint (GLAPIENTRY * PFNGLDATAPIPEPROC) (GLenum space);
+
+#define glAddressSpace GLEW_GET_FUN(__glewAddressSpace)
+#define glDataPipe GLEW_GET_FUN(__glewDataPipe)
+
+#define GLEW_SGIX_datapipe GLEW_GET_VAR(__GLEW_SGIX_datapipe)
+
+#endif /* GL_SGIX_datapipe */
+
+/* --------------------------- GL_SGIX_decimation -------------------------- */
+
+#ifndef GL_SGIX_decimation
+#define GL_SGIX_decimation 1
+
+#define GLEW_SGIX_decimation GLEW_GET_VAR(__GLEW_SGIX_decimation)
+
+#endif /* GL_SGIX_decimation */
+
+/* --------------------- GL_SGIX_depth_pass_instrument --------------------- */
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+
+#define GLEW_SGIX_depth_pass_instrument GLEW_GET_VAR(__GLEW_SGIX_depth_pass_instrument)
+
+#endif /* GL_SGIX_depth_pass_instrument */
+
+/* ------------------------- GL_SGIX_depth_texture ------------------------- */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_SGIX 0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX 0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX 0x81A7
+
+#define GLEW_SGIX_depth_texture GLEW_GET_VAR(__GLEW_SGIX_depth_texture)
+
+#endif /* GL_SGIX_depth_texture */
+
+/* ------------------------------ GL_SGIX_dvc ------------------------------ */
+
+#ifndef GL_SGIX_dvc
+#define GL_SGIX_dvc 1
+
+#define GLEW_SGIX_dvc GLEW_GET_VAR(__GLEW_SGIX_dvc)
+
+#endif /* GL_SGIX_dvc */
+
+/* -------------------------- GL_SGIX_flush_raster ------------------------- */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+
+typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
+
+#define glFlushRasterSGIX GLEW_GET_FUN(__glewFlushRasterSGIX)
+
+#define GLEW_SGIX_flush_raster GLEW_GET_VAR(__GLEW_SGIX_flush_raster)
+
+#endif /* GL_SGIX_flush_raster */
+
+/* --------------------------- GL_SGIX_fog_blend --------------------------- */
+
+#ifndef GL_SGIX_fog_blend
+#define GL_SGIX_fog_blend 1
+
+#define GL_FOG_BLEND_ALPHA_SGIX 0x81FE
+#define GL_FOG_BLEND_COLOR_SGIX 0x81FF
+
+#define GLEW_SGIX_fog_blend GLEW_GET_VAR(__GLEW_SGIX_fog_blend)
+
+#endif /* GL_SGIX_fog_blend */
+
+/* ---------------------- GL_SGIX_fog_factor_to_alpha ---------------------- */
+
+#ifndef GL_SGIX_fog_factor_to_alpha
+#define GL_SGIX_fog_factor_to_alpha 1
+
+#define GLEW_SGIX_fog_factor_to_alpha GLEW_GET_VAR(__GLEW_SGIX_fog_factor_to_alpha)
+
+#endif /* GL_SGIX_fog_factor_to_alpha */
+
+/* --------------------------- GL_SGIX_fog_layers -------------------------- */
+
+#ifndef GL_SGIX_fog_layers
+#define GL_SGIX_fog_layers 1
+
+#define GL_FOG_TYPE_SGIX 0x8323
+#define GL_UNIFORM_SGIX 0x8324
+#define GL_LAYERED_SGIX 0x8325
+#define GL_FOG_GROUND_PLANE_SGIX 0x8326
+#define GL_FOG_LAYERS_POINTS_SGIX 0x8327
+#define GL_MAX_FOG_LAYERS_POINTS_SGIX 0x8328
+
+typedef void (GLAPIENTRY * PFNGLFOGLAYERSSGIXPROC) (GLsizei n, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLGETFOGLAYERSSGIXPROC) (GLfloat* points);
+
+#define glFogLayersSGIX GLEW_GET_FUN(__glewFogLayersSGIX)
+#define glGetFogLayersSGIX GLEW_GET_FUN(__glewGetFogLayersSGIX)
+
+#define GLEW_SGIX_fog_layers GLEW_GET_VAR(__GLEW_SGIX_fog_layers)
+
+#endif /* GL_SGIX_fog_layers */
+
+/* --------------------------- GL_SGIX_fog_offset -------------------------- */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+
+#define GL_FOG_OFFSET_SGIX 0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX 0x8199
+
+#define GLEW_SGIX_fog_offset GLEW_GET_VAR(__GLEW_SGIX_fog_offset)
+
+#endif /* GL_SGIX_fog_offset */
+
+/* --------------------------- GL_SGIX_fog_patchy -------------------------- */
+
+#ifndef GL_SGIX_fog_patchy
+#define GL_SGIX_fog_patchy 1
+
+#define GLEW_SGIX_fog_patchy GLEW_GET_VAR(__GLEW_SGIX_fog_patchy)
+
+#endif /* GL_SGIX_fog_patchy */
+
+/* --------------------------- GL_SGIX_fog_scale --------------------------- */
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+
+#define GL_FOG_SCALE_SGIX 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX 0x81FD
+
+#define GLEW_SGIX_fog_scale GLEW_GET_VAR(__GLEW_SGIX_fog_scale)
+
+#endif /* GL_SGIX_fog_scale */
+
+/* -------------------------- GL_SGIX_fog_texture -------------------------- */
+
+#ifndef GL_SGIX_fog_texture
+#define GL_SGIX_fog_texture 1
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname);
+
+#define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX)
+
+#define GLEW_SGIX_fog_texture GLEW_GET_VAR(__GLEW_SGIX_fog_texture)
+
+#endif /* GL_SGIX_fog_texture */
+
+/* -------------------- GL_SGIX_fragment_lighting_space -------------------- */
+
+#ifndef GL_SGIX_fragment_lighting_space
+#define GL_SGIX_fragment_lighting_space 1
+
+#define GL_EYE_SPACE_SGIX 0x8436
+#define GL_TANGENT_SPACE_SGIX 0x8437
+#define GL_OBJECT_SPACE_SGIX 0x8438
+#define GL_FRAGMENT_LIGHT_SPACE_SGIX 0x843D
+
+#define GLEW_SGIX_fragment_lighting_space GLEW_GET_VAR(__GLEW_SGIX_fragment_lighting_space)
+
+#endif /* GL_SGIX_fragment_lighting_space */
+
+/* ------------------- GL_SGIX_fragment_specular_lighting ------------------ */
+
+#ifndef GL_SGIX_fragment_specular_lighting
+#define GL_SGIX_fragment_specular_lighting 1
+
+typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum value, GLfloat* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum value, GLint* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* data);
+
+#define glFragmentColorMaterialSGIX GLEW_GET_FUN(__glewFragmentColorMaterialSGIX)
+#define glFragmentLightModelfSGIX GLEW_GET_FUN(__glewFragmentLightModelfSGIX)
+#define glFragmentLightModelfvSGIX GLEW_GET_FUN(__glewFragmentLightModelfvSGIX)
+#define glFragmentLightModeliSGIX GLEW_GET_FUN(__glewFragmentLightModeliSGIX)
+#define glFragmentLightModelivSGIX GLEW_GET_FUN(__glewFragmentLightModelivSGIX)
+#define glFragmentLightfSGIX GLEW_GET_FUN(__glewFragmentLightfSGIX)
+#define glFragmentLightfvSGIX GLEW_GET_FUN(__glewFragmentLightfvSGIX)
+#define glFragmentLightiSGIX GLEW_GET_FUN(__glewFragmentLightiSGIX)
+#define glFragmentLightivSGIX GLEW_GET_FUN(__glewFragmentLightivSGIX)
+#define glFragmentMaterialfSGIX GLEW_GET_FUN(__glewFragmentMaterialfSGIX)
+#define glFragmentMaterialfvSGIX GLEW_GET_FUN(__glewFragmentMaterialfvSGIX)
+#define glFragmentMaterialiSGIX GLEW_GET_FUN(__glewFragmentMaterialiSGIX)
+#define glFragmentMaterialivSGIX GLEW_GET_FUN(__glewFragmentMaterialivSGIX)
+#define glGetFragmentLightfvSGIX GLEW_GET_FUN(__glewGetFragmentLightfvSGIX)
+#define glGetFragmentLightivSGIX GLEW_GET_FUN(__glewGetFragmentLightivSGIX)
+#define glGetFragmentMaterialfvSGIX GLEW_GET_FUN(__glewGetFragmentMaterialfvSGIX)
+#define glGetFragmentMaterialivSGIX GLEW_GET_FUN(__glewGetFragmentMaterialivSGIX)
+
+#define GLEW_SGIX_fragment_specular_lighting GLEW_GET_VAR(__GLEW_SGIX_fragment_specular_lighting)
+
+#endif /* GL_SGIX_fragment_specular_lighting */
+
+/* ---------------------- GL_SGIX_fragments_instrument --------------------- */
+
+#ifndef GL_SGIX_fragments_instrument
+#define GL_SGIX_fragments_instrument 1
+
+#define GL_FRAGMENTS_INSTRUMENT_SGIX 0x8313
+#define GL_FRAGMENTS_INSTRUMENT_COUNTERS_SGIX 0x8314
+#define GL_FRAGMENTS_INSTRUMENT_MAX_SGIX 0x8315
+
+#define GLEW_SGIX_fragments_instrument GLEW_GET_VAR(__GLEW_SGIX_fragments_instrument)
+
+#endif /* GL_SGIX_fragments_instrument */
+
+/* --------------------------- GL_SGIX_framezoom --------------------------- */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+
+typedef void (GLAPIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+
+#define glFrameZoomSGIX GLEW_GET_FUN(__glewFrameZoomSGIX)
+
+#define GLEW_SGIX_framezoom GLEW_GET_VAR(__GLEW_SGIX_framezoom)
+
+#endif /* GL_SGIX_framezoom */
+
+/* -------------------------- GL_SGIX_icc_texture -------------------------- */
+
+#ifndef GL_SGIX_icc_texture
+#define GL_SGIX_icc_texture 1
+
+#define GL_RGB_ICC_SGIX 0x8460
+#define GL_RGBA_ICC_SGIX 0x8461
+#define GL_ALPHA_ICC_SGIX 0x8462
+#define GL_LUMINANCE_ICC_SGIX 0x8463
+#define GL_INTENSITY_ICC_SGIX 0x8464
+#define GL_LUMINANCE_ALPHA_ICC_SGIX 0x8465
+#define GL_R5_G6_B5_ICC_SGIX 0x8466
+#define GL_R5_G6_B5_A8_ICC_SGIX 0x8467
+#define GL_ALPHA16_ICC_SGIX 0x8468
+#define GL_LUMINANCE16_ICC_SGIX 0x8469
+#define GL_INTENSITY16_ICC_SGIX 0x846A
+#define GL_LUMINANCE16_ALPHA8_ICC_SGIX 0x846B
+
+#define GLEW_SGIX_icc_texture GLEW_GET_VAR(__GLEW_SGIX_icc_texture)
+
+#endif /* GL_SGIX_icc_texture */
+
+/* ------------------------ GL_SGIX_igloo_interface ------------------------ */
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+
+#define GL_IGLOO_FULLSCREEN_SGIX 0x819E
+#define GL_IGLOO_VIEWPORT_OFFSET_SGIX 0x819F
+#define GL_IGLOO_SWAPTMESH_SGIX 0x81A0
+#define GL_IGLOO_COLORNORMAL_SGIX 0x81A1
+#define GL_IGLOO_IRISGL_MODE_SGIX 0x81A2
+#define GL_IGLOO_LMC_COLOR_SGIX 0x81A3
+#define GL_IGLOO_TMESHMODE_SGIX 0x81A4
+#define GL_LIGHT31 0xBEAD
+
+typedef void (GLAPIENTRY * PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, void *param);
+
+#define glIglooInterfaceSGIX GLEW_GET_FUN(__glewIglooInterfaceSGIX)
+
+#define GLEW_SGIX_igloo_interface GLEW_GET_VAR(__GLEW_SGIX_igloo_interface)
+
+#endif /* GL_SGIX_igloo_interface */
+
+/* ----------------------- GL_SGIX_image_compression ----------------------- */
+
+#ifndef GL_SGIX_image_compression
+#define GL_SGIX_image_compression 1
+
+#define GLEW_SGIX_image_compression GLEW_GET_VAR(__GLEW_SGIX_image_compression)
+
+#endif /* GL_SGIX_image_compression */
+
+/* ---------------------- GL_SGIX_impact_pixel_texture --------------------- */
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_SGIX_impact_pixel_texture 1
+
+#define GLEW_SGIX_impact_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_impact_pixel_texture)
+
+#endif /* GL_SGIX_impact_pixel_texture */
+
+/* ------------------------ GL_SGIX_instrument_error ----------------------- */
+
+#ifndef GL_SGIX_instrument_error
+#define GL_SGIX_instrument_error 1
+
+#define GLEW_SGIX_instrument_error GLEW_GET_VAR(__GLEW_SGIX_instrument_error)
+
+#endif /* GL_SGIX_instrument_error */
+
+/* --------------------------- GL_SGIX_interlace --------------------------- */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+
+#define GL_INTERLACE_SGIX 0x8094
+
+#define GLEW_SGIX_interlace GLEW_GET_VAR(__GLEW_SGIX_interlace)
+
+#endif /* GL_SGIX_interlace */
+
+/* ------------------------- GL_SGIX_ir_instrument1 ------------------------ */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+
+#define GLEW_SGIX_ir_instrument1 GLEW_GET_VAR(__GLEW_SGIX_ir_instrument1)
+
+#endif /* GL_SGIX_ir_instrument1 */
+
+/* ----------------------- GL_SGIX_line_quality_hint ----------------------- */
+
+#ifndef GL_SGIX_line_quality_hint
+#define GL_SGIX_line_quality_hint 1
+
+#define GL_LINE_QUALITY_HINT_SGIX 0x835B
+
+#define GLEW_SGIX_line_quality_hint GLEW_GET_VAR(__GLEW_SGIX_line_quality_hint)
+
+#endif /* GL_SGIX_line_quality_hint */
+
+/* ------------------------- GL_SGIX_list_priority ------------------------- */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+
+#define GLEW_SGIX_list_priority GLEW_GET_VAR(__GLEW_SGIX_list_priority)
+
+#endif /* GL_SGIX_list_priority */
+
+/* ----------------------------- GL_SGIX_mpeg1 ----------------------------- */
+
+#ifndef GL_SGIX_mpeg1
+#define GL_SGIX_mpeg1 1
+
+typedef void (GLAPIENTRY * PFNGLALLOCMPEGPREDICTORSSGIXPROC) (GLsizei width, GLsizei height, GLsizei n, GLuint* predictors);
+typedef void (GLAPIENTRY * PFNGLDELETEMPEGPREDICTORSSGIXPROC) (GLsizei n, GLuint* predictors);
+typedef void (GLAPIENTRY * PFNGLGENMPEGPREDICTORSSGIXPROC) (GLsizei n, GLuint* predictors);
+typedef void (GLAPIENTRY * PFNGLGETMPEGPARAMETERFVSGIXPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMPEGPARAMETERIVSGIXPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMPEGPREDICTORSGIXPROC) (GLenum target, GLenum format, GLenum type, void *pixels);
+typedef void (GLAPIENTRY * PFNGLGETMPEGQUANTTABLEUBVPROC) (GLenum target, GLubyte* values);
+typedef GLboolean (GLAPIENTRY * PFNGLISMPEGPREDICTORSGIXPROC) (GLuint predictor);
+typedef void (GLAPIENTRY * PFNGLMPEGPREDICTORSGIXPROC) (GLenum target, GLenum format, GLenum type, void *pixels);
+typedef void (GLAPIENTRY * PFNGLMPEGQUANTTABLEUBVPROC) (GLenum target, GLubyte* values);
+typedef void (GLAPIENTRY * PFNGLSWAPMPEGPREDICTORSSGIXPROC) (GLenum target0, GLenum target1);
+
+#define glAllocMPEGPredictorsSGIX GLEW_GET_FUN(__glewAllocMPEGPredictorsSGIX)
+#define glDeleteMPEGPredictorsSGIX GLEW_GET_FUN(__glewDeleteMPEGPredictorsSGIX)
+#define glGenMPEGPredictorsSGIX GLEW_GET_FUN(__glewGenMPEGPredictorsSGIX)
+#define glGetMPEGParameterfvSGIX GLEW_GET_FUN(__glewGetMPEGParameterfvSGIX)
+#define glGetMPEGParameterivSGIX GLEW_GET_FUN(__glewGetMPEGParameterivSGIX)
+#define glGetMPEGPredictorSGIX GLEW_GET_FUN(__glewGetMPEGPredictorSGIX)
+#define glGetMPEGQuantTableubv GLEW_GET_FUN(__glewGetMPEGQuantTableubv)
+#define glIsMPEGPredictorSGIX GLEW_GET_FUN(__glewIsMPEGPredictorSGIX)
+#define glMPEGPredictorSGIX GLEW_GET_FUN(__glewMPEGPredictorSGIX)
+#define glMPEGQuantTableubv GLEW_GET_FUN(__glewMPEGQuantTableubv)
+#define glSwapMPEGPredictorsSGIX GLEW_GET_FUN(__glewSwapMPEGPredictorsSGIX)
+
+#define GLEW_SGIX_mpeg1 GLEW_GET_VAR(__GLEW_SGIX_mpeg1)
+
+#endif /* GL_SGIX_mpeg1 */
+
+/* ----------------------------- GL_SGIX_mpeg2 ----------------------------- */
+
+#ifndef GL_SGIX_mpeg2
+#define GL_SGIX_mpeg2 1
+
+#define GLEW_SGIX_mpeg2 GLEW_GET_VAR(__GLEW_SGIX_mpeg2)
+
+#endif /* GL_SGIX_mpeg2 */
+
+/* ------------------ GL_SGIX_nonlinear_lighting_pervertex ----------------- */
+
+#ifndef GL_SGIX_nonlinear_lighting_pervertex
+#define GL_SGIX_nonlinear_lighting_pervertex 1
+
+typedef void (GLAPIENTRY * PFNGLGETNONLINLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLint* terms, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETNONLINMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLint* terms, const GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLNONLINLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLint terms, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLNONLINMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLint terms, const GLfloat* params);
+
+#define glGetNonlinLightfvSGIX GLEW_GET_FUN(__glewGetNonlinLightfvSGIX)
+#define glGetNonlinMaterialfvSGIX GLEW_GET_FUN(__glewGetNonlinMaterialfvSGIX)
+#define glNonlinLightfvSGIX GLEW_GET_FUN(__glewNonlinLightfvSGIX)
+#define glNonlinMaterialfvSGIX GLEW_GET_FUN(__glewNonlinMaterialfvSGIX)
+
+#define GLEW_SGIX_nonlinear_lighting_pervertex GLEW_GET_VAR(__GLEW_SGIX_nonlinear_lighting_pervertex)
+
+#endif /* GL_SGIX_nonlinear_lighting_pervertex */
+
+/* --------------------------- GL_SGIX_nurbs_eval -------------------------- */
+
+#ifndef GL_SGIX_nurbs_eval
+#define GL_SGIX_nurbs_eval 1
+
+#define GL_MAP1_VERTEX_3_NURBS_SGIX 0x81CB
+#define GL_MAP1_VERTEX_4_NURBS_SGIX 0x81CC
+#define GL_MAP1_INDEX_NURBS_SGIX 0x81CD
+#define GL_MAP1_COLOR_4_NURBS_SGIX 0x81CE
+#define GL_MAP1_NORMAL_NURBS_SGIX 0x81CF
+#define GL_MAP1_TEXTURE_COORD_1_NURBS_SGIX 0x81E0
+#define GL_MAP1_TEXTURE_COORD_2_NURBS_SGIX 0x81E1
+#define GL_MAP1_TEXTURE_COORD_3_NURBS_SGIX 0x81E2
+#define GL_MAP1_TEXTURE_COORD_4_NURBS_SGIX 0x81E3
+#define GL_MAP2_VERTEX_3_NURBS_SGIX 0x81E4
+#define GL_MAP2_VERTEX_4_NURBS_SGIX 0x81E5
+#define GL_MAP2_INDEX_NURBS_SGIX 0x81E6
+#define GL_MAP2_COLOR_4_NURBS_SGIX 0x81E7
+#define GL_MAP2_NORMAL_NURBS_SGIX 0x81E8
+#define GL_MAP2_TEXTURE_COORD_1_NURBS_SGIX 0x81E9
+#define GL_MAP2_TEXTURE_COORD_2_NURBS_SGIX 0x81EA
+#define GL_MAP2_TEXTURE_COORD_3_NURBS_SGIX 0x81EB
+#define GL_MAP2_TEXTURE_COORD_4_NURBS_SGIX 0x81EC
+#define GL_NURBS_KNOT_COUNT_SGIX 0x81ED
+#define GL_NURBS_KNOT_VECTOR_SGIX 0x81EE
+
+#define GLEW_SGIX_nurbs_eval GLEW_GET_VAR(__GLEW_SGIX_nurbs_eval)
+
+#endif /* GL_SGIX_nurbs_eval */
+
+/* ---------------------- GL_SGIX_occlusion_instrument --------------------- */
+
+#ifndef GL_SGIX_occlusion_instrument
+#define GL_SGIX_occlusion_instrument 1
+
+#define GL_OCCLUSION_INSTRUMENT_SGIX 0x6060
+
+#define GLEW_SGIX_occlusion_instrument GLEW_GET_VAR(__GLEW_SGIX_occlusion_instrument)
+
+#endif /* GL_SGIX_occlusion_instrument */
+
+/* ------------------------- GL_SGIX_packed_6bytes ------------------------- */
+
+#ifndef GL_SGIX_packed_6bytes
+#define GL_SGIX_packed_6bytes 1
+
+#define GLEW_SGIX_packed_6bytes GLEW_GET_VAR(__GLEW_SGIX_packed_6bytes)
+
+#endif /* GL_SGIX_packed_6bytes */
+
+/* ------------------------- GL_SGIX_pixel_texture ------------------------- */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+
+typedef void (GLAPIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+
+#define glPixelTexGenSGIX GLEW_GET_FUN(__glewPixelTexGenSGIX)
+
+#define GLEW_SGIX_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_pixel_texture)
+
+#endif /* GL_SGIX_pixel_texture */
+
+/* ----------------------- GL_SGIX_pixel_texture_bits ---------------------- */
+
+#ifndef GL_SGIX_pixel_texture_bits
+#define GL_SGIX_pixel_texture_bits 1
+
+#define GLEW_SGIX_pixel_texture_bits GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_bits)
+
+#endif /* GL_SGIX_pixel_texture_bits */
+
+/* ----------------------- GL_SGIX_pixel_texture_lod ----------------------- */
+
+#ifndef GL_SGIX_pixel_texture_lod
+#define GL_SGIX_pixel_texture_lod 1
+
+#define GLEW_SGIX_pixel_texture_lod GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_lod)
+
+#endif /* GL_SGIX_pixel_texture_lod */
+
+/* -------------------------- GL_SGIX_pixel_tiles -------------------------- */
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+
+#define GLEW_SGIX_pixel_tiles GLEW_GET_VAR(__GLEW_SGIX_pixel_tiles)
+
+#endif /* GL_SGIX_pixel_tiles */
+
+/* ------------------------- GL_SGIX_polynomial_ffd ------------------------ */
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x1
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x2
+
+typedef void (GLAPIENTRY * PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (GLAPIENTRY * PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+
+#define glDeformSGIX GLEW_GET_FUN(__glewDeformSGIX)
+#define glLoadIdentityDeformationMapSGIX GLEW_GET_FUN(__glewLoadIdentityDeformationMapSGIX)
+
+#define GLEW_SGIX_polynomial_ffd GLEW_GET_VAR(__GLEW_SGIX_polynomial_ffd)
+
+#endif /* GL_SGIX_polynomial_ffd */
+
+/* --------------------------- GL_SGIX_quad_mesh --------------------------- */
+
+#ifndef GL_SGIX_quad_mesh
+#define GL_SGIX_quad_mesh 1
+
+typedef void (GLAPIENTRY * PFNGLMESHBREADTHSGIXPROC) (GLint breadth);
+typedef void (GLAPIENTRY * PFNGLMESHSTRIDESGIXPROC) (GLint stride);
+
+#define glMeshBreadthSGIX GLEW_GET_FUN(__glewMeshBreadthSGIX)
+#define glMeshStrideSGIX GLEW_GET_FUN(__glewMeshStrideSGIX)
+
+#define GLEW_SGIX_quad_mesh GLEW_GET_VAR(__GLEW_SGIX_quad_mesh)
+
+#endif /* GL_SGIX_quad_mesh */
+
+/* ------------------------ GL_SGIX_reference_plane ------------------------ */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+
+typedef void (GLAPIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble* equation);
+
+#define glReferencePlaneSGIX GLEW_GET_FUN(__glewReferencePlaneSGIX)
+
+#define GLEW_SGIX_reference_plane GLEW_GET_VAR(__GLEW_SGIX_reference_plane)
+
+#endif /* GL_SGIX_reference_plane */
+
+/* ---------------------------- GL_SGIX_resample --------------------------- */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+
+#define GL_PACK_RESAMPLE_SGIX 0x842E
+#define GL_UNPACK_RESAMPLE_SGIX 0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX 0x8430
+#define GL_RESAMPLE_REPLICATE_SGIX 0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434
+
+#define GLEW_SGIX_resample GLEW_GET_VAR(__GLEW_SGIX_resample)
+
+#endif /* GL_SGIX_resample */
+
+/* ------------------------- GL_SGIX_scalebias_hint ------------------------ */
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+
+#define GL_SCALEBIAS_HINT_SGIX 0x8322
+
+#define GLEW_SGIX_scalebias_hint GLEW_GET_VAR(__GLEW_SGIX_scalebias_hint)
+
+#endif /* GL_SGIX_scalebias_hint */
+
+/* ----------------------------- GL_SGIX_shadow ---------------------------- */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+
+#define GL_TEXTURE_COMPARE_SGIX 0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D
+
+#define GLEW_SGIX_shadow GLEW_GET_VAR(__GLEW_SGIX_shadow)
+
+#endif /* GL_SGIX_shadow */
+
+/* ------------------------- GL_SGIX_shadow_ambient ------------------------ */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+
+#define GL_SHADOW_AMBIENT_SGIX 0x80BF
+
+#define GLEW_SGIX_shadow_ambient GLEW_GET_VAR(__GLEW_SGIX_shadow_ambient)
+
+#endif /* GL_SGIX_shadow_ambient */
+
+/* ------------------------------ GL_SGIX_slim ----------------------------- */
+
+#ifndef GL_SGIX_slim
+#define GL_SGIX_slim 1
+
+#define GL_PACK_MAX_COMPRESSED_SIZE_SGIX 0x831B
+#define GL_SLIM8U_SGIX 0x831D
+#define GL_SLIM10U_SGIX 0x831E
+#define GL_SLIM12S_SGIX 0x831F
+
+#define GLEW_SGIX_slim GLEW_GET_VAR(__GLEW_SGIX_slim)
+
+#endif /* GL_SGIX_slim */
+
+/* ------------------------ GL_SGIX_spotlight_cutoff ----------------------- */
+
+#ifndef GL_SGIX_spotlight_cutoff
+#define GL_SGIX_spotlight_cutoff 1
+
+#define GL_SPOT_CUTOFF_DELTA_SGIX 0x8193
+
+#define GLEW_SGIX_spotlight_cutoff GLEW_GET_VAR(__GLEW_SGIX_spotlight_cutoff)
+
+#endif /* GL_SGIX_spotlight_cutoff */
+
+/* ----------------------------- GL_SGIX_sprite ---------------------------- */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, GLint* params);
+
+#define glSpriteParameterfSGIX GLEW_GET_FUN(__glewSpriteParameterfSGIX)
+#define glSpriteParameterfvSGIX GLEW_GET_FUN(__glewSpriteParameterfvSGIX)
+#define glSpriteParameteriSGIX GLEW_GET_FUN(__glewSpriteParameteriSGIX)
+#define glSpriteParameterivSGIX GLEW_GET_FUN(__glewSpriteParameterivSGIX)
+
+#define GLEW_SGIX_sprite GLEW_GET_VAR(__GLEW_SGIX_sprite)
+
+#endif /* GL_SGIX_sprite */
+
+/* -------------------------- GL_SGIX_subdiv_patch ------------------------- */
+
+#ifndef GL_SGIX_subdiv_patch
+#define GL_SGIX_subdiv_patch 1
+
+#define GLEW_SGIX_subdiv_patch GLEW_GET_VAR(__GLEW_SGIX_subdiv_patch)
+
+#endif /* GL_SGIX_subdiv_patch */
+
+/* --------------------------- GL_SGIX_subsample --------------------------- */
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+
+#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4
+
+#define GLEW_SGIX_subsample GLEW_GET_VAR(__GLEW_SGIX_subsample)
+
+#endif /* GL_SGIX_subsample */
+
+/* ----------------------- GL_SGIX_tag_sample_buffer ----------------------- */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+
+typedef void (GLAPIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+
+#define glTagSampleBufferSGIX GLEW_GET_FUN(__glewTagSampleBufferSGIX)
+
+#define GLEW_SGIX_tag_sample_buffer GLEW_GET_VAR(__GLEW_SGIX_tag_sample_buffer)
+
+#endif /* GL_SGIX_tag_sample_buffer */
+
+/* ------------------------ GL_SGIX_texture_add_env ------------------------ */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+
+#define GLEW_SGIX_texture_add_env GLEW_GET_VAR(__GLEW_SGIX_texture_add_env)
+
+#endif /* GL_SGIX_texture_add_env */
+
+/* -------------------- GL_SGIX_texture_coordinate_clamp ------------------- */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B
+
+#define GLEW_SGIX_texture_coordinate_clamp GLEW_GET_VAR(__GLEW_SGIX_texture_coordinate_clamp)
+
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+/* ------------------------ GL_SGIX_texture_lod_bias ----------------------- */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+
+#define GLEW_SGIX_texture_lod_bias GLEW_GET_VAR(__GLEW_SGIX_texture_lod_bias)
+
+#endif /* GL_SGIX_texture_lod_bias */
+
+/* ------------------- GL_SGIX_texture_mipmap_anisotropic ------------------ */
+
+#ifndef GL_SGIX_texture_mipmap_anisotropic
+#define GL_SGIX_texture_mipmap_anisotropic 1
+
+#define GL_TEXTURE_MIPMAP_ANISOTROPY_SGIX 0x832E
+#define GL_MAX_MIPMAP_ANISOTROPY_SGIX 0x832F
+
+#define GLEW_SGIX_texture_mipmap_anisotropic GLEW_GET_VAR(__GLEW_SGIX_texture_mipmap_anisotropic)
+
+#endif /* GL_SGIX_texture_mipmap_anisotropic */
+
+/* ---------------------- GL_SGIX_texture_multi_buffer --------------------- */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+
+#define GLEW_SGIX_texture_multi_buffer GLEW_GET_VAR(__GLEW_SGIX_texture_multi_buffer)
+
+#endif /* GL_SGIX_texture_multi_buffer */
+
+/* ------------------------- GL_SGIX_texture_phase ------------------------- */
+
+#ifndef GL_SGIX_texture_phase
+#define GL_SGIX_texture_phase 1
+
+#define GL_PHASE_SGIX 0x832A
+
+#define GLEW_SGIX_texture_phase GLEW_GET_VAR(__GLEW_SGIX_texture_phase)
+
+#endif /* GL_SGIX_texture_phase */
+
+/* ------------------------- GL_SGIX_texture_range ------------------------- */
+
+#ifndef GL_SGIX_texture_range
+#define GL_SGIX_texture_range 1
+
+#define GL_RGB_SIGNED_SGIX 0x85E0
+#define GL_RGBA_SIGNED_SGIX 0x85E1
+#define GL_ALPHA_SIGNED_SGIX 0x85E2
+#define GL_LUMINANCE_SIGNED_SGIX 0x85E3
+#define GL_INTENSITY_SIGNED_SGIX 0x85E4
+#define GL_LUMINANCE_ALPHA_SIGNED_SGIX 0x85E5
+#define GL_RGB16_SIGNED_SGIX 0x85E6
+#define GL_RGBA16_SIGNED_SGIX 0x85E7
+#define GL_ALPHA16_SIGNED_SGIX 0x85E8
+#define GL_LUMINANCE16_SIGNED_SGIX 0x85E9
+#define GL_INTENSITY16_SIGNED_SGIX 0x85EA
+#define GL_LUMINANCE16_ALPHA16_SIGNED_SGIX 0x85EB
+#define GL_RGB_EXTENDED_RANGE_SGIX 0x85EC
+#define GL_RGBA_EXTENDED_RANGE_SGIX 0x85ED
+#define GL_ALPHA_EXTENDED_RANGE_SGIX 0x85EE
+#define GL_LUMINANCE_EXTENDED_RANGE_SGIX 0x85EF
+#define GL_INTENSITY_EXTENDED_RANGE_SGIX 0x85F0
+#define GL_LUMINANCE_ALPHA_EXTENDED_RANGE_SGIX 0x85F1
+#define GL_RGB16_EXTENDED_RANGE_SGIX 0x85F2
+#define GL_RGBA16_EXTENDED_RANGE_SGIX 0x85F3
+#define GL_ALPHA16_EXTENDED_RANGE_SGIX 0x85F4
+#define GL_LUMINANCE16_EXTENDED_RANGE_SGIX 0x85F5
+#define GL_INTENSITY16_EXTENDED_RANGE_SGIX 0x85F6
+#define GL_LUMINANCE16_ALPHA16_EXTENDED_RANGE_SGIX 0x85F7
+#define GL_MIN_LUMINANCE_SGIS 0x85F8
+#define GL_MAX_LUMINANCE_SGIS 0x85F9
+#define GL_MIN_INTENSITY_SGIS 0x85FA
+#define GL_MAX_INTENSITY_SGIS 0x85FB
+
+#define GLEW_SGIX_texture_range GLEW_GET_VAR(__GLEW_SGIX_texture_range)
+
+#endif /* GL_SGIX_texture_range */
+
+/* ----------------------- GL_SGIX_texture_scale_bias ---------------------- */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+
+#define GLEW_SGIX_texture_scale_bias GLEW_GET_VAR(__GLEW_SGIX_texture_scale_bias)
+
+#endif /* GL_SGIX_texture_scale_bias */
+
+/* ---------------------- GL_SGIX_texture_supersample ---------------------- */
+
+#ifndef GL_SGIX_texture_supersample
+#define GL_SGIX_texture_supersample 1
+
+#define GLEW_SGIX_texture_supersample GLEW_GET_VAR(__GLEW_SGIX_texture_supersample)
+
+#endif /* GL_SGIX_texture_supersample */
+
+/* --------------------------- GL_SGIX_vector_ops -------------------------- */
+
+#ifndef GL_SGIX_vector_ops
+#define GL_SGIX_vector_ops 1
+
+typedef void (GLAPIENTRY * PFNGLGETVECTOROPERATIONSGIXPROC) (GLenum operation);
+typedef void (GLAPIENTRY * PFNGLVECTOROPERATIONSGIXPROC) (GLenum operation);
+
+#define glGetVectorOperationSGIX GLEW_GET_FUN(__glewGetVectorOperationSGIX)
+#define glVectorOperationSGIX GLEW_GET_FUN(__glewVectorOperationSGIX)
+
+#define GLEW_SGIX_vector_ops GLEW_GET_VAR(__GLEW_SGIX_vector_ops)
+
+#endif /* GL_SGIX_vector_ops */
+
+/* ---------------------- GL_SGIX_vertex_array_object ---------------------- */
+
+#ifndef GL_SGIX_vertex_array_object
+#define GL_SGIX_vertex_array_object 1
+
+typedef GLboolean (GLAPIENTRY * PFNGLAREVERTEXARRAYSRESIDENTSGIXPROC) (GLsizei n, const GLuint* arrays, GLboolean* residences);
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYSGIXPROC) (GLuint array);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSSGIXPROC) (GLsizei n, const GLuint* arrays);
+typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSSGIXPROC) (GLsizei n, GLuint* arrays);
+typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYSGIXPROC) (GLuint array);
+typedef void (GLAPIENTRY * PFNGLPRIORITIZEVERTEXARRAYSSGIXPROC) (GLsizei n, const GLuint* arrays, const GLclampf* priorities);
+
+#define glAreVertexArraysResidentSGIX GLEW_GET_FUN(__glewAreVertexArraysResidentSGIX)
+#define glBindVertexArraySGIX GLEW_GET_FUN(__glewBindVertexArraySGIX)
+#define glDeleteVertexArraysSGIX GLEW_GET_FUN(__glewDeleteVertexArraysSGIX)
+#define glGenVertexArraysSGIX GLEW_GET_FUN(__glewGenVertexArraysSGIX)
+#define glIsVertexArraySGIX GLEW_GET_FUN(__glewIsVertexArraySGIX)
+#define glPrioritizeVertexArraysSGIX GLEW_GET_FUN(__glewPrioritizeVertexArraysSGIX)
+
+#define GLEW_SGIX_vertex_array_object GLEW_GET_VAR(__GLEW_SGIX_vertex_array_object)
+
+#endif /* GL_SGIX_vertex_array_object */
+
+/* ------------------------- GL_SGIX_vertex_preclip ------------------------ */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+
+#define GL_VERTEX_PRECLIP_SGIX 0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
+
+#define GLEW_SGIX_vertex_preclip GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip)
+
+#endif /* GL_SGIX_vertex_preclip */
+
+/* ---------------------- GL_SGIX_vertex_preclip_hint ---------------------- */
+
+#ifndef GL_SGIX_vertex_preclip_hint
+#define GL_SGIX_vertex_preclip_hint 1
+
+#define GL_VERTEX_PRECLIP_SGIX 0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
+
+#define GLEW_SGIX_vertex_preclip_hint GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip_hint)
+
+#endif /* GL_SGIX_vertex_preclip_hint */
+
+/* ----------------------------- GL_SGIX_ycrcb ----------------------------- */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+
+#define GLEW_SGIX_ycrcb GLEW_GET_VAR(__GLEW_SGIX_ycrcb)
+
+#endif /* GL_SGIX_ycrcb */
+
+/* ------------------------ GL_SGIX_ycrcb_subsample ------------------------ */
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+
+#define GLEW_SGIX_ycrcb_subsample GLEW_GET_VAR(__GLEW_SGIX_ycrcb_subsample)
+
+#endif /* GL_SGIX_ycrcb_subsample */
+
+/* ----------------------------- GL_SGIX_ycrcba ---------------------------- */
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+
+#define GL_YCRCB_SGIX 0x8318
+#define GL_YCRCBA_SGIX 0x8319
+
+#define GLEW_SGIX_ycrcba GLEW_GET_VAR(__GLEW_SGIX_ycrcba)
+
+#endif /* GL_SGIX_ycrcba */
+
+/* -------------------------- GL_SGI_color_matrix -------------------------- */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+
+#define GL_COLOR_MATRIX_SGI 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+
+#define GLEW_SGI_color_matrix GLEW_GET_VAR(__GLEW_SGI_color_matrix)
+
+#endif /* GL_SGI_color_matrix */
+
+/* --------------------------- GL_SGI_color_table -------------------------- */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+
+#define GL_COLOR_TABLE_SGI 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI 0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI 0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table);
+
+#define glColorTableParameterfvSGI GLEW_GET_FUN(__glewColorTableParameterfvSGI)
+#define glColorTableParameterivSGI GLEW_GET_FUN(__glewColorTableParameterivSGI)
+#define glColorTableSGI GLEW_GET_FUN(__glewColorTableSGI)
+#define glCopyColorTableSGI GLEW_GET_FUN(__glewCopyColorTableSGI)
+#define glGetColorTableParameterfvSGI GLEW_GET_FUN(__glewGetColorTableParameterfvSGI)
+#define glGetColorTableParameterivSGI GLEW_GET_FUN(__glewGetColorTableParameterivSGI)
+#define glGetColorTableSGI GLEW_GET_FUN(__glewGetColorTableSGI)
+
+#define GLEW_SGI_color_table GLEW_GET_VAR(__GLEW_SGI_color_table)
+
+#endif /* GL_SGI_color_table */
+
+/* ----------------------------- GL_SGI_complex ---------------------------- */
+
+#ifndef GL_SGI_complex
+#define GL_SGI_complex 1
+
+#define GLEW_SGI_complex GLEW_GET_VAR(__GLEW_SGI_complex)
+
+#endif /* GL_SGI_complex */
+
+/* -------------------------- GL_SGI_complex_type -------------------------- */
+
+#ifndef GL_SGI_complex_type
+#define GL_SGI_complex_type 1
+
+#define GL_COMPLEX_UNSIGNED_BYTE_SGI 0x81BD
+#define GL_COMPLEX_BYTE_SGI 0x81BE
+#define GL_COMPLEX_UNSIGNED_SHORT_SGI 0x81BF
+#define GL_COMPLEX_SHORT_SGI 0x81C0
+#define GL_COMPLEX_UNSIGNED_INT_SGI 0x81C1
+#define GL_COMPLEX_INT_SGI 0x81C2
+#define GL_COMPLEX_FLOAT_SGI 0x81C3
+
+#define GLEW_SGI_complex_type GLEW_GET_VAR(__GLEW_SGI_complex_type)
+
+#endif /* GL_SGI_complex_type */
+
+/* ------------------------------- GL_SGI_fft ------------------------------ */
+
+#ifndef GL_SGI_fft
+#define GL_SGI_fft 1
+
+#define GL_PIXEL_TRANSFORM_OPERATOR_SGI 0x81C4
+#define GL_CONVOLUTION_SGI 0x81C5
+#define GL_FFT_1D_SGI 0x81C6
+#define GL_PIXEL_TRANSFORM_SGI 0x81C7
+#define GL_MAX_FFT_WIDTH_SGI 0x81C8
+
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFSGIPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERISGIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMSGIPROC) (GLenum target);
+
+#define glGetPixelTransformParameterfvSGI GLEW_GET_FUN(__glewGetPixelTransformParameterfvSGI)
+#define glGetPixelTransformParameterivSGI GLEW_GET_FUN(__glewGetPixelTransformParameterivSGI)
+#define glPixelTransformParameterfSGI GLEW_GET_FUN(__glewPixelTransformParameterfSGI)
+#define glPixelTransformParameterfvSGI GLEW_GET_FUN(__glewPixelTransformParameterfvSGI)
+#define glPixelTransformParameteriSGI GLEW_GET_FUN(__glewPixelTransformParameteriSGI)
+#define glPixelTransformParameterivSGI GLEW_GET_FUN(__glewPixelTransformParameterivSGI)
+#define glPixelTransformSGI GLEW_GET_FUN(__glewPixelTransformSGI)
+
+#define GLEW_SGI_fft GLEW_GET_VAR(__GLEW_SGI_fft)
+
+#endif /* GL_SGI_fft */
+
+/* ----------------------- GL_SGI_texture_color_table ---------------------- */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+
+#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD
+
+#define GLEW_SGI_texture_color_table GLEW_GET_VAR(__GLEW_SGI_texture_color_table)
+
+#endif /* GL_SGI_texture_color_table */
+
+/* ------------------------- GL_SUNX_constant_data ------------------------- */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+
+#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6
+
+typedef void (GLAPIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
+
+#define glFinishTextureSUNX GLEW_GET_FUN(__glewFinishTextureSUNX)
+
+#define GLEW_SUNX_constant_data GLEW_GET_VAR(__GLEW_SUNX_constant_data)
+
+#endif /* GL_SUNX_constant_data */
+
+/* -------------------- GL_SUN_convolution_border_modes -------------------- */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+
+#define GL_WRAP_BORDER_SUN 0x81D4
+
+#define GLEW_SUN_convolution_border_modes GLEW_GET_VAR(__GLEW_SUN_convolution_border_modes)
+
+#endif /* GL_SUN_convolution_border_modes */
+
+/* -------------------------- GL_SUN_global_alpha -------------------------- */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+
+#define GL_GLOBAL_ALPHA_SUN 0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA
+
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+
+#define glGlobalAlphaFactorbSUN GLEW_GET_FUN(__glewGlobalAlphaFactorbSUN)
+#define glGlobalAlphaFactordSUN GLEW_GET_FUN(__glewGlobalAlphaFactordSUN)
+#define glGlobalAlphaFactorfSUN GLEW_GET_FUN(__glewGlobalAlphaFactorfSUN)
+#define glGlobalAlphaFactoriSUN GLEW_GET_FUN(__glewGlobalAlphaFactoriSUN)
+#define glGlobalAlphaFactorsSUN GLEW_GET_FUN(__glewGlobalAlphaFactorsSUN)
+#define glGlobalAlphaFactorubSUN GLEW_GET_FUN(__glewGlobalAlphaFactorubSUN)
+#define glGlobalAlphaFactoruiSUN GLEW_GET_FUN(__glewGlobalAlphaFactoruiSUN)
+#define glGlobalAlphaFactorusSUN GLEW_GET_FUN(__glewGlobalAlphaFactorusSUN)
+
+#define GLEW_SUN_global_alpha GLEW_GET_VAR(__GLEW_SUN_global_alpha)
+
+#endif /* GL_SUN_global_alpha */
+
+/* --------------------------- GL_SUN_mesh_array --------------------------- */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+
+#define GL_QUAD_MESH_SUN 0x8614
+#define GL_TRIANGLE_MESH_SUN 0x8615
+
+#define GLEW_SUN_mesh_array GLEW_GET_VAR(__GLEW_SUN_mesh_array)
+
+#endif /* GL_SUN_mesh_array */
+
+/* ------------------------ GL_SUN_read_video_pixels ----------------------- */
+
+#ifndef GL_SUN_read_video_pixels
+#define GL_SUN_read_video_pixels 1
+
+typedef void (GLAPIENTRY * PFNGLREADVIDEOPIXELSSUNPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels);
+
+#define glReadVideoPixelsSUN GLEW_GET_FUN(__glewReadVideoPixelsSUN)
+
+#define GLEW_SUN_read_video_pixels GLEW_GET_VAR(__GLEW_SUN_read_video_pixels)
+
+#endif /* GL_SUN_read_video_pixels */
+
+/* --------------------------- GL_SUN_slice_accum -------------------------- */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+
+#define GL_SLICE_ACCUM_SUN 0x85CC
+
+#define GLEW_SUN_slice_accum GLEW_GET_VAR(__GLEW_SUN_slice_accum)
+
+#endif /* GL_SUN_slice_accum */
+
+/* -------------------------- GL_SUN_triangle_list ------------------------- */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+
+#define GL_RESTART_SUN 0x01
+#define GL_REPLACE_MIDDLE_SUN 0x02
+#define GL_REPLACE_OLDEST_SUN 0x03
+#define GL_TRIANGLE_LIST_SUN 0x81D7
+#define GL_REPLACEMENT_CODE_SUN 0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN 0x85C4
+#define GL_R1UI_C4UB_V3F_SUN 0x85C5
+#define GL_R1UI_C3F_V3F_SUN 0x85C6
+#define GL_R1UI_N3F_V3F_SUN 0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8
+#define GL_R1UI_T2F_V3F_SUN 0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB
+
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte* code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint* code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort* code);
+
+#define glReplacementCodePointerSUN GLEW_GET_FUN(__glewReplacementCodePointerSUN)
+#define glReplacementCodeubSUN GLEW_GET_FUN(__glewReplacementCodeubSUN)
+#define glReplacementCodeubvSUN GLEW_GET_FUN(__glewReplacementCodeubvSUN)
+#define glReplacementCodeuiSUN GLEW_GET_FUN(__glewReplacementCodeuiSUN)
+#define glReplacementCodeuivSUN GLEW_GET_FUN(__glewReplacementCodeuivSUN)
+#define glReplacementCodeusSUN GLEW_GET_FUN(__glewReplacementCodeusSUN)
+#define glReplacementCodeusvSUN GLEW_GET_FUN(__glewReplacementCodeusvSUN)
+
+#define GLEW_SUN_triangle_list GLEW_GET_VAR(__GLEW_SUN_triangle_list)
+
+#endif /* GL_SUN_triangle_list */
+
+/* ----------------------------- GL_SUN_vertex ----------------------------- */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+
+typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint* rc, const GLubyte *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat* tc, const GLubyte *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
+
+#define glColor3fVertex3fSUN GLEW_GET_FUN(__glewColor3fVertex3fSUN)
+#define glColor3fVertex3fvSUN GLEW_GET_FUN(__glewColor3fVertex3fvSUN)
+#define glColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fSUN)
+#define glColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fvSUN)
+#define glColor4ubVertex2fSUN GLEW_GET_FUN(__glewColor4ubVertex2fSUN)
+#define glColor4ubVertex2fvSUN GLEW_GET_FUN(__glewColor4ubVertex2fvSUN)
+#define glColor4ubVertex3fSUN GLEW_GET_FUN(__glewColor4ubVertex3fSUN)
+#define glColor4ubVertex3fvSUN GLEW_GET_FUN(__glewColor4ubVertex3fvSUN)
+#define glNormal3fVertex3fSUN GLEW_GET_FUN(__glewNormal3fVertex3fSUN)
+#define glNormal3fVertex3fvSUN GLEW_GET_FUN(__glewNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fSUN)
+#define glReplacementCodeuiColor3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fvSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor4ubVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fSUN)
+#define glReplacementCodeuiColor4ubVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fvSUN)
+#define glReplacementCodeuiNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fSUN)
+#define glReplacementCodeuiNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fvSUN)
+#define glReplacementCodeuiVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fSUN)
+#define glReplacementCodeuiVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fvSUN)
+#define glTexCoord2fColor3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fSUN)
+#define glTexCoord2fColor3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fvSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glTexCoord2fColor4ubVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fSUN)
+#define glTexCoord2fColor4ubVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fvSUN)
+#define glTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fSUN)
+#define glTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fvSUN)
+#define glTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fSUN)
+#define glTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fvSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fvSUN)
+#define glTexCoord4fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fSUN)
+#define glTexCoord4fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fvSUN)
+
+#define GLEW_SUN_vertex GLEW_GET_VAR(__GLEW_SUN_vertex)
+
+#endif /* GL_SUN_vertex */
+
+/* -------------------------- GL_WIN_phong_shading ------------------------- */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+
+#define GL_PHONG_WIN 0x80EA
+#define GL_PHONG_HINT_WIN 0x80EB
+
+#define GLEW_WIN_phong_shading GLEW_GET_VAR(__GLEW_WIN_phong_shading)
+
+#endif /* GL_WIN_phong_shading */
+
+/* ------------------------- GL_WIN_scene_markerXXX ------------------------ */
+
+#ifndef GL_WIN_scene_markerXXX
+#define GL_WIN_scene_markerXXX 1
+
+#define GLEW_WIN_scene_markerXXX GLEW_GET_VAR(__GLEW_WIN_scene_markerXXX)
+
+#endif /* GL_WIN_scene_markerXXX */
+
+/* -------------------------- GL_WIN_specular_fog -------------------------- */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+
+#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC
+
+#define GLEW_WIN_specular_fog GLEW_GET_VAR(__GLEW_WIN_specular_fog)
+
+#endif /* GL_WIN_specular_fog */
+
+/* ---------------------------- GL_WIN_swap_hint --------------------------- */
+
+#ifndef GL_WIN_swap_hint
+#define GL_WIN_swap_hint 1
+
+typedef void (GLAPIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glAddSwapHintRectWIN GLEW_GET_FUN(__glewAddSwapHintRectWIN)
+
+#define GLEW_WIN_swap_hint GLEW_GET_VAR(__GLEW_WIN_swap_hint)
+
+#endif /* GL_WIN_swap_hint */
+
+/* ------------------------------------------------------------------------- */
+
+
+
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DPROC __glewTexImage3D;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D;
+
+GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture;
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv;
+GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage;
+
+GLEW_FUN_EXPORT PFNGLBLENDCOLORPROC __glewBlendColor;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONPROC __glewBlendEquation;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate;
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDPROC __glewFogCoordd;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDVPROC __glewFogCoorddv;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFPROC __glewFogCoordf;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFVPROC __glewFogCoordfv;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFPROC __glewPointParameterf;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIPROC __glewPointParameteri;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DPROC __glewWindowPos2d;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FPROC __glewWindowPos2f;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IPROC __glewWindowPos2i;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SPROC __glewWindowPos2s;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DPROC __glewWindowPos3d;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FPROC __glewWindowPos3f;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IPROC __glewWindowPos3i;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SPROC __glewWindowPos3s;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYPROC __glewBeginQuery;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERPROC __glewBindBuffer;
+GLEW_FUN_EXPORT PFNGLBUFFERDATAPROC __glewBufferData;
+GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAPROC __glewBufferSubData;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERSPROC __glewDeleteBuffers;
+GLEW_FUN_EXPORT PFNGLDELETEQUERIESPROC __glewDeleteQueries;
+GLEW_FUN_EXPORT PFNGLENDQUERYPROC __glewEndQuery;
+GLEW_FUN_EXPORT PFNGLGENBUFFERSPROC __glewGenBuffers;
+GLEW_FUN_EXPORT PFNGLGENQUERIESPROC __glewGenQueries;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv;
+GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv;
+GLEW_FUN_EXPORT PFNGLGETQUERYIVPROC __glewGetQueryiv;
+GLEW_FUN_EXPORT PFNGLISBUFFERPROC __glewIsBuffer;
+GLEW_FUN_EXPORT PFNGLISQUERYPROC __glewIsQuery;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERPROC __glewMapBuffer;
+GLEW_FUN_EXPORT PFNGLUNMAPBUFFERPROC __glewUnmapBuffer;
+
+GLEW_FUN_EXPORT PFNGLATTACHSHADERPROC __glewAttachShader;
+GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate;
+GLEW_FUN_EXPORT PFNGLCOMPILESHADERPROC __glewCompileShader;
+GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPROC __glewCreateProgram;
+GLEW_FUN_EXPORT PFNGLCREATESHADERPROC __glewCreateShader;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPROC __glewDeleteProgram;
+GLEW_FUN_EXPORT PFNGLDELETESHADERPROC __glewDeleteShader;
+GLEW_FUN_EXPORT PFNGLDETACHSHADERPROC __glewDetachShader;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray;
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSPROC __glewDrawBuffers;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray;
+GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform;
+GLEW_FUN_EXPORT PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders;
+GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVPROC __glewGetProgramiv;
+GLEW_FUN_EXPORT PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog;
+GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEPROC __glewGetShaderSource;
+GLEW_FUN_EXPORT PFNGLGETSHADERIVPROC __glewGetShaderiv;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMFVPROC __glewGetUniformfv;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMIVPROC __glewGetUniformiv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv;
+GLEW_FUN_EXPORT PFNGLISPROGRAMPROC __glewIsProgram;
+GLEW_FUN_EXPORT PFNGLISSHADERPROC __glewIsShader;
+GLEW_FUN_EXPORT PFNGLLINKPROGRAMPROC __glewLinkProgram;
+GLEW_FUN_EXPORT PFNGLSHADERSOURCEPROC __glewShaderSource;
+GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate;
+GLEW_FUN_EXPORT PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate;
+GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FPROC __glewUniform1f;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FVPROC __glewUniform1fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IPROC __glewUniform1i;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IVPROC __glewUniform1iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FPROC __glewUniform2f;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FVPROC __glewUniform2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IPROC __glewUniform2i;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IVPROC __glewUniform2iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FPROC __glewUniform3f;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FVPROC __glewUniform3fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IPROC __glewUniform3i;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IVPROC __glewUniform3iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FPROC __glewUniform4f;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FVPROC __glewUniform4fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IPROC __glewUniform4i;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IVPROC __glewUniform4iv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv;
+GLEW_FUN_EXPORT PFNGLUSEPROGRAMPROC __glewUseProgram;
+GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPROC __glewValidateProgram;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer;
+
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv;
+
+GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender;
+GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback;
+GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation;
+GLEW_FUN_EXPORT PFNGLCLAMPCOLORPROC __glewClampColor;
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERFIPROC __glewClearBufferfi;
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERFVPROC __glewClearBufferfv;
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERIVPROC __glewClearBufferiv;
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv;
+GLEW_FUN_EXPORT PFNGLCOLORMASKIPROC __glewColorMaski;
+GLEW_FUN_EXPORT PFNGLDISABLEIPROC __glewDisablei;
+GLEW_FUN_EXPORT PFNGLENABLEIPROC __glewEnablei;
+GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender;
+GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback;
+GLEW_FUN_EXPORT PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v;
+GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation;
+GLEW_FUN_EXPORT PFNGLGETSTRINGIPROC __glewGetStringi;
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv;
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv;
+GLEW_FUN_EXPORT PFNGLISENABLEDIPROC __glewIsEnabledi;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UIPROC __glewUniform1ui;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UIVPROC __glewUniform1uiv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UIPROC __glewUniform2ui;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UIVPROC __glewUniform2uiv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UIPROC __glewUniform3ui;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UIVPROC __glewUniform3uiv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UIPROC __glewUniform4ui;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UIVPROC __glewUniform4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced;
+GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex;
+GLEW_FUN_EXPORT PFNGLTEXBUFFERPROC __glewTexBuffer;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v;
+GLEW_FUN_EXPORT PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v;
+
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIPROC __glewBlendEquationi;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCIPROC __glewBlendFunci;
+GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading;
+
+GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus;
+GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEPROC __glewGetnCompressedTexImage;
+GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEPROC __glewGetnTexImage;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVPROC __glewGetnUniformdv;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC __glewMultiDrawArraysIndirectCount;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC __glewMultiDrawElementsIndirectCount;
+GLEW_FUN_EXPORT PFNGLSPECIALIZESHADERPROC __glewSpecializeShader;
+
+GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX;
+
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD;
+GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC __glewFramebufferSamplePositionsfvAMD;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC __glewGetFramebufferParameterfvAMD;
+GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC __glewGetNamedFramebufferParameterfvAMD;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC __glewNamedFramebufferSamplePositionsfvAMD;
+
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPARAMETERIAMDPROC __glewVertexAttribParameteriAMD;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD;
+
+GLEW_FUN_EXPORT PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD;
+GLEW_FUN_EXPORT PFNGLGENNAMESAMDPROC __glewGenNamesAMD;
+GLEW_FUN_EXPORT PFNGLISNAMEAMDPROC __glewIsNameAMD;
+
+GLEW_FUN_EXPORT PFNGLQUERYOBJECTPARAMETERUIAMDPROC __glewQueryObjectParameteruiAMD;
+
+GLEW_FUN_EXPORT PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD;
+GLEW_FUN_EXPORT PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD;
+GLEW_FUN_EXPORT PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD;
+GLEW_FUN_EXPORT PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD;
+GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD;
+GLEW_FUN_EXPORT PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD;
+
+GLEW_FUN_EXPORT PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD;
+
+GLEW_FUN_EXPORT PFNGLTEXSTORAGESPARSEAMDPROC __glewTexStorageSparseAMD;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGESPARSEAMDPROC __glewTextureStorageSparseAMD;
+
+GLEW_FUN_EXPORT PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD;
+
+GLEW_FUN_EXPORT PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD;
+GLEW_FUN_EXPORT PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD;
+
+GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERANGLEPROC __glewBlitFramebufferANGLE;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC __glewRenderbufferStorageMultisampleANGLE;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDANGLEPROC __glewDrawArraysInstancedANGLE;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDANGLEPROC __glewDrawElementsInstancedANGLE;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORANGLEPROC __glewVertexAttribDivisorANGLE;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYANGLEPROC __glewBeginQueryANGLE;
+GLEW_FUN_EXPORT PFNGLDELETEQUERIESANGLEPROC __glewDeleteQueriesANGLE;
+GLEW_FUN_EXPORT PFNGLENDQUERYANGLEPROC __glewEndQueryANGLE;
+GLEW_FUN_EXPORT PFNGLGENQUERIESANGLEPROC __glewGenQueriesANGLE;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VANGLEPROC __glewGetQueryObjecti64vANGLE;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVANGLEPROC __glewGetQueryObjectivANGLE;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VANGLEPROC __glewGetQueryObjectui64vANGLE;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVANGLEPROC __glewGetQueryObjectuivANGLE;
+GLEW_FUN_EXPORT PFNGLGETQUERYIVANGLEPROC __glewGetQueryivANGLE;
+GLEW_FUN_EXPORT PFNGLISQUERYANGLEPROC __glewIsQueryANGLE;
+GLEW_FUN_EXPORT PFNGLQUERYCOUNTERANGLEPROC __glewQueryCounterANGLE;
+
+GLEW_FUN_EXPORT PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC __glewGetTranslatedShaderSourceANGLE;
+
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURELEVELSAPPLEPROC __glewCopyTextureLevelsAPPLE;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE;
+
+GLEW_FUN_EXPORT PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE;
+GLEW_FUN_EXPORT PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE;
+GLEW_FUN_EXPORT PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE;
+GLEW_FUN_EXPORT PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE;
+
+GLEW_FUN_EXPORT PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE;
+GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC __glewRenderbufferStorageMultisampleAPPLE;
+GLEW_FUN_EXPORT PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC __glewResolveMultisampleFramebufferAPPLE;
+
+GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE;
+GLEW_FUN_EXPORT PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE;
+GLEW_FUN_EXPORT PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE;
+
+GLEW_FUN_EXPORT PFNGLCLIENTWAITSYNCAPPLEPROC __glewClientWaitSyncAPPLE;
+GLEW_FUN_EXPORT PFNGLDELETESYNCAPPLEPROC __glewDeleteSyncAPPLE;
+GLEW_FUN_EXPORT PFNGLFENCESYNCAPPLEPROC __glewFenceSyncAPPLE;
+GLEW_FUN_EXPORT PFNGLGETINTEGER64VAPPLEPROC __glewGetInteger64vAPPLE;
+GLEW_FUN_EXPORT PFNGLGETSYNCIVAPPLEPROC __glewGetSyncivAPPLE;
+GLEW_FUN_EXPORT PFNGLISSYNCAPPLEPROC __glewIsSyncAPPLE;
+GLEW_FUN_EXPORT PFNGLWAITSYNCAPPLEPROC __glewWaitSyncAPPLE;
+
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE;
+GLEW_FUN_EXPORT PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE;
+
+GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE;
+GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE;
+GLEW_FUN_EXPORT PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE;
+
+GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE;
+
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE;
+GLEW_FUN_EXPORT PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE;
+GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE;
+GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE;
+GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE;
+GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE;
+
+GLEW_FUN_EXPORT PFNGLCLEARDEPTHFPROC __glewClearDepthf;
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEFPROC __glewDepthRangef;
+GLEW_FUN_EXPORT PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat;
+GLEW_FUN_EXPORT PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler;
+GLEW_FUN_EXPORT PFNGLSHADERBINARYPROC __glewShaderBinary;
+
+GLEW_FUN_EXPORT PFNGLMEMORYBARRIERBYREGIONPROC __glewMemoryBarrierByRegion;
+
+GLEW_FUN_EXPORT PFNGLPRIMITIVEBOUNDINGBOXARBPROC __glewPrimitiveBoundingBoxARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance;
+
+GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLEARBPROC __glewGetImageHandleARB;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLEARBPROC __glewGetTextureHandleARB;
+GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLEARBPROC __glewGetTextureSamplerHandleARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VARBPROC __glewGetVertexAttribLui64vARB;
+GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTARBPROC __glewIsImageHandleResidentARB;
+GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTARBPROC __glewIsTextureHandleResidentARB;
+GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC __glewMakeImageHandleNonResidentARB;
+GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTARBPROC __glewMakeImageHandleResidentARB;
+GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC __glewMakeTextureHandleNonResidentARB;
+GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTARBPROC __glewMakeTextureHandleResidentARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC __glewProgramUniformHandleui64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC __glewProgramUniformHandleui64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64ARBPROC __glewUniformHandleui64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VARBPROC __glewUniformHandleui64vARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64ARBPROC __glewVertexAttribL1ui64ARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VARBPROC __glewVertexAttribL1ui64vARB;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed;
+GLEW_FUN_EXPORT PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex;
+
+GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEPROC __glewBufferStorage;
+
+GLEW_FUN_EXPORT PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB;
+
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERDATAPROC __glewClearBufferData;
+GLEW_FUN_EXPORT PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT;
+
+GLEW_FUN_EXPORT PFNGLCLEARTEXIMAGEPROC __glewClearTexImage;
+GLEW_FUN_EXPORT PFNGLCLEARTEXSUBIMAGEPROC __glewClearTexSubImage;
+
+GLEW_FUN_EXPORT PFNGLCLIPCONTROLPROC __glewClipControl;
+
+GLEW_FUN_EXPORT PFNGLCLAMPCOLORARBPROC __glewClampColorARB;
+
+GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute;
+GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect;
+
+GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC __glewDispatchComputeGroupSizeARB;
+
+GLEW_FUN_EXPORT PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData;
+
+GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData;
+
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB;
+GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB;
+
+GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPROC __glewBindTextureUnit;
+GLEW_FUN_EXPORT PFNGLBLITNAMEDFRAMEBUFFERPROC __glewBlitNamedFramebuffer;
+GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC __glewCheckNamedFramebufferStatus;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAPROC __glewClearNamedBufferData;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAPROC __glewClearNamedBufferSubData;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFIPROC __glewClearNamedFramebufferfi;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFVPROC __glewClearNamedFramebufferfv;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERIVPROC __glewClearNamedFramebufferiv;
+GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC __glewClearNamedFramebufferuiv;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC __glewCompressedTextureSubImage1D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC __glewCompressedTextureSubImage2D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC __glewCompressedTextureSubImage3D;
+GLEW_FUN_EXPORT PFNGLCOPYNAMEDBUFFERSUBDATAPROC __glewCopyNamedBufferSubData;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DPROC __glewCopyTextureSubImage1D;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DPROC __glewCopyTextureSubImage2D;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DPROC __glewCopyTextureSubImage3D;
+GLEW_FUN_EXPORT PFNGLCREATEBUFFERSPROC __glewCreateBuffers;
+GLEW_FUN_EXPORT PFNGLCREATEFRAMEBUFFERSPROC __glewCreateFramebuffers;
+GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPIPELINESPROC __glewCreateProgramPipelines;
+GLEW_FUN_EXPORT PFNGLCREATEQUERIESPROC __glewCreateQueries;
+GLEW_FUN_EXPORT PFNGLCREATERENDERBUFFERSPROC __glewCreateRenderbuffers;
+GLEW_FUN_EXPORT PFNGLCREATESAMPLERSPROC __glewCreateSamplers;
+GLEW_FUN_EXPORT PFNGLCREATETEXTURESPROC __glewCreateTextures;
+GLEW_FUN_EXPORT PFNGLCREATETRANSFORMFEEDBACKSPROC __glewCreateTransformFeedbacks;
+GLEW_FUN_EXPORT PFNGLCREATEVERTEXARRAYSPROC __glewCreateVertexArrays;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBPROC __glewDisableVertexArrayAttrib;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBPROC __glewEnableVertexArrayAttrib;
+GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC __glewFlushMappedNamedBufferRange;
+GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPPROC __glewGenerateTextureMipmap;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC __glewGetCompressedTextureImage;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERI64VPROC __glewGetNamedBufferParameteri64v;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVPROC __glewGetNamedBufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVPROC __glewGetNamedBufferPointerv;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAPROC __glewGetNamedBufferSubData;
+GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetNamedFramebufferAttachmentParameteriv;
+GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC __glewGetNamedFramebufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC __glewGetNamedRenderbufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTI64VPROC __glewGetQueryBufferObjecti64v;
+GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTIVPROC __glewGetQueryBufferObjectiv;
+GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUI64VPROC __glewGetQueryBufferObjectui64v;
+GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUIVPROC __glewGetQueryBufferObjectuiv;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEPROC __glewGetTextureImage;
+GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVPROC __glewGetTextureLevelParameterfv;
+GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVPROC __glewGetTextureLevelParameteriv;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVPROC __glewGetTextureParameterIiv;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVPROC __glewGetTextureParameterIuiv;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVPROC __glewGetTextureParameterfv;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVPROC __glewGetTextureParameteriv;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI64_VPROC __glewGetTransformFeedbacki64_v;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI_VPROC __glewGetTransformFeedbacki_v;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKIVPROC __glewGetTransformFeedbackiv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXED64IVPROC __glewGetVertexArrayIndexed64iv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXEDIVPROC __glewGetVertexArrayIndexediv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYIVPROC __glewGetVertexArrayiv;
+GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC __glewInvalidateNamedFramebufferData;
+GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC __glewInvalidateNamedFramebufferSubData;
+GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERPROC __glewMapNamedBuffer;
+GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEPROC __glewMapNamedBufferRange;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAPROC __glewNamedBufferData;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEPROC __glewNamedBufferStorage;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAPROC __glewNamedBufferSubData;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC __glewNamedFramebufferDrawBuffer;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC __glewNamedFramebufferDrawBuffers;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC __glewNamedFramebufferParameteri;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC __glewNamedFramebufferReadBuffer;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC __glewNamedFramebufferRenderbuffer;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREPROC __glewNamedFramebufferTexture;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC __glewNamedFramebufferTextureLayer;
+GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEPROC __glewNamedRenderbufferStorage;
+GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewNamedRenderbufferStorageMultisample;
+GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERPROC __glewTextureBuffer;
+GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEPROC __glewTextureBufferRange;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVPROC __glewTextureParameterIiv;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVPROC __glewTextureParameterIuiv;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFPROC __glewTextureParameterf;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVPROC __glewTextureParameterfv;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIPROC __glewTextureParameteri;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVPROC __glewTextureParameteriv;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DPROC __glewTextureStorage1D;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DPROC __glewTextureStorage2D;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC __glewTextureStorage2DMultisample;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DPROC __glewTextureStorage3D;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC __glewTextureStorage3DMultisample;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DPROC __glewTextureSubImage1D;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DPROC __glewTextureSubImage2D;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DPROC __glewTextureSubImage3D;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC __glewTransformFeedbackBufferBase;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC __glewTransformFeedbackBufferRange;
+GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFERPROC __glewUnmapNamedBuffer;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBBINDINGPROC __glewVertexArrayAttribBinding;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBFORMATPROC __glewVertexArrayAttribFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBIFORMATPROC __glewVertexArrayAttribIFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBLFORMATPROC __glewVertexArrayAttribLFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDINGDIVISORPROC __glewVertexArrayBindingDivisor;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYELEMENTBUFFERPROC __glewVertexArrayElementBuffer;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERPROC __glewVertexArrayVertexBuffer;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERSPROC __glewVertexArrayVertexBuffers;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer;
+GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer;
+GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer;
+GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus;
+GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers;
+GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer;
+GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers;
+GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers;
+GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv;
+GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv;
+GLEW_FUN_EXPORT PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer;
+GLEW_FUN_EXPORT PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer;
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage;
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB;
+
+GLEW_FUN_EXPORT PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary;
+GLEW_FUN_EXPORT PFNGLPROGRAMBINARYPROC __glewProgramBinary;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri;
+
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC __glewGetCompressedTextureSubImage;
+GLEW_FUN_EXPORT PFNGLGETTEXTURESUBIMAGEPROC __glewGetTextureSubImage;
+
+GLEW_FUN_EXPORT PFNGLSPECIALIZESHADERARBPROC __glewSpecializeShaderARB;
+
+GLEW_FUN_EXPORT PFNGLGETUNIFORMDVPROC __glewGetUniformdv;
+GLEW_FUN_EXPORT PFNGLUNIFORM1DPROC __glewUniform1d;
+GLEW_FUN_EXPORT PFNGLUNIFORM1DVPROC __glewUniform1dv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2DPROC __glewUniform2d;
+GLEW_FUN_EXPORT PFNGLUNIFORM2DVPROC __glewUniform2dv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3DPROC __glewUniform3d;
+GLEW_FUN_EXPORT PFNGLUNIFORM3DVPROC __glewUniform3dv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4DPROC __glewUniform4d;
+GLEW_FUN_EXPORT PFNGLUNIFORM4DVPROC __glewUniform4dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv;
+
+GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VARBPROC __glewGetUniformi64vARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VARBPROC __glewGetUniformui64vARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMI64VARBPROC __glewGetnUniformi64vARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMUI64VARBPROC __glewGetnUniformui64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64ARBPROC __glewProgramUniform1i64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VARBPROC __glewProgramUniform1i64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64ARBPROC __glewProgramUniform1ui64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VARBPROC __glewProgramUniform1ui64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64ARBPROC __glewProgramUniform2i64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VARBPROC __glewProgramUniform2i64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64ARBPROC __glewProgramUniform2ui64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VARBPROC __glewProgramUniform2ui64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64ARBPROC __glewProgramUniform3i64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VARBPROC __glewProgramUniform3i64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64ARBPROC __glewProgramUniform3ui64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VARBPROC __glewProgramUniform3ui64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64ARBPROC __glewProgramUniform4i64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VARBPROC __glewProgramUniform4i64vARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64ARBPROC __glewProgramUniform4ui64ARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VARBPROC __glewProgramUniform4ui64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1I64ARBPROC __glewUniform1i64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1I64VARBPROC __glewUniform1i64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UI64ARBPROC __glewUniform1ui64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VARBPROC __glewUniform1ui64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2I64ARBPROC __glewUniform2i64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2I64VARBPROC __glewUniform2i64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UI64ARBPROC __glewUniform2ui64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VARBPROC __glewUniform2ui64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3I64ARBPROC __glewUniform3i64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3I64VARBPROC __glewUniform3i64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UI64ARBPROC __glewUniform3ui64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VARBPROC __glewUniform3ui64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4I64ARBPROC __glewUniform4i64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4I64VARBPROC __glewUniform4i64vARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UI64ARBPROC __glewUniform4ui64ARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VARBPROC __glewUniform4ui64vARB;
+
+GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEPROC __glewColorSubTable;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPROC __glewColorTable;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPROC __glewGetColorTable;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPROC __glewGetHistogram;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPROC __glewGetMinmax;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv;
+GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter;
+GLEW_FUN_EXPORT PFNGLHISTOGRAMPROC __glewHistogram;
+GLEW_FUN_EXPORT PFNGLMINMAXPROC __glewMinmax;
+GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMPROC __glewResetHistogram;
+GLEW_FUN_EXPORT PFNGLRESETMINMAXPROC __glewResetMinmax;
+GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __glewMultiDrawArraysIndirectCountARB;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __glewMultiDrawElementsIndirectCountARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB;
+
+GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ;
+
+GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v;
+
+GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData;
+GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData;
+GLEW_FUN_EXPORT PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer;
+GLEW_FUN_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer;
+GLEW_FUN_EXPORT PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage;
+GLEW_FUN_EXPORT PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage;
+
+GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange;
+
+GLEW_FUN_EXPORT PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB;
+
+GLEW_FUN_EXPORT PFNGLBINDBUFFERSBASEPROC __glewBindBuffersBase;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERSRANGEPROC __glewBindBuffersRange;
+GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTURESPROC __glewBindImageTextures;
+GLEW_FUN_EXPORT PFNGLBINDSAMPLERSPROC __glewBindSamplers;
+GLEW_FUN_EXPORT PFNGLBINDTEXTURESPROC __glewBindTextures;
+GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERSPROC __glewBindVertexBuffers;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect;
+
+GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB;
+
+GLEW_FUN_EXPORT PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB;
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYARBPROC __glewBeginQueryARB;
+GLEW_FUN_EXPORT PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB;
+GLEW_FUN_EXPORT PFNGLENDQUERYARBPROC __glewEndQueryARB;
+GLEW_FUN_EXPORT PFNGLGENQUERIESARBPROC __glewGenQueriesARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYIVARBPROC __glewGetQueryivARB;
+GLEW_FUN_EXPORT PFNGLISQUERYARBPROC __glewIsQueryARB;
+
+GLEW_FUN_EXPORT PFNGLMAXSHADERCOMPILERTHREADSARBPROC __glewMaxShaderCompilerThreadsARB;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB;
+
+GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETCLAMPPROC __glewPolygonOffsetClamp;
+
+GLEW_FUN_EXPORT PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv;
+
+GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex;
+
+GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB;
+GLEW_FUN_EXPORT PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB;
+GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB;
+GLEW_FUN_EXPORT PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB;
+GLEW_FUN_EXPORT PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB;
+GLEW_FUN_EXPORT PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB;
+GLEW_FUN_EXPORT PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB;
+GLEW_FUN_EXPORT PFNGLGETNMAPIVARBPROC __glewGetnMapivARB;
+GLEW_FUN_EXPORT PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB;
+GLEW_FUN_EXPORT PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB;
+GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB;
+GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB;
+GLEW_FUN_EXPORT PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB;
+GLEW_FUN_EXPORT PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB;
+GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB;
+GLEW_FUN_EXPORT PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewFramebufferSampleLocationsfvARB;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewNamedFramebufferSampleLocationsfvARB;
+
+GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB;
+
+GLEW_FUN_EXPORT PFNGLBINDSAMPLERPROC __glewBindSampler;
+GLEW_FUN_EXPORT PFNGLDELETESAMPLERSPROC __glewDeleteSamplers;
+GLEW_FUN_EXPORT PFNGLGENSAMPLERSPROC __glewGenSamplers;
+GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv;
+GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv;
+GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv;
+GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv;
+GLEW_FUN_EXPORT PFNGLISSAMPLERPROC __glewIsSampler;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri;
+GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv;
+
+GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram;
+GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline;
+GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines;
+GLEW_FUN_EXPORT PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv;
+GLEW_FUN_EXPORT PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv;
+GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages;
+GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline;
+
+GLEW_FUN_EXPORT PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv;
+
+GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture;
+GLEW_FUN_EXPORT PFNGLMEMORYBARRIERPROC __glewMemoryBarrier;
+
+GLEW_FUN_EXPORT PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB;
+GLEW_FUN_EXPORT PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB;
+GLEW_FUN_EXPORT PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB;
+GLEW_FUN_EXPORT PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB;
+GLEW_FUN_EXPORT PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB;
+GLEW_FUN_EXPORT PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB;
+GLEW_FUN_EXPORT PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB;
+GLEW_FUN_EXPORT PFNGLGETHANDLEARBPROC __glewGetHandleARB;
+GLEW_FUN_EXPORT PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB;
+GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB;
+GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB;
+GLEW_FUN_EXPORT PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB;
+GLEW_FUN_EXPORT PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FARBPROC __glewUniform1fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IARBPROC __glewUniform1iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FARBPROC __glewUniform2fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IARBPROC __glewUniform2iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FARBPROC __glewUniform3fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IARBPROC __glewUniform3iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FARBPROC __glewUniform4fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IARBPROC __glewUniform4iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB;
+GLEW_FUN_EXPORT PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB;
+GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB;
+
+GLEW_FUN_EXPORT PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding;
+
+GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName;
+GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName;
+GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv;
+GLEW_FUN_EXPORT PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex;
+GLEW_FUN_EXPORT PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv;
+GLEW_FUN_EXPORT PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv;
+
+GLEW_FUN_EXPORT PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB;
+GLEW_FUN_EXPORT PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB;
+GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB;
+GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB;
+GLEW_FUN_EXPORT PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB;
+GLEW_FUN_EXPORT PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB;
+
+GLEW_FUN_EXPORT PFNGLBUFFERPAGECOMMITMENTARBPROC __glewBufferPageCommitmentARB;
+
+GLEW_FUN_EXPORT PFNGLTEXPAGECOMMITMENTARBPROC __glewTexPageCommitmentARB;
+
+GLEW_FUN_EXPORT PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync;
+GLEW_FUN_EXPORT PFNGLDELETESYNCPROC __glewDeleteSync;
+GLEW_FUN_EXPORT PFNGLFENCESYNCPROC __glewFenceSync;
+GLEW_FUN_EXPORT PFNGLGETINTEGER64VPROC __glewGetInteger64v;
+GLEW_FUN_EXPORT PFNGLGETSYNCIVPROC __glewGetSynciv;
+GLEW_FUN_EXPORT PFNGLISSYNCPROC __glewIsSync;
+GLEW_FUN_EXPORT PFNGLWAITSYNCPROC __glewWaitSync;
+
+GLEW_FUN_EXPORT PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv;
+GLEW_FUN_EXPORT PFNGLPATCHPARAMETERIPROC __glewPatchParameteri;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERPROC __glewTextureBarrier;
+
+GLEW_FUN_EXPORT PFNGLTEXBUFFERARBPROC __glewTexBufferARB;
+
+GLEW_FUN_EXPORT PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange;
+GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT;
+
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB;
+
+GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv;
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKIPROC __glewSampleMaski;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample;
+
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DPROC __glewTexStorage1D;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DPROC __glewTexStorage2D;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DPROC __glewTexStorage3D;
+
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREVIEWPROC __glewTextureView;
+
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v;
+GLEW_FUN_EXPORT PFNGLQUERYCOUNTERPROC __glewQueryCounter;
+
+GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback;
+GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks;
+GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback;
+GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks;
+GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback;
+GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback;
+GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed;
+GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream;
+GLEW_FUN_EXPORT PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed;
+GLEW_FUN_EXPORT PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv;
+
+GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced;
+GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced;
+
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB;
+
+GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEPROC __glewBindBufferBase;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv;
+GLEW_FUN_EXPORT PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices;
+GLEW_FUN_EXPORT PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding;
+
+GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays;
+GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays;
+GLEW_FUN_EXPORT PFNGLISVERTEXARRAYPROC __glewIsVertexArray;
+
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer;
+
+GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC __glewVertexArrayBindVertexBufferEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC __glewVertexArrayVertexAttribBindingEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC __glewVertexArrayVertexAttribFormatEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC __glewVertexArrayVertexAttribIFormatEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC __glewVertexArrayVertexAttribLFormatEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC __glewVertexArrayVertexBindingDivisorEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat;
+GLEW_FUN_EXPORT PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor;
+
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTBVARBPROC __glewWeightbvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTDVARBPROC __glewWeightdvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTFVARBPROC __glewWeightfvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTIVARBPROC __glewWeightivARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTSVARBPROC __glewWeightsvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUBVARBPROC __glewWeightubvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUIVARBPROC __glewWeightuivARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUSVARBPROC __glewWeightusvARB;
+
+GLEW_FUN_EXPORT PFNGLBINDBUFFERARBPROC __glewBindBufferARB;
+GLEW_FUN_EXPORT PFNGLBUFFERDATAARBPROC __glewBufferDataARB;
+GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB;
+GLEW_FUN_EXPORT PFNGLGENBUFFERSARBPROC __glewGenBuffersARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB;
+GLEW_FUN_EXPORT PFNGLISBUFFERARBPROC __glewIsBufferARB;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERARBPROC __glewMapBufferARB;
+GLEW_FUN_EXPORT PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB;
+
+GLEW_FUN_EXPORT PFNGLBINDPROGRAMARBPROC __glewBindProgramARB;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB;
+GLEW_FUN_EXPORT PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB;
+GLEW_FUN_EXPORT PFNGLISPROGRAMARBPROC __glewIsProgramARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB;
+
+GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB;
+GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB;
+GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB;
+
+GLEW_FUN_EXPORT PFNGLCOLORP3UIPROC __glewColorP3ui;
+GLEW_FUN_EXPORT PFNGLCOLORP3UIVPROC __glewColorP3uiv;
+GLEW_FUN_EXPORT PFNGLCOLORP4UIPROC __glewColorP4ui;
+GLEW_FUN_EXPORT PFNGLCOLORP4UIVPROC __glewColorP4uiv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv;
+GLEW_FUN_EXPORT PFNGLNORMALP3UIPROC __glewNormalP3ui;
+GLEW_FUN_EXPORT PFNGLNORMALP3UIVPROC __glewNormalP3uiv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui;
+GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXP2UIPROC __glewVertexP2ui;
+GLEW_FUN_EXPORT PFNGLVERTEXP2UIVPROC __glewVertexP2uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXP3UIPROC __glewVertexP3ui;
+GLEW_FUN_EXPORT PFNGLVERTEXP3UIVPROC __glewVertexP3uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXP4UIPROC __glewVertexP4ui;
+GLEW_FUN_EXPORT PFNGLVERTEXP4UIVPROC __glewVertexP4uiv;
+
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv;
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed;
+GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v;
+GLEW_FUN_EXPORT PFNGLGETFLOATI_VPROC __glewGetFloati_v;
+GLEW_FUN_EXPORT PFNGLSCISSORARRAYVPROC __glewScissorArrayv;
+GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDPROC __glewScissorIndexed;
+GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv;
+GLEW_FUN_EXPORT PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv;
+GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf;
+GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv;
+
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI;
+GLEW_FUN_EXPORT PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI;
+
+GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI;
+GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI;
+GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI;
+GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI;
+
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI;
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI;
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI;
+GLEW_FUN_EXPORT PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI;
+GLEW_FUN_EXPORT PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI;
+GLEW_FUN_EXPORT PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI;
+GLEW_FUN_EXPORT PFNGLSAMPLEMAPATIPROC __glewSampleMapATI;
+GLEW_FUN_EXPORT PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI;
+
+GLEW_FUN_EXPORT PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI;
+
+GLEW_FUN_EXPORT PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI;
+GLEW_FUN_EXPORT PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI;
+
+GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI;
+GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI;
+
+GLEW_FUN_EXPORT PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI;
+GLEW_FUN_EXPORT PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI;
+GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI;
+GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI;
+
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI;
+
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI;
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __glewDrawArraysInstancedBaseInstanceEXT;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __glewDrawElementsInstancedBaseInstanceEXT;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __glewDrawElementsInstancedBaseVertexBaseInstanceEXT;
+
+GLEW_FUN_EXPORT PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __glewBindFragDataLocationIndexedEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGDATAINDEXEXTPROC __glewGetFragDataIndexEXT;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __glewGetProgramResourceLocationIndexEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT;
+
+GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEEXTPROC __glewBufferStorageEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEEXTPROC __glewNamedBufferStorageEXT;
+
+GLEW_FUN_EXPORT PFNGLCLEARTEXIMAGEEXTPROC __glewClearTexImageEXT;
+GLEW_FUN_EXPORT PFNGLCLEARTEXSUBIMAGEEXTPROC __glewClearTexSubImageEXT;
+
+GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT;
+
+GLEW_FUN_EXPORT PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT;
+GLEW_FUN_EXPORT PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT;
+
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT;
+GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT;
+
+GLEW_FUN_EXPORT PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT;
+GLEW_FUN_EXPORT PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATAEXTPROC __glewCopyImageSubDataEXT;
+
+GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT;
+GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT;
+
+GLEW_FUN_EXPORT PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT;
+GLEW_FUN_EXPORT PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT;
+
+GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT;
+GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT;
+GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT;
+
+GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT;
+GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT;
+GLEW_FUN_EXPORT PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT;
+GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT;
+GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT;
+GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT;
+GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT;
+GLEW_FUN_EXPORT PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT;
+GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT;
+GLEW_FUN_EXPORT PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT;
+GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT;
+GLEW_FUN_EXPORT PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT;
+GLEW_FUN_EXPORT PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT;
+GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT;
+GLEW_FUN_EXPORT PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT;
+GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT;
+GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT;
+GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT;
+GLEW_FUN_EXPORT PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT;
+GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC __glewVertexArrayVertexAttribDivisorEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT;
+
+GLEW_FUN_EXPORT PFNGLDISCARDFRAMEBUFFEREXTPROC __glewDiscardFramebufferEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSEXTPROC __glewDrawBuffersEXT;
+
+GLEW_FUN_EXPORT PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT;
+GLEW_FUN_EXPORT PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT;
+GLEW_FUN_EXPORT PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT;
+GLEW_FUN_EXPORT PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT;
+GLEW_FUN_EXPORT PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIEXTPROC __glewBlendEquationSeparateiEXT;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIEXTPROC __glewBlendEquationiEXT;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIEXTPROC __glewBlendFuncSeparateiEXT;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCIEXTPROC __glewBlendFunciEXT;
+GLEW_FUN_EXPORT PFNGLCOLORMASKIEXTPROC __glewColorMaskiEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEIEXTPROC __glewDisableiEXT;
+GLEW_FUN_EXPORT PFNGLENABLEIEXTPROC __glewEnableiEXT;
+GLEW_FUN_EXPORT PFNGLISENABLEDIEXTPROC __glewIsEnablediEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSBASEVERTEXEXTPROC __glewDrawElementsBaseVertexEXT;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __glewDrawElementsInstancedBaseVertexEXT;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __glewDrawRangeElementsBaseVertexEXT;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __glewMultiDrawElementsBaseVertexEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT;
+
+GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEEXTERNALEXTPROC __glewBufferStorageExternalEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC __glewNamedBufferStorageExternalEXT;
+
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT;
+GLEW_FUN_EXPORT PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT;
+
+GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT;
+GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT;
+GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT;
+GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT;
+GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT;
+GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT;
+GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT;
+GLEW_FUN_EXPORT PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT;
+
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT;
+GLEW_FUN_EXPORT PFNGLHISTOGRAMEXTPROC __glewHistogramEXT;
+GLEW_FUN_EXPORT PFNGLMINMAXEXTPROC __glewMinmaxEXT;
+GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT;
+GLEW_FUN_EXPORT PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT;
+
+GLEW_FUN_EXPORT PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT;
+
+GLEW_FUN_EXPORT PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT;
+
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISOREXTPROC __glewVertexAttribDivisorEXT;
+
+GLEW_FUN_EXPORT PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT;
+
+GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC __glewFlushMappedBufferRangeEXT;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERRANGEEXTPROC __glewMapBufferRangeEXT;
+
+GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEMEMEXTPROC __glewBufferStorageMemEXT;
+GLEW_FUN_EXPORT PFNGLCREATEMEMORYOBJECTSEXTPROC __glewCreateMemoryObjectsEXT;
+GLEW_FUN_EXPORT PFNGLDELETEMEMORYOBJECTSEXTPROC __glewDeleteMemoryObjectsEXT;
+GLEW_FUN_EXPORT PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC __glewGetMemoryObjectParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETUNSIGNEDBYTEI_VEXTPROC __glewGetUnsignedBytei_vEXT;
+GLEW_FUN_EXPORT PFNGLGETUNSIGNEDBYTEVEXTPROC __glewGetUnsignedBytevEXT;
+GLEW_FUN_EXPORT PFNGLISMEMORYOBJECTEXTPROC __glewIsMemoryObjectEXT;
+GLEW_FUN_EXPORT PFNGLMEMORYOBJECTPARAMETERIVEXTPROC __glewMemoryObjectParameterivEXT;
+GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC __glewNamedBufferStorageMemEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGEMEM1DEXTPROC __glewTexStorageMem1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGEMEM2DEXTPROC __glewTexStorageMem2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC __glewTexStorageMem2DMultisampleEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGEMEM3DEXTPROC __glewTexStorageMem3DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC __glewTexStorageMem3DMultisampleEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGEMEM1DEXTPROC __glewTextureStorageMem1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGEMEM2DEXTPROC __glewTextureStorageMem2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC __glewTextureStorageMem2DMultisampleEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGEMEM3DEXTPROC __glewTextureStorageMem3DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC __glewTextureStorageMem3DMultisampleEXT;
+
+GLEW_FUN_EXPORT PFNGLIMPORTMEMORYFDEXTPROC __glewImportMemoryFdEXT;
+
+GLEW_FUN_EXPORT PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC __glewImportMemoryWin32HandleEXT;
+GLEW_FUN_EXPORT PFNGLIMPORTMEMORYWIN32NAMEEXTPROC __glewImportMemoryWin32NameEXT;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTEXTPROC __glewMultiDrawArraysIndirectEXT;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC __glewMultiDrawElementsIndirectEXT;
+
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT;
+GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __glewFramebufferTexture2DMultisampleEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSINDEXEDEXTPROC __glewDrawBuffersIndexedEXT;
+GLEW_FUN_EXPORT PFNGLGETINTEGERI_VEXTPROC __glewGetIntegeri_vEXT;
+GLEW_FUN_EXPORT PFNGLREADBUFFERINDEXEDEXTPROC __glewReadBufferIndexedEXT;
+
+GLEW_FUN_EXPORT PFNGLCOLORTABLEEXTPROC __glewColorTableEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT;
+
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT;
+
+GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT;
+
+GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETCLAMPEXTPROC __glewPolygonOffsetClampEXT;
+
+GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT;
+
+GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONNVPROC __glewCoverageModulationNV;
+GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONTABLENVPROC __glewCoverageModulationTableNV;
+GLEW_FUN_EXPORT PFNGLGETCOVERAGEMODULATIONTABLENVPROC __glewGetCoverageModulationTableNV;
+GLEW_FUN_EXPORT PFNGLRASTERSAMPLESEXTPROC __glewRasterSamplesEXT;
+
+GLEW_FUN_EXPORT PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT;
+GLEW_FUN_EXPORT PFNGLENDSCENEEXTPROC __glewEndSceneEXT;
+
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLDELETESEMAPHORESEXTPROC __glewDeleteSemaphoresEXT;
+GLEW_FUN_EXPORT PFNGLGENSEMAPHORESEXTPROC __glewGenSemaphoresEXT;
+GLEW_FUN_EXPORT PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC __glewGetSemaphoreParameterui64vEXT;
+GLEW_FUN_EXPORT PFNGLISSEMAPHOREEXTPROC __glewIsSemaphoreEXT;
+GLEW_FUN_EXPORT PFNGLSEMAPHOREPARAMETERUI64VEXTPROC __glewSemaphoreParameterui64vEXT;
+GLEW_FUN_EXPORT PFNGLSIGNALSEMAPHOREEXTPROC __glewSignalSemaphoreEXT;
+GLEW_FUN_EXPORT PFNGLWAITSEMAPHOREEXTPROC __glewWaitSemaphoreEXT;
+
+GLEW_FUN_EXPORT PFNGLIMPORTSEMAPHOREFDEXTPROC __glewImportSemaphoreFdEXT;
+
+GLEW_FUN_EXPORT PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC __glewImportSemaphoreWin32HandleEXT;
+GLEW_FUN_EXPORT PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC __glewImportSemaphoreWin32NameEXT;
+
+GLEW_FUN_EXPORT PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT;
+GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT;
+GLEW_FUN_EXPORT PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT;
+GLEW_FUN_EXPORT PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT;
+
+GLEW_FUN_EXPORT PFNGLCLEARPIXELLOCALSTORAGEUIEXTPROC __glewClearPixelLocalStorageuiEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __glewFramebufferPixelLocalStorageSizeEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __glewGetFramebufferPixelLocalStorageSizeEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXPAGECOMMITMENTEXTPROC __glewTexPageCommitmentEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREPAGECOMMITMENTEXTPROC __glewTexturePageCommitmentEXT;
+
+GLEW_FUN_EXPORT PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT;
+
+GLEW_FUN_EXPORT PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT;
+GLEW_FUN_EXPORT PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT;
+
+GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT;
+GLEW_FUN_EXPORT PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT;
+GLEW_FUN_EXPORT PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT;
+GLEW_FUN_EXPORT PFNGLISTEXTUREEXTPROC __glewIsTextureEXT;
+GLEW_FUN_EXPORT PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DEXTPROC __glewTexStorage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DEXTPROC __glewTexStorage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DEXTPROC __glewTexStorage3DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREVIEWEXTPROC __glewTextureViewEXT;
+
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT;
+
+GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT;
+GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT;
+GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT;
+
+GLEW_FUN_EXPORT PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT;
+GLEW_FUN_EXPORT PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT;
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT;
+GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT;
+GLEW_FUN_EXPORT PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDARRAYSETEXTPROC __glewBindArraySetEXT;
+GLEW_FUN_EXPORT PFNGLCREATEARRAYSETEXTPROC __glewCreateArraySetExt;
+GLEW_FUN_EXPORT PFNGLDELETEARRAYSETSEXTPROC __glewDeleteArraySetsEXT;
+
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT;
+GLEW_FUN_EXPORT PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT;
+GLEW_FUN_EXPORT PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT;
+GLEW_FUN_EXPORT PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT;
+GLEW_FUN_EXPORT PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT;
+GLEW_FUN_EXPORT PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT;
+GLEW_FUN_EXPORT PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT;
+GLEW_FUN_EXPORT PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT;
+GLEW_FUN_EXPORT PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT;
+GLEW_FUN_EXPORT PFNGLSWIZZLEEXTPROC __glewSwizzleEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTBVEXTPROC __glewVariantbvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTDVEXTPROC __glewVariantdvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTFVEXTPROC __glewVariantfvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTIVEXTPROC __glewVariantivEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTSVEXTPROC __glewVariantsvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT;
+GLEW_FUN_EXPORT PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT;
+
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT;
+
+GLEW_FUN_EXPORT PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC __glewAcquireKeyedMutexWin32EXT;
+GLEW_FUN_EXPORT PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC __glewReleaseKeyedMutexWin32EXT;
+
+GLEW_FUN_EXPORT PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT;
+
+GLEW_FUN_EXPORT PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY;
+
+GLEW_FUN_EXPORT PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY;
+
+GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP;
+GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP;
+
+GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM;
+GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM;
+
+GLEW_FUN_EXPORT PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM;
+GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM;
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM;
+GLEW_FUN_EXPORT PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM;
+
+GLEW_FUN_EXPORT PFNGLMAPTEXTURE2DINTELPROC __glewMapTexture2DINTEL;
+GLEW_FUN_EXPORT PFNGLSYNCTEXTUREINTELPROC __glewSyncTextureINTEL;
+GLEW_FUN_EXPORT PFNGLUNMAPTEXTURE2DINTELPROC __glewUnmapTexture2DINTEL;
+
+GLEW_FUN_EXPORT PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL;
+
+GLEW_FUN_EXPORT PFNGLBEGINPERFQUERYINTELPROC __glewBeginPerfQueryINTEL;
+GLEW_FUN_EXPORT PFNGLCREATEPERFQUERYINTELPROC __glewCreatePerfQueryINTEL;
+GLEW_FUN_EXPORT PFNGLDELETEPERFQUERYINTELPROC __glewDeletePerfQueryINTEL;
+GLEW_FUN_EXPORT PFNGLENDPERFQUERYINTELPROC __glewEndPerfQueryINTEL;
+GLEW_FUN_EXPORT PFNGLGETFIRSTPERFQUERYIDINTELPROC __glewGetFirstPerfQueryIdINTEL;
+GLEW_FUN_EXPORT PFNGLGETNEXTPERFQUERYIDINTELPROC __glewGetNextPerfQueryIdINTEL;
+GLEW_FUN_EXPORT PFNGLGETPERFCOUNTERINFOINTELPROC __glewGetPerfCounterInfoINTEL;
+GLEW_FUN_EXPORT PFNGLGETPERFQUERYDATAINTELPROC __glewGetPerfQueryDataINTEL;
+GLEW_FUN_EXPORT PFNGLGETPERFQUERYIDBYNAMEINTELPROC __glewGetPerfQueryIdByNameINTEL;
+GLEW_FUN_EXPORT PFNGLGETPERFQUERYINFOINTELPROC __glewGetPerfQueryInfoINTEL;
+
+GLEW_FUN_EXPORT PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL;
+GLEW_FUN_EXPORT PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL;
+
+GLEW_FUN_EXPORT PFNGLBLENDBARRIERKHRPROC __glewBlendBarrierKHR;
+
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl;
+GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert;
+GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog;
+GLEW_FUN_EXPORT PFNGLGETOBJECTLABELPROC __glewGetObjectLabel;
+GLEW_FUN_EXPORT PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel;
+GLEW_FUN_EXPORT PFNGLOBJECTLABELPROC __glewObjectLabel;
+GLEW_FUN_EXPORT PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel;
+GLEW_FUN_EXPORT PFNGLPOPDEBUGGROUPPROC __glewPopDebugGroup;
+GLEW_FUN_EXPORT PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup;
+
+GLEW_FUN_EXPORT PFNGLMAXSHADERCOMPILERTHREADSKHRPROC __glewMaxShaderCompilerThreadsKHR;
+
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVPROC __glewGetnUniformfv;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVPROC __glewGetnUniformiv;
+GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVPROC __glewGetnUniformuiv;
+GLEW_FUN_EXPORT PFNGLREADNPIXELSPROC __glewReadnPixels;
+
+GLEW_FUN_EXPORT PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion;
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion;
+GLEW_FUN_EXPORT PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion;
+GLEW_FUN_EXPORT PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion;
+
+GLEW_FUN_EXPORT PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA;
+
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA;
+
+GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVXPROC __glewBeginConditionalRenderNVX;
+GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVXPROC __glewEndConditionalRenderNVX;
+
+GLEW_FUN_EXPORT PFNGLLGPUCOPYIMAGESUBDATANVXPROC __glewLGPUCopyImageSubDataNVX;
+GLEW_FUN_EXPORT PFNGLLGPUINTERLOCKNVXPROC __glewLGPUInterlockNVX;
+GLEW_FUN_EXPORT PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC __glewLGPUNamedBufferSubDataNVX;
+
+GLEW_FUN_EXPORT PFNGLSTEREOPARAMETERFNVPROC __glewStereoParameterfNV;
+GLEW_FUN_EXPORT PFNGLSTEREOPARAMETERINVPROC __glewStereoParameteriNV;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC __glewMultiDrawArraysIndirectBindlessNV;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC __glewMultiDrawElementsIndirectBindlessNV;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawArraysIndirectBindlessCountNV;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawElementsIndirectBindlessCountNV;
+
+GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV;
+GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV;
+GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV;
+GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV;
+GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV;
+
+GLEW_FUN_EXPORT PFNGLBLENDBARRIERNVPROC __glewBlendBarrierNV;
+GLEW_FUN_EXPORT PFNGLBLENDPARAMETERINVPROC __glewBlendParameteriNV;
+
+GLEW_FUN_EXPORT PFNGLVIEWPORTPOSITIONWSCALENVPROC __glewViewportPositionWScaleNV;
+
+GLEW_FUN_EXPORT PFNGLCALLCOMMANDLISTNVPROC __glewCallCommandListNV;
+GLEW_FUN_EXPORT PFNGLCOMMANDLISTSEGMENTSNVPROC __glewCommandListSegmentsNV;
+GLEW_FUN_EXPORT PFNGLCOMPILECOMMANDLISTNVPROC __glewCompileCommandListNV;
+GLEW_FUN_EXPORT PFNGLCREATECOMMANDLISTSNVPROC __glewCreateCommandListsNV;
+GLEW_FUN_EXPORT PFNGLCREATESTATESNVPROC __glewCreateStatesNV;
+GLEW_FUN_EXPORT PFNGLDELETECOMMANDLISTSNVPROC __glewDeleteCommandListsNV;
+GLEW_FUN_EXPORT PFNGLDELETESTATESNVPROC __glewDeleteStatesNV;
+GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSADDRESSNVPROC __glewDrawCommandsAddressNV;
+GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSNVPROC __glewDrawCommandsNV;
+GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC __glewDrawCommandsStatesAddressNV;
+GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESNVPROC __glewDrawCommandsStatesNV;
+GLEW_FUN_EXPORT PFNGLGETCOMMANDHEADERNVPROC __glewGetCommandHeaderNV;
+GLEW_FUN_EXPORT PFNGLGETSTAGEINDEXNVPROC __glewGetStageIndexNV;
+GLEW_FUN_EXPORT PFNGLISCOMMANDLISTNVPROC __glewIsCommandListNV;
+GLEW_FUN_EXPORT PFNGLISSTATENVPROC __glewIsStateNV;
+GLEW_FUN_EXPORT PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC __glewListDrawCommandsStatesClientNV;
+GLEW_FUN_EXPORT PFNGLSTATECAPTURENVPROC __glewStateCaptureNV;
+
+GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV;
+GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV;
+
+GLEW_FUN_EXPORT PFNGLSUBPIXELPRECISIONBIASNVPROC __glewSubpixelPrecisionBiasNV;
+
+GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERFNVPROC __glewConservativeRasterParameterfNV;
+
+GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERINVPROC __glewConservativeRasterParameteriNV;
+
+GLEW_FUN_EXPORT PFNGLCOPYBUFFERSUBDATANVPROC __glewCopyBufferSubDataNV;
+
+GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV;
+
+GLEW_FUN_EXPORT PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV;
+GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV;
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSNVPROC __glewDrawBuffersNV;
+
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDNVPROC __glewDrawArraysInstancedNV;
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDNVPROC __glewDrawElementsInstancedNV;
+
+GLEW_FUN_EXPORT PFNGLDRAWTEXTURENVPROC __glewDrawTextureNV;
+
+GLEW_FUN_EXPORT PFNGLDRAWVKIMAGENVPROC __glewDrawVkImageNV;
+GLEW_FUN_EXPORT PFNGLGETVKPROCADDRNVPROC __glewGetVkProcAddrNV;
+GLEW_FUN_EXPORT PFNGLSIGNALVKFENCENVPROC __glewSignalVkFenceNV;
+GLEW_FUN_EXPORT PFNGLSIGNALVKSEMAPHORENVPROC __glewSignalVkSemaphoreNV;
+GLEW_FUN_EXPORT PFNGLWAITVKSEMAPHORENVPROC __glewWaitVkSemaphoreNV;
+
+GLEW_FUN_EXPORT PFNGLEVALMAPSNVPROC __glewEvalMapsNV;
+GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV;
+GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV;
+GLEW_FUN_EXPORT PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV;
+GLEW_FUN_EXPORT PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV;
+GLEW_FUN_EXPORT PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV;
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV;
+GLEW_FUN_EXPORT PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV;
+
+GLEW_FUN_EXPORT PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV;
+GLEW_FUN_EXPORT PFNGLFINISHFENCENVPROC __glewFinishFenceNV;
+GLEW_FUN_EXPORT PFNGLGENFENCESNVPROC __glewGenFencesNV;
+GLEW_FUN_EXPORT PFNGLGETFENCEIVNVPROC __glewGetFenceivNV;
+GLEW_FUN_EXPORT PFNGLISFENCENVPROC __glewIsFenceNV;
+GLEW_FUN_EXPORT PFNGLSETFENCENVPROC __glewSetFenceNV;
+GLEW_FUN_EXPORT PFNGLTESTFENCENVPROC __glewTestFenceNV;
+
+GLEW_FUN_EXPORT PFNGLFRAGMENTCOVERAGECOLORNVPROC __glewFragmentCoverageColorNV;
+
+GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV;
+
+GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERNVPROC __glewBlitFramebufferNV;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC __glewRenderbufferStorageMultisampleNV;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV;
+
+GLEW_FUN_EXPORT PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV;
+
+GLEW_FUN_EXPORT PFNGLMULTICASTBARRIERNVPROC __glewMulticastBarrierNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTBLITFRAMEBUFFERNVPROC __glewMulticastBlitFramebufferNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTBUFFERSUBDATANVPROC __glewMulticastBufferSubDataNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC __glewMulticastCopyBufferSubDataNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTCOPYIMAGESUBDATANVPROC __glewMulticastCopyImageSubDataNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewMulticastFramebufferSampleLocationsfvNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC __glewMulticastGetQueryObjecti64vNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTIVNVPROC __glewMulticastGetQueryObjectivNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC __glewMulticastGetQueryObjectui64vNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC __glewMulticastGetQueryObjectuivNV;
+GLEW_FUN_EXPORT PFNGLMULTICASTWAITSYNCNVPROC __glewMulticastWaitSyncNV;
+GLEW_FUN_EXPORT PFNGLRENDERGPUMASKNVPROC __glewRenderGpuMaskNV;
+
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV;
+
+GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV;
+
+GLEW_FUN_EXPORT PFNGLCOLOR3HNVPROC __glewColor3hNV;
+GLEW_FUN_EXPORT PFNGLCOLOR3HVNVPROC __glewColor3hvNV;
+GLEW_FUN_EXPORT PFNGLCOLOR4HNVPROC __glewColor4hNV;
+GLEW_FUN_EXPORT PFNGLCOLOR4HVNVPROC __glewColor4hvNV;
+GLEW_FUN_EXPORT PFNGLFOGCOORDHNVPROC __glewFogCoordhNV;
+GLEW_FUN_EXPORT PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV;
+GLEW_FUN_EXPORT PFNGLNORMAL3HNVPROC __glewNormal3hNV;
+GLEW_FUN_EXPORT PFNGLNORMAL3HVNVPROC __glewNormal3hvNV;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX2HNVPROC __glewVertex2hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX2HVNVPROC __glewVertex2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX3HNVPROC __glewVertex3hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX3HVNVPROC __glewVertex3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX4HNVPROC __glewVertex4hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX4HVNVPROC __glewVertex4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV;
+
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORNVPROC __glewVertexAttribDivisorNV;
+
+GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATSAMPLEIVNVPROC __glewGetInternalformatSampleivNV;
+
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3FVNVPROC __glewUniformMatrix2x3fvNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4FVNVPROC __glewUniformMatrix2x4fvNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2FVNVPROC __glewUniformMatrix3x2fvNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4FVNVPROC __glewUniformMatrix3x4fvNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2FVNVPROC __glewUniformMatrix4x2fvNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3FVNVPROC __glewUniformMatrix4x3fvNV;
+
+GLEW_FUN_EXPORT PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV;
+GLEW_FUN_EXPORT PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV;
+GLEW_FUN_EXPORT PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV;
+GLEW_FUN_EXPORT PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV;
+GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV;
+GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV;
+GLEW_FUN_EXPORT PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV;
+
+GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV;
+
+GLEW_FUN_EXPORT PFNGLCOPYPATHNVPROC __glewCopyPathNV;
+GLEW_FUN_EXPORT PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV;
+GLEW_FUN_EXPORT PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV;
+GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV;
+GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV;
+GLEW_FUN_EXPORT PFNGLDELETEPATHSNVPROC __glewDeletePathsNV;
+GLEW_FUN_EXPORT PFNGLGENPATHSNVPROC __glewGenPathsNV;
+GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV;
+GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV;
+GLEW_FUN_EXPORT PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV;
+GLEW_FUN_EXPORT PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV;
+GLEW_FUN_EXPORT PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV;
+GLEW_FUN_EXPORT PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV;
+GLEW_FUN_EXPORT PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV;
+GLEW_FUN_EXPORT PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV;
+GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV;
+GLEW_FUN_EXPORT PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV;
+GLEW_FUN_EXPORT PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEFVNVPROC __glewGetProgramResourcefvNV;
+GLEW_FUN_EXPORT PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV;
+GLEW_FUN_EXPORT PFNGLISPATHNVPROC __glewIsPathNV;
+GLEW_FUN_EXPORT PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV;
+GLEW_FUN_EXPORT PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV;
+GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X2FNVPROC __glewMatrixLoad3x2fNV;
+GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X3FNVPROC __glewMatrixLoad3x3fNV;
+GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC __glewMatrixLoadTranspose3x3fNV;
+GLEW_FUN_EXPORT PFNGLMATRIXMULT3X2FNVPROC __glewMatrixMult3x2fNV;
+GLEW_FUN_EXPORT PFNGLMATRIXMULT3X3FNVPROC __glewMatrixMult3x3fNV;
+GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC __glewMatrixMultTranspose3x3fNV;
+GLEW_FUN_EXPORT PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV;
+GLEW_FUN_EXPORT PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV;
+GLEW_FUN_EXPORT PFNGLPATHCOORDSNVPROC __glewPathCoordsNV;
+GLEW_FUN_EXPORT PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV;
+GLEW_FUN_EXPORT PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV;
+GLEW_FUN_EXPORT PFNGLPATHFOGGENNVPROC __glewPathFogGenNV;
+GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXARRAYNVPROC __glewPathGlyphIndexArrayNV;
+GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXRANGENVPROC __glewPathGlyphIndexRangeNV;
+GLEW_FUN_EXPORT PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV;
+GLEW_FUN_EXPORT PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV;
+GLEW_FUN_EXPORT PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC __glewPathMemoryGlyphIndexArrayNV;
+GLEW_FUN_EXPORT PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV;
+GLEW_FUN_EXPORT PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV;
+GLEW_FUN_EXPORT PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV;
+GLEW_FUN_EXPORT PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV;
+GLEW_FUN_EXPORT PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV;
+GLEW_FUN_EXPORT PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV;
+GLEW_FUN_EXPORT PFNGLPATHSTRINGNVPROC __glewPathStringNV;
+GLEW_FUN_EXPORT PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV;
+GLEW_FUN_EXPORT PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV;
+GLEW_FUN_EXPORT PFNGLPATHTEXGENNVPROC __glewPathTexGenNV;
+GLEW_FUN_EXPORT PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC __glewProgramPathFragmentInputGenNV;
+GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV;
+GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV;
+GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV;
+GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV;
+GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC __glewStencilThenCoverFillPathInstancedNV;
+GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHNVPROC __glewStencilThenCoverFillPathNV;
+GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC __glewStencilThenCoverStrokePathInstancedNV;
+GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC __glewStencilThenCoverStrokePathNV;
+GLEW_FUN_EXPORT PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV;
+GLEW_FUN_EXPORT PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV;
+
+GLEW_FUN_EXPORT PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV;
+GLEW_FUN_EXPORT PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLPOLYGONMODENVPROC __glewPolygonModeNV;
+
+GLEW_FUN_EXPORT PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV;
+GLEW_FUN_EXPORT PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV;
+GLEW_FUN_EXPORT PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV;
+
+GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV;
+GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV;
+
+GLEW_FUN_EXPORT PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV;
+GLEW_FUN_EXPORT PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV;
+GLEW_FUN_EXPORT PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewFramebufferSampleLocationsfvNV;
+GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewNamedFramebufferSampleLocationsfvNV;
+
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV;
+GLEW_FUN_EXPORT PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV;
+GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV;
+GLEW_FUN_EXPORT PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV;
+GLEW_FUN_EXPORT PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV;
+GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV;
+GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV;
+GLEW_FUN_EXPORT PFNGLUNIFORMUI64NVPROC __glewUniformui64NV;
+GLEW_FUN_EXPORT PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV;
+
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DNVPROC __glewCompressedTexImage3DNV;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DNVPROC __glewCompressedTexSubImage3DNV;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DNVPROC __glewCopyTexSubImage3DNV;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERNVPROC __glewFramebufferTextureLayerNV;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DNVPROC __glewTexImage3DNV;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DNVPROC __glewTexSubImage3DNV;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV;
+
+GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV;
+GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV;
+
+GLEW_FUN_EXPORT PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV;
+GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV;
+GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV;
+GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV;
+GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV;
+GLEW_FUN_EXPORT PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV;
+GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV;
+
+GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV;
+GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV;
+GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV;
+GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV;
+
+GLEW_FUN_EXPORT PFNGLVDPAUFININVPROC __glewVDPAUFiniNV;
+GLEW_FUN_EXPORT PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV;
+GLEW_FUN_EXPORT PFNGLVDPAUINITNVPROC __glewVDPAUInitNV;
+GLEW_FUN_EXPORT PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV;
+GLEW_FUN_EXPORT PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV;
+GLEW_FUN_EXPORT PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV;
+GLEW_FUN_EXPORT PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV;
+GLEW_FUN_EXPORT PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV;
+GLEW_FUN_EXPORT PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV;
+GLEW_FUN_EXPORT PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV;
+
+GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV;
+
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV;
+
+GLEW_FUN_EXPORT PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV;
+GLEW_FUN_EXPORT PFNGLCOLORFORMATNVPROC __glewColorFormatNV;
+GLEW_FUN_EXPORT PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV;
+GLEW_FUN_EXPORT PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV;
+GLEW_FUN_EXPORT PFNGLINDEXFORMATNVPROC __glewIndexFormatNV;
+GLEW_FUN_EXPORT PFNGLNORMALFORMATNVPROC __glewNormalFormatNV;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV;
+GLEW_FUN_EXPORT PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV;
+
+GLEW_FUN_EXPORT PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV;
+GLEW_FUN_EXPORT PFNGLBINDPROGRAMNVPROC __glewBindProgramNV;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV;
+GLEW_FUN_EXPORT PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV;
+GLEW_FUN_EXPORT PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV;
+GLEW_FUN_EXPORT PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV;
+GLEW_FUN_EXPORT PFNGLISPROGRAMNVPROC __glewIsProgramNV;
+GLEW_FUN_EXPORT PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV;
+GLEW_FUN_EXPORT PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV;
+GLEW_FUN_EXPORT PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV;
+
+GLEW_FUN_EXPORT PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV;
+GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV;
+GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV;
+GLEW_FUN_EXPORT PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV;
+GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV;
+GLEW_FUN_EXPORT PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV;
+GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV;
+GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV;
+GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEARRAYFVNVPROC __glewDepthRangeArrayfvNV;
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEINDEXEDFNVPROC __glewDepthRangeIndexedfNV;
+GLEW_FUN_EXPORT PFNGLDISABLEINVPROC __glewDisableiNV;
+GLEW_FUN_EXPORT PFNGLENABLEINVPROC __glewEnableiNV;
+GLEW_FUN_EXPORT PFNGLGETFLOATI_VNVPROC __glewGetFloati_vNV;
+GLEW_FUN_EXPORT PFNGLISENABLEDINVPROC __glewIsEnablediNV;
+GLEW_FUN_EXPORT PFNGLSCISSORARRAYVNVPROC __glewScissorArrayvNV;
+GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDNVPROC __glewScissorIndexedNV;
+GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDVNVPROC __glewScissorIndexedvNV;
+GLEW_FUN_EXPORT PFNGLVIEWPORTARRAYVNVPROC __glewViewportArrayvNV;
+GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFNVPROC __glewViewportIndexedfNV;
+GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFVNVPROC __glewViewportIndexedfvNV;
+
+GLEW_FUN_EXPORT PFNGLVIEWPORTSWIZZLENVPROC __glewViewportSwizzleNV;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __glewFramebufferTextureMultiviewOVR;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __glewFramebufferTextureMultisampleMultiviewOVR;
+
+GLEW_FUN_EXPORT PFNGLALPHAFUNCQCOMPROC __glewAlphaFuncQCOM;
+
+GLEW_FUN_EXPORT PFNGLDISABLEDRIVERCONTROLQCOMPROC __glewDisableDriverControlQCOM;
+GLEW_FUN_EXPORT PFNGLENABLEDRIVERCONTROLQCOMPROC __glewEnableDriverControlQCOM;
+GLEW_FUN_EXPORT PFNGLGETDRIVERCONTROLSTRINGQCOMPROC __glewGetDriverControlStringQCOM;
+GLEW_FUN_EXPORT PFNGLGETDRIVERCONTROLSQCOMPROC __glewGetDriverControlsQCOM;
+
+GLEW_FUN_EXPORT PFNGLEXTGETBUFFERPOINTERVQCOMPROC __glewExtGetBufferPointervQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETBUFFERSQCOMPROC __glewExtGetBuffersQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETFRAMEBUFFERSQCOMPROC __glewExtGetFramebuffersQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETRENDERBUFFERSQCOMPROC __glewExtGetRenderbuffersQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC __glewExtGetTexLevelParameterivQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETTEXSUBIMAGEQCOMPROC __glewExtGetTexSubImageQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETTEXTURESQCOMPROC __glewExtGetTexturesQCOM;
+GLEW_FUN_EXPORT PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC __glewExtTexObjectStateOverrideiQCOM;
+
+GLEW_FUN_EXPORT PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC __glewExtGetProgramBinarySourceQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETPROGRAMSQCOMPROC __glewExtGetProgramsQCOM;
+GLEW_FUN_EXPORT PFNGLEXTGETSHADERSQCOMPROC __glewExtGetShadersQCOM;
+GLEW_FUN_EXPORT PFNGLEXTISPROGRAMBINARYQCOMPROC __glewExtIsProgramBinaryQCOM;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERFOVEATIONCONFIGQCOMPROC __glewFramebufferFoveationConfigQCOM;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERFOVEATIONPARAMETERSQCOMPROC __glewFramebufferFoveationParametersQCOM;
+
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERFETCHBARRIERQCOMPROC __glewFramebufferFetchBarrierQCOM;
+
+GLEW_FUN_EXPORT PFNGLENDTILINGQCOMPROC __glewEndTilingQCOM;
+GLEW_FUN_EXPORT PFNGLSTARTTILINGQCOMPROC __glewStartTilingQCOM;
+
+GLEW_FUN_EXPORT PFNGLALPHAFUNCXPROC __glewAlphaFuncx;
+GLEW_FUN_EXPORT PFNGLCLEARCOLORXPROC __glewClearColorx;
+GLEW_FUN_EXPORT PFNGLCLEARDEPTHXPROC __glewClearDepthx;
+GLEW_FUN_EXPORT PFNGLCOLOR4XPROC __glewColor4x;
+GLEW_FUN_EXPORT PFNGLDEPTHRANGEXPROC __glewDepthRangex;
+GLEW_FUN_EXPORT PFNGLFOGXPROC __glewFogx;
+GLEW_FUN_EXPORT PFNGLFOGXVPROC __glewFogxv;
+GLEW_FUN_EXPORT PFNGLFRUSTUMFPROC __glewFrustumf;
+GLEW_FUN_EXPORT PFNGLFRUSTUMXPROC __glewFrustumx;
+GLEW_FUN_EXPORT PFNGLLIGHTMODELXPROC __glewLightModelx;
+GLEW_FUN_EXPORT PFNGLLIGHTMODELXVPROC __glewLightModelxv;
+GLEW_FUN_EXPORT PFNGLLIGHTXPROC __glewLightx;
+GLEW_FUN_EXPORT PFNGLLIGHTXVPROC __glewLightxv;
+GLEW_FUN_EXPORT PFNGLLINEWIDTHXPROC __glewLineWidthx;
+GLEW_FUN_EXPORT PFNGLLOADMATRIXXPROC __glewLoadMatrixx;
+GLEW_FUN_EXPORT PFNGLMATERIALXPROC __glewMaterialx;
+GLEW_FUN_EXPORT PFNGLMATERIALXVPROC __glewMaterialxv;
+GLEW_FUN_EXPORT PFNGLMULTMATRIXXPROC __glewMultMatrixx;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4XPROC __glewMultiTexCoord4x;
+GLEW_FUN_EXPORT PFNGLNORMAL3XPROC __glewNormal3x;
+GLEW_FUN_EXPORT PFNGLORTHOFPROC __glewOrthof;
+GLEW_FUN_EXPORT PFNGLORTHOXPROC __glewOrthox;
+GLEW_FUN_EXPORT PFNGLPOINTSIZEXPROC __glewPointSizex;
+GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETXPROC __glewPolygonOffsetx;
+GLEW_FUN_EXPORT PFNGLROTATEXPROC __glewRotatex;
+GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEXPROC __glewSampleCoveragex;
+GLEW_FUN_EXPORT PFNGLSCALEXPROC __glewScalex;
+GLEW_FUN_EXPORT PFNGLTEXENVXPROC __glewTexEnvx;
+GLEW_FUN_EXPORT PFNGLTEXENVXVPROC __glewTexEnvxv;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERXPROC __glewTexParameterx;
+GLEW_FUN_EXPORT PFNGLTRANSLATEXPROC __glewTranslatex;
+
+GLEW_FUN_EXPORT PFNGLCLIPPLANEFPROC __glewClipPlanef;
+GLEW_FUN_EXPORT PFNGLCLIPPLANEXPROC __glewClipPlanex;
+GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFPROC __glewGetClipPlanef;
+GLEW_FUN_EXPORT PFNGLGETCLIPPLANEXPROC __glewGetClipPlanex;
+GLEW_FUN_EXPORT PFNGLGETFIXEDVPROC __glewGetFixedv;
+GLEW_FUN_EXPORT PFNGLGETLIGHTXVPROC __glewGetLightxv;
+GLEW_FUN_EXPORT PFNGLGETMATERIALXVPROC __glewGetMaterialxv;
+GLEW_FUN_EXPORT PFNGLGETTEXENVXVPROC __glewGetTexEnvxv;
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERXVPROC __glewGetTexParameterxv;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXPROC __glewPointParameterx;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXVPROC __glewPointParameterxv;
+GLEW_FUN_EXPORT PFNGLPOINTSIZEPOINTEROESPROC __glewPointSizePointerOES;
+GLEW_FUN_EXPORT PFNGLTEXPARAMETERXVPROC __glewTexParameterxv;
+
+GLEW_FUN_EXPORT PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL;
+
+GLEW_FUN_EXPORT PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL;
+GLEW_FUN_EXPORT PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL;
+
+GLEW_FUN_EXPORT PFNGLLOGMESSAGECALLBACKREGALPROC __glewLogMessageCallbackREGAL;
+
+GLEW_FUN_EXPORT PFNGLGETPROCADDRESSREGALPROC __glewGetProcAddressREGAL;
+
+GLEW_FUN_EXPORT PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS;
+GLEW_FUN_EXPORT PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS;
+GLEW_FUN_EXPORT PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS;
+GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS;
+
+GLEW_FUN_EXPORT PFNGLINTERLEAVEDTEXTURECOORDSETSSGISPROC __glewInterleavedTextureCoordSetsSGIS;
+GLEW_FUN_EXPORT PFNGLSELECTTEXTURECOORDSETSGISPROC __glewSelectTextureCoordSetSGIS;
+GLEW_FUN_EXPORT PFNGLSELECTTEXTURESGISPROC __glewSelectTextureSGIS;
+GLEW_FUN_EXPORT PFNGLSELECTTEXTURETRANSFORMSGISPROC __glewSelectTextureTransformSGIS;
+
+GLEW_FUN_EXPORT PFNGLMULTISAMPLESUBRECTPOSSGISPROC __glewMultisampleSubRectPosSGIS;
+
+GLEW_FUN_EXPORT PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS;
+GLEW_FUN_EXPORT PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS;
+
+GLEW_FUN_EXPORT PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS;
+GLEW_FUN_EXPORT PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX;
+GLEW_FUN_EXPORT PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX;
+GLEW_FUN_EXPORT PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX;
+GLEW_FUN_EXPORT PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX;
+GLEW_FUN_EXPORT PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX;
+GLEW_FUN_EXPORT PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX;
+
+GLEW_FUN_EXPORT PFNGLADDRESSSPACEPROC __glewAddressSpace;
+GLEW_FUN_EXPORT PFNGLDATAPIPEPROC __glewDataPipe;
+
+GLEW_FUN_EXPORT PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX;
+
+GLEW_FUN_EXPORT PFNGLFOGLAYERSSGIXPROC __glewFogLayersSGIX;
+GLEW_FUN_EXPORT PFNGLGETFOGLAYERSSGIXPROC __glewGetFogLayersSGIX;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX;
+
+GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX;
+
+GLEW_FUN_EXPORT PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX;
+
+GLEW_FUN_EXPORT PFNGLIGLOOINTERFACESGIXPROC __glewIglooInterfaceSGIX;
+
+GLEW_FUN_EXPORT PFNGLALLOCMPEGPREDICTORSSGIXPROC __glewAllocMPEGPredictorsSGIX;
+GLEW_FUN_EXPORT PFNGLDELETEMPEGPREDICTORSSGIXPROC __glewDeleteMPEGPredictorsSGIX;
+GLEW_FUN_EXPORT PFNGLGENMPEGPREDICTORSSGIXPROC __glewGenMPEGPredictorsSGIX;
+GLEW_FUN_EXPORT PFNGLGETMPEGPARAMETERFVSGIXPROC __glewGetMPEGParameterfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETMPEGPARAMETERIVSGIXPROC __glewGetMPEGParameterivSGIX;
+GLEW_FUN_EXPORT PFNGLGETMPEGPREDICTORSGIXPROC __glewGetMPEGPredictorSGIX;
+GLEW_FUN_EXPORT PFNGLGETMPEGQUANTTABLEUBVPROC __glewGetMPEGQuantTableubv;
+GLEW_FUN_EXPORT PFNGLISMPEGPREDICTORSGIXPROC __glewIsMPEGPredictorSGIX;
+GLEW_FUN_EXPORT PFNGLMPEGPREDICTORSGIXPROC __glewMPEGPredictorSGIX;
+GLEW_FUN_EXPORT PFNGLMPEGQUANTTABLEUBVPROC __glewMPEGQuantTableubv;
+GLEW_FUN_EXPORT PFNGLSWAPMPEGPREDICTORSSGIXPROC __glewSwapMPEGPredictorsSGIX;
+
+GLEW_FUN_EXPORT PFNGLGETNONLINLIGHTFVSGIXPROC __glewGetNonlinLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETNONLINMATERIALFVSGIXPROC __glewGetNonlinMaterialfvSGIX;
+GLEW_FUN_EXPORT PFNGLNONLINLIGHTFVSGIXPROC __glewNonlinLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLNONLINMATERIALFVSGIXPROC __glewNonlinMaterialfvSGIX;
+
+GLEW_FUN_EXPORT PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX;
+
+GLEW_FUN_EXPORT PFNGLDEFORMSGIXPROC __glewDeformSGIX;
+GLEW_FUN_EXPORT PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC __glewLoadIdentityDeformationMapSGIX;
+
+GLEW_FUN_EXPORT PFNGLMESHBREADTHSGIXPROC __glewMeshBreadthSGIX;
+GLEW_FUN_EXPORT PFNGLMESHSTRIDESGIXPROC __glewMeshStrideSGIX;
+
+GLEW_FUN_EXPORT PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX;
+
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX;
+
+GLEW_FUN_EXPORT PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX;
+
+GLEW_FUN_EXPORT PFNGLGETVECTOROPERATIONSGIXPROC __glewGetVectorOperationSGIX;
+GLEW_FUN_EXPORT PFNGLVECTOROPERATIONSGIXPROC __glewVectorOperationSGIX;
+
+GLEW_FUN_EXPORT PFNGLAREVERTEXARRAYSRESIDENTSGIXPROC __glewAreVertexArraysResidentSGIX;
+GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYSGIXPROC __glewBindVertexArraySGIX;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSSGIXPROC __glewDeleteVertexArraysSGIX;
+GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSSGIXPROC __glewGenVertexArraysSGIX;
+GLEW_FUN_EXPORT PFNGLISVERTEXARRAYSGIXPROC __glewIsVertexArraySGIX;
+GLEW_FUN_EXPORT PFNGLPRIORITIZEVERTEXARRAYSSGIXPROC __glewPrioritizeVertexArraysSGIX;
+
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI;
+GLEW_FUN_EXPORT PFNGLCOLORTABLESGIPROC __glewColorTableSGI;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI;
+
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVSGIPROC __glewGetPixelTransformParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVSGIPROC __glewGetPixelTransformParameterivSGI;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFSGIPROC __glewPixelTransformParameterfSGI;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVSGIPROC __glewPixelTransformParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERISGIPROC __glewPixelTransformParameteriSGI;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVSGIPROC __glewPixelTransformParameterivSGI;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMSGIPROC __glewPixelTransformSGI;
+
+GLEW_FUN_EXPORT PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX;
+
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN;
+
+GLEW_FUN_EXPORT PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN;
+
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN;
+
+GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN;
+
+GLEW_FUN_EXPORT PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_3;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_4;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_5;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_0;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_0;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_2;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_3;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_0;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_2;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_3;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_4;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_5;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_6;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_tbuffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_texture_compression_FXT1;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_blend_minmax_factor;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_compressed_3DC_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_compressed_ATC_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_conservative_depth;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_debug_output;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_depth_clamp_separate;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_draw_buffers_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_framebuffer_sample_positions;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gcn_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gpu_shader_half_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gpu_shader_int16;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gpu_shader_int64;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_interleaved_elements;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_multi_draw_indirect;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_name_gen_delete;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_occlusion_query_event;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_performance_monitor;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_pinned_memory;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_program_binary_Z400;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_query_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sample_positions;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_seamless_cubemap_per_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_atomic_counter_ops;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_ballot;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_explicit_vertex_parameter;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_export;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_value_export;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_trinary_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sparse_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_stencil_operation_extended;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_texture_gather_bias_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_texture_texture4;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback3_lines_triangles;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback4;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_layer;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_tessellator;
+GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_viewport_index;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANDROID_extension_pack_es31a;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_depth_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_blit;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_instanced_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_pack_reverse_row_order;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_program_binary;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt1;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt5;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_usage;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_timer_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_translated_shader_source;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_aux_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_client_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_clip_distance;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_color_buffer_packed_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_copy_texture_levels;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_element_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_fence;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_float_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_flush_buffer_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_framebuffer_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_object_purgeable;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_pixel_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_rgb_422;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_row_bytes;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_specular_vector;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_sync;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_2D_limited_npot;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_format_BGRA8888;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_max_level;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_packed_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_transform_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_program_evaluators;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_ycbcr_422;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES2_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_1_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_2_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_arrays_of_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_base_instance;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_bindless_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_blend_func_extended;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_buffer_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cl_event;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clip_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_color_buffer_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compressed_texture_pixel_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_variable_group_size;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conditional_render_inverted;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conservative_depth;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_image;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cull_distance;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_debug_output;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_buffer_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_derivative_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_direct_state_access;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_elements_base_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_indirect;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_instanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_enhanced_layouts;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_attrib_location;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_uniform_location;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_coord_conventions;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_layer_viewport;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader_interlock;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_no_attachments;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_geometry_shader4;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_program_binary;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_texture_sub_image;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gl_spirv;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader5;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_fp64;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_int64;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_pixel;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_imaging;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_indirect_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_instanced_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query2;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_invalidate_subdata;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_alignment;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_matrix_palette;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_bind;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_draw_indirect;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multitexture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query2;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_parallel_shader_compile;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pipeline_statistics_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pixel_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_polygon_offset_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_post_depth_coverage;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_program_interface_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_provoking_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_query_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robust_buffer_access_behavior;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_application_isolation;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_share_group_isolation;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_locations;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_shading;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sampler_objects;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cubemap_per_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_separate_shader_objects;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counter_ops;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counters;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_ballot;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_bit_encoding;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_clock;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_draw_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_group_vote;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_load_store;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_size;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_objects;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_precision;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_stencil_export;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_storage_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_subroutine;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_image_samples;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_viewport_layer_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_100;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_420pack;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_include;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_packing;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow_ambient;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture2;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_spirv_extensions;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_stencil_texturing;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sync;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_tessellation_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_barrier;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_border_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object_rgb32;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_bptc;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_rgtc;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_add;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_combine;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_crossbar;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_dot3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_filter_anisotropic;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_filter_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_gather;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirror_clamp_to_edge;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirrored_repeat;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_non_power_of_two;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_levels;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rg;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rgb10_a2ui;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_stencil8;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_swizzle;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_view;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_timer_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback2;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_instanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_overflow_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transpose_matrix;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_uniform_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_bgra;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_64bit;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_binding;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_10f_11f_11f_rev;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_viewport_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_window_pos;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARM_mali_program_binary;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARM_mali_shader_binary;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARM_rgba8;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARM_shader_framebuffer_fetch;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARM_shader_framebuffer_fetch_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_point_sprites;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_combine3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_route;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_vertex_shader_output_point_size;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_element_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_envmap_bumpmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_map_object_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_meminfo;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_pn_triangles;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_separate_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_shader_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_text_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_compression_3dc;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_env_combine3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_mirror_once;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_attrib_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_streams;
+GLEW_VAR_EXPORT GLboolean __GLEW_EGL_KHR_context_flush_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_EGL_NV_robustness_video_memory_purge;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_422_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_Cg_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_EGL_image_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_YUV_target;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_abgr;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_base_instance;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bgra;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bindable_uniform;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_equation_separate;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_extended;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_separate;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_logic_op;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_subtract;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_buffer_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clear_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_cull_distance;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_volume_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cmyka;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_buffer_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_buffer_half_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_subtable;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compiled_vertex_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compressed_ETC1_RGB8_sub_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_conservative_depth;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_image;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_label;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_discard_framebuffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers2;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers_indexed;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_elements_base_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_instanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_range_elements;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_external_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_float_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fog_coord;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_frag_depth;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fragment_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_blit;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_point_size;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_shader4;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_program_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_shader4;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_shader5;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_histogram;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_array_formats;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_func;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_material;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_instanced_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_light_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_map_buffer_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_memory_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_memory_object_fd;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_memory_object_win32;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_misc_attribute;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_indirect;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multiple_textures;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisampled_render_to_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisampled_render_to_texture2;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multiview_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_paletted_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_point_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_post_depth_coverage;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_provoking_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pvrtc_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_raster_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_read_format_bgra;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_render_snorm;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sRGB_write_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_semaphore;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_semaphore_fd;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_semaphore_win32;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_framebuffer_fetch;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_group_vote;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_formatted;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_implicit_conversions;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_integer_mix;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_io_blocks;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_non_constant_global_initializers;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_pixel_local_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_pixel_local_storage2;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_samplers;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sparse_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sparse_texture2;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_two_side;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_wrap;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_subtexture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture3D;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_astc_decode_mode;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_bptc;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_dxt1;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_latc;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_rgtc;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_s3tc;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_edge_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_add;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_combine;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_dot3;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_anisotropic;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_format_BGRA8888;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_integer;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_lod_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_mirror_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_norm16;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_perturb_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rg;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_R8;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_RG8;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_decode;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_shared_exponent;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_snorm;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_swizzle;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_type_2_10_10_10_REV;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_view;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_timer_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_transform_feedback;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_unpack_subimage;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_bgra;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_setXXX;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_attrib_64bit;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_win32_keyed_mutex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_window_rectangles;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_x11_sync_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_frame_terminator;
+GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_convolution_border_modes;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_image_transform;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_occlusion_test;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_texture_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_multimode_draw_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_rasterpos_clip;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_static_data;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists;
+GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_conservative_rasterization;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_fragment_shader_ordering;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_framebuffer_CMAA;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_map_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_performance_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced_coherent;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_context_flush_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_no_error;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_parallel_shader_compile;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robust_buffer_access_behavior;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robustness;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_hdr;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_sliced_3d;
+GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_pack_invert;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_resize_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_shader_integer_functions;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_window_pos;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_ycbcr_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_NVX_blend_equation_advanced_multi_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_NVX_conditional_render;
+GLEW_VAR_EXPORT GLboolean __GLEW_NVX_gpu_memory_info;
+GLEW_VAR_EXPORT GLboolean __GLEW_NVX_linked_gpu_multicast;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_3dvision_settings;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_EGL_stream_consumer_external;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_alpha_to_coverage_dither_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_bgr;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect_count;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced_coherent;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_minmax_factor;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_square;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_clip_space_w_scaling;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_command_list;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_compute_program5;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_conditional_render;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_dilate;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_pre_snap_triangles;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_depth_to_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_image;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_deep_texture3D;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_buffer_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_range_unclamped;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_instanced;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_vulkan_image;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_evaluators;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_explicit_attrib_location;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_explicit_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fbo_color_attachments;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fence;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fill_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_float_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fog_distance;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_coverage_to_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program_option;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_shader_interlock;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_blit;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_mixed_samples;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_multisample_coverage;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_generate_mipmap_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_program4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader_passthrough;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_multicast;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5_mem_extended;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program_fp64;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_shader5;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_half_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_image_formats;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_instanced_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_internalformat_sample_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_light_max_exponent;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_coverage;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_filter_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_non_square_matrices;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_occlusion_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_pack_subimage;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_float_linear;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering_shared_edge;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_data_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_platform_binary;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_point_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_polygon_mode;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_present_video;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_primitive_restart;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_read_depth;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_read_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_read_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_robustness_video_memory_purge;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_sRGB_formats;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_locations;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_mask_override_coverage;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_counters;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float64;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_fp16_vector;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_int64;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_buffer_load;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_noperspective_interpolation;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_storage_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_group;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_shuffle;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shadow_samplers_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_shadow_samplers_cube;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_stereo_view_rendering;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_tessellation_program5;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_emboss;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_reflection;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_barrier;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_border_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_latc;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_s3tc;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_s3tc_update;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_vtc;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_env_combine4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_expand_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_npot_2D_mipmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle_compressed;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader3;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_uniform_buffer_unified_memory;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vdpau_interop;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_attrib_integer_64bit;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_buffer_unified_memory;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program1_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2_option;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program3;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_video_capture;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_array2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_swizzle;
+GLEW_VAR_EXPORT GLboolean __GLEW_OES_byte_coordinates;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_interlace;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_resample;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_subsample;
+GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview;
+GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview2;
+GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview_multisampled_render_to_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_PGI_misc_hints;
+GLEW_VAR_EXPORT GLboolean __GLEW_PGI_vertex_hints;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_alpha_test;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_binning_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_driver_control;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_extended_get;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_extended_get2;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_framebuffer_foveated;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_perfmon_global_mode;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_shader_framebuffer_fetch_noncoherent;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_tiled_rendering;
+GLEW_VAR_EXPORT GLboolean __GLEW_QCOM_writeonly_rendering;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_0_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_1_compatibility;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_enable;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_error_string;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_extension_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_log;
+GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_proc_address;
+GLEW_VAR_EXPORT GLboolean __GLEW_REND_screen_coordinates;
+GLEW_VAR_EXPORT GLboolean __GLEW_S3_s3tc;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_clip_band_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_color_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_detail_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_fog_function;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_generate_mipmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_line_texgen;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multitexture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_pixel_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_point_line_texgen;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_shared_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_sharpen_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture4D;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_border_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_edge_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_filter4;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_select;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_histogram;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_pixel;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_bali_g_instruments;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_bali_r_instruments;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_bali_timer_instruments;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_alpha_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_cadd;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_cmultiply;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_calligraphic_fragment;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_clipmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_color_matrix_accuracy;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_color_table_index_mode;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_complex_polar;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_convolution_accuracy;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_cylinder_texgen;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_datapipe;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_decimation;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_pass_instrument;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_dvc;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_flush_raster;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_factor_to_alpha;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_layers;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_offset;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_patchy;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_scale;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_lighting_space;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_specular_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragments_instrument;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_framezoom;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_icc_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_igloo_interface;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_image_compression;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_impact_pixel_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_instrument_error;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_interlace;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ir_instrument1;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_line_quality_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_list_priority;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_mpeg1;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_mpeg2;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_nonlinear_lighting_pervertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_nurbs_eval;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_occlusion_instrument;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_packed_6bytes;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_bits;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_tiles;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_polynomial_ffd;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_quad_mesh;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_reference_plane;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_resample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_scalebias_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow_ambient;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_slim;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_spotlight_cutoff;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_subdiv_patch;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_subsample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_tag_sample_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_add_env;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_coordinate_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_lod_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_mipmap_anisotropic;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_multi_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_phase;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_scale_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_supersample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vector_ops;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb_subsample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcba;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_matrix;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_complex;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_complex_type;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_fft;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_texture_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUNX_constant_data;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_convolution_border_modes;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_global_alpha;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_mesh_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_read_video_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_slice_accum;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_triangle_list;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_phong_shading;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_scene_markerXXX;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_specular_fog;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_swap_hint;
+/* ------------------------------------------------------------------------- */
+
+/* error codes */
+#define GLEW_OK 0
+#define GLEW_NO_ERROR 0
+#define GLEW_ERROR_NO_GL_VERSION 1  /* missing GL version */
+#define GLEW_ERROR_GL_VERSION_10_ONLY 2  /* Need at least OpenGL 1.1 */
+#define GLEW_ERROR_GLX_VERSION_11_ONLY 3  /* Need at least GLX 1.2 */
+#define GLEW_ERROR_NO_GLX_DISPLAY 4  /* Need GLX display for GLX support */
+
+/* string codes */
+#define GLEW_VERSION 1
+#define GLEW_VERSION_MAJOR 2
+#define GLEW_VERSION_MINOR 3
+#define GLEW_VERSION_MICRO 4
+
+/* ------------------------------------------------------------------------- */
+
+/* GLEW version info */
+
+/*
+VERSION 2.1.0
+VERSION_MAJOR 2
+VERSION_MINOR 1
+VERSION_MICRO 0
+*/
+
+/* API */
+GLEWAPI GLenum GLEWAPIENTRY glewInit (void);
+GLEWAPI GLenum GLEWAPIENTRY glewContextInit (void);
+GLEWAPI GLboolean GLEWAPIENTRY glewIsSupported (const char *name);
+#define glewIsExtensionSupported(x) glewIsSupported(x)
+
+#ifndef GLEW_GET_VAR
+#define GLEW_GET_VAR(x) (*(const GLboolean*)&x)
+#endif
+
+#ifndef GLEW_GET_FUN
+#define GLEW_GET_FUN(x) x
+#endif
+
+GLEWAPI GLboolean glewExperimental;
+GLEWAPI GLboolean GLEWAPIENTRY glewGetExtension (const char *name);
+GLEWAPI const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error);
+GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef GLEW_APIENTRY_DEFINED
+#undef GLEW_APIENTRY_DEFINED
+#undef APIENTRY
+#endif
+
+#ifdef GLEW_CALLBACK_DEFINED
+#undef GLEW_CALLBACK_DEFINED
+#undef CALLBACK
+#endif
+
+#ifdef GLEW_WINGDIAPI_DEFINED
+#undef GLEW_WINGDIAPI_DEFINED
+#undef WINGDIAPI
+#endif
+
+#undef GLAPI
+/* #undef GLEWAPI */
+
+#endif /* __glew_h__ */
diff --git a/src_bkp/engine/external/glew/GL/glxew.h b/src_bkp/engine/external/glew/GL/glxew.h
new file mode 100644
index 0000000000..7e39c2fd98
--- /dev/null
+++ b/src_bkp/engine/external/glew/GL/glxew.h
@@ -0,0 +1,1775 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2008-2017, Nigel Stewart <nigels[]users sourceforge net>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.0
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#ifndef __glxew_h__
+#define __glxew_h__
+#define __GLXEW_H__
+
+#ifdef __glxext_h_
+#error glxext.h included before glxew.h
+#endif
+
+#if defined(GLX_H) || defined(__GLX_glx_h__) || defined(__glx_h__)
+#error glx.h included before glxew.h
+#endif
+
+#define __glxext_h_
+
+#define GLX_H
+#define __GLX_glx_h__
+#define __glx_h__
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xmd.h>
+#include <GL/glew.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ---------------------------- GLX_VERSION_1_0 --------------------------- */
+
+#ifndef GLX_VERSION_1_0
+#define GLX_VERSION_1_0 1
+
+#define GLX_USE_GL 1
+#define GLX_BUFFER_SIZE 2
+#define GLX_LEVEL 3
+#define GLX_RGBA 4
+#define GLX_DOUBLEBUFFER 5
+#define GLX_STEREO 6
+#define GLX_AUX_BUFFERS 7
+#define GLX_RED_SIZE 8
+#define GLX_GREEN_SIZE 9
+#define GLX_BLUE_SIZE 10
+#define GLX_ALPHA_SIZE 11
+#define GLX_DEPTH_SIZE 12
+#define GLX_STENCIL_SIZE 13
+#define GLX_ACCUM_RED_SIZE 14
+#define GLX_ACCUM_GREEN_SIZE 15
+#define GLX_ACCUM_BLUE_SIZE 16
+#define GLX_ACCUM_ALPHA_SIZE 17
+#define GLX_BAD_SCREEN 1
+#define GLX_BAD_ATTRIBUTE 2
+#define GLX_NO_EXTENSION 3
+#define GLX_BAD_VISUAL 4
+#define GLX_BAD_CONTEXT 5
+#define GLX_BAD_VALUE 6
+#define GLX_BAD_ENUM 7
+
+typedef XID GLXDrawable;
+typedef XID GLXPixmap;
+#ifdef __sun
+typedef struct __glXContextRec *GLXContext;
+#else
+typedef struct __GLXcontextRec *GLXContext;
+#endif
+
+typedef unsigned int GLXVideoDeviceNV; 
+
+extern Bool glXQueryExtension (Display *dpy, int *errorBase, int *eventBase);
+extern Bool glXQueryVersion (Display *dpy, int *major, int *minor);
+extern int glXGetConfig (Display *dpy, XVisualInfo *vis, int attrib, int *value);
+extern XVisualInfo* glXChooseVisual (Display *dpy, int screen, int *attribList);
+extern GLXPixmap glXCreateGLXPixmap (Display *dpy, XVisualInfo *vis, Pixmap pixmap);
+extern void glXDestroyGLXPixmap (Display *dpy, GLXPixmap pix);
+extern GLXContext glXCreateContext (Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
+extern void glXDestroyContext (Display *dpy, GLXContext ctx);
+extern Bool glXIsDirect (Display *dpy, GLXContext ctx);
+extern void glXCopyContext (Display *dpy, GLXContext src, GLXContext dst, GLulong mask);
+extern Bool glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx);
+extern GLXContext glXGetCurrentContext (void);
+extern GLXDrawable glXGetCurrentDrawable (void);
+extern void glXWaitGL (void);
+extern void glXWaitX (void);
+extern void glXSwapBuffers (Display *dpy, GLXDrawable drawable);
+extern void glXUseXFont (Font font, int first, int count, int listBase);
+
+#define GLXEW_VERSION_1_0 GLXEW_GET_VAR(__GLXEW_VERSION_1_0)
+
+#endif /* GLX_VERSION_1_0 */
+
+/* ---------------------------- GLX_VERSION_1_1 --------------------------- */
+
+#ifndef GLX_VERSION_1_1
+#define GLX_VERSION_1_1
+
+#define GLX_VENDOR 0x1
+#define GLX_VERSION 0x2
+#define GLX_EXTENSIONS 0x3
+
+extern const char* glXQueryExtensionsString (Display *dpy, int screen);
+extern const char* glXGetClientString (Display *dpy, int name);
+extern const char* glXQueryServerString (Display *dpy, int screen, int name);
+
+#define GLXEW_VERSION_1_1 GLXEW_GET_VAR(__GLXEW_VERSION_1_1)
+
+#endif /* GLX_VERSION_1_1 */
+
+/* ---------------------------- GLX_VERSION_1_2 ---------------------------- */
+
+#ifndef GLX_VERSION_1_2
+#define GLX_VERSION_1_2 1
+
+typedef Display* ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+
+#define glXGetCurrentDisplay GLXEW_GET_FUN(__glewXGetCurrentDisplay)
+
+#define GLXEW_VERSION_1_2 GLXEW_GET_VAR(__GLXEW_VERSION_1_2)
+
+#endif /* GLX_VERSION_1_2 */
+
+/* ---------------------------- GLX_VERSION_1_3 ---------------------------- */
+
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+
+#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
+#define GLX_RGBA_BIT 0x00000001
+#define GLX_WINDOW_BIT 0x00000001
+#define GLX_COLOR_INDEX_BIT 0x00000002
+#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
+#define GLX_PIXMAP_BIT 0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
+#define GLX_PBUFFER_BIT 0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
+#define GLX_AUX_BUFFERS_BIT 0x00000010
+#define GLX_CONFIG_CAVEAT 0x20
+#define GLX_DEPTH_BUFFER_BIT 0x00000020
+#define GLX_X_VISUAL_TYPE 0x22
+#define GLX_TRANSPARENT_TYPE 0x23
+#define GLX_TRANSPARENT_INDEX_VALUE 0x24
+#define GLX_TRANSPARENT_RED_VALUE 0x25
+#define GLX_TRANSPARENT_GREEN_VALUE 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE 0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
+#define GLX_STENCIL_BUFFER_BIT 0x00000040
+#define GLX_ACCUM_BUFFER_BIT 0x00000080
+#define GLX_NONE 0x8000
+#define GLX_SLOW_CONFIG 0x8001
+#define GLX_TRUE_COLOR 0x8002
+#define GLX_DIRECT_COLOR 0x8003
+#define GLX_PSEUDO_COLOR 0x8004
+#define GLX_STATIC_COLOR 0x8005
+#define GLX_GRAY_SCALE 0x8006
+#define GLX_STATIC_GRAY 0x8007
+#define GLX_TRANSPARENT_RGB 0x8008
+#define GLX_TRANSPARENT_INDEX 0x8009
+#define GLX_VISUAL_ID 0x800B
+#define GLX_SCREEN 0x800C
+#define GLX_NON_CONFORMANT_CONFIG 0x800D
+#define GLX_DRAWABLE_TYPE 0x8010
+#define GLX_RENDER_TYPE 0x8011
+#define GLX_X_RENDERABLE 0x8012
+#define GLX_FBCONFIG_ID 0x8013
+#define GLX_RGBA_TYPE 0x8014
+#define GLX_COLOR_INDEX_TYPE 0x8015
+#define GLX_MAX_PBUFFER_WIDTH 0x8016
+#define GLX_MAX_PBUFFER_HEIGHT 0x8017
+#define GLX_MAX_PBUFFER_PIXELS 0x8018
+#define GLX_PRESERVED_CONTENTS 0x801B
+#define GLX_LARGEST_PBUFFER 0x801C
+#define GLX_WIDTH 0x801D
+#define GLX_HEIGHT 0x801E
+#define GLX_EVENT_MASK 0x801F
+#define GLX_DAMAGED 0x8020
+#define GLX_SAVED 0x8021
+#define GLX_WINDOW 0x8022
+#define GLX_PBUFFER 0x8023
+#define GLX_PBUFFER_HEIGHT 0x8040
+#define GLX_PBUFFER_WIDTH 0x8041
+#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
+#define GLX_DONT_CARE 0xFFFFFFFF
+
+typedef XID GLXFBConfigID;
+typedef XID GLXPbuffer;
+typedef XID GLXWindow;
+typedef struct __GLXFBConfigRec *GLXFBConfig;
+
+typedef struct {
+  int event_type; 
+  int draw_type; 
+  unsigned long serial; 
+  Bool send_event; 
+  Display *display; 
+  GLXDrawable drawable; 
+  unsigned int buffer_mask; 
+  unsigned int aux_buffer; 
+  int x, y; 
+  int width, height; 
+  int count; 
+} GLXPbufferClobberEvent;
+typedef union __GLXEvent {
+  GLXPbufferClobberEvent glxpbufferclobber; 
+  long pad[24]; 
+} GLXEvent;
+
+typedef GLXFBConfig* ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef GLXFBConfig* ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+
+#define glXChooseFBConfig GLXEW_GET_FUN(__glewXChooseFBConfig)
+#define glXCreateNewContext GLXEW_GET_FUN(__glewXCreateNewContext)
+#define glXCreatePbuffer GLXEW_GET_FUN(__glewXCreatePbuffer)
+#define glXCreatePixmap GLXEW_GET_FUN(__glewXCreatePixmap)
+#define glXCreateWindow GLXEW_GET_FUN(__glewXCreateWindow)
+#define glXDestroyPbuffer GLXEW_GET_FUN(__glewXDestroyPbuffer)
+#define glXDestroyPixmap GLXEW_GET_FUN(__glewXDestroyPixmap)
+#define glXDestroyWindow GLXEW_GET_FUN(__glewXDestroyWindow)
+#define glXGetCurrentReadDrawable GLXEW_GET_FUN(__glewXGetCurrentReadDrawable)
+#define glXGetFBConfigAttrib GLXEW_GET_FUN(__glewXGetFBConfigAttrib)
+#define glXGetFBConfigs GLXEW_GET_FUN(__glewXGetFBConfigs)
+#define glXGetSelectedEvent GLXEW_GET_FUN(__glewXGetSelectedEvent)
+#define glXGetVisualFromFBConfig GLXEW_GET_FUN(__glewXGetVisualFromFBConfig)
+#define glXMakeContextCurrent GLXEW_GET_FUN(__glewXMakeContextCurrent)
+#define glXQueryContext GLXEW_GET_FUN(__glewXQueryContext)
+#define glXQueryDrawable GLXEW_GET_FUN(__glewXQueryDrawable)
+#define glXSelectEvent GLXEW_GET_FUN(__glewXSelectEvent)
+
+#define GLXEW_VERSION_1_3 GLXEW_GET_VAR(__GLXEW_VERSION_1_3)
+
+#endif /* GLX_VERSION_1_3 */
+
+/* ---------------------------- GLX_VERSION_1_4 ---------------------------- */
+
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+
+#define GLX_SAMPLE_BUFFERS 100000
+#define GLX_SAMPLES 100001
+
+extern void ( * glXGetProcAddress (const GLubyte *procName)) (void);
+
+#define GLXEW_VERSION_1_4 GLXEW_GET_VAR(__GLXEW_VERSION_1_4)
+
+#endif /* GLX_VERSION_1_4 */
+
+/* -------------------------- GLX_3DFX_multisample ------------------------- */
+
+#ifndef GLX_3DFX_multisample
+#define GLX_3DFX_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_3DFX 0x8050
+#define GLX_SAMPLES_3DFX 0x8051
+
+#define GLXEW_3DFX_multisample GLXEW_GET_VAR(__GLXEW_3DFX_multisample)
+
+#endif /* GLX_3DFX_multisample */
+
+/* ------------------------ GLX_AMD_gpu_association ------------------------ */
+
+#ifndef GLX_AMD_gpu_association
+#define GLX_AMD_gpu_association 1
+
+#define GLX_GPU_VENDOR_AMD 0x1F00
+#define GLX_GPU_RENDERER_STRING_AMD 0x1F01
+#define GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
+#define GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
+#define GLX_GPU_RAM_AMD 0x21A3
+#define GLX_GPU_CLOCK_AMD 0x21A4
+#define GLX_GPU_NUM_PIPES_AMD 0x21A5
+#define GLX_GPU_NUM_SIMD_AMD 0x21A6
+#define GLX_GPU_NUM_RB_AMD 0x21A7
+#define GLX_GPU_NUM_SPI_AMD 0x21A8
+
+typedef void ( * PFNGLXBLITCONTEXTFRAMEBUFFERAMDPROC) (GLXContext dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLXContext ( * PFNGLXCREATEASSOCIATEDCONTEXTAMDPROC) (unsigned int id, GLXContext share_list);
+typedef GLXContext ( * PFNGLXCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (unsigned int id, GLXContext share_context, const int* attribList);
+typedef Bool ( * PFNGLXDELETEASSOCIATEDCONTEXTAMDPROC) (GLXContext ctx);
+typedef unsigned int ( * PFNGLXGETCONTEXTGPUIDAMDPROC) (GLXContext ctx);
+typedef GLXContext ( * PFNGLXGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
+typedef unsigned int ( * PFNGLXGETGPUIDSAMDPROC) (unsigned int maxCount, unsigned int* ids);
+typedef int ( * PFNGLXGETGPUINFOAMDPROC) (unsigned int id, int property, GLenum dataType, unsigned int size, void* data);
+typedef Bool ( * PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (GLXContext ctx);
+
+#define glXBlitContextFramebufferAMD GLXEW_GET_FUN(__glewXBlitContextFramebufferAMD)
+#define glXCreateAssociatedContextAMD GLXEW_GET_FUN(__glewXCreateAssociatedContextAMD)
+#define glXCreateAssociatedContextAttribsAMD GLXEW_GET_FUN(__glewXCreateAssociatedContextAttribsAMD)
+#define glXDeleteAssociatedContextAMD GLXEW_GET_FUN(__glewXDeleteAssociatedContextAMD)
+#define glXGetContextGPUIDAMD GLXEW_GET_FUN(__glewXGetContextGPUIDAMD)
+#define glXGetCurrentAssociatedContextAMD GLXEW_GET_FUN(__glewXGetCurrentAssociatedContextAMD)
+#define glXGetGPUIDsAMD GLXEW_GET_FUN(__glewXGetGPUIDsAMD)
+#define glXGetGPUInfoAMD GLXEW_GET_FUN(__glewXGetGPUInfoAMD)
+#define glXMakeAssociatedContextCurrentAMD GLXEW_GET_FUN(__glewXMakeAssociatedContextCurrentAMD)
+
+#define GLXEW_AMD_gpu_association GLXEW_GET_VAR(__GLXEW_AMD_gpu_association)
+
+#endif /* GLX_AMD_gpu_association */
+
+/* --------------------- GLX_ARB_context_flush_control --------------------- */
+
+#ifndef GLX_ARB_context_flush_control
+#define GLX_ARB_context_flush_control 1
+
+#define GLXEW_ARB_context_flush_control GLXEW_GET_VAR(__GLXEW_ARB_context_flush_control)
+
+#endif /* GLX_ARB_context_flush_control */
+
+/* ------------------------- GLX_ARB_create_context ------------------------ */
+
+#ifndef GLX_ARB_create_context
+#define GLX_ARB_create_context 1
+
+#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
+#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
+#define GLX_CONTEXT_FLAGS_ARB 0x2094
+
+typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display* dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
+
+#define glXCreateContextAttribsARB GLXEW_GET_FUN(__glewXCreateContextAttribsARB)
+
+#define GLXEW_ARB_create_context GLXEW_GET_VAR(__GLXEW_ARB_create_context)
+
+#endif /* GLX_ARB_create_context */
+
+/* -------------------- GLX_ARB_create_context_no_error -------------------- */
+
+#ifndef GLX_ARB_create_context_no_error
+#define GLX_ARB_create_context_no_error 1
+
+#define GLXEW_ARB_create_context_no_error GLXEW_GET_VAR(__GLXEW_ARB_create_context_no_error)
+
+#endif /* GLX_ARB_create_context_no_error */
+
+/* --------------------- GLX_ARB_create_context_profile -------------------- */
+
+#ifndef GLX_ARB_create_context_profile
+#define GLX_ARB_create_context_profile 1
+
+#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
+#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
+
+#define GLXEW_ARB_create_context_profile GLXEW_GET_VAR(__GLXEW_ARB_create_context_profile)
+
+#endif /* GLX_ARB_create_context_profile */
+
+/* ------------------- GLX_ARB_create_context_robustness ------------------- */
+
+#ifndef GLX_ARB_create_context_robustness
+#define GLX_ARB_create_context_robustness 1
+
+#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
+#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
+
+#define GLXEW_ARB_create_context_robustness GLXEW_GET_VAR(__GLXEW_ARB_create_context_robustness)
+
+#endif /* GLX_ARB_create_context_robustness */
+
+/* ------------------------- GLX_ARB_fbconfig_float ------------------------ */
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_ARB_fbconfig_float 1
+
+#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004
+#define GLX_RGBA_FLOAT_TYPE_ARB 0x20B9
+
+#define GLXEW_ARB_fbconfig_float GLXEW_GET_VAR(__GLXEW_ARB_fbconfig_float)
+
+#endif /* GLX_ARB_fbconfig_float */
+
+/* ------------------------ GLX_ARB_framebuffer_sRGB ----------------------- */
+
+#ifndef GLX_ARB_framebuffer_sRGB
+#define GLX_ARB_framebuffer_sRGB 1
+
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
+
+#define GLXEW_ARB_framebuffer_sRGB GLXEW_GET_VAR(__GLXEW_ARB_framebuffer_sRGB)
+
+#endif /* GLX_ARB_framebuffer_sRGB */
+
+/* ------------------------ GLX_ARB_get_proc_address ----------------------- */
+
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+
+extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void);
+
+#define GLXEW_ARB_get_proc_address GLXEW_GET_VAR(__GLXEW_ARB_get_proc_address)
+
+#endif /* GLX_ARB_get_proc_address */
+
+/* -------------------------- GLX_ARB_multisample -------------------------- */
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_ARB 100000
+#define GLX_SAMPLES_ARB 100001
+
+#define GLXEW_ARB_multisample GLXEW_GET_VAR(__GLXEW_ARB_multisample)
+
+#endif /* GLX_ARB_multisample */
+
+/* ---------------- GLX_ARB_robustness_application_isolation --------------- */
+
+#ifndef GLX_ARB_robustness_application_isolation
+#define GLX_ARB_robustness_application_isolation 1
+
+#define GLX_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
+
+#define GLXEW_ARB_robustness_application_isolation GLXEW_GET_VAR(__GLXEW_ARB_robustness_application_isolation)
+
+#endif /* GLX_ARB_robustness_application_isolation */
+
+/* ---------------- GLX_ARB_robustness_share_group_isolation --------------- */
+
+#ifndef GLX_ARB_robustness_share_group_isolation
+#define GLX_ARB_robustness_share_group_isolation 1
+
+#define GLX_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
+
+#define GLXEW_ARB_robustness_share_group_isolation GLXEW_GET_VAR(__GLXEW_ARB_robustness_share_group_isolation)
+
+#endif /* GLX_ARB_robustness_share_group_isolation */
+
+/* ---------------------- GLX_ARB_vertex_buffer_object --------------------- */
+
+#ifndef GLX_ARB_vertex_buffer_object
+#define GLX_ARB_vertex_buffer_object 1
+
+#define GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB 0x2095
+
+#define GLXEW_ARB_vertex_buffer_object GLXEW_GET_VAR(__GLXEW_ARB_vertex_buffer_object)
+
+#endif /* GLX_ARB_vertex_buffer_object */
+
+/* ----------------------- GLX_ATI_pixel_format_float ---------------------- */
+
+#ifndef GLX_ATI_pixel_format_float
+#define GLX_ATI_pixel_format_float 1
+
+#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100
+
+#define GLXEW_ATI_pixel_format_float GLXEW_GET_VAR(__GLXEW_ATI_pixel_format_float)
+
+#endif /* GLX_ATI_pixel_format_float */
+
+/* ------------------------- GLX_ATI_render_texture ------------------------ */
+
+#ifndef GLX_ATI_render_texture
+#define GLX_ATI_render_texture 1
+
+#define GLX_BIND_TO_TEXTURE_RGB_ATI 0x9800
+#define GLX_BIND_TO_TEXTURE_RGBA_ATI 0x9801
+#define GLX_TEXTURE_FORMAT_ATI 0x9802
+#define GLX_TEXTURE_TARGET_ATI 0x9803
+#define GLX_MIPMAP_TEXTURE_ATI 0x9804
+#define GLX_TEXTURE_RGB_ATI 0x9805
+#define GLX_TEXTURE_RGBA_ATI 0x9806
+#define GLX_NO_TEXTURE_ATI 0x9807
+#define GLX_TEXTURE_CUBE_MAP_ATI 0x9808
+#define GLX_TEXTURE_1D_ATI 0x9809
+#define GLX_TEXTURE_2D_ATI 0x980A
+#define GLX_MIPMAP_LEVEL_ATI 0x980B
+#define GLX_CUBE_MAP_FACE_ATI 0x980C
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_X_ATI 0x980D
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_X_ATI 0x980E
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Y_ATI 0x980F
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Y_ATI 0x9810
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Z_ATI 0x9811
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Z_ATI 0x9812
+#define GLX_FRONT_LEFT_ATI 0x9813
+#define GLX_FRONT_RIGHT_ATI 0x9814
+#define GLX_BACK_LEFT_ATI 0x9815
+#define GLX_BACK_RIGHT_ATI 0x9816
+#define GLX_AUX0_ATI 0x9817
+#define GLX_AUX1_ATI 0x9818
+#define GLX_AUX2_ATI 0x9819
+#define GLX_AUX3_ATI 0x981A
+#define GLX_AUX4_ATI 0x981B
+#define GLX_AUX5_ATI 0x981C
+#define GLX_AUX6_ATI 0x981D
+#define GLX_AUX7_ATI 0x981E
+#define GLX_AUX8_ATI 0x981F
+#define GLX_AUX9_ATI 0x9820
+#define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821
+#define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822
+
+typedef void ( * PFNGLXBINDTEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
+typedef void ( * PFNGLXDRAWABLEATTRIBATIPROC) (Display *dpy, GLXDrawable draw, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
+
+#define glXBindTexImageATI GLXEW_GET_FUN(__glewXBindTexImageATI)
+#define glXDrawableAttribATI GLXEW_GET_FUN(__glewXDrawableAttribATI)
+#define glXReleaseTexImageATI GLXEW_GET_FUN(__glewXReleaseTexImageATI)
+
+#define GLXEW_ATI_render_texture GLXEW_GET_VAR(__GLXEW_ATI_render_texture)
+
+#endif /* GLX_ATI_render_texture */
+
+/* --------------------------- GLX_EXT_buffer_age -------------------------- */
+
+#ifndef GLX_EXT_buffer_age
+#define GLX_EXT_buffer_age 1
+
+#define GLX_BACK_BUFFER_AGE_EXT 0x20F4
+
+#define GLXEW_EXT_buffer_age GLXEW_GET_VAR(__GLXEW_EXT_buffer_age)
+
+#endif /* GLX_EXT_buffer_age */
+
+/* ------------------- GLX_EXT_create_context_es2_profile ------------------ */
+
+#ifndef GLX_EXT_create_context_es2_profile
+#define GLX_EXT_create_context_es2_profile 1
+
+#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
+
+#define GLXEW_EXT_create_context_es2_profile GLXEW_GET_VAR(__GLXEW_EXT_create_context_es2_profile)
+
+#endif /* GLX_EXT_create_context_es2_profile */
+
+/* ------------------- GLX_EXT_create_context_es_profile ------------------- */
+
+#ifndef GLX_EXT_create_context_es_profile
+#define GLX_EXT_create_context_es_profile 1
+
+#define GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
+
+#define GLXEW_EXT_create_context_es_profile GLXEW_GET_VAR(__GLXEW_EXT_create_context_es_profile)
+
+#endif /* GLX_EXT_create_context_es_profile */
+
+/* --------------------- GLX_EXT_fbconfig_packed_float --------------------- */
+
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_EXT_fbconfig_packed_float 1
+
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
+#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1
+
+#define GLXEW_EXT_fbconfig_packed_float GLXEW_GET_VAR(__GLXEW_EXT_fbconfig_packed_float)
+
+#endif /* GLX_EXT_fbconfig_packed_float */
+
+/* ------------------------ GLX_EXT_framebuffer_sRGB ----------------------- */
+
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_EXT_framebuffer_sRGB 1
+
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2
+
+#define GLXEW_EXT_framebuffer_sRGB GLXEW_GET_VAR(__GLXEW_EXT_framebuffer_sRGB)
+
+#endif /* GLX_EXT_framebuffer_sRGB */
+
+/* ------------------------- GLX_EXT_import_context ------------------------ */
+
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+
+#define GLX_SHARE_CONTEXT_EXT 0x800A
+#define GLX_VISUAL_ID_EXT 0x800B
+#define GLX_SCREEN_EXT 0x800C
+
+typedef XID GLXContextID;
+
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display* dpy, GLXContext context);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display* dpy, GLXContextID contextID);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context, int attribute,int *value);
+
+#define glXFreeContextEXT GLXEW_GET_FUN(__glewXFreeContextEXT)
+#define glXGetContextIDEXT GLXEW_GET_FUN(__glewXGetContextIDEXT)
+#define glXImportContextEXT GLXEW_GET_FUN(__glewXImportContextEXT)
+#define glXQueryContextInfoEXT GLXEW_GET_FUN(__glewXQueryContextInfoEXT)
+
+#define GLXEW_EXT_import_context GLXEW_GET_VAR(__GLXEW_EXT_import_context)
+
+#endif /* GLX_EXT_import_context */
+
+/* ---------------------------- GLX_EXT_libglvnd --------------------------- */
+
+#ifndef GLX_EXT_libglvnd
+#define GLX_EXT_libglvnd 1
+
+#define GLX_VENDOR_NAMES_EXT 0x20F6
+
+#define GLXEW_EXT_libglvnd GLXEW_GET_VAR(__GLXEW_EXT_libglvnd)
+
+#endif /* GLX_EXT_libglvnd */
+
+/* -------------------------- GLX_EXT_scene_marker ------------------------- */
+
+#ifndef GLX_EXT_scene_marker
+#define GLX_EXT_scene_marker 1
+
+#define GLXEW_EXT_scene_marker GLXEW_GET_VAR(__GLXEW_EXT_scene_marker)
+
+#endif /* GLX_EXT_scene_marker */
+
+/* -------------------------- GLX_EXT_stereo_tree -------------------------- */
+
+#ifndef GLX_EXT_stereo_tree
+#define GLX_EXT_stereo_tree 1
+
+#define GLX_STEREO_NOTIFY_EXT 0x00000000
+#define GLX_STEREO_NOTIFY_MASK_EXT 0x00000001
+#define GLX_STEREO_TREE_EXT 0x20F5
+
+#define GLXEW_EXT_stereo_tree GLXEW_GET_VAR(__GLXEW_EXT_stereo_tree)
+
+#endif /* GLX_EXT_stereo_tree */
+
+/* -------------------------- GLX_EXT_swap_control ------------------------- */
+
+#ifndef GLX_EXT_swap_control
+#define GLX_EXT_swap_control 1
+
+#define GLX_SWAP_INTERVAL_EXT 0x20F1
+#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
+
+typedef void ( * PFNGLXSWAPINTERVALEXTPROC) (Display* dpy, GLXDrawable drawable, int interval);
+
+#define glXSwapIntervalEXT GLXEW_GET_FUN(__glewXSwapIntervalEXT)
+
+#define GLXEW_EXT_swap_control GLXEW_GET_VAR(__GLXEW_EXT_swap_control)
+
+#endif /* GLX_EXT_swap_control */
+
+/* ----------------------- GLX_EXT_swap_control_tear ----------------------- */
+
+#ifndef GLX_EXT_swap_control_tear
+#define GLX_EXT_swap_control_tear 1
+
+#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3
+
+#define GLXEW_EXT_swap_control_tear GLXEW_GET_VAR(__GLXEW_EXT_swap_control_tear)
+
+#endif /* GLX_EXT_swap_control_tear */
+
+/* ---------------------- GLX_EXT_texture_from_pixmap ---------------------- */
+
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_EXT_texture_from_pixmap 1
+
+#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
+#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_Y_INVERTED_EXT 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT 0x20D5
+#define GLX_TEXTURE_TARGET_EXT 0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
+#define GLX_TEXTURE_1D_EXT 0x20DB
+#define GLX_TEXTURE_2D_EXT 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
+#define GLX_FRONT_LEFT_EXT 0x20DE
+#define GLX_FRONT_RIGHT_EXT 0x20DF
+#define GLX_BACK_LEFT_EXT 0x20E0
+#define GLX_BACK_RIGHT_EXT 0x20E1
+#define GLX_AUX0_EXT 0x20E2
+#define GLX_AUX1_EXT 0x20E3
+#define GLX_AUX2_EXT 0x20E4
+#define GLX_AUX3_EXT 0x20E5
+#define GLX_AUX4_EXT 0x20E6
+#define GLX_AUX5_EXT 0x20E7
+#define GLX_AUX6_EXT 0x20E8
+#define GLX_AUX7_EXT 0x20E9
+#define GLX_AUX8_EXT 0x20EA
+#define GLX_AUX9_EXT 0x20EB
+
+typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer);
+
+#define glXBindTexImageEXT GLXEW_GET_FUN(__glewXBindTexImageEXT)
+#define glXReleaseTexImageEXT GLXEW_GET_FUN(__glewXReleaseTexImageEXT)
+
+#define GLXEW_EXT_texture_from_pixmap GLXEW_GET_VAR(__GLXEW_EXT_texture_from_pixmap)
+
+#endif /* GLX_EXT_texture_from_pixmap */
+
+/* -------------------------- GLX_EXT_visual_info -------------------------- */
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+
+#define GLX_X_VISUAL_TYPE_EXT 0x22
+#define GLX_TRANSPARENT_TYPE_EXT 0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT 0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28
+#define GLX_NONE_EXT 0x8000
+#define GLX_TRUE_COLOR_EXT 0x8002
+#define GLX_DIRECT_COLOR_EXT 0x8003
+#define GLX_PSEUDO_COLOR_EXT 0x8004
+#define GLX_STATIC_COLOR_EXT 0x8005
+#define GLX_GRAY_SCALE_EXT 0x8006
+#define GLX_STATIC_GRAY_EXT 0x8007
+#define GLX_TRANSPARENT_RGB_EXT 0x8008
+#define GLX_TRANSPARENT_INDEX_EXT 0x8009
+
+#define GLXEW_EXT_visual_info GLXEW_GET_VAR(__GLXEW_EXT_visual_info)
+
+#endif /* GLX_EXT_visual_info */
+
+/* ------------------------- GLX_EXT_visual_rating ------------------------- */
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+
+#define GLX_VISUAL_CAVEAT_EXT 0x20
+#define GLX_SLOW_VISUAL_EXT 0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D
+
+#define GLXEW_EXT_visual_rating GLXEW_GET_VAR(__GLXEW_EXT_visual_rating)
+
+#endif /* GLX_EXT_visual_rating */
+
+/* -------------------------- GLX_INTEL_swap_event ------------------------- */
+
+#ifndef GLX_INTEL_swap_event
+#define GLX_INTEL_swap_event 1
+
+#define GLX_EXCHANGE_COMPLETE_INTEL 0x8180
+#define GLX_COPY_COMPLETE_INTEL 0x8181
+#define GLX_FLIP_COMPLETE_INTEL 0x8182
+#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x04000000
+
+#define GLXEW_INTEL_swap_event GLXEW_GET_VAR(__GLXEW_INTEL_swap_event)
+
+#endif /* GLX_INTEL_swap_event */
+
+/* -------------------------- GLX_MESA_agp_offset -------------------------- */
+
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+
+typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void* pointer);
+
+#define glXGetAGPOffsetMESA GLXEW_GET_FUN(__glewXGetAGPOffsetMESA)
+
+#define GLXEW_MESA_agp_offset GLXEW_GET_VAR(__GLXEW_MESA_agp_offset)
+
+#endif /* GLX_MESA_agp_offset */
+
+/* ------------------------ GLX_MESA_copy_sub_buffer ----------------------- */
+
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display* dpy, GLXDrawable drawable, int x, int y, int width, int height);
+
+#define glXCopySubBufferMESA GLXEW_GET_FUN(__glewXCopySubBufferMESA)
+
+#define GLXEW_MESA_copy_sub_buffer GLXEW_GET_VAR(__GLXEW_MESA_copy_sub_buffer)
+
+#endif /* GLX_MESA_copy_sub_buffer */
+
+/* ------------------------ GLX_MESA_pixmap_colormap ----------------------- */
+
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+
+#define glXCreateGLXPixmapMESA GLXEW_GET_FUN(__glewXCreateGLXPixmapMESA)
+
+#define GLXEW_MESA_pixmap_colormap GLXEW_GET_VAR(__GLXEW_MESA_pixmap_colormap)
+
+#endif /* GLX_MESA_pixmap_colormap */
+
+/* ------------------------ GLX_MESA_query_renderer ------------------------ */
+
+#ifndef GLX_MESA_query_renderer
+#define GLX_MESA_query_renderer 1
+
+#define GLX_RENDERER_VENDOR_ID_MESA 0x8183
+#define GLX_RENDERER_DEVICE_ID_MESA 0x8184
+#define GLX_RENDERER_VERSION_MESA 0x8185
+#define GLX_RENDERER_ACCELERATED_MESA 0x8186
+#define GLX_RENDERER_VIDEO_MEMORY_MESA 0x8187
+#define GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA 0x8188
+#define GLX_RENDERER_PREFERRED_PROFILE_MESA 0x8189
+#define GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA 0x818A
+#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B
+#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C
+#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D
+#define GLX_RENDERER_ID_MESA 0x818E
+
+typedef Bool ( * PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int* value);
+typedef const char* ( * PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute);
+typedef Bool ( * PFNGLXQUERYRENDERERINTEGERMESAPROC) (Display* dpy, int screen, int renderer, int attribute, unsigned int *value);
+typedef const char* ( * PFNGLXQUERYRENDERERSTRINGMESAPROC) (Display *dpy, int screen, int renderer, int attribute);
+
+#define glXQueryCurrentRendererIntegerMESA GLXEW_GET_FUN(__glewXQueryCurrentRendererIntegerMESA)
+#define glXQueryCurrentRendererStringMESA GLXEW_GET_FUN(__glewXQueryCurrentRendererStringMESA)
+#define glXQueryRendererIntegerMESA GLXEW_GET_FUN(__glewXQueryRendererIntegerMESA)
+#define glXQueryRendererStringMESA GLXEW_GET_FUN(__glewXQueryRendererStringMESA)
+
+#define GLXEW_MESA_query_renderer GLXEW_GET_VAR(__GLXEW_MESA_query_renderer)
+
+#endif /* GLX_MESA_query_renderer */
+
+/* ------------------------ GLX_MESA_release_buffers ----------------------- */
+
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display* dpy, GLXDrawable d);
+
+#define glXReleaseBuffersMESA GLXEW_GET_FUN(__glewXReleaseBuffersMESA)
+
+#define GLXEW_MESA_release_buffers GLXEW_GET_VAR(__GLXEW_MESA_release_buffers)
+
+#endif /* GLX_MESA_release_buffers */
+
+/* ------------------------- GLX_MESA_set_3dfx_mode ------------------------ */
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+
+#define GLX_3DFX_WINDOW_MODE_MESA 0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2
+
+typedef GLboolean ( * PFNGLXSET3DFXMODEMESAPROC) (GLint mode);
+
+#define glXSet3DfxModeMESA GLXEW_GET_FUN(__glewXSet3DfxModeMESA)
+
+#define GLXEW_MESA_set_3dfx_mode GLXEW_GET_VAR(__GLXEW_MESA_set_3dfx_mode)
+
+#endif /* GLX_MESA_set_3dfx_mode */
+
+/* ------------------------- GLX_MESA_swap_control ------------------------- */
+
+#ifndef GLX_MESA_swap_control
+#define GLX_MESA_swap_control 1
+
+typedef int ( * PFNGLXGETSWAPINTERVALMESAPROC) (void);
+typedef int ( * PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval);
+
+#define glXGetSwapIntervalMESA GLXEW_GET_FUN(__glewXGetSwapIntervalMESA)
+#define glXSwapIntervalMESA GLXEW_GET_FUN(__glewXSwapIntervalMESA)
+
+#define GLXEW_MESA_swap_control GLXEW_GET_VAR(__GLXEW_MESA_swap_control)
+
+#endif /* GLX_MESA_swap_control */
+
+/* --------------------------- GLX_NV_copy_buffer -------------------------- */
+
+#ifndef GLX_NV_copy_buffer
+#define GLX_NV_copy_buffer 1
+
+typedef void ( * PFNGLXCOPYBUFFERSUBDATANVPROC) (Display* dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void ( * PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC) (Display* dpy, GLXContext readCtx, GLXContext writeCtx, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+
+#define glXCopyBufferSubDataNV GLXEW_GET_FUN(__glewXCopyBufferSubDataNV)
+#define glXNamedCopyBufferSubDataNV GLXEW_GET_FUN(__glewXNamedCopyBufferSubDataNV)
+
+#define GLXEW_NV_copy_buffer GLXEW_GET_VAR(__GLXEW_NV_copy_buffer)
+
+#endif /* GLX_NV_copy_buffer */
+
+/* --------------------------- GLX_NV_copy_image --------------------------- */
+
+#ifndef GLX_NV_copy_image
+#define GLX_NV_copy_image 1
+
+typedef void ( * PFNGLXCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+
+#define glXCopyImageSubDataNV GLXEW_GET_FUN(__glewXCopyImageSubDataNV)
+
+#define GLXEW_NV_copy_image GLXEW_GET_VAR(__GLXEW_NV_copy_image)
+
+#endif /* GLX_NV_copy_image */
+
+/* ------------------------ GLX_NV_delay_before_swap ----------------------- */
+
+#ifndef GLX_NV_delay_before_swap
+#define GLX_NV_delay_before_swap 1
+
+typedef Bool ( * PFNGLXDELAYBEFORESWAPNVPROC) (Display* dpy, GLXDrawable drawable, GLfloat seconds);
+
+#define glXDelayBeforeSwapNV GLXEW_GET_FUN(__glewXDelayBeforeSwapNV)
+
+#define GLXEW_NV_delay_before_swap GLXEW_GET_VAR(__GLXEW_NV_delay_before_swap)
+
+#endif /* GLX_NV_delay_before_swap */
+
+/* -------------------------- GLX_NV_float_buffer -------------------------- */
+
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+
+#define GLX_FLOAT_COMPONENTS_NV 0x20B0
+
+#define GLXEW_NV_float_buffer GLXEW_GET_VAR(__GLXEW_NV_float_buffer)
+
+#endif /* GLX_NV_float_buffer */
+
+/* ---------------------- GLX_NV_multisample_coverage ---------------------- */
+
+#ifndef GLX_NV_multisample_coverage
+#define GLX_NV_multisample_coverage 1
+
+#define GLX_COLOR_SAMPLES_NV 0x20B3
+#define GLX_COVERAGE_SAMPLES_NV 100001
+
+#define GLXEW_NV_multisample_coverage GLXEW_GET_VAR(__GLXEW_NV_multisample_coverage)
+
+#endif /* GLX_NV_multisample_coverage */
+
+/* -------------------------- GLX_NV_present_video ------------------------- */
+
+#ifndef GLX_NV_present_video
+#define GLX_NV_present_video 1
+
+#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0
+
+typedef int ( * PFNGLXBINDVIDEODEVICENVPROC) (Display* dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list);
+typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int screen, int *nelements);
+
+#define glXBindVideoDeviceNV GLXEW_GET_FUN(__glewXBindVideoDeviceNV)
+#define glXEnumerateVideoDevicesNV GLXEW_GET_FUN(__glewXEnumerateVideoDevicesNV)
+
+#define GLXEW_NV_present_video GLXEW_GET_VAR(__GLXEW_NV_present_video)
+
+#endif /* GLX_NV_present_video */
+
+/* ------------------ GLX_NV_robustness_video_memory_purge ----------------- */
+
+#ifndef GLX_NV_robustness_video_memory_purge
+#define GLX_NV_robustness_video_memory_purge 1
+
+#define GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x20F7
+
+#define GLXEW_NV_robustness_video_memory_purge GLXEW_GET_VAR(__GLXEW_NV_robustness_video_memory_purge)
+
+#endif /* GLX_NV_robustness_video_memory_purge */
+
+/* --------------------------- GLX_NV_swap_group --------------------------- */
+
+#ifndef GLX_NV_swap_group
+#define GLX_NV_swap_group 1
+
+typedef Bool ( * PFNGLXBINDSWAPBARRIERNVPROC) (Display* dpy, GLuint group, GLuint barrier);
+typedef Bool ( * PFNGLXJOINSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint group);
+typedef Bool ( * PFNGLXQUERYFRAMECOUNTNVPROC) (Display* dpy, int screen, GLuint *count);
+typedef Bool ( * PFNGLXQUERYMAXSWAPGROUPSNVPROC) (Display* dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers);
+typedef Bool ( * PFNGLXQUERYSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier);
+typedef Bool ( * PFNGLXRESETFRAMECOUNTNVPROC) (Display* dpy, int screen);
+
+#define glXBindSwapBarrierNV GLXEW_GET_FUN(__glewXBindSwapBarrierNV)
+#define glXJoinSwapGroupNV GLXEW_GET_FUN(__glewXJoinSwapGroupNV)
+#define glXQueryFrameCountNV GLXEW_GET_FUN(__glewXQueryFrameCountNV)
+#define glXQueryMaxSwapGroupsNV GLXEW_GET_FUN(__glewXQueryMaxSwapGroupsNV)
+#define glXQuerySwapGroupNV GLXEW_GET_FUN(__glewXQuerySwapGroupNV)
+#define glXResetFrameCountNV GLXEW_GET_FUN(__glewXResetFrameCountNV)
+
+#define GLXEW_NV_swap_group GLXEW_GET_VAR(__GLXEW_NV_swap_group)
+
+#endif /* GLX_NV_swap_group */
+
+/* ----------------------- GLX_NV_vertex_array_range ----------------------- */
+
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range 1
+
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (void *pointer);
+
+#define glXAllocateMemoryNV GLXEW_GET_FUN(__glewXAllocateMemoryNV)
+#define glXFreeMemoryNV GLXEW_GET_FUN(__glewXFreeMemoryNV)
+
+#define GLXEW_NV_vertex_array_range GLXEW_GET_VAR(__GLXEW_NV_vertex_array_range)
+
+#endif /* GLX_NV_vertex_array_range */
+
+/* -------------------------- GLX_NV_video_capture ------------------------- */
+
+#ifndef GLX_NV_video_capture
+#define GLX_NV_video_capture 1
+
+#define GLX_DEVICE_ID_NV 0x20CD
+#define GLX_UNIQUE_ID_NV 0x20CE
+#define GLX_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
+
+typedef XID GLXVideoCaptureDeviceNV;
+
+typedef int ( * PFNGLXBINDVIDEOCAPTUREDEVICENVPROC) (Display* dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device);
+typedef GLXVideoCaptureDeviceNV * ( * PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (Display* dpy, int screen, int *nelements);
+typedef void ( * PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
+typedef int ( * PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value);
+typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
+
+#define glXBindVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXBindVideoCaptureDeviceNV)
+#define glXEnumerateVideoCaptureDevicesNV GLXEW_GET_FUN(__glewXEnumerateVideoCaptureDevicesNV)
+#define glXLockVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXLockVideoCaptureDeviceNV)
+#define glXQueryVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXQueryVideoCaptureDeviceNV)
+#define glXReleaseVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXReleaseVideoCaptureDeviceNV)
+
+#define GLXEW_NV_video_capture GLXEW_GET_VAR(__GLXEW_NV_video_capture)
+
+#endif /* GLX_NV_video_capture */
+
+/* ---------------------------- GLX_NV_video_out --------------------------- */
+
+#ifndef GLX_NV_video_out
+#define GLX_NV_video_out 1
+
+#define GLX_VIDEO_OUT_COLOR_NV 0x20C3
+#define GLX_VIDEO_OUT_ALPHA_NV 0x20C4
+#define GLX_VIDEO_OUT_DEPTH_NV 0x20C5
+#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
+#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
+#define GLX_VIDEO_OUT_FRAME_NV 0x20C8
+#define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9
+#define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA
+#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB
+#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
+
+typedef int ( * PFNGLXBINDVIDEOIMAGENVPROC) (Display* dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer);
+typedef int ( * PFNGLXGETVIDEODEVICENVPROC) (Display* dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice);
+typedef int ( * PFNGLXGETVIDEOINFONVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+typedef int ( * PFNGLXRELEASEVIDEODEVICENVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice);
+typedef int ( * PFNGLXRELEASEVIDEOIMAGENVPROC) (Display* dpy, GLXPbuffer pbuf);
+typedef int ( * PFNGLXSENDPBUFFERTOVIDEONVPROC) (Display* dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock);
+
+#define glXBindVideoImageNV GLXEW_GET_FUN(__glewXBindVideoImageNV)
+#define glXGetVideoDeviceNV GLXEW_GET_FUN(__glewXGetVideoDeviceNV)
+#define glXGetVideoInfoNV GLXEW_GET_FUN(__glewXGetVideoInfoNV)
+#define glXReleaseVideoDeviceNV GLXEW_GET_FUN(__glewXReleaseVideoDeviceNV)
+#define glXReleaseVideoImageNV GLXEW_GET_FUN(__glewXReleaseVideoImageNV)
+#define glXSendPbufferToVideoNV GLXEW_GET_FUN(__glewXSendPbufferToVideoNV)
+
+#define GLXEW_NV_video_out GLXEW_GET_VAR(__GLXEW_NV_video_out)
+
+#endif /* GLX_NV_video_out */
+
+/* -------------------------- GLX_OML_swap_method -------------------------- */
+
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+
+#define GLX_SWAP_METHOD_OML 0x8060
+#define GLX_SWAP_EXCHANGE_OML 0x8061
+#define GLX_SWAP_COPY_OML 0x8062
+#define GLX_SWAP_UNDEFINED_OML 0x8063
+
+#define GLXEW_OML_swap_method GLXEW_GET_VAR(__GLXEW_OML_swap_method)
+
+#endif /* GLX_OML_swap_method */
+
+/* -------------------------- GLX_OML_sync_control ------------------------- */
+
+#ifndef GLX_OML_sync_control
+#define GLX_OML_sync_control 1
+
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display* dpy, GLXDrawable drawable, int32_t* numerator, int32_t* denominator);
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t* ust, int64_t* msc, int64_t* sbc);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t* ust, int64_t* msc, int64_t* sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_sbc, int64_t* ust, int64_t* msc, int64_t* sbc);
+
+#define glXGetMscRateOML GLXEW_GET_FUN(__glewXGetMscRateOML)
+#define glXGetSyncValuesOML GLXEW_GET_FUN(__glewXGetSyncValuesOML)
+#define glXSwapBuffersMscOML GLXEW_GET_FUN(__glewXSwapBuffersMscOML)
+#define glXWaitForMscOML GLXEW_GET_FUN(__glewXWaitForMscOML)
+#define glXWaitForSbcOML GLXEW_GET_FUN(__glewXWaitForSbcOML)
+
+#define GLXEW_OML_sync_control GLXEW_GET_VAR(__GLXEW_OML_sync_control)
+
+#endif /* GLX_OML_sync_control */
+
+/* ------------------------ GLX_SGIS_blended_overlay ----------------------- */
+
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_SGIS_blended_overlay 1
+
+#define GLX_BLENDED_RGBA_SGIS 0x8025
+
+#define GLXEW_SGIS_blended_overlay GLXEW_GET_VAR(__GLXEW_SGIS_blended_overlay)
+
+#endif /* GLX_SGIS_blended_overlay */
+
+/* -------------------------- GLX_SGIS_color_range ------------------------- */
+
+#ifndef GLX_SGIS_color_range
+#define GLX_SGIS_color_range 1
+
+#define GLXEW_SGIS_color_range GLXEW_GET_VAR(__GLXEW_SGIS_color_range)
+
+#endif /* GLX_SGIS_color_range */
+
+/* -------------------------- GLX_SGIS_multisample ------------------------- */
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_SGIS 100000
+#define GLX_SAMPLES_SGIS 100001
+
+#define GLXEW_SGIS_multisample GLXEW_GET_VAR(__GLXEW_SGIS_multisample)
+
+#endif /* GLX_SGIS_multisample */
+
+/* ---------------------- GLX_SGIS_shared_multisample ---------------------- */
+
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_SGIS_shared_multisample 1
+
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+
+#define GLXEW_SGIS_shared_multisample GLXEW_GET_VAR(__GLXEW_SGIS_shared_multisample)
+
+#endif /* GLX_SGIS_shared_multisample */
+
+/* --------------------------- GLX_SGIX_fbconfig --------------------------- */
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+
+#define GLX_RGBA_BIT_SGIX 0x00000001
+#define GLX_WINDOW_BIT_SGIX 0x00000001
+#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002
+#define GLX_PIXMAP_BIT_SGIX 0x00000002
+#define GLX_SCREEN_EXT 0x800C
+#define GLX_DRAWABLE_TYPE_SGIX 0x8010
+#define GLX_RENDER_TYPE_SGIX 0x8011
+#define GLX_X_RENDERABLE_SGIX 0x8012
+#define GLX_FBCONFIG_ID_SGIX 0x8013
+#define GLX_RGBA_TYPE_SGIX 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015
+
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+
+typedef GLXFBConfigSGIX* ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, Pixmap pixmap);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display* dpy, XVisualInfo *vis);
+typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfig config);
+
+#define glXChooseFBConfigSGIX GLXEW_GET_FUN(__glewXChooseFBConfigSGIX)
+#define glXCreateContextWithConfigSGIX GLXEW_GET_FUN(__glewXCreateContextWithConfigSGIX)
+#define glXCreateGLXPixmapWithConfigSGIX GLXEW_GET_FUN(__glewXCreateGLXPixmapWithConfigSGIX)
+#define glXGetFBConfigAttribSGIX GLXEW_GET_FUN(__glewXGetFBConfigAttribSGIX)
+#define glXGetFBConfigFromVisualSGIX GLXEW_GET_FUN(__glewXGetFBConfigFromVisualSGIX)
+#define glXGetVisualFromFBConfigSGIX GLXEW_GET_FUN(__glewXGetVisualFromFBConfigSGIX)
+
+#define GLXEW_SGIX_fbconfig GLXEW_GET_VAR(__GLXEW_SGIX_fbconfig)
+
+#endif /* GLX_SGIX_fbconfig */
+
+/* --------------------------- GLX_SGIX_hyperpipe -------------------------- */
+
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_SGIX_hyperpipe 1
+
+#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX 0x00000001
+#define GLX_PIPE_RECT_SGIX 0x00000001
+#define GLX_HYPERPIPE_RENDER_PIPE_SGIX 0x00000002
+#define GLX_PIPE_RECT_LIMITS_SGIX 0x00000002
+#define GLX_HYPERPIPE_STEREO_SGIX 0x00000003
+#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX 0x00000004
+#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
+#define GLX_BAD_HYPERPIPE_CONFIG_SGIX 91
+#define GLX_BAD_HYPERPIPE_SGIX 92
+#define GLX_HYPERPIPE_ID_SGIX 0x8030
+
+typedef struct {
+  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
+  int  networkId; 
+} GLXHyperpipeNetworkSGIX;
+typedef struct {
+  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
+  int XOrigin; 
+  int YOrigin; 
+  int maxHeight; 
+  int maxWidth; 
+} GLXPipeRectLimits;
+typedef struct {
+  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
+  int channel; 
+  unsigned int participationType; 
+  int timeSlice; 
+} GLXHyperpipeConfigSGIX;
+typedef struct {
+  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
+  int srcXOrigin; 
+  int srcYOrigin; 
+  int srcWidth; 
+  int srcHeight; 
+  int destXOrigin; 
+  int destYOrigin; 
+  int destWidth; 
+  int destHeight; 
+} GLXPipeRect;
+
+typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
+typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
+typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
+typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
+typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
+typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
+
+#define glXBindHyperpipeSGIX GLXEW_GET_FUN(__glewXBindHyperpipeSGIX)
+#define glXDestroyHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXDestroyHyperpipeConfigSGIX)
+#define glXHyperpipeAttribSGIX GLXEW_GET_FUN(__glewXHyperpipeAttribSGIX)
+#define glXHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXHyperpipeConfigSGIX)
+#define glXQueryHyperpipeAttribSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeAttribSGIX)
+#define glXQueryHyperpipeBestAttribSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeBestAttribSGIX)
+#define glXQueryHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeConfigSGIX)
+#define glXQueryHyperpipeNetworkSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeNetworkSGIX)
+
+#define GLXEW_SGIX_hyperpipe GLXEW_GET_VAR(__GLXEW_SGIX_hyperpipe)
+
+#endif /* GLX_SGIX_hyperpipe */
+
+/* ---------------------------- GLX_SGIX_pbuffer --------------------------- */
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX 0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX 0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX 0x00000004
+#define GLX_PBUFFER_BIT_SGIX 0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX 0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX 0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX 0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX 0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX 0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX 0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX 0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX 0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX 0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX 0x801B
+#define GLX_LARGEST_PBUFFER_SGIX 0x801C
+#define GLX_WIDTH_SGIX 0x801D
+#define GLX_HEIGHT_SGIX 0x801E
+#define GLX_EVENT_MASK_SGIX 0x801F
+#define GLX_DAMAGED_SGIX 0x8020
+#define GLX_SAVED_SGIX 0x8021
+#define GLX_WINDOW_SGIX 0x8022
+#define GLX_PBUFFER_SGIX 0x8023
+#define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000
+
+typedef XID GLXPbufferSGIX;
+typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX;
+
+typedef GLXPbuffer ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display* dpy, GLXFBConfig config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long *mask);
+typedef void ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long mask);
+
+#define glXCreateGLXPbufferSGIX GLXEW_GET_FUN(__glewXCreateGLXPbufferSGIX)
+#define glXDestroyGLXPbufferSGIX GLXEW_GET_FUN(__glewXDestroyGLXPbufferSGIX)
+#define glXGetSelectedEventSGIX GLXEW_GET_FUN(__glewXGetSelectedEventSGIX)
+#define glXQueryGLXPbufferSGIX GLXEW_GET_FUN(__glewXQueryGLXPbufferSGIX)
+#define glXSelectEventSGIX GLXEW_GET_FUN(__glewXSelectEventSGIX)
+
+#define GLXEW_SGIX_pbuffer GLXEW_GET_VAR(__GLXEW_SGIX_pbuffer)
+
+#endif /* GLX_SGIX_pbuffer */
+
+/* ------------------------- GLX_SGIX_swap_barrier ------------------------- */
+
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+
+#define glXBindSwapBarrierSGIX GLXEW_GET_FUN(__glewXBindSwapBarrierSGIX)
+#define glXQueryMaxSwapBarriersSGIX GLXEW_GET_FUN(__glewXQueryMaxSwapBarriersSGIX)
+
+#define GLXEW_SGIX_swap_barrier GLXEW_GET_VAR(__GLXEW_SGIX_swap_barrier)
+
+#endif /* GLX_SGIX_swap_barrier */
+
+/* -------------------------- GLX_SGIX_swap_group -------------------------- */
+
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+
+#define glXJoinSwapGroupSGIX GLXEW_GET_FUN(__glewXJoinSwapGroupSGIX)
+
+#define GLXEW_SGIX_swap_group GLXEW_GET_VAR(__GLXEW_SGIX_swap_group)
+
+#endif /* GLX_SGIX_swap_group */
+
+/* ------------------------- GLX_SGIX_video_resize ------------------------- */
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+
+#define GLX_SYNC_FRAME_SGIX 0x00000000
+#define GLX_SYNC_SWAP_SGIX 0x00000001
+
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display* display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display* display, int screen, int channel, GLenum synctype);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display* display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+
+#define glXBindChannelToWindowSGIX GLXEW_GET_FUN(__glewXBindChannelToWindowSGIX)
+#define glXChannelRectSGIX GLXEW_GET_FUN(__glewXChannelRectSGIX)
+#define glXChannelRectSyncSGIX GLXEW_GET_FUN(__glewXChannelRectSyncSGIX)
+#define glXQueryChannelDeltasSGIX GLXEW_GET_FUN(__glewXQueryChannelDeltasSGIX)
+#define glXQueryChannelRectSGIX GLXEW_GET_FUN(__glewXQueryChannelRectSGIX)
+
+#define GLXEW_SGIX_video_resize GLXEW_GET_VAR(__GLXEW_SGIX_video_resize)
+
+#endif /* GLX_SGIX_video_resize */
+
+/* ---------------------- GLX_SGIX_visual_select_group --------------------- */
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+
+#define GLX_VISUAL_SELECT_GROUP_SGIX 0x8028
+
+#define GLXEW_SGIX_visual_select_group GLXEW_GET_VAR(__GLXEW_SGIX_visual_select_group)
+
+#endif /* GLX_SGIX_visual_select_group */
+
+/* ---------------------------- GLX_SGI_cushion ---------------------------- */
+
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display* dpy, Window window, float cushion);
+
+#define glXCushionSGI GLXEW_GET_FUN(__glewXCushionSGI)
+
+#define GLXEW_SGI_cushion GLXEW_GET_VAR(__GLXEW_SGI_cushion)
+
+#endif /* GLX_SGI_cushion */
+
+/* ----------------------- GLX_SGI_make_current_read ----------------------- */
+
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display* dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+
+#define glXGetCurrentReadDrawableSGI GLXEW_GET_FUN(__glewXGetCurrentReadDrawableSGI)
+#define glXMakeCurrentReadSGI GLXEW_GET_FUN(__glewXMakeCurrentReadSGI)
+
+#define GLXEW_SGI_make_current_read GLXEW_GET_VAR(__GLXEW_SGI_make_current_read)
+
+#endif /* GLX_SGI_make_current_read */
+
+/* -------------------------- GLX_SGI_swap_control ------------------------- */
+
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+
+#define glXSwapIntervalSGI GLXEW_GET_FUN(__glewXSwapIntervalSGI)
+
+#define GLXEW_SGI_swap_control GLXEW_GET_VAR(__GLXEW_SGI_swap_control)
+
+#endif /* GLX_SGI_swap_control */
+
+/* --------------------------- GLX_SGI_video_sync -------------------------- */
+
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int* count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int* count);
+
+#define glXGetVideoSyncSGI GLXEW_GET_FUN(__glewXGetVideoSyncSGI)
+#define glXWaitVideoSyncSGI GLXEW_GET_FUN(__glewXWaitVideoSyncSGI)
+
+#define GLXEW_SGI_video_sync GLXEW_GET_VAR(__GLXEW_SGI_video_sync)
+
+#endif /* GLX_SGI_video_sync */
+
+/* --------------------- GLX_SUN_get_transparent_index --------------------- */
+
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display* dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex);
+
+#define glXGetTransparentIndexSUN GLXEW_GET_FUN(__glewXGetTransparentIndexSUN)
+
+#define GLXEW_SUN_get_transparent_index GLXEW_GET_VAR(__GLXEW_SUN_get_transparent_index)
+
+#endif /* GLX_SUN_get_transparent_index */
+
+/* -------------------------- GLX_SUN_video_resize ------------------------- */
+
+#ifndef GLX_SUN_video_resize
+#define GLX_SUN_video_resize 1
+
+#define GLX_VIDEO_RESIZE_SUN 0x8171
+#define GL_VIDEO_RESIZE_COMPENSATION_SUN 0x85CD
+
+typedef int ( * PFNGLXGETVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float* factor);
+typedef int ( * PFNGLXVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float factor);
+
+#define glXGetVideoResizeSUN GLXEW_GET_FUN(__glewXGetVideoResizeSUN)
+#define glXVideoResizeSUN GLXEW_GET_FUN(__glewXVideoResizeSUN)
+
+#define GLXEW_SUN_video_resize GLXEW_GET_VAR(__GLXEW_SUN_video_resize)
+
+#endif /* GLX_SUN_video_resize */
+
+/* ------------------------------------------------------------------------- */
+
+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+#define GLXEW_VAR_EXPORT GLEW_VAR_EXPORT
+
+GLXEW_FUN_EXPORT PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
+
+GLXEW_FUN_EXPORT PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig;
+GLXEW_FUN_EXPORT PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext;
+GLXEW_FUN_EXPORT PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer;
+GLXEW_FUN_EXPORT PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap;
+GLXEW_FUN_EXPORT PFNGLXCREATEWINDOWPROC __glewXCreateWindow;
+GLXEW_FUN_EXPORT PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer;
+GLXEW_FUN_EXPORT PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap;
+GLXEW_FUN_EXPORT PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow;
+GLXEW_FUN_EXPORT PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable;
+GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib;
+GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs;
+GLXEW_FUN_EXPORT PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent;
+GLXEW_FUN_EXPORT PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig;
+GLXEW_FUN_EXPORT PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent;
+GLXEW_FUN_EXPORT PFNGLXQUERYCONTEXTPROC __glewXQueryContext;
+GLXEW_FUN_EXPORT PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable;
+GLXEW_FUN_EXPORT PFNGLXSELECTEVENTPROC __glewXSelectEvent;
+
+GLXEW_FUN_EXPORT PFNGLXBLITCONTEXTFRAMEBUFFERAMDPROC __glewXBlitContextFramebufferAMD;
+GLXEW_FUN_EXPORT PFNGLXCREATEASSOCIATEDCONTEXTAMDPROC __glewXCreateAssociatedContextAMD;
+GLXEW_FUN_EXPORT PFNGLXCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __glewXCreateAssociatedContextAttribsAMD;
+GLXEW_FUN_EXPORT PFNGLXDELETEASSOCIATEDCONTEXTAMDPROC __glewXDeleteAssociatedContextAMD;
+GLXEW_FUN_EXPORT PFNGLXGETCONTEXTGPUIDAMDPROC __glewXGetContextGPUIDAMD;
+GLXEW_FUN_EXPORT PFNGLXGETCURRENTASSOCIATEDCONTEXTAMDPROC __glewXGetCurrentAssociatedContextAMD;
+GLXEW_FUN_EXPORT PFNGLXGETGPUIDSAMDPROC __glewXGetGPUIDsAMD;
+GLXEW_FUN_EXPORT PFNGLXGETGPUINFOAMDPROC __glewXGetGPUInfoAMD;
+GLXEW_FUN_EXPORT PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __glewXMakeAssociatedContextCurrentAMD;
+
+GLXEW_FUN_EXPORT PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB;
+
+GLXEW_FUN_EXPORT PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI;
+GLXEW_FUN_EXPORT PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI;
+GLXEW_FUN_EXPORT PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI;
+
+GLXEW_FUN_EXPORT PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT;
+GLXEW_FUN_EXPORT PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT;
+GLXEW_FUN_EXPORT PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT;
+GLXEW_FUN_EXPORT PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT;
+
+GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALEXTPROC __glewXSwapIntervalEXT;
+
+GLXEW_FUN_EXPORT PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT;
+GLXEW_FUN_EXPORT PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT;
+
+GLXEW_FUN_EXPORT PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA;
+
+GLXEW_FUN_EXPORT PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA;
+
+GLXEW_FUN_EXPORT PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA;
+
+GLXEW_FUN_EXPORT PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC __glewXQueryCurrentRendererIntegerMESA;
+GLXEW_FUN_EXPORT PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC __glewXQueryCurrentRendererStringMESA;
+GLXEW_FUN_EXPORT PFNGLXQUERYRENDERERINTEGERMESAPROC __glewXQueryRendererIntegerMESA;
+GLXEW_FUN_EXPORT PFNGLXQUERYRENDERERSTRINGMESAPROC __glewXQueryRendererStringMESA;
+
+GLXEW_FUN_EXPORT PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA;
+
+GLXEW_FUN_EXPORT PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA;
+
+GLXEW_FUN_EXPORT PFNGLXGETSWAPINTERVALMESAPROC __glewXGetSwapIntervalMESA;
+GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALMESAPROC __glewXSwapIntervalMESA;
+
+GLXEW_FUN_EXPORT PFNGLXCOPYBUFFERSUBDATANVPROC __glewXCopyBufferSubDataNV;
+GLXEW_FUN_EXPORT PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC __glewXNamedCopyBufferSubDataNV;
+
+GLXEW_FUN_EXPORT PFNGLXCOPYIMAGESUBDATANVPROC __glewXCopyImageSubDataNV;
+
+GLXEW_FUN_EXPORT PFNGLXDELAYBEFORESWAPNVPROC __glewXDelayBeforeSwapNV;
+
+GLXEW_FUN_EXPORT PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV;
+
+GLXEW_FUN_EXPORT PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV;
+GLXEW_FUN_EXPORT PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV;
+GLXEW_FUN_EXPORT PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV;
+GLXEW_FUN_EXPORT PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV;
+GLXEW_FUN_EXPORT PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV;
+GLXEW_FUN_EXPORT PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV;
+
+GLXEW_FUN_EXPORT PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV;
+GLXEW_FUN_EXPORT PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV;
+
+GLXEW_FUN_EXPORT PFNGLXBINDVIDEOCAPTUREDEVICENVPROC __glewXBindVideoCaptureDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC __glewXEnumerateVideoCaptureDevicesNV;
+GLXEW_FUN_EXPORT PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC __glewXLockVideoCaptureDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC __glewXQueryVideoCaptureDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC __glewXReleaseVideoCaptureDeviceNV;
+
+GLXEW_FUN_EXPORT PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV;
+GLXEW_FUN_EXPORT PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV;
+GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV;
+GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV;
+GLXEW_FUN_EXPORT PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV;
+
+GLXEW_FUN_EXPORT PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML;
+GLXEW_FUN_EXPORT PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML;
+GLXEW_FUN_EXPORT PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML;
+GLXEW_FUN_EXPORT PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML;
+GLXEW_FUN_EXPORT PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML;
+
+GLXEW_FUN_EXPORT PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX;
+GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX;
+GLXEW_FUN_EXPORT PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX;
+GLXEW_FUN_EXPORT PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX;
+GLXEW_FUN_EXPORT PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX;
+GLXEW_FUN_EXPORT PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX;
+GLXEW_FUN_EXPORT PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX;
+GLXEW_FUN_EXPORT PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX;
+GLXEW_FUN_EXPORT PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX;
+GLXEW_FUN_EXPORT PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX;
+GLXEW_FUN_EXPORT PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX;
+
+GLXEW_FUN_EXPORT PFNGLXCUSHIONSGIPROC __glewXCushionSGI;
+
+GLXEW_FUN_EXPORT PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI;
+GLXEW_FUN_EXPORT PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI;
+
+GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI;
+
+GLXEW_FUN_EXPORT PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI;
+GLXEW_FUN_EXPORT PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI;
+
+GLXEW_FUN_EXPORT PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
+
+GLXEW_FUN_EXPORT PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
+GLXEW_FUN_EXPORT PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_0;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_1;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_2;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_3;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_4;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_3DFX_multisample;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_AMD_gpu_association;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_context_flush_control;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_no_error;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_profile;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_robustness;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_fbconfig_float;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_framebuffer_sRGB;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_get_proc_address;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_multisample;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_robustness_application_isolation;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_robustness_share_group_isolation;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_vertex_buffer_object;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_pixel_format_float;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_render_texture;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_buffer_age;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es2_profile;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es_profile;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_fbconfig_packed_float;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_framebuffer_sRGB;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_import_context;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_libglvnd;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_scene_marker;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_stereo_tree;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_swap_control;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_swap_control_tear;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_texture_from_pixmap;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_visual_info;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_visual_rating;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_INTEL_swap_event;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_agp_offset;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_copy_sub_buffer;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_pixmap_colormap;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_query_renderer;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_release_buffers;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_set_3dfx_mode;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_swap_control;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_copy_buffer;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_copy_image;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_delay_before_swap;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_float_buffer;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_multisample_coverage;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_present_video;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_robustness_video_memory_purge;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_swap_group;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_vertex_array_range;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_video_capture;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_video_out;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_OML_swap_method;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_OML_sync_control;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_blended_overlay;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_color_range;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_multisample;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_shared_multisample;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_fbconfig;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_hyperpipe;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_pbuffer;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_swap_barrier;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_swap_group;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_video_resize;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_visual_select_group;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_cushion;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_make_current_read;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_swap_control;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_video_sync;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_get_transparent_index;
+GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_video_resize;
+/* ------------------------------------------------------------------------ */
+
+GLEWAPI GLenum GLEWAPIENTRY glxewInit ();
+GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name);
+
+#ifndef GLXEW_GET_VAR
+#define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
+#endif
+
+#ifndef GLXEW_GET_FUN
+#define GLXEW_GET_FUN(x) x
+#endif
+
+GLEWAPI GLboolean GLEWAPIENTRY glxewGetExtension (const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __glxew_h__ */
diff --git a/src_bkp/engine/external/glew/GL/wglew.h b/src_bkp/engine/external/glew/GL/wglew.h
new file mode 100644
index 0000000000..2097c0f033
--- /dev/null
+++ b/src_bkp/engine/external/glew/GL/wglew.h
@@ -0,0 +1,1447 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2008-2017, Nigel Stewart <nigels[]users sourceforge net>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#ifndef __wglew_h__
+#define __wglew_h__
+#define __WGLEW_H__
+
+#ifdef __wglext_h_
+#error wglext.h included before wglew.h
+#endif
+
+#define __wglext_h_
+
+#if !defined(WINAPI)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#include <windows.h>
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+/*
+ * GLEW_STATIC needs to be set when using the static version.
+ * GLEW_BUILD is set when building the DLL version.
+ */
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  ifdef GLEW_BUILD
+#    define GLEWAPI extern __declspec(dllexport)
+#  else
+#    define GLEWAPI extern __declspec(dllimport)
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -------------------------- WGL_3DFX_multisample ------------------------- */
+
+#ifndef WGL_3DFX_multisample
+#define WGL_3DFX_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_3DFX 0x2060
+#define WGL_SAMPLES_3DFX 0x2061
+
+#define WGLEW_3DFX_multisample WGLEW_GET_VAR(__WGLEW_3DFX_multisample)
+
+#endif /* WGL_3DFX_multisample */
+
+/* ------------------------- WGL_3DL_stereo_control ------------------------ */
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_3DL_stereo_control 1
+
+#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055
+#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
+#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
+#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
+
+typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
+
+#define wglSetStereoEmitterState3DL WGLEW_GET_FUN(__wglewSetStereoEmitterState3DL)
+
+#define WGLEW_3DL_stereo_control WGLEW_GET_VAR(__WGLEW_3DL_stereo_control)
+
+#endif /* WGL_3DL_stereo_control */
+
+/* ------------------------ WGL_AMD_gpu_association ------------------------ */
+
+#ifndef WGL_AMD_gpu_association
+#define WGL_AMD_gpu_association 1
+
+#define WGL_GPU_VENDOR_AMD 0x1F00
+#define WGL_GPU_RENDERER_STRING_AMD 0x1F01
+#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
+#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
+#define WGL_GPU_RAM_AMD 0x21A3
+#define WGL_GPU_CLOCK_AMD 0x21A4
+#define WGL_GPU_NUM_PIPES_AMD 0x21A5
+#define WGL_GPU_NUM_SIMD_AMD 0x21A6
+#define WGL_GPU_NUM_RB_AMD 0x21A7
+#define WGL_GPU_NUM_SPI_AMD 0x21A8
+
+typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int* attribList);
+typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc);
+typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc);
+typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
+typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT* ids);
+typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void* data);
+typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc);
+
+#define wglBlitContextFramebufferAMD WGLEW_GET_FUN(__wglewBlitContextFramebufferAMD)
+#define wglCreateAssociatedContextAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAMD)
+#define wglCreateAssociatedContextAttribsAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAttribsAMD)
+#define wglDeleteAssociatedContextAMD WGLEW_GET_FUN(__wglewDeleteAssociatedContextAMD)
+#define wglGetContextGPUIDAMD WGLEW_GET_FUN(__wglewGetContextGPUIDAMD)
+#define wglGetCurrentAssociatedContextAMD WGLEW_GET_FUN(__wglewGetCurrentAssociatedContextAMD)
+#define wglGetGPUIDsAMD WGLEW_GET_FUN(__wglewGetGPUIDsAMD)
+#define wglGetGPUInfoAMD WGLEW_GET_FUN(__wglewGetGPUInfoAMD)
+#define wglMakeAssociatedContextCurrentAMD WGLEW_GET_FUN(__wglewMakeAssociatedContextCurrentAMD)
+
+#define WGLEW_AMD_gpu_association WGLEW_GET_VAR(__WGLEW_AMD_gpu_association)
+
+#endif /* WGL_AMD_gpu_association */
+
+/* ------------------------- WGL_ARB_buffer_region ------------------------- */
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008
+
+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+
+#define wglCreateBufferRegionARB WGLEW_GET_FUN(__wglewCreateBufferRegionARB)
+#define wglDeleteBufferRegionARB WGLEW_GET_FUN(__wglewDeleteBufferRegionARB)
+#define wglRestoreBufferRegionARB WGLEW_GET_FUN(__wglewRestoreBufferRegionARB)
+#define wglSaveBufferRegionARB WGLEW_GET_FUN(__wglewSaveBufferRegionARB)
+
+#define WGLEW_ARB_buffer_region WGLEW_GET_VAR(__WGLEW_ARB_buffer_region)
+
+#endif /* WGL_ARB_buffer_region */
+
+/* --------------------- WGL_ARB_context_flush_control --------------------- */
+
+#ifndef WGL_ARB_context_flush_control
+#define WGL_ARB_context_flush_control 1
+
+#define WGLEW_ARB_context_flush_control WGLEW_GET_VAR(__WGLEW_ARB_context_flush_control)
+
+#endif /* WGL_ARB_context_flush_control */
+
+/* ------------------------- WGL_ARB_create_context ------------------------ */
+
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context 1
+
+#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
+#define WGL_CONTEXT_FLAGS_ARB 0x2094
+#define ERROR_INVALID_VERSION_ARB 0x2095
+#define ERROR_INVALID_PROFILE_ARB 0x2096
+
+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList);
+
+#define wglCreateContextAttribsARB WGLEW_GET_FUN(__wglewCreateContextAttribsARB)
+
+#define WGLEW_ARB_create_context WGLEW_GET_VAR(__WGLEW_ARB_create_context)
+
+#endif /* WGL_ARB_create_context */
+
+/* -------------------- WGL_ARB_create_context_no_error -------------------- */
+
+#ifndef WGL_ARB_create_context_no_error
+#define WGL_ARB_create_context_no_error 1
+
+#define WGLEW_ARB_create_context_no_error WGLEW_GET_VAR(__WGLEW_ARB_create_context_no_error)
+
+#endif /* WGL_ARB_create_context_no_error */
+
+/* --------------------- WGL_ARB_create_context_profile -------------------- */
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_ARB_create_context_profile 1
+
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
+
+#define WGLEW_ARB_create_context_profile WGLEW_GET_VAR(__WGLEW_ARB_create_context_profile)
+
+#endif /* WGL_ARB_create_context_profile */
+
+/* ------------------- WGL_ARB_create_context_robustness ------------------- */
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_ARB_create_context_robustness 1
+
+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261
+
+#define WGLEW_ARB_create_context_robustness WGLEW_GET_VAR(__WGLEW_ARB_create_context_robustness)
+
+#endif /* WGL_ARB_create_context_robustness */
+
+/* ----------------------- WGL_ARB_extensions_string ----------------------- */
+
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+
+typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+
+#define wglGetExtensionsStringARB WGLEW_GET_FUN(__wglewGetExtensionsStringARB)
+
+#define WGLEW_ARB_extensions_string WGLEW_GET_VAR(__WGLEW_ARB_extensions_string)
+
+#endif /* WGL_ARB_extensions_string */
+
+/* ------------------------ WGL_ARB_framebuffer_sRGB ----------------------- */
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_ARB_framebuffer_sRGB 1
+
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
+
+#define WGLEW_ARB_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_ARB_framebuffer_sRGB)
+
+#endif /* WGL_ARB_framebuffer_sRGB */
+
+/* ----------------------- WGL_ARB_make_current_read ----------------------- */
+
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+
+#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+
+#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB)
+#define wglMakeContextCurrentARB WGLEW_GET_FUN(__wglewMakeContextCurrentARB)
+
+#define WGLEW_ARB_make_current_read WGLEW_GET_VAR(__WGLEW_ARB_make_current_read)
+
+#endif /* WGL_ARB_make_current_read */
+
+/* -------------------------- WGL_ARB_multisample -------------------------- */
+
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_ARB 0x2041
+#define WGL_SAMPLES_ARB 0x2042
+
+#define WGLEW_ARB_multisample WGLEW_GET_VAR(__WGLEW_ARB_multisample)
+
+#endif /* WGL_ARB_multisample */
+
+/* ---------------------------- WGL_ARB_pbuffer ---------------------------- */
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+
+#define WGL_DRAW_TO_PBUFFER_ARB 0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030
+#define WGL_PBUFFER_LARGEST_ARB 0x2033
+#define WGL_PBUFFER_WIDTH_ARB 0x2034
+#define WGL_PBUFFER_HEIGHT_ARB 0x2035
+#define WGL_PBUFFER_LOST_ARB 0x2036
+
+DECLARE_HANDLE(HPBUFFERARB);
+
+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int* piValue);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+
+#define wglCreatePbufferARB WGLEW_GET_FUN(__wglewCreatePbufferARB)
+#define wglDestroyPbufferARB WGLEW_GET_FUN(__wglewDestroyPbufferARB)
+#define wglGetPbufferDCARB WGLEW_GET_FUN(__wglewGetPbufferDCARB)
+#define wglQueryPbufferARB WGLEW_GET_FUN(__wglewQueryPbufferARB)
+#define wglReleasePbufferDCARB WGLEW_GET_FUN(__wglewReleasePbufferDCARB)
+
+#define WGLEW_ARB_pbuffer WGLEW_GET_VAR(__WGLEW_ARB_pbuffer)
+
+#endif /* WGL_ARB_pbuffer */
+
+/* -------------------------- WGL_ARB_pixel_format ------------------------- */
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+
+#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000
+#define WGL_DRAW_TO_WINDOW_ARB 0x2001
+#define WGL_DRAW_TO_BITMAP_ARB 0x2002
+#define WGL_ACCELERATION_ARB 0x2003
+#define WGL_NEED_PALETTE_ARB 0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006
+#define WGL_SWAP_METHOD_ARB 0x2007
+#define WGL_NUMBER_OVERLAYS_ARB 0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB 0x2009
+#define WGL_TRANSPARENT_ARB 0x200A
+#define WGL_SHARE_DEPTH_ARB 0x200C
+#define WGL_SHARE_STENCIL_ARB 0x200D
+#define WGL_SHARE_ACCUM_ARB 0x200E
+#define WGL_SUPPORT_GDI_ARB 0x200F
+#define WGL_SUPPORT_OPENGL_ARB 0x2010
+#define WGL_DOUBLE_BUFFER_ARB 0x2011
+#define WGL_STEREO_ARB 0x2012
+#define WGL_PIXEL_TYPE_ARB 0x2013
+#define WGL_COLOR_BITS_ARB 0x2014
+#define WGL_RED_BITS_ARB 0x2015
+#define WGL_RED_SHIFT_ARB 0x2016
+#define WGL_GREEN_BITS_ARB 0x2017
+#define WGL_GREEN_SHIFT_ARB 0x2018
+#define WGL_BLUE_BITS_ARB 0x2019
+#define WGL_BLUE_SHIFT_ARB 0x201A
+#define WGL_ALPHA_BITS_ARB 0x201B
+#define WGL_ALPHA_SHIFT_ARB 0x201C
+#define WGL_ACCUM_BITS_ARB 0x201D
+#define WGL_ACCUM_RED_BITS_ARB 0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB 0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB 0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021
+#define WGL_DEPTH_BITS_ARB 0x2022
+#define WGL_STENCIL_BITS_ARB 0x2023
+#define WGL_AUX_BUFFERS_ARB 0x2024
+#define WGL_NO_ACCELERATION_ARB 0x2025
+#define WGL_GENERIC_ACCELERATION_ARB 0x2026
+#define WGL_FULL_ACCELERATION_ARB 0x2027
+#define WGL_SWAP_EXCHANGE_ARB 0x2028
+#define WGL_SWAP_COPY_ARB 0x2029
+#define WGL_SWAP_UNDEFINED_ARB 0x202A
+#define WGL_TYPE_RGBA_ARB 0x202B
+#define WGL_TYPE_COLORINDEX_ARB 0x202C
+#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues);
+
+#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB)
+#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB)
+#define wglGetPixelFormatAttribivARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribivARB)
+
+#define WGLEW_ARB_pixel_format WGLEW_GET_VAR(__WGLEW_ARB_pixel_format)
+
+#endif /* WGL_ARB_pixel_format */
+
+/* ----------------------- WGL_ARB_pixel_format_float ---------------------- */
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_ARB_pixel_format_float 1
+
+#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0
+
+#define WGLEW_ARB_pixel_format_float WGLEW_GET_VAR(__WGLEW_ARB_pixel_format_float)
+
+#endif /* WGL_ARB_pixel_format_float */
+
+/* ------------------------- WGL_ARB_render_texture ------------------------ */
+
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+
+#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071
+#define WGL_TEXTURE_FORMAT_ARB 0x2072
+#define WGL_TEXTURE_TARGET_ARB 0x2073
+#define WGL_MIPMAP_TEXTURE_ARB 0x2074
+#define WGL_TEXTURE_RGB_ARB 0x2075
+#define WGL_TEXTURE_RGBA_ARB 0x2076
+#define WGL_NO_TEXTURE_ARB 0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078
+#define WGL_TEXTURE_1D_ARB 0x2079
+#define WGL_TEXTURE_2D_ARB 0x207A
+#define WGL_MIPMAP_LEVEL_ARB 0x207B
+#define WGL_CUBE_MAP_FACE_ARB 0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
+#define WGL_FRONT_LEFT_ARB 0x2083
+#define WGL_FRONT_RIGHT_ARB 0x2084
+#define WGL_BACK_LEFT_ARB 0x2085
+#define WGL_BACK_RIGHT_ARB 0x2086
+#define WGL_AUX0_ARB 0x2087
+#define WGL_AUX1_ARB 0x2088
+#define WGL_AUX2_ARB 0x2089
+#define WGL_AUX3_ARB 0x208A
+#define WGL_AUX4_ARB 0x208B
+#define WGL_AUX5_ARB 0x208C
+#define WGL_AUX6_ARB 0x208D
+#define WGL_AUX7_ARB 0x208E
+#define WGL_AUX8_ARB 0x208F
+#define WGL_AUX9_ARB 0x2090
+
+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int* piAttribList);
+
+#define wglBindTexImageARB WGLEW_GET_FUN(__wglewBindTexImageARB)
+#define wglReleaseTexImageARB WGLEW_GET_FUN(__wglewReleaseTexImageARB)
+#define wglSetPbufferAttribARB WGLEW_GET_FUN(__wglewSetPbufferAttribARB)
+
+#define WGLEW_ARB_render_texture WGLEW_GET_VAR(__WGLEW_ARB_render_texture)
+
+#endif /* WGL_ARB_render_texture */
+
+/* ---------------- WGL_ARB_robustness_application_isolation --------------- */
+
+#ifndef WGL_ARB_robustness_application_isolation
+#define WGL_ARB_robustness_application_isolation 1
+
+#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
+
+#define WGLEW_ARB_robustness_application_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_application_isolation)
+
+#endif /* WGL_ARB_robustness_application_isolation */
+
+/* ---------------- WGL_ARB_robustness_share_group_isolation --------------- */
+
+#ifndef WGL_ARB_robustness_share_group_isolation
+#define WGL_ARB_robustness_share_group_isolation 1
+
+#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
+
+#define WGLEW_ARB_robustness_share_group_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_share_group_isolation)
+
+#endif /* WGL_ARB_robustness_share_group_isolation */
+
+/* ----------------------- WGL_ATI_pixel_format_float ---------------------- */
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float 1
+
+#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0
+#define GL_RGBA_FLOAT_MODE_ATI 0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+
+#define WGLEW_ATI_pixel_format_float WGLEW_GET_VAR(__WGLEW_ATI_pixel_format_float)
+
+#endif /* WGL_ATI_pixel_format_float */
+
+/* -------------------- WGL_ATI_render_texture_rectangle ------------------- */
+
+#ifndef WGL_ATI_render_texture_rectangle
+#define WGL_ATI_render_texture_rectangle 1
+
+#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5
+
+#define WGLEW_ATI_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_ATI_render_texture_rectangle)
+
+#endif /* WGL_ATI_render_texture_rectangle */
+
+/* --------------------------- WGL_EXT_colorspace -------------------------- */
+
+#ifndef WGL_EXT_colorspace
+#define WGL_EXT_colorspace 1
+
+#define WGL_COLORSPACE_SRGB_EXT 0x3089
+#define WGL_COLORSPACE_LINEAR_EXT 0x308A
+#define WGL_COLORSPACE_EXT 0x309D
+
+#define WGLEW_EXT_colorspace WGLEW_GET_VAR(__WGLEW_EXT_colorspace)
+
+#endif /* WGL_EXT_colorspace */
+
+/* ------------------- WGL_EXT_create_context_es2_profile ------------------ */
+
+#ifndef WGL_EXT_create_context_es2_profile
+#define WGL_EXT_create_context_es2_profile 1
+
+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
+
+#define WGLEW_EXT_create_context_es2_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es2_profile)
+
+#endif /* WGL_EXT_create_context_es2_profile */
+
+/* ------------------- WGL_EXT_create_context_es_profile ------------------- */
+
+#ifndef WGL_EXT_create_context_es_profile
+#define WGL_EXT_create_context_es_profile 1
+
+#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
+
+#define WGLEW_EXT_create_context_es_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es_profile)
+
+#endif /* WGL_EXT_create_context_es_profile */
+
+/* -------------------------- WGL_EXT_depth_float -------------------------- */
+
+#ifndef WGL_EXT_depth_float
+#define WGL_EXT_depth_float 1
+
+#define WGL_DEPTH_FLOAT_EXT 0x2040
+
+#define WGLEW_EXT_depth_float WGLEW_GET_VAR(__WGLEW_EXT_depth_float)
+
+#endif /* WGL_EXT_depth_float */
+
+/* ---------------------- WGL_EXT_display_color_table ---------------------- */
+
+#ifndef WGL_EXT_display_color_table
+#define WGL_EXT_display_color_table 1
+
+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length);
+
+#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT)
+#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT)
+#define wglDestroyDisplayColorTableEXT WGLEW_GET_FUN(__wglewDestroyDisplayColorTableEXT)
+#define wglLoadDisplayColorTableEXT WGLEW_GET_FUN(__wglewLoadDisplayColorTableEXT)
+
+#define WGLEW_EXT_display_color_table WGLEW_GET_VAR(__WGLEW_EXT_display_color_table)
+
+#endif /* WGL_EXT_display_color_table */
+
+/* ----------------------- WGL_EXT_extensions_string ----------------------- */
+
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+
+typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
+
+#define wglGetExtensionsStringEXT WGLEW_GET_FUN(__wglewGetExtensionsStringEXT)
+
+#define WGLEW_EXT_extensions_string WGLEW_GET_VAR(__WGLEW_EXT_extensions_string)
+
+#endif /* WGL_EXT_extensions_string */
+
+/* ------------------------ WGL_EXT_framebuffer_sRGB ----------------------- */
+
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_EXT_framebuffer_sRGB 1
+
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
+
+#define WGLEW_EXT_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_EXT_framebuffer_sRGB)
+
+#endif /* WGL_EXT_framebuffer_sRGB */
+
+/* ----------------------- WGL_EXT_make_current_read ----------------------- */
+
+#ifndef WGL_EXT_make_current_read
+#define WGL_EXT_make_current_read 1
+
+#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
+
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+
+#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT)
+#define wglMakeContextCurrentEXT WGLEW_GET_FUN(__wglewMakeContextCurrentEXT)
+
+#define WGLEW_EXT_make_current_read WGLEW_GET_VAR(__WGLEW_EXT_make_current_read)
+
+#endif /* WGL_EXT_make_current_read */
+
+/* -------------------------- WGL_EXT_multisample -------------------------- */
+
+#ifndef WGL_EXT_multisample
+#define WGL_EXT_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_EXT 0x2041
+#define WGL_SAMPLES_EXT 0x2042
+
+#define WGLEW_EXT_multisample WGLEW_GET_VAR(__WGLEW_EXT_multisample)
+
+#endif /* WGL_EXT_multisample */
+
+/* ---------------------------- WGL_EXT_pbuffer ---------------------------- */
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_EXT_pbuffer 1
+
+#define WGL_DRAW_TO_PBUFFER_EXT 0x202D
+#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E
+#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030
+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031
+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
+#define WGL_PBUFFER_LARGEST_EXT 0x2033
+#define WGL_PBUFFER_WIDTH_EXT 0x2034
+#define WGL_PBUFFER_HEIGHT_EXT 0x2035
+
+DECLARE_HANDLE(HPBUFFEREXT);
+
+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int* piValue);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
+
+#define wglCreatePbufferEXT WGLEW_GET_FUN(__wglewCreatePbufferEXT)
+#define wglDestroyPbufferEXT WGLEW_GET_FUN(__wglewDestroyPbufferEXT)
+#define wglGetPbufferDCEXT WGLEW_GET_FUN(__wglewGetPbufferDCEXT)
+#define wglQueryPbufferEXT WGLEW_GET_FUN(__wglewQueryPbufferEXT)
+#define wglReleasePbufferDCEXT WGLEW_GET_FUN(__wglewReleasePbufferDCEXT)
+
+#define WGLEW_EXT_pbuffer WGLEW_GET_VAR(__WGLEW_EXT_pbuffer)
+
+#endif /* WGL_EXT_pbuffer */
+
+/* -------------------------- WGL_EXT_pixel_format ------------------------- */
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_EXT_pixel_format 1
+
+#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000
+#define WGL_DRAW_TO_WINDOW_EXT 0x2001
+#define WGL_DRAW_TO_BITMAP_EXT 0x2002
+#define WGL_ACCELERATION_EXT 0x2003
+#define WGL_NEED_PALETTE_EXT 0x2004
+#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005
+#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006
+#define WGL_SWAP_METHOD_EXT 0x2007
+#define WGL_NUMBER_OVERLAYS_EXT 0x2008
+#define WGL_NUMBER_UNDERLAYS_EXT 0x2009
+#define WGL_TRANSPARENT_EXT 0x200A
+#define WGL_TRANSPARENT_VALUE_EXT 0x200B
+#define WGL_SHARE_DEPTH_EXT 0x200C
+#define WGL_SHARE_STENCIL_EXT 0x200D
+#define WGL_SHARE_ACCUM_EXT 0x200E
+#define WGL_SUPPORT_GDI_EXT 0x200F
+#define WGL_SUPPORT_OPENGL_EXT 0x2010
+#define WGL_DOUBLE_BUFFER_EXT 0x2011
+#define WGL_STEREO_EXT 0x2012
+#define WGL_PIXEL_TYPE_EXT 0x2013
+#define WGL_COLOR_BITS_EXT 0x2014
+#define WGL_RED_BITS_EXT 0x2015
+#define WGL_RED_SHIFT_EXT 0x2016
+#define WGL_GREEN_BITS_EXT 0x2017
+#define WGL_GREEN_SHIFT_EXT 0x2018
+#define WGL_BLUE_BITS_EXT 0x2019
+#define WGL_BLUE_SHIFT_EXT 0x201A
+#define WGL_ALPHA_BITS_EXT 0x201B
+#define WGL_ALPHA_SHIFT_EXT 0x201C
+#define WGL_ACCUM_BITS_EXT 0x201D
+#define WGL_ACCUM_RED_BITS_EXT 0x201E
+#define WGL_ACCUM_GREEN_BITS_EXT 0x201F
+#define WGL_ACCUM_BLUE_BITS_EXT 0x2020
+#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021
+#define WGL_DEPTH_BITS_EXT 0x2022
+#define WGL_STENCIL_BITS_EXT 0x2023
+#define WGL_AUX_BUFFERS_EXT 0x2024
+#define WGL_NO_ACCELERATION_EXT 0x2025
+#define WGL_GENERIC_ACCELERATION_EXT 0x2026
+#define WGL_FULL_ACCELERATION_EXT 0x2027
+#define WGL_SWAP_EXCHANGE_EXT 0x2028
+#define WGL_SWAP_COPY_EXT 0x2029
+#define WGL_SWAP_UNDEFINED_EXT 0x202A
+#define WGL_TYPE_RGBA_EXT 0x202B
+#define WGL_TYPE_COLORINDEX_EXT 0x202C
+
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues);
+
+#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT)
+#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT)
+#define wglGetPixelFormatAttribivEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribivEXT)
+
+#define WGLEW_EXT_pixel_format WGLEW_GET_VAR(__WGLEW_EXT_pixel_format)
+
+#endif /* WGL_EXT_pixel_format */
+
+/* ------------------- WGL_EXT_pixel_format_packed_float ------------------- */
+
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_EXT_pixel_format_packed_float 1
+
+#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
+
+#define WGLEW_EXT_pixel_format_packed_float WGLEW_GET_VAR(__WGLEW_EXT_pixel_format_packed_float)
+
+#endif /* WGL_EXT_pixel_format_packed_float */
+
+/* -------------------------- WGL_EXT_swap_control ------------------------- */
+
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+
+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+
+#define wglGetSwapIntervalEXT WGLEW_GET_FUN(__wglewGetSwapIntervalEXT)
+#define wglSwapIntervalEXT WGLEW_GET_FUN(__wglewSwapIntervalEXT)
+
+#define WGLEW_EXT_swap_control WGLEW_GET_VAR(__WGLEW_EXT_swap_control)
+
+#endif /* WGL_EXT_swap_control */
+
+/* ----------------------- WGL_EXT_swap_control_tear ----------------------- */
+
+#ifndef WGL_EXT_swap_control_tear
+#define WGL_EXT_swap_control_tear 1
+
+#define WGLEW_EXT_swap_control_tear WGLEW_GET_VAR(__WGLEW_EXT_swap_control_tear)
+
+#endif /* WGL_EXT_swap_control_tear */
+
+/* --------------------- WGL_I3D_digital_video_control --------------------- */
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_I3D_digital_video_control 1
+
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
+
+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
+
+#define wglGetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewGetDigitalVideoParametersI3D)
+#define wglSetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewSetDigitalVideoParametersI3D)
+
+#define WGLEW_I3D_digital_video_control WGLEW_GET_VAR(__WGLEW_I3D_digital_video_control)
+
+#endif /* WGL_I3D_digital_video_control */
+
+/* ----------------------------- WGL_I3D_gamma ----------------------------- */
+
+#ifndef WGL_I3D_gamma
+#define WGL_I3D_gamma 1
+
+#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E
+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F
+
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
+
+#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D)
+#define wglGetGammaTableParametersI3D WGLEW_GET_FUN(__wglewGetGammaTableParametersI3D)
+#define wglSetGammaTableI3D WGLEW_GET_FUN(__wglewSetGammaTableI3D)
+#define wglSetGammaTableParametersI3D WGLEW_GET_FUN(__wglewSetGammaTableParametersI3D)
+
+#define WGLEW_I3D_gamma WGLEW_GET_VAR(__WGLEW_I3D_gamma)
+
+#endif /* WGL_I3D_gamma */
+
+/* ---------------------------- WGL_I3D_genlock ---------------------------- */
+
+#ifndef WGL_I3D_genlock
+#define WGL_I3D_genlock 1
+
+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
+#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045
+#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046
+#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047
+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
+
+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT* uRate);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDelay);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource);
+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay);
+
+#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D)
+#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D)
+#define wglGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGenlockSampleRateI3D)
+#define wglGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGenlockSourceDelayI3D)
+#define wglGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGenlockSourceEdgeI3D)
+#define wglGenlockSourceI3D WGLEW_GET_FUN(__wglewGenlockSourceI3D)
+#define wglGetGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGetGenlockSampleRateI3D)
+#define wglGetGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGetGenlockSourceDelayI3D)
+#define wglGetGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGetGenlockSourceEdgeI3D)
+#define wglGetGenlockSourceI3D WGLEW_GET_FUN(__wglewGetGenlockSourceI3D)
+#define wglIsEnabledGenlockI3D WGLEW_GET_FUN(__wglewIsEnabledGenlockI3D)
+#define wglQueryGenlockMaxSourceDelayI3D WGLEW_GET_FUN(__wglewQueryGenlockMaxSourceDelayI3D)
+
+#define WGLEW_I3D_genlock WGLEW_GET_VAR(__WGLEW_I3D_genlock)
+
+#endif /* WGL_I3D_genlock */
+
+/* -------------------------- WGL_I3D_image_buffer ------------------------- */
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_I3D_image_buffer 1
+
+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
+#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002
+
+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count);
+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count);
+
+#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D)
+#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D)
+#define wglDestroyImageBufferI3D WGLEW_GET_FUN(__wglewDestroyImageBufferI3D)
+#define wglReleaseImageBufferEventsI3D WGLEW_GET_FUN(__wglewReleaseImageBufferEventsI3D)
+
+#define WGLEW_I3D_image_buffer WGLEW_GET_VAR(__WGLEW_I3D_image_buffer)
+
+#endif /* WGL_I3D_image_buffer */
+
+/* ------------------------ WGL_I3D_swap_frame_lock ------------------------ */
+
+#ifndef WGL_I3D_swap_frame_lock
+#define WGL_I3D_swap_frame_lock 1
+
+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag);
+
+#define wglDisableFrameLockI3D WGLEW_GET_FUN(__wglewDisableFrameLockI3D)
+#define wglEnableFrameLockI3D WGLEW_GET_FUN(__wglewEnableFrameLockI3D)
+#define wglIsEnabledFrameLockI3D WGLEW_GET_FUN(__wglewIsEnabledFrameLockI3D)
+#define wglQueryFrameLockMasterI3D WGLEW_GET_FUN(__wglewQueryFrameLockMasterI3D)
+
+#define WGLEW_I3D_swap_frame_lock WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_lock)
+
+#endif /* WGL_I3D_swap_frame_lock */
+
+/* ------------------------ WGL_I3D_swap_frame_usage ----------------------- */
+
+#ifndef WGL_I3D_swap_frame_usage
+#define WGL_I3D_swap_frame_usage 1
+
+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+
+#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D)
+#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D)
+#define wglGetFrameUsageI3D WGLEW_GET_FUN(__wglewGetFrameUsageI3D)
+#define wglQueryFrameTrackingI3D WGLEW_GET_FUN(__wglewQueryFrameTrackingI3D)
+
+#define WGLEW_I3D_swap_frame_usage WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_usage)
+
+#endif /* WGL_I3D_swap_frame_usage */
+
+/* --------------------------- WGL_NV_DX_interop --------------------------- */
+
+#ifndef WGL_NV_DX_interop
+#define WGL_NV_DX_interop 1
+
+#define WGL_ACCESS_READ_ONLY_NV 0x0000
+#define WGL_ACCESS_READ_WRITE_NV 0x0001
+#define WGL_ACCESS_WRITE_DISCARD_NV 0x0002
+
+typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
+typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects);
+typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access);
+typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void* dxDevice);
+typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access);
+typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void* dxObject, HANDLE shareHandle);
+typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects);
+typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject);
+
+#define wglDXCloseDeviceNV WGLEW_GET_FUN(__wglewDXCloseDeviceNV)
+#define wglDXLockObjectsNV WGLEW_GET_FUN(__wglewDXLockObjectsNV)
+#define wglDXObjectAccessNV WGLEW_GET_FUN(__wglewDXObjectAccessNV)
+#define wglDXOpenDeviceNV WGLEW_GET_FUN(__wglewDXOpenDeviceNV)
+#define wglDXRegisterObjectNV WGLEW_GET_FUN(__wglewDXRegisterObjectNV)
+#define wglDXSetResourceShareHandleNV WGLEW_GET_FUN(__wglewDXSetResourceShareHandleNV)
+#define wglDXUnlockObjectsNV WGLEW_GET_FUN(__wglewDXUnlockObjectsNV)
+#define wglDXUnregisterObjectNV WGLEW_GET_FUN(__wglewDXUnregisterObjectNV)
+
+#define WGLEW_NV_DX_interop WGLEW_GET_VAR(__WGLEW_NV_DX_interop)
+
+#endif /* WGL_NV_DX_interop */
+
+/* --------------------------- WGL_NV_DX_interop2 -------------------------- */
+
+#ifndef WGL_NV_DX_interop2
+#define WGL_NV_DX_interop2 1
+
+#define WGLEW_NV_DX_interop2 WGLEW_GET_VAR(__WGLEW_NV_DX_interop2)
+
+#endif /* WGL_NV_DX_interop2 */
+
+/* --------------------------- WGL_NV_copy_image --------------------------- */
+
+#ifndef WGL_NV_copy_image
+#define WGL_NV_copy_image 1
+
+typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+
+#define wglCopyImageSubDataNV WGLEW_GET_FUN(__wglewCopyImageSubDataNV)
+
+#define WGLEW_NV_copy_image WGLEW_GET_VAR(__WGLEW_NV_copy_image)
+
+#endif /* WGL_NV_copy_image */
+
+/* ------------------------ WGL_NV_delay_before_swap ----------------------- */
+
+#ifndef WGL_NV_delay_before_swap
+#define WGL_NV_delay_before_swap 1
+
+typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds);
+
+#define wglDelayBeforeSwapNV WGLEW_GET_FUN(__wglewDelayBeforeSwapNV)
+
+#define WGLEW_NV_delay_before_swap WGLEW_GET_VAR(__WGLEW_NV_delay_before_swap)
+
+#endif /* WGL_NV_delay_before_swap */
+
+/* -------------------------- WGL_NV_float_buffer -------------------------- */
+
+#ifndef WGL_NV_float_buffer
+#define WGL_NV_float_buffer 1
+
+#define WGL_FLOAT_COMPONENTS_NV 0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV 0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8
+
+#define WGLEW_NV_float_buffer WGLEW_GET_VAR(__WGLEW_NV_float_buffer)
+
+#endif /* WGL_NV_float_buffer */
+
+/* -------------------------- WGL_NV_gpu_affinity -------------------------- */
+
+#ifndef WGL_NV_gpu_affinity
+#define WGL_NV_gpu_affinity 1
+
+#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0
+#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1
+
+DECLARE_HANDLE(HGPUNV);
+typedef struct _GPU_DEVICE {
+  DWORD cb; 
+  CHAR DeviceName[32]; 
+  CHAR DeviceString[128]; 
+  DWORD Flags; 
+  RECT rcVirtualScreen; 
+} GPU_DEVICE, *PGPU_DEVICE;
+
+typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList);
+typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc);
+typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
+typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
+typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
+
+#define wglCreateAffinityDCNV WGLEW_GET_FUN(__wglewCreateAffinityDCNV)
+#define wglDeleteDCNV WGLEW_GET_FUN(__wglewDeleteDCNV)
+#define wglEnumGpuDevicesNV WGLEW_GET_FUN(__wglewEnumGpuDevicesNV)
+#define wglEnumGpusFromAffinityDCNV WGLEW_GET_FUN(__wglewEnumGpusFromAffinityDCNV)
+#define wglEnumGpusNV WGLEW_GET_FUN(__wglewEnumGpusNV)
+
+#define WGLEW_NV_gpu_affinity WGLEW_GET_VAR(__WGLEW_NV_gpu_affinity)
+
+#endif /* WGL_NV_gpu_affinity */
+
+/* ---------------------- WGL_NV_multisample_coverage ---------------------- */
+
+#ifndef WGL_NV_multisample_coverage
+#define WGL_NV_multisample_coverage 1
+
+#define WGL_COVERAGE_SAMPLES_NV 0x2042
+#define WGL_COLOR_SAMPLES_NV 0x20B9
+
+#define WGLEW_NV_multisample_coverage WGLEW_GET_VAR(__WGLEW_NV_multisample_coverage)
+
+#endif /* WGL_NV_multisample_coverage */
+
+/* -------------------------- WGL_NV_present_video ------------------------- */
+
+#ifndef WGL_NV_present_video
+#define WGL_NV_present_video 1
+
+#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0
+
+DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+
+typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int* piAttribList);
+typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV* phDeviceList);
+typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* piValue);
+
+#define wglBindVideoDeviceNV WGLEW_GET_FUN(__wglewBindVideoDeviceNV)
+#define wglEnumerateVideoDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoDevicesNV)
+#define wglQueryCurrentContextNV WGLEW_GET_FUN(__wglewQueryCurrentContextNV)
+
+#define WGLEW_NV_present_video WGLEW_GET_VAR(__WGLEW_NV_present_video)
+
+#endif /* WGL_NV_present_video */
+
+/* ---------------------- WGL_NV_render_depth_texture ---------------------- */
+
+#ifndef WGL_NV_render_depth_texture
+#define WGL_NV_render_depth_texture 1
+
+#define WGL_NO_TEXTURE_ARB 0x2077
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
+#define WGL_DEPTH_COMPONENT_NV 0x20A7
+
+#define WGLEW_NV_render_depth_texture WGLEW_GET_VAR(__WGLEW_NV_render_depth_texture)
+
+#endif /* WGL_NV_render_depth_texture */
+
+/* -------------------- WGL_NV_render_texture_rectangle -------------------- */
+
+#ifndef WGL_NV_render_texture_rectangle
+#define WGL_NV_render_texture_rectangle 1
+
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV 0x20A2
+
+#define WGLEW_NV_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_NV_render_texture_rectangle)
+
+#endif /* WGL_NV_render_texture_rectangle */
+
+/* --------------------------- WGL_NV_swap_group --------------------------- */
+
+#ifndef WGL_NV_swap_group
+#define WGL_NV_swap_group 1
+
+typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
+typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint* count);
+typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint *maxBarriers);
+typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint *barrier);
+typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
+
+#define wglBindSwapBarrierNV WGLEW_GET_FUN(__wglewBindSwapBarrierNV)
+#define wglJoinSwapGroupNV WGLEW_GET_FUN(__wglewJoinSwapGroupNV)
+#define wglQueryFrameCountNV WGLEW_GET_FUN(__wglewQueryFrameCountNV)
+#define wglQueryMaxSwapGroupsNV WGLEW_GET_FUN(__wglewQueryMaxSwapGroupsNV)
+#define wglQuerySwapGroupNV WGLEW_GET_FUN(__wglewQuerySwapGroupNV)
+#define wglResetFrameCountNV WGLEW_GET_FUN(__wglewResetFrameCountNV)
+
+#define WGLEW_NV_swap_group WGLEW_GET_VAR(__WGLEW_NV_swap_group)
+
+#endif /* WGL_NV_swap_group */
+
+/* ----------------------- WGL_NV_vertex_array_range ----------------------- */
+
+#ifndef WGL_NV_vertex_array_range
+#define WGL_NV_vertex_array_range 1
+
+typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
+
+#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV)
+#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV)
+
+#define WGLEW_NV_vertex_array_range WGLEW_GET_VAR(__WGLEW_NV_vertex_array_range)
+
+#endif /* WGL_NV_vertex_array_range */
+
+/* -------------------------- WGL_NV_video_capture ------------------------- */
+
+#ifndef WGL_NV_video_capture
+#define WGL_NV_video_capture 1
+
+#define WGL_UNIQUE_ID_NV 0x20CE
+#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
+
+DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
+typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV* phDeviceList);
+typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int* piValue);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+
+#define wglBindVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewBindVideoCaptureDeviceNV)
+#define wglEnumerateVideoCaptureDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoCaptureDevicesNV)
+#define wglLockVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewLockVideoCaptureDeviceNV)
+#define wglQueryVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewQueryVideoCaptureDeviceNV)
+#define wglReleaseVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoCaptureDeviceNV)
+
+#define WGLEW_NV_video_capture WGLEW_GET_VAR(__WGLEW_NV_video_capture)
+
+#endif /* WGL_NV_video_capture */
+
+/* -------------------------- WGL_NV_video_output -------------------------- */
+
+#ifndef WGL_NV_video_output
+#define WGL_NV_video_output 1
+
+#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0
+#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1
+#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2
+#define WGL_VIDEO_OUT_COLOR_NV 0x20C3
+#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4
+#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5
+#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
+#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
+#define WGL_VIDEO_OUT_FRAME 0x20C8
+#define WGL_VIDEO_OUT_FIELD_1 0x20C9
+#define WGL_VIDEO_OUT_FIELD_2 0x20CA
+#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB
+#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC
+
+DECLARE_HANDLE(HPVIDEODEV);
+
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV* hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long* pulCounterPbuffer, BOOL bBlock);
+
+#define wglBindVideoImageNV WGLEW_GET_FUN(__wglewBindVideoImageNV)
+#define wglGetVideoDeviceNV WGLEW_GET_FUN(__wglewGetVideoDeviceNV)
+#define wglGetVideoInfoNV WGLEW_GET_FUN(__wglewGetVideoInfoNV)
+#define wglReleaseVideoDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoDeviceNV)
+#define wglReleaseVideoImageNV WGLEW_GET_FUN(__wglewReleaseVideoImageNV)
+#define wglSendPbufferToVideoNV WGLEW_GET_FUN(__wglewSendPbufferToVideoNV)
+
+#define WGLEW_NV_video_output WGLEW_GET_VAR(__WGLEW_NV_video_output)
+
+#endif /* WGL_NV_video_output */
+
+/* -------------------------- WGL_OML_sync_control ------------------------- */
+
+#ifndef WGL_OML_sync_control
+#define WGL_OML_sync_control 1
+
+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator);
+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc);
+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc);
+
+#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML)
+#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML)
+#define wglSwapBuffersMscOML WGLEW_GET_FUN(__wglewSwapBuffersMscOML)
+#define wglSwapLayerBuffersMscOML WGLEW_GET_FUN(__wglewSwapLayerBuffersMscOML)
+#define wglWaitForMscOML WGLEW_GET_FUN(__wglewWaitForMscOML)
+#define wglWaitForSbcOML WGLEW_GET_FUN(__wglewWaitForSbcOML)
+
+#define WGLEW_OML_sync_control WGLEW_GET_VAR(__WGLEW_OML_sync_control)
+
+#endif /* WGL_OML_sync_control */
+
+/* ------------------------------------------------------------------------- */
+
+#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT
+#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT
+
+WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
+
+WGLEW_FUN_EXPORT PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD;
+WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD;
+WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD;
+WGLEW_FUN_EXPORT PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD;
+WGLEW_FUN_EXPORT PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD;
+WGLEW_FUN_EXPORT PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD;
+WGLEW_FUN_EXPORT PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD;
+WGLEW_FUN_EXPORT PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD;
+WGLEW_FUN_EXPORT PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD;
+
+WGLEW_FUN_EXPORT PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB;
+WGLEW_FUN_EXPORT PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB;
+WGLEW_FUN_EXPORT PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB;
+WGLEW_FUN_EXPORT PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB;
+
+WGLEW_FUN_EXPORT PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB;
+
+WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB;
+
+WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB;
+WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB;
+
+WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB;
+WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB;
+WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB;
+WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB;
+WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB;
+
+WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB;
+WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB;
+WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB;
+
+WGLEW_FUN_EXPORT PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB;
+WGLEW_FUN_EXPORT PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB;
+WGLEW_FUN_EXPORT PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB;
+
+WGLEW_FUN_EXPORT PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT;
+WGLEW_FUN_EXPORT PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT;
+WGLEW_FUN_EXPORT PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT;
+WGLEW_FUN_EXPORT PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT;
+
+WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT;
+
+WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT;
+WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT;
+
+WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT;
+WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT;
+WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT;
+WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT;
+WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT;
+
+WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT;
+WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT;
+WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT;
+
+WGLEW_FUN_EXPORT PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT;
+WGLEW_FUN_EXPORT PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT;
+
+WGLEW_FUN_EXPORT PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D;
+WGLEW_FUN_EXPORT PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D;
+
+WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D;
+WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D;
+WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D;
+WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D;
+
+WGLEW_FUN_EXPORT PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D;
+WGLEW_FUN_EXPORT PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D;
+WGLEW_FUN_EXPORT PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D;
+WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D;
+WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D;
+WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D;
+WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D;
+WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D;
+WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D;
+WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D;
+WGLEW_FUN_EXPORT PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D;
+WGLEW_FUN_EXPORT PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D;
+
+WGLEW_FUN_EXPORT PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D;
+WGLEW_FUN_EXPORT PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D;
+WGLEW_FUN_EXPORT PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D;
+WGLEW_FUN_EXPORT PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D;
+
+WGLEW_FUN_EXPORT PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D;
+WGLEW_FUN_EXPORT PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D;
+WGLEW_FUN_EXPORT PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D;
+WGLEW_FUN_EXPORT PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D;
+
+WGLEW_FUN_EXPORT PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D;
+WGLEW_FUN_EXPORT PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D;
+WGLEW_FUN_EXPORT PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D;
+WGLEW_FUN_EXPORT PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D;
+
+WGLEW_FUN_EXPORT PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV;
+WGLEW_FUN_EXPORT PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV;
+WGLEW_FUN_EXPORT PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV;
+WGLEW_FUN_EXPORT PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV;
+WGLEW_FUN_EXPORT PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV;
+WGLEW_FUN_EXPORT PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV;
+
+WGLEW_FUN_EXPORT PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV;
+
+WGLEW_FUN_EXPORT PFNWGLDELAYBEFORESWAPNVPROC __wglewDelayBeforeSwapNV;
+
+WGLEW_FUN_EXPORT PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV;
+WGLEW_FUN_EXPORT PFNWGLDELETEDCNVPROC __wglewDeleteDCNV;
+WGLEW_FUN_EXPORT PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV;
+WGLEW_FUN_EXPORT PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV;
+WGLEW_FUN_EXPORT PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV;
+
+WGLEW_FUN_EXPORT PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV;
+WGLEW_FUN_EXPORT PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV;
+
+WGLEW_FUN_EXPORT PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV;
+WGLEW_FUN_EXPORT PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV;
+WGLEW_FUN_EXPORT PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV;
+WGLEW_FUN_EXPORT PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV;
+WGLEW_FUN_EXPORT PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV;
+WGLEW_FUN_EXPORT PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV;
+
+WGLEW_FUN_EXPORT PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV;
+WGLEW_FUN_EXPORT PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV;
+
+WGLEW_FUN_EXPORT PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV;
+WGLEW_FUN_EXPORT PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV;
+
+WGLEW_FUN_EXPORT PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV;
+WGLEW_FUN_EXPORT PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV;
+WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV;
+WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV;
+WGLEW_FUN_EXPORT PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV;
+
+WGLEW_FUN_EXPORT PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML;
+WGLEW_FUN_EXPORT PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML;
+WGLEW_FUN_EXPORT PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML;
+WGLEW_FUN_EXPORT PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML;
+WGLEW_FUN_EXPORT PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML;
+WGLEW_FUN_EXPORT PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_3DFX_multisample;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_3DL_stereo_control;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_context_flush_control;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_no_error;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_extensions_string;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_framebuffer_sRGB;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_make_current_read;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_multisample;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pbuffer;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format_float;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_render_texture;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_application_isolation;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_share_group_isolation;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_pixel_format_float;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_colorspace;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es2_profile;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es_profile;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_depth_float;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_display_color_table;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_extensions_string;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_framebuffer_sRGB;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_make_current_read;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_multisample;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pbuffer;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format_packed_float;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control_tear;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_digital_video_control;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_gamma;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_genlock;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_image_buffer;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_lock;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop2;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_delay_before_swap;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_present_video;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_depth_texture;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_texture_rectangle;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_swap_group;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output;
+WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control;
+/* ------------------------------------------------------------------------- */
+
+GLEWAPI GLenum GLEWAPIENTRY wglewInit ();
+GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
+
+#ifndef WGLEW_GET_VAR
+#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
+#endif
+
+#ifndef WGLEW_GET_FUN
+#define WGLEW_GET_FUN(x) x
+#endif
+
+GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef GLEWAPI
+
+#endif /* __wglew_h__ */
diff --git a/src_bkp/engine/external/glew/LICENSE.txt b/src_bkp/engine/external/glew/LICENSE.txt
new file mode 100644
index 0000000000..f7078042e9
--- /dev/null
+++ b/src_bkp/engine/external/glew/LICENSE.txt
@@ -0,0 +1,73 @@
+The OpenGL Extension Wrangler Library
+Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
+Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
+Copyright (C) 2002, Lev Povalahev
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, 
+  this list of conditions and the following disclaimer in the documentation 
+  and/or other materials provided with the distribution.
+* The name of the author may be used to endorse or promote products 
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Mesa 3-D graphics library
+Version:  7.0
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Copyright (c) 2007 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
diff --git a/src_bkp/engine/external/glew/README.md b/src_bkp/engine/external/glew/README.md
new file mode 100644
index 0000000000..6d8245b45a
--- /dev/null
+++ b/src_bkp/engine/external/glew/README.md
@@ -0,0 +1,190 @@
+# GLEW - The OpenGL Extension Wrangler Library
+
+![](http://glew.sourceforge.net/glew.png)
+
+http://glew.sourceforge.net/
+
+https://github.com/nigels-com/glew
+
+[![Build Status](https://travis-ci.org/nigels-com/glew.svg?branch=master)](https://travis-ci.org/nigels-com/glew)
+[![Gitter](https://badges.gitter.im/nigels-com/glew.svg)](https://gitter.im/nigels-com/glew?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Download](https://img.shields.io/sourceforge/dm/glew.svg)](https://sourceforge.net/projects/glew/files/latest/download)
+
+## Downloads
+
+Current release is [2.1.0](https://sourceforge.net/projects/glew/files/glew/2.1.0/).
+[(Change Log)](http://glew.sourceforge.net/log.html)
+
+Sources available as 
+[ZIP](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.zip/download) or
+[TGZ](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.tgz/download).
+
+Windows binaries for [32-bit and 64-bit](https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0-win32.zip/download).
+
+### Recent snapshots
+
+Snapshots may contain new features, bug-fixes or new OpenGL extensions ahead of tested, official releases.
+
+## Build
+
+It is highly recommended to build from a tgz or zip release snapshot.
+The code generation workflow is a complex brew of gnu make, perl and python, that works best on Linux or Mac.
+For most end-users of GLEW the official releases are the best choice, with first class support.
+
+### Linux and Mac
+
+#### Using GNU Make
+
+##### Install build tools
+
+Debian/Ubuntu/Mint:    `$ sudo apt-get install build-essential libxmu-dev libxi-dev libgl-dev libosmesa-dev`
+
+RedHat/CentOS/Fedora:  `$ sudo yum install libXmu-devel libXi-devel libGL-devel`
+
+##### Build
+
+	$ make
+	$ sudo make install
+	$ make clean
+
+Targets:    `all, glew.lib (sub-targets: glew.lib.shared, glew.lib.static), glew.bin, clean, install, uninstall`
+
+Variables:  `SYSTEM=linux-clang, GLEW_DEST=/usr/local, STRIP=`
+
+_Note: may need to make **auto** folder_
+
+#### Using cmake
+
+*CMake 2.8.12 or higher is required.*
+
+##### Install build tools
+
+Debian/Ubuntu/Mint:   `$ sudo apt-get install build-essential libXmu-dev libXi-dev libgl-dev cmake`
+
+RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel cmake`
+
+##### Build
+
+	$ cd build
+	$ cmake ./cmake 
+	$ make -j4
+
+| Target     | Description |
+| ---------- | ----------- |
+| glew       | Build the glew shared library. |
+| glew_s     | Build the glew static library. |
+| glewinfo   | Build the `glewinfo` executable (requires `BUILD_UTILS` to be `ON`). |
+| visualinfo | Build the `visualinfo` executable (requires `BUILD_UTILS` to be `ON`). |
+| install    | Install all enabled targets into `CMAKE_INSTALL_PREFIX`. |
+| clean      | Clean up build artifacts. |
+| all        | Build all enabled targets (default target). |
+
+| Variables       | Description |
+| --------------- | ----------- |
+| BUILD_UTILS     | Build the `glewinfo` and `visualinfo` executables. |
+| GLEW_REGAL      | Build in Regal mode. |
+| GLEW_OSMESA     | Build in off-screen Mesa mode. |
+| BUILD_FRAMEWORK | Build as MacOSX Framework.  Setting `CMAKE_INSTALL_PREFIX` to `/Library/Frameworks` is recommended. |
+
+### Windows
+
+#### Visual Studio
+
+Use the provided Visual Studio project file in build/vc12/
+
+Projects for vc6 and vc10 are also provided
+
+#### MSYS/Mingw
+
+Available from [Mingw](http://www.mingw.org/)
+
+Requirements: bash, make, gcc
+
+	$ mingw32-make
+	$ mingw32-make install
+	$ mingw32-make install.all
+
+Alternative toolchain:  `SYSTEM=mingw-win32`
+
+#### MSYS2/Mingw-w64
+
+Available from [Msys2](http://msys2.github.io/) and/or [Mingw-w64](http://mingw-w64.org/)
+
+Requirements: bash, make, gcc
+
+	$ pacman -S gcc make  mingw-w64-i686-gcc mingw-w64-x86_64-gcc 
+	$ make
+	$ make install
+	$ make install.all
+
+Alternative toolchain:  `SYSTEM=msys, SYSTEM=msys-win32, SYSTEM=msys-win64`
+
+## glewinfo
+
+`glewinfo` is a command-line tool useful for inspecting the capabilities of an
+OpenGL implementation and GLEW support for that.  Please include `glewinfo.txt`
+with bug reports, as appropriate.	
+
+	---------------------------
+	    GLEW Extension Info
+	---------------------------
+
+	GLEW version 2.0.0
+	Reporting capabilities of pixelformat 3
+	Running on a Intel(R) HD Graphics 3000 from Intel
+	OpenGL version 3.1.0 - Build 9.17.10.4229 is supported
+
+	GL_VERSION_1_1:                                                OK
+	---------------
+
+	GL_VERSION_1_2:                                                OK
+	---------------
+	  glCopyTexSubImage3D:                                         OK
+	  glDrawRangeElements:                                         OK
+	  glTexImage3D:                                                OK
+	  glTexSubImage3D:                                             OK
+	
+	...
+
+## Code Generation
+
+A Unix or Mac environment is needed for building GLEW from scratch to
+include new extensions, or customize the code generation. The extension
+data is regenerated from the top level source directory with:
+
+	make extensions
+
+An alternative to generating the GLEW sources from scratch is to
+download a pre-generated (unsupported) snapshot:
+
+https://sourceforge.net/projects/glew/files/glew/snapshots/
+
+Travis-built snapshots are also available:
+
+https://glew.s3.amazonaws.com/index.html
+
+## Authors
+
+GLEW is currently maintained by [Nigel Stewart](https://github.com/nigels-com)
+with bug fixes, new OpenGL extension support and new releases.
+
+GLEW was developed by [Milan Ikits](http://www.cs.utah.edu/~ikits/)
+and [Marcelo Magallon](http://wwwvis.informatik.uni-stuttgart.de/~magallon/).
+Aaron Lefohn, Joe Kniss, and Chris Wyman were the first users and also
+assisted with the design and debugging process.  
+
+The acronym GLEW originates from Aaron Lefohn.
+Pasi K&auml;rkk&auml;inen identified and fixed several problems with
+GLX and SDL.  Nate Robins created the `wglinfo` utility, to
+which modifications were made by Michael Wimmer.  
+
+## Copyright and Licensing
+
+GLEW is originally derived from the EXTGL project by Lev Povalahev.
+The source code is licensed under the 
+[Modified BSD License](http://glew.sourceforge.net/glew.txt), the 
+[Mesa 3-D License](http://glew.sourceforge.net/mesa.txt) (MIT) and the
+[Khronos License](http://glew.sourceforge.net/khronos.txt) (MIT).
+
+The automatic code generation scripts are released under the 
+[GNU GPL](http://glew.sourceforge.net/gpl.txt).
diff --git a/src_bkp/engine/external/glew/VERSION.txt b/src_bkp/engine/external/glew/VERSION.txt
new file mode 100644
index 0000000000..7ec1d6db40
--- /dev/null
+++ b/src_bkp/engine/external/glew/VERSION.txt
@@ -0,0 +1 @@
+2.1.0
diff --git a/src_bkp/engine/external/glew/glew.c b/src_bkp/engine/external/glew/glew.c
new file mode 100644
index 0000000000..4c47ea1828
--- /dev/null
+++ b/src_bkp/engine/external/glew/glew.c
@@ -0,0 +1,28581 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2008-2017, Nigel Stewart <nigels[]users sourceforge net>
+** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef GLEW_INCLUDE
+#include <GL/glew.h>
+#else
+#include GLEW_INCLUDE
+#endif
+
+#if defined(GLEW_OSMESA)
+#  define GLAPI extern
+#  include <GL/osmesa.h>
+#elif defined(GLEW_EGL)
+#  include <GL/eglew.h>
+#elif defined(_WIN32)
+/*
+ * If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
+ * wglGetProcAddress won't be declared. It will instead be implicitly declared,
+ * potentially incorrectly, which we don't want.
+ */
+#  if defined(NOGDI)
+#    undef NOGDI
+#  endif
+#  include <GL/wglew.h>
+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
+#  include <GL/glxew.h>
+#endif
+
+#include <stddef.h>  /* For size_t */
+
+#if defined(GLEW_EGL)
+#elif defined(GLEW_REGAL)
+
+/* In GLEW_REGAL mode we call direcly into the linked
+   libRegal.so glGetProcAddressREGAL for looking up
+   the GL function pointers. */
+
+#  undef glGetProcAddressREGAL
+#  ifdef WIN32
+extern void *  __stdcall glGetProcAddressREGAL(const GLchar *name);
+static void * (__stdcall * regalGetProcAddress) (const GLchar *) = glGetProcAddressREGAL;
+#    else
+extern void * glGetProcAddressREGAL(const GLchar *name);
+static void * (*regalGetProcAddress) (const GLchar *) = glGetProcAddressREGAL;
+#  endif
+#  define glGetProcAddressREGAL GLEW_GET_FUN(__glewGetProcAddressREGAL)
+
+#elif defined(__sgi) || defined (__sun) || defined(__HAIKU__) || defined(GLEW_APPLE_GLX)
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void* dlGetProcAddress (const GLubyte* name)
+{
+  static void* h = NULL;
+  static void* gpa;
+
+  if (h == NULL)
+  {
+    if ((h = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL)) == NULL) return NULL;
+    gpa = dlsym(h, "glXGetProcAddress");
+  }
+
+  if (gpa != NULL)
+    return ((void*(*)(const GLubyte*))gpa)(name);
+  else
+    return dlsym(h, (const char*)name);
+}
+#endif /* __sgi || __sun || GLEW_APPLE_GLX */
+
+#if defined(__APPLE__)
+#include <stdlib.h>
+#include <string.h>
+#include <AvailabilityMacros.h>
+
+#ifdef MAC_OS_X_VERSION_10_3
+
+#include <dlfcn.h>
+
+void* NSGLGetProcAddress (const GLubyte *name)
+{
+  static void* image = NULL;
+  void* addr;
+  if (NULL == image)
+  {
+    image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
+  }
+  if( !image ) return NULL;
+  addr = dlsym(image, (const char*)name);
+  if( addr ) return addr;
+#ifdef GLEW_APPLE_GLX
+  return dlGetProcAddress( name ); // try next for glx symbols
+#else
+  return NULL;
+#endif
+}
+#else
+
+#include <mach-o/dyld.h>
+
+void* NSGLGetProcAddress (const GLubyte *name)
+{
+  static const struct mach_header* image = NULL;
+  NSSymbol symbol;
+  char* symbolName;
+  if (NULL == image)
+  {
+    image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+  }
+  /* prepend a '_' for the Unix C symbol mangling convention */
+  symbolName = malloc(strlen((const char*)name) + 2);
+  strcpy(symbolName+1, (const char*)name);
+  symbolName[0] = '_';
+  symbol = NULL;
+  /* if (NSIsSymbolNameDefined(symbolName))
+	 symbol = NSLookupAndBindSymbol(symbolName); */
+  symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
+  free(symbolName);
+  if( symbol ) return NSAddressOfSymbol(symbol);
+#ifdef GLEW_APPLE_GLX
+  return dlGetProcAddress( name ); // try next for glx symbols
+#else
+  return NULL;
+#endif
+}
+#endif /* MAC_OS_X_VERSION_10_3 */
+#endif /* __APPLE__ */
+
+/*
+ * Define glewGetProcAddress.
+ */
+#if defined(GLEW_REGAL)
+#  define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
+#elif defined(GLEW_OSMESA)
+#  define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
+#elif defined(GLEW_EGL)
+#  define glewGetProcAddress(name) eglGetProcAddress((const char *)name)
+#elif defined(_WIN32)
+#  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
+#  define glewGetProcAddress(name) NSGLGetProcAddress(name)
+#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)
+#  define glewGetProcAddress(name) dlGetProcAddress(name)
+#elif defined(__ANDROID__)
+#  define glewGetProcAddress(name) NULL /* TODO */
+#elif defined(__native_client__)
+#  define glewGetProcAddress(name) NULL /* TODO */
+#else /* __linux */
+#  define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
+#endif
+
+/*
+ * Redefine GLEW_GET_VAR etc without const cast
+ */
+
+#undef GLEW_GET_VAR
+# define GLEW_GET_VAR(x) (x)
+
+#ifdef WGLEW_GET_VAR
+# undef WGLEW_GET_VAR
+# define WGLEW_GET_VAR(x) (x)
+#endif /* WGLEW_GET_VAR */
+
+#ifdef GLXEW_GET_VAR
+# undef GLXEW_GET_VAR
+# define GLXEW_GET_VAR(x) (x)
+#endif /* GLXEW_GET_VAR */
+
+#ifdef EGLEW_GET_VAR
+# undef EGLEW_GET_VAR
+# define EGLEW_GET_VAR(x) (x)
+#endif /* EGLEW_GET_VAR */
+
+/*
+ * GLEW, just like OpenGL or GLU, does not rely on the standard C library.
+ * These functions implement the functionality required in this file.
+ */
+
+static GLuint _glewStrLen (const GLubyte* s)
+{
+  GLuint i=0;
+  if (s == NULL) return 0;
+  while (s[i] != '\0') i++;
+  return i;
+}
+
+static GLuint _glewStrCLen (const GLubyte* s, GLubyte c)
+{
+  GLuint i=0;
+  if (s == NULL) return 0;
+  while (s[i] != '\0' && s[i] != c) i++;
+  return i;
+}
+
+static GLuint _glewStrCopy(char *d, const char *s, char c)
+{
+  GLuint i=0;
+  if (s == NULL) return 0;
+  while (s[i] != '\0' && s[i] != c) { d[i] = s[i]; i++; }
+  d[i] = '\0';
+  return i;
+}
+
+#if !defined(GLEW_OSMESA)
+#if !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
+{
+  GLuint i=0;
+  if(a == NULL || b == NULL)
+    return (a == NULL && b == NULL && n == 0) ? GL_TRUE : GL_FALSE;
+  while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++;
+  return i == n ? GL_TRUE : GL_FALSE;
+}
+#endif
+#endif
+
+static GLboolean _glewStrSame1 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t'))
+  {
+    (*a)++;
+    (*na)--;
+  }
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+    if(i == nb)
+    {
+      *a = *a + nb;
+      *na = *na - nb;
+      return GL_TRUE;
+    }
+  }
+  return GL_FALSE;
+}
+
+static GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+    if(i == nb)
+    {
+      *a = *a + nb;
+      *na = *na - nb;
+      return GL_TRUE;
+    }
+  }
+  return GL_FALSE;
+}
+
+static GLboolean _glewStrSame3 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+    if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t'))
+    {
+      *a = *a + nb;
+      *na = *na - nb;
+      return GL_TRUE;
+    }
+  }
+  return GL_FALSE;
+}
+
+/*
+ * Search for name in the extensions string. Use of strstr()
+ * is not sufficient because extension names can be prefixes of
+ * other extension names. Could use strtok() but the constant
+ * string returned by glGetString might be in read-only memory.
+ */
+#if !defined(GLEW_OSMESA)
+#if !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, const GLubyte *end)
+{
+  const GLubyte* p;
+  GLuint len = _glewStrLen((const GLubyte*)name);
+  p = start;
+  while (p < end)
+  {
+    GLuint n = _glewStrCLen(p, ' ');
+    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
+    p += n+1;
+  }
+  return GL_FALSE;
+}
+#endif
+#endif
+
+PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D = NULL;
+PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements = NULL;
+PFNGLTEXIMAGE3DPROC __glewTexImage3D = NULL;
+PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D = NULL;
+
+PFNGLACTIVETEXTUREPROC __glewActiveTexture = NULL;
+PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture = NULL;
+PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D = NULL;
+PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D = NULL;
+PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D = NULL;
+PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage = NULL;
+PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd = NULL;
+PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf = NULL;
+PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd = NULL;
+PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf = NULL;
+PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d = NULL;
+PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv = NULL;
+PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f = NULL;
+PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv = NULL;
+PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i = NULL;
+PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv = NULL;
+PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s = NULL;
+PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv = NULL;
+PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d = NULL;
+PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv = NULL;
+PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f = NULL;
+PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv = NULL;
+PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i = NULL;
+PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv = NULL;
+PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s = NULL;
+PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv = NULL;
+PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d = NULL;
+PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv = NULL;
+PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f = NULL;
+PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv = NULL;
+PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i = NULL;
+PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv = NULL;
+PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s = NULL;
+PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv = NULL;
+PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d = NULL;
+PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv = NULL;
+PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f = NULL;
+PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv = NULL;
+PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i = NULL;
+PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv = NULL;
+PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s = NULL;
+PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv = NULL;
+PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage = NULL;
+
+PFNGLBLENDCOLORPROC __glewBlendColor = NULL;
+PFNGLBLENDEQUATIONPROC __glewBlendEquation = NULL;
+PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate = NULL;
+PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer = NULL;
+PFNGLFOGCOORDDPROC __glewFogCoordd = NULL;
+PFNGLFOGCOORDDVPROC __glewFogCoorddv = NULL;
+PFNGLFOGCOORDFPROC __glewFogCoordf = NULL;
+PFNGLFOGCOORDFVPROC __glewFogCoordfv = NULL;
+PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays = NULL;
+PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements = NULL;
+PFNGLPOINTPARAMETERFPROC __glewPointParameterf = NULL;
+PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv = NULL;
+PFNGLPOINTPARAMETERIPROC __glewPointParameteri = NULL;
+PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv = NULL;
+PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b = NULL;
+PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv = NULL;
+PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d = NULL;
+PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv = NULL;
+PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f = NULL;
+PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv = NULL;
+PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i = NULL;
+PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv = NULL;
+PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s = NULL;
+PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv = NULL;
+PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub = NULL;
+PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv = NULL;
+PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui = NULL;
+PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv = NULL;
+PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us = NULL;
+PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv = NULL;
+PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer = NULL;
+PFNGLWINDOWPOS2DPROC __glewWindowPos2d = NULL;
+PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv = NULL;
+PFNGLWINDOWPOS2FPROC __glewWindowPos2f = NULL;
+PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv = NULL;
+PFNGLWINDOWPOS2IPROC __glewWindowPos2i = NULL;
+PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv = NULL;
+PFNGLWINDOWPOS2SPROC __glewWindowPos2s = NULL;
+PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv = NULL;
+PFNGLWINDOWPOS3DPROC __glewWindowPos3d = NULL;
+PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv = NULL;
+PFNGLWINDOWPOS3FPROC __glewWindowPos3f = NULL;
+PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv = NULL;
+PFNGLWINDOWPOS3IPROC __glewWindowPos3i = NULL;
+PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv = NULL;
+PFNGLWINDOWPOS3SPROC __glewWindowPos3s = NULL;
+PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv = NULL;
+
+PFNGLBEGINQUERYPROC __glewBeginQuery = NULL;
+PFNGLBINDBUFFERPROC __glewBindBuffer = NULL;
+PFNGLBUFFERDATAPROC __glewBufferData = NULL;
+PFNGLBUFFERSUBDATAPROC __glewBufferSubData = NULL;
+PFNGLDELETEBUFFERSPROC __glewDeleteBuffers = NULL;
+PFNGLDELETEQUERIESPROC __glewDeleteQueries = NULL;
+PFNGLENDQUERYPROC __glewEndQuery = NULL;
+PFNGLGENBUFFERSPROC __glewGenBuffers = NULL;
+PFNGLGENQUERIESPROC __glewGenQueries = NULL;
+PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv = NULL;
+PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv = NULL;
+PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData = NULL;
+PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv = NULL;
+PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv = NULL;
+PFNGLGETQUERYIVPROC __glewGetQueryiv = NULL;
+PFNGLISBUFFERPROC __glewIsBuffer = NULL;
+PFNGLISQUERYPROC __glewIsQuery = NULL;
+PFNGLMAPBUFFERPROC __glewMapBuffer = NULL;
+PFNGLUNMAPBUFFERPROC __glewUnmapBuffer = NULL;
+
+PFNGLATTACHSHADERPROC __glewAttachShader = NULL;
+PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation = NULL;
+PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate = NULL;
+PFNGLCOMPILESHADERPROC __glewCompileShader = NULL;
+PFNGLCREATEPROGRAMPROC __glewCreateProgram = NULL;
+PFNGLCREATESHADERPROC __glewCreateShader = NULL;
+PFNGLDELETEPROGRAMPROC __glewDeleteProgram = NULL;
+PFNGLDELETESHADERPROC __glewDeleteShader = NULL;
+PFNGLDETACHSHADERPROC __glewDetachShader = NULL;
+PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray = NULL;
+PFNGLDRAWBUFFERSPROC __glewDrawBuffers = NULL;
+PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray = NULL;
+PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib = NULL;
+PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform = NULL;
+PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders = NULL;
+PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation = NULL;
+PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog = NULL;
+PFNGLGETPROGRAMIVPROC __glewGetProgramiv = NULL;
+PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog = NULL;
+PFNGLGETSHADERSOURCEPROC __glewGetShaderSource = NULL;
+PFNGLGETSHADERIVPROC __glewGetShaderiv = NULL;
+PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation = NULL;
+PFNGLGETUNIFORMFVPROC __glewGetUniformfv = NULL;
+PFNGLGETUNIFORMIVPROC __glewGetUniformiv = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv = NULL;
+PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv = NULL;
+PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv = NULL;
+PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv = NULL;
+PFNGLISPROGRAMPROC __glewIsProgram = NULL;
+PFNGLISSHADERPROC __glewIsShader = NULL;
+PFNGLLINKPROGRAMPROC __glewLinkProgram = NULL;
+PFNGLSHADERSOURCEPROC __glewShaderSource = NULL;
+PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate = NULL;
+PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate = NULL;
+PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate = NULL;
+PFNGLUNIFORM1FPROC __glewUniform1f = NULL;
+PFNGLUNIFORM1FVPROC __glewUniform1fv = NULL;
+PFNGLUNIFORM1IPROC __glewUniform1i = NULL;
+PFNGLUNIFORM1IVPROC __glewUniform1iv = NULL;
+PFNGLUNIFORM2FPROC __glewUniform2f = NULL;
+PFNGLUNIFORM2FVPROC __glewUniform2fv = NULL;
+PFNGLUNIFORM2IPROC __glewUniform2i = NULL;
+PFNGLUNIFORM2IVPROC __glewUniform2iv = NULL;
+PFNGLUNIFORM3FPROC __glewUniform3f = NULL;
+PFNGLUNIFORM3FVPROC __glewUniform3fv = NULL;
+PFNGLUNIFORM3IPROC __glewUniform3i = NULL;
+PFNGLUNIFORM3IVPROC __glewUniform3iv = NULL;
+PFNGLUNIFORM4FPROC __glewUniform4f = NULL;
+PFNGLUNIFORM4FVPROC __glewUniform4fv = NULL;
+PFNGLUNIFORM4IPROC __glewUniform4i = NULL;
+PFNGLUNIFORM4IVPROC __glewUniform4iv = NULL;
+PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv = NULL;
+PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv = NULL;
+PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv = NULL;
+PFNGLUSEPROGRAMPROC __glewUseProgram = NULL;
+PFNGLVALIDATEPROGRAMPROC __glewValidateProgram = NULL;
+PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d = NULL;
+PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv = NULL;
+PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f = NULL;
+PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv = NULL;
+PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s = NULL;
+PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv = NULL;
+PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d = NULL;
+PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv = NULL;
+PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f = NULL;
+PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv = NULL;
+PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s = NULL;
+PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv = NULL;
+PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d = NULL;
+PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv = NULL;
+PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f = NULL;
+PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv = NULL;
+PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s = NULL;
+PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv = NULL;
+PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv = NULL;
+PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv = NULL;
+PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv = NULL;
+PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub = NULL;
+PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv = NULL;
+PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv = NULL;
+PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv = NULL;
+PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv = NULL;
+PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d = NULL;
+PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv = NULL;
+PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f = NULL;
+PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv = NULL;
+PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv = NULL;
+PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s = NULL;
+PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv = NULL;
+PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv = NULL;
+PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv = NULL;
+PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv = NULL;
+PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer = NULL;
+
+PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv = NULL;
+PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv = NULL;
+PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv = NULL;
+PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv = NULL;
+PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv = NULL;
+PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv = NULL;
+
+PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender = NULL;
+PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback = NULL;
+PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation = NULL;
+PFNGLCLAMPCOLORPROC __glewClampColor = NULL;
+PFNGLCLEARBUFFERFIPROC __glewClearBufferfi = NULL;
+PFNGLCLEARBUFFERFVPROC __glewClearBufferfv = NULL;
+PFNGLCLEARBUFFERIVPROC __glewClearBufferiv = NULL;
+PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv = NULL;
+PFNGLCOLORMASKIPROC __glewColorMaski = NULL;
+PFNGLDISABLEIPROC __glewDisablei = NULL;
+PFNGLENABLEIPROC __glewEnablei = NULL;
+PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender = NULL;
+PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback = NULL;
+PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v = NULL;
+PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation = NULL;
+PFNGLGETSTRINGIPROC __glewGetStringi = NULL;
+PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv = NULL;
+PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv = NULL;
+PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying = NULL;
+PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv = NULL;
+PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv = NULL;
+PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv = NULL;
+PFNGLISENABLEDIPROC __glewIsEnabledi = NULL;
+PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv = NULL;
+PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv = NULL;
+PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings = NULL;
+PFNGLUNIFORM1UIPROC __glewUniform1ui = NULL;
+PFNGLUNIFORM1UIVPROC __glewUniform1uiv = NULL;
+PFNGLUNIFORM2UIPROC __glewUniform2ui = NULL;
+PFNGLUNIFORM2UIVPROC __glewUniform2uiv = NULL;
+PFNGLUNIFORM3UIPROC __glewUniform3ui = NULL;
+PFNGLUNIFORM3UIVPROC __glewUniform3uiv = NULL;
+PFNGLUNIFORM4UIPROC __glewUniform4ui = NULL;
+PFNGLUNIFORM4UIVPROC __glewUniform4uiv = NULL;
+PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i = NULL;
+PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv = NULL;
+PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui = NULL;
+PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv = NULL;
+PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i = NULL;
+PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv = NULL;
+PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui = NULL;
+PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv = NULL;
+PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i = NULL;
+PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv = NULL;
+PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui = NULL;
+PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv = NULL;
+PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv = NULL;
+PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i = NULL;
+PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv = NULL;
+PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv = NULL;
+PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv = NULL;
+PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui = NULL;
+PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv = NULL;
+PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv = NULL;
+PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced = NULL;
+PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced = NULL;
+PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex = NULL;
+PFNGLTEXBUFFERPROC __glewTexBuffer = NULL;
+
+PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture = NULL;
+PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v = NULL;
+PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v = NULL;
+
+PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor = NULL;
+
+PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei = NULL;
+PFNGLBLENDEQUATIONIPROC __glewBlendEquationi = NULL;
+PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei = NULL;
+PFNGLBLENDFUNCIPROC __glewBlendFunci = NULL;
+PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading = NULL;
+
+PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus = NULL;
+PFNGLGETNCOMPRESSEDTEXIMAGEPROC __glewGetnCompressedTexImage = NULL;
+PFNGLGETNTEXIMAGEPROC __glewGetnTexImage = NULL;
+PFNGLGETNUNIFORMDVPROC __glewGetnUniformdv = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC __glewMultiDrawArraysIndirectCount = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC __glewMultiDrawElementsIndirectCount = NULL;
+PFNGLSPECIALIZESHADERPROC __glewSpecializeShader = NULL;
+
+PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL;
+
+PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD = NULL;
+PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD = NULL;
+PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD = NULL;
+PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD = NULL;
+
+PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD = NULL;
+PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD = NULL;
+PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD = NULL;
+PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD = NULL;
+
+PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC __glewFramebufferSamplePositionsfvAMD = NULL;
+PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC __glewGetFramebufferParameterfvAMD = NULL;
+PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC __glewGetNamedFramebufferParameterfvAMD = NULL;
+PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC __glewNamedFramebufferSamplePositionsfvAMD = NULL;
+
+PFNGLVERTEXATTRIBPARAMETERIAMDPROC __glewVertexAttribParameteriAMD = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD = NULL;
+
+PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD = NULL;
+PFNGLGENNAMESAMDPROC __glewGenNamesAMD = NULL;
+PFNGLISNAMEAMDPROC __glewIsNameAMD = NULL;
+
+PFNGLQUERYOBJECTPARAMETERUIAMDPROC __glewQueryObjectParameteruiAMD = NULL;
+
+PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD = NULL;
+PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD = NULL;
+PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD = NULL;
+PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD = NULL;
+PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD = NULL;
+PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD = NULL;
+PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD = NULL;
+PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD = NULL;
+PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD = NULL;
+PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD = NULL;
+PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD = NULL;
+
+PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD = NULL;
+
+PFNGLTEXSTORAGESPARSEAMDPROC __glewTexStorageSparseAMD = NULL;
+PFNGLTEXTURESTORAGESPARSEAMDPROC __glewTextureStorageSparseAMD = NULL;
+
+PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD = NULL;
+
+PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD = NULL;
+PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD = NULL;
+
+PFNGLBLITFRAMEBUFFERANGLEPROC __glewBlitFramebufferANGLE = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC __glewRenderbufferStorageMultisampleANGLE = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDANGLEPROC __glewDrawArraysInstancedANGLE = NULL;
+PFNGLDRAWELEMENTSINSTANCEDANGLEPROC __glewDrawElementsInstancedANGLE = NULL;
+PFNGLVERTEXATTRIBDIVISORANGLEPROC __glewVertexAttribDivisorANGLE = NULL;
+
+PFNGLBEGINQUERYANGLEPROC __glewBeginQueryANGLE = NULL;
+PFNGLDELETEQUERIESANGLEPROC __glewDeleteQueriesANGLE = NULL;
+PFNGLENDQUERYANGLEPROC __glewEndQueryANGLE = NULL;
+PFNGLGENQUERIESANGLEPROC __glewGenQueriesANGLE = NULL;
+PFNGLGETQUERYOBJECTI64VANGLEPROC __glewGetQueryObjecti64vANGLE = NULL;
+PFNGLGETQUERYOBJECTIVANGLEPROC __glewGetQueryObjectivANGLE = NULL;
+PFNGLGETQUERYOBJECTUI64VANGLEPROC __glewGetQueryObjectui64vANGLE = NULL;
+PFNGLGETQUERYOBJECTUIVANGLEPROC __glewGetQueryObjectuivANGLE = NULL;
+PFNGLGETQUERYIVANGLEPROC __glewGetQueryivANGLE = NULL;
+PFNGLISQUERYANGLEPROC __glewIsQueryANGLE = NULL;
+PFNGLQUERYCOUNTERANGLEPROC __glewQueryCounterANGLE = NULL;
+
+PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC __glewGetTranslatedShaderSourceANGLE = NULL;
+
+PFNGLCOPYTEXTURELEVELSAPPLEPROC __glewCopyTextureLevelsAPPLE = NULL;
+
+PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE = NULL;
+PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE = NULL;
+PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE = NULL;
+PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE = NULL;
+PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE = NULL;
+
+PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE = NULL;
+PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE = NULL;
+PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE = NULL;
+PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE = NULL;
+PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE = NULL;
+PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE = NULL;
+PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE = NULL;
+PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE = NULL;
+
+PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE = NULL;
+PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC __glewRenderbufferStorageMultisampleAPPLE = NULL;
+PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC __glewResolveMultisampleFramebufferAPPLE = NULL;
+
+PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE = NULL;
+PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE = NULL;
+PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE = NULL;
+
+PFNGLCLIENTWAITSYNCAPPLEPROC __glewClientWaitSyncAPPLE = NULL;
+PFNGLDELETESYNCAPPLEPROC __glewDeleteSyncAPPLE = NULL;
+PFNGLFENCESYNCAPPLEPROC __glewFenceSyncAPPLE = NULL;
+PFNGLGETINTEGER64VAPPLEPROC __glewGetInteger64vAPPLE = NULL;
+PFNGLGETSYNCIVAPPLEPROC __glewGetSyncivAPPLE = NULL;
+PFNGLISSYNCAPPLEPROC __glewIsSyncAPPLE = NULL;
+PFNGLWAITSYNCAPPLEPROC __glewWaitSyncAPPLE = NULL;
+
+PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE = NULL;
+PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE = NULL;
+
+PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE = NULL;
+PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE = NULL;
+PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE = NULL;
+PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE = NULL;
+
+PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE = NULL;
+PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE = NULL;
+PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE = NULL;
+
+PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE = NULL;
+PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE = NULL;
+PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE = NULL;
+PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE = NULL;
+PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE = NULL;
+PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE = NULL;
+PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE = NULL;
+
+PFNGLCLEARDEPTHFPROC __glewClearDepthf = NULL;
+PFNGLDEPTHRANGEFPROC __glewDepthRangef = NULL;
+PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat = NULL;
+PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler = NULL;
+PFNGLSHADERBINARYPROC __glewShaderBinary = NULL;
+
+PFNGLMEMORYBARRIERBYREGIONPROC __glewMemoryBarrierByRegion = NULL;
+
+PFNGLPRIMITIVEBOUNDINGBOXARBPROC __glewPrimitiveBoundingBoxARB = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance = NULL;
+
+PFNGLGETIMAGEHANDLEARBPROC __glewGetImageHandleARB = NULL;
+PFNGLGETTEXTUREHANDLEARBPROC __glewGetTextureHandleARB = NULL;
+PFNGLGETTEXTURESAMPLERHANDLEARBPROC __glewGetTextureSamplerHandleARB = NULL;
+PFNGLGETVERTEXATTRIBLUI64VARBPROC __glewGetVertexAttribLui64vARB = NULL;
+PFNGLISIMAGEHANDLERESIDENTARBPROC __glewIsImageHandleResidentARB = NULL;
+PFNGLISTEXTUREHANDLERESIDENTARBPROC __glewIsTextureHandleResidentARB = NULL;
+PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC __glewMakeImageHandleNonResidentARB = NULL;
+PFNGLMAKEIMAGEHANDLERESIDENTARBPROC __glewMakeImageHandleResidentARB = NULL;
+PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC __glewMakeTextureHandleNonResidentARB = NULL;
+PFNGLMAKETEXTUREHANDLERESIDENTARBPROC __glewMakeTextureHandleResidentARB = NULL;
+PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC __glewProgramUniformHandleui64ARB = NULL;
+PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC __glewProgramUniformHandleui64vARB = NULL;
+PFNGLUNIFORMHANDLEUI64ARBPROC __glewUniformHandleui64ARB = NULL;
+PFNGLUNIFORMHANDLEUI64VARBPROC __glewUniformHandleui64vARB = NULL;
+PFNGLVERTEXATTRIBL1UI64ARBPROC __glewVertexAttribL1ui64ARB = NULL;
+PFNGLVERTEXATTRIBL1UI64VARBPROC __glewVertexAttribL1ui64vARB = NULL;
+
+PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed = NULL;
+PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex = NULL;
+
+PFNGLBUFFERSTORAGEPROC __glewBufferStorage = NULL;
+
+PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB = NULL;
+
+PFNGLCLEARBUFFERDATAPROC __glewClearBufferData = NULL;
+PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData = NULL;
+PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT = NULL;
+PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT = NULL;
+
+PFNGLCLEARTEXIMAGEPROC __glewClearTexImage = NULL;
+PFNGLCLEARTEXSUBIMAGEPROC __glewClearTexSubImage = NULL;
+
+PFNGLCLIPCONTROLPROC __glewClipControl = NULL;
+
+PFNGLCLAMPCOLORARBPROC __glewClampColorARB = NULL;
+
+PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute = NULL;
+PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect = NULL;
+
+PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC __glewDispatchComputeGroupSizeARB = NULL;
+
+PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData = NULL;
+
+PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData = NULL;
+
+PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB = NULL;
+PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB = NULL;
+PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB = NULL;
+PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB = NULL;
+
+PFNGLBINDTEXTUREUNITPROC __glewBindTextureUnit = NULL;
+PFNGLBLITNAMEDFRAMEBUFFERPROC __glewBlitNamedFramebuffer = NULL;
+PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC __glewCheckNamedFramebufferStatus = NULL;
+PFNGLCLEARNAMEDBUFFERDATAPROC __glewClearNamedBufferData = NULL;
+PFNGLCLEARNAMEDBUFFERSUBDATAPROC __glewClearNamedBufferSubData = NULL;
+PFNGLCLEARNAMEDFRAMEBUFFERFIPROC __glewClearNamedFramebufferfi = NULL;
+PFNGLCLEARNAMEDFRAMEBUFFERFVPROC __glewClearNamedFramebufferfv = NULL;
+PFNGLCLEARNAMEDFRAMEBUFFERIVPROC __glewClearNamedFramebufferiv = NULL;
+PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC __glewClearNamedFramebufferuiv = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC __glewCompressedTextureSubImage1D = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC __glewCompressedTextureSubImage2D = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC __glewCompressedTextureSubImage3D = NULL;
+PFNGLCOPYNAMEDBUFFERSUBDATAPROC __glewCopyNamedBufferSubData = NULL;
+PFNGLCOPYTEXTURESUBIMAGE1DPROC __glewCopyTextureSubImage1D = NULL;
+PFNGLCOPYTEXTURESUBIMAGE2DPROC __glewCopyTextureSubImage2D = NULL;
+PFNGLCOPYTEXTURESUBIMAGE3DPROC __glewCopyTextureSubImage3D = NULL;
+PFNGLCREATEBUFFERSPROC __glewCreateBuffers = NULL;
+PFNGLCREATEFRAMEBUFFERSPROC __glewCreateFramebuffers = NULL;
+PFNGLCREATEPROGRAMPIPELINESPROC __glewCreateProgramPipelines = NULL;
+PFNGLCREATEQUERIESPROC __glewCreateQueries = NULL;
+PFNGLCREATERENDERBUFFERSPROC __glewCreateRenderbuffers = NULL;
+PFNGLCREATESAMPLERSPROC __glewCreateSamplers = NULL;
+PFNGLCREATETEXTURESPROC __glewCreateTextures = NULL;
+PFNGLCREATETRANSFORMFEEDBACKSPROC __glewCreateTransformFeedbacks = NULL;
+PFNGLCREATEVERTEXARRAYSPROC __glewCreateVertexArrays = NULL;
+PFNGLDISABLEVERTEXARRAYATTRIBPROC __glewDisableVertexArrayAttrib = NULL;
+PFNGLENABLEVERTEXARRAYATTRIBPROC __glewEnableVertexArrayAttrib = NULL;
+PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC __glewFlushMappedNamedBufferRange = NULL;
+PFNGLGENERATETEXTUREMIPMAPPROC __glewGenerateTextureMipmap = NULL;
+PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC __glewGetCompressedTextureImage = NULL;
+PFNGLGETNAMEDBUFFERPARAMETERI64VPROC __glewGetNamedBufferParameteri64v = NULL;
+PFNGLGETNAMEDBUFFERPARAMETERIVPROC __glewGetNamedBufferParameteriv = NULL;
+PFNGLGETNAMEDBUFFERPOINTERVPROC __glewGetNamedBufferPointerv = NULL;
+PFNGLGETNAMEDBUFFERSUBDATAPROC __glewGetNamedBufferSubData = NULL;
+PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetNamedFramebufferAttachmentParameteriv = NULL;
+PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC __glewGetNamedFramebufferParameteriv = NULL;
+PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC __glewGetNamedRenderbufferParameteriv = NULL;
+PFNGLGETQUERYBUFFEROBJECTI64VPROC __glewGetQueryBufferObjecti64v = NULL;
+PFNGLGETQUERYBUFFEROBJECTIVPROC __glewGetQueryBufferObjectiv = NULL;
+PFNGLGETQUERYBUFFEROBJECTUI64VPROC __glewGetQueryBufferObjectui64v = NULL;
+PFNGLGETQUERYBUFFEROBJECTUIVPROC __glewGetQueryBufferObjectuiv = NULL;
+PFNGLGETTEXTUREIMAGEPROC __glewGetTextureImage = NULL;
+PFNGLGETTEXTURELEVELPARAMETERFVPROC __glewGetTextureLevelParameterfv = NULL;
+PFNGLGETTEXTURELEVELPARAMETERIVPROC __glewGetTextureLevelParameteriv = NULL;
+PFNGLGETTEXTUREPARAMETERIIVPROC __glewGetTextureParameterIiv = NULL;
+PFNGLGETTEXTUREPARAMETERIUIVPROC __glewGetTextureParameterIuiv = NULL;
+PFNGLGETTEXTUREPARAMETERFVPROC __glewGetTextureParameterfv = NULL;
+PFNGLGETTEXTUREPARAMETERIVPROC __glewGetTextureParameteriv = NULL;
+PFNGLGETTRANSFORMFEEDBACKI64_VPROC __glewGetTransformFeedbacki64_v = NULL;
+PFNGLGETTRANSFORMFEEDBACKI_VPROC __glewGetTransformFeedbacki_v = NULL;
+PFNGLGETTRANSFORMFEEDBACKIVPROC __glewGetTransformFeedbackiv = NULL;
+PFNGLGETVERTEXARRAYINDEXED64IVPROC __glewGetVertexArrayIndexed64iv = NULL;
+PFNGLGETVERTEXARRAYINDEXEDIVPROC __glewGetVertexArrayIndexediv = NULL;
+PFNGLGETVERTEXARRAYIVPROC __glewGetVertexArrayiv = NULL;
+PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC __glewInvalidateNamedFramebufferData = NULL;
+PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC __glewInvalidateNamedFramebufferSubData = NULL;
+PFNGLMAPNAMEDBUFFERPROC __glewMapNamedBuffer = NULL;
+PFNGLMAPNAMEDBUFFERRANGEPROC __glewMapNamedBufferRange = NULL;
+PFNGLNAMEDBUFFERDATAPROC __glewNamedBufferData = NULL;
+PFNGLNAMEDBUFFERSTORAGEPROC __glewNamedBufferStorage = NULL;
+PFNGLNAMEDBUFFERSUBDATAPROC __glewNamedBufferSubData = NULL;
+PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC __glewNamedFramebufferDrawBuffer = NULL;
+PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC __glewNamedFramebufferDrawBuffers = NULL;
+PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC __glewNamedFramebufferParameteri = NULL;
+PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC __glewNamedFramebufferReadBuffer = NULL;
+PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC __glewNamedFramebufferRenderbuffer = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTUREPROC __glewNamedFramebufferTexture = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC __glewNamedFramebufferTextureLayer = NULL;
+PFNGLNAMEDRENDERBUFFERSTORAGEPROC __glewNamedRenderbufferStorage = NULL;
+PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewNamedRenderbufferStorageMultisample = NULL;
+PFNGLTEXTUREBUFFERPROC __glewTextureBuffer = NULL;
+PFNGLTEXTUREBUFFERRANGEPROC __glewTextureBufferRange = NULL;
+PFNGLTEXTUREPARAMETERIIVPROC __glewTextureParameterIiv = NULL;
+PFNGLTEXTUREPARAMETERIUIVPROC __glewTextureParameterIuiv = NULL;
+PFNGLTEXTUREPARAMETERFPROC __glewTextureParameterf = NULL;
+PFNGLTEXTUREPARAMETERFVPROC __glewTextureParameterfv = NULL;
+PFNGLTEXTUREPARAMETERIPROC __glewTextureParameteri = NULL;
+PFNGLTEXTUREPARAMETERIVPROC __glewTextureParameteriv = NULL;
+PFNGLTEXTURESTORAGE1DPROC __glewTextureStorage1D = NULL;
+PFNGLTEXTURESTORAGE2DPROC __glewTextureStorage2D = NULL;
+PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC __glewTextureStorage2DMultisample = NULL;
+PFNGLTEXTURESTORAGE3DPROC __glewTextureStorage3D = NULL;
+PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC __glewTextureStorage3DMultisample = NULL;
+PFNGLTEXTURESUBIMAGE1DPROC __glewTextureSubImage1D = NULL;
+PFNGLTEXTURESUBIMAGE2DPROC __glewTextureSubImage2D = NULL;
+PFNGLTEXTURESUBIMAGE3DPROC __glewTextureSubImage3D = NULL;
+PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC __glewTransformFeedbackBufferBase = NULL;
+PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC __glewTransformFeedbackBufferRange = NULL;
+PFNGLUNMAPNAMEDBUFFERPROC __glewUnmapNamedBuffer = NULL;
+PFNGLVERTEXARRAYATTRIBBINDINGPROC __glewVertexArrayAttribBinding = NULL;
+PFNGLVERTEXARRAYATTRIBFORMATPROC __glewVertexArrayAttribFormat = NULL;
+PFNGLVERTEXARRAYATTRIBIFORMATPROC __glewVertexArrayAttribIFormat = NULL;
+PFNGLVERTEXARRAYATTRIBLFORMATPROC __glewVertexArrayAttribLFormat = NULL;
+PFNGLVERTEXARRAYBINDINGDIVISORPROC __glewVertexArrayBindingDivisor = NULL;
+PFNGLVERTEXARRAYELEMENTBUFFERPROC __glewVertexArrayElementBuffer = NULL;
+PFNGLVERTEXARRAYVERTEXBUFFERPROC __glewVertexArrayVertexBuffer = NULL;
+PFNGLVERTEXARRAYVERTEXBUFFERSPROC __glewVertexArrayVertexBuffers = NULL;
+
+PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB = NULL;
+
+PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB = NULL;
+PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB = NULL;
+PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB = NULL;
+PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB = NULL;
+
+PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex = NULL;
+PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex = NULL;
+PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex = NULL;
+
+PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect = NULL;
+PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect = NULL;
+
+PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri = NULL;
+PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv = NULL;
+PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT = NULL;
+
+PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer = NULL;
+PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer = NULL;
+PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer = NULL;
+PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus = NULL;
+PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers = NULL;
+PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers = NULL;
+PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer = NULL;
+PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D = NULL;
+PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D = NULL;
+PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D = NULL;
+PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer = NULL;
+PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers = NULL;
+PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers = NULL;
+PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap = NULL;
+PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv = NULL;
+PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv = NULL;
+PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer = NULL;
+PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer = NULL;
+PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage = NULL;
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample = NULL;
+
+PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB = NULL;
+PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB = NULL;
+PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB = NULL;
+PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB = NULL;
+
+PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary = NULL;
+PFNGLPROGRAMBINARYPROC __glewProgramBinary = NULL;
+PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri = NULL;
+
+PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC __glewGetCompressedTextureSubImage = NULL;
+PFNGLGETTEXTURESUBIMAGEPROC __glewGetTextureSubImage = NULL;
+
+PFNGLSPECIALIZESHADERARBPROC __glewSpecializeShaderARB = NULL;
+
+PFNGLGETUNIFORMDVPROC __glewGetUniformdv = NULL;
+PFNGLUNIFORM1DPROC __glewUniform1d = NULL;
+PFNGLUNIFORM1DVPROC __glewUniform1dv = NULL;
+PFNGLUNIFORM2DPROC __glewUniform2d = NULL;
+PFNGLUNIFORM2DVPROC __glewUniform2dv = NULL;
+PFNGLUNIFORM3DPROC __glewUniform3d = NULL;
+PFNGLUNIFORM3DVPROC __glewUniform3dv = NULL;
+PFNGLUNIFORM4DPROC __glewUniform4d = NULL;
+PFNGLUNIFORM4DVPROC __glewUniform4dv = NULL;
+PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv = NULL;
+PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv = NULL;
+PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv = NULL;
+PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv = NULL;
+PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv = NULL;
+PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv = NULL;
+PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv = NULL;
+PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv = NULL;
+PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv = NULL;
+
+PFNGLGETUNIFORMI64VARBPROC __glewGetUniformi64vARB = NULL;
+PFNGLGETUNIFORMUI64VARBPROC __glewGetUniformui64vARB = NULL;
+PFNGLGETNUNIFORMI64VARBPROC __glewGetnUniformi64vARB = NULL;
+PFNGLGETNUNIFORMUI64VARBPROC __glewGetnUniformui64vARB = NULL;
+PFNGLPROGRAMUNIFORM1I64ARBPROC __glewProgramUniform1i64ARB = NULL;
+PFNGLPROGRAMUNIFORM1I64VARBPROC __glewProgramUniform1i64vARB = NULL;
+PFNGLPROGRAMUNIFORM1UI64ARBPROC __glewProgramUniform1ui64ARB = NULL;
+PFNGLPROGRAMUNIFORM1UI64VARBPROC __glewProgramUniform1ui64vARB = NULL;
+PFNGLPROGRAMUNIFORM2I64ARBPROC __glewProgramUniform2i64ARB = NULL;
+PFNGLPROGRAMUNIFORM2I64VARBPROC __glewProgramUniform2i64vARB = NULL;
+PFNGLPROGRAMUNIFORM2UI64ARBPROC __glewProgramUniform2ui64ARB = NULL;
+PFNGLPROGRAMUNIFORM2UI64VARBPROC __glewProgramUniform2ui64vARB = NULL;
+PFNGLPROGRAMUNIFORM3I64ARBPROC __glewProgramUniform3i64ARB = NULL;
+PFNGLPROGRAMUNIFORM3I64VARBPROC __glewProgramUniform3i64vARB = NULL;
+PFNGLPROGRAMUNIFORM3UI64ARBPROC __glewProgramUniform3ui64ARB = NULL;
+PFNGLPROGRAMUNIFORM3UI64VARBPROC __glewProgramUniform3ui64vARB = NULL;
+PFNGLPROGRAMUNIFORM4I64ARBPROC __glewProgramUniform4i64ARB = NULL;
+PFNGLPROGRAMUNIFORM4I64VARBPROC __glewProgramUniform4i64vARB = NULL;
+PFNGLPROGRAMUNIFORM4UI64ARBPROC __glewProgramUniform4ui64ARB = NULL;
+PFNGLPROGRAMUNIFORM4UI64VARBPROC __glewProgramUniform4ui64vARB = NULL;
+PFNGLUNIFORM1I64ARBPROC __glewUniform1i64ARB = NULL;
+PFNGLUNIFORM1I64VARBPROC __glewUniform1i64vARB = NULL;
+PFNGLUNIFORM1UI64ARBPROC __glewUniform1ui64ARB = NULL;
+PFNGLUNIFORM1UI64VARBPROC __glewUniform1ui64vARB = NULL;
+PFNGLUNIFORM2I64ARBPROC __glewUniform2i64ARB = NULL;
+PFNGLUNIFORM2I64VARBPROC __glewUniform2i64vARB = NULL;
+PFNGLUNIFORM2UI64ARBPROC __glewUniform2ui64ARB = NULL;
+PFNGLUNIFORM2UI64VARBPROC __glewUniform2ui64vARB = NULL;
+PFNGLUNIFORM3I64ARBPROC __glewUniform3i64ARB = NULL;
+PFNGLUNIFORM3I64VARBPROC __glewUniform3i64vARB = NULL;
+PFNGLUNIFORM3UI64ARBPROC __glewUniform3ui64ARB = NULL;
+PFNGLUNIFORM3UI64VARBPROC __glewUniform3ui64vARB = NULL;
+PFNGLUNIFORM4I64ARBPROC __glewUniform4i64ARB = NULL;
+PFNGLUNIFORM4I64VARBPROC __glewUniform4i64vARB = NULL;
+PFNGLUNIFORM4UI64ARBPROC __glewUniform4ui64ARB = NULL;
+PFNGLUNIFORM4UI64VARBPROC __glewUniform4ui64vARB = NULL;
+
+PFNGLCOLORSUBTABLEPROC __glewColorSubTable = NULL;
+PFNGLCOLORTABLEPROC __glewColorTable = NULL;
+PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv = NULL;
+PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv = NULL;
+PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D = NULL;
+PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D = NULL;
+PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf = NULL;
+PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv = NULL;
+PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri = NULL;
+PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv = NULL;
+PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable = NULL;
+PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable = NULL;
+PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D = NULL;
+PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D = NULL;
+PFNGLGETCOLORTABLEPROC __glewGetColorTable = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv = NULL;
+PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter = NULL;
+PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv = NULL;
+PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv = NULL;
+PFNGLGETHISTOGRAMPROC __glewGetHistogram = NULL;
+PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv = NULL;
+PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv = NULL;
+PFNGLGETMINMAXPROC __glewGetMinmax = NULL;
+PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv = NULL;
+PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv = NULL;
+PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter = NULL;
+PFNGLHISTOGRAMPROC __glewHistogram = NULL;
+PFNGLMINMAXPROC __glewMinmax = NULL;
+PFNGLRESETHISTOGRAMPROC __glewResetHistogram = NULL;
+PFNGLRESETMINMAXPROC __glewResetMinmax = NULL;
+PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __glewMultiDrawArraysIndirectCountARB = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __glewMultiDrawElementsIndirectCountARB = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB = NULL;
+PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB = NULL;
+PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB = NULL;
+
+PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ = NULL;
+
+PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v = NULL;
+
+PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData = NULL;
+PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData = NULL;
+PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer = NULL;
+PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer = NULL;
+PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage = NULL;
+PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage = NULL;
+
+PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange = NULL;
+PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange = NULL;
+
+PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB = NULL;
+PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB = NULL;
+PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB = NULL;
+PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB = NULL;
+PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB = NULL;
+
+PFNGLBINDBUFFERSBASEPROC __glewBindBuffersBase = NULL;
+PFNGLBINDBUFFERSRANGEPROC __glewBindBuffersRange = NULL;
+PFNGLBINDIMAGETEXTURESPROC __glewBindImageTextures = NULL;
+PFNGLBINDSAMPLERSPROC __glewBindSamplers = NULL;
+PFNGLBINDTEXTURESPROC __glewBindTextures = NULL;
+PFNGLBINDVERTEXBUFFERSPROC __glewBindVertexBuffers = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect = NULL;
+
+PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB = NULL;
+
+PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB = NULL;
+PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB = NULL;
+PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB = NULL;
+PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB = NULL;
+PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB = NULL;
+PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB = NULL;
+PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB = NULL;
+PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB = NULL;
+PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB = NULL;
+PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB = NULL;
+PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB = NULL;
+PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB = NULL;
+PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB = NULL;
+PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB = NULL;
+PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB = NULL;
+PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB = NULL;
+PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB = NULL;
+PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB = NULL;
+PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB = NULL;
+PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB = NULL;
+PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB = NULL;
+PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB = NULL;
+PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB = NULL;
+PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB = NULL;
+PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB = NULL;
+PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB = NULL;
+PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB = NULL;
+PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB = NULL;
+PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB = NULL;
+PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB = NULL;
+PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB = NULL;
+PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB = NULL;
+PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB = NULL;
+PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB = NULL;
+
+PFNGLBEGINQUERYARBPROC __glewBeginQueryARB = NULL;
+PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB = NULL;
+PFNGLENDQUERYARBPROC __glewEndQueryARB = NULL;
+PFNGLGENQUERIESARBPROC __glewGenQueriesARB = NULL;
+PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB = NULL;
+PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB = NULL;
+PFNGLGETQUERYIVARBPROC __glewGetQueryivARB = NULL;
+PFNGLISQUERYARBPROC __glewIsQueryARB = NULL;
+
+PFNGLMAXSHADERCOMPILERTHREADSARBPROC __glewMaxShaderCompilerThreadsARB = NULL;
+
+PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB = NULL;
+PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB = NULL;
+
+PFNGLPOLYGONOFFSETCLAMPPROC __glewPolygonOffsetClamp = NULL;
+
+PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv = NULL;
+PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex = NULL;
+PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation = NULL;
+PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex = NULL;
+PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName = NULL;
+PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv = NULL;
+
+PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex = NULL;
+
+PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB = NULL;
+PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB = NULL;
+PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB = NULL;
+PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB = NULL;
+PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB = NULL;
+PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB = NULL;
+PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB = NULL;
+PFNGLGETNMAPIVARBPROC __glewGetnMapivARB = NULL;
+PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB = NULL;
+PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB = NULL;
+PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB = NULL;
+PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB = NULL;
+PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB = NULL;
+PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB = NULL;
+PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB = NULL;
+PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB = NULL;
+PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB = NULL;
+PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB = NULL;
+PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB = NULL;
+PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB = NULL;
+
+PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewFramebufferSampleLocationsfvARB = NULL;
+PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewNamedFramebufferSampleLocationsfvARB = NULL;
+
+PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB = NULL;
+
+PFNGLBINDSAMPLERPROC __glewBindSampler = NULL;
+PFNGLDELETESAMPLERSPROC __glewDeleteSamplers = NULL;
+PFNGLGENSAMPLERSPROC __glewGenSamplers = NULL;
+PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv = NULL;
+PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv = NULL;
+PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv = NULL;
+PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv = NULL;
+PFNGLISSAMPLERPROC __glewIsSampler = NULL;
+PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv = NULL;
+PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv = NULL;
+PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf = NULL;
+PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv = NULL;
+PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri = NULL;
+PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv = NULL;
+
+PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram = NULL;
+PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline = NULL;
+PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv = NULL;
+PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines = NULL;
+PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines = NULL;
+PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog = NULL;
+PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv = NULL;
+PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline = NULL;
+PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d = NULL;
+PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv = NULL;
+PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f = NULL;
+PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv = NULL;
+PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i = NULL;
+PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv = NULL;
+PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui = NULL;
+PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv = NULL;
+PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d = NULL;
+PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv = NULL;
+PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f = NULL;
+PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv = NULL;
+PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i = NULL;
+PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv = NULL;
+PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui = NULL;
+PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv = NULL;
+PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d = NULL;
+PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv = NULL;
+PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f = NULL;
+PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv = NULL;
+PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i = NULL;
+PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv = NULL;
+PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui = NULL;
+PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv = NULL;
+PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d = NULL;
+PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv = NULL;
+PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f = NULL;
+PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv = NULL;
+PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i = NULL;
+PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv = NULL;
+PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui = NULL;
+PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv = NULL;
+PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages = NULL;
+PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline = NULL;
+
+PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv = NULL;
+
+PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture = NULL;
+PFNGLMEMORYBARRIERPROC __glewMemoryBarrier = NULL;
+
+PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB = NULL;
+PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB = NULL;
+PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB = NULL;
+PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB = NULL;
+PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB = NULL;
+PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB = NULL;
+PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB = NULL;
+PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB = NULL;
+PFNGLGETHANDLEARBPROC __glewGetHandleARB = NULL;
+PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB = NULL;
+PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB = NULL;
+PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB = NULL;
+PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB = NULL;
+PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB = NULL;
+PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB = NULL;
+PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB = NULL;
+PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB = NULL;
+PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB = NULL;
+PFNGLUNIFORM1FARBPROC __glewUniform1fARB = NULL;
+PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB = NULL;
+PFNGLUNIFORM1IARBPROC __glewUniform1iARB = NULL;
+PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB = NULL;
+PFNGLUNIFORM2FARBPROC __glewUniform2fARB = NULL;
+PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB = NULL;
+PFNGLUNIFORM2IARBPROC __glewUniform2iARB = NULL;
+PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB = NULL;
+PFNGLUNIFORM3FARBPROC __glewUniform3fARB = NULL;
+PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB = NULL;
+PFNGLUNIFORM3IARBPROC __glewUniform3iARB = NULL;
+PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB = NULL;
+PFNGLUNIFORM4FARBPROC __glewUniform4fARB = NULL;
+PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB = NULL;
+PFNGLUNIFORM4IARBPROC __glewUniform4iARB = NULL;
+PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB = NULL;
+PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB = NULL;
+PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB = NULL;
+PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB = NULL;
+PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB = NULL;
+PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB = NULL;
+
+PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding = NULL;
+
+PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName = NULL;
+PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName = NULL;
+PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv = NULL;
+PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv = NULL;
+PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex = NULL;
+PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation = NULL;
+PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv = NULL;
+PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv = NULL;
+
+PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB = NULL;
+PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB = NULL;
+PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB = NULL;
+PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB = NULL;
+PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB = NULL;
+PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB = NULL;
+
+PFNGLBUFFERPAGECOMMITMENTARBPROC __glewBufferPageCommitmentARB = NULL;
+
+PFNGLTEXPAGECOMMITMENTARBPROC __glewTexPageCommitmentARB = NULL;
+
+PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync = NULL;
+PFNGLDELETESYNCPROC __glewDeleteSync = NULL;
+PFNGLFENCESYNCPROC __glewFenceSync = NULL;
+PFNGLGETINTEGER64VPROC __glewGetInteger64v = NULL;
+PFNGLGETSYNCIVPROC __glewGetSynciv = NULL;
+PFNGLISSYNCPROC __glewIsSync = NULL;
+PFNGLWAITSYNCPROC __glewWaitSync = NULL;
+
+PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv = NULL;
+PFNGLPATCHPARAMETERIPROC __glewPatchParameteri = NULL;
+
+PFNGLTEXTUREBARRIERPROC __glewTextureBarrier = NULL;
+
+PFNGLTEXBUFFERARBPROC __glewTexBufferARB = NULL;
+
+PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange = NULL;
+PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT = NULL;
+
+PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB = NULL;
+PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB = NULL;
+PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB = NULL;
+PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB = NULL;
+
+PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv = NULL;
+PFNGLSAMPLEMASKIPROC __glewSampleMaski = NULL;
+PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample = NULL;
+PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample = NULL;
+
+PFNGLTEXSTORAGE1DPROC __glewTexStorage1D = NULL;
+PFNGLTEXSTORAGE2DPROC __glewTexStorage2D = NULL;
+PFNGLTEXSTORAGE3DPROC __glewTexStorage3D = NULL;
+
+PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample = NULL;
+PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample = NULL;
+PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT = NULL;
+PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT = NULL;
+
+PFNGLTEXTUREVIEWPROC __glewTextureView = NULL;
+
+PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v = NULL;
+PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v = NULL;
+PFNGLQUERYCOUNTERPROC __glewQueryCounter = NULL;
+
+PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback = NULL;
+PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks = NULL;
+PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback = NULL;
+PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks = NULL;
+PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback = NULL;
+PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback = NULL;
+PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback = NULL;
+
+PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed = NULL;
+PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream = NULL;
+PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed = NULL;
+PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv = NULL;
+
+PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced = NULL;
+PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced = NULL;
+
+PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB = NULL;
+PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB = NULL;
+PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB = NULL;
+PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB = NULL;
+
+PFNGLBINDBUFFERBASEPROC __glewBindBufferBase = NULL;
+PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange = NULL;
+PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName = NULL;
+PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv = NULL;
+PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName = NULL;
+PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv = NULL;
+PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v = NULL;
+PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex = NULL;
+PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices = NULL;
+PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding = NULL;
+
+PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray = NULL;
+PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays = NULL;
+PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays = NULL;
+PFNGLISVERTEXARRAYPROC __glewIsVertexArray = NULL;
+
+PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv = NULL;
+PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d = NULL;
+PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv = NULL;
+PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d = NULL;
+PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv = NULL;
+PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d = NULL;
+PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv = NULL;
+PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d = NULL;
+PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv = NULL;
+PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer = NULL;
+
+PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer = NULL;
+PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC __glewVertexArrayBindVertexBufferEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC __glewVertexArrayVertexAttribBindingEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC __glewVertexArrayVertexAttribFormatEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC __glewVertexArrayVertexAttribIFormatEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC __glewVertexArrayVertexAttribLFormatEXT = NULL;
+PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC __glewVertexArrayVertexBindingDivisorEXT = NULL;
+PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding = NULL;
+PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat = NULL;
+PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat = NULL;
+PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat = NULL;
+PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor = NULL;
+
+PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB = NULL;
+PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB = NULL;
+PFNGLWEIGHTBVARBPROC __glewWeightbvARB = NULL;
+PFNGLWEIGHTDVARBPROC __glewWeightdvARB = NULL;
+PFNGLWEIGHTFVARBPROC __glewWeightfvARB = NULL;
+PFNGLWEIGHTIVARBPROC __glewWeightivARB = NULL;
+PFNGLWEIGHTSVARBPROC __glewWeightsvARB = NULL;
+PFNGLWEIGHTUBVARBPROC __glewWeightubvARB = NULL;
+PFNGLWEIGHTUIVARBPROC __glewWeightuivARB = NULL;
+PFNGLWEIGHTUSVARBPROC __glewWeightusvARB = NULL;
+
+PFNGLBINDBUFFERARBPROC __glewBindBufferARB = NULL;
+PFNGLBUFFERDATAARBPROC __glewBufferDataARB = NULL;
+PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB = NULL;
+PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB = NULL;
+PFNGLGENBUFFERSARBPROC __glewGenBuffersARB = NULL;
+PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB = NULL;
+PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB = NULL;
+PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB = NULL;
+PFNGLISBUFFERARBPROC __glewIsBufferARB = NULL;
+PFNGLMAPBUFFERARBPROC __glewMapBufferARB = NULL;
+PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB = NULL;
+
+PFNGLBINDPROGRAMARBPROC __glewBindProgramARB = NULL;
+PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB = NULL;
+PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB = NULL;
+PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB = NULL;
+PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB = NULL;
+PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB = NULL;
+PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB = NULL;
+PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB = NULL;
+PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB = NULL;
+PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB = NULL;
+PFNGLISPROGRAMARBPROC __glewIsProgramARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB = NULL;
+PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB = NULL;
+PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB = NULL;
+PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB = NULL;
+PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB = NULL;
+PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB = NULL;
+PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB = NULL;
+PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB = NULL;
+PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB = NULL;
+PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB = NULL;
+PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB = NULL;
+PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB = NULL;
+PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB = NULL;
+PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB = NULL;
+PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB = NULL;
+PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB = NULL;
+PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB = NULL;
+PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB = NULL;
+PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB = NULL;
+PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB = NULL;
+PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB = NULL;
+PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB = NULL;
+PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB = NULL;
+PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB = NULL;
+PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB = NULL;
+PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB = NULL;
+PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB = NULL;
+PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB = NULL;
+PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB = NULL;
+PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB = NULL;
+PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB = NULL;
+PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB = NULL;
+PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB = NULL;
+PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB = NULL;
+PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB = NULL;
+PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB = NULL;
+PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB = NULL;
+PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB = NULL;
+PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB = NULL;
+
+PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB = NULL;
+PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB = NULL;
+PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB = NULL;
+
+PFNGLCOLORP3UIPROC __glewColorP3ui = NULL;
+PFNGLCOLORP3UIVPROC __glewColorP3uiv = NULL;
+PFNGLCOLORP4UIPROC __glewColorP4ui = NULL;
+PFNGLCOLORP4UIVPROC __glewColorP4uiv = NULL;
+PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui = NULL;
+PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv = NULL;
+PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui = NULL;
+PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv = NULL;
+PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui = NULL;
+PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv = NULL;
+PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui = NULL;
+PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv = NULL;
+PFNGLNORMALP3UIPROC __glewNormalP3ui = NULL;
+PFNGLNORMALP3UIVPROC __glewNormalP3uiv = NULL;
+PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui = NULL;
+PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv = NULL;
+PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui = NULL;
+PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv = NULL;
+PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui = NULL;
+PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv = NULL;
+PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui = NULL;
+PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv = NULL;
+PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui = NULL;
+PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv = NULL;
+PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui = NULL;
+PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv = NULL;
+PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui = NULL;
+PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv = NULL;
+PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui = NULL;
+PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv = NULL;
+PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui = NULL;
+PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv = NULL;
+PFNGLVERTEXP2UIPROC __glewVertexP2ui = NULL;
+PFNGLVERTEXP2UIVPROC __glewVertexP2uiv = NULL;
+PFNGLVERTEXP3UIPROC __glewVertexP3ui = NULL;
+PFNGLVERTEXP3UIVPROC __glewVertexP3uiv = NULL;
+PFNGLVERTEXP4UIPROC __glewVertexP4ui = NULL;
+PFNGLVERTEXP4UIVPROC __glewVertexP4uiv = NULL;
+
+PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv = NULL;
+PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed = NULL;
+PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v = NULL;
+PFNGLGETFLOATI_VPROC __glewGetFloati_v = NULL;
+PFNGLSCISSORARRAYVPROC __glewScissorArrayv = NULL;
+PFNGLSCISSORINDEXEDPROC __glewScissorIndexed = NULL;
+PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv = NULL;
+PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv = NULL;
+PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf = NULL;
+PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv = NULL;
+
+PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB = NULL;
+PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB = NULL;
+PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB = NULL;
+PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB = NULL;
+PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB = NULL;
+PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB = NULL;
+PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB = NULL;
+PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB = NULL;
+PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB = NULL;
+PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB = NULL;
+PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB = NULL;
+PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB = NULL;
+PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB = NULL;
+PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB = NULL;
+PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB = NULL;
+PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB = NULL;
+
+PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI = NULL;
+
+PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI = NULL;
+PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI = NULL;
+PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI = NULL;
+
+PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI = NULL;
+PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI = NULL;
+PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI = NULL;
+PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI = NULL;
+
+PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI = NULL;
+PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI = NULL;
+PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI = NULL;
+PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI = NULL;
+PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI = NULL;
+PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI = NULL;
+PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI = NULL;
+PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI = NULL;
+PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI = NULL;
+PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI = NULL;
+PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI = NULL;
+PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI = NULL;
+PFNGLSAMPLEMAPATIPROC __glewSampleMapATI = NULL;
+PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI = NULL;
+
+PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI = NULL;
+PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI = NULL;
+
+PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI = NULL;
+PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI = NULL;
+
+PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI = NULL;
+PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI = NULL;
+
+PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI = NULL;
+PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI = NULL;
+PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI = NULL;
+PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI = NULL;
+PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI = NULL;
+PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI = NULL;
+PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI = NULL;
+PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI = NULL;
+PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI = NULL;
+PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI = NULL;
+
+PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI = NULL;
+PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI = NULL;
+PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI = NULL;
+
+PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI = NULL;
+PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI = NULL;
+PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI = NULL;
+PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI = NULL;
+PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI = NULL;
+PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI = NULL;
+PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI = NULL;
+PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI = NULL;
+PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI = NULL;
+PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI = NULL;
+PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI = NULL;
+PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI = NULL;
+PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI = NULL;
+PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI = NULL;
+PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI = NULL;
+PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI = NULL;
+PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI = NULL;
+PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI = NULL;
+PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI = NULL;
+PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI = NULL;
+PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI = NULL;
+PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI = NULL;
+PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI = NULL;
+PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI = NULL;
+PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI = NULL;
+PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI = NULL;
+PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI = NULL;
+PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI = NULL;
+PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI = NULL;
+PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI = NULL;
+PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI = NULL;
+PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI = NULL;
+PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI = NULL;
+PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI = NULL;
+PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI = NULL;
+PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI = NULL;
+PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI = NULL;
+PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI = NULL;
+PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI = NULL;
+PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI = NULL;
+PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI = NULL;
+PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI = NULL;
+PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI = NULL;
+PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI = NULL;
+PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __glewDrawArraysInstancedBaseInstanceEXT = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __glewDrawElementsInstancedBaseInstanceEXT = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __glewDrawElementsInstancedBaseVertexBaseInstanceEXT = NULL;
+
+PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT = NULL;
+PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT = NULL;
+PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT = NULL;
+
+PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT = NULL;
+
+PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT = NULL;
+
+PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __glewBindFragDataLocationIndexedEXT = NULL;
+PFNGLGETFRAGDATAINDEXEXTPROC __glewGetFragDataIndexEXT = NULL;
+PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __glewGetProgramResourceLocationIndexEXT = NULL;
+
+PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT = NULL;
+
+PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT = NULL;
+
+PFNGLBUFFERSTORAGEEXTPROC __glewBufferStorageEXT = NULL;
+PFNGLNAMEDBUFFERSTORAGEEXTPROC __glewNamedBufferStorageEXT = NULL;
+
+PFNGLCLEARTEXIMAGEEXTPROC __glewClearTexImageEXT = NULL;
+PFNGLCLEARTEXSUBIMAGEEXTPROC __glewClearTexSubImageEXT = NULL;
+
+PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT = NULL;
+PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT = NULL;
+
+PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT = NULL;
+PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT = NULL;
+
+PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT = NULL;
+PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT = NULL;
+PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT = NULL;
+PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT = NULL;
+PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT = NULL;
+PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT = NULL;
+PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT = NULL;
+PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT = NULL;
+PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT = NULL;
+
+PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT = NULL;
+PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT = NULL;
+
+PFNGLCOPYIMAGESUBDATAEXTPROC __glewCopyImageSubDataEXT = NULL;
+
+PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT = NULL;
+PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL;
+
+PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL;
+PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL;
+
+PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT = NULL;
+PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT = NULL;
+
+PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT = NULL;
+PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT = NULL;
+PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT = NULL;
+
+PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT = NULL;
+
+PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT = NULL;
+PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT = NULL;
+PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT = NULL;
+PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT = NULL;
+PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT = NULL;
+PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT = NULL;
+PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT = NULL;
+PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT = NULL;
+PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT = NULL;
+PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT = NULL;
+PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT = NULL;
+PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT = NULL;
+PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT = NULL;
+PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT = NULL;
+PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT = NULL;
+PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT = NULL;
+PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT = NULL;
+PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT = NULL;
+PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT = NULL;
+PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT = NULL;
+PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT = NULL;
+PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT = NULL;
+PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT = NULL;
+PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT = NULL;
+PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT = NULL;
+PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT = NULL;
+PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT = NULL;
+PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT = NULL;
+PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT = NULL;
+PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT = NULL;
+PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT = NULL;
+PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT = NULL;
+PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT = NULL;
+PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT = NULL;
+PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT = NULL;
+PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT = NULL;
+PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT = NULL;
+PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT = NULL;
+PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT = NULL;
+PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT = NULL;
+PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT = NULL;
+PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT = NULL;
+PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT = NULL;
+PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT = NULL;
+PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT = NULL;
+PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT = NULL;
+PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT = NULL;
+PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT = NULL;
+PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT = NULL;
+PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT = NULL;
+PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT = NULL;
+PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT = NULL;
+PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT = NULL;
+PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT = NULL;
+PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT = NULL;
+PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT = NULL;
+PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT = NULL;
+PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT = NULL;
+PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT = NULL;
+PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT = NULL;
+PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT = NULL;
+PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT = NULL;
+PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT = NULL;
+PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT = NULL;
+PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT = NULL;
+PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT = NULL;
+PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT = NULL;
+PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT = NULL;
+PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT = NULL;
+PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT = NULL;
+PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT = NULL;
+PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT = NULL;
+PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT = NULL;
+PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT = NULL;
+PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT = NULL;
+PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT = NULL;
+PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT = NULL;
+PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT = NULL;
+PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT = NULL;
+PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT = NULL;
+PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT = NULL;
+PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT = NULL;
+PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT = NULL;
+PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT = NULL;
+PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT = NULL;
+PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT = NULL;
+PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT = NULL;
+PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT = NULL;
+PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT = NULL;
+PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT = NULL;
+PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT = NULL;
+PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT = NULL;
+PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT = NULL;
+PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT = NULL;
+PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT = NULL;
+PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT = NULL;
+PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT = NULL;
+PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT = NULL;
+PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT = NULL;
+PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT = NULL;
+PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT = NULL;
+PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT = NULL;
+PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT = NULL;
+PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT = NULL;
+PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT = NULL;
+PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT = NULL;
+PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT = NULL;
+PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT = NULL;
+PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT = NULL;
+PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT = NULL;
+PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT = NULL;
+PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT = NULL;
+PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT = NULL;
+PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT = NULL;
+PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT = NULL;
+PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT = NULL;
+PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT = NULL;
+PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT = NULL;
+PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT = NULL;
+PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT = NULL;
+PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT = NULL;
+PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT = NULL;
+PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT = NULL;
+PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT = NULL;
+PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT = NULL;
+PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT = NULL;
+PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT = NULL;
+PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT = NULL;
+PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT = NULL;
+PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT = NULL;
+PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT = NULL;
+PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT = NULL;
+PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT = NULL;
+PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT = NULL;
+PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT = NULL;
+PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT = NULL;
+PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT = NULL;
+PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT = NULL;
+PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT = NULL;
+PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT = NULL;
+PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT = NULL;
+PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT = NULL;
+PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT = NULL;
+PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT = NULL;
+PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT = NULL;
+PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT = NULL;
+PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT = NULL;
+PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT = NULL;
+PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT = NULL;
+PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT = NULL;
+PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT = NULL;
+PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT = NULL;
+PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT = NULL;
+PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT = NULL;
+PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT = NULL;
+PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT = NULL;
+PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT = NULL;
+PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT = NULL;
+PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT = NULL;
+PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT = NULL;
+PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT = NULL;
+PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT = NULL;
+PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT = NULL;
+PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT = NULL;
+PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT = NULL;
+PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT = NULL;
+PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT = NULL;
+PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT = NULL;
+PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT = NULL;
+PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT = NULL;
+PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT = NULL;
+PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT = NULL;
+PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT = NULL;
+PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT = NULL;
+PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT = NULL;
+PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT = NULL;
+PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT = NULL;
+PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT = NULL;
+PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC __glewVertexArrayVertexAttribDivisorEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT = NULL;
+PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT = NULL;
+
+PFNGLDISCARDFRAMEBUFFEREXTPROC __glewDiscardFramebufferEXT = NULL;
+
+PFNGLDRAWBUFFERSEXTPROC __glewDrawBuffersEXT = NULL;
+
+PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT = NULL;
+PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT = NULL;
+PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT = NULL;
+PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT = NULL;
+PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT = NULL;
+PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT = NULL;
+
+PFNGLBLENDEQUATIONSEPARATEIEXTPROC __glewBlendEquationSeparateiEXT = NULL;
+PFNGLBLENDEQUATIONIEXTPROC __glewBlendEquationiEXT = NULL;
+PFNGLBLENDFUNCSEPARATEIEXTPROC __glewBlendFuncSeparateiEXT = NULL;
+PFNGLBLENDFUNCIEXTPROC __glewBlendFunciEXT = NULL;
+PFNGLCOLORMASKIEXTPROC __glewColorMaskiEXT = NULL;
+PFNGLDISABLEIEXTPROC __glewDisableiEXT = NULL;
+PFNGLENABLEIEXTPROC __glewEnableiEXT = NULL;
+PFNGLISENABLEDIEXTPROC __glewIsEnablediEXT = NULL;
+
+PFNGLDRAWELEMENTSBASEVERTEXEXTPROC __glewDrawElementsBaseVertexEXT = NULL;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __glewDrawElementsInstancedBaseVertexEXT = NULL;
+PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __glewDrawRangeElementsBaseVertexEXT = NULL;
+PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __glewMultiDrawElementsBaseVertexEXT = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT = NULL;
+PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT = NULL;
+
+PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT = NULL;
+
+PFNGLBUFFERSTORAGEEXTERNALEXTPROC __glewBufferStorageExternalEXT = NULL;
+PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC __glewNamedBufferStorageExternalEXT = NULL;
+
+PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT = NULL;
+PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT = NULL;
+PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT = NULL;
+PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT = NULL;
+PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT = NULL;
+
+PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT = NULL;
+PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT = NULL;
+PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT = NULL;
+PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT = NULL;
+PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT = NULL;
+PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT = NULL;
+PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT = NULL;
+PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT = NULL;
+PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT = NULL;
+PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT = NULL;
+PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT = NULL;
+PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT = NULL;
+PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT = NULL;
+PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT = NULL;
+
+PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT = NULL;
+
+PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT = NULL;
+PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT = NULL;
+PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT = NULL;
+PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT = NULL;
+PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT = NULL;
+PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT = NULL;
+PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT = NULL;
+PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT = NULL;
+PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT = NULL;
+PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT = NULL;
+PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT = NULL;
+PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT = NULL;
+PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT = NULL;
+PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT = NULL;
+
+PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT = NULL;
+PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT = NULL;
+PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT = NULL;
+
+PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT = NULL;
+PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT = NULL;
+
+PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT = NULL;
+PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT = NULL;
+PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT = NULL;
+PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT = NULL;
+PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT = NULL;
+PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT = NULL;
+PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT = NULL;
+PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT = NULL;
+PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT = NULL;
+PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT = NULL;
+PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT = NULL;
+PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT = NULL;
+PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT = NULL;
+PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT = NULL;
+PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT = NULL;
+PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT = NULL;
+PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT = NULL;
+PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT = NULL;
+PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT = NULL;
+PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT = NULL;
+PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT = NULL;
+PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT = NULL;
+PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT = NULL;
+PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT = NULL;
+PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT = NULL;
+PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT = NULL;
+PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT = NULL;
+PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT = NULL;
+PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT = NULL;
+PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT = NULL;
+PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT = NULL;
+PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT = NULL;
+PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT = NULL;
+PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT = NULL;
+
+PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT = NULL;
+PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT = NULL;
+PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT = NULL;
+PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT = NULL;
+PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT = NULL;
+PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT = NULL;
+PFNGLHISTOGRAMEXTPROC __glewHistogramEXT = NULL;
+PFNGLMINMAXEXTPROC __glewMinmaxEXT = NULL;
+PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT = NULL;
+PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT = NULL;
+
+PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT = NULL;
+
+PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT = NULL;
+
+PFNGLVERTEXATTRIBDIVISOREXTPROC __glewVertexAttribDivisorEXT = NULL;
+
+PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT = NULL;
+PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT = NULL;
+PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT = NULL;
+
+PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC __glewFlushMappedBufferRangeEXT = NULL;
+PFNGLMAPBUFFERRANGEEXTPROC __glewMapBufferRangeEXT = NULL;
+
+PFNGLBUFFERSTORAGEMEMEXTPROC __glewBufferStorageMemEXT = NULL;
+PFNGLCREATEMEMORYOBJECTSEXTPROC __glewCreateMemoryObjectsEXT = NULL;
+PFNGLDELETEMEMORYOBJECTSEXTPROC __glewDeleteMemoryObjectsEXT = NULL;
+PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC __glewGetMemoryObjectParameterivEXT = NULL;
+PFNGLGETUNSIGNEDBYTEI_VEXTPROC __glewGetUnsignedBytei_vEXT = NULL;
+PFNGLGETUNSIGNEDBYTEVEXTPROC __glewGetUnsignedBytevEXT = NULL;
+PFNGLISMEMORYOBJECTEXTPROC __glewIsMemoryObjectEXT = NULL;
+PFNGLMEMORYOBJECTPARAMETERIVEXTPROC __glewMemoryObjectParameterivEXT = NULL;
+PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC __glewNamedBufferStorageMemEXT = NULL;
+PFNGLTEXSTORAGEMEM1DEXTPROC __glewTexStorageMem1DEXT = NULL;
+PFNGLTEXSTORAGEMEM2DEXTPROC __glewTexStorageMem2DEXT = NULL;
+PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC __glewTexStorageMem2DMultisampleEXT = NULL;
+PFNGLTEXSTORAGEMEM3DEXTPROC __glewTexStorageMem3DEXT = NULL;
+PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC __glewTexStorageMem3DMultisampleEXT = NULL;
+PFNGLTEXTURESTORAGEMEM1DEXTPROC __glewTextureStorageMem1DEXT = NULL;
+PFNGLTEXTURESTORAGEMEM2DEXTPROC __glewTextureStorageMem2DEXT = NULL;
+PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC __glewTextureStorageMem2DMultisampleEXT = NULL;
+PFNGLTEXTURESTORAGEMEM3DEXTPROC __glewTextureStorageMem3DEXT = NULL;
+PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC __glewTextureStorageMem3DMultisampleEXT = NULL;
+
+PFNGLIMPORTMEMORYFDEXTPROC __glewImportMemoryFdEXT = NULL;
+
+PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC __glewImportMemoryWin32HandleEXT = NULL;
+PFNGLIMPORTMEMORYWIN32NAMEEXTPROC __glewImportMemoryWin32NameEXT = NULL;
+
+PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL;
+PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTEXTPROC __glewMultiDrawArraysIndirectEXT = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC __glewMultiDrawElementsIndirectEXT = NULL;
+
+PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT = NULL;
+PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT = NULL;
+
+PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __glewFramebufferTexture2DMultisampleEXT = NULL;
+
+PFNGLDRAWBUFFERSINDEXEDEXTPROC __glewDrawBuffersIndexedEXT = NULL;
+PFNGLGETINTEGERI_VEXTPROC __glewGetIntegeri_vEXT = NULL;
+PFNGLREADBUFFERINDEXEDEXTPROC __glewReadBufferIndexedEXT = NULL;
+
+PFNGLCOLORTABLEEXTPROC __glewColorTableEXT = NULL;
+PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT = NULL;
+
+PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT = NULL;
+PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT = NULL;
+
+PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT = NULL;
+PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT = NULL;
+
+PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT = NULL;
+
+PFNGLPOLYGONOFFSETCLAMPEXTPROC __glewPolygonOffsetClampEXT = NULL;
+
+PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT = NULL;
+
+PFNGLCOVERAGEMODULATIONNVPROC __glewCoverageModulationNV = NULL;
+PFNGLCOVERAGEMODULATIONTABLENVPROC __glewCoverageModulationTableNV = NULL;
+PFNGLGETCOVERAGEMODULATIONTABLENVPROC __glewGetCoverageModulationTableNV = NULL;
+PFNGLRASTERSAMPLESEXTPROC __glewRasterSamplesEXT = NULL;
+
+PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT = NULL;
+PFNGLENDSCENEEXTPROC __glewEndSceneEXT = NULL;
+
+PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT = NULL;
+PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT = NULL;
+PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT = NULL;
+PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT = NULL;
+PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT = NULL;
+PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT = NULL;
+PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT = NULL;
+PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT = NULL;
+PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT = NULL;
+PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT = NULL;
+PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT = NULL;
+PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT = NULL;
+PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT = NULL;
+PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT = NULL;
+PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT = NULL;
+PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL;
+PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL;
+
+PFNGLDELETESEMAPHORESEXTPROC __glewDeleteSemaphoresEXT = NULL;
+PFNGLGENSEMAPHORESEXTPROC __glewGenSemaphoresEXT = NULL;
+PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC __glewGetSemaphoreParameterui64vEXT = NULL;
+PFNGLISSEMAPHOREEXTPROC __glewIsSemaphoreEXT = NULL;
+PFNGLSEMAPHOREPARAMETERUI64VEXTPROC __glewSemaphoreParameterui64vEXT = NULL;
+PFNGLSIGNALSEMAPHOREEXTPROC __glewSignalSemaphoreEXT = NULL;
+PFNGLWAITSEMAPHOREEXTPROC __glewWaitSemaphoreEXT = NULL;
+
+PFNGLIMPORTSEMAPHOREFDEXTPROC __glewImportSemaphoreFdEXT = NULL;
+
+PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC __glewImportSemaphoreWin32HandleEXT = NULL;
+PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC __glewImportSemaphoreWin32NameEXT = NULL;
+
+PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT = NULL;
+PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT = NULL;
+PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT = NULL;
+
+PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT = NULL;
+PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT = NULL;
+
+PFNGLCLEARPIXELLOCALSTORAGEUIEXTPROC __glewClearPixelLocalStorageuiEXT = NULL;
+PFNGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __glewFramebufferPixelLocalStorageSizeEXT = NULL;
+PFNGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __glewGetFramebufferPixelLocalStorageSizeEXT = NULL;
+
+PFNGLTEXPAGECOMMITMENTEXTPROC __glewTexPageCommitmentEXT = NULL;
+PFNGLTEXTUREPAGECOMMITMENTEXTPROC __glewTexturePageCommitmentEXT = NULL;
+
+PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT = NULL;
+
+PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT = NULL;
+PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT = NULL;
+PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT = NULL;
+
+PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT = NULL;
+
+PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT = NULL;
+
+PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT = NULL;
+
+PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT = NULL;
+PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT = NULL;
+PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT = NULL;
+PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT = NULL;
+PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT = NULL;
+PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT = NULL;
+
+PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT = NULL;
+PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT = NULL;
+PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT = NULL;
+PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT = NULL;
+PFNGLISTEXTUREEXTPROC __glewIsTextureEXT = NULL;
+PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT = NULL;
+
+PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT = NULL;
+
+PFNGLTEXSTORAGE1DEXTPROC __glewTexStorage1DEXT = NULL;
+PFNGLTEXSTORAGE2DEXTPROC __glewTexStorage2DEXT = NULL;
+PFNGLTEXSTORAGE3DEXTPROC __glewTexStorage3DEXT = NULL;
+PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT = NULL;
+PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT = NULL;
+PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT = NULL;
+
+PFNGLTEXTUREVIEWEXTPROC __glewTextureViewEXT = NULL;
+
+PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT = NULL;
+PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT = NULL;
+
+PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT = NULL;
+PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT = NULL;
+PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT = NULL;
+PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT = NULL;
+PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT = NULL;
+PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT = NULL;
+PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT = NULL;
+
+PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT = NULL;
+PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT = NULL;
+PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT = NULL;
+PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT = NULL;
+PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT = NULL;
+PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT = NULL;
+PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT = NULL;
+PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT = NULL;
+
+PFNGLBINDARRAYSETEXTPROC __glewBindArraySetEXT = NULL;
+PFNGLCREATEARRAYSETEXTPROC __glewCreateArraySetExt = NULL;
+PFNGLDELETEARRAYSETSEXTPROC __glewDeleteArraySetsEXT = NULL;
+
+PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT = NULL;
+PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT = NULL;
+PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT = NULL;
+PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT = NULL;
+PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT = NULL;
+PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT = NULL;
+PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT = NULL;
+PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT = NULL;
+PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT = NULL;
+PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT = NULL;
+PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT = NULL;
+
+PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT = NULL;
+PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT = NULL;
+PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT = NULL;
+PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT = NULL;
+PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT = NULL;
+PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT = NULL;
+PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT = NULL;
+PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT = NULL;
+PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT = NULL;
+PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT = NULL;
+PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT = NULL;
+PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT = NULL;
+PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT = NULL;
+PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT = NULL;
+PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT = NULL;
+PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT = NULL;
+PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT = NULL;
+PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT = NULL;
+PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT = NULL;
+PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT = NULL;
+PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT = NULL;
+PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT = NULL;
+PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT = NULL;
+PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT = NULL;
+PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT = NULL;
+PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT = NULL;
+PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT = NULL;
+PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT = NULL;
+PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT = NULL;
+PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT = NULL;
+PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT = NULL;
+PFNGLSWIZZLEEXTPROC __glewSwizzleEXT = NULL;
+PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT = NULL;
+PFNGLVARIANTBVEXTPROC __glewVariantbvEXT = NULL;
+PFNGLVARIANTDVEXTPROC __glewVariantdvEXT = NULL;
+PFNGLVARIANTFVEXTPROC __glewVariantfvEXT = NULL;
+PFNGLVARIANTIVEXTPROC __glewVariantivEXT = NULL;
+PFNGLVARIANTSVEXTPROC __glewVariantsvEXT = NULL;
+PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT = NULL;
+PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT = NULL;
+PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT = NULL;
+PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT = NULL;
+
+PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL;
+PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL;
+PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL;
+
+PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC __glewAcquireKeyedMutexWin32EXT = NULL;
+PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC __glewReleaseKeyedMutexWin32EXT = NULL;
+
+PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT = NULL;
+
+PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT = NULL;
+
+PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY = NULL;
+
+PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY = NULL;
+
+PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP = NULL;
+PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP = NULL;
+
+PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM = NULL;
+PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM = NULL;
+
+PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM = NULL;
+PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM = NULL;
+PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM = NULL;
+PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM = NULL;
+PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM = NULL;
+PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM = NULL;
+PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM = NULL;
+PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM = NULL;
+
+PFNGLMAPTEXTURE2DINTELPROC __glewMapTexture2DINTEL = NULL;
+PFNGLSYNCTEXTUREINTELPROC __glewSyncTextureINTEL = NULL;
+PFNGLUNMAPTEXTURE2DINTELPROC __glewUnmapTexture2DINTEL = NULL;
+
+PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL = NULL;
+PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL = NULL;
+PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL = NULL;
+PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL = NULL;
+
+PFNGLBEGINPERFQUERYINTELPROC __glewBeginPerfQueryINTEL = NULL;
+PFNGLCREATEPERFQUERYINTELPROC __glewCreatePerfQueryINTEL = NULL;
+PFNGLDELETEPERFQUERYINTELPROC __glewDeletePerfQueryINTEL = NULL;
+PFNGLENDPERFQUERYINTELPROC __glewEndPerfQueryINTEL = NULL;
+PFNGLGETFIRSTPERFQUERYIDINTELPROC __glewGetFirstPerfQueryIdINTEL = NULL;
+PFNGLGETNEXTPERFQUERYIDINTELPROC __glewGetNextPerfQueryIdINTEL = NULL;
+PFNGLGETPERFCOUNTERINFOINTELPROC __glewGetPerfCounterInfoINTEL = NULL;
+PFNGLGETPERFQUERYDATAINTELPROC __glewGetPerfQueryDataINTEL = NULL;
+PFNGLGETPERFQUERYIDBYNAMEINTELPROC __glewGetPerfQueryIdByNameINTEL = NULL;
+PFNGLGETPERFQUERYINFOINTELPROC __glewGetPerfQueryInfoINTEL = NULL;
+
+PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL = NULL;
+PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL = NULL;
+
+PFNGLBLENDBARRIERKHRPROC __glewBlendBarrierKHR = NULL;
+
+PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback = NULL;
+PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl = NULL;
+PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert = NULL;
+PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog = NULL;
+PFNGLGETOBJECTLABELPROC __glewGetObjectLabel = NULL;
+PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel = NULL;
+PFNGLOBJECTLABELPROC __glewObjectLabel = NULL;
+PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel = NULL;
+PFNGLPOPDEBUGGROUPPROC __glewPopDebugGroup = NULL;
+PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup = NULL;
+
+PFNGLMAXSHADERCOMPILERTHREADSKHRPROC __glewMaxShaderCompilerThreadsKHR = NULL;
+
+PFNGLGETNUNIFORMFVPROC __glewGetnUniformfv = NULL;
+PFNGLGETNUNIFORMIVPROC __glewGetnUniformiv = NULL;
+PFNGLGETNUNIFORMUIVPROC __glewGetnUniformuiv = NULL;
+PFNGLREADNPIXELSPROC __glewReadnPixels = NULL;
+
+PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled = NULL;
+PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion = NULL;
+PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion = NULL;
+PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion = NULL;
+PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion = NULL;
+
+PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA = NULL;
+
+PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA = NULL;
+PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA = NULL;
+PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA = NULL;
+PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA = NULL;
+PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA = NULL;
+PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA = NULL;
+PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA = NULL;
+PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA = NULL;
+PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA = NULL;
+PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA = NULL;
+PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA = NULL;
+PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA = NULL;
+PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA = NULL;
+PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA = NULL;
+PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA = NULL;
+PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA = NULL;
+PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA = NULL;
+PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA = NULL;
+PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA = NULL;
+PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA = NULL;
+PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA = NULL;
+PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA = NULL;
+PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA = NULL;
+PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA = NULL;
+
+PFNGLBEGINCONDITIONALRENDERNVXPROC __glewBeginConditionalRenderNVX = NULL;
+PFNGLENDCONDITIONALRENDERNVXPROC __glewEndConditionalRenderNVX = NULL;
+
+PFNGLLGPUCOPYIMAGESUBDATANVXPROC __glewLGPUCopyImageSubDataNVX = NULL;
+PFNGLLGPUINTERLOCKNVXPROC __glewLGPUInterlockNVX = NULL;
+PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC __glewLGPUNamedBufferSubDataNVX = NULL;
+
+PFNGLSTEREOPARAMETERFNVPROC __glewStereoParameterfNV = NULL;
+PFNGLSTEREOPARAMETERINVPROC __glewStereoParameteriNV = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC __glewMultiDrawArraysIndirectBindlessNV = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC __glewMultiDrawElementsIndirectBindlessNV = NULL;
+
+PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawArraysIndirectBindlessCountNV = NULL;
+PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawElementsIndirectBindlessCountNV = NULL;
+
+PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV = NULL;
+PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV = NULL;
+PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV = NULL;
+PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV = NULL;
+PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV = NULL;
+PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV = NULL;
+PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV = NULL;
+PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV = NULL;
+PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV = NULL;
+PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV = NULL;
+PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV = NULL;
+PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV = NULL;
+PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV = NULL;
+
+PFNGLBLENDBARRIERNVPROC __glewBlendBarrierNV = NULL;
+PFNGLBLENDPARAMETERINVPROC __glewBlendParameteriNV = NULL;
+
+PFNGLVIEWPORTPOSITIONWSCALENVPROC __glewViewportPositionWScaleNV = NULL;
+
+PFNGLCALLCOMMANDLISTNVPROC __glewCallCommandListNV = NULL;
+PFNGLCOMMANDLISTSEGMENTSNVPROC __glewCommandListSegmentsNV = NULL;
+PFNGLCOMPILECOMMANDLISTNVPROC __glewCompileCommandListNV = NULL;
+PFNGLCREATECOMMANDLISTSNVPROC __glewCreateCommandListsNV = NULL;
+PFNGLCREATESTATESNVPROC __glewCreateStatesNV = NULL;
+PFNGLDELETECOMMANDLISTSNVPROC __glewDeleteCommandListsNV = NULL;
+PFNGLDELETESTATESNVPROC __glewDeleteStatesNV = NULL;
+PFNGLDRAWCOMMANDSADDRESSNVPROC __glewDrawCommandsAddressNV = NULL;
+PFNGLDRAWCOMMANDSNVPROC __glewDrawCommandsNV = NULL;
+PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC __glewDrawCommandsStatesAddressNV = NULL;
+PFNGLDRAWCOMMANDSSTATESNVPROC __glewDrawCommandsStatesNV = NULL;
+PFNGLGETCOMMANDHEADERNVPROC __glewGetCommandHeaderNV = NULL;
+PFNGLGETSTAGEINDEXNVPROC __glewGetStageIndexNV = NULL;
+PFNGLISCOMMANDLISTNVPROC __glewIsCommandListNV = NULL;
+PFNGLISSTATENVPROC __glewIsStateNV = NULL;
+PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC __glewListDrawCommandsStatesClientNV = NULL;
+PFNGLSTATECAPTURENVPROC __glewStateCaptureNV = NULL;
+
+PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV = NULL;
+PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV = NULL;
+
+PFNGLSUBPIXELPRECISIONBIASNVPROC __glewSubpixelPrecisionBiasNV = NULL;
+
+PFNGLCONSERVATIVERASTERPARAMETERFNVPROC __glewConservativeRasterParameterfNV = NULL;
+
+PFNGLCONSERVATIVERASTERPARAMETERINVPROC __glewConservativeRasterParameteriNV = NULL;
+
+PFNGLCOPYBUFFERSUBDATANVPROC __glewCopyBufferSubDataNV = NULL;
+
+PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV = NULL;
+
+PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV = NULL;
+PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV = NULL;
+PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV = NULL;
+
+PFNGLDRAWBUFFERSNVPROC __glewDrawBuffersNV = NULL;
+
+PFNGLDRAWARRAYSINSTANCEDNVPROC __glewDrawArraysInstancedNV = NULL;
+PFNGLDRAWELEMENTSINSTANCEDNVPROC __glewDrawElementsInstancedNV = NULL;
+
+PFNGLDRAWTEXTURENVPROC __glewDrawTextureNV = NULL;
+
+PFNGLDRAWVKIMAGENVPROC __glewDrawVkImageNV = NULL;
+PFNGLGETVKPROCADDRNVPROC __glewGetVkProcAddrNV = NULL;
+PFNGLSIGNALVKFENCENVPROC __glewSignalVkFenceNV = NULL;
+PFNGLSIGNALVKSEMAPHORENVPROC __glewSignalVkSemaphoreNV = NULL;
+PFNGLWAITVKSEMAPHORENVPROC __glewWaitVkSemaphoreNV = NULL;
+
+PFNGLEVALMAPSNVPROC __glewEvalMapsNV = NULL;
+PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV = NULL;
+PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV = NULL;
+PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV = NULL;
+PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV = NULL;
+PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV = NULL;
+PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV = NULL;
+PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV = NULL;
+PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV = NULL;
+
+PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV = NULL;
+PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV = NULL;
+PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV = NULL;
+
+PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV = NULL;
+PFNGLFINISHFENCENVPROC __glewFinishFenceNV = NULL;
+PFNGLGENFENCESNVPROC __glewGenFencesNV = NULL;
+PFNGLGETFENCEIVNVPROC __glewGetFenceivNV = NULL;
+PFNGLISFENCENVPROC __glewIsFenceNV = NULL;
+PFNGLSETFENCENVPROC __glewSetFenceNV = NULL;
+PFNGLTESTFENCENVPROC __glewTestFenceNV = NULL;
+
+PFNGLFRAGMENTCOVERAGECOLORNVPROC __glewFragmentCoverageColorNV = NULL;
+
+PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV = NULL;
+PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV = NULL;
+
+PFNGLBLITFRAMEBUFFERNVPROC __glewBlitFramebufferNV = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC __glewRenderbufferStorageMultisampleNV = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV = NULL;
+
+PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV = NULL;
+
+PFNGLMULTICASTBARRIERNVPROC __glewMulticastBarrierNV = NULL;
+PFNGLMULTICASTBLITFRAMEBUFFERNVPROC __glewMulticastBlitFramebufferNV = NULL;
+PFNGLMULTICASTBUFFERSUBDATANVPROC __glewMulticastBufferSubDataNV = NULL;
+PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC __glewMulticastCopyBufferSubDataNV = NULL;
+PFNGLMULTICASTCOPYIMAGESUBDATANVPROC __glewMulticastCopyImageSubDataNV = NULL;
+PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewMulticastFramebufferSampleLocationsfvNV = NULL;
+PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC __glewMulticastGetQueryObjecti64vNV = NULL;
+PFNGLMULTICASTGETQUERYOBJECTIVNVPROC __glewMulticastGetQueryObjectivNV = NULL;
+PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC __glewMulticastGetQueryObjectui64vNV = NULL;
+PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC __glewMulticastGetQueryObjectuivNV = NULL;
+PFNGLMULTICASTWAITSYNCNVPROC __glewMulticastWaitSyncNV = NULL;
+PFNGLRENDERGPUMASKNVPROC __glewRenderGpuMaskNV = NULL;
+
+PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV = NULL;
+PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV = NULL;
+PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV = NULL;
+PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV = NULL;
+PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV = NULL;
+PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV = NULL;
+PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV = NULL;
+
+PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV = NULL;
+PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV = NULL;
+PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV = NULL;
+PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV = NULL;
+PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV = NULL;
+PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV = NULL;
+PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV = NULL;
+PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV = NULL;
+PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV = NULL;
+PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV = NULL;
+PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV = NULL;
+PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV = NULL;
+PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV = NULL;
+PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV = NULL;
+PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV = NULL;
+PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV = NULL;
+PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV = NULL;
+PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV = NULL;
+PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV = NULL;
+PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV = NULL;
+PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV = NULL;
+PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV = NULL;
+PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV = NULL;
+PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV = NULL;
+PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV = NULL;
+PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV = NULL;
+PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV = NULL;
+PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV = NULL;
+PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV = NULL;
+PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV = NULL;
+PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV = NULL;
+PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV = NULL;
+PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV = NULL;
+PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV = NULL;
+
+PFNGLCOLOR3HNVPROC __glewColor3hNV = NULL;
+PFNGLCOLOR3HVNVPROC __glewColor3hvNV = NULL;
+PFNGLCOLOR4HNVPROC __glewColor4hNV = NULL;
+PFNGLCOLOR4HVNVPROC __glewColor4hvNV = NULL;
+PFNGLFOGCOORDHNVPROC __glewFogCoordhNV = NULL;
+PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV = NULL;
+PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV = NULL;
+PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV = NULL;
+PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV = NULL;
+PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV = NULL;
+PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV = NULL;
+PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV = NULL;
+PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV = NULL;
+PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV = NULL;
+PFNGLNORMAL3HNVPROC __glewNormal3hNV = NULL;
+PFNGLNORMAL3HVNVPROC __glewNormal3hvNV = NULL;
+PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV = NULL;
+PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV = NULL;
+PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV = NULL;
+PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV = NULL;
+PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV = NULL;
+PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV = NULL;
+PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV = NULL;
+PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV = NULL;
+PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV = NULL;
+PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV = NULL;
+PFNGLVERTEX2HNVPROC __glewVertex2hNV = NULL;
+PFNGLVERTEX2HVNVPROC __glewVertex2hvNV = NULL;
+PFNGLVERTEX3HNVPROC __glewVertex3hNV = NULL;
+PFNGLVERTEX3HVNVPROC __glewVertex3hvNV = NULL;
+PFNGLVERTEX4HNVPROC __glewVertex4hNV = NULL;
+PFNGLVERTEX4HVNVPROC __glewVertex4hvNV = NULL;
+PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV = NULL;
+PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV = NULL;
+PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV = NULL;
+PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV = NULL;
+PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV = NULL;
+PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV = NULL;
+PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV = NULL;
+PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV = NULL;
+PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV = NULL;
+PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV = NULL;
+PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV = NULL;
+PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV = NULL;
+PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV = NULL;
+PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV = NULL;
+
+PFNGLVERTEXATTRIBDIVISORNVPROC __glewVertexAttribDivisorNV = NULL;
+
+PFNGLGETINTERNALFORMATSAMPLEIVNVPROC __glewGetInternalformatSampleivNV = NULL;
+
+PFNGLUNIFORMMATRIX2X3FVNVPROC __glewUniformMatrix2x3fvNV = NULL;
+PFNGLUNIFORMMATRIX2X4FVNVPROC __glewUniformMatrix2x4fvNV = NULL;
+PFNGLUNIFORMMATRIX3X2FVNVPROC __glewUniformMatrix3x2fvNV = NULL;
+PFNGLUNIFORMMATRIX3X4FVNVPROC __glewUniformMatrix3x4fvNV = NULL;
+PFNGLUNIFORMMATRIX4X2FVNVPROC __glewUniformMatrix4x2fvNV = NULL;
+PFNGLUNIFORMMATRIX4X3FVNVPROC __glewUniformMatrix4x3fvNV = NULL;
+
+PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV = NULL;
+PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV = NULL;
+PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV = NULL;
+PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV = NULL;
+PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV = NULL;
+PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV = NULL;
+PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV = NULL;
+
+PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV = NULL;
+PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV = NULL;
+PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV = NULL;
+
+PFNGLCOPYPATHNVPROC __glewCopyPathNV = NULL;
+PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV = NULL;
+PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV = NULL;
+PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV = NULL;
+PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV = NULL;
+PFNGLDELETEPATHSNVPROC __glewDeletePathsNV = NULL;
+PFNGLGENPATHSNVPROC __glewGenPathsNV = NULL;
+PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV = NULL;
+PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV = NULL;
+PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV = NULL;
+PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV = NULL;
+PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV = NULL;
+PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV = NULL;
+PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV = NULL;
+PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV = NULL;
+PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV = NULL;
+PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV = NULL;
+PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV = NULL;
+PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV = NULL;
+PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV = NULL;
+PFNGLGETPROGRAMRESOURCEFVNVPROC __glewGetProgramResourcefvNV = NULL;
+PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV = NULL;
+PFNGLISPATHNVPROC __glewIsPathNV = NULL;
+PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV = NULL;
+PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV = NULL;
+PFNGLMATRIXLOAD3X2FNVPROC __glewMatrixLoad3x2fNV = NULL;
+PFNGLMATRIXLOAD3X3FNVPROC __glewMatrixLoad3x3fNV = NULL;
+PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC __glewMatrixLoadTranspose3x3fNV = NULL;
+PFNGLMATRIXMULT3X2FNVPROC __glewMatrixMult3x2fNV = NULL;
+PFNGLMATRIXMULT3X3FNVPROC __glewMatrixMult3x3fNV = NULL;
+PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC __glewMatrixMultTranspose3x3fNV = NULL;
+PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV = NULL;
+PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV = NULL;
+PFNGLPATHCOORDSNVPROC __glewPathCoordsNV = NULL;
+PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV = NULL;
+PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV = NULL;
+PFNGLPATHFOGGENNVPROC __glewPathFogGenNV = NULL;
+PFNGLPATHGLYPHINDEXARRAYNVPROC __glewPathGlyphIndexArrayNV = NULL;
+PFNGLPATHGLYPHINDEXRANGENVPROC __glewPathGlyphIndexRangeNV = NULL;
+PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV = NULL;
+PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV = NULL;
+PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC __glewPathMemoryGlyphIndexArrayNV = NULL;
+PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV = NULL;
+PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV = NULL;
+PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV = NULL;
+PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV = NULL;
+PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV = NULL;
+PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV = NULL;
+PFNGLPATHSTRINGNVPROC __glewPathStringNV = NULL;
+PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV = NULL;
+PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV = NULL;
+PFNGLPATHTEXGENNVPROC __glewPathTexGenNV = NULL;
+PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV = NULL;
+PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC __glewProgramPathFragmentInputGenNV = NULL;
+PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV = NULL;
+PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV = NULL;
+PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV = NULL;
+PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV = NULL;
+PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC __glewStencilThenCoverFillPathInstancedNV = NULL;
+PFNGLSTENCILTHENCOVERFILLPATHNVPROC __glewStencilThenCoverFillPathNV = NULL;
+PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC __glewStencilThenCoverStrokePathInstancedNV = NULL;
+PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC __glewStencilThenCoverStrokePathNV = NULL;
+PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV = NULL;
+PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV = NULL;
+
+PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV = NULL;
+PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV = NULL;
+
+PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV = NULL;
+PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV = NULL;
+
+PFNGLPOLYGONMODENVPROC __glewPolygonModeNV = NULL;
+
+PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV = NULL;
+PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV = NULL;
+PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV = NULL;
+PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV = NULL;
+PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV = NULL;
+PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV = NULL;
+
+PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL;
+PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL;
+
+PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV = NULL;
+PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV = NULL;
+PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV = NULL;
+PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV = NULL;
+PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV = NULL;
+PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV = NULL;
+PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV = NULL;
+PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV = NULL;
+PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV = NULL;
+PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV = NULL;
+PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV = NULL;
+PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV = NULL;
+PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV = NULL;
+
+PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV = NULL;
+PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV = NULL;
+
+PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewFramebufferSampleLocationsfvNV = NULL;
+PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewNamedFramebufferSampleLocationsfvNV = NULL;
+
+PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV = NULL;
+PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV = NULL;
+PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV = NULL;
+PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV = NULL;
+PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV = NULL;
+PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV = NULL;
+PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV = NULL;
+PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV = NULL;
+PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV = NULL;
+PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV = NULL;
+PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV = NULL;
+PFNGLUNIFORMUI64NVPROC __glewUniformui64NV = NULL;
+PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV = NULL;
+
+PFNGLCOMPRESSEDTEXIMAGE3DNVPROC __glewCompressedTexImage3DNV = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DNVPROC __glewCompressedTexSubImage3DNV = NULL;
+PFNGLCOPYTEXSUBIMAGE3DNVPROC __glewCopyTexSubImage3DNV = NULL;
+PFNGLFRAMEBUFFERTEXTURELAYERNVPROC __glewFramebufferTextureLayerNV = NULL;
+PFNGLTEXIMAGE3DNVPROC __glewTexImage3DNV = NULL;
+PFNGLTEXSUBIMAGE3DNVPROC __glewTexSubImage3DNV = NULL;
+
+PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV = NULL;
+
+PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV = NULL;
+PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV = NULL;
+PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV = NULL;
+PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV = NULL;
+PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV = NULL;
+PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV = NULL;
+
+PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV = NULL;
+PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV = NULL;
+PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV = NULL;
+PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV = NULL;
+PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV = NULL;
+PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV = NULL;
+PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV = NULL;
+PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV = NULL;
+PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV = NULL;
+PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV = NULL;
+PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV = NULL;
+
+PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV = NULL;
+PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV = NULL;
+PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV = NULL;
+PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV = NULL;
+PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV = NULL;
+PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV = NULL;
+PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV = NULL;
+
+PFNGLVDPAUFININVPROC __glewVDPAUFiniNV = NULL;
+PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV = NULL;
+PFNGLVDPAUINITNVPROC __glewVDPAUInitNV = NULL;
+PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV = NULL;
+PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV = NULL;
+PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV = NULL;
+PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV = NULL;
+PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV = NULL;
+PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV = NULL;
+PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV = NULL;
+
+PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV = NULL;
+PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV = NULL;
+
+PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV = NULL;
+PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV = NULL;
+PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV = NULL;
+PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV = NULL;
+PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV = NULL;
+PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV = NULL;
+PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV = NULL;
+PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV = NULL;
+PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV = NULL;
+PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV = NULL;
+PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV = NULL;
+PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV = NULL;
+PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV = NULL;
+PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV = NULL;
+PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV = NULL;
+PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV = NULL;
+PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV = NULL;
+PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV = NULL;
+PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV = NULL;
+
+PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV = NULL;
+PFNGLCOLORFORMATNVPROC __glewColorFormatNV = NULL;
+PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV = NULL;
+PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV = NULL;
+PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV = NULL;
+PFNGLINDEXFORMATNVPROC __glewIndexFormatNV = NULL;
+PFNGLNORMALFORMATNVPROC __glewNormalFormatNV = NULL;
+PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV = NULL;
+PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV = NULL;
+PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV = NULL;
+PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV = NULL;
+PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV = NULL;
+
+PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV = NULL;
+PFNGLBINDPROGRAMNVPROC __glewBindProgramNV = NULL;
+PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV = NULL;
+PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV = NULL;
+PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV = NULL;
+PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV = NULL;
+PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV = NULL;
+PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV = NULL;
+PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV = NULL;
+PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV = NULL;
+PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV = NULL;
+PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV = NULL;
+PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV = NULL;
+PFNGLISPROGRAMNVPROC __glewIsProgramNV = NULL;
+PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV = NULL;
+PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV = NULL;
+PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV = NULL;
+PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV = NULL;
+PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV = NULL;
+PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV = NULL;
+PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV = NULL;
+PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV = NULL;
+PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV = NULL;
+PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV = NULL;
+PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV = NULL;
+PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV = NULL;
+PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV = NULL;
+PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV = NULL;
+PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV = NULL;
+PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV = NULL;
+PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV = NULL;
+PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV = NULL;
+PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV = NULL;
+PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV = NULL;
+PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV = NULL;
+PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV = NULL;
+PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV = NULL;
+PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV = NULL;
+PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV = NULL;
+PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV = NULL;
+PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV = NULL;
+PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV = NULL;
+PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV = NULL;
+PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV = NULL;
+PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV = NULL;
+PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV = NULL;
+PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV = NULL;
+PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV = NULL;
+PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV = NULL;
+PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV = NULL;
+PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV = NULL;
+PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV = NULL;
+PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV = NULL;
+PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV = NULL;
+PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV = NULL;
+PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV = NULL;
+PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV = NULL;
+PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV = NULL;
+PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV = NULL;
+PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV = NULL;
+PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV = NULL;
+PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV = NULL;
+PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV = NULL;
+
+PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV = NULL;
+PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV = NULL;
+PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV = NULL;
+PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV = NULL;
+PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV = NULL;
+PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV = NULL;
+PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV = NULL;
+PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV = NULL;
+PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV = NULL;
+PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV = NULL;
+PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV = NULL;
+PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV = NULL;
+
+PFNGLDEPTHRANGEARRAYFVNVPROC __glewDepthRangeArrayfvNV = NULL;
+PFNGLDEPTHRANGEINDEXEDFNVPROC __glewDepthRangeIndexedfNV = NULL;
+PFNGLDISABLEINVPROC __glewDisableiNV = NULL;
+PFNGLENABLEINVPROC __glewEnableiNV = NULL;
+PFNGLGETFLOATI_VNVPROC __glewGetFloati_vNV = NULL;
+PFNGLISENABLEDINVPROC __glewIsEnablediNV = NULL;
+PFNGLSCISSORARRAYVNVPROC __glewScissorArrayvNV = NULL;
+PFNGLSCISSORINDEXEDNVPROC __glewScissorIndexedNV = NULL;
+PFNGLSCISSORINDEXEDVNVPROC __glewScissorIndexedvNV = NULL;
+PFNGLVIEWPORTARRAYVNVPROC __glewViewportArrayvNV = NULL;
+PFNGLVIEWPORTINDEXEDFNVPROC __glewViewportIndexedfNV = NULL;
+PFNGLVIEWPORTINDEXEDFVNVPROC __glewViewportIndexedfvNV = NULL;
+
+PFNGLVIEWPORTSWIZZLENVPROC __glewViewportSwizzleNV = NULL;
+
+PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __glewFramebufferTextureMultiviewOVR = NULL;
+
+PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __glewFramebufferTextureMultisampleMultiviewOVR = NULL;
+
+PFNGLALPHAFUNCQCOMPROC __glewAlphaFuncQCOM = NULL;
+
+PFNGLDISABLEDRIVERCONTROLQCOMPROC __glewDisableDriverControlQCOM = NULL;
+PFNGLENABLEDRIVERCONTROLQCOMPROC __glewEnableDriverControlQCOM = NULL;
+PFNGLGETDRIVERCONTROLSTRINGQCOMPROC __glewGetDriverControlStringQCOM = NULL;
+PFNGLGETDRIVERCONTROLSQCOMPROC __glewGetDriverControlsQCOM = NULL;
+
+PFNGLEXTGETBUFFERPOINTERVQCOMPROC __glewExtGetBufferPointervQCOM = NULL;
+PFNGLEXTGETBUFFERSQCOMPROC __glewExtGetBuffersQCOM = NULL;
+PFNGLEXTGETFRAMEBUFFERSQCOMPROC __glewExtGetFramebuffersQCOM = NULL;
+PFNGLEXTGETRENDERBUFFERSQCOMPROC __glewExtGetRenderbuffersQCOM = NULL;
+PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC __glewExtGetTexLevelParameterivQCOM = NULL;
+PFNGLEXTGETTEXSUBIMAGEQCOMPROC __glewExtGetTexSubImageQCOM = NULL;
+PFNGLEXTGETTEXTURESQCOMPROC __glewExtGetTexturesQCOM = NULL;
+PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC __glewExtTexObjectStateOverrideiQCOM = NULL;
+
+PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC __glewExtGetProgramBinarySourceQCOM = NULL;
+PFNGLEXTGETPROGRAMSQCOMPROC __glewExtGetProgramsQCOM = NULL;
+PFNGLEXTGETSHADERSQCOMPROC __glewExtGetShadersQCOM = NULL;
+PFNGLEXTISPROGRAMBINARYQCOMPROC __glewExtIsProgramBinaryQCOM = NULL;
+
+PFNGLFRAMEBUFFERFOVEATIONCONFIGQCOMPROC __glewFramebufferFoveationConfigQCOM = NULL;
+PFNGLFRAMEBUFFERFOVEATIONPARAMETERSQCOMPROC __glewFramebufferFoveationParametersQCOM = NULL;
+
+PFNGLFRAMEBUFFERFETCHBARRIERQCOMPROC __glewFramebufferFetchBarrierQCOM = NULL;
+
+PFNGLENDTILINGQCOMPROC __glewEndTilingQCOM = NULL;
+PFNGLSTARTTILINGQCOMPROC __glewStartTilingQCOM = NULL;
+
+PFNGLALPHAFUNCXPROC __glewAlphaFuncx = NULL;
+PFNGLCLEARCOLORXPROC __glewClearColorx = NULL;
+PFNGLCLEARDEPTHXPROC __glewClearDepthx = NULL;
+PFNGLCOLOR4XPROC __glewColor4x = NULL;
+PFNGLDEPTHRANGEXPROC __glewDepthRangex = NULL;
+PFNGLFOGXPROC __glewFogx = NULL;
+PFNGLFOGXVPROC __glewFogxv = NULL;
+PFNGLFRUSTUMFPROC __glewFrustumf = NULL;
+PFNGLFRUSTUMXPROC __glewFrustumx = NULL;
+PFNGLLIGHTMODELXPROC __glewLightModelx = NULL;
+PFNGLLIGHTMODELXVPROC __glewLightModelxv = NULL;
+PFNGLLIGHTXPROC __glewLightx = NULL;
+PFNGLLIGHTXVPROC __glewLightxv = NULL;
+PFNGLLINEWIDTHXPROC __glewLineWidthx = NULL;
+PFNGLLOADMATRIXXPROC __glewLoadMatrixx = NULL;
+PFNGLMATERIALXPROC __glewMaterialx = NULL;
+PFNGLMATERIALXVPROC __glewMaterialxv = NULL;
+PFNGLMULTMATRIXXPROC __glewMultMatrixx = NULL;
+PFNGLMULTITEXCOORD4XPROC __glewMultiTexCoord4x = NULL;
+PFNGLNORMAL3XPROC __glewNormal3x = NULL;
+PFNGLORTHOFPROC __glewOrthof = NULL;
+PFNGLORTHOXPROC __glewOrthox = NULL;
+PFNGLPOINTSIZEXPROC __glewPointSizex = NULL;
+PFNGLPOLYGONOFFSETXPROC __glewPolygonOffsetx = NULL;
+PFNGLROTATEXPROC __glewRotatex = NULL;
+PFNGLSAMPLECOVERAGEXPROC __glewSampleCoveragex = NULL;
+PFNGLSCALEXPROC __glewScalex = NULL;
+PFNGLTEXENVXPROC __glewTexEnvx = NULL;
+PFNGLTEXENVXVPROC __glewTexEnvxv = NULL;
+PFNGLTEXPARAMETERXPROC __glewTexParameterx = NULL;
+PFNGLTRANSLATEXPROC __glewTranslatex = NULL;
+
+PFNGLCLIPPLANEFPROC __glewClipPlanef = NULL;
+PFNGLCLIPPLANEXPROC __glewClipPlanex = NULL;
+PFNGLGETCLIPPLANEFPROC __glewGetClipPlanef = NULL;
+PFNGLGETCLIPPLANEXPROC __glewGetClipPlanex = NULL;
+PFNGLGETFIXEDVPROC __glewGetFixedv = NULL;
+PFNGLGETLIGHTXVPROC __glewGetLightxv = NULL;
+PFNGLGETMATERIALXVPROC __glewGetMaterialxv = NULL;
+PFNGLGETTEXENVXVPROC __glewGetTexEnvxv = NULL;
+PFNGLGETTEXPARAMETERXVPROC __glewGetTexParameterxv = NULL;
+PFNGLPOINTPARAMETERXPROC __glewPointParameterx = NULL;
+PFNGLPOINTPARAMETERXVPROC __glewPointParameterxv = NULL;
+PFNGLPOINTSIZEPOINTEROESPROC __glewPointSizePointerOES = NULL;
+PFNGLTEXPARAMETERXVPROC __glewTexParameterxv = NULL;
+
+PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL = NULL;
+
+PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL = NULL;
+PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL = NULL;
+
+PFNGLLOGMESSAGECALLBACKREGALPROC __glewLogMessageCallbackREGAL = NULL;
+
+PFNGLGETPROCADDRESSREGALPROC __glewGetProcAddressREGAL = NULL;
+
+PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS = NULL;
+PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS = NULL;
+
+PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS = NULL;
+PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS = NULL;
+
+PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS = NULL;
+PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS = NULL;
+
+PFNGLINTERLEAVEDTEXTURECOORDSETSSGISPROC __glewInterleavedTextureCoordSetsSGIS = NULL;
+PFNGLSELECTTEXTURECOORDSETSGISPROC __glewSelectTextureCoordSetSGIS = NULL;
+PFNGLSELECTTEXTURESGISPROC __glewSelectTextureSGIS = NULL;
+PFNGLSELECTTEXTURETRANSFORMSGISPROC __glewSelectTextureTransformSGIS = NULL;
+
+PFNGLMULTISAMPLESUBRECTPOSSGISPROC __glewMultisampleSubRectPosSGIS = NULL;
+
+PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS = NULL;
+PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS = NULL;
+
+PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS = NULL;
+PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS = NULL;
+
+PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS = NULL;
+PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS = NULL;
+
+PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX = NULL;
+PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX = NULL;
+PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX = NULL;
+PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX = NULL;
+PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX = NULL;
+PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX = NULL;
+
+PFNGLADDRESSSPACEPROC __glewAddressSpace = NULL;
+PFNGLDATAPIPEPROC __glewDataPipe = NULL;
+
+PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX = NULL;
+
+PFNGLFOGLAYERSSGIXPROC __glewFogLayersSGIX = NULL;
+PFNGLGETFOGLAYERSSGIXPROC __glewGetFogLayersSGIX = NULL;
+
+PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX = NULL;
+
+PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX = NULL;
+PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX = NULL;
+PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX = NULL;
+PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX = NULL;
+PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX = NULL;
+PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX = NULL;
+PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX = NULL;
+PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX = NULL;
+PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX = NULL;
+PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX = NULL;
+PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX = NULL;
+PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX = NULL;
+PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX = NULL;
+
+PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX = NULL;
+
+PFNGLIGLOOINTERFACESGIXPROC __glewIglooInterfaceSGIX = NULL;
+
+PFNGLALLOCMPEGPREDICTORSSGIXPROC __glewAllocMPEGPredictorsSGIX = NULL;
+PFNGLDELETEMPEGPREDICTORSSGIXPROC __glewDeleteMPEGPredictorsSGIX = NULL;
+PFNGLGENMPEGPREDICTORSSGIXPROC __glewGenMPEGPredictorsSGIX = NULL;
+PFNGLGETMPEGPARAMETERFVSGIXPROC __glewGetMPEGParameterfvSGIX = NULL;
+PFNGLGETMPEGPARAMETERIVSGIXPROC __glewGetMPEGParameterivSGIX = NULL;
+PFNGLGETMPEGPREDICTORSGIXPROC __glewGetMPEGPredictorSGIX = NULL;
+PFNGLGETMPEGQUANTTABLEUBVPROC __glewGetMPEGQuantTableubv = NULL;
+PFNGLISMPEGPREDICTORSGIXPROC __glewIsMPEGPredictorSGIX = NULL;
+PFNGLMPEGPREDICTORSGIXPROC __glewMPEGPredictorSGIX = NULL;
+PFNGLMPEGQUANTTABLEUBVPROC __glewMPEGQuantTableubv = NULL;
+PFNGLSWAPMPEGPREDICTORSSGIXPROC __glewSwapMPEGPredictorsSGIX = NULL;
+
+PFNGLGETNONLINLIGHTFVSGIXPROC __glewGetNonlinLightfvSGIX = NULL;
+PFNGLGETNONLINMATERIALFVSGIXPROC __glewGetNonlinMaterialfvSGIX = NULL;
+PFNGLNONLINLIGHTFVSGIXPROC __glewNonlinLightfvSGIX = NULL;
+PFNGLNONLINMATERIALFVSGIXPROC __glewNonlinMaterialfvSGIX = NULL;
+
+PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX = NULL;
+
+PFNGLDEFORMSGIXPROC __glewDeformSGIX = NULL;
+PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC __glewLoadIdentityDeformationMapSGIX = NULL;
+
+PFNGLMESHBREADTHSGIXPROC __glewMeshBreadthSGIX = NULL;
+PFNGLMESHSTRIDESGIXPROC __glewMeshStrideSGIX = NULL;
+
+PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX = NULL;
+
+PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX = NULL;
+PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX = NULL;
+PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX = NULL;
+PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX = NULL;
+
+PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX = NULL;
+
+PFNGLGETVECTOROPERATIONSGIXPROC __glewGetVectorOperationSGIX = NULL;
+PFNGLVECTOROPERATIONSGIXPROC __glewVectorOperationSGIX = NULL;
+
+PFNGLAREVERTEXARRAYSRESIDENTSGIXPROC __glewAreVertexArraysResidentSGIX = NULL;
+PFNGLBINDVERTEXARRAYSGIXPROC __glewBindVertexArraySGIX = NULL;
+PFNGLDELETEVERTEXARRAYSSGIXPROC __glewDeleteVertexArraysSGIX = NULL;
+PFNGLGENVERTEXARRAYSSGIXPROC __glewGenVertexArraysSGIX = NULL;
+PFNGLISVERTEXARRAYSGIXPROC __glewIsVertexArraySGIX = NULL;
+PFNGLPRIORITIZEVERTEXARRAYSSGIXPROC __glewPrioritizeVertexArraysSGIX = NULL;
+
+PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI = NULL;
+PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI = NULL;
+PFNGLCOLORTABLESGIPROC __glewColorTableSGI = NULL;
+PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI = NULL;
+PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI = NULL;
+
+PFNGLGETPIXELTRANSFORMPARAMETERFVSGIPROC __glewGetPixelTransformParameterfvSGI = NULL;
+PFNGLGETPIXELTRANSFORMPARAMETERIVSGIPROC __glewGetPixelTransformParameterivSGI = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFSGIPROC __glewPixelTransformParameterfSGI = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFVSGIPROC __glewPixelTransformParameterfvSGI = NULL;
+PFNGLPIXELTRANSFORMPARAMETERISGIPROC __glewPixelTransformParameteriSGI = NULL;
+PFNGLPIXELTRANSFORMPARAMETERIVSGIPROC __glewPixelTransformParameterivSGI = NULL;
+PFNGLPIXELTRANSFORMSGIPROC __glewPixelTransformSGI = NULL;
+
+PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX = NULL;
+
+PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN = NULL;
+PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN = NULL;
+PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN = NULL;
+PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN = NULL;
+PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN = NULL;
+PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN = NULL;
+PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN = NULL;
+PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN = NULL;
+
+PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN = NULL;
+
+PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN = NULL;
+PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN = NULL;
+PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN = NULL;
+PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN = NULL;
+PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN = NULL;
+PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN = NULL;
+PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN = NULL;
+
+PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN = NULL;
+PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN = NULL;
+PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN = NULL;
+PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN = NULL;
+PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN = NULL;
+PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN = NULL;
+PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN = NULL;
+PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN = NULL;
+PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN = NULL;
+PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN = NULL;
+PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN = NULL;
+PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN = NULL;
+PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL;
+
+PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL;
+
+GLboolean __GLEW_VERSION_1_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_2 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_2_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_3 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_4 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_5 = GL_FALSE;
+GLboolean __GLEW_VERSION_2_0 = GL_FALSE;
+GLboolean __GLEW_VERSION_2_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_3_0 = GL_FALSE;
+GLboolean __GLEW_VERSION_3_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_3_2 = GL_FALSE;
+GLboolean __GLEW_VERSION_3_3 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_0 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_2 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_3 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_4 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_5 = GL_FALSE;
+GLboolean __GLEW_VERSION_4_6 = GL_FALSE;
+GLboolean __GLEW_3DFX_multisample = GL_FALSE;
+GLboolean __GLEW_3DFX_tbuffer = GL_FALSE;
+GLboolean __GLEW_3DFX_texture_compression_FXT1 = GL_FALSE;
+GLboolean __GLEW_AMD_blend_minmax_factor = GL_FALSE;
+GLboolean __GLEW_AMD_compressed_3DC_texture = GL_FALSE;
+GLboolean __GLEW_AMD_compressed_ATC_texture = GL_FALSE;
+GLboolean __GLEW_AMD_conservative_depth = GL_FALSE;
+GLboolean __GLEW_AMD_debug_output = GL_FALSE;
+GLboolean __GLEW_AMD_depth_clamp_separate = GL_FALSE;
+GLboolean __GLEW_AMD_draw_buffers_blend = GL_FALSE;
+GLboolean __GLEW_AMD_framebuffer_sample_positions = GL_FALSE;
+GLboolean __GLEW_AMD_gcn_shader = GL_FALSE;
+GLboolean __GLEW_AMD_gpu_shader_half_float = GL_FALSE;
+GLboolean __GLEW_AMD_gpu_shader_int16 = GL_FALSE;
+GLboolean __GLEW_AMD_gpu_shader_int64 = GL_FALSE;
+GLboolean __GLEW_AMD_interleaved_elements = GL_FALSE;
+GLboolean __GLEW_AMD_multi_draw_indirect = GL_FALSE;
+GLboolean __GLEW_AMD_name_gen_delete = GL_FALSE;
+GLboolean __GLEW_AMD_occlusion_query_event = GL_FALSE;
+GLboolean __GLEW_AMD_performance_monitor = GL_FALSE;
+GLboolean __GLEW_AMD_pinned_memory = GL_FALSE;
+GLboolean __GLEW_AMD_program_binary_Z400 = GL_FALSE;
+GLboolean __GLEW_AMD_query_buffer_object = GL_FALSE;
+GLboolean __GLEW_AMD_sample_positions = GL_FALSE;
+GLboolean __GLEW_AMD_seamless_cubemap_per_texture = GL_FALSE;
+GLboolean __GLEW_AMD_shader_atomic_counter_ops = GL_FALSE;
+GLboolean __GLEW_AMD_shader_ballot = GL_FALSE;
+GLboolean __GLEW_AMD_shader_explicit_vertex_parameter = GL_FALSE;
+GLboolean __GLEW_AMD_shader_stencil_export = GL_FALSE;
+GLboolean __GLEW_AMD_shader_stencil_value_export = GL_FALSE;
+GLboolean __GLEW_AMD_shader_trinary_minmax = GL_FALSE;
+GLboolean __GLEW_AMD_sparse_texture = GL_FALSE;
+GLboolean __GLEW_AMD_stencil_operation_extended = GL_FALSE;
+GLboolean __GLEW_AMD_texture_gather_bias_lod = GL_FALSE;
+GLboolean __GLEW_AMD_texture_texture4 = GL_FALSE;
+GLboolean __GLEW_AMD_transform_feedback3_lines_triangles = GL_FALSE;
+GLboolean __GLEW_AMD_transform_feedback4 = GL_FALSE;
+GLboolean __GLEW_AMD_vertex_shader_layer = GL_FALSE;
+GLboolean __GLEW_AMD_vertex_shader_tessellator = GL_FALSE;
+GLboolean __GLEW_AMD_vertex_shader_viewport_index = GL_FALSE;
+GLboolean __GLEW_ANDROID_extension_pack_es31a = GL_FALSE;
+GLboolean __GLEW_ANGLE_depth_texture = GL_FALSE;
+GLboolean __GLEW_ANGLE_framebuffer_blit = GL_FALSE;
+GLboolean __GLEW_ANGLE_framebuffer_multisample = GL_FALSE;
+GLboolean __GLEW_ANGLE_instanced_arrays = GL_FALSE;
+GLboolean __GLEW_ANGLE_pack_reverse_row_order = GL_FALSE;
+GLboolean __GLEW_ANGLE_program_binary = GL_FALSE;
+GLboolean __GLEW_ANGLE_texture_compression_dxt1 = GL_FALSE;
+GLboolean __GLEW_ANGLE_texture_compression_dxt3 = GL_FALSE;
+GLboolean __GLEW_ANGLE_texture_compression_dxt5 = GL_FALSE;
+GLboolean __GLEW_ANGLE_texture_usage = GL_FALSE;
+GLboolean __GLEW_ANGLE_timer_query = GL_FALSE;
+GLboolean __GLEW_ANGLE_translated_shader_source = GL_FALSE;
+GLboolean __GLEW_APPLE_aux_depth_stencil = GL_FALSE;
+GLboolean __GLEW_APPLE_client_storage = GL_FALSE;
+GLboolean __GLEW_APPLE_clip_distance = GL_FALSE;
+GLboolean __GLEW_APPLE_color_buffer_packed_float = GL_FALSE;
+GLboolean __GLEW_APPLE_copy_texture_levels = GL_FALSE;
+GLboolean __GLEW_APPLE_element_array = GL_FALSE;
+GLboolean __GLEW_APPLE_fence = GL_FALSE;
+GLboolean __GLEW_APPLE_float_pixels = GL_FALSE;
+GLboolean __GLEW_APPLE_flush_buffer_range = GL_FALSE;
+GLboolean __GLEW_APPLE_framebuffer_multisample = GL_FALSE;
+GLboolean __GLEW_APPLE_object_purgeable = GL_FALSE;
+GLboolean __GLEW_APPLE_pixel_buffer = GL_FALSE;
+GLboolean __GLEW_APPLE_rgb_422 = GL_FALSE;
+GLboolean __GLEW_APPLE_row_bytes = GL_FALSE;
+GLboolean __GLEW_APPLE_specular_vector = GL_FALSE;
+GLboolean __GLEW_APPLE_sync = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_2D_limited_npot = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_format_BGRA8888 = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_max_level = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_packed_float = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_range = GL_FALSE;
+GLboolean __GLEW_APPLE_transform_hint = GL_FALSE;
+GLboolean __GLEW_APPLE_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_APPLE_vertex_array_range = GL_FALSE;
+GLboolean __GLEW_APPLE_vertex_program_evaluators = GL_FALSE;
+GLboolean __GLEW_APPLE_ycbcr_422 = GL_FALSE;
+GLboolean __GLEW_ARB_ES2_compatibility = GL_FALSE;
+GLboolean __GLEW_ARB_ES3_1_compatibility = GL_FALSE;
+GLboolean __GLEW_ARB_ES3_2_compatibility = GL_FALSE;
+GLboolean __GLEW_ARB_ES3_compatibility = GL_FALSE;
+GLboolean __GLEW_ARB_arrays_of_arrays = GL_FALSE;
+GLboolean __GLEW_ARB_base_instance = GL_FALSE;
+GLboolean __GLEW_ARB_bindless_texture = GL_FALSE;
+GLboolean __GLEW_ARB_blend_func_extended = GL_FALSE;
+GLboolean __GLEW_ARB_buffer_storage = GL_FALSE;
+GLboolean __GLEW_ARB_cl_event = GL_FALSE;
+GLboolean __GLEW_ARB_clear_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_clear_texture = GL_FALSE;
+GLboolean __GLEW_ARB_clip_control = GL_FALSE;
+GLboolean __GLEW_ARB_color_buffer_float = GL_FALSE;
+GLboolean __GLEW_ARB_compatibility = GL_FALSE;
+GLboolean __GLEW_ARB_compressed_texture_pixel_storage = GL_FALSE;
+GLboolean __GLEW_ARB_compute_shader = GL_FALSE;
+GLboolean __GLEW_ARB_compute_variable_group_size = GL_FALSE;
+GLboolean __GLEW_ARB_conditional_render_inverted = GL_FALSE;
+GLboolean __GLEW_ARB_conservative_depth = GL_FALSE;
+GLboolean __GLEW_ARB_copy_buffer = GL_FALSE;
+GLboolean __GLEW_ARB_copy_image = GL_FALSE;
+GLboolean __GLEW_ARB_cull_distance = GL_FALSE;
+GLboolean __GLEW_ARB_debug_output = GL_FALSE;
+GLboolean __GLEW_ARB_depth_buffer_float = GL_FALSE;
+GLboolean __GLEW_ARB_depth_clamp = GL_FALSE;
+GLboolean __GLEW_ARB_depth_texture = GL_FALSE;
+GLboolean __GLEW_ARB_derivative_control = GL_FALSE;
+GLboolean __GLEW_ARB_direct_state_access = GL_FALSE;
+GLboolean __GLEW_ARB_draw_buffers = GL_FALSE;
+GLboolean __GLEW_ARB_draw_buffers_blend = GL_FALSE;
+GLboolean __GLEW_ARB_draw_elements_base_vertex = GL_FALSE;
+GLboolean __GLEW_ARB_draw_indirect = GL_FALSE;
+GLboolean __GLEW_ARB_draw_instanced = GL_FALSE;
+GLboolean __GLEW_ARB_enhanced_layouts = GL_FALSE;
+GLboolean __GLEW_ARB_explicit_attrib_location = GL_FALSE;
+GLboolean __GLEW_ARB_explicit_uniform_location = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_coord_conventions = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_layer_viewport = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_program = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_program_shadow = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_shader_interlock = GL_FALSE;
+GLboolean __GLEW_ARB_framebuffer_no_attachments = GL_FALSE;
+GLboolean __GLEW_ARB_framebuffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_framebuffer_sRGB = GL_FALSE;
+GLboolean __GLEW_ARB_geometry_shader4 = GL_FALSE;
+GLboolean __GLEW_ARB_get_program_binary = GL_FALSE;
+GLboolean __GLEW_ARB_get_texture_sub_image = GL_FALSE;
+GLboolean __GLEW_ARB_gl_spirv = GL_FALSE;
+GLboolean __GLEW_ARB_gpu_shader5 = GL_FALSE;
+GLboolean __GLEW_ARB_gpu_shader_fp64 = GL_FALSE;
+GLboolean __GLEW_ARB_gpu_shader_int64 = GL_FALSE;
+GLboolean __GLEW_ARB_half_float_pixel = GL_FALSE;
+GLboolean __GLEW_ARB_half_float_vertex = GL_FALSE;
+GLboolean __GLEW_ARB_imaging = GL_FALSE;
+GLboolean __GLEW_ARB_indirect_parameters = GL_FALSE;
+GLboolean __GLEW_ARB_instanced_arrays = GL_FALSE;
+GLboolean __GLEW_ARB_internalformat_query = GL_FALSE;
+GLboolean __GLEW_ARB_internalformat_query2 = GL_FALSE;
+GLboolean __GLEW_ARB_invalidate_subdata = GL_FALSE;
+GLboolean __GLEW_ARB_map_buffer_alignment = GL_FALSE;
+GLboolean __GLEW_ARB_map_buffer_range = GL_FALSE;
+GLboolean __GLEW_ARB_matrix_palette = GL_FALSE;
+GLboolean __GLEW_ARB_multi_bind = GL_FALSE;
+GLboolean __GLEW_ARB_multi_draw_indirect = GL_FALSE;
+GLboolean __GLEW_ARB_multisample = GL_FALSE;
+GLboolean __GLEW_ARB_multitexture = GL_FALSE;
+GLboolean __GLEW_ARB_occlusion_query = GL_FALSE;
+GLboolean __GLEW_ARB_occlusion_query2 = GL_FALSE;
+GLboolean __GLEW_ARB_parallel_shader_compile = GL_FALSE;
+GLboolean __GLEW_ARB_pipeline_statistics_query = GL_FALSE;
+GLboolean __GLEW_ARB_pixel_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_point_parameters = GL_FALSE;
+GLboolean __GLEW_ARB_point_sprite = GL_FALSE;
+GLboolean __GLEW_ARB_polygon_offset_clamp = GL_FALSE;
+GLboolean __GLEW_ARB_post_depth_coverage = GL_FALSE;
+GLboolean __GLEW_ARB_program_interface_query = GL_FALSE;
+GLboolean __GLEW_ARB_provoking_vertex = GL_FALSE;
+GLboolean __GLEW_ARB_query_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_robust_buffer_access_behavior = GL_FALSE;
+GLboolean __GLEW_ARB_robustness = GL_FALSE;
+GLboolean __GLEW_ARB_robustness_application_isolation = GL_FALSE;
+GLboolean __GLEW_ARB_robustness_share_group_isolation = GL_FALSE;
+GLboolean __GLEW_ARB_sample_locations = GL_FALSE;
+GLboolean __GLEW_ARB_sample_shading = GL_FALSE;
+GLboolean __GLEW_ARB_sampler_objects = GL_FALSE;
+GLboolean __GLEW_ARB_seamless_cube_map = GL_FALSE;
+GLboolean __GLEW_ARB_seamless_cubemap_per_texture = GL_FALSE;
+GLboolean __GLEW_ARB_separate_shader_objects = GL_FALSE;
+GLboolean __GLEW_ARB_shader_atomic_counter_ops = GL_FALSE;
+GLboolean __GLEW_ARB_shader_atomic_counters = GL_FALSE;
+GLboolean __GLEW_ARB_shader_ballot = GL_FALSE;
+GLboolean __GLEW_ARB_shader_bit_encoding = GL_FALSE;
+GLboolean __GLEW_ARB_shader_clock = GL_FALSE;
+GLboolean __GLEW_ARB_shader_draw_parameters = GL_FALSE;
+GLboolean __GLEW_ARB_shader_group_vote = GL_FALSE;
+GLboolean __GLEW_ARB_shader_image_load_store = GL_FALSE;
+GLboolean __GLEW_ARB_shader_image_size = GL_FALSE;
+GLboolean __GLEW_ARB_shader_objects = GL_FALSE;
+GLboolean __GLEW_ARB_shader_precision = GL_FALSE;
+GLboolean __GLEW_ARB_shader_stencil_export = GL_FALSE;
+GLboolean __GLEW_ARB_shader_storage_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_shader_subroutine = GL_FALSE;
+GLboolean __GLEW_ARB_shader_texture_image_samples = GL_FALSE;
+GLboolean __GLEW_ARB_shader_texture_lod = GL_FALSE;
+GLboolean __GLEW_ARB_shader_viewport_layer_array = GL_FALSE;
+GLboolean __GLEW_ARB_shading_language_100 = GL_FALSE;
+GLboolean __GLEW_ARB_shading_language_420pack = GL_FALSE;
+GLboolean __GLEW_ARB_shading_language_include = GL_FALSE;
+GLboolean __GLEW_ARB_shading_language_packing = GL_FALSE;
+GLboolean __GLEW_ARB_shadow = GL_FALSE;
+GLboolean __GLEW_ARB_shadow_ambient = GL_FALSE;
+GLboolean __GLEW_ARB_sparse_buffer = GL_FALSE;
+GLboolean __GLEW_ARB_sparse_texture = GL_FALSE;
+GLboolean __GLEW_ARB_sparse_texture2 = GL_FALSE;
+GLboolean __GLEW_ARB_sparse_texture_clamp = GL_FALSE;
+GLboolean __GLEW_ARB_spirv_extensions = GL_FALSE;
+GLboolean __GLEW_ARB_stencil_texturing = GL_FALSE;
+GLboolean __GLEW_ARB_sync = GL_FALSE;
+GLboolean __GLEW_ARB_tessellation_shader = GL_FALSE;
+GLboolean __GLEW_ARB_texture_barrier = GL_FALSE;
+GLboolean __GLEW_ARB_texture_border_clamp = GL_FALSE;
+GLboolean __GLEW_ARB_texture_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_texture_buffer_object_rgb32 = GL_FALSE;
+GLboolean __GLEW_ARB_texture_buffer_range = GL_FALSE;
+GLboolean __GLEW_ARB_texture_compression = GL_FALSE;
+GLboolean __GLEW_ARB_texture_compression_bptc = GL_FALSE;
+GLboolean __GLEW_ARB_texture_compression_rgtc = GL_FALSE;
+GLboolean __GLEW_ARB_texture_cube_map = GL_FALSE;
+GLboolean __GLEW_ARB_texture_cube_map_array = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_add = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_combine = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_crossbar = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_dot3 = GL_FALSE;
+GLboolean __GLEW_ARB_texture_filter_anisotropic = GL_FALSE;
+GLboolean __GLEW_ARB_texture_filter_minmax = GL_FALSE;
+GLboolean __GLEW_ARB_texture_float = GL_FALSE;
+GLboolean __GLEW_ARB_texture_gather = GL_FALSE;
+GLboolean __GLEW_ARB_texture_mirror_clamp_to_edge = GL_FALSE;
+GLboolean __GLEW_ARB_texture_mirrored_repeat = GL_FALSE;
+GLboolean __GLEW_ARB_texture_multisample = GL_FALSE;
+GLboolean __GLEW_ARB_texture_non_power_of_two = GL_FALSE;
+GLboolean __GLEW_ARB_texture_query_levels = GL_FALSE;
+GLboolean __GLEW_ARB_texture_query_lod = GL_FALSE;
+GLboolean __GLEW_ARB_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_ARB_texture_rg = GL_FALSE;
+GLboolean __GLEW_ARB_texture_rgb10_a2ui = GL_FALSE;
+GLboolean __GLEW_ARB_texture_stencil8 = GL_FALSE;
+GLboolean __GLEW_ARB_texture_storage = GL_FALSE;
+GLboolean __GLEW_ARB_texture_storage_multisample = GL_FALSE;
+GLboolean __GLEW_ARB_texture_swizzle = GL_FALSE;
+GLboolean __GLEW_ARB_texture_view = GL_FALSE;
+GLboolean __GLEW_ARB_timer_query = GL_FALSE;
+GLboolean __GLEW_ARB_transform_feedback2 = GL_FALSE;
+GLboolean __GLEW_ARB_transform_feedback3 = GL_FALSE;
+GLboolean __GLEW_ARB_transform_feedback_instanced = GL_FALSE;
+GLboolean __GLEW_ARB_transform_feedback_overflow_query = GL_FALSE;
+GLboolean __GLEW_ARB_transpose_matrix = GL_FALSE;
+GLboolean __GLEW_ARB_uniform_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_array_bgra = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_attrib_64bit = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_attrib_binding = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_blend = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_program = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_shader = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_type_10f_11f_11f_rev = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev = GL_FALSE;
+GLboolean __GLEW_ARB_viewport_array = GL_FALSE;
+GLboolean __GLEW_ARB_window_pos = GL_FALSE;
+GLboolean __GLEW_ARM_mali_program_binary = GL_FALSE;
+GLboolean __GLEW_ARM_mali_shader_binary = GL_FALSE;
+GLboolean __GLEW_ARM_rgba8 = GL_FALSE;
+GLboolean __GLEW_ARM_shader_framebuffer_fetch = GL_FALSE;
+GLboolean __GLEW_ARM_shader_framebuffer_fetch_depth_stencil = GL_FALSE;
+GLboolean __GLEW_ATIX_point_sprites = GL_FALSE;
+GLboolean __GLEW_ATIX_texture_env_combine3 = GL_FALSE;
+GLboolean __GLEW_ATIX_texture_env_route = GL_FALSE;
+GLboolean __GLEW_ATIX_vertex_shader_output_point_size = GL_FALSE;
+GLboolean __GLEW_ATI_draw_buffers = GL_FALSE;
+GLboolean __GLEW_ATI_element_array = GL_FALSE;
+GLboolean __GLEW_ATI_envmap_bumpmap = GL_FALSE;
+GLboolean __GLEW_ATI_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ATI_map_object_buffer = GL_FALSE;
+GLboolean __GLEW_ATI_meminfo = GL_FALSE;
+GLboolean __GLEW_ATI_pn_triangles = GL_FALSE;
+GLboolean __GLEW_ATI_separate_stencil = GL_FALSE;
+GLboolean __GLEW_ATI_shader_texture_lod = GL_FALSE;
+GLboolean __GLEW_ATI_text_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ATI_texture_compression_3dc = GL_FALSE;
+GLboolean __GLEW_ATI_texture_env_combine3 = GL_FALSE;
+GLboolean __GLEW_ATI_texture_float = GL_FALSE;
+GLboolean __GLEW_ATI_texture_mirror_once = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_attrib_array_object = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_streams = GL_FALSE;
+GLboolean __GLEW_EGL_KHR_context_flush_control = GL_FALSE;
+GLboolean __GLEW_EGL_NV_robustness_video_memory_purge = GL_FALSE;
+GLboolean __GLEW_EXT_422_pixels = GL_FALSE;
+GLboolean __GLEW_EXT_Cg_shader = GL_FALSE;
+GLboolean __GLEW_EXT_EGL_image_array = GL_FALSE;
+GLboolean __GLEW_EXT_YUV_target = GL_FALSE;
+GLboolean __GLEW_EXT_abgr = GL_FALSE;
+GLboolean __GLEW_EXT_base_instance = GL_FALSE;
+GLboolean __GLEW_EXT_bgra = GL_FALSE;
+GLboolean __GLEW_EXT_bindable_uniform = GL_FALSE;
+GLboolean __GLEW_EXT_blend_color = GL_FALSE;
+GLboolean __GLEW_EXT_blend_equation_separate = GL_FALSE;
+GLboolean __GLEW_EXT_blend_func_extended = GL_FALSE;
+GLboolean __GLEW_EXT_blend_func_separate = GL_FALSE;
+GLboolean __GLEW_EXT_blend_logic_op = GL_FALSE;
+GLboolean __GLEW_EXT_blend_minmax = GL_FALSE;
+GLboolean __GLEW_EXT_blend_subtract = GL_FALSE;
+GLboolean __GLEW_EXT_buffer_storage = GL_FALSE;
+GLboolean __GLEW_EXT_clear_texture = GL_FALSE;
+GLboolean __GLEW_EXT_clip_cull_distance = GL_FALSE;
+GLboolean __GLEW_EXT_clip_volume_hint = GL_FALSE;
+GLboolean __GLEW_EXT_cmyka = GL_FALSE;
+GLboolean __GLEW_EXT_color_buffer_float = GL_FALSE;
+GLboolean __GLEW_EXT_color_buffer_half_float = GL_FALSE;
+GLboolean __GLEW_EXT_color_subtable = GL_FALSE;
+GLboolean __GLEW_EXT_compiled_vertex_array = GL_FALSE;
+GLboolean __GLEW_EXT_compressed_ETC1_RGB8_sub_texture = GL_FALSE;
+GLboolean __GLEW_EXT_conservative_depth = GL_FALSE;
+GLboolean __GLEW_EXT_convolution = GL_FALSE;
+GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE;
+GLboolean __GLEW_EXT_copy_image = GL_FALSE;
+GLboolean __GLEW_EXT_copy_texture = GL_FALSE;
+GLboolean __GLEW_EXT_cull_vertex = GL_FALSE;
+GLboolean __GLEW_EXT_debug_label = GL_FALSE;
+GLboolean __GLEW_EXT_debug_marker = GL_FALSE;
+GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE;
+GLboolean __GLEW_EXT_direct_state_access = GL_FALSE;
+GLboolean __GLEW_EXT_discard_framebuffer = GL_FALSE;
+GLboolean __GLEW_EXT_draw_buffers = GL_FALSE;
+GLboolean __GLEW_EXT_draw_buffers2 = GL_FALSE;
+GLboolean __GLEW_EXT_draw_buffers_indexed = GL_FALSE;
+GLboolean __GLEW_EXT_draw_elements_base_vertex = GL_FALSE;
+GLboolean __GLEW_EXT_draw_instanced = GL_FALSE;
+GLboolean __GLEW_EXT_draw_range_elements = GL_FALSE;
+GLboolean __GLEW_EXT_external_buffer = GL_FALSE;
+GLboolean __GLEW_EXT_float_blend = GL_FALSE;
+GLboolean __GLEW_EXT_fog_coord = GL_FALSE;
+GLboolean __GLEW_EXT_frag_depth = GL_FALSE;
+GLboolean __GLEW_EXT_fragment_lighting = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_blit = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_multisample = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_object = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_sRGB = GL_FALSE;
+GLboolean __GLEW_EXT_geometry_point_size = GL_FALSE;
+GLboolean __GLEW_EXT_geometry_shader = GL_FALSE;
+GLboolean __GLEW_EXT_geometry_shader4 = GL_FALSE;
+GLboolean __GLEW_EXT_gpu_program_parameters = GL_FALSE;
+GLboolean __GLEW_EXT_gpu_shader4 = GL_FALSE;
+GLboolean __GLEW_EXT_gpu_shader5 = GL_FALSE;
+GLboolean __GLEW_EXT_histogram = GL_FALSE;
+GLboolean __GLEW_EXT_index_array_formats = GL_FALSE;
+GLboolean __GLEW_EXT_index_func = GL_FALSE;
+GLboolean __GLEW_EXT_index_material = GL_FALSE;
+GLboolean __GLEW_EXT_index_texture = GL_FALSE;
+GLboolean __GLEW_EXT_instanced_arrays = GL_FALSE;
+GLboolean __GLEW_EXT_light_texture = GL_FALSE;
+GLboolean __GLEW_EXT_map_buffer_range = GL_FALSE;
+GLboolean __GLEW_EXT_memory_object = GL_FALSE;
+GLboolean __GLEW_EXT_memory_object_fd = GL_FALSE;
+GLboolean __GLEW_EXT_memory_object_win32 = GL_FALSE;
+GLboolean __GLEW_EXT_misc_attribute = GL_FALSE;
+GLboolean __GLEW_EXT_multi_draw_arrays = GL_FALSE;
+GLboolean __GLEW_EXT_multi_draw_indirect = GL_FALSE;
+GLboolean __GLEW_EXT_multiple_textures = GL_FALSE;
+GLboolean __GLEW_EXT_multisample = GL_FALSE;
+GLboolean __GLEW_EXT_multisample_compatibility = GL_FALSE;
+GLboolean __GLEW_EXT_multisampled_render_to_texture = GL_FALSE;
+GLboolean __GLEW_EXT_multisampled_render_to_texture2 = GL_FALSE;
+GLboolean __GLEW_EXT_multiview_draw_buffers = GL_FALSE;
+GLboolean __GLEW_EXT_packed_depth_stencil = GL_FALSE;
+GLboolean __GLEW_EXT_packed_float = GL_FALSE;
+GLboolean __GLEW_EXT_packed_pixels = GL_FALSE;
+GLboolean __GLEW_EXT_paletted_texture = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_buffer_object = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_transform = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_transform_color_table = GL_FALSE;
+GLboolean __GLEW_EXT_point_parameters = GL_FALSE;
+GLboolean __GLEW_EXT_polygon_offset = GL_FALSE;
+GLboolean __GLEW_EXT_polygon_offset_clamp = GL_FALSE;
+GLboolean __GLEW_EXT_post_depth_coverage = GL_FALSE;
+GLboolean __GLEW_EXT_provoking_vertex = GL_FALSE;
+GLboolean __GLEW_EXT_pvrtc_sRGB = GL_FALSE;
+GLboolean __GLEW_EXT_raster_multisample = GL_FALSE;
+GLboolean __GLEW_EXT_read_format_bgra = GL_FALSE;
+GLboolean __GLEW_EXT_render_snorm = GL_FALSE;
+GLboolean __GLEW_EXT_rescale_normal = GL_FALSE;
+GLboolean __GLEW_EXT_sRGB = GL_FALSE;
+GLboolean __GLEW_EXT_sRGB_write_control = GL_FALSE;
+GLboolean __GLEW_EXT_scene_marker = GL_FALSE;
+GLboolean __GLEW_EXT_secondary_color = GL_FALSE;
+GLboolean __GLEW_EXT_semaphore = GL_FALSE;
+GLboolean __GLEW_EXT_semaphore_fd = GL_FALSE;
+GLboolean __GLEW_EXT_semaphore_win32 = GL_FALSE;
+GLboolean __GLEW_EXT_separate_shader_objects = GL_FALSE;
+GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE;
+GLboolean __GLEW_EXT_shader_framebuffer_fetch = GL_FALSE;
+GLboolean __GLEW_EXT_shader_group_vote = GL_FALSE;
+GLboolean __GLEW_EXT_shader_image_load_formatted = GL_FALSE;
+GLboolean __GLEW_EXT_shader_image_load_store = GL_FALSE;
+GLboolean __GLEW_EXT_shader_implicit_conversions = GL_FALSE;
+GLboolean __GLEW_EXT_shader_integer_mix = GL_FALSE;
+GLboolean __GLEW_EXT_shader_io_blocks = GL_FALSE;
+GLboolean __GLEW_EXT_shader_non_constant_global_initializers = GL_FALSE;
+GLboolean __GLEW_EXT_shader_pixel_local_storage = GL_FALSE;
+GLboolean __GLEW_EXT_shader_pixel_local_storage2 = GL_FALSE;
+GLboolean __GLEW_EXT_shader_texture_lod = GL_FALSE;
+GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE;
+GLboolean __GLEW_EXT_shadow_samplers = GL_FALSE;
+GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE;
+GLboolean __GLEW_EXT_sparse_texture = GL_FALSE;
+GLboolean __GLEW_EXT_sparse_texture2 = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_two_side = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_wrap = GL_FALSE;
+GLboolean __GLEW_EXT_subtexture = GL_FALSE;
+GLboolean __GLEW_EXT_texture = GL_FALSE;
+GLboolean __GLEW_EXT_texture3D = GL_FALSE;
+GLboolean __GLEW_EXT_texture_array = GL_FALSE;
+GLboolean __GLEW_EXT_texture_buffer_object = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_astc_decode_mode = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_bptc = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_dxt1 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_latc = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_rgtc = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_s3tc = GL_FALSE;
+GLboolean __GLEW_EXT_texture_cube_map = GL_FALSE;
+GLboolean __GLEW_EXT_texture_cube_map_array = GL_FALSE;
+GLboolean __GLEW_EXT_texture_edge_clamp = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_add = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_combine = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_dot3 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_filter_anisotropic = GL_FALSE;
+GLboolean __GLEW_EXT_texture_filter_minmax = GL_FALSE;
+GLboolean __GLEW_EXT_texture_format_BGRA8888 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_integer = GL_FALSE;
+GLboolean __GLEW_EXT_texture_lod_bias = GL_FALSE;
+GLboolean __GLEW_EXT_texture_mirror_clamp = GL_FALSE;
+GLboolean __GLEW_EXT_texture_norm16 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_object = GL_FALSE;
+GLboolean __GLEW_EXT_texture_perturb_normal = GL_FALSE;
+GLboolean __GLEW_EXT_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_EXT_texture_rg = GL_FALSE;
+GLboolean __GLEW_EXT_texture_sRGB = GL_FALSE;
+GLboolean __GLEW_EXT_texture_sRGB_R8 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_sRGB_RG8 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_sRGB_decode = GL_FALSE;
+GLboolean __GLEW_EXT_texture_shared_exponent = GL_FALSE;
+GLboolean __GLEW_EXT_texture_snorm = GL_FALSE;
+GLboolean __GLEW_EXT_texture_storage = GL_FALSE;
+GLboolean __GLEW_EXT_texture_swizzle = GL_FALSE;
+GLboolean __GLEW_EXT_texture_type_2_10_10_10_REV = GL_FALSE;
+GLboolean __GLEW_EXT_texture_view = GL_FALSE;
+GLboolean __GLEW_EXT_timer_query = GL_FALSE;
+GLboolean __GLEW_EXT_transform_feedback = GL_FALSE;
+GLboolean __GLEW_EXT_unpack_subimage = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_array = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_array_bgra = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_array_setXXX = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_attrib_64bit = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_shader = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE;
+GLboolean __GLEW_EXT_win32_keyed_mutex = GL_FALSE;
+GLboolean __GLEW_EXT_window_rectangles = GL_FALSE;
+GLboolean __GLEW_EXT_x11_sync_object = GL_FALSE;
+GLboolean __GLEW_GREMEDY_frame_terminator = GL_FALSE;
+GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE;
+GLboolean __GLEW_HP_convolution_border_modes = GL_FALSE;
+GLboolean __GLEW_HP_image_transform = GL_FALSE;
+GLboolean __GLEW_HP_occlusion_test = GL_FALSE;
+GLboolean __GLEW_HP_texture_lighting = GL_FALSE;
+GLboolean __GLEW_IBM_cull_vertex = GL_FALSE;
+GLboolean __GLEW_IBM_multimode_draw_arrays = GL_FALSE;
+GLboolean __GLEW_IBM_rasterpos_clip = GL_FALSE;
+GLboolean __GLEW_IBM_static_data = GL_FALSE;
+GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE;
+GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE;
+GLboolean __GLEW_INGR_color_clamp = GL_FALSE;
+GLboolean __GLEW_INGR_interlace_read = GL_FALSE;
+GLboolean __GLEW_INTEL_conservative_rasterization = GL_FALSE;
+GLboolean __GLEW_INTEL_fragment_shader_ordering = GL_FALSE;
+GLboolean __GLEW_INTEL_framebuffer_CMAA = GL_FALSE;
+GLboolean __GLEW_INTEL_map_texture = GL_FALSE;
+GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE;
+GLboolean __GLEW_INTEL_performance_query = GL_FALSE;
+GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE;
+GLboolean __GLEW_KHR_blend_equation_advanced = GL_FALSE;
+GLboolean __GLEW_KHR_blend_equation_advanced_coherent = GL_FALSE;
+GLboolean __GLEW_KHR_context_flush_control = GL_FALSE;
+GLboolean __GLEW_KHR_debug = GL_FALSE;
+GLboolean __GLEW_KHR_no_error = GL_FALSE;
+GLboolean __GLEW_KHR_parallel_shader_compile = GL_FALSE;
+GLboolean __GLEW_KHR_robust_buffer_access_behavior = GL_FALSE;
+GLboolean __GLEW_KHR_robustness = GL_FALSE;
+GLboolean __GLEW_KHR_texture_compression_astc_hdr = GL_FALSE;
+GLboolean __GLEW_KHR_texture_compression_astc_ldr = GL_FALSE;
+GLboolean __GLEW_KHR_texture_compression_astc_sliced_3d = GL_FALSE;
+GLboolean __GLEW_KTX_buffer_region = GL_FALSE;
+GLboolean __GLEW_MESAX_texture_stack = GL_FALSE;
+GLboolean __GLEW_MESA_pack_invert = GL_FALSE;
+GLboolean __GLEW_MESA_resize_buffers = GL_FALSE;
+GLboolean __GLEW_MESA_shader_integer_functions = GL_FALSE;
+GLboolean __GLEW_MESA_window_pos = GL_FALSE;
+GLboolean __GLEW_MESA_ycbcr_texture = GL_FALSE;
+GLboolean __GLEW_NVX_blend_equation_advanced_multi_draw_buffers = GL_FALSE;
+GLboolean __GLEW_NVX_conditional_render = GL_FALSE;
+GLboolean __GLEW_NVX_gpu_memory_info = GL_FALSE;
+GLboolean __GLEW_NVX_linked_gpu_multicast = GL_FALSE;
+GLboolean __GLEW_NV_3dvision_settings = GL_FALSE;
+GLboolean __GLEW_NV_EGL_stream_consumer_external = GL_FALSE;
+GLboolean __GLEW_NV_alpha_to_coverage_dither_control = GL_FALSE;
+GLboolean __GLEW_NV_bgr = GL_FALSE;
+GLboolean __GLEW_NV_bindless_multi_draw_indirect = GL_FALSE;
+GLboolean __GLEW_NV_bindless_multi_draw_indirect_count = GL_FALSE;
+GLboolean __GLEW_NV_bindless_texture = GL_FALSE;
+GLboolean __GLEW_NV_blend_equation_advanced = GL_FALSE;
+GLboolean __GLEW_NV_blend_equation_advanced_coherent = GL_FALSE;
+GLboolean __GLEW_NV_blend_minmax_factor = GL_FALSE;
+GLboolean __GLEW_NV_blend_square = GL_FALSE;
+GLboolean __GLEW_NV_clip_space_w_scaling = GL_FALSE;
+GLboolean __GLEW_NV_command_list = GL_FALSE;
+GLboolean __GLEW_NV_compute_program5 = GL_FALSE;
+GLboolean __GLEW_NV_conditional_render = GL_FALSE;
+GLboolean __GLEW_NV_conservative_raster = GL_FALSE;
+GLboolean __GLEW_NV_conservative_raster_dilate = GL_FALSE;
+GLboolean __GLEW_NV_conservative_raster_pre_snap_triangles = GL_FALSE;
+GLboolean __GLEW_NV_copy_buffer = GL_FALSE;
+GLboolean __GLEW_NV_copy_depth_to_color = GL_FALSE;
+GLboolean __GLEW_NV_copy_image = GL_FALSE;
+GLboolean __GLEW_NV_deep_texture3D = GL_FALSE;
+GLboolean __GLEW_NV_depth_buffer_float = GL_FALSE;
+GLboolean __GLEW_NV_depth_clamp = GL_FALSE;
+GLboolean __GLEW_NV_depth_range_unclamped = GL_FALSE;
+GLboolean __GLEW_NV_draw_buffers = GL_FALSE;
+GLboolean __GLEW_NV_draw_instanced = GL_FALSE;
+GLboolean __GLEW_NV_draw_texture = GL_FALSE;
+GLboolean __GLEW_NV_draw_vulkan_image = GL_FALSE;
+GLboolean __GLEW_NV_evaluators = GL_FALSE;
+GLboolean __GLEW_NV_explicit_attrib_location = GL_FALSE;
+GLboolean __GLEW_NV_explicit_multisample = GL_FALSE;
+GLboolean __GLEW_NV_fbo_color_attachments = GL_FALSE;
+GLboolean __GLEW_NV_fence = GL_FALSE;
+GLboolean __GLEW_NV_fill_rectangle = GL_FALSE;
+GLboolean __GLEW_NV_float_buffer = GL_FALSE;
+GLboolean __GLEW_NV_fog_distance = GL_FALSE;
+GLboolean __GLEW_NV_fragment_coverage_to_color = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program2 = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program4 = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program_option = GL_FALSE;
+GLboolean __GLEW_NV_fragment_shader_interlock = GL_FALSE;
+GLboolean __GLEW_NV_framebuffer_blit = GL_FALSE;
+GLboolean __GLEW_NV_framebuffer_mixed_samples = GL_FALSE;
+GLboolean __GLEW_NV_framebuffer_multisample = GL_FALSE;
+GLboolean __GLEW_NV_framebuffer_multisample_coverage = GL_FALSE;
+GLboolean __GLEW_NV_generate_mipmap_sRGB = GL_FALSE;
+GLboolean __GLEW_NV_geometry_program4 = GL_FALSE;
+GLboolean __GLEW_NV_geometry_shader4 = GL_FALSE;
+GLboolean __GLEW_NV_geometry_shader_passthrough = GL_FALSE;
+GLboolean __GLEW_NV_gpu_multicast = GL_FALSE;
+GLboolean __GLEW_NV_gpu_program4 = GL_FALSE;
+GLboolean __GLEW_NV_gpu_program5 = GL_FALSE;
+GLboolean __GLEW_NV_gpu_program5_mem_extended = GL_FALSE;
+GLboolean __GLEW_NV_gpu_program_fp64 = GL_FALSE;
+GLboolean __GLEW_NV_gpu_shader5 = GL_FALSE;
+GLboolean __GLEW_NV_half_float = GL_FALSE;
+GLboolean __GLEW_NV_image_formats = GL_FALSE;
+GLboolean __GLEW_NV_instanced_arrays = GL_FALSE;
+GLboolean __GLEW_NV_internalformat_sample_query = GL_FALSE;
+GLboolean __GLEW_NV_light_max_exponent = GL_FALSE;
+GLboolean __GLEW_NV_multisample_coverage = GL_FALSE;
+GLboolean __GLEW_NV_multisample_filter_hint = GL_FALSE;
+GLboolean __GLEW_NV_non_square_matrices = GL_FALSE;
+GLboolean __GLEW_NV_occlusion_query = GL_FALSE;
+GLboolean __GLEW_NV_pack_subimage = GL_FALSE;
+GLboolean __GLEW_NV_packed_depth_stencil = GL_FALSE;
+GLboolean __GLEW_NV_packed_float = GL_FALSE;
+GLboolean __GLEW_NV_packed_float_linear = GL_FALSE;
+GLboolean __GLEW_NV_parameter_buffer_object = GL_FALSE;
+GLboolean __GLEW_NV_parameter_buffer_object2 = GL_FALSE;
+GLboolean __GLEW_NV_path_rendering = GL_FALSE;
+GLboolean __GLEW_NV_path_rendering_shared_edge = GL_FALSE;
+GLboolean __GLEW_NV_pixel_buffer_object = GL_FALSE;
+GLboolean __GLEW_NV_pixel_data_range = GL_FALSE;
+GLboolean __GLEW_NV_platform_binary = GL_FALSE;
+GLboolean __GLEW_NV_point_sprite = GL_FALSE;
+GLboolean __GLEW_NV_polygon_mode = GL_FALSE;
+GLboolean __GLEW_NV_present_video = GL_FALSE;
+GLboolean __GLEW_NV_primitive_restart = GL_FALSE;
+GLboolean __GLEW_NV_read_depth = GL_FALSE;
+GLboolean __GLEW_NV_read_depth_stencil = GL_FALSE;
+GLboolean __GLEW_NV_read_stencil = GL_FALSE;
+GLboolean __GLEW_NV_register_combiners = GL_FALSE;
+GLboolean __GLEW_NV_register_combiners2 = GL_FALSE;
+GLboolean __GLEW_NV_robustness_video_memory_purge = GL_FALSE;
+GLboolean __GLEW_NV_sRGB_formats = GL_FALSE;
+GLboolean __GLEW_NV_sample_locations = GL_FALSE;
+GLboolean __GLEW_NV_sample_mask_override_coverage = GL_FALSE;
+GLboolean __GLEW_NV_shader_atomic_counters = GL_FALSE;
+GLboolean __GLEW_NV_shader_atomic_float = GL_FALSE;
+GLboolean __GLEW_NV_shader_atomic_float64 = GL_FALSE;
+GLboolean __GLEW_NV_shader_atomic_fp16_vector = GL_FALSE;
+GLboolean __GLEW_NV_shader_atomic_int64 = GL_FALSE;
+GLboolean __GLEW_NV_shader_buffer_load = GL_FALSE;
+GLboolean __GLEW_NV_shader_noperspective_interpolation = GL_FALSE;
+GLboolean __GLEW_NV_shader_storage_buffer_object = GL_FALSE;
+GLboolean __GLEW_NV_shader_thread_group = GL_FALSE;
+GLboolean __GLEW_NV_shader_thread_shuffle = GL_FALSE;
+GLboolean __GLEW_NV_shadow_samplers_array = GL_FALSE;
+GLboolean __GLEW_NV_shadow_samplers_cube = GL_FALSE;
+GLboolean __GLEW_NV_stereo_view_rendering = GL_FALSE;
+GLboolean __GLEW_NV_tessellation_program5 = GL_FALSE;
+GLboolean __GLEW_NV_texgen_emboss = GL_FALSE;
+GLboolean __GLEW_NV_texgen_reflection = GL_FALSE;
+GLboolean __GLEW_NV_texture_array = GL_FALSE;
+GLboolean __GLEW_NV_texture_barrier = GL_FALSE;
+GLboolean __GLEW_NV_texture_border_clamp = GL_FALSE;
+GLboolean __GLEW_NV_texture_compression_latc = GL_FALSE;
+GLboolean __GLEW_NV_texture_compression_s3tc = GL_FALSE;
+GLboolean __GLEW_NV_texture_compression_s3tc_update = GL_FALSE;
+GLboolean __GLEW_NV_texture_compression_vtc = GL_FALSE;
+GLboolean __GLEW_NV_texture_env_combine4 = GL_FALSE;
+GLboolean __GLEW_NV_texture_expand_normal = GL_FALSE;
+GLboolean __GLEW_NV_texture_multisample = GL_FALSE;
+GLboolean __GLEW_NV_texture_npot_2D_mipmap = GL_FALSE;
+GLboolean __GLEW_NV_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_NV_texture_rectangle_compressed = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader2 = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader3 = GL_FALSE;
+GLboolean __GLEW_NV_transform_feedback = GL_FALSE;
+GLboolean __GLEW_NV_transform_feedback2 = GL_FALSE;
+GLboolean __GLEW_NV_uniform_buffer_unified_memory = GL_FALSE;
+GLboolean __GLEW_NV_vdpau_interop = GL_FALSE;
+GLboolean __GLEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __GLEW_NV_vertex_array_range2 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_attrib_integer_64bit = GL_FALSE;
+GLboolean __GLEW_NV_vertex_buffer_unified_memory = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program1_1 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program2 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program2_option = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program3 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program4 = GL_FALSE;
+GLboolean __GLEW_NV_video_capture = GL_FALSE;
+GLboolean __GLEW_NV_viewport_array = GL_FALSE;
+GLboolean __GLEW_NV_viewport_array2 = GL_FALSE;
+GLboolean __GLEW_NV_viewport_swizzle = GL_FALSE;
+GLboolean __GLEW_OES_byte_coordinates = GL_FALSE;
+GLboolean __GLEW_OML_interlace = GL_FALSE;
+GLboolean __GLEW_OML_resample = GL_FALSE;
+GLboolean __GLEW_OML_subsample = GL_FALSE;
+GLboolean __GLEW_OVR_multiview = GL_FALSE;
+GLboolean __GLEW_OVR_multiview2 = GL_FALSE;
+GLboolean __GLEW_OVR_multiview_multisampled_render_to_texture = GL_FALSE;
+GLboolean __GLEW_PGI_misc_hints = GL_FALSE;
+GLboolean __GLEW_PGI_vertex_hints = GL_FALSE;
+GLboolean __GLEW_QCOM_alpha_test = GL_FALSE;
+GLboolean __GLEW_QCOM_binning_control = GL_FALSE;
+GLboolean __GLEW_QCOM_driver_control = GL_FALSE;
+GLboolean __GLEW_QCOM_extended_get = GL_FALSE;
+GLboolean __GLEW_QCOM_extended_get2 = GL_FALSE;
+GLboolean __GLEW_QCOM_framebuffer_foveated = GL_FALSE;
+GLboolean __GLEW_QCOM_perfmon_global_mode = GL_FALSE;
+GLboolean __GLEW_QCOM_shader_framebuffer_fetch_noncoherent = GL_FALSE;
+GLboolean __GLEW_QCOM_tiled_rendering = GL_FALSE;
+GLboolean __GLEW_QCOM_writeonly_rendering = GL_FALSE;
+GLboolean __GLEW_REGAL_ES1_0_compatibility = GL_FALSE;
+GLboolean __GLEW_REGAL_ES1_1_compatibility = GL_FALSE;
+GLboolean __GLEW_REGAL_enable = GL_FALSE;
+GLboolean __GLEW_REGAL_error_string = GL_FALSE;
+GLboolean __GLEW_REGAL_extension_query = GL_FALSE;
+GLboolean __GLEW_REGAL_log = GL_FALSE;
+GLboolean __GLEW_REGAL_proc_address = GL_FALSE;
+GLboolean __GLEW_REND_screen_coordinates = GL_FALSE;
+GLboolean __GLEW_S3_s3tc = GL_FALSE;
+GLboolean __GLEW_SGIS_clip_band_hint = GL_FALSE;
+GLboolean __GLEW_SGIS_color_range = GL_FALSE;
+GLboolean __GLEW_SGIS_detail_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_fog_function = GL_FALSE;
+GLboolean __GLEW_SGIS_generate_mipmap = GL_FALSE;
+GLboolean __GLEW_SGIS_line_texgen = GL_FALSE;
+GLboolean __GLEW_SGIS_multisample = GL_FALSE;
+GLboolean __GLEW_SGIS_multitexture = GL_FALSE;
+GLboolean __GLEW_SGIS_pixel_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_point_line_texgen = GL_FALSE;
+GLboolean __GLEW_SGIS_shared_multisample = GL_FALSE;
+GLboolean __GLEW_SGIS_sharpen_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_texture4D = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_border_clamp = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_edge_clamp = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_filter4 = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_lod = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_select = GL_FALSE;
+GLboolean __GLEW_SGIX_async = GL_FALSE;
+GLboolean __GLEW_SGIX_async_histogram = GL_FALSE;
+GLboolean __GLEW_SGIX_async_pixel = GL_FALSE;
+GLboolean __GLEW_SGIX_bali_g_instruments = GL_FALSE;
+GLboolean __GLEW_SGIX_bali_r_instruments = GL_FALSE;
+GLboolean __GLEW_SGIX_bali_timer_instruments = GL_FALSE;
+GLboolean __GLEW_SGIX_blend_alpha_minmax = GL_FALSE;
+GLboolean __GLEW_SGIX_blend_cadd = GL_FALSE;
+GLboolean __GLEW_SGIX_blend_cmultiply = GL_FALSE;
+GLboolean __GLEW_SGIX_calligraphic_fragment = GL_FALSE;
+GLboolean __GLEW_SGIX_clipmap = GL_FALSE;
+GLboolean __GLEW_SGIX_color_matrix_accuracy = GL_FALSE;
+GLboolean __GLEW_SGIX_color_table_index_mode = GL_FALSE;
+GLboolean __GLEW_SGIX_complex_polar = GL_FALSE;
+GLboolean __GLEW_SGIX_convolution_accuracy = GL_FALSE;
+GLboolean __GLEW_SGIX_cube_map = GL_FALSE;
+GLboolean __GLEW_SGIX_cylinder_texgen = GL_FALSE;
+GLboolean __GLEW_SGIX_datapipe = GL_FALSE;
+GLboolean __GLEW_SGIX_decimation = GL_FALSE;
+GLboolean __GLEW_SGIX_depth_pass_instrument = GL_FALSE;
+GLboolean __GLEW_SGIX_depth_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_dvc = GL_FALSE;
+GLboolean __GLEW_SGIX_flush_raster = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_blend = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_factor_to_alpha = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_layers = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_offset = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_patchy = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_scale = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_fragment_lighting_space = GL_FALSE;
+GLboolean __GLEW_SGIX_fragment_specular_lighting = GL_FALSE;
+GLboolean __GLEW_SGIX_fragments_instrument = GL_FALSE;
+GLboolean __GLEW_SGIX_framezoom = GL_FALSE;
+GLboolean __GLEW_SGIX_icc_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_igloo_interface = GL_FALSE;
+GLboolean __GLEW_SGIX_image_compression = GL_FALSE;
+GLboolean __GLEW_SGIX_impact_pixel_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_instrument_error = GL_FALSE;
+GLboolean __GLEW_SGIX_interlace = GL_FALSE;
+GLboolean __GLEW_SGIX_ir_instrument1 = GL_FALSE;
+GLboolean __GLEW_SGIX_line_quality_hint = GL_FALSE;
+GLboolean __GLEW_SGIX_list_priority = GL_FALSE;
+GLboolean __GLEW_SGIX_mpeg1 = GL_FALSE;
+GLboolean __GLEW_SGIX_mpeg2 = GL_FALSE;
+GLboolean __GLEW_SGIX_nonlinear_lighting_pervertex = GL_FALSE;
+GLboolean __GLEW_SGIX_nurbs_eval = GL_FALSE;
+GLboolean __GLEW_SGIX_occlusion_instrument = GL_FALSE;
+GLboolean __GLEW_SGIX_packed_6bytes = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_texture_bits = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_texture_lod = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_tiles = GL_FALSE;
+GLboolean __GLEW_SGIX_polynomial_ffd = GL_FALSE;
+GLboolean __GLEW_SGIX_quad_mesh = GL_FALSE;
+GLboolean __GLEW_SGIX_reference_plane = GL_FALSE;
+GLboolean __GLEW_SGIX_resample = GL_FALSE;
+GLboolean __GLEW_SGIX_scalebias_hint = GL_FALSE;
+GLboolean __GLEW_SGIX_shadow = GL_FALSE;
+GLboolean __GLEW_SGIX_shadow_ambient = GL_FALSE;
+GLboolean __GLEW_SGIX_slim = GL_FALSE;
+GLboolean __GLEW_SGIX_spotlight_cutoff = GL_FALSE;
+GLboolean __GLEW_SGIX_sprite = GL_FALSE;
+GLboolean __GLEW_SGIX_subdiv_patch = GL_FALSE;
+GLboolean __GLEW_SGIX_subsample = GL_FALSE;
+GLboolean __GLEW_SGIX_tag_sample_buffer = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_add_env = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_coordinate_clamp = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_lod_bias = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_mipmap_anisotropic = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_multi_buffer = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_phase = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_range = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_scale_bias = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_supersample = GL_FALSE;
+GLboolean __GLEW_SGIX_vector_ops = GL_FALSE;
+GLboolean __GLEW_SGIX_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_SGIX_vertex_preclip = GL_FALSE;
+GLboolean __GLEW_SGIX_vertex_preclip_hint = GL_FALSE;
+GLboolean __GLEW_SGIX_ycrcb = GL_FALSE;
+GLboolean __GLEW_SGIX_ycrcb_subsample = GL_FALSE;
+GLboolean __GLEW_SGIX_ycrcba = GL_FALSE;
+GLboolean __GLEW_SGI_color_matrix = GL_FALSE;
+GLboolean __GLEW_SGI_color_table = GL_FALSE;
+GLboolean __GLEW_SGI_complex = GL_FALSE;
+GLboolean __GLEW_SGI_complex_type = GL_FALSE;
+GLboolean __GLEW_SGI_fft = GL_FALSE;
+GLboolean __GLEW_SGI_texture_color_table = GL_FALSE;
+GLboolean __GLEW_SUNX_constant_data = GL_FALSE;
+GLboolean __GLEW_SUN_convolution_border_modes = GL_FALSE;
+GLboolean __GLEW_SUN_global_alpha = GL_FALSE;
+GLboolean __GLEW_SUN_mesh_array = GL_FALSE;
+GLboolean __GLEW_SUN_read_video_pixels = GL_FALSE;
+GLboolean __GLEW_SUN_slice_accum = GL_FALSE;
+GLboolean __GLEW_SUN_triangle_list = GL_FALSE;
+GLboolean __GLEW_SUN_vertex = GL_FALSE;
+GLboolean __GLEW_WIN_phong_shading = GL_FALSE;
+GLboolean __GLEW_WIN_scene_markerXXX = GL_FALSE;
+GLboolean __GLEW_WIN_specular_fog = GL_FALSE;
+GLboolean __GLEW_WIN_swap_hint = GL_FALSE;
+
+static const char * _glewExtensionLookup[] = {
+#ifdef GL_VERSION_1_2
+  "GL_VERSION_1_2",
+#endif
+#ifdef GL_VERSION_1_2_1
+  "GL_VERSION_1_2_1",
+#endif
+#ifdef GL_VERSION_1_3
+  "GL_VERSION_1_3",
+#endif
+#ifdef GL_VERSION_1_4
+  "GL_VERSION_1_4",
+#endif
+#ifdef GL_VERSION_1_5
+  "GL_VERSION_1_5",
+#endif
+#ifdef GL_VERSION_2_0
+  "GL_VERSION_2_0",
+#endif
+#ifdef GL_VERSION_2_1
+  "GL_VERSION_2_1",
+#endif
+#ifdef GL_VERSION_3_0
+  "GL_VERSION_3_0",
+#endif
+#ifdef GL_VERSION_3_1
+  "GL_VERSION_3_1",
+#endif
+#ifdef GL_VERSION_3_2
+  "GL_VERSION_3_2",
+#endif
+#ifdef GL_VERSION_3_3
+  "GL_VERSION_3_3",
+#endif
+#ifdef GL_VERSION_4_0
+  "GL_VERSION_4_0",
+#endif
+#ifdef GL_VERSION_4_1
+  "GL_VERSION_4_1",
+#endif
+#ifdef GL_VERSION_4_2
+  "GL_VERSION_4_2",
+#endif
+#ifdef GL_VERSION_4_3
+  "GL_VERSION_4_3",
+#endif
+#ifdef GL_VERSION_4_4
+  "GL_VERSION_4_4",
+#endif
+#ifdef GL_VERSION_4_5
+  "GL_VERSION_4_5",
+#endif
+#ifdef GL_VERSION_4_6
+  "GL_VERSION_4_6",
+#endif
+#ifdef GL_3DFX_multisample
+  "GL_3DFX_multisample",
+#endif
+#ifdef GL_3DFX_tbuffer
+  "GL_3DFX_tbuffer",
+#endif
+#ifdef GL_3DFX_texture_compression_FXT1
+  "GL_3DFX_texture_compression_FXT1",
+#endif
+#ifdef GL_AMD_blend_minmax_factor
+  "GL_AMD_blend_minmax_factor",
+#endif
+#ifdef GL_AMD_compressed_3DC_texture
+  "GL_AMD_compressed_3DC_texture",
+#endif
+#ifdef GL_AMD_compressed_ATC_texture
+  "GL_AMD_compressed_ATC_texture",
+#endif
+#ifdef GL_AMD_conservative_depth
+  "GL_AMD_conservative_depth",
+#endif
+#ifdef GL_AMD_debug_output
+  "GL_AMD_debug_output",
+#endif
+#ifdef GL_AMD_depth_clamp_separate
+  "GL_AMD_depth_clamp_separate",
+#endif
+#ifdef GL_AMD_draw_buffers_blend
+  "GL_AMD_draw_buffers_blend",
+#endif
+#ifdef GL_AMD_framebuffer_sample_positions
+  "GL_AMD_framebuffer_sample_positions",
+#endif
+#ifdef GL_AMD_gcn_shader
+  "GL_AMD_gcn_shader",
+#endif
+#ifdef GL_AMD_gpu_shader_half_float
+  "GL_AMD_gpu_shader_half_float",
+#endif
+#ifdef GL_AMD_gpu_shader_int16
+  "GL_AMD_gpu_shader_int16",
+#endif
+#ifdef GL_AMD_gpu_shader_int64
+  "GL_AMD_gpu_shader_int64",
+#endif
+#ifdef GL_AMD_interleaved_elements
+  "GL_AMD_interleaved_elements",
+#endif
+#ifdef GL_AMD_multi_draw_indirect
+  "GL_AMD_multi_draw_indirect",
+#endif
+#ifdef GL_AMD_name_gen_delete
+  "GL_AMD_name_gen_delete",
+#endif
+#ifdef GL_AMD_occlusion_query_event
+  "GL_AMD_occlusion_query_event",
+#endif
+#ifdef GL_AMD_performance_monitor
+  "GL_AMD_performance_monitor",
+#endif
+#ifdef GL_AMD_pinned_memory
+  "GL_AMD_pinned_memory",
+#endif
+#ifdef GL_AMD_program_binary_Z400
+  "GL_AMD_program_binary_Z400",
+#endif
+#ifdef GL_AMD_query_buffer_object
+  "GL_AMD_query_buffer_object",
+#endif
+#ifdef GL_AMD_sample_positions
+  "GL_AMD_sample_positions",
+#endif
+#ifdef GL_AMD_seamless_cubemap_per_texture
+  "GL_AMD_seamless_cubemap_per_texture",
+#endif
+#ifdef GL_AMD_shader_atomic_counter_ops
+  "GL_AMD_shader_atomic_counter_ops",
+#endif
+#ifdef GL_AMD_shader_ballot
+  "GL_AMD_shader_ballot",
+#endif
+#ifdef GL_AMD_shader_explicit_vertex_parameter
+  "GL_AMD_shader_explicit_vertex_parameter",
+#endif
+#ifdef GL_AMD_shader_stencil_export
+  "GL_AMD_shader_stencil_export",
+#endif
+#ifdef GL_AMD_shader_stencil_value_export
+  "GL_AMD_shader_stencil_value_export",
+#endif
+#ifdef GL_AMD_shader_trinary_minmax
+  "GL_AMD_shader_trinary_minmax",
+#endif
+#ifdef GL_AMD_sparse_texture
+  "GL_AMD_sparse_texture",
+#endif
+#ifdef GL_AMD_stencil_operation_extended
+  "GL_AMD_stencil_operation_extended",
+#endif
+#ifdef GL_AMD_texture_gather_bias_lod
+  "GL_AMD_texture_gather_bias_lod",
+#endif
+#ifdef GL_AMD_texture_texture4
+  "GL_AMD_texture_texture4",
+#endif
+#ifdef GL_AMD_transform_feedback3_lines_triangles
+  "GL_AMD_transform_feedback3_lines_triangles",
+#endif
+#ifdef GL_AMD_transform_feedback4
+  "GL_AMD_transform_feedback4",
+#endif
+#ifdef GL_AMD_vertex_shader_layer
+  "GL_AMD_vertex_shader_layer",
+#endif
+#ifdef GL_AMD_vertex_shader_tessellator
+  "GL_AMD_vertex_shader_tessellator",
+#endif
+#ifdef GL_AMD_vertex_shader_viewport_index
+  "GL_AMD_vertex_shader_viewport_index",
+#endif
+#ifdef GL_ANDROID_extension_pack_es31a
+  "GL_ANDROID_extension_pack_es31a",
+#endif
+#ifdef GL_ANGLE_depth_texture
+  "GL_ANGLE_depth_texture",
+#endif
+#ifdef GL_ANGLE_framebuffer_blit
+  "GL_ANGLE_framebuffer_blit",
+#endif
+#ifdef GL_ANGLE_framebuffer_multisample
+  "GL_ANGLE_framebuffer_multisample",
+#endif
+#ifdef GL_ANGLE_instanced_arrays
+  "GL_ANGLE_instanced_arrays",
+#endif
+#ifdef GL_ANGLE_pack_reverse_row_order
+  "GL_ANGLE_pack_reverse_row_order",
+#endif
+#ifdef GL_ANGLE_program_binary
+  "GL_ANGLE_program_binary",
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt1
+  "GL_ANGLE_texture_compression_dxt1",
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt3
+  "GL_ANGLE_texture_compression_dxt3",
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt5
+  "GL_ANGLE_texture_compression_dxt5",
+#endif
+#ifdef GL_ANGLE_texture_usage
+  "GL_ANGLE_texture_usage",
+#endif
+#ifdef GL_ANGLE_timer_query
+  "GL_ANGLE_timer_query",
+#endif
+#ifdef GL_ANGLE_translated_shader_source
+  "GL_ANGLE_translated_shader_source",
+#endif
+#ifdef GL_APPLE_aux_depth_stencil
+  "GL_APPLE_aux_depth_stencil",
+#endif
+#ifdef GL_APPLE_client_storage
+  "GL_APPLE_client_storage",
+#endif
+#ifdef GL_APPLE_clip_distance
+  "GL_APPLE_clip_distance",
+#endif
+#ifdef GL_APPLE_color_buffer_packed_float
+  "GL_APPLE_color_buffer_packed_float",
+#endif
+#ifdef GL_APPLE_copy_texture_levels
+  "GL_APPLE_copy_texture_levels",
+#endif
+#ifdef GL_APPLE_element_array
+  "GL_APPLE_element_array",
+#endif
+#ifdef GL_APPLE_fence
+  "GL_APPLE_fence",
+#endif
+#ifdef GL_APPLE_float_pixels
+  "GL_APPLE_float_pixels",
+#endif
+#ifdef GL_APPLE_flush_buffer_range
+  "GL_APPLE_flush_buffer_range",
+#endif
+#ifdef GL_APPLE_framebuffer_multisample
+  "GL_APPLE_framebuffer_multisample",
+#endif
+#ifdef GL_APPLE_object_purgeable
+  "GL_APPLE_object_purgeable",
+#endif
+#ifdef GL_APPLE_pixel_buffer
+  "GL_APPLE_pixel_buffer",
+#endif
+#ifdef GL_APPLE_rgb_422
+  "GL_APPLE_rgb_422",
+#endif
+#ifdef GL_APPLE_row_bytes
+  "GL_APPLE_row_bytes",
+#endif
+#ifdef GL_APPLE_specular_vector
+  "GL_APPLE_specular_vector",
+#endif
+#ifdef GL_APPLE_sync
+  "GL_APPLE_sync",
+#endif
+#ifdef GL_APPLE_texture_2D_limited_npot
+  "GL_APPLE_texture_2D_limited_npot",
+#endif
+#ifdef GL_APPLE_texture_format_BGRA8888
+  "GL_APPLE_texture_format_BGRA8888",
+#endif
+#ifdef GL_APPLE_texture_max_level
+  "GL_APPLE_texture_max_level",
+#endif
+#ifdef GL_APPLE_texture_packed_float
+  "GL_APPLE_texture_packed_float",
+#endif
+#ifdef GL_APPLE_texture_range
+  "GL_APPLE_texture_range",
+#endif
+#ifdef GL_APPLE_transform_hint
+  "GL_APPLE_transform_hint",
+#endif
+#ifdef GL_APPLE_vertex_array_object
+  "GL_APPLE_vertex_array_object",
+#endif
+#ifdef GL_APPLE_vertex_array_range
+  "GL_APPLE_vertex_array_range",
+#endif
+#ifdef GL_APPLE_vertex_program_evaluators
+  "GL_APPLE_vertex_program_evaluators",
+#endif
+#ifdef GL_APPLE_ycbcr_422
+  "GL_APPLE_ycbcr_422",
+#endif
+#ifdef GL_ARB_ES2_compatibility
+  "GL_ARB_ES2_compatibility",
+#endif
+#ifdef GL_ARB_ES3_1_compatibility
+  "GL_ARB_ES3_1_compatibility",
+#endif
+#ifdef GL_ARB_ES3_2_compatibility
+  "GL_ARB_ES3_2_compatibility",
+#endif
+#ifdef GL_ARB_ES3_compatibility
+  "GL_ARB_ES3_compatibility",
+#endif
+#ifdef GL_ARB_arrays_of_arrays
+  "GL_ARB_arrays_of_arrays",
+#endif
+#ifdef GL_ARB_base_instance
+  "GL_ARB_base_instance",
+#endif
+#ifdef GL_ARB_bindless_texture
+  "GL_ARB_bindless_texture",
+#endif
+#ifdef GL_ARB_blend_func_extended
+  "GL_ARB_blend_func_extended",
+#endif
+#ifdef GL_ARB_buffer_storage
+  "GL_ARB_buffer_storage",
+#endif
+#ifdef GL_ARB_cl_event
+  "GL_ARB_cl_event",
+#endif
+#ifdef GL_ARB_clear_buffer_object
+  "GL_ARB_clear_buffer_object",
+#endif
+#ifdef GL_ARB_clear_texture
+  "GL_ARB_clear_texture",
+#endif
+#ifdef GL_ARB_clip_control
+  "GL_ARB_clip_control",
+#endif
+#ifdef GL_ARB_color_buffer_float
+  "GL_ARB_color_buffer_float",
+#endif
+#ifdef GL_ARB_compatibility
+  "GL_ARB_compatibility",
+#endif
+#ifdef GL_ARB_compressed_texture_pixel_storage
+  "GL_ARB_compressed_texture_pixel_storage",
+#endif
+#ifdef GL_ARB_compute_shader
+  "GL_ARB_compute_shader",
+#endif
+#ifdef GL_ARB_compute_variable_group_size
+  "GL_ARB_compute_variable_group_size",
+#endif
+#ifdef GL_ARB_conditional_render_inverted
+  "GL_ARB_conditional_render_inverted",
+#endif
+#ifdef GL_ARB_conservative_depth
+  "GL_ARB_conservative_depth",
+#endif
+#ifdef GL_ARB_copy_buffer
+  "GL_ARB_copy_buffer",
+#endif
+#ifdef GL_ARB_copy_image
+  "GL_ARB_copy_image",
+#endif
+#ifdef GL_ARB_cull_distance
+  "GL_ARB_cull_distance",
+#endif
+#ifdef GL_ARB_debug_output
+  "GL_ARB_debug_output",
+#endif
+#ifdef GL_ARB_depth_buffer_float
+  "GL_ARB_depth_buffer_float",
+#endif
+#ifdef GL_ARB_depth_clamp
+  "GL_ARB_depth_clamp",
+#endif
+#ifdef GL_ARB_depth_texture
+  "GL_ARB_depth_texture",
+#endif
+#ifdef GL_ARB_derivative_control
+  "GL_ARB_derivative_control",
+#endif
+#ifdef GL_ARB_direct_state_access
+  "GL_ARB_direct_state_access",
+#endif
+#ifdef GL_ARB_draw_buffers
+  "GL_ARB_draw_buffers",
+#endif
+#ifdef GL_ARB_draw_buffers_blend
+  "GL_ARB_draw_buffers_blend",
+#endif
+#ifdef GL_ARB_draw_elements_base_vertex
+  "GL_ARB_draw_elements_base_vertex",
+#endif
+#ifdef GL_ARB_draw_indirect
+  "GL_ARB_draw_indirect",
+#endif
+#ifdef GL_ARB_draw_instanced
+  "GL_ARB_draw_instanced",
+#endif
+#ifdef GL_ARB_enhanced_layouts
+  "GL_ARB_enhanced_layouts",
+#endif
+#ifdef GL_ARB_explicit_attrib_location
+  "GL_ARB_explicit_attrib_location",
+#endif
+#ifdef GL_ARB_explicit_uniform_location
+  "GL_ARB_explicit_uniform_location",
+#endif
+#ifdef GL_ARB_fragment_coord_conventions
+  "GL_ARB_fragment_coord_conventions",
+#endif
+#ifdef GL_ARB_fragment_layer_viewport
+  "GL_ARB_fragment_layer_viewport",
+#endif
+#ifdef GL_ARB_fragment_program
+  "GL_ARB_fragment_program",
+#endif
+#ifdef GL_ARB_fragment_program_shadow
+  "GL_ARB_fragment_program_shadow",
+#endif
+#ifdef GL_ARB_fragment_shader
+  "GL_ARB_fragment_shader",
+#endif
+#ifdef GL_ARB_fragment_shader_interlock
+  "GL_ARB_fragment_shader_interlock",
+#endif
+#ifdef GL_ARB_framebuffer_no_attachments
+  "GL_ARB_framebuffer_no_attachments",
+#endif
+#ifdef GL_ARB_framebuffer_object
+  "GL_ARB_framebuffer_object",
+#endif
+#ifdef GL_ARB_framebuffer_sRGB
+  "GL_ARB_framebuffer_sRGB",
+#endif
+#ifdef GL_ARB_geometry_shader4
+  "GL_ARB_geometry_shader4",
+#endif
+#ifdef GL_ARB_get_program_binary
+  "GL_ARB_get_program_binary",
+#endif
+#ifdef GL_ARB_get_texture_sub_image
+  "GL_ARB_get_texture_sub_image",
+#endif
+#ifdef GL_ARB_gl_spirv
+  "GL_ARB_gl_spirv",
+#endif
+#ifdef GL_ARB_gpu_shader5
+  "GL_ARB_gpu_shader5",
+#endif
+#ifdef GL_ARB_gpu_shader_fp64
+  "GL_ARB_gpu_shader_fp64",
+#endif
+#ifdef GL_ARB_gpu_shader_int64
+  "GL_ARB_gpu_shader_int64",
+#endif
+#ifdef GL_ARB_half_float_pixel
+  "GL_ARB_half_float_pixel",
+#endif
+#ifdef GL_ARB_half_float_vertex
+  "GL_ARB_half_float_vertex",
+#endif
+#ifdef GL_ARB_imaging
+  "GL_ARB_imaging",
+#endif
+#ifdef GL_ARB_indirect_parameters
+  "GL_ARB_indirect_parameters",
+#endif
+#ifdef GL_ARB_instanced_arrays
+  "GL_ARB_instanced_arrays",
+#endif
+#ifdef GL_ARB_internalformat_query
+  "GL_ARB_internalformat_query",
+#endif
+#ifdef GL_ARB_internalformat_query2
+  "GL_ARB_internalformat_query2",
+#endif
+#ifdef GL_ARB_invalidate_subdata
+  "GL_ARB_invalidate_subdata",
+#endif
+#ifdef GL_ARB_map_buffer_alignment
+  "GL_ARB_map_buffer_alignment",
+#endif
+#ifdef GL_ARB_map_buffer_range
+  "GL_ARB_map_buffer_range",
+#endif
+#ifdef GL_ARB_matrix_palette
+  "GL_ARB_matrix_palette",
+#endif
+#ifdef GL_ARB_multi_bind
+  "GL_ARB_multi_bind",
+#endif
+#ifdef GL_ARB_multi_draw_indirect
+  "GL_ARB_multi_draw_indirect",
+#endif
+#ifdef GL_ARB_multisample
+  "GL_ARB_multisample",
+#endif
+#ifdef GL_ARB_multitexture
+  "GL_ARB_multitexture",
+#endif
+#ifdef GL_ARB_occlusion_query
+  "GL_ARB_occlusion_query",
+#endif
+#ifdef GL_ARB_occlusion_query2
+  "GL_ARB_occlusion_query2",
+#endif
+#ifdef GL_ARB_parallel_shader_compile
+  "GL_ARB_parallel_shader_compile",
+#endif
+#ifdef GL_ARB_pipeline_statistics_query
+  "GL_ARB_pipeline_statistics_query",
+#endif
+#ifdef GL_ARB_pixel_buffer_object
+  "GL_ARB_pixel_buffer_object",
+#endif
+#ifdef GL_ARB_point_parameters
+  "GL_ARB_point_parameters",
+#endif
+#ifdef GL_ARB_point_sprite
+  "GL_ARB_point_sprite",
+#endif
+#ifdef GL_ARB_polygon_offset_clamp
+  "GL_ARB_polygon_offset_clamp",
+#endif
+#ifdef GL_ARB_post_depth_coverage
+  "GL_ARB_post_depth_coverage",
+#endif
+#ifdef GL_ARB_program_interface_query
+  "GL_ARB_program_interface_query",
+#endif
+#ifdef GL_ARB_provoking_vertex
+  "GL_ARB_provoking_vertex",
+#endif
+#ifdef GL_ARB_query_buffer_object
+  "GL_ARB_query_buffer_object",
+#endif
+#ifdef GL_ARB_robust_buffer_access_behavior
+  "GL_ARB_robust_buffer_access_behavior",
+#endif
+#ifdef GL_ARB_robustness
+  "GL_ARB_robustness",
+#endif
+#ifdef GL_ARB_robustness_application_isolation
+  "GL_ARB_robustness_application_isolation",
+#endif
+#ifdef GL_ARB_robustness_share_group_isolation
+  "GL_ARB_robustness_share_group_isolation",
+#endif
+#ifdef GL_ARB_sample_locations
+  "GL_ARB_sample_locations",
+#endif
+#ifdef GL_ARB_sample_shading
+  "GL_ARB_sample_shading",
+#endif
+#ifdef GL_ARB_sampler_objects
+  "GL_ARB_sampler_objects",
+#endif
+#ifdef GL_ARB_seamless_cube_map
+  "GL_ARB_seamless_cube_map",
+#endif
+#ifdef GL_ARB_seamless_cubemap_per_texture
+  "GL_ARB_seamless_cubemap_per_texture",
+#endif
+#ifdef GL_ARB_separate_shader_objects
+  "GL_ARB_separate_shader_objects",
+#endif
+#ifdef GL_ARB_shader_atomic_counter_ops
+  "GL_ARB_shader_atomic_counter_ops",
+#endif
+#ifdef GL_ARB_shader_atomic_counters
+  "GL_ARB_shader_atomic_counters",
+#endif
+#ifdef GL_ARB_shader_ballot
+  "GL_ARB_shader_ballot",
+#endif
+#ifdef GL_ARB_shader_bit_encoding
+  "GL_ARB_shader_bit_encoding",
+#endif
+#ifdef GL_ARB_shader_clock
+  "GL_ARB_shader_clock",
+#endif
+#ifdef GL_ARB_shader_draw_parameters
+  "GL_ARB_shader_draw_parameters",
+#endif
+#ifdef GL_ARB_shader_group_vote
+  "GL_ARB_shader_group_vote",
+#endif
+#ifdef GL_ARB_shader_image_load_store
+  "GL_ARB_shader_image_load_store",
+#endif
+#ifdef GL_ARB_shader_image_size
+  "GL_ARB_shader_image_size",
+#endif
+#ifdef GL_ARB_shader_objects
+  "GL_ARB_shader_objects",
+#endif
+#ifdef GL_ARB_shader_precision
+  "GL_ARB_shader_precision",
+#endif
+#ifdef GL_ARB_shader_stencil_export
+  "GL_ARB_shader_stencil_export",
+#endif
+#ifdef GL_ARB_shader_storage_buffer_object
+  "GL_ARB_shader_storage_buffer_object",
+#endif
+#ifdef GL_ARB_shader_subroutine
+  "GL_ARB_shader_subroutine",
+#endif
+#ifdef GL_ARB_shader_texture_image_samples
+  "GL_ARB_shader_texture_image_samples",
+#endif
+#ifdef GL_ARB_shader_texture_lod
+  "GL_ARB_shader_texture_lod",
+#endif
+#ifdef GL_ARB_shader_viewport_layer_array
+  "GL_ARB_shader_viewport_layer_array",
+#endif
+#ifdef GL_ARB_shading_language_100
+  "GL_ARB_shading_language_100",
+#endif
+#ifdef GL_ARB_shading_language_420pack
+  "GL_ARB_shading_language_420pack",
+#endif
+#ifdef GL_ARB_shading_language_include
+  "GL_ARB_shading_language_include",
+#endif
+#ifdef GL_ARB_shading_language_packing
+  "GL_ARB_shading_language_packing",
+#endif
+#ifdef GL_ARB_shadow
+  "GL_ARB_shadow",
+#endif
+#ifdef GL_ARB_shadow_ambient
+  "GL_ARB_shadow_ambient",
+#endif
+#ifdef GL_ARB_sparse_buffer
+  "GL_ARB_sparse_buffer",
+#endif
+#ifdef GL_ARB_sparse_texture
+  "GL_ARB_sparse_texture",
+#endif
+#ifdef GL_ARB_sparse_texture2
+  "GL_ARB_sparse_texture2",
+#endif
+#ifdef GL_ARB_sparse_texture_clamp
+  "GL_ARB_sparse_texture_clamp",
+#endif
+#ifdef GL_ARB_spirv_extensions
+  "GL_ARB_spirv_extensions",
+#endif
+#ifdef GL_ARB_stencil_texturing
+  "GL_ARB_stencil_texturing",
+#endif
+#ifdef GL_ARB_sync
+  "GL_ARB_sync",
+#endif
+#ifdef GL_ARB_tessellation_shader
+  "GL_ARB_tessellation_shader",
+#endif
+#ifdef GL_ARB_texture_barrier
+  "GL_ARB_texture_barrier",
+#endif
+#ifdef GL_ARB_texture_border_clamp
+  "GL_ARB_texture_border_clamp",
+#endif
+#ifdef GL_ARB_texture_buffer_object
+  "GL_ARB_texture_buffer_object",
+#endif
+#ifdef GL_ARB_texture_buffer_object_rgb32
+  "GL_ARB_texture_buffer_object_rgb32",
+#endif
+#ifdef GL_ARB_texture_buffer_range
+  "GL_ARB_texture_buffer_range",
+#endif
+#ifdef GL_ARB_texture_compression
+  "GL_ARB_texture_compression",
+#endif
+#ifdef GL_ARB_texture_compression_bptc
+  "GL_ARB_texture_compression_bptc",
+#endif
+#ifdef GL_ARB_texture_compression_rgtc
+  "GL_ARB_texture_compression_rgtc",
+#endif
+#ifdef GL_ARB_texture_cube_map
+  "GL_ARB_texture_cube_map",
+#endif
+#ifdef GL_ARB_texture_cube_map_array
+  "GL_ARB_texture_cube_map_array",
+#endif
+#ifdef GL_ARB_texture_env_add
+  "GL_ARB_texture_env_add",
+#endif
+#ifdef GL_ARB_texture_env_combine
+  "GL_ARB_texture_env_combine",
+#endif
+#ifdef GL_ARB_texture_env_crossbar
+  "GL_ARB_texture_env_crossbar",
+#endif
+#ifdef GL_ARB_texture_env_dot3
+  "GL_ARB_texture_env_dot3",
+#endif
+#ifdef GL_ARB_texture_filter_anisotropic
+  "GL_ARB_texture_filter_anisotropic",
+#endif
+#ifdef GL_ARB_texture_filter_minmax
+  "GL_ARB_texture_filter_minmax",
+#endif
+#ifdef GL_ARB_texture_float
+  "GL_ARB_texture_float",
+#endif
+#ifdef GL_ARB_texture_gather
+  "GL_ARB_texture_gather",
+#endif
+#ifdef GL_ARB_texture_mirror_clamp_to_edge
+  "GL_ARB_texture_mirror_clamp_to_edge",
+#endif
+#ifdef GL_ARB_texture_mirrored_repeat
+  "GL_ARB_texture_mirrored_repeat",
+#endif
+#ifdef GL_ARB_texture_multisample
+  "GL_ARB_texture_multisample",
+#endif
+#ifdef GL_ARB_texture_non_power_of_two
+  "GL_ARB_texture_non_power_of_two",
+#endif
+#ifdef GL_ARB_texture_query_levels
+  "GL_ARB_texture_query_levels",
+#endif
+#ifdef GL_ARB_texture_query_lod
+  "GL_ARB_texture_query_lod",
+#endif
+#ifdef GL_ARB_texture_rectangle
+  "GL_ARB_texture_rectangle",
+#endif
+#ifdef GL_ARB_texture_rg
+  "GL_ARB_texture_rg",
+#endif
+#ifdef GL_ARB_texture_rgb10_a2ui
+  "GL_ARB_texture_rgb10_a2ui",
+#endif
+#ifdef GL_ARB_texture_stencil8
+  "GL_ARB_texture_stencil8",
+#endif
+#ifdef GL_ARB_texture_storage
+  "GL_ARB_texture_storage",
+#endif
+#ifdef GL_ARB_texture_storage_multisample
+  "GL_ARB_texture_storage_multisample",
+#endif
+#ifdef GL_ARB_texture_swizzle
+  "GL_ARB_texture_swizzle",
+#endif
+#ifdef GL_ARB_texture_view
+  "GL_ARB_texture_view",
+#endif
+#ifdef GL_ARB_timer_query
+  "GL_ARB_timer_query",
+#endif
+#ifdef GL_ARB_transform_feedback2
+  "GL_ARB_transform_feedback2",
+#endif
+#ifdef GL_ARB_transform_feedback3
+  "GL_ARB_transform_feedback3",
+#endif
+#ifdef GL_ARB_transform_feedback_instanced
+  "GL_ARB_transform_feedback_instanced",
+#endif
+#ifdef GL_ARB_transform_feedback_overflow_query
+  "GL_ARB_transform_feedback_overflow_query",
+#endif
+#ifdef GL_ARB_transpose_matrix
+  "GL_ARB_transpose_matrix",
+#endif
+#ifdef GL_ARB_uniform_buffer_object
+  "GL_ARB_uniform_buffer_object",
+#endif
+#ifdef GL_ARB_vertex_array_bgra
+  "GL_ARB_vertex_array_bgra",
+#endif
+#ifdef GL_ARB_vertex_array_object
+  "GL_ARB_vertex_array_object",
+#endif
+#ifdef GL_ARB_vertex_attrib_64bit
+  "GL_ARB_vertex_attrib_64bit",
+#endif
+#ifdef GL_ARB_vertex_attrib_binding
+  "GL_ARB_vertex_attrib_binding",
+#endif
+#ifdef GL_ARB_vertex_blend
+  "GL_ARB_vertex_blend",
+#endif
+#ifdef GL_ARB_vertex_buffer_object
+  "GL_ARB_vertex_buffer_object",
+#endif
+#ifdef GL_ARB_vertex_program
+  "GL_ARB_vertex_program",
+#endif
+#ifdef GL_ARB_vertex_shader
+  "GL_ARB_vertex_shader",
+#endif
+#ifdef GL_ARB_vertex_type_10f_11f_11f_rev
+  "GL_ARB_vertex_type_10f_11f_11f_rev",
+#endif
+#ifdef GL_ARB_vertex_type_2_10_10_10_rev
+  "GL_ARB_vertex_type_2_10_10_10_rev",
+#endif
+#ifdef GL_ARB_viewport_array
+  "GL_ARB_viewport_array",
+#endif
+#ifdef GL_ARB_window_pos
+  "GL_ARB_window_pos",
+#endif
+#ifdef GL_ARM_mali_program_binary
+  "GL_ARM_mali_program_binary",
+#endif
+#ifdef GL_ARM_mali_shader_binary
+  "GL_ARM_mali_shader_binary",
+#endif
+#ifdef GL_ARM_rgba8
+  "GL_ARM_rgba8",
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch
+  "GL_ARM_shader_framebuffer_fetch",
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch_depth_stencil
+  "GL_ARM_shader_framebuffer_fetch_depth_stencil",
+#endif
+#ifdef GL_ATIX_point_sprites
+  "GL_ATIX_point_sprites",
+#endif
+#ifdef GL_ATIX_texture_env_combine3
+  "GL_ATIX_texture_env_combine3",
+#endif
+#ifdef GL_ATIX_texture_env_route
+  "GL_ATIX_texture_env_route",
+#endif
+#ifdef GL_ATIX_vertex_shader_output_point_size
+  "GL_ATIX_vertex_shader_output_point_size",
+#endif
+#ifdef GL_ATI_draw_buffers
+  "GL_ATI_draw_buffers",
+#endif
+#ifdef GL_ATI_element_array
+  "GL_ATI_element_array",
+#endif
+#ifdef GL_ATI_envmap_bumpmap
+  "GL_ATI_envmap_bumpmap",
+#endif
+#ifdef GL_ATI_fragment_shader
+  "GL_ATI_fragment_shader",
+#endif
+#ifdef GL_ATI_map_object_buffer
+  "GL_ATI_map_object_buffer",
+#endif
+#ifdef GL_ATI_meminfo
+  "GL_ATI_meminfo",
+#endif
+#ifdef GL_ATI_pn_triangles
+  "GL_ATI_pn_triangles",
+#endif
+#ifdef GL_ATI_separate_stencil
+  "GL_ATI_separate_stencil",
+#endif
+#ifdef GL_ATI_shader_texture_lod
+  "GL_ATI_shader_texture_lod",
+#endif
+#ifdef GL_ATI_text_fragment_shader
+  "GL_ATI_text_fragment_shader",
+#endif
+#ifdef GL_ATI_texture_compression_3dc
+  "GL_ATI_texture_compression_3dc",
+#endif
+#ifdef GL_ATI_texture_env_combine3
+  "GL_ATI_texture_env_combine3",
+#endif
+#ifdef GL_ATI_texture_float
+  "GL_ATI_texture_float",
+#endif
+#ifdef GL_ATI_texture_mirror_once
+  "GL_ATI_texture_mirror_once",
+#endif
+#ifdef GL_ATI_vertex_array_object
+  "GL_ATI_vertex_array_object",
+#endif
+#ifdef GL_ATI_vertex_attrib_array_object
+  "GL_ATI_vertex_attrib_array_object",
+#endif
+#ifdef GL_ATI_vertex_streams
+  "GL_ATI_vertex_streams",
+#endif
+#ifdef GL_EGL_KHR_context_flush_control
+  "GL_EGL_KHR_context_flush_control",
+#endif
+#ifdef GL_EGL_NV_robustness_video_memory_purge
+  "GL_EGL_NV_robustness_video_memory_purge",
+#endif
+#ifdef GL_EXT_422_pixels
+  "GL_EXT_422_pixels",
+#endif
+#ifdef GL_EXT_Cg_shader
+  "GL_EXT_Cg_shader",
+#endif
+#ifdef GL_EXT_EGL_image_array
+  "GL_EXT_EGL_image_array",
+#endif
+#ifdef GL_EXT_YUV_target
+  "GL_EXT_YUV_target",
+#endif
+#ifdef GL_EXT_abgr
+  "GL_EXT_abgr",
+#endif
+#ifdef GL_EXT_base_instance
+  "GL_EXT_base_instance",
+#endif
+#ifdef GL_EXT_bgra
+  "GL_EXT_bgra",
+#endif
+#ifdef GL_EXT_bindable_uniform
+  "GL_EXT_bindable_uniform",
+#endif
+#ifdef GL_EXT_blend_color
+  "GL_EXT_blend_color",
+#endif
+#ifdef GL_EXT_blend_equation_separate
+  "GL_EXT_blend_equation_separate",
+#endif
+#ifdef GL_EXT_blend_func_extended
+  "GL_EXT_blend_func_extended",
+#endif
+#ifdef GL_EXT_blend_func_separate
+  "GL_EXT_blend_func_separate",
+#endif
+#ifdef GL_EXT_blend_logic_op
+  "GL_EXT_blend_logic_op",
+#endif
+#ifdef GL_EXT_blend_minmax
+  "GL_EXT_blend_minmax",
+#endif
+#ifdef GL_EXT_blend_subtract
+  "GL_EXT_blend_subtract",
+#endif
+#ifdef GL_EXT_buffer_storage
+  "GL_EXT_buffer_storage",
+#endif
+#ifdef GL_EXT_clear_texture
+  "GL_EXT_clear_texture",
+#endif
+#ifdef GL_EXT_clip_cull_distance
+  "GL_EXT_clip_cull_distance",
+#endif
+#ifdef GL_EXT_clip_volume_hint
+  "GL_EXT_clip_volume_hint",
+#endif
+#ifdef GL_EXT_cmyka
+  "GL_EXT_cmyka",
+#endif
+#ifdef GL_EXT_color_buffer_float
+  "GL_EXT_color_buffer_float",
+#endif
+#ifdef GL_EXT_color_buffer_half_float
+  "GL_EXT_color_buffer_half_float",
+#endif
+#ifdef GL_EXT_color_subtable
+  "GL_EXT_color_subtable",
+#endif
+#ifdef GL_EXT_compiled_vertex_array
+  "GL_EXT_compiled_vertex_array",
+#endif
+#ifdef GL_EXT_compressed_ETC1_RGB8_sub_texture
+  "GL_EXT_compressed_ETC1_RGB8_sub_texture",
+#endif
+#ifdef GL_EXT_conservative_depth
+  "GL_EXT_conservative_depth",
+#endif
+#ifdef GL_EXT_convolution
+  "GL_EXT_convolution",
+#endif
+#ifdef GL_EXT_coordinate_frame
+  "GL_EXT_coordinate_frame",
+#endif
+#ifdef GL_EXT_copy_image
+  "GL_EXT_copy_image",
+#endif
+#ifdef GL_EXT_copy_texture
+  "GL_EXT_copy_texture",
+#endif
+#ifdef GL_EXT_cull_vertex
+  "GL_EXT_cull_vertex",
+#endif
+#ifdef GL_EXT_debug_label
+  "GL_EXT_debug_label",
+#endif
+#ifdef GL_EXT_debug_marker
+  "GL_EXT_debug_marker",
+#endif
+#ifdef GL_EXT_depth_bounds_test
+  "GL_EXT_depth_bounds_test",
+#endif
+#ifdef GL_EXT_direct_state_access
+  "GL_EXT_direct_state_access",
+#endif
+#ifdef GL_EXT_discard_framebuffer
+  "GL_EXT_discard_framebuffer",
+#endif
+#ifdef GL_EXT_draw_buffers
+  "GL_EXT_draw_buffers",
+#endif
+#ifdef GL_EXT_draw_buffers2
+  "GL_EXT_draw_buffers2",
+#endif
+#ifdef GL_EXT_draw_buffers_indexed
+  "GL_EXT_draw_buffers_indexed",
+#endif
+#ifdef GL_EXT_draw_elements_base_vertex
+  "GL_EXT_draw_elements_base_vertex",
+#endif
+#ifdef GL_EXT_draw_instanced
+  "GL_EXT_draw_instanced",
+#endif
+#ifdef GL_EXT_draw_range_elements
+  "GL_EXT_draw_range_elements",
+#endif
+#ifdef GL_EXT_external_buffer
+  "GL_EXT_external_buffer",
+#endif
+#ifdef GL_EXT_float_blend
+  "GL_EXT_float_blend",
+#endif
+#ifdef GL_EXT_fog_coord
+  "GL_EXT_fog_coord",
+#endif
+#ifdef GL_EXT_frag_depth
+  "GL_EXT_frag_depth",
+#endif
+#ifdef GL_EXT_fragment_lighting
+  "GL_EXT_fragment_lighting",
+#endif
+#ifdef GL_EXT_framebuffer_blit
+  "GL_EXT_framebuffer_blit",
+#endif
+#ifdef GL_EXT_framebuffer_multisample
+  "GL_EXT_framebuffer_multisample",
+#endif
+#ifdef GL_EXT_framebuffer_multisample_blit_scaled
+  "GL_EXT_framebuffer_multisample_blit_scaled",
+#endif
+#ifdef GL_EXT_framebuffer_object
+  "GL_EXT_framebuffer_object",
+#endif
+#ifdef GL_EXT_framebuffer_sRGB
+  "GL_EXT_framebuffer_sRGB",
+#endif
+#ifdef GL_EXT_geometry_point_size
+  "GL_EXT_geometry_point_size",
+#endif
+#ifdef GL_EXT_geometry_shader
+  "GL_EXT_geometry_shader",
+#endif
+#ifdef GL_EXT_geometry_shader4
+  "GL_EXT_geometry_shader4",
+#endif
+#ifdef GL_EXT_gpu_program_parameters
+  "GL_EXT_gpu_program_parameters",
+#endif
+#ifdef GL_EXT_gpu_shader4
+  "GL_EXT_gpu_shader4",
+#endif
+#ifdef GL_EXT_gpu_shader5
+  "GL_EXT_gpu_shader5",
+#endif
+#ifdef GL_EXT_histogram
+  "GL_EXT_histogram",
+#endif
+#ifdef GL_EXT_index_array_formats
+  "GL_EXT_index_array_formats",
+#endif
+#ifdef GL_EXT_index_func
+  "GL_EXT_index_func",
+#endif
+#ifdef GL_EXT_index_material
+  "GL_EXT_index_material",
+#endif
+#ifdef GL_EXT_index_texture
+  "GL_EXT_index_texture",
+#endif
+#ifdef GL_EXT_instanced_arrays
+  "GL_EXT_instanced_arrays",
+#endif
+#ifdef GL_EXT_light_texture
+  "GL_EXT_light_texture",
+#endif
+#ifdef GL_EXT_map_buffer_range
+  "GL_EXT_map_buffer_range",
+#endif
+#ifdef GL_EXT_memory_object
+  "GL_EXT_memory_object",
+#endif
+#ifdef GL_EXT_memory_object_fd
+  "GL_EXT_memory_object_fd",
+#endif
+#ifdef GL_EXT_memory_object_win32
+  "GL_EXT_memory_object_win32",
+#endif
+#ifdef GL_EXT_misc_attribute
+  "GL_EXT_misc_attribute",
+#endif
+#ifdef GL_EXT_multi_draw_arrays
+  "GL_EXT_multi_draw_arrays",
+#endif
+#ifdef GL_EXT_multi_draw_indirect
+  "GL_EXT_multi_draw_indirect",
+#endif
+#ifdef GL_EXT_multiple_textures
+  "GL_EXT_multiple_textures",
+#endif
+#ifdef GL_EXT_multisample
+  "GL_EXT_multisample",
+#endif
+#ifdef GL_EXT_multisample_compatibility
+  "GL_EXT_multisample_compatibility",
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture
+  "GL_EXT_multisampled_render_to_texture",
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture2
+  "GL_EXT_multisampled_render_to_texture2",
+#endif
+#ifdef GL_EXT_multiview_draw_buffers
+  "GL_EXT_multiview_draw_buffers",
+#endif
+#ifdef GL_EXT_packed_depth_stencil
+  "GL_EXT_packed_depth_stencil",
+#endif
+#ifdef GL_EXT_packed_float
+  "GL_EXT_packed_float",
+#endif
+#ifdef GL_EXT_packed_pixels
+  "GL_EXT_packed_pixels",
+#endif
+#ifdef GL_EXT_paletted_texture
+  "GL_EXT_paletted_texture",
+#endif
+#ifdef GL_EXT_pixel_buffer_object
+  "GL_EXT_pixel_buffer_object",
+#endif
+#ifdef GL_EXT_pixel_transform
+  "GL_EXT_pixel_transform",
+#endif
+#ifdef GL_EXT_pixel_transform_color_table
+  "GL_EXT_pixel_transform_color_table",
+#endif
+#ifdef GL_EXT_point_parameters
+  "GL_EXT_point_parameters",
+#endif
+#ifdef GL_EXT_polygon_offset
+  "GL_EXT_polygon_offset",
+#endif
+#ifdef GL_EXT_polygon_offset_clamp
+  "GL_EXT_polygon_offset_clamp",
+#endif
+#ifdef GL_EXT_post_depth_coverage
+  "GL_EXT_post_depth_coverage",
+#endif
+#ifdef GL_EXT_provoking_vertex
+  "GL_EXT_provoking_vertex",
+#endif
+#ifdef GL_EXT_pvrtc_sRGB
+  "GL_EXT_pvrtc_sRGB",
+#endif
+#ifdef GL_EXT_raster_multisample
+  "GL_EXT_raster_multisample",
+#endif
+#ifdef GL_EXT_read_format_bgra
+  "GL_EXT_read_format_bgra",
+#endif
+#ifdef GL_EXT_render_snorm
+  "GL_EXT_render_snorm",
+#endif
+#ifdef GL_EXT_rescale_normal
+  "GL_EXT_rescale_normal",
+#endif
+#ifdef GL_EXT_sRGB
+  "GL_EXT_sRGB",
+#endif
+#ifdef GL_EXT_sRGB_write_control
+  "GL_EXT_sRGB_write_control",
+#endif
+#ifdef GL_EXT_scene_marker
+  "GL_EXT_scene_marker",
+#endif
+#ifdef GL_EXT_secondary_color
+  "GL_EXT_secondary_color",
+#endif
+#ifdef GL_EXT_semaphore
+  "GL_EXT_semaphore",
+#endif
+#ifdef GL_EXT_semaphore_fd
+  "GL_EXT_semaphore_fd",
+#endif
+#ifdef GL_EXT_semaphore_win32
+  "GL_EXT_semaphore_win32",
+#endif
+#ifdef GL_EXT_separate_shader_objects
+  "GL_EXT_separate_shader_objects",
+#endif
+#ifdef GL_EXT_separate_specular_color
+  "GL_EXT_separate_specular_color",
+#endif
+#ifdef GL_EXT_shader_framebuffer_fetch
+  "GL_EXT_shader_framebuffer_fetch",
+#endif
+#ifdef GL_EXT_shader_group_vote
+  "GL_EXT_shader_group_vote",
+#endif
+#ifdef GL_EXT_shader_image_load_formatted
+  "GL_EXT_shader_image_load_formatted",
+#endif
+#ifdef GL_EXT_shader_image_load_store
+  "GL_EXT_shader_image_load_store",
+#endif
+#ifdef GL_EXT_shader_implicit_conversions
+  "GL_EXT_shader_implicit_conversions",
+#endif
+#ifdef GL_EXT_shader_integer_mix
+  "GL_EXT_shader_integer_mix",
+#endif
+#ifdef GL_EXT_shader_io_blocks
+  "GL_EXT_shader_io_blocks",
+#endif
+#ifdef GL_EXT_shader_non_constant_global_initializers
+  "GL_EXT_shader_non_constant_global_initializers",
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage
+  "GL_EXT_shader_pixel_local_storage",
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage2
+  "GL_EXT_shader_pixel_local_storage2",
+#endif
+#ifdef GL_EXT_shader_texture_lod
+  "GL_EXT_shader_texture_lod",
+#endif
+#ifdef GL_EXT_shadow_funcs
+  "GL_EXT_shadow_funcs",
+#endif
+#ifdef GL_EXT_shadow_samplers
+  "GL_EXT_shadow_samplers",
+#endif
+#ifdef GL_EXT_shared_texture_palette
+  "GL_EXT_shared_texture_palette",
+#endif
+#ifdef GL_EXT_sparse_texture
+  "GL_EXT_sparse_texture",
+#endif
+#ifdef GL_EXT_sparse_texture2
+  "GL_EXT_sparse_texture2",
+#endif
+#ifdef GL_EXT_stencil_clear_tag
+  "GL_EXT_stencil_clear_tag",
+#endif
+#ifdef GL_EXT_stencil_two_side
+  "GL_EXT_stencil_two_side",
+#endif
+#ifdef GL_EXT_stencil_wrap
+  "GL_EXT_stencil_wrap",
+#endif
+#ifdef GL_EXT_subtexture
+  "GL_EXT_subtexture",
+#endif
+#ifdef GL_EXT_texture
+  "GL_EXT_texture",
+#endif
+#ifdef GL_EXT_texture3D
+  "GL_EXT_texture3D",
+#endif
+#ifdef GL_EXT_texture_array
+  "GL_EXT_texture_array",
+#endif
+#ifdef GL_EXT_texture_buffer_object
+  "GL_EXT_texture_buffer_object",
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode
+  "GL_EXT_texture_compression_astc_decode_mode",
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode_rgb9e5
+  "GL_EXT_texture_compression_astc_decode_mode_rgb9e5",
+#endif
+#ifdef GL_EXT_texture_compression_bptc
+  "GL_EXT_texture_compression_bptc",
+#endif
+#ifdef GL_EXT_texture_compression_dxt1
+  "GL_EXT_texture_compression_dxt1",
+#endif
+#ifdef GL_EXT_texture_compression_latc
+  "GL_EXT_texture_compression_latc",
+#endif
+#ifdef GL_EXT_texture_compression_rgtc
+  "GL_EXT_texture_compression_rgtc",
+#endif
+#ifdef GL_EXT_texture_compression_s3tc
+  "GL_EXT_texture_compression_s3tc",
+#endif
+#ifdef GL_EXT_texture_cube_map
+  "GL_EXT_texture_cube_map",
+#endif
+#ifdef GL_EXT_texture_cube_map_array
+  "GL_EXT_texture_cube_map_array",
+#endif
+#ifdef GL_EXT_texture_edge_clamp
+  "GL_EXT_texture_edge_clamp",
+#endif
+#ifdef GL_EXT_texture_env
+  "GL_EXT_texture_env",
+#endif
+#ifdef GL_EXT_texture_env_add
+  "GL_EXT_texture_env_add",
+#endif
+#ifdef GL_EXT_texture_env_combine
+  "GL_EXT_texture_env_combine",
+#endif
+#ifdef GL_EXT_texture_env_dot3
+  "GL_EXT_texture_env_dot3",
+#endif
+#ifdef GL_EXT_texture_filter_anisotropic
+  "GL_EXT_texture_filter_anisotropic",
+#endif
+#ifdef GL_EXT_texture_filter_minmax
+  "GL_EXT_texture_filter_minmax",
+#endif
+#ifdef GL_EXT_texture_format_BGRA8888
+  "GL_EXT_texture_format_BGRA8888",
+#endif
+#ifdef GL_EXT_texture_integer
+  "GL_EXT_texture_integer",
+#endif
+#ifdef GL_EXT_texture_lod_bias
+  "GL_EXT_texture_lod_bias",
+#endif
+#ifdef GL_EXT_texture_mirror_clamp
+  "GL_EXT_texture_mirror_clamp",
+#endif
+#ifdef GL_EXT_texture_norm16
+  "GL_EXT_texture_norm16",
+#endif
+#ifdef GL_EXT_texture_object
+  "GL_EXT_texture_object",
+#endif
+#ifdef GL_EXT_texture_perturb_normal
+  "GL_EXT_texture_perturb_normal",
+#endif
+#ifdef GL_EXT_texture_rectangle
+  "GL_EXT_texture_rectangle",
+#endif
+#ifdef GL_EXT_texture_rg
+  "GL_EXT_texture_rg",
+#endif
+#ifdef GL_EXT_texture_sRGB
+  "GL_EXT_texture_sRGB",
+#endif
+#ifdef GL_EXT_texture_sRGB_R8
+  "GL_EXT_texture_sRGB_R8",
+#endif
+#ifdef GL_EXT_texture_sRGB_RG8
+  "GL_EXT_texture_sRGB_RG8",
+#endif
+#ifdef GL_EXT_texture_sRGB_decode
+  "GL_EXT_texture_sRGB_decode",
+#endif
+#ifdef GL_EXT_texture_shared_exponent
+  "GL_EXT_texture_shared_exponent",
+#endif
+#ifdef GL_EXT_texture_snorm
+  "GL_EXT_texture_snorm",
+#endif
+#ifdef GL_EXT_texture_storage
+  "GL_EXT_texture_storage",
+#endif
+#ifdef GL_EXT_texture_swizzle
+  "GL_EXT_texture_swizzle",
+#endif
+#ifdef GL_EXT_texture_type_2_10_10_10_REV
+  "GL_EXT_texture_type_2_10_10_10_REV",
+#endif
+#ifdef GL_EXT_texture_view
+  "GL_EXT_texture_view",
+#endif
+#ifdef GL_EXT_timer_query
+  "GL_EXT_timer_query",
+#endif
+#ifdef GL_EXT_transform_feedback
+  "GL_EXT_transform_feedback",
+#endif
+#ifdef GL_EXT_unpack_subimage
+  "GL_EXT_unpack_subimage",
+#endif
+#ifdef GL_EXT_vertex_array
+  "GL_EXT_vertex_array",
+#endif
+#ifdef GL_EXT_vertex_array_bgra
+  "GL_EXT_vertex_array_bgra",
+#endif
+#ifdef GL_EXT_vertex_array_setXXX
+  "GL_EXT_vertex_array_setXXX",
+#endif
+#ifdef GL_EXT_vertex_attrib_64bit
+  "GL_EXT_vertex_attrib_64bit",
+#endif
+#ifdef GL_EXT_vertex_shader
+  "GL_EXT_vertex_shader",
+#endif
+#ifdef GL_EXT_vertex_weighting
+  "GL_EXT_vertex_weighting",
+#endif
+#ifdef GL_EXT_win32_keyed_mutex
+  "GL_EXT_win32_keyed_mutex",
+#endif
+#ifdef GL_EXT_window_rectangles
+  "GL_EXT_window_rectangles",
+#endif
+#ifdef GL_EXT_x11_sync_object
+  "GL_EXT_x11_sync_object",
+#endif
+#ifdef GL_GREMEDY_frame_terminator
+  "GL_GREMEDY_frame_terminator",
+#endif
+#ifdef GL_GREMEDY_string_marker
+  "GL_GREMEDY_string_marker",
+#endif
+#ifdef GL_HP_convolution_border_modes
+  "GL_HP_convolution_border_modes",
+#endif
+#ifdef GL_HP_image_transform
+  "GL_HP_image_transform",
+#endif
+#ifdef GL_HP_occlusion_test
+  "GL_HP_occlusion_test",
+#endif
+#ifdef GL_HP_texture_lighting
+  "GL_HP_texture_lighting",
+#endif
+#ifdef GL_IBM_cull_vertex
+  "GL_IBM_cull_vertex",
+#endif
+#ifdef GL_IBM_multimode_draw_arrays
+  "GL_IBM_multimode_draw_arrays",
+#endif
+#ifdef GL_IBM_rasterpos_clip
+  "GL_IBM_rasterpos_clip",
+#endif
+#ifdef GL_IBM_static_data
+  "GL_IBM_static_data",
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+  "GL_IBM_texture_mirrored_repeat",
+#endif
+#ifdef GL_IBM_vertex_array_lists
+  "GL_IBM_vertex_array_lists",
+#endif
+#ifdef GL_INGR_color_clamp
+  "GL_INGR_color_clamp",
+#endif
+#ifdef GL_INGR_interlace_read
+  "GL_INGR_interlace_read",
+#endif
+#ifdef GL_INTEL_conservative_rasterization
+  "GL_INTEL_conservative_rasterization",
+#endif
+#ifdef GL_INTEL_fragment_shader_ordering
+  "GL_INTEL_fragment_shader_ordering",
+#endif
+#ifdef GL_INTEL_framebuffer_CMAA
+  "GL_INTEL_framebuffer_CMAA",
+#endif
+#ifdef GL_INTEL_map_texture
+  "GL_INTEL_map_texture",
+#endif
+#ifdef GL_INTEL_parallel_arrays
+  "GL_INTEL_parallel_arrays",
+#endif
+#ifdef GL_INTEL_performance_query
+  "GL_INTEL_performance_query",
+#endif
+#ifdef GL_INTEL_texture_scissor
+  "GL_INTEL_texture_scissor",
+#endif
+#ifdef GL_KHR_blend_equation_advanced
+  "GL_KHR_blend_equation_advanced",
+#endif
+#ifdef GL_KHR_blend_equation_advanced_coherent
+  "GL_KHR_blend_equation_advanced_coherent",
+#endif
+#ifdef GL_KHR_context_flush_control
+  "GL_KHR_context_flush_control",
+#endif
+#ifdef GL_KHR_debug
+  "GL_KHR_debug",
+#endif
+#ifdef GL_KHR_no_error
+  "GL_KHR_no_error",
+#endif
+#ifdef GL_KHR_parallel_shader_compile
+  "GL_KHR_parallel_shader_compile",
+#endif
+#ifdef GL_KHR_robust_buffer_access_behavior
+  "GL_KHR_robust_buffer_access_behavior",
+#endif
+#ifdef GL_KHR_robustness
+  "GL_KHR_robustness",
+#endif
+#ifdef GL_KHR_texture_compression_astc_hdr
+  "GL_KHR_texture_compression_astc_hdr",
+#endif
+#ifdef GL_KHR_texture_compression_astc_ldr
+  "GL_KHR_texture_compression_astc_ldr",
+#endif
+#ifdef GL_KHR_texture_compression_astc_sliced_3d
+  "GL_KHR_texture_compression_astc_sliced_3d",
+#endif
+#ifdef GL_KTX_buffer_region
+  "GL_KTX_buffer_region",
+#endif
+#ifdef GL_MESAX_texture_stack
+  "GL_MESAX_texture_stack",
+#endif
+#ifdef GL_MESA_pack_invert
+  "GL_MESA_pack_invert",
+#endif
+#ifdef GL_MESA_resize_buffers
+  "GL_MESA_resize_buffers",
+#endif
+#ifdef GL_MESA_shader_integer_functions
+  "GL_MESA_shader_integer_functions",
+#endif
+#ifdef GL_MESA_window_pos
+  "GL_MESA_window_pos",
+#endif
+#ifdef GL_MESA_ycbcr_texture
+  "GL_MESA_ycbcr_texture",
+#endif
+#ifdef GL_NVX_blend_equation_advanced_multi_draw_buffers
+  "GL_NVX_blend_equation_advanced_multi_draw_buffers",
+#endif
+#ifdef GL_NVX_conditional_render
+  "GL_NVX_conditional_render",
+#endif
+#ifdef GL_NVX_gpu_memory_info
+  "GL_NVX_gpu_memory_info",
+#endif
+#ifdef GL_NVX_linked_gpu_multicast
+  "GL_NVX_linked_gpu_multicast",
+#endif
+#ifdef GL_NV_3dvision_settings
+  "GL_NV_3dvision_settings",
+#endif
+#ifdef GL_NV_EGL_stream_consumer_external
+  "GL_NV_EGL_stream_consumer_external",
+#endif
+#ifdef GL_NV_alpha_to_coverage_dither_control
+  "GL_NV_alpha_to_coverage_dither_control",
+#endif
+#ifdef GL_NV_bgr
+  "GL_NV_bgr",
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect
+  "GL_NV_bindless_multi_draw_indirect",
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect_count
+  "GL_NV_bindless_multi_draw_indirect_count",
+#endif
+#ifdef GL_NV_bindless_texture
+  "GL_NV_bindless_texture",
+#endif
+#ifdef GL_NV_blend_equation_advanced
+  "GL_NV_blend_equation_advanced",
+#endif
+#ifdef GL_NV_blend_equation_advanced_coherent
+  "GL_NV_blend_equation_advanced_coherent",
+#endif
+#ifdef GL_NV_blend_minmax_factor
+  "GL_NV_blend_minmax_factor",
+#endif
+#ifdef GL_NV_blend_square
+  "GL_NV_blend_square",
+#endif
+#ifdef GL_NV_clip_space_w_scaling
+  "GL_NV_clip_space_w_scaling",
+#endif
+#ifdef GL_NV_command_list
+  "GL_NV_command_list",
+#endif
+#ifdef GL_NV_compute_program5
+  "GL_NV_compute_program5",
+#endif
+#ifdef GL_NV_conditional_render
+  "GL_NV_conditional_render",
+#endif
+#ifdef GL_NV_conservative_raster
+  "GL_NV_conservative_raster",
+#endif
+#ifdef GL_NV_conservative_raster_dilate
+  "GL_NV_conservative_raster_dilate",
+#endif
+#ifdef GL_NV_conservative_raster_pre_snap_triangles
+  "GL_NV_conservative_raster_pre_snap_triangles",
+#endif
+#ifdef GL_NV_copy_buffer
+  "GL_NV_copy_buffer",
+#endif
+#ifdef GL_NV_copy_depth_to_color
+  "GL_NV_copy_depth_to_color",
+#endif
+#ifdef GL_NV_copy_image
+  "GL_NV_copy_image",
+#endif
+#ifdef GL_NV_deep_texture3D
+  "GL_NV_deep_texture3D",
+#endif
+#ifdef GL_NV_depth_buffer_float
+  "GL_NV_depth_buffer_float",
+#endif
+#ifdef GL_NV_depth_clamp
+  "GL_NV_depth_clamp",
+#endif
+#ifdef GL_NV_depth_range_unclamped
+  "GL_NV_depth_range_unclamped",
+#endif
+#ifdef GL_NV_draw_buffers
+  "GL_NV_draw_buffers",
+#endif
+#ifdef GL_NV_draw_instanced
+  "GL_NV_draw_instanced",
+#endif
+#ifdef GL_NV_draw_texture
+  "GL_NV_draw_texture",
+#endif
+#ifdef GL_NV_draw_vulkan_image
+  "GL_NV_draw_vulkan_image",
+#endif
+#ifdef GL_NV_evaluators
+  "GL_NV_evaluators",
+#endif
+#ifdef GL_NV_explicit_attrib_location
+  "GL_NV_explicit_attrib_location",
+#endif
+#ifdef GL_NV_explicit_multisample
+  "GL_NV_explicit_multisample",
+#endif
+#ifdef GL_NV_fbo_color_attachments
+  "GL_NV_fbo_color_attachments",
+#endif
+#ifdef GL_NV_fence
+  "GL_NV_fence",
+#endif
+#ifdef GL_NV_fill_rectangle
+  "GL_NV_fill_rectangle",
+#endif
+#ifdef GL_NV_float_buffer
+  "GL_NV_float_buffer",
+#endif
+#ifdef GL_NV_fog_distance
+  "GL_NV_fog_distance",
+#endif
+#ifdef GL_NV_fragment_coverage_to_color
+  "GL_NV_fragment_coverage_to_color",
+#endif
+#ifdef GL_NV_fragment_program
+  "GL_NV_fragment_program",
+#endif
+#ifdef GL_NV_fragment_program2
+  "GL_NV_fragment_program2",
+#endif
+#ifdef GL_NV_fragment_program4
+  "GL_NV_fragment_program4",
+#endif
+#ifdef GL_NV_fragment_program_option
+  "GL_NV_fragment_program_option",
+#endif
+#ifdef GL_NV_fragment_shader_interlock
+  "GL_NV_fragment_shader_interlock",
+#endif
+#ifdef GL_NV_framebuffer_blit
+  "GL_NV_framebuffer_blit",
+#endif
+#ifdef GL_NV_framebuffer_mixed_samples
+  "GL_NV_framebuffer_mixed_samples",
+#endif
+#ifdef GL_NV_framebuffer_multisample
+  "GL_NV_framebuffer_multisample",
+#endif
+#ifdef GL_NV_framebuffer_multisample_coverage
+  "GL_NV_framebuffer_multisample_coverage",
+#endif
+#ifdef GL_NV_generate_mipmap_sRGB
+  "GL_NV_generate_mipmap_sRGB",
+#endif
+#ifdef GL_NV_geometry_program4
+  "GL_NV_geometry_program4",
+#endif
+#ifdef GL_NV_geometry_shader4
+  "GL_NV_geometry_shader4",
+#endif
+#ifdef GL_NV_geometry_shader_passthrough
+  "GL_NV_geometry_shader_passthrough",
+#endif
+#ifdef GL_NV_gpu_multicast
+  "GL_NV_gpu_multicast",
+#endif
+#ifdef GL_NV_gpu_program4
+  "GL_NV_gpu_program4",
+#endif
+#ifdef GL_NV_gpu_program5
+  "GL_NV_gpu_program5",
+#endif
+#ifdef GL_NV_gpu_program5_mem_extended
+  "GL_NV_gpu_program5_mem_extended",
+#endif
+#ifdef GL_NV_gpu_program_fp64
+  "GL_NV_gpu_program_fp64",
+#endif
+#ifdef GL_NV_gpu_shader5
+  "GL_NV_gpu_shader5",
+#endif
+#ifdef GL_NV_half_float
+  "GL_NV_half_float",
+#endif
+#ifdef GL_NV_image_formats
+  "GL_NV_image_formats",
+#endif
+#ifdef GL_NV_instanced_arrays
+  "GL_NV_instanced_arrays",
+#endif
+#ifdef GL_NV_internalformat_sample_query
+  "GL_NV_internalformat_sample_query",
+#endif
+#ifdef GL_NV_light_max_exponent
+  "GL_NV_light_max_exponent",
+#endif
+#ifdef GL_NV_multisample_coverage
+  "GL_NV_multisample_coverage",
+#endif
+#ifdef GL_NV_multisample_filter_hint
+  "GL_NV_multisample_filter_hint",
+#endif
+#ifdef GL_NV_non_square_matrices
+  "GL_NV_non_square_matrices",
+#endif
+#ifdef GL_NV_occlusion_query
+  "GL_NV_occlusion_query",
+#endif
+#ifdef GL_NV_pack_subimage
+  "GL_NV_pack_subimage",
+#endif
+#ifdef GL_NV_packed_depth_stencil
+  "GL_NV_packed_depth_stencil",
+#endif
+#ifdef GL_NV_packed_float
+  "GL_NV_packed_float",
+#endif
+#ifdef GL_NV_packed_float_linear
+  "GL_NV_packed_float_linear",
+#endif
+#ifdef GL_NV_parameter_buffer_object
+  "GL_NV_parameter_buffer_object",
+#endif
+#ifdef GL_NV_parameter_buffer_object2
+  "GL_NV_parameter_buffer_object2",
+#endif
+#ifdef GL_NV_path_rendering
+  "GL_NV_path_rendering",
+#endif
+#ifdef GL_NV_path_rendering_shared_edge
+  "GL_NV_path_rendering_shared_edge",
+#endif
+#ifdef GL_NV_pixel_buffer_object
+  "GL_NV_pixel_buffer_object",
+#endif
+#ifdef GL_NV_pixel_data_range
+  "GL_NV_pixel_data_range",
+#endif
+#ifdef GL_NV_platform_binary
+  "GL_NV_platform_binary",
+#endif
+#ifdef GL_NV_point_sprite
+  "GL_NV_point_sprite",
+#endif
+#ifdef GL_NV_polygon_mode
+  "GL_NV_polygon_mode",
+#endif
+#ifdef GL_NV_present_video
+  "GL_NV_present_video",
+#endif
+#ifdef GL_NV_primitive_restart
+  "GL_NV_primitive_restart",
+#endif
+#ifdef GL_NV_read_depth
+  "GL_NV_read_depth",
+#endif
+#ifdef GL_NV_read_depth_stencil
+  "GL_NV_read_depth_stencil",
+#endif
+#ifdef GL_NV_read_stencil
+  "GL_NV_read_stencil",
+#endif
+#ifdef GL_NV_register_combiners
+  "GL_NV_register_combiners",
+#endif
+#ifdef GL_NV_register_combiners2
+  "GL_NV_register_combiners2",
+#endif
+#ifdef GL_NV_robustness_video_memory_purge
+  "GL_NV_robustness_video_memory_purge",
+#endif
+#ifdef GL_NV_sRGB_formats
+  "GL_NV_sRGB_formats",
+#endif
+#ifdef GL_NV_sample_locations
+  "GL_NV_sample_locations",
+#endif
+#ifdef GL_NV_sample_mask_override_coverage
+  "GL_NV_sample_mask_override_coverage",
+#endif
+#ifdef GL_NV_shader_atomic_counters
+  "GL_NV_shader_atomic_counters",
+#endif
+#ifdef GL_NV_shader_atomic_float
+  "GL_NV_shader_atomic_float",
+#endif
+#ifdef GL_NV_shader_atomic_float64
+  "GL_NV_shader_atomic_float64",
+#endif
+#ifdef GL_NV_shader_atomic_fp16_vector
+  "GL_NV_shader_atomic_fp16_vector",
+#endif
+#ifdef GL_NV_shader_atomic_int64
+  "GL_NV_shader_atomic_int64",
+#endif
+#ifdef GL_NV_shader_buffer_load
+  "GL_NV_shader_buffer_load",
+#endif
+#ifdef GL_NV_shader_noperspective_interpolation
+  "GL_NV_shader_noperspective_interpolation",
+#endif
+#ifdef GL_NV_shader_storage_buffer_object
+  "GL_NV_shader_storage_buffer_object",
+#endif
+#ifdef GL_NV_shader_thread_group
+  "GL_NV_shader_thread_group",
+#endif
+#ifdef GL_NV_shader_thread_shuffle
+  "GL_NV_shader_thread_shuffle",
+#endif
+#ifdef GL_NV_shadow_samplers_array
+  "GL_NV_shadow_samplers_array",
+#endif
+#ifdef GL_NV_shadow_samplers_cube
+  "GL_NV_shadow_samplers_cube",
+#endif
+#ifdef GL_NV_stereo_view_rendering
+  "GL_NV_stereo_view_rendering",
+#endif
+#ifdef GL_NV_tessellation_program5
+  "GL_NV_tessellation_program5",
+#endif
+#ifdef GL_NV_texgen_emboss
+  "GL_NV_texgen_emboss",
+#endif
+#ifdef GL_NV_texgen_reflection
+  "GL_NV_texgen_reflection",
+#endif
+#ifdef GL_NV_texture_array
+  "GL_NV_texture_array",
+#endif
+#ifdef GL_NV_texture_barrier
+  "GL_NV_texture_barrier",
+#endif
+#ifdef GL_NV_texture_border_clamp
+  "GL_NV_texture_border_clamp",
+#endif
+#ifdef GL_NV_texture_compression_latc
+  "GL_NV_texture_compression_latc",
+#endif
+#ifdef GL_NV_texture_compression_s3tc
+  "GL_NV_texture_compression_s3tc",
+#endif
+#ifdef GL_NV_texture_compression_s3tc_update
+  "GL_NV_texture_compression_s3tc_update",
+#endif
+#ifdef GL_NV_texture_compression_vtc
+  "GL_NV_texture_compression_vtc",
+#endif
+#ifdef GL_NV_texture_env_combine4
+  "GL_NV_texture_env_combine4",
+#endif
+#ifdef GL_NV_texture_expand_normal
+  "GL_NV_texture_expand_normal",
+#endif
+#ifdef GL_NV_texture_multisample
+  "GL_NV_texture_multisample",
+#endif
+#ifdef GL_NV_texture_npot_2D_mipmap
+  "GL_NV_texture_npot_2D_mipmap",
+#endif
+#ifdef GL_NV_texture_rectangle
+  "GL_NV_texture_rectangle",
+#endif
+#ifdef GL_NV_texture_rectangle_compressed
+  "GL_NV_texture_rectangle_compressed",
+#endif
+#ifdef GL_NV_texture_shader
+  "GL_NV_texture_shader",
+#endif
+#ifdef GL_NV_texture_shader2
+  "GL_NV_texture_shader2",
+#endif
+#ifdef GL_NV_texture_shader3
+  "GL_NV_texture_shader3",
+#endif
+#ifdef GL_NV_transform_feedback
+  "GL_NV_transform_feedback",
+#endif
+#ifdef GL_NV_transform_feedback2
+  "GL_NV_transform_feedback2",
+#endif
+#ifdef GL_NV_uniform_buffer_unified_memory
+  "GL_NV_uniform_buffer_unified_memory",
+#endif
+#ifdef GL_NV_vdpau_interop
+  "GL_NV_vdpau_interop",
+#endif
+#ifdef GL_NV_vertex_array_range
+  "GL_NV_vertex_array_range",
+#endif
+#ifdef GL_NV_vertex_array_range2
+  "GL_NV_vertex_array_range2",
+#endif
+#ifdef GL_NV_vertex_attrib_integer_64bit
+  "GL_NV_vertex_attrib_integer_64bit",
+#endif
+#ifdef GL_NV_vertex_buffer_unified_memory
+  "GL_NV_vertex_buffer_unified_memory",
+#endif
+#ifdef GL_NV_vertex_program
+  "GL_NV_vertex_program",
+#endif
+#ifdef GL_NV_vertex_program1_1
+  "GL_NV_vertex_program1_1",
+#endif
+#ifdef GL_NV_vertex_program2
+  "GL_NV_vertex_program2",
+#endif
+#ifdef GL_NV_vertex_program2_option
+  "GL_NV_vertex_program2_option",
+#endif
+#ifdef GL_NV_vertex_program3
+  "GL_NV_vertex_program3",
+#endif
+#ifdef GL_NV_vertex_program4
+  "GL_NV_vertex_program4",
+#endif
+#ifdef GL_NV_video_capture
+  "GL_NV_video_capture",
+#endif
+#ifdef GL_NV_viewport_array
+  "GL_NV_viewport_array",
+#endif
+#ifdef GL_NV_viewport_array2
+  "GL_NV_viewport_array2",
+#endif
+#ifdef GL_NV_viewport_swizzle
+  "GL_NV_viewport_swizzle",
+#endif
+#ifdef GL_OES_byte_coordinates
+  "GL_OES_byte_coordinates",
+#endif
+#ifdef GL_OML_interlace
+  "GL_OML_interlace",
+#endif
+#ifdef GL_OML_resample
+  "GL_OML_resample",
+#endif
+#ifdef GL_OML_subsample
+  "GL_OML_subsample",
+#endif
+#ifdef GL_OVR_multiview
+  "GL_OVR_multiview",
+#endif
+#ifdef GL_OVR_multiview2
+  "GL_OVR_multiview2",
+#endif
+#ifdef GL_OVR_multiview_multisampled_render_to_texture
+  "GL_OVR_multiview_multisampled_render_to_texture",
+#endif
+#ifdef GL_PGI_misc_hints
+  "GL_PGI_misc_hints",
+#endif
+#ifdef GL_PGI_vertex_hints
+  "GL_PGI_vertex_hints",
+#endif
+#ifdef GL_QCOM_alpha_test
+  "GL_QCOM_alpha_test",
+#endif
+#ifdef GL_QCOM_binning_control
+  "GL_QCOM_binning_control",
+#endif
+#ifdef GL_QCOM_driver_control
+  "GL_QCOM_driver_control",
+#endif
+#ifdef GL_QCOM_extended_get
+  "GL_QCOM_extended_get",
+#endif
+#ifdef GL_QCOM_extended_get2
+  "GL_QCOM_extended_get2",
+#endif
+#ifdef GL_QCOM_framebuffer_foveated
+  "GL_QCOM_framebuffer_foveated",
+#endif
+#ifdef GL_QCOM_perfmon_global_mode
+  "GL_QCOM_perfmon_global_mode",
+#endif
+#ifdef GL_QCOM_shader_framebuffer_fetch_noncoherent
+  "GL_QCOM_shader_framebuffer_fetch_noncoherent",
+#endif
+#ifdef GL_QCOM_tiled_rendering
+  "GL_QCOM_tiled_rendering",
+#endif
+#ifdef GL_QCOM_writeonly_rendering
+  "GL_QCOM_writeonly_rendering",
+#endif
+#ifdef GL_REGAL_ES1_0_compatibility
+  "GL_REGAL_ES1_0_compatibility",
+#endif
+#ifdef GL_REGAL_ES1_1_compatibility
+  "GL_REGAL_ES1_1_compatibility",
+#endif
+#ifdef GL_REGAL_enable
+  "GL_REGAL_enable",
+#endif
+#ifdef GL_REGAL_error_string
+  "GL_REGAL_error_string",
+#endif
+#ifdef GL_REGAL_extension_query
+  "GL_REGAL_extension_query",
+#endif
+#ifdef GL_REGAL_log
+  "GL_REGAL_log",
+#endif
+#ifdef GL_REGAL_proc_address
+  "GL_REGAL_proc_address",
+#endif
+#ifdef GL_REND_screen_coordinates
+  "GL_REND_screen_coordinates",
+#endif
+#ifdef GL_S3_s3tc
+  "GL_S3_s3tc",
+#endif
+#ifdef GL_SGIS_clip_band_hint
+  "GL_SGIS_clip_band_hint",
+#endif
+#ifdef GL_SGIS_color_range
+  "GL_SGIS_color_range",
+#endif
+#ifdef GL_SGIS_detail_texture
+  "GL_SGIS_detail_texture",
+#endif
+#ifdef GL_SGIS_fog_function
+  "GL_SGIS_fog_function",
+#endif
+#ifdef GL_SGIS_generate_mipmap
+  "GL_SGIS_generate_mipmap",
+#endif
+#ifdef GL_SGIS_line_texgen
+  "GL_SGIS_line_texgen",
+#endif
+#ifdef GL_SGIS_multisample
+  "GL_SGIS_multisample",
+#endif
+#ifdef GL_SGIS_multitexture
+  "GL_SGIS_multitexture",
+#endif
+#ifdef GL_SGIS_pixel_texture
+  "GL_SGIS_pixel_texture",
+#endif
+#ifdef GL_SGIS_point_line_texgen
+  "GL_SGIS_point_line_texgen",
+#endif
+#ifdef GL_SGIS_shared_multisample
+  "GL_SGIS_shared_multisample",
+#endif
+#ifdef GL_SGIS_sharpen_texture
+  "GL_SGIS_sharpen_texture",
+#endif
+#ifdef GL_SGIS_texture4D
+  "GL_SGIS_texture4D",
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+  "GL_SGIS_texture_border_clamp",
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+  "GL_SGIS_texture_edge_clamp",
+#endif
+#ifdef GL_SGIS_texture_filter4
+  "GL_SGIS_texture_filter4",
+#endif
+#ifdef GL_SGIS_texture_lod
+  "GL_SGIS_texture_lod",
+#endif
+#ifdef GL_SGIS_texture_select
+  "GL_SGIS_texture_select",
+#endif
+#ifdef GL_SGIX_async
+  "GL_SGIX_async",
+#endif
+#ifdef GL_SGIX_async_histogram
+  "GL_SGIX_async_histogram",
+#endif
+#ifdef GL_SGIX_async_pixel
+  "GL_SGIX_async_pixel",
+#endif
+#ifdef GL_SGIX_bali_g_instruments
+  "GL_SGIX_bali_g_instruments",
+#endif
+#ifdef GL_SGIX_bali_r_instruments
+  "GL_SGIX_bali_r_instruments",
+#endif
+#ifdef GL_SGIX_bali_timer_instruments
+  "GL_SGIX_bali_timer_instruments",
+#endif
+#ifdef GL_SGIX_blend_alpha_minmax
+  "GL_SGIX_blend_alpha_minmax",
+#endif
+#ifdef GL_SGIX_blend_cadd
+  "GL_SGIX_blend_cadd",
+#endif
+#ifdef GL_SGIX_blend_cmultiply
+  "GL_SGIX_blend_cmultiply",
+#endif
+#ifdef GL_SGIX_calligraphic_fragment
+  "GL_SGIX_calligraphic_fragment",
+#endif
+#ifdef GL_SGIX_clipmap
+  "GL_SGIX_clipmap",
+#endif
+#ifdef GL_SGIX_color_matrix_accuracy
+  "GL_SGIX_color_matrix_accuracy",
+#endif
+#ifdef GL_SGIX_color_table_index_mode
+  "GL_SGIX_color_table_index_mode",
+#endif
+#ifdef GL_SGIX_complex_polar
+  "GL_SGIX_complex_polar",
+#endif
+#ifdef GL_SGIX_convolution_accuracy
+  "GL_SGIX_convolution_accuracy",
+#endif
+#ifdef GL_SGIX_cube_map
+  "GL_SGIX_cube_map",
+#endif
+#ifdef GL_SGIX_cylinder_texgen
+  "GL_SGIX_cylinder_texgen",
+#endif
+#ifdef GL_SGIX_datapipe
+  "GL_SGIX_datapipe",
+#endif
+#ifdef GL_SGIX_decimation
+  "GL_SGIX_decimation",
+#endif
+#ifdef GL_SGIX_depth_pass_instrument
+  "GL_SGIX_depth_pass_instrument",
+#endif
+#ifdef GL_SGIX_depth_texture
+  "GL_SGIX_depth_texture",
+#endif
+#ifdef GL_SGIX_dvc
+  "GL_SGIX_dvc",
+#endif
+#ifdef GL_SGIX_flush_raster
+  "GL_SGIX_flush_raster",
+#endif
+#ifdef GL_SGIX_fog_blend
+  "GL_SGIX_fog_blend",
+#endif
+#ifdef GL_SGIX_fog_factor_to_alpha
+  "GL_SGIX_fog_factor_to_alpha",
+#endif
+#ifdef GL_SGIX_fog_layers
+  "GL_SGIX_fog_layers",
+#endif
+#ifdef GL_SGIX_fog_offset
+  "GL_SGIX_fog_offset",
+#endif
+#ifdef GL_SGIX_fog_patchy
+  "GL_SGIX_fog_patchy",
+#endif
+#ifdef GL_SGIX_fog_scale
+  "GL_SGIX_fog_scale",
+#endif
+#ifdef GL_SGIX_fog_texture
+  "GL_SGIX_fog_texture",
+#endif
+#ifdef GL_SGIX_fragment_lighting_space
+  "GL_SGIX_fragment_lighting_space",
+#endif
+#ifdef GL_SGIX_fragment_specular_lighting
+  "GL_SGIX_fragment_specular_lighting",
+#endif
+#ifdef GL_SGIX_fragments_instrument
+  "GL_SGIX_fragments_instrument",
+#endif
+#ifdef GL_SGIX_framezoom
+  "GL_SGIX_framezoom",
+#endif
+#ifdef GL_SGIX_icc_texture
+  "GL_SGIX_icc_texture",
+#endif
+#ifdef GL_SGIX_igloo_interface
+  "GL_SGIX_igloo_interface",
+#endif
+#ifdef GL_SGIX_image_compression
+  "GL_SGIX_image_compression",
+#endif
+#ifdef GL_SGIX_impact_pixel_texture
+  "GL_SGIX_impact_pixel_texture",
+#endif
+#ifdef GL_SGIX_instrument_error
+  "GL_SGIX_instrument_error",
+#endif
+#ifdef GL_SGIX_interlace
+  "GL_SGIX_interlace",
+#endif
+#ifdef GL_SGIX_ir_instrument1
+  "GL_SGIX_ir_instrument1",
+#endif
+#ifdef GL_SGIX_line_quality_hint
+  "GL_SGIX_line_quality_hint",
+#endif
+#ifdef GL_SGIX_list_priority
+  "GL_SGIX_list_priority",
+#endif
+#ifdef GL_SGIX_mpeg1
+  "GL_SGIX_mpeg1",
+#endif
+#ifdef GL_SGIX_mpeg2
+  "GL_SGIX_mpeg2",
+#endif
+#ifdef GL_SGIX_nonlinear_lighting_pervertex
+  "GL_SGIX_nonlinear_lighting_pervertex",
+#endif
+#ifdef GL_SGIX_nurbs_eval
+  "GL_SGIX_nurbs_eval",
+#endif
+#ifdef GL_SGIX_occlusion_instrument
+  "GL_SGIX_occlusion_instrument",
+#endif
+#ifdef GL_SGIX_packed_6bytes
+  "GL_SGIX_packed_6bytes",
+#endif
+#ifdef GL_SGIX_pixel_texture
+  "GL_SGIX_pixel_texture",
+#endif
+#ifdef GL_SGIX_pixel_texture_bits
+  "GL_SGIX_pixel_texture_bits",
+#endif
+#ifdef GL_SGIX_pixel_texture_lod
+  "GL_SGIX_pixel_texture_lod",
+#endif
+#ifdef GL_SGIX_pixel_tiles
+  "GL_SGIX_pixel_tiles",
+#endif
+#ifdef GL_SGIX_polynomial_ffd
+  "GL_SGIX_polynomial_ffd",
+#endif
+#ifdef GL_SGIX_quad_mesh
+  "GL_SGIX_quad_mesh",
+#endif
+#ifdef GL_SGIX_reference_plane
+  "GL_SGIX_reference_plane",
+#endif
+#ifdef GL_SGIX_resample
+  "GL_SGIX_resample",
+#endif
+#ifdef GL_SGIX_scalebias_hint
+  "GL_SGIX_scalebias_hint",
+#endif
+#ifdef GL_SGIX_shadow
+  "GL_SGIX_shadow",
+#endif
+#ifdef GL_SGIX_shadow_ambient
+  "GL_SGIX_shadow_ambient",
+#endif
+#ifdef GL_SGIX_slim
+  "GL_SGIX_slim",
+#endif
+#ifdef GL_SGIX_spotlight_cutoff
+  "GL_SGIX_spotlight_cutoff",
+#endif
+#ifdef GL_SGIX_sprite
+  "GL_SGIX_sprite",
+#endif
+#ifdef GL_SGIX_subdiv_patch
+  "GL_SGIX_subdiv_patch",
+#endif
+#ifdef GL_SGIX_subsample
+  "GL_SGIX_subsample",
+#endif
+#ifdef GL_SGIX_tag_sample_buffer
+  "GL_SGIX_tag_sample_buffer",
+#endif
+#ifdef GL_SGIX_texture_add_env
+  "GL_SGIX_texture_add_env",
+#endif
+#ifdef GL_SGIX_texture_coordinate_clamp
+  "GL_SGIX_texture_coordinate_clamp",
+#endif
+#ifdef GL_SGIX_texture_lod_bias
+  "GL_SGIX_texture_lod_bias",
+#endif
+#ifdef GL_SGIX_texture_mipmap_anisotropic
+  "GL_SGIX_texture_mipmap_anisotropic",
+#endif
+#ifdef GL_SGIX_texture_multi_buffer
+  "GL_SGIX_texture_multi_buffer",
+#endif
+#ifdef GL_SGIX_texture_phase
+  "GL_SGIX_texture_phase",
+#endif
+#ifdef GL_SGIX_texture_range
+  "GL_SGIX_texture_range",
+#endif
+#ifdef GL_SGIX_texture_scale_bias
+  "GL_SGIX_texture_scale_bias",
+#endif
+#ifdef GL_SGIX_texture_supersample
+  "GL_SGIX_texture_supersample",
+#endif
+#ifdef GL_SGIX_vector_ops
+  "GL_SGIX_vector_ops",
+#endif
+#ifdef GL_SGIX_vertex_array_object
+  "GL_SGIX_vertex_array_object",
+#endif
+#ifdef GL_SGIX_vertex_preclip
+  "GL_SGIX_vertex_preclip",
+#endif
+#ifdef GL_SGIX_vertex_preclip_hint
+  "GL_SGIX_vertex_preclip_hint",
+#endif
+#ifdef GL_SGIX_ycrcb
+  "GL_SGIX_ycrcb",
+#endif
+#ifdef GL_SGIX_ycrcb_subsample
+  "GL_SGIX_ycrcb_subsample",
+#endif
+#ifdef GL_SGIX_ycrcba
+  "GL_SGIX_ycrcba",
+#endif
+#ifdef GL_SGI_color_matrix
+  "GL_SGI_color_matrix",
+#endif
+#ifdef GL_SGI_color_table
+  "GL_SGI_color_table",
+#endif
+#ifdef GL_SGI_complex
+  "GL_SGI_complex",
+#endif
+#ifdef GL_SGI_complex_type
+  "GL_SGI_complex_type",
+#endif
+#ifdef GL_SGI_fft
+  "GL_SGI_fft",
+#endif
+#ifdef GL_SGI_texture_color_table
+  "GL_SGI_texture_color_table",
+#endif
+#ifdef GL_SUNX_constant_data
+  "GL_SUNX_constant_data",
+#endif
+#ifdef GL_SUN_convolution_border_modes
+  "GL_SUN_convolution_border_modes",
+#endif
+#ifdef GL_SUN_global_alpha
+  "GL_SUN_global_alpha",
+#endif
+#ifdef GL_SUN_mesh_array
+  "GL_SUN_mesh_array",
+#endif
+#ifdef GL_SUN_read_video_pixels
+  "GL_SUN_read_video_pixels",
+#endif
+#ifdef GL_SUN_slice_accum
+  "GL_SUN_slice_accum",
+#endif
+#ifdef GL_SUN_triangle_list
+  "GL_SUN_triangle_list",
+#endif
+#ifdef GL_SUN_vertex
+  "GL_SUN_vertex",
+#endif
+#ifdef GL_WIN_phong_shading
+  "GL_WIN_phong_shading",
+#endif
+#ifdef GL_WIN_scene_markerXXX
+  "GL_WIN_scene_markerXXX",
+#endif
+#ifdef GL_WIN_specular_fog
+  "GL_WIN_specular_fog",
+#endif
+#ifdef GL_WIN_swap_hint
+  "GL_WIN_swap_hint",
+#endif
+  NULL
+};
+
+/* Detected in the extension string or strings */
+static GLboolean  _glewExtensionString[801];
+/* Detected via extension string or experimental mode */
+static GLboolean* _glewExtensionEnabled[] = {
+#ifdef GL_VERSION_1_2
+  &__GLEW_VERSION_1_2,
+#endif
+#ifdef GL_VERSION_1_2_1
+  &__GLEW_VERSION_1_2_1,
+#endif
+#ifdef GL_VERSION_1_3
+  &__GLEW_VERSION_1_3,
+#endif
+#ifdef GL_VERSION_1_4
+  &__GLEW_VERSION_1_4,
+#endif
+#ifdef GL_VERSION_1_5
+  &__GLEW_VERSION_1_5,
+#endif
+#ifdef GL_VERSION_2_0
+  &__GLEW_VERSION_2_0,
+#endif
+#ifdef GL_VERSION_2_1
+  &__GLEW_VERSION_2_1,
+#endif
+#ifdef GL_VERSION_3_0
+  &__GLEW_VERSION_3_0,
+#endif
+#ifdef GL_VERSION_3_1
+  &__GLEW_VERSION_3_1,
+#endif
+#ifdef GL_VERSION_3_2
+  &__GLEW_VERSION_3_2,
+#endif
+#ifdef GL_VERSION_3_3
+  &__GLEW_VERSION_3_3,
+#endif
+#ifdef GL_VERSION_4_0
+  &__GLEW_VERSION_4_0,
+#endif
+#ifdef GL_VERSION_4_1
+  &__GLEW_VERSION_4_1,
+#endif
+#ifdef GL_VERSION_4_2
+  &__GLEW_VERSION_4_2,
+#endif
+#ifdef GL_VERSION_4_3
+  &__GLEW_VERSION_4_3,
+#endif
+#ifdef GL_VERSION_4_4
+  &__GLEW_VERSION_4_4,
+#endif
+#ifdef GL_VERSION_4_5
+  &__GLEW_VERSION_4_5,
+#endif
+#ifdef GL_VERSION_4_6
+  &__GLEW_VERSION_4_6,
+#endif
+#ifdef GL_3DFX_multisample
+  &__GLEW_3DFX_multisample,
+#endif
+#ifdef GL_3DFX_tbuffer
+  &__GLEW_3DFX_tbuffer,
+#endif
+#ifdef GL_3DFX_texture_compression_FXT1
+  &__GLEW_3DFX_texture_compression_FXT1,
+#endif
+#ifdef GL_AMD_blend_minmax_factor
+  &__GLEW_AMD_blend_minmax_factor,
+#endif
+#ifdef GL_AMD_compressed_3DC_texture
+  &__GLEW_AMD_compressed_3DC_texture,
+#endif
+#ifdef GL_AMD_compressed_ATC_texture
+  &__GLEW_AMD_compressed_ATC_texture,
+#endif
+#ifdef GL_AMD_conservative_depth
+  &__GLEW_AMD_conservative_depth,
+#endif
+#ifdef GL_AMD_debug_output
+  &__GLEW_AMD_debug_output,
+#endif
+#ifdef GL_AMD_depth_clamp_separate
+  &__GLEW_AMD_depth_clamp_separate,
+#endif
+#ifdef GL_AMD_draw_buffers_blend
+  &__GLEW_AMD_draw_buffers_blend,
+#endif
+#ifdef GL_AMD_framebuffer_sample_positions
+  &__GLEW_AMD_framebuffer_sample_positions,
+#endif
+#ifdef GL_AMD_gcn_shader
+  &__GLEW_AMD_gcn_shader,
+#endif
+#ifdef GL_AMD_gpu_shader_half_float
+  &__GLEW_AMD_gpu_shader_half_float,
+#endif
+#ifdef GL_AMD_gpu_shader_int16
+  &__GLEW_AMD_gpu_shader_int16,
+#endif
+#ifdef GL_AMD_gpu_shader_int64
+  &__GLEW_AMD_gpu_shader_int64,
+#endif
+#ifdef GL_AMD_interleaved_elements
+  &__GLEW_AMD_interleaved_elements,
+#endif
+#ifdef GL_AMD_multi_draw_indirect
+  &__GLEW_AMD_multi_draw_indirect,
+#endif
+#ifdef GL_AMD_name_gen_delete
+  &__GLEW_AMD_name_gen_delete,
+#endif
+#ifdef GL_AMD_occlusion_query_event
+  &__GLEW_AMD_occlusion_query_event,
+#endif
+#ifdef GL_AMD_performance_monitor
+  &__GLEW_AMD_performance_monitor,
+#endif
+#ifdef GL_AMD_pinned_memory
+  &__GLEW_AMD_pinned_memory,
+#endif
+#ifdef GL_AMD_program_binary_Z400
+  &__GLEW_AMD_program_binary_Z400,
+#endif
+#ifdef GL_AMD_query_buffer_object
+  &__GLEW_AMD_query_buffer_object,
+#endif
+#ifdef GL_AMD_sample_positions
+  &__GLEW_AMD_sample_positions,
+#endif
+#ifdef GL_AMD_seamless_cubemap_per_texture
+  &__GLEW_AMD_seamless_cubemap_per_texture,
+#endif
+#ifdef GL_AMD_shader_atomic_counter_ops
+  &__GLEW_AMD_shader_atomic_counter_ops,
+#endif
+#ifdef GL_AMD_shader_ballot
+  &__GLEW_AMD_shader_ballot,
+#endif
+#ifdef GL_AMD_shader_explicit_vertex_parameter
+  &__GLEW_AMD_shader_explicit_vertex_parameter,
+#endif
+#ifdef GL_AMD_shader_stencil_export
+  &__GLEW_AMD_shader_stencil_export,
+#endif
+#ifdef GL_AMD_shader_stencil_value_export
+  &__GLEW_AMD_shader_stencil_value_export,
+#endif
+#ifdef GL_AMD_shader_trinary_minmax
+  &__GLEW_AMD_shader_trinary_minmax,
+#endif
+#ifdef GL_AMD_sparse_texture
+  &__GLEW_AMD_sparse_texture,
+#endif
+#ifdef GL_AMD_stencil_operation_extended
+  &__GLEW_AMD_stencil_operation_extended,
+#endif
+#ifdef GL_AMD_texture_gather_bias_lod
+  &__GLEW_AMD_texture_gather_bias_lod,
+#endif
+#ifdef GL_AMD_texture_texture4
+  &__GLEW_AMD_texture_texture4,
+#endif
+#ifdef GL_AMD_transform_feedback3_lines_triangles
+  &__GLEW_AMD_transform_feedback3_lines_triangles,
+#endif
+#ifdef GL_AMD_transform_feedback4
+  &__GLEW_AMD_transform_feedback4,
+#endif
+#ifdef GL_AMD_vertex_shader_layer
+  &__GLEW_AMD_vertex_shader_layer,
+#endif
+#ifdef GL_AMD_vertex_shader_tessellator
+  &__GLEW_AMD_vertex_shader_tessellator,
+#endif
+#ifdef GL_AMD_vertex_shader_viewport_index
+  &__GLEW_AMD_vertex_shader_viewport_index,
+#endif
+#ifdef GL_ANDROID_extension_pack_es31a
+  &__GLEW_ANDROID_extension_pack_es31a,
+#endif
+#ifdef GL_ANGLE_depth_texture
+  &__GLEW_ANGLE_depth_texture,
+#endif
+#ifdef GL_ANGLE_framebuffer_blit
+  &__GLEW_ANGLE_framebuffer_blit,
+#endif
+#ifdef GL_ANGLE_framebuffer_multisample
+  &__GLEW_ANGLE_framebuffer_multisample,
+#endif
+#ifdef GL_ANGLE_instanced_arrays
+  &__GLEW_ANGLE_instanced_arrays,
+#endif
+#ifdef GL_ANGLE_pack_reverse_row_order
+  &__GLEW_ANGLE_pack_reverse_row_order,
+#endif
+#ifdef GL_ANGLE_program_binary
+  &__GLEW_ANGLE_program_binary,
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt1
+  &__GLEW_ANGLE_texture_compression_dxt1,
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt3
+  &__GLEW_ANGLE_texture_compression_dxt3,
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt5
+  &__GLEW_ANGLE_texture_compression_dxt5,
+#endif
+#ifdef GL_ANGLE_texture_usage
+  &__GLEW_ANGLE_texture_usage,
+#endif
+#ifdef GL_ANGLE_timer_query
+  &__GLEW_ANGLE_timer_query,
+#endif
+#ifdef GL_ANGLE_translated_shader_source
+  &__GLEW_ANGLE_translated_shader_source,
+#endif
+#ifdef GL_APPLE_aux_depth_stencil
+  &__GLEW_APPLE_aux_depth_stencil,
+#endif
+#ifdef GL_APPLE_client_storage
+  &__GLEW_APPLE_client_storage,
+#endif
+#ifdef GL_APPLE_clip_distance
+  &__GLEW_APPLE_clip_distance,
+#endif
+#ifdef GL_APPLE_color_buffer_packed_float
+  &__GLEW_APPLE_color_buffer_packed_float,
+#endif
+#ifdef GL_APPLE_copy_texture_levels
+  &__GLEW_APPLE_copy_texture_levels,
+#endif
+#ifdef GL_APPLE_element_array
+  &__GLEW_APPLE_element_array,
+#endif
+#ifdef GL_APPLE_fence
+  &__GLEW_APPLE_fence,
+#endif
+#ifdef GL_APPLE_float_pixels
+  &__GLEW_APPLE_float_pixels,
+#endif
+#ifdef GL_APPLE_flush_buffer_range
+  &__GLEW_APPLE_flush_buffer_range,
+#endif
+#ifdef GL_APPLE_framebuffer_multisample
+  &__GLEW_APPLE_framebuffer_multisample,
+#endif
+#ifdef GL_APPLE_object_purgeable
+  &__GLEW_APPLE_object_purgeable,
+#endif
+#ifdef GL_APPLE_pixel_buffer
+  &__GLEW_APPLE_pixel_buffer,
+#endif
+#ifdef GL_APPLE_rgb_422
+  &__GLEW_APPLE_rgb_422,
+#endif
+#ifdef GL_APPLE_row_bytes
+  &__GLEW_APPLE_row_bytes,
+#endif
+#ifdef GL_APPLE_specular_vector
+  &__GLEW_APPLE_specular_vector,
+#endif
+#ifdef GL_APPLE_sync
+  &__GLEW_APPLE_sync,
+#endif
+#ifdef GL_APPLE_texture_2D_limited_npot
+  &__GLEW_APPLE_texture_2D_limited_npot,
+#endif
+#ifdef GL_APPLE_texture_format_BGRA8888
+  &__GLEW_APPLE_texture_format_BGRA8888,
+#endif
+#ifdef GL_APPLE_texture_max_level
+  &__GLEW_APPLE_texture_max_level,
+#endif
+#ifdef GL_APPLE_texture_packed_float
+  &__GLEW_APPLE_texture_packed_float,
+#endif
+#ifdef GL_APPLE_texture_range
+  &__GLEW_APPLE_texture_range,
+#endif
+#ifdef GL_APPLE_transform_hint
+  &__GLEW_APPLE_transform_hint,
+#endif
+#ifdef GL_APPLE_vertex_array_object
+  &__GLEW_APPLE_vertex_array_object,
+#endif
+#ifdef GL_APPLE_vertex_array_range
+  &__GLEW_APPLE_vertex_array_range,
+#endif
+#ifdef GL_APPLE_vertex_program_evaluators
+  &__GLEW_APPLE_vertex_program_evaluators,
+#endif
+#ifdef GL_APPLE_ycbcr_422
+  &__GLEW_APPLE_ycbcr_422,
+#endif
+#ifdef GL_ARB_ES2_compatibility
+  &__GLEW_ARB_ES2_compatibility,
+#endif
+#ifdef GL_ARB_ES3_1_compatibility
+  &__GLEW_ARB_ES3_1_compatibility,
+#endif
+#ifdef GL_ARB_ES3_2_compatibility
+  &__GLEW_ARB_ES3_2_compatibility,
+#endif
+#ifdef GL_ARB_ES3_compatibility
+  &__GLEW_ARB_ES3_compatibility,
+#endif
+#ifdef GL_ARB_arrays_of_arrays
+  &__GLEW_ARB_arrays_of_arrays,
+#endif
+#ifdef GL_ARB_base_instance
+  &__GLEW_ARB_base_instance,
+#endif
+#ifdef GL_ARB_bindless_texture
+  &__GLEW_ARB_bindless_texture,
+#endif
+#ifdef GL_ARB_blend_func_extended
+  &__GLEW_ARB_blend_func_extended,
+#endif
+#ifdef GL_ARB_buffer_storage
+  &__GLEW_ARB_buffer_storage,
+#endif
+#ifdef GL_ARB_cl_event
+  &__GLEW_ARB_cl_event,
+#endif
+#ifdef GL_ARB_clear_buffer_object
+  &__GLEW_ARB_clear_buffer_object,
+#endif
+#ifdef GL_ARB_clear_texture
+  &__GLEW_ARB_clear_texture,
+#endif
+#ifdef GL_ARB_clip_control
+  &__GLEW_ARB_clip_control,
+#endif
+#ifdef GL_ARB_color_buffer_float
+  &__GLEW_ARB_color_buffer_float,
+#endif
+#ifdef GL_ARB_compatibility
+  &__GLEW_ARB_compatibility,
+#endif
+#ifdef GL_ARB_compressed_texture_pixel_storage
+  &__GLEW_ARB_compressed_texture_pixel_storage,
+#endif
+#ifdef GL_ARB_compute_shader
+  &__GLEW_ARB_compute_shader,
+#endif
+#ifdef GL_ARB_compute_variable_group_size
+  &__GLEW_ARB_compute_variable_group_size,
+#endif
+#ifdef GL_ARB_conditional_render_inverted
+  &__GLEW_ARB_conditional_render_inverted,
+#endif
+#ifdef GL_ARB_conservative_depth
+  &__GLEW_ARB_conservative_depth,
+#endif
+#ifdef GL_ARB_copy_buffer
+  &__GLEW_ARB_copy_buffer,
+#endif
+#ifdef GL_ARB_copy_image
+  &__GLEW_ARB_copy_image,
+#endif
+#ifdef GL_ARB_cull_distance
+  &__GLEW_ARB_cull_distance,
+#endif
+#ifdef GL_ARB_debug_output
+  &__GLEW_ARB_debug_output,
+#endif
+#ifdef GL_ARB_depth_buffer_float
+  &__GLEW_ARB_depth_buffer_float,
+#endif
+#ifdef GL_ARB_depth_clamp
+  &__GLEW_ARB_depth_clamp,
+#endif
+#ifdef GL_ARB_depth_texture
+  &__GLEW_ARB_depth_texture,
+#endif
+#ifdef GL_ARB_derivative_control
+  &__GLEW_ARB_derivative_control,
+#endif
+#ifdef GL_ARB_direct_state_access
+  &__GLEW_ARB_direct_state_access,
+#endif
+#ifdef GL_ARB_draw_buffers
+  &__GLEW_ARB_draw_buffers,
+#endif
+#ifdef GL_ARB_draw_buffers_blend
+  &__GLEW_ARB_draw_buffers_blend,
+#endif
+#ifdef GL_ARB_draw_elements_base_vertex
+  &__GLEW_ARB_draw_elements_base_vertex,
+#endif
+#ifdef GL_ARB_draw_indirect
+  &__GLEW_ARB_draw_indirect,
+#endif
+#ifdef GL_ARB_draw_instanced
+  &__GLEW_ARB_draw_instanced,
+#endif
+#ifdef GL_ARB_enhanced_layouts
+  &__GLEW_ARB_enhanced_layouts,
+#endif
+#ifdef GL_ARB_explicit_attrib_location
+  &__GLEW_ARB_explicit_attrib_location,
+#endif
+#ifdef GL_ARB_explicit_uniform_location
+  &__GLEW_ARB_explicit_uniform_location,
+#endif
+#ifdef GL_ARB_fragment_coord_conventions
+  &__GLEW_ARB_fragment_coord_conventions,
+#endif
+#ifdef GL_ARB_fragment_layer_viewport
+  &__GLEW_ARB_fragment_layer_viewport,
+#endif
+#ifdef GL_ARB_fragment_program
+  &__GLEW_ARB_fragment_program,
+#endif
+#ifdef GL_ARB_fragment_program_shadow
+  &__GLEW_ARB_fragment_program_shadow,
+#endif
+#ifdef GL_ARB_fragment_shader
+  &__GLEW_ARB_fragment_shader,
+#endif
+#ifdef GL_ARB_fragment_shader_interlock
+  &__GLEW_ARB_fragment_shader_interlock,
+#endif
+#ifdef GL_ARB_framebuffer_no_attachments
+  &__GLEW_ARB_framebuffer_no_attachments,
+#endif
+#ifdef GL_ARB_framebuffer_object
+  &__GLEW_ARB_framebuffer_object,
+#endif
+#ifdef GL_ARB_framebuffer_sRGB
+  &__GLEW_ARB_framebuffer_sRGB,
+#endif
+#ifdef GL_ARB_geometry_shader4
+  &__GLEW_ARB_geometry_shader4,
+#endif
+#ifdef GL_ARB_get_program_binary
+  &__GLEW_ARB_get_program_binary,
+#endif
+#ifdef GL_ARB_get_texture_sub_image
+  &__GLEW_ARB_get_texture_sub_image,
+#endif
+#ifdef GL_ARB_gl_spirv
+  &__GLEW_ARB_gl_spirv,
+#endif
+#ifdef GL_ARB_gpu_shader5
+  &__GLEW_ARB_gpu_shader5,
+#endif
+#ifdef GL_ARB_gpu_shader_fp64
+  &__GLEW_ARB_gpu_shader_fp64,
+#endif
+#ifdef GL_ARB_gpu_shader_int64
+  &__GLEW_ARB_gpu_shader_int64,
+#endif
+#ifdef GL_ARB_half_float_pixel
+  &__GLEW_ARB_half_float_pixel,
+#endif
+#ifdef GL_ARB_half_float_vertex
+  &__GLEW_ARB_half_float_vertex,
+#endif
+#ifdef GL_ARB_imaging
+  &__GLEW_ARB_imaging,
+#endif
+#ifdef GL_ARB_indirect_parameters
+  &__GLEW_ARB_indirect_parameters,
+#endif
+#ifdef GL_ARB_instanced_arrays
+  &__GLEW_ARB_instanced_arrays,
+#endif
+#ifdef GL_ARB_internalformat_query
+  &__GLEW_ARB_internalformat_query,
+#endif
+#ifdef GL_ARB_internalformat_query2
+  &__GLEW_ARB_internalformat_query2,
+#endif
+#ifdef GL_ARB_invalidate_subdata
+  &__GLEW_ARB_invalidate_subdata,
+#endif
+#ifdef GL_ARB_map_buffer_alignment
+  &__GLEW_ARB_map_buffer_alignment,
+#endif
+#ifdef GL_ARB_map_buffer_range
+  &__GLEW_ARB_map_buffer_range,
+#endif
+#ifdef GL_ARB_matrix_palette
+  &__GLEW_ARB_matrix_palette,
+#endif
+#ifdef GL_ARB_multi_bind
+  &__GLEW_ARB_multi_bind,
+#endif
+#ifdef GL_ARB_multi_draw_indirect
+  &__GLEW_ARB_multi_draw_indirect,
+#endif
+#ifdef GL_ARB_multisample
+  &__GLEW_ARB_multisample,
+#endif
+#ifdef GL_ARB_multitexture
+  &__GLEW_ARB_multitexture,
+#endif
+#ifdef GL_ARB_occlusion_query
+  &__GLEW_ARB_occlusion_query,
+#endif
+#ifdef GL_ARB_occlusion_query2
+  &__GLEW_ARB_occlusion_query2,
+#endif
+#ifdef GL_ARB_parallel_shader_compile
+  &__GLEW_ARB_parallel_shader_compile,
+#endif
+#ifdef GL_ARB_pipeline_statistics_query
+  &__GLEW_ARB_pipeline_statistics_query,
+#endif
+#ifdef GL_ARB_pixel_buffer_object
+  &__GLEW_ARB_pixel_buffer_object,
+#endif
+#ifdef GL_ARB_point_parameters
+  &__GLEW_ARB_point_parameters,
+#endif
+#ifdef GL_ARB_point_sprite
+  &__GLEW_ARB_point_sprite,
+#endif
+#ifdef GL_ARB_polygon_offset_clamp
+  &__GLEW_ARB_polygon_offset_clamp,
+#endif
+#ifdef GL_ARB_post_depth_coverage
+  &__GLEW_ARB_post_depth_coverage,
+#endif
+#ifdef GL_ARB_program_interface_query
+  &__GLEW_ARB_program_interface_query,
+#endif
+#ifdef GL_ARB_provoking_vertex
+  &__GLEW_ARB_provoking_vertex,
+#endif
+#ifdef GL_ARB_query_buffer_object
+  &__GLEW_ARB_query_buffer_object,
+#endif
+#ifdef GL_ARB_robust_buffer_access_behavior
+  &__GLEW_ARB_robust_buffer_access_behavior,
+#endif
+#ifdef GL_ARB_robustness
+  &__GLEW_ARB_robustness,
+#endif
+#ifdef GL_ARB_robustness_application_isolation
+  &__GLEW_ARB_robustness_application_isolation,
+#endif
+#ifdef GL_ARB_robustness_share_group_isolation
+  &__GLEW_ARB_robustness_share_group_isolation,
+#endif
+#ifdef GL_ARB_sample_locations
+  &__GLEW_ARB_sample_locations,
+#endif
+#ifdef GL_ARB_sample_shading
+  &__GLEW_ARB_sample_shading,
+#endif
+#ifdef GL_ARB_sampler_objects
+  &__GLEW_ARB_sampler_objects,
+#endif
+#ifdef GL_ARB_seamless_cube_map
+  &__GLEW_ARB_seamless_cube_map,
+#endif
+#ifdef GL_ARB_seamless_cubemap_per_texture
+  &__GLEW_ARB_seamless_cubemap_per_texture,
+#endif
+#ifdef GL_ARB_separate_shader_objects
+  &__GLEW_ARB_separate_shader_objects,
+#endif
+#ifdef GL_ARB_shader_atomic_counter_ops
+  &__GLEW_ARB_shader_atomic_counter_ops,
+#endif
+#ifdef GL_ARB_shader_atomic_counters
+  &__GLEW_ARB_shader_atomic_counters,
+#endif
+#ifdef GL_ARB_shader_ballot
+  &__GLEW_ARB_shader_ballot,
+#endif
+#ifdef GL_ARB_shader_bit_encoding
+  &__GLEW_ARB_shader_bit_encoding,
+#endif
+#ifdef GL_ARB_shader_clock
+  &__GLEW_ARB_shader_clock,
+#endif
+#ifdef GL_ARB_shader_draw_parameters
+  &__GLEW_ARB_shader_draw_parameters,
+#endif
+#ifdef GL_ARB_shader_group_vote
+  &__GLEW_ARB_shader_group_vote,
+#endif
+#ifdef GL_ARB_shader_image_load_store
+  &__GLEW_ARB_shader_image_load_store,
+#endif
+#ifdef GL_ARB_shader_image_size
+  &__GLEW_ARB_shader_image_size,
+#endif
+#ifdef GL_ARB_shader_objects
+  &__GLEW_ARB_shader_objects,
+#endif
+#ifdef GL_ARB_shader_precision
+  &__GLEW_ARB_shader_precision,
+#endif
+#ifdef GL_ARB_shader_stencil_export
+  &__GLEW_ARB_shader_stencil_export,
+#endif
+#ifdef GL_ARB_shader_storage_buffer_object
+  &__GLEW_ARB_shader_storage_buffer_object,
+#endif
+#ifdef GL_ARB_shader_subroutine
+  &__GLEW_ARB_shader_subroutine,
+#endif
+#ifdef GL_ARB_shader_texture_image_samples
+  &__GLEW_ARB_shader_texture_image_samples,
+#endif
+#ifdef GL_ARB_shader_texture_lod
+  &__GLEW_ARB_shader_texture_lod,
+#endif
+#ifdef GL_ARB_shader_viewport_layer_array
+  &__GLEW_ARB_shader_viewport_layer_array,
+#endif
+#ifdef GL_ARB_shading_language_100
+  &__GLEW_ARB_shading_language_100,
+#endif
+#ifdef GL_ARB_shading_language_420pack
+  &__GLEW_ARB_shading_language_420pack,
+#endif
+#ifdef GL_ARB_shading_language_include
+  &__GLEW_ARB_shading_language_include,
+#endif
+#ifdef GL_ARB_shading_language_packing
+  &__GLEW_ARB_shading_language_packing,
+#endif
+#ifdef GL_ARB_shadow
+  &__GLEW_ARB_shadow,
+#endif
+#ifdef GL_ARB_shadow_ambient
+  &__GLEW_ARB_shadow_ambient,
+#endif
+#ifdef GL_ARB_sparse_buffer
+  &__GLEW_ARB_sparse_buffer,
+#endif
+#ifdef GL_ARB_sparse_texture
+  &__GLEW_ARB_sparse_texture,
+#endif
+#ifdef GL_ARB_sparse_texture2
+  &__GLEW_ARB_sparse_texture2,
+#endif
+#ifdef GL_ARB_sparse_texture_clamp
+  &__GLEW_ARB_sparse_texture_clamp,
+#endif
+#ifdef GL_ARB_spirv_extensions
+  &__GLEW_ARB_spirv_extensions,
+#endif
+#ifdef GL_ARB_stencil_texturing
+  &__GLEW_ARB_stencil_texturing,
+#endif
+#ifdef GL_ARB_sync
+  &__GLEW_ARB_sync,
+#endif
+#ifdef GL_ARB_tessellation_shader
+  &__GLEW_ARB_tessellation_shader,
+#endif
+#ifdef GL_ARB_texture_barrier
+  &__GLEW_ARB_texture_barrier,
+#endif
+#ifdef GL_ARB_texture_border_clamp
+  &__GLEW_ARB_texture_border_clamp,
+#endif
+#ifdef GL_ARB_texture_buffer_object
+  &__GLEW_ARB_texture_buffer_object,
+#endif
+#ifdef GL_ARB_texture_buffer_object_rgb32
+  &__GLEW_ARB_texture_buffer_object_rgb32,
+#endif
+#ifdef GL_ARB_texture_buffer_range
+  &__GLEW_ARB_texture_buffer_range,
+#endif
+#ifdef GL_ARB_texture_compression
+  &__GLEW_ARB_texture_compression,
+#endif
+#ifdef GL_ARB_texture_compression_bptc
+  &__GLEW_ARB_texture_compression_bptc,
+#endif
+#ifdef GL_ARB_texture_compression_rgtc
+  &__GLEW_ARB_texture_compression_rgtc,
+#endif
+#ifdef GL_ARB_texture_cube_map
+  &__GLEW_ARB_texture_cube_map,
+#endif
+#ifdef GL_ARB_texture_cube_map_array
+  &__GLEW_ARB_texture_cube_map_array,
+#endif
+#ifdef GL_ARB_texture_env_add
+  &__GLEW_ARB_texture_env_add,
+#endif
+#ifdef GL_ARB_texture_env_combine
+  &__GLEW_ARB_texture_env_combine,
+#endif
+#ifdef GL_ARB_texture_env_crossbar
+  &__GLEW_ARB_texture_env_crossbar,
+#endif
+#ifdef GL_ARB_texture_env_dot3
+  &__GLEW_ARB_texture_env_dot3,
+#endif
+#ifdef GL_ARB_texture_filter_anisotropic
+  &__GLEW_ARB_texture_filter_anisotropic,
+#endif
+#ifdef GL_ARB_texture_filter_minmax
+  &__GLEW_ARB_texture_filter_minmax,
+#endif
+#ifdef GL_ARB_texture_float
+  &__GLEW_ARB_texture_float,
+#endif
+#ifdef GL_ARB_texture_gather
+  &__GLEW_ARB_texture_gather,
+#endif
+#ifdef GL_ARB_texture_mirror_clamp_to_edge
+  &__GLEW_ARB_texture_mirror_clamp_to_edge,
+#endif
+#ifdef GL_ARB_texture_mirrored_repeat
+  &__GLEW_ARB_texture_mirrored_repeat,
+#endif
+#ifdef GL_ARB_texture_multisample
+  &__GLEW_ARB_texture_multisample,
+#endif
+#ifdef GL_ARB_texture_non_power_of_two
+  &__GLEW_ARB_texture_non_power_of_two,
+#endif
+#ifdef GL_ARB_texture_query_levels
+  &__GLEW_ARB_texture_query_levels,
+#endif
+#ifdef GL_ARB_texture_query_lod
+  &__GLEW_ARB_texture_query_lod,
+#endif
+#ifdef GL_ARB_texture_rectangle
+  &__GLEW_ARB_texture_rectangle,
+#endif
+#ifdef GL_ARB_texture_rg
+  &__GLEW_ARB_texture_rg,
+#endif
+#ifdef GL_ARB_texture_rgb10_a2ui
+  &__GLEW_ARB_texture_rgb10_a2ui,
+#endif
+#ifdef GL_ARB_texture_stencil8
+  &__GLEW_ARB_texture_stencil8,
+#endif
+#ifdef GL_ARB_texture_storage
+  &__GLEW_ARB_texture_storage,
+#endif
+#ifdef GL_ARB_texture_storage_multisample
+  &__GLEW_ARB_texture_storage_multisample,
+#endif
+#ifdef GL_ARB_texture_swizzle
+  &__GLEW_ARB_texture_swizzle,
+#endif
+#ifdef GL_ARB_texture_view
+  &__GLEW_ARB_texture_view,
+#endif
+#ifdef GL_ARB_timer_query
+  &__GLEW_ARB_timer_query,
+#endif
+#ifdef GL_ARB_transform_feedback2
+  &__GLEW_ARB_transform_feedback2,
+#endif
+#ifdef GL_ARB_transform_feedback3
+  &__GLEW_ARB_transform_feedback3,
+#endif
+#ifdef GL_ARB_transform_feedback_instanced
+  &__GLEW_ARB_transform_feedback_instanced,
+#endif
+#ifdef GL_ARB_transform_feedback_overflow_query
+  &__GLEW_ARB_transform_feedback_overflow_query,
+#endif
+#ifdef GL_ARB_transpose_matrix
+  &__GLEW_ARB_transpose_matrix,
+#endif
+#ifdef GL_ARB_uniform_buffer_object
+  &__GLEW_ARB_uniform_buffer_object,
+#endif
+#ifdef GL_ARB_vertex_array_bgra
+  &__GLEW_ARB_vertex_array_bgra,
+#endif
+#ifdef GL_ARB_vertex_array_object
+  &__GLEW_ARB_vertex_array_object,
+#endif
+#ifdef GL_ARB_vertex_attrib_64bit
+  &__GLEW_ARB_vertex_attrib_64bit,
+#endif
+#ifdef GL_ARB_vertex_attrib_binding
+  &__GLEW_ARB_vertex_attrib_binding,
+#endif
+#ifdef GL_ARB_vertex_blend
+  &__GLEW_ARB_vertex_blend,
+#endif
+#ifdef GL_ARB_vertex_buffer_object
+  &__GLEW_ARB_vertex_buffer_object,
+#endif
+#ifdef GL_ARB_vertex_program
+  &__GLEW_ARB_vertex_program,
+#endif
+#ifdef GL_ARB_vertex_shader
+  &__GLEW_ARB_vertex_shader,
+#endif
+#ifdef GL_ARB_vertex_type_10f_11f_11f_rev
+  &__GLEW_ARB_vertex_type_10f_11f_11f_rev,
+#endif
+#ifdef GL_ARB_vertex_type_2_10_10_10_rev
+  &__GLEW_ARB_vertex_type_2_10_10_10_rev,
+#endif
+#ifdef GL_ARB_viewport_array
+  &__GLEW_ARB_viewport_array,
+#endif
+#ifdef GL_ARB_window_pos
+  &__GLEW_ARB_window_pos,
+#endif
+#ifdef GL_ARM_mali_program_binary
+  &__GLEW_ARM_mali_program_binary,
+#endif
+#ifdef GL_ARM_mali_shader_binary
+  &__GLEW_ARM_mali_shader_binary,
+#endif
+#ifdef GL_ARM_rgba8
+  &__GLEW_ARM_rgba8,
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch
+  &__GLEW_ARM_shader_framebuffer_fetch,
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch_depth_stencil
+  &__GLEW_ARM_shader_framebuffer_fetch_depth_stencil,
+#endif
+#ifdef GL_ATIX_point_sprites
+  &__GLEW_ATIX_point_sprites,
+#endif
+#ifdef GL_ATIX_texture_env_combine3
+  &__GLEW_ATIX_texture_env_combine3,
+#endif
+#ifdef GL_ATIX_texture_env_route
+  &__GLEW_ATIX_texture_env_route,
+#endif
+#ifdef GL_ATIX_vertex_shader_output_point_size
+  &__GLEW_ATIX_vertex_shader_output_point_size,
+#endif
+#ifdef GL_ATI_draw_buffers
+  &__GLEW_ATI_draw_buffers,
+#endif
+#ifdef GL_ATI_element_array
+  &__GLEW_ATI_element_array,
+#endif
+#ifdef GL_ATI_envmap_bumpmap
+  &__GLEW_ATI_envmap_bumpmap,
+#endif
+#ifdef GL_ATI_fragment_shader
+  &__GLEW_ATI_fragment_shader,
+#endif
+#ifdef GL_ATI_map_object_buffer
+  &__GLEW_ATI_map_object_buffer,
+#endif
+#ifdef GL_ATI_meminfo
+  &__GLEW_ATI_meminfo,
+#endif
+#ifdef GL_ATI_pn_triangles
+  &__GLEW_ATI_pn_triangles,
+#endif
+#ifdef GL_ATI_separate_stencil
+  &__GLEW_ATI_separate_stencil,
+#endif
+#ifdef GL_ATI_shader_texture_lod
+  &__GLEW_ATI_shader_texture_lod,
+#endif
+#ifdef GL_ATI_text_fragment_shader
+  &__GLEW_ATI_text_fragment_shader,
+#endif
+#ifdef GL_ATI_texture_compression_3dc
+  &__GLEW_ATI_texture_compression_3dc,
+#endif
+#ifdef GL_ATI_texture_env_combine3
+  &__GLEW_ATI_texture_env_combine3,
+#endif
+#ifdef GL_ATI_texture_float
+  &__GLEW_ATI_texture_float,
+#endif
+#ifdef GL_ATI_texture_mirror_once
+  &__GLEW_ATI_texture_mirror_once,
+#endif
+#ifdef GL_ATI_vertex_array_object
+  &__GLEW_ATI_vertex_array_object,
+#endif
+#ifdef GL_ATI_vertex_attrib_array_object
+  &__GLEW_ATI_vertex_attrib_array_object,
+#endif
+#ifdef GL_ATI_vertex_streams
+  &__GLEW_ATI_vertex_streams,
+#endif
+#ifdef GL_EGL_KHR_context_flush_control
+  &__GLEW_EGL_KHR_context_flush_control,
+#endif
+#ifdef GL_EGL_NV_robustness_video_memory_purge
+  &__GLEW_EGL_NV_robustness_video_memory_purge,
+#endif
+#ifdef GL_EXT_422_pixels
+  &__GLEW_EXT_422_pixels,
+#endif
+#ifdef GL_EXT_Cg_shader
+  &__GLEW_EXT_Cg_shader,
+#endif
+#ifdef GL_EXT_EGL_image_array
+  &__GLEW_EXT_EGL_image_array,
+#endif
+#ifdef GL_EXT_YUV_target
+  &__GLEW_EXT_YUV_target,
+#endif
+#ifdef GL_EXT_abgr
+  &__GLEW_EXT_abgr,
+#endif
+#ifdef GL_EXT_base_instance
+  &__GLEW_EXT_base_instance,
+#endif
+#ifdef GL_EXT_bgra
+  &__GLEW_EXT_bgra,
+#endif
+#ifdef GL_EXT_bindable_uniform
+  &__GLEW_EXT_bindable_uniform,
+#endif
+#ifdef GL_EXT_blend_color
+  &__GLEW_EXT_blend_color,
+#endif
+#ifdef GL_EXT_blend_equation_separate
+  &__GLEW_EXT_blend_equation_separate,
+#endif
+#ifdef GL_EXT_blend_func_extended
+  &__GLEW_EXT_blend_func_extended,
+#endif
+#ifdef GL_EXT_blend_func_separate
+  &__GLEW_EXT_blend_func_separate,
+#endif
+#ifdef GL_EXT_blend_logic_op
+  &__GLEW_EXT_blend_logic_op,
+#endif
+#ifdef GL_EXT_blend_minmax
+  &__GLEW_EXT_blend_minmax,
+#endif
+#ifdef GL_EXT_blend_subtract
+  &__GLEW_EXT_blend_subtract,
+#endif
+#ifdef GL_EXT_buffer_storage
+  &__GLEW_EXT_buffer_storage,
+#endif
+#ifdef GL_EXT_clear_texture
+  &__GLEW_EXT_clear_texture,
+#endif
+#ifdef GL_EXT_clip_cull_distance
+  &__GLEW_EXT_clip_cull_distance,
+#endif
+#ifdef GL_EXT_clip_volume_hint
+  &__GLEW_EXT_clip_volume_hint,
+#endif
+#ifdef GL_EXT_cmyka
+  &__GLEW_EXT_cmyka,
+#endif
+#ifdef GL_EXT_color_buffer_float
+  &__GLEW_EXT_color_buffer_float,
+#endif
+#ifdef GL_EXT_color_buffer_half_float
+  &__GLEW_EXT_color_buffer_half_float,
+#endif
+#ifdef GL_EXT_color_subtable
+  &__GLEW_EXT_color_subtable,
+#endif
+#ifdef GL_EXT_compiled_vertex_array
+  &__GLEW_EXT_compiled_vertex_array,
+#endif
+#ifdef GL_EXT_compressed_ETC1_RGB8_sub_texture
+  &__GLEW_EXT_compressed_ETC1_RGB8_sub_texture,
+#endif
+#ifdef GL_EXT_conservative_depth
+  &__GLEW_EXT_conservative_depth,
+#endif
+#ifdef GL_EXT_convolution
+  &__GLEW_EXT_convolution,
+#endif
+#ifdef GL_EXT_coordinate_frame
+  &__GLEW_EXT_coordinate_frame,
+#endif
+#ifdef GL_EXT_copy_image
+  &__GLEW_EXT_copy_image,
+#endif
+#ifdef GL_EXT_copy_texture
+  &__GLEW_EXT_copy_texture,
+#endif
+#ifdef GL_EXT_cull_vertex
+  &__GLEW_EXT_cull_vertex,
+#endif
+#ifdef GL_EXT_debug_label
+  &__GLEW_EXT_debug_label,
+#endif
+#ifdef GL_EXT_debug_marker
+  &__GLEW_EXT_debug_marker,
+#endif
+#ifdef GL_EXT_depth_bounds_test
+  &__GLEW_EXT_depth_bounds_test,
+#endif
+#ifdef GL_EXT_direct_state_access
+  &__GLEW_EXT_direct_state_access,
+#endif
+#ifdef GL_EXT_discard_framebuffer
+  &__GLEW_EXT_discard_framebuffer,
+#endif
+#ifdef GL_EXT_draw_buffers
+  &__GLEW_EXT_draw_buffers,
+#endif
+#ifdef GL_EXT_draw_buffers2
+  &__GLEW_EXT_draw_buffers2,
+#endif
+#ifdef GL_EXT_draw_buffers_indexed
+  &__GLEW_EXT_draw_buffers_indexed,
+#endif
+#ifdef GL_EXT_draw_elements_base_vertex
+  &__GLEW_EXT_draw_elements_base_vertex,
+#endif
+#ifdef GL_EXT_draw_instanced
+  &__GLEW_EXT_draw_instanced,
+#endif
+#ifdef GL_EXT_draw_range_elements
+  &__GLEW_EXT_draw_range_elements,
+#endif
+#ifdef GL_EXT_external_buffer
+  &__GLEW_EXT_external_buffer,
+#endif
+#ifdef GL_EXT_float_blend
+  &__GLEW_EXT_float_blend,
+#endif
+#ifdef GL_EXT_fog_coord
+  &__GLEW_EXT_fog_coord,
+#endif
+#ifdef GL_EXT_frag_depth
+  &__GLEW_EXT_frag_depth,
+#endif
+#ifdef GL_EXT_fragment_lighting
+  &__GLEW_EXT_fragment_lighting,
+#endif
+#ifdef GL_EXT_framebuffer_blit
+  &__GLEW_EXT_framebuffer_blit,
+#endif
+#ifdef GL_EXT_framebuffer_multisample
+  &__GLEW_EXT_framebuffer_multisample,
+#endif
+#ifdef GL_EXT_framebuffer_multisample_blit_scaled
+  &__GLEW_EXT_framebuffer_multisample_blit_scaled,
+#endif
+#ifdef GL_EXT_framebuffer_object
+  &__GLEW_EXT_framebuffer_object,
+#endif
+#ifdef GL_EXT_framebuffer_sRGB
+  &__GLEW_EXT_framebuffer_sRGB,
+#endif
+#ifdef GL_EXT_geometry_point_size
+  &__GLEW_EXT_geometry_point_size,
+#endif
+#ifdef GL_EXT_geometry_shader
+  &__GLEW_EXT_geometry_shader,
+#endif
+#ifdef GL_EXT_geometry_shader4
+  &__GLEW_EXT_geometry_shader4,
+#endif
+#ifdef GL_EXT_gpu_program_parameters
+  &__GLEW_EXT_gpu_program_parameters,
+#endif
+#ifdef GL_EXT_gpu_shader4
+  &__GLEW_EXT_gpu_shader4,
+#endif
+#ifdef GL_EXT_gpu_shader5
+  &__GLEW_EXT_gpu_shader5,
+#endif
+#ifdef GL_EXT_histogram
+  &__GLEW_EXT_histogram,
+#endif
+#ifdef GL_EXT_index_array_formats
+  &__GLEW_EXT_index_array_formats,
+#endif
+#ifdef GL_EXT_index_func
+  &__GLEW_EXT_index_func,
+#endif
+#ifdef GL_EXT_index_material
+  &__GLEW_EXT_index_material,
+#endif
+#ifdef GL_EXT_index_texture
+  &__GLEW_EXT_index_texture,
+#endif
+#ifdef GL_EXT_instanced_arrays
+  &__GLEW_EXT_instanced_arrays,
+#endif
+#ifdef GL_EXT_light_texture
+  &__GLEW_EXT_light_texture,
+#endif
+#ifdef GL_EXT_map_buffer_range
+  &__GLEW_EXT_map_buffer_range,
+#endif
+#ifdef GL_EXT_memory_object
+  &__GLEW_EXT_memory_object,
+#endif
+#ifdef GL_EXT_memory_object_fd
+  &__GLEW_EXT_memory_object_fd,
+#endif
+#ifdef GL_EXT_memory_object_win32
+  &__GLEW_EXT_memory_object_win32,
+#endif
+#ifdef GL_EXT_misc_attribute
+  &__GLEW_EXT_misc_attribute,
+#endif
+#ifdef GL_EXT_multi_draw_arrays
+  &__GLEW_EXT_multi_draw_arrays,
+#endif
+#ifdef GL_EXT_multi_draw_indirect
+  &__GLEW_EXT_multi_draw_indirect,
+#endif
+#ifdef GL_EXT_multiple_textures
+  &__GLEW_EXT_multiple_textures,
+#endif
+#ifdef GL_EXT_multisample
+  &__GLEW_EXT_multisample,
+#endif
+#ifdef GL_EXT_multisample_compatibility
+  &__GLEW_EXT_multisample_compatibility,
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture
+  &__GLEW_EXT_multisampled_render_to_texture,
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture2
+  &__GLEW_EXT_multisampled_render_to_texture2,
+#endif
+#ifdef GL_EXT_multiview_draw_buffers
+  &__GLEW_EXT_multiview_draw_buffers,
+#endif
+#ifdef GL_EXT_packed_depth_stencil
+  &__GLEW_EXT_packed_depth_stencil,
+#endif
+#ifdef GL_EXT_packed_float
+  &__GLEW_EXT_packed_float,
+#endif
+#ifdef GL_EXT_packed_pixels
+  &__GLEW_EXT_packed_pixels,
+#endif
+#ifdef GL_EXT_paletted_texture
+  &__GLEW_EXT_paletted_texture,
+#endif
+#ifdef GL_EXT_pixel_buffer_object
+  &__GLEW_EXT_pixel_buffer_object,
+#endif
+#ifdef GL_EXT_pixel_transform
+  &__GLEW_EXT_pixel_transform,
+#endif
+#ifdef GL_EXT_pixel_transform_color_table
+  &__GLEW_EXT_pixel_transform_color_table,
+#endif
+#ifdef GL_EXT_point_parameters
+  &__GLEW_EXT_point_parameters,
+#endif
+#ifdef GL_EXT_polygon_offset
+  &__GLEW_EXT_polygon_offset,
+#endif
+#ifdef GL_EXT_polygon_offset_clamp
+  &__GLEW_EXT_polygon_offset_clamp,
+#endif
+#ifdef GL_EXT_post_depth_coverage
+  &__GLEW_EXT_post_depth_coverage,
+#endif
+#ifdef GL_EXT_provoking_vertex
+  &__GLEW_EXT_provoking_vertex,
+#endif
+#ifdef GL_EXT_pvrtc_sRGB
+  &__GLEW_EXT_pvrtc_sRGB,
+#endif
+#ifdef GL_EXT_raster_multisample
+  &__GLEW_EXT_raster_multisample,
+#endif
+#ifdef GL_EXT_read_format_bgra
+  &__GLEW_EXT_read_format_bgra,
+#endif
+#ifdef GL_EXT_render_snorm
+  &__GLEW_EXT_render_snorm,
+#endif
+#ifdef GL_EXT_rescale_normal
+  &__GLEW_EXT_rescale_normal,
+#endif
+#ifdef GL_EXT_sRGB
+  &__GLEW_EXT_sRGB,
+#endif
+#ifdef GL_EXT_sRGB_write_control
+  &__GLEW_EXT_sRGB_write_control,
+#endif
+#ifdef GL_EXT_scene_marker
+  &__GLEW_EXT_scene_marker,
+#endif
+#ifdef GL_EXT_secondary_color
+  &__GLEW_EXT_secondary_color,
+#endif
+#ifdef GL_EXT_semaphore
+  &__GLEW_EXT_semaphore,
+#endif
+#ifdef GL_EXT_semaphore_fd
+  &__GLEW_EXT_semaphore_fd,
+#endif
+#ifdef GL_EXT_semaphore_win32
+  &__GLEW_EXT_semaphore_win32,
+#endif
+#ifdef GL_EXT_separate_shader_objects
+  &__GLEW_EXT_separate_shader_objects,
+#endif
+#ifdef GL_EXT_separate_specular_color
+  &__GLEW_EXT_separate_specular_color,
+#endif
+#ifdef GL_EXT_shader_framebuffer_fetch
+  &__GLEW_EXT_shader_framebuffer_fetch,
+#endif
+#ifdef GL_EXT_shader_group_vote
+  &__GLEW_EXT_shader_group_vote,
+#endif
+#ifdef GL_EXT_shader_image_load_formatted
+  &__GLEW_EXT_shader_image_load_formatted,
+#endif
+#ifdef GL_EXT_shader_image_load_store
+  &__GLEW_EXT_shader_image_load_store,
+#endif
+#ifdef GL_EXT_shader_implicit_conversions
+  &__GLEW_EXT_shader_implicit_conversions,
+#endif
+#ifdef GL_EXT_shader_integer_mix
+  &__GLEW_EXT_shader_integer_mix,
+#endif
+#ifdef GL_EXT_shader_io_blocks
+  &__GLEW_EXT_shader_io_blocks,
+#endif
+#ifdef GL_EXT_shader_non_constant_global_initializers
+  &__GLEW_EXT_shader_non_constant_global_initializers,
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage
+  &__GLEW_EXT_shader_pixel_local_storage,
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage2
+  &__GLEW_EXT_shader_pixel_local_storage2,
+#endif
+#ifdef GL_EXT_shader_texture_lod
+  &__GLEW_EXT_shader_texture_lod,
+#endif
+#ifdef GL_EXT_shadow_funcs
+  &__GLEW_EXT_shadow_funcs,
+#endif
+#ifdef GL_EXT_shadow_samplers
+  &__GLEW_EXT_shadow_samplers,
+#endif
+#ifdef GL_EXT_shared_texture_palette
+  &__GLEW_EXT_shared_texture_palette,
+#endif
+#ifdef GL_EXT_sparse_texture
+  &__GLEW_EXT_sparse_texture,
+#endif
+#ifdef GL_EXT_sparse_texture2
+  &__GLEW_EXT_sparse_texture2,
+#endif
+#ifdef GL_EXT_stencil_clear_tag
+  &__GLEW_EXT_stencil_clear_tag,
+#endif
+#ifdef GL_EXT_stencil_two_side
+  &__GLEW_EXT_stencil_two_side,
+#endif
+#ifdef GL_EXT_stencil_wrap
+  &__GLEW_EXT_stencil_wrap,
+#endif
+#ifdef GL_EXT_subtexture
+  &__GLEW_EXT_subtexture,
+#endif
+#ifdef GL_EXT_texture
+  &__GLEW_EXT_texture,
+#endif
+#ifdef GL_EXT_texture3D
+  &__GLEW_EXT_texture3D,
+#endif
+#ifdef GL_EXT_texture_array
+  &__GLEW_EXT_texture_array,
+#endif
+#ifdef GL_EXT_texture_buffer_object
+  &__GLEW_EXT_texture_buffer_object,
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode
+  &__GLEW_EXT_texture_compression_astc_decode_mode,
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode_rgb9e5
+  &__GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5,
+#endif
+#ifdef GL_EXT_texture_compression_bptc
+  &__GLEW_EXT_texture_compression_bptc,
+#endif
+#ifdef GL_EXT_texture_compression_dxt1
+  &__GLEW_EXT_texture_compression_dxt1,
+#endif
+#ifdef GL_EXT_texture_compression_latc
+  &__GLEW_EXT_texture_compression_latc,
+#endif
+#ifdef GL_EXT_texture_compression_rgtc
+  &__GLEW_EXT_texture_compression_rgtc,
+#endif
+#ifdef GL_EXT_texture_compression_s3tc
+  &__GLEW_EXT_texture_compression_s3tc,
+#endif
+#ifdef GL_EXT_texture_cube_map
+  &__GLEW_EXT_texture_cube_map,
+#endif
+#ifdef GL_EXT_texture_cube_map_array
+  &__GLEW_EXT_texture_cube_map_array,
+#endif
+#ifdef GL_EXT_texture_edge_clamp
+  &__GLEW_EXT_texture_edge_clamp,
+#endif
+#ifdef GL_EXT_texture_env
+  &__GLEW_EXT_texture_env,
+#endif
+#ifdef GL_EXT_texture_env_add
+  &__GLEW_EXT_texture_env_add,
+#endif
+#ifdef GL_EXT_texture_env_combine
+  &__GLEW_EXT_texture_env_combine,
+#endif
+#ifdef GL_EXT_texture_env_dot3
+  &__GLEW_EXT_texture_env_dot3,
+#endif
+#ifdef GL_EXT_texture_filter_anisotropic
+  &__GLEW_EXT_texture_filter_anisotropic,
+#endif
+#ifdef GL_EXT_texture_filter_minmax
+  &__GLEW_EXT_texture_filter_minmax,
+#endif
+#ifdef GL_EXT_texture_format_BGRA8888
+  &__GLEW_EXT_texture_format_BGRA8888,
+#endif
+#ifdef GL_EXT_texture_integer
+  &__GLEW_EXT_texture_integer,
+#endif
+#ifdef GL_EXT_texture_lod_bias
+  &__GLEW_EXT_texture_lod_bias,
+#endif
+#ifdef GL_EXT_texture_mirror_clamp
+  &__GLEW_EXT_texture_mirror_clamp,
+#endif
+#ifdef GL_EXT_texture_norm16
+  &__GLEW_EXT_texture_norm16,
+#endif
+#ifdef GL_EXT_texture_object
+  &__GLEW_EXT_texture_object,
+#endif
+#ifdef GL_EXT_texture_perturb_normal
+  &__GLEW_EXT_texture_perturb_normal,
+#endif
+#ifdef GL_EXT_texture_rectangle
+  &__GLEW_EXT_texture_rectangle,
+#endif
+#ifdef GL_EXT_texture_rg
+  &__GLEW_EXT_texture_rg,
+#endif
+#ifdef GL_EXT_texture_sRGB
+  &__GLEW_EXT_texture_sRGB,
+#endif
+#ifdef GL_EXT_texture_sRGB_R8
+  &__GLEW_EXT_texture_sRGB_R8,
+#endif
+#ifdef GL_EXT_texture_sRGB_RG8
+  &__GLEW_EXT_texture_sRGB_RG8,
+#endif
+#ifdef GL_EXT_texture_sRGB_decode
+  &__GLEW_EXT_texture_sRGB_decode,
+#endif
+#ifdef GL_EXT_texture_shared_exponent
+  &__GLEW_EXT_texture_shared_exponent,
+#endif
+#ifdef GL_EXT_texture_snorm
+  &__GLEW_EXT_texture_snorm,
+#endif
+#ifdef GL_EXT_texture_storage
+  &__GLEW_EXT_texture_storage,
+#endif
+#ifdef GL_EXT_texture_swizzle
+  &__GLEW_EXT_texture_swizzle,
+#endif
+#ifdef GL_EXT_texture_type_2_10_10_10_REV
+  &__GLEW_EXT_texture_type_2_10_10_10_REV,
+#endif
+#ifdef GL_EXT_texture_view
+  &__GLEW_EXT_texture_view,
+#endif
+#ifdef GL_EXT_timer_query
+  &__GLEW_EXT_timer_query,
+#endif
+#ifdef GL_EXT_transform_feedback
+  &__GLEW_EXT_transform_feedback,
+#endif
+#ifdef GL_EXT_unpack_subimage
+  &__GLEW_EXT_unpack_subimage,
+#endif
+#ifdef GL_EXT_vertex_array
+  &__GLEW_EXT_vertex_array,
+#endif
+#ifdef GL_EXT_vertex_array_bgra
+  &__GLEW_EXT_vertex_array_bgra,
+#endif
+#ifdef GL_EXT_vertex_array_setXXX
+  &__GLEW_EXT_vertex_array_setXXX,
+#endif
+#ifdef GL_EXT_vertex_attrib_64bit
+  &__GLEW_EXT_vertex_attrib_64bit,
+#endif
+#ifdef GL_EXT_vertex_shader
+  &__GLEW_EXT_vertex_shader,
+#endif
+#ifdef GL_EXT_vertex_weighting
+  &__GLEW_EXT_vertex_weighting,
+#endif
+#ifdef GL_EXT_win32_keyed_mutex
+  &__GLEW_EXT_win32_keyed_mutex,
+#endif
+#ifdef GL_EXT_window_rectangles
+  &__GLEW_EXT_window_rectangles,
+#endif
+#ifdef GL_EXT_x11_sync_object
+  &__GLEW_EXT_x11_sync_object,
+#endif
+#ifdef GL_GREMEDY_frame_terminator
+  &__GLEW_GREMEDY_frame_terminator,
+#endif
+#ifdef GL_GREMEDY_string_marker
+  &__GLEW_GREMEDY_string_marker,
+#endif
+#ifdef GL_HP_convolution_border_modes
+  &__GLEW_HP_convolution_border_modes,
+#endif
+#ifdef GL_HP_image_transform
+  &__GLEW_HP_image_transform,
+#endif
+#ifdef GL_HP_occlusion_test
+  &__GLEW_HP_occlusion_test,
+#endif
+#ifdef GL_HP_texture_lighting
+  &__GLEW_HP_texture_lighting,
+#endif
+#ifdef GL_IBM_cull_vertex
+  &__GLEW_IBM_cull_vertex,
+#endif
+#ifdef GL_IBM_multimode_draw_arrays
+  &__GLEW_IBM_multimode_draw_arrays,
+#endif
+#ifdef GL_IBM_rasterpos_clip
+  &__GLEW_IBM_rasterpos_clip,
+#endif
+#ifdef GL_IBM_static_data
+  &__GLEW_IBM_static_data,
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+  &__GLEW_IBM_texture_mirrored_repeat,
+#endif
+#ifdef GL_IBM_vertex_array_lists
+  &__GLEW_IBM_vertex_array_lists,
+#endif
+#ifdef GL_INGR_color_clamp
+  &__GLEW_INGR_color_clamp,
+#endif
+#ifdef GL_INGR_interlace_read
+  &__GLEW_INGR_interlace_read,
+#endif
+#ifdef GL_INTEL_conservative_rasterization
+  &__GLEW_INTEL_conservative_rasterization,
+#endif
+#ifdef GL_INTEL_fragment_shader_ordering
+  &__GLEW_INTEL_fragment_shader_ordering,
+#endif
+#ifdef GL_INTEL_framebuffer_CMAA
+  &__GLEW_INTEL_framebuffer_CMAA,
+#endif
+#ifdef GL_INTEL_map_texture
+  &__GLEW_INTEL_map_texture,
+#endif
+#ifdef GL_INTEL_parallel_arrays
+  &__GLEW_INTEL_parallel_arrays,
+#endif
+#ifdef GL_INTEL_performance_query
+  &__GLEW_INTEL_performance_query,
+#endif
+#ifdef GL_INTEL_texture_scissor
+  &__GLEW_INTEL_texture_scissor,
+#endif
+#ifdef GL_KHR_blend_equation_advanced
+  &__GLEW_KHR_blend_equation_advanced,
+#endif
+#ifdef GL_KHR_blend_equation_advanced_coherent
+  &__GLEW_KHR_blend_equation_advanced_coherent,
+#endif
+#ifdef GL_KHR_context_flush_control
+  &__GLEW_KHR_context_flush_control,
+#endif
+#ifdef GL_KHR_debug
+  &__GLEW_KHR_debug,
+#endif
+#ifdef GL_KHR_no_error
+  &__GLEW_KHR_no_error,
+#endif
+#ifdef GL_KHR_parallel_shader_compile
+  &__GLEW_KHR_parallel_shader_compile,
+#endif
+#ifdef GL_KHR_robust_buffer_access_behavior
+  &__GLEW_KHR_robust_buffer_access_behavior,
+#endif
+#ifdef GL_KHR_robustness
+  &__GLEW_KHR_robustness,
+#endif
+#ifdef GL_KHR_texture_compression_astc_hdr
+  &__GLEW_KHR_texture_compression_astc_hdr,
+#endif
+#ifdef GL_KHR_texture_compression_astc_ldr
+  &__GLEW_KHR_texture_compression_astc_ldr,
+#endif
+#ifdef GL_KHR_texture_compression_astc_sliced_3d
+  &__GLEW_KHR_texture_compression_astc_sliced_3d,
+#endif
+#ifdef GL_KTX_buffer_region
+  &__GLEW_KTX_buffer_region,
+#endif
+#ifdef GL_MESAX_texture_stack
+  &__GLEW_MESAX_texture_stack,
+#endif
+#ifdef GL_MESA_pack_invert
+  &__GLEW_MESA_pack_invert,
+#endif
+#ifdef GL_MESA_resize_buffers
+  &__GLEW_MESA_resize_buffers,
+#endif
+#ifdef GL_MESA_shader_integer_functions
+  &__GLEW_MESA_shader_integer_functions,
+#endif
+#ifdef GL_MESA_window_pos
+  &__GLEW_MESA_window_pos,
+#endif
+#ifdef GL_MESA_ycbcr_texture
+  &__GLEW_MESA_ycbcr_texture,
+#endif
+#ifdef GL_NVX_blend_equation_advanced_multi_draw_buffers
+  &__GLEW_NVX_blend_equation_advanced_multi_draw_buffers,
+#endif
+#ifdef GL_NVX_conditional_render
+  &__GLEW_NVX_conditional_render,
+#endif
+#ifdef GL_NVX_gpu_memory_info
+  &__GLEW_NVX_gpu_memory_info,
+#endif
+#ifdef GL_NVX_linked_gpu_multicast
+  &__GLEW_NVX_linked_gpu_multicast,
+#endif
+#ifdef GL_NV_3dvision_settings
+  &__GLEW_NV_3dvision_settings,
+#endif
+#ifdef GL_NV_EGL_stream_consumer_external
+  &__GLEW_NV_EGL_stream_consumer_external,
+#endif
+#ifdef GL_NV_alpha_to_coverage_dither_control
+  &__GLEW_NV_alpha_to_coverage_dither_control,
+#endif
+#ifdef GL_NV_bgr
+  &__GLEW_NV_bgr,
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect
+  &__GLEW_NV_bindless_multi_draw_indirect,
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect_count
+  &__GLEW_NV_bindless_multi_draw_indirect_count,
+#endif
+#ifdef GL_NV_bindless_texture
+  &__GLEW_NV_bindless_texture,
+#endif
+#ifdef GL_NV_blend_equation_advanced
+  &__GLEW_NV_blend_equation_advanced,
+#endif
+#ifdef GL_NV_blend_equation_advanced_coherent
+  &__GLEW_NV_blend_equation_advanced_coherent,
+#endif
+#ifdef GL_NV_blend_minmax_factor
+  &__GLEW_NV_blend_minmax_factor,
+#endif
+#ifdef GL_NV_blend_square
+  &__GLEW_NV_blend_square,
+#endif
+#ifdef GL_NV_clip_space_w_scaling
+  &__GLEW_NV_clip_space_w_scaling,
+#endif
+#ifdef GL_NV_command_list
+  &__GLEW_NV_command_list,
+#endif
+#ifdef GL_NV_compute_program5
+  &__GLEW_NV_compute_program5,
+#endif
+#ifdef GL_NV_conditional_render
+  &__GLEW_NV_conditional_render,
+#endif
+#ifdef GL_NV_conservative_raster
+  &__GLEW_NV_conservative_raster,
+#endif
+#ifdef GL_NV_conservative_raster_dilate
+  &__GLEW_NV_conservative_raster_dilate,
+#endif
+#ifdef GL_NV_conservative_raster_pre_snap_triangles
+  &__GLEW_NV_conservative_raster_pre_snap_triangles,
+#endif
+#ifdef GL_NV_copy_buffer
+  &__GLEW_NV_copy_buffer,
+#endif
+#ifdef GL_NV_copy_depth_to_color
+  &__GLEW_NV_copy_depth_to_color,
+#endif
+#ifdef GL_NV_copy_image
+  &__GLEW_NV_copy_image,
+#endif
+#ifdef GL_NV_deep_texture3D
+  &__GLEW_NV_deep_texture3D,
+#endif
+#ifdef GL_NV_depth_buffer_float
+  &__GLEW_NV_depth_buffer_float,
+#endif
+#ifdef GL_NV_depth_clamp
+  &__GLEW_NV_depth_clamp,
+#endif
+#ifdef GL_NV_depth_range_unclamped
+  &__GLEW_NV_depth_range_unclamped,
+#endif
+#ifdef GL_NV_draw_buffers
+  &__GLEW_NV_draw_buffers,
+#endif
+#ifdef GL_NV_draw_instanced
+  &__GLEW_NV_draw_instanced,
+#endif
+#ifdef GL_NV_draw_texture
+  &__GLEW_NV_draw_texture,
+#endif
+#ifdef GL_NV_draw_vulkan_image
+  &__GLEW_NV_draw_vulkan_image,
+#endif
+#ifdef GL_NV_evaluators
+  &__GLEW_NV_evaluators,
+#endif
+#ifdef GL_NV_explicit_attrib_location
+  &__GLEW_NV_explicit_attrib_location,
+#endif
+#ifdef GL_NV_explicit_multisample
+  &__GLEW_NV_explicit_multisample,
+#endif
+#ifdef GL_NV_fbo_color_attachments
+  &__GLEW_NV_fbo_color_attachments,
+#endif
+#ifdef GL_NV_fence
+  &__GLEW_NV_fence,
+#endif
+#ifdef GL_NV_fill_rectangle
+  &__GLEW_NV_fill_rectangle,
+#endif
+#ifdef GL_NV_float_buffer
+  &__GLEW_NV_float_buffer,
+#endif
+#ifdef GL_NV_fog_distance
+  &__GLEW_NV_fog_distance,
+#endif
+#ifdef GL_NV_fragment_coverage_to_color
+  &__GLEW_NV_fragment_coverage_to_color,
+#endif
+#ifdef GL_NV_fragment_program
+  &__GLEW_NV_fragment_program,
+#endif
+#ifdef GL_NV_fragment_program2
+  &__GLEW_NV_fragment_program2,
+#endif
+#ifdef GL_NV_fragment_program4
+  &__GLEW_NV_fragment_program4,
+#endif
+#ifdef GL_NV_fragment_program_option
+  &__GLEW_NV_fragment_program_option,
+#endif
+#ifdef GL_NV_fragment_shader_interlock
+  &__GLEW_NV_fragment_shader_interlock,
+#endif
+#ifdef GL_NV_framebuffer_blit
+  &__GLEW_NV_framebuffer_blit,
+#endif
+#ifdef GL_NV_framebuffer_mixed_samples
+  &__GLEW_NV_framebuffer_mixed_samples,
+#endif
+#ifdef GL_NV_framebuffer_multisample
+  &__GLEW_NV_framebuffer_multisample,
+#endif
+#ifdef GL_NV_framebuffer_multisample_coverage
+  &__GLEW_NV_framebuffer_multisample_coverage,
+#endif
+#ifdef GL_NV_generate_mipmap_sRGB
+  &__GLEW_NV_generate_mipmap_sRGB,
+#endif
+#ifdef GL_NV_geometry_program4
+  &__GLEW_NV_geometry_program4,
+#endif
+#ifdef GL_NV_geometry_shader4
+  &__GLEW_NV_geometry_shader4,
+#endif
+#ifdef GL_NV_geometry_shader_passthrough
+  &__GLEW_NV_geometry_shader_passthrough,
+#endif
+#ifdef GL_NV_gpu_multicast
+  &__GLEW_NV_gpu_multicast,
+#endif
+#ifdef GL_NV_gpu_program4
+  &__GLEW_NV_gpu_program4,
+#endif
+#ifdef GL_NV_gpu_program5
+  &__GLEW_NV_gpu_program5,
+#endif
+#ifdef GL_NV_gpu_program5_mem_extended
+  &__GLEW_NV_gpu_program5_mem_extended,
+#endif
+#ifdef GL_NV_gpu_program_fp64
+  &__GLEW_NV_gpu_program_fp64,
+#endif
+#ifdef GL_NV_gpu_shader5
+  &__GLEW_NV_gpu_shader5,
+#endif
+#ifdef GL_NV_half_float
+  &__GLEW_NV_half_float,
+#endif
+#ifdef GL_NV_image_formats
+  &__GLEW_NV_image_formats,
+#endif
+#ifdef GL_NV_instanced_arrays
+  &__GLEW_NV_instanced_arrays,
+#endif
+#ifdef GL_NV_internalformat_sample_query
+  &__GLEW_NV_internalformat_sample_query,
+#endif
+#ifdef GL_NV_light_max_exponent
+  &__GLEW_NV_light_max_exponent,
+#endif
+#ifdef GL_NV_multisample_coverage
+  &__GLEW_NV_multisample_coverage,
+#endif
+#ifdef GL_NV_multisample_filter_hint
+  &__GLEW_NV_multisample_filter_hint,
+#endif
+#ifdef GL_NV_non_square_matrices
+  &__GLEW_NV_non_square_matrices,
+#endif
+#ifdef GL_NV_occlusion_query
+  &__GLEW_NV_occlusion_query,
+#endif
+#ifdef GL_NV_pack_subimage
+  &__GLEW_NV_pack_subimage,
+#endif
+#ifdef GL_NV_packed_depth_stencil
+  &__GLEW_NV_packed_depth_stencil,
+#endif
+#ifdef GL_NV_packed_float
+  &__GLEW_NV_packed_float,
+#endif
+#ifdef GL_NV_packed_float_linear
+  &__GLEW_NV_packed_float_linear,
+#endif
+#ifdef GL_NV_parameter_buffer_object
+  &__GLEW_NV_parameter_buffer_object,
+#endif
+#ifdef GL_NV_parameter_buffer_object2
+  &__GLEW_NV_parameter_buffer_object2,
+#endif
+#ifdef GL_NV_path_rendering
+  &__GLEW_NV_path_rendering,
+#endif
+#ifdef GL_NV_path_rendering_shared_edge
+  &__GLEW_NV_path_rendering_shared_edge,
+#endif
+#ifdef GL_NV_pixel_buffer_object
+  &__GLEW_NV_pixel_buffer_object,
+#endif
+#ifdef GL_NV_pixel_data_range
+  &__GLEW_NV_pixel_data_range,
+#endif
+#ifdef GL_NV_platform_binary
+  &__GLEW_NV_platform_binary,
+#endif
+#ifdef GL_NV_point_sprite
+  &__GLEW_NV_point_sprite,
+#endif
+#ifdef GL_NV_polygon_mode
+  &__GLEW_NV_polygon_mode,
+#endif
+#ifdef GL_NV_present_video
+  &__GLEW_NV_present_video,
+#endif
+#ifdef GL_NV_primitive_restart
+  &__GLEW_NV_primitive_restart,
+#endif
+#ifdef GL_NV_read_depth
+  &__GLEW_NV_read_depth,
+#endif
+#ifdef GL_NV_read_depth_stencil
+  &__GLEW_NV_read_depth_stencil,
+#endif
+#ifdef GL_NV_read_stencil
+  &__GLEW_NV_read_stencil,
+#endif
+#ifdef GL_NV_register_combiners
+  &__GLEW_NV_register_combiners,
+#endif
+#ifdef GL_NV_register_combiners2
+  &__GLEW_NV_register_combiners2,
+#endif
+#ifdef GL_NV_robustness_video_memory_purge
+  &__GLEW_NV_robustness_video_memory_purge,
+#endif
+#ifdef GL_NV_sRGB_formats
+  &__GLEW_NV_sRGB_formats,
+#endif
+#ifdef GL_NV_sample_locations
+  &__GLEW_NV_sample_locations,
+#endif
+#ifdef GL_NV_sample_mask_override_coverage
+  &__GLEW_NV_sample_mask_override_coverage,
+#endif
+#ifdef GL_NV_shader_atomic_counters
+  &__GLEW_NV_shader_atomic_counters,
+#endif
+#ifdef GL_NV_shader_atomic_float
+  &__GLEW_NV_shader_atomic_float,
+#endif
+#ifdef GL_NV_shader_atomic_float64
+  &__GLEW_NV_shader_atomic_float64,
+#endif
+#ifdef GL_NV_shader_atomic_fp16_vector
+  &__GLEW_NV_shader_atomic_fp16_vector,
+#endif
+#ifdef GL_NV_shader_atomic_int64
+  &__GLEW_NV_shader_atomic_int64,
+#endif
+#ifdef GL_NV_shader_buffer_load
+  &__GLEW_NV_shader_buffer_load,
+#endif
+#ifdef GL_NV_shader_noperspective_interpolation
+  &__GLEW_NV_shader_noperspective_interpolation,
+#endif
+#ifdef GL_NV_shader_storage_buffer_object
+  &__GLEW_NV_shader_storage_buffer_object,
+#endif
+#ifdef GL_NV_shader_thread_group
+  &__GLEW_NV_shader_thread_group,
+#endif
+#ifdef GL_NV_shader_thread_shuffle
+  &__GLEW_NV_shader_thread_shuffle,
+#endif
+#ifdef GL_NV_shadow_samplers_array
+  &__GLEW_NV_shadow_samplers_array,
+#endif
+#ifdef GL_NV_shadow_samplers_cube
+  &__GLEW_NV_shadow_samplers_cube,
+#endif
+#ifdef GL_NV_stereo_view_rendering
+  &__GLEW_NV_stereo_view_rendering,
+#endif
+#ifdef GL_NV_tessellation_program5
+  &__GLEW_NV_tessellation_program5,
+#endif
+#ifdef GL_NV_texgen_emboss
+  &__GLEW_NV_texgen_emboss,
+#endif
+#ifdef GL_NV_texgen_reflection
+  &__GLEW_NV_texgen_reflection,
+#endif
+#ifdef GL_NV_texture_array
+  &__GLEW_NV_texture_array,
+#endif
+#ifdef GL_NV_texture_barrier
+  &__GLEW_NV_texture_barrier,
+#endif
+#ifdef GL_NV_texture_border_clamp
+  &__GLEW_NV_texture_border_clamp,
+#endif
+#ifdef GL_NV_texture_compression_latc
+  &__GLEW_NV_texture_compression_latc,
+#endif
+#ifdef GL_NV_texture_compression_s3tc
+  &__GLEW_NV_texture_compression_s3tc,
+#endif
+#ifdef GL_NV_texture_compression_s3tc_update
+  &__GLEW_NV_texture_compression_s3tc_update,
+#endif
+#ifdef GL_NV_texture_compression_vtc
+  &__GLEW_NV_texture_compression_vtc,
+#endif
+#ifdef GL_NV_texture_env_combine4
+  &__GLEW_NV_texture_env_combine4,
+#endif
+#ifdef GL_NV_texture_expand_normal
+  &__GLEW_NV_texture_expand_normal,
+#endif
+#ifdef GL_NV_texture_multisample
+  &__GLEW_NV_texture_multisample,
+#endif
+#ifdef GL_NV_texture_npot_2D_mipmap
+  &__GLEW_NV_texture_npot_2D_mipmap,
+#endif
+#ifdef GL_NV_texture_rectangle
+  &__GLEW_NV_texture_rectangle,
+#endif
+#ifdef GL_NV_texture_rectangle_compressed
+  &__GLEW_NV_texture_rectangle_compressed,
+#endif
+#ifdef GL_NV_texture_shader
+  &__GLEW_NV_texture_shader,
+#endif
+#ifdef GL_NV_texture_shader2
+  &__GLEW_NV_texture_shader2,
+#endif
+#ifdef GL_NV_texture_shader3
+  &__GLEW_NV_texture_shader3,
+#endif
+#ifdef GL_NV_transform_feedback
+  &__GLEW_NV_transform_feedback,
+#endif
+#ifdef GL_NV_transform_feedback2
+  &__GLEW_NV_transform_feedback2,
+#endif
+#ifdef GL_NV_uniform_buffer_unified_memory
+  &__GLEW_NV_uniform_buffer_unified_memory,
+#endif
+#ifdef GL_NV_vdpau_interop
+  &__GLEW_NV_vdpau_interop,
+#endif
+#ifdef GL_NV_vertex_array_range
+  &__GLEW_NV_vertex_array_range,
+#endif
+#ifdef GL_NV_vertex_array_range2
+  &__GLEW_NV_vertex_array_range2,
+#endif
+#ifdef GL_NV_vertex_attrib_integer_64bit
+  &__GLEW_NV_vertex_attrib_integer_64bit,
+#endif
+#ifdef GL_NV_vertex_buffer_unified_memory
+  &__GLEW_NV_vertex_buffer_unified_memory,
+#endif
+#ifdef GL_NV_vertex_program
+  &__GLEW_NV_vertex_program,
+#endif
+#ifdef GL_NV_vertex_program1_1
+  &__GLEW_NV_vertex_program1_1,
+#endif
+#ifdef GL_NV_vertex_program2
+  &__GLEW_NV_vertex_program2,
+#endif
+#ifdef GL_NV_vertex_program2_option
+  &__GLEW_NV_vertex_program2_option,
+#endif
+#ifdef GL_NV_vertex_program3
+  &__GLEW_NV_vertex_program3,
+#endif
+#ifdef GL_NV_vertex_program4
+  &__GLEW_NV_vertex_program4,
+#endif
+#ifdef GL_NV_video_capture
+  &__GLEW_NV_video_capture,
+#endif
+#ifdef GL_NV_viewport_array
+  &__GLEW_NV_viewport_array,
+#endif
+#ifdef GL_NV_viewport_array2
+  &__GLEW_NV_viewport_array2,
+#endif
+#ifdef GL_NV_viewport_swizzle
+  &__GLEW_NV_viewport_swizzle,
+#endif
+#ifdef GL_OES_byte_coordinates
+  &__GLEW_OES_byte_coordinates,
+#endif
+#ifdef GL_OML_interlace
+  &__GLEW_OML_interlace,
+#endif
+#ifdef GL_OML_resample
+  &__GLEW_OML_resample,
+#endif
+#ifdef GL_OML_subsample
+  &__GLEW_OML_subsample,
+#endif
+#ifdef GL_OVR_multiview
+  &__GLEW_OVR_multiview,
+#endif
+#ifdef GL_OVR_multiview2
+  &__GLEW_OVR_multiview2,
+#endif
+#ifdef GL_OVR_multiview_multisampled_render_to_texture
+  &__GLEW_OVR_multiview_multisampled_render_to_texture,
+#endif
+#ifdef GL_PGI_misc_hints
+  &__GLEW_PGI_misc_hints,
+#endif
+#ifdef GL_PGI_vertex_hints
+  &__GLEW_PGI_vertex_hints,
+#endif
+#ifdef GL_QCOM_alpha_test
+  &__GLEW_QCOM_alpha_test,
+#endif
+#ifdef GL_QCOM_binning_control
+  &__GLEW_QCOM_binning_control,
+#endif
+#ifdef GL_QCOM_driver_control
+  &__GLEW_QCOM_driver_control,
+#endif
+#ifdef GL_QCOM_extended_get
+  &__GLEW_QCOM_extended_get,
+#endif
+#ifdef GL_QCOM_extended_get2
+  &__GLEW_QCOM_extended_get2,
+#endif
+#ifdef GL_QCOM_framebuffer_foveated
+  &__GLEW_QCOM_framebuffer_foveated,
+#endif
+#ifdef GL_QCOM_perfmon_global_mode
+  &__GLEW_QCOM_perfmon_global_mode,
+#endif
+#ifdef GL_QCOM_shader_framebuffer_fetch_noncoherent
+  &__GLEW_QCOM_shader_framebuffer_fetch_noncoherent,
+#endif
+#ifdef GL_QCOM_tiled_rendering
+  &__GLEW_QCOM_tiled_rendering,
+#endif
+#ifdef GL_QCOM_writeonly_rendering
+  &__GLEW_QCOM_writeonly_rendering,
+#endif
+#ifdef GL_REGAL_ES1_0_compatibility
+  &__GLEW_REGAL_ES1_0_compatibility,
+#endif
+#ifdef GL_REGAL_ES1_1_compatibility
+  &__GLEW_REGAL_ES1_1_compatibility,
+#endif
+#ifdef GL_REGAL_enable
+  &__GLEW_REGAL_enable,
+#endif
+#ifdef GL_REGAL_error_string
+  &__GLEW_REGAL_error_string,
+#endif
+#ifdef GL_REGAL_extension_query
+  &__GLEW_REGAL_extension_query,
+#endif
+#ifdef GL_REGAL_log
+  &__GLEW_REGAL_log,
+#endif
+#ifdef GL_REGAL_proc_address
+  &__GLEW_REGAL_proc_address,
+#endif
+#ifdef GL_REND_screen_coordinates
+  &__GLEW_REND_screen_coordinates,
+#endif
+#ifdef GL_S3_s3tc
+  &__GLEW_S3_s3tc,
+#endif
+#ifdef GL_SGIS_clip_band_hint
+  &__GLEW_SGIS_clip_band_hint,
+#endif
+#ifdef GL_SGIS_color_range
+  &__GLEW_SGIS_color_range,
+#endif
+#ifdef GL_SGIS_detail_texture
+  &__GLEW_SGIS_detail_texture,
+#endif
+#ifdef GL_SGIS_fog_function
+  &__GLEW_SGIS_fog_function,
+#endif
+#ifdef GL_SGIS_generate_mipmap
+  &__GLEW_SGIS_generate_mipmap,
+#endif
+#ifdef GL_SGIS_line_texgen
+  &__GLEW_SGIS_line_texgen,
+#endif
+#ifdef GL_SGIS_multisample
+  &__GLEW_SGIS_multisample,
+#endif
+#ifdef GL_SGIS_multitexture
+  &__GLEW_SGIS_multitexture,
+#endif
+#ifdef GL_SGIS_pixel_texture
+  &__GLEW_SGIS_pixel_texture,
+#endif
+#ifdef GL_SGIS_point_line_texgen
+  &__GLEW_SGIS_point_line_texgen,
+#endif
+#ifdef GL_SGIS_shared_multisample
+  &__GLEW_SGIS_shared_multisample,
+#endif
+#ifdef GL_SGIS_sharpen_texture
+  &__GLEW_SGIS_sharpen_texture,
+#endif
+#ifdef GL_SGIS_texture4D
+  &__GLEW_SGIS_texture4D,
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+  &__GLEW_SGIS_texture_border_clamp,
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+  &__GLEW_SGIS_texture_edge_clamp,
+#endif
+#ifdef GL_SGIS_texture_filter4
+  &__GLEW_SGIS_texture_filter4,
+#endif
+#ifdef GL_SGIS_texture_lod
+  &__GLEW_SGIS_texture_lod,
+#endif
+#ifdef GL_SGIS_texture_select
+  &__GLEW_SGIS_texture_select,
+#endif
+#ifdef GL_SGIX_async
+  &__GLEW_SGIX_async,
+#endif
+#ifdef GL_SGIX_async_histogram
+  &__GLEW_SGIX_async_histogram,
+#endif
+#ifdef GL_SGIX_async_pixel
+  &__GLEW_SGIX_async_pixel,
+#endif
+#ifdef GL_SGIX_bali_g_instruments
+  &__GLEW_SGIX_bali_g_instruments,
+#endif
+#ifdef GL_SGIX_bali_r_instruments
+  &__GLEW_SGIX_bali_r_instruments,
+#endif
+#ifdef GL_SGIX_bali_timer_instruments
+  &__GLEW_SGIX_bali_timer_instruments,
+#endif
+#ifdef GL_SGIX_blend_alpha_minmax
+  &__GLEW_SGIX_blend_alpha_minmax,
+#endif
+#ifdef GL_SGIX_blend_cadd
+  &__GLEW_SGIX_blend_cadd,
+#endif
+#ifdef GL_SGIX_blend_cmultiply
+  &__GLEW_SGIX_blend_cmultiply,
+#endif
+#ifdef GL_SGIX_calligraphic_fragment
+  &__GLEW_SGIX_calligraphic_fragment,
+#endif
+#ifdef GL_SGIX_clipmap
+  &__GLEW_SGIX_clipmap,
+#endif
+#ifdef GL_SGIX_color_matrix_accuracy
+  &__GLEW_SGIX_color_matrix_accuracy,
+#endif
+#ifdef GL_SGIX_color_table_index_mode
+  &__GLEW_SGIX_color_table_index_mode,
+#endif
+#ifdef GL_SGIX_complex_polar
+  &__GLEW_SGIX_complex_polar,
+#endif
+#ifdef GL_SGIX_convolution_accuracy
+  &__GLEW_SGIX_convolution_accuracy,
+#endif
+#ifdef GL_SGIX_cube_map
+  &__GLEW_SGIX_cube_map,
+#endif
+#ifdef GL_SGIX_cylinder_texgen
+  &__GLEW_SGIX_cylinder_texgen,
+#endif
+#ifdef GL_SGIX_datapipe
+  &__GLEW_SGIX_datapipe,
+#endif
+#ifdef GL_SGIX_decimation
+  &__GLEW_SGIX_decimation,
+#endif
+#ifdef GL_SGIX_depth_pass_instrument
+  &__GLEW_SGIX_depth_pass_instrument,
+#endif
+#ifdef GL_SGIX_depth_texture
+  &__GLEW_SGIX_depth_texture,
+#endif
+#ifdef GL_SGIX_dvc
+  &__GLEW_SGIX_dvc,
+#endif
+#ifdef GL_SGIX_flush_raster
+  &__GLEW_SGIX_flush_raster,
+#endif
+#ifdef GL_SGIX_fog_blend
+  &__GLEW_SGIX_fog_blend,
+#endif
+#ifdef GL_SGIX_fog_factor_to_alpha
+  &__GLEW_SGIX_fog_factor_to_alpha,
+#endif
+#ifdef GL_SGIX_fog_layers
+  &__GLEW_SGIX_fog_layers,
+#endif
+#ifdef GL_SGIX_fog_offset
+  &__GLEW_SGIX_fog_offset,
+#endif
+#ifdef GL_SGIX_fog_patchy
+  &__GLEW_SGIX_fog_patchy,
+#endif
+#ifdef GL_SGIX_fog_scale
+  &__GLEW_SGIX_fog_scale,
+#endif
+#ifdef GL_SGIX_fog_texture
+  &__GLEW_SGIX_fog_texture,
+#endif
+#ifdef GL_SGIX_fragment_lighting_space
+  &__GLEW_SGIX_fragment_lighting_space,
+#endif
+#ifdef GL_SGIX_fragment_specular_lighting
+  &__GLEW_SGIX_fragment_specular_lighting,
+#endif
+#ifdef GL_SGIX_fragments_instrument
+  &__GLEW_SGIX_fragments_instrument,
+#endif
+#ifdef GL_SGIX_framezoom
+  &__GLEW_SGIX_framezoom,
+#endif
+#ifdef GL_SGIX_icc_texture
+  &__GLEW_SGIX_icc_texture,
+#endif
+#ifdef GL_SGIX_igloo_interface
+  &__GLEW_SGIX_igloo_interface,
+#endif
+#ifdef GL_SGIX_image_compression
+  &__GLEW_SGIX_image_compression,
+#endif
+#ifdef GL_SGIX_impact_pixel_texture
+  &__GLEW_SGIX_impact_pixel_texture,
+#endif
+#ifdef GL_SGIX_instrument_error
+  &__GLEW_SGIX_instrument_error,
+#endif
+#ifdef GL_SGIX_interlace
+  &__GLEW_SGIX_interlace,
+#endif
+#ifdef GL_SGIX_ir_instrument1
+  &__GLEW_SGIX_ir_instrument1,
+#endif
+#ifdef GL_SGIX_line_quality_hint
+  &__GLEW_SGIX_line_quality_hint,
+#endif
+#ifdef GL_SGIX_list_priority
+  &__GLEW_SGIX_list_priority,
+#endif
+#ifdef GL_SGIX_mpeg1
+  &__GLEW_SGIX_mpeg1,
+#endif
+#ifdef GL_SGIX_mpeg2
+  &__GLEW_SGIX_mpeg2,
+#endif
+#ifdef GL_SGIX_nonlinear_lighting_pervertex
+  &__GLEW_SGIX_nonlinear_lighting_pervertex,
+#endif
+#ifdef GL_SGIX_nurbs_eval
+  &__GLEW_SGIX_nurbs_eval,
+#endif
+#ifdef GL_SGIX_occlusion_instrument
+  &__GLEW_SGIX_occlusion_instrument,
+#endif
+#ifdef GL_SGIX_packed_6bytes
+  &__GLEW_SGIX_packed_6bytes,
+#endif
+#ifdef GL_SGIX_pixel_texture
+  &__GLEW_SGIX_pixel_texture,
+#endif
+#ifdef GL_SGIX_pixel_texture_bits
+  &__GLEW_SGIX_pixel_texture_bits,
+#endif
+#ifdef GL_SGIX_pixel_texture_lod
+  &__GLEW_SGIX_pixel_texture_lod,
+#endif
+#ifdef GL_SGIX_pixel_tiles
+  &__GLEW_SGIX_pixel_tiles,
+#endif
+#ifdef GL_SGIX_polynomial_ffd
+  &__GLEW_SGIX_polynomial_ffd,
+#endif
+#ifdef GL_SGIX_quad_mesh
+  &__GLEW_SGIX_quad_mesh,
+#endif
+#ifdef GL_SGIX_reference_plane
+  &__GLEW_SGIX_reference_plane,
+#endif
+#ifdef GL_SGIX_resample
+  &__GLEW_SGIX_resample,
+#endif
+#ifdef GL_SGIX_scalebias_hint
+  &__GLEW_SGIX_scalebias_hint,
+#endif
+#ifdef GL_SGIX_shadow
+  &__GLEW_SGIX_shadow,
+#endif
+#ifdef GL_SGIX_shadow_ambient
+  &__GLEW_SGIX_shadow_ambient,
+#endif
+#ifdef GL_SGIX_slim
+  &__GLEW_SGIX_slim,
+#endif
+#ifdef GL_SGIX_spotlight_cutoff
+  &__GLEW_SGIX_spotlight_cutoff,
+#endif
+#ifdef GL_SGIX_sprite
+  &__GLEW_SGIX_sprite,
+#endif
+#ifdef GL_SGIX_subdiv_patch
+  &__GLEW_SGIX_subdiv_patch,
+#endif
+#ifdef GL_SGIX_subsample
+  &__GLEW_SGIX_subsample,
+#endif
+#ifdef GL_SGIX_tag_sample_buffer
+  &__GLEW_SGIX_tag_sample_buffer,
+#endif
+#ifdef GL_SGIX_texture_add_env
+  &__GLEW_SGIX_texture_add_env,
+#endif
+#ifdef GL_SGIX_texture_coordinate_clamp
+  &__GLEW_SGIX_texture_coordinate_clamp,
+#endif
+#ifdef GL_SGIX_texture_lod_bias
+  &__GLEW_SGIX_texture_lod_bias,
+#endif
+#ifdef GL_SGIX_texture_mipmap_anisotropic
+  &__GLEW_SGIX_texture_mipmap_anisotropic,
+#endif
+#ifdef GL_SGIX_texture_multi_buffer
+  &__GLEW_SGIX_texture_multi_buffer,
+#endif
+#ifdef GL_SGIX_texture_phase
+  &__GLEW_SGIX_texture_phase,
+#endif
+#ifdef GL_SGIX_texture_range
+  &__GLEW_SGIX_texture_range,
+#endif
+#ifdef GL_SGIX_texture_scale_bias
+  &__GLEW_SGIX_texture_scale_bias,
+#endif
+#ifdef GL_SGIX_texture_supersample
+  &__GLEW_SGIX_texture_supersample,
+#endif
+#ifdef GL_SGIX_vector_ops
+  &__GLEW_SGIX_vector_ops,
+#endif
+#ifdef GL_SGIX_vertex_array_object
+  &__GLEW_SGIX_vertex_array_object,
+#endif
+#ifdef GL_SGIX_vertex_preclip
+  &__GLEW_SGIX_vertex_preclip,
+#endif
+#ifdef GL_SGIX_vertex_preclip_hint
+  &__GLEW_SGIX_vertex_preclip_hint,
+#endif
+#ifdef GL_SGIX_ycrcb
+  &__GLEW_SGIX_ycrcb,
+#endif
+#ifdef GL_SGIX_ycrcb_subsample
+  &__GLEW_SGIX_ycrcb_subsample,
+#endif
+#ifdef GL_SGIX_ycrcba
+  &__GLEW_SGIX_ycrcba,
+#endif
+#ifdef GL_SGI_color_matrix
+  &__GLEW_SGI_color_matrix,
+#endif
+#ifdef GL_SGI_color_table
+  &__GLEW_SGI_color_table,
+#endif
+#ifdef GL_SGI_complex
+  &__GLEW_SGI_complex,
+#endif
+#ifdef GL_SGI_complex_type
+  &__GLEW_SGI_complex_type,
+#endif
+#ifdef GL_SGI_fft
+  &__GLEW_SGI_fft,
+#endif
+#ifdef GL_SGI_texture_color_table
+  &__GLEW_SGI_texture_color_table,
+#endif
+#ifdef GL_SUNX_constant_data
+  &__GLEW_SUNX_constant_data,
+#endif
+#ifdef GL_SUN_convolution_border_modes
+  &__GLEW_SUN_convolution_border_modes,
+#endif
+#ifdef GL_SUN_global_alpha
+  &__GLEW_SUN_global_alpha,
+#endif
+#ifdef GL_SUN_mesh_array
+  &__GLEW_SUN_mesh_array,
+#endif
+#ifdef GL_SUN_read_video_pixels
+  &__GLEW_SUN_read_video_pixels,
+#endif
+#ifdef GL_SUN_slice_accum
+  &__GLEW_SUN_slice_accum,
+#endif
+#ifdef GL_SUN_triangle_list
+  &__GLEW_SUN_triangle_list,
+#endif
+#ifdef GL_SUN_vertex
+  &__GLEW_SUN_vertex,
+#endif
+#ifdef GL_WIN_phong_shading
+  &__GLEW_WIN_phong_shading,
+#endif
+#ifdef GL_WIN_scene_markerXXX
+  &__GLEW_WIN_scene_markerXXX,
+#endif
+#ifdef GL_WIN_specular_fog
+  &__GLEW_WIN_specular_fog,
+#endif
+#ifdef GL_WIN_swap_hint
+  &__GLEW_WIN_swap_hint,
+#endif
+  NULL
+};
+static GLboolean _glewInit_GL_VERSION_1_2 ();
+static GLboolean _glewInit_GL_VERSION_1_3 ();
+static GLboolean _glewInit_GL_VERSION_1_4 ();
+static GLboolean _glewInit_GL_VERSION_1_5 ();
+static GLboolean _glewInit_GL_VERSION_2_0 ();
+static GLboolean _glewInit_GL_VERSION_2_1 ();
+static GLboolean _glewInit_GL_VERSION_3_0 ();
+static GLboolean _glewInit_GL_VERSION_3_1 ();
+static GLboolean _glewInit_GL_VERSION_3_2 ();
+static GLboolean _glewInit_GL_VERSION_3_3 ();
+static GLboolean _glewInit_GL_VERSION_4_0 ();
+static GLboolean _glewInit_GL_VERSION_4_5 ();
+static GLboolean _glewInit_GL_VERSION_4_6 ();
+static GLboolean _glewInit_GL_3DFX_tbuffer ();
+static GLboolean _glewInit_GL_AMD_debug_output ();
+static GLboolean _glewInit_GL_AMD_draw_buffers_blend ();
+static GLboolean _glewInit_GL_AMD_framebuffer_sample_positions ();
+static GLboolean _glewInit_GL_AMD_interleaved_elements ();
+static GLboolean _glewInit_GL_AMD_multi_draw_indirect ();
+static GLboolean _glewInit_GL_AMD_name_gen_delete ();
+static GLboolean _glewInit_GL_AMD_occlusion_query_event ();
+static GLboolean _glewInit_GL_AMD_performance_monitor ();
+static GLboolean _glewInit_GL_AMD_sample_positions ();
+static GLboolean _glewInit_GL_AMD_sparse_texture ();
+static GLboolean _glewInit_GL_AMD_stencil_operation_extended ();
+static GLboolean _glewInit_GL_AMD_vertex_shader_tessellator ();
+static GLboolean _glewInit_GL_ANGLE_framebuffer_blit ();
+static GLboolean _glewInit_GL_ANGLE_framebuffer_multisample ();
+static GLboolean _glewInit_GL_ANGLE_instanced_arrays ();
+static GLboolean _glewInit_GL_ANGLE_timer_query ();
+static GLboolean _glewInit_GL_ANGLE_translated_shader_source ();
+static GLboolean _glewInit_GL_APPLE_copy_texture_levels ();
+static GLboolean _glewInit_GL_APPLE_element_array ();
+static GLboolean _glewInit_GL_APPLE_fence ();
+static GLboolean _glewInit_GL_APPLE_flush_buffer_range ();
+static GLboolean _glewInit_GL_APPLE_framebuffer_multisample ();
+static GLboolean _glewInit_GL_APPLE_object_purgeable ();
+static GLboolean _glewInit_GL_APPLE_sync ();
+static GLboolean _glewInit_GL_APPLE_texture_range ();
+static GLboolean _glewInit_GL_APPLE_vertex_array_object ();
+static GLboolean _glewInit_GL_APPLE_vertex_array_range ();
+static GLboolean _glewInit_GL_APPLE_vertex_program_evaluators ();
+static GLboolean _glewInit_GL_ARB_ES2_compatibility ();
+static GLboolean _glewInit_GL_ARB_ES3_1_compatibility ();
+static GLboolean _glewInit_GL_ARB_ES3_2_compatibility ();
+static GLboolean _glewInit_GL_ARB_base_instance ();
+static GLboolean _glewInit_GL_ARB_bindless_texture ();
+static GLboolean _glewInit_GL_ARB_blend_func_extended ();
+static GLboolean _glewInit_GL_ARB_buffer_storage ();
+static GLboolean _glewInit_GL_ARB_cl_event ();
+static GLboolean _glewInit_GL_ARB_clear_buffer_object ();
+static GLboolean _glewInit_GL_ARB_clear_texture ();
+static GLboolean _glewInit_GL_ARB_clip_control ();
+static GLboolean _glewInit_GL_ARB_color_buffer_float ();
+static GLboolean _glewInit_GL_ARB_compute_shader ();
+static GLboolean _glewInit_GL_ARB_compute_variable_group_size ();
+static GLboolean _glewInit_GL_ARB_copy_buffer ();
+static GLboolean _glewInit_GL_ARB_copy_image ();
+static GLboolean _glewInit_GL_ARB_debug_output ();
+static GLboolean _glewInit_GL_ARB_direct_state_access ();
+static GLboolean _glewInit_GL_ARB_draw_buffers ();
+static GLboolean _glewInit_GL_ARB_draw_buffers_blend ();
+static GLboolean _glewInit_GL_ARB_draw_elements_base_vertex ();
+static GLboolean _glewInit_GL_ARB_draw_indirect ();
+static GLboolean _glewInit_GL_ARB_framebuffer_no_attachments ();
+static GLboolean _glewInit_GL_ARB_framebuffer_object ();
+static GLboolean _glewInit_GL_ARB_geometry_shader4 ();
+static GLboolean _glewInit_GL_ARB_get_program_binary ();
+static GLboolean _glewInit_GL_ARB_get_texture_sub_image ();
+static GLboolean _glewInit_GL_ARB_gl_spirv ();
+static GLboolean _glewInit_GL_ARB_gpu_shader_fp64 ();
+static GLboolean _glewInit_GL_ARB_gpu_shader_int64 ();
+static GLboolean _glewInit_GL_ARB_imaging ();
+static GLboolean _glewInit_GL_ARB_indirect_parameters ();
+static GLboolean _glewInit_GL_ARB_instanced_arrays ();
+static GLboolean _glewInit_GL_ARB_internalformat_query ();
+static GLboolean _glewInit_GL_ARB_internalformat_query2 ();
+static GLboolean _glewInit_GL_ARB_invalidate_subdata ();
+static GLboolean _glewInit_GL_ARB_map_buffer_range ();
+static GLboolean _glewInit_GL_ARB_matrix_palette ();
+static GLboolean _glewInit_GL_ARB_multi_bind ();
+static GLboolean _glewInit_GL_ARB_multi_draw_indirect ();
+static GLboolean _glewInit_GL_ARB_multisample ();
+static GLboolean _glewInit_GL_ARB_multitexture ();
+static GLboolean _glewInit_GL_ARB_occlusion_query ();
+static GLboolean _glewInit_GL_ARB_parallel_shader_compile ();
+static GLboolean _glewInit_GL_ARB_point_parameters ();
+static GLboolean _glewInit_GL_ARB_polygon_offset_clamp ();
+static GLboolean _glewInit_GL_ARB_program_interface_query ();
+static GLboolean _glewInit_GL_ARB_provoking_vertex ();
+static GLboolean _glewInit_GL_ARB_robustness ();
+static GLboolean _glewInit_GL_ARB_sample_locations ();
+static GLboolean _glewInit_GL_ARB_sample_shading ();
+static GLboolean _glewInit_GL_ARB_sampler_objects ();
+static GLboolean _glewInit_GL_ARB_separate_shader_objects ();
+static GLboolean _glewInit_GL_ARB_shader_atomic_counters ();
+static GLboolean _glewInit_GL_ARB_shader_image_load_store ();
+static GLboolean _glewInit_GL_ARB_shader_objects ();
+static GLboolean _glewInit_GL_ARB_shader_storage_buffer_object ();
+static GLboolean _glewInit_GL_ARB_shader_subroutine ();
+static GLboolean _glewInit_GL_ARB_shading_language_include ();
+static GLboolean _glewInit_GL_ARB_sparse_buffer ();
+static GLboolean _glewInit_GL_ARB_sparse_texture ();
+static GLboolean _glewInit_GL_ARB_sync ();
+static GLboolean _glewInit_GL_ARB_tessellation_shader ();
+static GLboolean _glewInit_GL_ARB_texture_barrier ();
+static GLboolean _glewInit_GL_ARB_texture_buffer_object ();
+static GLboolean _glewInit_GL_ARB_texture_buffer_range ();
+static GLboolean _glewInit_GL_ARB_texture_compression ();
+static GLboolean _glewInit_GL_ARB_texture_multisample ();
+static GLboolean _glewInit_GL_ARB_texture_storage ();
+static GLboolean _glewInit_GL_ARB_texture_storage_multisample ();
+static GLboolean _glewInit_GL_ARB_texture_view ();
+static GLboolean _glewInit_GL_ARB_timer_query ();
+static GLboolean _glewInit_GL_ARB_transform_feedback2 ();
+static GLboolean _glewInit_GL_ARB_transform_feedback3 ();
+static GLboolean _glewInit_GL_ARB_transform_feedback_instanced ();
+static GLboolean _glewInit_GL_ARB_transpose_matrix ();
+static GLboolean _glewInit_GL_ARB_uniform_buffer_object ();
+static GLboolean _glewInit_GL_ARB_vertex_array_object ();
+static GLboolean _glewInit_GL_ARB_vertex_attrib_64bit ();
+static GLboolean _glewInit_GL_ARB_vertex_attrib_binding ();
+static GLboolean _glewInit_GL_ARB_vertex_blend ();
+static GLboolean _glewInit_GL_ARB_vertex_buffer_object ();
+static GLboolean _glewInit_GL_ARB_vertex_program ();
+static GLboolean _glewInit_GL_ARB_vertex_shader ();
+static GLboolean _glewInit_GL_ARB_vertex_type_2_10_10_10_rev ();
+static GLboolean _glewInit_GL_ARB_viewport_array ();
+static GLboolean _glewInit_GL_ARB_window_pos ();
+static GLboolean _glewInit_GL_ATI_draw_buffers ();
+static GLboolean _glewInit_GL_ATI_element_array ();
+static GLboolean _glewInit_GL_ATI_envmap_bumpmap ();
+static GLboolean _glewInit_GL_ATI_fragment_shader ();
+static GLboolean _glewInit_GL_ATI_map_object_buffer ();
+static GLboolean _glewInit_GL_ATI_pn_triangles ();
+static GLboolean _glewInit_GL_ATI_separate_stencil ();
+static GLboolean _glewInit_GL_ATI_vertex_array_object ();
+static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object ();
+static GLboolean _glewInit_GL_ATI_vertex_streams ();
+static GLboolean _glewInit_GL_EXT_base_instance ();
+static GLboolean _glewInit_GL_EXT_bindable_uniform ();
+static GLboolean _glewInit_GL_EXT_blend_color ();
+static GLboolean _glewInit_GL_EXT_blend_equation_separate ();
+static GLboolean _glewInit_GL_EXT_blend_func_extended ();
+static GLboolean _glewInit_GL_EXT_blend_func_separate ();
+static GLboolean _glewInit_GL_EXT_blend_minmax ();
+static GLboolean _glewInit_GL_EXT_buffer_storage ();
+static GLboolean _glewInit_GL_EXT_clear_texture ();
+static GLboolean _glewInit_GL_EXT_color_subtable ();
+static GLboolean _glewInit_GL_EXT_compiled_vertex_array ();
+static GLboolean _glewInit_GL_EXT_convolution ();
+static GLboolean _glewInit_GL_EXT_coordinate_frame ();
+static GLboolean _glewInit_GL_EXT_copy_image ();
+static GLboolean _glewInit_GL_EXT_copy_texture ();
+static GLboolean _glewInit_GL_EXT_cull_vertex ();
+static GLboolean _glewInit_GL_EXT_debug_label ();
+static GLboolean _glewInit_GL_EXT_debug_marker ();
+static GLboolean _glewInit_GL_EXT_depth_bounds_test ();
+static GLboolean _glewInit_GL_EXT_direct_state_access ();
+static GLboolean _glewInit_GL_EXT_discard_framebuffer ();
+static GLboolean _glewInit_GL_EXT_draw_buffers ();
+static GLboolean _glewInit_GL_EXT_draw_buffers2 ();
+static GLboolean _glewInit_GL_EXT_draw_buffers_indexed ();
+static GLboolean _glewInit_GL_EXT_draw_elements_base_vertex ();
+static GLboolean _glewInit_GL_EXT_draw_instanced ();
+static GLboolean _glewInit_GL_EXT_draw_range_elements ();
+static GLboolean _glewInit_GL_EXT_external_buffer ();
+static GLboolean _glewInit_GL_EXT_fog_coord ();
+static GLboolean _glewInit_GL_EXT_fragment_lighting ();
+static GLboolean _glewInit_GL_EXT_framebuffer_blit ();
+static GLboolean _glewInit_GL_EXT_framebuffer_multisample ();
+static GLboolean _glewInit_GL_EXT_framebuffer_object ();
+static GLboolean _glewInit_GL_EXT_geometry_shader4 ();
+static GLboolean _glewInit_GL_EXT_gpu_program_parameters ();
+static GLboolean _glewInit_GL_EXT_gpu_shader4 ();
+static GLboolean _glewInit_GL_EXT_histogram ();
+static GLboolean _glewInit_GL_EXT_index_func ();
+static GLboolean _glewInit_GL_EXT_index_material ();
+static GLboolean _glewInit_GL_EXT_instanced_arrays ();
+static GLboolean _glewInit_GL_EXT_light_texture ();
+static GLboolean _glewInit_GL_EXT_map_buffer_range ();
+static GLboolean _glewInit_GL_EXT_memory_object ();
+static GLboolean _glewInit_GL_EXT_memory_object_fd ();
+static GLboolean _glewInit_GL_EXT_memory_object_win32 ();
+static GLboolean _glewInit_GL_EXT_multi_draw_arrays ();
+static GLboolean _glewInit_GL_EXT_multi_draw_indirect ();
+static GLboolean _glewInit_GL_EXT_multisample ();
+static GLboolean _glewInit_GL_EXT_multisampled_render_to_texture ();
+static GLboolean _glewInit_GL_EXT_multiview_draw_buffers ();
+static GLboolean _glewInit_GL_EXT_paletted_texture ();
+static GLboolean _glewInit_GL_EXT_pixel_transform ();
+static GLboolean _glewInit_GL_EXT_point_parameters ();
+static GLboolean _glewInit_GL_EXT_polygon_offset ();
+static GLboolean _glewInit_GL_EXT_polygon_offset_clamp ();
+static GLboolean _glewInit_GL_EXT_provoking_vertex ();
+static GLboolean _glewInit_GL_EXT_raster_multisample ();
+static GLboolean _glewInit_GL_EXT_scene_marker ();
+static GLboolean _glewInit_GL_EXT_secondary_color ();
+static GLboolean _glewInit_GL_EXT_semaphore ();
+static GLboolean _glewInit_GL_EXT_semaphore_fd ();
+static GLboolean _glewInit_GL_EXT_semaphore_win32 ();
+static GLboolean _glewInit_GL_EXT_separate_shader_objects ();
+static GLboolean _glewInit_GL_EXT_shader_image_load_store ();
+static GLboolean _glewInit_GL_EXT_shader_pixel_local_storage2 ();
+static GLboolean _glewInit_GL_EXT_sparse_texture ();
+static GLboolean _glewInit_GL_EXT_stencil_two_side ();
+static GLboolean _glewInit_GL_EXT_subtexture ();
+static GLboolean _glewInit_GL_EXT_texture3D ();
+static GLboolean _glewInit_GL_EXT_texture_array ();
+static GLboolean _glewInit_GL_EXT_texture_buffer_object ();
+static GLboolean _glewInit_GL_EXT_texture_integer ();
+static GLboolean _glewInit_GL_EXT_texture_object ();
+static GLboolean _glewInit_GL_EXT_texture_perturb_normal ();
+static GLboolean _glewInit_GL_EXT_texture_storage ();
+static GLboolean _glewInit_GL_EXT_texture_view ();
+static GLboolean _glewInit_GL_EXT_timer_query ();
+static GLboolean _glewInit_GL_EXT_transform_feedback ();
+static GLboolean _glewInit_GL_EXT_vertex_array ();
+static GLboolean _glewInit_GL_EXT_vertex_array_setXXX ();
+static GLboolean _glewInit_GL_EXT_vertex_attrib_64bit ();
+static GLboolean _glewInit_GL_EXT_vertex_shader ();
+static GLboolean _glewInit_GL_EXT_vertex_weighting ();
+static GLboolean _glewInit_GL_EXT_win32_keyed_mutex ();
+static GLboolean _glewInit_GL_EXT_window_rectangles ();
+static GLboolean _glewInit_GL_EXT_x11_sync_object ();
+static GLboolean _glewInit_GL_GREMEDY_frame_terminator ();
+static GLboolean _glewInit_GL_GREMEDY_string_marker ();
+static GLboolean _glewInit_GL_HP_image_transform ();
+static GLboolean _glewInit_GL_IBM_multimode_draw_arrays ();
+static GLboolean _glewInit_GL_IBM_vertex_array_lists ();
+static GLboolean _glewInit_GL_INTEL_map_texture ();
+static GLboolean _glewInit_GL_INTEL_parallel_arrays ();
+static GLboolean _glewInit_GL_INTEL_performance_query ();
+static GLboolean _glewInit_GL_INTEL_texture_scissor ();
+static GLboolean _glewInit_GL_KHR_blend_equation_advanced ();
+static GLboolean _glewInit_GL_KHR_debug ();
+static GLboolean _glewInit_GL_KHR_parallel_shader_compile ();
+static GLboolean _glewInit_GL_KHR_robustness ();
+static GLboolean _glewInit_GL_KTX_buffer_region ();
+static GLboolean _glewInit_GL_MESA_resize_buffers ();
+static GLboolean _glewInit_GL_MESA_window_pos ();
+static GLboolean _glewInit_GL_NVX_conditional_render ();
+static GLboolean _glewInit_GL_NVX_linked_gpu_multicast ();
+static GLboolean _glewInit_GL_NV_3dvision_settings ();
+static GLboolean _glewInit_GL_NV_bindless_multi_draw_indirect ();
+static GLboolean _glewInit_GL_NV_bindless_multi_draw_indirect_count ();
+static GLboolean _glewInit_GL_NV_bindless_texture ();
+static GLboolean _glewInit_GL_NV_blend_equation_advanced ();
+static GLboolean _glewInit_GL_NV_clip_space_w_scaling ();
+static GLboolean _glewInit_GL_NV_command_list ();
+static GLboolean _glewInit_GL_NV_conditional_render ();
+static GLboolean _glewInit_GL_NV_conservative_raster ();
+static GLboolean _glewInit_GL_NV_conservative_raster_dilate ();
+static GLboolean _glewInit_GL_NV_conservative_raster_pre_snap_triangles ();
+static GLboolean _glewInit_GL_NV_copy_buffer ();
+static GLboolean _glewInit_GL_NV_copy_image ();
+static GLboolean _glewInit_GL_NV_depth_buffer_float ();
+static GLboolean _glewInit_GL_NV_draw_buffers ();
+static GLboolean _glewInit_GL_NV_draw_instanced ();
+static GLboolean _glewInit_GL_NV_draw_texture ();
+static GLboolean _glewInit_GL_NV_draw_vulkan_image ();
+static GLboolean _glewInit_GL_NV_evaluators ();
+static GLboolean _glewInit_GL_NV_explicit_multisample ();
+static GLboolean _glewInit_GL_NV_fence ();
+static GLboolean _glewInit_GL_NV_fragment_coverage_to_color ();
+static GLboolean _glewInit_GL_NV_fragment_program ();
+static GLboolean _glewInit_GL_NV_framebuffer_blit ();
+static GLboolean _glewInit_GL_NV_framebuffer_multisample ();
+static GLboolean _glewInit_GL_NV_framebuffer_multisample_coverage ();
+static GLboolean _glewInit_GL_NV_geometry_program4 ();
+static GLboolean _glewInit_GL_NV_gpu_multicast ();
+static GLboolean _glewInit_GL_NV_gpu_program4 ();
+static GLboolean _glewInit_GL_NV_gpu_shader5 ();
+static GLboolean _glewInit_GL_NV_half_float ();
+static GLboolean _glewInit_GL_NV_instanced_arrays ();
+static GLboolean _glewInit_GL_NV_internalformat_sample_query ();
+static GLboolean _glewInit_GL_NV_non_square_matrices ();
+static GLboolean _glewInit_GL_NV_occlusion_query ();
+static GLboolean _glewInit_GL_NV_parameter_buffer_object ();
+static GLboolean _glewInit_GL_NV_path_rendering ();
+static GLboolean _glewInit_GL_NV_pixel_data_range ();
+static GLboolean _glewInit_GL_NV_point_sprite ();
+static GLboolean _glewInit_GL_NV_polygon_mode ();
+static GLboolean _glewInit_GL_NV_present_video ();
+static GLboolean _glewInit_GL_NV_primitive_restart ();
+static GLboolean _glewInit_GL_NV_register_combiners ();
+static GLboolean _glewInit_GL_NV_register_combiners2 ();
+static GLboolean _glewInit_GL_NV_sample_locations ();
+static GLboolean _glewInit_GL_NV_shader_buffer_load ();
+static GLboolean _glewInit_GL_NV_texture_array ();
+static GLboolean _glewInit_GL_NV_texture_barrier ();
+static GLboolean _glewInit_GL_NV_texture_multisample ();
+static GLboolean _glewInit_GL_NV_transform_feedback ();
+static GLboolean _glewInit_GL_NV_transform_feedback2 ();
+static GLboolean _glewInit_GL_NV_vdpau_interop ();
+static GLboolean _glewInit_GL_NV_vertex_array_range ();
+static GLboolean _glewInit_GL_NV_vertex_attrib_integer_64bit ();
+static GLboolean _glewInit_GL_NV_vertex_buffer_unified_memory ();
+static GLboolean _glewInit_GL_NV_vertex_program ();
+static GLboolean _glewInit_GL_NV_video_capture ();
+static GLboolean _glewInit_GL_NV_viewport_array ();
+static GLboolean _glewInit_GL_NV_viewport_swizzle ();
+static GLboolean _glewInit_GL_OVR_multiview ();
+static GLboolean _glewInit_GL_OVR_multiview_multisampled_render_to_texture ();
+static GLboolean _glewInit_GL_QCOM_alpha_test ();
+static GLboolean _glewInit_GL_QCOM_driver_control ();
+static GLboolean _glewInit_GL_QCOM_extended_get ();
+static GLboolean _glewInit_GL_QCOM_extended_get2 ();
+static GLboolean _glewInit_GL_QCOM_framebuffer_foveated ();
+static GLboolean _glewInit_GL_QCOM_shader_framebuffer_fetch_noncoherent ();
+static GLboolean _glewInit_GL_QCOM_tiled_rendering ();
+static GLboolean _glewInit_GL_REGAL_ES1_0_compatibility ();
+static GLboolean _glewInit_GL_REGAL_ES1_1_compatibility ();
+static GLboolean _glewInit_GL_REGAL_error_string ();
+static GLboolean _glewInit_GL_REGAL_extension_query ();
+static GLboolean _glewInit_GL_REGAL_log ();
+static GLboolean _glewInit_GL_REGAL_proc_address ();
+static GLboolean _glewInit_GL_SGIS_detail_texture ();
+static GLboolean _glewInit_GL_SGIS_fog_function ();
+static GLboolean _glewInit_GL_SGIS_multisample ();
+static GLboolean _glewInit_GL_SGIS_multitexture ();
+static GLboolean _glewInit_GL_SGIS_shared_multisample ();
+static GLboolean _glewInit_GL_SGIS_sharpen_texture ();
+static GLboolean _glewInit_GL_SGIS_texture4D ();
+static GLboolean _glewInit_GL_SGIS_texture_filter4 ();
+static GLboolean _glewInit_GL_SGIX_async ();
+static GLboolean _glewInit_GL_SGIX_datapipe ();
+static GLboolean _glewInit_GL_SGIX_flush_raster ();
+static GLboolean _glewInit_GL_SGIX_fog_layers ();
+static GLboolean _glewInit_GL_SGIX_fog_texture ();
+static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting ();
+static GLboolean _glewInit_GL_SGIX_framezoom ();
+static GLboolean _glewInit_GL_SGIX_igloo_interface ();
+static GLboolean _glewInit_GL_SGIX_mpeg1 ();
+static GLboolean _glewInit_GL_SGIX_nonlinear_lighting_pervertex ();
+static GLboolean _glewInit_GL_SGIX_pixel_texture ();
+static GLboolean _glewInit_GL_SGIX_polynomial_ffd ();
+static GLboolean _glewInit_GL_SGIX_quad_mesh ();
+static GLboolean _glewInit_GL_SGIX_reference_plane ();
+static GLboolean _glewInit_GL_SGIX_sprite ();
+static GLboolean _glewInit_GL_SGIX_tag_sample_buffer ();
+static GLboolean _glewInit_GL_SGIX_vector_ops ();
+static GLboolean _glewInit_GL_SGIX_vertex_array_object ();
+static GLboolean _glewInit_GL_SGI_color_table ();
+static GLboolean _glewInit_GL_SGI_fft ();
+static GLboolean _glewInit_GL_SUNX_constant_data ();
+static GLboolean _glewInit_GL_SUN_global_alpha ();
+static GLboolean _glewInit_GL_SUN_read_video_pixels ();
+static GLboolean _glewInit_GL_SUN_triangle_list ();
+static GLboolean _glewInit_GL_SUN_vertex ();
+static GLboolean _glewInit_GL_WIN_swap_hint ();
+
+#ifdef GL_VERSION_1_2
+
+static GLboolean _glewInit_GL_VERSION_1_2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3D")) == NULL) || r;
+  r = ((glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElements")) == NULL) || r;
+  r = ((glTexImage3D = (PFNGLTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexImage3D")) == NULL) || r;
+  r = ((glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_2 */
+
+#ifdef GL_VERSION_1_3
+
+static GLboolean _glewInit_GL_VERSION_1_3 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveTexture = (PFNGLACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glActiveTexture")) == NULL) || r;
+  r = ((glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTexture")) == NULL) || r;
+  r = ((glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1D")) == NULL) || r;
+  r = ((glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2D")) == NULL) || r;
+  r = ((glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3D")) == NULL) || r;
+  r = ((glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1D")) == NULL) || r;
+  r = ((glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2D")) == NULL) || r;
+  r = ((glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3D")) == NULL) || r;
+  r = ((glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImage")) == NULL) || r;
+  r = ((glLoadTransposeMatrixd = (PFNGLLOADTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixd")) == NULL) || r;
+  r = ((glLoadTransposeMatrixf = (PFNGLLOADTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixf")) == NULL) || r;
+  r = ((glMultTransposeMatrixd = (PFNGLMULTTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixd")) == NULL) || r;
+  r = ((glMultTransposeMatrixf = (PFNGLMULTTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixf")) == NULL) || r;
+  r = ((glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1d")) == NULL) || r;
+  r = ((glMultiTexCoord1dv = (PFNGLMULTITEXCOORD1DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dv")) == NULL) || r;
+  r = ((glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1f")) == NULL) || r;
+  r = ((glMultiTexCoord1fv = (PFNGLMULTITEXCOORD1FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fv")) == NULL) || r;
+  r = ((glMultiTexCoord1i = (PFNGLMULTITEXCOORD1IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1i")) == NULL) || r;
+  r = ((glMultiTexCoord1iv = (PFNGLMULTITEXCOORD1IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iv")) == NULL) || r;
+  r = ((glMultiTexCoord1s = (PFNGLMULTITEXCOORD1SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1s")) == NULL) || r;
+  r = ((glMultiTexCoord1sv = (PFNGLMULTITEXCOORD1SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sv")) == NULL) || r;
+  r = ((glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2d")) == NULL) || r;
+  r = ((glMultiTexCoord2dv = (PFNGLMULTITEXCOORD2DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dv")) == NULL) || r;
+  r = ((glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2f")) == NULL) || r;
+  r = ((glMultiTexCoord2fv = (PFNGLMULTITEXCOORD2FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fv")) == NULL) || r;
+  r = ((glMultiTexCoord2i = (PFNGLMULTITEXCOORD2IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2i")) == NULL) || r;
+  r = ((glMultiTexCoord2iv = (PFNGLMULTITEXCOORD2IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iv")) == NULL) || r;
+  r = ((glMultiTexCoord2s = (PFNGLMULTITEXCOORD2SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2s")) == NULL) || r;
+  r = ((glMultiTexCoord2sv = (PFNGLMULTITEXCOORD2SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sv")) == NULL) || r;
+  r = ((glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3d")) == NULL) || r;
+  r = ((glMultiTexCoord3dv = (PFNGLMULTITEXCOORD3DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dv")) == NULL) || r;
+  r = ((glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3f")) == NULL) || r;
+  r = ((glMultiTexCoord3fv = (PFNGLMULTITEXCOORD3FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fv")) == NULL) || r;
+  r = ((glMultiTexCoord3i = (PFNGLMULTITEXCOORD3IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3i")) == NULL) || r;
+  r = ((glMultiTexCoord3iv = (PFNGLMULTITEXCOORD3IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iv")) == NULL) || r;
+  r = ((glMultiTexCoord3s = (PFNGLMULTITEXCOORD3SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3s")) == NULL) || r;
+  r = ((glMultiTexCoord3sv = (PFNGLMULTITEXCOORD3SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sv")) == NULL) || r;
+  r = ((glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4d")) == NULL) || r;
+  r = ((glMultiTexCoord4dv = (PFNGLMULTITEXCOORD4DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dv")) == NULL) || r;
+  r = ((glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4f")) == NULL) || r;
+  r = ((glMultiTexCoord4fv = (PFNGLMULTITEXCOORD4FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fv")) == NULL) || r;
+  r = ((glMultiTexCoord4i = (PFNGLMULTITEXCOORD4IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4i")) == NULL) || r;
+  r = ((glMultiTexCoord4iv = (PFNGLMULTITEXCOORD4IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iv")) == NULL) || r;
+  r = ((glMultiTexCoord4s = (PFNGLMULTITEXCOORD4SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4s")) == NULL) || r;
+  r = ((glMultiTexCoord4sv = (PFNGLMULTITEXCOORD4SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sv")) == NULL) || r;
+  r = ((glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_3 */
+
+#ifdef GL_VERSION_1_4
+
+static GLboolean _glewInit_GL_VERSION_1_4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendColor = (PFNGLBLENDCOLORPROC)glewGetProcAddress((const GLubyte*)"glBlendColor")) == NULL) || r;
+  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
+  r = ((glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparate")) == NULL) || r;
+  r = ((glFogCoordPointer = (PFNGLFOGCOORDPOINTERPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointer")) == NULL) || r;
+  r = ((glFogCoordd = (PFNGLFOGCOORDDPROC)glewGetProcAddress((const GLubyte*)"glFogCoordd")) == NULL) || r;
+  r = ((glFogCoorddv = (PFNGLFOGCOORDDVPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddv")) == NULL) || r;
+  r = ((glFogCoordf = (PFNGLFOGCOORDFPROC)glewGetProcAddress((const GLubyte*)"glFogCoordf")) == NULL) || r;
+  r = ((glFogCoordfv = (PFNGLFOGCOORDFVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfv")) == NULL) || r;
+  r = ((glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArrays")) == NULL) || r;
+  r = ((glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElements")) == NULL) || r;
+  r = ((glPointParameterf = (PFNGLPOINTPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glPointParameterf")) == NULL) || r;
+  r = ((glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfv")) == NULL) || r;
+  r = ((glPointParameteri = (PFNGLPOINTPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPointParameteri")) == NULL) || r;
+  r = ((glPointParameteriv = (PFNGLPOINTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriv")) == NULL) || r;
+  r = ((glSecondaryColor3b = (PFNGLSECONDARYCOLOR3BPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3b")) == NULL) || r;
+  r = ((glSecondaryColor3bv = (PFNGLSECONDARYCOLOR3BVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bv")) == NULL) || r;
+  r = ((glSecondaryColor3d = (PFNGLSECONDARYCOLOR3DPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3d")) == NULL) || r;
+  r = ((glSecondaryColor3dv = (PFNGLSECONDARYCOLOR3DVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dv")) == NULL) || r;
+  r = ((glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3f")) == NULL) || r;
+  r = ((glSecondaryColor3fv = (PFNGLSECONDARYCOLOR3FVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fv")) == NULL) || r;
+  r = ((glSecondaryColor3i = (PFNGLSECONDARYCOLOR3IPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3i")) == NULL) || r;
+  r = ((glSecondaryColor3iv = (PFNGLSECONDARYCOLOR3IVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iv")) == NULL) || r;
+  r = ((glSecondaryColor3s = (PFNGLSECONDARYCOLOR3SPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3s")) == NULL) || r;
+  r = ((glSecondaryColor3sv = (PFNGLSECONDARYCOLOR3SVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sv")) == NULL) || r;
+  r = ((glSecondaryColor3ub = (PFNGLSECONDARYCOLOR3UBPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ub")) == NULL) || r;
+  r = ((glSecondaryColor3ubv = (PFNGLSECONDARYCOLOR3UBVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubv")) == NULL) || r;
+  r = ((glSecondaryColor3ui = (PFNGLSECONDARYCOLOR3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ui")) == NULL) || r;
+  r = ((glSecondaryColor3uiv = (PFNGLSECONDARYCOLOR3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiv")) == NULL) || r;
+  r = ((glSecondaryColor3us = (PFNGLSECONDARYCOLOR3USPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3us")) == NULL) || r;
+  r = ((glSecondaryColor3usv = (PFNGLSECONDARYCOLOR3USVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usv")) == NULL) || r;
+  r = ((glSecondaryColorPointer = (PFNGLSECONDARYCOLORPOINTERPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointer")) == NULL) || r;
+  r = ((glWindowPos2d = (PFNGLWINDOWPOS2DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2d")) == NULL) || r;
+  r = ((glWindowPos2dv = (PFNGLWINDOWPOS2DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dv")) == NULL) || r;
+  r = ((glWindowPos2f = (PFNGLWINDOWPOS2FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2f")) == NULL) || r;
+  r = ((glWindowPos2fv = (PFNGLWINDOWPOS2FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fv")) == NULL) || r;
+  r = ((glWindowPos2i = (PFNGLWINDOWPOS2IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2i")) == NULL) || r;
+  r = ((glWindowPos2iv = (PFNGLWINDOWPOS2IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iv")) == NULL) || r;
+  r = ((glWindowPos2s = (PFNGLWINDOWPOS2SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2s")) == NULL) || r;
+  r = ((glWindowPos2sv = (PFNGLWINDOWPOS2SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sv")) == NULL) || r;
+  r = ((glWindowPos3d = (PFNGLWINDOWPOS3DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3d")) == NULL) || r;
+  r = ((glWindowPos3dv = (PFNGLWINDOWPOS3DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dv")) == NULL) || r;
+  r = ((glWindowPos3f = (PFNGLWINDOWPOS3FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3f")) == NULL) || r;
+  r = ((glWindowPos3fv = (PFNGLWINDOWPOS3FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fv")) == NULL) || r;
+  r = ((glWindowPos3i = (PFNGLWINDOWPOS3IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3i")) == NULL) || r;
+  r = ((glWindowPos3iv = (PFNGLWINDOWPOS3IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iv")) == NULL) || r;
+  r = ((glWindowPos3s = (PFNGLWINDOWPOS3SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3s")) == NULL) || r;
+  r = ((glWindowPos3sv = (PFNGLWINDOWPOS3SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_4 */
+
+#ifdef GL_VERSION_1_5
+
+static GLboolean _glewInit_GL_VERSION_1_5 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQuery = (PFNGLBEGINQUERYPROC)glewGetProcAddress((const GLubyte*)"glBeginQuery")) == NULL) || r;
+  r = ((glBindBuffer = (PFNGLBINDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindBuffer")) == NULL) || r;
+  r = ((glBufferData = (PFNGLBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferData")) == NULL) || r;
+  r = ((glBufferSubData = (PFNGLBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferSubData")) == NULL) || r;
+  r = ((glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffers")) == NULL) || r;
+  r = ((glDeleteQueries = (PFNGLDELETEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueries")) == NULL) || r;
+  r = ((glEndQuery = (PFNGLENDQUERYPROC)glewGetProcAddress((const GLubyte*)"glEndQuery")) == NULL) || r;
+  r = ((glGenBuffers = (PFNGLGENBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenBuffers")) == NULL) || r;
+  r = ((glGenQueries = (PFNGLGENQUERIESPROC)glewGetProcAddress((const GLubyte*)"glGenQueries")) == NULL) || r;
+  r = ((glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteriv")) == NULL) || r;
+  r = ((glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointerv")) == NULL) || r;
+  r = ((glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubData")) == NULL) || r;
+  r = ((glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectiv")) == NULL) || r;
+  r = ((glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuiv")) == NULL) || r;
+  r = ((glGetQueryiv = (PFNGLGETQUERYIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryiv")) == NULL) || r;
+  r = ((glIsBuffer = (PFNGLISBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsBuffer")) == NULL) || r;
+  r = ((glIsQuery = (PFNGLISQUERYPROC)glewGetProcAddress((const GLubyte*)"glIsQuery")) == NULL) || r;
+  r = ((glMapBuffer = (PFNGLMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapBuffer")) == NULL) || r;
+  r = ((glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapBuffer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_5 */
+
+#ifdef GL_VERSION_2_0
+
+static GLboolean _glewInit_GL_VERSION_2_0 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r;
+  r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r;
+  r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r;
+  r = ((glCompileShader = (PFNGLCOMPILESHADERPROC)glewGetProcAddress((const GLubyte*)"glCompileShader")) == NULL) || r;
+  r = ((glCreateProgram = (PFNGLCREATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glCreateProgram")) == NULL) || r;
+  r = ((glCreateShader = (PFNGLCREATESHADERPROC)glewGetProcAddress((const GLubyte*)"glCreateShader")) == NULL) || r;
+  r = ((glDeleteProgram = (PFNGLDELETEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgram")) == NULL) || r;
+  r = ((glDeleteShader = (PFNGLDELETESHADERPROC)glewGetProcAddress((const GLubyte*)"glDeleteShader")) == NULL) || r;
+  r = ((glDetachShader = (PFNGLDETACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glDetachShader")) == NULL) || r;
+  r = ((glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArray")) == NULL) || r;
+  r = ((glDrawBuffers = (PFNGLDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffers")) == NULL) || r;
+  r = ((glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArray")) == NULL) || r;
+  r = ((glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttrib")) == NULL) || r;
+  r = ((glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniform")) == NULL) || r;
+  r = ((glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedShaders")) == NULL) || r;
+  r = ((glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocation")) == NULL) || r;
+  r = ((glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInfoLog")) == NULL) || r;
+  r = ((glGetProgramiv = (PFNGLGETPROGRAMIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramiv")) == NULL) || r;
+  r = ((glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetShaderInfoLog")) == NULL) || r;
+  r = ((glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSource")) == NULL) || r;
+  r = ((glGetShaderiv = (PFNGLGETSHADERIVPROC)glewGetProcAddress((const GLubyte*)"glGetShaderiv")) == NULL) || r;
+  r = ((glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocation")) == NULL) || r;
+  r = ((glGetUniformfv = (PFNGLGETUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfv")) == NULL) || r;
+  r = ((glGetUniformiv = (PFNGLGETUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformiv")) == NULL) || r;
+  r = ((glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointerv")) == NULL) || r;
+  r = ((glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdv")) == NULL) || r;
+  r = ((glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfv")) == NULL) || r;
+  r = ((glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribiv")) == NULL) || r;
+  r = ((glIsProgram = (PFNGLISPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glIsProgram")) == NULL) || r;
+  r = ((glIsShader = (PFNGLISSHADERPROC)glewGetProcAddress((const GLubyte*)"glIsShader")) == NULL) || r;
+  r = ((glLinkProgram = (PFNGLLINKPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glLinkProgram")) == NULL) || r;
+  r = ((glShaderSource = (PFNGLSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glShaderSource")) == NULL) || r;
+  r = ((glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparate")) == NULL) || r;
+  r = ((glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilMaskSeparate")) == NULL) || r;
+  r = ((glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparate")) == NULL) || r;
+  r = ((glUniform1f = (PFNGLUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glUniform1f")) == NULL) || r;
+  r = ((glUniform1fv = (PFNGLUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glUniform1fv")) == NULL) || r;
+  r = ((glUniform1i = (PFNGLUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glUniform1i")) == NULL) || r;
+  r = ((glUniform1iv = (PFNGLUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glUniform1iv")) == NULL) || r;
+  r = ((glUniform2f = (PFNGLUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glUniform2f")) == NULL) || r;
+  r = ((glUniform2fv = (PFNGLUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glUniform2fv")) == NULL) || r;
+  r = ((glUniform2i = (PFNGLUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glUniform2i")) == NULL) || r;
+  r = ((glUniform2iv = (PFNGLUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glUniform2iv")) == NULL) || r;
+  r = ((glUniform3f = (PFNGLUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glUniform3f")) == NULL) || r;
+  r = ((glUniform3fv = (PFNGLUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glUniform3fv")) == NULL) || r;
+  r = ((glUniform3i = (PFNGLUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glUniform3i")) == NULL) || r;
+  r = ((glUniform3iv = (PFNGLUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glUniform3iv")) == NULL) || r;
+  r = ((glUniform4f = (PFNGLUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glUniform4f")) == NULL) || r;
+  r = ((glUniform4fv = (PFNGLUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glUniform4fv")) == NULL) || r;
+  r = ((glUniform4i = (PFNGLUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glUniform4i")) == NULL) || r;
+  r = ((glUniform4iv = (PFNGLUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glUniform4iv")) == NULL) || r;
+  r = ((glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fv")) == NULL) || r;
+  r = ((glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fv")) == NULL) || r;
+  r = ((glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fv")) == NULL) || r;
+  r = ((glUseProgram = (PFNGLUSEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glUseProgram")) == NULL) || r;
+  r = ((glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glValidateProgram")) == NULL) || r;
+  r = ((glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1d")) == NULL) || r;
+  r = ((glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dv")) == NULL) || r;
+  r = ((glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1f")) == NULL) || r;
+  r = ((glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fv")) == NULL) || r;
+  r = ((glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1s")) == NULL) || r;
+  r = ((glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sv")) == NULL) || r;
+  r = ((glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2d")) == NULL) || r;
+  r = ((glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dv")) == NULL) || r;
+  r = ((glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2f")) == NULL) || r;
+  r = ((glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fv")) == NULL) || r;
+  r = ((glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2s")) == NULL) || r;
+  r = ((glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sv")) == NULL) || r;
+  r = ((glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3d")) == NULL) || r;
+  r = ((glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dv")) == NULL) || r;
+  r = ((glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3f")) == NULL) || r;
+  r = ((glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fv")) == NULL) || r;
+  r = ((glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3s")) == NULL) || r;
+  r = ((glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sv")) == NULL) || r;
+  r = ((glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nbv")) == NULL) || r;
+  r = ((glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Niv")) == NULL) || r;
+  r = ((glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nsv")) == NULL) || r;
+  r = ((glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nub")) == NULL) || r;
+  r = ((glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nubv")) == NULL) || r;
+  r = ((glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nuiv")) == NULL) || r;
+  r = ((glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nusv")) == NULL) || r;
+  r = ((glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bv")) == NULL) || r;
+  r = ((glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4d")) == NULL) || r;
+  r = ((glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dv")) == NULL) || r;
+  r = ((glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4f")) == NULL) || r;
+  r = ((glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fv")) == NULL) || r;
+  r = ((glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4iv")) == NULL) || r;
+  r = ((glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4s")) == NULL) || r;
+  r = ((glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sv")) == NULL) || r;
+  r = ((glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubv")) == NULL) || r;
+  r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r;
+  r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r;
+  r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_2_0 */
+
+#ifdef GL_VERSION_2_1
+
+static GLboolean _glewInit_GL_VERSION_2_1 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3fv")) == NULL) || r;
+  r = ((glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4fv")) == NULL) || r;
+  r = ((glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2fv")) == NULL) || r;
+  r = ((glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4fv")) == NULL) || r;
+  r = ((glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2fv")) == NULL) || r;
+  r = ((glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3fv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_2_1 */
+
+#ifdef GL_VERSION_3_0
+
+static GLboolean _glewInit_GL_VERSION_3_0 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = _glewInit_GL_ARB_framebuffer_object() || r;
+  r = _glewInit_GL_ARB_map_buffer_range() || r;
+  r = _glewInit_GL_ARB_uniform_buffer_object() || r;
+  r = _glewInit_GL_ARB_vertex_array_object() || r;
+
+  r = ((glBeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRender")) == NULL) || r;
+  r = ((glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedback")) == NULL) || r;
+  r = ((glBindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocation")) == NULL) || r;
+  r = ((glClampColor = (PFNGLCLAMPCOLORPROC)glewGetProcAddress((const GLubyte*)"glClampColor")) == NULL) || r;
+  r = ((glClearBufferfi = (PFNGLCLEARBUFFERFIPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfi")) == NULL) || r;
+  r = ((glClearBufferfv = (PFNGLCLEARBUFFERFVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfv")) == NULL) || r;
+  r = ((glClearBufferiv = (PFNGLCLEARBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferiv")) == NULL) || r;
+  r = ((glClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferuiv")) == NULL) || r;
+  r = ((glColorMaski = (PFNGLCOLORMASKIPROC)glewGetProcAddress((const GLubyte*)"glColorMaski")) == NULL) || r;
+  r = ((glDisablei = (PFNGLDISABLEIPROC)glewGetProcAddress((const GLubyte*)"glDisablei")) == NULL) || r;
+  r = ((glEnablei = (PFNGLENABLEIPROC)glewGetProcAddress((const GLubyte*)"glEnablei")) == NULL) || r;
+  r = ((glEndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRender")) == NULL) || r;
+  r = ((glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedback")) == NULL) || r;
+  r = ((glGetBooleani_v = (PFNGLGETBOOLEANI_VPROC)glewGetProcAddress((const GLubyte*)"glGetBooleani_v")) == NULL) || r;
+  r = ((glGetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocation")) == NULL) || r;
+  r = ((glGetStringi = (PFNGLGETSTRINGIPROC)glewGetProcAddress((const GLubyte*)"glGetStringi")) == NULL) || r;
+  r = ((glGetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIiv")) == NULL) || r;
+  r = ((glGetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuiv")) == NULL) || r;
+  r = ((glGetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVarying")) == NULL) || r;
+  r = ((glGetUniformuiv = (PFNGLGETUNIFORMUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuiv")) == NULL) || r;
+  r = ((glGetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIiv")) == NULL) || r;
+  r = ((glGetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuiv")) == NULL) || r;
+  r = ((glIsEnabledi = (PFNGLISENABLEDIPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledi")) == NULL) || r;
+  r = ((glTexParameterIiv = (PFNGLTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIiv")) == NULL) || r;
+  r = ((glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuiv")) == NULL) || r;
+  r = ((glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryings")) == NULL) || r;
+  r = ((glUniform1ui = (PFNGLUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui")) == NULL) || r;
+  r = ((glUniform1uiv = (PFNGLUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiv")) == NULL) || r;
+  r = ((glUniform2ui = (PFNGLUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui")) == NULL) || r;
+  r = ((glUniform2uiv = (PFNGLUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiv")) == NULL) || r;
+  r = ((glUniform3ui = (PFNGLUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui")) == NULL) || r;
+  r = ((glUniform3uiv = (PFNGLUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiv")) == NULL) || r;
+  r = ((glUniform4ui = (PFNGLUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui")) == NULL) || r;
+  r = ((glUniform4uiv = (PFNGLUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiv")) == NULL) || r;
+  r = ((glVertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1i")) == NULL) || r;
+  r = ((glVertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iv")) == NULL) || r;
+  r = ((glVertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ui")) == NULL) || r;
+  r = ((glVertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiv")) == NULL) || r;
+  r = ((glVertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2i")) == NULL) || r;
+  r = ((glVertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iv")) == NULL) || r;
+  r = ((glVertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ui")) == NULL) || r;
+  r = ((glVertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiv")) == NULL) || r;
+  r = ((glVertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3i")) == NULL) || r;
+  r = ((glVertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iv")) == NULL) || r;
+  r = ((glVertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ui")) == NULL) || r;
+  r = ((glVertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiv")) == NULL) || r;
+  r = ((glVertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bv")) == NULL) || r;
+  r = ((glVertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4i")) == NULL) || r;
+  r = ((glVertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iv")) == NULL) || r;
+  r = ((glVertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4sv")) == NULL) || r;
+  r = ((glVertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubv")) == NULL) || r;
+  r = ((glVertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ui")) == NULL) || r;
+  r = ((glVertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiv")) == NULL) || r;
+  r = ((glVertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usv")) == NULL) || r;
+  r = ((glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_3_0 */
+
+#ifdef GL_VERSION_3_1
+
+static GLboolean _glewInit_GL_VERSION_3_1 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = _glewInit_GL_ARB_copy_buffer() || r;
+
+  r = ((glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstanced")) == NULL) || r;
+  r = ((glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstanced")) == NULL) || r;
+  r = ((glPrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndex")) == NULL) || r;
+  r = ((glTexBuffer = (PFNGLTEXBUFFERPROC)glewGetProcAddress((const GLubyte*)"glTexBuffer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_3_1 */
+
+#ifdef GL_VERSION_3_2
+
+static GLboolean _glewInit_GL_VERSION_3_2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = _glewInit_GL_ARB_draw_elements_base_vertex() || r;
+  r = _glewInit_GL_ARB_provoking_vertex() || r;
+  r = _glewInit_GL_ARB_sync() || r;
+  r = _glewInit_GL_ARB_texture_multisample() || r;
+
+  r = ((glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture")) == NULL) || r;
+  r = ((glGetBufferParameteri64v = (PFNGLGETBUFFERPARAMETERI64VPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteri64v")) == NULL) || r;
+  r = ((glGetInteger64i_v = (PFNGLGETINTEGER64I_VPROC)glewGetProcAddress((const GLubyte*)"glGetInteger64i_v")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_3_2 */
+
+#ifdef GL_VERSION_3_3
+
+static GLboolean _glewInit_GL_VERSION_3_3 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisor")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_3_3 */
+
+#ifdef GL_VERSION_4_0
+
+static GLboolean _glewInit_GL_VERSION_4_0 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationSeparatei = (PFNGLBLENDEQUATIONSEPARATEIPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparatei")) == NULL) || r;
+  r = ((glBlendEquationi = (PFNGLBLENDEQUATIONIPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationi")) == NULL) || r;
+  r = ((glBlendFuncSeparatei = (PFNGLBLENDFUNCSEPARATEIPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparatei")) == NULL) || r;
+  r = ((glBlendFunci = (PFNGLBLENDFUNCIPROC)glewGetProcAddress((const GLubyte*)"glBlendFunci")) == NULL) || r;
+  r = ((glMinSampleShading = (PFNGLMINSAMPLESHADINGPROC)glewGetProcAddress((const GLubyte*)"glMinSampleShading")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_4_0 */
+
+#ifdef GL_VERSION_4_5
+
+static GLboolean _glewInit_GL_VERSION_4_5 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetGraphicsResetStatus = (PFNGLGETGRAPHICSRESETSTATUSPROC)glewGetProcAddress((const GLubyte*)"glGetGraphicsResetStatus")) == NULL) || r;
+  r = ((glGetnCompressedTexImage = (PFNGLGETNCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetnCompressedTexImage")) == NULL) || r;
+  r = ((glGetnTexImage = (PFNGLGETNTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetnTexImage")) == NULL) || r;
+  r = ((glGetnUniformdv = (PFNGLGETNUNIFORMDVPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformdv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_4_5 */
+
+#ifdef GL_VERSION_4_6
+
+static GLboolean _glewInit_GL_VERSION_4_6 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectCount = (PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectCount")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectCount = (PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectCount")) == NULL) || r;
+  r = ((glSpecializeShader = (PFNGLSPECIALIZESHADERPROC)glewGetProcAddress((const GLubyte*)"glSpecializeShader")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_4_6 */
+
+#ifdef GL_3DFX_tbuffer
+
+static GLboolean _glewInit_GL_3DFX_tbuffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTbufferMask3DFX = (PFNGLTBUFFERMASK3DFXPROC)glewGetProcAddress((const GLubyte*)"glTbufferMask3DFX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_3DFX_tbuffer */
+
+#ifdef GL_AMD_debug_output
+
+static GLboolean _glewInit_GL_AMD_debug_output ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDebugMessageCallbackAMD = (PFNGLDEBUGMESSAGECALLBACKAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallbackAMD")) == NULL) || r;
+  r = ((glDebugMessageEnableAMD = (PFNGLDEBUGMESSAGEENABLEAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageEnableAMD")) == NULL) || r;
+  r = ((glDebugMessageInsertAMD = (PFNGLDEBUGMESSAGEINSERTAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsertAMD")) == NULL) || r;
+  r = ((glGetDebugMessageLogAMD = (PFNGLGETDEBUGMESSAGELOGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLogAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_debug_output */
+
+#ifdef GL_AMD_draw_buffers_blend
+
+static GLboolean _glewInit_GL_AMD_draw_buffers_blend ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationIndexedAMD = (PFNGLBLENDEQUATIONINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationIndexedAMD")) == NULL) || r;
+  r = ((glBlendEquationSeparateIndexedAMD = (PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateIndexedAMD")) == NULL) || r;
+  r = ((glBlendFuncIndexedAMD = (PFNGLBLENDFUNCINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncIndexedAMD")) == NULL) || r;
+  r = ((glBlendFuncSeparateIndexedAMD = (PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateIndexedAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_draw_buffers_blend */
+
+#ifdef GL_AMD_framebuffer_sample_positions
+
+static GLboolean _glewInit_GL_AMD_framebuffer_sample_positions ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferSamplePositionsfvAMD = (PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC)glewGetProcAddress((const GLubyte*)"glFramebufferSamplePositionsfvAMD")) == NULL) || r;
+  r = ((glGetFramebufferParameterfvAMD = (PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameterfvAMD")) == NULL) || r;
+  r = ((glGetNamedFramebufferParameterfvAMD = (PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferParameterfvAMD")) == NULL) || r;
+  r = ((glNamedFramebufferSamplePositionsfvAMD = (PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferSamplePositionsfvAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_framebuffer_sample_positions */
+
+#ifdef GL_AMD_interleaved_elements
+
+static GLboolean _glewInit_GL_AMD_interleaved_elements ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexAttribParameteriAMD = (PFNGLVERTEXATTRIBPARAMETERIAMDPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribParameteriAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_interleaved_elements */
+
+#ifdef GL_AMD_multi_draw_indirect
+
+static GLboolean _glewInit_GL_AMD_multi_draw_indirect ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectAMD = (PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectAMD")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectAMD = (PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_multi_draw_indirect */
+
+#ifdef GL_AMD_name_gen_delete
+
+static GLboolean _glewInit_GL_AMD_name_gen_delete ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteNamesAMD = (PFNGLDELETENAMESAMDPROC)glewGetProcAddress((const GLubyte*)"glDeleteNamesAMD")) == NULL) || r;
+  r = ((glGenNamesAMD = (PFNGLGENNAMESAMDPROC)glewGetProcAddress((const GLubyte*)"glGenNamesAMD")) == NULL) || r;
+  r = ((glIsNameAMD = (PFNGLISNAMEAMDPROC)glewGetProcAddress((const GLubyte*)"glIsNameAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_name_gen_delete */
+
+#ifdef GL_AMD_occlusion_query_event
+
+static GLboolean _glewInit_GL_AMD_occlusion_query_event ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glQueryObjectParameteruiAMD = (PFNGLQUERYOBJECTPARAMETERUIAMDPROC)glewGetProcAddress((const GLubyte*)"glQueryObjectParameteruiAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_occlusion_query_event */
+
+#ifdef GL_AMD_performance_monitor
+
+static GLboolean _glewInit_GL_AMD_performance_monitor ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginPerfMonitorAMD = (PFNGLBEGINPERFMONITORAMDPROC)glewGetProcAddress((const GLubyte*)"glBeginPerfMonitorAMD")) == NULL) || r;
+  r = ((glDeletePerfMonitorsAMD = (PFNGLDELETEPERFMONITORSAMDPROC)glewGetProcAddress((const GLubyte*)"glDeletePerfMonitorsAMD")) == NULL) || r;
+  r = ((glEndPerfMonitorAMD = (PFNGLENDPERFMONITORAMDPROC)glewGetProcAddress((const GLubyte*)"glEndPerfMonitorAMD")) == NULL) || r;
+  r = ((glGenPerfMonitorsAMD = (PFNGLGENPERFMONITORSAMDPROC)glewGetProcAddress((const GLubyte*)"glGenPerfMonitorsAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorCounterDataAMD = (PFNGLGETPERFMONITORCOUNTERDATAAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterDataAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorCounterInfoAMD = (PFNGLGETPERFMONITORCOUNTERINFOAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterInfoAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorCounterStringAMD = (PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterStringAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorCountersAMD = (PFNGLGETPERFMONITORCOUNTERSAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCountersAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorGroupStringAMD = (PFNGLGETPERFMONITORGROUPSTRINGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorGroupStringAMD")) == NULL) || r;
+  r = ((glGetPerfMonitorGroupsAMD = (PFNGLGETPERFMONITORGROUPSAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorGroupsAMD")) == NULL) || r;
+  r = ((glSelectPerfMonitorCountersAMD = (PFNGLSELECTPERFMONITORCOUNTERSAMDPROC)glewGetProcAddress((const GLubyte*)"glSelectPerfMonitorCountersAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_performance_monitor */
+
+#ifdef GL_AMD_sample_positions
+
+static GLboolean _glewInit_GL_AMD_sample_positions ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSetMultisamplefvAMD = (PFNGLSETMULTISAMPLEFVAMDPROC)glewGetProcAddress((const GLubyte*)"glSetMultisamplefvAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_sample_positions */
+
+#ifdef GL_AMD_sparse_texture
+
+static GLboolean _glewInit_GL_AMD_sparse_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexStorageSparseAMD = (PFNGLTEXSTORAGESPARSEAMDPROC)glewGetProcAddress((const GLubyte*)"glTexStorageSparseAMD")) == NULL) || r;
+  r = ((glTextureStorageSparseAMD = (PFNGLTEXTURESTORAGESPARSEAMDPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageSparseAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_sparse_texture */
+
+#ifdef GL_AMD_stencil_operation_extended
+
+static GLboolean _glewInit_GL_AMD_stencil_operation_extended ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStencilOpValueAMD = (PFNGLSTENCILOPVALUEAMDPROC)glewGetProcAddress((const GLubyte*)"glStencilOpValueAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_stencil_operation_extended */
+
+#ifdef GL_AMD_vertex_shader_tessellator
+
+static GLboolean _glewInit_GL_AMD_vertex_shader_tessellator ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTessellationFactorAMD = (PFNGLTESSELLATIONFACTORAMDPROC)glewGetProcAddress((const GLubyte*)"glTessellationFactorAMD")) == NULL) || r;
+  r = ((glTessellationModeAMD = (PFNGLTESSELLATIONMODEAMDPROC)glewGetProcAddress((const GLubyte*)"glTessellationModeAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+#ifdef GL_ANGLE_framebuffer_blit
+
+static GLboolean _glewInit_GL_ANGLE_framebuffer_blit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlitFramebufferANGLE = (PFNGLBLITFRAMEBUFFERANGLEPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ANGLE_framebuffer_blit */
+
+#ifdef GL_ANGLE_framebuffer_multisample
+
+static GLboolean _glewInit_GL_ANGLE_framebuffer_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleANGLE = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ANGLE_framebuffer_multisample */
+
+#ifdef GL_ANGLE_instanced_arrays
+
+static GLboolean _glewInit_GL_ANGLE_instanced_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedANGLE = (PFNGLDRAWARRAYSINSTANCEDANGLEPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedANGLE")) == NULL) || r;
+  r = ((glDrawElementsInstancedANGLE = (PFNGLDRAWELEMENTSINSTANCEDANGLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedANGLE")) == NULL) || r;
+  r = ((glVertexAttribDivisorANGLE = (PFNGLVERTEXATTRIBDIVISORANGLEPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ANGLE_instanced_arrays */
+
+#ifdef GL_ANGLE_timer_query
+
+static GLboolean _glewInit_GL_ANGLE_timer_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQueryANGLE = (PFNGLBEGINQUERYANGLEPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryANGLE")) == NULL) || r;
+  r = ((glDeleteQueriesANGLE = (PFNGLDELETEQUERIESANGLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesANGLE")) == NULL) || r;
+  r = ((glEndQueryANGLE = (PFNGLENDQUERYANGLEPROC)glewGetProcAddress((const GLubyte*)"glEndQueryANGLE")) == NULL) || r;
+  r = ((glGenQueriesANGLE = (PFNGLGENQUERIESANGLEPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesANGLE")) == NULL) || r;
+  r = ((glGetQueryObjecti64vANGLE = (PFNGLGETQUERYOBJECTI64VANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64vANGLE")) == NULL) || r;
+  r = ((glGetQueryObjectivANGLE = (PFNGLGETQUERYOBJECTIVANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivANGLE")) == NULL) || r;
+  r = ((glGetQueryObjectui64vANGLE = (PFNGLGETQUERYOBJECTUI64VANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64vANGLE")) == NULL) || r;
+  r = ((glGetQueryObjectuivANGLE = (PFNGLGETQUERYOBJECTUIVANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivANGLE")) == NULL) || r;
+  r = ((glGetQueryivANGLE = (PFNGLGETQUERYIVANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivANGLE")) == NULL) || r;
+  r = ((glIsQueryANGLE = (PFNGLISQUERYANGLEPROC)glewGetProcAddress((const GLubyte*)"glIsQueryANGLE")) == NULL) || r;
+  r = ((glQueryCounterANGLE = (PFNGLQUERYCOUNTERANGLEPROC)glewGetProcAddress((const GLubyte*)"glQueryCounterANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ANGLE_timer_query */
+
+#ifdef GL_ANGLE_translated_shader_source
+
+static GLboolean _glewInit_GL_ANGLE_translated_shader_source ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTranslatedShaderSourceANGLE = (PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC)glewGetProcAddress((const GLubyte*)"glGetTranslatedShaderSourceANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ANGLE_translated_shader_source */
+
+#ifdef GL_APPLE_copy_texture_levels
+
+static GLboolean _glewInit_GL_APPLE_copy_texture_levels ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyTextureLevelsAPPLE = (PFNGLCOPYTEXTURELEVELSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureLevelsAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_copy_texture_levels */
+
+#ifdef GL_APPLE_element_array
+
+static GLboolean _glewInit_GL_APPLE_element_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementArrayAPPLE = (PFNGLDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayAPPLE")) == NULL) || r;
+  r = ((glDrawRangeElementArrayAPPLE = (PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayAPPLE")) == NULL) || r;
+  r = ((glElementPointerAPPLE = (PFNGLELEMENTPOINTERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glElementPointerAPPLE")) == NULL) || r;
+  r = ((glMultiDrawElementArrayAPPLE = (PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementArrayAPPLE")) == NULL) || r;
+  r = ((glMultiDrawRangeElementArrayAPPLE = (PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawRangeElementArrayAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_element_array */
+
+#ifdef GL_APPLE_fence
+
+static GLboolean _glewInit_GL_APPLE_fence ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteFencesAPPLE = (PFNGLDELETEFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesAPPLE")) == NULL) || r;
+  r = ((glFinishFenceAPPLE = (PFNGLFINISHFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceAPPLE")) == NULL) || r;
+  r = ((glFinishObjectAPPLE = (PFNGLFINISHOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishObjectAPPLE")) == NULL) || r;
+  r = ((glGenFencesAPPLE = (PFNGLGENFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenFencesAPPLE")) == NULL) || r;
+  r = ((glIsFenceAPPLE = (PFNGLISFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsFenceAPPLE")) == NULL) || r;
+  r = ((glSetFenceAPPLE = (PFNGLSETFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glSetFenceAPPLE")) == NULL) || r;
+  r = ((glTestFenceAPPLE = (PFNGLTESTFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestFenceAPPLE")) == NULL) || r;
+  r = ((glTestObjectAPPLE = (PFNGLTESTOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestObjectAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_fence */
+
+#ifdef GL_APPLE_flush_buffer_range
+
+static GLboolean _glewInit_GL_APPLE_flush_buffer_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferParameteriAPPLE = (PFNGLBUFFERPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBufferParameteriAPPLE")) == NULL) || r;
+  r = ((glFlushMappedBufferRangeAPPLE = (PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRangeAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_flush_buffer_range */
+
+#ifdef GL_APPLE_framebuffer_multisample
+
+static GLboolean _glewInit_GL_APPLE_framebuffer_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleAPPLE = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleAPPLE")) == NULL) || r;
+  r = ((glResolveMultisampleFramebufferAPPLE = (PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glResolveMultisampleFramebufferAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_framebuffer_multisample */
+
+#ifdef GL_APPLE_object_purgeable
+
+static GLboolean _glewInit_GL_APPLE_object_purgeable ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetObjectParameterivAPPLE = (PFNGLGETOBJECTPARAMETERIVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivAPPLE")) == NULL) || r;
+  r = ((glObjectPurgeableAPPLE = (PFNGLOBJECTPURGEABLEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glObjectPurgeableAPPLE")) == NULL) || r;
+  r = ((glObjectUnpurgeableAPPLE = (PFNGLOBJECTUNPURGEABLEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glObjectUnpurgeableAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_object_purgeable */
+
+#ifdef GL_APPLE_sync
+
+static GLboolean _glewInit_GL_APPLE_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClientWaitSyncAPPLE = (PFNGLCLIENTWAITSYNCAPPLEPROC)glewGetProcAddress((const GLubyte*)"glClientWaitSyncAPPLE")) == NULL) || r;
+  r = ((glDeleteSyncAPPLE = (PFNGLDELETESYNCAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteSyncAPPLE")) == NULL) || r;
+  r = ((glFenceSyncAPPLE = (PFNGLFENCESYNCAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFenceSyncAPPLE")) == NULL) || r;
+  r = ((glGetInteger64vAPPLE = (PFNGLGETINTEGER64VAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetInteger64vAPPLE")) == NULL) || r;
+  r = ((glGetSyncivAPPLE = (PFNGLGETSYNCIVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetSyncivAPPLE")) == NULL) || r;
+  r = ((glIsSyncAPPLE = (PFNGLISSYNCAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsSyncAPPLE")) == NULL) || r;
+  r = ((glWaitSyncAPPLE = (PFNGLWAITSYNCAPPLEPROC)glewGetProcAddress((const GLubyte*)"glWaitSyncAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_sync */
+
+#ifdef GL_APPLE_texture_range
+
+static GLboolean _glewInit_GL_APPLE_texture_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexParameterPointervAPPLE = (PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterPointervAPPLE")) == NULL) || r;
+  r = ((glTextureRangeAPPLE = (PFNGLTEXTURERANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureRangeAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_texture_range */
+
+#ifdef GL_APPLE_vertex_array_object
+
+static GLboolean _glewInit_GL_APPLE_vertex_array_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindVertexArrayAPPLE = (PFNGLBINDVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArrayAPPLE")) == NULL) || r;
+  r = ((glDeleteVertexArraysAPPLE = (PFNGLDELETEVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysAPPLE")) == NULL) || r;
+  r = ((glGenVertexArraysAPPLE = (PFNGLGENVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysAPPLE")) == NULL) || r;
+  r = ((glIsVertexArrayAPPLE = (PFNGLISVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArrayAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifdef GL_APPLE_vertex_array_range
+
+static GLboolean _glewInit_GL_APPLE_vertex_array_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushVertexArrayRangeAPPLE = (PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeAPPLE")) == NULL) || r;
+  r = ((glVertexArrayParameteriAPPLE = (PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayParameteriAPPLE")) == NULL) || r;
+  r = ((glVertexArrayRangeAPPLE = (PFNGLVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifdef GL_APPLE_vertex_program_evaluators
+
+static GLboolean _glewInit_GL_APPLE_vertex_program_evaluators ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDisableVertexAttribAPPLE = (PFNGLDISABLEVERTEXATTRIBAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribAPPLE")) == NULL) || r;
+  r = ((glEnableVertexAttribAPPLE = (PFNGLENABLEVERTEXATTRIBAPPLEPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribAPPLE")) == NULL) || r;
+  r = ((glIsVertexAttribEnabledAPPLE = (PFNGLISVERTEXATTRIBENABLEDAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexAttribEnabledAPPLE")) == NULL) || r;
+  r = ((glMapVertexAttrib1dAPPLE = (PFNGLMAPVERTEXATTRIB1DAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib1dAPPLE")) == NULL) || r;
+  r = ((glMapVertexAttrib1fAPPLE = (PFNGLMAPVERTEXATTRIB1FAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib1fAPPLE")) == NULL) || r;
+  r = ((glMapVertexAttrib2dAPPLE = (PFNGLMAPVERTEXATTRIB2DAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib2dAPPLE")) == NULL) || r;
+  r = ((glMapVertexAttrib2fAPPLE = (PFNGLMAPVERTEXATTRIB2FAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib2fAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+#ifdef GL_ARB_ES2_compatibility
+
+static GLboolean _glewInit_GL_ARB_ES2_compatibility ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearDepthf = (PFNGLCLEARDEPTHFPROC)glewGetProcAddress((const GLubyte*)"glClearDepthf")) == NULL) || r;
+  r = ((glDepthRangef = (PFNGLDEPTHRANGEFPROC)glewGetProcAddress((const GLubyte*)"glDepthRangef")) == NULL) || r;
+  r = ((glGetShaderPrecisionFormat = (PFNGLGETSHADERPRECISIONFORMATPROC)glewGetProcAddress((const GLubyte*)"glGetShaderPrecisionFormat")) == NULL) || r;
+  r = ((glReleaseShaderCompiler = (PFNGLRELEASESHADERCOMPILERPROC)glewGetProcAddress((const GLubyte*)"glReleaseShaderCompiler")) == NULL) || r;
+  r = ((glShaderBinary = (PFNGLSHADERBINARYPROC)glewGetProcAddress((const GLubyte*)"glShaderBinary")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_ES2_compatibility */
+
+#ifdef GL_ARB_ES3_1_compatibility
+
+static GLboolean _glewInit_GL_ARB_ES3_1_compatibility ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMemoryBarrierByRegion = (PFNGLMEMORYBARRIERBYREGIONPROC)glewGetProcAddress((const GLubyte*)"glMemoryBarrierByRegion")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_ES3_1_compatibility */
+
+#ifdef GL_ARB_ES3_2_compatibility
+
+static GLboolean _glewInit_GL_ARB_ES3_2_compatibility ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPrimitiveBoundingBoxARB = (PFNGLPRIMITIVEBOUNDINGBOXARBPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveBoundingBoxARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_ES3_2_compatibility */
+
+#ifdef GL_ARB_base_instance
+
+static GLboolean _glewInit_GL_ARB_base_instance ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedBaseInstance = (PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedBaseInstance")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseInstance")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertexBaseInstance")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_base_instance */
+
+#ifdef GL_ARB_bindless_texture
+
+static GLboolean _glewInit_GL_ARB_bindless_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetImageHandleARB = (PFNGLGETIMAGEHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetImageHandleARB")) == NULL) || r;
+  r = ((glGetTextureHandleARB = (PFNGLGETTEXTUREHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetTextureHandleARB")) == NULL) || r;
+  r = ((glGetTextureSamplerHandleARB = (PFNGLGETTEXTURESAMPLERHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetTextureSamplerHandleARB")) == NULL) || r;
+  r = ((glGetVertexAttribLui64vARB = (PFNGLGETVERTEXATTRIBLUI64VARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLui64vARB")) == NULL) || r;
+  r = ((glIsImageHandleResidentARB = (PFNGLISIMAGEHANDLERESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glIsImageHandleResidentARB")) == NULL) || r;
+  r = ((glIsTextureHandleResidentARB = (PFNGLISTEXTUREHANDLERESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glIsTextureHandleResidentARB")) == NULL) || r;
+  r = ((glMakeImageHandleNonResidentARB = (PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleNonResidentARB")) == NULL) || r;
+  r = ((glMakeImageHandleResidentARB = (PFNGLMAKEIMAGEHANDLERESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleResidentARB")) == NULL) || r;
+  r = ((glMakeTextureHandleNonResidentARB = (PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleNonResidentARB")) == NULL) || r;
+  r = ((glMakeTextureHandleResidentARB = (PFNGLMAKETEXTUREHANDLERESIDENTARBPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleResidentARB")) == NULL) || r;
+  r = ((glProgramUniformHandleui64ARB = (PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64ARB")) == NULL) || r;
+  r = ((glProgramUniformHandleui64vARB = (PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64vARB")) == NULL) || r;
+  r = ((glUniformHandleui64ARB = (PFNGLUNIFORMHANDLEUI64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64ARB")) == NULL) || r;
+  r = ((glUniformHandleui64vARB = (PFNGLUNIFORMHANDLEUI64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64vARB")) == NULL) || r;
+  r = ((glVertexAttribL1ui64ARB = (PFNGLVERTEXATTRIBL1UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64ARB")) == NULL) || r;
+  r = ((glVertexAttribL1ui64vARB = (PFNGLVERTEXATTRIBL1UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64vARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_bindless_texture */
+
+#ifdef GL_ARB_blend_func_extended
+
+static GLboolean _glewInit_GL_ARB_blend_func_extended ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFragDataLocationIndexed = (PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationIndexed")) == NULL) || r;
+  r = ((glGetFragDataIndex = (PFNGLGETFRAGDATAINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataIndex")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_blend_func_extended */
+
+#ifdef GL_ARB_buffer_storage
+
+static GLboolean _glewInit_GL_ARB_buffer_storage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferStorage = (PFNGLBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glBufferStorage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_buffer_storage */
+
+#ifdef GL_ARB_cl_event
+
+static GLboolean _glewInit_GL_ARB_cl_event ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCreateSyncFromCLeventARB = (PFNGLCREATESYNCFROMCLEVENTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateSyncFromCLeventARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_cl_event */
+
+#ifdef GL_ARB_clear_buffer_object
+
+static GLboolean _glewInit_GL_ARB_clear_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearBufferData = (PFNGLCLEARBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glClearBufferData")) == NULL) || r;
+  r = ((glClearBufferSubData = (PFNGLCLEARBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glClearBufferSubData")) == NULL) || r;
+  r = ((glClearNamedBufferDataEXT = (PFNGLCLEARNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferDataEXT")) == NULL) || r;
+  r = ((glClearNamedBufferSubDataEXT = (PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferSubDataEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_clear_buffer_object */
+
+#ifdef GL_ARB_clear_texture
+
+static GLboolean _glewInit_GL_ARB_clear_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearTexImage = (PFNGLCLEARTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glClearTexImage")) == NULL) || r;
+  r = ((glClearTexSubImage = (PFNGLCLEARTEXSUBIMAGEPROC)glewGetProcAddress((const GLubyte*)"glClearTexSubImage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_clear_texture */
+
+#ifdef GL_ARB_clip_control
+
+static GLboolean _glewInit_GL_ARB_clip_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClipControl = (PFNGLCLIPCONTROLPROC)glewGetProcAddress((const GLubyte*)"glClipControl")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_clip_control */
+
+#ifdef GL_ARB_color_buffer_float
+
+static GLboolean _glewInit_GL_ARB_color_buffer_float ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClampColorARB = (PFNGLCLAMPCOLORARBPROC)glewGetProcAddress((const GLubyte*)"glClampColorARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_color_buffer_float */
+
+#ifdef GL_ARB_compute_shader
+
+static GLboolean _glewInit_GL_ARB_compute_shader ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)glewGetProcAddress((const GLubyte*)"glDispatchCompute")) == NULL) || r;
+  r = ((glDispatchComputeIndirect = (PFNGLDISPATCHCOMPUTEINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDispatchComputeIndirect")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_compute_shader */
+
+#ifdef GL_ARB_compute_variable_group_size
+
+static GLboolean _glewInit_GL_ARB_compute_variable_group_size ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDispatchComputeGroupSizeARB = (PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC)glewGetProcAddress((const GLubyte*)"glDispatchComputeGroupSizeARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_compute_variable_group_size */
+
+#ifdef GL_ARB_copy_buffer
+
+static GLboolean _glewInit_GL_ARB_copy_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyBufferSubData = (PFNGLCOPYBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glCopyBufferSubData")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_copy_buffer */
+
+#ifdef GL_ARB_copy_image
+
+static GLboolean _glewInit_GL_ARB_copy_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyImageSubData = (PFNGLCOPYIMAGESUBDATAPROC)glewGetProcAddress((const GLubyte*)"glCopyImageSubData")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_copy_image */
+
+#ifdef GL_ARB_debug_output
+
+static GLboolean _glewInit_GL_ARB_debug_output ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallbackARB")) == NULL) || r;
+  r = ((glDebugMessageControlARB = (PFNGLDEBUGMESSAGECONTROLARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageControlARB")) == NULL) || r;
+  r = ((glDebugMessageInsertARB = (PFNGLDEBUGMESSAGEINSERTARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsertARB")) == NULL) || r;
+  r = ((glGetDebugMessageLogARB = (PFNGLGETDEBUGMESSAGELOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLogARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_debug_output */
+
+#ifdef GL_ARB_direct_state_access
+
+static GLboolean _glewInit_GL_ARB_direct_state_access ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindTextureUnit = (PFNGLBINDTEXTUREUNITPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnit")) == NULL) || r;
+  r = ((glBlitNamedFramebuffer = (PFNGLBLITNAMEDFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBlitNamedFramebuffer")) == NULL) || r;
+  r = ((glCheckNamedFramebufferStatus = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC)glewGetProcAddress((const GLubyte*)"glCheckNamedFramebufferStatus")) == NULL) || r;
+  r = ((glClearNamedBufferData = (PFNGLCLEARNAMEDBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferData")) == NULL) || r;
+  r = ((glClearNamedBufferSubData = (PFNGLCLEARNAMEDBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferSubData")) == NULL) || r;
+  r = ((glClearNamedFramebufferfi = (PFNGLCLEARNAMEDFRAMEBUFFERFIPROC)glewGetProcAddress((const GLubyte*)"glClearNamedFramebufferfi")) == NULL) || r;
+  r = ((glClearNamedFramebufferfv = (PFNGLCLEARNAMEDFRAMEBUFFERFVPROC)glewGetProcAddress((const GLubyte*)"glClearNamedFramebufferfv")) == NULL) || r;
+  r = ((glClearNamedFramebufferiv = (PFNGLCLEARNAMEDFRAMEBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glClearNamedFramebufferiv")) == NULL) || r;
+  r = ((glClearNamedFramebufferuiv = (PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC)glewGetProcAddress((const GLubyte*)"glClearNamedFramebufferuiv")) == NULL) || r;
+  r = ((glCompressedTextureSubImage1D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage1D")) == NULL) || r;
+  r = ((glCompressedTextureSubImage2D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage2D")) == NULL) || r;
+  r = ((glCompressedTextureSubImage3D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage3D")) == NULL) || r;
+  r = ((glCopyNamedBufferSubData = (PFNGLCOPYNAMEDBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glCopyNamedBufferSubData")) == NULL) || r;
+  r = ((glCopyTextureSubImage1D = (PFNGLCOPYTEXTURESUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage1D")) == NULL) || r;
+  r = ((glCopyTextureSubImage2D = (PFNGLCOPYTEXTURESUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage2D")) == NULL) || r;
+  r = ((glCopyTextureSubImage3D = (PFNGLCOPYTEXTURESUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage3D")) == NULL) || r;
+  r = ((glCreateBuffers = (PFNGLCREATEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glCreateBuffers")) == NULL) || r;
+  r = ((glCreateFramebuffers = (PFNGLCREATEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glCreateFramebuffers")) == NULL) || r;
+  r = ((glCreateProgramPipelines = (PFNGLCREATEPROGRAMPIPELINESPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramPipelines")) == NULL) || r;
+  r = ((glCreateQueries = (PFNGLCREATEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glCreateQueries")) == NULL) || r;
+  r = ((glCreateRenderbuffers = (PFNGLCREATERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glCreateRenderbuffers")) == NULL) || r;
+  r = ((glCreateSamplers = (PFNGLCREATESAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glCreateSamplers")) == NULL) || r;
+  r = ((glCreateTextures = (PFNGLCREATETEXTURESPROC)glewGetProcAddress((const GLubyte*)"glCreateTextures")) == NULL) || r;
+  r = ((glCreateTransformFeedbacks = (PFNGLCREATETRANSFORMFEEDBACKSPROC)glewGetProcAddress((const GLubyte*)"glCreateTransformFeedbacks")) == NULL) || r;
+  r = ((glCreateVertexArrays = (PFNGLCREATEVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glCreateVertexArrays")) == NULL) || r;
+  r = ((glDisableVertexArrayAttrib = (PFNGLDISABLEVERTEXARRAYATTRIBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexArrayAttrib")) == NULL) || r;
+  r = ((glEnableVertexArrayAttrib = (PFNGLENABLEVERTEXARRAYATTRIBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexArrayAttrib")) == NULL) || r;
+  r = ((glFlushMappedNamedBufferRange = (PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedNamedBufferRange")) == NULL) || r;
+  r = ((glGenerateTextureMipmap = (PFNGLGENERATETEXTUREMIPMAPPROC)glewGetProcAddress((const GLubyte*)"glGenerateTextureMipmap")) == NULL) || r;
+  r = ((glGetCompressedTextureImage = (PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureImage")) == NULL) || r;
+  r = ((glGetNamedBufferParameteri64v = (PFNGLGETNAMEDBUFFERPARAMETERI64VPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameteri64v")) == NULL) || r;
+  r = ((glGetNamedBufferParameteriv = (PFNGLGETNAMEDBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameteriv")) == NULL) || r;
+  r = ((glGetNamedBufferPointerv = (PFNGLGETNAMEDBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferPointerv")) == NULL) || r;
+  r = ((glGetNamedBufferSubData = (PFNGLGETNAMEDBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferSubData")) == NULL) || r;
+  r = ((glGetNamedFramebufferAttachmentParameteriv = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferAttachmentParameteriv")) == NULL) || r;
+  r = ((glGetNamedFramebufferParameteriv = (PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferParameteriv")) == NULL) || r;
+  r = ((glGetNamedRenderbufferParameteriv = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedRenderbufferParameteriv")) == NULL) || r;
+  r = ((glGetQueryBufferObjecti64v = (PFNGLGETQUERYBUFFEROBJECTI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryBufferObjecti64v")) == NULL) || r;
+  r = ((glGetQueryBufferObjectiv = (PFNGLGETQUERYBUFFEROBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryBufferObjectiv")) == NULL) || r;
+  r = ((glGetQueryBufferObjectui64v = (PFNGLGETQUERYBUFFEROBJECTUI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryBufferObjectui64v")) == NULL) || r;
+  r = ((glGetQueryBufferObjectuiv = (PFNGLGETQUERYBUFFEROBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryBufferObjectuiv")) == NULL) || r;
+  r = ((glGetTextureImage = (PFNGLGETTEXTUREIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetTextureImage")) == NULL) || r;
+  r = ((glGetTextureLevelParameterfv = (PFNGLGETTEXTURELEVELPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterfv")) == NULL) || r;
+  r = ((glGetTextureLevelParameteriv = (PFNGLGETTEXTURELEVELPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameteriv")) == NULL) || r;
+  r = ((glGetTextureParameterIiv = (PFNGLGETTEXTUREPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIiv")) == NULL) || r;
+  r = ((glGetTextureParameterIuiv = (PFNGLGETTEXTUREPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIuiv")) == NULL) || r;
+  r = ((glGetTextureParameterfv = (PFNGLGETTEXTUREPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterfv")) == NULL) || r;
+  r = ((glGetTextureParameteriv = (PFNGLGETTEXTUREPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameteriv")) == NULL) || r;
+  r = ((glGetTransformFeedbacki64_v = (PFNGLGETTRANSFORMFEEDBACKI64_VPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbacki64_v")) == NULL) || r;
+  r = ((glGetTransformFeedbacki_v = (PFNGLGETTRANSFORMFEEDBACKI_VPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbacki_v")) == NULL) || r;
+  r = ((glGetTransformFeedbackiv = (PFNGLGETTRANSFORMFEEDBACKIVPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackiv")) == NULL) || r;
+  r = ((glGetVertexArrayIndexed64iv = (PFNGLGETVERTEXARRAYINDEXED64IVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIndexed64iv")) == NULL) || r;
+  r = ((glGetVertexArrayIndexediv = (PFNGLGETVERTEXARRAYINDEXEDIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIndexediv")) == NULL) || r;
+  r = ((glGetVertexArrayiv = (PFNGLGETVERTEXARRAYIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayiv")) == NULL) || r;
+  r = ((glInvalidateNamedFramebufferData = (PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateNamedFramebufferData")) == NULL) || r;
+  r = ((glInvalidateNamedFramebufferSubData = (PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateNamedFramebufferSubData")) == NULL) || r;
+  r = ((glMapNamedBuffer = (PFNGLMAPNAMEDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBuffer")) == NULL) || r;
+  r = ((glMapNamedBufferRange = (PFNGLMAPNAMEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferRange")) == NULL) || r;
+  r = ((glNamedBufferData = (PFNGLNAMEDBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferData")) == NULL) || r;
+  r = ((glNamedBufferStorage = (PFNGLNAMEDBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferStorage")) == NULL) || r;
+  r = ((glNamedBufferSubData = (PFNGLNAMEDBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferSubData")) == NULL) || r;
+  r = ((glNamedFramebufferDrawBuffer = (PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferDrawBuffer")) == NULL) || r;
+  r = ((glNamedFramebufferDrawBuffers = (PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferDrawBuffers")) == NULL) || r;
+  r = ((glNamedFramebufferParameteri = (PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferParameteri")) == NULL) || r;
+  r = ((glNamedFramebufferReadBuffer = (PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferReadBuffer")) == NULL) || r;
+  r = ((glNamedFramebufferRenderbuffer = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferRenderbuffer")) == NULL) || r;
+  r = ((glNamedFramebufferTexture = (PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture")) == NULL) || r;
+  r = ((glNamedFramebufferTextureLayer = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureLayer")) == NULL) || r;
+  r = ((glNamedRenderbufferStorage = (PFNGLNAMEDRENDERBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorage")) == NULL) || r;
+  r = ((glNamedRenderbufferStorageMultisample = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisample")) == NULL) || r;
+  r = ((glTextureBuffer = (PFNGLTEXTUREBUFFERPROC)glewGetProcAddress((const GLubyte*)"glTextureBuffer")) == NULL) || r;
+  r = ((glTextureBufferRange = (PFNGLTEXTUREBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferRange")) == NULL) || r;
+  r = ((glTextureParameterIiv = (PFNGLTEXTUREPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIiv")) == NULL) || r;
+  r = ((glTextureParameterIuiv = (PFNGLTEXTUREPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIuiv")) == NULL) || r;
+  r = ((glTextureParameterf = (PFNGLTEXTUREPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterf")) == NULL) || r;
+  r = ((glTextureParameterfv = (PFNGLTEXTUREPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfv")) == NULL) || r;
+  r = ((glTextureParameteri = (PFNGLTEXTUREPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteri")) == NULL) || r;
+  r = ((glTextureParameteriv = (PFNGLTEXTUREPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteriv")) == NULL) || r;
+  r = ((glTextureStorage1D = (PFNGLTEXTURESTORAGE1DPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage1D")) == NULL) || r;
+  r = ((glTextureStorage2D = (PFNGLTEXTURESTORAGE2DPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2D")) == NULL) || r;
+  r = ((glTextureStorage2DMultisample = (PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2DMultisample")) == NULL) || r;
+  r = ((glTextureStorage3D = (PFNGLTEXTURESTORAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3D")) == NULL) || r;
+  r = ((glTextureStorage3DMultisample = (PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3DMultisample")) == NULL) || r;
+  r = ((glTextureSubImage1D = (PFNGLTEXTURESUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage1D")) == NULL) || r;
+  r = ((glTextureSubImage2D = (PFNGLTEXTURESUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage2D")) == NULL) || r;
+  r = ((glTextureSubImage3D = (PFNGLTEXTURESUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage3D")) == NULL) || r;
+  r = ((glTransformFeedbackBufferBase = (PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackBufferBase")) == NULL) || r;
+  r = ((glTransformFeedbackBufferRange = (PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackBufferRange")) == NULL) || r;
+  r = ((glUnmapNamedBuffer = (PFNGLUNMAPNAMEDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapNamedBuffer")) == NULL) || r;
+  r = ((glVertexArrayAttribBinding = (PFNGLVERTEXARRAYATTRIBBINDINGPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayAttribBinding")) == NULL) || r;
+  r = ((glVertexArrayAttribFormat = (PFNGLVERTEXARRAYATTRIBFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayAttribFormat")) == NULL) || r;
+  r = ((glVertexArrayAttribIFormat = (PFNGLVERTEXARRAYATTRIBIFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayAttribIFormat")) == NULL) || r;
+  r = ((glVertexArrayAttribLFormat = (PFNGLVERTEXARRAYATTRIBLFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayAttribLFormat")) == NULL) || r;
+  r = ((glVertexArrayBindingDivisor = (PFNGLVERTEXARRAYBINDINGDIVISORPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayBindingDivisor")) == NULL) || r;
+  r = ((glVertexArrayElementBuffer = (PFNGLVERTEXARRAYELEMENTBUFFERPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayElementBuffer")) == NULL) || r;
+  r = ((glVertexArrayVertexBuffer = (PFNGLVERTEXARRAYVERTEXBUFFERPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexBuffer")) == NULL) || r;
+  r = ((glVertexArrayVertexBuffers = (PFNGLVERTEXARRAYVERTEXBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexBuffers")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_direct_state_access */
+
+#ifdef GL_ARB_draw_buffers
+
+static GLboolean _glewInit_GL_ARB_draw_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_draw_buffers */
+
+#ifdef GL_ARB_draw_buffers_blend
+
+static GLboolean _glewInit_GL_ARB_draw_buffers_blend ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationSeparateiARB = (PFNGLBLENDEQUATIONSEPARATEIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateiARB")) == NULL) || r;
+  r = ((glBlendEquationiARB = (PFNGLBLENDEQUATIONIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationiARB")) == NULL) || r;
+  r = ((glBlendFuncSeparateiARB = (PFNGLBLENDFUNCSEPARATEIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateiARB")) == NULL) || r;
+  r = ((glBlendFunciARB = (PFNGLBLENDFUNCIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendFunciARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_draw_buffers_blend */
+
+#ifdef GL_ARB_draw_elements_base_vertex
+
+static GLboolean _glewInit_GL_ARB_draw_elements_base_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsBaseVertex")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertex")) == NULL) || r;
+  r = ((glDrawRangeElementsBaseVertex = (PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsBaseVertex")) == NULL) || r;
+  r = ((glMultiDrawElementsBaseVertex = (PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsBaseVertex")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+#ifdef GL_ARB_draw_indirect
+
+static GLboolean _glewInit_GL_ARB_draw_indirect ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysIndirect = (PFNGLDRAWARRAYSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysIndirect")) == NULL) || r;
+  r = ((glDrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsIndirect")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_draw_indirect */
+
+#ifdef GL_ARB_framebuffer_no_attachments
+
+static GLboolean _glewInit_GL_ARB_framebuffer_no_attachments ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferParameteri = (PFNGLFRAMEBUFFERPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glFramebufferParameteri")) == NULL) || r;
+  r = ((glGetFramebufferParameteriv = (PFNGLGETFRAMEBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameteriv")) == NULL) || r;
+  r = ((glGetNamedFramebufferParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferParameterivEXT")) == NULL) || r;
+  r = ((glNamedFramebufferParameteriEXT = (PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferParameteriEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+#ifdef GL_ARB_framebuffer_object
+
+static GLboolean _glewInit_GL_ARB_framebuffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindFramebuffer")) == NULL) || r;
+  r = ((glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbuffer")) == NULL) || r;
+  r = ((glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebuffer")) == NULL) || r;
+  r = ((glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatus")) == NULL) || r;
+  r = ((glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffers")) == NULL) || r;
+  r = ((glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffers")) == NULL) || r;
+  r = ((glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbuffer")) == NULL) || r;
+  r = ((glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1D")) == NULL) || r;
+  r = ((glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2D")) == NULL) || r;
+  r = ((glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3D")) == NULL) || r;
+  r = ((glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayer")) == NULL) || r;
+  r = ((glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffers")) == NULL) || r;
+  r = ((glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffers")) == NULL) || r;
+  r = ((glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmap")) == NULL) || r;
+  r = ((glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameteriv")) == NULL) || r;
+  r = ((glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameteriv")) == NULL) || r;
+  r = ((glIsFramebuffer = (PFNGLISFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsFramebuffer")) == NULL) || r;
+  r = ((glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbuffer")) == NULL) || r;
+  r = ((glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorage")) == NULL) || r;
+  r = ((glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisample")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_framebuffer_object */
+
+#ifdef GL_ARB_geometry_shader4
+
+static GLboolean _glewInit_GL_ARB_geometry_shader4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTextureARB = (PFNGLFRAMEBUFFERTEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureARB")) == NULL) || r;
+  r = ((glFramebufferTextureFaceARB = (PFNGLFRAMEBUFFERTEXTUREFACEARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceARB")) == NULL) || r;
+  r = ((glFramebufferTextureLayerARB = (PFNGLFRAMEBUFFERTEXTURELAYERARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerARB")) == NULL) || r;
+  r = ((glProgramParameteriARB = (PFNGLPROGRAMPARAMETERIARBPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_geometry_shader4 */
+
+#ifdef GL_ARB_get_program_binary
+
+static GLboolean _glewInit_GL_ARB_get_program_binary ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetProgramBinary = (PFNGLGETPROGRAMBINARYPROC)glewGetProcAddress((const GLubyte*)"glGetProgramBinary")) == NULL) || r;
+  r = ((glProgramBinary = (PFNGLPROGRAMBINARYPROC)glewGetProcAddress((const GLubyte*)"glProgramBinary")) == NULL) || r;
+  r = ((glProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteri")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_get_program_binary */
+
+#ifdef GL_ARB_get_texture_sub_image
+
+static GLboolean _glewInit_GL_ARB_get_texture_sub_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetCompressedTextureSubImage = (PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureSubImage")) == NULL) || r;
+  r = ((glGetTextureSubImage = (PFNGLGETTEXTURESUBIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetTextureSubImage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_get_texture_sub_image */
+
+#ifdef GL_ARB_gl_spirv
+
+static GLboolean _glewInit_GL_ARB_gl_spirv ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSpecializeShaderARB = (PFNGLSPECIALIZESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glSpecializeShaderARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_gl_spirv */
+
+#ifdef GL_ARB_gpu_shader_fp64
+
+static GLboolean _glewInit_GL_ARB_gpu_shader_fp64 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetUniformdv = (PFNGLGETUNIFORMDVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformdv")) == NULL) || r;
+  r = ((glUniform1d = (PFNGLUNIFORM1DPROC)glewGetProcAddress((const GLubyte*)"glUniform1d")) == NULL) || r;
+  r = ((glUniform1dv = (PFNGLUNIFORM1DVPROC)glewGetProcAddress((const GLubyte*)"glUniform1dv")) == NULL) || r;
+  r = ((glUniform2d = (PFNGLUNIFORM2DPROC)glewGetProcAddress((const GLubyte*)"glUniform2d")) == NULL) || r;
+  r = ((glUniform2dv = (PFNGLUNIFORM2DVPROC)glewGetProcAddress((const GLubyte*)"glUniform2dv")) == NULL) || r;
+  r = ((glUniform3d = (PFNGLUNIFORM3DPROC)glewGetProcAddress((const GLubyte*)"glUniform3d")) == NULL) || r;
+  r = ((glUniform3dv = (PFNGLUNIFORM3DVPROC)glewGetProcAddress((const GLubyte*)"glUniform3dv")) == NULL) || r;
+  r = ((glUniform4d = (PFNGLUNIFORM4DPROC)glewGetProcAddress((const GLubyte*)"glUniform4d")) == NULL) || r;
+  r = ((glUniform4dv = (PFNGLUNIFORM4DVPROC)glewGetProcAddress((const GLubyte*)"glUniform4dv")) == NULL) || r;
+  r = ((glUniformMatrix2dv = (PFNGLUNIFORMMATRIX2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2dv")) == NULL) || r;
+  r = ((glUniformMatrix2x3dv = (PFNGLUNIFORMMATRIX2X3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3dv")) == NULL) || r;
+  r = ((glUniformMatrix2x4dv = (PFNGLUNIFORMMATRIX2X4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4dv")) == NULL) || r;
+  r = ((glUniformMatrix3dv = (PFNGLUNIFORMMATRIX3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3dv")) == NULL) || r;
+  r = ((glUniformMatrix3x2dv = (PFNGLUNIFORMMATRIX3X2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2dv")) == NULL) || r;
+  r = ((glUniformMatrix3x4dv = (PFNGLUNIFORMMATRIX3X4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4dv")) == NULL) || r;
+  r = ((glUniformMatrix4dv = (PFNGLUNIFORMMATRIX4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4dv")) == NULL) || r;
+  r = ((glUniformMatrix4x2dv = (PFNGLUNIFORMMATRIX4X2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2dv")) == NULL) || r;
+  r = ((glUniformMatrix4x3dv = (PFNGLUNIFORMMATRIX4X3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3dv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+#ifdef GL_ARB_gpu_shader_int64
+
+static GLboolean _glewInit_GL_ARB_gpu_shader_int64 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetUniformi64vARB = (PFNGLGETUNIFORMI64VARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformi64vARB")) == NULL) || r;
+  r = ((glGetUniformui64vARB = (PFNGLGETUNIFORMUI64VARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformui64vARB")) == NULL) || r;
+  r = ((glGetnUniformi64vARB = (PFNGLGETNUNIFORMI64VARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformi64vARB")) == NULL) || r;
+  r = ((glGetnUniformui64vARB = (PFNGLGETNUNIFORMUI64VARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformui64vARB")) == NULL) || r;
+  r = ((glProgramUniform1i64ARB = (PFNGLPROGRAMUNIFORM1I64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64ARB")) == NULL) || r;
+  r = ((glProgramUniform1i64vARB = (PFNGLPROGRAMUNIFORM1I64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64vARB")) == NULL) || r;
+  r = ((glProgramUniform1ui64ARB = (PFNGLPROGRAMUNIFORM1UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64ARB")) == NULL) || r;
+  r = ((glProgramUniform1ui64vARB = (PFNGLPROGRAMUNIFORM1UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64vARB")) == NULL) || r;
+  r = ((glProgramUniform2i64ARB = (PFNGLPROGRAMUNIFORM2I64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64ARB")) == NULL) || r;
+  r = ((glProgramUniform2i64vARB = (PFNGLPROGRAMUNIFORM2I64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64vARB")) == NULL) || r;
+  r = ((glProgramUniform2ui64ARB = (PFNGLPROGRAMUNIFORM2UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64ARB")) == NULL) || r;
+  r = ((glProgramUniform2ui64vARB = (PFNGLPROGRAMUNIFORM2UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64vARB")) == NULL) || r;
+  r = ((glProgramUniform3i64ARB = (PFNGLPROGRAMUNIFORM3I64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64ARB")) == NULL) || r;
+  r = ((glProgramUniform3i64vARB = (PFNGLPROGRAMUNIFORM3I64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64vARB")) == NULL) || r;
+  r = ((glProgramUniform3ui64ARB = (PFNGLPROGRAMUNIFORM3UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64ARB")) == NULL) || r;
+  r = ((glProgramUniform3ui64vARB = (PFNGLPROGRAMUNIFORM3UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64vARB")) == NULL) || r;
+  r = ((glProgramUniform4i64ARB = (PFNGLPROGRAMUNIFORM4I64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64ARB")) == NULL) || r;
+  r = ((glProgramUniform4i64vARB = (PFNGLPROGRAMUNIFORM4I64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64vARB")) == NULL) || r;
+  r = ((glProgramUniform4ui64ARB = (PFNGLPROGRAMUNIFORM4UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64ARB")) == NULL) || r;
+  r = ((glProgramUniform4ui64vARB = (PFNGLPROGRAMUNIFORM4UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64vARB")) == NULL) || r;
+  r = ((glUniform1i64ARB = (PFNGLUNIFORM1I64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64ARB")) == NULL) || r;
+  r = ((glUniform1i64vARB = (PFNGLUNIFORM1I64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64vARB")) == NULL) || r;
+  r = ((glUniform1ui64ARB = (PFNGLUNIFORM1UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64ARB")) == NULL) || r;
+  r = ((glUniform1ui64vARB = (PFNGLUNIFORM1UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64vARB")) == NULL) || r;
+  r = ((glUniform2i64ARB = (PFNGLUNIFORM2I64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64ARB")) == NULL) || r;
+  r = ((glUniform2i64vARB = (PFNGLUNIFORM2I64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64vARB")) == NULL) || r;
+  r = ((glUniform2ui64ARB = (PFNGLUNIFORM2UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64ARB")) == NULL) || r;
+  r = ((glUniform2ui64vARB = (PFNGLUNIFORM2UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64vARB")) == NULL) || r;
+  r = ((glUniform3i64ARB = (PFNGLUNIFORM3I64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64ARB")) == NULL) || r;
+  r = ((glUniform3i64vARB = (PFNGLUNIFORM3I64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64vARB")) == NULL) || r;
+  r = ((glUniform3ui64ARB = (PFNGLUNIFORM3UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64ARB")) == NULL) || r;
+  r = ((glUniform3ui64vARB = (PFNGLUNIFORM3UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64vARB")) == NULL) || r;
+  r = ((glUniform4i64ARB = (PFNGLUNIFORM4I64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64ARB")) == NULL) || r;
+  r = ((glUniform4i64vARB = (PFNGLUNIFORM4I64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64vARB")) == NULL) || r;
+  r = ((glUniform4ui64ARB = (PFNGLUNIFORM4UI64ARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64ARB")) == NULL) || r;
+  r = ((glUniform4ui64vARB = (PFNGLUNIFORM4UI64VARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64vARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_gpu_shader_int64 */
+
+#ifdef GL_ARB_imaging
+
+static GLboolean _glewInit_GL_ARB_imaging ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
+  r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r;
+  r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r;
+  r = ((glColorTableParameterfv = (PFNGLCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfv")) == NULL) || r;
+  r = ((glColorTableParameteriv = (PFNGLCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameteriv")) == NULL) || r;
+  r = ((glConvolutionFilter1D = (PFNGLCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1D")) == NULL) || r;
+  r = ((glConvolutionFilter2D = (PFNGLCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2D")) == NULL) || r;
+  r = ((glConvolutionParameterf = (PFNGLCONVOLUTIONPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterf")) == NULL) || r;
+  r = ((glConvolutionParameterfv = (PFNGLCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfv")) == NULL) || r;
+  r = ((glConvolutionParameteri = (PFNGLCONVOLUTIONPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteri")) == NULL) || r;
+  r = ((glConvolutionParameteriv = (PFNGLCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriv")) == NULL) || r;
+  r = ((glCopyColorSubTable = (PFNGLCOPYCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTable")) == NULL) || r;
+  r = ((glCopyColorTable = (PFNGLCOPYCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTable")) == NULL) || r;
+  r = ((glCopyConvolutionFilter1D = (PFNGLCOPYCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1D")) == NULL) || r;
+  r = ((glCopyConvolutionFilter2D = (PFNGLCOPYCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2D")) == NULL) || r;
+  r = ((glGetColorTable = (PFNGLGETCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glGetColorTable")) == NULL) || r;
+  r = ((glGetColorTableParameterfv = (PFNGLGETCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfv")) == NULL) || r;
+  r = ((glGetColorTableParameteriv = (PFNGLGETCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameteriv")) == NULL) || r;
+  r = ((glGetConvolutionFilter = (PFNGLGETCONVOLUTIONFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilter")) == NULL) || r;
+  r = ((glGetConvolutionParameterfv = (PFNGLGETCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfv")) == NULL) || r;
+  r = ((glGetConvolutionParameteriv = (PFNGLGETCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameteriv")) == NULL) || r;
+  r = ((glGetHistogram = (PFNGLGETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glGetHistogram")) == NULL) || r;
+  r = ((glGetHistogramParameterfv = (PFNGLGETHISTOGRAMPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfv")) == NULL) || r;
+  r = ((glGetHistogramParameteriv = (PFNGLGETHISTOGRAMPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameteriv")) == NULL) || r;
+  r = ((glGetMinmax = (PFNGLGETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glGetMinmax")) == NULL) || r;
+  r = ((glGetMinmaxParameterfv = (PFNGLGETMINMAXPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfv")) == NULL) || r;
+  r = ((glGetMinmaxParameteriv = (PFNGLGETMINMAXPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameteriv")) == NULL) || r;
+  r = ((glGetSeparableFilter = (PFNGLGETSEPARABLEFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilter")) == NULL) || r;
+  r = ((glHistogram = (PFNGLHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glHistogram")) == NULL) || r;
+  r = ((glMinmax = (PFNGLMINMAXPROC)glewGetProcAddress((const GLubyte*)"glMinmax")) == NULL) || r;
+  r = ((glResetHistogram = (PFNGLRESETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glResetHistogram")) == NULL) || r;
+  r = ((glResetMinmax = (PFNGLRESETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glResetMinmax")) == NULL) || r;
+  r = ((glSeparableFilter2D = (PFNGLSEPARABLEFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_imaging */
+
+#ifdef GL_ARB_indirect_parameters
+
+static GLboolean _glewInit_GL_ARB_indirect_parameters ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectCountARB = (PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectCountARB")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectCountARB = (PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectCountARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_indirect_parameters */
+
+#ifdef GL_ARB_instanced_arrays
+
+static GLboolean _glewInit_GL_ARB_instanced_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedARB")) == NULL) || r;
+  r = ((glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedARB")) == NULL) || r;
+  r = ((glVertexAttribDivisorARB = (PFNGLVERTEXATTRIBDIVISORARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_instanced_arrays */
+
+#ifdef GL_ARB_internalformat_query
+
+static GLboolean _glewInit_GL_ARB_internalformat_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetInternalformativ = (PFNGLGETINTERNALFORMATIVPROC)glewGetProcAddress((const GLubyte*)"glGetInternalformativ")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_internalformat_query */
+
+#ifdef GL_ARB_internalformat_query2
+
+static GLboolean _glewInit_GL_ARB_internalformat_query2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetInternalformati64v = (PFNGLGETINTERNALFORMATI64VPROC)glewGetProcAddress((const GLubyte*)"glGetInternalformati64v")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_internalformat_query2 */
+
+#ifdef GL_ARB_invalidate_subdata
+
+static GLboolean _glewInit_GL_ARB_invalidate_subdata ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glInvalidateBufferData = (PFNGLINVALIDATEBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateBufferData")) == NULL) || r;
+  r = ((glInvalidateBufferSubData = (PFNGLINVALIDATEBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateBufferSubData")) == NULL) || r;
+  r = ((glInvalidateFramebuffer = (PFNGLINVALIDATEFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glInvalidateFramebuffer")) == NULL) || r;
+  r = ((glInvalidateSubFramebuffer = (PFNGLINVALIDATESUBFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glInvalidateSubFramebuffer")) == NULL) || r;
+  r = ((glInvalidateTexImage = (PFNGLINVALIDATETEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glInvalidateTexImage")) == NULL) || r;
+  r = ((glInvalidateTexSubImage = (PFNGLINVALIDATETEXSUBIMAGEPROC)glewGetProcAddress((const GLubyte*)"glInvalidateTexSubImage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_invalidate_subdata */
+
+#ifdef GL_ARB_map_buffer_range
+
+static GLboolean _glewInit_GL_ARB_map_buffer_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRange")) == NULL) || r;
+  r = ((glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glMapBufferRange")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_map_buffer_range */
+
+#ifdef GL_ARB_matrix_palette
+
+static GLboolean _glewInit_GL_ARB_matrix_palette ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCurrentPaletteMatrixARB = (PFNGLCURRENTPALETTEMATRIXARBPROC)glewGetProcAddress((const GLubyte*)"glCurrentPaletteMatrixARB")) == NULL) || r;
+  r = ((glMatrixIndexPointerARB = (PFNGLMATRIXINDEXPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexPointerARB")) == NULL) || r;
+  r = ((glMatrixIndexubvARB = (PFNGLMATRIXINDEXUBVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexubvARB")) == NULL) || r;
+  r = ((glMatrixIndexuivARB = (PFNGLMATRIXINDEXUIVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexuivARB")) == NULL) || r;
+  r = ((glMatrixIndexusvARB = (PFNGLMATRIXINDEXUSVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexusvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_matrix_palette */
+
+#ifdef GL_ARB_multi_bind
+
+static GLboolean _glewInit_GL_ARB_multi_bind ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindBuffersBase = (PFNGLBINDBUFFERSBASEPROC)glewGetProcAddress((const GLubyte*)"glBindBuffersBase")) == NULL) || r;
+  r = ((glBindBuffersRange = (PFNGLBINDBUFFERSRANGEPROC)glewGetProcAddress((const GLubyte*)"glBindBuffersRange")) == NULL) || r;
+  r = ((glBindImageTextures = (PFNGLBINDIMAGETEXTURESPROC)glewGetProcAddress((const GLubyte*)"glBindImageTextures")) == NULL) || r;
+  r = ((glBindSamplers = (PFNGLBINDSAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glBindSamplers")) == NULL) || r;
+  r = ((glBindTextures = (PFNGLBINDTEXTURESPROC)glewGetProcAddress((const GLubyte*)"glBindTextures")) == NULL) || r;
+  r = ((glBindVertexBuffers = (PFNGLBINDVERTEXBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glBindVertexBuffers")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multi_bind */
+
+#ifdef GL_ARB_multi_draw_indirect
+
+static GLboolean _glewInit_GL_ARB_multi_draw_indirect ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirect = (PFNGLMULTIDRAWARRAYSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirect")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirect")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multi_draw_indirect */
+
+#ifdef GL_ARB_multisample
+
+static GLboolean _glewInit_GL_ARB_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleCoverageARB = (PFNGLSAMPLECOVERAGEARBPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverageARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multisample */
+
+#ifdef GL_ARB_multitexture
+
+static GLboolean _glewInit_GL_ARB_multitexture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glActiveTextureARB")) == NULL) || r;
+  r = ((glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTextureARB")) == NULL) || r;
+  r = ((glMultiTexCoord1dARB = (PFNGLMULTITEXCOORD1DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dARB")) == NULL) || r;
+  r = ((glMultiTexCoord1dvARB = (PFNGLMULTITEXCOORD1DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord1fARB = (PFNGLMULTITEXCOORD1FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fARB")) == NULL) || r;
+  r = ((glMultiTexCoord1fvARB = (PFNGLMULTITEXCOORD1FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord1iARB = (PFNGLMULTITEXCOORD1IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iARB")) == NULL) || r;
+  r = ((glMultiTexCoord1ivARB = (PFNGLMULTITEXCOORD1IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord1sARB = (PFNGLMULTITEXCOORD1SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sARB")) == NULL) || r;
+  r = ((glMultiTexCoord1svARB = (PFNGLMULTITEXCOORD1SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1svARB")) == NULL) || r;
+  r = ((glMultiTexCoord2dARB = (PFNGLMULTITEXCOORD2DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dARB")) == NULL) || r;
+  r = ((glMultiTexCoord2dvARB = (PFNGLMULTITEXCOORD2DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fARB")) == NULL) || r;
+  r = ((glMultiTexCoord2fvARB = (PFNGLMULTITEXCOORD2FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord2iARB = (PFNGLMULTITEXCOORD2IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iARB")) == NULL) || r;
+  r = ((glMultiTexCoord2ivARB = (PFNGLMULTITEXCOORD2IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord2sARB = (PFNGLMULTITEXCOORD2SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sARB")) == NULL) || r;
+  r = ((glMultiTexCoord2svARB = (PFNGLMULTITEXCOORD2SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2svARB")) == NULL) || r;
+  r = ((glMultiTexCoord3dARB = (PFNGLMULTITEXCOORD3DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dARB")) == NULL) || r;
+  r = ((glMultiTexCoord3dvARB = (PFNGLMULTITEXCOORD3DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord3fARB = (PFNGLMULTITEXCOORD3FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fARB")) == NULL) || r;
+  r = ((glMultiTexCoord3fvARB = (PFNGLMULTITEXCOORD3FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord3iARB = (PFNGLMULTITEXCOORD3IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iARB")) == NULL) || r;
+  r = ((glMultiTexCoord3ivARB = (PFNGLMULTITEXCOORD3IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord3sARB = (PFNGLMULTITEXCOORD3SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sARB")) == NULL) || r;
+  r = ((glMultiTexCoord3svARB = (PFNGLMULTITEXCOORD3SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3svARB")) == NULL) || r;
+  r = ((glMultiTexCoord4dARB = (PFNGLMULTITEXCOORD4DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dARB")) == NULL) || r;
+  r = ((glMultiTexCoord4dvARB = (PFNGLMULTITEXCOORD4DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord4fARB = (PFNGLMULTITEXCOORD4FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fARB")) == NULL) || r;
+  r = ((glMultiTexCoord4fvARB = (PFNGLMULTITEXCOORD4FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord4iARB = (PFNGLMULTITEXCOORD4IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iARB")) == NULL) || r;
+  r = ((glMultiTexCoord4ivARB = (PFNGLMULTITEXCOORD4IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord4sARB = (PFNGLMULTITEXCOORD4SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sARB")) == NULL) || r;
+  r = ((glMultiTexCoord4svARB = (PFNGLMULTITEXCOORD4SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4svARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multitexture */
+
+#ifdef GL_ARB_occlusion_query
+
+static GLboolean _glewInit_GL_ARB_occlusion_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryARB")) == NULL) || r;
+  r = ((glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesARB")) == NULL) || r;
+  r = ((glEndQueryARB = (PFNGLENDQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glEndQueryARB")) == NULL) || r;
+  r = ((glGenQueriesARB = (PFNGLGENQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesARB")) == NULL) || r;
+  r = ((glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivARB")) == NULL) || r;
+  r = ((glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivARB")) == NULL) || r;
+  r = ((glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivARB")) == NULL) || r;
+  r = ((glIsQueryARB = (PFNGLISQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glIsQueryARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_occlusion_query */
+
+#ifdef GL_ARB_parallel_shader_compile
+
+static GLboolean _glewInit_GL_ARB_parallel_shader_compile ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMaxShaderCompilerThreadsARB = (PFNGLMAXSHADERCOMPILERTHREADSARBPROC)glewGetProcAddress((const GLubyte*)"glMaxShaderCompilerThreadsARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_parallel_shader_compile */
+
+#ifdef GL_ARB_point_parameters
+
+static GLboolean _glewInit_GL_ARB_point_parameters ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfARB")) == NULL) || r;
+  r = ((glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_point_parameters */
+
+#ifdef GL_ARB_polygon_offset_clamp
+
+static GLboolean _glewInit_GL_ARB_polygon_offset_clamp ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPolygonOffsetClamp = (PFNGLPOLYGONOFFSETCLAMPPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetClamp")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_polygon_offset_clamp */
+
+#ifdef GL_ARB_program_interface_query
+
+static GLboolean _glewInit_GL_ARB_program_interface_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetProgramInterfaceiv = (PFNGLGETPROGRAMINTERFACEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInterfaceiv")) == NULL) || r;
+  r = ((glGetProgramResourceIndex = (PFNGLGETPROGRAMRESOURCEINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceIndex")) == NULL) || r;
+  r = ((glGetProgramResourceLocation = (PFNGLGETPROGRAMRESOURCELOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceLocation")) == NULL) || r;
+  r = ((glGetProgramResourceLocationIndex = (PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceLocationIndex")) == NULL) || r;
+  r = ((glGetProgramResourceName = (PFNGLGETPROGRAMRESOURCENAMEPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceName")) == NULL) || r;
+  r = ((glGetProgramResourceiv = (PFNGLGETPROGRAMRESOURCEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceiv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_program_interface_query */
+
+#ifdef GL_ARB_provoking_vertex
+
+static GLboolean _glewInit_GL_ARB_provoking_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProvokingVertex = (PFNGLPROVOKINGVERTEXPROC)glewGetProcAddress((const GLubyte*)"glProvokingVertex")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_provoking_vertex */
+
+#ifdef GL_ARB_robustness
+
+static GLboolean _glewInit_GL_ARB_robustness ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetGraphicsResetStatusARB = (PFNGLGETGRAPHICSRESETSTATUSARBPROC)glewGetProcAddress((const GLubyte*)"glGetGraphicsResetStatusARB")) == NULL) || r;
+  r = ((glGetnColorTableARB = (PFNGLGETNCOLORTABLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnColorTableARB")) == NULL) || r;
+  r = ((glGetnCompressedTexImageARB = (PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnCompressedTexImageARB")) == NULL) || r;
+  r = ((glGetnConvolutionFilterARB = (PFNGLGETNCONVOLUTIONFILTERARBPROC)glewGetProcAddress((const GLubyte*)"glGetnConvolutionFilterARB")) == NULL) || r;
+  r = ((glGetnHistogramARB = (PFNGLGETNHISTOGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glGetnHistogramARB")) == NULL) || r;
+  r = ((glGetnMapdvARB = (PFNGLGETNMAPDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapdvARB")) == NULL) || r;
+  r = ((glGetnMapfvARB = (PFNGLGETNMAPFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapfvARB")) == NULL) || r;
+  r = ((glGetnMapivARB = (PFNGLGETNMAPIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapivARB")) == NULL) || r;
+  r = ((glGetnMinmaxARB = (PFNGLGETNMINMAXARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMinmaxARB")) == NULL) || r;
+  r = ((glGetnPixelMapfvARB = (PFNGLGETNPIXELMAPFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapfvARB")) == NULL) || r;
+  r = ((glGetnPixelMapuivARB = (PFNGLGETNPIXELMAPUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapuivARB")) == NULL) || r;
+  r = ((glGetnPixelMapusvARB = (PFNGLGETNPIXELMAPUSVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapusvARB")) == NULL) || r;
+  r = ((glGetnPolygonStippleARB = (PFNGLGETNPOLYGONSTIPPLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPolygonStippleARB")) == NULL) || r;
+  r = ((glGetnSeparableFilterARB = (PFNGLGETNSEPARABLEFILTERARBPROC)glewGetProcAddress((const GLubyte*)"glGetnSeparableFilterARB")) == NULL) || r;
+  r = ((glGetnTexImageARB = (PFNGLGETNTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnTexImageARB")) == NULL) || r;
+  r = ((glGetnUniformdvARB = (PFNGLGETNUNIFORMDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformdvARB")) == NULL) || r;
+  r = ((glGetnUniformfvARB = (PFNGLGETNUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformfvARB")) == NULL) || r;
+  r = ((glGetnUniformivARB = (PFNGLGETNUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformivARB")) == NULL) || r;
+  r = ((glGetnUniformuivARB = (PFNGLGETNUNIFORMUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformuivARB")) == NULL) || r;
+  r = ((glReadnPixelsARB = (PFNGLREADNPIXELSARBPROC)glewGetProcAddress((const GLubyte*)"glReadnPixelsARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_robustness */
+
+#ifdef GL_ARB_sample_locations
+
+static GLboolean _glewInit_GL_ARB_sample_locations ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferSampleLocationsfvARB = (PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferSampleLocationsfvARB")) == NULL) || r;
+  r = ((glNamedFramebufferSampleLocationsfvARB = (PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferSampleLocationsfvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sample_locations */
+
+#ifdef GL_ARB_sample_shading
+
+static GLboolean _glewInit_GL_ARB_sample_shading ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMinSampleShadingARB = (PFNGLMINSAMPLESHADINGARBPROC)glewGetProcAddress((const GLubyte*)"glMinSampleShadingARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sample_shading */
+
+#ifdef GL_ARB_sampler_objects
+
+static GLboolean _glewInit_GL_ARB_sampler_objects ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindSampler = (PFNGLBINDSAMPLERPROC)glewGetProcAddress((const GLubyte*)"glBindSampler")) == NULL) || r;
+  r = ((glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteSamplers")) == NULL) || r;
+  r = ((glGenSamplers = (PFNGLGENSAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glGenSamplers")) == NULL) || r;
+  r = ((glGetSamplerParameterIiv = (PFNGLGETSAMPLERPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterIiv")) == NULL) || r;
+  r = ((glGetSamplerParameterIuiv = (PFNGLGETSAMPLERPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterIuiv")) == NULL) || r;
+  r = ((glGetSamplerParameterfv = (PFNGLGETSAMPLERPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterfv")) == NULL) || r;
+  r = ((glGetSamplerParameteriv = (PFNGLGETSAMPLERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameteriv")) == NULL) || r;
+  r = ((glIsSampler = (PFNGLISSAMPLERPROC)glewGetProcAddress((const GLubyte*)"glIsSampler")) == NULL) || r;
+  r = ((glSamplerParameterIiv = (PFNGLSAMPLERPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterIiv")) == NULL) || r;
+  r = ((glSamplerParameterIuiv = (PFNGLSAMPLERPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterIuiv")) == NULL) || r;
+  r = ((glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterf")) == NULL) || r;
+  r = ((glSamplerParameterfv = (PFNGLSAMPLERPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterfv")) == NULL) || r;
+  r = ((glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameteri")) == NULL) || r;
+  r = ((glSamplerParameteriv = (PFNGLSAMPLERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameteriv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sampler_objects */
+
+#ifdef GL_ARB_separate_shader_objects
+
+static GLboolean _glewInit_GL_ARB_separate_shader_objects ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveShaderProgram = (PFNGLACTIVESHADERPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glActiveShaderProgram")) == NULL) || r;
+  r = ((glBindProgramPipeline = (PFNGLBINDPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glBindProgramPipeline")) == NULL) || r;
+  r = ((glCreateShaderProgramv = (PFNGLCREATESHADERPROGRAMVPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderProgramv")) == NULL) || r;
+  r = ((glDeleteProgramPipelines = (PFNGLDELETEPROGRAMPIPELINESPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramPipelines")) == NULL) || r;
+  r = ((glGenProgramPipelines = (PFNGLGENPROGRAMPIPELINESPROC)glewGetProcAddress((const GLubyte*)"glGenProgramPipelines")) == NULL) || r;
+  r = ((glGetProgramPipelineInfoLog = (PFNGLGETPROGRAMPIPELINEINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramPipelineInfoLog")) == NULL) || r;
+  r = ((glGetProgramPipelineiv = (PFNGLGETPROGRAMPIPELINEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramPipelineiv")) == NULL) || r;
+  r = ((glIsProgramPipeline = (PFNGLISPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glIsProgramPipeline")) == NULL) || r;
+  r = ((glProgramUniform1d = (PFNGLPROGRAMUNIFORM1DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1d")) == NULL) || r;
+  r = ((glProgramUniform1dv = (PFNGLPROGRAMUNIFORM1DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1dv")) == NULL) || r;
+  r = ((glProgramUniform1f = (PFNGLPROGRAMUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1f")) == NULL) || r;
+  r = ((glProgramUniform1fv = (PFNGLPROGRAMUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fv")) == NULL) || r;
+  r = ((glProgramUniform1i = (PFNGLPROGRAMUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i")) == NULL) || r;
+  r = ((glProgramUniform1iv = (PFNGLPROGRAMUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iv")) == NULL) || r;
+  r = ((glProgramUniform1ui = (PFNGLPROGRAMUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui")) == NULL) || r;
+  r = ((glProgramUniform1uiv = (PFNGLPROGRAMUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiv")) == NULL) || r;
+  r = ((glProgramUniform2d = (PFNGLPROGRAMUNIFORM2DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2d")) == NULL) || r;
+  r = ((glProgramUniform2dv = (PFNGLPROGRAMUNIFORM2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2dv")) == NULL) || r;
+  r = ((glProgramUniform2f = (PFNGLPROGRAMUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2f")) == NULL) || r;
+  r = ((glProgramUniform2fv = (PFNGLPROGRAMUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fv")) == NULL) || r;
+  r = ((glProgramUniform2i = (PFNGLPROGRAMUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i")) == NULL) || r;
+  r = ((glProgramUniform2iv = (PFNGLPROGRAMUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iv")) == NULL) || r;
+  r = ((glProgramUniform2ui = (PFNGLPROGRAMUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui")) == NULL) || r;
+  r = ((glProgramUniform2uiv = (PFNGLPROGRAMUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiv")) == NULL) || r;
+  r = ((glProgramUniform3d = (PFNGLPROGRAMUNIFORM3DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3d")) == NULL) || r;
+  r = ((glProgramUniform3dv = (PFNGLPROGRAMUNIFORM3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3dv")) == NULL) || r;
+  r = ((glProgramUniform3f = (PFNGLPROGRAMUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3f")) == NULL) || r;
+  r = ((glProgramUniform3fv = (PFNGLPROGRAMUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fv")) == NULL) || r;
+  r = ((glProgramUniform3i = (PFNGLPROGRAMUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i")) == NULL) || r;
+  r = ((glProgramUniform3iv = (PFNGLPROGRAMUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iv")) == NULL) || r;
+  r = ((glProgramUniform3ui = (PFNGLPROGRAMUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui")) == NULL) || r;
+  r = ((glProgramUniform3uiv = (PFNGLPROGRAMUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiv")) == NULL) || r;
+  r = ((glProgramUniform4d = (PFNGLPROGRAMUNIFORM4DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4d")) == NULL) || r;
+  r = ((glProgramUniform4dv = (PFNGLPROGRAMUNIFORM4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4dv")) == NULL) || r;
+  r = ((glProgramUniform4f = (PFNGLPROGRAMUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4f")) == NULL) || r;
+  r = ((glProgramUniform4fv = (PFNGLPROGRAMUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fv")) == NULL) || r;
+  r = ((glProgramUniform4i = (PFNGLPROGRAMUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i")) == NULL) || r;
+  r = ((glProgramUniform4iv = (PFNGLPROGRAMUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iv")) == NULL) || r;
+  r = ((glProgramUniform4ui = (PFNGLPROGRAMUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui")) == NULL) || r;
+  r = ((glProgramUniform4uiv = (PFNGLPROGRAMUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2dv = (PFNGLPROGRAMUNIFORMMATRIX2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2fv = (PFNGLPROGRAMUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x3dv = (PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x3fv = (PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x4dv = (PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x4fv = (PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3dv = (PFNGLPROGRAMUNIFORMMATRIX3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3fv = (PFNGLPROGRAMUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x2dv = (PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x2fv = (PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x4dv = (PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x4fv = (PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4dv = (PFNGLPROGRAMUNIFORMMATRIX4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4fv = (PFNGLPROGRAMUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x2dv = (PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x2fv = (PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x3dv = (PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3dv")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x3fv = (PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fv")) == NULL) || r;
+  r = ((glUseProgramStages = (PFNGLUSEPROGRAMSTAGESPROC)glewGetProcAddress((const GLubyte*)"glUseProgramStages")) == NULL) || r;
+  r = ((glValidateProgramPipeline = (PFNGLVALIDATEPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramPipeline")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_separate_shader_objects */
+
+#ifdef GL_ARB_shader_atomic_counters
+
+static GLboolean _glewInit_GL_ARB_shader_atomic_counters ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetActiveAtomicCounterBufferiv = (PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAtomicCounterBufferiv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_atomic_counters */
+
+#ifdef GL_ARB_shader_image_load_store
+
+static GLboolean _glewInit_GL_ARB_shader_image_load_store ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glBindImageTexture")) == NULL) || r;
+  r = ((glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)glewGetProcAddress((const GLubyte*)"glMemoryBarrier")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_image_load_store */
+
+#ifdef GL_ARB_shader_objects
+
+static GLboolean _glewInit_GL_ARB_shader_objects ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glAttachObjectARB")) == NULL) || r;
+  r = ((glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderARB")) == NULL) || r;
+  r = ((glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramObjectARB")) == NULL) || r;
+  r = ((glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderObjectARB")) == NULL) || r;
+  r = ((glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteObjectARB")) == NULL) || r;
+  r = ((glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDetachObjectARB")) == NULL) || r;
+  r = ((glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformARB")) == NULL) || r;
+  r = ((glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedObjectsARB")) == NULL) || r;
+  r = ((glGetHandleARB = (PFNGLGETHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetHandleARB")) == NULL) || r;
+  r = ((glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetInfoLogARB")) == NULL) || r;
+  r = ((glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterfvARB")) == NULL) || r;
+  r = ((glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivARB")) == NULL) || r;
+  r = ((glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSourceARB")) == NULL) || r;
+  r = ((glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocationARB")) == NULL) || r;
+  r = ((glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfvARB")) == NULL) || r;
+  r = ((glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformivARB")) == NULL) || r;
+  r = ((glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glLinkProgramARB")) == NULL) || r;
+  r = ((glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glShaderSourceARB")) == NULL) || r;
+  r = ((glUniform1fARB = (PFNGLUNIFORM1FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fARB")) == NULL) || r;
+  r = ((glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fvARB")) == NULL) || r;
+  r = ((glUniform1iARB = (PFNGLUNIFORM1IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1iARB")) == NULL) || r;
+  r = ((glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ivARB")) == NULL) || r;
+  r = ((glUniform2fARB = (PFNGLUNIFORM2FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fARB")) == NULL) || r;
+  r = ((glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fvARB")) == NULL) || r;
+  r = ((glUniform2iARB = (PFNGLUNIFORM2IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2iARB")) == NULL) || r;
+  r = ((glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ivARB")) == NULL) || r;
+  r = ((glUniform3fARB = (PFNGLUNIFORM3FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fARB")) == NULL) || r;
+  r = ((glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fvARB")) == NULL) || r;
+  r = ((glUniform3iARB = (PFNGLUNIFORM3IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3iARB")) == NULL) || r;
+  r = ((glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ivARB")) == NULL) || r;
+  r = ((glUniform4fARB = (PFNGLUNIFORM4FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fARB")) == NULL) || r;
+  r = ((glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fvARB")) == NULL) || r;
+  r = ((glUniform4iARB = (PFNGLUNIFORM4IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4iARB")) == NULL) || r;
+  r = ((glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ivARB")) == NULL) || r;
+  r = ((glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fvARB")) == NULL) || r;
+  r = ((glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fvARB")) == NULL) || r;
+  r = ((glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fvARB")) == NULL) || r;
+  r = ((glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glUseProgramObjectARB")) == NULL) || r;
+  r = ((glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_objects */
+
+#ifdef GL_ARB_shader_storage_buffer_object
+
+static GLboolean _glewInit_GL_ARB_shader_storage_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glShaderStorageBlockBinding = (PFNGLSHADERSTORAGEBLOCKBINDINGPROC)glewGetProcAddress((const GLubyte*)"glShaderStorageBlockBinding")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+#ifdef GL_ARB_shader_subroutine
+
+static GLboolean _glewInit_GL_ARB_shader_subroutine ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetActiveSubroutineName = (PFNGLGETACTIVESUBROUTINENAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineName")) == NULL) || r;
+  r = ((glGetActiveSubroutineUniformName = (PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineUniformName")) == NULL) || r;
+  r = ((glGetActiveSubroutineUniformiv = (PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineUniformiv")) == NULL) || r;
+  r = ((glGetProgramStageiv = (PFNGLGETPROGRAMSTAGEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStageiv")) == NULL) || r;
+  r = ((glGetSubroutineIndex = (PFNGLGETSUBROUTINEINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetSubroutineIndex")) == NULL) || r;
+  r = ((glGetSubroutineUniformLocation = (PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetSubroutineUniformLocation")) == NULL) || r;
+  r = ((glGetUniformSubroutineuiv = (PFNGLGETUNIFORMSUBROUTINEUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformSubroutineuiv")) == NULL) || r;
+  r = ((glUniformSubroutinesuiv = (PFNGLUNIFORMSUBROUTINESUIVPROC)glewGetProcAddress((const GLubyte*)"glUniformSubroutinesuiv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_subroutine */
+
+#ifdef GL_ARB_shading_language_include
+
+static GLboolean _glewInit_GL_ARB_shading_language_include ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCompileShaderIncludeARB = (PFNGLCOMPILESHADERINCLUDEARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderIncludeARB")) == NULL) || r;
+  r = ((glDeleteNamedStringARB = (PFNGLDELETENAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteNamedStringARB")) == NULL) || r;
+  r = ((glGetNamedStringARB = (PFNGLGETNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetNamedStringARB")) == NULL) || r;
+  r = ((glGetNamedStringivARB = (PFNGLGETNAMEDSTRINGIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetNamedStringivARB")) == NULL) || r;
+  r = ((glIsNamedStringARB = (PFNGLISNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glIsNamedStringARB")) == NULL) || r;
+  r = ((glNamedStringARB = (PFNGLNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glNamedStringARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shading_language_include */
+
+#ifdef GL_ARB_sparse_buffer
+
+static GLboolean _glewInit_GL_ARB_sparse_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferPageCommitmentARB = (PFNGLBUFFERPAGECOMMITMENTARBPROC)glewGetProcAddress((const GLubyte*)"glBufferPageCommitmentARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sparse_buffer */
+
+#ifdef GL_ARB_sparse_texture
+
+static GLboolean _glewInit_GL_ARB_sparse_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexPageCommitmentARB = (PFNGLTEXPAGECOMMITMENTARBPROC)glewGetProcAddress((const GLubyte*)"glTexPageCommitmentARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sparse_texture */
+
+#ifdef GL_ARB_sync
+
+static GLboolean _glewInit_GL_ARB_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"glClientWaitSync")) == NULL) || r;
+  r = ((glDeleteSync = (PFNGLDELETESYNCPROC)glewGetProcAddress((const GLubyte*)"glDeleteSync")) == NULL) || r;
+  r = ((glFenceSync = (PFNGLFENCESYNCPROC)glewGetProcAddress((const GLubyte*)"glFenceSync")) == NULL) || r;
+  r = ((glGetInteger64v = (PFNGLGETINTEGER64VPROC)glewGetProcAddress((const GLubyte*)"glGetInteger64v")) == NULL) || r;
+  r = ((glGetSynciv = (PFNGLGETSYNCIVPROC)glewGetProcAddress((const GLubyte*)"glGetSynciv")) == NULL) || r;
+  r = ((glIsSync = (PFNGLISSYNCPROC)glewGetProcAddress((const GLubyte*)"glIsSync")) == NULL) || r;
+  r = ((glWaitSync = (PFNGLWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"glWaitSync")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_sync */
+
+#ifdef GL_ARB_tessellation_shader
+
+static GLboolean _glewInit_GL_ARB_tessellation_shader ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPatchParameterfv = (PFNGLPATCHPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPatchParameterfv")) == NULL) || r;
+  r = ((glPatchParameteri = (PFNGLPATCHPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPatchParameteri")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_tessellation_shader */
+
+#ifdef GL_ARB_texture_barrier
+
+static GLboolean _glewInit_GL_ARB_texture_barrier ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureBarrier = (PFNGLTEXTUREBARRIERPROC)glewGetProcAddress((const GLubyte*)"glTextureBarrier")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_barrier */
+
+#ifdef GL_ARB_texture_buffer_object
+
+static GLboolean _glewInit_GL_ARB_texture_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexBufferARB = (PFNGLTEXBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glTexBufferARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_buffer_object */
+
+#ifdef GL_ARB_texture_buffer_range
+
+static GLboolean _glewInit_GL_ARB_texture_buffer_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexBufferRange = (PFNGLTEXBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glTexBufferRange")) == NULL) || r;
+  r = ((glTextureBufferRangeEXT = (PFNGLTEXTUREBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferRangeEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_buffer_range */
+
+#ifdef GL_ARB_texture_compression
+
+static GLboolean _glewInit_GL_ARB_texture_compression ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCompressedTexImage1DARB = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1DARB")) == NULL) || r;
+  r = ((glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2DARB")) == NULL) || r;
+  r = ((glCompressedTexImage3DARB = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage1DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage2DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage3DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DARB")) == NULL) || r;
+  r = ((glGetCompressedTexImageARB = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImageARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_compression */
+
+#ifdef GL_ARB_texture_multisample
+
+static GLboolean _glewInit_GL_ARB_texture_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefv")) == NULL) || r;
+  r = ((glSampleMaski = (PFNGLSAMPLEMASKIPROC)glewGetProcAddress((const GLubyte*)"glSampleMaski")) == NULL) || r;
+  r = ((glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexImage2DMultisample")) == NULL) || r;
+  r = ((glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DMultisample")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_multisample */
+
+#ifdef GL_ARB_texture_storage
+
+static GLboolean _glewInit_GL_ARB_texture_storage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage1D")) == NULL) || r;
+  r = ((glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage2D")) == NULL) || r;
+  r = ((glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_storage */
+
+#ifdef GL_ARB_texture_storage_multisample
+
+static GLboolean _glewInit_GL_ARB_texture_storage_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexStorage2DMultisample = (PFNGLTEXSTORAGE2DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexStorage2DMultisample")) == NULL) || r;
+  r = ((glTexStorage3DMultisample = (PFNGLTEXSTORAGE3DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexStorage3DMultisample")) == NULL) || r;
+  r = ((glTextureStorage2DMultisampleEXT = (PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2DMultisampleEXT")) == NULL) || r;
+  r = ((glTextureStorage3DMultisampleEXT = (PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3DMultisampleEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_storage_multisample */
+
+#ifdef GL_ARB_texture_view
+
+static GLboolean _glewInit_GL_ARB_texture_view ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureView = (PFNGLTEXTUREVIEWPROC)glewGetProcAddress((const GLubyte*)"glTextureView")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_view */
+
+#ifdef GL_ARB_timer_query
+
+static GLboolean _glewInit_GL_ARB_timer_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64v")) == NULL) || r;
+  r = ((glGetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64v")) == NULL) || r;
+  r = ((glQueryCounter = (PFNGLQUERYCOUNTERPROC)glewGetProcAddress((const GLubyte*)"glQueryCounter")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_timer_query */
+
+#ifdef GL_ARB_transform_feedback2
+
+static GLboolean _glewInit_GL_ARB_transform_feedback2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindTransformFeedback = (PFNGLBINDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBindTransformFeedback")) == NULL) || r;
+  r = ((glDeleteTransformFeedbacks = (PFNGLDELETETRANSFORMFEEDBACKSPROC)glewGetProcAddress((const GLubyte*)"glDeleteTransformFeedbacks")) == NULL) || r;
+  r = ((glDrawTransformFeedback = (PFNGLDRAWTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedback")) == NULL) || r;
+  r = ((glGenTransformFeedbacks = (PFNGLGENTRANSFORMFEEDBACKSPROC)glewGetProcAddress((const GLubyte*)"glGenTransformFeedbacks")) == NULL) || r;
+  r = ((glIsTransformFeedback = (PFNGLISTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glIsTransformFeedback")) == NULL) || r;
+  r = ((glPauseTransformFeedback = (PFNGLPAUSETRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glPauseTransformFeedback")) == NULL) || r;
+  r = ((glResumeTransformFeedback = (PFNGLRESUMETRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glResumeTransformFeedback")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_transform_feedback2 */
+
+#ifdef GL_ARB_transform_feedback3
+
+static GLboolean _glewInit_GL_ARB_transform_feedback3 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQueryIndexed = (PFNGLBEGINQUERYINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryIndexed")) == NULL) || r;
+  r = ((glDrawTransformFeedbackStream = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackStream")) == NULL) || r;
+  r = ((glEndQueryIndexed = (PFNGLENDQUERYINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glEndQueryIndexed")) == NULL) || r;
+  r = ((glGetQueryIndexediv = (PFNGLGETQUERYINDEXEDIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryIndexediv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_transform_feedback3 */
+
+#ifdef GL_ARB_transform_feedback_instanced
+
+static GLboolean _glewInit_GL_ARB_transform_feedback_instanced ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawTransformFeedbackInstanced = (PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackInstanced")) == NULL) || r;
+  r = ((glDrawTransformFeedbackStreamInstanced = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackStreamInstanced")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_transform_feedback_instanced */
+
+#ifdef GL_ARB_transpose_matrix
+
+static GLboolean _glewInit_GL_ARB_transpose_matrix ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLoadTransposeMatrixdARB = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixdARB")) == NULL) || r;
+  r = ((glLoadTransposeMatrixfARB = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixfARB")) == NULL) || r;
+  r = ((glMultTransposeMatrixdARB = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixdARB")) == NULL) || r;
+  r = ((glMultTransposeMatrixfARB = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixfARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_transpose_matrix */
+
+#ifdef GL_ARB_uniform_buffer_object
+
+static GLboolean _glewInit_GL_ARB_uniform_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBase")) == NULL) || r;
+  r = ((glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRange")) == NULL) || r;
+  r = ((glGetActiveUniformBlockName = (PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformBlockName")) == NULL) || r;
+  r = ((glGetActiveUniformBlockiv = (PFNGLGETACTIVEUNIFORMBLOCKIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformBlockiv")) == NULL) || r;
+  r = ((glGetActiveUniformName = (PFNGLGETACTIVEUNIFORMNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformName")) == NULL) || r;
+  r = ((glGetActiveUniformsiv = (PFNGLGETACTIVEUNIFORMSIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformsiv")) == NULL) || r;
+  r = ((glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)glewGetProcAddress((const GLubyte*)"glGetIntegeri_v")) == NULL) || r;
+  r = ((glGetUniformBlockIndex = (PFNGLGETUNIFORMBLOCKINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBlockIndex")) == NULL) || r;
+  r = ((glGetUniformIndices = (PFNGLGETUNIFORMINDICESPROC)glewGetProcAddress((const GLubyte*)"glGetUniformIndices")) == NULL) || r;
+  r = ((glUniformBlockBinding = (PFNGLUNIFORMBLOCKBINDINGPROC)glewGetProcAddress((const GLubyte*)"glUniformBlockBinding")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_uniform_buffer_object */
+
+#ifdef GL_ARB_vertex_array_object
+
+static GLboolean _glewInit_GL_ARB_vertex_array_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArray")) == NULL) || r;
+  r = ((glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArrays")) == NULL) || r;
+  r = ((glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArrays")) == NULL) || r;
+  r = ((glIsVertexArray = (PFNGLISVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArray")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_array_object */
+
+#ifdef GL_ARB_vertex_attrib_64bit
+
+static GLboolean _glewInit_GL_ARB_vertex_attrib_64bit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVertexAttribLdv = (PFNGLGETVERTEXATTRIBLDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLdv")) == NULL) || r;
+  r = ((glVertexAttribL1d = (PFNGLVERTEXATTRIBL1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1d")) == NULL) || r;
+  r = ((glVertexAttribL1dv = (PFNGLVERTEXATTRIBL1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dv")) == NULL) || r;
+  r = ((glVertexAttribL2d = (PFNGLVERTEXATTRIBL2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2d")) == NULL) || r;
+  r = ((glVertexAttribL2dv = (PFNGLVERTEXATTRIBL2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dv")) == NULL) || r;
+  r = ((glVertexAttribL3d = (PFNGLVERTEXATTRIBL3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3d")) == NULL) || r;
+  r = ((glVertexAttribL3dv = (PFNGLVERTEXATTRIBL3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dv")) == NULL) || r;
+  r = ((glVertexAttribL4d = (PFNGLVERTEXATTRIBL4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4d")) == NULL) || r;
+  r = ((glVertexAttribL4dv = (PFNGLVERTEXATTRIBL4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dv")) == NULL) || r;
+  r = ((glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLPointer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+#ifdef GL_ARB_vertex_attrib_binding
+
+static GLboolean _glewInit_GL_ARB_vertex_attrib_binding ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindVertexBuffer = (PFNGLBINDVERTEXBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindVertexBuffer")) == NULL) || r;
+  r = ((glVertexArrayBindVertexBufferEXT = (PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayBindVertexBufferEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribBindingEXT = (PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribBindingEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribFormatEXT = (PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribFormatEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribIFormatEXT = (PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribIFormatEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribLFormatEXT = (PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribLFormatEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexBindingDivisorEXT = (PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexBindingDivisorEXT")) == NULL) || r;
+  r = ((glVertexAttribBinding = (PFNGLVERTEXATTRIBBINDINGPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribBinding")) == NULL) || r;
+  r = ((glVertexAttribFormat = (PFNGLVERTEXATTRIBFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribFormat")) == NULL) || r;
+  r = ((glVertexAttribIFormat = (PFNGLVERTEXATTRIBIFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIFormat")) == NULL) || r;
+  r = ((glVertexAttribLFormat = (PFNGLVERTEXATTRIBLFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLFormat")) == NULL) || r;
+  r = ((glVertexBindingDivisor = (PFNGLVERTEXBINDINGDIVISORPROC)glewGetProcAddress((const GLubyte*)"glVertexBindingDivisor")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_attrib_binding */
+
+#ifdef GL_ARB_vertex_blend
+
+static GLboolean _glewInit_GL_ARB_vertex_blend ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexBlendARB = (PFNGLVERTEXBLENDARBPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendARB")) == NULL) || r;
+  r = ((glWeightPointerARB = (PFNGLWEIGHTPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glWeightPointerARB")) == NULL) || r;
+  r = ((glWeightbvARB = (PFNGLWEIGHTBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightbvARB")) == NULL) || r;
+  r = ((glWeightdvARB = (PFNGLWEIGHTDVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightdvARB")) == NULL) || r;
+  r = ((glWeightfvARB = (PFNGLWEIGHTFVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightfvARB")) == NULL) || r;
+  r = ((glWeightivARB = (PFNGLWEIGHTIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightivARB")) == NULL) || r;
+  r = ((glWeightsvARB = (PFNGLWEIGHTSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightsvARB")) == NULL) || r;
+  r = ((glWeightubvARB = (PFNGLWEIGHTUBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightubvARB")) == NULL) || r;
+  r = ((glWeightuivARB = (PFNGLWEIGHTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightuivARB")) == NULL) || r;
+  r = ((glWeightusvARB = (PFNGLWEIGHTUSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightusvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_blend */
+
+#ifdef GL_ARB_vertex_buffer_object
+
+static GLboolean _glewInit_GL_ARB_vertex_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindBufferARB = (PFNGLBINDBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glBindBufferARB")) == NULL) || r;
+  r = ((glBufferDataARB = (PFNGLBUFFERDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferDataARB")) == NULL) || r;
+  r = ((glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferSubDataARB")) == NULL) || r;
+  r = ((glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffersARB")) == NULL) || r;
+  r = ((glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glGenBuffersARB")) == NULL) || r;
+  r = ((glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterivARB")) == NULL) || r;
+  r = ((glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointervARB")) == NULL) || r;
+  r = ((glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubDataARB")) == NULL) || r;
+  r = ((glIsBufferARB = (PFNGLISBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glIsBufferARB")) == NULL) || r;
+  r = ((glMapBufferARB = (PFNGLMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glMapBufferARB")) == NULL) || r;
+  r = ((glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glUnmapBufferARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifdef GL_ARB_vertex_program
+
+static GLboolean _glewInit_GL_ARB_vertex_program ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glBindProgramARB")) == NULL) || r;
+  r = ((glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsARB")) == NULL) || r;
+  r = ((glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArrayARB")) == NULL) || r;
+  r = ((glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArrayARB")) == NULL) || r;
+  r = ((glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsARB")) == NULL) || r;
+  r = ((glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterdvARB")) == NULL) || r;
+  r = ((glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterfvARB")) == NULL) || r;
+  r = ((glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterdvARB")) == NULL) || r;
+  r = ((glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterfvARB")) == NULL) || r;
+  r = ((glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringARB")) == NULL) || r;
+  r = ((glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivARB")) == NULL) || r;
+  r = ((glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervARB")) == NULL) || r;
+  r = ((glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvARB")) == NULL) || r;
+  r = ((glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvARB")) == NULL) || r;
+  r = ((glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivARB")) == NULL) || r;
+  r = ((glIsProgramARB = (PFNGLISPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glIsProgramARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dvARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fvARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dvARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fvARB")) == NULL) || r;
+  r = ((glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glProgramStringARB")) == NULL) || r;
+  r = ((glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dARB")) == NULL) || r;
+  r = ((glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvARB")) == NULL) || r;
+  r = ((glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fARB")) == NULL) || r;
+  r = ((glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvARB")) == NULL) || r;
+  r = ((glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sARB")) == NULL) || r;
+  r = ((glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svARB")) == NULL) || r;
+  r = ((glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dARB")) == NULL) || r;
+  r = ((glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvARB")) == NULL) || r;
+  r = ((glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fARB")) == NULL) || r;
+  r = ((glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvARB")) == NULL) || r;
+  r = ((glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sARB")) == NULL) || r;
+  r = ((glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svARB")) == NULL) || r;
+  r = ((glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dARB")) == NULL) || r;
+  r = ((glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvARB")) == NULL) || r;
+  r = ((glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fARB")) == NULL) || r;
+  r = ((glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvARB")) == NULL) || r;
+  r = ((glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sARB")) == NULL) || r;
+  r = ((glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svARB")) == NULL) || r;
+  r = ((glVertexAttrib4NbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NbvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NivARB = (PFNGLVERTEXATTRIB4NIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NivARB")) == NULL) || r;
+  r = ((glVertexAttrib4NsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NsvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NubARB = (PFNGLVERTEXATTRIB4NUBARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubARB")) == NULL) || r;
+  r = ((glVertexAttrib4NubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NuivARB")) == NULL) || r;
+  r = ((glVertexAttrib4NusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NusvARB")) == NULL) || r;
+  r = ((glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bvARB")) == NULL) || r;
+  r = ((glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dARB")) == NULL) || r;
+  r = ((glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvARB")) == NULL) || r;
+  r = ((glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fARB")) == NULL) || r;
+  r = ((glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvARB")) == NULL) || r;
+  r = ((glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ivARB")) == NULL) || r;
+  r = ((glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sARB")) == NULL) || r;
+  r = ((glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svARB")) == NULL) || r;
+  r = ((glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvARB")) == NULL) || r;
+  r = ((glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uivARB")) == NULL) || r;
+  r = ((glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usvARB")) == NULL) || r;
+  r = ((glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_program */
+
+#ifdef GL_ARB_vertex_shader
+
+static GLboolean _glewInit_GL_ARB_vertex_shader ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocationARB")) == NULL) || r;
+  r = ((glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttribARB")) == NULL) || r;
+  r = ((glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocationARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_shader */
+
+#ifdef GL_ARB_vertex_type_2_10_10_10_rev
+
+static GLboolean _glewInit_GL_ARB_vertex_type_2_10_10_10_rev ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorP3ui = (PFNGLCOLORP3UIPROC)glewGetProcAddress((const GLubyte*)"glColorP3ui")) == NULL) || r;
+  r = ((glColorP3uiv = (PFNGLCOLORP3UIVPROC)glewGetProcAddress((const GLubyte*)"glColorP3uiv")) == NULL) || r;
+  r = ((glColorP4ui = (PFNGLCOLORP4UIPROC)glewGetProcAddress((const GLubyte*)"glColorP4ui")) == NULL) || r;
+  r = ((glColorP4uiv = (PFNGLCOLORP4UIVPROC)glewGetProcAddress((const GLubyte*)"glColorP4uiv")) == NULL) || r;
+  r = ((glMultiTexCoordP1ui = (PFNGLMULTITEXCOORDP1UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP1ui")) == NULL) || r;
+  r = ((glMultiTexCoordP1uiv = (PFNGLMULTITEXCOORDP1UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP1uiv")) == NULL) || r;
+  r = ((glMultiTexCoordP2ui = (PFNGLMULTITEXCOORDP2UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP2ui")) == NULL) || r;
+  r = ((glMultiTexCoordP2uiv = (PFNGLMULTITEXCOORDP2UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP2uiv")) == NULL) || r;
+  r = ((glMultiTexCoordP3ui = (PFNGLMULTITEXCOORDP3UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP3ui")) == NULL) || r;
+  r = ((glMultiTexCoordP3uiv = (PFNGLMULTITEXCOORDP3UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP3uiv")) == NULL) || r;
+  r = ((glMultiTexCoordP4ui = (PFNGLMULTITEXCOORDP4UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP4ui")) == NULL) || r;
+  r = ((glMultiTexCoordP4uiv = (PFNGLMULTITEXCOORDP4UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP4uiv")) == NULL) || r;
+  r = ((glNormalP3ui = (PFNGLNORMALP3UIPROC)glewGetProcAddress((const GLubyte*)"glNormalP3ui")) == NULL) || r;
+  r = ((glNormalP3uiv = (PFNGLNORMALP3UIVPROC)glewGetProcAddress((const GLubyte*)"glNormalP3uiv")) == NULL) || r;
+  r = ((glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorP3ui")) == NULL) || r;
+  r = ((glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorP3uiv")) == NULL) || r;
+  r = ((glTexCoordP1ui = (PFNGLTEXCOORDP1UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP1ui")) == NULL) || r;
+  r = ((glTexCoordP1uiv = (PFNGLTEXCOORDP1UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP1uiv")) == NULL) || r;
+  r = ((glTexCoordP2ui = (PFNGLTEXCOORDP2UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP2ui")) == NULL) || r;
+  r = ((glTexCoordP2uiv = (PFNGLTEXCOORDP2UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP2uiv")) == NULL) || r;
+  r = ((glTexCoordP3ui = (PFNGLTEXCOORDP3UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP3ui")) == NULL) || r;
+  r = ((glTexCoordP3uiv = (PFNGLTEXCOORDP3UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP3uiv")) == NULL) || r;
+  r = ((glTexCoordP4ui = (PFNGLTEXCOORDP4UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP4ui")) == NULL) || r;
+  r = ((glTexCoordP4uiv = (PFNGLTEXCOORDP4UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP4uiv")) == NULL) || r;
+  r = ((glVertexAttribP1ui = (PFNGLVERTEXATTRIBP1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP1ui")) == NULL) || r;
+  r = ((glVertexAttribP1uiv = (PFNGLVERTEXATTRIBP1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP1uiv")) == NULL) || r;
+  r = ((glVertexAttribP2ui = (PFNGLVERTEXATTRIBP2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP2ui")) == NULL) || r;
+  r = ((glVertexAttribP2uiv = (PFNGLVERTEXATTRIBP2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP2uiv")) == NULL) || r;
+  r = ((glVertexAttribP3ui = (PFNGLVERTEXATTRIBP3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP3ui")) == NULL) || r;
+  r = ((glVertexAttribP3uiv = (PFNGLVERTEXATTRIBP3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP3uiv")) == NULL) || r;
+  r = ((glVertexAttribP4ui = (PFNGLVERTEXATTRIBP4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP4ui")) == NULL) || r;
+  r = ((glVertexAttribP4uiv = (PFNGLVERTEXATTRIBP4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP4uiv")) == NULL) || r;
+  r = ((glVertexP2ui = (PFNGLVERTEXP2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP2ui")) == NULL) || r;
+  r = ((glVertexP2uiv = (PFNGLVERTEXP2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP2uiv")) == NULL) || r;
+  r = ((glVertexP3ui = (PFNGLVERTEXP3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP3ui")) == NULL) || r;
+  r = ((glVertexP3uiv = (PFNGLVERTEXP3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP3uiv")) == NULL) || r;
+  r = ((glVertexP4ui = (PFNGLVERTEXP4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP4ui")) == NULL) || r;
+  r = ((glVertexP4uiv = (PFNGLVERTEXP4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP4uiv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+#ifdef GL_ARB_viewport_array
+
+static GLboolean _glewInit_GL_ARB_viewport_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDepthRangeArrayv = (PFNGLDEPTHRANGEARRAYVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeArrayv")) == NULL) || r;
+  r = ((glDepthRangeIndexed = (PFNGLDEPTHRANGEINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeIndexed")) == NULL) || r;
+  r = ((glGetDoublei_v = (PFNGLGETDOUBLEI_VPROC)glewGetProcAddress((const GLubyte*)"glGetDoublei_v")) == NULL) || r;
+  r = ((glGetFloati_v = (PFNGLGETFLOATI_VPROC)glewGetProcAddress((const GLubyte*)"glGetFloati_v")) == NULL) || r;
+  r = ((glScissorArrayv = (PFNGLSCISSORARRAYVPROC)glewGetProcAddress((const GLubyte*)"glScissorArrayv")) == NULL) || r;
+  r = ((glScissorIndexed = (PFNGLSCISSORINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexed")) == NULL) || r;
+  r = ((glScissorIndexedv = (PFNGLSCISSORINDEXEDVPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexedv")) == NULL) || r;
+  r = ((glViewportArrayv = (PFNGLVIEWPORTARRAYVPROC)glewGetProcAddress((const GLubyte*)"glViewportArrayv")) == NULL) || r;
+  r = ((glViewportIndexedf = (PFNGLVIEWPORTINDEXEDFPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedf")) == NULL) || r;
+  r = ((glViewportIndexedfv = (PFNGLVIEWPORTINDEXEDFVPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedfv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_viewport_array */
+
+#ifdef GL_ARB_window_pos
+
+static GLboolean _glewInit_GL_ARB_window_pos ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glWindowPos2dARB = (PFNGLWINDOWPOS2DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dARB")) == NULL) || r;
+  r = ((glWindowPos2dvARB = (PFNGLWINDOWPOS2DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvARB")) == NULL) || r;
+  r = ((glWindowPos2fARB = (PFNGLWINDOWPOS2FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fARB")) == NULL) || r;
+  r = ((glWindowPos2fvARB = (PFNGLWINDOWPOS2FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvARB")) == NULL) || r;
+  r = ((glWindowPos2iARB = (PFNGLWINDOWPOS2IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iARB")) == NULL) || r;
+  r = ((glWindowPos2ivARB = (PFNGLWINDOWPOS2IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivARB")) == NULL) || r;
+  r = ((glWindowPos2sARB = (PFNGLWINDOWPOS2SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sARB")) == NULL) || r;
+  r = ((glWindowPos2svARB = (PFNGLWINDOWPOS2SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svARB")) == NULL) || r;
+  r = ((glWindowPos3dARB = (PFNGLWINDOWPOS3DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dARB")) == NULL) || r;
+  r = ((glWindowPos3dvARB = (PFNGLWINDOWPOS3DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvARB")) == NULL) || r;
+  r = ((glWindowPos3fARB = (PFNGLWINDOWPOS3FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fARB")) == NULL) || r;
+  r = ((glWindowPos3fvARB = (PFNGLWINDOWPOS3FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvARB")) == NULL) || r;
+  r = ((glWindowPos3iARB = (PFNGLWINDOWPOS3IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iARB")) == NULL) || r;
+  r = ((glWindowPos3ivARB = (PFNGLWINDOWPOS3IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivARB")) == NULL) || r;
+  r = ((glWindowPos3sARB = (PFNGLWINDOWPOS3SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sARB")) == NULL) || r;
+  r = ((glWindowPos3svARB = (PFNGLWINDOWPOS3SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_window_pos */
+
+#ifdef GL_ATI_draw_buffers
+
+static GLboolean _glewInit_GL_ATI_draw_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_draw_buffers */
+
+#ifdef GL_ATI_element_array
+
+static GLboolean _glewInit_GL_ATI_element_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementArrayATI = (PFNGLDRAWELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayATI")) == NULL) || r;
+  r = ((glDrawRangeElementArrayATI = (PFNGLDRAWRANGEELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayATI")) == NULL) || r;
+  r = ((glElementPointerATI = (PFNGLELEMENTPOINTERATIPROC)glewGetProcAddress((const GLubyte*)"glElementPointerATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_element_array */
+
+#ifdef GL_ATI_envmap_bumpmap
+
+static GLboolean _glewInit_GL_ATI_envmap_bumpmap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexBumpParameterfvATI = (PFNGLGETTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterfvATI")) == NULL) || r;
+  r = ((glGetTexBumpParameterivATI = (PFNGLGETTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterivATI")) == NULL) || r;
+  r = ((glTexBumpParameterfvATI = (PFNGLTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterfvATI")) == NULL) || r;
+  r = ((glTexBumpParameterivATI = (PFNGLTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterivATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifdef GL_ATI_fragment_shader
+
+static GLboolean _glewInit_GL_ATI_fragment_shader ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAlphaFragmentOp1ATI = (PFNGLALPHAFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp1ATI")) == NULL) || r;
+  r = ((glAlphaFragmentOp2ATI = (PFNGLALPHAFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp2ATI")) == NULL) || r;
+  r = ((glAlphaFragmentOp3ATI = (PFNGLALPHAFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp3ATI")) == NULL) || r;
+  r = ((glBeginFragmentShaderATI = (PFNGLBEGINFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBeginFragmentShaderATI")) == NULL) || r;
+  r = ((glBindFragmentShaderATI = (PFNGLBINDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBindFragmentShaderATI")) == NULL) || r;
+  r = ((glColorFragmentOp1ATI = (PFNGLCOLORFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp1ATI")) == NULL) || r;
+  r = ((glColorFragmentOp2ATI = (PFNGLCOLORFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp2ATI")) == NULL) || r;
+  r = ((glColorFragmentOp3ATI = (PFNGLCOLORFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp3ATI")) == NULL) || r;
+  r = ((glDeleteFragmentShaderATI = (PFNGLDELETEFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glDeleteFragmentShaderATI")) == NULL) || r;
+  r = ((glEndFragmentShaderATI = (PFNGLENDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glEndFragmentShaderATI")) == NULL) || r;
+  r = ((glGenFragmentShadersATI = (PFNGLGENFRAGMENTSHADERSATIPROC)glewGetProcAddress((const GLubyte*)"glGenFragmentShadersATI")) == NULL) || r;
+  r = ((glPassTexCoordATI = (PFNGLPASSTEXCOORDATIPROC)glewGetProcAddress((const GLubyte*)"glPassTexCoordATI")) == NULL) || r;
+  r = ((glSampleMapATI = (PFNGLSAMPLEMAPATIPROC)glewGetProcAddress((const GLubyte*)"glSampleMapATI")) == NULL) || r;
+  r = ((glSetFragmentShaderConstantATI = (PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)glewGetProcAddress((const GLubyte*)"glSetFragmentShaderConstantATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_fragment_shader */
+
+#ifdef GL_ATI_map_object_buffer
+
+static GLboolean _glewInit_GL_ATI_map_object_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMapObjectBufferATI = (PFNGLMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glMapObjectBufferATI")) == NULL) || r;
+  r = ((glUnmapObjectBufferATI = (PFNGLUNMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUnmapObjectBufferATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_map_object_buffer */
+
+#ifdef GL_ATI_pn_triangles
+
+static GLboolean _glewInit_GL_ATI_pn_triangles ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPNTrianglesfATI = (PFNGLPNTRIANGLESFATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesfATI")) == NULL) || r;
+  r = ((glPNTrianglesiATI = (PFNGLPNTRIANGLESIATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesiATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_pn_triangles */
+
+#ifdef GL_ATI_separate_stencil
+
+static GLboolean _glewInit_GL_ATI_separate_stencil ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparateATI")) == NULL) || r;
+  r = ((glStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparateATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_separate_stencil */
+
+#ifdef GL_ATI_vertex_array_object
+
+static GLboolean _glewInit_GL_ATI_vertex_array_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glArrayObjectATI = (PFNGLARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glArrayObjectATI")) == NULL) || r;
+  r = ((glFreeObjectBufferATI = (PFNGLFREEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glFreeObjectBufferATI")) == NULL) || r;
+  r = ((glGetArrayObjectfvATI = (PFNGLGETARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetArrayObjectivATI = (PFNGLGETARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectivATI")) == NULL) || r;
+  r = ((glGetObjectBufferfvATI = (PFNGLGETOBJECTBUFFERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferfvATI")) == NULL) || r;
+  r = ((glGetObjectBufferivATI = (PFNGLGETOBJECTBUFFERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferivATI")) == NULL) || r;
+  r = ((glGetVariantArrayObjectfvATI = (PFNGLGETVARIANTARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetVariantArrayObjectivATI = (PFNGLGETVARIANTARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectivATI")) == NULL) || r;
+  r = ((glIsObjectBufferATI = (PFNGLISOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glIsObjectBufferATI")) == NULL) || r;
+  r = ((glNewObjectBufferATI = (PFNGLNEWOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glNewObjectBufferATI")) == NULL) || r;
+  r = ((glUpdateObjectBufferATI = (PFNGLUPDATEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUpdateObjectBufferATI")) == NULL) || r;
+  r = ((glVariantArrayObjectATI = (PFNGLVARIANTARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVariantArrayObjectATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_array_object */
+
+#ifdef GL_ATI_vertex_attrib_array_object
+
+static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVertexAttribArrayObjectfvATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetVertexAttribArrayObjectivATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectivATI")) == NULL) || r;
+  r = ((glVertexAttribArrayObjectATI = (PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribArrayObjectATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifdef GL_ATI_vertex_streams
+
+static GLboolean _glewInit_GL_ATI_vertex_streams ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClientActiveVertexStreamATI = (PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)glewGetProcAddress((const GLubyte*)"glClientActiveVertexStreamATI")) == NULL) || r;
+  r = ((glNormalStream3bATI = (PFNGLNORMALSTREAM3BATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bATI")) == NULL) || r;
+  r = ((glNormalStream3bvATI = (PFNGLNORMALSTREAM3BVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bvATI")) == NULL) || r;
+  r = ((glNormalStream3dATI = (PFNGLNORMALSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dATI")) == NULL) || r;
+  r = ((glNormalStream3dvATI = (PFNGLNORMALSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dvATI")) == NULL) || r;
+  r = ((glNormalStream3fATI = (PFNGLNORMALSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fATI")) == NULL) || r;
+  r = ((glNormalStream3fvATI = (PFNGLNORMALSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fvATI")) == NULL) || r;
+  r = ((glNormalStream3iATI = (PFNGLNORMALSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3iATI")) == NULL) || r;
+  r = ((glNormalStream3ivATI = (PFNGLNORMALSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3ivATI")) == NULL) || r;
+  r = ((glNormalStream3sATI = (PFNGLNORMALSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3sATI")) == NULL) || r;
+  r = ((glNormalStream3svATI = (PFNGLNORMALSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3svATI")) == NULL) || r;
+  r = ((glVertexBlendEnvfATI = (PFNGLVERTEXBLENDENVFATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnvfATI")) == NULL) || r;
+  r = ((glVertexBlendEnviATI = (PFNGLVERTEXBLENDENVIATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnviATI")) == NULL) || r;
+  r = ((glVertexStream1dATI = (PFNGLVERTEXSTREAM1DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1dATI")) == NULL) || r;
+  r = ((glVertexStream1dvATI = (PFNGLVERTEXSTREAM1DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1dvATI")) == NULL) || r;
+  r = ((glVertexStream1fATI = (PFNGLVERTEXSTREAM1FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1fATI")) == NULL) || r;
+  r = ((glVertexStream1fvATI = (PFNGLVERTEXSTREAM1FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1fvATI")) == NULL) || r;
+  r = ((glVertexStream1iATI = (PFNGLVERTEXSTREAM1IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1iATI")) == NULL) || r;
+  r = ((glVertexStream1ivATI = (PFNGLVERTEXSTREAM1IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1ivATI")) == NULL) || r;
+  r = ((glVertexStream1sATI = (PFNGLVERTEXSTREAM1SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1sATI")) == NULL) || r;
+  r = ((glVertexStream1svATI = (PFNGLVERTEXSTREAM1SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1svATI")) == NULL) || r;
+  r = ((glVertexStream2dATI = (PFNGLVERTEXSTREAM2DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dATI")) == NULL) || r;
+  r = ((glVertexStream2dvATI = (PFNGLVERTEXSTREAM2DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dvATI")) == NULL) || r;
+  r = ((glVertexStream2fATI = (PFNGLVERTEXSTREAM2FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fATI")) == NULL) || r;
+  r = ((glVertexStream2fvATI = (PFNGLVERTEXSTREAM2FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fvATI")) == NULL) || r;
+  r = ((glVertexStream2iATI = (PFNGLVERTEXSTREAM2IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2iATI")) == NULL) || r;
+  r = ((glVertexStream2ivATI = (PFNGLVERTEXSTREAM2IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2ivATI")) == NULL) || r;
+  r = ((glVertexStream2sATI = (PFNGLVERTEXSTREAM2SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2sATI")) == NULL) || r;
+  r = ((glVertexStream2svATI = (PFNGLVERTEXSTREAM2SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2svATI")) == NULL) || r;
+  r = ((glVertexStream3dATI = (PFNGLVERTEXSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dATI")) == NULL) || r;
+  r = ((glVertexStream3dvATI = (PFNGLVERTEXSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dvATI")) == NULL) || r;
+  r = ((glVertexStream3fATI = (PFNGLVERTEXSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fATI")) == NULL) || r;
+  r = ((glVertexStream3fvATI = (PFNGLVERTEXSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fvATI")) == NULL) || r;
+  r = ((glVertexStream3iATI = (PFNGLVERTEXSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3iATI")) == NULL) || r;
+  r = ((glVertexStream3ivATI = (PFNGLVERTEXSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3ivATI")) == NULL) || r;
+  r = ((glVertexStream3sATI = (PFNGLVERTEXSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3sATI")) == NULL) || r;
+  r = ((glVertexStream3svATI = (PFNGLVERTEXSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3svATI")) == NULL) || r;
+  r = ((glVertexStream4dATI = (PFNGLVERTEXSTREAM4DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dATI")) == NULL) || r;
+  r = ((glVertexStream4dvATI = (PFNGLVERTEXSTREAM4DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dvATI")) == NULL) || r;
+  r = ((glVertexStream4fATI = (PFNGLVERTEXSTREAM4FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fATI")) == NULL) || r;
+  r = ((glVertexStream4fvATI = (PFNGLVERTEXSTREAM4FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fvATI")) == NULL) || r;
+  r = ((glVertexStream4iATI = (PFNGLVERTEXSTREAM4IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4iATI")) == NULL) || r;
+  r = ((glVertexStream4ivATI = (PFNGLVERTEXSTREAM4IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4ivATI")) == NULL) || r;
+  r = ((glVertexStream4sATI = (PFNGLVERTEXSTREAM4SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4sATI")) == NULL) || r;
+  r = ((glVertexStream4svATI = (PFNGLVERTEXSTREAM4SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4svATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_streams */
+
+#ifdef GL_EXT_base_instance
+
+static GLboolean _glewInit_GL_EXT_base_instance ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedBaseInstanceEXT = (PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedBaseInstanceEXT")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseInstanceEXT = (PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseInstanceEXT")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseVertexBaseInstanceEXT = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertexBaseInstanceEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_base_instance */
+
+#ifdef GL_EXT_bindable_uniform
+
+static GLboolean _glewInit_GL_EXT_bindable_uniform ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetUniformBufferSizeEXT = (PFNGLGETUNIFORMBUFFERSIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBufferSizeEXT")) == NULL) || r;
+  r = ((glGetUniformOffsetEXT = (PFNGLGETUNIFORMOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformOffsetEXT")) == NULL) || r;
+  r = ((glUniformBufferEXT = (PFNGLUNIFORMBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUniformBufferEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_bindable_uniform */
+
+#ifdef GL_EXT_blend_color
+
+static GLboolean _glewInit_GL_EXT_blend_color ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendColorEXT = (PFNGLBLENDCOLOREXTPROC)glewGetProcAddress((const GLubyte*)"glBlendColorEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_color */
+
+#ifdef GL_EXT_blend_equation_separate
+
+static GLboolean _glewInit_GL_EXT_blend_equation_separate ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifdef GL_EXT_blend_func_extended
+
+static GLboolean _glewInit_GL_EXT_blend_func_extended ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFragDataLocationIndexedEXT = (PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationIndexedEXT")) == NULL) || r;
+  r = ((glGetFragDataIndexEXT = (PFNGLGETFRAGDATAINDEXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataIndexEXT")) == NULL) || r;
+  r = ((glGetProgramResourceLocationIndexEXT = (PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceLocationIndexEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_func_extended */
+
+#ifdef GL_EXT_blend_func_separate
+
+static GLboolean _glewInit_GL_EXT_blend_func_separate ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_func_separate */
+
+#ifdef GL_EXT_blend_minmax
+
+static GLboolean _glewInit_GL_EXT_blend_minmax ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_minmax */
+
+#ifdef GL_EXT_buffer_storage
+
+static GLboolean _glewInit_GL_EXT_buffer_storage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferStorageEXT = (PFNGLBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferStorageEXT")) == NULL) || r;
+  r = ((glNamedBufferStorageEXT = (PFNGLNAMEDBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferStorageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_buffer_storage */
+
+#ifdef GL_EXT_clear_texture
+
+static GLboolean _glewInit_GL_EXT_clear_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearTexImageEXT = (PFNGLCLEARTEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glClearTexImageEXT")) == NULL) || r;
+  r = ((glClearTexSubImageEXT = (PFNGLCLEARTEXSUBIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glClearTexSubImageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_clear_texture */
+
+#ifdef GL_EXT_color_subtable
+
+static GLboolean _glewInit_GL_EXT_color_subtable ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorSubTableEXT = (PFNGLCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorSubTableEXT")) == NULL) || r;
+  r = ((glCopyColorSubTableEXT = (PFNGLCOPYCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTableEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_color_subtable */
+
+#ifdef GL_EXT_compiled_vertex_array
+
+static GLboolean _glewInit_GL_EXT_compiled_vertex_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLockArraysEXT = (PFNGLLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glLockArraysEXT")) == NULL) || r;
+  r = ((glUnlockArraysEXT = (PFNGLUNLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glUnlockArraysEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifdef GL_EXT_convolution
+
+static GLboolean _glewInit_GL_EXT_convolution ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glConvolutionFilter1DEXT = (PFNGLCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1DEXT")) == NULL) || r;
+  r = ((glConvolutionFilter2DEXT = (PFNGLCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2DEXT")) == NULL) || r;
+  r = ((glConvolutionParameterfEXT = (PFNGLCONVOLUTIONPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfEXT")) == NULL) || r;
+  r = ((glConvolutionParameterfvEXT = (PFNGLCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfvEXT")) == NULL) || r;
+  r = ((glConvolutionParameteriEXT = (PFNGLCONVOLUTIONPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriEXT")) == NULL) || r;
+  r = ((glConvolutionParameterivEXT = (PFNGLCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterivEXT")) == NULL) || r;
+  r = ((glCopyConvolutionFilter1DEXT = (PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1DEXT")) == NULL) || r;
+  r = ((glCopyConvolutionFilter2DEXT = (PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2DEXT")) == NULL) || r;
+  r = ((glGetConvolutionFilterEXT = (PFNGLGETCONVOLUTIONFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilterEXT")) == NULL) || r;
+  r = ((glGetConvolutionParameterfvEXT = (PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfvEXT")) == NULL) || r;
+  r = ((glGetConvolutionParameterivEXT = (PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterivEXT")) == NULL) || r;
+  r = ((glGetSeparableFilterEXT = (PFNGLGETSEPARABLEFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilterEXT")) == NULL) || r;
+  r = ((glSeparableFilter2DEXT = (PFNGLSEPARABLEFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_convolution */
+
+#ifdef GL_EXT_coordinate_frame
+
+static GLboolean _glewInit_GL_EXT_coordinate_frame ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBinormalPointerEXT = (PFNGLBINORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glBinormalPointerEXT")) == NULL) || r;
+  r = ((glTangentPointerEXT = (PFNGLTANGENTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTangentPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_coordinate_frame */
+
+#ifdef GL_EXT_copy_image
+
+static GLboolean _glewInit_GL_EXT_copy_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyImageSubDataEXT = (PFNGLCOPYIMAGESUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyImageSubDataEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_copy_image */
+
+#ifdef GL_EXT_copy_texture
+
+static GLboolean _glewInit_GL_EXT_copy_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyTexImage1DEXT = (PFNGLCOPYTEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage1DEXT")) == NULL) || r;
+  r = ((glCopyTexImage2DEXT = (PFNGLCOPYTEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage2DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage1DEXT = (PFNGLCOPYTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage1DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage2DEXT = (PFNGLCOPYTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage2DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage3DEXT = (PFNGLCOPYTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_copy_texture */
+
+#ifdef GL_EXT_cull_vertex
+
+static GLboolean _glewInit_GL_EXT_cull_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCullParameterdvEXT = (PFNGLCULLPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterdvEXT")) == NULL) || r;
+  r = ((glCullParameterfvEXT = (PFNGLCULLPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_cull_vertex */
+
+#ifdef GL_EXT_debug_label
+
+static GLboolean _glewInit_GL_EXT_debug_label ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetObjectLabelEXT = (PFNGLGETOBJECTLABELEXTPROC)glewGetProcAddress((const GLubyte*)"glGetObjectLabelEXT")) == NULL) || r;
+  r = ((glLabelObjectEXT = (PFNGLLABELOBJECTEXTPROC)glewGetProcAddress((const GLubyte*)"glLabelObjectEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_debug_label */
+
+#ifdef GL_EXT_debug_marker
+
+static GLboolean _glewInit_GL_EXT_debug_marker ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glInsertEventMarkerEXT = (PFNGLINSERTEVENTMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glInsertEventMarkerEXT")) == NULL) || r;
+  r = ((glPopGroupMarkerEXT = (PFNGLPOPGROUPMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glPopGroupMarkerEXT")) == NULL) || r;
+  r = ((glPushGroupMarkerEXT = (PFNGLPUSHGROUPMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glPushGroupMarkerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_debug_marker */
+
+#ifdef GL_EXT_depth_bounds_test
+
+static GLboolean _glewInit_GL_EXT_depth_bounds_test ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDepthBoundsEXT = (PFNGLDEPTHBOUNDSEXTPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifdef GL_EXT_direct_state_access
+
+static GLboolean _glewInit_GL_EXT_direct_state_access ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindMultiTextureEXT = (PFNGLBINDMULTITEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindMultiTextureEXT")) == NULL) || r;
+  r = ((glCheckNamedFramebufferStatusEXT = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckNamedFramebufferStatusEXT")) == NULL) || r;
+  r = ((glClientAttribDefaultEXT = (PFNGLCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glClientAttribDefaultEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexImage1DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage1DEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexImage2DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage2DEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexImage3DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage3DEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexSubImage1DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage1DEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexSubImage2DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage2DEXT")) == NULL) || r;
+  r = ((glCompressedMultiTexSubImage3DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage3DEXT")) == NULL) || r;
+  r = ((glCompressedTextureImage1DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage1DEXT")) == NULL) || r;
+  r = ((glCompressedTextureImage2DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage2DEXT")) == NULL) || r;
+  r = ((glCompressedTextureImage3DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage3DEXT")) == NULL) || r;
+  r = ((glCompressedTextureSubImage1DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage1DEXT")) == NULL) || r;
+  r = ((glCompressedTextureSubImage2DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage2DEXT")) == NULL) || r;
+  r = ((glCompressedTextureSubImage3DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage3DEXT")) == NULL) || r;
+  r = ((glCopyMultiTexImage1DEXT = (PFNGLCOPYMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage1DEXT")) == NULL) || r;
+  r = ((glCopyMultiTexImage2DEXT = (PFNGLCOPYMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage2DEXT")) == NULL) || r;
+  r = ((glCopyMultiTexSubImage1DEXT = (PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage1DEXT")) == NULL) || r;
+  r = ((glCopyMultiTexSubImage2DEXT = (PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage2DEXT")) == NULL) || r;
+  r = ((glCopyMultiTexSubImage3DEXT = (PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage3DEXT")) == NULL) || r;
+  r = ((glCopyTextureImage1DEXT = (PFNGLCOPYTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage1DEXT")) == NULL) || r;
+  r = ((glCopyTextureImage2DEXT = (PFNGLCOPYTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage2DEXT")) == NULL) || r;
+  r = ((glCopyTextureSubImage1DEXT = (PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage1DEXT")) == NULL) || r;
+  r = ((glCopyTextureSubImage2DEXT = (PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage2DEXT")) == NULL) || r;
+  r = ((glCopyTextureSubImage3DEXT = (PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage3DEXT")) == NULL) || r;
+  r = ((glDisableClientStateIndexedEXT = (PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateIndexedEXT")) == NULL) || r;
+  r = ((glDisableClientStateiEXT = (PFNGLDISABLECLIENTSTATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateiEXT")) == NULL) || r;
+  r = ((glDisableVertexArrayAttribEXT = (PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexArrayAttribEXT")) == NULL) || r;
+  r = ((glDisableVertexArrayEXT = (PFNGLDISABLEVERTEXARRAYEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexArrayEXT")) == NULL) || r;
+  r = ((glEnableClientStateIndexedEXT = (PFNGLENABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateIndexedEXT")) == NULL) || r;
+  r = ((glEnableClientStateiEXT = (PFNGLENABLECLIENTSTATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateiEXT")) == NULL) || r;
+  r = ((glEnableVertexArrayAttribEXT = (PFNGLENABLEVERTEXARRAYATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexArrayAttribEXT")) == NULL) || r;
+  r = ((glEnableVertexArrayEXT = (PFNGLENABLEVERTEXARRAYEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexArrayEXT")) == NULL) || r;
+  r = ((glFlushMappedNamedBufferRangeEXT = (PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedNamedBufferRangeEXT")) == NULL) || r;
+  r = ((glFramebufferDrawBufferEXT = (PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBufferEXT")) == NULL) || r;
+  r = ((glFramebufferDrawBuffersEXT = (PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBuffersEXT")) == NULL) || r;
+  r = ((glFramebufferReadBufferEXT = (PFNGLFRAMEBUFFERREADBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferReadBufferEXT")) == NULL) || r;
+  r = ((glGenerateMultiTexMipmapEXT = (PFNGLGENERATEMULTITEXMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMultiTexMipmapEXT")) == NULL) || r;
+  r = ((glGenerateTextureMipmapEXT = (PFNGLGENERATETEXTUREMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateTextureMipmapEXT")) == NULL) || r;
+  r = ((glGetCompressedMultiTexImageEXT = (PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedMultiTexImageEXT")) == NULL) || r;
+  r = ((glGetCompressedTextureImageEXT = (PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureImageEXT")) == NULL) || r;
+  r = ((glGetDoubleIndexedvEXT = (PFNGLGETDOUBLEINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoubleIndexedvEXT")) == NULL) || r;
+  r = ((glGetDoublei_vEXT = (PFNGLGETDOUBLEI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoublei_vEXT")) == NULL) || r;
+  r = ((glGetFloatIndexedvEXT = (PFNGLGETFLOATINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloatIndexedvEXT")) == NULL) || r;
+  r = ((glGetFloati_vEXT = (PFNGLGETFLOATI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloati_vEXT")) == NULL) || r;
+  r = ((glGetFramebufferParameterivEXT = (PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameterivEXT")) == NULL) || r;
+  r = ((glGetMultiTexEnvfvEXT = (PFNGLGETMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvfvEXT")) == NULL) || r;
+  r = ((glGetMultiTexEnvivEXT = (PFNGLGETMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvivEXT")) == NULL) || r;
+  r = ((glGetMultiTexGendvEXT = (PFNGLGETMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGendvEXT")) == NULL) || r;
+  r = ((glGetMultiTexGenfvEXT = (PFNGLGETMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenfvEXT")) == NULL) || r;
+  r = ((glGetMultiTexGenivEXT = (PFNGLGETMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenivEXT")) == NULL) || r;
+  r = ((glGetMultiTexImageEXT = (PFNGLGETMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexImageEXT")) == NULL) || r;
+  r = ((glGetMultiTexLevelParameterfvEXT = (PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterfvEXT")) == NULL) || r;
+  r = ((glGetMultiTexLevelParameterivEXT = (PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterivEXT")) == NULL) || r;
+  r = ((glGetMultiTexParameterIivEXT = (PFNGLGETMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIivEXT")) == NULL) || r;
+  r = ((glGetMultiTexParameterIuivEXT = (PFNGLGETMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIuivEXT")) == NULL) || r;
+  r = ((glGetMultiTexParameterfvEXT = (PFNGLGETMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterfvEXT")) == NULL) || r;
+  r = ((glGetMultiTexParameterivEXT = (PFNGLGETMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterivEXT")) == NULL) || r;
+  r = ((glGetNamedBufferParameterivEXT = (PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterivEXT")) == NULL) || r;
+  r = ((glGetNamedBufferPointervEXT = (PFNGLGETNAMEDBUFFERPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferPointervEXT")) == NULL) || r;
+  r = ((glGetNamedBufferSubDataEXT = (PFNGLGETNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferSubDataEXT")) == NULL) || r;
+  r = ((glGetNamedFramebufferAttachmentParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferAttachmentParameterivEXT")) == NULL) || r;
+  r = ((glGetNamedProgramLocalParameterIivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIivEXT")) == NULL) || r;
+  r = ((glGetNamedProgramLocalParameterIuivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIuivEXT")) == NULL) || r;
+  r = ((glGetNamedProgramLocalParameterdvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterdvEXT")) == NULL) || r;
+  r = ((glGetNamedProgramLocalParameterfvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterfvEXT")) == NULL) || r;
+  r = ((glGetNamedProgramStringEXT = (PFNGLGETNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramStringEXT")) == NULL) || r;
+  r = ((glGetNamedProgramivEXT = (PFNGLGETNAMEDPROGRAMIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramivEXT")) == NULL) || r;
+  r = ((glGetNamedRenderbufferParameterivEXT = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedRenderbufferParameterivEXT")) == NULL) || r;
+  r = ((glGetPointerIndexedvEXT = (PFNGLGETPOINTERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointerIndexedvEXT")) == NULL) || r;
+  r = ((glGetPointeri_vEXT = (PFNGLGETPOINTERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointeri_vEXT")) == NULL) || r;
+  r = ((glGetTextureImageEXT = (PFNGLGETTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureImageEXT")) == NULL) || r;
+  r = ((glGetTextureLevelParameterfvEXT = (PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterfvEXT")) == NULL) || r;
+  r = ((glGetTextureLevelParameterivEXT = (PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterivEXT")) == NULL) || r;
+  r = ((glGetTextureParameterIivEXT = (PFNGLGETTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIivEXT")) == NULL) || r;
+  r = ((glGetTextureParameterIuivEXT = (PFNGLGETTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIuivEXT")) == NULL) || r;
+  r = ((glGetTextureParameterfvEXT = (PFNGLGETTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterfvEXT")) == NULL) || r;
+  r = ((glGetTextureParameterivEXT = (PFNGLGETTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterivEXT")) == NULL) || r;
+  r = ((glGetVertexArrayIntegeri_vEXT = (PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIntegeri_vEXT")) == NULL) || r;
+  r = ((glGetVertexArrayIntegervEXT = (PFNGLGETVERTEXARRAYINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIntegervEXT")) == NULL) || r;
+  r = ((glGetVertexArrayPointeri_vEXT = (PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayPointeri_vEXT")) == NULL) || r;
+  r = ((glGetVertexArrayPointervEXT = (PFNGLGETVERTEXARRAYPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayPointervEXT")) == NULL) || r;
+  r = ((glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferEXT")) == NULL) || r;
+  r = ((glMapNamedBufferRangeEXT = (PFNGLMAPNAMEDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferRangeEXT")) == NULL) || r;
+  r = ((glMatrixFrustumEXT = (PFNGLMATRIXFRUSTUMEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixFrustumEXT")) == NULL) || r;
+  r = ((glMatrixLoadIdentityEXT = (PFNGLMATRIXLOADIDENTITYEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadIdentityEXT")) == NULL) || r;
+  r = ((glMatrixLoadTransposedEXT = (PFNGLMATRIXLOADTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposedEXT")) == NULL) || r;
+  r = ((glMatrixLoadTransposefEXT = (PFNGLMATRIXLOADTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposefEXT")) == NULL) || r;
+  r = ((glMatrixLoaddEXT = (PFNGLMATRIXLOADDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoaddEXT")) == NULL) || r;
+  r = ((glMatrixLoadfEXT = (PFNGLMATRIXLOADFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadfEXT")) == NULL) || r;
+  r = ((glMatrixMultTransposedEXT = (PFNGLMATRIXMULTTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposedEXT")) == NULL) || r;
+  r = ((glMatrixMultTransposefEXT = (PFNGLMATRIXMULTTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposefEXT")) == NULL) || r;
+  r = ((glMatrixMultdEXT = (PFNGLMATRIXMULTDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultdEXT")) == NULL) || r;
+  r = ((glMatrixMultfEXT = (PFNGLMATRIXMULTFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultfEXT")) == NULL) || r;
+  r = ((glMatrixOrthoEXT = (PFNGLMATRIXORTHOEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixOrthoEXT")) == NULL) || r;
+  r = ((glMatrixPopEXT = (PFNGLMATRIXPOPEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPopEXT")) == NULL) || r;
+  r = ((glMatrixPushEXT = (PFNGLMATRIXPUSHEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPushEXT")) == NULL) || r;
+  r = ((glMatrixRotatedEXT = (PFNGLMATRIXROTATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatedEXT")) == NULL) || r;
+  r = ((glMatrixRotatefEXT = (PFNGLMATRIXROTATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatefEXT")) == NULL) || r;
+  r = ((glMatrixScaledEXT = (PFNGLMATRIXSCALEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScaledEXT")) == NULL) || r;
+  r = ((glMatrixScalefEXT = (PFNGLMATRIXSCALEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScalefEXT")) == NULL) || r;
+  r = ((glMatrixTranslatedEXT = (PFNGLMATRIXTRANSLATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatedEXT")) == NULL) || r;
+  r = ((glMatrixTranslatefEXT = (PFNGLMATRIXTRANSLATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatefEXT")) == NULL) || r;
+  r = ((glMultiTexBufferEXT = (PFNGLMULTITEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexBufferEXT")) == NULL) || r;
+  r = ((glMultiTexCoordPointerEXT = (PFNGLMULTITEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordPointerEXT")) == NULL) || r;
+  r = ((glMultiTexEnvfEXT = (PFNGLMULTITEXENVFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfEXT")) == NULL) || r;
+  r = ((glMultiTexEnvfvEXT = (PFNGLMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfvEXT")) == NULL) || r;
+  r = ((glMultiTexEnviEXT = (PFNGLMULTITEXENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnviEXT")) == NULL) || r;
+  r = ((glMultiTexEnvivEXT = (PFNGLMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvivEXT")) == NULL) || r;
+  r = ((glMultiTexGendEXT = (PFNGLMULTITEXGENDEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendEXT")) == NULL) || r;
+  r = ((glMultiTexGendvEXT = (PFNGLMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendvEXT")) == NULL) || r;
+  r = ((glMultiTexGenfEXT = (PFNGLMULTITEXGENFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfEXT")) == NULL) || r;
+  r = ((glMultiTexGenfvEXT = (PFNGLMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfvEXT")) == NULL) || r;
+  r = ((glMultiTexGeniEXT = (PFNGLMULTITEXGENIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGeniEXT")) == NULL) || r;
+  r = ((glMultiTexGenivEXT = (PFNGLMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenivEXT")) == NULL) || r;
+  r = ((glMultiTexImage1DEXT = (PFNGLMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage1DEXT")) == NULL) || r;
+  r = ((glMultiTexImage2DEXT = (PFNGLMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage2DEXT")) == NULL) || r;
+  r = ((glMultiTexImage3DEXT = (PFNGLMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage3DEXT")) == NULL) || r;
+  r = ((glMultiTexParameterIivEXT = (PFNGLMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIivEXT")) == NULL) || r;
+  r = ((glMultiTexParameterIuivEXT = (PFNGLMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIuivEXT")) == NULL) || r;
+  r = ((glMultiTexParameterfEXT = (PFNGLMULTITEXPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfEXT")) == NULL) || r;
+  r = ((glMultiTexParameterfvEXT = (PFNGLMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfvEXT")) == NULL) || r;
+  r = ((glMultiTexParameteriEXT = (PFNGLMULTITEXPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameteriEXT")) == NULL) || r;
+  r = ((glMultiTexParameterivEXT = (PFNGLMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterivEXT")) == NULL) || r;
+  r = ((glMultiTexRenderbufferEXT = (PFNGLMULTITEXRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexRenderbufferEXT")) == NULL) || r;
+  r = ((glMultiTexSubImage1DEXT = (PFNGLMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage1DEXT")) == NULL) || r;
+  r = ((glMultiTexSubImage2DEXT = (PFNGLMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage2DEXT")) == NULL) || r;
+  r = ((glMultiTexSubImage3DEXT = (PFNGLMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage3DEXT")) == NULL) || r;
+  r = ((glNamedBufferDataEXT = (PFNGLNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferDataEXT")) == NULL) || r;
+  r = ((glNamedBufferSubDataEXT = (PFNGLNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferSubDataEXT")) == NULL) || r;
+  r = ((glNamedCopyBufferSubDataEXT = (PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedCopyBufferSubDataEXT")) == NULL) || r;
+  r = ((glNamedFramebufferRenderbufferEXT = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferRenderbufferEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTexture1DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture1DEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTexture2DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture2DEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTexture3DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture3DEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTextureEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTextureFaceEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureFaceEXT")) == NULL) || r;
+  r = ((glNamedFramebufferTextureLayerEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureLayerEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameter4dEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameter4dvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dvEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameter4fEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameter4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fvEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameterI4iEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4iEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameterI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4ivEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameterI4uiEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uiEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameterI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uivEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParameters4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameters4fvEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParametersI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4ivEXT")) == NULL) || r;
+  r = ((glNamedProgramLocalParametersI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4uivEXT")) == NULL) || r;
+  r = ((glNamedProgramStringEXT = (PFNGLNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramStringEXT")) == NULL) || r;
+  r = ((glNamedRenderbufferStorageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageEXT")) == NULL) || r;
+  r = ((glNamedRenderbufferStorageMultisampleCoverageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleCoverageEXT")) == NULL) || r;
+  r = ((glNamedRenderbufferStorageMultisampleEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleEXT")) == NULL) || r;
+  r = ((glProgramUniform1fEXT = (PFNGLPROGRAMUNIFORM1FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fEXT")) == NULL) || r;
+  r = ((glProgramUniform1fvEXT = (PFNGLPROGRAMUNIFORM1FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fvEXT")) == NULL) || r;
+  r = ((glProgramUniform1iEXT = (PFNGLPROGRAMUNIFORM1IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iEXT")) == NULL) || r;
+  r = ((glProgramUniform1ivEXT = (PFNGLPROGRAMUNIFORM1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ivEXT")) == NULL) || r;
+  r = ((glProgramUniform1uiEXT = (PFNGLPROGRAMUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiEXT")) == NULL) || r;
+  r = ((glProgramUniform1uivEXT = (PFNGLPROGRAMUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uivEXT")) == NULL) || r;
+  r = ((glProgramUniform2fEXT = (PFNGLPROGRAMUNIFORM2FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fEXT")) == NULL) || r;
+  r = ((glProgramUniform2fvEXT = (PFNGLPROGRAMUNIFORM2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fvEXT")) == NULL) || r;
+  r = ((glProgramUniform2iEXT = (PFNGLPROGRAMUNIFORM2IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iEXT")) == NULL) || r;
+  r = ((glProgramUniform2ivEXT = (PFNGLPROGRAMUNIFORM2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ivEXT")) == NULL) || r;
+  r = ((glProgramUniform2uiEXT = (PFNGLPROGRAMUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiEXT")) == NULL) || r;
+  r = ((glProgramUniform2uivEXT = (PFNGLPROGRAMUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uivEXT")) == NULL) || r;
+  r = ((glProgramUniform3fEXT = (PFNGLPROGRAMUNIFORM3FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fEXT")) == NULL) || r;
+  r = ((glProgramUniform3fvEXT = (PFNGLPROGRAMUNIFORM3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fvEXT")) == NULL) || r;
+  r = ((glProgramUniform3iEXT = (PFNGLPROGRAMUNIFORM3IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iEXT")) == NULL) || r;
+  r = ((glProgramUniform3ivEXT = (PFNGLPROGRAMUNIFORM3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ivEXT")) == NULL) || r;
+  r = ((glProgramUniform3uiEXT = (PFNGLPROGRAMUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiEXT")) == NULL) || r;
+  r = ((glProgramUniform3uivEXT = (PFNGLPROGRAMUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uivEXT")) == NULL) || r;
+  r = ((glProgramUniform4fEXT = (PFNGLPROGRAMUNIFORM4FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fEXT")) == NULL) || r;
+  r = ((glProgramUniform4fvEXT = (PFNGLPROGRAMUNIFORM4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fvEXT")) == NULL) || r;
+  r = ((glProgramUniform4iEXT = (PFNGLPROGRAMUNIFORM4IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iEXT")) == NULL) || r;
+  r = ((glProgramUniform4ivEXT = (PFNGLPROGRAMUNIFORM4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ivEXT")) == NULL) || r;
+  r = ((glProgramUniform4uiEXT = (PFNGLPROGRAMUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiEXT")) == NULL) || r;
+  r = ((glProgramUniform4uivEXT = (PFNGLPROGRAMUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uivEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix2x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix3x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fvEXT")) == NULL) || r;
+  r = ((glProgramUniformMatrix4x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fvEXT")) == NULL) || r;
+  r = ((glPushClientAttribDefaultEXT = (PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glPushClientAttribDefaultEXT")) == NULL) || r;
+  r = ((glTextureBufferEXT = (PFNGLTEXTUREBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferEXT")) == NULL) || r;
+  r = ((glTextureImage1DEXT = (PFNGLTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage1DEXT")) == NULL) || r;
+  r = ((glTextureImage2DEXT = (PFNGLTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DEXT")) == NULL) || r;
+  r = ((glTextureImage3DEXT = (PFNGLTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DEXT")) == NULL) || r;
+  r = ((glTextureParameterIivEXT = (PFNGLTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIivEXT")) == NULL) || r;
+  r = ((glTextureParameterIuivEXT = (PFNGLTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIuivEXT")) == NULL) || r;
+  r = ((glTextureParameterfEXT = (PFNGLTEXTUREPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfEXT")) == NULL) || r;
+  r = ((glTextureParameterfvEXT = (PFNGLTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfvEXT")) == NULL) || r;
+  r = ((glTextureParameteriEXT = (PFNGLTEXTUREPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteriEXT")) == NULL) || r;
+  r = ((glTextureParameterivEXT = (PFNGLTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterivEXT")) == NULL) || r;
+  r = ((glTextureRenderbufferEXT = (PFNGLTEXTURERENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureRenderbufferEXT")) == NULL) || r;
+  r = ((glTextureSubImage1DEXT = (PFNGLTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage1DEXT")) == NULL) || r;
+  r = ((glTextureSubImage2DEXT = (PFNGLTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage2DEXT")) == NULL) || r;
+  r = ((glTextureSubImage3DEXT = (PFNGLTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage3DEXT")) == NULL) || r;
+  r = ((glUnmapNamedBufferEXT = (PFNGLUNMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUnmapNamedBufferEXT")) == NULL) || r;
+  r = ((glVertexArrayColorOffsetEXT = (PFNGLVERTEXARRAYCOLOROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayColorOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayEdgeFlagOffsetEXT = (PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayEdgeFlagOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayFogCoordOffsetEXT = (PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayFogCoordOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayIndexOffsetEXT = (PFNGLVERTEXARRAYINDEXOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayIndexOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayMultiTexCoordOffsetEXT = (PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayMultiTexCoordOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayNormalOffsetEXT = (PFNGLVERTEXARRAYNORMALOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayNormalOffsetEXT")) == NULL) || r;
+  r = ((glVertexArraySecondaryColorOffsetEXT = (PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArraySecondaryColorOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayTexCoordOffsetEXT = (PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayTexCoordOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribDivisorEXT = (PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribDivisorEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribIOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribIOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribOffsetEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexOffsetEXT = (PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexOffsetEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_direct_state_access */
+
+#ifdef GL_EXT_discard_framebuffer
+
+static GLboolean _glewInit_GL_EXT_discard_framebuffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDiscardFramebufferEXT = (PFNGLDISCARDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glDiscardFramebufferEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_discard_framebuffer */
+
+#ifdef GL_EXT_draw_buffers
+
+static GLboolean _glewInit_GL_EXT_draw_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersEXT = (PFNGLDRAWBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_buffers */
+
+#ifdef GL_EXT_draw_buffers2
+
+static GLboolean _glewInit_GL_EXT_draw_buffers2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorMaskIndexedEXT = (PFNGLCOLORMASKINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glColorMaskIndexedEXT")) == NULL) || r;
+  r = ((glDisableIndexedEXT = (PFNGLDISABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableIndexedEXT")) == NULL) || r;
+  r = ((glEnableIndexedEXT = (PFNGLENABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableIndexedEXT")) == NULL) || r;
+  r = ((glGetBooleanIndexedvEXT = (PFNGLGETBOOLEANINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetBooleanIndexedvEXT")) == NULL) || r;
+  r = ((glGetIntegerIndexedvEXT = (PFNGLGETINTEGERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerIndexedvEXT")) == NULL) || r;
+  r = ((glIsEnabledIndexedEXT = (PFNGLISENABLEDINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledIndexedEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_buffers2 */
+
+#ifdef GL_EXT_draw_buffers_indexed
+
+static GLboolean _glewInit_GL_EXT_draw_buffers_indexed ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationSeparateiEXT = (PFNGLBLENDEQUATIONSEPARATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateiEXT")) == NULL) || r;
+  r = ((glBlendEquationiEXT = (PFNGLBLENDEQUATIONIEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationiEXT")) == NULL) || r;
+  r = ((glBlendFuncSeparateiEXT = (PFNGLBLENDFUNCSEPARATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateiEXT")) == NULL) || r;
+  r = ((glBlendFunciEXT = (PFNGLBLENDFUNCIEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFunciEXT")) == NULL) || r;
+  r = ((glColorMaskiEXT = (PFNGLCOLORMASKIEXTPROC)glewGetProcAddress((const GLubyte*)"glColorMaskiEXT")) == NULL) || r;
+  r = ((glDisableiEXT = (PFNGLDISABLEIEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableiEXT")) == NULL) || r;
+  r = ((glEnableiEXT = (PFNGLENABLEIEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableiEXT")) == NULL) || r;
+  r = ((glIsEnablediEXT = (PFNGLISENABLEDIEXTPROC)glewGetProcAddress((const GLubyte*)"glIsEnablediEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_buffers_indexed */
+
+#ifdef GL_EXT_draw_elements_base_vertex
+
+static GLboolean _glewInit_GL_EXT_draw_elements_base_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementsBaseVertexEXT = (PFNGLDRAWELEMENTSBASEVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsBaseVertexEXT")) == NULL) || r;
+  r = ((glDrawElementsInstancedBaseVertexEXT = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertexEXT")) == NULL) || r;
+  r = ((glDrawRangeElementsBaseVertexEXT = (PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsBaseVertexEXT")) == NULL) || r;
+  r = ((glMultiDrawElementsBaseVertexEXT = (PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsBaseVertexEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_elements_base_vertex */
+
+#ifdef GL_EXT_draw_instanced
+
+static GLboolean _glewInit_GL_EXT_draw_instanced ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedEXT = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedEXT")) == NULL) || r;
+  r = ((glDrawElementsInstancedEXT = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_instanced */
+
+#ifdef GL_EXT_draw_range_elements
+
+static GLboolean _glewInit_GL_EXT_draw_range_elements ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawRangeElementsEXT = (PFNGLDRAWRANGEELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_range_elements */
+
+#ifdef GL_EXT_external_buffer
+
+static GLboolean _glewInit_GL_EXT_external_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferStorageExternalEXT = (PFNGLBUFFERSTORAGEEXTERNALEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferStorageExternalEXT")) == NULL) || r;
+  r = ((glNamedBufferStorageExternalEXT = (PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferStorageExternalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_external_buffer */
+
+#ifdef GL_EXT_fog_coord
+
+static GLboolean _glewInit_GL_EXT_fog_coord ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerEXT")) == NULL) || r;
+  r = ((glFogCoorddEXT = (PFNGLFOGCOORDDEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddEXT")) == NULL) || r;
+  r = ((glFogCoorddvEXT = (PFNGLFOGCOORDDVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddvEXT")) == NULL) || r;
+  r = ((glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfEXT")) == NULL) || r;
+  r = ((glFogCoordfvEXT = (PFNGLFOGCOORDFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_fog_coord */
+
+#ifdef GL_EXT_fragment_lighting
+
+static GLboolean _glewInit_GL_EXT_fragment_lighting ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFragmentColorMaterialEXT = (PFNGLFRAGMENTCOLORMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialEXT")) == NULL) || r;
+  r = ((glFragmentLightModelfEXT = (PFNGLFRAGMENTLIGHTMODELFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfEXT")) == NULL) || r;
+  r = ((glFragmentLightModelfvEXT = (PFNGLFRAGMENTLIGHTMODELFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvEXT")) == NULL) || r;
+  r = ((glFragmentLightModeliEXT = (PFNGLFRAGMENTLIGHTMODELIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliEXT")) == NULL) || r;
+  r = ((glFragmentLightModelivEXT = (PFNGLFRAGMENTLIGHTMODELIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivEXT")) == NULL) || r;
+  r = ((glFragmentLightfEXT = (PFNGLFRAGMENTLIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfEXT")) == NULL) || r;
+  r = ((glFragmentLightfvEXT = (PFNGLFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvEXT")) == NULL) || r;
+  r = ((glFragmentLightiEXT = (PFNGLFRAGMENTLIGHTIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiEXT")) == NULL) || r;
+  r = ((glFragmentLightivEXT = (PFNGLFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivEXT")) == NULL) || r;
+  r = ((glFragmentMaterialfEXT = (PFNGLFRAGMENTMATERIALFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfEXT")) == NULL) || r;
+  r = ((glFragmentMaterialfvEXT = (PFNGLFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvEXT")) == NULL) || r;
+  r = ((glFragmentMaterialiEXT = (PFNGLFRAGMENTMATERIALIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiEXT")) == NULL) || r;
+  r = ((glFragmentMaterialivEXT = (PFNGLFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivEXT")) == NULL) || r;
+  r = ((glGetFragmentLightfvEXT = (PFNGLGETFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvEXT")) == NULL) || r;
+  r = ((glGetFragmentLightivEXT = (PFNGLGETFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivEXT")) == NULL) || r;
+  r = ((glGetFragmentMaterialfvEXT = (PFNGLGETFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvEXT")) == NULL) || r;
+  r = ((glGetFragmentMaterialivEXT = (PFNGLGETFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivEXT")) == NULL) || r;
+  r = ((glLightEnviEXT = (PFNGLLIGHTENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glLightEnviEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_fragment_lighting */
+
+#ifdef GL_EXT_framebuffer_blit
+
+static GLboolean _glewInit_GL_EXT_framebuffer_blit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifdef GL_EXT_framebuffer_multisample
+
+static GLboolean _glewInit_GL_EXT_framebuffer_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifdef GL_EXT_framebuffer_object
+
+static GLboolean _glewInit_GL_EXT_framebuffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindFramebufferEXT")) == NULL) || r;
+  r = ((glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbufferEXT")) == NULL) || r;
+  r = ((glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatusEXT")) == NULL) || r;
+  r = ((glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffersEXT")) == NULL) || r;
+  r = ((glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffersEXT")) == NULL) || r;
+  r = ((glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbufferEXT")) == NULL) || r;
+  r = ((glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1DEXT")) == NULL) || r;
+  r = ((glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DEXT")) == NULL) || r;
+  r = ((glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3DEXT")) == NULL) || r;
+  r = ((glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffersEXT")) == NULL) || r;
+  r = ((glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffersEXT")) == NULL) || r;
+  r = ((glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmapEXT")) == NULL) || r;
+  r = ((glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameterivEXT")) == NULL) || r;
+  r = ((glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameterivEXT")) == NULL) || r;
+  r = ((glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsFramebufferEXT")) == NULL) || r;
+  r = ((glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbufferEXT")) == NULL) || r;
+  r = ((glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_object */
+
+#ifdef GL_EXT_geometry_shader4
+
+static GLboolean _glewInit_GL_EXT_geometry_shader4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTextureEXT = (PFNGLFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureEXT")) == NULL) || r;
+  r = ((glFramebufferTextureFaceEXT = (PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceEXT")) == NULL) || r;
+  r = ((glProgramParameteriEXT = (PFNGLPROGRAMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_geometry_shader4 */
+
+#ifdef GL_EXT_gpu_program_parameters
+
+static GLboolean _glewInit_GL_EXT_gpu_program_parameters ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProgramEnvParameters4fvEXT = (PFNGLPROGRAMENVPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameters4fvEXT")) == NULL) || r;
+  r = ((glProgramLocalParameters4fvEXT = (PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameters4fvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_gpu_program_parameters */
+
+#ifdef GL_EXT_gpu_shader4
+
+static GLboolean _glewInit_GL_EXT_gpu_shader4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFragDataLocationEXT = (PFNGLBINDFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationEXT")) == NULL) || r;
+  r = ((glGetFragDataLocationEXT = (PFNGLGETFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocationEXT")) == NULL) || r;
+  r = ((glGetUniformuivEXT = (PFNGLGETUNIFORMUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuivEXT")) == NULL) || r;
+  r = ((glGetVertexAttribIivEXT = (PFNGLGETVERTEXATTRIBIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIivEXT")) == NULL) || r;
+  r = ((glGetVertexAttribIuivEXT = (PFNGLGETVERTEXATTRIBIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuivEXT")) == NULL) || r;
+  r = ((glUniform1uiEXT = (PFNGLUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiEXT")) == NULL) || r;
+  r = ((glUniform1uivEXT = (PFNGLUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uivEXT")) == NULL) || r;
+  r = ((glUniform2uiEXT = (PFNGLUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiEXT")) == NULL) || r;
+  r = ((glUniform2uivEXT = (PFNGLUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uivEXT")) == NULL) || r;
+  r = ((glUniform3uiEXT = (PFNGLUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiEXT")) == NULL) || r;
+  r = ((glUniform3uivEXT = (PFNGLUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uivEXT")) == NULL) || r;
+  r = ((glUniform4uiEXT = (PFNGLUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiEXT")) == NULL) || r;
+  r = ((glUniform4uivEXT = (PFNGLUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uivEXT")) == NULL) || r;
+  r = ((glVertexAttribI1iEXT = (PFNGLVERTEXATTRIBI1IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iEXT")) == NULL) || r;
+  r = ((glVertexAttribI1ivEXT = (PFNGLVERTEXATTRIBI1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ivEXT")) == NULL) || r;
+  r = ((glVertexAttribI1uiEXT = (PFNGLVERTEXATTRIBI1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiEXT")) == NULL) || r;
+  r = ((glVertexAttribI1uivEXT = (PFNGLVERTEXATTRIBI1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uivEXT")) == NULL) || r;
+  r = ((glVertexAttribI2iEXT = (PFNGLVERTEXATTRIBI2IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iEXT")) == NULL) || r;
+  r = ((glVertexAttribI2ivEXT = (PFNGLVERTEXATTRIBI2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ivEXT")) == NULL) || r;
+  r = ((glVertexAttribI2uiEXT = (PFNGLVERTEXATTRIBI2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiEXT")) == NULL) || r;
+  r = ((glVertexAttribI2uivEXT = (PFNGLVERTEXATTRIBI2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uivEXT")) == NULL) || r;
+  r = ((glVertexAttribI3iEXT = (PFNGLVERTEXATTRIBI3IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iEXT")) == NULL) || r;
+  r = ((glVertexAttribI3ivEXT = (PFNGLVERTEXATTRIBI3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ivEXT")) == NULL) || r;
+  r = ((glVertexAttribI3uiEXT = (PFNGLVERTEXATTRIBI3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiEXT")) == NULL) || r;
+  r = ((glVertexAttribI3uivEXT = (PFNGLVERTEXATTRIBI3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uivEXT")) == NULL) || r;
+  r = ((glVertexAttribI4bvEXT = (PFNGLVERTEXATTRIBI4BVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bvEXT")) == NULL) || r;
+  r = ((glVertexAttribI4iEXT = (PFNGLVERTEXATTRIBI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iEXT")) == NULL) || r;
+  r = ((glVertexAttribI4ivEXT = (PFNGLVERTEXATTRIBI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ivEXT")) == NULL) || r;
+  r = ((glVertexAttribI4svEXT = (PFNGLVERTEXATTRIBI4SVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4svEXT")) == NULL) || r;
+  r = ((glVertexAttribI4ubvEXT = (PFNGLVERTEXATTRIBI4UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubvEXT")) == NULL) || r;
+  r = ((glVertexAttribI4uiEXT = (PFNGLVERTEXATTRIBI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiEXT")) == NULL) || r;
+  r = ((glVertexAttribI4uivEXT = (PFNGLVERTEXATTRIBI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uivEXT")) == NULL) || r;
+  r = ((glVertexAttribI4usvEXT = (PFNGLVERTEXATTRIBI4USVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usvEXT")) == NULL) || r;
+  r = ((glVertexAttribIPointerEXT = (PFNGLVERTEXATTRIBIPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_gpu_shader4 */
+
+#ifdef GL_EXT_histogram
+
+static GLboolean _glewInit_GL_EXT_histogram ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetHistogramEXT = (PFNGLGETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramEXT")) == NULL) || r;
+  r = ((glGetHistogramParameterfvEXT = (PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfvEXT")) == NULL) || r;
+  r = ((glGetHistogramParameterivEXT = (PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterivEXT")) == NULL) || r;
+  r = ((glGetMinmaxEXT = (PFNGLGETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxEXT")) == NULL) || r;
+  r = ((glGetMinmaxParameterfvEXT = (PFNGLGETMINMAXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfvEXT")) == NULL) || r;
+  r = ((glGetMinmaxParameterivEXT = (PFNGLGETMINMAXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterivEXT")) == NULL) || r;
+  r = ((glHistogramEXT = (PFNGLHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glHistogramEXT")) == NULL) || r;
+  r = ((glMinmaxEXT = (PFNGLMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glMinmaxEXT")) == NULL) || r;
+  r = ((glResetHistogramEXT = (PFNGLRESETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glResetHistogramEXT")) == NULL) || r;
+  r = ((glResetMinmaxEXT = (PFNGLRESETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glResetMinmaxEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_histogram */
+
+#ifdef GL_EXT_index_func
+
+static GLboolean _glewInit_GL_EXT_index_func ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glIndexFuncEXT = (PFNGLINDEXFUNCEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexFuncEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_index_func */
+
+#ifdef GL_EXT_index_material
+
+static GLboolean _glewInit_GL_EXT_index_material ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glIndexMaterialEXT = (PFNGLINDEXMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexMaterialEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_index_material */
+
+#ifdef GL_EXT_instanced_arrays
+
+static GLboolean _glewInit_GL_EXT_instanced_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexAttribDivisorEXT = (PFNGLVERTEXATTRIBDIVISOREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_instanced_arrays */
+
+#ifdef GL_EXT_light_texture
+
+static GLboolean _glewInit_GL_EXT_light_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glApplyTextureEXT = (PFNGLAPPLYTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glApplyTextureEXT")) == NULL) || r;
+  r = ((glTextureLightEXT = (PFNGLTEXTURELIGHTEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureLightEXT")) == NULL) || r;
+  r = ((glTextureMaterialEXT = (PFNGLTEXTUREMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureMaterialEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_light_texture */
+
+#ifdef GL_EXT_map_buffer_range
+
+static GLboolean _glewInit_GL_EXT_map_buffer_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushMappedBufferRangeEXT = (PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRangeEXT")) == NULL) || r;
+  r = ((glMapBufferRangeEXT = (PFNGLMAPBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glMapBufferRangeEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_map_buffer_range */
+
+#ifdef GL_EXT_memory_object
+
+static GLboolean _glewInit_GL_EXT_memory_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferStorageMemEXT = (PFNGLBUFFERSTORAGEMEMEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferStorageMemEXT")) == NULL) || r;
+  r = ((glCreateMemoryObjectsEXT = (PFNGLCREATEMEMORYOBJECTSEXTPROC)glewGetProcAddress((const GLubyte*)"glCreateMemoryObjectsEXT")) == NULL) || r;
+  r = ((glDeleteMemoryObjectsEXT = (PFNGLDELETEMEMORYOBJECTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteMemoryObjectsEXT")) == NULL) || r;
+  r = ((glGetMemoryObjectParameterivEXT = (PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMemoryObjectParameterivEXT")) == NULL) || r;
+  r = ((glGetUnsignedBytei_vEXT = (PFNGLGETUNSIGNEDBYTEI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUnsignedBytei_vEXT")) == NULL) || r;
+  r = ((glGetUnsignedBytevEXT = (PFNGLGETUNSIGNEDBYTEVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUnsignedBytevEXT")) == NULL) || r;
+  r = ((glIsMemoryObjectEXT = (PFNGLISMEMORYOBJECTEXTPROC)glewGetProcAddress((const GLubyte*)"glIsMemoryObjectEXT")) == NULL) || r;
+  r = ((glMemoryObjectParameterivEXT = (PFNGLMEMORYOBJECTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMemoryObjectParameterivEXT")) == NULL) || r;
+  r = ((glNamedBufferStorageMemEXT = (PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferStorageMemEXT")) == NULL) || r;
+  r = ((glTexStorageMem1DEXT = (PFNGLTEXSTORAGEMEM1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorageMem1DEXT")) == NULL) || r;
+  r = ((glTexStorageMem2DEXT = (PFNGLTEXSTORAGEMEM2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorageMem2DEXT")) == NULL) || r;
+  r = ((glTexStorageMem2DMultisampleEXT = (PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorageMem2DMultisampleEXT")) == NULL) || r;
+  r = ((glTexStorageMem3DEXT = (PFNGLTEXSTORAGEMEM3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorageMem3DEXT")) == NULL) || r;
+  r = ((glTexStorageMem3DMultisampleEXT = (PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorageMem3DMultisampleEXT")) == NULL) || r;
+  r = ((glTextureStorageMem1DEXT = (PFNGLTEXTURESTORAGEMEM1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageMem1DEXT")) == NULL) || r;
+  r = ((glTextureStorageMem2DEXT = (PFNGLTEXTURESTORAGEMEM2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageMem2DEXT")) == NULL) || r;
+  r = ((glTextureStorageMem2DMultisampleEXT = (PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageMem2DMultisampleEXT")) == NULL) || r;
+  r = ((glTextureStorageMem3DEXT = (PFNGLTEXTURESTORAGEMEM3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageMem3DEXT")) == NULL) || r;
+  r = ((glTextureStorageMem3DMultisampleEXT = (PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorageMem3DMultisampleEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_memory_object */
+
+#ifdef GL_EXT_memory_object_fd
+
+static GLboolean _glewInit_GL_EXT_memory_object_fd ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glImportMemoryFdEXT = (PFNGLIMPORTMEMORYFDEXTPROC)glewGetProcAddress((const GLubyte*)"glImportMemoryFdEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_memory_object_fd */
+
+#ifdef GL_EXT_memory_object_win32
+
+static GLboolean _glewInit_GL_EXT_memory_object_win32 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glImportMemoryWin32HandleEXT = (PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC)glewGetProcAddress((const GLubyte*)"glImportMemoryWin32HandleEXT")) == NULL) || r;
+  r = ((glImportMemoryWin32NameEXT = (PFNGLIMPORTMEMORYWIN32NAMEEXTPROC)glewGetProcAddress((const GLubyte*)"glImportMemoryWin32NameEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_memory_object_win32 */
+
+#ifdef GL_EXT_multi_draw_arrays
+
+static GLboolean _glewInit_GL_EXT_multi_draw_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysEXT = (PFNGLMULTIDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysEXT")) == NULL) || r;
+  r = ((glMultiDrawElementsEXT = (PFNGLMULTIDRAWELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifdef GL_EXT_multi_draw_indirect
+
+static GLboolean _glewInit_GL_EXT_multi_draw_indirect ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectEXT = (PFNGLMULTIDRAWARRAYSINDIRECTEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectEXT")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectEXT = (PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multi_draw_indirect */
+
+#ifdef GL_EXT_multisample
+
+static GLboolean _glewInit_GL_EXT_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleMaskEXT = (PFNGLSAMPLEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskEXT")) == NULL) || r;
+  r = ((glSamplePatternEXT = (PFNGLSAMPLEPATTERNEXTPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multisample */
+
+#ifdef GL_EXT_multisampled_render_to_texture
+
+static GLboolean _glewInit_GL_EXT_multisampled_render_to_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTexture2DMultisampleEXT = (PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DMultisampleEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multisampled_render_to_texture */
+
+#ifdef GL_EXT_multiview_draw_buffers
+
+static GLboolean _glewInit_GL_EXT_multiview_draw_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersIndexedEXT = (PFNGLDRAWBUFFERSINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersIndexedEXT")) == NULL) || r;
+  r = ((glGetIntegeri_vEXT = (PFNGLGETINTEGERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetIntegeri_vEXT")) == NULL) || r;
+  r = ((glReadBufferIndexedEXT = (PFNGLREADBUFFERINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glReadBufferIndexedEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multiview_draw_buffers */
+
+#ifdef GL_EXT_paletted_texture
+
+static GLboolean _glewInit_GL_EXT_paletted_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorTableEXT")) == NULL) || r;
+  r = ((glGetColorTableEXT = (PFNGLGETCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableEXT")) == NULL) || r;
+  r = ((glGetColorTableParameterfvEXT = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvEXT")) == NULL) || r;
+  r = ((glGetColorTableParameterivEXT = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_paletted_texture */
+
+#ifdef GL_EXT_pixel_transform
+
+static GLboolean _glewInit_GL_EXT_pixel_transform ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetPixelTransformParameterfvEXT = (PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvEXT")) == NULL) || r;
+  r = ((glGetPixelTransformParameterivEXT = (PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterfEXT = (PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterfvEXT = (PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvEXT")) == NULL) || r;
+  r = ((glPixelTransformParameteriEXT = (PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterivEXT = (PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_pixel_transform */
+
+#ifdef GL_EXT_point_parameters
+
+static GLboolean _glewInit_GL_EXT_point_parameters ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfEXT")) == NULL) || r;
+  r = ((glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_point_parameters */
+
+#ifdef GL_EXT_polygon_offset
+
+static GLboolean _glewInit_GL_EXT_polygon_offset ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_polygon_offset */
+
+#ifdef GL_EXT_polygon_offset_clamp
+
+static GLboolean _glewInit_GL_EXT_polygon_offset_clamp ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPolygonOffsetClampEXT = (PFNGLPOLYGONOFFSETCLAMPEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetClampEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_polygon_offset_clamp */
+
+#ifdef GL_EXT_provoking_vertex
+
+static GLboolean _glewInit_GL_EXT_provoking_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProvokingVertexEXT = (PFNGLPROVOKINGVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glProvokingVertexEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_provoking_vertex */
+
+#ifdef GL_EXT_raster_multisample
+
+static GLboolean _glewInit_GL_EXT_raster_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCoverageModulationNV = (PFNGLCOVERAGEMODULATIONNVPROC)glewGetProcAddress((const GLubyte*)"glCoverageModulationNV")) == NULL) || r;
+  r = ((glCoverageModulationTableNV = (PFNGLCOVERAGEMODULATIONTABLENVPROC)glewGetProcAddress((const GLubyte*)"glCoverageModulationTableNV")) == NULL) || r;
+  r = ((glGetCoverageModulationTableNV = (PFNGLGETCOVERAGEMODULATIONTABLENVPROC)glewGetProcAddress((const GLubyte*)"glGetCoverageModulationTableNV")) == NULL) || r;
+  r = ((glRasterSamplesEXT = (PFNGLRASTERSAMPLESEXTPROC)glewGetProcAddress((const GLubyte*)"glRasterSamplesEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_raster_multisample */
+
+#ifdef GL_EXT_scene_marker
+
+static GLboolean _glewInit_GL_EXT_scene_marker ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginSceneEXT = (PFNGLBEGINSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginSceneEXT")) == NULL) || r;
+  r = ((glEndSceneEXT = (PFNGLENDSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glEndSceneEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_scene_marker */
+
+#ifdef GL_EXT_secondary_color
+
+static GLboolean _glewInit_GL_EXT_secondary_color ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSecondaryColor3bEXT = (PFNGLSECONDARYCOLOR3BEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bEXT")) == NULL) || r;
+  r = ((glSecondaryColor3bvEXT = (PFNGLSECONDARYCOLOR3BVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3dEXT = (PFNGLSECONDARYCOLOR3DEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dEXT")) == NULL) || r;
+  r = ((glSecondaryColor3dvEXT = (PFNGLSECONDARYCOLOR3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3fEXT = (PFNGLSECONDARYCOLOR3FEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fEXT")) == NULL) || r;
+  r = ((glSecondaryColor3fvEXT = (PFNGLSECONDARYCOLOR3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3iEXT = (PFNGLSECONDARYCOLOR3IEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ivEXT = (PFNGLSECONDARYCOLOR3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ivEXT")) == NULL) || r;
+  r = ((glSecondaryColor3sEXT = (PFNGLSECONDARYCOLOR3SEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sEXT")) == NULL) || r;
+  r = ((glSecondaryColor3svEXT = (PFNGLSECONDARYCOLOR3SVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3svEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ubEXT = (PFNGLSECONDARYCOLOR3UBEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ubvEXT = (PFNGLSECONDARYCOLOR3UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3uiEXT = (PFNGLSECONDARYCOLOR3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiEXT")) == NULL) || r;
+  r = ((glSecondaryColor3uivEXT = (PFNGLSECONDARYCOLOR3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uivEXT")) == NULL) || r;
+  r = ((glSecondaryColor3usEXT = (PFNGLSECONDARYCOLOR3USEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usEXT")) == NULL) || r;
+  r = ((glSecondaryColor3usvEXT = (PFNGLSECONDARYCOLOR3USVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usvEXT")) == NULL) || r;
+  r = ((glSecondaryColorPointerEXT = (PFNGLSECONDARYCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_secondary_color */
+
+#ifdef GL_EXT_semaphore
+
+static GLboolean _glewInit_GL_EXT_semaphore ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteSemaphoresEXT = (PFNGLDELETESEMAPHORESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteSemaphoresEXT")) == NULL) || r;
+  r = ((glGenSemaphoresEXT = (PFNGLGENSEMAPHORESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSemaphoresEXT")) == NULL) || r;
+  r = ((glGetSemaphoreParameterui64vEXT = (PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetSemaphoreParameterui64vEXT")) == NULL) || r;
+  r = ((glIsSemaphoreEXT = (PFNGLISSEMAPHOREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsSemaphoreEXT")) == NULL) || r;
+  r = ((glSemaphoreParameterui64vEXT = (PFNGLSEMAPHOREPARAMETERUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glSemaphoreParameterui64vEXT")) == NULL) || r;
+  r = ((glSignalSemaphoreEXT = (PFNGLSIGNALSEMAPHOREEXTPROC)glewGetProcAddress((const GLubyte*)"glSignalSemaphoreEXT")) == NULL) || r;
+  r = ((glWaitSemaphoreEXT = (PFNGLWAITSEMAPHOREEXTPROC)glewGetProcAddress((const GLubyte*)"glWaitSemaphoreEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_semaphore */
+
+#ifdef GL_EXT_semaphore_fd
+
+static GLboolean _glewInit_GL_EXT_semaphore_fd ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glImportSemaphoreFdEXT = (PFNGLIMPORTSEMAPHOREFDEXTPROC)glewGetProcAddress((const GLubyte*)"glImportSemaphoreFdEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_semaphore_fd */
+
+#ifdef GL_EXT_semaphore_win32
+
+static GLboolean _glewInit_GL_EXT_semaphore_win32 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glImportSemaphoreWin32HandleEXT = (PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC)glewGetProcAddress((const GLubyte*)"glImportSemaphoreWin32HandleEXT")) == NULL) || r;
+  r = ((glImportSemaphoreWin32NameEXT = (PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC)glewGetProcAddress((const GLubyte*)"glImportSemaphoreWin32NameEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_semaphore_win32 */
+
+#ifdef GL_EXT_separate_shader_objects
+
+static GLboolean _glewInit_GL_EXT_separate_shader_objects ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveProgramEXT = (PFNGLACTIVEPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveProgramEXT")) == NULL) || r;
+  r = ((glCreateShaderProgramEXT = (PFNGLCREATESHADERPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderProgramEXT")) == NULL) || r;
+  r = ((glUseShaderProgramEXT = (PFNGLUSESHADERPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glUseShaderProgramEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_separate_shader_objects */
+
+#ifdef GL_EXT_shader_image_load_store
+
+static GLboolean _glewInit_GL_EXT_shader_image_load_store ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindImageTextureEXT = (PFNGLBINDIMAGETEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindImageTextureEXT")) == NULL) || r;
+  r = ((glMemoryBarrierEXT = (PFNGLMEMORYBARRIEREXTPROC)glewGetProcAddress((const GLubyte*)"glMemoryBarrierEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_shader_image_load_store */
+
+#ifdef GL_EXT_shader_pixel_local_storage2
+
+static GLboolean _glewInit_GL_EXT_shader_pixel_local_storage2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearPixelLocalStorageuiEXT = (PFNGLCLEARPIXELLOCALSTORAGEUIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearPixelLocalStorageuiEXT")) == NULL) || r;
+  r = ((glFramebufferPixelLocalStorageSizeEXT = (PFNGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferPixelLocalStorageSizeEXT")) == NULL) || r;
+  r = ((glGetFramebufferPixelLocalStorageSizeEXT = (PFNGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferPixelLocalStorageSizeEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_shader_pixel_local_storage2 */
+
+#ifdef GL_EXT_sparse_texture
+
+static GLboolean _glewInit_GL_EXT_sparse_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexPageCommitmentEXT = (PFNGLTEXPAGECOMMITMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glTexPageCommitmentEXT")) == NULL) || r;
+  r = ((glTexturePageCommitmentEXT = (PFNGLTEXTUREPAGECOMMITMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glTexturePageCommitmentEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_sparse_texture */
+
+#ifdef GL_EXT_stencil_two_side
+
+static GLboolean _glewInit_GL_EXT_stencil_two_side ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveStencilFaceEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_stencil_two_side */
+
+#ifdef GL_EXT_subtexture
+
+static GLboolean _glewInit_GL_EXT_subtexture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexSubImage1DEXT = (PFNGLTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage1DEXT")) == NULL) || r;
+  r = ((glTexSubImage2DEXT = (PFNGLTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage2DEXT")) == NULL) || r;
+  r = ((glTexSubImage3DEXT = (PFNGLTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_subtexture */
+
+#ifdef GL_EXT_texture3D
+
+static GLboolean _glewInit_GL_EXT_texture3D ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexImage3DEXT = (PFNGLTEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture3D */
+
+#ifdef GL_EXT_texture_array
+
+static GLboolean _glewInit_GL_EXT_texture_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTextureLayerEXT = (PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_array */
+
+#ifdef GL_EXT_texture_buffer_object
+
+static GLboolean _glewInit_GL_EXT_texture_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexBufferEXT = (PFNGLTEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexBufferEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_buffer_object */
+
+#ifdef GL_EXT_texture_integer
+
+static GLboolean _glewInit_GL_EXT_texture_integer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearColorIiEXT = (PFNGLCLEARCOLORIIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIiEXT")) == NULL) || r;
+  r = ((glClearColorIuiEXT = (PFNGLCLEARCOLORIUIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIuiEXT")) == NULL) || r;
+  r = ((glGetTexParameterIivEXT = (PFNGLGETTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIivEXT")) == NULL) || r;
+  r = ((glGetTexParameterIuivEXT = (PFNGLGETTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuivEXT")) == NULL) || r;
+  r = ((glTexParameterIivEXT = (PFNGLTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIivEXT")) == NULL) || r;
+  r = ((glTexParameterIuivEXT = (PFNGLTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_integer */
+
+#ifdef GL_EXT_texture_object
+
+static GLboolean _glewInit_GL_EXT_texture_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAreTexturesResidentEXT = (PFNGLARETEXTURESRESIDENTEXTPROC)glewGetProcAddress((const GLubyte*)"glAreTexturesResidentEXT")) == NULL) || r;
+  r = ((glBindTextureEXT = (PFNGLBINDTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureEXT")) == NULL) || r;
+  r = ((glDeleteTexturesEXT = (PFNGLDELETETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteTexturesEXT")) == NULL) || r;
+  r = ((glGenTexturesEXT = (PFNGLGENTEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenTexturesEXT")) == NULL) || r;
+  r = ((glIsTextureEXT = (PFNGLISTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsTextureEXT")) == NULL) || r;
+  r = ((glPrioritizeTexturesEXT = (PFNGLPRIORITIZETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeTexturesEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_object */
+
+#ifdef GL_EXT_texture_perturb_normal
+
+static GLboolean _glewInit_GL_EXT_texture_perturb_normal ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureNormalEXT = (PFNGLTEXTURENORMALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureNormalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifdef GL_EXT_texture_storage
+
+static GLboolean _glewInit_GL_EXT_texture_storage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexStorage1DEXT = (PFNGLTEXSTORAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorage1DEXT")) == NULL) || r;
+  r = ((glTexStorage2DEXT = (PFNGLTEXSTORAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorage2DEXT")) == NULL) || r;
+  r = ((glTexStorage3DEXT = (PFNGLTEXSTORAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexStorage3DEXT")) == NULL) || r;
+  r = ((glTextureStorage1DEXT = (PFNGLTEXTURESTORAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage1DEXT")) == NULL) || r;
+  r = ((glTextureStorage2DEXT = (PFNGLTEXTURESTORAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2DEXT")) == NULL) || r;
+  r = ((glTextureStorage3DEXT = (PFNGLTEXTURESTORAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_storage */
+
+#ifdef GL_EXT_texture_view
+
+static GLboolean _glewInit_GL_EXT_texture_view ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureViewEXT = (PFNGLTEXTUREVIEWEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureViewEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_view */
+
+#ifdef GL_EXT_timer_query
+
+static GLboolean _glewInit_GL_EXT_timer_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetQueryObjecti64vEXT = (PFNGLGETQUERYOBJECTI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64vEXT")) == NULL) || r;
+  r = ((glGetQueryObjectui64vEXT = (PFNGLGETQUERYOBJECTUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64vEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_timer_query */
+
+#ifdef GL_EXT_transform_feedback
+
+static GLboolean _glewInit_GL_EXT_transform_feedback ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginTransformFeedbackEXT = (PFNGLBEGINTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackEXT")) == NULL) || r;
+  r = ((glBindBufferBaseEXT = (PFNGLBINDBUFFERBASEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseEXT")) == NULL) || r;
+  r = ((glBindBufferOffsetEXT = (PFNGLBINDBUFFEROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetEXT")) == NULL) || r;
+  r = ((glBindBufferRangeEXT = (PFNGLBINDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeEXT")) == NULL) || r;
+  r = ((glEndTransformFeedbackEXT = (PFNGLENDTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackEXT")) == NULL) || r;
+  r = ((glGetTransformFeedbackVaryingEXT = (PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingEXT")) == NULL) || r;
+  r = ((glTransformFeedbackVaryingsEXT = (PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_transform_feedback */
+
+#ifdef GL_EXT_vertex_array
+
+static GLboolean _glewInit_GL_EXT_vertex_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glArrayElementEXT = (PFNGLARRAYELEMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glArrayElementEXT")) == NULL) || r;
+  r = ((glColorPointerEXT = (PFNGLCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glColorPointerEXT")) == NULL) || r;
+  r = ((glDrawArraysEXT = (PFNGLDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysEXT")) == NULL) || r;
+  r = ((glEdgeFlagPointerEXT = (PFNGLEDGEFLAGPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerEXT")) == NULL) || r;
+  r = ((glIndexPointerEXT = (PFNGLINDEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerEXT")) == NULL) || r;
+  r = ((glNormalPointerEXT = (PFNGLNORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerEXT")) == NULL) || r;
+  r = ((glTexCoordPointerEXT = (PFNGLTEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerEXT")) == NULL) || r;
+  r = ((glVertexPointerEXT = (PFNGLVERTEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_array */
+
+#ifdef GL_EXT_vertex_array_setXXX
+
+static GLboolean _glewInit_GL_EXT_vertex_array_setXXX ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindArraySetEXT = (PFNGLBINDARRAYSETEXTPROC)glewGetProcAddress((const GLubyte*)"glBindArraySetEXT")) == NULL) || r;
+  r = ((glCreateArraySetExt = (PFNGLCREATEARRAYSETEXTPROC)glewGetProcAddress((const GLubyte*)"glCreateArraySetExt")) == NULL) || r;
+  r = ((glDeleteArraySetsEXT = (PFNGLDELETEARRAYSETSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteArraySetsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_array_setXXX */
+
+#ifdef GL_EXT_vertex_attrib_64bit
+
+static GLboolean _glewInit_GL_EXT_vertex_attrib_64bit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVertexAttribLdvEXT = (PFNGLGETVERTEXATTRIBLDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLdvEXT")) == NULL) || r;
+  r = ((glVertexArrayVertexAttribLOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribLOffsetEXT")) == NULL) || r;
+  r = ((glVertexAttribL1dEXT = (PFNGLVERTEXATTRIBL1DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dEXT")) == NULL) || r;
+  r = ((glVertexAttribL1dvEXT = (PFNGLVERTEXATTRIBL1DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dvEXT")) == NULL) || r;
+  r = ((glVertexAttribL2dEXT = (PFNGLVERTEXATTRIBL2DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dEXT")) == NULL) || r;
+  r = ((glVertexAttribL2dvEXT = (PFNGLVERTEXATTRIBL2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dvEXT")) == NULL) || r;
+  r = ((glVertexAttribL3dEXT = (PFNGLVERTEXATTRIBL3DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dEXT")) == NULL) || r;
+  r = ((glVertexAttribL3dvEXT = (PFNGLVERTEXATTRIBL3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dvEXT")) == NULL) || r;
+  r = ((glVertexAttribL4dEXT = (PFNGLVERTEXATTRIBL4DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dEXT")) == NULL) || r;
+  r = ((glVertexAttribL4dvEXT = (PFNGLVERTEXATTRIBL4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dvEXT")) == NULL) || r;
+  r = ((glVertexAttribLPointerEXT = (PFNGLVERTEXATTRIBLPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+#ifdef GL_EXT_vertex_shader
+
+static GLboolean _glewInit_GL_EXT_vertex_shader ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginVertexShaderEXT = (PFNGLBEGINVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBeginVertexShaderEXT")) == NULL) || r;
+  r = ((glBindLightParameterEXT = (PFNGLBINDLIGHTPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindLightParameterEXT")) == NULL) || r;
+  r = ((glBindMaterialParameterEXT = (PFNGLBINDMATERIALPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindMaterialParameterEXT")) == NULL) || r;
+  r = ((glBindParameterEXT = (PFNGLBINDPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindParameterEXT")) == NULL) || r;
+  r = ((glBindTexGenParameterEXT = (PFNGLBINDTEXGENPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTexGenParameterEXT")) == NULL) || r;
+  r = ((glBindTextureUnitParameterEXT = (PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnitParameterEXT")) == NULL) || r;
+  r = ((glBindVertexShaderEXT = (PFNGLBINDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindVertexShaderEXT")) == NULL) || r;
+  r = ((glDeleteVertexShaderEXT = (PFNGLDELETEVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexShaderEXT")) == NULL) || r;
+  r = ((glDisableVariantClientStateEXT = (PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVariantClientStateEXT")) == NULL) || r;
+  r = ((glEnableVariantClientStateEXT = (PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVariantClientStateEXT")) == NULL) || r;
+  r = ((glEndVertexShaderEXT = (PFNGLENDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glEndVertexShaderEXT")) == NULL) || r;
+  r = ((glExtractComponentEXT = (PFNGLEXTRACTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glExtractComponentEXT")) == NULL) || r;
+  r = ((glGenSymbolsEXT = (PFNGLGENSYMBOLSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSymbolsEXT")) == NULL) || r;
+  r = ((glGenVertexShadersEXT = (PFNGLGENVERTEXSHADERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenVertexShadersEXT")) == NULL) || r;
+  r = ((glGetInvariantBooleanvEXT = (PFNGLGETINVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantBooleanvEXT")) == NULL) || r;
+  r = ((glGetInvariantFloatvEXT = (PFNGLGETINVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantFloatvEXT")) == NULL) || r;
+  r = ((glGetInvariantIntegervEXT = (PFNGLGETINVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantIntegervEXT")) == NULL) || r;
+  r = ((glGetLocalConstantBooleanvEXT = (PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantBooleanvEXT")) == NULL) || r;
+  r = ((glGetLocalConstantFloatvEXT = (PFNGLGETLOCALCONSTANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantFloatvEXT")) == NULL) || r;
+  r = ((glGetLocalConstantIntegervEXT = (PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantIntegervEXT")) == NULL) || r;
+  r = ((glGetVariantBooleanvEXT = (PFNGLGETVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantBooleanvEXT")) == NULL) || r;
+  r = ((glGetVariantFloatvEXT = (PFNGLGETVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantFloatvEXT")) == NULL) || r;
+  r = ((glGetVariantIntegervEXT = (PFNGLGETVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantIntegervEXT")) == NULL) || r;
+  r = ((glGetVariantPointervEXT = (PFNGLGETVARIANTPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantPointervEXT")) == NULL) || r;
+  r = ((glInsertComponentEXT = (PFNGLINSERTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glInsertComponentEXT")) == NULL) || r;
+  r = ((glIsVariantEnabledEXT = (PFNGLISVARIANTENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsVariantEnabledEXT")) == NULL) || r;
+  r = ((glSetInvariantEXT = (PFNGLSETINVARIANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetInvariantEXT")) == NULL) || r;
+  r = ((glSetLocalConstantEXT = (PFNGLSETLOCALCONSTANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetLocalConstantEXT")) == NULL) || r;
+  r = ((glShaderOp1EXT = (PFNGLSHADEROP1EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp1EXT")) == NULL) || r;
+  r = ((glShaderOp2EXT = (PFNGLSHADEROP2EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp2EXT")) == NULL) || r;
+  r = ((glShaderOp3EXT = (PFNGLSHADEROP3EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp3EXT")) == NULL) || r;
+  r = ((glSwizzleEXT = (PFNGLSWIZZLEEXTPROC)glewGetProcAddress((const GLubyte*)"glSwizzleEXT")) == NULL) || r;
+  r = ((glVariantPointerEXT = (PFNGLVARIANTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVariantPointerEXT")) == NULL) || r;
+  r = ((glVariantbvEXT = (PFNGLVARIANTBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantbvEXT")) == NULL) || r;
+  r = ((glVariantdvEXT = (PFNGLVARIANTDVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantdvEXT")) == NULL) || r;
+  r = ((glVariantfvEXT = (PFNGLVARIANTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantfvEXT")) == NULL) || r;
+  r = ((glVariantivEXT = (PFNGLVARIANTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantivEXT")) == NULL) || r;
+  r = ((glVariantsvEXT = (PFNGLVARIANTSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantsvEXT")) == NULL) || r;
+  r = ((glVariantubvEXT = (PFNGLVARIANTUBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantubvEXT")) == NULL) || r;
+  r = ((glVariantuivEXT = (PFNGLVARIANTUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantuivEXT")) == NULL) || r;
+  r = ((glVariantusvEXT = (PFNGLVARIANTUSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantusvEXT")) == NULL) || r;
+  r = ((glWriteMaskEXT = (PFNGLWRITEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glWriteMaskEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_shader */
+
+#ifdef GL_EXT_vertex_weighting
+
+static GLboolean _glewInit_GL_EXT_vertex_weighting ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexWeightPointerEXT = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightPointerEXT")) == NULL) || r;
+  r = ((glVertexWeightfEXT = (PFNGLVERTEXWEIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfEXT")) == NULL) || r;
+  r = ((glVertexWeightfvEXT = (PFNGLVERTEXWEIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_weighting */
+
+#ifdef GL_EXT_win32_keyed_mutex
+
+static GLboolean _glewInit_GL_EXT_win32_keyed_mutex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAcquireKeyedMutexWin32EXT = (PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC)glewGetProcAddress((const GLubyte*)"glAcquireKeyedMutexWin32EXT")) == NULL) || r;
+  r = ((glReleaseKeyedMutexWin32EXT = (PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC)glewGetProcAddress((const GLubyte*)"glReleaseKeyedMutexWin32EXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_win32_keyed_mutex */
+
+#ifdef GL_EXT_window_rectangles
+
+static GLboolean _glewInit_GL_EXT_window_rectangles ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glWindowRectanglesEXT = (PFNGLWINDOWRECTANGLESEXTPROC)glewGetProcAddress((const GLubyte*)"glWindowRectanglesEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_window_rectangles */
+
+#ifdef GL_EXT_x11_sync_object
+
+static GLboolean _glewInit_GL_EXT_x11_sync_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glImportSyncEXT = (PFNGLIMPORTSYNCEXTPROC)glewGetProcAddress((const GLubyte*)"glImportSyncEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_x11_sync_object */
+
+#ifdef GL_GREMEDY_frame_terminator
+
+static GLboolean _glewInit_GL_GREMEDY_frame_terminator ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFrameTerminatorGREMEDY = (PFNGLFRAMETERMINATORGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glFrameTerminatorGREMEDY")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_GREMEDY_frame_terminator */
+
+#ifdef GL_GREMEDY_string_marker
+
+static GLboolean _glewInit_GL_GREMEDY_string_marker ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStringMarkerGREMEDY = (PFNGLSTRINGMARKERGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glStringMarkerGREMEDY")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_GREMEDY_string_marker */
+
+#ifdef GL_HP_image_transform
+
+static GLboolean _glewInit_GL_HP_image_transform ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetImageTransformParameterfvHP = (PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterfvHP")) == NULL) || r;
+  r = ((glGetImageTransformParameterivHP = (PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterivHP")) == NULL) || r;
+  r = ((glImageTransformParameterfHP = (PFNGLIMAGETRANSFORMPARAMETERFHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfHP")) == NULL) || r;
+  r = ((glImageTransformParameterfvHP = (PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfvHP")) == NULL) || r;
+  r = ((glImageTransformParameteriHP = (PFNGLIMAGETRANSFORMPARAMETERIHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameteriHP")) == NULL) || r;
+  r = ((glImageTransformParameterivHP = (PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterivHP")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_HP_image_transform */
+
+#ifdef GL_IBM_multimode_draw_arrays
+
+static GLboolean _glewInit_GL_IBM_multimode_draw_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiModeDrawArraysIBM = (PFNGLMULTIMODEDRAWARRAYSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawArraysIBM")) == NULL) || r;
+  r = ((glMultiModeDrawElementsIBM = (PFNGLMULTIMODEDRAWELEMENTSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawElementsIBM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifdef GL_IBM_vertex_array_lists
+
+static GLboolean _glewInit_GL_IBM_vertex_array_lists ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorPointerListIBM = (PFNGLCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glColorPointerListIBM")) == NULL) || r;
+  r = ((glEdgeFlagPointerListIBM = (PFNGLEDGEFLAGPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerListIBM")) == NULL) || r;
+  r = ((glFogCoordPointerListIBM = (PFNGLFOGCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerListIBM")) == NULL) || r;
+  r = ((glIndexPointerListIBM = (PFNGLINDEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerListIBM")) == NULL) || r;
+  r = ((glNormalPointerListIBM = (PFNGLNORMALPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerListIBM")) == NULL) || r;
+  r = ((glSecondaryColorPointerListIBM = (PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerListIBM")) == NULL) || r;
+  r = ((glTexCoordPointerListIBM = (PFNGLTEXCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerListIBM")) == NULL) || r;
+  r = ((glVertexPointerListIBM = (PFNGLVERTEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerListIBM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifdef GL_INTEL_map_texture
+
+static GLboolean _glewInit_GL_INTEL_map_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMapTexture2DINTEL = (PFNGLMAPTEXTURE2DINTELPROC)glewGetProcAddress((const GLubyte*)"glMapTexture2DINTEL")) == NULL) || r;
+  r = ((glSyncTextureINTEL = (PFNGLSYNCTEXTUREINTELPROC)glewGetProcAddress((const GLubyte*)"glSyncTextureINTEL")) == NULL) || r;
+  r = ((glUnmapTexture2DINTEL = (PFNGLUNMAPTEXTURE2DINTELPROC)glewGetProcAddress((const GLubyte*)"glUnmapTexture2DINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_map_texture */
+
+#ifdef GL_INTEL_parallel_arrays
+
+static GLboolean _glewInit_GL_INTEL_parallel_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorPointervINTEL = (PFNGLCOLORPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glColorPointervINTEL")) == NULL) || r;
+  r = ((glNormalPointervINTEL = (PFNGLNORMALPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glNormalPointervINTEL")) == NULL) || r;
+  r = ((glTexCoordPointervINTEL = (PFNGLTEXCOORDPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointervINTEL")) == NULL) || r;
+  r = ((glVertexPointervINTEL = (PFNGLVERTEXPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glVertexPointervINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifdef GL_INTEL_performance_query
+
+static GLboolean _glewInit_GL_INTEL_performance_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginPerfQueryINTEL = (PFNGLBEGINPERFQUERYINTELPROC)glewGetProcAddress((const GLubyte*)"glBeginPerfQueryINTEL")) == NULL) || r;
+  r = ((glCreatePerfQueryINTEL = (PFNGLCREATEPERFQUERYINTELPROC)glewGetProcAddress((const GLubyte*)"glCreatePerfQueryINTEL")) == NULL) || r;
+  r = ((glDeletePerfQueryINTEL = (PFNGLDELETEPERFQUERYINTELPROC)glewGetProcAddress((const GLubyte*)"glDeletePerfQueryINTEL")) == NULL) || r;
+  r = ((glEndPerfQueryINTEL = (PFNGLENDPERFQUERYINTELPROC)glewGetProcAddress((const GLubyte*)"glEndPerfQueryINTEL")) == NULL) || r;
+  r = ((glGetFirstPerfQueryIdINTEL = (PFNGLGETFIRSTPERFQUERYIDINTELPROC)glewGetProcAddress((const GLubyte*)"glGetFirstPerfQueryIdINTEL")) == NULL) || r;
+  r = ((glGetNextPerfQueryIdINTEL = (PFNGLGETNEXTPERFQUERYIDINTELPROC)glewGetProcAddress((const GLubyte*)"glGetNextPerfQueryIdINTEL")) == NULL) || r;
+  r = ((glGetPerfCounterInfoINTEL = (PFNGLGETPERFCOUNTERINFOINTELPROC)glewGetProcAddress((const GLubyte*)"glGetPerfCounterInfoINTEL")) == NULL) || r;
+  r = ((glGetPerfQueryDataINTEL = (PFNGLGETPERFQUERYDATAINTELPROC)glewGetProcAddress((const GLubyte*)"glGetPerfQueryDataINTEL")) == NULL) || r;
+  r = ((glGetPerfQueryIdByNameINTEL = (PFNGLGETPERFQUERYIDBYNAMEINTELPROC)glewGetProcAddress((const GLubyte*)"glGetPerfQueryIdByNameINTEL")) == NULL) || r;
+  r = ((glGetPerfQueryInfoINTEL = (PFNGLGETPERFQUERYINFOINTELPROC)glewGetProcAddress((const GLubyte*)"glGetPerfQueryInfoINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_performance_query */
+
+#ifdef GL_INTEL_texture_scissor
+
+static GLboolean _glewInit_GL_INTEL_texture_scissor ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexScissorFuncINTEL = (PFNGLTEXSCISSORFUNCINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorFuncINTEL")) == NULL) || r;
+  r = ((glTexScissorINTEL = (PFNGLTEXSCISSORINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_texture_scissor */
+
+#ifdef GL_KHR_blend_equation_advanced
+
+static GLboolean _glewInit_GL_KHR_blend_equation_advanced ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendBarrierKHR = (PFNGLBLENDBARRIERKHRPROC)glewGetProcAddress((const GLubyte*)"glBlendBarrierKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KHR_blend_equation_advanced */
+
+#ifdef GL_KHR_debug
+
+static GLboolean _glewInit_GL_KHR_debug ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallback")) == NULL) || r;
+  r = ((glDebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageControl")) == NULL) || r;
+  r = ((glDebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsert")) == NULL) || r;
+  r = ((glGetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLog")) == NULL) || r;
+  r = ((glGetObjectLabel = (PFNGLGETOBJECTLABELPROC)glewGetProcAddress((const GLubyte*)"glGetObjectLabel")) == NULL) || r;
+  r = ((glGetObjectPtrLabel = (PFNGLGETOBJECTPTRLABELPROC)glewGetProcAddress((const GLubyte*)"glGetObjectPtrLabel")) == NULL) || r;
+  r = ((glObjectLabel = (PFNGLOBJECTLABELPROC)glewGetProcAddress((const GLubyte*)"glObjectLabel")) == NULL) || r;
+  r = ((glObjectPtrLabel = (PFNGLOBJECTPTRLABELPROC)glewGetProcAddress((const GLubyte*)"glObjectPtrLabel")) == NULL) || r;
+  r = ((glPopDebugGroup = (PFNGLPOPDEBUGGROUPPROC)glewGetProcAddress((const GLubyte*)"glPopDebugGroup")) == NULL) || r;
+  r = ((glPushDebugGroup = (PFNGLPUSHDEBUGGROUPPROC)glewGetProcAddress((const GLubyte*)"glPushDebugGroup")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KHR_debug */
+
+#ifdef GL_KHR_parallel_shader_compile
+
+static GLboolean _glewInit_GL_KHR_parallel_shader_compile ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMaxShaderCompilerThreadsKHR = (PFNGLMAXSHADERCOMPILERTHREADSKHRPROC)glewGetProcAddress((const GLubyte*)"glMaxShaderCompilerThreadsKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KHR_parallel_shader_compile */
+
+#ifdef GL_KHR_robustness
+
+static GLboolean _glewInit_GL_KHR_robustness ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetnUniformfv = (PFNGLGETNUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformfv")) == NULL) || r;
+  r = ((glGetnUniformiv = (PFNGLGETNUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformiv")) == NULL) || r;
+  r = ((glGetnUniformuiv = (PFNGLGETNUNIFORMUIVPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformuiv")) == NULL) || r;
+  r = ((glReadnPixels = (PFNGLREADNPIXELSPROC)glewGetProcAddress((const GLubyte*)"glReadnPixels")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KHR_robustness */
+
+#ifdef GL_KTX_buffer_region
+
+static GLboolean _glewInit_GL_KTX_buffer_region ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferRegionEnabled = (PFNGLBUFFERREGIONENABLEDPROC)glewGetProcAddress((const GLubyte*)"glBufferRegionEnabled")) == NULL) || r;
+  r = ((glDeleteBufferRegion = (PFNGLDELETEBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glDeleteBufferRegion")) == NULL) || r;
+  r = ((glDrawBufferRegion = (PFNGLDRAWBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glDrawBufferRegion")) == NULL) || r;
+  r = ((glNewBufferRegion = (PFNGLNEWBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glNewBufferRegion")) == NULL) || r;
+  r = ((glReadBufferRegion = (PFNGLREADBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glReadBufferRegion")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KTX_buffer_region */
+
+#ifdef GL_MESA_resize_buffers
+
+static GLboolean _glewInit_GL_MESA_resize_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glResizeBuffersMESA = (PFNGLRESIZEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glResizeBuffersMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_MESA_resize_buffers */
+
+#ifdef GL_MESA_window_pos
+
+static GLboolean _glewInit_GL_MESA_window_pos ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glWindowPos2dMESA = (PFNGLWINDOWPOS2DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dMESA")) == NULL) || r;
+  r = ((glWindowPos2dvMESA = (PFNGLWINDOWPOS2DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvMESA")) == NULL) || r;
+  r = ((glWindowPos2fMESA = (PFNGLWINDOWPOS2FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fMESA")) == NULL) || r;
+  r = ((glWindowPos2fvMESA = (PFNGLWINDOWPOS2FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvMESA")) == NULL) || r;
+  r = ((glWindowPos2iMESA = (PFNGLWINDOWPOS2IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iMESA")) == NULL) || r;
+  r = ((glWindowPos2ivMESA = (PFNGLWINDOWPOS2IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivMESA")) == NULL) || r;
+  r = ((glWindowPos2sMESA = (PFNGLWINDOWPOS2SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sMESA")) == NULL) || r;
+  r = ((glWindowPos2svMESA = (PFNGLWINDOWPOS2SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svMESA")) == NULL) || r;
+  r = ((glWindowPos3dMESA = (PFNGLWINDOWPOS3DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dMESA")) == NULL) || r;
+  r = ((glWindowPos3dvMESA = (PFNGLWINDOWPOS3DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvMESA")) == NULL) || r;
+  r = ((glWindowPos3fMESA = (PFNGLWINDOWPOS3FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fMESA")) == NULL) || r;
+  r = ((glWindowPos3fvMESA = (PFNGLWINDOWPOS3FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvMESA")) == NULL) || r;
+  r = ((glWindowPos3iMESA = (PFNGLWINDOWPOS3IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iMESA")) == NULL) || r;
+  r = ((glWindowPos3ivMESA = (PFNGLWINDOWPOS3IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivMESA")) == NULL) || r;
+  r = ((glWindowPos3sMESA = (PFNGLWINDOWPOS3SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sMESA")) == NULL) || r;
+  r = ((glWindowPos3svMESA = (PFNGLWINDOWPOS3SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svMESA")) == NULL) || r;
+  r = ((glWindowPos4dMESA = (PFNGLWINDOWPOS4DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dMESA")) == NULL) || r;
+  r = ((glWindowPos4dvMESA = (PFNGLWINDOWPOS4DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dvMESA")) == NULL) || r;
+  r = ((glWindowPos4fMESA = (PFNGLWINDOWPOS4FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fMESA")) == NULL) || r;
+  r = ((glWindowPos4fvMESA = (PFNGLWINDOWPOS4FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fvMESA")) == NULL) || r;
+  r = ((glWindowPos4iMESA = (PFNGLWINDOWPOS4IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4iMESA")) == NULL) || r;
+  r = ((glWindowPos4ivMESA = (PFNGLWINDOWPOS4IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4ivMESA")) == NULL) || r;
+  r = ((glWindowPos4sMESA = (PFNGLWINDOWPOS4SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4sMESA")) == NULL) || r;
+  r = ((glWindowPos4svMESA = (PFNGLWINDOWPOS4SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4svMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_MESA_window_pos */
+
+#ifdef GL_NVX_conditional_render
+
+static GLboolean _glewInit_GL_NVX_conditional_render ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginConditionalRenderNVX = (PFNGLBEGINCONDITIONALRENDERNVXPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRenderNVX")) == NULL) || r;
+  r = ((glEndConditionalRenderNVX = (PFNGLENDCONDITIONALRENDERNVXPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRenderNVX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NVX_conditional_render */
+
+#ifdef GL_NVX_linked_gpu_multicast
+
+static GLboolean _glewInit_GL_NVX_linked_gpu_multicast ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLGPUCopyImageSubDataNVX = (PFNGLLGPUCOPYIMAGESUBDATANVXPROC)glewGetProcAddress((const GLubyte*)"glLGPUCopyImageSubDataNVX")) == NULL) || r;
+  r = ((glLGPUInterlockNVX = (PFNGLLGPUINTERLOCKNVXPROC)glewGetProcAddress((const GLubyte*)"glLGPUInterlockNVX")) == NULL) || r;
+  r = ((glLGPUNamedBufferSubDataNVX = (PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC)glewGetProcAddress((const GLubyte*)"glLGPUNamedBufferSubDataNVX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NVX_linked_gpu_multicast */
+
+#ifdef GL_NV_3dvision_settings
+
+static GLboolean _glewInit_GL_NV_3dvision_settings ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStereoParameterfNV = (PFNGLSTEREOPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glStereoParameterfNV")) == NULL) || r;
+  r = ((glStereoParameteriNV = (PFNGLSTEREOPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glStereoParameteriNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_3dvision_settings */
+
+#ifdef GL_NV_bindless_multi_draw_indirect
+
+static GLboolean _glewInit_GL_NV_bindless_multi_draw_indirect ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectBindlessNV = (PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectBindlessNV")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectBindlessNV = (PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectBindlessNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+#ifdef GL_NV_bindless_multi_draw_indirect_count
+
+static GLboolean _glewInit_GL_NV_bindless_multi_draw_indirect_count ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysIndirectBindlessCountNV = (PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectBindlessCountNV")) == NULL) || r;
+  r = ((glMultiDrawElementsIndirectBindlessCountNV = (PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectBindlessCountNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+
+#ifdef GL_NV_bindless_texture
+
+static GLboolean _glewInit_GL_NV_bindless_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetImageHandleNV = (PFNGLGETIMAGEHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetImageHandleNV")) == NULL) || r;
+  r = ((glGetTextureHandleNV = (PFNGLGETTEXTUREHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureHandleNV")) == NULL) || r;
+  r = ((glGetTextureSamplerHandleNV = (PFNGLGETTEXTURESAMPLERHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureSamplerHandleNV")) == NULL) || r;
+  r = ((glIsImageHandleResidentNV = (PFNGLISIMAGEHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsImageHandleResidentNV")) == NULL) || r;
+  r = ((glIsTextureHandleResidentNV = (PFNGLISTEXTUREHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsTextureHandleResidentNV")) == NULL) || r;
+  r = ((glMakeImageHandleNonResidentNV = (PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleNonResidentNV")) == NULL) || r;
+  r = ((glMakeImageHandleResidentNV = (PFNGLMAKEIMAGEHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleResidentNV")) == NULL) || r;
+  r = ((glMakeTextureHandleNonResidentNV = (PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleNonResidentNV")) == NULL) || r;
+  r = ((glMakeTextureHandleResidentNV = (PFNGLMAKETEXTUREHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleResidentNV")) == NULL) || r;
+  r = ((glProgramUniformHandleui64NV = (PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64NV")) == NULL) || r;
+  r = ((glProgramUniformHandleui64vNV = (PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64vNV")) == NULL) || r;
+  r = ((glUniformHandleui64NV = (PFNGLUNIFORMHANDLEUI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64NV")) == NULL) || r;
+  r = ((glUniformHandleui64vNV = (PFNGLUNIFORMHANDLEUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64vNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_bindless_texture */
+
+#ifdef GL_NV_blend_equation_advanced
+
+static GLboolean _glewInit_GL_NV_blend_equation_advanced ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendBarrierNV = (PFNGLBLENDBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glBlendBarrierNV")) == NULL) || r;
+  r = ((glBlendParameteriNV = (PFNGLBLENDPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glBlendParameteriNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_blend_equation_advanced */
+
+#ifdef GL_NV_clip_space_w_scaling
+
+static GLboolean _glewInit_GL_NV_clip_space_w_scaling ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glViewportPositionWScaleNV = (PFNGLVIEWPORTPOSITIONWSCALENVPROC)glewGetProcAddress((const GLubyte*)"glViewportPositionWScaleNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_clip_space_w_scaling */
+
+#ifdef GL_NV_command_list
+
+static GLboolean _glewInit_GL_NV_command_list ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCallCommandListNV = (PFNGLCALLCOMMANDLISTNVPROC)glewGetProcAddress((const GLubyte*)"glCallCommandListNV")) == NULL) || r;
+  r = ((glCommandListSegmentsNV = (PFNGLCOMMANDLISTSEGMENTSNVPROC)glewGetProcAddress((const GLubyte*)"glCommandListSegmentsNV")) == NULL) || r;
+  r = ((glCompileCommandListNV = (PFNGLCOMPILECOMMANDLISTNVPROC)glewGetProcAddress((const GLubyte*)"glCompileCommandListNV")) == NULL) || r;
+  r = ((glCreateCommandListsNV = (PFNGLCREATECOMMANDLISTSNVPROC)glewGetProcAddress((const GLubyte*)"glCreateCommandListsNV")) == NULL) || r;
+  r = ((glCreateStatesNV = (PFNGLCREATESTATESNVPROC)glewGetProcAddress((const GLubyte*)"glCreateStatesNV")) == NULL) || r;
+  r = ((glDeleteCommandListsNV = (PFNGLDELETECOMMANDLISTSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteCommandListsNV")) == NULL) || r;
+  r = ((glDeleteStatesNV = (PFNGLDELETESTATESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteStatesNV")) == NULL) || r;
+  r = ((glDrawCommandsAddressNV = (PFNGLDRAWCOMMANDSADDRESSNVPROC)glewGetProcAddress((const GLubyte*)"glDrawCommandsAddressNV")) == NULL) || r;
+  r = ((glDrawCommandsNV = (PFNGLDRAWCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glDrawCommandsNV")) == NULL) || r;
+  r = ((glDrawCommandsStatesAddressNV = (PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC)glewGetProcAddress((const GLubyte*)"glDrawCommandsStatesAddressNV")) == NULL) || r;
+  r = ((glDrawCommandsStatesNV = (PFNGLDRAWCOMMANDSSTATESNVPROC)glewGetProcAddress((const GLubyte*)"glDrawCommandsStatesNV")) == NULL) || r;
+  r = ((glGetCommandHeaderNV = (PFNGLGETCOMMANDHEADERNVPROC)glewGetProcAddress((const GLubyte*)"glGetCommandHeaderNV")) == NULL) || r;
+  r = ((glGetStageIndexNV = (PFNGLGETSTAGEINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glGetStageIndexNV")) == NULL) || r;
+  r = ((glIsCommandListNV = (PFNGLISCOMMANDLISTNVPROC)glewGetProcAddress((const GLubyte*)"glIsCommandListNV")) == NULL) || r;
+  r = ((glIsStateNV = (PFNGLISSTATENVPROC)glewGetProcAddress((const GLubyte*)"glIsStateNV")) == NULL) || r;
+  r = ((glListDrawCommandsStatesClientNV = (PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC)glewGetProcAddress((const GLubyte*)"glListDrawCommandsStatesClientNV")) == NULL) || r;
+  r = ((glStateCaptureNV = (PFNGLSTATECAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glStateCaptureNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_command_list */
+
+#ifdef GL_NV_conditional_render
+
+static GLboolean _glewInit_GL_NV_conditional_render ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginConditionalRenderNV = (PFNGLBEGINCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRenderNV")) == NULL) || r;
+  r = ((glEndConditionalRenderNV = (PFNGLENDCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRenderNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_conditional_render */
+
+#ifdef GL_NV_conservative_raster
+
+static GLboolean _glewInit_GL_NV_conservative_raster ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSubpixelPrecisionBiasNV = (PFNGLSUBPIXELPRECISIONBIASNVPROC)glewGetProcAddress((const GLubyte*)"glSubpixelPrecisionBiasNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_conservative_raster */
+
+#ifdef GL_NV_conservative_raster_dilate
+
+static GLboolean _glewInit_GL_NV_conservative_raster_dilate ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glConservativeRasterParameterfNV = (PFNGLCONSERVATIVERASTERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glConservativeRasterParameterfNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_conservative_raster_dilate */
+
+#ifdef GL_NV_conservative_raster_pre_snap_triangles
+
+static GLboolean _glewInit_GL_NV_conservative_raster_pre_snap_triangles ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glConservativeRasterParameteriNV = (PFNGLCONSERVATIVERASTERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glConservativeRasterParameteriNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_conservative_raster_pre_snap_triangles */
+
+#ifdef GL_NV_copy_buffer
+
+static GLboolean _glewInit_GL_NV_copy_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyBufferSubDataNV = (PFNGLCOPYBUFFERSUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glCopyBufferSubDataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_copy_buffer */
+
+#ifdef GL_NV_copy_image
+
+static GLboolean _glewInit_GL_NV_copy_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyImageSubDataNV = (PFNGLCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glCopyImageSubDataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_copy_image */
+
+#ifdef GL_NV_depth_buffer_float
+
+static GLboolean _glewInit_GL_NV_depth_buffer_float ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClearDepthdNV = (PFNGLCLEARDEPTHDNVPROC)glewGetProcAddress((const GLubyte*)"glClearDepthdNV")) == NULL) || r;
+  r = ((glDepthBoundsdNV = (PFNGLDEPTHBOUNDSDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsdNV")) == NULL) || r;
+  r = ((glDepthRangedNV = (PFNGLDEPTHRANGEDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangedNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_depth_buffer_float */
+
+#ifdef GL_NV_draw_buffers
+
+static GLboolean _glewInit_GL_NV_draw_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersNV = (PFNGLDRAWBUFFERSNVPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_draw_buffers */
+
+#ifdef GL_NV_draw_instanced
+
+static GLboolean _glewInit_GL_NV_draw_instanced ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawArraysInstancedNV = (PFNGLDRAWARRAYSINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedNV")) == NULL) || r;
+  r = ((glDrawElementsInstancedNV = (PFNGLDRAWELEMENTSINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_draw_instanced */
+
+#ifdef GL_NV_draw_texture
+
+static GLboolean _glewInit_GL_NV_draw_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawTextureNV = (PFNGLDRAWTEXTURENVPROC)glewGetProcAddress((const GLubyte*)"glDrawTextureNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_draw_texture */
+
+#ifdef GL_NV_draw_vulkan_image
+
+static GLboolean _glewInit_GL_NV_draw_vulkan_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawVkImageNV = (PFNGLDRAWVKIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glDrawVkImageNV")) == NULL) || r;
+  r = ((glGetVkProcAddrNV = (PFNGLGETVKPROCADDRNVPROC)glewGetProcAddress((const GLubyte*)"glGetVkProcAddrNV")) == NULL) || r;
+  r = ((glSignalVkFenceNV = (PFNGLSIGNALVKFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSignalVkFenceNV")) == NULL) || r;
+  r = ((glSignalVkSemaphoreNV = (PFNGLSIGNALVKSEMAPHORENVPROC)glewGetProcAddress((const GLubyte*)"glSignalVkSemaphoreNV")) == NULL) || r;
+  r = ((glWaitVkSemaphoreNV = (PFNGLWAITVKSEMAPHORENVPROC)glewGetProcAddress((const GLubyte*)"glWaitVkSemaphoreNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_draw_vulkan_image */
+
+#ifdef GL_NV_evaluators
+
+static GLboolean _glewInit_GL_NV_evaluators ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glEvalMapsNV = (PFNGLEVALMAPSNVPROC)glewGetProcAddress((const GLubyte*)"glEvalMapsNV")) == NULL) || r;
+  r = ((glGetMapAttribParameterfvNV = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterfvNV")) == NULL) || r;
+  r = ((glGetMapAttribParameterivNV = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterivNV")) == NULL) || r;
+  r = ((glGetMapControlPointsNV = (PFNGLGETMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapControlPointsNV")) == NULL) || r;
+  r = ((glGetMapParameterfvNV = (PFNGLGETMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterfvNV")) == NULL) || r;
+  r = ((glGetMapParameterivNV = (PFNGLGETMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterivNV")) == NULL) || r;
+  r = ((glMapControlPointsNV = (PFNGLMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glMapControlPointsNV")) == NULL) || r;
+  r = ((glMapParameterfvNV = (PFNGLMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterfvNV")) == NULL) || r;
+  r = ((glMapParameterivNV = (PFNGLMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_evaluators */
+
+#ifdef GL_NV_explicit_multisample
+
+static GLboolean _glewInit_GL_NV_explicit_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetMultisamplefvNV = (PFNGLGETMULTISAMPLEFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefvNV")) == NULL) || r;
+  r = ((glSampleMaskIndexedNV = (PFNGLSAMPLEMASKINDEXEDNVPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskIndexedNV")) == NULL) || r;
+  r = ((glTexRenderbufferNV = (PFNGLTEXRENDERBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glTexRenderbufferNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_explicit_multisample */
+
+#ifdef GL_NV_fence
+
+static GLboolean _glewInit_GL_NV_fence ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesNV")) == NULL) || r;
+  r = ((glFinishFenceNV = (PFNGLFINISHFENCENVPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceNV")) == NULL) || r;
+  r = ((glGenFencesNV = (PFNGLGENFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glGenFencesNV")) == NULL) || r;
+  r = ((glGetFenceivNV = (PFNGLGETFENCEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFenceivNV")) == NULL) || r;
+  r = ((glIsFenceNV = (PFNGLISFENCENVPROC)glewGetProcAddress((const GLubyte*)"glIsFenceNV")) == NULL) || r;
+  r = ((glSetFenceNV = (PFNGLSETFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSetFenceNV")) == NULL) || r;
+  r = ((glTestFenceNV = (PFNGLTESTFENCENVPROC)glewGetProcAddress((const GLubyte*)"glTestFenceNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_fence */
+
+#ifdef GL_NV_fragment_coverage_to_color
+
+static GLboolean _glewInit_GL_NV_fragment_coverage_to_color ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFragmentCoverageColorNV = (PFNGLFRAGMENTCOVERAGECOLORNVPROC)glewGetProcAddress((const GLubyte*)"glFragmentCoverageColorNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_fragment_coverage_to_color */
+
+#ifdef GL_NV_fragment_program
+
+static GLboolean _glewInit_GL_NV_fragment_program ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetProgramNamedParameterdvNV = (PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterdvNV")) == NULL) || r;
+  r = ((glGetProgramNamedParameterfvNV = (PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterfvNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4dNV = (PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4dvNV = (PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dvNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4fNV = (PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4fvNV = (PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_fragment_program */
+
+#ifdef GL_NV_framebuffer_blit
+
+static GLboolean _glewInit_GL_NV_framebuffer_blit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlitFramebufferNV = (PFNGLBLITFRAMEBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_framebuffer_blit */
+
+#ifdef GL_NV_framebuffer_multisample
+
+static GLboolean _glewInit_GL_NV_framebuffer_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleNV = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_framebuffer_multisample */
+
+#ifdef GL_NV_framebuffer_multisample_coverage
+
+static GLboolean _glewInit_GL_NV_framebuffer_multisample_coverage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleCoverageNV = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleCoverageNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+#ifdef GL_NV_geometry_program4
+
+static GLboolean _glewInit_GL_NV_geometry_program4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProgramVertexLimitNV = (PFNGLPROGRAMVERTEXLIMITNVPROC)glewGetProcAddress((const GLubyte*)"glProgramVertexLimitNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_geometry_program4 */
+
+#ifdef GL_NV_gpu_multicast
+
+static GLboolean _glewInit_GL_NV_gpu_multicast ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMulticastBarrierNV = (PFNGLMULTICASTBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastBarrierNV")) == NULL) || r;
+  r = ((glMulticastBlitFramebufferNV = (PFNGLMULTICASTBLITFRAMEBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastBlitFramebufferNV")) == NULL) || r;
+  r = ((glMulticastBufferSubDataNV = (PFNGLMULTICASTBUFFERSUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glMulticastBufferSubDataNV")) == NULL) || r;
+  r = ((glMulticastCopyBufferSubDataNV = (PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glMulticastCopyBufferSubDataNV")) == NULL) || r;
+  r = ((glMulticastCopyImageSubDataNV = (PFNGLMULTICASTCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glMulticastCopyImageSubDataNV")) == NULL) || r;
+  r = ((glMulticastFramebufferSampleLocationsfvNV = (PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastFramebufferSampleLocationsfvNV")) == NULL) || r;
+  r = ((glMulticastGetQueryObjecti64vNV = (PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastGetQueryObjecti64vNV")) == NULL) || r;
+  r = ((glMulticastGetQueryObjectivNV = (PFNGLMULTICASTGETQUERYOBJECTIVNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastGetQueryObjectivNV")) == NULL) || r;
+  r = ((glMulticastGetQueryObjectui64vNV = (PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastGetQueryObjectui64vNV")) == NULL) || r;
+  r = ((glMulticastGetQueryObjectuivNV = (PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastGetQueryObjectuivNV")) == NULL) || r;
+  r = ((glMulticastWaitSyncNV = (PFNGLMULTICASTWAITSYNCNVPROC)glewGetProcAddress((const GLubyte*)"glMulticastWaitSyncNV")) == NULL) || r;
+  r = ((glRenderGpuMaskNV = (PFNGLRENDERGPUMASKNVPROC)glewGetProcAddress((const GLubyte*)"glRenderGpuMaskNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_gpu_multicast */
+
+#ifdef GL_NV_gpu_program4
+
+static GLboolean _glewInit_GL_NV_gpu_program4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProgramEnvParameterI4iNV = (PFNGLPROGRAMENVPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4iNV")) == NULL) || r;
+  r = ((glProgramEnvParameterI4ivNV = (PFNGLPROGRAMENVPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4ivNV")) == NULL) || r;
+  r = ((glProgramEnvParameterI4uiNV = (PFNGLPROGRAMENVPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uiNV")) == NULL) || r;
+  r = ((glProgramEnvParameterI4uivNV = (PFNGLPROGRAMENVPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uivNV")) == NULL) || r;
+  r = ((glProgramEnvParametersI4ivNV = (PFNGLPROGRAMENVPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4ivNV")) == NULL) || r;
+  r = ((glProgramEnvParametersI4uivNV = (PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4uivNV")) == NULL) || r;
+  r = ((glProgramLocalParameterI4iNV = (PFNGLPROGRAMLOCALPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4iNV")) == NULL) || r;
+  r = ((glProgramLocalParameterI4ivNV = (PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4ivNV")) == NULL) || r;
+  r = ((glProgramLocalParameterI4uiNV = (PFNGLPROGRAMLOCALPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uiNV")) == NULL) || r;
+  r = ((glProgramLocalParameterI4uivNV = (PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uivNV")) == NULL) || r;
+  r = ((glProgramLocalParametersI4ivNV = (PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4ivNV")) == NULL) || r;
+  r = ((glProgramLocalParametersI4uivNV = (PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4uivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_gpu_program4 */
+
+#ifdef GL_NV_gpu_shader5
+
+static GLboolean _glewInit_GL_NV_gpu_shader5 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetUniformi64vNV = (PFNGLGETUNIFORMI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformi64vNV")) == NULL) || r;
+  r = ((glGetUniformui64vNV = (PFNGLGETUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformui64vNV")) == NULL) || r;
+  r = ((glProgramUniform1i64NV = (PFNGLPROGRAMUNIFORM1I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64NV")) == NULL) || r;
+  r = ((glProgramUniform1i64vNV = (PFNGLPROGRAMUNIFORM1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64vNV")) == NULL) || r;
+  r = ((glProgramUniform1ui64NV = (PFNGLPROGRAMUNIFORM1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64NV")) == NULL) || r;
+  r = ((glProgramUniform1ui64vNV = (PFNGLPROGRAMUNIFORM1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64vNV")) == NULL) || r;
+  r = ((glProgramUniform2i64NV = (PFNGLPROGRAMUNIFORM2I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64NV")) == NULL) || r;
+  r = ((glProgramUniform2i64vNV = (PFNGLPROGRAMUNIFORM2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64vNV")) == NULL) || r;
+  r = ((glProgramUniform2ui64NV = (PFNGLPROGRAMUNIFORM2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64NV")) == NULL) || r;
+  r = ((glProgramUniform2ui64vNV = (PFNGLPROGRAMUNIFORM2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64vNV")) == NULL) || r;
+  r = ((glProgramUniform3i64NV = (PFNGLPROGRAMUNIFORM3I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64NV")) == NULL) || r;
+  r = ((glProgramUniform3i64vNV = (PFNGLPROGRAMUNIFORM3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64vNV")) == NULL) || r;
+  r = ((glProgramUniform3ui64NV = (PFNGLPROGRAMUNIFORM3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64NV")) == NULL) || r;
+  r = ((glProgramUniform3ui64vNV = (PFNGLPROGRAMUNIFORM3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64vNV")) == NULL) || r;
+  r = ((glProgramUniform4i64NV = (PFNGLPROGRAMUNIFORM4I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64NV")) == NULL) || r;
+  r = ((glProgramUniform4i64vNV = (PFNGLPROGRAMUNIFORM4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64vNV")) == NULL) || r;
+  r = ((glProgramUniform4ui64NV = (PFNGLPROGRAMUNIFORM4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64NV")) == NULL) || r;
+  r = ((glProgramUniform4ui64vNV = (PFNGLPROGRAMUNIFORM4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64vNV")) == NULL) || r;
+  r = ((glUniform1i64NV = (PFNGLUNIFORM1I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64NV")) == NULL) || r;
+  r = ((glUniform1i64vNV = (PFNGLUNIFORM1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64vNV")) == NULL) || r;
+  r = ((glUniform1ui64NV = (PFNGLUNIFORM1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64NV")) == NULL) || r;
+  r = ((glUniform1ui64vNV = (PFNGLUNIFORM1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64vNV")) == NULL) || r;
+  r = ((glUniform2i64NV = (PFNGLUNIFORM2I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64NV")) == NULL) || r;
+  r = ((glUniform2i64vNV = (PFNGLUNIFORM2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64vNV")) == NULL) || r;
+  r = ((glUniform2ui64NV = (PFNGLUNIFORM2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64NV")) == NULL) || r;
+  r = ((glUniform2ui64vNV = (PFNGLUNIFORM2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64vNV")) == NULL) || r;
+  r = ((glUniform3i64NV = (PFNGLUNIFORM3I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64NV")) == NULL) || r;
+  r = ((glUniform3i64vNV = (PFNGLUNIFORM3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64vNV")) == NULL) || r;
+  r = ((glUniform3ui64NV = (PFNGLUNIFORM3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64NV")) == NULL) || r;
+  r = ((glUniform3ui64vNV = (PFNGLUNIFORM3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64vNV")) == NULL) || r;
+  r = ((glUniform4i64NV = (PFNGLUNIFORM4I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64NV")) == NULL) || r;
+  r = ((glUniform4i64vNV = (PFNGLUNIFORM4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64vNV")) == NULL) || r;
+  r = ((glUniform4ui64NV = (PFNGLUNIFORM4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64NV")) == NULL) || r;
+  r = ((glUniform4ui64vNV = (PFNGLUNIFORM4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64vNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_gpu_shader5 */
+
+#ifdef GL_NV_half_float
+
+static GLboolean _glewInit_GL_NV_half_float ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColor3hNV = (PFNGLCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hNV")) == NULL) || r;
+  r = ((glColor3hvNV = (PFNGLCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hvNV")) == NULL) || r;
+  r = ((glColor4hNV = (PFNGLCOLOR4HNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hNV")) == NULL) || r;
+  r = ((glColor4hvNV = (PFNGLCOLOR4HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hvNV")) == NULL) || r;
+  r = ((glFogCoordhNV = (PFNGLFOGCOORDHNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhNV")) == NULL) || r;
+  r = ((glFogCoordhvNV = (PFNGLFOGCOORDHVNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhvNV")) == NULL) || r;
+  r = ((glMultiTexCoord1hNV = (PFNGLMULTITEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hNV")) == NULL) || r;
+  r = ((glMultiTexCoord1hvNV = (PFNGLMULTITEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord2hNV = (PFNGLMULTITEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hNV")) == NULL) || r;
+  r = ((glMultiTexCoord2hvNV = (PFNGLMULTITEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord3hNV = (PFNGLMULTITEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hNV")) == NULL) || r;
+  r = ((glMultiTexCoord3hvNV = (PFNGLMULTITEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord4hNV = (PFNGLMULTITEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hNV")) == NULL) || r;
+  r = ((glMultiTexCoord4hvNV = (PFNGLMULTITEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hvNV")) == NULL) || r;
+  r = ((glNormal3hNV = (PFNGLNORMAL3HNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hNV")) == NULL) || r;
+  r = ((glNormal3hvNV = (PFNGLNORMAL3HVNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hvNV")) == NULL) || r;
+  r = ((glSecondaryColor3hNV = (PFNGLSECONDARYCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hNV")) == NULL) || r;
+  r = ((glSecondaryColor3hvNV = (PFNGLSECONDARYCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hvNV")) == NULL) || r;
+  r = ((glTexCoord1hNV = (PFNGLTEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hNV")) == NULL) || r;
+  r = ((glTexCoord1hvNV = (PFNGLTEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hvNV")) == NULL) || r;
+  r = ((glTexCoord2hNV = (PFNGLTEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hNV")) == NULL) || r;
+  r = ((glTexCoord2hvNV = (PFNGLTEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hvNV")) == NULL) || r;
+  r = ((glTexCoord3hNV = (PFNGLTEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hNV")) == NULL) || r;
+  r = ((glTexCoord3hvNV = (PFNGLTEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hvNV")) == NULL) || r;
+  r = ((glTexCoord4hNV = (PFNGLTEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hNV")) == NULL) || r;
+  r = ((glTexCoord4hvNV = (PFNGLTEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hvNV")) == NULL) || r;
+  r = ((glVertex2hNV = (PFNGLVERTEX2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hNV")) == NULL) || r;
+  r = ((glVertex2hvNV = (PFNGLVERTEX2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hvNV")) == NULL) || r;
+  r = ((glVertex3hNV = (PFNGLVERTEX3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hNV")) == NULL) || r;
+  r = ((glVertex3hvNV = (PFNGLVERTEX3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hvNV")) == NULL) || r;
+  r = ((glVertex4hNV = (PFNGLVERTEX4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hNV")) == NULL) || r;
+  r = ((glVertex4hvNV = (PFNGLVERTEX4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hvNV")) == NULL) || r;
+  r = ((glVertexAttrib1hNV = (PFNGLVERTEXATTRIB1HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hNV")) == NULL) || r;
+  r = ((glVertexAttrib1hvNV = (PFNGLVERTEXATTRIB1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hvNV")) == NULL) || r;
+  r = ((glVertexAttrib2hNV = (PFNGLVERTEXATTRIB2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hNV")) == NULL) || r;
+  r = ((glVertexAttrib2hvNV = (PFNGLVERTEXATTRIB2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hvNV")) == NULL) || r;
+  r = ((glVertexAttrib3hNV = (PFNGLVERTEXATTRIB3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hNV")) == NULL) || r;
+  r = ((glVertexAttrib3hvNV = (PFNGLVERTEXATTRIB3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hvNV")) == NULL) || r;
+  r = ((glVertexAttrib4hNV = (PFNGLVERTEXATTRIB4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hNV")) == NULL) || r;
+  r = ((glVertexAttrib4hvNV = (PFNGLVERTEXATTRIB4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hvNV")) == NULL) || r;
+  r = ((glVertexAttribs1hvNV = (PFNGLVERTEXATTRIBS1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1hvNV")) == NULL) || r;
+  r = ((glVertexAttribs2hvNV = (PFNGLVERTEXATTRIBS2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2hvNV")) == NULL) || r;
+  r = ((glVertexAttribs3hvNV = (PFNGLVERTEXATTRIBS3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3hvNV")) == NULL) || r;
+  r = ((glVertexAttribs4hvNV = (PFNGLVERTEXATTRIBS4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4hvNV")) == NULL) || r;
+  r = ((glVertexWeighthNV = (PFNGLVERTEXWEIGHTHNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthNV")) == NULL) || r;
+  r = ((glVertexWeighthvNV = (PFNGLVERTEXWEIGHTHVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_half_float */
+
+#ifdef GL_NV_instanced_arrays
+
+static GLboolean _glewInit_GL_NV_instanced_arrays ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexAttribDivisorNV = (PFNGLVERTEXATTRIBDIVISORNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_instanced_arrays */
+
+#ifdef GL_NV_internalformat_sample_query
+
+static GLboolean _glewInit_GL_NV_internalformat_sample_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetInternalformatSampleivNV = (PFNGLGETINTERNALFORMATSAMPLEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetInternalformatSampleivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_internalformat_sample_query */
+
+#ifdef GL_NV_non_square_matrices
+
+static GLboolean _glewInit_GL_NV_non_square_matrices ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glUniformMatrix2x3fvNV = (PFNGLUNIFORMMATRIX2X3FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3fvNV")) == NULL) || r;
+  r = ((glUniformMatrix2x4fvNV = (PFNGLUNIFORMMATRIX2X4FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4fvNV")) == NULL) || r;
+  r = ((glUniformMatrix3x2fvNV = (PFNGLUNIFORMMATRIX3X2FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2fvNV")) == NULL) || r;
+  r = ((glUniformMatrix3x4fvNV = (PFNGLUNIFORMMATRIX3X4FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4fvNV")) == NULL) || r;
+  r = ((glUniformMatrix4x2fvNV = (PFNGLUNIFORMMATRIX4X2FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2fvNV")) == NULL) || r;
+  r = ((glUniformMatrix4x3fvNV = (PFNGLUNIFORMMATRIX4X3FVNVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3fvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_non_square_matrices */
+
+#ifdef GL_NV_occlusion_query
+
+static GLboolean _glewInit_GL_NV_occlusion_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glBeginOcclusionQueryNV")) == NULL) || r;
+  r = ((glDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteOcclusionQueriesNV")) == NULL) || r;
+  r = ((glEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glEndOcclusionQueryNV")) == NULL) || r;
+  r = ((glGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glGenOcclusionQueriesNV")) == NULL) || r;
+  r = ((glGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryivNV")) == NULL) || r;
+  r = ((glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryuivNV")) == NULL) || r;
+  r = ((glIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glIsOcclusionQueryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_occlusion_query */
+
+#ifdef GL_NV_parameter_buffer_object
+
+static GLboolean _glewInit_GL_NV_parameter_buffer_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glProgramBufferParametersIivNV = (PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIivNV")) == NULL) || r;
+  r = ((glProgramBufferParametersIuivNV = (PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIuivNV")) == NULL) || r;
+  r = ((glProgramBufferParametersfvNV = (PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersfvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_parameter_buffer_object */
+
+#ifdef GL_NV_path_rendering
+
+static GLboolean _glewInit_GL_NV_path_rendering ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyPathNV = (PFNGLCOPYPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCopyPathNV")) == NULL) || r;
+  r = ((glCoverFillPathInstancedNV = (PFNGLCOVERFILLPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glCoverFillPathInstancedNV")) == NULL) || r;
+  r = ((glCoverFillPathNV = (PFNGLCOVERFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCoverFillPathNV")) == NULL) || r;
+  r = ((glCoverStrokePathInstancedNV = (PFNGLCOVERSTROKEPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glCoverStrokePathInstancedNV")) == NULL) || r;
+  r = ((glCoverStrokePathNV = (PFNGLCOVERSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCoverStrokePathNV")) == NULL) || r;
+  r = ((glDeletePathsNV = (PFNGLDELETEPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glDeletePathsNV")) == NULL) || r;
+  r = ((glGenPathsNV = (PFNGLGENPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glGenPathsNV")) == NULL) || r;
+  r = ((glGetPathColorGenfvNV = (PFNGLGETPATHCOLORGENFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathColorGenfvNV")) == NULL) || r;
+  r = ((glGetPathColorGenivNV = (PFNGLGETPATHCOLORGENIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathColorGenivNV")) == NULL) || r;
+  r = ((glGetPathCommandsNV = (PFNGLGETPATHCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathCommandsNV")) == NULL) || r;
+  r = ((glGetPathCoordsNV = (PFNGLGETPATHCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathCoordsNV")) == NULL) || r;
+  r = ((glGetPathDashArrayNV = (PFNGLGETPATHDASHARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathDashArrayNV")) == NULL) || r;
+  r = ((glGetPathLengthNV = (PFNGLGETPATHLENGTHNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathLengthNV")) == NULL) || r;
+  r = ((glGetPathMetricRangeNV = (PFNGLGETPATHMETRICRANGENVPROC)glewGetProcAddress((const GLubyte*)"glGetPathMetricRangeNV")) == NULL) || r;
+  r = ((glGetPathMetricsNV = (PFNGLGETPATHMETRICSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathMetricsNV")) == NULL) || r;
+  r = ((glGetPathParameterfvNV = (PFNGLGETPATHPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathParameterfvNV")) == NULL) || r;
+  r = ((glGetPathParameterivNV = (PFNGLGETPATHPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathParameterivNV")) == NULL) || r;
+  r = ((glGetPathSpacingNV = (PFNGLGETPATHSPACINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathSpacingNV")) == NULL) || r;
+  r = ((glGetPathTexGenfvNV = (PFNGLGETPATHTEXGENFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathTexGenfvNV")) == NULL) || r;
+  r = ((glGetPathTexGenivNV = (PFNGLGETPATHTEXGENIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathTexGenivNV")) == NULL) || r;
+  r = ((glGetProgramResourcefvNV = (PFNGLGETPROGRAMRESOURCEFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourcefvNV")) == NULL) || r;
+  r = ((glInterpolatePathsNV = (PFNGLINTERPOLATEPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glInterpolatePathsNV")) == NULL) || r;
+  r = ((glIsPathNV = (PFNGLISPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPathNV")) == NULL) || r;
+  r = ((glIsPointInFillPathNV = (PFNGLISPOINTINFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPointInFillPathNV")) == NULL) || r;
+  r = ((glIsPointInStrokePathNV = (PFNGLISPOINTINSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPointInStrokePathNV")) == NULL) || r;
+  r = ((glMatrixLoad3x2fNV = (PFNGLMATRIXLOAD3X2FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoad3x2fNV")) == NULL) || r;
+  r = ((glMatrixLoad3x3fNV = (PFNGLMATRIXLOAD3X3FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoad3x3fNV")) == NULL) || r;
+  r = ((glMatrixLoadTranspose3x3fNV = (PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTranspose3x3fNV")) == NULL) || r;
+  r = ((glMatrixMult3x2fNV = (PFNGLMATRIXMULT3X2FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixMult3x2fNV")) == NULL) || r;
+  r = ((glMatrixMult3x3fNV = (PFNGLMATRIXMULT3X3FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixMult3x3fNV")) == NULL) || r;
+  r = ((glMatrixMultTranspose3x3fNV = (PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTranspose3x3fNV")) == NULL) || r;
+  r = ((glPathColorGenNV = (PFNGLPATHCOLORGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathColorGenNV")) == NULL) || r;
+  r = ((glPathCommandsNV = (PFNGLPATHCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathCommandsNV")) == NULL) || r;
+  r = ((glPathCoordsNV = (PFNGLPATHCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathCoordsNV")) == NULL) || r;
+  r = ((glPathCoverDepthFuncNV = (PFNGLPATHCOVERDEPTHFUNCNVPROC)glewGetProcAddress((const GLubyte*)"glPathCoverDepthFuncNV")) == NULL) || r;
+  r = ((glPathDashArrayNV = (PFNGLPATHDASHARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glPathDashArrayNV")) == NULL) || r;
+  r = ((glPathFogGenNV = (PFNGLPATHFOGGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathFogGenNV")) == NULL) || r;
+  r = ((glPathGlyphIndexArrayNV = (PFNGLPATHGLYPHINDEXARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphIndexArrayNV")) == NULL) || r;
+  r = ((glPathGlyphIndexRangeNV = (PFNGLPATHGLYPHINDEXRANGENVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphIndexRangeNV")) == NULL) || r;
+  r = ((glPathGlyphRangeNV = (PFNGLPATHGLYPHRANGENVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphRangeNV")) == NULL) || r;
+  r = ((glPathGlyphsNV = (PFNGLPATHGLYPHSNVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphsNV")) == NULL) || r;
+  r = ((glPathMemoryGlyphIndexArrayNV = (PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glPathMemoryGlyphIndexArrayNV")) == NULL) || r;
+  r = ((glPathParameterfNV = (PFNGLPATHPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterfNV")) == NULL) || r;
+  r = ((glPathParameterfvNV = (PFNGLPATHPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterfvNV")) == NULL) || r;
+  r = ((glPathParameteriNV = (PFNGLPATHPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPathParameteriNV")) == NULL) || r;
+  r = ((glPathParameterivNV = (PFNGLPATHPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterivNV")) == NULL) || r;
+  r = ((glPathStencilDepthOffsetNV = (PFNGLPATHSTENCILDEPTHOFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glPathStencilDepthOffsetNV")) == NULL) || r;
+  r = ((glPathStencilFuncNV = (PFNGLPATHSTENCILFUNCNVPROC)glewGetProcAddress((const GLubyte*)"glPathStencilFuncNV")) == NULL) || r;
+  r = ((glPathStringNV = (PFNGLPATHSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glPathStringNV")) == NULL) || r;
+  r = ((glPathSubCommandsNV = (PFNGLPATHSUBCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathSubCommandsNV")) == NULL) || r;
+  r = ((glPathSubCoordsNV = (PFNGLPATHSUBCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathSubCoordsNV")) == NULL) || r;
+  r = ((glPathTexGenNV = (PFNGLPATHTEXGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathTexGenNV")) == NULL) || r;
+  r = ((glPointAlongPathNV = (PFNGLPOINTALONGPATHNVPROC)glewGetProcAddress((const GLubyte*)"glPointAlongPathNV")) == NULL) || r;
+  r = ((glProgramPathFragmentInputGenNV = (PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC)glewGetProcAddress((const GLubyte*)"glProgramPathFragmentInputGenNV")) == NULL) || r;
+  r = ((glStencilFillPathInstancedNV = (PFNGLSTENCILFILLPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilFillPathInstancedNV")) == NULL) || r;
+  r = ((glStencilFillPathNV = (PFNGLSTENCILFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilFillPathNV")) == NULL) || r;
+  r = ((glStencilStrokePathInstancedNV = (PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilStrokePathInstancedNV")) == NULL) || r;
+  r = ((glStencilStrokePathNV = (PFNGLSTENCILSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilStrokePathNV")) == NULL) || r;
+  r = ((glStencilThenCoverFillPathInstancedNV = (PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilThenCoverFillPathInstancedNV")) == NULL) || r;
+  r = ((glStencilThenCoverFillPathNV = (PFNGLSTENCILTHENCOVERFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilThenCoverFillPathNV")) == NULL) || r;
+  r = ((glStencilThenCoverStrokePathInstancedNV = (PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilThenCoverStrokePathInstancedNV")) == NULL) || r;
+  r = ((glStencilThenCoverStrokePathNV = (PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilThenCoverStrokePathNV")) == NULL) || r;
+  r = ((glTransformPathNV = (PFNGLTRANSFORMPATHNVPROC)glewGetProcAddress((const GLubyte*)"glTransformPathNV")) == NULL) || r;
+  r = ((glWeightPathsNV = (PFNGLWEIGHTPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glWeightPathsNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_path_rendering */
+
+#ifdef GL_NV_pixel_data_range
+
+static GLboolean _glewInit_GL_NV_pixel_data_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushPixelDataRangeNV = (PFNGLFLUSHPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushPixelDataRangeNV")) == NULL) || r;
+  r = ((glPixelDataRangeNV = (PFNGLPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glPixelDataRangeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_pixel_data_range */
+
+#ifdef GL_NV_point_sprite
+
+static GLboolean _glewInit_GL_NV_point_sprite ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameteriNV = (PFNGLPOINTPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriNV")) == NULL) || r;
+  r = ((glPointParameterivNV = (PFNGLPOINTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_point_sprite */
+
+#ifdef GL_NV_polygon_mode
+
+static GLboolean _glewInit_GL_NV_polygon_mode ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPolygonModeNV = (PFNGLPOLYGONMODENVPROC)glewGetProcAddress((const GLubyte*)"glPolygonModeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_polygon_mode */
+
+#ifdef GL_NV_present_video
+
+static GLboolean _glewInit_GL_NV_present_video ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVideoi64vNV = (PFNGLGETVIDEOI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoi64vNV")) == NULL) || r;
+  r = ((glGetVideoivNV = (PFNGLGETVIDEOIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoivNV")) == NULL) || r;
+  r = ((glGetVideoui64vNV = (PFNGLGETVIDEOUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoui64vNV")) == NULL) || r;
+  r = ((glGetVideouivNV = (PFNGLGETVIDEOUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideouivNV")) == NULL) || r;
+  r = ((glPresentFrameDualFillNV = (PFNGLPRESENTFRAMEDUALFILLNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameDualFillNV")) == NULL) || r;
+  r = ((glPresentFrameKeyedNV = (PFNGLPRESENTFRAMEKEYEDNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameKeyedNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_present_video */
+
+#ifdef GL_NV_primitive_restart
+
+static GLboolean _glewInit_GL_NV_primitive_restart ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPrimitiveRestartIndexNV = (PFNGLPRIMITIVERESTARTINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndexNV")) == NULL) || r;
+  r = ((glPrimitiveRestartNV = (PFNGLPRIMITIVERESTARTNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_primitive_restart */
+
+#ifdef GL_NV_register_combiners
+
+static GLboolean _glewInit_GL_NV_register_combiners ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerInputNV")) == NULL) || r;
+  r = ((glCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerOutputNV")) == NULL) || r;
+  r = ((glCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfNV")) == NULL) || r;
+  r = ((glCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfvNV")) == NULL) || r;
+  r = ((glCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameteriNV")) == NULL) || r;
+  r = ((glCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterivNV")) == NULL) || r;
+  r = ((glFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glFinalCombinerInputNV")) == NULL) || r;
+  r = ((glGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterivNV")) == NULL) || r;
+  r = ((glGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterivNV")) == NULL) || r;
+  r = ((glGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterfvNV")) == NULL) || r;
+  r = ((glGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_register_combiners */
+
+#ifdef GL_NV_register_combiners2
+
+static GLboolean _glewInit_GL_NV_register_combiners2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCombinerStageParameterfvNV = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerStageParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerStageParameterfvNV = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerStageParameterfvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_register_combiners2 */
+
+#ifdef GL_NV_sample_locations
+
+static GLboolean _glewInit_GL_NV_sample_locations ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferSampleLocationsfvNV = (PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC)glewGetProcAddress((const GLubyte*)"glFramebufferSampleLocationsfvNV")) == NULL) || r;
+  r = ((glNamedFramebufferSampleLocationsfvNV = (PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferSampleLocationsfvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_sample_locations */
+
+#ifdef GL_NV_shader_buffer_load
+
+static GLboolean _glewInit_GL_NV_shader_buffer_load ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetBufferParameterui64vNV = (PFNGLGETBUFFERPARAMETERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterui64vNV")) == NULL) || r;
+  r = ((glGetIntegerui64vNV = (PFNGLGETINTEGERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerui64vNV")) == NULL) || r;
+  r = ((glGetNamedBufferParameterui64vNV = (PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterui64vNV")) == NULL) || r;
+  r = ((glIsBufferResidentNV = (PFNGLISBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsBufferResidentNV")) == NULL) || r;
+  r = ((glIsNamedBufferResidentNV = (PFNGLISNAMEDBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsNamedBufferResidentNV")) == NULL) || r;
+  r = ((glMakeBufferNonResidentNV = (PFNGLMAKEBUFFERNONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeBufferNonResidentNV")) == NULL) || r;
+  r = ((glMakeBufferResidentNV = (PFNGLMAKEBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeBufferResidentNV")) == NULL) || r;
+  r = ((glMakeNamedBufferNonResidentNV = (PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeNamedBufferNonResidentNV")) == NULL) || r;
+  r = ((glMakeNamedBufferResidentNV = (PFNGLMAKENAMEDBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeNamedBufferResidentNV")) == NULL) || r;
+  r = ((glProgramUniformui64NV = (PFNGLPROGRAMUNIFORMUI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformui64NV")) == NULL) || r;
+  r = ((glProgramUniformui64vNV = (PFNGLPROGRAMUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformui64vNV")) == NULL) || r;
+  r = ((glUniformui64NV = (PFNGLUNIFORMUI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniformui64NV")) == NULL) || r;
+  r = ((glUniformui64vNV = (PFNGLUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniformui64vNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_shader_buffer_load */
+
+#ifdef GL_NV_texture_array
+
+static GLboolean _glewInit_GL_NV_texture_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCompressedTexImage3DNV = (PFNGLCOMPRESSEDTEXIMAGE3DNVPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DNV")) == NULL) || r;
+  r = ((glCompressedTexSubImage3DNV = (PFNGLCOMPRESSEDTEXSUBIMAGE3DNVPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DNV")) == NULL) || r;
+  r = ((glCopyTexSubImage3DNV = (PFNGLCOPYTEXSUBIMAGE3DNVPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DNV")) == NULL) || r;
+  r = ((glFramebufferTextureLayerNV = (PFNGLFRAMEBUFFERTEXTURELAYERNVPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerNV")) == NULL) || r;
+  r = ((glTexImage3DNV = (PFNGLTEXIMAGE3DNVPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DNV")) == NULL) || r;
+  r = ((glTexSubImage3DNV = (PFNGLTEXSUBIMAGE3DNVPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_texture_array */
+
+#ifdef GL_NV_texture_barrier
+
+static GLboolean _glewInit_GL_NV_texture_barrier ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureBarrierNV = (PFNGLTEXTUREBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glTextureBarrierNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_texture_barrier */
+
+#ifdef GL_NV_texture_multisample
+
+static GLboolean _glewInit_GL_NV_texture_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexImage2DMultisampleCoverageNV = (PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTexImage2DMultisampleCoverageNV")) == NULL) || r;
+  r = ((glTexImage3DMultisampleCoverageNV = (PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DMultisampleCoverageNV")) == NULL) || r;
+  r = ((glTextureImage2DMultisampleCoverageNV = (PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DMultisampleCoverageNV")) == NULL) || r;
+  r = ((glTextureImage2DMultisampleNV = (PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DMultisampleNV")) == NULL) || r;
+  r = ((glTextureImage3DMultisampleCoverageNV = (PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DMultisampleCoverageNV")) == NULL) || r;
+  r = ((glTextureImage3DMultisampleNV = (PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DMultisampleNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_texture_multisample */
+
+#ifdef GL_NV_transform_feedback
+
+static GLboolean _glewInit_GL_NV_transform_feedback ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveVaryingNV = (PFNGLACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glActiveVaryingNV")) == NULL) || r;
+  r = ((glBeginTransformFeedbackNV = (PFNGLBEGINTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackNV")) == NULL) || r;
+  r = ((glBindBufferBaseNV = (PFNGLBINDBUFFERBASENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseNV")) == NULL) || r;
+  r = ((glBindBufferOffsetNV = (PFNGLBINDBUFFEROFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetNV")) == NULL) || r;
+  r = ((glBindBufferRangeNV = (PFNGLBINDBUFFERRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeNV")) == NULL) || r;
+  r = ((glEndTransformFeedbackNV = (PFNGLENDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackNV")) == NULL) || r;
+  r = ((glGetActiveVaryingNV = (PFNGLGETACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveVaryingNV")) == NULL) || r;
+  r = ((glGetTransformFeedbackVaryingNV = (PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingNV")) == NULL) || r;
+  r = ((glGetVaryingLocationNV = (PFNGLGETVARYINGLOCATIONNVPROC)glewGetProcAddress((const GLubyte*)"glGetVaryingLocationNV")) == NULL) || r;
+  r = ((glTransformFeedbackAttribsNV = (PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackAttribsNV")) == NULL) || r;
+  r = ((glTransformFeedbackVaryingsNV = (PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_transform_feedback */
+
+#ifdef GL_NV_transform_feedback2
+
+static GLboolean _glewInit_GL_NV_transform_feedback2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindTransformFeedbackNV = (PFNGLBINDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBindTransformFeedbackNV")) == NULL) || r;
+  r = ((glDeleteTransformFeedbacksNV = (PFNGLDELETETRANSFORMFEEDBACKSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteTransformFeedbacksNV")) == NULL) || r;
+  r = ((glDrawTransformFeedbackNV = (PFNGLDRAWTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackNV")) == NULL) || r;
+  r = ((glGenTransformFeedbacksNV = (PFNGLGENTRANSFORMFEEDBACKSNVPROC)glewGetProcAddress((const GLubyte*)"glGenTransformFeedbacksNV")) == NULL) || r;
+  r = ((glIsTransformFeedbackNV = (PFNGLISTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glIsTransformFeedbackNV")) == NULL) || r;
+  r = ((glPauseTransformFeedbackNV = (PFNGLPAUSETRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glPauseTransformFeedbackNV")) == NULL) || r;
+  r = ((glResumeTransformFeedbackNV = (PFNGLRESUMETRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glResumeTransformFeedbackNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_transform_feedback2 */
+
+#ifdef GL_NV_vdpau_interop
+
+static GLboolean _glewInit_GL_NV_vdpau_interop ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVDPAUFiniNV = (PFNGLVDPAUFININVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUFiniNV")) == NULL) || r;
+  r = ((glVDPAUGetSurfaceivNV = (PFNGLVDPAUGETSURFACEIVNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUGetSurfaceivNV")) == NULL) || r;
+  r = ((glVDPAUInitNV = (PFNGLVDPAUINITNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUInitNV")) == NULL) || r;
+  r = ((glVDPAUIsSurfaceNV = (PFNGLVDPAUISSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUIsSurfaceNV")) == NULL) || r;
+  r = ((glVDPAUMapSurfacesNV = (PFNGLVDPAUMAPSURFACESNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUMapSurfacesNV")) == NULL) || r;
+  r = ((glVDPAURegisterOutputSurfaceNV = (PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAURegisterOutputSurfaceNV")) == NULL) || r;
+  r = ((glVDPAURegisterVideoSurfaceNV = (PFNGLVDPAUREGISTERVIDEOSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAURegisterVideoSurfaceNV")) == NULL) || r;
+  r = ((glVDPAUSurfaceAccessNV = (PFNGLVDPAUSURFACEACCESSNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUSurfaceAccessNV")) == NULL) || r;
+  r = ((glVDPAUUnmapSurfacesNV = (PFNGLVDPAUUNMAPSURFACESNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUUnmapSurfacesNV")) == NULL) || r;
+  r = ((glVDPAUUnregisterSurfaceNV = (PFNGLVDPAUUNREGISTERSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUUnregisterSurfaceNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vdpau_interop */
+
+#ifdef GL_NV_vertex_array_range
+
+static GLboolean _glewInit_GL_NV_vertex_array_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushVertexArrayRangeNV = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeNV")) == NULL) || r;
+  r = ((glVertexArrayRangeNV = (PFNGLVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_array_range */
+
+#ifdef GL_NV_vertex_attrib_integer_64bit
+
+static GLboolean _glewInit_GL_NV_vertex_attrib_integer_64bit ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVertexAttribLi64vNV = (PFNGLGETVERTEXATTRIBLI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLi64vNV")) == NULL) || r;
+  r = ((glGetVertexAttribLui64vNV = (PFNGLGETVERTEXATTRIBLUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLui64vNV")) == NULL) || r;
+  r = ((glVertexAttribL1i64NV = (PFNGLVERTEXATTRIBL1I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1i64NV")) == NULL) || r;
+  r = ((glVertexAttribL1i64vNV = (PFNGLVERTEXATTRIBL1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1i64vNV")) == NULL) || r;
+  r = ((glVertexAttribL1ui64NV = (PFNGLVERTEXATTRIBL1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64NV")) == NULL) || r;
+  r = ((glVertexAttribL1ui64vNV = (PFNGLVERTEXATTRIBL1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64vNV")) == NULL) || r;
+  r = ((glVertexAttribL2i64NV = (PFNGLVERTEXATTRIBL2I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2i64NV")) == NULL) || r;
+  r = ((glVertexAttribL2i64vNV = (PFNGLVERTEXATTRIBL2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2i64vNV")) == NULL) || r;
+  r = ((glVertexAttribL2ui64NV = (PFNGLVERTEXATTRIBL2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2ui64NV")) == NULL) || r;
+  r = ((glVertexAttribL2ui64vNV = (PFNGLVERTEXATTRIBL2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2ui64vNV")) == NULL) || r;
+  r = ((glVertexAttribL3i64NV = (PFNGLVERTEXATTRIBL3I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3i64NV")) == NULL) || r;
+  r = ((glVertexAttribL3i64vNV = (PFNGLVERTEXATTRIBL3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3i64vNV")) == NULL) || r;
+  r = ((glVertexAttribL3ui64NV = (PFNGLVERTEXATTRIBL3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3ui64NV")) == NULL) || r;
+  r = ((glVertexAttribL3ui64vNV = (PFNGLVERTEXATTRIBL3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3ui64vNV")) == NULL) || r;
+  r = ((glVertexAttribL4i64NV = (PFNGLVERTEXATTRIBL4I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4i64NV")) == NULL) || r;
+  r = ((glVertexAttribL4i64vNV = (PFNGLVERTEXATTRIBL4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4i64vNV")) == NULL) || r;
+  r = ((glVertexAttribL4ui64NV = (PFNGLVERTEXATTRIBL4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4ui64NV")) == NULL) || r;
+  r = ((glVertexAttribL4ui64vNV = (PFNGLVERTEXATTRIBL4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4ui64vNV")) == NULL) || r;
+  r = ((glVertexAttribLFormatNV = (PFNGLVERTEXATTRIBLFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLFormatNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+#ifdef GL_NV_vertex_buffer_unified_memory
+
+static GLboolean _glewInit_GL_NV_vertex_buffer_unified_memory ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferAddressRangeNV = (PFNGLBUFFERADDRESSRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBufferAddressRangeNV")) == NULL) || r;
+  r = ((glColorFormatNV = (PFNGLCOLORFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glColorFormatNV")) == NULL) || r;
+  r = ((glEdgeFlagFormatNV = (PFNGLEDGEFLAGFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagFormatNV")) == NULL) || r;
+  r = ((glFogCoordFormatNV = (PFNGLFOGCOORDFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordFormatNV")) == NULL) || r;
+  r = ((glGetIntegerui64i_vNV = (PFNGLGETINTEGERUI64I_VNVPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerui64i_vNV")) == NULL) || r;
+  r = ((glIndexFormatNV = (PFNGLINDEXFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glIndexFormatNV")) == NULL) || r;
+  r = ((glNormalFormatNV = (PFNGLNORMALFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glNormalFormatNV")) == NULL) || r;
+  r = ((glSecondaryColorFormatNV = (PFNGLSECONDARYCOLORFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorFormatNV")) == NULL) || r;
+  r = ((glTexCoordFormatNV = (PFNGLTEXCOORDFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordFormatNV")) == NULL) || r;
+  r = ((glVertexAttribFormatNV = (PFNGLVERTEXATTRIBFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribFormatNV")) == NULL) || r;
+  r = ((glVertexAttribIFormatNV = (PFNGLVERTEXATTRIBIFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIFormatNV")) == NULL) || r;
+  r = ((glVertexFormatNV = (PFNGLVERTEXFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexFormatNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+#ifdef GL_NV_vertex_program
+
+static GLboolean _glewInit_GL_NV_vertex_program ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAreProgramsResidentNV = (PFNGLAREPROGRAMSRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glAreProgramsResidentNV")) == NULL) || r;
+  r = ((glBindProgramNV = (PFNGLBINDPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glBindProgramNV")) == NULL) || r;
+  r = ((glDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsNV")) == NULL) || r;
+  r = ((glExecuteProgramNV = (PFNGLEXECUTEPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glExecuteProgramNV")) == NULL) || r;
+  r = ((glGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsNV")) == NULL) || r;
+  r = ((glGetProgramParameterdvNV = (PFNGLGETPROGRAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterdvNV")) == NULL) || r;
+  r = ((glGetProgramParameterfvNV = (PFNGLGETPROGRAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterfvNV")) == NULL) || r;
+  r = ((glGetProgramStringNV = (PFNGLGETPROGRAMSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringNV")) == NULL) || r;
+  r = ((glGetProgramivNV = (PFNGLGETPROGRAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivNV")) == NULL) || r;
+  r = ((glGetTrackMatrixivNV = (PFNGLGETTRACKMATRIXIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetTrackMatrixivNV")) == NULL) || r;
+  r = ((glGetVertexAttribPointervNV = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervNV")) == NULL) || r;
+  r = ((glGetVertexAttribdvNV = (PFNGLGETVERTEXATTRIBDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvNV")) == NULL) || r;
+  r = ((glGetVertexAttribfvNV = (PFNGLGETVERTEXATTRIBFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvNV")) == NULL) || r;
+  r = ((glGetVertexAttribivNV = (PFNGLGETVERTEXATTRIBIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivNV")) == NULL) || r;
+  r = ((glIsProgramNV = (PFNGLISPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glIsProgramNV")) == NULL) || r;
+  r = ((glLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glLoadProgramNV")) == NULL) || r;
+  r = ((glProgramParameter4dNV = (PFNGLPROGRAMPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dNV")) == NULL) || r;
+  r = ((glProgramParameter4dvNV = (PFNGLPROGRAMPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dvNV")) == NULL) || r;
+  r = ((glProgramParameter4fNV = (PFNGLPROGRAMPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fNV")) == NULL) || r;
+  r = ((glProgramParameter4fvNV = (PFNGLPROGRAMPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fvNV")) == NULL) || r;
+  r = ((glProgramParameters4dvNV = (PFNGLPROGRAMPARAMETERS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4dvNV")) == NULL) || r;
+  r = ((glProgramParameters4fvNV = (PFNGLPROGRAMPARAMETERS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4fvNV")) == NULL) || r;
+  r = ((glRequestResidentProgramsNV = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glRequestResidentProgramsNV")) == NULL) || r;
+  r = ((glTrackMatrixNV = (PFNGLTRACKMATRIXNVPROC)glewGetProcAddress((const GLubyte*)"glTrackMatrixNV")) == NULL) || r;
+  r = ((glVertexAttrib1dNV = (PFNGLVERTEXATTRIB1DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dNV")) == NULL) || r;
+  r = ((glVertexAttrib1dvNV = (PFNGLVERTEXATTRIB1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvNV")) == NULL) || r;
+  r = ((glVertexAttrib1fNV = (PFNGLVERTEXATTRIB1FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fNV")) == NULL) || r;
+  r = ((glVertexAttrib1fvNV = (PFNGLVERTEXATTRIB1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvNV")) == NULL) || r;
+  r = ((glVertexAttrib1sNV = (PFNGLVERTEXATTRIB1SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sNV")) == NULL) || r;
+  r = ((glVertexAttrib1svNV = (PFNGLVERTEXATTRIB1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svNV")) == NULL) || r;
+  r = ((glVertexAttrib2dNV = (PFNGLVERTEXATTRIB2DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dNV")) == NULL) || r;
+  r = ((glVertexAttrib2dvNV = (PFNGLVERTEXATTRIB2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvNV")) == NULL) || r;
+  r = ((glVertexAttrib2fNV = (PFNGLVERTEXATTRIB2FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fNV")) == NULL) || r;
+  r = ((glVertexAttrib2fvNV = (PFNGLVERTEXATTRIB2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvNV")) == NULL) || r;
+  r = ((glVertexAttrib2sNV = (PFNGLVERTEXATTRIB2SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sNV")) == NULL) || r;
+  r = ((glVertexAttrib2svNV = (PFNGLVERTEXATTRIB2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svNV")) == NULL) || r;
+  r = ((glVertexAttrib3dNV = (PFNGLVERTEXATTRIB3DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dNV")) == NULL) || r;
+  r = ((glVertexAttrib3dvNV = (PFNGLVERTEXATTRIB3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvNV")) == NULL) || r;
+  r = ((glVertexAttrib3fNV = (PFNGLVERTEXATTRIB3FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fNV")) == NULL) || r;
+  r = ((glVertexAttrib3fvNV = (PFNGLVERTEXATTRIB3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvNV")) == NULL) || r;
+  r = ((glVertexAttrib3sNV = (PFNGLVERTEXATTRIB3SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sNV")) == NULL) || r;
+  r = ((glVertexAttrib3svNV = (PFNGLVERTEXATTRIB3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svNV")) == NULL) || r;
+  r = ((glVertexAttrib4dNV = (PFNGLVERTEXATTRIB4DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dNV")) == NULL) || r;
+  r = ((glVertexAttrib4dvNV = (PFNGLVERTEXATTRIB4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvNV")) == NULL) || r;
+  r = ((glVertexAttrib4fNV = (PFNGLVERTEXATTRIB4FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fNV")) == NULL) || r;
+  r = ((glVertexAttrib4fvNV = (PFNGLVERTEXATTRIB4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvNV")) == NULL) || r;
+  r = ((glVertexAttrib4sNV = (PFNGLVERTEXATTRIB4SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sNV")) == NULL) || r;
+  r = ((glVertexAttrib4svNV = (PFNGLVERTEXATTRIB4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svNV")) == NULL) || r;
+  r = ((glVertexAttrib4ubNV = (PFNGLVERTEXATTRIB4UBNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubNV")) == NULL) || r;
+  r = ((glVertexAttrib4ubvNV = (PFNGLVERTEXATTRIB4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvNV")) == NULL) || r;
+  r = ((glVertexAttribPointerNV = (PFNGLVERTEXATTRIBPOINTERNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerNV")) == NULL) || r;
+  r = ((glVertexAttribs1dvNV = (PFNGLVERTEXATTRIBS1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1dvNV")) == NULL) || r;
+  r = ((glVertexAttribs1fvNV = (PFNGLVERTEXATTRIBS1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1fvNV")) == NULL) || r;
+  r = ((glVertexAttribs1svNV = (PFNGLVERTEXATTRIBS1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1svNV")) == NULL) || r;
+  r = ((glVertexAttribs2dvNV = (PFNGLVERTEXATTRIBS2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2dvNV")) == NULL) || r;
+  r = ((glVertexAttribs2fvNV = (PFNGLVERTEXATTRIBS2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2fvNV")) == NULL) || r;
+  r = ((glVertexAttribs2svNV = (PFNGLVERTEXATTRIBS2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2svNV")) == NULL) || r;
+  r = ((glVertexAttribs3dvNV = (PFNGLVERTEXATTRIBS3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3dvNV")) == NULL) || r;
+  r = ((glVertexAttribs3fvNV = (PFNGLVERTEXATTRIBS3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3fvNV")) == NULL) || r;
+  r = ((glVertexAttribs3svNV = (PFNGLVERTEXATTRIBS3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3svNV")) == NULL) || r;
+  r = ((glVertexAttribs4dvNV = (PFNGLVERTEXATTRIBS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4dvNV")) == NULL) || r;
+  r = ((glVertexAttribs4fvNV = (PFNGLVERTEXATTRIBS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4fvNV")) == NULL) || r;
+  r = ((glVertexAttribs4svNV = (PFNGLVERTEXATTRIBS4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4svNV")) == NULL) || r;
+  r = ((glVertexAttribs4ubvNV = (PFNGLVERTEXATTRIBS4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4ubvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_program */
+
+#ifdef GL_NV_video_capture
+
+static GLboolean _glewInit_GL_NV_video_capture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginVideoCaptureNV = (PFNGLBEGINVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glBeginVideoCaptureNV")) == NULL) || r;
+  r = ((glBindVideoCaptureStreamBufferNV = (PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glBindVideoCaptureStreamBufferNV")) == NULL) || r;
+  r = ((glBindVideoCaptureStreamTextureNV = (PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC)glewGetProcAddress((const GLubyte*)"glBindVideoCaptureStreamTextureNV")) == NULL) || r;
+  r = ((glEndVideoCaptureNV = (PFNGLENDVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glEndVideoCaptureNV")) == NULL) || r;
+  r = ((glGetVideoCaptureStreamdvNV = (PFNGLGETVIDEOCAPTURESTREAMDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamdvNV")) == NULL) || r;
+  r = ((glGetVideoCaptureStreamfvNV = (PFNGLGETVIDEOCAPTURESTREAMFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamfvNV")) == NULL) || r;
+  r = ((glGetVideoCaptureStreamivNV = (PFNGLGETVIDEOCAPTURESTREAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamivNV")) == NULL) || r;
+  r = ((glGetVideoCaptureivNV = (PFNGLGETVIDEOCAPTUREIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureivNV")) == NULL) || r;
+  r = ((glVideoCaptureNV = (PFNGLVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureNV")) == NULL) || r;
+  r = ((glVideoCaptureStreamParameterdvNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterdvNV")) == NULL) || r;
+  r = ((glVideoCaptureStreamParameterfvNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterfvNV")) == NULL) || r;
+  r = ((glVideoCaptureStreamParameterivNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_video_capture */
+
+#ifdef GL_NV_viewport_array
+
+static GLboolean _glewInit_GL_NV_viewport_array ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDepthRangeArrayfvNV = (PFNGLDEPTHRANGEARRAYFVNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeArrayfvNV")) == NULL) || r;
+  r = ((glDepthRangeIndexedfNV = (PFNGLDEPTHRANGEINDEXEDFNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeIndexedfNV")) == NULL) || r;
+  r = ((glDisableiNV = (PFNGLDISABLEINVPROC)glewGetProcAddress((const GLubyte*)"glDisableiNV")) == NULL) || r;
+  r = ((glEnableiNV = (PFNGLENABLEINVPROC)glewGetProcAddress((const GLubyte*)"glEnableiNV")) == NULL) || r;
+  r = ((glGetFloati_vNV = (PFNGLGETFLOATI_VNVPROC)glewGetProcAddress((const GLubyte*)"glGetFloati_vNV")) == NULL) || r;
+  r = ((glIsEnablediNV = (PFNGLISENABLEDINVPROC)glewGetProcAddress((const GLubyte*)"glIsEnablediNV")) == NULL) || r;
+  r = ((glScissorArrayvNV = (PFNGLSCISSORARRAYVNVPROC)glewGetProcAddress((const GLubyte*)"glScissorArrayvNV")) == NULL) || r;
+  r = ((glScissorIndexedNV = (PFNGLSCISSORINDEXEDNVPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexedNV")) == NULL) || r;
+  r = ((glScissorIndexedvNV = (PFNGLSCISSORINDEXEDVNVPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexedvNV")) == NULL) || r;
+  r = ((glViewportArrayvNV = (PFNGLVIEWPORTARRAYVNVPROC)glewGetProcAddress((const GLubyte*)"glViewportArrayvNV")) == NULL) || r;
+  r = ((glViewportIndexedfNV = (PFNGLVIEWPORTINDEXEDFNVPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedfNV")) == NULL) || r;
+  r = ((glViewportIndexedfvNV = (PFNGLVIEWPORTINDEXEDFVNVPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedfvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_viewport_array */
+
+#ifdef GL_NV_viewport_swizzle
+
+static GLboolean _glewInit_GL_NV_viewport_swizzle ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glViewportSwizzleNV = (PFNGLVIEWPORTSWIZZLENVPROC)glewGetProcAddress((const GLubyte*)"glViewportSwizzleNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_viewport_swizzle */
+
+#ifdef GL_OVR_multiview
+
+static GLboolean _glewInit_GL_OVR_multiview ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTextureMultiviewOVR = (PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureMultiviewOVR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_OVR_multiview */
+
+#ifdef GL_OVR_multiview_multisampled_render_to_texture
+
+static GLboolean _glewInit_GL_OVR_multiview_multisampled_render_to_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferTextureMultisampleMultiviewOVR = (PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureMultisampleMultiviewOVR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_OVR_multiview_multisampled_render_to_texture */
+
+#ifdef GL_QCOM_alpha_test
+
+static GLboolean _glewInit_GL_QCOM_alpha_test ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAlphaFuncQCOM = (PFNGLALPHAFUNCQCOMPROC)glewGetProcAddress((const GLubyte*)"glAlphaFuncQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_alpha_test */
+
+#ifdef GL_QCOM_driver_control
+
+static GLboolean _glewInit_GL_QCOM_driver_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDisableDriverControlQCOM = (PFNGLDISABLEDRIVERCONTROLQCOMPROC)glewGetProcAddress((const GLubyte*)"glDisableDriverControlQCOM")) == NULL) || r;
+  r = ((glEnableDriverControlQCOM = (PFNGLENABLEDRIVERCONTROLQCOMPROC)glewGetProcAddress((const GLubyte*)"glEnableDriverControlQCOM")) == NULL) || r;
+  r = ((glGetDriverControlStringQCOM = (PFNGLGETDRIVERCONTROLSTRINGQCOMPROC)glewGetProcAddress((const GLubyte*)"glGetDriverControlStringQCOM")) == NULL) || r;
+  r = ((glGetDriverControlsQCOM = (PFNGLGETDRIVERCONTROLSQCOMPROC)glewGetProcAddress((const GLubyte*)"glGetDriverControlsQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_driver_control */
+
+#ifdef GL_QCOM_extended_get
+
+static GLboolean _glewInit_GL_QCOM_extended_get ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glExtGetBufferPointervQCOM = (PFNGLEXTGETBUFFERPOINTERVQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetBufferPointervQCOM")) == NULL) || r;
+  r = ((glExtGetBuffersQCOM = (PFNGLEXTGETBUFFERSQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetBuffersQCOM")) == NULL) || r;
+  r = ((glExtGetFramebuffersQCOM = (PFNGLEXTGETFRAMEBUFFERSQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetFramebuffersQCOM")) == NULL) || r;
+  r = ((glExtGetRenderbuffersQCOM = (PFNGLEXTGETRENDERBUFFERSQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetRenderbuffersQCOM")) == NULL) || r;
+  r = ((glExtGetTexLevelParameterivQCOM = (PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetTexLevelParameterivQCOM")) == NULL) || r;
+  r = ((glExtGetTexSubImageQCOM = (PFNGLEXTGETTEXSUBIMAGEQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetTexSubImageQCOM")) == NULL) || r;
+  r = ((glExtGetTexturesQCOM = (PFNGLEXTGETTEXTURESQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetTexturesQCOM")) == NULL) || r;
+  r = ((glExtTexObjectStateOverrideiQCOM = (PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtTexObjectStateOverrideiQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_extended_get */
+
+#ifdef GL_QCOM_extended_get2
+
+static GLboolean _glewInit_GL_QCOM_extended_get2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glExtGetProgramBinarySourceQCOM = (PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetProgramBinarySourceQCOM")) == NULL) || r;
+  r = ((glExtGetProgramsQCOM = (PFNGLEXTGETPROGRAMSQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetProgramsQCOM")) == NULL) || r;
+  r = ((glExtGetShadersQCOM = (PFNGLEXTGETSHADERSQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtGetShadersQCOM")) == NULL) || r;
+  r = ((glExtIsProgramBinaryQCOM = (PFNGLEXTISPROGRAMBINARYQCOMPROC)glewGetProcAddress((const GLubyte*)"glExtIsProgramBinaryQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_extended_get2 */
+
+#ifdef GL_QCOM_framebuffer_foveated
+
+static GLboolean _glewInit_GL_QCOM_framebuffer_foveated ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferFoveationConfigQCOM = (PFNGLFRAMEBUFFERFOVEATIONCONFIGQCOMPROC)glewGetProcAddress((const GLubyte*)"glFramebufferFoveationConfigQCOM")) == NULL) || r;
+  r = ((glFramebufferFoveationParametersQCOM = (PFNGLFRAMEBUFFERFOVEATIONPARAMETERSQCOMPROC)glewGetProcAddress((const GLubyte*)"glFramebufferFoveationParametersQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_framebuffer_foveated */
+
+#ifdef GL_QCOM_shader_framebuffer_fetch_noncoherent
+
+static GLboolean _glewInit_GL_QCOM_shader_framebuffer_fetch_noncoherent ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFramebufferFetchBarrierQCOM = (PFNGLFRAMEBUFFERFETCHBARRIERQCOMPROC)glewGetProcAddress((const GLubyte*)"glFramebufferFetchBarrierQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
+
+#ifdef GL_QCOM_tiled_rendering
+
+static GLboolean _glewInit_GL_QCOM_tiled_rendering ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glEndTilingQCOM = (PFNGLENDTILINGQCOMPROC)glewGetProcAddress((const GLubyte*)"glEndTilingQCOM")) == NULL) || r;
+  r = ((glStartTilingQCOM = (PFNGLSTARTTILINGQCOMPROC)glewGetProcAddress((const GLubyte*)"glStartTilingQCOM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_QCOM_tiled_rendering */
+
+#ifdef GL_REGAL_ES1_0_compatibility
+
+static GLboolean _glewInit_GL_REGAL_ES1_0_compatibility ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAlphaFuncx = (PFNGLALPHAFUNCXPROC)glewGetProcAddress((const GLubyte*)"glAlphaFuncx")) == NULL) || r;
+  r = ((glClearColorx = (PFNGLCLEARCOLORXPROC)glewGetProcAddress((const GLubyte*)"glClearColorx")) == NULL) || r;
+  r = ((glClearDepthx = (PFNGLCLEARDEPTHXPROC)glewGetProcAddress((const GLubyte*)"glClearDepthx")) == NULL) || r;
+  r = ((glColor4x = (PFNGLCOLOR4XPROC)glewGetProcAddress((const GLubyte*)"glColor4x")) == NULL) || r;
+  r = ((glDepthRangex = (PFNGLDEPTHRANGEXPROC)glewGetProcAddress((const GLubyte*)"glDepthRangex")) == NULL) || r;
+  r = ((glFogx = (PFNGLFOGXPROC)glewGetProcAddress((const GLubyte*)"glFogx")) == NULL) || r;
+  r = ((glFogxv = (PFNGLFOGXVPROC)glewGetProcAddress((const GLubyte*)"glFogxv")) == NULL) || r;
+  r = ((glFrustumf = (PFNGLFRUSTUMFPROC)glewGetProcAddress((const GLubyte*)"glFrustumf")) == NULL) || r;
+  r = ((glFrustumx = (PFNGLFRUSTUMXPROC)glewGetProcAddress((const GLubyte*)"glFrustumx")) == NULL) || r;
+  r = ((glLightModelx = (PFNGLLIGHTMODELXPROC)glewGetProcAddress((const GLubyte*)"glLightModelx")) == NULL) || r;
+  r = ((glLightModelxv = (PFNGLLIGHTMODELXVPROC)glewGetProcAddress((const GLubyte*)"glLightModelxv")) == NULL) || r;
+  r = ((glLightx = (PFNGLLIGHTXPROC)glewGetProcAddress((const GLubyte*)"glLightx")) == NULL) || r;
+  r = ((glLightxv = (PFNGLLIGHTXVPROC)glewGetProcAddress((const GLubyte*)"glLightxv")) == NULL) || r;
+  r = ((glLineWidthx = (PFNGLLINEWIDTHXPROC)glewGetProcAddress((const GLubyte*)"glLineWidthx")) == NULL) || r;
+  r = ((glLoadMatrixx = (PFNGLLOADMATRIXXPROC)glewGetProcAddress((const GLubyte*)"glLoadMatrixx")) == NULL) || r;
+  r = ((glMaterialx = (PFNGLMATERIALXPROC)glewGetProcAddress((const GLubyte*)"glMaterialx")) == NULL) || r;
+  r = ((glMaterialxv = (PFNGLMATERIALXVPROC)glewGetProcAddress((const GLubyte*)"glMaterialxv")) == NULL) || r;
+  r = ((glMultMatrixx = (PFNGLMULTMATRIXXPROC)glewGetProcAddress((const GLubyte*)"glMultMatrixx")) == NULL) || r;
+  r = ((glMultiTexCoord4x = (PFNGLMULTITEXCOORD4XPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4x")) == NULL) || r;
+  r = ((glNormal3x = (PFNGLNORMAL3XPROC)glewGetProcAddress((const GLubyte*)"glNormal3x")) == NULL) || r;
+  r = ((glOrthof = (PFNGLORTHOFPROC)glewGetProcAddress((const GLubyte*)"glOrthof")) == NULL) || r;
+  r = ((glOrthox = (PFNGLORTHOXPROC)glewGetProcAddress((const GLubyte*)"glOrthox")) == NULL) || r;
+  r = ((glPointSizex = (PFNGLPOINTSIZEXPROC)glewGetProcAddress((const GLubyte*)"glPointSizex")) == NULL) || r;
+  r = ((glPolygonOffsetx = (PFNGLPOLYGONOFFSETXPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetx")) == NULL) || r;
+  r = ((glRotatex = (PFNGLROTATEXPROC)glewGetProcAddress((const GLubyte*)"glRotatex")) == NULL) || r;
+  r = ((glSampleCoveragex = (PFNGLSAMPLECOVERAGEXPROC)glewGetProcAddress((const GLubyte*)"glSampleCoveragex")) == NULL) || r;
+  r = ((glScalex = (PFNGLSCALEXPROC)glewGetProcAddress((const GLubyte*)"glScalex")) == NULL) || r;
+  r = ((glTexEnvx = (PFNGLTEXENVXPROC)glewGetProcAddress((const GLubyte*)"glTexEnvx")) == NULL) || r;
+  r = ((glTexEnvxv = (PFNGLTEXENVXVPROC)glewGetProcAddress((const GLubyte*)"glTexEnvxv")) == NULL) || r;
+  r = ((glTexParameterx = (PFNGLTEXPARAMETERXPROC)glewGetProcAddress((const GLubyte*)"glTexParameterx")) == NULL) || r;
+  r = ((glTranslatex = (PFNGLTRANSLATEXPROC)glewGetProcAddress((const GLubyte*)"glTranslatex")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_ES1_0_compatibility */
+
+#ifdef GL_REGAL_ES1_1_compatibility
+
+static GLboolean _glewInit_GL_REGAL_ES1_1_compatibility ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClipPlanef = (PFNGLCLIPPLANEFPROC)glewGetProcAddress((const GLubyte*)"glClipPlanef")) == NULL) || r;
+  r = ((glClipPlanex = (PFNGLCLIPPLANEXPROC)glewGetProcAddress((const GLubyte*)"glClipPlanex")) == NULL) || r;
+  r = ((glGetClipPlanef = (PFNGLGETCLIPPLANEFPROC)glewGetProcAddress((const GLubyte*)"glGetClipPlanef")) == NULL) || r;
+  r = ((glGetClipPlanex = (PFNGLGETCLIPPLANEXPROC)glewGetProcAddress((const GLubyte*)"glGetClipPlanex")) == NULL) || r;
+  r = ((glGetFixedv = (PFNGLGETFIXEDVPROC)glewGetProcAddress((const GLubyte*)"glGetFixedv")) == NULL) || r;
+  r = ((glGetLightxv = (PFNGLGETLIGHTXVPROC)glewGetProcAddress((const GLubyte*)"glGetLightxv")) == NULL) || r;
+  r = ((glGetMaterialxv = (PFNGLGETMATERIALXVPROC)glewGetProcAddress((const GLubyte*)"glGetMaterialxv")) == NULL) || r;
+  r = ((glGetTexEnvxv = (PFNGLGETTEXENVXVPROC)glewGetProcAddress((const GLubyte*)"glGetTexEnvxv")) == NULL) || r;
+  r = ((glGetTexParameterxv = (PFNGLGETTEXPARAMETERXVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterxv")) == NULL) || r;
+  r = ((glPointParameterx = (PFNGLPOINTPARAMETERXPROC)glewGetProcAddress((const GLubyte*)"glPointParameterx")) == NULL) || r;
+  r = ((glPointParameterxv = (PFNGLPOINTPARAMETERXVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterxv")) == NULL) || r;
+  r = ((glPointSizePointerOES = (PFNGLPOINTSIZEPOINTEROESPROC)glewGetProcAddress((const GLubyte*)"glPointSizePointerOES")) == NULL) || r;
+  r = ((glTexParameterxv = (PFNGLTEXPARAMETERXVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterxv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_ES1_1_compatibility */
+
+#ifdef GL_REGAL_error_string
+
+static GLboolean _glewInit_GL_REGAL_error_string ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glErrorStringREGAL = (PFNGLERRORSTRINGREGALPROC)glewGetProcAddress((const GLubyte*)"glErrorStringREGAL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_error_string */
+
+#ifdef GL_REGAL_extension_query
+
+static GLboolean _glewInit_GL_REGAL_extension_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetExtensionREGAL = (PFNGLGETEXTENSIONREGALPROC)glewGetProcAddress((const GLubyte*)"glGetExtensionREGAL")) == NULL) || r;
+  r = ((glIsSupportedREGAL = (PFNGLISSUPPORTEDREGALPROC)glewGetProcAddress((const GLubyte*)"glIsSupportedREGAL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_extension_query */
+
+#ifdef GL_REGAL_log
+
+static GLboolean _glewInit_GL_REGAL_log ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLogMessageCallbackREGAL = (PFNGLLOGMESSAGECALLBACKREGALPROC)glewGetProcAddress((const GLubyte*)"glLogMessageCallbackREGAL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_log */
+
+#ifdef GL_REGAL_proc_address
+
+static GLboolean _glewInit_GL_REGAL_proc_address ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetProcAddressREGAL = (PFNGLGETPROCADDRESSREGALPROC)glewGetProcAddress((const GLubyte*)"glGetProcAddressREGAL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_REGAL_proc_address */
+
+#ifdef GL_SGIS_detail_texture
+
+static GLboolean _glewInit_GL_SGIS_detail_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDetailTexFuncSGIS = (PFNGLDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glDetailTexFuncSGIS")) == NULL) || r;
+  r = ((glGetDetailTexFuncSGIS = (PFNGLGETDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetDetailTexFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_detail_texture */
+
+#ifdef GL_SGIS_fog_function
+
+static GLboolean _glewInit_GL_SGIS_fog_function ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFogFuncSGIS = (PFNGLFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glFogFuncSGIS")) == NULL) || r;
+  r = ((glGetFogFuncSGIS = (PFNGLGETFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetFogFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_fog_function */
+
+#ifdef GL_SGIS_multisample
+
+static GLboolean _glewInit_GL_SGIS_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleMaskSGIS = (PFNGLSAMPLEMASKSGISPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskSGIS")) == NULL) || r;
+  r = ((glSamplePatternSGIS = (PFNGLSAMPLEPATTERNSGISPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_multisample */
+
+#ifdef GL_SGIS_multitexture
+
+static GLboolean _glewInit_GL_SGIS_multitexture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glInterleavedTextureCoordSetsSGIS = (PFNGLINTERLEAVEDTEXTURECOORDSETSSGISPROC)glewGetProcAddress((const GLubyte*)"glInterleavedTextureCoordSetsSGIS")) == NULL) || r;
+  r = ((glSelectTextureCoordSetSGIS = (PFNGLSELECTTEXTURECOORDSETSGISPROC)glewGetProcAddress((const GLubyte*)"glSelectTextureCoordSetSGIS")) == NULL) || r;
+  r = ((glSelectTextureSGIS = (PFNGLSELECTTEXTURESGISPROC)glewGetProcAddress((const GLubyte*)"glSelectTextureSGIS")) == NULL) || r;
+  r = ((glSelectTextureTransformSGIS = (PFNGLSELECTTEXTURETRANSFORMSGISPROC)glewGetProcAddress((const GLubyte*)"glSelectTextureTransformSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_multitexture */
+
+#ifdef GL_SGIS_shared_multisample
+
+static GLboolean _glewInit_GL_SGIS_shared_multisample ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultisampleSubRectPosSGIS = (PFNGLMULTISAMPLESUBRECTPOSSGISPROC)glewGetProcAddress((const GLubyte*)"glMultisampleSubRectPosSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_shared_multisample */
+
+#ifdef GL_SGIS_sharpen_texture
+
+static GLboolean _glewInit_GL_SGIS_sharpen_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetSharpenTexFuncSGIS = (PFNGLGETSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetSharpenTexFuncSGIS")) == NULL) || r;
+  r = ((glSharpenTexFuncSGIS = (PFNGLSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glSharpenTexFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifdef GL_SGIS_texture4D
+
+static GLboolean _glewInit_GL_SGIS_texture4D ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexImage4DSGIS = (PFNGLTEXIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexImage4DSGIS")) == NULL) || r;
+  r = ((glTexSubImage4DSGIS = (PFNGLTEXSUBIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage4DSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_texture4D */
+
+#ifdef GL_SGIS_texture_filter4
+
+static GLboolean _glewInit_GL_SGIS_texture_filter4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexFilterFuncSGIS = (PFNGLGETTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetTexFilterFuncSGIS")) == NULL) || r;
+  r = ((glTexFilterFuncSGIS = (PFNGLTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glTexFilterFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifdef GL_SGIX_async
+
+static GLboolean _glewInit_GL_SGIX_async ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAsyncMarkerSGIX = (PFNGLASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glAsyncMarkerSGIX")) == NULL) || r;
+  r = ((glDeleteAsyncMarkersSGIX = (PFNGLDELETEASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteAsyncMarkersSGIX")) == NULL) || r;
+  r = ((glFinishAsyncSGIX = (PFNGLFINISHASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glFinishAsyncSGIX")) == NULL) || r;
+  r = ((glGenAsyncMarkersSGIX = (PFNGLGENASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenAsyncMarkersSGIX")) == NULL) || r;
+  r = ((glIsAsyncMarkerSGIX = (PFNGLISASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsAsyncMarkerSGIX")) == NULL) || r;
+  r = ((glPollAsyncSGIX = (PFNGLPOLLASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glPollAsyncSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_async */
+
+#ifdef GL_SGIX_datapipe
+
+static GLboolean _glewInit_GL_SGIX_datapipe ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAddressSpace = (PFNGLADDRESSSPACEPROC)glewGetProcAddress((const GLubyte*)"glAddressSpace")) == NULL) || r;
+  r = ((glDataPipe = (PFNGLDATAPIPEPROC)glewGetProcAddress((const GLubyte*)"glDataPipe")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_datapipe */
+
+#ifdef GL_SGIX_flush_raster
+
+static GLboolean _glewInit_GL_SGIX_flush_raster ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushRasterSGIX = (PFNGLFLUSHRASTERSGIXPROC)glewGetProcAddress((const GLubyte*)"glFlushRasterSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_flush_raster */
+
+#ifdef GL_SGIX_fog_layers
+
+static GLboolean _glewInit_GL_SGIX_fog_layers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFogLayersSGIX = (PFNGLFOGLAYERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glFogLayersSGIX")) == NULL) || r;
+  r = ((glGetFogLayersSGIX = (PFNGLGETFOGLAYERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFogLayersSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_fog_layers */
+
+#ifdef GL_SGIX_fog_texture
+
+static GLboolean _glewInit_GL_SGIX_fog_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureFogSGIX = (PFNGLTEXTUREFOGSGIXPROC)glewGetProcAddress((const GLubyte*)"glTextureFogSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_fog_texture */
+
+#ifdef GL_SGIX_fragment_specular_lighting
+
+static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFragmentColorMaterialSGIX = (PFNGLFRAGMENTCOLORMATERIALSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelfSGIX = (PFNGLFRAGMENTLIGHTMODELFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelfvSGIX = (PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvSGIX")) == NULL) || r;
+  r = ((glFragmentLightModeliSGIX = (PFNGLFRAGMENTLIGHTMODELISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelivSGIX = (PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivSGIX")) == NULL) || r;
+  r = ((glFragmentLightfSGIX = (PFNGLFRAGMENTLIGHTFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfSGIX")) == NULL) || r;
+  r = ((glFragmentLightfvSGIX = (PFNGLFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvSGIX")) == NULL) || r;
+  r = ((glFragmentLightiSGIX = (PFNGLFRAGMENTLIGHTISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiSGIX")) == NULL) || r;
+  r = ((glFragmentLightivSGIX = (PFNGLFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialfSGIX = (PFNGLFRAGMENTMATERIALFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialfvSGIX = (PFNGLFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialiSGIX = (PFNGLFRAGMENTMATERIALISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialivSGIX = (PFNGLFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivSGIX")) == NULL) || r;
+  r = ((glGetFragmentLightfvSGIX = (PFNGLGETFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvSGIX")) == NULL) || r;
+  r = ((glGetFragmentLightivSGIX = (PFNGLGETFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivSGIX")) == NULL) || r;
+  r = ((glGetFragmentMaterialfvSGIX = (PFNGLGETFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvSGIX")) == NULL) || r;
+  r = ((glGetFragmentMaterialivSGIX = (PFNGLGETFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_fragment_specular_lighting */
+
+#ifdef GL_SGIX_framezoom
+
+static GLboolean _glewInit_GL_SGIX_framezoom ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFrameZoomSGIX = (PFNGLFRAMEZOOMSGIXPROC)glewGetProcAddress((const GLubyte*)"glFrameZoomSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_framezoom */
+
+#ifdef GL_SGIX_igloo_interface
+
+static GLboolean _glewInit_GL_SGIX_igloo_interface ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glIglooInterfaceSGIX = (PFNGLIGLOOINTERFACESGIXPROC)glewGetProcAddress((const GLubyte*)"glIglooInterfaceSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_igloo_interface */
+
+#ifdef GL_SGIX_mpeg1
+
+static GLboolean _glewInit_GL_SGIX_mpeg1 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAllocMPEGPredictorsSGIX = (PFNGLALLOCMPEGPREDICTORSSGIXPROC)glewGetProcAddress((const GLubyte*)"glAllocMPEGPredictorsSGIX")) == NULL) || r;
+  r = ((glDeleteMPEGPredictorsSGIX = (PFNGLDELETEMPEGPREDICTORSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteMPEGPredictorsSGIX")) == NULL) || r;
+  r = ((glGenMPEGPredictorsSGIX = (PFNGLGENMPEGPREDICTORSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenMPEGPredictorsSGIX")) == NULL) || r;
+  r = ((glGetMPEGParameterfvSGIX = (PFNGLGETMPEGPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetMPEGParameterfvSGIX")) == NULL) || r;
+  r = ((glGetMPEGParameterivSGIX = (PFNGLGETMPEGPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetMPEGParameterivSGIX")) == NULL) || r;
+  r = ((glGetMPEGPredictorSGIX = (PFNGLGETMPEGPREDICTORSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetMPEGPredictorSGIX")) == NULL) || r;
+  r = ((glGetMPEGQuantTableubv = (PFNGLGETMPEGQUANTTABLEUBVPROC)glewGetProcAddress((const GLubyte*)"glGetMPEGQuantTableubv")) == NULL) || r;
+  r = ((glIsMPEGPredictorSGIX = (PFNGLISMPEGPREDICTORSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsMPEGPredictorSGIX")) == NULL) || r;
+  r = ((glMPEGPredictorSGIX = (PFNGLMPEGPREDICTORSGIXPROC)glewGetProcAddress((const GLubyte*)"glMPEGPredictorSGIX")) == NULL) || r;
+  r = ((glMPEGQuantTableubv = (PFNGLMPEGQUANTTABLEUBVPROC)glewGetProcAddress((const GLubyte*)"glMPEGQuantTableubv")) == NULL) || r;
+  r = ((glSwapMPEGPredictorsSGIX = (PFNGLSWAPMPEGPREDICTORSSGIXPROC)glewGetProcAddress((const GLubyte*)"glSwapMPEGPredictorsSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_mpeg1 */
+
+#ifdef GL_SGIX_nonlinear_lighting_pervertex
+
+static GLboolean _glewInit_GL_SGIX_nonlinear_lighting_pervertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetNonlinLightfvSGIX = (PFNGLGETNONLINLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetNonlinLightfvSGIX")) == NULL) || r;
+  r = ((glGetNonlinMaterialfvSGIX = (PFNGLGETNONLINMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetNonlinMaterialfvSGIX")) == NULL) || r;
+  r = ((glNonlinLightfvSGIX = (PFNGLNONLINLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glNonlinLightfvSGIX")) == NULL) || r;
+  r = ((glNonlinMaterialfvSGIX = (PFNGLNONLINMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glNonlinMaterialfvSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_nonlinear_lighting_pervertex */
+
+#ifdef GL_SGIX_pixel_texture
+
+static GLboolean _glewInit_GL_SGIX_pixel_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPixelTexGenSGIX = (PFNGLPIXELTEXGENSGIXPROC)glewGetProcAddress((const GLubyte*)"glPixelTexGenSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_pixel_texture */
+
+#ifdef GL_SGIX_polynomial_ffd
+
+static GLboolean _glewInit_GL_SGIX_polynomial_ffd ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeformSGIX = (PFNGLDEFORMSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeformSGIX")) == NULL) || r;
+  r = ((glLoadIdentityDeformationMapSGIX = (PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC)glewGetProcAddress((const GLubyte*)"glLoadIdentityDeformationMapSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_polynomial_ffd */
+
+#ifdef GL_SGIX_quad_mesh
+
+static GLboolean _glewInit_GL_SGIX_quad_mesh ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMeshBreadthSGIX = (PFNGLMESHBREADTHSGIXPROC)glewGetProcAddress((const GLubyte*)"glMeshBreadthSGIX")) == NULL) || r;
+  r = ((glMeshStrideSGIX = (PFNGLMESHSTRIDESGIXPROC)glewGetProcAddress((const GLubyte*)"glMeshStrideSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_quad_mesh */
+
+#ifdef GL_SGIX_reference_plane
+
+static GLboolean _glewInit_GL_SGIX_reference_plane ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReferencePlaneSGIX = (PFNGLREFERENCEPLANESGIXPROC)glewGetProcAddress((const GLubyte*)"glReferencePlaneSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_reference_plane */
+
+#ifdef GL_SGIX_sprite
+
+static GLboolean _glewInit_GL_SGIX_sprite ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSpriteParameterfSGIX = (PFNGLSPRITEPARAMETERFSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfSGIX")) == NULL) || r;
+  r = ((glSpriteParameterfvSGIX = (PFNGLSPRITEPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfvSGIX")) == NULL) || r;
+  r = ((glSpriteParameteriSGIX = (PFNGLSPRITEPARAMETERISGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameteriSGIX")) == NULL) || r;
+  r = ((glSpriteParameterivSGIX = (PFNGLSPRITEPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterivSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_sprite */
+
+#ifdef GL_SGIX_tag_sample_buffer
+
+static GLboolean _glewInit_GL_SGIX_tag_sample_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTagSampleBufferSGIX = (PFNGLTAGSAMPLEBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glTagSampleBufferSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifdef GL_SGIX_vector_ops
+
+static GLboolean _glewInit_GL_SGIX_vector_ops ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVectorOperationSGIX = (PFNGLGETVECTOROPERATIONSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetVectorOperationSGIX")) == NULL) || r;
+  r = ((glVectorOperationSGIX = (PFNGLVECTOROPERATIONSGIXPROC)glewGetProcAddress((const GLubyte*)"glVectorOperationSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_vector_ops */
+
+#ifdef GL_SGIX_vertex_array_object
+
+static GLboolean _glewInit_GL_SGIX_vertex_array_object ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAreVertexArraysResidentSGIX = (PFNGLAREVERTEXARRAYSRESIDENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glAreVertexArraysResidentSGIX")) == NULL) || r;
+  r = ((glBindVertexArraySGIX = (PFNGLBINDVERTEXARRAYSGIXPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArraySGIX")) == NULL) || r;
+  r = ((glDeleteVertexArraysSGIX = (PFNGLDELETEVERTEXARRAYSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysSGIX")) == NULL) || r;
+  r = ((glGenVertexArraysSGIX = (PFNGLGENVERTEXARRAYSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysSGIX")) == NULL) || r;
+  r = ((glIsVertexArraySGIX = (PFNGLISVERTEXARRAYSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArraySGIX")) == NULL) || r;
+  r = ((glPrioritizeVertexArraysSGIX = (PFNGLPRIORITIZEVERTEXARRAYSSGIXPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeVertexArraysSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_vertex_array_object */
+
+#ifdef GL_SGI_color_table
+
+static GLboolean _glewInit_GL_SGI_color_table ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorTableParameterfvSGI = (PFNGLCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfvSGI")) == NULL) || r;
+  r = ((glColorTableParameterivSGI = (PFNGLCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterivSGI")) == NULL) || r;
+  r = ((glColorTableSGI = (PFNGLCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableSGI")) == NULL) || r;
+  r = ((glCopyColorTableSGI = (PFNGLCOPYCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTableSGI")) == NULL) || r;
+  r = ((glGetColorTableParameterfvSGI = (PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvSGI")) == NULL) || r;
+  r = ((glGetColorTableParameterivSGI = (PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivSGI")) == NULL) || r;
+  r = ((glGetColorTableSGI = (PFNGLGETCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGI_color_table */
+
+#ifdef GL_SGI_fft
+
+static GLboolean _glewInit_GL_SGI_fft ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetPixelTransformParameterfvSGI = (PFNGLGETPIXELTRANSFORMPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvSGI")) == NULL) || r;
+  r = ((glGetPixelTransformParameterivSGI = (PFNGLGETPIXELTRANSFORMPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivSGI")) == NULL) || r;
+  r = ((glPixelTransformParameterfSGI = (PFNGLPIXELTRANSFORMPARAMETERFSGIPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfSGI")) == NULL) || r;
+  r = ((glPixelTransformParameterfvSGI = (PFNGLPIXELTRANSFORMPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvSGI")) == NULL) || r;
+  r = ((glPixelTransformParameteriSGI = (PFNGLPIXELTRANSFORMPARAMETERISGIPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriSGI")) == NULL) || r;
+  r = ((glPixelTransformParameterivSGI = (PFNGLPIXELTRANSFORMPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivSGI")) == NULL) || r;
+  r = ((glPixelTransformSGI = (PFNGLPIXELTRANSFORMSGIPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGI_fft */
+
+#ifdef GL_SUNX_constant_data
+
+static GLboolean _glewInit_GL_SUNX_constant_data ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFinishTextureSUNX = (PFNGLFINISHTEXTURESUNXPROC)glewGetProcAddress((const GLubyte*)"glFinishTextureSUNX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUNX_constant_data */
+
+#ifdef GL_SUN_global_alpha
+
+static GLboolean _glewInit_GL_SUN_global_alpha ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGlobalAlphaFactorbSUN = (PFNGLGLOBALALPHAFACTORBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorbSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactordSUN = (PFNGLGLOBALALPHAFACTORDSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactordSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorfSUN = (PFNGLGLOBALALPHAFACTORFSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorfSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactoriSUN = (PFNGLGLOBALALPHAFACTORISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoriSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorsSUN = (PFNGLGLOBALALPHAFACTORSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorsSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorubSUN = (PFNGLGLOBALALPHAFACTORUBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorubSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactoruiSUN = (PFNGLGLOBALALPHAFACTORUISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoruiSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorusSUN = (PFNGLGLOBALALPHAFACTORUSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorusSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_global_alpha */
+
+#ifdef GL_SUN_read_video_pixels
+
+static GLboolean _glewInit_GL_SUN_read_video_pixels ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReadVideoPixelsSUN = (PFNGLREADVIDEOPIXELSSUNPROC)glewGetProcAddress((const GLubyte*)"glReadVideoPixelsSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_read_video_pixels */
+
+#ifdef GL_SUN_triangle_list
+
+static GLboolean _glewInit_GL_SUN_triangle_list ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReplacementCodePointerSUN = (PFNGLREPLACEMENTCODEPOINTERSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodePointerSUN")) == NULL) || r;
+  r = ((glReplacementCodeubSUN = (PFNGLREPLACEMENTCODEUBSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubSUN")) == NULL) || r;
+  r = ((glReplacementCodeubvSUN = (PFNGLREPLACEMENTCODEUBVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiSUN = (PFNGLREPLACEMENTCODEUISUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiSUN")) == NULL) || r;
+  r = ((glReplacementCodeuivSUN = (PFNGLREPLACEMENTCODEUIVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuivSUN")) == NULL) || r;
+  r = ((glReplacementCodeusSUN = (PFNGLREPLACEMENTCODEUSSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusSUN")) == NULL) || r;
+  r = ((glReplacementCodeusvSUN = (PFNGLREPLACEMENTCODEUSVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusvSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_triangle_list */
+
+#ifdef GL_SUN_vertex
+
+static GLboolean _glewInit_GL_SUN_vertex ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColor3fVertex3fSUN = (PFNGLCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glColor3fVertex3fvSUN = (PFNGLCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glColor4fNormal3fVertex3fSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glColor4fNormal3fVertex3fvSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glColor4ubVertex2fSUN = (PFNGLCOLOR4UBVERTEX2FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fSUN")) == NULL) || r;
+  r = ((glColor4ubVertex2fvSUN = (PFNGLCOLOR4UBVERTEX2FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fvSUN")) == NULL) || r;
+  r = ((glColor4ubVertex3fSUN = (PFNGLCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glColor4ubVertex3fvSUN = (PFNGLCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glNormal3fVertex3fSUN = (PFNGLNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glNormal3fVertex3fvSUN = (PFNGLNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4ubVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4ubVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiVertex3fSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiVertex3fvSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4ubVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4ubVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fVertex3fSUN = (PFNGLTEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fVertex3fvSUN = (PFNGLTEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord4fColor4fNormal3fVertex4fSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fSUN")) == NULL) || r;
+  r = ((glTexCoord4fColor4fNormal3fVertex4fvSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fvSUN")) == NULL) || r;
+  r = ((glTexCoord4fVertex4fSUN = (PFNGLTEXCOORD4FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fSUN")) == NULL) || r;
+  r = ((glTexCoord4fVertex4fvSUN = (PFNGLTEXCOORD4FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fvSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_vertex */
+
+#ifdef GL_WIN_swap_hint
+
+static GLboolean _glewInit_GL_WIN_swap_hint ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAddSwapHintRectWIN = (PFNGLADDSWAPHINTRECTWINPROC)glewGetProcAddress((const GLubyte*)"glAddSwapHintRectWIN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_WIN_swap_hint */
+
+/* ------------------------------------------------------------------------- */
+
+static int _glewExtensionCompare(const char *s1, const char *s2)
+{
+  /* http://www.chanduthedev.com/2012/07/strcmp-implementation-in-c.html */
+  while (*s1 || *s2)
+  {
+      if (*s1 > *s2)
+          return 1;
+      if (*s1 < *s2)
+          return -1;
+      s1++;
+      s2++;
+  }
+  return 0;
+}
+
+static ptrdiff_t _glewBsearchExtension(const char* name)
+{
+  ptrdiff_t lo = 0, hi = sizeof(_glewExtensionLookup) / sizeof(char*) - 2;
+
+  while (lo <= hi)
+  {
+    ptrdiff_t mid = (lo + hi) / 2;
+    const int cmp = _glewExtensionCompare(name, _glewExtensionLookup[mid]);
+    if (cmp < 0) hi = mid - 1;
+    else if (cmp > 0) lo = mid + 1;
+    else return mid;
+  }
+  return -1;
+}
+
+static GLboolean *_glewGetExtensionString(const char *name)
+{
+  ptrdiff_t n = _glewBsearchExtension(name);
+  if (n >= 0) return &_glewExtensionString[n];
+  return NULL;
+}
+
+static GLboolean *_glewGetExtensionEnable(const char *name)
+{
+  ptrdiff_t n = _glewBsearchExtension(name);
+  if (n >= 0) return _glewExtensionEnabled[n];
+  return NULL;
+}
+
+static const char *_glewNextSpace(const char *i)
+{
+  const char *j = i;
+  if (j)
+    while (*j!=' ' && *j) ++j;
+  return j;
+}
+
+static const char *_glewNextNonSpace(const char *i)
+{
+  const char *j = i;
+  if (j)
+    while (*j==' ') ++j;
+  return j;
+}
+
+GLboolean GLEWAPIENTRY glewGetExtension (const char* name)
+{
+  GLboolean *enable = _glewGetExtensionString(name);
+  if (enable)
+    return *enable;
+  return GL_FALSE;
+}
+
+/* ------------------------------------------------------------------------- */
+
+typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGPROC) (GLenum name);
+typedef void (GLAPIENTRY * PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params);
+
+GLenum GLEWAPIENTRY glewContextInit ()
+{
+  PFNGLGETSTRINGPROC getString;
+  const GLubyte* s;
+  GLuint dot;
+  GLint major, minor;
+  size_t n;
+
+  #ifdef _WIN32
+  getString = glGetString;
+  #else
+  getString = (PFNGLGETSTRINGPROC) glewGetProcAddress((const GLubyte*)"glGetString");
+  if (!getString)
+    return GLEW_ERROR_NO_GL_VERSION;
+  #endif
+
+  /* query opengl version */
+  s = getString(GL_VERSION);
+  dot = _glewStrCLen(s, '.');
+  if (dot == 0)
+    return GLEW_ERROR_NO_GL_VERSION;
+
+  major = s[dot-1]-'0';
+  minor = s[dot+1]-'0';
+
+  if (minor < 0 || minor > 9)
+    minor = 0;
+  if (major<0 || major>9)
+    return GLEW_ERROR_NO_GL_VERSION;
+
+  if (major == 1 && minor == 0)
+  {
+    return GLEW_ERROR_GL_VERSION_10_ONLY;
+  }
+  else
+  {
+    GLEW_VERSION_4_6   = ( major > 4 )                 || ( major == 4 && minor >= 6 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_5   = GLEW_VERSION_4_4   == GL_TRUE || ( major == 4 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_4   = GLEW_VERSION_4_5   == GL_TRUE || ( major == 4 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_3   = GLEW_VERSION_4_4   == GL_TRUE || ( major == 4 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_2   = GLEW_VERSION_4_3   == GL_TRUE || ( major == 4 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_1   = GLEW_VERSION_4_2   == GL_TRUE || ( major == 4 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_4_0   = GLEW_VERSION_4_1   == GL_TRUE || ( major == 4               ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_3_3   = GLEW_VERSION_4_0   == GL_TRUE || ( major == 3 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_3_2   = GLEW_VERSION_3_3   == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_3_1   = GLEW_VERSION_3_2   == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_3_0   = GLEW_VERSION_3_1   == GL_TRUE || ( major == 3               ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_2_1   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_2_0   = GLEW_VERSION_2_1   == GL_TRUE || ( major == 2               ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_5   = GLEW_VERSION_2_0   == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_4   = GLEW_VERSION_1_5   == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_3   = GLEW_VERSION_1_4   == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_2_1 = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_2   = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
+    GLEW_VERSION_1_1   = GLEW_VERSION_1_2   == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+  }
+
+  for (n = 0; n < sizeof(_glewExtensionString) / sizeof(_glewExtensionString[0]); ++n)
+    _glewExtensionString[n] = GL_FALSE;
+
+  if (GLEW_VERSION_3_0)
+  {
+    GLint n = 0;
+    GLint i;
+    PFNGLGETINTEGERVPROC getIntegerv;
+    PFNGLGETSTRINGIPROC getStringi;
+    const char *ext;
+    GLboolean *enable;
+
+    #ifdef _WIN32
+    getIntegerv = glGetIntegerv;
+    #else
+    getIntegerv = (PFNGLGETINTEGERVPROC) glewGetProcAddress((const GLubyte*)"glGetIntegerv");
+    #endif
+
+    if (getIntegerv)
+      getIntegerv(GL_NUM_EXTENSIONS, &n);
+
+    /* glGetStringi is OpenGL 3.0 */
+    getStringi = (PFNGLGETSTRINGIPROC) glewGetProcAddress((const GLubyte*)"glGetStringi");
+    if (getStringi)
+      for (i = 0; i<n; ++i)
+      {
+        ext = (const char *) getStringi(GL_EXTENSIONS, i);
+
+        /* Based on extension string(s), glewGetExtension purposes */
+        enable = _glewGetExtensionString(ext);
+        if (enable)
+          *enable = GL_TRUE;
+
+        /* Based on extension string(s), experimental mode, glewIsSupported purposes */
+        enable = _glewGetExtensionEnable(ext);
+        if (enable)
+          *enable = GL_TRUE;
+      }
+  }
+  else
+  {
+    const char *extensions;
+    const char *end;
+    const char *i;
+    const char *j;
+    char ext[128];
+    GLboolean *enable;
+
+    extensions = (const char *) getString(GL_EXTENSIONS);
+
+    if (extensions)
+    {
+      end = extensions + _glewStrLen((const GLubyte *) extensions);
+      for (i=extensions; i<end; i = j + 1)
+      {
+        i = _glewNextNonSpace(i);
+        j = _glewNextSpace(i);
+
+        /* Copy extension into NUL terminated string */
+        if (j-i >= (ptrdiff_t) sizeof(ext))
+          continue;
+        _glewStrCopy(ext, i, ' ');
+
+        /* Based on extension string(s), glewGetExtension purposes */
+        enable = _glewGetExtensionString(ext);
+        if (enable)
+          *enable = GL_TRUE;
+
+        /* Based on extension string(s), experimental mode, glewIsSupported purposes */
+        enable = _glewGetExtensionEnable(ext);
+        if (enable)
+          *enable = GL_TRUE;
+      }
+    }
+  }
+#ifdef GL_VERSION_1_2
+  if (glewExperimental || GLEW_VERSION_1_2) GLEW_VERSION_1_2 = !_glewInit_GL_VERSION_1_2();
+#endif /* GL_VERSION_1_2 */
+#ifdef GL_VERSION_1_3
+  if (glewExperimental || GLEW_VERSION_1_3) GLEW_VERSION_1_3 = !_glewInit_GL_VERSION_1_3();
+#endif /* GL_VERSION_1_3 */
+#ifdef GL_VERSION_1_4
+  if (glewExperimental || GLEW_VERSION_1_4) GLEW_VERSION_1_4 = !_glewInit_GL_VERSION_1_4();
+#endif /* GL_VERSION_1_4 */
+#ifdef GL_VERSION_1_5
+  if (glewExperimental || GLEW_VERSION_1_5) GLEW_VERSION_1_5 = !_glewInit_GL_VERSION_1_5();
+#endif /* GL_VERSION_1_5 */
+#ifdef GL_VERSION_2_0
+  if (glewExperimental || GLEW_VERSION_2_0) GLEW_VERSION_2_0 = !_glewInit_GL_VERSION_2_0();
+#endif /* GL_VERSION_2_0 */
+#ifdef GL_VERSION_2_1
+  if (glewExperimental || GLEW_VERSION_2_1) GLEW_VERSION_2_1 = !_glewInit_GL_VERSION_2_1();
+#endif /* GL_VERSION_2_1 */
+#ifdef GL_VERSION_3_0
+  if (glewExperimental || GLEW_VERSION_3_0) GLEW_VERSION_3_0 = !_glewInit_GL_VERSION_3_0();
+#endif /* GL_VERSION_3_0 */
+#ifdef GL_VERSION_3_1
+  if (glewExperimental || GLEW_VERSION_3_1) GLEW_VERSION_3_1 = !_glewInit_GL_VERSION_3_1();
+#endif /* GL_VERSION_3_1 */
+#ifdef GL_VERSION_3_2
+  if (glewExperimental || GLEW_VERSION_3_2) GLEW_VERSION_3_2 = !_glewInit_GL_VERSION_3_2();
+#endif /* GL_VERSION_3_2 */
+#ifdef GL_VERSION_3_3
+  if (glewExperimental || GLEW_VERSION_3_3) GLEW_VERSION_3_3 = !_glewInit_GL_VERSION_3_3();
+#endif /* GL_VERSION_3_3 */
+#ifdef GL_VERSION_4_0
+  if (glewExperimental || GLEW_VERSION_4_0) GLEW_VERSION_4_0 = !_glewInit_GL_VERSION_4_0();
+#endif /* GL_VERSION_4_0 */
+#ifdef GL_VERSION_4_5
+  if (glewExperimental || GLEW_VERSION_4_5) GLEW_VERSION_4_5 = !_glewInit_GL_VERSION_4_5();
+#endif /* GL_VERSION_4_5 */
+#ifdef GL_VERSION_4_6
+  if (glewExperimental || GLEW_VERSION_4_6) GLEW_VERSION_4_6 = !_glewInit_GL_VERSION_4_6();
+#endif /* GL_VERSION_4_6 */
+#ifdef GL_3DFX_tbuffer
+  if (glewExperimental || GLEW_3DFX_tbuffer) GLEW_3DFX_tbuffer = !_glewInit_GL_3DFX_tbuffer();
+#endif /* GL_3DFX_tbuffer */
+#ifdef GL_AMD_debug_output
+  if (glewExperimental || GLEW_AMD_debug_output) GLEW_AMD_debug_output = !_glewInit_GL_AMD_debug_output();
+#endif /* GL_AMD_debug_output */
+#ifdef GL_AMD_draw_buffers_blend
+  if (glewExperimental || GLEW_AMD_draw_buffers_blend) GLEW_AMD_draw_buffers_blend = !_glewInit_GL_AMD_draw_buffers_blend();
+#endif /* GL_AMD_draw_buffers_blend */
+#ifdef GL_AMD_framebuffer_sample_positions
+  if (glewExperimental || GLEW_AMD_framebuffer_sample_positions) GLEW_AMD_framebuffer_sample_positions = !_glewInit_GL_AMD_framebuffer_sample_positions();
+#endif /* GL_AMD_framebuffer_sample_positions */
+#ifdef GL_AMD_interleaved_elements
+  if (glewExperimental || GLEW_AMD_interleaved_elements) GLEW_AMD_interleaved_elements = !_glewInit_GL_AMD_interleaved_elements();
+#endif /* GL_AMD_interleaved_elements */
+#ifdef GL_AMD_multi_draw_indirect
+  if (glewExperimental || GLEW_AMD_multi_draw_indirect) GLEW_AMD_multi_draw_indirect = !_glewInit_GL_AMD_multi_draw_indirect();
+#endif /* GL_AMD_multi_draw_indirect */
+#ifdef GL_AMD_name_gen_delete
+  if (glewExperimental || GLEW_AMD_name_gen_delete) GLEW_AMD_name_gen_delete = !_glewInit_GL_AMD_name_gen_delete();
+#endif /* GL_AMD_name_gen_delete */
+#ifdef GL_AMD_occlusion_query_event
+  if (glewExperimental || GLEW_AMD_occlusion_query_event) GLEW_AMD_occlusion_query_event = !_glewInit_GL_AMD_occlusion_query_event();
+#endif /* GL_AMD_occlusion_query_event */
+#ifdef GL_AMD_performance_monitor
+  if (glewExperimental || GLEW_AMD_performance_monitor) GLEW_AMD_performance_monitor = !_glewInit_GL_AMD_performance_monitor();
+#endif /* GL_AMD_performance_monitor */
+#ifdef GL_AMD_sample_positions
+  if (glewExperimental || GLEW_AMD_sample_positions) GLEW_AMD_sample_positions = !_glewInit_GL_AMD_sample_positions();
+#endif /* GL_AMD_sample_positions */
+#ifdef GL_AMD_sparse_texture
+  if (glewExperimental || GLEW_AMD_sparse_texture) GLEW_AMD_sparse_texture = !_glewInit_GL_AMD_sparse_texture();
+#endif /* GL_AMD_sparse_texture */
+#ifdef GL_AMD_stencil_operation_extended
+  if (glewExperimental || GLEW_AMD_stencil_operation_extended) GLEW_AMD_stencil_operation_extended = !_glewInit_GL_AMD_stencil_operation_extended();
+#endif /* GL_AMD_stencil_operation_extended */
+#ifdef GL_AMD_vertex_shader_tessellator
+  if (glewExperimental || GLEW_AMD_vertex_shader_tessellator) GLEW_AMD_vertex_shader_tessellator = !_glewInit_GL_AMD_vertex_shader_tessellator();
+#endif /* GL_AMD_vertex_shader_tessellator */
+#ifdef GL_ANGLE_framebuffer_blit
+  if (glewExperimental || GLEW_ANGLE_framebuffer_blit) GLEW_ANGLE_framebuffer_blit = !_glewInit_GL_ANGLE_framebuffer_blit();
+#endif /* GL_ANGLE_framebuffer_blit */
+#ifdef GL_ANGLE_framebuffer_multisample
+  if (glewExperimental || GLEW_ANGLE_framebuffer_multisample) GLEW_ANGLE_framebuffer_multisample = !_glewInit_GL_ANGLE_framebuffer_multisample();
+#endif /* GL_ANGLE_framebuffer_multisample */
+#ifdef GL_ANGLE_instanced_arrays
+  if (glewExperimental || GLEW_ANGLE_instanced_arrays) GLEW_ANGLE_instanced_arrays = !_glewInit_GL_ANGLE_instanced_arrays();
+#endif /* GL_ANGLE_instanced_arrays */
+#ifdef GL_ANGLE_timer_query
+  if (glewExperimental || GLEW_ANGLE_timer_query) GLEW_ANGLE_timer_query = !_glewInit_GL_ANGLE_timer_query();
+#endif /* GL_ANGLE_timer_query */
+#ifdef GL_ANGLE_translated_shader_source
+  if (glewExperimental || GLEW_ANGLE_translated_shader_source) GLEW_ANGLE_translated_shader_source = !_glewInit_GL_ANGLE_translated_shader_source();
+#endif /* GL_ANGLE_translated_shader_source */
+#ifdef GL_APPLE_copy_texture_levels
+  if (glewExperimental || GLEW_APPLE_copy_texture_levels) GLEW_APPLE_copy_texture_levels = !_glewInit_GL_APPLE_copy_texture_levels();
+#endif /* GL_APPLE_copy_texture_levels */
+#ifdef GL_APPLE_element_array
+  if (glewExperimental || GLEW_APPLE_element_array) GLEW_APPLE_element_array = !_glewInit_GL_APPLE_element_array();
+#endif /* GL_APPLE_element_array */
+#ifdef GL_APPLE_fence
+  if (glewExperimental || GLEW_APPLE_fence) GLEW_APPLE_fence = !_glewInit_GL_APPLE_fence();
+#endif /* GL_APPLE_fence */
+#ifdef GL_APPLE_flush_buffer_range
+  if (glewExperimental || GLEW_APPLE_flush_buffer_range) GLEW_APPLE_flush_buffer_range = !_glewInit_GL_APPLE_flush_buffer_range();
+#endif /* GL_APPLE_flush_buffer_range */
+#ifdef GL_APPLE_framebuffer_multisample
+  if (glewExperimental || GLEW_APPLE_framebuffer_multisample) GLEW_APPLE_framebuffer_multisample = !_glewInit_GL_APPLE_framebuffer_multisample();
+#endif /* GL_APPLE_framebuffer_multisample */
+#ifdef GL_APPLE_object_purgeable
+  if (glewExperimental || GLEW_APPLE_object_purgeable) GLEW_APPLE_object_purgeable = !_glewInit_GL_APPLE_object_purgeable();
+#endif /* GL_APPLE_object_purgeable */
+#ifdef GL_APPLE_sync
+  if (glewExperimental || GLEW_APPLE_sync) GLEW_APPLE_sync = !_glewInit_GL_APPLE_sync();
+#endif /* GL_APPLE_sync */
+#ifdef GL_APPLE_texture_range
+  if (glewExperimental || GLEW_APPLE_texture_range) GLEW_APPLE_texture_range = !_glewInit_GL_APPLE_texture_range();
+#endif /* GL_APPLE_texture_range */
+#ifdef GL_APPLE_vertex_array_object
+  if (glewExperimental || GLEW_APPLE_vertex_array_object) GLEW_APPLE_vertex_array_object = !_glewInit_GL_APPLE_vertex_array_object();
+#endif /* GL_APPLE_vertex_array_object */
+#ifdef GL_APPLE_vertex_array_range
+  if (glewExperimental || GLEW_APPLE_vertex_array_range) GLEW_APPLE_vertex_array_range = !_glewInit_GL_APPLE_vertex_array_range();
+#endif /* GL_APPLE_vertex_array_range */
+#ifdef GL_APPLE_vertex_program_evaluators
+  if (glewExperimental || GLEW_APPLE_vertex_program_evaluators) GLEW_APPLE_vertex_program_evaluators = !_glewInit_GL_APPLE_vertex_program_evaluators();
+#endif /* GL_APPLE_vertex_program_evaluators */
+#ifdef GL_ARB_ES2_compatibility
+  if (glewExperimental || GLEW_ARB_ES2_compatibility) GLEW_ARB_ES2_compatibility = !_glewInit_GL_ARB_ES2_compatibility();
+#endif /* GL_ARB_ES2_compatibility */
+#ifdef GL_ARB_ES3_1_compatibility
+  if (glewExperimental || GLEW_ARB_ES3_1_compatibility) GLEW_ARB_ES3_1_compatibility = !_glewInit_GL_ARB_ES3_1_compatibility();
+#endif /* GL_ARB_ES3_1_compatibility */
+#ifdef GL_ARB_ES3_2_compatibility
+  if (glewExperimental || GLEW_ARB_ES3_2_compatibility) GLEW_ARB_ES3_2_compatibility = !_glewInit_GL_ARB_ES3_2_compatibility();
+#endif /* GL_ARB_ES3_2_compatibility */
+#ifdef GL_ARB_base_instance
+  if (glewExperimental || GLEW_ARB_base_instance) GLEW_ARB_base_instance = !_glewInit_GL_ARB_base_instance();
+#endif /* GL_ARB_base_instance */
+#ifdef GL_ARB_bindless_texture
+  if (glewExperimental || GLEW_ARB_bindless_texture) GLEW_ARB_bindless_texture = !_glewInit_GL_ARB_bindless_texture();
+#endif /* GL_ARB_bindless_texture */
+#ifdef GL_ARB_blend_func_extended
+  if (glewExperimental || GLEW_ARB_blend_func_extended) GLEW_ARB_blend_func_extended = !_glewInit_GL_ARB_blend_func_extended();
+#endif /* GL_ARB_blend_func_extended */
+#ifdef GL_ARB_buffer_storage
+  if (glewExperimental || GLEW_ARB_buffer_storage) GLEW_ARB_buffer_storage = !_glewInit_GL_ARB_buffer_storage();
+#endif /* GL_ARB_buffer_storage */
+#ifdef GL_ARB_cl_event
+  if (glewExperimental || GLEW_ARB_cl_event) GLEW_ARB_cl_event = !_glewInit_GL_ARB_cl_event();
+#endif /* GL_ARB_cl_event */
+#ifdef GL_ARB_clear_buffer_object
+  if (glewExperimental || GLEW_ARB_clear_buffer_object) GLEW_ARB_clear_buffer_object = !_glewInit_GL_ARB_clear_buffer_object();
+#endif /* GL_ARB_clear_buffer_object */
+#ifdef GL_ARB_clear_texture
+  if (glewExperimental || GLEW_ARB_clear_texture) GLEW_ARB_clear_texture = !_glewInit_GL_ARB_clear_texture();
+#endif /* GL_ARB_clear_texture */
+#ifdef GL_ARB_clip_control
+  if (glewExperimental || GLEW_ARB_clip_control) GLEW_ARB_clip_control = !_glewInit_GL_ARB_clip_control();
+#endif /* GL_ARB_clip_control */
+#ifdef GL_ARB_color_buffer_float
+  if (glewExperimental || GLEW_ARB_color_buffer_float) GLEW_ARB_color_buffer_float = !_glewInit_GL_ARB_color_buffer_float();
+#endif /* GL_ARB_color_buffer_float */
+#ifdef GL_ARB_compute_shader
+  if (glewExperimental || GLEW_ARB_compute_shader) GLEW_ARB_compute_shader = !_glewInit_GL_ARB_compute_shader();
+#endif /* GL_ARB_compute_shader */
+#ifdef GL_ARB_compute_variable_group_size
+  if (glewExperimental || GLEW_ARB_compute_variable_group_size) GLEW_ARB_compute_variable_group_size = !_glewInit_GL_ARB_compute_variable_group_size();
+#endif /* GL_ARB_compute_variable_group_size */
+#ifdef GL_ARB_copy_buffer
+  if (glewExperimental || GLEW_ARB_copy_buffer) GLEW_ARB_copy_buffer = !_glewInit_GL_ARB_copy_buffer();
+#endif /* GL_ARB_copy_buffer */
+#ifdef GL_ARB_copy_image
+  if (glewExperimental || GLEW_ARB_copy_image) GLEW_ARB_copy_image = !_glewInit_GL_ARB_copy_image();
+#endif /* GL_ARB_copy_image */
+#ifdef GL_ARB_debug_output
+  if (glewExperimental || GLEW_ARB_debug_output) GLEW_ARB_debug_output = !_glewInit_GL_ARB_debug_output();
+#endif /* GL_ARB_debug_output */
+#ifdef GL_ARB_direct_state_access
+  if (glewExperimental || GLEW_ARB_direct_state_access) GLEW_ARB_direct_state_access = !_glewInit_GL_ARB_direct_state_access();
+#endif /* GL_ARB_direct_state_access */
+#ifdef GL_ARB_draw_buffers
+  if (glewExperimental || GLEW_ARB_draw_buffers) GLEW_ARB_draw_buffers = !_glewInit_GL_ARB_draw_buffers();
+#endif /* GL_ARB_draw_buffers */
+#ifdef GL_ARB_draw_buffers_blend
+  if (glewExperimental || GLEW_ARB_draw_buffers_blend) GLEW_ARB_draw_buffers_blend = !_glewInit_GL_ARB_draw_buffers_blend();
+#endif /* GL_ARB_draw_buffers_blend */
+#ifdef GL_ARB_draw_elements_base_vertex
+  if (glewExperimental || GLEW_ARB_draw_elements_base_vertex) GLEW_ARB_draw_elements_base_vertex = !_glewInit_GL_ARB_draw_elements_base_vertex();
+#endif /* GL_ARB_draw_elements_base_vertex */
+#ifdef GL_ARB_draw_indirect
+  if (glewExperimental || GLEW_ARB_draw_indirect) GLEW_ARB_draw_indirect = !_glewInit_GL_ARB_draw_indirect();
+#endif /* GL_ARB_draw_indirect */
+#ifdef GL_ARB_framebuffer_no_attachments
+  if (glewExperimental || GLEW_ARB_framebuffer_no_attachments) GLEW_ARB_framebuffer_no_attachments = !_glewInit_GL_ARB_framebuffer_no_attachments();
+#endif /* GL_ARB_framebuffer_no_attachments */
+#ifdef GL_ARB_framebuffer_object
+  if (glewExperimental || GLEW_ARB_framebuffer_object) GLEW_ARB_framebuffer_object = !_glewInit_GL_ARB_framebuffer_object();
+#endif /* GL_ARB_framebuffer_object */
+#ifdef GL_ARB_geometry_shader4
+  if (glewExperimental || GLEW_ARB_geometry_shader4) GLEW_ARB_geometry_shader4 = !_glewInit_GL_ARB_geometry_shader4();
+#endif /* GL_ARB_geometry_shader4 */
+#ifdef GL_ARB_get_program_binary
+  if (glewExperimental || GLEW_ARB_get_program_binary) GLEW_ARB_get_program_binary = !_glewInit_GL_ARB_get_program_binary();
+#endif /* GL_ARB_get_program_binary */
+#ifdef GL_ARB_get_texture_sub_image
+  if (glewExperimental || GLEW_ARB_get_texture_sub_image) GLEW_ARB_get_texture_sub_image = !_glewInit_GL_ARB_get_texture_sub_image();
+#endif /* GL_ARB_get_texture_sub_image */
+#ifdef GL_ARB_gl_spirv
+  if (glewExperimental || GLEW_ARB_gl_spirv) GLEW_ARB_gl_spirv = !_glewInit_GL_ARB_gl_spirv();
+#endif /* GL_ARB_gl_spirv */
+#ifdef GL_ARB_gpu_shader_fp64
+  if (glewExperimental || GLEW_ARB_gpu_shader_fp64) GLEW_ARB_gpu_shader_fp64 = !_glewInit_GL_ARB_gpu_shader_fp64();
+#endif /* GL_ARB_gpu_shader_fp64 */
+#ifdef GL_ARB_gpu_shader_int64
+  if (glewExperimental || GLEW_ARB_gpu_shader_int64) GLEW_ARB_gpu_shader_int64 = !_glewInit_GL_ARB_gpu_shader_int64();
+#endif /* GL_ARB_gpu_shader_int64 */
+#ifdef GL_ARB_imaging
+  if (glewExperimental || GLEW_ARB_imaging) GLEW_ARB_imaging = !_glewInit_GL_ARB_imaging();
+#endif /* GL_ARB_imaging */
+#ifdef GL_ARB_indirect_parameters
+  if (glewExperimental || GLEW_ARB_indirect_parameters) GLEW_ARB_indirect_parameters = !_glewInit_GL_ARB_indirect_parameters();
+#endif /* GL_ARB_indirect_parameters */
+#ifdef GL_ARB_instanced_arrays
+  if (glewExperimental || GLEW_ARB_instanced_arrays) GLEW_ARB_instanced_arrays = !_glewInit_GL_ARB_instanced_arrays();
+#endif /* GL_ARB_instanced_arrays */
+#ifdef GL_ARB_internalformat_query
+  if (glewExperimental || GLEW_ARB_internalformat_query) GLEW_ARB_internalformat_query = !_glewInit_GL_ARB_internalformat_query();
+#endif /* GL_ARB_internalformat_query */
+#ifdef GL_ARB_internalformat_query2
+  if (glewExperimental || GLEW_ARB_internalformat_query2) GLEW_ARB_internalformat_query2 = !_glewInit_GL_ARB_internalformat_query2();
+#endif /* GL_ARB_internalformat_query2 */
+#ifdef GL_ARB_invalidate_subdata
+  if (glewExperimental || GLEW_ARB_invalidate_subdata) GLEW_ARB_invalidate_subdata = !_glewInit_GL_ARB_invalidate_subdata();
+#endif /* GL_ARB_invalidate_subdata */
+#ifdef GL_ARB_map_buffer_range
+  if (glewExperimental || GLEW_ARB_map_buffer_range) GLEW_ARB_map_buffer_range = !_glewInit_GL_ARB_map_buffer_range();
+#endif /* GL_ARB_map_buffer_range */
+#ifdef GL_ARB_matrix_palette
+  if (glewExperimental || GLEW_ARB_matrix_palette) GLEW_ARB_matrix_palette = !_glewInit_GL_ARB_matrix_palette();
+#endif /* GL_ARB_matrix_palette */
+#ifdef GL_ARB_multi_bind
+  if (glewExperimental || GLEW_ARB_multi_bind) GLEW_ARB_multi_bind = !_glewInit_GL_ARB_multi_bind();
+#endif /* GL_ARB_multi_bind */
+#ifdef GL_ARB_multi_draw_indirect
+  if (glewExperimental || GLEW_ARB_multi_draw_indirect) GLEW_ARB_multi_draw_indirect = !_glewInit_GL_ARB_multi_draw_indirect();
+#endif /* GL_ARB_multi_draw_indirect */
+#ifdef GL_ARB_multisample
+  if (glewExperimental || GLEW_ARB_multisample) GLEW_ARB_multisample = !_glewInit_GL_ARB_multisample();
+#endif /* GL_ARB_multisample */
+#ifdef GL_ARB_multitexture
+  if (glewExperimental || GLEW_ARB_multitexture) GLEW_ARB_multitexture = !_glewInit_GL_ARB_multitexture();
+#endif /* GL_ARB_multitexture */
+#ifdef GL_ARB_occlusion_query
+  if (glewExperimental || GLEW_ARB_occlusion_query) GLEW_ARB_occlusion_query = !_glewInit_GL_ARB_occlusion_query();
+#endif /* GL_ARB_occlusion_query */
+#ifdef GL_ARB_parallel_shader_compile
+  if (glewExperimental || GLEW_ARB_parallel_shader_compile) GLEW_ARB_parallel_shader_compile = !_glewInit_GL_ARB_parallel_shader_compile();
+#endif /* GL_ARB_parallel_shader_compile */
+#ifdef GL_ARB_point_parameters
+  if (glewExperimental || GLEW_ARB_point_parameters) GLEW_ARB_point_parameters = !_glewInit_GL_ARB_point_parameters();
+#endif /* GL_ARB_point_parameters */
+#ifdef GL_ARB_polygon_offset_clamp
+  if (glewExperimental || GLEW_ARB_polygon_offset_clamp) GLEW_ARB_polygon_offset_clamp = !_glewInit_GL_ARB_polygon_offset_clamp();
+#endif /* GL_ARB_polygon_offset_clamp */
+#ifdef GL_ARB_program_interface_query
+  if (glewExperimental || GLEW_ARB_program_interface_query) GLEW_ARB_program_interface_query = !_glewInit_GL_ARB_program_interface_query();
+#endif /* GL_ARB_program_interface_query */
+#ifdef GL_ARB_provoking_vertex
+  if (glewExperimental || GLEW_ARB_provoking_vertex) GLEW_ARB_provoking_vertex = !_glewInit_GL_ARB_provoking_vertex();
+#endif /* GL_ARB_provoking_vertex */
+#ifdef GL_ARB_robustness
+  if (glewExperimental || GLEW_ARB_robustness) GLEW_ARB_robustness = !_glewInit_GL_ARB_robustness();
+#endif /* GL_ARB_robustness */
+#ifdef GL_ARB_sample_locations
+  if (glewExperimental || GLEW_ARB_sample_locations) GLEW_ARB_sample_locations = !_glewInit_GL_ARB_sample_locations();
+#endif /* GL_ARB_sample_locations */
+#ifdef GL_ARB_sample_shading
+  if (glewExperimental || GLEW_ARB_sample_shading) GLEW_ARB_sample_shading = !_glewInit_GL_ARB_sample_shading();
+#endif /* GL_ARB_sample_shading */
+#ifdef GL_ARB_sampler_objects
+  if (glewExperimental || GLEW_ARB_sampler_objects) GLEW_ARB_sampler_objects = !_glewInit_GL_ARB_sampler_objects();
+#endif /* GL_ARB_sampler_objects */
+#ifdef GL_ARB_separate_shader_objects
+  if (glewExperimental || GLEW_ARB_separate_shader_objects) GLEW_ARB_separate_shader_objects = !_glewInit_GL_ARB_separate_shader_objects();
+#endif /* GL_ARB_separate_shader_objects */
+#ifdef GL_ARB_shader_atomic_counters
+  if (glewExperimental || GLEW_ARB_shader_atomic_counters) GLEW_ARB_shader_atomic_counters = !_glewInit_GL_ARB_shader_atomic_counters();
+#endif /* GL_ARB_shader_atomic_counters */
+#ifdef GL_ARB_shader_image_load_store
+  if (glewExperimental || GLEW_ARB_shader_image_load_store) GLEW_ARB_shader_image_load_store = !_glewInit_GL_ARB_shader_image_load_store();
+#endif /* GL_ARB_shader_image_load_store */
+#ifdef GL_ARB_shader_objects
+  if (glewExperimental || GLEW_ARB_shader_objects) GLEW_ARB_shader_objects = !_glewInit_GL_ARB_shader_objects();
+#endif /* GL_ARB_shader_objects */
+#ifdef GL_ARB_shader_storage_buffer_object
+  if (glewExperimental || GLEW_ARB_shader_storage_buffer_object) GLEW_ARB_shader_storage_buffer_object = !_glewInit_GL_ARB_shader_storage_buffer_object();
+#endif /* GL_ARB_shader_storage_buffer_object */
+#ifdef GL_ARB_shader_subroutine
+  if (glewExperimental || GLEW_ARB_shader_subroutine) GLEW_ARB_shader_subroutine = !_glewInit_GL_ARB_shader_subroutine();
+#endif /* GL_ARB_shader_subroutine */
+#ifdef GL_ARB_shading_language_include
+  if (glewExperimental || GLEW_ARB_shading_language_include) GLEW_ARB_shading_language_include = !_glewInit_GL_ARB_shading_language_include();
+#endif /* GL_ARB_shading_language_include */
+#ifdef GL_ARB_sparse_buffer
+  if (glewExperimental || GLEW_ARB_sparse_buffer) GLEW_ARB_sparse_buffer = !_glewInit_GL_ARB_sparse_buffer();
+#endif /* GL_ARB_sparse_buffer */
+#ifdef GL_ARB_sparse_texture
+  if (glewExperimental || GLEW_ARB_sparse_texture) GLEW_ARB_sparse_texture = !_glewInit_GL_ARB_sparse_texture();
+#endif /* GL_ARB_sparse_texture */
+#ifdef GL_ARB_sync
+  if (glewExperimental || GLEW_ARB_sync) GLEW_ARB_sync = !_glewInit_GL_ARB_sync();
+#endif /* GL_ARB_sync */
+#ifdef GL_ARB_tessellation_shader
+  if (glewExperimental || GLEW_ARB_tessellation_shader) GLEW_ARB_tessellation_shader = !_glewInit_GL_ARB_tessellation_shader();
+#endif /* GL_ARB_tessellation_shader */
+#ifdef GL_ARB_texture_barrier
+  if (glewExperimental || GLEW_ARB_texture_barrier) GLEW_ARB_texture_barrier = !_glewInit_GL_ARB_texture_barrier();
+#endif /* GL_ARB_texture_barrier */
+#ifdef GL_ARB_texture_buffer_object
+  if (glewExperimental || GLEW_ARB_texture_buffer_object) GLEW_ARB_texture_buffer_object = !_glewInit_GL_ARB_texture_buffer_object();
+#endif /* GL_ARB_texture_buffer_object */
+#ifdef GL_ARB_texture_buffer_range
+  if (glewExperimental || GLEW_ARB_texture_buffer_range) GLEW_ARB_texture_buffer_range = !_glewInit_GL_ARB_texture_buffer_range();
+#endif /* GL_ARB_texture_buffer_range */
+#ifdef GL_ARB_texture_compression
+  if (glewExperimental || GLEW_ARB_texture_compression) GLEW_ARB_texture_compression = !_glewInit_GL_ARB_texture_compression();
+#endif /* GL_ARB_texture_compression */
+#ifdef GL_ARB_texture_multisample
+  if (glewExperimental || GLEW_ARB_texture_multisample) GLEW_ARB_texture_multisample = !_glewInit_GL_ARB_texture_multisample();
+#endif /* GL_ARB_texture_multisample */
+#ifdef GL_ARB_texture_storage
+  if (glewExperimental || GLEW_ARB_texture_storage) GLEW_ARB_texture_storage = !_glewInit_GL_ARB_texture_storage();
+#endif /* GL_ARB_texture_storage */
+#ifdef GL_ARB_texture_storage_multisample
+  if (glewExperimental || GLEW_ARB_texture_storage_multisample) GLEW_ARB_texture_storage_multisample = !_glewInit_GL_ARB_texture_storage_multisample();
+#endif /* GL_ARB_texture_storage_multisample */
+#ifdef GL_ARB_texture_view
+  if (glewExperimental || GLEW_ARB_texture_view) GLEW_ARB_texture_view = !_glewInit_GL_ARB_texture_view();
+#endif /* GL_ARB_texture_view */
+#ifdef GL_ARB_timer_query
+  if (glewExperimental || GLEW_ARB_timer_query) GLEW_ARB_timer_query = !_glewInit_GL_ARB_timer_query();
+#endif /* GL_ARB_timer_query */
+#ifdef GL_ARB_transform_feedback2
+  if (glewExperimental || GLEW_ARB_transform_feedback2) GLEW_ARB_transform_feedback2 = !_glewInit_GL_ARB_transform_feedback2();
+#endif /* GL_ARB_transform_feedback2 */
+#ifdef GL_ARB_transform_feedback3
+  if (glewExperimental || GLEW_ARB_transform_feedback3) GLEW_ARB_transform_feedback3 = !_glewInit_GL_ARB_transform_feedback3();
+#endif /* GL_ARB_transform_feedback3 */
+#ifdef GL_ARB_transform_feedback_instanced
+  if (glewExperimental || GLEW_ARB_transform_feedback_instanced) GLEW_ARB_transform_feedback_instanced = !_glewInit_GL_ARB_transform_feedback_instanced();
+#endif /* GL_ARB_transform_feedback_instanced */
+#ifdef GL_ARB_transpose_matrix
+  if (glewExperimental || GLEW_ARB_transpose_matrix) GLEW_ARB_transpose_matrix = !_glewInit_GL_ARB_transpose_matrix();
+#endif /* GL_ARB_transpose_matrix */
+#ifdef GL_ARB_uniform_buffer_object
+  if (glewExperimental || GLEW_ARB_uniform_buffer_object) GLEW_ARB_uniform_buffer_object = !_glewInit_GL_ARB_uniform_buffer_object();
+#endif /* GL_ARB_uniform_buffer_object */
+#ifdef GL_ARB_vertex_array_object
+  if (glewExperimental || GLEW_ARB_vertex_array_object) GLEW_ARB_vertex_array_object = !_glewInit_GL_ARB_vertex_array_object();
+#endif /* GL_ARB_vertex_array_object */
+#ifdef GL_ARB_vertex_attrib_64bit
+  if (glewExperimental || GLEW_ARB_vertex_attrib_64bit) GLEW_ARB_vertex_attrib_64bit = !_glewInit_GL_ARB_vertex_attrib_64bit();
+#endif /* GL_ARB_vertex_attrib_64bit */
+#ifdef GL_ARB_vertex_attrib_binding
+  if (glewExperimental || GLEW_ARB_vertex_attrib_binding) GLEW_ARB_vertex_attrib_binding = !_glewInit_GL_ARB_vertex_attrib_binding();
+#endif /* GL_ARB_vertex_attrib_binding */
+#ifdef GL_ARB_vertex_blend
+  if (glewExperimental || GLEW_ARB_vertex_blend) GLEW_ARB_vertex_blend = !_glewInit_GL_ARB_vertex_blend();
+#endif /* GL_ARB_vertex_blend */
+#ifdef GL_ARB_vertex_buffer_object
+  if (glewExperimental || GLEW_ARB_vertex_buffer_object) GLEW_ARB_vertex_buffer_object = !_glewInit_GL_ARB_vertex_buffer_object();
+#endif /* GL_ARB_vertex_buffer_object */
+#ifdef GL_ARB_vertex_program
+  if (glewExperimental || GLEW_ARB_vertex_program) GLEW_ARB_vertex_program = !_glewInit_GL_ARB_vertex_program();
+#endif /* GL_ARB_vertex_program */
+#ifdef GL_ARB_vertex_shader
+  if (glewExperimental || GLEW_ARB_vertex_shader) { GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(); _glewInit_GL_ARB_vertex_program(); }
+#endif /* GL_ARB_vertex_shader */
+#ifdef GL_ARB_vertex_type_2_10_10_10_rev
+  if (glewExperimental || GLEW_ARB_vertex_type_2_10_10_10_rev) GLEW_ARB_vertex_type_2_10_10_10_rev = !_glewInit_GL_ARB_vertex_type_2_10_10_10_rev();
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+#ifdef GL_ARB_viewport_array
+  if (glewExperimental || GLEW_ARB_viewport_array) GLEW_ARB_viewport_array = !_glewInit_GL_ARB_viewport_array();
+#endif /* GL_ARB_viewport_array */
+#ifdef GL_ARB_window_pos
+  if (glewExperimental || GLEW_ARB_window_pos) GLEW_ARB_window_pos = !_glewInit_GL_ARB_window_pos();
+#endif /* GL_ARB_window_pos */
+#ifdef GL_ATI_draw_buffers
+  if (glewExperimental || GLEW_ATI_draw_buffers) GLEW_ATI_draw_buffers = !_glewInit_GL_ATI_draw_buffers();
+#endif /* GL_ATI_draw_buffers */
+#ifdef GL_ATI_element_array
+  if (glewExperimental || GLEW_ATI_element_array) GLEW_ATI_element_array = !_glewInit_GL_ATI_element_array();
+#endif /* GL_ATI_element_array */
+#ifdef GL_ATI_envmap_bumpmap
+  if (glewExperimental || GLEW_ATI_envmap_bumpmap) GLEW_ATI_envmap_bumpmap = !_glewInit_GL_ATI_envmap_bumpmap();
+#endif /* GL_ATI_envmap_bumpmap */
+#ifdef GL_ATI_fragment_shader
+  if (glewExperimental || GLEW_ATI_fragment_shader) GLEW_ATI_fragment_shader = !_glewInit_GL_ATI_fragment_shader();
+#endif /* GL_ATI_fragment_shader */
+#ifdef GL_ATI_map_object_buffer
+  if (glewExperimental || GLEW_ATI_map_object_buffer) GLEW_ATI_map_object_buffer = !_glewInit_GL_ATI_map_object_buffer();
+#endif /* GL_ATI_map_object_buffer */
+#ifdef GL_ATI_pn_triangles
+  if (glewExperimental || GLEW_ATI_pn_triangles) GLEW_ATI_pn_triangles = !_glewInit_GL_ATI_pn_triangles();
+#endif /* GL_ATI_pn_triangles */
+#ifdef GL_ATI_separate_stencil
+  if (glewExperimental || GLEW_ATI_separate_stencil) GLEW_ATI_separate_stencil = !_glewInit_GL_ATI_separate_stencil();
+#endif /* GL_ATI_separate_stencil */
+#ifdef GL_ATI_vertex_array_object
+  if (glewExperimental || GLEW_ATI_vertex_array_object) GLEW_ATI_vertex_array_object = !_glewInit_GL_ATI_vertex_array_object();
+#endif /* GL_ATI_vertex_array_object */
+#ifdef GL_ATI_vertex_attrib_array_object
+  if (glewExperimental || GLEW_ATI_vertex_attrib_array_object) GLEW_ATI_vertex_attrib_array_object = !_glewInit_GL_ATI_vertex_attrib_array_object();
+#endif /* GL_ATI_vertex_attrib_array_object */
+#ifdef GL_ATI_vertex_streams
+  if (glewExperimental || GLEW_ATI_vertex_streams) GLEW_ATI_vertex_streams = !_glewInit_GL_ATI_vertex_streams();
+#endif /* GL_ATI_vertex_streams */
+#ifdef GL_EXT_base_instance
+  if (glewExperimental || GLEW_EXT_base_instance) GLEW_EXT_base_instance = !_glewInit_GL_EXT_base_instance();
+#endif /* GL_EXT_base_instance */
+#ifdef GL_EXT_bindable_uniform
+  if (glewExperimental || GLEW_EXT_bindable_uniform) GLEW_EXT_bindable_uniform = !_glewInit_GL_EXT_bindable_uniform();
+#endif /* GL_EXT_bindable_uniform */
+#ifdef GL_EXT_blend_color
+  if (glewExperimental || GLEW_EXT_blend_color) GLEW_EXT_blend_color = !_glewInit_GL_EXT_blend_color();
+#endif /* GL_EXT_blend_color */
+#ifdef GL_EXT_blend_equation_separate
+  if (glewExperimental || GLEW_EXT_blend_equation_separate) GLEW_EXT_blend_equation_separate = !_glewInit_GL_EXT_blend_equation_separate();
+#endif /* GL_EXT_blend_equation_separate */
+#ifdef GL_EXT_blend_func_extended
+  if (glewExperimental || GLEW_EXT_blend_func_extended) GLEW_EXT_blend_func_extended = !_glewInit_GL_EXT_blend_func_extended();
+#endif /* GL_EXT_blend_func_extended */
+#ifdef GL_EXT_blend_func_separate
+  if (glewExperimental || GLEW_EXT_blend_func_separate) GLEW_EXT_blend_func_separate = !_glewInit_GL_EXT_blend_func_separate();
+#endif /* GL_EXT_blend_func_separate */
+#ifdef GL_EXT_blend_minmax
+  if (glewExperimental || GLEW_EXT_blend_minmax) GLEW_EXT_blend_minmax = !_glewInit_GL_EXT_blend_minmax();
+#endif /* GL_EXT_blend_minmax */
+#ifdef GL_EXT_buffer_storage
+  if (glewExperimental || GLEW_EXT_buffer_storage) GLEW_EXT_buffer_storage = !_glewInit_GL_EXT_buffer_storage();
+#endif /* GL_EXT_buffer_storage */
+#ifdef GL_EXT_clear_texture
+  if (glewExperimental || GLEW_EXT_clear_texture) GLEW_EXT_clear_texture = !_glewInit_GL_EXT_clear_texture();
+#endif /* GL_EXT_clear_texture */
+#ifdef GL_EXT_color_subtable
+  if (glewExperimental || GLEW_EXT_color_subtable) GLEW_EXT_color_subtable = !_glewInit_GL_EXT_color_subtable();
+#endif /* GL_EXT_color_subtable */
+#ifdef GL_EXT_compiled_vertex_array
+  if (glewExperimental || GLEW_EXT_compiled_vertex_array) GLEW_EXT_compiled_vertex_array = !_glewInit_GL_EXT_compiled_vertex_array();
+#endif /* GL_EXT_compiled_vertex_array */
+#ifdef GL_EXT_convolution
+  if (glewExperimental || GLEW_EXT_convolution) GLEW_EXT_convolution = !_glewInit_GL_EXT_convolution();
+#endif /* GL_EXT_convolution */
+#ifdef GL_EXT_coordinate_frame
+  if (glewExperimental || GLEW_EXT_coordinate_frame) GLEW_EXT_coordinate_frame = !_glewInit_GL_EXT_coordinate_frame();
+#endif /* GL_EXT_coordinate_frame */
+#ifdef GL_EXT_copy_image
+  if (glewExperimental || GLEW_EXT_copy_image) GLEW_EXT_copy_image = !_glewInit_GL_EXT_copy_image();
+#endif /* GL_EXT_copy_image */
+#ifdef GL_EXT_copy_texture
+  if (glewExperimental || GLEW_EXT_copy_texture) GLEW_EXT_copy_texture = !_glewInit_GL_EXT_copy_texture();
+#endif /* GL_EXT_copy_texture */
+#ifdef GL_EXT_cull_vertex
+  if (glewExperimental || GLEW_EXT_cull_vertex) GLEW_EXT_cull_vertex = !_glewInit_GL_EXT_cull_vertex();
+#endif /* GL_EXT_cull_vertex */
+#ifdef GL_EXT_debug_label
+  if (glewExperimental || GLEW_EXT_debug_label) GLEW_EXT_debug_label = !_glewInit_GL_EXT_debug_label();
+#endif /* GL_EXT_debug_label */
+#ifdef GL_EXT_debug_marker
+  if (glewExperimental || GLEW_EXT_debug_marker) GLEW_EXT_debug_marker = !_glewInit_GL_EXT_debug_marker();
+#endif /* GL_EXT_debug_marker */
+#ifdef GL_EXT_depth_bounds_test
+  if (glewExperimental || GLEW_EXT_depth_bounds_test) GLEW_EXT_depth_bounds_test = !_glewInit_GL_EXT_depth_bounds_test();
+#endif /* GL_EXT_depth_bounds_test */
+#ifdef GL_EXT_direct_state_access
+  if (glewExperimental || GLEW_EXT_direct_state_access) GLEW_EXT_direct_state_access = !_glewInit_GL_EXT_direct_state_access();
+#endif /* GL_EXT_direct_state_access */
+#ifdef GL_EXT_discard_framebuffer
+  if (glewExperimental || GLEW_EXT_discard_framebuffer) GLEW_EXT_discard_framebuffer = !_glewInit_GL_EXT_discard_framebuffer();
+#endif /* GL_EXT_discard_framebuffer */
+#ifdef GL_EXT_draw_buffers
+  if (glewExperimental || GLEW_EXT_draw_buffers) GLEW_EXT_draw_buffers = !_glewInit_GL_EXT_draw_buffers();
+#endif /* GL_EXT_draw_buffers */
+#ifdef GL_EXT_draw_buffers2
+  if (glewExperimental || GLEW_EXT_draw_buffers2) GLEW_EXT_draw_buffers2 = !_glewInit_GL_EXT_draw_buffers2();
+#endif /* GL_EXT_draw_buffers2 */
+#ifdef GL_EXT_draw_buffers_indexed
+  if (glewExperimental || GLEW_EXT_draw_buffers_indexed) GLEW_EXT_draw_buffers_indexed = !_glewInit_GL_EXT_draw_buffers_indexed();
+#endif /* GL_EXT_draw_buffers_indexed */
+#ifdef GL_EXT_draw_elements_base_vertex
+  if (glewExperimental || GLEW_EXT_draw_elements_base_vertex) GLEW_EXT_draw_elements_base_vertex = !_glewInit_GL_EXT_draw_elements_base_vertex();
+#endif /* GL_EXT_draw_elements_base_vertex */
+#ifdef GL_EXT_draw_instanced
+  if (glewExperimental || GLEW_EXT_draw_instanced) GLEW_EXT_draw_instanced = !_glewInit_GL_EXT_draw_instanced();
+#endif /* GL_EXT_draw_instanced */
+#ifdef GL_EXT_draw_range_elements
+  if (glewExperimental || GLEW_EXT_draw_range_elements) GLEW_EXT_draw_range_elements = !_glewInit_GL_EXT_draw_range_elements();
+#endif /* GL_EXT_draw_range_elements */
+#ifdef GL_EXT_external_buffer
+  if (glewExperimental || GLEW_EXT_external_buffer) GLEW_EXT_external_buffer = !_glewInit_GL_EXT_external_buffer();
+#endif /* GL_EXT_external_buffer */
+#ifdef GL_EXT_fog_coord
+  if (glewExperimental || GLEW_EXT_fog_coord) GLEW_EXT_fog_coord = !_glewInit_GL_EXT_fog_coord();
+#endif /* GL_EXT_fog_coord */
+#ifdef GL_EXT_fragment_lighting
+  if (glewExperimental || GLEW_EXT_fragment_lighting) GLEW_EXT_fragment_lighting = !_glewInit_GL_EXT_fragment_lighting();
+#endif /* GL_EXT_fragment_lighting */
+#ifdef GL_EXT_framebuffer_blit
+  if (glewExperimental || GLEW_EXT_framebuffer_blit) GLEW_EXT_framebuffer_blit = !_glewInit_GL_EXT_framebuffer_blit();
+#endif /* GL_EXT_framebuffer_blit */
+#ifdef GL_EXT_framebuffer_multisample
+  if (glewExperimental || GLEW_EXT_framebuffer_multisample) GLEW_EXT_framebuffer_multisample = !_glewInit_GL_EXT_framebuffer_multisample();
+#endif /* GL_EXT_framebuffer_multisample */
+#ifdef GL_EXT_framebuffer_object
+  if (glewExperimental || GLEW_EXT_framebuffer_object) GLEW_EXT_framebuffer_object = !_glewInit_GL_EXT_framebuffer_object();
+#endif /* GL_EXT_framebuffer_object */
+#ifdef GL_EXT_geometry_shader4
+  if (glewExperimental || GLEW_EXT_geometry_shader4) GLEW_EXT_geometry_shader4 = !_glewInit_GL_EXT_geometry_shader4();
+#endif /* GL_EXT_geometry_shader4 */
+#ifdef GL_EXT_gpu_program_parameters
+  if (glewExperimental || GLEW_EXT_gpu_program_parameters) GLEW_EXT_gpu_program_parameters = !_glewInit_GL_EXT_gpu_program_parameters();
+#endif /* GL_EXT_gpu_program_parameters */
+#ifdef GL_EXT_gpu_shader4
+  if (glewExperimental || GLEW_EXT_gpu_shader4) GLEW_EXT_gpu_shader4 = !_glewInit_GL_EXT_gpu_shader4();
+#endif /* GL_EXT_gpu_shader4 */
+#ifdef GL_EXT_histogram
+  if (glewExperimental || GLEW_EXT_histogram) GLEW_EXT_histogram = !_glewInit_GL_EXT_histogram();
+#endif /* GL_EXT_histogram */
+#ifdef GL_EXT_index_func
+  if (glewExperimental || GLEW_EXT_index_func) GLEW_EXT_index_func = !_glewInit_GL_EXT_index_func();
+#endif /* GL_EXT_index_func */
+#ifdef GL_EXT_index_material
+  if (glewExperimental || GLEW_EXT_index_material) GLEW_EXT_index_material = !_glewInit_GL_EXT_index_material();
+#endif /* GL_EXT_index_material */
+#ifdef GL_EXT_instanced_arrays
+  if (glewExperimental || GLEW_EXT_instanced_arrays) GLEW_EXT_instanced_arrays = !_glewInit_GL_EXT_instanced_arrays();
+#endif /* GL_EXT_instanced_arrays */
+#ifdef GL_EXT_light_texture
+  if (glewExperimental || GLEW_EXT_light_texture) GLEW_EXT_light_texture = !_glewInit_GL_EXT_light_texture();
+#endif /* GL_EXT_light_texture */
+#ifdef GL_EXT_map_buffer_range
+  if (glewExperimental || GLEW_EXT_map_buffer_range) GLEW_EXT_map_buffer_range = !_glewInit_GL_EXT_map_buffer_range();
+#endif /* GL_EXT_map_buffer_range */
+#ifdef GL_EXT_memory_object
+  if (glewExperimental || GLEW_EXT_memory_object) GLEW_EXT_memory_object = !_glewInit_GL_EXT_memory_object();
+#endif /* GL_EXT_memory_object */
+#ifdef GL_EXT_memory_object_fd
+  if (glewExperimental || GLEW_EXT_memory_object_fd) GLEW_EXT_memory_object_fd = !_glewInit_GL_EXT_memory_object_fd();
+#endif /* GL_EXT_memory_object_fd */
+#ifdef GL_EXT_memory_object_win32
+  if (glewExperimental || GLEW_EXT_memory_object_win32) GLEW_EXT_memory_object_win32 = !_glewInit_GL_EXT_memory_object_win32();
+#endif /* GL_EXT_memory_object_win32 */
+#ifdef GL_EXT_multi_draw_arrays
+  if (glewExperimental || GLEW_EXT_multi_draw_arrays) GLEW_EXT_multi_draw_arrays = !_glewInit_GL_EXT_multi_draw_arrays();
+#endif /* GL_EXT_multi_draw_arrays */
+#ifdef GL_EXT_multi_draw_indirect
+  if (glewExperimental || GLEW_EXT_multi_draw_indirect) GLEW_EXT_multi_draw_indirect = !_glewInit_GL_EXT_multi_draw_indirect();
+#endif /* GL_EXT_multi_draw_indirect */
+#ifdef GL_EXT_multisample
+  if (glewExperimental || GLEW_EXT_multisample) GLEW_EXT_multisample = !_glewInit_GL_EXT_multisample();
+#endif /* GL_EXT_multisample */
+#ifdef GL_EXT_multisampled_render_to_texture
+  if (glewExperimental || GLEW_EXT_multisampled_render_to_texture) GLEW_EXT_multisampled_render_to_texture = !_glewInit_GL_EXT_multisampled_render_to_texture();
+#endif /* GL_EXT_multisampled_render_to_texture */
+#ifdef GL_EXT_multiview_draw_buffers
+  if (glewExperimental || GLEW_EXT_multiview_draw_buffers) GLEW_EXT_multiview_draw_buffers = !_glewInit_GL_EXT_multiview_draw_buffers();
+#endif /* GL_EXT_multiview_draw_buffers */
+#ifdef GL_EXT_paletted_texture
+  if (glewExperimental || GLEW_EXT_paletted_texture) GLEW_EXT_paletted_texture = !_glewInit_GL_EXT_paletted_texture();
+#endif /* GL_EXT_paletted_texture */
+#ifdef GL_EXT_pixel_transform
+  if (glewExperimental || GLEW_EXT_pixel_transform) GLEW_EXT_pixel_transform = !_glewInit_GL_EXT_pixel_transform();
+#endif /* GL_EXT_pixel_transform */
+#ifdef GL_EXT_point_parameters
+  if (glewExperimental || GLEW_EXT_point_parameters) GLEW_EXT_point_parameters = !_glewInit_GL_EXT_point_parameters();
+#endif /* GL_EXT_point_parameters */
+#ifdef GL_EXT_polygon_offset
+  if (glewExperimental || GLEW_EXT_polygon_offset) GLEW_EXT_polygon_offset = !_glewInit_GL_EXT_polygon_offset();
+#endif /* GL_EXT_polygon_offset */
+#ifdef GL_EXT_polygon_offset_clamp
+  if (glewExperimental || GLEW_EXT_polygon_offset_clamp) GLEW_EXT_polygon_offset_clamp = !_glewInit_GL_EXT_polygon_offset_clamp();
+#endif /* GL_EXT_polygon_offset_clamp */
+#ifdef GL_EXT_provoking_vertex
+  if (glewExperimental || GLEW_EXT_provoking_vertex) GLEW_EXT_provoking_vertex = !_glewInit_GL_EXT_provoking_vertex();
+#endif /* GL_EXT_provoking_vertex */
+#ifdef GL_EXT_raster_multisample
+  if (glewExperimental || GLEW_EXT_raster_multisample) GLEW_EXT_raster_multisample = !_glewInit_GL_EXT_raster_multisample();
+#endif /* GL_EXT_raster_multisample */
+#ifdef GL_EXT_scene_marker
+  if (glewExperimental || GLEW_EXT_scene_marker) GLEW_EXT_scene_marker = !_glewInit_GL_EXT_scene_marker();
+#endif /* GL_EXT_scene_marker */
+#ifdef GL_EXT_secondary_color
+  if (glewExperimental || GLEW_EXT_secondary_color) GLEW_EXT_secondary_color = !_glewInit_GL_EXT_secondary_color();
+#endif /* GL_EXT_secondary_color */
+#ifdef GL_EXT_semaphore
+  if (glewExperimental || GLEW_EXT_semaphore) GLEW_EXT_semaphore = !_glewInit_GL_EXT_semaphore();
+#endif /* GL_EXT_semaphore */
+#ifdef GL_EXT_semaphore_fd
+  if (glewExperimental || GLEW_EXT_semaphore_fd) GLEW_EXT_semaphore_fd = !_glewInit_GL_EXT_semaphore_fd();
+#endif /* GL_EXT_semaphore_fd */
+#ifdef GL_EXT_semaphore_win32
+  if (glewExperimental || GLEW_EXT_semaphore_win32) GLEW_EXT_semaphore_win32 = !_glewInit_GL_EXT_semaphore_win32();
+#endif /* GL_EXT_semaphore_win32 */
+#ifdef GL_EXT_separate_shader_objects
+  if (glewExperimental || GLEW_EXT_separate_shader_objects) GLEW_EXT_separate_shader_objects = !_glewInit_GL_EXT_separate_shader_objects();
+#endif /* GL_EXT_separate_shader_objects */
+#ifdef GL_EXT_shader_image_load_store
+  if (glewExperimental || GLEW_EXT_shader_image_load_store) GLEW_EXT_shader_image_load_store = !_glewInit_GL_EXT_shader_image_load_store();
+#endif /* GL_EXT_shader_image_load_store */
+#ifdef GL_EXT_shader_pixel_local_storage2
+  if (glewExperimental || GLEW_EXT_shader_pixel_local_storage2) GLEW_EXT_shader_pixel_local_storage2 = !_glewInit_GL_EXT_shader_pixel_local_storage2();
+#endif /* GL_EXT_shader_pixel_local_storage2 */
+#ifdef GL_EXT_sparse_texture
+  if (glewExperimental || GLEW_EXT_sparse_texture) GLEW_EXT_sparse_texture = !_glewInit_GL_EXT_sparse_texture();
+#endif /* GL_EXT_sparse_texture */
+#ifdef GL_EXT_stencil_two_side
+  if (glewExperimental || GLEW_EXT_stencil_two_side) GLEW_EXT_stencil_two_side = !_glewInit_GL_EXT_stencil_two_side();
+#endif /* GL_EXT_stencil_two_side */
+#ifdef GL_EXT_subtexture
+  if (glewExperimental || GLEW_EXT_subtexture) GLEW_EXT_subtexture = !_glewInit_GL_EXT_subtexture();
+#endif /* GL_EXT_subtexture */
+#ifdef GL_EXT_texture3D
+  if (glewExperimental || GLEW_EXT_texture3D) GLEW_EXT_texture3D = !_glewInit_GL_EXT_texture3D();
+#endif /* GL_EXT_texture3D */
+#ifdef GL_EXT_texture_array
+  if (glewExperimental || GLEW_EXT_texture_array) GLEW_EXT_texture_array = !_glewInit_GL_EXT_texture_array();
+#endif /* GL_EXT_texture_array */
+#ifdef GL_EXT_texture_buffer_object
+  if (glewExperimental || GLEW_EXT_texture_buffer_object) GLEW_EXT_texture_buffer_object = !_glewInit_GL_EXT_texture_buffer_object();
+#endif /* GL_EXT_texture_buffer_object */
+#ifdef GL_EXT_texture_integer
+  if (glewExperimental || GLEW_EXT_texture_integer) GLEW_EXT_texture_integer = !_glewInit_GL_EXT_texture_integer();
+#endif /* GL_EXT_texture_integer */
+#ifdef GL_EXT_texture_object
+  if (glewExperimental || GLEW_EXT_texture_object) GLEW_EXT_texture_object = !_glewInit_GL_EXT_texture_object();
+#endif /* GL_EXT_texture_object */
+#ifdef GL_EXT_texture_perturb_normal
+  if (glewExperimental || GLEW_EXT_texture_perturb_normal) GLEW_EXT_texture_perturb_normal = !_glewInit_GL_EXT_texture_perturb_normal();
+#endif /* GL_EXT_texture_perturb_normal */
+#ifdef GL_EXT_texture_storage
+  if (glewExperimental || GLEW_EXT_texture_storage) GLEW_EXT_texture_storage = !_glewInit_GL_EXT_texture_storage();
+#endif /* GL_EXT_texture_storage */
+#ifdef GL_EXT_texture_view
+  if (glewExperimental || GLEW_EXT_texture_view) GLEW_EXT_texture_view = !_glewInit_GL_EXT_texture_view();
+#endif /* GL_EXT_texture_view */
+#ifdef GL_EXT_timer_query
+  if (glewExperimental || GLEW_EXT_timer_query) GLEW_EXT_timer_query = !_glewInit_GL_EXT_timer_query();
+#endif /* GL_EXT_timer_query */
+#ifdef GL_EXT_transform_feedback
+  if (glewExperimental || GLEW_EXT_transform_feedback) GLEW_EXT_transform_feedback = !_glewInit_GL_EXT_transform_feedback();
+#endif /* GL_EXT_transform_feedback */
+#ifdef GL_EXT_vertex_array
+  if (glewExperimental || GLEW_EXT_vertex_array) GLEW_EXT_vertex_array = !_glewInit_GL_EXT_vertex_array();
+#endif /* GL_EXT_vertex_array */
+#ifdef GL_EXT_vertex_array_setXXX
+  if (glewExperimental || GLEW_EXT_vertex_array_setXXX) GLEW_EXT_vertex_array_setXXX = !_glewInit_GL_EXT_vertex_array_setXXX();
+#endif /* GL_EXT_vertex_array_setXXX */
+#ifdef GL_EXT_vertex_attrib_64bit
+  if (glewExperimental || GLEW_EXT_vertex_attrib_64bit) GLEW_EXT_vertex_attrib_64bit = !_glewInit_GL_EXT_vertex_attrib_64bit();
+#endif /* GL_EXT_vertex_attrib_64bit */
+#ifdef GL_EXT_vertex_shader
+  if (glewExperimental || GLEW_EXT_vertex_shader) GLEW_EXT_vertex_shader = !_glewInit_GL_EXT_vertex_shader();
+#endif /* GL_EXT_vertex_shader */
+#ifdef GL_EXT_vertex_weighting
+  if (glewExperimental || GLEW_EXT_vertex_weighting) GLEW_EXT_vertex_weighting = !_glewInit_GL_EXT_vertex_weighting();
+#endif /* GL_EXT_vertex_weighting */
+#ifdef GL_EXT_win32_keyed_mutex
+  if (glewExperimental || GLEW_EXT_win32_keyed_mutex) GLEW_EXT_win32_keyed_mutex = !_glewInit_GL_EXT_win32_keyed_mutex();
+#endif /* GL_EXT_win32_keyed_mutex */
+#ifdef GL_EXT_window_rectangles
+  if (glewExperimental || GLEW_EXT_window_rectangles) GLEW_EXT_window_rectangles = !_glewInit_GL_EXT_window_rectangles();
+#endif /* GL_EXT_window_rectangles */
+#ifdef GL_EXT_x11_sync_object
+  if (glewExperimental || GLEW_EXT_x11_sync_object) GLEW_EXT_x11_sync_object = !_glewInit_GL_EXT_x11_sync_object();
+#endif /* GL_EXT_x11_sync_object */
+#ifdef GL_GREMEDY_frame_terminator
+  if (glewExperimental || GLEW_GREMEDY_frame_terminator) GLEW_GREMEDY_frame_terminator = !_glewInit_GL_GREMEDY_frame_terminator();
+#endif /* GL_GREMEDY_frame_terminator */
+#ifdef GL_GREMEDY_string_marker
+  if (glewExperimental || GLEW_GREMEDY_string_marker) GLEW_GREMEDY_string_marker = !_glewInit_GL_GREMEDY_string_marker();
+#endif /* GL_GREMEDY_string_marker */
+#ifdef GL_HP_image_transform
+  if (glewExperimental || GLEW_HP_image_transform) GLEW_HP_image_transform = !_glewInit_GL_HP_image_transform();
+#endif /* GL_HP_image_transform */
+#ifdef GL_IBM_multimode_draw_arrays
+  if (glewExperimental || GLEW_IBM_multimode_draw_arrays) GLEW_IBM_multimode_draw_arrays = !_glewInit_GL_IBM_multimode_draw_arrays();
+#endif /* GL_IBM_multimode_draw_arrays */
+#ifdef GL_IBM_vertex_array_lists
+  if (glewExperimental || GLEW_IBM_vertex_array_lists) GLEW_IBM_vertex_array_lists = !_glewInit_GL_IBM_vertex_array_lists();
+#endif /* GL_IBM_vertex_array_lists */
+#ifdef GL_INTEL_map_texture
+  if (glewExperimental || GLEW_INTEL_map_texture) GLEW_INTEL_map_texture = !_glewInit_GL_INTEL_map_texture();
+#endif /* GL_INTEL_map_texture */
+#ifdef GL_INTEL_parallel_arrays
+  if (glewExperimental || GLEW_INTEL_parallel_arrays) GLEW_INTEL_parallel_arrays = !_glewInit_GL_INTEL_parallel_arrays();
+#endif /* GL_INTEL_parallel_arrays */
+#ifdef GL_INTEL_performance_query
+  if (glewExperimental || GLEW_INTEL_performance_query) GLEW_INTEL_performance_query = !_glewInit_GL_INTEL_performance_query();
+#endif /* GL_INTEL_performance_query */
+#ifdef GL_INTEL_texture_scissor
+  if (glewExperimental || GLEW_INTEL_texture_scissor) GLEW_INTEL_texture_scissor = !_glewInit_GL_INTEL_texture_scissor();
+#endif /* GL_INTEL_texture_scissor */
+#ifdef GL_KHR_blend_equation_advanced
+  if (glewExperimental || GLEW_KHR_blend_equation_advanced) GLEW_KHR_blend_equation_advanced = !_glewInit_GL_KHR_blend_equation_advanced();
+#endif /* GL_KHR_blend_equation_advanced */
+#ifdef GL_KHR_debug
+  if (glewExperimental || GLEW_KHR_debug) GLEW_KHR_debug = !_glewInit_GL_KHR_debug();
+#endif /* GL_KHR_debug */
+#ifdef GL_KHR_parallel_shader_compile
+  if (glewExperimental || GLEW_KHR_parallel_shader_compile) GLEW_KHR_parallel_shader_compile = !_glewInit_GL_KHR_parallel_shader_compile();
+#endif /* GL_KHR_parallel_shader_compile */
+#ifdef GL_KHR_robustness
+  if (glewExperimental || GLEW_KHR_robustness) GLEW_KHR_robustness = !_glewInit_GL_KHR_robustness();
+#endif /* GL_KHR_robustness */
+#ifdef GL_KTX_buffer_region
+  if (glewExperimental || GLEW_KTX_buffer_region) GLEW_KTX_buffer_region = !_glewInit_GL_KTX_buffer_region();
+#endif /* GL_KTX_buffer_region */
+#ifdef GL_MESA_resize_buffers
+  if (glewExperimental || GLEW_MESA_resize_buffers) GLEW_MESA_resize_buffers = !_glewInit_GL_MESA_resize_buffers();
+#endif /* GL_MESA_resize_buffers */
+#ifdef GL_MESA_window_pos
+  if (glewExperimental || GLEW_MESA_window_pos) GLEW_MESA_window_pos = !_glewInit_GL_MESA_window_pos();
+#endif /* GL_MESA_window_pos */
+#ifdef GL_NVX_conditional_render
+  if (glewExperimental || GLEW_NVX_conditional_render) GLEW_NVX_conditional_render = !_glewInit_GL_NVX_conditional_render();
+#endif /* GL_NVX_conditional_render */
+#ifdef GL_NVX_linked_gpu_multicast
+  if (glewExperimental || GLEW_NVX_linked_gpu_multicast) GLEW_NVX_linked_gpu_multicast = !_glewInit_GL_NVX_linked_gpu_multicast();
+#endif /* GL_NVX_linked_gpu_multicast */
+#ifdef GL_NV_3dvision_settings
+  if (glewExperimental || GLEW_NV_3dvision_settings) GLEW_NV_3dvision_settings = !_glewInit_GL_NV_3dvision_settings();
+#endif /* GL_NV_3dvision_settings */
+#ifdef GL_NV_bindless_multi_draw_indirect
+  if (glewExperimental || GLEW_NV_bindless_multi_draw_indirect) GLEW_NV_bindless_multi_draw_indirect = !_glewInit_GL_NV_bindless_multi_draw_indirect();
+#endif /* GL_NV_bindless_multi_draw_indirect */
+#ifdef GL_NV_bindless_multi_draw_indirect_count
+  if (glewExperimental || GLEW_NV_bindless_multi_draw_indirect_count) GLEW_NV_bindless_multi_draw_indirect_count = !_glewInit_GL_NV_bindless_multi_draw_indirect_count();
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+#ifdef GL_NV_bindless_texture
+  if (glewExperimental || GLEW_NV_bindless_texture) GLEW_NV_bindless_texture = !_glewInit_GL_NV_bindless_texture();
+#endif /* GL_NV_bindless_texture */
+#ifdef GL_NV_blend_equation_advanced
+  if (glewExperimental || GLEW_NV_blend_equation_advanced) GLEW_NV_blend_equation_advanced = !_glewInit_GL_NV_blend_equation_advanced();
+#endif /* GL_NV_blend_equation_advanced */
+#ifdef GL_NV_clip_space_w_scaling
+  if (glewExperimental || GLEW_NV_clip_space_w_scaling) GLEW_NV_clip_space_w_scaling = !_glewInit_GL_NV_clip_space_w_scaling();
+#endif /* GL_NV_clip_space_w_scaling */
+#ifdef GL_NV_command_list
+  if (glewExperimental || GLEW_NV_command_list) GLEW_NV_command_list = !_glewInit_GL_NV_command_list();
+#endif /* GL_NV_command_list */
+#ifdef GL_NV_conditional_render
+  if (glewExperimental || GLEW_NV_conditional_render) GLEW_NV_conditional_render = !_glewInit_GL_NV_conditional_render();
+#endif /* GL_NV_conditional_render */
+#ifdef GL_NV_conservative_raster
+  if (glewExperimental || GLEW_NV_conservative_raster) GLEW_NV_conservative_raster = !_glewInit_GL_NV_conservative_raster();
+#endif /* GL_NV_conservative_raster */
+#ifdef GL_NV_conservative_raster_dilate
+  if (glewExperimental || GLEW_NV_conservative_raster_dilate) GLEW_NV_conservative_raster_dilate = !_glewInit_GL_NV_conservative_raster_dilate();
+#endif /* GL_NV_conservative_raster_dilate */
+#ifdef GL_NV_conservative_raster_pre_snap_triangles
+  if (glewExperimental || GLEW_NV_conservative_raster_pre_snap_triangles) GLEW_NV_conservative_raster_pre_snap_triangles = !_glewInit_GL_NV_conservative_raster_pre_snap_triangles();
+#endif /* GL_NV_conservative_raster_pre_snap_triangles */
+#ifdef GL_NV_copy_buffer
+  if (glewExperimental || GLEW_NV_copy_buffer) GLEW_NV_copy_buffer = !_glewInit_GL_NV_copy_buffer();
+#endif /* GL_NV_copy_buffer */
+#ifdef GL_NV_copy_image
+  if (glewExperimental || GLEW_NV_copy_image) GLEW_NV_copy_image = !_glewInit_GL_NV_copy_image();
+#endif /* GL_NV_copy_image */
+#ifdef GL_NV_depth_buffer_float
+  if (glewExperimental || GLEW_NV_depth_buffer_float) GLEW_NV_depth_buffer_float = !_glewInit_GL_NV_depth_buffer_float();
+#endif /* GL_NV_depth_buffer_float */
+#ifdef GL_NV_draw_buffers
+  if (glewExperimental || GLEW_NV_draw_buffers) GLEW_NV_draw_buffers = !_glewInit_GL_NV_draw_buffers();
+#endif /* GL_NV_draw_buffers */
+#ifdef GL_NV_draw_instanced
+  if (glewExperimental || GLEW_NV_draw_instanced) GLEW_NV_draw_instanced = !_glewInit_GL_NV_draw_instanced();
+#endif /* GL_NV_draw_instanced */
+#ifdef GL_NV_draw_texture
+  if (glewExperimental || GLEW_NV_draw_texture) GLEW_NV_draw_texture = !_glewInit_GL_NV_draw_texture();
+#endif /* GL_NV_draw_texture */
+#ifdef GL_NV_draw_vulkan_image
+  if (glewExperimental || GLEW_NV_draw_vulkan_image) GLEW_NV_draw_vulkan_image = !_glewInit_GL_NV_draw_vulkan_image();
+#endif /* GL_NV_draw_vulkan_image */
+#ifdef GL_NV_evaluators
+  if (glewExperimental || GLEW_NV_evaluators) GLEW_NV_evaluators = !_glewInit_GL_NV_evaluators();
+#endif /* GL_NV_evaluators */
+#ifdef GL_NV_explicit_multisample
+  if (glewExperimental || GLEW_NV_explicit_multisample) GLEW_NV_explicit_multisample = !_glewInit_GL_NV_explicit_multisample();
+#endif /* GL_NV_explicit_multisample */
+#ifdef GL_NV_fence
+  if (glewExperimental || GLEW_NV_fence) GLEW_NV_fence = !_glewInit_GL_NV_fence();
+#endif /* GL_NV_fence */
+#ifdef GL_NV_fragment_coverage_to_color
+  if (glewExperimental || GLEW_NV_fragment_coverage_to_color) GLEW_NV_fragment_coverage_to_color = !_glewInit_GL_NV_fragment_coverage_to_color();
+#endif /* GL_NV_fragment_coverage_to_color */
+#ifdef GL_NV_fragment_program
+  if (glewExperimental || GLEW_NV_fragment_program) GLEW_NV_fragment_program = !_glewInit_GL_NV_fragment_program();
+#endif /* GL_NV_fragment_program */
+#ifdef GL_NV_framebuffer_blit
+  if (glewExperimental || GLEW_NV_framebuffer_blit) GLEW_NV_framebuffer_blit = !_glewInit_GL_NV_framebuffer_blit();
+#endif /* GL_NV_framebuffer_blit */
+#ifdef GL_NV_framebuffer_multisample
+  if (glewExperimental || GLEW_NV_framebuffer_multisample) GLEW_NV_framebuffer_multisample = !_glewInit_GL_NV_framebuffer_multisample();
+#endif /* GL_NV_framebuffer_multisample */
+#ifdef GL_NV_framebuffer_multisample_coverage
+  if (glewExperimental || GLEW_NV_framebuffer_multisample_coverage) GLEW_NV_framebuffer_multisample_coverage = !_glewInit_GL_NV_framebuffer_multisample_coverage();
+#endif /* GL_NV_framebuffer_multisample_coverage */
+#ifdef GL_NV_geometry_program4
+  if (glewExperimental || GLEW_NV_geometry_program4) GLEW_NV_geometry_program4 = !_glewInit_GL_NV_geometry_program4();
+#endif /* GL_NV_geometry_program4 */
+#ifdef GL_NV_gpu_multicast
+  if (glewExperimental || GLEW_NV_gpu_multicast) GLEW_NV_gpu_multicast = !_glewInit_GL_NV_gpu_multicast();
+#endif /* GL_NV_gpu_multicast */
+#ifdef GL_NV_gpu_program4
+  if (glewExperimental || GLEW_NV_gpu_program4) GLEW_NV_gpu_program4 = !_glewInit_GL_NV_gpu_program4();
+#endif /* GL_NV_gpu_program4 */
+#ifdef GL_NV_gpu_shader5
+  if (glewExperimental || GLEW_NV_gpu_shader5) GLEW_NV_gpu_shader5 = !_glewInit_GL_NV_gpu_shader5();
+#endif /* GL_NV_gpu_shader5 */
+#ifdef GL_NV_half_float
+  if (glewExperimental || GLEW_NV_half_float) GLEW_NV_half_float = !_glewInit_GL_NV_half_float();
+#endif /* GL_NV_half_float */
+#ifdef GL_NV_instanced_arrays
+  if (glewExperimental || GLEW_NV_instanced_arrays) GLEW_NV_instanced_arrays = !_glewInit_GL_NV_instanced_arrays();
+#endif /* GL_NV_instanced_arrays */
+#ifdef GL_NV_internalformat_sample_query
+  if (glewExperimental || GLEW_NV_internalformat_sample_query) GLEW_NV_internalformat_sample_query = !_glewInit_GL_NV_internalformat_sample_query();
+#endif /* GL_NV_internalformat_sample_query */
+#ifdef GL_NV_non_square_matrices
+  if (glewExperimental || GLEW_NV_non_square_matrices) GLEW_NV_non_square_matrices = !_glewInit_GL_NV_non_square_matrices();
+#endif /* GL_NV_non_square_matrices */
+#ifdef GL_NV_occlusion_query
+  if (glewExperimental || GLEW_NV_occlusion_query) GLEW_NV_occlusion_query = !_glewInit_GL_NV_occlusion_query();
+#endif /* GL_NV_occlusion_query */
+#ifdef GL_NV_parameter_buffer_object
+  if (glewExperimental || GLEW_NV_parameter_buffer_object) GLEW_NV_parameter_buffer_object = !_glewInit_GL_NV_parameter_buffer_object();
+#endif /* GL_NV_parameter_buffer_object */
+#ifdef GL_NV_path_rendering
+  if (glewExperimental || GLEW_NV_path_rendering) GLEW_NV_path_rendering = !_glewInit_GL_NV_path_rendering();
+#endif /* GL_NV_path_rendering */
+#ifdef GL_NV_pixel_data_range
+  if (glewExperimental || GLEW_NV_pixel_data_range) GLEW_NV_pixel_data_range = !_glewInit_GL_NV_pixel_data_range();
+#endif /* GL_NV_pixel_data_range */
+#ifdef GL_NV_point_sprite
+  if (glewExperimental || GLEW_NV_point_sprite) GLEW_NV_point_sprite = !_glewInit_GL_NV_point_sprite();
+#endif /* GL_NV_point_sprite */
+#ifdef GL_NV_polygon_mode
+  if (glewExperimental || GLEW_NV_polygon_mode) GLEW_NV_polygon_mode = !_glewInit_GL_NV_polygon_mode();
+#endif /* GL_NV_polygon_mode */
+#ifdef GL_NV_present_video
+  if (glewExperimental || GLEW_NV_present_video) GLEW_NV_present_video = !_glewInit_GL_NV_present_video();
+#endif /* GL_NV_present_video */
+#ifdef GL_NV_primitive_restart
+  if (glewExperimental || GLEW_NV_primitive_restart) GLEW_NV_primitive_restart = !_glewInit_GL_NV_primitive_restart();
+#endif /* GL_NV_primitive_restart */
+#ifdef GL_NV_register_combiners
+  if (glewExperimental || GLEW_NV_register_combiners) GLEW_NV_register_combiners = !_glewInit_GL_NV_register_combiners();
+#endif /* GL_NV_register_combiners */
+#ifdef GL_NV_register_combiners2
+  if (glewExperimental || GLEW_NV_register_combiners2) GLEW_NV_register_combiners2 = !_glewInit_GL_NV_register_combiners2();
+#endif /* GL_NV_register_combiners2 */
+#ifdef GL_NV_sample_locations
+  if (glewExperimental || GLEW_NV_sample_locations) GLEW_NV_sample_locations = !_glewInit_GL_NV_sample_locations();
+#endif /* GL_NV_sample_locations */
+#ifdef GL_NV_shader_buffer_load
+  if (glewExperimental || GLEW_NV_shader_buffer_load) GLEW_NV_shader_buffer_load = !_glewInit_GL_NV_shader_buffer_load();
+#endif /* GL_NV_shader_buffer_load */
+#ifdef GL_NV_texture_array
+  if (glewExperimental || GLEW_NV_texture_array) GLEW_NV_texture_array = !_glewInit_GL_NV_texture_array();
+#endif /* GL_NV_texture_array */
+#ifdef GL_NV_texture_barrier
+  if (glewExperimental || GLEW_NV_texture_barrier) GLEW_NV_texture_barrier = !_glewInit_GL_NV_texture_barrier();
+#endif /* GL_NV_texture_barrier */
+#ifdef GL_NV_texture_multisample
+  if (glewExperimental || GLEW_NV_texture_multisample) GLEW_NV_texture_multisample = !_glewInit_GL_NV_texture_multisample();
+#endif /* GL_NV_texture_multisample */
+#ifdef GL_NV_transform_feedback
+  if (glewExperimental || GLEW_NV_transform_feedback) GLEW_NV_transform_feedback = !_glewInit_GL_NV_transform_feedback();
+#endif /* GL_NV_transform_feedback */
+#ifdef GL_NV_transform_feedback2
+  if (glewExperimental || GLEW_NV_transform_feedback2) GLEW_NV_transform_feedback2 = !_glewInit_GL_NV_transform_feedback2();
+#endif /* GL_NV_transform_feedback2 */
+#ifdef GL_NV_vdpau_interop
+  if (glewExperimental || GLEW_NV_vdpau_interop) GLEW_NV_vdpau_interop = !_glewInit_GL_NV_vdpau_interop();
+#endif /* GL_NV_vdpau_interop */
+#ifdef GL_NV_vertex_array_range
+  if (glewExperimental || GLEW_NV_vertex_array_range) GLEW_NV_vertex_array_range = !_glewInit_GL_NV_vertex_array_range();
+#endif /* GL_NV_vertex_array_range */
+#ifdef GL_NV_vertex_attrib_integer_64bit
+  if (glewExperimental || GLEW_NV_vertex_attrib_integer_64bit) GLEW_NV_vertex_attrib_integer_64bit = !_glewInit_GL_NV_vertex_attrib_integer_64bit();
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+#ifdef GL_NV_vertex_buffer_unified_memory
+  if (glewExperimental || GLEW_NV_vertex_buffer_unified_memory) GLEW_NV_vertex_buffer_unified_memory = !_glewInit_GL_NV_vertex_buffer_unified_memory();
+#endif /* GL_NV_vertex_buffer_unified_memory */
+#ifdef GL_NV_vertex_program
+  if (glewExperimental || GLEW_NV_vertex_program) GLEW_NV_vertex_program = !_glewInit_GL_NV_vertex_program();
+#endif /* GL_NV_vertex_program */
+#ifdef GL_NV_video_capture
+  if (glewExperimental || GLEW_NV_video_capture) GLEW_NV_video_capture = !_glewInit_GL_NV_video_capture();
+#endif /* GL_NV_video_capture */
+#ifdef GL_NV_viewport_array
+  if (glewExperimental || GLEW_NV_viewport_array) GLEW_NV_viewport_array = !_glewInit_GL_NV_viewport_array();
+#endif /* GL_NV_viewport_array */
+#ifdef GL_NV_viewport_swizzle
+  if (glewExperimental || GLEW_NV_viewport_swizzle) GLEW_NV_viewport_swizzle = !_glewInit_GL_NV_viewport_swizzle();
+#endif /* GL_NV_viewport_swizzle */
+#ifdef GL_OVR_multiview
+  if (glewExperimental || GLEW_OVR_multiview) GLEW_OVR_multiview = !_glewInit_GL_OVR_multiview();
+#endif /* GL_OVR_multiview */
+#ifdef GL_OVR_multiview_multisampled_render_to_texture
+  if (glewExperimental || GLEW_OVR_multiview_multisampled_render_to_texture) GLEW_OVR_multiview_multisampled_render_to_texture = !_glewInit_GL_OVR_multiview_multisampled_render_to_texture();
+#endif /* GL_OVR_multiview_multisampled_render_to_texture */
+#ifdef GL_QCOM_alpha_test
+  if (glewExperimental || GLEW_QCOM_alpha_test) GLEW_QCOM_alpha_test = !_glewInit_GL_QCOM_alpha_test();
+#endif /* GL_QCOM_alpha_test */
+#ifdef GL_QCOM_driver_control
+  if (glewExperimental || GLEW_QCOM_driver_control) GLEW_QCOM_driver_control = !_glewInit_GL_QCOM_driver_control();
+#endif /* GL_QCOM_driver_control */
+#ifdef GL_QCOM_extended_get
+  if (glewExperimental || GLEW_QCOM_extended_get) GLEW_QCOM_extended_get = !_glewInit_GL_QCOM_extended_get();
+#endif /* GL_QCOM_extended_get */
+#ifdef GL_QCOM_extended_get2
+  if (glewExperimental || GLEW_QCOM_extended_get2) GLEW_QCOM_extended_get2 = !_glewInit_GL_QCOM_extended_get2();
+#endif /* GL_QCOM_extended_get2 */
+#ifdef GL_QCOM_framebuffer_foveated
+  if (glewExperimental || GLEW_QCOM_framebuffer_foveated) GLEW_QCOM_framebuffer_foveated = !_glewInit_GL_QCOM_framebuffer_foveated();
+#endif /* GL_QCOM_framebuffer_foveated */
+#ifdef GL_QCOM_shader_framebuffer_fetch_noncoherent
+  if (glewExperimental || GLEW_QCOM_shader_framebuffer_fetch_noncoherent) GLEW_QCOM_shader_framebuffer_fetch_noncoherent = !_glewInit_GL_QCOM_shader_framebuffer_fetch_noncoherent();
+#endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
+#ifdef GL_QCOM_tiled_rendering
+  if (glewExperimental || GLEW_QCOM_tiled_rendering) GLEW_QCOM_tiled_rendering = !_glewInit_GL_QCOM_tiled_rendering();
+#endif /* GL_QCOM_tiled_rendering */
+#ifdef GL_REGAL_ES1_0_compatibility
+  if (glewExperimental || GLEW_REGAL_ES1_0_compatibility) GLEW_REGAL_ES1_0_compatibility = !_glewInit_GL_REGAL_ES1_0_compatibility();
+#endif /* GL_REGAL_ES1_0_compatibility */
+#ifdef GL_REGAL_ES1_1_compatibility
+  if (glewExperimental || GLEW_REGAL_ES1_1_compatibility) GLEW_REGAL_ES1_1_compatibility = !_glewInit_GL_REGAL_ES1_1_compatibility();
+#endif /* GL_REGAL_ES1_1_compatibility */
+#ifdef GL_REGAL_error_string
+  if (glewExperimental || GLEW_REGAL_error_string) GLEW_REGAL_error_string = !_glewInit_GL_REGAL_error_string();
+#endif /* GL_REGAL_error_string */
+#ifdef GL_REGAL_extension_query
+  if (glewExperimental || GLEW_REGAL_extension_query) GLEW_REGAL_extension_query = !_glewInit_GL_REGAL_extension_query();
+#endif /* GL_REGAL_extension_query */
+#ifdef GL_REGAL_log
+  if (glewExperimental || GLEW_REGAL_log) GLEW_REGAL_log = !_glewInit_GL_REGAL_log();
+#endif /* GL_REGAL_log */
+#ifdef GL_REGAL_proc_address
+  if (glewExperimental || GLEW_REGAL_proc_address) GLEW_REGAL_proc_address = !_glewInit_GL_REGAL_proc_address();
+#endif /* GL_REGAL_proc_address */
+#ifdef GL_SGIS_detail_texture
+  if (glewExperimental || GLEW_SGIS_detail_texture) GLEW_SGIS_detail_texture = !_glewInit_GL_SGIS_detail_texture();
+#endif /* GL_SGIS_detail_texture */
+#ifdef GL_SGIS_fog_function
+  if (glewExperimental || GLEW_SGIS_fog_function) GLEW_SGIS_fog_function = !_glewInit_GL_SGIS_fog_function();
+#endif /* GL_SGIS_fog_function */
+#ifdef GL_SGIS_multisample
+  if (glewExperimental || GLEW_SGIS_multisample) GLEW_SGIS_multisample = !_glewInit_GL_SGIS_multisample();
+#endif /* GL_SGIS_multisample */
+#ifdef GL_SGIS_multitexture
+  if (glewExperimental || GLEW_SGIS_multitexture) GLEW_SGIS_multitexture = !_glewInit_GL_SGIS_multitexture();
+#endif /* GL_SGIS_multitexture */
+#ifdef GL_SGIS_shared_multisample
+  if (glewExperimental || GLEW_SGIS_shared_multisample) GLEW_SGIS_shared_multisample = !_glewInit_GL_SGIS_shared_multisample();
+#endif /* GL_SGIS_shared_multisample */
+#ifdef GL_SGIS_sharpen_texture
+  if (glewExperimental || GLEW_SGIS_sharpen_texture) GLEW_SGIS_sharpen_texture = !_glewInit_GL_SGIS_sharpen_texture();
+#endif /* GL_SGIS_sharpen_texture */
+#ifdef GL_SGIS_texture4D
+  if (glewExperimental || GLEW_SGIS_texture4D) GLEW_SGIS_texture4D = !_glewInit_GL_SGIS_texture4D();
+#endif /* GL_SGIS_texture4D */
+#ifdef GL_SGIS_texture_filter4
+  if (glewExperimental || GLEW_SGIS_texture_filter4) GLEW_SGIS_texture_filter4 = !_glewInit_GL_SGIS_texture_filter4();
+#endif /* GL_SGIS_texture_filter4 */
+#ifdef GL_SGIX_async
+  if (glewExperimental || GLEW_SGIX_async) GLEW_SGIX_async = !_glewInit_GL_SGIX_async();
+#endif /* GL_SGIX_async */
+#ifdef GL_SGIX_datapipe
+  if (glewExperimental || GLEW_SGIX_datapipe) GLEW_SGIX_datapipe = !_glewInit_GL_SGIX_datapipe();
+#endif /* GL_SGIX_datapipe */
+#ifdef GL_SGIX_flush_raster
+  if (glewExperimental || GLEW_SGIX_flush_raster) GLEW_SGIX_flush_raster = !_glewInit_GL_SGIX_flush_raster();
+#endif /* GL_SGIX_flush_raster */
+#ifdef GL_SGIX_fog_layers
+  if (glewExperimental || GLEW_SGIX_fog_layers) GLEW_SGIX_fog_layers = !_glewInit_GL_SGIX_fog_layers();
+#endif /* GL_SGIX_fog_layers */
+#ifdef GL_SGIX_fog_texture
+  if (glewExperimental || GLEW_SGIX_fog_texture) GLEW_SGIX_fog_texture = !_glewInit_GL_SGIX_fog_texture();
+#endif /* GL_SGIX_fog_texture */
+#ifdef GL_SGIX_fragment_specular_lighting
+  if (glewExperimental || GLEW_SGIX_fragment_specular_lighting) GLEW_SGIX_fragment_specular_lighting = !_glewInit_GL_SGIX_fragment_specular_lighting();
+#endif /* GL_SGIX_fragment_specular_lighting */
+#ifdef GL_SGIX_framezoom
+  if (glewExperimental || GLEW_SGIX_framezoom) GLEW_SGIX_framezoom = !_glewInit_GL_SGIX_framezoom();
+#endif /* GL_SGIX_framezoom */
+#ifdef GL_SGIX_igloo_interface
+  if (glewExperimental || GLEW_SGIX_igloo_interface) GLEW_SGIX_igloo_interface = !_glewInit_GL_SGIX_igloo_interface();
+#endif /* GL_SGIX_igloo_interface */
+#ifdef GL_SGIX_mpeg1
+  if (glewExperimental || GLEW_SGIX_mpeg1) GLEW_SGIX_mpeg1 = !_glewInit_GL_SGIX_mpeg1();
+#endif /* GL_SGIX_mpeg1 */
+#ifdef GL_SGIX_nonlinear_lighting_pervertex
+  if (glewExperimental || GLEW_SGIX_nonlinear_lighting_pervertex) GLEW_SGIX_nonlinear_lighting_pervertex = !_glewInit_GL_SGIX_nonlinear_lighting_pervertex();
+#endif /* GL_SGIX_nonlinear_lighting_pervertex */
+#ifdef GL_SGIX_pixel_texture
+  if (glewExperimental || GLEW_SGIX_pixel_texture) GLEW_SGIX_pixel_texture = !_glewInit_GL_SGIX_pixel_texture();
+#endif /* GL_SGIX_pixel_texture */
+#ifdef GL_SGIX_polynomial_ffd
+  if (glewExperimental || GLEW_SGIX_polynomial_ffd) GLEW_SGIX_polynomial_ffd = !_glewInit_GL_SGIX_polynomial_ffd();
+#endif /* GL_SGIX_polynomial_ffd */
+#ifdef GL_SGIX_quad_mesh
+  if (glewExperimental || GLEW_SGIX_quad_mesh) GLEW_SGIX_quad_mesh = !_glewInit_GL_SGIX_quad_mesh();
+#endif /* GL_SGIX_quad_mesh */
+#ifdef GL_SGIX_reference_plane
+  if (glewExperimental || GLEW_SGIX_reference_plane) GLEW_SGIX_reference_plane = !_glewInit_GL_SGIX_reference_plane();
+#endif /* GL_SGIX_reference_plane */
+#ifdef GL_SGIX_sprite
+  if (glewExperimental || GLEW_SGIX_sprite) GLEW_SGIX_sprite = !_glewInit_GL_SGIX_sprite();
+#endif /* GL_SGIX_sprite */
+#ifdef GL_SGIX_tag_sample_buffer
+  if (glewExperimental || GLEW_SGIX_tag_sample_buffer) GLEW_SGIX_tag_sample_buffer = !_glewInit_GL_SGIX_tag_sample_buffer();
+#endif /* GL_SGIX_tag_sample_buffer */
+#ifdef GL_SGIX_vector_ops
+  if (glewExperimental || GLEW_SGIX_vector_ops) GLEW_SGIX_vector_ops = !_glewInit_GL_SGIX_vector_ops();
+#endif /* GL_SGIX_vector_ops */
+#ifdef GL_SGIX_vertex_array_object
+  if (glewExperimental || GLEW_SGIX_vertex_array_object) GLEW_SGIX_vertex_array_object = !_glewInit_GL_SGIX_vertex_array_object();
+#endif /* GL_SGIX_vertex_array_object */
+#ifdef GL_SGI_color_table
+  if (glewExperimental || GLEW_SGI_color_table) GLEW_SGI_color_table = !_glewInit_GL_SGI_color_table();
+#endif /* GL_SGI_color_table */
+#ifdef GL_SGI_fft
+  if (glewExperimental || GLEW_SGI_fft) GLEW_SGI_fft = !_glewInit_GL_SGI_fft();
+#endif /* GL_SGI_fft */
+#ifdef GL_SUNX_constant_data
+  if (glewExperimental || GLEW_SUNX_constant_data) GLEW_SUNX_constant_data = !_glewInit_GL_SUNX_constant_data();
+#endif /* GL_SUNX_constant_data */
+#ifdef GL_SUN_global_alpha
+  if (glewExperimental || GLEW_SUN_global_alpha) GLEW_SUN_global_alpha = !_glewInit_GL_SUN_global_alpha();
+#endif /* GL_SUN_global_alpha */
+#ifdef GL_SUN_read_video_pixels
+  if (glewExperimental || GLEW_SUN_read_video_pixels) GLEW_SUN_read_video_pixels = !_glewInit_GL_SUN_read_video_pixels();
+#endif /* GL_SUN_read_video_pixels */
+#ifdef GL_SUN_triangle_list
+  if (glewExperimental || GLEW_SUN_triangle_list) GLEW_SUN_triangle_list = !_glewInit_GL_SUN_triangle_list();
+#endif /* GL_SUN_triangle_list */
+#ifdef GL_SUN_vertex
+  if (glewExperimental || GLEW_SUN_vertex) GLEW_SUN_vertex = !_glewInit_GL_SUN_vertex();
+#endif /* GL_SUN_vertex */
+#ifdef GL_WIN_swap_hint
+  if (glewExperimental || GLEW_WIN_swap_hint) GLEW_WIN_swap_hint = !_glewInit_GL_WIN_swap_hint();
+#endif /* GL_WIN_swap_hint */
+#ifdef GL_NV_fragment_program4
+  GLEW_NV_fragment_program4 = GLEW_NV_gpu_program4;
+#endif /* GL_NV_fragment_program4 */
+#ifdef GL_NV_geometry_program4
+  GLEW_NV_geometry_program4 = GLEW_NV_gpu_program4;
+#endif /* GL_NV_geometry_program4 */
+#ifdef GL_NV_tessellation_program5
+  GLEW_NV_tessellation_program5 = GLEW_NV_gpu_program5;
+#endif /* GL_NV_tessellation_program5 */
+#ifdef GL_NV_vertex_program4
+  GLEW_NV_vertex_program4 = GLEW_NV_gpu_program4;
+#endif /* GL_NV_vertex_program4 */
+
+  return GLEW_OK;
+}
+
+
+#if defined(GLEW_OSMESA)
+
+#elif defined(GLEW_EGL)
+
+PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL;
+PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL;
+PFNEGLCREATECONTEXTPROC __eglewCreateContext = NULL;
+PFNEGLCREATEPBUFFERSURFACEPROC __eglewCreatePbufferSurface = NULL;
+PFNEGLCREATEPIXMAPSURFACEPROC __eglewCreatePixmapSurface = NULL;
+PFNEGLCREATEWINDOWSURFACEPROC __eglewCreateWindowSurface = NULL;
+PFNEGLDESTROYCONTEXTPROC __eglewDestroyContext = NULL;
+PFNEGLDESTROYSURFACEPROC __eglewDestroySurface = NULL;
+PFNEGLGETCONFIGATTRIBPROC __eglewGetConfigAttrib = NULL;
+PFNEGLGETCONFIGSPROC __eglewGetConfigs = NULL;
+PFNEGLGETCURRENTDISPLAYPROC __eglewGetCurrentDisplay = NULL;
+PFNEGLGETCURRENTSURFACEPROC __eglewGetCurrentSurface = NULL;
+PFNEGLGETDISPLAYPROC __eglewGetDisplay = NULL;
+PFNEGLGETERRORPROC __eglewGetError = NULL;
+PFNEGLINITIALIZEPROC __eglewInitialize = NULL;
+PFNEGLMAKECURRENTPROC __eglewMakeCurrent = NULL;
+PFNEGLQUERYCONTEXTPROC __eglewQueryContext = NULL;
+PFNEGLQUERYSTRINGPROC __eglewQueryString = NULL;
+PFNEGLQUERYSURFACEPROC __eglewQuerySurface = NULL;
+PFNEGLSWAPBUFFERSPROC __eglewSwapBuffers = NULL;
+PFNEGLTERMINATEPROC __eglewTerminate = NULL;
+PFNEGLWAITGLPROC __eglewWaitGL = NULL;
+PFNEGLWAITNATIVEPROC __eglewWaitNative = NULL;
+
+PFNEGLBINDTEXIMAGEPROC __eglewBindTexImage = NULL;
+PFNEGLRELEASETEXIMAGEPROC __eglewReleaseTexImage = NULL;
+PFNEGLSURFACEATTRIBPROC __eglewSurfaceAttrib = NULL;
+PFNEGLSWAPINTERVALPROC __eglewSwapInterval = NULL;
+
+PFNEGLBINDAPIPROC __eglewBindAPI = NULL;
+PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC __eglewCreatePbufferFromClientBuffer = NULL;
+PFNEGLQUERYAPIPROC __eglewQueryAPI = NULL;
+PFNEGLRELEASETHREADPROC __eglewReleaseThread = NULL;
+PFNEGLWAITCLIENTPROC __eglewWaitClient = NULL;
+
+PFNEGLGETCURRENTCONTEXTPROC __eglewGetCurrentContext = NULL;
+
+PFNEGLCLIENTWAITSYNCPROC __eglewClientWaitSync = NULL;
+PFNEGLCREATEIMAGEPROC __eglewCreateImage = NULL;
+PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC __eglewCreatePlatformPixmapSurface = NULL;
+PFNEGLCREATEPLATFORMWINDOWSURFACEPROC __eglewCreatePlatformWindowSurface = NULL;
+PFNEGLCREATESYNCPROC __eglewCreateSync = NULL;
+PFNEGLDESTROYIMAGEPROC __eglewDestroyImage = NULL;
+PFNEGLDESTROYSYNCPROC __eglewDestroySync = NULL;
+PFNEGLGETPLATFORMDISPLAYPROC __eglewGetPlatformDisplay = NULL;
+PFNEGLGETSYNCATTRIBPROC __eglewGetSyncAttrib = NULL;
+PFNEGLWAITSYNCPROC __eglewWaitSync = NULL;
+
+PFNEGLSETBLOBCACHEFUNCSANDROIDPROC __eglewSetBlobCacheFuncsANDROID = NULL;
+
+PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC __eglewCreateNativeClientBufferANDROID = NULL;
+
+PFNEGLDUPNATIVEFENCEFDANDROIDPROC __eglewDupNativeFenceFDANDROID = NULL;
+
+PFNEGLPRESENTATIONTIMEANDROIDPROC __eglewPresentationTimeANDROID = NULL;
+
+PFNEGLQUERYSURFACEPOINTERANGLEPROC __eglewQuerySurfacePointerANGLE = NULL;
+
+PFNEGLQUERYDEVICESEXTPROC __eglewQueryDevicesEXT = NULL;
+
+PFNEGLQUERYDEVICEATTRIBEXTPROC __eglewQueryDeviceAttribEXT = NULL;
+PFNEGLQUERYDEVICESTRINGEXTPROC __eglewQueryDeviceStringEXT = NULL;
+PFNEGLQUERYDISPLAYATTRIBEXTPROC __eglewQueryDisplayAttribEXT = NULL;
+
+PFNEGLQUERYDMABUFFORMATSEXTPROC __eglewQueryDmaBufFormatsEXT = NULL;
+PFNEGLQUERYDMABUFMODIFIERSEXTPROC __eglewQueryDmaBufModifiersEXT = NULL;
+
+PFNEGLGETOUTPUTLAYERSEXTPROC __eglewGetOutputLayersEXT = NULL;
+PFNEGLGETOUTPUTPORTSEXTPROC __eglewGetOutputPortsEXT = NULL;
+PFNEGLOUTPUTLAYERATTRIBEXTPROC __eglewOutputLayerAttribEXT = NULL;
+PFNEGLOUTPUTPORTATTRIBEXTPROC __eglewOutputPortAttribEXT = NULL;
+PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC __eglewQueryOutputLayerAttribEXT = NULL;
+PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC __eglewQueryOutputLayerStringEXT = NULL;
+PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC __eglewQueryOutputPortAttribEXT = NULL;
+PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC __eglewQueryOutputPortStringEXT = NULL;
+
+PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC __eglewCreatePlatformPixmapSurfaceEXT = NULL;
+PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC __eglewCreatePlatformWindowSurfaceEXT = NULL;
+PFNEGLGETPLATFORMDISPLAYEXTPROC __eglewGetPlatformDisplayEXT = NULL;
+
+PFNEGLSTREAMCONSUMEROUTPUTEXTPROC __eglewStreamConsumerOutputEXT = NULL;
+
+PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC __eglewSwapBuffersWithDamageEXT = NULL;
+
+PFNEGLCREATEPIXMAPSURFACEHIPROC __eglewCreatePixmapSurfaceHI = NULL;
+
+PFNEGLCREATESYNC64KHRPROC __eglewCreateSync64KHR = NULL;
+
+PFNEGLDEBUGMESSAGECONTROLKHRPROC __eglewDebugMessageControlKHR = NULL;
+PFNEGLLABELOBJECTKHRPROC __eglewLabelObjectKHR = NULL;
+PFNEGLQUERYDEBUGKHRPROC __eglewQueryDebugKHR = NULL;
+
+PFNEGLCREATEIMAGEKHRPROC __eglewCreateImageKHR = NULL;
+PFNEGLDESTROYIMAGEKHRPROC __eglewDestroyImageKHR = NULL;
+
+PFNEGLLOCKSURFACEKHRPROC __eglewLockSurfaceKHR = NULL;
+PFNEGLUNLOCKSURFACEKHRPROC __eglewUnlockSurfaceKHR = NULL;
+
+PFNEGLQUERYSURFACE64KHRPROC __eglewQuerySurface64KHR = NULL;
+
+PFNEGLSETDAMAGEREGIONKHRPROC __eglewSetDamageRegionKHR = NULL;
+
+PFNEGLCLIENTWAITSYNCKHRPROC __eglewClientWaitSyncKHR = NULL;
+PFNEGLCREATESYNCKHRPROC __eglewCreateSyncKHR = NULL;
+PFNEGLDESTROYSYNCKHRPROC __eglewDestroySyncKHR = NULL;
+PFNEGLGETSYNCATTRIBKHRPROC __eglewGetSyncAttribKHR = NULL;
+PFNEGLSIGNALSYNCKHRPROC __eglewSignalSyncKHR = NULL;
+
+PFNEGLCREATESTREAMKHRPROC __eglewCreateStreamKHR = NULL;
+PFNEGLDESTROYSTREAMKHRPROC __eglewDestroyStreamKHR = NULL;
+PFNEGLQUERYSTREAMKHRPROC __eglewQueryStreamKHR = NULL;
+PFNEGLQUERYSTREAMU64KHRPROC __eglewQueryStreamu64KHR = NULL;
+PFNEGLSTREAMATTRIBKHRPROC __eglewStreamAttribKHR = NULL;
+
+PFNEGLCREATESTREAMATTRIBKHRPROC __eglewCreateStreamAttribKHR = NULL;
+PFNEGLQUERYSTREAMATTRIBKHRPROC __eglewQueryStreamAttribKHR = NULL;
+PFNEGLSETSTREAMATTRIBKHRPROC __eglewSetStreamAttribKHR = NULL;
+PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC __eglewStreamConsumerAcquireAttribKHR = NULL;
+PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC __eglewStreamConsumerReleaseAttribKHR = NULL;
+
+PFNEGLSTREAMCONSUMERACQUIREKHRPROC __eglewStreamConsumerAcquireKHR = NULL;
+PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC __eglewStreamConsumerGLTextureExternalKHR = NULL;
+PFNEGLSTREAMCONSUMERRELEASEKHRPROC __eglewStreamConsumerReleaseKHR = NULL;
+
+PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC __eglewCreateStreamFromFileDescriptorKHR = NULL;
+PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC __eglewGetStreamFileDescriptorKHR = NULL;
+
+PFNEGLQUERYSTREAMTIMEKHRPROC __eglewQueryStreamTimeKHR = NULL;
+
+PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC __eglewCreateStreamProducerSurfaceKHR = NULL;
+
+PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC __eglewSwapBuffersWithDamageKHR = NULL;
+
+PFNEGLWAITSYNCKHRPROC __eglewWaitSyncKHR = NULL;
+
+PFNEGLCREATEDRMIMAGEMESAPROC __eglewCreateDRMImageMESA = NULL;
+PFNEGLEXPORTDRMIMAGEMESAPROC __eglewExportDRMImageMESA = NULL;
+
+PFNEGLEXPORTDMABUFIMAGEMESAPROC __eglewExportDMABUFImageMESA = NULL;
+PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC __eglewExportDMABUFImageQueryMESA = NULL;
+
+PFNEGLSWAPBUFFERSREGIONNOKPROC __eglewSwapBuffersRegionNOK = NULL;
+
+PFNEGLSWAPBUFFERSREGION2NOKPROC __eglewSwapBuffersRegion2NOK = NULL;
+
+PFNEGLQUERYNATIVEDISPLAYNVPROC __eglewQueryNativeDisplayNV = NULL;
+PFNEGLQUERYNATIVEPIXMAPNVPROC __eglewQueryNativePixmapNV = NULL;
+PFNEGLQUERYNATIVEWINDOWNVPROC __eglewQueryNativeWindowNV = NULL;
+
+PFNEGLPOSTSUBBUFFERNVPROC __eglewPostSubBufferNV = NULL;
+
+PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC __eglewStreamConsumerGLTextureExternalAttribsNV = NULL;
+
+PFNEGLQUERYDISPLAYATTRIBNVPROC __eglewQueryDisplayAttribNV = NULL;
+PFNEGLQUERYSTREAMMETADATANVPROC __eglewQueryStreamMetadataNV = NULL;
+PFNEGLSETSTREAMMETADATANVPROC __eglewSetStreamMetadataNV = NULL;
+
+PFNEGLRESETSTREAMNVPROC __eglewResetStreamNV = NULL;
+
+PFNEGLCREATESTREAMSYNCNVPROC __eglewCreateStreamSyncNV = NULL;
+
+PFNEGLCLIENTWAITSYNCNVPROC __eglewClientWaitSyncNV = NULL;
+PFNEGLCREATEFENCESYNCNVPROC __eglewCreateFenceSyncNV = NULL;
+PFNEGLDESTROYSYNCNVPROC __eglewDestroySyncNV = NULL;
+PFNEGLFENCENVPROC __eglewFenceNV = NULL;
+PFNEGLGETSYNCATTRIBNVPROC __eglewGetSyncAttribNV = NULL;
+PFNEGLSIGNALSYNCNVPROC __eglewSignalSyncNV = NULL;
+
+PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC __eglewGetSystemTimeFrequencyNV = NULL;
+PFNEGLGETSYSTEMTIMENVPROC __eglewGetSystemTimeNV = NULL;
+GLboolean __EGLEW_VERSION_1_0 = GL_FALSE;
+GLboolean __EGLEW_VERSION_1_1 = GL_FALSE;
+GLboolean __EGLEW_VERSION_1_2 = GL_FALSE;
+GLboolean __EGLEW_VERSION_1_3 = GL_FALSE;
+GLboolean __EGLEW_VERSION_1_4 = GL_FALSE;
+GLboolean __EGLEW_VERSION_1_5 = GL_FALSE;
+GLboolean __EGLEW_ANDROID_blob_cache = GL_FALSE;
+GLboolean __EGLEW_ANDROID_create_native_client_buffer = GL_FALSE;
+GLboolean __EGLEW_ANDROID_framebuffer_target = GL_FALSE;
+GLboolean __EGLEW_ANDROID_front_buffer_auto_refresh = GL_FALSE;
+GLboolean __EGLEW_ANDROID_image_native_buffer = GL_FALSE;
+GLboolean __EGLEW_ANDROID_native_fence_sync = GL_FALSE;
+GLboolean __EGLEW_ANDROID_presentation_time = GL_FALSE;
+GLboolean __EGLEW_ANDROID_recordable = GL_FALSE;
+GLboolean __EGLEW_ANGLE_d3d_share_handle_client_buffer = GL_FALSE;
+GLboolean __EGLEW_ANGLE_device_d3d = GL_FALSE;
+GLboolean __EGLEW_ANGLE_query_surface_pointer = GL_FALSE;
+GLboolean __EGLEW_ANGLE_surface_d3d_texture_2d_share_handle = GL_FALSE;
+GLboolean __EGLEW_ANGLE_window_fixed_size = GL_FALSE;
+GLboolean __EGLEW_ARM_implicit_external_sync = GL_FALSE;
+GLboolean __EGLEW_ARM_pixmap_multisample_discard = GL_FALSE;
+GLboolean __EGLEW_EXT_buffer_age = GL_FALSE;
+GLboolean __EGLEW_EXT_client_extensions = GL_FALSE;
+GLboolean __EGLEW_EXT_create_context_robustness = GL_FALSE;
+GLboolean __EGLEW_EXT_device_base = GL_FALSE;
+GLboolean __EGLEW_EXT_device_drm = GL_FALSE;
+GLboolean __EGLEW_EXT_device_enumeration = GL_FALSE;
+GLboolean __EGLEW_EXT_device_openwf = GL_FALSE;
+GLboolean __EGLEW_EXT_device_query = GL_FALSE;
+GLboolean __EGLEW_EXT_gl_colorspace_bt2020_linear = GL_FALSE;
+GLboolean __EGLEW_EXT_gl_colorspace_bt2020_pq = GL_FALSE;
+GLboolean __EGLEW_EXT_gl_colorspace_scrgb_linear = GL_FALSE;
+GLboolean __EGLEW_EXT_image_dma_buf_import = GL_FALSE;
+GLboolean __EGLEW_EXT_image_dma_buf_import_modifiers = GL_FALSE;
+GLboolean __EGLEW_EXT_multiview_window = GL_FALSE;
+GLboolean __EGLEW_EXT_output_base = GL_FALSE;
+GLboolean __EGLEW_EXT_output_drm = GL_FALSE;
+GLboolean __EGLEW_EXT_output_openwf = GL_FALSE;
+GLboolean __EGLEW_EXT_pixel_format_float = GL_FALSE;
+GLboolean __EGLEW_EXT_platform_base = GL_FALSE;
+GLboolean __EGLEW_EXT_platform_device = GL_FALSE;
+GLboolean __EGLEW_EXT_platform_wayland = GL_FALSE;
+GLboolean __EGLEW_EXT_platform_x11 = GL_FALSE;
+GLboolean __EGLEW_EXT_protected_content = GL_FALSE;
+GLboolean __EGLEW_EXT_protected_surface = GL_FALSE;
+GLboolean __EGLEW_EXT_stream_consumer_egloutput = GL_FALSE;
+GLboolean __EGLEW_EXT_surface_SMPTE2086_metadata = GL_FALSE;
+GLboolean __EGLEW_EXT_swap_buffers_with_damage = GL_FALSE;
+GLboolean __EGLEW_EXT_yuv_surface = GL_FALSE;
+GLboolean __EGLEW_HI_clientpixmap = GL_FALSE;
+GLboolean __EGLEW_HI_colorformats = GL_FALSE;
+GLboolean __EGLEW_IMG_context_priority = GL_FALSE;
+GLboolean __EGLEW_IMG_image_plane_attribs = GL_FALSE;
+GLboolean __EGLEW_KHR_cl_event = GL_FALSE;
+GLboolean __EGLEW_KHR_cl_event2 = GL_FALSE;
+GLboolean __EGLEW_KHR_client_get_all_proc_addresses = GL_FALSE;
+GLboolean __EGLEW_KHR_config_attribs = GL_FALSE;
+GLboolean __EGLEW_KHR_context_flush_control = GL_FALSE;
+GLboolean __EGLEW_KHR_create_context = GL_FALSE;
+GLboolean __EGLEW_KHR_create_context_no_error = GL_FALSE;
+GLboolean __EGLEW_KHR_debug = GL_FALSE;
+GLboolean __EGLEW_KHR_fence_sync = GL_FALSE;
+GLboolean __EGLEW_KHR_get_all_proc_addresses = GL_FALSE;
+GLboolean __EGLEW_KHR_gl_colorspace = GL_FALSE;
+GLboolean __EGLEW_KHR_gl_renderbuffer_image = GL_FALSE;
+GLboolean __EGLEW_KHR_gl_texture_2D_image = GL_FALSE;
+GLboolean __EGLEW_KHR_gl_texture_3D_image = GL_FALSE;
+GLboolean __EGLEW_KHR_gl_texture_cubemap_image = GL_FALSE;
+GLboolean __EGLEW_KHR_image = GL_FALSE;
+GLboolean __EGLEW_KHR_image_base = GL_FALSE;
+GLboolean __EGLEW_KHR_image_pixmap = GL_FALSE;
+GLboolean __EGLEW_KHR_lock_surface = GL_FALSE;
+GLboolean __EGLEW_KHR_lock_surface2 = GL_FALSE;
+GLboolean __EGLEW_KHR_lock_surface3 = GL_FALSE;
+GLboolean __EGLEW_KHR_mutable_render_buffer = GL_FALSE;
+GLboolean __EGLEW_KHR_no_config_context = GL_FALSE;
+GLboolean __EGLEW_KHR_partial_update = GL_FALSE;
+GLboolean __EGLEW_KHR_platform_android = GL_FALSE;
+GLboolean __EGLEW_KHR_platform_gbm = GL_FALSE;
+GLboolean __EGLEW_KHR_platform_wayland = GL_FALSE;
+GLboolean __EGLEW_KHR_platform_x11 = GL_FALSE;
+GLboolean __EGLEW_KHR_reusable_sync = GL_FALSE;
+GLboolean __EGLEW_KHR_stream = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_attrib = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_consumer_gltexture = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_cross_process_fd = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_fifo = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_producer_aldatalocator = GL_FALSE;
+GLboolean __EGLEW_KHR_stream_producer_eglsurface = GL_FALSE;
+GLboolean __EGLEW_KHR_surfaceless_context = GL_FALSE;
+GLboolean __EGLEW_KHR_swap_buffers_with_damage = GL_FALSE;
+GLboolean __EGLEW_KHR_vg_parent_image = GL_FALSE;
+GLboolean __EGLEW_KHR_wait_sync = GL_FALSE;
+GLboolean __EGLEW_MESA_drm_image = GL_FALSE;
+GLboolean __EGLEW_MESA_image_dma_buf_export = GL_FALSE;
+GLboolean __EGLEW_MESA_platform_gbm = GL_FALSE;
+GLboolean __EGLEW_MESA_platform_surfaceless = GL_FALSE;
+GLboolean __EGLEW_NOK_swap_region = GL_FALSE;
+GLboolean __EGLEW_NOK_swap_region2 = GL_FALSE;
+GLboolean __EGLEW_NOK_texture_from_pixmap = GL_FALSE;
+GLboolean __EGLEW_NV_3dvision_surface = GL_FALSE;
+GLboolean __EGLEW_NV_coverage_sample = GL_FALSE;
+GLboolean __EGLEW_NV_coverage_sample_resolve = GL_FALSE;
+GLboolean __EGLEW_NV_cuda_event = GL_FALSE;
+GLboolean __EGLEW_NV_depth_nonlinear = GL_FALSE;
+GLboolean __EGLEW_NV_device_cuda = GL_FALSE;
+GLboolean __EGLEW_NV_native_query = GL_FALSE;
+GLboolean __EGLEW_NV_post_convert_rounding = GL_FALSE;
+GLboolean __EGLEW_NV_post_sub_buffer = GL_FALSE;
+GLboolean __EGLEW_NV_robustness_video_memory_purge = GL_FALSE;
+GLboolean __EGLEW_NV_stream_consumer_gltexture_yuv = GL_FALSE;
+GLboolean __EGLEW_NV_stream_cross_display = GL_FALSE;
+GLboolean __EGLEW_NV_stream_cross_object = GL_FALSE;
+GLboolean __EGLEW_NV_stream_cross_partition = GL_FALSE;
+GLboolean __EGLEW_NV_stream_cross_process = GL_FALSE;
+GLboolean __EGLEW_NV_stream_cross_system = GL_FALSE;
+GLboolean __EGLEW_NV_stream_fifo_next = GL_FALSE;
+GLboolean __EGLEW_NV_stream_fifo_synchronous = GL_FALSE;
+GLboolean __EGLEW_NV_stream_frame_limits = GL_FALSE;
+GLboolean __EGLEW_NV_stream_metadata = GL_FALSE;
+GLboolean __EGLEW_NV_stream_remote = GL_FALSE;
+GLboolean __EGLEW_NV_stream_reset = GL_FALSE;
+GLboolean __EGLEW_NV_stream_socket = GL_FALSE;
+GLboolean __EGLEW_NV_stream_socket_inet = GL_FALSE;
+GLboolean __EGLEW_NV_stream_socket_unix = GL_FALSE;
+GLboolean __EGLEW_NV_stream_sync = GL_FALSE;
+GLboolean __EGLEW_NV_sync = GL_FALSE;
+GLboolean __EGLEW_NV_system_time = GL_FALSE;
+GLboolean __EGLEW_TIZEN_image_native_buffer = GL_FALSE;
+GLboolean __EGLEW_TIZEN_image_native_surface = GL_FALSE;
+#ifdef EGL_VERSION_1_0
+
+static GLboolean _glewInit_EGL_VERSION_1_0 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglChooseConfig = (PFNEGLCHOOSECONFIGPROC)glewGetProcAddress((const GLubyte*)"eglChooseConfig")) == NULL) || r;
+  r = ((eglCopyBuffers = (PFNEGLCOPYBUFFERSPROC)glewGetProcAddress((const GLubyte*)"eglCopyBuffers")) == NULL) || r;
+  r = ((eglCreateContext = (PFNEGLCREATECONTEXTPROC)glewGetProcAddress((const GLubyte*)"eglCreateContext")) == NULL) || r;
+  r = ((eglCreatePbufferSurface = (PFNEGLCREATEPBUFFERSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglCreatePbufferSurface")) == NULL) || r;
+  r = ((eglCreatePixmapSurface = (PFNEGLCREATEPIXMAPSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglCreatePixmapSurface")) == NULL) || r;
+  r = ((eglCreateWindowSurface = (PFNEGLCREATEWINDOWSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglCreateWindowSurface")) == NULL) || r;
+  r = ((eglDestroyContext = (PFNEGLDESTROYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"eglDestroyContext")) == NULL) || r;
+  r = ((eglDestroySurface = (PFNEGLDESTROYSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglDestroySurface")) == NULL) || r;
+  r = ((eglGetConfigAttrib = (PFNEGLGETCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"eglGetConfigAttrib")) == NULL) || r;
+  r = ((eglGetConfigs = (PFNEGLGETCONFIGSPROC)glewGetProcAddress((const GLubyte*)"eglGetConfigs")) == NULL) || r;
+  r = ((eglGetCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"eglGetCurrentDisplay")) == NULL) || r;
+  r = ((eglGetCurrentSurface = (PFNEGLGETCURRENTSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglGetCurrentSurface")) == NULL) || r;
+  r = ((eglGetDisplay = (PFNEGLGETDISPLAYPROC)glewGetProcAddress((const GLubyte*)"eglGetDisplay")) == NULL) || r;
+  r = ((eglGetError = (PFNEGLGETERRORPROC)glewGetProcAddress((const GLubyte*)"eglGetError")) == NULL) || r;
+  r = ((eglInitialize = (PFNEGLINITIALIZEPROC)glewGetProcAddress((const GLubyte*)"eglInitialize")) == NULL) || r;
+  r = ((eglMakeCurrent = (PFNEGLMAKECURRENTPROC)glewGetProcAddress((const GLubyte*)"eglMakeCurrent")) == NULL) || r;
+  r = ((eglQueryContext = (PFNEGLQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryContext")) == NULL) || r;
+  r = ((eglQueryString = (PFNEGLQUERYSTRINGPROC)glewGetProcAddress((const GLubyte*)"eglQueryString")) == NULL) || r;
+  r = ((eglQuerySurface = (PFNEGLQUERYSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglQuerySurface")) == NULL) || r;
+  r = ((eglSwapBuffers = (PFNEGLSWAPBUFFERSPROC)glewGetProcAddress((const GLubyte*)"eglSwapBuffers")) == NULL) || r;
+  r = ((eglTerminate = (PFNEGLTERMINATEPROC)glewGetProcAddress((const GLubyte*)"eglTerminate")) == NULL) || r;
+  r = ((eglWaitGL = (PFNEGLWAITGLPROC)glewGetProcAddress((const GLubyte*)"eglWaitGL")) == NULL) || r;
+  r = ((eglWaitNative = (PFNEGLWAITNATIVEPROC)glewGetProcAddress((const GLubyte*)"eglWaitNative")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_VERSION_1_0 */
+
+#ifdef EGL_VERSION_1_1
+
+static GLboolean _glewInit_EGL_VERSION_1_1 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglBindTexImage = (PFNEGLBINDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"eglBindTexImage")) == NULL) || r;
+  r = ((eglReleaseTexImage = (PFNEGLRELEASETEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"eglReleaseTexImage")) == NULL) || r;
+  r = ((eglSurfaceAttrib = (PFNEGLSURFACEATTRIBPROC)glewGetProcAddress((const GLubyte*)"eglSurfaceAttrib")) == NULL) || r;
+  r = ((eglSwapInterval = (PFNEGLSWAPINTERVALPROC)glewGetProcAddress((const GLubyte*)"eglSwapInterval")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_VERSION_1_1 */
+
+#ifdef EGL_VERSION_1_2
+
+static GLboolean _glewInit_EGL_VERSION_1_2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglBindAPI = (PFNEGLBINDAPIPROC)glewGetProcAddress((const GLubyte*)"eglBindAPI")) == NULL) || r;
+  r = ((eglCreatePbufferFromClientBuffer = (PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC)glewGetProcAddress((const GLubyte*)"eglCreatePbufferFromClientBuffer")) == NULL) || r;
+  r = ((eglQueryAPI = (PFNEGLQUERYAPIPROC)glewGetProcAddress((const GLubyte*)"eglQueryAPI")) == NULL) || r;
+  r = ((eglReleaseThread = (PFNEGLRELEASETHREADPROC)glewGetProcAddress((const GLubyte*)"eglReleaseThread")) == NULL) || r;
+  r = ((eglWaitClient = (PFNEGLWAITCLIENTPROC)glewGetProcAddress((const GLubyte*)"eglWaitClient")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_VERSION_1_2 */
+
+#ifdef EGL_VERSION_1_4
+
+static GLboolean _glewInit_EGL_VERSION_1_4 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglGetCurrentContext = (PFNEGLGETCURRENTCONTEXTPROC)glewGetProcAddress((const GLubyte*)"eglGetCurrentContext")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_VERSION_1_4 */
+
+#ifdef EGL_VERSION_1_5
+
+static GLboolean _glewInit_EGL_VERSION_1_5 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglClientWaitSync = (PFNEGLCLIENTWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"eglClientWaitSync")) == NULL) || r;
+  r = ((eglCreateImage = (PFNEGLCREATEIMAGEPROC)glewGetProcAddress((const GLubyte*)"eglCreateImage")) == NULL) || r;
+  r = ((eglCreatePlatformPixmapSurface = (PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglCreatePlatformPixmapSurface")) == NULL) || r;
+  r = ((eglCreatePlatformWindowSurface = (PFNEGLCREATEPLATFORMWINDOWSURFACEPROC)glewGetProcAddress((const GLubyte*)"eglCreatePlatformWindowSurface")) == NULL) || r;
+  r = ((eglCreateSync = (PFNEGLCREATESYNCPROC)glewGetProcAddress((const GLubyte*)"eglCreateSync")) == NULL) || r;
+  r = ((eglDestroyImage = (PFNEGLDESTROYIMAGEPROC)glewGetProcAddress((const GLubyte*)"eglDestroyImage")) == NULL) || r;
+  r = ((eglDestroySync = (PFNEGLDESTROYSYNCPROC)glewGetProcAddress((const GLubyte*)"eglDestroySync")) == NULL) || r;
+  r = ((eglGetPlatformDisplay = (PFNEGLGETPLATFORMDISPLAYPROC)glewGetProcAddress((const GLubyte*)"eglGetPlatformDisplay")) == NULL) || r;
+  r = ((eglGetSyncAttrib = (PFNEGLGETSYNCATTRIBPROC)glewGetProcAddress((const GLubyte*)"eglGetSyncAttrib")) == NULL) || r;
+  r = ((eglWaitSync = (PFNEGLWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"eglWaitSync")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_VERSION_1_5 */
+
+#ifdef EGL_ANDROID_blob_cache
+
+static GLboolean _glewInit_EGL_ANDROID_blob_cache ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSetBlobCacheFuncsANDROID = (PFNEGLSETBLOBCACHEFUNCSANDROIDPROC)glewGetProcAddress((const GLubyte*)"eglSetBlobCacheFuncsANDROID")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_ANDROID_blob_cache */
+
+#ifdef EGL_ANDROID_create_native_client_buffer
+
+static GLboolean _glewInit_EGL_ANDROID_create_native_client_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateNativeClientBufferANDROID = (PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC)glewGetProcAddress((const GLubyte*)"eglCreateNativeClientBufferANDROID")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_ANDROID_create_native_client_buffer */
+
+#ifdef EGL_ANDROID_native_fence_sync
+
+static GLboolean _glewInit_EGL_ANDROID_native_fence_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglDupNativeFenceFDANDROID = (PFNEGLDUPNATIVEFENCEFDANDROIDPROC)glewGetProcAddress((const GLubyte*)"eglDupNativeFenceFDANDROID")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_ANDROID_native_fence_sync */
+
+#ifdef EGL_ANDROID_presentation_time
+
+static GLboolean _glewInit_EGL_ANDROID_presentation_time ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglPresentationTimeANDROID = (PFNEGLPRESENTATIONTIMEANDROIDPROC)glewGetProcAddress((const GLubyte*)"eglPresentationTimeANDROID")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_ANDROID_presentation_time */
+
+#ifdef EGL_ANGLE_query_surface_pointer
+
+static GLboolean _glewInit_EGL_ANGLE_query_surface_pointer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQuerySurfacePointerANGLE = (PFNEGLQUERYSURFACEPOINTERANGLEPROC)glewGetProcAddress((const GLubyte*)"eglQuerySurfacePointerANGLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_ANGLE_query_surface_pointer */
+
+#ifdef EGL_EXT_device_enumeration
+
+static GLboolean _glewInit_EGL_EXT_device_enumeration ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryDevicesEXT = (PFNEGLQUERYDEVICESEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDevicesEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_device_enumeration */
+
+#ifdef EGL_EXT_device_query
+
+static GLboolean _glewInit_EGL_EXT_device_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryDeviceAttribEXT = (PFNEGLQUERYDEVICEATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDeviceAttribEXT")) == NULL) || r;
+  r = ((eglQueryDeviceStringEXT = (PFNEGLQUERYDEVICESTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDeviceStringEXT")) == NULL) || r;
+  r = ((eglQueryDisplayAttribEXT = (PFNEGLQUERYDISPLAYATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDisplayAttribEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_device_query */
+
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+
+static GLboolean _glewInit_EGL_EXT_image_dma_buf_import_modifiers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryDmaBufFormatsEXT = (PFNEGLQUERYDMABUFFORMATSEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDmaBufFormatsEXT")) == NULL) || r;
+  r = ((eglQueryDmaBufModifiersEXT = (PFNEGLQUERYDMABUFMODIFIERSEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryDmaBufModifiersEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_image_dma_buf_import_modifiers */
+
+#ifdef EGL_EXT_output_base
+
+static GLboolean _glewInit_EGL_EXT_output_base ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglGetOutputLayersEXT = (PFNEGLGETOUTPUTLAYERSEXTPROC)glewGetProcAddress((const GLubyte*)"eglGetOutputLayersEXT")) == NULL) || r;
+  r = ((eglGetOutputPortsEXT = (PFNEGLGETOUTPUTPORTSEXTPROC)glewGetProcAddress((const GLubyte*)"eglGetOutputPortsEXT")) == NULL) || r;
+  r = ((eglOutputLayerAttribEXT = (PFNEGLOUTPUTLAYERATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglOutputLayerAttribEXT")) == NULL) || r;
+  r = ((eglOutputPortAttribEXT = (PFNEGLOUTPUTPORTATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglOutputPortAttribEXT")) == NULL) || r;
+  r = ((eglQueryOutputLayerAttribEXT = (PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryOutputLayerAttribEXT")) == NULL) || r;
+  r = ((eglQueryOutputLayerStringEXT = (PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryOutputLayerStringEXT")) == NULL) || r;
+  r = ((eglQueryOutputPortAttribEXT = (PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryOutputPortAttribEXT")) == NULL) || r;
+  r = ((eglQueryOutputPortStringEXT = (PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"eglQueryOutputPortStringEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_output_base */
+
+#ifdef EGL_EXT_platform_base
+
+static GLboolean _glewInit_EGL_EXT_platform_base ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreatePlatformPixmapSurfaceEXT = (PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC)glewGetProcAddress((const GLubyte*)"eglCreatePlatformPixmapSurfaceEXT")) == NULL) || r;
+  r = ((eglCreatePlatformWindowSurfaceEXT = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)glewGetProcAddress((const GLubyte*)"eglCreatePlatformWindowSurfaceEXT")) == NULL) || r;
+  r = ((eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)glewGetProcAddress((const GLubyte*)"eglGetPlatformDisplayEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_platform_base */
+
+#ifdef EGL_EXT_stream_consumer_egloutput
+
+static GLboolean _glewInit_EGL_EXT_stream_consumer_egloutput ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglStreamConsumerOutputEXT = (PFNEGLSTREAMCONSUMEROUTPUTEXTPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerOutputEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_stream_consumer_egloutput */
+
+#ifdef EGL_EXT_swap_buffers_with_damage
+
+static GLboolean _glewInit_EGL_EXT_swap_buffers_with_damage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSwapBuffersWithDamageEXT = (PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"eglSwapBuffersWithDamageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_EXT_swap_buffers_with_damage */
+
+#ifdef EGL_HI_clientpixmap
+
+static GLboolean _glewInit_EGL_HI_clientpixmap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreatePixmapSurfaceHI = (PFNEGLCREATEPIXMAPSURFACEHIPROC)glewGetProcAddress((const GLubyte*)"eglCreatePixmapSurfaceHI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_HI_clientpixmap */
+
+#ifdef EGL_KHR_cl_event2
+
+static GLboolean _glewInit_EGL_KHR_cl_event2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateSync64KHR = (PFNEGLCREATESYNC64KHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateSync64KHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_cl_event2 */
+
+#ifdef EGL_KHR_debug
+
+static GLboolean _glewInit_EGL_KHR_debug ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglDebugMessageControlKHR = (PFNEGLDEBUGMESSAGECONTROLKHRPROC)glewGetProcAddress((const GLubyte*)"eglDebugMessageControlKHR")) == NULL) || r;
+  r = ((eglLabelObjectKHR = (PFNEGLLABELOBJECTKHRPROC)glewGetProcAddress((const GLubyte*)"eglLabelObjectKHR")) == NULL) || r;
+  r = ((eglQueryDebugKHR = (PFNEGLQUERYDEBUGKHRPROC)glewGetProcAddress((const GLubyte*)"eglQueryDebugKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_debug */
+
+#ifdef EGL_KHR_image
+
+static GLboolean _glewInit_EGL_KHR_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateImageKHR")) == NULL) || r;
+  r = ((eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)glewGetProcAddress((const GLubyte*)"eglDestroyImageKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_image */
+
+#ifdef EGL_KHR_lock_surface
+
+static GLboolean _glewInit_EGL_KHR_lock_surface ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglLockSurfaceKHR = (PFNEGLLOCKSURFACEKHRPROC)glewGetProcAddress((const GLubyte*)"eglLockSurfaceKHR")) == NULL) || r;
+  r = ((eglUnlockSurfaceKHR = (PFNEGLUNLOCKSURFACEKHRPROC)glewGetProcAddress((const GLubyte*)"eglUnlockSurfaceKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_lock_surface */
+
+#ifdef EGL_KHR_lock_surface3
+
+static GLboolean _glewInit_EGL_KHR_lock_surface3 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQuerySurface64KHR = (PFNEGLQUERYSURFACE64KHRPROC)glewGetProcAddress((const GLubyte*)"eglQuerySurface64KHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_lock_surface3 */
+
+#ifdef EGL_KHR_partial_update
+
+static GLboolean _glewInit_EGL_KHR_partial_update ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSetDamageRegionKHR = (PFNEGLSETDAMAGEREGIONKHRPROC)glewGetProcAddress((const GLubyte*)"eglSetDamageRegionKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_partial_update */
+
+#ifdef EGL_KHR_reusable_sync
+
+static GLboolean _glewInit_EGL_KHR_reusable_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglClientWaitSyncKHR = (PFNEGLCLIENTWAITSYNCKHRPROC)glewGetProcAddress((const GLubyte*)"eglClientWaitSyncKHR")) == NULL) || r;
+  r = ((eglCreateSyncKHR = (PFNEGLCREATESYNCKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateSyncKHR")) == NULL) || r;
+  r = ((eglDestroySyncKHR = (PFNEGLDESTROYSYNCKHRPROC)glewGetProcAddress((const GLubyte*)"eglDestroySyncKHR")) == NULL) || r;
+  r = ((eglGetSyncAttribKHR = (PFNEGLGETSYNCATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglGetSyncAttribKHR")) == NULL) || r;
+  r = ((eglSignalSyncKHR = (PFNEGLSIGNALSYNCKHRPROC)glewGetProcAddress((const GLubyte*)"eglSignalSyncKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_reusable_sync */
+
+#ifdef EGL_KHR_stream
+
+static GLboolean _glewInit_EGL_KHR_stream ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateStreamKHR = (PFNEGLCREATESTREAMKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateStreamKHR")) == NULL) || r;
+  r = ((eglDestroyStreamKHR = (PFNEGLDESTROYSTREAMKHRPROC)glewGetProcAddress((const GLubyte*)"eglDestroyStreamKHR")) == NULL) || r;
+  r = ((eglQueryStreamKHR = (PFNEGLQUERYSTREAMKHRPROC)glewGetProcAddress((const GLubyte*)"eglQueryStreamKHR")) == NULL) || r;
+  r = ((eglQueryStreamu64KHR = (PFNEGLQUERYSTREAMU64KHRPROC)glewGetProcAddress((const GLubyte*)"eglQueryStreamu64KHR")) == NULL) || r;
+  r = ((eglStreamAttribKHR = (PFNEGLSTREAMATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamAttribKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream */
+
+#ifdef EGL_KHR_stream_attrib
+
+static GLboolean _glewInit_EGL_KHR_stream_attrib ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateStreamAttribKHR = (PFNEGLCREATESTREAMATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateStreamAttribKHR")) == NULL) || r;
+  r = ((eglQueryStreamAttribKHR = (PFNEGLQUERYSTREAMATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglQueryStreamAttribKHR")) == NULL) || r;
+  r = ((eglSetStreamAttribKHR = (PFNEGLSETSTREAMATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglSetStreamAttribKHR")) == NULL) || r;
+  r = ((eglStreamConsumerAcquireAttribKHR = (PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerAcquireAttribKHR")) == NULL) || r;
+  r = ((eglStreamConsumerReleaseAttribKHR = (PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerReleaseAttribKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream_attrib */
+
+#ifdef EGL_KHR_stream_consumer_gltexture
+
+static GLboolean _glewInit_EGL_KHR_stream_consumer_gltexture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglStreamConsumerAcquireKHR = (PFNEGLSTREAMCONSUMERACQUIREKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerAcquireKHR")) == NULL) || r;
+  r = ((eglStreamConsumerGLTextureExternalKHR = (PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerGLTextureExternalKHR")) == NULL) || r;
+  r = ((eglStreamConsumerReleaseKHR = (PFNEGLSTREAMCONSUMERRELEASEKHRPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerReleaseKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream_consumer_gltexture */
+
+#ifdef EGL_KHR_stream_cross_process_fd
+
+static GLboolean _glewInit_EGL_KHR_stream_cross_process_fd ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateStreamFromFileDescriptorKHR = (PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateStreamFromFileDescriptorKHR")) == NULL) || r;
+  r = ((eglGetStreamFileDescriptorKHR = (PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC)glewGetProcAddress((const GLubyte*)"eglGetStreamFileDescriptorKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream_cross_process_fd */
+
+#ifdef EGL_KHR_stream_fifo
+
+static GLboolean _glewInit_EGL_KHR_stream_fifo ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryStreamTimeKHR = (PFNEGLQUERYSTREAMTIMEKHRPROC)glewGetProcAddress((const GLubyte*)"eglQueryStreamTimeKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream_fifo */
+
+#ifdef EGL_KHR_stream_producer_eglsurface
+
+static GLboolean _glewInit_EGL_KHR_stream_producer_eglsurface ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateStreamProducerSurfaceKHR = (PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC)glewGetProcAddress((const GLubyte*)"eglCreateStreamProducerSurfaceKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_stream_producer_eglsurface */
+
+#ifdef EGL_KHR_swap_buffers_with_damage
+
+static GLboolean _glewInit_EGL_KHR_swap_buffers_with_damage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSwapBuffersWithDamageKHR = (PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC)glewGetProcAddress((const GLubyte*)"eglSwapBuffersWithDamageKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_swap_buffers_with_damage */
+
+#ifdef EGL_KHR_wait_sync
+
+static GLboolean _glewInit_EGL_KHR_wait_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglWaitSyncKHR = (PFNEGLWAITSYNCKHRPROC)glewGetProcAddress((const GLubyte*)"eglWaitSyncKHR")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_KHR_wait_sync */
+
+#ifdef EGL_MESA_drm_image
+
+static GLboolean _glewInit_EGL_MESA_drm_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateDRMImageMESA = (PFNEGLCREATEDRMIMAGEMESAPROC)glewGetProcAddress((const GLubyte*)"eglCreateDRMImageMESA")) == NULL) || r;
+  r = ((eglExportDRMImageMESA = (PFNEGLEXPORTDRMIMAGEMESAPROC)glewGetProcAddress((const GLubyte*)"eglExportDRMImageMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_MESA_drm_image */
+
+#ifdef EGL_MESA_image_dma_buf_export
+
+static GLboolean _glewInit_EGL_MESA_image_dma_buf_export ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglExportDMABUFImageMESA = (PFNEGLEXPORTDMABUFIMAGEMESAPROC)glewGetProcAddress((const GLubyte*)"eglExportDMABUFImageMESA")) == NULL) || r;
+  r = ((eglExportDMABUFImageQueryMESA = (PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC)glewGetProcAddress((const GLubyte*)"eglExportDMABUFImageQueryMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_MESA_image_dma_buf_export */
+
+#ifdef EGL_NOK_swap_region
+
+static GLboolean _glewInit_EGL_NOK_swap_region ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSwapBuffersRegionNOK = (PFNEGLSWAPBUFFERSREGIONNOKPROC)glewGetProcAddress((const GLubyte*)"eglSwapBuffersRegionNOK")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NOK_swap_region */
+
+#ifdef EGL_NOK_swap_region2
+
+static GLboolean _glewInit_EGL_NOK_swap_region2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglSwapBuffersRegion2NOK = (PFNEGLSWAPBUFFERSREGION2NOKPROC)glewGetProcAddress((const GLubyte*)"eglSwapBuffersRegion2NOK")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NOK_swap_region2 */
+
+#ifdef EGL_NV_native_query
+
+static GLboolean _glewInit_EGL_NV_native_query ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryNativeDisplayNV = (PFNEGLQUERYNATIVEDISPLAYNVPROC)glewGetProcAddress((const GLubyte*)"eglQueryNativeDisplayNV")) == NULL) || r;
+  r = ((eglQueryNativePixmapNV = (PFNEGLQUERYNATIVEPIXMAPNVPROC)glewGetProcAddress((const GLubyte*)"eglQueryNativePixmapNV")) == NULL) || r;
+  r = ((eglQueryNativeWindowNV = (PFNEGLQUERYNATIVEWINDOWNVPROC)glewGetProcAddress((const GLubyte*)"eglQueryNativeWindowNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_native_query */
+
+#ifdef EGL_NV_post_sub_buffer
+
+static GLboolean _glewInit_EGL_NV_post_sub_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglPostSubBufferNV = (PFNEGLPOSTSUBBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"eglPostSubBufferNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_post_sub_buffer */
+
+#ifdef EGL_NV_stream_consumer_gltexture_yuv
+
+static GLboolean _glewInit_EGL_NV_stream_consumer_gltexture_yuv ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglStreamConsumerGLTextureExternalAttribsNV = (PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC)glewGetProcAddress((const GLubyte*)"eglStreamConsumerGLTextureExternalAttribsNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_stream_consumer_gltexture_yuv */
+
+#ifdef EGL_NV_stream_metadata
+
+static GLboolean _glewInit_EGL_NV_stream_metadata ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglQueryDisplayAttribNV = (PFNEGLQUERYDISPLAYATTRIBNVPROC)glewGetProcAddress((const GLubyte*)"eglQueryDisplayAttribNV")) == NULL) || r;
+  r = ((eglQueryStreamMetadataNV = (PFNEGLQUERYSTREAMMETADATANVPROC)glewGetProcAddress((const GLubyte*)"eglQueryStreamMetadataNV")) == NULL) || r;
+  r = ((eglSetStreamMetadataNV = (PFNEGLSETSTREAMMETADATANVPROC)glewGetProcAddress((const GLubyte*)"eglSetStreamMetadataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_stream_metadata */
+
+#ifdef EGL_NV_stream_reset
+
+static GLboolean _glewInit_EGL_NV_stream_reset ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglResetStreamNV = (PFNEGLRESETSTREAMNVPROC)glewGetProcAddress((const GLubyte*)"eglResetStreamNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_stream_reset */
+
+#ifdef EGL_NV_stream_sync
+
+static GLboolean _glewInit_EGL_NV_stream_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglCreateStreamSyncNV = (PFNEGLCREATESTREAMSYNCNVPROC)glewGetProcAddress((const GLubyte*)"eglCreateStreamSyncNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_stream_sync */
+
+#ifdef EGL_NV_sync
+
+static GLboolean _glewInit_EGL_NV_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglClientWaitSyncNV = (PFNEGLCLIENTWAITSYNCNVPROC)glewGetProcAddress((const GLubyte*)"eglClientWaitSyncNV")) == NULL) || r;
+  r = ((eglCreateFenceSyncNV = (PFNEGLCREATEFENCESYNCNVPROC)glewGetProcAddress((const GLubyte*)"eglCreateFenceSyncNV")) == NULL) || r;
+  r = ((eglDestroySyncNV = (PFNEGLDESTROYSYNCNVPROC)glewGetProcAddress((const GLubyte*)"eglDestroySyncNV")) == NULL) || r;
+  r = ((eglFenceNV = (PFNEGLFENCENVPROC)glewGetProcAddress((const GLubyte*)"eglFenceNV")) == NULL) || r;
+  r = ((eglGetSyncAttribNV = (PFNEGLGETSYNCATTRIBNVPROC)glewGetProcAddress((const GLubyte*)"eglGetSyncAttribNV")) == NULL) || r;
+  r = ((eglSignalSyncNV = (PFNEGLSIGNALSYNCNVPROC)glewGetProcAddress((const GLubyte*)"eglSignalSyncNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_sync */
+
+#ifdef EGL_NV_system_time
+
+static GLboolean _glewInit_EGL_NV_system_time ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((eglGetSystemTimeFrequencyNV = (PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC)glewGetProcAddress((const GLubyte*)"eglGetSystemTimeFrequencyNV")) == NULL) || r;
+  r = ((eglGetSystemTimeNV = (PFNEGLGETSYSTEMTIMENVPROC)glewGetProcAddress((const GLubyte*)"eglGetSystemTimeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* EGL_NV_system_time */
+
+  /* ------------------------------------------------------------------------ */
+
+GLboolean eglewGetExtension (const char* name)
+{
+  const GLubyte* start;
+  const GLubyte* end;
+
+  start = (const GLubyte*) eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS);
+  if (0 == start) return GL_FALSE;
+  end = start + _glewStrLen(start);
+  return _glewSearchExtension(name, start, end);
+}
+
+GLenum eglewInit (EGLDisplay display)
+{
+  EGLint major, minor;
+  const GLubyte* extStart;
+  const GLubyte* extEnd;
+  PFNEGLINITIALIZEPROC initialize = NULL;
+  PFNEGLQUERYSTRINGPROC queryString = NULL;
+
+  /* Load necessary entry points */
+  initialize = (PFNEGLINITIALIZEPROC)   glewGetProcAddress("eglInitialize");
+  queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString");
+  if (!initialize || !queryString)
+    return 1;
+
+  /* query EGK version */
+  if (initialize(display, &major, &minor) != EGL_TRUE)
+    return 1;
+
+  EGLEW_VERSION_1_5   = ( major > 1 )                || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
+  EGLEW_VERSION_1_4   = EGLEW_VERSION_1_5 == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
+  EGLEW_VERSION_1_3   = EGLEW_VERSION_1_4 == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
+  EGLEW_VERSION_1_2   = EGLEW_VERSION_1_3 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
+  EGLEW_VERSION_1_1   = EGLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
+  EGLEW_VERSION_1_0   = EGLEW_VERSION_1_1 == GL_TRUE || ( major == 1 && minor >= 0 ) ? GL_TRUE : GL_FALSE;
+
+  /* query EGL extension string */
+  extStart = (const GLubyte*) queryString(display, EGL_EXTENSIONS);
+  if (extStart == 0)
+    extStart = (const GLubyte *)"";
+  extEnd = extStart + _glewStrLen(extStart);
+
+  /* initialize extensions */
+#ifdef EGL_VERSION_1_0
+  if (glewExperimental || EGLEW_VERSION_1_0) EGLEW_VERSION_1_0 = !_glewInit_EGL_VERSION_1_0();
+#endif /* EGL_VERSION_1_0 */
+#ifdef EGL_VERSION_1_1
+  if (glewExperimental || EGLEW_VERSION_1_1) EGLEW_VERSION_1_1 = !_glewInit_EGL_VERSION_1_1();
+#endif /* EGL_VERSION_1_1 */
+#ifdef EGL_VERSION_1_2
+  if (glewExperimental || EGLEW_VERSION_1_2) EGLEW_VERSION_1_2 = !_glewInit_EGL_VERSION_1_2();
+#endif /* EGL_VERSION_1_2 */
+#ifdef EGL_VERSION_1_4
+  if (glewExperimental || EGLEW_VERSION_1_4) EGLEW_VERSION_1_4 = !_glewInit_EGL_VERSION_1_4();
+#endif /* EGL_VERSION_1_4 */
+#ifdef EGL_VERSION_1_5
+  if (glewExperimental || EGLEW_VERSION_1_5) EGLEW_VERSION_1_5 = !_glewInit_EGL_VERSION_1_5();
+#endif /* EGL_VERSION_1_5 */
+#ifdef EGL_ANDROID_blob_cache
+  EGLEW_ANDROID_blob_cache = _glewSearchExtension("EGL_ANDROID_blob_cache", extStart, extEnd);
+  if (glewExperimental || EGLEW_ANDROID_blob_cache) EGLEW_ANDROID_blob_cache = !_glewInit_EGL_ANDROID_blob_cache();
+#endif /* EGL_ANDROID_blob_cache */
+#ifdef EGL_ANDROID_create_native_client_buffer
+  EGLEW_ANDROID_create_native_client_buffer = _glewSearchExtension("EGL_ANDROID_create_native_client_buffer", extStart, extEnd);
+  if (glewExperimental || EGLEW_ANDROID_create_native_client_buffer) EGLEW_ANDROID_create_native_client_buffer = !_glewInit_EGL_ANDROID_create_native_client_buffer();
+#endif /* EGL_ANDROID_create_native_client_buffer */
+#ifdef EGL_ANDROID_framebuffer_target
+  EGLEW_ANDROID_framebuffer_target = _glewSearchExtension("EGL_ANDROID_framebuffer_target", extStart, extEnd);
+#endif /* EGL_ANDROID_framebuffer_target */
+#ifdef EGL_ANDROID_front_buffer_auto_refresh
+  EGLEW_ANDROID_front_buffer_auto_refresh = _glewSearchExtension("EGL_ANDROID_front_buffer_auto_refresh", extStart, extEnd);
+#endif /* EGL_ANDROID_front_buffer_auto_refresh */
+#ifdef EGL_ANDROID_image_native_buffer
+  EGLEW_ANDROID_image_native_buffer = _glewSearchExtension("EGL_ANDROID_image_native_buffer", extStart, extEnd);
+#endif /* EGL_ANDROID_image_native_buffer */
+#ifdef EGL_ANDROID_native_fence_sync
+  EGLEW_ANDROID_native_fence_sync = _glewSearchExtension("EGL_ANDROID_native_fence_sync", extStart, extEnd);
+  if (glewExperimental || EGLEW_ANDROID_native_fence_sync) EGLEW_ANDROID_native_fence_sync = !_glewInit_EGL_ANDROID_native_fence_sync();
+#endif /* EGL_ANDROID_native_fence_sync */
+#ifdef EGL_ANDROID_presentation_time
+  EGLEW_ANDROID_presentation_time = _glewSearchExtension("EGL_ANDROID_presentation_time", extStart, extEnd);
+  if (glewExperimental || EGLEW_ANDROID_presentation_time) EGLEW_ANDROID_presentation_time = !_glewInit_EGL_ANDROID_presentation_time();
+#endif /* EGL_ANDROID_presentation_time */
+#ifdef EGL_ANDROID_recordable
+  EGLEW_ANDROID_recordable = _glewSearchExtension("EGL_ANDROID_recordable", extStart, extEnd);
+#endif /* EGL_ANDROID_recordable */
+#ifdef EGL_ANGLE_d3d_share_handle_client_buffer
+  EGLEW_ANGLE_d3d_share_handle_client_buffer = _glewSearchExtension("EGL_ANGLE_d3d_share_handle_client_buffer", extStart, extEnd);
+#endif /* EGL_ANGLE_d3d_share_handle_client_buffer */
+#ifdef EGL_ANGLE_device_d3d
+  EGLEW_ANGLE_device_d3d = _glewSearchExtension("EGL_ANGLE_device_d3d", extStart, extEnd);
+#endif /* EGL_ANGLE_device_d3d */
+#ifdef EGL_ANGLE_query_surface_pointer
+  EGLEW_ANGLE_query_surface_pointer = _glewSearchExtension("EGL_ANGLE_query_surface_pointer", extStart, extEnd);
+  if (glewExperimental || EGLEW_ANGLE_query_surface_pointer) EGLEW_ANGLE_query_surface_pointer = !_glewInit_EGL_ANGLE_query_surface_pointer();
+#endif /* EGL_ANGLE_query_surface_pointer */
+#ifdef EGL_ANGLE_surface_d3d_texture_2d_share_handle
+  EGLEW_ANGLE_surface_d3d_texture_2d_share_handle = _glewSearchExtension("EGL_ANGLE_surface_d3d_texture_2d_share_handle", extStart, extEnd);
+#endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */
+#ifdef EGL_ANGLE_window_fixed_size
+  EGLEW_ANGLE_window_fixed_size = _glewSearchExtension("EGL_ANGLE_window_fixed_size", extStart, extEnd);
+#endif /* EGL_ANGLE_window_fixed_size */
+#ifdef EGL_ARM_implicit_external_sync
+  EGLEW_ARM_implicit_external_sync = _glewSearchExtension("EGL_ARM_implicit_external_sync", extStart, extEnd);
+#endif /* EGL_ARM_implicit_external_sync */
+#ifdef EGL_ARM_pixmap_multisample_discard
+  EGLEW_ARM_pixmap_multisample_discard = _glewSearchExtension("EGL_ARM_pixmap_multisample_discard", extStart, extEnd);
+#endif /* EGL_ARM_pixmap_multisample_discard */
+#ifdef EGL_EXT_buffer_age
+  EGLEW_EXT_buffer_age = _glewSearchExtension("EGL_EXT_buffer_age", extStart, extEnd);
+#endif /* EGL_EXT_buffer_age */
+#ifdef EGL_EXT_client_extensions
+  EGLEW_EXT_client_extensions = _glewSearchExtension("EGL_EXT_client_extensions", extStart, extEnd);
+#endif /* EGL_EXT_client_extensions */
+#ifdef EGL_EXT_create_context_robustness
+  EGLEW_EXT_create_context_robustness = _glewSearchExtension("EGL_EXT_create_context_robustness", extStart, extEnd);
+#endif /* EGL_EXT_create_context_robustness */
+#ifdef EGL_EXT_device_base
+  EGLEW_EXT_device_base = _glewSearchExtension("EGL_EXT_device_base", extStart, extEnd);
+#endif /* EGL_EXT_device_base */
+#ifdef EGL_EXT_device_drm
+  EGLEW_EXT_device_drm = _glewSearchExtension("EGL_EXT_device_drm", extStart, extEnd);
+#endif /* EGL_EXT_device_drm */
+#ifdef EGL_EXT_device_enumeration
+  EGLEW_EXT_device_enumeration = _glewSearchExtension("EGL_EXT_device_enumeration", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_device_enumeration) EGLEW_EXT_device_enumeration = !_glewInit_EGL_EXT_device_enumeration();
+#endif /* EGL_EXT_device_enumeration */
+#ifdef EGL_EXT_device_openwf
+  EGLEW_EXT_device_openwf = _glewSearchExtension("EGL_EXT_device_openwf", extStart, extEnd);
+#endif /* EGL_EXT_device_openwf */
+#ifdef EGL_EXT_device_query
+  EGLEW_EXT_device_query = _glewSearchExtension("EGL_EXT_device_query", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_device_query) EGLEW_EXT_device_query = !_glewInit_EGL_EXT_device_query();
+#endif /* EGL_EXT_device_query */
+#ifdef EGL_EXT_gl_colorspace_bt2020_linear
+  EGLEW_EXT_gl_colorspace_bt2020_linear = _glewSearchExtension("EGL_EXT_gl_colorspace_bt2020_linear", extStart, extEnd);
+#endif /* EGL_EXT_gl_colorspace_bt2020_linear */
+#ifdef EGL_EXT_gl_colorspace_bt2020_pq
+  EGLEW_EXT_gl_colorspace_bt2020_pq = _glewSearchExtension("EGL_EXT_gl_colorspace_bt2020_pq", extStart, extEnd);
+#endif /* EGL_EXT_gl_colorspace_bt2020_pq */
+#ifdef EGL_EXT_gl_colorspace_scrgb_linear
+  EGLEW_EXT_gl_colorspace_scrgb_linear = _glewSearchExtension("EGL_EXT_gl_colorspace_scrgb_linear", extStart, extEnd);
+#endif /* EGL_EXT_gl_colorspace_scrgb_linear */
+#ifdef EGL_EXT_image_dma_buf_import
+  EGLEW_EXT_image_dma_buf_import = _glewSearchExtension("EGL_EXT_image_dma_buf_import", extStart, extEnd);
+#endif /* EGL_EXT_image_dma_buf_import */
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+  EGLEW_EXT_image_dma_buf_import_modifiers = _glewSearchExtension("EGL_EXT_image_dma_buf_import_modifiers", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_image_dma_buf_import_modifiers) EGLEW_EXT_image_dma_buf_import_modifiers = !_glewInit_EGL_EXT_image_dma_buf_import_modifiers();
+#endif /* EGL_EXT_image_dma_buf_import_modifiers */
+#ifdef EGL_EXT_multiview_window
+  EGLEW_EXT_multiview_window = _glewSearchExtension("EGL_EXT_multiview_window", extStart, extEnd);
+#endif /* EGL_EXT_multiview_window */
+#ifdef EGL_EXT_output_base
+  EGLEW_EXT_output_base = _glewSearchExtension("EGL_EXT_output_base", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_output_base) EGLEW_EXT_output_base = !_glewInit_EGL_EXT_output_base();
+#endif /* EGL_EXT_output_base */
+#ifdef EGL_EXT_output_drm
+  EGLEW_EXT_output_drm = _glewSearchExtension("EGL_EXT_output_drm", extStart, extEnd);
+#endif /* EGL_EXT_output_drm */
+#ifdef EGL_EXT_output_openwf
+  EGLEW_EXT_output_openwf = _glewSearchExtension("EGL_EXT_output_openwf", extStart, extEnd);
+#endif /* EGL_EXT_output_openwf */
+#ifdef EGL_EXT_pixel_format_float
+  EGLEW_EXT_pixel_format_float = _glewSearchExtension("EGL_EXT_pixel_format_float", extStart, extEnd);
+#endif /* EGL_EXT_pixel_format_float */
+#ifdef EGL_EXT_platform_base
+  EGLEW_EXT_platform_base = _glewSearchExtension("EGL_EXT_platform_base", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_platform_base) EGLEW_EXT_platform_base = !_glewInit_EGL_EXT_platform_base();
+#endif /* EGL_EXT_platform_base */
+#ifdef EGL_EXT_platform_device
+  EGLEW_EXT_platform_device = _glewSearchExtension("EGL_EXT_platform_device", extStart, extEnd);
+#endif /* EGL_EXT_platform_device */
+#ifdef EGL_EXT_platform_wayland
+  EGLEW_EXT_platform_wayland = _glewSearchExtension("EGL_EXT_platform_wayland", extStart, extEnd);
+#endif /* EGL_EXT_platform_wayland */
+#ifdef EGL_EXT_platform_x11
+  EGLEW_EXT_platform_x11 = _glewSearchExtension("EGL_EXT_platform_x11", extStart, extEnd);
+#endif /* EGL_EXT_platform_x11 */
+#ifdef EGL_EXT_protected_content
+  EGLEW_EXT_protected_content = _glewSearchExtension("EGL_EXT_protected_content", extStart, extEnd);
+#endif /* EGL_EXT_protected_content */
+#ifdef EGL_EXT_protected_surface
+  EGLEW_EXT_protected_surface = _glewSearchExtension("EGL_EXT_protected_surface", extStart, extEnd);
+#endif /* EGL_EXT_protected_surface */
+#ifdef EGL_EXT_stream_consumer_egloutput
+  EGLEW_EXT_stream_consumer_egloutput = _glewSearchExtension("EGL_EXT_stream_consumer_egloutput", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_stream_consumer_egloutput) EGLEW_EXT_stream_consumer_egloutput = !_glewInit_EGL_EXT_stream_consumer_egloutput();
+#endif /* EGL_EXT_stream_consumer_egloutput */
+#ifdef EGL_EXT_surface_SMPTE2086_metadata
+  EGLEW_EXT_surface_SMPTE2086_metadata = _glewSearchExtension("EGL_EXT_surface_SMPTE2086_metadata", extStart, extEnd);
+#endif /* EGL_EXT_surface_SMPTE2086_metadata */
+#ifdef EGL_EXT_swap_buffers_with_damage
+  EGLEW_EXT_swap_buffers_with_damage = _glewSearchExtension("EGL_EXT_swap_buffers_with_damage", extStart, extEnd);
+  if (glewExperimental || EGLEW_EXT_swap_buffers_with_damage) EGLEW_EXT_swap_buffers_with_damage = !_glewInit_EGL_EXT_swap_buffers_with_damage();
+#endif /* EGL_EXT_swap_buffers_with_damage */
+#ifdef EGL_EXT_yuv_surface
+  EGLEW_EXT_yuv_surface = _glewSearchExtension("EGL_EXT_yuv_surface", extStart, extEnd);
+#endif /* EGL_EXT_yuv_surface */
+#ifdef EGL_HI_clientpixmap
+  EGLEW_HI_clientpixmap = _glewSearchExtension("EGL_HI_clientpixmap", extStart, extEnd);
+  if (glewExperimental || EGLEW_HI_clientpixmap) EGLEW_HI_clientpixmap = !_glewInit_EGL_HI_clientpixmap();
+#endif /* EGL_HI_clientpixmap */
+#ifdef EGL_HI_colorformats
+  EGLEW_HI_colorformats = _glewSearchExtension("EGL_HI_colorformats", extStart, extEnd);
+#endif /* EGL_HI_colorformats */
+#ifdef EGL_IMG_context_priority
+  EGLEW_IMG_context_priority = _glewSearchExtension("EGL_IMG_context_priority", extStart, extEnd);
+#endif /* EGL_IMG_context_priority */
+#ifdef EGL_IMG_image_plane_attribs
+  EGLEW_IMG_image_plane_attribs = _glewSearchExtension("EGL_IMG_image_plane_attribs", extStart, extEnd);
+#endif /* EGL_IMG_image_plane_attribs */
+#ifdef EGL_KHR_cl_event
+  EGLEW_KHR_cl_event = _glewSearchExtension("EGL_KHR_cl_event", extStart, extEnd);
+#endif /* EGL_KHR_cl_event */
+#ifdef EGL_KHR_cl_event2
+  EGLEW_KHR_cl_event2 = _glewSearchExtension("EGL_KHR_cl_event2", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_cl_event2) EGLEW_KHR_cl_event2 = !_glewInit_EGL_KHR_cl_event2();
+#endif /* EGL_KHR_cl_event2 */
+#ifdef EGL_KHR_client_get_all_proc_addresses
+  EGLEW_KHR_client_get_all_proc_addresses = _glewSearchExtension("EGL_KHR_client_get_all_proc_addresses", extStart, extEnd);
+#endif /* EGL_KHR_client_get_all_proc_addresses */
+#ifdef EGL_KHR_config_attribs
+  EGLEW_KHR_config_attribs = _glewSearchExtension("EGL_KHR_config_attribs", extStart, extEnd);
+#endif /* EGL_KHR_config_attribs */
+#ifdef EGL_KHR_context_flush_control
+  EGLEW_KHR_context_flush_control = _glewSearchExtension("EGL_KHR_context_flush_control", extStart, extEnd);
+#endif /* EGL_KHR_context_flush_control */
+#ifdef EGL_KHR_create_context
+  EGLEW_KHR_create_context = _glewSearchExtension("EGL_KHR_create_context", extStart, extEnd);
+#endif /* EGL_KHR_create_context */
+#ifdef EGL_KHR_create_context_no_error
+  EGLEW_KHR_create_context_no_error = _glewSearchExtension("EGL_KHR_create_context_no_error", extStart, extEnd);
+#endif /* EGL_KHR_create_context_no_error */
+#ifdef EGL_KHR_debug
+  EGLEW_KHR_debug = _glewSearchExtension("EGL_KHR_debug", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_debug) EGLEW_KHR_debug = !_glewInit_EGL_KHR_debug();
+#endif /* EGL_KHR_debug */
+#ifdef EGL_KHR_fence_sync
+  EGLEW_KHR_fence_sync = _glewSearchExtension("EGL_KHR_fence_sync", extStart, extEnd);
+#endif /* EGL_KHR_fence_sync */
+#ifdef EGL_KHR_get_all_proc_addresses
+  EGLEW_KHR_get_all_proc_addresses = _glewSearchExtension("EGL_KHR_get_all_proc_addresses", extStart, extEnd);
+#endif /* EGL_KHR_get_all_proc_addresses */
+#ifdef EGL_KHR_gl_colorspace
+  EGLEW_KHR_gl_colorspace = _glewSearchExtension("EGL_KHR_gl_colorspace", extStart, extEnd);
+#endif /* EGL_KHR_gl_colorspace */
+#ifdef EGL_KHR_gl_renderbuffer_image
+  EGLEW_KHR_gl_renderbuffer_image = _glewSearchExtension("EGL_KHR_gl_renderbuffer_image", extStart, extEnd);
+#endif /* EGL_KHR_gl_renderbuffer_image */
+#ifdef EGL_KHR_gl_texture_2D_image
+  EGLEW_KHR_gl_texture_2D_image = _glewSearchExtension("EGL_KHR_gl_texture_2D_image", extStart, extEnd);
+#endif /* EGL_KHR_gl_texture_2D_image */
+#ifdef EGL_KHR_gl_texture_3D_image
+  EGLEW_KHR_gl_texture_3D_image = _glewSearchExtension("EGL_KHR_gl_texture_3D_image", extStart, extEnd);
+#endif /* EGL_KHR_gl_texture_3D_image */
+#ifdef EGL_KHR_gl_texture_cubemap_image
+  EGLEW_KHR_gl_texture_cubemap_image = _glewSearchExtension("EGL_KHR_gl_texture_cubemap_image", extStart, extEnd);
+#endif /* EGL_KHR_gl_texture_cubemap_image */
+#ifdef EGL_KHR_image
+  EGLEW_KHR_image = _glewSearchExtension("EGL_KHR_image", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_image) EGLEW_KHR_image = !_glewInit_EGL_KHR_image();
+#endif /* EGL_KHR_image */
+#ifdef EGL_KHR_image_base
+  EGLEW_KHR_image_base = _glewSearchExtension("EGL_KHR_image_base", extStart, extEnd);
+#endif /* EGL_KHR_image_base */
+#ifdef EGL_KHR_image_pixmap
+  EGLEW_KHR_image_pixmap = _glewSearchExtension("EGL_KHR_image_pixmap", extStart, extEnd);
+#endif /* EGL_KHR_image_pixmap */
+#ifdef EGL_KHR_lock_surface
+  EGLEW_KHR_lock_surface = _glewSearchExtension("EGL_KHR_lock_surface", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_lock_surface) EGLEW_KHR_lock_surface = !_glewInit_EGL_KHR_lock_surface();
+#endif /* EGL_KHR_lock_surface */
+#ifdef EGL_KHR_lock_surface2
+  EGLEW_KHR_lock_surface2 = _glewSearchExtension("EGL_KHR_lock_surface2", extStart, extEnd);
+#endif /* EGL_KHR_lock_surface2 */
+#ifdef EGL_KHR_lock_surface3
+  EGLEW_KHR_lock_surface3 = _glewSearchExtension("EGL_KHR_lock_surface3", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_lock_surface3) EGLEW_KHR_lock_surface3 = !_glewInit_EGL_KHR_lock_surface3();
+#endif /* EGL_KHR_lock_surface3 */
+#ifdef EGL_KHR_mutable_render_buffer
+  EGLEW_KHR_mutable_render_buffer = _glewSearchExtension("EGL_KHR_mutable_render_buffer", extStart, extEnd);
+#endif /* EGL_KHR_mutable_render_buffer */
+#ifdef EGL_KHR_no_config_context
+  EGLEW_KHR_no_config_context = _glewSearchExtension("EGL_KHR_no_config_context", extStart, extEnd);
+#endif /* EGL_KHR_no_config_context */
+#ifdef EGL_KHR_partial_update
+  EGLEW_KHR_partial_update = _glewSearchExtension("EGL_KHR_partial_update", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_partial_update) EGLEW_KHR_partial_update = !_glewInit_EGL_KHR_partial_update();
+#endif /* EGL_KHR_partial_update */
+#ifdef EGL_KHR_platform_android
+  EGLEW_KHR_platform_android = _glewSearchExtension("EGL_KHR_platform_android", extStart, extEnd);
+#endif /* EGL_KHR_platform_android */
+#ifdef EGL_KHR_platform_gbm
+  EGLEW_KHR_platform_gbm = _glewSearchExtension("EGL_KHR_platform_gbm", extStart, extEnd);
+#endif /* EGL_KHR_platform_gbm */
+#ifdef EGL_KHR_platform_wayland
+  EGLEW_KHR_platform_wayland = _glewSearchExtension("EGL_KHR_platform_wayland", extStart, extEnd);
+#endif /* EGL_KHR_platform_wayland */
+#ifdef EGL_KHR_platform_x11
+  EGLEW_KHR_platform_x11 = _glewSearchExtension("EGL_KHR_platform_x11", extStart, extEnd);
+#endif /* EGL_KHR_platform_x11 */
+#ifdef EGL_KHR_reusable_sync
+  EGLEW_KHR_reusable_sync = _glewSearchExtension("EGL_KHR_reusable_sync", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_reusable_sync) EGLEW_KHR_reusable_sync = !_glewInit_EGL_KHR_reusable_sync();
+#endif /* EGL_KHR_reusable_sync */
+#ifdef EGL_KHR_stream
+  EGLEW_KHR_stream = _glewSearchExtension("EGL_KHR_stream", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream) EGLEW_KHR_stream = !_glewInit_EGL_KHR_stream();
+#endif /* EGL_KHR_stream */
+#ifdef EGL_KHR_stream_attrib
+  EGLEW_KHR_stream_attrib = _glewSearchExtension("EGL_KHR_stream_attrib", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream_attrib) EGLEW_KHR_stream_attrib = !_glewInit_EGL_KHR_stream_attrib();
+#endif /* EGL_KHR_stream_attrib */
+#ifdef EGL_KHR_stream_consumer_gltexture
+  EGLEW_KHR_stream_consumer_gltexture = _glewSearchExtension("EGL_KHR_stream_consumer_gltexture", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream_consumer_gltexture) EGLEW_KHR_stream_consumer_gltexture = !_glewInit_EGL_KHR_stream_consumer_gltexture();
+#endif /* EGL_KHR_stream_consumer_gltexture */
+#ifdef EGL_KHR_stream_cross_process_fd
+  EGLEW_KHR_stream_cross_process_fd = _glewSearchExtension("EGL_KHR_stream_cross_process_fd", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream_cross_process_fd) EGLEW_KHR_stream_cross_process_fd = !_glewInit_EGL_KHR_stream_cross_process_fd();
+#endif /* EGL_KHR_stream_cross_process_fd */
+#ifdef EGL_KHR_stream_fifo
+  EGLEW_KHR_stream_fifo = _glewSearchExtension("EGL_KHR_stream_fifo", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream_fifo) EGLEW_KHR_stream_fifo = !_glewInit_EGL_KHR_stream_fifo();
+#endif /* EGL_KHR_stream_fifo */
+#ifdef EGL_KHR_stream_producer_aldatalocator
+  EGLEW_KHR_stream_producer_aldatalocator = _glewSearchExtension("EGL_KHR_stream_producer_aldatalocator", extStart, extEnd);
+#endif /* EGL_KHR_stream_producer_aldatalocator */
+#ifdef EGL_KHR_stream_producer_eglsurface
+  EGLEW_KHR_stream_producer_eglsurface = _glewSearchExtension("EGL_KHR_stream_producer_eglsurface", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_stream_producer_eglsurface) EGLEW_KHR_stream_producer_eglsurface = !_glewInit_EGL_KHR_stream_producer_eglsurface();
+#endif /* EGL_KHR_stream_producer_eglsurface */
+#ifdef EGL_KHR_surfaceless_context
+  EGLEW_KHR_surfaceless_context = _glewSearchExtension("EGL_KHR_surfaceless_context", extStart, extEnd);
+#endif /* EGL_KHR_surfaceless_context */
+#ifdef EGL_KHR_swap_buffers_with_damage
+  EGLEW_KHR_swap_buffers_with_damage = _glewSearchExtension("EGL_KHR_swap_buffers_with_damage", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_swap_buffers_with_damage) EGLEW_KHR_swap_buffers_with_damage = !_glewInit_EGL_KHR_swap_buffers_with_damage();
+#endif /* EGL_KHR_swap_buffers_with_damage */
+#ifdef EGL_KHR_vg_parent_image
+  EGLEW_KHR_vg_parent_image = _glewSearchExtension("EGL_KHR_vg_parent_image", extStart, extEnd);
+#endif /* EGL_KHR_vg_parent_image */
+#ifdef EGL_KHR_wait_sync
+  EGLEW_KHR_wait_sync = _glewSearchExtension("EGL_KHR_wait_sync", extStart, extEnd);
+  if (glewExperimental || EGLEW_KHR_wait_sync) EGLEW_KHR_wait_sync = !_glewInit_EGL_KHR_wait_sync();
+#endif /* EGL_KHR_wait_sync */
+#ifdef EGL_MESA_drm_image
+  EGLEW_MESA_drm_image = _glewSearchExtension("EGL_MESA_drm_image", extStart, extEnd);
+  if (glewExperimental || EGLEW_MESA_drm_image) EGLEW_MESA_drm_image = !_glewInit_EGL_MESA_drm_image();
+#endif /* EGL_MESA_drm_image */
+#ifdef EGL_MESA_image_dma_buf_export
+  EGLEW_MESA_image_dma_buf_export = _glewSearchExtension("EGL_MESA_image_dma_buf_export", extStart, extEnd);
+  if (glewExperimental || EGLEW_MESA_image_dma_buf_export) EGLEW_MESA_image_dma_buf_export = !_glewInit_EGL_MESA_image_dma_buf_export();
+#endif /* EGL_MESA_image_dma_buf_export */
+#ifdef EGL_MESA_platform_gbm
+  EGLEW_MESA_platform_gbm = _glewSearchExtension("EGL_MESA_platform_gbm", extStart, extEnd);
+#endif /* EGL_MESA_platform_gbm */
+#ifdef EGL_MESA_platform_surfaceless
+  EGLEW_MESA_platform_surfaceless = _glewSearchExtension("EGL_MESA_platform_surfaceless", extStart, extEnd);
+#endif /* EGL_MESA_platform_surfaceless */
+#ifdef EGL_NOK_swap_region
+  EGLEW_NOK_swap_region = _glewSearchExtension("EGL_NOK_swap_region", extStart, extEnd);
+  if (glewExperimental || EGLEW_NOK_swap_region) EGLEW_NOK_swap_region = !_glewInit_EGL_NOK_swap_region();
+#endif /* EGL_NOK_swap_region */
+#ifdef EGL_NOK_swap_region2
+  EGLEW_NOK_swap_region2 = _glewSearchExtension("EGL_NOK_swap_region2", extStart, extEnd);
+  if (glewExperimental || EGLEW_NOK_swap_region2) EGLEW_NOK_swap_region2 = !_glewInit_EGL_NOK_swap_region2();
+#endif /* EGL_NOK_swap_region2 */
+#ifdef EGL_NOK_texture_from_pixmap
+  EGLEW_NOK_texture_from_pixmap = _glewSearchExtension("EGL_NOK_texture_from_pixmap", extStart, extEnd);
+#endif /* EGL_NOK_texture_from_pixmap */
+#ifdef EGL_NV_3dvision_surface
+  EGLEW_NV_3dvision_surface = _glewSearchExtension("EGL_NV_3dvision_surface", extStart, extEnd);
+#endif /* EGL_NV_3dvision_surface */
+#ifdef EGL_NV_coverage_sample
+  EGLEW_NV_coverage_sample = _glewSearchExtension("EGL_NV_coverage_sample", extStart, extEnd);
+#endif /* EGL_NV_coverage_sample */
+#ifdef EGL_NV_coverage_sample_resolve
+  EGLEW_NV_coverage_sample_resolve = _glewSearchExtension("EGL_NV_coverage_sample_resolve", extStart, extEnd);
+#endif /* EGL_NV_coverage_sample_resolve */
+#ifdef EGL_NV_cuda_event
+  EGLEW_NV_cuda_event = _glewSearchExtension("EGL_NV_cuda_event", extStart, extEnd);
+#endif /* EGL_NV_cuda_event */
+#ifdef EGL_NV_depth_nonlinear
+  EGLEW_NV_depth_nonlinear = _glewSearchExtension("EGL_NV_depth_nonlinear", extStart, extEnd);
+#endif /* EGL_NV_depth_nonlinear */
+#ifdef EGL_NV_device_cuda
+  EGLEW_NV_device_cuda = _glewSearchExtension("EGL_NV_device_cuda", extStart, extEnd);
+#endif /* EGL_NV_device_cuda */
+#ifdef EGL_NV_native_query
+  EGLEW_NV_native_query = _glewSearchExtension("EGL_NV_native_query", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_native_query) EGLEW_NV_native_query = !_glewInit_EGL_NV_native_query();
+#endif /* EGL_NV_native_query */
+#ifdef EGL_NV_post_convert_rounding
+  EGLEW_NV_post_convert_rounding = _glewSearchExtension("EGL_NV_post_convert_rounding", extStart, extEnd);
+#endif /* EGL_NV_post_convert_rounding */
+#ifdef EGL_NV_post_sub_buffer
+  EGLEW_NV_post_sub_buffer = _glewSearchExtension("EGL_NV_post_sub_buffer", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_post_sub_buffer) EGLEW_NV_post_sub_buffer = !_glewInit_EGL_NV_post_sub_buffer();
+#endif /* EGL_NV_post_sub_buffer */
+#ifdef EGL_NV_robustness_video_memory_purge
+  EGLEW_NV_robustness_video_memory_purge = _glewSearchExtension("EGL_NV_robustness_video_memory_purge", extStart, extEnd);
+#endif /* EGL_NV_robustness_video_memory_purge */
+#ifdef EGL_NV_stream_consumer_gltexture_yuv
+  EGLEW_NV_stream_consumer_gltexture_yuv = _glewSearchExtension("EGL_NV_stream_consumer_gltexture_yuv", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_stream_consumer_gltexture_yuv) EGLEW_NV_stream_consumer_gltexture_yuv = !_glewInit_EGL_NV_stream_consumer_gltexture_yuv();
+#endif /* EGL_NV_stream_consumer_gltexture_yuv */
+#ifdef EGL_NV_stream_cross_display
+  EGLEW_NV_stream_cross_display = _glewSearchExtension("EGL_NV_stream_cross_display", extStart, extEnd);
+#endif /* EGL_NV_stream_cross_display */
+#ifdef EGL_NV_stream_cross_object
+  EGLEW_NV_stream_cross_object = _glewSearchExtension("EGL_NV_stream_cross_object", extStart, extEnd);
+#endif /* EGL_NV_stream_cross_object */
+#ifdef EGL_NV_stream_cross_partition
+  EGLEW_NV_stream_cross_partition = _glewSearchExtension("EGL_NV_stream_cross_partition", extStart, extEnd);
+#endif /* EGL_NV_stream_cross_partition */
+#ifdef EGL_NV_stream_cross_process
+  EGLEW_NV_stream_cross_process = _glewSearchExtension("EGL_NV_stream_cross_process", extStart, extEnd);
+#endif /* EGL_NV_stream_cross_process */
+#ifdef EGL_NV_stream_cross_system
+  EGLEW_NV_stream_cross_system = _glewSearchExtension("EGL_NV_stream_cross_system", extStart, extEnd);
+#endif /* EGL_NV_stream_cross_system */
+#ifdef EGL_NV_stream_fifo_next
+  EGLEW_NV_stream_fifo_next = _glewSearchExtension("EGL_NV_stream_fifo_next", extStart, extEnd);
+#endif /* EGL_NV_stream_fifo_next */
+#ifdef EGL_NV_stream_fifo_synchronous
+  EGLEW_NV_stream_fifo_synchronous = _glewSearchExtension("EGL_NV_stream_fifo_synchronous", extStart, extEnd);
+#endif /* EGL_NV_stream_fifo_synchronous */
+#ifdef EGL_NV_stream_frame_limits
+  EGLEW_NV_stream_frame_limits = _glewSearchExtension("EGL_NV_stream_frame_limits", extStart, extEnd);
+#endif /* EGL_NV_stream_frame_limits */
+#ifdef EGL_NV_stream_metadata
+  EGLEW_NV_stream_metadata = _glewSearchExtension("EGL_NV_stream_metadata", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_stream_metadata) EGLEW_NV_stream_metadata = !_glewInit_EGL_NV_stream_metadata();
+#endif /* EGL_NV_stream_metadata */
+#ifdef EGL_NV_stream_remote
+  EGLEW_NV_stream_remote = _glewSearchExtension("EGL_NV_stream_remote", extStart, extEnd);
+#endif /* EGL_NV_stream_remote */
+#ifdef EGL_NV_stream_reset
+  EGLEW_NV_stream_reset = _glewSearchExtension("EGL_NV_stream_reset", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_stream_reset) EGLEW_NV_stream_reset = !_glewInit_EGL_NV_stream_reset();
+#endif /* EGL_NV_stream_reset */
+#ifdef EGL_NV_stream_socket
+  EGLEW_NV_stream_socket = _glewSearchExtension("EGL_NV_stream_socket", extStart, extEnd);
+#endif /* EGL_NV_stream_socket */
+#ifdef EGL_NV_stream_socket_inet
+  EGLEW_NV_stream_socket_inet = _glewSearchExtension("EGL_NV_stream_socket_inet", extStart, extEnd);
+#endif /* EGL_NV_stream_socket_inet */
+#ifdef EGL_NV_stream_socket_unix
+  EGLEW_NV_stream_socket_unix = _glewSearchExtension("EGL_NV_stream_socket_unix", extStart, extEnd);
+#endif /* EGL_NV_stream_socket_unix */
+#ifdef EGL_NV_stream_sync
+  EGLEW_NV_stream_sync = _glewSearchExtension("EGL_NV_stream_sync", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_stream_sync) EGLEW_NV_stream_sync = !_glewInit_EGL_NV_stream_sync();
+#endif /* EGL_NV_stream_sync */
+#ifdef EGL_NV_sync
+  EGLEW_NV_sync = _glewSearchExtension("EGL_NV_sync", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_sync) EGLEW_NV_sync = !_glewInit_EGL_NV_sync();
+#endif /* EGL_NV_sync */
+#ifdef EGL_NV_system_time
+  EGLEW_NV_system_time = _glewSearchExtension("EGL_NV_system_time", extStart, extEnd);
+  if (glewExperimental || EGLEW_NV_system_time) EGLEW_NV_system_time = !_glewInit_EGL_NV_system_time();
+#endif /* EGL_NV_system_time */
+#ifdef EGL_TIZEN_image_native_buffer
+  EGLEW_TIZEN_image_native_buffer = _glewSearchExtension("EGL_TIZEN_image_native_buffer", extStart, extEnd);
+#endif /* EGL_TIZEN_image_native_buffer */
+#ifdef EGL_TIZEN_image_native_surface
+  EGLEW_TIZEN_image_native_surface = _glewSearchExtension("EGL_TIZEN_image_native_surface", extStart, extEnd);
+#endif /* EGL_TIZEN_image_native_surface */
+
+  return GLEW_OK;
+}
+
+#elif defined(_WIN32)
+
+PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;
+
+PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD = NULL;
+PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD = NULL;
+PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD = NULL;
+PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD = NULL;
+PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD = NULL;
+PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD = NULL;
+PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD = NULL;
+PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD = NULL;
+PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD = NULL;
+
+PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB = NULL;
+PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB = NULL;
+PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB = NULL;
+PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB = NULL;
+
+PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB = NULL;
+
+PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB = NULL;
+
+PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB = NULL;
+PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB = NULL;
+
+PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB = NULL;
+PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB = NULL;
+PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB = NULL;
+PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB = NULL;
+PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB = NULL;
+
+PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB = NULL;
+PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB = NULL;
+PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB = NULL;
+
+PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB = NULL;
+PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB = NULL;
+PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB = NULL;
+
+PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT = NULL;
+PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT = NULL;
+PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT = NULL;
+PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT = NULL;
+
+PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT = NULL;
+
+PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT = NULL;
+PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT = NULL;
+
+PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT = NULL;
+PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT = NULL;
+PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT = NULL;
+PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT = NULL;
+PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT = NULL;
+
+PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT = NULL;
+PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT = NULL;
+PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT = NULL;
+
+PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT = NULL;
+PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT = NULL;
+
+PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D = NULL;
+PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D = NULL;
+
+PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D = NULL;
+PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D = NULL;
+PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D = NULL;
+PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D = NULL;
+
+PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D = NULL;
+PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D = NULL;
+PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D = NULL;
+PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D = NULL;
+PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D = NULL;
+PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D = NULL;
+PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D = NULL;
+PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D = NULL;
+PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D = NULL;
+PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D = NULL;
+PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D = NULL;
+PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D = NULL;
+
+PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D = NULL;
+PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D = NULL;
+PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D = NULL;
+PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D = NULL;
+
+PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D = NULL;
+PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D = NULL;
+PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D = NULL;
+PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D = NULL;
+
+PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D = NULL;
+PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D = NULL;
+PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D = NULL;
+PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D = NULL;
+
+PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV = NULL;
+PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV = NULL;
+PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV = NULL;
+PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV = NULL;
+PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV = NULL;
+PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV = NULL;
+PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV = NULL;
+PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV = NULL;
+
+PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV = NULL;
+
+PFNWGLDELAYBEFORESWAPNVPROC __wglewDelayBeforeSwapNV = NULL;
+
+PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV = NULL;
+PFNWGLDELETEDCNVPROC __wglewDeleteDCNV = NULL;
+PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV = NULL;
+PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV = NULL;
+PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV = NULL;
+
+PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV = NULL;
+PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV = NULL;
+PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV = NULL;
+
+PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV = NULL;
+PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV = NULL;
+PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV = NULL;
+PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV = NULL;
+PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV = NULL;
+PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV = NULL;
+
+PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV = NULL;
+PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV = NULL;
+
+PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV = NULL;
+PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV = NULL;
+PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV = NULL;
+PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV = NULL;
+PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV = NULL;
+
+PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV = NULL;
+PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV = NULL;
+PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV = NULL;
+PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV = NULL;
+PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV = NULL;
+PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV = NULL;
+
+PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML = NULL;
+PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML = NULL;
+PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML = NULL;
+PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML = NULL;
+PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML = NULL;
+PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML = NULL;
+GLboolean __WGLEW_3DFX_multisample = GL_FALSE;
+GLboolean __WGLEW_3DL_stereo_control = GL_FALSE;
+GLboolean __WGLEW_AMD_gpu_association = GL_FALSE;
+GLboolean __WGLEW_ARB_buffer_region = GL_FALSE;
+GLboolean __WGLEW_ARB_context_flush_control = GL_FALSE;
+GLboolean __WGLEW_ARB_create_context = GL_FALSE;
+GLboolean __WGLEW_ARB_create_context_no_error = GL_FALSE;
+GLboolean __WGLEW_ARB_create_context_profile = GL_FALSE;
+GLboolean __WGLEW_ARB_create_context_robustness = GL_FALSE;
+GLboolean __WGLEW_ARB_extensions_string = GL_FALSE;
+GLboolean __WGLEW_ARB_framebuffer_sRGB = GL_FALSE;
+GLboolean __WGLEW_ARB_make_current_read = GL_FALSE;
+GLboolean __WGLEW_ARB_multisample = GL_FALSE;
+GLboolean __WGLEW_ARB_pbuffer = GL_FALSE;
+GLboolean __WGLEW_ARB_pixel_format = GL_FALSE;
+GLboolean __WGLEW_ARB_pixel_format_float = GL_FALSE;
+GLboolean __WGLEW_ARB_render_texture = GL_FALSE;
+GLboolean __WGLEW_ARB_robustness_application_isolation = GL_FALSE;
+GLboolean __WGLEW_ARB_robustness_share_group_isolation = GL_FALSE;
+GLboolean __WGLEW_ATI_pixel_format_float = GL_FALSE;
+GLboolean __WGLEW_ATI_render_texture_rectangle = GL_FALSE;
+GLboolean __WGLEW_EXT_colorspace = GL_FALSE;
+GLboolean __WGLEW_EXT_create_context_es2_profile = GL_FALSE;
+GLboolean __WGLEW_EXT_create_context_es_profile = GL_FALSE;
+GLboolean __WGLEW_EXT_depth_float = GL_FALSE;
+GLboolean __WGLEW_EXT_display_color_table = GL_FALSE;
+GLboolean __WGLEW_EXT_extensions_string = GL_FALSE;
+GLboolean __WGLEW_EXT_framebuffer_sRGB = GL_FALSE;
+GLboolean __WGLEW_EXT_make_current_read = GL_FALSE;
+GLboolean __WGLEW_EXT_multisample = GL_FALSE;
+GLboolean __WGLEW_EXT_pbuffer = GL_FALSE;
+GLboolean __WGLEW_EXT_pixel_format = GL_FALSE;
+GLboolean __WGLEW_EXT_pixel_format_packed_float = GL_FALSE;
+GLboolean __WGLEW_EXT_swap_control = GL_FALSE;
+GLboolean __WGLEW_EXT_swap_control_tear = GL_FALSE;
+GLboolean __WGLEW_I3D_digital_video_control = GL_FALSE;
+GLboolean __WGLEW_I3D_gamma = GL_FALSE;
+GLboolean __WGLEW_I3D_genlock = GL_FALSE;
+GLboolean __WGLEW_I3D_image_buffer = GL_FALSE;
+GLboolean __WGLEW_I3D_swap_frame_lock = GL_FALSE;
+GLboolean __WGLEW_I3D_swap_frame_usage = GL_FALSE;
+GLboolean __WGLEW_NV_DX_interop = GL_FALSE;
+GLboolean __WGLEW_NV_DX_interop2 = GL_FALSE;
+GLboolean __WGLEW_NV_copy_image = GL_FALSE;
+GLboolean __WGLEW_NV_delay_before_swap = GL_FALSE;
+GLboolean __WGLEW_NV_float_buffer = GL_FALSE;
+GLboolean __WGLEW_NV_gpu_affinity = GL_FALSE;
+GLboolean __WGLEW_NV_multisample_coverage = GL_FALSE;
+GLboolean __WGLEW_NV_present_video = GL_FALSE;
+GLboolean __WGLEW_NV_render_depth_texture = GL_FALSE;
+GLboolean __WGLEW_NV_render_texture_rectangle = GL_FALSE;
+GLboolean __WGLEW_NV_swap_group = GL_FALSE;
+GLboolean __WGLEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __WGLEW_NV_video_capture = GL_FALSE;
+GLboolean __WGLEW_NV_video_output = GL_FALSE;
+GLboolean __WGLEW_OML_sync_control = GL_FALSE;
+#ifdef WGL_3DL_stereo_control
+
+static GLboolean _glewInit_WGL_3DL_stereo_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglSetStereoEmitterState3DL = (PFNWGLSETSTEREOEMITTERSTATE3DLPROC)glewGetProcAddress((const GLubyte*)"wglSetStereoEmitterState3DL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_3DL_stereo_control */
+
+#ifdef WGL_AMD_gpu_association
+
+static GLboolean _glewInit_WGL_AMD_gpu_association ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBlitContextFramebufferAMD = (PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC)glewGetProcAddress((const GLubyte*)"wglBlitContextFramebufferAMD")) == NULL) || r;
+  r = ((wglCreateAssociatedContextAMD = (PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglCreateAssociatedContextAMD")) == NULL) || r;
+  r = ((wglCreateAssociatedContextAttribsAMD = (PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC)glewGetProcAddress((const GLubyte*)"wglCreateAssociatedContextAttribsAMD")) == NULL) || r;
+  r = ((wglDeleteAssociatedContextAMD = (PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglDeleteAssociatedContextAMD")) == NULL) || r;
+  r = ((wglGetContextGPUIDAMD = (PFNWGLGETCONTEXTGPUIDAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetContextGPUIDAMD")) == NULL) || r;
+  r = ((wglGetCurrentAssociatedContextAMD = (PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentAssociatedContextAMD")) == NULL) || r;
+  r = ((wglGetGPUIDsAMD = (PFNWGLGETGPUIDSAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetGPUIDsAMD")) == NULL) || r;
+  r = ((wglGetGPUInfoAMD = (PFNWGLGETGPUINFOAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetGPUInfoAMD")) == NULL) || r;
+  r = ((wglMakeAssociatedContextCurrentAMD = (PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC)glewGetProcAddress((const GLubyte*)"wglMakeAssociatedContextCurrentAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_AMD_gpu_association */
+
+#ifdef WGL_ARB_buffer_region
+
+static GLboolean _glewInit_WGL_ARB_buffer_region ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreateBufferRegionARB = (PFNWGLCREATEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateBufferRegionARB")) == NULL) || r;
+  r = ((wglDeleteBufferRegionARB = (PFNWGLDELETEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglDeleteBufferRegionARB")) == NULL) || r;
+  r = ((wglRestoreBufferRegionARB = (PFNWGLRESTOREBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglRestoreBufferRegionARB")) == NULL) || r;
+  r = ((wglSaveBufferRegionARB = (PFNWGLSAVEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglSaveBufferRegionARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_buffer_region */
+
+#ifdef WGL_ARB_create_context
+
+static GLboolean _glewInit_WGL_ARB_create_context ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateContextAttribsARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_create_context */
+
+#ifdef WGL_ARB_extensions_string
+
+static GLboolean _glewInit_WGL_ARB_extensions_string ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_extensions_string */
+
+#ifdef WGL_ARB_make_current_read
+
+static GLboolean _glewInit_WGL_ARB_make_current_read ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetCurrentReadDCARB = (PFNWGLGETCURRENTREADDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCARB")) == NULL) || r;
+  r = ((wglMakeContextCurrentARB = (PFNWGLMAKECONTEXTCURRENTARBPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_make_current_read */
+
+#ifdef WGL_ARB_pbuffer
+
+static GLboolean _glewInit_WGL_ARB_pbuffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreatePbufferARB = (PFNWGLCREATEPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferARB")) == NULL) || r;
+  r = ((wglDestroyPbufferARB = (PFNWGLDESTROYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferARB")) == NULL) || r;
+  r = ((wglGetPbufferDCARB = (PFNWGLGETPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCARB")) == NULL) || r;
+  r = ((wglQueryPbufferARB = (PFNWGLQUERYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferARB")) == NULL) || r;
+  r = ((wglReleasePbufferDCARB = (PFNWGLRELEASEPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_pbuffer */
+
+#ifdef WGL_ARB_pixel_format
+
+static GLboolean _glewInit_WGL_ARB_pixel_format ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatARB")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvARB")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_pixel_format */
+
+#ifdef WGL_ARB_render_texture
+
+static GLboolean _glewInit_WGL_ARB_render_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindTexImageARB = (PFNWGLBINDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglBindTexImageARB")) == NULL) || r;
+  r = ((wglReleaseTexImageARB = (PFNWGLRELEASETEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglReleaseTexImageARB")) == NULL) || r;
+  r = ((wglSetPbufferAttribARB = (PFNWGLSETPBUFFERATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"wglSetPbufferAttribARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_render_texture */
+
+#ifdef WGL_EXT_display_color_table
+
+static GLboolean _glewInit_WGL_EXT_display_color_table ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindDisplayColorTableEXT = (PFNWGLBINDDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglBindDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglCreateDisplayColorTableEXT = (PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglCreateDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglDestroyDisplayColorTableEXT = (PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglLoadDisplayColorTableEXT = (PFNWGLLOADDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglLoadDisplayColorTableEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_display_color_table */
+
+#ifdef WGL_EXT_extensions_string
+
+static GLboolean _glewInit_WGL_EXT_extensions_string ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_extensions_string */
+
+#ifdef WGL_EXT_make_current_read
+
+static GLboolean _glewInit_WGL_EXT_make_current_read ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetCurrentReadDCEXT = (PFNWGLGETCURRENTREADDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCEXT")) == NULL) || r;
+  r = ((wglMakeContextCurrentEXT = (PFNWGLMAKECONTEXTCURRENTEXTPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_make_current_read */
+
+#ifdef WGL_EXT_pbuffer
+
+static GLboolean _glewInit_WGL_EXT_pbuffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreatePbufferEXT = (PFNWGLCREATEPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferEXT")) == NULL) || r;
+  r = ((wglDestroyPbufferEXT = (PFNWGLDESTROYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferEXT")) == NULL) || r;
+  r = ((wglGetPbufferDCEXT = (PFNWGLGETPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCEXT")) == NULL) || r;
+  r = ((wglQueryPbufferEXT = (PFNWGLQUERYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferEXT")) == NULL) || r;
+  r = ((wglReleasePbufferDCEXT = (PFNWGLRELEASEPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_pbuffer */
+
+#ifdef WGL_EXT_pixel_format
+
+static GLboolean _glewInit_WGL_EXT_pixel_format ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglChoosePixelFormatEXT = (PFNWGLCHOOSEPIXELFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatEXT")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribfvEXT = (PFNWGLGETPIXELFORMATATTRIBFVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvEXT")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribivEXT = (PFNWGLGETPIXELFORMATATTRIBIVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_pixel_format */
+
+#ifdef WGL_EXT_swap_control
+
+static GLboolean _glewInit_WGL_EXT_swap_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetSwapIntervalEXT")) == NULL) || r;
+  r = ((wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglSwapIntervalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_swap_control */
+
+#ifdef WGL_I3D_digital_video_control
+
+static GLboolean _glewInit_WGL_I3D_digital_video_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetDigitalVideoParametersI3D = (PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetDigitalVideoParametersI3D")) == NULL) || r;
+  r = ((wglSetDigitalVideoParametersI3D = (PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetDigitalVideoParametersI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_digital_video_control */
+
+#ifdef WGL_I3D_gamma
+
+static GLboolean _glewInit_WGL_I3D_gamma ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetGammaTableI3D = (PFNWGLGETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableI3D")) == NULL) || r;
+  r = ((wglGetGammaTableParametersI3D = (PFNWGLGETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableParametersI3D")) == NULL) || r;
+  r = ((wglSetGammaTableI3D = (PFNWGLSETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableI3D")) == NULL) || r;
+  r = ((wglSetGammaTableParametersI3D = (PFNWGLSETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableParametersI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_gamma */
+
+#ifdef WGL_I3D_genlock
+
+static GLboolean _glewInit_WGL_I3D_genlock ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDisableGenlockI3D = (PFNWGLDISABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableGenlockI3D")) == NULL) || r;
+  r = ((wglEnableGenlockI3D = (PFNWGLENABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableGenlockI3D")) == NULL) || r;
+  r = ((wglGenlockSampleRateI3D = (PFNWGLGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSampleRateI3D")) == NULL) || r;
+  r = ((wglGenlockSourceDelayI3D = (PFNWGLGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceDelayI3D")) == NULL) || r;
+  r = ((wglGenlockSourceEdgeI3D = (PFNWGLGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceEdgeI3D")) == NULL) || r;
+  r = ((wglGenlockSourceI3D = (PFNWGLGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceI3D")) == NULL) || r;
+  r = ((wglGetGenlockSampleRateI3D = (PFNWGLGETGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSampleRateI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceDelayI3D = (PFNWGLGETGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceDelayI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceEdgeI3D = (PFNWGLGETGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceEdgeI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceI3D = (PFNWGLGETGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceI3D")) == NULL) || r;
+  r = ((wglIsEnabledGenlockI3D = (PFNWGLISENABLEDGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledGenlockI3D")) == NULL) || r;
+  r = ((wglQueryGenlockMaxSourceDelayI3D = (PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryGenlockMaxSourceDelayI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_genlock */
+
+#ifdef WGL_I3D_image_buffer
+
+static GLboolean _glewInit_WGL_I3D_image_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglAssociateImageBufferEventsI3D = (PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglAssociateImageBufferEventsI3D")) == NULL) || r;
+  r = ((wglCreateImageBufferI3D = (PFNWGLCREATEIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglCreateImageBufferI3D")) == NULL) || r;
+  r = ((wglDestroyImageBufferI3D = (PFNWGLDESTROYIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglDestroyImageBufferI3D")) == NULL) || r;
+  r = ((wglReleaseImageBufferEventsI3D = (PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglReleaseImageBufferEventsI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_image_buffer */
+
+#ifdef WGL_I3D_swap_frame_lock
+
+static GLboolean _glewInit_WGL_I3D_swap_frame_lock ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDisableFrameLockI3D = (PFNWGLDISABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableFrameLockI3D")) == NULL) || r;
+  r = ((wglEnableFrameLockI3D = (PFNWGLENABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableFrameLockI3D")) == NULL) || r;
+  r = ((wglIsEnabledFrameLockI3D = (PFNWGLISENABLEDFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledFrameLockI3D")) == NULL) || r;
+  r = ((wglQueryFrameLockMasterI3D = (PFNWGLQUERYFRAMELOCKMASTERI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameLockMasterI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_swap_frame_lock */
+
+#ifdef WGL_I3D_swap_frame_usage
+
+static GLboolean _glewInit_WGL_I3D_swap_frame_usage ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBeginFrameTrackingI3D = (PFNWGLBEGINFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglBeginFrameTrackingI3D")) == NULL) || r;
+  r = ((wglEndFrameTrackingI3D = (PFNWGLENDFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglEndFrameTrackingI3D")) == NULL) || r;
+  r = ((wglGetFrameUsageI3D = (PFNWGLGETFRAMEUSAGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetFrameUsageI3D")) == NULL) || r;
+  r = ((wglQueryFrameTrackingI3D = (PFNWGLQUERYFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameTrackingI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_swap_frame_usage */
+
+#ifdef WGL_NV_DX_interop
+
+static GLboolean _glewInit_WGL_NV_DX_interop ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDXCloseDeviceNV = (PFNWGLDXCLOSEDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglDXCloseDeviceNV")) == NULL) || r;
+  r = ((wglDXLockObjectsNV = (PFNWGLDXLOCKOBJECTSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXLockObjectsNV")) == NULL) || r;
+  r = ((wglDXObjectAccessNV = (PFNWGLDXOBJECTACCESSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXObjectAccessNV")) == NULL) || r;
+  r = ((wglDXOpenDeviceNV = (PFNWGLDXOPENDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglDXOpenDeviceNV")) == NULL) || r;
+  r = ((wglDXRegisterObjectNV = (PFNWGLDXREGISTEROBJECTNVPROC)glewGetProcAddress((const GLubyte*)"wglDXRegisterObjectNV")) == NULL) || r;
+  r = ((wglDXSetResourceShareHandleNV = (PFNWGLDXSETRESOURCESHAREHANDLENVPROC)glewGetProcAddress((const GLubyte*)"wglDXSetResourceShareHandleNV")) == NULL) || r;
+  r = ((wglDXUnlockObjectsNV = (PFNWGLDXUNLOCKOBJECTSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXUnlockObjectsNV")) == NULL) || r;
+  r = ((wglDXUnregisterObjectNV = (PFNWGLDXUNREGISTEROBJECTNVPROC)glewGetProcAddress((const GLubyte*)"wglDXUnregisterObjectNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_DX_interop */
+
+#ifdef WGL_NV_copy_image
+
+static GLboolean _glewInit_WGL_NV_copy_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCopyImageSubDataNV = (PFNWGLCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"wglCopyImageSubDataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_copy_image */
+
+#ifdef WGL_NV_delay_before_swap
+
+static GLboolean _glewInit_WGL_NV_delay_before_swap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDelayBeforeSwapNV = (PFNWGLDELAYBEFORESWAPNVPROC)glewGetProcAddress((const GLubyte*)"wglDelayBeforeSwapNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_delay_before_swap */
+
+#ifdef WGL_NV_gpu_affinity
+
+static GLboolean _glewInit_WGL_NV_gpu_affinity ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreateAffinityDCNV = (PFNWGLCREATEAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglCreateAffinityDCNV")) == NULL) || r;
+  r = ((wglDeleteDCNV = (PFNWGLDELETEDCNVPROC)glewGetProcAddress((const GLubyte*)"wglDeleteDCNV")) == NULL) || r;
+  r = ((wglEnumGpuDevicesNV = (PFNWGLENUMGPUDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpuDevicesNV")) == NULL) || r;
+  r = ((wglEnumGpusFromAffinityDCNV = (PFNWGLENUMGPUSFROMAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusFromAffinityDCNV")) == NULL) || r;
+  r = ((wglEnumGpusNV = (PFNWGLENUMGPUSNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_gpu_affinity */
+
+#ifdef WGL_NV_present_video
+
+static GLboolean _glewInit_WGL_NV_present_video ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindVideoDeviceNV = (PFNWGLBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoDeviceNV")) == NULL) || r;
+  r = ((wglEnumerateVideoDevicesNV = (PFNWGLENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoDevicesNV")) == NULL) || r;
+  r = ((wglQueryCurrentContextNV = (PFNWGLQUERYCURRENTCONTEXTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryCurrentContextNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_present_video */
+
+#ifdef WGL_NV_swap_group
+
+static GLboolean _glewInit_WGL_NV_swap_group ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindSwapBarrierNV = (PFNWGLBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"wglBindSwapBarrierNV")) == NULL) || r;
+  r = ((wglJoinSwapGroupNV = (PFNWGLJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglJoinSwapGroupNV")) == NULL) || r;
+  r = ((wglQueryFrameCountNV = (PFNWGLQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameCountNV")) == NULL) || r;
+  r = ((wglQueryMaxSwapGroupsNV = (PFNWGLQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryMaxSwapGroupsNV")) == NULL) || r;
+  r = ((wglQuerySwapGroupNV = (PFNWGLQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglQuerySwapGroupNV")) == NULL) || r;
+  r = ((wglResetFrameCountNV = (PFNWGLRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglResetFrameCountNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_swap_group */
+
+#ifdef WGL_NV_vertex_array_range
+
+static GLboolean _glewInit_WGL_NV_vertex_array_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglAllocateMemoryNV = (PFNWGLALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglAllocateMemoryNV")) == NULL) || r;
+  r = ((wglFreeMemoryNV = (PFNWGLFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglFreeMemoryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_vertex_array_range */
+
+#ifdef WGL_NV_video_capture
+
+static GLboolean _glewInit_WGL_NV_video_capture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindVideoCaptureDeviceNV = (PFNWGLBINDVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((wglEnumerateVideoCaptureDevicesNV = (PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoCaptureDevicesNV")) == NULL) || r;
+  r = ((wglLockVideoCaptureDeviceNV = (PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglLockVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((wglQueryVideoCaptureDeviceNV = (PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglQueryVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((wglReleaseVideoCaptureDeviceNV = (PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoCaptureDeviceNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_video_capture */
+
+#ifdef WGL_NV_video_output
+
+static GLboolean _glewInit_WGL_NV_video_output ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindVideoImageNV = (PFNWGLBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoImageNV")) == NULL) || r;
+  r = ((wglGetVideoDeviceNV = (PFNWGLGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoDeviceNV")) == NULL) || r;
+  r = ((wglGetVideoInfoNV = (PFNWGLGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoInfoNV")) == NULL) || r;
+  r = ((wglReleaseVideoDeviceNV = (PFNWGLRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoDeviceNV")) == NULL) || r;
+  r = ((wglReleaseVideoImageNV = (PFNWGLRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoImageNV")) == NULL) || r;
+  r = ((wglSendPbufferToVideoNV = (PFNWGLSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"wglSendPbufferToVideoNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_video_output */
+
+#ifdef WGL_OML_sync_control
+
+static GLboolean _glewInit_WGL_OML_sync_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetMscRateOML = (PFNWGLGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetMscRateOML")) == NULL) || r;
+  r = ((wglGetSyncValuesOML = (PFNWGLGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetSyncValuesOML")) == NULL) || r;
+  r = ((wglSwapBuffersMscOML = (PFNWGLSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapBuffersMscOML")) == NULL) || r;
+  r = ((wglSwapLayerBuffersMscOML = (PFNWGLSWAPLAYERBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapLayerBuffersMscOML")) == NULL) || r;
+  r = ((wglWaitForMscOML = (PFNWGLWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForMscOML")) == NULL) || r;
+  r = ((wglWaitForSbcOML = (PFNWGLWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForSbcOML")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_OML_sync_control */
+
+/* ------------------------------------------------------------------------- */
+
+static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL;
+static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL;
+
+GLboolean GLEWAPIENTRY wglewGetExtension (const char* name)
+{    
+  const GLubyte* start;
+  const GLubyte* end;
+  if (_wglewGetExtensionsStringARB == NULL)
+    if (_wglewGetExtensionsStringEXT == NULL)
+      return GL_FALSE;
+    else
+      start = (const GLubyte*)_wglewGetExtensionsStringEXT();
+  else
+    start = (const GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC());
+  if (start == 0)
+    return GL_FALSE;
+  end = start + _glewStrLen(start);
+  return _glewSearchExtension(name, start, end);
+}
+
+GLenum GLEWAPIENTRY wglewInit ()
+{
+  GLboolean crippled;
+  const GLubyte* extStart;
+  const GLubyte* extEnd;
+  /* find wgl extension string query functions */
+  _wglewGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB");
+  _wglewGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT");
+  /* query wgl extension string */
+  if (_wglewGetExtensionsStringARB == NULL)
+    if (_wglewGetExtensionsStringEXT == NULL)
+      extStart = (const GLubyte*)"";
+    else
+      extStart = (const GLubyte*)_wglewGetExtensionsStringEXT();
+  else
+    extStart = (const GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC());
+  extEnd = extStart + _glewStrLen(extStart);
+  /* initialize extensions */
+  crippled = _wglewGetExtensionsStringARB == NULL && _wglewGetExtensionsStringEXT == NULL;
+#ifdef WGL_3DFX_multisample
+  WGLEW_3DFX_multisample = _glewSearchExtension("WGL_3DFX_multisample", extStart, extEnd);
+#endif /* WGL_3DFX_multisample */
+#ifdef WGL_3DL_stereo_control
+  WGLEW_3DL_stereo_control = _glewSearchExtension("WGL_3DL_stereo_control", extStart, extEnd);
+  if (glewExperimental || WGLEW_3DL_stereo_control|| crippled) WGLEW_3DL_stereo_control= !_glewInit_WGL_3DL_stereo_control();
+#endif /* WGL_3DL_stereo_control */
+#ifdef WGL_AMD_gpu_association
+  WGLEW_AMD_gpu_association = _glewSearchExtension("WGL_AMD_gpu_association", extStart, extEnd);
+  if (glewExperimental || WGLEW_AMD_gpu_association|| crippled) WGLEW_AMD_gpu_association= !_glewInit_WGL_AMD_gpu_association();
+#endif /* WGL_AMD_gpu_association */
+#ifdef WGL_ARB_buffer_region
+  WGLEW_ARB_buffer_region = _glewSearchExtension("WGL_ARB_buffer_region", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_buffer_region|| crippled) WGLEW_ARB_buffer_region= !_glewInit_WGL_ARB_buffer_region();
+#endif /* WGL_ARB_buffer_region */
+#ifdef WGL_ARB_context_flush_control
+  WGLEW_ARB_context_flush_control = _glewSearchExtension("WGL_ARB_context_flush_control", extStart, extEnd);
+#endif /* WGL_ARB_context_flush_control */
+#ifdef WGL_ARB_create_context
+  WGLEW_ARB_create_context = _glewSearchExtension("WGL_ARB_create_context", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_create_context|| crippled) WGLEW_ARB_create_context= !_glewInit_WGL_ARB_create_context();
+#endif /* WGL_ARB_create_context */
+#ifdef WGL_ARB_create_context_no_error
+  WGLEW_ARB_create_context_no_error = _glewSearchExtension("WGL_ARB_create_context_no_error", extStart, extEnd);
+#endif /* WGL_ARB_create_context_no_error */
+#ifdef WGL_ARB_create_context_profile
+  WGLEW_ARB_create_context_profile = _glewSearchExtension("WGL_ARB_create_context_profile", extStart, extEnd);
+#endif /* WGL_ARB_create_context_profile */
+#ifdef WGL_ARB_create_context_robustness
+  WGLEW_ARB_create_context_robustness = _glewSearchExtension("WGL_ARB_create_context_robustness", extStart, extEnd);
+#endif /* WGL_ARB_create_context_robustness */
+#ifdef WGL_ARB_extensions_string
+  WGLEW_ARB_extensions_string = _glewSearchExtension("WGL_ARB_extensions_string", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_extensions_string|| crippled) WGLEW_ARB_extensions_string= !_glewInit_WGL_ARB_extensions_string();
+#endif /* WGL_ARB_extensions_string */
+#ifdef WGL_ARB_framebuffer_sRGB
+  WGLEW_ARB_framebuffer_sRGB = _glewSearchExtension("WGL_ARB_framebuffer_sRGB", extStart, extEnd);
+#endif /* WGL_ARB_framebuffer_sRGB */
+#ifdef WGL_ARB_make_current_read
+  WGLEW_ARB_make_current_read = _glewSearchExtension("WGL_ARB_make_current_read", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_make_current_read|| crippled) WGLEW_ARB_make_current_read= !_glewInit_WGL_ARB_make_current_read();
+#endif /* WGL_ARB_make_current_read */
+#ifdef WGL_ARB_multisample
+  WGLEW_ARB_multisample = _glewSearchExtension("WGL_ARB_multisample", extStart, extEnd);
+#endif /* WGL_ARB_multisample */
+#ifdef WGL_ARB_pbuffer
+  WGLEW_ARB_pbuffer = _glewSearchExtension("WGL_ARB_pbuffer", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_pbuffer|| crippled) WGLEW_ARB_pbuffer= !_glewInit_WGL_ARB_pbuffer();
+#endif /* WGL_ARB_pbuffer */
+#ifdef WGL_ARB_pixel_format
+  WGLEW_ARB_pixel_format = _glewSearchExtension("WGL_ARB_pixel_format", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_pixel_format|| crippled) WGLEW_ARB_pixel_format= !_glewInit_WGL_ARB_pixel_format();
+#endif /* WGL_ARB_pixel_format */
+#ifdef WGL_ARB_pixel_format_float
+  WGLEW_ARB_pixel_format_float = _glewSearchExtension("WGL_ARB_pixel_format_float", extStart, extEnd);
+#endif /* WGL_ARB_pixel_format_float */
+#ifdef WGL_ARB_render_texture
+  WGLEW_ARB_render_texture = _glewSearchExtension("WGL_ARB_render_texture", extStart, extEnd);
+  if (glewExperimental || WGLEW_ARB_render_texture|| crippled) WGLEW_ARB_render_texture= !_glewInit_WGL_ARB_render_texture();
+#endif /* WGL_ARB_render_texture */
+#ifdef WGL_ARB_robustness_application_isolation
+  WGLEW_ARB_robustness_application_isolation = _glewSearchExtension("WGL_ARB_robustness_application_isolation", extStart, extEnd);
+#endif /* WGL_ARB_robustness_application_isolation */
+#ifdef WGL_ARB_robustness_share_group_isolation
+  WGLEW_ARB_robustness_share_group_isolation = _glewSearchExtension("WGL_ARB_robustness_share_group_isolation", extStart, extEnd);
+#endif /* WGL_ARB_robustness_share_group_isolation */
+#ifdef WGL_ATI_pixel_format_float
+  WGLEW_ATI_pixel_format_float = _glewSearchExtension("WGL_ATI_pixel_format_float", extStart, extEnd);
+#endif /* WGL_ATI_pixel_format_float */
+#ifdef WGL_ATI_render_texture_rectangle
+  WGLEW_ATI_render_texture_rectangle = _glewSearchExtension("WGL_ATI_render_texture_rectangle", extStart, extEnd);
+#endif /* WGL_ATI_render_texture_rectangle */
+#ifdef WGL_EXT_colorspace
+  WGLEW_EXT_colorspace = _glewSearchExtension("WGL_EXT_colorspace", extStart, extEnd);
+#endif /* WGL_EXT_colorspace */
+#ifdef WGL_EXT_create_context_es2_profile
+  WGLEW_EXT_create_context_es2_profile = _glewSearchExtension("WGL_EXT_create_context_es2_profile", extStart, extEnd);
+#endif /* WGL_EXT_create_context_es2_profile */
+#ifdef WGL_EXT_create_context_es_profile
+  WGLEW_EXT_create_context_es_profile = _glewSearchExtension("WGL_EXT_create_context_es_profile", extStart, extEnd);
+#endif /* WGL_EXT_create_context_es_profile */
+#ifdef WGL_EXT_depth_float
+  WGLEW_EXT_depth_float = _glewSearchExtension("WGL_EXT_depth_float", extStart, extEnd);
+#endif /* WGL_EXT_depth_float */
+#ifdef WGL_EXT_display_color_table
+  WGLEW_EXT_display_color_table = _glewSearchExtension("WGL_EXT_display_color_table", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_display_color_table|| crippled) WGLEW_EXT_display_color_table= !_glewInit_WGL_EXT_display_color_table();
+#endif /* WGL_EXT_display_color_table */
+#ifdef WGL_EXT_extensions_string
+  WGLEW_EXT_extensions_string = _glewSearchExtension("WGL_EXT_extensions_string", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_extensions_string|| crippled) WGLEW_EXT_extensions_string= !_glewInit_WGL_EXT_extensions_string();
+#endif /* WGL_EXT_extensions_string */
+#ifdef WGL_EXT_framebuffer_sRGB
+  WGLEW_EXT_framebuffer_sRGB = _glewSearchExtension("WGL_EXT_framebuffer_sRGB", extStart, extEnd);
+#endif /* WGL_EXT_framebuffer_sRGB */
+#ifdef WGL_EXT_make_current_read
+  WGLEW_EXT_make_current_read = _glewSearchExtension("WGL_EXT_make_current_read", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_make_current_read|| crippled) WGLEW_EXT_make_current_read= !_glewInit_WGL_EXT_make_current_read();
+#endif /* WGL_EXT_make_current_read */
+#ifdef WGL_EXT_multisample
+  WGLEW_EXT_multisample = _glewSearchExtension("WGL_EXT_multisample", extStart, extEnd);
+#endif /* WGL_EXT_multisample */
+#ifdef WGL_EXT_pbuffer
+  WGLEW_EXT_pbuffer = _glewSearchExtension("WGL_EXT_pbuffer", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_pbuffer|| crippled) WGLEW_EXT_pbuffer= !_glewInit_WGL_EXT_pbuffer();
+#endif /* WGL_EXT_pbuffer */
+#ifdef WGL_EXT_pixel_format
+  WGLEW_EXT_pixel_format = _glewSearchExtension("WGL_EXT_pixel_format", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_pixel_format|| crippled) WGLEW_EXT_pixel_format= !_glewInit_WGL_EXT_pixel_format();
+#endif /* WGL_EXT_pixel_format */
+#ifdef WGL_EXT_pixel_format_packed_float
+  WGLEW_EXT_pixel_format_packed_float = _glewSearchExtension("WGL_EXT_pixel_format_packed_float", extStart, extEnd);
+#endif /* WGL_EXT_pixel_format_packed_float */
+#ifdef WGL_EXT_swap_control
+  WGLEW_EXT_swap_control = _glewSearchExtension("WGL_EXT_swap_control", extStart, extEnd);
+  if (glewExperimental || WGLEW_EXT_swap_control|| crippled) WGLEW_EXT_swap_control= !_glewInit_WGL_EXT_swap_control();
+#endif /* WGL_EXT_swap_control */
+#ifdef WGL_EXT_swap_control_tear
+  WGLEW_EXT_swap_control_tear = _glewSearchExtension("WGL_EXT_swap_control_tear", extStart, extEnd);
+#endif /* WGL_EXT_swap_control_tear */
+#ifdef WGL_I3D_digital_video_control
+  WGLEW_I3D_digital_video_control = _glewSearchExtension("WGL_I3D_digital_video_control", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_digital_video_control|| crippled) WGLEW_I3D_digital_video_control= !_glewInit_WGL_I3D_digital_video_control();
+#endif /* WGL_I3D_digital_video_control */
+#ifdef WGL_I3D_gamma
+  WGLEW_I3D_gamma = _glewSearchExtension("WGL_I3D_gamma", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_gamma|| crippled) WGLEW_I3D_gamma= !_glewInit_WGL_I3D_gamma();
+#endif /* WGL_I3D_gamma */
+#ifdef WGL_I3D_genlock
+  WGLEW_I3D_genlock = _glewSearchExtension("WGL_I3D_genlock", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_genlock|| crippled) WGLEW_I3D_genlock= !_glewInit_WGL_I3D_genlock();
+#endif /* WGL_I3D_genlock */
+#ifdef WGL_I3D_image_buffer
+  WGLEW_I3D_image_buffer = _glewSearchExtension("WGL_I3D_image_buffer", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_image_buffer|| crippled) WGLEW_I3D_image_buffer= !_glewInit_WGL_I3D_image_buffer();
+#endif /* WGL_I3D_image_buffer */
+#ifdef WGL_I3D_swap_frame_lock
+  WGLEW_I3D_swap_frame_lock = _glewSearchExtension("WGL_I3D_swap_frame_lock", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_swap_frame_lock|| crippled) WGLEW_I3D_swap_frame_lock= !_glewInit_WGL_I3D_swap_frame_lock();
+#endif /* WGL_I3D_swap_frame_lock */
+#ifdef WGL_I3D_swap_frame_usage
+  WGLEW_I3D_swap_frame_usage = _glewSearchExtension("WGL_I3D_swap_frame_usage", extStart, extEnd);
+  if (glewExperimental || WGLEW_I3D_swap_frame_usage|| crippled) WGLEW_I3D_swap_frame_usage= !_glewInit_WGL_I3D_swap_frame_usage();
+#endif /* WGL_I3D_swap_frame_usage */
+#ifdef WGL_NV_DX_interop
+  WGLEW_NV_DX_interop = _glewSearchExtension("WGL_NV_DX_interop", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_DX_interop|| crippled) WGLEW_NV_DX_interop= !_glewInit_WGL_NV_DX_interop();
+#endif /* WGL_NV_DX_interop */
+#ifdef WGL_NV_DX_interop2
+  WGLEW_NV_DX_interop2 = _glewSearchExtension("WGL_NV_DX_interop2", extStart, extEnd);
+#endif /* WGL_NV_DX_interop2 */
+#ifdef WGL_NV_copy_image
+  WGLEW_NV_copy_image = _glewSearchExtension("WGL_NV_copy_image", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_copy_image|| crippled) WGLEW_NV_copy_image= !_glewInit_WGL_NV_copy_image();
+#endif /* WGL_NV_copy_image */
+#ifdef WGL_NV_delay_before_swap
+  WGLEW_NV_delay_before_swap = _glewSearchExtension("WGL_NV_delay_before_swap", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_delay_before_swap|| crippled) WGLEW_NV_delay_before_swap= !_glewInit_WGL_NV_delay_before_swap();
+#endif /* WGL_NV_delay_before_swap */
+#ifdef WGL_NV_float_buffer
+  WGLEW_NV_float_buffer = _glewSearchExtension("WGL_NV_float_buffer", extStart, extEnd);
+#endif /* WGL_NV_float_buffer */
+#ifdef WGL_NV_gpu_affinity
+  WGLEW_NV_gpu_affinity = _glewSearchExtension("WGL_NV_gpu_affinity", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_gpu_affinity|| crippled) WGLEW_NV_gpu_affinity= !_glewInit_WGL_NV_gpu_affinity();
+#endif /* WGL_NV_gpu_affinity */
+#ifdef WGL_NV_multisample_coverage
+  WGLEW_NV_multisample_coverage = _glewSearchExtension("WGL_NV_multisample_coverage", extStart, extEnd);
+#endif /* WGL_NV_multisample_coverage */
+#ifdef WGL_NV_present_video
+  WGLEW_NV_present_video = _glewSearchExtension("WGL_NV_present_video", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_present_video|| crippled) WGLEW_NV_present_video= !_glewInit_WGL_NV_present_video();
+#endif /* WGL_NV_present_video */
+#ifdef WGL_NV_render_depth_texture
+  WGLEW_NV_render_depth_texture = _glewSearchExtension("WGL_NV_render_depth_texture", extStart, extEnd);
+#endif /* WGL_NV_render_depth_texture */
+#ifdef WGL_NV_render_texture_rectangle
+  WGLEW_NV_render_texture_rectangle = _glewSearchExtension("WGL_NV_render_texture_rectangle", extStart, extEnd);
+#endif /* WGL_NV_render_texture_rectangle */
+#ifdef WGL_NV_swap_group
+  WGLEW_NV_swap_group = _glewSearchExtension("WGL_NV_swap_group", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_swap_group|| crippled) WGLEW_NV_swap_group= !_glewInit_WGL_NV_swap_group();
+#endif /* WGL_NV_swap_group */
+#ifdef WGL_NV_vertex_array_range
+  WGLEW_NV_vertex_array_range = _glewSearchExtension("WGL_NV_vertex_array_range", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_vertex_array_range|| crippled) WGLEW_NV_vertex_array_range= !_glewInit_WGL_NV_vertex_array_range();
+#endif /* WGL_NV_vertex_array_range */
+#ifdef WGL_NV_video_capture
+  WGLEW_NV_video_capture = _glewSearchExtension("WGL_NV_video_capture", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_video_capture|| crippled) WGLEW_NV_video_capture= !_glewInit_WGL_NV_video_capture();
+#endif /* WGL_NV_video_capture */
+#ifdef WGL_NV_video_output
+  WGLEW_NV_video_output = _glewSearchExtension("WGL_NV_video_output", extStart, extEnd);
+  if (glewExperimental || WGLEW_NV_video_output|| crippled) WGLEW_NV_video_output= !_glewInit_WGL_NV_video_output();
+#endif /* WGL_NV_video_output */
+#ifdef WGL_OML_sync_control
+  WGLEW_OML_sync_control = _glewSearchExtension("WGL_OML_sync_control", extStart, extEnd);
+  if (glewExperimental || WGLEW_OML_sync_control|| crippled) WGLEW_OML_sync_control= !_glewInit_WGL_OML_sync_control();
+#endif /* WGL_OML_sync_control */
+
+  return GLEW_OK;
+}
+
+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
+
+PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL;
+
+PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig = NULL;
+PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext = NULL;
+PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer = NULL;
+PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap = NULL;
+PFNGLXCREATEWINDOWPROC __glewXCreateWindow = NULL;
+PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer = NULL;
+PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap = NULL;
+PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow = NULL;
+PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable = NULL;
+PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib = NULL;
+PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs = NULL;
+PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent = NULL;
+PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig = NULL;
+PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent = NULL;
+PFNGLXQUERYCONTEXTPROC __glewXQueryContext = NULL;
+PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable = NULL;
+PFNGLXSELECTEVENTPROC __glewXSelectEvent = NULL;
+
+PFNGLXBLITCONTEXTFRAMEBUFFERAMDPROC __glewXBlitContextFramebufferAMD = NULL;
+PFNGLXCREATEASSOCIATEDCONTEXTAMDPROC __glewXCreateAssociatedContextAMD = NULL;
+PFNGLXCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __glewXCreateAssociatedContextAttribsAMD = NULL;
+PFNGLXDELETEASSOCIATEDCONTEXTAMDPROC __glewXDeleteAssociatedContextAMD = NULL;
+PFNGLXGETCONTEXTGPUIDAMDPROC __glewXGetContextGPUIDAMD = NULL;
+PFNGLXGETCURRENTASSOCIATEDCONTEXTAMDPROC __glewXGetCurrentAssociatedContextAMD = NULL;
+PFNGLXGETGPUIDSAMDPROC __glewXGetGPUIDsAMD = NULL;
+PFNGLXGETGPUINFOAMDPROC __glewXGetGPUInfoAMD = NULL;
+PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __glewXMakeAssociatedContextCurrentAMD = NULL;
+
+PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB = NULL;
+
+PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI = NULL;
+PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI = NULL;
+PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI = NULL;
+
+PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT = NULL;
+PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT = NULL;
+PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT = NULL;
+PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT = NULL;
+
+PFNGLXSWAPINTERVALEXTPROC __glewXSwapIntervalEXT = NULL;
+
+PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT = NULL;
+PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT = NULL;
+
+PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA = NULL;
+
+PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA = NULL;
+
+PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA = NULL;
+
+PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC __glewXQueryCurrentRendererIntegerMESA = NULL;
+PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC __glewXQueryCurrentRendererStringMESA = NULL;
+PFNGLXQUERYRENDERERINTEGERMESAPROC __glewXQueryRendererIntegerMESA = NULL;
+PFNGLXQUERYRENDERERSTRINGMESAPROC __glewXQueryRendererStringMESA = NULL;
+
+PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA = NULL;
+
+PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA = NULL;
+
+PFNGLXGETSWAPINTERVALMESAPROC __glewXGetSwapIntervalMESA = NULL;
+PFNGLXSWAPINTERVALMESAPROC __glewXSwapIntervalMESA = NULL;
+
+PFNGLXCOPYBUFFERSUBDATANVPROC __glewXCopyBufferSubDataNV = NULL;
+PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC __glewXNamedCopyBufferSubDataNV = NULL;
+
+PFNGLXCOPYIMAGESUBDATANVPROC __glewXCopyImageSubDataNV = NULL;
+
+PFNGLXDELAYBEFORESWAPNVPROC __glewXDelayBeforeSwapNV = NULL;
+
+PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV = NULL;
+PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV = NULL;
+
+PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV = NULL;
+PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV = NULL;
+PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV = NULL;
+PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV = NULL;
+PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV = NULL;
+PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV = NULL;
+
+PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV = NULL;
+PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV = NULL;
+
+PFNGLXBINDVIDEOCAPTUREDEVICENVPROC __glewXBindVideoCaptureDeviceNV = NULL;
+PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC __glewXEnumerateVideoCaptureDevicesNV = NULL;
+PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC __glewXLockVideoCaptureDeviceNV = NULL;
+PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC __glewXQueryVideoCaptureDeviceNV = NULL;
+PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC __glewXReleaseVideoCaptureDeviceNV = NULL;
+
+PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV = NULL;
+PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV = NULL;
+PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV = NULL;
+PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV = NULL;
+PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV = NULL;
+PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV = NULL;
+
+PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL;
+PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML = NULL;
+PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML = NULL;
+PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML = NULL;
+PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL;
+
+PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX = NULL;
+PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX = NULL;
+PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX = NULL;
+PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX = NULL;
+PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX = NULL;
+PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX = NULL;
+
+PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX = NULL;
+PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX = NULL;
+PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX = NULL;
+PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX = NULL;
+PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX = NULL;
+PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX = NULL;
+PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX = NULL;
+PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX = NULL;
+
+PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX = NULL;
+PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX = NULL;
+PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX = NULL;
+PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX = NULL;
+PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX = NULL;
+
+PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX = NULL;
+PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX = NULL;
+
+PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX = NULL;
+
+PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX = NULL;
+PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX = NULL;
+PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX = NULL;
+PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX = NULL;
+PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX = NULL;
+
+PFNGLXCUSHIONSGIPROC __glewXCushionSGI = NULL;
+
+PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI = NULL;
+PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI = NULL;
+
+PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI = NULL;
+
+PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI = NULL;
+PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI = NULL;
+
+PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN = NULL;
+
+PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN = NULL;
+PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN = NULL;
+
+GLboolean __GLXEW_VERSION_1_0 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_1 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_2 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_3 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_4 = GL_FALSE;
+GLboolean __GLXEW_3DFX_multisample = GL_FALSE;
+GLboolean __GLXEW_AMD_gpu_association = GL_FALSE;
+GLboolean __GLXEW_ARB_context_flush_control = GL_FALSE;
+GLboolean __GLXEW_ARB_create_context = GL_FALSE;
+GLboolean __GLXEW_ARB_create_context_no_error = GL_FALSE;
+GLboolean __GLXEW_ARB_create_context_profile = GL_FALSE;
+GLboolean __GLXEW_ARB_create_context_robustness = GL_FALSE;
+GLboolean __GLXEW_ARB_fbconfig_float = GL_FALSE;
+GLboolean __GLXEW_ARB_framebuffer_sRGB = GL_FALSE;
+GLboolean __GLXEW_ARB_get_proc_address = GL_FALSE;
+GLboolean __GLXEW_ARB_multisample = GL_FALSE;
+GLboolean __GLXEW_ARB_robustness_application_isolation = GL_FALSE;
+GLboolean __GLXEW_ARB_robustness_share_group_isolation = GL_FALSE;
+GLboolean __GLXEW_ARB_vertex_buffer_object = GL_FALSE;
+GLboolean __GLXEW_ATI_pixel_format_float = GL_FALSE;
+GLboolean __GLXEW_ATI_render_texture = GL_FALSE;
+GLboolean __GLXEW_EXT_buffer_age = GL_FALSE;
+GLboolean __GLXEW_EXT_create_context_es2_profile = GL_FALSE;
+GLboolean __GLXEW_EXT_create_context_es_profile = GL_FALSE;
+GLboolean __GLXEW_EXT_fbconfig_packed_float = GL_FALSE;
+GLboolean __GLXEW_EXT_framebuffer_sRGB = GL_FALSE;
+GLboolean __GLXEW_EXT_import_context = GL_FALSE;
+GLboolean __GLXEW_EXT_libglvnd = GL_FALSE;
+GLboolean __GLXEW_EXT_scene_marker = GL_FALSE;
+GLboolean __GLXEW_EXT_stereo_tree = GL_FALSE;
+GLboolean __GLXEW_EXT_swap_control = GL_FALSE;
+GLboolean __GLXEW_EXT_swap_control_tear = GL_FALSE;
+GLboolean __GLXEW_EXT_texture_from_pixmap = GL_FALSE;
+GLboolean __GLXEW_EXT_visual_info = GL_FALSE;
+GLboolean __GLXEW_EXT_visual_rating = GL_FALSE;
+GLboolean __GLXEW_INTEL_swap_event = GL_FALSE;
+GLboolean __GLXEW_MESA_agp_offset = GL_FALSE;
+GLboolean __GLXEW_MESA_copy_sub_buffer = GL_FALSE;
+GLboolean __GLXEW_MESA_pixmap_colormap = GL_FALSE;
+GLboolean __GLXEW_MESA_query_renderer = GL_FALSE;
+GLboolean __GLXEW_MESA_release_buffers = GL_FALSE;
+GLboolean __GLXEW_MESA_set_3dfx_mode = GL_FALSE;
+GLboolean __GLXEW_MESA_swap_control = GL_FALSE;
+GLboolean __GLXEW_NV_copy_buffer = GL_FALSE;
+GLboolean __GLXEW_NV_copy_image = GL_FALSE;
+GLboolean __GLXEW_NV_delay_before_swap = GL_FALSE;
+GLboolean __GLXEW_NV_float_buffer = GL_FALSE;
+GLboolean __GLXEW_NV_multisample_coverage = GL_FALSE;
+GLboolean __GLXEW_NV_present_video = GL_FALSE;
+GLboolean __GLXEW_NV_robustness_video_memory_purge = GL_FALSE;
+GLboolean __GLXEW_NV_swap_group = GL_FALSE;
+GLboolean __GLXEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __GLXEW_NV_video_capture = GL_FALSE;
+GLboolean __GLXEW_NV_video_out = GL_FALSE;
+GLboolean __GLXEW_OML_swap_method = GL_FALSE;
+GLboolean __GLXEW_OML_sync_control = GL_FALSE;
+GLboolean __GLXEW_SGIS_blended_overlay = GL_FALSE;
+GLboolean __GLXEW_SGIS_color_range = GL_FALSE;
+GLboolean __GLXEW_SGIS_multisample = GL_FALSE;
+GLboolean __GLXEW_SGIS_shared_multisample = GL_FALSE;
+GLboolean __GLXEW_SGIX_fbconfig = GL_FALSE;
+GLboolean __GLXEW_SGIX_hyperpipe = GL_FALSE;
+GLboolean __GLXEW_SGIX_pbuffer = GL_FALSE;
+GLboolean __GLXEW_SGIX_swap_barrier = GL_FALSE;
+GLboolean __GLXEW_SGIX_swap_group = GL_FALSE;
+GLboolean __GLXEW_SGIX_video_resize = GL_FALSE;
+GLboolean __GLXEW_SGIX_visual_select_group = GL_FALSE;
+GLboolean __GLXEW_SGI_cushion = GL_FALSE;
+GLboolean __GLXEW_SGI_make_current_read = GL_FALSE;
+GLboolean __GLXEW_SGI_swap_control = GL_FALSE;
+GLboolean __GLXEW_SGI_video_sync = GL_FALSE;
+GLboolean __GLXEW_SUN_get_transparent_index = GL_FALSE;
+GLboolean __GLXEW_SUN_video_resize = GL_FALSE;
+#ifdef GLX_VERSION_1_2
+
+static GLboolean _glewInit_GLX_VERSION_1_2 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_VERSION_1_2 */
+
+#ifdef GLX_VERSION_1_3
+
+static GLboolean _glewInit_GLX_VERSION_1_3 ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfig")) == NULL) || r;
+  r = ((glXCreateNewContext = (PFNGLXCREATENEWCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXCreateNewContext")) == NULL) || r;
+  r = ((glXCreatePbuffer = (PFNGLXCREATEPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXCreatePbuffer")) == NULL) || r;
+  r = ((glXCreatePixmap = (PFNGLXCREATEPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXCreatePixmap")) == NULL) || r;
+  r = ((glXCreateWindow = (PFNGLXCREATEWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXCreateWindow")) == NULL) || r;
+  r = ((glXDestroyPbuffer = (PFNGLXDESTROYPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPbuffer")) == NULL) || r;
+  r = ((glXDestroyPixmap = (PFNGLXDESTROYPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPixmap")) == NULL) || r;
+  r = ((glXDestroyWindow = (PFNGLXDESTROYWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXDestroyWindow")) == NULL) || r;
+  r = ((glXGetCurrentReadDrawable = (PFNGLXGETCURRENTREADDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawable")) == NULL) || r;
+  r = ((glXGetFBConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttrib")) == NULL) || r;
+  r = ((glXGetFBConfigs = (PFNGLXGETFBCONFIGSPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigs")) == NULL) || r;
+  r = ((glXGetSelectedEvent = (PFNGLXGETSELECTEDEVENTPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEvent")) == NULL) || r;
+  r = ((glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfig")) == NULL) || r;
+  r = ((glXMakeContextCurrent = (PFNGLXMAKECONTEXTCURRENTPROC)glewGetProcAddress((const GLubyte*)"glXMakeContextCurrent")) == NULL) || r;
+  r = ((glXQueryContext = (PFNGLXQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContext")) == NULL) || r;
+  r = ((glXQueryDrawable = (PFNGLXQUERYDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXQueryDrawable")) == NULL) || r;
+  r = ((glXSelectEvent = (PFNGLXSELECTEVENTPROC)glewGetProcAddress((const GLubyte*)"glXSelectEvent")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_VERSION_1_3 */
+
+#ifdef GLX_AMD_gpu_association
+
+static GLboolean _glewInit_GLX_AMD_gpu_association ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBlitContextFramebufferAMD = (PFNGLXBLITCONTEXTFRAMEBUFFERAMDPROC)glewGetProcAddress((const GLubyte*)"glXBlitContextFramebufferAMD")) == NULL) || r;
+  r = ((glXCreateAssociatedContextAMD = (PFNGLXCREATEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"glXCreateAssociatedContextAMD")) == NULL) || r;
+  r = ((glXCreateAssociatedContextAttribsAMD = (PFNGLXCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC)glewGetProcAddress((const GLubyte*)"glXCreateAssociatedContextAttribsAMD")) == NULL) || r;
+  r = ((glXDeleteAssociatedContextAMD = (PFNGLXDELETEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"glXDeleteAssociatedContextAMD")) == NULL) || r;
+  r = ((glXGetContextGPUIDAMD = (PFNGLXGETCONTEXTGPUIDAMDPROC)glewGetProcAddress((const GLubyte*)"glXGetContextGPUIDAMD")) == NULL) || r;
+  r = ((glXGetCurrentAssociatedContextAMD = (PFNGLXGETCURRENTASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentAssociatedContextAMD")) == NULL) || r;
+  r = ((glXGetGPUIDsAMD = (PFNGLXGETGPUIDSAMDPROC)glewGetProcAddress((const GLubyte*)"glXGetGPUIDsAMD")) == NULL) || r;
+  r = ((glXGetGPUInfoAMD = (PFNGLXGETGPUINFOAMDPROC)glewGetProcAddress((const GLubyte*)"glXGetGPUInfoAMD")) == NULL) || r;
+  r = ((glXMakeAssociatedContextCurrentAMD = (PFNGLXMAKEASSOCIATEDCONTEXTCURRENTAMDPROC)glewGetProcAddress((const GLubyte*)"glXMakeAssociatedContextCurrentAMD")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_AMD_gpu_association */
+
+#ifdef GLX_ARB_create_context
+
+static GLboolean _glewInit_GLX_ARB_create_context ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_ARB_create_context */
+
+#ifdef GLX_ATI_render_texture
+
+static GLboolean _glewInit_GLX_ATI_render_texture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindTexImageATI = (PFNGLXBINDTEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageATI")) == NULL) || r;
+  r = ((glXDrawableAttribATI = (PFNGLXDRAWABLEATTRIBATIPROC)glewGetProcAddress((const GLubyte*)"glXDrawableAttribATI")) == NULL) || r;
+  r = ((glXReleaseTexImageATI = (PFNGLXRELEASETEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_ATI_render_texture */
+
+#ifdef GLX_EXT_import_context
+
+static GLboolean _glewInit_GLX_EXT_import_context ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXFreeContextEXT = (PFNGLXFREECONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXFreeContextEXT")) == NULL) || r;
+  r = ((glXGetContextIDEXT = (PFNGLXGETCONTEXTIDEXTPROC)glewGetProcAddress((const GLubyte*)"glXGetContextIDEXT")) == NULL) || r;
+  r = ((glXImportContextEXT = (PFNGLXIMPORTCONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXImportContextEXT")) == NULL) || r;
+  r = ((glXQueryContextInfoEXT = (PFNGLXQUERYCONTEXTINFOEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContextInfoEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_EXT_import_context */
+
+#ifdef GLX_EXT_swap_control
+
+static GLboolean _glewInit_GLX_EXT_swap_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_EXT_swap_control */
+
+#ifdef GLX_EXT_texture_from_pixmap
+
+static GLboolean _glewInit_GLX_EXT_texture_from_pixmap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageEXT")) == NULL) || r;
+  r = ((glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_EXT_texture_from_pixmap */
+
+#ifdef GLX_MESA_agp_offset
+
+static GLboolean _glewInit_GLX_MESA_agp_offset ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetAGPOffsetMESA = (PFNGLXGETAGPOFFSETMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetAGPOffsetMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_agp_offset */
+
+#ifdef GLX_MESA_copy_sub_buffer
+
+static GLboolean _glewInit_GLX_MESA_copy_sub_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)glewGetProcAddress((const GLubyte*)"glXCopySubBufferMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_copy_sub_buffer */
+
+#ifdef GLX_MESA_pixmap_colormap
+
+static GLboolean _glewInit_GLX_MESA_pixmap_colormap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCreateGLXPixmapMESA = (PFNGLXCREATEGLXPIXMAPMESAPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_pixmap_colormap */
+
+#ifdef GLX_MESA_query_renderer
+
+static GLboolean _glewInit_GLX_MESA_query_renderer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXQueryCurrentRendererIntegerMESA = (PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC)glewGetProcAddress((const GLubyte*)"glXQueryCurrentRendererIntegerMESA")) == NULL) || r;
+  r = ((glXQueryCurrentRendererStringMESA = (PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC)glewGetProcAddress((const GLubyte*)"glXQueryCurrentRendererStringMESA")) == NULL) || r;
+  r = ((glXQueryRendererIntegerMESA = (PFNGLXQUERYRENDERERINTEGERMESAPROC)glewGetProcAddress((const GLubyte*)"glXQueryRendererIntegerMESA")) == NULL) || r;
+  r = ((glXQueryRendererStringMESA = (PFNGLXQUERYRENDERERSTRINGMESAPROC)glewGetProcAddress((const GLubyte*)"glXQueryRendererStringMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_query_renderer */
+
+#ifdef GLX_MESA_release_buffers
+
+static GLboolean _glewInit_GLX_MESA_release_buffers ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXReleaseBuffersMESA = (PFNGLXRELEASEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glXReleaseBuffersMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_release_buffers */
+
+#ifdef GLX_MESA_set_3dfx_mode
+
+static GLboolean _glewInit_GLX_MESA_set_3dfx_mode ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXSet3DfxModeMESA = (PFNGLXSET3DFXMODEMESAPROC)glewGetProcAddress((const GLubyte*)"glXSet3DfxModeMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_set_3dfx_mode */
+
+#ifdef GLX_MESA_swap_control
+
+static GLboolean _glewInit_GLX_MESA_swap_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetSwapIntervalMESA = (PFNGLXGETSWAPINTERVALMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetSwapIntervalMESA")) == NULL) || r;
+  r = ((glXSwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_swap_control */
+
+#ifdef GLX_NV_copy_buffer
+
+static GLboolean _glewInit_GLX_NV_copy_buffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCopyBufferSubDataNV = (PFNGLXCOPYBUFFERSUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glXCopyBufferSubDataNV")) == NULL) || r;
+  r = ((glXNamedCopyBufferSubDataNV = (PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glXNamedCopyBufferSubDataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_copy_buffer */
+
+#ifdef GLX_NV_copy_image
+
+static GLboolean _glewInit_GLX_NV_copy_image ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCopyImageSubDataNV = (PFNGLXCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glXCopyImageSubDataNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_copy_image */
+
+#ifdef GLX_NV_delay_before_swap
+
+static GLboolean _glewInit_GLX_NV_delay_before_swap ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXDelayBeforeSwapNV = (PFNGLXDELAYBEFORESWAPNVPROC)glewGetProcAddress((const GLubyte*)"glXDelayBeforeSwapNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_delay_before_swap */
+
+#ifdef GLX_NV_present_video
+
+static GLboolean _glewInit_GLX_NV_present_video ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindVideoDeviceNV = (PFNGLXBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoDeviceNV")) == NULL) || r;
+  r = ((glXEnumerateVideoDevicesNV = (PFNGLXENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoDevicesNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_present_video */
+
+#ifdef GLX_NV_swap_group
+
+static GLboolean _glewInit_GLX_NV_swap_group ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindSwapBarrierNV = (PFNGLXBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierNV")) == NULL) || r;
+  r = ((glXJoinSwapGroupNV = (PFNGLXJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupNV")) == NULL) || r;
+  r = ((glXQueryFrameCountNV = (PFNGLXQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryFrameCountNV")) == NULL) || r;
+  r = ((glXQueryMaxSwapGroupsNV = (PFNGLXQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapGroupsNV")) == NULL) || r;
+  r = ((glXQuerySwapGroupNV = (PFNGLXQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXQuerySwapGroupNV")) == NULL) || r;
+  r = ((glXResetFrameCountNV = (PFNGLXRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXResetFrameCountNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_swap_group */
+
+#ifdef GLX_NV_vertex_array_range
+
+static GLboolean _glewInit_GLX_NV_vertex_array_range ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXAllocateMemoryNV = (PFNGLXALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXAllocateMemoryNV")) == NULL) || r;
+  r = ((glXFreeMemoryNV = (PFNGLXFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXFreeMemoryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_vertex_array_range */
+
+#ifdef GLX_NV_video_capture
+
+static GLboolean _glewInit_GLX_NV_video_capture ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindVideoCaptureDeviceNV = (PFNGLXBINDVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((glXEnumerateVideoCaptureDevicesNV = (PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoCaptureDevicesNV")) == NULL) || r;
+  r = ((glXLockVideoCaptureDeviceNV = (PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXLockVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((glXQueryVideoCaptureDeviceNV = (PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXQueryVideoCaptureDeviceNV")) == NULL) || r;
+  r = ((glXReleaseVideoCaptureDeviceNV = (PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoCaptureDeviceNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_video_capture */
+
+#ifdef GLX_NV_video_out
+
+static GLboolean _glewInit_GLX_NV_video_out ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindVideoImageNV = (PFNGLXBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoImageNV")) == NULL) || r;
+  r = ((glXGetVideoDeviceNV = (PFNGLXGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoDeviceNV")) == NULL) || r;
+  r = ((glXGetVideoInfoNV = (PFNGLXGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoInfoNV")) == NULL) || r;
+  r = ((glXReleaseVideoDeviceNV = (PFNGLXRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoDeviceNV")) == NULL) || r;
+  r = ((glXReleaseVideoImageNV = (PFNGLXRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoImageNV")) == NULL) || r;
+  r = ((glXSendPbufferToVideoNV = (PFNGLXSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"glXSendPbufferToVideoNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_video_out */
+
+#ifdef GLX_OML_sync_control
+
+static GLboolean _glewInit_GLX_OML_sync_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetMscRateOML = (PFNGLXGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetMscRateOML")) == NULL) || r;
+  r = ((glXGetSyncValuesOML = (PFNGLXGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetSyncValuesOML")) == NULL) || r;
+  r = ((glXSwapBuffersMscOML = (PFNGLXSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXSwapBuffersMscOML")) == NULL) || r;
+  r = ((glXWaitForMscOML = (PFNGLXWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForMscOML")) == NULL) || r;
+  r = ((glXWaitForSbcOML = (PFNGLXWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForSbcOML")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_OML_sync_control */
+
+#ifdef GLX_SGIX_fbconfig
+
+static GLboolean _glewInit_GLX_SGIX_fbconfig ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfigSGIX")) == NULL) || r;
+  r = ((glXCreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextWithConfigSGIX")) == NULL) || r;
+  r = ((glXCreateGLXPixmapWithConfigSGIX = (PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapWithConfigSGIX")) == NULL) || r;
+  r = ((glXGetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttribSGIX")) == NULL) || r;
+  r = ((glXGetFBConfigFromVisualSGIX = (PFNGLXGETFBCONFIGFROMVISUALSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigFromVisualSGIX")) == NULL) || r;
+  r = ((glXGetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfigSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_fbconfig */
+
+#ifdef GLX_SGIX_hyperpipe
+
+static GLboolean _glewInit_GLX_SGIX_hyperpipe ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindHyperpipeSGIX = (PFNGLXBINDHYPERPIPESGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindHyperpipeSGIX")) == NULL) || r;
+  r = ((glXDestroyHyperpipeConfigSGIX = (PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyHyperpipeConfigSGIX")) == NULL) || r;
+  r = ((glXHyperpipeAttribSGIX = (PFNGLXHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeAttribSGIX")) == NULL) || r;
+  r = ((glXHyperpipeConfigSGIX = (PFNGLXHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeConfigSGIX")) == NULL) || r;
+  r = ((glXQueryHyperpipeAttribSGIX = (PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeAttribSGIX")) == NULL) || r;
+  r = ((glXQueryHyperpipeBestAttribSGIX = (PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeBestAttribSGIX")) == NULL) || r;
+  r = ((glXQueryHyperpipeConfigSGIX = (PFNGLXQUERYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeConfigSGIX")) == NULL) || r;
+  r = ((glXQueryHyperpipeNetworkSGIX = (PFNGLXQUERYHYPERPIPENETWORKSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeNetworkSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_hyperpipe */
+
+#ifdef GLX_SGIX_pbuffer
+
+static GLboolean _glewInit_GLX_SGIX_pbuffer ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCreateGLXPbufferSGIX = (PFNGLXCREATEGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXDestroyGLXPbufferSGIX = (PFNGLXDESTROYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXGetSelectedEventSGIX = (PFNGLXGETSELECTEDEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEventSGIX")) == NULL) || r;
+  r = ((glXQueryGLXPbufferSGIX = (PFNGLXQUERYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXSelectEventSGIX = (PFNGLXSELECTEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXSelectEventSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_pbuffer */
+
+#ifdef GLX_SGIX_swap_barrier
+
+static GLboolean _glewInit_GLX_SGIX_swap_barrier ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindSwapBarrierSGIX = (PFNGLXBINDSWAPBARRIERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierSGIX")) == NULL) || r;
+  r = ((glXQueryMaxSwapBarriersSGIX = (PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapBarriersSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_swap_barrier */
+
+#ifdef GLX_SGIX_swap_group
+
+static GLboolean _glewInit_GLX_SGIX_swap_group ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXJoinSwapGroupSGIX = (PFNGLXJOINSWAPGROUPSGIXPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_swap_group */
+
+#ifdef GLX_SGIX_video_resize
+
+static GLboolean _glewInit_GLX_SGIX_video_resize ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindChannelToWindowSGIX = (PFNGLXBINDCHANNELTOWINDOWSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindChannelToWindowSGIX")) == NULL) || r;
+  r = ((glXChannelRectSGIX = (PFNGLXCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSGIX")) == NULL) || r;
+  r = ((glXChannelRectSyncSGIX = (PFNGLXCHANNELRECTSYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSyncSGIX")) == NULL) || r;
+  r = ((glXQueryChannelDeltasSGIX = (PFNGLXQUERYCHANNELDELTASSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelDeltasSGIX")) == NULL) || r;
+  r = ((glXQueryChannelRectSGIX = (PFNGLXQUERYCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelRectSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_video_resize */
+
+#ifdef GLX_SGI_cushion
+
+static GLboolean _glewInit_GLX_SGI_cushion ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCushionSGI = (PFNGLXCUSHIONSGIPROC)glewGetProcAddress((const GLubyte*)"glXCushionSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_cushion */
+
+#ifdef GLX_SGI_make_current_read
+
+static GLboolean _glewInit_GLX_SGI_make_current_read ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetCurrentReadDrawableSGI = (PFNGLXGETCURRENTREADDRAWABLESGIPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawableSGI")) == NULL) || r;
+  r = ((glXMakeCurrentReadSGI = (PFNGLXMAKECURRENTREADSGIPROC)glewGetProcAddress((const GLubyte*)"glXMakeCurrentReadSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_make_current_read */
+
+#ifdef GLX_SGI_swap_control
+
+static GLboolean _glewInit_GLX_SGI_swap_control ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_swap_control */
+
+#ifdef GLX_SGI_video_sync
+
+static GLboolean _glewInit_GLX_SGI_video_sync ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI")) == NULL) || r;
+  r = ((glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_video_sync */
+
+#ifdef GLX_SUN_get_transparent_index
+
+static GLboolean _glewInit_GLX_SUN_get_transparent_index ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetTransparentIndexSUN = (PFNGLXGETTRANSPARENTINDEXSUNPROC)glewGetProcAddress((const GLubyte*)"glXGetTransparentIndexSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SUN_get_transparent_index */
+
+#ifdef GLX_SUN_video_resize
+
+static GLboolean _glewInit_GLX_SUN_video_resize ()
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetVideoResizeSUN = (PFNGLXGETVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoResizeSUN")) == NULL) || r;
+  r = ((glXVideoResizeSUN = (PFNGLXVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXVideoResizeSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SUN_video_resize */
+
+/* ------------------------------------------------------------------------ */
+
+GLboolean glxewGetExtension (const char* name)
+{    
+  const GLubyte* start;
+  const GLubyte* end;
+
+  if (glXGetCurrentDisplay == NULL) return GL_FALSE;
+  start = (const GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS);
+  if (0 == start) return GL_FALSE;
+  end = start + _glewStrLen(start);
+  return _glewSearchExtension(name, start, end);
+}
+
+GLenum glxewInit ()
+{
+  Display* display;
+  int major, minor;
+  const GLubyte* extStart;
+  const GLubyte* extEnd;
+  /* initialize core GLX 1.2 */
+  if (_glewInit_GLX_VERSION_1_2()) return GLEW_ERROR_GLX_VERSION_11_ONLY;
+  /* check for a display */
+  display = glXGetCurrentDisplay();
+  if (display == NULL) return GLEW_ERROR_NO_GLX_DISPLAY;
+  /* initialize flags */
+  GLXEW_VERSION_1_0 = GL_TRUE;
+  GLXEW_VERSION_1_1 = GL_TRUE;
+  GLXEW_VERSION_1_2 = GL_TRUE;
+  GLXEW_VERSION_1_3 = GL_TRUE;
+  GLXEW_VERSION_1_4 = GL_TRUE;
+  /* query GLX version */
+  glXQueryVersion(display, &major, &minor);
+  if (major == 1 && minor <= 3)
+  {
+    switch (minor)
+    {
+      case 3:
+      GLXEW_VERSION_1_4 = GL_FALSE;
+      break;
+      case 2:
+      GLXEW_VERSION_1_4 = GL_FALSE;
+      GLXEW_VERSION_1_3 = GL_FALSE;
+      break;
+      default:
+      return GLEW_ERROR_GLX_VERSION_11_ONLY;
+      break;
+    }
+  }
+  /* query GLX extension string */
+  extStart = 0;
+  if (glXGetCurrentDisplay != NULL)
+    extStart = (const GLubyte*)glXGetClientString(display, GLX_EXTENSIONS);
+  if (extStart == 0)
+    extStart = (const GLubyte *)"";
+  extEnd = extStart + _glewStrLen(extStart);
+  /* initialize extensions */
+#ifdef GLX_VERSION_1_3
+  if (glewExperimental || GLXEW_VERSION_1_3) GLXEW_VERSION_1_3 = !_glewInit_GLX_VERSION_1_3();
+#endif /* GLX_VERSION_1_3 */
+#ifdef GLX_3DFX_multisample
+  GLXEW_3DFX_multisample = _glewSearchExtension("GLX_3DFX_multisample", extStart, extEnd);
+#endif /* GLX_3DFX_multisample */
+#ifdef GLX_AMD_gpu_association
+  GLXEW_AMD_gpu_association = _glewSearchExtension("GLX_AMD_gpu_association", extStart, extEnd);
+  if (glewExperimental || GLXEW_AMD_gpu_association) GLXEW_AMD_gpu_association = !_glewInit_GLX_AMD_gpu_association();
+#endif /* GLX_AMD_gpu_association */
+#ifdef GLX_ARB_context_flush_control
+  GLXEW_ARB_context_flush_control = _glewSearchExtension("GLX_ARB_context_flush_control", extStart, extEnd);
+#endif /* GLX_ARB_context_flush_control */
+#ifdef GLX_ARB_create_context
+  GLXEW_ARB_create_context = _glewSearchExtension("GLX_ARB_create_context", extStart, extEnd);
+  if (glewExperimental || GLXEW_ARB_create_context) GLXEW_ARB_create_context = !_glewInit_GLX_ARB_create_context();
+#endif /* GLX_ARB_create_context */
+#ifdef GLX_ARB_create_context_no_error
+  GLXEW_ARB_create_context_no_error = _glewSearchExtension("GLX_ARB_create_context_no_error", extStart, extEnd);
+#endif /* GLX_ARB_create_context_no_error */
+#ifdef GLX_ARB_create_context_profile
+  GLXEW_ARB_create_context_profile = _glewSearchExtension("GLX_ARB_create_context_profile", extStart, extEnd);
+#endif /* GLX_ARB_create_context_profile */
+#ifdef GLX_ARB_create_context_robustness
+  GLXEW_ARB_create_context_robustness = _glewSearchExtension("GLX_ARB_create_context_robustness", extStart, extEnd);
+#endif /* GLX_ARB_create_context_robustness */
+#ifdef GLX_ARB_fbconfig_float
+  GLXEW_ARB_fbconfig_float = _glewSearchExtension("GLX_ARB_fbconfig_float", extStart, extEnd);
+#endif /* GLX_ARB_fbconfig_float */
+#ifdef GLX_ARB_framebuffer_sRGB
+  GLXEW_ARB_framebuffer_sRGB = _glewSearchExtension("GLX_ARB_framebuffer_sRGB", extStart, extEnd);
+#endif /* GLX_ARB_framebuffer_sRGB */
+#ifdef GLX_ARB_get_proc_address
+  GLXEW_ARB_get_proc_address = _glewSearchExtension("GLX_ARB_get_proc_address", extStart, extEnd);
+#endif /* GLX_ARB_get_proc_address */
+#ifdef GLX_ARB_multisample
+  GLXEW_ARB_multisample = _glewSearchExtension("GLX_ARB_multisample", extStart, extEnd);
+#endif /* GLX_ARB_multisample */
+#ifdef GLX_ARB_robustness_application_isolation
+  GLXEW_ARB_robustness_application_isolation = _glewSearchExtension("GLX_ARB_robustness_application_isolation", extStart, extEnd);
+#endif /* GLX_ARB_robustness_application_isolation */
+#ifdef GLX_ARB_robustness_share_group_isolation
+  GLXEW_ARB_robustness_share_group_isolation = _glewSearchExtension("GLX_ARB_robustness_share_group_isolation", extStart, extEnd);
+#endif /* GLX_ARB_robustness_share_group_isolation */
+#ifdef GLX_ARB_vertex_buffer_object
+  GLXEW_ARB_vertex_buffer_object = _glewSearchExtension("GLX_ARB_vertex_buffer_object", extStart, extEnd);
+#endif /* GLX_ARB_vertex_buffer_object */
+#ifdef GLX_ATI_pixel_format_float
+  GLXEW_ATI_pixel_format_float = _glewSearchExtension("GLX_ATI_pixel_format_float", extStart, extEnd);
+#endif /* GLX_ATI_pixel_format_float */
+#ifdef GLX_ATI_render_texture
+  GLXEW_ATI_render_texture = _glewSearchExtension("GLX_ATI_render_texture", extStart, extEnd);
+  if (glewExperimental || GLXEW_ATI_render_texture) GLXEW_ATI_render_texture = !_glewInit_GLX_ATI_render_texture();
+#endif /* GLX_ATI_render_texture */
+#ifdef GLX_EXT_buffer_age
+  GLXEW_EXT_buffer_age = _glewSearchExtension("GLX_EXT_buffer_age", extStart, extEnd);
+#endif /* GLX_EXT_buffer_age */
+#ifdef GLX_EXT_create_context_es2_profile
+  GLXEW_EXT_create_context_es2_profile = _glewSearchExtension("GLX_EXT_create_context_es2_profile", extStart, extEnd);
+#endif /* GLX_EXT_create_context_es2_profile */
+#ifdef GLX_EXT_create_context_es_profile
+  GLXEW_EXT_create_context_es_profile = _glewSearchExtension("GLX_EXT_create_context_es_profile", extStart, extEnd);
+#endif /* GLX_EXT_create_context_es_profile */
+#ifdef GLX_EXT_fbconfig_packed_float
+  GLXEW_EXT_fbconfig_packed_float = _glewSearchExtension("GLX_EXT_fbconfig_packed_float", extStart, extEnd);
+#endif /* GLX_EXT_fbconfig_packed_float */
+#ifdef GLX_EXT_framebuffer_sRGB
+  GLXEW_EXT_framebuffer_sRGB = _glewSearchExtension("GLX_EXT_framebuffer_sRGB", extStart, extEnd);
+#endif /* GLX_EXT_framebuffer_sRGB */
+#ifdef GLX_EXT_import_context
+  GLXEW_EXT_import_context = _glewSearchExtension("GLX_EXT_import_context", extStart, extEnd);
+  if (glewExperimental || GLXEW_EXT_import_context) GLXEW_EXT_import_context = !_glewInit_GLX_EXT_import_context();
+#endif /* GLX_EXT_import_context */
+#ifdef GLX_EXT_libglvnd
+  GLXEW_EXT_libglvnd = _glewSearchExtension("GLX_EXT_libglvnd", extStart, extEnd);
+#endif /* GLX_EXT_libglvnd */
+#ifdef GLX_EXT_scene_marker
+  GLXEW_EXT_scene_marker = _glewSearchExtension("GLX_EXT_scene_marker", extStart, extEnd);
+#endif /* GLX_EXT_scene_marker */
+#ifdef GLX_EXT_stereo_tree
+  GLXEW_EXT_stereo_tree = _glewSearchExtension("GLX_EXT_stereo_tree", extStart, extEnd);
+#endif /* GLX_EXT_stereo_tree */
+#ifdef GLX_EXT_swap_control
+  GLXEW_EXT_swap_control = _glewSearchExtension("GLX_EXT_swap_control", extStart, extEnd);
+  if (glewExperimental || GLXEW_EXT_swap_control) GLXEW_EXT_swap_control = !_glewInit_GLX_EXT_swap_control();
+#endif /* GLX_EXT_swap_control */
+#ifdef GLX_EXT_swap_control_tear
+  GLXEW_EXT_swap_control_tear = _glewSearchExtension("GLX_EXT_swap_control_tear", extStart, extEnd);
+#endif /* GLX_EXT_swap_control_tear */
+#ifdef GLX_EXT_texture_from_pixmap
+  GLXEW_EXT_texture_from_pixmap = _glewSearchExtension("GLX_EXT_texture_from_pixmap", extStart, extEnd);
+  if (glewExperimental || GLXEW_EXT_texture_from_pixmap) GLXEW_EXT_texture_from_pixmap = !_glewInit_GLX_EXT_texture_from_pixmap();
+#endif /* GLX_EXT_texture_from_pixmap */
+#ifdef GLX_EXT_visual_info
+  GLXEW_EXT_visual_info = _glewSearchExtension("GLX_EXT_visual_info", extStart, extEnd);
+#endif /* GLX_EXT_visual_info */
+#ifdef GLX_EXT_visual_rating
+  GLXEW_EXT_visual_rating = _glewSearchExtension("GLX_EXT_visual_rating", extStart, extEnd);
+#endif /* GLX_EXT_visual_rating */
+#ifdef GLX_INTEL_swap_event
+  GLXEW_INTEL_swap_event = _glewSearchExtension("GLX_INTEL_swap_event", extStart, extEnd);
+#endif /* GLX_INTEL_swap_event */
+#ifdef GLX_MESA_agp_offset
+  GLXEW_MESA_agp_offset = _glewSearchExtension("GLX_MESA_agp_offset", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_agp_offset) GLXEW_MESA_agp_offset = !_glewInit_GLX_MESA_agp_offset();
+#endif /* GLX_MESA_agp_offset */
+#ifdef GLX_MESA_copy_sub_buffer
+  GLXEW_MESA_copy_sub_buffer = _glewSearchExtension("GLX_MESA_copy_sub_buffer", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_copy_sub_buffer) GLXEW_MESA_copy_sub_buffer = !_glewInit_GLX_MESA_copy_sub_buffer();
+#endif /* GLX_MESA_copy_sub_buffer */
+#ifdef GLX_MESA_pixmap_colormap
+  GLXEW_MESA_pixmap_colormap = _glewSearchExtension("GLX_MESA_pixmap_colormap", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_pixmap_colormap) GLXEW_MESA_pixmap_colormap = !_glewInit_GLX_MESA_pixmap_colormap();
+#endif /* GLX_MESA_pixmap_colormap */
+#ifdef GLX_MESA_query_renderer
+  GLXEW_MESA_query_renderer = _glewSearchExtension("GLX_MESA_query_renderer", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_query_renderer) GLXEW_MESA_query_renderer = !_glewInit_GLX_MESA_query_renderer();
+#endif /* GLX_MESA_query_renderer */
+#ifdef GLX_MESA_release_buffers
+  GLXEW_MESA_release_buffers = _glewSearchExtension("GLX_MESA_release_buffers", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_release_buffers) GLXEW_MESA_release_buffers = !_glewInit_GLX_MESA_release_buffers();
+#endif /* GLX_MESA_release_buffers */
+#ifdef GLX_MESA_set_3dfx_mode
+  GLXEW_MESA_set_3dfx_mode = _glewSearchExtension("GLX_MESA_set_3dfx_mode", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_set_3dfx_mode) GLXEW_MESA_set_3dfx_mode = !_glewInit_GLX_MESA_set_3dfx_mode();
+#endif /* GLX_MESA_set_3dfx_mode */
+#ifdef GLX_MESA_swap_control
+  GLXEW_MESA_swap_control = _glewSearchExtension("GLX_MESA_swap_control", extStart, extEnd);
+  if (glewExperimental || GLXEW_MESA_swap_control) GLXEW_MESA_swap_control = !_glewInit_GLX_MESA_swap_control();
+#endif /* GLX_MESA_swap_control */
+#ifdef GLX_NV_copy_buffer
+  GLXEW_NV_copy_buffer = _glewSearchExtension("GLX_NV_copy_buffer", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_copy_buffer) GLXEW_NV_copy_buffer = !_glewInit_GLX_NV_copy_buffer();
+#endif /* GLX_NV_copy_buffer */
+#ifdef GLX_NV_copy_image
+  GLXEW_NV_copy_image = _glewSearchExtension("GLX_NV_copy_image", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_copy_image) GLXEW_NV_copy_image = !_glewInit_GLX_NV_copy_image();
+#endif /* GLX_NV_copy_image */
+#ifdef GLX_NV_delay_before_swap
+  GLXEW_NV_delay_before_swap = _glewSearchExtension("GLX_NV_delay_before_swap", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_delay_before_swap) GLXEW_NV_delay_before_swap = !_glewInit_GLX_NV_delay_before_swap();
+#endif /* GLX_NV_delay_before_swap */
+#ifdef GLX_NV_float_buffer
+  GLXEW_NV_float_buffer = _glewSearchExtension("GLX_NV_float_buffer", extStart, extEnd);
+#endif /* GLX_NV_float_buffer */
+#ifdef GLX_NV_multisample_coverage
+  GLXEW_NV_multisample_coverage = _glewSearchExtension("GLX_NV_multisample_coverage", extStart, extEnd);
+#endif /* GLX_NV_multisample_coverage */
+#ifdef GLX_NV_present_video
+  GLXEW_NV_present_video = _glewSearchExtension("GLX_NV_present_video", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_present_video) GLXEW_NV_present_video = !_glewInit_GLX_NV_present_video();
+#endif /* GLX_NV_present_video */
+#ifdef GLX_NV_robustness_video_memory_purge
+  GLXEW_NV_robustness_video_memory_purge = _glewSearchExtension("GLX_NV_robustness_video_memory_purge", extStart, extEnd);
+#endif /* GLX_NV_robustness_video_memory_purge */
+#ifdef GLX_NV_swap_group
+  GLXEW_NV_swap_group = _glewSearchExtension("GLX_NV_swap_group", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_swap_group) GLXEW_NV_swap_group = !_glewInit_GLX_NV_swap_group();
+#endif /* GLX_NV_swap_group */
+#ifdef GLX_NV_vertex_array_range
+  GLXEW_NV_vertex_array_range = _glewSearchExtension("GLX_NV_vertex_array_range", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_vertex_array_range) GLXEW_NV_vertex_array_range = !_glewInit_GLX_NV_vertex_array_range();
+#endif /* GLX_NV_vertex_array_range */
+#ifdef GLX_NV_video_capture
+  GLXEW_NV_video_capture = _glewSearchExtension("GLX_NV_video_capture", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_video_capture) GLXEW_NV_video_capture = !_glewInit_GLX_NV_video_capture();
+#endif /* GLX_NV_video_capture */
+#ifdef GLX_NV_video_out
+  GLXEW_NV_video_out = _glewSearchExtension("GLX_NV_video_out", extStart, extEnd);
+  if (glewExperimental || GLXEW_NV_video_out) GLXEW_NV_video_out = !_glewInit_GLX_NV_video_out();
+#endif /* GLX_NV_video_out */
+#ifdef GLX_OML_swap_method
+  GLXEW_OML_swap_method = _glewSearchExtension("GLX_OML_swap_method", extStart, extEnd);
+#endif /* GLX_OML_swap_method */
+#ifdef GLX_OML_sync_control
+  GLXEW_OML_sync_control = _glewSearchExtension("GLX_OML_sync_control", extStart, extEnd);
+  if (glewExperimental || GLXEW_OML_sync_control) GLXEW_OML_sync_control = !_glewInit_GLX_OML_sync_control();
+#endif /* GLX_OML_sync_control */
+#ifdef GLX_SGIS_blended_overlay
+  GLXEW_SGIS_blended_overlay = _glewSearchExtension("GLX_SGIS_blended_overlay", extStart, extEnd);
+#endif /* GLX_SGIS_blended_overlay */
+#ifdef GLX_SGIS_color_range
+  GLXEW_SGIS_color_range = _glewSearchExtension("GLX_SGIS_color_range", extStart, extEnd);
+#endif /* GLX_SGIS_color_range */
+#ifdef GLX_SGIS_multisample
+  GLXEW_SGIS_multisample = _glewSearchExtension("GLX_SGIS_multisample", extStart, extEnd);
+#endif /* GLX_SGIS_multisample */
+#ifdef GLX_SGIS_shared_multisample
+  GLXEW_SGIS_shared_multisample = _glewSearchExtension("GLX_SGIS_shared_multisample", extStart, extEnd);
+#endif /* GLX_SGIS_shared_multisample */
+#ifdef GLX_SGIX_fbconfig
+  GLXEW_SGIX_fbconfig = _glewSearchExtension("GLX_SGIX_fbconfig", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_fbconfig) GLXEW_SGIX_fbconfig = !_glewInit_GLX_SGIX_fbconfig();
+#endif /* GLX_SGIX_fbconfig */
+#ifdef GLX_SGIX_hyperpipe
+  GLXEW_SGIX_hyperpipe = _glewSearchExtension("GLX_SGIX_hyperpipe", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_hyperpipe) GLXEW_SGIX_hyperpipe = !_glewInit_GLX_SGIX_hyperpipe();
+#endif /* GLX_SGIX_hyperpipe */
+#ifdef GLX_SGIX_pbuffer
+  GLXEW_SGIX_pbuffer = _glewSearchExtension("GLX_SGIX_pbuffer", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_pbuffer) GLXEW_SGIX_pbuffer = !_glewInit_GLX_SGIX_pbuffer();
+#endif /* GLX_SGIX_pbuffer */
+#ifdef GLX_SGIX_swap_barrier
+  GLXEW_SGIX_swap_barrier = _glewSearchExtension("GLX_SGIX_swap_barrier", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_swap_barrier) GLXEW_SGIX_swap_barrier = !_glewInit_GLX_SGIX_swap_barrier();
+#endif /* GLX_SGIX_swap_barrier */
+#ifdef GLX_SGIX_swap_group
+  GLXEW_SGIX_swap_group = _glewSearchExtension("GLX_SGIX_swap_group", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_swap_group) GLXEW_SGIX_swap_group = !_glewInit_GLX_SGIX_swap_group();
+#endif /* GLX_SGIX_swap_group */
+#ifdef GLX_SGIX_video_resize
+  GLXEW_SGIX_video_resize = _glewSearchExtension("GLX_SGIX_video_resize", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGIX_video_resize) GLXEW_SGIX_video_resize = !_glewInit_GLX_SGIX_video_resize();
+#endif /* GLX_SGIX_video_resize */
+#ifdef GLX_SGIX_visual_select_group
+  GLXEW_SGIX_visual_select_group = _glewSearchExtension("GLX_SGIX_visual_select_group", extStart, extEnd);
+#endif /* GLX_SGIX_visual_select_group */
+#ifdef GLX_SGI_cushion
+  GLXEW_SGI_cushion = _glewSearchExtension("GLX_SGI_cushion", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGI_cushion) GLXEW_SGI_cushion = !_glewInit_GLX_SGI_cushion();
+#endif /* GLX_SGI_cushion */
+#ifdef GLX_SGI_make_current_read
+  GLXEW_SGI_make_current_read = _glewSearchExtension("GLX_SGI_make_current_read", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGI_make_current_read) GLXEW_SGI_make_current_read = !_glewInit_GLX_SGI_make_current_read();
+#endif /* GLX_SGI_make_current_read */
+#ifdef GLX_SGI_swap_control
+  GLXEW_SGI_swap_control = _glewSearchExtension("GLX_SGI_swap_control", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGI_swap_control) GLXEW_SGI_swap_control = !_glewInit_GLX_SGI_swap_control();
+#endif /* GLX_SGI_swap_control */
+#ifdef GLX_SGI_video_sync
+  GLXEW_SGI_video_sync = _glewSearchExtension("GLX_SGI_video_sync", extStart, extEnd);
+  if (glewExperimental || GLXEW_SGI_video_sync) GLXEW_SGI_video_sync = !_glewInit_GLX_SGI_video_sync();
+#endif /* GLX_SGI_video_sync */
+#ifdef GLX_SUN_get_transparent_index
+  GLXEW_SUN_get_transparent_index = _glewSearchExtension("GLX_SUN_get_transparent_index", extStart, extEnd);
+  if (glewExperimental || GLXEW_SUN_get_transparent_index) GLXEW_SUN_get_transparent_index = !_glewInit_GLX_SUN_get_transparent_index();
+#endif /* GLX_SUN_get_transparent_index */
+#ifdef GLX_SUN_video_resize
+  GLXEW_SUN_video_resize = _glewSearchExtension("GLX_SUN_video_resize", extStart, extEnd);
+  if (glewExperimental || GLXEW_SUN_video_resize) GLXEW_SUN_video_resize = !_glewInit_GLX_SUN_video_resize();
+#endif /* GLX_SUN_video_resize */
+
+  return GLEW_OK;
+}
+
+#endif /* !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */
+
+/* ------------------------------------------------------------------------ */
+
+const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error)
+{
+  static const GLubyte* _glewErrorString[] =
+  {
+    (const GLubyte*)"No error",
+    (const GLubyte*)"Missing GL version",
+    (const GLubyte*)"GL 1.1 and up are not supported",
+    (const GLubyte*)"GLX 1.2 and up are not supported",
+    (const GLubyte*)"Unknown error"
+  };
+  const size_t max_error = sizeof(_glewErrorString)/sizeof(*_glewErrorString) - 1;
+  return _glewErrorString[(size_t)error > max_error ? max_error : (size_t)error];
+}
+
+const GLubyte * GLEWAPIENTRY glewGetString (GLenum name)
+{
+  static const GLubyte* _glewString[] =
+  {
+    (const GLubyte*)NULL,
+    (const GLubyte*)"2.1.0",
+    (const GLubyte*)"2",
+    (const GLubyte*)"1",
+    (const GLubyte*)"0"
+  };
+  const size_t max_string = sizeof(_glewString)/sizeof(*_glewString) - 1;
+  return _glewString[(size_t)name > max_string ? 0 : (size_t)name];
+}
+
+/* ------------------------------------------------------------------------ */
+
+GLboolean glewExperimental = GL_FALSE;
+
+GLenum GLEWAPIENTRY glewInit (void)
+{
+  GLenum r;
+#if defined(GLEW_EGL)
+  PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL;
+#endif
+  r = glewContextInit();
+  if ( r != 0 ) return r;
+#if defined(GLEW_EGL)
+  getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay");
+  return eglewInit(getCurrentDisplay());
+#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
+  return r;
+#elif defined(_WIN32)
+  return wglewInit();
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
+  return glxewInit();
+#else
+  return r;
+#endif /* _WIN32 */
+}
+
+#if defined(_WIN32) && defined(GLEW_BUILD) && defined(__GNUC__)
+/* GCC requires a DLL entry point even without any standard library included. */
+/* Types extracted from windows.h to avoid polluting the rest of the file. */
+int __stdcall DllMainCRTStartup(void* instance, unsigned reason, void* reserved)
+{
+  (void) instance;
+  (void) reason;
+  (void) reserved;
+  return 1;
+}
+#endif
+GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
+{
+  const GLubyte* pos = (const GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if (_glewStrSame1(&pos, &len, (const GLubyte*)"GL_", 3))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
+      {
+#ifdef GL_VERSION_1_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
+        {
+          ret = GLEW_VERSION_1_2;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_2_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2_1", 5))
+        {
+          ret = GLEW_VERSION_1_2_1;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
+        {
+          ret = GLEW_VERSION_1_3;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
+        {
+          ret = GLEW_VERSION_1_4;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3))
+        {
+          ret = GLEW_VERSION_1_5;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_2_0
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_0", 3))
+        {
+          ret = GLEW_VERSION_2_0;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_2_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_1", 3))
+        {
+          ret = GLEW_VERSION_2_1;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_3_0
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_0", 3))
+        {
+          ret = GLEW_VERSION_3_0;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_3_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_1", 3))
+        {
+          ret = GLEW_VERSION_3_1;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_3_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_2", 3))
+        {
+          ret = GLEW_VERSION_3_2;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_3_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_3", 3))
+        {
+          ret = GLEW_VERSION_3_3;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_0
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_0", 3))
+        {
+          ret = GLEW_VERSION_4_0;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_1", 3))
+        {
+          ret = GLEW_VERSION_4_1;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_2", 3))
+        {
+          ret = GLEW_VERSION_4_2;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_3", 3))
+        {
+          ret = GLEW_VERSION_4_3;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_4", 3))
+        {
+          ret = GLEW_VERSION_4_4;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_5", 3))
+        {
+          ret = GLEW_VERSION_4_5;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_4_6
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_6", 3))
+        {
+          ret = GLEW_VERSION_4_6;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef GL_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_3DFX_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_3DFX_tbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tbuffer", 7))
+        {
+          ret = GLEW_3DFX_tbuffer;
+          continue;
+        }
+#endif
+#ifdef GL_3DFX_texture_compression_FXT1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_FXT1", 24))
+        {
+          ret = GLEW_3DFX_texture_compression_FXT1;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
+      {
+#ifdef GL_AMD_blend_minmax_factor
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax_factor", 19))
+        {
+          ret = GLEW_AMD_blend_minmax_factor;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_compressed_3DC_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_3DC_texture", 22))
+        {
+          ret = GLEW_AMD_compressed_3DC_texture;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_compressed_ATC_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_ATC_texture", 22))
+        {
+          ret = GLEW_AMD_compressed_ATC_texture;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_conservative_depth
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_depth", 18))
+        {
+          ret = GLEW_AMD_conservative_depth;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_debug_output
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_output", 12))
+        {
+          ret = GLEW_AMD_debug_output;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_depth_clamp_separate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp_separate", 20))
+        {
+          ret = GLEW_AMD_depth_clamp_separate;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_draw_buffers_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers_blend", 18))
+        {
+          ret = GLEW_AMD_draw_buffers_blend;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_framebuffer_sample_positions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sample_positions", 28))
+        {
+          ret = GLEW_AMD_framebuffer_sample_positions;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_gcn_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gcn_shader", 10))
+        {
+          ret = GLEW_AMD_gcn_shader;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_gpu_shader_half_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_half_float", 21))
+        {
+          ret = GLEW_AMD_gpu_shader_half_float;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_gpu_shader_int16
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_int16", 16))
+        {
+          ret = GLEW_AMD_gpu_shader_int16;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_gpu_shader_int64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_int64", 16))
+        {
+          ret = GLEW_AMD_gpu_shader_int64;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_interleaved_elements
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interleaved_elements", 20))
+        {
+          ret = GLEW_AMD_interleaved_elements;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_multi_draw_indirect
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_indirect", 19))
+        {
+          ret = GLEW_AMD_multi_draw_indirect;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_name_gen_delete
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"name_gen_delete", 15))
+        {
+          ret = GLEW_AMD_name_gen_delete;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_occlusion_query_event
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query_event", 21))
+        {
+          ret = GLEW_AMD_occlusion_query_event;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_performance_monitor
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"performance_monitor", 19))
+        {
+          ret = GLEW_AMD_performance_monitor;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_pinned_memory
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pinned_memory", 13))
+        {
+          ret = GLEW_AMD_pinned_memory;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_program_binary_Z400
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"program_binary_Z400", 19))
+        {
+          ret = GLEW_AMD_program_binary_Z400;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_query_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_buffer_object", 19))
+        {
+          ret = GLEW_AMD_query_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_sample_positions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_positions", 16))
+        {
+          ret = GLEW_AMD_sample_positions;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_seamless_cubemap_per_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"seamless_cubemap_per_texture", 28))
+        {
+          ret = GLEW_AMD_seamless_cubemap_per_texture;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_atomic_counter_ops
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_counter_ops", 25))
+        {
+          ret = GLEW_AMD_shader_atomic_counter_ops;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_ballot
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_ballot", 13))
+        {
+          ret = GLEW_AMD_shader_ballot;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_explicit_vertex_parameter
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_explicit_vertex_parameter", 32))
+        {
+          ret = GLEW_AMD_shader_explicit_vertex_parameter;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_stencil_export
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_stencil_export", 21))
+        {
+          ret = GLEW_AMD_shader_stencil_export;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_stencil_value_export
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_stencil_value_export", 27))
+        {
+          ret = GLEW_AMD_shader_stencil_value_export;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_shader_trinary_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_trinary_minmax", 21))
+        {
+          ret = GLEW_AMD_shader_trinary_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_sparse_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture", 14))
+        {
+          ret = GLEW_AMD_sparse_texture;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_stencil_operation_extended
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_operation_extended", 26))
+        {
+          ret = GLEW_AMD_stencil_operation_extended;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_texture_gather_bias_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_gather_bias_lod", 23))
+        {
+          ret = GLEW_AMD_texture_gather_bias_lod;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_texture_texture4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_texture4", 16))
+        {
+          ret = GLEW_AMD_texture_texture4;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_transform_feedback3_lines_triangles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback3_lines_triangles", 35))
+        {
+          ret = GLEW_AMD_transform_feedback3_lines_triangles;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_transform_feedback4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback4", 19))
+        {
+          ret = GLEW_AMD_transform_feedback4;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_vertex_shader_layer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_layer", 19))
+        {
+          ret = GLEW_AMD_vertex_shader_layer;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_vertex_shader_tessellator
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_tessellator", 25))
+        {
+          ret = GLEW_AMD_vertex_shader_tessellator;
+          continue;
+        }
+#endif
+#ifdef GL_AMD_vertex_shader_viewport_index
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_viewport_index", 28))
+        {
+          ret = GLEW_AMD_vertex_shader_viewport_index;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ANDROID_", 8))
+      {
+#ifdef GL_ANDROID_extension_pack_es31a
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extension_pack_es31a", 20))
+        {
+          ret = GLEW_ANDROID_extension_pack_es31a;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ANGLE_", 6))
+      {
+#ifdef GL_ANGLE_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
+        {
+          ret = GLEW_ANGLE_depth_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_framebuffer_blit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16))
+        {
+          ret = GLEW_ANGLE_framebuffer_blit;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_framebuffer_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
+        {
+          ret = GLEW_ANGLE_framebuffer_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_instanced_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16))
+        {
+          ret = GLEW_ANGLE_instanced_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_pack_reverse_row_order
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_reverse_row_order", 22))
+        {
+          ret = GLEW_ANGLE_pack_reverse_row_order;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_program_binary
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"program_binary", 14))
+        {
+          ret = GLEW_ANGLE_program_binary;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24))
+        {
+          ret = GLEW_ANGLE_texture_compression_dxt1;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt3", 24))
+        {
+          ret = GLEW_ANGLE_texture_compression_dxt3;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_texture_compression_dxt5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt5", 24))
+        {
+          ret = GLEW_ANGLE_texture_compression_dxt5;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_texture_usage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_usage", 13))
+        {
+          ret = GLEW_ANGLE_texture_usage;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_timer_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11))
+        {
+          ret = GLEW_ANGLE_timer_query;
+          continue;
+        }
+#endif
+#ifdef GL_ANGLE_translated_shader_source
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"translated_shader_source", 24))
+        {
+          ret = GLEW_ANGLE_translated_shader_source;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"APPLE_", 6))
+      {
+#ifdef GL_APPLE_aux_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"aux_depth_stencil", 17))
+        {
+          ret = GLEW_APPLE_aux_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_client_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_storage", 14))
+        {
+          ret = GLEW_APPLE_client_storage;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_clip_distance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_distance", 13))
+        {
+          ret = GLEW_APPLE_clip_distance;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_color_buffer_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_packed_float", 25))
+        {
+          ret = GLEW_APPLE_color_buffer_packed_float;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_copy_texture_levels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture_levels", 19))
+        {
+          ret = GLEW_APPLE_copy_texture_levels;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_element_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
+        {
+          ret = GLEW_APPLE_element_array;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_fence
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
+        {
+          ret = GLEW_APPLE_fence;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_float_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_pixels", 12))
+        {
+          ret = GLEW_APPLE_float_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_flush_buffer_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_buffer_range", 18))
+        {
+          ret = GLEW_APPLE_flush_buffer_range;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_framebuffer_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
+        {
+          ret = GLEW_APPLE_framebuffer_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_object_purgeable
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"object_purgeable", 16))
+        {
+          ret = GLEW_APPLE_object_purgeable;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_pixel_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer", 12))
+        {
+          ret = GLEW_APPLE_pixel_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_rgb_422
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rgb_422", 7))
+        {
+          ret = GLEW_APPLE_rgb_422;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_row_bytes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"row_bytes", 9))
+        {
+          ret = GLEW_APPLE_row_bytes;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_specular_vector
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_vector", 15))
+        {
+          ret = GLEW_APPLE_specular_vector;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync", 4))
+        {
+          ret = GLEW_APPLE_sync;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_2D_limited_npot
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_2D_limited_npot", 23))
+        {
+          ret = GLEW_APPLE_texture_2D_limited_npot;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_format_BGRA8888
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_format_BGRA8888", 23))
+        {
+          ret = GLEW_APPLE_texture_format_BGRA8888;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_max_level
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_max_level", 17))
+        {
+          ret = GLEW_APPLE_texture_max_level;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_packed_float", 20))
+        {
+          ret = GLEW_APPLE_texture_packed_float;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
+        {
+          ret = GLEW_APPLE_texture_range;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_transform_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_hint", 14))
+        {
+          ret = GLEW_APPLE_transform_hint;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_APPLE_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLEW_APPLE_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_vertex_program_evaluators
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program_evaluators", 25))
+        {
+          ret = GLEW_APPLE_vertex_program_evaluators;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_ycbcr_422
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_422", 9))
+        {
+          ret = GLEW_APPLE_ycbcr_422;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef GL_ARB_ES2_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES2_compatibility", 17))
+        {
+          ret = GLEW_ARB_ES2_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_ES3_1_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES3_1_compatibility", 19))
+        {
+          ret = GLEW_ARB_ES3_1_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_ES3_2_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES3_2_compatibility", 19))
+        {
+          ret = GLEW_ARB_ES3_2_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_ES3_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES3_compatibility", 17))
+        {
+          ret = GLEW_ARB_ES3_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_arrays_of_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"arrays_of_arrays", 16))
+        {
+          ret = GLEW_ARB_arrays_of_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_base_instance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"base_instance", 13))
+        {
+          ret = GLEW_ARB_base_instance;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_bindless_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindless_texture", 16))
+        {
+          ret = GLEW_ARB_bindless_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_blend_func_extended
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_extended", 19))
+        {
+          ret = GLEW_ARB_blend_func_extended;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_buffer_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_storage", 14))
+        {
+          ret = GLEW_ARB_buffer_storage;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_cl_event
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cl_event", 8))
+        {
+          ret = GLEW_ARB_cl_event;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_clear_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clear_buffer_object", 19))
+        {
+          ret = GLEW_ARB_clear_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_clear_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clear_texture", 13))
+        {
+          ret = GLEW_ARB_clear_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_clip_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_control", 12))
+        {
+          ret = GLEW_ARB_clip_control;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_color_buffer_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18))
+        {
+          ret = GLEW_ARB_color_buffer_float;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compatibility", 13))
+        {
+          ret = GLEW_ARB_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_compressed_texture_pixel_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_texture_pixel_storage", 32))
+        {
+          ret = GLEW_ARB_compressed_texture_pixel_storage;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_compute_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compute_shader", 14))
+        {
+          ret = GLEW_ARB_compute_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_compute_variable_group_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compute_variable_group_size", 27))
+        {
+          ret = GLEW_ARB_compute_variable_group_size;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_conditional_render_inverted
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render_inverted", 27))
+        {
+          ret = GLEW_ARB_conditional_render_inverted;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_conservative_depth
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_depth", 18))
+        {
+          ret = GLEW_ARB_conservative_depth;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_copy_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_buffer", 11))
+        {
+          ret = GLEW_ARB_copy_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_copy_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
+        {
+          ret = GLEW_ARB_copy_image;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_cull_distance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_distance", 13))
+        {
+          ret = GLEW_ARB_cull_distance;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_debug_output
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_output", 12))
+        {
+          ret = GLEW_ARB_debug_output;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_depth_buffer_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18))
+        {
+          ret = GLEW_ARB_depth_buffer_float;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_depth_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11))
+        {
+          ret = GLEW_ARB_depth_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
+        {
+          ret = GLEW_ARB_depth_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_derivative_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"derivative_control", 18))
+        {
+          ret = GLEW_ARB_derivative_control;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_direct_state_access
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"direct_state_access", 19))
+        {
+          ret = GLEW_ARB_direct_state_access;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_ARB_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_buffers_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers_blend", 18))
+        {
+          ret = GLEW_ARB_draw_buffers_blend;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_elements_base_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_elements_base_vertex", 25))
+        {
+          ret = GLEW_ARB_draw_elements_base_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_indirect
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_indirect", 13))
+        {
+          ret = GLEW_ARB_draw_indirect;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_instanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14))
+        {
+          ret = GLEW_ARB_draw_instanced;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_enhanced_layouts
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"enhanced_layouts", 16))
+        {
+          ret = GLEW_ARB_enhanced_layouts;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_explicit_attrib_location
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_attrib_location", 24))
+        {
+          ret = GLEW_ARB_explicit_attrib_location;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_explicit_uniform_location
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_uniform_location", 25))
+        {
+          ret = GLEW_ARB_explicit_uniform_location;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_coord_conventions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_coord_conventions", 26))
+        {
+          ret = GLEW_ARB_fragment_coord_conventions;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_layer_viewport
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_layer_viewport", 23))
+        {
+          ret = GLEW_ARB_fragment_layer_viewport;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
+        {
+          ret = GLEW_ARB_fragment_program;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_program_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_shadow", 23))
+        {
+          ret = GLEW_ARB_fragment_program_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
+        {
+          ret = GLEW_ARB_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_shader_interlock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader_interlock", 25))
+        {
+          ret = GLEW_ARB_fragment_shader_interlock;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_framebuffer_no_attachments
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_no_attachments", 26))
+        {
+          ret = GLEW_ARB_framebuffer_no_attachments;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_framebuffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18))
+        {
+          ret = GLEW_ARB_framebuffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = GLEW_ARB_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_geometry_shader4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
+        {
+          ret = GLEW_ARB_geometry_shader4;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_get_program_binary
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_program_binary", 18))
+        {
+          ret = GLEW_ARB_get_program_binary;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_get_texture_sub_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_texture_sub_image", 21))
+        {
+          ret = GLEW_ARB_get_texture_sub_image;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_gl_spirv
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_spirv", 8))
+        {
+          ret = GLEW_ARB_gl_spirv;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_gpu_shader5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader5", 11))
+        {
+          ret = GLEW_ARB_gpu_shader5;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_gpu_shader_fp64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_fp64", 15))
+        {
+          ret = GLEW_ARB_gpu_shader_fp64;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_gpu_shader_int64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_int64", 16))
+        {
+          ret = GLEW_ARB_gpu_shader_int64;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_half_float_pixel
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_pixel", 16))
+        {
+          ret = GLEW_ARB_half_float_pixel;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_half_float_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_vertex", 17))
+        {
+          ret = GLEW_ARB_half_float_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_imaging
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"imaging", 7))
+        {
+          ret = GLEW_ARB_imaging;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_indirect_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"indirect_parameters", 19))
+        {
+          ret = GLEW_ARB_indirect_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_instanced_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16))
+        {
+          ret = GLEW_ARB_instanced_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_internalformat_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"internalformat_query", 20))
+        {
+          ret = GLEW_ARB_internalformat_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_internalformat_query2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"internalformat_query2", 21))
+        {
+          ret = GLEW_ARB_internalformat_query2;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_invalidate_subdata
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"invalidate_subdata", 18))
+        {
+          ret = GLEW_ARB_invalidate_subdata;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_map_buffer_alignment
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_alignment", 20))
+        {
+          ret = GLEW_ARB_map_buffer_alignment;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_map_buffer_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_range", 16))
+        {
+          ret = GLEW_ARB_map_buffer_range;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_matrix_palette
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"matrix_palette", 14))
+        {
+          ret = GLEW_ARB_matrix_palette;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multi_bind
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_bind", 10))
+        {
+          ret = GLEW_ARB_multi_bind;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multi_draw_indirect
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_indirect", 19))
+        {
+          ret = GLEW_ARB_multi_draw_indirect;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_ARB_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multitexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12))
+        {
+          ret = GLEW_ARB_multitexture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_occlusion_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
+        {
+          ret = GLEW_ARB_occlusion_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_occlusion_query2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query2", 16))
+        {
+          ret = GLEW_ARB_occlusion_query2;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_parallel_shader_compile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_shader_compile", 23))
+        {
+          ret = GLEW_ARB_parallel_shader_compile;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_pipeline_statistics_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pipeline_statistics_query", 25))
+        {
+          ret = GLEW_ARB_pipeline_statistics_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_pixel_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
+        {
+          ret = GLEW_ARB_pixel_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_point_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
+        {
+          ret = GLEW_ARB_point_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_point_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
+        {
+          ret = GLEW_ARB_point_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_polygon_offset_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset_clamp", 20))
+        {
+          ret = GLEW_ARB_polygon_offset_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_post_depth_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"post_depth_coverage", 19))
+        {
+          ret = GLEW_ARB_post_depth_coverage;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_program_interface_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"program_interface_query", 23))
+        {
+          ret = GLEW_ARB_program_interface_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_provoking_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"provoking_vertex", 16))
+        {
+          ret = GLEW_ARB_provoking_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_query_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_buffer_object", 19))
+        {
+          ret = GLEW_ARB_query_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_robust_buffer_access_behavior
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robust_buffer_access_behavior", 29))
+        {
+          ret = GLEW_ARB_robust_buffer_access_behavior;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_robustness
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness", 10))
+        {
+          ret = GLEW_ARB_robustness;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_robustness_application_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_application_isolation", 32))
+        {
+          ret = GLEW_ARB_robustness_application_isolation;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_robustness_share_group_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_share_group_isolation", 32))
+        {
+          ret = GLEW_ARB_robustness_share_group_isolation;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sample_locations
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_locations", 16))
+        {
+          ret = GLEW_ARB_sample_locations;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sample_shading
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_shading", 14))
+        {
+          ret = GLEW_ARB_sample_shading;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sampler_objects
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sampler_objects", 15))
+        {
+          ret = GLEW_ARB_sampler_objects;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_seamless_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"seamless_cube_map", 17))
+        {
+          ret = GLEW_ARB_seamless_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_seamless_cubemap_per_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"seamless_cubemap_per_texture", 28))
+        {
+          ret = GLEW_ARB_seamless_cubemap_per_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_separate_shader_objects
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_shader_objects", 23))
+        {
+          ret = GLEW_ARB_separate_shader_objects;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_atomic_counter_ops
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_counter_ops", 25))
+        {
+          ret = GLEW_ARB_shader_atomic_counter_ops;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_atomic_counters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_counters", 22))
+        {
+          ret = GLEW_ARB_shader_atomic_counters;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_ballot
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_ballot", 13))
+        {
+          ret = GLEW_ARB_shader_ballot;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_bit_encoding
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_bit_encoding", 19))
+        {
+          ret = GLEW_ARB_shader_bit_encoding;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_clock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_clock", 12))
+        {
+          ret = GLEW_ARB_shader_clock;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_draw_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_draw_parameters", 22))
+        {
+          ret = GLEW_ARB_shader_draw_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_group_vote
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_group_vote", 17))
+        {
+          ret = GLEW_ARB_shader_group_vote;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_image_load_store
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_load_store", 23))
+        {
+          ret = GLEW_ARB_shader_image_load_store;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_image_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_size", 17))
+        {
+          ret = GLEW_ARB_shader_image_size;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_objects
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_objects", 14))
+        {
+          ret = GLEW_ARB_shader_objects;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_precision
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_precision", 16))
+        {
+          ret = GLEW_ARB_shader_precision;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_stencil_export
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_stencil_export", 21))
+        {
+          ret = GLEW_ARB_shader_stencil_export;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_storage_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_storage_buffer_object", 28))
+        {
+          ret = GLEW_ARB_shader_storage_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_subroutine
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_subroutine", 17))
+        {
+          ret = GLEW_ARB_shader_subroutine;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_texture_image_samples
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_image_samples", 28))
+        {
+          ret = GLEW_ARB_shader_texture_image_samples;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18))
+        {
+          ret = GLEW_ARB_shader_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_viewport_layer_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_viewport_layer_array", 27))
+        {
+          ret = GLEW_ARB_shader_viewport_layer_array;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shading_language_100
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_100", 20))
+        {
+          ret = GLEW_ARB_shading_language_100;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shading_language_420pack
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_420pack", 24))
+        {
+          ret = GLEW_ARB_shading_language_420pack;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shading_language_include
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_include", 24))
+        {
+          ret = GLEW_ARB_shading_language_include;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shading_language_packing
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_packing", 24))
+        {
+          ret = GLEW_ARB_shading_language_packing;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
+        {
+          ret = GLEW_ARB_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shadow_ambient
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
+        {
+          ret = GLEW_ARB_shadow_ambient;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sparse_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_buffer", 13))
+        {
+          ret = GLEW_ARB_sparse_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sparse_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture", 14))
+        {
+          ret = GLEW_ARB_sparse_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sparse_texture2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture2", 15))
+        {
+          ret = GLEW_ARB_sparse_texture2;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sparse_texture_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture_clamp", 20))
+        {
+          ret = GLEW_ARB_sparse_texture_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_spirv_extensions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"spirv_extensions", 16))
+        {
+          ret = GLEW_ARB_spirv_extensions;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_stencil_texturing
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_texturing", 17))
+        {
+          ret = GLEW_ARB_stencil_texturing;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync", 4))
+        {
+          ret = GLEW_ARB_sync;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_tessellation_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tessellation_shader", 19))
+        {
+          ret = GLEW_ARB_tessellation_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_barrier
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_barrier", 15))
+        {
+          ret = GLEW_ARB_texture_barrier;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_border_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
+        {
+          ret = GLEW_ARB_texture_border_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21))
+        {
+          ret = GLEW_ARB_texture_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_buffer_object_rgb32
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object_rgb32", 27))
+        {
+          ret = GLEW_ARB_texture_buffer_object_rgb32;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_buffer_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_range", 20))
+        {
+          ret = GLEW_ARB_texture_buffer_range;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_compression
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression", 19))
+        {
+          ret = GLEW_ARB_texture_compression;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_compression_bptc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_bptc", 24))
+        {
+          ret = GLEW_ARB_texture_compression_bptc;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_compression_rgtc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24))
+        {
+          ret = GLEW_ARB_texture_compression_rgtc;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
+        {
+          ret = GLEW_ARB_texture_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_cube_map_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map_array", 22))
+        {
+          ret = GLEW_ARB_texture_cube_map_array;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_add
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
+        {
+          ret = GLEW_ARB_texture_env_add;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_combine
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
+        {
+          ret = GLEW_ARB_texture_env_combine;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_crossbar
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_crossbar", 20))
+        {
+          ret = GLEW_ARB_texture_env_crossbar;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_dot3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
+        {
+          ret = GLEW_ARB_texture_env_dot3;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_filter_anisotropic
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26))
+        {
+          ret = GLEW_ARB_texture_filter_anisotropic;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_filter_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_minmax", 21))
+        {
+          ret = GLEW_ARB_texture_filter_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
+        {
+          ret = GLEW_ARB_texture_float;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_gather
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_gather", 14))
+        {
+          ret = GLEW_ARB_texture_gather;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_mirror_clamp_to_edge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp_to_edge", 28))
+        {
+          ret = GLEW_ARB_texture_mirror_clamp_to_edge;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_mirrored_repeat
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
+        {
+          ret = GLEW_ARB_texture_mirrored_repeat;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multisample", 19))
+        {
+          ret = GLEW_ARB_texture_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_non_power_of_two
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_non_power_of_two", 24))
+        {
+          ret = GLEW_ARB_texture_non_power_of_two;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_query_levels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_query_levels", 20))
+        {
+          ret = GLEW_ARB_texture_query_levels;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_query_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_query_lod", 17))
+        {
+          ret = GLEW_ARB_texture_query_lod;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_ARB_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_rg
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rg", 10))
+        {
+          ret = GLEW_ARB_texture_rg;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_rgb10_a2ui
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rgb10_a2ui", 18))
+        {
+          ret = GLEW_ARB_texture_rgb10_a2ui;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_stencil8
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stencil8", 16))
+        {
+          ret = GLEW_ARB_texture_stencil8;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_storage", 15))
+        {
+          ret = GLEW_ARB_texture_storage;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_storage_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_storage_multisample", 27))
+        {
+          ret = GLEW_ARB_texture_storage_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_swizzle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15))
+        {
+          ret = GLEW_ARB_texture_swizzle;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_view
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_view", 12))
+        {
+          ret = GLEW_ARB_texture_view;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_timer_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11))
+        {
+          ret = GLEW_ARB_timer_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transform_feedback2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback2", 19))
+        {
+          ret = GLEW_ARB_transform_feedback2;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transform_feedback3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback3", 19))
+        {
+          ret = GLEW_ARB_transform_feedback3;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transform_feedback_instanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback_instanced", 28))
+        {
+          ret = GLEW_ARB_transform_feedback_instanced;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transform_feedback_overflow_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback_overflow_query", 33))
+        {
+          ret = GLEW_ARB_transform_feedback_overflow_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transpose_matrix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transpose_matrix", 16))
+        {
+          ret = GLEW_ARB_transpose_matrix;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_uniform_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"uniform_buffer_object", 21))
+        {
+          ret = GLEW_ARB_uniform_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_array_bgra
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17))
+        {
+          ret = GLEW_ARB_vertex_array_bgra;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_ARB_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_attrib_64bit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_64bit", 19))
+        {
+          ret = GLEW_ARB_vertex_attrib_64bit;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_attrib_binding
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_binding", 21))
+        {
+          ret = GLEW_ARB_vertex_attrib_binding;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_blend", 12))
+        {
+          ret = GLEW_ARB_vertex_blend;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20))
+        {
+          ret = GLEW_ARB_vertex_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
+        {
+          ret = GLEW_ARB_vertex_program;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
+        {
+          ret = GLEW_ARB_vertex_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_type_10f_11f_11f_rev
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_type_10f_11f_11f_rev", 27))
+        {
+          ret = GLEW_ARB_vertex_type_10f_11f_11f_rev;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_type_2_10_10_10_rev
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_type_2_10_10_10_rev", 26))
+        {
+          ret = GLEW_ARB_vertex_type_2_10_10_10_rev;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_viewport_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"viewport_array", 14))
+        {
+          ret = GLEW_ARB_viewport_array;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_window_pos
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
+        {
+          ret = GLEW_ARB_window_pos;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARM_", 4))
+      {
+#ifdef GL_ARM_mali_program_binary
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mali_program_binary", 19))
+        {
+          ret = GLEW_ARM_mali_program_binary;
+          continue;
+        }
+#endif
+#ifdef GL_ARM_mali_shader_binary
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mali_shader_binary", 18))
+        {
+          ret = GLEW_ARM_mali_shader_binary;
+          continue;
+        }
+#endif
+#ifdef GL_ARM_rgba8
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rgba8", 5))
+        {
+          ret = GLEW_ARM_rgba8;
+          continue;
+        }
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_framebuffer_fetch", 24))
+        {
+          ret = GLEW_ARM_shader_framebuffer_fetch;
+          continue;
+        }
+#endif
+#ifdef GL_ARM_shader_framebuffer_fetch_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_framebuffer_fetch_depth_stencil", 38))
+        {
+          ret = GLEW_ARM_shader_framebuffer_fetch_depth_stencil;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATIX_", 5))
+      {
+#ifdef GL_ATIX_point_sprites
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprites", 13))
+        {
+          ret = GLEW_ATIX_point_sprites;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_texture_env_combine3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
+        {
+          ret = GLEW_ATIX_texture_env_combine3;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_texture_env_route
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_route", 17))
+        {
+          ret = GLEW_ATIX_texture_env_route;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_vertex_shader_output_point_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_output_point_size", 31))
+        {
+          ret = GLEW_ATIX_vertex_shader_output_point_size;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef GL_ATI_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_ATI_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_element_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
+        {
+          ret = GLEW_ATI_element_array;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_envmap_bumpmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"envmap_bumpmap", 14))
+        {
+          ret = GLEW_ATI_envmap_bumpmap;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
+        {
+          ret = GLEW_ATI_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_map_object_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_object_buffer", 17))
+        {
+          ret = GLEW_ATI_map_object_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_meminfo
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"meminfo", 7))
+        {
+          ret = GLEW_ATI_meminfo;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_pn_triangles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pn_triangles", 12))
+        {
+          ret = GLEW_ATI_pn_triangles;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_separate_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_stencil", 16))
+        {
+          ret = GLEW_ATI_separate_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_shader_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18))
+        {
+          ret = GLEW_ATI_shader_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_text_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"text_fragment_shader", 20))
+        {
+          ret = GLEW_ATI_text_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_compression_3dc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_3dc", 23))
+        {
+          ret = GLEW_ATI_texture_compression_3dc;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_env_combine3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
+        {
+          ret = GLEW_ATI_texture_env_combine3;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
+        {
+          ret = GLEW_ATI_texture_float;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_mirror_once
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_once", 19))
+        {
+          ret = GLEW_ATI_texture_mirror_once;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_ATI_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_attrib_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_array_object", 26))
+        {
+          ret = GLEW_ATI_vertex_attrib_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_streams
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_streams", 14))
+        {
+          ret = GLEW_ATI_vertex_streams;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EGL_", 4))
+      {
+#ifdef GL_EGL_KHR_context_flush_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"KHR_context_flush_control", 25))
+        {
+          ret = GLEW_EGL_KHR_context_flush_control;
+          continue;
+        }
+#endif
+#ifdef GL_EGL_NV_robustness_video_memory_purge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"NV_robustness_video_memory_purge", 32))
+        {
+          ret = GLEW_EGL_NV_robustness_video_memory_purge;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef GL_EXT_422_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"422_pixels", 10))
+        {
+          ret = GLEW_EXT_422_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_Cg_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"Cg_shader", 9))
+        {
+          ret = GLEW_EXT_Cg_shader;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_EGL_image_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"EGL_image_array", 15))
+        {
+          ret = GLEW_EXT_EGL_image_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_YUV_target
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"YUV_target", 10))
+        {
+          ret = GLEW_EXT_YUV_target;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_abgr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"abgr", 4))
+        {
+          ret = GLEW_EXT_abgr;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_base_instance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"base_instance", 13))
+        {
+          ret = GLEW_EXT_base_instance;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_bgra
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgra", 4))
+        {
+          ret = GLEW_EXT_bgra;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_bindable_uniform
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindable_uniform", 16))
+        {
+          ret = GLEW_EXT_bindable_uniform;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_color", 11))
+        {
+          ret = GLEW_EXT_blend_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_equation_separate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_separate", 23))
+        {
+          ret = GLEW_EXT_blend_equation_separate;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_func_extended
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_extended", 19))
+        {
+          ret = GLEW_EXT_blend_func_extended;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_func_separate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_separate", 19))
+        {
+          ret = GLEW_EXT_blend_func_separate;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_logic_op
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_logic_op", 14))
+        {
+          ret = GLEW_EXT_blend_logic_op;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax", 12))
+        {
+          ret = GLEW_EXT_blend_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_subtract
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_subtract", 14))
+        {
+          ret = GLEW_EXT_blend_subtract;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_buffer_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_storage", 14))
+        {
+          ret = GLEW_EXT_buffer_storage;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_clear_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clear_texture", 13))
+        {
+          ret = GLEW_EXT_clear_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_clip_cull_distance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_cull_distance", 18))
+        {
+          ret = GLEW_EXT_clip_cull_distance;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_clip_volume_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_volume_hint", 16))
+        {
+          ret = GLEW_EXT_clip_volume_hint;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_cmyka
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cmyka", 5))
+        {
+          ret = GLEW_EXT_cmyka;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_color_buffer_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18))
+        {
+          ret = GLEW_EXT_color_buffer_float;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_color_buffer_half_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_half_float", 23))
+        {
+          ret = GLEW_EXT_color_buffer_half_float;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_color_subtable
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_subtable", 14))
+        {
+          ret = GLEW_EXT_color_subtable;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_compiled_vertex_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compiled_vertex_array", 21))
+        {
+          ret = GLEW_EXT_compiled_vertex_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_compressed_ETC1_RGB8_sub_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_ETC1_RGB8_sub_texture", 32))
+        {
+          ret = GLEW_EXT_compressed_ETC1_RGB8_sub_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_conservative_depth
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_depth", 18))
+        {
+          ret = GLEW_EXT_conservative_depth;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_convolution
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution", 11))
+        {
+          ret = GLEW_EXT_convolution;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_coordinate_frame
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"coordinate_frame", 16))
+        {
+          ret = GLEW_EXT_coordinate_frame;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_copy_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
+        {
+          ret = GLEW_EXT_copy_image;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_copy_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture", 12))
+        {
+          ret = GLEW_EXT_copy_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_cull_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
+        {
+          ret = GLEW_EXT_cull_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_debug_label
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_label", 11))
+        {
+          ret = GLEW_EXT_debug_label;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_debug_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_marker", 12))
+        {
+          ret = GLEW_EXT_debug_marker;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_depth_bounds_test
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_bounds_test", 17))
+        {
+          ret = GLEW_EXT_depth_bounds_test;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_direct_state_access
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"direct_state_access", 19))
+        {
+          ret = GLEW_EXT_direct_state_access;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_discard_framebuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"discard_framebuffer", 19))
+        {
+          ret = GLEW_EXT_discard_framebuffer;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_EXT_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_buffers2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers2", 13))
+        {
+          ret = GLEW_EXT_draw_buffers2;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_buffers_indexed
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers_indexed", 20))
+        {
+          ret = GLEW_EXT_draw_buffers_indexed;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_elements_base_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_elements_base_vertex", 25))
+        {
+          ret = GLEW_EXT_draw_elements_base_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_instanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14))
+        {
+          ret = GLEW_EXT_draw_instanced;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_range_elements
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_range_elements", 19))
+        {
+          ret = GLEW_EXT_draw_range_elements;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_external_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"external_buffer", 15))
+        {
+          ret = GLEW_EXT_external_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_float_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_blend", 11))
+        {
+          ret = GLEW_EXT_float_blend;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_fog_coord
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_coord", 9))
+        {
+          ret = GLEW_EXT_fog_coord;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_frag_depth
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"frag_depth", 10))
+        {
+          ret = GLEW_EXT_frag_depth;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_fragment_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting", 17))
+        {
+          ret = GLEW_EXT_fragment_lighting;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_blit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16))
+        {
+          ret = GLEW_EXT_framebuffer_blit;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
+        {
+          ret = GLEW_EXT_framebuffer_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_multisample_blit_scaled
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_blit_scaled", 35))
+        {
+          ret = GLEW_EXT_framebuffer_multisample_blit_scaled;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18))
+        {
+          ret = GLEW_EXT_framebuffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = GLEW_EXT_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_geometry_point_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_point_size", 19))
+        {
+          ret = GLEW_EXT_geometry_point_size;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_geometry_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader", 15))
+        {
+          ret = GLEW_EXT_geometry_shader;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_geometry_shader4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
+        {
+          ret = GLEW_EXT_geometry_shader4;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_gpu_program_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_parameters", 22))
+        {
+          ret = GLEW_EXT_gpu_program_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_gpu_shader4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader4", 11))
+        {
+          ret = GLEW_EXT_gpu_shader4;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_gpu_shader5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader5", 11))
+        {
+          ret = GLEW_EXT_gpu_shader5;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_histogram
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"histogram", 9))
+        {
+          ret = GLEW_EXT_histogram;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_array_formats
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_array_formats", 19))
+        {
+          ret = GLEW_EXT_index_array_formats;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_func
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_func", 10))
+        {
+          ret = GLEW_EXT_index_func;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_material
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_material", 14))
+        {
+          ret = GLEW_EXT_index_material;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_texture", 13))
+        {
+          ret = GLEW_EXT_index_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_instanced_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16))
+        {
+          ret = GLEW_EXT_instanced_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_light_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_texture", 13))
+        {
+          ret = GLEW_EXT_light_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_map_buffer_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_range", 16))
+        {
+          ret = GLEW_EXT_map_buffer_range;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_memory_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"memory_object", 13))
+        {
+          ret = GLEW_EXT_memory_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_memory_object_fd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"memory_object_fd", 16))
+        {
+          ret = GLEW_EXT_memory_object_fd;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_memory_object_win32
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"memory_object_win32", 19))
+        {
+          ret = GLEW_EXT_memory_object_win32;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_misc_attribute
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_attribute", 14))
+        {
+          ret = GLEW_EXT_misc_attribute;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multi_draw_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_arrays", 17))
+        {
+          ret = GLEW_EXT_multi_draw_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multi_draw_indirect
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_indirect", 19))
+        {
+          ret = GLEW_EXT_multi_draw_indirect;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multiple_textures
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiple_textures", 17))
+        {
+          ret = GLEW_EXT_multiple_textures;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_EXT_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multisample_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_compatibility", 25))
+        {
+          ret = GLEW_EXT_multisample_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisampled_render_to_texture", 30))
+        {
+          ret = GLEW_EXT_multisampled_render_to_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multisampled_render_to_texture2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisampled_render_to_texture2", 31))
+        {
+          ret = GLEW_EXT_multisampled_render_to_texture2;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multiview_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiview_draw_buffers", 22))
+        {
+          ret = GLEW_EXT_multiview_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_packed_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
+        {
+          ret = GLEW_EXT_packed_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float", 12))
+        {
+          ret = GLEW_EXT_packed_float;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_packed_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_pixels", 13))
+        {
+          ret = GLEW_EXT_packed_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_paletted_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"paletted_texture", 16))
+        {
+          ret = GLEW_EXT_paletted_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
+        {
+          ret = GLEW_EXT_pixel_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_transform
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform", 15))
+        {
+          ret = GLEW_EXT_pixel_transform;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_transform_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform_color_table", 27))
+        {
+          ret = GLEW_EXT_pixel_transform_color_table;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_point_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
+        {
+          ret = GLEW_EXT_point_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_polygon_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset", 14))
+        {
+          ret = GLEW_EXT_polygon_offset;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_polygon_offset_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset_clamp", 20))
+        {
+          ret = GLEW_EXT_polygon_offset_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_post_depth_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"post_depth_coverage", 19))
+        {
+          ret = GLEW_EXT_post_depth_coverage;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_provoking_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"provoking_vertex", 16))
+        {
+          ret = GLEW_EXT_provoking_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pvrtc_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pvrtc_sRGB", 10))
+        {
+          ret = GLEW_EXT_pvrtc_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_raster_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"raster_multisample", 18))
+        {
+          ret = GLEW_EXT_raster_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_read_format_bgra
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_format_bgra", 16))
+        {
+          ret = GLEW_EXT_read_format_bgra;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_render_snorm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_snorm", 12))
+        {
+          ret = GLEW_EXT_render_snorm;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_rescale_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rescale_normal", 14))
+        {
+          ret = GLEW_EXT_rescale_normal;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sRGB", 4))
+        {
+          ret = GLEW_EXT_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_sRGB_write_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sRGB_write_control", 18))
+        {
+          ret = GLEW_EXT_sRGB_write_control;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_scene_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
+        {
+          ret = GLEW_EXT_scene_marker;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_secondary_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"secondary_color", 15))
+        {
+          ret = GLEW_EXT_secondary_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_semaphore
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"semaphore", 9))
+        {
+          ret = GLEW_EXT_semaphore;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_semaphore_fd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"semaphore_fd", 12))
+        {
+          ret = GLEW_EXT_semaphore_fd;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_semaphore_win32
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"semaphore_win32", 15))
+        {
+          ret = GLEW_EXT_semaphore_win32;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_separate_shader_objects
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_shader_objects", 23))
+        {
+          ret = GLEW_EXT_separate_shader_objects;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_separate_specular_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_specular_color", 23))
+        {
+          ret = GLEW_EXT_separate_specular_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_framebuffer_fetch
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_framebuffer_fetch", 24))
+        {
+          ret = GLEW_EXT_shader_framebuffer_fetch;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_group_vote
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_group_vote", 17))
+        {
+          ret = GLEW_EXT_shader_group_vote;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_image_load_formatted
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_load_formatted", 27))
+        {
+          ret = GLEW_EXT_shader_image_load_formatted;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_image_load_store
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_load_store", 23))
+        {
+          ret = GLEW_EXT_shader_image_load_store;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_implicit_conversions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_implicit_conversions", 27))
+        {
+          ret = GLEW_EXT_shader_implicit_conversions;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_integer_mix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_integer_mix", 18))
+        {
+          ret = GLEW_EXT_shader_integer_mix;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_io_blocks
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_io_blocks", 16))
+        {
+          ret = GLEW_EXT_shader_io_blocks;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_non_constant_global_initializers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_non_constant_global_initializers", 39))
+        {
+          ret = GLEW_EXT_shader_non_constant_global_initializers;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_pixel_local_storage", 26))
+        {
+          ret = GLEW_EXT_shader_pixel_local_storage;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_pixel_local_storage2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_pixel_local_storage2", 27))
+        {
+          ret = GLEW_EXT_shader_pixel_local_storage2;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shader_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18))
+        {
+          ret = GLEW_EXT_shader_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shadow_funcs
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12))
+        {
+          ret = GLEW_EXT_shadow_funcs;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shadow_samplers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_samplers", 15))
+        {
+          ret = GLEW_EXT_shadow_samplers;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shared_texture_palette
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_texture_palette", 22))
+        {
+          ret = GLEW_EXT_shared_texture_palette;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_sparse_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture", 14))
+        {
+          ret = GLEW_EXT_sparse_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_sparse_texture2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sparse_texture2", 15))
+        {
+          ret = GLEW_EXT_sparse_texture2;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_clear_tag
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_clear_tag", 17))
+        {
+          ret = GLEW_EXT_stencil_clear_tag;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_two_side
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_two_side", 16))
+        {
+          ret = GLEW_EXT_stencil_two_side;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_wrap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_wrap", 12))
+        {
+          ret = GLEW_EXT_stencil_wrap;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_subtexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subtexture", 10))
+        {
+          ret = GLEW_EXT_subtexture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture", 7))
+        {
+          ret = GLEW_EXT_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture3D
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture3D", 9))
+        {
+          ret = GLEW_EXT_texture3D;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_array", 13))
+        {
+          ret = GLEW_EXT_texture_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21))
+        {
+          ret = GLEW_EXT_texture_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_decode_mode", 36))
+        {
+          ret = GLEW_EXT_texture_compression_astc_decode_mode;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_astc_decode_mode_rgb9e5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_decode_mode_rgb9e5", 43))
+        {
+          ret = GLEW_EXT_texture_compression_astc_decode_mode_rgb9e5;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_bptc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_bptc", 24))
+        {
+          ret = GLEW_EXT_texture_compression_bptc;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_dxt1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24))
+        {
+          ret = GLEW_EXT_texture_compression_dxt1;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_latc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_latc", 24))
+        {
+          ret = GLEW_EXT_texture_compression_latc;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_rgtc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24))
+        {
+          ret = GLEW_EXT_texture_compression_rgtc;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_s3tc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24))
+        {
+          ret = GLEW_EXT_texture_compression_s3tc;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
+        {
+          ret = GLEW_EXT_texture_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_cube_map_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map_array", 22))
+        {
+          ret = GLEW_EXT_texture_cube_map_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_edge_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
+        {
+          ret = GLEW_EXT_texture_edge_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env", 11))
+        {
+          ret = GLEW_EXT_texture_env;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_add
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
+        {
+          ret = GLEW_EXT_texture_env_add;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_combine
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
+        {
+          ret = GLEW_EXT_texture_env_combine;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_dot3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
+        {
+          ret = GLEW_EXT_texture_env_dot3;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_filter_anisotropic
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26))
+        {
+          ret = GLEW_EXT_texture_filter_anisotropic;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_filter_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_minmax", 21))
+        {
+          ret = GLEW_EXT_texture_filter_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_format_BGRA8888
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_format_BGRA8888", 23))
+        {
+          ret = GLEW_EXT_texture_format_BGRA8888;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_integer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_integer", 15))
+        {
+          ret = GLEW_EXT_texture_integer;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_lod_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
+        {
+          ret = GLEW_EXT_texture_lod_bias;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_mirror_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp", 20))
+        {
+          ret = GLEW_EXT_texture_mirror_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_norm16
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_norm16", 14))
+        {
+          ret = GLEW_EXT_texture_norm16;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_object", 14))
+        {
+          ret = GLEW_EXT_texture_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_perturb_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_perturb_normal", 22))
+        {
+          ret = GLEW_EXT_texture_perturb_normal;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_EXT_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_rg
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rg", 10))
+        {
+          ret = GLEW_EXT_texture_rg;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB", 12))
+        {
+          ret = GLEW_EXT_texture_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_sRGB_R8
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB_R8", 15))
+        {
+          ret = GLEW_EXT_texture_sRGB_R8;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_sRGB_RG8
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB_RG8", 16))
+        {
+          ret = GLEW_EXT_texture_sRGB_RG8;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_sRGB_decode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB_decode", 19))
+        {
+          ret = GLEW_EXT_texture_sRGB_decode;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_shared_exponent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shared_exponent", 23))
+        {
+          ret = GLEW_EXT_texture_shared_exponent;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_snorm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_snorm", 13))
+        {
+          ret = GLEW_EXT_texture_snorm;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_storage", 15))
+        {
+          ret = GLEW_EXT_texture_storage;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_swizzle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15))
+        {
+          ret = GLEW_EXT_texture_swizzle;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_type_2_10_10_10_REV
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_type_2_10_10_10_REV", 27))
+        {
+          ret = GLEW_EXT_texture_type_2_10_10_10_REV;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_view
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_view", 12))
+        {
+          ret = GLEW_EXT_texture_view;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_timer_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11))
+        {
+          ret = GLEW_EXT_timer_query;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_transform_feedback
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18))
+        {
+          ret = GLEW_EXT_transform_feedback;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_unpack_subimage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"unpack_subimage", 15))
+        {
+          ret = GLEW_EXT_unpack_subimage;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array", 12))
+        {
+          ret = GLEW_EXT_vertex_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_array_bgra
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17))
+        {
+          ret = GLEW_EXT_vertex_array_bgra;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_array_setXXX
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_setXXX", 19))
+        {
+          ret = GLEW_EXT_vertex_array_setXXX;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_attrib_64bit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_64bit", 19))
+        {
+          ret = GLEW_EXT_vertex_attrib_64bit;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
+        {
+          ret = GLEW_EXT_vertex_shader;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_weighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_weighting", 16))
+        {
+          ret = GLEW_EXT_vertex_weighting;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_win32_keyed_mutex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"win32_keyed_mutex", 17))
+        {
+          ret = GLEW_EXT_win32_keyed_mutex;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_window_rectangles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_rectangles", 17))
+        {
+          ret = GLEW_EXT_window_rectangles;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_x11_sync_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"x11_sync_object", 15))
+        {
+          ret = GLEW_EXT_x11_sync_object;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"GREMEDY_", 8))
+      {
+#ifdef GL_GREMEDY_frame_terminator
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"frame_terminator", 16))
+        {
+          ret = GLEW_GREMEDY_frame_terminator;
+          continue;
+        }
+#endif
+#ifdef GL_GREMEDY_string_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"string_marker", 13))
+        {
+          ret = GLEW_GREMEDY_string_marker;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"HP_", 3))
+      {
+#ifdef GL_HP_convolution_border_modes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
+        {
+          ret = GLEW_HP_convolution_border_modes;
+          continue;
+        }
+#endif
+#ifdef GL_HP_image_transform
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_transform", 15))
+        {
+          ret = GLEW_HP_image_transform;
+          continue;
+        }
+#endif
+#ifdef GL_HP_occlusion_test
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_test", 14))
+        {
+          ret = GLEW_HP_occlusion_test;
+          continue;
+        }
+#endif
+#ifdef GL_HP_texture_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lighting", 16))
+        {
+          ret = GLEW_HP_texture_lighting;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"IBM_", 4))
+      {
+#ifdef GL_IBM_cull_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
+        {
+          ret = GLEW_IBM_cull_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_multimode_draw_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multimode_draw_arrays", 21))
+        {
+          ret = GLEW_IBM_multimode_draw_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_rasterpos_clip
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rasterpos_clip", 14))
+        {
+          ret = GLEW_IBM_rasterpos_clip;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_static_data
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"static_data", 11))
+        {
+          ret = GLEW_IBM_static_data;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
+        {
+          ret = GLEW_IBM_texture_mirrored_repeat;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_vertex_array_lists
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_lists", 18))
+        {
+          ret = GLEW_IBM_vertex_array_lists;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INGR_", 5))
+      {
+#ifdef GL_INGR_color_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_clamp", 11))
+        {
+          ret = GLEW_INGR_color_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_INGR_interlace_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace_read", 14))
+        {
+          ret = GLEW_INGR_interlace_read;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
+      {
+#ifdef GL_INTEL_conservative_rasterization
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_rasterization", 26))
+        {
+          ret = GLEW_INTEL_conservative_rasterization;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_fragment_shader_ordering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader_ordering", 24))
+        {
+          ret = GLEW_INTEL_fragment_shader_ordering;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_framebuffer_CMAA
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_CMAA", 16))
+        {
+          ret = GLEW_INTEL_framebuffer_CMAA;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_map_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_texture", 11))
+        {
+          ret = GLEW_INTEL_map_texture;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_parallel_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_arrays", 15))
+        {
+          ret = GLEW_INTEL_parallel_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_performance_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"performance_query", 17))
+        {
+          ret = GLEW_INTEL_performance_query;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_texture_scissor
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scissor", 15))
+        {
+          ret = GLEW_INTEL_texture_scissor;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KHR_", 4))
+      {
+#ifdef GL_KHR_blend_equation_advanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_advanced", 23))
+        {
+          ret = GLEW_KHR_blend_equation_advanced;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_blend_equation_advanced_coherent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_advanced_coherent", 32))
+        {
+          ret = GLEW_KHR_blend_equation_advanced_coherent;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_context_flush_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"context_flush_control", 21))
+        {
+          ret = GLEW_KHR_context_flush_control;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_debug
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug", 5))
+        {
+          ret = GLEW_KHR_debug;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_no_error
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"no_error", 8))
+        {
+          ret = GLEW_KHR_no_error;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_parallel_shader_compile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_shader_compile", 23))
+        {
+          ret = GLEW_KHR_parallel_shader_compile;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_robust_buffer_access_behavior
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robust_buffer_access_behavior", 29))
+        {
+          ret = GLEW_KHR_robust_buffer_access_behavior;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_robustness
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness", 10))
+        {
+          ret = GLEW_KHR_robustness;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_texture_compression_astc_hdr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_hdr", 28))
+        {
+          ret = GLEW_KHR_texture_compression_astc_hdr;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_texture_compression_astc_ldr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_ldr", 28))
+        {
+          ret = GLEW_KHR_texture_compression_astc_ldr;
+          continue;
+        }
+#endif
+#ifdef GL_KHR_texture_compression_astc_sliced_3d
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_sliced_3d", 34))
+        {
+          ret = GLEW_KHR_texture_compression_astc_sliced_3d;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KTX_", 4))
+      {
+#ifdef GL_KTX_buffer_region
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
+        {
+          ret = GLEW_KTX_buffer_region;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESAX_", 6))
+      {
+#ifdef GL_MESAX_texture_stack
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stack", 13))
+        {
+          ret = GLEW_MESAX_texture_stack;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
+      {
+#ifdef GL_MESA_pack_invert
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_invert", 11))
+        {
+          ret = GLEW_MESA_pack_invert;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_resize_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resize_buffers", 14))
+        {
+          ret = GLEW_MESA_resize_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_shader_integer_functions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_integer_functions", 24))
+        {
+          ret = GLEW_MESA_shader_integer_functions;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_window_pos
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
+        {
+          ret = GLEW_MESA_window_pos;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_ycbcr_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_texture", 13))
+        {
+          ret = GLEW_MESA_ycbcr_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NVX_", 4))
+      {
+#ifdef GL_NVX_blend_equation_advanced_multi_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_advanced_multi_draw_buffers", 42))
+        {
+          ret = GLEW_NVX_blend_equation_advanced_multi_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_NVX_conditional_render
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render", 18))
+        {
+          ret = GLEW_NVX_conditional_render;
+          continue;
+        }
+#endif
+#ifdef GL_NVX_gpu_memory_info
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_memory_info", 15))
+        {
+          ret = GLEW_NVX_gpu_memory_info;
+          continue;
+        }
+#endif
+#ifdef GL_NVX_linked_gpu_multicast
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"linked_gpu_multicast", 20))
+        {
+          ret = GLEW_NVX_linked_gpu_multicast;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef GL_NV_3dvision_settings
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3dvision_settings", 17))
+        {
+          ret = GLEW_NV_3dvision_settings;
+          continue;
+        }
+#endif
+#ifdef GL_NV_EGL_stream_consumer_external
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"EGL_stream_consumer_external", 28))
+        {
+          ret = GLEW_NV_EGL_stream_consumer_external;
+          continue;
+        }
+#endif
+#ifdef GL_NV_alpha_to_coverage_dither_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"alpha_to_coverage_dither_control", 32))
+        {
+          ret = GLEW_NV_alpha_to_coverage_dither_control;
+          continue;
+        }
+#endif
+#ifdef GL_NV_bgr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgr", 3))
+        {
+          ret = GLEW_NV_bgr;
+          continue;
+        }
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindless_multi_draw_indirect", 28))
+        {
+          ret = GLEW_NV_bindless_multi_draw_indirect;
+          continue;
+        }
+#endif
+#ifdef GL_NV_bindless_multi_draw_indirect_count
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindless_multi_draw_indirect_count", 34))
+        {
+          ret = GLEW_NV_bindless_multi_draw_indirect_count;
+          continue;
+        }
+#endif
+#ifdef GL_NV_bindless_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindless_texture", 16))
+        {
+          ret = GLEW_NV_bindless_texture;
+          continue;
+        }
+#endif
+#ifdef GL_NV_blend_equation_advanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_advanced", 23))
+        {
+          ret = GLEW_NV_blend_equation_advanced;
+          continue;
+        }
+#endif
+#ifdef GL_NV_blend_equation_advanced_coherent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_advanced_coherent", 32))
+        {
+          ret = GLEW_NV_blend_equation_advanced_coherent;
+          continue;
+        }
+#endif
+#ifdef GL_NV_blend_minmax_factor
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax_factor", 19))
+        {
+          ret = GLEW_NV_blend_minmax_factor;
+          continue;
+        }
+#endif
+#ifdef GL_NV_blend_square
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_square", 12))
+        {
+          ret = GLEW_NV_blend_square;
+          continue;
+        }
+#endif
+#ifdef GL_NV_clip_space_w_scaling
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_space_w_scaling", 20))
+        {
+          ret = GLEW_NV_clip_space_w_scaling;
+          continue;
+        }
+#endif
+#ifdef GL_NV_command_list
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"command_list", 12))
+        {
+          ret = GLEW_NV_command_list;
+          continue;
+        }
+#endif
+#ifdef GL_NV_compute_program5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compute_program5", 16))
+        {
+          ret = GLEW_NV_compute_program5;
+          continue;
+        }
+#endif
+#ifdef GL_NV_conditional_render
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render", 18))
+        {
+          ret = GLEW_NV_conditional_render;
+          continue;
+        }
+#endif
+#ifdef GL_NV_conservative_raster
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_raster", 19))
+        {
+          ret = GLEW_NV_conservative_raster;
+          continue;
+        }
+#endif
+#ifdef GL_NV_conservative_raster_dilate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_raster_dilate", 26))
+        {
+          ret = GLEW_NV_conservative_raster_dilate;
+          continue;
+        }
+#endif
+#ifdef GL_NV_conservative_raster_pre_snap_triangles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_raster_pre_snap_triangles", 38))
+        {
+          ret = GLEW_NV_conservative_raster_pre_snap_triangles;
+          continue;
+        }
+#endif
+#ifdef GL_NV_copy_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_buffer", 11))
+        {
+          ret = GLEW_NV_copy_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_NV_copy_depth_to_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_depth_to_color", 19))
+        {
+          ret = GLEW_NV_copy_depth_to_color;
+          continue;
+        }
+#endif
+#ifdef GL_NV_copy_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
+        {
+          ret = GLEW_NV_copy_image;
+          continue;
+        }
+#endif
+#ifdef GL_NV_deep_texture3D
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"deep_texture3D", 14))
+        {
+          ret = GLEW_NV_deep_texture3D;
+          continue;
+        }
+#endif
+#ifdef GL_NV_depth_buffer_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18))
+        {
+          ret = GLEW_NV_depth_buffer_float;
+          continue;
+        }
+#endif
+#ifdef GL_NV_depth_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11))
+        {
+          ret = GLEW_NV_depth_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_NV_depth_range_unclamped
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_range_unclamped", 21))
+        {
+          ret = GLEW_NV_depth_range_unclamped;
+          continue;
+        }
+#endif
+#ifdef GL_NV_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_NV_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_NV_draw_instanced
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14))
+        {
+          ret = GLEW_NV_draw_instanced;
+          continue;
+        }
+#endif
+#ifdef GL_NV_draw_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_texture", 12))
+        {
+          ret = GLEW_NV_draw_texture;
+          continue;
+        }
+#endif
+#ifdef GL_NV_draw_vulkan_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_vulkan_image", 17))
+        {
+          ret = GLEW_NV_draw_vulkan_image;
+          continue;
+        }
+#endif
+#ifdef GL_NV_evaluators
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"evaluators", 10))
+        {
+          ret = GLEW_NV_evaluators;
+          continue;
+        }
+#endif
+#ifdef GL_NV_explicit_attrib_location
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_attrib_location", 24))
+        {
+          ret = GLEW_NV_explicit_attrib_location;
+          continue;
+        }
+#endif
+#ifdef GL_NV_explicit_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_multisample", 20))
+        {
+          ret = GLEW_NV_explicit_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fbo_color_attachments
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbo_color_attachments", 21))
+        {
+          ret = GLEW_NV_fbo_color_attachments;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fence
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
+        {
+          ret = GLEW_NV_fence;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fill_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fill_rectangle", 14))
+        {
+          ret = GLEW_NV_fill_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = GLEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fog_distance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_distance", 12))
+        {
+          ret = GLEW_NV_fog_distance;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_coverage_to_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_coverage_to_color", 26))
+        {
+          ret = GLEW_NV_fragment_coverage_to_color;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
+        {
+          ret = GLEW_NV_fragment_program;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program2", 17))
+        {
+          ret = GLEW_NV_fragment_program2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program4", 17))
+        {
+          ret = GLEW_NV_fragment_program4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program_option
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_option", 23))
+        {
+          ret = GLEW_NV_fragment_program_option;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_shader_interlock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader_interlock", 25))
+        {
+          ret = GLEW_NV_fragment_shader_interlock;
+          continue;
+        }
+#endif
+#ifdef GL_NV_framebuffer_blit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16))
+        {
+          ret = GLEW_NV_framebuffer_blit;
+          continue;
+        }
+#endif
+#ifdef GL_NV_framebuffer_mixed_samples
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_mixed_samples", 25))
+        {
+          ret = GLEW_NV_framebuffer_mixed_samples;
+          continue;
+        }
+#endif
+#ifdef GL_NV_framebuffer_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
+        {
+          ret = GLEW_NV_framebuffer_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_NV_framebuffer_multisample_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_coverage", 32))
+        {
+          ret = GLEW_NV_framebuffer_multisample_coverage;
+          continue;
+        }
+#endif
+#ifdef GL_NV_generate_mipmap_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap_sRGB", 20))
+        {
+          ret = GLEW_NV_generate_mipmap_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_NV_geometry_program4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_program4", 17))
+        {
+          ret = GLEW_NV_geometry_program4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_geometry_shader4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
+        {
+          ret = GLEW_NV_geometry_shader4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_geometry_shader_passthrough
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader_passthrough", 27))
+        {
+          ret = GLEW_NV_geometry_shader_passthrough;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_multicast
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_multicast", 13))
+        {
+          ret = GLEW_NV_gpu_multicast;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_program4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program4", 12))
+        {
+          ret = GLEW_NV_gpu_program4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_program5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program5", 12))
+        {
+          ret = GLEW_NV_gpu_program5;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_program5_mem_extended
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program5_mem_extended", 25))
+        {
+          ret = GLEW_NV_gpu_program5_mem_extended;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_program_fp64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_fp64", 16))
+        {
+          ret = GLEW_NV_gpu_program_fp64;
+          continue;
+        }
+#endif
+#ifdef GL_NV_gpu_shader5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader5", 11))
+        {
+          ret = GLEW_NV_gpu_shader5;
+          continue;
+        }
+#endif
+#ifdef GL_NV_half_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float", 10))
+        {
+          ret = GLEW_NV_half_float;
+          continue;
+        }
+#endif
+#ifdef GL_NV_image_formats
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_formats", 13))
+        {
+          ret = GLEW_NV_image_formats;
+          continue;
+        }
+#endif
+#ifdef GL_NV_instanced_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16))
+        {
+          ret = GLEW_NV_instanced_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_NV_internalformat_sample_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"internalformat_sample_query", 27))
+        {
+          ret = GLEW_NV_internalformat_sample_query;
+          continue;
+        }
+#endif
+#ifdef GL_NV_light_max_exponent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_max_exponent", 18))
+        {
+          ret = GLEW_NV_light_max_exponent;
+          continue;
+        }
+#endif
+#ifdef GL_NV_multisample_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
+        {
+          ret = GLEW_NV_multisample_coverage;
+          continue;
+        }
+#endif
+#ifdef GL_NV_multisample_filter_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_filter_hint", 23))
+        {
+          ret = GLEW_NV_multisample_filter_hint;
+          continue;
+        }
+#endif
+#ifdef GL_NV_non_square_matrices
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"non_square_matrices", 19))
+        {
+          ret = GLEW_NV_non_square_matrices;
+          continue;
+        }
+#endif
+#ifdef GL_NV_occlusion_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
+        {
+          ret = GLEW_NV_occlusion_query;
+          continue;
+        }
+#endif
+#ifdef GL_NV_pack_subimage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_subimage", 13))
+        {
+          ret = GLEW_NV_pack_subimage;
+          continue;
+        }
+#endif
+#ifdef GL_NV_packed_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
+        {
+          ret = GLEW_NV_packed_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_NV_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float", 12))
+        {
+          ret = GLEW_NV_packed_float;
+          continue;
+        }
+#endif
+#ifdef GL_NV_packed_float_linear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float_linear", 19))
+        {
+          ret = GLEW_NV_packed_float_linear;
+          continue;
+        }
+#endif
+#ifdef GL_NV_parameter_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object", 23))
+        {
+          ret = GLEW_NV_parameter_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_NV_parameter_buffer_object2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object2", 24))
+        {
+          ret = GLEW_NV_parameter_buffer_object2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_path_rendering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"path_rendering", 14))
+        {
+          ret = GLEW_NV_path_rendering;
+          continue;
+        }
+#endif
+#ifdef GL_NV_path_rendering_shared_edge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"path_rendering_shared_edge", 26))
+        {
+          ret = GLEW_NV_path_rendering_shared_edge;
+          continue;
+        }
+#endif
+#ifdef GL_NV_pixel_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
+        {
+          ret = GLEW_NV_pixel_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_NV_pixel_data_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_data_range", 16))
+        {
+          ret = GLEW_NV_pixel_data_range;
+          continue;
+        }
+#endif
+#ifdef GL_NV_platform_binary
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_binary", 15))
+        {
+          ret = GLEW_NV_platform_binary;
+          continue;
+        }
+#endif
+#ifdef GL_NV_point_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
+        {
+          ret = GLEW_NV_point_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_NV_polygon_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_mode", 12))
+        {
+          ret = GLEW_NV_polygon_mode;
+          continue;
+        }
+#endif
+#ifdef GL_NV_present_video
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
+        {
+          ret = GLEW_NV_present_video;
+          continue;
+        }
+#endif
+#ifdef GL_NV_primitive_restart
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"primitive_restart", 17))
+        {
+          ret = GLEW_NV_primitive_restart;
+          continue;
+        }
+#endif
+#ifdef GL_NV_read_depth
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_depth", 10))
+        {
+          ret = GLEW_NV_read_depth;
+          continue;
+        }
+#endif
+#ifdef GL_NV_read_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_depth_stencil", 18))
+        {
+          ret = GLEW_NV_read_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_NV_read_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_stencil", 12))
+        {
+          ret = GLEW_NV_read_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_NV_register_combiners
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners", 18))
+        {
+          ret = GLEW_NV_register_combiners;
+          continue;
+        }
+#endif
+#ifdef GL_NV_register_combiners2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners2", 19))
+        {
+          ret = GLEW_NV_register_combiners2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_robustness_video_memory_purge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_video_memory_purge", 29))
+        {
+          ret = GLEW_NV_robustness_video_memory_purge;
+          continue;
+        }
+#endif
+#ifdef GL_NV_sRGB_formats
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sRGB_formats", 12))
+        {
+          ret = GLEW_NV_sRGB_formats;
+          continue;
+        }
+#endif
+#ifdef GL_NV_sample_locations
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_locations", 16))
+        {
+          ret = GLEW_NV_sample_locations;
+          continue;
+        }
+#endif
+#ifdef GL_NV_sample_mask_override_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_mask_override_coverage", 29))
+        {
+          ret = GLEW_NV_sample_mask_override_coverage;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_atomic_counters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_counters", 22))
+        {
+          ret = GLEW_NV_shader_atomic_counters;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_atomic_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_float", 19))
+        {
+          ret = GLEW_NV_shader_atomic_float;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_atomic_float64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_float64", 21))
+        {
+          ret = GLEW_NV_shader_atomic_float64;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_atomic_fp16_vector
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_fp16_vector", 25))
+        {
+          ret = GLEW_NV_shader_atomic_fp16_vector;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_atomic_int64
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_int64", 19))
+        {
+          ret = GLEW_NV_shader_atomic_int64;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_buffer_load
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_buffer_load", 18))
+        {
+          ret = GLEW_NV_shader_buffer_load;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_noperspective_interpolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_noperspective_interpolation", 34))
+        {
+          ret = GLEW_NV_shader_noperspective_interpolation;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_storage_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_storage_buffer_object", 28))
+        {
+          ret = GLEW_NV_shader_storage_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_thread_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_thread_group", 19))
+        {
+          ret = GLEW_NV_shader_thread_group;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shader_thread_shuffle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_thread_shuffle", 21))
+        {
+          ret = GLEW_NV_shader_thread_shuffle;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shadow_samplers_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_samplers_array", 21))
+        {
+          ret = GLEW_NV_shadow_samplers_array;
+          continue;
+        }
+#endif
+#ifdef GL_NV_shadow_samplers_cube
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_samplers_cube", 20))
+        {
+          ret = GLEW_NV_shadow_samplers_cube;
+          continue;
+        }
+#endif
+#ifdef GL_NV_stereo_view_rendering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_view_rendering", 21))
+        {
+          ret = GLEW_NV_stereo_view_rendering;
+          continue;
+        }
+#endif
+#ifdef GL_NV_tessellation_program5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tessellation_program5", 21))
+        {
+          ret = GLEW_NV_tessellation_program5;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texgen_emboss
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_emboss", 13))
+        {
+          ret = GLEW_NV_texgen_emboss;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texgen_reflection
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_reflection", 17))
+        {
+          ret = GLEW_NV_texgen_reflection;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_array", 13))
+        {
+          ret = GLEW_NV_texture_array;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_barrier
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_barrier", 15))
+        {
+          ret = GLEW_NV_texture_barrier;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_border_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
+        {
+          ret = GLEW_NV_texture_border_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_compression_latc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_latc", 24))
+        {
+          ret = GLEW_NV_texture_compression_latc;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_compression_s3tc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24))
+        {
+          ret = GLEW_NV_texture_compression_s3tc;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_compression_s3tc_update
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc_update", 31))
+        {
+          ret = GLEW_NV_texture_compression_s3tc_update;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_compression_vtc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_vtc", 23))
+        {
+          ret = GLEW_NV_texture_compression_vtc;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_env_combine4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine4", 20))
+        {
+          ret = GLEW_NV_texture_env_combine4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_expand_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_expand_normal", 21))
+        {
+          ret = GLEW_NV_texture_expand_normal;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multisample", 19))
+        {
+          ret = GLEW_NV_texture_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_npot_2D_mipmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_npot_2D_mipmap", 22))
+        {
+          ret = GLEW_NV_texture_npot_2D_mipmap;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_NV_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_rectangle_compressed
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle_compressed", 28))
+        {
+          ret = GLEW_NV_texture_rectangle_compressed;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader", 14))
+        {
+          ret = GLEW_NV_texture_shader;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader2", 15))
+        {
+          ret = GLEW_NV_texture_shader2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader3", 15))
+        {
+          ret = GLEW_NV_texture_shader3;
+          continue;
+        }
+#endif
+#ifdef GL_NV_transform_feedback
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18))
+        {
+          ret = GLEW_NV_transform_feedback;
+          continue;
+        }
+#endif
+#ifdef GL_NV_transform_feedback2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback2", 19))
+        {
+          ret = GLEW_NV_transform_feedback2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_uniform_buffer_unified_memory
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"uniform_buffer_unified_memory", 29))
+        {
+          ret = GLEW_NV_uniform_buffer_unified_memory;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vdpau_interop
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vdpau_interop", 13))
+        {
+          ret = GLEW_NV_vdpau_interop;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_array_range2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range2", 19))
+        {
+          ret = GLEW_NV_vertex_array_range2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_attrib_integer_64bit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_integer_64bit", 27))
+        {
+          ret = GLEW_NV_vertex_attrib_integer_64bit;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_buffer_unified_memory
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_unified_memory", 28))
+        {
+          ret = GLEW_NV_vertex_buffer_unified_memory;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
+        {
+          ret = GLEW_NV_vertex_program;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program1_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program1_1", 17))
+        {
+          ret = GLEW_NV_vertex_program1_1;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2", 15))
+        {
+          ret = GLEW_NV_vertex_program2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program2_option
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2_option", 22))
+        {
+          ret = GLEW_NV_vertex_program2_option;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program3", 15))
+        {
+          ret = GLEW_NV_vertex_program3;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program4", 15))
+        {
+          ret = GLEW_NV_vertex_program4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_video_capture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
+        {
+          ret = GLEW_NV_video_capture;
+          continue;
+        }
+#endif
+#ifdef GL_NV_viewport_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"viewport_array", 14))
+        {
+          ret = GLEW_NV_viewport_array;
+          continue;
+        }
+#endif
+#ifdef GL_NV_viewport_array2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"viewport_array2", 15))
+        {
+          ret = GLEW_NV_viewport_array2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_viewport_swizzle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"viewport_swizzle", 16))
+        {
+          ret = GLEW_NV_viewport_swizzle;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OES_", 4))
+      {
+#ifdef GL_OES_byte_coordinates
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"byte_coordinates", 16))
+        {
+          ret = GLEW_OES_byte_coordinates;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef GL_OML_interlace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
+        {
+          ret = GLEW_OML_interlace;
+          continue;
+        }
+#endif
+#ifdef GL_OML_resample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
+        {
+          ret = GLEW_OML_resample;
+          continue;
+        }
+#endif
+#ifdef GL_OML_subsample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9))
+        {
+          ret = GLEW_OML_subsample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OVR_", 4))
+      {
+#ifdef GL_OVR_multiview
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiview", 9))
+        {
+          ret = GLEW_OVR_multiview;
+          continue;
+        }
+#endif
+#ifdef GL_OVR_multiview2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiview2", 10))
+        {
+          ret = GLEW_OVR_multiview2;
+          continue;
+        }
+#endif
+#ifdef GL_OVR_multiview_multisampled_render_to_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiview_multisampled_render_to_texture", 40))
+        {
+          ret = GLEW_OVR_multiview_multisampled_render_to_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"PGI_", 4))
+      {
+#ifdef GL_PGI_misc_hints
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_hints", 10))
+        {
+          ret = GLEW_PGI_misc_hints;
+          continue;
+        }
+#endif
+#ifdef GL_PGI_vertex_hints
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_hints", 12))
+        {
+          ret = GLEW_PGI_vertex_hints;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"QCOM_", 5))
+      {
+#ifdef GL_QCOM_alpha_test
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"alpha_test", 10))
+        {
+          ret = GLEW_QCOM_alpha_test;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_binning_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"binning_control", 15))
+        {
+          ret = GLEW_QCOM_binning_control;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_driver_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"driver_control", 14))
+        {
+          ret = GLEW_QCOM_driver_control;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_extended_get
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extended_get", 12))
+        {
+          ret = GLEW_QCOM_extended_get;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_extended_get2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extended_get2", 13))
+        {
+          ret = GLEW_QCOM_extended_get2;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_framebuffer_foveated
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_foveated", 20))
+        {
+          ret = GLEW_QCOM_framebuffer_foveated;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_perfmon_global_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"perfmon_global_mode", 19))
+        {
+          ret = GLEW_QCOM_perfmon_global_mode;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_shader_framebuffer_fetch_noncoherent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_framebuffer_fetch_noncoherent", 36))
+        {
+          ret = GLEW_QCOM_shader_framebuffer_fetch_noncoherent;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_tiled_rendering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tiled_rendering", 15))
+        {
+          ret = GLEW_QCOM_tiled_rendering;
+          continue;
+        }
+#endif
+#ifdef GL_QCOM_writeonly_rendering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"writeonly_rendering", 19))
+        {
+          ret = GLEW_QCOM_writeonly_rendering;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"REGAL_", 6))
+      {
+#ifdef GL_REGAL_ES1_0_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES1_0_compatibility", 19))
+        {
+          ret = GLEW_REGAL_ES1_0_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_ES1_1_compatibility
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES1_1_compatibility", 19))
+        {
+          ret = GLEW_REGAL_ES1_1_compatibility;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_enable
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"enable", 6))
+        {
+          ret = GLEW_REGAL_enable;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_error_string
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"error_string", 12))
+        {
+          ret = GLEW_REGAL_error_string;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_extension_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extension_query", 15))
+        {
+          ret = GLEW_REGAL_extension_query;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_log
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"log", 3))
+        {
+          ret = GLEW_REGAL_log;
+          continue;
+        }
+#endif
+#ifdef GL_REGAL_proc_address
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"proc_address", 12))
+        {
+          ret = GLEW_REGAL_proc_address;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"REND_", 5))
+      {
+#ifdef GL_REND_screen_coordinates
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"screen_coordinates", 18))
+        {
+          ret = GLEW_REND_screen_coordinates;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"S3_", 3))
+      {
+#ifdef GL_S3_s3tc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"s3tc", 4))
+        {
+          ret = GLEW_S3_s3tc;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
+      {
+#ifdef GL_SGIS_clip_band_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_band_hint", 14))
+        {
+          ret = GLEW_SGIS_clip_band_hint;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_color_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
+        {
+          ret = GLEW_SGIS_color_range;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_detail_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"detail_texture", 14))
+        {
+          ret = GLEW_SGIS_detail_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_fog_function
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_function", 12))
+        {
+          ret = GLEW_SGIS_fog_function;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_generate_mipmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap", 15))
+        {
+          ret = GLEW_SGIS_generate_mipmap;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_line_texgen
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"line_texgen", 11))
+        {
+          ret = GLEW_SGIS_line_texgen;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_SGIS_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_multitexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12))
+        {
+          ret = GLEW_SGIS_multitexture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_pixel_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
+        {
+          ret = GLEW_SGIS_pixel_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_point_line_texgen
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_line_texgen", 17))
+        {
+          ret = GLEW_SGIS_point_line_texgen;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_shared_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18))
+        {
+          ret = GLEW_SGIS_shared_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_sharpen_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sharpen_texture", 15))
+        {
+          ret = GLEW_SGIS_sharpen_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture4D
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture4D", 9))
+        {
+          ret = GLEW_SGIS_texture4D;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
+        {
+          ret = GLEW_SGIS_texture_border_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
+        {
+          ret = GLEW_SGIS_texture_edge_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_filter4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter4", 15))
+        {
+          ret = GLEW_SGIS_texture_filter4;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod", 11))
+        {
+          ret = GLEW_SGIS_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_select
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_select", 14))
+        {
+          ret = GLEW_SGIS_texture_select;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
+      {
+#ifdef GL_SGIX_async
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async", 5))
+        {
+          ret = GLEW_SGIX_async;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_async_histogram
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_histogram", 15))
+        {
+          ret = GLEW_SGIX_async_histogram;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_async_pixel
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_pixel", 11))
+        {
+          ret = GLEW_SGIX_async_pixel;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_bali_g_instruments
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bali_g_instruments", 18))
+        {
+          ret = GLEW_SGIX_bali_g_instruments;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_bali_r_instruments
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bali_r_instruments", 18))
+        {
+          ret = GLEW_SGIX_bali_r_instruments;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_bali_timer_instruments
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bali_timer_instruments", 22))
+        {
+          ret = GLEW_SGIX_bali_timer_instruments;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_blend_alpha_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_alpha_minmax", 18))
+        {
+          ret = GLEW_SGIX_blend_alpha_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_blend_cadd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_cadd", 10))
+        {
+          ret = GLEW_SGIX_blend_cadd;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_blend_cmultiply
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_cmultiply", 15))
+        {
+          ret = GLEW_SGIX_blend_cmultiply;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_calligraphic_fragment
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"calligraphic_fragment", 21))
+        {
+          ret = GLEW_SGIX_calligraphic_fragment;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_clipmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clipmap", 7))
+        {
+          ret = GLEW_SGIX_clipmap;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_color_matrix_accuracy
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix_accuracy", 21))
+        {
+          ret = GLEW_SGIX_color_matrix_accuracy;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_color_table_index_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table_index_mode", 22))
+        {
+          ret = GLEW_SGIX_color_table_index_mode;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_complex_polar
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"complex_polar", 13))
+        {
+          ret = GLEW_SGIX_complex_polar;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_convolution_accuracy
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_accuracy", 20))
+        {
+          ret = GLEW_SGIX_convolution_accuracy;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cube_map", 8))
+        {
+          ret = GLEW_SGIX_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_cylinder_texgen
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cylinder_texgen", 15))
+        {
+          ret = GLEW_SGIX_cylinder_texgen;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_datapipe
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"datapipe", 8))
+        {
+          ret = GLEW_SGIX_datapipe;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_decimation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"decimation", 10))
+        {
+          ret = GLEW_SGIX_decimation;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_depth_pass_instrument
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_pass_instrument", 21))
+        {
+          ret = GLEW_SGIX_depth_pass_instrument;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
+        {
+          ret = GLEW_SGIX_depth_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_dvc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"dvc", 3))
+        {
+          ret = GLEW_SGIX_dvc;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_flush_raster
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_raster", 12))
+        {
+          ret = GLEW_SGIX_flush_raster;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_blend", 9))
+        {
+          ret = GLEW_SGIX_fog_blend;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_factor_to_alpha
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_factor_to_alpha", 19))
+        {
+          ret = GLEW_SGIX_fog_factor_to_alpha;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_layers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_layers", 10))
+        {
+          ret = GLEW_SGIX_fog_layers;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_offset", 10))
+        {
+          ret = GLEW_SGIX_fog_offset;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_patchy
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_patchy", 10))
+        {
+          ret = GLEW_SGIX_fog_patchy;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_scale
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_scale", 9))
+        {
+          ret = GLEW_SGIX_fog_scale;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_texture", 11))
+        {
+          ret = GLEW_SGIX_fog_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fragment_lighting_space
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting_space", 23))
+        {
+          ret = GLEW_SGIX_fragment_lighting_space;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fragment_specular_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_specular_lighting", 26))
+        {
+          ret = GLEW_SGIX_fragment_specular_lighting;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fragments_instrument
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragments_instrument", 20))
+        {
+          ret = GLEW_SGIX_fragments_instrument;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_framezoom
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framezoom", 9))
+        {
+          ret = GLEW_SGIX_framezoom;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_icc_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"icc_texture", 11))
+        {
+          ret = GLEW_SGIX_icc_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_igloo_interface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"igloo_interface", 15))
+        {
+          ret = GLEW_SGIX_igloo_interface;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_image_compression
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_compression", 17))
+        {
+          ret = GLEW_SGIX_image_compression;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_impact_pixel_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"impact_pixel_texture", 20))
+        {
+          ret = GLEW_SGIX_impact_pixel_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_instrument_error
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instrument_error", 16))
+        {
+          ret = GLEW_SGIX_instrument_error;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_interlace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
+        {
+          ret = GLEW_SGIX_interlace;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ir_instrument1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ir_instrument1", 14))
+        {
+          ret = GLEW_SGIX_ir_instrument1;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_line_quality_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"line_quality_hint", 17))
+        {
+          ret = GLEW_SGIX_line_quality_hint;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_list_priority
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"list_priority", 13))
+        {
+          ret = GLEW_SGIX_list_priority;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_mpeg1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mpeg1", 5))
+        {
+          ret = GLEW_SGIX_mpeg1;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_mpeg2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mpeg2", 5))
+        {
+          ret = GLEW_SGIX_mpeg2;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_nonlinear_lighting_pervertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"nonlinear_lighting_pervertex", 28))
+        {
+          ret = GLEW_SGIX_nonlinear_lighting_pervertex;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_nurbs_eval
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"nurbs_eval", 10))
+        {
+          ret = GLEW_SGIX_nurbs_eval;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_occlusion_instrument
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_instrument", 20))
+        {
+          ret = GLEW_SGIX_occlusion_instrument;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_packed_6bytes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_6bytes", 13))
+        {
+          ret = GLEW_SGIX_packed_6bytes;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
+        {
+          ret = GLEW_SGIX_pixel_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_texture_bits
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_bits", 18))
+        {
+          ret = GLEW_SGIX_pixel_texture_bits;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_lod", 17))
+        {
+          ret = GLEW_SGIX_pixel_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_tiles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_tiles", 11))
+        {
+          ret = GLEW_SGIX_pixel_tiles;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_polynomial_ffd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polynomial_ffd", 14))
+        {
+          ret = GLEW_SGIX_polynomial_ffd;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_quad_mesh
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"quad_mesh", 9))
+        {
+          ret = GLEW_SGIX_quad_mesh;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_reference_plane
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"reference_plane", 15))
+        {
+          ret = GLEW_SGIX_reference_plane;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_resample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
+        {
+          ret = GLEW_SGIX_resample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_scalebias_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scalebias_hint", 14))
+        {
+          ret = GLEW_SGIX_scalebias_hint;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
+        {
+          ret = GLEW_SGIX_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_shadow_ambient
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
+        {
+          ret = GLEW_SGIX_shadow_ambient;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_slim
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"slim", 4))
+        {
+          ret = GLEW_SGIX_slim;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_spotlight_cutoff
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"spotlight_cutoff", 16))
+        {
+          ret = GLEW_SGIX_spotlight_cutoff;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sprite", 6))
+        {
+          ret = GLEW_SGIX_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_subdiv_patch
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subdiv_patch", 12))
+        {
+          ret = GLEW_SGIX_subdiv_patch;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_subsample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9))
+        {
+          ret = GLEW_SGIX_subsample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_tag_sample_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tag_sample_buffer", 17))
+        {
+          ret = GLEW_SGIX_tag_sample_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_add_env
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_add_env", 15))
+        {
+          ret = GLEW_SGIX_texture_add_env;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_coordinate_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_coordinate_clamp", 24))
+        {
+          ret = GLEW_SGIX_texture_coordinate_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_lod_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
+        {
+          ret = GLEW_SGIX_texture_lod_bias;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_mipmap_anisotropic
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mipmap_anisotropic", 26))
+        {
+          ret = GLEW_SGIX_texture_mipmap_anisotropic;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_multi_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multi_buffer", 20))
+        {
+          ret = GLEW_SGIX_texture_multi_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_phase
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_phase", 13))
+        {
+          ret = GLEW_SGIX_texture_phase;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
+        {
+          ret = GLEW_SGIX_texture_range;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_scale_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scale_bias", 18))
+        {
+          ret = GLEW_SGIX_texture_scale_bias;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_supersample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_supersample", 19))
+        {
+          ret = GLEW_SGIX_texture_supersample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vector_ops
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vector_ops", 10))
+        {
+          ret = GLEW_SGIX_vector_ops;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_SGIX_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vertex_preclip
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip", 14))
+        {
+          ret = GLEW_SGIX_vertex_preclip;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vertex_preclip_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip_hint", 19))
+        {
+          ret = GLEW_SGIX_vertex_preclip_hint;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ycrcb
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb", 5))
+        {
+          ret = GLEW_SGIX_ycrcb;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ycrcb_subsample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb_subsample", 15))
+        {
+          ret = GLEW_SGIX_ycrcb_subsample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ycrcba
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcba", 6))
+        {
+          ret = GLEW_SGIX_ycrcba;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
+      {
+#ifdef GL_SGI_color_matrix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix", 12))
+        {
+          ret = GLEW_SGI_color_matrix;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table", 11))
+        {
+          ret = GLEW_SGI_color_table;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_complex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"complex", 7))
+        {
+          ret = GLEW_SGI_complex;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_complex_type
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"complex_type", 12))
+        {
+          ret = GLEW_SGI_complex_type;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_fft
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fft", 3))
+        {
+          ret = GLEW_SGI_fft;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_texture_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_color_table", 19))
+        {
+          ret = GLEW_SGI_texture_color_table;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUNX_", 5))
+      {
+#ifdef GL_SUNX_constant_data
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"constant_data", 13))
+        {
+          ret = GLEW_SUNX_constant_data;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
+      {
+#ifdef GL_SUN_convolution_border_modes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
+        {
+          ret = GLEW_SUN_convolution_border_modes;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_global_alpha
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"global_alpha", 12))
+        {
+          ret = GLEW_SUN_global_alpha;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_mesh_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mesh_array", 10))
+        {
+          ret = GLEW_SUN_mesh_array;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_read_video_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_video_pixels", 17))
+        {
+          ret = GLEW_SUN_read_video_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_slice_accum
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"slice_accum", 11))
+        {
+          ret = GLEW_SUN_slice_accum;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_triangle_list
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"triangle_list", 13))
+        {
+          ret = GLEW_SUN_triangle_list;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex", 6))
+        {
+          ret = GLEW_SUN_vertex;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"WIN_", 4))
+      {
+#ifdef GL_WIN_phong_shading
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"phong_shading", 13))
+        {
+          ret = GLEW_WIN_phong_shading;
+          continue;
+        }
+#endif
+#ifdef GL_WIN_scene_markerXXX
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_markerXXX", 15))
+        {
+          ret = GLEW_WIN_scene_markerXXX;
+          continue;
+        }
+#endif
+#ifdef GL_WIN_specular_fog
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_fog", 12))
+        {
+          ret = GLEW_WIN_specular_fog;
+          continue;
+        }
+#endif
+#ifdef GL_WIN_swap_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_hint", 9))
+        {
+          ret = GLEW_WIN_swap_hint;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA)
+
+GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
+{
+  const GLubyte* pos = (const GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if (_glewStrSame1(&pos, &len, (const GLubyte*)"WGL_", 4))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef WGL_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_3DFX_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DL_", 4))
+      {
+#ifdef WGL_3DL_stereo_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_control", 14))
+        {
+          ret = WGLEW_3DL_stereo_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
+      {
+#ifdef WGL_AMD_gpu_association
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_association", 15))
+        {
+          ret = WGLEW_AMD_gpu_association;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef WGL_ARB_buffer_region
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
+        {
+          ret = WGLEW_ARB_buffer_region;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_context_flush_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"context_flush_control", 21))
+        {
+          ret = WGLEW_ARB_context_flush_control;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_create_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14))
+        {
+          ret = WGLEW_ARB_create_context;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_create_context_no_error
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_no_error", 23))
+        {
+          ret = WGLEW_ARB_create_context_no_error;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_create_context_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_profile", 22))
+        {
+          ret = WGLEW_ARB_create_context_profile;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_create_context_robustness
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_robustness", 25))
+        {
+          ret = WGLEW_ARB_create_context_robustness;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_extensions_string
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
+        {
+          ret = WGLEW_ARB_extensions_string;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = WGLEW_ARB_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = WGLEW_ARB_make_current_read;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_ARB_multisample;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = WGLEW_ARB_pbuffer;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pixel_format
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
+        {
+          ret = WGLEW_ARB_pixel_format;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = WGLEW_ARB_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_render_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
+        {
+          ret = WGLEW_ARB_render_texture;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_robustness_application_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_application_isolation", 32))
+        {
+          ret = WGLEW_ARB_robustness_application_isolation;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_robustness_share_group_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_share_group_isolation", 32))
+        {
+          ret = WGLEW_ARB_robustness_share_group_isolation;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef WGL_ATI_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = WGLEW_ATI_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef WGL_ATI_render_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
+        {
+          ret = WGLEW_ATI_render_texture_rectangle;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef WGL_EXT_colorspace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"colorspace", 10))
+        {
+          ret = WGLEW_EXT_colorspace;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_create_context_es2_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es2_profile", 26))
+        {
+          ret = WGLEW_EXT_create_context_es2_profile;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_create_context_es_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es_profile", 25))
+        {
+          ret = WGLEW_EXT_create_context_es_profile;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_depth_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_float", 11))
+        {
+          ret = WGLEW_EXT_depth_float;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_display_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"display_color_table", 19))
+        {
+          ret = WGLEW_EXT_display_color_table;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_extensions_string
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
+        {
+          ret = WGLEW_EXT_extensions_string;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = WGLEW_EXT_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = WGLEW_EXT_make_current_read;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_EXT_multisample;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = WGLEW_EXT_pbuffer;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_pixel_format
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
+        {
+          ret = WGLEW_EXT_pixel_format;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_pixel_format_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_packed_float", 25))
+        {
+          ret = WGLEW_EXT_pixel_format_packed_float;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = WGLEW_EXT_swap_control;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_swap_control_tear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control_tear", 17))
+        {
+          ret = WGLEW_EXT_swap_control_tear;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"I3D_", 4))
+      {
+#ifdef WGL_I3D_digital_video_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"digital_video_control", 21))
+        {
+          ret = WGLEW_I3D_digital_video_control;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_gamma
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gamma", 5))
+        {
+          ret = WGLEW_I3D_gamma;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_genlock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"genlock", 7))
+        {
+          ret = WGLEW_I3D_genlock;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_image_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_buffer", 12))
+        {
+          ret = WGLEW_I3D_image_buffer;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_swap_frame_lock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_lock", 15))
+        {
+          ret = WGLEW_I3D_swap_frame_lock;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_swap_frame_usage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_usage", 16))
+        {
+          ret = WGLEW_I3D_swap_frame_usage;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef WGL_NV_DX_interop
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"DX_interop", 10))
+        {
+          ret = WGLEW_NV_DX_interop;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_DX_interop2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"DX_interop2", 11))
+        {
+          ret = WGLEW_NV_DX_interop2;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_copy_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
+        {
+          ret = WGLEW_NV_copy_image;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_delay_before_swap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"delay_before_swap", 17))
+        {
+          ret = WGLEW_NV_delay_before_swap;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = WGLEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_gpu_affinity
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_affinity", 12))
+        {
+          ret = WGLEW_NV_gpu_affinity;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_multisample_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
+        {
+          ret = WGLEW_NV_multisample_coverage;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_present_video
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
+        {
+          ret = WGLEW_NV_present_video;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_render_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_depth_texture", 20))
+        {
+          ret = WGLEW_NV_render_depth_texture;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_render_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
+        {
+          ret = WGLEW_NV_render_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_swap_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
+        {
+          ret = WGLEW_NV_swap_group;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = WGLEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_video_capture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
+        {
+          ret = WGLEW_NV_video_capture;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_video_output
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12))
+        {
+          ret = WGLEW_NV_video_output;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef WGL_OML_sync_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
+        {
+          ret = WGLEW_OML_sync_control;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+
+GLboolean glxewIsSupported (const char* name)
+{
+  const GLubyte* pos = (const GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if(_glewStrSame1(&pos, &len, (const GLubyte*)"GLX_", 4))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
+      {
+#ifdef GLX_VERSION_1_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
+        {
+          ret = GLXEW_VERSION_1_2;
+          continue;
+        }
+#endif
+#ifdef GLX_VERSION_1_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
+        {
+          ret = GLXEW_VERSION_1_3;
+          continue;
+        }
+#endif
+#ifdef GLX_VERSION_1_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
+        {
+          ret = GLXEW_VERSION_1_4;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef GLX_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_3DFX_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
+      {
+#ifdef GLX_AMD_gpu_association
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_association", 15))
+        {
+          ret = GLXEW_AMD_gpu_association;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef GLX_ARB_context_flush_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"context_flush_control", 21))
+        {
+          ret = GLXEW_ARB_context_flush_control;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_create_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14))
+        {
+          ret = GLXEW_ARB_create_context;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_create_context_no_error
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_no_error", 23))
+        {
+          ret = GLXEW_ARB_create_context_no_error;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_create_context_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_profile", 22))
+        {
+          ret = GLXEW_ARB_create_context_profile;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_create_context_robustness
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_robustness", 25))
+        {
+          ret = GLXEW_ARB_create_context_robustness;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_fbconfig_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_float", 14))
+        {
+          ret = GLXEW_ARB_fbconfig_float;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = GLXEW_ARB_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_get_proc_address
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_proc_address", 16))
+        {
+          ret = GLXEW_ARB_get_proc_address;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_ARB_multisample;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_robustness_application_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_application_isolation", 32))
+        {
+          ret = GLXEW_ARB_robustness_application_isolation;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_robustness_share_group_isolation
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_share_group_isolation", 32))
+        {
+          ret = GLXEW_ARB_robustness_share_group_isolation;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_vertex_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20))
+        {
+          ret = GLXEW_ARB_vertex_buffer_object;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef GLX_ATI_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = GLXEW_ATI_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef GLX_ATI_render_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
+        {
+          ret = GLXEW_ATI_render_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef GLX_EXT_buffer_age
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_age", 10))
+        {
+          ret = GLXEW_EXT_buffer_age;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_create_context_es2_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es2_profile", 26))
+        {
+          ret = GLXEW_EXT_create_context_es2_profile;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_create_context_es_profile
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es_profile", 25))
+        {
+          ret = GLXEW_EXT_create_context_es_profile;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_fbconfig_packed_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_packed_float", 21))
+        {
+          ret = GLXEW_EXT_fbconfig_packed_float;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_framebuffer_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
+        {
+          ret = GLXEW_EXT_framebuffer_sRGB;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_import_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"import_context", 14))
+        {
+          ret = GLXEW_EXT_import_context;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_libglvnd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"libglvnd", 8))
+        {
+          ret = GLXEW_EXT_libglvnd;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_scene_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
+        {
+          ret = GLXEW_EXT_scene_marker;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_stereo_tree
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_tree", 11))
+        {
+          ret = GLXEW_EXT_stereo_tree;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = GLXEW_EXT_swap_control;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_swap_control_tear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control_tear", 17))
+        {
+          ret = GLXEW_EXT_swap_control_tear;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_texture_from_pixmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_from_pixmap", 19))
+        {
+          ret = GLXEW_EXT_texture_from_pixmap;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_visual_info
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_info", 11))
+        {
+          ret = GLXEW_EXT_visual_info;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_visual_rating
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_rating", 13))
+        {
+          ret = GLXEW_EXT_visual_rating;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
+      {
+#ifdef GLX_INTEL_swap_event
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_event", 10))
+        {
+          ret = GLXEW_INTEL_swap_event;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
+      {
+#ifdef GLX_MESA_agp_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"agp_offset", 10))
+        {
+          ret = GLXEW_MESA_agp_offset;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_copy_sub_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_sub_buffer", 15))
+        {
+          ret = GLXEW_MESA_copy_sub_buffer;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_pixmap_colormap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_colormap", 15))
+        {
+          ret = GLXEW_MESA_pixmap_colormap;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_query_renderer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_renderer", 14))
+        {
+          ret = GLXEW_MESA_query_renderer;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_release_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"release_buffers", 15))
+        {
+          ret = GLXEW_MESA_release_buffers;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_set_3dfx_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"set_3dfx_mode", 13))
+        {
+          ret = GLXEW_MESA_set_3dfx_mode;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = GLXEW_MESA_swap_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef GLX_NV_copy_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_buffer", 11))
+        {
+          ret = GLXEW_NV_copy_buffer;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_copy_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
+        {
+          ret = GLXEW_NV_copy_image;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_delay_before_swap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"delay_before_swap", 17))
+        {
+          ret = GLXEW_NV_delay_before_swap;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = GLXEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_multisample_coverage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
+        {
+          ret = GLXEW_NV_multisample_coverage;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_present_video
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
+        {
+          ret = GLXEW_NV_present_video;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_robustness_video_memory_purge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_video_memory_purge", 29))
+        {
+          ret = GLXEW_NV_robustness_video_memory_purge;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_swap_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
+        {
+          ret = GLXEW_NV_swap_group;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLXEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_video_capture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
+        {
+          ret = GLXEW_NV_video_capture;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_video_out
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_out", 9))
+        {
+          ret = GLXEW_NV_video_out;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef GLX_OML_swap_method
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_method", 11))
+        {
+          ret = GLXEW_OML_swap_method;
+          continue;
+        }
+#endif
+#ifdef GLX_OML_sync_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
+        {
+          ret = GLXEW_OML_sync_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
+      {
+#ifdef GLX_SGIS_blended_overlay
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blended_overlay", 15))
+        {
+          ret = GLXEW_SGIS_blended_overlay;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_color_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
+        {
+          ret = GLXEW_SGIS_color_range;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_SGIS_multisample;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_shared_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18))
+        {
+          ret = GLXEW_SGIS_shared_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
+      {
+#ifdef GLX_SGIX_fbconfig
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig", 8))
+        {
+          ret = GLXEW_SGIX_fbconfig;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_hyperpipe
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"hyperpipe", 9))
+        {
+          ret = GLXEW_SGIX_hyperpipe;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = GLXEW_SGIX_pbuffer;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_swap_barrier
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_barrier", 12))
+        {
+          ret = GLXEW_SGIX_swap_barrier;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_swap_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
+        {
+          ret = GLXEW_SGIX_swap_group;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_video_resize
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
+        {
+          ret = GLXEW_SGIX_video_resize;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_visual_select_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_select_group", 19))
+        {
+          ret = GLXEW_SGIX_visual_select_group;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
+      {
+#ifdef GLX_SGI_cushion
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cushion", 7))
+        {
+          ret = GLXEW_SGI_cushion;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = GLXEW_SGI_make_current_read;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = GLXEW_SGI_swap_control;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_video_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_sync", 10))
+        {
+          ret = GLXEW_SGI_video_sync;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
+      {
+#ifdef GLX_SUN_get_transparent_index
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_transparent_index", 21))
+        {
+          ret = GLXEW_SUN_get_transparent_index;
+          continue;
+        }
+#endif
+#ifdef GLX_SUN_video_resize
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
+        {
+          ret = GLXEW_SUN_video_resize;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#elif defined(GLEW_EGL)
+
+GLboolean eglewIsSupported (const char* name)
+{
+  const GLubyte* pos = (const GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if(_glewStrSame1(&pos, &len, (const GLubyte*)"EGL_", 4))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
+      {
+#ifdef EGL_VERSION_1_0
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_0", 3))
+        {
+          ret = EGLEW_VERSION_1_0;
+          continue;
+        }
+#endif
+#ifdef EGL_VERSION_1_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_1", 3))
+        {
+          ret = EGLEW_VERSION_1_1;
+          continue;
+        }
+#endif
+#ifdef EGL_VERSION_1_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
+        {
+          ret = EGLEW_VERSION_1_2;
+          continue;
+        }
+#endif
+#ifdef EGL_VERSION_1_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
+        {
+          ret = EGLEW_VERSION_1_3;
+          continue;
+        }
+#endif
+#ifdef EGL_VERSION_1_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
+        {
+          ret = EGLEW_VERSION_1_4;
+          continue;
+        }
+#endif
+#ifdef EGL_VERSION_1_5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3))
+        {
+          ret = EGLEW_VERSION_1_5;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ANDROID_", 8))
+      {
+#ifdef EGL_ANDROID_blob_cache
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blob_cache", 10))
+        {
+          ret = EGLEW_ANDROID_blob_cache;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_create_native_client_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_native_client_buffer", 27))
+        {
+          ret = EGLEW_ANDROID_create_native_client_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_framebuffer_target
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_target", 18))
+        {
+          ret = EGLEW_ANDROID_framebuffer_target;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_front_buffer_auto_refresh
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"front_buffer_auto_refresh", 25))
+        {
+          ret = EGLEW_ANDROID_front_buffer_auto_refresh;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_image_native_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_native_buffer", 19))
+        {
+          ret = EGLEW_ANDROID_image_native_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_native_fence_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"native_fence_sync", 17))
+        {
+          ret = EGLEW_ANDROID_native_fence_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_presentation_time
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"presentation_time", 17))
+        {
+          ret = EGLEW_ANDROID_presentation_time;
+          continue;
+        }
+#endif
+#ifdef EGL_ANDROID_recordable
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"recordable", 10))
+        {
+          ret = EGLEW_ANDROID_recordable;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ANGLE_", 6))
+      {
+#ifdef EGL_ANGLE_d3d_share_handle_client_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"d3d_share_handle_client_buffer", 30))
+        {
+          ret = EGLEW_ANGLE_d3d_share_handle_client_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_ANGLE_device_d3d
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_d3d", 10))
+        {
+          ret = EGLEW_ANGLE_device_d3d;
+          continue;
+        }
+#endif
+#ifdef EGL_ANGLE_query_surface_pointer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_surface_pointer", 21))
+        {
+          ret = EGLEW_ANGLE_query_surface_pointer;
+          continue;
+        }
+#endif
+#ifdef EGL_ANGLE_surface_d3d_texture_2d_share_handle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"surface_d3d_texture_2d_share_handle", 35))
+        {
+          ret = EGLEW_ANGLE_surface_d3d_texture_2d_share_handle;
+          continue;
+        }
+#endif
+#ifdef EGL_ANGLE_window_fixed_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_fixed_size", 17))
+        {
+          ret = EGLEW_ANGLE_window_fixed_size;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARM_", 4))
+      {
+#ifdef EGL_ARM_implicit_external_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"implicit_external_sync", 22))
+        {
+          ret = EGLEW_ARM_implicit_external_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_ARM_pixmap_multisample_discard
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_multisample_discard", 26))
+        {
+          ret = EGLEW_ARM_pixmap_multisample_discard;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef EGL_EXT_buffer_age
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_age", 10))
+        {
+          ret = EGLEW_EXT_buffer_age;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_client_extensions
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_extensions", 17))
+        {
+          ret = EGLEW_EXT_client_extensions;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_create_context_robustness
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_robustness", 25))
+        {
+          ret = EGLEW_EXT_create_context_robustness;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_device_base
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_base", 11))
+        {
+          ret = EGLEW_EXT_device_base;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_device_drm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_drm", 10))
+        {
+          ret = EGLEW_EXT_device_drm;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_device_enumeration
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_enumeration", 18))
+        {
+          ret = EGLEW_EXT_device_enumeration;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_device_openwf
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_openwf", 13))
+        {
+          ret = EGLEW_EXT_device_openwf;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_device_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_query", 12))
+        {
+          ret = EGLEW_EXT_device_query;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_gl_colorspace_bt2020_linear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_colorspace_bt2020_linear", 27))
+        {
+          ret = EGLEW_EXT_gl_colorspace_bt2020_linear;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_gl_colorspace_bt2020_pq
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_colorspace_bt2020_pq", 23))
+        {
+          ret = EGLEW_EXT_gl_colorspace_bt2020_pq;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_gl_colorspace_scrgb_linear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_colorspace_scrgb_linear", 26))
+        {
+          ret = EGLEW_EXT_gl_colorspace_scrgb_linear;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_image_dma_buf_import
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_dma_buf_import", 20))
+        {
+          ret = EGLEW_EXT_image_dma_buf_import;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_dma_buf_import_modifiers", 30))
+        {
+          ret = EGLEW_EXT_image_dma_buf_import_modifiers;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_multiview_window
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multiview_window", 16))
+        {
+          ret = EGLEW_EXT_multiview_window;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_output_base
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"output_base", 11))
+        {
+          ret = EGLEW_EXT_output_base;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_output_drm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"output_drm", 10))
+        {
+          ret = EGLEW_EXT_output_drm;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_output_openwf
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"output_openwf", 13))
+        {
+          ret = EGLEW_EXT_output_openwf;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = EGLEW_EXT_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_platform_base
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_base", 13))
+        {
+          ret = EGLEW_EXT_platform_base;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_platform_device
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_device", 15))
+        {
+          ret = EGLEW_EXT_platform_device;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_platform_wayland
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_wayland", 16))
+        {
+          ret = EGLEW_EXT_platform_wayland;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_platform_x11
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_x11", 12))
+        {
+          ret = EGLEW_EXT_platform_x11;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_protected_content
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"protected_content", 17))
+        {
+          ret = EGLEW_EXT_protected_content;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_protected_surface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"protected_surface", 17))
+        {
+          ret = EGLEW_EXT_protected_surface;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_stream_consumer_egloutput
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_consumer_egloutput", 25))
+        {
+          ret = EGLEW_EXT_stream_consumer_egloutput;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_surface_SMPTE2086_metadata
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"surface_SMPTE2086_metadata", 26))
+        {
+          ret = EGLEW_EXT_surface_SMPTE2086_metadata;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_swap_buffers_with_damage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_buffers_with_damage", 24))
+        {
+          ret = EGLEW_EXT_swap_buffers_with_damage;
+          continue;
+        }
+#endif
+#ifdef EGL_EXT_yuv_surface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"yuv_surface", 11))
+        {
+          ret = EGLEW_EXT_yuv_surface;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"HI_", 3))
+      {
+#ifdef EGL_HI_clientpixmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clientpixmap", 12))
+        {
+          ret = EGLEW_HI_clientpixmap;
+          continue;
+        }
+#endif
+#ifdef EGL_HI_colorformats
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"colorformats", 12))
+        {
+          ret = EGLEW_HI_colorformats;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"IMG_", 4))
+      {
+#ifdef EGL_IMG_context_priority
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"context_priority", 16))
+        {
+          ret = EGLEW_IMG_context_priority;
+          continue;
+        }
+#endif
+#ifdef EGL_IMG_image_plane_attribs
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_plane_attribs", 19))
+        {
+          ret = EGLEW_IMG_image_plane_attribs;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KHR_", 4))
+      {
+#ifdef EGL_KHR_cl_event
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cl_event", 8))
+        {
+          ret = EGLEW_KHR_cl_event;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_cl_event2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cl_event2", 9))
+        {
+          ret = EGLEW_KHR_cl_event2;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_client_get_all_proc_addresses
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_get_all_proc_addresses", 29))
+        {
+          ret = EGLEW_KHR_client_get_all_proc_addresses;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_config_attribs
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"config_attribs", 14))
+        {
+          ret = EGLEW_KHR_config_attribs;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_context_flush_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"context_flush_control", 21))
+        {
+          ret = EGLEW_KHR_context_flush_control;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_create_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14))
+        {
+          ret = EGLEW_KHR_create_context;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_create_context_no_error
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_no_error", 23))
+        {
+          ret = EGLEW_KHR_create_context_no_error;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_debug
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug", 5))
+        {
+          ret = EGLEW_KHR_debug;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_fence_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence_sync", 10))
+        {
+          ret = EGLEW_KHR_fence_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_get_all_proc_addresses
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_all_proc_addresses", 22))
+        {
+          ret = EGLEW_KHR_get_all_proc_addresses;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_gl_colorspace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_colorspace", 13))
+        {
+          ret = EGLEW_KHR_gl_colorspace;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_gl_renderbuffer_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_renderbuffer_image", 21))
+        {
+          ret = EGLEW_KHR_gl_renderbuffer_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_gl_texture_2D_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_texture_2D_image", 19))
+        {
+          ret = EGLEW_KHR_gl_texture_2D_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_gl_texture_3D_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_texture_3D_image", 19))
+        {
+          ret = EGLEW_KHR_gl_texture_3D_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_gl_texture_cubemap_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gl_texture_cubemap_image", 24))
+        {
+          ret = EGLEW_KHR_gl_texture_cubemap_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image", 5))
+        {
+          ret = EGLEW_KHR_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_image_base
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_base", 10))
+        {
+          ret = EGLEW_KHR_image_base;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_image_pixmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_pixmap", 12))
+        {
+          ret = EGLEW_KHR_image_pixmap;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_lock_surface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"lock_surface", 12))
+        {
+          ret = EGLEW_KHR_lock_surface;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_lock_surface2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"lock_surface2", 13))
+        {
+          ret = EGLEW_KHR_lock_surface2;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_lock_surface3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"lock_surface3", 13))
+        {
+          ret = EGLEW_KHR_lock_surface3;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_mutable_render_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mutable_render_buffer", 21))
+        {
+          ret = EGLEW_KHR_mutable_render_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_no_config_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"no_config_context", 17))
+        {
+          ret = EGLEW_KHR_no_config_context;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_partial_update
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"partial_update", 14))
+        {
+          ret = EGLEW_KHR_partial_update;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_platform_android
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_android", 16))
+        {
+          ret = EGLEW_KHR_platform_android;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_platform_gbm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_gbm", 12))
+        {
+          ret = EGLEW_KHR_platform_gbm;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_platform_wayland
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_wayland", 16))
+        {
+          ret = EGLEW_KHR_platform_wayland;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_platform_x11
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_x11", 12))
+        {
+          ret = EGLEW_KHR_platform_x11;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_reusable_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"reusable_sync", 13))
+        {
+          ret = EGLEW_KHR_reusable_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream", 6))
+        {
+          ret = EGLEW_KHR_stream;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_attrib
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_attrib", 13))
+        {
+          ret = EGLEW_KHR_stream_attrib;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_consumer_gltexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_consumer_gltexture", 25))
+        {
+          ret = EGLEW_KHR_stream_consumer_gltexture;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_cross_process_fd
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_process_fd", 23))
+        {
+          ret = EGLEW_KHR_stream_cross_process_fd;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_fifo
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_fifo", 11))
+        {
+          ret = EGLEW_KHR_stream_fifo;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_producer_aldatalocator
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_producer_aldatalocator", 29))
+        {
+          ret = EGLEW_KHR_stream_producer_aldatalocator;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_stream_producer_eglsurface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_producer_eglsurface", 26))
+        {
+          ret = EGLEW_KHR_stream_producer_eglsurface;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_surfaceless_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"surfaceless_context", 19))
+        {
+          ret = EGLEW_KHR_surfaceless_context;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_swap_buffers_with_damage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_buffers_with_damage", 24))
+        {
+          ret = EGLEW_KHR_swap_buffers_with_damage;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_vg_parent_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vg_parent_image", 15))
+        {
+          ret = EGLEW_KHR_vg_parent_image;
+          continue;
+        }
+#endif
+#ifdef EGL_KHR_wait_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"wait_sync", 9))
+        {
+          ret = EGLEW_KHR_wait_sync;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
+      {
+#ifdef EGL_MESA_drm_image
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"drm_image", 9))
+        {
+          ret = EGLEW_MESA_drm_image;
+          continue;
+        }
+#endif
+#ifdef EGL_MESA_image_dma_buf_export
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_dma_buf_export", 20))
+        {
+          ret = EGLEW_MESA_image_dma_buf_export;
+          continue;
+        }
+#endif
+#ifdef EGL_MESA_platform_gbm
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_gbm", 12))
+        {
+          ret = EGLEW_MESA_platform_gbm;
+          continue;
+        }
+#endif
+#ifdef EGL_MESA_platform_surfaceless
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"platform_surfaceless", 20))
+        {
+          ret = EGLEW_MESA_platform_surfaceless;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NOK_", 4))
+      {
+#ifdef EGL_NOK_swap_region
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_region", 11))
+        {
+          ret = EGLEW_NOK_swap_region;
+          continue;
+        }
+#endif
+#ifdef EGL_NOK_swap_region2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_region2", 12))
+        {
+          ret = EGLEW_NOK_swap_region2;
+          continue;
+        }
+#endif
+#ifdef EGL_NOK_texture_from_pixmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_from_pixmap", 19))
+        {
+          ret = EGLEW_NOK_texture_from_pixmap;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef EGL_NV_3dvision_surface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3dvision_surface", 16))
+        {
+          ret = EGLEW_NV_3dvision_surface;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_coverage_sample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"coverage_sample", 15))
+        {
+          ret = EGLEW_NV_coverage_sample;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_coverage_sample_resolve
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"coverage_sample_resolve", 23))
+        {
+          ret = EGLEW_NV_coverage_sample_resolve;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_cuda_event
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cuda_event", 10))
+        {
+          ret = EGLEW_NV_cuda_event;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_depth_nonlinear
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_nonlinear", 15))
+        {
+          ret = EGLEW_NV_depth_nonlinear;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_device_cuda
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"device_cuda", 11))
+        {
+          ret = EGLEW_NV_device_cuda;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_native_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"native_query", 12))
+        {
+          ret = EGLEW_NV_native_query;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_post_convert_rounding
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"post_convert_rounding", 21))
+        {
+          ret = EGLEW_NV_post_convert_rounding;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_post_sub_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"post_sub_buffer", 15))
+        {
+          ret = EGLEW_NV_post_sub_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_robustness_video_memory_purge
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_video_memory_purge", 29))
+        {
+          ret = EGLEW_NV_robustness_video_memory_purge;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_consumer_gltexture_yuv
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_consumer_gltexture_yuv", 29))
+        {
+          ret = EGLEW_NV_stream_consumer_gltexture_yuv;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_cross_display
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_display", 20))
+        {
+          ret = EGLEW_NV_stream_cross_display;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_cross_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_object", 19))
+        {
+          ret = EGLEW_NV_stream_cross_object;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_cross_partition
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_partition", 22))
+        {
+          ret = EGLEW_NV_stream_cross_partition;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_cross_process
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_process", 20))
+        {
+          ret = EGLEW_NV_stream_cross_process;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_cross_system
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_cross_system", 19))
+        {
+          ret = EGLEW_NV_stream_cross_system;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_fifo_next
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_fifo_next", 16))
+        {
+          ret = EGLEW_NV_stream_fifo_next;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_fifo_synchronous
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_fifo_synchronous", 23))
+        {
+          ret = EGLEW_NV_stream_fifo_synchronous;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_frame_limits
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_frame_limits", 19))
+        {
+          ret = EGLEW_NV_stream_frame_limits;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_metadata
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_metadata", 15))
+        {
+          ret = EGLEW_NV_stream_metadata;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_remote
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_remote", 13))
+        {
+          ret = EGLEW_NV_stream_remote;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_reset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_reset", 12))
+        {
+          ret = EGLEW_NV_stream_reset;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_socket
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_socket", 13))
+        {
+          ret = EGLEW_NV_stream_socket;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_socket_inet
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_socket_inet", 18))
+        {
+          ret = EGLEW_NV_stream_socket_inet;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_socket_unix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_socket_unix", 18))
+        {
+          ret = EGLEW_NV_stream_socket_unix;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_stream_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stream_sync", 11))
+        {
+          ret = EGLEW_NV_stream_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync", 4))
+        {
+          ret = EGLEW_NV_sync;
+          continue;
+        }
+#endif
+#ifdef EGL_NV_system_time
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"system_time", 11))
+        {
+          ret = EGLEW_NV_system_time;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"TIZEN_", 6))
+      {
+#ifdef EGL_TIZEN_image_native_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_native_buffer", 19))
+        {
+          ret = EGLEW_TIZEN_image_native_buffer;
+          continue;
+        }
+#endif
+#ifdef EGL_TIZEN_image_native_surface
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_native_surface", 20))
+        {
+          ret = EGLEW_TIZEN_image_native_surface;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#endif /* _WIN32 */
diff --git a/src_bkp/engine/external/important.txt b/src_bkp/engine/external/important.txt
new file mode 100644
index 0000000000..41b9c6a11a
--- /dev/null
+++ b/src_bkp/engine/external/important.txt
@@ -0,0 +1,5 @@
+The source code under this directory are external libraries
+with their own licences. The source you find here is stripped
+of unnecessary information. Please visit their websites for
+more information and official releases.
+
diff --git a/src_bkp/engine/external/json-parser/LICENSE b/src_bkp/engine/external/json-parser/LICENSE
new file mode 100644
index 0000000000..1aee375e04
--- /dev/null
+++ b/src_bkp/engine/external/json-parser/LICENSE
@@ -0,0 +1,26 @@
+
+  Copyright (C) 2012, 2013 James McLaughlin et al.  All rights reserved.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+ 
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
diff --git a/src_bkp/engine/external/json-parser/VERSION.txt b/src_bkp/engine/external/json-parser/VERSION.txt
new file mode 100644
index 0000000000..9084fa2f71
--- /dev/null
+++ b/src_bkp/engine/external/json-parser/VERSION.txt
@@ -0,0 +1 @@
+1.1.0
diff --git a/src_bkp/engine/external/json-parser/json.c b/src_bkp/engine/external/json-parser/json.c
new file mode 100644
index 0000000000..4e3752a073
--- /dev/null
+++ b/src_bkp/engine/external/json-parser/json.c
@@ -0,0 +1,1004 @@
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "json.h"
+
+#ifdef _MSC_VER
+   #ifndef _CRT_SECURE_NO_WARNINGS
+      #define _CRT_SECURE_NO_WARNINGS
+   #endif
+#endif
+
+const struct _json_value json_value_none;
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <math.h>
+
+typedef unsigned int json_uchar;
+
+static unsigned char hex_value (json_char c)
+{
+   if (isdigit(c))
+      return c - '0';
+
+   switch (c) {
+      case 'a': case 'A': return 0x0A;
+      case 'b': case 'B': return 0x0B;
+      case 'c': case 'C': return 0x0C;
+      case 'd': case 'D': return 0x0D;
+      case 'e': case 'E': return 0x0E;
+      case 'f': case 'F': return 0x0F;
+      default: return 0xFF;
+   }
+}
+
+typedef struct
+{
+   unsigned long used_memory;
+
+   unsigned int uint_max;
+   unsigned long ulong_max;
+
+   json_settings settings;
+   int first_pass;
+
+   const json_char * ptr;
+   unsigned int cur_line, cur_col;
+
+} json_state;
+
+static void * default_alloc (size_t size, int zero, void * user_data)
+{
+   return zero ? calloc (1, size) : malloc (size);
+}
+
+static void default_free (void * ptr, void * user_data)
+{
+   free (ptr);
+}
+
+static void * json_alloc (json_state * state, unsigned long size, int zero)
+{
+   if ((state->ulong_max - state->used_memory) < size)
+      return 0;
+
+   if (state->settings.max_memory
+         && (state->used_memory += size) > state->settings.max_memory)
+   {
+      return 0;
+   }
+
+   return state->settings.mem_alloc (size, zero, state->settings.user_data);
+}
+
+static int new_value (json_state * state,
+                      json_value ** top, json_value ** root, json_value ** alloc,
+                      json_type type)
+{
+   json_value * value;
+   int values_size;
+
+   if (!state->first_pass)
+   {
+      value = *top = *alloc;
+      *alloc = (*alloc)->_reserved.next_alloc;
+
+      if (!*root)
+         *root = value;
+
+      switch (value->type)
+      {
+         case json_array:
+
+            if (! (value->u.array.values = (json_value **) json_alloc
+               (state, value->u.array.length * sizeof (json_value *), 0)) )
+            {
+               return 0;
+            }
+
+            value->u.array.length = 0;
+            break;
+
+         case json_object:
+
+            values_size = sizeof (*value->u.object.values) * value->u.object.length;
+
+            if (! ((*(void **) &value->u.object.values) = json_alloc
+                  (state, values_size + ((uintptr_t) value->u.object.values), 0)) )
+            {
+               return 0;
+            }
+
+            value->_reserved.object_mem = (*(char **) &value->u.object.values) + values_size;
+
+            value->u.object.length = 0;
+            break;
+
+         case json_string:
+
+            if (! (value->u.string.ptr = (json_char *) json_alloc
+               (state, (value->u.string.length + 1) * sizeof (json_char), 0)) )
+            {
+               return 0;
+            }
+
+            value->u.string.length = 0;
+            break;
+
+         default:
+            break;
+      };
+
+      return 1;
+   }
+
+   if (! (value = (json_value *) json_alloc
+         (state, sizeof (json_value) + state->settings.value_extra, 1)))
+   {
+      return 0;
+   }
+
+   if (!*root)
+      *root = value;
+
+   value->type = type;
+   value->parent = *top;
+
+   #ifdef JSON_TRACK_SOURCE
+      value->line = state->cur_line;
+      value->col = state->cur_col;
+   #endif
+
+   if (*alloc)
+      (*alloc)->_reserved.next_alloc = value;
+
+   *alloc = *top = value;
+
+   return 1;
+}
+
+#define whitespace \
+   case '\n': ++ state.cur_line;  state.cur_col = 0; \
+   case ' ': case '\t': case '\r'
+
+#define string_add(b)  \
+   do { if (!state.first_pass) string [string_length] = b;  ++ string_length; } while (0);
+
+#define line_and_col \
+   state.cur_line, state.cur_col
+
+static const long
+   flag_next             = 1 << 0,
+   flag_reproc           = 1 << 1,
+   flag_need_comma       = 1 << 2,
+   flag_seek_value       = 1 << 3, 
+   flag_escaped          = 1 << 4,
+   flag_string           = 1 << 5,
+   flag_need_colon       = 1 << 6,
+   flag_done             = 1 << 7,
+   flag_num_negative     = 1 << 8,
+   flag_num_zero         = 1 << 9,
+   flag_num_e            = 1 << 10,
+   flag_num_e_got_sign   = 1 << 11,
+   flag_num_e_negative   = 1 << 12,
+   flag_line_comment     = 1 << 13,
+   flag_block_comment    = 1 << 14;
+
+json_value * json_parse_ex (json_settings * settings,
+                            const json_char * json,
+                            size_t length,
+                            char * error_buf)
+{
+   json_char error [json_error_max];
+   const json_char * end;
+   json_value * top, * root, * alloc = 0;
+   json_state state = { 0 };
+   long flags;
+   long num_digits = 0, num_e = 0;
+   json_int_t num_fraction = 0;
+
+   /* Skip UTF-8 BOM
+    */
+   if (length >= 3 && ((unsigned char) json [0]) == 0xEF
+                   && ((unsigned char) json [1]) == 0xBB
+                   && ((unsigned char) json [2]) == 0xBF)
+   {
+      json += 3;
+      length -= 3;
+   }
+
+   error[0] = '\0';
+   end = (json + length);
+
+   memcpy (&state.settings, settings, sizeof (json_settings));
+
+   if (!state.settings.mem_alloc)
+      state.settings.mem_alloc = default_alloc;
+
+   if (!state.settings.mem_free)
+      state.settings.mem_free = default_free;
+
+   memset (&state.uint_max, 0xFF, sizeof (state.uint_max));
+   memset (&state.ulong_max, 0xFF, sizeof (state.ulong_max));
+
+   state.uint_max -= 8; /* limit of how much can be added before next check */
+   state.ulong_max -= 8;
+
+   for (state.first_pass = 1; state.first_pass >= 0; -- state.first_pass)
+   {
+      json_uchar uchar;
+      unsigned char uc_b1, uc_b2, uc_b3, uc_b4;
+      json_char * string = 0;
+      unsigned int string_length = 0;
+
+      top = root = 0;
+      flags = flag_seek_value;
+
+      state.cur_line = 1;
+
+      for (state.ptr = json ;; ++ state.ptr)
+      {
+         json_char b = (state.ptr == end ? 0 : *state.ptr);
+         
+         if (flags & flag_string)
+         {
+            if (!b)
+            {  sprintf (error, "Unexpected EOF in string (at %d:%d)", line_and_col);
+               goto e_failed;
+            }
+
+            if (string_length > state.uint_max)
+               goto e_overflow;
+
+            if (flags & flag_escaped)
+            {
+               flags &= ~ flag_escaped;
+
+               switch (b)
+               {
+                  case 'b':  string_add ('\b');  break;
+                  case 'f':  string_add ('\f');  break;
+                  case 'n':  string_add ('\n');  break;
+                  case 'r':  string_add ('\r');  break;
+                  case 't':  string_add ('\t');  break;
+                  case 'u':
+
+                    if (end - state.ptr < 4 || 
+                        (uc_b1 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b2 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
+                    {
+                        sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+                        goto e_failed;
+                    }
+
+                    uc_b1 = (uc_b1 << 4) | uc_b2;
+                    uc_b2 = (uc_b3 << 4) | uc_b4;
+                    uchar = (uc_b1 << 8) | uc_b2;
+
+                    if ((uchar & 0xF800) == 0xD800) {
+                        json_uchar uchar2;
+                        
+                        if (end - state.ptr < 6 || (*++ state.ptr) != '\\' || (*++ state.ptr) != 'u' ||
+                            (uc_b1 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b2 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
+                        {
+                            sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+                            goto e_failed;
+                        }
+
+                        uc_b1 = (uc_b1 << 4) | uc_b2;
+                        uc_b2 = (uc_b3 << 4) | uc_b4;
+                        uchar2 = (uc_b1 << 8) | uc_b2;
+                        
+                        uchar = 0x010000 | ((uchar & 0x3FF) << 10) | (uchar2 & 0x3FF);
+                    }
+
+                    if (sizeof (json_char) >= sizeof (json_uchar) || (uchar <= 0x7F))
+                    {
+                       string_add ((json_char) uchar);
+                       break;
+                    }
+
+                    if (uchar <= 0x7FF)
+                    {
+                        if (state.first_pass)
+                           string_length += 2;
+                        else
+                        {  string [string_length ++] = 0xC0 | (uchar >> 6);
+                           string [string_length ++] = 0x80 | (uchar & 0x3F);
+                        }
+
+                        break;
+                    }
+
+                    if (uchar <= 0xFFFF) {
+                        if (state.first_pass)
+                           string_length += 3;
+                        else
+                        {  string [string_length ++] = 0xE0 | (uchar >> 12);
+                           string [string_length ++] = 0x80 | ((uchar >> 6) & 0x3F);
+                           string [string_length ++] = 0x80 | (uchar & 0x3F);
+                        }
+                        
+                        break;
+                    }
+
+                    if (state.first_pass)
+                       string_length += 4;
+                    else
+                    {  string [string_length ++] = 0xF0 | (uchar >> 18);
+                       string [string_length ++] = 0x80 | ((uchar >> 12) & 0x3F);
+                       string [string_length ++] = 0x80 | ((uchar >> 6) & 0x3F);
+                       string [string_length ++] = 0x80 | (uchar & 0x3F);
+                    }
+
+                    break;
+
+                  default:
+                     string_add (b);
+               };
+
+               continue;
+            }
+
+            if (b == '\\')
+            {
+               flags |= flag_escaped;
+               continue;
+            }
+
+            if (b == '"')
+            {
+               if (!state.first_pass)
+                  string [string_length] = 0;
+
+               flags &= ~ flag_string;
+               string = 0;
+
+               switch (top->type)
+               {
+                  case json_string:
+
+                     top->u.string.length = string_length;
+                     flags |= flag_next;
+
+                     break;
+
+                  case json_object:
+
+                     if (state.first_pass)
+                        (*(json_char **) &top->u.object.values) += string_length + 1;
+                     else
+                     {  
+                        top->u.object.values [top->u.object.length].name
+                           = (json_char *) top->_reserved.object_mem;
+
+                        top->u.object.values [top->u.object.length].name_length
+                           = string_length;
+
+                        (*(json_char **) &top->_reserved.object_mem) += string_length + 1;
+                     }
+
+                     flags |= flag_seek_value | flag_need_colon;
+                     continue;
+
+                  default:
+                     break;
+               };
+            }
+            else
+            {
+               string_add (b);
+               continue;
+            }
+         }
+
+         if (state.settings.settings & json_enable_comments)
+         {
+            if (flags & (flag_line_comment | flag_block_comment))
+            {
+               if (flags & flag_line_comment)
+               {
+                  if (b == '\r' || b == '\n' || !b)
+                  {
+                     flags &= ~ flag_line_comment;
+                     -- state.ptr;  /* so null can be reproc'd */
+                  }
+
+                  continue;
+               }
+
+               if (flags & flag_block_comment)
+               {
+                  if (!b)
+                  {  sprintf (error, "%d:%d: Unexpected EOF in block comment", line_and_col);
+                     goto e_failed;
+                  }
+
+                  if (b == '*' && state.ptr < (end - 1) && state.ptr [1] == '/')
+                  {
+                     flags &= ~ flag_block_comment;
+                     ++ state.ptr;  /* skip closing sequence */
+                  }
+
+                  continue;
+               }
+            }
+            else if (b == '/')
+            {
+               if (! (flags & (flag_seek_value | flag_done)) && top->type != json_object)
+               {  sprintf (error, "%d:%d: Comment not allowed here", line_and_col);
+                  goto e_failed;
+               }
+
+               if (++ state.ptr == end)
+               {  sprintf (error, "%d:%d: EOF unexpected", line_and_col);
+                  goto e_failed;
+               }
+
+               switch (b = *state.ptr)
+               {
+                  case '/':
+                     flags |= flag_line_comment;
+                     continue;
+
+                  case '*':
+                     flags |= flag_block_comment;
+                     continue;
+
+                  default:
+                     sprintf (error, "%d:%d: Unexpected `%c` in comment opening sequence", line_and_col, b);
+                     goto e_failed;
+               };
+            }
+         }
+
+         if (flags & flag_done)
+         {
+            if (!b)
+               break;
+
+            switch (b)
+            {
+               whitespace:
+                  continue;
+
+               default:
+
+                  sprintf (error, "%d:%d: Trailing garbage: `%c`",
+                           state.cur_line, state.cur_col, b);
+
+                  goto e_failed;
+            };
+         }
+
+         if (flags & flag_seek_value)
+         {
+            switch (b)
+            {
+               whitespace:
+                  continue;
+
+               case ']':
+
+                  if (top && top->type == json_array)
+                     flags = (flags & ~ (flag_need_comma | flag_seek_value)) | flag_next;
+                  else
+                  {  sprintf (error, "%d:%d: Unexpected ]", line_and_col);
+                     goto e_failed;
+                  }
+
+                  break;
+
+               default:
+
+                  if (flags & flag_need_comma)
+                  {
+                     if (b == ',')
+                     {  flags &= ~ flag_need_comma;
+                        continue;
+                     }
+                     else
+                     {
+                        sprintf (error, "%d:%d: Expected , before %c",
+                                 state.cur_line, state.cur_col, b);
+
+                        goto e_failed;
+                     }
+                  }
+
+                  if (flags & flag_need_colon)
+                  {
+                     if (b == ':')
+                     {  flags &= ~ flag_need_colon;
+                        continue;
+                     }
+                     else
+                     { 
+                        sprintf (error, "%d:%d: Expected : before %c",
+                                 state.cur_line, state.cur_col, b);
+
+                        goto e_failed;
+                     }
+                  }
+
+                  flags &= ~ flag_seek_value;
+
+                  switch (b)
+                  {
+                     case '{':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_object))
+                           goto e_alloc_failure;
+
+                        continue;
+
+                     case '[':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_array))
+                           goto e_alloc_failure;
+
+                        flags |= flag_seek_value;
+                        continue;
+
+                     case '"':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_string))
+                           goto e_alloc_failure;
+
+                        flags |= flag_string;
+
+                        string = top->u.string.ptr;
+                        string_length = 0;
+
+                        continue;
+
+                     case 't':
+
+                        if ((end - state.ptr) < 3 || *(++ state.ptr) != 'r' ||
+                            *(++ state.ptr) != 'u' || *(++ state.ptr) != 'e')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_boolean))
+                           goto e_alloc_failure;
+
+                        top->u.boolean = 1;
+
+                        flags |= flag_next;
+                        break;
+
+                     case 'f':
+
+                        if ((end - state.ptr) < 4 || *(++ state.ptr) != 'a' ||
+                            *(++ state.ptr) != 'l' || *(++ state.ptr) != 's' ||
+                            *(++ state.ptr) != 'e')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_boolean))
+                           goto e_alloc_failure;
+
+                        flags |= flag_next;
+                        break;
+
+                     case 'n':
+
+                        if ((end - state.ptr) < 3 || *(++ state.ptr) != 'u' ||
+                            *(++ state.ptr) != 'l' || *(++ state.ptr) != 'l')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_null))
+                           goto e_alloc_failure;
+
+                        flags |= flag_next;
+                        break;
+
+                     default:
+
+                        if (isdigit (b) || b == '-')
+                        {
+                           if (!new_value (&state, &top, &root, &alloc, json_integer))
+                              goto e_alloc_failure;
+
+                           if (!state.first_pass)
+                           {
+                              while (isdigit (b) || b == '+' || b == '-'
+                                        || b == 'e' || b == 'E' || b == '.')
+                              {
+                                 if ( (++ state.ptr) == end)
+                                 {
+                                    b = 0;
+                                    break;
+                                 }
+
+                                 b = *state.ptr;
+                              }
+
+                              flags |= flag_next | flag_reproc;
+                              break;
+                           }
+
+                           flags &= ~ (flag_num_negative | flag_num_e |
+                                        flag_num_e_got_sign | flag_num_e_negative |
+                                           flag_num_zero);
+
+                           num_digits = 0;
+                           num_fraction = 0;
+                           num_e = 0;
+
+                           if (b != '-')
+                           {
+                              flags |= flag_reproc;
+                              break;
+                           }
+
+                           flags |= flag_num_negative;
+                           continue;
+                        }
+                        else
+                        {  sprintf (error, "%d:%d: Unexpected %c when seeking value", line_and_col, b);
+                           goto e_failed;
+                        }
+                  };
+            };
+         }
+         else
+         {
+            switch (top->type)
+            {
+            case json_object:
+               
+               switch (b)
+               {
+                  whitespace:
+                     continue;
+
+                  case '"':
+
+                     if (flags & flag_need_comma)
+                     {  sprintf (error, "%d:%d: Expected , before \"", line_and_col);
+                        goto e_failed;
+                     }
+
+                     flags |= flag_string;
+
+                     string = (json_char *) top->_reserved.object_mem;
+                     string_length = 0;
+
+                     break;
+                  
+                  case '}':
+
+                     flags = (flags & ~ flag_need_comma) | flag_next;
+                     break;
+
+                  case ',':
+
+                     if (flags & flag_need_comma)
+                     {
+                        flags &= ~ flag_need_comma;
+                        break;
+                     }
+
+                  default:
+                     sprintf (error, "%d:%d: Unexpected `%c` in object", line_and_col, b);
+                     goto e_failed;
+               };
+
+               break;
+
+            case json_integer:
+            case json_double:
+
+               if (isdigit (b))
+               {
+                  ++ num_digits;
+
+                  if (top->type == json_integer || flags & flag_num_e)
+                  {
+                     if (! (flags & flag_num_e))
+                     {
+                        if (flags & flag_num_zero)
+                        {  sprintf (error, "%d:%d: Unexpected `0` before `%c`", line_and_col, b);
+                           goto e_failed;
+                        }
+
+                        if (num_digits == 1 && b == '0')
+                           flags |= flag_num_zero;
+                     }
+                     else
+                     {
+                        flags |= flag_num_e_got_sign;
+                        num_e = (num_e * 10) + (b - '0');
+                        continue;
+                     }
+
+                     top->u.integer = (top->u.integer * 10) + (b - '0');
+                     continue;
+                  }
+
+                  num_fraction = (num_fraction * 10) + (b - '0');
+                  continue;
+               }
+
+               if (b == '+' || b == '-')
+               {
+                  if ( (flags & flag_num_e) && !(flags & flag_num_e_got_sign))
+                  {
+                     flags |= flag_num_e_got_sign;
+
+                     if (b == '-')
+                        flags |= flag_num_e_negative;
+
+                     continue;
+                  }
+               }
+               else if (b == '.' && top->type == json_integer)
+               {
+                  if (!num_digits)
+                  {  sprintf (error, "%d:%d: Expected digit before `.`", line_and_col);
+                     goto e_failed;
+                  }
+
+                  top->type = json_double;
+                  top->u.dbl = (double) top->u.integer;
+
+                  num_digits = 0;
+                  continue;
+               }
+
+               if (! (flags & flag_num_e))
+               {
+                  if (top->type == json_double)
+                  {
+                     if (!num_digits)
+                     {  sprintf (error, "%d:%d: Expected digit after `.`", line_and_col);
+                        goto e_failed;
+                     }
+
+                     top->u.dbl += ((double) num_fraction) / (pow (10.0, (double) num_digits));
+                  }
+
+                  if (b == 'e' || b == 'E')
+                  {
+                     flags |= flag_num_e;
+
+                     if (top->type == json_integer)
+                     {
+                        top->type = json_double;
+                        top->u.dbl = (double) top->u.integer;
+                     }
+
+                     num_digits = 0;
+                     flags &= ~ flag_num_zero;
+
+                     continue;
+                  }
+               }
+               else
+               {
+                  if (!num_digits)
+                  {  sprintf (error, "%d:%d: Expected digit after `e`", line_and_col);
+                     goto e_failed;
+                  }
+
+                  top->u.dbl *= pow (10.0, (double)
+                      (flags & flag_num_e_negative ? - num_e : num_e));
+               }
+
+               if (flags & flag_num_negative)
+               {
+                  if (top->type == json_integer)
+                     top->u.integer = - top->u.integer;
+                  else
+                     top->u.dbl = - top->u.dbl;
+               }
+
+               flags |= flag_next | flag_reproc;
+               break;
+
+            default:
+               break;
+            };
+         }
+
+         if (flags & flag_reproc)
+         {
+            flags &= ~ flag_reproc;
+            -- state.ptr;
+         }
+
+         if (flags & flag_next)
+         {
+            flags = (flags & ~ flag_next) | flag_need_comma;
+
+            if (!top->parent)
+            {
+               /* root value done */
+
+               flags |= flag_done;
+               continue;
+            }
+
+            if (top->parent->type == json_array)
+               flags |= flag_seek_value;
+               
+            if (!state.first_pass)
+            {
+               json_value * parent = top->parent;
+
+               switch (parent->type)
+               {
+                  case json_object:
+
+                     parent->u.object.values
+                        [parent->u.object.length].value = top;
+
+                     break;
+
+                  case json_array:
+
+                     parent->u.array.values
+                           [parent->u.array.length] = top;
+
+                     break;
+
+                  default:
+                     break;
+               };
+            }
+
+            if ( (++ top->parent->u.array.length) > state.uint_max)
+               goto e_overflow;
+
+            top = top->parent;
+
+            continue;
+         }
+      }
+
+      alloc = root;
+   }
+
+   return root;
+
+e_unknown_value:
+
+   sprintf (error, "%d:%d: Unknown value", line_and_col);
+   goto e_failed;
+
+e_alloc_failure:
+
+   strcpy (error, "Memory allocation failure");
+   goto e_failed;
+
+e_overflow:
+
+   sprintf (error, "%d:%d: Too long (caught overflow)", line_and_col);
+   goto e_failed;
+
+e_failed:
+
+   if (error_buf)
+   {
+      if (*error)
+         strcpy (error_buf, error);
+      else
+         strcpy (error_buf, "Unknown error");
+   }
+
+   if (state.first_pass)
+      alloc = root;
+
+   while (alloc)
+   {
+      top = alloc->_reserved.next_alloc;
+      state.settings.mem_free (alloc, state.settings.user_data);
+      alloc = top;
+   }
+
+   if (!state.first_pass)
+      json_value_free_ex (&state.settings, root);
+
+   return 0;
+}
+
+json_value * json_parse (const json_char * json, size_t length)
+{
+   json_settings settings = { 0 };
+   return json_parse_ex (&settings, json, length, 0);
+}
+
+void json_value_free_ex (json_settings * settings, json_value * value)
+{
+   json_value * cur_value;
+
+   if (!value)
+      return;
+
+   value->parent = 0;
+
+   while (value)
+   {
+      switch (value->type)
+      {
+         case json_array:
+
+            if (!value->u.array.length)
+            {
+               settings->mem_free (value->u.array.values, settings->user_data);
+               break;
+            }
+
+            value = value->u.array.values [-- value->u.array.length];
+            continue;
+
+         case json_object:
+
+            if (!value->u.object.length)
+            {
+               settings->mem_free (value->u.object.values, settings->user_data);
+               break;
+            }
+
+            value = value->u.object.values [-- value->u.object.length].value;
+            continue;
+
+         case json_string:
+
+            settings->mem_free (value->u.string.ptr, settings->user_data);
+            break;
+
+         default:
+            break;
+      };
+
+      cur_value = value;
+      value = value->parent;
+      settings->mem_free (cur_value, settings->user_data);
+   }
+}
+
+void json_value_free (json_value * value)
+{
+   json_settings settings = { 0 };
+   settings.mem_free = default_free;
+   json_value_free_ex (&settings, value);
+}
diff --git a/src_bkp/engine/external/json-parser/json.h b/src_bkp/engine/external/json-parser/json.h
new file mode 100644
index 0000000000..610d072b6a
--- /dev/null
+++ b/src_bkp/engine/external/json-parser/json.h
@@ -0,0 +1,280 @@
+
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _JSON_H
+#define _JSON_H
+
+#ifndef json_char
+   #define json_char char
+#endif
+
+#ifndef json_int_t
+   #ifndef _MSC_VER
+      #include <inttypes.h>
+      #define json_int_t int64_t
+   #else
+      #define json_int_t __int64
+   #endif
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+
+   #include <string.h>
+
+   extern "C"
+   {
+
+#endif
+
+typedef struct
+{
+   unsigned long max_memory;
+   int settings;
+
+   /* Custom allocator support (leave null to use malloc/free)
+    */
+
+   void * (* mem_alloc) (size_t, int zero, void * user_data);
+   void (* mem_free) (void *, void * user_data);
+
+   void * user_data;  /* will be passed to mem_alloc and mem_free */
+
+   size_t value_extra;  /* how much extra space to allocate for values? */
+
+} json_settings;
+
+#define json_enable_comments  0x01
+
+typedef enum
+{
+   json_none,
+   json_object,
+   json_array,
+   json_integer,
+   json_double,
+   json_string,
+   json_boolean,
+   json_null
+
+} json_type;
+
+extern const struct _json_value json_value_none;
+
+typedef struct _json_value
+{
+   struct _json_value * parent;
+
+   json_type type;
+
+   union
+   {
+      int boolean;
+      json_int_t integer;
+      double dbl;
+
+      struct
+      {
+         unsigned int length;
+         json_char * ptr; /* null terminated */
+
+      } string;
+
+      struct
+      {
+         unsigned int length;
+
+         struct
+         {
+            json_char * name;
+            unsigned int name_length;
+
+            struct _json_value * value;
+
+         } * values;
+
+         #if defined(__cplusplus) && __cplusplus >= 201103L
+         decltype(values) begin () const
+         {  return values;
+         }
+         decltype(values) end () const
+         {  return values + length;
+         }
+         #endif
+
+      } object;
+
+      struct
+      {
+         unsigned int length;
+         struct _json_value ** values;
+
+         #if defined(__cplusplus) && __cplusplus >= 201103L
+         decltype(values) begin () const
+         {  return values;
+         }
+         decltype(values) end () const
+         {  return values + length;
+         }
+         #endif
+
+      } array;
+
+   } u;
+
+   union
+   {
+      struct _json_value * next_alloc;
+      void * object_mem;
+
+   } _reserved;
+
+   #ifdef JSON_TRACK_SOURCE
+
+      /* Location of the value in the source JSON
+       */
+      unsigned int line, col;
+
+   #endif
+
+
+   /* Some C++ operator sugar */
+
+   #ifdef __cplusplus
+
+      public:
+
+         inline _json_value ()
+         {  memset (this, 0, sizeof (_json_value));
+         }
+
+         inline const struct _json_value &operator [] (int index) const
+         {
+            if (type != json_array || index < 0
+                     || ((unsigned int) index) >= u.array.length)
+            {
+               return json_value_none;
+            }
+
+            return *u.array.values [index];
+         }
+
+         inline const struct _json_value &operator [] (const char * index) const
+         { 
+            if (type != json_object)
+               return json_value_none;
+
+            for (unsigned int i = 0; i < u.object.length; ++ i)
+               if (!strcmp (u.object.values [i].name, index))
+                  return *u.object.values [i].value;
+
+            return json_value_none;
+         }
+
+         inline operator const char * () const
+         {  
+            switch (type)
+            {
+               case json_string:
+                  return u.string.ptr;
+
+               default:
+                  return "";
+            };
+         }
+
+         inline operator json_int_t () const
+         {  
+            switch (type)
+            {
+               case json_integer:
+                  return u.integer;
+
+               case json_double:
+                  return (json_int_t) u.dbl;
+
+               default:
+                  return 0;
+            };
+         }
+
+         inline operator bool () const
+         {  
+            if (type != json_boolean)
+               return false;
+
+            return u.boolean != 0;
+         }
+
+         inline operator double () const
+         {  
+            switch (type)
+            {
+               case json_integer:
+                  return (double) u.integer;
+
+               case json_double:
+                  return u.dbl;
+
+               default:
+                  return 0;
+            };
+         }
+
+   #endif
+
+} json_value;
+
+json_value * json_parse (const json_char * json,
+                         size_t length);
+
+#define json_error_max 128
+json_value * json_parse_ex (json_settings * settings,
+                            const json_char * json,
+                            size_t length,
+                            char * error);
+
+void json_value_free (json_value *);
+
+
+/* Not usually necessary, unless you used a custom mem_alloc and now want to
+ * use a custom mem_free.
+ */
+void json_value_free_ex (json_settings * settings,
+                         json_value *);
+
+#ifdef __cplusplus
+   } /* extern "C" */
+#endif
+
+#endif
+
+
diff --git a/src_bkp/engine/external/md5/md5.c b/src_bkp/engine/external/md5/md5.c
new file mode 100644
index 0000000000..99877cd7a3
--- /dev/null
+++ b/src_bkp/engine/external/md5/md5.c
@@ -0,0 +1,381 @@
+/*
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+#include <string.h>
+
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
+    }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish_(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/src_bkp/engine/external/md5/md5.h b/src_bkp/engine/external/md5/md5.h
new file mode 100644
index 0000000000..bed5e8fdc5
--- /dev/null
+++ b/src_bkp/engine/external/md5/md5.h
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish_(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
diff --git a/src_bkp/engine/external/wavpack/VERSION.txt b/src_bkp/engine/external/wavpack/VERSION.txt
new file mode 100644
index 0000000000..df83b62e9e
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/VERSION.txt
@@ -0,0 +1 @@
+Tiny Decoder 4.40
diff --git a/src_bkp/engine/external/wavpack/arm.S b/src_bkp/engine/external/wavpack/arm.S
new file mode 100644
index 0000000000..4f2998923b
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/arm.S
@@ -0,0 +1,461 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+/* This is an assembly optimized version of the following WavPack function:
+ *
+ * void decorr_stereo_pass_cont (struct decorr_pass *dpp,
+ *                               long *buffer, long sample_count);
+ *
+ * It performs a single pass of stereo decorrelation on the provided buffer.
+ * Note that this version of the function requires that the 8 previous stereo
+ * samples are visible and correct. In other words, it ignores the "samples_*"
+ * fields in the decorr_pass structure and gets the history data directly
+ * from the buffer. It does, however, return the appropriate history samples
+ * to the decorr_pass structure before returning.
+ *
+ * This is written to work on a ARM7TDMI processor. This version only uses the
+ * 32-bit multiply-accumulate instruction and so will overflow with 24-bit
+ * WavPack files.
+ */
+        .text
+        .align
+        .global         decorr_stereo_pass_cont_arm
+
+/*
+ * on entry:
+ *
+ * r0 = struct decorr_pass *dpp
+ * r1 = long *buffer
+ * r2 = long sample_count
+ */
+
+decorr_stereo_pass_cont_arm:
+
+        stmfd   sp!, {r4 - r8, r10, r11, lr}
+        mov     r5, r0                  @ r5 = dpp
+        mov     r11, #512               @ r11 = 512 for rounding
+        ldrsh   r6, [r0, #2]            @ r6 = dpp->delta
+        ldrsh   r4, [r0, #4]            @ r4 = dpp->weight_A
+        ldrsh   r0, [r0, #6]            @ r0 = dpp->weight_B
+        cmp     r2, #0                  @ exit if no samples to process
+        beq     common_exit
+
+        add     r7, r1, r2, asl #3      @ r7 = buffer ending position
+        ldrsh   r2, [r5, #0]            @ r2 = dpp->term
+        cmp     r2, #0
+        bmi     minus_term
+
+        ldr     lr, [r1, #-16]          @ load 2 sample history from buffer
+        ldr     r10, [r1, #-12]         @  for terms 2, 17, and 18
+        ldr     r8, [r1, #-8]
+        ldr     r3, [r1, #-4]
+        cmp     r2, #17
+        beq     term_17_loop
+        cmp     r2, #18
+        beq     term_18_loop
+        cmp     r2, #2
+        beq     term_2_loop
+        b       term_default_loop       @ else handle default (1-8, except 2)
+
+minus_term:
+        mov     r10, #1024              @ r10 = -1024 for weight clipping
+        rsb     r10, r10, #0            @  (only used for negative terms)
+        cmn     r2, #1
+        beq     term_minus_1
+        cmn     r2, #2
+        beq     term_minus_2
+        cmn     r2, #3
+        beq     term_minus_3
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 17 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample
+ * r3 = previous right sample   r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = current decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_17_loop:
+        rsbs    ip, lr, r8, asl #1      @ decorr value = (2 * prev) - 2nd prev
+        mov     lr, r8                  @ previous becomes 2nd previous
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mla     r8, ip, r4, r11         @ mult decorr value by weight, round,
+        add     r8, r2, r8, asr #10     @  shift, and add to new sample
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L325
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L325:  rsbs    ip, r10, r3, asl #1     @ do same thing for right channel
+        mov     r10, r3
+        ldr     r2, [r1], #4
+        mla     r3, ip, r0, r11
+        add     r3, r2, r3, asr #10
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L329
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L329:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_17_loop
+        b       store_1718              @ common exit for terms 17 & 18
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 18 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample
+ * r3 = previous right sample   r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_18_loop:
+        sub     ip, r8, lr              @ decorr value =
+        mov     lr, r8                  @  ((3 * prev) - 2nd prev) >> 1
+        adds    ip, r8, ip, asr #1
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mla     r8, ip, r4, r11         @ mult decorr value by weight, round,
+        add     r8, r2, r8, asr #10     @  shift, and add to new sample
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L337
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L337:  sub     ip, r3, r10             @ do same thing for right channel
+        mov     r10, r3
+        adds    ip, r3, ip, asr #1
+        ldr     r2, [r1], #4
+        mla     r3, ip, r0, r11
+        add     r3, r2, r3, asr #10
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L341
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L341:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_18_loop
+
+/* common exit for terms 17 & 18 */
+
+store_1718:
+        str     r3, [r5, #40]           @ store sample history into struct
+        str     r8, [r5, #8]
+        str     r10, [r5, #44]
+        str     lr, [r5, #12]
+        b       common_exit             @ and return
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 2 condition
+ * (note that this case can be handled by the default term handler (1-8), but
+ * this special case is faster because it doesn't have to read memory twice)
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample
+ * r3 = previous right sample   r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_2_loop:
+        movs    ip, lr                  @ get decorrelation value & test
+        mov     lr, r8                  @ previous becomes 2nd previous
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mla     r8, ip, r4, r11         @ mult decorr value by weight, round,
+        add     r8, r2, r8, asr #10     @  shift, and add to new sample
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L225
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L225:  movs    ip, r10                 @ do same thing for right channel
+        mov     r10, r3
+        ldr     r2, [r1], #4
+        mla     r3, ip, r0, r11
+        add     r3, r2, r3, asr #10
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L229
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L229:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_2_loop
+        b       default_term_exit       @ this exit updates all dpp->samples
+
+/*
+ ******************************************************************************
+ * Loop to handle default term condition
+ *
+ * r0 = dpp->weight_B           r8 = result accumulator
+ * r1 = bptr                    r9 = 
+ * r2 = dpp->term               r10 =
+ * r3 = decorrelation value     r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr =
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_default_loop:
+        ldr     ip, [r1]                @ get original sample
+        ldr     r3, [r1, -r2, asl #3]   @ get decorrelation value based on term
+        mla     r8, r3, r4, r11         @ mult decorr value by weight, round,
+        add     r8, ip, r8, asr #10     @  shift and add to new sample
+        str     r8, [r1], #4            @ store update sample
+        cmp     r3, #0
+        cmpne   ip, #0
+        beq     .L350
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L350:  ldr     ip, [r1]                @ do the same thing for right channel
+        ldr     r3, [r1, -r2, asl #3]
+        mla     r8, r3, r0, r11
+        add     r8, ip, r8, asr #10
+        str     r8, [r1], #4
+        cmp     r3, #0
+        cmpne   ip, #0
+        beq     .L354
+        teq     ip, r3
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L354:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_default_loop
+
+/*
+ * This exit is used by terms 1-8 to store the previous 8 samples into the decorr
+ * structure (even if they are not all used for the given term)
+ */
+
+default_term_exit:
+        ldrsh   r3, [r5, #0]
+        sub     ip, r3, #1
+        mov     lr, #7
+
+.L358:  and     r3, ip, #7
+        add     r3, r5, r3, asl #2
+        ldr     r2, [r1, #-4]
+        str     r2, [r3, #40]
+        ldr     r2, [r1, #-8]!
+        str     r2, [r3, #8]
+        sub     ip, ip, #1
+        sub     lr, lr, #1
+        cmn     lr, #1
+        bne     .L358
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -1 condition
+ *
+ * r0 = dpp->weight_B           r8 =
+ * r1 = bptr                    r9 = 
+ * r2 = intermediate result     r10 = -1024 (for clipping)
+ * r3 = previous right sample   r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = updated left sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_1:
+        ldr     r3, [r1, #-4]
+
+term_minus_1_loop:
+        ldr     ip, [r1]                @ for left channel the decorrelation value
+        mla     r2, r3, r4, r11         @  is the previous right sample (in r3)
+        add     lr, ip, r2, asr #10
+        str     lr, [r1], #8
+        cmp     r3, #0
+        cmpne   ip, #0
+        beq     .L361
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #1024
+        movgt   r4, #1024
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L361:  ldr     r2, [r1, #-4]           @ for right channel the decorrelation value
+        mla     r3, lr, r0, r11         @  is the just updated right sample (in lr)
+        add     r3, r2, r3, asr #10
+        str     r3, [r1, #-4]
+        cmp     lr, #0
+        cmpne   r2, #0
+        beq     .L369
+        teq     r2, lr
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #1024               @ then clip weight to +/-1024
+        movgt   r0, #1024
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L369:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_1_loop
+
+        str     r3, [r5, #8]            @ else store right sample and exit
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -2 condition
+ * (note that the channels are processed in the reverse order here)
+ *
+ * r0 = dpp->weight_B           r8 =
+ * r1 = bptr                    r9 = 
+ * r2 = intermediate result     r10 = -1024 (for clipping)
+ * r3 = previous left sample    r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = updated right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_2:
+        ldr     r3, [r1, #-8]
+
+term_minus_2_loop:
+        ldr     ip, [r1, #4]            @ for right channel the decorrelation value
+        mla     r2, r3, r0, r11         @  is the previous left sample (in r3)
+        add     lr, ip, r2, asr #10
+        str     lr, [r1, #4]
+        cmp     r3, #0
+        cmpne   ip, #0
+        beq     .L380
+        teq     ip, r3                  @ update weight based on signs
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #1024               @ then clip weight to +/-1024
+        movgt   r0, #1024
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L380:  ldr     r2, [r1, #0]            @ for left channel the decorrelation value
+        mla     r3, lr, r4, r11         @  is the just updated left sample (in lr)
+        add     r3, r2, r3, asr #10
+        str     r3, [r1], #8
+        cmp     lr, #0
+        cmpne   r2, #0
+        beq     .L388
+        teq     r2, lr
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #1024
+        movgt   r4, #1024
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L388:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_2_loop
+
+        str     r3, [r5, #40]           @ else store left channel and exit
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -3 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current left sample     r10 = -1024 (for clipping)
+ * r3 = previous right sample   r11 = 512 (for rounding)
+ * r4 = dpp->weight_A           ip = intermediate result
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr =
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_3:
+        ldr     r3, [r1, #-4]           @ load previous samples
+        ldr     r8, [r1, #-8]
+
+term_minus_3_loop:
+        ldr     ip, [r1]
+        mla     r2, r3, r4, r11
+        add     r2, ip, r2, asr #10
+        str     r2, [r1], #4
+        cmp     r3, #0
+        cmpne   ip, #0
+        beq     .L399
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #1024               @ then clip weight to +/-1024
+        movgt   r4, #1024
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L399:  movs    ip, r8                  @ ip = previous left we use now
+        mov     r8, r2                  @ r8 = current left we use next time
+        ldr     r2, [r1], #4
+        mla     r3, ip, r0, r11
+        add     r3, r2, r3, asr #10
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L407
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #1024
+        movgt   r0, #1024
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L407:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_3_loop
+
+        str     r3, [r5, #8]            @ else store previous samples & exit
+        str     r8, [r5, #40]
+
+/*
+ * Before finally exiting we must store weights back for next time
+ */
+
+common_exit:
+        strh    r4, [r5, #4]
+        strh    r0, [r5, #6]
+        ldmfd   sp!, {r4 - r8, r10, r11, pc}
+
diff --git a/src_bkp/engine/external/wavpack/arml.S b/src_bkp/engine/external/wavpack/arml.S
new file mode 100644
index 0000000000..7da0051397
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/arml.S
@@ -0,0 +1,491 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+/* This is an assembly optimized version of the following WavPack function:
+ *
+ * void decorr_stereo_pass_cont (struct decorr_pass *dpp,
+ *                               long *buffer, long sample_count);
+ *
+ * It performs a single pass of stereo decorrelation on the provided buffer.
+ * Note that this version of the function requires that the 8 previous stereo
+ * samples are visible and correct. In other words, it ignores the "samples_*"
+ * fields in the decorr_pass structure and gets the history data directly
+ * from the buffer. It does, however, return the appropriate history samples
+ * to the decorr_pass structure before returning.
+ *
+ * This is written to work on a ARM7TDMI processor. This version uses the
+ * 64-bit multiply-accumulate instruction and so can be used with all
+ * WavPack files. However, for optimum performance with 16-bit WavPack
+ * files, there is a faster version that only uses the 32-bit MLA
+ * instruction.
+ */
+
+        .text
+        .align
+        .global         decorr_stereo_pass_cont_arml
+
+/*
+ * on entry:
+ *
+ * r0 = struct decorr_pass *dpp
+ * r1 = long *buffer
+ * r2 = long sample_count
+ */
+
+decorr_stereo_pass_cont_arml:
+
+        stmfd   sp!, {r4 - r8, r10, r11, lr}
+        mov     r5, r0                  @ r5 = dpp
+        mov     r11, #512               @ r11 = 512 for rounding
+        ldrsh   r6, [r0, #2]            @ r6 = dpp->delta
+        ldrsh   r4, [r0, #4]            @ r4 = dpp->weight_A
+        ldrsh   r0, [r0, #6]            @ r0 = dpp->weight_B
+        cmp     r2, #0                  @ exit if no samples to process
+        beq     common_exit
+
+        mov     r0, r0, asl #18         @ for 64-bit math we use weights << 18
+        mov     r4, r4, asl #18
+        mov     r6, r6, asl #18
+        add     r7, r1, r2, asl #3      @ r7 = buffer ending position
+        ldrsh   r2, [r5, #0]            @ r2 = dpp->term
+        cmp     r2, #0
+        blt     minus_term
+
+        ldr     lr, [r1, #-16]          @ load 2 sample history from buffer
+        ldr     r10, [r1, #-12]         @  for terms 2, 17, and 18
+        ldr     r8, [r1, #-8]
+        ldr     r3, [r1, #-4]
+
+        cmp     r2, #18
+        beq     term_18_loop
+        mov     lr, lr, asl #4
+        mov     r10, r10, asl #4
+        cmp     r2, #2
+        beq     term_2_loop
+        cmp     r2, #17
+        beq     term_17_loop
+        b       term_default_loop
+
+minus_term:
+        mov     r10, #(1024 << 18)      @ r10 = -1024 << 18 for weight clipping
+        rsb     r10, r10, #0            @  (only used for negative terms)
+        cmn     r2, #1
+        beq     term_minus_1
+        cmn     r2, #2
+        beq     term_minus_2
+        cmn     r2, #3
+        beq     term_minus_3
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 17 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample << 4
+ * r3 = previous right sample   r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = current decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample << 4
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_17_loop:
+        rsbs    ip, lr, r8, asl #5      @ decorr value = (2 * prev) - 2nd prev
+        mov     lr, r8, asl #4          @ previous becomes 2nd previous
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mov     r11, #0x80000000
+        mov     r8, r2
+        smlalne r11, r8, r4, ip
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L325
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L325:  rsbs    ip, r10, r3, asl #5     @ do same thing for right channel
+        mov     r10, r3, asl #4
+        ldr     r2, [r1], #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r0, ip
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L329
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L329:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_17_loop
+        mov     lr, lr, asr #4
+        mov     r10, r10, asr #4
+        b       store_1718              @ common exit for terms 17 & 18
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 18 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample
+ * r3 = previous right sample   r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_18_loop:
+        rsb     ip, lr, r8              @ decorr value =
+        mov     lr, r8                  @  ((3 * prev) - 2nd prev) >> 1
+        add     ip, lr, ip, asr #1
+        movs    ip, ip, asl #4
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mov     r11, #0x80000000
+        mov     r8, r2
+        smlalne r11, r8, r4, ip
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L337
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L337:  rsb     ip, r10, r3             @ do same thing for right channel
+        mov     r10, r3
+        add     ip, r10, ip, asr #1
+        movs    ip, ip, asl #4
+        ldr     r2, [r1], #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r0, ip
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L341
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L341:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_18_loop
+
+/* common exit for terms 17 & 18 */
+
+store_1718:
+        str     r3, [r5, #40]           @ store sample history into struct
+        str     r8, [r5, #8]
+        str     r10, [r5, #44]
+        str     lr, [r5, #12]
+        b       common_exit             @ and return
+
+/*
+ ******************************************************************************
+ * Loop to handle term = 2 condition
+ * (note that this case can be handled by the default term handler (1-8), but
+ * this special case is faster because it doesn't have to read memory twice)
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current sample          r10 = second previous left sample << 4
+ * r3 = previous right sample   r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = decorrelation value
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = second previous right sample << 4
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_2_loop:
+        movs    ip, lr                  @ get decorrelation value & test
+        ldr     r2, [r1], #4            @ get sample & update pointer
+        mov     lr, r8, asl #4          @ previous becomes 2nd previous
+        mov     r11, #0x80000000
+        mov     r8, r2
+        smlalne r11, r8, r4, ip
+        strne   r8, [r1, #-4]           @ if change possible, store sample back
+        cmpne   r2, #0
+        beq     .L225
+        teq     ip, r2                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L225:  movs    ip, r10                 @ do same thing for right channel
+        ldr     r2, [r1], #4
+        mov     r10, r3, asl #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r0, ip
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L229
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L229:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_2_loop
+
+        b       default_term_exit       @ this exit updates all dpp->samples
+
+/*
+ ******************************************************************************
+ * Loop to handle default term condition
+ *
+ * r0 = dpp->weight_B           r8 = result accumulator
+ * r1 = bptr                    r9 = 
+ * r2 = dpp->term               r10 =
+ * r3 = decorrelation value     r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr =
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_default_loop:
+        ldr     r3, [r1, -r2, asl #3]   @ get decorrelation value based on term
+        ldr     ip, [r1], #4            @ get original sample and bump ptr
+        movs    r3, r3, asl #4
+        mov     r11, #0x80000000
+        mov     r8, ip
+        smlalne r11, r8, r4, r3
+        strne   r8, [r1, #-4]           @ if possibly changed, store updated sample
+        cmpne   ip, #0
+        beq     .L350
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+
+.L350:  ldr     r3, [r1, -r2, asl #3]   @ do the same thing for right channel
+        ldr     ip, [r1], #4
+        movs    r3, r3, asl #4
+        mov     r11, #0x80000000
+        mov     r8, ip
+        smlalne r11, r8, r0, r3
+        strne   r8, [r1, #-4]
+        cmpne   ip, #0
+        beq     .L354
+        teq     ip, r3
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+
+.L354:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_default_loop
+
+/*
+ * This exit is used by terms 1-8 to store the previous 8 samples into the decorr
+ * structure (even if they are not all used for the given term)
+ */
+
+default_term_exit:
+        ldrsh   r3, [r5, #0]
+        sub     ip, r3, #1
+        mov     lr, #7
+
+.L358:  and     r3, ip, #7
+        add     r3, r5, r3, asl #2
+        ldr     r2, [r1, #-4]
+        str     r2, [r3, #40]
+        ldr     r2, [r1, #-8]!
+        str     r2, [r3, #8]
+        sub     ip, ip, #1
+        sub     lr, lr, #1
+        cmn     lr, #1
+        bne     .L358
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -1 condition
+ *
+ * r0 = dpp->weight_B           r8 =
+ * r1 = bptr                    r9 = 
+ * r2 = intermediate result     r10 = -1024 (for clipping)
+ * r3 = previous right sample   r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = updated left sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_1:
+        ldr     r3, [r1, #-4]
+
+term_minus_1_loop:
+        ldr     ip, [r1], #8            @ for left channel the decorrelation value
+        movs    r3, r3, asl #4          @  is the previous right sample (in r3)
+        mov     r11, #0x80000000
+        mov     lr, ip
+        smlalne r11, lr, r4, r3
+        strne   lr, [r1, #-8]
+        cmpne   ip, #0
+        beq     .L361
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #(1024 << 18)
+        movgt   r4, #(1024 << 18)
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L361:  ldr     r2, [r1, #-4]           @ for right channel the decorrelation value
+        movs    lr, lr, asl #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r0, lr
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L369
+        teq     r2, lr
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #(1024 << 18)               @ then clip weight to +/-1024
+        movgt   r0, #(1024 << 18)
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L369:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_1_loop
+
+        str     r3, [r5, #8]            @ else store right sample and exit
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -2 condition
+ * (note that the channels are processed in the reverse order here)
+ *
+ * r0 = dpp->weight_B           r8 =
+ * r1 = bptr                    r9 = 
+ * r2 = intermediate result     r10 = -1024 (for clipping)
+ * r3 = previous left sample    r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = current sample
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr = updated right sample
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_2:
+        ldr     r3, [r1, #-8]
+
+term_minus_2_loop:
+        ldr     ip, [r1, #4]            @ for right channel the decorrelation value
+        movs    r3, r3, asl #4          @  is the previous left sample (in r3)
+        mov     r11, #0x80000000
+        mov     lr, ip
+        smlalne r11, lr, r0, r3
+        strne   lr, [r1, #4]
+        cmpne   ip, #0
+        beq     .L380
+        teq     ip, r3                  @ update weight based on signs
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #(1024 << 18)               @ then clip weight to +/-1024
+        movgt   r0, #(1024 << 18)
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L380:  ldr     r2, [r1], #8            @ for left channel the decorrelation value
+        movs    lr, lr, asl #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r4, lr
+        strne   r3, [r1, #-8]
+        cmpne   r2, #0
+        beq     .L388
+        teq     r2, lr
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #(1024 << 18)
+        movgt   r4, #(1024 << 18)
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L388:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_2_loop
+
+        str     r3, [r5, #40]           @ else store left channel and exit
+        b       common_exit
+
+/*
+ ******************************************************************************
+ * Loop to handle term = -3 condition
+ *
+ * r0 = dpp->weight_B           r8 = previous left sample
+ * r1 = bptr                    r9 = 
+ * r2 = current left sample     r10 = -1024 (for clipping)
+ * r3 = previous right sample   r11 = lo accumulator (for rounding)
+ * r4 = dpp->weight_A           ip = intermediate result
+ * r5 = dpp                     sp =
+ * r6 = dpp->delta              lr =
+ * r7 = eptr                    pc =
+ *******************************************************************************
+ */
+
+term_minus_3:
+        ldr     r3, [r1, #-4]           @ load previous samples
+        ldr     r8, [r1, #-8]
+
+term_minus_3_loop:
+        ldr     ip, [r1], #4
+        movs    r3, r3, asl #4
+        mov     r11, #0x80000000
+        mov     r2, ip
+        smlalne r11, r2, r4, r3
+        strne   r2, [r1, #-4]
+        cmpne   ip, #0
+        beq     .L399
+        teq     ip, r3                  @ update weight based on signs
+        submi   r4, r4, r6
+        addpl   r4, r4, r6
+        cmp     r4, #(1024 << 18)       @ then clip weight to +/-1024
+        movgt   r4, #(1024 << 18)
+        cmp     r4, r10
+        movlt   r4, r10
+
+.L399:  movs    ip, r8, asl #4          @ ip = previous left we use now
+        mov     r8, r2                  @ r8 = current left we use next time
+        ldr     r2, [r1], #4
+        mov     r11, #0x80000000
+        mov     r3, r2
+        smlalne r11, r3, r0, ip
+        strne   r3, [r1, #-4]
+        cmpne   r2, #0
+        beq     .L407
+        teq     ip, r2
+        submi   r0, r0, r6
+        addpl   r0, r0, r6
+        cmp     r0, #(1024 << 18)
+        movgt   r0, #(1024 << 18)
+        cmp     r0, r10
+        movlt   r0, r10
+
+.L407:  cmp     r7, r1                  @ loop back if more samples to do
+        bhi     term_minus_3_loop
+
+        str     r3, [r5, #8]            @ else store previous samples & exit
+        str     r8, [r5, #40]
+
+/*
+ * Before finally exiting we must store weights back for next time
+ */
+
+common_exit:
+        mov     r0, r0, asr #18         @ restore weights to real magnitude
+        mov     r4, r4, asr #18
+        strh    r4, [r5, #4]
+        strh    r0, [r5, #6]
+        ldmfd   sp!, {r4 - r8, r10, r11, pc}
+
diff --git a/src_bkp/engine/external/wavpack/bits.c b/src_bkp/engine/external/wavpack/bits.c
new file mode 100644
index 0000000000..b4f03385e9
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/bits.c
@@ -0,0 +1,140 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// bits.c
+
+// This module provides utilities to support the BitStream structure which is
+// used to read and write all WavPack audio data streams. It also contains a
+// wrapper for the stream I/O functions and a set of functions dealing with
+// endian-ness, both for enhancing portability. Finally, a debug wrapper for
+// the malloc() system is provided.
+
+#include "wavpack.h"
+
+#include <string.h>
+#include <ctype.h>
+
+////////////////////////// Bitstream functions ////////////////////////////////
+
+// Open the specified BitStream and associate with the specified buffer.
+
+static void bs_read (Bitstream *bs);
+
+void bs_open_read (Bitstream *bs, uchar *buffer_start, uchar *buffer_end, read_stream file, uint32_t file_bytes)
+{
+    CLEAR (*bs);
+    bs->buf = buffer_start;
+    bs->end = buffer_end;
+
+    if (file) {
+        bs->ptr = bs->end - 1;
+        bs->file_bytes = file_bytes;
+        bs->file = file;
+    }
+    else
+        bs->ptr = bs->buf - 1;
+
+    bs->wrap = bs_read;
+}
+
+// This function is only called from the getbit() and getbits() macros when
+// the BitStream has been exhausted and more data is required. Sinve these
+// bistreams no longer access files, this function simple sets an error and
+// resets the buffer.
+
+static void bs_read (Bitstream *bs)
+{
+    if (bs->file && bs->file_bytes) {
+        uint32_t bytes_read, bytes_to_read = bs->end - bs->buf;
+
+        if (bytes_to_read > bs->file_bytes)
+            bytes_to_read = bs->file_bytes;
+
+        bytes_read = bs->file (bs->buf, bytes_to_read);
+
+        if (bytes_read) {
+            bs->end = bs->buf + bytes_read;
+            bs->file_bytes -= bytes_read;
+        }
+        else {
+            memset (bs->buf, -1, bs->end - bs->buf);
+            bs->error = 1;
+        }
+    }
+    else
+        bs->error = 1;
+
+    if (bs->error)
+        memset (bs->buf, -1, bs->end - bs->buf);
+
+    bs->ptr = bs->buf;
+}
+
+/////////////////////// Endian Correction Routines ////////////////////////////
+
+void little_endian_to_native (void *data, char *format)
+{
+    uchar *cp = (uchar *) data;
+    int32_t temp;
+
+    while (*format) {
+        switch (*format) {
+            case 'L':
+                temp = cp [0] + ((int32_t) cp [1] << 8) + ((int32_t) cp [2] << 16) + ((int32_t) cp [3] << 24);
+                * (int32_t *) cp = temp;
+                cp += 4;
+                break;
+
+            case 'S':
+                temp = cp [0] + (cp [1] << 8);
+                * (short *) cp = (short) temp;
+                cp += 2;
+                break;
+
+            default:
+                if (isdigit (*format))
+                    cp += *format - '0';
+
+                break;
+        }
+
+        format++;
+    }
+}
+
+void native_to_little_endian (void *data, char *format)
+{
+    uchar *cp = (uchar *) data;
+    int32_t temp;
+
+    while (*format) {
+        switch (*format) {
+            case 'L':
+                temp = * (int32_t *) cp;
+                *cp++ = (uchar) temp;
+                *cp++ = (uchar) (temp >> 8);
+                *cp++ = (uchar) (temp >> 16);
+                *cp++ = (uchar) (temp >> 24);
+                break;
+
+            case 'S':
+                temp = * (short *) cp;
+                *cp++ = (uchar) temp;
+                *cp++ = (uchar) (temp >> 8);
+                break;
+
+            default:
+                if (isdigit (*format))
+                    cp += *format - '0';
+
+                break;
+        }
+
+        format++;
+    }
+}
diff --git a/src_bkp/engine/external/wavpack/coldfire.S b/src_bkp/engine/external/wavpack/coldfire.S
new file mode 100644
index 0000000000..83530900cf
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/coldfire.S
@@ -0,0 +1,525 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+/* This is an assembly optimized version of the following WavPack function:
+ *
+ * void decorr_stereo_pass_cont (struct decorr_pass *dpp,
+ *                               long *buffer, long sample_count);
+ *
+ * It performs a single pass of stereo decorrelation on the provided buffer.
+ * Note that this version of the function requires that the 8 previous stereo
+ * samples are visible and correct. In other words, it ignores the "samples_*"
+ * fields in the decorr_pass structure and gets the history data directly
+ * from the buffer. It does, however, return the appropriate history samples
+ * to the decorr_pass structure before returning.
+ *
+ * This is written to work on a MCF5249 processor, or any processor based on
+ * the ColdFire V2 core with an EMAC unit. The EMAC is perfectly suited for
+ * the "apply_weight" function of WavPack decorrelation because it provides
+ * the requires 40-bit product. The fractional rounding mode of the EMAC is not
+ * configurable and uses "round to even" while WavPack uses "round to larger",
+ * so the rounding has to be done manually.
+ */
+
+        .text
+        .align  2
+        .global decorr_stereo_pass_cont_mcf5249
+
+decorr_stereo_pass_cont_mcf5249:
+
+        lea     (-44, %sp), %sp
+        movem.l %d2-%d7/%a2-%a6, (%sp)
+        move.l  44+4(%sp), %a2          | a2 = dpp->
+        move.l  44+8(%sp), %a1          | a1 = bptr
+        move.w  2(%a2), %a3             | a3 = dpp->delta
+        move.w  4(%a2), %d3             | d3 = dpp->weight_A (sign extended)
+        ext.l   %d3
+        move.w  6(%a2), %d4             | d4 = dpp->weight_B (sign extended)
+        ext.l   %d4
+        move.l 44+12(%sp), %d0          | d0 = sample_count
+        jbeq    return_only             | if zero, nothing to do
+
+        lsl.l   #3, %d0                 | d5 = bptr + (sample_count * 8)
+        move.l  %d0, %d5
+        add.l   %a1, %d5
+
+        moveq.l #17, %d0                | left shift weights & delta 17 places
+        asl.l   %d0, %d3
+        asl.l   %d0, %d4
+        move.l  %a3, %d1
+        asl.l   %d0, %d1
+        move.l  %d1, %a3
+
+        moveq.l #0x20, %d6
+        move.l  %d6, %macsr             | set fractional mode for MAC
+        move.l  #0, %acc1               | acc1 = 0x00 0000 80 (for rounding)
+        move.l  #0x800000, %accext01
+        
+        move.l  #1024<<17, %d6          | d6 & d7 are weight clipping limits
+        move.l  #-1024<<17, %d7         | (only used by negative terms)
+
+        move.w  (%a2), %d0              | d0 = term
+        ext.l   %d0
+        cmp.l   #17, %d0
+        jbeq    term_17                 | term = 17
+        cmp.l   #18, %d0
+        jbeq    term_18                 | term = 18
+        addq.l  #1, %d0
+        jbeq    term_minus_1            | term = -1
+        addq.l  #1, %d0
+        jbeq    term_minus_2            | term = -2
+        addq.l  #1, %d0
+        jbeq    term_minus_3            | term = -3
+        jbra    term_default            | default term = 1 - 8
+
+|------------------------------------------------------------------------------
+| Loop to handle term = 17 condition
+|
+| a0 =                          d0 = (2 * bptr [-1]) - bptr [-2]
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_17:
+        move.l  -8(%a1), %d0            | d0 = 2 * bptr [-1] - bptr [-2]
+        add.l   %d0, %d0
+        sub.l   -16(%a1), %d0
+        beq     .L251                   | if zero, skip calculation
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_A
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L255
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L256                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        sub.l   %a3, %d3                | subtract again instead of branch
+.L256:  add.l   %a3, %d3                | add delta to weight
+
+.L255:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | update bptr [0] and store
+        move.l  %d2, (%a1)+
+
+.L253:  move.l  -8(%a1), %d0            | d0 = 2 * bptr [-1] - bptr [-2]
+        add.l   %d0, %d0
+        sub.l   -16(%a1), %d0
+        beq     .L257                   | if zero, skip calculations
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_B
+        mac.l   %d0, %d4, %acc0
+        move.l  (%a1), %d1
+        beq     .L254
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L259                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        sub.l   %a3, %d4                | subtract again instead of branch
+.L259:  add.l   %a3, %d4                | add delta to weight
+
+.L254:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | update bptr [0] and store
+        move.l  %d2, (%a1)+
+
+.L252:  cmp.l   %a1, %d5                | loop if bptr < eptr
+        jbhi    term_17
+        bra     term_17_18_finish       | exit through common path
+
+.L251:  addq.l  #4, %a1                 | update point and jump back into loop
+        bra     .L253
+
+.L257:  addq.l  #4, %a1                 | update point and jump back into loop
+        bra     .L252
+
+|------------------------------------------------------------------------------
+| Loop to handle term = 18 condition
+|
+| a0 =                          d0 = ((3 * bptr [-1]) - bptr [-2]) >> 1
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_18:
+        move.l  -8(%a1), %a0            | d0 = (3 * bptr [-1] - bptr [-2]) >> 1
+        lea     (%a0,%a0.l*2), %a0
+        move.l  %a0, %d0
+        sub.l   -16(%a1), %d0
+        asr.l   #1, %d0
+        beq     .L260
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_A
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L266
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L267                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        sub.l   %a3, %d3                | subtract again instead of branch
+.L267:  add.l   %a3, %d3                | add delta to weight
+
+.L266:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [0], store
+        move.l  %d2, (%a1)+
+
+.L268:  move.l  -8(%a1), %a0            | d0 = (3 * bptr [-1] - bptr [-2]) >> 1
+        lea     (%a0,%a0.l*2), %a0
+        move.l  %a0, %d0
+        sub.l   -16(%a1), %d0
+        asr.l   #1, %d0
+        beq     .L261
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_B
+        mac.l   %d0, %d4, %acc0
+        move.l  (%a1), %d1
+        beq     .L265
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L270                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        sub.l   %a3, %d4                | subtract again instead of branch
+.L270:  add.l   %a3, %d4                | add delta to weight
+
+.L265:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [0], store
+        move.l  %d2, (%a1)+
+
+.L269:  cmp.l   %a1, %d5                | loop if bptr < eptr
+        jbhi    term_18
+        bra     term_17_18_finish       | exit through common path
+
+.L260:  addq.l  #4, %a1                 | bump pointer and jump back into loop
+        bra     .L268
+
+.L261:  addq.l  #4, %a1                 | bump pointer and jump back into loop
+        bra     .L269
+
+term_17_18_finish:
+        move.l  -4(%a1), 40(%a2)        | restore dpp->samples_A [0-1], B [0-1]
+        move.l  -8(%a1), 8(%a2)
+        move.l  -12(%a1), 44(%a2)
+        move.l  -16(%a1), 12(%a2)
+        jbra    finish_up
+
+|------------------------------------------------------------------------------
+| Loop to handle default terms (i.e. 1 - 8)
+|
+| a0 = tptr                     d0 = tptr [0]
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_default:
+        move.w  (%a2), %d0              | a0 = a1 - (dpp->term * 8)
+        ext.l   %d0
+        lsl.l   #3, %d0
+        move.l  %a1, %a0
+        sub.l   %d0, %a0
+
+term_default_loop:
+        move.l  (%a0)+, %d0             | d0 = tptr [0], skip ahead if zero
+        beq     .L271
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_A
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L277
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L278                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        sub.l   %a3, %d3                | subtract again instead of branch
+.L278:  add.l   %a3, %d3                | add delta to weight
+
+.L277:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [0], store
+        move.l  %d2, (%a1)+
+
+.L275:  move.l  (%a0)+, %d0             | d0 = tptr [0], skip ahead if zero
+        beq     .L272
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + (d0 << 4) * weight_B
+        mac.l   %d0, %d4, %acc0
+        move.l  (%a1), %d1
+        beq     .L276
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L281                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        sub.l   %a3, %d4                | subtract again instead of branch
+.L281:  add.l   %a3, %d4                | add delta to weight
+
+.L276:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [0], store
+        move.l  %d2, (%a1)+
+
+.L274:  cmp.l   %a1, %d5                | loop back if bptr < eptr
+        jbhi    term_default_loop
+        move.w  (%a2), %d0              | d0 = term - 1
+        moveq.l #8, %d1                 | d1 = loop counter
+
+.L323:  subq.l  #1, %d0                 | back up & mask index
+        and.l   #7, %d0
+        move.l  -(%a1), 40(%a2,%d0.l*4) | store dpp->samples_B [d0]
+        move.l  -(%a1), 8(%a2,%d0.l*4)  | store dpp->samples_A [d0]
+        subq.l  #1, %d1                 | loop on count
+        jbne    .L323
+        jbra    finish_up
+
+.L271:  addq.l  #4, %a1                 | bump pointer and jump back into loop
+        bra     .L275
+
+.L272:  addq.l  #4, %a1                 | bump pointer and jump back into loop
+        bra     .L274
+
+
+|------------------------------------------------------------------------------
+| Loop to handle term = -1 condition
+|
+| a0 =                          d0 = decorrelation sample
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| a6 =                          d6 = 1024 << 17
+| a7 =                          d7 = -1024 << 17
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_minus_1:
+        move.l  -4(%a1), %d0            | d0 = bptr [-1]
+        beq     .L402
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_A)
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L405
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L404                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        cmp.l   %d7, %d3                | check for negative clip limit
+        bge     .L405
+        move.l  %d7, %d3
+        bra     .L405
+
+.L404:  add.l   %a3, %d3                | add delta to weight
+        cmp.l   %d6, %d3                | check for positive clip limit
+        ble     .L405
+        move.l  %d6, %d3
+
+.L405:  move.l  %acc0, %d0              | d2 = rounded product
+        add.l   %d1, %d0                | add applied weight to bptr [0], store
+        move.l  %d0, (%a1)+
+        beq     .L401
+
+.L410:  move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_B)
+        mac.l   %d0, %d4, %acc0
+        move.l  (%a1), %d1
+        beq     .L403
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L407                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        cmp.l   %d7, %d4                | check for negative clip limit
+        bge     .L403
+        move.l  %d7, %d4
+        bra     .L403
+
+.L407:  add.l   %a3, %d4                | add delta to weight
+        cmp.l   %d6, %d4                | check for positive clip limit
+        ble     .L403
+        move.l  %d6, %d4
+
+.L403:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [1], store
+        move.l  %d2, (%a1)+
+
+.L411:  cmp.l   %a1, %d5                | loop back if bptr < eptr
+        jbhi    term_minus_1
+        move.l  -4(%a1), 8(%a2)         | dpp->samples_A [0] = bptr [-1]
+        jbra    finish_up
+
+.L402:  move.l  (%a1)+, %d0
+        bne     .L410
+
+.L401:  addq.l  #4, %a1
+        bra     .L411
+
+
+|------------------------------------------------------------------------------
+| Loop to handle term = -2 condition
+|
+| a0 =                          d0 = decorrelation sample
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| a6 =                          d6 = 1024 << 17
+| a7 =                          d7 = -1024 << 17
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_minus_2:
+        move.l  -8(%a1), %d0            | d0 = bptr [-2]
+        beq     .L511
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_B)
+        mac.l   %d0, %d4, %acc0
+        move.l  4(%a1), %d1
+        beq     .L505
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L504                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        cmp.l   %d7, %d4                | ckeck for negative clip limit
+        bge     .L505
+        move.l  %d7, %d4
+        bra     .L505
+
+.L504:  add.l   %a3, %d4                | add delta to weight
+        cmp.l   %d6, %d4                | check for positive clip limit
+        ble     .L505
+        move.l  %d6, %d4
+
+.L505:  move.l  %acc0, %d0              | d2 = rounded product
+        add.l   %d1, %d0                | add applied weight to bptr [0], store
+        move.l  %d0, 4(%a1)
+        beq     .L512
+
+.L510:  move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_A)
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L503
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L507                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        cmp.l   %d7, %d3                | check for negative clip limit
+        bge     .L503
+        move.l  %d7, %d3
+        bra     .L503
+
+.L507:  add.l   %a3, %d3                | add delta to weight
+        cmp.l   %d6, %d3                | check for negative clip limit
+        ble     .L503
+        move.l  %d6, %d3
+
+.L503:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [1], store
+        move.l  %d2, (%a1)
+
+.L512:  addq.l  #8, %a1
+        cmp.l   %a1, %d5                | loop if bptr < eptr
+        jbhi    term_minus_2
+        move.l  -8(%a1), 40(%a2)        | dpp->samples_B [0] = bptr [-4]
+        jbra    finish_up
+
+.L511:  move.l  4(%a1), %d0
+        beq     .L512
+        bra     .L510
+
+
+|------------------------------------------------------------------------------
+| Loop to handle term = -3 condition
+|
+| a0 =                          d0 = decorrelation sample
+| a1 = bptr                     d1 = initial bptr [0]
+| a2 = dpp->                    d2 = updated bptr [0]
+| a3 = dpp->delta << 17         d3 = dpp->weight_A << 17
+| a4 =                          d4 = dpp->weight_B << 17
+| a5 =                          d5 = eptr
+| a6 =                          d6 = 1024 << 17
+| a7 =                          d7 = -1024 << 17
+| macsr = 0x20                  acc1 = 0x00 0000 80
+|------------------------------------------------------------------------------
+
+term_minus_3:
+        move.l  -4(%a1), %d0            | d0 = bptr [-1]
+        beq     .L301
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_A)
+        mac.l   %d0, %d3, %acc0
+        move.l  (%a1), %d1
+        beq     .L320
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L319                   | if same, add delta to weight
+        sub.l   %a3, %d3                | else subtract delta from weight
+        cmp.l   %d7, %d3                | check for negative clip limit
+        bge     .L320
+        move.l  %d7, %d3
+        bra     .L320
+
+.L319:  add.l   %a3, %d3                | add delta to weight
+        cmp.l   %d6, %d3                | check for positive clip limit
+        ble     .L320
+        move.l  %d6, %d3
+
+.L320:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [0], store
+        move.l  %d2, (%a1)+
+
+.L330:  move.l  -12(%a1), %d0           | d0 = bptr [-2]
+        beq     .L302
+        move.l  %acc1, %acc0
+        asl.l   #4, %d0                 | acc0 = acc1 + ((d0 << 4) * weight_B)
+        mac.l   %d0, %d4, %acc0
+        move.l  (%a1), %d1
+        beq     .L318
+        eor.l   %d1, %d0                | else compare signs
+        bge     .L322                   | if same, add delta to weight
+        sub.l   %a3, %d4                | else subtract delta from weight
+        cmp.l   %d7, %d4                | check for negative clip limit
+        bge     .L318
+        move.l  %d7, %d4
+        bra     .L318
+
+.L322:  add.l   %a3, %d4                | add delta to weight
+        cmp.l   %d6, %d4                | check for positive clip limit
+        ble     .L318
+        move.l  %d6, %d4
+
+.L318:  move.l  %acc0, %d2              | d2 = rounded product
+        add.l   %d1, %d2                | add applied weight to bptr [1], store
+        move.l  %d2, (%a1)+
+
+.L331:  cmp.l   %a1, %d5                | bptr, eptr
+        jbhi    term_minus_3
+        move.l  -4(%a1), 8(%a2)         | dpp->samples_A [0] = bptr [-1]
+        move.l  -8(%a1), 40(%a2)        | dpp->samples_B [0] = bptr [-2]
+        jbra    finish_up
+
+.L301:  addq.l  #4, %a1
+        bra     .L330
+
+.L302:  addq.l  #4, %a1
+        bra     .L331
+
+| finish and return
+
+finish_up:
+        moveq.l #17, %d0
+        asr.l   %d0, %d3
+        asr.l   %d0, %d4
+        move.w  %d3, 4(%a2)     | weight_A, dpp->weight_A
+        move.w  %d4, 6(%a2)     | weight_B, dpp->weight_B
+
+        clr.l   %d0             | clear up EMAC
+        move.l  %d0, %acc0
+        move.l  %d0, %acc1
+
+return_only:
+        movem.l (%sp), %d2-%d7/%a2-%a6
+        lea     (44,%sp), %sp
+        rts
diff --git a/src_bkp/engine/external/wavpack/float.c b/src_bkp/engine/external/wavpack/float.c
new file mode 100644
index 0000000000..09f0e4c36c
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/float.c
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// float.c
+
+#include "wavpack.h"
+
+int read_float_info (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    int bytecnt = wpmd->byte_length;
+    char *byteptr = wpmd->data;
+
+    if (bytecnt != 4)
+        return FALSE;
+
+    wps->float_flags = *byteptr++;
+    wps->float_shift = *byteptr++;
+    wps->float_max_exp = *byteptr++;
+    wps->float_norm_exp = *byteptr;
+    return TRUE;
+}
+
+void float_values (WavpackStream *wps, int32_t *values, int32_t num_values)
+{
+    int shift = wps->float_max_exp - wps->float_norm_exp + wps->float_shift;
+
+    if (shift > 32)
+        shift = 32;
+    else if (shift < -32)
+        shift = -32;
+
+    while (num_values--) {
+        if (shift > 0)
+            *values <<= shift;
+        else if (shift < 0)
+            *values >>= -shift;
+
+        if (*values > 8388607L)
+            *values = 8388607L;
+        else if (*values < -8388608L)
+            *values = -8388608L;
+
+        values++;
+    }
+}
diff --git a/src_bkp/engine/external/wavpack/license.txt b/src_bkp/engine/external/wavpack/license.txt
new file mode 100644
index 0000000000..d2ee90fc74
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/license.txt
@@ -0,0 +1,25 @@
+               Copyright (c) 1998 - 2006 Conifer Software
+                          All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Conifer Software nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src_bkp/engine/external/wavpack/metadata.c b/src_bkp/engine/external/wavpack/metadata.c
new file mode 100644
index 0000000000..6a19ac9bb3
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/metadata.c
@@ -0,0 +1,105 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// metadata.c
+
+// This module handles the metadata structure introduced in WavPack 4.0
+
+#include "wavpack.h"
+
+int read_metadata_buff (WavpackContext *wpc, WavpackMetadata *wpmd)
+{
+    uchar tchar;
+
+    if (!wpc->infile (&wpmd->id, 1) || !wpc->infile (&tchar, 1))
+        return FALSE;
+
+    wpmd->byte_length = tchar << 1;
+
+    if (wpmd->id & ID_LARGE) {
+        wpmd->id &= ~ID_LARGE;
+
+        if (!wpc->infile (&tchar, 1))
+            return FALSE;
+
+        wpmd->byte_length += (int32_t) tchar << 9; 
+
+        if (!wpc->infile (&tchar, 1))
+            return FALSE;
+
+        wpmd->byte_length += (int32_t) tchar << 17;
+    }
+
+    if (wpmd->id & ID_ODD_SIZE) {
+        wpmd->id &= ~ID_ODD_SIZE;
+        wpmd->byte_length--;
+    }
+
+    if (wpmd->byte_length && wpmd->byte_length <= sizeof (wpc->read_buffer)) {
+        uint32_t bytes_to_read = wpmd->byte_length + (wpmd->byte_length & 1);
+
+        if (wpc->infile (wpc->read_buffer, bytes_to_read) != (int32_t) bytes_to_read) {
+            wpmd->data = NULL;
+            return FALSE;
+        }
+
+        wpmd->data = wpc->read_buffer;
+    }
+    else
+        wpmd->data = NULL;
+
+    return TRUE;
+}
+
+int process_metadata (WavpackContext *wpc, WavpackMetadata *wpmd)
+{
+    WavpackStream *wps = &wpc->stream;
+
+    switch (wpmd->id) {
+        case ID_DUMMY:
+            return TRUE;
+
+        case ID_DECORR_TERMS:
+            return read_decorr_terms (wps, wpmd);
+
+        case ID_DECORR_WEIGHTS:
+            return read_decorr_weights (wps, wpmd);
+
+        case ID_DECORR_SAMPLES:
+            return read_decorr_samples (wps, wpmd);
+
+        case ID_ENTROPY_VARS:
+            return read_entropy_vars (wps, wpmd);
+
+        case ID_HYBRID_PROFILE:
+            return read_hybrid_profile (wps, wpmd);
+
+        case ID_FLOAT_INFO:
+            return read_float_info (wps, wpmd);
+
+        case ID_INT32_INFO:
+            return read_int32_info (wps, wpmd);
+
+        case ID_CHANNEL_INFO:
+            return read_channel_info (wpc, wpmd);
+
+        case ID_CONFIG_BLOCK:
+            return read_config_info (wpc, wpmd);
+
+        case ID_WV_BITSTREAM:
+            return init_wv_bitstream (wpc, wpmd);
+
+        case ID_SHAPING_WEIGHTS:
+        case ID_WVC_BITSTREAM:
+        case ID_WVX_BITSTREAM:
+            return TRUE;
+
+        default:
+            return (wpmd->id & ID_OPTIONAL_DATA) ? TRUE : FALSE;
+    }
+}
diff --git a/src_bkp/engine/external/wavpack/readme.txt b/src_bkp/engine/external/wavpack/readme.txt
new file mode 100644
index 0000000000..07b7a261dd
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/readme.txt
@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+This package contains a tiny version of the WavPack 4.40 decoder that might
+be used in a "resource limited" CPU environment or form the basis for a
+hardware decoding implementation. It is packaged with a demo command-line
+program that accepts a WavPack audio file on stdin and outputs a RIFF wav
+file to stdout. The program is standard C, and a win32 executable is
+included which was compiled under MS Visual C++ 6.0 using this command:
+
+cl /O1 /DWIN32 wvfilter.c wputils.c unpack.c float.c metadata.c words.c bits.c
+
+WavPack data is read with a stream reading callback. No direct seeking is
+provided for, but it is possible to start decoding anywhere in a WavPack
+stream. In this case, WavPack will be able to provide the sample-accurate
+position when it synchs with the data and begins decoding. The WIN32 macro
+is used for Windows to force the stdin and stdout streams to be binary mode.
+
+Compared to the previous version, this library has been optimized somewhat
+for improved performance in exchange for slightly larger code size. The
+library also now includes hand-optimized assembly language versions of the
+decorrelation functions for both the ColdFire (w/EMAC) and ARM processors.
+
+For demonstration purposes this uses a single static copy of the
+WavpackContext structure, so obviously it cannot be used for more than one
+file at a time. Also, this decoder will not handle "correction" files, plays
+only the first two channels of multi-channel files, and is limited in
+resolution in some large integer or floating point files (but always
+provides at least 24 bits of resolution). It also will not accept WavPack
+files from before version 4.0.
+
+The previous version of this library would handle float files by returning
+32-bit floating-point data (even though no floating point math was used).
+Because this library would normally be used for simply playing WavPack
+files where lossless performance (beyond 24-bits) is not relevant, I have
+changed this behavior. Now, these files will generate clipped 24-bit data.
+The MODE_FLOAT flag will still be returned by WavpackGetMode(), but the
+BitsPerSample and BytesPerSample queries will be 24 and 3, respectfully.
+What this means is that an application that can handle 24-bit data will
+now be able to handle floating point data (assuming that the MODE_FLOAT
+flag is ignored).
+
+To make this code viable on the greatest number of hardware platforms, the
+following are true:
+
+   speed is about 5x realtime on an AMD K6 300 MHz
+      ("high" mode 16/44 stereo; normal mode is about twice that fast)
+
+   no floating-point math required; just 32b * 32b = 32b int multiply
+
+   large data areas are static and less than 4K total
+   executable code and tables are less than 40K
+   no malloc / free usage
+
+To maintain compatibility on various platforms, the following conventions
+are used:
+
+   a "char" must be exactly 8-bits
+   a "short" must be exactly 16-bits
+   an "int" must be at least 16-bits, but may be larger
+   the "long" type is not used to avoid problems with 64-bit compilers
+
+Questions or comments should be directed to david@wavpack.com
diff --git a/src_bkp/engine/external/wavpack/unpack.c b/src_bkp/engine/external/wavpack/unpack.c
new file mode 100644
index 0000000000..317fe2227f
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/unpack.c
@@ -0,0 +1,785 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// unpack.c
+
+// This module actually handles the decompression of the audio data, except
+// for the entropy decoding which is handled by the words.c module. For
+// maximum efficiency, the conversion is isolated to tight loops that handle
+// an entire buffer.
+
+#include "wavpack.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#define LOSSY_MUTE
+
+///////////////////////////// executable code ////////////////////////////////
+
+// This function initializes everything required to unpack a WavPack block
+// and must be called before unpack_samples() is called to obtain audio data.
+// It is assumed that the WavpackHeader has been read into the wps->wphdr
+// (in the current WavpackStream). This is where all the metadata blocks are
+// scanned up to the one containing the audio bitstream.
+
+int unpack_init (WavpackContext *wpc)
+{
+    WavpackStream *wps = &wpc->stream;
+    WavpackMetadata wpmd;
+
+    if (wps->wphdr.block_samples && wps->wphdr.block_index != (uint32_t) -1)
+        wps->sample_index = wps->wphdr.block_index;
+
+    wps->mute_error = FALSE;
+    wps->crc = 0xffffffff;
+    CLEAR (wps->wvbits);
+    CLEAR (wps->decorr_passes);
+    CLEAR (wps->w);
+
+    while (read_metadata_buff (wpc, &wpmd)) {
+        if (!process_metadata (wpc, &wpmd)) {
+            strcpy (wpc->error_message, "invalid metadata!");
+            return FALSE;
+        }
+
+        if (wpmd.id == ID_WV_BITSTREAM)
+            break;
+    }
+
+    if (wps->wphdr.block_samples && !bs_is_open (&wps->wvbits)) {
+        strcpy (wpc->error_message, "invalid WavPack file!");
+        return FALSE;
+    }
+
+    if (wps->wphdr.block_samples) {
+        if ((wps->wphdr.flags & INT32_DATA) && wps->int32_sent_bits)
+            wpc->lossy_blocks = TRUE;
+
+        if ((wps->wphdr.flags & FLOAT_DATA) &&
+            wps->float_flags & (FLOAT_EXCEPTIONS | FLOAT_ZEROS_SENT | FLOAT_SHIFT_SENT | FLOAT_SHIFT_SAME))
+                wpc->lossy_blocks = TRUE;
+    }
+
+    return TRUE;
+}
+
+// This function initialzes the main bitstream for audio samples, which must
+// be in the "wv" file.
+
+int init_wv_bitstream (WavpackContext *wpc, WavpackMetadata *wpmd)
+{
+    WavpackStream *wps = &wpc->stream;
+
+    if (wpmd->data)
+        bs_open_read (&wps->wvbits, wpmd->data, (unsigned char *) wpmd->data + wpmd->byte_length, NULL, 0);
+    else if (wpmd->byte_length)
+        bs_open_read (&wps->wvbits, wpc->read_buffer, wpc->read_buffer + sizeof (wpc->read_buffer),
+            wpc->infile, wpmd->byte_length + (wpmd->byte_length & 1));
+
+    return TRUE;
+}
+
+// Read decorrelation terms from specified metadata block into the
+// decorr_passes array. The terms range from -3 to 8, plus 17 & 18;
+// other values are reserved and generate errors for now. The delta
+// ranges from 0 to 7 with all values valid. Note that the terms are
+// stored in the opposite order in the decorr_passes array compared
+// to packing.
+
+int read_decorr_terms (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    int termcnt = wpmd->byte_length;
+    uchar *byteptr = wpmd->data;
+    struct decorr_pass *dpp;
+
+    if (termcnt > MAX_NTERMS)
+        return FALSE;
+
+    wps->num_terms = termcnt;
+
+    for (dpp = wps->decorr_passes + termcnt - 1; termcnt--; dpp--) {
+        dpp->term = (int)(*byteptr & 0x1f) - 5;
+        dpp->delta = (*byteptr++ >> 5) & 0x7;
+
+        if (!dpp->term || dpp->term < -3 || (dpp->term > MAX_TERM && dpp->term < 17) || dpp->term > 18)
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+// Read decorrelation weights from specified metadata block into the
+// decorr_passes array. The weights range +/-1024, but are rounded and
+// truncated to fit in signed chars for metadata storage. Weights are
+// separate for the two channels and are specified from the "last" term
+// (first during encode). Unspecified weights are set to zero.
+
+int read_decorr_weights (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    int termcnt = wpmd->byte_length, tcount;
+    signed char *byteptr = wpmd->data;
+    struct decorr_pass *dpp;
+
+    if (!(wps->wphdr.flags & MONO_DATA))
+        termcnt /= 2;
+
+    if (termcnt > wps->num_terms)
+        return FALSE;
+
+    for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
+        dpp->weight_A = dpp->weight_B = 0;
+
+    while (--dpp >= wps->decorr_passes && termcnt--) {
+        dpp->weight_A = restore_weight (*byteptr++);
+
+        if (!(wps->wphdr.flags & MONO_DATA))
+            dpp->weight_B = restore_weight (*byteptr++);
+    }
+
+    return TRUE;
+}
+
+// Read decorrelation samples from specified metadata block into the
+// decorr_passes array. The samples are signed 32-bit values, but are
+// converted to signed log2 values for storage in metadata. Values are
+// stored for both channels and are specified from the "last" term
+// (first during encode) with unspecified samples set to zero. The
+// number of samples stored varies with the actual term value, so
+// those must obviously come first in the metadata.
+
+int read_decorr_samples (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    uchar *byteptr = wpmd->data;
+    uchar *endptr = byteptr + wpmd->byte_length;
+    struct decorr_pass *dpp;
+    int tcount;
+
+    for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
+        CLEAR (dpp->samples_A);
+        CLEAR (dpp->samples_B);
+    }
+
+    if (wps->wphdr.version == 0x402 && (wps->wphdr.flags & HYBRID_FLAG)) {
+        byteptr += 2;
+
+        if (!(wps->wphdr.flags & MONO_DATA))
+            byteptr += 2;
+    }
+
+    while (dpp-- > wps->decorr_passes && byteptr < endptr)
+        if (dpp->term > MAX_TERM) {
+            dpp->samples_A [0] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+            dpp->samples_A [1] = exp2s ((short)(byteptr [2] + (byteptr [3] << 8)));
+            byteptr += 4;
+
+            if (!(wps->wphdr.flags & MONO_DATA)) {
+                dpp->samples_B [0] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+                dpp->samples_B [1] = exp2s ((short)(byteptr [2] + (byteptr [3] << 8)));
+                byteptr += 4;
+            }
+        }
+        else if (dpp->term < 0) {
+            dpp->samples_A [0] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+            dpp->samples_B [0] = exp2s ((short)(byteptr [2] + (byteptr [3] << 8)));
+            byteptr += 4;
+        }
+        else {
+            int m = 0, cnt = dpp->term;
+
+            while (cnt--) {
+                dpp->samples_A [m] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+                byteptr += 2;
+
+                if (!(wps->wphdr.flags & MONO_DATA)) {
+                    dpp->samples_B [m] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+                    byteptr += 2;
+                }
+
+                m++;
+            }
+        }
+
+    return byteptr == endptr;
+}
+
+// Read the int32 data from the specified metadata into the specified stream.
+// This data is used for integer data that has more than 24 bits of magnitude
+// or, in some cases, used to eliminate redundant bits from any audio stream.
+
+int read_int32_info (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    int bytecnt = wpmd->byte_length;
+    char *byteptr = wpmd->data;
+
+    if (bytecnt != 4)
+        return FALSE;
+
+    wps->int32_sent_bits = *byteptr++;
+    wps->int32_zeros = *byteptr++;
+    wps->int32_ones = *byteptr++;
+    wps->int32_dups = *byteptr;
+    return TRUE;
+}
+
+// Read multichannel information from metadata. The first byte is the total
+// number of channels and the following bytes represent the channel_mask
+// as described for Microsoft WAVEFORMATEX.
+
+int read_channel_info (WavpackContext *wpc, WavpackMetadata *wpmd)
+{
+    int bytecnt = wpmd->byte_length, shift = 0;
+    char *byteptr = wpmd->data;
+    uint32_t mask = 0;
+
+    if (!bytecnt || bytecnt > 5)
+        return FALSE;
+
+    wpc->config.num_channels = *byteptr++;
+
+    while (--bytecnt) {
+        mask |= (uint32_t) *byteptr++ << shift;
+        shift += 8;
+    }
+
+    wpc->config.channel_mask = mask;
+    return TRUE;
+}
+
+// Read configuration information from metadata.
+
+int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd)
+{
+    int bytecnt = wpmd->byte_length;
+    uchar *byteptr = wpmd->data;
+
+    if (bytecnt >= 3) {
+        wpc->config.flags &= 0xff;
+        wpc->config.flags |= (int32_t) *byteptr++ << 8;
+        wpc->config.flags |= (int32_t) *byteptr++ << 16;
+        wpc->config.flags |= (int32_t) *byteptr << 24;
+    }
+
+    return TRUE;
+}
+
+// This monster actually unpacks the WavPack bitstream(s) into the specified
+// buffer as 32-bit integers or floats (depending on orignal data). Lossy
+// samples will be clipped to their original limits (i.e. 8-bit samples are
+// clipped to -128/+127) but are still returned in int32_ts. It is up to the
+// caller to potentially reformat this for the final output including any
+// multichannel distribution, block alignment or endian compensation. The
+// function unpack_init() must have been called and the entire WavPack block
+// must still be visible (although wps->blockbuff will not be accessed again).
+// For maximum clarity, the function is broken up into segments that handle
+// various modes. This makes for a few extra infrequent flag checks, but
+// makes the code easier to follow because the nesting does not become so
+// deep. For maximum efficiency, the conversion is isolated to tight loops
+// that handle an entire buffer. The function returns the total number of
+// samples unpacked, which can be less than the number requested if an error
+// occurs or the end of the block is reached.
+
+#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+#elif defined(CPU_ARM) && !defined(SIMULATOR)
+extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+#else
+static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+#endif
+
+static void decorr_mono_pass (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+static void decorr_stereo_pass (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
+static void fixup_samples (WavpackStream *wps, int32_t *buffer, uint32_t sample_count);
+
+int32_t unpack_samples (WavpackContext *wpc, int32_t *buffer, uint32_t sample_count)
+{
+    WavpackStream *wps = &wpc->stream;
+    uint32_t flags = wps->wphdr.flags, crc = wps->crc, i;
+    int32_t mute_limit = (1L << ((flags & MAG_MASK) >> MAG_LSB)) + 2;
+    struct decorr_pass *dpp;
+    int32_t *bptr, *eptr;
+    int tcount;
+
+    if (wps->sample_index + sample_count > wps->wphdr.block_index + wps->wphdr.block_samples)
+        sample_count = wps->wphdr.block_index + wps->wphdr.block_samples - wps->sample_index;
+
+    if (wps->mute_error) {
+        memset (buffer, 0, sample_count * (flags & MONO_FLAG ? 4 : 8));
+        wps->sample_index += sample_count;
+        return sample_count;
+    }
+
+    if (flags & HYBRID_FLAG)
+        mute_limit *= 2;
+
+    ///////////////////// handle version 4 mono data /////////////////////////
+
+    if (flags & MONO_DATA) {
+        eptr = buffer + sample_count;
+        i = get_words (buffer, sample_count, flags, &wps->w, &wps->wvbits);
+
+        for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
+            decorr_mono_pass (dpp, buffer, sample_count);
+
+        for (bptr = buffer; bptr < eptr; ++bptr) {
+            if (labs (bptr [0]) > mute_limit) {
+                i = bptr - buffer;
+                break;
+            }
+
+            crc = crc * 3 + bptr [0];
+        }
+    }
+
+    //////////////////// handle version 4 stereo data ////////////////////////
+
+    else {
+        eptr = buffer + (sample_count * 2);
+        i = get_words (buffer, sample_count, flags, &wps->w, &wps->wvbits);
+
+        if (sample_count < 16)
+            for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
+                decorr_stereo_pass (dpp, buffer, sample_count);
+        else
+            for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
+                decorr_stereo_pass (dpp, buffer, 8);
+#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+                decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8);
+#elif defined(CPU_ARM) && !defined(SIMULATOR)
+                if (((flags & MAG_MASK) >> MAG_LSB) > 15)
+                    decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8);
+                else
+                    decorr_stereo_pass_cont_arm (dpp, buffer + 16, sample_count - 8);
+#else
+                decorr_stereo_pass_cont (dpp, buffer + 16, sample_count - 8);
+#endif
+            }
+
+        if (flags & JOINT_STEREO)
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                bptr [0] += (bptr [1] -= (bptr [0] >> 1));
+
+                if (labs (bptr [0]) > mute_limit || labs (bptr [1]) > mute_limit) {
+                    i = (bptr - buffer) / 2;
+                    break;
+                }
+
+                crc = (crc * 3 + bptr [0]) * 3 + bptr [1];
+            }
+        else
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                if (labs (bptr [0]) > mute_limit || labs (bptr [1]) > mute_limit) {
+                    i = (bptr - buffer) / 2;
+                    break;
+                }
+
+                crc = (crc * 3 + bptr [0]) * 3 + bptr [1];
+            }
+    }
+
+    if (i != sample_count) {
+        memset (buffer, 0, sample_count * (flags & MONO_FLAG ? 4 : 8));
+        wps->mute_error = TRUE;
+        i = sample_count;
+    }
+
+    fixup_samples (wps, buffer, i);
+
+    if (flags & FALSE_STEREO) {
+        int32_t *dptr = buffer + i * 2;
+        int32_t *sptr = buffer + i;
+        int32_t c = i;
+
+        while (c--) {
+            *--dptr = *--sptr;
+            *--dptr = *sptr;
+        }
+    }
+
+    wps->sample_index += i;
+    wps->crc = crc;
+
+    return i;
+}
+
+static void decorr_stereo_pass (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count)
+{
+    int32_t delta = dpp->delta, weight_A = dpp->weight_A, weight_B = dpp->weight_B;
+    int32_t *bptr, *eptr = buffer + (sample_count * 2), sam_A, sam_B;
+    int m, k;
+
+    switch (dpp->term) {
+
+        case 17:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = 2 * dpp->samples_A [0] - dpp->samples_A [1];
+                dpp->samples_A [1] = dpp->samples_A [0];
+                dpp->samples_A [0] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [0];
+
+                sam_A = 2 * dpp->samples_B [0] - dpp->samples_B [1];
+                dpp->samples_B [1] = dpp->samples_B [0];
+                dpp->samples_B [0] = apply_weight (weight_B, sam_A) + bptr [1];
+                update_weight (weight_B, delta, sam_A, bptr [1]);
+                bptr [1] = dpp->samples_B [0];
+            }
+
+            break;
+
+        case 18:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = (3 * dpp->samples_A [0] - dpp->samples_A [1]) >> 1;
+                dpp->samples_A [1] = dpp->samples_A [0];
+                dpp->samples_A [0] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [0];
+
+                sam_A = (3 * dpp->samples_B [0] - dpp->samples_B [1]) >> 1;
+                dpp->samples_B [1] = dpp->samples_B [0];
+                dpp->samples_B [0] = apply_weight (weight_B, sam_A) + bptr [1];
+                update_weight (weight_B, delta, sam_A, bptr [1]);
+                bptr [1] = dpp->samples_B [0];
+            }
+
+            break;
+
+        default:
+            for (m = 0, k = dpp->term & (MAX_TERM - 1), bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = dpp->samples_A [m];
+                dpp->samples_A [k] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [k];
+
+                sam_A = dpp->samples_B [m];
+                dpp->samples_B [k] = apply_weight (weight_B, sam_A) + bptr [1];
+                update_weight (weight_B, delta, sam_A, bptr [1]);
+                bptr [1] = dpp->samples_B [k];
+
+                m = (m + 1) & (MAX_TERM - 1);
+                k = (k + 1) & (MAX_TERM - 1);
+            }
+
+            if (m) {
+                int32_t temp_samples [MAX_TERM];
+
+                memcpy (temp_samples, dpp->samples_A, sizeof (dpp->samples_A));
+
+                for (k = 0; k < MAX_TERM; k++, m++)
+                    dpp->samples_A [k] = temp_samples [m & (MAX_TERM - 1)];
+
+                memcpy (temp_samples, dpp->samples_B, sizeof (dpp->samples_B));
+
+                for (k = 0; k < MAX_TERM; k++, m++)
+                    dpp->samples_B [k] = temp_samples [m & (MAX_TERM - 1)];
+            }
+
+            break;
+
+        case -1:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = bptr [0] + apply_weight (weight_A, dpp->samples_A [0]);
+                update_weight_clip (weight_A, delta, dpp->samples_A [0], bptr [0]);
+                bptr [0] = sam_A;
+                dpp->samples_A [0] = bptr [1] + apply_weight (weight_B, sam_A);
+                update_weight_clip (weight_B, delta, sam_A, bptr [1]);
+                bptr [1] = dpp->samples_A [0];
+            }
+
+            break;
+
+        case -2:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_B = bptr [1] + apply_weight (weight_B, dpp->samples_B [0]);
+                update_weight_clip (weight_B, delta, dpp->samples_B [0], bptr [1]);
+                bptr [1] = sam_B;
+                dpp->samples_B [0] = bptr [0] + apply_weight (weight_A, sam_B);
+                update_weight_clip (weight_A, delta, sam_B, bptr [0]);
+                bptr [0] = dpp->samples_B [0];
+            }
+
+            break;
+
+        case -3:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = bptr [0] + apply_weight (weight_A, dpp->samples_A [0]);
+                update_weight_clip (weight_A, delta, dpp->samples_A [0], bptr [0]);
+                sam_B = bptr [1] + apply_weight (weight_B, dpp->samples_B [0]);
+                update_weight_clip (weight_B, delta, dpp->samples_B [0], bptr [1]);
+                bptr [0] = dpp->samples_B [0] = sam_A;
+                bptr [1] = dpp->samples_A [0] = sam_B;
+            }
+
+            break;
+    }
+
+    dpp->weight_A = weight_A;
+    dpp->weight_B = weight_B;
+}
+
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(SIMULATOR)
+
+static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count)
+{
+    int32_t delta = dpp->delta, weight_A = dpp->weight_A, weight_B = dpp->weight_B;
+    int32_t *bptr, *tptr, *eptr = buffer + (sample_count * 2), sam_A, sam_B;
+    int k, i;
+
+    switch (dpp->term) {
+
+        case 17:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = 2 * bptr [-2] - bptr [-4];
+                bptr [0] = apply_weight (weight_A, sam_A) + (sam_B = bptr [0]);
+                update_weight (weight_A, delta, sam_A, sam_B);
+
+                sam_A = 2 * bptr [-1] - bptr [-3];
+                bptr [1] = apply_weight (weight_B, sam_A) + (sam_B = bptr [1]);
+                update_weight (weight_B, delta, sam_A, sam_B);
+            }
+
+            dpp->samples_B [0] = bptr [-1];
+            dpp->samples_A [0] = bptr [-2];
+            dpp->samples_B [1] = bptr [-3];
+            dpp->samples_A [1] = bptr [-4];
+            break;
+
+        case 18:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                sam_A = (3 * bptr [-2] - bptr [-4]) >> 1;
+                bptr [0] = apply_weight (weight_A, sam_A) + (sam_B = bptr [0]);
+                update_weight (weight_A, delta, sam_A, sam_B);
+
+                sam_A = (3 * bptr [-1] - bptr [-3]) >> 1;
+                bptr [1] = apply_weight (weight_B, sam_A) + (sam_B = bptr [1]);
+                update_weight (weight_B, delta, sam_A, sam_B);
+            }
+
+            dpp->samples_B [0] = bptr [-1];
+            dpp->samples_A [0] = bptr [-2];
+            dpp->samples_B [1] = bptr [-3];
+            dpp->samples_A [1] = bptr [-4];
+            break;
+
+        default:
+            for (bptr = buffer, tptr = buffer - (dpp->term * 2); bptr < eptr; bptr += 2, tptr += 2) {
+                bptr [0] = apply_weight (weight_A, tptr [0]) + (sam_A = bptr [0]);
+                update_weight (weight_A, delta, tptr [0], sam_A);
+
+                bptr [1] = apply_weight (weight_B, tptr [1]) + (sam_A = bptr [1]);
+                update_weight (weight_B, delta, tptr [1], sam_A);
+            }
+
+            for (k = dpp->term - 1, i = 8; i--; k--) {
+                dpp->samples_B [k & (MAX_TERM - 1)] = *--bptr;
+                dpp->samples_A [k & (MAX_TERM - 1)] = *--bptr;
+            }
+
+            break;
+
+        case -1:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                bptr [0] = apply_weight (weight_A, bptr [-1]) + (sam_A = bptr [0]);
+                update_weight_clip (weight_A, delta, bptr [-1], sam_A);
+                bptr [1] = apply_weight (weight_B, bptr [0]) + (sam_A = bptr [1]);
+                update_weight_clip (weight_B, delta, bptr [0], sam_A);
+            }
+
+            dpp->samples_A [0] = bptr [-1];
+            break;
+
+        case -2:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                bptr [1] = apply_weight (weight_B, bptr [-2]) + (sam_A = bptr [1]);
+                update_weight_clip (weight_B, delta, bptr [-2], sam_A);
+                bptr [0] = apply_weight (weight_A, bptr [1]) + (sam_A = bptr [0]);
+                update_weight_clip (weight_A, delta, bptr [1], sam_A);
+            }
+
+            dpp->samples_B [0] = bptr [-2];
+            break;
+
+        case -3:
+            for (bptr = buffer; bptr < eptr; bptr += 2) {
+                bptr [0] = apply_weight (weight_A, bptr [-1]) + (sam_A = bptr [0]);
+                update_weight_clip (weight_A, delta, bptr [-1], sam_A);
+                bptr [1] = apply_weight (weight_B, bptr [-2]) + (sam_A = bptr [1]);
+                update_weight_clip (weight_B, delta, bptr [-2], sam_A);
+            }
+
+            dpp->samples_A [0] = bptr [-1];
+            dpp->samples_B [0] = bptr [-2];
+            break;
+    }
+
+    dpp->weight_A = weight_A;
+    dpp->weight_B = weight_B;
+}
+
+#endif
+
+static void decorr_mono_pass (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count)
+{
+    int32_t delta = dpp->delta, weight_A = dpp->weight_A;
+    int32_t *bptr, *eptr = buffer + sample_count, sam_A;
+    int m, k;
+
+    switch (dpp->term) {
+
+        case 17:
+            for (bptr = buffer; bptr < eptr; bptr++) {
+                sam_A = 2 * dpp->samples_A [0] - dpp->samples_A [1];
+                dpp->samples_A [1] = dpp->samples_A [0];
+                dpp->samples_A [0] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [0];
+            }
+
+            break;
+
+        case 18:
+            for (bptr = buffer; bptr < eptr; bptr++) {
+                sam_A = (3 * dpp->samples_A [0] - dpp->samples_A [1]) >> 1;
+                dpp->samples_A [1] = dpp->samples_A [0];
+                dpp->samples_A [0] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [0];
+            }
+
+            break;
+
+        default:
+            for (m = 0, k = dpp->term & (MAX_TERM - 1), bptr = buffer; bptr < eptr; bptr++) {
+                sam_A = dpp->samples_A [m];
+                dpp->samples_A [k] = apply_weight (weight_A, sam_A) + bptr [0];
+                update_weight (weight_A, delta, sam_A, bptr [0]);
+                bptr [0] = dpp->samples_A [k];
+                m = (m + 1) & (MAX_TERM - 1);
+                k = (k + 1) & (MAX_TERM - 1);
+            }
+
+            if (m) {
+                int32_t temp_samples [MAX_TERM];
+
+                memcpy (temp_samples, dpp->samples_A, sizeof (dpp->samples_A));
+
+                for (k = 0; k < MAX_TERM; k++, m++)
+                    dpp->samples_A [k] = temp_samples [m & (MAX_TERM - 1)];
+            }
+
+            break;
+    }
+
+    dpp->weight_A = weight_A;
+}
+
+
+// This is a helper function for unpack_samples() that applies several final
+// operations. First, if the data is 32-bit float data, then that conversion
+// is done in the float.c module (whether lossy or lossless) and we return.
+// Otherwise, if the extended integer data applies, then that operation is
+// executed first. If the unpacked data is lossy (and not corrected) then
+// it is clipped and shifted in a single operation. Otherwise, if it's
+// lossless then the last step is to apply the final shift (if any).
+
+static void fixup_samples (WavpackStream *wps, int32_t *buffer, uint32_t sample_count)
+{
+    uint32_t flags = wps->wphdr.flags;
+    int shift = (flags & SHIFT_MASK) >> SHIFT_LSB;
+
+    if (flags & FLOAT_DATA) {
+        float_values (wps, buffer, (flags & MONO_FLAG) ? sample_count : sample_count * 2);
+        return;
+    }
+
+    if (flags & INT32_DATA) {
+        uint32_t count = (flags & MONO_FLAG) ? sample_count : sample_count * 2;
+        int sent_bits = wps->int32_sent_bits, zeros = wps->int32_zeros;
+        int ones = wps->int32_ones, dups = wps->int32_dups;
+        int32_t *dptr = buffer;
+
+        if (!(flags & HYBRID_FLAG) && !sent_bits && (zeros + ones + dups))
+            while (count--) {
+                if (zeros)
+                    *dptr <<= zeros;
+                else if (ones)
+                    *dptr = ((*dptr + 1) << ones) - 1;
+                else if (dups)
+                    *dptr = ((*dptr + (*dptr & 1)) << dups) - (*dptr & 1);
+
+                dptr++;
+            }
+        else
+            shift += zeros + sent_bits + ones + dups;
+    }
+
+    if (flags & HYBRID_FLAG) {
+        int32_t min_value, max_value, min_shifted, max_shifted;
+
+        switch (flags & BYTES_STORED) {
+            case 0:
+                min_shifted = (min_value = -128 >> shift) << shift;
+                max_shifted = (max_value = 127 >> shift) << shift;
+                break;
+
+            case 1:
+                min_shifted = (min_value = -32768 >> shift) << shift;
+                max_shifted = (max_value = 32767 >> shift) << shift;
+                break;
+
+            case 2:
+                min_shifted = (min_value = -8388608 >> shift) << shift;
+                max_shifted = (max_value = 8388607 >> shift) << shift;
+                break;
+
+            case 3:
+            default:
+                min_shifted = (min_value = (int32_t) 0x80000000 >> shift) << shift;
+                max_shifted = (max_value = (int32_t) 0x7FFFFFFF >> shift) << shift;
+                break;
+        }
+
+        if (!(flags & MONO_FLAG))
+            sample_count *= 2;
+
+        while (sample_count--) {
+            if (*buffer < min_value)
+                *buffer++ = min_shifted;
+            else if (*buffer > max_value)
+                *buffer++ = max_shifted;
+            else
+                *buffer++ <<= shift;
+        }
+    }
+    else if (shift) {
+        if (!(flags & MONO_FLAG))
+            sample_count *= 2;
+
+        while (sample_count--)
+            *buffer++ <<= shift;
+    }
+}
+
+// This function checks the crc value(s) for an unpacked block, returning the
+// number of actual crc errors detected for the block. The block must be
+// completely unpacked before this test is valid. For losslessly unpacked
+// blocks of float or extended integer data the extended crc is also checked.
+// Note that WavPack's crc is not a CCITT approved polynomial algorithm, but
+// is a much simpler method that is virtually as robust for real world data.
+
+int check_crc_error (WavpackContext *wpc)
+{
+    WavpackStream *wps = &wpc->stream;
+    int result = 0;
+
+    if (wps->crc != wps->wphdr.crc)
+        ++result;
+
+    return result;
+}
diff --git a/src_bkp/engine/external/wavpack/wavpack.h b/src_bkp/engine/external/wavpack/wavpack.h
new file mode 100644
index 0000000000..2e22fc51ea
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/wavpack.h
@@ -0,0 +1,384 @@
+/*////////////////////////////////////////////////////////////////////////// */
+/*                           **** WAVPACK ****                            // */
+/*                  Hybrid Lossless Wavefile Compressor                   // */
+/*              Copyright (c) 1998 - 2004 Conifer Software.               // */
+/*                          All Rights Reserved.                          // */
+/*      Distributed under the BSD Software License (see license.txt)      // */
+/*////////////////////////////////////////////////////////////////////////// */
+
+/* wavpack.h */
+
+#include <sys/types.h>
+
+/* This header file contains all the definitions required by WavPack. */
+
+#ifdef __BORLANDC__
+typedef unsigned long uint32_t;
+typedef long int32_t;
+#elif defined(_WIN32) && !defined(__MINGW32__)
+#include <stdlib.h>
+typedef unsigned __int64 uint64_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef __int32 int32_t;
+#else
+#include <inttypes.h>
+#endif
+
+typedef unsigned char   uchar;
+
+#if !defined(__GNUC__) || defined(WIN32)
+typedef unsigned short  ushort;
+typedef unsigned int    uint;
+#endif
+
+#include <stdio.h>
+
+#define FALSE 0
+#define TRUE 1
+
+/*//////////////////////////// WavPack Header ///////////////////////////////// */
+
+/* Note that this is the ONLY structure that is written to (or read from) */
+/* WavPack 4.0 files, and is the preamble to every block in both the .wv */
+/* and .wvc files. */
+
+typedef struct {
+    char ckID [4];
+    uint32_t ckSize;
+    short version;
+    uchar track_no, index_no;
+    uint32_t total_samples, block_index, block_samples, flags, crc;
+} WavpackHeader;
+
+#define WavpackHeaderFormat "4LS2LLLLL"
+
+/* or-values for "flags" */
+
+#define BYTES_STORED    3       /* 1-4 bytes/sample */
+#define MONO_FLAG       4       /* not stereo */
+#define HYBRID_FLAG     8       /* hybrid mode */
+#define JOINT_STEREO    0x10    /* joint stereo */
+#define CROSS_DECORR    0x20    /* no-delay cross decorrelation */
+#define HYBRID_SHAPE    0x40    /* noise shape (hybrid mode only) */
+#define FLOAT_DATA      0x80    /* ieee 32-bit floating point data */
+
+#define INT32_DATA      0x100   /* special extended int handling */
+#define HYBRID_BITRATE  0x200   /* bitrate noise (hybrid mode only) */
+#define HYBRID_BALANCE  0x400   /* balance noise (hybrid stereo mode only) */
+
+#define INITIAL_BLOCK   0x800   /* initial block of multichannel segment */
+#define FINAL_BLOCK     0x1000  /* final block of multichannel segment */
+
+#define SHIFT_LSB       13
+#define SHIFT_MASK      (0x1fL << SHIFT_LSB)
+
+#define MAG_LSB         18
+#define MAG_MASK        (0x1fL << MAG_LSB)
+
+#define SRATE_LSB       23
+#define SRATE_MASK      (0xfL << SRATE_LSB)
+
+#define FALSE_STEREO    0x40000000      /* block is stereo, but data is mono */
+
+#define IGNORED_FLAGS   0x18000000      /* reserved, but ignore if encountered */
+#define NEW_SHAPING     0x20000000      /* use IIR filter for negative shaping */
+#define UNKNOWN_FLAGS   0x80000000      /* also reserved, but refuse decode if */
+                                        /*  encountered */
+
+#define MONO_DATA (MONO_FLAG | FALSE_STEREO)
+
+#define MIN_STREAM_VERS     0x402       /* lowest stream version we'll decode */
+#define MAX_STREAM_VERS     0x410       /* highest stream version we'll decode */
+
+/*////////////////////////// WavPack Metadata ///////////////////////////////// */
+
+/* This is an internal representation of metadata. */
+
+typedef struct {
+    int32_t byte_length;
+    void *data;
+    uchar id;
+} WavpackMetadata;
+
+#define ID_OPTIONAL_DATA        0x20
+#define ID_ODD_SIZE             0x40
+#define ID_LARGE                0x80
+
+#define ID_DUMMY                0x0
+#define ID_ENCODER_INFO         0x1
+#define ID_DECORR_TERMS         0x2
+#define ID_DECORR_WEIGHTS       0x3
+#define ID_DECORR_SAMPLES       0x4
+#define ID_ENTROPY_VARS         0x5
+#define ID_HYBRID_PROFILE       0x6
+#define ID_SHAPING_WEIGHTS      0x7
+#define ID_FLOAT_INFO           0x8
+#define ID_INT32_INFO           0x9
+#define ID_WV_BITSTREAM         0xa
+#define ID_WVC_BITSTREAM        0xb
+#define ID_WVX_BITSTREAM        0xc
+#define ID_CHANNEL_INFO         0xd
+
+#define ID_RIFF_HEADER          (ID_OPTIONAL_DATA | 0x1)
+#define ID_RIFF_TRAILER         (ID_OPTIONAL_DATA | 0x2)
+#define ID_REPLAY_GAIN          (ID_OPTIONAL_DATA | 0x3)
+#define ID_CUESHEET             (ID_OPTIONAL_DATA | 0x4)
+#define ID_CONFIG_BLOCK         (ID_OPTIONAL_DATA | 0x5)
+#define ID_MD5_CHECKSUM         (ID_OPTIONAL_DATA | 0x6)
+
+/*/////////////////////// WavPack Configuration /////////////////////////////// */
+
+/* This internal structure is used during encode to provide configuration to */
+/* the encoding engine and during decoding to provide fle information back to */
+/* the higher level functions. Not all fields are used in both modes. */
+
+typedef struct {
+    int bits_per_sample, bytes_per_sample;
+    int num_channels, float_norm_exp;
+    uint32_t flags, sample_rate, channel_mask;
+} WavpackConfig;
+
+#define CONFIG_BYTES_STORED     3       /* 1-4 bytes/sample */
+#define CONFIG_MONO_FLAG        4       /* not stereo */
+#define CONFIG_HYBRID_FLAG      8       /* hybrid mode */
+#define CONFIG_JOINT_STEREO     0x10    /* joint stereo */
+#define CONFIG_CROSS_DECORR     0x20    /* no-delay cross decorrelation */
+#define CONFIG_HYBRID_SHAPE     0x40    /* noise shape (hybrid mode only) */
+#define CONFIG_FLOAT_DATA       0x80    /* ieee 32-bit floating point data */
+
+#define CONFIG_FAST_FLAG        0x200   /* fast mode */
+#define CONFIG_HIGH_FLAG        0x800   /* high quality mode */
+#define CONFIG_VERY_HIGH_FLAG   0x1000  /* very high */
+#define CONFIG_BITRATE_KBPS     0x2000  /* bitrate is kbps, not bits / sample */
+#define CONFIG_AUTO_SHAPING     0x4000  /* automatic noise shaping */
+#define CONFIG_SHAPE_OVERRIDE   0x8000  /* shaping mode specified */
+#define CONFIG_JOINT_OVERRIDE   0x10000 /* joint-stereo mode specified */
+#define CONFIG_CREATE_EXE       0x40000 /* create executable */
+#define CONFIG_CREATE_WVC       0x80000 /* create correction file */
+#define CONFIG_OPTIMIZE_WVC     0x100000 /* maximize bybrid compression */
+#define CONFIG_CALC_NOISE       0x800000 /* calc noise in hybrid mode */
+#define CONFIG_LOSSY_MODE       0x1000000 /* obsolete (for information) */
+#define CONFIG_EXTRA_MODE       0x2000000 /* extra processing mode */
+#define CONFIG_SKIP_WVX         0x4000000 /* no wvx stream w/ floats & big ints */
+#define CONFIG_MD5_CHECKSUM     0x8000000 /* compute & store MD5 signature */
+#define CONFIG_OPTIMIZE_MONO    0x80000000 /* optimize for mono streams posing as stereo */
+
+/*////////////////////////////// WavPack Stream /////////////////////////////// */
+
+/* This internal structure contains everything required to handle a WavPack */
+/* "stream", which is defined as a stereo or mono stream of audio samples. For */
+/* multichannel audio several of these would be required. Each stream contains */
+/* pointers to hold a complete allocated block of WavPack data, although it's */
+/* possible to decode WavPack blocks without buffering an entire block. */
+
+typedef int32_t (*read_stream)(void *, int32_t);
+
+typedef struct bs {
+    uchar *buf, *end, *ptr;
+    void (*wrap)(struct bs *bs);
+    uint32_t file_bytes, sr;
+    int error, bc;
+    read_stream file;
+} Bitstream;
+
+#define MAX_NTERMS 16
+#define MAX_TERM 8
+
+struct decorr_pass {
+    short term, delta, weight_A, weight_B;
+    int32_t samples_A [MAX_TERM], samples_B [MAX_TERM];
+};
+
+struct entropy_data {
+    uint32_t median [3], slow_level, error_limit;
+};
+
+struct words_data {
+    uint32_t bitrate_delta [2], bitrate_acc [2];
+    uint32_t pend_data, holding_one, zeros_acc;
+    int holding_zero, pend_count;
+    struct entropy_data c [2];
+};
+
+typedef struct {
+    WavpackHeader wphdr;
+    Bitstream wvbits;
+
+    struct words_data w;
+
+    int num_terms, mute_error;
+    uint32_t sample_index, crc;
+
+    uchar int32_sent_bits, int32_zeros, int32_ones, int32_dups;
+    uchar float_flags, float_shift, float_max_exp, float_norm_exp;
+ 
+    struct decorr_pass decorr_passes [MAX_NTERMS];
+
+} WavpackStream;
+
+/* flags for float_flags: */
+
+#define FLOAT_SHIFT_ONES 1      /* bits left-shifted into float = '1' */
+#define FLOAT_SHIFT_SAME 2      /* bits left-shifted into float are the same */
+#define FLOAT_SHIFT_SENT 4      /* bits shifted into float are sent literally */
+#define FLOAT_ZEROS_SENT 8      /* "zeros" are not all real zeros */
+#define FLOAT_NEG_ZEROS  0x10   /* contains negative zeros */
+#define FLOAT_EXCEPTIONS 0x20   /* contains exceptions (inf, nan, etc.) */
+
+/*///////////////////////////// WavPack Context /////////////////////////////// */
+
+/* This internal structure holds everything required to encode or decode WavPack */
+/* files. It is recommended that direct access to this structure be minimized */
+/* and the provided utilities used instead. */
+
+typedef struct {
+    WavpackConfig config;
+    WavpackStream stream;
+
+    uchar read_buffer [1024];
+    char error_message [80];
+
+    read_stream infile;
+    uint32_t total_samples, crc_errors, first_flags;
+    int open_flags, norm_offset, reduced_channels, lossy_blocks;
+
+} WavpackContext;
+
+/*////////////////////// function prototypes and macros ////////////////////// */
+
+#define CLEAR(destin) memset (&destin, 0, sizeof (destin));
+
+/* bits.c */
+
+void bs_open_read (Bitstream *bs, uchar *buffer_start, uchar *buffer_end, read_stream file, uint32_t file_bytes);
+
+#define bs_is_open(bs) ((bs)->ptr != NULL)
+
+#define getbit(bs) ( \
+    (((bs)->bc) ? \
+        ((bs)->bc--, (bs)->sr & 1) : \
+            (((++((bs)->ptr) != (bs)->end) ? (void) 0 : (bs)->wrap (bs)), (bs)->bc = 7, ((bs)->sr = *((bs)->ptr)) & 1) \
+    ) ? \
+        ((bs)->sr >>= 1, 1) : \
+        ((bs)->sr >>= 1, 0) \
+)
+
+#define getbits(value, nbits, bs) { \
+    while ((nbits) > (bs)->bc) { \
+        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+        (bs)->sr |= (int32_t)*((bs)->ptr) << (bs)->bc; \
+        (bs)->bc += 8; \
+    } \
+    *(value) = (bs)->sr; \
+    if ((bs)->bc > 32) { \
+        (bs)->bc -= (nbits); \
+        (bs)->sr = *((bs)->ptr) >> (8 - (bs)->bc); \
+    } \
+    else { \
+        (bs)->bc -= (nbits); \
+        (bs)->sr >>= (nbits); \
+    } \
+}
+
+void little_endian_to_native (void *data, char *format);
+void native_to_little_endian (void *data, char *format);
+
+/* These macros implement the weight application and update operations */
+/* that are at the heart of the decorrelation loops. Note that when there */
+/* are several alternative versions of the same macro (marked with PERFCOND) */
+/* then the versions are functionally equivalent with respect to WavPack */
+/* decoding and the user should choose the one that provides the best */
+/* performance. This may be easier to check when NOT using the assembly */
+/* language optimizations. */
+
+#if 1   /* PERFCOND */
+#define apply_weight_i(weight, sample) ((weight * sample + 512) >> 10)
+#else
+#define apply_weight_i(weight, sample) ((((weight * sample) >> 8) + 2) >> 2)
+#endif
+
+#define apply_weight_f(weight, sample) (((((sample & 0xffffL) * weight) >> 9) + \
+    (((sample & ~0xffffL) >> 9) * weight) + 1) >> 1)
+
+#if 1   /* PERFCOND */
+#define apply_weight(weight, sample) (sample != (short) sample ? \
+    apply_weight_f (weight, sample) : apply_weight_i (weight, sample))
+#else
+#define apply_weight(weight, sample) ((int32_t)((weight * (int64_t) sample + 512) >> 10))
+#endif
+
+#if 0   /* PERFCOND */
+#define update_weight(weight, delta, source, result) \
+    if (source && result) { int32_t s = (int32_t) (source ^ result) >> 31; weight = (delta ^ s) + (weight - s); }
+#elif 1
+#define update_weight(weight, delta, source, result) \
+    if (source && result) weight += (((source ^ result) >> 30) | 1) * delta
+#else
+#define update_weight(weight, delta, source, result) \
+    if (source && result) (source ^ result) < 0 ? (weight -= delta) : (weight += delta)
+#endif
+
+#define update_weight_clip(weight, delta, source, result) \
+    if (source && result && ((source ^ result) < 0 ? (weight -= delta) < -1024 : (weight += delta) > 1024)) \
+        weight = weight < 0 ? -1024 : 1024
+
+/* unpack.c */
+
+int unpack_init (WavpackContext *wpc);
+int init_wv_bitstream (WavpackContext *wpc, WavpackMetadata *wpmd);
+int read_decorr_terms (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_decorr_weights (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_decorr_samples (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_float_info (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_int32_info (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_channel_info (WavpackContext *wpc, WavpackMetadata *wpmd);
+int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd);
+int32_t unpack_samples (WavpackContext *wpc, int32_t *buffer, uint32_t sample_count);
+int check_crc_error (WavpackContext *wpc);
+
+/* metadata.c stuff */
+
+int read_metadata_buff (WavpackContext *wpc, WavpackMetadata *wpmd);
+int process_metadata (WavpackContext *wpc, WavpackMetadata *wpmd);
+
+/* words.c stuff */
+
+int read_entropy_vars (WavpackStream *wps, WavpackMetadata *wpmd);
+int read_hybrid_profile (WavpackStream *wps, WavpackMetadata *wpmd);
+int32_t get_words (int32_t *buffer, int nsamples, uint32_t flags,
+                struct words_data *w, Bitstream *bs);
+int32_t exp2s (int log);
+int restore_weight (signed char weight);
+
+#define WORD_EOF (1L << 31)
+
+/* float.c */
+
+int read_float_info (WavpackStream *wps, WavpackMetadata *wpmd);
+void float_values (WavpackStream *wps, int32_t *values, int32_t num_values);
+
+/* wputils.c */
+
+WavpackContext *WavpackOpenFileInput (read_stream infile, char *error);
+
+int WavpackGetMode (WavpackContext *wpc);
+
+#define MODE_WVC        0x1
+#define MODE_LOSSLESS   0x2
+#define MODE_HYBRID     0x4
+#define MODE_FLOAT      0x8
+#define MODE_VALID_TAG  0x10
+#define MODE_HIGH       0x20
+#define MODE_FAST       0x40
+
+uint32_t WavpackUnpackSamples (WavpackContext *wpc, int32_t *buffer, uint32_t samples);
+uint32_t WavpackGetNumSamples (WavpackContext *wpc);
+uint32_t WavpackGetSampleIndex (WavpackContext *wpc);
+int WavpackGetNumErrors (WavpackContext *wpc);
+int WavpackLossyBlocks (WavpackContext *wpc);
+uint32_t WavpackGetSampleRate (WavpackContext *wpc);
+int WavpackGetBitsPerSample (WavpackContext *wpc);
+int WavpackGetBytesPerSample (WavpackContext *wpc);
+int WavpackGetNumChannels (WavpackContext *wpc);
+int WavpackGetReducedChannels (WavpackContext *wpc);
diff --git a/src_bkp/engine/external/wavpack/words.c b/src_bkp/engine/external/wavpack/words.c
new file mode 100644
index 0000000000..d39563b0ca
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/words.c
@@ -0,0 +1,560 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// words.c
+
+// This module provides entropy word encoding and decoding functions using
+// a variation on the Rice method.  This was introduced in version 3.93
+// because it allows splitting the data into a "lossy" stream and a
+// "correction" stream in a very efficient manner and is therefore ideal
+// for the "hybrid" mode.  For 4.0, the efficiency of this method was
+// significantly improved by moving away from the normal Rice restriction of
+// using powers of two for the modulus divisions and now the method can be
+// used for both hybrid and pure lossless encoding.
+
+// Samples are divided by median probabilities at 5/7 (71.43%), 10/49 (20.41%),
+// and 20/343 (5.83%). Each zone has 3.5 times fewer samples than the
+// previous. Using standard Rice coding on this data would result in 1.4
+// bits per sample average (not counting sign bit). However, there is a
+// very simple encoding that is over 99% efficient with this data and
+// results in about 1.22 bits per sample.
+
+#include "wavpack.h"
+
+#include <string.h>
+
+//////////////////////////////// local macros /////////////////////////////////
+
+#define LIMIT_ONES 16   // maximum consecutive 1s sent for "div" data
+
+// these control the time constant "slow_level" which is used for hybrid mode
+// that controls bitrate as a function of residual level (HYBRID_BITRATE).
+#define SLS 8
+#define SLO ((1 << (SLS - 1)))
+
+// these control the time constant of the 3 median level breakpoints
+#define DIV0 128        // 5/7 of samples
+#define DIV1 64         // 10/49 of samples
+#define DIV2 32         // 20/343 of samples
+
+// this macro retrieves the specified median breakpoint (without frac; min = 1)
+#define GET_MED(med) (((c->median [med]) >> 4) + 1)
+
+// These macros update the specified median breakpoints. Note that the median
+// is incremented when the sample is higher than the median, else decremented.
+// They are designed so that the median will never drop below 1 and the value
+// is essentially stationary if there are 2 increments for every 5 decrements.
+
+#define INC_MED0() (c->median [0] += ((c->median [0] + DIV0) / DIV0) * 5)
+#define DEC_MED0() (c->median [0] -= ((c->median [0] + (DIV0-2)) / DIV0) * 2)
+#define INC_MED1() (c->median [1] += ((c->median [1] + DIV1) / DIV1) * 5)
+#define DEC_MED1() (c->median [1] -= ((c->median [1] + (DIV1-2)) / DIV1) * 2)
+#define INC_MED2() (c->median [2] += ((c->median [2] + DIV2) / DIV2) * 5)
+#define DEC_MED2() (c->median [2] -= ((c->median [2] + (DIV2-2)) / DIV2) * 2)
+
+#define count_bits(av) ( \
+ (av) < (1 << 8) ? nbits_table [av] : \
+  ( \
+   (av) < (1L << 16) ? nbits_table [(av) >> 8] + 8 : \
+   ((av) < (1L << 24) ? nbits_table [(av) >> 16] + 16 : nbits_table [(av) >> 24] + 24) \
+  ) \
+)
+
+///////////////////////////// local table storage ////////////////////////////
+
+const char nbits_table [] = {
+    0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,     // 0 - 15
+    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,     // 16 - 31
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,     // 32 - 47
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,     // 48 - 63
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,     // 64 - 79
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,     // 80 - 95
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,     // 96 - 111
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,     // 112 - 127
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 128 - 143
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 144 - 159
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 160 - 175
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 176 - 191
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 192 - 207
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 208 - 223
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,     // 224 - 239
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8      // 240 - 255
+};
+
+static const uchar log2_table [] = {
+    0x00, 0x01, 0x03, 0x04, 0x06, 0x07, 0x09, 0x0a, 0x0b, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x15,
+    0x16, 0x18, 0x19, 0x1a, 0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a,
+    0x2c, 0x2d, 0x2e, 0x2f, 0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x39, 0x3b, 0x3c, 0x3d, 0x3e,
+    0x3f, 0x41, 0x42, 0x43, 0x44, 0x45, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4d, 0x4e, 0x4f, 0x50, 0x51,
+    0x52, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
+    0x64, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
+    0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+    0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
+    0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb2,
+    0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc0,
+    0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xce,
+    0xcf, 0xd0, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd8, 0xd9, 0xda, 0xdb,
+    0xdc, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe4, 0xe5, 0xe6, 0xe7, 0xe7,
+    0xe8, 0xe9, 0xea, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xee, 0xef, 0xf0, 0xf1, 0xf1, 0xf2, 0xf3, 0xf4,
+    0xf4, 0xf5, 0xf6, 0xf7, 0xf7, 0xf8, 0xf9, 0xf9, 0xfa, 0xfb, 0xfc, 0xfc, 0xfd, 0xfe, 0xff, 0xff
+};
+
+static const uchar exp2_table [] = {
+    0x00, 0x01, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x0b,
+    0x0b, 0x0c, 0x0d, 0x0e, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x14, 0x15, 0x16, 0x16,
+    0x17, 0x18, 0x19, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1f, 0x20, 0x20, 0x21, 0x22, 0x23,
+    0x24, 0x24, 0x25, 0x26, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3a, 0x3b, 0x3c, 0x3d,
+    0x3e, 0x3f, 0x40, 0x41, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x48, 0x49, 0x4a, 0x4b,
+    0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a,
+    0x5b, 0x5c, 0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+    0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+    0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x87, 0x88, 0x89, 0x8a,
+    0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
+    0x9c, 0x9d, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad,
+    0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,
+    0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc8, 0xc9, 0xca, 0xcb, 0xcd, 0xce, 0xcf, 0xd0, 0xd2, 0xd3, 0xd4,
+    0xd6, 0xd7, 0xd8, 0xd9, 0xdb, 0xdc, 0xdd, 0xde, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe8, 0xe9,
+    0xea, 0xec, 0xed, 0xee, 0xf0, 0xf1, 0xf2, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfc, 0xfd, 0xff
+};
+
+static const char ones_count_table [] = {
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+    0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,8
+};
+
+///////////////////////////// executable code ////////////////////////////////
+
+void init_words (WavpackStream *wps)
+{
+    CLEAR (wps->w);
+}
+
+static int mylog2 (uint32_t avalue);
+
+// Read the median log2 values from the specifed metadata structure, convert
+// them back to 32-bit unsigned values and store them. If length is not
+// exactly correct then we flag and return an error.
+
+int read_entropy_vars (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    uchar *byteptr = wpmd->data;
+
+    if (wpmd->byte_length != ((wps->wphdr.flags & MONO_DATA) ? 6 : 12))
+        return FALSE;
+
+    wps->w.c [0].median [0] = exp2s (byteptr [0] + (byteptr [1] << 8));
+    wps->w.c [0].median [1] = exp2s (byteptr [2] + (byteptr [3] << 8));
+    wps->w.c [0].median [2] = exp2s (byteptr [4] + (byteptr [5] << 8));
+
+    if (!(wps->wphdr.flags & MONO_DATA)) {
+        wps->w.c [1].median [0] = exp2s (byteptr [6] + (byteptr [7] << 8));
+        wps->w.c [1].median [1] = exp2s (byteptr [8] + (byteptr [9] << 8));
+        wps->w.c [1].median [2] = exp2s (byteptr [10] + (byteptr [11] << 8));
+    }
+
+    return TRUE;
+}
+
+// Read the hybrid related values from the specifed metadata structure, convert
+// them back to their internal formats and store them. The extended profile
+// stuff is not implemented yet, so return an error if we get more data than
+// we know what to do with.
+
+int read_hybrid_profile (WavpackStream *wps, WavpackMetadata *wpmd)
+{
+    uchar *byteptr = wpmd->data;
+    uchar *endptr = byteptr + wpmd->byte_length;
+
+    if (wps->wphdr.flags & HYBRID_BITRATE) {
+        wps->w.c [0].slow_level = exp2s (byteptr [0] + (byteptr [1] << 8));
+        byteptr += 2;
+
+        if (!(wps->wphdr.flags & MONO_DATA)) {
+            wps->w.c [1].slow_level = exp2s (byteptr [0] + (byteptr [1] << 8));
+            byteptr += 2;
+        }
+    }
+
+    wps->w.bitrate_acc [0] = (int32_t)(byteptr [0] + (byteptr [1] << 8)) << 16;
+    byteptr += 2;
+
+    if (!(wps->wphdr.flags & MONO_DATA)) {
+        wps->w.bitrate_acc [1] = (int32_t)(byteptr [0] + (byteptr [1] << 8)) << 16;
+        byteptr += 2;
+    }
+
+    if (byteptr < endptr) {
+        wps->w.bitrate_delta [0] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+        byteptr += 2;
+
+        if (!(wps->wphdr.flags & MONO_DATA)) {
+            wps->w.bitrate_delta [1] = exp2s ((short)(byteptr [0] + (byteptr [1] << 8)));
+            byteptr += 2;
+        }
+
+        if (byteptr < endptr)
+            return FALSE;
+    }
+    else
+        wps->w.bitrate_delta [0] = wps->w.bitrate_delta [1] = 0;
+
+    return TRUE;
+}
+
+// This function is called during both encoding and decoding of hybrid data to
+// update the "error_limit" variable which determines the maximum sample error
+// allowed in the main bitstream. In the HYBRID_BITRATE mode (which is the only
+// currently implemented) this is calculated from the slow_level values and the
+// bitrate accumulators. Note that the bitrate accumulators can be changing.
+
+void update_error_limit (struct words_data *w, uint32_t flags)
+{
+    int bitrate_0 = (w->bitrate_acc [0] += w->bitrate_delta [0]) >> 16;
+
+    if (flags & MONO_DATA) {
+        if (flags & HYBRID_BITRATE) {
+            int slow_log_0 = (w->c [0].slow_level + SLO) >> SLS;
+
+            if (slow_log_0 - bitrate_0 > -0x100)
+                w->c [0].error_limit = exp2s (slow_log_0 - bitrate_0 + 0x100);
+            else
+                w->c [0].error_limit = 0;
+        }
+        else
+            w->c [0].error_limit = exp2s (bitrate_0);
+    }
+    else {
+        int bitrate_1 = (w->bitrate_acc [1] += w->bitrate_delta [1]) >> 16;
+
+        if (flags & HYBRID_BITRATE) {
+            int slow_log_0 = (w->c [0].slow_level + SLO) >> SLS;
+            int slow_log_1 = (w->c [1].slow_level + SLO) >> SLS;
+
+            if (flags & HYBRID_BALANCE) {
+                int balance = (slow_log_1 - slow_log_0 + bitrate_1 + 1) >> 1;
+
+                if (balance > bitrate_0) {
+                    bitrate_1 = bitrate_0 * 2;
+                    bitrate_0 = 0;
+                }
+                else if (-balance > bitrate_0) {
+                    bitrate_0 = bitrate_0 * 2;
+                    bitrate_1 = 0;
+                }
+                else {
+                    bitrate_1 = bitrate_0 + balance;
+                    bitrate_0 = bitrate_0 - balance;
+                }
+            }
+
+            if (slow_log_0 - bitrate_0 > -0x100)
+                w->c [0].error_limit = exp2s (slow_log_0 - bitrate_0 + 0x100);
+            else
+                w->c [0].error_limit = 0;
+
+            if (slow_log_1 - bitrate_1 > -0x100)
+                w->c [1].error_limit = exp2s (slow_log_1 - bitrate_1 + 0x100);
+            else
+                w->c [1].error_limit = 0;
+        }
+        else {
+            w->c [0].error_limit = exp2s (bitrate_0);
+            w->c [1].error_limit = exp2s (bitrate_1);
+        }
+    }
+}
+
+static uint32_t read_code (Bitstream *bs, uint32_t maxcode);
+
+// Read the next word from the bitstream "wvbits" and return the value. This
+// function can be used for hybrid or lossless streams, but since an
+// optimized version is available for lossless this function would normally
+// be used for hybrid only. If a hybrid lossless stream is being read then
+// the "correction" offset is written at the specified pointer. A return value
+// of WORD_EOF indicates that the end of the bitstream was reached (all 1s) or
+// some other error occurred.
+
+int32_t get_words (int32_t *buffer, int nsamples, uint32_t flags,
+                struct words_data *w, Bitstream *bs)
+{
+    register struct entropy_data *c = w->c;
+    int csamples;
+
+    if (!(flags & MONO_DATA))
+        nsamples *= 2;
+
+    for (csamples = 0; csamples < nsamples; ++csamples) {
+        uint32_t ones_count, low, mid, high;
+
+        if (!(flags & MONO_DATA))
+            c = w->c + (csamples & 1);
+
+        if (!(w->c [0].median [0] & ~1) && !w->holding_zero && !w->holding_one && !(w->c [1].median [0] & ~1)) {
+            uint32_t mask;
+            int cbits;
+
+            if (w->zeros_acc) {
+                if (--w->zeros_acc) {
+                    c->slow_level -= (c->slow_level + SLO) >> SLS;
+                    *buffer++ = 0;
+                    continue;
+                }
+            }
+            else {
+                for (cbits = 0; cbits < 33 && getbit (bs); ++cbits);
+
+                if (cbits == 33)
+                    break;
+
+                if (cbits < 2)
+                    w->zeros_acc = cbits;
+                else {
+                    for (mask = 1, w->zeros_acc = 0; --cbits; mask <<= 1)
+                        if (getbit (bs))
+                            w->zeros_acc |= mask;
+
+                    w->zeros_acc |= mask;
+                }
+
+                if (w->zeros_acc) {
+                    c->slow_level -= (c->slow_level + SLO) >> SLS;
+                    CLEAR (w->c [0].median);
+                    CLEAR (w->c [1].median);
+                    *buffer++ = 0;
+                    continue;
+                }
+            }
+        }
+
+        if (w->holding_zero)
+            ones_count = w->holding_zero = 0;
+        else {
+            int next8;
+
+            if (bs->bc < 8) {
+                if (++(bs->ptr) == bs->end)
+                    bs->wrap (bs);
+
+                next8 = (bs->sr |= *(bs->ptr) << bs->bc) & 0xff;
+                bs->bc += 8;
+            }
+            else
+                next8 = bs->sr & 0xff;
+
+            if (next8 == 0xff) {
+                bs->bc -= 8;
+                bs->sr >>= 8;
+
+                for (ones_count = 8; ones_count < (LIMIT_ONES + 1) && getbit (bs); ++ones_count);
+
+                if (ones_count == (LIMIT_ONES + 1))
+                    break;
+
+                if (ones_count == LIMIT_ONES) {
+                    uint32_t mask;
+                    int cbits;
+
+                    for (cbits = 0; cbits < 33 && getbit (bs); ++cbits);
+
+                    if (cbits == 33)
+                        break;
+
+                    if (cbits < 2)
+                        ones_count = cbits;
+                    else {
+                        for (mask = 1, ones_count = 0; --cbits; mask <<= 1)
+                            if (getbit (bs))
+                                ones_count |= mask;
+
+                        ones_count |= mask;
+                    }
+
+                    ones_count += LIMIT_ONES;
+                }
+            }
+            else {
+                bs->bc -= (ones_count = ones_count_table [next8]) + 1;
+                bs->sr >>= ones_count + 1;
+            }
+
+            if (w->holding_one) {
+                w->holding_one = ones_count & 1;
+                ones_count = (ones_count >> 1) + 1;
+            }
+            else {
+                w->holding_one = ones_count & 1;
+                ones_count >>= 1;
+            }
+
+            w->holding_zero = ~w->holding_one & 1;
+        }
+
+        if ((flags & HYBRID_FLAG) && ((flags & MONO_DATA) || !(csamples & 1)))
+            update_error_limit (w, flags);
+
+        if (ones_count == 0) {
+            low = 0;
+            high = GET_MED (0) - 1;
+            DEC_MED0 ();
+        }
+        else {
+            low = GET_MED (0);
+            INC_MED0 ();
+
+            if (ones_count == 1) {
+                high = low + GET_MED (1) - 1;
+                DEC_MED1 ();
+            }
+            else {
+                low += GET_MED (1);
+                INC_MED1 ();
+
+                if (ones_count == 2) {
+                    high = low + GET_MED (2) - 1;
+                    DEC_MED2 ();
+                }
+                else {
+                    low += (ones_count - 2) * GET_MED (2);
+                    high = low + GET_MED (2) - 1;
+                    INC_MED2 ();
+                }
+            }
+        }
+
+        mid = (high + low + 1) >> 1;
+
+        if (!c->error_limit)
+            mid = read_code (bs, high - low) + low;
+        else while (high - low > c->error_limit) {
+            if (getbit (bs))
+                mid = (high + (low = mid) + 1) >> 1;
+            else
+                mid = ((high = mid - 1) + low + 1) >> 1;
+        }
+
+        *buffer++ = getbit (bs) ? ~mid : mid;
+
+        if (flags & HYBRID_BITRATE)
+            c->slow_level = c->slow_level - ((c->slow_level + SLO) >> SLS) + mylog2 (mid);
+    }
+
+    return (flags & MONO_DATA) ? csamples : (csamples / 2);
+}
+
+// Read a single unsigned value from the specified bitstream with a value
+// from 0 to maxcode. If there are exactly a power of two number of possible
+// codes then this will read a fixed number of bits; otherwise it reads the
+// minimum number of bits and then determines whether another bit is needed
+// to define the code.
+
+static uint32_t read_code (Bitstream *bs, uint32_t maxcode)
+{
+    int bitcount = count_bits (maxcode);
+    uint32_t extras = (1L << bitcount) - maxcode - 1, code;
+
+    if (!bitcount)
+        return 0;
+
+    getbits (&code, bitcount - 1, bs);
+    code &= (1L << (bitcount - 1)) - 1;
+
+    if (code >= extras) {
+        code = (code << 1) - extras;
+
+        if (getbit (bs))
+            ++code;
+    }
+
+    return code;
+}
+
+// The concept of a base 2 logarithm is used in many parts of WavPack. It is
+// a way of sufficiently accurately representing 32-bit signed and unsigned
+// values storing only 16 bits (actually fewer). It is also used in the hybrid
+// mode for quickly comparing the relative magnitude of large values (i.e.
+// division) and providing smooth exponentials using only addition.
+
+// These are not strict logarithms in that they become linear around zero and
+// can therefore represent both zero and negative values. They have 8 bits
+// of precision and in "roundtrip" conversions the total error never exceeds 1
+// part in 225 except for the cases of +/-115 and +/-195 (which error by 1).
+
+
+// This function returns the log2 for the specified 32-bit unsigned value.
+// The maximum value allowed is about 0xff800000 and returns 8447.
+
+static int mylog2 (uint32_t avalue)
+{
+    int dbits;
+
+    if ((avalue += avalue >> 9) < (1 << 8)) {
+        dbits = nbits_table [avalue];
+        return (dbits << 8) + log2_table [(avalue << (9 - dbits)) & 0xff];
+    }
+    else {
+        if (avalue < (1L << 16))
+            dbits = nbits_table [avalue >> 8] + 8;
+        else if (avalue < (1L << 24))
+            dbits = nbits_table [avalue >> 16] + 16;
+        else
+            dbits = nbits_table [avalue >> 24] + 24;
+
+        return (dbits << 8) + log2_table [(avalue >> (dbits - 9)) & 0xff];
+    }
+}
+
+// This function returns the log2 for the specified 32-bit signed value.
+// All input values are valid and the return values are in the range of
+// +/- 8192.
+
+int log2s (int32_t value)
+{
+    return (value < 0) ? -mylog2 (-value) : mylog2 (value);
+}
+
+// This function returns the original integer represented by the supplied
+// logarithm (at least within the provided accuracy). The log is signed,
+// but since a full 32-bit value is returned this can be used for unsigned
+// conversions as well (i.e. the input range is -8192 to +8447).
+
+int32_t exp2s (int log)
+{
+    uint32_t value;
+
+    if (log < 0)
+        return -exp2s (-log);
+
+    value = exp2_table [log & 0xff] | 0x100;
+
+    if ((log >>= 8) <= 9)
+        return value >> (9 - log);
+    else
+        return value << (log - 9);
+}
+
+// These two functions convert internal weights (which are normally +/-1024)
+// to and from an 8-bit signed character version for storage in metadata. The
+// weights are clipped here in the case that they are outside that range.
+
+int restore_weight (signed char weight)
+{
+    int result;
+
+    if ((result = (int) weight << 3) > 0)
+        result += (result + 64) >> 7;
+
+    return result;
+}
diff --git a/src_bkp/engine/external/wavpack/wputils.c b/src_bkp/engine/external/wavpack/wputils.c
new file mode 100644
index 0000000000..1bc656103d
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/wputils.c
@@ -0,0 +1,351 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// wputils.c
+
+// This module provides a high-level interface for decoding WavPack 4.0 audio
+// streams and files. WavPack data is read with a stream reading callback. No
+// direct seeking is provided for, but it is possible to start decoding
+// anywhere in a WavPack stream. In this case, WavPack will be able to provide
+// the sample-accurate position when it synchs with the data and begins
+// decoding.
+
+#include "wavpack.h"
+
+#include <string.h>
+
+///////////////////////////// local table storage ////////////////////////////
+
+const uint32_t sample_rates [] = { 6000, 8000, 9600, 11025, 12000, 16000, 22050,
+    24000, 32000, 44100, 48000, 64000, 88200, 96000, 192000 };
+
+///////////////////////////// executable code ////////////////////////////////
+
+static uint32_t read_next_header (read_stream infile, WavpackHeader *wphdr);
+        
+// This function reads data from the specified stream in search of a valid
+// WavPack 4.0 audio block. If this fails in 1 megabyte (or an invalid or
+// unsupported WavPack block is encountered) then an appropriate message is
+// copied to "error" and NULL is returned, otherwise a pointer to a
+// WavpackContext structure is returned (which is used to call all other
+// functions in this module). This can be initiated at the beginning of a
+// WavPack file, or anywhere inside a WavPack file. To determine the exact
+// position within the file use WavpackGetSampleIndex(). For demonstration
+// purposes this uses a single static copy of the WavpackContext structure,
+// so obviously it cannot be used for more than one file at a time. Also,
+// this function will not handle "correction" files, plays only the first
+// two channels of multi-channel files, and is limited in resolution in some
+// large integer or floating point files (but always provides at least 24 bits
+// of resolution).
+
+static WavpackContext wpc;
+
+WavpackContext *WavpackOpenFileInput (read_stream infile, char *error)
+{
+    WavpackStream *wps = &wpc.stream;
+    uint32_t bcount;
+
+    CLEAR (wpc);
+    wpc.infile = infile;
+    wpc.total_samples = (uint32_t) -1;
+    wpc.norm_offset = 0;
+    wpc.open_flags = 0;
+
+    // open the source file for reading and store the size
+
+    while (!wps->wphdr.block_samples) {
+
+        bcount = read_next_header (wpc.infile, &wps->wphdr);
+
+        if (bcount == (uint32_t) -1) {
+            strcpy (error, "not compatible with this version of WavPack file!");
+            return NULL;
+        }
+
+        if (wps->wphdr.block_samples && wps->wphdr.total_samples != (uint32_t) -1)
+            wpc.total_samples = wps->wphdr.total_samples;
+
+        if (!unpack_init (&wpc)) {
+            strcpy (error, wpc.error_message [0] ? wpc.error_message :
+                "not compatible with this version of WavPack file!");
+
+            return NULL;
+        }
+    }
+
+    wpc.config.flags &= ~0xff;
+    wpc.config.flags |= wps->wphdr.flags & 0xff;
+    wpc.config.bytes_per_sample = (wps->wphdr.flags & BYTES_STORED) + 1;
+    wpc.config.float_norm_exp = wps->float_norm_exp;
+
+    wpc.config.bits_per_sample = (wpc.config.bytes_per_sample * 8) - 
+        ((wps->wphdr.flags & SHIFT_MASK) >> SHIFT_LSB);
+
+    if (wpc.config.flags & FLOAT_DATA) {
+        wpc.config.bytes_per_sample = 3;
+        wpc.config.bits_per_sample = 24;
+    }
+
+    if (!wpc.config.sample_rate) {
+        if (!wps || !wps->wphdr.block_samples || (wps->wphdr.flags & SRATE_MASK) == SRATE_MASK)
+            wpc.config.sample_rate = 44100;
+        else
+            wpc.config.sample_rate = sample_rates [(wps->wphdr.flags & SRATE_MASK) >> SRATE_LSB];
+    }
+
+    if (!wpc.config.num_channels) {
+        wpc.config.num_channels = (wps->wphdr.flags & MONO_FLAG) ? 1 : 2;
+        wpc.config.channel_mask = 0x5 - wpc.config.num_channels;
+    }
+
+    if (!(wps->wphdr.flags & FINAL_BLOCK))
+        wpc.reduced_channels = (wps->wphdr.flags & MONO_FLAG) ? 1 : 2;
+
+    return &wpc;
+}
+
+// This function obtains general information about an open file and returns
+// a mask with the following bit values:
+
+// MODE_LOSSLESS:  file is lossless (pure lossless only)
+// MODE_HYBRID:  file is hybrid mode (lossy part only)
+// MODE_FLOAT:  audio data is 32-bit ieee floating point (but will provided
+//               in 24-bit integers for convenience)
+// MODE_HIGH:  file was created in "high" mode (information only)
+// MODE_FAST:  file was created in "fast" mode (information only)
+
+int WavpackGetMode (WavpackContext *wpc)
+{
+    int mode = 0;
+
+    if (wpc) {
+        if (wpc->config.flags & CONFIG_HYBRID_FLAG)
+            mode |= MODE_HYBRID;
+        else if (!(wpc->config.flags & CONFIG_LOSSY_MODE))
+            mode |= MODE_LOSSLESS;
+
+        if (wpc->lossy_blocks)
+            mode &= ~MODE_LOSSLESS;
+
+        if (wpc->config.flags & CONFIG_FLOAT_DATA)
+            mode |= MODE_FLOAT;
+
+        if (wpc->config.flags & CONFIG_HIGH_FLAG)
+            mode |= MODE_HIGH;
+
+        if (wpc->config.flags & CONFIG_FAST_FLAG)
+            mode |= MODE_FAST;
+    }
+
+    return mode;
+}
+
+// Unpack the specified number of samples from the current file position.
+// Note that "samples" here refers to "complete" samples, which would be
+// 2 longs for stereo files. The audio data is returned right-justified in
+// 32-bit longs in the endian mode native to the executing processor. So,
+// if the original data was 16-bit, then the values returned would be
+// +/-32k. Floating point data will be returned as 24-bit integers (and may
+// also be clipped). The actual number of samples unpacked is returned,
+// which should be equal to the number requested unless the end of fle is
+// encountered or an error occurs.
+
+uint32_t WavpackUnpackSamples (WavpackContext *wpc, int32_t *buffer, uint32_t samples)
+{
+    WavpackStream *wps = &wpc->stream;
+    uint32_t bcount, samples_unpacked = 0, samples_to_unpack;
+    int num_channels = wpc->config.num_channels;
+
+    while (samples) {
+        if (!wps->wphdr.block_samples || !(wps->wphdr.flags & INITIAL_BLOCK) ||
+            wps->sample_index >= wps->wphdr.block_index + wps->wphdr.block_samples) {
+                bcount = read_next_header (wpc->infile, &wps->wphdr);
+
+                if (bcount == (uint32_t) -1)
+                    break;
+
+                if (!wps->wphdr.block_samples || wps->sample_index == wps->wphdr.block_index)
+                    if (!unpack_init (wpc))
+                        break;
+        }
+
+        if (!wps->wphdr.block_samples || !(wps->wphdr.flags & INITIAL_BLOCK) ||
+            wps->sample_index >= wps->wphdr.block_index + wps->wphdr.block_samples)
+                continue;
+
+        if (wps->sample_index < wps->wphdr.block_index) {
+            samples_to_unpack = wps->wphdr.block_index - wps->sample_index;
+
+            if (samples_to_unpack > samples)
+                samples_to_unpack = samples;
+
+            wps->sample_index += samples_to_unpack;
+            samples_unpacked += samples_to_unpack;
+            samples -= samples_to_unpack;
+
+            if (wpc->reduced_channels)
+                samples_to_unpack *= wpc->reduced_channels;
+            else
+                samples_to_unpack *= num_channels;
+
+            while (samples_to_unpack--)
+                *buffer++ = 0;
+
+            continue;
+        }
+
+        samples_to_unpack = wps->wphdr.block_index + wps->wphdr.block_samples - wps->sample_index;
+
+        if (samples_to_unpack > samples)
+            samples_to_unpack = samples;
+
+        unpack_samples (wpc, buffer, samples_to_unpack);
+
+        if (wpc->reduced_channels)
+            buffer += samples_to_unpack * wpc->reduced_channels;
+        else
+            buffer += samples_to_unpack * num_channels;
+
+        samples_unpacked += samples_to_unpack;
+        samples -= samples_to_unpack;
+
+        if (wps->sample_index == wps->wphdr.block_index + wps->wphdr.block_samples) {
+            if (check_crc_error (wpc))
+                wpc->crc_errors++;
+        }
+
+        if (wps->sample_index == wpc->total_samples)
+            break;
+    }
+
+    return samples_unpacked;
+}
+
+// Get total number of samples contained in the WavPack file, or -1 if unknown
+
+uint32_t WavpackGetNumSamples (WavpackContext *wpc)
+{
+    return wpc ? wpc->total_samples : (uint32_t) -1;
+}
+
+// Get the current sample index position, or -1 if unknown
+
+uint32_t WavpackGetSampleIndex (WavpackContext *wpc)
+{
+    if (wpc)
+        return wpc->stream.sample_index;
+
+    return (uint32_t) -1;
+}
+
+// Get the number of errors encountered so far
+
+int WavpackGetNumErrors (WavpackContext *wpc)
+{
+    return wpc ? wpc->crc_errors : 0;
+}
+
+// return TRUE if any uncorrected lossy blocks were actually written or read
+
+int WavpackLossyBlocks (WavpackContext *wpc)
+{
+    return wpc ? wpc->lossy_blocks : 0;
+}
+
+// Returns the sample rate of the specified WavPack file
+
+uint32_t WavpackGetSampleRate (WavpackContext *wpc)
+{
+    return wpc ? wpc->config.sample_rate : 44100;
+}
+
+// Returns the number of channels of the specified WavPack file. Note that
+// this is the actual number of channels contained in the file, but this
+// version can only decode the first two.
+
+int WavpackGetNumChannels (WavpackContext *wpc)
+{
+    return wpc ? wpc->config.num_channels : 2;
+}
+
+// Returns the actual number of valid bits per sample contained in the
+// original file, which may or may not be a multiple of 8. Floating data
+// always has 32 bits, integers may be from 1 to 32 bits each. When this
+// value is not a multiple of 8, then the "extra" bits are located in the
+// LSBs of the results. That is, values are right justified when unpacked
+// into longs, but are left justified in the number of bytes used by the
+// original data.
+
+int WavpackGetBitsPerSample (WavpackContext *wpc)
+{
+    return wpc ? wpc->config.bits_per_sample : 16;
+}
+
+// Returns the number of bytes used for each sample (1 to 4) in the original
+// file. This is required information for the user of this module because the
+// audio data is returned in the LOWER bytes of the long buffer and must be
+// left-shifted 8, 16, or 24 bits if normalized longs are required.
+
+int WavpackGetBytesPerSample (WavpackContext *wpc)
+{
+    return wpc ? wpc->config.bytes_per_sample : 2;
+}
+
+// This function will return the actual number of channels decoded from the
+// file (which may or may not be less than the actual number of channels, but
+// will always be 1 or 2). Normally, this will be the front left and right
+// channels of a multi-channel file.
+
+int WavpackGetReducedChannels (WavpackContext *wpc)
+{
+    if (wpc)
+        return wpc->reduced_channels ? wpc->reduced_channels : wpc->config.num_channels;
+    else
+        return 2;
+}
+
+// Read from current file position until a valid 32-byte WavPack 4.0 header is
+// found and read into the specified pointer. The number of bytes skipped is
+// returned. If no WavPack header is found within 1 meg, then a -1 is returned
+// to indicate the error. No additional bytes are read past the header and it
+// is returned in the processor's native endian mode. Seeking is not required.
+
+static uint32_t read_next_header (read_stream infile, WavpackHeader *wphdr)
+{
+    char buffer [sizeof (*wphdr)], *sp = buffer + sizeof (*wphdr), *ep = sp;
+    uint32_t bytes_skipped = 0;
+    int bleft;
+
+    while (1) {
+        if (sp < ep) {
+            bleft = ep - sp;
+            memcpy (buffer, sp, bleft);
+        }
+        else
+            bleft = 0;
+
+        if (infile (buffer + bleft, sizeof (*wphdr) - bleft) != (int32_t) sizeof (*wphdr) - bleft)
+            return -1;
+
+        sp = buffer;
+
+        if (*sp++ == 'w' && *sp == 'v' && *++sp == 'p' && *++sp == 'k' &&
+            !(*++sp & 1) && sp [2] < 16 && !sp [3] && sp [5] == 4 &&
+            sp [4] >= (MIN_STREAM_VERS & 0xff) && sp [4] <= (MAX_STREAM_VERS & 0xff)) {
+                memcpy (wphdr, buffer, sizeof (*wphdr));
+                little_endian_to_native (wphdr, WavpackHeaderFormat);
+                return bytes_skipped;
+            }
+
+        while (sp < ep && *sp != 'w')
+            sp++;
+
+        if ((bytes_skipped += sp - buffer) > 1048576L)
+            return -1;
+    }
+}
diff --git a/src_bkp/engine/external/wavpack/wvfilter.c.no_compile b/src_bkp/engine/external/wavpack/wvfilter.c.no_compile
new file mode 100644
index 0000000000..236912dacd
--- /dev/null
+++ b/src_bkp/engine/external/wavpack/wvfilter.c.no_compile
@@ -0,0 +1,200 @@
+////////////////////////////////////////////////////////////////////////////
+//                           **** WAVPACK ****                            //
+//                  Hybrid Lossless Wavefile Compressor                   //
+//              Copyright (c) 1998 - 2006 Conifer Software.               //
+//                          All Rights Reserved.                          //
+//      Distributed under the BSD Software License (see license.txt)      //
+////////////////////////////////////////////////////////////////////////////
+
+// wv_filter.c
+
+// This is the main module for the demonstration WavPack command-line
+// decoder filter. It uses the tiny "hardware" version of the decoder and
+// accepts WavPack files on stdin and outputs a standard MS wav file to
+// stdout. Note that this involves converting the data to little-endian
+// (if the executing processor is not), possibly packing the data into
+// fewer bytes per sample, and generating an appropriate riff wav header.
+// Note that this is NOT the copy of the RIFF header that might be stored
+// in the file, and any additional RIFF information and tags are lost.
+// See wputils.c for further limitations.
+
+#include "wavpack.h"
+
+#if defined(WIN32)
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#include <string.h>
+
+// These structures are used to place a wav riff header at the beginning of
+// the output.
+
+typedef struct {
+    char ckID [4];
+    uint32_t ckSize;
+    char formType [4];
+} RiffChunkHeader;
+
+typedef struct {
+    char ckID [4];
+    uint32_t ckSize;
+} ChunkHeader;
+
+#define ChunkHeaderFormat "4L"
+
+typedef struct {
+    ushort FormatTag, NumChannels;
+    uint32_t SampleRate, BytesPerSecond;
+    ushort BlockAlign, BitsPerSample;
+} WaveHeader;
+
+#define WaveHeaderFormat "SSLLSS"
+
+static uchar *format_samples (int bps, uchar *dst, int32_t *src, uint32_t samcnt);
+static int32_t read_bytes (void *buff, int32_t bcount);
+static int32_t temp_buffer [256];
+
+int main ()
+{
+    ChunkHeader FormatChunkHeader, DataChunkHeader;
+    RiffChunkHeader RiffChunkHeader;
+    WaveHeader WaveHeader;
+
+    uint32_t total_unpacked_samples = 0, total_samples;
+    int num_channels, bps;
+    WavpackContext *wpc;
+    char error [80];
+
+#if defined(WIN32)
+    setmode (fileno (stdin), O_BINARY);
+    setmode (fileno (stdout), O_BINARY);
+#endif
+
+    wpc = WavpackOpenFileInput (read_bytes, error);
+
+    if (!wpc) {
+        fputs (error, stderr);
+        fputs ("\n", stderr);
+        return 1;
+    }
+
+    num_channels = WavpackGetReducedChannels (wpc);
+    total_samples = WavpackGetNumSamples (wpc);
+    bps = WavpackGetBytesPerSample (wpc);
+
+    strncpy (RiffChunkHeader.ckID, "RIFF", sizeof (RiffChunkHeader.ckID));
+    RiffChunkHeader.ckSize = total_samples * num_channels * bps + sizeof (ChunkHeader) * 2 + sizeof (WaveHeader) + 4;
+    strncpy (RiffChunkHeader.formType, "WAVE", sizeof (RiffChunkHeader.formType));
+
+    strncpy (FormatChunkHeader.ckID, "fmt ", sizeof (FormatChunkHeader.ckID));
+    FormatChunkHeader.ckSize = sizeof (WaveHeader);
+
+    WaveHeader.FormatTag = 1;
+    WaveHeader.NumChannels = num_channels;
+    WaveHeader.SampleRate = WavpackGetSampleRate (wpc);
+    WaveHeader.BlockAlign = num_channels * bps;
+    WaveHeader.BytesPerSecond = WaveHeader.SampleRate * WaveHeader.BlockAlign;
+    WaveHeader.BitsPerSample = WavpackGetBitsPerSample (wpc);
+
+    strncpy (DataChunkHeader.ckID, "data", sizeof (DataChunkHeader.ckID));
+    DataChunkHeader.ckSize = total_samples * num_channels * bps;
+
+    native_to_little_endian (&RiffChunkHeader, ChunkHeaderFormat);
+    native_to_little_endian (&FormatChunkHeader, ChunkHeaderFormat);
+    native_to_little_endian (&WaveHeader, WaveHeaderFormat);
+    native_to_little_endian (&DataChunkHeader, ChunkHeaderFormat);
+
+    if (!fwrite (&RiffChunkHeader, sizeof (RiffChunkHeader), 1, stdout) ||
+        !fwrite (&FormatChunkHeader, sizeof (FormatChunkHeader), 1, stdout) ||
+        !fwrite (&WaveHeader, sizeof (WaveHeader), 1, stdout) ||
+        !fwrite (&DataChunkHeader, sizeof (DataChunkHeader), 1, stdout)) {
+            fputs ("can't write .WAV data, disk probably full!\n", stderr);
+            return 1;
+        }
+
+    while (1) {
+        uint32_t samples_unpacked;
+
+        samples_unpacked = WavpackUnpackSamples (wpc, temp_buffer, 256 / num_channels);
+        total_unpacked_samples += samples_unpacked;
+
+        if (samples_unpacked) {
+            format_samples (bps, (uchar *) temp_buffer, temp_buffer, samples_unpacked *= num_channels);
+
+            if (fwrite (temp_buffer, bps, samples_unpacked, stdout) != samples_unpacked) {
+                fputs ("can't write .WAV data, disk probably full!\n", stderr);
+                return 1;
+            }
+        }
+
+        if (!samples_unpacked)
+            break;
+    }
+
+    fflush (stdout);
+
+    if (WavpackGetNumSamples (wpc) != (uint32_t) -1 &&
+        total_unpacked_samples != WavpackGetNumSamples (wpc)) {
+            fputs ("incorrect number of samples!\n", stderr);
+            return 1;
+    }
+
+    if (WavpackGetNumErrors (wpc)) {
+        fputs ("crc errors detected!\n", stderr);
+        return 1;
+    }
+
+    return 0;
+}
+
+static int32_t read_bytes (void *buff, int32_t bcount)
+{
+    return fread (buff, 1, bcount, stdin);
+}
+
+// Reformat samples from longs in processor's native endian mode to
+// little-endian data with (possibly) less than 4 bytes / sample.
+
+static uchar *format_samples (int bps, uchar *dst, int32_t *src, uint32_t samcnt)
+{
+    int32_t temp;
+
+    switch (bps) {
+
+        case 1:
+            while (samcnt--)
+                *dst++ = *src++ + 128;
+
+            break;
+
+        case 2:
+            while (samcnt--) {
+                *dst++ = (uchar)(temp = *src++);
+                *dst++ = (uchar)(temp >> 8);
+            }
+
+            break;
+
+        case 3:
+            while (samcnt--) {
+                *dst++ = (uchar)(temp = *src++);
+                *dst++ = (uchar)(temp >> 8);
+                *dst++ = (uchar)(temp >> 16);
+            }
+
+            break;
+
+        case 4:
+            while (samcnt--) {
+                *dst++ = (uchar)(temp = *src++);
+                *dst++ = (uchar)(temp >> 8);
+                *dst++ = (uchar)(temp >> 16);
+                *dst++ = (uchar)(temp >> 24);
+            }
+
+            break;
+    }
+
+    return dst;
+}
diff --git a/src_bkp/engine/external/zlib/VERSION.txt b/src_bkp/engine/external/zlib/VERSION.txt
new file mode 100644
index 0000000000..0b1f1edf11
--- /dev/null
+++ b/src_bkp/engine/external/zlib/VERSION.txt
@@ -0,0 +1 @@
+1.2.13
diff --git a/src_bkp/engine/external/zlib/adler32.c b/src_bkp/engine/external/zlib/adler32.c
new file mode 100644
index 0000000000..d0be4380a3
--- /dev/null
+++ b/src_bkp/engine/external/zlib/adler32.c
@@ -0,0 +1,186 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521U     /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_z(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    z_size_t len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/src_bkp/engine/external/zlib/compress.c b/src_bkp/engine/external/zlib/compress.c
new file mode 100644
index 0000000000..2ad5326c14
--- /dev/null
+++ b/src_bkp/engine/external/zlib/compress.c
@@ -0,0 +1,86 @@
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong left;
+
+    left = *destLen;
+    *destLen = 0;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    stream.next_out = dest;
+    stream.avail_out = 0;
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+            sourceLen -= stream.avail_in;
+        }
+        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
+    } while (err == Z_OK);
+
+    *destLen = stream.total_out;
+    deflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK : err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound(sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
+}
diff --git a/src_bkp/engine/external/zlib/crc32.c b/src_bkp/engine/external/zlib/crc32.c
new file mode 100644
index 0000000000..f8357b083f
--- /dev/null
+++ b/src_bkp/engine/external/zlib/crc32.c
@@ -0,0 +1,1125 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * This interleaved implementation of a CRC makes use of pipelined multiple
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  MAKECRCH can be #defined to write out crc32.h. A main() routine is also
+  produced, so that this one source file can be compiled to an executable.
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
+
+ /*
+  A CRC of a message is computed on N braids of words in the message, where
+  each word consists of W bytes (4 or 8). If N is 3, for example, then three
+  running sparse CRCs are calculated respectively on each braid, at these
+  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
+  This is done starting at a word boundary, and continues until as many blocks
+  of N * W bytes as are available have been processed. The results are combined
+  into a single CRC at the end. For this code, N must be in the range 1..6 and
+  W must be 4 or 8. The upper limit on N can be increased if desired by adding
+  more #if blocks, extending the patterns apparent in the code. In addition,
+  crc32.h would need to be regenerated, if the maximum N value is increased.
+
+  N and W are chosen empirically by benchmarking the execution time on a given
+  processor. The choices for N and W below were based on testing on Intel Kaby
+  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
+  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
+  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
+  They were all tested with either gcc or clang, all using the -O3 optimization
+  level. Your mileage may vary.
+ */
+
+/* Define N */
+#ifdef Z_TESTN
+#  define N Z_TESTN
+#else
+#  define N 5
+#endif
+#if N < 1 || N > 6
+#  error N must be in 1..6
+#endif
+
+/*
+  z_crc_t must be at least 32 bits. z_word_t must be at least as long as
+  z_crc_t. It is assumed here that z_word_t is either 32 bits or 64 bits, and
+  that bytes are eight bits.
+ */
+
+/*
+  Define W and the associated z_word_t type. If W is not defined, then a
+  braided calculation is not used, and the associated tables and code are not
+  compiled.
+ */
+#ifdef Z_TESTW
+#  if Z_TESTW-1 != -1
+#    define W Z_TESTW
+#  endif
+#else
+#  ifdef MAKECRCH
+#    define W 8         /* required for MAKECRCH */
+#  else
+#    if defined(__x86_64__) || defined(__aarch64__)
+#      define W 8
+#    else
+#      define W 4
+#    endif
+#  endif
+#endif
+#ifdef W
+#  if W == 8 && defined(Z_U8)
+     typedef Z_U8 z_word_t;
+#  elif defined(Z_U4)
+#    undef W
+#    define W 4
+     typedef Z_U4 z_word_t;
+#  else
+#    undef W
+#  endif
+#endif
+
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#  define ARMCRC32
+#endif
+
+/* Local functions. */
+local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
+local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
+
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+    local z_word_t byte_swap OF((z_word_t word));
+#endif
+
+#if defined(W) && !defined(ARMCRC32)
+    local z_crc_t crc_word OF((z_word_t data));
+    local z_word_t crc_word_big OF((z_word_t data));
+#endif
+
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+/*
+  Swap the bytes in a z_word_t to convert between little and big endian. Any
+  self-respecting compiler will optimize this to a single machine byte-swap
+  instruction, if one is available. This assumes that word_t is either 32 bits
+  or 64 bits.
+ */
+local z_word_t byte_swap(word)
+    z_word_t word;
+{
+#  if W == 8
+    return
+        (word & 0xff00000000000000) >> 56 |
+        (word & 0xff000000000000) >> 40 |
+        (word & 0xff0000000000) >> 24 |
+        (word & 0xff00000000) >> 8 |
+        (word & 0xff000000) << 8 |
+        (word & 0xff0000) << 24 |
+        (word & 0xff00) << 40 |
+        (word & 0xff) << 56;
+#  else   /* W == 4 */
+    return
+        (word & 0xff000000) >> 24 |
+        (word & 0xff0000) >> 8 |
+        (word & 0xff00) << 8 |
+        (word & 0xff) << 24;
+#  endif
+}
+#endif
+
+/* CRC polynomial. */
+#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local z_crc_t FAR crc_table[256];
+local z_crc_t FAR x2n_table[32];
+local void make_crc_table OF((void));
+#ifdef W
+   local z_word_t FAR crc_big_table[256];
+   local z_crc_t FAR crc_braid_table[W][256];
+   local z_word_t FAR crc_braid_big_table[W][256];
+   local void braid OF((z_crc_t [][256], z_word_t [][256], int, int));
+#endif
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const z_crc_t FAR *, int));
+   local void write_table32hi OF((FILE *, const z_word_t FAR *, int));
+   local void write_table64 OF((FILE *, const z_word_t FAR *, int));
+#endif /* MAKECRCH */
+
+/*
+  Define a once() function depending on the availability of atomics. If this is
+  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
+  multiple threads, and if atomics are not available, then get_crc_table() must
+  be called to initialize the tables and must return before any threads are
+  allowed to compute or combine CRCs.
+ */
+
+/* Definition of once functionality. */
+typedef struct once_s once_t;
+local void once OF((once_t *, void (*)(void)));
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    atomic_flag begun;
+    atomic_int done;
+};
+#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  ONCE_INIT.
+ */
+local void once(state, init)
+    once_t *state;
+    void (*init)(void);
+{
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    volatile int begun;
+    volatile int done;
+};
+#define ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to minimize the period of
+   vulnerability. */
+local int test_and_set OF((int volatile *));
+local int test_and_set(flag)
+    int volatile *flag;
+{
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void once(state, init)
+    once_t *state;
+    void (*init)(void);
+{
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif
+
+/* State for once(). */
+local once_t made = ONCE_INIT;
+
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit. Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one. If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder. The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
+  (which is shifting right by one and adding x^32 mod p if the bit shifted out
+  is a one). We start with the highest power (least significant bit) of q and
+  repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values. This is all the
+  information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+ */
+
+local void make_crc_table()
+{
+    unsigned i, j, n;
+    z_crc_t p;
+
+    /* initialize the CRC of bytes tables */
+    for (i = 0; i < 256; i++) {
+        p = i;
+        for (j = 0; j < 8; j++)
+            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
+        crc_table[i] = p;
+#ifdef W
+        crc_big_table[i] = byte_swap(p);
+#endif
+    }
+
+    /* initialize the x^2^n mod p(x) table */
+    p = (z_crc_t)1 << 30;         /* x^1 */
+    x2n_table[0] = p;
+    for (n = 1; n < 32; n++)
+        x2n_table[n] = p = multmodp(p, p);
+
+#ifdef W
+    /* initialize the braiding tables -- needs x2n_table[] */
+    braid(crc_braid_table, crc_braid_big_table, N, W);
+#endif
+
+#ifdef MAKECRCH
+    {
+        /*
+          The crc32.h header file contains tables for both 32-bit and 64-bit
+          z_word_t's, and so requires a 64-bit type be available. In that case,
+          z_word_t must be defined to be 64-bits. This code then also generates
+          and writes out the tables for the case that z_word_t is 32 bits.
+         */
+#if !defined(W) || W != 8
+#  error Need a 64-bit integer type in order to generate crc32.h.
+#endif
+        FILE *out;
+        int k, n;
+        z_crc_t ltl[8][256];
+        z_word_t big[8][256];
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+
+        /* write out little-endian CRC table to crc32.h */
+        fprintf(out,
+            "/* crc32.h -- tables for rapid CRC calculation\n"
+            " * Generated automatically by crc32.c\n */\n"
+            "\n"
+            "local const z_crc_t FAR crc_table[] = {\n"
+            "    ");
+        write_table(out, crc_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 64-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#ifdef W\n"
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table64(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 32-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table32hi(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n");
+
+        /* write out braid tables for each value of N */
+        for (n = 1; n <= 6; n++) {
+            fprintf(out,
+            "\n"
+            "#if N == %d\n", n);
+
+            /* compute braid tables for this N and 64-bit word_t */
+            braid(ltl, big, n, 8);
+
+            /* write out braid tables for 64-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table64(out, big[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n");
+
+            /* compute braid tables for this N and 32-bit word_t */
+            braid(ltl, big, n, 4);
+
+            /* write out braid tables for 32-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table32hi(out, big[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n"
+            "\n"
+            "#endif\n");
+        }
+        fprintf(out,
+            "\n"
+            "#endif\n");
+
+        /* write out zeros operator table to crc32.h */
+        fprintf(out,
+            "\n"
+            "local const z_crc_t FAR x2n_table[] = {\n"
+            "    ");
+        write_table(out, x2n_table, 32);
+        fprintf(out,
+            "};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+local void write_table(out, table, k)
+    FILE *out;
+    const z_crc_t FAR *table;
+    int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+   Write the high 32-bits of each value in table[0..k-1] to out, five per line
+   in hexadecimal separated by commas.
+ */
+local void write_table32hi(out, table, k)
+FILE *out;
+const z_word_t FAR *table;
+int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n] >> 32),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+  Write the 64-bit values in table[0..k-1] to out, three per line in
+  hexadecimal separated by commas. This assumes that if there is a 64-bit
+  type, then there is also a long long integer type, and it is at least 64
+  bits. If not, then the type cast and format string can be adjusted
+  accordingly.
+ */
+local void write_table64(out, table, k)
+    FILE *out;
+    const z_word_t FAR *table;
+    int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : "    ",
+                (unsigned long long)(table[n]),
+                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
+}
+
+/* Actually do the deed. */
+int main()
+{
+    make_crc_table();
+    return 0;
+}
+
+#endif /* MAKECRCH */
+
+#ifdef W
+/*
+  Generate the little and big-endian braid tables for the given n and z_word_t
+  size w. Each array must have room for w blocks of 256 elements.
+ */
+local void braid(ltl, big, n, w)
+    z_crc_t ltl[][256];
+    z_word_t big[][256];
+    int n;
+    int w;
+{
+    int k;
+    z_crc_t i, p, q;
+    for (k = 0; k < w; k++) {
+        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        ltl[k][0] = 0;
+        big[w - 1 - k][0] = 0;
+        for (i = 1; i < 256; i++) {
+            ltl[k][i] = q = multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* ========================================================================
+ * Routines used for CRC calculation. Some are also required for the table
+ * generation above.
+ */
+
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+local z_crc_t multmodp(a, b)
+    z_crc_t a;
+    z_crc_t b;
+{
+    z_crc_t m, p;
+
+    m = (z_crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
+
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+local z_crc_t x2nmodp(n, k)
+    z_off64_t n;
+    unsigned k;
+{
+    z_crc_t p;
+
+    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32(), and to force the
+ * generation of the CRC tables in a threaded application.
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const z_crc_t FAR *)crc_table;
+}
+
+/* =========================================================================
+ * Use ARM machine instructions if available. This will compute the CRC about
+ * ten times faster than the braided calculation. This code does not check for
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
+ * only be defined if the compilation specifies an ARM processor architecture
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
+ * instructions.
+ */
+#ifdef ARMCRC32
+
+/*
+   Constants empirically determined to maximize speed. These values are from
+   measurements on a Cortex-A57. Your mileage may vary.
+ */
+#define Z_BATCH 3990                /* number of words in a batch */
+#define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
+#define Z_BATCH_MIN 800             /* fewest words in a final batch */
+
+unsigned long ZEXPORT crc32_z(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    z_crc_t val;
+    z_word_t crc1, crc2;
+    const z_word_t *word;
+    z_word_t val0, val1, val2;
+    z_size_t last, last2, i;
+    z_size_t num;
+
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+    /* Compute the CRC up to a word boundary. */
+    while (len && ((z_size_t)buf & 7) != 0) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
+    word = (z_word_t const *)buf;
+    num = len >> 3;
+    len &= 7;
+
+    /* Do three interleaved CRCs to realize the throughput of one crc32x
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
+    while (num >= 3 * Z_BATCH) {
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < Z_BATCH; i++) {
+            val0 = word[i];
+            val1 = word[i + Z_BATCH];
+            val2 = word[i + 2 * Z_BATCH];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * Z_BATCH;
+        num -= 3 * Z_BATCH;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
+    }
+
+    /* Do one last smaller batch with the remaining words, if there are enough
+       to pay for the combination of CRCs. */
+    last = num / 3;
+    if (last >= Z_BATCH_MIN) {
+        last2 = last << 1;
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < last; i++) {
+            val0 = word[i];
+            val1 = word[i + last];
+            val2 = word[i + last2];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * last;
+        num -= 3 * last;
+        val = x2nmodp(last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
+
+    /* Compute the CRC on any remaining words. */
+    for (i = 0; i < num; i++) {
+        val0 = word[i];
+        __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+    }
+    word += num;
+
+    /* Complete the CRC on any remaining bytes. */
+    buf = (const unsigned char FAR *)word;
+    while (len) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#else
+
+#ifdef W
+
+/*
+  Return the CRC of the W bytes in the word_t data, taking the
+  least-significant byte of the word as the first byte of data, without any pre
+  or post conditioning. This is used to combine the CRCs of each braid.
+ */
+local z_crc_t crc_word(data)
+    z_word_t data;
+{
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (z_crc_t)data;
+}
+
+local z_word_t crc_word_big(data)
+    z_word_t data;
+{
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data << 8) ^
+            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
+    return data;
+}
+
+#endif
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32_z(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+#ifdef W
+
+    /* If provided enough bytes, do a braided CRC calculation. */
+    if (len >= N * W + W - 1) {
+        z_size_t blks;
+        z_word_t const *words;
+        unsigned endian;
+        int k;
+
+        /* Compute the CRC up to a z_word_t boundary. */
+        while (len && ((z_size_t)buf & (W - 1)) != 0) {
+            len--;
+            crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        }
+
+        /* Compute the CRC on as many N z_word_t blocks as are available. */
+        blks = len / (N * W);
+        len -= blks * N * W;
+        words = (z_word_t const *)buf;
+
+        /* Do endian check at execution time instead of compile time, since ARM
+           processors can change the endianess at execution time. If the
+           compiler knows what the endianess will be, it can optimize out the
+           check and the unused branch. */
+        endian = 1;
+        if (*(unsigned char *)&endian) {
+            /* Little endian. */
+
+            z_crc_t crc0;
+            z_word_t word0;
+#if N > 1
+            z_crc_t crc1;
+            z_word_t word1;
+#if N > 2
+            z_crc_t crc2;
+            z_word_t word2;
+#if N > 3
+            z_crc_t crc3;
+            z_word_t word3;
+#if N > 4
+            z_crc_t crc4;
+            z_word_t word4;
+#if N > 5
+            z_crc_t crc5;
+            z_word_t word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = crc;
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            crc = crc_word(crc0 ^ words[0]);
+#if N > 1
+            crc = crc_word(crc1 ^ words[1] ^ crc);
+#if N > 2
+            crc = crc_word(crc2 ^ words[2] ^ crc);
+#if N > 3
+            crc = crc_word(crc3 ^ words[3] ^ crc);
+#if N > 4
+            crc = crc_word(crc4 ^ words[4] ^ crc);
+#if N > 5
+            crc = crc_word(crc5 ^ words[5] ^ crc);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+        }
+        else {
+            /* Big endian. */
+
+            z_word_t crc0, word0, comb;
+#if N > 1
+            z_word_t crc1, word1;
+#if N > 2
+            z_word_t crc2, word2;
+#if N > 3
+            z_word_t crc3, word3;
+#if N > 4
+            z_word_t crc4, word4;
+#if N > 5
+            z_word_t crc5, word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = byte_swap(crc);
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_big_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_big_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_big_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_big_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_big_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_big_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            comb = crc_word_big(crc0 ^ words[0]);
+#if N > 1
+            comb = crc_word_big(crc1 ^ words[1] ^ comb);
+#if N > 2
+            comb = crc_word_big(crc2 ^ words[2] ^ comb);
+#if N > 3
+            comb = crc_word_big(crc3 ^ words[3] ^ comb);
+#if N > 4
+            comb = crc_word_big(crc4 ^ words[4] ^ comb);
+#if N > 5
+            comb = crc_word_big(crc5 ^ words[5] ^ comb);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+            crc = byte_swap(comb);
+        }
+
+        /*
+          Update the pointer to the remaining bytes to process.
+         */
+        buf = (unsigned char const *)words;
+    }
+
+#endif /* W */
+
+    /* Complete the computation of the CRC on any remaining bytes. */
+    while (len >= 8) {
+        len -= 8;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#endif
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    return crc32_z(crc, buf, len);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen64(len2)
+    z_off64_t len2;
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return x2nmodp(len2, 3);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen(len2)
+    z_off_t len2;
+{
+    return crc32_combine_gen64((z_off64_t)len2);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
+    uLong crc1;
+    uLong crc2;
+    uLong op;
+{
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+}
diff --git a/src_bkp/engine/external/zlib/crc32.h b/src_bkp/engine/external/zlib/crc32.h
new file mode 100644
index 0000000000..137df68d61
--- /dev/null
+++ b/src_bkp/engine/external/zlib/crc32.h
@@ -0,0 +1,9446 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d};
+
+#ifdef W
+
+#if W == 8
+
+local const z_word_t FAR crc_big_table[] = {
+    0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000};
+
+#else /* W == 4 */
+
+local const z_word_t FAR crc_big_table[] = {
+    0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d};
+
+#endif
+
+#if N == 1
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c},
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000},
+   {0x0000000000000000, 0x41311b1900000000, 0x8262363200000000,
+    0xc3532d2b00000000, 0x04c56c6400000000, 0x45f4777d00000000,
+    0x86a75a5600000000, 0xc796414f00000000, 0x088ad9c800000000,
+    0x49bbc2d100000000, 0x8ae8effa00000000, 0xcbd9f4e300000000,
+    0x0c4fb5ac00000000, 0x4d7eaeb500000000, 0x8e2d839e00000000,
+    0xcf1c988700000000, 0x5112c24a00000000, 0x1023d95300000000,
+    0xd370f47800000000, 0x9241ef6100000000, 0x55d7ae2e00000000,
+    0x14e6b53700000000, 0xd7b5981c00000000, 0x9684830500000000,
+    0x59981b8200000000, 0x18a9009b00000000, 0xdbfa2db000000000,
+    0x9acb36a900000000, 0x5d5d77e600000000, 0x1c6c6cff00000000,
+    0xdf3f41d400000000, 0x9e0e5acd00000000, 0xa224849500000000,
+    0xe3159f8c00000000, 0x2046b2a700000000, 0x6177a9be00000000,
+    0xa6e1e8f100000000, 0xe7d0f3e800000000, 0x2483dec300000000,
+    0x65b2c5da00000000, 0xaaae5d5d00000000, 0xeb9f464400000000,
+    0x28cc6b6f00000000, 0x69fd707600000000, 0xae6b313900000000,
+    0xef5a2a2000000000, 0x2c09070b00000000, 0x6d381c1200000000,
+    0xf33646df00000000, 0xb2075dc600000000, 0x715470ed00000000,
+    0x30656bf400000000, 0xf7f32abb00000000, 0xb6c231a200000000,
+    0x75911c8900000000, 0x34a0079000000000, 0xfbbc9f1700000000,
+    0xba8d840e00000000, 0x79dea92500000000, 0x38efb23c00000000,
+    0xff79f37300000000, 0xbe48e86a00000000, 0x7d1bc54100000000,
+    0x3c2ade5800000000, 0x054f79f000000000, 0x447e62e900000000,
+    0x872d4fc200000000, 0xc61c54db00000000, 0x018a159400000000,
+    0x40bb0e8d00000000, 0x83e823a600000000, 0xc2d938bf00000000,
+    0x0dc5a03800000000, 0x4cf4bb2100000000, 0x8fa7960a00000000,
+    0xce968d1300000000, 0x0900cc5c00000000, 0x4831d74500000000,
+    0x8b62fa6e00000000, 0xca53e17700000000, 0x545dbbba00000000,
+    0x156ca0a300000000, 0xd63f8d8800000000, 0x970e969100000000,
+    0x5098d7de00000000, 0x11a9ccc700000000, 0xd2fae1ec00000000,
+    0x93cbfaf500000000, 0x5cd7627200000000, 0x1de6796b00000000,
+    0xdeb5544000000000, 0x9f844f5900000000, 0x58120e1600000000,
+    0x1923150f00000000, 0xda70382400000000, 0x9b41233d00000000,
+    0xa76bfd6500000000, 0xe65ae67c00000000, 0x2509cb5700000000,
+    0x6438d04e00000000, 0xa3ae910100000000, 0xe29f8a1800000000,
+    0x21cca73300000000, 0x60fdbc2a00000000, 0xafe124ad00000000,
+    0xeed03fb400000000, 0x2d83129f00000000, 0x6cb2098600000000,
+    0xab2448c900000000, 0xea1553d000000000, 0x29467efb00000000,
+    0x687765e200000000, 0xf6793f2f00000000, 0xb748243600000000,
+    0x741b091d00000000, 0x352a120400000000, 0xf2bc534b00000000,
+    0xb38d485200000000, 0x70de657900000000, 0x31ef7e6000000000,
+    0xfef3e6e700000000, 0xbfc2fdfe00000000, 0x7c91d0d500000000,
+    0x3da0cbcc00000000, 0xfa368a8300000000, 0xbb07919a00000000,
+    0x7854bcb100000000, 0x3965a7a800000000, 0x4b98833b00000000,
+    0x0aa9982200000000, 0xc9fab50900000000, 0x88cbae1000000000,
+    0x4f5def5f00000000, 0x0e6cf44600000000, 0xcd3fd96d00000000,
+    0x8c0ec27400000000, 0x43125af300000000, 0x022341ea00000000,
+    0xc1706cc100000000, 0x804177d800000000, 0x47d7369700000000,
+    0x06e62d8e00000000, 0xc5b500a500000000, 0x84841bbc00000000,
+    0x1a8a417100000000, 0x5bbb5a6800000000, 0x98e8774300000000,
+    0xd9d96c5a00000000, 0x1e4f2d1500000000, 0x5f7e360c00000000,
+    0x9c2d1b2700000000, 0xdd1c003e00000000, 0x120098b900000000,
+    0x533183a000000000, 0x9062ae8b00000000, 0xd153b59200000000,
+    0x16c5f4dd00000000, 0x57f4efc400000000, 0x94a7c2ef00000000,
+    0xd596d9f600000000, 0xe9bc07ae00000000, 0xa88d1cb700000000,
+    0x6bde319c00000000, 0x2aef2a8500000000, 0xed796bca00000000,
+    0xac4870d300000000, 0x6f1b5df800000000, 0x2e2a46e100000000,
+    0xe136de6600000000, 0xa007c57f00000000, 0x6354e85400000000,
+    0x2265f34d00000000, 0xe5f3b20200000000, 0xa4c2a91b00000000,
+    0x6791843000000000, 0x26a09f2900000000, 0xb8aec5e400000000,
+    0xf99fdefd00000000, 0x3accf3d600000000, 0x7bfde8cf00000000,
+    0xbc6ba98000000000, 0xfd5ab29900000000, 0x3e099fb200000000,
+    0x7f3884ab00000000, 0xb0241c2c00000000, 0xf115073500000000,
+    0x32462a1e00000000, 0x7377310700000000, 0xb4e1704800000000,
+    0xf5d06b5100000000, 0x3683467a00000000, 0x77b25d6300000000,
+    0x4ed7facb00000000, 0x0fe6e1d200000000, 0xccb5ccf900000000,
+    0x8d84d7e000000000, 0x4a1296af00000000, 0x0b238db600000000,
+    0xc870a09d00000000, 0x8941bb8400000000, 0x465d230300000000,
+    0x076c381a00000000, 0xc43f153100000000, 0x850e0e2800000000,
+    0x42984f6700000000, 0x03a9547e00000000, 0xc0fa795500000000,
+    0x81cb624c00000000, 0x1fc5388100000000, 0x5ef4239800000000,
+    0x9da70eb300000000, 0xdc9615aa00000000, 0x1b0054e500000000,
+    0x5a314ffc00000000, 0x996262d700000000, 0xd85379ce00000000,
+    0x174fe14900000000, 0x567efa5000000000, 0x952dd77b00000000,
+    0xd41ccc6200000000, 0x138a8d2d00000000, 0x52bb963400000000,
+    0x91e8bb1f00000000, 0xd0d9a00600000000, 0xecf37e5e00000000,
+    0xadc2654700000000, 0x6e91486c00000000, 0x2fa0537500000000,
+    0xe836123a00000000, 0xa907092300000000, 0x6a54240800000000,
+    0x2b653f1100000000, 0xe479a79600000000, 0xa548bc8f00000000,
+    0x661b91a400000000, 0x272a8abd00000000, 0xe0bccbf200000000,
+    0xa18dd0eb00000000, 0x62defdc000000000, 0x23efe6d900000000,
+    0xbde1bc1400000000, 0xfcd0a70d00000000, 0x3f838a2600000000,
+    0x7eb2913f00000000, 0xb924d07000000000, 0xf815cb6900000000,
+    0x3b46e64200000000, 0x7a77fd5b00000000, 0xb56b65dc00000000,
+    0xf45a7ec500000000, 0x370953ee00000000, 0x763848f700000000,
+    0xb1ae09b800000000, 0xf09f12a100000000, 0x33cc3f8a00000000,
+    0x72fd249300000000},
+   {0x0000000000000000, 0x376ac20100000000, 0x6ed4840300000000,
+    0x59be460200000000, 0xdca8090700000000, 0xebc2cb0600000000,
+    0xb27c8d0400000000, 0x85164f0500000000, 0xb851130e00000000,
+    0x8f3bd10f00000000, 0xd685970d00000000, 0xe1ef550c00000000,
+    0x64f91a0900000000, 0x5393d80800000000, 0x0a2d9e0a00000000,
+    0x3d475c0b00000000, 0x70a3261c00000000, 0x47c9e41d00000000,
+    0x1e77a21f00000000, 0x291d601e00000000, 0xac0b2f1b00000000,
+    0x9b61ed1a00000000, 0xc2dfab1800000000, 0xf5b5691900000000,
+    0xc8f2351200000000, 0xff98f71300000000, 0xa626b11100000000,
+    0x914c731000000000, 0x145a3c1500000000, 0x2330fe1400000000,
+    0x7a8eb81600000000, 0x4de47a1700000000, 0xe0464d3800000000,
+    0xd72c8f3900000000, 0x8e92c93b00000000, 0xb9f80b3a00000000,
+    0x3cee443f00000000, 0x0b84863e00000000, 0x523ac03c00000000,
+    0x6550023d00000000, 0x58175e3600000000, 0x6f7d9c3700000000,
+    0x36c3da3500000000, 0x01a9183400000000, 0x84bf573100000000,
+    0xb3d5953000000000, 0xea6bd33200000000, 0xdd01113300000000,
+    0x90e56b2400000000, 0xa78fa92500000000, 0xfe31ef2700000000,
+    0xc95b2d2600000000, 0x4c4d622300000000, 0x7b27a02200000000,
+    0x2299e62000000000, 0x15f3242100000000, 0x28b4782a00000000,
+    0x1fdeba2b00000000, 0x4660fc2900000000, 0x710a3e2800000000,
+    0xf41c712d00000000, 0xc376b32c00000000, 0x9ac8f52e00000000,
+    0xada2372f00000000, 0xc08d9a7000000000, 0xf7e7587100000000,
+    0xae591e7300000000, 0x9933dc7200000000, 0x1c25937700000000,
+    0x2b4f517600000000, 0x72f1177400000000, 0x459bd57500000000,
+    0x78dc897e00000000, 0x4fb64b7f00000000, 0x16080d7d00000000,
+    0x2162cf7c00000000, 0xa474807900000000, 0x931e427800000000,
+    0xcaa0047a00000000, 0xfdcac67b00000000, 0xb02ebc6c00000000,
+    0x87447e6d00000000, 0xdefa386f00000000, 0xe990fa6e00000000,
+    0x6c86b56b00000000, 0x5bec776a00000000, 0x0252316800000000,
+    0x3538f36900000000, 0x087faf6200000000, 0x3f156d6300000000,
+    0x66ab2b6100000000, 0x51c1e96000000000, 0xd4d7a66500000000,
+    0xe3bd646400000000, 0xba03226600000000, 0x8d69e06700000000,
+    0x20cbd74800000000, 0x17a1154900000000, 0x4e1f534b00000000,
+    0x7975914a00000000, 0xfc63de4f00000000, 0xcb091c4e00000000,
+    0x92b75a4c00000000, 0xa5dd984d00000000, 0x989ac44600000000,
+    0xaff0064700000000, 0xf64e404500000000, 0xc124824400000000,
+    0x4432cd4100000000, 0x73580f4000000000, 0x2ae6494200000000,
+    0x1d8c8b4300000000, 0x5068f15400000000, 0x6702335500000000,
+    0x3ebc755700000000, 0x09d6b75600000000, 0x8cc0f85300000000,
+    0xbbaa3a5200000000, 0xe2147c5000000000, 0xd57ebe5100000000,
+    0xe839e25a00000000, 0xdf53205b00000000, 0x86ed665900000000,
+    0xb187a45800000000, 0x3491eb5d00000000, 0x03fb295c00000000,
+    0x5a456f5e00000000, 0x6d2fad5f00000000, 0x801b35e100000000,
+    0xb771f7e000000000, 0xeecfb1e200000000, 0xd9a573e300000000,
+    0x5cb33ce600000000, 0x6bd9fee700000000, 0x3267b8e500000000,
+    0x050d7ae400000000, 0x384a26ef00000000, 0x0f20e4ee00000000,
+    0x569ea2ec00000000, 0x61f460ed00000000, 0xe4e22fe800000000,
+    0xd388ede900000000, 0x8a36abeb00000000, 0xbd5c69ea00000000,
+    0xf0b813fd00000000, 0xc7d2d1fc00000000, 0x9e6c97fe00000000,
+    0xa90655ff00000000, 0x2c101afa00000000, 0x1b7ad8fb00000000,
+    0x42c49ef900000000, 0x75ae5cf800000000, 0x48e900f300000000,
+    0x7f83c2f200000000, 0x263d84f000000000, 0x115746f100000000,
+    0x944109f400000000, 0xa32bcbf500000000, 0xfa958df700000000,
+    0xcdff4ff600000000, 0x605d78d900000000, 0x5737bad800000000,
+    0x0e89fcda00000000, 0x39e33edb00000000, 0xbcf571de00000000,
+    0x8b9fb3df00000000, 0xd221f5dd00000000, 0xe54b37dc00000000,
+    0xd80c6bd700000000, 0xef66a9d600000000, 0xb6d8efd400000000,
+    0x81b22dd500000000, 0x04a462d000000000, 0x33cea0d100000000,
+    0x6a70e6d300000000, 0x5d1a24d200000000, 0x10fe5ec500000000,
+    0x27949cc400000000, 0x7e2adac600000000, 0x494018c700000000,
+    0xcc5657c200000000, 0xfb3c95c300000000, 0xa282d3c100000000,
+    0x95e811c000000000, 0xa8af4dcb00000000, 0x9fc58fca00000000,
+    0xc67bc9c800000000, 0xf1110bc900000000, 0x740744cc00000000,
+    0x436d86cd00000000, 0x1ad3c0cf00000000, 0x2db902ce00000000,
+    0x4096af9100000000, 0x77fc6d9000000000, 0x2e422b9200000000,
+    0x1928e99300000000, 0x9c3ea69600000000, 0xab54649700000000,
+    0xf2ea229500000000, 0xc580e09400000000, 0xf8c7bc9f00000000,
+    0xcfad7e9e00000000, 0x9613389c00000000, 0xa179fa9d00000000,
+    0x246fb59800000000, 0x1305779900000000, 0x4abb319b00000000,
+    0x7dd1f39a00000000, 0x3035898d00000000, 0x075f4b8c00000000,
+    0x5ee10d8e00000000, 0x698bcf8f00000000, 0xec9d808a00000000,
+    0xdbf7428b00000000, 0x8249048900000000, 0xb523c68800000000,
+    0x88649a8300000000, 0xbf0e588200000000, 0xe6b01e8000000000,
+    0xd1dadc8100000000, 0x54cc938400000000, 0x63a6518500000000,
+    0x3a18178700000000, 0x0d72d58600000000, 0xa0d0e2a900000000,
+    0x97ba20a800000000, 0xce0466aa00000000, 0xf96ea4ab00000000,
+    0x7c78ebae00000000, 0x4b1229af00000000, 0x12ac6fad00000000,
+    0x25c6adac00000000, 0x1881f1a700000000, 0x2feb33a600000000,
+    0x765575a400000000, 0x413fb7a500000000, 0xc429f8a000000000,
+    0xf3433aa100000000, 0xaafd7ca300000000, 0x9d97bea200000000,
+    0xd073c4b500000000, 0xe71906b400000000, 0xbea740b600000000,
+    0x89cd82b700000000, 0x0cdbcdb200000000, 0x3bb10fb300000000,
+    0x620f49b100000000, 0x55658bb000000000, 0x6822d7bb00000000,
+    0x5f4815ba00000000, 0x06f653b800000000, 0x319c91b900000000,
+    0xb48adebc00000000, 0x83e01cbd00000000, 0xda5e5abf00000000,
+    0xed3498be00000000},
+   {0x0000000000000000, 0x6567bcb800000000, 0x8bc809aa00000000,
+    0xeeafb51200000000, 0x5797628f00000000, 0x32f0de3700000000,
+    0xdc5f6b2500000000, 0xb938d79d00000000, 0xef28b4c500000000,
+    0x8a4f087d00000000, 0x64e0bd6f00000000, 0x018701d700000000,
+    0xb8bfd64a00000000, 0xddd86af200000000, 0x3377dfe000000000,
+    0x5610635800000000, 0x9f57195000000000, 0xfa30a5e800000000,
+    0x149f10fa00000000, 0x71f8ac4200000000, 0xc8c07bdf00000000,
+    0xada7c76700000000, 0x4308727500000000, 0x266fcecd00000000,
+    0x707fad9500000000, 0x1518112d00000000, 0xfbb7a43f00000000,
+    0x9ed0188700000000, 0x27e8cf1a00000000, 0x428f73a200000000,
+    0xac20c6b000000000, 0xc9477a0800000000, 0x3eaf32a000000000,
+    0x5bc88e1800000000, 0xb5673b0a00000000, 0xd00087b200000000,
+    0x6938502f00000000, 0x0c5fec9700000000, 0xe2f0598500000000,
+    0x8797e53d00000000, 0xd187866500000000, 0xb4e03add00000000,
+    0x5a4f8fcf00000000, 0x3f28337700000000, 0x8610e4ea00000000,
+    0xe377585200000000, 0x0dd8ed4000000000, 0x68bf51f800000000,
+    0xa1f82bf000000000, 0xc49f974800000000, 0x2a30225a00000000,
+    0x4f579ee200000000, 0xf66f497f00000000, 0x9308f5c700000000,
+    0x7da740d500000000, 0x18c0fc6d00000000, 0x4ed09f3500000000,
+    0x2bb7238d00000000, 0xc518969f00000000, 0xa07f2a2700000000,
+    0x1947fdba00000000, 0x7c20410200000000, 0x928ff41000000000,
+    0xf7e848a800000000, 0x3d58149b00000000, 0x583fa82300000000,
+    0xb6901d3100000000, 0xd3f7a18900000000, 0x6acf761400000000,
+    0x0fa8caac00000000, 0xe1077fbe00000000, 0x8460c30600000000,
+    0xd270a05e00000000, 0xb7171ce600000000, 0x59b8a9f400000000,
+    0x3cdf154c00000000, 0x85e7c2d100000000, 0xe0807e6900000000,
+    0x0e2fcb7b00000000, 0x6b4877c300000000, 0xa20f0dcb00000000,
+    0xc768b17300000000, 0x29c7046100000000, 0x4ca0b8d900000000,
+    0xf5986f4400000000, 0x90ffd3fc00000000, 0x7e5066ee00000000,
+    0x1b37da5600000000, 0x4d27b90e00000000, 0x284005b600000000,
+    0xc6efb0a400000000, 0xa3880c1c00000000, 0x1ab0db8100000000,
+    0x7fd7673900000000, 0x9178d22b00000000, 0xf41f6e9300000000,
+    0x03f7263b00000000, 0x66909a8300000000, 0x883f2f9100000000,
+    0xed58932900000000, 0x546044b400000000, 0x3107f80c00000000,
+    0xdfa84d1e00000000, 0xbacff1a600000000, 0xecdf92fe00000000,
+    0x89b82e4600000000, 0x67179b5400000000, 0x027027ec00000000,
+    0xbb48f07100000000, 0xde2f4cc900000000, 0x3080f9db00000000,
+    0x55e7456300000000, 0x9ca03f6b00000000, 0xf9c783d300000000,
+    0x176836c100000000, 0x720f8a7900000000, 0xcb375de400000000,
+    0xae50e15c00000000, 0x40ff544e00000000, 0x2598e8f600000000,
+    0x73888bae00000000, 0x16ef371600000000, 0xf840820400000000,
+    0x9d273ebc00000000, 0x241fe92100000000, 0x4178559900000000,
+    0xafd7e08b00000000, 0xcab05c3300000000, 0x3bb659ed00000000,
+    0x5ed1e55500000000, 0xb07e504700000000, 0xd519ecff00000000,
+    0x6c213b6200000000, 0x094687da00000000, 0xe7e932c800000000,
+    0x828e8e7000000000, 0xd49eed2800000000, 0xb1f9519000000000,
+    0x5f56e48200000000, 0x3a31583a00000000, 0x83098fa700000000,
+    0xe66e331f00000000, 0x08c1860d00000000, 0x6da63ab500000000,
+    0xa4e140bd00000000, 0xc186fc0500000000, 0x2f29491700000000,
+    0x4a4ef5af00000000, 0xf376223200000000, 0x96119e8a00000000,
+    0x78be2b9800000000, 0x1dd9972000000000, 0x4bc9f47800000000,
+    0x2eae48c000000000, 0xc001fdd200000000, 0xa566416a00000000,
+    0x1c5e96f700000000, 0x79392a4f00000000, 0x97969f5d00000000,
+    0xf2f123e500000000, 0x05196b4d00000000, 0x607ed7f500000000,
+    0x8ed162e700000000, 0xebb6de5f00000000, 0x528e09c200000000,
+    0x37e9b57a00000000, 0xd946006800000000, 0xbc21bcd000000000,
+    0xea31df8800000000, 0x8f56633000000000, 0x61f9d62200000000,
+    0x049e6a9a00000000, 0xbda6bd0700000000, 0xd8c101bf00000000,
+    0x366eb4ad00000000, 0x5309081500000000, 0x9a4e721d00000000,
+    0xff29cea500000000, 0x11867bb700000000, 0x74e1c70f00000000,
+    0xcdd9109200000000, 0xa8beac2a00000000, 0x4611193800000000,
+    0x2376a58000000000, 0x7566c6d800000000, 0x10017a6000000000,
+    0xfeaecf7200000000, 0x9bc973ca00000000, 0x22f1a45700000000,
+    0x479618ef00000000, 0xa939adfd00000000, 0xcc5e114500000000,
+    0x06ee4d7600000000, 0x6389f1ce00000000, 0x8d2644dc00000000,
+    0xe841f86400000000, 0x51792ff900000000, 0x341e934100000000,
+    0xdab1265300000000, 0xbfd69aeb00000000, 0xe9c6f9b300000000,
+    0x8ca1450b00000000, 0x620ef01900000000, 0x07694ca100000000,
+    0xbe519b3c00000000, 0xdb36278400000000, 0x3599929600000000,
+    0x50fe2e2e00000000, 0x99b9542600000000, 0xfcdee89e00000000,
+    0x12715d8c00000000, 0x7716e13400000000, 0xce2e36a900000000,
+    0xab498a1100000000, 0x45e63f0300000000, 0x208183bb00000000,
+    0x7691e0e300000000, 0x13f65c5b00000000, 0xfd59e94900000000,
+    0x983e55f100000000, 0x2106826c00000000, 0x44613ed400000000,
+    0xaace8bc600000000, 0xcfa9377e00000000, 0x38417fd600000000,
+    0x5d26c36e00000000, 0xb389767c00000000, 0xd6eecac400000000,
+    0x6fd61d5900000000, 0x0ab1a1e100000000, 0xe41e14f300000000,
+    0x8179a84b00000000, 0xd769cb1300000000, 0xb20e77ab00000000,
+    0x5ca1c2b900000000, 0x39c67e0100000000, 0x80fea99c00000000,
+    0xe599152400000000, 0x0b36a03600000000, 0x6e511c8e00000000,
+    0xa716668600000000, 0xc271da3e00000000, 0x2cde6f2c00000000,
+    0x49b9d39400000000, 0xf081040900000000, 0x95e6b8b100000000,
+    0x7b490da300000000, 0x1e2eb11b00000000, 0x483ed24300000000,
+    0x2d596efb00000000, 0xc3f6dbe900000000, 0xa691675100000000,
+    0x1fa9b0cc00000000, 0x7ace0c7400000000, 0x9461b96600000000,
+    0xf10605de00000000},
+   {0x0000000000000000, 0xb029603d00000000, 0x6053c07a00000000,
+    0xd07aa04700000000, 0xc0a680f500000000, 0x708fe0c800000000,
+    0xa0f5408f00000000, 0x10dc20b200000000, 0xc14b703000000000,
+    0x7162100d00000000, 0xa118b04a00000000, 0x1131d07700000000,
+    0x01edf0c500000000, 0xb1c490f800000000, 0x61be30bf00000000,
+    0xd197508200000000, 0x8297e06000000000, 0x32be805d00000000,
+    0xe2c4201a00000000, 0x52ed402700000000, 0x4231609500000000,
+    0xf21800a800000000, 0x2262a0ef00000000, 0x924bc0d200000000,
+    0x43dc905000000000, 0xf3f5f06d00000000, 0x238f502a00000000,
+    0x93a6301700000000, 0x837a10a500000000, 0x3353709800000000,
+    0xe329d0df00000000, 0x5300b0e200000000, 0x042fc1c100000000,
+    0xb406a1fc00000000, 0x647c01bb00000000, 0xd455618600000000,
+    0xc489413400000000, 0x74a0210900000000, 0xa4da814e00000000,
+    0x14f3e17300000000, 0xc564b1f100000000, 0x754dd1cc00000000,
+    0xa537718b00000000, 0x151e11b600000000, 0x05c2310400000000,
+    0xb5eb513900000000, 0x6591f17e00000000, 0xd5b8914300000000,
+    0x86b821a100000000, 0x3691419c00000000, 0xe6ebe1db00000000,
+    0x56c281e600000000, 0x461ea15400000000, 0xf637c16900000000,
+    0x264d612e00000000, 0x9664011300000000, 0x47f3519100000000,
+    0xf7da31ac00000000, 0x27a091eb00000000, 0x9789f1d600000000,
+    0x8755d16400000000, 0x377cb15900000000, 0xe706111e00000000,
+    0x572f712300000000, 0x4958f35800000000, 0xf971936500000000,
+    0x290b332200000000, 0x9922531f00000000, 0x89fe73ad00000000,
+    0x39d7139000000000, 0xe9adb3d700000000, 0x5984d3ea00000000,
+    0x8813836800000000, 0x383ae35500000000, 0xe840431200000000,
+    0x5869232f00000000, 0x48b5039d00000000, 0xf89c63a000000000,
+    0x28e6c3e700000000, 0x98cfa3da00000000, 0xcbcf133800000000,
+    0x7be6730500000000, 0xab9cd34200000000, 0x1bb5b37f00000000,
+    0x0b6993cd00000000, 0xbb40f3f000000000, 0x6b3a53b700000000,
+    0xdb13338a00000000, 0x0a84630800000000, 0xbaad033500000000,
+    0x6ad7a37200000000, 0xdafec34f00000000, 0xca22e3fd00000000,
+    0x7a0b83c000000000, 0xaa71238700000000, 0x1a5843ba00000000,
+    0x4d77329900000000, 0xfd5e52a400000000, 0x2d24f2e300000000,
+    0x9d0d92de00000000, 0x8dd1b26c00000000, 0x3df8d25100000000,
+    0xed82721600000000, 0x5dab122b00000000, 0x8c3c42a900000000,
+    0x3c15229400000000, 0xec6f82d300000000, 0x5c46e2ee00000000,
+    0x4c9ac25c00000000, 0xfcb3a26100000000, 0x2cc9022600000000,
+    0x9ce0621b00000000, 0xcfe0d2f900000000, 0x7fc9b2c400000000,
+    0xafb3128300000000, 0x1f9a72be00000000, 0x0f46520c00000000,
+    0xbf6f323100000000, 0x6f15927600000000, 0xdf3cf24b00000000,
+    0x0eaba2c900000000, 0xbe82c2f400000000, 0x6ef862b300000000,
+    0xded1028e00000000, 0xce0d223c00000000, 0x7e24420100000000,
+    0xae5ee24600000000, 0x1e77827b00000000, 0x92b0e6b100000000,
+    0x2299868c00000000, 0xf2e326cb00000000, 0x42ca46f600000000,
+    0x5216664400000000, 0xe23f067900000000, 0x3245a63e00000000,
+    0x826cc60300000000, 0x53fb968100000000, 0xe3d2f6bc00000000,
+    0x33a856fb00000000, 0x838136c600000000, 0x935d167400000000,
+    0x2374764900000000, 0xf30ed60e00000000, 0x4327b63300000000,
+    0x102706d100000000, 0xa00e66ec00000000, 0x7074c6ab00000000,
+    0xc05da69600000000, 0xd081862400000000, 0x60a8e61900000000,
+    0xb0d2465e00000000, 0x00fb266300000000, 0xd16c76e100000000,
+    0x614516dc00000000, 0xb13fb69b00000000, 0x0116d6a600000000,
+    0x11caf61400000000, 0xa1e3962900000000, 0x7199366e00000000,
+    0xc1b0565300000000, 0x969f277000000000, 0x26b6474d00000000,
+    0xf6cce70a00000000, 0x46e5873700000000, 0x5639a78500000000,
+    0xe610c7b800000000, 0x366a67ff00000000, 0x864307c200000000,
+    0x57d4574000000000, 0xe7fd377d00000000, 0x3787973a00000000,
+    0x87aef70700000000, 0x9772d7b500000000, 0x275bb78800000000,
+    0xf72117cf00000000, 0x470877f200000000, 0x1408c71000000000,
+    0xa421a72d00000000, 0x745b076a00000000, 0xc472675700000000,
+    0xd4ae47e500000000, 0x648727d800000000, 0xb4fd879f00000000,
+    0x04d4e7a200000000, 0xd543b72000000000, 0x656ad71d00000000,
+    0xb510775a00000000, 0x0539176700000000, 0x15e537d500000000,
+    0xa5cc57e800000000, 0x75b6f7af00000000, 0xc59f979200000000,
+    0xdbe815e900000000, 0x6bc175d400000000, 0xbbbbd59300000000,
+    0x0b92b5ae00000000, 0x1b4e951c00000000, 0xab67f52100000000,
+    0x7b1d556600000000, 0xcb34355b00000000, 0x1aa365d900000000,
+    0xaa8a05e400000000, 0x7af0a5a300000000, 0xcad9c59e00000000,
+    0xda05e52c00000000, 0x6a2c851100000000, 0xba56255600000000,
+    0x0a7f456b00000000, 0x597ff58900000000, 0xe95695b400000000,
+    0x392c35f300000000, 0x890555ce00000000, 0x99d9757c00000000,
+    0x29f0154100000000, 0xf98ab50600000000, 0x49a3d53b00000000,
+    0x983485b900000000, 0x281de58400000000, 0xf86745c300000000,
+    0x484e25fe00000000, 0x5892054c00000000, 0xe8bb657100000000,
+    0x38c1c53600000000, 0x88e8a50b00000000, 0xdfc7d42800000000,
+    0x6feeb41500000000, 0xbf94145200000000, 0x0fbd746f00000000,
+    0x1f6154dd00000000, 0xaf4834e000000000, 0x7f3294a700000000,
+    0xcf1bf49a00000000, 0x1e8ca41800000000, 0xaea5c42500000000,
+    0x7edf646200000000, 0xcef6045f00000000, 0xde2a24ed00000000,
+    0x6e0344d000000000, 0xbe79e49700000000, 0x0e5084aa00000000,
+    0x5d50344800000000, 0xed79547500000000, 0x3d03f43200000000,
+    0x8d2a940f00000000, 0x9df6b4bd00000000, 0x2ddfd48000000000,
+    0xfda574c700000000, 0x4d8c14fa00000000, 0x9c1b447800000000,
+    0x2c32244500000000, 0xfc48840200000000, 0x4c61e43f00000000,
+    0x5cbdc48d00000000, 0xec94a4b000000000, 0x3cee04f700000000,
+    0x8cc764ca00000000},
+   {0x0000000000000000, 0xa5d35ccb00000000, 0x0ba1c84d00000000,
+    0xae72948600000000, 0x1642919b00000000, 0xb391cd5000000000,
+    0x1de359d600000000, 0xb830051d00000000, 0x6d8253ec00000000,
+    0xc8510f2700000000, 0x66239ba100000000, 0xc3f0c76a00000000,
+    0x7bc0c27700000000, 0xde139ebc00000000, 0x70610a3a00000000,
+    0xd5b256f100000000, 0x9b02d60300000000, 0x3ed18ac800000000,
+    0x90a31e4e00000000, 0x3570428500000000, 0x8d40479800000000,
+    0x28931b5300000000, 0x86e18fd500000000, 0x2332d31e00000000,
+    0xf68085ef00000000, 0x5353d92400000000, 0xfd214da200000000,
+    0x58f2116900000000, 0xe0c2147400000000, 0x451148bf00000000,
+    0xeb63dc3900000000, 0x4eb080f200000000, 0x3605ac0700000000,
+    0x93d6f0cc00000000, 0x3da4644a00000000, 0x9877388100000000,
+    0x20473d9c00000000, 0x8594615700000000, 0x2be6f5d100000000,
+    0x8e35a91a00000000, 0x5b87ffeb00000000, 0xfe54a32000000000,
+    0x502637a600000000, 0xf5f56b6d00000000, 0x4dc56e7000000000,
+    0xe81632bb00000000, 0x4664a63d00000000, 0xe3b7faf600000000,
+    0xad077a0400000000, 0x08d426cf00000000, 0xa6a6b24900000000,
+    0x0375ee8200000000, 0xbb45eb9f00000000, 0x1e96b75400000000,
+    0xb0e423d200000000, 0x15377f1900000000, 0xc08529e800000000,
+    0x6556752300000000, 0xcb24e1a500000000, 0x6ef7bd6e00000000,
+    0xd6c7b87300000000, 0x7314e4b800000000, 0xdd66703e00000000,
+    0x78b52cf500000000, 0x6c0a580f00000000, 0xc9d904c400000000,
+    0x67ab904200000000, 0xc278cc8900000000, 0x7a48c99400000000,
+    0xdf9b955f00000000, 0x71e901d900000000, 0xd43a5d1200000000,
+    0x01880be300000000, 0xa45b572800000000, 0x0a29c3ae00000000,
+    0xaffa9f6500000000, 0x17ca9a7800000000, 0xb219c6b300000000,
+    0x1c6b523500000000, 0xb9b80efe00000000, 0xf7088e0c00000000,
+    0x52dbd2c700000000, 0xfca9464100000000, 0x597a1a8a00000000,
+    0xe14a1f9700000000, 0x4499435c00000000, 0xeaebd7da00000000,
+    0x4f388b1100000000, 0x9a8adde000000000, 0x3f59812b00000000,
+    0x912b15ad00000000, 0x34f8496600000000, 0x8cc84c7b00000000,
+    0x291b10b000000000, 0x8769843600000000, 0x22bad8fd00000000,
+    0x5a0ff40800000000, 0xffdca8c300000000, 0x51ae3c4500000000,
+    0xf47d608e00000000, 0x4c4d659300000000, 0xe99e395800000000,
+    0x47ecadde00000000, 0xe23ff11500000000, 0x378da7e400000000,
+    0x925efb2f00000000, 0x3c2c6fa900000000, 0x99ff336200000000,
+    0x21cf367f00000000, 0x841c6ab400000000, 0x2a6efe3200000000,
+    0x8fbda2f900000000, 0xc10d220b00000000, 0x64de7ec000000000,
+    0xcaacea4600000000, 0x6f7fb68d00000000, 0xd74fb39000000000,
+    0x729cef5b00000000, 0xdcee7bdd00000000, 0x793d271600000000,
+    0xac8f71e700000000, 0x095c2d2c00000000, 0xa72eb9aa00000000,
+    0x02fde56100000000, 0xbacde07c00000000, 0x1f1ebcb700000000,
+    0xb16c283100000000, 0x14bf74fa00000000, 0xd814b01e00000000,
+    0x7dc7ecd500000000, 0xd3b5785300000000, 0x7666249800000000,
+    0xce56218500000000, 0x6b857d4e00000000, 0xc5f7e9c800000000,
+    0x6024b50300000000, 0xb596e3f200000000, 0x1045bf3900000000,
+    0xbe372bbf00000000, 0x1be4777400000000, 0xa3d4726900000000,
+    0x06072ea200000000, 0xa875ba2400000000, 0x0da6e6ef00000000,
+    0x4316661d00000000, 0xe6c53ad600000000, 0x48b7ae5000000000,
+    0xed64f29b00000000, 0x5554f78600000000, 0xf087ab4d00000000,
+    0x5ef53fcb00000000, 0xfb26630000000000, 0x2e9435f100000000,
+    0x8b47693a00000000, 0x2535fdbc00000000, 0x80e6a17700000000,
+    0x38d6a46a00000000, 0x9d05f8a100000000, 0x33776c2700000000,
+    0x96a430ec00000000, 0xee111c1900000000, 0x4bc240d200000000,
+    0xe5b0d45400000000, 0x4063889f00000000, 0xf8538d8200000000,
+    0x5d80d14900000000, 0xf3f245cf00000000, 0x5621190400000000,
+    0x83934ff500000000, 0x2640133e00000000, 0x883287b800000000,
+    0x2de1db7300000000, 0x95d1de6e00000000, 0x300282a500000000,
+    0x9e70162300000000, 0x3ba34ae800000000, 0x7513ca1a00000000,
+    0xd0c096d100000000, 0x7eb2025700000000, 0xdb615e9c00000000,
+    0x63515b8100000000, 0xc682074a00000000, 0x68f093cc00000000,
+    0xcd23cf0700000000, 0x189199f600000000, 0xbd42c53d00000000,
+    0x133051bb00000000, 0xb6e30d7000000000, 0x0ed3086d00000000,
+    0xab0054a600000000, 0x0572c02000000000, 0xa0a19ceb00000000,
+    0xb41ee81100000000, 0x11cdb4da00000000, 0xbfbf205c00000000,
+    0x1a6c7c9700000000, 0xa25c798a00000000, 0x078f254100000000,
+    0xa9fdb1c700000000, 0x0c2eed0c00000000, 0xd99cbbfd00000000,
+    0x7c4fe73600000000, 0xd23d73b000000000, 0x77ee2f7b00000000,
+    0xcfde2a6600000000, 0x6a0d76ad00000000, 0xc47fe22b00000000,
+    0x61acbee000000000, 0x2f1c3e1200000000, 0x8acf62d900000000,
+    0x24bdf65f00000000, 0x816eaa9400000000, 0x395eaf8900000000,
+    0x9c8df34200000000, 0x32ff67c400000000, 0x972c3b0f00000000,
+    0x429e6dfe00000000, 0xe74d313500000000, 0x493fa5b300000000,
+    0xececf97800000000, 0x54dcfc6500000000, 0xf10fa0ae00000000,
+    0x5f7d342800000000, 0xfaae68e300000000, 0x821b441600000000,
+    0x27c818dd00000000, 0x89ba8c5b00000000, 0x2c69d09000000000,
+    0x9459d58d00000000, 0x318a894600000000, 0x9ff81dc000000000,
+    0x3a2b410b00000000, 0xef9917fa00000000, 0x4a4a4b3100000000,
+    0xe438dfb700000000, 0x41eb837c00000000, 0xf9db866100000000,
+    0x5c08daaa00000000, 0xf27a4e2c00000000, 0x57a912e700000000,
+    0x1919921500000000, 0xbccacede00000000, 0x12b85a5800000000,
+    0xb76b069300000000, 0x0f5b038e00000000, 0xaa885f4500000000,
+    0x04facbc300000000, 0xa129970800000000, 0x749bc1f900000000,
+    0xd1489d3200000000, 0x7f3a09b400000000, 0xdae9557f00000000,
+    0x62d9506200000000, 0xc70a0ca900000000, 0x6978982f00000000,
+    0xccabc4e400000000},
+   {0x0000000000000000, 0xb40b77a600000000, 0x29119f9700000000,
+    0x9d1ae83100000000, 0x13244ff400000000, 0xa72f385200000000,
+    0x3a35d06300000000, 0x8e3ea7c500000000, 0x674eef3300000000,
+    0xd345989500000000, 0x4e5f70a400000000, 0xfa54070200000000,
+    0x746aa0c700000000, 0xc061d76100000000, 0x5d7b3f5000000000,
+    0xe97048f600000000, 0xce9cde6700000000, 0x7a97a9c100000000,
+    0xe78d41f000000000, 0x5386365600000000, 0xddb8919300000000,
+    0x69b3e63500000000, 0xf4a90e0400000000, 0x40a279a200000000,
+    0xa9d2315400000000, 0x1dd946f200000000, 0x80c3aec300000000,
+    0x34c8d96500000000, 0xbaf67ea000000000, 0x0efd090600000000,
+    0x93e7e13700000000, 0x27ec969100000000, 0x9c39bdcf00000000,
+    0x2832ca6900000000, 0xb528225800000000, 0x012355fe00000000,
+    0x8f1df23b00000000, 0x3b16859d00000000, 0xa60c6dac00000000,
+    0x12071a0a00000000, 0xfb7752fc00000000, 0x4f7c255a00000000,
+    0xd266cd6b00000000, 0x666dbacd00000000, 0xe8531d0800000000,
+    0x5c586aae00000000, 0xc142829f00000000, 0x7549f53900000000,
+    0x52a563a800000000, 0xe6ae140e00000000, 0x7bb4fc3f00000000,
+    0xcfbf8b9900000000, 0x41812c5c00000000, 0xf58a5bfa00000000,
+    0x6890b3cb00000000, 0xdc9bc46d00000000, 0x35eb8c9b00000000,
+    0x81e0fb3d00000000, 0x1cfa130c00000000, 0xa8f164aa00000000,
+    0x26cfc36f00000000, 0x92c4b4c900000000, 0x0fde5cf800000000,
+    0xbbd52b5e00000000, 0x79750b4400000000, 0xcd7e7ce200000000,
+    0x506494d300000000, 0xe46fe37500000000, 0x6a5144b000000000,
+    0xde5a331600000000, 0x4340db2700000000, 0xf74bac8100000000,
+    0x1e3be47700000000, 0xaa3093d100000000, 0x372a7be000000000,
+    0x83210c4600000000, 0x0d1fab8300000000, 0xb914dc2500000000,
+    0x240e341400000000, 0x900543b200000000, 0xb7e9d52300000000,
+    0x03e2a28500000000, 0x9ef84ab400000000, 0x2af33d1200000000,
+    0xa4cd9ad700000000, 0x10c6ed7100000000, 0x8ddc054000000000,
+    0x39d772e600000000, 0xd0a73a1000000000, 0x64ac4db600000000,
+    0xf9b6a58700000000, 0x4dbdd22100000000, 0xc38375e400000000,
+    0x7788024200000000, 0xea92ea7300000000, 0x5e999dd500000000,
+    0xe54cb68b00000000, 0x5147c12d00000000, 0xcc5d291c00000000,
+    0x78565eba00000000, 0xf668f97f00000000, 0x42638ed900000000,
+    0xdf7966e800000000, 0x6b72114e00000000, 0x820259b800000000,
+    0x36092e1e00000000, 0xab13c62f00000000, 0x1f18b18900000000,
+    0x9126164c00000000, 0x252d61ea00000000, 0xb83789db00000000,
+    0x0c3cfe7d00000000, 0x2bd068ec00000000, 0x9fdb1f4a00000000,
+    0x02c1f77b00000000, 0xb6ca80dd00000000, 0x38f4271800000000,
+    0x8cff50be00000000, 0x11e5b88f00000000, 0xa5eecf2900000000,
+    0x4c9e87df00000000, 0xf895f07900000000, 0x658f184800000000,
+    0xd1846fee00000000, 0x5fbac82b00000000, 0xebb1bf8d00000000,
+    0x76ab57bc00000000, 0xc2a0201a00000000, 0xf2ea168800000000,
+    0x46e1612e00000000, 0xdbfb891f00000000, 0x6ff0feb900000000,
+    0xe1ce597c00000000, 0x55c52eda00000000, 0xc8dfc6eb00000000,
+    0x7cd4b14d00000000, 0x95a4f9bb00000000, 0x21af8e1d00000000,
+    0xbcb5662c00000000, 0x08be118a00000000, 0x8680b64f00000000,
+    0x328bc1e900000000, 0xaf9129d800000000, 0x1b9a5e7e00000000,
+    0x3c76c8ef00000000, 0x887dbf4900000000, 0x1567577800000000,
+    0xa16c20de00000000, 0x2f52871b00000000, 0x9b59f0bd00000000,
+    0x0643188c00000000, 0xb2486f2a00000000, 0x5b3827dc00000000,
+    0xef33507a00000000, 0x7229b84b00000000, 0xc622cfed00000000,
+    0x481c682800000000, 0xfc171f8e00000000, 0x610df7bf00000000,
+    0xd506801900000000, 0x6ed3ab4700000000, 0xdad8dce100000000,
+    0x47c234d000000000, 0xf3c9437600000000, 0x7df7e4b300000000,
+    0xc9fc931500000000, 0x54e67b2400000000, 0xe0ed0c8200000000,
+    0x099d447400000000, 0xbd9633d200000000, 0x208cdbe300000000,
+    0x9487ac4500000000, 0x1ab90b8000000000, 0xaeb27c2600000000,
+    0x33a8941700000000, 0x87a3e3b100000000, 0xa04f752000000000,
+    0x1444028600000000, 0x895eeab700000000, 0x3d559d1100000000,
+    0xb36b3ad400000000, 0x07604d7200000000, 0x9a7aa54300000000,
+    0x2e71d2e500000000, 0xc7019a1300000000, 0x730aedb500000000,
+    0xee10058400000000, 0x5a1b722200000000, 0xd425d5e700000000,
+    0x602ea24100000000, 0xfd344a7000000000, 0x493f3dd600000000,
+    0x8b9f1dcc00000000, 0x3f946a6a00000000, 0xa28e825b00000000,
+    0x1685f5fd00000000, 0x98bb523800000000, 0x2cb0259e00000000,
+    0xb1aacdaf00000000, 0x05a1ba0900000000, 0xecd1f2ff00000000,
+    0x58da855900000000, 0xc5c06d6800000000, 0x71cb1ace00000000,
+    0xfff5bd0b00000000, 0x4bfecaad00000000, 0xd6e4229c00000000,
+    0x62ef553a00000000, 0x4503c3ab00000000, 0xf108b40d00000000,
+    0x6c125c3c00000000, 0xd8192b9a00000000, 0x56278c5f00000000,
+    0xe22cfbf900000000, 0x7f3613c800000000, 0xcb3d646e00000000,
+    0x224d2c9800000000, 0x96465b3e00000000, 0x0b5cb30f00000000,
+    0xbf57c4a900000000, 0x3169636c00000000, 0x856214ca00000000,
+    0x1878fcfb00000000, 0xac738b5d00000000, 0x17a6a00300000000,
+    0xa3add7a500000000, 0x3eb73f9400000000, 0x8abc483200000000,
+    0x0482eff700000000, 0xb089985100000000, 0x2d93706000000000,
+    0x999807c600000000, 0x70e84f3000000000, 0xc4e3389600000000,
+    0x59f9d0a700000000, 0xedf2a70100000000, 0x63cc00c400000000,
+    0xd7c7776200000000, 0x4add9f5300000000, 0xfed6e8f500000000,
+    0xd93a7e6400000000, 0x6d3109c200000000, 0xf02be1f300000000,
+    0x4420965500000000, 0xca1e319000000000, 0x7e15463600000000,
+    0xe30fae0700000000, 0x5704d9a100000000, 0xbe74915700000000,
+    0x0a7fe6f100000000, 0x97650ec000000000, 0x236e796600000000,
+    0xad50dea300000000, 0x195ba90500000000, 0x8441413400000000,
+    0x304a369200000000},
+   {0x0000000000000000, 0x9e00aacc00000000, 0x7d07254200000000,
+    0xe3078f8e00000000, 0xfa0e4a8400000000, 0x640ee04800000000,
+    0x87096fc600000000, 0x1909c50a00000000, 0xb51be5d300000000,
+    0x2b1b4f1f00000000, 0xc81cc09100000000, 0x561c6a5d00000000,
+    0x4f15af5700000000, 0xd115059b00000000, 0x32128a1500000000,
+    0xac1220d900000000, 0x2b31bb7c00000000, 0xb53111b000000000,
+    0x56369e3e00000000, 0xc83634f200000000, 0xd13ff1f800000000,
+    0x4f3f5b3400000000, 0xac38d4ba00000000, 0x32387e7600000000,
+    0x9e2a5eaf00000000, 0x002af46300000000, 0xe32d7bed00000000,
+    0x7d2dd12100000000, 0x6424142b00000000, 0xfa24bee700000000,
+    0x1923316900000000, 0x87239ba500000000, 0x566276f900000000,
+    0xc862dc3500000000, 0x2b6553bb00000000, 0xb565f97700000000,
+    0xac6c3c7d00000000, 0x326c96b100000000, 0xd16b193f00000000,
+    0x4f6bb3f300000000, 0xe379932a00000000, 0x7d7939e600000000,
+    0x9e7eb66800000000, 0x007e1ca400000000, 0x1977d9ae00000000,
+    0x8777736200000000, 0x6470fcec00000000, 0xfa70562000000000,
+    0x7d53cd8500000000, 0xe353674900000000, 0x0054e8c700000000,
+    0x9e54420b00000000, 0x875d870100000000, 0x195d2dcd00000000,
+    0xfa5aa24300000000, 0x645a088f00000000, 0xc848285600000000,
+    0x5648829a00000000, 0xb54f0d1400000000, 0x2b4fa7d800000000,
+    0x324662d200000000, 0xac46c81e00000000, 0x4f41479000000000,
+    0xd141ed5c00000000, 0xedc29d2900000000, 0x73c237e500000000,
+    0x90c5b86b00000000, 0x0ec512a700000000, 0x17ccd7ad00000000,
+    0x89cc7d6100000000, 0x6acbf2ef00000000, 0xf4cb582300000000,
+    0x58d978fa00000000, 0xc6d9d23600000000, 0x25de5db800000000,
+    0xbbdef77400000000, 0xa2d7327e00000000, 0x3cd798b200000000,
+    0xdfd0173c00000000, 0x41d0bdf000000000, 0xc6f3265500000000,
+    0x58f38c9900000000, 0xbbf4031700000000, 0x25f4a9db00000000,
+    0x3cfd6cd100000000, 0xa2fdc61d00000000, 0x41fa499300000000,
+    0xdffae35f00000000, 0x73e8c38600000000, 0xede8694a00000000,
+    0x0eefe6c400000000, 0x90ef4c0800000000, 0x89e6890200000000,
+    0x17e623ce00000000, 0xf4e1ac4000000000, 0x6ae1068c00000000,
+    0xbba0ebd000000000, 0x25a0411c00000000, 0xc6a7ce9200000000,
+    0x58a7645e00000000, 0x41aea15400000000, 0xdfae0b9800000000,
+    0x3ca9841600000000, 0xa2a92eda00000000, 0x0ebb0e0300000000,
+    0x90bba4cf00000000, 0x73bc2b4100000000, 0xedbc818d00000000,
+    0xf4b5448700000000, 0x6ab5ee4b00000000, 0x89b261c500000000,
+    0x17b2cb0900000000, 0x909150ac00000000, 0x0e91fa6000000000,
+    0xed9675ee00000000, 0x7396df2200000000, 0x6a9f1a2800000000,
+    0xf49fb0e400000000, 0x17983f6a00000000, 0x899895a600000000,
+    0x258ab57f00000000, 0xbb8a1fb300000000, 0x588d903d00000000,
+    0xc68d3af100000000, 0xdf84fffb00000000, 0x4184553700000000,
+    0xa283dab900000000, 0x3c83707500000000, 0xda853b5300000000,
+    0x4485919f00000000, 0xa7821e1100000000, 0x3982b4dd00000000,
+    0x208b71d700000000, 0xbe8bdb1b00000000, 0x5d8c549500000000,
+    0xc38cfe5900000000, 0x6f9ede8000000000, 0xf19e744c00000000,
+    0x1299fbc200000000, 0x8c99510e00000000, 0x9590940400000000,
+    0x0b903ec800000000, 0xe897b14600000000, 0x76971b8a00000000,
+    0xf1b4802f00000000, 0x6fb42ae300000000, 0x8cb3a56d00000000,
+    0x12b30fa100000000, 0x0bbacaab00000000, 0x95ba606700000000,
+    0x76bdefe900000000, 0xe8bd452500000000, 0x44af65fc00000000,
+    0xdaafcf3000000000, 0x39a840be00000000, 0xa7a8ea7200000000,
+    0xbea12f7800000000, 0x20a185b400000000, 0xc3a60a3a00000000,
+    0x5da6a0f600000000, 0x8ce74daa00000000, 0x12e7e76600000000,
+    0xf1e068e800000000, 0x6fe0c22400000000, 0x76e9072e00000000,
+    0xe8e9ade200000000, 0x0bee226c00000000, 0x95ee88a000000000,
+    0x39fca87900000000, 0xa7fc02b500000000, 0x44fb8d3b00000000,
+    0xdafb27f700000000, 0xc3f2e2fd00000000, 0x5df2483100000000,
+    0xbef5c7bf00000000, 0x20f56d7300000000, 0xa7d6f6d600000000,
+    0x39d65c1a00000000, 0xdad1d39400000000, 0x44d1795800000000,
+    0x5dd8bc5200000000, 0xc3d8169e00000000, 0x20df991000000000,
+    0xbedf33dc00000000, 0x12cd130500000000, 0x8ccdb9c900000000,
+    0x6fca364700000000, 0xf1ca9c8b00000000, 0xe8c3598100000000,
+    0x76c3f34d00000000, 0x95c47cc300000000, 0x0bc4d60f00000000,
+    0x3747a67a00000000, 0xa9470cb600000000, 0x4a40833800000000,
+    0xd44029f400000000, 0xcd49ecfe00000000, 0x5349463200000000,
+    0xb04ec9bc00000000, 0x2e4e637000000000, 0x825c43a900000000,
+    0x1c5ce96500000000, 0xff5b66eb00000000, 0x615bcc2700000000,
+    0x7852092d00000000, 0xe652a3e100000000, 0x05552c6f00000000,
+    0x9b5586a300000000, 0x1c761d0600000000, 0x8276b7ca00000000,
+    0x6171384400000000, 0xff71928800000000, 0xe678578200000000,
+    0x7878fd4e00000000, 0x9b7f72c000000000, 0x057fd80c00000000,
+    0xa96df8d500000000, 0x376d521900000000, 0xd46add9700000000,
+    0x4a6a775b00000000, 0x5363b25100000000, 0xcd63189d00000000,
+    0x2e64971300000000, 0xb0643ddf00000000, 0x6125d08300000000,
+    0xff257a4f00000000, 0x1c22f5c100000000, 0x82225f0d00000000,
+    0x9b2b9a0700000000, 0x052b30cb00000000, 0xe62cbf4500000000,
+    0x782c158900000000, 0xd43e355000000000, 0x4a3e9f9c00000000,
+    0xa939101200000000, 0x3739bade00000000, 0x2e307fd400000000,
+    0xb030d51800000000, 0x53375a9600000000, 0xcd37f05a00000000,
+    0x4a146bff00000000, 0xd414c13300000000, 0x37134ebd00000000,
+    0xa913e47100000000, 0xb01a217b00000000, 0x2e1a8bb700000000,
+    0xcd1d043900000000, 0x531daef500000000, 0xff0f8e2c00000000,
+    0x610f24e000000000, 0x8208ab6e00000000, 0x1c0801a200000000,
+    0x0501c4a800000000, 0x9b016e6400000000, 0x7806e1ea00000000,
+    0xe6064b2600000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d},
+   {0x00000000, 0x41311b19, 0x82623632, 0xc3532d2b, 0x04c56c64,
+    0x45f4777d, 0x86a75a56, 0xc796414f, 0x088ad9c8, 0x49bbc2d1,
+    0x8ae8effa, 0xcbd9f4e3, 0x0c4fb5ac, 0x4d7eaeb5, 0x8e2d839e,
+    0xcf1c9887, 0x5112c24a, 0x1023d953, 0xd370f478, 0x9241ef61,
+    0x55d7ae2e, 0x14e6b537, 0xd7b5981c, 0x96848305, 0x59981b82,
+    0x18a9009b, 0xdbfa2db0, 0x9acb36a9, 0x5d5d77e6, 0x1c6c6cff,
+    0xdf3f41d4, 0x9e0e5acd, 0xa2248495, 0xe3159f8c, 0x2046b2a7,
+    0x6177a9be, 0xa6e1e8f1, 0xe7d0f3e8, 0x2483dec3, 0x65b2c5da,
+    0xaaae5d5d, 0xeb9f4644, 0x28cc6b6f, 0x69fd7076, 0xae6b3139,
+    0xef5a2a20, 0x2c09070b, 0x6d381c12, 0xf33646df, 0xb2075dc6,
+    0x715470ed, 0x30656bf4, 0xf7f32abb, 0xb6c231a2, 0x75911c89,
+    0x34a00790, 0xfbbc9f17, 0xba8d840e, 0x79dea925, 0x38efb23c,
+    0xff79f373, 0xbe48e86a, 0x7d1bc541, 0x3c2ade58, 0x054f79f0,
+    0x447e62e9, 0x872d4fc2, 0xc61c54db, 0x018a1594, 0x40bb0e8d,
+    0x83e823a6, 0xc2d938bf, 0x0dc5a038, 0x4cf4bb21, 0x8fa7960a,
+    0xce968d13, 0x0900cc5c, 0x4831d745, 0x8b62fa6e, 0xca53e177,
+    0x545dbbba, 0x156ca0a3, 0xd63f8d88, 0x970e9691, 0x5098d7de,
+    0x11a9ccc7, 0xd2fae1ec, 0x93cbfaf5, 0x5cd76272, 0x1de6796b,
+    0xdeb55440, 0x9f844f59, 0x58120e16, 0x1923150f, 0xda703824,
+    0x9b41233d, 0xa76bfd65, 0xe65ae67c, 0x2509cb57, 0x6438d04e,
+    0xa3ae9101, 0xe29f8a18, 0x21cca733, 0x60fdbc2a, 0xafe124ad,
+    0xeed03fb4, 0x2d83129f, 0x6cb20986, 0xab2448c9, 0xea1553d0,
+    0x29467efb, 0x687765e2, 0xf6793f2f, 0xb7482436, 0x741b091d,
+    0x352a1204, 0xf2bc534b, 0xb38d4852, 0x70de6579, 0x31ef7e60,
+    0xfef3e6e7, 0xbfc2fdfe, 0x7c91d0d5, 0x3da0cbcc, 0xfa368a83,
+    0xbb07919a, 0x7854bcb1, 0x3965a7a8, 0x4b98833b, 0x0aa99822,
+    0xc9fab509, 0x88cbae10, 0x4f5def5f, 0x0e6cf446, 0xcd3fd96d,
+    0x8c0ec274, 0x43125af3, 0x022341ea, 0xc1706cc1, 0x804177d8,
+    0x47d73697, 0x06e62d8e, 0xc5b500a5, 0x84841bbc, 0x1a8a4171,
+    0x5bbb5a68, 0x98e87743, 0xd9d96c5a, 0x1e4f2d15, 0x5f7e360c,
+    0x9c2d1b27, 0xdd1c003e, 0x120098b9, 0x533183a0, 0x9062ae8b,
+    0xd153b592, 0x16c5f4dd, 0x57f4efc4, 0x94a7c2ef, 0xd596d9f6,
+    0xe9bc07ae, 0xa88d1cb7, 0x6bde319c, 0x2aef2a85, 0xed796bca,
+    0xac4870d3, 0x6f1b5df8, 0x2e2a46e1, 0xe136de66, 0xa007c57f,
+    0x6354e854, 0x2265f34d, 0xe5f3b202, 0xa4c2a91b, 0x67918430,
+    0x26a09f29, 0xb8aec5e4, 0xf99fdefd, 0x3accf3d6, 0x7bfde8cf,
+    0xbc6ba980, 0xfd5ab299, 0x3e099fb2, 0x7f3884ab, 0xb0241c2c,
+    0xf1150735, 0x32462a1e, 0x73773107, 0xb4e17048, 0xf5d06b51,
+    0x3683467a, 0x77b25d63, 0x4ed7facb, 0x0fe6e1d2, 0xccb5ccf9,
+    0x8d84d7e0, 0x4a1296af, 0x0b238db6, 0xc870a09d, 0x8941bb84,
+    0x465d2303, 0x076c381a, 0xc43f1531, 0x850e0e28, 0x42984f67,
+    0x03a9547e, 0xc0fa7955, 0x81cb624c, 0x1fc53881, 0x5ef42398,
+    0x9da70eb3, 0xdc9615aa, 0x1b0054e5, 0x5a314ffc, 0x996262d7,
+    0xd85379ce, 0x174fe149, 0x567efa50, 0x952dd77b, 0xd41ccc62,
+    0x138a8d2d, 0x52bb9634, 0x91e8bb1f, 0xd0d9a006, 0xecf37e5e,
+    0xadc26547, 0x6e91486c, 0x2fa05375, 0xe836123a, 0xa9070923,
+    0x6a542408, 0x2b653f11, 0xe479a796, 0xa548bc8f, 0x661b91a4,
+    0x272a8abd, 0xe0bccbf2, 0xa18dd0eb, 0x62defdc0, 0x23efe6d9,
+    0xbde1bc14, 0xfcd0a70d, 0x3f838a26, 0x7eb2913f, 0xb924d070,
+    0xf815cb69, 0x3b46e642, 0x7a77fd5b, 0xb56b65dc, 0xf45a7ec5,
+    0x370953ee, 0x763848f7, 0xb1ae09b8, 0xf09f12a1, 0x33cc3f8a,
+    0x72fd2493},
+   {0x00000000, 0x376ac201, 0x6ed48403, 0x59be4602, 0xdca80907,
+    0xebc2cb06, 0xb27c8d04, 0x85164f05, 0xb851130e, 0x8f3bd10f,
+    0xd685970d, 0xe1ef550c, 0x64f91a09, 0x5393d808, 0x0a2d9e0a,
+    0x3d475c0b, 0x70a3261c, 0x47c9e41d, 0x1e77a21f, 0x291d601e,
+    0xac0b2f1b, 0x9b61ed1a, 0xc2dfab18, 0xf5b56919, 0xc8f23512,
+    0xff98f713, 0xa626b111, 0x914c7310, 0x145a3c15, 0x2330fe14,
+    0x7a8eb816, 0x4de47a17, 0xe0464d38, 0xd72c8f39, 0x8e92c93b,
+    0xb9f80b3a, 0x3cee443f, 0x0b84863e, 0x523ac03c, 0x6550023d,
+    0x58175e36, 0x6f7d9c37, 0x36c3da35, 0x01a91834, 0x84bf5731,
+    0xb3d59530, 0xea6bd332, 0xdd011133, 0x90e56b24, 0xa78fa925,
+    0xfe31ef27, 0xc95b2d26, 0x4c4d6223, 0x7b27a022, 0x2299e620,
+    0x15f32421, 0x28b4782a, 0x1fdeba2b, 0x4660fc29, 0x710a3e28,
+    0xf41c712d, 0xc376b32c, 0x9ac8f52e, 0xada2372f, 0xc08d9a70,
+    0xf7e75871, 0xae591e73, 0x9933dc72, 0x1c259377, 0x2b4f5176,
+    0x72f11774, 0x459bd575, 0x78dc897e, 0x4fb64b7f, 0x16080d7d,
+    0x2162cf7c, 0xa4748079, 0x931e4278, 0xcaa0047a, 0xfdcac67b,
+    0xb02ebc6c, 0x87447e6d, 0xdefa386f, 0xe990fa6e, 0x6c86b56b,
+    0x5bec776a, 0x02523168, 0x3538f369, 0x087faf62, 0x3f156d63,
+    0x66ab2b61, 0x51c1e960, 0xd4d7a665, 0xe3bd6464, 0xba032266,
+    0x8d69e067, 0x20cbd748, 0x17a11549, 0x4e1f534b, 0x7975914a,
+    0xfc63de4f, 0xcb091c4e, 0x92b75a4c, 0xa5dd984d, 0x989ac446,
+    0xaff00647, 0xf64e4045, 0xc1248244, 0x4432cd41, 0x73580f40,
+    0x2ae64942, 0x1d8c8b43, 0x5068f154, 0x67023355, 0x3ebc7557,
+    0x09d6b756, 0x8cc0f853, 0xbbaa3a52, 0xe2147c50, 0xd57ebe51,
+    0xe839e25a, 0xdf53205b, 0x86ed6659, 0xb187a458, 0x3491eb5d,
+    0x03fb295c, 0x5a456f5e, 0x6d2fad5f, 0x801b35e1, 0xb771f7e0,
+    0xeecfb1e2, 0xd9a573e3, 0x5cb33ce6, 0x6bd9fee7, 0x3267b8e5,
+    0x050d7ae4, 0x384a26ef, 0x0f20e4ee, 0x569ea2ec, 0x61f460ed,
+    0xe4e22fe8, 0xd388ede9, 0x8a36abeb, 0xbd5c69ea, 0xf0b813fd,
+    0xc7d2d1fc, 0x9e6c97fe, 0xa90655ff, 0x2c101afa, 0x1b7ad8fb,
+    0x42c49ef9, 0x75ae5cf8, 0x48e900f3, 0x7f83c2f2, 0x263d84f0,
+    0x115746f1, 0x944109f4, 0xa32bcbf5, 0xfa958df7, 0xcdff4ff6,
+    0x605d78d9, 0x5737bad8, 0x0e89fcda, 0x39e33edb, 0xbcf571de,
+    0x8b9fb3df, 0xd221f5dd, 0xe54b37dc, 0xd80c6bd7, 0xef66a9d6,
+    0xb6d8efd4, 0x81b22dd5, 0x04a462d0, 0x33cea0d1, 0x6a70e6d3,
+    0x5d1a24d2, 0x10fe5ec5, 0x27949cc4, 0x7e2adac6, 0x494018c7,
+    0xcc5657c2, 0xfb3c95c3, 0xa282d3c1, 0x95e811c0, 0xa8af4dcb,
+    0x9fc58fca, 0xc67bc9c8, 0xf1110bc9, 0x740744cc, 0x436d86cd,
+    0x1ad3c0cf, 0x2db902ce, 0x4096af91, 0x77fc6d90, 0x2e422b92,
+    0x1928e993, 0x9c3ea696, 0xab546497, 0xf2ea2295, 0xc580e094,
+    0xf8c7bc9f, 0xcfad7e9e, 0x9613389c, 0xa179fa9d, 0x246fb598,
+    0x13057799, 0x4abb319b, 0x7dd1f39a, 0x3035898d, 0x075f4b8c,
+    0x5ee10d8e, 0x698bcf8f, 0xec9d808a, 0xdbf7428b, 0x82490489,
+    0xb523c688, 0x88649a83, 0xbf0e5882, 0xe6b01e80, 0xd1dadc81,
+    0x54cc9384, 0x63a65185, 0x3a181787, 0x0d72d586, 0xa0d0e2a9,
+    0x97ba20a8, 0xce0466aa, 0xf96ea4ab, 0x7c78ebae, 0x4b1229af,
+    0x12ac6fad, 0x25c6adac, 0x1881f1a7, 0x2feb33a6, 0x765575a4,
+    0x413fb7a5, 0xc429f8a0, 0xf3433aa1, 0xaafd7ca3, 0x9d97bea2,
+    0xd073c4b5, 0xe71906b4, 0xbea740b6, 0x89cd82b7, 0x0cdbcdb2,
+    0x3bb10fb3, 0x620f49b1, 0x55658bb0, 0x6822d7bb, 0x5f4815ba,
+    0x06f653b8, 0x319c91b9, 0xb48adebc, 0x83e01cbd, 0xda5e5abf,
+    0xed3498be},
+   {0x00000000, 0x6567bcb8, 0x8bc809aa, 0xeeafb512, 0x5797628f,
+    0x32f0de37, 0xdc5f6b25, 0xb938d79d, 0xef28b4c5, 0x8a4f087d,
+    0x64e0bd6f, 0x018701d7, 0xb8bfd64a, 0xddd86af2, 0x3377dfe0,
+    0x56106358, 0x9f571950, 0xfa30a5e8, 0x149f10fa, 0x71f8ac42,
+    0xc8c07bdf, 0xada7c767, 0x43087275, 0x266fcecd, 0x707fad95,
+    0x1518112d, 0xfbb7a43f, 0x9ed01887, 0x27e8cf1a, 0x428f73a2,
+    0xac20c6b0, 0xc9477a08, 0x3eaf32a0, 0x5bc88e18, 0xb5673b0a,
+    0xd00087b2, 0x6938502f, 0x0c5fec97, 0xe2f05985, 0x8797e53d,
+    0xd1878665, 0xb4e03add, 0x5a4f8fcf, 0x3f283377, 0x8610e4ea,
+    0xe3775852, 0x0dd8ed40, 0x68bf51f8, 0xa1f82bf0, 0xc49f9748,
+    0x2a30225a, 0x4f579ee2, 0xf66f497f, 0x9308f5c7, 0x7da740d5,
+    0x18c0fc6d, 0x4ed09f35, 0x2bb7238d, 0xc518969f, 0xa07f2a27,
+    0x1947fdba, 0x7c204102, 0x928ff410, 0xf7e848a8, 0x3d58149b,
+    0x583fa823, 0xb6901d31, 0xd3f7a189, 0x6acf7614, 0x0fa8caac,
+    0xe1077fbe, 0x8460c306, 0xd270a05e, 0xb7171ce6, 0x59b8a9f4,
+    0x3cdf154c, 0x85e7c2d1, 0xe0807e69, 0x0e2fcb7b, 0x6b4877c3,
+    0xa20f0dcb, 0xc768b173, 0x29c70461, 0x4ca0b8d9, 0xf5986f44,
+    0x90ffd3fc, 0x7e5066ee, 0x1b37da56, 0x4d27b90e, 0x284005b6,
+    0xc6efb0a4, 0xa3880c1c, 0x1ab0db81, 0x7fd76739, 0x9178d22b,
+    0xf41f6e93, 0x03f7263b, 0x66909a83, 0x883f2f91, 0xed589329,
+    0x546044b4, 0x3107f80c, 0xdfa84d1e, 0xbacff1a6, 0xecdf92fe,
+    0x89b82e46, 0x67179b54, 0x027027ec, 0xbb48f071, 0xde2f4cc9,
+    0x3080f9db, 0x55e74563, 0x9ca03f6b, 0xf9c783d3, 0x176836c1,
+    0x720f8a79, 0xcb375de4, 0xae50e15c, 0x40ff544e, 0x2598e8f6,
+    0x73888bae, 0x16ef3716, 0xf8408204, 0x9d273ebc, 0x241fe921,
+    0x41785599, 0xafd7e08b, 0xcab05c33, 0x3bb659ed, 0x5ed1e555,
+    0xb07e5047, 0xd519ecff, 0x6c213b62, 0x094687da, 0xe7e932c8,
+    0x828e8e70, 0xd49eed28, 0xb1f95190, 0x5f56e482, 0x3a31583a,
+    0x83098fa7, 0xe66e331f, 0x08c1860d, 0x6da63ab5, 0xa4e140bd,
+    0xc186fc05, 0x2f294917, 0x4a4ef5af, 0xf3762232, 0x96119e8a,
+    0x78be2b98, 0x1dd99720, 0x4bc9f478, 0x2eae48c0, 0xc001fdd2,
+    0xa566416a, 0x1c5e96f7, 0x79392a4f, 0x97969f5d, 0xf2f123e5,
+    0x05196b4d, 0x607ed7f5, 0x8ed162e7, 0xebb6de5f, 0x528e09c2,
+    0x37e9b57a, 0xd9460068, 0xbc21bcd0, 0xea31df88, 0x8f566330,
+    0x61f9d622, 0x049e6a9a, 0xbda6bd07, 0xd8c101bf, 0x366eb4ad,
+    0x53090815, 0x9a4e721d, 0xff29cea5, 0x11867bb7, 0x74e1c70f,
+    0xcdd91092, 0xa8beac2a, 0x46111938, 0x2376a580, 0x7566c6d8,
+    0x10017a60, 0xfeaecf72, 0x9bc973ca, 0x22f1a457, 0x479618ef,
+    0xa939adfd, 0xcc5e1145, 0x06ee4d76, 0x6389f1ce, 0x8d2644dc,
+    0xe841f864, 0x51792ff9, 0x341e9341, 0xdab12653, 0xbfd69aeb,
+    0xe9c6f9b3, 0x8ca1450b, 0x620ef019, 0x07694ca1, 0xbe519b3c,
+    0xdb362784, 0x35999296, 0x50fe2e2e, 0x99b95426, 0xfcdee89e,
+    0x12715d8c, 0x7716e134, 0xce2e36a9, 0xab498a11, 0x45e63f03,
+    0x208183bb, 0x7691e0e3, 0x13f65c5b, 0xfd59e949, 0x983e55f1,
+    0x2106826c, 0x44613ed4, 0xaace8bc6, 0xcfa9377e, 0x38417fd6,
+    0x5d26c36e, 0xb389767c, 0xd6eecac4, 0x6fd61d59, 0x0ab1a1e1,
+    0xe41e14f3, 0x8179a84b, 0xd769cb13, 0xb20e77ab, 0x5ca1c2b9,
+    0x39c67e01, 0x80fea99c, 0xe5991524, 0x0b36a036, 0x6e511c8e,
+    0xa7166686, 0xc271da3e, 0x2cde6f2c, 0x49b9d394, 0xf0810409,
+    0x95e6b8b1, 0x7b490da3, 0x1e2eb11b, 0x483ed243, 0x2d596efb,
+    0xc3f6dbe9, 0xa6916751, 0x1fa9b0cc, 0x7ace0c74, 0x9461b966,
+    0xf10605de}};
+
+#endif
+
+#endif
+
+#if N == 2
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6},
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43147b1700000000, 0x8628f62e00000000,
+    0xc53c8d3900000000, 0x0c51ec5d00000000, 0x4f45974a00000000,
+    0x8a791a7300000000, 0xc96d616400000000, 0x18a2d8bb00000000,
+    0x5bb6a3ac00000000, 0x9e8a2e9500000000, 0xdd9e558200000000,
+    0x14f334e600000000, 0x57e74ff100000000, 0x92dbc2c800000000,
+    0xd1cfb9df00000000, 0x7142c0ac00000000, 0x3256bbbb00000000,
+    0xf76a368200000000, 0xb47e4d9500000000, 0x7d132cf100000000,
+    0x3e0757e600000000, 0xfb3bdadf00000000, 0xb82fa1c800000000,
+    0x69e0181700000000, 0x2af4630000000000, 0xefc8ee3900000000,
+    0xacdc952e00000000, 0x65b1f44a00000000, 0x26a58f5d00000000,
+    0xe399026400000000, 0xa08d797300000000, 0xa382f18200000000,
+    0xe0968a9500000000, 0x25aa07ac00000000, 0x66be7cbb00000000,
+    0xafd31ddf00000000, 0xecc766c800000000, 0x29fbebf100000000,
+    0x6aef90e600000000, 0xbb20293900000000, 0xf834522e00000000,
+    0x3d08df1700000000, 0x7e1ca40000000000, 0xb771c56400000000,
+    0xf465be7300000000, 0x3159334a00000000, 0x724d485d00000000,
+    0xd2c0312e00000000, 0x91d44a3900000000, 0x54e8c70000000000,
+    0x17fcbc1700000000, 0xde91dd7300000000, 0x9d85a66400000000,
+    0x58b92b5d00000000, 0x1bad504a00000000, 0xca62e99500000000,
+    0x8976928200000000, 0x4c4a1fbb00000000, 0x0f5e64ac00000000,
+    0xc63305c800000000, 0x85277edf00000000, 0x401bf3e600000000,
+    0x030f88f100000000, 0x070392de00000000, 0x4417e9c900000000,
+    0x812b64f000000000, 0xc23f1fe700000000, 0x0b527e8300000000,
+    0x4846059400000000, 0x8d7a88ad00000000, 0xce6ef3ba00000000,
+    0x1fa14a6500000000, 0x5cb5317200000000, 0x9989bc4b00000000,
+    0xda9dc75c00000000, 0x13f0a63800000000, 0x50e4dd2f00000000,
+    0x95d8501600000000, 0xd6cc2b0100000000, 0x7641527200000000,
+    0x3555296500000000, 0xf069a45c00000000, 0xb37ddf4b00000000,
+    0x7a10be2f00000000, 0x3904c53800000000, 0xfc38480100000000,
+    0xbf2c331600000000, 0x6ee38ac900000000, 0x2df7f1de00000000,
+    0xe8cb7ce700000000, 0xabdf07f000000000, 0x62b2669400000000,
+    0x21a61d8300000000, 0xe49a90ba00000000, 0xa78eebad00000000,
+    0xa481635c00000000, 0xe795184b00000000, 0x22a9957200000000,
+    0x61bdee6500000000, 0xa8d08f0100000000, 0xebc4f41600000000,
+    0x2ef8792f00000000, 0x6dec023800000000, 0xbc23bbe700000000,
+    0xff37c0f000000000, 0x3a0b4dc900000000, 0x791f36de00000000,
+    0xb07257ba00000000, 0xf3662cad00000000, 0x365aa19400000000,
+    0x754eda8300000000, 0xd5c3a3f000000000, 0x96d7d8e700000000,
+    0x53eb55de00000000, 0x10ff2ec900000000, 0xd9924fad00000000,
+    0x9a8634ba00000000, 0x5fbab98300000000, 0x1caec29400000000,
+    0xcd617b4b00000000, 0x8e75005c00000000, 0x4b498d6500000000,
+    0x085df67200000000, 0xc130971600000000, 0x8224ec0100000000,
+    0x4718613800000000, 0x040c1a2f00000000, 0x4f00556600000000,
+    0x0c142e7100000000, 0xc928a34800000000, 0x8a3cd85f00000000,
+    0x4351b93b00000000, 0x0045c22c00000000, 0xc5794f1500000000,
+    0x866d340200000000, 0x57a28ddd00000000, 0x14b6f6ca00000000,
+    0xd18a7bf300000000, 0x929e00e400000000, 0x5bf3618000000000,
+    0x18e71a9700000000, 0xdddb97ae00000000, 0x9ecfecb900000000,
+    0x3e4295ca00000000, 0x7d56eedd00000000, 0xb86a63e400000000,
+    0xfb7e18f300000000, 0x3213799700000000, 0x7107028000000000,
+    0xb43b8fb900000000, 0xf72ff4ae00000000, 0x26e04d7100000000,
+    0x65f4366600000000, 0xa0c8bb5f00000000, 0xe3dcc04800000000,
+    0x2ab1a12c00000000, 0x69a5da3b00000000, 0xac99570200000000,
+    0xef8d2c1500000000, 0xec82a4e400000000, 0xaf96dff300000000,
+    0x6aaa52ca00000000, 0x29be29dd00000000, 0xe0d348b900000000,
+    0xa3c733ae00000000, 0x66fbbe9700000000, 0x25efc58000000000,
+    0xf4207c5f00000000, 0xb734074800000000, 0x72088a7100000000,
+    0x311cf16600000000, 0xf871900200000000, 0xbb65eb1500000000,
+    0x7e59662c00000000, 0x3d4d1d3b00000000, 0x9dc0644800000000,
+    0xded41f5f00000000, 0x1be8926600000000, 0x58fce97100000000,
+    0x9191881500000000, 0xd285f30200000000, 0x17b97e3b00000000,
+    0x54ad052c00000000, 0x8562bcf300000000, 0xc676c7e400000000,
+    0x034a4add00000000, 0x405e31ca00000000, 0x893350ae00000000,
+    0xca272bb900000000, 0x0f1ba68000000000, 0x4c0fdd9700000000,
+    0x4803c7b800000000, 0x0b17bcaf00000000, 0xce2b319600000000,
+    0x8d3f4a8100000000, 0x44522be500000000, 0x074650f200000000,
+    0xc27addcb00000000, 0x816ea6dc00000000, 0x50a11f0300000000,
+    0x13b5641400000000, 0xd689e92d00000000, 0x959d923a00000000,
+    0x5cf0f35e00000000, 0x1fe4884900000000, 0xdad8057000000000,
+    0x99cc7e6700000000, 0x3941071400000000, 0x7a557c0300000000,
+    0xbf69f13a00000000, 0xfc7d8a2d00000000, 0x3510eb4900000000,
+    0x7604905e00000000, 0xb3381d6700000000, 0xf02c667000000000,
+    0x21e3dfaf00000000, 0x62f7a4b800000000, 0xa7cb298100000000,
+    0xe4df529600000000, 0x2db233f200000000, 0x6ea648e500000000,
+    0xab9ac5dc00000000, 0xe88ebecb00000000, 0xeb81363a00000000,
+    0xa8954d2d00000000, 0x6da9c01400000000, 0x2ebdbb0300000000,
+    0xe7d0da6700000000, 0xa4c4a17000000000, 0x61f82c4900000000,
+    0x22ec575e00000000, 0xf323ee8100000000, 0xb037959600000000,
+    0x750b18af00000000, 0x361f63b800000000, 0xff7202dc00000000,
+    0xbc6679cb00000000, 0x795af4f200000000, 0x3a4e8fe500000000,
+    0x9ac3f69600000000, 0xd9d78d8100000000, 0x1ceb00b800000000,
+    0x5fff7baf00000000, 0x96921acb00000000, 0xd58661dc00000000,
+    0x10baece500000000, 0x53ae97f200000000, 0x82612e2d00000000,
+    0xc175553a00000000, 0x0449d80300000000, 0x475da31400000000,
+    0x8e30c27000000000, 0xcd24b96700000000, 0x0818345e00000000,
+    0x4b0c4f4900000000},
+   {0x0000000000000000, 0x3e6bc2ef00000000, 0x3dd0f50400000000,
+    0x03bb37eb00000000, 0x7aa0eb0900000000, 0x44cb29e600000000,
+    0x47701e0d00000000, 0x791bdce200000000, 0xf440d71300000000,
+    0xca2b15fc00000000, 0xc990221700000000, 0xf7fbe0f800000000,
+    0x8ee03c1a00000000, 0xb08bfef500000000, 0xb330c91e00000000,
+    0x8d5b0bf100000000, 0xe881ae2700000000, 0xd6ea6cc800000000,
+    0xd5515b2300000000, 0xeb3a99cc00000000, 0x9221452e00000000,
+    0xac4a87c100000000, 0xaff1b02a00000000, 0x919a72c500000000,
+    0x1cc1793400000000, 0x22aabbdb00000000, 0x21118c3000000000,
+    0x1f7a4edf00000000, 0x6661923d00000000, 0x580a50d200000000,
+    0x5bb1673900000000, 0x65daa5d600000000, 0xd0035d4f00000000,
+    0xee689fa000000000, 0xedd3a84b00000000, 0xd3b86aa400000000,
+    0xaaa3b64600000000, 0x94c874a900000000, 0x9773434200000000,
+    0xa91881ad00000000, 0x24438a5c00000000, 0x1a2848b300000000,
+    0x19937f5800000000, 0x27f8bdb700000000, 0x5ee3615500000000,
+    0x6088a3ba00000000, 0x6333945100000000, 0x5d5856be00000000,
+    0x3882f36800000000, 0x06e9318700000000, 0x0552066c00000000,
+    0x3b39c48300000000, 0x4222186100000000, 0x7c49da8e00000000,
+    0x7ff2ed6500000000, 0x41992f8a00000000, 0xccc2247b00000000,
+    0xf2a9e69400000000, 0xf112d17f00000000, 0xcf79139000000000,
+    0xb662cf7200000000, 0x88090d9d00000000, 0x8bb23a7600000000,
+    0xb5d9f89900000000, 0xa007ba9e00000000, 0x9e6c787100000000,
+    0x9dd74f9a00000000, 0xa3bc8d7500000000, 0xdaa7519700000000,
+    0xe4cc937800000000, 0xe777a49300000000, 0xd91c667c00000000,
+    0x54476d8d00000000, 0x6a2caf6200000000, 0x6997988900000000,
+    0x57fc5a6600000000, 0x2ee7868400000000, 0x108c446b00000000,
+    0x1337738000000000, 0x2d5cb16f00000000, 0x488614b900000000,
+    0x76edd65600000000, 0x7556e1bd00000000, 0x4b3d235200000000,
+    0x3226ffb000000000, 0x0c4d3d5f00000000, 0x0ff60ab400000000,
+    0x319dc85b00000000, 0xbcc6c3aa00000000, 0x82ad014500000000,
+    0x811636ae00000000, 0xbf7df44100000000, 0xc66628a300000000,
+    0xf80dea4c00000000, 0xfbb6dda700000000, 0xc5dd1f4800000000,
+    0x7004e7d100000000, 0x4e6f253e00000000, 0x4dd412d500000000,
+    0x73bfd03a00000000, 0x0aa40cd800000000, 0x34cfce3700000000,
+    0x3774f9dc00000000, 0x091f3b3300000000, 0x844430c200000000,
+    0xba2ff22d00000000, 0xb994c5c600000000, 0x87ff072900000000,
+    0xfee4dbcb00000000, 0xc08f192400000000, 0xc3342ecf00000000,
+    0xfd5fec2000000000, 0x988549f600000000, 0xa6ee8b1900000000,
+    0xa555bcf200000000, 0x9b3e7e1d00000000, 0xe225a2ff00000000,
+    0xdc4e601000000000, 0xdff557fb00000000, 0xe19e951400000000,
+    0x6cc59ee500000000, 0x52ae5c0a00000000, 0x51156be100000000,
+    0x6f7ea90e00000000, 0x166575ec00000000, 0x280eb70300000000,
+    0x2bb580e800000000, 0x15de420700000000, 0x010905e600000000,
+    0x3f62c70900000000, 0x3cd9f0e200000000, 0x02b2320d00000000,
+    0x7ba9eeef00000000, 0x45c22c0000000000, 0x46791beb00000000,
+    0x7812d90400000000, 0xf549d2f500000000, 0xcb22101a00000000,
+    0xc89927f100000000, 0xf6f2e51e00000000, 0x8fe939fc00000000,
+    0xb182fb1300000000, 0xb239ccf800000000, 0x8c520e1700000000,
+    0xe988abc100000000, 0xd7e3692e00000000, 0xd4585ec500000000,
+    0xea339c2a00000000, 0x932840c800000000, 0xad43822700000000,
+    0xaef8b5cc00000000, 0x9093772300000000, 0x1dc87cd200000000,
+    0x23a3be3d00000000, 0x201889d600000000, 0x1e734b3900000000,
+    0x676897db00000000, 0x5903553400000000, 0x5ab862df00000000,
+    0x64d3a03000000000, 0xd10a58a900000000, 0xef619a4600000000,
+    0xecdaadad00000000, 0xd2b16f4200000000, 0xabaab3a000000000,
+    0x95c1714f00000000, 0x967a46a400000000, 0xa811844b00000000,
+    0x254a8fba00000000, 0x1b214d5500000000, 0x189a7abe00000000,
+    0x26f1b85100000000, 0x5fea64b300000000, 0x6181a65c00000000,
+    0x623a91b700000000, 0x5c51535800000000, 0x398bf68e00000000,
+    0x07e0346100000000, 0x045b038a00000000, 0x3a30c16500000000,
+    0x432b1d8700000000, 0x7d40df6800000000, 0x7efbe88300000000,
+    0x40902a6c00000000, 0xcdcb219d00000000, 0xf3a0e37200000000,
+    0xf01bd49900000000, 0xce70167600000000, 0xb76bca9400000000,
+    0x8900087b00000000, 0x8abb3f9000000000, 0xb4d0fd7f00000000,
+    0xa10ebf7800000000, 0x9f657d9700000000, 0x9cde4a7c00000000,
+    0xa2b5889300000000, 0xdbae547100000000, 0xe5c5969e00000000,
+    0xe67ea17500000000, 0xd815639a00000000, 0x554e686b00000000,
+    0x6b25aa8400000000, 0x689e9d6f00000000, 0x56f55f8000000000,
+    0x2fee836200000000, 0x1185418d00000000, 0x123e766600000000,
+    0x2c55b48900000000, 0x498f115f00000000, 0x77e4d3b000000000,
+    0x745fe45b00000000, 0x4a3426b400000000, 0x332ffa5600000000,
+    0x0d4438b900000000, 0x0eff0f5200000000, 0x3094cdbd00000000,
+    0xbdcfc64c00000000, 0x83a404a300000000, 0x801f334800000000,
+    0xbe74f1a700000000, 0xc76f2d4500000000, 0xf904efaa00000000,
+    0xfabfd84100000000, 0xc4d41aae00000000, 0x710de23700000000,
+    0x4f6620d800000000, 0x4cdd173300000000, 0x72b6d5dc00000000,
+    0x0bad093e00000000, 0x35c6cbd100000000, 0x367dfc3a00000000,
+    0x08163ed500000000, 0x854d352400000000, 0xbb26f7cb00000000,
+    0xb89dc02000000000, 0x86f602cf00000000, 0xffedde2d00000000,
+    0xc1861cc200000000, 0xc23d2b2900000000, 0xfc56e9c600000000,
+    0x998c4c1000000000, 0xa7e78eff00000000, 0xa45cb91400000000,
+    0x9a377bfb00000000, 0xe32ca71900000000, 0xdd4765f600000000,
+    0xdefc521d00000000, 0xe09790f200000000, 0x6dcc9b0300000000,
+    0x53a759ec00000000, 0x501c6e0700000000, 0x6e77ace800000000,
+    0x176c700a00000000, 0x2907b2e500000000, 0x2abc850e00000000,
+    0x14d747e100000000},
+   {0x0000000000000000, 0xc0df8ec100000000, 0xc1b96c5800000000,
+    0x0166e29900000000, 0x8273d9b000000000, 0x42ac577100000000,
+    0x43cab5e800000000, 0x83153b2900000000, 0x45e1c3ba00000000,
+    0x853e4d7b00000000, 0x8458afe200000000, 0x4487212300000000,
+    0xc7921a0a00000000, 0x074d94cb00000000, 0x062b765200000000,
+    0xc6f4f89300000000, 0xcbc4f6ae00000000, 0x0b1b786f00000000,
+    0x0a7d9af600000000, 0xcaa2143700000000, 0x49b72f1e00000000,
+    0x8968a1df00000000, 0x880e434600000000, 0x48d1cd8700000000,
+    0x8e25351400000000, 0x4efabbd500000000, 0x4f9c594c00000000,
+    0x8f43d78d00000000, 0x0c56eca400000000, 0xcc89626500000000,
+    0xcdef80fc00000000, 0x0d300e3d00000000, 0xd78f9c8600000000,
+    0x1750124700000000, 0x1636f0de00000000, 0xd6e97e1f00000000,
+    0x55fc453600000000, 0x9523cbf700000000, 0x9445296e00000000,
+    0x549aa7af00000000, 0x926e5f3c00000000, 0x52b1d1fd00000000,
+    0x53d7336400000000, 0x9308bda500000000, 0x101d868c00000000,
+    0xd0c2084d00000000, 0xd1a4ead400000000, 0x117b641500000000,
+    0x1c4b6a2800000000, 0xdc94e4e900000000, 0xddf2067000000000,
+    0x1d2d88b100000000, 0x9e38b39800000000, 0x5ee73d5900000000,
+    0x5f81dfc000000000, 0x9f5e510100000000, 0x59aaa99200000000,
+    0x9975275300000000, 0x9813c5ca00000000, 0x58cc4b0b00000000,
+    0xdbd9702200000000, 0x1b06fee300000000, 0x1a601c7a00000000,
+    0xdabf92bb00000000, 0xef1948d600000000, 0x2fc6c61700000000,
+    0x2ea0248e00000000, 0xee7faa4f00000000, 0x6d6a916600000000,
+    0xadb51fa700000000, 0xacd3fd3e00000000, 0x6c0c73ff00000000,
+    0xaaf88b6c00000000, 0x6a2705ad00000000, 0x6b41e73400000000,
+    0xab9e69f500000000, 0x288b52dc00000000, 0xe854dc1d00000000,
+    0xe9323e8400000000, 0x29edb04500000000, 0x24ddbe7800000000,
+    0xe40230b900000000, 0xe564d22000000000, 0x25bb5ce100000000,
+    0xa6ae67c800000000, 0x6671e90900000000, 0x67170b9000000000,
+    0xa7c8855100000000, 0x613c7dc200000000, 0xa1e3f30300000000,
+    0xa085119a00000000, 0x605a9f5b00000000, 0xe34fa47200000000,
+    0x23902ab300000000, 0x22f6c82a00000000, 0xe22946eb00000000,
+    0x3896d45000000000, 0xf8495a9100000000, 0xf92fb80800000000,
+    0x39f036c900000000, 0xbae50de000000000, 0x7a3a832100000000,
+    0x7b5c61b800000000, 0xbb83ef7900000000, 0x7d7717ea00000000,
+    0xbda8992b00000000, 0xbcce7bb200000000, 0x7c11f57300000000,
+    0xff04ce5a00000000, 0x3fdb409b00000000, 0x3ebda20200000000,
+    0xfe622cc300000000, 0xf35222fe00000000, 0x338dac3f00000000,
+    0x32eb4ea600000000, 0xf234c06700000000, 0x7121fb4e00000000,
+    0xb1fe758f00000000, 0xb098971600000000, 0x704719d700000000,
+    0xb6b3e14400000000, 0x766c6f8500000000, 0x770a8d1c00000000,
+    0xb7d503dd00000000, 0x34c038f400000000, 0xf41fb63500000000,
+    0xf57954ac00000000, 0x35a6da6d00000000, 0x9f35e17700000000,
+    0x5fea6fb600000000, 0x5e8c8d2f00000000, 0x9e5303ee00000000,
+    0x1d4638c700000000, 0xdd99b60600000000, 0xdcff549f00000000,
+    0x1c20da5e00000000, 0xdad422cd00000000, 0x1a0bac0c00000000,
+    0x1b6d4e9500000000, 0xdbb2c05400000000, 0x58a7fb7d00000000,
+    0x987875bc00000000, 0x991e972500000000, 0x59c119e400000000,
+    0x54f117d900000000, 0x942e991800000000, 0x95487b8100000000,
+    0x5597f54000000000, 0xd682ce6900000000, 0x165d40a800000000,
+    0x173ba23100000000, 0xd7e42cf000000000, 0x1110d46300000000,
+    0xd1cf5aa200000000, 0xd0a9b83b00000000, 0x107636fa00000000,
+    0x93630dd300000000, 0x53bc831200000000, 0x52da618b00000000,
+    0x9205ef4a00000000, 0x48ba7df100000000, 0x8865f33000000000,
+    0x890311a900000000, 0x49dc9f6800000000, 0xcac9a44100000000,
+    0x0a162a8000000000, 0x0b70c81900000000, 0xcbaf46d800000000,
+    0x0d5bbe4b00000000, 0xcd84308a00000000, 0xcce2d21300000000,
+    0x0c3d5cd200000000, 0x8f2867fb00000000, 0x4ff7e93a00000000,
+    0x4e910ba300000000, 0x8e4e856200000000, 0x837e8b5f00000000,
+    0x43a1059e00000000, 0x42c7e70700000000, 0x821869c600000000,
+    0x010d52ef00000000, 0xc1d2dc2e00000000, 0xc0b43eb700000000,
+    0x006bb07600000000, 0xc69f48e500000000, 0x0640c62400000000,
+    0x072624bd00000000, 0xc7f9aa7c00000000, 0x44ec915500000000,
+    0x84331f9400000000, 0x8555fd0d00000000, 0x458a73cc00000000,
+    0x702ca9a100000000, 0xb0f3276000000000, 0xb195c5f900000000,
+    0x714a4b3800000000, 0xf25f701100000000, 0x3280fed000000000,
+    0x33e61c4900000000, 0xf339928800000000, 0x35cd6a1b00000000,
+    0xf512e4da00000000, 0xf474064300000000, 0x34ab888200000000,
+    0xb7beb3ab00000000, 0x77613d6a00000000, 0x7607dff300000000,
+    0xb6d8513200000000, 0xbbe85f0f00000000, 0x7b37d1ce00000000,
+    0x7a51335700000000, 0xba8ebd9600000000, 0x399b86bf00000000,
+    0xf944087e00000000, 0xf822eae700000000, 0x38fd642600000000,
+    0xfe099cb500000000, 0x3ed6127400000000, 0x3fb0f0ed00000000,
+    0xff6f7e2c00000000, 0x7c7a450500000000, 0xbca5cbc400000000,
+    0xbdc3295d00000000, 0x7d1ca79c00000000, 0xa7a3352700000000,
+    0x677cbbe600000000, 0x661a597f00000000, 0xa6c5d7be00000000,
+    0x25d0ec9700000000, 0xe50f625600000000, 0xe46980cf00000000,
+    0x24b60e0e00000000, 0xe242f69d00000000, 0x229d785c00000000,
+    0x23fb9ac500000000, 0xe324140400000000, 0x60312f2d00000000,
+    0xa0eea1ec00000000, 0xa188437500000000, 0x6157cdb400000000,
+    0x6c67c38900000000, 0xacb84d4800000000, 0xaddeafd100000000,
+    0x6d01211000000000, 0xee141a3900000000, 0x2ecb94f800000000,
+    0x2fad766100000000, 0xef72f8a000000000, 0x2986003300000000,
+    0xe9598ef200000000, 0xe83f6c6b00000000, 0x28e0e2aa00000000,
+    0xabf5d98300000000, 0x6b2a574200000000, 0x6a4cb5db00000000,
+    0xaa933b1a00000000},
+   {0x0000000000000000, 0x6f4ca59b00000000, 0x9f9e3bec00000000,
+    0xf0d29e7700000000, 0x7f3b060300000000, 0x1077a39800000000,
+    0xe0a53def00000000, 0x8fe9987400000000, 0xfe760c0600000000,
+    0x913aa99d00000000, 0x61e837ea00000000, 0x0ea4927100000000,
+    0x814d0a0500000000, 0xee01af9e00000000, 0x1ed331e900000000,
+    0x719f947200000000, 0xfced180c00000000, 0x93a1bd9700000000,
+    0x637323e000000000, 0x0c3f867b00000000, 0x83d61e0f00000000,
+    0xec9abb9400000000, 0x1c4825e300000000, 0x7304807800000000,
+    0x029b140a00000000, 0x6dd7b19100000000, 0x9d052fe600000000,
+    0xf2498a7d00000000, 0x7da0120900000000, 0x12ecb79200000000,
+    0xe23e29e500000000, 0x8d728c7e00000000, 0xf8db311800000000,
+    0x9797948300000000, 0x67450af400000000, 0x0809af6f00000000,
+    0x87e0371b00000000, 0xe8ac928000000000, 0x187e0cf700000000,
+    0x7732a96c00000000, 0x06ad3d1e00000000, 0x69e1988500000000,
+    0x993306f200000000, 0xf67fa36900000000, 0x79963b1d00000000,
+    0x16da9e8600000000, 0xe60800f100000000, 0x8944a56a00000000,
+    0x0436291400000000, 0x6b7a8c8f00000000, 0x9ba812f800000000,
+    0xf4e4b76300000000, 0x7b0d2f1700000000, 0x14418a8c00000000,
+    0xe49314fb00000000, 0x8bdfb16000000000, 0xfa40251200000000,
+    0x950c808900000000, 0x65de1efe00000000, 0x0a92bb6500000000,
+    0x857b231100000000, 0xea37868a00000000, 0x1ae518fd00000000,
+    0x75a9bd6600000000, 0xf0b7633000000000, 0x9ffbc6ab00000000,
+    0x6f2958dc00000000, 0x0065fd4700000000, 0x8f8c653300000000,
+    0xe0c0c0a800000000, 0x10125edf00000000, 0x7f5efb4400000000,
+    0x0ec16f3600000000, 0x618dcaad00000000, 0x915f54da00000000,
+    0xfe13f14100000000, 0x71fa693500000000, 0x1eb6ccae00000000,
+    0xee6452d900000000, 0x8128f74200000000, 0x0c5a7b3c00000000,
+    0x6316dea700000000, 0x93c440d000000000, 0xfc88e54b00000000,
+    0x73617d3f00000000, 0x1c2dd8a400000000, 0xecff46d300000000,
+    0x83b3e34800000000, 0xf22c773a00000000, 0x9d60d2a100000000,
+    0x6db24cd600000000, 0x02fee94d00000000, 0x8d17713900000000,
+    0xe25bd4a200000000, 0x12894ad500000000, 0x7dc5ef4e00000000,
+    0x086c522800000000, 0x6720f7b300000000, 0x97f269c400000000,
+    0xf8becc5f00000000, 0x7757542b00000000, 0x181bf1b000000000,
+    0xe8c96fc700000000, 0x8785ca5c00000000, 0xf61a5e2e00000000,
+    0x9956fbb500000000, 0x698465c200000000, 0x06c8c05900000000,
+    0x8921582d00000000, 0xe66dfdb600000000, 0x16bf63c100000000,
+    0x79f3c65a00000000, 0xf4814a2400000000, 0x9bcdefbf00000000,
+    0x6b1f71c800000000, 0x0453d45300000000, 0x8bba4c2700000000,
+    0xe4f6e9bc00000000, 0x142477cb00000000, 0x7b68d25000000000,
+    0x0af7462200000000, 0x65bbe3b900000000, 0x95697dce00000000,
+    0xfa25d85500000000, 0x75cc402100000000, 0x1a80e5ba00000000,
+    0xea527bcd00000000, 0x851ede5600000000, 0xe06fc76000000000,
+    0x8f2362fb00000000, 0x7ff1fc8c00000000, 0x10bd591700000000,
+    0x9f54c16300000000, 0xf01864f800000000, 0x00cafa8f00000000,
+    0x6f865f1400000000, 0x1e19cb6600000000, 0x71556efd00000000,
+    0x8187f08a00000000, 0xeecb551100000000, 0x6122cd6500000000,
+    0x0e6e68fe00000000, 0xfebcf68900000000, 0x91f0531200000000,
+    0x1c82df6c00000000, 0x73ce7af700000000, 0x831ce48000000000,
+    0xec50411b00000000, 0x63b9d96f00000000, 0x0cf57cf400000000,
+    0xfc27e28300000000, 0x936b471800000000, 0xe2f4d36a00000000,
+    0x8db876f100000000, 0x7d6ae88600000000, 0x12264d1d00000000,
+    0x9dcfd56900000000, 0xf28370f200000000, 0x0251ee8500000000,
+    0x6d1d4b1e00000000, 0x18b4f67800000000, 0x77f853e300000000,
+    0x872acd9400000000, 0xe866680f00000000, 0x678ff07b00000000,
+    0x08c355e000000000, 0xf811cb9700000000, 0x975d6e0c00000000,
+    0xe6c2fa7e00000000, 0x898e5fe500000000, 0x795cc19200000000,
+    0x1610640900000000, 0x99f9fc7d00000000, 0xf6b559e600000000,
+    0x0667c79100000000, 0x692b620a00000000, 0xe459ee7400000000,
+    0x8b154bef00000000, 0x7bc7d59800000000, 0x148b700300000000,
+    0x9b62e87700000000, 0xf42e4dec00000000, 0x04fcd39b00000000,
+    0x6bb0760000000000, 0x1a2fe27200000000, 0x756347e900000000,
+    0x85b1d99e00000000, 0xeafd7c0500000000, 0x6514e47100000000,
+    0x0a5841ea00000000, 0xfa8adf9d00000000, 0x95c67a0600000000,
+    0x10d8a45000000000, 0x7f9401cb00000000, 0x8f469fbc00000000,
+    0xe00a3a2700000000, 0x6fe3a25300000000, 0x00af07c800000000,
+    0xf07d99bf00000000, 0x9f313c2400000000, 0xeeaea85600000000,
+    0x81e20dcd00000000, 0x713093ba00000000, 0x1e7c362100000000,
+    0x9195ae5500000000, 0xfed90bce00000000, 0x0e0b95b900000000,
+    0x6147302200000000, 0xec35bc5c00000000, 0x837919c700000000,
+    0x73ab87b000000000, 0x1ce7222b00000000, 0x930eba5f00000000,
+    0xfc421fc400000000, 0x0c9081b300000000, 0x63dc242800000000,
+    0x1243b05a00000000, 0x7d0f15c100000000, 0x8ddd8bb600000000,
+    0xe2912e2d00000000, 0x6d78b65900000000, 0x023413c200000000,
+    0xf2e68db500000000, 0x9daa282e00000000, 0xe803954800000000,
+    0x874f30d300000000, 0x779daea400000000, 0x18d10b3f00000000,
+    0x9738934b00000000, 0xf87436d000000000, 0x08a6a8a700000000,
+    0x67ea0d3c00000000, 0x1675994e00000000, 0x79393cd500000000,
+    0x89eba2a200000000, 0xe6a7073900000000, 0x694e9f4d00000000,
+    0x06023ad600000000, 0xf6d0a4a100000000, 0x999c013a00000000,
+    0x14ee8d4400000000, 0x7ba228df00000000, 0x8b70b6a800000000,
+    0xe43c133300000000, 0x6bd58b4700000000, 0x04992edc00000000,
+    0xf44bb0ab00000000, 0x9b07153000000000, 0xea98814200000000,
+    0x85d424d900000000, 0x7506baae00000000, 0x1a4a1f3500000000,
+    0x95a3874100000000, 0xfaef22da00000000, 0x0a3dbcad00000000,
+    0x6571193600000000},
+   {0x0000000000000000, 0x85d996dd00000000, 0x4bb55c6000000000,
+    0xce6ccabd00000000, 0x966ab9c000000000, 0x13b32f1d00000000,
+    0xdddfe5a000000000, 0x5806737d00000000, 0x6dd3035a00000000,
+    0xe80a958700000000, 0x26665f3a00000000, 0xa3bfc9e700000000,
+    0xfbb9ba9a00000000, 0x7e602c4700000000, 0xb00ce6fa00000000,
+    0x35d5702700000000, 0xdaa607b400000000, 0x5f7f916900000000,
+    0x91135bd400000000, 0x14cacd0900000000, 0x4cccbe7400000000,
+    0xc91528a900000000, 0x0779e21400000000, 0x82a074c900000000,
+    0xb77504ee00000000, 0x32ac923300000000, 0xfcc0588e00000000,
+    0x7919ce5300000000, 0x211fbd2e00000000, 0xa4c62bf300000000,
+    0x6aaae14e00000000, 0xef73779300000000, 0xf54b7eb300000000,
+    0x7092e86e00000000, 0xbefe22d300000000, 0x3b27b40e00000000,
+    0x6321c77300000000, 0xe6f851ae00000000, 0x28949b1300000000,
+    0xad4d0dce00000000, 0x98987de900000000, 0x1d41eb3400000000,
+    0xd32d218900000000, 0x56f4b75400000000, 0x0ef2c42900000000,
+    0x8b2b52f400000000, 0x4547984900000000, 0xc09e0e9400000000,
+    0x2fed790700000000, 0xaa34efda00000000, 0x6458256700000000,
+    0xe181b3ba00000000, 0xb987c0c700000000, 0x3c5e561a00000000,
+    0xf2329ca700000000, 0x77eb0a7a00000000, 0x423e7a5d00000000,
+    0xc7e7ec8000000000, 0x098b263d00000000, 0x8c52b0e000000000,
+    0xd454c39d00000000, 0x518d554000000000, 0x9fe19ffd00000000,
+    0x1a38092000000000, 0xab918dbd00000000, 0x2e481b6000000000,
+    0xe024d1dd00000000, 0x65fd470000000000, 0x3dfb347d00000000,
+    0xb822a2a000000000, 0x764e681d00000000, 0xf397fec000000000,
+    0xc6428ee700000000, 0x439b183a00000000, 0x8df7d28700000000,
+    0x082e445a00000000, 0x5028372700000000, 0xd5f1a1fa00000000,
+    0x1b9d6b4700000000, 0x9e44fd9a00000000, 0x71378a0900000000,
+    0xf4ee1cd400000000, 0x3a82d66900000000, 0xbf5b40b400000000,
+    0xe75d33c900000000, 0x6284a51400000000, 0xace86fa900000000,
+    0x2931f97400000000, 0x1ce4895300000000, 0x993d1f8e00000000,
+    0x5751d53300000000, 0xd28843ee00000000, 0x8a8e309300000000,
+    0x0f57a64e00000000, 0xc13b6cf300000000, 0x44e2fa2e00000000,
+    0x5edaf30e00000000, 0xdb0365d300000000, 0x156faf6e00000000,
+    0x90b639b300000000, 0xc8b04ace00000000, 0x4d69dc1300000000,
+    0x830516ae00000000, 0x06dc807300000000, 0x3309f05400000000,
+    0xb6d0668900000000, 0x78bcac3400000000, 0xfd653ae900000000,
+    0xa563499400000000, 0x20badf4900000000, 0xeed615f400000000,
+    0x6b0f832900000000, 0x847cf4ba00000000, 0x01a5626700000000,
+    0xcfc9a8da00000000, 0x4a103e0700000000, 0x12164d7a00000000,
+    0x97cfdba700000000, 0x59a3111a00000000, 0xdc7a87c700000000,
+    0xe9aff7e000000000, 0x6c76613d00000000, 0xa21aab8000000000,
+    0x27c33d5d00000000, 0x7fc54e2000000000, 0xfa1cd8fd00000000,
+    0x3470124000000000, 0xb1a9849d00000000, 0x17256aa000000000,
+    0x92fcfc7d00000000, 0x5c9036c000000000, 0xd949a01d00000000,
+    0x814fd36000000000, 0x049645bd00000000, 0xcafa8f0000000000,
+    0x4f2319dd00000000, 0x7af669fa00000000, 0xff2fff2700000000,
+    0x3143359a00000000, 0xb49aa34700000000, 0xec9cd03a00000000,
+    0x694546e700000000, 0xa7298c5a00000000, 0x22f01a8700000000,
+    0xcd836d1400000000, 0x485afbc900000000, 0x8636317400000000,
+    0x03efa7a900000000, 0x5be9d4d400000000, 0xde30420900000000,
+    0x105c88b400000000, 0x95851e6900000000, 0xa0506e4e00000000,
+    0x2589f89300000000, 0xebe5322e00000000, 0x6e3ca4f300000000,
+    0x363ad78e00000000, 0xb3e3415300000000, 0x7d8f8bee00000000,
+    0xf8561d3300000000, 0xe26e141300000000, 0x67b782ce00000000,
+    0xa9db487300000000, 0x2c02deae00000000, 0x7404add300000000,
+    0xf1dd3b0e00000000, 0x3fb1f1b300000000, 0xba68676e00000000,
+    0x8fbd174900000000, 0x0a64819400000000, 0xc4084b2900000000,
+    0x41d1ddf400000000, 0x19d7ae8900000000, 0x9c0e385400000000,
+    0x5262f2e900000000, 0xd7bb643400000000, 0x38c813a700000000,
+    0xbd11857a00000000, 0x737d4fc700000000, 0xf6a4d91a00000000,
+    0xaea2aa6700000000, 0x2b7b3cba00000000, 0xe517f60700000000,
+    0x60ce60da00000000, 0x551b10fd00000000, 0xd0c2862000000000,
+    0x1eae4c9d00000000, 0x9b77da4000000000, 0xc371a93d00000000,
+    0x46a83fe000000000, 0x88c4f55d00000000, 0x0d1d638000000000,
+    0xbcb4e71d00000000, 0x396d71c000000000, 0xf701bb7d00000000,
+    0x72d82da000000000, 0x2ade5edd00000000, 0xaf07c80000000000,
+    0x616b02bd00000000, 0xe4b2946000000000, 0xd167e44700000000,
+    0x54be729a00000000, 0x9ad2b82700000000, 0x1f0b2efa00000000,
+    0x470d5d8700000000, 0xc2d4cb5a00000000, 0x0cb801e700000000,
+    0x8961973a00000000, 0x6612e0a900000000, 0xe3cb767400000000,
+    0x2da7bcc900000000, 0xa87e2a1400000000, 0xf078596900000000,
+    0x75a1cfb400000000, 0xbbcd050900000000, 0x3e1493d400000000,
+    0x0bc1e3f300000000, 0x8e18752e00000000, 0x4074bf9300000000,
+    0xc5ad294e00000000, 0x9dab5a3300000000, 0x1872ccee00000000,
+    0xd61e065300000000, 0x53c7908e00000000, 0x49ff99ae00000000,
+    0xcc260f7300000000, 0x024ac5ce00000000, 0x8793531300000000,
+    0xdf95206e00000000, 0x5a4cb6b300000000, 0x94207c0e00000000,
+    0x11f9ead300000000, 0x242c9af400000000, 0xa1f50c2900000000,
+    0x6f99c69400000000, 0xea40504900000000, 0xb246233400000000,
+    0x379fb5e900000000, 0xf9f37f5400000000, 0x7c2ae98900000000,
+    0x93599e1a00000000, 0x168008c700000000, 0xd8ecc27a00000000,
+    0x5d3554a700000000, 0x053327da00000000, 0x80eab10700000000,
+    0x4e867bba00000000, 0xcb5fed6700000000, 0xfe8a9d4000000000,
+    0x7b530b9d00000000, 0xb53fc12000000000, 0x30e657fd00000000,
+    0x68e0248000000000, 0xed39b25d00000000, 0x235578e000000000,
+    0xa68cee3d00000000},
+   {0x0000000000000000, 0x76e10f9d00000000, 0xadc46ee100000000,
+    0xdb25617c00000000, 0x1b8fac1900000000, 0x6d6ea38400000000,
+    0xb64bc2f800000000, 0xc0aacd6500000000, 0x361e593300000000,
+    0x40ff56ae00000000, 0x9bda37d200000000, 0xed3b384f00000000,
+    0x2d91f52a00000000, 0x5b70fab700000000, 0x80559bcb00000000,
+    0xf6b4945600000000, 0x6c3cb26600000000, 0x1addbdfb00000000,
+    0xc1f8dc8700000000, 0xb719d31a00000000, 0x77b31e7f00000000,
+    0x015211e200000000, 0xda77709e00000000, 0xac967f0300000000,
+    0x5a22eb5500000000, 0x2cc3e4c800000000, 0xf7e685b400000000,
+    0x81078a2900000000, 0x41ad474c00000000, 0x374c48d100000000,
+    0xec6929ad00000000, 0x9a88263000000000, 0xd87864cd00000000,
+    0xae996b5000000000, 0x75bc0a2c00000000, 0x035d05b100000000,
+    0xc3f7c8d400000000, 0xb516c74900000000, 0x6e33a63500000000,
+    0x18d2a9a800000000, 0xee663dfe00000000, 0x9887326300000000,
+    0x43a2531f00000000, 0x35435c8200000000, 0xf5e991e700000000,
+    0x83089e7a00000000, 0x582dff0600000000, 0x2eccf09b00000000,
+    0xb444d6ab00000000, 0xc2a5d93600000000, 0x1980b84a00000000,
+    0x6f61b7d700000000, 0xafcb7ab200000000, 0xd92a752f00000000,
+    0x020f145300000000, 0x74ee1bce00000000, 0x825a8f9800000000,
+    0xf4bb800500000000, 0x2f9ee17900000000, 0x597feee400000000,
+    0x99d5238100000000, 0xef342c1c00000000, 0x34114d6000000000,
+    0x42f042fd00000000, 0xf1f7b94100000000, 0x8716b6dc00000000,
+    0x5c33d7a000000000, 0x2ad2d83d00000000, 0xea78155800000000,
+    0x9c991ac500000000, 0x47bc7bb900000000, 0x315d742400000000,
+    0xc7e9e07200000000, 0xb108efef00000000, 0x6a2d8e9300000000,
+    0x1ccc810e00000000, 0xdc664c6b00000000, 0xaa8743f600000000,
+    0x71a2228a00000000, 0x07432d1700000000, 0x9dcb0b2700000000,
+    0xeb2a04ba00000000, 0x300f65c600000000, 0x46ee6a5b00000000,
+    0x8644a73e00000000, 0xf0a5a8a300000000, 0x2b80c9df00000000,
+    0x5d61c64200000000, 0xabd5521400000000, 0xdd345d8900000000,
+    0x06113cf500000000, 0x70f0336800000000, 0xb05afe0d00000000,
+    0xc6bbf19000000000, 0x1d9e90ec00000000, 0x6b7f9f7100000000,
+    0x298fdd8c00000000, 0x5f6ed21100000000, 0x844bb36d00000000,
+    0xf2aabcf000000000, 0x3200719500000000, 0x44e17e0800000000,
+    0x9fc41f7400000000, 0xe92510e900000000, 0x1f9184bf00000000,
+    0x69708b2200000000, 0xb255ea5e00000000, 0xc4b4e5c300000000,
+    0x041e28a600000000, 0x72ff273b00000000, 0xa9da464700000000,
+    0xdf3b49da00000000, 0x45b36fea00000000, 0x3352607700000000,
+    0xe877010b00000000, 0x9e960e9600000000, 0x5e3cc3f300000000,
+    0x28ddcc6e00000000, 0xf3f8ad1200000000, 0x8519a28f00000000,
+    0x73ad36d900000000, 0x054c394400000000, 0xde69583800000000,
+    0xa88857a500000000, 0x68229ac000000000, 0x1ec3955d00000000,
+    0xc5e6f42100000000, 0xb307fbbc00000000, 0xe2ef738300000000,
+    0x940e7c1e00000000, 0x4f2b1d6200000000, 0x39ca12ff00000000,
+    0xf960df9a00000000, 0x8f81d00700000000, 0x54a4b17b00000000,
+    0x2245bee600000000, 0xd4f12ab000000000, 0xa210252d00000000,
+    0x7935445100000000, 0x0fd44bcc00000000, 0xcf7e86a900000000,
+    0xb99f893400000000, 0x62bae84800000000, 0x145be7d500000000,
+    0x8ed3c1e500000000, 0xf832ce7800000000, 0x2317af0400000000,
+    0x55f6a09900000000, 0x955c6dfc00000000, 0xe3bd626100000000,
+    0x3898031d00000000, 0x4e790c8000000000, 0xb8cd98d600000000,
+    0xce2c974b00000000, 0x1509f63700000000, 0x63e8f9aa00000000,
+    0xa34234cf00000000, 0xd5a33b5200000000, 0x0e865a2e00000000,
+    0x786755b300000000, 0x3a97174e00000000, 0x4c7618d300000000,
+    0x975379af00000000, 0xe1b2763200000000, 0x2118bb5700000000,
+    0x57f9b4ca00000000, 0x8cdcd5b600000000, 0xfa3dda2b00000000,
+    0x0c894e7d00000000, 0x7a6841e000000000, 0xa14d209c00000000,
+    0xd7ac2f0100000000, 0x1706e26400000000, 0x61e7edf900000000,
+    0xbac28c8500000000, 0xcc23831800000000, 0x56aba52800000000,
+    0x204aaab500000000, 0xfb6fcbc900000000, 0x8d8ec45400000000,
+    0x4d24093100000000, 0x3bc506ac00000000, 0xe0e067d000000000,
+    0x9601684d00000000, 0x60b5fc1b00000000, 0x1654f38600000000,
+    0xcd7192fa00000000, 0xbb909d6700000000, 0x7b3a500200000000,
+    0x0ddb5f9f00000000, 0xd6fe3ee300000000, 0xa01f317e00000000,
+    0x1318cac200000000, 0x65f9c55f00000000, 0xbedca42300000000,
+    0xc83dabbe00000000, 0x089766db00000000, 0x7e76694600000000,
+    0xa553083a00000000, 0xd3b207a700000000, 0x250693f100000000,
+    0x53e79c6c00000000, 0x88c2fd1000000000, 0xfe23f28d00000000,
+    0x3e893fe800000000, 0x4868307500000000, 0x934d510900000000,
+    0xe5ac5e9400000000, 0x7f2478a400000000, 0x09c5773900000000,
+    0xd2e0164500000000, 0xa40119d800000000, 0x64abd4bd00000000,
+    0x124adb2000000000, 0xc96fba5c00000000, 0xbf8eb5c100000000,
+    0x493a219700000000, 0x3fdb2e0a00000000, 0xe4fe4f7600000000,
+    0x921f40eb00000000, 0x52b58d8e00000000, 0x2454821300000000,
+    0xff71e36f00000000, 0x8990ecf200000000, 0xcb60ae0f00000000,
+    0xbd81a19200000000, 0x66a4c0ee00000000, 0x1045cf7300000000,
+    0xd0ef021600000000, 0xa60e0d8b00000000, 0x7d2b6cf700000000,
+    0x0bca636a00000000, 0xfd7ef73c00000000, 0x8b9ff8a100000000,
+    0x50ba99dd00000000, 0x265b964000000000, 0xe6f15b2500000000,
+    0x901054b800000000, 0x4b3535c400000000, 0x3dd43a5900000000,
+    0xa75c1c6900000000, 0xd1bd13f400000000, 0x0a98728800000000,
+    0x7c797d1500000000, 0xbcd3b07000000000, 0xca32bfed00000000,
+    0x1117de9100000000, 0x67f6d10c00000000, 0x9142455a00000000,
+    0xe7a34ac700000000, 0x3c862bbb00000000, 0x4a67242600000000,
+    0x8acde94300000000, 0xfc2ce6de00000000, 0x270987a200000000,
+    0x51e8883f00000000},
+   {0x0000000000000000, 0xe8dbfbb900000000, 0x91b186a800000000,
+    0x796a7d1100000000, 0x63657c8a00000000, 0x8bbe873300000000,
+    0xf2d4fa2200000000, 0x1a0f019b00000000, 0x87cc89cf00000000,
+    0x6f17727600000000, 0x167d0f6700000000, 0xfea6f4de00000000,
+    0xe4a9f54500000000, 0x0c720efc00000000, 0x751873ed00000000,
+    0x9dc3885400000000, 0x4f9f624400000000, 0xa74499fd00000000,
+    0xde2ee4ec00000000, 0x36f51f5500000000, 0x2cfa1ece00000000,
+    0xc421e57700000000, 0xbd4b986600000000, 0x559063df00000000,
+    0xc853eb8b00000000, 0x2088103200000000, 0x59e26d2300000000,
+    0xb139969a00000000, 0xab36970100000000, 0x43ed6cb800000000,
+    0x3a8711a900000000, 0xd25cea1000000000, 0x9e3ec58800000000,
+    0x76e53e3100000000, 0x0f8f432000000000, 0xe754b89900000000,
+    0xfd5bb90200000000, 0x158042bb00000000, 0x6cea3faa00000000,
+    0x8431c41300000000, 0x19f24c4700000000, 0xf129b7fe00000000,
+    0x8843caef00000000, 0x6098315600000000, 0x7a9730cd00000000,
+    0x924ccb7400000000, 0xeb26b66500000000, 0x03fd4ddc00000000,
+    0xd1a1a7cc00000000, 0x397a5c7500000000, 0x4010216400000000,
+    0xa8cbdadd00000000, 0xb2c4db4600000000, 0x5a1f20ff00000000,
+    0x23755dee00000000, 0xcbaea65700000000, 0x566d2e0300000000,
+    0xbeb6d5ba00000000, 0xc7dca8ab00000000, 0x2f07531200000000,
+    0x3508528900000000, 0xddd3a93000000000, 0xa4b9d42100000000,
+    0x4c622f9800000000, 0x7d7bfbca00000000, 0x95a0007300000000,
+    0xecca7d6200000000, 0x041186db00000000, 0x1e1e874000000000,
+    0xf6c57cf900000000, 0x8faf01e800000000, 0x6774fa5100000000,
+    0xfab7720500000000, 0x126c89bc00000000, 0x6b06f4ad00000000,
+    0x83dd0f1400000000, 0x99d20e8f00000000, 0x7109f53600000000,
+    0x0863882700000000, 0xe0b8739e00000000, 0x32e4998e00000000,
+    0xda3f623700000000, 0xa3551f2600000000, 0x4b8ee49f00000000,
+    0x5181e50400000000, 0xb95a1ebd00000000, 0xc03063ac00000000,
+    0x28eb981500000000, 0xb528104100000000, 0x5df3ebf800000000,
+    0x249996e900000000, 0xcc426d5000000000, 0xd64d6ccb00000000,
+    0x3e96977200000000, 0x47fcea6300000000, 0xaf2711da00000000,
+    0xe3453e4200000000, 0x0b9ec5fb00000000, 0x72f4b8ea00000000,
+    0x9a2f435300000000, 0x802042c800000000, 0x68fbb97100000000,
+    0x1191c46000000000, 0xf94a3fd900000000, 0x6489b78d00000000,
+    0x8c524c3400000000, 0xf538312500000000, 0x1de3ca9c00000000,
+    0x07eccb0700000000, 0xef3730be00000000, 0x965d4daf00000000,
+    0x7e86b61600000000, 0xacda5c0600000000, 0x4401a7bf00000000,
+    0x3d6bdaae00000000, 0xd5b0211700000000, 0xcfbf208c00000000,
+    0x2764db3500000000, 0x5e0ea62400000000, 0xb6d55d9d00000000,
+    0x2b16d5c900000000, 0xc3cd2e7000000000, 0xbaa7536100000000,
+    0x527ca8d800000000, 0x4873a94300000000, 0xa0a852fa00000000,
+    0xd9c22feb00000000, 0x3119d45200000000, 0xbbf0874e00000000,
+    0x532b7cf700000000, 0x2a4101e600000000, 0xc29afa5f00000000,
+    0xd895fbc400000000, 0x304e007d00000000, 0x49247d6c00000000,
+    0xa1ff86d500000000, 0x3c3c0e8100000000, 0xd4e7f53800000000,
+    0xad8d882900000000, 0x4556739000000000, 0x5f59720b00000000,
+    0xb78289b200000000, 0xcee8f4a300000000, 0x26330f1a00000000,
+    0xf46fe50a00000000, 0x1cb41eb300000000, 0x65de63a200000000,
+    0x8d05981b00000000, 0x970a998000000000, 0x7fd1623900000000,
+    0x06bb1f2800000000, 0xee60e49100000000, 0x73a36cc500000000,
+    0x9b78977c00000000, 0xe212ea6d00000000, 0x0ac911d400000000,
+    0x10c6104f00000000, 0xf81debf600000000, 0x817796e700000000,
+    0x69ac6d5e00000000, 0x25ce42c600000000, 0xcd15b97f00000000,
+    0xb47fc46e00000000, 0x5ca43fd700000000, 0x46ab3e4c00000000,
+    0xae70c5f500000000, 0xd71ab8e400000000, 0x3fc1435d00000000,
+    0xa202cb0900000000, 0x4ad930b000000000, 0x33b34da100000000,
+    0xdb68b61800000000, 0xc167b78300000000, 0x29bc4c3a00000000,
+    0x50d6312b00000000, 0xb80dca9200000000, 0x6a51208200000000,
+    0x828adb3b00000000, 0xfbe0a62a00000000, 0x133b5d9300000000,
+    0x09345c0800000000, 0xe1efa7b100000000, 0x9885daa000000000,
+    0x705e211900000000, 0xed9da94d00000000, 0x054652f400000000,
+    0x7c2c2fe500000000, 0x94f7d45c00000000, 0x8ef8d5c700000000,
+    0x66232e7e00000000, 0x1f49536f00000000, 0xf792a8d600000000,
+    0xc68b7c8400000000, 0x2e50873d00000000, 0x573afa2c00000000,
+    0xbfe1019500000000, 0xa5ee000e00000000, 0x4d35fbb700000000,
+    0x345f86a600000000, 0xdc847d1f00000000, 0x4147f54b00000000,
+    0xa99c0ef200000000, 0xd0f673e300000000, 0x382d885a00000000,
+    0x222289c100000000, 0xcaf9727800000000, 0xb3930f6900000000,
+    0x5b48f4d000000000, 0x89141ec000000000, 0x61cfe57900000000,
+    0x18a5986800000000, 0xf07e63d100000000, 0xea71624a00000000,
+    0x02aa99f300000000, 0x7bc0e4e200000000, 0x931b1f5b00000000,
+    0x0ed8970f00000000, 0xe6036cb600000000, 0x9f6911a700000000,
+    0x77b2ea1e00000000, 0x6dbdeb8500000000, 0x8566103c00000000,
+    0xfc0c6d2d00000000, 0x14d7969400000000, 0x58b5b90c00000000,
+    0xb06e42b500000000, 0xc9043fa400000000, 0x21dfc41d00000000,
+    0x3bd0c58600000000, 0xd30b3e3f00000000, 0xaa61432e00000000,
+    0x42bab89700000000, 0xdf7930c300000000, 0x37a2cb7a00000000,
+    0x4ec8b66b00000000, 0xa6134dd200000000, 0xbc1c4c4900000000,
+    0x54c7b7f000000000, 0x2dadcae100000000, 0xc576315800000000,
+    0x172adb4800000000, 0xfff120f100000000, 0x869b5de000000000,
+    0x6e40a65900000000, 0x744fa7c200000000, 0x9c945c7b00000000,
+    0xe5fe216a00000000, 0x0d25dad300000000, 0x90e6528700000000,
+    0x783da93e00000000, 0x0157d42f00000000, 0xe98c2f9600000000,
+    0xf3832e0d00000000, 0x1b58d5b400000000, 0x6232a8a500000000,
+    0x8ae9531c00000000},
+   {0x0000000000000000, 0x919168ae00000000, 0x6325a08700000000,
+    0xf2b4c82900000000, 0x874c31d400000000, 0x16dd597a00000000,
+    0xe469915300000000, 0x75f8f9fd00000000, 0x4f9f137300000000,
+    0xde0e7bdd00000000, 0x2cbab3f400000000, 0xbd2bdb5a00000000,
+    0xc8d322a700000000, 0x59424a0900000000, 0xabf6822000000000,
+    0x3a67ea8e00000000, 0x9e3e27e600000000, 0x0faf4f4800000000,
+    0xfd1b876100000000, 0x6c8aefcf00000000, 0x1972163200000000,
+    0x88e37e9c00000000, 0x7a57b6b500000000, 0xebc6de1b00000000,
+    0xd1a1349500000000, 0x40305c3b00000000, 0xb284941200000000,
+    0x2315fcbc00000000, 0x56ed054100000000, 0xc77c6def00000000,
+    0x35c8a5c600000000, 0xa459cd6800000000, 0x7d7b3f1700000000,
+    0xecea57b900000000, 0x1e5e9f9000000000, 0x8fcff73e00000000,
+    0xfa370ec300000000, 0x6ba6666d00000000, 0x9912ae4400000000,
+    0x0883c6ea00000000, 0x32e42c6400000000, 0xa37544ca00000000,
+    0x51c18ce300000000, 0xc050e44d00000000, 0xb5a81db000000000,
+    0x2439751e00000000, 0xd68dbd3700000000, 0x471cd59900000000,
+    0xe34518f100000000, 0x72d4705f00000000, 0x8060b87600000000,
+    0x11f1d0d800000000, 0x6409292500000000, 0xf598418b00000000,
+    0x072c89a200000000, 0x96bde10c00000000, 0xacda0b8200000000,
+    0x3d4b632c00000000, 0xcfffab0500000000, 0x5e6ec3ab00000000,
+    0x2b963a5600000000, 0xba0752f800000000, 0x48b39ad100000000,
+    0xd922f27f00000000, 0xfaf67e2e00000000, 0x6b67168000000000,
+    0x99d3dea900000000, 0x0842b60700000000, 0x7dba4ffa00000000,
+    0xec2b275400000000, 0x1e9fef7d00000000, 0x8f0e87d300000000,
+    0xb5696d5d00000000, 0x24f805f300000000, 0xd64ccdda00000000,
+    0x47dda57400000000, 0x32255c8900000000, 0xa3b4342700000000,
+    0x5100fc0e00000000, 0xc09194a000000000, 0x64c859c800000000,
+    0xf559316600000000, 0x07edf94f00000000, 0x967c91e100000000,
+    0xe384681c00000000, 0x721500b200000000, 0x80a1c89b00000000,
+    0x1130a03500000000, 0x2b574abb00000000, 0xbac6221500000000,
+    0x4872ea3c00000000, 0xd9e3829200000000, 0xac1b7b6f00000000,
+    0x3d8a13c100000000, 0xcf3edbe800000000, 0x5eafb34600000000,
+    0x878d413900000000, 0x161c299700000000, 0xe4a8e1be00000000,
+    0x7539891000000000, 0x00c170ed00000000, 0x9150184300000000,
+    0x63e4d06a00000000, 0xf275b8c400000000, 0xc812524a00000000,
+    0x59833ae400000000, 0xab37f2cd00000000, 0x3aa69a6300000000,
+    0x4f5e639e00000000, 0xdecf0b3000000000, 0x2c7bc31900000000,
+    0xbdeaabb700000000, 0x19b366df00000000, 0x88220e7100000000,
+    0x7a96c65800000000, 0xeb07aef600000000, 0x9eff570b00000000,
+    0x0f6e3fa500000000, 0xfddaf78c00000000, 0x6c4b9f2200000000,
+    0x562c75ac00000000, 0xc7bd1d0200000000, 0x3509d52b00000000,
+    0xa498bd8500000000, 0xd160447800000000, 0x40f12cd600000000,
+    0xb245e4ff00000000, 0x23d48c5100000000, 0xf4edfd5c00000000,
+    0x657c95f200000000, 0x97c85ddb00000000, 0x0659357500000000,
+    0x73a1cc8800000000, 0xe230a42600000000, 0x10846c0f00000000,
+    0x811504a100000000, 0xbb72ee2f00000000, 0x2ae3868100000000,
+    0xd8574ea800000000, 0x49c6260600000000, 0x3c3edffb00000000,
+    0xadafb75500000000, 0x5f1b7f7c00000000, 0xce8a17d200000000,
+    0x6ad3daba00000000, 0xfb42b21400000000, 0x09f67a3d00000000,
+    0x9867129300000000, 0xed9feb6e00000000, 0x7c0e83c000000000,
+    0x8eba4be900000000, 0x1f2b234700000000, 0x254cc9c900000000,
+    0xb4dda16700000000, 0x4669694e00000000, 0xd7f801e000000000,
+    0xa200f81d00000000, 0x339190b300000000, 0xc125589a00000000,
+    0x50b4303400000000, 0x8996c24b00000000, 0x1807aae500000000,
+    0xeab362cc00000000, 0x7b220a6200000000, 0x0edaf39f00000000,
+    0x9f4b9b3100000000, 0x6dff531800000000, 0xfc6e3bb600000000,
+    0xc609d13800000000, 0x5798b99600000000, 0xa52c71bf00000000,
+    0x34bd191100000000, 0x4145e0ec00000000, 0xd0d4884200000000,
+    0x2260406b00000000, 0xb3f128c500000000, 0x17a8e5ad00000000,
+    0x86398d0300000000, 0x748d452a00000000, 0xe51c2d8400000000,
+    0x90e4d47900000000, 0x0175bcd700000000, 0xf3c174fe00000000,
+    0x62501c5000000000, 0x5837f6de00000000, 0xc9a69e7000000000,
+    0x3b12565900000000, 0xaa833ef700000000, 0xdf7bc70a00000000,
+    0x4eeaafa400000000, 0xbc5e678d00000000, 0x2dcf0f2300000000,
+    0x0e1b837200000000, 0x9f8aebdc00000000, 0x6d3e23f500000000,
+    0xfcaf4b5b00000000, 0x8957b2a600000000, 0x18c6da0800000000,
+    0xea72122100000000, 0x7be37a8f00000000, 0x4184900100000000,
+    0xd015f8af00000000, 0x22a1308600000000, 0xb330582800000000,
+    0xc6c8a1d500000000, 0x5759c97b00000000, 0xa5ed015200000000,
+    0x347c69fc00000000, 0x9025a49400000000, 0x01b4cc3a00000000,
+    0xf300041300000000, 0x62916cbd00000000, 0x1769954000000000,
+    0x86f8fdee00000000, 0x744c35c700000000, 0xe5dd5d6900000000,
+    0xdfbab7e700000000, 0x4e2bdf4900000000, 0xbc9f176000000000,
+    0x2d0e7fce00000000, 0x58f6863300000000, 0xc967ee9d00000000,
+    0x3bd326b400000000, 0xaa424e1a00000000, 0x7360bc6500000000,
+    0xe2f1d4cb00000000, 0x10451ce200000000, 0x81d4744c00000000,
+    0xf42c8db100000000, 0x65bde51f00000000, 0x97092d3600000000,
+    0x0698459800000000, 0x3cffaf1600000000, 0xad6ec7b800000000,
+    0x5fda0f9100000000, 0xce4b673f00000000, 0xbbb39ec200000000,
+    0x2a22f66c00000000, 0xd8963e4500000000, 0x490756eb00000000,
+    0xed5e9b8300000000, 0x7ccff32d00000000, 0x8e7b3b0400000000,
+    0x1fea53aa00000000, 0x6a12aa5700000000, 0xfb83c2f900000000,
+    0x09370ad000000000, 0x98a6627e00000000, 0xa2c188f000000000,
+    0x3350e05e00000000, 0xc1e4287700000000, 0x507540d900000000,
+    0x258db92400000000, 0xb41cd18a00000000, 0x46a819a300000000,
+    0xd739710d00000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0xb029603d, 0x6053c07a, 0xd07aa047, 0xc0a680f5,
+    0x708fe0c8, 0xa0f5408f, 0x10dc20b2, 0xc14b7030, 0x7162100d,
+    0xa118b04a, 0x1131d077, 0x01edf0c5, 0xb1c490f8, 0x61be30bf,
+    0xd1975082, 0x8297e060, 0x32be805d, 0xe2c4201a, 0x52ed4027,
+    0x42316095, 0xf21800a8, 0x2262a0ef, 0x924bc0d2, 0x43dc9050,
+    0xf3f5f06d, 0x238f502a, 0x93a63017, 0x837a10a5, 0x33537098,
+    0xe329d0df, 0x5300b0e2, 0x042fc1c1, 0xb406a1fc, 0x647c01bb,
+    0xd4556186, 0xc4894134, 0x74a02109, 0xa4da814e, 0x14f3e173,
+    0xc564b1f1, 0x754dd1cc, 0xa537718b, 0x151e11b6, 0x05c23104,
+    0xb5eb5139, 0x6591f17e, 0xd5b89143, 0x86b821a1, 0x3691419c,
+    0xe6ebe1db, 0x56c281e6, 0x461ea154, 0xf637c169, 0x264d612e,
+    0x96640113, 0x47f35191, 0xf7da31ac, 0x27a091eb, 0x9789f1d6,
+    0x8755d164, 0x377cb159, 0xe706111e, 0x572f7123, 0x4958f358,
+    0xf9719365, 0x290b3322, 0x9922531f, 0x89fe73ad, 0x39d71390,
+    0xe9adb3d7, 0x5984d3ea, 0x88138368, 0x383ae355, 0xe8404312,
+    0x5869232f, 0x48b5039d, 0xf89c63a0, 0x28e6c3e7, 0x98cfa3da,
+    0xcbcf1338, 0x7be67305, 0xab9cd342, 0x1bb5b37f, 0x0b6993cd,
+    0xbb40f3f0, 0x6b3a53b7, 0xdb13338a, 0x0a846308, 0xbaad0335,
+    0x6ad7a372, 0xdafec34f, 0xca22e3fd, 0x7a0b83c0, 0xaa712387,
+    0x1a5843ba, 0x4d773299, 0xfd5e52a4, 0x2d24f2e3, 0x9d0d92de,
+    0x8dd1b26c, 0x3df8d251, 0xed827216, 0x5dab122b, 0x8c3c42a9,
+    0x3c152294, 0xec6f82d3, 0x5c46e2ee, 0x4c9ac25c, 0xfcb3a261,
+    0x2cc90226, 0x9ce0621b, 0xcfe0d2f9, 0x7fc9b2c4, 0xafb31283,
+    0x1f9a72be, 0x0f46520c, 0xbf6f3231, 0x6f159276, 0xdf3cf24b,
+    0x0eaba2c9, 0xbe82c2f4, 0x6ef862b3, 0xded1028e, 0xce0d223c,
+    0x7e244201, 0xae5ee246, 0x1e77827b, 0x92b0e6b1, 0x2299868c,
+    0xf2e326cb, 0x42ca46f6, 0x52166644, 0xe23f0679, 0x3245a63e,
+    0x826cc603, 0x53fb9681, 0xe3d2f6bc, 0x33a856fb, 0x838136c6,
+    0x935d1674, 0x23747649, 0xf30ed60e, 0x4327b633, 0x102706d1,
+    0xa00e66ec, 0x7074c6ab, 0xc05da696, 0xd0818624, 0x60a8e619,
+    0xb0d2465e, 0x00fb2663, 0xd16c76e1, 0x614516dc, 0xb13fb69b,
+    0x0116d6a6, 0x11caf614, 0xa1e39629, 0x7199366e, 0xc1b05653,
+    0x969f2770, 0x26b6474d, 0xf6cce70a, 0x46e58737, 0x5639a785,
+    0xe610c7b8, 0x366a67ff, 0x864307c2, 0x57d45740, 0xe7fd377d,
+    0x3787973a, 0x87aef707, 0x9772d7b5, 0x275bb788, 0xf72117cf,
+    0x470877f2, 0x1408c710, 0xa421a72d, 0x745b076a, 0xc4726757,
+    0xd4ae47e5, 0x648727d8, 0xb4fd879f, 0x04d4e7a2, 0xd543b720,
+    0x656ad71d, 0xb510775a, 0x05391767, 0x15e537d5, 0xa5cc57e8,
+    0x75b6f7af, 0xc59f9792, 0xdbe815e9, 0x6bc175d4, 0xbbbbd593,
+    0x0b92b5ae, 0x1b4e951c, 0xab67f521, 0x7b1d5566, 0xcb34355b,
+    0x1aa365d9, 0xaa8a05e4, 0x7af0a5a3, 0xcad9c59e, 0xda05e52c,
+    0x6a2c8511, 0xba562556, 0x0a7f456b, 0x597ff589, 0xe95695b4,
+    0x392c35f3, 0x890555ce, 0x99d9757c, 0x29f01541, 0xf98ab506,
+    0x49a3d53b, 0x983485b9, 0x281de584, 0xf86745c3, 0x484e25fe,
+    0x5892054c, 0xe8bb6571, 0x38c1c536, 0x88e8a50b, 0xdfc7d428,
+    0x6feeb415, 0xbf941452, 0x0fbd746f, 0x1f6154dd, 0xaf4834e0,
+    0x7f3294a7, 0xcf1bf49a, 0x1e8ca418, 0xaea5c425, 0x7edf6462,
+    0xcef6045f, 0xde2a24ed, 0x6e0344d0, 0xbe79e497, 0x0e5084aa,
+    0x5d503448, 0xed795475, 0x3d03f432, 0x8d2a940f, 0x9df6b4bd,
+    0x2ddfd480, 0xfda574c7, 0x4d8c14fa, 0x9c1b4478, 0x2c322445,
+    0xfc488402, 0x4c61e43f, 0x5cbdc48d, 0xec94a4b0, 0x3cee04f7,
+    0x8cc764ca},
+   {0x00000000, 0xa5d35ccb, 0x0ba1c84d, 0xae729486, 0x1642919b,
+    0xb391cd50, 0x1de359d6, 0xb830051d, 0x6d8253ec, 0xc8510f27,
+    0x66239ba1, 0xc3f0c76a, 0x7bc0c277, 0xde139ebc, 0x70610a3a,
+    0xd5b256f1, 0x9b02d603, 0x3ed18ac8, 0x90a31e4e, 0x35704285,
+    0x8d404798, 0x28931b53, 0x86e18fd5, 0x2332d31e, 0xf68085ef,
+    0x5353d924, 0xfd214da2, 0x58f21169, 0xe0c21474, 0x451148bf,
+    0xeb63dc39, 0x4eb080f2, 0x3605ac07, 0x93d6f0cc, 0x3da4644a,
+    0x98773881, 0x20473d9c, 0x85946157, 0x2be6f5d1, 0x8e35a91a,
+    0x5b87ffeb, 0xfe54a320, 0x502637a6, 0xf5f56b6d, 0x4dc56e70,
+    0xe81632bb, 0x4664a63d, 0xe3b7faf6, 0xad077a04, 0x08d426cf,
+    0xa6a6b249, 0x0375ee82, 0xbb45eb9f, 0x1e96b754, 0xb0e423d2,
+    0x15377f19, 0xc08529e8, 0x65567523, 0xcb24e1a5, 0x6ef7bd6e,
+    0xd6c7b873, 0x7314e4b8, 0xdd66703e, 0x78b52cf5, 0x6c0a580f,
+    0xc9d904c4, 0x67ab9042, 0xc278cc89, 0x7a48c994, 0xdf9b955f,
+    0x71e901d9, 0xd43a5d12, 0x01880be3, 0xa45b5728, 0x0a29c3ae,
+    0xaffa9f65, 0x17ca9a78, 0xb219c6b3, 0x1c6b5235, 0xb9b80efe,
+    0xf7088e0c, 0x52dbd2c7, 0xfca94641, 0x597a1a8a, 0xe14a1f97,
+    0x4499435c, 0xeaebd7da, 0x4f388b11, 0x9a8adde0, 0x3f59812b,
+    0x912b15ad, 0x34f84966, 0x8cc84c7b, 0x291b10b0, 0x87698436,
+    0x22bad8fd, 0x5a0ff408, 0xffdca8c3, 0x51ae3c45, 0xf47d608e,
+    0x4c4d6593, 0xe99e3958, 0x47ecadde, 0xe23ff115, 0x378da7e4,
+    0x925efb2f, 0x3c2c6fa9, 0x99ff3362, 0x21cf367f, 0x841c6ab4,
+    0x2a6efe32, 0x8fbda2f9, 0xc10d220b, 0x64de7ec0, 0xcaacea46,
+    0x6f7fb68d, 0xd74fb390, 0x729cef5b, 0xdcee7bdd, 0x793d2716,
+    0xac8f71e7, 0x095c2d2c, 0xa72eb9aa, 0x02fde561, 0xbacde07c,
+    0x1f1ebcb7, 0xb16c2831, 0x14bf74fa, 0xd814b01e, 0x7dc7ecd5,
+    0xd3b57853, 0x76662498, 0xce562185, 0x6b857d4e, 0xc5f7e9c8,
+    0x6024b503, 0xb596e3f2, 0x1045bf39, 0xbe372bbf, 0x1be47774,
+    0xa3d47269, 0x06072ea2, 0xa875ba24, 0x0da6e6ef, 0x4316661d,
+    0xe6c53ad6, 0x48b7ae50, 0xed64f29b, 0x5554f786, 0xf087ab4d,
+    0x5ef53fcb, 0xfb266300, 0x2e9435f1, 0x8b47693a, 0x2535fdbc,
+    0x80e6a177, 0x38d6a46a, 0x9d05f8a1, 0x33776c27, 0x96a430ec,
+    0xee111c19, 0x4bc240d2, 0xe5b0d454, 0x4063889f, 0xf8538d82,
+    0x5d80d149, 0xf3f245cf, 0x56211904, 0x83934ff5, 0x2640133e,
+    0x883287b8, 0x2de1db73, 0x95d1de6e, 0x300282a5, 0x9e701623,
+    0x3ba34ae8, 0x7513ca1a, 0xd0c096d1, 0x7eb20257, 0xdb615e9c,
+    0x63515b81, 0xc682074a, 0x68f093cc, 0xcd23cf07, 0x189199f6,
+    0xbd42c53d, 0x133051bb, 0xb6e30d70, 0x0ed3086d, 0xab0054a6,
+    0x0572c020, 0xa0a19ceb, 0xb41ee811, 0x11cdb4da, 0xbfbf205c,
+    0x1a6c7c97, 0xa25c798a, 0x078f2541, 0xa9fdb1c7, 0x0c2eed0c,
+    0xd99cbbfd, 0x7c4fe736, 0xd23d73b0, 0x77ee2f7b, 0xcfde2a66,
+    0x6a0d76ad, 0xc47fe22b, 0x61acbee0, 0x2f1c3e12, 0x8acf62d9,
+    0x24bdf65f, 0x816eaa94, 0x395eaf89, 0x9c8df342, 0x32ff67c4,
+    0x972c3b0f, 0x429e6dfe, 0xe74d3135, 0x493fa5b3, 0xececf978,
+    0x54dcfc65, 0xf10fa0ae, 0x5f7d3428, 0xfaae68e3, 0x821b4416,
+    0x27c818dd, 0x89ba8c5b, 0x2c69d090, 0x9459d58d, 0x318a8946,
+    0x9ff81dc0, 0x3a2b410b, 0xef9917fa, 0x4a4a4b31, 0xe438dfb7,
+    0x41eb837c, 0xf9db8661, 0x5c08daaa, 0xf27a4e2c, 0x57a912e7,
+    0x19199215, 0xbccacede, 0x12b85a58, 0xb76b0693, 0x0f5b038e,
+    0xaa885f45, 0x04facbc3, 0xa1299708, 0x749bc1f9, 0xd1489d32,
+    0x7f3a09b4, 0xdae9557f, 0x62d95062, 0xc70a0ca9, 0x6978982f,
+    0xccabc4e4},
+   {0x00000000, 0xb40b77a6, 0x29119f97, 0x9d1ae831, 0x13244ff4,
+    0xa72f3852, 0x3a35d063, 0x8e3ea7c5, 0x674eef33, 0xd3459895,
+    0x4e5f70a4, 0xfa540702, 0x746aa0c7, 0xc061d761, 0x5d7b3f50,
+    0xe97048f6, 0xce9cde67, 0x7a97a9c1, 0xe78d41f0, 0x53863656,
+    0xddb89193, 0x69b3e635, 0xf4a90e04, 0x40a279a2, 0xa9d23154,
+    0x1dd946f2, 0x80c3aec3, 0x34c8d965, 0xbaf67ea0, 0x0efd0906,
+    0x93e7e137, 0x27ec9691, 0x9c39bdcf, 0x2832ca69, 0xb5282258,
+    0x012355fe, 0x8f1df23b, 0x3b16859d, 0xa60c6dac, 0x12071a0a,
+    0xfb7752fc, 0x4f7c255a, 0xd266cd6b, 0x666dbacd, 0xe8531d08,
+    0x5c586aae, 0xc142829f, 0x7549f539, 0x52a563a8, 0xe6ae140e,
+    0x7bb4fc3f, 0xcfbf8b99, 0x41812c5c, 0xf58a5bfa, 0x6890b3cb,
+    0xdc9bc46d, 0x35eb8c9b, 0x81e0fb3d, 0x1cfa130c, 0xa8f164aa,
+    0x26cfc36f, 0x92c4b4c9, 0x0fde5cf8, 0xbbd52b5e, 0x79750b44,
+    0xcd7e7ce2, 0x506494d3, 0xe46fe375, 0x6a5144b0, 0xde5a3316,
+    0x4340db27, 0xf74bac81, 0x1e3be477, 0xaa3093d1, 0x372a7be0,
+    0x83210c46, 0x0d1fab83, 0xb914dc25, 0x240e3414, 0x900543b2,
+    0xb7e9d523, 0x03e2a285, 0x9ef84ab4, 0x2af33d12, 0xa4cd9ad7,
+    0x10c6ed71, 0x8ddc0540, 0x39d772e6, 0xd0a73a10, 0x64ac4db6,
+    0xf9b6a587, 0x4dbdd221, 0xc38375e4, 0x77880242, 0xea92ea73,
+    0x5e999dd5, 0xe54cb68b, 0x5147c12d, 0xcc5d291c, 0x78565eba,
+    0xf668f97f, 0x42638ed9, 0xdf7966e8, 0x6b72114e, 0x820259b8,
+    0x36092e1e, 0xab13c62f, 0x1f18b189, 0x9126164c, 0x252d61ea,
+    0xb83789db, 0x0c3cfe7d, 0x2bd068ec, 0x9fdb1f4a, 0x02c1f77b,
+    0xb6ca80dd, 0x38f42718, 0x8cff50be, 0x11e5b88f, 0xa5eecf29,
+    0x4c9e87df, 0xf895f079, 0x658f1848, 0xd1846fee, 0x5fbac82b,
+    0xebb1bf8d, 0x76ab57bc, 0xc2a0201a, 0xf2ea1688, 0x46e1612e,
+    0xdbfb891f, 0x6ff0feb9, 0xe1ce597c, 0x55c52eda, 0xc8dfc6eb,
+    0x7cd4b14d, 0x95a4f9bb, 0x21af8e1d, 0xbcb5662c, 0x08be118a,
+    0x8680b64f, 0x328bc1e9, 0xaf9129d8, 0x1b9a5e7e, 0x3c76c8ef,
+    0x887dbf49, 0x15675778, 0xa16c20de, 0x2f52871b, 0x9b59f0bd,
+    0x0643188c, 0xb2486f2a, 0x5b3827dc, 0xef33507a, 0x7229b84b,
+    0xc622cfed, 0x481c6828, 0xfc171f8e, 0x610df7bf, 0xd5068019,
+    0x6ed3ab47, 0xdad8dce1, 0x47c234d0, 0xf3c94376, 0x7df7e4b3,
+    0xc9fc9315, 0x54e67b24, 0xe0ed0c82, 0x099d4474, 0xbd9633d2,
+    0x208cdbe3, 0x9487ac45, 0x1ab90b80, 0xaeb27c26, 0x33a89417,
+    0x87a3e3b1, 0xa04f7520, 0x14440286, 0x895eeab7, 0x3d559d11,
+    0xb36b3ad4, 0x07604d72, 0x9a7aa543, 0x2e71d2e5, 0xc7019a13,
+    0x730aedb5, 0xee100584, 0x5a1b7222, 0xd425d5e7, 0x602ea241,
+    0xfd344a70, 0x493f3dd6, 0x8b9f1dcc, 0x3f946a6a, 0xa28e825b,
+    0x1685f5fd, 0x98bb5238, 0x2cb0259e, 0xb1aacdaf, 0x05a1ba09,
+    0xecd1f2ff, 0x58da8559, 0xc5c06d68, 0x71cb1ace, 0xfff5bd0b,
+    0x4bfecaad, 0xd6e4229c, 0x62ef553a, 0x4503c3ab, 0xf108b40d,
+    0x6c125c3c, 0xd8192b9a, 0x56278c5f, 0xe22cfbf9, 0x7f3613c8,
+    0xcb3d646e, 0x224d2c98, 0x96465b3e, 0x0b5cb30f, 0xbf57c4a9,
+    0x3169636c, 0x856214ca, 0x1878fcfb, 0xac738b5d, 0x17a6a003,
+    0xa3add7a5, 0x3eb73f94, 0x8abc4832, 0x0482eff7, 0xb0899851,
+    0x2d937060, 0x999807c6, 0x70e84f30, 0xc4e33896, 0x59f9d0a7,
+    0xedf2a701, 0x63cc00c4, 0xd7c77762, 0x4add9f53, 0xfed6e8f5,
+    0xd93a7e64, 0x6d3109c2, 0xf02be1f3, 0x44209655, 0xca1e3190,
+    0x7e154636, 0xe30fae07, 0x5704d9a1, 0xbe749157, 0x0a7fe6f1,
+    0x97650ec0, 0x236e7966, 0xad50dea3, 0x195ba905, 0x84414134,
+    0x304a3692},
+   {0x00000000, 0x9e00aacc, 0x7d072542, 0xe3078f8e, 0xfa0e4a84,
+    0x640ee048, 0x87096fc6, 0x1909c50a, 0xb51be5d3, 0x2b1b4f1f,
+    0xc81cc091, 0x561c6a5d, 0x4f15af57, 0xd115059b, 0x32128a15,
+    0xac1220d9, 0x2b31bb7c, 0xb53111b0, 0x56369e3e, 0xc83634f2,
+    0xd13ff1f8, 0x4f3f5b34, 0xac38d4ba, 0x32387e76, 0x9e2a5eaf,
+    0x002af463, 0xe32d7bed, 0x7d2dd121, 0x6424142b, 0xfa24bee7,
+    0x19233169, 0x87239ba5, 0x566276f9, 0xc862dc35, 0x2b6553bb,
+    0xb565f977, 0xac6c3c7d, 0x326c96b1, 0xd16b193f, 0x4f6bb3f3,
+    0xe379932a, 0x7d7939e6, 0x9e7eb668, 0x007e1ca4, 0x1977d9ae,
+    0x87777362, 0x6470fcec, 0xfa705620, 0x7d53cd85, 0xe3536749,
+    0x0054e8c7, 0x9e54420b, 0x875d8701, 0x195d2dcd, 0xfa5aa243,
+    0x645a088f, 0xc8482856, 0x5648829a, 0xb54f0d14, 0x2b4fa7d8,
+    0x324662d2, 0xac46c81e, 0x4f414790, 0xd141ed5c, 0xedc29d29,
+    0x73c237e5, 0x90c5b86b, 0x0ec512a7, 0x17ccd7ad, 0x89cc7d61,
+    0x6acbf2ef, 0xf4cb5823, 0x58d978fa, 0xc6d9d236, 0x25de5db8,
+    0xbbdef774, 0xa2d7327e, 0x3cd798b2, 0xdfd0173c, 0x41d0bdf0,
+    0xc6f32655, 0x58f38c99, 0xbbf40317, 0x25f4a9db, 0x3cfd6cd1,
+    0xa2fdc61d, 0x41fa4993, 0xdffae35f, 0x73e8c386, 0xede8694a,
+    0x0eefe6c4, 0x90ef4c08, 0x89e68902, 0x17e623ce, 0xf4e1ac40,
+    0x6ae1068c, 0xbba0ebd0, 0x25a0411c, 0xc6a7ce92, 0x58a7645e,
+    0x41aea154, 0xdfae0b98, 0x3ca98416, 0xa2a92eda, 0x0ebb0e03,
+    0x90bba4cf, 0x73bc2b41, 0xedbc818d, 0xf4b54487, 0x6ab5ee4b,
+    0x89b261c5, 0x17b2cb09, 0x909150ac, 0x0e91fa60, 0xed9675ee,
+    0x7396df22, 0x6a9f1a28, 0xf49fb0e4, 0x17983f6a, 0x899895a6,
+    0x258ab57f, 0xbb8a1fb3, 0x588d903d, 0xc68d3af1, 0xdf84fffb,
+    0x41845537, 0xa283dab9, 0x3c837075, 0xda853b53, 0x4485919f,
+    0xa7821e11, 0x3982b4dd, 0x208b71d7, 0xbe8bdb1b, 0x5d8c5495,
+    0xc38cfe59, 0x6f9ede80, 0xf19e744c, 0x1299fbc2, 0x8c99510e,
+    0x95909404, 0x0b903ec8, 0xe897b146, 0x76971b8a, 0xf1b4802f,
+    0x6fb42ae3, 0x8cb3a56d, 0x12b30fa1, 0x0bbacaab, 0x95ba6067,
+    0x76bdefe9, 0xe8bd4525, 0x44af65fc, 0xdaafcf30, 0x39a840be,
+    0xa7a8ea72, 0xbea12f78, 0x20a185b4, 0xc3a60a3a, 0x5da6a0f6,
+    0x8ce74daa, 0x12e7e766, 0xf1e068e8, 0x6fe0c224, 0x76e9072e,
+    0xe8e9ade2, 0x0bee226c, 0x95ee88a0, 0x39fca879, 0xa7fc02b5,
+    0x44fb8d3b, 0xdafb27f7, 0xc3f2e2fd, 0x5df24831, 0xbef5c7bf,
+    0x20f56d73, 0xa7d6f6d6, 0x39d65c1a, 0xdad1d394, 0x44d17958,
+    0x5dd8bc52, 0xc3d8169e, 0x20df9910, 0xbedf33dc, 0x12cd1305,
+    0x8ccdb9c9, 0x6fca3647, 0xf1ca9c8b, 0xe8c35981, 0x76c3f34d,
+    0x95c47cc3, 0x0bc4d60f, 0x3747a67a, 0xa9470cb6, 0x4a408338,
+    0xd44029f4, 0xcd49ecfe, 0x53494632, 0xb04ec9bc, 0x2e4e6370,
+    0x825c43a9, 0x1c5ce965, 0xff5b66eb, 0x615bcc27, 0x7852092d,
+    0xe652a3e1, 0x05552c6f, 0x9b5586a3, 0x1c761d06, 0x8276b7ca,
+    0x61713844, 0xff719288, 0xe6785782, 0x7878fd4e, 0x9b7f72c0,
+    0x057fd80c, 0xa96df8d5, 0x376d5219, 0xd46add97, 0x4a6a775b,
+    0x5363b251, 0xcd63189d, 0x2e649713, 0xb0643ddf, 0x6125d083,
+    0xff257a4f, 0x1c22f5c1, 0x82225f0d, 0x9b2b9a07, 0x052b30cb,
+    0xe62cbf45, 0x782c1589, 0xd43e3550, 0x4a3e9f9c, 0xa9391012,
+    0x3739bade, 0x2e307fd4, 0xb030d518, 0x53375a96, 0xcd37f05a,
+    0x4a146bff, 0xd414c133, 0x37134ebd, 0xa913e471, 0xb01a217b,
+    0x2e1a8bb7, 0xcd1d0439, 0x531daef5, 0xff0f8e2c, 0x610f24e0,
+    0x8208ab6e, 0x1c0801a2, 0x0501c4a8, 0x9b016e64, 0x7806e1ea,
+    0xe6064b26}};
+
+#endif
+
+#endif
+
+#if N == 3
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848},
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43cba68700000000, 0xc7903cd400000000,
+    0x845b9a5300000000, 0xcf27087300000000, 0x8cecaef400000000,
+    0x08b734a700000000, 0x4b7c922000000000, 0x9e4f10e600000000,
+    0xdd84b66100000000, 0x59df2c3200000000, 0x1a148ab500000000,
+    0x5168189500000000, 0x12a3be1200000000, 0x96f8244100000000,
+    0xd53382c600000000, 0x7d99511700000000, 0x3e52f79000000000,
+    0xba096dc300000000, 0xf9c2cb4400000000, 0xb2be596400000000,
+    0xf175ffe300000000, 0x752e65b000000000, 0x36e5c33700000000,
+    0xe3d641f100000000, 0xa01de77600000000, 0x24467d2500000000,
+    0x678ddba200000000, 0x2cf1498200000000, 0x6f3aef0500000000,
+    0xeb61755600000000, 0xa8aad3d100000000, 0xfa32a32e00000000,
+    0xb9f905a900000000, 0x3da29ffa00000000, 0x7e69397d00000000,
+    0x3515ab5d00000000, 0x76de0dda00000000, 0xf285978900000000,
+    0xb14e310e00000000, 0x647db3c800000000, 0x27b6154f00000000,
+    0xa3ed8f1c00000000, 0xe026299b00000000, 0xab5abbbb00000000,
+    0xe8911d3c00000000, 0x6cca876f00000000, 0x2f0121e800000000,
+    0x87abf23900000000, 0xc46054be00000000, 0x403bceed00000000,
+    0x03f0686a00000000, 0x488cfa4a00000000, 0x0b475ccd00000000,
+    0x8f1cc69e00000000, 0xccd7601900000000, 0x19e4e2df00000000,
+    0x5a2f445800000000, 0xde74de0b00000000, 0x9dbf788c00000000,
+    0xd6c3eaac00000000, 0x95084c2b00000000, 0x1153d67800000000,
+    0x529870ff00000000, 0xf465465d00000000, 0xb7aee0da00000000,
+    0x33f57a8900000000, 0x703edc0e00000000, 0x3b424e2e00000000,
+    0x7889e8a900000000, 0xfcd272fa00000000, 0xbf19d47d00000000,
+    0x6a2a56bb00000000, 0x29e1f03c00000000, 0xadba6a6f00000000,
+    0xee71cce800000000, 0xa50d5ec800000000, 0xe6c6f84f00000000,
+    0x629d621c00000000, 0x2156c49b00000000, 0x89fc174a00000000,
+    0xca37b1cd00000000, 0x4e6c2b9e00000000, 0x0da78d1900000000,
+    0x46db1f3900000000, 0x0510b9be00000000, 0x814b23ed00000000,
+    0xc280856a00000000, 0x17b307ac00000000, 0x5478a12b00000000,
+    0xd0233b7800000000, 0x93e89dff00000000, 0xd8940fdf00000000,
+    0x9b5fa95800000000, 0x1f04330b00000000, 0x5ccf958c00000000,
+    0x0e57e57300000000, 0x4d9c43f400000000, 0xc9c7d9a700000000,
+    0x8a0c7f2000000000, 0xc170ed0000000000, 0x82bb4b8700000000,
+    0x06e0d1d400000000, 0x452b775300000000, 0x9018f59500000000,
+    0xd3d3531200000000, 0x5788c94100000000, 0x14436fc600000000,
+    0x5f3ffde600000000, 0x1cf45b6100000000, 0x98afc13200000000,
+    0xdb6467b500000000, 0x73ceb46400000000, 0x300512e300000000,
+    0xb45e88b000000000, 0xf7952e3700000000, 0xbce9bc1700000000,
+    0xff221a9000000000, 0x7b7980c300000000, 0x38b2264400000000,
+    0xed81a48200000000, 0xae4a020500000000, 0x2a11985600000000,
+    0x69da3ed100000000, 0x22a6acf100000000, 0x616d0a7600000000,
+    0xe536902500000000, 0xa6fd36a200000000, 0xe8cb8cba00000000,
+    0xab002a3d00000000, 0x2f5bb06e00000000, 0x6c9016e900000000,
+    0x27ec84c900000000, 0x6427224e00000000, 0xe07cb81d00000000,
+    0xa3b71e9a00000000, 0x76849c5c00000000, 0x354f3adb00000000,
+    0xb114a08800000000, 0xf2df060f00000000, 0xb9a3942f00000000,
+    0xfa6832a800000000, 0x7e33a8fb00000000, 0x3df80e7c00000000,
+    0x9552ddad00000000, 0xd6997b2a00000000, 0x52c2e17900000000,
+    0x110947fe00000000, 0x5a75d5de00000000, 0x19be735900000000,
+    0x9de5e90a00000000, 0xde2e4f8d00000000, 0x0b1dcd4b00000000,
+    0x48d66bcc00000000, 0xcc8df19f00000000, 0x8f46571800000000,
+    0xc43ac53800000000, 0x87f163bf00000000, 0x03aaf9ec00000000,
+    0x40615f6b00000000, 0x12f92f9400000000, 0x5132891300000000,
+    0xd569134000000000, 0x96a2b5c700000000, 0xddde27e700000000,
+    0x9e15816000000000, 0x1a4e1b3300000000, 0x5985bdb400000000,
+    0x8cb63f7200000000, 0xcf7d99f500000000, 0x4b2603a600000000,
+    0x08eda52100000000, 0x4391370100000000, 0x005a918600000000,
+    0x84010bd500000000, 0xc7caad5200000000, 0x6f607e8300000000,
+    0x2cabd80400000000, 0xa8f0425700000000, 0xeb3be4d000000000,
+    0xa04776f000000000, 0xe38cd07700000000, 0x67d74a2400000000,
+    0x241ceca300000000, 0xf12f6e6500000000, 0xb2e4c8e200000000,
+    0x36bf52b100000000, 0x7574f43600000000, 0x3e08661600000000,
+    0x7dc3c09100000000, 0xf9985ac200000000, 0xba53fc4500000000,
+    0x1caecae700000000, 0x5f656c6000000000, 0xdb3ef63300000000,
+    0x98f550b400000000, 0xd389c29400000000, 0x9042641300000000,
+    0x1419fe4000000000, 0x57d258c700000000, 0x82e1da0100000000,
+    0xc12a7c8600000000, 0x4571e6d500000000, 0x06ba405200000000,
+    0x4dc6d27200000000, 0x0e0d74f500000000, 0x8a56eea600000000,
+    0xc99d482100000000, 0x61379bf000000000, 0x22fc3d7700000000,
+    0xa6a7a72400000000, 0xe56c01a300000000, 0xae10938300000000,
+    0xeddb350400000000, 0x6980af5700000000, 0x2a4b09d000000000,
+    0xff788b1600000000, 0xbcb32d9100000000, 0x38e8b7c200000000,
+    0x7b23114500000000, 0x305f836500000000, 0x739425e200000000,
+    0xf7cfbfb100000000, 0xb404193600000000, 0xe69c69c900000000,
+    0xa557cf4e00000000, 0x210c551d00000000, 0x62c7f39a00000000,
+    0x29bb61ba00000000, 0x6a70c73d00000000, 0xee2b5d6e00000000,
+    0xade0fbe900000000, 0x78d3792f00000000, 0x3b18dfa800000000,
+    0xbf4345fb00000000, 0xfc88e37c00000000, 0xb7f4715c00000000,
+    0xf43fd7db00000000, 0x70644d8800000000, 0x33afeb0f00000000,
+    0x9b0538de00000000, 0xd8ce9e5900000000, 0x5c95040a00000000,
+    0x1f5ea28d00000000, 0x542230ad00000000, 0x17e9962a00000000,
+    0x93b20c7900000000, 0xd079aafe00000000, 0x054a283800000000,
+    0x46818ebf00000000, 0xc2da14ec00000000, 0x8111b26b00000000,
+    0xca6d204b00000000, 0x89a686cc00000000, 0x0dfd1c9f00000000,
+    0x4e36ba1800000000},
+   {0x0000000000000000, 0xe1b652ef00000000, 0x836bd40500000000,
+    0x62dd86ea00000000, 0x06d7a80b00000000, 0xe761fae400000000,
+    0x85bc7c0e00000000, 0x640a2ee100000000, 0x0cae511700000000,
+    0xed1803f800000000, 0x8fc5851200000000, 0x6e73d7fd00000000,
+    0x0a79f91c00000000, 0xebcfabf300000000, 0x89122d1900000000,
+    0x68a47ff600000000, 0x185ca32e00000000, 0xf9eaf1c100000000,
+    0x9b37772b00000000, 0x7a8125c400000000, 0x1e8b0b2500000000,
+    0xff3d59ca00000000, 0x9de0df2000000000, 0x7c568dcf00000000,
+    0x14f2f23900000000, 0xf544a0d600000000, 0x9799263c00000000,
+    0x762f74d300000000, 0x12255a3200000000, 0xf39308dd00000000,
+    0x914e8e3700000000, 0x70f8dcd800000000, 0x30b8465d00000000,
+    0xd10e14b200000000, 0xb3d3925800000000, 0x5265c0b700000000,
+    0x366fee5600000000, 0xd7d9bcb900000000, 0xb5043a5300000000,
+    0x54b268bc00000000, 0x3c16174a00000000, 0xdda045a500000000,
+    0xbf7dc34f00000000, 0x5ecb91a000000000, 0x3ac1bf4100000000,
+    0xdb77edae00000000, 0xb9aa6b4400000000, 0x581c39ab00000000,
+    0x28e4e57300000000, 0xc952b79c00000000, 0xab8f317600000000,
+    0x4a39639900000000, 0x2e334d7800000000, 0xcf851f9700000000,
+    0xad58997d00000000, 0x4ceecb9200000000, 0x244ab46400000000,
+    0xc5fce68b00000000, 0xa721606100000000, 0x4697328e00000000,
+    0x229d1c6f00000000, 0xc32b4e8000000000, 0xa1f6c86a00000000,
+    0x40409a8500000000, 0x60708dba00000000, 0x81c6df5500000000,
+    0xe31b59bf00000000, 0x02ad0b5000000000, 0x66a725b100000000,
+    0x8711775e00000000, 0xe5ccf1b400000000, 0x047aa35b00000000,
+    0x6cdedcad00000000, 0x8d688e4200000000, 0xefb508a800000000,
+    0x0e035a4700000000, 0x6a0974a600000000, 0x8bbf264900000000,
+    0xe962a0a300000000, 0x08d4f24c00000000, 0x782c2e9400000000,
+    0x999a7c7b00000000, 0xfb47fa9100000000, 0x1af1a87e00000000,
+    0x7efb869f00000000, 0x9f4dd47000000000, 0xfd90529a00000000,
+    0x1c26007500000000, 0x74827f8300000000, 0x95342d6c00000000,
+    0xf7e9ab8600000000, 0x165ff96900000000, 0x7255d78800000000,
+    0x93e3856700000000, 0xf13e038d00000000, 0x1088516200000000,
+    0x50c8cbe700000000, 0xb17e990800000000, 0xd3a31fe200000000,
+    0x32154d0d00000000, 0x561f63ec00000000, 0xb7a9310300000000,
+    0xd574b7e900000000, 0x34c2e50600000000, 0x5c669af000000000,
+    0xbdd0c81f00000000, 0xdf0d4ef500000000, 0x3ebb1c1a00000000,
+    0x5ab132fb00000000, 0xbb07601400000000, 0xd9dae6fe00000000,
+    0x386cb41100000000, 0x489468c900000000, 0xa9223a2600000000,
+    0xcbffbccc00000000, 0x2a49ee2300000000, 0x4e43c0c200000000,
+    0xaff5922d00000000, 0xcd2814c700000000, 0x2c9e462800000000,
+    0x443a39de00000000, 0xa58c6b3100000000, 0xc751eddb00000000,
+    0x26e7bf3400000000, 0x42ed91d500000000, 0xa35bc33a00000000,
+    0xc18645d000000000, 0x2030173f00000000, 0x81e66bae00000000,
+    0x6050394100000000, 0x028dbfab00000000, 0xe33bed4400000000,
+    0x8731c3a500000000, 0x6687914a00000000, 0x045a17a000000000,
+    0xe5ec454f00000000, 0x8d483ab900000000, 0x6cfe685600000000,
+    0x0e23eebc00000000, 0xef95bc5300000000, 0x8b9f92b200000000,
+    0x6a29c05d00000000, 0x08f446b700000000, 0xe942145800000000,
+    0x99bac88000000000, 0x780c9a6f00000000, 0x1ad11c8500000000,
+    0xfb674e6a00000000, 0x9f6d608b00000000, 0x7edb326400000000,
+    0x1c06b48e00000000, 0xfdb0e66100000000, 0x9514999700000000,
+    0x74a2cb7800000000, 0x167f4d9200000000, 0xf7c91f7d00000000,
+    0x93c3319c00000000, 0x7275637300000000, 0x10a8e59900000000,
+    0xf11eb77600000000, 0xb15e2df300000000, 0x50e87f1c00000000,
+    0x3235f9f600000000, 0xd383ab1900000000, 0xb78985f800000000,
+    0x563fd71700000000, 0x34e251fd00000000, 0xd554031200000000,
+    0xbdf07ce400000000, 0x5c462e0b00000000, 0x3e9ba8e100000000,
+    0xdf2dfa0e00000000, 0xbb27d4ef00000000, 0x5a91860000000000,
+    0x384c00ea00000000, 0xd9fa520500000000, 0xa9028edd00000000,
+    0x48b4dc3200000000, 0x2a695ad800000000, 0xcbdf083700000000,
+    0xafd526d600000000, 0x4e63743900000000, 0x2cbef2d300000000,
+    0xcd08a03c00000000, 0xa5acdfca00000000, 0x441a8d2500000000,
+    0x26c70bcf00000000, 0xc771592000000000, 0xa37b77c100000000,
+    0x42cd252e00000000, 0x2010a3c400000000, 0xc1a6f12b00000000,
+    0xe196e61400000000, 0x0020b4fb00000000, 0x62fd321100000000,
+    0x834b60fe00000000, 0xe7414e1f00000000, 0x06f71cf000000000,
+    0x642a9a1a00000000, 0x859cc8f500000000, 0xed38b70300000000,
+    0x0c8ee5ec00000000, 0x6e53630600000000, 0x8fe531e900000000,
+    0xebef1f0800000000, 0x0a594de700000000, 0x6884cb0d00000000,
+    0x893299e200000000, 0xf9ca453a00000000, 0x187c17d500000000,
+    0x7aa1913f00000000, 0x9b17c3d000000000, 0xff1ded3100000000,
+    0x1eabbfde00000000, 0x7c76393400000000, 0x9dc06bdb00000000,
+    0xf564142d00000000, 0x14d246c200000000, 0x760fc02800000000,
+    0x97b992c700000000, 0xf3b3bc2600000000, 0x1205eec900000000,
+    0x70d8682300000000, 0x916e3acc00000000, 0xd12ea04900000000,
+    0x3098f2a600000000, 0x5245744c00000000, 0xb3f326a300000000,
+    0xd7f9084200000000, 0x364f5aad00000000, 0x5492dc4700000000,
+    0xb5248ea800000000, 0xdd80f15e00000000, 0x3c36a3b100000000,
+    0x5eeb255b00000000, 0xbf5d77b400000000, 0xdb57595500000000,
+    0x3ae10bba00000000, 0x583c8d5000000000, 0xb98adfbf00000000,
+    0xc972036700000000, 0x28c4518800000000, 0x4a19d76200000000,
+    0xabaf858d00000000, 0xcfa5ab6c00000000, 0x2e13f98300000000,
+    0x4cce7f6900000000, 0xad782d8600000000, 0xc5dc527000000000,
+    0x246a009f00000000, 0x46b7867500000000, 0xa701d49a00000000,
+    0xc30bfa7b00000000, 0x22bda89400000000, 0x40602e7e00000000,
+    0xa1d67c9100000000},
+   {0x0000000000000000, 0x5880e2d700000000, 0xf106b47400000000,
+    0xa98656a300000000, 0xe20d68e900000000, 0xba8d8a3e00000000,
+    0x130bdc9d00000000, 0x4b8b3e4a00000000, 0x851da10900000000,
+    0xdd9d43de00000000, 0x741b157d00000000, 0x2c9bf7aa00000000,
+    0x6710c9e000000000, 0x3f902b3700000000, 0x96167d9400000000,
+    0xce969f4300000000, 0x0a3b421300000000, 0x52bba0c400000000,
+    0xfb3df66700000000, 0xa3bd14b000000000, 0xe8362afa00000000,
+    0xb0b6c82d00000000, 0x19309e8e00000000, 0x41b07c5900000000,
+    0x8f26e31a00000000, 0xd7a601cd00000000, 0x7e20576e00000000,
+    0x26a0b5b900000000, 0x6d2b8bf300000000, 0x35ab692400000000,
+    0x9c2d3f8700000000, 0xc4addd5000000000, 0x1476842600000000,
+    0x4cf666f100000000, 0xe570305200000000, 0xbdf0d28500000000,
+    0xf67beccf00000000, 0xaefb0e1800000000, 0x077d58bb00000000,
+    0x5ffdba6c00000000, 0x916b252f00000000, 0xc9ebc7f800000000,
+    0x606d915b00000000, 0x38ed738c00000000, 0x73664dc600000000,
+    0x2be6af1100000000, 0x8260f9b200000000, 0xdae01b6500000000,
+    0x1e4dc63500000000, 0x46cd24e200000000, 0xef4b724100000000,
+    0xb7cb909600000000, 0xfc40aedc00000000, 0xa4c04c0b00000000,
+    0x0d461aa800000000, 0x55c6f87f00000000, 0x9b50673c00000000,
+    0xc3d085eb00000000, 0x6a56d34800000000, 0x32d6319f00000000,
+    0x795d0fd500000000, 0x21dded0200000000, 0x885bbba100000000,
+    0xd0db597600000000, 0x28ec084d00000000, 0x706cea9a00000000,
+    0xd9eabc3900000000, 0x816a5eee00000000, 0xcae160a400000000,
+    0x9261827300000000, 0x3be7d4d000000000, 0x6367360700000000,
+    0xadf1a94400000000, 0xf5714b9300000000, 0x5cf71d3000000000,
+    0x0477ffe700000000, 0x4ffcc1ad00000000, 0x177c237a00000000,
+    0xbefa75d900000000, 0xe67a970e00000000, 0x22d74a5e00000000,
+    0x7a57a88900000000, 0xd3d1fe2a00000000, 0x8b511cfd00000000,
+    0xc0da22b700000000, 0x985ac06000000000, 0x31dc96c300000000,
+    0x695c741400000000, 0xa7caeb5700000000, 0xff4a098000000000,
+    0x56cc5f2300000000, 0x0e4cbdf400000000, 0x45c783be00000000,
+    0x1d47616900000000, 0xb4c137ca00000000, 0xec41d51d00000000,
+    0x3c9a8c6b00000000, 0x641a6ebc00000000, 0xcd9c381f00000000,
+    0x951cdac800000000, 0xde97e48200000000, 0x8617065500000000,
+    0x2f9150f600000000, 0x7711b22100000000, 0xb9872d6200000000,
+    0xe107cfb500000000, 0x4881991600000000, 0x10017bc100000000,
+    0x5b8a458b00000000, 0x030aa75c00000000, 0xaa8cf1ff00000000,
+    0xf20c132800000000, 0x36a1ce7800000000, 0x6e212caf00000000,
+    0xc7a77a0c00000000, 0x9f2798db00000000, 0xd4aca69100000000,
+    0x8c2c444600000000, 0x25aa12e500000000, 0x7d2af03200000000,
+    0xb3bc6f7100000000, 0xeb3c8da600000000, 0x42badb0500000000,
+    0x1a3a39d200000000, 0x51b1079800000000, 0x0931e54f00000000,
+    0xa0b7b3ec00000000, 0xf837513b00000000, 0x50d8119a00000000,
+    0x0858f34d00000000, 0xa1dea5ee00000000, 0xf95e473900000000,
+    0xb2d5797300000000, 0xea559ba400000000, 0x43d3cd0700000000,
+    0x1b532fd000000000, 0xd5c5b09300000000, 0x8d45524400000000,
+    0x24c304e700000000, 0x7c43e63000000000, 0x37c8d87a00000000,
+    0x6f483aad00000000, 0xc6ce6c0e00000000, 0x9e4e8ed900000000,
+    0x5ae3538900000000, 0x0263b15e00000000, 0xabe5e7fd00000000,
+    0xf365052a00000000, 0xb8ee3b6000000000, 0xe06ed9b700000000,
+    0x49e88f1400000000, 0x11686dc300000000, 0xdffef28000000000,
+    0x877e105700000000, 0x2ef846f400000000, 0x7678a42300000000,
+    0x3df39a6900000000, 0x657378be00000000, 0xccf52e1d00000000,
+    0x9475ccca00000000, 0x44ae95bc00000000, 0x1c2e776b00000000,
+    0xb5a821c800000000, 0xed28c31f00000000, 0xa6a3fd5500000000,
+    0xfe231f8200000000, 0x57a5492100000000, 0x0f25abf600000000,
+    0xc1b334b500000000, 0x9933d66200000000, 0x30b580c100000000,
+    0x6835621600000000, 0x23be5c5c00000000, 0x7b3ebe8b00000000,
+    0xd2b8e82800000000, 0x8a380aff00000000, 0x4e95d7af00000000,
+    0x1615357800000000, 0xbf9363db00000000, 0xe713810c00000000,
+    0xac98bf4600000000, 0xf4185d9100000000, 0x5d9e0b3200000000,
+    0x051ee9e500000000, 0xcb8876a600000000, 0x9308947100000000,
+    0x3a8ec2d200000000, 0x620e200500000000, 0x29851e4f00000000,
+    0x7105fc9800000000, 0xd883aa3b00000000, 0x800348ec00000000,
+    0x783419d700000000, 0x20b4fb0000000000, 0x8932ada300000000,
+    0xd1b24f7400000000, 0x9a39713e00000000, 0xc2b993e900000000,
+    0x6b3fc54a00000000, 0x33bf279d00000000, 0xfd29b8de00000000,
+    0xa5a95a0900000000, 0x0c2f0caa00000000, 0x54afee7d00000000,
+    0x1f24d03700000000, 0x47a432e000000000, 0xee22644300000000,
+    0xb6a2869400000000, 0x720f5bc400000000, 0x2a8fb91300000000,
+    0x8309efb000000000, 0xdb890d6700000000, 0x9002332d00000000,
+    0xc882d1fa00000000, 0x6104875900000000, 0x3984658e00000000,
+    0xf712facd00000000, 0xaf92181a00000000, 0x06144eb900000000,
+    0x5e94ac6e00000000, 0x151f922400000000, 0x4d9f70f300000000,
+    0xe419265000000000, 0xbc99c48700000000, 0x6c429df100000000,
+    0x34c27f2600000000, 0x9d44298500000000, 0xc5c4cb5200000000,
+    0x8e4ff51800000000, 0xd6cf17cf00000000, 0x7f49416c00000000,
+    0x27c9a3bb00000000, 0xe95f3cf800000000, 0xb1dfde2f00000000,
+    0x1859888c00000000, 0x40d96a5b00000000, 0x0b52541100000000,
+    0x53d2b6c600000000, 0xfa54e06500000000, 0xa2d402b200000000,
+    0x6679dfe200000000, 0x3ef93d3500000000, 0x977f6b9600000000,
+    0xcfff894100000000, 0x8474b70b00000000, 0xdcf455dc00000000,
+    0x7572037f00000000, 0x2df2e1a800000000, 0xe3647eeb00000000,
+    0xbbe49c3c00000000, 0x1262ca9f00000000, 0x4ae2284800000000,
+    0x0169160200000000, 0x59e9f4d500000000, 0xf06fa27600000000,
+    0xa8ef40a100000000},
+   {0x0000000000000000, 0x463b676500000000, 0x8c76ceca00000000,
+    0xca4da9af00000000, 0x59ebed4e00000000, 0x1fd08a2b00000000,
+    0xd59d238400000000, 0x93a644e100000000, 0xb2d6db9d00000000,
+    0xf4edbcf800000000, 0x3ea0155700000000, 0x789b723200000000,
+    0xeb3d36d300000000, 0xad0651b600000000, 0x674bf81900000000,
+    0x21709f7c00000000, 0x25abc6e000000000, 0x6390a18500000000,
+    0xa9dd082a00000000, 0xefe66f4f00000000, 0x7c402bae00000000,
+    0x3a7b4ccb00000000, 0xf036e56400000000, 0xb60d820100000000,
+    0x977d1d7d00000000, 0xd1467a1800000000, 0x1b0bd3b700000000,
+    0x5d30b4d200000000, 0xce96f03300000000, 0x88ad975600000000,
+    0x42e03ef900000000, 0x04db599c00000000, 0x0b50fc1a00000000,
+    0x4d6b9b7f00000000, 0x872632d000000000, 0xc11d55b500000000,
+    0x52bb115400000000, 0x1480763100000000, 0xdecddf9e00000000,
+    0x98f6b8fb00000000, 0xb986278700000000, 0xffbd40e200000000,
+    0x35f0e94d00000000, 0x73cb8e2800000000, 0xe06dcac900000000,
+    0xa656adac00000000, 0x6c1b040300000000, 0x2a20636600000000,
+    0x2efb3afa00000000, 0x68c05d9f00000000, 0xa28df43000000000,
+    0xe4b6935500000000, 0x7710d7b400000000, 0x312bb0d100000000,
+    0xfb66197e00000000, 0xbd5d7e1b00000000, 0x9c2de16700000000,
+    0xda16860200000000, 0x105b2fad00000000, 0x566048c800000000,
+    0xc5c60c2900000000, 0x83fd6b4c00000000, 0x49b0c2e300000000,
+    0x0f8ba58600000000, 0x16a0f83500000000, 0x509b9f5000000000,
+    0x9ad636ff00000000, 0xdced519a00000000, 0x4f4b157b00000000,
+    0x0970721e00000000, 0xc33ddbb100000000, 0x8506bcd400000000,
+    0xa47623a800000000, 0xe24d44cd00000000, 0x2800ed6200000000,
+    0x6e3b8a0700000000, 0xfd9dcee600000000, 0xbba6a98300000000,
+    0x71eb002c00000000, 0x37d0674900000000, 0x330b3ed500000000,
+    0x753059b000000000, 0xbf7df01f00000000, 0xf946977a00000000,
+    0x6ae0d39b00000000, 0x2cdbb4fe00000000, 0xe6961d5100000000,
+    0xa0ad7a3400000000, 0x81dde54800000000, 0xc7e6822d00000000,
+    0x0dab2b8200000000, 0x4b904ce700000000, 0xd836080600000000,
+    0x9e0d6f6300000000, 0x5440c6cc00000000, 0x127ba1a900000000,
+    0x1df0042f00000000, 0x5bcb634a00000000, 0x9186cae500000000,
+    0xd7bdad8000000000, 0x441be96100000000, 0x02208e0400000000,
+    0xc86d27ab00000000, 0x8e5640ce00000000, 0xaf26dfb200000000,
+    0xe91db8d700000000, 0x2350117800000000, 0x656b761d00000000,
+    0xf6cd32fc00000000, 0xb0f6559900000000, 0x7abbfc3600000000,
+    0x3c809b5300000000, 0x385bc2cf00000000, 0x7e60a5aa00000000,
+    0xb42d0c0500000000, 0xf2166b6000000000, 0x61b02f8100000000,
+    0x278b48e400000000, 0xedc6e14b00000000, 0xabfd862e00000000,
+    0x8a8d195200000000, 0xccb67e3700000000, 0x06fbd79800000000,
+    0x40c0b0fd00000000, 0xd366f41c00000000, 0x955d937900000000,
+    0x5f103ad600000000, 0x192b5db300000000, 0x2c40f16b00000000,
+    0x6a7b960e00000000, 0xa0363fa100000000, 0xe60d58c400000000,
+    0x75ab1c2500000000, 0x33907b4000000000, 0xf9ddd2ef00000000,
+    0xbfe6b58a00000000, 0x9e962af600000000, 0xd8ad4d9300000000,
+    0x12e0e43c00000000, 0x54db835900000000, 0xc77dc7b800000000,
+    0x8146a0dd00000000, 0x4b0b097200000000, 0x0d306e1700000000,
+    0x09eb378b00000000, 0x4fd050ee00000000, 0x859df94100000000,
+    0xc3a69e2400000000, 0x5000dac500000000, 0x163bbda000000000,
+    0xdc76140f00000000, 0x9a4d736a00000000, 0xbb3dec1600000000,
+    0xfd068b7300000000, 0x374b22dc00000000, 0x717045b900000000,
+    0xe2d6015800000000, 0xa4ed663d00000000, 0x6ea0cf9200000000,
+    0x289ba8f700000000, 0x27100d7100000000, 0x612b6a1400000000,
+    0xab66c3bb00000000, 0xed5da4de00000000, 0x7efbe03f00000000,
+    0x38c0875a00000000, 0xf28d2ef500000000, 0xb4b6499000000000,
+    0x95c6d6ec00000000, 0xd3fdb18900000000, 0x19b0182600000000,
+    0x5f8b7f4300000000, 0xcc2d3ba200000000, 0x8a165cc700000000,
+    0x405bf56800000000, 0x0660920d00000000, 0x02bbcb9100000000,
+    0x4480acf400000000, 0x8ecd055b00000000, 0xc8f6623e00000000,
+    0x5b5026df00000000, 0x1d6b41ba00000000, 0xd726e81500000000,
+    0x911d8f7000000000, 0xb06d100c00000000, 0xf656776900000000,
+    0x3c1bdec600000000, 0x7a20b9a300000000, 0xe986fd4200000000,
+    0xafbd9a2700000000, 0x65f0338800000000, 0x23cb54ed00000000,
+    0x3ae0095e00000000, 0x7cdb6e3b00000000, 0xb696c79400000000,
+    0xf0ada0f100000000, 0x630be41000000000, 0x2530837500000000,
+    0xef7d2ada00000000, 0xa9464dbf00000000, 0x8836d2c300000000,
+    0xce0db5a600000000, 0x04401c0900000000, 0x427b7b6c00000000,
+    0xd1dd3f8d00000000, 0x97e658e800000000, 0x5dabf14700000000,
+    0x1b90962200000000, 0x1f4bcfbe00000000, 0x5970a8db00000000,
+    0x933d017400000000, 0xd506661100000000, 0x46a022f000000000,
+    0x009b459500000000, 0xcad6ec3a00000000, 0x8ced8b5f00000000,
+    0xad9d142300000000, 0xeba6734600000000, 0x21ebdae900000000,
+    0x67d0bd8c00000000, 0xf476f96d00000000, 0xb24d9e0800000000,
+    0x780037a700000000, 0x3e3b50c200000000, 0x31b0f54400000000,
+    0x778b922100000000, 0xbdc63b8e00000000, 0xfbfd5ceb00000000,
+    0x685b180a00000000, 0x2e607f6f00000000, 0xe42dd6c000000000,
+    0xa216b1a500000000, 0x83662ed900000000, 0xc55d49bc00000000,
+    0x0f10e01300000000, 0x492b877600000000, 0xda8dc39700000000,
+    0x9cb6a4f200000000, 0x56fb0d5d00000000, 0x10c06a3800000000,
+    0x141b33a400000000, 0x522054c100000000, 0x986dfd6e00000000,
+    0xde569a0b00000000, 0x4df0deea00000000, 0x0bcbb98f00000000,
+    0xc186102000000000, 0x87bd774500000000, 0xa6cde83900000000,
+    0xe0f68f5c00000000, 0x2abb26f300000000, 0x6c80419600000000,
+    0xff26057700000000, 0xb91d621200000000, 0x7350cbbd00000000,
+    0x356bacd800000000},
+   {0x0000000000000000, 0x9e83da9f00000000, 0x7d01c4e400000000,
+    0xe3821e7b00000000, 0xbb04f91200000000, 0x2587238d00000000,
+    0xc6053df600000000, 0x5886e76900000000, 0x7609f22500000000,
+    0xe88a28ba00000000, 0x0b0836c100000000, 0x958bec5e00000000,
+    0xcd0d0b3700000000, 0x538ed1a800000000, 0xb00ccfd300000000,
+    0x2e8f154c00000000, 0xec12e44b00000000, 0x72913ed400000000,
+    0x911320af00000000, 0x0f90fa3000000000, 0x57161d5900000000,
+    0xc995c7c600000000, 0x2a17d9bd00000000, 0xb494032200000000,
+    0x9a1b166e00000000, 0x0498ccf100000000, 0xe71ad28a00000000,
+    0x7999081500000000, 0x211fef7c00000000, 0xbf9c35e300000000,
+    0x5c1e2b9800000000, 0xc29df10700000000, 0xd825c89700000000,
+    0x46a6120800000000, 0xa5240c7300000000, 0x3ba7d6ec00000000,
+    0x6321318500000000, 0xfda2eb1a00000000, 0x1e20f56100000000,
+    0x80a32ffe00000000, 0xae2c3ab200000000, 0x30afe02d00000000,
+    0xd32dfe5600000000, 0x4dae24c900000000, 0x1528c3a000000000,
+    0x8bab193f00000000, 0x6829074400000000, 0xf6aadddb00000000,
+    0x34372cdc00000000, 0xaab4f64300000000, 0x4936e83800000000,
+    0xd7b532a700000000, 0x8f33d5ce00000000, 0x11b00f5100000000,
+    0xf232112a00000000, 0x6cb1cbb500000000, 0x423edef900000000,
+    0xdcbd046600000000, 0x3f3f1a1d00000000, 0xa1bcc08200000000,
+    0xf93a27eb00000000, 0x67b9fd7400000000, 0x843be30f00000000,
+    0x1ab8399000000000, 0xf14de1f400000000, 0x6fce3b6b00000000,
+    0x8c4c251000000000, 0x12cfff8f00000000, 0x4a4918e600000000,
+    0xd4cac27900000000, 0x3748dc0200000000, 0xa9cb069d00000000,
+    0x874413d100000000, 0x19c7c94e00000000, 0xfa45d73500000000,
+    0x64c60daa00000000, 0x3c40eac300000000, 0xa2c3305c00000000,
+    0x41412e2700000000, 0xdfc2f4b800000000, 0x1d5f05bf00000000,
+    0x83dcdf2000000000, 0x605ec15b00000000, 0xfedd1bc400000000,
+    0xa65bfcad00000000, 0x38d8263200000000, 0xdb5a384900000000,
+    0x45d9e2d600000000, 0x6b56f79a00000000, 0xf5d52d0500000000,
+    0x1657337e00000000, 0x88d4e9e100000000, 0xd0520e8800000000,
+    0x4ed1d41700000000, 0xad53ca6c00000000, 0x33d010f300000000,
+    0x2968296300000000, 0xb7ebf3fc00000000, 0x5469ed8700000000,
+    0xcaea371800000000, 0x926cd07100000000, 0x0cef0aee00000000,
+    0xef6d149500000000, 0x71eece0a00000000, 0x5f61db4600000000,
+    0xc1e201d900000000, 0x22601fa200000000, 0xbce3c53d00000000,
+    0xe465225400000000, 0x7ae6f8cb00000000, 0x9964e6b000000000,
+    0x07e73c2f00000000, 0xc57acd2800000000, 0x5bf917b700000000,
+    0xb87b09cc00000000, 0x26f8d35300000000, 0x7e7e343a00000000,
+    0xe0fdeea500000000, 0x037ff0de00000000, 0x9dfc2a4100000000,
+    0xb3733f0d00000000, 0x2df0e59200000000, 0xce72fbe900000000,
+    0x50f1217600000000, 0x0877c61f00000000, 0x96f41c8000000000,
+    0x757602fb00000000, 0xebf5d86400000000, 0xa39db33200000000,
+    0x3d1e69ad00000000, 0xde9c77d600000000, 0x401fad4900000000,
+    0x18994a2000000000, 0x861a90bf00000000, 0x65988ec400000000,
+    0xfb1b545b00000000, 0xd594411700000000, 0x4b179b8800000000,
+    0xa89585f300000000, 0x36165f6c00000000, 0x6e90b80500000000,
+    0xf013629a00000000, 0x13917ce100000000, 0x8d12a67e00000000,
+    0x4f8f577900000000, 0xd10c8de600000000, 0x328e939d00000000,
+    0xac0d490200000000, 0xf48bae6b00000000, 0x6a0874f400000000,
+    0x898a6a8f00000000, 0x1709b01000000000, 0x3986a55c00000000,
+    0xa7057fc300000000, 0x448761b800000000, 0xda04bb2700000000,
+    0x82825c4e00000000, 0x1c0186d100000000, 0xff8398aa00000000,
+    0x6100423500000000, 0x7bb87ba500000000, 0xe53ba13a00000000,
+    0x06b9bf4100000000, 0x983a65de00000000, 0xc0bc82b700000000,
+    0x5e3f582800000000, 0xbdbd465300000000, 0x233e9ccc00000000,
+    0x0db1898000000000, 0x9332531f00000000, 0x70b04d6400000000,
+    0xee3397fb00000000, 0xb6b5709200000000, 0x2836aa0d00000000,
+    0xcbb4b47600000000, 0x55376ee900000000, 0x97aa9fee00000000,
+    0x0929457100000000, 0xeaab5b0a00000000, 0x7428819500000000,
+    0x2cae66fc00000000, 0xb22dbc6300000000, 0x51afa21800000000,
+    0xcf2c788700000000, 0xe1a36dcb00000000, 0x7f20b75400000000,
+    0x9ca2a92f00000000, 0x022173b000000000, 0x5aa794d900000000,
+    0xc4244e4600000000, 0x27a6503d00000000, 0xb9258aa200000000,
+    0x52d052c600000000, 0xcc53885900000000, 0x2fd1962200000000,
+    0xb1524cbd00000000, 0xe9d4abd400000000, 0x7757714b00000000,
+    0x94d56f3000000000, 0x0a56b5af00000000, 0x24d9a0e300000000,
+    0xba5a7a7c00000000, 0x59d8640700000000, 0xc75bbe9800000000,
+    0x9fdd59f100000000, 0x015e836e00000000, 0xe2dc9d1500000000,
+    0x7c5f478a00000000, 0xbec2b68d00000000, 0x20416c1200000000,
+    0xc3c3726900000000, 0x5d40a8f600000000, 0x05c64f9f00000000,
+    0x9b45950000000000, 0x78c78b7b00000000, 0xe64451e400000000,
+    0xc8cb44a800000000, 0x56489e3700000000, 0xb5ca804c00000000,
+    0x2b495ad300000000, 0x73cfbdba00000000, 0xed4c672500000000,
+    0x0ece795e00000000, 0x904da3c100000000, 0x8af59a5100000000,
+    0x147640ce00000000, 0xf7f45eb500000000, 0x6977842a00000000,
+    0x31f1634300000000, 0xaf72b9dc00000000, 0x4cf0a7a700000000,
+    0xd2737d3800000000, 0xfcfc687400000000, 0x627fb2eb00000000,
+    0x81fdac9000000000, 0x1f7e760f00000000, 0x47f8916600000000,
+    0xd97b4bf900000000, 0x3af9558200000000, 0xa47a8f1d00000000,
+    0x66e77e1a00000000, 0xf864a48500000000, 0x1be6bafe00000000,
+    0x8565606100000000, 0xdde3870800000000, 0x43605d9700000000,
+    0xa0e243ec00000000, 0x3e61997300000000, 0x10ee8c3f00000000,
+    0x8e6d56a000000000, 0x6def48db00000000, 0xf36c924400000000,
+    0xabea752d00000000, 0x3569afb200000000, 0xd6ebb1c900000000,
+    0x48686b5600000000},
+   {0x0000000000000000, 0xc064281700000000, 0x80c9502e00000000,
+    0x40ad783900000000, 0x0093a15c00000000, 0xc0f7894b00000000,
+    0x805af17200000000, 0x403ed96500000000, 0x002643b900000000,
+    0xc0426bae00000000, 0x80ef139700000000, 0x408b3b8000000000,
+    0x00b5e2e500000000, 0xc0d1caf200000000, 0x807cb2cb00000000,
+    0x40189adc00000000, 0x414af7a900000000, 0x812edfbe00000000,
+    0xc183a78700000000, 0x01e78f9000000000, 0x41d956f500000000,
+    0x81bd7ee200000000, 0xc11006db00000000, 0x01742ecc00000000,
+    0x416cb41000000000, 0x81089c0700000000, 0xc1a5e43e00000000,
+    0x01c1cc2900000000, 0x41ff154c00000000, 0x819b3d5b00000000,
+    0xc136456200000000, 0x01526d7500000000, 0xc3929f8800000000,
+    0x03f6b79f00000000, 0x435bcfa600000000, 0x833fe7b100000000,
+    0xc3013ed400000000, 0x036516c300000000, 0x43c86efa00000000,
+    0x83ac46ed00000000, 0xc3b4dc3100000000, 0x03d0f42600000000,
+    0x437d8c1f00000000, 0x8319a40800000000, 0xc3277d6d00000000,
+    0x0343557a00000000, 0x43ee2d4300000000, 0x838a055400000000,
+    0x82d8682100000000, 0x42bc403600000000, 0x0211380f00000000,
+    0xc275101800000000, 0x824bc97d00000000, 0x422fe16a00000000,
+    0x0282995300000000, 0xc2e6b14400000000, 0x82fe2b9800000000,
+    0x429a038f00000000, 0x02377bb600000000, 0xc25353a100000000,
+    0x826d8ac400000000, 0x4209a2d300000000, 0x02a4daea00000000,
+    0xc2c0f2fd00000000, 0xc7234eca00000000, 0x074766dd00000000,
+    0x47ea1ee400000000, 0x878e36f300000000, 0xc7b0ef9600000000,
+    0x07d4c78100000000, 0x4779bfb800000000, 0x871d97af00000000,
+    0xc7050d7300000000, 0x0761256400000000, 0x47cc5d5d00000000,
+    0x87a8754a00000000, 0xc796ac2f00000000, 0x07f2843800000000,
+    0x475ffc0100000000, 0x873bd41600000000, 0x8669b96300000000,
+    0x460d917400000000, 0x06a0e94d00000000, 0xc6c4c15a00000000,
+    0x86fa183f00000000, 0x469e302800000000, 0x0633481100000000,
+    0xc657600600000000, 0x864ffada00000000, 0x462bd2cd00000000,
+    0x0686aaf400000000, 0xc6e282e300000000, 0x86dc5b8600000000,
+    0x46b8739100000000, 0x06150ba800000000, 0xc67123bf00000000,
+    0x04b1d14200000000, 0xc4d5f95500000000, 0x8478816c00000000,
+    0x441ca97b00000000, 0x0422701e00000000, 0xc446580900000000,
+    0x84eb203000000000, 0x448f082700000000, 0x049792fb00000000,
+    0xc4f3baec00000000, 0x845ec2d500000000, 0x443aeac200000000,
+    0x040433a700000000, 0xc4601bb000000000, 0x84cd638900000000,
+    0x44a94b9e00000000, 0x45fb26eb00000000, 0x859f0efc00000000,
+    0xc53276c500000000, 0x05565ed200000000, 0x456887b700000000,
+    0x850cafa000000000, 0xc5a1d79900000000, 0x05c5ff8e00000000,
+    0x45dd655200000000, 0x85b94d4500000000, 0xc514357c00000000,
+    0x05701d6b00000000, 0x454ec40e00000000, 0x852aec1900000000,
+    0xc587942000000000, 0x05e3bc3700000000, 0xcf41ed4f00000000,
+    0x0f25c55800000000, 0x4f88bd6100000000, 0x8fec957600000000,
+    0xcfd24c1300000000, 0x0fb6640400000000, 0x4f1b1c3d00000000,
+    0x8f7f342a00000000, 0xcf67aef600000000, 0x0f0386e100000000,
+    0x4faefed800000000, 0x8fcad6cf00000000, 0xcff40faa00000000,
+    0x0f9027bd00000000, 0x4f3d5f8400000000, 0x8f59779300000000,
+    0x8e0b1ae600000000, 0x4e6f32f100000000, 0x0ec24ac800000000,
+    0xcea662df00000000, 0x8e98bbba00000000, 0x4efc93ad00000000,
+    0x0e51eb9400000000, 0xce35c38300000000, 0x8e2d595f00000000,
+    0x4e49714800000000, 0x0ee4097100000000, 0xce80216600000000,
+    0x8ebef80300000000, 0x4edad01400000000, 0x0e77a82d00000000,
+    0xce13803a00000000, 0x0cd372c700000000, 0xccb75ad000000000,
+    0x8c1a22e900000000, 0x4c7e0afe00000000, 0x0c40d39b00000000,
+    0xcc24fb8c00000000, 0x8c8983b500000000, 0x4cedaba200000000,
+    0x0cf5317e00000000, 0xcc91196900000000, 0x8c3c615000000000,
+    0x4c58494700000000, 0x0c66902200000000, 0xcc02b83500000000,
+    0x8cafc00c00000000, 0x4ccbe81b00000000, 0x4d99856e00000000,
+    0x8dfdad7900000000, 0xcd50d54000000000, 0x0d34fd5700000000,
+    0x4d0a243200000000, 0x8d6e0c2500000000, 0xcdc3741c00000000,
+    0x0da75c0b00000000, 0x4dbfc6d700000000, 0x8ddbeec000000000,
+    0xcd7696f900000000, 0x0d12beee00000000, 0x4d2c678b00000000,
+    0x8d484f9c00000000, 0xcde537a500000000, 0x0d811fb200000000,
+    0x0862a38500000000, 0xc8068b9200000000, 0x88abf3ab00000000,
+    0x48cfdbbc00000000, 0x08f102d900000000, 0xc8952ace00000000,
+    0x883852f700000000, 0x485c7ae000000000, 0x0844e03c00000000,
+    0xc820c82b00000000, 0x888db01200000000, 0x48e9980500000000,
+    0x08d7416000000000, 0xc8b3697700000000, 0x881e114e00000000,
+    0x487a395900000000, 0x4928542c00000000, 0x894c7c3b00000000,
+    0xc9e1040200000000, 0x09852c1500000000, 0x49bbf57000000000,
+    0x89dfdd6700000000, 0xc972a55e00000000, 0x09168d4900000000,
+    0x490e179500000000, 0x896a3f8200000000, 0xc9c747bb00000000,
+    0x09a36fac00000000, 0x499db6c900000000, 0x89f99ede00000000,
+    0xc954e6e700000000, 0x0930cef000000000, 0xcbf03c0d00000000,
+    0x0b94141a00000000, 0x4b396c2300000000, 0x8b5d443400000000,
+    0xcb639d5100000000, 0x0b07b54600000000, 0x4baacd7f00000000,
+    0x8bcee56800000000, 0xcbd67fb400000000, 0x0bb257a300000000,
+    0x4b1f2f9a00000000, 0x8b7b078d00000000, 0xcb45dee800000000,
+    0x0b21f6ff00000000, 0x4b8c8ec600000000, 0x8be8a6d100000000,
+    0x8abacba400000000, 0x4adee3b300000000, 0x0a739b8a00000000,
+    0xca17b39d00000000, 0x8a296af800000000, 0x4a4d42ef00000000,
+    0x0ae03ad600000000, 0xca8412c100000000, 0x8a9c881d00000000,
+    0x4af8a00a00000000, 0x0a55d83300000000, 0xca31f02400000000,
+    0x8a0f294100000000, 0x4a6b015600000000, 0x0ac6796f00000000,
+    0xcaa2517800000000},
+   {0x0000000000000000, 0xd4ea739b00000000, 0xe9d396ed00000000,
+    0x3d39e57600000000, 0x93a15c0000000000, 0x474b2f9b00000000,
+    0x7a72caed00000000, 0xae98b97600000000, 0x2643b90000000000,
+    0xf2a9ca9b00000000, 0xcf902fed00000000, 0x1b7a5c7600000000,
+    0xb5e2e50000000000, 0x6108969b00000000, 0x5c3173ed00000000,
+    0x88db007600000000, 0x4c86720100000000, 0x986c019a00000000,
+    0xa555e4ec00000000, 0x71bf977700000000, 0xdf272e0100000000,
+    0x0bcd5d9a00000000, 0x36f4b8ec00000000, 0xe21ecb7700000000,
+    0x6ac5cb0100000000, 0xbe2fb89a00000000, 0x83165dec00000000,
+    0x57fc2e7700000000, 0xf964970100000000, 0x2d8ee49a00000000,
+    0x10b701ec00000000, 0xc45d727700000000, 0x980ce50200000000,
+    0x4ce6969900000000, 0x71df73ef00000000, 0xa535007400000000,
+    0x0badb90200000000, 0xdf47ca9900000000, 0xe27e2fef00000000,
+    0x36945c7400000000, 0xbe4f5c0200000000, 0x6aa52f9900000000,
+    0x579ccaef00000000, 0x8376b97400000000, 0x2dee000200000000,
+    0xf904739900000000, 0xc43d96ef00000000, 0x10d7e57400000000,
+    0xd48a970300000000, 0x0060e49800000000, 0x3d5901ee00000000,
+    0xe9b3727500000000, 0x472bcb0300000000, 0x93c1b89800000000,
+    0xaef85dee00000000, 0x7a122e7500000000, 0xf2c92e0300000000,
+    0x26235d9800000000, 0x1b1ab8ee00000000, 0xcff0cb7500000000,
+    0x6168720300000000, 0xb582019800000000, 0x88bbe4ee00000000,
+    0x5c51977500000000, 0x3019ca0500000000, 0xe4f3b99e00000000,
+    0xd9ca5ce800000000, 0x0d202f7300000000, 0xa3b8960500000000,
+    0x7752e59e00000000, 0x4a6b00e800000000, 0x9e81737300000000,
+    0x165a730500000000, 0xc2b0009e00000000, 0xff89e5e800000000,
+    0x2b63967300000000, 0x85fb2f0500000000, 0x51115c9e00000000,
+    0x6c28b9e800000000, 0xb8c2ca7300000000, 0x7c9fb80400000000,
+    0xa875cb9f00000000, 0x954c2ee900000000, 0x41a65d7200000000,
+    0xef3ee40400000000, 0x3bd4979f00000000, 0x06ed72e900000000,
+    0xd207017200000000, 0x5adc010400000000, 0x8e36729f00000000,
+    0xb30f97e900000000, 0x67e5e47200000000, 0xc97d5d0400000000,
+    0x1d972e9f00000000, 0x20aecbe900000000, 0xf444b87200000000,
+    0xa8152f0700000000, 0x7cff5c9c00000000, 0x41c6b9ea00000000,
+    0x952cca7100000000, 0x3bb4730700000000, 0xef5e009c00000000,
+    0xd267e5ea00000000, 0x068d967100000000, 0x8e56960700000000,
+    0x5abce59c00000000, 0x678500ea00000000, 0xb36f737100000000,
+    0x1df7ca0700000000, 0xc91db99c00000000, 0xf4245cea00000000,
+    0x20ce2f7100000000, 0xe4935d0600000000, 0x30792e9d00000000,
+    0x0d40cbeb00000000, 0xd9aab87000000000, 0x7732010600000000,
+    0xa3d8729d00000000, 0x9ee197eb00000000, 0x4a0be47000000000,
+    0xc2d0e40600000000, 0x163a979d00000000, 0x2b0372eb00000000,
+    0xffe9017000000000, 0x5171b80600000000, 0x859bcb9d00000000,
+    0xb8a22eeb00000000, 0x6c485d7000000000, 0x6032940b00000000,
+    0xb4d8e79000000000, 0x89e102e600000000, 0x5d0b717d00000000,
+    0xf393c80b00000000, 0x2779bb9000000000, 0x1a405ee600000000,
+    0xceaa2d7d00000000, 0x46712d0b00000000, 0x929b5e9000000000,
+    0xafa2bbe600000000, 0x7b48c87d00000000, 0xd5d0710b00000000,
+    0x013a029000000000, 0x3c03e7e600000000, 0xe8e9947d00000000,
+    0x2cb4e60a00000000, 0xf85e959100000000, 0xc56770e700000000,
+    0x118d037c00000000, 0xbf15ba0a00000000, 0x6bffc99100000000,
+    0x56c62ce700000000, 0x822c5f7c00000000, 0x0af75f0a00000000,
+    0xde1d2c9100000000, 0xe324c9e700000000, 0x37ceba7c00000000,
+    0x9956030a00000000, 0x4dbc709100000000, 0x708595e700000000,
+    0xa46fe67c00000000, 0xf83e710900000000, 0x2cd4029200000000,
+    0x11ede7e400000000, 0xc507947f00000000, 0x6b9f2d0900000000,
+    0xbf755e9200000000, 0x824cbbe400000000, 0x56a6c87f00000000,
+    0xde7dc80900000000, 0x0a97bb9200000000, 0x37ae5ee400000000,
+    0xe3442d7f00000000, 0x4ddc940900000000, 0x9936e79200000000,
+    0xa40f02e400000000, 0x70e5717f00000000, 0xb4b8030800000000,
+    0x6052709300000000, 0x5d6b95e500000000, 0x8981e67e00000000,
+    0x27195f0800000000, 0xf3f32c9300000000, 0xcecac9e500000000,
+    0x1a20ba7e00000000, 0x92fbba0800000000, 0x4611c99300000000,
+    0x7b282ce500000000, 0xafc25f7e00000000, 0x015ae60800000000,
+    0xd5b0959300000000, 0xe88970e500000000, 0x3c63037e00000000,
+    0x502b5e0e00000000, 0x84c12d9500000000, 0xb9f8c8e300000000,
+    0x6d12bb7800000000, 0xc38a020e00000000, 0x1760719500000000,
+    0x2a5994e300000000, 0xfeb3e77800000000, 0x7668e70e00000000,
+    0xa282949500000000, 0x9fbb71e300000000, 0x4b51027800000000,
+    0xe5c9bb0e00000000, 0x3123c89500000000, 0x0c1a2de300000000,
+    0xd8f05e7800000000, 0x1cad2c0f00000000, 0xc8475f9400000000,
+    0xf57ebae200000000, 0x2194c97900000000, 0x8f0c700f00000000,
+    0x5be6039400000000, 0x66dfe6e200000000, 0xb235957900000000,
+    0x3aee950f00000000, 0xee04e69400000000, 0xd33d03e200000000,
+    0x07d7707900000000, 0xa94fc90f00000000, 0x7da5ba9400000000,
+    0x409c5fe200000000, 0x94762c7900000000, 0xc827bb0c00000000,
+    0x1ccdc89700000000, 0x21f42de100000000, 0xf51e5e7a00000000,
+    0x5b86e70c00000000, 0x8f6c949700000000, 0xb25571e100000000,
+    0x66bf027a00000000, 0xee64020c00000000, 0x3a8e719700000000,
+    0x07b794e100000000, 0xd35de77a00000000, 0x7dc55e0c00000000,
+    0xa92f2d9700000000, 0x9416c8e100000000, 0x40fcbb7a00000000,
+    0x84a1c90d00000000, 0x504bba9600000000, 0x6d725fe000000000,
+    0xb9982c7b00000000, 0x1700950d00000000, 0xc3eae69600000000,
+    0xfed303e000000000, 0x2a39707b00000000, 0xa2e2700d00000000,
+    0x7608039600000000, 0x4b31e6e000000000, 0x9fdb957b00000000,
+    0x31432c0d00000000, 0xe5a95f9600000000, 0xd890bae000000000,
+    0x0c7ac97b00000000},
+   {0x0000000000000000, 0x2765258100000000, 0x0fcc3bd900000000,
+    0x28a91e5800000000, 0x5f9e066900000000, 0x78fb23e800000000,
+    0x50523db000000000, 0x7737183100000000, 0xbe3c0dd200000000,
+    0x9959285300000000, 0xb1f0360b00000000, 0x9695138a00000000,
+    0xe1a20bbb00000000, 0xc6c72e3a00000000, 0xee6e306200000000,
+    0xc90b15e300000000, 0x3d7f6b7f00000000, 0x1a1a4efe00000000,
+    0x32b350a600000000, 0x15d6752700000000, 0x62e16d1600000000,
+    0x4584489700000000, 0x6d2d56cf00000000, 0x4a48734e00000000,
+    0x834366ad00000000, 0xa426432c00000000, 0x8c8f5d7400000000,
+    0xabea78f500000000, 0xdcdd60c400000000, 0xfbb8454500000000,
+    0xd3115b1d00000000, 0xf4747e9c00000000, 0x7afed6fe00000000,
+    0x5d9bf37f00000000, 0x7532ed2700000000, 0x5257c8a600000000,
+    0x2560d09700000000, 0x0205f51600000000, 0x2aaceb4e00000000,
+    0x0dc9cecf00000000, 0xc4c2db2c00000000, 0xe3a7fead00000000,
+    0xcb0ee0f500000000, 0xec6bc57400000000, 0x9b5cdd4500000000,
+    0xbc39f8c400000000, 0x9490e69c00000000, 0xb3f5c31d00000000,
+    0x4781bd8100000000, 0x60e4980000000000, 0x484d865800000000,
+    0x6f28a3d900000000, 0x181fbbe800000000, 0x3f7a9e6900000000,
+    0x17d3803100000000, 0x30b6a5b000000000, 0xf9bdb05300000000,
+    0xded895d200000000, 0xf6718b8a00000000, 0xd114ae0b00000000,
+    0xa623b63a00000000, 0x814693bb00000000, 0xa9ef8de300000000,
+    0x8e8aa86200000000, 0xb5fadc2600000000, 0x929ff9a700000000,
+    0xba36e7ff00000000, 0x9d53c27e00000000, 0xea64da4f00000000,
+    0xcd01ffce00000000, 0xe5a8e19600000000, 0xc2cdc41700000000,
+    0x0bc6d1f400000000, 0x2ca3f47500000000, 0x040aea2d00000000,
+    0x236fcfac00000000, 0x5458d79d00000000, 0x733df21c00000000,
+    0x5b94ec4400000000, 0x7cf1c9c500000000, 0x8885b75900000000,
+    0xafe092d800000000, 0x87498c8000000000, 0xa02ca90100000000,
+    0xd71bb13000000000, 0xf07e94b100000000, 0xd8d78ae900000000,
+    0xffb2af6800000000, 0x36b9ba8b00000000, 0x11dc9f0a00000000,
+    0x3975815200000000, 0x1e10a4d300000000, 0x6927bce200000000,
+    0x4e42996300000000, 0x66eb873b00000000, 0x418ea2ba00000000,
+    0xcf040ad800000000, 0xe8612f5900000000, 0xc0c8310100000000,
+    0xe7ad148000000000, 0x909a0cb100000000, 0xb7ff293000000000,
+    0x9f56376800000000, 0xb83312e900000000, 0x7138070a00000000,
+    0x565d228b00000000, 0x7ef43cd300000000, 0x5991195200000000,
+    0x2ea6016300000000, 0x09c324e200000000, 0x216a3aba00000000,
+    0x060f1f3b00000000, 0xf27b61a700000000, 0xd51e442600000000,
+    0xfdb75a7e00000000, 0xdad27fff00000000, 0xade567ce00000000,
+    0x8a80424f00000000, 0xa2295c1700000000, 0x854c799600000000,
+    0x4c476c7500000000, 0x6b2249f400000000, 0x438b57ac00000000,
+    0x64ee722d00000000, 0x13d96a1c00000000, 0x34bc4f9d00000000,
+    0x1c1551c500000000, 0x3b70744400000000, 0x6af5b94d00000000,
+    0x4d909ccc00000000, 0x6539829400000000, 0x425ca71500000000,
+    0x356bbf2400000000, 0x120e9aa500000000, 0x3aa784fd00000000,
+    0x1dc2a17c00000000, 0xd4c9b49f00000000, 0xf3ac911e00000000,
+    0xdb058f4600000000, 0xfc60aac700000000, 0x8b57b2f600000000,
+    0xac32977700000000, 0x849b892f00000000, 0xa3feacae00000000,
+    0x578ad23200000000, 0x70eff7b300000000, 0x5846e9eb00000000,
+    0x7f23cc6a00000000, 0x0814d45b00000000, 0x2f71f1da00000000,
+    0x07d8ef8200000000, 0x20bdca0300000000, 0xe9b6dfe000000000,
+    0xced3fa6100000000, 0xe67ae43900000000, 0xc11fc1b800000000,
+    0xb628d98900000000, 0x914dfc0800000000, 0xb9e4e25000000000,
+    0x9e81c7d100000000, 0x100b6fb300000000, 0x376e4a3200000000,
+    0x1fc7546a00000000, 0x38a271eb00000000, 0x4f9569da00000000,
+    0x68f04c5b00000000, 0x4059520300000000, 0x673c778200000000,
+    0xae37626100000000, 0x895247e000000000, 0xa1fb59b800000000,
+    0x869e7c3900000000, 0xf1a9640800000000, 0xd6cc418900000000,
+    0xfe655fd100000000, 0xd9007a5000000000, 0x2d7404cc00000000,
+    0x0a11214d00000000, 0x22b83f1500000000, 0x05dd1a9400000000,
+    0x72ea02a500000000, 0x558f272400000000, 0x7d26397c00000000,
+    0x5a431cfd00000000, 0x9348091e00000000, 0xb42d2c9f00000000,
+    0x9c8432c700000000, 0xbbe1174600000000, 0xccd60f7700000000,
+    0xebb32af600000000, 0xc31a34ae00000000, 0xe47f112f00000000,
+    0xdf0f656b00000000, 0xf86a40ea00000000, 0xd0c35eb200000000,
+    0xf7a67b3300000000, 0x8091630200000000, 0xa7f4468300000000,
+    0x8f5d58db00000000, 0xa8387d5a00000000, 0x613368b900000000,
+    0x46564d3800000000, 0x6eff536000000000, 0x499a76e100000000,
+    0x3ead6ed000000000, 0x19c84b5100000000, 0x3161550900000000,
+    0x1604708800000000, 0xe2700e1400000000, 0xc5152b9500000000,
+    0xedbc35cd00000000, 0xcad9104c00000000, 0xbdee087d00000000,
+    0x9a8b2dfc00000000, 0xb22233a400000000, 0x9547162500000000,
+    0x5c4c03c600000000, 0x7b29264700000000, 0x5380381f00000000,
+    0x74e51d9e00000000, 0x03d205af00000000, 0x24b7202e00000000,
+    0x0c1e3e7600000000, 0x2b7b1bf700000000, 0xa5f1b39500000000,
+    0x8294961400000000, 0xaa3d884c00000000, 0x8d58adcd00000000,
+    0xfa6fb5fc00000000, 0xdd0a907d00000000, 0xf5a38e2500000000,
+    0xd2c6aba400000000, 0x1bcdbe4700000000, 0x3ca89bc600000000,
+    0x1401859e00000000, 0x3364a01f00000000, 0x4453b82e00000000,
+    0x63369daf00000000, 0x4b9f83f700000000, 0x6cfaa67600000000,
+    0x988ed8ea00000000, 0xbfebfd6b00000000, 0x9742e33300000000,
+    0xb027c6b200000000, 0xc710de8300000000, 0xe075fb0200000000,
+    0xc8dce55a00000000, 0xefb9c0db00000000, 0x26b2d53800000000,
+    0x01d7f0b900000000, 0x297eeee100000000, 0x0e1bcb6000000000,
+    0x792cd35100000000, 0x5e49f6d000000000, 0x76e0e88800000000,
+    0x5185cd0900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43147b17, 0x8628f62e, 0xc53c8d39, 0x0c51ec5d,
+    0x4f45974a, 0x8a791a73, 0xc96d6164, 0x18a2d8bb, 0x5bb6a3ac,
+    0x9e8a2e95, 0xdd9e5582, 0x14f334e6, 0x57e74ff1, 0x92dbc2c8,
+    0xd1cfb9df, 0x7142c0ac, 0x3256bbbb, 0xf76a3682, 0xb47e4d95,
+    0x7d132cf1, 0x3e0757e6, 0xfb3bdadf, 0xb82fa1c8, 0x69e01817,
+    0x2af46300, 0xefc8ee39, 0xacdc952e, 0x65b1f44a, 0x26a58f5d,
+    0xe3990264, 0xa08d7973, 0xa382f182, 0xe0968a95, 0x25aa07ac,
+    0x66be7cbb, 0xafd31ddf, 0xecc766c8, 0x29fbebf1, 0x6aef90e6,
+    0xbb202939, 0xf834522e, 0x3d08df17, 0x7e1ca400, 0xb771c564,
+    0xf465be73, 0x3159334a, 0x724d485d, 0xd2c0312e, 0x91d44a39,
+    0x54e8c700, 0x17fcbc17, 0xde91dd73, 0x9d85a664, 0x58b92b5d,
+    0x1bad504a, 0xca62e995, 0x89769282, 0x4c4a1fbb, 0x0f5e64ac,
+    0xc63305c8, 0x85277edf, 0x401bf3e6, 0x030f88f1, 0x070392de,
+    0x4417e9c9, 0x812b64f0, 0xc23f1fe7, 0x0b527e83, 0x48460594,
+    0x8d7a88ad, 0xce6ef3ba, 0x1fa14a65, 0x5cb53172, 0x9989bc4b,
+    0xda9dc75c, 0x13f0a638, 0x50e4dd2f, 0x95d85016, 0xd6cc2b01,
+    0x76415272, 0x35552965, 0xf069a45c, 0xb37ddf4b, 0x7a10be2f,
+    0x3904c538, 0xfc384801, 0xbf2c3316, 0x6ee38ac9, 0x2df7f1de,
+    0xe8cb7ce7, 0xabdf07f0, 0x62b26694, 0x21a61d83, 0xe49a90ba,
+    0xa78eebad, 0xa481635c, 0xe795184b, 0x22a99572, 0x61bdee65,
+    0xa8d08f01, 0xebc4f416, 0x2ef8792f, 0x6dec0238, 0xbc23bbe7,
+    0xff37c0f0, 0x3a0b4dc9, 0x791f36de, 0xb07257ba, 0xf3662cad,
+    0x365aa194, 0x754eda83, 0xd5c3a3f0, 0x96d7d8e7, 0x53eb55de,
+    0x10ff2ec9, 0xd9924fad, 0x9a8634ba, 0x5fbab983, 0x1caec294,
+    0xcd617b4b, 0x8e75005c, 0x4b498d65, 0x085df672, 0xc1309716,
+    0x8224ec01, 0x47186138, 0x040c1a2f, 0x4f005566, 0x0c142e71,
+    0xc928a348, 0x8a3cd85f, 0x4351b93b, 0x0045c22c, 0xc5794f15,
+    0x866d3402, 0x57a28ddd, 0x14b6f6ca, 0xd18a7bf3, 0x929e00e4,
+    0x5bf36180, 0x18e71a97, 0xdddb97ae, 0x9ecfecb9, 0x3e4295ca,
+    0x7d56eedd, 0xb86a63e4, 0xfb7e18f3, 0x32137997, 0x71070280,
+    0xb43b8fb9, 0xf72ff4ae, 0x26e04d71, 0x65f43666, 0xa0c8bb5f,
+    0xe3dcc048, 0x2ab1a12c, 0x69a5da3b, 0xac995702, 0xef8d2c15,
+    0xec82a4e4, 0xaf96dff3, 0x6aaa52ca, 0x29be29dd, 0xe0d348b9,
+    0xa3c733ae, 0x66fbbe97, 0x25efc580, 0xf4207c5f, 0xb7340748,
+    0x72088a71, 0x311cf166, 0xf8719002, 0xbb65eb15, 0x7e59662c,
+    0x3d4d1d3b, 0x9dc06448, 0xded41f5f, 0x1be89266, 0x58fce971,
+    0x91918815, 0xd285f302, 0x17b97e3b, 0x54ad052c, 0x8562bcf3,
+    0xc676c7e4, 0x034a4add, 0x405e31ca, 0x893350ae, 0xca272bb9,
+    0x0f1ba680, 0x4c0fdd97, 0x4803c7b8, 0x0b17bcaf, 0xce2b3196,
+    0x8d3f4a81, 0x44522be5, 0x074650f2, 0xc27addcb, 0x816ea6dc,
+    0x50a11f03, 0x13b56414, 0xd689e92d, 0x959d923a, 0x5cf0f35e,
+    0x1fe48849, 0xdad80570, 0x99cc7e67, 0x39410714, 0x7a557c03,
+    0xbf69f13a, 0xfc7d8a2d, 0x3510eb49, 0x7604905e, 0xb3381d67,
+    0xf02c6670, 0x21e3dfaf, 0x62f7a4b8, 0xa7cb2981, 0xe4df5296,
+    0x2db233f2, 0x6ea648e5, 0xab9ac5dc, 0xe88ebecb, 0xeb81363a,
+    0xa8954d2d, 0x6da9c014, 0x2ebdbb03, 0xe7d0da67, 0xa4c4a170,
+    0x61f82c49, 0x22ec575e, 0xf323ee81, 0xb0379596, 0x750b18af,
+    0x361f63b8, 0xff7202dc, 0xbc6679cb, 0x795af4f2, 0x3a4e8fe5,
+    0x9ac3f696, 0xd9d78d81, 0x1ceb00b8, 0x5fff7baf, 0x96921acb,
+    0xd58661dc, 0x10baece5, 0x53ae97f2, 0x82612e2d, 0xc175553a,
+    0x0449d803, 0x475da314, 0x8e30c270, 0xcd24b967, 0x0818345e,
+    0x4b0c4f49},
+   {0x00000000, 0x3e6bc2ef, 0x3dd0f504, 0x03bb37eb, 0x7aa0eb09,
+    0x44cb29e6, 0x47701e0d, 0x791bdce2, 0xf440d713, 0xca2b15fc,
+    0xc9902217, 0xf7fbe0f8, 0x8ee03c1a, 0xb08bfef5, 0xb330c91e,
+    0x8d5b0bf1, 0xe881ae27, 0xd6ea6cc8, 0xd5515b23, 0xeb3a99cc,
+    0x9221452e, 0xac4a87c1, 0xaff1b02a, 0x919a72c5, 0x1cc17934,
+    0x22aabbdb, 0x21118c30, 0x1f7a4edf, 0x6661923d, 0x580a50d2,
+    0x5bb16739, 0x65daa5d6, 0xd0035d4f, 0xee689fa0, 0xedd3a84b,
+    0xd3b86aa4, 0xaaa3b646, 0x94c874a9, 0x97734342, 0xa91881ad,
+    0x24438a5c, 0x1a2848b3, 0x19937f58, 0x27f8bdb7, 0x5ee36155,
+    0x6088a3ba, 0x63339451, 0x5d5856be, 0x3882f368, 0x06e93187,
+    0x0552066c, 0x3b39c483, 0x42221861, 0x7c49da8e, 0x7ff2ed65,
+    0x41992f8a, 0xccc2247b, 0xf2a9e694, 0xf112d17f, 0xcf791390,
+    0xb662cf72, 0x88090d9d, 0x8bb23a76, 0xb5d9f899, 0xa007ba9e,
+    0x9e6c7871, 0x9dd74f9a, 0xa3bc8d75, 0xdaa75197, 0xe4cc9378,
+    0xe777a493, 0xd91c667c, 0x54476d8d, 0x6a2caf62, 0x69979889,
+    0x57fc5a66, 0x2ee78684, 0x108c446b, 0x13377380, 0x2d5cb16f,
+    0x488614b9, 0x76edd656, 0x7556e1bd, 0x4b3d2352, 0x3226ffb0,
+    0x0c4d3d5f, 0x0ff60ab4, 0x319dc85b, 0xbcc6c3aa, 0x82ad0145,
+    0x811636ae, 0xbf7df441, 0xc66628a3, 0xf80dea4c, 0xfbb6dda7,
+    0xc5dd1f48, 0x7004e7d1, 0x4e6f253e, 0x4dd412d5, 0x73bfd03a,
+    0x0aa40cd8, 0x34cfce37, 0x3774f9dc, 0x091f3b33, 0x844430c2,
+    0xba2ff22d, 0xb994c5c6, 0x87ff0729, 0xfee4dbcb, 0xc08f1924,
+    0xc3342ecf, 0xfd5fec20, 0x988549f6, 0xa6ee8b19, 0xa555bcf2,
+    0x9b3e7e1d, 0xe225a2ff, 0xdc4e6010, 0xdff557fb, 0xe19e9514,
+    0x6cc59ee5, 0x52ae5c0a, 0x51156be1, 0x6f7ea90e, 0x166575ec,
+    0x280eb703, 0x2bb580e8, 0x15de4207, 0x010905e6, 0x3f62c709,
+    0x3cd9f0e2, 0x02b2320d, 0x7ba9eeef, 0x45c22c00, 0x46791beb,
+    0x7812d904, 0xf549d2f5, 0xcb22101a, 0xc89927f1, 0xf6f2e51e,
+    0x8fe939fc, 0xb182fb13, 0xb239ccf8, 0x8c520e17, 0xe988abc1,
+    0xd7e3692e, 0xd4585ec5, 0xea339c2a, 0x932840c8, 0xad438227,
+    0xaef8b5cc, 0x90937723, 0x1dc87cd2, 0x23a3be3d, 0x201889d6,
+    0x1e734b39, 0x676897db, 0x59035534, 0x5ab862df, 0x64d3a030,
+    0xd10a58a9, 0xef619a46, 0xecdaadad, 0xd2b16f42, 0xabaab3a0,
+    0x95c1714f, 0x967a46a4, 0xa811844b, 0x254a8fba, 0x1b214d55,
+    0x189a7abe, 0x26f1b851, 0x5fea64b3, 0x6181a65c, 0x623a91b7,
+    0x5c515358, 0x398bf68e, 0x07e03461, 0x045b038a, 0x3a30c165,
+    0x432b1d87, 0x7d40df68, 0x7efbe883, 0x40902a6c, 0xcdcb219d,
+    0xf3a0e372, 0xf01bd499, 0xce701676, 0xb76bca94, 0x8900087b,
+    0x8abb3f90, 0xb4d0fd7f, 0xa10ebf78, 0x9f657d97, 0x9cde4a7c,
+    0xa2b58893, 0xdbae5471, 0xe5c5969e, 0xe67ea175, 0xd815639a,
+    0x554e686b, 0x6b25aa84, 0x689e9d6f, 0x56f55f80, 0x2fee8362,
+    0x1185418d, 0x123e7666, 0x2c55b489, 0x498f115f, 0x77e4d3b0,
+    0x745fe45b, 0x4a3426b4, 0x332ffa56, 0x0d4438b9, 0x0eff0f52,
+    0x3094cdbd, 0xbdcfc64c, 0x83a404a3, 0x801f3348, 0xbe74f1a7,
+    0xc76f2d45, 0xf904efaa, 0xfabfd841, 0xc4d41aae, 0x710de237,
+    0x4f6620d8, 0x4cdd1733, 0x72b6d5dc, 0x0bad093e, 0x35c6cbd1,
+    0x367dfc3a, 0x08163ed5, 0x854d3524, 0xbb26f7cb, 0xb89dc020,
+    0x86f602cf, 0xffedde2d, 0xc1861cc2, 0xc23d2b29, 0xfc56e9c6,
+    0x998c4c10, 0xa7e78eff, 0xa45cb914, 0x9a377bfb, 0xe32ca719,
+    0xdd4765f6, 0xdefc521d, 0xe09790f2, 0x6dcc9b03, 0x53a759ec,
+    0x501c6e07, 0x6e77ace8, 0x176c700a, 0x2907b2e5, 0x2abc850e,
+    0x14d747e1},
+   {0x00000000, 0xc0df8ec1, 0xc1b96c58, 0x0166e299, 0x8273d9b0,
+    0x42ac5771, 0x43cab5e8, 0x83153b29, 0x45e1c3ba, 0x853e4d7b,
+    0x8458afe2, 0x44872123, 0xc7921a0a, 0x074d94cb, 0x062b7652,
+    0xc6f4f893, 0xcbc4f6ae, 0x0b1b786f, 0x0a7d9af6, 0xcaa21437,
+    0x49b72f1e, 0x8968a1df, 0x880e4346, 0x48d1cd87, 0x8e253514,
+    0x4efabbd5, 0x4f9c594c, 0x8f43d78d, 0x0c56eca4, 0xcc896265,
+    0xcdef80fc, 0x0d300e3d, 0xd78f9c86, 0x17501247, 0x1636f0de,
+    0xd6e97e1f, 0x55fc4536, 0x9523cbf7, 0x9445296e, 0x549aa7af,
+    0x926e5f3c, 0x52b1d1fd, 0x53d73364, 0x9308bda5, 0x101d868c,
+    0xd0c2084d, 0xd1a4ead4, 0x117b6415, 0x1c4b6a28, 0xdc94e4e9,
+    0xddf20670, 0x1d2d88b1, 0x9e38b398, 0x5ee73d59, 0x5f81dfc0,
+    0x9f5e5101, 0x59aaa992, 0x99752753, 0x9813c5ca, 0x58cc4b0b,
+    0xdbd97022, 0x1b06fee3, 0x1a601c7a, 0xdabf92bb, 0xef1948d6,
+    0x2fc6c617, 0x2ea0248e, 0xee7faa4f, 0x6d6a9166, 0xadb51fa7,
+    0xacd3fd3e, 0x6c0c73ff, 0xaaf88b6c, 0x6a2705ad, 0x6b41e734,
+    0xab9e69f5, 0x288b52dc, 0xe854dc1d, 0xe9323e84, 0x29edb045,
+    0x24ddbe78, 0xe40230b9, 0xe564d220, 0x25bb5ce1, 0xa6ae67c8,
+    0x6671e909, 0x67170b90, 0xa7c88551, 0x613c7dc2, 0xa1e3f303,
+    0xa085119a, 0x605a9f5b, 0xe34fa472, 0x23902ab3, 0x22f6c82a,
+    0xe22946eb, 0x3896d450, 0xf8495a91, 0xf92fb808, 0x39f036c9,
+    0xbae50de0, 0x7a3a8321, 0x7b5c61b8, 0xbb83ef79, 0x7d7717ea,
+    0xbda8992b, 0xbcce7bb2, 0x7c11f573, 0xff04ce5a, 0x3fdb409b,
+    0x3ebda202, 0xfe622cc3, 0xf35222fe, 0x338dac3f, 0x32eb4ea6,
+    0xf234c067, 0x7121fb4e, 0xb1fe758f, 0xb0989716, 0x704719d7,
+    0xb6b3e144, 0x766c6f85, 0x770a8d1c, 0xb7d503dd, 0x34c038f4,
+    0xf41fb635, 0xf57954ac, 0x35a6da6d, 0x9f35e177, 0x5fea6fb6,
+    0x5e8c8d2f, 0x9e5303ee, 0x1d4638c7, 0xdd99b606, 0xdcff549f,
+    0x1c20da5e, 0xdad422cd, 0x1a0bac0c, 0x1b6d4e95, 0xdbb2c054,
+    0x58a7fb7d, 0x987875bc, 0x991e9725, 0x59c119e4, 0x54f117d9,
+    0x942e9918, 0x95487b81, 0x5597f540, 0xd682ce69, 0x165d40a8,
+    0x173ba231, 0xd7e42cf0, 0x1110d463, 0xd1cf5aa2, 0xd0a9b83b,
+    0x107636fa, 0x93630dd3, 0x53bc8312, 0x52da618b, 0x9205ef4a,
+    0x48ba7df1, 0x8865f330, 0x890311a9, 0x49dc9f68, 0xcac9a441,
+    0x0a162a80, 0x0b70c819, 0xcbaf46d8, 0x0d5bbe4b, 0xcd84308a,
+    0xcce2d213, 0x0c3d5cd2, 0x8f2867fb, 0x4ff7e93a, 0x4e910ba3,
+    0x8e4e8562, 0x837e8b5f, 0x43a1059e, 0x42c7e707, 0x821869c6,
+    0x010d52ef, 0xc1d2dc2e, 0xc0b43eb7, 0x006bb076, 0xc69f48e5,
+    0x0640c624, 0x072624bd, 0xc7f9aa7c, 0x44ec9155, 0x84331f94,
+    0x8555fd0d, 0x458a73cc, 0x702ca9a1, 0xb0f32760, 0xb195c5f9,
+    0x714a4b38, 0xf25f7011, 0x3280fed0, 0x33e61c49, 0xf3399288,
+    0x35cd6a1b, 0xf512e4da, 0xf4740643, 0x34ab8882, 0xb7beb3ab,
+    0x77613d6a, 0x7607dff3, 0xb6d85132, 0xbbe85f0f, 0x7b37d1ce,
+    0x7a513357, 0xba8ebd96, 0x399b86bf, 0xf944087e, 0xf822eae7,
+    0x38fd6426, 0xfe099cb5, 0x3ed61274, 0x3fb0f0ed, 0xff6f7e2c,
+    0x7c7a4505, 0xbca5cbc4, 0xbdc3295d, 0x7d1ca79c, 0xa7a33527,
+    0x677cbbe6, 0x661a597f, 0xa6c5d7be, 0x25d0ec97, 0xe50f6256,
+    0xe46980cf, 0x24b60e0e, 0xe242f69d, 0x229d785c, 0x23fb9ac5,
+    0xe3241404, 0x60312f2d, 0xa0eea1ec, 0xa1884375, 0x6157cdb4,
+    0x6c67c389, 0xacb84d48, 0xaddeafd1, 0x6d012110, 0xee141a39,
+    0x2ecb94f8, 0x2fad7661, 0xef72f8a0, 0x29860033, 0xe9598ef2,
+    0xe83f6c6b, 0x28e0e2aa, 0xabf5d983, 0x6b2a5742, 0x6a4cb5db,
+    0xaa933b1a},
+   {0x00000000, 0x6f4ca59b, 0x9f9e3bec, 0xf0d29e77, 0x7f3b0603,
+    0x1077a398, 0xe0a53def, 0x8fe99874, 0xfe760c06, 0x913aa99d,
+    0x61e837ea, 0x0ea49271, 0x814d0a05, 0xee01af9e, 0x1ed331e9,
+    0x719f9472, 0xfced180c, 0x93a1bd97, 0x637323e0, 0x0c3f867b,
+    0x83d61e0f, 0xec9abb94, 0x1c4825e3, 0x73048078, 0x029b140a,
+    0x6dd7b191, 0x9d052fe6, 0xf2498a7d, 0x7da01209, 0x12ecb792,
+    0xe23e29e5, 0x8d728c7e, 0xf8db3118, 0x97979483, 0x67450af4,
+    0x0809af6f, 0x87e0371b, 0xe8ac9280, 0x187e0cf7, 0x7732a96c,
+    0x06ad3d1e, 0x69e19885, 0x993306f2, 0xf67fa369, 0x79963b1d,
+    0x16da9e86, 0xe60800f1, 0x8944a56a, 0x04362914, 0x6b7a8c8f,
+    0x9ba812f8, 0xf4e4b763, 0x7b0d2f17, 0x14418a8c, 0xe49314fb,
+    0x8bdfb160, 0xfa402512, 0x950c8089, 0x65de1efe, 0x0a92bb65,
+    0x857b2311, 0xea37868a, 0x1ae518fd, 0x75a9bd66, 0xf0b76330,
+    0x9ffbc6ab, 0x6f2958dc, 0x0065fd47, 0x8f8c6533, 0xe0c0c0a8,
+    0x10125edf, 0x7f5efb44, 0x0ec16f36, 0x618dcaad, 0x915f54da,
+    0xfe13f141, 0x71fa6935, 0x1eb6ccae, 0xee6452d9, 0x8128f742,
+    0x0c5a7b3c, 0x6316dea7, 0x93c440d0, 0xfc88e54b, 0x73617d3f,
+    0x1c2dd8a4, 0xecff46d3, 0x83b3e348, 0xf22c773a, 0x9d60d2a1,
+    0x6db24cd6, 0x02fee94d, 0x8d177139, 0xe25bd4a2, 0x12894ad5,
+    0x7dc5ef4e, 0x086c5228, 0x6720f7b3, 0x97f269c4, 0xf8becc5f,
+    0x7757542b, 0x181bf1b0, 0xe8c96fc7, 0x8785ca5c, 0xf61a5e2e,
+    0x9956fbb5, 0x698465c2, 0x06c8c059, 0x8921582d, 0xe66dfdb6,
+    0x16bf63c1, 0x79f3c65a, 0xf4814a24, 0x9bcdefbf, 0x6b1f71c8,
+    0x0453d453, 0x8bba4c27, 0xe4f6e9bc, 0x142477cb, 0x7b68d250,
+    0x0af74622, 0x65bbe3b9, 0x95697dce, 0xfa25d855, 0x75cc4021,
+    0x1a80e5ba, 0xea527bcd, 0x851ede56, 0xe06fc760, 0x8f2362fb,
+    0x7ff1fc8c, 0x10bd5917, 0x9f54c163, 0xf01864f8, 0x00cafa8f,
+    0x6f865f14, 0x1e19cb66, 0x71556efd, 0x8187f08a, 0xeecb5511,
+    0x6122cd65, 0x0e6e68fe, 0xfebcf689, 0x91f05312, 0x1c82df6c,
+    0x73ce7af7, 0x831ce480, 0xec50411b, 0x63b9d96f, 0x0cf57cf4,
+    0xfc27e283, 0x936b4718, 0xe2f4d36a, 0x8db876f1, 0x7d6ae886,
+    0x12264d1d, 0x9dcfd569, 0xf28370f2, 0x0251ee85, 0x6d1d4b1e,
+    0x18b4f678, 0x77f853e3, 0x872acd94, 0xe866680f, 0x678ff07b,
+    0x08c355e0, 0xf811cb97, 0x975d6e0c, 0xe6c2fa7e, 0x898e5fe5,
+    0x795cc192, 0x16106409, 0x99f9fc7d, 0xf6b559e6, 0x0667c791,
+    0x692b620a, 0xe459ee74, 0x8b154bef, 0x7bc7d598, 0x148b7003,
+    0x9b62e877, 0xf42e4dec, 0x04fcd39b, 0x6bb07600, 0x1a2fe272,
+    0x756347e9, 0x85b1d99e, 0xeafd7c05, 0x6514e471, 0x0a5841ea,
+    0xfa8adf9d, 0x95c67a06, 0x10d8a450, 0x7f9401cb, 0x8f469fbc,
+    0xe00a3a27, 0x6fe3a253, 0x00af07c8, 0xf07d99bf, 0x9f313c24,
+    0xeeaea856, 0x81e20dcd, 0x713093ba, 0x1e7c3621, 0x9195ae55,
+    0xfed90bce, 0x0e0b95b9, 0x61473022, 0xec35bc5c, 0x837919c7,
+    0x73ab87b0, 0x1ce7222b, 0x930eba5f, 0xfc421fc4, 0x0c9081b3,
+    0x63dc2428, 0x1243b05a, 0x7d0f15c1, 0x8ddd8bb6, 0xe2912e2d,
+    0x6d78b659, 0x023413c2, 0xf2e68db5, 0x9daa282e, 0xe8039548,
+    0x874f30d3, 0x779daea4, 0x18d10b3f, 0x9738934b, 0xf87436d0,
+    0x08a6a8a7, 0x67ea0d3c, 0x1675994e, 0x79393cd5, 0x89eba2a2,
+    0xe6a70739, 0x694e9f4d, 0x06023ad6, 0xf6d0a4a1, 0x999c013a,
+    0x14ee8d44, 0x7ba228df, 0x8b70b6a8, 0xe43c1333, 0x6bd58b47,
+    0x04992edc, 0xf44bb0ab, 0x9b071530, 0xea988142, 0x85d424d9,
+    0x7506baae, 0x1a4a1f35, 0x95a38741, 0xfaef22da, 0x0a3dbcad,
+    0x65711936}};
+
+#endif
+
+#endif
+
+#if N == 4
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xf1da05aa, 0x38c50d15, 0xc91f08bf, 0x718a1a2a,
+    0x80501f80, 0x494f173f, 0xb8951295, 0xe3143454, 0x12ce31fe,
+    0xdbd13941, 0x2a0b3ceb, 0x929e2e7e, 0x63442bd4, 0xaa5b236b,
+    0x5b8126c1, 0x1d596ee9, 0xec836b43, 0x259c63fc, 0xd4466656,
+    0x6cd374c3, 0x9d097169, 0x541679d6, 0xa5cc7c7c, 0xfe4d5abd,
+    0x0f975f17, 0xc68857a8, 0x37525202, 0x8fc74097, 0x7e1d453d,
+    0xb7024d82, 0x46d84828, 0x3ab2ddd2, 0xcb68d878, 0x0277d0c7,
+    0xf3add56d, 0x4b38c7f8, 0xbae2c252, 0x73fdcaed, 0x8227cf47,
+    0xd9a6e986, 0x287cec2c, 0xe163e493, 0x10b9e139, 0xa82cf3ac,
+    0x59f6f606, 0x90e9feb9, 0x6133fb13, 0x27ebb33b, 0xd631b691,
+    0x1f2ebe2e, 0xeef4bb84, 0x5661a911, 0xa7bbacbb, 0x6ea4a404,
+    0x9f7ea1ae, 0xc4ff876f, 0x352582c5, 0xfc3a8a7a, 0x0de08fd0,
+    0xb5759d45, 0x44af98ef, 0x8db09050, 0x7c6a95fa, 0x7565bba4,
+    0x84bfbe0e, 0x4da0b6b1, 0xbc7ab31b, 0x04efa18e, 0xf535a424,
+    0x3c2aac9b, 0xcdf0a931, 0x96718ff0, 0x67ab8a5a, 0xaeb482e5,
+    0x5f6e874f, 0xe7fb95da, 0x16219070, 0xdf3e98cf, 0x2ee49d65,
+    0x683cd54d, 0x99e6d0e7, 0x50f9d858, 0xa123ddf2, 0x19b6cf67,
+    0xe86ccacd, 0x2173c272, 0xd0a9c7d8, 0x8b28e119, 0x7af2e4b3,
+    0xb3edec0c, 0x4237e9a6, 0xfaa2fb33, 0x0b78fe99, 0xc267f626,
+    0x33bdf38c, 0x4fd76676, 0xbe0d63dc, 0x77126b63, 0x86c86ec9,
+    0x3e5d7c5c, 0xcf8779f6, 0x06987149, 0xf74274e3, 0xacc35222,
+    0x5d195788, 0x94065f37, 0x65dc5a9d, 0xdd494808, 0x2c934da2,
+    0xe58c451d, 0x145640b7, 0x528e089f, 0xa3540d35, 0x6a4b058a,
+    0x9b910020, 0x230412b5, 0xd2de171f, 0x1bc11fa0, 0xea1b1a0a,
+    0xb19a3ccb, 0x40403961, 0x895f31de, 0x78853474, 0xc01026e1,
+    0x31ca234b, 0xf8d52bf4, 0x090f2e5e, 0xeacb7748, 0x1b1172e2,
+    0xd20e7a5d, 0x23d47ff7, 0x9b416d62, 0x6a9b68c8, 0xa3846077,
+    0x525e65dd, 0x09df431c, 0xf80546b6, 0x311a4e09, 0xc0c04ba3,
+    0x78555936, 0x898f5c9c, 0x40905423, 0xb14a5189, 0xf79219a1,
+    0x06481c0b, 0xcf5714b4, 0x3e8d111e, 0x8618038b, 0x77c20621,
+    0xbedd0e9e, 0x4f070b34, 0x14862df5, 0xe55c285f, 0x2c4320e0,
+    0xdd99254a, 0x650c37df, 0x94d63275, 0x5dc93aca, 0xac133f60,
+    0xd079aa9a, 0x21a3af30, 0xe8bca78f, 0x1966a225, 0xa1f3b0b0,
+    0x5029b51a, 0x9936bda5, 0x68ecb80f, 0x336d9ece, 0xc2b79b64,
+    0x0ba893db, 0xfa729671, 0x42e784e4, 0xb33d814e, 0x7a2289f1,
+    0x8bf88c5b, 0xcd20c473, 0x3cfac1d9, 0xf5e5c966, 0x043fcccc,
+    0xbcaade59, 0x4d70dbf3, 0x846fd34c, 0x75b5d6e6, 0x2e34f027,
+    0xdfeef58d, 0x16f1fd32, 0xe72bf898, 0x5fbeea0d, 0xae64efa7,
+    0x677be718, 0x96a1e2b2, 0x9faeccec, 0x6e74c946, 0xa76bc1f9,
+    0x56b1c453, 0xee24d6c6, 0x1ffed36c, 0xd6e1dbd3, 0x273bde79,
+    0x7cbaf8b8, 0x8d60fd12, 0x447ff5ad, 0xb5a5f007, 0x0d30e292,
+    0xfceae738, 0x35f5ef87, 0xc42fea2d, 0x82f7a205, 0x732da7af,
+    0xba32af10, 0x4be8aaba, 0xf37db82f, 0x02a7bd85, 0xcbb8b53a,
+    0x3a62b090, 0x61e39651, 0x903993fb, 0x59269b44, 0xa8fc9eee,
+    0x10698c7b, 0xe1b389d1, 0x28ac816e, 0xd97684c4, 0xa51c113e,
+    0x54c61494, 0x9dd91c2b, 0x6c031981, 0xd4960b14, 0x254c0ebe,
+    0xec530601, 0x1d8903ab, 0x4608256a, 0xb7d220c0, 0x7ecd287f,
+    0x8f172dd5, 0x37823f40, 0xc6583aea, 0x0f473255, 0xfe9d37ff,
+    0xb8457fd7, 0x499f7a7d, 0x808072c2, 0x715a7768, 0xc9cf65fd,
+    0x38156057, 0xf10a68e8, 0x00d06d42, 0x5b514b83, 0xaa8b4e29,
+    0x63944696, 0x924e433c, 0x2adb51a9, 0xdb015403, 0x121e5cbc,
+    0xe3c45916},
+   {0x00000000, 0x0ee7e8d1, 0x1dcfd1a2, 0x13283973, 0x3b9fa344,
+    0x35784b95, 0x265072e6, 0x28b79a37, 0x773f4688, 0x79d8ae59,
+    0x6af0972a, 0x64177ffb, 0x4ca0e5cc, 0x42470d1d, 0x516f346e,
+    0x5f88dcbf, 0xee7e8d10, 0xe09965c1, 0xf3b15cb2, 0xfd56b463,
+    0xd5e12e54, 0xdb06c685, 0xc82efff6, 0xc6c91727, 0x9941cb98,
+    0x97a62349, 0x848e1a3a, 0x8a69f2eb, 0xa2de68dc, 0xac39800d,
+    0xbf11b97e, 0xb1f651af, 0x078c1c61, 0x096bf4b0, 0x1a43cdc3,
+    0x14a42512, 0x3c13bf25, 0x32f457f4, 0x21dc6e87, 0x2f3b8656,
+    0x70b35ae9, 0x7e54b238, 0x6d7c8b4b, 0x639b639a, 0x4b2cf9ad,
+    0x45cb117c, 0x56e3280f, 0x5804c0de, 0xe9f29171, 0xe71579a0,
+    0xf43d40d3, 0xfadaa802, 0xd26d3235, 0xdc8adae4, 0xcfa2e397,
+    0xc1450b46, 0x9ecdd7f9, 0x902a3f28, 0x8302065b, 0x8de5ee8a,
+    0xa55274bd, 0xabb59c6c, 0xb89da51f, 0xb67a4dce, 0x0f1838c2,
+    0x01ffd013, 0x12d7e960, 0x1c3001b1, 0x34879b86, 0x3a607357,
+    0x29484a24, 0x27afa2f5, 0x78277e4a, 0x76c0969b, 0x65e8afe8,
+    0x6b0f4739, 0x43b8dd0e, 0x4d5f35df, 0x5e770cac, 0x5090e47d,
+    0xe166b5d2, 0xef815d03, 0xfca96470, 0xf24e8ca1, 0xdaf91696,
+    0xd41efe47, 0xc736c734, 0xc9d12fe5, 0x9659f35a, 0x98be1b8b,
+    0x8b9622f8, 0x8571ca29, 0xadc6501e, 0xa321b8cf, 0xb00981bc,
+    0xbeee696d, 0x089424a3, 0x0673cc72, 0x155bf501, 0x1bbc1dd0,
+    0x330b87e7, 0x3dec6f36, 0x2ec45645, 0x2023be94, 0x7fab622b,
+    0x714c8afa, 0x6264b389, 0x6c835b58, 0x4434c16f, 0x4ad329be,
+    0x59fb10cd, 0x571cf81c, 0xe6eaa9b3, 0xe80d4162, 0xfb257811,
+    0xf5c290c0, 0xdd750af7, 0xd392e226, 0xc0badb55, 0xce5d3384,
+    0x91d5ef3b, 0x9f3207ea, 0x8c1a3e99, 0x82fdd648, 0xaa4a4c7f,
+    0xa4ada4ae, 0xb7859ddd, 0xb962750c, 0x1e307184, 0x10d79955,
+    0x03ffa026, 0x0d1848f7, 0x25afd2c0, 0x2b483a11, 0x38600362,
+    0x3687ebb3, 0x690f370c, 0x67e8dfdd, 0x74c0e6ae, 0x7a270e7f,
+    0x52909448, 0x5c777c99, 0x4f5f45ea, 0x41b8ad3b, 0xf04efc94,
+    0xfea91445, 0xed812d36, 0xe366c5e7, 0xcbd15fd0, 0xc536b701,
+    0xd61e8e72, 0xd8f966a3, 0x8771ba1c, 0x899652cd, 0x9abe6bbe,
+    0x9459836f, 0xbcee1958, 0xb209f189, 0xa121c8fa, 0xafc6202b,
+    0x19bc6de5, 0x175b8534, 0x0473bc47, 0x0a945496, 0x2223cea1,
+    0x2cc42670, 0x3fec1f03, 0x310bf7d2, 0x6e832b6d, 0x6064c3bc,
+    0x734cfacf, 0x7dab121e, 0x551c8829, 0x5bfb60f8, 0x48d3598b,
+    0x4634b15a, 0xf7c2e0f5, 0xf9250824, 0xea0d3157, 0xe4ead986,
+    0xcc5d43b1, 0xc2baab60, 0xd1929213, 0xdf757ac2, 0x80fda67d,
+    0x8e1a4eac, 0x9d3277df, 0x93d59f0e, 0xbb620539, 0xb585ede8,
+    0xa6add49b, 0xa84a3c4a, 0x11284946, 0x1fcfa197, 0x0ce798e4,
+    0x02007035, 0x2ab7ea02, 0x245002d3, 0x37783ba0, 0x399fd371,
+    0x66170fce, 0x68f0e71f, 0x7bd8de6c, 0x753f36bd, 0x5d88ac8a,
+    0x536f445b, 0x40477d28, 0x4ea095f9, 0xff56c456, 0xf1b12c87,
+    0xe29915f4, 0xec7efd25, 0xc4c96712, 0xca2e8fc3, 0xd906b6b0,
+    0xd7e15e61, 0x886982de, 0x868e6a0f, 0x95a6537c, 0x9b41bbad,
+    0xb3f6219a, 0xbd11c94b, 0xae39f038, 0xa0de18e9, 0x16a45527,
+    0x1843bdf6, 0x0b6b8485, 0x058c6c54, 0x2d3bf663, 0x23dc1eb2,
+    0x30f427c1, 0x3e13cf10, 0x619b13af, 0x6f7cfb7e, 0x7c54c20d,
+    0x72b32adc, 0x5a04b0eb, 0x54e3583a, 0x47cb6149, 0x492c8998,
+    0xf8dad837, 0xf63d30e6, 0xe5150995, 0xebf2e144, 0xc3457b73,
+    0xcda293a2, 0xde8aaad1, 0xd06d4200, 0x8fe59ebf, 0x8102766e,
+    0x922a4f1d, 0x9ccda7cc, 0xb47a3dfb, 0xba9dd52a, 0xa9b5ec59,
+    0xa7520488},
+   {0x00000000, 0x3c60e308, 0x78c1c610, 0x44a12518, 0xf1838c20,
+    0xcde36f28, 0x89424a30, 0xb522a938, 0x38761e01, 0x0416fd09,
+    0x40b7d811, 0x7cd73b19, 0xc9f59221, 0xf5957129, 0xb1345431,
+    0x8d54b739, 0x70ec3c02, 0x4c8cdf0a, 0x082dfa12, 0x344d191a,
+    0x816fb022, 0xbd0f532a, 0xf9ae7632, 0xc5ce953a, 0x489a2203,
+    0x74fac10b, 0x305be413, 0x0c3b071b, 0xb919ae23, 0x85794d2b,
+    0xc1d86833, 0xfdb88b3b, 0xe1d87804, 0xddb89b0c, 0x9919be14,
+    0xa5795d1c, 0x105bf424, 0x2c3b172c, 0x689a3234, 0x54fad13c,
+    0xd9ae6605, 0xe5ce850d, 0xa16fa015, 0x9d0f431d, 0x282dea25,
+    0x144d092d, 0x50ec2c35, 0x6c8ccf3d, 0x91344406, 0xad54a70e,
+    0xe9f58216, 0xd595611e, 0x60b7c826, 0x5cd72b2e, 0x18760e36,
+    0x2416ed3e, 0xa9425a07, 0x9522b90f, 0xd1839c17, 0xede37f1f,
+    0x58c1d627, 0x64a1352f, 0x20001037, 0x1c60f33f, 0x18c1f649,
+    0x24a11541, 0x60003059, 0x5c60d351, 0xe9427a69, 0xd5229961,
+    0x9183bc79, 0xade35f71, 0x20b7e848, 0x1cd70b40, 0x58762e58,
+    0x6416cd50, 0xd1346468, 0xed548760, 0xa9f5a278, 0x95954170,
+    0x682dca4b, 0x544d2943, 0x10ec0c5b, 0x2c8cef53, 0x99ae466b,
+    0xa5cea563, 0xe16f807b, 0xdd0f6373, 0x505bd44a, 0x6c3b3742,
+    0x289a125a, 0x14faf152, 0xa1d8586a, 0x9db8bb62, 0xd9199e7a,
+    0xe5797d72, 0xf9198e4d, 0xc5796d45, 0x81d8485d, 0xbdb8ab55,
+    0x089a026d, 0x34fae165, 0x705bc47d, 0x4c3b2775, 0xc16f904c,
+    0xfd0f7344, 0xb9ae565c, 0x85ceb554, 0x30ec1c6c, 0x0c8cff64,
+    0x482dda7c, 0x744d3974, 0x89f5b24f, 0xb5955147, 0xf134745f,
+    0xcd549757, 0x78763e6f, 0x4416dd67, 0x00b7f87f, 0x3cd71b77,
+    0xb183ac4e, 0x8de34f46, 0xc9426a5e, 0xf5228956, 0x4000206e,
+    0x7c60c366, 0x38c1e67e, 0x04a10576, 0x3183ec92, 0x0de30f9a,
+    0x49422a82, 0x7522c98a, 0xc00060b2, 0xfc6083ba, 0xb8c1a6a2,
+    0x84a145aa, 0x09f5f293, 0x3595119b, 0x71343483, 0x4d54d78b,
+    0xf8767eb3, 0xc4169dbb, 0x80b7b8a3, 0xbcd75bab, 0x416fd090,
+    0x7d0f3398, 0x39ae1680, 0x05cef588, 0xb0ec5cb0, 0x8c8cbfb8,
+    0xc82d9aa0, 0xf44d79a8, 0x7919ce91, 0x45792d99, 0x01d80881,
+    0x3db8eb89, 0x889a42b1, 0xb4faa1b9, 0xf05b84a1, 0xcc3b67a9,
+    0xd05b9496, 0xec3b779e, 0xa89a5286, 0x94fab18e, 0x21d818b6,
+    0x1db8fbbe, 0x5919dea6, 0x65793dae, 0xe82d8a97, 0xd44d699f,
+    0x90ec4c87, 0xac8caf8f, 0x19ae06b7, 0x25cee5bf, 0x616fc0a7,
+    0x5d0f23af, 0xa0b7a894, 0x9cd74b9c, 0xd8766e84, 0xe4168d8c,
+    0x513424b4, 0x6d54c7bc, 0x29f5e2a4, 0x159501ac, 0x98c1b695,
+    0xa4a1559d, 0xe0007085, 0xdc60938d, 0x69423ab5, 0x5522d9bd,
+    0x1183fca5, 0x2de31fad, 0x29421adb, 0x1522f9d3, 0x5183dccb,
+    0x6de33fc3, 0xd8c196fb, 0xe4a175f3, 0xa00050eb, 0x9c60b3e3,
+    0x113404da, 0x2d54e7d2, 0x69f5c2ca, 0x559521c2, 0xe0b788fa,
+    0xdcd76bf2, 0x98764eea, 0xa416ade2, 0x59ae26d9, 0x65cec5d1,
+    0x216fe0c9, 0x1d0f03c1, 0xa82daaf9, 0x944d49f1, 0xd0ec6ce9,
+    0xec8c8fe1, 0x61d838d8, 0x5db8dbd0, 0x1919fec8, 0x25791dc0,
+    0x905bb4f8, 0xac3b57f0, 0xe89a72e8, 0xd4fa91e0, 0xc89a62df,
+    0xf4fa81d7, 0xb05ba4cf, 0x8c3b47c7, 0x3919eeff, 0x05790df7,
+    0x41d828ef, 0x7db8cbe7, 0xf0ec7cde, 0xcc8c9fd6, 0x882dbace,
+    0xb44d59c6, 0x016ff0fe, 0x3d0f13f6, 0x79ae36ee, 0x45ced5e6,
+    0xb8765edd, 0x8416bdd5, 0xc0b798cd, 0xfcd77bc5, 0x49f5d2fd,
+    0x759531f5, 0x313414ed, 0x0d54f7e5, 0x800040dc, 0xbc60a3d4,
+    0xf8c186cc, 0xc4a165c4, 0x7183ccfc, 0x4de32ff4, 0x09420aec,
+    0x3522e9e4},
+   {0x00000000, 0x6307d924, 0xc60fb248, 0xa5086b6c, 0x576e62d1,
+    0x3469bbf5, 0x9161d099, 0xf26609bd, 0xaedcc5a2, 0xcddb1c86,
+    0x68d377ea, 0x0bd4aece, 0xf9b2a773, 0x9ab57e57, 0x3fbd153b,
+    0x5cbacc1f, 0x86c88d05, 0xe5cf5421, 0x40c73f4d, 0x23c0e669,
+    0xd1a6efd4, 0xb2a136f0, 0x17a95d9c, 0x74ae84b8, 0x281448a7,
+    0x4b139183, 0xee1bfaef, 0x8d1c23cb, 0x7f7a2a76, 0x1c7df352,
+    0xb975983e, 0xda72411a, 0xd6e01c4b, 0xb5e7c56f, 0x10efae03,
+    0x73e87727, 0x818e7e9a, 0xe289a7be, 0x4781ccd2, 0x248615f6,
+    0x783cd9e9, 0x1b3b00cd, 0xbe336ba1, 0xdd34b285, 0x2f52bb38,
+    0x4c55621c, 0xe95d0970, 0x8a5ad054, 0x5028914e, 0x332f486a,
+    0x96272306, 0xf520fa22, 0x0746f39f, 0x64412abb, 0xc14941d7,
+    0xa24e98f3, 0xfef454ec, 0x9df38dc8, 0x38fbe6a4, 0x5bfc3f80,
+    0xa99a363d, 0xca9def19, 0x6f958475, 0x0c925d51, 0x76b13ed7,
+    0x15b6e7f3, 0xb0be8c9f, 0xd3b955bb, 0x21df5c06, 0x42d88522,
+    0xe7d0ee4e, 0x84d7376a, 0xd86dfb75, 0xbb6a2251, 0x1e62493d,
+    0x7d659019, 0x8f0399a4, 0xec044080, 0x490c2bec, 0x2a0bf2c8,
+    0xf079b3d2, 0x937e6af6, 0x3676019a, 0x5571d8be, 0xa717d103,
+    0xc4100827, 0x6118634b, 0x021fba6f, 0x5ea57670, 0x3da2af54,
+    0x98aac438, 0xfbad1d1c, 0x09cb14a1, 0x6acccd85, 0xcfc4a6e9,
+    0xacc37fcd, 0xa051229c, 0xc356fbb8, 0x665e90d4, 0x055949f0,
+    0xf73f404d, 0x94389969, 0x3130f205, 0x52372b21, 0x0e8de73e,
+    0x6d8a3e1a, 0xc8825576, 0xab858c52, 0x59e385ef, 0x3ae45ccb,
+    0x9fec37a7, 0xfcebee83, 0x2699af99, 0x459e76bd, 0xe0961dd1,
+    0x8391c4f5, 0x71f7cd48, 0x12f0146c, 0xb7f87f00, 0xd4ffa624,
+    0x88456a3b, 0xeb42b31f, 0x4e4ad873, 0x2d4d0157, 0xdf2b08ea,
+    0xbc2cd1ce, 0x1924baa2, 0x7a236386, 0xed627dae, 0x8e65a48a,
+    0x2b6dcfe6, 0x486a16c2, 0xba0c1f7f, 0xd90bc65b, 0x7c03ad37,
+    0x1f047413, 0x43beb80c, 0x20b96128, 0x85b10a44, 0xe6b6d360,
+    0x14d0dadd, 0x77d703f9, 0xd2df6895, 0xb1d8b1b1, 0x6baaf0ab,
+    0x08ad298f, 0xada542e3, 0xcea29bc7, 0x3cc4927a, 0x5fc34b5e,
+    0xfacb2032, 0x99ccf916, 0xc5763509, 0xa671ec2d, 0x03798741,
+    0x607e5e65, 0x921857d8, 0xf11f8efc, 0x5417e590, 0x37103cb4,
+    0x3b8261e5, 0x5885b8c1, 0xfd8dd3ad, 0x9e8a0a89, 0x6cec0334,
+    0x0febda10, 0xaae3b17c, 0xc9e46858, 0x955ea447, 0xf6597d63,
+    0x5351160f, 0x3056cf2b, 0xc230c696, 0xa1371fb2, 0x043f74de,
+    0x6738adfa, 0xbd4aece0, 0xde4d35c4, 0x7b455ea8, 0x1842878c,
+    0xea248e31, 0x89235715, 0x2c2b3c79, 0x4f2ce55d, 0x13962942,
+    0x7091f066, 0xd5999b0a, 0xb69e422e, 0x44f84b93, 0x27ff92b7,
+    0x82f7f9db, 0xe1f020ff, 0x9bd34379, 0xf8d49a5d, 0x5ddcf131,
+    0x3edb2815, 0xccbd21a8, 0xafbaf88c, 0x0ab293e0, 0x69b54ac4,
+    0x350f86db, 0x56085fff, 0xf3003493, 0x9007edb7, 0x6261e40a,
+    0x01663d2e, 0xa46e5642, 0xc7698f66, 0x1d1bce7c, 0x7e1c1758,
+    0xdb147c34, 0xb813a510, 0x4a75acad, 0x29727589, 0x8c7a1ee5,
+    0xef7dc7c1, 0xb3c70bde, 0xd0c0d2fa, 0x75c8b996, 0x16cf60b2,
+    0xe4a9690f, 0x87aeb02b, 0x22a6db47, 0x41a10263, 0x4d335f32,
+    0x2e348616, 0x8b3ced7a, 0xe83b345e, 0x1a5d3de3, 0x795ae4c7,
+    0xdc528fab, 0xbf55568f, 0xe3ef9a90, 0x80e843b4, 0x25e028d8,
+    0x46e7f1fc, 0xb481f841, 0xd7862165, 0x728e4a09, 0x1189932d,
+    0xcbfbd237, 0xa8fc0b13, 0x0df4607f, 0x6ef3b95b, 0x9c95b0e6,
+    0xff9269c2, 0x5a9a02ae, 0x399ddb8a, 0x65271795, 0x0620ceb1,
+    0xa328a5dd, 0xc02f7cf9, 0x32497544, 0x514eac60, 0xf446c70c,
+    0x97411e28},
+   {0x00000000, 0x01b5fd1d, 0x036bfa3a, 0x02de0727, 0x06d7f474,
+    0x07620969, 0x05bc0e4e, 0x0409f353, 0x0dafe8e8, 0x0c1a15f5,
+    0x0ec412d2, 0x0f71efcf, 0x0b781c9c, 0x0acde181, 0x0813e6a6,
+    0x09a61bbb, 0x1b5fd1d0, 0x1aea2ccd, 0x18342bea, 0x1981d6f7,
+    0x1d8825a4, 0x1c3dd8b9, 0x1ee3df9e, 0x1f562283, 0x16f03938,
+    0x1745c425, 0x159bc302, 0x142e3e1f, 0x1027cd4c, 0x11923051,
+    0x134c3776, 0x12f9ca6b, 0x36bfa3a0, 0x370a5ebd, 0x35d4599a,
+    0x3461a487, 0x306857d4, 0x31ddaac9, 0x3303adee, 0x32b650f3,
+    0x3b104b48, 0x3aa5b655, 0x387bb172, 0x39ce4c6f, 0x3dc7bf3c,
+    0x3c724221, 0x3eac4506, 0x3f19b81b, 0x2de07270, 0x2c558f6d,
+    0x2e8b884a, 0x2f3e7557, 0x2b378604, 0x2a827b19, 0x285c7c3e,
+    0x29e98123, 0x204f9a98, 0x21fa6785, 0x232460a2, 0x22919dbf,
+    0x26986eec, 0x272d93f1, 0x25f394d6, 0x244669cb, 0x6d7f4740,
+    0x6ccaba5d, 0x6e14bd7a, 0x6fa14067, 0x6ba8b334, 0x6a1d4e29,
+    0x68c3490e, 0x6976b413, 0x60d0afa8, 0x616552b5, 0x63bb5592,
+    0x620ea88f, 0x66075bdc, 0x67b2a6c1, 0x656ca1e6, 0x64d95cfb,
+    0x76209690, 0x77956b8d, 0x754b6caa, 0x74fe91b7, 0x70f762e4,
+    0x71429ff9, 0x739c98de, 0x722965c3, 0x7b8f7e78, 0x7a3a8365,
+    0x78e48442, 0x7951795f, 0x7d588a0c, 0x7ced7711, 0x7e337036,
+    0x7f868d2b, 0x5bc0e4e0, 0x5a7519fd, 0x58ab1eda, 0x591ee3c7,
+    0x5d171094, 0x5ca2ed89, 0x5e7ceaae, 0x5fc917b3, 0x566f0c08,
+    0x57daf115, 0x5504f632, 0x54b10b2f, 0x50b8f87c, 0x510d0561,
+    0x53d30246, 0x5266ff5b, 0x409f3530, 0x412ac82d, 0x43f4cf0a,
+    0x42413217, 0x4648c144, 0x47fd3c59, 0x45233b7e, 0x4496c663,
+    0x4d30ddd8, 0x4c8520c5, 0x4e5b27e2, 0x4feedaff, 0x4be729ac,
+    0x4a52d4b1, 0x488cd396, 0x49392e8b, 0xdafe8e80, 0xdb4b739d,
+    0xd99574ba, 0xd82089a7, 0xdc297af4, 0xdd9c87e9, 0xdf4280ce,
+    0xdef77dd3, 0xd7516668, 0xd6e49b75, 0xd43a9c52, 0xd58f614f,
+    0xd186921c, 0xd0336f01, 0xd2ed6826, 0xd358953b, 0xc1a15f50,
+    0xc014a24d, 0xc2caa56a, 0xc37f5877, 0xc776ab24, 0xc6c35639,
+    0xc41d511e, 0xc5a8ac03, 0xcc0eb7b8, 0xcdbb4aa5, 0xcf654d82,
+    0xced0b09f, 0xcad943cc, 0xcb6cbed1, 0xc9b2b9f6, 0xc80744eb,
+    0xec412d20, 0xedf4d03d, 0xef2ad71a, 0xee9f2a07, 0xea96d954,
+    0xeb232449, 0xe9fd236e, 0xe848de73, 0xe1eec5c8, 0xe05b38d5,
+    0xe2853ff2, 0xe330c2ef, 0xe73931bc, 0xe68ccca1, 0xe452cb86,
+    0xe5e7369b, 0xf71efcf0, 0xf6ab01ed, 0xf47506ca, 0xf5c0fbd7,
+    0xf1c90884, 0xf07cf599, 0xf2a2f2be, 0xf3170fa3, 0xfab11418,
+    0xfb04e905, 0xf9daee22, 0xf86f133f, 0xfc66e06c, 0xfdd31d71,
+    0xff0d1a56, 0xfeb8e74b, 0xb781c9c0, 0xb63434dd, 0xb4ea33fa,
+    0xb55fcee7, 0xb1563db4, 0xb0e3c0a9, 0xb23dc78e, 0xb3883a93,
+    0xba2e2128, 0xbb9bdc35, 0xb945db12, 0xb8f0260f, 0xbcf9d55c,
+    0xbd4c2841, 0xbf922f66, 0xbe27d27b, 0xacde1810, 0xad6be50d,
+    0xafb5e22a, 0xae001f37, 0xaa09ec64, 0xabbc1179, 0xa962165e,
+    0xa8d7eb43, 0xa171f0f8, 0xa0c40de5, 0xa21a0ac2, 0xa3aff7df,
+    0xa7a6048c, 0xa613f991, 0xa4cdfeb6, 0xa57803ab, 0x813e6a60,
+    0x808b977d, 0x8255905a, 0x83e06d47, 0x87e99e14, 0x865c6309,
+    0x8482642e, 0x85379933, 0x8c918288, 0x8d247f95, 0x8ffa78b2,
+    0x8e4f85af, 0x8a4676fc, 0x8bf38be1, 0x892d8cc6, 0x889871db,
+    0x9a61bbb0, 0x9bd446ad, 0x990a418a, 0x98bfbc97, 0x9cb64fc4,
+    0x9d03b2d9, 0x9fddb5fe, 0x9e6848e3, 0x97ce5358, 0x967bae45,
+    0x94a5a962, 0x9510547f, 0x9119a72c, 0x90ac5a31, 0x92725d16,
+    0x93c7a00b},
+   {0x00000000, 0x6e8c1b41, 0xdd183682, 0xb3942dc3, 0x61416b45,
+    0x0fcd7004, 0xbc595dc7, 0xd2d54686, 0xc282d68a, 0xac0ecdcb,
+    0x1f9ae008, 0x7116fb49, 0xa3c3bdcf, 0xcd4fa68e, 0x7edb8b4d,
+    0x1057900c, 0x5e74ab55, 0x30f8b014, 0x836c9dd7, 0xede08696,
+    0x3f35c010, 0x51b9db51, 0xe22df692, 0x8ca1edd3, 0x9cf67ddf,
+    0xf27a669e, 0x41ee4b5d, 0x2f62501c, 0xfdb7169a, 0x933b0ddb,
+    0x20af2018, 0x4e233b59, 0xbce956aa, 0xd2654deb, 0x61f16028,
+    0x0f7d7b69, 0xdda83def, 0xb32426ae, 0x00b00b6d, 0x6e3c102c,
+    0x7e6b8020, 0x10e79b61, 0xa373b6a2, 0xcdffade3, 0x1f2aeb65,
+    0x71a6f024, 0xc232dde7, 0xacbec6a6, 0xe29dfdff, 0x8c11e6be,
+    0x3f85cb7d, 0x5109d03c, 0x83dc96ba, 0xed508dfb, 0x5ec4a038,
+    0x3048bb79, 0x201f2b75, 0x4e933034, 0xfd071df7, 0x938b06b6,
+    0x415e4030, 0x2fd25b71, 0x9c4676b2, 0xf2ca6df3, 0xa2a3ab15,
+    0xcc2fb054, 0x7fbb9d97, 0x113786d6, 0xc3e2c050, 0xad6edb11,
+    0x1efaf6d2, 0x7076ed93, 0x60217d9f, 0x0ead66de, 0xbd394b1d,
+    0xd3b5505c, 0x016016da, 0x6fec0d9b, 0xdc782058, 0xb2f43b19,
+    0xfcd70040, 0x925b1b01, 0x21cf36c2, 0x4f432d83, 0x9d966b05,
+    0xf31a7044, 0x408e5d87, 0x2e0246c6, 0x3e55d6ca, 0x50d9cd8b,
+    0xe34de048, 0x8dc1fb09, 0x5f14bd8f, 0x3198a6ce, 0x820c8b0d,
+    0xec80904c, 0x1e4afdbf, 0x70c6e6fe, 0xc352cb3d, 0xadded07c,
+    0x7f0b96fa, 0x11878dbb, 0xa213a078, 0xcc9fbb39, 0xdcc82b35,
+    0xb2443074, 0x01d01db7, 0x6f5c06f6, 0xbd894070, 0xd3055b31,
+    0x609176f2, 0x0e1d6db3, 0x403e56ea, 0x2eb24dab, 0x9d266068,
+    0xf3aa7b29, 0x217f3daf, 0x4ff326ee, 0xfc670b2d, 0x92eb106c,
+    0x82bc8060, 0xec309b21, 0x5fa4b6e2, 0x3128ada3, 0xe3fdeb25,
+    0x8d71f064, 0x3ee5dda7, 0x5069c6e6, 0x9e36506b, 0xf0ba4b2a,
+    0x432e66e9, 0x2da27da8, 0xff773b2e, 0x91fb206f, 0x226f0dac,
+    0x4ce316ed, 0x5cb486e1, 0x32389da0, 0x81acb063, 0xef20ab22,
+    0x3df5eda4, 0x5379f6e5, 0xe0eddb26, 0x8e61c067, 0xc042fb3e,
+    0xaecee07f, 0x1d5acdbc, 0x73d6d6fd, 0xa103907b, 0xcf8f8b3a,
+    0x7c1ba6f9, 0x1297bdb8, 0x02c02db4, 0x6c4c36f5, 0xdfd81b36,
+    0xb1540077, 0x638146f1, 0x0d0d5db0, 0xbe997073, 0xd0156b32,
+    0x22df06c1, 0x4c531d80, 0xffc73043, 0x914b2b02, 0x439e6d84,
+    0x2d1276c5, 0x9e865b06, 0xf00a4047, 0xe05dd04b, 0x8ed1cb0a,
+    0x3d45e6c9, 0x53c9fd88, 0x811cbb0e, 0xef90a04f, 0x5c048d8c,
+    0x328896cd, 0x7cabad94, 0x1227b6d5, 0xa1b39b16, 0xcf3f8057,
+    0x1deac6d1, 0x7366dd90, 0xc0f2f053, 0xae7eeb12, 0xbe297b1e,
+    0xd0a5605f, 0x63314d9c, 0x0dbd56dd, 0xdf68105b, 0xb1e40b1a,
+    0x027026d9, 0x6cfc3d98, 0x3c95fb7e, 0x5219e03f, 0xe18dcdfc,
+    0x8f01d6bd, 0x5dd4903b, 0x33588b7a, 0x80cca6b9, 0xee40bdf8,
+    0xfe172df4, 0x909b36b5, 0x230f1b76, 0x4d830037, 0x9f5646b1,
+    0xf1da5df0, 0x424e7033, 0x2cc26b72, 0x62e1502b, 0x0c6d4b6a,
+    0xbff966a9, 0xd1757de8, 0x03a03b6e, 0x6d2c202f, 0xdeb80dec,
+    0xb03416ad, 0xa06386a1, 0xceef9de0, 0x7d7bb023, 0x13f7ab62,
+    0xc122ede4, 0xafaef6a5, 0x1c3adb66, 0x72b6c027, 0x807cadd4,
+    0xeef0b695, 0x5d649b56, 0x33e88017, 0xe13dc691, 0x8fb1ddd0,
+    0x3c25f013, 0x52a9eb52, 0x42fe7b5e, 0x2c72601f, 0x9fe64ddc,
+    0xf16a569d, 0x23bf101b, 0x4d330b5a, 0xfea72699, 0x902b3dd8,
+    0xde080681, 0xb0841dc0, 0x03103003, 0x6d9c2b42, 0xbf496dc4,
+    0xd1c57685, 0x62515b46, 0x0cdd4007, 0x1c8ad00b, 0x7206cb4a,
+    0xc192e689, 0xaf1efdc8, 0x7dcbbb4e, 0x1347a00f, 0xa0d38dcc,
+    0xce5f968d},
+   {0x00000000, 0xe71da697, 0x154a4b6f, 0xf257edf8, 0x2a9496de,
+    0xcd893049, 0x3fdeddb1, 0xd8c37b26, 0x55292dbc, 0xb2348b2b,
+    0x406366d3, 0xa77ec044, 0x7fbdbb62, 0x98a01df5, 0x6af7f00d,
+    0x8dea569a, 0xaa525b78, 0x4d4ffdef, 0xbf181017, 0x5805b680,
+    0x80c6cda6, 0x67db6b31, 0x958c86c9, 0x7291205e, 0xff7b76c4,
+    0x1866d053, 0xea313dab, 0x0d2c9b3c, 0xd5efe01a, 0x32f2468d,
+    0xc0a5ab75, 0x27b80de2, 0x8fd5b0b1, 0x68c81626, 0x9a9ffbde,
+    0x7d825d49, 0xa541266f, 0x425c80f8, 0xb00b6d00, 0x5716cb97,
+    0xdafc9d0d, 0x3de13b9a, 0xcfb6d662, 0x28ab70f5, 0xf0680bd3,
+    0x1775ad44, 0xe52240bc, 0x023fe62b, 0x2587ebc9, 0xc29a4d5e,
+    0x30cda0a6, 0xd7d00631, 0x0f137d17, 0xe80edb80, 0x1a593678,
+    0xfd4490ef, 0x70aec675, 0x97b360e2, 0x65e48d1a, 0x82f92b8d,
+    0x5a3a50ab, 0xbd27f63c, 0x4f701bc4, 0xa86dbd53, 0xc4da6723,
+    0x23c7c1b4, 0xd1902c4c, 0x368d8adb, 0xee4ef1fd, 0x0953576a,
+    0xfb04ba92, 0x1c191c05, 0x91f34a9f, 0x76eeec08, 0x84b901f0,
+    0x63a4a767, 0xbb67dc41, 0x5c7a7ad6, 0xae2d972e, 0x493031b9,
+    0x6e883c5b, 0x89959acc, 0x7bc27734, 0x9cdfd1a3, 0x441caa85,
+    0xa3010c12, 0x5156e1ea, 0xb64b477d, 0x3ba111e7, 0xdcbcb770,
+    0x2eeb5a88, 0xc9f6fc1f, 0x11358739, 0xf62821ae, 0x047fcc56,
+    0xe3626ac1, 0x4b0fd792, 0xac127105, 0x5e459cfd, 0xb9583a6a,
+    0x619b414c, 0x8686e7db, 0x74d10a23, 0x93ccacb4, 0x1e26fa2e,
+    0xf93b5cb9, 0x0b6cb141, 0xec7117d6, 0x34b26cf0, 0xd3afca67,
+    0x21f8279f, 0xc6e58108, 0xe15d8cea, 0x06402a7d, 0xf417c785,
+    0x130a6112, 0xcbc91a34, 0x2cd4bca3, 0xde83515b, 0x399ef7cc,
+    0xb474a156, 0x536907c1, 0xa13eea39, 0x46234cae, 0x9ee03788,
+    0x79fd911f, 0x8baa7ce7, 0x6cb7da70, 0x52c5c807, 0xb5d86e90,
+    0x478f8368, 0xa09225ff, 0x78515ed9, 0x9f4cf84e, 0x6d1b15b6,
+    0x8a06b321, 0x07ece5bb, 0xe0f1432c, 0x12a6aed4, 0xf5bb0843,
+    0x2d787365, 0xca65d5f2, 0x3832380a, 0xdf2f9e9d, 0xf897937f,
+    0x1f8a35e8, 0xedddd810, 0x0ac07e87, 0xd20305a1, 0x351ea336,
+    0xc7494ece, 0x2054e859, 0xadbebec3, 0x4aa31854, 0xb8f4f5ac,
+    0x5fe9533b, 0x872a281d, 0x60378e8a, 0x92606372, 0x757dc5e5,
+    0xdd1078b6, 0x3a0dde21, 0xc85a33d9, 0x2f47954e, 0xf784ee68,
+    0x109948ff, 0xe2cea507, 0x05d30390, 0x8839550a, 0x6f24f39d,
+    0x9d731e65, 0x7a6eb8f2, 0xa2adc3d4, 0x45b06543, 0xb7e788bb,
+    0x50fa2e2c, 0x774223ce, 0x905f8559, 0x620868a1, 0x8515ce36,
+    0x5dd6b510, 0xbacb1387, 0x489cfe7f, 0xaf8158e8, 0x226b0e72,
+    0xc576a8e5, 0x3721451d, 0xd03ce38a, 0x08ff98ac, 0xefe23e3b,
+    0x1db5d3c3, 0xfaa87554, 0x961faf24, 0x710209b3, 0x8355e44b,
+    0x644842dc, 0xbc8b39fa, 0x5b969f6d, 0xa9c17295, 0x4edcd402,
+    0xc3368298, 0x242b240f, 0xd67cc9f7, 0x31616f60, 0xe9a21446,
+    0x0ebfb2d1, 0xfce85f29, 0x1bf5f9be, 0x3c4df45c, 0xdb5052cb,
+    0x2907bf33, 0xce1a19a4, 0x16d96282, 0xf1c4c415, 0x039329ed,
+    0xe48e8f7a, 0x6964d9e0, 0x8e797f77, 0x7c2e928f, 0x9b333418,
+    0x43f04f3e, 0xa4ede9a9, 0x56ba0451, 0xb1a7a2c6, 0x19ca1f95,
+    0xfed7b902, 0x0c8054fa, 0xeb9df26d, 0x335e894b, 0xd4432fdc,
+    0x2614c224, 0xc10964b3, 0x4ce33229, 0xabfe94be, 0x59a97946,
+    0xbeb4dfd1, 0x6677a4f7, 0x816a0260, 0x733def98, 0x9420490f,
+    0xb39844ed, 0x5485e27a, 0xa6d20f82, 0x41cfa915, 0x990cd233,
+    0x7e1174a4, 0x8c46995c, 0x6b5b3fcb, 0xe6b16951, 0x01accfc6,
+    0xf3fb223e, 0x14e684a9, 0xcc25ff8f, 0x2b385918, 0xd96fb4e0,
+    0x3e721277},
+   {0x00000000, 0xa58b900e, 0x9066265d, 0x35edb653, 0xfbbd4afb,
+    0x5e36daf5, 0x6bdb6ca6, 0xce50fca8, 0x2c0b93b7, 0x898003b9,
+    0xbc6db5ea, 0x19e625e4, 0xd7b6d94c, 0x723d4942, 0x47d0ff11,
+    0xe25b6f1f, 0x5817276e, 0xfd9cb760, 0xc8710133, 0x6dfa913d,
+    0xa3aa6d95, 0x0621fd9b, 0x33cc4bc8, 0x9647dbc6, 0x741cb4d9,
+    0xd19724d7, 0xe47a9284, 0x41f1028a, 0x8fa1fe22, 0x2a2a6e2c,
+    0x1fc7d87f, 0xba4c4871, 0xb02e4edc, 0x15a5ded2, 0x20486881,
+    0x85c3f88f, 0x4b930427, 0xee189429, 0xdbf5227a, 0x7e7eb274,
+    0x9c25dd6b, 0x39ae4d65, 0x0c43fb36, 0xa9c86b38, 0x67989790,
+    0xc213079e, 0xf7feb1cd, 0x527521c3, 0xe83969b2, 0x4db2f9bc,
+    0x785f4fef, 0xddd4dfe1, 0x13842349, 0xb60fb347, 0x83e20514,
+    0x2669951a, 0xc432fa05, 0x61b96a0b, 0x5454dc58, 0xf1df4c56,
+    0x3f8fb0fe, 0x9a0420f0, 0xafe996a3, 0x0a6206ad, 0xbb2d9bf9,
+    0x1ea60bf7, 0x2b4bbda4, 0x8ec02daa, 0x4090d102, 0xe51b410c,
+    0xd0f6f75f, 0x757d6751, 0x9726084e, 0x32ad9840, 0x07402e13,
+    0xa2cbbe1d, 0x6c9b42b5, 0xc910d2bb, 0xfcfd64e8, 0x5976f4e6,
+    0xe33abc97, 0x46b12c99, 0x735c9aca, 0xd6d70ac4, 0x1887f66c,
+    0xbd0c6662, 0x88e1d031, 0x2d6a403f, 0xcf312f20, 0x6ababf2e,
+    0x5f57097d, 0xfadc9973, 0x348c65db, 0x9107f5d5, 0xa4ea4386,
+    0x0161d388, 0x0b03d525, 0xae88452b, 0x9b65f378, 0x3eee6376,
+    0xf0be9fde, 0x55350fd0, 0x60d8b983, 0xc553298d, 0x27084692,
+    0x8283d69c, 0xb76e60cf, 0x12e5f0c1, 0xdcb50c69, 0x793e9c67,
+    0x4cd32a34, 0xe958ba3a, 0x5314f24b, 0xf69f6245, 0xc372d416,
+    0x66f94418, 0xa8a9b8b0, 0x0d2228be, 0x38cf9eed, 0x9d440ee3,
+    0x7f1f61fc, 0xda94f1f2, 0xef7947a1, 0x4af2d7af, 0x84a22b07,
+    0x2129bb09, 0x14c40d5a, 0xb14f9d54, 0xad2a31b3, 0x08a1a1bd,
+    0x3d4c17ee, 0x98c787e0, 0x56977b48, 0xf31ceb46, 0xc6f15d15,
+    0x637acd1b, 0x8121a204, 0x24aa320a, 0x11478459, 0xb4cc1457,
+    0x7a9ce8ff, 0xdf1778f1, 0xeafacea2, 0x4f715eac, 0xf53d16dd,
+    0x50b686d3, 0x655b3080, 0xc0d0a08e, 0x0e805c26, 0xab0bcc28,
+    0x9ee67a7b, 0x3b6dea75, 0xd936856a, 0x7cbd1564, 0x4950a337,
+    0xecdb3339, 0x228bcf91, 0x87005f9f, 0xb2ede9cc, 0x176679c2,
+    0x1d047f6f, 0xb88fef61, 0x8d625932, 0x28e9c93c, 0xe6b93594,
+    0x4332a59a, 0x76df13c9, 0xd35483c7, 0x310fecd8, 0x94847cd6,
+    0xa169ca85, 0x04e25a8b, 0xcab2a623, 0x6f39362d, 0x5ad4807e,
+    0xff5f1070, 0x45135801, 0xe098c80f, 0xd5757e5c, 0x70feee52,
+    0xbeae12fa, 0x1b2582f4, 0x2ec834a7, 0x8b43a4a9, 0x6918cbb6,
+    0xcc935bb8, 0xf97eedeb, 0x5cf57de5, 0x92a5814d, 0x372e1143,
+    0x02c3a710, 0xa748371e, 0x1607aa4a, 0xb38c3a44, 0x86618c17,
+    0x23ea1c19, 0xedbae0b1, 0x483170bf, 0x7ddcc6ec, 0xd85756e2,
+    0x3a0c39fd, 0x9f87a9f3, 0xaa6a1fa0, 0x0fe18fae, 0xc1b17306,
+    0x643ae308, 0x51d7555b, 0xf45cc555, 0x4e108d24, 0xeb9b1d2a,
+    0xde76ab79, 0x7bfd3b77, 0xb5adc7df, 0x102657d1, 0x25cbe182,
+    0x8040718c, 0x621b1e93, 0xc7908e9d, 0xf27d38ce, 0x57f6a8c0,
+    0x99a65468, 0x3c2dc466, 0x09c07235, 0xac4be23b, 0xa629e496,
+    0x03a27498, 0x364fc2cb, 0x93c452c5, 0x5d94ae6d, 0xf81f3e63,
+    0xcdf28830, 0x6879183e, 0x8a227721, 0x2fa9e72f, 0x1a44517c,
+    0xbfcfc172, 0x719f3dda, 0xd414add4, 0xe1f91b87, 0x44728b89,
+    0xfe3ec3f8, 0x5bb553f6, 0x6e58e5a5, 0xcbd375ab, 0x05838903,
+    0xa008190d, 0x95e5af5e, 0x306e3f50, 0xd235504f, 0x77bec041,
+    0x42537612, 0xe7d8e61c, 0x29881ab4, 0x8c038aba, 0xb9ee3ce9,
+    0x1c65ace7}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x0e908ba500000000, 0x5d26669000000000,
+    0x53b6ed3500000000, 0xfb4abdfb00000000, 0xf5da365e00000000,
+    0xa66cdb6b00000000, 0xa8fc50ce00000000, 0xb7930b2c00000000,
+    0xb903808900000000, 0xeab56dbc00000000, 0xe425e61900000000,
+    0x4cd9b6d700000000, 0x42493d7200000000, 0x11ffd04700000000,
+    0x1f6f5be200000000, 0x6e27175800000000, 0x60b79cfd00000000,
+    0x330171c800000000, 0x3d91fa6d00000000, 0x956daaa300000000,
+    0x9bfd210600000000, 0xc84bcc3300000000, 0xc6db479600000000,
+    0xd9b41c7400000000, 0xd72497d100000000, 0x84927ae400000000,
+    0x8a02f14100000000, 0x22fea18f00000000, 0x2c6e2a2a00000000,
+    0x7fd8c71f00000000, 0x71484cba00000000, 0xdc4e2eb000000000,
+    0xd2dea51500000000, 0x8168482000000000, 0x8ff8c38500000000,
+    0x2704934b00000000, 0x299418ee00000000, 0x7a22f5db00000000,
+    0x74b27e7e00000000, 0x6bdd259c00000000, 0x654dae3900000000,
+    0x36fb430c00000000, 0x386bc8a900000000, 0x9097986700000000,
+    0x9e0713c200000000, 0xcdb1fef700000000, 0xc321755200000000,
+    0xb26939e800000000, 0xbcf9b24d00000000, 0xef4f5f7800000000,
+    0xe1dfd4dd00000000, 0x4923841300000000, 0x47b30fb600000000,
+    0x1405e28300000000, 0x1a95692600000000, 0x05fa32c400000000,
+    0x0b6ab96100000000, 0x58dc545400000000, 0x564cdff100000000,
+    0xfeb08f3f00000000, 0xf020049a00000000, 0xa396e9af00000000,
+    0xad06620a00000000, 0xf99b2dbb00000000, 0xf70ba61e00000000,
+    0xa4bd4b2b00000000, 0xaa2dc08e00000000, 0x02d1904000000000,
+    0x0c411be500000000, 0x5ff7f6d000000000, 0x51677d7500000000,
+    0x4e08269700000000, 0x4098ad3200000000, 0x132e400700000000,
+    0x1dbecba200000000, 0xb5429b6c00000000, 0xbbd210c900000000,
+    0xe864fdfc00000000, 0xe6f4765900000000, 0x97bc3ae300000000,
+    0x992cb14600000000, 0xca9a5c7300000000, 0xc40ad7d600000000,
+    0x6cf6871800000000, 0x62660cbd00000000, 0x31d0e18800000000,
+    0x3f406a2d00000000, 0x202f31cf00000000, 0x2ebfba6a00000000,
+    0x7d09575f00000000, 0x7399dcfa00000000, 0xdb658c3400000000,
+    0xd5f5079100000000, 0x8643eaa400000000, 0x88d3610100000000,
+    0x25d5030b00000000, 0x2b4588ae00000000, 0x78f3659b00000000,
+    0x7663ee3e00000000, 0xde9fbef000000000, 0xd00f355500000000,
+    0x83b9d86000000000, 0x8d2953c500000000, 0x9246082700000000,
+    0x9cd6838200000000, 0xcf606eb700000000, 0xc1f0e51200000000,
+    0x690cb5dc00000000, 0x679c3e7900000000, 0x342ad34c00000000,
+    0x3aba58e900000000, 0x4bf2145300000000, 0x45629ff600000000,
+    0x16d472c300000000, 0x1844f96600000000, 0xb0b8a9a800000000,
+    0xbe28220d00000000, 0xed9ecf3800000000, 0xe30e449d00000000,
+    0xfc611f7f00000000, 0xf2f194da00000000, 0xa14779ef00000000,
+    0xafd7f24a00000000, 0x072ba28400000000, 0x09bb292100000000,
+    0x5a0dc41400000000, 0x549d4fb100000000, 0xb3312aad00000000,
+    0xbda1a10800000000, 0xee174c3d00000000, 0xe087c79800000000,
+    0x487b975600000000, 0x46eb1cf300000000, 0x155df1c600000000,
+    0x1bcd7a6300000000, 0x04a2218100000000, 0x0a32aa2400000000,
+    0x5984471100000000, 0x5714ccb400000000, 0xffe89c7a00000000,
+    0xf17817df00000000, 0xa2cefaea00000000, 0xac5e714f00000000,
+    0xdd163df500000000, 0xd386b65000000000, 0x80305b6500000000,
+    0x8ea0d0c000000000, 0x265c800e00000000, 0x28cc0bab00000000,
+    0x7b7ae69e00000000, 0x75ea6d3b00000000, 0x6a8536d900000000,
+    0x6415bd7c00000000, 0x37a3504900000000, 0x3933dbec00000000,
+    0x91cf8b2200000000, 0x9f5f008700000000, 0xcce9edb200000000,
+    0xc279661700000000, 0x6f7f041d00000000, 0x61ef8fb800000000,
+    0x3259628d00000000, 0x3cc9e92800000000, 0x9435b9e600000000,
+    0x9aa5324300000000, 0xc913df7600000000, 0xc78354d300000000,
+    0xd8ec0f3100000000, 0xd67c849400000000, 0x85ca69a100000000,
+    0x8b5ae20400000000, 0x23a6b2ca00000000, 0x2d36396f00000000,
+    0x7e80d45a00000000, 0x70105fff00000000, 0x0158134500000000,
+    0x0fc898e000000000, 0x5c7e75d500000000, 0x52eefe7000000000,
+    0xfa12aebe00000000, 0xf482251b00000000, 0xa734c82e00000000,
+    0xa9a4438b00000000, 0xb6cb186900000000, 0xb85b93cc00000000,
+    0xebed7ef900000000, 0xe57df55c00000000, 0x4d81a59200000000,
+    0x43112e3700000000, 0x10a7c30200000000, 0x1e3748a700000000,
+    0x4aaa071600000000, 0x443a8cb300000000, 0x178c618600000000,
+    0x191cea2300000000, 0xb1e0baed00000000, 0xbf70314800000000,
+    0xecc6dc7d00000000, 0xe25657d800000000, 0xfd390c3a00000000,
+    0xf3a9879f00000000, 0xa01f6aaa00000000, 0xae8fe10f00000000,
+    0x0673b1c100000000, 0x08e33a6400000000, 0x5b55d75100000000,
+    0x55c55cf400000000, 0x248d104e00000000, 0x2a1d9beb00000000,
+    0x79ab76de00000000, 0x773bfd7b00000000, 0xdfc7adb500000000,
+    0xd157261000000000, 0x82e1cb2500000000, 0x8c71408000000000,
+    0x931e1b6200000000, 0x9d8e90c700000000, 0xce387df200000000,
+    0xc0a8f65700000000, 0x6854a69900000000, 0x66c42d3c00000000,
+    0x3572c00900000000, 0x3be24bac00000000, 0x96e429a600000000,
+    0x9874a20300000000, 0xcbc24f3600000000, 0xc552c49300000000,
+    0x6dae945d00000000, 0x633e1ff800000000, 0x3088f2cd00000000,
+    0x3e18796800000000, 0x2177228a00000000, 0x2fe7a92f00000000,
+    0x7c51441a00000000, 0x72c1cfbf00000000, 0xda3d9f7100000000,
+    0xd4ad14d400000000, 0x871bf9e100000000, 0x898b724400000000,
+    0xf8c33efe00000000, 0xf653b55b00000000, 0xa5e5586e00000000,
+    0xab75d3cb00000000, 0x0389830500000000, 0x0d1908a000000000,
+    0x5eafe59500000000, 0x503f6e3000000000, 0x4f5035d200000000,
+    0x41c0be7700000000, 0x1276534200000000, 0x1ce6d8e700000000,
+    0xb41a882900000000, 0xba8a038c00000000, 0xe93ceeb900000000,
+    0xe7ac651c00000000},
+   {0x0000000000000000, 0x97a61de700000000, 0x6f4b4a1500000000,
+    0xf8ed57f200000000, 0xde96942a00000000, 0x493089cd00000000,
+    0xb1ddde3f00000000, 0x267bc3d800000000, 0xbc2d295500000000,
+    0x2b8b34b200000000, 0xd366634000000000, 0x44c07ea700000000,
+    0x62bbbd7f00000000, 0xf51da09800000000, 0x0df0f76a00000000,
+    0x9a56ea8d00000000, 0x785b52aa00000000, 0xeffd4f4d00000000,
+    0x171018bf00000000, 0x80b6055800000000, 0xa6cdc68000000000,
+    0x316bdb6700000000, 0xc9868c9500000000, 0x5e20917200000000,
+    0xc4767bff00000000, 0x53d0661800000000, 0xab3d31ea00000000,
+    0x3c9b2c0d00000000, 0x1ae0efd500000000, 0x8d46f23200000000,
+    0x75aba5c000000000, 0xe20db82700000000, 0xb1b0d58f00000000,
+    0x2616c86800000000, 0xdefb9f9a00000000, 0x495d827d00000000,
+    0x6f2641a500000000, 0xf8805c4200000000, 0x006d0bb000000000,
+    0x97cb165700000000, 0x0d9dfcda00000000, 0x9a3be13d00000000,
+    0x62d6b6cf00000000, 0xf570ab2800000000, 0xd30b68f000000000,
+    0x44ad751700000000, 0xbc4022e500000000, 0x2be63f0200000000,
+    0xc9eb872500000000, 0x5e4d9ac200000000, 0xa6a0cd3000000000,
+    0x3106d0d700000000, 0x177d130f00000000, 0x80db0ee800000000,
+    0x7836591a00000000, 0xef9044fd00000000, 0x75c6ae7000000000,
+    0xe260b39700000000, 0x1a8de46500000000, 0x8d2bf98200000000,
+    0xab503a5a00000000, 0x3cf627bd00000000, 0xc41b704f00000000,
+    0x53bd6da800000000, 0x2367dac400000000, 0xb4c1c72300000000,
+    0x4c2c90d100000000, 0xdb8a8d3600000000, 0xfdf14eee00000000,
+    0x6a57530900000000, 0x92ba04fb00000000, 0x051c191c00000000,
+    0x9f4af39100000000, 0x08ecee7600000000, 0xf001b98400000000,
+    0x67a7a46300000000, 0x41dc67bb00000000, 0xd67a7a5c00000000,
+    0x2e972dae00000000, 0xb931304900000000, 0x5b3c886e00000000,
+    0xcc9a958900000000, 0x3477c27b00000000, 0xa3d1df9c00000000,
+    0x85aa1c4400000000, 0x120c01a300000000, 0xeae1565100000000,
+    0x7d474bb600000000, 0xe711a13b00000000, 0x70b7bcdc00000000,
+    0x885aeb2e00000000, 0x1ffcf6c900000000, 0x3987351100000000,
+    0xae2128f600000000, 0x56cc7f0400000000, 0xc16a62e300000000,
+    0x92d70f4b00000000, 0x057112ac00000000, 0xfd9c455e00000000,
+    0x6a3a58b900000000, 0x4c419b6100000000, 0xdbe7868600000000,
+    0x230ad17400000000, 0xb4accc9300000000, 0x2efa261e00000000,
+    0xb95c3bf900000000, 0x41b16c0b00000000, 0xd61771ec00000000,
+    0xf06cb23400000000, 0x67caafd300000000, 0x9f27f82100000000,
+    0x0881e5c600000000, 0xea8c5de100000000, 0x7d2a400600000000,
+    0x85c717f400000000, 0x12610a1300000000, 0x341ac9cb00000000,
+    0xa3bcd42c00000000, 0x5b5183de00000000, 0xccf79e3900000000,
+    0x56a174b400000000, 0xc107695300000000, 0x39ea3ea100000000,
+    0xae4c234600000000, 0x8837e09e00000000, 0x1f91fd7900000000,
+    0xe77caa8b00000000, 0x70dab76c00000000, 0x07c8c55200000000,
+    0x906ed8b500000000, 0x68838f4700000000, 0xff2592a000000000,
+    0xd95e517800000000, 0x4ef84c9f00000000, 0xb6151b6d00000000,
+    0x21b3068a00000000, 0xbbe5ec0700000000, 0x2c43f1e000000000,
+    0xd4aea61200000000, 0x4308bbf500000000, 0x6573782d00000000,
+    0xf2d565ca00000000, 0x0a38323800000000, 0x9d9e2fdf00000000,
+    0x7f9397f800000000, 0xe8358a1f00000000, 0x10d8dded00000000,
+    0x877ec00a00000000, 0xa10503d200000000, 0x36a31e3500000000,
+    0xce4e49c700000000, 0x59e8542000000000, 0xc3bebead00000000,
+    0x5418a34a00000000, 0xacf5f4b800000000, 0x3b53e95f00000000,
+    0x1d282a8700000000, 0x8a8e376000000000, 0x7263609200000000,
+    0xe5c57d7500000000, 0xb67810dd00000000, 0x21de0d3a00000000,
+    0xd9335ac800000000, 0x4e95472f00000000, 0x68ee84f700000000,
+    0xff48991000000000, 0x07a5cee200000000, 0x9003d30500000000,
+    0x0a55398800000000, 0x9df3246f00000000, 0x651e739d00000000,
+    0xf2b86e7a00000000, 0xd4c3ada200000000, 0x4365b04500000000,
+    0xbb88e7b700000000, 0x2c2efa5000000000, 0xce23427700000000,
+    0x59855f9000000000, 0xa168086200000000, 0x36ce158500000000,
+    0x10b5d65d00000000, 0x8713cbba00000000, 0x7ffe9c4800000000,
+    0xe85881af00000000, 0x720e6b2200000000, 0xe5a876c500000000,
+    0x1d45213700000000, 0x8ae33cd000000000, 0xac98ff0800000000,
+    0x3b3ee2ef00000000, 0xc3d3b51d00000000, 0x5475a8fa00000000,
+    0x24af1f9600000000, 0xb309027100000000, 0x4be4558300000000,
+    0xdc42486400000000, 0xfa398bbc00000000, 0x6d9f965b00000000,
+    0x9572c1a900000000, 0x02d4dc4e00000000, 0x988236c300000000,
+    0x0f242b2400000000, 0xf7c97cd600000000, 0x606f613100000000,
+    0x4614a2e900000000, 0xd1b2bf0e00000000, 0x295fe8fc00000000,
+    0xbef9f51b00000000, 0x5cf44d3c00000000, 0xcb5250db00000000,
+    0x33bf072900000000, 0xa4191ace00000000, 0x8262d91600000000,
+    0x15c4c4f100000000, 0xed29930300000000, 0x7a8f8ee400000000,
+    0xe0d9646900000000, 0x777f798e00000000, 0x8f922e7c00000000,
+    0x1834339b00000000, 0x3e4ff04300000000, 0xa9e9eda400000000,
+    0x5104ba5600000000, 0xc6a2a7b100000000, 0x951fca1900000000,
+    0x02b9d7fe00000000, 0xfa54800c00000000, 0x6df29deb00000000,
+    0x4b895e3300000000, 0xdc2f43d400000000, 0x24c2142600000000,
+    0xb36409c100000000, 0x2932e34c00000000, 0xbe94feab00000000,
+    0x4679a95900000000, 0xd1dfb4be00000000, 0xf7a4776600000000,
+    0x60026a8100000000, 0x98ef3d7300000000, 0x0f49209400000000,
+    0xed4498b300000000, 0x7ae2855400000000, 0x820fd2a600000000,
+    0x15a9cf4100000000, 0x33d20c9900000000, 0xa474117e00000000,
+    0x5c99468c00000000, 0xcb3f5b6b00000000, 0x5169b1e600000000,
+    0xc6cfac0100000000, 0x3e22fbf300000000, 0xa984e61400000000,
+    0x8fff25cc00000000, 0x1859382b00000000, 0xe0b46fd900000000,
+    0x7712723e00000000},
+   {0x0000000000000000, 0x411b8c6e00000000, 0x823618dd00000000,
+    0xc32d94b300000000, 0x456b416100000000, 0x0470cd0f00000000,
+    0xc75d59bc00000000, 0x8646d5d200000000, 0x8ad682c200000000,
+    0xcbcd0eac00000000, 0x08e09a1f00000000, 0x49fb167100000000,
+    0xcfbdc3a300000000, 0x8ea64fcd00000000, 0x4d8bdb7e00000000,
+    0x0c90571000000000, 0x55ab745e00000000, 0x14b0f83000000000,
+    0xd79d6c8300000000, 0x9686e0ed00000000, 0x10c0353f00000000,
+    0x51dbb95100000000, 0x92f62de200000000, 0xd3eda18c00000000,
+    0xdf7df69c00000000, 0x9e667af200000000, 0x5d4bee4100000000,
+    0x1c50622f00000000, 0x9a16b7fd00000000, 0xdb0d3b9300000000,
+    0x1820af2000000000, 0x593b234e00000000, 0xaa56e9bc00000000,
+    0xeb4d65d200000000, 0x2860f16100000000, 0x697b7d0f00000000,
+    0xef3da8dd00000000, 0xae2624b300000000, 0x6d0bb00000000000,
+    0x2c103c6e00000000, 0x20806b7e00000000, 0x619be71000000000,
+    0xa2b673a300000000, 0xe3adffcd00000000, 0x65eb2a1f00000000,
+    0x24f0a67100000000, 0xe7dd32c200000000, 0xa6c6beac00000000,
+    0xfffd9de200000000, 0xbee6118c00000000, 0x7dcb853f00000000,
+    0x3cd0095100000000, 0xba96dc8300000000, 0xfb8d50ed00000000,
+    0x38a0c45e00000000, 0x79bb483000000000, 0x752b1f2000000000,
+    0x3430934e00000000, 0xf71d07fd00000000, 0xb6068b9300000000,
+    0x30405e4100000000, 0x715bd22f00000000, 0xb276469c00000000,
+    0xf36dcaf200000000, 0x15aba3a200000000, 0x54b02fcc00000000,
+    0x979dbb7f00000000, 0xd686371100000000, 0x50c0e2c300000000,
+    0x11db6ead00000000, 0xd2f6fa1e00000000, 0x93ed767000000000,
+    0x9f7d216000000000, 0xde66ad0e00000000, 0x1d4b39bd00000000,
+    0x5c50b5d300000000, 0xda16600100000000, 0x9b0dec6f00000000,
+    0x582078dc00000000, 0x193bf4b200000000, 0x4000d7fc00000000,
+    0x011b5b9200000000, 0xc236cf2100000000, 0x832d434f00000000,
+    0x056b969d00000000, 0x44701af300000000, 0x875d8e4000000000,
+    0xc646022e00000000, 0xcad6553e00000000, 0x8bcdd95000000000,
+    0x48e04de300000000, 0x09fbc18d00000000, 0x8fbd145f00000000,
+    0xcea6983100000000, 0x0d8b0c8200000000, 0x4c9080ec00000000,
+    0xbffd4a1e00000000, 0xfee6c67000000000, 0x3dcb52c300000000,
+    0x7cd0dead00000000, 0xfa960b7f00000000, 0xbb8d871100000000,
+    0x78a013a200000000, 0x39bb9fcc00000000, 0x352bc8dc00000000,
+    0x743044b200000000, 0xb71dd00100000000, 0xf6065c6f00000000,
+    0x704089bd00000000, 0x315b05d300000000, 0xf276916000000000,
+    0xb36d1d0e00000000, 0xea563e4000000000, 0xab4db22e00000000,
+    0x6860269d00000000, 0x297baaf300000000, 0xaf3d7f2100000000,
+    0xee26f34f00000000, 0x2d0b67fc00000000, 0x6c10eb9200000000,
+    0x6080bc8200000000, 0x219b30ec00000000, 0xe2b6a45f00000000,
+    0xa3ad283100000000, 0x25ebfde300000000, 0x64f0718d00000000,
+    0xa7dde53e00000000, 0xe6c6695000000000, 0x6b50369e00000000,
+    0x2a4bbaf000000000, 0xe9662e4300000000, 0xa87da22d00000000,
+    0x2e3b77ff00000000, 0x6f20fb9100000000, 0xac0d6f2200000000,
+    0xed16e34c00000000, 0xe186b45c00000000, 0xa09d383200000000,
+    0x63b0ac8100000000, 0x22ab20ef00000000, 0xa4edf53d00000000,
+    0xe5f6795300000000, 0x26dbede000000000, 0x67c0618e00000000,
+    0x3efb42c000000000, 0x7fe0ceae00000000, 0xbccd5a1d00000000,
+    0xfdd6d67300000000, 0x7b9003a100000000, 0x3a8b8fcf00000000,
+    0xf9a61b7c00000000, 0xb8bd971200000000, 0xb42dc00200000000,
+    0xf5364c6c00000000, 0x361bd8df00000000, 0x770054b100000000,
+    0xf146816300000000, 0xb05d0d0d00000000, 0x737099be00000000,
+    0x326b15d000000000, 0xc106df2200000000, 0x801d534c00000000,
+    0x4330c7ff00000000, 0x022b4b9100000000, 0x846d9e4300000000,
+    0xc576122d00000000, 0x065b869e00000000, 0x47400af000000000,
+    0x4bd05de000000000, 0x0acbd18e00000000, 0xc9e6453d00000000,
+    0x88fdc95300000000, 0x0ebb1c8100000000, 0x4fa090ef00000000,
+    0x8c8d045c00000000, 0xcd96883200000000, 0x94adab7c00000000,
+    0xd5b6271200000000, 0x169bb3a100000000, 0x57803fcf00000000,
+    0xd1c6ea1d00000000, 0x90dd667300000000, 0x53f0f2c000000000,
+    0x12eb7eae00000000, 0x1e7b29be00000000, 0x5f60a5d000000000,
+    0x9c4d316300000000, 0xdd56bd0d00000000, 0x5b1068df00000000,
+    0x1a0be4b100000000, 0xd926700200000000, 0x983dfc6c00000000,
+    0x7efb953c00000000, 0x3fe0195200000000, 0xfccd8de100000000,
+    0xbdd6018f00000000, 0x3b90d45d00000000, 0x7a8b583300000000,
+    0xb9a6cc8000000000, 0xf8bd40ee00000000, 0xf42d17fe00000000,
+    0xb5369b9000000000, 0x761b0f2300000000, 0x3700834d00000000,
+    0xb146569f00000000, 0xf05ddaf100000000, 0x33704e4200000000,
+    0x726bc22c00000000, 0x2b50e16200000000, 0x6a4b6d0c00000000,
+    0xa966f9bf00000000, 0xe87d75d100000000, 0x6e3ba00300000000,
+    0x2f202c6d00000000, 0xec0db8de00000000, 0xad1634b000000000,
+    0xa18663a000000000, 0xe09defce00000000, 0x23b07b7d00000000,
+    0x62abf71300000000, 0xe4ed22c100000000, 0xa5f6aeaf00000000,
+    0x66db3a1c00000000, 0x27c0b67200000000, 0xd4ad7c8000000000,
+    0x95b6f0ee00000000, 0x569b645d00000000, 0x1780e83300000000,
+    0x91c63de100000000, 0xd0ddb18f00000000, 0x13f0253c00000000,
+    0x52eba95200000000, 0x5e7bfe4200000000, 0x1f60722c00000000,
+    0xdc4de69f00000000, 0x9d566af100000000, 0x1b10bf2300000000,
+    0x5a0b334d00000000, 0x9926a7fe00000000, 0xd83d2b9000000000,
+    0x810608de00000000, 0xc01d84b000000000, 0x0330100300000000,
+    0x422b9c6d00000000, 0xc46d49bf00000000, 0x8576c5d100000000,
+    0x465b516200000000, 0x0740dd0c00000000, 0x0bd08a1c00000000,
+    0x4acb067200000000, 0x89e692c100000000, 0xc8fd1eaf00000000,
+    0x4ebbcb7d00000000, 0x0fa0471300000000, 0xcc8dd3a000000000,
+    0x8d965fce00000000},
+   {0x0000000000000000, 0x1dfdb50100000000, 0x3afa6b0300000000,
+    0x2707de0200000000, 0x74f4d70600000000, 0x6909620700000000,
+    0x4e0ebc0500000000, 0x53f3090400000000, 0xe8e8af0d00000000,
+    0xf5151a0c00000000, 0xd212c40e00000000, 0xcfef710f00000000,
+    0x9c1c780b00000000, 0x81e1cd0a00000000, 0xa6e6130800000000,
+    0xbb1ba60900000000, 0xd0d15f1b00000000, 0xcd2cea1a00000000,
+    0xea2b341800000000, 0xf7d6811900000000, 0xa425881d00000000,
+    0xb9d83d1c00000000, 0x9edfe31e00000000, 0x8322561f00000000,
+    0x3839f01600000000, 0x25c4451700000000, 0x02c39b1500000000,
+    0x1f3e2e1400000000, 0x4ccd271000000000, 0x5130921100000000,
+    0x76374c1300000000, 0x6bcaf91200000000, 0xa0a3bf3600000000,
+    0xbd5e0a3700000000, 0x9a59d43500000000, 0x87a4613400000000,
+    0xd457683000000000, 0xc9aadd3100000000, 0xeead033300000000,
+    0xf350b63200000000, 0x484b103b00000000, 0x55b6a53a00000000,
+    0x72b17b3800000000, 0x6f4cce3900000000, 0x3cbfc73d00000000,
+    0x2142723c00000000, 0x0645ac3e00000000, 0x1bb8193f00000000,
+    0x7072e02d00000000, 0x6d8f552c00000000, 0x4a888b2e00000000,
+    0x57753e2f00000000, 0x0486372b00000000, 0x197b822a00000000,
+    0x3e7c5c2800000000, 0x2381e92900000000, 0x989a4f2000000000,
+    0x8567fa2100000000, 0xa260242300000000, 0xbf9d912200000000,
+    0xec6e982600000000, 0xf1932d2700000000, 0xd694f32500000000,
+    0xcb69462400000000, 0x40477f6d00000000, 0x5dbaca6c00000000,
+    0x7abd146e00000000, 0x6740a16f00000000, 0x34b3a86b00000000,
+    0x294e1d6a00000000, 0x0e49c36800000000, 0x13b4766900000000,
+    0xa8afd06000000000, 0xb552656100000000, 0x9255bb6300000000,
+    0x8fa80e6200000000, 0xdc5b076600000000, 0xc1a6b26700000000,
+    0xe6a16c6500000000, 0xfb5cd96400000000, 0x9096207600000000,
+    0x8d6b957700000000, 0xaa6c4b7500000000, 0xb791fe7400000000,
+    0xe462f77000000000, 0xf99f427100000000, 0xde989c7300000000,
+    0xc365297200000000, 0x787e8f7b00000000, 0x65833a7a00000000,
+    0x4284e47800000000, 0x5f79517900000000, 0x0c8a587d00000000,
+    0x1177ed7c00000000, 0x3670337e00000000, 0x2b8d867f00000000,
+    0xe0e4c05b00000000, 0xfd19755a00000000, 0xda1eab5800000000,
+    0xc7e31e5900000000, 0x9410175d00000000, 0x89eda25c00000000,
+    0xaeea7c5e00000000, 0xb317c95f00000000, 0x080c6f5600000000,
+    0x15f1da5700000000, 0x32f6045500000000, 0x2f0bb15400000000,
+    0x7cf8b85000000000, 0x61050d5100000000, 0x4602d35300000000,
+    0x5bff665200000000, 0x30359f4000000000, 0x2dc82a4100000000,
+    0x0acff44300000000, 0x1732414200000000, 0x44c1484600000000,
+    0x593cfd4700000000, 0x7e3b234500000000, 0x63c6964400000000,
+    0xd8dd304d00000000, 0xc520854c00000000, 0xe2275b4e00000000,
+    0xffdaee4f00000000, 0xac29e74b00000000, 0xb1d4524a00000000,
+    0x96d38c4800000000, 0x8b2e394900000000, 0x808efeda00000000,
+    0x9d734bdb00000000, 0xba7495d900000000, 0xa78920d800000000,
+    0xf47a29dc00000000, 0xe9879cdd00000000, 0xce8042df00000000,
+    0xd37df7de00000000, 0x686651d700000000, 0x759be4d600000000,
+    0x529c3ad400000000, 0x4f618fd500000000, 0x1c9286d100000000,
+    0x016f33d000000000, 0x2668edd200000000, 0x3b9558d300000000,
+    0x505fa1c100000000, 0x4da214c000000000, 0x6aa5cac200000000,
+    0x77587fc300000000, 0x24ab76c700000000, 0x3956c3c600000000,
+    0x1e511dc400000000, 0x03aca8c500000000, 0xb8b70ecc00000000,
+    0xa54abbcd00000000, 0x824d65cf00000000, 0x9fb0d0ce00000000,
+    0xcc43d9ca00000000, 0xd1be6ccb00000000, 0xf6b9b2c900000000,
+    0xeb4407c800000000, 0x202d41ec00000000, 0x3dd0f4ed00000000,
+    0x1ad72aef00000000, 0x072a9fee00000000, 0x54d996ea00000000,
+    0x492423eb00000000, 0x6e23fde900000000, 0x73de48e800000000,
+    0xc8c5eee100000000, 0xd5385be000000000, 0xf23f85e200000000,
+    0xefc230e300000000, 0xbc3139e700000000, 0xa1cc8ce600000000,
+    0x86cb52e400000000, 0x9b36e7e500000000, 0xf0fc1ef700000000,
+    0xed01abf600000000, 0xca0675f400000000, 0xd7fbc0f500000000,
+    0x8408c9f100000000, 0x99f57cf000000000, 0xbef2a2f200000000,
+    0xa30f17f300000000, 0x1814b1fa00000000, 0x05e904fb00000000,
+    0x22eedaf900000000, 0x3f136ff800000000, 0x6ce066fc00000000,
+    0x711dd3fd00000000, 0x561a0dff00000000, 0x4be7b8fe00000000,
+    0xc0c981b700000000, 0xdd3434b600000000, 0xfa33eab400000000,
+    0xe7ce5fb500000000, 0xb43d56b100000000, 0xa9c0e3b000000000,
+    0x8ec73db200000000, 0x933a88b300000000, 0x28212eba00000000,
+    0x35dc9bbb00000000, 0x12db45b900000000, 0x0f26f0b800000000,
+    0x5cd5f9bc00000000, 0x41284cbd00000000, 0x662f92bf00000000,
+    0x7bd227be00000000, 0x1018deac00000000, 0x0de56bad00000000,
+    0x2ae2b5af00000000, 0x371f00ae00000000, 0x64ec09aa00000000,
+    0x7911bcab00000000, 0x5e1662a900000000, 0x43ebd7a800000000,
+    0xf8f071a100000000, 0xe50dc4a000000000, 0xc20a1aa200000000,
+    0xdff7afa300000000, 0x8c04a6a700000000, 0x91f913a600000000,
+    0xb6fecda400000000, 0xab0378a500000000, 0x606a3e8100000000,
+    0x7d978b8000000000, 0x5a90558200000000, 0x476de08300000000,
+    0x149ee98700000000, 0x09635c8600000000, 0x2e64828400000000,
+    0x3399378500000000, 0x8882918c00000000, 0x957f248d00000000,
+    0xb278fa8f00000000, 0xaf854f8e00000000, 0xfc76468a00000000,
+    0xe18bf38b00000000, 0xc68c2d8900000000, 0xdb71988800000000,
+    0xb0bb619a00000000, 0xad46d49b00000000, 0x8a410a9900000000,
+    0x97bcbf9800000000, 0xc44fb69c00000000, 0xd9b2039d00000000,
+    0xfeb5dd9f00000000, 0xe348689e00000000, 0x5853ce9700000000,
+    0x45ae7b9600000000, 0x62a9a59400000000, 0x7f54109500000000,
+    0x2ca7199100000000, 0x315aac9000000000, 0x165d729200000000,
+    0x0ba0c79300000000},
+   {0x0000000000000000, 0x24d9076300000000, 0x48b20fc600000000,
+    0x6c6b08a500000000, 0xd1626e5700000000, 0xf5bb693400000000,
+    0x99d0619100000000, 0xbd0966f200000000, 0xa2c5dcae00000000,
+    0x861cdbcd00000000, 0xea77d36800000000, 0xceaed40b00000000,
+    0x73a7b2f900000000, 0x577eb59a00000000, 0x3b15bd3f00000000,
+    0x1fccba5c00000000, 0x058dc88600000000, 0x2154cfe500000000,
+    0x4d3fc74000000000, 0x69e6c02300000000, 0xd4efa6d100000000,
+    0xf036a1b200000000, 0x9c5da91700000000, 0xb884ae7400000000,
+    0xa748142800000000, 0x8391134b00000000, 0xeffa1bee00000000,
+    0xcb231c8d00000000, 0x762a7a7f00000000, 0x52f37d1c00000000,
+    0x3e9875b900000000, 0x1a4172da00000000, 0x4b1ce0d600000000,
+    0x6fc5e7b500000000, 0x03aeef1000000000, 0x2777e87300000000,
+    0x9a7e8e8100000000, 0xbea789e200000000, 0xd2cc814700000000,
+    0xf615862400000000, 0xe9d93c7800000000, 0xcd003b1b00000000,
+    0xa16b33be00000000, 0x85b234dd00000000, 0x38bb522f00000000,
+    0x1c62554c00000000, 0x70095de900000000, 0x54d05a8a00000000,
+    0x4e91285000000000, 0x6a482f3300000000, 0x0623279600000000,
+    0x22fa20f500000000, 0x9ff3460700000000, 0xbb2a416400000000,
+    0xd74149c100000000, 0xf3984ea200000000, 0xec54f4fe00000000,
+    0xc88df39d00000000, 0xa4e6fb3800000000, 0x803ffc5b00000000,
+    0x3d369aa900000000, 0x19ef9dca00000000, 0x7584956f00000000,
+    0x515d920c00000000, 0xd73eb17600000000, 0xf3e7b61500000000,
+    0x9f8cbeb000000000, 0xbb55b9d300000000, 0x065cdf2100000000,
+    0x2285d84200000000, 0x4eeed0e700000000, 0x6a37d78400000000,
+    0x75fb6dd800000000, 0x51226abb00000000, 0x3d49621e00000000,
+    0x1990657d00000000, 0xa499038f00000000, 0x804004ec00000000,
+    0xec2b0c4900000000, 0xc8f20b2a00000000, 0xd2b379f000000000,
+    0xf66a7e9300000000, 0x9a01763600000000, 0xbed8715500000000,
+    0x03d117a700000000, 0x270810c400000000, 0x4b63186100000000,
+    0x6fba1f0200000000, 0x7076a55e00000000, 0x54afa23d00000000,
+    0x38c4aa9800000000, 0x1c1dadfb00000000, 0xa114cb0900000000,
+    0x85cdcc6a00000000, 0xe9a6c4cf00000000, 0xcd7fc3ac00000000,
+    0x9c2251a000000000, 0xb8fb56c300000000, 0xd4905e6600000000,
+    0xf049590500000000, 0x4d403ff700000000, 0x6999389400000000,
+    0x05f2303100000000, 0x212b375200000000, 0x3ee78d0e00000000,
+    0x1a3e8a6d00000000, 0x765582c800000000, 0x528c85ab00000000,
+    0xef85e35900000000, 0xcb5ce43a00000000, 0xa737ec9f00000000,
+    0x83eeebfc00000000, 0x99af992600000000, 0xbd769e4500000000,
+    0xd11d96e000000000, 0xf5c4918300000000, 0x48cdf77100000000,
+    0x6c14f01200000000, 0x007ff8b700000000, 0x24a6ffd400000000,
+    0x3b6a458800000000, 0x1fb342eb00000000, 0x73d84a4e00000000,
+    0x57014d2d00000000, 0xea082bdf00000000, 0xced12cbc00000000,
+    0xa2ba241900000000, 0x8663237a00000000, 0xae7d62ed00000000,
+    0x8aa4658e00000000, 0xe6cf6d2b00000000, 0xc2166a4800000000,
+    0x7f1f0cba00000000, 0x5bc60bd900000000, 0x37ad037c00000000,
+    0x1374041f00000000, 0x0cb8be4300000000, 0x2861b92000000000,
+    0x440ab18500000000, 0x60d3b6e600000000, 0xdddad01400000000,
+    0xf903d77700000000, 0x9568dfd200000000, 0xb1b1d8b100000000,
+    0xabf0aa6b00000000, 0x8f29ad0800000000, 0xe342a5ad00000000,
+    0xc79ba2ce00000000, 0x7a92c43c00000000, 0x5e4bc35f00000000,
+    0x3220cbfa00000000, 0x16f9cc9900000000, 0x093576c500000000,
+    0x2dec71a600000000, 0x4187790300000000, 0x655e7e6000000000,
+    0xd857189200000000, 0xfc8e1ff100000000, 0x90e5175400000000,
+    0xb43c103700000000, 0xe561823b00000000, 0xc1b8855800000000,
+    0xadd38dfd00000000, 0x890a8a9e00000000, 0x3403ec6c00000000,
+    0x10daeb0f00000000, 0x7cb1e3aa00000000, 0x5868e4c900000000,
+    0x47a45e9500000000, 0x637d59f600000000, 0x0f16515300000000,
+    0x2bcf563000000000, 0x96c630c200000000, 0xb21f37a100000000,
+    0xde743f0400000000, 0xfaad386700000000, 0xe0ec4abd00000000,
+    0xc4354dde00000000, 0xa85e457b00000000, 0x8c87421800000000,
+    0x318e24ea00000000, 0x1557238900000000, 0x793c2b2c00000000,
+    0x5de52c4f00000000, 0x4229961300000000, 0x66f0917000000000,
+    0x0a9b99d500000000, 0x2e429eb600000000, 0x934bf84400000000,
+    0xb792ff2700000000, 0xdbf9f78200000000, 0xff20f0e100000000,
+    0x7943d39b00000000, 0x5d9ad4f800000000, 0x31f1dc5d00000000,
+    0x1528db3e00000000, 0xa821bdcc00000000, 0x8cf8baaf00000000,
+    0xe093b20a00000000, 0xc44ab56900000000, 0xdb860f3500000000,
+    0xff5f085600000000, 0x933400f300000000, 0xb7ed079000000000,
+    0x0ae4616200000000, 0x2e3d660100000000, 0x42566ea400000000,
+    0x668f69c700000000, 0x7cce1b1d00000000, 0x58171c7e00000000,
+    0x347c14db00000000, 0x10a513b800000000, 0xadac754a00000000,
+    0x8975722900000000, 0xe51e7a8c00000000, 0xc1c77def00000000,
+    0xde0bc7b300000000, 0xfad2c0d000000000, 0x96b9c87500000000,
+    0xb260cf1600000000, 0x0f69a9e400000000, 0x2bb0ae8700000000,
+    0x47dba62200000000, 0x6302a14100000000, 0x325f334d00000000,
+    0x1686342e00000000, 0x7aed3c8b00000000, 0x5e343be800000000,
+    0xe33d5d1a00000000, 0xc7e45a7900000000, 0xab8f52dc00000000,
+    0x8f5655bf00000000, 0x909aefe300000000, 0xb443e88000000000,
+    0xd828e02500000000, 0xfcf1e74600000000, 0x41f881b400000000,
+    0x652186d700000000, 0x094a8e7200000000, 0x2d93891100000000,
+    0x37d2fbcb00000000, 0x130bfca800000000, 0x7f60f40d00000000,
+    0x5bb9f36e00000000, 0xe6b0959c00000000, 0xc26992ff00000000,
+    0xae029a5a00000000, 0x8adb9d3900000000, 0x9517276500000000,
+    0xb1ce200600000000, 0xdda528a300000000, 0xf97c2fc000000000,
+    0x4475493200000000, 0x60ac4e5100000000, 0x0cc746f400000000,
+    0x281e419700000000},
+   {0x0000000000000000, 0x08e3603c00000000, 0x10c6c17800000000,
+    0x1825a14400000000, 0x208c83f100000000, 0x286fe3cd00000000,
+    0x304a428900000000, 0x38a922b500000000, 0x011e763800000000,
+    0x09fd160400000000, 0x11d8b74000000000, 0x193bd77c00000000,
+    0x2192f5c900000000, 0x297195f500000000, 0x315434b100000000,
+    0x39b7548d00000000, 0x023cec7000000000, 0x0adf8c4c00000000,
+    0x12fa2d0800000000, 0x1a194d3400000000, 0x22b06f8100000000,
+    0x2a530fbd00000000, 0x3276aef900000000, 0x3a95cec500000000,
+    0x03229a4800000000, 0x0bc1fa7400000000, 0x13e45b3000000000,
+    0x1b073b0c00000000, 0x23ae19b900000000, 0x2b4d798500000000,
+    0x3368d8c100000000, 0x3b8bb8fd00000000, 0x0478d8e100000000,
+    0x0c9bb8dd00000000, 0x14be199900000000, 0x1c5d79a500000000,
+    0x24f45b1000000000, 0x2c173b2c00000000, 0x34329a6800000000,
+    0x3cd1fa5400000000, 0x0566aed900000000, 0x0d85cee500000000,
+    0x15a06fa100000000, 0x1d430f9d00000000, 0x25ea2d2800000000,
+    0x2d094d1400000000, 0x352cec5000000000, 0x3dcf8c6c00000000,
+    0x0644349100000000, 0x0ea754ad00000000, 0x1682f5e900000000,
+    0x1e6195d500000000, 0x26c8b76000000000, 0x2e2bd75c00000000,
+    0x360e761800000000, 0x3eed162400000000, 0x075a42a900000000,
+    0x0fb9229500000000, 0x179c83d100000000, 0x1f7fe3ed00000000,
+    0x27d6c15800000000, 0x2f35a16400000000, 0x3710002000000000,
+    0x3ff3601c00000000, 0x49f6c11800000000, 0x4115a12400000000,
+    0x5930006000000000, 0x51d3605c00000000, 0x697a42e900000000,
+    0x619922d500000000, 0x79bc839100000000, 0x715fe3ad00000000,
+    0x48e8b72000000000, 0x400bd71c00000000, 0x582e765800000000,
+    0x50cd166400000000, 0x686434d100000000, 0x608754ed00000000,
+    0x78a2f5a900000000, 0x7041959500000000, 0x4bca2d6800000000,
+    0x43294d5400000000, 0x5b0cec1000000000, 0x53ef8c2c00000000,
+    0x6b46ae9900000000, 0x63a5cea500000000, 0x7b806fe100000000,
+    0x73630fdd00000000, 0x4ad45b5000000000, 0x42373b6c00000000,
+    0x5a129a2800000000, 0x52f1fa1400000000, 0x6a58d8a100000000,
+    0x62bbb89d00000000, 0x7a9e19d900000000, 0x727d79e500000000,
+    0x4d8e19f900000000, 0x456d79c500000000, 0x5d48d88100000000,
+    0x55abb8bd00000000, 0x6d029a0800000000, 0x65e1fa3400000000,
+    0x7dc45b7000000000, 0x75273b4c00000000, 0x4c906fc100000000,
+    0x44730ffd00000000, 0x5c56aeb900000000, 0x54b5ce8500000000,
+    0x6c1cec3000000000, 0x64ff8c0c00000000, 0x7cda2d4800000000,
+    0x74394d7400000000, 0x4fb2f58900000000, 0x475195b500000000,
+    0x5f7434f100000000, 0x579754cd00000000, 0x6f3e767800000000,
+    0x67dd164400000000, 0x7ff8b70000000000, 0x771bd73c00000000,
+    0x4eac83b100000000, 0x464fe38d00000000, 0x5e6a42c900000000,
+    0x568922f500000000, 0x6e20004000000000, 0x66c3607c00000000,
+    0x7ee6c13800000000, 0x7605a10400000000, 0x92ec833100000000,
+    0x9a0fe30d00000000, 0x822a424900000000, 0x8ac9227500000000,
+    0xb26000c000000000, 0xba8360fc00000000, 0xa2a6c1b800000000,
+    0xaa45a18400000000, 0x93f2f50900000000, 0x9b11953500000000,
+    0x8334347100000000, 0x8bd7544d00000000, 0xb37e76f800000000,
+    0xbb9d16c400000000, 0xa3b8b78000000000, 0xab5bd7bc00000000,
+    0x90d06f4100000000, 0x98330f7d00000000, 0x8016ae3900000000,
+    0x88f5ce0500000000, 0xb05cecb000000000, 0xb8bf8c8c00000000,
+    0xa09a2dc800000000, 0xa8794df400000000, 0x91ce197900000000,
+    0x992d794500000000, 0x8108d80100000000, 0x89ebb83d00000000,
+    0xb1429a8800000000, 0xb9a1fab400000000, 0xa1845bf000000000,
+    0xa9673bcc00000000, 0x96945bd000000000, 0x9e773bec00000000,
+    0x86529aa800000000, 0x8eb1fa9400000000, 0xb618d82100000000,
+    0xbefbb81d00000000, 0xa6de195900000000, 0xae3d796500000000,
+    0x978a2de800000000, 0x9f694dd400000000, 0x874cec9000000000,
+    0x8faf8cac00000000, 0xb706ae1900000000, 0xbfe5ce2500000000,
+    0xa7c06f6100000000, 0xaf230f5d00000000, 0x94a8b7a000000000,
+    0x9c4bd79c00000000, 0x846e76d800000000, 0x8c8d16e400000000,
+    0xb424345100000000, 0xbcc7546d00000000, 0xa4e2f52900000000,
+    0xac01951500000000, 0x95b6c19800000000, 0x9d55a1a400000000,
+    0x857000e000000000, 0x8d9360dc00000000, 0xb53a426900000000,
+    0xbdd9225500000000, 0xa5fc831100000000, 0xad1fe32d00000000,
+    0xdb1a422900000000, 0xd3f9221500000000, 0xcbdc835100000000,
+    0xc33fe36d00000000, 0xfb96c1d800000000, 0xf375a1e400000000,
+    0xeb5000a000000000, 0xe3b3609c00000000, 0xda04341100000000,
+    0xd2e7542d00000000, 0xcac2f56900000000, 0xc221955500000000,
+    0xfa88b7e000000000, 0xf26bd7dc00000000, 0xea4e769800000000,
+    0xe2ad16a400000000, 0xd926ae5900000000, 0xd1c5ce6500000000,
+    0xc9e06f2100000000, 0xc1030f1d00000000, 0xf9aa2da800000000,
+    0xf1494d9400000000, 0xe96cecd000000000, 0xe18f8cec00000000,
+    0xd838d86100000000, 0xd0dbb85d00000000, 0xc8fe191900000000,
+    0xc01d792500000000, 0xf8b45b9000000000, 0xf0573bac00000000,
+    0xe8729ae800000000, 0xe091fad400000000, 0xdf629ac800000000,
+    0xd781faf400000000, 0xcfa45bb000000000, 0xc7473b8c00000000,
+    0xffee193900000000, 0xf70d790500000000, 0xef28d84100000000,
+    0xe7cbb87d00000000, 0xde7cecf000000000, 0xd69f8ccc00000000,
+    0xceba2d8800000000, 0xc6594db400000000, 0xfef06f0100000000,
+    0xf6130f3d00000000, 0xee36ae7900000000, 0xe6d5ce4500000000,
+    0xdd5e76b800000000, 0xd5bd168400000000, 0xcd98b7c000000000,
+    0xc57bd7fc00000000, 0xfdd2f54900000000, 0xf531957500000000,
+    0xed14343100000000, 0xe5f7540d00000000, 0xdc40008000000000,
+    0xd4a360bc00000000, 0xcc86c1f800000000, 0xc465a1c400000000,
+    0xfccc837100000000, 0xf42fe34d00000000, 0xec0a420900000000,
+    0xe4e9223500000000},
+   {0x0000000000000000, 0xd1e8e70e00000000, 0xa2d1cf1d00000000,
+    0x7339281300000000, 0x44a39f3b00000000, 0x954b783500000000,
+    0xe672502600000000, 0x379ab72800000000, 0x88463f7700000000,
+    0x59aed87900000000, 0x2a97f06a00000000, 0xfb7f176400000000,
+    0xcce5a04c00000000, 0x1d0d474200000000, 0x6e346f5100000000,
+    0xbfdc885f00000000, 0x108d7eee00000000, 0xc16599e000000000,
+    0xb25cb1f300000000, 0x63b456fd00000000, 0x542ee1d500000000,
+    0x85c606db00000000, 0xf6ff2ec800000000, 0x2717c9c600000000,
+    0x98cb419900000000, 0x4923a69700000000, 0x3a1a8e8400000000,
+    0xebf2698a00000000, 0xdc68dea200000000, 0x0d8039ac00000000,
+    0x7eb911bf00000000, 0xaf51f6b100000000, 0x611c8c0700000000,
+    0xb0f46b0900000000, 0xc3cd431a00000000, 0x1225a41400000000,
+    0x25bf133c00000000, 0xf457f43200000000, 0x876edc2100000000,
+    0x56863b2f00000000, 0xe95ab37000000000, 0x38b2547e00000000,
+    0x4b8b7c6d00000000, 0x9a639b6300000000, 0xadf92c4b00000000,
+    0x7c11cb4500000000, 0x0f28e35600000000, 0xdec0045800000000,
+    0x7191f2e900000000, 0xa07915e700000000, 0xd3403df400000000,
+    0x02a8dafa00000000, 0x35326dd200000000, 0xe4da8adc00000000,
+    0x97e3a2cf00000000, 0x460b45c100000000, 0xf9d7cd9e00000000,
+    0x283f2a9000000000, 0x5b06028300000000, 0x8aeee58d00000000,
+    0xbd7452a500000000, 0x6c9cb5ab00000000, 0x1fa59db800000000,
+    0xce4d7ab600000000, 0xc238180f00000000, 0x13d0ff0100000000,
+    0x60e9d71200000000, 0xb101301c00000000, 0x869b873400000000,
+    0x5773603a00000000, 0x244a482900000000, 0xf5a2af2700000000,
+    0x4a7e277800000000, 0x9b96c07600000000, 0xe8afe86500000000,
+    0x39470f6b00000000, 0x0eddb84300000000, 0xdf355f4d00000000,
+    0xac0c775e00000000, 0x7de4905000000000, 0xd2b566e100000000,
+    0x035d81ef00000000, 0x7064a9fc00000000, 0xa18c4ef200000000,
+    0x9616f9da00000000, 0x47fe1ed400000000, 0x34c736c700000000,
+    0xe52fd1c900000000, 0x5af3599600000000, 0x8b1bbe9800000000,
+    0xf822968b00000000, 0x29ca718500000000, 0x1e50c6ad00000000,
+    0xcfb821a300000000, 0xbc8109b000000000, 0x6d69eebe00000000,
+    0xa324940800000000, 0x72cc730600000000, 0x01f55b1500000000,
+    0xd01dbc1b00000000, 0xe7870b3300000000, 0x366fec3d00000000,
+    0x4556c42e00000000, 0x94be232000000000, 0x2b62ab7f00000000,
+    0xfa8a4c7100000000, 0x89b3646200000000, 0x585b836c00000000,
+    0x6fc1344400000000, 0xbe29d34a00000000, 0xcd10fb5900000000,
+    0x1cf81c5700000000, 0xb3a9eae600000000, 0x62410de800000000,
+    0x117825fb00000000, 0xc090c2f500000000, 0xf70a75dd00000000,
+    0x26e292d300000000, 0x55dbbac000000000, 0x84335dce00000000,
+    0x3befd59100000000, 0xea07329f00000000, 0x993e1a8c00000000,
+    0x48d6fd8200000000, 0x7f4c4aaa00000000, 0xaea4ada400000000,
+    0xdd9d85b700000000, 0x0c7562b900000000, 0x8471301e00000000,
+    0x5599d71000000000, 0x26a0ff0300000000, 0xf748180d00000000,
+    0xc0d2af2500000000, 0x113a482b00000000, 0x6203603800000000,
+    0xb3eb873600000000, 0x0c370f6900000000, 0xdddfe86700000000,
+    0xaee6c07400000000, 0x7f0e277a00000000, 0x4894905200000000,
+    0x997c775c00000000, 0xea455f4f00000000, 0x3badb84100000000,
+    0x94fc4ef000000000, 0x4514a9fe00000000, 0x362d81ed00000000,
+    0xe7c566e300000000, 0xd05fd1cb00000000, 0x01b736c500000000,
+    0x728e1ed600000000, 0xa366f9d800000000, 0x1cba718700000000,
+    0xcd52968900000000, 0xbe6bbe9a00000000, 0x6f83599400000000,
+    0x5819eebc00000000, 0x89f109b200000000, 0xfac821a100000000,
+    0x2b20c6af00000000, 0xe56dbc1900000000, 0x34855b1700000000,
+    0x47bc730400000000, 0x9654940a00000000, 0xa1ce232200000000,
+    0x7026c42c00000000, 0x031fec3f00000000, 0xd2f70b3100000000,
+    0x6d2b836e00000000, 0xbcc3646000000000, 0xcffa4c7300000000,
+    0x1e12ab7d00000000, 0x29881c5500000000, 0xf860fb5b00000000,
+    0x8b59d34800000000, 0x5ab1344600000000, 0xf5e0c2f700000000,
+    0x240825f900000000, 0x57310dea00000000, 0x86d9eae400000000,
+    0xb1435dcc00000000, 0x60abbac200000000, 0x139292d100000000,
+    0xc27a75df00000000, 0x7da6fd8000000000, 0xac4e1a8e00000000,
+    0xdf77329d00000000, 0x0e9fd59300000000, 0x390562bb00000000,
+    0xe8ed85b500000000, 0x9bd4ada600000000, 0x4a3c4aa800000000,
+    0x4649281100000000, 0x97a1cf1f00000000, 0xe498e70c00000000,
+    0x3570000200000000, 0x02eab72a00000000, 0xd302502400000000,
+    0xa03b783700000000, 0x71d39f3900000000, 0xce0f176600000000,
+    0x1fe7f06800000000, 0x6cded87b00000000, 0xbd363f7500000000,
+    0x8aac885d00000000, 0x5b446f5300000000, 0x287d474000000000,
+    0xf995a04e00000000, 0x56c456ff00000000, 0x872cb1f100000000,
+    0xf41599e200000000, 0x25fd7eec00000000, 0x1267c9c400000000,
+    0xc38f2eca00000000, 0xb0b606d900000000, 0x615ee1d700000000,
+    0xde82698800000000, 0x0f6a8e8600000000, 0x7c53a69500000000,
+    0xadbb419b00000000, 0x9a21f6b300000000, 0x4bc911bd00000000,
+    0x38f039ae00000000, 0xe918dea000000000, 0x2755a41600000000,
+    0xf6bd431800000000, 0x85846b0b00000000, 0x546c8c0500000000,
+    0x63f63b2d00000000, 0xb21edc2300000000, 0xc127f43000000000,
+    0x10cf133e00000000, 0xaf139b6100000000, 0x7efb7c6f00000000,
+    0x0dc2547c00000000, 0xdc2ab37200000000, 0xebb0045a00000000,
+    0x3a58e35400000000, 0x4961cb4700000000, 0x98892c4900000000,
+    0x37d8daf800000000, 0xe6303df600000000, 0x950915e500000000,
+    0x44e1f2eb00000000, 0x737b45c300000000, 0xa293a2cd00000000,
+    0xd1aa8ade00000000, 0x00426dd000000000, 0xbf9ee58f00000000,
+    0x6e76028100000000, 0x1d4f2a9200000000, 0xcca7cd9c00000000,
+    0xfb3d7ab400000000, 0x2ad59dba00000000, 0x59ecb5a900000000,
+    0x880452a700000000},
+   {0x0000000000000000, 0xaa05daf100000000, 0x150dc53800000000,
+    0xbf081fc900000000, 0x2a1a8a7100000000, 0x801f508000000000,
+    0x3f174f4900000000, 0x951295b800000000, 0x543414e300000000,
+    0xfe31ce1200000000, 0x4139d1db00000000, 0xeb3c0b2a00000000,
+    0x7e2e9e9200000000, 0xd42b446300000000, 0x6b235baa00000000,
+    0xc126815b00000000, 0xe96e591d00000000, 0x436b83ec00000000,
+    0xfc639c2500000000, 0x566646d400000000, 0xc374d36c00000000,
+    0x6971099d00000000, 0xd679165400000000, 0x7c7ccca500000000,
+    0xbd5a4dfe00000000, 0x175f970f00000000, 0xa85788c600000000,
+    0x0252523700000000, 0x9740c78f00000000, 0x3d451d7e00000000,
+    0x824d02b700000000, 0x2848d84600000000, 0xd2ddb23a00000000,
+    0x78d868cb00000000, 0xc7d0770200000000, 0x6dd5adf300000000,
+    0xf8c7384b00000000, 0x52c2e2ba00000000, 0xedcafd7300000000,
+    0x47cf278200000000, 0x86e9a6d900000000, 0x2cec7c2800000000,
+    0x93e463e100000000, 0x39e1b91000000000, 0xacf32ca800000000,
+    0x06f6f65900000000, 0xb9fee99000000000, 0x13fb336100000000,
+    0x3bb3eb2700000000, 0x91b631d600000000, 0x2ebe2e1f00000000,
+    0x84bbf4ee00000000, 0x11a9615600000000, 0xbbacbba700000000,
+    0x04a4a46e00000000, 0xaea17e9f00000000, 0x6f87ffc400000000,
+    0xc582253500000000, 0x7a8a3afc00000000, 0xd08fe00d00000000,
+    0x459d75b500000000, 0xef98af4400000000, 0x5090b08d00000000,
+    0xfa956a7c00000000, 0xa4bb657500000000, 0x0ebebf8400000000,
+    0xb1b6a04d00000000, 0x1bb37abc00000000, 0x8ea1ef0400000000,
+    0x24a435f500000000, 0x9bac2a3c00000000, 0x31a9f0cd00000000,
+    0xf08f719600000000, 0x5a8aab6700000000, 0xe582b4ae00000000,
+    0x4f876e5f00000000, 0xda95fbe700000000, 0x7090211600000000,
+    0xcf983edf00000000, 0x659de42e00000000, 0x4dd53c6800000000,
+    0xe7d0e69900000000, 0x58d8f95000000000, 0xf2dd23a100000000,
+    0x67cfb61900000000, 0xcdca6ce800000000, 0x72c2732100000000,
+    0xd8c7a9d000000000, 0x19e1288b00000000, 0xb3e4f27a00000000,
+    0x0cecedb300000000, 0xa6e9374200000000, 0x33fba2fa00000000,
+    0x99fe780b00000000, 0x26f667c200000000, 0x8cf3bd3300000000,
+    0x7666d74f00000000, 0xdc630dbe00000000, 0x636b127700000000,
+    0xc96ec88600000000, 0x5c7c5d3e00000000, 0xf67987cf00000000,
+    0x4971980600000000, 0xe37442f700000000, 0x2252c3ac00000000,
+    0x8857195d00000000, 0x375f069400000000, 0x9d5adc6500000000,
+    0x084849dd00000000, 0xa24d932c00000000, 0x1d458ce500000000,
+    0xb740561400000000, 0x9f088e5200000000, 0x350d54a300000000,
+    0x8a054b6a00000000, 0x2000919b00000000, 0xb512042300000000,
+    0x1f17ded200000000, 0xa01fc11b00000000, 0x0a1a1bea00000000,
+    0xcb3c9ab100000000, 0x6139404000000000, 0xde315f8900000000,
+    0x7434857800000000, 0xe12610c000000000, 0x4b23ca3100000000,
+    0xf42bd5f800000000, 0x5e2e0f0900000000, 0x4877cbea00000000,
+    0xe272111b00000000, 0x5d7a0ed200000000, 0xf77fd42300000000,
+    0x626d419b00000000, 0xc8689b6a00000000, 0x776084a300000000,
+    0xdd655e5200000000, 0x1c43df0900000000, 0xb64605f800000000,
+    0x094e1a3100000000, 0xa34bc0c000000000, 0x3659557800000000,
+    0x9c5c8f8900000000, 0x2354904000000000, 0x89514ab100000000,
+    0xa11992f700000000, 0x0b1c480600000000, 0xb41457cf00000000,
+    0x1e118d3e00000000, 0x8b03188600000000, 0x2106c27700000000,
+    0x9e0eddbe00000000, 0x340b074f00000000, 0xf52d861400000000,
+    0x5f285ce500000000, 0xe020432c00000000, 0x4a2599dd00000000,
+    0xdf370c6500000000, 0x7532d69400000000, 0xca3ac95d00000000,
+    0x603f13ac00000000, 0x9aaa79d000000000, 0x30afa32100000000,
+    0x8fa7bce800000000, 0x25a2661900000000, 0xb0b0f3a100000000,
+    0x1ab5295000000000, 0xa5bd369900000000, 0x0fb8ec6800000000,
+    0xce9e6d3300000000, 0x649bb7c200000000, 0xdb93a80b00000000,
+    0x719672fa00000000, 0xe484e74200000000, 0x4e813db300000000,
+    0xf189227a00000000, 0x5b8cf88b00000000, 0x73c420cd00000000,
+    0xd9c1fa3c00000000, 0x66c9e5f500000000, 0xcccc3f0400000000,
+    0x59deaabc00000000, 0xf3db704d00000000, 0x4cd36f8400000000,
+    0xe6d6b57500000000, 0x27f0342e00000000, 0x8df5eedf00000000,
+    0x32fdf11600000000, 0x98f82be700000000, 0x0deabe5f00000000,
+    0xa7ef64ae00000000, 0x18e77b6700000000, 0xb2e2a19600000000,
+    0xecccae9f00000000, 0x46c9746e00000000, 0xf9c16ba700000000,
+    0x53c4b15600000000, 0xc6d624ee00000000, 0x6cd3fe1f00000000,
+    0xd3dbe1d600000000, 0x79de3b2700000000, 0xb8f8ba7c00000000,
+    0x12fd608d00000000, 0xadf57f4400000000, 0x07f0a5b500000000,
+    0x92e2300d00000000, 0x38e7eafc00000000, 0x87eff53500000000,
+    0x2dea2fc400000000, 0x05a2f78200000000, 0xafa72d7300000000,
+    0x10af32ba00000000, 0xbaaae84b00000000, 0x2fb87df300000000,
+    0x85bda70200000000, 0x3ab5b8cb00000000, 0x90b0623a00000000,
+    0x5196e36100000000, 0xfb93399000000000, 0x449b265900000000,
+    0xee9efca800000000, 0x7b8c691000000000, 0xd189b3e100000000,
+    0x6e81ac2800000000, 0xc48476d900000000, 0x3e111ca500000000,
+    0x9414c65400000000, 0x2b1cd99d00000000, 0x8119036c00000000,
+    0x140b96d400000000, 0xbe0e4c2500000000, 0x010653ec00000000,
+    0xab03891d00000000, 0x6a25084600000000, 0xc020d2b700000000,
+    0x7f28cd7e00000000, 0xd52d178f00000000, 0x403f823700000000,
+    0xea3a58c600000000, 0x5532470f00000000, 0xff379dfe00000000,
+    0xd77f45b800000000, 0x7d7a9f4900000000, 0xc272808000000000,
+    0x68775a7100000000, 0xfd65cfc900000000, 0x5760153800000000,
+    0xe8680af100000000, 0x426dd00000000000, 0x834b515b00000000,
+    0x294e8baa00000000, 0x9646946300000000, 0x3c434e9200000000,
+    0xa951db2a00000000, 0x035401db00000000, 0xbc5c1e1200000000,
+    0x1659c4e300000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x85d996dd, 0x4bb55c60, 0xce6ccabd, 0x966ab9c0,
+    0x13b32f1d, 0xdddfe5a0, 0x5806737d, 0x6dd3035a, 0xe80a9587,
+    0x26665f3a, 0xa3bfc9e7, 0xfbb9ba9a, 0x7e602c47, 0xb00ce6fa,
+    0x35d57027, 0xdaa607b4, 0x5f7f9169, 0x91135bd4, 0x14cacd09,
+    0x4cccbe74, 0xc91528a9, 0x0779e214, 0x82a074c9, 0xb77504ee,
+    0x32ac9233, 0xfcc0588e, 0x7919ce53, 0x211fbd2e, 0xa4c62bf3,
+    0x6aaae14e, 0xef737793, 0xf54b7eb3, 0x7092e86e, 0xbefe22d3,
+    0x3b27b40e, 0x6321c773, 0xe6f851ae, 0x28949b13, 0xad4d0dce,
+    0x98987de9, 0x1d41eb34, 0xd32d2189, 0x56f4b754, 0x0ef2c429,
+    0x8b2b52f4, 0x45479849, 0xc09e0e94, 0x2fed7907, 0xaa34efda,
+    0x64582567, 0xe181b3ba, 0xb987c0c7, 0x3c5e561a, 0xf2329ca7,
+    0x77eb0a7a, 0x423e7a5d, 0xc7e7ec80, 0x098b263d, 0x8c52b0e0,
+    0xd454c39d, 0x518d5540, 0x9fe19ffd, 0x1a380920, 0xab918dbd,
+    0x2e481b60, 0xe024d1dd, 0x65fd4700, 0x3dfb347d, 0xb822a2a0,
+    0x764e681d, 0xf397fec0, 0xc6428ee7, 0x439b183a, 0x8df7d287,
+    0x082e445a, 0x50283727, 0xd5f1a1fa, 0x1b9d6b47, 0x9e44fd9a,
+    0x71378a09, 0xf4ee1cd4, 0x3a82d669, 0xbf5b40b4, 0xe75d33c9,
+    0x6284a514, 0xace86fa9, 0x2931f974, 0x1ce48953, 0x993d1f8e,
+    0x5751d533, 0xd28843ee, 0x8a8e3093, 0x0f57a64e, 0xc13b6cf3,
+    0x44e2fa2e, 0x5edaf30e, 0xdb0365d3, 0x156faf6e, 0x90b639b3,
+    0xc8b04ace, 0x4d69dc13, 0x830516ae, 0x06dc8073, 0x3309f054,
+    0xb6d06689, 0x78bcac34, 0xfd653ae9, 0xa5634994, 0x20badf49,
+    0xeed615f4, 0x6b0f8329, 0x847cf4ba, 0x01a56267, 0xcfc9a8da,
+    0x4a103e07, 0x12164d7a, 0x97cfdba7, 0x59a3111a, 0xdc7a87c7,
+    0xe9aff7e0, 0x6c76613d, 0xa21aab80, 0x27c33d5d, 0x7fc54e20,
+    0xfa1cd8fd, 0x34701240, 0xb1a9849d, 0x17256aa0, 0x92fcfc7d,
+    0x5c9036c0, 0xd949a01d, 0x814fd360, 0x049645bd, 0xcafa8f00,
+    0x4f2319dd, 0x7af669fa, 0xff2fff27, 0x3143359a, 0xb49aa347,
+    0xec9cd03a, 0x694546e7, 0xa7298c5a, 0x22f01a87, 0xcd836d14,
+    0x485afbc9, 0x86363174, 0x03efa7a9, 0x5be9d4d4, 0xde304209,
+    0x105c88b4, 0x95851e69, 0xa0506e4e, 0x2589f893, 0xebe5322e,
+    0x6e3ca4f3, 0x363ad78e, 0xb3e34153, 0x7d8f8bee, 0xf8561d33,
+    0xe26e1413, 0x67b782ce, 0xa9db4873, 0x2c02deae, 0x7404add3,
+    0xf1dd3b0e, 0x3fb1f1b3, 0xba68676e, 0x8fbd1749, 0x0a648194,
+    0xc4084b29, 0x41d1ddf4, 0x19d7ae89, 0x9c0e3854, 0x5262f2e9,
+    0xd7bb6434, 0x38c813a7, 0xbd11857a, 0x737d4fc7, 0xf6a4d91a,
+    0xaea2aa67, 0x2b7b3cba, 0xe517f607, 0x60ce60da, 0x551b10fd,
+    0xd0c28620, 0x1eae4c9d, 0x9b77da40, 0xc371a93d, 0x46a83fe0,
+    0x88c4f55d, 0x0d1d6380, 0xbcb4e71d, 0x396d71c0, 0xf701bb7d,
+    0x72d82da0, 0x2ade5edd, 0xaf07c800, 0x616b02bd, 0xe4b29460,
+    0xd167e447, 0x54be729a, 0x9ad2b827, 0x1f0b2efa, 0x470d5d87,
+    0xc2d4cb5a, 0x0cb801e7, 0x8961973a, 0x6612e0a9, 0xe3cb7674,
+    0x2da7bcc9, 0xa87e2a14, 0xf0785969, 0x75a1cfb4, 0xbbcd0509,
+    0x3e1493d4, 0x0bc1e3f3, 0x8e18752e, 0x4074bf93, 0xc5ad294e,
+    0x9dab5a33, 0x1872ccee, 0xd61e0653, 0x53c7908e, 0x49ff99ae,
+    0xcc260f73, 0x024ac5ce, 0x87935313, 0xdf95206e, 0x5a4cb6b3,
+    0x94207c0e, 0x11f9ead3, 0x242c9af4, 0xa1f50c29, 0x6f99c694,
+    0xea405049, 0xb2462334, 0x379fb5e9, 0xf9f37f54, 0x7c2ae989,
+    0x93599e1a, 0x168008c7, 0xd8ecc27a, 0x5d3554a7, 0x053327da,
+    0x80eab107, 0x4e867bba, 0xcb5fed67, 0xfe8a9d40, 0x7b530b9d,
+    0xb53fc120, 0x30e657fd, 0x68e02480, 0xed39b25d, 0x235578e0,
+    0xa68cee3d},
+   {0x00000000, 0x76e10f9d, 0xadc46ee1, 0xdb25617c, 0x1b8fac19,
+    0x6d6ea384, 0xb64bc2f8, 0xc0aacd65, 0x361e5933, 0x40ff56ae,
+    0x9bda37d2, 0xed3b384f, 0x2d91f52a, 0x5b70fab7, 0x80559bcb,
+    0xf6b49456, 0x6c3cb266, 0x1addbdfb, 0xc1f8dc87, 0xb719d31a,
+    0x77b31e7f, 0x015211e2, 0xda77709e, 0xac967f03, 0x5a22eb55,
+    0x2cc3e4c8, 0xf7e685b4, 0x81078a29, 0x41ad474c, 0x374c48d1,
+    0xec6929ad, 0x9a882630, 0xd87864cd, 0xae996b50, 0x75bc0a2c,
+    0x035d05b1, 0xc3f7c8d4, 0xb516c749, 0x6e33a635, 0x18d2a9a8,
+    0xee663dfe, 0x98873263, 0x43a2531f, 0x35435c82, 0xf5e991e7,
+    0x83089e7a, 0x582dff06, 0x2eccf09b, 0xb444d6ab, 0xc2a5d936,
+    0x1980b84a, 0x6f61b7d7, 0xafcb7ab2, 0xd92a752f, 0x020f1453,
+    0x74ee1bce, 0x825a8f98, 0xf4bb8005, 0x2f9ee179, 0x597feee4,
+    0x99d52381, 0xef342c1c, 0x34114d60, 0x42f042fd, 0xf1f7b941,
+    0x8716b6dc, 0x5c33d7a0, 0x2ad2d83d, 0xea781558, 0x9c991ac5,
+    0x47bc7bb9, 0x315d7424, 0xc7e9e072, 0xb108efef, 0x6a2d8e93,
+    0x1ccc810e, 0xdc664c6b, 0xaa8743f6, 0x71a2228a, 0x07432d17,
+    0x9dcb0b27, 0xeb2a04ba, 0x300f65c6, 0x46ee6a5b, 0x8644a73e,
+    0xf0a5a8a3, 0x2b80c9df, 0x5d61c642, 0xabd55214, 0xdd345d89,
+    0x06113cf5, 0x70f03368, 0xb05afe0d, 0xc6bbf190, 0x1d9e90ec,
+    0x6b7f9f71, 0x298fdd8c, 0x5f6ed211, 0x844bb36d, 0xf2aabcf0,
+    0x32007195, 0x44e17e08, 0x9fc41f74, 0xe92510e9, 0x1f9184bf,
+    0x69708b22, 0xb255ea5e, 0xc4b4e5c3, 0x041e28a6, 0x72ff273b,
+    0xa9da4647, 0xdf3b49da, 0x45b36fea, 0x33526077, 0xe877010b,
+    0x9e960e96, 0x5e3cc3f3, 0x28ddcc6e, 0xf3f8ad12, 0x8519a28f,
+    0x73ad36d9, 0x054c3944, 0xde695838, 0xa88857a5, 0x68229ac0,
+    0x1ec3955d, 0xc5e6f421, 0xb307fbbc, 0xe2ef7383, 0x940e7c1e,
+    0x4f2b1d62, 0x39ca12ff, 0xf960df9a, 0x8f81d007, 0x54a4b17b,
+    0x2245bee6, 0xd4f12ab0, 0xa210252d, 0x79354451, 0x0fd44bcc,
+    0xcf7e86a9, 0xb99f8934, 0x62bae848, 0x145be7d5, 0x8ed3c1e5,
+    0xf832ce78, 0x2317af04, 0x55f6a099, 0x955c6dfc, 0xe3bd6261,
+    0x3898031d, 0x4e790c80, 0xb8cd98d6, 0xce2c974b, 0x1509f637,
+    0x63e8f9aa, 0xa34234cf, 0xd5a33b52, 0x0e865a2e, 0x786755b3,
+    0x3a97174e, 0x4c7618d3, 0x975379af, 0xe1b27632, 0x2118bb57,
+    0x57f9b4ca, 0x8cdcd5b6, 0xfa3dda2b, 0x0c894e7d, 0x7a6841e0,
+    0xa14d209c, 0xd7ac2f01, 0x1706e264, 0x61e7edf9, 0xbac28c85,
+    0xcc238318, 0x56aba528, 0x204aaab5, 0xfb6fcbc9, 0x8d8ec454,
+    0x4d240931, 0x3bc506ac, 0xe0e067d0, 0x9601684d, 0x60b5fc1b,
+    0x1654f386, 0xcd7192fa, 0xbb909d67, 0x7b3a5002, 0x0ddb5f9f,
+    0xd6fe3ee3, 0xa01f317e, 0x1318cac2, 0x65f9c55f, 0xbedca423,
+    0xc83dabbe, 0x089766db, 0x7e766946, 0xa553083a, 0xd3b207a7,
+    0x250693f1, 0x53e79c6c, 0x88c2fd10, 0xfe23f28d, 0x3e893fe8,
+    0x48683075, 0x934d5109, 0xe5ac5e94, 0x7f2478a4, 0x09c57739,
+    0xd2e01645, 0xa40119d8, 0x64abd4bd, 0x124adb20, 0xc96fba5c,
+    0xbf8eb5c1, 0x493a2197, 0x3fdb2e0a, 0xe4fe4f76, 0x921f40eb,
+    0x52b58d8e, 0x24548213, 0xff71e36f, 0x8990ecf2, 0xcb60ae0f,
+    0xbd81a192, 0x66a4c0ee, 0x1045cf73, 0xd0ef0216, 0xa60e0d8b,
+    0x7d2b6cf7, 0x0bca636a, 0xfd7ef73c, 0x8b9ff8a1, 0x50ba99dd,
+    0x265b9640, 0xe6f15b25, 0x901054b8, 0x4b3535c4, 0x3dd43a59,
+    0xa75c1c69, 0xd1bd13f4, 0x0a987288, 0x7c797d15, 0xbcd3b070,
+    0xca32bfed, 0x1117de91, 0x67f6d10c, 0x9142455a, 0xe7a34ac7,
+    0x3c862bbb, 0x4a672426, 0x8acde943, 0xfc2ce6de, 0x270987a2,
+    0x51e8883f},
+   {0x00000000, 0xe8dbfbb9, 0x91b186a8, 0x796a7d11, 0x63657c8a,
+    0x8bbe8733, 0xf2d4fa22, 0x1a0f019b, 0x87cc89cf, 0x6f177276,
+    0x167d0f67, 0xfea6f4de, 0xe4a9f545, 0x0c720efc, 0x751873ed,
+    0x9dc38854, 0x4f9f6244, 0xa74499fd, 0xde2ee4ec, 0x36f51f55,
+    0x2cfa1ece, 0xc421e577, 0xbd4b9866, 0x559063df, 0xc853eb8b,
+    0x20881032, 0x59e26d23, 0xb139969a, 0xab369701, 0x43ed6cb8,
+    0x3a8711a9, 0xd25cea10, 0x9e3ec588, 0x76e53e31, 0x0f8f4320,
+    0xe754b899, 0xfd5bb902, 0x158042bb, 0x6cea3faa, 0x8431c413,
+    0x19f24c47, 0xf129b7fe, 0x8843caef, 0x60983156, 0x7a9730cd,
+    0x924ccb74, 0xeb26b665, 0x03fd4ddc, 0xd1a1a7cc, 0x397a5c75,
+    0x40102164, 0xa8cbdadd, 0xb2c4db46, 0x5a1f20ff, 0x23755dee,
+    0xcbaea657, 0x566d2e03, 0xbeb6d5ba, 0xc7dca8ab, 0x2f075312,
+    0x35085289, 0xddd3a930, 0xa4b9d421, 0x4c622f98, 0x7d7bfbca,
+    0x95a00073, 0xecca7d62, 0x041186db, 0x1e1e8740, 0xf6c57cf9,
+    0x8faf01e8, 0x6774fa51, 0xfab77205, 0x126c89bc, 0x6b06f4ad,
+    0x83dd0f14, 0x99d20e8f, 0x7109f536, 0x08638827, 0xe0b8739e,
+    0x32e4998e, 0xda3f6237, 0xa3551f26, 0x4b8ee49f, 0x5181e504,
+    0xb95a1ebd, 0xc03063ac, 0x28eb9815, 0xb5281041, 0x5df3ebf8,
+    0x249996e9, 0xcc426d50, 0xd64d6ccb, 0x3e969772, 0x47fcea63,
+    0xaf2711da, 0xe3453e42, 0x0b9ec5fb, 0x72f4b8ea, 0x9a2f4353,
+    0x802042c8, 0x68fbb971, 0x1191c460, 0xf94a3fd9, 0x6489b78d,
+    0x8c524c34, 0xf5383125, 0x1de3ca9c, 0x07eccb07, 0xef3730be,
+    0x965d4daf, 0x7e86b616, 0xacda5c06, 0x4401a7bf, 0x3d6bdaae,
+    0xd5b02117, 0xcfbf208c, 0x2764db35, 0x5e0ea624, 0xb6d55d9d,
+    0x2b16d5c9, 0xc3cd2e70, 0xbaa75361, 0x527ca8d8, 0x4873a943,
+    0xa0a852fa, 0xd9c22feb, 0x3119d452, 0xbbf0874e, 0x532b7cf7,
+    0x2a4101e6, 0xc29afa5f, 0xd895fbc4, 0x304e007d, 0x49247d6c,
+    0xa1ff86d5, 0x3c3c0e81, 0xd4e7f538, 0xad8d8829, 0x45567390,
+    0x5f59720b, 0xb78289b2, 0xcee8f4a3, 0x26330f1a, 0xf46fe50a,
+    0x1cb41eb3, 0x65de63a2, 0x8d05981b, 0x970a9980, 0x7fd16239,
+    0x06bb1f28, 0xee60e491, 0x73a36cc5, 0x9b78977c, 0xe212ea6d,
+    0x0ac911d4, 0x10c6104f, 0xf81debf6, 0x817796e7, 0x69ac6d5e,
+    0x25ce42c6, 0xcd15b97f, 0xb47fc46e, 0x5ca43fd7, 0x46ab3e4c,
+    0xae70c5f5, 0xd71ab8e4, 0x3fc1435d, 0xa202cb09, 0x4ad930b0,
+    0x33b34da1, 0xdb68b618, 0xc167b783, 0x29bc4c3a, 0x50d6312b,
+    0xb80dca92, 0x6a512082, 0x828adb3b, 0xfbe0a62a, 0x133b5d93,
+    0x09345c08, 0xe1efa7b1, 0x9885daa0, 0x705e2119, 0xed9da94d,
+    0x054652f4, 0x7c2c2fe5, 0x94f7d45c, 0x8ef8d5c7, 0x66232e7e,
+    0x1f49536f, 0xf792a8d6, 0xc68b7c84, 0x2e50873d, 0x573afa2c,
+    0xbfe10195, 0xa5ee000e, 0x4d35fbb7, 0x345f86a6, 0xdc847d1f,
+    0x4147f54b, 0xa99c0ef2, 0xd0f673e3, 0x382d885a, 0x222289c1,
+    0xcaf97278, 0xb3930f69, 0x5b48f4d0, 0x89141ec0, 0x61cfe579,
+    0x18a59868, 0xf07e63d1, 0xea71624a, 0x02aa99f3, 0x7bc0e4e2,
+    0x931b1f5b, 0x0ed8970f, 0xe6036cb6, 0x9f6911a7, 0x77b2ea1e,
+    0x6dbdeb85, 0x8566103c, 0xfc0c6d2d, 0x14d79694, 0x58b5b90c,
+    0xb06e42b5, 0xc9043fa4, 0x21dfc41d, 0x3bd0c586, 0xd30b3e3f,
+    0xaa61432e, 0x42bab897, 0xdf7930c3, 0x37a2cb7a, 0x4ec8b66b,
+    0xa6134dd2, 0xbc1c4c49, 0x54c7b7f0, 0x2dadcae1, 0xc5763158,
+    0x172adb48, 0xfff120f1, 0x869b5de0, 0x6e40a659, 0x744fa7c2,
+    0x9c945c7b, 0xe5fe216a, 0x0d25dad3, 0x90e65287, 0x783da93e,
+    0x0157d42f, 0xe98c2f96, 0xf3832e0d, 0x1b58d5b4, 0x6232a8a5,
+    0x8ae9531c},
+   {0x00000000, 0x919168ae, 0x6325a087, 0xf2b4c829, 0x874c31d4,
+    0x16dd597a, 0xe4699153, 0x75f8f9fd, 0x4f9f1373, 0xde0e7bdd,
+    0x2cbab3f4, 0xbd2bdb5a, 0xc8d322a7, 0x59424a09, 0xabf68220,
+    0x3a67ea8e, 0x9e3e27e6, 0x0faf4f48, 0xfd1b8761, 0x6c8aefcf,
+    0x19721632, 0x88e37e9c, 0x7a57b6b5, 0xebc6de1b, 0xd1a13495,
+    0x40305c3b, 0xb2849412, 0x2315fcbc, 0x56ed0541, 0xc77c6def,
+    0x35c8a5c6, 0xa459cd68, 0x7d7b3f17, 0xecea57b9, 0x1e5e9f90,
+    0x8fcff73e, 0xfa370ec3, 0x6ba6666d, 0x9912ae44, 0x0883c6ea,
+    0x32e42c64, 0xa37544ca, 0x51c18ce3, 0xc050e44d, 0xb5a81db0,
+    0x2439751e, 0xd68dbd37, 0x471cd599, 0xe34518f1, 0x72d4705f,
+    0x8060b876, 0x11f1d0d8, 0x64092925, 0xf598418b, 0x072c89a2,
+    0x96bde10c, 0xacda0b82, 0x3d4b632c, 0xcfffab05, 0x5e6ec3ab,
+    0x2b963a56, 0xba0752f8, 0x48b39ad1, 0xd922f27f, 0xfaf67e2e,
+    0x6b671680, 0x99d3dea9, 0x0842b607, 0x7dba4ffa, 0xec2b2754,
+    0x1e9fef7d, 0x8f0e87d3, 0xb5696d5d, 0x24f805f3, 0xd64ccdda,
+    0x47dda574, 0x32255c89, 0xa3b43427, 0x5100fc0e, 0xc09194a0,
+    0x64c859c8, 0xf5593166, 0x07edf94f, 0x967c91e1, 0xe384681c,
+    0x721500b2, 0x80a1c89b, 0x1130a035, 0x2b574abb, 0xbac62215,
+    0x4872ea3c, 0xd9e38292, 0xac1b7b6f, 0x3d8a13c1, 0xcf3edbe8,
+    0x5eafb346, 0x878d4139, 0x161c2997, 0xe4a8e1be, 0x75398910,
+    0x00c170ed, 0x91501843, 0x63e4d06a, 0xf275b8c4, 0xc812524a,
+    0x59833ae4, 0xab37f2cd, 0x3aa69a63, 0x4f5e639e, 0xdecf0b30,
+    0x2c7bc319, 0xbdeaabb7, 0x19b366df, 0x88220e71, 0x7a96c658,
+    0xeb07aef6, 0x9eff570b, 0x0f6e3fa5, 0xfddaf78c, 0x6c4b9f22,
+    0x562c75ac, 0xc7bd1d02, 0x3509d52b, 0xa498bd85, 0xd1604478,
+    0x40f12cd6, 0xb245e4ff, 0x23d48c51, 0xf4edfd5c, 0x657c95f2,
+    0x97c85ddb, 0x06593575, 0x73a1cc88, 0xe230a426, 0x10846c0f,
+    0x811504a1, 0xbb72ee2f, 0x2ae38681, 0xd8574ea8, 0x49c62606,
+    0x3c3edffb, 0xadafb755, 0x5f1b7f7c, 0xce8a17d2, 0x6ad3daba,
+    0xfb42b214, 0x09f67a3d, 0x98671293, 0xed9feb6e, 0x7c0e83c0,
+    0x8eba4be9, 0x1f2b2347, 0x254cc9c9, 0xb4dda167, 0x4669694e,
+    0xd7f801e0, 0xa200f81d, 0x339190b3, 0xc125589a, 0x50b43034,
+    0x8996c24b, 0x1807aae5, 0xeab362cc, 0x7b220a62, 0x0edaf39f,
+    0x9f4b9b31, 0x6dff5318, 0xfc6e3bb6, 0xc609d138, 0x5798b996,
+    0xa52c71bf, 0x34bd1911, 0x4145e0ec, 0xd0d48842, 0x2260406b,
+    0xb3f128c5, 0x17a8e5ad, 0x86398d03, 0x748d452a, 0xe51c2d84,
+    0x90e4d479, 0x0175bcd7, 0xf3c174fe, 0x62501c50, 0x5837f6de,
+    0xc9a69e70, 0x3b125659, 0xaa833ef7, 0xdf7bc70a, 0x4eeaafa4,
+    0xbc5e678d, 0x2dcf0f23, 0x0e1b8372, 0x9f8aebdc, 0x6d3e23f5,
+    0xfcaf4b5b, 0x8957b2a6, 0x18c6da08, 0xea721221, 0x7be37a8f,
+    0x41849001, 0xd015f8af, 0x22a13086, 0xb3305828, 0xc6c8a1d5,
+    0x5759c97b, 0xa5ed0152, 0x347c69fc, 0x9025a494, 0x01b4cc3a,
+    0xf3000413, 0x62916cbd, 0x17699540, 0x86f8fdee, 0x744c35c7,
+    0xe5dd5d69, 0xdfbab7e7, 0x4e2bdf49, 0xbc9f1760, 0x2d0e7fce,
+    0x58f68633, 0xc967ee9d, 0x3bd326b4, 0xaa424e1a, 0x7360bc65,
+    0xe2f1d4cb, 0x10451ce2, 0x81d4744c, 0xf42c8db1, 0x65bde51f,
+    0x97092d36, 0x06984598, 0x3cffaf16, 0xad6ec7b8, 0x5fda0f91,
+    0xce4b673f, 0xbbb39ec2, 0x2a22f66c, 0xd8963e45, 0x490756eb,
+    0xed5e9b83, 0x7ccff32d, 0x8e7b3b04, 0x1fea53aa, 0x6a12aa57,
+    0xfb83c2f9, 0x09370ad0, 0x98a6627e, 0xa2c188f0, 0x3350e05e,
+    0xc1e42877, 0x507540d9, 0x258db924, 0xb41cd18a, 0x46a819a3,
+    0xd739710d}};
+
+#endif
+
+#endif
+
+#if N == 5
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xaf449247, 0x85f822cf, 0x2abcb088, 0xd08143df,
+    0x7fc5d198, 0x55796110, 0xfa3df357, 0x7a7381ff, 0xd53713b8,
+    0xff8ba330, 0x50cf3177, 0xaaf2c220, 0x05b65067, 0x2f0ae0ef,
+    0x804e72a8, 0xf4e703fe, 0x5ba391b9, 0x711f2131, 0xde5bb376,
+    0x24664021, 0x8b22d266, 0xa19e62ee, 0x0edaf0a9, 0x8e948201,
+    0x21d01046, 0x0b6ca0ce, 0xa4283289, 0x5e15c1de, 0xf1515399,
+    0xdbede311, 0x74a97156, 0x32bf01bd, 0x9dfb93fa, 0xb7472372,
+    0x1803b135, 0xe23e4262, 0x4d7ad025, 0x67c660ad, 0xc882f2ea,
+    0x48cc8042, 0xe7881205, 0xcd34a28d, 0x627030ca, 0x984dc39d,
+    0x370951da, 0x1db5e152, 0xb2f17315, 0xc6580243, 0x691c9004,
+    0x43a0208c, 0xece4b2cb, 0x16d9419c, 0xb99dd3db, 0x93216353,
+    0x3c65f114, 0xbc2b83bc, 0x136f11fb, 0x39d3a173, 0x96973334,
+    0x6caac063, 0xc3ee5224, 0xe952e2ac, 0x461670eb, 0x657e037a,
+    0xca3a913d, 0xe08621b5, 0x4fc2b3f2, 0xb5ff40a5, 0x1abbd2e2,
+    0x3007626a, 0x9f43f02d, 0x1f0d8285, 0xb04910c2, 0x9af5a04a,
+    0x35b1320d, 0xcf8cc15a, 0x60c8531d, 0x4a74e395, 0xe53071d2,
+    0x91990084, 0x3edd92c3, 0x1461224b, 0xbb25b00c, 0x4118435b,
+    0xee5cd11c, 0xc4e06194, 0x6ba4f3d3, 0xebea817b, 0x44ae133c,
+    0x6e12a3b4, 0xc15631f3, 0x3b6bc2a4, 0x942f50e3, 0xbe93e06b,
+    0x11d7722c, 0x57c102c7, 0xf8859080, 0xd2392008, 0x7d7db24f,
+    0x87404118, 0x2804d35f, 0x02b863d7, 0xadfcf190, 0x2db28338,
+    0x82f6117f, 0xa84aa1f7, 0x070e33b0, 0xfd33c0e7, 0x527752a0,
+    0x78cbe228, 0xd78f706f, 0xa3260139, 0x0c62937e, 0x26de23f6,
+    0x899ab1b1, 0x73a742e6, 0xdce3d0a1, 0xf65f6029, 0x591bf26e,
+    0xd95580c6, 0x76111281, 0x5cada209, 0xf3e9304e, 0x09d4c319,
+    0xa690515e, 0x8c2ce1d6, 0x23687391, 0xcafc06f4, 0x65b894b3,
+    0x4f04243b, 0xe040b67c, 0x1a7d452b, 0xb539d76c, 0x9f8567e4,
+    0x30c1f5a3, 0xb08f870b, 0x1fcb154c, 0x3577a5c4, 0x9a333783,
+    0x600ec4d4, 0xcf4a5693, 0xe5f6e61b, 0x4ab2745c, 0x3e1b050a,
+    0x915f974d, 0xbbe327c5, 0x14a7b582, 0xee9a46d5, 0x41ded492,
+    0x6b62641a, 0xc426f65d, 0x446884f5, 0xeb2c16b2, 0xc190a63a,
+    0x6ed4347d, 0x94e9c72a, 0x3bad556d, 0x1111e5e5, 0xbe5577a2,
+    0xf8430749, 0x5707950e, 0x7dbb2586, 0xd2ffb7c1, 0x28c24496,
+    0x8786d6d1, 0xad3a6659, 0x027ef41e, 0x823086b6, 0x2d7414f1,
+    0x07c8a479, 0xa88c363e, 0x52b1c569, 0xfdf5572e, 0xd749e7a6,
+    0x780d75e1, 0x0ca404b7, 0xa3e096f0, 0x895c2678, 0x2618b43f,
+    0xdc254768, 0x7361d52f, 0x59dd65a7, 0xf699f7e0, 0x76d78548,
+    0xd993170f, 0xf32fa787, 0x5c6b35c0, 0xa656c697, 0x091254d0,
+    0x23aee458, 0x8cea761f, 0xaf82058e, 0x00c697c9, 0x2a7a2741,
+    0x853eb506, 0x7f034651, 0xd047d416, 0xfafb649e, 0x55bff6d9,
+    0xd5f18471, 0x7ab51636, 0x5009a6be, 0xff4d34f9, 0x0570c7ae,
+    0xaa3455e9, 0x8088e561, 0x2fcc7726, 0x5b650670, 0xf4219437,
+    0xde9d24bf, 0x71d9b6f8, 0x8be445af, 0x24a0d7e8, 0x0e1c6760,
+    0xa158f527, 0x2116878f, 0x8e5215c8, 0xa4eea540, 0x0baa3707,
+    0xf197c450, 0x5ed35617, 0x746fe69f, 0xdb2b74d8, 0x9d3d0433,
+    0x32799674, 0x18c526fc, 0xb781b4bb, 0x4dbc47ec, 0xe2f8d5ab,
+    0xc8446523, 0x6700f764, 0xe74e85cc, 0x480a178b, 0x62b6a703,
+    0xcdf23544, 0x37cfc613, 0x988b5454, 0xb237e4dc, 0x1d73769b,
+    0x69da07cd, 0xc69e958a, 0xec222502, 0x4366b745, 0xb95b4412,
+    0x161fd655, 0x3ca366dd, 0x93e7f49a, 0x13a98632, 0xbced1475,
+    0x9651a4fd, 0x391536ba, 0xc328c5ed, 0x6c6c57aa, 0x46d0e722,
+    0xe9947565},
+   {0x00000000, 0x4e890ba9, 0x9d121752, 0xd39b1cfb, 0xe15528e5,
+    0xafdc234c, 0x7c473fb7, 0x32ce341e, 0x19db578b, 0x57525c22,
+    0x84c940d9, 0xca404b70, 0xf88e7f6e, 0xb60774c7, 0x659c683c,
+    0x2b156395, 0x33b6af16, 0x7d3fa4bf, 0xaea4b844, 0xe02db3ed,
+    0xd2e387f3, 0x9c6a8c5a, 0x4ff190a1, 0x01789b08, 0x2a6df89d,
+    0x64e4f334, 0xb77fefcf, 0xf9f6e466, 0xcb38d078, 0x85b1dbd1,
+    0x562ac72a, 0x18a3cc83, 0x676d5e2c, 0x29e45585, 0xfa7f497e,
+    0xb4f642d7, 0x863876c9, 0xc8b17d60, 0x1b2a619b, 0x55a36a32,
+    0x7eb609a7, 0x303f020e, 0xe3a41ef5, 0xad2d155c, 0x9fe32142,
+    0xd16a2aeb, 0x02f13610, 0x4c783db9, 0x54dbf13a, 0x1a52fa93,
+    0xc9c9e668, 0x8740edc1, 0xb58ed9df, 0xfb07d276, 0x289cce8d,
+    0x6615c524, 0x4d00a6b1, 0x0389ad18, 0xd012b1e3, 0x9e9bba4a,
+    0xac558e54, 0xe2dc85fd, 0x31479906, 0x7fce92af, 0xcedabc58,
+    0x8053b7f1, 0x53c8ab0a, 0x1d41a0a3, 0x2f8f94bd, 0x61069f14,
+    0xb29d83ef, 0xfc148846, 0xd701ebd3, 0x9988e07a, 0x4a13fc81,
+    0x049af728, 0x3654c336, 0x78ddc89f, 0xab46d464, 0xe5cfdfcd,
+    0xfd6c134e, 0xb3e518e7, 0x607e041c, 0x2ef70fb5, 0x1c393bab,
+    0x52b03002, 0x812b2cf9, 0xcfa22750, 0xe4b744c5, 0xaa3e4f6c,
+    0x79a55397, 0x372c583e, 0x05e26c20, 0x4b6b6789, 0x98f07b72,
+    0xd67970db, 0xa9b7e274, 0xe73ee9dd, 0x34a5f526, 0x7a2cfe8f,
+    0x48e2ca91, 0x066bc138, 0xd5f0ddc3, 0x9b79d66a, 0xb06cb5ff,
+    0xfee5be56, 0x2d7ea2ad, 0x63f7a904, 0x51399d1a, 0x1fb096b3,
+    0xcc2b8a48, 0x82a281e1, 0x9a014d62, 0xd48846cb, 0x07135a30,
+    0x499a5199, 0x7b546587, 0x35dd6e2e, 0xe64672d5, 0xa8cf797c,
+    0x83da1ae9, 0xcd531140, 0x1ec80dbb, 0x50410612, 0x628f320c,
+    0x2c0639a5, 0xff9d255e, 0xb1142ef7, 0x46c47ef1, 0x084d7558,
+    0xdbd669a3, 0x955f620a, 0xa7915614, 0xe9185dbd, 0x3a834146,
+    0x740a4aef, 0x5f1f297a, 0x119622d3, 0xc20d3e28, 0x8c843581,
+    0xbe4a019f, 0xf0c30a36, 0x235816cd, 0x6dd11d64, 0x7572d1e7,
+    0x3bfbda4e, 0xe860c6b5, 0xa6e9cd1c, 0x9427f902, 0xdaaef2ab,
+    0x0935ee50, 0x47bce5f9, 0x6ca9866c, 0x22208dc5, 0xf1bb913e,
+    0xbf329a97, 0x8dfcae89, 0xc375a520, 0x10eeb9db, 0x5e67b272,
+    0x21a920dd, 0x6f202b74, 0xbcbb378f, 0xf2323c26, 0xc0fc0838,
+    0x8e750391, 0x5dee1f6a, 0x136714c3, 0x38727756, 0x76fb7cff,
+    0xa5606004, 0xebe96bad, 0xd9275fb3, 0x97ae541a, 0x443548e1,
+    0x0abc4348, 0x121f8fcb, 0x5c968462, 0x8f0d9899, 0xc1849330,
+    0xf34aa72e, 0xbdc3ac87, 0x6e58b07c, 0x20d1bbd5, 0x0bc4d840,
+    0x454dd3e9, 0x96d6cf12, 0xd85fc4bb, 0xea91f0a5, 0xa418fb0c,
+    0x7783e7f7, 0x390aec5e, 0x881ec2a9, 0xc697c900, 0x150cd5fb,
+    0x5b85de52, 0x694bea4c, 0x27c2e1e5, 0xf459fd1e, 0xbad0f6b7,
+    0x91c59522, 0xdf4c9e8b, 0x0cd78270, 0x425e89d9, 0x7090bdc7,
+    0x3e19b66e, 0xed82aa95, 0xa30ba13c, 0xbba86dbf, 0xf5216616,
+    0x26ba7aed, 0x68337144, 0x5afd455a, 0x14744ef3, 0xc7ef5208,
+    0x896659a1, 0xa2733a34, 0xecfa319d, 0x3f612d66, 0x71e826cf,
+    0x432612d1, 0x0daf1978, 0xde340583, 0x90bd0e2a, 0xef739c85,
+    0xa1fa972c, 0x72618bd7, 0x3ce8807e, 0x0e26b460, 0x40afbfc9,
+    0x9334a332, 0xddbda89b, 0xf6a8cb0e, 0xb821c0a7, 0x6bbadc5c,
+    0x2533d7f5, 0x17fde3eb, 0x5974e842, 0x8aeff4b9, 0xc466ff10,
+    0xdcc53393, 0x924c383a, 0x41d724c1, 0x0f5e2f68, 0x3d901b76,
+    0x731910df, 0xa0820c24, 0xee0b078d, 0xc51e6418, 0x8b976fb1,
+    0x580c734a, 0x168578e3, 0x244b4cfd, 0x6ac24754, 0xb9595baf,
+    0xf7d05006},
+   {0x00000000, 0x8d88fde2, 0xc060fd85, 0x4de80067, 0x5bb0fd4b,
+    0xd63800a9, 0x9bd000ce, 0x1658fd2c, 0xb761fa96, 0x3ae90774,
+    0x77010713, 0xfa89faf1, 0xecd107dd, 0x6159fa3f, 0x2cb1fa58,
+    0xa13907ba, 0xb5b2f36d, 0x383a0e8f, 0x75d20ee8, 0xf85af30a,
+    0xee020e26, 0x638af3c4, 0x2e62f3a3, 0xa3ea0e41, 0x02d309fb,
+    0x8f5bf419, 0xc2b3f47e, 0x4f3b099c, 0x5963f4b0, 0xd4eb0952,
+    0x99030935, 0x148bf4d7, 0xb014e09b, 0x3d9c1d79, 0x70741d1e,
+    0xfdfce0fc, 0xeba41dd0, 0x662ce032, 0x2bc4e055, 0xa64c1db7,
+    0x07751a0d, 0x8afde7ef, 0xc715e788, 0x4a9d1a6a, 0x5cc5e746,
+    0xd14d1aa4, 0x9ca51ac3, 0x112de721, 0x05a613f6, 0x882eee14,
+    0xc5c6ee73, 0x484e1391, 0x5e16eebd, 0xd39e135f, 0x9e761338,
+    0x13feeeda, 0xb2c7e960, 0x3f4f1482, 0x72a714e5, 0xff2fe907,
+    0xe977142b, 0x64ffe9c9, 0x2917e9ae, 0xa49f144c, 0xbb58c777,
+    0x36d03a95, 0x7b383af2, 0xf6b0c710, 0xe0e83a3c, 0x6d60c7de,
+    0x2088c7b9, 0xad003a5b, 0x0c393de1, 0x81b1c003, 0xcc59c064,
+    0x41d13d86, 0x5789c0aa, 0xda013d48, 0x97e93d2f, 0x1a61c0cd,
+    0x0eea341a, 0x8362c9f8, 0xce8ac99f, 0x4302347d, 0x555ac951,
+    0xd8d234b3, 0x953a34d4, 0x18b2c936, 0xb98bce8c, 0x3403336e,
+    0x79eb3309, 0xf463ceeb, 0xe23b33c7, 0x6fb3ce25, 0x225bce42,
+    0xafd333a0, 0x0b4c27ec, 0x86c4da0e, 0xcb2cda69, 0x46a4278b,
+    0x50fcdaa7, 0xdd742745, 0x909c2722, 0x1d14dac0, 0xbc2ddd7a,
+    0x31a52098, 0x7c4d20ff, 0xf1c5dd1d, 0xe79d2031, 0x6a15ddd3,
+    0x27fdddb4, 0xaa752056, 0xbefed481, 0x33762963, 0x7e9e2904,
+    0xf316d4e6, 0xe54e29ca, 0x68c6d428, 0x252ed44f, 0xa8a629ad,
+    0x099f2e17, 0x8417d3f5, 0xc9ffd392, 0x44772e70, 0x522fd35c,
+    0xdfa72ebe, 0x924f2ed9, 0x1fc7d33b, 0xadc088af, 0x2048754d,
+    0x6da0752a, 0xe02888c8, 0xf67075e4, 0x7bf88806, 0x36108861,
+    0xbb987583, 0x1aa17239, 0x97298fdb, 0xdac18fbc, 0x5749725e,
+    0x41118f72, 0xcc997290, 0x817172f7, 0x0cf98f15, 0x18727bc2,
+    0x95fa8620, 0xd8128647, 0x559a7ba5, 0x43c28689, 0xce4a7b6b,
+    0x83a27b0c, 0x0e2a86ee, 0xaf138154, 0x229b7cb6, 0x6f737cd1,
+    0xe2fb8133, 0xf4a37c1f, 0x792b81fd, 0x34c3819a, 0xb94b7c78,
+    0x1dd46834, 0x905c95d6, 0xddb495b1, 0x503c6853, 0x4664957f,
+    0xcbec689d, 0x860468fa, 0x0b8c9518, 0xaab592a2, 0x273d6f40,
+    0x6ad56f27, 0xe75d92c5, 0xf1056fe9, 0x7c8d920b, 0x3165926c,
+    0xbced6f8e, 0xa8669b59, 0x25ee66bb, 0x680666dc, 0xe58e9b3e,
+    0xf3d66612, 0x7e5e9bf0, 0x33b69b97, 0xbe3e6675, 0x1f0761cf,
+    0x928f9c2d, 0xdf679c4a, 0x52ef61a8, 0x44b79c84, 0xc93f6166,
+    0x84d76101, 0x095f9ce3, 0x16984fd8, 0x9b10b23a, 0xd6f8b25d,
+    0x5b704fbf, 0x4d28b293, 0xc0a04f71, 0x8d484f16, 0x00c0b2f4,
+    0xa1f9b54e, 0x2c7148ac, 0x619948cb, 0xec11b529, 0xfa494805,
+    0x77c1b5e7, 0x3a29b580, 0xb7a14862, 0xa32abcb5, 0x2ea24157,
+    0x634a4130, 0xeec2bcd2, 0xf89a41fe, 0x7512bc1c, 0x38fabc7b,
+    0xb5724199, 0x144b4623, 0x99c3bbc1, 0xd42bbba6, 0x59a34644,
+    0x4ffbbb68, 0xc273468a, 0x8f9b46ed, 0x0213bb0f, 0xa68caf43,
+    0x2b0452a1, 0x66ec52c6, 0xeb64af24, 0xfd3c5208, 0x70b4afea,
+    0x3d5caf8d, 0xb0d4526f, 0x11ed55d5, 0x9c65a837, 0xd18da850,
+    0x5c0555b2, 0x4a5da89e, 0xc7d5557c, 0x8a3d551b, 0x07b5a8f9,
+    0x133e5c2e, 0x9eb6a1cc, 0xd35ea1ab, 0x5ed65c49, 0x488ea165,
+    0xc5065c87, 0x88ee5ce0, 0x0566a102, 0xa45fa6b8, 0x29d75b5a,
+    0x643f5b3d, 0xe9b7a6df, 0xffef5bf3, 0x7267a611, 0x3f8fa676,
+    0xb2075b94},
+   {0x00000000, 0x80f0171f, 0xda91287f, 0x5a613f60, 0x6e5356bf,
+    0xeea341a0, 0xb4c27ec0, 0x343269df, 0xdca6ad7e, 0x5c56ba61,
+    0x06378501, 0x86c7921e, 0xb2f5fbc1, 0x3205ecde, 0x6864d3be,
+    0xe894c4a1, 0x623c5cbd, 0xe2cc4ba2, 0xb8ad74c2, 0x385d63dd,
+    0x0c6f0a02, 0x8c9f1d1d, 0xd6fe227d, 0x560e3562, 0xbe9af1c3,
+    0x3e6ae6dc, 0x640bd9bc, 0xe4fbcea3, 0xd0c9a77c, 0x5039b063,
+    0x0a588f03, 0x8aa8981c, 0xc478b97a, 0x4488ae65, 0x1ee99105,
+    0x9e19861a, 0xaa2befc5, 0x2adbf8da, 0x70bac7ba, 0xf04ad0a5,
+    0x18de1404, 0x982e031b, 0xc24f3c7b, 0x42bf2b64, 0x768d42bb,
+    0xf67d55a4, 0xac1c6ac4, 0x2cec7ddb, 0xa644e5c7, 0x26b4f2d8,
+    0x7cd5cdb8, 0xfc25daa7, 0xc817b378, 0x48e7a467, 0x12869b07,
+    0x92768c18, 0x7ae248b9, 0xfa125fa6, 0xa07360c6, 0x208377d9,
+    0x14b11e06, 0x94410919, 0xce203679, 0x4ed02166, 0x538074b5,
+    0xd37063aa, 0x89115cca, 0x09e14bd5, 0x3dd3220a, 0xbd233515,
+    0xe7420a75, 0x67b21d6a, 0x8f26d9cb, 0x0fd6ced4, 0x55b7f1b4,
+    0xd547e6ab, 0xe1758f74, 0x6185986b, 0x3be4a70b, 0xbb14b014,
+    0x31bc2808, 0xb14c3f17, 0xeb2d0077, 0x6bdd1768, 0x5fef7eb7,
+    0xdf1f69a8, 0x857e56c8, 0x058e41d7, 0xed1a8576, 0x6dea9269,
+    0x378bad09, 0xb77bba16, 0x8349d3c9, 0x03b9c4d6, 0x59d8fbb6,
+    0xd928eca9, 0x97f8cdcf, 0x1708dad0, 0x4d69e5b0, 0xcd99f2af,
+    0xf9ab9b70, 0x795b8c6f, 0x233ab30f, 0xa3caa410, 0x4b5e60b1,
+    0xcbae77ae, 0x91cf48ce, 0x113f5fd1, 0x250d360e, 0xa5fd2111,
+    0xff9c1e71, 0x7f6c096e, 0xf5c49172, 0x7534866d, 0x2f55b90d,
+    0xafa5ae12, 0x9b97c7cd, 0x1b67d0d2, 0x4106efb2, 0xc1f6f8ad,
+    0x29623c0c, 0xa9922b13, 0xf3f31473, 0x7303036c, 0x47316ab3,
+    0xc7c17dac, 0x9da042cc, 0x1d5055d3, 0xa700e96a, 0x27f0fe75,
+    0x7d91c115, 0xfd61d60a, 0xc953bfd5, 0x49a3a8ca, 0x13c297aa,
+    0x933280b5, 0x7ba64414, 0xfb56530b, 0xa1376c6b, 0x21c77b74,
+    0x15f512ab, 0x950505b4, 0xcf643ad4, 0x4f942dcb, 0xc53cb5d7,
+    0x45cca2c8, 0x1fad9da8, 0x9f5d8ab7, 0xab6fe368, 0x2b9ff477,
+    0x71fecb17, 0xf10edc08, 0x199a18a9, 0x996a0fb6, 0xc30b30d6,
+    0x43fb27c9, 0x77c94e16, 0xf7395909, 0xad586669, 0x2da87176,
+    0x63785010, 0xe388470f, 0xb9e9786f, 0x39196f70, 0x0d2b06af,
+    0x8ddb11b0, 0xd7ba2ed0, 0x574a39cf, 0xbfdefd6e, 0x3f2eea71,
+    0x654fd511, 0xe5bfc20e, 0xd18dabd1, 0x517dbcce, 0x0b1c83ae,
+    0x8bec94b1, 0x01440cad, 0x81b41bb2, 0xdbd524d2, 0x5b2533cd,
+    0x6f175a12, 0xefe74d0d, 0xb586726d, 0x35766572, 0xdde2a1d3,
+    0x5d12b6cc, 0x077389ac, 0x87839eb3, 0xb3b1f76c, 0x3341e073,
+    0x6920df13, 0xe9d0c80c, 0xf4809ddf, 0x74708ac0, 0x2e11b5a0,
+    0xaee1a2bf, 0x9ad3cb60, 0x1a23dc7f, 0x4042e31f, 0xc0b2f400,
+    0x282630a1, 0xa8d627be, 0xf2b718de, 0x72470fc1, 0x4675661e,
+    0xc6857101, 0x9ce44e61, 0x1c14597e, 0x96bcc162, 0x164cd67d,
+    0x4c2de91d, 0xccddfe02, 0xf8ef97dd, 0x781f80c2, 0x227ebfa2,
+    0xa28ea8bd, 0x4a1a6c1c, 0xcaea7b03, 0x908b4463, 0x107b537c,
+    0x24493aa3, 0xa4b92dbc, 0xfed812dc, 0x7e2805c3, 0x30f824a5,
+    0xb00833ba, 0xea690cda, 0x6a991bc5, 0x5eab721a, 0xde5b6505,
+    0x843a5a65, 0x04ca4d7a, 0xec5e89db, 0x6cae9ec4, 0x36cfa1a4,
+    0xb63fb6bb, 0x820ddf64, 0x02fdc87b, 0x589cf71b, 0xd86ce004,
+    0x52c47818, 0xd2346f07, 0x88555067, 0x08a54778, 0x3c972ea7,
+    0xbc6739b8, 0xe60606d8, 0x66f611c7, 0x8e62d566, 0x0e92c279,
+    0x54f3fd19, 0xd403ea06, 0xe03183d9, 0x60c194c6, 0x3aa0aba6,
+    0xba50bcb9},
+   {0x00000000, 0x9570d495, 0xf190af6b, 0x64e07bfe, 0x38505897,
+    0xad208c02, 0xc9c0f7fc, 0x5cb02369, 0x70a0b12e, 0xe5d065bb,
+    0x81301e45, 0x1440cad0, 0x48f0e9b9, 0xdd803d2c, 0xb96046d2,
+    0x2c109247, 0xe141625c, 0x7431b6c9, 0x10d1cd37, 0x85a119a2,
+    0xd9113acb, 0x4c61ee5e, 0x288195a0, 0xbdf14135, 0x91e1d372,
+    0x049107e7, 0x60717c19, 0xf501a88c, 0xa9b18be5, 0x3cc15f70,
+    0x5821248e, 0xcd51f01b, 0x19f3c2f9, 0x8c83166c, 0xe8636d92,
+    0x7d13b907, 0x21a39a6e, 0xb4d34efb, 0xd0333505, 0x4543e190,
+    0x695373d7, 0xfc23a742, 0x98c3dcbc, 0x0db30829, 0x51032b40,
+    0xc473ffd5, 0xa093842b, 0x35e350be, 0xf8b2a0a5, 0x6dc27430,
+    0x09220fce, 0x9c52db5b, 0xc0e2f832, 0x55922ca7, 0x31725759,
+    0xa40283cc, 0x8812118b, 0x1d62c51e, 0x7982bee0, 0xecf26a75,
+    0xb042491c, 0x25329d89, 0x41d2e677, 0xd4a232e2, 0x33e785f2,
+    0xa6975167, 0xc2772a99, 0x5707fe0c, 0x0bb7dd65, 0x9ec709f0,
+    0xfa27720e, 0x6f57a69b, 0x434734dc, 0xd637e049, 0xb2d79bb7,
+    0x27a74f22, 0x7b176c4b, 0xee67b8de, 0x8a87c320, 0x1ff717b5,
+    0xd2a6e7ae, 0x47d6333b, 0x233648c5, 0xb6469c50, 0xeaf6bf39,
+    0x7f866bac, 0x1b661052, 0x8e16c4c7, 0xa2065680, 0x37768215,
+    0x5396f9eb, 0xc6e62d7e, 0x9a560e17, 0x0f26da82, 0x6bc6a17c,
+    0xfeb675e9, 0x2a14470b, 0xbf64939e, 0xdb84e860, 0x4ef43cf5,
+    0x12441f9c, 0x8734cb09, 0xe3d4b0f7, 0x76a46462, 0x5ab4f625,
+    0xcfc422b0, 0xab24594e, 0x3e548ddb, 0x62e4aeb2, 0xf7947a27,
+    0x937401d9, 0x0604d54c, 0xcb552557, 0x5e25f1c2, 0x3ac58a3c,
+    0xafb55ea9, 0xf3057dc0, 0x6675a955, 0x0295d2ab, 0x97e5063e,
+    0xbbf59479, 0x2e8540ec, 0x4a653b12, 0xdf15ef87, 0x83a5ccee,
+    0x16d5187b, 0x72356385, 0xe745b710, 0x67cf0be4, 0xf2bfdf71,
+    0x965fa48f, 0x032f701a, 0x5f9f5373, 0xcaef87e6, 0xae0ffc18,
+    0x3b7f288d, 0x176fbaca, 0x821f6e5f, 0xe6ff15a1, 0x738fc134,
+    0x2f3fe25d, 0xba4f36c8, 0xdeaf4d36, 0x4bdf99a3, 0x868e69b8,
+    0x13febd2d, 0x771ec6d3, 0xe26e1246, 0xbede312f, 0x2baee5ba,
+    0x4f4e9e44, 0xda3e4ad1, 0xf62ed896, 0x635e0c03, 0x07be77fd,
+    0x92cea368, 0xce7e8001, 0x5b0e5494, 0x3fee2f6a, 0xaa9efbff,
+    0x7e3cc91d, 0xeb4c1d88, 0x8fac6676, 0x1adcb2e3, 0x466c918a,
+    0xd31c451f, 0xb7fc3ee1, 0x228cea74, 0x0e9c7833, 0x9becaca6,
+    0xff0cd758, 0x6a7c03cd, 0x36cc20a4, 0xa3bcf431, 0xc75c8fcf,
+    0x522c5b5a, 0x9f7dab41, 0x0a0d7fd4, 0x6eed042a, 0xfb9dd0bf,
+    0xa72df3d6, 0x325d2743, 0x56bd5cbd, 0xc3cd8828, 0xefdd1a6f,
+    0x7aadcefa, 0x1e4db504, 0x8b3d6191, 0xd78d42f8, 0x42fd966d,
+    0x261ded93, 0xb36d3906, 0x54288e16, 0xc1585a83, 0xa5b8217d,
+    0x30c8f5e8, 0x6c78d681, 0xf9080214, 0x9de879ea, 0x0898ad7f,
+    0x24883f38, 0xb1f8ebad, 0xd5189053, 0x406844c6, 0x1cd867af,
+    0x89a8b33a, 0xed48c8c4, 0x78381c51, 0xb569ec4a, 0x201938df,
+    0x44f94321, 0xd18997b4, 0x8d39b4dd, 0x18496048, 0x7ca91bb6,
+    0xe9d9cf23, 0xc5c95d64, 0x50b989f1, 0x3459f20f, 0xa129269a,
+    0xfd9905f3, 0x68e9d166, 0x0c09aa98, 0x99797e0d, 0x4ddb4cef,
+    0xd8ab987a, 0xbc4be384, 0x293b3711, 0x758b1478, 0xe0fbc0ed,
+    0x841bbb13, 0x116b6f86, 0x3d7bfdc1, 0xa80b2954, 0xcceb52aa,
+    0x599b863f, 0x052ba556, 0x905b71c3, 0xf4bb0a3d, 0x61cbdea8,
+    0xac9a2eb3, 0x39eafa26, 0x5d0a81d8, 0xc87a554d, 0x94ca7624,
+    0x01baa2b1, 0x655ad94f, 0xf02a0dda, 0xdc3a9f9d, 0x494a4b08,
+    0x2daa30f6, 0xb8dae463, 0xe46ac70a, 0x711a139f, 0x15fa6861,
+    0x808abcf4},
+   {0x00000000, 0xcf9e17c8, 0x444d29d1, 0x8bd33e19, 0x889a53a2,
+    0x4704446a, 0xccd77a73, 0x03496dbb, 0xca45a105, 0x05dbb6cd,
+    0x8e0888d4, 0x41969f1c, 0x42dff2a7, 0x8d41e56f, 0x0692db76,
+    0xc90cccbe, 0x4ffa444b, 0x80645383, 0x0bb76d9a, 0xc4297a52,
+    0xc76017e9, 0x08fe0021, 0x832d3e38, 0x4cb329f0, 0x85bfe54e,
+    0x4a21f286, 0xc1f2cc9f, 0x0e6cdb57, 0x0d25b6ec, 0xc2bba124,
+    0x49689f3d, 0x86f688f5, 0x9ff48896, 0x506a9f5e, 0xdbb9a147,
+    0x1427b68f, 0x176edb34, 0xd8f0ccfc, 0x5323f2e5, 0x9cbde52d,
+    0x55b12993, 0x9a2f3e5b, 0x11fc0042, 0xde62178a, 0xdd2b7a31,
+    0x12b56df9, 0x996653e0, 0x56f84428, 0xd00eccdd, 0x1f90db15,
+    0x9443e50c, 0x5bddf2c4, 0x58949f7f, 0x970a88b7, 0x1cd9b6ae,
+    0xd347a166, 0x1a4b6dd8, 0xd5d57a10, 0x5e064409, 0x919853c1,
+    0x92d13e7a, 0x5d4f29b2, 0xd69c17ab, 0x19020063, 0xe498176d,
+    0x2b0600a5, 0xa0d53ebc, 0x6f4b2974, 0x6c0244cf, 0xa39c5307,
+    0x284f6d1e, 0xe7d17ad6, 0x2eddb668, 0xe143a1a0, 0x6a909fb9,
+    0xa50e8871, 0xa647e5ca, 0x69d9f202, 0xe20acc1b, 0x2d94dbd3,
+    0xab625326, 0x64fc44ee, 0xef2f7af7, 0x20b16d3f, 0x23f80084,
+    0xec66174c, 0x67b52955, 0xa82b3e9d, 0x6127f223, 0xaeb9e5eb,
+    0x256adbf2, 0xeaf4cc3a, 0xe9bda181, 0x2623b649, 0xadf08850,
+    0x626e9f98, 0x7b6c9ffb, 0xb4f28833, 0x3f21b62a, 0xf0bfa1e2,
+    0xf3f6cc59, 0x3c68db91, 0xb7bbe588, 0x7825f240, 0xb1293efe,
+    0x7eb72936, 0xf564172f, 0x3afa00e7, 0x39b36d5c, 0xf62d7a94,
+    0x7dfe448d, 0xb2605345, 0x3496dbb0, 0xfb08cc78, 0x70dbf261,
+    0xbf45e5a9, 0xbc0c8812, 0x73929fda, 0xf841a1c3, 0x37dfb60b,
+    0xfed37ab5, 0x314d6d7d, 0xba9e5364, 0x750044ac, 0x76492917,
+    0xb9d73edf, 0x320400c6, 0xfd9a170e, 0x1241289b, 0xdddf3f53,
+    0x560c014a, 0x99921682, 0x9adb7b39, 0x55456cf1, 0xde9652e8,
+    0x11084520, 0xd804899e, 0x179a9e56, 0x9c49a04f, 0x53d7b787,
+    0x509eda3c, 0x9f00cdf4, 0x14d3f3ed, 0xdb4de425, 0x5dbb6cd0,
+    0x92257b18, 0x19f64501, 0xd66852c9, 0xd5213f72, 0x1abf28ba,
+    0x916c16a3, 0x5ef2016b, 0x97fecdd5, 0x5860da1d, 0xd3b3e404,
+    0x1c2df3cc, 0x1f649e77, 0xd0fa89bf, 0x5b29b7a6, 0x94b7a06e,
+    0x8db5a00d, 0x422bb7c5, 0xc9f889dc, 0x06669e14, 0x052ff3af,
+    0xcab1e467, 0x4162da7e, 0x8efccdb6, 0x47f00108, 0x886e16c0,
+    0x03bd28d9, 0xcc233f11, 0xcf6a52aa, 0x00f44562, 0x8b277b7b,
+    0x44b96cb3, 0xc24fe446, 0x0dd1f38e, 0x8602cd97, 0x499cda5f,
+    0x4ad5b7e4, 0x854ba02c, 0x0e989e35, 0xc10689fd, 0x080a4543,
+    0xc794528b, 0x4c476c92, 0x83d97b5a, 0x809016e1, 0x4f0e0129,
+    0xc4dd3f30, 0x0b4328f8, 0xf6d93ff6, 0x3947283e, 0xb2941627,
+    0x7d0a01ef, 0x7e436c54, 0xb1dd7b9c, 0x3a0e4585, 0xf590524d,
+    0x3c9c9ef3, 0xf302893b, 0x78d1b722, 0xb74fa0ea, 0xb406cd51,
+    0x7b98da99, 0xf04be480, 0x3fd5f348, 0xb9237bbd, 0x76bd6c75,
+    0xfd6e526c, 0x32f045a4, 0x31b9281f, 0xfe273fd7, 0x75f401ce,
+    0xba6a1606, 0x7366dab8, 0xbcf8cd70, 0x372bf369, 0xf8b5e4a1,
+    0xfbfc891a, 0x34629ed2, 0xbfb1a0cb, 0x702fb703, 0x692db760,
+    0xa6b3a0a8, 0x2d609eb1, 0xe2fe8979, 0xe1b7e4c2, 0x2e29f30a,
+    0xa5facd13, 0x6a64dadb, 0xa3681665, 0x6cf601ad, 0xe7253fb4,
+    0x28bb287c, 0x2bf245c7, 0xe46c520f, 0x6fbf6c16, 0xa0217bde,
+    0x26d7f32b, 0xe949e4e3, 0x629adafa, 0xad04cd32, 0xae4da089,
+    0x61d3b741, 0xea008958, 0x259e9e90, 0xec92522e, 0x230c45e6,
+    0xa8df7bff, 0x67416c37, 0x6408018c, 0xab961644, 0x2045285d,
+    0xefdb3f95},
+   {0x00000000, 0x24825136, 0x4904a26c, 0x6d86f35a, 0x920944d8,
+    0xb68b15ee, 0xdb0de6b4, 0xff8fb782, 0xff638ff1, 0xdbe1dec7,
+    0xb6672d9d, 0x92e57cab, 0x6d6acb29, 0x49e89a1f, 0x246e6945,
+    0x00ec3873, 0x25b619a3, 0x01344895, 0x6cb2bbcf, 0x4830eaf9,
+    0xb7bf5d7b, 0x933d0c4d, 0xfebbff17, 0xda39ae21, 0xdad59652,
+    0xfe57c764, 0x93d1343e, 0xb7536508, 0x48dcd28a, 0x6c5e83bc,
+    0x01d870e6, 0x255a21d0, 0x4b6c3346, 0x6fee6270, 0x0268912a,
+    0x26eac01c, 0xd965779e, 0xfde726a8, 0x9061d5f2, 0xb4e384c4,
+    0xb40fbcb7, 0x908ded81, 0xfd0b1edb, 0xd9894fed, 0x2606f86f,
+    0x0284a959, 0x6f025a03, 0x4b800b35, 0x6eda2ae5, 0x4a587bd3,
+    0x27de8889, 0x035cd9bf, 0xfcd36e3d, 0xd8513f0b, 0xb5d7cc51,
+    0x91559d67, 0x91b9a514, 0xb53bf422, 0xd8bd0778, 0xfc3f564e,
+    0x03b0e1cc, 0x2732b0fa, 0x4ab443a0, 0x6e361296, 0x96d8668c,
+    0xb25a37ba, 0xdfdcc4e0, 0xfb5e95d6, 0x04d12254, 0x20537362,
+    0x4dd58038, 0x6957d10e, 0x69bbe97d, 0x4d39b84b, 0x20bf4b11,
+    0x043d1a27, 0xfbb2ada5, 0xdf30fc93, 0xb2b60fc9, 0x96345eff,
+    0xb36e7f2f, 0x97ec2e19, 0xfa6add43, 0xdee88c75, 0x21673bf7,
+    0x05e56ac1, 0x6863999b, 0x4ce1c8ad, 0x4c0df0de, 0x688fa1e8,
+    0x050952b2, 0x218b0384, 0xde04b406, 0xfa86e530, 0x9700166a,
+    0xb382475c, 0xddb455ca, 0xf93604fc, 0x94b0f7a6, 0xb032a690,
+    0x4fbd1112, 0x6b3f4024, 0x06b9b37e, 0x223be248, 0x22d7da3b,
+    0x06558b0d, 0x6bd37857, 0x4f512961, 0xb0de9ee3, 0x945ccfd5,
+    0xf9da3c8f, 0xdd586db9, 0xf8024c69, 0xdc801d5f, 0xb106ee05,
+    0x9584bf33, 0x6a0b08b1, 0x4e895987, 0x230faadd, 0x078dfbeb,
+    0x0761c398, 0x23e392ae, 0x4e6561f4, 0x6ae730c2, 0x95688740,
+    0xb1ead676, 0xdc6c252c, 0xf8ee741a, 0xf6c1cb59, 0xd2439a6f,
+    0xbfc56935, 0x9b473803, 0x64c88f81, 0x404adeb7, 0x2dcc2ded,
+    0x094e7cdb, 0x09a244a8, 0x2d20159e, 0x40a6e6c4, 0x6424b7f2,
+    0x9bab0070, 0xbf295146, 0xd2afa21c, 0xf62df32a, 0xd377d2fa,
+    0xf7f583cc, 0x9a737096, 0xbef121a0, 0x417e9622, 0x65fcc714,
+    0x087a344e, 0x2cf86578, 0x2c145d0b, 0x08960c3d, 0x6510ff67,
+    0x4192ae51, 0xbe1d19d3, 0x9a9f48e5, 0xf719bbbf, 0xd39bea89,
+    0xbdadf81f, 0x992fa929, 0xf4a95a73, 0xd02b0b45, 0x2fa4bcc7,
+    0x0b26edf1, 0x66a01eab, 0x42224f9d, 0x42ce77ee, 0x664c26d8,
+    0x0bcad582, 0x2f4884b4, 0xd0c73336, 0xf4456200, 0x99c3915a,
+    0xbd41c06c, 0x981be1bc, 0xbc99b08a, 0xd11f43d0, 0xf59d12e6,
+    0x0a12a564, 0x2e90f452, 0x43160708, 0x6794563e, 0x67786e4d,
+    0x43fa3f7b, 0x2e7ccc21, 0x0afe9d17, 0xf5712a95, 0xd1f37ba3,
+    0xbc7588f9, 0x98f7d9cf, 0x6019add5, 0x449bfce3, 0x291d0fb9,
+    0x0d9f5e8f, 0xf210e90d, 0xd692b83b, 0xbb144b61, 0x9f961a57,
+    0x9f7a2224, 0xbbf87312, 0xd67e8048, 0xf2fcd17e, 0x0d7366fc,
+    0x29f137ca, 0x4477c490, 0x60f595a6, 0x45afb476, 0x612de540,
+    0x0cab161a, 0x2829472c, 0xd7a6f0ae, 0xf324a198, 0x9ea252c2,
+    0xba2003f4, 0xbacc3b87, 0x9e4e6ab1, 0xf3c899eb, 0xd74ac8dd,
+    0x28c57f5f, 0x0c472e69, 0x61c1dd33, 0x45438c05, 0x2b759e93,
+    0x0ff7cfa5, 0x62713cff, 0x46f36dc9, 0xb97cda4b, 0x9dfe8b7d,
+    0xf0787827, 0xd4fa2911, 0xd4161162, 0xf0944054, 0x9d12b30e,
+    0xb990e238, 0x461f55ba, 0x629d048c, 0x0f1bf7d6, 0x2b99a6e0,
+    0x0ec38730, 0x2a41d606, 0x47c7255c, 0x6345746a, 0x9ccac3e8,
+    0xb84892de, 0xd5ce6184, 0xf14c30b2, 0xf1a008c1, 0xd52259f7,
+    0xb8a4aaad, 0x9c26fb9b, 0x63a94c19, 0x472b1d2f, 0x2aadee75,
+    0x0e2fbf43},
+   {0x00000000, 0x36f290f3, 0x6de521e6, 0x5b17b115, 0xdbca43cc,
+    0xed38d33f, 0xb62f622a, 0x80ddf2d9, 0x6ce581d9, 0x5a17112a,
+    0x0100a03f, 0x37f230cc, 0xb72fc215, 0x81dd52e6, 0xdacae3f3,
+    0xec387300, 0xd9cb03b2, 0xef399341, 0xb42e2254, 0x82dcb2a7,
+    0x0201407e, 0x34f3d08d, 0x6fe46198, 0x5916f16b, 0xb52e826b,
+    0x83dc1298, 0xd8cba38d, 0xee39337e, 0x6ee4c1a7, 0x58165154,
+    0x0301e041, 0x35f370b2, 0x68e70125, 0x5e1591d6, 0x050220c3,
+    0x33f0b030, 0xb32d42e9, 0x85dfd21a, 0xdec8630f, 0xe83af3fc,
+    0x040280fc, 0x32f0100f, 0x69e7a11a, 0x5f1531e9, 0xdfc8c330,
+    0xe93a53c3, 0xb22de2d6, 0x84df7225, 0xb12c0297, 0x87de9264,
+    0xdcc92371, 0xea3bb382, 0x6ae6415b, 0x5c14d1a8, 0x070360bd,
+    0x31f1f04e, 0xddc9834e, 0xeb3b13bd, 0xb02ca2a8, 0x86de325b,
+    0x0603c082, 0x30f15071, 0x6be6e164, 0x5d147197, 0xd1ce024a,
+    0xe73c92b9, 0xbc2b23ac, 0x8ad9b35f, 0x0a044186, 0x3cf6d175,
+    0x67e16060, 0x5113f093, 0xbd2b8393, 0x8bd91360, 0xd0cea275,
+    0xe63c3286, 0x66e1c05f, 0x501350ac, 0x0b04e1b9, 0x3df6714a,
+    0x080501f8, 0x3ef7910b, 0x65e0201e, 0x5312b0ed, 0xd3cf4234,
+    0xe53dd2c7, 0xbe2a63d2, 0x88d8f321, 0x64e08021, 0x521210d2,
+    0x0905a1c7, 0x3ff73134, 0xbf2ac3ed, 0x89d8531e, 0xd2cfe20b,
+    0xe43d72f8, 0xb929036f, 0x8fdb939c, 0xd4cc2289, 0xe23eb27a,
+    0x62e340a3, 0x5411d050, 0x0f066145, 0x39f4f1b6, 0xd5cc82b6,
+    0xe33e1245, 0xb829a350, 0x8edb33a3, 0x0e06c17a, 0x38f45189,
+    0x63e3e09c, 0x5511706f, 0x60e200dd, 0x5610902e, 0x0d07213b,
+    0x3bf5b1c8, 0xbb284311, 0x8ddad3e2, 0xd6cd62f7, 0xe03ff204,
+    0x0c078104, 0x3af511f7, 0x61e2a0e2, 0x57103011, 0xd7cdc2c8,
+    0xe13f523b, 0xba28e32e, 0x8cda73dd, 0x78ed02d5, 0x4e1f9226,
+    0x15082333, 0x23fab3c0, 0xa3274119, 0x95d5d1ea, 0xcec260ff,
+    0xf830f00c, 0x1408830c, 0x22fa13ff, 0x79eda2ea, 0x4f1f3219,
+    0xcfc2c0c0, 0xf9305033, 0xa227e126, 0x94d571d5, 0xa1260167,
+    0x97d49194, 0xccc32081, 0xfa31b072, 0x7aec42ab, 0x4c1ed258,
+    0x1709634d, 0x21fbf3be, 0xcdc380be, 0xfb31104d, 0xa026a158,
+    0x96d431ab, 0x1609c372, 0x20fb5381, 0x7bece294, 0x4d1e7267,
+    0x100a03f0, 0x26f89303, 0x7def2216, 0x4b1db2e5, 0xcbc0403c,
+    0xfd32d0cf, 0xa62561da, 0x90d7f129, 0x7cef8229, 0x4a1d12da,
+    0x110aa3cf, 0x27f8333c, 0xa725c1e5, 0x91d75116, 0xcac0e003,
+    0xfc3270f0, 0xc9c10042, 0xff3390b1, 0xa42421a4, 0x92d6b157,
+    0x120b438e, 0x24f9d37d, 0x7fee6268, 0x491cf29b, 0xa524819b,
+    0x93d61168, 0xc8c1a07d, 0xfe33308e, 0x7eeec257, 0x481c52a4,
+    0x130be3b1, 0x25f97342, 0xa923009f, 0x9fd1906c, 0xc4c62179,
+    0xf234b18a, 0x72e94353, 0x441bd3a0, 0x1f0c62b5, 0x29fef246,
+    0xc5c68146, 0xf33411b5, 0xa823a0a0, 0x9ed13053, 0x1e0cc28a,
+    0x28fe5279, 0x73e9e36c, 0x451b739f, 0x70e8032d, 0x461a93de,
+    0x1d0d22cb, 0x2bffb238, 0xab2240e1, 0x9dd0d012, 0xc6c76107,
+    0xf035f1f4, 0x1c0d82f4, 0x2aff1207, 0x71e8a312, 0x471a33e1,
+    0xc7c7c138, 0xf13551cb, 0xaa22e0de, 0x9cd0702d, 0xc1c401ba,
+    0xf7369149, 0xac21205c, 0x9ad3b0af, 0x1a0e4276, 0x2cfcd285,
+    0x77eb6390, 0x4119f363, 0xad218063, 0x9bd31090, 0xc0c4a185,
+    0xf6363176, 0x76ebc3af, 0x4019535c, 0x1b0ee249, 0x2dfc72ba,
+    0x180f0208, 0x2efd92fb, 0x75ea23ee, 0x4318b31d, 0xc3c541c4,
+    0xf537d137, 0xae206022, 0x98d2f0d1, 0x74ea83d1, 0x42181322,
+    0x190fa237, 0x2ffd32c4, 0xaf20c01d, 0x99d250ee, 0xc2c5e1fb,
+    0xf4377108}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xf390f23600000000, 0xe621e56d00000000,
+    0x15b1175b00000000, 0xcc43cadb00000000, 0x3fd338ed00000000,
+    0x2a622fb600000000, 0xd9f2dd8000000000, 0xd981e56c00000000,
+    0x2a11175a00000000, 0x3fa0000100000000, 0xcc30f23700000000,
+    0x15c22fb700000000, 0xe652dd8100000000, 0xf3e3cada00000000,
+    0x007338ec00000000, 0xb203cbd900000000, 0x419339ef00000000,
+    0x54222eb400000000, 0xa7b2dc8200000000, 0x7e40010200000000,
+    0x8dd0f33400000000, 0x9861e46f00000000, 0x6bf1165900000000,
+    0x6b822eb500000000, 0x9812dc8300000000, 0x8da3cbd800000000,
+    0x7e3339ee00000000, 0xa7c1e46e00000000, 0x5451165800000000,
+    0x41e0010300000000, 0xb270f33500000000, 0x2501e76800000000,
+    0xd691155e00000000, 0xc320020500000000, 0x30b0f03300000000,
+    0xe9422db300000000, 0x1ad2df8500000000, 0x0f63c8de00000000,
+    0xfcf33ae800000000, 0xfc80020400000000, 0x0f10f03200000000,
+    0x1aa1e76900000000, 0xe931155f00000000, 0x30c3c8df00000000,
+    0xc3533ae900000000, 0xd6e22db200000000, 0x2572df8400000000,
+    0x97022cb100000000, 0x6492de8700000000, 0x7123c9dc00000000,
+    0x82b33bea00000000, 0x5b41e66a00000000, 0xa8d1145c00000000,
+    0xbd60030700000000, 0x4ef0f13100000000, 0x4e83c9dd00000000,
+    0xbd133beb00000000, 0xa8a22cb000000000, 0x5b32de8600000000,
+    0x82c0030600000000, 0x7150f13000000000, 0x64e1e66b00000000,
+    0x9771145d00000000, 0x4a02ced100000000, 0xb9923ce700000000,
+    0xac232bbc00000000, 0x5fb3d98a00000000, 0x8641040a00000000,
+    0x75d1f63c00000000, 0x6060e16700000000, 0x93f0135100000000,
+    0x93832bbd00000000, 0x6013d98b00000000, 0x75a2ced000000000,
+    0x86323ce600000000, 0x5fc0e16600000000, 0xac50135000000000,
+    0xb9e1040b00000000, 0x4a71f63d00000000, 0xf801050800000000,
+    0x0b91f73e00000000, 0x1e20e06500000000, 0xedb0125300000000,
+    0x3442cfd300000000, 0xc7d23de500000000, 0xd2632abe00000000,
+    0x21f3d88800000000, 0x2180e06400000000, 0xd210125200000000,
+    0xc7a1050900000000, 0x3431f73f00000000, 0xedc32abf00000000,
+    0x1e53d88900000000, 0x0be2cfd200000000, 0xf8723de400000000,
+    0x6f0329b900000000, 0x9c93db8f00000000, 0x8922ccd400000000,
+    0x7ab23ee200000000, 0xa340e36200000000, 0x50d0115400000000,
+    0x4561060f00000000, 0xb6f1f43900000000, 0xb682ccd500000000,
+    0x45123ee300000000, 0x50a329b800000000, 0xa333db8e00000000,
+    0x7ac1060e00000000, 0x8951f43800000000, 0x9ce0e36300000000,
+    0x6f70115500000000, 0xdd00e26000000000, 0x2e90105600000000,
+    0x3b21070d00000000, 0xc8b1f53b00000000, 0x114328bb00000000,
+    0xe2d3da8d00000000, 0xf762cdd600000000, 0x04f23fe000000000,
+    0x0481070c00000000, 0xf711f53a00000000, 0xe2a0e26100000000,
+    0x1130105700000000, 0xc8c2cdd700000000, 0x3b523fe100000000,
+    0x2ee328ba00000000, 0xdd73da8c00000000, 0xd502ed7800000000,
+    0x26921f4e00000000, 0x3323081500000000, 0xc0b3fa2300000000,
+    0x194127a300000000, 0xead1d59500000000, 0xff60c2ce00000000,
+    0x0cf030f800000000, 0x0c83081400000000, 0xff13fa2200000000,
+    0xeaa2ed7900000000, 0x19321f4f00000000, 0xc0c0c2cf00000000,
+    0x335030f900000000, 0x26e127a200000000, 0xd571d59400000000,
+    0x670126a100000000, 0x9491d49700000000, 0x8120c3cc00000000,
+    0x72b031fa00000000, 0xab42ec7a00000000, 0x58d21e4c00000000,
+    0x4d63091700000000, 0xbef3fb2100000000, 0xbe80c3cd00000000,
+    0x4d1031fb00000000, 0x58a126a000000000, 0xab31d49600000000,
+    0x72c3091600000000, 0x8153fb2000000000, 0x94e2ec7b00000000,
+    0x67721e4d00000000, 0xf0030a1000000000, 0x0393f82600000000,
+    0x1622ef7d00000000, 0xe5b21d4b00000000, 0x3c40c0cb00000000,
+    0xcfd032fd00000000, 0xda6125a600000000, 0x29f1d79000000000,
+    0x2982ef7c00000000, 0xda121d4a00000000, 0xcfa30a1100000000,
+    0x3c33f82700000000, 0xe5c125a700000000, 0x1651d79100000000,
+    0x03e0c0ca00000000, 0xf07032fc00000000, 0x4200c1c900000000,
+    0xb19033ff00000000, 0xa42124a400000000, 0x57b1d69200000000,
+    0x8e430b1200000000, 0x7dd3f92400000000, 0x6862ee7f00000000,
+    0x9bf21c4900000000, 0x9b8124a500000000, 0x6811d69300000000,
+    0x7da0c1c800000000, 0x8e3033fe00000000, 0x57c2ee7e00000000,
+    0xa4521c4800000000, 0xb1e30b1300000000, 0x4273f92500000000,
+    0x9f0023a900000000, 0x6c90d19f00000000, 0x7921c6c400000000,
+    0x8ab134f200000000, 0x5343e97200000000, 0xa0d31b4400000000,
+    0xb5620c1f00000000, 0x46f2fe2900000000, 0x4681c6c500000000,
+    0xb51134f300000000, 0xa0a023a800000000, 0x5330d19e00000000,
+    0x8ac20c1e00000000, 0x7952fe2800000000, 0x6ce3e97300000000,
+    0x9f731b4500000000, 0x2d03e87000000000, 0xde931a4600000000,
+    0xcb220d1d00000000, 0x38b2ff2b00000000, 0xe14022ab00000000,
+    0x12d0d09d00000000, 0x0761c7c600000000, 0xf4f135f000000000,
+    0xf4820d1c00000000, 0x0712ff2a00000000, 0x12a3e87100000000,
+    0xe1331a4700000000, 0x38c1c7c700000000, 0xcb5135f100000000,
+    0xdee022aa00000000, 0x2d70d09c00000000, 0xba01c4c100000000,
+    0x499136f700000000, 0x5c2021ac00000000, 0xafb0d39a00000000,
+    0x76420e1a00000000, 0x85d2fc2c00000000, 0x9063eb7700000000,
+    0x63f3194100000000, 0x638021ad00000000, 0x9010d39b00000000,
+    0x85a1c4c000000000, 0x763136f600000000, 0xafc3eb7600000000,
+    0x5c53194000000000, 0x49e20e1b00000000, 0xba72fc2d00000000,
+    0x08020f1800000000, 0xfb92fd2e00000000, 0xee23ea7500000000,
+    0x1db3184300000000, 0xc441c5c300000000, 0x37d137f500000000,
+    0x226020ae00000000, 0xd1f0d29800000000, 0xd183ea7400000000,
+    0x2213184200000000, 0x37a20f1900000000, 0xc432fd2f00000000,
+    0x1dc020af00000000, 0xee50d29900000000, 0xfbe1c5c200000000,
+    0x087137f400000000},
+   {0x0000000000000000, 0x3651822400000000, 0x6ca2044900000000,
+    0x5af3866d00000000, 0xd844099200000000, 0xee158bb600000000,
+    0xb4e60ddb00000000, 0x82b78fff00000000, 0xf18f63ff00000000,
+    0xc7dee1db00000000, 0x9d2d67b600000000, 0xab7ce59200000000,
+    0x29cb6a6d00000000, 0x1f9ae84900000000, 0x45696e2400000000,
+    0x7338ec0000000000, 0xa319b62500000000, 0x9548340100000000,
+    0xcfbbb26c00000000, 0xf9ea304800000000, 0x7b5dbfb700000000,
+    0x4d0c3d9300000000, 0x17ffbbfe00000000, 0x21ae39da00000000,
+    0x5296d5da00000000, 0x64c757fe00000000, 0x3e34d19300000000,
+    0x086553b700000000, 0x8ad2dc4800000000, 0xbc835e6c00000000,
+    0xe670d80100000000, 0xd0215a2500000000, 0x46336c4b00000000,
+    0x7062ee6f00000000, 0x2a91680200000000, 0x1cc0ea2600000000,
+    0x9e7765d900000000, 0xa826e7fd00000000, 0xf2d5619000000000,
+    0xc484e3b400000000, 0xb7bc0fb400000000, 0x81ed8d9000000000,
+    0xdb1e0bfd00000000, 0xed4f89d900000000, 0x6ff8062600000000,
+    0x59a9840200000000, 0x035a026f00000000, 0x350b804b00000000,
+    0xe52ada6e00000000, 0xd37b584a00000000, 0x8988de2700000000,
+    0xbfd95c0300000000, 0x3d6ed3fc00000000, 0x0b3f51d800000000,
+    0x51ccd7b500000000, 0x679d559100000000, 0x14a5b99100000000,
+    0x22f43bb500000000, 0x7807bdd800000000, 0x4e563ffc00000000,
+    0xcce1b00300000000, 0xfab0322700000000, 0xa043b44a00000000,
+    0x9612366e00000000, 0x8c66d89600000000, 0xba375ab200000000,
+    0xe0c4dcdf00000000, 0xd6955efb00000000, 0x5422d10400000000,
+    0x6273532000000000, 0x3880d54d00000000, 0x0ed1576900000000,
+    0x7de9bb6900000000, 0x4bb8394d00000000, 0x114bbf2000000000,
+    0x271a3d0400000000, 0xa5adb2fb00000000, 0x93fc30df00000000,
+    0xc90fb6b200000000, 0xff5e349600000000, 0x2f7f6eb300000000,
+    0x192eec9700000000, 0x43dd6afa00000000, 0x758ce8de00000000,
+    0xf73b672100000000, 0xc16ae50500000000, 0x9b99636800000000,
+    0xadc8e14c00000000, 0xdef00d4c00000000, 0xe8a18f6800000000,
+    0xb252090500000000, 0x84038b2100000000, 0x06b404de00000000,
+    0x30e586fa00000000, 0x6a16009700000000, 0x5c4782b300000000,
+    0xca55b4dd00000000, 0xfc0436f900000000, 0xa6f7b09400000000,
+    0x90a632b000000000, 0x1211bd4f00000000, 0x24403f6b00000000,
+    0x7eb3b90600000000, 0x48e23b2200000000, 0x3bdad72200000000,
+    0x0d8b550600000000, 0x5778d36b00000000, 0x6129514f00000000,
+    0xe39edeb000000000, 0xd5cf5c9400000000, 0x8f3cdaf900000000,
+    0xb96d58dd00000000, 0x694c02f800000000, 0x5f1d80dc00000000,
+    0x05ee06b100000000, 0x33bf849500000000, 0xb1080b6a00000000,
+    0x8759894e00000000, 0xddaa0f2300000000, 0xebfb8d0700000000,
+    0x98c3610700000000, 0xae92e32300000000, 0xf461654e00000000,
+    0xc230e76a00000000, 0x4087689500000000, 0x76d6eab100000000,
+    0x2c256cdc00000000, 0x1a74eef800000000, 0x59cbc1f600000000,
+    0x6f9a43d200000000, 0x3569c5bf00000000, 0x0338479b00000000,
+    0x818fc86400000000, 0xb7de4a4000000000, 0xed2dcc2d00000000,
+    0xdb7c4e0900000000, 0xa844a20900000000, 0x9e15202d00000000,
+    0xc4e6a64000000000, 0xf2b7246400000000, 0x7000ab9b00000000,
+    0x465129bf00000000, 0x1ca2afd200000000, 0x2af32df600000000,
+    0xfad277d300000000, 0xcc83f5f700000000, 0x9670739a00000000,
+    0xa021f1be00000000, 0x22967e4100000000, 0x14c7fc6500000000,
+    0x4e347a0800000000, 0x7865f82c00000000, 0x0b5d142c00000000,
+    0x3d0c960800000000, 0x67ff106500000000, 0x51ae924100000000,
+    0xd3191dbe00000000, 0xe5489f9a00000000, 0xbfbb19f700000000,
+    0x89ea9bd300000000, 0x1ff8adbd00000000, 0x29a92f9900000000,
+    0x735aa9f400000000, 0x450b2bd000000000, 0xc7bca42f00000000,
+    0xf1ed260b00000000, 0xab1ea06600000000, 0x9d4f224200000000,
+    0xee77ce4200000000, 0xd8264c6600000000, 0x82d5ca0b00000000,
+    0xb484482f00000000, 0x3633c7d000000000, 0x006245f400000000,
+    0x5a91c39900000000, 0x6cc041bd00000000, 0xbce11b9800000000,
+    0x8ab099bc00000000, 0xd0431fd100000000, 0xe6129df500000000,
+    0x64a5120a00000000, 0x52f4902e00000000, 0x0807164300000000,
+    0x3e56946700000000, 0x4d6e786700000000, 0x7b3ffa4300000000,
+    0x21cc7c2e00000000, 0x179dfe0a00000000, 0x952a71f500000000,
+    0xa37bf3d100000000, 0xf98875bc00000000, 0xcfd9f79800000000,
+    0xd5ad196000000000, 0xe3fc9b4400000000, 0xb90f1d2900000000,
+    0x8f5e9f0d00000000, 0x0de910f200000000, 0x3bb892d600000000,
+    0x614b14bb00000000, 0x571a969f00000000, 0x24227a9f00000000,
+    0x1273f8bb00000000, 0x48807ed600000000, 0x7ed1fcf200000000,
+    0xfc66730d00000000, 0xca37f12900000000, 0x90c4774400000000,
+    0xa695f56000000000, 0x76b4af4500000000, 0x40e52d6100000000,
+    0x1a16ab0c00000000, 0x2c47292800000000, 0xaef0a6d700000000,
+    0x98a124f300000000, 0xc252a29e00000000, 0xf40320ba00000000,
+    0x873bccba00000000, 0xb16a4e9e00000000, 0xeb99c8f300000000,
+    0xddc84ad700000000, 0x5f7fc52800000000, 0x692e470c00000000,
+    0x33ddc16100000000, 0x058c434500000000, 0x939e752b00000000,
+    0xa5cff70f00000000, 0xff3c716200000000, 0xc96df34600000000,
+    0x4bda7cb900000000, 0x7d8bfe9d00000000, 0x277878f000000000,
+    0x1129fad400000000, 0x621116d400000000, 0x544094f000000000,
+    0x0eb3129d00000000, 0x38e290b900000000, 0xba551f4600000000,
+    0x8c049d6200000000, 0xd6f71b0f00000000, 0xe0a6992b00000000,
+    0x3087c30e00000000, 0x06d6412a00000000, 0x5c25c74700000000,
+    0x6a74456300000000, 0xe8c3ca9c00000000, 0xde9248b800000000,
+    0x8461ced500000000, 0xb2304cf100000000, 0xc108a0f100000000,
+    0xf75922d500000000, 0xadaaa4b800000000, 0x9bfb269c00000000,
+    0x194ca96300000000, 0x2f1d2b4700000000, 0x75eead2a00000000,
+    0x43bf2f0e00000000},
+   {0x0000000000000000, 0xc8179ecf00000000, 0xd1294d4400000000,
+    0x193ed38b00000000, 0xa2539a8800000000, 0x6a44044700000000,
+    0x737ad7cc00000000, 0xbb6d490300000000, 0x05a145ca00000000,
+    0xcdb6db0500000000, 0xd488088e00000000, 0x1c9f964100000000,
+    0xa7f2df4200000000, 0x6fe5418d00000000, 0x76db920600000000,
+    0xbecc0cc900000000, 0x4b44fa4f00000000, 0x8353648000000000,
+    0x9a6db70b00000000, 0x527a29c400000000, 0xe91760c700000000,
+    0x2100fe0800000000, 0x383e2d8300000000, 0xf029b34c00000000,
+    0x4ee5bf8500000000, 0x86f2214a00000000, 0x9fccf2c100000000,
+    0x57db6c0e00000000, 0xecb6250d00000000, 0x24a1bbc200000000,
+    0x3d9f684900000000, 0xf588f68600000000, 0x9688f49f00000000,
+    0x5e9f6a5000000000, 0x47a1b9db00000000, 0x8fb6271400000000,
+    0x34db6e1700000000, 0xfcccf0d800000000, 0xe5f2235300000000,
+    0x2de5bd9c00000000, 0x9329b15500000000, 0x5b3e2f9a00000000,
+    0x4200fc1100000000, 0x8a1762de00000000, 0x317a2bdd00000000,
+    0xf96db51200000000, 0xe053669900000000, 0x2844f85600000000,
+    0xddcc0ed000000000, 0x15db901f00000000, 0x0ce5439400000000,
+    0xc4f2dd5b00000000, 0x7f9f945800000000, 0xb7880a9700000000,
+    0xaeb6d91c00000000, 0x66a147d300000000, 0xd86d4b1a00000000,
+    0x107ad5d500000000, 0x0944065e00000000, 0xc153989100000000,
+    0x7a3ed19200000000, 0xb2294f5d00000000, 0xab179cd600000000,
+    0x6300021900000000, 0x6d1798e400000000, 0xa500062b00000000,
+    0xbc3ed5a000000000, 0x74294b6f00000000, 0xcf44026c00000000,
+    0x07539ca300000000, 0x1e6d4f2800000000, 0xd67ad1e700000000,
+    0x68b6dd2e00000000, 0xa0a143e100000000, 0xb99f906a00000000,
+    0x71880ea500000000, 0xcae547a600000000, 0x02f2d96900000000,
+    0x1bcc0ae200000000, 0xd3db942d00000000, 0x265362ab00000000,
+    0xee44fc6400000000, 0xf77a2fef00000000, 0x3f6db12000000000,
+    0x8400f82300000000, 0x4c1766ec00000000, 0x5529b56700000000,
+    0x9d3e2ba800000000, 0x23f2276100000000, 0xebe5b9ae00000000,
+    0xf2db6a2500000000, 0x3accf4ea00000000, 0x81a1bde900000000,
+    0x49b6232600000000, 0x5088f0ad00000000, 0x989f6e6200000000,
+    0xfb9f6c7b00000000, 0x3388f2b400000000, 0x2ab6213f00000000,
+    0xe2a1bff000000000, 0x59ccf6f300000000, 0x91db683c00000000,
+    0x88e5bbb700000000, 0x40f2257800000000, 0xfe3e29b100000000,
+    0x3629b77e00000000, 0x2f1764f500000000, 0xe700fa3a00000000,
+    0x5c6db33900000000, 0x947a2df600000000, 0x8d44fe7d00000000,
+    0x455360b200000000, 0xb0db963400000000, 0x78cc08fb00000000,
+    0x61f2db7000000000, 0xa9e545bf00000000, 0x12880cbc00000000,
+    0xda9f927300000000, 0xc3a141f800000000, 0x0bb6df3700000000,
+    0xb57ad3fe00000000, 0x7d6d4d3100000000, 0x64539eba00000000,
+    0xac44007500000000, 0x1729497600000000, 0xdf3ed7b900000000,
+    0xc600043200000000, 0x0e179afd00000000, 0x9b28411200000000,
+    0x533fdfdd00000000, 0x4a010c5600000000, 0x8216929900000000,
+    0x397bdb9a00000000, 0xf16c455500000000, 0xe85296de00000000,
+    0x2045081100000000, 0x9e8904d800000000, 0x569e9a1700000000,
+    0x4fa0499c00000000, 0x87b7d75300000000, 0x3cda9e5000000000,
+    0xf4cd009f00000000, 0xedf3d31400000000, 0x25e44ddb00000000,
+    0xd06cbb5d00000000, 0x187b259200000000, 0x0145f61900000000,
+    0xc95268d600000000, 0x723f21d500000000, 0xba28bf1a00000000,
+    0xa3166c9100000000, 0x6b01f25e00000000, 0xd5cdfe9700000000,
+    0x1dda605800000000, 0x04e4b3d300000000, 0xccf32d1c00000000,
+    0x779e641f00000000, 0xbf89fad000000000, 0xa6b7295b00000000,
+    0x6ea0b79400000000, 0x0da0b58d00000000, 0xc5b72b4200000000,
+    0xdc89f8c900000000, 0x149e660600000000, 0xaff32f0500000000,
+    0x67e4b1ca00000000, 0x7eda624100000000, 0xb6cdfc8e00000000,
+    0x0801f04700000000, 0xc0166e8800000000, 0xd928bd0300000000,
+    0x113f23cc00000000, 0xaa526acf00000000, 0x6245f40000000000,
+    0x7b7b278b00000000, 0xb36cb94400000000, 0x46e44fc200000000,
+    0x8ef3d10d00000000, 0x97cd028600000000, 0x5fda9c4900000000,
+    0xe4b7d54a00000000, 0x2ca04b8500000000, 0x359e980e00000000,
+    0xfd8906c100000000, 0x43450a0800000000, 0x8b5294c700000000,
+    0x926c474c00000000, 0x5a7bd98300000000, 0xe116908000000000,
+    0x29010e4f00000000, 0x303fddc400000000, 0xf828430b00000000,
+    0xf63fd9f600000000, 0x3e28473900000000, 0x271694b200000000,
+    0xef010a7d00000000, 0x546c437e00000000, 0x9c7bddb100000000,
+    0x85450e3a00000000, 0x4d5290f500000000, 0xf39e9c3c00000000,
+    0x3b8902f300000000, 0x22b7d17800000000, 0xeaa04fb700000000,
+    0x51cd06b400000000, 0x99da987b00000000, 0x80e44bf000000000,
+    0x48f3d53f00000000, 0xbd7b23b900000000, 0x756cbd7600000000,
+    0x6c526efd00000000, 0xa445f03200000000, 0x1f28b93100000000,
+    0xd73f27fe00000000, 0xce01f47500000000, 0x06166aba00000000,
+    0xb8da667300000000, 0x70cdf8bc00000000, 0x69f32b3700000000,
+    0xa1e4b5f800000000, 0x1a89fcfb00000000, 0xd29e623400000000,
+    0xcba0b1bf00000000, 0x03b72f7000000000, 0x60b72d6900000000,
+    0xa8a0b3a600000000, 0xb19e602d00000000, 0x7989fee200000000,
+    0xc2e4b7e100000000, 0x0af3292e00000000, 0x13cdfaa500000000,
+    0xdbda646a00000000, 0x651668a300000000, 0xad01f66c00000000,
+    0xb43f25e700000000, 0x7c28bb2800000000, 0xc745f22b00000000,
+    0x0f526ce400000000, 0x166cbf6f00000000, 0xde7b21a000000000,
+    0x2bf3d72600000000, 0xe3e449e900000000, 0xfada9a6200000000,
+    0x32cd04ad00000000, 0x89a04dae00000000, 0x41b7d36100000000,
+    0x588900ea00000000, 0x909e9e2500000000, 0x2e5292ec00000000,
+    0xe6450c2300000000, 0xff7bdfa800000000, 0x376c416700000000,
+    0x8c01086400000000, 0x441696ab00000000, 0x5d28452000000000,
+    0x953fdbef00000000},
+   {0x0000000000000000, 0x95d4709500000000, 0x6baf90f100000000,
+    0xfe7be06400000000, 0x9758503800000000, 0x028c20ad00000000,
+    0xfcf7c0c900000000, 0x6923b05c00000000, 0x2eb1a07000000000,
+    0xbb65d0e500000000, 0x451e308100000000, 0xd0ca401400000000,
+    0xb9e9f04800000000, 0x2c3d80dd00000000, 0xd24660b900000000,
+    0x4792102c00000000, 0x5c6241e100000000, 0xc9b6317400000000,
+    0x37cdd11000000000, 0xa219a18500000000, 0xcb3a11d900000000,
+    0x5eee614c00000000, 0xa095812800000000, 0x3541f1bd00000000,
+    0x72d3e19100000000, 0xe707910400000000, 0x197c716000000000,
+    0x8ca801f500000000, 0xe58bb1a900000000, 0x705fc13c00000000,
+    0x8e24215800000000, 0x1bf051cd00000000, 0xf9c2f31900000000,
+    0x6c16838c00000000, 0x926d63e800000000, 0x07b9137d00000000,
+    0x6e9aa32100000000, 0xfb4ed3b400000000, 0x053533d000000000,
+    0x90e1434500000000, 0xd773536900000000, 0x42a723fc00000000,
+    0xbcdcc39800000000, 0x2908b30d00000000, 0x402b035100000000,
+    0xd5ff73c400000000, 0x2b8493a000000000, 0xbe50e33500000000,
+    0xa5a0b2f800000000, 0x3074c26d00000000, 0xce0f220900000000,
+    0x5bdb529c00000000, 0x32f8e2c000000000, 0xa72c925500000000,
+    0x5957723100000000, 0xcc8302a400000000, 0x8b11128800000000,
+    0x1ec5621d00000000, 0xe0be827900000000, 0x756af2ec00000000,
+    0x1c4942b000000000, 0x899d322500000000, 0x77e6d24100000000,
+    0xe232a2d400000000, 0xf285e73300000000, 0x675197a600000000,
+    0x992a77c200000000, 0x0cfe075700000000, 0x65ddb70b00000000,
+    0xf009c79e00000000, 0x0e7227fa00000000, 0x9ba6576f00000000,
+    0xdc34474300000000, 0x49e037d600000000, 0xb79bd7b200000000,
+    0x224fa72700000000, 0x4b6c177b00000000, 0xdeb867ee00000000,
+    0x20c3878a00000000, 0xb517f71f00000000, 0xaee7a6d200000000,
+    0x3b33d64700000000, 0xc548362300000000, 0x509c46b600000000,
+    0x39bff6ea00000000, 0xac6b867f00000000, 0x5210661b00000000,
+    0xc7c4168e00000000, 0x805606a200000000, 0x1582763700000000,
+    0xebf9965300000000, 0x7e2de6c600000000, 0x170e569a00000000,
+    0x82da260f00000000, 0x7ca1c66b00000000, 0xe975b6fe00000000,
+    0x0b47142a00000000, 0x9e9364bf00000000, 0x60e884db00000000,
+    0xf53cf44e00000000, 0x9c1f441200000000, 0x09cb348700000000,
+    0xf7b0d4e300000000, 0x6264a47600000000, 0x25f6b45a00000000,
+    0xb022c4cf00000000, 0x4e5924ab00000000, 0xdb8d543e00000000,
+    0xb2aee46200000000, 0x277a94f700000000, 0xd901749300000000,
+    0x4cd5040600000000, 0x572555cb00000000, 0xc2f1255e00000000,
+    0x3c8ac53a00000000, 0xa95eb5af00000000, 0xc07d05f300000000,
+    0x55a9756600000000, 0xabd2950200000000, 0x3e06e59700000000,
+    0x7994f5bb00000000, 0xec40852e00000000, 0x123b654a00000000,
+    0x87ef15df00000000, 0xeecca58300000000, 0x7b18d51600000000,
+    0x8563357200000000, 0x10b745e700000000, 0xe40bcf6700000000,
+    0x71dfbff200000000, 0x8fa45f9600000000, 0x1a702f0300000000,
+    0x73539f5f00000000, 0xe687efca00000000, 0x18fc0fae00000000,
+    0x8d287f3b00000000, 0xcaba6f1700000000, 0x5f6e1f8200000000,
+    0xa115ffe600000000, 0x34c18f7300000000, 0x5de23f2f00000000,
+    0xc8364fba00000000, 0x364dafde00000000, 0xa399df4b00000000,
+    0xb8698e8600000000, 0x2dbdfe1300000000, 0xd3c61e7700000000,
+    0x46126ee200000000, 0x2f31debe00000000, 0xbae5ae2b00000000,
+    0x449e4e4f00000000, 0xd14a3eda00000000, 0x96d82ef600000000,
+    0x030c5e6300000000, 0xfd77be0700000000, 0x68a3ce9200000000,
+    0x01807ece00000000, 0x94540e5b00000000, 0x6a2fee3f00000000,
+    0xfffb9eaa00000000, 0x1dc93c7e00000000, 0x881d4ceb00000000,
+    0x7666ac8f00000000, 0xe3b2dc1a00000000, 0x8a916c4600000000,
+    0x1f451cd300000000, 0xe13efcb700000000, 0x74ea8c2200000000,
+    0x33789c0e00000000, 0xa6acec9b00000000, 0x58d70cff00000000,
+    0xcd037c6a00000000, 0xa420cc3600000000, 0x31f4bca300000000,
+    0xcf8f5cc700000000, 0x5a5b2c5200000000, 0x41ab7d9f00000000,
+    0xd47f0d0a00000000, 0x2a04ed6e00000000, 0xbfd09dfb00000000,
+    0xd6f32da700000000, 0x43275d3200000000, 0xbd5cbd5600000000,
+    0x2888cdc300000000, 0x6f1addef00000000, 0xfacead7a00000000,
+    0x04b54d1e00000000, 0x91613d8b00000000, 0xf8428dd700000000,
+    0x6d96fd4200000000, 0x93ed1d2600000000, 0x06396db300000000,
+    0x168e285400000000, 0x835a58c100000000, 0x7d21b8a500000000,
+    0xe8f5c83000000000, 0x81d6786c00000000, 0x140208f900000000,
+    0xea79e89d00000000, 0x7fad980800000000, 0x383f882400000000,
+    0xadebf8b100000000, 0x539018d500000000, 0xc644684000000000,
+    0xaf67d81c00000000, 0x3ab3a88900000000, 0xc4c848ed00000000,
+    0x511c387800000000, 0x4aec69b500000000, 0xdf38192000000000,
+    0x2143f94400000000, 0xb49789d100000000, 0xddb4398d00000000,
+    0x4860491800000000, 0xb61ba97c00000000, 0x23cfd9e900000000,
+    0x645dc9c500000000, 0xf189b95000000000, 0x0ff2593400000000,
+    0x9a2629a100000000, 0xf30599fd00000000, 0x66d1e96800000000,
+    0x98aa090c00000000, 0x0d7e799900000000, 0xef4cdb4d00000000,
+    0x7a98abd800000000, 0x84e34bbc00000000, 0x11373b2900000000,
+    0x78148b7500000000, 0xedc0fbe000000000, 0x13bb1b8400000000,
+    0x866f6b1100000000, 0xc1fd7b3d00000000, 0x54290ba800000000,
+    0xaa52ebcc00000000, 0x3f869b5900000000, 0x56a52b0500000000,
+    0xc3715b9000000000, 0x3d0abbf400000000, 0xa8decb6100000000,
+    0xb32e9aac00000000, 0x26faea3900000000, 0xd8810a5d00000000,
+    0x4d557ac800000000, 0x2476ca9400000000, 0xb1a2ba0100000000,
+    0x4fd95a6500000000, 0xda0d2af000000000, 0x9d9f3adc00000000,
+    0x084b4a4900000000, 0xf630aa2d00000000, 0x63e4dab800000000,
+    0x0ac76ae400000000, 0x9f131a7100000000, 0x6168fa1500000000,
+    0xf4bc8a8000000000},
+   {0x0000000000000000, 0x1f17f08000000000, 0x7f2891da00000000,
+    0x603f615a00000000, 0xbf56536e00000000, 0xa041a3ee00000000,
+    0xc07ec2b400000000, 0xdf69323400000000, 0x7eada6dc00000000,
+    0x61ba565c00000000, 0x0185370600000000, 0x1e92c78600000000,
+    0xc1fbf5b200000000, 0xdeec053200000000, 0xbed3646800000000,
+    0xa1c494e800000000, 0xbd5c3c6200000000, 0xa24bcce200000000,
+    0xc274adb800000000, 0xdd635d3800000000, 0x020a6f0c00000000,
+    0x1d1d9f8c00000000, 0x7d22fed600000000, 0x62350e5600000000,
+    0xc3f19abe00000000, 0xdce66a3e00000000, 0xbcd90b6400000000,
+    0xa3cefbe400000000, 0x7ca7c9d000000000, 0x63b0395000000000,
+    0x038f580a00000000, 0x1c98a88a00000000, 0x7ab978c400000000,
+    0x65ae884400000000, 0x0591e91e00000000, 0x1a86199e00000000,
+    0xc5ef2baa00000000, 0xdaf8db2a00000000, 0xbac7ba7000000000,
+    0xa5d04af000000000, 0x0414de1800000000, 0x1b032e9800000000,
+    0x7b3c4fc200000000, 0x642bbf4200000000, 0xbb428d7600000000,
+    0xa4557df600000000, 0xc46a1cac00000000, 0xdb7dec2c00000000,
+    0xc7e544a600000000, 0xd8f2b42600000000, 0xb8cdd57c00000000,
+    0xa7da25fc00000000, 0x78b317c800000000, 0x67a4e74800000000,
+    0x079b861200000000, 0x188c769200000000, 0xb948e27a00000000,
+    0xa65f12fa00000000, 0xc66073a000000000, 0xd977832000000000,
+    0x061eb11400000000, 0x1909419400000000, 0x793620ce00000000,
+    0x6621d04e00000000, 0xb574805300000000, 0xaa6370d300000000,
+    0xca5c118900000000, 0xd54be10900000000, 0x0a22d33d00000000,
+    0x153523bd00000000, 0x750a42e700000000, 0x6a1db26700000000,
+    0xcbd9268f00000000, 0xd4ced60f00000000, 0xb4f1b75500000000,
+    0xabe647d500000000, 0x748f75e100000000, 0x6b98856100000000,
+    0x0ba7e43b00000000, 0x14b014bb00000000, 0x0828bc3100000000,
+    0x173f4cb100000000, 0x77002deb00000000, 0x6817dd6b00000000,
+    0xb77eef5f00000000, 0xa8691fdf00000000, 0xc8567e8500000000,
+    0xd7418e0500000000, 0x76851aed00000000, 0x6992ea6d00000000,
+    0x09ad8b3700000000, 0x16ba7bb700000000, 0xc9d3498300000000,
+    0xd6c4b90300000000, 0xb6fbd85900000000, 0xa9ec28d900000000,
+    0xcfcdf89700000000, 0xd0da081700000000, 0xb0e5694d00000000,
+    0xaff299cd00000000, 0x709babf900000000, 0x6f8c5b7900000000,
+    0x0fb33a2300000000, 0x10a4caa300000000, 0xb1605e4b00000000,
+    0xae77aecb00000000, 0xce48cf9100000000, 0xd15f3f1100000000,
+    0x0e360d2500000000, 0x1121fda500000000, 0x711e9cff00000000,
+    0x6e096c7f00000000, 0x7291c4f500000000, 0x6d86347500000000,
+    0x0db9552f00000000, 0x12aea5af00000000, 0xcdc7979b00000000,
+    0xd2d0671b00000000, 0xb2ef064100000000, 0xadf8f6c100000000,
+    0x0c3c622900000000, 0x132b92a900000000, 0x7314f3f300000000,
+    0x6c03037300000000, 0xb36a314700000000, 0xac7dc1c700000000,
+    0xcc42a09d00000000, 0xd355501d00000000, 0x6ae900a700000000,
+    0x75fef02700000000, 0x15c1917d00000000, 0x0ad661fd00000000,
+    0xd5bf53c900000000, 0xcaa8a34900000000, 0xaa97c21300000000,
+    0xb580329300000000, 0x1444a67b00000000, 0x0b5356fb00000000,
+    0x6b6c37a100000000, 0x747bc72100000000, 0xab12f51500000000,
+    0xb405059500000000, 0xd43a64cf00000000, 0xcb2d944f00000000,
+    0xd7b53cc500000000, 0xc8a2cc4500000000, 0xa89dad1f00000000,
+    0xb78a5d9f00000000, 0x68e36fab00000000, 0x77f49f2b00000000,
+    0x17cbfe7100000000, 0x08dc0ef100000000, 0xa9189a1900000000,
+    0xb60f6a9900000000, 0xd6300bc300000000, 0xc927fb4300000000,
+    0x164ec97700000000, 0x095939f700000000, 0x696658ad00000000,
+    0x7671a82d00000000, 0x1050786300000000, 0x0f4788e300000000,
+    0x6f78e9b900000000, 0x706f193900000000, 0xaf062b0d00000000,
+    0xb011db8d00000000, 0xd02ebad700000000, 0xcf394a5700000000,
+    0x6efddebf00000000, 0x71ea2e3f00000000, 0x11d54f6500000000,
+    0x0ec2bfe500000000, 0xd1ab8dd100000000, 0xcebc7d5100000000,
+    0xae831c0b00000000, 0xb194ec8b00000000, 0xad0c440100000000,
+    0xb21bb48100000000, 0xd224d5db00000000, 0xcd33255b00000000,
+    0x125a176f00000000, 0x0d4de7ef00000000, 0x6d7286b500000000,
+    0x7265763500000000, 0xd3a1e2dd00000000, 0xccb6125d00000000,
+    0xac89730700000000, 0xb39e838700000000, 0x6cf7b1b300000000,
+    0x73e0413300000000, 0x13df206900000000, 0x0cc8d0e900000000,
+    0xdf9d80f400000000, 0xc08a707400000000, 0xa0b5112e00000000,
+    0xbfa2e1ae00000000, 0x60cbd39a00000000, 0x7fdc231a00000000,
+    0x1fe3424000000000, 0x00f4b2c000000000, 0xa130262800000000,
+    0xbe27d6a800000000, 0xde18b7f200000000, 0xc10f477200000000,
+    0x1e66754600000000, 0x017185c600000000, 0x614ee49c00000000,
+    0x7e59141c00000000, 0x62c1bc9600000000, 0x7dd64c1600000000,
+    0x1de92d4c00000000, 0x02feddcc00000000, 0xdd97eff800000000,
+    0xc2801f7800000000, 0xa2bf7e2200000000, 0xbda88ea200000000,
+    0x1c6c1a4a00000000, 0x037beaca00000000, 0x63448b9000000000,
+    0x7c537b1000000000, 0xa33a492400000000, 0xbc2db9a400000000,
+    0xdc12d8fe00000000, 0xc305287e00000000, 0xa524f83000000000,
+    0xba3308b000000000, 0xda0c69ea00000000, 0xc51b996a00000000,
+    0x1a72ab5e00000000, 0x05655bde00000000, 0x655a3a8400000000,
+    0x7a4dca0400000000, 0xdb895eec00000000, 0xc49eae6c00000000,
+    0xa4a1cf3600000000, 0xbbb63fb600000000, 0x64df0d8200000000,
+    0x7bc8fd0200000000, 0x1bf79c5800000000, 0x04e06cd800000000,
+    0x1878c45200000000, 0x076f34d200000000, 0x6750558800000000,
+    0x7847a50800000000, 0xa72e973c00000000, 0xb83967bc00000000,
+    0xd80606e600000000, 0xc711f66600000000, 0x66d5628e00000000,
+    0x79c2920e00000000, 0x19fdf35400000000, 0x06ea03d400000000,
+    0xd98331e000000000, 0xc694c16000000000, 0xa6aba03a00000000,
+    0xb9bc50ba00000000},
+   {0x0000000000000000, 0xe2fd888d00000000, 0x85fd60c000000000,
+    0x6700e84d00000000, 0x4bfdb05b00000000, 0xa90038d600000000,
+    0xce00d09b00000000, 0x2cfd581600000000, 0x96fa61b700000000,
+    0x7407e93a00000000, 0x1307017700000000, 0xf1fa89fa00000000,
+    0xdd07d1ec00000000, 0x3ffa596100000000, 0x58fab12c00000000,
+    0xba0739a100000000, 0x6df3b2b500000000, 0x8f0e3a3800000000,
+    0xe80ed27500000000, 0x0af35af800000000, 0x260e02ee00000000,
+    0xc4f38a6300000000, 0xa3f3622e00000000, 0x410eeaa300000000,
+    0xfb09d30200000000, 0x19f45b8f00000000, 0x7ef4b3c200000000,
+    0x9c093b4f00000000, 0xb0f4635900000000, 0x5209ebd400000000,
+    0x3509039900000000, 0xd7f48b1400000000, 0x9be014b000000000,
+    0x791d9c3d00000000, 0x1e1d747000000000, 0xfce0fcfd00000000,
+    0xd01da4eb00000000, 0x32e02c6600000000, 0x55e0c42b00000000,
+    0xb71d4ca600000000, 0x0d1a750700000000, 0xefe7fd8a00000000,
+    0x88e715c700000000, 0x6a1a9d4a00000000, 0x46e7c55c00000000,
+    0xa41a4dd100000000, 0xc31aa59c00000000, 0x21e72d1100000000,
+    0xf613a60500000000, 0x14ee2e8800000000, 0x73eec6c500000000,
+    0x91134e4800000000, 0xbdee165e00000000, 0x5f139ed300000000,
+    0x3813769e00000000, 0xdaeefe1300000000, 0x60e9c7b200000000,
+    0x82144f3f00000000, 0xe514a77200000000, 0x07e92fff00000000,
+    0x2b1477e900000000, 0xc9e9ff6400000000, 0xaee9172900000000,
+    0x4c149fa400000000, 0x77c758bb00000000, 0x953ad03600000000,
+    0xf23a387b00000000, 0x10c7b0f600000000, 0x3c3ae8e000000000,
+    0xdec7606d00000000, 0xb9c7882000000000, 0x5b3a00ad00000000,
+    0xe13d390c00000000, 0x03c0b18100000000, 0x64c059cc00000000,
+    0x863dd14100000000, 0xaac0895700000000, 0x483d01da00000000,
+    0x2f3de99700000000, 0xcdc0611a00000000, 0x1a34ea0e00000000,
+    0xf8c9628300000000, 0x9fc98ace00000000, 0x7d34024300000000,
+    0x51c95a5500000000, 0xb334d2d800000000, 0xd4343a9500000000,
+    0x36c9b21800000000, 0x8cce8bb900000000, 0x6e33033400000000,
+    0x0933eb7900000000, 0xebce63f400000000, 0xc7333be200000000,
+    0x25ceb36f00000000, 0x42ce5b2200000000, 0xa033d3af00000000,
+    0xec274c0b00000000, 0x0edac48600000000, 0x69da2ccb00000000,
+    0x8b27a44600000000, 0xa7dafc5000000000, 0x452774dd00000000,
+    0x22279c9000000000, 0xc0da141d00000000, 0x7add2dbc00000000,
+    0x9820a53100000000, 0xff204d7c00000000, 0x1dddc5f100000000,
+    0x31209de700000000, 0xd3dd156a00000000, 0xb4ddfd2700000000,
+    0x562075aa00000000, 0x81d4febe00000000, 0x6329763300000000,
+    0x04299e7e00000000, 0xe6d416f300000000, 0xca294ee500000000,
+    0x28d4c66800000000, 0x4fd42e2500000000, 0xad29a6a800000000,
+    0x172e9f0900000000, 0xf5d3178400000000, 0x92d3ffc900000000,
+    0x702e774400000000, 0x5cd32f5200000000, 0xbe2ea7df00000000,
+    0xd92e4f9200000000, 0x3bd3c71f00000000, 0xaf88c0ad00000000,
+    0x4d75482000000000, 0x2a75a06d00000000, 0xc88828e000000000,
+    0xe47570f600000000, 0x0688f87b00000000, 0x6188103600000000,
+    0x837598bb00000000, 0x3972a11a00000000, 0xdb8f299700000000,
+    0xbc8fc1da00000000, 0x5e72495700000000, 0x728f114100000000,
+    0x907299cc00000000, 0xf772718100000000, 0x158ff90c00000000,
+    0xc27b721800000000, 0x2086fa9500000000, 0x478612d800000000,
+    0xa57b9a5500000000, 0x8986c24300000000, 0x6b7b4ace00000000,
+    0x0c7ba28300000000, 0xee862a0e00000000, 0x548113af00000000,
+    0xb67c9b2200000000, 0xd17c736f00000000, 0x3381fbe200000000,
+    0x1f7ca3f400000000, 0xfd812b7900000000, 0x9a81c33400000000,
+    0x787c4bb900000000, 0x3468d41d00000000, 0xd6955c9000000000,
+    0xb195b4dd00000000, 0x53683c5000000000, 0x7f95644600000000,
+    0x9d68eccb00000000, 0xfa68048600000000, 0x18958c0b00000000,
+    0xa292b5aa00000000, 0x406f3d2700000000, 0x276fd56a00000000,
+    0xc5925de700000000, 0xe96f05f100000000, 0x0b928d7c00000000,
+    0x6c92653100000000, 0x8e6fedbc00000000, 0x599b66a800000000,
+    0xbb66ee2500000000, 0xdc66066800000000, 0x3e9b8ee500000000,
+    0x1266d6f300000000, 0xf09b5e7e00000000, 0x979bb63300000000,
+    0x75663ebe00000000, 0xcf61071f00000000, 0x2d9c8f9200000000,
+    0x4a9c67df00000000, 0xa861ef5200000000, 0x849cb74400000000,
+    0x66613fc900000000, 0x0161d78400000000, 0xe39c5f0900000000,
+    0xd84f981600000000, 0x3ab2109b00000000, 0x5db2f8d600000000,
+    0xbf4f705b00000000, 0x93b2284d00000000, 0x714fa0c000000000,
+    0x164f488d00000000, 0xf4b2c00000000000, 0x4eb5f9a100000000,
+    0xac48712c00000000, 0xcb48996100000000, 0x29b511ec00000000,
+    0x054849fa00000000, 0xe7b5c17700000000, 0x80b5293a00000000,
+    0x6248a1b700000000, 0xb5bc2aa300000000, 0x5741a22e00000000,
+    0x30414a6300000000, 0xd2bcc2ee00000000, 0xfe419af800000000,
+    0x1cbc127500000000, 0x7bbcfa3800000000, 0x994172b500000000,
+    0x23464b1400000000, 0xc1bbc39900000000, 0xa6bb2bd400000000,
+    0x4446a35900000000, 0x68bbfb4f00000000, 0x8a4673c200000000,
+    0xed469b8f00000000, 0x0fbb130200000000, 0x43af8ca600000000,
+    0xa152042b00000000, 0xc652ec6600000000, 0x24af64eb00000000,
+    0x08523cfd00000000, 0xeaafb47000000000, 0x8daf5c3d00000000,
+    0x6f52d4b000000000, 0xd555ed1100000000, 0x37a8659c00000000,
+    0x50a88dd100000000, 0xb255055c00000000, 0x9ea85d4a00000000,
+    0x7c55d5c700000000, 0x1b553d8a00000000, 0xf9a8b50700000000,
+    0x2e5c3e1300000000, 0xcca1b69e00000000, 0xaba15ed300000000,
+    0x495cd65e00000000, 0x65a18e4800000000, 0x875c06c500000000,
+    0xe05cee8800000000, 0x02a1660500000000, 0xb8a65fa400000000,
+    0x5a5bd72900000000, 0x3d5b3f6400000000, 0xdfa6b7e900000000,
+    0xf35befff00000000, 0x11a6677200000000, 0x76a68f3f00000000,
+    0x945b07b200000000},
+   {0x0000000000000000, 0xa90b894e00000000, 0x5217129d00000000,
+    0xfb1c9bd300000000, 0xe52855e100000000, 0x4c23dcaf00000000,
+    0xb73f477c00000000, 0x1e34ce3200000000, 0x8b57db1900000000,
+    0x225c525700000000, 0xd940c98400000000, 0x704b40ca00000000,
+    0x6e7f8ef800000000, 0xc77407b600000000, 0x3c689c6500000000,
+    0x9563152b00000000, 0x16afb63300000000, 0xbfa43f7d00000000,
+    0x44b8a4ae00000000, 0xedb32de000000000, 0xf387e3d200000000,
+    0x5a8c6a9c00000000, 0xa190f14f00000000, 0x089b780100000000,
+    0x9df86d2a00000000, 0x34f3e46400000000, 0xcfef7fb700000000,
+    0x66e4f6f900000000, 0x78d038cb00000000, 0xd1dbb18500000000,
+    0x2ac72a5600000000, 0x83cca31800000000, 0x2c5e6d6700000000,
+    0x8555e42900000000, 0x7e497ffa00000000, 0xd742f6b400000000,
+    0xc976388600000000, 0x607db1c800000000, 0x9b612a1b00000000,
+    0x326aa35500000000, 0xa709b67e00000000, 0x0e023f3000000000,
+    0xf51ea4e300000000, 0x5c152dad00000000, 0x4221e39f00000000,
+    0xeb2a6ad100000000, 0x1036f10200000000, 0xb93d784c00000000,
+    0x3af1db5400000000, 0x93fa521a00000000, 0x68e6c9c900000000,
+    0xc1ed408700000000, 0xdfd98eb500000000, 0x76d207fb00000000,
+    0x8dce9c2800000000, 0x24c5156600000000, 0xb1a6004d00000000,
+    0x18ad890300000000, 0xe3b112d000000000, 0x4aba9b9e00000000,
+    0x548e55ac00000000, 0xfd85dce200000000, 0x0699473100000000,
+    0xaf92ce7f00000000, 0x58bcdace00000000, 0xf1b7538000000000,
+    0x0aabc85300000000, 0xa3a0411d00000000, 0xbd948f2f00000000,
+    0x149f066100000000, 0xef839db200000000, 0x468814fc00000000,
+    0xd3eb01d700000000, 0x7ae0889900000000, 0x81fc134a00000000,
+    0x28f79a0400000000, 0x36c3543600000000, 0x9fc8dd7800000000,
+    0x64d446ab00000000, 0xcddfcfe500000000, 0x4e136cfd00000000,
+    0xe718e5b300000000, 0x1c047e6000000000, 0xb50ff72e00000000,
+    0xab3b391c00000000, 0x0230b05200000000, 0xf92c2b8100000000,
+    0x5027a2cf00000000, 0xc544b7e400000000, 0x6c4f3eaa00000000,
+    0x9753a57900000000, 0x3e582c3700000000, 0x206ce20500000000,
+    0x89676b4b00000000, 0x727bf09800000000, 0xdb7079d600000000,
+    0x74e2b7a900000000, 0xdde93ee700000000, 0x26f5a53400000000,
+    0x8ffe2c7a00000000, 0x91cae24800000000, 0x38c16b0600000000,
+    0xc3ddf0d500000000, 0x6ad6799b00000000, 0xffb56cb000000000,
+    0x56bee5fe00000000, 0xada27e2d00000000, 0x04a9f76300000000,
+    0x1a9d395100000000, 0xb396b01f00000000, 0x488a2bcc00000000,
+    0xe181a28200000000, 0x624d019a00000000, 0xcb4688d400000000,
+    0x305a130700000000, 0x99519a4900000000, 0x8765547b00000000,
+    0x2e6edd3500000000, 0xd57246e600000000, 0x7c79cfa800000000,
+    0xe91ada8300000000, 0x401153cd00000000, 0xbb0dc81e00000000,
+    0x1206415000000000, 0x0c328f6200000000, 0xa539062c00000000,
+    0x5e259dff00000000, 0xf72e14b100000000, 0xf17ec44600000000,
+    0x58754d0800000000, 0xa369d6db00000000, 0x0a625f9500000000,
+    0x145691a700000000, 0xbd5d18e900000000, 0x4641833a00000000,
+    0xef4a0a7400000000, 0x7a291f5f00000000, 0xd322961100000000,
+    0x283e0dc200000000, 0x8135848c00000000, 0x9f014abe00000000,
+    0x360ac3f000000000, 0xcd16582300000000, 0x641dd16d00000000,
+    0xe7d1727500000000, 0x4edafb3b00000000, 0xb5c660e800000000,
+    0x1ccde9a600000000, 0x02f9279400000000, 0xabf2aeda00000000,
+    0x50ee350900000000, 0xf9e5bc4700000000, 0x6c86a96c00000000,
+    0xc58d202200000000, 0x3e91bbf100000000, 0x979a32bf00000000,
+    0x89aefc8d00000000, 0x20a575c300000000, 0xdbb9ee1000000000,
+    0x72b2675e00000000, 0xdd20a92100000000, 0x742b206f00000000,
+    0x8f37bbbc00000000, 0x263c32f200000000, 0x3808fcc000000000,
+    0x9103758e00000000, 0x6a1fee5d00000000, 0xc314671300000000,
+    0x5677723800000000, 0xff7cfb7600000000, 0x046060a500000000,
+    0xad6be9eb00000000, 0xb35f27d900000000, 0x1a54ae9700000000,
+    0xe148354400000000, 0x4843bc0a00000000, 0xcb8f1f1200000000,
+    0x6284965c00000000, 0x99980d8f00000000, 0x309384c100000000,
+    0x2ea74af300000000, 0x87acc3bd00000000, 0x7cb0586e00000000,
+    0xd5bbd12000000000, 0x40d8c40b00000000, 0xe9d34d4500000000,
+    0x12cfd69600000000, 0xbbc45fd800000000, 0xa5f091ea00000000,
+    0x0cfb18a400000000, 0xf7e7837700000000, 0x5eec0a3900000000,
+    0xa9c21e8800000000, 0x00c997c600000000, 0xfbd50c1500000000,
+    0x52de855b00000000, 0x4cea4b6900000000, 0xe5e1c22700000000,
+    0x1efd59f400000000, 0xb7f6d0ba00000000, 0x2295c59100000000,
+    0x8b9e4cdf00000000, 0x7082d70c00000000, 0xd9895e4200000000,
+    0xc7bd907000000000, 0x6eb6193e00000000, 0x95aa82ed00000000,
+    0x3ca10ba300000000, 0xbf6da8bb00000000, 0x166621f500000000,
+    0xed7aba2600000000, 0x4471336800000000, 0x5a45fd5a00000000,
+    0xf34e741400000000, 0x0852efc700000000, 0xa159668900000000,
+    0x343a73a200000000, 0x9d31faec00000000, 0x662d613f00000000,
+    0xcf26e87100000000, 0xd112264300000000, 0x7819af0d00000000,
+    0x830534de00000000, 0x2a0ebd9000000000, 0x859c73ef00000000,
+    0x2c97faa100000000, 0xd78b617200000000, 0x7e80e83c00000000,
+    0x60b4260e00000000, 0xc9bfaf4000000000, 0x32a3349300000000,
+    0x9ba8bddd00000000, 0x0ecba8f600000000, 0xa7c021b800000000,
+    0x5cdcba6b00000000, 0xf5d7332500000000, 0xebe3fd1700000000,
+    0x42e8745900000000, 0xb9f4ef8a00000000, 0x10ff66c400000000,
+    0x9333c5dc00000000, 0x3a384c9200000000, 0xc124d74100000000,
+    0x682f5e0f00000000, 0x761b903d00000000, 0xdf10197300000000,
+    0x240c82a000000000, 0x8d070bee00000000, 0x18641ec500000000,
+    0xb16f978b00000000, 0x4a730c5800000000, 0xe378851600000000,
+    0xfd4c4b2400000000, 0x5447c26a00000000, 0xaf5b59b900000000,
+    0x0650d0f700000000},
+   {0x0000000000000000, 0x479244af00000000, 0xcf22f88500000000,
+    0x88b0bc2a00000000, 0xdf4381d000000000, 0x98d1c57f00000000,
+    0x1061795500000000, 0x57f33dfa00000000, 0xff81737a00000000,
+    0xb81337d500000000, 0x30a38bff00000000, 0x7731cf5000000000,
+    0x20c2f2aa00000000, 0x6750b60500000000, 0xefe00a2f00000000,
+    0xa8724e8000000000, 0xfe03e7f400000000, 0xb991a35b00000000,
+    0x31211f7100000000, 0x76b35bde00000000, 0x2140662400000000,
+    0x66d2228b00000000, 0xee629ea100000000, 0xa9f0da0e00000000,
+    0x0182948e00000000, 0x4610d02100000000, 0xcea06c0b00000000,
+    0x893228a400000000, 0xdec1155e00000000, 0x995351f100000000,
+    0x11e3eddb00000000, 0x5671a97400000000, 0xbd01bf3200000000,
+    0xfa93fb9d00000000, 0x722347b700000000, 0x35b1031800000000,
+    0x62423ee200000000, 0x25d07a4d00000000, 0xad60c66700000000,
+    0xeaf282c800000000, 0x4280cc4800000000, 0x051288e700000000,
+    0x8da234cd00000000, 0xca30706200000000, 0x9dc34d9800000000,
+    0xda51093700000000, 0x52e1b51d00000000, 0x1573f1b200000000,
+    0x430258c600000000, 0x04901c6900000000, 0x8c20a04300000000,
+    0xcbb2e4ec00000000, 0x9c41d91600000000, 0xdbd39db900000000,
+    0x5363219300000000, 0x14f1653c00000000, 0xbc832bbc00000000,
+    0xfb116f1300000000, 0x73a1d33900000000, 0x3433979600000000,
+    0x63c0aa6c00000000, 0x2452eec300000000, 0xace252e900000000,
+    0xeb70164600000000, 0x7a037e6500000000, 0x3d913aca00000000,
+    0xb52186e000000000, 0xf2b3c24f00000000, 0xa540ffb500000000,
+    0xe2d2bb1a00000000, 0x6a62073000000000, 0x2df0439f00000000,
+    0x85820d1f00000000, 0xc21049b000000000, 0x4aa0f59a00000000,
+    0x0d32b13500000000, 0x5ac18ccf00000000, 0x1d53c86000000000,
+    0x95e3744a00000000, 0xd27130e500000000, 0x8400999100000000,
+    0xc392dd3e00000000, 0x4b22611400000000, 0x0cb025bb00000000,
+    0x5b43184100000000, 0x1cd15cee00000000, 0x9461e0c400000000,
+    0xd3f3a46b00000000, 0x7b81eaeb00000000, 0x3c13ae4400000000,
+    0xb4a3126e00000000, 0xf33156c100000000, 0xa4c26b3b00000000,
+    0xe3502f9400000000, 0x6be093be00000000, 0x2c72d71100000000,
+    0xc702c15700000000, 0x809085f800000000, 0x082039d200000000,
+    0x4fb27d7d00000000, 0x1841408700000000, 0x5fd3042800000000,
+    0xd763b80200000000, 0x90f1fcad00000000, 0x3883b22d00000000,
+    0x7f11f68200000000, 0xf7a14aa800000000, 0xb0330e0700000000,
+    0xe7c033fd00000000, 0xa052775200000000, 0x28e2cb7800000000,
+    0x6f708fd700000000, 0x390126a300000000, 0x7e93620c00000000,
+    0xf623de2600000000, 0xb1b19a8900000000, 0xe642a77300000000,
+    0xa1d0e3dc00000000, 0x29605ff600000000, 0x6ef21b5900000000,
+    0xc68055d900000000, 0x8112117600000000, 0x09a2ad5c00000000,
+    0x4e30e9f300000000, 0x19c3d40900000000, 0x5e5190a600000000,
+    0xd6e12c8c00000000, 0x9173682300000000, 0xf406fcca00000000,
+    0xb394b86500000000, 0x3b24044f00000000, 0x7cb640e000000000,
+    0x2b457d1a00000000, 0x6cd739b500000000, 0xe467859f00000000,
+    0xa3f5c13000000000, 0x0b878fb000000000, 0x4c15cb1f00000000,
+    0xc4a5773500000000, 0x8337339a00000000, 0xd4c40e6000000000,
+    0x93564acf00000000, 0x1be6f6e500000000, 0x5c74b24a00000000,
+    0x0a051b3e00000000, 0x4d975f9100000000, 0xc527e3bb00000000,
+    0x82b5a71400000000, 0xd5469aee00000000, 0x92d4de4100000000,
+    0x1a64626b00000000, 0x5df626c400000000, 0xf584684400000000,
+    0xb2162ceb00000000, 0x3aa690c100000000, 0x7d34d46e00000000,
+    0x2ac7e99400000000, 0x6d55ad3b00000000, 0xe5e5111100000000,
+    0xa27755be00000000, 0x490743f800000000, 0x0e95075700000000,
+    0x8625bb7d00000000, 0xc1b7ffd200000000, 0x9644c22800000000,
+    0xd1d6868700000000, 0x59663aad00000000, 0x1ef47e0200000000,
+    0xb686308200000000, 0xf114742d00000000, 0x79a4c80700000000,
+    0x3e368ca800000000, 0x69c5b15200000000, 0x2e57f5fd00000000,
+    0xa6e749d700000000, 0xe1750d7800000000, 0xb704a40c00000000,
+    0xf096e0a300000000, 0x78265c8900000000, 0x3fb4182600000000,
+    0x684725dc00000000, 0x2fd5617300000000, 0xa765dd5900000000,
+    0xe0f799f600000000, 0x4885d77600000000, 0x0f1793d900000000,
+    0x87a72ff300000000, 0xc0356b5c00000000, 0x97c656a600000000,
+    0xd054120900000000, 0x58e4ae2300000000, 0x1f76ea8c00000000,
+    0x8e0582af00000000, 0xc997c60000000000, 0x41277a2a00000000,
+    0x06b53e8500000000, 0x5146037f00000000, 0x16d447d000000000,
+    0x9e64fbfa00000000, 0xd9f6bf5500000000, 0x7184f1d500000000,
+    0x3616b57a00000000, 0xbea6095000000000, 0xf9344dff00000000,
+    0xaec7700500000000, 0xe95534aa00000000, 0x61e5888000000000,
+    0x2677cc2f00000000, 0x7006655b00000000, 0x379421f400000000,
+    0xbf249dde00000000, 0xf8b6d97100000000, 0xaf45e48b00000000,
+    0xe8d7a02400000000, 0x60671c0e00000000, 0x27f558a100000000,
+    0x8f87162100000000, 0xc815528e00000000, 0x40a5eea400000000,
+    0x0737aa0b00000000, 0x50c497f100000000, 0x1756d35e00000000,
+    0x9fe66f7400000000, 0xd8742bdb00000000, 0x33043d9d00000000,
+    0x7496793200000000, 0xfc26c51800000000, 0xbbb481b700000000,
+    0xec47bc4d00000000, 0xabd5f8e200000000, 0x236544c800000000,
+    0x64f7006700000000, 0xcc854ee700000000, 0x8b170a4800000000,
+    0x03a7b66200000000, 0x4435f2cd00000000, 0x13c6cf3700000000,
+    0x54548b9800000000, 0xdce437b200000000, 0x9b76731d00000000,
+    0xcd07da6900000000, 0x8a959ec600000000, 0x022522ec00000000,
+    0x45b7664300000000, 0x12445bb900000000, 0x55d61f1600000000,
+    0xdd66a33c00000000, 0x9af4e79300000000, 0x3286a91300000000,
+    0x7514edbc00000000, 0xfda4519600000000, 0xba36153900000000,
+    0xedc528c300000000, 0xaa576c6c00000000, 0x22e7d04600000000,
+    0x657594e900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43cba687, 0xc7903cd4, 0x845b9a53, 0xcf270873,
+    0x8cecaef4, 0x08b734a7, 0x4b7c9220, 0x9e4f10e6, 0xdd84b661,
+    0x59df2c32, 0x1a148ab5, 0x51681895, 0x12a3be12, 0x96f82441,
+    0xd53382c6, 0x7d995117, 0x3e52f790, 0xba096dc3, 0xf9c2cb44,
+    0xb2be5964, 0xf175ffe3, 0x752e65b0, 0x36e5c337, 0xe3d641f1,
+    0xa01de776, 0x24467d25, 0x678ddba2, 0x2cf14982, 0x6f3aef05,
+    0xeb617556, 0xa8aad3d1, 0xfa32a32e, 0xb9f905a9, 0x3da29ffa,
+    0x7e69397d, 0x3515ab5d, 0x76de0dda, 0xf2859789, 0xb14e310e,
+    0x647db3c8, 0x27b6154f, 0xa3ed8f1c, 0xe026299b, 0xab5abbbb,
+    0xe8911d3c, 0x6cca876f, 0x2f0121e8, 0x87abf239, 0xc46054be,
+    0x403bceed, 0x03f0686a, 0x488cfa4a, 0x0b475ccd, 0x8f1cc69e,
+    0xccd76019, 0x19e4e2df, 0x5a2f4458, 0xde74de0b, 0x9dbf788c,
+    0xd6c3eaac, 0x95084c2b, 0x1153d678, 0x529870ff, 0xf465465d,
+    0xb7aee0da, 0x33f57a89, 0x703edc0e, 0x3b424e2e, 0x7889e8a9,
+    0xfcd272fa, 0xbf19d47d, 0x6a2a56bb, 0x29e1f03c, 0xadba6a6f,
+    0xee71cce8, 0xa50d5ec8, 0xe6c6f84f, 0x629d621c, 0x2156c49b,
+    0x89fc174a, 0xca37b1cd, 0x4e6c2b9e, 0x0da78d19, 0x46db1f39,
+    0x0510b9be, 0x814b23ed, 0xc280856a, 0x17b307ac, 0x5478a12b,
+    0xd0233b78, 0x93e89dff, 0xd8940fdf, 0x9b5fa958, 0x1f04330b,
+    0x5ccf958c, 0x0e57e573, 0x4d9c43f4, 0xc9c7d9a7, 0x8a0c7f20,
+    0xc170ed00, 0x82bb4b87, 0x06e0d1d4, 0x452b7753, 0x9018f595,
+    0xd3d35312, 0x5788c941, 0x14436fc6, 0x5f3ffde6, 0x1cf45b61,
+    0x98afc132, 0xdb6467b5, 0x73ceb464, 0x300512e3, 0xb45e88b0,
+    0xf7952e37, 0xbce9bc17, 0xff221a90, 0x7b7980c3, 0x38b22644,
+    0xed81a482, 0xae4a0205, 0x2a119856, 0x69da3ed1, 0x22a6acf1,
+    0x616d0a76, 0xe5369025, 0xa6fd36a2, 0xe8cb8cba, 0xab002a3d,
+    0x2f5bb06e, 0x6c9016e9, 0x27ec84c9, 0x6427224e, 0xe07cb81d,
+    0xa3b71e9a, 0x76849c5c, 0x354f3adb, 0xb114a088, 0xf2df060f,
+    0xb9a3942f, 0xfa6832a8, 0x7e33a8fb, 0x3df80e7c, 0x9552ddad,
+    0xd6997b2a, 0x52c2e179, 0x110947fe, 0x5a75d5de, 0x19be7359,
+    0x9de5e90a, 0xde2e4f8d, 0x0b1dcd4b, 0x48d66bcc, 0xcc8df19f,
+    0x8f465718, 0xc43ac538, 0x87f163bf, 0x03aaf9ec, 0x40615f6b,
+    0x12f92f94, 0x51328913, 0xd5691340, 0x96a2b5c7, 0xddde27e7,
+    0x9e158160, 0x1a4e1b33, 0x5985bdb4, 0x8cb63f72, 0xcf7d99f5,
+    0x4b2603a6, 0x08eda521, 0x43913701, 0x005a9186, 0x84010bd5,
+    0xc7caad52, 0x6f607e83, 0x2cabd804, 0xa8f04257, 0xeb3be4d0,
+    0xa04776f0, 0xe38cd077, 0x67d74a24, 0x241ceca3, 0xf12f6e65,
+    0xb2e4c8e2, 0x36bf52b1, 0x7574f436, 0x3e086616, 0x7dc3c091,
+    0xf9985ac2, 0xba53fc45, 0x1caecae7, 0x5f656c60, 0xdb3ef633,
+    0x98f550b4, 0xd389c294, 0x90426413, 0x1419fe40, 0x57d258c7,
+    0x82e1da01, 0xc12a7c86, 0x4571e6d5, 0x06ba4052, 0x4dc6d272,
+    0x0e0d74f5, 0x8a56eea6, 0xc99d4821, 0x61379bf0, 0x22fc3d77,
+    0xa6a7a724, 0xe56c01a3, 0xae109383, 0xeddb3504, 0x6980af57,
+    0x2a4b09d0, 0xff788b16, 0xbcb32d91, 0x38e8b7c2, 0x7b231145,
+    0x305f8365, 0x739425e2, 0xf7cfbfb1, 0xb4041936, 0xe69c69c9,
+    0xa557cf4e, 0x210c551d, 0x62c7f39a, 0x29bb61ba, 0x6a70c73d,
+    0xee2b5d6e, 0xade0fbe9, 0x78d3792f, 0x3b18dfa8, 0xbf4345fb,
+    0xfc88e37c, 0xb7f4715c, 0xf43fd7db, 0x70644d88, 0x33afeb0f,
+    0x9b0538de, 0xd8ce9e59, 0x5c95040a, 0x1f5ea28d, 0x542230ad,
+    0x17e9962a, 0x93b20c79, 0xd079aafe, 0x054a2838, 0x46818ebf,
+    0xc2da14ec, 0x8111b26b, 0xca6d204b, 0x89a686cc, 0x0dfd1c9f,
+    0x4e36ba18},
+   {0x00000000, 0xe1b652ef, 0x836bd405, 0x62dd86ea, 0x06d7a80b,
+    0xe761fae4, 0x85bc7c0e, 0x640a2ee1, 0x0cae5117, 0xed1803f8,
+    0x8fc58512, 0x6e73d7fd, 0x0a79f91c, 0xebcfabf3, 0x89122d19,
+    0x68a47ff6, 0x185ca32e, 0xf9eaf1c1, 0x9b37772b, 0x7a8125c4,
+    0x1e8b0b25, 0xff3d59ca, 0x9de0df20, 0x7c568dcf, 0x14f2f239,
+    0xf544a0d6, 0x9799263c, 0x762f74d3, 0x12255a32, 0xf39308dd,
+    0x914e8e37, 0x70f8dcd8, 0x30b8465d, 0xd10e14b2, 0xb3d39258,
+    0x5265c0b7, 0x366fee56, 0xd7d9bcb9, 0xb5043a53, 0x54b268bc,
+    0x3c16174a, 0xdda045a5, 0xbf7dc34f, 0x5ecb91a0, 0x3ac1bf41,
+    0xdb77edae, 0xb9aa6b44, 0x581c39ab, 0x28e4e573, 0xc952b79c,
+    0xab8f3176, 0x4a396399, 0x2e334d78, 0xcf851f97, 0xad58997d,
+    0x4ceecb92, 0x244ab464, 0xc5fce68b, 0xa7216061, 0x4697328e,
+    0x229d1c6f, 0xc32b4e80, 0xa1f6c86a, 0x40409a85, 0x60708dba,
+    0x81c6df55, 0xe31b59bf, 0x02ad0b50, 0x66a725b1, 0x8711775e,
+    0xe5ccf1b4, 0x047aa35b, 0x6cdedcad, 0x8d688e42, 0xefb508a8,
+    0x0e035a47, 0x6a0974a6, 0x8bbf2649, 0xe962a0a3, 0x08d4f24c,
+    0x782c2e94, 0x999a7c7b, 0xfb47fa91, 0x1af1a87e, 0x7efb869f,
+    0x9f4dd470, 0xfd90529a, 0x1c260075, 0x74827f83, 0x95342d6c,
+    0xf7e9ab86, 0x165ff969, 0x7255d788, 0x93e38567, 0xf13e038d,
+    0x10885162, 0x50c8cbe7, 0xb17e9908, 0xd3a31fe2, 0x32154d0d,
+    0x561f63ec, 0xb7a93103, 0xd574b7e9, 0x34c2e506, 0x5c669af0,
+    0xbdd0c81f, 0xdf0d4ef5, 0x3ebb1c1a, 0x5ab132fb, 0xbb076014,
+    0xd9dae6fe, 0x386cb411, 0x489468c9, 0xa9223a26, 0xcbffbccc,
+    0x2a49ee23, 0x4e43c0c2, 0xaff5922d, 0xcd2814c7, 0x2c9e4628,
+    0x443a39de, 0xa58c6b31, 0xc751eddb, 0x26e7bf34, 0x42ed91d5,
+    0xa35bc33a, 0xc18645d0, 0x2030173f, 0x81e66bae, 0x60503941,
+    0x028dbfab, 0xe33bed44, 0x8731c3a5, 0x6687914a, 0x045a17a0,
+    0xe5ec454f, 0x8d483ab9, 0x6cfe6856, 0x0e23eebc, 0xef95bc53,
+    0x8b9f92b2, 0x6a29c05d, 0x08f446b7, 0xe9421458, 0x99bac880,
+    0x780c9a6f, 0x1ad11c85, 0xfb674e6a, 0x9f6d608b, 0x7edb3264,
+    0x1c06b48e, 0xfdb0e661, 0x95149997, 0x74a2cb78, 0x167f4d92,
+    0xf7c91f7d, 0x93c3319c, 0x72756373, 0x10a8e599, 0xf11eb776,
+    0xb15e2df3, 0x50e87f1c, 0x3235f9f6, 0xd383ab19, 0xb78985f8,
+    0x563fd717, 0x34e251fd, 0xd5540312, 0xbdf07ce4, 0x5c462e0b,
+    0x3e9ba8e1, 0xdf2dfa0e, 0xbb27d4ef, 0x5a918600, 0x384c00ea,
+    0xd9fa5205, 0xa9028edd, 0x48b4dc32, 0x2a695ad8, 0xcbdf0837,
+    0xafd526d6, 0x4e637439, 0x2cbef2d3, 0xcd08a03c, 0xa5acdfca,
+    0x441a8d25, 0x26c70bcf, 0xc7715920, 0xa37b77c1, 0x42cd252e,
+    0x2010a3c4, 0xc1a6f12b, 0xe196e614, 0x0020b4fb, 0x62fd3211,
+    0x834b60fe, 0xe7414e1f, 0x06f71cf0, 0x642a9a1a, 0x859cc8f5,
+    0xed38b703, 0x0c8ee5ec, 0x6e536306, 0x8fe531e9, 0xebef1f08,
+    0x0a594de7, 0x6884cb0d, 0x893299e2, 0xf9ca453a, 0x187c17d5,
+    0x7aa1913f, 0x9b17c3d0, 0xff1ded31, 0x1eabbfde, 0x7c763934,
+    0x9dc06bdb, 0xf564142d, 0x14d246c2, 0x760fc028, 0x97b992c7,
+    0xf3b3bc26, 0x1205eec9, 0x70d86823, 0x916e3acc, 0xd12ea049,
+    0x3098f2a6, 0x5245744c, 0xb3f326a3, 0xd7f90842, 0x364f5aad,
+    0x5492dc47, 0xb5248ea8, 0xdd80f15e, 0x3c36a3b1, 0x5eeb255b,
+    0xbf5d77b4, 0xdb575955, 0x3ae10bba, 0x583c8d50, 0xb98adfbf,
+    0xc9720367, 0x28c45188, 0x4a19d762, 0xabaf858d, 0xcfa5ab6c,
+    0x2e13f983, 0x4cce7f69, 0xad782d86, 0xc5dc5270, 0x246a009f,
+    0x46b78675, 0xa701d49a, 0xc30bfa7b, 0x22bda894, 0x40602e7e,
+    0xa1d67c91},
+   {0x00000000, 0x5880e2d7, 0xf106b474, 0xa98656a3, 0xe20d68e9,
+    0xba8d8a3e, 0x130bdc9d, 0x4b8b3e4a, 0x851da109, 0xdd9d43de,
+    0x741b157d, 0x2c9bf7aa, 0x6710c9e0, 0x3f902b37, 0x96167d94,
+    0xce969f43, 0x0a3b4213, 0x52bba0c4, 0xfb3df667, 0xa3bd14b0,
+    0xe8362afa, 0xb0b6c82d, 0x19309e8e, 0x41b07c59, 0x8f26e31a,
+    0xd7a601cd, 0x7e20576e, 0x26a0b5b9, 0x6d2b8bf3, 0x35ab6924,
+    0x9c2d3f87, 0xc4addd50, 0x14768426, 0x4cf666f1, 0xe5703052,
+    0xbdf0d285, 0xf67beccf, 0xaefb0e18, 0x077d58bb, 0x5ffdba6c,
+    0x916b252f, 0xc9ebc7f8, 0x606d915b, 0x38ed738c, 0x73664dc6,
+    0x2be6af11, 0x8260f9b2, 0xdae01b65, 0x1e4dc635, 0x46cd24e2,
+    0xef4b7241, 0xb7cb9096, 0xfc40aedc, 0xa4c04c0b, 0x0d461aa8,
+    0x55c6f87f, 0x9b50673c, 0xc3d085eb, 0x6a56d348, 0x32d6319f,
+    0x795d0fd5, 0x21dded02, 0x885bbba1, 0xd0db5976, 0x28ec084d,
+    0x706cea9a, 0xd9eabc39, 0x816a5eee, 0xcae160a4, 0x92618273,
+    0x3be7d4d0, 0x63673607, 0xadf1a944, 0xf5714b93, 0x5cf71d30,
+    0x0477ffe7, 0x4ffcc1ad, 0x177c237a, 0xbefa75d9, 0xe67a970e,
+    0x22d74a5e, 0x7a57a889, 0xd3d1fe2a, 0x8b511cfd, 0xc0da22b7,
+    0x985ac060, 0x31dc96c3, 0x695c7414, 0xa7caeb57, 0xff4a0980,
+    0x56cc5f23, 0x0e4cbdf4, 0x45c783be, 0x1d476169, 0xb4c137ca,
+    0xec41d51d, 0x3c9a8c6b, 0x641a6ebc, 0xcd9c381f, 0x951cdac8,
+    0xde97e482, 0x86170655, 0x2f9150f6, 0x7711b221, 0xb9872d62,
+    0xe107cfb5, 0x48819916, 0x10017bc1, 0x5b8a458b, 0x030aa75c,
+    0xaa8cf1ff, 0xf20c1328, 0x36a1ce78, 0x6e212caf, 0xc7a77a0c,
+    0x9f2798db, 0xd4aca691, 0x8c2c4446, 0x25aa12e5, 0x7d2af032,
+    0xb3bc6f71, 0xeb3c8da6, 0x42badb05, 0x1a3a39d2, 0x51b10798,
+    0x0931e54f, 0xa0b7b3ec, 0xf837513b, 0x50d8119a, 0x0858f34d,
+    0xa1dea5ee, 0xf95e4739, 0xb2d57973, 0xea559ba4, 0x43d3cd07,
+    0x1b532fd0, 0xd5c5b093, 0x8d455244, 0x24c304e7, 0x7c43e630,
+    0x37c8d87a, 0x6f483aad, 0xc6ce6c0e, 0x9e4e8ed9, 0x5ae35389,
+    0x0263b15e, 0xabe5e7fd, 0xf365052a, 0xb8ee3b60, 0xe06ed9b7,
+    0x49e88f14, 0x11686dc3, 0xdffef280, 0x877e1057, 0x2ef846f4,
+    0x7678a423, 0x3df39a69, 0x657378be, 0xccf52e1d, 0x9475ccca,
+    0x44ae95bc, 0x1c2e776b, 0xb5a821c8, 0xed28c31f, 0xa6a3fd55,
+    0xfe231f82, 0x57a54921, 0x0f25abf6, 0xc1b334b5, 0x9933d662,
+    0x30b580c1, 0x68356216, 0x23be5c5c, 0x7b3ebe8b, 0xd2b8e828,
+    0x8a380aff, 0x4e95d7af, 0x16153578, 0xbf9363db, 0xe713810c,
+    0xac98bf46, 0xf4185d91, 0x5d9e0b32, 0x051ee9e5, 0xcb8876a6,
+    0x93089471, 0x3a8ec2d2, 0x620e2005, 0x29851e4f, 0x7105fc98,
+    0xd883aa3b, 0x800348ec, 0x783419d7, 0x20b4fb00, 0x8932ada3,
+    0xd1b24f74, 0x9a39713e, 0xc2b993e9, 0x6b3fc54a, 0x33bf279d,
+    0xfd29b8de, 0xa5a95a09, 0x0c2f0caa, 0x54afee7d, 0x1f24d037,
+    0x47a432e0, 0xee226443, 0xb6a28694, 0x720f5bc4, 0x2a8fb913,
+    0x8309efb0, 0xdb890d67, 0x9002332d, 0xc882d1fa, 0x61048759,
+    0x3984658e, 0xf712facd, 0xaf92181a, 0x06144eb9, 0x5e94ac6e,
+    0x151f9224, 0x4d9f70f3, 0xe4192650, 0xbc99c487, 0x6c429df1,
+    0x34c27f26, 0x9d442985, 0xc5c4cb52, 0x8e4ff518, 0xd6cf17cf,
+    0x7f49416c, 0x27c9a3bb, 0xe95f3cf8, 0xb1dfde2f, 0x1859888c,
+    0x40d96a5b, 0x0b525411, 0x53d2b6c6, 0xfa54e065, 0xa2d402b2,
+    0x6679dfe2, 0x3ef93d35, 0x977f6b96, 0xcfff8941, 0x8474b70b,
+    0xdcf455dc, 0x7572037f, 0x2df2e1a8, 0xe3647eeb, 0xbbe49c3c,
+    0x1262ca9f, 0x4ae22848, 0x01691602, 0x59e9f4d5, 0xf06fa276,
+    0xa8ef40a1},
+   {0x00000000, 0x463b6765, 0x8c76ceca, 0xca4da9af, 0x59ebed4e,
+    0x1fd08a2b, 0xd59d2384, 0x93a644e1, 0xb2d6db9d, 0xf4edbcf8,
+    0x3ea01557, 0x789b7232, 0xeb3d36d3, 0xad0651b6, 0x674bf819,
+    0x21709f7c, 0x25abc6e0, 0x6390a185, 0xa9dd082a, 0xefe66f4f,
+    0x7c402bae, 0x3a7b4ccb, 0xf036e564, 0xb60d8201, 0x977d1d7d,
+    0xd1467a18, 0x1b0bd3b7, 0x5d30b4d2, 0xce96f033, 0x88ad9756,
+    0x42e03ef9, 0x04db599c, 0x0b50fc1a, 0x4d6b9b7f, 0x872632d0,
+    0xc11d55b5, 0x52bb1154, 0x14807631, 0xdecddf9e, 0x98f6b8fb,
+    0xb9862787, 0xffbd40e2, 0x35f0e94d, 0x73cb8e28, 0xe06dcac9,
+    0xa656adac, 0x6c1b0403, 0x2a206366, 0x2efb3afa, 0x68c05d9f,
+    0xa28df430, 0xe4b69355, 0x7710d7b4, 0x312bb0d1, 0xfb66197e,
+    0xbd5d7e1b, 0x9c2de167, 0xda168602, 0x105b2fad, 0x566048c8,
+    0xc5c60c29, 0x83fd6b4c, 0x49b0c2e3, 0x0f8ba586, 0x16a0f835,
+    0x509b9f50, 0x9ad636ff, 0xdced519a, 0x4f4b157b, 0x0970721e,
+    0xc33ddbb1, 0x8506bcd4, 0xa47623a8, 0xe24d44cd, 0x2800ed62,
+    0x6e3b8a07, 0xfd9dcee6, 0xbba6a983, 0x71eb002c, 0x37d06749,
+    0x330b3ed5, 0x753059b0, 0xbf7df01f, 0xf946977a, 0x6ae0d39b,
+    0x2cdbb4fe, 0xe6961d51, 0xa0ad7a34, 0x81dde548, 0xc7e6822d,
+    0x0dab2b82, 0x4b904ce7, 0xd8360806, 0x9e0d6f63, 0x5440c6cc,
+    0x127ba1a9, 0x1df0042f, 0x5bcb634a, 0x9186cae5, 0xd7bdad80,
+    0x441be961, 0x02208e04, 0xc86d27ab, 0x8e5640ce, 0xaf26dfb2,
+    0xe91db8d7, 0x23501178, 0x656b761d, 0xf6cd32fc, 0xb0f65599,
+    0x7abbfc36, 0x3c809b53, 0x385bc2cf, 0x7e60a5aa, 0xb42d0c05,
+    0xf2166b60, 0x61b02f81, 0x278b48e4, 0xedc6e14b, 0xabfd862e,
+    0x8a8d1952, 0xccb67e37, 0x06fbd798, 0x40c0b0fd, 0xd366f41c,
+    0x955d9379, 0x5f103ad6, 0x192b5db3, 0x2c40f16b, 0x6a7b960e,
+    0xa0363fa1, 0xe60d58c4, 0x75ab1c25, 0x33907b40, 0xf9ddd2ef,
+    0xbfe6b58a, 0x9e962af6, 0xd8ad4d93, 0x12e0e43c, 0x54db8359,
+    0xc77dc7b8, 0x8146a0dd, 0x4b0b0972, 0x0d306e17, 0x09eb378b,
+    0x4fd050ee, 0x859df941, 0xc3a69e24, 0x5000dac5, 0x163bbda0,
+    0xdc76140f, 0x9a4d736a, 0xbb3dec16, 0xfd068b73, 0x374b22dc,
+    0x717045b9, 0xe2d60158, 0xa4ed663d, 0x6ea0cf92, 0x289ba8f7,
+    0x27100d71, 0x612b6a14, 0xab66c3bb, 0xed5da4de, 0x7efbe03f,
+    0x38c0875a, 0xf28d2ef5, 0xb4b64990, 0x95c6d6ec, 0xd3fdb189,
+    0x19b01826, 0x5f8b7f43, 0xcc2d3ba2, 0x8a165cc7, 0x405bf568,
+    0x0660920d, 0x02bbcb91, 0x4480acf4, 0x8ecd055b, 0xc8f6623e,
+    0x5b5026df, 0x1d6b41ba, 0xd726e815, 0x911d8f70, 0xb06d100c,
+    0xf6567769, 0x3c1bdec6, 0x7a20b9a3, 0xe986fd42, 0xafbd9a27,
+    0x65f03388, 0x23cb54ed, 0x3ae0095e, 0x7cdb6e3b, 0xb696c794,
+    0xf0ada0f1, 0x630be410, 0x25308375, 0xef7d2ada, 0xa9464dbf,
+    0x8836d2c3, 0xce0db5a6, 0x04401c09, 0x427b7b6c, 0xd1dd3f8d,
+    0x97e658e8, 0x5dabf147, 0x1b909622, 0x1f4bcfbe, 0x5970a8db,
+    0x933d0174, 0xd5066611, 0x46a022f0, 0x009b4595, 0xcad6ec3a,
+    0x8ced8b5f, 0xad9d1423, 0xeba67346, 0x21ebdae9, 0x67d0bd8c,
+    0xf476f96d, 0xb24d9e08, 0x780037a7, 0x3e3b50c2, 0x31b0f544,
+    0x778b9221, 0xbdc63b8e, 0xfbfd5ceb, 0x685b180a, 0x2e607f6f,
+    0xe42dd6c0, 0xa216b1a5, 0x83662ed9, 0xc55d49bc, 0x0f10e013,
+    0x492b8776, 0xda8dc397, 0x9cb6a4f2, 0x56fb0d5d, 0x10c06a38,
+    0x141b33a4, 0x522054c1, 0x986dfd6e, 0xde569a0b, 0x4df0deea,
+    0x0bcbb98f, 0xc1861020, 0x87bd7745, 0xa6cde839, 0xe0f68f5c,
+    0x2abb26f3, 0x6c804196, 0xff260577, 0xb91d6212, 0x7350cbbd,
+    0x356bacd8}};
+
+#endif
+
+#endif
+
+#if N == 6
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x3db1ecdc, 0x7b63d9b8, 0x46d23564, 0xf6c7b370,
+    0xcb765fac, 0x8da46ac8, 0xb0158614, 0x36fe60a1, 0x0b4f8c7d,
+    0x4d9db919, 0x702c55c5, 0xc039d3d1, 0xfd883f0d, 0xbb5a0a69,
+    0x86ebe6b5, 0x6dfcc142, 0x504d2d9e, 0x169f18fa, 0x2b2ef426,
+    0x9b3b7232, 0xa68a9eee, 0xe058ab8a, 0xdde94756, 0x5b02a1e3,
+    0x66b34d3f, 0x2061785b, 0x1dd09487, 0xadc51293, 0x9074fe4f,
+    0xd6a6cb2b, 0xeb1727f7, 0xdbf98284, 0xe6486e58, 0xa09a5b3c,
+    0x9d2bb7e0, 0x2d3e31f4, 0x108fdd28, 0x565de84c, 0x6bec0490,
+    0xed07e225, 0xd0b60ef9, 0x96643b9d, 0xabd5d741, 0x1bc05155,
+    0x2671bd89, 0x60a388ed, 0x5d126431, 0xb60543c6, 0x8bb4af1a,
+    0xcd669a7e, 0xf0d776a2, 0x40c2f0b6, 0x7d731c6a, 0x3ba1290e,
+    0x0610c5d2, 0x80fb2367, 0xbd4acfbb, 0xfb98fadf, 0xc6291603,
+    0x763c9017, 0x4b8d7ccb, 0x0d5f49af, 0x30eea573, 0x6c820349,
+    0x5133ef95, 0x17e1daf1, 0x2a50362d, 0x9a45b039, 0xa7f45ce5,
+    0xe1266981, 0xdc97855d, 0x5a7c63e8, 0x67cd8f34, 0x211fba50,
+    0x1cae568c, 0xacbbd098, 0x910a3c44, 0xd7d80920, 0xea69e5fc,
+    0x017ec20b, 0x3ccf2ed7, 0x7a1d1bb3, 0x47acf76f, 0xf7b9717b,
+    0xca089da7, 0x8cdaa8c3, 0xb16b441f, 0x3780a2aa, 0x0a314e76,
+    0x4ce37b12, 0x715297ce, 0xc14711da, 0xfcf6fd06, 0xba24c862,
+    0x879524be, 0xb77b81cd, 0x8aca6d11, 0xcc185875, 0xf1a9b4a9,
+    0x41bc32bd, 0x7c0dde61, 0x3adfeb05, 0x076e07d9, 0x8185e16c,
+    0xbc340db0, 0xfae638d4, 0xc757d408, 0x7742521c, 0x4af3bec0,
+    0x0c218ba4, 0x31906778, 0xda87408f, 0xe736ac53, 0xa1e49937,
+    0x9c5575eb, 0x2c40f3ff, 0x11f11f23, 0x57232a47, 0x6a92c69b,
+    0xec79202e, 0xd1c8ccf2, 0x971af996, 0xaaab154a, 0x1abe935e,
+    0x270f7f82, 0x61dd4ae6, 0x5c6ca63a, 0xd9040692, 0xe4b5ea4e,
+    0xa267df2a, 0x9fd633f6, 0x2fc3b5e2, 0x1272593e, 0x54a06c5a,
+    0x69118086, 0xeffa6633, 0xd24b8aef, 0x9499bf8b, 0xa9285357,
+    0x193dd543, 0x248c399f, 0x625e0cfb, 0x5fefe027, 0xb4f8c7d0,
+    0x89492b0c, 0xcf9b1e68, 0xf22af2b4, 0x423f74a0, 0x7f8e987c,
+    0x395cad18, 0x04ed41c4, 0x8206a771, 0xbfb74bad, 0xf9657ec9,
+    0xc4d49215, 0x74c11401, 0x4970f8dd, 0x0fa2cdb9, 0x32132165,
+    0x02fd8416, 0x3f4c68ca, 0x799e5dae, 0x442fb172, 0xf43a3766,
+    0xc98bdbba, 0x8f59eede, 0xb2e80202, 0x3403e4b7, 0x09b2086b,
+    0x4f603d0f, 0x72d1d1d3, 0xc2c457c7, 0xff75bb1b, 0xb9a78e7f,
+    0x841662a3, 0x6f014554, 0x52b0a988, 0x14629cec, 0x29d37030,
+    0x99c6f624, 0xa4771af8, 0xe2a52f9c, 0xdf14c340, 0x59ff25f5,
+    0x644ec929, 0x229cfc4d, 0x1f2d1091, 0xaf389685, 0x92897a59,
+    0xd45b4f3d, 0xe9eaa3e1, 0xb58605db, 0x8837e907, 0xcee5dc63,
+    0xf35430bf, 0x4341b6ab, 0x7ef05a77, 0x38226f13, 0x059383cf,
+    0x8378657a, 0xbec989a6, 0xf81bbcc2, 0xc5aa501e, 0x75bfd60a,
+    0x480e3ad6, 0x0edc0fb2, 0x336de36e, 0xd87ac499, 0xe5cb2845,
+    0xa3191d21, 0x9ea8f1fd, 0x2ebd77e9, 0x130c9b35, 0x55deae51,
+    0x686f428d, 0xee84a438, 0xd33548e4, 0x95e77d80, 0xa856915c,
+    0x18431748, 0x25f2fb94, 0x6320cef0, 0x5e91222c, 0x6e7f875f,
+    0x53ce6b83, 0x151c5ee7, 0x28adb23b, 0x98b8342f, 0xa509d8f3,
+    0xe3dbed97, 0xde6a014b, 0x5881e7fe, 0x65300b22, 0x23e23e46,
+    0x1e53d29a, 0xae46548e, 0x93f7b852, 0xd5258d36, 0xe89461ea,
+    0x0383461d, 0x3e32aac1, 0x78e09fa5, 0x45517379, 0xf544f56d,
+    0xc8f519b1, 0x8e272cd5, 0xb396c009, 0x357d26bc, 0x08ccca60,
+    0x4e1eff04, 0x73af13d8, 0xc3ba95cc, 0xfe0b7910, 0xb8d94c74,
+    0x8568a0a8},
+   {0x00000000, 0x69790b65, 0xd2f216ca, 0xbb8b1daf, 0x7e952bd5,
+    0x17ec20b0, 0xac673d1f, 0xc51e367a, 0xfd2a57aa, 0x94535ccf,
+    0x2fd84160, 0x46a14a05, 0x83bf7c7f, 0xeac6771a, 0x514d6ab5,
+    0x383461d0, 0x2125a915, 0x485ca270, 0xf3d7bfdf, 0x9aaeb4ba,
+    0x5fb082c0, 0x36c989a5, 0x8d42940a, 0xe43b9f6f, 0xdc0ffebf,
+    0xb576f5da, 0x0efde875, 0x6784e310, 0xa29ad56a, 0xcbe3de0f,
+    0x7068c3a0, 0x1911c8c5, 0x424b522a, 0x2b32594f, 0x90b944e0,
+    0xf9c04f85, 0x3cde79ff, 0x55a7729a, 0xee2c6f35, 0x87556450,
+    0xbf610580, 0xd6180ee5, 0x6d93134a, 0x04ea182f, 0xc1f42e55,
+    0xa88d2530, 0x1306389f, 0x7a7f33fa, 0x636efb3f, 0x0a17f05a,
+    0xb19cedf5, 0xd8e5e690, 0x1dfbd0ea, 0x7482db8f, 0xcf09c620,
+    0xa670cd45, 0x9e44ac95, 0xf73da7f0, 0x4cb6ba5f, 0x25cfb13a,
+    0xe0d18740, 0x89a88c25, 0x3223918a, 0x5b5a9aef, 0x8496a454,
+    0xedefaf31, 0x5664b29e, 0x3f1db9fb, 0xfa038f81, 0x937a84e4,
+    0x28f1994b, 0x4188922e, 0x79bcf3fe, 0x10c5f89b, 0xab4ee534,
+    0xc237ee51, 0x0729d82b, 0x6e50d34e, 0xd5dbcee1, 0xbca2c584,
+    0xa5b30d41, 0xccca0624, 0x77411b8b, 0x1e3810ee, 0xdb262694,
+    0xb25f2df1, 0x09d4305e, 0x60ad3b3b, 0x58995aeb, 0x31e0518e,
+    0x8a6b4c21, 0xe3124744, 0x260c713e, 0x4f757a5b, 0xf4fe67f4,
+    0x9d876c91, 0xc6ddf67e, 0xafa4fd1b, 0x142fe0b4, 0x7d56ebd1,
+    0xb848ddab, 0xd131d6ce, 0x6abacb61, 0x03c3c004, 0x3bf7a1d4,
+    0x528eaab1, 0xe905b71e, 0x807cbc7b, 0x45628a01, 0x2c1b8164,
+    0x97909ccb, 0xfee997ae, 0xe7f85f6b, 0x8e81540e, 0x350a49a1,
+    0x5c7342c4, 0x996d74be, 0xf0147fdb, 0x4b9f6274, 0x22e66911,
+    0x1ad208c1, 0x73ab03a4, 0xc8201e0b, 0xa159156e, 0x64472314,
+    0x0d3e2871, 0xb6b535de, 0xdfcc3ebb, 0xd25c4ee9, 0xbb25458c,
+    0x00ae5823, 0x69d75346, 0xacc9653c, 0xc5b06e59, 0x7e3b73f6,
+    0x17427893, 0x2f761943, 0x460f1226, 0xfd840f89, 0x94fd04ec,
+    0x51e33296, 0x389a39f3, 0x8311245c, 0xea682f39, 0xf379e7fc,
+    0x9a00ec99, 0x218bf136, 0x48f2fa53, 0x8deccc29, 0xe495c74c,
+    0x5f1edae3, 0x3667d186, 0x0e53b056, 0x672abb33, 0xdca1a69c,
+    0xb5d8adf9, 0x70c69b83, 0x19bf90e6, 0xa2348d49, 0xcb4d862c,
+    0x90171cc3, 0xf96e17a6, 0x42e50a09, 0x2b9c016c, 0xee823716,
+    0x87fb3c73, 0x3c7021dc, 0x55092ab9, 0x6d3d4b69, 0x0444400c,
+    0xbfcf5da3, 0xd6b656c6, 0x13a860bc, 0x7ad16bd9, 0xc15a7676,
+    0xa8237d13, 0xb132b5d6, 0xd84bbeb3, 0x63c0a31c, 0x0ab9a879,
+    0xcfa79e03, 0xa6de9566, 0x1d5588c9, 0x742c83ac, 0x4c18e27c,
+    0x2561e919, 0x9eeaf4b6, 0xf793ffd3, 0x328dc9a9, 0x5bf4c2cc,
+    0xe07fdf63, 0x8906d406, 0x56caeabd, 0x3fb3e1d8, 0x8438fc77,
+    0xed41f712, 0x285fc168, 0x4126ca0d, 0xfaadd7a2, 0x93d4dcc7,
+    0xabe0bd17, 0xc299b672, 0x7912abdd, 0x106ba0b8, 0xd57596c2,
+    0xbc0c9da7, 0x07878008, 0x6efe8b6d, 0x77ef43a8, 0x1e9648cd,
+    0xa51d5562, 0xcc645e07, 0x097a687d, 0x60036318, 0xdb887eb7,
+    0xb2f175d2, 0x8ac51402, 0xe3bc1f67, 0x583702c8, 0x314e09ad,
+    0xf4503fd7, 0x9d2934b2, 0x26a2291d, 0x4fdb2278, 0x1481b897,
+    0x7df8b3f2, 0xc673ae5d, 0xaf0aa538, 0x6a149342, 0x036d9827,
+    0xb8e68588, 0xd19f8eed, 0xe9abef3d, 0x80d2e458, 0x3b59f9f7,
+    0x5220f292, 0x973ec4e8, 0xfe47cf8d, 0x45ccd222, 0x2cb5d947,
+    0x35a41182, 0x5cdd1ae7, 0xe7560748, 0x8e2f0c2d, 0x4b313a57,
+    0x22483132, 0x99c32c9d, 0xf0ba27f8, 0xc88e4628, 0xa1f74d4d,
+    0x1a7c50e2, 0x73055b87, 0xb61b6dfd, 0xdf626698, 0x64e97b37,
+    0x0d907052},
+   {0x00000000, 0x7fc99b93, 0xff933726, 0x805aacb5, 0x2457680d,
+    0x5b9ef39e, 0xdbc45f2b, 0xa40dc4b8, 0x48aed01a, 0x37674b89,
+    0xb73de73c, 0xc8f47caf, 0x6cf9b817, 0x13302384, 0x936a8f31,
+    0xeca314a2, 0x915da034, 0xee943ba7, 0x6ece9712, 0x11070c81,
+    0xb50ac839, 0xcac353aa, 0x4a99ff1f, 0x3550648c, 0xd9f3702e,
+    0xa63aebbd, 0x26604708, 0x59a9dc9b, 0xfda41823, 0x826d83b0,
+    0x02372f05, 0x7dfeb496, 0xf9ca4629, 0x8603ddba, 0x0659710f,
+    0x7990ea9c, 0xdd9d2e24, 0xa254b5b7, 0x220e1902, 0x5dc78291,
+    0xb1649633, 0xcead0da0, 0x4ef7a115, 0x313e3a86, 0x9533fe3e,
+    0xeafa65ad, 0x6aa0c918, 0x1569528b, 0x6897e61d, 0x175e7d8e,
+    0x9704d13b, 0xe8cd4aa8, 0x4cc08e10, 0x33091583, 0xb353b936,
+    0xcc9a22a5, 0x20393607, 0x5ff0ad94, 0xdfaa0121, 0xa0639ab2,
+    0x046e5e0a, 0x7ba7c599, 0xfbfd692c, 0x8434f2bf, 0x28e58a13,
+    0x572c1180, 0xd776bd35, 0xa8bf26a6, 0x0cb2e21e, 0x737b798d,
+    0xf321d538, 0x8ce84eab, 0x604b5a09, 0x1f82c19a, 0x9fd86d2f,
+    0xe011f6bc, 0x441c3204, 0x3bd5a997, 0xbb8f0522, 0xc4469eb1,
+    0xb9b82a27, 0xc671b1b4, 0x462b1d01, 0x39e28692, 0x9def422a,
+    0xe226d9b9, 0x627c750c, 0x1db5ee9f, 0xf116fa3d, 0x8edf61ae,
+    0x0e85cd1b, 0x714c5688, 0xd5419230, 0xaa8809a3, 0x2ad2a516,
+    0x551b3e85, 0xd12fcc3a, 0xaee657a9, 0x2ebcfb1c, 0x5175608f,
+    0xf578a437, 0x8ab13fa4, 0x0aeb9311, 0x75220882, 0x99811c20,
+    0xe64887b3, 0x66122b06, 0x19dbb095, 0xbdd6742d, 0xc21fefbe,
+    0x4245430b, 0x3d8cd898, 0x40726c0e, 0x3fbbf79d, 0xbfe15b28,
+    0xc028c0bb, 0x64250403, 0x1bec9f90, 0x9bb63325, 0xe47fa8b6,
+    0x08dcbc14, 0x77152787, 0xf74f8b32, 0x888610a1, 0x2c8bd419,
+    0x53424f8a, 0xd318e33f, 0xacd178ac, 0x51cb1426, 0x2e028fb5,
+    0xae582300, 0xd191b893, 0x759c7c2b, 0x0a55e7b8, 0x8a0f4b0d,
+    0xf5c6d09e, 0x1965c43c, 0x66ac5faf, 0xe6f6f31a, 0x993f6889,
+    0x3d32ac31, 0x42fb37a2, 0xc2a19b17, 0xbd680084, 0xc096b412,
+    0xbf5f2f81, 0x3f058334, 0x40cc18a7, 0xe4c1dc1f, 0x9b08478c,
+    0x1b52eb39, 0x649b70aa, 0x88386408, 0xf7f1ff9b, 0x77ab532e,
+    0x0862c8bd, 0xac6f0c05, 0xd3a69796, 0x53fc3b23, 0x2c35a0b0,
+    0xa801520f, 0xd7c8c99c, 0x57926529, 0x285bfeba, 0x8c563a02,
+    0xf39fa191, 0x73c50d24, 0x0c0c96b7, 0xe0af8215, 0x9f661986,
+    0x1f3cb533, 0x60f52ea0, 0xc4f8ea18, 0xbb31718b, 0x3b6bdd3e,
+    0x44a246ad, 0x395cf23b, 0x469569a8, 0xc6cfc51d, 0xb9065e8e,
+    0x1d0b9a36, 0x62c201a5, 0xe298ad10, 0x9d513683, 0x71f22221,
+    0x0e3bb9b2, 0x8e611507, 0xf1a88e94, 0x55a54a2c, 0x2a6cd1bf,
+    0xaa367d0a, 0xd5ffe699, 0x792e9e35, 0x06e705a6, 0x86bda913,
+    0xf9743280, 0x5d79f638, 0x22b06dab, 0xa2eac11e, 0xdd235a8d,
+    0x31804e2f, 0x4e49d5bc, 0xce137909, 0xb1dae29a, 0x15d72622,
+    0x6a1ebdb1, 0xea441104, 0x958d8a97, 0xe8733e01, 0x97baa592,
+    0x17e00927, 0x682992b4, 0xcc24560c, 0xb3edcd9f, 0x33b7612a,
+    0x4c7efab9, 0xa0ddee1b, 0xdf147588, 0x5f4ed93d, 0x208742ae,
+    0x848a8616, 0xfb431d85, 0x7b19b130, 0x04d02aa3, 0x80e4d81c,
+    0xff2d438f, 0x7f77ef3a, 0x00be74a9, 0xa4b3b011, 0xdb7a2b82,
+    0x5b208737, 0x24e91ca4, 0xc84a0806, 0xb7839395, 0x37d93f20,
+    0x4810a4b3, 0xec1d600b, 0x93d4fb98, 0x138e572d, 0x6c47ccbe,
+    0x11b97828, 0x6e70e3bb, 0xee2a4f0e, 0x91e3d49d, 0x35ee1025,
+    0x4a278bb6, 0xca7d2703, 0xb5b4bc90, 0x5917a832, 0x26de33a1,
+    0xa6849f14, 0xd94d0487, 0x7d40c03f, 0x02895bac, 0x82d3f719,
+    0xfd1a6c8a},
+   {0x00000000, 0xa396284c, 0x9c5d56d9, 0x3fcb7e95, 0xe3cbabf3,
+    0x405d83bf, 0x7f96fd2a, 0xdc00d566, 0x1ce651a7, 0xbf7079eb,
+    0x80bb077e, 0x232d2f32, 0xff2dfa54, 0x5cbbd218, 0x6370ac8d,
+    0xc0e684c1, 0x39cca34e, 0x9a5a8b02, 0xa591f597, 0x0607dddb,
+    0xda0708bd, 0x799120f1, 0x465a5e64, 0xe5cc7628, 0x252af2e9,
+    0x86bcdaa5, 0xb977a430, 0x1ae18c7c, 0xc6e1591a, 0x65777156,
+    0x5abc0fc3, 0xf92a278f, 0x7399469c, 0xd00f6ed0, 0xefc41045,
+    0x4c523809, 0x9052ed6f, 0x33c4c523, 0x0c0fbbb6, 0xaf9993fa,
+    0x6f7f173b, 0xcce93f77, 0xf32241e2, 0x50b469ae, 0x8cb4bcc8,
+    0x2f229484, 0x10e9ea11, 0xb37fc25d, 0x4a55e5d2, 0xe9c3cd9e,
+    0xd608b30b, 0x759e9b47, 0xa99e4e21, 0x0a08666d, 0x35c318f8,
+    0x965530b4, 0x56b3b475, 0xf5259c39, 0xcaeee2ac, 0x6978cae0,
+    0xb5781f86, 0x16ee37ca, 0x2925495f, 0x8ab36113, 0xe7328d38,
+    0x44a4a574, 0x7b6fdbe1, 0xd8f9f3ad, 0x04f926cb, 0xa76f0e87,
+    0x98a47012, 0x3b32585e, 0xfbd4dc9f, 0x5842f4d3, 0x67898a46,
+    0xc41fa20a, 0x181f776c, 0xbb895f20, 0x844221b5, 0x27d409f9,
+    0xdefe2e76, 0x7d68063a, 0x42a378af, 0xe13550e3, 0x3d358585,
+    0x9ea3adc9, 0xa168d35c, 0x02fefb10, 0xc2187fd1, 0x618e579d,
+    0x5e452908, 0xfdd30144, 0x21d3d422, 0x8245fc6e, 0xbd8e82fb,
+    0x1e18aab7, 0x94abcba4, 0x373de3e8, 0x08f69d7d, 0xab60b531,
+    0x77606057, 0xd4f6481b, 0xeb3d368e, 0x48ab1ec2, 0x884d9a03,
+    0x2bdbb24f, 0x1410ccda, 0xb786e496, 0x6b8631f0, 0xc81019bc,
+    0xf7db6729, 0x544d4f65, 0xad6768ea, 0x0ef140a6, 0x313a3e33,
+    0x92ac167f, 0x4eacc319, 0xed3aeb55, 0xd2f195c0, 0x7167bd8c,
+    0xb181394d, 0x12171101, 0x2ddc6f94, 0x8e4a47d8, 0x524a92be,
+    0xf1dcbaf2, 0xce17c467, 0x6d81ec2b, 0x15141c31, 0xb682347d,
+    0x89494ae8, 0x2adf62a4, 0xf6dfb7c2, 0x55499f8e, 0x6a82e11b,
+    0xc914c957, 0x09f24d96, 0xaa6465da, 0x95af1b4f, 0x36393303,
+    0xea39e665, 0x49afce29, 0x7664b0bc, 0xd5f298f0, 0x2cd8bf7f,
+    0x8f4e9733, 0xb085e9a6, 0x1313c1ea, 0xcf13148c, 0x6c853cc0,
+    0x534e4255, 0xf0d86a19, 0x303eeed8, 0x93a8c694, 0xac63b801,
+    0x0ff5904d, 0xd3f5452b, 0x70636d67, 0x4fa813f2, 0xec3e3bbe,
+    0x668d5aad, 0xc51b72e1, 0xfad00c74, 0x59462438, 0x8546f15e,
+    0x26d0d912, 0x191ba787, 0xba8d8fcb, 0x7a6b0b0a, 0xd9fd2346,
+    0xe6365dd3, 0x45a0759f, 0x99a0a0f9, 0x3a3688b5, 0x05fdf620,
+    0xa66bde6c, 0x5f41f9e3, 0xfcd7d1af, 0xc31caf3a, 0x608a8776,
+    0xbc8a5210, 0x1f1c7a5c, 0x20d704c9, 0x83412c85, 0x43a7a844,
+    0xe0318008, 0xdffafe9d, 0x7c6cd6d1, 0xa06c03b7, 0x03fa2bfb,
+    0x3c31556e, 0x9fa77d22, 0xf2269109, 0x51b0b945, 0x6e7bc7d0,
+    0xcdedef9c, 0x11ed3afa, 0xb27b12b6, 0x8db06c23, 0x2e26446f,
+    0xeec0c0ae, 0x4d56e8e2, 0x729d9677, 0xd10bbe3b, 0x0d0b6b5d,
+    0xae9d4311, 0x91563d84, 0x32c015c8, 0xcbea3247, 0x687c1a0b,
+    0x57b7649e, 0xf4214cd2, 0x282199b4, 0x8bb7b1f8, 0xb47ccf6d,
+    0x17eae721, 0xd70c63e0, 0x749a4bac, 0x4b513539, 0xe8c71d75,
+    0x34c7c813, 0x9751e05f, 0xa89a9eca, 0x0b0cb686, 0x81bfd795,
+    0x2229ffd9, 0x1de2814c, 0xbe74a900, 0x62747c66, 0xc1e2542a,
+    0xfe292abf, 0x5dbf02f3, 0x9d598632, 0x3ecfae7e, 0x0104d0eb,
+    0xa292f8a7, 0x7e922dc1, 0xdd04058d, 0xe2cf7b18, 0x41595354,
+    0xb87374db, 0x1be55c97, 0x242e2202, 0x87b80a4e, 0x5bb8df28,
+    0xf82ef764, 0xc7e589f1, 0x6473a1bd, 0xa495257c, 0x07030d30,
+    0x38c873a5, 0x9b5e5be9, 0x475e8e8f, 0xe4c8a6c3, 0xdb03d856,
+    0x7895f01a},
+   {0x00000000, 0x2a283862, 0x545070c4, 0x7e7848a6, 0xa8a0e188,
+    0x8288d9ea, 0xfcf0914c, 0xd6d8a92e, 0x8a30c551, 0xa018fd33,
+    0xde60b595, 0xf4488df7, 0x229024d9, 0x08b81cbb, 0x76c0541d,
+    0x5ce86c7f, 0xcf108ce3, 0xe538b481, 0x9b40fc27, 0xb168c445,
+    0x67b06d6b, 0x4d985509, 0x33e01daf, 0x19c825cd, 0x452049b2,
+    0x6f0871d0, 0x11703976, 0x3b580114, 0xed80a83a, 0xc7a89058,
+    0xb9d0d8fe, 0x93f8e09c, 0x45501f87, 0x6f7827e5, 0x11006f43,
+    0x3b285721, 0xedf0fe0f, 0xc7d8c66d, 0xb9a08ecb, 0x9388b6a9,
+    0xcf60dad6, 0xe548e2b4, 0x9b30aa12, 0xb1189270, 0x67c03b5e,
+    0x4de8033c, 0x33904b9a, 0x19b873f8, 0x8a409364, 0xa068ab06,
+    0xde10e3a0, 0xf438dbc2, 0x22e072ec, 0x08c84a8e, 0x76b00228,
+    0x5c983a4a, 0x00705635, 0x2a586e57, 0x542026f1, 0x7e081e93,
+    0xa8d0b7bd, 0x82f88fdf, 0xfc80c779, 0xd6a8ff1b, 0x8aa03f0e,
+    0xa088076c, 0xdef04fca, 0xf4d877a8, 0x2200de86, 0x0828e6e4,
+    0x7650ae42, 0x5c789620, 0x0090fa5f, 0x2ab8c23d, 0x54c08a9b,
+    0x7ee8b2f9, 0xa8301bd7, 0x821823b5, 0xfc606b13, 0xd6485371,
+    0x45b0b3ed, 0x6f988b8f, 0x11e0c329, 0x3bc8fb4b, 0xed105265,
+    0xc7386a07, 0xb94022a1, 0x93681ac3, 0xcf8076bc, 0xe5a84ede,
+    0x9bd00678, 0xb1f83e1a, 0x67209734, 0x4d08af56, 0x3370e7f0,
+    0x1958df92, 0xcff02089, 0xe5d818eb, 0x9ba0504d, 0xb188682f,
+    0x6750c101, 0x4d78f963, 0x3300b1c5, 0x192889a7, 0x45c0e5d8,
+    0x6fe8ddba, 0x1190951c, 0x3bb8ad7e, 0xed600450, 0xc7483c32,
+    0xb9307494, 0x93184cf6, 0x00e0ac6a, 0x2ac89408, 0x54b0dcae,
+    0x7e98e4cc, 0xa8404de2, 0x82687580, 0xfc103d26, 0xd6380544,
+    0x8ad0693b, 0xa0f85159, 0xde8019ff, 0xf4a8219d, 0x227088b3,
+    0x0858b0d1, 0x7620f877, 0x5c08c015, 0xce31785d, 0xe419403f,
+    0x9a610899, 0xb04930fb, 0x669199d5, 0x4cb9a1b7, 0x32c1e911,
+    0x18e9d173, 0x4401bd0c, 0x6e29856e, 0x1051cdc8, 0x3a79f5aa,
+    0xeca15c84, 0xc68964e6, 0xb8f12c40, 0x92d91422, 0x0121f4be,
+    0x2b09ccdc, 0x5571847a, 0x7f59bc18, 0xa9811536, 0x83a92d54,
+    0xfdd165f2, 0xd7f95d90, 0x8b1131ef, 0xa139098d, 0xdf41412b,
+    0xf5697949, 0x23b1d067, 0x0999e805, 0x77e1a0a3, 0x5dc998c1,
+    0x8b6167da, 0xa1495fb8, 0xdf31171e, 0xf5192f7c, 0x23c18652,
+    0x09e9be30, 0x7791f696, 0x5db9cef4, 0x0151a28b, 0x2b799ae9,
+    0x5501d24f, 0x7f29ea2d, 0xa9f14303, 0x83d97b61, 0xfda133c7,
+    0xd7890ba5, 0x4471eb39, 0x6e59d35b, 0x10219bfd, 0x3a09a39f,
+    0xecd10ab1, 0xc6f932d3, 0xb8817a75, 0x92a94217, 0xce412e68,
+    0xe469160a, 0x9a115eac, 0xb03966ce, 0x66e1cfe0, 0x4cc9f782,
+    0x32b1bf24, 0x18998746, 0x44914753, 0x6eb97f31, 0x10c13797,
+    0x3ae90ff5, 0xec31a6db, 0xc6199eb9, 0xb861d61f, 0x9249ee7d,
+    0xcea18202, 0xe489ba60, 0x9af1f2c6, 0xb0d9caa4, 0x6601638a,
+    0x4c295be8, 0x3251134e, 0x18792b2c, 0x8b81cbb0, 0xa1a9f3d2,
+    0xdfd1bb74, 0xf5f98316, 0x23212a38, 0x0909125a, 0x77715afc,
+    0x5d59629e, 0x01b10ee1, 0x2b993683, 0x55e17e25, 0x7fc94647,
+    0xa911ef69, 0x8339d70b, 0xfd419fad, 0xd769a7cf, 0x01c158d4,
+    0x2be960b6, 0x55912810, 0x7fb91072, 0xa961b95c, 0x8349813e,
+    0xfd31c998, 0xd719f1fa, 0x8bf19d85, 0xa1d9a5e7, 0xdfa1ed41,
+    0xf589d523, 0x23517c0d, 0x0979446f, 0x77010cc9, 0x5d2934ab,
+    0xced1d437, 0xe4f9ec55, 0x9a81a4f3, 0xb0a99c91, 0x667135bf,
+    0x4c590ddd, 0x3221457b, 0x18097d19, 0x44e11166, 0x6ec92904,
+    0x10b161a2, 0x3a9959c0, 0xec41f0ee, 0xc669c88c, 0xb811802a,
+    0x9239b848},
+   {0x00000000, 0x4713f6fb, 0x8e27edf6, 0xc9341b0d, 0xc73eddad,
+    0x802d2b56, 0x4919305b, 0x0e0ac6a0, 0x550cbd1b, 0x121f4be0,
+    0xdb2b50ed, 0x9c38a616, 0x923260b6, 0xd521964d, 0x1c158d40,
+    0x5b067bbb, 0xaa197a36, 0xed0a8ccd, 0x243e97c0, 0x632d613b,
+    0x6d27a79b, 0x2a345160, 0xe3004a6d, 0xa413bc96, 0xff15c72d,
+    0xb80631d6, 0x71322adb, 0x3621dc20, 0x382b1a80, 0x7f38ec7b,
+    0xb60cf776, 0xf11f018d, 0x8f43f22d, 0xc85004d6, 0x01641fdb,
+    0x4677e920, 0x487d2f80, 0x0f6ed97b, 0xc65ac276, 0x8149348d,
+    0xda4f4f36, 0x9d5cb9cd, 0x5468a2c0, 0x137b543b, 0x1d71929b,
+    0x5a626460, 0x93567f6d, 0xd4458996, 0x255a881b, 0x62497ee0,
+    0xab7d65ed, 0xec6e9316, 0xe26455b6, 0xa577a34d, 0x6c43b840,
+    0x2b504ebb, 0x70563500, 0x3745c3fb, 0xfe71d8f6, 0xb9622e0d,
+    0xb768e8ad, 0xf07b1e56, 0x394f055b, 0x7e5cf3a0, 0xc5f6e21b,
+    0x82e514e0, 0x4bd10fed, 0x0cc2f916, 0x02c83fb6, 0x45dbc94d,
+    0x8cefd240, 0xcbfc24bb, 0x90fa5f00, 0xd7e9a9fb, 0x1eddb2f6,
+    0x59ce440d, 0x57c482ad, 0x10d77456, 0xd9e36f5b, 0x9ef099a0,
+    0x6fef982d, 0x28fc6ed6, 0xe1c875db, 0xa6db8320, 0xa8d14580,
+    0xefc2b37b, 0x26f6a876, 0x61e55e8d, 0x3ae32536, 0x7df0d3cd,
+    0xb4c4c8c0, 0xf3d73e3b, 0xfdddf89b, 0xbace0e60, 0x73fa156d,
+    0x34e9e396, 0x4ab51036, 0x0da6e6cd, 0xc492fdc0, 0x83810b3b,
+    0x8d8bcd9b, 0xca983b60, 0x03ac206d, 0x44bfd696, 0x1fb9ad2d,
+    0x58aa5bd6, 0x919e40db, 0xd68db620, 0xd8877080, 0x9f94867b,
+    0x56a09d76, 0x11b36b8d, 0xe0ac6a00, 0xa7bf9cfb, 0x6e8b87f6,
+    0x2998710d, 0x2792b7ad, 0x60814156, 0xa9b55a5b, 0xeea6aca0,
+    0xb5a0d71b, 0xf2b321e0, 0x3b873aed, 0x7c94cc16, 0x729e0ab6,
+    0x358dfc4d, 0xfcb9e740, 0xbbaa11bb, 0x509cc277, 0x178f348c,
+    0xdebb2f81, 0x99a8d97a, 0x97a21fda, 0xd0b1e921, 0x1985f22c,
+    0x5e9604d7, 0x05907f6c, 0x42838997, 0x8bb7929a, 0xcca46461,
+    0xc2aea2c1, 0x85bd543a, 0x4c894f37, 0x0b9ab9cc, 0xfa85b841,
+    0xbd964eba, 0x74a255b7, 0x33b1a34c, 0x3dbb65ec, 0x7aa89317,
+    0xb39c881a, 0xf48f7ee1, 0xaf89055a, 0xe89af3a1, 0x21aee8ac,
+    0x66bd1e57, 0x68b7d8f7, 0x2fa42e0c, 0xe6903501, 0xa183c3fa,
+    0xdfdf305a, 0x98ccc6a1, 0x51f8ddac, 0x16eb2b57, 0x18e1edf7,
+    0x5ff21b0c, 0x96c60001, 0xd1d5f6fa, 0x8ad38d41, 0xcdc07bba,
+    0x04f460b7, 0x43e7964c, 0x4ded50ec, 0x0afea617, 0xc3cabd1a,
+    0x84d94be1, 0x75c64a6c, 0x32d5bc97, 0xfbe1a79a, 0xbcf25161,
+    0xb2f897c1, 0xf5eb613a, 0x3cdf7a37, 0x7bcc8ccc, 0x20caf777,
+    0x67d9018c, 0xaeed1a81, 0xe9feec7a, 0xe7f42ada, 0xa0e7dc21,
+    0x69d3c72c, 0x2ec031d7, 0x956a206c, 0xd279d697, 0x1b4dcd9a,
+    0x5c5e3b61, 0x5254fdc1, 0x15470b3a, 0xdc731037, 0x9b60e6cc,
+    0xc0669d77, 0x87756b8c, 0x4e417081, 0x0952867a, 0x075840da,
+    0x404bb621, 0x897fad2c, 0xce6c5bd7, 0x3f735a5a, 0x7860aca1,
+    0xb154b7ac, 0xf6474157, 0xf84d87f7, 0xbf5e710c, 0x766a6a01,
+    0x31799cfa, 0x6a7fe741, 0x2d6c11ba, 0xe4580ab7, 0xa34bfc4c,
+    0xad413aec, 0xea52cc17, 0x2366d71a, 0x647521e1, 0x1a29d241,
+    0x5d3a24ba, 0x940e3fb7, 0xd31dc94c, 0xdd170fec, 0x9a04f917,
+    0x5330e21a, 0x142314e1, 0x4f256f5a, 0x083699a1, 0xc10282ac,
+    0x86117457, 0x881bb2f7, 0xcf08440c, 0x063c5f01, 0x412fa9fa,
+    0xb030a877, 0xf7235e8c, 0x3e174581, 0x7904b37a, 0x770e75da,
+    0x301d8321, 0xf929982c, 0xbe3a6ed7, 0xe53c156c, 0xa22fe397,
+    0x6b1bf89a, 0x2c080e61, 0x2202c8c1, 0x65113e3a, 0xac252537,
+    0xeb36d3cc},
+   {0x00000000, 0xa13984ee, 0x99020f9d, 0x383b8b73, 0xe975197b,
+    0x484c9d95, 0x707716e6, 0xd14e9208, 0x099b34b7, 0xa8a2b059,
+    0x90993b2a, 0x31a0bfc4, 0xe0ee2dcc, 0x41d7a922, 0x79ec2251,
+    0xd8d5a6bf, 0x1336696e, 0xb20fed80, 0x8a3466f3, 0x2b0de21d,
+    0xfa437015, 0x5b7af4fb, 0x63417f88, 0xc278fb66, 0x1aad5dd9,
+    0xbb94d937, 0x83af5244, 0x2296d6aa, 0xf3d844a2, 0x52e1c04c,
+    0x6ada4b3f, 0xcbe3cfd1, 0x266cd2dc, 0x87555632, 0xbf6edd41,
+    0x1e5759af, 0xcf19cba7, 0x6e204f49, 0x561bc43a, 0xf72240d4,
+    0x2ff7e66b, 0x8ece6285, 0xb6f5e9f6, 0x17cc6d18, 0xc682ff10,
+    0x67bb7bfe, 0x5f80f08d, 0xfeb97463, 0x355abbb2, 0x94633f5c,
+    0xac58b42f, 0x0d6130c1, 0xdc2fa2c9, 0x7d162627, 0x452dad54,
+    0xe41429ba, 0x3cc18f05, 0x9df80beb, 0xa5c38098, 0x04fa0476,
+    0xd5b4967e, 0x748d1290, 0x4cb699e3, 0xed8f1d0d, 0x4cd9a5b8,
+    0xede02156, 0xd5dbaa25, 0x74e22ecb, 0xa5acbcc3, 0x0495382d,
+    0x3caeb35e, 0x9d9737b0, 0x4542910f, 0xe47b15e1, 0xdc409e92,
+    0x7d791a7c, 0xac378874, 0x0d0e0c9a, 0x353587e9, 0x940c0307,
+    0x5fefccd6, 0xfed64838, 0xc6edc34b, 0x67d447a5, 0xb69ad5ad,
+    0x17a35143, 0x2f98da30, 0x8ea15ede, 0x5674f861, 0xf74d7c8f,
+    0xcf76f7fc, 0x6e4f7312, 0xbf01e11a, 0x1e3865f4, 0x2603ee87,
+    0x873a6a69, 0x6ab57764, 0xcb8cf38a, 0xf3b778f9, 0x528efc17,
+    0x83c06e1f, 0x22f9eaf1, 0x1ac26182, 0xbbfbe56c, 0x632e43d3,
+    0xc217c73d, 0xfa2c4c4e, 0x5b15c8a0, 0x8a5b5aa8, 0x2b62de46,
+    0x13595535, 0xb260d1db, 0x79831e0a, 0xd8ba9ae4, 0xe0811197,
+    0x41b89579, 0x90f60771, 0x31cf839f, 0x09f408ec, 0xa8cd8c02,
+    0x70182abd, 0xd121ae53, 0xe91a2520, 0x4823a1ce, 0x996d33c6,
+    0x3854b728, 0x006f3c5b, 0xa156b8b5, 0x99b34b70, 0x388acf9e,
+    0x00b144ed, 0xa188c003, 0x70c6520b, 0xd1ffd6e5, 0xe9c45d96,
+    0x48fdd978, 0x90287fc7, 0x3111fb29, 0x092a705a, 0xa813f4b4,
+    0x795d66bc, 0xd864e252, 0xe05f6921, 0x4166edcf, 0x8a85221e,
+    0x2bbca6f0, 0x13872d83, 0xb2bea96d, 0x63f03b65, 0xc2c9bf8b,
+    0xfaf234f8, 0x5bcbb016, 0x831e16a9, 0x22279247, 0x1a1c1934,
+    0xbb259dda, 0x6a6b0fd2, 0xcb528b3c, 0xf369004f, 0x525084a1,
+    0xbfdf99ac, 0x1ee61d42, 0x26dd9631, 0x87e412df, 0x56aa80d7,
+    0xf7930439, 0xcfa88f4a, 0x6e910ba4, 0xb644ad1b, 0x177d29f5,
+    0x2f46a286, 0x8e7f2668, 0x5f31b460, 0xfe08308e, 0xc633bbfd,
+    0x670a3f13, 0xace9f0c2, 0x0dd0742c, 0x35ebff5f, 0x94d27bb1,
+    0x459ce9b9, 0xe4a56d57, 0xdc9ee624, 0x7da762ca, 0xa572c475,
+    0x044b409b, 0x3c70cbe8, 0x9d494f06, 0x4c07dd0e, 0xed3e59e0,
+    0xd505d293, 0x743c567d, 0xd56aeec8, 0x74536a26, 0x4c68e155,
+    0xed5165bb, 0x3c1ff7b3, 0x9d26735d, 0xa51df82e, 0x04247cc0,
+    0xdcf1da7f, 0x7dc85e91, 0x45f3d5e2, 0xe4ca510c, 0x3584c304,
+    0x94bd47ea, 0xac86cc99, 0x0dbf4877, 0xc65c87a6, 0x67650348,
+    0x5f5e883b, 0xfe670cd5, 0x2f299edd, 0x8e101a33, 0xb62b9140,
+    0x171215ae, 0xcfc7b311, 0x6efe37ff, 0x56c5bc8c, 0xf7fc3862,
+    0x26b2aa6a, 0x878b2e84, 0xbfb0a5f7, 0x1e892119, 0xf3063c14,
+    0x523fb8fa, 0x6a043389, 0xcb3db767, 0x1a73256f, 0xbb4aa181,
+    0x83712af2, 0x2248ae1c, 0xfa9d08a3, 0x5ba48c4d, 0x639f073e,
+    0xc2a683d0, 0x13e811d8, 0xb2d19536, 0x8aea1e45, 0x2bd39aab,
+    0xe030557a, 0x4109d194, 0x79325ae7, 0xd80bde09, 0x09454c01,
+    0xa87cc8ef, 0x9047439c, 0x317ec772, 0xe9ab61cd, 0x4892e523,
+    0x70a96e50, 0xd190eabe, 0x00de78b6, 0xa1e7fc58, 0x99dc772b,
+    0x38e5f3c5},
+   {0x00000000, 0xe81790a1, 0x0b5e2703, 0xe349b7a2, 0x16bc4e06,
+    0xfeabdea7, 0x1de26905, 0xf5f5f9a4, 0x2d789c0c, 0xc56f0cad,
+    0x2626bb0f, 0xce312bae, 0x3bc4d20a, 0xd3d342ab, 0x309af509,
+    0xd88d65a8, 0x5af13818, 0xb2e6a8b9, 0x51af1f1b, 0xb9b88fba,
+    0x4c4d761e, 0xa45ae6bf, 0x4713511d, 0xaf04c1bc, 0x7789a414,
+    0x9f9e34b5, 0x7cd78317, 0x94c013b6, 0x6135ea12, 0x89227ab3,
+    0x6a6bcd11, 0x827c5db0, 0xb5e27030, 0x5df5e091, 0xbebc5733,
+    0x56abc792, 0xa35e3e36, 0x4b49ae97, 0xa8001935, 0x40178994,
+    0x989aec3c, 0x708d7c9d, 0x93c4cb3f, 0x7bd35b9e, 0x8e26a23a,
+    0x6631329b, 0x85788539, 0x6d6f1598, 0xef134828, 0x0704d889,
+    0xe44d6f2b, 0x0c5aff8a, 0xf9af062e, 0x11b8968f, 0xf2f1212d,
+    0x1ae6b18c, 0xc26bd424, 0x2a7c4485, 0xc935f327, 0x21226386,
+    0xd4d79a22, 0x3cc00a83, 0xdf89bd21, 0x379e2d80, 0xb0b5e621,
+    0x58a27680, 0xbbebc122, 0x53fc5183, 0xa609a827, 0x4e1e3886,
+    0xad578f24, 0x45401f85, 0x9dcd7a2d, 0x75daea8c, 0x96935d2e,
+    0x7e84cd8f, 0x8b71342b, 0x6366a48a, 0x802f1328, 0x68388389,
+    0xea44de39, 0x02534e98, 0xe11af93a, 0x090d699b, 0xfcf8903f,
+    0x14ef009e, 0xf7a6b73c, 0x1fb1279d, 0xc73c4235, 0x2f2bd294,
+    0xcc626536, 0x2475f597, 0xd1800c33, 0x39979c92, 0xdade2b30,
+    0x32c9bb91, 0x05579611, 0xed4006b0, 0x0e09b112, 0xe61e21b3,
+    0x13ebd817, 0xfbfc48b6, 0x18b5ff14, 0xf0a26fb5, 0x282f0a1d,
+    0xc0389abc, 0x23712d1e, 0xcb66bdbf, 0x3e93441b, 0xd684d4ba,
+    0x35cd6318, 0xdddaf3b9, 0x5fa6ae09, 0xb7b13ea8, 0x54f8890a,
+    0xbcef19ab, 0x491ae00f, 0xa10d70ae, 0x4244c70c, 0xaa5357ad,
+    0x72de3205, 0x9ac9a2a4, 0x79801506, 0x919785a7, 0x64627c03,
+    0x8c75eca2, 0x6f3c5b00, 0x872bcba1, 0xba1aca03, 0x520d5aa2,
+    0xb144ed00, 0x59537da1, 0xaca68405, 0x44b114a4, 0xa7f8a306,
+    0x4fef33a7, 0x9762560f, 0x7f75c6ae, 0x9c3c710c, 0x742be1ad,
+    0x81de1809, 0x69c988a8, 0x8a803f0a, 0x6297afab, 0xe0ebf21b,
+    0x08fc62ba, 0xebb5d518, 0x03a245b9, 0xf657bc1d, 0x1e402cbc,
+    0xfd099b1e, 0x151e0bbf, 0xcd936e17, 0x2584feb6, 0xc6cd4914,
+    0x2edad9b5, 0xdb2f2011, 0x3338b0b0, 0xd0710712, 0x386697b3,
+    0x0ff8ba33, 0xe7ef2a92, 0x04a69d30, 0xecb10d91, 0x1944f435,
+    0xf1536494, 0x121ad336, 0xfa0d4397, 0x2280263f, 0xca97b69e,
+    0x29de013c, 0xc1c9919d, 0x343c6839, 0xdc2bf898, 0x3f624f3a,
+    0xd775df9b, 0x5509822b, 0xbd1e128a, 0x5e57a528, 0xb6403589,
+    0x43b5cc2d, 0xaba25c8c, 0x48ebeb2e, 0xa0fc7b8f, 0x78711e27,
+    0x90668e86, 0x732f3924, 0x9b38a985, 0x6ecd5021, 0x86dac080,
+    0x65937722, 0x8d84e783, 0x0aaf2c22, 0xe2b8bc83, 0x01f10b21,
+    0xe9e69b80, 0x1c136224, 0xf404f285, 0x174d4527, 0xff5ad586,
+    0x27d7b02e, 0xcfc0208f, 0x2c89972d, 0xc49e078c, 0x316bfe28,
+    0xd97c6e89, 0x3a35d92b, 0xd222498a, 0x505e143a, 0xb849849b,
+    0x5b003339, 0xb317a398, 0x46e25a3c, 0xaef5ca9d, 0x4dbc7d3f,
+    0xa5abed9e, 0x7d268836, 0x95311897, 0x7678af35, 0x9e6f3f94,
+    0x6b9ac630, 0x838d5691, 0x60c4e133, 0x88d37192, 0xbf4d5c12,
+    0x575accb3, 0xb4137b11, 0x5c04ebb0, 0xa9f11214, 0x41e682b5,
+    0xa2af3517, 0x4ab8a5b6, 0x9235c01e, 0x7a2250bf, 0x996be71d,
+    0x717c77bc, 0x84898e18, 0x6c9e1eb9, 0x8fd7a91b, 0x67c039ba,
+    0xe5bc640a, 0x0dabf4ab, 0xeee24309, 0x06f5d3a8, 0xf3002a0c,
+    0x1b17baad, 0xf85e0d0f, 0x10499dae, 0xc8c4f806, 0x20d368a7,
+    0xc39adf05, 0x2b8d4fa4, 0xde78b600, 0x366f26a1, 0xd5269103,
+    0x3d3101a2}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xa19017e800000000, 0x03275e0b00000000,
+    0xa2b749e300000000, 0x064ebc1600000000, 0xa7deabfe00000000,
+    0x0569e21d00000000, 0xa4f9f5f500000000, 0x0c9c782d00000000,
+    0xad0c6fc500000000, 0x0fbb262600000000, 0xae2b31ce00000000,
+    0x0ad2c43b00000000, 0xab42d3d300000000, 0x09f59a3000000000,
+    0xa8658dd800000000, 0x1838f15a00000000, 0xb9a8e6b200000000,
+    0x1b1faf5100000000, 0xba8fb8b900000000, 0x1e764d4c00000000,
+    0xbfe65aa400000000, 0x1d51134700000000, 0xbcc104af00000000,
+    0x14a4897700000000, 0xb5349e9f00000000, 0x1783d77c00000000,
+    0xb613c09400000000, 0x12ea356100000000, 0xb37a228900000000,
+    0x11cd6b6a00000000, 0xb05d7c8200000000, 0x3070e2b500000000,
+    0x91e0f55d00000000, 0x3357bcbe00000000, 0x92c7ab5600000000,
+    0x363e5ea300000000, 0x97ae494b00000000, 0x351900a800000000,
+    0x9489174000000000, 0x3cec9a9800000000, 0x9d7c8d7000000000,
+    0x3fcbc49300000000, 0x9e5bd37b00000000, 0x3aa2268e00000000,
+    0x9b32316600000000, 0x3985788500000000, 0x98156f6d00000000,
+    0x284813ef00000000, 0x89d8040700000000, 0x2b6f4de400000000,
+    0x8aff5a0c00000000, 0x2e06aff900000000, 0x8f96b81100000000,
+    0x2d21f1f200000000, 0x8cb1e61a00000000, 0x24d46bc200000000,
+    0x85447c2a00000000, 0x27f335c900000000, 0x8663222100000000,
+    0x229ad7d400000000, 0x830ac03c00000000, 0x21bd89df00000000,
+    0x802d9e3700000000, 0x21e6b5b000000000, 0x8076a25800000000,
+    0x22c1ebbb00000000, 0x8351fc5300000000, 0x27a809a600000000,
+    0x86381e4e00000000, 0x248f57ad00000000, 0x851f404500000000,
+    0x2d7acd9d00000000, 0x8ceada7500000000, 0x2e5d939600000000,
+    0x8fcd847e00000000, 0x2b34718b00000000, 0x8aa4666300000000,
+    0x28132f8000000000, 0x8983386800000000, 0x39de44ea00000000,
+    0x984e530200000000, 0x3af91ae100000000, 0x9b690d0900000000,
+    0x3f90f8fc00000000, 0x9e00ef1400000000, 0x3cb7a6f700000000,
+    0x9d27b11f00000000, 0x35423cc700000000, 0x94d22b2f00000000,
+    0x366562cc00000000, 0x97f5752400000000, 0x330c80d100000000,
+    0x929c973900000000, 0x302bdeda00000000, 0x91bbc93200000000,
+    0x1196570500000000, 0xb00640ed00000000, 0x12b1090e00000000,
+    0xb3211ee600000000, 0x17d8eb1300000000, 0xb648fcfb00000000,
+    0x14ffb51800000000, 0xb56fa2f000000000, 0x1d0a2f2800000000,
+    0xbc9a38c000000000, 0x1e2d712300000000, 0xbfbd66cb00000000,
+    0x1b44933e00000000, 0xbad484d600000000, 0x1863cd3500000000,
+    0xb9f3dadd00000000, 0x09aea65f00000000, 0xa83eb1b700000000,
+    0x0a89f85400000000, 0xab19efbc00000000, 0x0fe01a4900000000,
+    0xae700da100000000, 0x0cc7444200000000, 0xad5753aa00000000,
+    0x0532de7200000000, 0xa4a2c99a00000000, 0x0615807900000000,
+    0xa785979100000000, 0x037c626400000000, 0xa2ec758c00000000,
+    0x005b3c6f00000000, 0xa1cb2b8700000000, 0x03ca1aba00000000,
+    0xa25a0d5200000000, 0x00ed44b100000000, 0xa17d535900000000,
+    0x0584a6ac00000000, 0xa414b14400000000, 0x06a3f8a700000000,
+    0xa733ef4f00000000, 0x0f56629700000000, 0xaec6757f00000000,
+    0x0c713c9c00000000, 0xade12b7400000000, 0x0918de8100000000,
+    0xa888c96900000000, 0x0a3f808a00000000, 0xabaf976200000000,
+    0x1bf2ebe000000000, 0xba62fc0800000000, 0x18d5b5eb00000000,
+    0xb945a20300000000, 0x1dbc57f600000000, 0xbc2c401e00000000,
+    0x1e9b09fd00000000, 0xbf0b1e1500000000, 0x176e93cd00000000,
+    0xb6fe842500000000, 0x1449cdc600000000, 0xb5d9da2e00000000,
+    0x11202fdb00000000, 0xb0b0383300000000, 0x120771d000000000,
+    0xb397663800000000, 0x33baf80f00000000, 0x922aefe700000000,
+    0x309da60400000000, 0x910db1ec00000000, 0x35f4441900000000,
+    0x946453f100000000, 0x36d31a1200000000, 0x97430dfa00000000,
+    0x3f26802200000000, 0x9eb697ca00000000, 0x3c01de2900000000,
+    0x9d91c9c100000000, 0x39683c3400000000, 0x98f82bdc00000000,
+    0x3a4f623f00000000, 0x9bdf75d700000000, 0x2b82095500000000,
+    0x8a121ebd00000000, 0x28a5575e00000000, 0x893540b600000000,
+    0x2dccb54300000000, 0x8c5ca2ab00000000, 0x2eebeb4800000000,
+    0x8f7bfca000000000, 0x271e717800000000, 0x868e669000000000,
+    0x24392f7300000000, 0x85a9389b00000000, 0x2150cd6e00000000,
+    0x80c0da8600000000, 0x2277936500000000, 0x83e7848d00000000,
+    0x222caf0a00000000, 0x83bcb8e200000000, 0x210bf10100000000,
+    0x809be6e900000000, 0x2462131c00000000, 0x85f204f400000000,
+    0x27454d1700000000, 0x86d55aff00000000, 0x2eb0d72700000000,
+    0x8f20c0cf00000000, 0x2d97892c00000000, 0x8c079ec400000000,
+    0x28fe6b3100000000, 0x896e7cd900000000, 0x2bd9353a00000000,
+    0x8a4922d200000000, 0x3a145e5000000000, 0x9b8449b800000000,
+    0x3933005b00000000, 0x98a317b300000000, 0x3c5ae24600000000,
+    0x9dcaf5ae00000000, 0x3f7dbc4d00000000, 0x9eedaba500000000,
+    0x3688267d00000000, 0x9718319500000000, 0x35af787600000000,
+    0x943f6f9e00000000, 0x30c69a6b00000000, 0x91568d8300000000,
+    0x33e1c46000000000, 0x9271d38800000000, 0x125c4dbf00000000,
+    0xb3cc5a5700000000, 0x117b13b400000000, 0xb0eb045c00000000,
+    0x1412f1a900000000, 0xb582e64100000000, 0x1735afa200000000,
+    0xb6a5b84a00000000, 0x1ec0359200000000, 0xbf50227a00000000,
+    0x1de76b9900000000, 0xbc777c7100000000, 0x188e898400000000,
+    0xb91e9e6c00000000, 0x1ba9d78f00000000, 0xba39c06700000000,
+    0x0a64bce500000000, 0xabf4ab0d00000000, 0x0943e2ee00000000,
+    0xa8d3f50600000000, 0x0c2a00f300000000, 0xadba171b00000000,
+    0x0f0d5ef800000000, 0xae9d491000000000, 0x06f8c4c800000000,
+    0xa768d32000000000, 0x05df9ac300000000, 0xa44f8d2b00000000,
+    0x00b678de00000000, 0xa1266f3600000000, 0x039126d500000000,
+    0xa201313d00000000},
+   {0x0000000000000000, 0xee8439a100000000, 0x9d0f029900000000,
+    0x738b3b3800000000, 0x7b1975e900000000, 0x959d4c4800000000,
+    0xe616777000000000, 0x08924ed100000000, 0xb7349b0900000000,
+    0x59b0a2a800000000, 0x2a3b999000000000, 0xc4bfa03100000000,
+    0xcc2deee000000000, 0x22a9d74100000000, 0x5122ec7900000000,
+    0xbfa6d5d800000000, 0x6e69361300000000, 0x80ed0fb200000000,
+    0xf366348a00000000, 0x1de20d2b00000000, 0x157043fa00000000,
+    0xfbf47a5b00000000, 0x887f416300000000, 0x66fb78c200000000,
+    0xd95dad1a00000000, 0x37d994bb00000000, 0x4452af8300000000,
+    0xaad6962200000000, 0xa244d8f300000000, 0x4cc0e15200000000,
+    0x3f4bda6a00000000, 0xd1cfe3cb00000000, 0xdcd26c2600000000,
+    0x3256558700000000, 0x41dd6ebf00000000, 0xaf59571e00000000,
+    0xa7cb19cf00000000, 0x494f206e00000000, 0x3ac41b5600000000,
+    0xd44022f700000000, 0x6be6f72f00000000, 0x8562ce8e00000000,
+    0xf6e9f5b600000000, 0x186dcc1700000000, 0x10ff82c600000000,
+    0xfe7bbb6700000000, 0x8df0805f00000000, 0x6374b9fe00000000,
+    0xb2bb5a3500000000, 0x5c3f639400000000, 0x2fb458ac00000000,
+    0xc130610d00000000, 0xc9a22fdc00000000, 0x2726167d00000000,
+    0x54ad2d4500000000, 0xba2914e400000000, 0x058fc13c00000000,
+    0xeb0bf89d00000000, 0x9880c3a500000000, 0x7604fa0400000000,
+    0x7e96b4d500000000, 0x90128d7400000000, 0xe399b64c00000000,
+    0x0d1d8fed00000000, 0xb8a5d94c00000000, 0x5621e0ed00000000,
+    0x25aadbd500000000, 0xcb2ee27400000000, 0xc3bcaca500000000,
+    0x2d38950400000000, 0x5eb3ae3c00000000, 0xb037979d00000000,
+    0x0f91424500000000, 0xe1157be400000000, 0x929e40dc00000000,
+    0x7c1a797d00000000, 0x748837ac00000000, 0x9a0c0e0d00000000,
+    0xe987353500000000, 0x07030c9400000000, 0xd6ccef5f00000000,
+    0x3848d6fe00000000, 0x4bc3edc600000000, 0xa547d46700000000,
+    0xadd59ab600000000, 0x4351a31700000000, 0x30da982f00000000,
+    0xde5ea18e00000000, 0x61f8745600000000, 0x8f7c4df700000000,
+    0xfcf776cf00000000, 0x12734f6e00000000, 0x1ae101bf00000000,
+    0xf465381e00000000, 0x87ee032600000000, 0x696a3a8700000000,
+    0x6477b56a00000000, 0x8af38ccb00000000, 0xf978b7f300000000,
+    0x17fc8e5200000000, 0x1f6ec08300000000, 0xf1eaf92200000000,
+    0x8261c21a00000000, 0x6ce5fbbb00000000, 0xd3432e6300000000,
+    0x3dc717c200000000, 0x4e4c2cfa00000000, 0xa0c8155b00000000,
+    0xa85a5b8a00000000, 0x46de622b00000000, 0x3555591300000000,
+    0xdbd160b200000000, 0x0a1e837900000000, 0xe49abad800000000,
+    0x971181e000000000, 0x7995b84100000000, 0x7107f69000000000,
+    0x9f83cf3100000000, 0xec08f40900000000, 0x028ccda800000000,
+    0xbd2a187000000000, 0x53ae21d100000000, 0x20251ae900000000,
+    0xcea1234800000000, 0xc6336d9900000000, 0x28b7543800000000,
+    0x5b3c6f0000000000, 0xb5b856a100000000, 0x704bb39900000000,
+    0x9ecf8a3800000000, 0xed44b10000000000, 0x03c088a100000000,
+    0x0b52c67000000000, 0xe5d6ffd100000000, 0x965dc4e900000000,
+    0x78d9fd4800000000, 0xc77f289000000000, 0x29fb113100000000,
+    0x5a702a0900000000, 0xb4f413a800000000, 0xbc665d7900000000,
+    0x52e264d800000000, 0x21695fe000000000, 0xcfed664100000000,
+    0x1e22858a00000000, 0xf0a6bc2b00000000, 0x832d871300000000,
+    0x6da9beb200000000, 0x653bf06300000000, 0x8bbfc9c200000000,
+    0xf834f2fa00000000, 0x16b0cb5b00000000, 0xa9161e8300000000,
+    0x4792272200000000, 0x34191c1a00000000, 0xda9d25bb00000000,
+    0xd20f6b6a00000000, 0x3c8b52cb00000000, 0x4f0069f300000000,
+    0xa184505200000000, 0xac99dfbf00000000, 0x421de61e00000000,
+    0x3196dd2600000000, 0xdf12e48700000000, 0xd780aa5600000000,
+    0x390493f700000000, 0x4a8fa8cf00000000, 0xa40b916e00000000,
+    0x1bad44b600000000, 0xf5297d1700000000, 0x86a2462f00000000,
+    0x68267f8e00000000, 0x60b4315f00000000, 0x8e3008fe00000000,
+    0xfdbb33c600000000, 0x133f0a6700000000, 0xc2f0e9ac00000000,
+    0x2c74d00d00000000, 0x5fffeb3500000000, 0xb17bd29400000000,
+    0xb9e99c4500000000, 0x576da5e400000000, 0x24e69edc00000000,
+    0xca62a77d00000000, 0x75c472a500000000, 0x9b404b0400000000,
+    0xe8cb703c00000000, 0x064f499d00000000, 0x0edd074c00000000,
+    0xe0593eed00000000, 0x93d205d500000000, 0x7d563c7400000000,
+    0xc8ee6ad500000000, 0x266a537400000000, 0x55e1684c00000000,
+    0xbb6551ed00000000, 0xb3f71f3c00000000, 0x5d73269d00000000,
+    0x2ef81da500000000, 0xc07c240400000000, 0x7fdaf1dc00000000,
+    0x915ec87d00000000, 0xe2d5f34500000000, 0x0c51cae400000000,
+    0x04c3843500000000, 0xea47bd9400000000, 0x99cc86ac00000000,
+    0x7748bf0d00000000, 0xa6875cc600000000, 0x4803656700000000,
+    0x3b885e5f00000000, 0xd50c67fe00000000, 0xdd9e292f00000000,
+    0x331a108e00000000, 0x40912bb600000000, 0xae15121700000000,
+    0x11b3c7cf00000000, 0xff37fe6e00000000, 0x8cbcc55600000000,
+    0x6238fcf700000000, 0x6aaab22600000000, 0x842e8b8700000000,
+    0xf7a5b0bf00000000, 0x1921891e00000000, 0x143c06f300000000,
+    0xfab83f5200000000, 0x8933046a00000000, 0x67b73dcb00000000,
+    0x6f25731a00000000, 0x81a14abb00000000, 0xf22a718300000000,
+    0x1cae482200000000, 0xa3089dfa00000000, 0x4d8ca45b00000000,
+    0x3e079f6300000000, 0xd083a6c200000000, 0xd811e81300000000,
+    0x3695d1b200000000, 0x451eea8a00000000, 0xab9ad32b00000000,
+    0x7a5530e000000000, 0x94d1094100000000, 0xe75a327900000000,
+    0x09de0bd800000000, 0x014c450900000000, 0xefc87ca800000000,
+    0x9c43479000000000, 0x72c77e3100000000, 0xcd61abe900000000,
+    0x23e5924800000000, 0x506ea97000000000, 0xbeea90d100000000,
+    0xb678de0000000000, 0x58fce7a100000000, 0x2b77dc9900000000,
+    0xc5f3e53800000000},
+   {0x0000000000000000, 0xfbf6134700000000, 0xf6ed278e00000000,
+    0x0d1b34c900000000, 0xaddd3ec700000000, 0x562b2d8000000000,
+    0x5b30194900000000, 0xa0c60a0e00000000, 0x1bbd0c5500000000,
+    0xe04b1f1200000000, 0xed502bdb00000000, 0x16a6389c00000000,
+    0xb660329200000000, 0x4d9621d500000000, 0x408d151c00000000,
+    0xbb7b065b00000000, 0x367a19aa00000000, 0xcd8c0aed00000000,
+    0xc0973e2400000000, 0x3b612d6300000000, 0x9ba7276d00000000,
+    0x6051342a00000000, 0x6d4a00e300000000, 0x96bc13a400000000,
+    0x2dc715ff00000000, 0xd63106b800000000, 0xdb2a327100000000,
+    0x20dc213600000000, 0x801a2b3800000000, 0x7bec387f00000000,
+    0x76f70cb600000000, 0x8d011ff100000000, 0x2df2438f00000000,
+    0xd60450c800000000, 0xdb1f640100000000, 0x20e9774600000000,
+    0x802f7d4800000000, 0x7bd96e0f00000000, 0x76c25ac600000000,
+    0x8d34498100000000, 0x364f4fda00000000, 0xcdb95c9d00000000,
+    0xc0a2685400000000, 0x3b547b1300000000, 0x9b92711d00000000,
+    0x6064625a00000000, 0x6d7f569300000000, 0x968945d400000000,
+    0x1b885a2500000000, 0xe07e496200000000, 0xed657dab00000000,
+    0x16936eec00000000, 0xb65564e200000000, 0x4da377a500000000,
+    0x40b8436c00000000, 0xbb4e502b00000000, 0x0035567000000000,
+    0xfbc3453700000000, 0xf6d871fe00000000, 0x0d2e62b900000000,
+    0xade868b700000000, 0x561e7bf000000000, 0x5b054f3900000000,
+    0xa0f35c7e00000000, 0x1be2f6c500000000, 0xe014e58200000000,
+    0xed0fd14b00000000, 0x16f9c20c00000000, 0xb63fc80200000000,
+    0x4dc9db4500000000, 0x40d2ef8c00000000, 0xbb24fccb00000000,
+    0x005ffa9000000000, 0xfba9e9d700000000, 0xf6b2dd1e00000000,
+    0x0d44ce5900000000, 0xad82c45700000000, 0x5674d71000000000,
+    0x5b6fe3d900000000, 0xa099f09e00000000, 0x2d98ef6f00000000,
+    0xd66efc2800000000, 0xdb75c8e100000000, 0x2083dba600000000,
+    0x8045d1a800000000, 0x7bb3c2ef00000000, 0x76a8f62600000000,
+    0x8d5ee56100000000, 0x3625e33a00000000, 0xcdd3f07d00000000,
+    0xc0c8c4b400000000, 0x3b3ed7f300000000, 0x9bf8ddfd00000000,
+    0x600eceba00000000, 0x6d15fa7300000000, 0x96e3e93400000000,
+    0x3610b54a00000000, 0xcde6a60d00000000, 0xc0fd92c400000000,
+    0x3b0b818300000000, 0x9bcd8b8d00000000, 0x603b98ca00000000,
+    0x6d20ac0300000000, 0x96d6bf4400000000, 0x2dadb91f00000000,
+    0xd65baa5800000000, 0xdb409e9100000000, 0x20b68dd600000000,
+    0x807087d800000000, 0x7b86949f00000000, 0x769da05600000000,
+    0x8d6bb31100000000, 0x006aace000000000, 0xfb9cbfa700000000,
+    0xf6878b6e00000000, 0x0d71982900000000, 0xadb7922700000000,
+    0x5641816000000000, 0x5b5ab5a900000000, 0xa0aca6ee00000000,
+    0x1bd7a0b500000000, 0xe021b3f200000000, 0xed3a873b00000000,
+    0x16cc947c00000000, 0xb60a9e7200000000, 0x4dfc8d3500000000,
+    0x40e7b9fc00000000, 0xbb11aabb00000000, 0x77c29c5000000000,
+    0x8c348f1700000000, 0x812fbbde00000000, 0x7ad9a89900000000,
+    0xda1fa29700000000, 0x21e9b1d000000000, 0x2cf2851900000000,
+    0xd704965e00000000, 0x6c7f900500000000, 0x9789834200000000,
+    0x9a92b78b00000000, 0x6164a4cc00000000, 0xc1a2aec200000000,
+    0x3a54bd8500000000, 0x374f894c00000000, 0xccb99a0b00000000,
+    0x41b885fa00000000, 0xba4e96bd00000000, 0xb755a27400000000,
+    0x4ca3b13300000000, 0xec65bb3d00000000, 0x1793a87a00000000,
+    0x1a889cb300000000, 0xe17e8ff400000000, 0x5a0589af00000000,
+    0xa1f39ae800000000, 0xace8ae2100000000, 0x571ebd6600000000,
+    0xf7d8b76800000000, 0x0c2ea42f00000000, 0x013590e600000000,
+    0xfac383a100000000, 0x5a30dfdf00000000, 0xa1c6cc9800000000,
+    0xacddf85100000000, 0x572beb1600000000, 0xf7ede11800000000,
+    0x0c1bf25f00000000, 0x0100c69600000000, 0xfaf6d5d100000000,
+    0x418dd38a00000000, 0xba7bc0cd00000000, 0xb760f40400000000,
+    0x4c96e74300000000, 0xec50ed4d00000000, 0x17a6fe0a00000000,
+    0x1abdcac300000000, 0xe14bd98400000000, 0x6c4ac67500000000,
+    0x97bcd53200000000, 0x9aa7e1fb00000000, 0x6151f2bc00000000,
+    0xc197f8b200000000, 0x3a61ebf500000000, 0x377adf3c00000000,
+    0xcc8ccc7b00000000, 0x77f7ca2000000000, 0x8c01d96700000000,
+    0x811aedae00000000, 0x7aecfee900000000, 0xda2af4e700000000,
+    0x21dce7a000000000, 0x2cc7d36900000000, 0xd731c02e00000000,
+    0x6c206a9500000000, 0x97d679d200000000, 0x9acd4d1b00000000,
+    0x613b5e5c00000000, 0xc1fd545200000000, 0x3a0b471500000000,
+    0x371073dc00000000, 0xcce6609b00000000, 0x779d66c000000000,
+    0x8c6b758700000000, 0x8170414e00000000, 0x7a86520900000000,
+    0xda40580700000000, 0x21b64b4000000000, 0x2cad7f8900000000,
+    0xd75b6cce00000000, 0x5a5a733f00000000, 0xa1ac607800000000,
+    0xacb754b100000000, 0x574147f600000000, 0xf7874df800000000,
+    0x0c715ebf00000000, 0x016a6a7600000000, 0xfa9c793100000000,
+    0x41e77f6a00000000, 0xba116c2d00000000, 0xb70a58e400000000,
+    0x4cfc4ba300000000, 0xec3a41ad00000000, 0x17cc52ea00000000,
+    0x1ad7662300000000, 0xe121756400000000, 0x41d2291a00000000,
+    0xba243a5d00000000, 0xb73f0e9400000000, 0x4cc91dd300000000,
+    0xec0f17dd00000000, 0x17f9049a00000000, 0x1ae2305300000000,
+    0xe114231400000000, 0x5a6f254f00000000, 0xa199360800000000,
+    0xac8202c100000000, 0x5774118600000000, 0xf7b21b8800000000,
+    0x0c4408cf00000000, 0x015f3c0600000000, 0xfaa92f4100000000,
+    0x77a830b000000000, 0x8c5e23f700000000, 0x8145173e00000000,
+    0x7ab3047900000000, 0xda750e7700000000, 0x21831d3000000000,
+    0x2c9829f900000000, 0xd76e3abe00000000, 0x6c153ce500000000,
+    0x97e32fa200000000, 0x9af81b6b00000000, 0x610e082c00000000,
+    0xc1c8022200000000, 0x3a3e116500000000, 0x372525ac00000000,
+    0xccd336eb00000000},
+   {0x0000000000000000, 0x6238282a00000000, 0xc470505400000000,
+    0xa648787e00000000, 0x88e1a0a800000000, 0xead9888200000000,
+    0x4c91f0fc00000000, 0x2ea9d8d600000000, 0x51c5308a00000000,
+    0x33fd18a000000000, 0x95b560de00000000, 0xf78d48f400000000,
+    0xd924902200000000, 0xbb1cb80800000000, 0x1d54c07600000000,
+    0x7f6ce85c00000000, 0xe38c10cf00000000, 0x81b438e500000000,
+    0x27fc409b00000000, 0x45c468b100000000, 0x6b6db06700000000,
+    0x0955984d00000000, 0xaf1de03300000000, 0xcd25c81900000000,
+    0xb249204500000000, 0xd071086f00000000, 0x7639701100000000,
+    0x1401583b00000000, 0x3aa880ed00000000, 0x5890a8c700000000,
+    0xfed8d0b900000000, 0x9ce0f89300000000, 0x871f504500000000,
+    0xe527786f00000000, 0x436f001100000000, 0x2157283b00000000,
+    0x0ffef0ed00000000, 0x6dc6d8c700000000, 0xcb8ea0b900000000,
+    0xa9b6889300000000, 0xd6da60cf00000000, 0xb4e248e500000000,
+    0x12aa309b00000000, 0x709218b100000000, 0x5e3bc06700000000,
+    0x3c03e84d00000000, 0x9a4b903300000000, 0xf873b81900000000,
+    0x6493408a00000000, 0x06ab68a000000000, 0xa0e310de00000000,
+    0xc2db38f400000000, 0xec72e02200000000, 0x8e4ac80800000000,
+    0x2802b07600000000, 0x4a3a985c00000000, 0x3556700000000000,
+    0x576e582a00000000, 0xf126205400000000, 0x931e087e00000000,
+    0xbdb7d0a800000000, 0xdf8ff88200000000, 0x79c780fc00000000,
+    0x1bffa8d600000000, 0x0e3fa08a00000000, 0x6c0788a000000000,
+    0xca4ff0de00000000, 0xa877d8f400000000, 0x86de002200000000,
+    0xe4e6280800000000, 0x42ae507600000000, 0x2096785c00000000,
+    0x5ffa900000000000, 0x3dc2b82a00000000, 0x9b8ac05400000000,
+    0xf9b2e87e00000000, 0xd71b30a800000000, 0xb523188200000000,
+    0x136b60fc00000000, 0x715348d600000000, 0xedb3b04500000000,
+    0x8f8b986f00000000, 0x29c3e01100000000, 0x4bfbc83b00000000,
+    0x655210ed00000000, 0x076a38c700000000, 0xa12240b900000000,
+    0xc31a689300000000, 0xbc7680cf00000000, 0xde4ea8e500000000,
+    0x7806d09b00000000, 0x1a3ef8b100000000, 0x3497206700000000,
+    0x56af084d00000000, 0xf0e7703300000000, 0x92df581900000000,
+    0x8920f0cf00000000, 0xeb18d8e500000000, 0x4d50a09b00000000,
+    0x2f6888b100000000, 0x01c1506700000000, 0x63f9784d00000000,
+    0xc5b1003300000000, 0xa789281900000000, 0xd8e5c04500000000,
+    0xbadde86f00000000, 0x1c95901100000000, 0x7eadb83b00000000,
+    0x500460ed00000000, 0x323c48c700000000, 0x947430b900000000,
+    0xf64c189300000000, 0x6aace00000000000, 0x0894c82a00000000,
+    0xaedcb05400000000, 0xcce4987e00000000, 0xe24d40a800000000,
+    0x8075688200000000, 0x263d10fc00000000, 0x440538d600000000,
+    0x3b69d08a00000000, 0x5951f8a000000000, 0xff1980de00000000,
+    0x9d21a8f400000000, 0xb388702200000000, 0xd1b0580800000000,
+    0x77f8207600000000, 0x15c0085c00000000, 0x5d7831ce00000000,
+    0x3f4019e400000000, 0x9908619a00000000, 0xfb3049b000000000,
+    0xd599916600000000, 0xb7a1b94c00000000, 0x11e9c13200000000,
+    0x73d1e91800000000, 0x0cbd014400000000, 0x6e85296e00000000,
+    0xc8cd511000000000, 0xaaf5793a00000000, 0x845ca1ec00000000,
+    0xe66489c600000000, 0x402cf1b800000000, 0x2214d99200000000,
+    0xbef4210100000000, 0xdccc092b00000000, 0x7a84715500000000,
+    0x18bc597f00000000, 0x361581a900000000, 0x542da98300000000,
+    0xf265d1fd00000000, 0x905df9d700000000, 0xef31118b00000000,
+    0x8d0939a100000000, 0x2b4141df00000000, 0x497969f500000000,
+    0x67d0b12300000000, 0x05e8990900000000, 0xa3a0e17700000000,
+    0xc198c95d00000000, 0xda67618b00000000, 0xb85f49a100000000,
+    0x1e1731df00000000, 0x7c2f19f500000000, 0x5286c12300000000,
+    0x30bee90900000000, 0x96f6917700000000, 0xf4ceb95d00000000,
+    0x8ba2510100000000, 0xe99a792b00000000, 0x4fd2015500000000,
+    0x2dea297f00000000, 0x0343f1a900000000, 0x617bd98300000000,
+    0xc733a1fd00000000, 0xa50b89d700000000, 0x39eb714400000000,
+    0x5bd3596e00000000, 0xfd9b211000000000, 0x9fa3093a00000000,
+    0xb10ad1ec00000000, 0xd332f9c600000000, 0x757a81b800000000,
+    0x1742a99200000000, 0x682e41ce00000000, 0x0a1669e400000000,
+    0xac5e119a00000000, 0xce6639b000000000, 0xe0cfe16600000000,
+    0x82f7c94c00000000, 0x24bfb13200000000, 0x4687991800000000,
+    0x5347914400000000, 0x317fb96e00000000, 0x9737c11000000000,
+    0xf50fe93a00000000, 0xdba631ec00000000, 0xb99e19c600000000,
+    0x1fd661b800000000, 0x7dee499200000000, 0x0282a1ce00000000,
+    0x60ba89e400000000, 0xc6f2f19a00000000, 0xa4cad9b000000000,
+    0x8a63016600000000, 0xe85b294c00000000, 0x4e13513200000000,
+    0x2c2b791800000000, 0xb0cb818b00000000, 0xd2f3a9a100000000,
+    0x74bbd1df00000000, 0x1683f9f500000000, 0x382a212300000000,
+    0x5a12090900000000, 0xfc5a717700000000, 0x9e62595d00000000,
+    0xe10eb10100000000, 0x8336992b00000000, 0x257ee15500000000,
+    0x4746c97f00000000, 0x69ef11a900000000, 0x0bd7398300000000,
+    0xad9f41fd00000000, 0xcfa769d700000000, 0xd458c10100000000,
+    0xb660e92b00000000, 0x1028915500000000, 0x7210b97f00000000,
+    0x5cb961a900000000, 0x3e81498300000000, 0x98c931fd00000000,
+    0xfaf119d700000000, 0x859df18b00000000, 0xe7a5d9a100000000,
+    0x41eda1df00000000, 0x23d589f500000000, 0x0d7c512300000000,
+    0x6f44790900000000, 0xc90c017700000000, 0xab34295d00000000,
+    0x37d4d1ce00000000, 0x55ecf9e400000000, 0xf3a4819a00000000,
+    0x919ca9b000000000, 0xbf35716600000000, 0xdd0d594c00000000,
+    0x7b45213200000000, 0x197d091800000000, 0x6611e14400000000,
+    0x0429c96e00000000, 0xa261b11000000000, 0xc059993a00000000,
+    0xeef041ec00000000, 0x8cc869c600000000, 0x2a8011b800000000,
+    0x48b8399200000000},
+   {0x0000000000000000, 0x4c2896a300000000, 0xd9565d9c00000000,
+    0x957ecb3f00000000, 0xf3abcbe300000000, 0xbf835d4000000000,
+    0x2afd967f00000000, 0x66d500dc00000000, 0xa751e61c00000000,
+    0xeb7970bf00000000, 0x7e07bb8000000000, 0x322f2d2300000000,
+    0x54fa2dff00000000, 0x18d2bb5c00000000, 0x8dac706300000000,
+    0xc184e6c000000000, 0x4ea3cc3900000000, 0x028b5a9a00000000,
+    0x97f591a500000000, 0xdbdd070600000000, 0xbd0807da00000000,
+    0xf120917900000000, 0x645e5a4600000000, 0x2876cce500000000,
+    0xe9f22a2500000000, 0xa5dabc8600000000, 0x30a477b900000000,
+    0x7c8ce11a00000000, 0x1a59e1c600000000, 0x5671776500000000,
+    0xc30fbc5a00000000, 0x8f272af900000000, 0x9c46997300000000,
+    0xd06e0fd000000000, 0x4510c4ef00000000, 0x0938524c00000000,
+    0x6fed529000000000, 0x23c5c43300000000, 0xb6bb0f0c00000000,
+    0xfa9399af00000000, 0x3b177f6f00000000, 0x773fe9cc00000000,
+    0xe24122f300000000, 0xae69b45000000000, 0xc8bcb48c00000000,
+    0x8494222f00000000, 0x11eae91000000000, 0x5dc27fb300000000,
+    0xd2e5554a00000000, 0x9ecdc3e900000000, 0x0bb308d600000000,
+    0x479b9e7500000000, 0x214e9ea900000000, 0x6d66080a00000000,
+    0xf818c33500000000, 0xb430559600000000, 0x75b4b35600000000,
+    0x399c25f500000000, 0xace2eeca00000000, 0xe0ca786900000000,
+    0x861f78b500000000, 0xca37ee1600000000, 0x5f49252900000000,
+    0x1361b38a00000000, 0x388d32e700000000, 0x74a5a44400000000,
+    0xe1db6f7b00000000, 0xadf3f9d800000000, 0xcb26f90400000000,
+    0x870e6fa700000000, 0x1270a49800000000, 0x5e58323b00000000,
+    0x9fdcd4fb00000000, 0xd3f4425800000000, 0x468a896700000000,
+    0x0aa21fc400000000, 0x6c771f1800000000, 0x205f89bb00000000,
+    0xb521428400000000, 0xf909d42700000000, 0x762efede00000000,
+    0x3a06687d00000000, 0xaf78a34200000000, 0xe35035e100000000,
+    0x8585353d00000000, 0xc9ada39e00000000, 0x5cd368a100000000,
+    0x10fbfe0200000000, 0xd17f18c200000000, 0x9d578e6100000000,
+    0x0829455e00000000, 0x4401d3fd00000000, 0x22d4d32100000000,
+    0x6efc458200000000, 0xfb828ebd00000000, 0xb7aa181e00000000,
+    0xa4cbab9400000000, 0xe8e33d3700000000, 0x7d9df60800000000,
+    0x31b560ab00000000, 0x5760607700000000, 0x1b48f6d400000000,
+    0x8e363deb00000000, 0xc21eab4800000000, 0x039a4d8800000000,
+    0x4fb2db2b00000000, 0xdacc101400000000, 0x96e486b700000000,
+    0xf031866b00000000, 0xbc1910c800000000, 0x2967dbf700000000,
+    0x654f4d5400000000, 0xea6867ad00000000, 0xa640f10e00000000,
+    0x333e3a3100000000, 0x7f16ac9200000000, 0x19c3ac4e00000000,
+    0x55eb3aed00000000, 0xc095f1d200000000, 0x8cbd677100000000,
+    0x4d3981b100000000, 0x0111171200000000, 0x946fdc2d00000000,
+    0xd8474a8e00000000, 0xbe924a5200000000, 0xf2badcf100000000,
+    0x67c417ce00000000, 0x2bec816d00000000, 0x311c141500000000,
+    0x7d3482b600000000, 0xe84a498900000000, 0xa462df2a00000000,
+    0xc2b7dff600000000, 0x8e9f495500000000, 0x1be1826a00000000,
+    0x57c914c900000000, 0x964df20900000000, 0xda6564aa00000000,
+    0x4f1baf9500000000, 0x0333393600000000, 0x65e639ea00000000,
+    0x29ceaf4900000000, 0xbcb0647600000000, 0xf098f2d500000000,
+    0x7fbfd82c00000000, 0x33974e8f00000000, 0xa6e985b000000000,
+    0xeac1131300000000, 0x8c1413cf00000000, 0xc03c856c00000000,
+    0x55424e5300000000, 0x196ad8f000000000, 0xd8ee3e3000000000,
+    0x94c6a89300000000, 0x01b863ac00000000, 0x4d90f50f00000000,
+    0x2b45f5d300000000, 0x676d637000000000, 0xf213a84f00000000,
+    0xbe3b3eec00000000, 0xad5a8d6600000000, 0xe1721bc500000000,
+    0x740cd0fa00000000, 0x3824465900000000, 0x5ef1468500000000,
+    0x12d9d02600000000, 0x87a71b1900000000, 0xcb8f8dba00000000,
+    0x0a0b6b7a00000000, 0x4623fdd900000000, 0xd35d36e600000000,
+    0x9f75a04500000000, 0xf9a0a09900000000, 0xb588363a00000000,
+    0x20f6fd0500000000, 0x6cde6ba600000000, 0xe3f9415f00000000,
+    0xafd1d7fc00000000, 0x3aaf1cc300000000, 0x76878a6000000000,
+    0x10528abc00000000, 0x5c7a1c1f00000000, 0xc904d72000000000,
+    0x852c418300000000, 0x44a8a74300000000, 0x088031e000000000,
+    0x9dfefadf00000000, 0xd1d66c7c00000000, 0xb7036ca000000000,
+    0xfb2bfa0300000000, 0x6e55313c00000000, 0x227da79f00000000,
+    0x099126f200000000, 0x45b9b05100000000, 0xd0c77b6e00000000,
+    0x9cefedcd00000000, 0xfa3aed1100000000, 0xb6127bb200000000,
+    0x236cb08d00000000, 0x6f44262e00000000, 0xaec0c0ee00000000,
+    0xe2e8564d00000000, 0x77969d7200000000, 0x3bbe0bd100000000,
+    0x5d6b0b0d00000000, 0x11439dae00000000, 0x843d569100000000,
+    0xc815c03200000000, 0x4732eacb00000000, 0x0b1a7c6800000000,
+    0x9e64b75700000000, 0xd24c21f400000000, 0xb499212800000000,
+    0xf8b1b78b00000000, 0x6dcf7cb400000000, 0x21e7ea1700000000,
+    0xe0630cd700000000, 0xac4b9a7400000000, 0x3935514b00000000,
+    0x751dc7e800000000, 0x13c8c73400000000, 0x5fe0519700000000,
+    0xca9e9aa800000000, 0x86b60c0b00000000, 0x95d7bf8100000000,
+    0xd9ff292200000000, 0x4c81e21d00000000, 0x00a974be00000000,
+    0x667c746200000000, 0x2a54e2c100000000, 0xbf2a29fe00000000,
+    0xf302bf5d00000000, 0x3286599d00000000, 0x7eaecf3e00000000,
+    0xebd0040100000000, 0xa7f892a200000000, 0xc12d927e00000000,
+    0x8d0504dd00000000, 0x187bcfe200000000, 0x5453594100000000,
+    0xdb7473b800000000, 0x975ce51b00000000, 0x02222e2400000000,
+    0x4e0ab88700000000, 0x28dfb85b00000000, 0x64f72ef800000000,
+    0xf189e5c700000000, 0xbda1736400000000, 0x7c2595a400000000,
+    0x300d030700000000, 0xa573c83800000000, 0xe95b5e9b00000000,
+    0x8f8e5e4700000000, 0xc3a6c8e400000000, 0x56d803db00000000,
+    0x1af0957800000000},
+   {0x0000000000000000, 0x939bc97f00000000, 0x263793ff00000000,
+    0xb5ac5a8000000000, 0x0d68572400000000, 0x9ef39e5b00000000,
+    0x2b5fc4db00000000, 0xb8c40da400000000, 0x1ad0ae4800000000,
+    0x894b673700000000, 0x3ce73db700000000, 0xaf7cf4c800000000,
+    0x17b8f96c00000000, 0x8423301300000000, 0x318f6a9300000000,
+    0xa214a3ec00000000, 0x34a05d9100000000, 0xa73b94ee00000000,
+    0x1297ce6e00000000, 0x810c071100000000, 0x39c80ab500000000,
+    0xaa53c3ca00000000, 0x1fff994a00000000, 0x8c64503500000000,
+    0x2e70f3d900000000, 0xbdeb3aa600000000, 0x0847602600000000,
+    0x9bdca95900000000, 0x2318a4fd00000000, 0xb0836d8200000000,
+    0x052f370200000000, 0x96b4fe7d00000000, 0x2946caf900000000,
+    0xbadd038600000000, 0x0f71590600000000, 0x9cea907900000000,
+    0x242e9ddd00000000, 0xb7b554a200000000, 0x02190e2200000000,
+    0x9182c75d00000000, 0x339664b100000000, 0xa00dadce00000000,
+    0x15a1f74e00000000, 0x863a3e3100000000, 0x3efe339500000000,
+    0xad65faea00000000, 0x18c9a06a00000000, 0x8b52691500000000,
+    0x1de6976800000000, 0x8e7d5e1700000000, 0x3bd1049700000000,
+    0xa84acde800000000, 0x108ec04c00000000, 0x8315093300000000,
+    0x36b953b300000000, 0xa5229acc00000000, 0x0736392000000000,
+    0x94adf05f00000000, 0x2101aadf00000000, 0xb29a63a000000000,
+    0x0a5e6e0400000000, 0x99c5a77b00000000, 0x2c69fdfb00000000,
+    0xbff2348400000000, 0x138ae52800000000, 0x80112c5700000000,
+    0x35bd76d700000000, 0xa626bfa800000000, 0x1ee2b20c00000000,
+    0x8d797b7300000000, 0x38d521f300000000, 0xab4ee88c00000000,
+    0x095a4b6000000000, 0x9ac1821f00000000, 0x2f6dd89f00000000,
+    0xbcf611e000000000, 0x04321c4400000000, 0x97a9d53b00000000,
+    0x22058fbb00000000, 0xb19e46c400000000, 0x272ab8b900000000,
+    0xb4b171c600000000, 0x011d2b4600000000, 0x9286e23900000000,
+    0x2a42ef9d00000000, 0xb9d926e200000000, 0x0c757c6200000000,
+    0x9feeb51d00000000, 0x3dfa16f100000000, 0xae61df8e00000000,
+    0x1bcd850e00000000, 0x88564c7100000000, 0x309241d500000000,
+    0xa30988aa00000000, 0x16a5d22a00000000, 0x853e1b5500000000,
+    0x3acc2fd100000000, 0xa957e6ae00000000, 0x1cfbbc2e00000000,
+    0x8f60755100000000, 0x37a478f500000000, 0xa43fb18a00000000,
+    0x1193eb0a00000000, 0x8208227500000000, 0x201c819900000000,
+    0xb38748e600000000, 0x062b126600000000, 0x95b0db1900000000,
+    0x2d74d6bd00000000, 0xbeef1fc200000000, 0x0b43454200000000,
+    0x98d88c3d00000000, 0x0e6c724000000000, 0x9df7bb3f00000000,
+    0x285be1bf00000000, 0xbbc028c000000000, 0x0304256400000000,
+    0x909fec1b00000000, 0x2533b69b00000000, 0xb6a87fe400000000,
+    0x14bcdc0800000000, 0x8727157700000000, 0x328b4ff700000000,
+    0xa110868800000000, 0x19d48b2c00000000, 0x8a4f425300000000,
+    0x3fe318d300000000, 0xac78d1ac00000000, 0x2614cb5100000000,
+    0xb58f022e00000000, 0x002358ae00000000, 0x93b891d100000000,
+    0x2b7c9c7500000000, 0xb8e7550a00000000, 0x0d4b0f8a00000000,
+    0x9ed0c6f500000000, 0x3cc4651900000000, 0xaf5fac6600000000,
+    0x1af3f6e600000000, 0x89683f9900000000, 0x31ac323d00000000,
+    0xa237fb4200000000, 0x179ba1c200000000, 0x840068bd00000000,
+    0x12b496c000000000, 0x812f5fbf00000000, 0x3483053f00000000,
+    0xa718cc4000000000, 0x1fdcc1e400000000, 0x8c47089b00000000,
+    0x39eb521b00000000, 0xaa709b6400000000, 0x0864388800000000,
+    0x9bfff1f700000000, 0x2e53ab7700000000, 0xbdc8620800000000,
+    0x050c6fac00000000, 0x9697a6d300000000, 0x233bfc5300000000,
+    0xb0a0352c00000000, 0x0f5201a800000000, 0x9cc9c8d700000000,
+    0x2965925700000000, 0xbafe5b2800000000, 0x023a568c00000000,
+    0x91a19ff300000000, 0x240dc57300000000, 0xb7960c0c00000000,
+    0x1582afe000000000, 0x8619669f00000000, 0x33b53c1f00000000,
+    0xa02ef56000000000, 0x18eaf8c400000000, 0x8b7131bb00000000,
+    0x3edd6b3b00000000, 0xad46a24400000000, 0x3bf25c3900000000,
+    0xa869954600000000, 0x1dc5cfc600000000, 0x8e5e06b900000000,
+    0x369a0b1d00000000, 0xa501c26200000000, 0x10ad98e200000000,
+    0x8336519d00000000, 0x2122f27100000000, 0xb2b93b0e00000000,
+    0x0715618e00000000, 0x948ea8f100000000, 0x2c4aa55500000000,
+    0xbfd16c2a00000000, 0x0a7d36aa00000000, 0x99e6ffd500000000,
+    0x359e2e7900000000, 0xa605e70600000000, 0x13a9bd8600000000,
+    0x803274f900000000, 0x38f6795d00000000, 0xab6db02200000000,
+    0x1ec1eaa200000000, 0x8d5a23dd00000000, 0x2f4e803100000000,
+    0xbcd5494e00000000, 0x097913ce00000000, 0x9ae2dab100000000,
+    0x2226d71500000000, 0xb1bd1e6a00000000, 0x041144ea00000000,
+    0x978a8d9500000000, 0x013e73e800000000, 0x92a5ba9700000000,
+    0x2709e01700000000, 0xb492296800000000, 0x0c5624cc00000000,
+    0x9fcdedb300000000, 0x2a61b73300000000, 0xb9fa7e4c00000000,
+    0x1beedda000000000, 0x887514df00000000, 0x3dd94e5f00000000,
+    0xae42872000000000, 0x16868a8400000000, 0x851d43fb00000000,
+    0x30b1197b00000000, 0xa32ad00400000000, 0x1cd8e48000000000,
+    0x8f432dff00000000, 0x3aef777f00000000, 0xa974be0000000000,
+    0x11b0b3a400000000, 0x822b7adb00000000, 0x3787205b00000000,
+    0xa41ce92400000000, 0x06084ac800000000, 0x959383b700000000,
+    0x203fd93700000000, 0xb3a4104800000000, 0x0b601dec00000000,
+    0x98fbd49300000000, 0x2d578e1300000000, 0xbecc476c00000000,
+    0x2878b91100000000, 0xbbe3706e00000000, 0x0e4f2aee00000000,
+    0x9dd4e39100000000, 0x2510ee3500000000, 0xb68b274a00000000,
+    0x03277dca00000000, 0x90bcb4b500000000, 0x32a8175900000000,
+    0xa133de2600000000, 0x149f84a600000000, 0x87044dd900000000,
+    0x3fc0407d00000000, 0xac5b890200000000, 0x19f7d38200000000,
+    0x8a6c1afd00000000},
+   {0x0000000000000000, 0x650b796900000000, 0xca16f2d200000000,
+    0xaf1d8bbb00000000, 0xd52b957e00000000, 0xb020ec1700000000,
+    0x1f3d67ac00000000, 0x7a361ec500000000, 0xaa572afd00000000,
+    0xcf5c539400000000, 0x6041d82f00000000, 0x054aa14600000000,
+    0x7f7cbf8300000000, 0x1a77c6ea00000000, 0xb56a4d5100000000,
+    0xd061343800000000, 0x15a9252100000000, 0x70a25c4800000000,
+    0xdfbfd7f300000000, 0xbab4ae9a00000000, 0xc082b05f00000000,
+    0xa589c93600000000, 0x0a94428d00000000, 0x6f9f3be400000000,
+    0xbffe0fdc00000000, 0xdaf576b500000000, 0x75e8fd0e00000000,
+    0x10e3846700000000, 0x6ad59aa200000000, 0x0fdee3cb00000000,
+    0xa0c3687000000000, 0xc5c8111900000000, 0x2a524b4200000000,
+    0x4f59322b00000000, 0xe044b99000000000, 0x854fc0f900000000,
+    0xff79de3c00000000, 0x9a72a75500000000, 0x356f2cee00000000,
+    0x5064558700000000, 0x800561bf00000000, 0xe50e18d600000000,
+    0x4a13936d00000000, 0x2f18ea0400000000, 0x552ef4c100000000,
+    0x30258da800000000, 0x9f38061300000000, 0xfa337f7a00000000,
+    0x3ffb6e6300000000, 0x5af0170a00000000, 0xf5ed9cb100000000,
+    0x90e6e5d800000000, 0xead0fb1d00000000, 0x8fdb827400000000,
+    0x20c609cf00000000, 0x45cd70a600000000, 0x95ac449e00000000,
+    0xf0a73df700000000, 0x5fbab64c00000000, 0x3ab1cf2500000000,
+    0x4087d1e000000000, 0x258ca88900000000, 0x8a91233200000000,
+    0xef9a5a5b00000000, 0x54a4968400000000, 0x31afefed00000000,
+    0x9eb2645600000000, 0xfbb91d3f00000000, 0x818f03fa00000000,
+    0xe4847a9300000000, 0x4b99f12800000000, 0x2e92884100000000,
+    0xfef3bc7900000000, 0x9bf8c51000000000, 0x34e54eab00000000,
+    0x51ee37c200000000, 0x2bd8290700000000, 0x4ed3506e00000000,
+    0xe1cedbd500000000, 0x84c5a2bc00000000, 0x410db3a500000000,
+    0x2406cacc00000000, 0x8b1b417700000000, 0xee10381e00000000,
+    0x942626db00000000, 0xf12d5fb200000000, 0x5e30d40900000000,
+    0x3b3bad6000000000, 0xeb5a995800000000, 0x8e51e03100000000,
+    0x214c6b8a00000000, 0x444712e300000000, 0x3e710c2600000000,
+    0x5b7a754f00000000, 0xf467fef400000000, 0x916c879d00000000,
+    0x7ef6ddc600000000, 0x1bfda4af00000000, 0xb4e02f1400000000,
+    0xd1eb567d00000000, 0xabdd48b800000000, 0xced631d100000000,
+    0x61cbba6a00000000, 0x04c0c30300000000, 0xd4a1f73b00000000,
+    0xb1aa8e5200000000, 0x1eb705e900000000, 0x7bbc7c8000000000,
+    0x018a624500000000, 0x64811b2c00000000, 0xcb9c909700000000,
+    0xae97e9fe00000000, 0x6b5ff8e700000000, 0x0e54818e00000000,
+    0xa1490a3500000000, 0xc442735c00000000, 0xbe746d9900000000,
+    0xdb7f14f000000000, 0x74629f4b00000000, 0x1169e62200000000,
+    0xc108d21a00000000, 0xa403ab7300000000, 0x0b1e20c800000000,
+    0x6e1559a100000000, 0x1423476400000000, 0x71283e0d00000000,
+    0xde35b5b600000000, 0xbb3eccdf00000000, 0xe94e5cd200000000,
+    0x8c4525bb00000000, 0x2358ae0000000000, 0x4653d76900000000,
+    0x3c65c9ac00000000, 0x596eb0c500000000, 0xf6733b7e00000000,
+    0x9378421700000000, 0x4319762f00000000, 0x26120f4600000000,
+    0x890f84fd00000000, 0xec04fd9400000000, 0x9632e35100000000,
+    0xf3399a3800000000, 0x5c24118300000000, 0x392f68ea00000000,
+    0xfce779f300000000, 0x99ec009a00000000, 0x36f18b2100000000,
+    0x53faf24800000000, 0x29ccec8d00000000, 0x4cc795e400000000,
+    0xe3da1e5f00000000, 0x86d1673600000000, 0x56b0530e00000000,
+    0x33bb2a6700000000, 0x9ca6a1dc00000000, 0xf9add8b500000000,
+    0x839bc67000000000, 0xe690bf1900000000, 0x498d34a200000000,
+    0x2c864dcb00000000, 0xc31c179000000000, 0xa6176ef900000000,
+    0x090ae54200000000, 0x6c019c2b00000000, 0x163782ee00000000,
+    0x733cfb8700000000, 0xdc21703c00000000, 0xb92a095500000000,
+    0x694b3d6d00000000, 0x0c40440400000000, 0xa35dcfbf00000000,
+    0xc656b6d600000000, 0xbc60a81300000000, 0xd96bd17a00000000,
+    0x76765ac100000000, 0x137d23a800000000, 0xd6b532b100000000,
+    0xb3be4bd800000000, 0x1ca3c06300000000, 0x79a8b90a00000000,
+    0x039ea7cf00000000, 0x6695dea600000000, 0xc988551d00000000,
+    0xac832c7400000000, 0x7ce2184c00000000, 0x19e9612500000000,
+    0xb6f4ea9e00000000, 0xd3ff93f700000000, 0xa9c98d3200000000,
+    0xccc2f45b00000000, 0x63df7fe000000000, 0x06d4068900000000,
+    0xbdeaca5600000000, 0xd8e1b33f00000000, 0x77fc388400000000,
+    0x12f741ed00000000, 0x68c15f2800000000, 0x0dca264100000000,
+    0xa2d7adfa00000000, 0xc7dcd49300000000, 0x17bde0ab00000000,
+    0x72b699c200000000, 0xddab127900000000, 0xb8a06b1000000000,
+    0xc29675d500000000, 0xa79d0cbc00000000, 0x0880870700000000,
+    0x6d8bfe6e00000000, 0xa843ef7700000000, 0xcd48961e00000000,
+    0x62551da500000000, 0x075e64cc00000000, 0x7d687a0900000000,
+    0x1863036000000000, 0xb77e88db00000000, 0xd275f1b200000000,
+    0x0214c58a00000000, 0x671fbce300000000, 0xc802375800000000,
+    0xad094e3100000000, 0xd73f50f400000000, 0xb234299d00000000,
+    0x1d29a22600000000, 0x7822db4f00000000, 0x97b8811400000000,
+    0xf2b3f87d00000000, 0x5dae73c600000000, 0x38a50aaf00000000,
+    0x4293146a00000000, 0x27986d0300000000, 0x8885e6b800000000,
+    0xed8e9fd100000000, 0x3defabe900000000, 0x58e4d28000000000,
+    0xf7f9593b00000000, 0x92f2205200000000, 0xe8c43e9700000000,
+    0x8dcf47fe00000000, 0x22d2cc4500000000, 0x47d9b52c00000000,
+    0x8211a43500000000, 0xe71add5c00000000, 0x480756e700000000,
+    0x2d0c2f8e00000000, 0x573a314b00000000, 0x3231482200000000,
+    0x9d2cc39900000000, 0xf827baf000000000, 0x28468ec800000000,
+    0x4d4df7a100000000, 0xe2507c1a00000000, 0x875b057300000000,
+    0xfd6d1bb600000000, 0x986662df00000000, 0x377be96400000000,
+    0x5270900d00000000},
+   {0x0000000000000000, 0xdcecb13d00000000, 0xb8d9637b00000000,
+    0x6435d24600000000, 0x70b3c7f600000000, 0xac5f76cb00000000,
+    0xc86aa48d00000000, 0x148615b000000000, 0xa160fe3600000000,
+    0x7d8c4f0b00000000, 0x19b99d4d00000000, 0xc5552c7000000000,
+    0xd1d339c000000000, 0x0d3f88fd00000000, 0x690a5abb00000000,
+    0xb5e6eb8600000000, 0x42c1fc6d00000000, 0x9e2d4d5000000000,
+    0xfa189f1600000000, 0x26f42e2b00000000, 0x32723b9b00000000,
+    0xee9e8aa600000000, 0x8aab58e000000000, 0x5647e9dd00000000,
+    0xe3a1025b00000000, 0x3f4db36600000000, 0x5b78612000000000,
+    0x8794d01d00000000, 0x9312c5ad00000000, 0x4ffe749000000000,
+    0x2bcba6d600000000, 0xf72717eb00000000, 0x8482f9db00000000,
+    0x586e48e600000000, 0x3c5b9aa000000000, 0xe0b72b9d00000000,
+    0xf4313e2d00000000, 0x28dd8f1000000000, 0x4ce85d5600000000,
+    0x9004ec6b00000000, 0x25e207ed00000000, 0xf90eb6d000000000,
+    0x9d3b649600000000, 0x41d7d5ab00000000, 0x5551c01b00000000,
+    0x89bd712600000000, 0xed88a36000000000, 0x3164125d00000000,
+    0xc64305b600000000, 0x1aafb48b00000000, 0x7e9a66cd00000000,
+    0xa276d7f000000000, 0xb6f0c24000000000, 0x6a1c737d00000000,
+    0x0e29a13b00000000, 0xd2c5100600000000, 0x6723fb8000000000,
+    0xbbcf4abd00000000, 0xdffa98fb00000000, 0x031629c600000000,
+    0x17903c7600000000, 0xcb7c8d4b00000000, 0xaf495f0d00000000,
+    0x73a5ee3000000000, 0x4903826c00000000, 0x95ef335100000000,
+    0xf1dae11700000000, 0x2d36502a00000000, 0x39b0459a00000000,
+    0xe55cf4a700000000, 0x816926e100000000, 0x5d8597dc00000000,
+    0xe8637c5a00000000, 0x348fcd6700000000, 0x50ba1f2100000000,
+    0x8c56ae1c00000000, 0x98d0bbac00000000, 0x443c0a9100000000,
+    0x2009d8d700000000, 0xfce569ea00000000, 0x0bc27e0100000000,
+    0xd72ecf3c00000000, 0xb31b1d7a00000000, 0x6ff7ac4700000000,
+    0x7b71b9f700000000, 0xa79d08ca00000000, 0xc3a8da8c00000000,
+    0x1f446bb100000000, 0xaaa2803700000000, 0x764e310a00000000,
+    0x127be34c00000000, 0xce97527100000000, 0xda1147c100000000,
+    0x06fdf6fc00000000, 0x62c824ba00000000, 0xbe24958700000000,
+    0xcd817bb700000000, 0x116dca8a00000000, 0x755818cc00000000,
+    0xa9b4a9f100000000, 0xbd32bc4100000000, 0x61de0d7c00000000,
+    0x05ebdf3a00000000, 0xd9076e0700000000, 0x6ce1858100000000,
+    0xb00d34bc00000000, 0xd438e6fa00000000, 0x08d457c700000000,
+    0x1c52427700000000, 0xc0bef34a00000000, 0xa48b210c00000000,
+    0x7867903100000000, 0x8f4087da00000000, 0x53ac36e700000000,
+    0x3799e4a100000000, 0xeb75559c00000000, 0xfff3402c00000000,
+    0x231ff11100000000, 0x472a235700000000, 0x9bc6926a00000000,
+    0x2e2079ec00000000, 0xf2ccc8d100000000, 0x96f91a9700000000,
+    0x4a15abaa00000000, 0x5e93be1a00000000, 0x827f0f2700000000,
+    0xe64add6100000000, 0x3aa66c5c00000000, 0x920604d900000000,
+    0x4eeab5e400000000, 0x2adf67a200000000, 0xf633d69f00000000,
+    0xe2b5c32f00000000, 0x3e59721200000000, 0x5a6ca05400000000,
+    0x8680116900000000, 0x3366faef00000000, 0xef8a4bd200000000,
+    0x8bbf999400000000, 0x575328a900000000, 0x43d53d1900000000,
+    0x9f398c2400000000, 0xfb0c5e6200000000, 0x27e0ef5f00000000,
+    0xd0c7f8b400000000, 0x0c2b498900000000, 0x681e9bcf00000000,
+    0xb4f22af200000000, 0xa0743f4200000000, 0x7c988e7f00000000,
+    0x18ad5c3900000000, 0xc441ed0400000000, 0x71a7068200000000,
+    0xad4bb7bf00000000, 0xc97e65f900000000, 0x1592d4c400000000,
+    0x0114c17400000000, 0xddf8704900000000, 0xb9cda20f00000000,
+    0x6521133200000000, 0x1684fd0200000000, 0xca684c3f00000000,
+    0xae5d9e7900000000, 0x72b12f4400000000, 0x66373af400000000,
+    0xbadb8bc900000000, 0xdeee598f00000000, 0x0202e8b200000000,
+    0xb7e4033400000000, 0x6b08b20900000000, 0x0f3d604f00000000,
+    0xd3d1d17200000000, 0xc757c4c200000000, 0x1bbb75ff00000000,
+    0x7f8ea7b900000000, 0xa362168400000000, 0x5445016f00000000,
+    0x88a9b05200000000, 0xec9c621400000000, 0x3070d32900000000,
+    0x24f6c69900000000, 0xf81a77a400000000, 0x9c2fa5e200000000,
+    0x40c314df00000000, 0xf525ff5900000000, 0x29c94e6400000000,
+    0x4dfc9c2200000000, 0x91102d1f00000000, 0x859638af00000000,
+    0x597a899200000000, 0x3d4f5bd400000000, 0xe1a3eae900000000,
+    0xdb0586b500000000, 0x07e9378800000000, 0x63dce5ce00000000,
+    0xbf3054f300000000, 0xabb6414300000000, 0x775af07e00000000,
+    0x136f223800000000, 0xcf83930500000000, 0x7a65788300000000,
+    0xa689c9be00000000, 0xc2bc1bf800000000, 0x1e50aac500000000,
+    0x0ad6bf7500000000, 0xd63a0e4800000000, 0xb20fdc0e00000000,
+    0x6ee36d3300000000, 0x99c47ad800000000, 0x4528cbe500000000,
+    0x211d19a300000000, 0xfdf1a89e00000000, 0xe977bd2e00000000,
+    0x359b0c1300000000, 0x51aede5500000000, 0x8d426f6800000000,
+    0x38a484ee00000000, 0xe44835d300000000, 0x807de79500000000,
+    0x5c9156a800000000, 0x4817431800000000, 0x94fbf22500000000,
+    0xf0ce206300000000, 0x2c22915e00000000, 0x5f877f6e00000000,
+    0x836bce5300000000, 0xe75e1c1500000000, 0x3bb2ad2800000000,
+    0x2f34b89800000000, 0xf3d809a500000000, 0x97eddbe300000000,
+    0x4b016ade00000000, 0xfee7815800000000, 0x220b306500000000,
+    0x463ee22300000000, 0x9ad2531e00000000, 0x8e5446ae00000000,
+    0x52b8f79300000000, 0x368d25d500000000, 0xea6194e800000000,
+    0x1d46830300000000, 0xc1aa323e00000000, 0xa59fe07800000000,
+    0x7973514500000000, 0x6df544f500000000, 0xb119f5c800000000,
+    0xd52c278e00000000, 0x09c096b300000000, 0xbc267d3500000000,
+    0x60cacc0800000000, 0x04ff1e4e00000000, 0xd813af7300000000,
+    0xcc95bac300000000, 0x10790bfe00000000, 0x744cd9b800000000,
+    0xa8a0688500000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x9e83da9f, 0x7d01c4e4, 0xe3821e7b, 0xbb04f912,
+    0x2587238d, 0xc6053df6, 0x5886e769, 0x7609f225, 0xe88a28ba,
+    0x0b0836c1, 0x958bec5e, 0xcd0d0b37, 0x538ed1a8, 0xb00ccfd3,
+    0x2e8f154c, 0xec12e44b, 0x72913ed4, 0x911320af, 0x0f90fa30,
+    0x57161d59, 0xc995c7c6, 0x2a17d9bd, 0xb4940322, 0x9a1b166e,
+    0x0498ccf1, 0xe71ad28a, 0x79990815, 0x211fef7c, 0xbf9c35e3,
+    0x5c1e2b98, 0xc29df107, 0xd825c897, 0x46a61208, 0xa5240c73,
+    0x3ba7d6ec, 0x63213185, 0xfda2eb1a, 0x1e20f561, 0x80a32ffe,
+    0xae2c3ab2, 0x30afe02d, 0xd32dfe56, 0x4dae24c9, 0x1528c3a0,
+    0x8bab193f, 0x68290744, 0xf6aadddb, 0x34372cdc, 0xaab4f643,
+    0x4936e838, 0xd7b532a7, 0x8f33d5ce, 0x11b00f51, 0xf232112a,
+    0x6cb1cbb5, 0x423edef9, 0xdcbd0466, 0x3f3f1a1d, 0xa1bcc082,
+    0xf93a27eb, 0x67b9fd74, 0x843be30f, 0x1ab83990, 0xf14de1f4,
+    0x6fce3b6b, 0x8c4c2510, 0x12cfff8f, 0x4a4918e6, 0xd4cac279,
+    0x3748dc02, 0xa9cb069d, 0x874413d1, 0x19c7c94e, 0xfa45d735,
+    0x64c60daa, 0x3c40eac3, 0xa2c3305c, 0x41412e27, 0xdfc2f4b8,
+    0x1d5f05bf, 0x83dcdf20, 0x605ec15b, 0xfedd1bc4, 0xa65bfcad,
+    0x38d82632, 0xdb5a3849, 0x45d9e2d6, 0x6b56f79a, 0xf5d52d05,
+    0x1657337e, 0x88d4e9e1, 0xd0520e88, 0x4ed1d417, 0xad53ca6c,
+    0x33d010f3, 0x29682963, 0xb7ebf3fc, 0x5469ed87, 0xcaea3718,
+    0x926cd071, 0x0cef0aee, 0xef6d1495, 0x71eece0a, 0x5f61db46,
+    0xc1e201d9, 0x22601fa2, 0xbce3c53d, 0xe4652254, 0x7ae6f8cb,
+    0x9964e6b0, 0x07e73c2f, 0xc57acd28, 0x5bf917b7, 0xb87b09cc,
+    0x26f8d353, 0x7e7e343a, 0xe0fdeea5, 0x037ff0de, 0x9dfc2a41,
+    0xb3733f0d, 0x2df0e592, 0xce72fbe9, 0x50f12176, 0x0877c61f,
+    0x96f41c80, 0x757602fb, 0xebf5d864, 0xa39db332, 0x3d1e69ad,
+    0xde9c77d6, 0x401fad49, 0x18994a20, 0x861a90bf, 0x65988ec4,
+    0xfb1b545b, 0xd5944117, 0x4b179b88, 0xa89585f3, 0x36165f6c,
+    0x6e90b805, 0xf013629a, 0x13917ce1, 0x8d12a67e, 0x4f8f5779,
+    0xd10c8de6, 0x328e939d, 0xac0d4902, 0xf48bae6b, 0x6a0874f4,
+    0x898a6a8f, 0x1709b010, 0x3986a55c, 0xa7057fc3, 0x448761b8,
+    0xda04bb27, 0x82825c4e, 0x1c0186d1, 0xff8398aa, 0x61004235,
+    0x7bb87ba5, 0xe53ba13a, 0x06b9bf41, 0x983a65de, 0xc0bc82b7,
+    0x5e3f5828, 0xbdbd4653, 0x233e9ccc, 0x0db18980, 0x9332531f,
+    0x70b04d64, 0xee3397fb, 0xb6b57092, 0x2836aa0d, 0xcbb4b476,
+    0x55376ee9, 0x97aa9fee, 0x09294571, 0xeaab5b0a, 0x74288195,
+    0x2cae66fc, 0xb22dbc63, 0x51afa218, 0xcf2c7887, 0xe1a36dcb,
+    0x7f20b754, 0x9ca2a92f, 0x022173b0, 0x5aa794d9, 0xc4244e46,
+    0x27a6503d, 0xb9258aa2, 0x52d052c6, 0xcc538859, 0x2fd19622,
+    0xb1524cbd, 0xe9d4abd4, 0x7757714b, 0x94d56f30, 0x0a56b5af,
+    0x24d9a0e3, 0xba5a7a7c, 0x59d86407, 0xc75bbe98, 0x9fdd59f1,
+    0x015e836e, 0xe2dc9d15, 0x7c5f478a, 0xbec2b68d, 0x20416c12,
+    0xc3c37269, 0x5d40a8f6, 0x05c64f9f, 0x9b459500, 0x78c78b7b,
+    0xe64451e4, 0xc8cb44a8, 0x56489e37, 0xb5ca804c, 0x2b495ad3,
+    0x73cfbdba, 0xed4c6725, 0x0ece795e, 0x904da3c1, 0x8af59a51,
+    0x147640ce, 0xf7f45eb5, 0x6977842a, 0x31f16343, 0xaf72b9dc,
+    0x4cf0a7a7, 0xd2737d38, 0xfcfc6874, 0x627fb2eb, 0x81fdac90,
+    0x1f7e760f, 0x47f89166, 0xd97b4bf9, 0x3af95582, 0xa47a8f1d,
+    0x66e77e1a, 0xf864a485, 0x1be6bafe, 0x85656061, 0xdde38708,
+    0x43605d97, 0xa0e243ec, 0x3e619973, 0x10ee8c3f, 0x8e6d56a0,
+    0x6def48db, 0xf36c9244, 0xabea752d, 0x3569afb2, 0xd6ebb1c9,
+    0x48686b56},
+   {0x00000000, 0xc0642817, 0x80c9502e, 0x40ad7839, 0x0093a15c,
+    0xc0f7894b, 0x805af172, 0x403ed965, 0x002643b9, 0xc0426bae,
+    0x80ef1397, 0x408b3b80, 0x00b5e2e5, 0xc0d1caf2, 0x807cb2cb,
+    0x40189adc, 0x414af7a9, 0x812edfbe, 0xc183a787, 0x01e78f90,
+    0x41d956f5, 0x81bd7ee2, 0xc11006db, 0x01742ecc, 0x416cb410,
+    0x81089c07, 0xc1a5e43e, 0x01c1cc29, 0x41ff154c, 0x819b3d5b,
+    0xc1364562, 0x01526d75, 0xc3929f88, 0x03f6b79f, 0x435bcfa6,
+    0x833fe7b1, 0xc3013ed4, 0x036516c3, 0x43c86efa, 0x83ac46ed,
+    0xc3b4dc31, 0x03d0f426, 0x437d8c1f, 0x8319a408, 0xc3277d6d,
+    0x0343557a, 0x43ee2d43, 0x838a0554, 0x82d86821, 0x42bc4036,
+    0x0211380f, 0xc2751018, 0x824bc97d, 0x422fe16a, 0x02829953,
+    0xc2e6b144, 0x82fe2b98, 0x429a038f, 0x02377bb6, 0xc25353a1,
+    0x826d8ac4, 0x4209a2d3, 0x02a4daea, 0xc2c0f2fd, 0xc7234eca,
+    0x074766dd, 0x47ea1ee4, 0x878e36f3, 0xc7b0ef96, 0x07d4c781,
+    0x4779bfb8, 0x871d97af, 0xc7050d73, 0x07612564, 0x47cc5d5d,
+    0x87a8754a, 0xc796ac2f, 0x07f28438, 0x475ffc01, 0x873bd416,
+    0x8669b963, 0x460d9174, 0x06a0e94d, 0xc6c4c15a, 0x86fa183f,
+    0x469e3028, 0x06334811, 0xc6576006, 0x864ffada, 0x462bd2cd,
+    0x0686aaf4, 0xc6e282e3, 0x86dc5b86, 0x46b87391, 0x06150ba8,
+    0xc67123bf, 0x04b1d142, 0xc4d5f955, 0x8478816c, 0x441ca97b,
+    0x0422701e, 0xc4465809, 0x84eb2030, 0x448f0827, 0x049792fb,
+    0xc4f3baec, 0x845ec2d5, 0x443aeac2, 0x040433a7, 0xc4601bb0,
+    0x84cd6389, 0x44a94b9e, 0x45fb26eb, 0x859f0efc, 0xc53276c5,
+    0x05565ed2, 0x456887b7, 0x850cafa0, 0xc5a1d799, 0x05c5ff8e,
+    0x45dd6552, 0x85b94d45, 0xc514357c, 0x05701d6b, 0x454ec40e,
+    0x852aec19, 0xc5879420, 0x05e3bc37, 0xcf41ed4f, 0x0f25c558,
+    0x4f88bd61, 0x8fec9576, 0xcfd24c13, 0x0fb66404, 0x4f1b1c3d,
+    0x8f7f342a, 0xcf67aef6, 0x0f0386e1, 0x4faefed8, 0x8fcad6cf,
+    0xcff40faa, 0x0f9027bd, 0x4f3d5f84, 0x8f597793, 0x8e0b1ae6,
+    0x4e6f32f1, 0x0ec24ac8, 0xcea662df, 0x8e98bbba, 0x4efc93ad,
+    0x0e51eb94, 0xce35c383, 0x8e2d595f, 0x4e497148, 0x0ee40971,
+    0xce802166, 0x8ebef803, 0x4edad014, 0x0e77a82d, 0xce13803a,
+    0x0cd372c7, 0xccb75ad0, 0x8c1a22e9, 0x4c7e0afe, 0x0c40d39b,
+    0xcc24fb8c, 0x8c8983b5, 0x4cedaba2, 0x0cf5317e, 0xcc911969,
+    0x8c3c6150, 0x4c584947, 0x0c669022, 0xcc02b835, 0x8cafc00c,
+    0x4ccbe81b, 0x4d99856e, 0x8dfdad79, 0xcd50d540, 0x0d34fd57,
+    0x4d0a2432, 0x8d6e0c25, 0xcdc3741c, 0x0da75c0b, 0x4dbfc6d7,
+    0x8ddbeec0, 0xcd7696f9, 0x0d12beee, 0x4d2c678b, 0x8d484f9c,
+    0xcde537a5, 0x0d811fb2, 0x0862a385, 0xc8068b92, 0x88abf3ab,
+    0x48cfdbbc, 0x08f102d9, 0xc8952ace, 0x883852f7, 0x485c7ae0,
+    0x0844e03c, 0xc820c82b, 0x888db012, 0x48e99805, 0x08d74160,
+    0xc8b36977, 0x881e114e, 0x487a3959, 0x4928542c, 0x894c7c3b,
+    0xc9e10402, 0x09852c15, 0x49bbf570, 0x89dfdd67, 0xc972a55e,
+    0x09168d49, 0x490e1795, 0x896a3f82, 0xc9c747bb, 0x09a36fac,
+    0x499db6c9, 0x89f99ede, 0xc954e6e7, 0x0930cef0, 0xcbf03c0d,
+    0x0b94141a, 0x4b396c23, 0x8b5d4434, 0xcb639d51, 0x0b07b546,
+    0x4baacd7f, 0x8bcee568, 0xcbd67fb4, 0x0bb257a3, 0x4b1f2f9a,
+    0x8b7b078d, 0xcb45dee8, 0x0b21f6ff, 0x4b8c8ec6, 0x8be8a6d1,
+    0x8abacba4, 0x4adee3b3, 0x0a739b8a, 0xca17b39d, 0x8a296af8,
+    0x4a4d42ef, 0x0ae03ad6, 0xca8412c1, 0x8a9c881d, 0x4af8a00a,
+    0x0a55d833, 0xca31f024, 0x8a0f2941, 0x4a6b0156, 0x0ac6796f,
+    0xcaa25178},
+   {0x00000000, 0xd4ea739b, 0xe9d396ed, 0x3d39e576, 0x93a15c00,
+    0x474b2f9b, 0x7a72caed, 0xae98b976, 0x2643b900, 0xf2a9ca9b,
+    0xcf902fed, 0x1b7a5c76, 0xb5e2e500, 0x6108969b, 0x5c3173ed,
+    0x88db0076, 0x4c867201, 0x986c019a, 0xa555e4ec, 0x71bf9777,
+    0xdf272e01, 0x0bcd5d9a, 0x36f4b8ec, 0xe21ecb77, 0x6ac5cb01,
+    0xbe2fb89a, 0x83165dec, 0x57fc2e77, 0xf9649701, 0x2d8ee49a,
+    0x10b701ec, 0xc45d7277, 0x980ce502, 0x4ce69699, 0x71df73ef,
+    0xa5350074, 0x0badb902, 0xdf47ca99, 0xe27e2fef, 0x36945c74,
+    0xbe4f5c02, 0x6aa52f99, 0x579ccaef, 0x8376b974, 0x2dee0002,
+    0xf9047399, 0xc43d96ef, 0x10d7e574, 0xd48a9703, 0x0060e498,
+    0x3d5901ee, 0xe9b37275, 0x472bcb03, 0x93c1b898, 0xaef85dee,
+    0x7a122e75, 0xf2c92e03, 0x26235d98, 0x1b1ab8ee, 0xcff0cb75,
+    0x61687203, 0xb5820198, 0x88bbe4ee, 0x5c519775, 0x3019ca05,
+    0xe4f3b99e, 0xd9ca5ce8, 0x0d202f73, 0xa3b89605, 0x7752e59e,
+    0x4a6b00e8, 0x9e817373, 0x165a7305, 0xc2b0009e, 0xff89e5e8,
+    0x2b639673, 0x85fb2f05, 0x51115c9e, 0x6c28b9e8, 0xb8c2ca73,
+    0x7c9fb804, 0xa875cb9f, 0x954c2ee9, 0x41a65d72, 0xef3ee404,
+    0x3bd4979f, 0x06ed72e9, 0xd2070172, 0x5adc0104, 0x8e36729f,
+    0xb30f97e9, 0x67e5e472, 0xc97d5d04, 0x1d972e9f, 0x20aecbe9,
+    0xf444b872, 0xa8152f07, 0x7cff5c9c, 0x41c6b9ea, 0x952cca71,
+    0x3bb47307, 0xef5e009c, 0xd267e5ea, 0x068d9671, 0x8e569607,
+    0x5abce59c, 0x678500ea, 0xb36f7371, 0x1df7ca07, 0xc91db99c,
+    0xf4245cea, 0x20ce2f71, 0xe4935d06, 0x30792e9d, 0x0d40cbeb,
+    0xd9aab870, 0x77320106, 0xa3d8729d, 0x9ee197eb, 0x4a0be470,
+    0xc2d0e406, 0x163a979d, 0x2b0372eb, 0xffe90170, 0x5171b806,
+    0x859bcb9d, 0xb8a22eeb, 0x6c485d70, 0x6032940b, 0xb4d8e790,
+    0x89e102e6, 0x5d0b717d, 0xf393c80b, 0x2779bb90, 0x1a405ee6,
+    0xceaa2d7d, 0x46712d0b, 0x929b5e90, 0xafa2bbe6, 0x7b48c87d,
+    0xd5d0710b, 0x013a0290, 0x3c03e7e6, 0xe8e9947d, 0x2cb4e60a,
+    0xf85e9591, 0xc56770e7, 0x118d037c, 0xbf15ba0a, 0x6bffc991,
+    0x56c62ce7, 0x822c5f7c, 0x0af75f0a, 0xde1d2c91, 0xe324c9e7,
+    0x37ceba7c, 0x9956030a, 0x4dbc7091, 0x708595e7, 0xa46fe67c,
+    0xf83e7109, 0x2cd40292, 0x11ede7e4, 0xc507947f, 0x6b9f2d09,
+    0xbf755e92, 0x824cbbe4, 0x56a6c87f, 0xde7dc809, 0x0a97bb92,
+    0x37ae5ee4, 0xe3442d7f, 0x4ddc9409, 0x9936e792, 0xa40f02e4,
+    0x70e5717f, 0xb4b80308, 0x60527093, 0x5d6b95e5, 0x8981e67e,
+    0x27195f08, 0xf3f32c93, 0xcecac9e5, 0x1a20ba7e, 0x92fbba08,
+    0x4611c993, 0x7b282ce5, 0xafc25f7e, 0x015ae608, 0xd5b09593,
+    0xe88970e5, 0x3c63037e, 0x502b5e0e, 0x84c12d95, 0xb9f8c8e3,
+    0x6d12bb78, 0xc38a020e, 0x17607195, 0x2a5994e3, 0xfeb3e778,
+    0x7668e70e, 0xa2829495, 0x9fbb71e3, 0x4b510278, 0xe5c9bb0e,
+    0x3123c895, 0x0c1a2de3, 0xd8f05e78, 0x1cad2c0f, 0xc8475f94,
+    0xf57ebae2, 0x2194c979, 0x8f0c700f, 0x5be60394, 0x66dfe6e2,
+    0xb2359579, 0x3aee950f, 0xee04e694, 0xd33d03e2, 0x07d77079,
+    0xa94fc90f, 0x7da5ba94, 0x409c5fe2, 0x94762c79, 0xc827bb0c,
+    0x1ccdc897, 0x21f42de1, 0xf51e5e7a, 0x5b86e70c, 0x8f6c9497,
+    0xb25571e1, 0x66bf027a, 0xee64020c, 0x3a8e7197, 0x07b794e1,
+    0xd35de77a, 0x7dc55e0c, 0xa92f2d97, 0x9416c8e1, 0x40fcbb7a,
+    0x84a1c90d, 0x504bba96, 0x6d725fe0, 0xb9982c7b, 0x1700950d,
+    0xc3eae696, 0xfed303e0, 0x2a39707b, 0xa2e2700d, 0x76080396,
+    0x4b31e6e0, 0x9fdb957b, 0x31432c0d, 0xe5a95f96, 0xd890bae0,
+    0x0c7ac97b},
+   {0x00000000, 0x27652581, 0x0fcc3bd9, 0x28a91e58, 0x5f9e0669,
+    0x78fb23e8, 0x50523db0, 0x77371831, 0xbe3c0dd2, 0x99592853,
+    0xb1f0360b, 0x9695138a, 0xe1a20bbb, 0xc6c72e3a, 0xee6e3062,
+    0xc90b15e3, 0x3d7f6b7f, 0x1a1a4efe, 0x32b350a6, 0x15d67527,
+    0x62e16d16, 0x45844897, 0x6d2d56cf, 0x4a48734e, 0x834366ad,
+    0xa426432c, 0x8c8f5d74, 0xabea78f5, 0xdcdd60c4, 0xfbb84545,
+    0xd3115b1d, 0xf4747e9c, 0x7afed6fe, 0x5d9bf37f, 0x7532ed27,
+    0x5257c8a6, 0x2560d097, 0x0205f516, 0x2aaceb4e, 0x0dc9cecf,
+    0xc4c2db2c, 0xe3a7fead, 0xcb0ee0f5, 0xec6bc574, 0x9b5cdd45,
+    0xbc39f8c4, 0x9490e69c, 0xb3f5c31d, 0x4781bd81, 0x60e49800,
+    0x484d8658, 0x6f28a3d9, 0x181fbbe8, 0x3f7a9e69, 0x17d38031,
+    0x30b6a5b0, 0xf9bdb053, 0xded895d2, 0xf6718b8a, 0xd114ae0b,
+    0xa623b63a, 0x814693bb, 0xa9ef8de3, 0x8e8aa862, 0xb5fadc26,
+    0x929ff9a7, 0xba36e7ff, 0x9d53c27e, 0xea64da4f, 0xcd01ffce,
+    0xe5a8e196, 0xc2cdc417, 0x0bc6d1f4, 0x2ca3f475, 0x040aea2d,
+    0x236fcfac, 0x5458d79d, 0x733df21c, 0x5b94ec44, 0x7cf1c9c5,
+    0x8885b759, 0xafe092d8, 0x87498c80, 0xa02ca901, 0xd71bb130,
+    0xf07e94b1, 0xd8d78ae9, 0xffb2af68, 0x36b9ba8b, 0x11dc9f0a,
+    0x39758152, 0x1e10a4d3, 0x6927bce2, 0x4e429963, 0x66eb873b,
+    0x418ea2ba, 0xcf040ad8, 0xe8612f59, 0xc0c83101, 0xe7ad1480,
+    0x909a0cb1, 0xb7ff2930, 0x9f563768, 0xb83312e9, 0x7138070a,
+    0x565d228b, 0x7ef43cd3, 0x59911952, 0x2ea60163, 0x09c324e2,
+    0x216a3aba, 0x060f1f3b, 0xf27b61a7, 0xd51e4426, 0xfdb75a7e,
+    0xdad27fff, 0xade567ce, 0x8a80424f, 0xa2295c17, 0x854c7996,
+    0x4c476c75, 0x6b2249f4, 0x438b57ac, 0x64ee722d, 0x13d96a1c,
+    0x34bc4f9d, 0x1c1551c5, 0x3b707444, 0x6af5b94d, 0x4d909ccc,
+    0x65398294, 0x425ca715, 0x356bbf24, 0x120e9aa5, 0x3aa784fd,
+    0x1dc2a17c, 0xd4c9b49f, 0xf3ac911e, 0xdb058f46, 0xfc60aac7,
+    0x8b57b2f6, 0xac329777, 0x849b892f, 0xa3feacae, 0x578ad232,
+    0x70eff7b3, 0x5846e9eb, 0x7f23cc6a, 0x0814d45b, 0x2f71f1da,
+    0x07d8ef82, 0x20bdca03, 0xe9b6dfe0, 0xced3fa61, 0xe67ae439,
+    0xc11fc1b8, 0xb628d989, 0x914dfc08, 0xb9e4e250, 0x9e81c7d1,
+    0x100b6fb3, 0x376e4a32, 0x1fc7546a, 0x38a271eb, 0x4f9569da,
+    0x68f04c5b, 0x40595203, 0x673c7782, 0xae376261, 0x895247e0,
+    0xa1fb59b8, 0x869e7c39, 0xf1a96408, 0xd6cc4189, 0xfe655fd1,
+    0xd9007a50, 0x2d7404cc, 0x0a11214d, 0x22b83f15, 0x05dd1a94,
+    0x72ea02a5, 0x558f2724, 0x7d26397c, 0x5a431cfd, 0x9348091e,
+    0xb42d2c9f, 0x9c8432c7, 0xbbe11746, 0xccd60f77, 0xebb32af6,
+    0xc31a34ae, 0xe47f112f, 0xdf0f656b, 0xf86a40ea, 0xd0c35eb2,
+    0xf7a67b33, 0x80916302, 0xa7f44683, 0x8f5d58db, 0xa8387d5a,
+    0x613368b9, 0x46564d38, 0x6eff5360, 0x499a76e1, 0x3ead6ed0,
+    0x19c84b51, 0x31615509, 0x16047088, 0xe2700e14, 0xc5152b95,
+    0xedbc35cd, 0xcad9104c, 0xbdee087d, 0x9a8b2dfc, 0xb22233a4,
+    0x95471625, 0x5c4c03c6, 0x7b292647, 0x5380381f, 0x74e51d9e,
+    0x03d205af, 0x24b7202e, 0x0c1e3e76, 0x2b7b1bf7, 0xa5f1b395,
+    0x82949614, 0xaa3d884c, 0x8d58adcd, 0xfa6fb5fc, 0xdd0a907d,
+    0xf5a38e25, 0xd2c6aba4, 0x1bcdbe47, 0x3ca89bc6, 0x1401859e,
+    0x3364a01f, 0x4453b82e, 0x63369daf, 0x4b9f83f7, 0x6cfaa676,
+    0x988ed8ea, 0xbfebfd6b, 0x9742e333, 0xb027c6b2, 0xc710de83,
+    0xe075fb02, 0xc8dce55a, 0xefb9c0db, 0x26b2d538, 0x01d7f0b9,
+    0x297eeee1, 0x0e1bcb60, 0x792cd351, 0x5e49f6d0, 0x76e0e888,
+    0x5185cd09}};
+
+#endif
+
+#endif
+
+#endif
+
+local const z_crc_t FAR x2n_table[] = {
+    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xedb88320, 0xb1e6b092, 0xa06a2517, 0xed627dae, 0x88d14467,
+    0xd7bbfe6a, 0xec447f11, 0x8e7ea170, 0x6427800e, 0x4d47bae0,
+    0x09fe548f, 0x83852d0f, 0x30362f1a, 0x7b5a9cc3, 0x31fec169,
+    0x9fec022a, 0x6c8dedc4, 0x15d6874d, 0x5fde7a4e, 0xbad90e37,
+    0x2e4e5eef, 0x4eaba214, 0xa8a472c0, 0x429a969e, 0x148d302a,
+    0xc40ba6d0, 0xc4e22c3c};
diff --git a/src_bkp/engine/external/zlib/deflate.c b/src_bkp/engine/external/zlib/deflate.c
new file mode 100644
index 0000000000..4a689db359
--- /dev/null
+++ b/src_bkp/engine/external/zlib/deflate.c
@@ -0,0 +1,2217 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://tools.ietf.org/html/rfc1951
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local int deflateStateCheck      OF((z_streamp strm));
+local void slide_hash     OF((deflate_state *s));
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+
+#ifdef ZLIB_DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
+ *    characters, so that a running hash key can be computed from the previous
+ *    key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input
+ *    characters and the first MIN_MATCH bytes of str are valid (except for
+ *    the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    do { \
+        s->head[s->hash_size - 1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+    } while (0)
+
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local void slide_hash(s)
+    deflate_state *s;
+{
+    unsigned n, m;
+    Posf *p;
+    uInt wsize = s->w_size;
+
+    n = s->hash_size;
+    p = &s->head[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+    } while (--n);
+    n = wsize;
+#ifndef FASTEST
+    p = &s->prev[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+        /* If n is not on any hash chain, prev[n] is garbage but
+         * its value will never be used.
+         */
+    } while (--n);
+#endif
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = (uInt)windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = (uInt)memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    /* We overlay pending_buf and sym_buf. This works since the average size
+     * for length/distance pairs over any compressed block is assured to be 31
+     * bits or less.
+     *
+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
+     * possible fixed-codes length/distance pair is then 31 bits total.
+     *
+     * sym_buf starts one-fourth of the way into pending_buf. So there are
+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
+     * in sym_buf is three bytes -- two for the distance and one for the
+     * literal/length. As each symbol is consumed, the pointer to the next
+     * sym_buf value to read moves forward three bytes. From that symbol, up to
+     * 31 bits are written to pending_buf. The closest the written pending_buf
+     * bits gets to the next sym_buf symbol to read is just before the last
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
+     * symbols are written.) The closest the writing gets to what is unread is
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * can range from 128 to 32768.
+     *
+     * Therefore, at a minimum, there are 142 bits of space between what is
+     * written and what is read in the overlain buffers, so the symbols cannot
+     * be overwritten by the compressed data. That space is actually 139 bits,
+     * due to the three-bit fixed-code block header.
+     *
+     * That covers the case where either Z_FIXED is specified, forcing fixed
+     * codes, or when the use of fixed codes is chosen, because that choice
+     * results in a smaller compressed block than dynamic codes. That latter
+     * condition then assures that the above analysis also covers all dynamic
+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
+     * fewer bits than a fixed-code block would for the same set of symbols.
+     * Therefore its average symbol length is assured to be less than 31. So
+     * the compressed data for a dynamic block also cannot overwrite the
+     * symbols from which it is being constructed.
+     */
+
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->sym_buf = s->pending_buf + s->lit_bufsize;
+    s->sym_end = (s->lit_bufsize - 1) * 3;
+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* =========================================================================
+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
+ */
+local int deflateStateCheck(strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    s = strm->state;
+    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
+#ifdef GZIP
+                                           s->status != GZIP_STATE &&
+#endif
+                                           s->status != EXTRA_STATE &&
+                                           s->status != NAME_STATE &&
+                                           s->status != COMMENT_STATE &&
+                                           s->status != HCRC_STATE &&
+                                           s->status != BUSY_STATE &&
+                                           s->status != FINISH_STATE))
+        return 1;
+    return 0;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
+
+    if (deflateStateCheck(strm) || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
+
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
+    }
+
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
+    }
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateGetDictionary(strm, dictionary, dictLength)
+    z_streamp strm;
+    Bytef *dictionary;
+    uInt  *dictLength;
+{
+    deflate_state *s;
+    uInt len;
+
+    if (deflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    len = s->strstart + s->lookahead;
+    if (len > s->w_size)
+        len = s->w_size;
+    if (dictionary != Z_NULL && len)
+        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
+    if (dictLength != Z_NULL)
+        *dictLength = len;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateResetKeep(strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (deflateStateCheck(strm)) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status =
+#ifdef GZIP
+        s->wrap == 2 ? GZIP_STATE :
+#endif
+        INIT_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = -2;
+
+    _tr_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset(strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader(strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (deflateStateCheck(strm) || strm->state->wrap != 2)
+        return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending(strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime(strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    deflate_state *s;
+    int put;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+    if (bits < 0 || bits > 16 ||
+        s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        s->last_flush != -2) {
+        /* Flush the last buffer: */
+        int err = deflate(strm, Z_BLOCK);
+        if (err == Z_STREAM_ERROR)
+            return err;
+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
+            return Z_BUF_ERROR;
+    }
+    if (s->level != level) {
+        if (s->level == 0 && s->matches != 0) {
+            if (s->matches == 1)
+                slide_hash(s);
+            else
+                CLEAR_HASH(s);
+            s->matches = 0;
+        }
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = (uInt)good_length;
+    s->max_lazy_match = (uInt)max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = (uInt)max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
+ *
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
+ *
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
+ *
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
+ *
+ * Shifts are used to approximate divisions, for speed.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong fixedlen, storelen, wraplen;
+
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
+
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
+
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
+    if (deflateStateCheck(strm))
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+#ifdef GZIP
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            Bytef *str;
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+#endif
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return one of the conservative bounds */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return (s->w_bits <= s->hash_bits ? fixedlen : storelen) + wraplen;
+
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB(s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output, except for
+ * some deflate_stored() output, goes through this function so some
+ * applications may wish to modify it to avoid allocating a large
+ * strm->next_out buffer and copying into it. (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len;
+    deflate_state *s = strm->state;
+
+    _tr_flush_bits(s);
+    len = s->pending;
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, s->pending_out, len);
+    strm->next_out  += len;
+    s->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out -= len;
+    s->pending      -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
+    }
+}
+
+/* ===========================================================================
+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
+ */
+#define HCRC_UPDATE(beg) \
+    do { \
+        if (s->gzhead->hcrc && s->pending > (beg)) \
+            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
+                                s->pending - (beg)); \
+    } while (0)
+
+/* ========================================================================= */
+int ZEXPORT deflate(strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Write the header */
+    if (s->status == INIT_STATE && s->wrap == 0)
+        s->status = BUSY_STATE;
+    if (s->status == INIT_STATE) {
+        /* zlib header */
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
+        uInt level_flags;
+
+        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+            level_flags = 0;
+        else if (s->level < 6)
+            level_flags = 1;
+        else if (s->level == 6)
+            level_flags = 2;
+        else
+            level_flags = 3;
+        header |= (level_flags << 6);
+        if (s->strstart != 0) header |= PRESET_DICT;
+        header += 31 - (header % 31);
+
+        putShortMSB(s, header);
+
+        /* Save the adler32 of the preset dictionary: */
+        if (s->strstart != 0) {
+            putShortMSB(s, (uInt)(strm->adler >> 16));
+            putShortMSB(s, (uInt)(strm->adler & 0xffff));
+        }
+        strm->adler = adler32(0L, Z_NULL, 0);
+        s->status = BUSY_STATE;
+
+        /* Compression must start with an empty pending buffer */
+        flush_pending(strm);
+        if (s->pending != 0) {
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
+#ifdef GZIP
+    if (s->status == GZIP_STATE) {
+        /* gzip header */
+        strm->adler = crc32(0L, Z_NULL, 0);
+        put_byte(s, 31);
+        put_byte(s, 139);
+        put_byte(s, 8);
+        if (s->gzhead == Z_NULL) {
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, OS_CODE);
+            s->status = BUSY_STATE;
+
+            /* Compression must start with an empty pending buffer */
+            flush_pending(strm);
+            if (s->pending != 0) {
+                s->last_flush = -1;
+                return Z_OK;
+            }
+        }
+        else {
+            put_byte(s, (s->gzhead->text ? 1 : 0) +
+                     (s->gzhead->hcrc ? 2 : 0) +
+                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                     (s->gzhead->name == Z_NULL ? 0 : 8) +
+                     (s->gzhead->comment == Z_NULL ? 0 : 16)
+                     );
+            put_byte(s, (Byte)(s->gzhead->time & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, s->gzhead->os & 0xff);
+            if (s->gzhead->extra != Z_NULL) {
+                put_byte(s, s->gzhead->extra_len & 0xff);
+                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+            }
+            if (s->gzhead->hcrc)
+                strm->adler = crc32(strm->adler, s->pending_buf,
+                                    s->pending);
+            s->gzindex = 0;
+            s->status = EXTRA_STATE;
+        }
+    }
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
+            while (s->pending + left > s->pending_buf_size) {
+                uInt copy = s->pending_buf_size - s->pending;
+                zmemcpy(s->pending_buf + s->pending,
+                        s->gzhead->extra + s->gzindex, copy);
+                s->pending = s->pending_buf_size;
+                HCRC_UPDATE(beg);
+                s->gzindex += copy;
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
+                }
+                beg = 0;
+                left -= copy;
+            }
+            zmemcpy(s->pending_buf + s->pending,
+                    s->gzhead->extra + s->gzindex, left);
+            s->pending += left;
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
+        }
+        s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    HCRC_UPDATE(beg);
+                    flush_pending(strm);
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
+                    }
+                    beg = 0;
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
+        }
+        s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    HCRC_UPDATE(beg);
+                    flush_pending(strm);
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
+                    }
+                    beg = 0;
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            HCRC_UPDATE(beg);
+        }
+        s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size) {
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
+                }
+            }
+            put_byte(s, (Byte)(strm->adler & 0xff));
+            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+            strm->adler = crc32(0L, Z_NULL, 0);
+        }
+        s->status = BUSY_STATE;
+
+        /* Compression must start with an empty pending buffer */
+        flush_pending(strm);
+        if (s->pending != 0) {
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
+#endif
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = s->level == 0 ? deflate_stored(s, flush) :
+                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                 (*(configuration_table[s->level].func))(s, flush);
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd(strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy(dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+
+
+    if (deflateStateCheck(source) || dest == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local unsigned read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init(s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                      /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = (int)s->prev_length;         /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len - 1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]     != scan_end  ||
+            match[best_len - 1] != scan_end1 ||
+            *match              != *scan     ||
+            *++match            != scan[1])      continue;
+
+        /* The check at best_len - 1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart + 258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan + best_len - 1);
+#else
+            scan_end1  = scan[best_len - 1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len - 1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart + 258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef ZLIB_DEBUG
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* ZLIB_DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    unsigned n;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize + MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+            if (s->insert > s->strstart)
+                s->insert = s->strstart;
+            slide_hash(s);
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* Maximum stored block length in deflate format (not including header). */
+#define MAX_STORED 65535
+
+/* Minimum of a and b. */
+#define MIN(a, b) ((a) > (b) ? (b) : (a))
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ *
+ * In case deflateParams() is used to later switch to a non-zero compression
+ * level, s->matches (otherwise unused when storing) keeps track of the number
+ * of hash table slides to perform. If s->matches is 1, then one hash table
+ * slide will be done when switching. If s->matches is 2, the maximum value
+ * allowed here, then the hash table will be cleared, since two or more slides
+ * is the same as a clear.
+ *
+ * deflate_stored() is written to minimize the number of times an input byte is
+ * copied. It is most efficient with large input and output buffers, which
+ * maximizes the opportunities to have a single copy from next_in to next_out.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Smallest worthy block size when not flushing or finishing. By default
+     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
+     * large input and output buffers, the stored block size will be larger.
+     */
+    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
+
+    /* Copy as many min_block or larger stored blocks directly to next_out as
+     * possible. If flushing, copy the remaining available input to next_out as
+     * stored blocks, if there is enough space.
+     */
+    unsigned len, left, have, last = 0;
+    unsigned used = s->strm->avail_in;
+    do {
+        /* Set len to the maximum size block that we can copy directly with the
+         * available input data and output space. Set left to how much of that
+         * would be copied from what's left in the window.
+         */
+        len = MAX_STORED;       /* maximum deflate stored block length */
+        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        if (s->strm->avail_out < have)          /* need room for header */
+            break;
+            /* maximum stored block length that will fit in avail_out: */
+        have = s->strm->avail_out - have;
+        left = s->strstart - s->block_start;    /* bytes left in window */
+        if (len > (ulg)left + s->strm->avail_in)
+            len = left + s->strm->avail_in;     /* limit len to the input */
+        if (len > have)
+            len = have;                         /* limit len to the output */
+
+        /* If the stored block would be less than min_block in length, or if
+         * unable to copy all of the available input when flushing, then try
+         * copying to the window and the pending buffer instead. Also don't
+         * write an empty block when flushing -- deflate() does that.
+         */
+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+                                flush == Z_NO_FLUSH ||
+                                len != left + s->strm->avail_in))
+            break;
+
+        /* Make a dummy stored block in pending to get the header bytes,
+         * including any pending bits. This also updates the debugging counts.
+         */
+        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
+        _tr_stored_block(s, (char *)0, 0L, last);
+
+        /* Replace the lengths in the dummy stored block with len. */
+        s->pending_buf[s->pending - 4] = len;
+        s->pending_buf[s->pending - 3] = len >> 8;
+        s->pending_buf[s->pending - 2] = ~len;
+        s->pending_buf[s->pending - 1] = ~len >> 8;
+
+        /* Write the stored block header bytes. */
+        flush_pending(s->strm);
+
+#ifdef ZLIB_DEBUG
+        /* Update debugging counts for the data about to be copied. */
+        s->compressed_len += len << 3;
+        s->bits_sent += len << 3;
+#endif
+
+        /* Copy uncompressed bytes from the window to next_out. */
+        if (left) {
+            if (left > len)
+                left = len;
+            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
+            s->strm->next_out += left;
+            s->strm->avail_out -= left;
+            s->strm->total_out += left;
+            s->block_start += left;
+            len -= left;
+        }
+
+        /* Copy uncompressed bytes directly from next_in to next_out, updating
+         * the check value.
+         */
+        if (len) {
+            read_buf(s->strm, s->strm->next_out, len);
+            s->strm->next_out += len;
+            s->strm->avail_out -= len;
+            s->strm->total_out += len;
+        }
+    } while (last == 0);
+
+    /* Update the sliding window with the last s->w_size bytes of the copied
+     * data, or append all of the copied data to the existing window if less
+     * than s->w_size bytes were copied. Also update the number of bytes to
+     * insert in the hash tables, in the event that deflateParams() switches to
+     * a non-zero compression level.
+     */
+    used -= s->strm->avail_in;      /* number of input bytes directly copied */
+    if (used) {
+        /* If any input was used, then no unused input remains in the window,
+         * therefore s->block_start == s->strstart.
+         */
+        if (used >= s->w_size) {    /* supplant the previous history */
+            s->matches = 2;         /* clear hash */
+            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
+            s->strstart = s->w_size;
+            s->insert = s->strstart;
+        }
+        else {
+            if (s->window_size - s->strstart <= used) {
+                /* Slide the window down. */
+                s->strstart -= s->w_size;
+                zmemcpy(s->window, s->window + s->w_size, s->strstart);
+                if (s->matches < 2)
+                    s->matches++;   /* add a pending slide_hash() */
+                if (s->insert > s->strstart)
+                    s->insert = s->strstart;
+            }
+            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
+            s->strstart += used;
+            s->insert += MIN(used, s->w_size - s->insert);
+        }
+        s->block_start = s->strstart;
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* If the last block was written to next_out, then done. */
+    if (last)
+        return finish_done;
+
+    /* If flushing and all input has been consumed, then done. */
+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        return block_done;
+
+    /* Fill the window with any remaining input. */
+    have = s->window_size - s->strstart;
+    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+        /* Slide the window down. */
+        s->block_start -= s->w_size;
+        s->strstart -= s->w_size;
+        zmemcpy(s->window, s->window + s->w_size, s->strstart);
+        if (s->matches < 2)
+            s->matches++;           /* add a pending slide_hash() */
+        have += s->w_size;          /* more space now */
+        if (s->insert > s->strstart)
+            s->insert = s->strstart;
+    }
+    if (have > s->strm->avail_in)
+        have = s->strm->avail_in;
+    if (have) {
+        read_buf(s->strm, s->window + s->strstart, have);
+        s->strstart += have;
+        s->insert += MIN(have, s->w_size - s->insert);
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* There was not enough avail_out to write a complete worthy or flushed
+     * stored block to next_out. Write a stored block to pending instead, if we
+     * have enough input for a worthy block, or if flushing and there is enough
+     * room for the remaining input as a stored block in the pending buffer.
+     */
+    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        /* maximum stored block length that will fit in pending: */
+    have = MIN(s->pending_buf_size - have, MAX_STORED);
+    min_block = MIN(have, s->w_size);
+    left = s->strstart - s->block_start;
+    if (left >= min_block ||
+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+         s->strm->avail_in == 0 && left <= have)) {
+        len = MIN(left, have);
+        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
+               len == left ? 1 : 0;
+        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
+        s->block_start += len;
+        flush_pending(s->strm);
+    }
+
+    /* We've done all we can with the available input and output. */
+    return last ? finish_started : need_more;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart + 2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart + 2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart - 1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length - 1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
+        s->match_available = 0;
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest run, plus one for the unrolled loop.
+         */
+        if (s->lookahead <= MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (uInt)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
diff --git a/src_bkp/engine/external/zlib/deflate.h b/src_bkp/engine/external/zlib/deflate.h
new file mode 100644
index 0000000000..1a06cd5f25
--- /dev/null
+++ b/src_bkp/engine/external/zlib/deflate.h
@@ -0,0 +1,346 @@
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2018 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
+#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
+#ifdef GZIP
+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
+#endif
+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
+#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
+#define FINISH_STATE 666    /* stream complete */
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    const static_tree_desc *stat_desc;  /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    ulg   pending;       /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    ulg   gzindex;       /* where in extra, name, or comment */
+    Byte  method;        /* can only be DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_end;       /* symbol table full when sym_next reaches this */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    uInt insert;        /* bytes at end of window left to insert */
+
+#ifdef ZLIB_DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
+        /* in trees.c */
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef ZLIB_DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
+#else
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (uch)(length); \
+    ush dist = (ush)(distance); \
+    s->sym_buf[s->sym_next++] = (uch)dist; \
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
+    s->sym_buf[s->sym_next++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/src_bkp/engine/external/zlib/gzclose.c b/src_bkp/engine/external/zlib/gzclose.c
new file mode 100644
index 0000000000..caeb99a317
--- /dev/null
+++ b/src_bkp/engine/external/zlib/gzclose.c
@@ -0,0 +1,25 @@
+/* gzclose.c -- zlib gzclose() function
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* gzclose() is in a separate file so that it is linked in only if it is used.
+   That way the other gzclose functions can be used instead to avoid linking in
+   unneeded compression or decompression routines. */
+int ZEXPORT gzclose(file)
+    gzFile file;
+{
+#ifndef NO_GZCOMPRESS
+    gz_statep state;
+
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
+#else
+    return gzclose_r(file);
+#endif
+}
diff --git a/src_bkp/engine/external/zlib/gzguts.h b/src_bkp/engine/external/zlib/gzguts.h
new file mode 100644
index 0000000000..57faf37165
--- /dev/null
+++ b/src_bkp/engine/external/zlib/gzguts.h
@@ -0,0 +1,219 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
+
+#ifndef _POSIX_SOURCE
+#  define _POSIX_SOURCE
+#endif
+#include <fcntl.h>
+
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#if defined(_WIN32)
+#  define WIDECHAR
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99), _snprintf does not guarantee
+   null termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#  define snprintf _snprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifndef NO_STRERROR
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
+    unsigned char *in;      /* input buffer (double-sized when writing) */
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
+        /* just for reading */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+    int reset;              /* true if a reset is pending after a Z_FINISH */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/src_bkp/engine/external/zlib/gzlib.c b/src_bkp/engine/external/zlib/gzlib.c
new file mode 100644
index 0000000000..55da46a453
--- /dev/null
+++ b/src_bkp/engine/external/zlib/gzlib.c
@@ -0,0 +1,639 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+#if defined(_WIN32) && !defined(__BORLANDC__)
+#  define LSEEK _lseeki64
+#else
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define LSEEK lseek64
+#else
+#  define LSEEK lseek
+#endif
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const void *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+   string and return a pointer to it.  Typically, the values for ERROR come
+   from GetLastError.
+
+   The string pointed to shall not be modified by the application, but may be
+   overwritten by a subsequent call to gz_strwinerror
+
+   The gz_strwinerror function does not change the current setting of
+   GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror(error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+    gz_statep state;
+{
+    state->x.have = 0;              /* no output data available */
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
+        state->how = LOOK;          /* look for gzip header */
+    }
+    else                            /* for writing ... */
+        state->reset = 0;           /* no deflateReset pending */
+    state->seek = 0;                /* no seek request pending */
+    gz_error(state, Z_OK, NULL);    /* clear error */
+    state->x.pos = 0;               /* no uncompressed data yet */
+    state->strm.avail_in = 0;       /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+    const void *path;
+    int fd;
+    const char *mode;
+{
+    gz_statep state;
+    z_size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
+
+    /* allocate gzFile structure to return */
+    state = (gz_statep)malloc(sizeof(gz_state));
+    if (state == NULL)
+        return NULL;
+    state->size = 0;            /* no buffers allocated yet */
+    state->want = GZBUFSIZE;    /* requested buffer size */
+    state->msg = NULL;          /* no error message yet */
+
+    /* interpret mode */
+    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
+    while (*mode) {
+        if (*mode >= '0' && *mode <= '9')
+            state->level = *mode - '0';
+        else
+            switch (*mode) {
+            case 'r':
+                state->mode = GZ_READ;
+                break;
+#ifndef NO_GZCOMPRESS
+            case 'w':
+                state->mode = GZ_WRITE;
+                break;
+            case 'a':
+                state->mode = GZ_APPEND;
+                break;
+#endif
+            case '+':       /* can't read and write at the same time */
+                free(state);
+                return NULL;
+            case 'b':       /* ignore -- will request binary anyway */
+                break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
+            case 'f':
+                state->strategy = Z_FILTERED;
+                break;
+            case 'h':
+                state->strategy = Z_HUFFMAN_ONLY;
+                break;
+            case 'R':
+                state->strategy = Z_RLE;
+                break;
+            case 'F':
+                state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
+            default:        /* could consider as an error, but just ignore */
+                ;
+            }
+        mode++;
+    }
+
+    /* must provide an "r", "w", or "a" */
+    if (state->mode == GZ_NONE) {
+        free(state);
+        return NULL;
+    }
+
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
+    /* save the path name for error messages */
+#ifdef WIDECHAR
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (z_size_t)-1)
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
+    if (state->path == NULL) {
+        free(state);
+        return NULL;
+    }
+#ifdef WIDECHAR
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
+#else
+        strcpy(state->path, path);
+#endif
+
+    /* compute the flags for open() */
+    oflag =
+#ifdef O_LARGEFILE
+        O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+        O_BINARY |
+#endif
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef WIDECHAR
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
+    if (state->fd == -1) {
+        free(state->path);
+        free(state);
+        return NULL;
+    }
+    if (state->mode == GZ_APPEND) {
+        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
+        state->mode = GZ_WRITE;         /* simplify later checks */
+    }
+
+    /* save the current position for rewinding (only if reading) */
+    if (state->mode == GZ_READ) {
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);
+        if (state->start == -1) state->start = 0;
+    }
+
+    /* initialize stream */
+    gz_reset(state);
+
+    /* return stream */
+    return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    char *path;         /* identifier for error messages */
+    gzFile gz;
+
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
+#else
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
+    gz = gz_open(path, fd, mode);
+    free(path);
+    return gz;
+}
+
+/* -- see zlib.h -- */
+#ifdef WIDECHAR
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+    gzFile file;
+    unsigned size;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* make sure we haven't already allocated memory */
+    if (state->size != 0)
+        return -1;
+
+    /* check and set requested size */
+    if ((size << 1) < size)
+        return -1;              /* need to be able to double it */
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
+    state->want = size;
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* back up and start over */
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+        return -1;
+    gz_reset(state);
+    return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+    gzFile file;
+    z_off64_t offset;
+    int whence;
+{
+    unsigned n;
+    z_off64_t ret;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* check that there's no error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* can only seek from start or relative to current position */
+    if (whence != SEEK_SET && whence != SEEK_CUR)
+        return -1;
+
+    /* normalize offset to a SEEK_CUR specification */
+    if (whence == SEEK_SET)
+        offset -= state->x.pos;
+    else if (state->seek)
+        offset += state->skip;
+    state->seek = 0;
+
+    /* if within raw area while reading, just go there */
+    if (state->mode == GZ_READ && state->how == COPY &&
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
+        if (ret == -1)
+            return -1;
+        state->x.have = 0;
+        state->eof = 0;
+        state->past = 0;
+        state->seek = 0;
+        gz_error(state, Z_OK, NULL);
+        state->strm.avail_in = 0;
+        state->x.pos += offset;
+        return state->x.pos;
+    }
+
+    /* calculate skip amount, rewinding if needed for back seek when reading */
+    if (offset < 0) {
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
+            return -1;
+        offset += state->x.pos;
+        if (offset < 0)                     /* before start of file! */
+            return -1;
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
+            return -1;
+    }
+
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */
+    if (state->mode == GZ_READ) {
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        offset -= n;
+    }
+
+    /* request skip (if not zero) */
+    if (offset) {
+        state->seek = 1;
+        state->skip = offset;
+    }
+    return state->x.pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    z_off64_t ret;
+
+    ret = gzseek64(file, (z_off64_t)offset, whence);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* return position */
+    return state->x.pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gztell64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+    gzFile file;
+{
+    z_off64_t offset;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* compute and return effective offset in file */
+    offset = LSEEK(state->fd, 0, SEEK_CUR);
+    if (offset == -1)
+        return -1;
+    if (state->mode == GZ_READ)             /* reading */
+        offset -= state->strm.avail_in;     /* don't count buffered input */
+    return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gzoffset64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return 0;
+
+    /* return end-of-file state */
+    return state->mode == GZ_READ ? state->past : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return NULL;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return NULL;
+
+    /* return error information */
+    if (errnum != NULL)
+        *errnum = state->err;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return;
+
+    /* clear error and end-of-file */
+    if (state->mode == GZ_READ) {
+        state->eof = 0;
+        state->past = 0;
+    }
+    gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+   state->msg accordingly.  Free any previous error message already there.  Do
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of
+   memory).  Simply save the error message as a static string.  If there is an
+   allocation failure constructing the error message, then convert the error to
+   out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+    gz_statep state;
+    int err;
+    const char *msg;
+{
+    /* free previously allocated message and clear */
+    if (state->msg != NULL) {
+        if (state->err != Z_MEM_ERROR)
+            free(state->msg);
+        state->msg = NULL;
+    }
+
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
+    /* set error code, and if no message, then done */
+    state->err = err;
+    if (msg == NULL)
+        return;
+
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
+        return;
+
+    /* construct error message with path */
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
+        state->err = Z_MEM_ERROR;
+        return;
+    }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+                   "%s%s%s", state->path, ": ", msg);
+#else
+    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
+#endif
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+   available) -- we need to do this to cover cases where 2's complement not
+   used, since C standard permits 1's complement and sign-bit representations,
+   otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+    unsigned p, q;
+
+    p = 1;
+    do {
+        q = p;
+        p <<= 1;
+        p++;
+    } while (p > q);
+    return q >> 1;
+}
+#endif
diff --git a/src_bkp/engine/external/zlib/gzread.c b/src_bkp/engine/external/zlib/gzread.c
new file mode 100644
index 0000000000..dd77381596
--- /dev/null
+++ b/src_bkp/engine/external/zlib/gzread.c
@@ -0,0 +1,650 @@
+/* gzread.c -- zlib functions for reading gzip files
+ * Copyright (C) 2004-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_look OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_fetch OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
+local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.
+   This function needs to loop on read(), since read() is not guaranteed to
+   read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+    gz_statep state;
+    unsigned char *buf;
+    unsigned len;
+    unsigned *have;
+{
+    int ret;
+    unsigned get, max = ((unsigned)-1 >> 2) + 1;
+
+    *have = 0;
+    do {
+        get = len - *have;
+        if (get > max)
+            get = max;
+        ret = read(state->fd, buf + *have, get);
+        if (ret <= 0)
+            break;
+        *have += (unsigned)ret;
+    } while (*have < len);
+    if (ret < 0) {
+        gz_error(state, Z_ERRNO, zstrerror());
+        return -1;
+    }
+    if (ret == 0)
+        state->eof = 1;
+    return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input
+   file is reached, even though there may be unused data in the buffer.  Once
+   that data has been used, no more attempts will be made to read the file.
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
+local int gz_avail(state)
+    gz_statep state;
+{
+    unsigned got;
+    z_streamp strm = &(state->strm);
+
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+    if (state->eof == 0) {
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
+            return -1;
+        strm->avail_in += got;
+        strm->next_in = state->in;
+    }
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
+   If this is the first time in, allocate required memory.  state->how will be
+   left unchanged if there is no more input data available, will be set to COPY
+   if there is no gzip header and direct copying will be performed, or it will
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    /* allocate read buffers and inflate memory */
+    if (state->size == 0) {
+        /* allocate buffers */
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
+        if (state->in == NULL || state->out == NULL) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        state->size = state->want;
+
+        /* allocate inflate memory */
+        state->strm.zalloc = Z_NULL;
+        state->strm.zfree = Z_NULL;
+        state->strm.opaque = Z_NULL;
+        state->strm.avail_in = 0;
+        state->strm.next_in = Z_NULL;
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
+            free(state->out);
+            free(state->in);
+            state->size = 0;
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
+        if (gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0)
+            return 0;
+    }
+
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
+    }
+
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
+    memcpy(state->x.next, strm->next_in, strm->avail_in);
+    state->x.have = strm->avail_in;
+    strm->avail_in = 0;
+    state->how = COPY;
+    state->direct = 1;
+    return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
+local int gz_decomp(state)
+    gz_statep state;
+{
+    int ret = Z_OK;
+    unsigned had;
+    z_streamp strm = &(state->strm);
+
+    /* fill output buffer up to end of deflate stream */
+    had = strm->avail_out;
+    do {
+        /* get more input for inflate() */
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0) {
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
+        }
+
+        /* decompress and handle errors */
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+            gz_error(state, Z_STREAM_ERROR,
+                     "internal error: inflate stream corrupt");
+            return -1;
+        }
+        if (ret == Z_MEM_ERROR) {
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            gz_error(state, Z_DATA_ERROR,
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
+            return -1;
+        }
+    } while (strm->avail_out && ret != Z_STREAM_END);
+
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
+
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
+
+    /* good decompression */
+    return 0;
+}
+
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
+   Data is either copied from the input file or decompressed from the input
+   file depending on state->how.  If state->how is LOOK, then a gzip header is
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
+            return 0;
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
+    return 0;
+}
+
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    unsigned n;
+
+    /* skip over len bytes or reach end-of-file, whichever comes first */
+    while (len)
+        /* skip over whatever is in output buffer */
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
+            len -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0)
+            break;
+
+        /* need more data to skip -- load up output buffer */
+        else {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return -1;
+        }
+    return 0;
+}
+
+/* Read len bytes into buf from file, or less than len up to the end of the
+   input.  Return the number of bytes read.  If zero is returned, either the
+   end of file was reached, or there was an error.  state->err must be
+   consulted in that case to determine which. */
+local z_size_t gz_read(state, buf, len)
+    gz_statep state;
+    voidp buf;
+    z_size_t len;
+{
+    z_size_t got;
+    unsigned n;
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* get len bytes to buf, or less than len if at the end */
+    got = 0;
+    do {
+        /* set n to the maximum amount of len that fits in an unsigned int */
+        n = (unsigned)-1;
+        if (n > len)
+            n = (unsigned)len;
+
+        /* first just try copying data from the output buffer */
+        if (state->x.have) {
+            if (state->x.have < n)
+                n = state->x.have;
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0) {
+            state->past = 1;        /* tried to read past end */
+            break;
+        }
+
+        /* need output data -- for small len or new stream load up our output
+           buffer */
+        else if (state->how == LOOK || n < (state->size << 1)) {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return 0;
+            continue;       /* no progress yet -- go back to copy above */
+            /* the copy above assures that we will leave with space in the
+               output buffer, allowing at least one gzungetc() to succeed */
+        }
+
+        /* large len -- read directly into user buffer */
+        else if (state->how == COPY) {      /* read directly */
+            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
+                return 0;
+        }
+
+        /* large len -- decompress directly into user buffer */
+        else {  /* state->how == GZIP */
+            state->strm.avail_out = n;
+            state->strm.next_out = (unsigned char *)buf;
+            if (gz_decomp(state) == -1)
+                return 0;
+            n = state->x.have;
+            state->x.have = 0;
+        }
+
+        /* update progress */
+        len -= n;
+        buf = (char *)buf + n;
+        got += n;
+        state->x.pos += n;
+    } while (len);
+
+    /* return number of bytes read into user buffer */
+    return got;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids a flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
+        return -1;
+    }
+
+    /* read len or fewer bytes to buf */
+    len = (unsigned)gz_read(state, buf, len);
+
+    /* check for an error */
+    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* return the number of bytes read (this is assured to fit in an int) */
+    return (int)len;
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfread(buf, size, nitems, file)
+    voidp buf;
+    z_size_t size;
+    z_size_t nitems;
+    gzFile file;
+{
+    z_size_t len;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return 0;
+
+    /* compute bytes to read -- error on overflow */
+    len = nitems * size;
+    if (size && len / size != nitems) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+        return 0;
+    }
+
+    /* read len or fewer bytes to buf, return the number of full items read */
+    return len ? gz_read(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#else
+#  undef gzgetc
+#endif
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    unsigned char buf[1];
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* try output buffer (no need to check for skip request) */
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
+    }
+
+    /* nothing there -- try gz_read() */
+    return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
+}
+
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* can't push EOF */
+    if (c < 0)
+        return -1;
+
+    /* if output buffer empty, put byte at end (allows more pushing) */
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
+        state->x.next[0] = (unsigned char)c;
+        state->x.pos--;
+        state->past = 0;
+        return c;
+    }
+
+    /* if no room, give up (must have already done a gzungetc()) */
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+        return -1;
+    }
+
+    /* slide output data if needed and insert byte before existing data */
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
+        unsigned char *dest = state->out + (state->size << 1);
+        while (src > state->out)
+            *--dest = *--src;
+        state->x.next = dest;
+    }
+    state->x.have++;
+    state->x.next--;
+    state->x.next[0] = (unsigned char)c;
+    state->x.pos--;
+    state->past = 0;
+    return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    unsigned left, n;
+    char *str;
+    unsigned char *eol;
+    gz_statep state;
+
+    /* check parameters and get internal structure */
+    if (file == NULL || buf == NULL || len < 1)
+        return NULL;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return NULL;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return NULL;
+    }
+
+    /* copy output bytes up to new line or len - 1, whichever comes first --
+       append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) */
+    str = buf;
+    left = (unsigned)len - 1;
+    if (left) do {
+        /* assure that something is in the output buffer */
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
+        }
+
+        /* look for end-of-line in current output buffer */
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+        if (eol != NULL)
+            n = (unsigned)(eol - state->x.next) + 1;
+
+        /* copy through end-of-line, or remainder if not found */
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        left -= n;
+        buf += n;
+    } while (left && eol == NULL);
+
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
+    buf[0] = 0;
+    return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* if the state is not known, but we can find out, then do so (this is
+       mainly for right after a gzopen() or gzdopen()) */
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
+
+    /* return 1 if transparent, 0 if processing a gzip stream */
+    return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+    gzFile file;
+{
+    int ret, err;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return Z_STREAM_ERROR;
+
+    /* free memory and close file */
+    if (state->size) {
+        inflateEnd(&(state->strm));
+        free(state->out);
+        free(state->in);
+    }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret = close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : err;
+}
diff --git a/src_bkp/engine/external/zlib/gzwrite.c b/src_bkp/engine/external/zlib/gzwrite.c
new file mode 100644
index 0000000000..eb8a0e5893
--- /dev/null
+++ b/src_bkp/engine/external/zlib/gzwrite.c
@@ -0,0 +1,677 @@
+/* gzwrite.c -- zlib functions for writing gzip files
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
+local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
+
+/* Initialize state for writing a gzip file.  Mark initialization by setting
+   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
+   success. */
+local int gz_init(state)
+    gz_statep state;
+{
+    int ret;
+    z_streamp strm = &(state->strm);
+
+    /* allocate input buffer (double size for gzprintf) */
+    state->in = (unsigned char *)malloc(state->want << 1);
+    if (state->in == NULL) {
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        strm->next_in = NULL;
+    }
+
+    /* mark state as initialized */
+    state->size = state->want;
+
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
+    return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
+   Return -1 if there is an error writing to the output file or if gz_init()
+   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
+   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
+   reset to start a new gzip stream.  If gz->direct is true, then simply write
+   to the output file without compressing, and ignore flush. */
+local int gz_comp(state, flush)
+    gz_statep state;
+    int flush;
+{
+    int ret, writ;
+    unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
+    z_streamp strm = &(state->strm);
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return -1;
+
+    /* write directly if requested */
+    if (state->direct) {
+        while (strm->avail_in) {
+            put = strm->avail_in > max ? max : strm->avail_in;
+            writ = write(state->fd, strm->next_in, put);
+            if (writ < 0) {
+                gz_error(state, Z_ERRNO, zstrerror());
+                return -1;
+            }
+            strm->avail_in -= (unsigned)writ;
+            strm->next_in += writ;
+        }
+        return 0;
+    }
+
+    /* check for a pending reset */
+    if (state->reset) {
+        /* don't start a new gzip member unless there is data to write */
+        if (strm->avail_in == 0)
+            return 0;
+        deflateReset(strm);
+        state->reset = 0;
+    }
+
+    /* run deflate() on provided input until it produces no more output */
+    ret = Z_OK;
+    do {
+        /* write out current buffer contents if full, or if flushing, but if
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
+            while (strm->next_out > state->x.next) {
+                put = strm->next_out - state->x.next > (int)max ? max :
+                      (unsigned)(strm->next_out - state->x.next);
+                writ = write(state->fd, state->x.next, put);
+                if (writ < 0) {
+                    gz_error(state, Z_ERRNO, zstrerror());
+                    return -1;
+                }
+                state->x.next += writ;
+            }
+            if (strm->avail_out == 0) {
+                strm->avail_out = state->size;
+                strm->next_out = state->out;
+                state->x.next = state->out;
+            }
+        }
+
+        /* compress */
+        have = strm->avail_out;
+        ret = deflate(strm, flush);
+        if (ret == Z_STREAM_ERROR) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: deflate stream corrupt");
+            return -1;
+        }
+        have -= strm->avail_out;
+    } while (have);
+
+    /* if that completed a deflate stream, allow another to start */
+    if (flush == Z_FINISH)
+        state->reset = 1;
+
+    /* all done, no errors */
+    return 0;
+}
+
+/* Compress len zeros to output.  Return -1 on a write error or memory
+   allocation failure by gz_comp(), or 0 on success. */
+local int gz_zero(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    int first;
+    unsigned n;
+    z_streamp strm = &(state->strm);
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return -1;
+
+    /* compress len zeros (len guaranteed > 0) */
+    first = 1;
+    while (len) {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+            (unsigned)len : state->size;
+        if (first) {
+            memset(state->in, 0, n);
+            first = 0;
+        }
+        strm->avail_in = n;
+        strm->next_in = state->in;
+        state->x.pos += n;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return -1;
+        len -= n;
+    }
+    return 0;
+}
+
+/* Write len bytes from buf to file.  Return the number of bytes written.  If
+   the returned value is less than len, then there was an error. */
+local z_size_t gz_write(state, buf, len)
+    gz_statep state;
+    voidpc buf;
+    z_size_t len;
+{
+    z_size_t put = len;
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* for small len, copy to input buffer, otherwise compress directly */
+    if (len < state->size) {
+        /* copy to input buffer, compress when full */
+        do {
+            unsigned have, copy;
+
+            if (state->strm.avail_in == 0)
+                state->strm.next_in = state->in;
+            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
+                              state->in);
+            copy = state->size - have;
+            if (copy > len)
+                copy = (unsigned)len;
+            memcpy(state->in + have, buf, copy);
+            state->strm.avail_in += copy;
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+        } while (len);
+    }
+    else {
+        /* consume whatever's left in the input buffer */
+        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+
+        /* directly compress user buffer to file */
+        state->strm.next_in = (z_const Bytef *)buf;
+        do {
+            unsigned n = (unsigned)-1;
+            if (n > len)
+                n = (unsigned)len;
+            state->strm.avail_in = n;
+            state->x.pos += n;
+            if (gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+            len -= n;
+        } while (len);
+    }
+
+    /* input was all buffered or compressed */
+    return put;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+    gzFile file;
+    voidpc buf;
+    unsigned len;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids a flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        return 0;
+    }
+
+    /* write len bytes from buf (the return value will fit in an int) */
+    return (int)gz_write(state, buf, len);
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
+    voidpc buf;
+    z_size_t size;
+    z_size_t nitems;
+    gzFile file;
+{
+    z_size_t len;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* compute bytes to read -- error on overflow */
+    len = nitems * size;
+    if (size && len / size != nitems) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+        return 0;
+    }
+
+    /* write len bytes to buf, return the number of full items written */
+    return len ? gz_write(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned have;
+    unsigned char buf[1];
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* try writing to input buffer for speed (state->size == 0 if buffer not
+       initialized) */
+    if (state->size) {
+        if (strm->avail_in == 0)
+            strm->next_in = state->in;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
+            state->in[have] = (unsigned char)c;
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
+    }
+
+    /* no room in buffer or not initialized, use gz_write() */
+    buf[0] = (unsigned char)c;
+    if (gz_write(state, buf, 1) != 1)
+        return -1;
+    return c & 0xff;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, s)
+    gzFile file;
+    const char *s;
+{
+    z_size_t len, put;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* write string */
+    len = strlen(s);
+    if ((int)len < 0 || (unsigned)len != len) {
+        gz_error(state, Z_STREAM_ERROR, "string length does not fit in int");
+        return -1;
+    }
+    put = gz_write(state, s, len);
+    return put < len ? -1 : (int)len;
+}
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
+{
+    int len;
+    unsigned left;
+    char *next;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return state->err;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* do the printf() into the input buffer, put length in len -- the input
+       buffer is double-sized just for this function, so there is guaranteed to
+       be state->size bytes available after the current contents */
+    if (strm->avail_in == 0)
+        strm->next_in = state->in;
+    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
+    next[state->size - 1] = 0;
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+    (void)vsprintf(next, format, va);
+    for (len = 0; len < state->size; len++)
+        if (next[len] == 0) break;
+#  else
+    len = vsprintf(next, format, va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf(next, state->size, format, va);
+    len = strlen(next);
+#  else
+    len = vsnprintf(next, state->size, format, va);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, compress first half if past that */
+    strm->avail_in += (unsigned)len;
+    state->x.pos += len;
+    if (strm->avail_in >= state->size) {
+        left = strm->avail_in - state->size;
+        strm->avail_in = state->size;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return state->err;
+        memmove(state->in, state->in + state->size, left);
+        strm->next_in = state->in;
+        strm->avail_in = left;
+    }
+    return len;
+}
+
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf(file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    unsigned len, left;
+    char *next;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
+        return Z_STREAM_ERROR;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return state->error;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->error;
+    }
+
+    /* do the printf() into the input buffer, put length in len -- the input
+       buffer is double-sized just for this function, so there is guaranteed to
+       be state->size bytes available after the current contents */
+    if (strm->avail_in == 0)
+        strm->next_in = state->in;
+    next = (char *)(strm->next_in + strm->avail_in);
+    next[state->size - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+    sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
+            a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < size; len++)
+        if (next[len] == 0)
+            break;
+#  else
+    len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
+                  a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
+             a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen(next);
+#  else
+    len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                   a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len == 0 || len >= state->size || next[state->size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, compress first half if past that */
+    strm->avail_in += len;
+    state->x.pos += len;
+    if (strm->avail_in >= state->size) {
+        left = strm->avail_in - state->size;
+        strm->avail_in = state->size;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return state->err;
+        memmove(state->in, state->in + state->size, left);
+        strm->next_in = state->in;
+        strm->avail_in = left;
+    }
+    return (int)len;
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+    gzFile file;
+    int flush;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* check flush parameter */
+    if (flush < 0 || flush > Z_FINISH)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* compress remaining data with requested flush */
+    (void)gz_comp(state, flush);
+    return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* if no change is requested, then do nothing */
+    if (level == state->level && strategy == state->strategy)
+        return Z_OK;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* change compression parameters for subsequent input */
+    if (state->size) {
+        /* flush previous input with previous parameters before changing */
+        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
+            return state->err;
+        deflateParams(strm, level, strategy);
+    }
+    state->level = level;
+    state->strategy = strategy;
+    return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+    gzFile file;
+{
+    int ret = Z_OK;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing */
+    if (state->mode != GZ_WRITE)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
+    }
+
+    /* flush, free memory, and close file */
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
+    free(state);
+    return ret;
+}
diff --git a/src_bkp/engine/external/zlib/infback.c b/src_bkp/engine/external/zlib/infback.c
new file mode 100644
index 0000000000..babeaf1806
--- /dev/null
+++ b/src_bkp/engine/external/zlib/infback.c
@@ -0,0 +1,644 @@
+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = (uInt)windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->wnext = 0;
+    state->whave = 0;
+    state->sane = 1;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+                /* fallthrough */
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly */
+            ret = Z_STREAM_END;
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:
+            /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Write leftover output and return unused input */
+  inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/src_bkp/engine/external/zlib/inffast.c b/src_bkp/engine/external/zlib/inffast.c
new file mode 100644
index 0000000000..1fec7f363f
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inffast.c
@@ -0,0 +1,323 @@
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code const *here;           /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+        }
+        here = lcode + (hold & lmask);
+      dolen:
+        op = (unsigned)(here->bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here->op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here->val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+            }
+            here = dcode + (hold & dmask);
+          dodist:
+            op = (unsigned)(here->bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here->op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here->val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(*in++) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                *out++ = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            *out++ = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                *out++ = *from++;
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window;
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = window;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
+                                    *out++ = *from++;
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        len -= 3;
+                    }
+                    if (len) {
+                        *out++ = *from++;
+                        if (len > 1)
+                            *out++ = *from++;
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        *out++ = *from++;
+                        if (len > 1)
+                            *out++ = *from++;
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode + here->val + (hold & ((1U << op) - 1));
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode + here->val + (hold & ((1U << op) - 1));
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in;
+    strm->next_out = out;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/src_bkp/engine/external/zlib/inffast.h b/src_bkp/engine/external/zlib/inffast.h
new file mode 100644
index 0000000000..e5c1aa4ca8
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inffast.h
@@ -0,0 +1,11 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/src_bkp/engine/external/zlib/inffixed.h b/src_bkp/engine/external/zlib/inffixed.h
new file mode 100644
index 0000000000..d628327769
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inffixed.h
@@ -0,0 +1,94 @@
+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/src_bkp/engine/external/zlib/inflate.c b/src_bkp/engine/external/zlib/inflate.c
new file mode 100644
index 0000000000..8acbef44e9
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inflate.c
@@ -0,0 +1,1595 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local int inflateStateCheck OF((z_streamp strm));
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
+                              unsigned len));
+
+local int inflateStateCheck(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+        state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
+int ZEXPORT inflateResetKeep(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->flags = -1;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 5;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
+    state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += (unsigned)value << state->bits;
+    state->bits += (uInt)bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, end, copy)
+z_streamp strm;
+const Bytef *end;
+unsigned copy;
+{
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE_CHECK(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                if (state->wbits == 0)
+                    state->wbits = 15;
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            if (len > 15 || len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+                /* fallthrough */
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+                /* fallthrough */
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+                /* fallthrough */
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+                /* fallthrough */
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+                /* fallthrough */
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+                /* fallthrough */
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+                /* fallthrough */
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+                /* fallthrough */
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+                /* fallthrough */
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case COPY_:
+            state->mode = COPY;
+                /* fallthrough */
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+                /* fallthrough */
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+                /* fallthrough */
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case LEN_:
+            state->mode = LEN;
+                /* fallthrough */
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+                /* fallthrough */
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+                /* fallthrough */
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+                /* fallthrough */
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+                /* fallthrough */
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if ((state->wrap & 4) && out)
+                    strm->adler = state->check =
+                        UPDATE_CHECK(state->check, put - out, out);
+                out = left;
+                if ((state->wrap & 4) && (
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+                /* fallthrough */
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+                /* fallthrough */
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+                /* fallthrough */
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if ((state->wrap & 4) && out)
+        strm->adler = state->check =
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+const unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (inflateStateCheck(source) || dest == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
+    return Z_OK;
+#else
+    (void)subvert;
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+int ZEXPORT inflateValidate(strm, check)
+z_streamp strm;
+int check;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check && state->wrap)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm))
+        return -(1L << 16);
+    state = (struct inflate_state FAR *)strm->state;
+    return (long)(((unsigned long)((long)state->back)) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
+
+unsigned long ZEXPORT inflateCodesUsed(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}
diff --git a/src_bkp/engine/external/zlib/inflate.h b/src_bkp/engine/external/zlib/inflate.h
new file mode 100644
index 0000000000..f127b6b1fa
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inflate.h
@@ -0,0 +1,126 @@
+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD = 16180,   /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
+    Read deflate blocks:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+   including the allocated sliding window, which is up to 32K bytes. */
+struct inflate_state {
+    z_streamp strm;             /* pointer back to this zlib stream */
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
+                                   bit 2 true to validate check value */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags, 0 if zlib, or
+                                   -1 if raw or no header yet */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
+};
diff --git a/src_bkp/engine/external/zlib/inftrees.c b/src_bkp/engine/external/zlib/inftrees.c
new file mode 100644
index 0000000000..57d2793bec
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inftrees.c
@@ -0,0 +1,304 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code here;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    unsigned match;             /* use base and extra for symbol >= match */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        match = 20;
+        break;
+    case LENS:
+        base = lbase;
+        extra = lext;
+        match = 257;
+        break;
+    default:    /* DISTS */
+        base = dbase;
+        extra = dext;
+        match = 0;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        here.bits = (unsigned char)(len - drop);
+        if (work[sym] + 1U < match) {
+            here.op = (unsigned char)0;
+            here.val = work[sym];
+        }
+        else if (work[sym] >= match) {
+            here.op = (unsigned char)(extra[work[sym] - match]);
+            here.val = base[work[sym] - match];
+        }
+        else {
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = here;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/src_bkp/engine/external/zlib/inftrees.h b/src_bkp/engine/external/zlib/inftrees.h
new file mode 100644
index 0000000000..f53665311c
--- /dev/null
+++ b/src_bkp/engine/external/zlib/inftrees.h
@@ -0,0 +1,62 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src_bkp/engine/external/zlib/trees.c b/src_bkp/engine/external/zlib/trees.c
new file mode 100644
index 0000000000..5f305c4722
--- /dev/null
+++ b/src_bkp/engine/external/zlib/trees.c
@@ -0,0 +1,1181 @@
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2021 Jean-loup Gailly
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id$ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef ZLIB_DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local const static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local const static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local const static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned code, int len));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef ZLIB_DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* !ZLIB_DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef ZLIB_DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !ZLIB_DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = (int)value;\
+    s->bi_buf |= (ush)val << s->bi_valid;\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* ZLIB_DEBUG */
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+#endif
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length - 1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Generate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef ZLIB_DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void ZLIB_INTERNAL _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->sym_next = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n - base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
+        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Tracev((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length - 1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
+                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes(tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    unsigned code = 0;         /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree(s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n + 1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree(s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n + 1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
+    bi_windup(s);        /* align on byte boundary */
+    put_short(s, (ush)stored_len);
+    put_short(s, (ush)~stored_len);
+    if (stored_len)
+        zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    s->pending += stored_len;
+#ifdef ZLIB_DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+    s->bits_sent += 2*16;
+    s->bits_sent += stored_len << 3;
+#endif
+}
+
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ */
+void ZLIB_INTERNAL _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef ZLIB_DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and write out the encoded block.
+ */
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+        /* Check if the file is binary or text */
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
+
+        /* Construct the literal and distance trees */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->sym_next / 3));
+
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, last);
+
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
+#ifdef ZLIB_DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
+#ifdef ZLIB_DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (last) {
+        bi_windup(s);
+#ifdef ZLIB_DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int ZLIB_INTERNAL _tr_tally(s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length - MIN_MATCH or unmatched char (dist==0) */
+{
+    s->sym_buf[s->sym_next++] = (uch)dist;
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+    s->sym_buf[s->sym_next++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+    return (s->sym_next == s->sym_end);
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned sx = 0;    /* running index in sym_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->sym_next != 0) do {
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= (unsigned)base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and sym_buf is ok: */
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+
+    } while (sx < s->sym_next);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "block list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(s)
+    deflate_state *s;
+{
+    /* block_mask is the bit mask of block-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long block_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("allow-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "block-listed" or "allow-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~7;
+#endif
+}
diff --git a/src_bkp/engine/external/zlib/trees.h b/src_bkp/engine/external/zlib/trees.h
new file mode 100644
index 0000000000..d35639d82a
--- /dev/null
+++ b/src_bkp/engine/external/zlib/trees.h
@@ -0,0 +1,128 @@
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
+
diff --git a/src_bkp/engine/external/zlib/uncompr.c b/src_bkp/engine/external/zlib/uncompr.c
new file mode 100644
index 0000000000..f9532f46c1
--- /dev/null
+++ b/src_bkp/engine/external/zlib/uncompr.c
@@ -0,0 +1,93 @@
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  *sourceLen is
+   the byte length of the source buffer. Upon entry, *destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data. (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit,
+   *destLen is the size of the decompressed data and *sourceLen is the number
+   of source bytes consumed. Upon return, source + *sourceLen points to the
+   first unused input byte.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+   Z_DATA_ERROR if the input data was corrupted, including if the input data is
+   an incomplete zlib stream.
+*/
+int ZEXPORT uncompress2(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong *sourceLen;
+{
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong len, left;
+    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
+
+    len = *sourceLen;
+    if (*destLen) {
+        left = *destLen;
+        *destLen = 0;
+    }
+    else {
+        left = 1;
+        dest = buf;
+    }
+
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    stream.next_out = dest;
+    stream.avail_out = 0;
+
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = len > (uLong)max ? max : (uInt)len;
+            len -= stream.avail_in;
+        }
+        err = inflate(&stream, Z_NO_FLUSH);
+    } while (err == Z_OK);
+
+    *sourceLen -= len + stream.avail_in;
+    if (dest != buf)
+        *destLen = stream.total_out;
+    else if (stream.total_out && err == Z_BUF_ERROR)
+        left = 1;
+
+    inflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK :
+           err == Z_NEED_DICT ? Z_DATA_ERROR  :
+           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+           err;
+}
+
+int ZEXPORT uncompress(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return uncompress2(dest, destLen, source, &sourceLen);
+}
diff --git a/src_bkp/engine/external/zlib/zconf.h b/src_bkp/engine/external/zlib/zconf.h
new file mode 100644
index 0000000000..bf977d3e70
--- /dev/null
+++ b/src_bkp/engine/external/zlib/zconf.h
@@ -0,0 +1,547 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/src_bkp/engine/external/zlib/zlib.h b/src_bkp/engine/external/zlib/zlib.h
new file mode 100644
index 0000000000..953cb5012d
--- /dev/null
+++ b/src_bkp/engine/external/zlib/zlib.h
@@ -0,0 +1,1935 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.13, October 13th, 2022
+
+  Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.13"
+#define ZLIB_VERNUM 0x12d0
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 13
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in the case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    z_const Bytef *next_in;     /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total number of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte will go here */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total number of bytes output so far */
+
+    z_const char *msg;  /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use by the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field for deflate() */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Generate more output starting at next_out and update next_out and avail_out
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more output
+  in that case.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
+
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
+
+  - Generate more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  To assist in this, on return inflate() always sets strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained unless inflateGetHeader() is used.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is to be attempted.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields zalloc, zfree and opaque must be initialized before by the caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute a check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the Adler-32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor.  (The Adler-32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   Adler-32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similarly, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2().  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, and if there have been any deflate() calls since the
+   state was initialized or reset, then the input available so far is
+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+   There are three approaches for the compression levels 0, 1..3, and 4..9
+   respectively.  The new level and strategy will take effect at the next call
+   of deflate().
+
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
+
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will *not* automatically decode concatenated gzip members.
+   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
+   would need to be reset to continue decoding a subsequent gzip member.  This
+   *must* be done if there is more data after a gzip member, in order for the
+   decompression to be compliant with the gzip standard (RFC 1952).
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   can be determined from the Adler-32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similarly, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above, or -65536 if the provided
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: ZLIB_DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed data.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed data.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
+*/
+
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Open the gzip (.gz) file at path for reading and decompressing, or
+   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
+   but can also include a compression level ("wb9") or a strategy: 'f' for
+   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
+   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
+   as in "wb9F".  (See the description of deflateInit2 for more information
+   about the strategy parameter.)  'T' will request transparent writing or
+   appending with no compression and not using the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     Associate a gzFile with the file descriptor fd.  File descriptors are
+   obtained from calls like open, dup, creat, pipe or fileno (if the file has
+   been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions for file to
+   size.  The default buffer size is 8192 bytes.  This function must be called
+   after gzopen() or gzdopen(), and before any other calls that read or write
+   the file.  The buffer memory allocation is always deferred to the first read
+   or write.  Three times that size in buffer space is allocated.  A larger
+   buffer size of, for example, 64K or 128K bytes will noticeably increase the
+   speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level and strategy for file.  See the
+   description of deflateInit2 for the meaning of these parameters. Previously
+   provided data is flushed before applying the parameter changes.
+
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Read and decompress up to len uncompressed bytes from file into buf.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read and decompress up to nitems items of size size from file into buf,
+   otherwise operating as gzread() does.  This duplicates the interface of
+   stdio's fread(), with size_t request and return types.  If the library
+   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
+   is an unsigned integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevertheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, resetting and retrying on end-of-file, when size is not 1.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
+/*
+     Compress and write the len uncompressed bytes at buf to file. gzwrite
+   returns the number of uncompressed bytes written or 0 in case of error.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     Compress and write nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+     Convert, format, compress, and write the arguments (...) to file under
+   control of the string format, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf(),
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Compress and write the given null-terminated string s to file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Read and decompress bytes from file into buf, until len-1 characters are
+   read, or until a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  If any characters are read or if len
+   is one, the string is terminated with a null character.  If no characters
+   are read due to an end-of-file or len is less than one, then the buffer is
+   left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Compress and write c, converted to an unsigned char, into file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Read and decompress one byte from file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push c back onto the stream for file to be read as the first character on
+   the next read.  At least one character of push-back is always allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flush all pending output to file.  The parameter flush is as in the
+   deflate() function.  The return value is the zlib error number (see function
+   gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatenated gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Set the starting position to offset relative to whence for the next gzread
+   or gzwrite on file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewind file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Return the starting position for the next gzread or gzwrite on file.
+   This position represents a number of bytes in the uncompressed data stream,
+   and is zero when starting, even if appending or reading a gzip stream from
+   the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Return the current compressed (actual) read or write offset of file.  This
+   offset includes the count of bytes that precede the gzip stream, for example
+   when appending or when using gzdopen() for reading.  When reading, the
+   offset does not include as yet unused buffered input.  This information can
+   be used for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Return true (1) if the end-of-file indicator for file has been set while
+   reading, false (0) otherwise.  Note that the end-of-file indicator is set
+   only if the read tried to go past the end of the input, but came up short.
+   Therefore, just like feof(), gzeof() may return false even if there is no
+   more data to read, in the event that the last read request was for the exact
+   number of bytes remaining in the input file.  This will happen if the input
+   file size is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Return true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flush all pending output for file, if necessary, close file and
+   deallocate the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Return the error message for the last error which occurred on file.
+   errnum is set to zlib error number.  If an error occurred in the file system
+   and not in the compression library, errnum is set to Z_ERRNO and the
+   application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clear the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. An Adler-32 value is in the range of a 32-bit
+   unsigned integer. If buf is Z_NULL, this function returns the required
+   initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
+   If buf is Z_NULL, this function returns the required initial value for the
+   crc. Pre- and post-conditioning (one's complement) is performed within this
+   function so it shouldn't be done by the application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong crc, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t len2));
+
+     Return the operator corresponding to length len2, to be used with
+   crc32_combine_op().
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine_op OF((uLong crc1, uLong crc2, uLong op));
+/*
+     Give the same result as crc32_combine(), using op in place of len2. op is
+   is generated from len2 by crc32_combine_gen(). This will be faster than
+   crc32_combine() if the generated op is used more than once.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#    define z_crc32_combine_gen z_crc32_combine_gen64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#    define crc32_combine_gen crc32_combine_gen64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF((z_streamp));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/src_bkp/engine/external/zlib/zutil.c b/src_bkp/engine/external/zlib/zutil.c
new file mode 100644
index 0000000000..9543ae825e
--- /dev/null
+++ b/src_bkp/engine/external/zlib/zutil.c
@@ -0,0 +1,327 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2017 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
+
+z_const char * const z_errmsg[10] = {
+    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
+    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
+    (z_const char *)"",                    /* Z_OK              0  */
+    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
+    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
+    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
+    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
+    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
+    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
+    (z_const char *)""
+};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef ZLIB_DEBUG
+    flags += 1 << 8;
+#endif
+    /*
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+     */
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef ZLIB_DEBUG
+#include <stdlib.h>
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error(m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
+    /* The older Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf;
+    ulg bsize = (ulg)items*size;
+
+    (void)opaque;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
+{
+    int n;
+
+    (void)opaque;
+
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
+{
+    (void)opaque;
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
+{
+    (void)opaque;
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    (void)opaque;
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree(opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    (void)opaque;
+    free(ptr);
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/src_bkp/engine/external/zlib/zutil.h b/src_bkp/engine/external/zlib/zutil.h
new file mode 100644
index 0000000000..0bc7f4ecd1
--- /dev/null
+++ b/src_bkp/engine/external/zlib/zutil.h
@@ -0,0 +1,275 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (ULONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long
+#  elif (ULLONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long long
+#  elif (UINT_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned
+#  endif
+#endif
+
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
+#    endif
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  1
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  2
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#ifdef __370__
+#  if __TARGET_LIB__ < 0x20000000
+#    define OS_CODE 4
+#  elif __TARGET_LIB__ < 0x40000000
+#    define OS_CODE 11
+#  else
+#    define OS_CODE 8
+#  endif
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  5
+#endif
+
+#ifdef OS2
+#  define OS_CODE  6
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  7
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __acorn
+#  define OS_CODE 13
+#endif
+
+#if defined(WIN32) && !defined(__CYGWIN__)
+#  define OS_CODE  10
+#endif
+
+#ifdef _BEOS_
+#  define OS_CODE  16
+#endif
+
+#ifdef __TOS_OS400__
+#  define OS_CODE 18
+#endif
+
+#ifdef __APPLE__
+#  define OS_CODE 19
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  3     /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef ZLIB_DEBUG
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+#endif /* ZUTIL_H */
diff --git a/src_bkp/engine/favorites.h b/src_bkp/engine/favorites.h
new file mode 100644
index 0000000000..4515bd9a8b
--- /dev/null
+++ b/src_bkp/engine/favorites.h
@@ -0,0 +1,45 @@
+#ifndef ENGINE_FAVORITES_H
+#define ENGINE_FAVORITES_H
+
+#include <memory>
+
+#include <base/types.h>
+#include <engine/shared/protocol.h>
+
+#include "kernel.h"
+
+class IConfigManager;
+
+class IFavorites : public IInterface
+{
+	MACRO_INTERFACE("favorites")
+
+protected:
+	virtual void OnConfigSave(IConfigManager *pConfigManager) = 0;
+
+public:
+	class CEntry
+	{
+	public:
+		int m_NumAddrs;
+		NETADDR m_aAddrs[MAX_SERVER_ADDRESSES];
+		bool m_AllowPing;
+	};
+
+	virtual ~IFavorites() {}
+
+	virtual TRISTATE IsFavorite(const NETADDR *pAddrs, int NumAddrs) const = 0;
+	// Only considers the addresses that are actually favorites.
+	virtual TRISTATE IsPingAllowed(const NETADDR *pAddrs, int NumAddrs) const = 0;
+	virtual void Add(const NETADDR *pAddrs, int NumAddrs) = 0;
+	// Only considers the addresses that are actually favorites.
+	virtual void AllowPing(const NETADDR *pAddrs, int NumAddrs, bool AllowPing) = 0;
+	virtual void Remove(const NETADDR *pAddrs, int NumAddrs) = 0;
+	virtual void AllEntries(const CEntry **ppEntries, int *pNumEntries) = 0;
+
+	// Pass the `IFavorites` instance as callback.
+	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
+};
+
+std::unique_ptr<IFavorites> CreateFavorites();
+#endif // ENGINE_FAVORITES_H
diff --git a/src_bkp/engine/friends.h b/src_bkp/engine/friends.h
new file mode 100644
index 0000000000..17a8bdbca8
--- /dev/null
+++ b/src_bkp/engine/friends.h
@@ -0,0 +1,42 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_FRIENDS_H
+#define ENGINE_FRIENDS_H
+
+#include <engine/shared/protocol.h>
+
+#include "kernel.h"
+
+struct CFriendInfo
+{
+	char m_aName[MAX_NAME_LENGTH];
+	char m_aClan[MAX_CLAN_LENGTH];
+	unsigned m_NameHash;
+	unsigned m_ClanHash;
+};
+
+class IFriends : public IInterface
+{
+	MACRO_INTERFACE("friends")
+public:
+	enum
+	{
+		FRIEND_NO = 0,
+		FRIEND_CLAN,
+		FRIEND_PLAYER,
+
+		MAX_FRIENDS = 4096,
+	};
+
+	virtual void Init(bool Foes = false) = 0;
+
+	virtual int NumFriends() const = 0;
+	virtual const CFriendInfo *GetFriend(int Index) const = 0;
+	virtual int GetFriendState(const char *pName, const char *pClan) const = 0;
+	virtual bool IsFriend(const char *pName, const char *pClan, bool PlayersOnly) const = 0;
+
+	virtual void AddFriend(const char *pName, const char *pClan) = 0;
+	virtual void RemoveFriend(const char *pName, const char *pClan) = 0;
+};
+
+#endif
diff --git a/src_bkp/engine/gfx/image_loader.cpp b/src_bkp/engine/gfx/image_loader.cpp
new file mode 100644
index 0000000000..eefb597cdb
--- /dev/null
+++ b/src_bkp/engine/gfx/image_loader.cpp
@@ -0,0 +1,360 @@
+#include "image_loader.h"
+#include <base/log.h>
+#include <base/system.h>
+#include <csetjmp>
+#include <cstdlib>
+
+#include <png.h>
+
+struct SLibPNGWarningItem
+{
+	SImageByteBuffer *m_pByteLoader;
+	const char *m_pFileName;
+	std::jmp_buf m_Buf;
+};
+
+[[noreturn]] static void LibPNGError(png_structp png_ptr, png_const_charp error_msg)
+{
+	SLibPNGWarningItem *pUserStruct = (SLibPNGWarningItem *)png_get_error_ptr(png_ptr);
+	pUserStruct->m_pByteLoader->m_Err = -1;
+	dbg_msg("png", "error for file \"%s\": %s", pUserStruct->m_pFileName, error_msg);
+	std::longjmp(pUserStruct->m_Buf, 1);
+}
+
+static void LibPNGWarning(png_structp png_ptr, png_const_charp warning_msg)
+{
+	SLibPNGWarningItem *pUserStruct = (SLibPNGWarningItem *)png_get_error_ptr(png_ptr);
+	dbg_msg("png", "warning for file \"%s\": %s", pUserStruct->m_pFileName, warning_msg);
+}
+
+static bool FileMatchesImageType(SImageByteBuffer &ByteLoader)
+{
+	if(ByteLoader.m_pvLoadedImageBytes->size() >= 8)
+		return png_sig_cmp((png_bytep)ByteLoader.m_pvLoadedImageBytes->data(), 0, 8) == 0;
+	return false;
+}
+
+static void ReadDataFromLoadedBytes(png_structp pPNGStruct, png_bytep pOutBytes, png_size_t ByteCountToRead)
+{
+	png_voidp pIO_Ptr = png_get_io_ptr(pPNGStruct);
+
+	SImageByteBuffer *pByteLoader = (SImageByteBuffer *)pIO_Ptr;
+
+	if(pByteLoader->m_pvLoadedImageBytes->size() >= pByteLoader->m_LoadOffset + (size_t)ByteCountToRead)
+	{
+		mem_copy(pOutBytes, &(*pByteLoader->m_pvLoadedImageBytes)[pByteLoader->m_LoadOffset], (size_t)ByteCountToRead);
+
+		pByteLoader->m_LoadOffset += (size_t)ByteCountToRead;
+	}
+	else
+	{
+		pByteLoader->m_Err = -1;
+		dbg_msg("png", "could not read bytes, file was too small.");
+	}
+}
+
+static EImageFormat LibPNGGetImageFormat(int ColorChannelCount)
+{
+	switch(ColorChannelCount)
+	{
+	case 1:
+		return IMAGE_FORMAT_R;
+	case 2:
+		return IMAGE_FORMAT_RA;
+	case 3:
+		return IMAGE_FORMAT_RGB;
+	case 4:
+		return IMAGE_FORMAT_RGBA;
+	default:
+		dbg_assert(false, "ColorChannelCount invalid");
+		dbg_break();
+	}
+}
+
+static void LibPNGDeleteReadStruct(png_structp pPNGStruct, png_infop pPNGInfo)
+{
+	if(pPNGInfo != nullptr)
+		png_destroy_info_struct(pPNGStruct, &pPNGInfo);
+	png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
+}
+
+static int PngliteIncompatibility(png_structp pPNGStruct, png_infop pPNGInfo)
+{
+	int ColorType = png_get_color_type(pPNGStruct, pPNGInfo);
+	int BitDepth = png_get_bit_depth(pPNGStruct, pPNGInfo);
+	int InterlaceType = png_get_interlace_type(pPNGStruct, pPNGInfo);
+	int Result = 0;
+	switch(ColorType)
+	{
+	case PNG_COLOR_TYPE_GRAY:
+	case PNG_COLOR_TYPE_RGB:
+	case PNG_COLOR_TYPE_RGB_ALPHA:
+	case PNG_COLOR_TYPE_GRAY_ALPHA:
+		break;
+	default:
+		log_debug("png", "color type %d unsupported by pnglite", ColorType);
+		Result |= PNGLITE_COLOR_TYPE;
+	}
+
+	switch(BitDepth)
+	{
+	case 8:
+	case 16:
+		break;
+	default:
+		log_debug("png", "bit depth %d unsupported by pnglite", BitDepth);
+		Result |= PNGLITE_BIT_DEPTH;
+	}
+
+	if(InterlaceType != PNG_INTERLACE_NONE)
+	{
+		log_debug("png", "interlace type %d unsupported by pnglite", InterlaceType);
+		Result |= PNGLITE_INTERLACE_TYPE;
+	}
+	if(png_get_compression_type(pPNGStruct, pPNGInfo) != PNG_COMPRESSION_TYPE_BASE)
+	{
+		log_debug("png", "non-default compression type unsupported by pnglite");
+		Result |= PNGLITE_COMPRESSION_TYPE;
+	}
+	if(png_get_filter_type(pPNGStruct, pPNGInfo) != PNG_FILTER_TYPE_BASE)
+	{
+		log_debug("png", "non-default filter type unsupported by pnglite");
+		Result |= PNGLITE_FILTER_TYPE;
+	}
+	return Result;
+}
+
+bool LoadPNG(SImageByteBuffer &ByteLoader, const char *pFileName, int &PngliteIncompatible, int &Width, int &Height, uint8_t *&pImageBuff, EImageFormat &ImageFormat)
+{
+	SLibPNGWarningItem UserErrorStruct = {&ByteLoader, pFileName, {}};
+
+	png_structp pPNGStruct = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+
+	if(pPNGStruct == nullptr)
+	{
+		dbg_msg("png", "libpng internal failure: png_create_read_struct failed.");
+		return false;
+	}
+
+	png_infop pPNGInfo = nullptr;
+	png_bytepp pRowPointers = nullptr;
+	Height = 0; // ensure this is not undefined for the error handler
+	if(setjmp(UserErrorStruct.m_Buf))
+	{
+		if(pRowPointers != nullptr)
+		{
+			for(int i = 0; i < Height; ++i)
+			{
+				delete[] pRowPointers[i];
+			}
+		}
+		delete[] pRowPointers;
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		return false;
+	}
+	png_set_error_fn(pPNGStruct, &UserErrorStruct, LibPNGError, LibPNGWarning);
+
+	pPNGInfo = png_create_info_struct(pPNGStruct);
+
+	if(pPNGInfo == nullptr)
+	{
+		png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
+		dbg_msg("png", "libpng internal failure: png_create_info_struct failed.");
+		return false;
+	}
+
+	if(!FileMatchesImageType(ByteLoader))
+	{
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		dbg_msg("png", "file does not match image type.");
+		return false;
+	}
+
+	ByteLoader.m_LoadOffset = 8;
+
+	png_set_read_fn(pPNGStruct, (png_bytep)&ByteLoader, ReadDataFromLoadedBytes);
+
+	png_set_sig_bytes(pPNGStruct, 8);
+
+	png_read_info(pPNGStruct, pPNGInfo);
+
+	if(ByteLoader.m_Err != 0)
+	{
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		dbg_msg("png", "byte loader error.");
+		return false;
+	}
+
+	Width = png_get_image_width(pPNGStruct, pPNGInfo);
+	Height = png_get_image_height(pPNGStruct, pPNGInfo);
+	const int ColorType = png_get_color_type(pPNGStruct, pPNGInfo);
+	const png_byte BitDepth = png_get_bit_depth(pPNGStruct, pPNGInfo);
+	PngliteIncompatible = PngliteIncompatibility(pPNGStruct, pPNGInfo);
+
+	if(BitDepth == 16)
+	{
+		png_set_strip_16(pPNGStruct);
+	}
+	else if(BitDepth > 8)
+	{
+		dbg_msg("png", "non supported bit depth.");
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		return false;
+	}
+
+	if(Width == 0 || Height == 0 || BitDepth == 0)
+	{
+		dbg_msg("png", "image had width, height or bit depth of 0.");
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		return false;
+	}
+
+	if(ColorType == PNG_COLOR_TYPE_PALETTE)
+		png_set_palette_to_rgb(pPNGStruct);
+
+	if(ColorType == PNG_COLOR_TYPE_GRAY && BitDepth < 8)
+		png_set_expand_gray_1_2_4_to_8(pPNGStruct);
+
+	if(png_get_valid(pPNGStruct, pPNGInfo, PNG_INFO_tRNS))
+		png_set_tRNS_to_alpha(pPNGStruct);
+
+	png_read_update_info(pPNGStruct, pPNGInfo);
+
+	const int ColorChannelCount = png_get_channels(pPNGStruct, pPNGInfo);
+	const int BytesInRow = png_get_rowbytes(pPNGStruct, pPNGInfo);
+	dbg_assert(BytesInRow == Width * ColorChannelCount, "bytes in row incorrect.");
+
+	pRowPointers = new png_bytep[Height];
+	for(int y = 0; y < Height; ++y)
+	{
+		pRowPointers[y] = new png_byte[BytesInRow];
+	}
+
+	png_read_image(pPNGStruct, pRowPointers);
+
+	if(ByteLoader.m_Err == 0)
+		pImageBuff = (uint8_t *)malloc((size_t)Height * (size_t)Width * (size_t)ColorChannelCount * sizeof(uint8_t));
+
+	for(int i = 0; i < Height; ++i)
+	{
+		if(ByteLoader.m_Err == 0)
+			mem_copy(&pImageBuff[i * BytesInRow], pRowPointers[i], BytesInRow);
+		delete[] pRowPointers[i];
+	}
+	delete[] pRowPointers;
+	pRowPointers = nullptr;
+
+	if(ByteLoader.m_Err != 0)
+	{
+		LibPNGDeleteReadStruct(pPNGStruct, pPNGInfo);
+		dbg_msg("png", "byte loader error.");
+		return false;
+	}
+
+	ImageFormat = LibPNGGetImageFormat(ColorChannelCount);
+
+	png_destroy_info_struct(pPNGStruct, &pPNGInfo);
+	png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
+
+	return true;
+}
+
+static void WriteDataFromLoadedBytes(png_structp pPNGStruct, png_bytep pOutBytes, png_size_t ByteCountToWrite)
+{
+	if(ByteCountToWrite > 0)
+	{
+		png_voidp pIO_Ptr = png_get_io_ptr(pPNGStruct);
+
+		SImageByteBuffer *pByteLoader = (SImageByteBuffer *)pIO_Ptr;
+
+		size_t NewSize = pByteLoader->m_LoadOffset + (size_t)ByteCountToWrite;
+		pByteLoader->m_pvLoadedImageBytes->resize(NewSize);
+
+		mem_copy(&(*pByteLoader->m_pvLoadedImageBytes)[pByteLoader->m_LoadOffset], pOutBytes, (size_t)ByteCountToWrite);
+		pByteLoader->m_LoadOffset = NewSize;
+	}
+}
+
+static void FlushPNGWrite(png_structp png_ptr) {}
+
+static int ImageLoaderHelperFormatToColorChannel(EImageFormat Format)
+{
+	switch(Format)
+	{
+	case IMAGE_FORMAT_R:
+		return 1;
+	case IMAGE_FORMAT_RA:
+		return 2;
+	case IMAGE_FORMAT_RGB:
+		return 3;
+	case IMAGE_FORMAT_RGBA:
+		return 4;
+	default:
+		dbg_assert(false, "Format invalid");
+		dbg_break();
+	}
+}
+
+bool SavePNG(EImageFormat ImageFormat, const uint8_t *pRawBuffer, SImageByteBuffer &WrittenBytes, int Width, int Height)
+{
+	png_structp pPNGStruct = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+
+	if(pPNGStruct == nullptr)
+	{
+		dbg_msg("png", "libpng internal failure: png_create_write_struct failed.");
+		return false;
+	}
+
+	png_infop pPNGInfo = png_create_info_struct(pPNGStruct);
+
+	if(pPNGInfo == nullptr)
+	{
+		png_destroy_read_struct(&pPNGStruct, nullptr, nullptr);
+		dbg_msg("png", "libpng internal failure: png_create_info_struct failed.");
+		return false;
+	}
+
+	WrittenBytes.m_LoadOffset = 0;
+	WrittenBytes.m_pvLoadedImageBytes->clear();
+
+	png_set_write_fn(pPNGStruct, (png_bytep)&WrittenBytes, WriteDataFromLoadedBytes, FlushPNGWrite);
+
+	int ColorType = PNG_COLOR_TYPE_RGB;
+	int WriteBytesPerPixel = ImageLoaderHelperFormatToColorChannel(ImageFormat);
+	if(ImageFormat == IMAGE_FORMAT_R)
+	{
+		ColorType = PNG_COLOR_TYPE_GRAY;
+	}
+	else if(ImageFormat == IMAGE_FORMAT_RGBA)
+	{
+		ColorType = PNG_COLOR_TYPE_RGBA;
+	}
+
+	png_set_IHDR(pPNGStruct, pPNGInfo, Width, Height, 8, ColorType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+	png_write_info(pPNGStruct, pPNGInfo);
+
+	png_bytepp pRowPointers = new png_bytep[Height];
+	int WidthBytes = Width * WriteBytesPerPixel;
+	ptrdiff_t BufferOffset = 0;
+	for(int y = 0; y < Height; ++y)
+	{
+		pRowPointers[y] = new png_byte[WidthBytes];
+		mem_copy(pRowPointers[y], pRawBuffer + BufferOffset, WidthBytes);
+		BufferOffset += (ptrdiff_t)WidthBytes;
+	}
+	png_write_image(pPNGStruct, pRowPointers);
+
+	png_write_end(pPNGStruct, pPNGInfo);
+
+	for(int y = 0; y < Height; ++y)
+	{
+		delete[](pRowPointers[y]);
+	}
+	delete[](pRowPointers);
+
+	png_destroy_info_struct(pPNGStruct, &pPNGInfo);
+	png_destroy_write_struct(&pPNGStruct, nullptr);
+
+	return true;
+}
diff --git a/src_bkp/engine/gfx/image_loader.h b/src_bkp/engine/gfx/image_loader.h
new file mode 100644
index 0000000000..0da2474a0f
--- /dev/null
+++ b/src_bkp/engine/gfx/image_loader.h
@@ -0,0 +1,38 @@
+#ifndef ENGINE_GFX_IMAGE_LOADER_H
+#define ENGINE_GFX_IMAGE_LOADER_H
+
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+
+enum EImageFormat
+{
+	IMAGE_FORMAT_R = 0,
+	IMAGE_FORMAT_RA,
+	IMAGE_FORMAT_RGB,
+	IMAGE_FORMAT_RGBA,
+};
+
+typedef std::vector<uint8_t> TImageByteBuffer;
+struct SImageByteBuffer
+{
+	SImageByteBuffer(std::vector<uint8_t> *pvBuff) :
+		m_LoadOffset(0), m_pvLoadedImageBytes(pvBuff), m_Err(0) {}
+	size_t m_LoadOffset;
+	std::vector<uint8_t> *m_pvLoadedImageBytes;
+	int m_Err;
+};
+
+enum
+{
+	PNGLITE_COLOR_TYPE = 1 << 0,
+	PNGLITE_BIT_DEPTH = 1 << 1,
+	PNGLITE_INTERLACE_TYPE = 1 << 2,
+	PNGLITE_COMPRESSION_TYPE = 1 << 3,
+	PNGLITE_FILTER_TYPE = 1 << 4,
+};
+
+bool LoadPNG(SImageByteBuffer &ByteLoader, const char *pFileName, int &PngliteIncompatible, int &Width, int &Height, uint8_t *&pImageBuff, EImageFormat &ImageFormat);
+bool SavePNG(EImageFormat ImageFormat, const uint8_t *pRawBuffer, SImageByteBuffer &WrittenBytes, int Width, int Height);
+
+#endif // ENGINE_GFX_IMAGE_LOADER_H
diff --git a/src_bkp/engine/gfx/image_manipulation.cpp b/src_bkp/engine/gfx/image_manipulation.cpp
new file mode 100644
index 0000000000..992ab7311a
--- /dev/null
+++ b/src_bkp/engine/gfx/image_manipulation.cpp
@@ -0,0 +1,246 @@
+#include "image_manipulation.h"
+#include <base/math.h>
+#include <base/system.h>
+
+#define TW_DILATE_ALPHA_THRESHOLD 10
+
+static void Dilate(int w, int h, const unsigned char *pSrc, unsigned char *pDest, unsigned char AlphaThreshold = TW_DILATE_ALPHA_THRESHOLD)
+{
+	const int BPP = 4; // RGBA assumed
+	int ix, iy;
+	const int aDirX[] = {0, -1, 1, 0};
+	const int aDirY[] = {-1, 0, 0, 1};
+
+	int AlphaCompIndex = BPP - 1;
+
+	int m = 0;
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++, m += BPP)
+		{
+			for(int i = 0; i < BPP; ++i)
+				pDest[m + i] = pSrc[m + i];
+			if(pSrc[m + AlphaCompIndex] > AlphaThreshold)
+				continue;
+
+			int aSumOfOpaque[] = {0, 0, 0};
+			int Counter = 0;
+			for(int c = 0; c < 4; c++)
+			{
+				ix = clamp(x + aDirX[c], 0, w - 1);
+				iy = clamp(y + aDirY[c], 0, h - 1);
+				int k = iy * w * BPP + ix * BPP;
+				if(pSrc[k + AlphaCompIndex] > AlphaThreshold)
+				{
+					for(int p = 0; p < BPP - 1; ++p)
+						aSumOfOpaque[p] += pSrc[k + p];
+					++Counter;
+					break;
+				}
+			}
+
+			if(Counter > 0)
+			{
+				for(int i = 0; i < BPP - 1; ++i)
+				{
+					aSumOfOpaque[i] /= Counter;
+					pDest[m + i] = (unsigned char)aSumOfOpaque[i];
+				}
+
+				pDest[m + AlphaCompIndex] = 255;
+			}
+		}
+	}
+}
+
+static void CopyColorValues(int w, int h, int BPP, const unsigned char *pSrc, unsigned char *pDest)
+{
+	int m = 0;
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++, m += BPP)
+		{
+			for(int i = 0; i < BPP - 1; ++i)
+			{
+				if(pDest[m + 3] == 0)
+					pDest[m + i] = pSrc[m + i];
+			}
+		}
+	}
+}
+
+void DilateImage(unsigned char *pImageBuff, int w, int h)
+{
+	DilateImageSub(pImageBuff, w, h, 0, 0, w, h);
+}
+
+void DilateImageSub(unsigned char *pImageBuff, int w, int h, int x, int y, int sw, int sh)
+{
+	const int BPP = 4; // RGBA assumed
+	unsigned char *apBuffer[2] = {NULL, NULL};
+
+	apBuffer[0] = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
+	apBuffer[1] = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
+	unsigned char *pBufferOriginal = (unsigned char *)malloc((size_t)sw * sh * sizeof(unsigned char) * BPP);
+
+	unsigned char *pPixelBuff = (unsigned char *)pImageBuff;
+
+	for(int Y = 0; Y < sh; ++Y)
+	{
+		int SrcImgOffset = ((y + Y) * w * BPP) + (x * BPP);
+		int DstImgOffset = (Y * sw * BPP);
+		int CopySize = sw * BPP;
+		mem_copy(&pBufferOriginal[DstImgOffset], &pPixelBuff[SrcImgOffset], CopySize);
+	}
+
+	Dilate(sw, sh, pBufferOriginal, apBuffer[0]);
+
+	for(int i = 0; i < 5; i++)
+	{
+		Dilate(sw, sh, apBuffer[0], apBuffer[1]);
+		Dilate(sw, sh, apBuffer[1], apBuffer[0]);
+	}
+
+	CopyColorValues(sw, sh, BPP, apBuffer[0], pBufferOriginal);
+
+	free(apBuffer[0]);
+	free(apBuffer[1]);
+
+	for(int Y = 0; Y < sh; ++Y)
+	{
+		int SrcImgOffset = ((y + Y) * w * BPP) + (x * BPP);
+		int DstImgOffset = (Y * sw * BPP);
+		int CopySize = sw * BPP;
+		mem_copy(&pPixelBuff[SrcImgOffset], &pBufferOriginal[DstImgOffset], CopySize);
+	}
+
+	free(pBufferOriginal);
+}
+
+static float CubicHermite(float A, float B, float C, float D, float t)
+{
+	float a = -A / 2.0f + (3.0f * B) / 2.0f - (3.0f * C) / 2.0f + D / 2.0f;
+	float b = A - (5.0f * B) / 2.0f + 2.0f * C - D / 2.0f;
+	float c = -A / 2.0f + C / 2.0f;
+	float d = B;
+
+	return (a * t * t * t) + (b * t * t) + (c * t) + d;
+}
+
+static void GetPixelClamped(const uint8_t *pSourceImage, int x, int y, uint32_t W, uint32_t H, size_t BPP, uint8_t aTmp[])
+{
+	x = clamp<int>(x, 0, (int)W - 1);
+	y = clamp<int>(y, 0, (int)H - 1);
+
+	for(size_t i = 0; i < BPP; i++)
+	{
+		aTmp[i] = pSourceImage[x * BPP + (W * BPP * y) + i];
+	}
+}
+
+static void SampleBicubic(const uint8_t *pSourceImage, float u, float v, uint32_t W, uint32_t H, size_t BPP, uint8_t aSample[])
+{
+	float X = (u * W) - 0.5f;
+	int xInt = (int)X;
+	float xFract = X - std::floor(X);
+
+	float Y = (v * H) - 0.5f;
+	int yInt = (int)Y;
+	float yFract = Y - std::floor(Y);
+
+	uint8_t aPX00[4];
+	uint8_t aPX10[4];
+	uint8_t aPX20[4];
+	uint8_t aPX30[4];
+
+	uint8_t aPX01[4];
+	uint8_t aPX11[4];
+	uint8_t aPX21[4];
+	uint8_t aPX31[4];
+
+	uint8_t aPX02[4];
+	uint8_t aPX12[4];
+	uint8_t aPX22[4];
+	uint8_t aPX32[4];
+
+	uint8_t aPX03[4];
+	uint8_t aPX13[4];
+	uint8_t aPX23[4];
+	uint8_t aPX33[4];
+
+	GetPixelClamped(pSourceImage, xInt - 1, yInt - 1, W, H, BPP, aPX00);
+	GetPixelClamped(pSourceImage, xInt + 0, yInt - 1, W, H, BPP, aPX10);
+	GetPixelClamped(pSourceImage, xInt + 1, yInt - 1, W, H, BPP, aPX20);
+	GetPixelClamped(pSourceImage, xInt + 2, yInt - 1, W, H, BPP, aPX30);
+
+	GetPixelClamped(pSourceImage, xInt - 1, yInt + 0, W, H, BPP, aPX01);
+	GetPixelClamped(pSourceImage, xInt + 0, yInt + 0, W, H, BPP, aPX11);
+	GetPixelClamped(pSourceImage, xInt + 1, yInt + 0, W, H, BPP, aPX21);
+	GetPixelClamped(pSourceImage, xInt + 2, yInt + 0, W, H, BPP, aPX31);
+
+	GetPixelClamped(pSourceImage, xInt - 1, yInt + 1, W, H, BPP, aPX02);
+	GetPixelClamped(pSourceImage, xInt + 0, yInt + 1, W, H, BPP, aPX12);
+	GetPixelClamped(pSourceImage, xInt + 1, yInt + 1, W, H, BPP, aPX22);
+	GetPixelClamped(pSourceImage, xInt + 2, yInt + 1, W, H, BPP, aPX32);
+
+	GetPixelClamped(pSourceImage, xInt - 1, yInt + 2, W, H, BPP, aPX03);
+	GetPixelClamped(pSourceImage, xInt + 0, yInt + 2, W, H, BPP, aPX13);
+	GetPixelClamped(pSourceImage, xInt + 1, yInt + 2, W, H, BPP, aPX23);
+	GetPixelClamped(pSourceImage, xInt + 2, yInt + 2, W, H, BPP, aPX33);
+
+	for(size_t i = 0; i < BPP; i++)
+	{
+		float Clmn0 = CubicHermite(aPX00[i], aPX10[i], aPX20[i], aPX30[i], xFract);
+		float Clmn1 = CubicHermite(aPX01[i], aPX11[i], aPX21[i], aPX31[i], xFract);
+		float Clmn2 = CubicHermite(aPX02[i], aPX12[i], aPX22[i], aPX32[i], xFract);
+		float Clmn3 = CubicHermite(aPX03[i], aPX13[i], aPX23[i], aPX33[i], xFract);
+
+		float Valuef = CubicHermite(Clmn0, Clmn1, Clmn2, Clmn3, yFract);
+
+		Valuef = clamp<float>(Valuef, 0.0f, 255.0f);
+
+		aSample[i] = (uint8_t)Valuef;
+	}
+}
+
+static void ResizeImage(const uint8_t *pSourceImage, uint32_t SW, uint32_t SH, uint8_t *pDestinationImage, uint32_t W, uint32_t H, size_t BPP)
+{
+	uint8_t aSample[4];
+	int y, x;
+
+	for(y = 0; y < (int)H; ++y)
+	{
+		float v = (float)y / (float)(H - 1);
+
+		for(x = 0; x < (int)W; ++x)
+		{
+			float u = (float)x / (float)(W - 1);
+			SampleBicubic(pSourceImage, u, v, SW, SH, BPP, aSample);
+
+			for(size_t i = 0; i < BPP; ++i)
+			{
+				pDestinationImage[x * BPP + ((W * BPP) * y) + i] = aSample[i];
+			}
+		}
+	}
+}
+
+uint8_t *ResizeImage(const uint8_t *pImageData, int Width, int Height, int NewWidth, int NewHeight, int BPP)
+{
+	uint8_t *pTmpData = (uint8_t *)malloc((size_t)NewWidth * NewHeight * BPP);
+	ResizeImage(pImageData, Width, Height, pTmpData, NewWidth, NewHeight, BPP);
+	return pTmpData;
+}
+
+int HighestBit(int OfVar)
+{
+	if(!OfVar)
+		return 0;
+
+	int RetV = 1;
+
+	while(OfVar >>= 1)
+		RetV <<= 1;
+
+	return RetV;
+}
diff --git a/src_bkp/engine/gfx/image_manipulation.h b/src_bkp/engine/gfx/image_manipulation.h
new file mode 100644
index 0000000000..58a1335402
--- /dev/null
+++ b/src_bkp/engine/gfx/image_manipulation.h
@@ -0,0 +1,15 @@
+#ifndef ENGINE_GFX_IMAGE_MANIPULATION_H
+#define ENGINE_GFX_IMAGE_MANIPULATION_H
+
+#include <cstdint>
+
+// These functions assume that the image data is 4 bytes per pixel RGBA
+void DilateImage(unsigned char *pImageBuff, int w, int h);
+void DilateImageSub(unsigned char *pImageBuff, int w, int h, int x, int y, int sw, int sh);
+
+// returned pointer is allocated with malloc
+uint8_t *ResizeImage(const uint8_t *pImageData, int Width, int Height, int NewWidth, int NewHeight, int BPP);
+
+int HighestBit(int OfVar);
+
+#endif // ENGINE_GFX_IMAGE_MANIPULATION_H
diff --git a/src_bkp/engine/ghost.h b/src_bkp/engine/ghost.h
new file mode 100644
index 0000000000..581374878b
--- /dev/null
+++ b/src_bkp/engine/ghost.h
@@ -0,0 +1,48 @@
+#ifndef ENGINE_GHOST_H
+#define ENGINE_GHOST_H
+
+#include <base/hash.h>
+#include <engine/shared/protocol.h>
+
+#include "kernel.h"
+
+class CGhostInfo
+{
+public:
+	char m_aOwner[MAX_NAME_LENGTH];
+	char m_aMap[64];
+	int m_NumTicks;
+	int m_Time;
+};
+
+class IGhostRecorder : public IInterface
+{
+	MACRO_INTERFACE("ghostrecorder")
+public:
+	virtual ~IGhostRecorder() {}
+
+	virtual int Start(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, const char *pName) = 0;
+	virtual int Stop(int Ticks, int Time) = 0;
+
+	virtual void WriteData(int Type, const void *pData, int Size) = 0;
+	virtual bool IsRecording() const = 0;
+};
+
+class IGhostLoader : public IInterface
+{
+	MACRO_INTERFACE("ghostloader")
+public:
+	virtual ~IGhostLoader() {}
+
+	virtual int Load(const char *pFilename, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc) = 0;
+	virtual void Close() = 0;
+
+	virtual const CGhostInfo *GetInfo() const = 0;
+
+	virtual bool ReadNextType(int *pType) = 0;
+	virtual bool ReadData(int Type, void *pData, int Size) = 0;
+
+	virtual bool GetGhostInfo(const char *pFilename, CGhostInfo *pInfo, const char *pMap, SHA256_DIGEST MapSha256, unsigned MapCrc) = 0;
+};
+
+#endif
diff --git a/src_bkp/engine/graphics.h b/src_bkp/engine/graphics.h
new file mode 100644
index 0000000000..951748b117
--- /dev/null
+++ b/src_bkp/engine/graphics.h
@@ -0,0 +1,565 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_GRAPHICS_H
+#define ENGINE_GRAPHICS_H
+
+#include "kernel.h"
+#include "warning.h"
+
+#include <base/color.h>
+#include <base/system.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <vector>
+
+#define GRAPHICS_TYPE_UNSIGNED_BYTE 0x1401
+#define GRAPHICS_TYPE_UNSIGNED_SHORT 0x1403
+#define GRAPHICS_TYPE_INT 0x1404
+#define GRAPHICS_TYPE_UNSIGNED_INT 0x1405
+#define GRAPHICS_TYPE_FLOAT 0x1406
+
+struct SBufferContainerInfo
+{
+	int m_Stride;
+	int m_VertBufferBindingIndex;
+
+	// the attributes of the container
+	struct SAttribute
+	{
+		int m_DataTypeCount;
+		unsigned int m_Type;
+		bool m_Normalized;
+		void *m_pOffset;
+
+		//0: float, 1:integer
+		unsigned int m_FuncType;
+	};
+	std::vector<SAttribute> m_vAttributes;
+};
+
+struct SQuadRenderInfo
+{
+	ColorRGBA m_Color;
+	vec2 m_Offsets;
+	float m_Rotation;
+	// allows easier upload for uniform buffers because of the alignment requirements
+	float m_Padding;
+};
+
+struct SGraphicTile
+{
+	vec2 m_TopLeft;
+	vec2 m_TopRight;
+	vec2 m_BottomRight;
+	vec2 m_BottomLeft;
+};
+
+struct SGraphicTileTexureCoords
+{
+	ubvec4 m_TexCoordTopLeft;
+	ubvec4 m_TexCoordTopRight;
+	ubvec4 m_TexCoordBottomRight;
+	ubvec4 m_TexCoordBottomLeft;
+};
+
+class CImageInfo
+{
+public:
+	enum EImageFormat
+	{
+		FORMAT_ERROR = -1,
+		FORMAT_RGB = 0,
+		FORMAT_RGBA = 1,
+		FORMAT_SINGLE_COMPONENT = 2,
+	};
+
+	/**
+	 * Contains the width of the image
+	 */
+	int m_Width = 0;
+
+	/**
+	 * Contains the height of the image
+	 */
+	int m_Height = 0;
+
+	/**
+	 * Contains the format of the image.
+	 *
+	 * @see EImageFormat
+	 */
+	EImageFormat m_Format = FORMAT_ERROR;
+
+	/**
+	 * Pointer to the image data.
+	 */
+	void *m_pData = nullptr;
+
+	static size_t PixelSize(EImageFormat Format)
+	{
+		dbg_assert(Format != FORMAT_ERROR, "Format invalid");
+		static const size_t s_aSizes[] = {3, 4, 1};
+		return s_aSizes[(int)Format];
+	}
+
+	size_t PixelSize() const
+	{
+		return PixelSize(m_Format);
+	}
+
+	static EImageFormat ImageFormatFromInt(int Format)
+	{
+		if(Format < (int)FORMAT_RGB || Format > (int)FORMAT_SINGLE_COMPONENT)
+			return FORMAT_ERROR;
+		return (EImageFormat)Format;
+	}
+};
+
+/*
+	Structure: CVideoMode
+*/
+class CVideoMode
+{
+public:
+	int m_CanvasWidth, m_CanvasHeight;
+	int m_WindowWidth, m_WindowHeight;
+	int m_RefreshRate;
+	int m_Red, m_Green, m_Blue;
+	uint32_t m_Format;
+};
+
+typedef vec2 GL_SPoint;
+typedef vec2 GL_STexCoord;
+
+struct GL_STexCoord3D
+{
+	GL_STexCoord3D &operator=(const GL_STexCoord &TexCoord)
+	{
+		u = TexCoord.u;
+		v = TexCoord.v;
+		return *this;
+	}
+
+	GL_STexCoord3D &operator=(const vec3 &TexCoord)
+	{
+		u = TexCoord.u;
+		v = TexCoord.v;
+		w = TexCoord.w;
+		return *this;
+	}
+
+	float u, v, w;
+};
+
+typedef ColorRGBA GL_SColorf;
+//use normalized color values
+typedef vector4_base<unsigned char> GL_SColor;
+
+struct GL_SVertex
+{
+	GL_SPoint m_Pos;
+	GL_STexCoord m_Tex;
+	GL_SColor m_Color;
+};
+
+struct GL_SVertexTex3D
+{
+	GL_SPoint m_Pos;
+	GL_SColorf m_Color;
+	GL_STexCoord3D m_Tex;
+};
+
+struct GL_SVertexTex3DStream
+{
+	GL_SPoint m_Pos;
+	GL_SColor m_Color;
+	GL_STexCoord3D m_Tex;
+};
+
+static constexpr size_t gs_GraphicsMaxQuadsRenderCount = 256;
+static constexpr size_t gs_GraphicsMaxParticlesRenderCount = 512;
+
+enum EGraphicsDriverAgeType
+{
+	GRAPHICS_DRIVER_AGE_TYPE_LEGACY = 0,
+	GRAPHICS_DRIVER_AGE_TYPE_DEFAULT,
+	GRAPHICS_DRIVER_AGE_TYPE_MODERN,
+
+	GRAPHICS_DRIVER_AGE_TYPE_COUNT,
+};
+
+enum EBackendType
+{
+	BACKEND_TYPE_OPENGL = 0,
+	BACKEND_TYPE_OPENGL_ES,
+	BACKEND_TYPE_VULKAN,
+
+	// special value to tell the backend to identify the current backend
+	BACKEND_TYPE_AUTO,
+
+	BACKEND_TYPE_COUNT,
+};
+
+struct STWGraphicGPU
+{
+	enum ETWGraphicsGPUType
+	{
+		GRAPHICS_GPU_TYPE_DISCRETE = 0,
+		GRAPHICS_GPU_TYPE_INTEGRATED,
+		GRAPHICS_GPU_TYPE_VIRTUAL,
+		GRAPHICS_GPU_TYPE_CPU,
+
+		// should stay at last position in this enum
+		GRAPHICS_GPU_TYPE_INVALID,
+	};
+
+	struct STWGraphicGPUItem
+	{
+		char m_aName[256];
+		ETWGraphicsGPUType m_GPUType;
+	};
+	std::vector<STWGraphicGPUItem> m_vGPUs;
+	STWGraphicGPUItem m_AutoGPU;
+};
+
+typedef STWGraphicGPU TTWGraphicsGPUList;
+
+typedef std::function<void()> WINDOW_RESIZE_FUNC;
+typedef std::function<void()> WINDOW_PROPS_CHANGED_FUNC;
+
+typedef std::function<bool(uint32_t &Width, uint32_t &Height, CImageInfo::EImageFormat &Format, std::vector<uint8_t> &vDstData)> TGLBackendReadPresentedImageData;
+
+class IGraphics : public IInterface
+{
+	MACRO_INTERFACE("graphics")
+protected:
+	int m_ScreenWidth;
+	int m_ScreenHeight;
+	int m_ScreenRefreshRate;
+	float m_ScreenHiDPIScale;
+
+public:
+	enum
+	{
+		TEXLOAD_NOMIPMAPS = 1 << 1,
+		TEXLOAD_NO_COMPRESSION = 1 << 2,
+		TEXLOAD_TO_3D_TEXTURE = (1 << 3),
+		TEXLOAD_TO_2D_ARRAY_TEXTURE = (1 << 4),
+		TEXLOAD_NO_2D_TEXTURE = (1 << 5),
+	};
+
+	class CTextureHandle
+	{
+		friend class IGraphics;
+		int m_Id;
+
+	public:
+		CTextureHandle() :
+			m_Id(-1)
+		{
+		}
+
+		bool IsValid() const { return Id() >= 0; }
+		bool IsNullTexture() const { return Id() == 0; }
+		int Id() const { return m_Id; }
+		void Invalidate() { m_Id = -1; }
+	};
+
+	int ScreenWidth() const { return m_ScreenWidth; }
+	int ScreenHeight() const { return m_ScreenHeight; }
+	float ScreenAspect() const { return (float)ScreenWidth() / (float)ScreenHeight(); }
+	float ScreenHiDPIScale() const { return m_ScreenHiDPIScale; }
+	int WindowWidth() const { return m_ScreenWidth / m_ScreenHiDPIScale; }
+	int WindowHeight() const { return m_ScreenHeight / m_ScreenHiDPIScale; }
+
+	virtual void WarnPngliteIncompatibleImages(bool Warn) = 0;
+	virtual void SetWindowParams(int FullscreenMode, bool IsBorderless, bool AllowResizing) = 0;
+	virtual bool SetWindowScreen(int Index) = 0;
+	virtual bool SetVSync(bool State) = 0;
+	virtual bool SetMultiSampling(uint32_t ReqMultiSamplingCount, uint32_t &MultiSamplingCountBackend) = 0;
+	virtual int GetWindowScreen() = 0;
+	virtual void Move(int x, int y) = 0;
+	virtual void Resize(int w, int h, int RefreshRate) = 0;
+	virtual void GotResized(int w, int h, int RefreshRate) = 0;
+	virtual void UpdateViewport(int X, int Y, int W, int H, bool ByResize) = 0;
+
+	/**
+	* Listens to a resize event of the canvas, which is usually caused by a window resize.
+	* Will only be triggered if the actual size changed.
+	*/
+	virtual void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc) = 0;
+	/**
+	* Listens to various window property changes, such as minimize, maximize, move, fullscreen mode
+	*/
+	virtual void AddWindowPropChangeListener(WINDOW_PROPS_CHANGED_FUNC pFunc) = 0;
+
+	virtual void WindowDestroyNtf(uint32_t WindowID) = 0;
+	virtual void WindowCreateNtf(uint32_t WindowID) = 0;
+
+	// ForceClearNow forces the backend to trigger a clear, even at performance cost, else it might be delayed by one frame
+	virtual void Clear(float r, float g, float b, bool ForceClearNow = false) = 0;
+
+	virtual void ClipEnable(int x, int y, int w, int h) = 0;
+	virtual void ClipDisable() = 0;
+
+	virtual void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY) = 0;
+	virtual void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY) = 0;
+
+	// TODO: These should perhaps not be virtuals
+	virtual void BlendNone() = 0;
+	virtual void BlendNormal() = 0;
+	virtual void BlendAdditive() = 0;
+	virtual void WrapNormal() = 0;
+	virtual void WrapClamp() = 0;
+
+	virtual uint64_t TextureMemoryUsage() const = 0;
+	virtual uint64_t BufferMemoryUsage() const = 0;
+	virtual uint64_t StreamedMemoryUsage() const = 0;
+	virtual uint64_t StagingMemoryUsage() const = 0;
+
+	virtual const TTWGraphicsGPUList &GetGPUs() const = 0;
+
+	virtual bool LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) = 0;
+	virtual void FreePNG(CImageInfo *pImg) = 0;
+
+	virtual bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) = 0;
+	virtual bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) = 0;
+
+	// destination and source buffer require to have the same width and height
+	virtual void CopyTextureBufferSub(uint8_t *pDestBuffer, uint8_t *pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t PixelSize, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) = 0;
+
+	// destination width must be equal to the subwidth of the source
+	virtual void CopyTextureFromTextureBufferSub(uint8_t *pDestBuffer, size_t DestWidth, size_t DestHeight, uint8_t *pSourceBuffer, size_t SrcWidth, size_t SrcHeight, size_t PixelSize, size_t SrcSubOffsetX, size_t SrcSubOffsetY, size_t SrcSubCopyWidth, size_t SrcSubCopyHeight) = 0;
+
+	virtual int UnloadTexture(CTextureHandle *pIndex) = 0;
+	virtual CTextureHandle LoadTextureRaw(size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData, int Flags, const char *pTexName = nullptr) = 0;
+	virtual int LoadTextureRawSub(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, CImageInfo::EImageFormat Format, const void *pData) = 0;
+	virtual CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) = 0;
+	virtual CTextureHandle NullTexture() const = 0;
+	virtual void TextureSet(CTextureHandle Texture) = 0;
+	void TextureClear() { TextureSet(CTextureHandle()); }
+
+	// pTextData & pTextOutlineData are automatically free'd
+	virtual bool LoadTextTextures(size_t Width, size_t Height, CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture, void *pTextData, void *pTextOutlineData) = 0;
+	virtual bool UnloadTextTextures(CTextureHandle &TextTexture, CTextureHandle &TextOutlineTexture) = 0;
+	virtual bool UpdateTextTexture(CTextureHandle TextureID, int x, int y, size_t Width, size_t Height, const void *pData) = 0;
+
+	virtual CTextureHandle LoadSpriteTexture(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) = 0;
+
+	virtual bool IsImageSubFullyTransparent(CImageInfo &FromImageInfo, int x, int y, int w, int h) = 0;
+	virtual bool IsSpriteTextureFullyTransparent(CImageInfo &FromImageInfo, struct CDataSprite *pSprite) = 0;
+
+	virtual void FlushVertices(bool KeepVertices = false) = 0;
+	virtual void FlushVerticesTex3D() = 0;
+
+	// specific render functions
+	virtual void RenderTileLayer(int BufferContainerIndex, const ColorRGBA &Color, char **pOffsets, unsigned int *pIndicedVertexDrawNum, size_t NumIndicesOffset) = 0;
+	virtual void RenderBorderTiles(int BufferContainerIndex, const ColorRGBA &Color, char *pIndexBufferOffset, const vec2 &Offset, const vec2 &Scale, uint32_t DrawNum) = 0;
+	virtual void RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo *pQuadInfo, size_t QuadNum, int QuadOffset) = 0;
+	virtual void RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor) = 0;
+
+	// opengl 3.3 functions
+
+	enum EBufferObjectCreateFlags
+	{
+		// tell the backend that the buffer only needs to be valid for the span of one frame. Buffer size is not allowed to be bigger than GL_SVertex * MAX_VERTICES
+		BUFFER_OBJECT_CREATE_FLAGS_ONE_TIME_USE_BIT = 1 << 0,
+	};
+
+	// if a pointer is passed as moved pointer, it requires to be allocated with malloc()
+	virtual int CreateBufferObject(size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) = 0;
+	virtual void RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void *pUploadData, int CreateFlags, bool IsMovedPointer = false) = 0;
+	virtual void DeleteBufferObject(int BufferIndex) = 0;
+
+	virtual int CreateBufferContainer(struct SBufferContainerInfo *pContainerInfo) = 0;
+	// destroying all buffer objects means, that all referenced VBOs are destroyed automatically, so the user does not need to save references to them
+	virtual void DeleteBufferContainer(int &ContainerIndex, bool DestroyAllBO = true) = 0;
+	virtual void IndicesNumRequiredNotify(unsigned int RequiredIndicesCount) = 0;
+
+	// returns true if the driver age type is supported, passing BACKEND_TYPE_AUTO for BackendType will query the values for the currently used backend
+	virtual bool GetDriverVersion(EGraphicsDriverAgeType DriverAgeType, int &Major, int &Minor, int &Patch, const char *&pName, EBackendType BackendType) = 0;
+	virtual bool IsConfigModernAPI() = 0;
+	virtual bool IsTileBufferingEnabled() = 0;
+	virtual bool IsQuadBufferingEnabled() = 0;
+	virtual bool IsTextBufferingEnabled() = 0;
+	virtual bool IsQuadContainerBufferingEnabled() = 0;
+	virtual bool Uses2DTextureArrays() = 0;
+	virtual bool HasTextureArraysSupport() = 0;
+
+	virtual const char *GetVendorString() = 0;
+	virtual const char *GetVersionString() = 0;
+	virtual const char *GetRendererString() = 0;
+
+	struct CLineItem
+	{
+		float m_X0, m_Y0, m_X1, m_Y1;
+		CLineItem() {}
+		CLineItem(float x0, float y0, float x1, float y1) :
+			m_X0(x0), m_Y0(y0), m_X1(x1), m_Y1(y1) {}
+	};
+	virtual void LinesBegin() = 0;
+	virtual void LinesEnd() = 0;
+	virtual void LinesDraw(const CLineItem *pArray, int Num) = 0;
+
+	virtual void QuadsBegin() = 0;
+	virtual void QuadsEnd() = 0;
+	virtual void QuadsTex3DBegin() = 0;
+	virtual void QuadsTex3DEnd() = 0;
+	virtual void TrianglesBegin() = 0;
+	virtual void TrianglesEnd() = 0;
+	virtual void QuadsEndKeepVertices() = 0;
+	virtual void QuadsDrawCurrentVertices(bool KeepVertices = true) = 0;
+	virtual void QuadsSetRotation(float Angle) = 0;
+	virtual void QuadsSetSubset(float TopLeftU, float TopLeftV, float BottomRightU, float BottomRightV) = 0;
+	virtual void QuadsSetSubsetFree(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, int Index = -1) = 0;
+
+	struct CFreeformItem
+	{
+		float m_X0, m_Y0, m_X1, m_Y1, m_X2, m_Y2, m_X3, m_Y3;
+		CFreeformItem() {}
+		CFreeformItem(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3) :
+			m_X0(x0), m_Y0(y0), m_X1(x1), m_Y1(y1), m_X2(x2), m_Y2(y2), m_X3(x3), m_Y3(y3) {}
+	};
+
+	struct CQuadItem
+	{
+		float m_X, m_Y, m_Width, m_Height;
+		CQuadItem() {}
+		CQuadItem(float x, float y, float w, float h) :
+			m_X(x), m_Y(y), m_Width(w), m_Height(h) {}
+		void Set(float x, float y, float w, float h)
+		{
+			m_X = x;
+			m_Y = y;
+			m_Width = w;
+			m_Height = h;
+		}
+
+		CFreeformItem ToFreeForm() const
+		{
+			return CFreeformItem(m_X, m_Y, m_X + m_Width, m_Y, m_X, m_Y + m_Height, m_X + m_Width, m_Y + m_Height);
+		}
+	};
+	virtual void QuadsDraw(CQuadItem *pArray, int Num) = 0;
+	virtual void QuadsDrawTL(const CQuadItem *pArray, int Num) = 0;
+
+	virtual void QuadsTex3DDrawTL(const CQuadItem *pArray, int Num) = 0;
+
+	virtual const GL_STexCoord *GetCurTextureCoordinates() = 0;
+	virtual const GL_SColor *GetCurColor() = 0;
+
+	virtual int CreateQuadContainer(bool AutomaticUpload = true) = 0;
+	virtual void QuadContainerChangeAutomaticUpload(int ContainerIndex, bool AutomaticUpload) = 0;
+	virtual void QuadContainerUpload(int ContainerIndex) = 0;
+	virtual int QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num) = 0;
+	virtual int QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num) = 0;
+	virtual void QuadContainerReset(int ContainerIndex) = 0;
+	virtual void DeleteQuadContainer(int &ContainerIndex) = 0;
+	virtual void RenderQuadContainer(int ContainerIndex, int QuadDrawNum) = 0;
+	virtual void RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum, bool ChangeWrapMode = true) = 0;
+	virtual void RenderQuadContainerEx(int ContainerIndex, int QuadOffset, int QuadDrawNum, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) = 0;
+	virtual void RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) = 0;
+
+	struct SRenderSpriteInfo
+	{
+		vec2 m_Pos;
+		float m_Scale;
+		float m_Rotation;
+	};
+
+	virtual void RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo) = 0;
+
+	virtual void QuadsDrawFreeform(const CFreeformItem *pArray, int Num) = 0;
+	virtual void QuadsText(float x, float y, float Size, const char *pText) = 0;
+
+	enum
+	{
+		CORNER_NONE = 0,
+		CORNER_TL = 1,
+		CORNER_TR = 2,
+		CORNER_BL = 4,
+		CORNER_BR = 8,
+
+		CORNER_T = CORNER_TL | CORNER_TR,
+		CORNER_B = CORNER_BL | CORNER_BR,
+		CORNER_R = CORNER_TR | CORNER_BR,
+		CORNER_L = CORNER_TL | CORNER_BL,
+
+		CORNER_ALL = CORNER_T | CORNER_B,
+	};
+	virtual void DrawRectExt(float x, float y, float w, float h, float r, int Corners) = 0;
+	virtual void DrawRectExt4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, float r, int Corners) = 0;
+	virtual int CreateRectQuadContainer(float x, float y, float w, float h, float r, int Corners) = 0;
+	virtual void DrawRect(float x, float y, float w, float h, ColorRGBA Color, int Corners, float Rounding) = 0;
+	virtual void DrawRect4(float x, float y, float w, float h, ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding) = 0;
+	virtual void DrawCircle(float CenterX, float CenterY, float Radius, int Segments) = 0;
+
+	struct CColorVertex
+	{
+		int m_Index;
+		float m_R, m_G, m_B, m_A;
+		CColorVertex() {}
+		CColorVertex(int i, float r, float g, float b, float a) :
+			m_Index(i), m_R(r), m_G(g), m_B(b), m_A(a) {}
+	};
+	virtual void SetColorVertex(const CColorVertex *pArray, int Num) = 0;
+	virtual void SetColor(float r, float g, float b, float a) = 0;
+	virtual void SetColor(ColorRGBA Color) = 0;
+	virtual void SetColor4(ColorRGBA TopLeft, ColorRGBA TopRight, ColorRGBA BottomLeft, ColorRGBA BottomRight) = 0;
+	virtual void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) = 0;
+	virtual void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) = 0;
+
+	virtual void TakeScreenshot(const char *pFilename) = 0;
+	virtual void TakeCustomScreenshot(const char *pFilename) = 0;
+	virtual int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) = 0;
+
+	virtual void Swap() = 0;
+	virtual int GetNumScreens() const = 0;
+	virtual const char *GetScreenName(int Screen) const = 0;
+
+	// synchronization
+	virtual void InsertSignal(class CSemaphore *pSemaphore) = 0;
+	virtual bool IsIdle() const = 0;
+	virtual void WaitForIdle() = 0;
+
+	virtual void SetWindowGrab(bool Grab) = 0;
+	virtual void NotifyWindow() = 0;
+
+	// be aware that this function should only be called from the graphics thread, and even then you should really know what you are doing
+	// this function always returns the pixels in RGB
+	virtual TGLBackendReadPresentedImageData &GetReadPresentedImageDataFuncUnsafe() = 0;
+
+	virtual SWarning *GetCurWarning() = 0;
+
+	// returns true if the error msg was shown
+	virtual bool ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg) = 0;
+	virtual bool IsBackendInitialized() = 0;
+
+protected:
+	inline CTextureHandle CreateTextureHandle(int Index)
+	{
+		CTextureHandle Tex;
+		Tex.m_Id = Index;
+		return Tex;
+	}
+};
+
+class IEngineGraphics : public IGraphics
+{
+	MACRO_INTERFACE("enginegraphics")
+public:
+	virtual int Init() = 0;
+	virtual void Shutdown() override = 0;
+
+	virtual void Minimize() = 0;
+	virtual void Maximize() = 0;
+
+	virtual int WindowActive() = 0;
+	virtual int WindowOpen() = 0;
+};
+
+extern IEngineGraphics *CreateEngineGraphicsThreaded();
+
+#endif
diff --git a/src_bkp/engine/input.h b/src_bkp/engine/input.h
new file mode 100644
index 0000000000..87740c2fa2
--- /dev/null
+++ b/src_bkp/engine/input.h
@@ -0,0 +1,154 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_INPUT_H
+#define ENGINE_INPUT_H
+
+#include "kernel.h"
+#include <base/system.h>
+
+const int g_MaxKeys = 512;
+extern const char g_aaKeyStrings[g_MaxKeys][20];
+
+class IInput : public IInterface
+{
+	MACRO_INTERFACE("input")
+public:
+	enum
+	{
+		INPUT_TEXT_SIZE = 32 * UTF8_BYTE_LENGTH + 1,
+	};
+
+	class CEvent
+	{
+	public:
+		int m_Flags;
+		int m_Key;
+		char m_aText[INPUT_TEXT_SIZE];
+		int m_InputCount;
+	};
+
+protected:
+	enum
+	{
+		INPUT_BUFFER_SIZE = 32
+	};
+
+	// quick access to events
+	size_t m_NumEvents;
+	CEvent m_aInputEvents[INPUT_BUFFER_SIZE];
+	int64_t m_LastUpdate;
+	float m_UpdateTime;
+
+public:
+	enum
+	{
+		FLAG_PRESS = 1 << 0,
+		FLAG_RELEASE = 1 << 1,
+		FLAG_TEXT = 1 << 2,
+	};
+	enum ECursorType
+	{
+		CURSOR_NONE,
+		CURSOR_MOUSE,
+		CURSOR_JOYSTICK,
+	};
+	enum
+	{
+		MAX_COMPOSITION_ARRAY_SIZE = 32, // SDL2 limitation
+
+		COMP_LENGTH_INACTIVE = -1,
+	};
+
+	// events
+	size_t NumEvents() const { return m_NumEvents; }
+	virtual bool IsEventValid(const CEvent &Event) const = 0;
+	const CEvent &GetEvent(size_t Index) const
+	{
+		dbg_assert(Index < m_NumEvents, "Index invalid");
+		return m_aInputEvents[Index];
+	}
+
+	/**
+	 * @return Rolling average of the time in seconds between
+	 * calls of the Update function.
+	 */
+	float GetUpdateTime() const { return m_UpdateTime; }
+
+	// keys
+	virtual bool ModifierIsPressed() const = 0;
+	virtual bool ShiftIsPressed() const = 0;
+	virtual bool AltIsPressed() const = 0;
+	virtual bool KeyIsPressed(int Key) const = 0;
+	virtual bool KeyPress(int Key, bool CheckCounter = false) const = 0;
+	const char *KeyName(int Key) const { return (Key >= 0 && Key < g_MaxKeys) ? g_aaKeyStrings[Key] : g_aaKeyStrings[0]; }
+	virtual void Clear() = 0;
+
+	// joystick
+	class IJoystick
+	{
+	public:
+		virtual int GetIndex() const = 0;
+		virtual const char *GetName() const = 0;
+		virtual int GetNumAxes() const = 0;
+		virtual int GetNumButtons() const = 0;
+		virtual int GetNumBalls() const = 0;
+		virtual int GetNumHats() const = 0;
+		virtual float GetAxisValue(int Axis) = 0;
+		virtual void GetHatValue(int Hat, int (&HatKeys)[2]) = 0;
+		virtual bool Relative(float *pX, float *pY) = 0;
+		virtual bool Absolute(float *pX, float *pY) = 0;
+	};
+	virtual size_t NumJoysticks() const = 0;
+	virtual IJoystick *GetJoystick(size_t Index) = 0;
+	virtual IJoystick *GetActiveJoystick() = 0;
+	virtual void SetActiveJoystick(size_t Index) = 0;
+
+	// mouse
+	virtual void NativeMousePos(int *pX, int *pY) const = 0;
+	virtual bool NativeMousePressed(int Index) = 0;
+	virtual void MouseModeRelative() = 0;
+	virtual void MouseModeAbsolute() = 0;
+	virtual bool MouseDoubleClick() = 0;
+	virtual bool MouseRelative(float *pX, float *pY) = 0;
+
+	// clipboard
+	virtual const char *GetClipboardText() = 0;
+	virtual void SetClipboardText(const char *pText) = 0;
+
+	// text editing
+	virtual void StartTextInput() = 0;
+	virtual void StopTextInput() = 0;
+	virtual const char *GetComposition() const = 0;
+	virtual bool HasComposition() const = 0;
+	virtual int GetCompositionCursor() const = 0;
+	virtual int GetCompositionLength() const = 0;
+	virtual const char *GetCandidate(int Index) const = 0;
+	virtual int GetCandidateCount() const = 0;
+	virtual int GetCandidateSelectedIndex() const = 0;
+	virtual void SetCompositionWindowPosition(float X, float Y, float H) = 0;
+
+	virtual bool GetDropFile(char *aBuf, int Len) = 0;
+
+	ECursorType CursorRelative(float *pX, float *pY)
+	{
+		if(MouseRelative(pX, pY))
+			return CURSOR_MOUSE;
+		IJoystick *pJoystick = GetActiveJoystick();
+		if(pJoystick && pJoystick->Relative(pX, pY))
+			return CURSOR_JOYSTICK;
+		return CURSOR_NONE;
+	}
+};
+
+class IEngineInput : public IInput
+{
+	MACRO_INTERFACE("engineinput")
+public:
+	virtual void Init() = 0;
+	virtual void Shutdown() override = 0;
+	virtual int Update() = 0;
+};
+
+extern IEngineInput *CreateEngineInput();
+
+#endif
diff --git a/src_bkp/engine/kernel.h b/src_bkp/engine/kernel.h
new file mode 100644
index 0000000000..3a2c4362bc
--- /dev/null
+++ b/src_bkp/engine/kernel.h
@@ -0,0 +1,66 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_KERNEL_H
+#define ENGINE_KERNEL_H
+
+class IKernel;
+class IInterface;
+
+class IInterface
+{
+	// friend with the kernel implementation
+	friend class CKernel;
+	IKernel *m_pKernel;
+
+protected:
+	IKernel *Kernel() { return m_pKernel; }
+
+public:
+	IInterface() :
+		m_pKernel(nullptr) {}
+	virtual void Shutdown() {}
+	virtual ~IInterface() {}
+};
+
+#define MACRO_INTERFACE(Name) \
+public: \
+	static const char *InterfaceName() { return Name; } \
+\
+private:
+
+// This kernel thingie makes the structure very flat and basically singletons.
+// I'm not sure if this is a good idea but it works for now.
+class IKernel
+{
+	// hide the implementation
+	virtual bool RegisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface, bool Destroy) = 0;
+	virtual bool ReregisterInterfaceImpl(const char *pInterfaceName, IInterface *pInterface) = 0;
+	virtual IInterface *RequestInterfaceImpl(const char *pInterfaceName) = 0;
+
+public:
+	static IKernel *Create();
+	virtual void Shutdown() = 0;
+	virtual ~IKernel() {}
+
+	// templated access to handle pointer conversions and interface names
+	template<class TINTERFACE>
+	bool RegisterInterface(TINTERFACE *pInterface, bool Destroy = true)
+	{
+		return RegisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface, Destroy);
+	}
+	template<class TINTERFACE>
+	bool ReregisterInterface(TINTERFACE *pInterface)
+	{
+		return ReregisterInterfaceImpl(TINTERFACE::InterfaceName(), pInterface);
+	}
+
+	// Usage example:
+	//		IMyInterface *pMyHandle = Kernel()->RequestInterface<IMyInterface>()
+	template<class TINTERFACE>
+	TINTERFACE *RequestInterface()
+	{
+		return reinterpret_cast<TINTERFACE *>(RequestInterfaceImpl(TINTERFACE::InterfaceName()));
+	}
+};
+
+#endif
diff --git a/src_bkp/engine/keys.h b/src_bkp/engine/keys.h
new file mode 100644
index 0000000000..88db9778ab
--- /dev/null
+++ b/src_bkp/engine/keys.h
@@ -0,0 +1,330 @@
+#ifndef ENGINE_KEYS_H
+#define ENGINE_KEYS_H
+#if defined(CONF_FAMILY_WINDOWS)
+#undef KEY_EXECUTE
+#endif
+/* AUTO GENERATED! DO NOT EDIT MANUALLY! */
+enum
+{
+	KEY_FIRST = 0,
+	KEY_UNKNOWN = 0,
+	KEY_A = 4,
+	KEY_B = 5,
+	KEY_C = 6,
+	KEY_D = 7,
+	KEY_E = 8,
+	KEY_F = 9,
+	KEY_G = 10,
+	KEY_H = 11,
+	KEY_I = 12,
+	KEY_J = 13,
+	KEY_K = 14,
+	KEY_L = 15,
+	KEY_M = 16,
+	KEY_N = 17,
+	KEY_O = 18,
+	KEY_P = 19,
+	KEY_Q = 20,
+	KEY_R = 21,
+	KEY_S = 22,
+	KEY_T = 23,
+	KEY_U = 24,
+	KEY_V = 25,
+	KEY_W = 26,
+	KEY_X = 27,
+	KEY_Y = 28,
+	KEY_Z = 29,
+	KEY_1 = 30,
+	KEY_2 = 31,
+	KEY_3 = 32,
+	KEY_4 = 33,
+	KEY_5 = 34,
+	KEY_6 = 35,
+	KEY_7 = 36,
+	KEY_8 = 37,
+	KEY_9 = 38,
+	KEY_0 = 39,
+	KEY_RETURN = 40,
+	KEY_ESCAPE = 41,
+	KEY_BACKSPACE = 42,
+	KEY_TAB = 43,
+	KEY_SPACE = 44,
+	KEY_MINUS = 45,
+	KEY_EQUALS = 46,
+	KEY_LEFTBRACKET = 47,
+	KEY_RIGHTBRACKET = 48,
+	KEY_BACKSLASH = 49,
+	KEY_NONUSHASH = 50,
+	KEY_SEMICOLON = 51,
+	KEY_APOSTROPHE = 52,
+	KEY_GRAVE = 53,
+	KEY_COMMA = 54,
+	KEY_PERIOD = 55,
+	KEY_SLASH = 56,
+	KEY_CAPSLOCK = 57,
+	KEY_F1 = 58,
+	KEY_F2 = 59,
+	KEY_F3 = 60,
+	KEY_F4 = 61,
+	KEY_F5 = 62,
+	KEY_F6 = 63,
+	KEY_F7 = 64,
+	KEY_F8 = 65,
+	KEY_F9 = 66,
+	KEY_F10 = 67,
+	KEY_F11 = 68,
+	KEY_F12 = 69,
+	KEY_PRINTSCREEN = 70,
+	KEY_SCROLLLOCK = 71,
+	KEY_PAUSE = 72,
+	KEY_INSERT = 73,
+	KEY_HOME = 74,
+	KEY_PAGEUP = 75,
+	KEY_DELETE = 76,
+	KEY_END = 77,
+	KEY_PAGEDOWN = 78,
+	KEY_RIGHT = 79,
+	KEY_LEFT = 80,
+	KEY_DOWN = 81,
+	KEY_UP = 82,
+	KEY_NUMLOCKCLEAR = 83,
+	KEY_KP_DIVIDE = 84,
+	KEY_KP_MULTIPLY = 85,
+	KEY_KP_MINUS = 86,
+	KEY_KP_PLUS = 87,
+	KEY_KP_ENTER = 88,
+	KEY_KP_1 = 89,
+	KEY_KP_2 = 90,
+	KEY_KP_3 = 91,
+	KEY_KP_4 = 92,
+	KEY_KP_5 = 93,
+	KEY_KP_6 = 94,
+	KEY_KP_7 = 95,
+	KEY_KP_8 = 96,
+	KEY_KP_9 = 97,
+	KEY_KP_0 = 98,
+	KEY_KP_PERIOD = 99,
+	KEY_NONUSBACKSLASH = 100,
+	KEY_APPLICATION = 101,
+	KEY_POWER = 102,
+	KEY_KP_EQUALS = 103,
+	KEY_F13 = 104,
+	KEY_F14 = 105,
+	KEY_F15 = 106,
+	KEY_F16 = 107,
+	KEY_F17 = 108,
+	KEY_F18 = 109,
+	KEY_F19 = 110,
+	KEY_F20 = 111,
+	KEY_F21 = 112,
+	KEY_F22 = 113,
+	KEY_F23 = 114,
+	KEY_F24 = 115,
+	KEY_EXECUTE = 116,
+	KEY_HELP = 117,
+	KEY_MENU = 118,
+	KEY_SELECT = 119,
+	KEY_STOP = 120,
+	KEY_AGAIN = 121,
+	KEY_UNDO = 122,
+	KEY_CUT = 123,
+	KEY_COPY = 124,
+	KEY_PASTE = 125,
+	KEY_FIND = 126,
+	KEY_MUTE = 127,
+	KEY_VOLUMEUP = 128,
+	KEY_VOLUMEDOWN = 129,
+	KEY_KP_COMMA = 133,
+	KEY_KP_EQUALSAS400 = 134,
+	KEY_INTERNATIONAL1 = 135,
+	KEY_INTERNATIONAL2 = 136,
+	KEY_INTERNATIONAL3 = 137,
+	KEY_INTERNATIONAL4 = 138,
+	KEY_INTERNATIONAL5 = 139,
+	KEY_INTERNATIONAL6 = 140,
+	KEY_INTERNATIONAL7 = 141,
+	KEY_INTERNATIONAL8 = 142,
+	KEY_INTERNATIONAL9 = 143,
+	KEY_LANG1 = 144,
+	KEY_LANG2 = 145,
+	KEY_LANG3 = 146,
+	KEY_LANG4 = 147,
+	KEY_LANG5 = 148,
+	KEY_LANG6 = 149,
+	KEY_LANG7 = 150,
+	KEY_LANG8 = 151,
+	KEY_LANG9 = 152,
+	KEY_ALTERASE = 153,
+	KEY_SYSREQ = 154,
+	KEY_CANCEL = 155,
+	KEY_CLEAR = 156,
+	KEY_PRIOR = 157,
+	KEY_RETURN2 = 158,
+	KEY_SEPARATOR = 159,
+	KEY_OUT = 160,
+	KEY_OPER = 161,
+	KEY_CLEARAGAIN = 162,
+	KEY_CRSEL = 163,
+	KEY_EXSEL = 164,
+	KEY_KP_00 = 176,
+	KEY_KP_000 = 177,
+	KEY_THOUSANDSSEPARATOR = 178,
+	KEY_DECIMALSEPARATOR = 179,
+	KEY_CURRENCYUNIT = 180,
+	KEY_CURRENCYSUBUNIT = 181,
+	KEY_KP_LEFTPAREN = 182,
+	KEY_KP_RIGHTPAREN = 183,
+	KEY_KP_LEFTBRACE = 184,
+	KEY_KP_RIGHTBRACE = 185,
+	KEY_KP_TAB = 186,
+	KEY_KP_BACKSPACE = 187,
+	KEY_KP_A = 188,
+	KEY_KP_B = 189,
+	KEY_KP_C = 190,
+	KEY_KP_D = 191,
+	KEY_KP_E = 192,
+	KEY_KP_F = 193,
+	KEY_KP_XOR = 194,
+	KEY_KP_POWER = 195,
+	KEY_KP_PERCENT = 196,
+	KEY_KP_LESS = 197,
+	KEY_KP_GREATER = 198,
+	KEY_KP_AMPERSAND = 199,
+	KEY_KP_DBLAMPERSAND = 200,
+	KEY_KP_VERTICALBAR = 201,
+	KEY_KP_DBLVERTICALBAR = 202,
+	KEY_KP_COLON = 203,
+	KEY_KP_HASH = 204,
+	KEY_KP_SPACE = 205,
+	KEY_KP_AT = 206,
+	KEY_KP_EXCLAM = 207,
+	KEY_KP_MEMSTORE = 208,
+	KEY_KP_MEMRECALL = 209,
+	KEY_KP_MEMCLEAR = 210,
+	KEY_KP_MEMADD = 211,
+	KEY_KP_MEMSUBTRACT = 212,
+	KEY_KP_MEMMULTIPLY = 213,
+	KEY_KP_MEMDIVIDE = 214,
+	KEY_KP_PLUSMINUS = 215,
+	KEY_KP_CLEAR = 216,
+	KEY_KP_CLEARENTRY = 217,
+	KEY_KP_BINARY = 218,
+	KEY_KP_OCTAL = 219,
+	KEY_KP_DECIMAL = 220,
+	KEY_KP_HEXADECIMAL = 221,
+	KEY_LCTRL = 224,
+	KEY_LSHIFT = 225,
+	KEY_LALT = 226,
+	KEY_LGUI = 227,
+	KEY_RCTRL = 228,
+	KEY_RSHIFT = 229,
+	KEY_RALT = 230,
+	KEY_RGUI = 231,
+	KEY_MODE = 257,
+	KEY_AUDIONEXT = 258,
+	KEY_AUDIOPREV = 259,
+	KEY_AUDIOSTOP = 260,
+	KEY_AUDIOPLAY = 261,
+	KEY_AUDIOMUTE = 262,
+	KEY_MEDIASELECT = 263,
+	KEY_WWW = 264,
+	KEY_MAIL = 265,
+	KEY_CALCULATOR = 266,
+	KEY_COMPUTER = 267,
+	KEY_AC_SEARCH = 268,
+	KEY_AC_HOME = 269,
+	KEY_AC_BACK = 270,
+	KEY_AC_FORWARD = 271,
+	KEY_AC_STOP = 272,
+	KEY_AC_REFRESH = 273,
+	KEY_AC_BOOKMARKS = 274,
+	KEY_BRIGHTNESSDOWN = 275,
+	KEY_BRIGHTNESSUP = 276,
+	KEY_DISPLAYSWITCH = 277,
+	KEY_KBDILLUMTOGGLE = 278,
+	KEY_KBDILLUMDOWN = 279,
+	KEY_KBDILLUMUP = 280,
+	KEY_EJECT = 281,
+	KEY_SLEEP = 282,
+	KEY_APP1 = 283,
+	KEY_APP2 = 284,
+	KEY_AUDIOREWIND = 285,
+	KEY_AUDIOFASTFORWARD = 286,
+	KEY_SOFTLEFT = 287,
+	KEY_SOFTRIGHT = 288,
+	KEY_CALL = 289,
+	KEY_ENDCALL = 290,
+
+	KEY_MOUSE_1 = 291,
+	KEY_MOUSE_2 = 292,
+	KEY_MOUSE_3 = 293,
+	KEY_MOUSE_4 = 294,
+	KEY_MOUSE_5 = 295,
+	KEY_MOUSE_6 = 296,
+	KEY_MOUSE_7 = 297,
+	KEY_MOUSE_8 = 298,
+	KEY_MOUSE_9 = 299,
+	KEY_MOUSE_WHEEL_UP = 300,
+	KEY_MOUSE_WHEEL_DOWN = 301,
+	KEY_MOUSE_WHEEL_LEFT = 302,
+	KEY_MOUSE_WHEEL_RIGHT = 303,
+
+	KEY_JOYSTICK_BUTTON_0 = 304,
+	KEY_JOYSTICK_BUTTON_1 = 305,
+	KEY_JOYSTICK_BUTTON_2 = 306,
+	KEY_JOYSTICK_BUTTON_3 = 307,
+	KEY_JOYSTICK_BUTTON_4 = 308,
+	KEY_JOYSTICK_BUTTON_5 = 309,
+	KEY_JOYSTICK_BUTTON_6 = 310,
+	KEY_JOYSTICK_BUTTON_7 = 311,
+	KEY_JOYSTICK_BUTTON_8 = 312,
+	KEY_JOYSTICK_BUTTON_9 = 313,
+	KEY_JOYSTICK_BUTTON_10 = 314,
+	KEY_JOYSTICK_BUTTON_11 = 315,
+
+	KEY_JOY_HAT0_UP = 316,
+	KEY_JOY_HAT0_LEFT = 317,
+	KEY_JOY_HAT0_RIGHT = 318,
+	KEY_JOY_HAT0_DOWN = 319,
+	KEY_JOY_HAT1_UP = 320,
+	KEY_JOY_HAT1_LEFT = 321,
+	KEY_JOY_HAT1_RIGHT = 322,
+	KEY_JOY_HAT1_DOWN = 323,
+
+	KEY_JOY_AXIS_0_LEFT = 324,
+	KEY_JOY_AXIS_0_RIGHT = 325,
+	KEY_JOY_AXIS_1_LEFT = 326,
+	KEY_JOY_AXIS_1_RIGHT = 327,
+	KEY_JOY_AXIS_2_LEFT = 328,
+	KEY_JOY_AXIS_2_RIGHT = 329,
+	KEY_JOY_AXIS_3_LEFT = 330,
+	KEY_JOY_AXIS_3_RIGHT = 331,
+	KEY_JOY_AXIS_4_LEFT = 332,
+	KEY_JOY_AXIS_4_RIGHT = 333,
+	KEY_JOY_AXIS_5_LEFT = 334,
+	KEY_JOY_AXIS_5_RIGHT = 335,
+	KEY_JOY_AXIS_6_LEFT = 336,
+	KEY_JOY_AXIS_6_RIGHT = 337,
+	KEY_JOY_AXIS_7_LEFT = 338,
+	KEY_JOY_AXIS_7_RIGHT = 339,
+	KEY_JOY_AXIS_8_LEFT = 340,
+	KEY_JOY_AXIS_8_RIGHT = 341,
+	KEY_JOY_AXIS_9_LEFT = 342,
+	KEY_JOY_AXIS_9_RIGHT = 343,
+	KEY_JOY_AXIS_10_LEFT = 344,
+	KEY_JOY_AXIS_10_RIGHT = 345,
+	KEY_JOY_AXIS_11_LEFT = 346,
+	KEY_JOY_AXIS_11_RIGHT = 347,
+
+	KEY_LAST = 512,
+
+	NUM_JOYSTICK_BUTTONS = KEY_JOYSTICK_BUTTON_11 - KEY_JOYSTICK_BUTTON_0 + 1,
+	NUM_JOYSTICK_AXES_BUTTONS = KEY_JOY_AXIS_11_RIGHT - KEY_JOY_AXIS_0_LEFT + 1,
+	NUM_JOYSTICK_BUTTONS_PER_AXIS = KEY_JOY_AXIS_0_RIGHT - KEY_JOY_AXIS_0_LEFT + 1,
+	NUM_JOYSTICK_AXES = NUM_JOYSTICK_AXES_BUTTONS / NUM_JOYSTICK_BUTTONS_PER_AXIS,
+	NUM_JOYSTICK_HAT_BUTTONS = KEY_JOY_HAT1_DOWN - KEY_JOY_HAT0_UP + 1,
+	NUM_JOYSTICK_BUTTONS_PER_HAT = KEY_JOY_HAT1_DOWN - KEY_JOY_HAT1_UP + 1,
+	NUM_JOYSTICK_HATS = NUM_JOYSTICK_HAT_BUTTONS / NUM_JOYSTICK_BUTTONS_PER_HAT,
+};
+
+#endif
diff --git a/src_bkp/engine/lib.rs b/src_bkp/engine/lib.rs
new file mode 100644
index 0000000000..eef3120d38
--- /dev/null
+++ b/src_bkp/engine/lib.rs
@@ -0,0 +1,19 @@
+//! DDNet's engine interfaces, Rust part.
+//!
+//! DDNet's code base is separated into three major parts, `base`, `engine` and
+//! `game`.
+//!
+//! The engine consists of game-independent code such as display setup,
+//! low-level network protocol, low-level map format, etc.
+//!
+//! This crate in particular corresponds to the `src/engine` directory that only
+//! contains interfaces used by `engine` and `game` code.
+
+#![warn(missing_docs)]
+
+#[cfg(test)]
+extern crate ddnet_test;
+
+mod console;
+
+pub use console::*;
diff --git a/src_bkp/engine/map.h b/src_bkp/engine/map.h
new file mode 100644
index 0000000000..47c2c5ed8a
--- /dev/null
+++ b/src_bkp/engine/map.h
@@ -0,0 +1,50 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_MAP_H
+#define ENGINE_MAP_H
+
+#include "kernel.h"
+#include <base/hash.h>
+#include <base/types.h>
+
+enum
+{
+	MAX_MAP_LENGTH = 128
+};
+
+class IMap : public IInterface
+{
+	MACRO_INTERFACE("map")
+public:
+	virtual int GetDataSize(int Index) const = 0;
+	virtual void *GetData(int Index) = 0;
+	virtual void *GetDataSwapped(int Index) = 0;
+	virtual const char *GetDataString(int Index) = 0;
+	virtual void UnloadData(int Index) = 0;
+	virtual int NumData() const = 0;
+
+	virtual int GetItemSize(int Index) = 0;
+	virtual void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr) = 0;
+	virtual void GetType(int Type, int *pStart, int *pNum) = 0;
+	virtual int FindItemIndex(int Type, int ID) = 0;
+	virtual void *FindItem(int Type, int ID) = 0;
+	virtual int NumItems() const = 0;
+};
+
+class IEngineMap : public IMap
+{
+	MACRO_INTERFACE("enginemap")
+public:
+	virtual bool Load(const char *pMapName) = 0;
+	virtual void Unload() = 0;
+	virtual bool IsLoaded() const = 0;
+	virtual IOHANDLE File() const = 0;
+
+	virtual SHA256_DIGEST Sha256() const = 0;
+	virtual unsigned Crc() const = 0;
+	virtual int MapSize() const = 0;
+};
+
+extern IEngineMap *CreateEngineMap();
+
+#endif
diff --git a/src_bkp/engine/message.h b/src_bkp/engine/message.h
new file mode 100644
index 0000000000..d862b8178b
--- /dev/null
+++ b/src_bkp/engine/message.h
@@ -0,0 +1,28 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_MESSAGE_H
+#define ENGINE_MESSAGE_H
+
+#include <engine/shared/packer.h>
+#include <engine/shared/uuid_manager.h>
+
+class CMsgPacker : public CPacker
+{
+public:
+	int m_MsgID;
+	bool m_System;
+	bool m_NoTranslate;
+	CMsgPacker(int Type, bool System = false, bool NoTranslate = false) :
+		m_MsgID(Type), m_System(System), m_NoTranslate(NoTranslate)
+	{
+		Reset();
+	}
+
+	template<typename T>
+	CMsgPacker(const T *, bool System = false, bool NoTranslate = false) :
+		CMsgPacker(T::ms_MsgID, System, NoTranslate)
+	{
+	}
+};
+
+#endif
diff --git a/src_bkp/engine/notifications.h b/src_bkp/engine/notifications.h
new file mode 100644
index 0000000000..38cfe88b0a
--- /dev/null
+++ b/src_bkp/engine/notifications.h
@@ -0,0 +1,17 @@
+#ifndef ENGINE_NOTIFICATIONS_H
+#define ENGINE_NOTIFICATIONS_H
+
+#include "kernel.h"
+
+class INotifications : public IInterface
+{
+	MACRO_INTERFACE("notifications")
+public:
+	virtual void Init(const char *pAppname) = 0;
+	virtual void Shutdown() override = 0;
+	virtual void Notify(const char *pTitle, const char *pMessage) = 0;
+};
+
+INotifications *CreateNotifications();
+
+#endif // ENGINE_NOTIFICATIONS_H
diff --git a/src_bkp/engine/rust.h b/src_bkp/engine/rust.h
new file mode 100644
index 0000000000..6e6ac2e123
--- /dev/null
+++ b/src_bkp/engine/rust.h
@@ -0,0 +1,7 @@
+#ifndef ENGINE_RUST_H
+#define ENGINE_RUST_H
+#include "console.h"
+
+typedef IConsole::IResult IConsole_IResult;
+typedef IConsole::FCommandCallback IConsole_FCommandCallback;
+#endif // ENGINE_RUST_H
diff --git a/src_bkp/engine/server.h b/src_bkp/engine/server.h
new file mode 100644
index 0000000000..1e81f77397
--- /dev/null
+++ b/src_bkp/engine/server.h
@@ -0,0 +1,356 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SERVER_H
+#define ENGINE_SERVER_H
+
+#include <optional>
+#include <type_traits>
+
+#include <base/hash.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include "kernel.h"
+#include "message.h"
+#include <engine/shared/protocol.h>
+#include <game/generated/protocol.h>
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
+
+struct CAntibotRoundData;
+
+// When recording a demo on the server, the ClientID -1 is used
+enum
+{
+	SERVER_DEMO_CLIENT = -1
+};
+
+class IServer : public IInterface
+{
+	MACRO_INTERFACE("server")
+protected:
+	int m_CurrentGameTick;
+
+public:
+	/*
+		Structure: CClientInfo
+	*/
+	struct CClientInfo
+	{
+		const char *m_pName;
+		int m_Latency;
+		bool m_GotDDNetVersion;
+		int m_DDNetVersion;
+		const char *m_pDDNetVersionStr;
+		const CUuid *m_pConnectionID;
+	};
+
+	int Tick() const { return m_CurrentGameTick; }
+	int TickSpeed() const { return SERVER_TICK_SPEED; }
+
+	virtual int Port() const = 0;
+	virtual int MaxClients() const = 0;
+	virtual int ClientCount() const = 0;
+	virtual int DistinctClientCount() const = 0;
+	virtual const char *ClientName(int ClientID) const = 0;
+	virtual const char *ClientClan(int ClientID) const = 0;
+	virtual int ClientCountry(int ClientID) const = 0;
+	virtual bool ClientIngame(int ClientID) const = 0;
+	virtual bool ClientAuthed(int ClientID) const = 0;
+	virtual bool GetClientInfo(int ClientID, CClientInfo *pInfo) const = 0;
+	virtual void SetClientDDNetVersion(int ClientID, int DDNetVersion) = 0;
+	virtual void GetClientAddr(int ClientID, char *pAddrStr, int Size) const = 0;
+
+	/**
+	 * Returns the version of the client with the given client ID.
+	 *
+	 * @param ClientID the client ID, which must be between 0 and
+	 * MAX_CLIENTS - 1, or equal to SERVER_DEMO_CLIENT for server demos.
+	 *
+	 * @return The version of the client with the given client ID.
+	 * For server demos this is always the latest client version.
+	 * On errors, VERSION_NONE is returned.
+	 */
+	virtual int GetClientVersion(int ClientID) const = 0;
+	virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0;
+
+	template<class T, typename std::enable_if<!protocol7::is_sixup<T>::value, int>::type = 0>
+	inline int SendPackMsg(const T *pMsg, int Flags, int ClientID)
+	{
+		int Result = 0;
+		if(ClientID == -1)
+		{
+			for(int i = 0; i < MaxClients(); i++)
+				if(ClientIngame(i))
+					Result = SendPackMsgTranslate(pMsg, Flags, i);
+		}
+		else
+		{
+			Result = SendPackMsgTranslate(pMsg, Flags, ClientID);
+		}
+		return Result;
+	}
+
+	template<class T, typename std::enable_if<protocol7::is_sixup<T>::value, int>::type = 1>
+	inline int SendPackMsg(const T *pMsg, int Flags, int ClientID)
+	{
+		int Result = 0;
+		if(ClientID == -1)
+		{
+			for(int i = 0; i < MaxClients(); i++)
+				if(ClientIngame(i) && IsSixup(i))
+					Result = SendPackMsgOne(pMsg, Flags, i);
+		}
+		else if(IsSixup(ClientID))
+			Result = SendPackMsgOne(pMsg, Flags, ClientID);
+
+		return Result;
+	}
+
+	template<class T>
+	int SendPackMsgTranslate(const T *pMsg, int Flags, int ClientID)
+	{
+		return SendPackMsgOne(pMsg, Flags, ClientID);
+	}
+
+	int SendPackMsgTranslate(const CNetMsg_Sv_Emoticon *pMsg, int Flags, int ClientID)
+	{
+		CNetMsg_Sv_Emoticon MsgCopy;
+		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
+		return Translate(MsgCopy.m_ClientID, ClientID) && SendPackMsgOne(&MsgCopy, Flags, ClientID);
+	}
+
+	int SendPackMsgTranslate(const CNetMsg_Sv_Chat *pMsg, int Flags, int ClientID)
+	{
+		CNetMsg_Sv_Chat MsgCopy;
+		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
+
+		char aBuf[1000];
+		if(MsgCopy.m_ClientID >= 0 && !Translate(MsgCopy.m_ClientID, ClientID))
+		{
+			str_format(aBuf, sizeof(aBuf), "%s: %s", ClientName(MsgCopy.m_ClientID), MsgCopy.m_pMessage);
+			MsgCopy.m_pMessage = aBuf;
+			MsgCopy.m_ClientID = VANILLA_MAX_CLIENTS - 1;
+		}
+
+		if(IsSixup(ClientID))
+		{
+			protocol7::CNetMsg_Sv_Chat Msg7;
+			Msg7.m_ClientID = MsgCopy.m_ClientID;
+			Msg7.m_pMessage = MsgCopy.m_pMessage;
+			Msg7.m_Mode = MsgCopy.m_Team > 0 ? protocol7::CHAT_TEAM : protocol7::CHAT_ALL;
+			Msg7.m_TargetID = -1;
+			return SendPackMsgOne(&Msg7, Flags, ClientID);
+		}
+
+		return SendPackMsgOne(&MsgCopy, Flags, ClientID);
+	}
+
+	int SendPackMsgTranslate(const CNetMsg_Sv_KillMsg *pMsg, int Flags, int ClientID)
+	{
+		CNetMsg_Sv_KillMsg MsgCopy;
+		mem_copy(&MsgCopy, pMsg, sizeof(MsgCopy));
+		if(!Translate(MsgCopy.m_Victim, ClientID))
+			return 0;
+		if(!Translate(MsgCopy.m_Killer, ClientID))
+			MsgCopy.m_Killer = MsgCopy.m_Victim;
+		return SendPackMsgOne(&MsgCopy, Flags, ClientID);
+	}
+
+	template<class T>
+	int SendPackMsgOne(const T *pMsg, int Flags, int ClientID)
+	{
+		dbg_assert(ClientID != -1, "SendPackMsgOne called with -1");
+		CMsgPacker Packer(T::ms_MsgID, false, protocol7::is_sixup<T>::value);
+
+		if(pMsg->Pack(&Packer))
+			return -1;
+		return SendMsg(&Packer, Flags, ClientID);
+	}
+
+	bool Translate(int &Target, int Client)
+	{
+		if(IsSixup(Client))
+			return true;
+		if(GetClientVersion(Client) >= VERSION_DDNET_OLD)
+			return true;
+		int *pMap = GetIdMap(Client);
+		bool Found = false;
+		for(int i = 0; i < VANILLA_MAX_CLIENTS; i++)
+		{
+			if(Target == pMap[i])
+			{
+				Target = i;
+				Found = true;
+				break;
+			}
+		}
+		return Found;
+	}
+
+	bool ReverseTranslate(int &Target, int Client)
+	{
+		if(IsSixup(Client))
+			return true;
+		if(GetClientVersion(Client) >= VERSION_DDNET_OLD)
+			return true;
+		Target = clamp(Target, 0, VANILLA_MAX_CLIENTS - 1);
+		int *pMap = GetIdMap(Client);
+		if(pMap[Target] == -1)
+			return false;
+		Target = pMap[Target];
+		return true;
+	}
+
+	virtual void GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pSha256, int *pMapCrc) = 0;
+
+	virtual bool WouldClientNameChange(int ClientID, const char *pNameRequest) = 0;
+	virtual bool WouldClientClanChange(int ClientID, const char *pClanRequest) = 0;
+	virtual void SetClientName(int ClientID, const char *pName) = 0;
+	virtual void SetClientClan(int ClientID, const char *pClan) = 0;
+	virtual void SetClientCountry(int ClientID, int Country) = 0;
+	virtual void SetClientScore(int ClientID, std::optional<int> Score) = 0;
+	virtual void SetClientFlags(int ClientID, int Flags) = 0;
+
+	virtual int SnapNewID() = 0;
+	virtual void SnapFreeID(int ID) = 0;
+	virtual void *SnapNewItem(int Type, int ID, int Size) = 0;
+
+	template<typename T>
+	T *SnapNewItem(int ID)
+	{
+		const int Type = protocol7::is_sixup<T>::value ? -T::ms_MsgID : T::ms_MsgID;
+		return static_cast<T *>(SnapNewItem(Type, ID, sizeof(T)));
+	}
+
+	virtual void SnapSetStaticsize(int ItemType, int Size) = 0;
+
+	enum
+	{
+		RCON_CID_SERV = -1,
+		RCON_CID_VOTE = -2,
+	};
+	virtual void SetRconCID(int ClientID) = 0;
+	virtual int GetAuthedState(int ClientID) const = 0;
+	virtual const char *GetAuthName(int ClientID) const = 0;
+	virtual void Kick(int ClientID, const char *pReason) = 0;
+	virtual void Ban(int ClientID, int Seconds, const char *pReason) = 0;
+	virtual void RedirectClient(int ClientID, int Port, bool Verbose = false) = 0;
+	virtual void ChangeMap(const char *pMap) = 0;
+
+	virtual void DemoRecorder_HandleAutoStart() = 0;
+
+	// DDRace
+
+	virtual void SaveDemo(int ClientID, float Time) = 0;
+	virtual void StartRecord(int ClientID) = 0;
+	virtual void StopRecord(int ClientID) = 0;
+	virtual bool IsRecording(int ClientID) = 0;
+	virtual void StopDemos() = 0;
+
+	virtual void GetClientAddr(int ClientID, NETADDR *pAddr) const = 0;
+
+	virtual int *GetIdMap(int ClientID) = 0;
+
+	virtual bool DnsblWhite(int ClientID) = 0;
+	virtual bool DnsblPending(int ClientID) = 0;
+	virtual bool DnsblBlack(int ClientID) = 0;
+	virtual const char *GetAnnouncementLine(const char *pFileName) = 0;
+	virtual bool ClientPrevIngame(int ClientID) = 0;
+	virtual const char *GetNetErrorString(int ClientID) = 0;
+	virtual void ResetNetErrorString(int ClientID) = 0;
+	virtual bool SetTimedOut(int ClientID, int OrigID) = 0;
+	virtual void SetTimeoutProtected(int ClientID) = 0;
+
+	virtual void SetErrorShutdown(const char *pReason) = 0;
+	virtual void ExpireServerInfo() = 0;
+
+	virtual void FillAntibot(CAntibotRoundData *pData) = 0;
+
+	virtual void SendMsgRaw(int ClientID, const void *pData, int Size, int Flags) = 0;
+
+	virtual const char *GetMapName() const = 0;
+
+	virtual bool IsSixup(int ClientID) const = 0;
+};
+
+class IGameServer : public IInterface
+{
+	MACRO_INTERFACE("gameserver")
+protected:
+public:
+	// `pPersistentData` may be null if this is the first time `IGameServer`
+	// is instantiated.
+	virtual void OnInit(const void *pPersistentData) = 0;
+	virtual void OnConsoleInit() = 0;
+	virtual void OnMapChange(char *pNewMapName, int MapNameSize) = 0;
+	// `pPersistentData` may be null if this is the last time `IGameServer`
+	// is destroyed.
+	virtual void OnShutdown(void *pPersistentData) = 0;
+
+	virtual void OnTick() = 0;
+	virtual void OnPreSnap() = 0;
+	virtual void OnSnap(int ClientID) = 0;
+	virtual void OnPostSnap() = 0;
+
+	virtual void OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) = 0;
+
+	// Called before map reload, for any data that the game wants to
+	// persist to the next map.
+	//
+	// Has the size of the return value of `PersistentClientDataSize()`.
+	//
+	// Returns whether the game should be supplied with the data when the
+	// client connects for the next map.
+	virtual bool OnClientDataPersist(int ClientID, void *pData) = 0;
+
+	// Called when a client connects.
+	//
+	// If it is reconnecting to the game after a map change, the
+	// `pPersistentData` point is nonnull and contains the data the game
+	// previously stored.
+	virtual void OnClientConnected(int ClientID, void *pPersistentData) = 0;
+
+	virtual void OnClientEnter(int ClientID) = 0;
+	virtual void OnClientDrop(int ClientID, const char *pReason) = 0;
+	virtual void OnClientPrepareInput(int ClientID, void *pInput) = 0;
+	virtual void OnClientDirectInput(int ClientID, void *pInput) = 0;
+	virtual void OnClientPredictedInput(int ClientID, void *pInput) = 0;
+	virtual void OnClientPredictedEarlyInput(int ClientID, void *pInput) = 0;
+
+	virtual bool IsClientReady(int ClientID) const = 0;
+	virtual bool IsClientPlayer(int ClientID) const = 0;
+
+	virtual int PersistentDataSize() const = 0;
+	virtual int PersistentClientDataSize() const = 0;
+
+	virtual CUuid GameUuid() const = 0;
+	virtual const char *GameType() const = 0;
+	virtual const char *Version() const = 0;
+	virtual const char *NetVersion() const = 0;
+
+	// DDRace
+
+	virtual void OnPreTickTeehistorian() = 0;
+
+	virtual void OnSetAuthed(int ClientID, int Level) = 0;
+	virtual bool PlayerExists(int ClientID) const = 0;
+
+	virtual void TeehistorianRecordAntibot(const void *pData, int DataSize) = 0;
+	virtual void TeehistorianRecordPlayerJoin(int ClientID, bool Sixup) = 0;
+	virtual void TeehistorianRecordPlayerDrop(int ClientID, const char *pReason) = 0;
+	virtual void TeehistorianRecordPlayerRejoin(int ClientID) = 0;
+
+	virtual void FillAntibot(CAntibotRoundData *pData) = 0;
+
+	/**
+	 * Used to report custom player info to master servers.
+	 *
+	 * @param aBuf Should be the json key values to add, starting with a ',' beforehand, like: ',"skin": "default", "team": 1'
+	 * @param i The client id.
+	 */
+	virtual void OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID) = 0;
+};
+
+extern IGameServer *CreateGameServer();
+#endif
diff --git a/src_bkp/engine/server/antibot.cpp b/src_bkp/engine/server/antibot.cpp
new file mode 100644
index 0000000000..238e8420f5
--- /dev/null
+++ b/src_bkp/engine/server/antibot.cpp
@@ -0,0 +1,269 @@
+#include "antibot.h"
+
+#include <antibot/antibot_interface.h>
+
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/kernel.h>
+#include <engine/server.h>
+
+class IEngineAntibot;
+
+#ifdef CONF_ANTIBOT
+CAntibot::CAntibot() :
+	m_pServer(0), m_pConsole(0), m_pGameServer(0), m_Initialized(false)
+{
+}
+CAntibot::~CAntibot()
+{
+	if(m_pGameServer)
+		free(m_RoundData.m_Map.m_pTiles);
+
+	if(m_Initialized)
+		AntibotDestroy();
+}
+void CAntibot::Kick(int ClientID, const char *pMessage, void *pUser)
+{
+	CAntibot *pAntibot = (CAntibot *)pUser;
+	pAntibot->Server()->Kick(ClientID, pMessage);
+}
+void CAntibot::Log(const char *pMessage, void *pUser)
+{
+	CAntibot *pAntibot = (CAntibot *)pUser;
+	pAntibot->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "antibot", pMessage);
+}
+void CAntibot::Report(int ClientID, const char *pMessage, void *pUser)
+{
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "%d: %s", ClientID, pMessage);
+	Log(aBuf, pUser);
+}
+void CAntibot::Send(int ClientID, const void *pData, int Size, int Flags, void *pUser)
+{
+	CAntibot *pAntibot = (CAntibot *)pUser;
+
+	int RealFlags = MSGFLAG_VITAL;
+	if(Flags & ANTIBOT_MSGFLAG_NONVITAL)
+	{
+		RealFlags &= ~MSGFLAG_VITAL;
+	}
+	if(Flags & ANTIBOT_MSGFLAG_FLUSH)
+	{
+		RealFlags |= MSGFLAG_FLUSH;
+	}
+	pAntibot->Server()->SendMsgRaw(ClientID, pData, Size, RealFlags);
+}
+void CAntibot::Teehistorian(const void *pData, int Size, void *pUser)
+{
+	CAntibot *pAntibot = (CAntibot *)pUser;
+	pAntibot->m_pGameServer->TeehistorianRecordAntibot(pData, Size);
+}
+void CAntibot::Init()
+{
+	m_pServer = Kernel()->RequestInterface<IServer>();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	dbg_assert(m_pServer && m_pConsole, "antibot requires server and console");
+	dbg_assert(AntibotAbiVersion() == ANTIBOT_ABI_VERSION, "antibot abi version mismatch");
+
+	mem_zero(&m_Data, sizeof(m_Data));
+	CAntibotVersion Version = ANTIBOT_VERSION;
+	m_Data.m_Version = Version;
+
+	m_Data.m_Now = time_get();
+	m_Data.m_Freq = time_freq();
+	m_Data.m_pfnKick = Kick;
+	m_Data.m_pfnLog = Log;
+	m_Data.m_pfnReport = Report;
+	m_Data.m_pfnSend = Send;
+	m_Data.m_pfnTeehistorian = Teehistorian;
+	m_Data.m_pUser = this;
+	AntibotInit(&m_Data);
+
+	m_Initialized = true;
+}
+void CAntibot::RoundStart(IGameServer *pGameServer)
+{
+	m_pGameServer = pGameServer;
+	mem_zero(&m_RoundData, sizeof(m_RoundData));
+	m_RoundData.m_Map.m_pTiles = 0;
+	AntibotRoundStart(&m_RoundData);
+	Update();
+}
+void CAntibot::RoundEnd()
+{
+	// Let the external module clean up first
+	AntibotRoundEnd();
+
+	m_pGameServer = 0;
+	free(m_RoundData.m_Map.m_pTiles);
+}
+void CAntibot::ConsoleCommand(const char *pCommand)
+{
+	AntibotConsoleCommand(pCommand);
+}
+void CAntibot::Update()
+{
+	m_Data.m_Now = time_get();
+	m_Data.m_Freq = time_freq();
+
+	Server()->FillAntibot(&m_RoundData);
+	if(GameServer())
+	{
+		GameServer()->FillAntibot(&m_RoundData);
+		AntibotUpdateData();
+	}
+}
+
+void CAntibot::OnPlayerInit(int ClientID)
+{
+	Update();
+	AntibotOnPlayerInit(ClientID);
+}
+void CAntibot::OnPlayerDestroy(int ClientID)
+{
+	Update();
+	AntibotOnPlayerDestroy(ClientID);
+}
+void CAntibot::OnSpawn(int ClientID)
+{
+	Update();
+	AntibotOnSpawn(ClientID);
+}
+void CAntibot::OnHammerFireReloading(int ClientID)
+{
+	Update();
+	AntibotOnHammerFireReloading(ClientID);
+}
+void CAntibot::OnHammerFire(int ClientID)
+{
+	Update();
+	AntibotOnHammerFire(ClientID);
+}
+void CAntibot::OnHammerHit(int ClientID, int TargetID)
+{
+	Update();
+	AntibotOnHammerHit(ClientID, TargetID);
+}
+void CAntibot::OnDirectInput(int ClientID)
+{
+	Update();
+	AntibotOnDirectInput(ClientID);
+}
+void CAntibot::OnCharacterTick(int ClientID)
+{
+	Update();
+	AntibotOnCharacterTick(ClientID);
+}
+void CAntibot::OnHookAttach(int ClientID, bool Player)
+{
+	Update();
+	AntibotOnHookAttach(ClientID, Player);
+}
+
+void CAntibot::OnEngineTick()
+{
+	Update();
+	AntibotOnEngineTick();
+}
+void CAntibot::OnEngineClientJoin(int ClientID, bool Sixup)
+{
+	Update();
+	AntibotOnEngineClientJoin(ClientID, Sixup);
+}
+void CAntibot::OnEngineClientDrop(int ClientID, const char *pReason)
+{
+	Update();
+	AntibotOnEngineClientDrop(ClientID, pReason);
+}
+bool CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags)
+{
+	Update();
+	int AntibotFlags = 0;
+	if((Flags & MSGFLAG_VITAL) == 0)
+	{
+		AntibotFlags |= ANTIBOT_MSGFLAG_NONVITAL;
+	}
+	return AntibotOnEngineClientMessage(ClientID, pData, Size, AntibotFlags);
+}
+bool CAntibot::OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags)
+{
+	Update();
+	int AntibotFlags = 0;
+	if((Flags & MSGFLAG_VITAL) == 0)
+	{
+		AntibotFlags |= ANTIBOT_MSGFLAG_NONVITAL;
+	}
+	return AntibotOnEngineServerMessage(ClientID, pData, Size, AntibotFlags);
+}
+bool CAntibot::OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags)
+{
+	int AntibotFlags = 0;
+	bool Result = AntibotOnEngineSimulateClientMessage(pClientID, pBuffer, BufferSize, pOutSize, &AntibotFlags);
+	if(Result)
+	{
+		*pFlags = 0;
+		if((AntibotFlags & ANTIBOT_MSGFLAG_NONVITAL) == 0)
+		{
+			*pFlags |= MSGFLAG_VITAL;
+		}
+	}
+	return Result;
+}
+#else
+CAntibot::CAntibot() :
+	m_pServer(0), m_pConsole(0), m_pGameServer(0), m_Initialized(false)
+{
+}
+CAntibot::~CAntibot() = default;
+void CAntibot::Init()
+{
+	m_pServer = Kernel()->RequestInterface<IServer>();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	dbg_assert(m_pServer && m_pConsole, "antibot requires server and console");
+}
+void CAntibot::RoundStart(IGameServer *pGameServer)
+{
+	m_pGameServer = pGameServer;
+}
+void CAntibot::RoundEnd()
+{
+	m_pGameServer = 0;
+}
+void CAntibot::ConsoleCommand(const char *pCommand)
+{
+	if(str_comp(pCommand, "dump") == 0)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "antibot", "antibot support not compiled in");
+	}
+	else
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "antibot", "unknown command");
+	}
+}
+void CAntibot::Update()
+{
+}
+
+void CAntibot::OnPlayerInit(int ClientID) {}
+void CAntibot::OnPlayerDestroy(int ClientID) {}
+void CAntibot::OnSpawn(int ClientID) {}
+void CAntibot::OnHammerFireReloading(int ClientID) {}
+void CAntibot::OnHammerFire(int ClientID) {}
+void CAntibot::OnHammerHit(int ClientID, int TargetID) {}
+void CAntibot::OnDirectInput(int ClientID) {}
+void CAntibot::OnCharacterTick(int ClientID) {}
+void CAntibot::OnHookAttach(int ClientID, bool Player) {}
+
+void CAntibot::OnEngineTick() {}
+void CAntibot::OnEngineClientJoin(int ClientID, bool Sixup) {}
+void CAntibot::OnEngineClientDrop(int ClientID, const char *pReason) {}
+bool CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) { return false; }
+bool CAntibot::OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) { return false; }
+bool CAntibot::OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) { return false; }
+#endif
+
+IEngineAntibot *CreateEngineAntibot()
+{
+	return new CAntibot;
+}
diff --git a/src_bkp/engine/server/antibot.h b/src_bkp/engine/server/antibot.h
new file mode 100644
index 0000000000..00af4b0aee
--- /dev/null
+++ b/src_bkp/engine/server/antibot.h
@@ -0,0 +1,61 @@
+#ifndef ENGINE_SERVER_ANTIBOT_H
+#define ENGINE_SERVER_ANTIBOT_H
+
+#include <antibot/antibot_data.h>
+#include <engine/antibot.h>
+
+class CAntibot : public IEngineAntibot
+{
+	class IServer *m_pServer;
+	class IConsole *m_pConsole;
+	class IGameServer *m_pGameServer;
+
+	class IServer *Server() const { return m_pServer; }
+	class IConsole *Console() const { return m_pConsole; }
+	class IGameServer *GameServer() const { return m_pGameServer; }
+
+	CAntibotData m_Data;
+	CAntibotRoundData m_RoundData;
+	bool m_Initialized;
+
+	void Update();
+	static void Kick(int ClientID, const char *pMessage, void *pUser);
+	static void Log(const char *pMessage, void *pUser);
+	static void Report(int ClientID, const char *pMessage, void *pUser);
+	static void Send(int ClientID, const void *pData, int Size, int Flags, void *pUser);
+	static void Teehistorian(const void *pData, int Size, void *pUser);
+
+public:
+	CAntibot();
+	virtual ~CAntibot();
+
+	// Engine
+	void Init() override;
+
+	void OnEngineTick() override;
+	void OnEngineClientJoin(int ClientID, bool Sixup) override;
+	void OnEngineClientDrop(int ClientID, const char *pReason) override;
+	bool OnEngineClientMessage(int ClientID, const void *pData, int Size, int Flags) override;
+	bool OnEngineServerMessage(int ClientID, const void *pData, int Size, int Flags) override;
+	bool OnEngineSimulateClientMessage(int *pClientID, void *pBuffer, int BufferSize, int *pOutSize, int *pFlags) override;
+
+	// Game
+	void RoundStart(class IGameServer *pGameServer) override;
+	void RoundEnd() override;
+
+	void OnPlayerInit(int ClientID) override;
+	void OnPlayerDestroy(int ClientID) override;
+	void OnSpawn(int ClientID) override;
+	void OnHammerFireReloading(int ClientID) override;
+	void OnHammerFire(int ClientID) override;
+	void OnHammerHit(int ClientID, int TargetID) override;
+	void OnDirectInput(int ClientID) override;
+	void OnCharacterTick(int ClientID) override;
+	void OnHookAttach(int ClientID, bool Player) override;
+
+	void ConsoleCommand(const char *pCommand) override;
+};
+
+extern IEngineAntibot *CreateEngineAntibot();
+
+#endif // ENGINE_SERVER_ANTIBOT_H
diff --git a/src_bkp/engine/server/authmanager.cpp b/src_bkp/engine/server/authmanager.cpp
new file mode 100644
index 0000000000..59f1bc3c5a
--- /dev/null
+++ b/src_bkp/engine/server/authmanager.cpp
@@ -0,0 +1,172 @@
+#include "authmanager.h"
+#include <base/hash_ctxt.h>
+#include <base/system.h>
+#include <engine/shared/config.h>
+#include <game/generated/protocol.h>
+
+#define ADMIN_IDENT "default_admin"
+#define MOD_IDENT "default_mod"
+#define HELPER_IDENT "default_helper"
+
+static MD5_DIGEST HashPassword(const char *pPassword, const unsigned char aSalt[SALT_BYTES])
+{
+	// Hash the password and the salt
+	MD5_CTX Md5;
+	md5_init(&Md5);
+	md5_update(&Md5, (unsigned char *)pPassword, str_length(pPassword));
+	md5_update(&Md5, aSalt, SALT_BYTES);
+	return md5_finish(&Md5);
+}
+
+CAuthManager::CAuthManager()
+{
+	m_aDefault[0] = -1;
+	m_aDefault[1] = -1;
+	m_aDefault[2] = -1;
+	m_Generated = false;
+}
+
+void CAuthManager::Init()
+{
+	size_t NumDefaultKeys = 0;
+	if(g_Config.m_SvRconPassword[0])
+		NumDefaultKeys++;
+	if(g_Config.m_SvRconModPassword[0])
+		NumDefaultKeys++;
+	if(g_Config.m_SvRconHelperPassword[0])
+		NumDefaultKeys++;
+	if(m_vKeys.size() == NumDefaultKeys && !g_Config.m_SvRconPassword[0])
+	{
+		secure_random_password(g_Config.m_SvRconPassword, sizeof(g_Config.m_SvRconPassword), 6);
+		AddDefaultKey(AUTHED_ADMIN, g_Config.m_SvRconPassword);
+		m_Generated = true;
+	}
+}
+
+int CAuthManager::AddKeyHash(const char *pIdent, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel)
+{
+	if(FindKey(pIdent) >= 0)
+		return -1;
+
+	CKey Key;
+	str_copy(Key.m_aIdent, pIdent);
+	Key.m_Pw = Hash;
+	mem_copy(Key.m_aSalt, pSalt, SALT_BYTES);
+	Key.m_Level = AuthLevel;
+
+	m_vKeys.push_back(Key);
+	return m_vKeys.size() - 1;
+}
+
+int CAuthManager::AddKey(const char *pIdent, const char *pPw, int AuthLevel)
+{
+	// Generate random salt
+	unsigned char aSalt[SALT_BYTES];
+	secure_random_fill(aSalt, SALT_BYTES);
+	return AddKeyHash(pIdent, HashPassword(pPw, aSalt), aSalt, AuthLevel);
+}
+
+void CAuthManager::RemoveKey(int Slot)
+{
+	m_vKeys.erase(m_vKeys.begin() + Slot);
+	// Update indices of default keys
+	for(int &Default : m_aDefault)
+	{
+		if(Default == Slot)
+		{
+			Default = -1;
+		}
+		else if(Default > Slot)
+		{
+			--Default;
+		}
+	}
+}
+
+int CAuthManager::FindKey(const char *pIdent) const
+{
+	for(size_t i = 0; i < m_vKeys.size(); i++)
+		if(!str_comp(m_vKeys[i].m_aIdent, pIdent))
+			return i;
+
+	return -1;
+}
+
+bool CAuthManager::CheckKey(int Slot, const char *pPw) const
+{
+	if(Slot < 0 || Slot >= (int)m_vKeys.size())
+		return false;
+	return m_vKeys[Slot].m_Pw == HashPassword(pPw, m_vKeys[Slot].m_aSalt);
+}
+
+int CAuthManager::DefaultKey(int AuthLevel) const
+{
+	if(AuthLevel < 0 || AuthLevel > AUTHED_ADMIN)
+		return 0;
+	return m_aDefault[AUTHED_ADMIN - AuthLevel];
+}
+
+int CAuthManager::KeyLevel(int Slot) const
+{
+	if(Slot < 0 || Slot >= (int)m_vKeys.size())
+		return false;
+	return m_vKeys[Slot].m_Level;
+}
+
+const char *CAuthManager::KeyIdent(int Slot) const
+{
+	if(Slot < 0 || Slot >= (int)m_vKeys.size())
+		return NULL;
+	return m_vKeys[Slot].m_aIdent;
+}
+
+void CAuthManager::UpdateKeyHash(int Slot, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel)
+{
+	if(Slot < 0 || Slot >= (int)m_vKeys.size())
+		return;
+
+	CKey *pKey = &m_vKeys[Slot];
+	pKey->m_Pw = Hash;
+	mem_copy(pKey->m_aSalt, pSalt, SALT_BYTES);
+	pKey->m_Level = AuthLevel;
+}
+
+void CAuthManager::UpdateKey(int Slot, const char *pPw, int AuthLevel)
+{
+	if(Slot < 0 || Slot >= (int)m_vKeys.size())
+		return;
+
+	// Generate random salt
+	unsigned char aSalt[SALT_BYTES];
+	secure_random_fill(aSalt, SALT_BYTES);
+	UpdateKeyHash(Slot, HashPassword(pPw, aSalt), aSalt, AuthLevel);
+}
+
+void CAuthManager::ListKeys(FListCallback pfnListCallback, void *pUser)
+{
+	for(auto &Key : m_vKeys)
+		pfnListCallback(Key.m_aIdent, Key.m_Level, pUser);
+}
+
+void CAuthManager::AddDefaultKey(int Level, const char *pPw)
+{
+	if(Level < AUTHED_HELPER || Level > AUTHED_ADMIN)
+		return;
+
+	static const char s_aaIdents[3][sizeof(HELPER_IDENT)] = {ADMIN_IDENT, MOD_IDENT, HELPER_IDENT};
+	int Index = AUTHED_ADMIN - Level;
+	if(m_aDefault[Index] >= 0)
+		return; // already exists
+	m_aDefault[Index] = AddKey(s_aaIdents[Index], pPw, Level);
+}
+
+bool CAuthManager::IsGenerated() const
+{
+	return m_Generated;
+}
+
+int CAuthManager::NumNonDefaultKeys() const
+{
+	int DefaultCount = (m_aDefault[0] >= 0) + (m_aDefault[1] >= 0) + (m_aDefault[2] >= 0);
+	return m_vKeys.size() - DefaultCount;
+}
diff --git a/src_bkp/engine/server/authmanager.h b/src_bkp/engine/server/authmanager.h
new file mode 100644
index 0000000000..9845100e8e
--- /dev/null
+++ b/src_bkp/engine/server/authmanager.h
@@ -0,0 +1,47 @@
+#ifndef ENGINE_SERVER_AUTHMANAGER_H
+#define ENGINE_SERVER_AUTHMANAGER_H
+
+#include <vector>
+
+#include <base/hash.h>
+
+#define SALT_BYTES 8
+
+class CAuthManager
+{
+private:
+	struct CKey
+	{
+		char m_aIdent[64];
+		MD5_DIGEST m_Pw;
+		unsigned char m_aSalt[SALT_BYTES];
+		int m_Level;
+	};
+	std::vector<CKey> m_vKeys;
+
+	int m_aDefault[3];
+	bool m_Generated;
+
+public:
+	typedef void (*FListCallback)(const char *pIdent, int Level, void *pUser);
+
+	CAuthManager();
+
+	void Init();
+	int AddKeyHash(const char *pIdent, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel);
+	int AddKey(const char *pIdent, const char *pPw, int AuthLevel);
+	void RemoveKey(int Slot);
+	int FindKey(const char *pIdent) const;
+	bool CheckKey(int Slot, const char *pPw) const;
+	int DefaultKey(int AuthLevel) const;
+	int KeyLevel(int Slot) const;
+	const char *KeyIdent(int Slot) const;
+	void UpdateKeyHash(int Slot, MD5_DIGEST Hash, const unsigned char *pSalt, int AuthLevel);
+	void UpdateKey(int Slot, const char *pPw, int AuthLevel);
+	void ListKeys(FListCallback pfnListCallbac, void *pUser);
+	void AddDefaultKey(int Level, const char *pPw);
+	bool IsGenerated() const;
+	int NumNonDefaultKeys() const;
+};
+
+#endif //ENGINE_SERVER_AUTHMANAGER_H
diff --git a/src_bkp/engine/server/databases/connection.cpp b/src_bkp/engine/server/databases/connection.cpp
new file mode 100644
index 0000000000..ac124baa49
--- /dev/null
+++ b/src_bkp/engine/server/databases/connection.cpp
@@ -0,0 +1,94 @@
+#include "connection.h"
+
+#include <engine/shared/protocol.h>
+
+IDbConnection::IDbConnection(const char *pPrefix)
+{
+	str_copy(m_aPrefix, pPrefix);
+}
+
+void IDbConnection::FormatCreateRace(char *aBuf, unsigned int BufferSize, bool Backup) const
+{
+	str_format(aBuf, BufferSize,
+		"CREATE TABLE IF NOT EXISTS %s_race%s ("
+		"  Map VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Name VARCHAR(%d) COLLATE %s NOT NULL, "
+		"  Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
+		"  Time FLOAT DEFAULT 0, "
+		"  Server CHAR(4), "
+		"  cp1 FLOAT DEFAULT 0, cp2 FLOAT DEFAULT 0, cp3 FLOAT DEFAULT 0, "
+		"  cp4 FLOAT DEFAULT 0, cp5 FLOAT DEFAULT 0, cp6 FLOAT DEFAULT 0, "
+		"  cp7 FLOAT DEFAULT 0, cp8 FLOAT DEFAULT 0, cp9 FLOAT DEFAULT 0, "
+		"  cp10 FLOAT DEFAULT 0, cp11 FLOAT DEFAULT 0, cp12 FLOAT DEFAULT 0, "
+		"  cp13 FLOAT DEFAULT 0, cp14 FLOAT DEFAULT 0, cp15 FLOAT DEFAULT 0, "
+		"  cp16 FLOAT DEFAULT 0, cp17 FLOAT DEFAULT 0, cp18 FLOAT DEFAULT 0, "
+		"  cp19 FLOAT DEFAULT 0, cp20 FLOAT DEFAULT 0, cp21 FLOAT DEFAULT 0, "
+		"  cp22 FLOAT DEFAULT 0, cp23 FLOAT DEFAULT 0, cp24 FLOAT DEFAULT 0, "
+		"  cp25 FLOAT DEFAULT 0, "
+		"  GameID VARCHAR(64), "
+		"  DDNet7 BOOL DEFAULT FALSE, "
+		"  PRIMARY KEY (Map, Name, Time, Timestamp, Server)"
+		")",
+		GetPrefix(), Backup ? "_backup" : "",
+		BinaryCollate(), MAX_NAME_LENGTH, BinaryCollate());
+}
+
+void IDbConnection::FormatCreateTeamrace(char *aBuf, unsigned int BufferSize, const char *pIdType, bool Backup) const
+{
+	str_format(aBuf, BufferSize,
+		"CREATE TABLE IF NOT EXISTS %s_teamrace%s ("
+		"  Map VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Name VARCHAR(%d) COLLATE %s NOT NULL, "
+		"  Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
+		"  Time FLOAT DEFAULT 0, "
+		"  ID %s NOT NULL, " // VARBINARY(16) for MySQL and BLOB for SQLite
+		"  GameID VARCHAR(64), "
+		"  DDNet7 BOOL DEFAULT FALSE, "
+		"  PRIMARY KEY (ID, Name)"
+		")",
+		GetPrefix(), Backup ? "_backup" : "",
+		BinaryCollate(), MAX_NAME_LENGTH, BinaryCollate(), pIdType);
+}
+
+void IDbConnection::FormatCreateMaps(char *aBuf, unsigned int BufferSize) const
+{
+	str_format(aBuf, BufferSize,
+		"CREATE TABLE IF NOT EXISTS %s_maps ("
+		"  Map VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Server VARCHAR(32) COLLATE %s NOT NULL, "
+		"  Mapper VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Points INT DEFAULT 0, "
+		"  Stars INT DEFAULT 0, "
+		"  Timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, "
+		"  PRIMARY KEY (Map)"
+		")",
+		GetPrefix(), BinaryCollate(), BinaryCollate(), BinaryCollate());
+}
+
+void IDbConnection::FormatCreateSaves(char *aBuf, unsigned int BufferSize, bool Backup) const
+{
+	str_format(aBuf, BufferSize,
+		"CREATE TABLE IF NOT EXISTS %s_saves%s ("
+		"  Savegame TEXT COLLATE %s NOT NULL, "
+		"  Map VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Code VARCHAR(128) COLLATE %s NOT NULL, "
+		"  Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
+		"  Server CHAR(4), "
+		"  DDNet7 BOOL DEFAULT FALSE, "
+		"  SaveID VARCHAR(36) DEFAULT NULL, "
+		"  PRIMARY KEY (Map, Code)"
+		")",
+		GetPrefix(), Backup ? "_backup" : "",
+		BinaryCollate(), BinaryCollate(), BinaryCollate());
+}
+
+void IDbConnection::FormatCreatePoints(char *aBuf, unsigned int BufferSize) const
+{
+	str_format(aBuf, BufferSize,
+		"CREATE TABLE IF NOT EXISTS %s_points ("
+		"  Name VARCHAR(%d) COLLATE %s NOT NULL, "
+		"  Points INT DEFAULT 0, "
+		"  PRIMARY KEY (Name)"
+		")",
+		GetPrefix(), MAX_NAME_LENGTH, BinaryCollate());
+}
diff --git a/src_bkp/engine/server/databases/connection.h b/src_bkp/engine/server/databases/connection.h
new file mode 100644
index 0000000000..a2da8e0daf
--- /dev/null
+++ b/src_bkp/engine/server/databases/connection.h
@@ -0,0 +1,102 @@
+#ifndef ENGINE_SERVER_DATABASES_CONNECTION_H
+#define ENGINE_SERVER_DATABASES_CONNECTION_H
+
+#include "connection_pool.h"
+
+#include <memory>
+
+class IConsole;
+
+// can hold one PreparedStatement with Results
+class IDbConnection
+{
+public:
+	IDbConnection(const char *pPrefix);
+	virtual ~IDbConnection() {}
+	IDbConnection &operator=(const IDbConnection &) = delete;
+	virtual void Print(IConsole *pConsole, const char *pMode) = 0;
+
+	// returns the database prefix
+	const char *GetPrefix() const { return m_aPrefix; }
+	virtual const char *BinaryCollate() const = 0;
+	// can be inserted into queries to convert a timestamp variable to the unix timestamp
+	virtual void ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize) = 0;
+	// since MySQL automatically converts timestamps to utc, meanwhile sqlite code has to
+	// explicitly convert before inserting timestamps, NOTE: CURRENT_TIMESTAMP in SQLite is UTC by
+	// default and doesn't have to be converted
+	virtual const char *InsertTimestampAsUtc() const = 0;
+	// can be used in the context of `LIKE Map`, adds `? COLLATE`
+	virtual const char *CollateNocase() const = 0;
+	// syntax to insert a row into table or ignore if it already exists
+	virtual const char *InsertIgnore() const = 0;
+	// ORDER BY RANDOM()/RAND()
+	virtual const char *Random() const = 0;
+	// Get Median Map Time from l.Map
+	virtual const char *MedianMapTime(char *pBuffer, int BufferSize) const = 0;
+	virtual const char *False() const = 0;
+	virtual const char *True() const = 0;
+
+	// tries to allocate the connection from the pool established
+	//
+	// returns true on failure
+	virtual bool Connect(char *pError, int ErrorSize) = 0;
+	// has to be called to return the connection back to the pool
+	virtual void Disconnect() = 0;
+
+	// ? for Placeholders, connection has to be established, can overwrite previous prepared statements
+	//
+	// returns true on failure
+	virtual bool PrepareStatement(const char *pStmt, char *pError, int ErrorSize) = 0;
+
+	// PrepareStatement has to be called beforehand,
+	virtual void BindString(int Idx, const char *pString) = 0;
+	virtual void BindBlob(int Idx, unsigned char *pBlob, int Size) = 0;
+	virtual void BindInt(int Idx, int Value) = 0;
+	virtual void BindInt64(int Idx, int64_t Value) = 0;
+	virtual void BindFloat(int Idx, float Value) = 0;
+
+	// Print expanded sql statement
+	virtual void Print() = 0;
+
+	// executes the query and returns if a result row exists and selects it
+	// when called multiple times the next row is selected
+	//
+	// returns true on failure
+	virtual bool Step(bool *pEnd, char *pError, int ErrorSize) = 0;
+	// executes the query and returns the number of rows affected by the update/insert/delete
+	//
+	// returns true on failure
+	virtual bool ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize) = 0;
+
+	virtual bool IsNull(int Col) = 0;
+	virtual float GetFloat(int Col) = 0;
+	virtual int GetInt(int Col) = 0;
+	virtual int64_t GetInt64(int Col) = 0;
+	// ensures that the string is null terminated
+	virtual void GetString(int Col, char *pBuffer, int BufferSize) = 0;
+	// returns number of bytes read into the buffer
+	virtual int GetBlob(int Col, unsigned char *pBuffer, int BufferSize) = 0;
+
+	// SQL statements, that can't be abstracted, has side effects to the result
+	virtual bool AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize) = 0;
+
+private:
+	char m_aPrefix[64];
+
+protected:
+	void FormatCreateRace(char *aBuf, unsigned int BufferSize, bool Backup) const;
+	void FormatCreateTeamrace(char *aBuf, unsigned int BufferSize, const char *pIdType, bool Backup) const;
+	void FormatCreateMaps(char *aBuf, unsigned int BufferSize) const;
+	void FormatCreateSaves(char *aBuf, unsigned int BufferSize, bool Backup) const;
+	void FormatCreatePoints(char *aBuf, unsigned int BufferSize) const;
+};
+
+bool MysqlAvailable();
+int MysqlInit();
+void MysqlUninit();
+
+std::unique_ptr<IDbConnection> CreateSqliteConnection(const char *pFilename, bool Setup);
+// Returns nullptr if MySQL support is not compiled in.
+std::unique_ptr<IDbConnection> CreateMysqlConnection(CMysqlConfig Config);
+
+#endif // ENGINE_SERVER_DATABASES_CONNECTION_H
diff --git a/src_bkp/engine/server/databases/connection_pool.cpp b/src_bkp/engine/server/databases/connection_pool.cpp
new file mode 100644
index 0000000000..2ea2e3d9e1
--- /dev/null
+++ b/src_bkp/engine/server/databases/connection_pool.cpp
@@ -0,0 +1,481 @@
+#include "connection_pool.h"
+#include "connection.h"
+
+#include <base/system.h>
+#include <cstring>
+#include <engine/console.h>
+
+#include <chrono>
+#include <iterator>
+#include <memory>
+#include <thread>
+#include <vector>
+
+using namespace std::chrono_literals;
+
+// helper struct to hold thread data
+struct CSqlExecData
+{
+	CSqlExecData(
+		CDbConnectionPool::FRead pFunc,
+		std::unique_ptr<const ISqlData> pThreadData,
+		const char *pName);
+	CSqlExecData(
+		CDbConnectionPool::FWrite pFunc,
+		std::unique_ptr<const ISqlData> pThreadData,
+		const char *pName);
+	CSqlExecData(
+		CDbConnectionPool::Mode m,
+		const char aFileName[64]);
+	CSqlExecData(
+		CDbConnectionPool::Mode m,
+		const CMysqlConfig *pMysqlConfig);
+	CSqlExecData(IConsole *pConsole, CDbConnectionPool::Mode m);
+	~CSqlExecData() = default;
+
+	enum
+	{
+		READ_ACCESS,
+		WRITE_ACCESS,
+		ADD_MYSQL,
+		ADD_SQLITE,
+		PRINT,
+	} m_Mode;
+	union
+	{
+		CDbConnectionPool::FRead m_pReadFunc;
+		CDbConnectionPool::FWrite m_pWriteFunc;
+		struct
+		{
+			CDbConnectionPool::Mode m_Mode;
+			CMysqlConfig m_Config;
+		} m_MySql;
+		struct
+		{
+			CDbConnectionPool::Mode m_Mode;
+			char m_FileName[64];
+		} m_Sqlite;
+		struct
+		{
+			IConsole *m_pConsole;
+			CDbConnectionPool::Mode m_Mode;
+		} m_Print;
+	} m_Ptr;
+
+	std::unique_ptr<const ISqlData> m_pThreadData;
+	const char *m_pName;
+};
+
+CSqlExecData::CSqlExecData(
+	CDbConnectionPool::FRead pFunc,
+	std::unique_ptr<const ISqlData> pThreadData,
+	const char *pName) :
+	m_Mode(READ_ACCESS),
+	m_pThreadData(std::move(pThreadData)),
+	m_pName(pName)
+{
+	m_Ptr.m_pReadFunc = pFunc;
+}
+
+CSqlExecData::CSqlExecData(
+	CDbConnectionPool::FWrite pFunc,
+	std::unique_ptr<const ISqlData> pThreadData,
+	const char *pName) :
+	m_Mode(WRITE_ACCESS),
+	m_pThreadData(std::move(pThreadData)),
+	m_pName(pName)
+{
+	m_Ptr.m_pWriteFunc = pFunc;
+}
+
+CSqlExecData::CSqlExecData(
+	CDbConnectionPool::Mode m,
+	const char aFileName[64]) :
+	m_Mode(ADD_SQLITE),
+	m_pThreadData(nullptr),
+	m_pName("add sqlite server")
+{
+	m_Ptr.m_Sqlite.m_Mode = m;
+	mem_copy(m_Ptr.m_Sqlite.m_FileName, aFileName, sizeof(m_Ptr.m_Sqlite.m_FileName));
+}
+CSqlExecData::CSqlExecData(CDbConnectionPool::Mode m,
+	const CMysqlConfig *pMysqlConfig) :
+	m_Mode(ADD_MYSQL),
+	m_pThreadData(nullptr),
+	m_pName("add mysql server")
+{
+	m_Ptr.m_MySql.m_Mode = m;
+	mem_copy(&m_Ptr.m_MySql.m_Config, pMysqlConfig, sizeof(m_Ptr.m_MySql.m_Config));
+}
+
+CSqlExecData::CSqlExecData(IConsole *pConsole, CDbConnectionPool::Mode m) :
+	m_Mode(PRINT),
+	m_pThreadData(nullptr),
+	m_pName("print database server")
+{
+	m_Ptr.m_Print.m_pConsole = pConsole;
+	m_Ptr.m_Print.m_Mode = m;
+}
+
+void CDbConnectionPool::Print(IConsole *pConsole, Mode DatabaseMode)
+{
+	m_pShared->m_aQueries[m_InsertIdx++] = std::make_unique<CSqlExecData>(pConsole, DatabaseMode);
+	m_InsertIdx %= std::size(m_pShared->m_aQueries);
+	m_pShared->m_NumBackup.Signal();
+}
+
+void CDbConnectionPool::RegisterSqliteDatabase(Mode DatabaseMode, const char aFileName[64])
+{
+	m_pShared->m_aQueries[m_InsertIdx++] = std::make_unique<CSqlExecData>(DatabaseMode, aFileName);
+	m_InsertIdx %= std::size(m_pShared->m_aQueries);
+	m_pShared->m_NumBackup.Signal();
+}
+
+void CDbConnectionPool::RegisterMysqlDatabase(Mode DatabaseMode, const CMysqlConfig *pMysqlConfig)
+{
+	m_pShared->m_aQueries[m_InsertIdx++] = std::make_unique<CSqlExecData>(DatabaseMode, pMysqlConfig);
+	m_InsertIdx %= std::size(m_pShared->m_aQueries);
+	m_pShared->m_NumBackup.Signal();
+}
+
+void CDbConnectionPool::Execute(
+	FRead pFunc,
+	std::unique_ptr<const ISqlData> pSqlRequestData,
+	const char *pName)
+{
+	m_pShared->m_aQueries[m_InsertIdx++] = std::make_unique<CSqlExecData>(pFunc, std::move(pSqlRequestData), pName);
+	m_InsertIdx %= std::size(m_pShared->m_aQueries);
+	m_pShared->m_NumBackup.Signal();
+}
+
+void CDbConnectionPool::ExecuteWrite(
+	FWrite pFunc,
+	std::unique_ptr<const ISqlData> pSqlRequestData,
+	const char *pName)
+{
+	m_pShared->m_aQueries[m_InsertIdx++] = std::make_unique<CSqlExecData>(pFunc, std::move(pSqlRequestData), pName);
+	m_InsertIdx %= std::size(m_pShared->m_aQueries);
+	m_pShared->m_NumBackup.Signal();
+}
+
+void CDbConnectionPool::OnShutdown()
+{
+	if(m_Shutdown)
+		return;
+	m_Shutdown = true;
+	m_pShared->m_Shutdown.store(true);
+	m_pShared->m_NumBackup.Signal();
+	int i = 0;
+	while(m_pShared->m_Shutdown.load())
+	{
+		// print a log about every two seconds
+		if(i % 20 == 0 && i > 0)
+		{
+			dbg_msg("sql", "Waiting for score threads to complete (%ds)", i / 10);
+		}
+		++i;
+		std::this_thread::sleep_for(100ms);
+	}
+}
+
+// The backup worker thread looks at write queries and stores them
+// in the sqlite database (WRITE_BACKUP). It skips over read queries.
+// After processing the query, it gets passed on to the Worker thread.
+// This is done to not loose ranks when the server shuts down before all
+// queries are executed on the mysql server
+class CBackup
+{
+public:
+	CBackup(std::shared_ptr<CDbConnectionPool::CSharedData> pShared) :
+		m_pShared(std::move(pShared)) {}
+	static void Start(void *pUser);
+
+private:
+	void ProcessQueries();
+
+	std::unique_ptr<IDbConnection> m_pWriteBackup;
+
+	std::shared_ptr<CDbConnectionPool::CSharedData> m_pShared;
+};
+
+/* static */
+void CBackup::Start(void *pUser)
+{
+	CBackup *pThis = (CBackup *)pUser;
+	pThis->ProcessQueries();
+	delete pThis;
+}
+
+void CBackup::ProcessQueries()
+{
+	for(int JobNum = 0;; JobNum++)
+	{
+		m_pShared->m_NumBackup.Wait();
+		CSqlExecData *pThreadData = m_pShared->m_aQueries[JobNum % std::size(m_pShared->m_aQueries)].get();
+
+		// work through all database jobs after OnShutdown is called before exiting the thread
+		if(pThreadData == nullptr)
+		{
+			m_pShared->m_NumWorker.Signal();
+			return;
+		}
+
+		if(pThreadData->m_Mode == CSqlExecData::ADD_SQLITE &&
+			pThreadData->m_Ptr.m_Sqlite.m_Mode == CDbConnectionPool::Mode::WRITE_BACKUP)
+		{
+			m_pWriteBackup = CreateSqliteConnection(pThreadData->m_Ptr.m_Sqlite.m_FileName, true);
+		}
+		else if(pThreadData->m_Mode == CSqlExecData::WRITE_ACCESS && m_pWriteBackup.get())
+		{
+			bool Success = CDbConnectionPool::ExecSqlFunc(m_pWriteBackup.get(), pThreadData, Write::BACKUP_FIRST);
+			dbg_msg("sql", "[%i] %s done on write backup database, Success=%i", JobNum, pThreadData->m_pName, Success);
+		}
+		m_pShared->m_NumWorker.Signal();
+	}
+}
+
+// the worker threads executes queries on mysql or sqlite. If we write on
+// a mysql server and have a backup server configured, we'll remove the
+// entry from the backup server after completing it on the write server.
+// static void Worker(void *pUser);
+class CWorker
+{
+public:
+	CWorker(std::shared_ptr<CDbConnectionPool::CSharedData> pShared) :
+		m_pShared(std::move(pShared)) {}
+	static void Start(void *pUser);
+	void ProcessQueries();
+
+private:
+	void Print(IConsole *pConsole, CDbConnectionPool::Mode DatabaseMode);
+
+	// There are two possible configurations
+	//  * sqlite mode: There exists exactly one READ and the same WRITE server
+	//                 with no WRITE_BACKUP server
+	//  * mysql mode: there can exist multiple READ server, there must be at
+	//                most one WRITE server. The WRITE server for all DDNet
+	//                Servers must be the same (to counteract double loads).
+	//                There may be one WRITE_BACKUP sqlite server.
+	// This variable should only change, before the worker threads
+	std::vector<std::unique_ptr<IDbConnection>> m_vpReadConnections;
+	std::unique_ptr<IDbConnection> m_pWriteConnection;
+	std::unique_ptr<IDbConnection> m_pWriteBackup;
+
+	std::shared_ptr<CDbConnectionPool::CSharedData> m_pShared;
+};
+
+/* static */
+void CWorker::Start(void *pUser)
+{
+	CWorker *pThis = (CWorker *)pUser;
+	pThis->ProcessQueries();
+	delete pThis;
+}
+
+void CWorker::ProcessQueries()
+{
+	// remember last working server and try to connect to it first
+	int ReadServer = 0;
+	// enter fail mode when a sql request fails, skip read request during it and
+	// write to the backup database until all requests are handled
+	bool FailMode = false;
+	for(int JobNum = 0;; JobNum++)
+	{
+		if(FailMode && m_pShared->m_NumWorker.GetApproximateValue() == 0)
+		{
+			FailMode = false;
+		}
+		m_pShared->m_NumWorker.Wait();
+		auto pThreadData = std::move(m_pShared->m_aQueries[JobNum % std::size(m_pShared->m_aQueries)]);
+		// work through all database jobs after OnShutdown is called before exiting the thread
+		if(pThreadData == nullptr)
+		{
+			m_pShared->m_Shutdown.store(false);
+			return;
+		}
+		bool Success = false;
+		switch(pThreadData->m_Mode)
+		{
+		case CSqlExecData::READ_ACCESS:
+		{
+			for(size_t i = 0; i < m_vpReadConnections.size(); i++)
+			{
+				if(m_pShared->m_Shutdown)
+				{
+					dbg_msg("sql", "[%i] %s dismissed read request during shutdown", JobNum, pThreadData->m_pName);
+					break;
+				}
+				if(FailMode)
+				{
+					dbg_msg("sql", "[%i] %s dismissed read request during FailMode", JobNum, pThreadData->m_pName);
+					break;
+				}
+				int CurServer = (ReadServer + i) % (int)m_vpReadConnections.size();
+				if(CDbConnectionPool::ExecSqlFunc(m_vpReadConnections[CurServer].get(), pThreadData.get(), Write::NORMAL))
+				{
+					ReadServer = CurServer;
+					dbg_msg("sql", "[%i] %s done on read database %d", JobNum, pThreadData->m_pName, CurServer);
+					Success = true;
+					break;
+				}
+			}
+			if(!Success)
+			{
+				FailMode = true;
+			}
+		}
+		break;
+		case CSqlExecData::WRITE_ACCESS:
+		{
+			if(m_pShared->m_Shutdown && m_pWriteBackup != nullptr)
+			{
+				dbg_msg("sql", "[%i] %s skipped to backup database during shutdown", JobNum, pThreadData->m_pName);
+			}
+			else if(FailMode && m_pWriteBackup != nullptr)
+			{
+				dbg_msg("sql", "[%i] %s skipped to backup database during FailMode", JobNum, pThreadData->m_pName);
+			}
+			else if(CDbConnectionPool::ExecSqlFunc(m_pWriteConnection.get(), pThreadData.get(), Write::NORMAL))
+			{
+				dbg_msg("sql", "[%i] %s done on write database", JobNum, pThreadData->m_pName);
+				Success = true;
+			}
+			// enter fail mode if not successful
+			FailMode = FailMode || !Success;
+			const Write w = Success ? Write::NORMAL_SUCCEEDED : Write::NORMAL_FAILED;
+			if(m_pWriteBackup && CDbConnectionPool::ExecSqlFunc(m_pWriteBackup.get(), pThreadData.get(), w))
+			{
+				dbg_msg("sql", "[%i] %s done move write on backup database to non-backup table", JobNum, pThreadData->m_pName);
+				Success = true;
+			}
+		}
+		break;
+		case CSqlExecData::ADD_MYSQL:
+		{
+			auto pMysql = CreateMysqlConnection(pThreadData->m_Ptr.m_MySql.m_Config);
+			switch(pThreadData->m_Ptr.m_MySql.m_Mode)
+			{
+			case CDbConnectionPool::Mode::READ:
+				m_vpReadConnections.push_back(std::move(pMysql));
+				break;
+			case CDbConnectionPool::Mode::WRITE:
+				m_pWriteConnection = std::move(pMysql);
+				break;
+			case CDbConnectionPool::Mode::WRITE_BACKUP:
+				m_pWriteBackup = std::move(pMysql);
+				break;
+			case CDbConnectionPool::Mode::NUM_MODES:
+				break;
+			}
+			Success = true;
+			break;
+		}
+		case CSqlExecData::ADD_SQLITE:
+		{
+			auto pSqlite = CreateSqliteConnection(pThreadData->m_Ptr.m_Sqlite.m_FileName, true);
+			switch(pThreadData->m_Ptr.m_Sqlite.m_Mode)
+			{
+			case CDbConnectionPool::Mode::READ:
+				m_vpReadConnections.push_back(std::move(pSqlite));
+				break;
+			case CDbConnectionPool::Mode::WRITE:
+				m_pWriteConnection = std::move(pSqlite);
+				break;
+			case CDbConnectionPool::Mode::WRITE_BACKUP:
+				m_pWriteBackup = std::move(pSqlite);
+				break;
+			case CDbConnectionPool::Mode::NUM_MODES:
+				break;
+			}
+			Success = true;
+			break;
+		}
+		case CSqlExecData::PRINT:
+			Print(pThreadData->m_Ptr.m_Print.m_pConsole, pThreadData->m_Ptr.m_Print.m_Mode);
+			Success = true;
+			break;
+		}
+		if(!Success)
+			dbg_msg("sql", "[%i] %s failed on all databases", JobNum, pThreadData->m_pName);
+		if(pThreadData->m_pThreadData != nullptr && pThreadData->m_pThreadData->m_pResult != nullptr)
+		{
+			pThreadData->m_pThreadData->m_pResult->m_Success = Success;
+			pThreadData->m_pThreadData->m_pResult->m_Completed.store(true);
+		}
+	}
+}
+
+void CWorker::Print(IConsole *pConsole, CDbConnectionPool::Mode DatabaseMode)
+{
+	if(DatabaseMode == CDbConnectionPool::Mode::READ)
+	{
+		for(auto &pReadConnection : m_vpReadConnections)
+			pReadConnection->Print(pConsole, "Read");
+		if(m_vpReadConnections.empty())
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "There are no read databases");
+	}
+	else if(DatabaseMode == CDbConnectionPool::Mode::WRITE)
+	{
+		if(m_pWriteConnection)
+			m_pWriteConnection->Print(pConsole, "Write");
+		else
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "There are no write databases");
+	}
+	else if(DatabaseMode == CDbConnectionPool::Mode::WRITE_BACKUP)
+	{
+		if(m_pWriteBackup)
+			m_pWriteBackup->Print(pConsole, "WriteBackup");
+		else
+			pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "There are no write backup databases");
+	}
+}
+
+/* static */
+bool CDbConnectionPool::ExecSqlFunc(IDbConnection *pConnection, CSqlExecData *pData, Write w)
+{
+	if(pConnection == nullptr)
+	{
+		dbg_msg("sql", "No database given");
+		return false;
+	}
+	char aError[256] = "unknown error";
+	if(pConnection->Connect(aError, sizeof(aError)))
+	{
+		dbg_msg("sql", "failed connecting to db: %s", aError);
+		return false;
+	}
+	bool Success = false;
+	switch(pData->m_Mode)
+	{
+	case CSqlExecData::READ_ACCESS:
+		Success = !pData->m_Ptr.m_pReadFunc(pConnection, pData->m_pThreadData.get(), aError, sizeof(aError));
+		break;
+	case CSqlExecData::WRITE_ACCESS:
+		Success = !pData->m_Ptr.m_pWriteFunc(pConnection, pData->m_pThreadData.get(), w, aError, sizeof(aError));
+		break;
+	default:
+		dbg_assert(false, "unreachable");
+	}
+	pConnection->Disconnect();
+	if(!Success)
+	{
+		dbg_msg("sql", "%s failed: %s", pData->m_pName, aError);
+	}
+	return Success;
+}
+
+CDbConnectionPool::CDbConnectionPool()
+{
+	m_pShared = std::make_shared<CSharedData>();
+	m_pWorkerThread = thread_init(CWorker::Start, new CWorker(m_pShared), "database worker thread");
+	m_pBackupThread = thread_init(CBackup::Start, new CBackup(m_pShared), "database backup worker thread");
+}
+
+CDbConnectionPool::~CDbConnectionPool()
+{
+	OnShutdown();
+	if(m_pWorkerThread)
+		thread_wait(m_pWorkerThread);
+	if(m_pBackupThread)
+		thread_wait(m_pBackupThread);
+}
diff --git a/src_bkp/engine/server/databases/connection_pool.h b/src_bkp/engine/server/databases/connection_pool.h
new file mode 100644
index 0000000000..87b7f2dc59
--- /dev/null
+++ b/src_bkp/engine/server/databases/connection_pool.h
@@ -0,0 +1,133 @@
+#ifndef ENGINE_SERVER_DATABASES_CONNECTION_POOL_H
+#define ENGINE_SERVER_DATABASES_CONNECTION_POOL_H
+
+#include <atomic>
+#include <base/tl/threading.h>
+#include <memory>
+#include <vector>
+
+class IDbConnection;
+
+struct ISqlResult
+{
+	// using atomic_bool to indicate completed sql query since usage_count
+	// from shard_ptr isn't safe in multithreaded environment
+	// the main thread must only access the remaining result data if set to true
+	std::atomic_bool m_Completed{false};
+	// indicate whether the thread indicated a successful completion (returned true)
+	bool m_Success = false;
+
+	virtual ~ISqlResult() = default;
+};
+
+struct ISqlData
+{
+	ISqlData(std::shared_ptr<ISqlResult> pResult) :
+		m_pResult(std::move(pResult))
+	{
+	}
+	virtual ~ISqlData() = default;
+
+	mutable std::shared_ptr<ISqlResult> m_pResult;
+};
+
+enum Write
+{
+	// write everything into the backup db first
+	BACKUP_FIRST,
+	// now try to write it into remote db
+	NORMAL,
+	// succeeded writing -> remove copy from backup
+	NORMAL_SUCCEEDED,
+	// failed writing -> notify about failure
+	NORMAL_FAILED,
+};
+
+class IConsole;
+
+struct CMysqlConfig
+{
+	char m_aDatabase[64];
+	char m_aPrefix[64];
+	char m_aUser[64];
+	char m_aPass[64];
+	char m_aIp[64];
+	char m_aBindaddr[128];
+	int m_Port;
+	bool m_Setup;
+};
+
+class CDbConnectionPool
+{
+public:
+	CDbConnectionPool();
+	~CDbConnectionPool();
+	CDbConnectionPool &operator=(const CDbConnectionPool &) = delete;
+
+	// Returns false on success.
+	typedef bool (*FRead)(IDbConnection *, const ISqlData *, char *pError, int ErrorSize);
+	typedef bool (*FWrite)(IDbConnection *, const ISqlData *, Write, char *pError, int ErrorSize);
+
+	enum Mode
+	{
+		READ,
+		WRITE,
+		WRITE_BACKUP,
+		NUM_MODES,
+	};
+
+	void Print(IConsole *pConsole, Mode DatabaseMode);
+
+	void RegisterSqliteDatabase(Mode DatabaseMode, const char FileName[64]);
+	void RegisterMysqlDatabase(Mode DatabaseMode, const CMysqlConfig *pMysqlConfig);
+
+	void Execute(
+		FRead pFunc,
+		std::unique_ptr<const ISqlData> pSqlRequestData,
+		const char *pName);
+	// writes to WRITE_BACKUP first and removes it from there when successfully
+	// executed on WRITE server
+	void ExecuteWrite(
+		FWrite pFunc,
+		std::unique_ptr<const ISqlData> pSqlRequestData,
+		const char *pName);
+
+	void OnShutdown();
+
+	friend class CWorker;
+	friend class CBackup;
+
+private:
+	static bool ExecSqlFunc(IDbConnection *pConnection, struct CSqlExecData *pData, Write w);
+
+	// Only the main thread accesses this variable. It points to the index,
+	// where the next query is added to the queue.
+	int m_InsertIdx = 0;
+
+	bool m_Shutdown = false;
+
+	struct CSharedData
+	{
+		// Used as signal that shutdown is in progress from main thread to
+		// speed up the queries by discarding read queries and writing to
+		// the sqlite file instead of the remote mysql server.
+		// The worker thread signals the main thread that all queries are
+		// processed by setting this variable to false again.
+		std::atomic_bool m_Shutdown{false};
+		// Queries go first to the backup thread. This semaphore signals about
+		// new queries.
+		CSemaphore m_NumBackup;
+		// When the backup thread processed the query, it signals the main
+		// thread with this semaphore about the new query
+		CSemaphore m_NumWorker;
+
+		// spsc queue with additional backup worker to look at queries first.
+		std::unique_ptr<struct CSqlExecData> m_aQueries[512];
+	};
+
+	std::shared_ptr<CSharedData> m_pShared;
+	void *m_pWorkerThread = nullptr;
+	void *m_pBackupThread = nullptr;
+};
+
+#endif // ENGINE_SERVER_DATABASES_CONNECTION_POOL_H
diff --git a/src_bkp/engine/server/databases/mysql.cpp b/src_bkp/engine/server/databases/mysql.cpp
new file mode 100644
index 0000000000..202fb96871
--- /dev/null
+++ b/src_bkp/engine/server/databases/mysql.cpp
@@ -0,0 +1,708 @@
+#include "connection.h"
+
+#include <engine/server/databases/connection_pool.h>
+
+#if defined(CONF_MYSQL)
+#include <mysql.h>
+
+#include <base/tl/threading.h>
+#include <engine/console.h>
+
+#include <atomic>
+#include <memory>
+#include <vector>
+
+// MySQL >= 8.0.1 removed my_bool, 8.0.2 accidentally reintroduced it: https://bugs.mysql.com/bug.php?id=87337
+#if !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002
+typedef bool my_bool;
+#endif
+
+enum
+{
+	MYSQLSTATE_UNINITIALIZED,
+	MYSQLSTATE_INITIALIZED,
+	MYSQLSTATE_SHUTTINGDOWN,
+};
+
+std::atomic_int g_MysqlState = {MYSQLSTATE_UNINITIALIZED};
+std::atomic_int g_MysqlNumConnections;
+
+bool MysqlAvailable()
+{
+	return true;
+}
+
+int MysqlInit()
+{
+	dbg_assert(mysql_thread_safe(), "MySQL library without thread safety");
+	dbg_assert(g_MysqlState == MYSQLSTATE_UNINITIALIZED, "double MySQL initialization");
+	if(mysql_library_init(0, nullptr, nullptr))
+	{
+		return 1;
+	}
+	int Uninitialized = MYSQLSTATE_UNINITIALIZED;
+	bool Swapped = g_MysqlState.compare_exchange_strong(Uninitialized, MYSQLSTATE_INITIALIZED);
+	(void)Swapped;
+	dbg_assert(Swapped, "MySQL double initialization");
+	return 0;
+}
+
+void MysqlUninit()
+{
+	int Initialized = MYSQLSTATE_INITIALIZED;
+	bool Swapped = g_MysqlState.compare_exchange_strong(Initialized, MYSQLSTATE_SHUTTINGDOWN);
+	(void)Swapped;
+	dbg_assert(Swapped, "double MySQL free or free without initialization");
+	int Counter = g_MysqlNumConnections;
+	if(Counter != 0)
+	{
+		dbg_msg("mysql", "can't deinitialize, connections remaining: %d", Counter);
+		return;
+	}
+	mysql_library_end();
+}
+
+class CMysqlConnection : public IDbConnection
+{
+public:
+	explicit CMysqlConnection(CMysqlConfig m_Config);
+	~CMysqlConnection();
+	void Print(IConsole *pConsole, const char *pMode) override;
+
+	const char *BinaryCollate() const override { return "utf8mb4_bin"; }
+	void ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize) override;
+	const char *InsertTimestampAsUtc() const override { return "?"; }
+	const char *CollateNocase() const override { return "CONVERT(? USING utf8mb4) COLLATE utf8mb4_general_ci"; }
+	const char *InsertIgnore() const override { return "INSERT IGNORE"; }
+	const char *Random() const override { return "RAND()"; }
+	const char *MedianMapTime(char *pBuffer, int BufferSize) const override;
+	const char *False() const override { return "FALSE"; }
+	const char *True() const override { return "TRUE"; }
+
+	bool Connect(char *pError, int ErrorSize) override;
+	void Disconnect() override;
+
+	bool PrepareStatement(const char *pStmt, char *pError, int ErrorSize) override;
+
+	void BindString(int Idx, const char *pString) override;
+	void BindBlob(int Idx, unsigned char *pBlob, int Size) override;
+	void BindInt(int Idx, int Value) override;
+	void BindInt64(int Idx, int64_t Value) override;
+	void BindFloat(int Idx, float Value) override;
+
+	void Print() override {}
+	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
+	bool ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize) override;
+
+	bool IsNull(int Col) override;
+	float GetFloat(int Col) override;
+	int GetInt(int Col) override;
+	int64_t GetInt64(int Col) override;
+	void GetString(int Col, char *pBuffer, int BufferSize) override;
+	int GetBlob(int Col, unsigned char *pBuffer, int BufferSize) override;
+
+	bool AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize) override;
+
+private:
+	class CStmtDeleter
+	{
+	public:
+		void operator()(MYSQL_STMT *pStmt) const;
+	};
+
+	char m_aErrorDetail[128];
+	void StoreErrorMysql(const char *pContext);
+	void StoreErrorStmt(const char *pContext);
+	bool ConnectImpl();
+	bool PrepareAndExecuteStatement(const char *pStmt);
+	//static void DeleteResult(MYSQL_RES *pResult);
+
+	union UParameterExtra
+	{
+		int i;
+		unsigned long ul;
+		float f;
+	};
+
+	bool m_NewQuery = false;
+	bool m_HaveConnection = false;
+	MYSQL m_Mysql;
+	std::unique_ptr<MYSQL_STMT, CStmtDeleter> m_pStmt = nullptr;
+	std::vector<MYSQL_BIND> m_vStmtParameters;
+	std::vector<UParameterExtra> m_vStmtParameterExtras;
+
+	// copy of m_Config vars
+	CMysqlConfig m_Config;
+
+	std::atomic_bool m_InUse;
+};
+
+void CMysqlConnection::CStmtDeleter::operator()(MYSQL_STMT *pStmt) const
+{
+	mysql_stmt_close(pStmt);
+}
+
+CMysqlConnection::CMysqlConnection(CMysqlConfig Config) :
+	IDbConnection(Config.m_aPrefix),
+	m_Config(Config),
+	m_InUse(false)
+{
+	g_MysqlNumConnections += 1;
+	dbg_assert(g_MysqlState == MYSQLSTATE_INITIALIZED, "MySQL library not in initialized state");
+
+	mem_zero(m_aErrorDetail, sizeof(m_aErrorDetail));
+	mem_zero(&m_Mysql, sizeof(m_Mysql));
+	mysql_init(&m_Mysql);
+}
+
+CMysqlConnection::~CMysqlConnection()
+{
+	mysql_close(&m_Mysql);
+	g_MysqlNumConnections -= 1;
+}
+
+void CMysqlConnection::StoreErrorMysql(const char *pContext)
+{
+	str_format(m_aErrorDetail, sizeof(m_aErrorDetail), "(%s:mysql:%d): %s", pContext, mysql_errno(&m_Mysql), mysql_error(&m_Mysql));
+}
+
+void CMysqlConnection::StoreErrorStmt(const char *pContext)
+{
+	str_format(m_aErrorDetail, sizeof(m_aErrorDetail), "(%s:stmt:%d): %s", pContext, mysql_stmt_errno(m_pStmt.get()), mysql_stmt_error(m_pStmt.get()));
+}
+
+bool CMysqlConnection::PrepareAndExecuteStatement(const char *pStmt)
+{
+	if(mysql_stmt_prepare(m_pStmt.get(), pStmt, str_length(pStmt)))
+	{
+		StoreErrorStmt("prepare");
+		return true;
+	}
+	if(mysql_stmt_execute(m_pStmt.get()))
+	{
+		StoreErrorStmt("execute");
+		return true;
+	}
+	return false;
+}
+
+void CMysqlConnection::Print(IConsole *pConsole, const char *pMode)
+{
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"MySQL-%s: DB: '%s' Prefix: '%s' User: '%s' IP: <{'%s'}> Port: %d",
+		pMode, m_Config.m_aDatabase, GetPrefix(), m_Config.m_aUser, m_Config.m_aIp, m_Config.m_Port);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+}
+
+void CMysqlConnection::ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize)
+{
+	str_format(aBuf, BufferSize, "UNIX_TIMESTAMP(%s)", pTimestamp);
+}
+
+bool CMysqlConnection::Connect(char *pError, int ErrorSize)
+{
+	if(m_InUse.exchange(true))
+	{
+		dbg_assert(0, "Tried connecting while the connection is in use");
+	}
+
+	m_NewQuery = true;
+	if(ConnectImpl())
+	{
+		str_copy(pError, m_aErrorDetail, ErrorSize);
+		m_InUse.store(false);
+		return true;
+	}
+	return false;
+}
+
+bool CMysqlConnection::ConnectImpl()
+{
+	if(m_HaveConnection)
+	{
+		if(m_pStmt && mysql_stmt_free_result(m_pStmt.get()))
+		{
+			StoreErrorStmt("free_result");
+			dbg_msg("mysql", "can't free last result %s", m_aErrorDetail);
+		}
+		if(!mysql_select_db(&m_Mysql, m_Config.m_aDatabase))
+		{
+			// Success.
+			return false;
+		}
+		StoreErrorMysql("select_db");
+		dbg_msg("mysql", "ping error, trying to reconnect %s", m_aErrorDetail);
+		mysql_close(&m_Mysql);
+		mem_zero(&m_Mysql, sizeof(m_Mysql));
+		mysql_init(&m_Mysql);
+	}
+
+	m_pStmt = nullptr;
+	unsigned int OptConnectTimeout = 60;
+	unsigned int OptReadTimeout = 60;
+	unsigned int OptWriteTimeout = 120;
+	my_bool OptReconnect = true;
+	mysql_options(&m_Mysql, MYSQL_OPT_CONNECT_TIMEOUT, &OptConnectTimeout);
+	mysql_options(&m_Mysql, MYSQL_OPT_READ_TIMEOUT, &OptReadTimeout);
+	mysql_options(&m_Mysql, MYSQL_OPT_WRITE_TIMEOUT, &OptWriteTimeout);
+	mysql_options(&m_Mysql, MYSQL_OPT_RECONNECT, &OptReconnect);
+	mysql_options(&m_Mysql, MYSQL_SET_CHARSET_NAME, "utf8mb4");
+	if(m_Config.m_aBindaddr[0] != '\0')
+	{
+		mysql_options(&m_Mysql, MYSQL_OPT_BIND, m_Config.m_aBindaddr);
+	}
+
+	if(!mysql_real_connect(&m_Mysql, m_Config.m_aIp, m_Config.m_aUser, m_Config.m_aPass, nullptr, m_Config.m_Port, nullptr, CLIENT_IGNORE_SIGPIPE))
+	{
+		StoreErrorMysql("real_connect");
+		return true;
+	}
+	m_HaveConnection = true;
+
+	m_pStmt = std::unique_ptr<MYSQL_STMT, CStmtDeleter>(mysql_stmt_init(&m_Mysql));
+
+	// Apparently MYSQL_SET_CHARSET_NAME is not enough
+	if(PrepareAndExecuteStatement("SET CHARACTER SET utf8mb4"))
+	{
+		return true;
+	}
+
+	if(m_Config.m_Setup)
+	{
+		char aCreateDatabase[1024];
+		// create database
+		str_format(aCreateDatabase, sizeof(aCreateDatabase), "CREATE DATABASE IF NOT EXISTS %s CHARACTER SET utf8mb4", m_Config.m_aDatabase);
+		if(PrepareAndExecuteStatement(aCreateDatabase))
+		{
+			return true;
+		}
+	}
+
+	// Connect to specific database
+	if(mysql_select_db(&m_Mysql, m_Config.m_aDatabase))
+	{
+		StoreErrorMysql("select_db");
+		return true;
+	}
+
+	if(m_Config.m_Setup)
+	{
+		char aCreateRace[1024];
+		char aCreateTeamrace[1024];
+		char aCreateMaps[1024];
+		char aCreateSaves[1024];
+		char aCreatePoints[1024];
+		FormatCreateRace(aCreateRace, sizeof(aCreateRace), /* Backup */ false);
+		FormatCreateTeamrace(aCreateTeamrace, sizeof(aCreateTeamrace), "VARBINARY(16)", /* Backup */ false);
+		FormatCreateMaps(aCreateMaps, sizeof(aCreateMaps));
+		FormatCreateSaves(aCreateSaves, sizeof(aCreateSaves), /* Backup */ false);
+		FormatCreatePoints(aCreatePoints, sizeof(aCreatePoints));
+
+		if(PrepareAndExecuteStatement(aCreateRace) ||
+			PrepareAndExecuteStatement(aCreateTeamrace) ||
+			PrepareAndExecuteStatement(aCreateMaps) ||
+			PrepareAndExecuteStatement(aCreateSaves) ||
+			PrepareAndExecuteStatement(aCreatePoints))
+		{
+			return true;
+		}
+		m_Config.m_Setup = false;
+	}
+	dbg_msg("mysql", "connection established");
+	return false;
+}
+
+void CMysqlConnection::Disconnect()
+{
+	m_InUse.store(false);
+}
+
+bool CMysqlConnection::PrepareStatement(const char *pStmt, char *pError, int ErrorSize)
+{
+	if(mysql_stmt_prepare(m_pStmt.get(), pStmt, str_length(pStmt)))
+	{
+		StoreErrorStmt("prepare");
+		str_copy(pError, m_aErrorDetail, ErrorSize);
+		return true;
+	}
+	m_NewQuery = true;
+	unsigned NumParameters = mysql_stmt_param_count(m_pStmt.get());
+	m_vStmtParameters.resize(NumParameters);
+	m_vStmtParameterExtras.resize(NumParameters);
+	mem_zero(&m_vStmtParameters[0], sizeof(m_vStmtParameters[0]) * m_vStmtParameters.size());
+	mem_zero(&m_vStmtParameterExtras[0], sizeof(m_vStmtParameterExtras[0]) * m_vStmtParameterExtras.size());
+	return false;
+}
+
+void CMysqlConnection::BindString(int Idx, const char *pString)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	int Length = str_length(pString);
+	m_vStmtParameterExtras[Idx].ul = Length;
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_STRING;
+	pParam->buffer = (void *)pString;
+	pParam->buffer_length = Length + 1;
+	pParam->length = &m_vStmtParameterExtras[Idx].ul;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
+void CMysqlConnection::BindBlob(int Idx, unsigned char *pBlob, int Size)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	m_vStmtParameterExtras[Idx].ul = Size;
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_BLOB;
+	pParam->buffer = pBlob;
+	pParam->buffer_length = Size;
+	pParam->length = &m_vStmtParameterExtras[Idx].ul;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
+void CMysqlConnection::BindInt(int Idx, int Value)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	m_vStmtParameterExtras[Idx].i = Value;
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_LONG;
+	pParam->buffer = &m_vStmtParameterExtras[Idx].i;
+	pParam->buffer_length = sizeof(m_vStmtParameterExtras[Idx].i);
+	pParam->length = nullptr;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
+void CMysqlConnection::BindInt64(int Idx, int64_t Value)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	m_vStmtParameterExtras[Idx].i = Value;
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_LONGLONG;
+	pParam->buffer = &m_vStmtParameterExtras[Idx].i;
+	pParam->buffer_length = sizeof(m_vStmtParameterExtras[Idx].i);
+	pParam->length = nullptr;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
+void CMysqlConnection::BindFloat(int Idx, float Value)
+{
+	m_NewQuery = true;
+	Idx -= 1;
+	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
+
+	m_vStmtParameterExtras[Idx].f = Value;
+	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
+	pParam->buffer_type = MYSQL_TYPE_FLOAT;
+	pParam->buffer = &m_vStmtParameterExtras[Idx].f;
+	pParam->buffer_length = sizeof(m_vStmtParameterExtras[Idx].i);
+	pParam->length = nullptr;
+	pParam->is_null = nullptr;
+	pParam->is_unsigned = false;
+	pParam->error = nullptr;
+}
+
+bool CMysqlConnection::Step(bool *pEnd, char *pError, int ErrorSize)
+{
+	if(m_NewQuery)
+	{
+		m_NewQuery = false;
+		if(mysql_stmt_bind_param(m_pStmt.get(), &m_vStmtParameters[0]))
+		{
+			StoreErrorStmt("bind_param");
+			str_copy(pError, m_aErrorDetail, ErrorSize);
+			return true;
+		}
+		if(mysql_stmt_execute(m_pStmt.get()))
+		{
+			StoreErrorStmt("execute");
+			str_copy(pError, m_aErrorDetail, ErrorSize);
+			return true;
+		}
+	}
+	int Result = mysql_stmt_fetch(m_pStmt.get());
+	if(Result == 1)
+	{
+		StoreErrorStmt("fetch");
+		str_copy(pError, m_aErrorDetail, ErrorSize);
+		return true;
+	}
+	*pEnd = (Result == MYSQL_NO_DATA);
+	// `Result` is now either `MYSQL_DATA_TRUNCATED` (which we ignore, we
+	// fetch our columns in a different way) or `0` aka success.
+	return false;
+}
+
+bool CMysqlConnection::ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize)
+{
+	if(m_NewQuery)
+	{
+		m_NewQuery = false;
+		if(mysql_stmt_bind_param(m_pStmt.get(), &m_vStmtParameters[0]))
+		{
+			StoreErrorStmt("bind_param");
+			str_copy(pError, m_aErrorDetail, ErrorSize);
+			return true;
+		}
+		if(mysql_stmt_execute(m_pStmt.get()))
+		{
+			StoreErrorStmt("execute");
+			str_copy(pError, m_aErrorDetail, ErrorSize);
+			return true;
+		}
+		*pNumUpdated = mysql_stmt_affected_rows(m_pStmt.get());
+		return false;
+	}
+	str_copy(pError, "tried to execute update without query", ErrorSize);
+	return true;
+}
+
+bool CMysqlConnection::IsNull(int Col)
+{
+	Col -= 1;
+
+	MYSQL_BIND Bind;
+	my_bool IsNull;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_NULL;
+	Bind.buffer = nullptr;
+	Bind.buffer_length = 0;
+	Bind.length = nullptr;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = nullptr;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:null");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in IsNull");
+	}
+	return IsNull;
+}
+
+float CMysqlConnection::GetFloat(int Col)
+{
+	Col -= 1;
+
+	MYSQL_BIND Bind;
+	float Value;
+	my_bool IsNull;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_FLOAT;
+	Bind.buffer = &Value;
+	Bind.buffer_length = sizeof(Value);
+	Bind.length = nullptr;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = nullptr;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:float");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in GetFloat");
+	}
+	if(IsNull)
+	{
+		dbg_assert(0, "error getting float: NULL");
+	}
+	return Value;
+}
+
+int CMysqlConnection::GetInt(int Col)
+{
+	Col -= 1;
+
+	MYSQL_BIND Bind;
+	int Value;
+	my_bool IsNull;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_LONG;
+	Bind.buffer = &Value;
+	Bind.buffer_length = sizeof(Value);
+	Bind.length = nullptr;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = nullptr;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:int");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in GetInt");
+	}
+	if(IsNull)
+	{
+		dbg_assert(0, "error getting int: NULL");
+	}
+	return Value;
+}
+
+int64_t CMysqlConnection::GetInt64(int Col)
+{
+	Col -= 1;
+
+	MYSQL_BIND Bind;
+	int64_t Value;
+	my_bool IsNull;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_LONGLONG;
+	Bind.buffer = &Value;
+	Bind.buffer_length = sizeof(Value);
+	Bind.length = nullptr;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = nullptr;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:int64");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in GetInt64");
+	}
+	if(IsNull)
+	{
+		dbg_assert(0, "error getting int: NULL");
+	}
+	return Value;
+}
+
+void CMysqlConnection::GetString(int Col, char *pBuffer, int BufferSize)
+{
+	Col -= 1;
+
+	for(int i = 0; i < BufferSize; i++)
+	{
+		pBuffer[i] = '\0';
+	}
+
+	MYSQL_BIND Bind;
+	unsigned long Length;
+	my_bool IsNull;
+	my_bool Error;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_STRING;
+	Bind.buffer = pBuffer;
+	// leave one character for null-termination
+	Bind.buffer_length = BufferSize - 1;
+	Bind.length = &Length;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = &Error;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:string");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in GetString");
+	}
+	if(IsNull)
+	{
+		dbg_assert(0, "error getting string: NULL");
+	}
+	if(Error)
+	{
+		dbg_assert(0, "error getting string: truncation occurred");
+	}
+}
+
+int CMysqlConnection::GetBlob(int Col, unsigned char *pBuffer, int BufferSize)
+{
+	Col -= 1;
+
+	MYSQL_BIND Bind;
+	unsigned long Length;
+	my_bool IsNull;
+	my_bool Error;
+	mem_zero(&Bind, sizeof(Bind));
+	Bind.buffer_type = MYSQL_TYPE_BLOB;
+	Bind.buffer = pBuffer;
+	Bind.buffer_length = BufferSize;
+	Bind.length = &Length;
+	Bind.is_null = &IsNull;
+	Bind.is_unsigned = false;
+	Bind.error = &Error;
+	if(mysql_stmt_fetch_column(m_pStmt.get(), &Bind, Col, 0))
+	{
+		StoreErrorStmt("fetch_column:blob");
+		dbg_msg("mysql", "error fetching column %s", m_aErrorDetail);
+		dbg_assert(0, "error in GetBlob");
+	}
+	if(IsNull)
+	{
+		dbg_assert(0, "error getting blob: NULL");
+	}
+	if(Error)
+	{
+		dbg_assert(0, "error getting blob: truncation occurred");
+	}
+	return Length;
+}
+
+const char *CMysqlConnection::MedianMapTime(char *pBuffer, int BufferSize) const
+{
+	str_format(pBuffer, BufferSize,
+		"SELECT MEDIAN(Time) "
+		"OVER (PARTITION BY Map) "
+		"FROM %s_race "
+		"WHERE Map = l.Map "
+		"LIMIT 1",
+		GetPrefix());
+	return pBuffer;
+}
+
+bool CMysqlConnection::AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize)
+{
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"INSERT INTO %s_points(Name, Points) "
+		"VALUES (?, ?) "
+		"ON DUPLICATE KEY UPDATE Points=Points+?",
+		GetPrefix());
+	if(PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	BindString(1, pPlayer);
+	BindInt(2, Points);
+	BindInt(3, Points);
+	int NumUpdated;
+	return ExecuteUpdate(&NumUpdated, pError, ErrorSize);
+}
+
+std::unique_ptr<IDbConnection> CreateMysqlConnection(CMysqlConfig Config)
+{
+	return std::make_unique<CMysqlConnection>(Config);
+}
+#else
+bool MysqlAvailable()
+{
+	return false;
+}
+int MysqlInit()
+{
+	return 0;
+}
+void MysqlUninit()
+{
+}
+std::unique_ptr<IDbConnection> CreateMysqlConnection(CMysqlConfig Config)
+{
+	return nullptr;
+}
+#endif
diff --git a/src_bkp/engine/server/databases/sqlite.cpp b/src_bkp/engine/server/databases/sqlite.cpp
new file mode 100644
index 0000000000..df2925f6ef
--- /dev/null
+++ b/src_bkp/engine/server/databases/sqlite.cpp
@@ -0,0 +1,410 @@
+#include "connection.h"
+
+#include <sqlite3.h>
+
+#include <base/math.h>
+#include <engine/console.h>
+
+#include <atomic>
+
+class CSqliteConnection : public IDbConnection
+{
+public:
+	CSqliteConnection(const char *pFilename, bool Setup);
+	~CSqliteConnection() override;
+	void Print(IConsole *pConsole, const char *pMode) override;
+
+	const char *BinaryCollate() const override { return "BINARY"; }
+	void ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize) override;
+	const char *InsertTimestampAsUtc() const override { return "DATETIME(?, 'utc')"; }
+	const char *CollateNocase() const override { return "? COLLATE NOCASE"; }
+	const char *InsertIgnore() const override { return "INSERT OR IGNORE"; }
+	const char *Random() const override { return "RANDOM()"; }
+	const char *MedianMapTime(char *pBuffer, int BufferSize) const override;
+	// Since SQLite 3.23.0 true/false literals are recognized, but still cleaner to use 1/0, because:
+	// > For compatibility, if there exist columns named "true" or "false", then
+	// > the identifiers refer to the columns rather than Boolean constants.
+	const char *False() const override { return "0"; }
+	const char *True() const override { return "1"; }
+
+	bool Connect(char *pError, int ErrorSize) override;
+	void Disconnect() override;
+
+	bool PrepareStatement(const char *pStmt, char *pError, int ErrorSize) override;
+
+	void BindString(int Idx, const char *pString) override;
+	void BindBlob(int Idx, unsigned char *pBlob, int Size) override;
+	void BindInt(int Idx, int Value) override;
+	void BindInt64(int Idx, int64_t Value) override;
+	void BindFloat(int Idx, float Value) override;
+
+	void Print() override;
+	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
+	bool ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize) override;
+
+	bool IsNull(int Col) override;
+	float GetFloat(int Col) override;
+	int GetInt(int Col) override;
+	int64_t GetInt64(int Col) override;
+	void GetString(int Col, char *pBuffer, int BufferSize) override;
+	// passing a negative buffer size is undefined behavior
+	int GetBlob(int Col, unsigned char *pBuffer, int BufferSize) override;
+
+	bool AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize) override;
+
+	// fail safe
+	bool CreateFailsafeTables();
+
+private:
+	// copy of config vars
+	char m_aFilename[IO_MAX_PATH_LENGTH];
+	bool m_Setup;
+
+	sqlite3 *m_pDb;
+	sqlite3_stmt *m_pStmt;
+	bool m_Done; // no more rows available for Step
+	// returns false, if the query succeeded
+	bool Execute(const char *pQuery, char *pError, int ErrorSize);
+	// returns true on failure
+	bool ConnectImpl(char *pError, int ErrorSize);
+
+	// returns true if an error was formatted
+	bool FormatError(int Result, char *pError, int ErrorSize);
+	void AssertNoError(int Result);
+
+	std::atomic_bool m_InUse;
+};
+
+CSqliteConnection::CSqliteConnection(const char *pFilename, bool Setup) :
+	IDbConnection("record"),
+	m_Setup(Setup),
+	m_pDb(nullptr),
+	m_pStmt(nullptr),
+	m_Done(true),
+	m_InUse(false)
+{
+	str_copy(m_aFilename, pFilename);
+}
+
+CSqliteConnection::~CSqliteConnection()
+{
+	if(m_pStmt != nullptr)
+		sqlite3_finalize(m_pStmt);
+	sqlite3_close(m_pDb);
+	m_pDb = nullptr;
+}
+
+void CSqliteConnection::Print(IConsole *pConsole, const char *pMode)
+{
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SQLite-%s: DB: '%s'",
+		pMode, m_aFilename);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+}
+
+void CSqliteConnection::ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize)
+{
+	str_format(aBuf, BufferSize, "strftime('%%s', %s)", pTimestamp);
+}
+
+bool CSqliteConnection::Connect(char *pError, int ErrorSize)
+{
+	if(m_InUse.exchange(true))
+	{
+		dbg_assert(false, "Tried connecting while the connection is in use");
+	}
+	if(ConnectImpl(pError, ErrorSize))
+	{
+		m_InUse.store(false);
+		return true;
+	}
+	return false;
+}
+
+bool CSqliteConnection::ConnectImpl(char *pError, int ErrorSize)
+{
+	if(m_pDb != nullptr)
+	{
+		return false;
+	}
+
+	if(sqlite3_libversion_number() < 3025000)
+	{
+		dbg_msg("sql", "SQLite version %s is not supported, use at least version 3.25.0", sqlite3_libversion());
+	}
+
+	int Result = sqlite3_open(m_aFilename, &m_pDb);
+	if(Result != SQLITE_OK)
+	{
+		str_format(pError, ErrorSize, "Can't open sqlite database: '%s'", sqlite3_errmsg(m_pDb));
+		return true;
+	}
+
+	// wait for database to unlock so we don't have to handle SQLITE_BUSY errors
+	sqlite3_busy_timeout(m_pDb, -1);
+
+	if(m_Setup)
+	{
+		if(Execute("PRAGMA journal_mode=WAL", pError, ErrorSize))
+			return true;
+		char aBuf[1024];
+		FormatCreateRace(aBuf, sizeof(aBuf), /* Backup */ false);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreateTeamrace(aBuf, sizeof(aBuf), "BLOB", /* Backup */ false);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreateMaps(aBuf, sizeof(aBuf));
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreateSaves(aBuf, sizeof(aBuf), /* Backup */ false);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreatePoints(aBuf, sizeof(aBuf));
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+
+		FormatCreateRace(aBuf, sizeof(aBuf), /* Backup */ true);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreateTeamrace(aBuf, sizeof(aBuf), "BLOB", /* Backup */ true);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		FormatCreateSaves(aBuf, sizeof(aBuf), /* Backup */ true);
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		m_Setup = false;
+	}
+	return false;
+}
+
+void CSqliteConnection::Disconnect()
+{
+	if(m_pStmt != nullptr)
+		sqlite3_finalize(m_pStmt);
+	m_pStmt = nullptr;
+	m_InUse.store(false);
+}
+
+bool CSqliteConnection::PrepareStatement(const char *pStmt, char *pError, int ErrorSize)
+{
+	if(m_pStmt != nullptr)
+		sqlite3_finalize(m_pStmt);
+	m_pStmt = nullptr;
+	int Result = sqlite3_prepare_v2(
+		m_pDb,
+		pStmt,
+		-1, // pStmt can be any length
+		&m_pStmt,
+		NULL);
+	if(FormatError(Result, pError, ErrorSize))
+	{
+		return true;
+	}
+	m_Done = false;
+	return false;
+}
+
+void CSqliteConnection::BindString(int Idx, const char *pString)
+{
+	int Result = sqlite3_bind_text(m_pStmt, Idx, pString, -1, NULL);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
+void CSqliteConnection::BindBlob(int Idx, unsigned char *pBlob, int Size)
+{
+	int Result = sqlite3_bind_blob(m_pStmt, Idx, pBlob, Size, NULL);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
+void CSqliteConnection::BindInt(int Idx, int Value)
+{
+	int Result = sqlite3_bind_int(m_pStmt, Idx, Value);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
+void CSqliteConnection::BindInt64(int Idx, int64_t Value)
+{
+	int Result = sqlite3_bind_int64(m_pStmt, Idx, Value);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
+void CSqliteConnection::BindFloat(int Idx, float Value)
+{
+	int Result = sqlite3_bind_double(m_pStmt, Idx, (double)Value);
+	AssertNoError(Result);
+	m_Done = false;
+}
+
+// Keep support for SQLite < 3.14 on older Linux distributions. MinGW does not
+// support __attribute__((weak)): https://sourceware.org/bugzilla/show_bug.cgi?id=9687
+#if defined(__GNUC__) && !defined(__MINGW32__)
+extern char *sqlite3_expanded_sql(sqlite3_stmt *pStmt) __attribute__((weak)); // NOLINT(readability-redundant-declaration)
+#endif
+
+void CSqliteConnection::Print()
+{
+	if(m_pStmt != nullptr
+#if defined(__GNUC__) && !defined(__MINGW32__)
+		&& sqlite3_expanded_sql != nullptr
+#endif
+	)
+	{
+		char *pExpandedStmt = sqlite3_expanded_sql(m_pStmt);
+		dbg_msg("sql", "SQLite statement: %s", pExpandedStmt);
+		sqlite3_free(pExpandedStmt);
+	}
+}
+
+bool CSqliteConnection::Step(bool *pEnd, char *pError, int ErrorSize)
+{
+	if(m_Done)
+	{
+		*pEnd = true;
+		return false;
+	}
+	int Result = sqlite3_step(m_pStmt);
+	if(Result == SQLITE_ROW)
+	{
+		*pEnd = false;
+		return false;
+	}
+	else if(Result == SQLITE_DONE)
+	{
+		m_Done = true;
+		*pEnd = true;
+		return false;
+	}
+	else
+	{
+		if(FormatError(Result, pError, ErrorSize))
+		{
+			return true;
+		}
+	}
+	*pEnd = true;
+	return false;
+}
+
+bool CSqliteConnection::ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize)
+{
+	bool End;
+	if(Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	*pNumUpdated = sqlite3_changes(m_pDb);
+	return false;
+}
+
+bool CSqliteConnection::IsNull(int Col)
+{
+	return sqlite3_column_type(m_pStmt, Col - 1) == SQLITE_NULL;
+}
+
+float CSqliteConnection::GetFloat(int Col)
+{
+	return (float)sqlite3_column_double(m_pStmt, Col - 1);
+}
+
+int CSqliteConnection::GetInt(int Col)
+{
+	return sqlite3_column_int(m_pStmt, Col - 1);
+}
+
+int64_t CSqliteConnection::GetInt64(int Col)
+{
+	return sqlite3_column_int64(m_pStmt, Col - 1);
+}
+
+void CSqliteConnection::GetString(int Col, char *pBuffer, int BufferSize)
+{
+	str_copy(pBuffer, (const char *)sqlite3_column_text(m_pStmt, Col - 1), BufferSize);
+}
+
+int CSqliteConnection::GetBlob(int Col, unsigned char *pBuffer, int BufferSize)
+{
+	int Size = sqlite3_column_bytes(m_pStmt, Col - 1);
+	Size = minimum(Size, BufferSize);
+	mem_copy(pBuffer, sqlite3_column_blob(m_pStmt, Col - 1), Size);
+	return Size;
+}
+
+const char *CSqliteConnection::MedianMapTime(char *pBuffer, int BufferSize) const
+{
+	str_format(pBuffer, BufferSize,
+		"SELECT AVG("
+		"  CASE counter %% 2 "
+		"    WHEN 0 THEN CASE WHEN rn IN (counter / 2, counter / 2 + 1) THEN Time END "
+		"    WHEN 1 THEN CASE WHEN rn = counter / 2 + 1 THEN Time END END) "
+		"  OVER (PARTITION BY Map) AS Median "
+		"FROM ("
+		"  SELECT *, ROW_NUMBER() "
+		"  OVER (PARTITION BY Map ORDER BY Time) rn, COUNT(*) "
+		"  OVER (PARTITION BY Map) counter "
+		"  FROM %s_race where Map = l.Map) as r",
+		GetPrefix());
+	return pBuffer;
+}
+
+bool CSqliteConnection::Execute(const char *pQuery, char *pError, int ErrorSize)
+{
+	char *pErrorMsg;
+	int Result = sqlite3_exec(m_pDb, pQuery, NULL, NULL, &pErrorMsg);
+	if(Result != SQLITE_OK)
+	{
+		str_format(pError, ErrorSize, "error executing query: '%s'", pErrorMsg);
+		sqlite3_free(pErrorMsg);
+		return true;
+	}
+	return false;
+}
+
+bool CSqliteConnection::FormatError(int Result, char *pError, int ErrorSize)
+{
+	if(Result != SQLITE_OK)
+	{
+		str_copy(pError, sqlite3_errmsg(m_pDb), ErrorSize);
+		return true;
+	}
+	return false;
+}
+
+void CSqliteConnection::AssertNoError(int Result)
+{
+	char aBuf[128];
+	if(FormatError(Result, aBuf, sizeof(aBuf)))
+	{
+		dbg_msg("sqlite", "unexpected sqlite error: %s", aBuf);
+		dbg_assert(0, "sqlite error");
+	}
+}
+
+bool CSqliteConnection::AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize)
+{
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"INSERT INTO %s_points(Name, Points) "
+		"VALUES (?, ?) "
+		"ON CONFLICT(Name) DO UPDATE SET Points=Points+?",
+		GetPrefix());
+	if(PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	BindString(1, pPlayer);
+	BindInt(2, Points);
+	BindInt(3, Points);
+	bool End;
+	return Step(&End, pError, ErrorSize);
+}
+
+std::unique_ptr<IDbConnection> CreateSqliteConnection(const char *pFilename, bool Setup)
+{
+	return std::make_unique<CSqliteConnection>(pFilename, Setup);
+}
diff --git a/src_bkp/engine/server/main.cpp b/src_bkp/engine/server/main.cpp
new file mode 100644
index 0000000000..ea19875316
--- /dev/null
+++ b/src_bkp/engine/server/main.cpp
@@ -0,0 +1,207 @@
+
+#define _WIN32_WINNT 0x0501
+
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/map.h>
+#include <engine/server.h>
+#include <engine/storage.h>
+
+#include <engine/server/antibot.h>
+#include <engine/server/databases/connection.h>
+#include <engine/server/server.h>
+#include <engine/server/server_logger.h>
+
+#include <engine/shared/assertion_logger.h>
+#include <engine/shared/config.h>
+
+#include <game/version.h>
+
+#include <vector>
+
+#if defined(CONF_FAMILY_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#include <csignal>
+
+volatile sig_atomic_t InterruptSignaled = 0;
+
+bool IsInterrupted()
+{
+	return InterruptSignaled;
+}
+
+void HandleSigIntTerm(int Param)
+{
+	InterruptSignaled = 1;
+
+	// Exit the next time a signal is received
+	signal(SIGINT, SIG_DFL);
+	signal(SIGTERM, SIG_DFL);
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	bool Silent = false;
+
+	for(int i = 1; i < argc; i++)
+	{
+		if(str_comp("-s", argv[i]) == 0 || str_comp("--silent", argv[i]) == 0)
+		{
+			Silent = true;
+#if defined(CONF_FAMILY_WINDOWS)
+			ShowWindow(GetConsoleWindow(), SW_HIDE);
+#endif
+			break;
+		}
+	}
+
+#if defined(CONF_FAMILY_WINDOWS)
+	CWindowsComLifecycle WindowsComLifecycle(false);
+#endif
+
+	std::vector<std::shared_ptr<ILogger>> vpLoggers;
+	std::shared_ptr<ILogger> pStdoutLogger;
+#if defined(CONF_PLATFORM_ANDROID)
+	pStdoutLogger = std::shared_ptr<ILogger>(log_logger_android());
+#else
+	if(!Silent)
+	{
+		pStdoutLogger = std::shared_ptr<ILogger>(log_logger_stdout());
+	}
+#endif
+	if(pStdoutLogger)
+	{
+		vpLoggers.push_back(pStdoutLogger);
+	}
+	std::shared_ptr<CFutureLogger> pFutureFileLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureFileLogger);
+	std::shared_ptr<CFutureLogger> pFutureConsoleLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureConsoleLogger);
+	std::shared_ptr<CFutureLogger> pFutureAssertionLogger = std::make_shared<CFutureLogger>();
+	vpLoggers.push_back(pFutureAssertionLogger);
+	log_set_global_logger(log_logger_collection(std::move(vpLoggers)).release());
+
+	if(secure_random_init() != 0)
+	{
+		dbg_msg("secure", "could not initialize secure RNG");
+		return -1;
+	}
+	if(MysqlInit() != 0)
+	{
+		dbg_msg("mysql", "failed to initialize MySQL library");
+		return -1;
+	}
+
+	signal(SIGINT, HandleSigIntTerm);
+	signal(SIGTERM, HandleSigIntTerm);
+
+#if defined(CONF_EXCEPTION_HANDLING)
+	init_exception_handler();
+#endif
+
+	CServer *pServer = CreateServer();
+	pServer->SetLoggers(pFutureFileLogger, std::move(pStdoutLogger));
+
+	IKernel *pKernel = IKernel::Create();
+
+	// create the components
+	IEngine *pEngine = CreateEngine(GAME_NAME, pFutureConsoleLogger, 2 * std::thread::hardware_concurrency() + 2);
+	IEngineMap *pEngineMap = CreateEngineMap();
+	IGameServer *pGameServer = CreateGameServer();
+	IConsole *pConsole = CreateConsole(CFGFLAG_SERVER | CFGFLAG_ECON).release();
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_SERVER, argc, argv);
+	IConfigManager *pConfigManager = CreateConfigManager();
+	IEngineAntibot *pEngineAntibot = CreateEngineAntibot();
+
+	pFutureAssertionLogger->Set(CreateAssertionLogger(pStorage, GAME_NAME));
+#if defined(CONF_EXCEPTION_HANDLING)
+	char aBuf[IO_MAX_PATH_LENGTH];
+	char aBufName[IO_MAX_PATH_LENGTH];
+	char aDate[64];
+	str_timestamp(aDate, sizeof(aDate));
+	str_format(aBufName, sizeof(aBufName), "dumps/" GAME_NAME "-Server_%s_crash_log_%s_%d_%s.RTP", CONF_PLATFORM_STRING, aDate, pid(), GIT_SHORTREV_HASH != nullptr ? GIT_SHORTREV_HASH : "");
+	pStorage->GetCompletePath(IStorage::TYPE_SAVE, aBufName, aBuf, sizeof(aBuf));
+	set_exception_handler_log_file(aBuf);
+#endif
+
+	{
+		bool RegisterFail = false;
+
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pServer);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngine);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngineMap); // register as both
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IMap *>(pEngineMap), false);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pGameServer);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pConsole);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pConfigManager);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngineAntibot);
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IAntibot *>(pEngineAntibot), false);
+
+		if(RegisterFail)
+		{
+			delete pKernel;
+			return -1;
+		}
+	}
+
+	pEngine->Init();
+	pConsole->Init();
+	pConfigManager->Init();
+
+	// register all console commands
+	pServer->RegisterCommands();
+
+	// execute autoexec file
+	if(pStorage->FileExists(AUTOEXEC_SERVER_FILE, IStorage::TYPE_ALL))
+	{
+		pConsole->ExecuteFile(AUTOEXEC_SERVER_FILE);
+	}
+	else // fallback
+	{
+		pConsole->ExecuteFile(AUTOEXEC_FILE);
+	}
+
+	// parse the command line arguments
+	if(argc > 1)
+		pConsole->ParseArguments(argc - 1, &argv[1]);
+
+	pConfigManager->SetReadOnly("sv_test_cmds", true);
+	pConfigManager->SetReadOnly("sv_rescue", true);
+
+	const int Mode = g_Config.m_Logappend ? IOFLAG_APPEND : IOFLAG_WRITE;
+	if(g_Config.m_Logfile[0])
+	{
+		IOHANDLE Logfile = pStorage->OpenFile(g_Config.m_Logfile, Mode, IStorage::TYPE_SAVE_OR_ABSOLUTE);
+		if(Logfile)
+		{
+			pFutureFileLogger->Set(log_logger_file(Logfile));
+		}
+		else
+		{
+			dbg_msg("server", "failed to open '%s' for logging", g_Config.m_Logfile);
+		}
+	}
+	auto pServerLogger = std::make_shared<CServerLogger>(pServer);
+	pEngine->SetAdditionalLogger(pServerLogger);
+
+	// run the server
+	dbg_msg("server", "starting...");
+	int Ret = pServer->Run();
+
+	pServerLogger->OnServerDeletion();
+	// free
+	delete pKernel;
+
+	MysqlUninit();
+	secure_random_uninit();
+
+	return Ret;
+}
diff --git a/src_bkp/engine/server/name_ban.cpp b/src_bkp/engine/server/name_ban.cpp
new file mode 100644
index 0000000000..b08922161f
--- /dev/null
+++ b/src_bkp/engine/server/name_ban.cpp
@@ -0,0 +1,127 @@
+#include "name_ban.h"
+
+#include <base/system.h>
+
+#include <engine/shared/config.h>
+
+CNameBan::CNameBan(const char *pName, const char *pReason, int Distance, bool IsSubstring) :
+	m_Distance(Distance), m_IsSubstring(IsSubstring)
+{
+	str_copy(m_aName, pName);
+	str_copy(m_aReason, pReason);
+	m_SkeletonLength = str_utf8_to_skeleton(m_aName, m_aSkeleton, std::size(m_aSkeleton));
+}
+
+void CNameBans::InitConsole(IConsole *pConsole)
+{
+	m_pConsole = pConsole;
+
+	m_pConsole->Register("name_ban", "s[name] ?i[distance] ?i[is_substring] ?r[reason]", CFGFLAG_SERVER, ConNameBan, this, "Ban a certain nickname");
+	m_pConsole->Register("name_unban", "s[name]", CFGFLAG_SERVER, ConNameUnban, this, "Unban a certain nickname");
+	m_pConsole->Register("name_bans", "", CFGFLAG_SERVER, ConNameBans, this, "List all name bans");
+}
+
+void CNameBans::Ban(const char *pName, const char *pReason, const int Distance, const bool IsSubstring)
+{
+	for(auto &Ban : m_vNameBans)
+	{
+		if(str_comp(Ban.m_aName, pName) == 0)
+		{
+			if(m_pConsole)
+			{
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "changed name='%s' distance=%d old_distance=%d is_substring=%d old_is_substring=%d reason='%s' old_reason='%s'", pName, Distance, Ban.m_Distance, IsSubstring, Ban.m_IsSubstring, pReason, Ban.m_aReason);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf);
+			}
+			str_copy(Ban.m_aReason, pReason);
+			Ban.m_Distance = Distance;
+			Ban.m_IsSubstring = IsSubstring;
+			return;
+		}
+	}
+
+	m_vNameBans.emplace_back(pName, pReason, Distance, IsSubstring);
+	if(m_pConsole)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "added name='%s' distance=%d is_substring=%d reason='%s'", pName, Distance, IsSubstring, pReason);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf);
+	}
+}
+
+void CNameBans::Unban(const char *pName)
+{
+	auto ToRemove = std::remove_if(m_vNameBans.begin(), m_vNameBans.end(), [pName](const CNameBan &Ban) { return str_comp(Ban.m_aName, pName) == 0; });
+	if(ToRemove == m_vNameBans.end())
+	{
+		if(m_pConsole)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "name ban '%s' not found", pName);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf);
+		}
+	}
+	else
+	{
+		if(m_pConsole)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "removed name='%s' distance=%d is_substring=%d reason='%s'", (*ToRemove).m_aName, (*ToRemove).m_Distance, (*ToRemove).m_IsSubstring, (*ToRemove).m_aReason);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf);
+		}
+		m_vNameBans.erase(ToRemove, m_vNameBans.end());
+	}
+}
+
+void CNameBans::Dump() const
+{
+	if(!m_pConsole)
+		return;
+
+	char aBuf[256];
+	for(const auto &Ban : m_vNameBans)
+	{
+		str_format(aBuf, sizeof(aBuf), "name='%s' distance=%d is_substring=%d reason='%s'", Ban.m_aName, Ban.m_Distance, Ban.m_IsSubstring, Ban.m_aReason);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf);
+	}
+}
+
+const CNameBan *CNameBans::IsBanned(const char *pName) const
+{
+	char aTrimmed[MAX_NAME_LENGTH];
+	str_copy(aTrimmed, str_utf8_skip_whitespaces(pName));
+	str_utf8_trim_right(aTrimmed);
+
+	int aSkeleton[MAX_NAME_SKELETON_LENGTH];
+	int SkeletonLength = str_utf8_to_skeleton(aTrimmed, aSkeleton, std::size(aSkeleton));
+	int aBuffer[MAX_NAME_SKELETON_LENGTH * 2 + 2];
+
+	const CNameBan *pResult = nullptr;
+	for(const CNameBan &Ban : m_vNameBans)
+	{
+		int Distance = str_utf32_dist_buffer(aSkeleton, SkeletonLength, Ban.m_aSkeleton, Ban.m_SkeletonLength, aBuffer, std::size(aBuffer));
+		if(Distance <= Ban.m_Distance || (Ban.m_IsSubstring && str_utf8_find_nocase(pName, Ban.m_aName)))
+			pResult = &Ban;
+	}
+	return pResult;
+}
+
+void CNameBans::ConNameBan(IConsole::IResult *pResult, void *pUser)
+{
+	const char *pName = pResult->GetString(0);
+	const char *pReason = pResult->NumArguments() > 3 ? pResult->GetString(3) : "";
+	const int Distance = pResult->NumArguments() > 1 ? pResult->GetInteger(1) : str_length(pName) / 3;
+	const bool IsSubstring = pResult->NumArguments() > 2 ? pResult->GetInteger(2) != 0 : false;
+	static_cast<CNameBans *>(pUser)->Ban(pName, pReason, Distance, IsSubstring);
+}
+
+void CNameBans::ConNameUnban(IConsole::IResult *pResult, void *pUser)
+{
+	const char *pName = pResult->GetString(0);
+	static_cast<CNameBans *>(pUser)->Unban(pName);
+}
+
+void CNameBans::ConNameBans(IConsole::IResult *pResult, void *pUser)
+{
+	static_cast<CNameBans *>(pUser)->Dump();
+}
diff --git a/src_bkp/engine/server/name_ban.h b/src_bkp/engine/server/name_ban.h
new file mode 100644
index 0000000000..ff58630a20
--- /dev/null
+++ b/src_bkp/engine/server/name_ban.h
@@ -0,0 +1,45 @@
+#ifndef ENGINE_SERVER_NAME_BAN_H
+#define ENGINE_SERVER_NAME_BAN_H
+
+#include <engine/console.h>
+#include <engine/shared/protocol.h>
+
+#include <vector>
+
+enum
+{
+	MAX_NAME_SKELETON_LENGTH = MAX_NAME_LENGTH * 4,
+	MAX_NAMEBAN_REASON_LENGTH = 64
+};
+
+class CNameBan
+{
+public:
+	CNameBan(const char *pName, const char *pReason, int Distance, bool IsSubstring);
+
+	char m_aName[MAX_NAME_LENGTH];
+	char m_aReason[MAX_NAMEBAN_REASON_LENGTH];
+	int m_aSkeleton[MAX_NAME_SKELETON_LENGTH];
+	int m_SkeletonLength;
+	int m_Distance;
+	bool m_IsSubstring;
+};
+
+class CNameBans
+{
+	IConsole *m_pConsole = nullptr;
+	std::vector<CNameBan> m_vNameBans;
+
+	static void ConNameBan(IConsole::IResult *pResult, void *pUser);
+	static void ConNameUnban(IConsole::IResult *pResult, void *pUser);
+	static void ConNameBans(IConsole::IResult *pResult, void *pUser);
+
+public:
+	void InitConsole(IConsole *pConsole);
+	void Ban(const char *pName, const char *pReason, const int Distance, const bool IsSubstring);
+	void Unban(const char *pName);
+	void Dump() const;
+	const CNameBan *IsBanned(const char *pName) const;
+};
+
+#endif // ENGINE_SERVER_NAME_BAN_H
diff --git a/src_bkp/engine/server/register.cpp b/src_bkp/engine/server/register.cpp
new file mode 100644
index 0000000000..34acda919b
--- /dev/null
+++ b/src_bkp/engine/server/register.cpp
@@ -0,0 +1,755 @@
+#include "register.h"
+
+#include <base/lock.h>
+#include <base/log.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/shared/config.h>
+#include <engine/shared/http.h>
+#include <engine/shared/json.h>
+#include <engine/shared/masterserver.h>
+#include <engine/shared/network.h>
+#include <engine/shared/packer.h>
+#include <engine/shared/uuid_manager.h>
+
+class CRegister : public IRegister
+{
+	enum
+	{
+		STATUS_NONE = 0,
+		STATUS_OK,
+		STATUS_NEEDCHALLENGE,
+		STATUS_NEEDINFO,
+
+		PROTOCOL_TW6_IPV6 = 0,
+		PROTOCOL_TW6_IPV4,
+		PROTOCOL_TW7_IPV6,
+		PROTOCOL_TW7_IPV4,
+		NUM_PROTOCOLS,
+	};
+
+	static bool StatusFromString(int *pResult, const char *pString);
+	static const char *ProtocolToScheme(int Protocol);
+	static const char *ProtocolToString(int Protocol);
+	static bool ProtocolFromString(int *pResult, const char *pString);
+	static const char *ProtocolToSystem(int Protocol);
+	static IPRESOLVE ProtocolToIpresolve(int Protocol);
+
+	static void ConchainOnConfigChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	class CGlobal
+	{
+	public:
+		CLock m_Lock;
+		int m_InfoSerial GUARDED_BY(m_Lock) = -1;
+		int m_LatestSuccessfulInfoSerial GUARDED_BY(m_Lock) = -1;
+	};
+
+	class CProtocol
+	{
+		class CShared
+		{
+		public:
+			CShared(std::shared_ptr<CGlobal> pGlobal) :
+				m_pGlobal(std::move(pGlobal))
+			{
+			}
+
+			std::shared_ptr<CGlobal> m_pGlobal;
+			CLock m_Lock;
+			int m_NumTotalRequests GUARDED_BY(m_Lock) = 0;
+			int m_LatestResponseStatus GUARDED_BY(m_Lock) = STATUS_NONE;
+			int m_LatestResponseIndex GUARDED_BY(m_Lock) = -1;
+		};
+
+		class CJob : public IJob
+		{
+			int m_Protocol;
+			int m_ServerPort;
+			int m_Index;
+			int m_InfoSerial;
+			std::shared_ptr<CShared> m_pShared;
+			std::unique_ptr<CHttpRequest> m_pRegister;
+			void Run() override;
+
+		public:
+			CJob(int Protocol, int ServerPort, int Index, int InfoSerial, std::shared_ptr<CShared> pShared, std::unique_ptr<CHttpRequest> &&pRegister) :
+				m_Protocol(Protocol),
+				m_ServerPort(ServerPort),
+				m_Index(Index),
+				m_InfoSerial(InfoSerial),
+				m_pShared(std::move(pShared)),
+				m_pRegister(std::move(pRegister))
+			{
+			}
+			~CJob() override = default;
+		};
+
+		CRegister *m_pParent;
+		int m_Protocol;
+
+		std::shared_ptr<CShared> m_pShared;
+		bool m_NewChallengeToken = false;
+		bool m_HaveChallengeToken = false;
+		char m_aChallengeToken[128] = {0};
+
+		void CheckChallengeStatus();
+
+	public:
+		int64_t m_PrevRegister = -1;
+		int64_t m_NextRegister = -1;
+
+		CProtocol(CRegister *pParent, int Protocol);
+		void OnToken(const char *pToken);
+		void SendRegister();
+		void SendDeleteIfRegistered(bool Shutdown);
+		void Update();
+	};
+
+	CConfig *m_pConfig;
+	IConsole *m_pConsole;
+	IEngine *m_pEngine;
+	// Don't start sending registers before the server has initialized
+	// completely.
+	bool m_GotFirstUpdateCall = false;
+	int m_ServerPort;
+	char m_aConnlessTokenHex[16];
+
+	std::shared_ptr<CGlobal> m_pGlobal = std::make_shared<CGlobal>();
+	bool m_aProtocolEnabled[NUM_PROTOCOLS] = {true, true, true, true};
+	CProtocol m_aProtocols[NUM_PROTOCOLS];
+
+	int m_NumExtraHeaders = 0;
+	char m_aaExtraHeaders[8][128];
+
+	char m_aVerifyPacketPrefix[sizeof(SERVERBROWSE_CHALLENGE) + UUID_MAXSTRSIZE];
+	CUuid m_Secret = RandomUuid();
+	CUuid m_ChallengeSecret = RandomUuid();
+	bool m_GotServerInfo = false;
+	char m_aServerInfo[16384];
+
+public:
+	CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken);
+	void Update() override;
+	void OnConfigChange() override;
+	bool OnPacket(const CNetChunk *pPacket) override;
+	void OnNewInfo(const char *pInfo) override;
+	void OnShutdown() override;
+};
+
+bool CRegister::StatusFromString(int *pResult, const char *pString)
+{
+	if(str_comp(pString, "success") == 0)
+	{
+		*pResult = STATUS_OK;
+	}
+	else if(str_comp(pString, "need_challenge") == 0)
+	{
+		*pResult = STATUS_NEEDCHALLENGE;
+	}
+	else if(str_comp(pString, "need_info") == 0)
+	{
+		*pResult = STATUS_NEEDINFO;
+	}
+	else
+	{
+		*pResult = -1;
+		return true;
+	}
+	return false;
+}
+
+const char *CRegister::ProtocolToScheme(int Protocol)
+{
+	switch(Protocol)
+	{
+	case PROTOCOL_TW6_IPV6: return "tw-0.6+udp://";
+	case PROTOCOL_TW6_IPV4: return "tw-0.6+udp://";
+	case PROTOCOL_TW7_IPV6: return "tw-0.7+udp://";
+	case PROTOCOL_TW7_IPV4: return "tw-0.7+udp://";
+	}
+	dbg_assert(false, "invalid protocol");
+	dbg_break();
+}
+
+const char *CRegister::ProtocolToString(int Protocol)
+{
+	switch(Protocol)
+	{
+	case PROTOCOL_TW6_IPV6: return "tw0.6/ipv6";
+	case PROTOCOL_TW6_IPV4: return "tw0.6/ipv4";
+	case PROTOCOL_TW7_IPV6: return "tw0.7/ipv6";
+	case PROTOCOL_TW7_IPV4: return "tw0.7/ipv4";
+	}
+	dbg_assert(false, "invalid protocol");
+	dbg_break();
+}
+
+bool CRegister::ProtocolFromString(int *pResult, const char *pString)
+{
+	if(str_comp(pString, "tw0.6/ipv6") == 0)
+	{
+		*pResult = PROTOCOL_TW6_IPV6;
+	}
+	else if(str_comp(pString, "tw0.6/ipv4") == 0)
+	{
+		*pResult = PROTOCOL_TW6_IPV4;
+	}
+	else if(str_comp(pString, "tw0.7/ipv6") == 0)
+	{
+		*pResult = PROTOCOL_TW7_IPV6;
+	}
+	else if(str_comp(pString, "tw0.7/ipv4") == 0)
+	{
+		*pResult = PROTOCOL_TW7_IPV4;
+	}
+	else
+	{
+		*pResult = -1;
+		return true;
+	}
+	return false;
+}
+
+const char *CRegister::ProtocolToSystem(int Protocol)
+{
+	switch(Protocol)
+	{
+	case PROTOCOL_TW6_IPV6: return "register/6/ipv6";
+	case PROTOCOL_TW6_IPV4: return "register/6/ipv4";
+	case PROTOCOL_TW7_IPV6: return "register/7/ipv6";
+	case PROTOCOL_TW7_IPV4: return "register/7/ipv4";
+	}
+	dbg_assert(false, "invalid protocol");
+	dbg_break();
+}
+
+IPRESOLVE CRegister::ProtocolToIpresolve(int Protocol)
+{
+	switch(Protocol)
+	{
+	case PROTOCOL_TW6_IPV6: return IPRESOLVE::V6;
+	case PROTOCOL_TW6_IPV4: return IPRESOLVE::V4;
+	case PROTOCOL_TW7_IPV6: return IPRESOLVE::V6;
+	case PROTOCOL_TW7_IPV4: return IPRESOLVE::V4;
+	}
+	dbg_assert(false, "invalid protocol");
+	dbg_break();
+}
+
+void CRegister::ConchainOnConfigChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		((CRegister *)pUserData)->OnConfigChange();
+	}
+}
+
+void CRegister::CProtocol::SendRegister()
+{
+	int64_t Now = time_get();
+	int64_t Freq = time_freq();
+
+	char aAddress[64];
+	str_format(aAddress, sizeof(aAddress), "%sconnecting-address.invalid:%d", ProtocolToScheme(m_Protocol), m_pParent->m_ServerPort);
+
+	char aSecret[UUID_MAXSTRSIZE];
+	FormatUuid(m_pParent->m_Secret, aSecret, sizeof(aSecret));
+
+	char aChallengeUuid[UUID_MAXSTRSIZE];
+	FormatUuid(m_pParent->m_ChallengeSecret, aChallengeUuid, sizeof(aChallengeUuid));
+	char aChallengeSecret[64];
+	str_format(aChallengeSecret, sizeof(aChallengeSecret), "%s:%s", aChallengeUuid, ProtocolToString(m_Protocol));
+	int InfoSerial;
+	bool SendInfo;
+
+	{
+		CLockScope ls(m_pShared->m_pGlobal->m_Lock);
+		InfoSerial = m_pShared->m_pGlobal->m_InfoSerial;
+		SendInfo = InfoSerial > m_pShared->m_pGlobal->m_LatestSuccessfulInfoSerial;
+	}
+
+	std::unique_ptr<CHttpRequest> pRegister;
+	if(SendInfo)
+	{
+		pRegister = HttpPostJson(m_pParent->m_pConfig->m_SvRegisterUrl, m_pParent->m_aServerInfo);
+	}
+	else
+	{
+		pRegister = HttpPost(m_pParent->m_pConfig->m_SvRegisterUrl, (unsigned char *)"", 0);
+	}
+	pRegister->HeaderString("Address", aAddress);
+	pRegister->HeaderString("Secret", aSecret);
+	if(m_Protocol == PROTOCOL_TW7_IPV6 || m_Protocol == PROTOCOL_TW7_IPV4)
+	{
+		pRegister->HeaderString("Connless-Token", m_pParent->m_aConnlessTokenHex);
+	}
+	pRegister->HeaderString("Challenge-Secret", aChallengeSecret);
+	if(m_HaveChallengeToken)
+	{
+		pRegister->HeaderString("Challenge-Token", m_aChallengeToken);
+	}
+	pRegister->HeaderInt("Info-Serial", InfoSerial);
+	for(int i = 0; i < m_pParent->m_NumExtraHeaders; i++)
+	{
+		pRegister->Header(m_pParent->m_aaExtraHeaders[i]);
+	}
+	pRegister->LogProgress(HTTPLOG::FAILURE);
+	pRegister->IpResolve(ProtocolToIpresolve(m_Protocol));
+
+	int RequestIndex;
+	{
+		CLockScope ls(m_pShared->m_Lock);
+		if(m_pShared->m_LatestResponseStatus != STATUS_OK)
+		{
+			log_info(ProtocolToSystem(m_Protocol), "registering...");
+		}
+		RequestIndex = m_pShared->m_NumTotalRequests;
+		m_pShared->m_NumTotalRequests += 1;
+	}
+	m_pParent->m_pEngine->AddJob(std::make_shared<CJob>(m_Protocol, m_pParent->m_ServerPort, RequestIndex, InfoSerial, m_pShared, std::move(pRegister)));
+	m_NewChallengeToken = false;
+
+	m_PrevRegister = Now;
+	m_NextRegister = Now + 15 * Freq;
+}
+
+void CRegister::CProtocol::SendDeleteIfRegistered(bool Shutdown)
+{
+	{
+		const CLockScope LockScope(m_pShared->m_Lock);
+		const bool ShouldSendDelete = m_pShared->m_LatestResponseStatus == STATUS_OK;
+		m_pShared->m_LatestResponseStatus = STATUS_NONE;
+		if(!ShouldSendDelete)
+			return;
+	}
+
+	char aAddress[64];
+	str_format(aAddress, sizeof(aAddress), "%sconnecting-address.invalid:%d", ProtocolToScheme(m_Protocol), m_pParent->m_ServerPort);
+
+	char aSecret[UUID_MAXSTRSIZE];
+	FormatUuid(m_pParent->m_Secret, aSecret, sizeof(aSecret));
+
+	std::unique_ptr<CHttpRequest> pDelete = HttpPost(m_pParent->m_pConfig->m_SvRegisterUrl, (const unsigned char *)"", 0);
+	pDelete->HeaderString("Action", "delete");
+	pDelete->HeaderString("Address", aAddress);
+	pDelete->HeaderString("Secret", aSecret);
+	for(int i = 0; i < m_pParent->m_NumExtraHeaders; i++)
+	{
+		pDelete->Header(m_pParent->m_aaExtraHeaders[i]);
+	}
+	pDelete->LogProgress(HTTPLOG::FAILURE);
+	pDelete->IpResolve(ProtocolToIpresolve(m_Protocol));
+	if(Shutdown)
+	{
+		// On shutdown, wait at most 1 second for the delete requests.
+		pDelete->Timeout(CTimeout{1000, 1000, 0, 0});
+	}
+	log_info(ProtocolToSystem(m_Protocol), "deleting...");
+	m_pParent->m_pEngine->AddJob(std::move(pDelete));
+}
+
+CRegister::CProtocol::CProtocol(CRegister *pParent, int Protocol) :
+	m_pParent(pParent),
+	m_Protocol(Protocol),
+	m_pShared(std::make_shared<CShared>(pParent->m_pGlobal))
+{
+}
+
+void CRegister::CProtocol::CheckChallengeStatus()
+{
+	CLockScope ls(m_pShared->m_Lock);
+	// No requests in flight?
+	if(m_pShared->m_LatestResponseIndex == m_pShared->m_NumTotalRequests - 1)
+	{
+		switch(m_pShared->m_LatestResponseStatus)
+		{
+		case STATUS_NEEDCHALLENGE:
+			if(m_NewChallengeToken)
+			{
+				// Immediately resend if we got the token.
+				m_NextRegister = time_get();
+			}
+			break;
+		case STATUS_NEEDINFO:
+			// Act immediately if the master requests more info.
+			m_NextRegister = time_get();
+			break;
+		}
+	}
+}
+
+void CRegister::CProtocol::Update()
+{
+	CheckChallengeStatus();
+	if(time_get() >= m_NextRegister)
+	{
+		SendRegister();
+	}
+}
+
+void CRegister::CProtocol::OnToken(const char *pToken)
+{
+	m_NewChallengeToken = true;
+	m_HaveChallengeToken = true;
+	str_copy(m_aChallengeToken, pToken);
+
+	CheckChallengeStatus();
+	if(time_get() >= m_NextRegister)
+	{
+		SendRegister();
+	}
+}
+
+void CRegister::CProtocol::CJob::Run()
+{
+	IEngine::RunJobBlocking(m_pRegister.get());
+	if(m_pRegister->State() != HTTP_DONE)
+	{
+		// TODO: log the error response content from master
+		// TODO: exponential backoff
+		log_error(ProtocolToSystem(m_Protocol), "error response from master");
+		return;
+	}
+	json_value *pJson = m_pRegister->ResultJson();
+	if(!pJson)
+	{
+		log_error(ProtocolToSystem(m_Protocol), "non-JSON response from master");
+		return;
+	}
+	const json_value &Json = *pJson;
+	const json_value &StatusString = Json["status"];
+	if(StatusString.type != json_string)
+	{
+		json_value_free(pJson);
+		log_error(ProtocolToSystem(m_Protocol), "invalid JSON response from master");
+		return;
+	}
+	int Status;
+	if(StatusFromString(&Status, StatusString))
+	{
+		log_error(ProtocolToSystem(m_Protocol), "invalid status from master: %s", (const char *)StatusString);
+		json_value_free(pJson);
+		return;
+	}
+	{
+		CLockScope ls(m_pShared->m_Lock);
+		if(Status != STATUS_OK || Status != m_pShared->m_LatestResponseStatus)
+		{
+			log_debug(ProtocolToSystem(m_Protocol), "status: %s", (const char *)StatusString);
+		}
+		if(Status == m_pShared->m_LatestResponseStatus && Status == STATUS_NEEDCHALLENGE)
+		{
+			log_error(ProtocolToSystem(m_Protocol), "ERROR: the master server reports that clients can not connect to this server.");
+			log_error(ProtocolToSystem(m_Protocol), "ERROR: configure your firewall/nat to let through udp on port %d.", m_ServerPort);
+		}
+		json_value_free(pJson);
+		if(m_Index > m_pShared->m_LatestResponseIndex)
+		{
+			m_pShared->m_LatestResponseIndex = m_Index;
+			m_pShared->m_LatestResponseStatus = Status;
+		}
+	}
+	if(Status == STATUS_OK)
+	{
+		CLockScope ls(m_pShared->m_pGlobal->m_Lock);
+		if(m_InfoSerial > m_pShared->m_pGlobal->m_LatestSuccessfulInfoSerial)
+		{
+			m_pShared->m_pGlobal->m_LatestSuccessfulInfoSerial = m_InfoSerial;
+		}
+	}
+	else if(Status == STATUS_NEEDINFO)
+	{
+		CLockScope ls(m_pShared->m_pGlobal->m_Lock);
+		if(m_InfoSerial == m_pShared->m_pGlobal->m_LatestSuccessfulInfoSerial)
+		{
+			// Tell other requests that they need to send the info again.
+			m_pShared->m_pGlobal->m_LatestSuccessfulInfoSerial -= 1;
+		}
+	}
+}
+
+CRegister::CRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken) :
+	m_pConfig(pConfig),
+	m_pConsole(pConsole),
+	m_pEngine(pEngine),
+	m_ServerPort(ServerPort),
+	m_aProtocols{
+		CProtocol(this, PROTOCOL_TW6_IPV6),
+		CProtocol(this, PROTOCOL_TW6_IPV4),
+		CProtocol(this, PROTOCOL_TW7_IPV6),
+		CProtocol(this, PROTOCOL_TW7_IPV4),
+	}
+{
+	const int HEADER_LEN = sizeof(SERVERBROWSE_CHALLENGE);
+	mem_copy(m_aVerifyPacketPrefix, SERVERBROWSE_CHALLENGE, HEADER_LEN);
+	FormatUuid(m_ChallengeSecret, m_aVerifyPacketPrefix + HEADER_LEN, sizeof(m_aVerifyPacketPrefix) - HEADER_LEN);
+	m_aVerifyPacketPrefix[HEADER_LEN + UUID_MAXSTRSIZE - 1] = ':';
+
+	// The DDNet code uses the `unsigned` security token in memory byte order.
+	unsigned char aTokenBytes[sizeof(int32_t)];
+	mem_copy(aTokenBytes, &SixupSecurityToken, sizeof(aTokenBytes));
+	str_format(m_aConnlessTokenHex, sizeof(m_aConnlessTokenHex), "%08x", bytes_be_to_uint(aTokenBytes));
+
+	m_pConsole->Chain("sv_register", ConchainOnConfigChange, this);
+	m_pConsole->Chain("sv_register_extra", ConchainOnConfigChange, this);
+	m_pConsole->Chain("sv_register_url", ConchainOnConfigChange, this);
+	m_pConsole->Chain("sv_sixup", ConchainOnConfigChange, this);
+	m_pConsole->Chain("sv_ipv4only", ConchainOnConfigChange, this);
+}
+
+void CRegister::Update()
+{
+	if(!m_GotFirstUpdateCall)
+	{
+		bool Ipv6 = m_aProtocolEnabled[PROTOCOL_TW6_IPV6] || m_aProtocolEnabled[PROTOCOL_TW7_IPV6];
+		bool Ipv4 = m_aProtocolEnabled[PROTOCOL_TW6_IPV4] || m_aProtocolEnabled[PROTOCOL_TW7_IPV4];
+		if(Ipv6 && Ipv4)
+		{
+			dbg_assert(!HttpHasIpresolveBug(), "curl version < 7.77.0 does not support registering via both IPv4 and IPv6, set `sv_register ipv6` or `sv_register ipv4`");
+		}
+		m_GotFirstUpdateCall = true;
+	}
+	if(!m_GotServerInfo)
+	{
+		return;
+	}
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		if(!m_aProtocolEnabled[i])
+		{
+			continue;
+		}
+		m_aProtocols[i].Update();
+	}
+}
+
+void CRegister::OnConfigChange()
+{
+	bool aOldProtocolEnabled[NUM_PROTOCOLS];
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		aOldProtocolEnabled[i] = m_aProtocolEnabled[i];
+	}
+	const char *pProtocols = m_pConfig->m_SvRegister;
+	if(str_comp(pProtocols, "1") == 0)
+	{
+		for(auto &Enabled : m_aProtocolEnabled)
+		{
+			Enabled = true;
+		}
+	}
+	else if(str_comp(pProtocols, "0") == 0)
+	{
+		for(auto &Enabled : m_aProtocolEnabled)
+		{
+			Enabled = false;
+		}
+	}
+	else
+	{
+		for(auto &Enabled : m_aProtocolEnabled)
+		{
+			Enabled = false;
+		}
+		char aBuf[16];
+		while((pProtocols = str_next_token(pProtocols, ",", aBuf, sizeof(aBuf))))
+		{
+			int Protocol;
+			if(str_comp(aBuf, "ipv6") == 0)
+			{
+				m_aProtocolEnabled[PROTOCOL_TW6_IPV6] = true;
+				m_aProtocolEnabled[PROTOCOL_TW7_IPV6] = true;
+			}
+			else if(str_comp(aBuf, "ipv4") == 0)
+			{
+				m_aProtocolEnabled[PROTOCOL_TW6_IPV4] = true;
+				m_aProtocolEnabled[PROTOCOL_TW7_IPV4] = true;
+			}
+			else if(str_comp(aBuf, "tw0.6") == 0)
+			{
+				m_aProtocolEnabled[PROTOCOL_TW6_IPV6] = true;
+				m_aProtocolEnabled[PROTOCOL_TW6_IPV4] = true;
+			}
+			else if(str_comp(aBuf, "tw0.7") == 0)
+			{
+				m_aProtocolEnabled[PROTOCOL_TW7_IPV6] = true;
+				m_aProtocolEnabled[PROTOCOL_TW7_IPV4] = true;
+			}
+			else if(!ProtocolFromString(&Protocol, aBuf))
+			{
+				m_aProtocolEnabled[Protocol] = true;
+			}
+			else
+			{
+				log_warn("register", "unknown protocol '%s'", aBuf);
+				continue;
+			}
+		}
+	}
+	if(!m_pConfig->m_SvSixup)
+	{
+		m_aProtocolEnabled[PROTOCOL_TW7_IPV6] = false;
+		m_aProtocolEnabled[PROTOCOL_TW7_IPV4] = false;
+	}
+	if(m_pConfig->m_SvIpv4Only)
+	{
+		m_aProtocolEnabled[PROTOCOL_TW6_IPV6] = false;
+		m_aProtocolEnabled[PROTOCOL_TW7_IPV6] = false;
+	}
+	m_NumExtraHeaders = 0;
+	const char *pRegisterExtra = m_pConfig->m_SvRegisterExtra;
+	char aHeader[128];
+	while((pRegisterExtra = str_next_token(pRegisterExtra, ",", aHeader, sizeof(aHeader))))
+	{
+		if(m_NumExtraHeaders == (int)std::size(m_aaExtraHeaders))
+		{
+			log_warn("register", "reached maximum of %d extra headers, dropping '%s' and all further headers", m_NumExtraHeaders, aHeader);
+			break;
+		}
+		if(!str_find(aHeader, ": "))
+		{
+			log_warn("register", "header '%s' doesn't contain mandatory ': ', ignoring", aHeader);
+			continue;
+		}
+		str_copy(m_aaExtraHeaders[m_NumExtraHeaders], aHeader);
+		m_NumExtraHeaders += 1;
+	}
+	// Don't start registering before the first `CRegister::Update` call.
+	if(!m_GotFirstUpdateCall)
+	{
+		return;
+	}
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		if(aOldProtocolEnabled[i] == m_aProtocolEnabled[i])
+		{
+			continue;
+		}
+		if(m_aProtocolEnabled[i])
+		{
+			m_aProtocols[i].SendRegister();
+		}
+		else
+		{
+			m_aProtocols[i].SendDeleteIfRegistered(false);
+		}
+	}
+}
+
+bool CRegister::OnPacket(const CNetChunk *pPacket)
+{
+	if((pPacket->m_Flags & NETSENDFLAG_CONNLESS) == 0)
+	{
+		return false;
+	}
+	if(pPacket->m_DataSize >= (int)sizeof(m_aVerifyPacketPrefix) &&
+		mem_comp(pPacket->m_pData, m_aVerifyPacketPrefix, sizeof(m_aVerifyPacketPrefix)) == 0)
+	{
+		CUnpacker Unpacker;
+		Unpacker.Reset(pPacket->m_pData, pPacket->m_DataSize);
+		Unpacker.GetRaw(sizeof(m_aVerifyPacketPrefix));
+		const char *pProtocol = Unpacker.GetString(0);
+		const char *pToken = Unpacker.GetString(0);
+		if(Unpacker.Error())
+		{
+			log_error("register", "got erroneous challenge packet from master");
+			return true;
+		}
+
+		log_debug("register", "got challenge token, protocol='%s' token='%s'", pProtocol, pToken);
+		int Protocol;
+		if(ProtocolFromString(&Protocol, pProtocol))
+		{
+			log_error("register", "got challenge packet with unknown protocol");
+			return true;
+		}
+		m_aProtocols[Protocol].OnToken(pToken);
+		return true;
+	}
+	return false;
+}
+
+void CRegister::OnNewInfo(const char *pInfo)
+{
+	log_trace("register", "info: %s", pInfo);
+	if(m_GotServerInfo && str_comp(m_aServerInfo, pInfo) == 0)
+	{
+		return;
+	}
+
+	m_GotServerInfo = true;
+	str_copy(m_aServerInfo, pInfo);
+	{
+		CLockScope ls(m_pGlobal->m_Lock);
+		m_pGlobal->m_InfoSerial += 1;
+	}
+
+	// Don't start registering before the first `CRegister::Update` call.
+	if(!m_GotFirstUpdateCall)
+	{
+		return;
+	}
+
+	// Immediately send new info if it changes, but at most once per second.
+	int64_t Now = time_get();
+	int64_t Freq = time_freq();
+	int64_t MaximumPrevRegister = -1;
+	int64_t MinimumNextRegister = -1;
+	int MinimumNextRegisterProtocol = -1;
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		if(!m_aProtocolEnabled[i])
+		{
+			continue;
+		}
+		if(m_aProtocols[i].m_NextRegister == -1)
+		{
+			m_aProtocols[i].m_NextRegister = Now;
+			continue;
+		}
+		if(m_aProtocols[i].m_PrevRegister > MaximumPrevRegister)
+		{
+			MaximumPrevRegister = m_aProtocols[i].m_PrevRegister;
+		}
+		if(MinimumNextRegisterProtocol == -1 || m_aProtocols[i].m_NextRegister < MinimumNextRegister)
+		{
+			MinimumNextRegisterProtocol = i;
+			MinimumNextRegister = m_aProtocols[i].m_NextRegister;
+		}
+	}
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		if(!m_aProtocolEnabled[i])
+		{
+			continue;
+		}
+		if(i == MinimumNextRegisterProtocol)
+		{
+			m_aProtocols[i].m_NextRegister = std::min(m_aProtocols[i].m_NextRegister, MaximumPrevRegister + Freq);
+		}
+		if(Now >= m_aProtocols[i].m_NextRegister)
+		{
+			m_aProtocols[i].SendRegister();
+		}
+	}
+}
+
+void CRegister::OnShutdown()
+{
+	for(int i = 0; i < NUM_PROTOCOLS; i++)
+	{
+		if(!m_aProtocolEnabled[i])
+		{
+			continue;
+		}
+		m_aProtocols[i].SendDeleteIfRegistered(true);
+	}
+}
+
+IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken)
+{
+	return new CRegister(pConfig, pConsole, pEngine, ServerPort, SixupSecurityToken);
+}
diff --git a/src_bkp/engine/server/register.h b/src_bkp/engine/server/register.h
new file mode 100644
index 0000000000..85bdf7a64c
--- /dev/null
+++ b/src_bkp/engine/server/register.h
@@ -0,0 +1,28 @@
+#ifndef ENGINE_SERVER_REGISTER_H
+#define ENGINE_SERVER_REGISTER_H
+
+class CConfig;
+class IConsole;
+class IEngine;
+struct CNetChunk;
+
+class IRegister
+{
+public:
+	virtual ~IRegister() {}
+
+	virtual void Update() = 0;
+	// Call `OnConfigChange` if you change relevant config variables
+	// without going through the console.
+	virtual void OnConfigChange() = 0;
+	// Returns `true` if the packet was a packet related to registering
+	// code and doesn't have to processed furtherly.
+	virtual bool OnPacket(const CNetChunk *pPacket) = 0;
+	// `pInfo` must be an encoded JSON object.
+	virtual void OnNewInfo(const char *pInfo) = 0;
+	virtual void OnShutdown() = 0;
+};
+
+IRegister *CreateRegister(CConfig *pConfig, IConsole *pConsole, IEngine *pEngine, int ServerPort, unsigned SixupSecurityToken);
+
+#endif
diff --git a/src_bkp/engine/server/server.cpp b/src_bkp/engine/server/server.cpp
new file mode 100644
index 0000000000..80cb967261
--- /dev/null
+++ b/src_bkp/engine/server/server.cpp
@@ -0,0 +1,3977 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "server.h"
+
+#include <base/logger.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/config.h>
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/map.h>
+#include <engine/server.h>
+#include <engine/storage.h>
+
+#include <engine/shared/compression.h>
+#include <engine/shared/config.h>
+#include <engine/shared/console.h>
+#include <engine/shared/demo.h>
+#include <engine/shared/econ.h>
+#include <engine/shared/fifo.h>
+#include <engine/shared/filecollection.h>
+#include <engine/shared/host_lookup.h>
+#include <engine/shared/http.h>
+#include <engine/shared/json.h>
+#include <engine/shared/masterserver.h>
+#include <engine/shared/netban.h>
+#include <engine/shared/network.h>
+#include <engine/shared/packer.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/protocol7.h>
+#include <engine/shared/protocol_ex.h>
+#include <engine/shared/rust_version.h>
+#include <engine/shared/snapshot.h>
+
+#include <game/version.h>
+
+// DDRace
+#include <engine/shared/linereader.h>
+#include <vector>
+#include <zlib.h>
+
+#include "databases/connection.h"
+#include "databases/connection_pool.h"
+#include "register.h"
+
+extern bool IsInterrupted();
+
+CSnapIDPool::CSnapIDPool()
+{
+	Reset();
+}
+
+void CSnapIDPool::Reset()
+{
+	for(int i = 0; i < MAX_IDS; i++)
+	{
+		m_aIDs[i].m_Next = i + 1;
+		m_aIDs[i].m_State = ID_FREE;
+	}
+
+	m_aIDs[MAX_IDS - 1].m_Next = -1;
+	m_FirstFree = 0;
+	m_FirstTimed = -1;
+	m_LastTimed = -1;
+	m_Usage = 0;
+	m_InUsage = 0;
+}
+
+void CSnapIDPool::RemoveFirstTimeout()
+{
+	int NextTimed = m_aIDs[m_FirstTimed].m_Next;
+
+	// add it to the free list
+	m_aIDs[m_FirstTimed].m_Next = m_FirstFree;
+	m_aIDs[m_FirstTimed].m_State = ID_FREE;
+	m_FirstFree = m_FirstTimed;
+
+	// remove it from the timed list
+	m_FirstTimed = NextTimed;
+	if(m_FirstTimed == -1)
+		m_LastTimed = -1;
+
+	m_Usage--;
+}
+
+int CSnapIDPool::NewID()
+{
+	int64_t Now = time_get();
+
+	// process timed ids
+	while(m_FirstTimed != -1 && m_aIDs[m_FirstTimed].m_Timeout < Now)
+		RemoveFirstTimeout();
+
+	int ID = m_FirstFree;
+	if(ID == -1)
+	{
+		dbg_msg("server", "invalid id");
+		return ID;
+	}
+	m_FirstFree = m_aIDs[m_FirstFree].m_Next;
+	m_aIDs[ID].m_State = ID_ALLOCATED;
+	m_Usage++;
+	m_InUsage++;
+	return ID;
+}
+
+void CSnapIDPool::TimeoutIDs()
+{
+	// process timed ids
+	while(m_FirstTimed != -1)
+		RemoveFirstTimeout();
+}
+
+void CSnapIDPool::FreeID(int ID)
+{
+	if(ID < 0)
+		return;
+	dbg_assert((size_t)ID < std::size(m_aIDs), "id is out of range");
+	dbg_assert(m_aIDs[ID].m_State == ID_ALLOCATED, "id is not allocated");
+
+	m_InUsage--;
+	m_aIDs[ID].m_State = ID_TIMED;
+	m_aIDs[ID].m_Timeout = time_get() + time_freq() * 5;
+	m_aIDs[ID].m_Next = -1;
+
+	if(m_LastTimed != -1)
+	{
+		m_aIDs[m_LastTimed].m_Next = ID;
+		m_LastTimed = ID;
+	}
+	else
+	{
+		m_FirstTimed = ID;
+		m_LastTimed = ID;
+	}
+}
+
+void CServerBan::InitServerBan(IConsole *pConsole, IStorage *pStorage, CServer *pServer)
+{
+	CNetBan::Init(pConsole, pStorage);
+
+	m_pServer = pServer;
+
+	// overwrites base command, todo: improve this
+	Console()->Register("ban", "s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_STORE, ConBanExt, this, "Ban player with ip/client id for x minutes for any reason");
+	Console()->Register("ban_region", "s[region] s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_STORE, ConBanRegion, this, "Ban player in a region");
+	Console()->Register("ban_region_range", "s[region] s[first ip] s[last ip] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_STORE, ConBanRegionRange, this, "Ban range in a region");
+}
+
+template<class T>
+int CServerBan::BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason)
+{
+	// validate address
+	if(Server()->m_RconClientID >= 0 && Server()->m_RconClientID < MAX_CLIENTS &&
+		Server()->m_aClients[Server()->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	{
+		if(NetMatch(pData, Server()->m_NetServer.ClientAddr(Server()->m_RconClientID)))
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (you can't ban yourself)");
+			return -1;
+		}
+
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(i == Server()->m_RconClientID || Server()->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY)
+				continue;
+
+			if(Server()->m_aClients[i].m_Authed >= Server()->m_RconAuthLevel && NetMatch(pData, Server()->m_NetServer.ClientAddr(i)))
+			{
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (command denied)");
+				return -1;
+			}
+		}
+	}
+	else if(Server()->m_RconClientID == IServer::RCON_CID_VOTE)
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(Server()->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY)
+				continue;
+
+			if(Server()->m_aClients[i].m_Authed != AUTHED_NO && NetMatch(pData, Server()->m_NetServer.ClientAddr(i)))
+			{
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (command denied)");
+				return -1;
+			}
+		}
+	}
+
+	int Result = Ban(pBanPool, pData, Seconds, pReason);
+	if(Result != 0)
+		return Result;
+
+	// drop banned clients
+	typename T::CDataType Data = *pData;
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(Server()->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY)
+			continue;
+
+		if(NetMatch(&Data, Server()->m_NetServer.ClientAddr(i)))
+		{
+			CNetHash NetHash(&Data);
+			char aBuf[256];
+			MakeBanInfo(pBanPool->Find(&Data, &NetHash), aBuf, sizeof(aBuf), MSGTYPE_PLAYER);
+			Server()->m_NetServer.Drop(i, aBuf);
+		}
+	}
+
+	return Result;
+}
+
+int CServerBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason)
+{
+	return BanExt(&m_BanAddrPool, pAddr, Seconds, pReason);
+}
+
+int CServerBan::BanRange(const CNetRange *pRange, int Seconds, const char *pReason)
+{
+	if(pRange->IsValid())
+		return BanExt(&m_BanRangePool, pRange, Seconds, pReason);
+
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (invalid range)");
+	return -1;
+}
+
+void CServerBan::ConBanExt(IConsole::IResult *pResult, void *pUser)
+{
+	CServerBan *pThis = static_cast<CServerBan *>(pUser);
+
+	const char *pStr = pResult->GetString(0);
+	int Minutes = pResult->NumArguments() > 1 ? clamp(pResult->GetInteger(1), 0, 525600) : 10;
+	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "Follow the server rules. Type /rules into the chat.";
+
+	if(str_isallnum(pStr))
+	{
+		int ClientID = str_toint(pStr);
+		if(ClientID < 0 || ClientID >= MAX_CLIENTS || pThis->Server()->m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+			pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (invalid client id)");
+		else
+			pThis->BanAddr(pThis->Server()->m_NetServer.ClientAddr(ClientID), Minutes * 60, pReason);
+	}
+	else
+		ConBan(pResult, pUser);
+}
+
+void CServerBan::ConBanRegion(IConsole::IResult *pResult, void *pUser)
+{
+	const char *pRegion = pResult->GetString(0);
+	if(str_comp_nocase(pRegion, g_Config.m_SvRegionName))
+		return;
+
+	pResult->RemoveArgument(0);
+	ConBanExt(pResult, pUser);
+}
+
+void CServerBan::ConBanRegionRange(IConsole::IResult *pResult, void *pUser)
+{
+	CServerBan *pServerBan = static_cast<CServerBan *>(pUser);
+
+	const char *pRegion = pResult->GetString(0);
+	if(str_comp_nocase(pRegion, g_Config.m_SvRegionName))
+		return;
+
+	pResult->RemoveArgument(0);
+	ConBanRange(pResult, static_cast<CNetBan *>(pServerBan));
+}
+
+// Not thread-safe!
+class CRconClientLogger : public ILogger
+{
+	CServer *m_pServer;
+	int m_ClientID;
+
+public:
+	CRconClientLogger(CServer *pServer, int ClientID) :
+		m_pServer(pServer),
+		m_ClientID(ClientID)
+	{
+	}
+	void Log(const CLogMessage *pMessage) override;
+};
+
+void CRconClientLogger::Log(const CLogMessage *pMessage)
+{
+	if(m_Filter.Filters(pMessage))
+	{
+		return;
+	}
+	m_pServer->SendRconLogLine(m_ClientID, pMessage);
+}
+
+void CServer::CClient::Reset()
+{
+	// reset input
+	for(auto &Input : m_aInputs)
+		Input.m_GameTick = -1;
+	m_CurrentInput = 0;
+	mem_zero(&m_LatestInput, sizeof(m_LatestInput));
+
+	m_Snapshots.PurgeAll();
+	m_LastAckedSnapshot = -1;
+	m_LastInputTick = -1;
+	m_SnapRate = CClient::SNAPRATE_INIT;
+	m_Score = -1;
+	m_NextMapChunk = 0;
+	m_Flags = 0;
+	m_RedirectDropTime = 0;
+}
+
+CServer::CServer()
+{
+	m_pConfig = &g_Config;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		m_aDemoRecorder[i] = CDemoRecorder(&m_SnapshotDelta, true);
+	m_aDemoRecorder[MAX_CLIENTS] = CDemoRecorder(&m_SnapshotDelta, false);
+
+	m_pGameServer = 0;
+
+	m_CurrentGameTick = MIN_TICK;
+	m_RunServer = UNINITIALIZED;
+
+	m_aShutdownReason[0] = 0;
+
+	for(int i = 0; i < NUM_MAP_TYPES; i++)
+	{
+		m_apCurrentMapData[i] = 0;
+		m_aCurrentMapSize[i] = 0;
+	}
+
+	m_MapReload = false;
+	m_ReloadedWhenEmpty = false;
+	m_aCurrentMap[0] = '\0';
+
+	m_RconClientID = IServer::RCON_CID_SERV;
+	m_RconAuthLevel = AUTHED_ADMIN;
+
+	m_ServerInfoFirstRequest = 0;
+	m_ServerInfoNumRequests = 0;
+	m_ServerInfoNeedsUpdate = false;
+
+#ifdef CONF_FAMILY_UNIX
+	m_ConnLoggingSocketCreated = false;
+#endif
+
+	m_pConnectionPool = new CDbConnectionPool();
+	m_pRegister = nullptr;
+
+	m_aErrorShutdownReason[0] = 0;
+
+	Init();
+}
+
+CServer::~CServer()
+{
+	for(auto &pCurrentMapData : m_apCurrentMapData)
+	{
+		free(pCurrentMapData);
+	}
+
+	if(m_RunServer != UNINITIALIZED)
+	{
+		for(auto &Client : m_aClients)
+		{
+			free(Client.m_pPersistentData);
+		}
+	}
+	free(m_pPersistentData);
+
+	delete m_pRegister;
+	delete m_pConnectionPool;
+}
+
+bool CServer::IsClientNameAvailable(int ClientID, const char *pNameRequest)
+{
+	// check for empty names
+	if(!pNameRequest[0])
+		return false;
+
+	// check for names starting with /, as they can be abused to make people
+	// write chat commands
+	if(pNameRequest[0] == '/')
+		return false;
+
+	// make sure that two clients don't have the same name
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(i != ClientID && m_aClients[i].m_State >= CClient::STATE_READY)
+		{
+			if(str_utf8_comp_confusable(pNameRequest, m_aClients[i].m_aName) == 0)
+				return false;
+		}
+	}
+
+	return true;
+}
+
+bool CServer::SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set)
+{
+	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid client id");
+	if(m_aClients[ClientID].m_State < CClient::STATE_READY)
+		return false;
+
+	const CNameBan *pBanned = m_NameBans.IsBanned(pNameRequest);
+	if(pBanned)
+	{
+		if(m_aClients[ClientID].m_State == CClient::STATE_READY && Set)
+		{
+			char aBuf[256];
+			if(pBanned->m_aReason[0])
+			{
+				str_format(aBuf, sizeof(aBuf), "Kicked (your name is banned: %s)", pBanned->m_aReason);
+			}
+			else
+			{
+				str_copy(aBuf, "Kicked (your name is banned)");
+			}
+			Kick(ClientID, aBuf);
+		}
+		return false;
+	}
+
+	// trim the name
+	char aTrimmedName[MAX_NAME_LENGTH];
+	str_copy(aTrimmedName, str_utf8_skip_whitespaces(pNameRequest));
+	str_utf8_trim_right(aTrimmedName);
+
+	char aNameTry[MAX_NAME_LENGTH];
+	str_copy(aNameTry, aTrimmedName);
+
+	if(!IsClientNameAvailable(ClientID, aNameTry))
+	{
+		// auto rename
+		for(int i = 1;; i++)
+		{
+			str_format(aNameTry, sizeof(aNameTry), "(%d)%s", i, aTrimmedName);
+			if(IsClientNameAvailable(ClientID, aNameTry))
+				break;
+		}
+	}
+
+	bool Changed = str_comp(m_aClients[ClientID].m_aName, aNameTry) != 0;
+
+	if(Set)
+	{
+		// set the client name
+		str_copy(m_aClients[ClientID].m_aName, aNameTry);
+	}
+
+	return Changed;
+}
+
+bool CServer::SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set)
+{
+	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid client id");
+	if(m_aClients[ClientID].m_State < CClient::STATE_READY)
+		return false;
+
+	const CNameBan *pBanned = m_NameBans.IsBanned(pClanRequest);
+	if(pBanned)
+	{
+		if(m_aClients[ClientID].m_State == CClient::STATE_READY && Set)
+		{
+			char aBuf[256];
+			if(pBanned->m_aReason[0])
+			{
+				str_format(aBuf, sizeof(aBuf), "Kicked (your clan is banned: %s)", pBanned->m_aReason);
+			}
+			else
+			{
+				str_copy(aBuf, "Kicked (your clan is banned)");
+			}
+			Kick(ClientID, aBuf);
+		}
+		return false;
+	}
+
+	// trim the clan
+	char aTrimmedClan[MAX_CLAN_LENGTH];
+	str_copy(aTrimmedClan, str_utf8_skip_whitespaces(pClanRequest));
+	str_utf8_trim_right(aTrimmedClan);
+
+	bool Changed = str_comp(m_aClients[ClientID].m_aClan, aTrimmedClan) != 0;
+
+	if(Set)
+	{
+		// set the client clan
+		str_copy(m_aClients[ClientID].m_aClan, aTrimmedClan);
+	}
+
+	return Changed;
+}
+
+bool CServer::WouldClientNameChange(int ClientID, const char *pNameRequest)
+{
+	return SetClientNameImpl(ClientID, pNameRequest, false);
+}
+
+bool CServer::WouldClientClanChange(int ClientID, const char *pClanRequest)
+{
+	return SetClientClanImpl(ClientID, pClanRequest, false);
+}
+
+void CServer::SetClientName(int ClientID, const char *pName)
+{
+	SetClientNameImpl(ClientID, pName, true);
+}
+
+void CServer::SetClientClan(int ClientID, const char *pClan)
+{
+	SetClientClanImpl(ClientID, pClan, true);
+}
+
+void CServer::SetClientCountry(int ClientID, int Country)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+		return;
+
+	m_aClients[ClientID].m_Country = Country;
+}
+
+void CServer::SetClientScore(int ClientID, std::optional<int> Score)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+		return;
+
+	if(m_aClients[ClientID].m_Score != Score)
+		ExpireServerInfo();
+
+	m_aClients[ClientID].m_Score = Score;
+}
+
+void CServer::SetClientFlags(int ClientID, int Flags)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CClient::STATE_READY)
+		return;
+
+	m_aClients[ClientID].m_Flags = Flags;
+}
+
+void CServer::Kick(int ClientID, const char *pReason)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "invalid client id to kick");
+		return;
+	}
+	else if(m_RconClientID == ClientID)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "you can't kick yourself");
+		return;
+	}
+	else if(m_aClients[ClientID].m_Authed > m_RconAuthLevel)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "kick command denied");
+		return;
+	}
+
+	m_NetServer.Drop(ClientID, pReason);
+}
+
+void CServer::Ban(int ClientID, int Seconds, const char *pReason)
+{
+	NETADDR Addr;
+	GetClientAddr(ClientID, &Addr);
+	m_NetServer.NetBan()->BanAddr(&Addr, Seconds, pReason);
+}
+
+void CServer::RedirectClient(int ClientID, int Port, bool Verbose)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+		return;
+
+	char aBuf[512];
+	bool SupportsRedirect = GetClientVersion(ClientID) >= VERSION_DDNET_REDIRECT;
+	if(Verbose)
+	{
+		str_format(aBuf, sizeof(aBuf), "redirecting '%s' to port %d supported=%d", ClientName(ClientID), Port, SupportsRedirect);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "redirect", aBuf);
+	}
+
+	if(!SupportsRedirect)
+	{
+		bool SamePort = Port == m_NetServer.Address().port;
+		str_format(aBuf, sizeof(aBuf), "Redirect unsupported: please connect to port %d", Port);
+		Kick(ClientID, SamePort ? "Redirect unsupported: please reconnect" : aBuf);
+		return;
+	}
+
+	CMsgPacker Msg(NETMSG_REDIRECT, true);
+	Msg.AddInt(Port);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+
+	m_aClients[ClientID].m_RedirectDropTime = time_get() + time_freq() * 10;
+	m_aClients[ClientID].m_State = CClient::STATE_REDIRECTED;
+}
+
+int64_t CServer::TickStartTime(int Tick)
+{
+	return m_GameStartTime + (time_freq() * Tick) / TickSpeed();
+}
+
+int CServer::Init()
+{
+	for(auto &Client : m_aClients)
+	{
+		Client.m_State = CClient::STATE_EMPTY;
+		Client.m_aName[0] = 0;
+		Client.m_aClan[0] = 0;
+		Client.m_Country = -1;
+		Client.m_Snapshots.Init();
+		Client.m_Traffic = 0;
+		Client.m_TrafficSince = 0;
+		Client.m_ShowIps = false;
+		Client.m_DebugDummy = false;
+		Client.m_AuthKey = -1;
+		Client.m_Latency = 0;
+		Client.m_Sixup = false;
+		Client.m_RedirectDropTime = 0;
+	}
+
+	m_CurrentGameTick = MIN_TICK;
+
+	m_AnnouncementLastLine = 0;
+	m_aAnnouncementFile[0] = '\0';
+	mem_zero(m_aPrevStates, sizeof(m_aPrevStates));
+
+	return 0;
+}
+
+void CServer::SendLogLine(const CLogMessage *pMessage)
+{
+	if(pMessage->m_Level <= IConsole::ToLogLevelFilter(g_Config.m_ConsoleOutputLevel))
+	{
+		SendRconLogLine(-1, pMessage);
+	}
+	if(pMessage->m_Level <= IConsole::ToLogLevelFilter(g_Config.m_EcOutputLevel))
+	{
+		m_Econ.Send(-1, pMessage->m_aLine);
+	}
+}
+
+void CServer::SetRconCID(int ClientID)
+{
+	m_RconClientID = ClientID;
+}
+
+int CServer::GetAuthedState(int ClientID) const
+{
+	return m_aClients[ClientID].m_Authed;
+}
+
+const char *CServer::GetAuthName(int ClientID) const
+{
+	int Key = m_aClients[ClientID].m_AuthKey;
+	if(Key == -1)
+	{
+		return 0;
+	}
+	return m_AuthManager.KeyIdent(Key);
+}
+
+bool CServer::GetClientInfo(int ClientID, CClientInfo *pInfo) const
+{
+	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "ClientID is not valid");
+	dbg_assert(pInfo != nullptr, "pInfo cannot be null");
+
+	if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	{
+		pInfo->m_pName = m_aClients[ClientID].m_aName;
+		pInfo->m_Latency = m_aClients[ClientID].m_Latency;
+		pInfo->m_GotDDNetVersion = m_aClients[ClientID].m_DDNetVersionSettled;
+		pInfo->m_DDNetVersion = m_aClients[ClientID].m_DDNetVersion >= 0 ? m_aClients[ClientID].m_DDNetVersion : VERSION_VANILLA;
+		if(m_aClients[ClientID].m_GotDDNetVersionPacket)
+		{
+			pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionID;
+			pInfo->m_pDDNetVersionStr = m_aClients[ClientID].m_aDDNetVersionStr;
+		}
+		else
+		{
+			pInfo->m_pConnectionID = nullptr;
+			pInfo->m_pDDNetVersionStr = nullptr;
+		}
+		return true;
+	}
+	return false;
+}
+
+void CServer::SetClientDDNetVersion(int ClientID, int DDNetVersion)
+{
+	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "ClientID is not valid");
+
+	if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	{
+		m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
+		m_aClients[ClientID].m_DDNetVersionSettled = true;
+	}
+}
+
+void CServer::GetClientAddr(int ClientID, char *pAddrStr, int Size) const
+{
+	if(ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+		net_addr_str(m_NetServer.ClientAddr(ClientID), pAddrStr, Size, false);
+}
+
+const char *CServer::ClientName(int ClientID) const
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+		return "(invalid)";
+	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientID].m_aName;
+	else
+		return "(connecting)";
+}
+
+const char *CServer::ClientClan(int ClientID) const
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+		return "";
+	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientID].m_aClan;
+	else
+		return "";
+}
+
+int CServer::ClientCountry(int ClientID) const
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
+		return -1;
+	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
+		return m_aClients[ClientID].m_Country;
+	else
+		return -1;
+}
+
+bool CServer::ClientIngame(int ClientID) const
+{
+	return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME;
+}
+
+bool CServer::ClientAuthed(int ClientID) const
+{
+	return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_Authed;
+}
+
+int CServer::Port() const
+{
+	return m_NetServer.Address().port;
+}
+
+int CServer::MaxClients() const
+{
+	return m_RunServer == UNINITIALIZED ? 0 : m_NetServer.MaxClients();
+}
+
+int CServer::ClientCount() const
+{
+	int ClientCount = 0;
+	for(const auto &Client : m_aClients)
+	{
+		if(Client.m_State != CClient::STATE_EMPTY)
+		{
+			ClientCount++;
+		}
+	}
+
+	return ClientCount;
+}
+
+int CServer::DistinctClientCount() const
+{
+	NETADDR aAddresses[MAX_CLIENTS];
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].m_State != CClient::STATE_EMPTY)
+		{
+			GetClientAddr(i, &aAddresses[i]);
+		}
+	}
+
+	int ClientCount = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		// connecting clients with spoofed ips can clog slots without being ingame
+		if(ClientIngame(i))
+		{
+			ClientCount++;
+			for(int j = 0; j < i; j++)
+			{
+				if(!net_addr_comp_noport(&aAddresses[i], &aAddresses[j]))
+				{
+					ClientCount--;
+					break;
+				}
+			}
+		}
+	}
+
+	return ClientCount;
+}
+
+int CServer::GetClientVersion(int ClientID) const
+{
+	// Assume latest client version for server demos
+	if(ClientID == SERVER_DEMO_CLIENT)
+		return DDNET_VERSION_NUMBER;
+
+	CClientInfo Info;
+	if(GetClientInfo(ClientID, &Info))
+		return Info.m_DDNetVersion;
+	return VERSION_NONE;
+}
+
+static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer, bool Sixup)
+{
+	int MsgId = pMsg->m_MsgID;
+	Packer.Reset();
+
+	if(Sixup && !pMsg->m_NoTranslate)
+	{
+		if(pMsg->m_System)
+		{
+			if(MsgId >= OFFSET_UUID)
+				;
+			else if(MsgId >= NETMSG_MAP_CHANGE && MsgId <= NETMSG_MAP_DATA)
+				;
+			else if(MsgId >= NETMSG_CON_READY && MsgId <= NETMSG_INPUTTIMING)
+				MsgId += 1;
+			else if(MsgId == NETMSG_RCON_LINE)
+				MsgId = protocol7::NETMSG_RCON_LINE;
+			else if(MsgId >= NETMSG_PING && MsgId <= NETMSG_PING_REPLY)
+				MsgId += 4;
+			else if(MsgId >= NETMSG_RCON_CMD_ADD && MsgId <= NETMSG_RCON_CMD_REM)
+				MsgId -= 11;
+			else
+			{
+				dbg_msg("net", "DROP send sys %d", MsgId);
+				return true;
+			}
+		}
+		else
+		{
+			if(MsgId >= 0 && MsgId < OFFSET_UUID)
+				MsgId = Msg_SixToSeven(MsgId);
+
+			if(MsgId < 0)
+				return true;
+		}
+	}
+
+	if(MsgId < OFFSET_UUID)
+	{
+		Packer.AddInt((MsgId << 1) | (pMsg->m_System ? 1 : 0));
+	}
+	else
+	{
+		Packer.AddInt(pMsg->m_System ? 1 : 0); // NETMSG_EX, NETMSGTYPE_EX
+		g_UuidManager.PackUuid(MsgId, &Packer);
+	}
+	Packer.AddRaw(pMsg->Data(), pMsg->Size());
+
+	return false;
+}
+
+int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
+{
+	CNetChunk Packet;
+	mem_zero(&Packet, sizeof(CNetChunk));
+	if(Flags & MSGFLAG_VITAL)
+		Packet.m_Flags |= NETSENDFLAG_VITAL;
+	if(Flags & MSGFLAG_FLUSH)
+		Packet.m_Flags |= NETSENDFLAG_FLUSH;
+
+	if(ClientID < 0)
+	{
+		CPacker Pack6, Pack7;
+		if(RepackMsg(pMsg, Pack6, false))
+			return -1;
+		if(RepackMsg(pMsg, Pack7, true))
+			return -1;
+
+		// write message to demo recorders
+		if(!(Flags & MSGFLAG_NORECORD))
+		{
+			for(auto &Recorder : m_aDemoRecorder)
+				if(Recorder.IsRecording())
+					Recorder.RecordMessage(Pack6.Data(), Pack6.Size());
+		}
+
+		if(!(Flags & MSGFLAG_NOSEND))
+		{
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				if(m_aClients[i].m_State == CClient::STATE_INGAME)
+				{
+					CPacker *pPack = m_aClients[i].m_Sixup ? &Pack7 : &Pack6;
+					Packet.m_pData = pPack->Data();
+					Packet.m_DataSize = pPack->Size();
+					Packet.m_ClientID = i;
+					if(Antibot()->OnEngineServerMessage(i, Packet.m_pData, Packet.m_DataSize, Flags))
+					{
+						continue;
+					}
+					m_NetServer.Send(&Packet);
+				}
+			}
+		}
+	}
+	else
+	{
+		CPacker Pack;
+		if(RepackMsg(pMsg, Pack, m_aClients[ClientID].m_Sixup))
+			return -1;
+
+		Packet.m_ClientID = ClientID;
+		Packet.m_pData = Pack.Data();
+		Packet.m_DataSize = Pack.Size();
+
+		if(Antibot()->OnEngineServerMessage(ClientID, Packet.m_pData, Packet.m_DataSize, Flags))
+		{
+			return 0;
+		}
+
+		// write message to demo recorders
+		if(!(Flags & MSGFLAG_NORECORD))
+		{
+			if(m_aDemoRecorder[ClientID].IsRecording())
+				m_aDemoRecorder[ClientID].RecordMessage(Pack.Data(), Pack.Size());
+			if(m_aDemoRecorder[MAX_CLIENTS].IsRecording())
+				m_aDemoRecorder[MAX_CLIENTS].RecordMessage(Pack.Data(), Pack.Size());
+		}
+
+		if(!(Flags & MSGFLAG_NOSEND))
+			m_NetServer.Send(&Packet);
+	}
+
+	return 0;
+}
+
+void CServer::SendMsgRaw(int ClientID, const void *pData, int Size, int Flags)
+{
+	CNetChunk Packet;
+	mem_zero(&Packet, sizeof(CNetChunk));
+	Packet.m_ClientID = ClientID;
+	Packet.m_pData = pData;
+	Packet.m_DataSize = Size;
+	Packet.m_Flags = 0;
+	if(Flags & MSGFLAG_VITAL)
+	{
+		Packet.m_Flags |= NETSENDFLAG_VITAL;
+	}
+	if(Flags & MSGFLAG_FLUSH)
+	{
+		Packet.m_Flags |= NETSENDFLAG_FLUSH;
+	}
+	m_NetServer.Send(&Packet);
+}
+
+void CServer::DoSnapshot()
+{
+	GameServer()->OnPreSnap();
+
+	// create snapshot for demo recording
+	if(m_aDemoRecorder[MAX_CLIENTS].IsRecording())
+	{
+		char aData[CSnapshot::MAX_SIZE];
+
+		// build snap and possibly add some messages
+		m_SnapshotBuilder.Init();
+		GameServer()->OnSnap(-1);
+		int SnapshotSize = m_SnapshotBuilder.Finish(aData);
+
+		// write snapshot
+		m_aDemoRecorder[MAX_CLIENTS].RecordSnapshot(Tick(), aData, SnapshotSize);
+	}
+
+	// create snapshots for all clients
+	for(int i = 0; i < MaxClients(); i++)
+	{
+		// client must be ingame to receive snapshots
+		if(m_aClients[i].m_State != CClient::STATE_INGAME)
+			continue;
+
+		// this client is trying to recover, don't spam snapshots
+		if(m_aClients[i].m_SnapRate == CClient::SNAPRATE_RECOVER && (Tick() % TickSpeed()) != 0)
+			continue;
+
+		// this client is trying to recover, don't spam snapshots
+		if(m_aClients[i].m_SnapRate == CClient::SNAPRATE_INIT && (Tick() % 10) != 0)
+			continue;
+
+		{
+			m_SnapshotBuilder.Init(m_aClients[i].m_Sixup);
+
+			GameServer()->OnSnap(i);
+
+			// finish snapshot
+			char aData[CSnapshot::MAX_SIZE];
+			CSnapshot *pData = (CSnapshot *)aData; // Fix compiler warning for strict-aliasing
+			int SnapshotSize = m_SnapshotBuilder.Finish(pData);
+
+			if(m_aDemoRecorder[i].IsRecording())
+			{
+				// write snapshot
+				m_aDemoRecorder[i].RecordSnapshot(Tick(), aData, SnapshotSize);
+			}
+
+			int Crc = pData->Crc();
+
+			// remove old snapshots
+			// keep 3 seconds worth of snapshots
+			m_aClients[i].m_Snapshots.PurgeUntil(m_CurrentGameTick - TickSpeed() * 3);
+
+			// save the snapshot
+			m_aClients[i].m_Snapshots.Add(m_CurrentGameTick, time_get(), SnapshotSize, pData, 0, nullptr);
+
+			// find snapshot that we can perform delta against
+			int DeltaTick = -1;
+			const CSnapshot *pDeltashot = CSnapshot::EmptySnapshot();
+			{
+				int DeltashotSize = m_aClients[i].m_Snapshots.Get(m_aClients[i].m_LastAckedSnapshot, 0, &pDeltashot, 0);
+				if(DeltashotSize >= 0)
+					DeltaTick = m_aClients[i].m_LastAckedSnapshot;
+				else
+				{
+					// no acked package found, force client to recover rate
+					if(m_aClients[i].m_SnapRate == CClient::SNAPRATE_FULL)
+						m_aClients[i].m_SnapRate = CClient::SNAPRATE_RECOVER;
+				}
+			}
+
+			// create delta
+			m_SnapshotDelta.SetStaticsize(protocol7::NETEVENTTYPE_SOUNDWORLD, m_aClients[i].m_Sixup);
+			m_SnapshotDelta.SetStaticsize(protocol7::NETEVENTTYPE_DAMAGE, m_aClients[i].m_Sixup);
+			char aDeltaData[CSnapshot::MAX_SIZE];
+			int DeltaSize = m_SnapshotDelta.CreateDelta(pDeltashot, pData, aDeltaData);
+
+			if(DeltaSize)
+			{
+				// compress it
+				const int MaxSize = MAX_SNAPSHOT_PACKSIZE;
+
+				char aCompData[CSnapshot::MAX_SIZE];
+				SnapshotSize = CVariableInt::Compress(aDeltaData, DeltaSize, aCompData, sizeof(aCompData));
+				int NumPackets = (SnapshotSize + MaxSize - 1) / MaxSize;
+
+				for(int n = 0, Left = SnapshotSize; Left > 0; n++)
+				{
+					int Chunk = Left < MaxSize ? Left : MaxSize;
+					Left -= Chunk;
+
+					if(NumPackets == 1)
+					{
+						CMsgPacker Msg(NETMSG_SNAPSINGLE, true);
+						Msg.AddInt(m_CurrentGameTick);
+						Msg.AddInt(m_CurrentGameTick - DeltaTick);
+						Msg.AddInt(Crc);
+						Msg.AddInt(Chunk);
+						Msg.AddRaw(&aCompData[n * MaxSize], Chunk);
+						SendMsg(&Msg, MSGFLAG_FLUSH, i);
+					}
+					else
+					{
+						CMsgPacker Msg(NETMSG_SNAP, true);
+						Msg.AddInt(m_CurrentGameTick);
+						Msg.AddInt(m_CurrentGameTick - DeltaTick);
+						Msg.AddInt(NumPackets);
+						Msg.AddInt(n);
+						Msg.AddInt(Crc);
+						Msg.AddInt(Chunk);
+						Msg.AddRaw(&aCompData[n * MaxSize], Chunk);
+						SendMsg(&Msg, MSGFLAG_FLUSH, i);
+					}
+				}
+			}
+			else
+			{
+				CMsgPacker Msg(NETMSG_SNAPEMPTY, true);
+				Msg.AddInt(m_CurrentGameTick);
+				Msg.AddInt(m_CurrentGameTick - DeltaTick);
+				SendMsg(&Msg, MSGFLAG_FLUSH, i);
+			}
+		}
+	}
+
+	GameServer()->OnPostSnap();
+}
+
+int CServer::ClientRejoinCallback(int ClientID, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+
+	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientID].m_AuthKey = -1;
+	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
+	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
+
+	pThis->m_aClients[ClientID].Reset();
+
+	pThis->GameServer()->TeehistorianRecordPlayerRejoin(ClientID);
+	pThis->Antibot()->OnEngineClientDrop(ClientID, "rejoin");
+	pThis->Antibot()->OnEngineClientJoin(ClientID, false);
+
+	pThis->SendMap(ClientID);
+
+	return 0;
+}
+
+int CServer::NewClientNoAuthCallback(int ClientID, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+
+	pThis->m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_NONE;
+
+	pThis->m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
+	pThis->m_aClients[ClientID].m_aName[0] = 0;
+	pThis->m_aClients[ClientID].m_aClan[0] = 0;
+	pThis->m_aClients[ClientID].m_Country = -1;
+	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientID].m_AuthKey = -1;
+	pThis->m_aClients[ClientID].m_AuthTries = 0;
+	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
+	pThis->m_aClients[ClientID].m_ShowIps = false;
+	pThis->m_aClients[ClientID].m_DebugDummy = false;
+	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
+	pThis->m_aClients[ClientID].Reset();
+
+	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientID, false);
+	pThis->Antibot()->OnEngineClientJoin(ClientID, false);
+
+	pThis->SendCapabilities(ClientID);
+	pThis->SendMap(ClientID);
+#if defined(CONF_FAMILY_UNIX)
+	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+#endif
+	return 0;
+}
+
+int CServer::NewClientCallback(int ClientID, void *pUser, bool Sixup)
+{
+	CServer *pThis = (CServer *)pUser;
+	pThis->m_aClients[ClientID].m_State = CClient::STATE_PREAUTH;
+	pThis->m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_NONE;
+	pThis->m_aClients[ClientID].m_aName[0] = 0;
+	pThis->m_aClients[ClientID].m_aClan[0] = 0;
+	pThis->m_aClients[ClientID].m_Country = -1;
+	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientID].m_AuthKey = -1;
+	pThis->m_aClients[ClientID].m_AuthTries = 0;
+	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
+	pThis->m_aClients[ClientID].m_Traffic = 0;
+	pThis->m_aClients[ClientID].m_TrafficSince = 0;
+	pThis->m_aClients[ClientID].m_ShowIps = false;
+	pThis->m_aClients[ClientID].m_DebugDummy = false;
+	pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE;
+	pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false;
+	pThis->m_aClients[ClientID].m_DDNetVersionSettled = false;
+	mem_zero(&pThis->m_aClients[ClientID].m_Addr, sizeof(NETADDR));
+	pThis->m_aClients[ClientID].Reset();
+
+	pThis->GameServer()->TeehistorianRecordPlayerJoin(ClientID, Sixup);
+	pThis->Antibot()->OnEngineClientJoin(ClientID, Sixup);
+
+	pThis->m_aClients[ClientID].m_Sixup = Sixup;
+
+#if defined(CONF_FAMILY_UNIX)
+	pThis->SendConnLoggingCommand(OPEN_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+#endif
+	return 0;
+}
+
+void CServer::InitDnsbl(int ClientID)
+{
+	NETADDR Addr = *m_NetServer.ClientAddr(ClientID);
+
+	//TODO: support ipv6
+	if(Addr.type != NETTYPE_IPV4)
+		return;
+
+	// build dnsbl host lookup
+	char aBuf[256];
+	if(Config()->m_SvDnsblKey[0] == '\0')
+	{
+		// without key
+		str_format(aBuf, sizeof(aBuf), "%d.%d.%d.%d.%s", Addr.ip[3], Addr.ip[2], Addr.ip[1], Addr.ip[0], Config()->m_SvDnsblHost);
+	}
+	else
+	{
+		// with key
+		str_format(aBuf, sizeof(aBuf), "%s.%d.%d.%d.%d.%s", Config()->m_SvDnsblKey, Addr.ip[3], Addr.ip[2], Addr.ip[1], Addr.ip[0], Config()->m_SvDnsblHost);
+	}
+
+	IEngine *pEngine = Kernel()->RequestInterface<IEngine>();
+	pEngine->AddJob(m_aClients[ClientID].m_pDnsblLookup = std::make_shared<CHostLookup>(aBuf, NETTYPE_IPV4));
+	m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_PENDING;
+}
+
+#ifdef CONF_FAMILY_UNIX
+void CServer::SendConnLoggingCommand(CONN_LOGGING_CMD Cmd, const NETADDR *pAddr)
+{
+	if(!Config()->m_SvConnLoggingServer[0] || !m_ConnLoggingSocketCreated)
+		return;
+
+	// pack the data and send it
+	unsigned char aData[23] = {0};
+	aData[0] = Cmd;
+	mem_copy(&aData[1], &pAddr->type, 4);
+	mem_copy(&aData[5], pAddr->ip, 16);
+	mem_copy(&aData[21], &pAddr->port, 2);
+
+	net_unix_send(m_ConnLoggingSocket, &m_ConnLoggingDestAddr, aData, sizeof(aData));
+}
+#endif
+
+int CServer::DelClientCallback(int ClientID, const char *pReason, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+
+	char aAddrStr[NETADDR_MAXSTRSIZE];
+	net_addr_str(pThis->m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=<{%s}> reason='%s'", ClientID, aAddrStr, pReason);
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
+
+	// notify the mod about the drop
+	if(pThis->m_aClients[ClientID].m_State >= CClient::STATE_READY)
+		pThis->GameServer()->OnClientDrop(ClientID, pReason);
+
+	pThis->m_aClients[ClientID].m_State = CClient::STATE_EMPTY;
+	pThis->m_aClients[ClientID].m_aName[0] = 0;
+	pThis->m_aClients[ClientID].m_aClan[0] = 0;
+	pThis->m_aClients[ClientID].m_Country = -1;
+	pThis->m_aClients[ClientID].m_Authed = AUTHED_NO;
+	pThis->m_aClients[ClientID].m_AuthKey = -1;
+	pThis->m_aClients[ClientID].m_AuthTries = 0;
+	pThis->m_aClients[ClientID].m_pRconCmdToSend = 0;
+	pThis->m_aClients[ClientID].m_Traffic = 0;
+	pThis->m_aClients[ClientID].m_TrafficSince = 0;
+	pThis->m_aClients[ClientID].m_ShowIps = false;
+	pThis->m_aClients[ClientID].m_DebugDummy = false;
+	pThis->m_aPrevStates[ClientID] = CClient::STATE_EMPTY;
+	pThis->m_aClients[ClientID].m_Snapshots.PurgeAll();
+	pThis->m_aClients[ClientID].m_Sixup = false;
+	pThis->m_aClients[ClientID].m_RedirectDropTime = 0;
+
+	pThis->GameServer()->TeehistorianRecordPlayerDrop(ClientID, pReason);
+	pThis->Antibot()->OnEngineClientDrop(ClientID, pReason);
+#if defined(CONF_FAMILY_UNIX)
+	pThis->SendConnLoggingCommand(CLOSE_SESSION, pThis->m_NetServer.ClientAddr(ClientID));
+#endif
+	return 0;
+}
+
+void CServer::SendRconType(int ClientID, bool UsernameReq)
+{
+	CMsgPacker Msg(NETMSG_RCONTYPE, true);
+	Msg.AddInt(UsernameReq);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CServer::GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pMapSha256, int *pMapCrc)
+{
+	str_copy(pMapName, GetMapName(), MapNameSize);
+	*pMapSize = m_aCurrentMapSize[MAP_TYPE_SIX];
+	*pMapSha256 = m_aCurrentMapSha256[MAP_TYPE_SIX];
+	*pMapCrc = m_aCurrentMapCrc[MAP_TYPE_SIX];
+}
+
+void CServer::SendCapabilities(int ClientID)
+{
+	CMsgPacker Msg(NETMSG_CAPABILITIES, true);
+	Msg.AddInt(SERVERCAP_CURVERSION); // version
+	Msg.AddInt(SERVERCAPFLAG_DDNET | SERVERCAPFLAG_CHATTIMEOUTCODE | SERVERCAPFLAG_ANYPLAYERFLAG | SERVERCAPFLAG_PINGEX | SERVERCAPFLAG_ALLOWDUMMY | SERVERCAPFLAG_SYNCWEAPONINPUT); // flags
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CServer::SendMap(int ClientID)
+{
+	int MapType = IsSixup(ClientID) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
+	{
+		CMsgPacker Msg(NETMSG_MAP_DETAILS, true);
+		Msg.AddString(GetMapName(), 0);
+		Msg.AddRaw(&m_aCurrentMapSha256[MapType].data, sizeof(m_aCurrentMapSha256[MapType].data));
+		Msg.AddInt(m_aCurrentMapCrc[MapType]);
+		Msg.AddInt(m_aCurrentMapSize[MapType]);
+		Msg.AddString("", 0); // HTTPS map download URL
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	}
+	{
+		CMsgPacker Msg(NETMSG_MAP_CHANGE, true);
+		Msg.AddString(GetMapName(), 0);
+		Msg.AddInt(m_aCurrentMapCrc[MapType]);
+		Msg.AddInt(m_aCurrentMapSize[MapType]);
+		if(MapType == MAP_TYPE_SIXUP)
+		{
+			Msg.AddInt(Config()->m_SvMapWindow);
+			Msg.AddInt(1024 - 128);
+			Msg.AddRaw(m_aCurrentMapSha256[MapType].data, sizeof(m_aCurrentMapSha256[MapType].data));
+		}
+		SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+	}
+
+	m_aClients[ClientID].m_NextMapChunk = 0;
+}
+
+void CServer::SendMapData(int ClientID, int Chunk)
+{
+	int MapType = IsSixup(ClientID) ? MAP_TYPE_SIXUP : MAP_TYPE_SIX;
+	unsigned int ChunkSize = 1024 - 128;
+	unsigned int Offset = Chunk * ChunkSize;
+	int Last = 0;
+
+	// drop faulty map data requests
+	if(Chunk < 0 || Offset > m_aCurrentMapSize[MapType])
+		return;
+
+	if(Offset + ChunkSize >= m_aCurrentMapSize[MapType])
+	{
+		ChunkSize = m_aCurrentMapSize[MapType] - Offset;
+		Last = 1;
+	}
+
+	CMsgPacker Msg(NETMSG_MAP_DATA, true);
+	if(MapType == MAP_TYPE_SIX)
+	{
+		Msg.AddInt(Last);
+		Msg.AddInt(m_aCurrentMapCrc[MAP_TYPE_SIX]);
+		Msg.AddInt(Chunk);
+		Msg.AddInt(ChunkSize);
+	}
+	Msg.AddRaw(&m_apCurrentMapData[MapType][Offset], ChunkSize);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+
+	if(Config()->m_Debug)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "sending chunk %d with size %d", Chunk, ChunkSize);
+		Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "server", aBuf);
+	}
+}
+
+void CServer::SendConnectionReady(int ClientID)
+{
+	CMsgPacker Msg(NETMSG_CON_READY, true);
+	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+}
+
+void CServer::SendRconLine(int ClientID, const char *pLine)
+{
+	CMsgPacker Msg(NETMSG_RCON_LINE, true);
+	Msg.AddString(pLine, 512);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CServer::SendRconLogLine(int ClientID, const CLogMessage *pMessage)
+{
+	const char *pLine = pMessage->m_aLine;
+	const char *pStart = str_find(pLine, "<{");
+	const char *pEnd = pStart == NULL ? NULL : str_find(pStart + 2, "}>");
+	const char *pLineWithoutIps;
+	char aLine[512];
+	char aLineWithoutIps[512];
+	aLine[0] = '\0';
+	aLineWithoutIps[0] = '\0';
+
+	if(pStart == NULL || pEnd == NULL)
+	{
+		pLineWithoutIps = pLine;
+	}
+	else
+	{
+		str_append(aLine, pLine, pStart - pLine + 1);
+		str_append(aLine, pStart + 2, pStart - pLine + pEnd - pStart - 1);
+		str_append(aLine, pEnd + 2);
+
+		str_append(aLineWithoutIps, pLine, pStart - pLine + 1);
+		str_append(aLineWithoutIps, "XXX");
+		str_append(aLineWithoutIps, pEnd + 2);
+
+		pLine = aLine;
+		pLineWithoutIps = aLineWithoutIps;
+	}
+
+	if(ClientID == -1)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_aClients[i].m_State != CClient::STATE_EMPTY && m_aClients[i].m_Authed >= AUTHED_ADMIN)
+				SendRconLine(i, m_aClients[i].m_ShowIps ? pLine : pLineWithoutIps);
+		}
+	}
+	else
+	{
+		if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY)
+			SendRconLine(ClientID, m_aClients[ClientID].m_ShowIps ? pLine : pLineWithoutIps);
+	}
+}
+
+void CServer::SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientID)
+{
+	CMsgPacker Msg(NETMSG_RCON_CMD_ADD, true);
+	Msg.AddString(pCommandInfo->m_pName, IConsole::TEMPCMD_NAME_LENGTH);
+	Msg.AddString(pCommandInfo->m_pHelp, IConsole::TEMPCMD_HELP_LENGTH);
+	Msg.AddString(pCommandInfo->m_pParams, IConsole::TEMPCMD_PARAMS_LENGTH);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CServer::SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientID)
+{
+	CMsgPacker Msg(NETMSG_RCON_CMD_REM, true);
+	Msg.AddString(pCommandInfo->m_pName, 256);
+	SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CServer::UpdateClientRconCommands()
+{
+	int ClientID = Tick() % MAX_CLIENTS;
+
+	if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY && m_aClients[ClientID].m_Authed)
+	{
+		int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER;
+		for(int i = 0; i < MAX_RCONCMD_SEND && m_aClients[ClientID].m_pRconCmdToSend; ++i)
+		{
+			SendRconCmdAdd(m_aClients[ClientID].m_pRconCmdToSend, ClientID);
+			m_aClients[ClientID].m_pRconCmdToSend = m_aClients[ClientID].m_pRconCmdToSend->NextCommandInfo(ConsoleAccessLevel, CFGFLAG_SERVER);
+		}
+	}
+}
+
+static inline int MsgFromSixup(int Msg, bool System)
+{
+	if(System)
+	{
+		if(Msg == NETMSG_INFO)
+			;
+		else if(Msg >= 14 && Msg <= 15)
+			Msg += 11;
+		else if(Msg >= 18 && Msg <= 28)
+			Msg = NETMSG_READY + Msg - 18;
+		else if(Msg < OFFSET_UUID)
+			return -1;
+	}
+
+	return Msg;
+}
+
+bool CServer::CheckReservedSlotAuth(int ClientID, const char *pPassword)
+{
+	char aBuf[256];
+
+	if(Config()->m_SvReservedSlotsPass[0] && !str_comp(Config()->m_SvReservedSlotsPass, pPassword))
+	{
+		str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with reserved pass", ClientID);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+		return true;
+	}
+
+	// "^([^:]*):(.*)$"
+	if(Config()->m_SvReservedSlotsAuthLevel != 4)
+	{
+		char aName[sizeof(Config()->m_Password)];
+		const char *pInnerPassword = str_next_token(pPassword, ":", aName, sizeof(aName));
+		if(!pInnerPassword)
+		{
+			return false;
+		}
+		int Slot = m_AuthManager.FindKey(aName);
+		if(m_AuthManager.CheckKey(Slot, pInnerPassword + 1) && m_AuthManager.KeyLevel(Slot) >= Config()->m_SvReservedSlotsAuthLevel)
+		{
+			str_format(aBuf, sizeof(aBuf), "cid=%d joining reserved slot with key=%s", ClientID, m_AuthManager.KeyIdent(Slot));
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void CServer::ProcessClientPacket(CNetChunk *pPacket)
+{
+	int ClientID = pPacket->m_ClientID;
+	CUnpacker Unpacker;
+	Unpacker.Reset(pPacket->m_pData, pPacket->m_DataSize);
+	CMsgPacker Packer(NETMSG_EX, true);
+
+	// unpack msgid and system flag
+	int Msg;
+	bool Sys;
+	CUuid Uuid;
+
+	int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+	if(Result == UNPACKMESSAGE_ERROR)
+	{
+		return;
+	}
+
+	if(m_aClients[ClientID].m_Sixup && (Msg = MsgFromSixup(Msg, Sys)) < 0)
+	{
+		return;
+	}
+
+	if(Config()->m_SvNetlimit && Msg != NETMSG_REQUEST_MAP_DATA)
+	{
+		int64_t Now = time_get();
+		int64_t Diff = Now - m_aClients[ClientID].m_TrafficSince;
+		double Alpha = Config()->m_SvNetlimitAlpha / 100.0;
+		double Limit = (double)(Config()->m_SvNetlimit * 1024) / time_freq();
+
+		if(m_aClients[ClientID].m_Traffic > Limit)
+		{
+			m_NetServer.NetBan()->BanAddr(&pPacket->m_Address, 600, "Stressing network");
+			return;
+		}
+		if(Diff > 100)
+		{
+			m_aClients[ClientID].m_Traffic = (Alpha * ((double)pPacket->m_DataSize / Diff)) + (1.0 - Alpha) * m_aClients[ClientID].m_Traffic;
+			m_aClients[ClientID].m_TrafficSince = Now;
+		}
+	}
+
+	if(Result == UNPACKMESSAGE_ANSWER)
+	{
+		SendMsg(&Packer, MSGFLAG_VITAL, ClientID);
+	}
+
+	if(Sys)
+	{
+		// system message
+		if(Msg == NETMSG_CLIENTVER)
+		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State == CClient::STATE_PREAUTH)
+			{
+				CUuid *pConnectionID = (CUuid *)Unpacker.GetRaw(sizeof(*pConnectionID));
+				int DDNetVersion = Unpacker.GetInt();
+				const char *pDDNetVersionStr = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+				if(Unpacker.Error() || !str_utf8_check(pDDNetVersionStr) || DDNetVersion < 0)
+				{
+					return;
+				}
+				m_aClients[ClientID].m_ConnectionID = *pConnectionID;
+				m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
+				str_copy(m_aClients[ClientID].m_aDDNetVersionStr, pDDNetVersionStr);
+				m_aClients[ClientID].m_DDNetVersionSettled = true;
+				m_aClients[ClientID].m_GotDDNetVersionPacket = true;
+				m_aClients[ClientID].m_State = CClient::STATE_AUTH;
+			}
+		}
+		else if(Msg == NETMSG_INFO)
+		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientID].m_State == CClient::STATE_PREAUTH || m_aClients[ClientID].m_State == CClient::STATE_AUTH))
+			{
+				const char *pVersion = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+				if(!str_utf8_check(pVersion))
+				{
+					return;
+				}
+				if(str_comp(pVersion, GameServer()->NetVersion()) != 0 && str_comp(pVersion, "0.7 802f1be60a05665f") != 0)
+				{
+					// wrong version
+					char aReason[256];
+					str_format(aReason, sizeof(aReason), "Wrong version. Server is running '%s' and client '%s'", GameServer()->NetVersion(), pVersion);
+					m_NetServer.Drop(ClientID, aReason);
+					return;
+				}
+
+				const char *pPassword = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+				if(!str_utf8_check(pPassword))
+				{
+					return;
+				}
+				if(Config()->m_Password[0] != 0 && str_comp(Config()->m_Password, pPassword) != 0)
+				{
+					// wrong password
+					m_NetServer.Drop(ClientID, "Wrong password");
+					return;
+				}
+
+				// reserved slot
+				if(ClientID >= Config()->m_SvMaxClients - Config()->m_SvReservedSlots && !CheckReservedSlotAuth(ClientID, pPassword))
+				{
+					m_NetServer.Drop(ClientID, "This server is full");
+					return;
+				}
+
+				m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
+				SendRconType(ClientID, m_AuthManager.NumNonDefaultKeys() > 0);
+				SendCapabilities(ClientID);
+				SendMap(ClientID);
+			}
+		}
+		else if(Msg == NETMSG_REQUEST_MAP_DATA)
+		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) == 0 || m_aClients[ClientID].m_State < CClient::STATE_CONNECTING)
+				return;
+
+			if(m_aClients[ClientID].m_Sixup)
+			{
+				for(int i = 0; i < Config()->m_SvMapWindow; i++)
+				{
+					SendMapData(ClientID, m_aClients[ClientID].m_NextMapChunk++);
+				}
+				return;
+			}
+
+			int Chunk = Unpacker.GetInt();
+			if(Chunk != m_aClients[ClientID].m_NextMapChunk || !Config()->m_SvFastDownload)
+			{
+				SendMapData(ClientID, Chunk);
+				return;
+			}
+
+			if(Chunk == 0)
+			{
+				for(int i = 0; i < Config()->m_SvMapWindow; i++)
+				{
+					SendMapData(ClientID, i);
+				}
+			}
+			SendMapData(ClientID, Config()->m_SvMapWindow + m_aClients[ClientID].m_NextMapChunk);
+			m_aClients[ClientID].m_NextMapChunk++;
+		}
+		else if(Msg == NETMSG_READY)
+		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && (m_aClients[ClientID].m_State == CClient::STATE_CONNECTING))
+			{
+				char aAddrStr[NETADDR_MAXSTRSIZE];
+				net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "player is ready. ClientID=%d addr=<{%s}> secure=%s", ClientID, aAddrStr, m_NetServer.HasSecurityToken(ClientID) ? "yes" : "no");
+				Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
+
+				void *pPersistentData = 0;
+				if(m_aClients[ClientID].m_HasPersistentData)
+				{
+					pPersistentData = m_aClients[ClientID].m_pPersistentData;
+					m_aClients[ClientID].m_HasPersistentData = false;
+				}
+				m_aClients[ClientID].m_State = CClient::STATE_READY;
+				GameServer()->OnClientConnected(ClientID, pPersistentData);
+			}
+
+			SendConnectionReady(ClientID);
+		}
+		else if(Msg == NETMSG_ENTERGAME)
+		{
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State == CClient::STATE_READY && GameServer()->IsClientReady(ClientID))
+			{
+				char aAddrStr[NETADDR_MAXSTRSIZE];
+				net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "player has entered the game. ClientID=%d addr=<{%s}> sixup=%d", ClientID, aAddrStr, IsSixup(ClientID));
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+				m_aClients[ClientID].m_State = CClient::STATE_INGAME;
+				if(!IsSixup(ClientID))
+				{
+					SendServerInfo(m_NetServer.ClientAddr(ClientID), -1, SERVERINFO_EXTENDED, false);
+				}
+				else
+				{
+					CMsgPacker Msgp(protocol7::NETMSG_SERVERINFO, true, true);
+					GetServerInfoSixup(&Msgp, -1, false);
+					SendMsg(&Msgp, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+				}
+				GameServer()->OnClientEnter(ClientID);
+			}
+		}
+		else if(Msg == NETMSG_INPUT)
+		{
+			m_aClients[ClientID].m_LastAckedSnapshot = Unpacker.GetInt();
+			int IntendedTick = Unpacker.GetInt();
+			int Size = Unpacker.GetInt();
+
+			// check for errors
+			if(Unpacker.Error() || Size / 4 > MAX_INPUT_SIZE || IntendedTick < MIN_TICK || IntendedTick >= MAX_TICK)
+				return;
+
+			if(m_aClients[ClientID].m_LastAckedSnapshot > 0)
+				m_aClients[ClientID].m_SnapRate = CClient::SNAPRATE_FULL;
+
+			int64_t TagTime;
+			if(m_aClients[ClientID].m_Snapshots.Get(m_aClients[ClientID].m_LastAckedSnapshot, &TagTime, 0, 0) >= 0)
+				m_aClients[ClientID].m_Latency = (int)(((time_get() - TagTime) * 1000) / time_freq());
+
+			// add message to report the input timing
+			// skip packets that are old
+			if(IntendedTick > m_aClients[ClientID].m_LastInputTick)
+			{
+				const int TimeLeft = (TickStartTime(IntendedTick) - time_get()) / (time_freq() / 1000);
+
+				CMsgPacker Msgp(NETMSG_INPUTTIMING, true);
+				Msgp.AddInt(IntendedTick);
+				Msgp.AddInt(TimeLeft);
+				SendMsg(&Msgp, 0, ClientID);
+			}
+
+			m_aClients[ClientID].m_LastInputTick = IntendedTick;
+
+			CClient::CInput *pInput = &m_aClients[ClientID].m_aInputs[m_aClients[ClientID].m_CurrentInput];
+
+			if(IntendedTick <= Tick())
+				IntendedTick = Tick() + 1;
+
+			pInput->m_GameTick = IntendedTick;
+
+			for(int i = 0; i < Size / 4; i++)
+				pInput->m_aData[i] = Unpacker.GetInt();
+
+			GameServer()->OnClientPrepareInput(ClientID, pInput->m_aData);
+			mem_copy(m_aClients[ClientID].m_LatestInput.m_aData, pInput->m_aData, MAX_INPUT_SIZE * sizeof(int));
+
+			m_aClients[ClientID].m_CurrentInput++;
+			m_aClients[ClientID].m_CurrentInput %= 200;
+
+			// call the mod with the fresh input data
+			if(m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+				GameServer()->OnClientDirectInput(ClientID, m_aClients[ClientID].m_LatestInput.m_aData);
+		}
+		else if(Msg == NETMSG_RCON_CMD)
+		{
+			const char *pCmd = Unpacker.GetString();
+			if(!str_utf8_check(pCmd))
+			{
+				return;
+			}
+			if(Unpacker.Error() == 0 && !str_comp(pCmd, "crashmeplx"))
+			{
+				int Version = m_aClients[ClientID].m_DDNetVersion;
+				if(GameServer()->PlayerExists(ClientID) && Version < VERSION_DDNET_OLD)
+				{
+					m_aClients[ClientID].m_DDNetVersion = VERSION_DDNET_OLD;
+				}
+			}
+			else if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Unpacker.Error() == 0 && m_aClients[ClientID].m_Authed)
+			{
+				if(GameServer()->PlayerExists(ClientID))
+				{
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "ClientID=%d rcon='%s'", ClientID, pCmd);
+					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+					m_RconClientID = ClientID;
+					m_RconAuthLevel = m_aClients[ClientID].m_Authed;
+					Console()->SetAccessLevel(m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : m_aClients[ClientID].m_Authed == AUTHED_HELPER ? IConsole::ACCESS_LEVEL_HELPER : IConsole::ACCESS_LEVEL_USER);
+					{
+						CRconClientLogger Logger(this, ClientID);
+						CLogScope Scope(&Logger);
+						Console()->ExecuteLineFlag(pCmd, CFGFLAG_SERVER, ClientID);
+					}
+					Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
+					m_RconClientID = IServer::RCON_CID_SERV;
+					m_RconAuthLevel = AUTHED_ADMIN;
+				}
+			}
+		}
+		else if(Msg == NETMSG_RCON_AUTH)
+		{
+			const char *pName = "";
+			if(!IsSixup(ClientID))
+				pName = Unpacker.GetString(CUnpacker::SANITIZE_CC); // login name, now used
+			const char *pPw = Unpacker.GetString(CUnpacker::SANITIZE_CC);
+			if(!str_utf8_check(pPw) || !str_utf8_check(pName))
+			{
+				return;
+			}
+
+			if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Unpacker.Error() == 0)
+			{
+				int AuthLevel = -1;
+				int KeySlot = -1;
+
+				if(!pName[0])
+				{
+					if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_ADMIN)), pPw))
+						AuthLevel = AUTHED_ADMIN;
+					else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_MOD)), pPw))
+						AuthLevel = AUTHED_MOD;
+					else if(m_AuthManager.CheckKey((KeySlot = m_AuthManager.DefaultKey(AUTHED_HELPER)), pPw))
+						AuthLevel = AUTHED_HELPER;
+				}
+				else
+				{
+					KeySlot = m_AuthManager.FindKey(pName);
+					if(m_AuthManager.CheckKey(KeySlot, pPw))
+						AuthLevel = m_AuthManager.KeyLevel(KeySlot);
+				}
+
+				if(AuthLevel != -1)
+				{
+					if(m_aClients[ClientID].m_Authed != AuthLevel)
+					{
+						if(!IsSixup(ClientID))
+						{
+							CMsgPacker Msgp(NETMSG_RCON_AUTH_STATUS, true);
+							Msgp.AddInt(1); //authed
+							Msgp.AddInt(1); //cmdlist
+							SendMsg(&Msgp, MSGFLAG_VITAL, ClientID);
+						}
+						else
+						{
+							CMsgPacker Msgp(protocol7::NETMSG_RCON_AUTH_ON, true, true);
+							SendMsg(&Msgp, MSGFLAG_VITAL, ClientID);
+						}
+
+						m_aClients[ClientID].m_Authed = AuthLevel; // Keeping m_Authed around is unwise...
+						m_aClients[ClientID].m_AuthKey = KeySlot;
+						int SendRconCmds = IsSixup(ClientID) ? true : Unpacker.GetInt();
+						if(Unpacker.Error() == 0 && SendRconCmds)
+							// AUTHED_ADMIN - AuthLevel gets the proper IConsole::ACCESS_LEVEL_<x>
+							m_aClients[ClientID].m_pRconCmdToSend = Console()->FirstCommandInfo(AUTHED_ADMIN - AuthLevel, CFGFLAG_SERVER);
+
+						char aBuf[256];
+						const char *pIdent = m_AuthManager.KeyIdent(KeySlot);
+						switch(AuthLevel)
+						{
+						case AUTHED_ADMIN:
+						{
+							SendRconLine(ClientID, "Admin authentication successful. Full remote console access granted.");
+							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (admin)", ClientID, pIdent);
+							break;
+						}
+						case AUTHED_MOD:
+						{
+							SendRconLine(ClientID, "Moderator authentication successful. Limited remote console access granted.");
+							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (moderator)", ClientID, pIdent);
+							break;
+						}
+						case AUTHED_HELPER:
+						{
+							SendRconLine(ClientID, "Helper authentication successful. Limited remote console access granted.");
+							str_format(aBuf, sizeof(aBuf), "ClientID=%d authed with key=%s (helper)", ClientID, pIdent);
+							break;
+						}
+						}
+						Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+
+						// DDRace
+						GameServer()->OnSetAuthed(ClientID, AuthLevel);
+					}
+				}
+				else if(Config()->m_SvRconMaxTries)
+				{
+					m_aClients[ClientID].m_AuthTries++;
+					char aBuf[128];
+					str_format(aBuf, sizeof(aBuf), "Wrong password %d/%d.", m_aClients[ClientID].m_AuthTries, Config()->m_SvRconMaxTries);
+					SendRconLine(ClientID, aBuf);
+					if(m_aClients[ClientID].m_AuthTries >= Config()->m_SvRconMaxTries)
+					{
+						if(!Config()->m_SvRconBantime)
+							m_NetServer.Drop(ClientID, "Too many remote console authentication tries");
+						else
+							m_ServerBan.BanAddr(m_NetServer.ClientAddr(ClientID), Config()->m_SvRconBantime * 60, "Too many remote console authentication tries");
+					}
+				}
+				else
+				{
+					SendRconLine(ClientID, "Wrong password.");
+				}
+			}
+		}
+		else if(Msg == NETMSG_PING)
+		{
+			CMsgPacker Msgp(NETMSG_PING_REPLY, true);
+			SendMsg(&Msgp, MSGFLAG_FLUSH, ClientID);
+		}
+		else if(Msg == NETMSG_PINGEX)
+		{
+			CUuid *pID = (CUuid *)Unpacker.GetRaw(sizeof(*pID));
+			if(Unpacker.Error())
+			{
+				return;
+			}
+			CMsgPacker Msgp(NETMSG_PONGEX, true);
+			Msgp.AddRaw(pID, sizeof(*pID));
+			SendMsg(&Msgp, MSGFLAG_FLUSH, ClientID);
+		}
+		else
+		{
+			if(Config()->m_Debug)
+			{
+				constexpr int MaxDumpedDataSize = 32;
+				char aBuf[MaxDumpedDataSize * 3 + 1];
+				str_hex(aBuf, sizeof(aBuf), pPacket->m_pData, minimum(pPacket->m_DataSize, MaxDumpedDataSize));
+
+				char aBufMsg[256];
+				str_format(aBufMsg, sizeof(aBufMsg), "strange message ClientID=%d msg=%d data_size=%d", ClientID, Msg, pPacket->m_DataSize);
+				Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "server", aBufMsg);
+				Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "server", aBuf);
+			}
+		}
+	}
+	else
+	{
+		// game message
+		if((pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && m_aClients[ClientID].m_State >= CClient::STATE_READY)
+			GameServer()->OnMessage(Msg, &Unpacker, ClientID);
+	}
+}
+
+bool CServer::RateLimitServerInfoConnless()
+{
+	bool SendClients = true;
+	if(Config()->m_SvServerInfoPerSecond)
+	{
+		SendClients = m_ServerInfoNumRequests <= Config()->m_SvServerInfoPerSecond;
+		const int64_t Now = Tick();
+
+		if(Now <= m_ServerInfoFirstRequest + TickSpeed())
+		{
+			m_ServerInfoNumRequests++;
+		}
+		else
+		{
+			m_ServerInfoNumRequests = 1;
+			m_ServerInfoFirstRequest = Now;
+		}
+	}
+
+	return SendClients;
+}
+
+void CServer::SendServerInfoConnless(const NETADDR *pAddr, int Token, int Type)
+{
+	SendServerInfo(pAddr, Token, Type, RateLimitServerInfoConnless());
+}
+
+static inline int GetCacheIndex(int Type, bool SendClient)
+{
+	if(Type == SERVERINFO_INGAME)
+		Type = SERVERINFO_VANILLA;
+	else if(Type == SERVERINFO_EXTENDED_MORE)
+		Type = SERVERINFO_EXTENDED;
+
+	return Type * 2 + SendClient;
+}
+
+CServer::CCache::CCache()
+{
+	m_vCache.clear();
+}
+
+CServer::CCache::~CCache()
+{
+	Clear();
+}
+
+CServer::CCache::CCacheChunk::CCacheChunk(const void *pData, int Size)
+{
+	m_vData.assign((const uint8_t *)pData, (const uint8_t *)pData + Size);
+}
+
+void CServer::CCache::AddChunk(const void *pData, int Size)
+{
+	m_vCache.emplace_back(pData, Size);
+}
+
+void CServer::CCache::Clear()
+{
+	m_vCache.clear();
+}
+
+void CServer::CacheServerInfo(CCache *pCache, int Type, bool SendClients)
+{
+	pCache->Clear();
+
+	// One chance to improve the protocol!
+	CPacker p;
+	char aBuf[128];
+
+	// count the players
+	int PlayerCount = 0, ClientCount = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].IncludedInServerInfo())
+		{
+			if(GameServer()->IsClientPlayer(i))
+				PlayerCount++;
+
+			ClientCount++;
+		}
+	}
+
+	p.Reset();
+
+#define ADD_RAW(p, x) (p).AddRaw(x, sizeof(x))
+#define ADD_INT(p, x) \
+	do \
+	{ \
+		str_from_int(x, aBuf); \
+		(p).AddString(aBuf, 0); \
+	} while(0)
+
+	p.AddString(GameServer()->Version(), 32);
+	if(Type != SERVERINFO_VANILLA)
+	{
+		p.AddString(Config()->m_SvName, 256);
+	}
+	else
+	{
+		if(m_NetServer.MaxClients() <= VANILLA_MAX_CLIENTS)
+		{
+			p.AddString(Config()->m_SvName, 64);
+		}
+		else
+		{
+			const int MaxClients = maximum(ClientCount, m_NetServer.MaxClients() - Config()->m_SvReservedSlots);
+			str_format(aBuf, sizeof(aBuf), "%s [%d/%d]", Config()->m_SvName, ClientCount, MaxClients);
+			p.AddString(aBuf, 64);
+		}
+	}
+	p.AddString(GetMapName(), 32);
+
+	if(Type == SERVERINFO_EXTENDED)
+	{
+		ADD_INT(p, m_aCurrentMapCrc[MAP_TYPE_SIX]);
+		ADD_INT(p, m_aCurrentMapSize[MAP_TYPE_SIX]);
+	}
+
+	// gametype
+	p.AddString(GameServer()->GameType(), 16);
+
+	// flags
+	ADD_INT(p, Config()->m_Password[0] ? SERVER_FLAG_PASSWORD : 0);
+
+	int MaxClients = m_NetServer.MaxClients();
+	// How many clients the used serverinfo protocol supports, has to be tracked
+	// separately to make sure we don't subtract the reserved slots from it
+	int MaxClientsProtocol = MAX_CLIENTS;
+	if(Type == SERVERINFO_VANILLA || Type == SERVERINFO_INGAME)
+	{
+		if(ClientCount >= VANILLA_MAX_CLIENTS)
+		{
+			if(ClientCount < MaxClients)
+				ClientCount = VANILLA_MAX_CLIENTS - 1;
+			else
+				ClientCount = VANILLA_MAX_CLIENTS;
+		}
+		MaxClientsProtocol = VANILLA_MAX_CLIENTS;
+		if(PlayerCount > ClientCount)
+			PlayerCount = ClientCount;
+	}
+
+	ADD_INT(p, PlayerCount); // num players
+	ADD_INT(p, minimum(MaxClientsProtocol, maximum(MaxClients - maximum(Config()->m_SvSpectatorSlots, Config()->m_SvReservedSlots), PlayerCount))); // max players
+	ADD_INT(p, ClientCount); // num clients
+	ADD_INT(p, minimum(MaxClientsProtocol, maximum(MaxClients - Config()->m_SvReservedSlots, ClientCount))); // max clients
+
+	if(Type == SERVERINFO_EXTENDED)
+		p.AddString("", 0); // extra info, reserved
+
+	const void *pPrefix = p.Data();
+	int PrefixSize = p.Size();
+
+	CPacker q;
+	int ChunksStored = 0;
+	int PlayersStored = 0;
+
+#define SAVE(size) \
+	do \
+	{ \
+		pCache->AddChunk(q.Data(), size); \
+		ChunksStored++; \
+	} while(0)
+
+#define RESET() \
+	do \
+	{ \
+		q.Reset(); \
+		q.AddRaw(pPrefix, PrefixSize); \
+	} while(0)
+
+	RESET();
+
+	if(Type == SERVERINFO_64_LEGACY)
+		q.AddInt(PlayersStored); // offset
+
+	if(!SendClients)
+	{
+		SAVE(q.Size());
+		return;
+	}
+
+	if(Type == SERVERINFO_EXTENDED)
+	{
+		pPrefix = "";
+		PrefixSize = 0;
+	}
+
+	int Remaining;
+	switch(Type)
+	{
+	case SERVERINFO_EXTENDED: Remaining = -1; break;
+	case SERVERINFO_64_LEGACY: Remaining = 24; break;
+	case SERVERINFO_VANILLA: Remaining = VANILLA_MAX_CLIENTS; break;
+	case SERVERINFO_INGAME: Remaining = VANILLA_MAX_CLIENTS; break;
+	default: dbg_assert(0, "caught earlier, unreachable"); return;
+	}
+
+	// Use the following strategy for sending:
+	// For vanilla, send the first 16 players.
+	// For legacy 64p, send 24 players per packet.
+	// For extended, send as much players as possible.
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].IncludedInServerInfo())
+		{
+			if(Remaining == 0)
+			{
+				if(Type == SERVERINFO_VANILLA || Type == SERVERINFO_INGAME)
+					break;
+
+				// Otherwise we're SERVERINFO_64_LEGACY.
+				SAVE(q.Size());
+				RESET();
+				q.AddInt(PlayersStored); // offset
+				Remaining = 24;
+			}
+			if(Remaining > 0)
+			{
+				Remaining--;
+			}
+
+			int PreviousSize = q.Size();
+
+			q.AddString(ClientName(i), MAX_NAME_LENGTH); // client name
+			q.AddString(ClientClan(i), MAX_CLAN_LENGTH); // client clan
+
+			ADD_INT(q, m_aClients[i].m_Country); // client country
+
+			int Score;
+			if(m_aClients[i].m_Score.has_value())
+			{
+				Score = m_aClients[i].m_Score.value();
+				if(Score == 9999)
+					Score = -10000;
+				else if(Score == 0) // 0 time isn't displayed otherwise.
+					Score = -1;
+				else
+					Score = -Score;
+			}
+			else
+			{
+				Score = -9999;
+			}
+
+			ADD_INT(q, Score); // client score
+			ADD_INT(q, GameServer()->IsClientPlayer(i) ? 1 : 0); // is player?
+			if(Type == SERVERINFO_EXTENDED)
+				q.AddString("", 0); // extra info, reserved
+
+			if(Type == SERVERINFO_EXTENDED)
+			{
+				if(q.Size() >= NET_MAX_PAYLOAD - 18) // 8 bytes for type, 10 bytes for the largest token
+				{
+					// Retry current player.
+					i--;
+					SAVE(PreviousSize);
+					RESET();
+					ADD_INT(q, ChunksStored);
+					q.AddString("", 0); // extra info, reserved
+					continue;
+				}
+			}
+			PlayersStored++;
+		}
+	}
+
+	SAVE(q.Size());
+#undef SAVE
+#undef RESET
+#undef ADD_RAW
+#undef ADD_INT
+}
+
+void CServer::CacheServerInfoSixup(CCache *pCache, bool SendClients)
+{
+	pCache->Clear();
+
+	CPacker Packer;
+	Packer.Reset();
+
+	// Could be moved to a separate function and cached
+	// count the players
+	int PlayerCount = 0, ClientCount = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].IncludedInServerInfo())
+		{
+			if(GameServer()->IsClientPlayer(i))
+				PlayerCount++;
+
+			ClientCount++;
+		}
+	}
+
+	char aVersion[32];
+	str_format(aVersion, sizeof(aVersion), "0.7↔%s", GameServer()->Version());
+	Packer.AddString(aVersion, 32);
+	Packer.AddString(Config()->m_SvName, 64);
+	Packer.AddString(Config()->m_SvHostname, 128);
+	Packer.AddString(GetMapName(), 32);
+
+	// gametype
+	Packer.AddString(GameServer()->GameType(), 16);
+
+	// flags
+	int Flags = SERVER_FLAG_TIMESCORE;
+	if(Config()->m_Password[0]) // password set
+		Flags |= SERVER_FLAG_PASSWORD;
+	Packer.AddInt(Flags);
+
+	int MaxClients = m_NetServer.MaxClients();
+	Packer.AddInt(Config()->m_SvSkillLevel); // server skill level
+	Packer.AddInt(PlayerCount); // num players
+	Packer.AddInt(maximum(MaxClients - maximum(Config()->m_SvSpectatorSlots, Config()->m_SvReservedSlots), PlayerCount)); // max players
+	Packer.AddInt(ClientCount); // num clients
+	Packer.AddInt(maximum(MaxClients - Config()->m_SvReservedSlots, ClientCount)); // max clients
+
+	if(SendClients)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_aClients[i].IncludedInServerInfo())
+			{
+				Packer.AddString(ClientName(i), MAX_NAME_LENGTH); // client name
+				Packer.AddString(ClientClan(i), MAX_CLAN_LENGTH); // client clan
+				Packer.AddInt(m_aClients[i].m_Country); // client country
+				Packer.AddInt(m_aClients[i].m_Score.value_or(-1)); // client score
+				Packer.AddInt(GameServer()->IsClientPlayer(i) ? 0 : 1); // flag spectator=1, bot=2 (player=0)
+			}
+		}
+	}
+
+	pCache->AddChunk(Packer.Data(), Packer.Size());
+}
+
+void CServer::SendServerInfo(const NETADDR *pAddr, int Token, int Type, bool SendClients)
+{
+	CPacker p;
+	char aBuf[128];
+	p.Reset();
+
+	CCache *pCache = &m_aServerInfoCache[GetCacheIndex(Type, SendClients)];
+
+#define ADD_RAW(p, x) (p).AddRaw(x, sizeof(x))
+#define ADD_INT(p, x) \
+	do \
+	{ \
+		str_from_int(x, aBuf); \
+		(p).AddString(aBuf, 0); \
+	} while(0)
+
+	CNetChunk Packet;
+	Packet.m_ClientID = -1;
+	Packet.m_Address = *pAddr;
+	Packet.m_Flags = NETSENDFLAG_CONNLESS;
+
+	for(const auto &Chunk : pCache->m_vCache)
+	{
+		p.Reset();
+		if(Type == SERVERINFO_EXTENDED)
+		{
+			if(&Chunk == &pCache->m_vCache.front())
+				p.AddRaw(SERVERBROWSE_INFO_EXTENDED, sizeof(SERVERBROWSE_INFO_EXTENDED));
+			else
+				p.AddRaw(SERVERBROWSE_INFO_EXTENDED_MORE, sizeof(SERVERBROWSE_INFO_EXTENDED_MORE));
+			ADD_INT(p, Token);
+		}
+		else if(Type == SERVERINFO_64_LEGACY)
+		{
+			ADD_RAW(p, SERVERBROWSE_INFO_64_LEGACY);
+			ADD_INT(p, Token);
+		}
+		else if(Type == SERVERINFO_VANILLA || Type == SERVERINFO_INGAME)
+		{
+			ADD_RAW(p, SERVERBROWSE_INFO);
+			ADD_INT(p, Token);
+		}
+		else
+		{
+			dbg_assert(false, "unknown serverinfo type");
+		}
+
+		p.AddRaw(Chunk.m_vData.data(), Chunk.m_vData.size());
+		Packet.m_pData = p.Data();
+		Packet.m_DataSize = p.Size();
+		m_NetServer.Send(&Packet);
+	}
+}
+
+void CServer::GetServerInfoSixup(CPacker *pPacker, int Token, bool SendClients)
+{
+	if(Token != -1)
+	{
+		pPacker->Reset();
+		pPacker->AddRaw(SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
+		pPacker->AddInt(Token);
+	}
+
+	SendClients = SendClients && Token != -1;
+
+	CCache::CCacheChunk &FirstChunk = m_aSixupServerInfoCache[SendClients].m_vCache.front();
+	pPacker->AddRaw(FirstChunk.m_vData.data(), FirstChunk.m_vData.size());
+}
+
+void CServer::FillAntibot(CAntibotRoundData *pData)
+{
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		CAntibotPlayerData *pPlayer = &pData->m_aPlayers[i];
+		net_addr_str(m_NetServer.ClientAddr(i), pPlayer->m_aAddress, sizeof(pPlayer->m_aAddress), true);
+	}
+}
+
+void CServer::ExpireServerInfo()
+{
+	m_ServerInfoNeedsUpdate = true;
+}
+
+void CServer::UpdateRegisterServerInfo()
+{
+	// count the players
+	int PlayerCount = 0, ClientCount = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].IncludedInServerInfo())
+		{
+			if(GameServer()->IsClientPlayer(i))
+				PlayerCount++;
+
+			ClientCount++;
+		}
+	}
+
+	int MaxPlayers = maximum(m_NetServer.MaxClients() - maximum(g_Config.m_SvSpectatorSlots, g_Config.m_SvReservedSlots), PlayerCount);
+	int MaxClients = maximum(m_NetServer.MaxClients() - g_Config.m_SvReservedSlots, ClientCount);
+	char aName[256];
+	char aGameType[32];
+	char aMapName[64];
+	char aVersion[64];
+	char aMapSha256[SHA256_MAXSTRSIZE];
+
+	sha256_str(m_aCurrentMapSha256[MAP_TYPE_SIX], aMapSha256, sizeof(aMapSha256));
+
+	char aInfo[16384];
+	str_format(aInfo, sizeof(aInfo),
+		"{"
+		"\"max_clients\":%d,"
+		"\"max_players\":%d,"
+		"\"passworded\":%s,"
+		"\"game_type\":\"%s\","
+		"\"name\":\"%s\","
+		"\"map\":{"
+		"\"name\":\"%s\","
+		"\"sha256\":\"%s\","
+		"\"size\":%d"
+		"},"
+		"\"version\":\"%s\","
+		"\"client_score_kind\":\"time\","
+		"\"clients\":[",
+		MaxClients,
+		MaxPlayers,
+		JsonBool(g_Config.m_Password[0]),
+		EscapeJson(aGameType, sizeof(aGameType), GameServer()->GameType()),
+		EscapeJson(aName, sizeof(aName), g_Config.m_SvName),
+		EscapeJson(aMapName, sizeof(aMapName), m_aCurrentMap),
+		aMapSha256,
+		m_aCurrentMapSize[MAP_TYPE_SIX],
+		EscapeJson(aVersion, sizeof(aVersion), GameServer()->Version()));
+
+	bool FirstPlayer = true;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aClients[i].IncludedInServerInfo())
+		{
+			char aCName[32];
+			char aCClan[32];
+
+			char aExtraPlayerInfo[512];
+			GameServer()->OnUpdatePlayerServerInfo(aExtraPlayerInfo, sizeof(aExtraPlayerInfo), i);
+
+			char aClientInfo[1024];
+			str_format(aClientInfo, sizeof(aClientInfo),
+				"%s{"
+				"\"name\":\"%s\","
+				"\"clan\":\"%s\","
+				"\"country\":%d,"
+				"\"score\":%d,"
+				"\"is_player\":%s"
+				"%s"
+				"}",
+				!FirstPlayer ? "," : "",
+				EscapeJson(aCName, sizeof(aCName), ClientName(i)),
+				EscapeJson(aCClan, sizeof(aCClan), ClientClan(i)),
+				m_aClients[i].m_Country,
+				m_aClients[i].m_Score.value_or(-9999),
+				JsonBool(GameServer()->IsClientPlayer(i)),
+				aExtraPlayerInfo);
+			str_append(aInfo, aClientInfo);
+			FirstPlayer = false;
+		}
+	}
+
+	str_append(aInfo, "]}");
+
+	m_pRegister->OnNewInfo(aInfo);
+}
+
+void CServer::UpdateServerInfo(bool Resend)
+{
+	if(m_RunServer == UNINITIALIZED)
+		return;
+
+	UpdateRegisterServerInfo();
+
+	for(int i = 0; i < 3; i++)
+		for(int j = 0; j < 2; j++)
+			CacheServerInfo(&m_aServerInfoCache[i * 2 + j], i, j);
+
+	for(int i = 0; i < 2; i++)
+		CacheServerInfoSixup(&m_aSixupServerInfoCache[i], i);
+
+	if(Resend)
+	{
+		for(int i = 0; i < MaxClients(); ++i)
+		{
+			if(m_aClients[i].m_State != CClient::STATE_EMPTY)
+			{
+				if(!IsSixup(i))
+					SendServerInfo(m_NetServer.ClientAddr(i), -1, SERVERINFO_INGAME, false);
+				else
+				{
+					CMsgPacker Msg(protocol7::NETMSG_SERVERINFO, true, true);
+					GetServerInfoSixup(&Msg, -1, false);
+					SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, i);
+				}
+			}
+		}
+	}
+
+	m_ServerInfoNeedsUpdate = false;
+}
+
+void CServer::PumpNetwork(bool PacketWaiting)
+{
+	CNetChunk Packet;
+	SECURITY_TOKEN ResponseToken;
+
+	m_NetServer.Update();
+
+	if(PacketWaiting)
+	{
+		// process packets
+		while(m_NetServer.Recv(&Packet, &ResponseToken))
+		{
+			if(Packet.m_ClientID == -1)
+			{
+				if(ResponseToken == NET_SECURITY_TOKEN_UNKNOWN && m_pRegister->OnPacket(&Packet))
+					continue;
+
+				{
+					int ExtraToken = 0;
+					int Type = -1;
+					if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO) + 1 &&
+						mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO)) == 0)
+					{
+						if(Packet.m_Flags & NETSENDFLAG_EXTENDED)
+						{
+							Type = SERVERINFO_EXTENDED;
+							ExtraToken = (Packet.m_aExtraData[0] << 8) | Packet.m_aExtraData[1];
+						}
+						else
+							Type = SERVERINFO_VANILLA;
+					}
+					else if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_GETINFO_64_LEGACY) + 1 &&
+						mem_comp(Packet.m_pData, SERVERBROWSE_GETINFO_64_LEGACY, sizeof(SERVERBROWSE_GETINFO_64_LEGACY)) == 0)
+					{
+						Type = SERVERINFO_64_LEGACY;
+					}
+					if(Type == SERVERINFO_VANILLA && ResponseToken != NET_SECURITY_TOKEN_UNKNOWN && Config()->m_SvSixup)
+					{
+						CUnpacker Unpacker;
+						Unpacker.Reset((unsigned char *)Packet.m_pData + sizeof(SERVERBROWSE_GETINFO), Packet.m_DataSize - sizeof(SERVERBROWSE_GETINFO));
+						int SrvBrwsToken = Unpacker.GetInt();
+						if(Unpacker.Error())
+							continue;
+
+						CPacker Packer;
+						CNetChunk Response;
+
+						GetServerInfoSixup(&Packer, SrvBrwsToken, RateLimitServerInfoConnless());
+
+						Response.m_ClientID = -1;
+						Response.m_Address = Packet.m_Address;
+						Response.m_Flags = NETSENDFLAG_CONNLESS;
+						Response.m_pData = Packer.Data();
+						Response.m_DataSize = Packer.Size();
+						m_NetServer.SendConnlessSixup(&Response, ResponseToken);
+					}
+					else if(Type != -1)
+					{
+						int Token = ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)];
+						Token |= ExtraToken << 8;
+						SendServerInfoConnless(&Packet.m_Address, Token, Type);
+					}
+				}
+			}
+			else
+			{
+				if(m_aClients[Packet.m_ClientID].m_State == CClient::STATE_REDIRECTED)
+					continue;
+
+				int GameFlags = 0;
+				if(Packet.m_Flags & NET_CHUNKFLAG_VITAL)
+				{
+					GameFlags |= MSGFLAG_VITAL;
+				}
+				if(Antibot()->OnEngineClientMessage(Packet.m_ClientID, Packet.m_pData, Packet.m_DataSize, GameFlags))
+				{
+					continue;
+				}
+
+				ProcessClientPacket(&Packet);
+			}
+		}
+	}
+	{
+		unsigned char aBuffer[NET_MAX_PAYLOAD];
+		int Flags;
+		mem_zero(&Packet, sizeof(Packet));
+		Packet.m_pData = aBuffer;
+		while(Antibot()->OnEngineSimulateClientMessage(&Packet.m_ClientID, aBuffer, sizeof(aBuffer), &Packet.m_DataSize, &Flags))
+		{
+			Packet.m_Flags = 0;
+			if(Flags & MSGFLAG_VITAL)
+			{
+				Packet.m_Flags |= NET_CHUNKFLAG_VITAL;
+			}
+			ProcessClientPacket(&Packet);
+		}
+	}
+
+	m_ServerBan.Update();
+	m_Econ.Update();
+}
+
+const char *CServer::GetMapName() const
+{
+	// get the name of the map without his path
+	const char *pMapShortName = &Config()->m_SvMap[0];
+	for(int i = 0; i < str_length(Config()->m_SvMap) - 1; i++)
+	{
+		if(Config()->m_SvMap[i] == '/' || Config()->m_SvMap[i] == '\\')
+			pMapShortName = &Config()->m_SvMap[i + 1];
+	}
+	return pMapShortName;
+}
+
+void CServer::ChangeMap(const char *pMap)
+{
+	str_copy(Config()->m_SvMap, pMap);
+	m_MapReload = str_comp(Config()->m_SvMap, m_aCurrentMap) != 0;
+}
+
+int CServer::LoadMap(const char *pMapName)
+{
+	m_MapReload = false;
+
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "maps/%s.map", pMapName);
+	GameServer()->OnMapChange(aBuf, sizeof(aBuf));
+
+	if(!m_pMap->Load(aBuf))
+		return 0;
+
+	// reinit snapshot ids
+	m_IDPool.TimeoutIDs();
+
+	// get the crc of the map
+	m_aCurrentMapSha256[MAP_TYPE_SIX] = m_pMap->Sha256();
+	m_aCurrentMapCrc[MAP_TYPE_SIX] = m_pMap->Crc();
+	char aBufMsg[256];
+	char aSha256[SHA256_MAXSTRSIZE];
+	sha256_str(m_aCurrentMapSha256[MAP_TYPE_SIX], aSha256, sizeof(aSha256));
+	str_format(aBufMsg, sizeof(aBufMsg), "%s sha256 is %s", aBuf, aSha256);
+	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBufMsg);
+
+	str_copy(m_aCurrentMap, pMapName);
+
+	// load complete map into memory for download
+	{
+		free(m_apCurrentMapData[MAP_TYPE_SIX]);
+		void *pData;
+		Storage()->ReadFile(aBuf, IStorage::TYPE_ALL, &pData, &m_aCurrentMapSize[MAP_TYPE_SIX]);
+		m_apCurrentMapData[MAP_TYPE_SIX] = (unsigned char *)pData;
+	}
+
+	// load sixup version of the map
+	if(Config()->m_SvSixup)
+	{
+		str_format(aBuf, sizeof(aBuf), "maps7/%s.map", pMapName);
+		void *pData;
+		if(!Storage()->ReadFile(aBuf, IStorage::TYPE_ALL, &pData, &m_aCurrentMapSize[MAP_TYPE_SIXUP]))
+		{
+			Config()->m_SvSixup = 0;
+			if(m_pRegister)
+			{
+				m_pRegister->OnConfigChange();
+			}
+			str_format(aBufMsg, sizeof(aBufMsg), "couldn't load map %s", aBuf);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "sixup", aBufMsg);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "sixup", "disabling 0.7 compatibility");
+		}
+		else
+		{
+			free(m_apCurrentMapData[MAP_TYPE_SIXUP]);
+			m_apCurrentMapData[MAP_TYPE_SIXUP] = (unsigned char *)pData;
+
+			m_aCurrentMapSha256[MAP_TYPE_SIXUP] = sha256(m_apCurrentMapData[MAP_TYPE_SIXUP], m_aCurrentMapSize[MAP_TYPE_SIXUP]);
+			m_aCurrentMapCrc[MAP_TYPE_SIXUP] = crc32(0, m_apCurrentMapData[MAP_TYPE_SIXUP], m_aCurrentMapSize[MAP_TYPE_SIXUP]);
+			sha256_str(m_aCurrentMapSha256[MAP_TYPE_SIXUP], aSha256, sizeof(aSha256));
+			str_format(aBufMsg, sizeof(aBufMsg), "%s sha256 is %s", aBuf, aSha256);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "sixup", aBufMsg);
+		}
+	}
+	if(!Config()->m_SvSixup)
+	{
+		free(m_apCurrentMapData[MAP_TYPE_SIXUP]);
+		m_apCurrentMapData[MAP_TYPE_SIXUP] = 0;
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		m_aPrevStates[i] = m_aClients[i].m_State;
+
+	return 1;
+}
+
+#ifdef CONF_DEBUG
+void CServer::UpdateDebugDummies(bool ForceDisconnect)
+{
+	if(m_PreviousDebugDummies == g_Config.m_DbgDummies && !ForceDisconnect)
+		return;
+
+	for(int DummyIndex = 0; DummyIndex < maximum(m_PreviousDebugDummies, g_Config.m_DbgDummies); ++DummyIndex)
+	{
+		const bool AddDummy = !ForceDisconnect && DummyIndex < g_Config.m_DbgDummies;
+		const int ClientID = MAX_CLIENTS - DummyIndex - 1;
+		if(AddDummy && m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
+		{
+			NewClientCallback(ClientID, this, false);
+			m_aClients[ClientID].m_DebugDummy = true;
+			GameServer()->OnClientConnected(ClientID, nullptr);
+			m_aClients[ClientID].m_State = CClient::STATE_INGAME;
+			str_format(m_aClients[ClientID].m_aName, sizeof(m_aClients[ClientID].m_aName), "Debug dummy %d", DummyIndex + 1);
+			GameServer()->OnClientEnter(ClientID);
+		}
+		else if(!AddDummy && m_aClients[ClientID].m_DebugDummy)
+		{
+			DelClientCallback(ClientID, "Dropping debug dummy", this);
+		}
+
+		if(AddDummy && m_aClients[ClientID].m_DebugDummy)
+		{
+			CNetObj_PlayerInput Input = {0};
+			Input.m_Direction = (ClientID & 1) ? -1 : 1;
+			m_aClients[ClientID].m_aInputs[0].m_GameTick = Tick() + 1;
+			mem_copy(m_aClients[ClientID].m_aInputs[0].m_aData, &Input, minimum(sizeof(Input), sizeof(m_aClients[ClientID].m_aInputs[0].m_aData)));
+			m_aClients[ClientID].m_LatestInput = m_aClients[ClientID].m_aInputs[0];
+			m_aClients[ClientID].m_CurrentInput = 0;
+		}
+	}
+
+	m_PreviousDebugDummies = ForceDisconnect ? 0 : g_Config.m_DbgDummies;
+}
+#endif
+
+int CServer::Run()
+{
+	if(m_RunServer == UNINITIALIZED)
+		m_RunServer = RUNNING;
+
+	m_AuthManager.Init();
+
+	if(Config()->m_Debug)
+	{
+		g_UuidManager.DebugDump();
+	}
+
+	{
+		int Size = GameServer()->PersistentClientDataSize();
+		for(auto &Client : m_aClients)
+		{
+			Client.m_HasPersistentData = false;
+			Client.m_pPersistentData = malloc(Size);
+		}
+	}
+	m_pPersistentData = malloc(GameServer()->PersistentDataSize());
+
+	// load map
+	if(!LoadMap(Config()->m_SvMap))
+	{
+		dbg_msg("server", "failed to load map. mapname='%s'", Config()->m_SvMap);
+		return -1;
+	}
+
+	if(Config()->m_SvSqliteFile[0] != '\0')
+	{
+		char aFullPath[IO_MAX_PATH_LENGTH];
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE_OR_ABSOLUTE, Config()->m_SvSqliteFile, aFullPath, sizeof(aFullPath));
+
+		if(Config()->m_SvUseSQL)
+		{
+			DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE_BACKUP, aFullPath);
+		}
+		else
+		{
+			DbPool()->RegisterSqliteDatabase(CDbConnectionPool::READ, aFullPath);
+			DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE, aFullPath);
+		}
+	}
+
+	// start server
+	NETADDR BindAddr;
+	if(g_Config.m_Bindaddr[0] == '\0')
+	{
+		mem_zero(&BindAddr, sizeof(BindAddr));
+	}
+	else if(net_host_lookup(g_Config.m_Bindaddr, &BindAddr, NETTYPE_ALL) != 0)
+	{
+		dbg_msg("server", "The configured bindaddr '%s' cannot be resolved", g_Config.m_Bindaddr);
+		return -1;
+	}
+	BindAddr.type = Config()->m_SvIpv4Only ? NETTYPE_IPV4 : NETTYPE_ALL;
+
+	int Port = Config()->m_SvPort;
+	for(BindAddr.port = Port != 0 ? Port : 8303; !m_NetServer.Open(BindAddr, &m_ServerBan, Config()->m_SvMaxClients, Config()->m_SvMaxClientsPerIP); BindAddr.port++)
+	{
+		if(Port != 0 || BindAddr.port >= 8310)
+		{
+			dbg_msg("server", "couldn't open socket. port %d might already be in use", BindAddr.port);
+			return -1;
+		}
+	}
+
+	if(Port == 0)
+		dbg_msg("server", "using port %d", BindAddr.port);
+
+#if defined(CONF_UPNP)
+	m_UPnP.Open(BindAddr);
+#endif
+
+	IEngine *pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pRegister = CreateRegister(&g_Config, m_pConsole, pEngine, this->Port(), m_NetServer.GetGlobalToken());
+
+	m_NetServer.SetCallbacks(NewClientCallback, NewClientNoAuthCallback, ClientRejoinCallback, DelClientCallback, this);
+
+	m_Econ.Init(Config(), Console(), &m_ServerBan);
+
+	m_Fifo.Init(Console(), Config()->m_SvInputFifo, CFGFLAG_SERVER);
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "server name is '%s'", Config()->m_SvName);
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+
+	Antibot()->Init();
+	GameServer()->OnInit(nullptr);
+	if(ErrorShutdown())
+	{
+		m_RunServer = STOPPING;
+	}
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "version " GAME_RELEASE_VERSION " on " CONF_PLATFORM_STRING " " CONF_ARCH_STRING);
+	if(GIT_SHORTREV_HASH)
+	{
+		str_format(aBuf, sizeof(aBuf), "git revision hash: %s", GIT_SHORTREV_HASH);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+	}
+
+	// process pending commands
+	m_pConsole->StoreCommands(false);
+	m_pRegister->OnConfigChange();
+
+	if(m_AuthManager.IsGenerated())
+	{
+		dbg_msg("server", "+-------------------------+");
+		dbg_msg("server", "| rcon password: '%s' |", Config()->m_SvRconPassword);
+		dbg_msg("server", "+-------------------------+");
+	}
+
+	// start game
+	{
+		bool NonActive = false;
+		bool PacketWaiting = false;
+
+		m_GameStartTime = time_get();
+
+		UpdateServerInfo();
+		while(m_RunServer < STOPPING)
+		{
+			if(NonActive)
+				PumpNetwork(PacketWaiting);
+
+			set_new_tick();
+
+			int64_t t = time_get();
+			int NewTicks = 0;
+
+			// load new map
+			if(m_MapReload || m_CurrentGameTick >= MAX_TICK) // force reload to make sure the ticks stay within a valid range
+			{
+				// load map
+				if(LoadMap(Config()->m_SvMap))
+				{
+					// new map loaded
+
+					// ask the game to for the data it wants to persist past a map change
+					for(int i = 0; i < MAX_CLIENTS; i++)
+					{
+						if(m_aClients[i].m_State == CClient::STATE_INGAME)
+						{
+							m_aClients[i].m_HasPersistentData = GameServer()->OnClientDataPersist(i, m_aClients[i].m_pPersistentData);
+						}
+					}
+
+#ifdef CONF_DEBUG
+					UpdateDebugDummies(true);
+#endif
+					GameServer()->OnShutdown(m_pPersistentData);
+
+					for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+					{
+						if(m_aClients[ClientID].m_State <= CClient::STATE_AUTH)
+							continue;
+
+						SendMap(ClientID);
+						bool HasPersistentData = m_aClients[ClientID].m_HasPersistentData;
+						m_aClients[ClientID].Reset();
+						m_aClients[ClientID].m_HasPersistentData = HasPersistentData;
+						m_aClients[ClientID].m_State = CClient::STATE_CONNECTING;
+					}
+
+					m_GameStartTime = time_get();
+					m_CurrentGameTick = MIN_TICK;
+					m_ServerInfoFirstRequest = 0;
+					Kernel()->ReregisterInterface(GameServer());
+					GameServer()->OnInit(m_pPersistentData);
+					if(ErrorShutdown())
+					{
+						break;
+					}
+					UpdateServerInfo(true);
+					for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+					{
+						if(m_aClients[ClientID].m_State != CClient::STATE_CONNECTING)
+							continue;
+
+						// When doing a map change, a new Teehistorian file is created. For players that are already
+						// on the server, no PlayerJoin event is produced in Teehistorian from the network engine.
+						// Record PlayerJoin events here to record the Sixup version and player join event.
+						GameServer()->TeehistorianRecordPlayerJoin(ClientID, m_aClients[ClientID].m_Sixup);
+					}
+				}
+				else
+				{
+					str_format(aBuf, sizeof(aBuf), "failed to load map. mapname='%s'", Config()->m_SvMap);
+					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+					str_copy(Config()->m_SvMap, m_aCurrentMap);
+				}
+			}
+
+			// handle dnsbl
+			if(Config()->m_SvDnsbl)
+			{
+				for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+				{
+					if(m_aClients[ClientID].m_State == CClient::STATE_EMPTY)
+						continue;
+
+					if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE)
+					{
+						// initiate dnsbl lookup
+						InitDnsbl(ClientID);
+					}
+					else if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_PENDING &&
+						m_aClients[ClientID].m_pDnsblLookup->Status() == IJob::STATE_DONE)
+					{
+						if(m_aClients[ClientID].m_pDnsblLookup->Result() != 0)
+						{
+							// entry not found -> whitelisted
+							m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_WHITELISTED;
+						}
+						else
+						{
+							// entry found -> blacklisted
+							m_aClients[ClientID].m_DnsblState = CClient::DNSBL_STATE_BLACKLISTED;
+
+							// console output
+							char aAddrStr[NETADDR_MAXSTRSIZE];
+							net_addr_str(m_NetServer.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+
+							str_format(aBuf, sizeof(aBuf), "ClientID=%d addr=<{%s}> secure=%s blacklisted", ClientID, aAddrStr, m_NetServer.HasSecurityToken(ClientID) ? "yes" : "no");
+
+							Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "dnsbl", aBuf);
+						}
+					}
+
+					if(m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED &&
+						Config()->m_SvDnsblBan)
+						m_NetServer.NetBan()->BanAddr(m_NetServer.ClientAddr(ClientID), 60 * 10, "VPN detected, try connecting without. Contact admin if mistaken");
+				}
+			}
+
+			while(t > TickStartTime(m_CurrentGameTick + 1))
+			{
+				GameServer()->OnPreTickTeehistorian();
+
+#ifdef CONF_DEBUG
+				UpdateDebugDummies(false);
+#endif
+
+				for(int c = 0; c < MAX_CLIENTS; c++)
+				{
+					if(m_aClients[c].m_State != CClient::STATE_INGAME)
+						continue;
+					bool ClientHadInput = false;
+					for(auto &Input : m_aClients[c].m_aInputs)
+					{
+						if(Input.m_GameTick == Tick() + 1)
+						{
+							GameServer()->OnClientPredictedEarlyInput(c, Input.m_aData);
+							ClientHadInput = true;
+						}
+					}
+					if(!ClientHadInput)
+						GameServer()->OnClientPredictedEarlyInput(c, nullptr);
+				}
+
+				m_CurrentGameTick++;
+				NewTicks++;
+
+				// apply new input
+				for(int c = 0; c < MAX_CLIENTS; c++)
+				{
+					if(m_aClients[c].m_State != CClient::STATE_INGAME)
+						continue;
+					bool ClientHadInput = false;
+					for(auto &Input : m_aClients[c].m_aInputs)
+					{
+						if(Input.m_GameTick == Tick())
+						{
+							GameServer()->OnClientPredictedInput(c, Input.m_aData);
+							ClientHadInput = true;
+							break;
+						}
+					}
+					if(!ClientHadInput)
+						GameServer()->OnClientPredictedInput(c, nullptr);
+				}
+
+				GameServer()->OnTick();
+				if(ErrorShutdown())
+				{
+					break;
+				}
+			}
+
+			// snap game
+			if(NewTicks)
+			{
+				if(Config()->m_SvHighBandwidth || (m_CurrentGameTick % 2) == 0)
+					DoSnapshot();
+
+				UpdateClientRconCommands();
+
+				m_Fifo.Update();
+			}
+
+			// master server stuff
+			m_pRegister->Update();
+
+			if(m_ServerInfoNeedsUpdate)
+				UpdateServerInfo();
+
+			Antibot()->OnEngineTick();
+
+			if(!NonActive)
+				PumpNetwork(PacketWaiting);
+
+			NonActive = true;
+
+			for(int i = 0; i < MAX_CLIENTS; ++i)
+			{
+				if(m_aClients[i].m_State == CClient::STATE_REDIRECTED)
+					if(time_get() > m_aClients[i].m_RedirectDropTime)
+						m_NetServer.Drop(i, "redirected");
+				if(m_aClients[i].m_State != CClient::STATE_EMPTY)
+				{
+					NonActive = false;
+					break;
+				}
+			}
+
+			// wait for incoming data
+			if(NonActive)
+			{
+				if(Config()->m_SvReloadWhenEmpty == 1)
+				{
+					m_MapReload = true;
+					Config()->m_SvReloadWhenEmpty = 0;
+				}
+				else if(Config()->m_SvReloadWhenEmpty == 2 && !m_ReloadedWhenEmpty)
+				{
+					m_MapReload = true;
+					m_ReloadedWhenEmpty = true;
+				}
+
+				if(Config()->m_SvShutdownWhenEmpty)
+					m_RunServer = STOPPING;
+				else
+					PacketWaiting = net_socket_read_wait(m_NetServer.Socket(), 1000000);
+			}
+			else
+			{
+				m_ReloadedWhenEmpty = false;
+
+				set_new_tick();
+				t = time_get();
+				int x = (TickStartTime(m_CurrentGameTick + 1) - t) * 1000000 / time_freq() + 1;
+
+				PacketWaiting = x > 0 ? net_socket_read_wait(m_NetServer.Socket(), x) : true;
+			}
+			if(IsInterrupted())
+			{
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "interrupted");
+				break;
+			}
+		}
+	}
+	const char *pDisconnectReason = "Server shutdown";
+	if(m_aShutdownReason[0])
+		pDisconnectReason = m_aShutdownReason;
+
+	if(ErrorShutdown())
+	{
+		dbg_msg("server", "shutdown from game server (%s)", m_aErrorShutdownReason);
+		pDisconnectReason = m_aErrorShutdownReason;
+	}
+	// disconnect all clients on shutdown
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(m_aClients[i].m_State != CClient::STATE_EMPTY)
+			m_NetServer.Drop(i, pDisconnectReason);
+	}
+
+	m_Econ.Shutdown();
+
+	m_Fifo.Shutdown();
+
+	GameServer()->OnShutdown(nullptr);
+	m_pMap->Unload();
+
+	DbPool()->OnShutdown();
+
+#if defined(CONF_UPNP)
+	m_UPnP.Shutdown();
+#endif
+
+	m_NetServer.Close();
+
+	m_pRegister->OnShutdown();
+
+	return ErrorShutdown();
+}
+
+void CServer::ConKick(IConsole::IResult *pResult, void *pUser)
+{
+	if(pResult->NumArguments() > 1)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "Kicked (%s)", pResult->GetString(1));
+		((CServer *)pUser)->Kick(pResult->GetInteger(0), aBuf);
+	}
+	else
+		((CServer *)pUser)->Kick(pResult->GetInteger(0), "Kicked by console");
+}
+
+void CServer::ConStatus(IConsole::IResult *pResult, void *pUser)
+{
+	char aBuf[1024];
+	char aAddrStr[NETADDR_MAXSTRSIZE];
+	CServer *pThis = static_cast<CServer *>(pUser);
+	const char *pName = pResult->NumArguments() == 1 ? pResult->GetString(0) : "";
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(pThis->m_aClients[i].m_State == CClient::STATE_EMPTY)
+			continue;
+
+		if(!str_utf8_find_nocase(pThis->m_aClients[i].m_aName, pName))
+			continue;
+
+		net_addr_str(pThis->m_NetServer.ClientAddr(i), aAddrStr, sizeof(aAddrStr), true);
+		if(pThis->m_aClients[i].m_State == CClient::STATE_INGAME)
+		{
+			char aDnsblStr[64];
+			aDnsblStr[0] = '\0';
+			if(pThis->Config()->m_SvDnsbl)
+			{
+				const char *pDnsblStr = pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED ? "white" :
+																pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED ? "black" :
+																									pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_PENDING ? "pending" : "n/a";
+
+				str_format(aDnsblStr, sizeof(aDnsblStr), " dnsbl=%s", pDnsblStr);
+			}
+
+			char aAuthStr[128];
+			aAuthStr[0] = '\0';
+			if(pThis->m_aClients[i].m_AuthKey >= 0)
+			{
+				const char *pAuthStr = pThis->m_aClients[i].m_Authed == AUTHED_ADMIN ? "(Admin)" :
+												       pThis->m_aClients[i].m_Authed == AUTHED_MOD ? "(Mod)" :
+																		     pThis->m_aClients[i].m_Authed == AUTHED_HELPER ? "(Helper)" : "";
+
+				str_format(aAuthStr, sizeof(aAuthStr), " key=%s %s", pThis->m_AuthManager.KeyIdent(pThis->m_aClients[i].m_AuthKey), pAuthStr);
+			}
+
+			const char *pClientPrefix = "";
+			if(pThis->m_aClients[i].m_Sixup)
+			{
+				pClientPrefix = "0.7:";
+			}
+			str_format(aBuf, sizeof(aBuf), "id=%d addr=<{%s}> name='%s' client=%s%d secure=%s flags=%d%s%s",
+				i, aAddrStr, pThis->m_aClients[i].m_aName, pClientPrefix, pThis->m_aClients[i].m_DDNetVersion,
+				pThis->m_NetServer.HasSecurityToken(i) ? "yes" : "no", pThis->m_aClients[i].m_Flags, aDnsblStr, aAuthStr);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "id=%d addr=<{%s}> connecting", i, aAddrStr);
+		}
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+	}
+}
+
+static int GetAuthLevel(const char *pLevel)
+{
+	int Level = -1;
+	if(!str_comp_nocase(pLevel, "admin"))
+		Level = AUTHED_ADMIN;
+	else if(str_startswith(pLevel, "mod"))
+		Level = AUTHED_MOD;
+	else if(!str_comp_nocase(pLevel, "helper"))
+		Level = AUTHED_HELPER;
+
+	return Level;
+}
+
+void CServer::AuthRemoveKey(int KeySlot)
+{
+	m_AuthManager.RemoveKey(KeySlot);
+	LogoutKey(KeySlot, "key removal");
+
+	// Update indices.
+	for(auto &Client : m_aClients)
+	{
+		if(Client.m_AuthKey == KeySlot)
+		{
+			Client.m_AuthKey = -1;
+		}
+		else if(Client.m_AuthKey > KeySlot)
+		{
+			--Client.m_AuthKey;
+		}
+	}
+}
+
+void CServer::ConAuthAdd(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	const char *pIdent = pResult->GetString(0);
+	const char *pLevel = pResult->GetString(1);
+	const char *pPw = pResult->GetString(2);
+
+	int Level = GetAuthLevel(pLevel);
+	if(Level == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "level can be one of {\"admin\", \"mod(erator)\", \"helper\"}");
+		return;
+	}
+
+	bool NeedUpdate = !pManager->NumNonDefaultKeys();
+	if(pManager->AddKey(pIdent, pPw, Level) < 0)
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "ident already exists");
+	else
+	{
+		if(NeedUpdate)
+			pThis->SendRconType(-1, true);
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "key added");
+	}
+}
+
+void CServer::ConAuthAddHashed(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	const char *pIdent = pResult->GetString(0);
+	const char *pLevel = pResult->GetString(1);
+	const char *pPw = pResult->GetString(2);
+	const char *pSalt = pResult->GetString(3);
+
+	int Level = GetAuthLevel(pLevel);
+	if(Level == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "level can be one of {\"admin\", \"mod(erator)\", \"helper\"}");
+		return;
+	}
+
+	MD5_DIGEST Hash;
+	unsigned char aSalt[SALT_BYTES];
+
+	if(md5_from_str(&Hash, pPw))
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "Malformed password hash");
+		return;
+	}
+	if(str_hex_decode(aSalt, sizeof(aSalt), pSalt))
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "Malformed salt hash");
+		return;
+	}
+
+	bool NeedUpdate = !pManager->NumNonDefaultKeys();
+
+	if(pManager->AddKeyHash(pIdent, Hash, aSalt, Level) < 0)
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "ident already exists");
+	else
+	{
+		if(NeedUpdate)
+			pThis->SendRconType(-1, true);
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "key added");
+	}
+}
+
+void CServer::ConAuthUpdate(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	const char *pIdent = pResult->GetString(0);
+	const char *pLevel = pResult->GetString(1);
+	const char *pPw = pResult->GetString(2);
+
+	int KeySlot = pManager->FindKey(pIdent);
+	if(KeySlot == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "ident couldn't be found");
+		return;
+	}
+
+	int Level = GetAuthLevel(pLevel);
+	if(Level == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "level can be one of {\"admin\", \"mod(erator)\", \"helper\"}");
+		return;
+	}
+
+	pManager->UpdateKey(KeySlot, pPw, Level);
+	pThis->LogoutKey(KeySlot, "key update");
+
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "key updated");
+}
+
+void CServer::ConAuthUpdateHashed(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	const char *pIdent = pResult->GetString(0);
+	const char *pLevel = pResult->GetString(1);
+	const char *pPw = pResult->GetString(2);
+	const char *pSalt = pResult->GetString(3);
+
+	int KeySlot = pManager->FindKey(pIdent);
+	if(KeySlot == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "ident couldn't be found");
+		return;
+	}
+
+	int Level = GetAuthLevel(pLevel);
+	if(Level == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "level can be one of {\"admin\", \"mod(erator)\", \"helper\"}");
+		return;
+	}
+
+	MD5_DIGEST Hash;
+	unsigned char aSalt[SALT_BYTES];
+
+	if(md5_from_str(&Hash, pPw))
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "Malformed password hash");
+		return;
+	}
+	if(str_hex_decode(aSalt, sizeof(aSalt), pSalt))
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "Malformed salt hash");
+		return;
+	}
+
+	pManager->UpdateKeyHash(KeySlot, Hash, aSalt, Level);
+	pThis->LogoutKey(KeySlot, "key update");
+
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "key updated");
+}
+
+void CServer::ConAuthRemove(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	const char *pIdent = pResult->GetString(0);
+
+	int KeySlot = pManager->FindKey(pIdent);
+	if(KeySlot == -1)
+	{
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "ident couldn't be found");
+		return;
+	}
+
+	pThis->AuthRemoveKey(KeySlot);
+
+	if(!pManager->NumNonDefaultKeys())
+		pThis->SendRconType(-1, false);
+
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", "key removed, all users logged out");
+}
+
+static void ListKeysCallback(const char *pIdent, int Level, void *pUser)
+{
+	static const char LSTRING[][10] = {"helper", "moderator", "admin"};
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "%s %s", pIdent, LSTRING[Level - 1]);
+	((CServer *)pUser)->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "auth", aBuf);
+}
+
+void CServer::ConAuthList(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = (CServer *)pUser;
+	CAuthManager *pManager = &pThis->m_AuthManager;
+
+	pManager->ListKeys(ListKeysCallback, pThis);
+}
+
+void CServer::ConShutdown(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pThis = static_cast<CServer *>(pUser);
+	pThis->m_RunServer = STOPPING;
+	const char *pReason = pResult->GetString(0);
+	if(pReason[0])
+	{
+		str_copy(pThis->m_aShutdownReason, pReason);
+	}
+}
+
+void CServer::DemoRecorder_HandleAutoStart()
+{
+	if(Config()->m_SvAutoDemoRecord)
+	{
+		m_aDemoRecorder[MAX_CLIENTS].Stop();
+		char aFilename[IO_MAX_PATH_LENGTH];
+		char aDate[20];
+		str_timestamp(aDate, sizeof(aDate));
+		str_format(aFilename, sizeof(aFilename), "demos/%s_%s.demo", "auto/autorecord", aDate);
+		m_aDemoRecorder[MAX_CLIENTS].Start(Storage(), m_pConsole, aFilename, GameServer()->NetVersion(), m_aCurrentMap, m_aCurrentMapSha256[MAP_TYPE_SIX], m_aCurrentMapCrc[MAP_TYPE_SIX], "server", m_aCurrentMapSize[MAP_TYPE_SIX], m_apCurrentMapData[MAP_TYPE_SIX]);
+		if(Config()->m_SvAutoDemoMax)
+		{
+			// clean up auto recorded demos
+			CFileCollection AutoDemos;
+			AutoDemos.Init(Storage(), "demos/server", "autorecord", ".demo", Config()->m_SvAutoDemoMax);
+		}
+	}
+}
+
+void CServer::SaveDemo(int ClientID, float Time)
+{
+	if(IsRecording(ClientID))
+	{
+		m_aDemoRecorder[ClientID].Stop();
+
+		// rename the demo
+		char aOldFilename[IO_MAX_PATH_LENGTH];
+		char aNewFilename[IO_MAX_PATH_LENGTH];
+		str_format(aOldFilename, sizeof(aOldFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
+		str_format(aNewFilename, sizeof(aNewFilename), "demos/%s_%s_%05.2f.demo", m_aCurrentMap, m_aClients[ClientID].m_aName, Time);
+		Storage()->RenameFile(aOldFilename, aNewFilename, IStorage::TYPE_SAVE);
+	}
+}
+
+void CServer::StartRecord(int ClientID)
+{
+	if(Config()->m_SvPlayerDemoRecord)
+	{
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
+		m_aDemoRecorder[ClientID].Start(Storage(), Console(), aFilename, GameServer()->NetVersion(), m_aCurrentMap, m_aCurrentMapSha256[MAP_TYPE_SIX], m_aCurrentMapCrc[MAP_TYPE_SIX], "server", m_aCurrentMapSize[MAP_TYPE_SIX], m_apCurrentMapData[MAP_TYPE_SIX]);
+	}
+}
+
+void CServer::StopRecord(int ClientID)
+{
+	if(IsRecording(ClientID))
+	{
+		m_aDemoRecorder[ClientID].Stop();
+
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, ClientID);
+		Storage()->RemoveFile(aFilename, IStorage::TYPE_SAVE);
+	}
+}
+
+bool CServer::IsRecording(int ClientID)
+{
+	return m_aDemoRecorder[ClientID].IsRecording();
+}
+
+void CServer::StopDemos()
+{
+	for(int i = 0; i < MAX_CLIENTS + 1; i++)
+	{
+		if(!m_aDemoRecorder[i].IsRecording())
+			continue;
+
+		m_aDemoRecorder[i].Stop();
+
+		// remove tmp demos
+		if(i < MAX_CLIENTS)
+		{
+			char aPath[256];
+			str_format(aPath, sizeof(aPath), "demos/%s_%d_%d_tmp.demo", m_aCurrentMap, m_NetServer.Address().port, i);
+			Storage()->RemoveFile(aPath, IStorage::TYPE_SAVE);
+		}
+	}
+}
+
+void CServer::ConRecord(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+	char aFilename[IO_MAX_PATH_LENGTH];
+
+	if(pServer->IsRecording(MAX_CLIENTS))
+	{
+		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Demo recorder already recording");
+		return;
+	}
+
+	if(pResult->NumArguments())
+		str_format(aFilename, sizeof(aFilename), "demos/%s.demo", pResult->GetString(0));
+	else
+	{
+		char aDate[20];
+		str_timestamp(aDate, sizeof(aDate));
+		str_format(aFilename, sizeof(aFilename), "demos/demo_%s.demo", aDate);
+	}
+	pServer->m_aDemoRecorder[MAX_CLIENTS].Start(pServer->Storage(), pServer->Console(), aFilename, pServer->GameServer()->NetVersion(), pServer->m_aCurrentMap, pServer->m_aCurrentMapSha256[MAP_TYPE_SIX], pServer->m_aCurrentMapCrc[MAP_TYPE_SIX], "server", pServer->m_aCurrentMapSize[MAP_TYPE_SIX], pServer->m_apCurrentMapData[MAP_TYPE_SIX]);
+}
+
+void CServer::ConStopRecord(IConsole::IResult *pResult, void *pUser)
+{
+	((CServer *)pUser)->m_aDemoRecorder[MAX_CLIENTS].Stop();
+}
+
+void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser)
+{
+	((CServer *)pUser)->m_MapReload = true;
+}
+
+void CServer::ConLogout(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+
+	if(pServer->m_RconClientID >= 0 && pServer->m_RconClientID < MAX_CLIENTS &&
+		pServer->m_aClients[pServer->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	{
+		pServer->LogoutClient(pServer->m_RconClientID, "");
+	}
+}
+
+void CServer::ConShowIps(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+
+	if(pServer->m_RconClientID >= 0 && pServer->m_RconClientID < MAX_CLIENTS &&
+		pServer->m_aClients[pServer->m_RconClientID].m_State != CServer::CClient::STATE_EMPTY)
+	{
+		if(pResult->NumArguments())
+		{
+			pServer->m_aClients[pServer->m_RconClientID].m_ShowIps = pResult->GetInteger(0);
+		}
+		else
+		{
+			char aStr[9];
+			str_format(aStr, sizeof(aStr), "Value: %d", pServer->m_aClients[pServer->m_RconClientID].m_ShowIps);
+			char aBuf[32];
+			pServer->SendRconLine(pServer->m_RconClientID, pServer->Console()->Format(aBuf, sizeof(aBuf), "server", aStr));
+		}
+	}
+}
+
+void CServer::ConAddSqlServer(IConsole::IResult *pResult, void *pUserData)
+{
+	CServer *pSelf = (CServer *)pUserData;
+
+	if(!MysqlAvailable())
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "can't add MySQL server: compiled without MySQL support");
+		return;
+	}
+
+	if(!pSelf->Config()->m_SvUseSQL)
+		return;
+
+	if(pResult->NumArguments() != 7 && pResult->NumArguments() != 8)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "7 or 8 arguments are required");
+		return;
+	}
+
+	CMysqlConfig Config;
+	bool Write;
+	if(str_comp_nocase(pResult->GetString(0), "w") == 0)
+		Write = false;
+	else if(str_comp_nocase(pResult->GetString(0), "r") == 0)
+		Write = true;
+	else
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "choose either 'r' for SqlReadServer or 'w' for SqlWriteServer");
+		return;
+	}
+
+	str_copy(Config.m_aDatabase, pResult->GetString(1), sizeof(Config.m_aDatabase));
+	str_copy(Config.m_aPrefix, pResult->GetString(2), sizeof(Config.m_aPrefix));
+	str_copy(Config.m_aUser, pResult->GetString(3), sizeof(Config.m_aUser));
+	str_copy(Config.m_aPass, pResult->GetString(4), sizeof(Config.m_aPass));
+	str_copy(Config.m_aIp, pResult->GetString(5), sizeof(Config.m_aIp));
+	Config.m_aBindaddr[0] = '\0';
+	Config.m_Port = pResult->GetInteger(6);
+	Config.m_Setup = pResult->NumArguments() == 8 ? pResult->GetInteger(7) : true;
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"Adding new Sql%sServer: DB: '%s' Prefix: '%s' User: '%s' IP: <{%s}> Port: %d",
+		Write ? "Write" : "Read",
+		Config.m_aDatabase, Config.m_aPrefix, Config.m_aUser, Config.m_aIp, Config.m_Port);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+	pSelf->DbPool()->RegisterMysqlDatabase(Write ? CDbConnectionPool::WRITE : CDbConnectionPool::READ, &Config);
+}
+
+void CServer::ConDumpSqlServers(IConsole::IResult *pResult, void *pUserData)
+{
+	CServer *pSelf = (CServer *)pUserData;
+
+	if(str_comp_nocase(pResult->GetString(0), "w") == 0)
+	{
+		pSelf->DbPool()->Print(pSelf->Console(), CDbConnectionPool::WRITE);
+		pSelf->DbPool()->Print(pSelf->Console(), CDbConnectionPool::WRITE_BACKUP);
+	}
+	else if(str_comp_nocase(pResult->GetString(0), "r") == 0)
+	{
+		pSelf->DbPool()->Print(pSelf->Console(), CDbConnectionPool::READ);
+	}
+	else
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "choose either 'r' for SqlReadServer or 'w' for SqlWriteServer");
+		return;
+	}
+}
+
+void CServer::ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		CServer *pThis = static_cast<CServer *>(pUserData);
+		str_clean_whitespaces(pThis->Config()->m_SvName);
+		pThis->UpdateServerInfo(true);
+	}
+}
+
+void CServer::ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		((CServer *)pUserData)->m_NetServer.SetMaxClientsPerIP(pResult->GetInteger(0));
+}
+
+void CServer::ConchainCommandAccessUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	if(pResult->NumArguments() == 2)
+	{
+		CServer *pThis = static_cast<CServer *>(pUserData);
+		const IConsole::CCommandInfo *pInfo = pThis->Console()->GetCommandInfo(pResult->GetString(0), CFGFLAG_SERVER, false);
+		int OldAccessLevel = 0;
+		if(pInfo)
+			OldAccessLevel = pInfo->GetAccessLevel();
+		pfnCallback(pResult, pCallbackUserData);
+		if(pInfo && OldAccessLevel != pInfo->GetAccessLevel())
+		{
+			for(int i = 0; i < MAX_CLIENTS; ++i)
+			{
+				if(pThis->m_aClients[i].m_State == CServer::CClient::STATE_EMPTY ||
+					(pInfo->GetAccessLevel() > AUTHED_ADMIN - pThis->m_aClients[i].m_Authed && AUTHED_ADMIN - pThis->m_aClients[i].m_Authed < OldAccessLevel) ||
+					(pInfo->GetAccessLevel() < AUTHED_ADMIN - pThis->m_aClients[i].m_Authed && AUTHED_ADMIN - pThis->m_aClients[i].m_Authed > OldAccessLevel) ||
+					(pThis->m_aClients[i].m_pRconCmdToSend && str_comp(pResult->GetString(0), pThis->m_aClients[i].m_pRconCmdToSend->m_pName) >= 0))
+					continue;
+
+				if(OldAccessLevel < pInfo->GetAccessLevel())
+					pThis->SendRconCmdAdd(pInfo, i);
+				else
+					pThis->SendRconCmdRem(pInfo, i);
+			}
+		}
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CServer::LogoutClient(int ClientID, const char *pReason)
+{
+	if(!IsSixup(ClientID))
+	{
+		CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS, true);
+		Msg.AddInt(0); //authed
+		Msg.AddInt(0); //cmdlist
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	}
+	else
+	{
+		CMsgPacker Msg(protocol7::NETMSG_RCON_AUTH_OFF, true, true);
+		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	}
+
+	m_aClients[ClientID].m_AuthTries = 0;
+	m_aClients[ClientID].m_pRconCmdToSend = 0;
+
+	char aBuf[64];
+	if(*pReason)
+	{
+		str_format(aBuf, sizeof(aBuf), "Logged out by %s.", pReason);
+		SendRconLine(ClientID, aBuf);
+		str_format(aBuf, sizeof(aBuf), "ClientID=%d with key=%s logged out by %s", ClientID, m_AuthManager.KeyIdent(m_aClients[ClientID].m_AuthKey), pReason);
+	}
+	else
+	{
+		SendRconLine(ClientID, "Logout successful.");
+		str_format(aBuf, sizeof(aBuf), "ClientID=%d with key=%s logged out", ClientID, m_AuthManager.KeyIdent(m_aClients[ClientID].m_AuthKey));
+	}
+
+	m_aClients[ClientID].m_Authed = AUTHED_NO;
+	m_aClients[ClientID].m_AuthKey = -1;
+
+	GameServer()->OnSetAuthed(ClientID, AUTHED_NO);
+
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+}
+
+void CServer::LogoutKey(int Key, const char *pReason)
+{
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(m_aClients[i].m_AuthKey == Key)
+			LogoutClient(i, pReason);
+}
+
+void CServer::ConchainRconPasswordChangeGeneric(int Level, const char *pCurrent, IConsole::IResult *pResult)
+{
+	if(pResult->NumArguments() == 1)
+	{
+		int KeySlot = m_AuthManager.DefaultKey(Level);
+		const char *pNew = pResult->GetString(0);
+		if(str_comp(pCurrent, pNew) == 0)
+		{
+			return;
+		}
+		if(KeySlot == -1 && pNew[0])
+		{
+			m_AuthManager.AddDefaultKey(Level, pNew);
+		}
+		else if(KeySlot >= 0)
+		{
+			if(!pNew[0])
+			{
+				AuthRemoveKey(KeySlot);
+				// Already logs users out.
+			}
+			else
+			{
+				m_AuthManager.UpdateKey(KeySlot, pNew, Level);
+				LogoutKey(KeySlot, "key update");
+			}
+		}
+	}
+}
+
+void CServer::ConchainRconPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pThis = static_cast<CServer *>(pUserData);
+	pThis->ConchainRconPasswordChangeGeneric(AUTHED_ADMIN, pThis->Config()->m_SvRconPassword, pResult);
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CServer::ConchainRconModPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pThis = static_cast<CServer *>(pUserData);
+	pThis->ConchainRconPasswordChangeGeneric(AUTHED_MOD, pThis->Config()->m_SvRconModPassword, pResult);
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CServer::ConchainRconHelperPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pThis = static_cast<CServer *>(pUserData);
+	pThis->ConchainRconPasswordChangeGeneric(AUTHED_HELPER, pThis->Config()->m_SvRconHelperPassword, pResult);
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CServer::ConchainMapUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() >= 1)
+	{
+		CServer *pThis = static_cast<CServer *>(pUserData);
+		pThis->m_MapReload = str_comp(pThis->Config()->m_SvMap, pThis->m_aCurrentMap) != 0;
+	}
+}
+
+void CServer::ConchainSixupUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	CServer *pThis = static_cast<CServer *>(pUserData);
+	if(pResult->NumArguments() >= 1 && pThis->m_aCurrentMap[0] != '\0')
+		pThis->m_MapReload |= (pThis->m_apCurrentMapData[MAP_TYPE_SIXUP] != 0) != (pResult->GetInteger(0) != 0);
+}
+
+void CServer::ConchainLoglevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pSelf = (CServer *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		pSelf->m_pFileLogger->SetFilter(CLogFilter{IConsole::ToLogLevelFilter(g_Config.m_Loglevel)});
+	}
+}
+
+void CServer::ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CServer *pSelf = (CServer *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() && pSelf->m_pStdoutLogger)
+	{
+		pSelf->m_pStdoutLogger->SetFilter(CLogFilter{IConsole::ToLogLevelFilter(g_Config.m_StdoutOutputLevel)});
+	}
+}
+
+#if defined(CONF_FAMILY_UNIX)
+void CServer::ConchainConnLoggingServerChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() == 1)
+	{
+		CServer *pServer = (CServer *)pUserData;
+
+		// open socket to send new connections
+		if(!pServer->m_ConnLoggingSocketCreated)
+		{
+			pServer->m_ConnLoggingSocket = net_unix_create_unnamed();
+			if(pServer->m_ConnLoggingSocket == -1)
+			{
+				pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "Failed to created socket for communication with the connection logging server.");
+			}
+			else
+			{
+				pServer->m_ConnLoggingSocketCreated = true;
+			}
+		}
+
+		// set the destination address for the connection logging
+		net_unix_set_addr(&pServer->m_ConnLoggingDestAddr, pResult->GetString(0));
+	}
+}
+#endif
+
+void CServer::RegisterCommands()
+{
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pGameServer = Kernel()->RequestInterface<IGameServer>();
+	m_pMap = Kernel()->RequestInterface<IEngineMap>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pAntibot = Kernel()->RequestInterface<IEngineAntibot>();
+
+	HttpInit(m_pStorage);
+
+	// register console commands
+	Console()->Register("kick", "i[id] ?r[reason]", CFGFLAG_SERVER, ConKick, this, "Kick player with specified id for any reason");
+	Console()->Register("status", "?r[name]", CFGFLAG_SERVER, ConStatus, this, "List players containing name or all players");
+	Console()->Register("shutdown", "?r[reason]", CFGFLAG_SERVER, ConShutdown, this, "Shut down");
+	Console()->Register("logout", "", CFGFLAG_SERVER, ConLogout, this, "Logout of rcon");
+	Console()->Register("show_ips", "?i[show]", CFGFLAG_SERVER, ConShowIps, this, "Show IP addresses in rcon commands (1 = on, 0 = off)");
+
+	Console()->Register("record", "?s[file]", CFGFLAG_SERVER | CFGFLAG_STORE, ConRecord, this, "Record to a file");
+	Console()->Register("stoprecord", "", CFGFLAG_SERVER, ConStopRecord, this, "Stop recording");
+
+	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "Reload the map");
+
+	Console()->Register("add_sqlserver", "s['r'|'w'] s[Database] s[Prefix] s[User] s[Password] s[IP] i[Port] ?i[SetUpDatabase ?]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAddSqlServer, this, "add a sqlserver");
+	Console()->Register("dump_sqlservers", "s['r'|'w']", CFGFLAG_SERVER, ConDumpSqlServers, this, "dumps all sqlservers readservers = r, writeservers = w");
+
+	Console()->Register("auth_add", "s[ident] s[level] r[pw]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthAdd, this, "Add a rcon key");
+	Console()->Register("auth_add_p", "s[ident] s[level] s[hash] s[salt]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthAddHashed, this, "Add a prehashed rcon key");
+	Console()->Register("auth_change", "s[ident] s[level] r[pw]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthUpdate, this, "Update a rcon key");
+	Console()->Register("auth_change_p", "s[ident] s[level] s[hash] s[salt]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthUpdateHashed, this, "Update a rcon key with prehashed data");
+	Console()->Register("auth_remove", "s[ident]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthRemove, this, "Remove a rcon key");
+	Console()->Register("auth_list", "", CFGFLAG_SERVER, ConAuthList, this, "List all rcon keys");
+
+	RustVersionRegister(*Console());
+
+	Console()->Chain("sv_name", ConchainSpecialInfoupdate, this);
+	Console()->Chain("password", ConchainSpecialInfoupdate, this);
+	Console()->Chain("sv_spectator_slots", ConchainSpecialInfoupdate, this);
+
+	Console()->Chain("sv_max_clients_per_ip", ConchainMaxclientsperipUpdate, this);
+	Console()->Chain("access_level", ConchainCommandAccessUpdate, this);
+
+	Console()->Chain("sv_rcon_password", ConchainRconPasswordChange, this);
+	Console()->Chain("sv_rcon_mod_password", ConchainRconModPasswordChange, this);
+	Console()->Chain("sv_rcon_helper_password", ConchainRconHelperPasswordChange, this);
+	Console()->Chain("sv_map", ConchainMapUpdate, this);
+	Console()->Chain("sv_sixup", ConchainSixupUpdate, this);
+
+	Console()->Chain("loglevel", ConchainLoglevel, this);
+	Console()->Chain("stdout_output_level", ConchainStdoutOutputLevel, this);
+
+#if defined(CONF_FAMILY_UNIX)
+	Console()->Chain("sv_conn_logging_server", ConchainConnLoggingServerChange, this);
+#endif
+
+	// register console commands in sub parts
+	m_ServerBan.InitServerBan(Console(), Storage(), this);
+	m_NameBans.InitConsole(Console());
+	m_pGameServer->OnConsoleInit();
+}
+
+int CServer::SnapNewID()
+{
+	return m_IDPool.NewID();
+}
+
+void CServer::SnapFreeID(int ID)
+{
+	m_IDPool.FreeID(ID);
+}
+
+void *CServer::SnapNewItem(int Type, int ID, int Size)
+{
+	dbg_assert(ID >= -1 && ID <= 0xffff, "incorrect id");
+	return ID < 0 ? 0 : m_SnapshotBuilder.NewItem(Type, ID, Size);
+}
+
+void CServer::SnapSetStaticsize(int ItemType, int Size)
+{
+	m_SnapshotDelta.SetStaticsize(ItemType, Size);
+}
+
+CServer *CreateServer() { return new CServer(); }
+
+// DDRace
+
+void CServer::GetClientAddr(int ClientID, NETADDR *pAddr) const
+{
+	if(ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_INGAME)
+	{
+		*pAddr = *m_NetServer.ClientAddr(ClientID);
+	}
+}
+
+const char *CServer::GetAnnouncementLine(const char *pFileName)
+{
+	if(str_comp(pFileName, m_aAnnouncementFile) != 0)
+	{
+		str_copy(m_aAnnouncementFile, pFileName);
+		m_vAnnouncements.clear();
+
+		IOHANDLE File = m_pStorage->OpenFile(pFileName, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+		if(!File)
+			return 0;
+
+		char *pLine;
+		CLineReader Reader;
+		Reader.Init(File);
+		while((pLine = Reader.Get()))
+			if(str_length(pLine) && pLine[0] != '#')
+				m_vAnnouncements.emplace_back(pLine);
+
+		io_close(File);
+	}
+
+	if(m_vAnnouncements.empty())
+	{
+		return 0;
+	}
+	else if(m_vAnnouncements.size() == 1)
+	{
+		m_AnnouncementLastLine = 0;
+	}
+	else if(!Config()->m_SvAnnouncementRandom)
+	{
+		if(++m_AnnouncementLastLine >= m_vAnnouncements.size())
+			m_AnnouncementLastLine %= m_vAnnouncements.size();
+	}
+	else
+	{
+		unsigned Rand;
+		do
+		{
+			Rand = rand() % m_vAnnouncements.size();
+		} while(Rand == m_AnnouncementLastLine);
+
+		m_AnnouncementLastLine = Rand;
+	}
+
+	return m_vAnnouncements[m_AnnouncementLastLine].c_str();
+}
+
+int *CServer::GetIdMap(int ClientID)
+{
+	return m_aIdMap + VANILLA_MAX_CLIENTS * ClientID;
+}
+
+bool CServer::SetTimedOut(int ClientID, int OrigID)
+{
+	if(!m_NetServer.SetTimedOut(ClientID, OrigID))
+	{
+		return false;
+	}
+	m_aClients[ClientID].m_Sixup = m_aClients[OrigID].m_Sixup;
+
+	if(m_aClients[OrigID].m_Authed != AUTHED_NO)
+	{
+		LogoutClient(ClientID, "Timeout Protection");
+	}
+	DelClientCallback(OrigID, "Timeout Protection used", this);
+	m_aClients[ClientID].m_Authed = AUTHED_NO;
+	m_aClients[ClientID].m_Flags = m_aClients[OrigID].m_Flags;
+	m_aClients[ClientID].m_DDNetVersion = m_aClients[OrigID].m_DDNetVersion;
+	m_aClients[ClientID].m_GotDDNetVersionPacket = m_aClients[OrigID].m_GotDDNetVersionPacket;
+	m_aClients[ClientID].m_DDNetVersionSettled = m_aClients[OrigID].m_DDNetVersionSettled;
+	return true;
+}
+
+void CServer::SetErrorShutdown(const char *pReason)
+{
+	str_copy(m_aErrorShutdownReason, pReason);
+}
+
+void CServer::SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger)
+{
+	m_pFileLogger = pFileLogger;
+	m_pStdoutLogger = pStdoutLogger;
+}
diff --git a/src_bkp/engine/server/server.h b/src_bkp/engine/server/server.h
new file mode 100644
index 0000000000..a5dcb34ae1
--- /dev/null
+++ b/src_bkp/engine/server/server.h
@@ -0,0 +1,515 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SERVER_SERVER_H
+#define ENGINE_SERVER_SERVER_H
+
+#include <base/hash.h>
+
+#include <engine/console.h>
+#include <engine/server.h>
+
+#include <engine/shared/demo.h>
+#include <engine/shared/econ.h>
+#include <engine/shared/fifo.h>
+#include <engine/shared/netban.h>
+#include <engine/shared/network.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/snapshot.h>
+#include <engine/shared/uuid_manager.h>
+
+#include <list>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "antibot.h"
+#include "authmanager.h"
+#include "name_ban.h"
+
+#if defined(CONF_UPNP)
+#include "upnp.h"
+#endif
+
+class CConfig;
+class CHostLookup;
+class CLogMessage;
+class CMsgPacker;
+class CPacker;
+class IEngineMap;
+class ILogger;
+
+class CSnapIDPool
+{
+	enum
+	{
+		MAX_IDS = 32 * 1024,
+	};
+
+	// State of a Snap ID
+	enum
+	{
+		ID_FREE = 0,
+		ID_ALLOCATED = 1,
+		ID_TIMED = 2,
+	};
+
+	class CID
+	{
+	public:
+		short m_Next;
+		short m_State; // 0 = free, 1 = allocated, 2 = timed
+		int m_Timeout;
+	};
+
+	CID m_aIDs[MAX_IDS];
+
+	int m_FirstFree;
+	int m_FirstTimed;
+	int m_LastTimed;
+	int m_Usage;
+	int m_InUsage;
+
+public:
+	CSnapIDPool();
+
+	void Reset();
+	void RemoveFirstTimeout();
+	int NewID();
+	void TimeoutIDs();
+	void FreeID(int ID);
+};
+
+class CServerBan : public CNetBan
+{
+	class CServer *m_pServer;
+
+	template<class T>
+	int BanExt(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason);
+
+public:
+	class CServer *Server() const { return m_pServer; }
+
+	void InitServerBan(class IConsole *pConsole, class IStorage *pStorage, class CServer *pServer);
+
+	int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason) override;
+	int BanRange(const CNetRange *pRange, int Seconds, const char *pReason) override;
+
+	static void ConBanExt(class IConsole::IResult *pResult, void *pUser);
+	static void ConBanRegion(class IConsole::IResult *pResult, void *pUser);
+	static void ConBanRegionRange(class IConsole::IResult *pResult, void *pUser);
+};
+
+class CServer : public IServer
+{
+	friend class CServerLogger;
+
+	class IGameServer *m_pGameServer;
+	class CConfig *m_pConfig;
+	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+	class IEngineAntibot *m_pAntibot;
+	class IRegister *m_pRegister;
+
+#if defined(CONF_UPNP)
+	CUPnP m_UPnP;
+#endif
+
+#if defined(CONF_FAMILY_UNIX)
+	UNIXSOCKETADDR m_ConnLoggingDestAddr;
+	bool m_ConnLoggingSocketCreated;
+	UNIXSOCKET m_ConnLoggingSocket;
+#endif
+
+	class CDbConnectionPool *m_pConnectionPool;
+
+#ifdef CONF_DEBUG
+	int m_PreviousDebugDummies = 0;
+	void UpdateDebugDummies(bool ForceDisconnect);
+#endif
+
+public:
+	class IGameServer *GameServer() { return m_pGameServer; }
+	class CConfig *Config() { return m_pConfig; }
+	const CConfig *Config() const { return m_pConfig; }
+	class IConsole *Console() { return m_pConsole; }
+	class IStorage *Storage() { return m_pStorage; }
+	class IEngineAntibot *Antibot() { return m_pAntibot; }
+	class CDbConnectionPool *DbPool() { return m_pConnectionPool; }
+
+	enum
+	{
+		MAX_RCONCMD_SEND = 16,
+	};
+
+	class CClient
+	{
+	public:
+		enum
+		{
+			STATE_EMPTY = 0,
+			STATE_PREAUTH,
+			STATE_AUTH,
+			STATE_CONNECTING,
+			STATE_READY,
+			STATE_INGAME,
+			STATE_REDIRECTED,
+
+			SNAPRATE_INIT = 0,
+			SNAPRATE_FULL,
+			SNAPRATE_RECOVER,
+
+			DNSBL_STATE_NONE = 0,
+			DNSBL_STATE_PENDING,
+			DNSBL_STATE_BLACKLISTED,
+			DNSBL_STATE_WHITELISTED,
+		};
+
+		class CInput
+		{
+		public:
+			int m_aData[MAX_INPUT_SIZE];
+			int m_GameTick; // the tick that was chosen for the input
+		};
+
+		// connection state info
+		int m_State;
+		int m_Latency;
+		int m_SnapRate;
+
+		double m_Traffic;
+		int64_t m_TrafficSince;
+
+		int m_LastAckedSnapshot;
+		int m_LastInputTick;
+		CSnapshotStorage m_Snapshots;
+
+		CInput m_LatestInput;
+		CInput m_aInputs[200]; // TODO: handle input better
+		int m_CurrentInput;
+
+		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
+		int m_Country;
+		std::optional<int> m_Score;
+		int m_Authed;
+		int m_AuthKey;
+		int m_AuthTries;
+		int m_NextMapChunk;
+		int m_Flags;
+		bool m_ShowIps;
+		bool m_DebugDummy;
+
+		const IConsole::CCommandInfo *m_pRconCmdToSend;
+
+		bool m_HasPersistentData;
+		void *m_pPersistentData;
+
+		void Reset();
+
+		// DDRace
+
+		NETADDR m_Addr;
+		bool m_GotDDNetVersionPacket;
+		bool m_DDNetVersionSettled;
+		int m_DDNetVersion;
+		char m_aDDNetVersionStr[64];
+		CUuid m_ConnectionID;
+		int64_t m_RedirectDropTime;
+
+		// DNSBL
+		int m_DnsblState;
+		std::shared_ptr<CHostLookup> m_pDnsblLookup;
+
+		bool m_Sixup;
+
+		bool IncludedInServerInfo() const
+		{
+			return m_State != STATE_EMPTY && !m_DebugDummy;
+		}
+	};
+
+	CClient m_aClients[MAX_CLIENTS];
+	int m_aIdMap[MAX_CLIENTS * VANILLA_MAX_CLIENTS];
+
+	CSnapshotDelta m_SnapshotDelta;
+	CSnapshotBuilder m_SnapshotBuilder;
+	CSnapIDPool m_IDPool;
+	CNetServer m_NetServer;
+	CEcon m_Econ;
+	CFifo m_Fifo;
+	CServerBan m_ServerBan;
+
+	IEngineMap *m_pMap;
+
+	int64_t m_GameStartTime;
+	//int m_CurrentGameTick;
+
+	enum
+	{
+		UNINITIALIZED = 0,
+		RUNNING = 1,
+		STOPPING = 2
+	};
+
+	int m_RunServer;
+
+	bool m_MapReload;
+	bool m_ReloadedWhenEmpty;
+	int m_RconClientID;
+	int m_RconAuthLevel;
+	int m_PrintCBIndex;
+	char m_aShutdownReason[128];
+	void *m_pPersistentData;
+
+	enum
+	{
+		MAP_TYPE_SIX = 0,
+		MAP_TYPE_SIXUP,
+		NUM_MAP_TYPES
+	};
+
+	char m_aCurrentMap[IO_MAX_PATH_LENGTH];
+	SHA256_DIGEST m_aCurrentMapSha256[NUM_MAP_TYPES];
+	unsigned m_aCurrentMapCrc[NUM_MAP_TYPES];
+	unsigned char *m_apCurrentMapData[NUM_MAP_TYPES];
+	unsigned int m_aCurrentMapSize[NUM_MAP_TYPES];
+
+	CDemoRecorder m_aDemoRecorder[MAX_CLIENTS + 1];
+	CAuthManager m_AuthManager;
+
+	int64_t m_ServerInfoFirstRequest;
+	int m_ServerInfoNumRequests;
+
+	char m_aErrorShutdownReason[128];
+
+	CNameBans m_NameBans;
+
+	size_t m_AnnouncementLastLine;
+	std::vector<std::string> m_vAnnouncements;
+	char m_aAnnouncementFile[IO_MAX_PATH_LENGTH];
+
+	std::shared_ptr<ILogger> m_pFileLogger = nullptr;
+	std::shared_ptr<ILogger> m_pStdoutLogger = nullptr;
+
+	CServer();
+	~CServer();
+
+	bool IsClientNameAvailable(int ClientID, const char *pNameRequest);
+	bool SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set);
+	bool SetClientClanImpl(int ClientID, const char *pClanRequest, bool Set);
+
+	bool WouldClientNameChange(int ClientID, const char *pNameRequest) override;
+	bool WouldClientClanChange(int ClientID, const char *pClanRequest) override;
+	void SetClientName(int ClientID, const char *pName) override;
+	void SetClientClan(int ClientID, const char *pClan) override;
+	void SetClientCountry(int ClientID, int Country) override;
+	void SetClientScore(int ClientID, std::optional<int> Score) override;
+	void SetClientFlags(int ClientID, int Flags) override;
+
+	void Kick(int ClientID, const char *pReason) override;
+	void Ban(int ClientID, int Seconds, const char *pReason) override;
+	void RedirectClient(int ClientID, int Port, bool Verbose = false) override;
+
+	void DemoRecorder_HandleAutoStart() override;
+
+	//int Tick()
+	int64_t TickStartTime(int Tick);
+	//int TickSpeed()
+
+	int Init();
+
+	void SendLogLine(const CLogMessage *pMessage);
+	void SetRconCID(int ClientID) override;
+	int GetAuthedState(int ClientID) const override;
+	const char *GetAuthName(int ClientID) const override;
+	void GetMapInfo(char *pMapName, int MapNameSize, int *pMapSize, SHA256_DIGEST *pMapSha256, int *pMapCrc) override;
+	bool GetClientInfo(int ClientID, CClientInfo *pInfo) const override;
+	void SetClientDDNetVersion(int ClientID, int DDNetVersion) override;
+	void GetClientAddr(int ClientID, char *pAddrStr, int Size) const override;
+	const char *ClientName(int ClientID) const override;
+	const char *ClientClan(int ClientID) const override;
+	int ClientCountry(int ClientID) const override;
+	bool ClientIngame(int ClientID) const override;
+	bool ClientAuthed(int ClientID) const override;
+	int Port() const override;
+	int MaxClients() const override;
+	int ClientCount() const override;
+	int DistinctClientCount() const override;
+
+	int GetClientVersion(int ClientID) const override;
+	int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) override;
+
+	void DoSnapshot();
+
+	static int NewClientCallback(int ClientID, void *pUser, bool Sixup);
+	static int NewClientNoAuthCallback(int ClientID, void *pUser);
+	static int DelClientCallback(int ClientID, const char *pReason, void *pUser);
+
+	static int ClientRejoinCallback(int ClientID, void *pUser);
+
+	void SendRconType(int ClientID, bool UsernameReq);
+	void SendCapabilities(int ClientID);
+	void SendMap(int ClientID);
+	void SendMapData(int ClientID, int Chunk);
+	void SendConnectionReady(int ClientID);
+	void SendRconLine(int ClientID, const char *pLine);
+	// Accepts -1 as ClientID to mean "all clients with at least auth level admin"
+	void SendRconLogLine(int ClientID, const CLogMessage *pMessage);
+
+	void SendRconCmdAdd(const IConsole::CCommandInfo *pCommandInfo, int ClientID);
+	void SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int ClientID);
+	void UpdateClientRconCommands();
+
+	bool CheckReservedSlotAuth(int ClientID, const char *pPassword);
+	void ProcessClientPacket(CNetChunk *pPacket);
+
+	class CCache
+	{
+	public:
+		class CCacheChunk
+		{
+		public:
+			CCacheChunk(const void *pData, int Size);
+			CCacheChunk(const CCacheChunk &) = delete;
+			CCacheChunk(CCacheChunk &&) = default;
+
+			std::vector<uint8_t> m_vData;
+		};
+
+		std::vector<CCacheChunk> m_vCache;
+
+		CCache();
+		~CCache();
+
+		void AddChunk(const void *pData, int Size);
+		void Clear();
+	};
+	CCache m_aServerInfoCache[3 * 2];
+	CCache m_aSixupServerInfoCache[2];
+	bool m_ServerInfoNeedsUpdate;
+
+	void FillAntibot(CAntibotRoundData *pData) override;
+
+	void ExpireServerInfo() override;
+	void CacheServerInfo(CCache *pCache, int Type, bool SendClients);
+	void CacheServerInfoSixup(CCache *pCache, bool SendClients);
+	void SendServerInfo(const NETADDR *pAddr, int Token, int Type, bool SendClients);
+	void GetServerInfoSixup(CPacker *pPacker, int Token, bool SendClients);
+	bool RateLimitServerInfoConnless();
+	void SendServerInfoConnless(const NETADDR *pAddr, int Token, int Type);
+	void UpdateRegisterServerInfo();
+	void UpdateServerInfo(bool Resend = false);
+
+	void PumpNetwork(bool PacketWaiting);
+
+	void ChangeMap(const char *pMap) override;
+	const char *GetMapName() const override;
+	int LoadMap(const char *pMapName);
+
+	void SaveDemo(int ClientID, float Time) override;
+	void StartRecord(int ClientID) override;
+	void StopRecord(int ClientID) override;
+	bool IsRecording(int ClientID) override;
+	void StopDemos() override;
+
+	int Run();
+
+	static void ConKick(IConsole::IResult *pResult, void *pUser);
+	static void ConStatus(IConsole::IResult *pResult, void *pUser);
+	static void ConShutdown(IConsole::IResult *pResult, void *pUser);
+	static void ConRecord(IConsole::IResult *pResult, void *pUser);
+	static void ConStopRecord(IConsole::IResult *pResult, void *pUser);
+	static void ConMapReload(IConsole::IResult *pResult, void *pUser);
+	static void ConLogout(IConsole::IResult *pResult, void *pUser);
+	static void ConShowIps(IConsole::IResult *pResult, void *pUser);
+
+	static void ConAuthAdd(IConsole::IResult *pResult, void *pUser);
+	static void ConAuthAddHashed(IConsole::IResult *pResult, void *pUser);
+	static void ConAuthUpdate(IConsole::IResult *pResult, void *pUser);
+	static void ConAuthUpdateHashed(IConsole::IResult *pResult, void *pUser);
+	static void ConAuthRemove(IConsole::IResult *pResult, void *pUser);
+	static void ConAuthList(IConsole::IResult *pResult, void *pUser);
+
+	// console commands for sqlmasters
+	static void ConAddSqlServer(IConsole::IResult *pResult, void *pUserData);
+	static void ConDumpSqlServers(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainCommandAccessUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	void LogoutClient(int ClientID, const char *pReason);
+	void LogoutKey(int Key, const char *pReason);
+
+	void ConchainRconPasswordChangeGeneric(int Level, const char *pCurrent, IConsole::IResult *pResult);
+	static void ConchainRconPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainRconModPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainRconHelperPasswordChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainMapUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainSixupUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainLoglevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainStdoutOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+#if defined(CONF_FAMILY_UNIX)
+	static void ConchainConnLoggingServerChange(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+#endif
+
+	void RegisterCommands();
+
+	int SnapNewID() override;
+	void SnapFreeID(int ID) override;
+	void *SnapNewItem(int Type, int ID, int Size) override;
+	void SnapSetStaticsize(int ItemType, int Size) override;
+
+	// DDRace
+
+	void GetClientAddr(int ClientID, NETADDR *pAddr) const override;
+	int m_aPrevStates[MAX_CLIENTS];
+	const char *GetAnnouncementLine(const char *pFileName) override;
+
+	int *GetIdMap(int ClientID) override;
+
+	void InitDnsbl(int ClientID);
+	bool DnsblWhite(int ClientID) override
+	{
+		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_NONE ||
+		       m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED;
+	}
+	bool DnsblPending(int ClientID) override
+	{
+		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_PENDING;
+	}
+	bool DnsblBlack(int ClientID) override
+	{
+		return m_aClients[ClientID].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED;
+	}
+
+	void AuthRemoveKey(int KeySlot);
+	bool ClientPrevIngame(int ClientID) override { return m_aPrevStates[ClientID] == CClient::STATE_INGAME; }
+	const char *GetNetErrorString(int ClientID) override { return m_NetServer.ErrorString(ClientID); }
+	void ResetNetErrorString(int ClientID) override { m_NetServer.ResetErrorString(ClientID); }
+	bool SetTimedOut(int ClientID, int OrigID) override;
+	void SetTimeoutProtected(int ClientID) override { m_NetServer.SetTimeoutProtected(ClientID); }
+
+	void SendMsgRaw(int ClientID, const void *pData, int Size, int Flags) override;
+
+	bool ErrorShutdown() const { return m_aErrorShutdownReason[0] != 0; }
+	void SetErrorShutdown(const char *pReason) override;
+
+	bool IsSixup(int ClientID) const override { return ClientID != SERVER_DEMO_CLIENT && m_aClients[ClientID].m_Sixup; }
+
+	void SetLoggers(std::shared_ptr<ILogger> &&pFileLogger, std::shared_ptr<ILogger> &&pStdoutLogger);
+
+#ifdef CONF_FAMILY_UNIX
+	enum CONN_LOGGING_CMD
+	{
+		OPEN_SESSION = 1,
+		CLOSE_SESSION = 2,
+	};
+
+	void SendConnLoggingCommand(CONN_LOGGING_CMD Cmd, const NETADDR *pAddr);
+#endif
+};
+
+extern CServer *CreateServer();
+#endif
diff --git a/src_bkp/engine/server/server_logger.cpp b/src_bkp/engine/server/server_logger.cpp
new file mode 100644
index 0000000000..2d0e2d15a5
--- /dev/null
+++ b/src_bkp/engine/server/server_logger.cpp
@@ -0,0 +1,47 @@
+#include "server_logger.h"
+
+#include "server.h"
+
+CServerLogger::CServerLogger(CServer *pServer) :
+	m_pServer(pServer),
+	m_MainThread(std::this_thread::get_id())
+{
+	dbg_assert(pServer != nullptr, "server pointer must not be null");
+}
+
+void CServerLogger::Log(const CLogMessage *pMessage)
+{
+	if(m_Filter.Filters(pMessage))
+	{
+		return;
+	}
+	m_PendingLock.lock();
+	if(m_MainThread == std::this_thread::get_id())
+	{
+		if(!m_vPending.empty())
+		{
+			if(m_pServer)
+			{
+				for(const auto &Message : m_vPending)
+				{
+					m_pServer->SendLogLine(&Message);
+				}
+			}
+			m_vPending.clear();
+		}
+		m_PendingLock.unlock();
+		if(m_pServer)
+			m_pServer->SendLogLine(pMessage);
+	}
+	else
+	{
+		m_vPending.push_back(*pMessage);
+		m_PendingLock.unlock();
+	}
+}
+
+void CServerLogger::OnServerDeletion()
+{
+	dbg_assert(m_MainThread == std::this_thread::get_id(), "CServerLogger::OnServerDeletion not called from the main thread");
+	m_pServer = nullptr;
+}
diff --git a/src_bkp/engine/server/server_logger.h b/src_bkp/engine/server/server_logger.h
new file mode 100644
index 0000000000..18c5d9f5ab
--- /dev/null
+++ b/src_bkp/engine/server/server_logger.h
@@ -0,0 +1,23 @@
+#ifndef ENGINE_SERVER_SERVER_LOGGER_H
+#define ENGINE_SERVER_SERVER_LOGGER_H
+#include <base/logger.h>
+
+#include <thread>
+
+class CServer;
+
+class CServerLogger : public ILogger
+{
+	CServer *m_pServer = nullptr;
+	CLock m_PendingLock;
+	std::vector<CLogMessage> m_vPending;
+	std::thread::id m_MainThread;
+
+public:
+	CServerLogger(CServer *pServer);
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_PendingLock);
+	// Must be called from the main thread!
+	void OnServerDeletion();
+};
+
+#endif // ENGINE_SERVER_SERVER_LOGGER_H
diff --git a/src_bkp/engine/server/sql_string_helpers.cpp b/src_bkp/engine/server/sql_string_helpers.cpp
new file mode 100644
index 0000000000..c0a6fe10a7
--- /dev/null
+++ b/src_bkp/engine/server/sql_string_helpers.cpp
@@ -0,0 +1,121 @@
+#include "sql_string_helpers.h"
+
+#include <base/system.h>
+#include <cmath>
+
+void sqlstr::FuzzyString(char *pString, int Size)
+{
+	char *pNewString = new char[Size * 4 - 1];
+	int OutPos = 0;
+
+	for(int i = 0; i < Size; i++)
+	{
+		if(!pString[i])
+			break;
+
+		pNewString[OutPos++] = pString[i];
+		if(pString[i] != '\\' && str_utf8_isstart(pString[i + 1]))
+			pNewString[OutPos++] = '%';
+	}
+
+	pNewString[OutPos] = '\0';
+	str_copy(pString, pNewString, Size);
+	delete[] pNewString;
+}
+
+int sqlstr::EscapeLike(char *pDst, const char *pSrc, int DstSize)
+{
+	int Pos = 0;
+	int DstPos = 0;
+	while(DstPos + 2 < DstSize)
+	{
+		if(pSrc[Pos] == '\0')
+			break;
+		if(pSrc[Pos] == '\\' || pSrc[Pos] == '%' || pSrc[Pos] == '_' || pSrc[Pos] == '[')
+			pDst[DstPos++] = '\\';
+		pDst[DstPos++] = pSrc[Pos++];
+	}
+	pDst[DstPos++] = '\0';
+	return DstPos;
+}
+
+void sqlstr::AgoTimeToString(int AgoTime, char *pAgoString, int Size)
+{
+	if(AgoTime <= 0)
+	{
+		str_copy(pAgoString, "moments", Size);
+		return;
+	}
+
+	char aBuf[20];
+	const int aTimes[7] =
+		{
+			60 * 60 * 24 * 365,
+			60 * 60 * 24 * 30,
+			60 * 60 * 24 * 7,
+			60 * 60 * 24,
+			60 * 60,
+			60,
+			1};
+	const char aaNames[7][6] =
+		{
+			"year",
+			"month",
+			"week",
+			"day",
+			"hour",
+			"min",
+			"sec"};
+
+	int Seconds = 0;
+	char aName[6];
+	int Count = 0;
+	int i = 0;
+
+	// finding biggest match
+	for(i = 0; i < 7; i++)
+	{
+		Seconds = aTimes[i];
+		str_copy(aName, aaNames[i]);
+
+		Count = std::floor((float)AgoTime / (float)Seconds);
+		if(Count != 0)
+		{
+			break;
+		}
+	}
+
+	if(Count == 1)
+	{
+		str_format(aBuf, sizeof(aBuf), "%d %s", 1, aName);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf), "%d %ss", Count, aName);
+	}
+	str_append(pAgoString, aBuf, Size);
+
+	if(i + 1 < 7)
+	{
+		// getting second piece now
+		int Seconds2 = aTimes[i + 1];
+		char aName2[6];
+		str_copy(aName2, aaNames[i + 1]);
+
+		// add second piece if it's greater than 0
+		int Count2 = std::floor((float)(AgoTime - (Seconds * Count)) / (float)Seconds2);
+
+		if(Count2 != 0)
+		{
+			if(Count2 == 1)
+			{
+				str_format(aBuf, sizeof(aBuf), " and %d %s", 1, aName2);
+			}
+			else
+			{
+				str_format(aBuf, sizeof(aBuf), " and %d %ss", Count2, aName2);
+			}
+			str_append(pAgoString, aBuf, Size);
+		}
+	}
+}
diff --git a/src_bkp/engine/server/sql_string_helpers.h b/src_bkp/engine/server/sql_string_helpers.h
new file mode 100644
index 0000000000..c55a2f2e2d
--- /dev/null
+++ b/src_bkp/engine/server/sql_string_helpers.h
@@ -0,0 +1,15 @@
+#ifndef ENGINE_SERVER_SQL_STRING_HELPERS_H
+#define ENGINE_SERVER_SQL_STRING_HELPERS_H
+
+namespace sqlstr {
+
+void FuzzyString(char *pString, int Size);
+
+// written number of added bytes
+int EscapeLike(char *pDst, const char *pSrc, int DstSize);
+
+void AgoTimeToString(int AgoTime, char *pAgoString, int Size);
+
+} // namespace sqlstr
+
+#endif
diff --git a/src_bkp/engine/server/upnp.cpp b/src_bkp/engine/server/upnp.cpp
new file mode 100644
index 0000000000..e6639c07d2
--- /dev/null
+++ b/src_bkp/engine/server/upnp.cpp
@@ -0,0 +1,75 @@
+#ifdef CONF_UPNP
+
+#include "upnp.h"
+#include <base/system.h>
+#include <engine/shared/config.h>
+#include <game/version.h>
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
+#include <miniupnpc/upnperrors.h>
+
+#include <cstdlib>
+
+void CUPnP::Open(NETADDR Address)
+{
+	if(g_Config.m_SvUseUPnP)
+	{
+		m_Enabled = false;
+		m_Addr = Address;
+		m_pUPnPUrls = (struct UPNPUrls *)malloc(sizeof(struct UPNPUrls));
+		m_pUPnPData = (struct IGDdatas *)malloc(sizeof(struct IGDdatas));
+
+		char aLanAddr[64];
+		char aPort[6];
+		int Error;
+
+		m_pUPnPDevice = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &Error);
+
+		int Status = UPNP_GetValidIGD(m_pUPnPDevice, m_pUPnPUrls, m_pUPnPData, aLanAddr, sizeof(aLanAddr));
+		dbg_msg("upnp", "status=%d, lan_addr=%s", Status, aLanAddr);
+
+		if(Status == 1)
+		{
+			m_Enabled = true;
+			dbg_msg("upnp", "found valid IGD: %s", m_pUPnPUrls->controlURL);
+			str_from_int(m_Addr.port, aPort);
+			Error = UPNP_AddPortMapping(m_pUPnPUrls->controlURL, m_pUPnPData->first.servicetype,
+				aPort, aPort, aLanAddr,
+				"DDNet Server " GAME_RELEASE_VERSION,
+				"UDP", NULL, "0");
+
+			if(Error)
+				dbg_msg("upnp", "failed to map port, error: %s", strupnperror(Error));
+			else
+				dbg_msg("upnp", "successfully mapped port");
+		}
+		else
+			dbg_msg("upnp", "no valid IGD found, disabled");
+	}
+}
+
+void CUPnP::Shutdown()
+{
+	if(g_Config.m_SvUseUPnP)
+	{
+		if(m_Enabled)
+		{
+			char aPort[6];
+			str_from_int(m_Addr.port, aPort);
+			int Error = UPNP_DeletePortMapping(m_pUPnPUrls->controlURL, m_pUPnPData->first.servicetype, aPort, "UDP", NULL);
+
+			if(Error != 0)
+			{
+				dbg_msg("upnp", "failed to delete port mapping on shutdown: %s", strupnperror(Error));
+			}
+			FreeUPNPUrls(m_pUPnPUrls);
+			freeUPNPDevlist(m_pUPnPDevice);
+		}
+		free(m_pUPnPUrls);
+		free(m_pUPnPData);
+		m_pUPnPUrls = NULL;
+		m_pUPnPData = NULL;
+	}
+}
+
+#endif
diff --git a/src_bkp/engine/server/upnp.h b/src_bkp/engine/server/upnp.h
new file mode 100644
index 0000000000..6b35db268c
--- /dev/null
+++ b/src_bkp/engine/server/upnp.h
@@ -0,0 +1,18 @@
+#ifndef ENGINE_SERVER_UPNP_H
+#define ENGINE_SERVER_UPNP_H
+
+#include <base/types.h>
+class CUPnP
+{
+	NETADDR m_Addr;
+	struct UPNPUrls *m_pUPnPUrls;
+	struct IGDdatas *m_pUPnPData;
+	struct UPNPDev *m_pUPnPDevice;
+	bool m_Enabled;
+
+public:
+	void Open(NETADDR Address);
+	void Shutdown();
+};
+
+#endif
diff --git a/src_bkp/engine/serverbrowser.h b/src_bkp/engine/serverbrowser.h
new file mode 100644
index 0000000000..015f5171a3
--- /dev/null
+++ b/src_bkp/engine/serverbrowser.h
@@ -0,0 +1,314 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SERVERBROWSER_H
+#define ENGINE_SERVERBROWSER_H
+
+#include <base/hash.h>
+#include <base/system.h>
+
+#include <engine/map.h>
+#include <engine/shared/protocol.h>
+
+#include "kernel.h"
+
+#include <unordered_set>
+#include <vector>
+
+static constexpr const char *DDNET_INFO_FILE = "ddnet-info.json";
+static constexpr const char *DDNET_INFO_URL = "https://info.ddnet.org/info";
+
+class CUIElement;
+
+class CServerInfo
+{
+public:
+	enum
+	{
+		LOC_UNKNOWN = 0,
+		LOC_AFRICA,
+		LOC_ASIA,
+		LOC_AUSTRALIA,
+		LOC_EUROPE,
+		LOC_NORTH_AMERICA,
+		LOC_SOUTH_AMERICA,
+		// Special case China because it has an exceptionally bad
+		// connection to the outside due to the Great Firewall of
+		// China:
+		// https://en.wikipedia.org/w/index.php?title=Great_Firewall&oldid=1019589632
+		LOC_CHINA,
+		NUM_LOCS,
+	};
+
+	enum EClientScoreKind
+	{
+		CLIENT_SCORE_KIND_UNSPECIFIED,
+		CLIENT_SCORE_KIND_POINTS,
+		CLIENT_SCORE_KIND_TIME,
+		CLIENT_SCORE_KIND_TIME_BACKCOMPAT,
+	};
+
+	enum ERankState
+	{
+		RANK_UNAVAILABLE,
+		RANK_RANKED,
+		RANK_UNRANKED,
+	};
+
+	enum
+	{
+		MAX_COMMUNITY_ID_LENGTH = 32,
+		MAX_COMMUNITY_COUNTRY_LENGTH = 32,
+		MAX_COMMUNITY_TYPE_LENGTH = 32,
+	};
+
+	class CClient
+	{
+	public:
+		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
+		int m_Country;
+		int m_Score;
+		bool m_Player;
+		bool m_Afk;
+
+		// skin info
+		char m_aSkin[24 + 1];
+		bool m_CustomSkinColors;
+		int m_CustomSkinColorBody;
+		int m_CustomSkinColorFeet;
+
+		int m_FriendState;
+	};
+
+	int m_ServerIndex;
+
+	int m_Type;
+	uint64_t m_ReceivedPackets;
+	int m_NumReceivedClients;
+
+	int m_NumAddresses;
+	NETADDR m_aAddresses[MAX_SERVER_ADDRESSES];
+
+	int m_QuickSearchHit;
+	int m_FriendState;
+	int m_FriendNum;
+
+	int m_MaxClients;
+	int m_NumClients;
+	int m_MaxPlayers;
+	int m_NumPlayers;
+	int m_Flags;
+	EClientScoreKind m_ClientScoreKind;
+	TRISTATE m_Favorite;
+	TRISTATE m_FavoriteAllowPing;
+	char m_aCommunityId[MAX_COMMUNITY_ID_LENGTH];
+	char m_aCommunityCountry[MAX_COMMUNITY_COUNTRY_LENGTH];
+	char m_aCommunityType[MAX_COMMUNITY_TYPE_LENGTH];
+	int m_Location;
+	bool m_LatencyIsEstimated;
+	int m_Latency; // in ms
+	ERankState m_HasRank;
+	char m_aGameType[16];
+	char m_aName[64];
+	char m_aMap[MAX_MAP_LENGTH];
+	int m_MapCrc;
+	int m_MapSize;
+	char m_aVersion[32];
+	char m_aAddress[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE];
+	CClient m_aClients[SERVERINFO_MAX_CLIENTS];
+	int m_NumFilteredPlayers;
+
+	static int EstimateLatency(int Loc1, int Loc2);
+	static bool ParseLocation(int *pResult, const char *pString);
+	void InfoToString(char *pBuffer, int BufferSize) const;
+};
+
+class CCommunityCountryServer
+{
+	NETADDR m_Address;
+	char m_aTypeName[CServerInfo::MAX_COMMUNITY_TYPE_LENGTH];
+
+public:
+	CCommunityCountryServer(NETADDR Address, const char *pTypeName) :
+		m_Address(Address)
+	{
+		str_copy(m_aTypeName, pTypeName);
+	}
+
+	NETADDR Address() const { return m_Address; }
+	const char *TypeName() const { return m_aTypeName; }
+};
+
+class CCommunityCountry
+{
+	friend class CServerBrowser;
+
+	char m_aName[CServerInfo::MAX_COMMUNITY_COUNTRY_LENGTH];
+	int m_FlagId;
+	std::vector<CCommunityCountryServer> m_vServers;
+
+public:
+	CCommunityCountry(const char *pName, int FlagId) :
+		m_FlagId(FlagId)
+	{
+		str_copy(m_aName, pName);
+	}
+
+	const char *Name() const { return m_aName; }
+	int FlagId() const { return m_FlagId; }
+	const std::vector<CCommunityCountryServer> &Servers() const { return m_vServers; }
+};
+
+class CCommunityType
+{
+	char m_aName[CServerInfo::MAX_COMMUNITY_TYPE_LENGTH];
+
+public:
+	CCommunityType(const char *pName)
+	{
+		str_copy(m_aName, pName);
+	}
+
+	const char *Name() const { return m_aName; }
+};
+
+class CCommunityMap
+{
+	char m_aName[MAX_MAP_LENGTH];
+
+public:
+	CCommunityMap(const char *pName)
+	{
+		str_copy(m_aName, pName);
+	}
+
+	const char *Name() const { return m_aName; }
+
+	bool operator==(const CCommunityMap &Other) const
+	{
+		return str_comp(Name(), Other.Name()) == 0;
+	}
+
+	bool operator!=(const CCommunityMap &Other) const
+	{
+		return !(*this == Other);
+	}
+
+	struct SHash
+	{
+		size_t operator()(const CCommunityMap &Map) const
+		{
+			return str_quickhash(Map.Name());
+		}
+	};
+};
+
+class CCommunity
+{
+	friend class CServerBrowser;
+
+	char m_aId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	char m_aName[64];
+	SHA256_DIGEST m_IconSha256;
+	char m_aIconUrl[128];
+	std::vector<CCommunityCountry> m_vCountries;
+	std::vector<CCommunityType> m_vTypes;
+	bool m_HasFinishes = false;
+	std::unordered_set<CCommunityMap, CCommunityMap::SHash> m_FinishedMaps;
+
+public:
+	CCommunity(const char *pId, const char *pName, SHA256_DIGEST IconSha256, const char *pIconUrl) :
+		m_IconSha256(IconSha256)
+	{
+		str_copy(m_aId, pId);
+		str_copy(m_aName, pName);
+		str_copy(m_aIconUrl, pIconUrl);
+	}
+
+	const char *Id() const { return m_aId; }
+	const char *Name() const { return m_aName; }
+	const char *IconUrl() const { return m_aIconUrl; }
+	const SHA256_DIGEST &IconSha256() const { return m_IconSha256; }
+	const std::vector<CCommunityCountry> &Countries() const { return m_vCountries; }
+	const std::vector<CCommunityType> &Types() const { return m_vTypes; }
+	bool HasRanks() const { return m_HasFinishes; }
+	CServerInfo::ERankState HasRank(const char *pMap) const;
+};
+
+class IFilterList
+{
+public:
+	virtual void Add(const char *pElement) = 0;
+	virtual void Remove(const char *pElement) = 0;
+	virtual void Clear() = 0;
+	virtual bool Empty() const = 0;
+	virtual bool Filtered(const char *pElement) const = 0;
+};
+
+class IServerBrowser : public IInterface
+{
+	MACRO_INTERFACE("serverbrowser")
+public:
+	/* Constants: Server Browser Sorting
+		SORT_NAME - Sort by name.
+		SORT_PING - Sort by ping.
+		SORT_MAP - Sort by map
+		SORT_GAMETYPE - Sort by game type. DM, TDM etc.
+		SORT_NUMPLAYERS - Sort after how many players there are on the server.
+	*/
+	enum
+	{
+		SORT_NAME = 0,
+		SORT_PING,
+		SORT_MAP,
+		SORT_GAMETYPE,
+		SORT_NUMPLAYERS,
+
+		QUICK_SERVERNAME = 1,
+		QUICK_PLAYER = 2,
+		QUICK_MAPNAME = 4,
+
+		TYPE_INTERNET = 0,
+		TYPE_LAN,
+		TYPE_FAVORITES,
+		NUM_TYPES,
+
+	};
+
+	static constexpr const char *COMMUNITY_DDNET = "ddnet";
+	static constexpr const char *COMMUNITY_NONE = "none";
+
+	static constexpr const char *SEARCH_EXCLUDE_TOKEN = ";";
+
+	virtual void Refresh(int Type) = 0;
+	virtual bool IsGettingServerlist() const = 0;
+	virtual bool IsRefreshing() const = 0;
+	virtual int LoadingProgression() const = 0;
+
+	virtual int NumServers() const = 0;
+
+	virtual int Players(const CServerInfo &Item) const = 0;
+	virtual int Max(const CServerInfo &Item) const = 0;
+
+	virtual int NumSortedServers() const = 0;
+	virtual int NumSortedPlayers() const = 0;
+	virtual const CServerInfo *SortedGet(int Index) const = 0;
+
+	virtual const std::vector<CCommunity> &Communities() const = 0;
+	virtual const CCommunity *Community(const char *pCommunityId) const = 0;
+	virtual std::vector<const CCommunity *> SelectedCommunities() const = 0;
+	virtual int64_t DDNetInfoUpdateTime() const = 0;
+
+	virtual IFilterList &CommunitiesFilter() = 0;
+	virtual IFilterList &CountriesFilter() = 0;
+	virtual IFilterList &TypesFilter() = 0;
+	virtual const IFilterList &CommunitiesFilter() const = 0;
+	virtual const IFilterList &CountriesFilter() const = 0;
+	virtual const IFilterList &TypesFilter() const = 0;
+	virtual void CleanFilters() = 0;
+
+	virtual int GetCurrentType() = 0;
+	virtual const char *GetTutorialServer() = 0;
+};
+
+#endif
diff --git a/src_bkp/engine/shared/Cargo.toml b/src_bkp/engine/shared/Cargo.toml
new file mode 100644
index 0000000000..b939c23d16
--- /dev/null
+++ b/src_bkp/engine/shared/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "ddnet-engine-shared"
+version = "0.0.1"
+edition = "2018"
+publish = false
+license = "Zlib"
+
+[lib]
+crate-type = ["rlib", "staticlib"]
+path = "lib.rs"
+
+[dependencies]
+ddnet-base = { path = "../../base" }
+ddnet-engine = { path = ".." }
+
+cxx = "1.0"
+
+[dev-dependencies]
+ddnet-test = { path = "../../rust-bridge/test", features = ["link-test-libraries"] }
diff --git a/src_bkp/engine/shared/assertion_logger.cpp b/src_bkp/engine/shared/assertion_logger.cpp
new file mode 100644
index 0000000000..b6b2510bf7
--- /dev/null
+++ b/src_bkp/engine/shared/assertion_logger.cpp
@@ -0,0 +1,85 @@
+#include "assertion_logger.h"
+
+#include <base/lock.h>
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/shared/ringbuffer.h>
+#include <engine/storage.h>
+
+class CAssertionLogger : public ILogger
+{
+	struct SDebugMessageItem
+	{
+		char m_aMessage[1024];
+	};
+
+	CLock m_DbgMessageMutex;
+	CStaticRingBuffer<SDebugMessageItem, sizeof(SDebugMessageItem) * 64, CRingBufferBase::FLAG_RECYCLE> m_DbgMessages;
+
+	char m_aAssertLogPath[IO_MAX_PATH_LENGTH];
+	char m_aGameName[256];
+
+	void Dump() REQUIRES(!m_DbgMessageMutex);
+
+public:
+	CAssertionLogger(const char *pAssertLogPath, const char *pGameName);
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_DbgMessageMutex);
+	void GlobalFinish() override REQUIRES(!m_DbgMessageMutex);
+};
+
+void CAssertionLogger::Log(const CLogMessage *pMessage)
+{
+	if(m_Filter.Filters(pMessage))
+	{
+		return;
+	}
+	const CLockScope LockScope(m_DbgMessageMutex);
+	SDebugMessageItem *pMsgItem = (SDebugMessageItem *)m_DbgMessages.Allocate(sizeof(SDebugMessageItem));
+	str_copy(pMsgItem->m_aMessage, pMessage->m_aLine);
+}
+
+void CAssertionLogger::GlobalFinish()
+{
+	if(dbg_assert_has_failed())
+	{
+		Dump();
+	}
+}
+
+void CAssertionLogger::Dump()
+{
+	char aAssertLogFile[IO_MAX_PATH_LENGTH];
+	char aDate[64];
+	str_timestamp(aDate, sizeof(aDate));
+	str_format(aAssertLogFile, std::size(aAssertLogFile), "%s%s_assert_log_%s_%d.txt", m_aAssertLogPath, m_aGameName, aDate, pid());
+	const CLockScope LockScope(m_DbgMessageMutex);
+	IOHANDLE FileHandle = io_open(aAssertLogFile, IOFLAG_WRITE);
+	if(FileHandle)
+	{
+		auto *pIt = m_DbgMessages.First();
+		while(pIt)
+		{
+			io_write(FileHandle, pIt->m_aMessage, str_length(pIt->m_aMessage));
+			io_write(FileHandle, "\n", 1);
+
+			pIt = m_DbgMessages.Next(pIt);
+		}
+
+		io_sync(FileHandle);
+		io_close(FileHandle);
+	}
+}
+
+CAssertionLogger::CAssertionLogger(const char *pAssertLogPath, const char *pGameName)
+{
+	str_copy(m_aAssertLogPath, pAssertLogPath);
+	str_copy(m_aGameName, pGameName);
+}
+
+std::unique_ptr<ILogger> CreateAssertionLogger(IStorage *pStorage, const char *pGameName)
+{
+	char aAssertLogPath[IO_MAX_PATH_LENGTH];
+	pStorage->GetCompletePath(IStorage::TYPE_SAVE, "dumps/", aAssertLogPath, sizeof(aAssertLogPath));
+	return std::make_unique<CAssertionLogger>(aAssertLogPath, pGameName);
+}
diff --git a/src_bkp/engine/shared/assertion_logger.h b/src_bkp/engine/shared/assertion_logger.h
new file mode 100644
index 0000000000..45c11217eb
--- /dev/null
+++ b/src_bkp/engine/shared/assertion_logger.h
@@ -0,0 +1,11 @@
+#ifndef ENGINE_SHARED_ASSERTION_LOGGER_H
+#define ENGINE_SHARED_ASSERTION_LOGGER_H
+
+#include <memory>
+
+class ILogger;
+class IStorage;
+
+std::unique_ptr<ILogger> CreateAssertionLogger(IStorage *pStorage, const char *pGameName);
+
+#endif
diff --git a/src_bkp/engine/shared/build.rs b/src_bkp/engine/shared/build.rs
new file mode 100644
index 0000000000..a9d62f96b5
--- /dev/null
+++ b/src_bkp/engine/shared/build.rs
@@ -0,0 +1,18 @@
+use std::env;
+use std::fs;
+use std::path::PathBuf;
+use std::process::Command;
+
+fn main() {
+    let mut out = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR"));
+    out.push("rustc-version");
+    let rustc = env::var_os("RUSTC").expect("RUSTC");
+    let rustc_output = Command::new(rustc)
+        .arg("--version")
+        .output()
+        .expect("rustc --version");
+    if !rustc_output.status.success() {
+        panic!("rustc --version: exit status {}", rustc_output.status);
+    }
+    fs::write(&out, rustc_output.stdout).expect("file write");
+}
diff --git a/src_bkp/engine/shared/compression.cpp b/src_bkp/engine/shared/compression.cpp
new file mode 100644
index 0000000000..58cb94e010
--- /dev/null
+++ b/src_bkp/engine/shared/compression.cpp
@@ -0,0 +1,105 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+#include "compression.h"
+
+#include <iterator> // std::size
+
+// Format: ESDDDDDD EDDDDDDD EDD... Extended, Data, Sign
+unsigned char *CVariableInt::Pack(unsigned char *pDst, int i, int DstSize)
+{
+	if(DstSize <= 0)
+		return 0;
+
+	DstSize--;
+	*pDst = 0;
+	if(i < 0)
+	{
+		*pDst |= 0x40; // set sign bit
+		i = ~i;
+	}
+
+	*pDst |= i & 0x3F; // pack 6bit into dst
+	i >>= 6; // discard 6 bits
+	while(i)
+	{
+		if(DstSize <= 0)
+			return 0;
+		*pDst |= 0x80; // set extend bit
+		DstSize--;
+		pDst++;
+		*pDst = i & 0x7F; // pack 7bit
+		i >>= 7; // discard 7 bits
+	}
+
+	pDst++;
+	return pDst;
+}
+
+const unsigned char *CVariableInt::Unpack(const unsigned char *pSrc, int *pInOut, int SrcSize)
+{
+	if(SrcSize <= 0)
+		return 0;
+
+	const int Sign = (*pSrc >> 6) & 1;
+	*pInOut = *pSrc & 0x3F;
+	SrcSize--;
+
+	static const int s_aMasks[] = {0x7F, 0x7F, 0x7F, 0x0F};
+	static const int s_aShifts[] = {6, 6 + 7, 6 + 7 + 7, 6 + 7 + 7 + 7};
+
+	for(unsigned i = 0; i < std::size(s_aMasks); i++)
+	{
+		if(!(*pSrc & 0x80))
+			break;
+		if(SrcSize <= 0)
+			return 0;
+		SrcSize--;
+		pSrc++;
+		*pInOut |= (*pSrc & s_aMasks[i]) << s_aShifts[i];
+	}
+
+	pSrc++;
+	*pInOut ^= -Sign; // if(sign) *i = ~(*i)
+	return pSrc;
+}
+
+long CVariableInt::Decompress(const void *pSrc_, int SrcSize, void *pDst_, int DstSize)
+{
+	dbg_assert(DstSize % sizeof(int) == 0, "invalid bounds");
+
+	const unsigned char *pSrc = (unsigned char *)pSrc_;
+	const unsigned char *pSrcEnd = pSrc + SrcSize;
+	int *pDst = (int *)pDst_;
+	const int *pDstEnd = pDst + DstSize / sizeof(int);
+	while(pSrc < pSrcEnd)
+	{
+		if(pDst >= pDstEnd)
+			return -1;
+		pSrc = CVariableInt::Unpack(pSrc, pDst, pSrcEnd - pSrc);
+		if(!pSrc)
+			return -1;
+		pDst++;
+	}
+	return (long)((unsigned char *)pDst - (unsigned char *)pDst_);
+}
+
+long CVariableInt::Compress(const void *pSrc_, int SrcSize, void *pDst_, int DstSize)
+{
+	dbg_assert(SrcSize % sizeof(int) == 0, "invalid bounds");
+
+	const int *pSrc = (int *)pSrc_;
+	unsigned char *pDst = (unsigned char *)pDst_;
+	const unsigned char *pDstEnd = pDst + DstSize;
+	SrcSize /= sizeof(int);
+	while(SrcSize)
+	{
+		pDst = CVariableInt::Pack(pDst, *pSrc, pDstEnd - pDst);
+		if(!pDst)
+			return -1;
+		SrcSize--;
+		pSrc++;
+	}
+	return (long)(pDst - (unsigned char *)pDst_);
+}
diff --git a/src_bkp/engine/shared/compression.h b/src_bkp/engine/shared/compression.h
new file mode 100644
index 0000000000..ef490b0d82
--- /dev/null
+++ b/src_bkp/engine/shared/compression.h
@@ -0,0 +1,22 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_COMPRESSION_H
+#define ENGINE_SHARED_COMPRESSION_H
+
+// variable int packing
+class CVariableInt
+{
+public:
+	enum
+	{
+		MAX_BYTES_PACKED = 5, // maximum number of bytes in a packed int
+	};
+
+	static unsigned char *Pack(unsigned char *pDst, int i, int DstSize);
+	static const unsigned char *Unpack(const unsigned char *pSrc, int *pInOut, int SrcSize);
+
+	static long Compress(const void *pSrc, int SrcSize, void *pDst, int DstSize);
+	static long Decompress(const void *pSrc, int SrcSize, void *pDst, int DstSize);
+};
+
+#endif
diff --git a/src_bkp/engine/shared/config.cpp b/src_bkp/engine/shared/config.cpp
new file mode 100644
index 0000000000..3c0f61e23b
--- /dev/null
+++ b/src_bkp/engine/shared/config.cpp
@@ -0,0 +1,613 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/log.h>
+
+#include <engine/config.h>
+#include <engine/shared/config.h>
+#include <engine/shared/console.h>
+#include <engine/shared/protocol.h>
+#include <engine/storage.h>
+
+CConfig g_Config;
+
+static void EscapeParam(char *pDst, const char *pSrc, int Size)
+{
+	str_escape(&pDst, pSrc, pDst + Size);
+}
+
+struct SConfigVariable
+{
+	enum EVariableType
+	{
+		VAR_INT,
+		VAR_COLOR,
+		VAR_STRING,
+	};
+	IConsole *m_pConsole;
+	const char *m_pScriptName;
+	EVariableType m_Type;
+	int m_Flags;
+	const char *m_pHelp;
+	// Note that this only applies to the console command and the SetValue function,
+	// but the underlying config variable can still be modified programatically.
+	bool m_ReadOnly = false;
+
+	SConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp) :
+		m_pConsole(pConsole),
+		m_pScriptName(pScriptName),
+		m_Type(Type),
+		m_Flags(Flags),
+		m_pHelp(pHelp)
+	{
+	}
+
+	virtual ~SConfigVariable() = default;
+
+	virtual void Register() = 0;
+	virtual bool IsDefault() const = 0;
+	virtual void Serialize(char *pOut, size_t Size) const = 0;
+	virtual void ResetToDefault() = 0;
+	virtual void ResetToOld() = 0;
+
+protected:
+	void ExecuteLine(const char *pLine) const
+	{
+		m_pConsole->ExecuteLine(pLine, (m_Flags & CFGFLAG_GAME) != 0 ? IConsole::CLIENT_ID_GAME : -1);
+	}
+
+	bool CheckReadOnly() const
+	{
+		if(!m_ReadOnly)
+			return false;
+		char aBuf[IConsole::CMDLINE_LENGTH + 64];
+		str_format(aBuf, sizeof(aBuf), "The config variable '%s' cannot be changed right now.", m_pScriptName);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+		return true;
+	}
+};
+
+struct SIntConfigVariable : public SConfigVariable
+{
+	int *m_pVariable;
+	int m_Default;
+	int m_Min;
+	int m_Max;
+	int m_OldValue;
+
+	SIntConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, int *pVariable, int Default, int Min, int Max) :
+		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+		m_pVariable(pVariable),
+		m_Default(Default),
+		m_Min(Min),
+		m_Max(Max),
+		m_OldValue(Default)
+	{
+		*m_pVariable = m_Default;
+	}
+
+	~SIntConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
+	{
+		SIntConfigVariable *pData = static_cast<SIntConfigVariable *>(pUserData);
+
+		if(pResult->NumArguments())
+		{
+			if(pData->CheckReadOnly())
+				return;
+
+			int Value = pResult->GetInteger(0);
+
+			// do clamping
+			if(pData->m_Min != pData->m_Max)
+			{
+				if(Value < pData->m_Min)
+					Value = pData->m_Min;
+				if(pData->m_Max != 0 && Value > pData->m_Max)
+					Value = pData->m_Max;
+			}
+
+			*pData->m_pVariable = Value;
+			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
+				pData->m_OldValue = Value;
+		}
+		else
+		{
+			char aBuf[32];
+			str_format(aBuf, sizeof(aBuf), "Value: %d", *pData->m_pVariable);
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+		}
+	}
+
+	void Register() override
+	{
+		m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
+	}
+
+	bool IsDefault() const override
+	{
+		return *m_pVariable == m_Default;
+	}
+
+	void Serialize(char *pOut, size_t Size, int Value) const
+	{
+		str_format(pOut, Size, "%s %i", m_pScriptName, Value);
+	}
+
+	void Serialize(char *pOut, size_t Size) const override
+	{
+		Serialize(pOut, Size, *m_pVariable);
+	}
+
+	void SetValue(int Value)
+	{
+		if(CheckReadOnly())
+			return;
+		char aBuf[IConsole::CMDLINE_LENGTH];
+		Serialize(aBuf, sizeof(aBuf), Value);
+		ExecuteLine(aBuf);
+	}
+
+	void ResetToDefault() override
+	{
+		SetValue(m_Default);
+	}
+
+	void ResetToOld() override
+	{
+		*m_pVariable = m_OldValue;
+	}
+};
+
+struct SColorConfigVariable : public SConfigVariable
+{
+	unsigned *m_pVariable;
+	unsigned m_Default;
+	bool m_Light;
+	bool m_Alpha;
+	unsigned m_OldValue;
+
+	SColorConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, unsigned *pVariable, unsigned Default) :
+		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+		m_pVariable(pVariable),
+		m_Default(Default),
+		m_Light(Flags & CFGFLAG_COLLIGHT),
+		m_Alpha(Flags & CFGFLAG_COLALPHA),
+		m_OldValue(Default)
+	{
+		*m_pVariable = m_Default;
+	}
+
+	~SColorConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
+	{
+		SColorConfigVariable *pData = static_cast<SColorConfigVariable *>(pUserData);
+
+		if(pResult->NumArguments())
+		{
+			if(pData->CheckReadOnly())
+				return;
+
+			const ColorHSLA Color = pResult->GetColor(0, pData->m_Light);
+			const unsigned Value = Color.Pack(pData->m_Light ? 0.5f : 0.0f, pData->m_Alpha);
+
+			*pData->m_pVariable = Value;
+			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
+				pData->m_OldValue = Value;
+		}
+		else
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Value: %u", *pData->m_pVariable);
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+
+			ColorHSLA Hsla = ColorHSLA(*pData->m_pVariable, true);
+			if(pData->m_Light)
+				Hsla = Hsla.UnclampLighting();
+			str_format(aBuf, sizeof(aBuf), "H: %d°, S: %d%%, L: %d%%", round_truncate(Hsla.h * 360), round_truncate(Hsla.s * 100), round_truncate(Hsla.l * 100));
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+
+			const ColorRGBA Rgba = color_cast<ColorRGBA>(Hsla);
+			str_format(aBuf, sizeof(aBuf), "R: %d, G: %d, B: %d, #%06X", round_truncate(Rgba.r * 255), round_truncate(Rgba.g * 255), round_truncate(Rgba.b * 255), Rgba.Pack(false));
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+
+			if(pData->m_Alpha)
+			{
+				str_format(aBuf, sizeof(aBuf), "A: %d%%", round_truncate(Hsla.a * 100));
+				pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+			}
+		}
+	}
+
+	void Register() override
+	{
+		m_pConsole->Register(m_pScriptName, "?i", m_Flags, CommandCallback, this, m_pHelp);
+	}
+
+	bool IsDefault() const override
+	{
+		return *m_pVariable == m_Default;
+	}
+
+	void Serialize(char *pOut, size_t Size, unsigned Value) const
+	{
+		str_format(pOut, Size, "%s %u", m_pScriptName, Value);
+	}
+
+	void Serialize(char *pOut, size_t Size) const override
+	{
+		Serialize(pOut, Size, *m_pVariable);
+	}
+
+	void SetValue(unsigned Value)
+	{
+		if(CheckReadOnly())
+			return;
+		char aBuf[IConsole::CMDLINE_LENGTH];
+		Serialize(aBuf, sizeof(aBuf), Value);
+		ExecuteLine(aBuf);
+	}
+
+	void ResetToDefault() override
+	{
+		SetValue(m_Default);
+	}
+
+	void ResetToOld() override
+	{
+		*m_pVariable = m_OldValue;
+	}
+};
+
+struct SStringConfigVariable : public SConfigVariable
+{
+	char *m_pStr;
+	const char *m_pDefault;
+	size_t m_MaxSize;
+	char *m_pOldValue;
+
+	SStringConfigVariable(IConsole *pConsole, const char *pScriptName, EVariableType Type, int Flags, const char *pHelp, char *pStr, const char *pDefault, size_t MaxSize, char *pOldValue) :
+		SConfigVariable(pConsole, pScriptName, Type, Flags, pHelp),
+		m_pStr(pStr),
+		m_pDefault(pDefault),
+		m_MaxSize(MaxSize),
+		m_pOldValue(pOldValue)
+	{
+		str_copy(m_pStr, m_pDefault, m_MaxSize);
+		str_copy(m_pOldValue, m_pDefault, m_MaxSize);
+	}
+
+	~SStringConfigVariable() override = default;
+
+	static void CommandCallback(IConsole::IResult *pResult, void *pUserData)
+	{
+		SStringConfigVariable *pData = static_cast<SStringConfigVariable *>(pUserData);
+
+		if(pResult->NumArguments())
+		{
+			if(pData->CheckReadOnly())
+				return;
+
+			const char *pString = pResult->GetString(0);
+			if(!str_utf8_check(pString))
+			{
+				char aTemp[4];
+				size_t Length = 0;
+				while(*pString)
+				{
+					size_t Size = str_utf8_encode(aTemp, static_cast<unsigned char>(*pString++));
+					if(Length + Size < pData->m_MaxSize)
+					{
+						mem_copy(pData->m_pStr + Length, aTemp, Size);
+						Length += Size;
+					}
+					else
+						break;
+				}
+				pData->m_pStr[Length] = '\0';
+			}
+			else
+				str_copy(pData->m_pStr, pString, pData->m_MaxSize);
+
+			if(pResult->m_ClientID != IConsole::CLIENT_ID_GAME)
+				str_copy(pData->m_pOldValue, pData->m_pStr, pData->m_MaxSize);
+		}
+		else
+		{
+			char aBuf[1024];
+			str_format(aBuf, sizeof(aBuf), "Value: %s", pData->m_pStr);
+			pData->m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+		}
+	}
+
+	void Register() override
+	{
+		m_pConsole->Register(m_pScriptName, "?r", m_Flags, CommandCallback, this, m_pHelp);
+	}
+
+	bool IsDefault() const override
+	{
+		return str_comp(m_pStr, m_pDefault) == 0;
+	}
+
+	void Serialize(char *pOut, size_t Size, const char *pValue) const
+	{
+		str_copy(pOut, m_pScriptName, Size);
+		str_append(pOut, " \"", Size);
+		const int OutLen = str_length(pOut);
+		EscapeParam(pOut + OutLen, pValue, Size - OutLen - 1); // -1 to ensure space for final quote
+		str_append(pOut, "\"", Size);
+	}
+
+	void Serialize(char *pOut, size_t Size) const override
+	{
+		Serialize(pOut, Size, m_pStr);
+	}
+
+	void SetValue(const char *pValue)
+	{
+		if(CheckReadOnly())
+			return;
+		char aBuf[2048];
+		Serialize(aBuf, sizeof(aBuf), pValue);
+		ExecuteLine(aBuf);
+	}
+
+	void ResetToDefault() override
+	{
+		SetValue(m_pDefault);
+	}
+
+	void ResetToOld() override
+	{
+		str_copy(m_pStr, m_pOldValue, m_MaxSize);
+	}
+};
+
+CConfigManager::CConfigManager()
+{
+	m_pConsole = nullptr;
+	m_pStorage = nullptr;
+	m_ConfigFile = 0;
+	m_Failed = false;
+}
+
+void CConfigManager::Init()
+{
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+
+	const auto &&AddVariable = [this](SConfigVariable *pVariable) {
+		m_vpAllVariables.push_back(pVariable);
+		if((pVariable->m_Flags & CFGFLAG_GAME) != 0)
+			m_vpGameVariables.push_back(pVariable);
+		pVariable->Register();
+	};
+
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \
+	{ \
+		const char *pHelp = Min == Max ? Desc " (default: " #Def ")" : Max == 0 ? Desc " (default: " #Def ", min: " #Min ")" : Desc " (default: " #Def ", min: " #Min ", max: " #Max ")"; \
+		AddVariable(m_ConfigHeap.Allocate<SIntConfigVariable>(m_pConsole, #ScriptName, SConfigVariable::VAR_INT, Flags, pHelp, &g_Config.m_##Name, Def, Min, Max)); \
+	}
+
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Flags, Desc) \
+	{ \
+		const size_t HelpSize = (size_t)str_length(Desc) + 32; \
+		char *pHelp = static_cast<char *>(m_ConfigHeap.Allocate(HelpSize)); \
+		const bool Alpha = ((Flags)&CFGFLAG_COLALPHA) != 0; \
+		str_format(pHelp, HelpSize, "%s (default: $%0*X)", Desc, Alpha ? 8 : 6, color_cast<ColorRGBA>(ColorHSLA(Def, Alpha)).Pack(Alpha)); \
+		AddVariable(m_ConfigHeap.Allocate<SColorConfigVariable>(m_pConsole, #ScriptName, SConfigVariable::VAR_COLOR, Flags, pHelp, &g_Config.m_##Name, Def)); \
+	}
+
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Flags, Desc) \
+	{ \
+		const size_t HelpSize = (size_t)str_length(Desc) + str_length(Def) + 64; \
+		char *pHelp = static_cast<char *>(m_ConfigHeap.Allocate(HelpSize)); \
+		str_format(pHelp, HelpSize, "%s (default: \"%s\", max length: %d)", Desc, Def, Len - 1); \
+		char *pOldValue = static_cast<char *>(m_ConfigHeap.Allocate(Len)); \
+		AddVariable(m_ConfigHeap.Allocate<SStringConfigVariable>(m_pConsole, #ScriptName, SConfigVariable::VAR_STRING, Flags, pHelp, g_Config.m_##Name, Def, Len, pOldValue)); \
+	}
+
+#include "config_variables.h"
+
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_COL
+#undef MACRO_CONFIG_STR
+
+	m_pConsole->Register("reset", "s[config-name]", CFGFLAG_SERVER | CFGFLAG_CLIENT | CFGFLAG_STORE, Con_Reset, this, "Reset a config to its default value");
+	m_pConsole->Register("toggle", "s[config-option] i[value 1] i[value 2]", CFGFLAG_SERVER | CFGFLAG_CLIENT, Con_Toggle, this, "Toggle config value");
+	m_pConsole->Register("+toggle", "s[config-option] i[value 1] i[value 2]", CFGFLAG_CLIENT, Con_ToggleStroke, this, "Toggle config value via keypress");
+}
+
+void CConfigManager::Reset(const char *pScriptName)
+{
+	for(SConfigVariable *pVariable : m_vpAllVariables)
+	{
+		if((pVariable->m_Flags & m_pConsole->FlagMask()) != 0 && str_comp(pScriptName, pVariable->m_pScriptName) == 0)
+		{
+			pVariable->ResetToDefault();
+			return;
+		}
+	}
+
+	char aBuf[IConsole::CMDLINE_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "Invalid command: '%s'.", pScriptName);
+	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+}
+
+void CConfigManager::ResetGameSettings()
+{
+	for(SConfigVariable *pVariable : m_vpGameVariables)
+	{
+		pVariable->ResetToOld();
+	}
+}
+
+void CConfigManager::SetReadOnly(const char *pScriptName, bool ReadOnly)
+{
+	for(SConfigVariable *pVariable : m_vpAllVariables)
+	{
+		if(str_comp(pScriptName, pVariable->m_pScriptName) == 0)
+		{
+			pVariable->m_ReadOnly = ReadOnly;
+			return;
+		}
+	}
+	char aBuf[IConsole::CMDLINE_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "Invalid command for SetReadOnly: '%s'", pScriptName);
+	dbg_assert(false, aBuf);
+}
+
+bool CConfigManager::Save()
+{
+	if(!m_pStorage || !g_Config.m_ClSaveSettings)
+		return true;
+
+	char aConfigFileTmp[IO_MAX_PATH_LENGTH];
+	m_ConfigFile = m_pStorage->OpenFile(IStorage::FormatTmpPath(aConfigFileTmp, sizeof(aConfigFileTmp), CONFIG_FILE), IOFLAG_WRITE, IStorage::TYPE_SAVE);
+
+	if(!m_ConfigFile)
+	{
+		log_error("config", "ERROR: opening %s failed", aConfigFileTmp);
+		return false;
+	}
+
+	m_Failed = false;
+
+	char aLineBuf[2048];
+	for(const SConfigVariable *pVariable : m_vpAllVariables)
+	{
+		if((pVariable->m_Flags & CFGFLAG_SAVE) != 0 && !pVariable->IsDefault())
+		{
+			pVariable->Serialize(aLineBuf, sizeof(aLineBuf));
+			WriteLine(aLineBuf);
+		}
+	}
+
+	for(const auto &Callback : m_vCallbacks)
+	{
+		Callback.m_pfnFunc(this, Callback.m_pUserData);
+	}
+
+	for(const char *pCommand : m_vpUnknownCommands)
+	{
+		WriteLine(pCommand);
+	}
+
+	if(io_sync(m_ConfigFile) != 0)
+	{
+		m_Failed = true;
+	}
+
+	if(io_close(m_ConfigFile) != 0)
+		m_Failed = true;
+
+	m_ConfigFile = 0;
+
+	if(m_Failed)
+	{
+		log_error("config", "ERROR: writing to %s failed", aConfigFileTmp);
+		return false;
+	}
+
+	if(!m_pStorage->RenameFile(aConfigFileTmp, CONFIG_FILE, IStorage::TYPE_SAVE))
+	{
+		log_error("config", "ERROR: renaming %s to " CONFIG_FILE " failed", aConfigFileTmp);
+		return false;
+	}
+
+	return true;
+}
+
+void CConfigManager::RegisterCallback(SAVECALLBACKFUNC pfnFunc, void *pUserData)
+{
+	m_vCallbacks.emplace_back(pfnFunc, pUserData);
+}
+
+void CConfigManager::WriteLine(const char *pLine)
+{
+	if(!m_ConfigFile ||
+		io_write(m_ConfigFile, pLine, str_length(pLine)) != static_cast<unsigned>(str_length(pLine)) ||
+		!io_write_newline(m_ConfigFile))
+	{
+		m_Failed = true;
+	}
+}
+
+void CConfigManager::StoreUnknownCommand(const char *pCommand)
+{
+	m_vpUnknownCommands.push_back(m_ConfigHeap.StoreString(pCommand));
+}
+
+void CConfigManager::Con_Reset(IConsole::IResult *pResult, void *pUserData)
+{
+	static_cast<CConfigManager *>(pUserData)->Reset(pResult->GetString(0));
+}
+
+void CConfigManager::Con_Toggle(IConsole::IResult *pResult, void *pUserData)
+{
+	CConfigManager *pConfigManager = static_cast<CConfigManager *>(pUserData);
+	IConsole *pConsole = pConfigManager->m_pConsole;
+
+	const char *pScriptName = pResult->GetString(0);
+	for(SConfigVariable *pVariable : pConfigManager->m_vpAllVariables)
+	{
+		if((pVariable->m_Flags & pConsole->FlagMask()) == 0 ||
+			str_comp(pScriptName, pVariable->m_pScriptName) != 0)
+		{
+			continue;
+		}
+
+		if(pVariable->m_Type == SConfigVariable::VAR_INT)
+		{
+			SIntConfigVariable *pIntVariable = static_cast<SIntConfigVariable *>(pVariable);
+			pIntVariable->SetValue(*pIntVariable->m_pVariable == pResult->GetInteger(1) ? pResult->GetInteger(2) : pResult->GetInteger(1));
+		}
+		else if(pVariable->m_Type == SConfigVariable::VAR_COLOR)
+		{
+			SColorConfigVariable *pColorVariable = static_cast<SColorConfigVariable *>(pVariable);
+			const float Darkest = pColorVariable->m_Light ? 0.5f : 0.0f;
+			const ColorHSLA Value = *pColorVariable->m_pVariable == pResult->GetColor(1, pColorVariable->m_Light).Pack(Darkest, pColorVariable->m_Alpha) ? pResult->GetColor(2, pColorVariable->m_Light) : pResult->GetColor(1, pColorVariable->m_Light);
+			pColorVariable->SetValue(Value.Pack(Darkest, pColorVariable->m_Alpha));
+		}
+		else if(pVariable->m_Type == SConfigVariable::VAR_STRING)
+		{
+			SStringConfigVariable *pStringVariable = static_cast<SStringConfigVariable *>(pVariable);
+			pStringVariable->SetValue(str_comp(pStringVariable->m_pStr, pResult->GetString(1)) == 0 ? pResult->GetString(2) : pResult->GetString(1));
+		}
+		return;
+	}
+
+	char aBuf[IConsole::CMDLINE_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "Invalid command: '%s'.", pScriptName);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+}
+
+void CConfigManager::Con_ToggleStroke(IConsole::IResult *pResult, void *pUserData)
+{
+	CConfigManager *pConfigManager = static_cast<CConfigManager *>(pUserData);
+	IConsole *pConsole = pConfigManager->m_pConsole;
+
+	const char *pScriptName = pResult->GetString(1);
+	for(SConfigVariable *pVariable : pConfigManager->m_vpAllVariables)
+	{
+		if((pVariable->m_Flags & pConsole->FlagMask()) == 0 ||
+			pVariable->m_Type != SConfigVariable::VAR_INT ||
+			str_comp(pScriptName, pVariable->m_pScriptName) != 0)
+		{
+			continue;
+		}
+
+		SIntConfigVariable *pIntVariable = static_cast<SIntConfigVariable *>(pVariable);
+		pIntVariable->SetValue(pResult->GetInteger(0) == 0 ? pResult->GetInteger(3) : pResult->GetInteger(2));
+		return;
+	}
+
+	char aBuf[IConsole::CMDLINE_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "Invalid command: '%s'.", pScriptName);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "config", aBuf);
+}
+
+IConfigManager *CreateConfigManager() { return new CConfigManager; }
diff --git a/src_bkp/engine/shared/config.h b/src_bkp/engine/shared/config.h
new file mode 100644
index 0000000000..de3c54e47d
--- /dev/null
+++ b/src_bkp/engine/shared/config.h
@@ -0,0 +1,109 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_CONFIG_H
+#define ENGINE_SHARED_CONFIG_H
+
+#include <base/detect.h>
+
+#include <engine/config.h>
+#include <engine/console.h>
+#include <engine/shared/memheap.h>
+
+#include <vector>
+
+// include protocol for MAX_CLIENT used in config_variables
+#include <engine/shared/protocol.h>
+
+#define CONFIG_FILE "settings_ddnet.cfg"
+#define AUTOEXEC_FILE "autoexec.cfg"
+#define AUTOEXEC_CLIENT_FILE "autoexec_client.cfg"
+#define AUTOEXEC_SERVER_FILE "autoexec_server.cfg"
+#define TCONFIG_FILE "settings_sta.cfg"
+class CConfig
+{
+public:
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \
+	static constexpr int ms_##Name = Def; \
+	int m_##Name;
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Flags, Desc) \
+	static constexpr unsigned ms_##Name = Def; \
+	unsigned m_##Name;
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Flags, Desc) \
+	static constexpr const char *ms_p##Name = Def; \
+	char m_##Name[Len]; // Flawfinder: ignore
+#include "config_variables.h"
+
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_COL
+#undef MACRO_CONFIG_STR
+};
+
+extern CConfig g_Config;
+
+enum
+{
+	CFGFLAG_SAVE = 1 << 0,
+	CFGFLAG_CLIENT = 1 << 1,
+	CFGFLAG_SERVER = 1 << 2,
+	CFGFLAG_STORE = 1 << 3,
+	CFGFLAG_MASTER = 1 << 4,
+	CFGFLAG_ECON = 1 << 5,
+	// DDRace
+
+	CMDFLAG_TEST = 1 << 6,
+	CFGFLAG_CHAT = 1 << 7,
+	CFGFLAG_GAME = 1 << 8,
+	CFGFLAG_NONTEEHISTORIC = 1 << 9,
+	CFGFLAG_COLLIGHT = 1 << 10,
+	CFGFLAG_COLALPHA = 1 << 11,
+	CFGFLAG_INSENSITIVE = 1 << 12,
+};
+
+class CConfigManager : public IConfigManager
+{
+	IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+
+	IOHANDLE m_ConfigFile;
+	bool m_Failed;
+
+	struct SCallback
+	{
+		SAVECALLBACKFUNC m_pfnFunc;
+		void *m_pUserData;
+
+		SCallback(SAVECALLBACKFUNC pfnFunc, void *pUserData) :
+			m_pfnFunc(pfnFunc),
+			m_pUserData(pUserData)
+		{
+		}
+	};
+	std::vector<SCallback> m_vCallbacks;
+
+	std::vector<struct SConfigVariable *> m_vpAllVariables;
+	std::vector<struct SConfigVariable *> m_vpGameVariables;
+	std::vector<const char *> m_vpUnknownCommands;
+	CHeap m_ConfigHeap;
+
+	static void Con_Reset(IConsole::IResult *pResult, void *pUserData);
+	static void Con_Toggle(IConsole::IResult *pResult, void *pUserData);
+	static void Con_ToggleStroke(IConsole::IResult *pResult, void *pUserData);
+
+public:
+	CConfigManager();
+
+	void Init() override;
+	void Reset(const char *pScriptName) override;
+	void ResetGameSettings() override;
+	void SetReadOnly(const char *pScriptName, bool ReadOnly) override;
+	bool Save() override;
+	CConfig *Values() override { return &g_Config; }
+
+	void RegisterCallback(SAVECALLBACKFUNC pfnFunc, void *pUserData) override;
+
+	void WriteLine(const char *pLine) override;
+
+	void StoreUnknownCommand(const char *pCommand) override;
+};
+
+#endif
diff --git a/src_bkp/engine/shared/config.rs b/src_bkp/engine/shared/config.rs
new file mode 100644
index 0000000000..ca42303ee6
--- /dev/null
+++ b/src_bkp/engine/shared/config.rs
@@ -0,0 +1,57 @@
+/// Config variable that is saved when the client is closed.
+///
+/// Has no effect on other commands.
+pub const CFGFLAG_SAVE: i32 = 1 << 0;
+
+/// Command that is available in the client.
+pub const CFGFLAG_CLIENT: i32 = 1 << 1;
+
+/// Command that is available on the server.
+pub const CFGFLAG_SERVER: i32 = 1 << 2;
+
+/// Command that is delayed in the execution until
+/// `IConsole::StoreCommands(false)` is called.
+pub const CFGFLAG_STORE: i32 = 1 << 3;
+
+/// Command that is available in the master server.
+pub const CFGFLAG_MASTER: i32 = 1 << 4;
+
+/// Command that has something to do with the external console (econ).
+pub const CFGFLAG_ECON: i32 = 1 << 5;
+
+/// Command that can be used for testing or cheating maps. Only available if
+/// `sv_test_cmds 1` is set.
+pub const CMDFLAG_TEST: i32 = 1 << 6;
+
+/// Command that can be used from the chat on the server.
+pub const CFGFLAG_CHAT: i32 = 1 << 7;
+
+/// Command that can be used from a map config.
+///
+/// Only commands that are not security sensitive should have this flag.
+pub const CFGFLAG_GAME: i32 = 1 << 8;
+
+/// Command that is not recorded into teehistorian.
+///
+/// This should only be set for security sensitive commands like passwords etc.
+/// that should not be recorded.
+pub const CFGFLAG_NONTEEHISTORIC: i32 = 1 << 9;
+
+/// Color config variable that can only have lightness 0.5 to 1.0.
+///
+/// This is achieved by dividing the lightness channel by and adding 0.5, i.e.
+/// remapping all the colors.
+///
+/// Has no effect on other commands or config variables.
+pub const CFGFLAG_COLLIGHT: i32 = 1 << 10;
+
+/// Color config variable that includes an alpha (opacity) value.
+///
+/// Has no effect on other commands or config variables.
+pub const CFGFLAG_COLALPHA: i32 = 1 << 11;
+
+/// Config variable with insensitive data that can be included in client
+/// integrity checks.
+///
+/// This should only be set on config variables the server could observe anyway.
+pub const CFGFLAG_INSENSITIVE: i32 = 1 << 12;
diff --git a/src_bkp/engine/shared/config_variables.h b/src_bkp/engine/shared/config_variables.h
new file mode 100644
index 0000000000..b73e4b9287
--- /dev/null
+++ b/src_bkp/engine/shared/config_variables.h
@@ -0,0 +1,755 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+// This file can be included several times.
+
+#ifndef MACRO_CONFIG_INT
+#error "The config macros must be defined"
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Save, Desc) ;
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Save, Desc) ;
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Save, Desc) ;
+#endif
+
+// client
+MACRO_CONFIG_INT(ClPredict, cl_predict, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict client movements")
+MACRO_CONFIG_INT(ClPredictDummy, cl_predict_dummy, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict dummy movements")
+MACRO_CONFIG_INT(ClAntiPingLimit, cl_antiping_limit, 0, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Antiping limit (0 to disable)")
+MACRO_CONFIG_INT(ClAntiPing, cl_antiping, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable antiping, i. e. more aggressive prediction.")
+MACRO_CONFIG_INT(ClAntiPingPlayers, cl_antiping_players, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict other player's movement more aggressively (only enabled if cl_antiping is set to 1)")
+MACRO_CONFIG_INT(ClAntiPingGrenade, cl_antiping_grenade, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict grenades (only enabled if cl_antiping is set to 1)")
+MACRO_CONFIG_INT(ClAntiPingWeapons, cl_antiping_weapons, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict weapon projectiles (only enabled if cl_antiping is set to 1)")
+MACRO_CONFIG_INT(ClAntiPingSmooth, cl_antiping_smooth, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Make the prediction of other player's movement smoother")
+MACRO_CONFIG_INT(ClAntiPingGunfire, cl_antiping_gunfire, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict gunfire and show predicted weapon physics (with cl_antiping_grenade 1 and cl_antiping_weapons 1)")
+MACRO_CONFIG_INT(ClPredictionMargin, cl_prediction_margin, 10, 1, 300, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Prediction margin in ms (adds latency, can reduce lag from ping jumps)")
+MACRO_CONFIG_INT(ClSubTickAiming, cl_sub_tick_aiming, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Send aiming data at sub-tick accuracy")
+
+MACRO_CONFIG_INT(ClNameplates, cl_nameplates, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show name plates")
+MACRO_CONFIG_INT(ClAfkEmote, cl_afk_emote, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show zzz emote next to afk players")
+MACRO_CONFIG_INT(ClNameplatesAlways, cl_nameplates_always, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Always show name plates disregarding of distance")
+MACRO_CONFIG_INT(ClNameplatesTeamcolors, cl_nameplates_teamcolors, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Use team colors for name plates")
+MACRO_CONFIG_INT(ClNameplatesSize, cl_nameplates_size, 50, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of the name plates from 0 to 100%")
+MACRO_CONFIG_INT(ClNameplatesClan, cl_nameplates_clan, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show clan in name plates")
+MACRO_CONFIG_INT(ClNameplatesClanSize, cl_nameplates_clan_size, 30, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of the clan plates from 0 to 100%")
+MACRO_CONFIG_INT(ClNameplatesIDs, cl_nameplates_ids, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show IDs in name plates")
+MACRO_CONFIG_INT(ClNameplatesOwn, cl_nameplates_own, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show own name plate (useful for demo recording)")
+MACRO_CONFIG_INT(ClNameplatesFriendMark, cl_nameplates_friendmark, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show friend mark (♥) in name plates")
+MACRO_CONFIG_INT(ClNameplatesStrong, cl_nameplates_strong, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show strong/weak in name plates (0 - off, 1 - icons, 2 - icons + numbers)")
+MACRO_CONFIG_INT(ClTextEntities, cl_text_entities, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Render textual entity data")
+MACRO_CONFIG_INT(ClTextEntitiesSize, cl_text_entities_size, 100, 1, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of textual entity data from 1 to 100%")
+MACRO_CONFIG_INT(ClStreamerMode, cl_streamer_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Censor sensitive information such as /save password")
+
+MACRO_CONFIG_COL(ClAuthedPlayerColor, cl_authed_player_color, 5898211, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Color of name of authenticated player in scoreboard")
+MACRO_CONFIG_COL(ClSameClanColor, cl_same_clan_color, 5898211, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Clan color of players with the same clan as you in scoreboard.")
+
+MACRO_CONFIG_INT(ClEnablePingColor, cl_enable_ping_color, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Whether ping is colored in scoreboard.")
+MACRO_CONFIG_INT(ClAutoswitchWeapons, cl_autoswitch_weapons, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Auto switch weapon on pickup")
+MACRO_CONFIG_INT(ClAutoswitchWeaponsOutOfAmmo, cl_autoswitch_weapons_out_of_ammo, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Auto switch weapon when out of ammo")
+
+MACRO_CONFIG_INT(ClShowhud, cl_showhud, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD")
+MACRO_CONFIG_INT(ClShowhudHealthAmmo, cl_showhud_healthammo, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Health + Ammo)")
+MACRO_CONFIG_INT(ClShowhudScore, cl_showhud_score, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Score)")
+MACRO_CONFIG_INT(ClShowhudTimer, cl_showhud_timer, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Timer)")
+MACRO_CONFIG_INT(ClShowhudDummyActions, cl_showhud_dummy_actions, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Dummy Actions)")
+MACRO_CONFIG_INT(ClShowhudPlayerPosition, cl_showhud_player_position, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Player Position)")
+MACRO_CONFIG_INT(ClShowhudPlayerSpeed, cl_showhud_player_speed, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Player Speed)")
+MACRO_CONFIG_INT(ClShowhudPlayerAngle, cl_showhud_player_angle, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD (Player Aim Angle)")
+MACRO_CONFIG_INT(ClShowhudDDRace, cl_showhud_ddrace, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show ingame HUD (DDRace HUD)")
+MACRO_CONFIG_INT(ClShowhudJumpsIndicator, cl_showhud_jumps_indicator, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show ingame HUD (Jumps you have and have used)")
+MACRO_CONFIG_INT(ClShowFreezeBars, cl_show_freeze_bars, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show a freeze bar under frozen players to indicate the thaw time")
+MACRO_CONFIG_INT(ClFreezeBarsAlphaInsideFreeze, cl_freezebars_alpha_inside_freeze, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of freeze bars inside freeze (0 invisible, 100 fully visible)")
+MACRO_CONFIG_INT(ClShowRecord, cl_showrecord, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show old style DDRace client records")
+MACRO_CONFIG_INT(ClShowNotifications, cl_shownotifications, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Make the client notify when someone highlights you")
+MACRO_CONFIG_INT(ClShowEmotes, cl_showemotes, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show tee emotes")
+MACRO_CONFIG_INT(ClShowChat, cl_showchat, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show chat (2 to always show large chat area)")
+MACRO_CONFIG_INT(ClShowChatFriends, cl_show_chat_friends, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show only chat messages from friends")
+MACRO_CONFIG_INT(ClShowChatSystem, cl_show_chat_system, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show chat messages from the server")
+MACRO_CONFIG_INT(ClShowKillMessages, cl_showkillmessages, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show kill messages")
+MACRO_CONFIG_INT(ClShowFinishMessages, cl_show_finish_messages, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show finish messages")
+MACRO_CONFIG_INT(ClShowVotesAfterVoting, cl_show_votes_after_voting, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show votes window after voting")
+MACRO_CONFIG_INT(ClShowLocalTimeAlways, cl_show_local_time_always, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Always show local time")
+MACRO_CONFIG_INT(ClShowfps, cl_showfps, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame FPS counter")
+MACRO_CONFIG_INT(ClShowpred, cl_showpred, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame prediction time in milliseconds")
+MACRO_CONFIG_INT(ClEyeWheel, cl_eye_wheel, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show eye wheel along together with emotes")
+MACRO_CONFIG_INT(ClEyeDuration, cl_eye_duration, 999999, 1, 999999, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long the eyes emotes last")
+
+MACRO_CONFIG_INT(ClAirjumpindicator, cl_airjumpindicator, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the air jump indicator")
+MACRO_CONFIG_INT(ClThreadsoundloading, cl_threadsoundloading, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Load sound files threaded")
+
+MACRO_CONFIG_INT(ClWarningTeambalance, cl_warning_teambalance, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Warn about team balance")
+
+MACRO_CONFIG_INT(ClMouseDeadzone, cl_mouse_deadzone, 0, 0, 3000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Deadzone for the camera to follow the cursor")
+MACRO_CONFIG_INT(ClMouseFollowfactor, cl_mouse_followfactor, 0, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Factor for the camera to follow the cursor")
+MACRO_CONFIG_INT(ClMouseMaxDistance, cl_mouse_max_distance, 400, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Maximum cursor distance")
+MACRO_CONFIG_INT(ClMouseMinDistance, cl_mouse_min_distance, 0, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Minimum cursor distance")
+
+MACRO_CONFIG_INT(ClDyncam, cl_dyncam, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Enable dyncam")
+MACRO_CONFIG_INT(ClDyncamMaxDistance, cl_dyncam_max_distance, 1000, 0, 2000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Maximum dynamic camera cursor distance")
+MACRO_CONFIG_INT(ClDyncamMinDistance, cl_dyncam_min_distance, 0, 0, 2000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Minimum dynamic camera cursor distance")
+MACRO_CONFIG_INT(ClDyncamMousesens, cl_dyncam_mousesens, 0, 0, 100000, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Mouse sens used when dyncam is toggled on")
+MACRO_CONFIG_INT(ClDyncamDeadzone, cl_dyncam_deadzone, 300, 1, 1300, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Deadzone for the dynamic camera to follow the cursor")
+MACRO_CONFIG_INT(ClDyncamFollowFactor, cl_dyncam_follow_factor, 60, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Factor for the dynamic camera to follow the cursor")
+
+MACRO_CONFIG_INT(ClDyncamSmoothness, cl_dyncam_smoothness, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Transition amount of the camera movement, 0=instant, 100=slow and smooth")
+MACRO_CONFIG_INT(ClDyncamStabilizing, cl_dyncam_stabilizing, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Amount of camera slowdown during fast cursor movement. High value can cause delay in camera movement")
+
+MACRO_CONFIG_INT(ClMultiViewSensitivity, cl_multiview_sensitivity, 100, 0, 200, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set how fast the camera will move to the desired location (higher = faster)")
+MACRO_CONFIG_INT(ClMultiViewZoomSmoothness, cl_multiview_zoom_smoothness, 1300, 50, 5000, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Set the smoothness of the multi-view zoom (in ms, higher = slower)")
+
+MACRO_CONFIG_INT(EdAutosaveInterval, ed_autosave_interval, 10, 0, 240, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interval in minutes at which a copy of the current editor map is automatically saved to the 'auto' folder (0 for off)")
+MACRO_CONFIG_INT(EdAutosaveMax, ed_autosave_max, 10, 0, 1000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of autosaves that are kept per map name (0 = no limit)")
+MACRO_CONFIG_INT(EdSmoothZoomTime, ed_smooth_zoom_time, 250, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time of smooth zoom animation in the editor in ms (0 for off)")
+MACRO_CONFIG_INT(EdLimitMaxZoomLevel, ed_limit_max_zoom_level, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies, if zooming in the editor should be limited or not (0 = no limit)")
+MACRO_CONFIG_INT(EdZoomTarget, ed_zoom_target, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Zoom to the current mouse target")
+MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show pressed keys")
+MACRO_CONFIG_INT(EdAlignQuads, ed_align_quads, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable/disable quad alignment. When enabled, red lines appear to show how quad/points are aligned and snapped to other quads/points when moving them")
+MACRO_CONFIG_INT(EdShowQuadsRect, ed_show_quads_rect, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show the bounds of the selected quad. In case of multiple quads, it shows the bounds of the englobing rect. Can be helpful when aligning a group of quads")
+
+MACRO_CONFIG_INT(ClShowWelcome, cl_show_welcome, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show welcome message indicating the first launch of the client")
+MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long to show the server message of the day")
+
+// http map download
+MACRO_CONFIG_STR(ClMapDownloadUrl, cl_map_download_url, 100, "https://maps.ddnet.org", CFGFLAG_CLIENT | CFGFLAG_SAVE, "URL used to download maps (can start with http:// or https://)")
+MACRO_CONFIG_INT(ClMapDownloadConnectTimeoutMs, cl_map_download_connect_timeout_ms, 2000, 0, 100000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "HTTP map downloads: timeout for the connect phase in milliseconds (0 to disable)")
+MACRO_CONFIG_INT(ClMapDownloadLowSpeedLimit, cl_map_download_low_speed_limit, 4000, 0, 100000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "HTTP map downloads: Set low speed limit in bytes per second (0 to disable)")
+MACRO_CONFIG_INT(ClMapDownloadLowSpeedTime, cl_map_download_low_speed_time, 3, 0, 100000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "HTTP map downloads: Set low speed limit time period (0 to disable)")
+
+MACRO_CONFIG_STR(ClLanguagefile, cl_languagefile, 255, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "What language file to use")
+MACRO_CONFIG_STR(ClSkinDownloadUrl, cl_skin_download_url, 100, "https://skins.ddnet.org/skin/", CFGFLAG_CLIENT | CFGFLAG_SAVE, "URL used to download skins")
+MACRO_CONFIG_STR(ClSkinCommunityDownloadUrl, cl_skin_community_download_url, 100, "https://skins.ddnet.org/skin/community/", CFGFLAG_CLIENT | CFGFLAG_SAVE, "URL used to download community skins")
+MACRO_CONFIG_INT(ClVanillaSkinsOnly, cl_vanilla_skins_only, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only show skins available in Vanilla Teeworlds")
+MACRO_CONFIG_INT(ClDownloadSkins, cl_download_skins, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Download skins from cl_skin_download_url on-the-fly")
+MACRO_CONFIG_INT(ClDownloadCommunitySkins, cl_download_community_skins, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Allow to download skins created by the community. Uses cl_skin_community_download_url instead of cl_skin_download_url for the download")
+MACRO_CONFIG_INT(ClAutoStatboardScreenshot, cl_auto_statboard_screenshot, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Automatically take game over statboard screenshot")
+MACRO_CONFIG_INT(ClAutoStatboardScreenshotMax, cl_auto_statboard_screenshot_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically created statboard screenshots (0 = no limit)")
+
+MACRO_CONFIG_INT(ClDefaultZoom, cl_default_zoom, 10, 0, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Default zoom level")
+MACRO_CONFIG_INT(ClSmoothZoomTime, cl_smooth_zoom_time, 250, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time of smooth zoom animation ingame in ms (0 for off)")
+MACRO_CONFIG_INT(ClLimitMaxZoomLevel, cl_limit_max_zoom_level, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies, if zooming ingame should be limited or not (0 = no limit)")
+
+MACRO_CONFIG_INT(ClPlayerUseCustomColor, player_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors")
+MACRO_CONFIG_COL(ClPlayerColorBody, player_color_body, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Player body color")
+MACRO_CONFIG_COL(ClPlayerColorFeet, player_color_feet, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Player feet color")
+MACRO_CONFIG_STR(ClPlayerSkin, player_skin, 24, "default", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin")
+MACRO_CONFIG_INT(ClPlayerDefaultEyes, player_default_eyes, 0, 0, 5, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Player eyes when joining server. 0 = normal, 1 = pain, 2 = happy, 3 = surprise, 4 = angry, 5 = blink")
+MACRO_CONFIG_STR(ClSkinPrefix, cl_skin_prefix, 12, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Replace the skins by skins with this prefix (e.g. kitty, santa)")
+MACRO_CONFIG_INT(ClFatSkins, cl_fat_skins, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable fat skins")
+
+MACRO_CONFIG_INT(UiPage, ui_page, 6, 6, 10, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interface page")
+MACRO_CONFIG_INT(UiSettingsPage, ui_settings_page, 0, 0, 9, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Interface settings page")
+MACRO_CONFIG_INT(UiToolboxPage, ui_toolbox_page, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Toolbox page")
+MACRO_CONFIG_STR(UiServerAddress, ui_server_address, 1024, "localhost:8303", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Interface server address")
+MACRO_CONFIG_INT(UiMousesens, ui_mousesens, 200, 1, 100000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Mouse sensitivity for menus/editor")
+MACRO_CONFIG_INT(UiControllerSens, ui_controller_sens, 100, 1, 100000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Controller sensitivity for menus/editor")
+MACRO_CONFIG_INT(UiSmoothScrollTime, ui_smooth_scroll_time, 500, 0, 5000, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time of smooth scrolling animation in menus/editor in ms (0 for off)")
+
+MACRO_CONFIG_COL(UiColor, ui_color, 0xE4A046AF, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLALPHA, "Interface color") // 160 70 175 228 hasalpha
+
+MACRO_CONFIG_INT(UiColorizePing, ui_colorize_ping, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Highlight ping")
+MACRO_CONFIG_INT(UiColorizeGametype, ui_colorize_gametype, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Highlight gametype")
+
+MACRO_CONFIG_INT(UiCloseWindowAfterChangingSetting, ui_close_window_after_changing_setting, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Close window after changing setting")
+MACRO_CONFIG_INT(UiUnreadNews, ui_unread_news, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Whether there is unread news")
+
+MACRO_CONFIG_INT(GfxNoclip, gfx_noclip, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Disable clipping")
+
+// dummy
+MACRO_CONFIG_STR(ClDummyName, dummy_name, 16, "", CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Name of the dummy")
+MACRO_CONFIG_STR(ClDummyClan, dummy_clan, 12, "", CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Clan of the dummy")
+MACRO_CONFIG_INT(ClDummyCountry, dummy_country, -1, -1, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Country of the Dummy")
+MACRO_CONFIG_INT(ClDummyUseCustomColor, dummy_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Toggles usage of custom colors")
+MACRO_CONFIG_COL(ClDummyColorBody, dummy_color_body, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Dummy body color")
+MACRO_CONFIG_COL(ClDummyColorFeet, dummy_color_feet, 65408, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLLIGHT | CFGFLAG_INSENSITIVE, "Dummy feet color")
+MACRO_CONFIG_STR(ClDummySkin, dummy_skin, 24, "default", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Dummy skin")
+MACRO_CONFIG_INT(ClDummyDefaultEyes, dummy_default_eyes, 0, 0, 5, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dummy eyes when joining server. 0 = normal, 1 = pain, 2 = happy, 3 = surprise, 4 = angry, 5 = blink")
+MACRO_CONFIG_INT(ClDummy, cl_dummy, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "0 - player / 1 - dummy")
+MACRO_CONFIG_INT(ClDummyHammer, cl_dummy_hammer, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is hammering for a hammerfly")
+MACRO_CONFIG_INT(ClDummyResetOnSwitch, cl_dummy_resetonswitch, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Whether dummy or player should stop pressing keys when you switch. 0 = off, 1 = dummy, 2 = player")
+MACRO_CONFIG_INT(ClDummyRestoreWeapon, cl_dummy_restore_weapon, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Whether dummy should switch to last weapon after hammerfly")
+MACRO_CONFIG_INT(ClDummyCopyMoves, cl_dummy_copy_moves, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy should copy your moves")
+
+// more controllable dummy command
+MACRO_CONFIG_INT(ClDummyControl, cl_dummy_control, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether can you control dummy at the same time (cl_dummy_jump, cl_dummy_fire, cl_dummy_hook)")
+MACRO_CONFIG_INT(ClDummyJump, cl_dummy_jump, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is jumping (requires cl_dummy_control 1)")
+MACRO_CONFIG_INT(ClDummyFire, cl_dummy_fire, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is firing (requires cl_dummy_control 1)")
+MACRO_CONFIG_INT(ClDummyHook, cl_dummy_hook, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Whether dummy is hooking (requires cl_dummy_control 1)")
+
+// start menu
+MACRO_CONFIG_INT(ClShowStartMenuImages, cl_show_start_menu_images, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show start menu images")
+MACRO_CONFIG_INT(ClSkipStartMenu, cl_skip_start_menu, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Skip the start menu")
+
+// server
+MACRO_CONFIG_INT(SvWarmup, sv_warmup, 0, 0, 0, CFGFLAG_SERVER, "Number of seconds to do warmup before round starts")
+MACRO_CONFIG_STR(SvMotd, sv_motd, 900, "", CFGFLAG_SERVER, "Message of the day to display for the clients")
+MACRO_CONFIG_STR(SvGametype, sv_gametype, 32, "ddnet", CFGFLAG_SERVER, "Game type (ddnet, mod)")
+MACRO_CONFIG_INT(SvTournamentMode, sv_tournament_mode, 0, 0, 1, CFGFLAG_SERVER, "Tournament mode. When enabled, players joins the server as spectator")
+MACRO_CONFIG_INT(SvSpamprotection, sv_spamprotection, 1, 0, 1, CFGFLAG_SERVER, "Spam protection")
+
+MACRO_CONFIG_INT(SvSpectatorSlots, sv_spectator_slots, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Number of slots to reserve for spectators")
+MACRO_CONFIG_INT(SvInactiveKickTime, sv_inactivekick_time, 0, 0, 1000, CFGFLAG_SERVER, "How many minutes to wait before taking care of inactive players")
+MACRO_CONFIG_INT(SvInactiveKick, sv_inactivekick, 0, 0, 2, CFGFLAG_SERVER, "How to deal with inactive players (0=move to spectator, 1=move to free spectator slot/kick, 2=kick)")
+
+MACRO_CONFIG_INT(SvStrictSpectateMode, sv_strict_spectate_mode, 0, 0, 1, CFGFLAG_SERVER, "Restricts information in spectator mode")
+MACRO_CONFIG_INT(SvVoteSpectate, sv_vote_spectate, 1, 0, 1, CFGFLAG_SERVER, "Allow voting to move players to spectators")
+MACRO_CONFIG_INT(SvVoteSpectateRejoindelay, sv_vote_spectate_rejoindelay, 3, 0, 1000, CFGFLAG_SERVER, "How many minutes to wait before a player can rejoin after being moved to spectators by vote")
+MACRO_CONFIG_INT(SvVoteKick, sv_vote_kick, 1, 0, 1, CFGFLAG_SERVER, "Allow voting to kick players")
+MACRO_CONFIG_INT(SvVoteKickMin, sv_vote_kick_min, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Minimum number of players required to start a kick vote")
+MACRO_CONFIG_INT(SvVoteKickBantime, sv_vote_kick_bantime, 5, 0, 1440, CFGFLAG_SERVER, "The time in seconds to ban a player if kicked by vote. 0 makes it just use kick")
+MACRO_CONFIG_INT(SvJoinVoteDelay, sv_join_vote_delay, 300, 0, 1000, CFGFLAG_SERVER, "Add a delay before recently joined players can call any vote or participate in a kick/spec vote (in seconds)")
+MACRO_CONFIG_INT(SvOldTeleportWeapons, sv_old_teleport_weapons, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Teleporting of all weapons (deprecated, use special entities instead)")
+MACRO_CONFIG_INT(SvOldTeleportHook, sv_old_teleport_hook, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Hook through teleporter (deprecated, use special entities instead)")
+MACRO_CONFIG_INT(SvTeleportHoldHook, sv_teleport_hold_hook, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Hold hook when teleported")
+MACRO_CONFIG_INT(SvTeleportLoseWeapons, sv_teleport_lose_weapons, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Lose weapons when teleported (useful for some race maps)")
+MACRO_CONFIG_INT(SvDeepfly, sv_deepfly, 1, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Allow fire non auto weapons when deep")
+MACRO_CONFIG_INT(SvDestroyBulletsOnDeath, sv_destroy_bullets_on_death, 1, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Destroy bullets when their owner dies")
+MACRO_CONFIG_INT(SvDestroyLasersOnDeath, sv_destroy_lasers_on_death, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Destroy lasers when their owner dies")
+
+MACRO_CONFIG_INT(SvMapUpdateRate, sv_mapupdaterate, 5, 1, 100, CFGFLAG_SERVER, "64 player id <-> vanilla id players map update rate")
+
+MACRO_CONFIG_STR(SvServerType, sv_server_type, 64, "none", CFGFLAG_SERVER, "Type of the server (novice, moderate, ...)")
+
+MACRO_CONFIG_INT(SvSendVotesPerTick, sv_send_votes_per_tick, 5, 1, 15, CFGFLAG_SERVER, "Number of vote options being send per tick")
+
+MACRO_CONFIG_INT(SvRescue, sv_rescue, 0, 0, 1, CFGFLAG_SERVER, "Allow /rescue command so players can teleport themselves out of freeze (setting only works in initial config)")
+MACRO_CONFIG_INT(SvRescueDelay, sv_rescue_delay, 1, 0, 1000, CFGFLAG_SERVER, "Number of seconds between two rescues")
+MACRO_CONFIG_INT(SvPractice, sv_practice, 1, 0, 1, CFGFLAG_SERVER, "Enable practice mode for teams. Means you can use /rescue, but in turn your rank doesn't count.")
+
+MACRO_CONFIG_INT(ClVideoPauseWithDemo, cl_video_pausewithdemo, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Pause video rendering when demo playing pause")
+MACRO_CONFIG_INT(ClVideoShowhud, cl_video_showhud, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ingame HUD when rendering video")
+MACRO_CONFIG_INT(ClVideoShowChat, cl_video_showchat, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show chat when rendering video")
+MACRO_CONFIG_INT(ClVideoSndEnable, cl_video_sound_enable, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Use sound when rendering video")
+MACRO_CONFIG_INT(ClVideoShowHookCollOther, cl_video_show_hook_coll_other, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show other players' hook collision lines when rendering video")
+MACRO_CONFIG_INT(ClVideoShowDirection, cl_video_show_direction, 0, 0, 3, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show players' key presses when rendering video (1 = other players', 2 = also your own, 3 = only your own)")
+MACRO_CONFIG_INT(ClVideoX264Crf, cl_video_crf, 18, 0, 51, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Set crf when encode video with libx264 (0 for highest quality, 51 for lowest)")
+MACRO_CONFIG_INT(ClVideoX264Preset, cl_video_preset, 5, 0, 9, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Set preset when encode video with libx264, default is 5 (medium), 0 is ultrafast, 9 is placebo (the slowest, not recommend)")
+
+// debug
+#ifdef CONF_DEBUG
+MACRO_CONFIG_INT(DbgDummies, dbg_dummies, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "Add debug dummies to server (Debug build only)")
+#endif
+
+MACRO_CONFIG_INT(DbgTuning, dbg_tuning, 0, 0, 2, CFGFLAG_CLIENT, "Display information about the tuning parameters that affect the own player (0 = off, 1 = show changed, 2 = show all)")
+
+MACRO_CONFIG_STR(PlayerName, player_name, 16, "", CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Name of the player")
+MACRO_CONFIG_STR(PlayerClan, player_clan, 12, "", CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Clan of the player")
+MACRO_CONFIG_INT(PlayerCountry, player_country, -1, -1, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_INSENSITIVE, "Country of the player")
+
+MACRO_CONFIG_STR(Password, password, 256, "", CFGFLAG_CLIENT | CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Password to the server")
+MACRO_CONFIG_INT(Events, events, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Enable triggering of events, (eye emotes on some holidays in server, christmas skins in client).")
+MACRO_CONFIG_STR(SteamName, steam_name, 16, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Last seen name of the Steam profile")
+
+MACRO_CONFIG_STR(Logfile, logfile, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Filename to log all output to")
+MACRO_CONFIG_INT(Logappend, logappend, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Append to logfile instead of overwriting it every time")
+MACRO_CONFIG_INT(Loglevel, loglevel, 0, -3, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Adjusts the amount of information in the logfile (-3 = none, -2 = error only, -1 = warn, 0 = info, 1 = debug, 2 = trace)")
+MACRO_CONFIG_INT(StdoutOutputLevel, stdout_output_level, 0, -3, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Adjusts the amount of information in the system console (-3 = none, -2 = error only, -1 = warn, 0 = info, 1 = debug, 2 = trace)")
+MACRO_CONFIG_INT(ConsoleOutputLevel, console_output_level, 0, -3, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Adjusts the amount of information in the local/remote console (-3 = none, -2 = error only, -1 = warn, 0 = info, 1 = debug, 2 = trace)")
+MACRO_CONFIG_INT(ConsoleEnableColors, console_enable_colors, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Enable colors in console output")
+
+MACRO_CONFIG_INT(ClSaveSettings, cl_save_settings, 1, 0, 1, CFGFLAG_CLIENT, "Write the settings file on exit")
+MACRO_CONFIG_INT(ClRefreshRate, cl_refresh_rate, 0, 0, 10000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Refresh rate for updating the game (in Hz)")
+MACRO_CONFIG_INT(ClRefreshRateInactive, cl_refresh_rate_inactive, 120, 0, 10000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Refresh rate for updating the game when the window is inactive (in Hz)")
+MACRO_CONFIG_INT(ClEditor, cl_editor, 0, 0, 1, CFGFLAG_CLIENT, "Open the map editor")
+MACRO_CONFIG_INT(ClEditorDilate, cl_editor_dilate, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Automatically dilates embedded images")
+MACRO_CONFIG_STR(ClSkinFilterString, cl_skin_filter_string, 25, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Skin filtering string")
+MACRO_CONFIG_INT(ClEditorMaxHistory, cl_editor_max_history, 50, 1, 500, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of undo actions in the editor history (not shared between editor, envelope editor and server settings editor)")
+
+MACRO_CONFIG_INT(ClAutoDemoRecord, cl_auto_demo_record, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Automatically record demos")
+MACRO_CONFIG_INT(ClAutoDemoOnConnect, cl_auto_demo_on_connect, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Only start a new demo when connect while automatically record demos")
+MACRO_CONFIG_INT(ClAutoDemoMax, cl_auto_demo_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically recorded demos (0 = no limit)")
+MACRO_CONFIG_INT(ClAutoScreenshot, cl_auto_screenshot, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Automatically take game over screenshot")
+MACRO_CONFIG_INT(ClAutoScreenshotMax, cl_auto_screenshot_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically created screenshots (0 = no limit)")
+MACRO_CONFIG_INT(ClAutoCSV, cl_auto_csv, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Automatically create game over csv")
+MACRO_CONFIG_INT(ClAutoCSVMax, cl_auto_csv_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically created csvs (0 = no limit)")
+MACRO_CONFIG_INT(ClShowBroadcasts, cl_show_broadcasts, 1, 0, 1, CFGFLAG_CLIENT, "Show broadcasts ingame")
+MACRO_CONFIG_INT(ClPrintBroadcasts, cl_print_broadcasts, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Print broadcasts to console")
+MACRO_CONFIG_INT(ClPrintMotd, cl_print_motd, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Print motd to console")
+MACRO_CONFIG_INT(ClFriendsIgnoreClan, cl_friends_ignore_clan, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Ignore clan tag when searching for friends")
+
+MACRO_CONFIG_STR(ClAssetsEntities, cl_assets_entities, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset/assets for entities")
+MACRO_CONFIG_STR(ClAssetGame, cl_asset_game, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset for game")
+MACRO_CONFIG_STR(ClAssetEmoticons, cl_asset_emoticons, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset for emoticons")
+MACRO_CONFIG_STR(ClAssetParticles, cl_asset_particles, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset for particles")
+MACRO_CONFIG_STR(ClAssetHud, cl_asset_hud, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset for HUD")
+MACRO_CONFIG_STR(ClAssetExtras, cl_asset_extras, 50, "default", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The asset for the game graphics that do not come from Teeworlds")
+
+MACRO_CONFIG_STR(BrFilterString, br_filter_string, 128, "Novice", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Server browser filtering string")
+MACRO_CONFIG_STR(BrExcludeString, br_exclude_string, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Server browser exclusion string")
+MACRO_CONFIG_INT(BrFilterFull, br_filter_full, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out full server in browser")
+MACRO_CONFIG_INT(BrFilterEmpty, br_filter_empty, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out empty server in browser")
+MACRO_CONFIG_INT(BrFilterSpectators, br_filter_spectators, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out spectators from player numbers")
+MACRO_CONFIG_INT(BrFilterFriends, br_filter_friends, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out servers with no friends")
+MACRO_CONFIG_INT(BrFilterCountry, br_filter_country, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out servers with non-matching player country")
+MACRO_CONFIG_INT(BrFilterCountryIndex, br_filter_country_index, -1, -1, 999, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Player country to filter by in the server browser")
+MACRO_CONFIG_INT(BrFilterPw, br_filter_pw, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out password protected servers in browser")
+MACRO_CONFIG_STR(BrFilterGametype, br_filter_gametype, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Game types to filter")
+MACRO_CONFIG_INT(BrFilterGametypeStrict, br_filter_gametype_strict, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Strict gametype filter")
+MACRO_CONFIG_INT(BrFilterConnectingPlayers, br_filter_connecting_players, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter connecting players")
+MACRO_CONFIG_STR(BrFilterServerAddress, br_filter_serveraddress, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Server address to filter")
+MACRO_CONFIG_INT(BrFilterUnfinishedMap, br_filter_unfinished_map, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show only servers with unfinished maps")
+
+MACRO_CONFIG_STR(BrFilterExcludeCommunities, br_filter_exclude_communities, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out servers by community")
+MACRO_CONFIG_STR(BrFilterExcludeCountries, br_filter_exclude_countries, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out communities' servers by country")
+MACRO_CONFIG_STR(BrFilterExcludeTypes, br_filter_exclude_types, 512, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out communities' servers by gametype")
+MACRO_CONFIG_INT(BrIndicateFinished, br_indicate_finished, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show whether you have finished a DDNet map (transmits your player name to info.ddnet.org/info)")
+MACRO_CONFIG_STR(BrLocation, br_location, 16, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Override location for ping estimation, available: auto, af, as, as:cn, eu, na, oc, sa (Automatic, Africa, Asia, China, Europe, North America, Oceania/Australia, South America")
+MACRO_CONFIG_STR(BrCachedBestServerinfoUrl, br_cached_best_serverinfo_url, 256, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Do not set this variable, instead create a ddnet-serverlist-urls.cfg next to settings_ddnet.cfg to specify all possible serverlist URLs")
+
+MACRO_CONFIG_INT(BrSort, br_sort, 4, 0, 256, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting column in server browser")
+MACRO_CONFIG_INT(BrSortOrder, br_sort_order, 2, 0, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting order in server browser")
+MACRO_CONFIG_INT(BrMaxRequests, br_max_requests, 100, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Number of concurrent requests to use when refreshing server browser")
+
+MACRO_CONFIG_INT(BrDemoSort, br_demo_sort, 0, 0, 2, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting column in demo browser")
+MACRO_CONFIG_INT(BrDemoSortOrder, br_demo_sort_order, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sorting order in demo browser")
+MACRO_CONFIG_INT(BrDemoFetchInfo, br_demo_fetch_info, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to auto fetch demo infos on refresh")
+
+MACRO_CONFIG_INT(SndBufferSize, snd_buffer_size, 512, 128, 32768, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound buffer size (may cause delay if large)")
+MACRO_CONFIG_INT(SndRate, snd_rate, 48000, 5512, 384000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound mixing rate")
+MACRO_CONFIG_INT(SndEnable, snd_enable, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound enable")
+MACRO_CONFIG_INT(SndMusic, snd_enable_music, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Play background music")
+MACRO_CONFIG_INT(SndVolume, snd_volume, 30, 0, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Sound volume")
+MACRO_CONFIG_INT(SndChatSoundVolume, snd_chat_volume, 30, 0, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Chat sound volume")
+MACRO_CONFIG_INT(SndGameSoundVolume, snd_game_volume, 30, 0, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Game sound volume")
+MACRO_CONFIG_INT(SndMapSoundVolume, snd_ambient_volume, 30, 0, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Map Sound sound volume")
+MACRO_CONFIG_INT(SndBackgroundMusicVolume, snd_background_music_volume, 30, 0, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Background music sound volume")
+
+MACRO_CONFIG_INT(SndNonactiveMute, snd_nonactive_mute, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Mute sounds when window is not active")
+MACRO_CONFIG_INT(SndGame, snd_game, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable game sounds")
+MACRO_CONFIG_INT(SndGun, snd_gun, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable gun sound")
+MACRO_CONFIG_INT(SndLongPain, snd_long_pain, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable long pain sound (used when shooting in freeze)")
+MACRO_CONFIG_INT(SndChat, snd_chat, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable regular chat sound")
+MACRO_CONFIG_INT(SndTeamChat, snd_team_chat, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable team chat sound")
+MACRO_CONFIG_INT(SndServerMessage, snd_servermessage, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable server message sound")
+MACRO_CONFIG_INT(SndHighlight, snd_highlight, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable highlighted chat sound")
+
+MACRO_CONFIG_INT(GfxScreen, gfx_screen, 0, 0, 15, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen index")
+MACRO_CONFIG_INT(GfxScreenWidth, gfx_screen_width, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen resolution width")
+MACRO_CONFIG_INT(GfxScreenHeight, gfx_screen_height, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen resolution height")
+MACRO_CONFIG_INT(GfxScreenRefreshRate, gfx_screen_refresh_rate, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen refresh rate")
+
+MACRO_CONFIG_INT(GfxDesktopWidth, gfx_desktop_width, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Desktop resolution width for detecting display changes (not recommended to change manually)")
+MACRO_CONFIG_INT(GfxDesktopHeight, gfx_desktop_height, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Desktop resolution height for detecting display changes (not recommended to change manually)")
+#if !defined(CONF_PLATFORM_MACOS)
+MACRO_CONFIG_INT(GfxBorderless, gfx_borderless, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Borderless window (not to be used with fullscreen)")
+#if !defined(CONF_WEBASM)
+MACRO_CONFIG_INT(GfxFullscreen, gfx_fullscreen, 1, 0, 3, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Set fullscreen mode: 0=no fullscreen, 1=pure fullscreen, 2=desktop fullscreen, 3=windowed fullscreen")
+#else
+MACRO_CONFIG_INT(GfxFullscreen, gfx_fullscreen, 0, 0, 3, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Set fullscreen mode: 0=no fullscreen, 1=pure fullscreen, 2=desktop fullscreen, 3=windowed fullscreen")
+#endif
+#else
+MACRO_CONFIG_INT(GfxBorderless, gfx_borderless, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Borderless window (not to be used with fullscreen)")
+MACRO_CONFIG_INT(GfxFullscreen, gfx_fullscreen, 0, 0, 3, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Set fullscreen mode: 0=no fullscreen, 1=pure fullscreen, 2=desktop fullscreen, 3=windowed fullscreen")
+#endif
+MACRO_CONFIG_INT(GfxHighdpi, gfx_highdpi, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable high-dpi")
+MACRO_CONFIG_INT(GfxColorDepth, gfx_color_depth, 24, 16, 24, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Colors bits for framebuffer (fullscreen only)")
+MACRO_CONFIG_INT(GfxVsync, gfx_vsync, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Vertical sync (may cause delay)")
+MACRO_CONFIG_INT(GfxDisplayAllVideoModes, gfx_display_all_video_modes, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show all video modes")
+MACRO_CONFIG_INT(GfxHighDetail, gfx_high_detail, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "High detail")
+MACRO_CONFIG_INT(GfxFsaaSamples, gfx_fsaa_samples, 0, 0, 64, CFGFLAG_SAVE | CFGFLAG_CLIENT, "FSAA samples (may cause delay)")
+MACRO_CONFIG_INT(GfxRefreshRate, gfx_refresh_rate, 0, 0, 10000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen refresh rate")
+MACRO_CONFIG_INT(GfxBackgroundRender, gfx_backgroundrender, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Render graphics when window is in background")
+MACRO_CONFIG_INT(GfxTextOverlay, gfx_text_overlay, 10, 1, 100, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Stop rendering textoverlay in editor or with entities: high value = less details = more speed")
+MACRO_CONFIG_INT(GfxAsyncRenderOld, gfx_asyncrender_old, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "During an update cycle, skip the render cycle, if the render cycle would need to wait for the previous render cycle to finish")
+MACRO_CONFIG_INT(GfxQuadAsTriangle, gfx_quad_as_triangle, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Render quads as triangles (fixes quad coloring on some GPUs)")
+
+MACRO_CONFIG_INT(InpMousesens, inp_mousesens, 200, 1, 100000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Mouse sensitivity")
+MACRO_CONFIG_INT(InpTranslatedKeys, inp_translated_keys, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Translate keys before interpreting them, respects keyboard layouts")
+MACRO_CONFIG_INT(InpIgnoredModifiers, inp_ignored_modifiers, 0, 0, 65536, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Ignored keyboard modifier mask")
+#if defined(CONF_FAMILY_WINDOWS)
+MACRO_CONFIG_INT(InpImeNativeUi, inp_ime_native_ui, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Use native UI for IME (may cause IME to not work in fullscreen mode) (changing requires restart)")
+#endif
+
+MACRO_CONFIG_INT(InpControllerEnable, inp_controller_enable, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable controller")
+MACRO_CONFIG_STR(InpControllerGUID, inp_controller_guid, 34, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Controller GUID which uniquely identifies the active controller")
+MACRO_CONFIG_INT(InpControllerAbsolute, inp_controller_absolute, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable absolute controller aiming ingame")
+MACRO_CONFIG_INT(InpControllerSens, inp_controller_sens, 100, 1, 100000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Ingame controller sensitivity")
+MACRO_CONFIG_INT(InpControllerX, inp_controller_x, 0, 0, 12, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Controller axis that controls X axis of cursor")
+MACRO_CONFIG_INT(InpControllerY, inp_controller_y, 1, 0, 12, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Controller axis that controls Y axis of cursor")
+MACRO_CONFIG_INT(InpControllerTolerance, inp_controller_tolerance, 5, 0, 50, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Controller axis tolerance to account for jitter")
+
+MACRO_CONFIG_INT(ClPort, cl_port, 0, 0, 65535, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Port to use for client connections to server (0 to choose a random port, 1024 or higher to set a manual port, requires a restart)")
+MACRO_CONFIG_INT(ClDummyPort, cl_dummy_port, 0, 0, 65535, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Port to use for dummy connections to server (0 to choose a random port, 1024 or higher to set a manual port, requires a restart)")
+MACRO_CONFIG_INT(ClContactPort, cl_contact_port, 0, 0, 65535, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Port to use for serverinfo connections to server (0 to choose a random port, 1024 or higher to set a manual port, requires a restart)")
+
+MACRO_CONFIG_STR(SvName, sv_name, 128, "unnamed server", CFGFLAG_SERVER, "Server name")
+MACRO_CONFIG_STR(Bindaddr, bindaddr, 128, "", CFGFLAG_CLIENT | CFGFLAG_SERVER | CFGFLAG_MASTER, "Address to bind the client/server to")
+MACRO_CONFIG_INT(SvIpv4Only, sv_ipv4only, 0, 0, 1, CFGFLAG_SERVER, "Whether to bind only to ipv4, otherwise bind to all available interfaces")
+MACRO_CONFIG_INT(SvPort, sv_port, 0, 0, 0, CFGFLAG_SERVER, "Port to use for the server (Only ports 8303-8310 work in LAN server browser, 0 to automatically find a free port in 8303-8310)")
+MACRO_CONFIG_STR(SvHostname, sv_hostname, 128, "", CFGFLAG_SERVER, "Server hostname (0.7 only)")
+MACRO_CONFIG_STR(SvMap, sv_map, 128, "Sunny Side Up", CFGFLAG_SERVER, "Map to use on the server")
+MACRO_CONFIG_INT(SvMaxClients, sv_max_clients, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients that are allowed on a server")
+MACRO_CONFIG_INT(SvMaxClientsPerIP, sv_max_clients_per_ip, 4, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients with the same IP that can connect to the server")
+MACRO_CONFIG_INT(SvHighBandwidth, sv_high_bandwidth, 0, 0, 1, CFGFLAG_SERVER, "Use high bandwidth mode. Doubles the bandwidth required for the server. LAN use only")
+MACRO_CONFIG_STR(SvRegister, sv_register, 16, "1", CFGFLAG_SERVER, "Register server with master server for public listing, can also accept a comma-separated list of protocols to register on, like 'ipv4,ipv6'")
+MACRO_CONFIG_STR(SvRegisterExtra, sv_register_extra, 256, "", CFGFLAG_SERVER, "Extra headers to send to the register endpoint, comma separated 'Header: Value' pairs")
+MACRO_CONFIG_STR(SvRegisterUrl, sv_register_url, 128, "https://master1.ddnet.org/ddnet/15/register", CFGFLAG_SERVER, "Masterserver URL to register to")
+MACRO_CONFIG_STR(SvRconPassword, sv_rcon_password, 128, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Remote console password (full access)")
+MACRO_CONFIG_STR(SvRconModPassword, sv_rcon_mod_password, 128, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Remote console password for moderators (limited access)")
+MACRO_CONFIG_STR(SvRconHelperPassword, sv_rcon_helper_password, 128, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Remote console password for helpers (limited access)")
+MACRO_CONFIG_INT(SvRconMaxTries, sv_rcon_max_tries, 30, 0, 100, CFGFLAG_SERVER, "Maximum number of tries for remote console authentication")
+MACRO_CONFIG_INT(SvRconBantime, sv_rcon_bantime, 5, 0, 1440, CFGFLAG_SERVER, "The time a client gets banned if remote console authentication fails. 0 makes it just use kick")
+MACRO_CONFIG_INT(SvAutoDemoRecord, sv_auto_demo_record, 0, 0, 1, CFGFLAG_SERVER, "Automatically record demos")
+MACRO_CONFIG_INT(SvAutoDemoMax, sv_auto_demo_max, 10, 0, 1000, CFGFLAG_SERVER, "Maximum number of automatically recorded demos (0 = no limit)")
+MACRO_CONFIG_INT(SvTeeHistorian, sv_tee_historian, 0, 0, 1, CFGFLAG_SERVER, "Activate the tee historian that writes complete gameplay data to disk (WARNING: This will use a lot of disk space)")
+MACRO_CONFIG_INT(SvVanillaAntiSpoof, sv_vanilla_antispoof, 1, 0, 1, CFGFLAG_SERVER, "Enable vanilla Antispoof")
+MACRO_CONFIG_INT(SvDnsbl, sv_dnsbl, 0, 0, 1, CFGFLAG_SERVER, "Enable DNSBL (DNS-based Blackhole List)")
+MACRO_CONFIG_STR(SvDnsblHost, sv_dnsbl_host, 128, "", CFGFLAG_SERVER, "Hostname of DNSBL provider to use for IP Verification")
+MACRO_CONFIG_STR(SvDnsblKey, sv_dnsbl_key, 128, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "Optional Authentication Key for the specified DNSBL provider")
+MACRO_CONFIG_INT(SvDnsblVote, sv_dnsbl_vote, 0, 0, 1, CFGFLAG_SERVER, "Block votes by blacklisted addresses")
+MACRO_CONFIG_INT(SvDnsblBan, sv_dnsbl_ban, 0, 0, 1, CFGFLAG_SERVER, "Automatically ban blacklisted addresses")
+MACRO_CONFIG_INT(SvDnsblChat, sv_dnsbl_chat, 0, 0, 1, CFGFLAG_SERVER, "Don't allow chat from blacklisted addresses")
+MACRO_CONFIG_INT(SvRconVote, sv_rcon_vote, 0, 0, 1, CFGFLAG_SERVER, "Only allow authed clients to call votes")
+
+MACRO_CONFIG_INT(SvPlayerDemoRecord, sv_player_demo_record, 0, 0, 1, CFGFLAG_SERVER, "Automatically record demos for each player")
+MACRO_CONFIG_INT(SvDemoChat, sv_demo_chat, 0, 0, 1, CFGFLAG_SERVER, "Record chat for demos")
+MACRO_CONFIG_INT(SvServerInfoPerSecond, sv_server_info_per_second, 50, 0, 10000, CFGFLAG_SERVER, "Maximum number of complete server info responses that are sent out per second (0 for no limit)")
+MACRO_CONFIG_INT(SvVanConnPerSecond, sv_van_conn_per_second, 10, 0, 10000, CFGFLAG_SERVER, "Antispoof specific ratelimit (0 for no limit)")
+MACRO_CONFIG_INT(SvSixup, sv_sixup, 1, 0, 1, CFGFLAG_SERVER, "Enable sixup connections")
+MACRO_CONFIG_INT(SvSkillLevel, sv_skill_level, 1, SERVERINFO_LEVEL_MIN, SERVERINFO_LEVEL_MAX, CFGFLAG_SERVER, "Difficulty level for Teeworlds 0.7 (0: Casual, 1: Normal, 2: Competitive)")
+
+MACRO_CONFIG_STR(EcBindaddr, ec_bindaddr, 128, "localhost", CFGFLAG_ECON, "Address to bind the external console to. Anything but 'localhost' is dangerous")
+MACRO_CONFIG_INT(EcPort, ec_port, 0, 0, 0, CFGFLAG_ECON, "Port to use for the external console")
+MACRO_CONFIG_STR(EcPassword, ec_password, 128, "", CFGFLAG_ECON, "External console password")
+MACRO_CONFIG_INT(EcBantime, ec_bantime, 0, 0, 1440, CFGFLAG_ECON, "The time a client gets banned if econ authentication fails. 0 just closes the connection")
+MACRO_CONFIG_INT(EcAuthTimeout, ec_auth_timeout, 30, 1, 120, CFGFLAG_ECON, "Time in seconds before the the econ authentication times out")
+MACRO_CONFIG_INT(EcOutputLevel, ec_output_level, 0, -3, 2, CFGFLAG_ECON, "Adjusts the amount of information in the external console (-3 = none, -2 = error only, -1 = warn, 0 = info, 1 = debug, 2 = trace)")
+
+MACRO_CONFIG_INT(Debug, debug, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SERVER, "Debug mode")
+MACRO_CONFIG_INT(DbgCurl, dbg_curl, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SERVER, "Debug curl")
+MACRO_CONFIG_INT(DbgGraphs, dbg_graphs, 0, 0, 1, CFGFLAG_CLIENT, "Performance graphs")
+MACRO_CONFIG_INT(DbgGfx, dbg_gfx, 0, 0, 4, CFGFLAG_CLIENT, "Show graphic library warnings and errors, if the GPU supports it (0: none, 1: minimal, 2: affects performance, 3: verbose, 4: all)")
+#ifdef CONF_DEBUG
+MACRO_CONFIG_INT(DbgStress, dbg_stress, 0, 0, 1, CFGFLAG_CLIENT, "Stress systems (Debug build only)")
+MACRO_CONFIG_STR(DbgStressServer, dbg_stress_server, 32, "localhost", CFGFLAG_CLIENT, "Server to stress (Debug build only)")
+#endif
+
+MACRO_CONFIG_INT(HttpAllowInsecure, http_allow_insecure, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SERVER, "Allow insecure HTTP protocol in addition to the secure HTTPS one. Mostly useful for testing.")
+
+// DDRace
+MACRO_CONFIG_STR(SvWelcome, sv_welcome, 64, "", CFGFLAG_SERVER, "Message that will be displayed to players who join the server")
+MACRO_CONFIG_INT(SvReservedSlots, sv_reserved_slots, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "The number of slots that are reserved for special players")
+MACRO_CONFIG_STR(SvReservedSlotsPass, sv_reserved_slots_pass, 256, "", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, "The password that is required to use a reserved slot")
+MACRO_CONFIG_INT(SvReservedSlotsAuthLevel, sv_reserved_slots_auth_level, 1, 1, 4, CFGFLAG_SERVER, "Minimum rcon auth level needed to use a reserved slot. 4 = rcon auth disabled")
+MACRO_CONFIG_INT(SvHit, sv_hit, 1, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether players can hammer/grenade/laser each other or not")
+MACRO_CONFIG_INT(SvEndlessDrag, sv_endless_drag, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Turns endless hooking on/off")
+MACRO_CONFIG_INT(SvTestingCommands, sv_test_cmds, 0, 0, 1, CFGFLAG_SERVER, "Turns testing commands aka cheats on/off (setting only works in initial config)")
+MACRO_CONFIG_INT(SvFreezeDelay, sv_freeze_delay, 3, 1, 30, CFGFLAG_SERVER | CFGFLAG_GAME, "How many seconds the players will remain frozen (applies to all except delayed freeze in switch layer & deepfreeze)")
+MACRO_CONFIG_INT(ClDDRaceBindsSet, cl_race_binds_set, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "What level the DDRace binds are set to (this is automated, you don't need to use this)")
+MACRO_CONFIG_INT(SvEndlessSuperHook, sv_endless_super_hook, 0, 0, 1, CFGFLAG_SERVER, "Endless hook for super players on/off")
+MACRO_CONFIG_INT(SvHideScore, sv_hide_score, 0, 0, 1, CFGFLAG_SERVER, "Whether players scores will be announced or not")
+MACRO_CONFIG_INT(SvSaveWorseScores, sv_save_worse_scores, 1, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether to save worse scores when you already have a better one")
+MACRO_CONFIG_INT(SvPauseable, sv_pauseable, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether players can pause their char or not")
+MACRO_CONFIG_INT(SvPauseMessages, sv_pause_messages, 0, 0, 1, CFGFLAG_SERVER, "Whether to show messages when a player pauses and resumes")
+MACRO_CONFIG_INT(SvSpecFrequency, sv_pause_frequency, 1, 0, 9999, CFGFLAG_SERVER, "The minimum allowed delay between /spec")
+MACRO_CONFIG_INT(SvInvite, sv_invite, 1, 0, 1, CFGFLAG_SERVER, "Whether players can invite other players to teams")
+MACRO_CONFIG_INT(SvInviteFrequency, sv_invite_frequency, 1, 0, 9999, CFGFLAG_SERVER, "The minimum allowed delay between invites")
+MACRO_CONFIG_INT(SvTeleOthersAuthLevel, sv_tele_others_auth_level, 1, 1, 3, CFGFLAG_SERVER, "The auth level you need to tele others")
+MACRO_CONFIG_INT(SvRegionalRankings, sv_regional_rankings, 1, 0, 1, CFGFLAG_SERVER, "Display regional rankings in /rank and /top5")
+
+MACRO_CONFIG_INT(SvEmotionalTees, sv_emotional_tees, 1, -1, 1, CFGFLAG_SERVER, "Whether eye change of tees is enabled with emoticons = 1, not = 0, -1 not at all")
+MACRO_CONFIG_INT(SvEmoticonMsDelay, sv_emoticon_ms_delay, 3000, 20, 999999999, CFGFLAG_SERVER, "The time in ms a player has to wait before allowing the next over-head emoticons")
+MACRO_CONFIG_INT(SvGlobalEmoticonMsDelay, sv_global_emoticon_ms_delay, 3000, 20, 999999999, CFGFLAG_SERVER, "The time in ms a player has to wait before allowing the next over-head emoticons that is send to all clients (this config must be higher or equal to sv_emoticon_ms_delay to have an effect)")
+MACRO_CONFIG_INT(SvEyeEmoteChangeDelay, sv_eye_emote_change_delay, 1, 0, 9999, CFGFLAG_SERVER, "The time in seconds between eye emoticons change")
+
+MACRO_CONFIG_INT(SvChatDelay, sv_chat_delay, 1, 0, 9999, CFGFLAG_SERVER, "The time in seconds between chat messages")
+MACRO_CONFIG_INT(SvTeamChangeDelay, sv_team_change_delay, 3, 0, 9999, CFGFLAG_SERVER, "The time in seconds between team changes (spectator/in game)")
+MACRO_CONFIG_INT(SvInfoChangeDelay, sv_info_change_delay, 5, 0, 9999, CFGFLAG_SERVER, "The time in seconds between info changes (name/skin/color), to avoid ranbow mod set this to a very high time")
+MACRO_CONFIG_INT(SvVoteTime, sv_vote_time, 25, 1, 9999, CFGFLAG_SERVER, "The time in seconds a vote lasts")
+MACRO_CONFIG_INT(SvVoteMapTimeDelay, sv_vote_map_delay, 0, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between map votes")
+MACRO_CONFIG_INT(SvVoteDelay, sv_vote_delay, 3, 0, 9999, CFGFLAG_SERVER, "The time in seconds between any vote")
+MACRO_CONFIG_INT(SvVoteKickDelay, sv_vote_kick_delay, 0, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between kick votes")
+MACRO_CONFIG_INT(SvVoteYesPercentage, sv_vote_yes_percentage, 50, 1, 100, CFGFLAG_SERVER, "The percent of people that need to agree or deny for the vote to succeed/fail")
+MACRO_CONFIG_INT(SvVoteMajority, sv_vote_majority, 0, 0, 1, CFGFLAG_SERVER, "Whether No. of Yes is compared to No. of No votes or to number of total Players ( Default is 0 Y compare N)")
+MACRO_CONFIG_INT(SvVoteMaxTotal, sv_vote_max_total, 0, 0, MAX_CLIENTS, CFGFLAG_SERVER, "How many people can participate in a vote at max (0 = no limit by default)")
+MACRO_CONFIG_INT(SvVoteVetoTime, sv_vote_veto_time, 20, 0, 1000, CFGFLAG_SERVER, "Minutes of time on a server until a player can veto map change votes (0 = disabled)")
+MACRO_CONFIG_INT(SvKillDelay, sv_kill_delay, 1, 0, 9999, CFGFLAG_SERVER, "The minimum time in seconds between kills")
+
+MACRO_CONFIG_INT(SvMapWindow, sv_map_window, 15, 0, 100, CFGFLAG_SERVER, "Map downloading send-ahead window")
+MACRO_CONFIG_INT(SvFastDownload, sv_fast_download, 1, 0, 1, CFGFLAG_SERVER, "Enables fast download of maps")
+
+MACRO_CONFIG_INT(SvShotgunBulletSound, sv_shotgun_bullet_sound, 0, 0, 1, CFGFLAG_SERVER, "Crazy shotgun bullet sound on/off")
+
+MACRO_CONFIG_STR(SvRegionName, sv_region_name, 5, "UNK", CFGFLAG_SERVER, "Server region. Used for regional bans")
+MACRO_CONFIG_STR(SvSqlServerName, sv_sql_servername, 5, "UNK", CFGFLAG_SERVER, "SQL Server name that is inserted into record table")
+MACRO_CONFIG_INT(SvSaveGames, sv_savegames, 1, 0, 1, CFGFLAG_SERVER, "Enables savegames (/save and /load)")
+MACRO_CONFIG_INT(SvSaveSwapGamesDelay, sv_saveswapgames_delay, 30, 0, 10000, CFGFLAG_SERVER, "Delay in seconds for loading a savegame or before swapping")
+MACRO_CONFIG_INT(SvSaveSwapGamesPenalty, sv_saveswapgames_penalty, 60, 0, 10000, CFGFLAG_SERVER, "Penalty in seconds for saving or swapping position")
+MACRO_CONFIG_INT(SvSwapTimeout, sv_swap_timeout, 180, 0, 10000, CFGFLAG_SERVER, "Timeout in seconds before option to swap expires")
+MACRO_CONFIG_INT(SvSwap, sv_swap, 1, 0, 1, CFGFLAG_SERVER, "Enable /swap")
+MACRO_CONFIG_INT(SvUseSQL, sv_use_sql, 0, 0, 1, CFGFLAG_SERVER, "Enables MySQL backend instead of SQLite backend (sv_sqlite_file is still used as fallback write server when no MySQL server is reachable)")
+MACRO_CONFIG_INT(SvSqlQueriesDelay, sv_sql_queries_delay, 1, 0, 20, CFGFLAG_SERVER, "Delay in seconds between SQL queries of a single player")
+MACRO_CONFIG_STR(SvSqliteFile, sv_sqlite_file, 64, "ddnet-server.sqlite", CFGFLAG_SERVER, "File to store ranks in case sv_use_sql is turned off or used as backup sql server")
+
+#if defined(CONF_UPNP)
+MACRO_CONFIG_INT(SvUseUPnP, sv_use_upnp, 0, 0, 1, CFGFLAG_SERVER, "Enables UPnP support. (Requires -DCONF_UPNP=ON when compiling)")
+#endif
+
+MACRO_CONFIG_INT(SvDDRaceRules, sv_ddrace_rules, 1, 0, 1, CFGFLAG_SERVER, "Whether the default mod rules are displayed or not")
+MACRO_CONFIG_STR(SvRulesLine1, sv_rules_line1, 128, "", CFGFLAG_SERVER, "Rules line 1")
+MACRO_CONFIG_STR(SvRulesLine2, sv_rules_line2, 128, "", CFGFLAG_SERVER, "Rules line 2")
+MACRO_CONFIG_STR(SvRulesLine3, sv_rules_line3, 128, "", CFGFLAG_SERVER, "Rules line 3")
+MACRO_CONFIG_STR(SvRulesLine4, sv_rules_line4, 128, "", CFGFLAG_SERVER, "Rules line 4")
+MACRO_CONFIG_STR(SvRulesLine5, sv_rules_line5, 128, "", CFGFLAG_SERVER, "Rules line 5")
+MACRO_CONFIG_STR(SvRulesLine6, sv_rules_line6, 128, "", CFGFLAG_SERVER, "Rules line 6")
+MACRO_CONFIG_STR(SvRulesLine7, sv_rules_line7, 128, "", CFGFLAG_SERVER, "Rules line 7")
+MACRO_CONFIG_STR(SvRulesLine8, sv_rules_line8, 128, "", CFGFLAG_SERVER, "Rules line 8")
+MACRO_CONFIG_STR(SvRulesLine9, sv_rules_line9, 128, "", CFGFLAG_SERVER, "Rules line 9")
+MACRO_CONFIG_STR(SvRulesLine10, sv_rules_line10, 128, "", CFGFLAG_SERVER, "Rules line 10")
+
+MACRO_CONFIG_INT(SvTeam, sv_team, 1, 0, 3, CFGFLAG_SERVER | CFGFLAG_GAME, "Teams configuration (0 = off, 1 = on but optional, 2 = must play only with teams, 3 = forced random team only for you)")
+MACRO_CONFIG_INT(SvMinTeamSize, sv_min_team_size, 2, 1, MAX_CLIENTS, CFGFLAG_SERVER | CFGFLAG_GAME, "Minimum team size (finishing in a team smaller than this size gives you no teamrank)")
+MACRO_CONFIG_INT(SvMaxTeamSize, sv_max_team_size, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER | CFGFLAG_GAME, "Maximum team size")
+MACRO_CONFIG_INT(SvMapVote, sv_map_vote, 1, 0, 1, CFGFLAG_SERVER, "Whether to allow /map")
+
+MACRO_CONFIG_STR(SvAnnouncementFileName, sv_announcement_filename, 24, "announcement.txt", CFGFLAG_SERVER, "file which will have the announcement, each one at a line")
+MACRO_CONFIG_INT(SvAnnouncementInterval, sv_announcement_interval, 300, 1, 9999, CFGFLAG_SERVER, "time(minutes) in which the announcement will be displayed from the announcement file")
+MACRO_CONFIG_INT(SvAnnouncementRandom, sv_announcement_random, 1, 0, 1, CFGFLAG_SERVER, "Whether announcements are sequential or random")
+
+MACRO_CONFIG_INT(SvOldLaser, sv_old_laser, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether lasers can hit you if you shot them and that they pull you towards the bounce origin (0 for all new maps) or lasers can't hit you if you shot them, and they pull others towards the shooter")
+MACRO_CONFIG_INT(SvSlashMe, sv_slash_me, 0, 0, 1, CFGFLAG_SERVER, "Whether /me is active on the server or not")
+MACRO_CONFIG_INT(SvRejoinTeam0, sv_rejoin_team_0, 1, 0, 1, CFGFLAG_SERVER, "Make a team automatically rejoin team 0 after finish (only if not locked)")
+
+MACRO_CONFIG_INT(SvNoWeakHook, sv_no_weak_hook, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether to use an alternative calculation for world ticks, that makes the hook behave like all players have strong.")
+
+MACRO_CONFIG_INT(ClReconnectTimeout, cl_reconnect_timeout, 120, 0, 600, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How many seconds to wait before reconnecting (after timeout, 0 for off)")
+MACRO_CONFIG_INT(ClReconnectFull, cl_reconnect_full, 5, 0, 600, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How many seconds to wait before reconnecting (when server is full, 0 for off)")
+
+MACRO_CONFIG_COL(ClMessageSystemColor, cl_message_system_color, 2817983, CFGFLAG_CLIENT | CFGFLAG_SAVE, "System message color")
+MACRO_CONFIG_COL(ClMessageClientColor, cl_message_client_color, 9633471, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Client message color")
+MACRO_CONFIG_COL(ClMessageHighlightColor, cl_message_highlight_color, 65471, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Highlighted message color")
+MACRO_CONFIG_COL(ClMessageTeamColor, cl_message_team_color, 5636050, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Team message color")
+MACRO_CONFIG_COL(ClMessageColor, cl_message_color, 255, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Message color")
+MACRO_CONFIG_COL(ClLaserRifleInnerColor, cl_laser_rifle_inner_color, 11206591, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser inner color for Rifle")
+MACRO_CONFIG_COL(ClLaserRifleOutlineColor, cl_laser_rifle_outline_color, 11176233, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser outline color for Rifle")
+MACRO_CONFIG_COL(ClLaserShotgunInnerColor, cl_laser_sg_inner_color, 1467241, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser inner color for Shotgun")
+MACRO_CONFIG_COL(ClLaserShotgunOutlineColor, cl_laser_sg_outline_color, 1866773, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser outline color for Shotgun")
+MACRO_CONFIG_COL(ClLaserDoorInnerColor, cl_laser_door_inner_color, 7701379, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser inner color for doors")
+MACRO_CONFIG_COL(ClLaserDoorOutlineColor, cl_laser_door_outline_color, 7667473, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser outline color for doors")
+MACRO_CONFIG_COL(ClLaserFreezeInnerColor, cl_laser_freeze_inner_color, 12001153, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser inner color for freezes")
+MACRO_CONFIG_COL(ClLaserFreezeOutlineColor, cl_laser_freeze_outline_color, 11613223, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Laser outline color for freezes")
+MACRO_CONFIG_COL(ClKillMessageNormalColor, cl_kill_message_normal_color, 255, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLALPHA, "Kill message normal color")
+MACRO_CONFIG_COL(ClKillMessageHighlightColor, cl_kill_message_highlight_color, 255, CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_COLALPHA, "Kill message highlight color")
+
+MACRO_CONFIG_INT(ClMessageFriend, cl_message_friend, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable coloring and the heart for friends")
+MACRO_CONFIG_COL(ClMessageFriendColor, cl_message_friend_color, 65425, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friend message color")
+
+MACRO_CONFIG_INT(ConnTimeout, conn_timeout, 100, 5, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT | CFGFLAG_SERVER, "Network timeout")
+MACRO_CONFIG_INT(ConnTimeoutProtection, conn_timeout_protection, 1000, 5, 10000, CFGFLAG_SERVER, "Network timeout protection")
+MACRO_CONFIG_INT(ClShowIDs, cl_show_ids, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show client ids in scoreboard")
+MACRO_CONFIG_INT(ClScoreboardOnDeath, cl_scoreboard_on_death, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Whether to show scoreboard after death or not")
+MACRO_CONFIG_INT(ClAutoRaceRecord, cl_auto_race_record, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save the best demo of each race")
+MACRO_CONFIG_INT(ClReplays, cl_replays, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable/disable replays")
+MACRO_CONFIG_INT(ClReplayLength, cl_replay_length, 30, 10, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Set the default length of the replays")
+MACRO_CONFIG_INT(ClRaceRecordServerControl, cl_race_record_server_control, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Let the server start the race recorder")
+MACRO_CONFIG_INT(ClDemoName, cl_demo_name, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save the player name within the demo")
+MACRO_CONFIG_INT(ClDemoAssumeRace, cl_demo_assume_race, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Assume that demos are race demos")
+MACRO_CONFIG_INT(ClRaceGhost, cl_race_ghost, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable ghost")
+MACRO_CONFIG_INT(ClRaceGhostServerControl, cl_race_ghost_server_control, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Let the server start the ghost")
+MACRO_CONFIG_INT(ClRaceShowGhost, cl_race_show_ghost, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ghost")
+MACRO_CONFIG_INT(ClRaceSaveGhost, cl_race_save_ghost, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save ghost")
+MACRO_CONFIG_INT(ClRaceGhostStrictMap, cl_race_ghost_strict_map, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Match ghosts by map version instead of only map name")
+MACRO_CONFIG_INT(ClRaceGhostSaveBest, cl_race_ghost_save_best, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Save only ghosts that are better than the previous record.")
+MACRO_CONFIG_INT(ClRaceGhostAlpha, cl_race_ghost_alpha, 40, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Visbility of ghosts (alpha value, 0 invisible, 100 fully visible)")
+
+MACRO_CONFIG_INT(ClDDRaceScoreBoard, cl_ddrace_scoreboard, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable DDRace Scoreboard")
+MACRO_CONFIG_INT(SvResetPickups, sv_reset_pickups, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether the weapons are reset on passing the start tile or not")
+MACRO_CONFIG_INT(ClShowOthers, cl_show_others, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show players in other teams (2 to show own team only)")
+MACRO_CONFIG_INT(ClShowOthersAlpha, cl_show_others_alpha, 40, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show players in other teams (alpha value, 0 invisible, 100 fully visible)")
+MACRO_CONFIG_INT(ClOverlayEntities, cl_overlay_entities, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Overlay game tiles with a percentage of opacity")
+MACRO_CONFIG_INT(ClShowQuads, cl_showquads, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show quads (only interesting for mappers, or if your system has extremely bad performance)")
+MACRO_CONFIG_COL(ClBackgroundColor, cl_background_color, 128, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background color") // 0 0 128
+MACRO_CONFIG_COL(ClBackgroundEntitiesColor, cl_background_entities_color, 128, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background (entities) color") // 0 0 128
+MACRO_CONFIG_STR(ClBackgroundEntities, cl_background_entities, 100, "", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background (entities)")
+MACRO_CONFIG_STR(ClRunOnJoin, cl_run_on_join, 100, "", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Command to run when joining a server")
+
+// menu background map
+MACRO_CONFIG_STR(ClMenuMap, cl_menu_map, 100, "auto", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Background map in the menu")
+MACRO_CONFIG_INT(ClRotationRadius, cl_rotation_radius, 30, 1, 500, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Menu camera rotation radius")
+MACRO_CONFIG_INT(ClRotationSpeed, cl_rotation_speed, 40, 1, 120, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Menu camera rotations in seconds")
+MACRO_CONFIG_INT(ClCameraSpeed, cl_camera_speed, 5, 1, 40, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Menu camera speed")
+
+MACRO_CONFIG_INT(ClBackgroundShowTilesLayers, cl_background_show_tiles_layers, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Whether draw tiles layers when using custom background (entities)")
+MACRO_CONFIG_INT(SvShowOthers, sv_show_others, 1, 0, 1, CFGFLAG_SERVER, "Whether players can use the command showothers or not")
+MACRO_CONFIG_INT(SvShowOthersDefault, sv_show_others_default, 0, 0, 2, CFGFLAG_SERVER | CFGFLAG_GAME, "Whether players see others by default (2 for own team)")
+MACRO_CONFIG_INT(SvShowAllDefault, sv_show_all_default, 0, 0, 1, CFGFLAG_SERVER, "Whether players see all tees by default")
+MACRO_CONFIG_INT(SvMaxAfkTime, sv_max_afk_time, 300, 0, 9999, CFGFLAG_SERVER, "The time in seconds a player to be afk (0 = disabled)")
+MACRO_CONFIG_INT(SvPlasmaRange, sv_plasma_range, 700, 1, 99999, CFGFLAG_SERVER | CFGFLAG_GAME, "How far will the plasma gun track tees")
+MACRO_CONFIG_INT(SvPlasmaPerSec, sv_plasma_per_sec, 3, 0, 50, CFGFLAG_SERVER | CFGFLAG_GAME, "How many shots does the plasma gun fire per seconds")
+MACRO_CONFIG_INT(SvDraggerRange, sv_dragger_range, 700, 1, 99999, CFGFLAG_SERVER | CFGFLAG_GAME, "How far will the dragger track tees")
+MACRO_CONFIG_INT(SvVotePause, sv_vote_pause, 1, 0, 1, CFGFLAG_SERVER, "Allow voting to pause players (instead of moving to spectators)")
+MACRO_CONFIG_INT(SvVotePauseTime, sv_vote_pause_time, 10, 0, 360, CFGFLAG_SERVER, "The time (in seconds) players have to wait in pause when paused by vote")
+MACRO_CONFIG_INT(SvTuneReset, sv_tune_reset, 1, 0, 1, CFGFLAG_SERVER, "Whether tuning is reset after each map change or not")
+MACRO_CONFIG_STR(SvResetFile, sv_reset_file, 128, "reset.cfg", CFGFLAG_SERVER, "File to execute on map change or reload to set the default server settings")
+MACRO_CONFIG_STR(SvInputFifo, sv_input_fifo, 128, "", CFGFLAG_SERVER, "Fifo file (non-Windows) or Named Pipe (Windows) to use as input for server console")
+MACRO_CONFIG_INT(SvDDRaceTuneReset, sv_ddrace_tune_reset, 1, 0, 1, CFGFLAG_SERVER, "Whether DDRace tuning (sv_hit, sv_endless_drag and sv_old_laser) is reset after each map change or not")
+MACRO_CONFIG_INT(SvNamelessScore, sv_nameless_score, 1, 0, 1, CFGFLAG_SERVER, "Whether nameless tee has a score or not")
+MACRO_CONFIG_INT(SvTimeInBroadcastInterval, sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time")
+MACRO_CONFIG_INT(SvDefaultTimerType, sv_default_timer_type, 0, 0, 3, CFGFLAG_SERVER, "Default way of displaying time either game/round timer or broadcast. 0 = game/round timer, 1 = broadcast, 2 = 0+1, 3 = none")
+
+// these might need some fine tuning
+MACRO_CONFIG_INT(SvChatInitialDelay, sv_chat_initial_delay, 0, 0, 360, CFGFLAG_SERVER, "The time in seconds before the first message can be sent")
+MACRO_CONFIG_INT(SvChatPenalty, sv_chat_penalty, 250, 50, 1000, CFGFLAG_SERVER, "chat score will be increased by this on every message, and decremented by 1 on every tick.")
+MACRO_CONFIG_INT(SvChatThreshold, sv_chat_threshold, 1000, 50, 10000, CFGFLAG_SERVER, "if chats core exceeds this, the player will be muted for sv_spam_mute_duration seconds")
+MACRO_CONFIG_INT(SvSpamMuteDuration, sv_spam_mute_duration, 60, 0, 3600, CFGFLAG_SERVER, "how many seconds to mute, if player triggers mute on spam. 0 = off")
+
+MACRO_CONFIG_INT(SvShutdownWhenEmpty, sv_shutdown_when_empty, 0, 0, 1, CFGFLAG_SERVER, "Shutdown server as soon as no one is on it anymore")
+MACRO_CONFIG_INT(SvReloadWhenEmpty, sv_reload_when_empty, 0, 0, 2, CFGFLAG_SERVER, "Reload map when server is empty (1 = reload once, 2 = reload every time server gets empty)")
+MACRO_CONFIG_INT(SvKillProtection, sv_kill_protection, 20, 0, 9999, CFGFLAG_SERVER, "0 - Disable, 1-9999 minutes")
+MACRO_CONFIG_INT(SvSoloServer, sv_solo_server, 0, 0, 1, CFGFLAG_SERVER | CFGFLAG_GAME, "Set server to solo mode (no player interactions, has to be set before loading the map)")
+MACRO_CONFIG_STR(SvClientSuggestion, sv_client_suggestion, 128, "Get DDNet client from DDNet.org to use all features on DDNet!", CFGFLAG_SERVER, "Broadcast to display to players without DDNet client")
+MACRO_CONFIG_STR(SvClientSuggestionOld, sv_client_suggestion_old, 128, "Your DDNet client is old, update it on DDNet.org!", CFGFLAG_SERVER, "Broadcast to display to players with an old version of DDNet client")
+MACRO_CONFIG_STR(SvClientSuggestionBot, sv_client_suggestion_bot, 128, "Your client has bots and can be remotely controlled!\nPlease use another client like DDNet client from DDNet.org", CFGFLAG_SERVER, "Broadcast to display to players with a known botting client")
+MACRO_CONFIG_STR(SvBannedVersions, sv_banned_versions, 128, "", CFGFLAG_SERVER, "Comma separated list of banned clients to be kicked on join")
+
+// netlimit
+MACRO_CONFIG_INT(SvNetlimit, sv_netlimit, 0, 0, 10000, CFGFLAG_SERVER, "Netlimit: Maximum amount of traffic a client is allowed to use (in kb/s)")
+MACRO_CONFIG_INT(SvNetlimitAlpha, sv_netlimit_alpha, 50, 1, 100, CFGFLAG_SERVER, "Netlimit: Alpha of Exponention moving average")
+
+MACRO_CONFIG_INT(SvConnlimit, sv_connlimit, 5, 0, 100, CFGFLAG_SERVER, "Connlimit: Number of connections an IP is allowed to do in a timespan")
+MACRO_CONFIG_INT(SvConnlimitTime, sv_connlimit_time, 20, 0, 1000, CFGFLAG_SERVER, "Connlimit: Time in which IP's connections are counted")
+
+#if defined(CONF_FAMILY_UNIX)
+MACRO_CONFIG_STR(SvConnLoggingServer, sv_conn_logging_server, 128, "", CFGFLAG_SERVER, "Unix socket server for IP address logging (Unix only)")
+#endif
+
+MACRO_CONFIG_INT(ClUnpredictedShadow, cl_unpredicted_shadow, 0, -1, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show unpredicted shadow tee (0 = off, 1 = on, -1 = don't even show in debug mode)")
+MACRO_CONFIG_INT(ClPredictFreeze, cl_predict_freeze, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Predict freeze tiles (0 = off, 1 = on, 2 = partial (allow a small amount of movement in freeze)")
+MACRO_CONFIG_INT(ClShowNinja, cl_show_ninja, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show ninja skin")
+MACRO_CONFIG_INT(ClShowHookCollOther, cl_show_hook_coll_other, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show other players' hook collision line (2 to always show)")
+MACRO_CONFIG_INT(ClShowHookCollOwn, cl_show_hook_coll_own, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show own players' hook collision line (2 to always show)")
+MACRO_CONFIG_INT(ClHookCollSize, cl_hook_coll_size, 0, 0, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of hook collision line")
+MACRO_CONFIG_INT(ClHookCollAlpha, cl_hook_coll_alpha, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Alpha of hook collision line (0 invisible, 100 fully visible)")
+
+MACRO_CONFIG_COL(ClHookCollColorNoColl, cl_hook_coll_color_no_coll, 65407, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies the color of a hookline that hits nothing.")
+MACRO_CONFIG_COL(ClHookCollColorHookableColl, cl_hook_coll_color_hookable_coll, 6401973, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies the color of a hookline that hits hookable tiles.")
+MACRO_CONFIG_COL(ClHookCollColorTeeColl, cl_hook_coll_color_tee_coll, 2817919, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Specifies the color of a hookline that hits tees.")
+
+MACRO_CONFIG_INT(ClChatTeamColors, cl_chat_teamcolors, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show names in chat in team colors")
+MACRO_CONFIG_INT(ClChatReset, cl_chat_reset, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Reset chat when pressing escape")
+MACRO_CONFIG_INT(ClChatOld, cl_chat_old, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Old chat style: No tee, no background")
+
+MACRO_CONFIG_INT(ClShowDirection, cl_show_direction, 1, 0, 3, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show key presses (1 = other players', 2 = also your own, 3 = only your own")
+MACRO_CONFIG_INT(ClOldGunPosition, cl_old_gun_position, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Tees hold gun a bit higher like in TW 0.6.1 and older")
+MACRO_CONFIG_INT(ClConfirmDisconnectTime, cl_confirm_disconnect_time, 20, -1, 1440, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Confirmation popup before disconnecting after game time (in minutes, -1 to turn off, 0 to always turn on)")
+MACRO_CONFIG_INT(ClConfirmQuitTime, cl_confirm_quit_time, 20, -1, 1440, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Confirmation popup before quitting after game time (in minutes, -1 to turn off, 0 to always turn on)")
+MACRO_CONFIG_STR(ClTimeoutCode, cl_timeout_code, 64, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Timeout code to use")
+MACRO_CONFIG_STR(ClDummyTimeoutCode, cl_dummy_timeout_code, 64, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Dummy Timeout code to use")
+MACRO_CONFIG_STR(ClTimeoutSeed, cl_timeout_seed, 64, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Timeout seed")
+MACRO_CONFIG_STR(ClInputFifo, cl_input_fifo, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Fifo file (non-Windows) or Named Pipe (Windows) to use as input for client console")
+MACRO_CONFIG_INT(ClConfigVersion, cl_config_version, 0, 0, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "The config version. Helps newer clients fix bugs with older configs.")
+
+// demo editor
+MACRO_CONFIG_INT(ClDemoSliceBegin, cl_demo_slice_begin, -1, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Begin marker for demo slice")
+MACRO_CONFIG_INT(ClDemoSliceEnd, cl_demo_slice_end, -1, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "End marker for demo slice")
+MACRO_CONFIG_INT(ClDemoShowSpeed, cl_demo_show_speed, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show speed meter on change")
+MACRO_CONFIG_INT(ClDemoShowPause, cl_demo_show_pause, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show pause/play indicator on change")
+MACRO_CONFIG_INT(ClDemoKeyboardShortcuts, cl_demo_keyboard_shortcuts, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable keyboard shortcuts in demo player")
+
+// graphic library
+#if !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
+MACRO_CONFIG_INT(GfxGLMajor, gfx_gl_major, 1, 1, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library major version")
+#elif !defined(CONF_ARCH_IA32)
+MACRO_CONFIG_INT(GfxGLMajor, gfx_gl_major, 3, 1, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library major version")
+#else
+MACRO_CONFIG_INT(GfxGLMajor, gfx_gl_major, 1, 1, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library major version")
+#endif
+#if !defined(CONF_PLATFORM_MACOS)
+MACRO_CONFIG_INT(GfxGLMinor, gfx_gl_minor, 1, 0, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library minor version")
+#else
+MACRO_CONFIG_INT(GfxGLMinor, gfx_gl_minor, 3, 0, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library minor version")
+#endif
+MACRO_CONFIG_INT(GfxGLPatch, gfx_gl_patch, 0, 0, 10, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Graphic library patch version")
+
+// float multiplied with 1000
+MACRO_CONFIG_INT(GfxGLTextureLODBIAS, gfx_gl_texture_lod_bias, -500, -15000, 15000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "The lod bias for graphic library texture sampling multiplied by 1000")
+
+MACRO_CONFIG_INT(Gfx3DTextureAnalysisRan, gfx_3d_texture_analysis_ran, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Ran an analyzer to check if sampling 3D/2D array textures works correctly")
+MACRO_CONFIG_STR(Gfx3DTextureAnalysisRenderer, gfx_3d_texture_analysis_renderer, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The renderer on which the analysis was performed")
+MACRO_CONFIG_STR(Gfx3DTextureAnalysisVersion, gfx_3d_texture_analysis_version, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The version on which the analysis was performed")
+
+MACRO_CONFIG_STR(GfxGPUName, gfx_gpu_name, 256, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The GPU's name, which will be selected by the backend. (if supported by the backend)")
+#if !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
+MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "Vulkan", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
+#else
+MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "OpenGL", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
+#endif
+//sta
+MACRO_CONFIG_INT(GfxRenderThreadCount, gfx_render_thread_count, 3, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Number of threads the backend can use for rendering. (note: the value can be ignored by the backend)")
+
+MACRO_CONFIG_INT(GfxDriverIsBlocked, gfx_driver_is_blocked, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "If 1, the current driver is in a blocked error state.")
+
+MACRO_CONFIG_INT(ClVideoRecorderFPS, cl_video_recorder_fps, 60, 1, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "At which FPS the videorecorder should record demos.")
+/*
+ * Add config variables for mods below this comment to avoid merge conflicts.
+ */
+
+MACRO_CONFIG_INT(ClShowFrozenText, sc_frozen_tees_text, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show how many tees in your team are currently frozen. (0 - off, 1 - show alive, 2 - show frozen)")
+MACRO_CONFIG_INT(ClShowFrozenHud, sc_frozen_tees_hud, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show frozen tee HUD")
+MACRO_CONFIG_INT(ClShowFrozenHudSkins, sc_frozen_tees_hud_skins, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Use ninja skin, or darkened skin for frozen tees on hud")
+
+MACRO_CONFIG_INT(ClFrozenHudTeeSize, sc_frozen_tees_size, 15, 8, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of tees in frozen tee hud. (Default : 15)")
+MACRO_CONFIG_INT(ClFrozenMaxRows, sc_frozen_tees_max_rows, 1, 1, 6, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of rows in frozen tee HUD display")
+MACRO_CONFIG_INT(ClFrozenHudTeamOnly, sc_frozen_tees_only_inteam, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only render frozen tee HUD display while in team")
+
+MACRO_CONFIG_COL(ScPlayerOwnColor, sc_player_own_color, 6684927, CFGFLAG_CLIENT | CFGFLAG_SAVE, "You'r color in TAB list")
+MACRO_CONFIG_COL(ScLocalConsoleColor, sc_local_console_color, 51, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Local console color")
+MACRO_CONFIG_COL(ScConsoleBarColor, sc_console_bar_color, 8883654, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Console bar color")
+MACRO_CONFIG_COL(ScRemoteConsoleColor, sc_remote_console_color, 21837, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Remote console color")
+MACRO_CONFIG_INT(ClLocalConsolaAlpha, cl_local_console_alpha, 90, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of local console")
+MACRO_CONFIG_INT(ClRemoteConsolaAlpha, cl_remote_console_alpha, 90, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of remote console")
+
+MACRO_CONFIG_COL(ScBlacklistPColor, sc_blacklist_p_color, 65457, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Blacklist players color")
+MACRO_CONFIG_COL(ScFriendColor, sc_friend_color, 7995321, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friends color")
+MACRO_CONFIG_COL(ScFrozenTeeColor, sc_frozen_tee_color, 172, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Frozen tee color")
+
+MACRO_CONFIG_INT(ClApplyProfileSkin, sc_passet_skin, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply skin in profiles")
+MACRO_CONFIG_INT(ClApplyProfileName, sc_passet_name, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply name in profiles")
+MACRO_CONFIG_INT(ClApplyProfileClan, sc_passet_clan, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply clan in profiles")
+MACRO_CONFIG_INT(ClApplyProfileFlag, sc_passet_flag, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply flag in profiles")
+MACRO_CONFIG_INT(ClApplyProfileColors, sc_passet_colors, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply colors in profiles")
+MACRO_CONFIG_INT(ClApplyProfileEmote, sc_passet_emote, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Apply emote in profiles")
+//autolog
+MACRO_CONFIG_INT(ClAutoVerify, sc_auto_verify, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Auto verify")
+//chat size
+MACRO_CONFIG_INT(ClChatSize, sc_chat_size, 100, 10, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat sizer")
+//Chat pos
+MACRO_CONFIG_INT(ClChatPos, sc_chat_pos, 1, 1, 3, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat Position")
+//Anim
+MACRO_CONFIG_INT(ClAnimFeetSpeed, cl_anim_feet_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for feet")
+MACRO_CONFIG_INT(ClAnimHammerSpeed, cl_anim_hammer_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for hammer")
+MACRO_CONFIG_INT(ClAnimNinjaSpeed, cl_anim_ninja_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for ninja")
+MACRO_CONFIG_INT(ClAnimGunsSpeed, cl_anim_guns_speed, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Speed of animation for guns(shotgun, gun, grenade, laser)")
+//nameplates rendr.
+MACRO_CONFIG_INT(ScShowFriendsNameplatesColor, sc_show_friends_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friend's Nameplates Color")
+MACRO_CONFIG_INT(ScShowBlacklistNameplaterColor, sc_show_blacklist_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Foe's Nameplates Color")
+MACRO_CONFIG_INT(ScShowFrozenNameplaterColor, sc_show_frozen_nameplates_color, 0, 1, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Frozen tee Nameplates Color")
+
+MACRO_CONFIG_INT(ClChatFontSize, cl_chat_size, 60, 10, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat font size")
+MACRO_CONFIG_INT(ClChatWidth, cl_chat_width, 200, 140, 400, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Chat width")
+
+//Outline Variables
+MACRO_CONFIG_INT(ClOutline, sc_outline, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outlines")
+MACRO_CONFIG_INT(ClOutlineEntities, sc_outline_in_entities, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only show outlines in entities")
+MACRO_CONFIG_INT(ClOutlineFreeze, sc_outline_freeze, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around freeze and deep")
+MACRO_CONFIG_INT(ClOutlineUnFreeze, sc_outline_unfreeze, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around unfreeze and undeep")
+MACRO_CONFIG_INT(ClOutlineTele, sc_outline_tele, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around teleporters")
+MACRO_CONFIG_INT(ClOutlineSolid, sc_outline_solid, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around hook and unhook")
+MACRO_CONFIG_INT(ClOutlineWidth, sc_outline_width, 5, 1, 16, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(1-16) Width of freeze outline")
+MACRO_CONFIG_INT(ClOutlineAlpha, sc_outline_alpha, 50, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(0-100) Outline alpha")
+MACRO_CONFIG_INT(ClOutlineAlphaSolid, sc_outline_alpha_solid, 100, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(0-100) Outline solids alpha")
+MACRO_CONFIG_COL(ClOutlineColorSolid, sc_outline_color_solid, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Solid outline color") //0 0 0
+MACRO_CONFIG_COL(ClOutlineColorFreeze, sc_outline_color_freeze, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Freeze outline color") //0 0 0
+MACRO_CONFIG_COL(ClOutlineColorTele, sc_outline_color_tele, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Tele outline color") //0 0 0
+MACRO_CONFIG_COL(ClOutlineColorUnfreeze, sc_outline_color_unfreeze, 0, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Unfreeze outline color") //0 0 0
+
+MACRO_CONFIG_INT(ClRainbow, sc_rainbow, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow urself")
+MACRO_CONFIG_INT(ClRainbowSpeed, sc_rainbow_speed, 20, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow speed")
+MACRO_CONFIG_INT(ClRainbowEveryone, sc_rainbow_all, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow all")
+MACRO_CONFIG_INT(ClShowStateChangeCountdown, sc_stars, 1, 1, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow all")
+
+//tee skin name
+MACRO_CONFIG_INT(ClShowSkinName, sc_nameplates_skin_name, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
+MACRO_CONFIG_INT(ClConsoleSimple, sc_console_simple, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
+MACRO_CONFIG_INT(ClConsoleBarSimple, cl_consolebar_simple, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display name skin in nameplates")
+// Old ninja mode
+MACRO_CONFIG_INT(ClOldFreezeMode, cl_old_freeze_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "OldNinjaMode")
+MACRO_CONFIG_INT(ClFrozenWeapon, cl_frozen_weapon, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Give frozen tees their weapon")
+MACRO_CONFIG_INT(ClRainbowHook, cl_rainbow_hook, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "rainbow hook lmfao")
\ No newline at end of file
diff --git a/src_bkp/engine/shared/console.cpp b/src_bkp/engine/shared/console.cpp
new file mode 100644
index 0000000000..e20e2dae28
--- /dev/null
+++ b/src_bkp/engine/shared/console.cpp
@@ -0,0 +1,1055 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/color.h>
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/client/checksum.h>
+#include <engine/shared/protocol.h>
+#include <engine/storage.h>
+
+#include "config.h"
+#include "console.h"
+#include "linereader.h"
+
+#include <iterator> // std::size
+#include <new>
+
+// todo: rework this
+
+const char *CConsole::CResult::GetString(unsigned Index) const
+{
+	if(Index >= m_NumArgs)
+		return "";
+	return m_apArgs[Index];
+}
+
+int CConsole::CResult::GetInteger(unsigned Index) const
+{
+	if(Index >= m_NumArgs)
+		return 0;
+	return str_toint(m_apArgs[Index]);
+}
+
+float CConsole::CResult::GetFloat(unsigned Index) const
+{
+	if(Index >= m_NumArgs)
+		return 0.0f;
+	return str_tofloat(m_apArgs[Index]);
+}
+
+ColorHSLA CConsole::CResult::GetColor(unsigned Index, bool Light) const
+{
+	if(Index >= m_NumArgs)
+		return ColorHSLA(0, 0, 0);
+
+	const char *pStr = m_apArgs[Index];
+	if(str_isallnum(pStr) || ((pStr[0] == '-' || pStr[0] == '+') && str_isallnum(pStr + 1))) // Teeworlds Color (Packed HSL)
+	{
+		const ColorHSLA Hsla = ColorHSLA(str_toulong_base(pStr, 10), true);
+		if(Light)
+			return Hsla.UnclampLighting();
+		return Hsla;
+	}
+	else if(*pStr == '$') // Hex RGB/RGBA
+	{
+		return color_cast<ColorHSLA>(color_parse<ColorRGBA>(pStr + 1).value_or(ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f)));
+	}
+	else if(!str_comp_nocase(pStr, "red"))
+		return ColorHSLA(0.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "yellow"))
+		return ColorHSLA(1.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "green"))
+		return ColorHSLA(2.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "cyan"))
+		return ColorHSLA(3.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "blue"))
+		return ColorHSLA(4.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "magenta"))
+		return ColorHSLA(5.0f / 6.0f, 1, .5f);
+	else if(!str_comp_nocase(pStr, "white"))
+		return ColorHSLA(0, 0, 1);
+	else if(!str_comp_nocase(pStr, "gray"))
+		return ColorHSLA(0, 0, .5f);
+	else if(!str_comp_nocase(pStr, "black"))
+		return ColorHSLA(0, 0, 0);
+
+	return ColorHSLA(0, 0, 0);
+}
+
+const IConsole::CCommandInfo *CConsole::CCommand::NextCommandInfo(int AccessLevel, int FlagMask) const
+{
+	const CCommand *pInfo = m_pNext;
+	while(pInfo)
+	{
+		if(pInfo->m_Flags & FlagMask && pInfo->m_AccessLevel >= AccessLevel)
+			break;
+		pInfo = pInfo->m_pNext;
+	}
+	return pInfo;
+}
+
+const IConsole::CCommandInfo *CConsole::FirstCommandInfo(int AccessLevel, int FlagMask) const
+{
+	for(const CCommand *pCommand = m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pCommand->m_Flags & FlagMask && pCommand->GetAccessLevel() >= AccessLevel)
+			return pCommand;
+	}
+
+	return 0;
+}
+
+// the maximum number of tokens occurs in a string of length CONSOLE_MAX_STR_LENGTH with tokens size 1 separated by single spaces
+
+int CConsole::ParseStart(CResult *pResult, const char *pString, int Length)
+{
+	char *pStr;
+	int Len = sizeof(pResult->m_aStringStorage);
+	if(Length < Len)
+		Len = Length;
+
+	str_copy(pResult->m_aStringStorage, pString, Len);
+	pStr = pResult->m_aStringStorage;
+
+	// get command
+	pStr = str_skip_whitespaces(pStr);
+	pResult->m_pCommand = pStr;
+	pStr = str_skip_to_whitespace(pStr);
+
+	if(*pStr)
+	{
+		pStr[0] = 0;
+		pStr++;
+	}
+
+	pResult->m_pArgsStart = pStr;
+	return 0;
+}
+
+int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
+{
+	char Command = *pFormat;
+	char *pStr;
+	int Optional = 0;
+	int Error = 0;
+
+	pResult->ResetVictim();
+
+	pStr = pResult->m_pArgsStart;
+
+	while(true)
+	{
+		if(!Command)
+			break;
+
+		if(Command == '?')
+			Optional = 1;
+		else
+		{
+			pStr = str_skip_whitespaces(pStr);
+
+			if(!(*pStr)) // error, non optional command needs value
+			{
+				if(!Optional)
+				{
+					Error = 1;
+					break;
+				}
+
+				while(Command)
+				{
+					if(Command == 'v')
+					{
+						pResult->SetVictim(CResult::VICTIM_ME);
+						break;
+					}
+					Command = NextParam(pFormat);
+				}
+				break;
+			}
+
+			// add token
+			if(*pStr == '"')
+			{
+				char *pDst;
+				pStr++;
+				pResult->AddArgument(pStr);
+
+				pDst = pStr; // we might have to process escape data
+				while(true)
+				{
+					if(pStr[0] == '"')
+						break;
+					else if(pStr[0] == '\\')
+					{
+						if(pStr[1] == '\\')
+							pStr++; // skip due to escape
+						else if(pStr[1] == '"')
+							pStr++; // skip due to escape
+					}
+					else if(pStr[0] == 0)
+						return 1; // return error
+
+					*pDst = *pStr;
+					pDst++;
+					pStr++;
+				}
+
+				// write null termination
+				*pDst = 0;
+
+				pStr++;
+			}
+			else
+			{
+				char *pVictim = 0;
+
+				pResult->AddArgument(pStr);
+				if(Command == 'v')
+				{
+					pVictim = pStr;
+				}
+
+				if(Command == 'r') // rest of the string
+					break;
+				else if(Command == 'v') // validate victim
+					pStr = str_skip_to_whitespace(pStr);
+				else if(Command == 'i') // validate int
+					pStr = str_skip_to_whitespace(pStr);
+				else if(Command == 'f') // validate float
+					pStr = str_skip_to_whitespace(pStr);
+				else if(Command == 's') // validate string
+					pStr = str_skip_to_whitespace(pStr);
+
+				if(pStr[0] != 0) // check for end of string
+				{
+					pStr[0] = 0;
+					pStr++;
+				}
+
+				if(pVictim)
+				{
+					pResult->SetVictim(pVictim);
+				}
+			}
+		}
+		// fetch next command
+		Command = NextParam(pFormat);
+	}
+
+	return Error;
+}
+
+char CConsole::NextParam(const char *&pFormat)
+{
+	if(*pFormat)
+	{
+		pFormat++;
+
+		if(*pFormat == '[')
+		{
+			// skip bracket contents
+			for(; *pFormat != ']'; pFormat++)
+			{
+				if(!*pFormat)
+					return *pFormat;
+			}
+
+			// skip ']'
+			pFormat++;
+
+			// skip space if there is one
+			if(*pFormat == ' ')
+				pFormat++;
+		}
+	}
+	return *pFormat;
+}
+
+char *CConsole::Format(char *pBuf, int Size, const char *pFrom, const char *pStr)
+{
+	char aTimeBuf[80];
+	str_timestamp_format(aTimeBuf, sizeof(aTimeBuf), FORMAT_TIME);
+
+	str_format(pBuf, Size, "[%s][%s]: %s", aTimeBuf, pFrom, pStr);
+	return pBuf;
+}
+
+LEVEL IConsole::ToLogLevel(int Level)
+{
+	switch(Level)
+	{
+	case IConsole::OUTPUT_LEVEL_STANDARD:
+		return LEVEL_INFO;
+	case IConsole::OUTPUT_LEVEL_ADDINFO:
+		return LEVEL_DEBUG;
+	case IConsole::OUTPUT_LEVEL_DEBUG:
+		return LEVEL_TRACE;
+	}
+	dbg_assert(0, "invalid log level");
+	return LEVEL_INFO;
+}
+
+int IConsole::ToLogLevelFilter(int Level)
+{
+	if(!(-3 <= Level && Level <= 2))
+	{
+		dbg_assert(0, "invalid log level filter");
+	}
+	return Level + 2;
+}
+
+LOG_COLOR ColorToLogColor(ColorRGBA Color)
+{
+	return LOG_COLOR{
+		(uint8_t)(Color.r * 255.0),
+		(uint8_t)(Color.g * 255.0),
+		(uint8_t)(Color.b * 255.0)};
+}
+
+void CConsole::Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor) const
+{
+	LEVEL LogLevel = IConsole::ToLogLevel(Level);
+	// if console colors are not enabled or if the color is pure white, use default terminal color
+	if(g_Config.m_ConsoleEnableColors && mem_comp(&PrintColor, &gs_ConsoleDefaultColor, sizeof(ColorRGBA)) != 0)
+	{
+		log_log_color(LogLevel, ColorToLogColor(PrintColor), pFrom, "%s", pStr);
+	}
+	else
+	{
+		log_log(LogLevel, pFrom, "%s", pStr);
+	}
+}
+
+void CConsole::SetTeeHistorianCommandCallback(FTeeHistorianCommandCallback pfnCallback, void *pUser)
+{
+	m_pfnTeeHistorianCommandCallback = pfnCallback;
+	m_pTeeHistorianCommandUserdata = pUser;
+}
+
+void CConsole::SetUnknownCommandCallback(FUnknownCommandCallback pfnCallback, void *pUser)
+{
+	m_pfnUnknownCommandCallback = pfnCallback;
+	m_pUnknownCommandUserdata = pUser;
+}
+
+void CConsole::InitChecksum(CChecksumData *pData) const
+{
+	pData->m_NumCommands = 0;
+	for(CCommand *pCommand = m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pData->m_NumCommands < (int)(std::size(pData->m_aCommandsChecksum)))
+		{
+			FCommandCallback pfnCallback = pCommand->m_pfnCallback;
+			void *pUserData = pCommand->m_pUserData;
+			TraverseChain(&pfnCallback, &pUserData);
+			int CallbackBits = (uintptr_t)pfnCallback & 0xfff;
+			int *pTarget = &pData->m_aCommandsChecksum[pData->m_NumCommands];
+			*pTarget = ((uint8_t)pCommand->m_pName[0]) | ((uint8_t)pCommand->m_pName[1] << 8) | (CallbackBits << 16);
+		}
+		pData->m_NumCommands += 1;
+	}
+}
+
+bool CConsole::LineIsValid(const char *pStr)
+{
+	if(!pStr || *pStr == 0)
+		return false;
+
+	do
+	{
+		CResult Result;
+		const char *pEnd = pStr;
+		const char *pNextPart = 0;
+		int InString = 0;
+
+		while(*pEnd)
+		{
+			if(*pEnd == '"')
+				InString ^= 1;
+			else if(*pEnd == '\\') // escape sequences
+			{
+				if(pEnd[1] == '"')
+					pEnd++;
+			}
+			else if(!InString)
+			{
+				if(*pEnd == ';') // command separator
+				{
+					pNextPart = pEnd + 1;
+					break;
+				}
+				else if(*pEnd == '#') // comment, no need to do anything more
+					break;
+			}
+
+			pEnd++;
+		}
+
+		if(ParseStart(&Result, pStr, (pEnd - pStr) + 1) != 0)
+			return false;
+
+		CCommand *pCommand = FindCommand(Result.m_pCommand, m_FlagMask);
+		if(!pCommand || ParseArgs(&Result, pCommand->m_pParams))
+			return false;
+
+		pStr = pNextPart;
+	} while(pStr && *pStr);
+
+	return true;
+}
+
+void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientID, bool InterpretSemicolons)
+{
+	const char *pWithoutPrefix = str_startswith(pStr, "mc;");
+	if(pWithoutPrefix)
+	{
+		InterpretSemicolons = true;
+		pStr = pWithoutPrefix;
+	}
+	while(pStr && *pStr)
+	{
+		CResult Result;
+		Result.m_ClientID = ClientID;
+		const char *pEnd = pStr;
+		const char *pNextPart = 0;
+		int InString = 0;
+
+		while(*pEnd)
+		{
+			if(*pEnd == '"')
+				InString ^= 1;
+			else if(*pEnd == '\\') // escape sequences
+			{
+				if(pEnd[1] == '"')
+					pEnd++;
+			}
+			else if(!InString && InterpretSemicolons)
+			{
+				if(*pEnd == ';') // command separator
+				{
+					pNextPart = pEnd + 1;
+					break;
+				}
+				else if(*pEnd == '#') // comment, no need to do anything more
+					break;
+			}
+
+			pEnd++;
+		}
+
+		if(ParseStart(&Result, pStr, (pEnd - pStr) + 1) != 0)
+			return;
+
+		if(!*Result.m_pCommand)
+			return;
+
+		CCommand *pCommand;
+		if(ClientID == IConsole::CLIENT_ID_GAME)
+			pCommand = FindCommand(Result.m_pCommand, m_FlagMask | CFGFLAG_GAME);
+		else
+			pCommand = FindCommand(Result.m_pCommand, m_FlagMask);
+
+		if(pCommand)
+		{
+			if(ClientID == IConsole::CLIENT_ID_GAME && !(pCommand->m_Flags & CFGFLAG_GAME))
+			{
+				if(Stroke)
+				{
+					char aBuf[CMDLINE_LENGTH + 64];
+					str_format(aBuf, sizeof(aBuf), "Command '%s' cannot be executed from a map.", Result.m_pCommand);
+					Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+				}
+			}
+			else if(ClientID == IConsole::CLIENT_ID_NO_GAME && pCommand->m_Flags & CFGFLAG_GAME)
+			{
+				if(Stroke)
+				{
+					char aBuf[CMDLINE_LENGTH + 64];
+					str_format(aBuf, sizeof(aBuf), "Command '%s' cannot be executed from a non-map config file.", Result.m_pCommand);
+					Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+					str_format(aBuf, sizeof(aBuf), "Hint: Put the command in '%s.cfg' instead of '%s.map.cfg' ", g_Config.m_SvMap, g_Config.m_SvMap);
+					Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+				}
+			}
+			else if(pCommand->GetAccessLevel() >= m_AccessLevel)
+			{
+				int IsStrokeCommand = 0;
+				if(Result.m_pCommand[0] == '+')
+				{
+					// insert the stroke direction token
+					Result.AddArgument(m_apStrokeStr[Stroke]);
+					IsStrokeCommand = 1;
+				}
+
+				if(Stroke || IsStrokeCommand)
+				{
+					if(ParseArgs(&Result, pCommand->m_pParams))
+					{
+						char aBuf[TEMPCMD_NAME_LENGTH + TEMPCMD_PARAMS_LENGTH + 32];
+						str_format(aBuf, sizeof(aBuf), "Invalid arguments. Usage: %s %s", pCommand->m_pName, pCommand->m_pParams);
+						Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+					}
+					else if(m_StoreCommands && pCommand->m_Flags & CFGFLAG_STORE)
+					{
+						m_ExecutionQueue.AddEntry();
+						m_ExecutionQueue.m_pLast->m_pCommand = pCommand;
+						m_ExecutionQueue.m_pLast->m_Result = Result;
+					}
+					else
+					{
+						if(pCommand->m_Flags & CMDFLAG_TEST && !g_Config.m_SvTestingCommands)
+							return;
+
+						if(m_pfnTeeHistorianCommandCallback && !(pCommand->m_Flags & CFGFLAG_NONTEEHISTORIC))
+						{
+							m_pfnTeeHistorianCommandCallback(ClientID, m_FlagMask, pCommand->m_pName, &Result, m_pTeeHistorianCommandUserdata);
+						}
+
+						if(Result.GetVictim() == CResult::VICTIM_ME)
+							Result.SetVictim(ClientID);
+
+						if(Result.HasVictim() && Result.GetVictim() == CResult::VICTIM_ALL)
+						{
+							for(int i = 0; i < MAX_CLIENTS; i++)
+							{
+								Result.SetVictim(i);
+								pCommand->m_pfnCallback(&Result, pCommand->m_pUserData);
+							}
+						}
+						else
+						{
+							pCommand->m_pfnCallback(&Result, pCommand->m_pUserData);
+						}
+
+						if(pCommand->m_Flags & CMDFLAG_TEST)
+							m_Cheated = true;
+					}
+				}
+			}
+			else if(Stroke)
+			{
+				char aBuf[CMDLINE_LENGTH + 32];
+				str_format(aBuf, sizeof(aBuf), "Access for command %s denied.", Result.m_pCommand);
+				Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+			}
+		}
+		else if(Stroke)
+		{
+			// Pass the original string to the unknown command callback instead of the parsed command, as the latter
+			// ends at the first whitespace, which breaks for unknown commands (filenames) containing spaces.
+			if(!m_pfnUnknownCommandCallback(pStr, m_pUnknownCommandUserdata))
+			{
+				char aBuf[CMDLINE_LENGTH + 32];
+				str_format(aBuf, sizeof(aBuf), "No such command: %s.", Result.m_pCommand);
+				Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+			}
+		}
+
+		pStr = pNextPart;
+	}
+}
+
+int CConsole::PossibleCommands(const char *pStr, int FlagMask, bool Temp, FPossibleCallback pfnCallback, void *pUser)
+{
+	int Index = 0;
+	for(CCommand *pCommand = m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pCommand->m_Flags & FlagMask && pCommand->m_Temp == Temp)
+		{
+			if(str_find_nocase(pCommand->m_pName, pStr))
+			{
+				pfnCallback(Index, pCommand->m_pName, pUser);
+				Index++;
+			}
+		}
+	}
+	return Index;
+}
+
+CConsole::CCommand *CConsole::FindCommand(const char *pName, int FlagMask)
+{
+	for(CCommand *pCommand = m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pCommand->m_Flags & FlagMask)
+		{
+			if(str_comp_nocase(pCommand->m_pName, pName) == 0)
+				return pCommand;
+		}
+	}
+
+	return 0x0;
+}
+
+void CConsole::ExecuteLine(const char *pStr, int ClientID, bool InterpretSemicolons)
+{
+	CConsole::ExecuteLineStroked(1, pStr, ClientID, InterpretSemicolons); // press it
+	CConsole::ExecuteLineStroked(0, pStr, ClientID, InterpretSemicolons); // then release it
+}
+
+void CConsole::ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID, bool InterpretSemicolons)
+{
+	int Temp = m_FlagMask;
+	m_FlagMask = FlagMask;
+	ExecuteLine(pStr, ClientID, InterpretSemicolons);
+	m_FlagMask = Temp;
+}
+
+bool CConsole::ExecuteFile(const char *pFilename, int ClientID, bool LogFailure, int StorageType)
+{
+	// make sure that this isn't being executed already
+	for(CExecFile *pCur = m_pFirstExec; pCur; pCur = pCur->m_pPrev)
+		if(str_comp(pFilename, pCur->m_pFilename) == 0)
+			return false;
+
+	if(!m_pStorage)
+		return false;
+
+	// push this one to the stack
+	CExecFile ThisFile;
+	CExecFile *pPrev = m_pFirstExec;
+	ThisFile.m_pFilename = pFilename;
+	ThisFile.m_pPrev = m_pFirstExec;
+	m_pFirstExec = &ThisFile;
+
+	// exec the file
+	IOHANDLE File = m_pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, StorageType);
+
+	bool Success = false;
+	char aBuf[32 + IO_MAX_PATH_LENGTH];
+	if(File)
+	{
+		str_format(aBuf, sizeof(aBuf), "executing '%s'", pFilename);
+		Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
+
+		CLineReader Reader;
+		Reader.Init(File);
+
+		char *pLine;
+		while((pLine = Reader.Get()))
+			ExecuteLine(pLine, ClientID);
+
+		io_close(File);
+		Success = true;
+	}
+	else if(LogFailure)
+	{
+		str_format(aBuf, sizeof(aBuf), "failed to open '%s'", pFilename);
+		Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
+	}
+
+	m_pFirstExec = pPrev;
+	return Success;
+}
+
+void CConsole::Con_Echo(IResult *pResult, void *pUserData)
+{
+	((CConsole *)pUserData)->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", pResult->GetString(0));
+}
+
+void CConsole::Con_Exec(IResult *pResult, void *pUserData)
+{
+	((CConsole *)pUserData)->ExecuteFile(pResult->GetString(0), -1, true, IStorage::TYPE_ALL);
+}
+
+void CConsole::ConCommandAccess(IResult *pResult, void *pUser)
+{
+	CConsole *pConsole = static_cast<CConsole *>(pUser);
+	char aBuf[CMDLINE_LENGTH + 64];
+	CCommand *pCommand = pConsole->FindCommand(pResult->GetString(0), CFGFLAG_SERVER);
+	if(pCommand)
+	{
+		if(pResult->NumArguments() == 2)
+		{
+			pCommand->SetAccessLevel(pResult->GetInteger(1));
+			str_format(aBuf, sizeof(aBuf), "moderator access for '%s' is now %s", pResult->GetString(0), pCommand->GetAccessLevel() ? "enabled" : "disabled");
+			pConsole->Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+			str_format(aBuf, sizeof(aBuf), "helper access for '%s' is now %s", pResult->GetString(0), pCommand->GetAccessLevel() >= ACCESS_LEVEL_HELPER ? "enabled" : "disabled");
+			pConsole->Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+			str_format(aBuf, sizeof(aBuf), "user access for '%s' is now %s", pResult->GetString(0), pCommand->GetAccessLevel() >= ACCESS_LEVEL_USER ? "enabled" : "disabled");
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "moderator access for '%s' is %s", pResult->GetString(0), pCommand->GetAccessLevel() ? "enabled" : "disabled");
+			pConsole->Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+			str_format(aBuf, sizeof(aBuf), "helper access for '%s' is %s", pResult->GetString(0), pCommand->GetAccessLevel() >= ACCESS_LEVEL_HELPER ? "enabled" : "disabled");
+			pConsole->Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+			str_format(aBuf, sizeof(aBuf), "user access for '%s' is %s", pResult->GetString(0), pCommand->GetAccessLevel() >= ACCESS_LEVEL_USER ? "enabled" : "disabled");
+		}
+	}
+	else
+		str_format(aBuf, sizeof(aBuf), "No such command: '%s'.", pResult->GetString(0));
+
+	pConsole->Print(OUTPUT_LEVEL_STANDARD, "console", aBuf);
+}
+
+void CConsole::ConCommandStatus(IResult *pResult, void *pUser)
+{
+	CConsole *pConsole = static_cast<CConsole *>(pUser);
+	char aBuf[240];
+	mem_zero(aBuf, sizeof(aBuf));
+	int Used = 0;
+
+	for(CCommand *pCommand = pConsole->m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pCommand->m_Flags & pConsole->m_FlagMask && pCommand->GetAccessLevel() >= clamp(pResult->GetInteger(0), (int)ACCESS_LEVEL_ADMIN, (int)ACCESS_LEVEL_USER))
+		{
+			int Length = str_length(pCommand->m_pName);
+			if(Used + Length + 2 < (int)(sizeof(aBuf)))
+			{
+				if(Used > 0)
+				{
+					Used += 2;
+					str_append(aBuf, ", ");
+				}
+				str_append(aBuf, pCommand->m_pName);
+				Used += Length;
+			}
+			else
+			{
+				pConsole->Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+				mem_zero(aBuf, sizeof(aBuf));
+				str_copy(aBuf, pCommand->m_pName);
+				Used = Length;
+			}
+		}
+	}
+	if(Used > 0)
+		pConsole->Print(OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+}
+
+void CConsole::ConUserCommandStatus(IResult *pResult, void *pUser)
+{
+	CConsole *pConsole = static_cast<CConsole *>(pUser);
+	CResult Result;
+	Result.m_pCommand = "access_status";
+	char aBuf[4];
+	str_from_int((int)IConsole::ACCESS_LEVEL_USER, aBuf);
+	Result.AddArgument(aBuf);
+
+	pConsole->ConCommandStatus(&Result, pConsole);
+}
+
+void CConsole::TraverseChain(FCommandCallback *ppfnCallback, void **ppUserData)
+{
+	while(*ppfnCallback == Con_Chain)
+	{
+		CChain *pChainInfo = static_cast<CChain *>(*ppUserData);
+		*ppfnCallback = pChainInfo->m_pfnCallback;
+		*ppUserData = pChainInfo->m_pCallbackUserData;
+	}
+}
+
+CConsole::CConsole(int FlagMask)
+{
+	m_FlagMask = FlagMask;
+	m_AccessLevel = ACCESS_LEVEL_ADMIN;
+	m_pRecycleList = 0;
+	m_TempCommands.Reset();
+	m_StoreCommands = true;
+	m_apStrokeStr[0] = "0";
+	m_apStrokeStr[1] = "1";
+	m_ExecutionQueue.Reset();
+	m_pFirstCommand = 0;
+	m_pFirstExec = 0;
+	m_pfnTeeHistorianCommandCallback = 0;
+	m_pTeeHistorianCommandUserdata = 0;
+
+	m_pStorage = 0;
+
+	// register some basic commands
+	Register("echo", "r[text]", CFGFLAG_SERVER, Con_Echo, this, "Echo the text");
+	Register("exec", "r[file]", CFGFLAG_SERVER | CFGFLAG_CLIENT, Con_Exec, this, "Execute the specified file");
+
+	Register("access_level", "s[command] ?i[accesslevel]", CFGFLAG_SERVER, ConCommandAccess, this, "Specify command accessibility (admin = 0, moderator = 1, helper = 2, all = 3)");
+	Register("access_status", "i[accesslevel]", CFGFLAG_SERVER, ConCommandStatus, this, "List all commands which are accessible for admin = 0, moderator = 1, helper = 2, all = 3");
+	Register("cmdlist", "", CFGFLAG_SERVER | CFGFLAG_CHAT, ConUserCommandStatus, this, "List all commands which are accessible for users");
+
+	// DDRace
+
+	m_Cheated = false;
+}
+
+CConsole::~CConsole()
+{
+	CCommand *pCommand = m_pFirstCommand;
+	while(pCommand)
+	{
+		CCommand *pNext = pCommand->m_pNext;
+		{
+			FCommandCallback pfnCallback = pCommand->m_pfnCallback;
+			void *pUserData = pCommand->m_pUserData;
+			CChain *pChain = nullptr;
+			while(pfnCallback == Con_Chain)
+			{
+				pChain = static_cast<CChain *>(pUserData);
+				pfnCallback = pChain->m_pfnCallback;
+				pUserData = pChain->m_pCallbackUserData;
+				delete pChain;
+			}
+		}
+		// Temp commands are on m_TempCommands heap, so don't delete them
+		if(!pCommand->m_Temp)
+			delete pCommand;
+		pCommand = pNext;
+	}
+}
+
+void CConsole::Init()
+{
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+}
+
+void CConsole::ParseArguments(int NumArgs, const char **ppArguments)
+{
+	for(int i = 0; i < NumArgs; i++)
+	{
+		// check for scripts to execute
+		if(ppArguments[i][0] == '-' && ppArguments[i][1] == 'f' && ppArguments[i][2] == 0)
+		{
+			if(NumArgs - i > 1)
+				ExecuteFile(ppArguments[i + 1], -1, true, IStorage::TYPE_ABSOLUTE);
+			i++;
+		}
+		else if(!str_comp("-s", ppArguments[i]) || !str_comp("--silent", ppArguments[i]))
+		{
+			// skip silent param
+			continue;
+		}
+		else
+		{
+			// search arguments for overrides
+			ExecuteLine(ppArguments[i]);
+		}
+	}
+}
+
+void CConsole::AddCommandSorted(CCommand *pCommand)
+{
+	if(!m_pFirstCommand || str_comp(pCommand->m_pName, m_pFirstCommand->m_pName) <= 0)
+	{
+		if(m_pFirstCommand && m_pFirstCommand->m_pNext)
+			pCommand->m_pNext = m_pFirstCommand;
+		else
+			pCommand->m_pNext = 0;
+		m_pFirstCommand = pCommand;
+	}
+	else
+	{
+		for(CCommand *p = m_pFirstCommand; p; p = p->m_pNext)
+		{
+			if(!p->m_pNext || str_comp(pCommand->m_pName, p->m_pNext->m_pName) <= 0)
+			{
+				pCommand->m_pNext = p->m_pNext;
+				p->m_pNext = pCommand;
+				break;
+			}
+		}
+	}
+}
+
+void CConsole::Register(const char *pName, const char *pParams,
+	int Flags, FCommandCallback pfnFunc, void *pUser, const char *pHelp)
+{
+	CCommand *pCommand = FindCommand(pName, Flags);
+	bool DoAdd = false;
+	if(pCommand == 0)
+	{
+		pCommand = new CCommand();
+		DoAdd = true;
+	}
+	pCommand->m_pfnCallback = pfnFunc;
+	pCommand->m_pUserData = pUser;
+
+	pCommand->m_pName = pName;
+	pCommand->m_pHelp = pHelp;
+	pCommand->m_pParams = pParams;
+
+	pCommand->m_Flags = Flags;
+	pCommand->m_Temp = false;
+
+	if(DoAdd)
+		AddCommandSorted(pCommand);
+
+	if(pCommand->m_Flags & CFGFLAG_CHAT)
+		pCommand->SetAccessLevel(ACCESS_LEVEL_USER);
+}
+
+void CConsole::RegisterTemp(const char *pName, const char *pParams, int Flags, const char *pHelp)
+{
+	CCommand *pCommand;
+	if(m_pRecycleList)
+	{
+		pCommand = m_pRecycleList;
+		str_copy(const_cast<char *>(pCommand->m_pName), pName, TEMPCMD_NAME_LENGTH);
+		str_copy(const_cast<char *>(pCommand->m_pHelp), pHelp, TEMPCMD_HELP_LENGTH);
+		str_copy(const_cast<char *>(pCommand->m_pParams), pParams, TEMPCMD_PARAMS_LENGTH);
+
+		m_pRecycleList = m_pRecycleList->m_pNext;
+	}
+	else
+	{
+		pCommand = new(m_TempCommands.Allocate(sizeof(CCommand))) CCommand;
+		char *pMem = static_cast<char *>(m_TempCommands.Allocate(TEMPCMD_NAME_LENGTH));
+		str_copy(pMem, pName, TEMPCMD_NAME_LENGTH);
+		pCommand->m_pName = pMem;
+		pMem = static_cast<char *>(m_TempCommands.Allocate(TEMPCMD_HELP_LENGTH));
+		str_copy(pMem, pHelp, TEMPCMD_HELP_LENGTH);
+		pCommand->m_pHelp = pMem;
+		pMem = static_cast<char *>(m_TempCommands.Allocate(TEMPCMD_PARAMS_LENGTH));
+		str_copy(pMem, pParams, TEMPCMD_PARAMS_LENGTH);
+		pCommand->m_pParams = pMem;
+	}
+
+	pCommand->m_pfnCallback = 0;
+	pCommand->m_pUserData = 0;
+	pCommand->m_Flags = Flags;
+	pCommand->m_Temp = true;
+
+	AddCommandSorted(pCommand);
+}
+
+void CConsole::DeregisterTemp(const char *pName)
+{
+	if(!m_pFirstCommand)
+		return;
+
+	CCommand *pRemoved = 0;
+
+	// remove temp entry from command list
+	if(m_pFirstCommand->m_Temp && str_comp(m_pFirstCommand->m_pName, pName) == 0)
+	{
+		pRemoved = m_pFirstCommand;
+		m_pFirstCommand = m_pFirstCommand->m_pNext;
+	}
+	else
+	{
+		for(CCommand *pCommand = m_pFirstCommand; pCommand->m_pNext; pCommand = pCommand->m_pNext)
+			if(pCommand->m_pNext->m_Temp && str_comp(pCommand->m_pNext->m_pName, pName) == 0)
+			{
+				pRemoved = pCommand->m_pNext;
+				pCommand->m_pNext = pCommand->m_pNext->m_pNext;
+				break;
+			}
+	}
+
+	// add to recycle list
+	if(pRemoved)
+	{
+		pRemoved->m_pNext = m_pRecycleList;
+		m_pRecycleList = pRemoved;
+	}
+}
+
+void CConsole::DeregisterTempAll()
+{
+	// set non temp as first one
+	for(; m_pFirstCommand && m_pFirstCommand->m_Temp; m_pFirstCommand = m_pFirstCommand->m_pNext)
+		;
+
+	// remove temp entries from command list
+	for(CCommand *pCommand = m_pFirstCommand; pCommand && pCommand->m_pNext; pCommand = pCommand->m_pNext)
+	{
+		CCommand *pNext = pCommand->m_pNext;
+		if(pNext->m_Temp)
+		{
+			for(; pNext && pNext->m_Temp; pNext = pNext->m_pNext)
+				;
+			pCommand->m_pNext = pNext;
+		}
+	}
+
+	m_TempCommands.Reset();
+	m_pRecycleList = 0;
+}
+
+void CConsole::Con_Chain(IResult *pResult, void *pUserData)
+{
+	CChain *pInfo = (CChain *)pUserData;
+	pInfo->m_pfnChainCallback(pResult, pInfo->m_pUserData, pInfo->m_pfnCallback, pInfo->m_pCallbackUserData);
+}
+
+void CConsole::Chain(const char *pName, FChainCommandCallback pfnChainFunc, void *pUser)
+{
+	CCommand *pCommand = FindCommand(pName, m_FlagMask);
+
+	if(!pCommand)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "failed to chain '%s'", pName);
+		Print(IConsole::OUTPUT_LEVEL_DEBUG, "console", aBuf);
+		return;
+	}
+
+	CChain *pChainInfo = new CChain();
+
+	// store info
+	pChainInfo->m_pfnChainCallback = pfnChainFunc;
+	pChainInfo->m_pUserData = pUser;
+	pChainInfo->m_pfnCallback = pCommand->m_pfnCallback;
+	pChainInfo->m_pCallbackUserData = pCommand->m_pUserData;
+
+	// chain
+	pCommand->m_pfnCallback = Con_Chain;
+	pCommand->m_pUserData = pChainInfo;
+}
+
+void CConsole::StoreCommands(bool Store)
+{
+	if(!Store)
+	{
+		for(CExecutionQueue::CQueueEntry *pEntry = m_ExecutionQueue.m_pFirst; pEntry; pEntry = pEntry->m_pNext)
+			pEntry->m_pCommand->m_pfnCallback(&pEntry->m_Result, pEntry->m_pCommand->m_pUserData);
+		m_ExecutionQueue.Reset();
+	}
+	m_StoreCommands = Store;
+}
+
+const IConsole::CCommandInfo *CConsole::GetCommandInfo(const char *pName, int FlagMask, bool Temp)
+{
+	for(CCommand *pCommand = m_pFirstCommand; pCommand; pCommand = pCommand->m_pNext)
+	{
+		if(pCommand->m_Flags & FlagMask && pCommand->m_Temp == Temp)
+		{
+			if(str_comp_nocase(pCommand->m_pName, pName) == 0)
+				return pCommand;
+		}
+	}
+
+	return 0;
+}
+
+std::unique_ptr<IConsole> CreateConsole(int FlagMask) { return std::make_unique<CConsole>(FlagMask); }
+
+int CConsole::CResult::GetVictim() const
+{
+	return m_Victim;
+}
+
+void CConsole::CResult::ResetVictim()
+{
+	m_Victim = VICTIM_NONE;
+}
+
+bool CConsole::CResult::HasVictim() const
+{
+	return m_Victim != VICTIM_NONE;
+}
+
+void CConsole::CResult::SetVictim(int Victim)
+{
+	m_Victim = clamp<int>(Victim, VICTIM_NONE, MAX_CLIENTS - 1);
+}
+
+void CConsole::CResult::SetVictim(const char *pVictim)
+{
+	if(!str_comp(pVictim, "me"))
+		m_Victim = VICTIM_ME;
+	else if(!str_comp(pVictim, "all"))
+		m_Victim = VICTIM_ALL;
+	else
+		m_Victim = clamp<int>(str_toint(pVictim), 0, MAX_CLIENTS - 1);
+}
diff --git a/src_bkp/engine/shared/console.h b/src_bkp/engine/shared/console.h
new file mode 100644
index 0000000000..339b521ce6
--- /dev/null
+++ b/src_bkp/engine/shared/console.h
@@ -0,0 +1,232 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_CONSOLE_H
+#define ENGINE_SHARED_CONSOLE_H
+
+#include "memheap.h"
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/console.h>
+#include <engine/storage.h>
+
+class CConsole : public IConsole
+{
+	class CCommand : public CCommandInfo
+	{
+	public:
+		CCommand *m_pNext;
+		int m_Flags;
+		bool m_Temp;
+		FCommandCallback m_pfnCallback;
+		void *m_pUserData;
+
+		const CCommandInfo *NextCommandInfo(int AccessLevel, int FlagMask) const override;
+
+		void SetAccessLevel(int AccessLevel) { m_AccessLevel = clamp(AccessLevel, (int)(ACCESS_LEVEL_ADMIN), (int)(ACCESS_LEVEL_USER)); }
+	};
+
+	class CChain
+	{
+	public:
+		FChainCommandCallback m_pfnChainCallback;
+		FCommandCallback m_pfnCallback;
+		void *m_pCallbackUserData;
+		void *m_pUserData;
+	};
+
+	int m_FlagMask;
+	bool m_StoreCommands;
+	const char *m_apStrokeStr[2];
+	CCommand *m_pFirstCommand;
+
+	class CExecFile
+	{
+	public:
+		const char *m_pFilename;
+		CExecFile *m_pPrev;
+	};
+
+	CExecFile *m_pFirstExec;
+	IStorage *m_pStorage;
+	int m_AccessLevel;
+
+	CCommand *m_pRecycleList;
+	CHeap m_TempCommands;
+
+	static void TraverseChain(FCommandCallback *ppfnCallback, void **ppUserData);
+
+	static void Con_Chain(IResult *pResult, void *pUserData);
+	static void Con_Echo(IResult *pResult, void *pUserData);
+	static void Con_Exec(IResult *pResult, void *pUserData);
+	static void ConCommandAccess(IResult *pResult, void *pUser);
+	static void ConCommandStatus(IConsole::IResult *pResult, void *pUser);
+
+	void ExecuteLineStroked(int Stroke, const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) override;
+
+	FTeeHistorianCommandCallback m_pfnTeeHistorianCommandCallback;
+	void *m_pTeeHistorianCommandUserdata;
+
+	FUnknownCommandCallback m_pfnUnknownCommandCallback = EmptyUnknownCommandCallback;
+	void *m_pUnknownCommandUserdata = nullptr;
+
+	enum
+	{
+		CONSOLE_MAX_STR_LENGTH = 8192,
+		MAX_PARTS = (CONSOLE_MAX_STR_LENGTH + 1) / 2
+	};
+
+	class CResult : public IResult
+	{
+	public:
+		char m_aStringStorage[CONSOLE_MAX_STR_LENGTH + 1];
+		char *m_pArgsStart;
+
+		const char *m_pCommand;
+		const char *m_apArgs[MAX_PARTS];
+
+		CResult()
+
+		{
+			mem_zero(m_aStringStorage, sizeof(m_aStringStorage));
+			m_pArgsStart = 0;
+			m_pCommand = 0;
+			mem_zero(m_apArgs, sizeof(m_apArgs));
+		}
+
+		CResult &operator=(const CResult &Other)
+		{
+			if(this != &Other)
+			{
+				IResult::operator=(Other);
+				mem_copy(m_aStringStorage, Other.m_aStringStorage, sizeof(m_aStringStorage));
+				m_pArgsStart = m_aStringStorage + (Other.m_pArgsStart - Other.m_aStringStorage);
+				m_pCommand = m_aStringStorage + (Other.m_pCommand - Other.m_aStringStorage);
+				for(unsigned i = 0; i < Other.m_NumArgs; ++i)
+					m_apArgs[i] = m_aStringStorage + (Other.m_apArgs[i] - Other.m_aStringStorage);
+			}
+			return *this;
+		}
+
+		void AddArgument(const char *pArg)
+		{
+			m_apArgs[m_NumArgs++] = pArg;
+		}
+
+		const char *GetString(unsigned Index) const override;
+		int GetInteger(unsigned Index) const override;
+		float GetFloat(unsigned Index) const override;
+		ColorHSLA GetColor(unsigned Index, bool Light) const override;
+
+		void RemoveArgument(unsigned Index) override
+		{
+			dbg_assert(Index < m_NumArgs, "invalid argument index");
+			for(unsigned i = Index; i < m_NumArgs - 1; i++)
+				m_apArgs[i] = m_apArgs[i + 1];
+
+			m_apArgs[m_NumArgs--] = 0;
+		}
+
+		// DDRace
+
+		enum
+		{
+			VICTIM_NONE = -3,
+			VICTIM_ME = -2,
+			VICTIM_ALL = -1,
+		};
+
+		int m_Victim;
+		void ResetVictim();
+		bool HasVictim() const;
+		void SetVictim(int Victim);
+		void SetVictim(const char *pVictim);
+		int GetVictim() const override;
+	};
+
+	int ParseStart(CResult *pResult, const char *pString, int Length);
+	int ParseArgs(CResult *pResult, const char *pFormat);
+
+	/*
+	this function will set pFormat to the next parameter (i,s,r,v,?) it contains and
+	return the parameter; descriptions in brackets like [file] will be skipped;
+	returns '\0' if there is no next parameter; expects pFormat to point at a
+	parameter
+	*/
+	char NextParam(const char *&pFormat);
+
+	class CExecutionQueue
+	{
+		CHeap m_Queue;
+
+	public:
+		struct CQueueEntry
+		{
+			CQueueEntry *m_pNext;
+			CCommand *m_pCommand;
+			CResult m_Result;
+		} * m_pFirst, *m_pLast;
+
+		void AddEntry()
+		{
+			CQueueEntry *pEntry = m_Queue.Allocate<CQueueEntry>();
+			pEntry->m_pNext = 0;
+			if(!m_pFirst)
+				m_pFirst = pEntry;
+			if(m_pLast)
+				m_pLast->m_pNext = pEntry;
+			m_pLast = pEntry;
+			(void)new(&(pEntry->m_Result)) CResult;
+		}
+		void Reset()
+		{
+			m_Queue.Reset();
+			m_pFirst = m_pLast = 0;
+		}
+	} m_ExecutionQueue;
+
+	void AddCommandSorted(CCommand *pCommand);
+	CCommand *FindCommand(const char *pName, int FlagMask);
+
+	bool m_Cheated;
+
+public:
+	CConsole(int FlagMask);
+	~CConsole();
+
+	void Init() override;
+	const CCommandInfo *FirstCommandInfo(int AccessLevel, int FlagMask) const override;
+	const CCommandInfo *GetCommandInfo(const char *pName, int FlagMask, bool Temp) override;
+	int PossibleCommands(const char *pStr, int FlagMask, bool Temp, FPossibleCallback pfnCallback, void *pUser) override;
+
+	void ParseArguments(int NumArgs, const char **ppArguments) override;
+	void Register(const char *pName, const char *pParams, int Flags, FCommandCallback pfnFunc, void *pUser, const char *pHelp) override;
+	void RegisterTemp(const char *pName, const char *pParams, int Flags, const char *pHelp) override;
+	void DeregisterTemp(const char *pName) override;
+	void DeregisterTempAll() override;
+	void Chain(const char *pName, FChainCommandCallback pfnChainFunc, void *pUser) override;
+	void StoreCommands(bool Store) override;
+
+	bool LineIsValid(const char *pStr) override;
+	void ExecuteLine(const char *pStr, int ClientID = -1, bool InterpretSemicolons = true) override;
+	void ExecuteLineFlag(const char *pStr, int FlagMask, int ClientID = -1, bool InterpretSemicolons = true) override;
+	bool ExecuteFile(const char *pFilename, int ClientID = -1, bool LogFailure = false, int StorageType = IStorage::TYPE_ALL) override;
+
+	char *Format(char *pBuf, int Size, const char *pFrom, const char *pStr) override;
+	void Print(int Level, const char *pFrom, const char *pStr, ColorRGBA PrintColor = gs_ConsoleDefaultColor) const override;
+	void SetTeeHistorianCommandCallback(FTeeHistorianCommandCallback pfnCallback, void *pUser) override;
+	void SetUnknownCommandCallback(FUnknownCommandCallback pfnCallback, void *pUser) override;
+	void InitChecksum(CChecksumData *pData) const override;
+
+	void SetAccessLevel(int AccessLevel) override { m_AccessLevel = clamp(AccessLevel, (int)(ACCESS_LEVEL_ADMIN), (int)(ACCESS_LEVEL_USER)); }
+
+	// DDRace
+
+	static void ConUserCommandStatus(IConsole::IResult *pResult, void *pUser);
+
+	bool Cheated() const override { return m_Cheated; }
+
+	int FlagMask() const override { return m_FlagMask; }
+	void SetFlagMask(int FlagMask) override { m_FlagMask = FlagMask; }
+};
+
+#endif
diff --git a/src_bkp/engine/shared/csv.cpp b/src_bkp/engine/shared/csv.cpp
new file mode 100644
index 0000000000..056091e8c8
--- /dev/null
+++ b/src_bkp/engine/shared/csv.cpp
@@ -0,0 +1,42 @@
+#include "csv.h"
+
+#include <base/system.h>
+
+void CsvWrite(IOHANDLE File, int NumColumns, const char *const *ppColumns)
+{
+	for(int i = 0; i < NumColumns; i++)
+	{
+		if(i != 0)
+		{
+			io_write(File, ",", 1);
+		}
+		const char *pColumn = ppColumns[i];
+		int ColumnLength = str_length(pColumn);
+		if(!str_find(pColumn, "\"") && !str_find(pColumn, ","))
+		{
+			io_write(File, pColumn, ColumnLength);
+			continue;
+		}
+
+		int Start = 0;
+		io_write(File, "\"", 1);
+		for(int j = 0; j < ColumnLength; j++)
+		{
+			if(pColumn[j] == '"')
+			{
+				if(Start != j)
+				{
+					io_write(File, pColumn + Start, j - Start);
+				}
+				Start = j + 1;
+				io_write(File, "\"\"", 2);
+			}
+		}
+		if(Start != ColumnLength)
+		{
+			io_write(File, pColumn + Start, ColumnLength - Start);
+		}
+		io_write(File, "\"", 1);
+	}
+	io_write_newline(File);
+}
diff --git a/src_bkp/engine/shared/csv.h b/src_bkp/engine/shared/csv.h
new file mode 100644
index 0000000000..0417e45488
--- /dev/null
+++ b/src_bkp/engine/shared/csv.h
@@ -0,0 +1,8 @@
+#ifndef ENGINE_SHARED_CSV_H
+#define ENGINE_SHARED_CSV_H
+
+#include <base/types.h>
+
+void CsvWrite(IOHANDLE File, int NumColumns, const char *const *ppColumns);
+
+#endif // ENGINE_SHARED_CSV_H
diff --git a/src_bkp/engine/shared/datafile.cpp b/src_bkp/engine/shared/datafile.cpp
new file mode 100644
index 0000000000..7714b4e77f
--- /dev/null
+++ b/src_bkp/engine/shared/datafile.cpp
@@ -0,0 +1,943 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "datafile.h"
+
+#include <base/hash_ctxt.h>
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/storage.h>
+
+#include "uuid_manager.h"
+
+#include <cstdlib>
+#include <limits>
+
+static const int DEBUG = 0;
+
+enum
+{
+	OFFSET_UUID_TYPE = 0x8000,
+};
+
+struct CItemEx
+{
+	int m_aUuid[sizeof(CUuid) / sizeof(int32_t)];
+
+	static CItemEx FromUuid(CUuid Uuid)
+	{
+		CItemEx Result;
+		for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+			Result.m_aUuid[i] = bytes_be_to_uint(&Uuid.m_aData[i * sizeof(int32_t)]);
+		return Result;
+	}
+
+	CUuid ToUuid() const
+	{
+		CUuid Result;
+		for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+			uint_to_bytes_be(&Result.m_aData[i * sizeof(int32_t)], m_aUuid[i]);
+		return Result;
+	}
+};
+
+struct CDatafileItemType
+{
+	int m_Type;
+	int m_Start;
+	int m_Num;
+};
+
+struct CDatafileItem
+{
+	int m_TypeAndID;
+	int m_Size;
+};
+
+struct CDatafileHeader
+{
+	char m_aID[4];
+	int m_Version;
+	int m_Size;
+	int m_Swaplen;
+	int m_NumItemTypes;
+	int m_NumItems;
+	int m_NumRawData;
+	int m_ItemSize;
+	int m_DataSize;
+
+	constexpr size_t SizeOffset()
+	{
+		// The size of these members is not included in m_Size and m_Swaplen
+		return sizeof(m_aID) + sizeof(m_Version) + sizeof(m_Size) + sizeof(m_Swaplen);
+	}
+};
+
+struct CDatafileInfo
+{
+	CDatafileItemType *m_pItemTypes;
+	int *m_pItemOffsets;
+	int *m_pDataOffsets;
+	int *m_pDataSizes;
+
+	char *m_pItemStart;
+	char *m_pDataStart;
+};
+
+struct CDatafile
+{
+	IOHANDLE m_File;
+	SHA256_DIGEST m_Sha256;
+	unsigned m_Crc;
+	CDatafileInfo m_Info;
+	CDatafileHeader m_Header;
+	int m_DataStartOffset;
+	char **m_ppDataPtrs;
+	int *m_pDataSizes;
+	char *m_pData;
+};
+
+bool CDataFileReader::Open(class IStorage *pStorage, const char *pFilename, int StorageType)
+{
+	log_trace("datafile", "loading. filename='%s'", pFilename);
+
+	IOHANDLE File = pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType);
+	if(!File)
+	{
+		dbg_msg("datafile", "could not open '%s'", pFilename);
+		return false;
+	}
+
+	// take the CRC of the file and store it
+	unsigned Crc = 0;
+	SHA256_DIGEST Sha256;
+	{
+		enum
+		{
+			BUFFER_SIZE = 64 * 1024
+		};
+
+		SHA256_CTX Sha256Ctxt;
+		sha256_init(&Sha256Ctxt);
+		unsigned char aBuffer[BUFFER_SIZE];
+
+		while(true)
+		{
+			unsigned Bytes = io_read(File, aBuffer, BUFFER_SIZE);
+			if(Bytes == 0)
+				break;
+			Crc = crc32(Crc, aBuffer, Bytes);
+			sha256_update(&Sha256Ctxt, aBuffer, Bytes);
+		}
+		Sha256 = sha256_finish(&Sha256Ctxt);
+
+		io_seek(File, 0, IOSEEK_START);
+	}
+
+	// TODO: change this header
+	CDatafileHeader Header;
+	if(sizeof(Header) != io_read(File, &Header, sizeof(Header)))
+	{
+		dbg_msg("datafile", "couldn't load header");
+		return false;
+	}
+	if(Header.m_aID[0] != 'A' || Header.m_aID[1] != 'T' || Header.m_aID[2] != 'A' || Header.m_aID[3] != 'D')
+	{
+		if(Header.m_aID[0] != 'D' || Header.m_aID[1] != 'A' || Header.m_aID[2] != 'T' || Header.m_aID[3] != 'A')
+		{
+			dbg_msg("datafile", "wrong signature. %x %x %x %x", Header.m_aID[0], Header.m_aID[1], Header.m_aID[2], Header.m_aID[3]);
+			return false;
+		}
+	}
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+	swap_endian(&Header, sizeof(int), sizeof(Header) / sizeof(int));
+#endif
+	if(Header.m_Version != 3 && Header.m_Version != 4)
+	{
+		dbg_msg("datafile", "wrong version. version=%x", Header.m_Version);
+		return false;
+	}
+
+	// read in the rest except the data
+	unsigned Size = 0;
+	Size += Header.m_NumItemTypes * sizeof(CDatafileItemType);
+	Size += (Header.m_NumItems + Header.m_NumRawData) * sizeof(int);
+	if(Header.m_Version == 4)
+		Size += Header.m_NumRawData * sizeof(int); // v4 has uncompressed data sizes as well
+	Size += Header.m_ItemSize;
+
+	unsigned AllocSize = Size;
+	AllocSize += sizeof(CDatafile); // add space for info structure
+	AllocSize += Header.m_NumRawData * sizeof(void *); // add space for data pointers
+	AllocSize += Header.m_NumRawData * sizeof(int); // add space for data sizes
+	if(Size > (((int64_t)1) << 31) || Header.m_NumItemTypes < 0 || Header.m_NumItems < 0 || Header.m_NumRawData < 0 || Header.m_ItemSize < 0)
+	{
+		io_close(File);
+		dbg_msg("datafile", "unable to load file, invalid file information");
+		return false;
+	}
+
+	CDatafile *pTmpDataFile = (CDatafile *)malloc(AllocSize);
+	pTmpDataFile->m_Header = Header;
+	pTmpDataFile->m_DataStartOffset = sizeof(CDatafileHeader) + Size;
+	pTmpDataFile->m_ppDataPtrs = (char **)(pTmpDataFile + 1);
+	pTmpDataFile->m_pDataSizes = (int *)(pTmpDataFile->m_ppDataPtrs + Header.m_NumRawData);
+	pTmpDataFile->m_pData = (char *)(pTmpDataFile->m_pDataSizes + Header.m_NumRawData);
+	pTmpDataFile->m_File = File;
+	pTmpDataFile->m_Sha256 = Sha256;
+	pTmpDataFile->m_Crc = Crc;
+
+	// clear the data pointers and sizes
+	mem_zero(pTmpDataFile->m_ppDataPtrs, Header.m_NumRawData * sizeof(void *));
+	mem_zero(pTmpDataFile->m_pDataSizes, Header.m_NumRawData * sizeof(int));
+
+	// read types, offsets, sizes and item data
+	unsigned ReadSize = io_read(File, pTmpDataFile->m_pData, Size);
+	if(ReadSize != Size)
+	{
+		io_close(pTmpDataFile->m_File);
+		free(pTmpDataFile);
+		dbg_msg("datafile", "couldn't load the whole thing, wanted=%d got=%d", Size, ReadSize);
+		return false;
+	}
+
+	Close();
+	m_pDataFile = pTmpDataFile;
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+	swap_endian(m_pDataFile->m_pData, sizeof(int), minimum(static_cast<unsigned>(Header.m_Swaplen), Size) / sizeof(int));
+#endif
+
+	if(DEBUG)
+	{
+		dbg_msg("datafile", "allocsize=%d", AllocSize);
+		dbg_msg("datafile", "readsize=%d", ReadSize);
+		dbg_msg("datafile", "swaplen=%d", Header.m_Swaplen);
+		dbg_msg("datafile", "item_size=%d", m_pDataFile->m_Header.m_ItemSize);
+	}
+
+	m_pDataFile->m_Info.m_pItemTypes = (CDatafileItemType *)m_pDataFile->m_pData;
+	m_pDataFile->m_Info.m_pItemOffsets = (int *)&m_pDataFile->m_Info.m_pItemTypes[m_pDataFile->m_Header.m_NumItemTypes];
+	m_pDataFile->m_Info.m_pDataOffsets = &m_pDataFile->m_Info.m_pItemOffsets[m_pDataFile->m_Header.m_NumItems];
+	m_pDataFile->m_Info.m_pDataSizes = &m_pDataFile->m_Info.m_pDataOffsets[m_pDataFile->m_Header.m_NumRawData];
+
+	if(Header.m_Version == 4)
+		m_pDataFile->m_Info.m_pItemStart = (char *)&m_pDataFile->m_Info.m_pDataSizes[m_pDataFile->m_Header.m_NumRawData];
+	else
+		m_pDataFile->m_Info.m_pItemStart = (char *)&m_pDataFile->m_Info.m_pDataOffsets[m_pDataFile->m_Header.m_NumRawData];
+	m_pDataFile->m_Info.m_pDataStart = m_pDataFile->m_Info.m_pItemStart + m_pDataFile->m_Header.m_ItemSize;
+
+	log_trace("datafile", "loading done. datafile='%s'", pFilename);
+
+	return true;
+}
+
+bool CDataFileReader::Close()
+{
+	if(!m_pDataFile)
+		return true;
+
+	// free the data that is loaded
+	for(int i = 0; i < m_pDataFile->m_Header.m_NumRawData; i++)
+	{
+		free(m_pDataFile->m_ppDataPtrs[i]);
+		m_pDataFile->m_ppDataPtrs[i] = nullptr;
+		m_pDataFile->m_pDataSizes[i] = 0;
+	}
+
+	io_close(m_pDataFile->m_File);
+	free(m_pDataFile);
+	m_pDataFile = nullptr;
+	return true;
+}
+
+IOHANDLE CDataFileReader::File() const
+{
+	if(!m_pDataFile)
+		return 0;
+	return m_pDataFile->m_File;
+}
+
+int CDataFileReader::NumData() const
+{
+	if(!m_pDataFile)
+	{
+		return 0;
+	}
+	return m_pDataFile->m_Header.m_NumRawData;
+}
+
+// returns the size in the file
+int CDataFileReader::GetFileDataSize(int Index) const
+{
+	if(!m_pDataFile)
+	{
+		return 0;
+	}
+
+	if(Index == m_pDataFile->m_Header.m_NumRawData - 1)
+		return m_pDataFile->m_Header.m_DataSize - m_pDataFile->m_Info.m_pDataOffsets[Index];
+
+	return m_pDataFile->m_Info.m_pDataOffsets[Index + 1] - m_pDataFile->m_Info.m_pDataOffsets[Index];
+}
+
+// returns the size of the resulting data
+int CDataFileReader::GetDataSize(int Index) const
+{
+	if(!m_pDataFile || Index < 0 || Index >= m_pDataFile->m_Header.m_NumRawData)
+	{
+		return 0;
+	}
+
+	if(!m_pDataFile->m_ppDataPtrs[Index])
+	{
+		if(m_pDataFile->m_Header.m_Version >= 4)
+		{
+			return m_pDataFile->m_Info.m_pDataSizes[Index];
+		}
+		else
+		{
+			return GetFileDataSize(Index);
+		}
+	}
+	const int Size = m_pDataFile->m_pDataSizes[Index];
+	if(Size < 0)
+		return 0; // summarize all errors as zero size
+	return Size;
+}
+
+void *CDataFileReader::GetDataImpl(int Index, bool Swap)
+{
+	if(!m_pDataFile)
+	{
+		return nullptr;
+	}
+
+	if(Index < 0 || Index >= m_pDataFile->m_Header.m_NumRawData)
+		return nullptr;
+
+	// load it if needed
+	if(!m_pDataFile->m_ppDataPtrs[Index])
+	{
+		// don't try to load again if it previously failed
+		if(m_pDataFile->m_pDataSizes[Index] < 0)
+			return nullptr;
+
+		// fetch the data size
+		unsigned DataSize = GetFileDataSize(Index);
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		unsigned SwapSize = DataSize;
+#endif
+
+		if(m_pDataFile->m_Header.m_Version == 4)
+		{
+			// v4 has compressed data
+			const unsigned OriginalUncompressedSize = m_pDataFile->m_Info.m_pDataSizes[Index];
+			unsigned long UncompressedSize = OriginalUncompressedSize;
+
+			log_trace("datafile", "loading data. index=%d size=%u uncompressed=%u", Index, DataSize, OriginalUncompressedSize);
+
+			// read the compressed data
+			void *pCompressedData = malloc(DataSize);
+			unsigned ActualDataSize = 0;
+			if(io_seek(m_pDataFile->m_File, m_pDataFile->m_DataStartOffset + m_pDataFile->m_Info.m_pDataOffsets[Index], IOSEEK_START) == 0)
+				ActualDataSize = io_read(m_pDataFile->m_File, pCompressedData, DataSize);
+			if(DataSize != ActualDataSize)
+			{
+				log_error("datafile", "truncation error, could not read all data. index=%d wanted=%u got=%u", Index, DataSize, ActualDataSize);
+				free(pCompressedData);
+				m_pDataFile->m_ppDataPtrs[Index] = nullptr;
+				m_pDataFile->m_pDataSizes[Index] = -1;
+				return nullptr;
+			}
+
+			// decompress the data
+			m_pDataFile->m_ppDataPtrs[Index] = (char *)malloc(UncompressedSize);
+			m_pDataFile->m_pDataSizes[Index] = UncompressedSize;
+			const int Result = uncompress((Bytef *)m_pDataFile->m_ppDataPtrs[Index], &UncompressedSize, (Bytef *)pCompressedData, DataSize);
+			free(pCompressedData);
+			if(Result != Z_OK || UncompressedSize != OriginalUncompressedSize)
+			{
+				log_error("datafile", "uncompress error. result=%d wanted=%u got=%lu", Result, OriginalUncompressedSize, UncompressedSize);
+				free(m_pDataFile->m_ppDataPtrs[Index]);
+				m_pDataFile->m_ppDataPtrs[Index] = nullptr;
+				m_pDataFile->m_pDataSizes[Index] = -1;
+				return nullptr;
+			}
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+			SwapSize = UncompressedSize;
+#endif
+		}
+		else
+		{
+			// load the data
+			log_trace("datafile", "loading data. index=%d size=%d", Index, DataSize);
+			m_pDataFile->m_ppDataPtrs[Index] = static_cast<char *>(malloc(DataSize));
+			m_pDataFile->m_pDataSizes[Index] = DataSize;
+			unsigned ActualDataSize = 0;
+			if(io_seek(m_pDataFile->m_File, m_pDataFile->m_DataStartOffset + m_pDataFile->m_Info.m_pDataOffsets[Index], IOSEEK_START) == 0)
+				ActualDataSize = io_read(m_pDataFile->m_File, m_pDataFile->m_ppDataPtrs[Index], DataSize);
+			if(DataSize != ActualDataSize)
+			{
+				log_error("datafile", "truncation error, could not read all data. index=%d wanted=%u got=%u", Index, DataSize, ActualDataSize);
+				free(m_pDataFile->m_ppDataPtrs[Index]);
+				m_pDataFile->m_ppDataPtrs[Index] = nullptr;
+				m_pDataFile->m_pDataSizes[Index] = -1;
+				return nullptr;
+			}
+		}
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		if(Swap && SwapSize)
+			swap_endian(m_pDataFile->m_ppDataPtrs[Index], sizeof(int), SwapSize / sizeof(int));
+#endif
+	}
+
+	return m_pDataFile->m_ppDataPtrs[Index];
+}
+
+void *CDataFileReader::GetData(int Index)
+{
+	return GetDataImpl(Index, false);
+}
+
+void *CDataFileReader::GetDataSwapped(int Index)
+{
+	return GetDataImpl(Index, true);
+}
+
+const char *CDataFileReader::GetDataString(int Index)
+{
+	if(Index == -1)
+		return "";
+	const int DataSize = GetDataSize(Index);
+	if(!DataSize)
+		return nullptr;
+	const char *pData = static_cast<char *>(GetData(Index));
+	if(pData == nullptr || mem_has_null(pData, DataSize - 1) || pData[DataSize - 1] != '\0' || !str_utf8_check(pData))
+		return nullptr;
+	return pData;
+}
+
+void CDataFileReader::ReplaceData(int Index, char *pData, size_t Size)
+{
+	dbg_assert(Index >= 0 && Index < m_pDataFile->m_Header.m_NumRawData, "Index invalid");
+
+	free(m_pDataFile->m_ppDataPtrs[Index]);
+	m_pDataFile->m_ppDataPtrs[Index] = pData;
+	m_pDataFile->m_pDataSizes[Index] = Size;
+}
+
+void CDataFileReader::UnloadData(int Index)
+{
+	if(Index < 0 || Index >= m_pDataFile->m_Header.m_NumRawData)
+		return;
+
+	free(m_pDataFile->m_ppDataPtrs[Index]);
+	m_pDataFile->m_ppDataPtrs[Index] = nullptr;
+	m_pDataFile->m_pDataSizes[Index] = 0;
+}
+
+int CDataFileReader::GetItemSize(int Index) const
+{
+	if(!m_pDataFile)
+		return 0;
+	if(Index == m_pDataFile->m_Header.m_NumItems - 1)
+		return m_pDataFile->m_Header.m_ItemSize - m_pDataFile->m_Info.m_pItemOffsets[Index] - sizeof(CDatafileItem);
+	return m_pDataFile->m_Info.m_pItemOffsets[Index + 1] - m_pDataFile->m_Info.m_pItemOffsets[Index] - sizeof(CDatafileItem);
+}
+
+int CDataFileReader::GetExternalItemType(int InternalType)
+{
+	if(InternalType <= OFFSET_UUID_TYPE || InternalType == ITEMTYPE_EX)
+	{
+		return InternalType;
+	}
+	int TypeIndex = FindItemIndex(ITEMTYPE_EX, InternalType);
+	if(TypeIndex < 0 || GetItemSize(TypeIndex) < (int)sizeof(CItemEx))
+	{
+		return InternalType;
+	}
+	const CItemEx *pItemEx = (const CItemEx *)GetItem(TypeIndex);
+	// Propagate UUID_UNKNOWN, it doesn't hurt.
+	return g_UuidManager.LookupUuid(pItemEx->ToUuid());
+}
+
+int CDataFileReader::GetInternalItemType(int ExternalType)
+{
+	if(ExternalType < OFFSET_UUID)
+	{
+		return ExternalType;
+	}
+	CUuid Uuid = g_UuidManager.GetUuid(ExternalType);
+	int Start, Num;
+	GetType(ITEMTYPE_EX, &Start, &Num);
+	for(int i = Start; i < Start + Num; i++)
+	{
+		if(GetItemSize(i) < (int)sizeof(CItemEx))
+		{
+			continue;
+		}
+		int ID;
+		if(Uuid == ((const CItemEx *)GetItem(i, nullptr, &ID))->ToUuid())
+		{
+			return ID;
+		}
+	}
+	return -1;
+}
+
+void *CDataFileReader::GetItem(int Index, int *pType, int *pID)
+{
+	if(!m_pDataFile)
+	{
+		if(pType)
+			*pType = 0;
+		if(pID)
+			*pID = 0;
+		return nullptr;
+	}
+
+	CDatafileItem *pItem = (CDatafileItem *)(m_pDataFile->m_Info.m_pItemStart + m_pDataFile->m_Info.m_pItemOffsets[Index]);
+	if(pType)
+	{
+		// remove sign extension
+		*pType = GetExternalItemType((pItem->m_TypeAndID >> 16) & 0xffff);
+	}
+	if(pID)
+	{
+		*pID = pItem->m_TypeAndID & 0xffff;
+	}
+	return (void *)(pItem + 1);
+}
+
+void CDataFileReader::GetType(int Type, int *pStart, int *pNum)
+{
+	*pStart = 0;
+	*pNum = 0;
+
+	if(!m_pDataFile)
+		return;
+
+	Type = GetInternalItemType(Type);
+	for(int i = 0; i < m_pDataFile->m_Header.m_NumItemTypes; i++)
+	{
+		if(m_pDataFile->m_Info.m_pItemTypes[i].m_Type == Type)
+		{
+			*pStart = m_pDataFile->m_Info.m_pItemTypes[i].m_Start;
+			*pNum = m_pDataFile->m_Info.m_pItemTypes[i].m_Num;
+			return;
+		}
+	}
+}
+
+int CDataFileReader::FindItemIndex(int Type, int ID)
+{
+	if(!m_pDataFile)
+	{
+		return -1;
+	}
+
+	int Start, Num;
+	GetType(Type, &Start, &Num);
+	for(int i = 0; i < Num; i++)
+	{
+		int ItemID;
+		GetItem(Start + i, nullptr, &ItemID);
+		if(ID == ItemID)
+		{
+			return Start + i;
+		}
+	}
+	return -1;
+}
+
+void *CDataFileReader::FindItem(int Type, int ID)
+{
+	int Index = FindItemIndex(Type, ID);
+	if(Index < 0)
+	{
+		return nullptr;
+	}
+	return GetItem(Index);
+}
+
+int CDataFileReader::NumItems() const
+{
+	if(!m_pDataFile)
+		return 0;
+	return m_pDataFile->m_Header.m_NumItems;
+}
+
+SHA256_DIGEST CDataFileReader::Sha256() const
+{
+	if(!m_pDataFile)
+	{
+		SHA256_DIGEST Result;
+		for(unsigned char &d : Result.data)
+		{
+			d = 0xff;
+		}
+		return Result;
+	}
+	return m_pDataFile->m_Sha256;
+}
+
+unsigned CDataFileReader::Crc() const
+{
+	if(!m_pDataFile)
+		return 0xFFFFFFFF;
+	return m_pDataFile->m_Crc;
+}
+
+int CDataFileReader::MapSize() const
+{
+	if(!m_pDataFile)
+		return 0;
+	return m_pDataFile->m_Header.m_Size + m_pDataFile->m_Header.SizeOffset();
+}
+
+CDataFileWriter::CDataFileWriter()
+{
+	m_File = 0;
+	for(CItemTypeInfo &ItemTypeInfo : m_aItemTypes)
+	{
+		ItemTypeInfo.m_Num = 0;
+		ItemTypeInfo.m_First = -1;
+		ItemTypeInfo.m_Last = -1;
+	}
+}
+
+CDataFileWriter::~CDataFileWriter()
+{
+	if(m_File)
+	{
+		io_close(m_File);
+		m_File = 0;
+	}
+
+	for(CItemInfo &ItemInfo : m_vItems)
+	{
+		free(ItemInfo.m_pData);
+	}
+
+	for(CDataInfo &DataInfo : m_vDatas)
+	{
+		free(DataInfo.m_pUncompressedData);
+		free(DataInfo.m_pCompressedData);
+	}
+}
+
+bool CDataFileWriter::Open(class IStorage *pStorage, const char *pFilename, int StorageType)
+{
+	dbg_assert(!m_File, "File already open");
+	m_File = pStorage->OpenFile(pFilename, IOFLAG_WRITE, StorageType);
+	return m_File != 0;
+}
+
+int CDataFileWriter::GetTypeFromIndex(int Index) const
+{
+	return ITEMTYPE_EX - Index - 1;
+}
+
+int CDataFileWriter::GetExtendedItemTypeIndex(int Type)
+{
+	int Index = 0;
+	for(int ExtendedItemType : m_vExtendedItemTypes)
+	{
+		if(ExtendedItemType == Type)
+			return Index;
+		++Index;
+	}
+
+	// Type not found, add it.
+	m_vExtendedItemTypes.push_back(Type);
+
+	CItemEx ExtendedType = CItemEx::FromUuid(g_UuidManager.GetUuid(Type));
+	AddItem(ITEMTYPE_EX, GetTypeFromIndex(Index), sizeof(ExtendedType), &ExtendedType);
+	return Index;
+}
+
+int CDataFileWriter::AddItem(int Type, int ID, size_t Size, const void *pData)
+{
+	dbg_assert((Type >= 0 && Type < MAX_ITEM_TYPES) || Type >= OFFSET_UUID, "Invalid type");
+	dbg_assert(ID >= 0 && ID <= ITEMTYPE_EX, "Invalid ID");
+	dbg_assert(Size == 0 || pData != nullptr, "Data missing"); // Items without data are allowed
+	dbg_assert(Size <= (size_t)std::numeric_limits<int>::max(), "Data too large");
+	dbg_assert(Size % sizeof(int) == 0, "Invalid data boundary");
+
+	if(Type >= OFFSET_UUID)
+	{
+		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type));
+	}
+
+	const int NumItems = m_vItems.size();
+	m_vItems.emplace_back();
+	CItemInfo &Info = m_vItems.back();
+	Info.m_Type = Type;
+	Info.m_ID = ID;
+	Info.m_Size = Size;
+
+	// copy data
+	if(Size > 0)
+	{
+		Info.m_pData = malloc(Size);
+		mem_copy(Info.m_pData, pData, Size);
+	}
+	else
+		Info.m_pData = nullptr;
+
+	// link
+	Info.m_Prev = m_aItemTypes[Type].m_Last;
+	Info.m_Next = -1;
+
+	if(m_aItemTypes[Type].m_Last != -1)
+		m_vItems[m_aItemTypes[Type].m_Last].m_Next = NumItems;
+	m_aItemTypes[Type].m_Last = NumItems;
+
+	if(m_aItemTypes[Type].m_First == -1)
+		m_aItemTypes[Type].m_First = NumItems;
+
+	m_aItemTypes[Type].m_Num++;
+	return NumItems;
+}
+
+int CDataFileWriter::AddData(size_t Size, const void *pData, int CompressionLevel)
+{
+	dbg_assert(Size > 0 && pData != nullptr, "Data missing");
+	dbg_assert(Size <= (size_t)std::numeric_limits<int>::max(), "Data too large");
+
+	m_vDatas.emplace_back();
+	CDataInfo &Info = m_vDatas.back();
+	Info.m_pUncompressedData = malloc(Size);
+	mem_copy(Info.m_pUncompressedData, pData, Size);
+	Info.m_UncompressedSize = Size;
+	Info.m_pCompressedData = nullptr;
+	Info.m_CompressedSize = 0;
+	Info.m_CompressionLevel = CompressionLevel;
+
+	return m_vDatas.size() - 1;
+}
+
+int CDataFileWriter::AddDataSwapped(size_t Size, const void *pData)
+{
+	dbg_assert(Size > 0 && pData != nullptr, "Data missing");
+	dbg_assert(Size <= (size_t)std::numeric_limits<int>::max(), "Data too large");
+	dbg_assert(Size % sizeof(int) == 0, "Invalid data boundary");
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+	void *pSwapped = malloc(Size); // temporary buffer that we use during compression
+	mem_copy(pSwapped, pData, Size);
+	swap_endian(pSwapped, sizeof(int), Size / sizeof(int));
+	int Index = AddData(Size, pSwapped);
+	free(pSwapped);
+	return Index;
+#else
+	return AddData(Size, pData);
+#endif
+}
+
+int CDataFileWriter::AddDataString(const char *pStr)
+{
+	dbg_assert(pStr != nullptr, "Data missing");
+
+	if(pStr[0] == '\0')
+		return -1;
+	return AddData(str_length(pStr) + 1, pStr);
+}
+
+void CDataFileWriter::Finish()
+{
+	dbg_assert((bool)m_File, "File not open");
+
+	// Compress data. This takes the majority of the time when saving a datafile,
+	// so it's delayed until the end so it can be off-loaded to another thread.
+	for(CDataInfo &DataInfo : m_vDatas)
+	{
+		unsigned long CompressedSize = compressBound(DataInfo.m_UncompressedSize);
+		DataInfo.m_pCompressedData = malloc(CompressedSize);
+		const int Result = compress2((Bytef *)DataInfo.m_pCompressedData, &CompressedSize, (Bytef *)DataInfo.m_pUncompressedData, DataInfo.m_UncompressedSize, DataInfo.m_CompressionLevel);
+		DataInfo.m_CompressedSize = CompressedSize;
+		free(DataInfo.m_pUncompressedData);
+		DataInfo.m_pUncompressedData = nullptr;
+		if(Result != Z_OK)
+		{
+			char aError[32];
+			str_format(aError, sizeof(aError), "zlib compression error %d", Result);
+			dbg_assert(false, aError);
+		}
+	}
+
+	// Calculate total size of items
+	size_t ItemSize = 0;
+	for(const CItemInfo &ItemInfo : m_vItems)
+	{
+		ItemSize += ItemInfo.m_Size;
+		ItemSize += sizeof(CDatafileItem);
+	}
+
+	// Calculate total size of data
+	size_t DataSize = 0;
+	for(const CDataInfo &DataInfo : m_vDatas)
+		DataSize += DataInfo.m_CompressedSize;
+
+	// Count number of item types
+	int NumItemTypes = 0;
+	for(const CItemTypeInfo &ItemType : m_aItemTypes)
+	{
+		if(ItemType.m_Num > 0)
+			++NumItemTypes;
+	}
+
+	// Calculate complete file size
+	const size_t TypesSize = NumItemTypes * sizeof(CDatafileItemType);
+	const size_t HeaderSize = sizeof(CDatafileHeader);
+	const size_t OffsetSize = (m_vItems.size() + m_vDatas.size() * 2) * sizeof(int); // ItemOffsets, DataOffsets, DataUncompressedSizes
+	const size_t SwapSize = HeaderSize + TypesSize + OffsetSize + ItemSize;
+	const size_t FileSize = SwapSize + DataSize;
+
+	if(DEBUG)
+		dbg_msg("datafile", "NumItemTypes=%d TypesSize=%" PRIzu " ItemSize=%" PRIzu " DataSize=%" PRIzu, NumItemTypes, TypesSize, ItemSize, DataSize);
+
+	// This also ensures that SwapSize, ItemSize and DataSize are valid.
+	dbg_assert(FileSize <= (size_t)std::numeric_limits<int>::max(), "File size too large");
+
+	// Construct and write header
+	{
+		CDatafileHeader Header;
+		Header.m_aID[0] = 'D';
+		Header.m_aID[1] = 'A';
+		Header.m_aID[2] = 'T';
+		Header.m_aID[3] = 'A';
+		Header.m_Version = 4;
+		Header.m_Size = FileSize - Header.SizeOffset();
+		Header.m_Swaplen = SwapSize - Header.SizeOffset();
+		Header.m_NumItemTypes = NumItemTypes;
+		Header.m_NumItems = m_vItems.size();
+		Header.m_NumRawData = m_vDatas.size();
+		Header.m_ItemSize = ItemSize;
+		Header.m_DataSize = DataSize;
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		swap_endian(&Header, sizeof(int), sizeof(Header) / sizeof(int));
+#endif
+		io_write(m_File, &Header, sizeof(Header));
+	}
+
+	// Write item types
+	for(int Type = 0, Count = 0; Type < (int)m_aItemTypes.size(); ++Type)
+	{
+		if(!m_aItemTypes[Type].m_Num)
+			continue;
+
+		CDatafileItemType Info;
+		Info.m_Type = Type;
+		Info.m_Start = Count;
+		Info.m_Num = m_aItemTypes[Type].m_Num;
+
+		if(DEBUG)
+			dbg_msg("datafile", "writing item type. Type=%x Start=%d Num=%d", Info.m_Type, Info.m_Start, Info.m_Num);
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		swap_endian(&Info, sizeof(int), sizeof(CDatafileItemType) / sizeof(int));
+#endif
+		io_write(m_File, &Info, sizeof(Info));
+		Count += m_aItemTypes[Type].m_Num;
+	}
+
+	// Write item offsets sorted by type
+	for(int Type = 0, Offset = 0; Type < (int)m_aItemTypes.size(); Type++)
+	{
+		// Write all items offsets of this type
+		for(int ItemIndex = m_aItemTypes[Type].m_First; ItemIndex != -1; ItemIndex = m_vItems[ItemIndex].m_Next)
+		{
+			if(DEBUG)
+				dbg_msg("datafile", "writing item offset. Type=%d ItemIndex=%d Offset=%d", Type, ItemIndex, Offset);
+
+			int Temp = Offset;
+#if defined(CONF_ARCH_ENDIAN_BIG)
+			swap_endian(&Temp, sizeof(int), sizeof(Temp) / sizeof(int));
+#endif
+			io_write(m_File, &Temp, sizeof(Temp));
+			Offset += m_vItems[ItemIndex].m_Size + sizeof(CDatafileItem);
+		}
+	}
+
+	// Write data offsets
+	int Offset = 0, DataIndex = 0;
+	for(const CDataInfo &DataInfo : m_vDatas)
+	{
+		if(DEBUG)
+			dbg_msg("datafile", "writing data offset. DataIndex=%d Offset=%d", DataIndex, Offset);
+
+		int Temp = Offset;
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		swap_endian(&Temp, sizeof(int), sizeof(Temp) / sizeof(int));
+#endif
+		io_write(m_File, &Temp, sizeof(Temp));
+		Offset += DataInfo.m_CompressedSize;
+		++DataIndex;
+	}
+
+	// Write data uncompressed sizes
+	DataIndex = 0;
+	for(const CDataInfo &DataInfo : m_vDatas)
+	{
+		if(DEBUG)
+			dbg_msg("datafile", "writing data uncompressed size. DataIndex=%d UncompressedSize=%d", DataIndex, DataInfo.m_UncompressedSize);
+
+		int UncompressedSize = DataInfo.m_UncompressedSize;
+#if defined(CONF_ARCH_ENDIAN_BIG)
+		swap_endian(&UncompressedSize, sizeof(int), sizeof(UncompressedSize) / sizeof(int));
+#endif
+		io_write(m_File, &UncompressedSize, sizeof(UncompressedSize));
+		++DataIndex;
+	}
+
+	// Write items sorted by type
+	for(int Type = 0; Type < (int)m_aItemTypes.size(); ++Type)
+	{
+		// Write all items of this type
+		for(int ItemIndex = m_aItemTypes[Type].m_First; ItemIndex != -1; ItemIndex = m_vItems[ItemIndex].m_Next)
+		{
+			CDatafileItem Item;
+			Item.m_TypeAndID = (Type << 16) | m_vItems[ItemIndex].m_ID;
+			Item.m_Size = m_vItems[ItemIndex].m_Size;
+
+			if(DEBUG)
+				dbg_msg("datafile", "writing item. Type=%x ItemIndex=%d ID=%d Size=%d", Type, ItemIndex, m_vItems[ItemIndex].m_ID, m_vItems[ItemIndex].m_Size);
+
+#if defined(CONF_ARCH_ENDIAN_BIG)
+			swap_endian(&Item, sizeof(int), sizeof(Item) / sizeof(int));
+			if(m_vItems[ItemIndex].m_pData != nullptr)
+				swap_endian(m_vItems[ItemIndex].m_pData, sizeof(int), m_vItems[ItemIndex].m_Size / sizeof(int));
+#endif
+			io_write(m_File, &Item, sizeof(Item));
+			if(m_vItems[ItemIndex].m_pData != nullptr)
+			{
+				io_write(m_File, m_vItems[ItemIndex].m_pData, m_vItems[ItemIndex].m_Size);
+				free(m_vItems[ItemIndex].m_pData);
+				m_vItems[ItemIndex].m_pData = nullptr;
+			}
+		}
+	}
+
+	// Write data
+	DataIndex = 0;
+	for(CDataInfo &DataInfo : m_vDatas)
+	{
+		if(DEBUG)
+			dbg_msg("datafile", "writing data. DataIndex=%d CompressedSize=%d", DataIndex, DataInfo.m_CompressedSize);
+
+		io_write(m_File, DataInfo.m_pCompressedData, DataInfo.m_CompressedSize);
+		free(DataInfo.m_pCompressedData);
+		DataInfo.m_pCompressedData = nullptr;
+		++DataIndex;
+	}
+
+	io_close(m_File);
+	m_File = 0;
+}
diff --git a/src_bkp/engine/shared/datafile.h b/src_bkp/engine/shared/datafile.h
new file mode 100644
index 0000000000..db77ca41e4
--- /dev/null
+++ b/src_bkp/engine/shared/datafile.h
@@ -0,0 +1,132 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_DATAFILE_H
+#define ENGINE_SHARED_DATAFILE_H
+
+#include <engine/storage.h>
+
+#include <base/hash.h>
+#include <base/types.h>
+
+#include <array>
+#include <vector>
+
+#include <zlib.h>
+
+enum
+{
+	ITEMTYPE_EX = 0xffff,
+};
+
+// raw datafile access
+class CDataFileReader
+{
+	struct CDatafile *m_pDataFile;
+	void *GetDataImpl(int Index, bool Swap);
+	int GetFileDataSize(int Index) const;
+
+	int GetExternalItemType(int InternalType);
+	int GetInternalItemType(int ExternalType);
+
+public:
+	CDataFileReader() :
+		m_pDataFile(nullptr) {}
+	~CDataFileReader() { Close(); }
+
+	CDataFileReader &operator=(CDataFileReader &&Other)
+	{
+		m_pDataFile = Other.m_pDataFile;
+		Other.m_pDataFile = nullptr;
+		return *this;
+	}
+
+	bool Open(class IStorage *pStorage, const char *pFilename, int StorageType);
+	bool Close();
+	bool IsOpen() const { return m_pDataFile != nullptr; }
+	IOHANDLE File() const;
+
+	int GetDataSize(int Index) const;
+	void *GetData(int Index);
+	void *GetDataSwapped(int Index); // makes sure that the data is 32bit LE ints when saved
+	const char *GetDataString(int Index);
+	void ReplaceData(int Index, char *pData, size_t Size); // memory for data must have been allocated with malloc
+	void UnloadData(int Index);
+	int NumData() const;
+
+	int GetItemSize(int Index) const;
+	void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr);
+	void GetType(int Type, int *pStart, int *pNum);
+	int FindItemIndex(int Type, int ID);
+	void *FindItem(int Type, int ID);
+	int NumItems() const;
+
+	SHA256_DIGEST Sha256() const;
+	unsigned Crc() const;
+	int MapSize() const;
+};
+
+// write access
+class CDataFileWriter
+{
+	struct CDataInfo
+	{
+		void *m_pUncompressedData;
+		int m_UncompressedSize;
+		void *m_pCompressedData;
+		int m_CompressedSize;
+		int m_CompressionLevel;
+	};
+
+	struct CItemInfo
+	{
+		int m_Type;
+		int m_ID;
+		int m_Size;
+		int m_Next;
+		int m_Prev;
+		void *m_pData;
+	};
+
+	struct CItemTypeInfo
+	{
+		int m_Num;
+		int m_First;
+		int m_Last;
+	};
+
+	enum
+	{
+		MAX_ITEM_TYPES = 0x10000,
+	};
+
+	IOHANDLE m_File;
+	std::array<CItemTypeInfo, MAX_ITEM_TYPES> m_aItemTypes;
+	std::vector<CItemInfo> m_vItems;
+	std::vector<CDataInfo> m_vDatas;
+	std::vector<int> m_vExtendedItemTypes;
+
+	int GetTypeFromIndex(int Index) const;
+	int GetExtendedItemTypeIndex(int Type);
+
+public:
+	CDataFileWriter();
+	CDataFileWriter(CDataFileWriter &&Other)
+	{
+		m_File = Other.m_File;
+		Other.m_File = 0;
+		m_aItemTypes = std::move(Other.m_aItemTypes);
+		m_vItems = std::move(Other.m_vItems);
+		m_vDatas = std::move(Other.m_vDatas);
+		m_vExtendedItemTypes = std::move(Other.m_vExtendedItemTypes);
+	}
+	~CDataFileWriter();
+
+	bool Open(class IStorage *pStorage, const char *pFilename, int StorageType = IStorage::TYPE_SAVE);
+	int AddItem(int Type, int ID, size_t Size, const void *pData);
+	int AddData(size_t Size, const void *pData, int CompressionLevel = Z_DEFAULT_COMPRESSION);
+	int AddDataSwapped(size_t Size, const void *pData);
+	int AddDataString(const char *pStr);
+	void Finish();
+};
+
+#endif
diff --git a/src_bkp/engine/shared/demo.cpp b/src_bkp/engine/shared/demo.cpp
new file mode 100644
index 0000000000..2eefe2b824
--- /dev/null
+++ b/src_bkp/engine/shared/demo.cpp
@@ -0,0 +1,1233 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/storage.h>
+
+#include <engine/shared/config.h>
+
+#if defined(CONF_VIDEORECORDER)
+#include <engine/shared/video.h>
+#endif
+
+#include "compression.h"
+#include "demo.h"
+#include "network.h"
+#include "snapshot.h"
+
+const double g_aSpeeds[g_DemoSpeeds] = {0.1, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 2.0, 3.0, 4.0, 6.0, 8.0, 12.0, 16.0, 20.0, 24.0, 28.0, 32.0, 40.0, 48.0, 56.0, 64.0};
+const CUuid SHA256_EXTENSION =
+	{{0x6b, 0xe6, 0xda, 0x4a, 0xce, 0xbd, 0x38, 0x0c,
+		0x9b, 0x5b, 0x12, 0x89, 0xc8, 0x42, 0xd7, 0x80}};
+
+static const unsigned char gs_CurVersion = 6;
+static const unsigned char gs_OldVersion = 3;
+static const unsigned char gs_Sha256Version = 6;
+static const unsigned char gs_VersionTickCompression = 5; // demo files with this version or higher will use `CHUNKTICKFLAG_TICK_COMPRESSED`
+static const int gs_LengthOffset = 152;
+static const int gs_NumMarkersOffset = 176;
+
+static const ColorRGBA gs_DemoPrintColor{0.75f, 0.7f, 0.7f, 1.0f};
+
+bool CDemoHeader::Valid() const
+{
+	// Check marker and ensure that strings are zero-terminated and valid UTF-8.
+	return mem_comp(m_aMarker, gs_aHeaderMarker, sizeof(gs_aHeaderMarker)) == 0 &&
+	       mem_has_null(m_aNetversion, sizeof(m_aNetversion)) && str_utf8_check(m_aNetversion) &&
+	       mem_has_null(m_aMapName, sizeof(m_aMapName)) && str_utf8_check(m_aMapName) &&
+	       mem_has_null(m_aType, sizeof(m_aType)) && str_utf8_check(m_aType) &&
+	       mem_has_null(m_aTimestamp, sizeof(m_aTimestamp)) && str_utf8_check(m_aTimestamp);
+}
+
+CDemoRecorder::CDemoRecorder(class CSnapshotDelta *pSnapshotDelta, bool NoMapData)
+{
+	m_File = 0;
+	m_aCurrentFilename[0] = '\0';
+	m_pfnFilter = nullptr;
+	m_pUser = nullptr;
+	m_LastTickMarker = -1;
+	m_pSnapshotDelta = pSnapshotDelta;
+	m_NoMapData = NoMapData;
+}
+
+CDemoRecorder::~CDemoRecorder()
+{
+	dbg_assert(m_File == 0, "Demo recorder was not stopped");
+}
+
+// Record
+int CDemoRecorder::Start(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, const char *pNetVersion, const char *pMap, const SHA256_DIGEST &Sha256, unsigned Crc, const char *pType, unsigned MapSize, unsigned char *pMapData, IOHANDLE MapFile, DEMOFUNC_FILTER pfnFilter, void *pUser)
+{
+	dbg_assert(m_File == 0, "Demo recorder already recording");
+
+	m_pfnFilter = pfnFilter;
+	m_pUser = pUser;
+
+	m_pMapData = pMapData;
+	m_pConsole = pConsole;
+
+	IOHANDLE DemoFile = pStorage->OpenFile(pFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!DemoFile)
+	{
+		if(m_pConsole)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Unable to open '%s' for recording", pFilename);
+			m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+		}
+		return -1;
+	}
+
+	bool CloseMapFile = false;
+
+	if(MapFile)
+		io_seek(MapFile, 0, IOSEEK_START);
+
+	char aSha256[SHA256_MAXSTRSIZE];
+	sha256_str(Sha256, aSha256, sizeof(aSha256));
+
+	if(!pMapData && !MapFile)
+	{
+		// open mapfile
+		char aMapFilename[IO_MAX_PATH_LENGTH];
+		// try the downloaded maps
+		str_format(aMapFilename, sizeof(aMapFilename), "downloadedmaps/%s_%s.map", pMap, aSha256);
+		MapFile = pStorage->OpenFile(aMapFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+		if(!MapFile)
+		{
+			// try the normal maps folder
+			str_format(aMapFilename, sizeof(aMapFilename), "maps/%s.map", pMap);
+			MapFile = pStorage->OpenFile(aMapFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+		}
+		if(!MapFile)
+		{
+			// search for the map within subfolders
+			char aBuf[IO_MAX_PATH_LENGTH];
+			str_format(aMapFilename, sizeof(aMapFilename), "%s.map", pMap);
+			if(pStorage->FindFile(aMapFilename, "maps", IStorage::TYPE_ALL, aBuf, sizeof(aBuf)))
+				MapFile = pStorage->OpenFile(aBuf, IOFLAG_READ, IStorage::TYPE_ALL);
+		}
+		if(!MapFile)
+		{
+			if(m_pConsole)
+			{
+				char aBuf[32 + IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "Unable to open mapfile '%s'", pMap);
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+			}
+			return -1;
+		}
+
+		CloseMapFile = true;
+	}
+
+	if(m_NoMapData)
+		MapSize = 0;
+	else if(MapFile)
+		MapSize = io_length(MapFile);
+
+	// write header
+	CDemoHeader Header;
+	mem_zero(&Header, sizeof(Header));
+	mem_copy(Header.m_aMarker, gs_aHeaderMarker, sizeof(Header.m_aMarker));
+	Header.m_Version = gs_CurVersion;
+	str_copy(Header.m_aNetversion, pNetVersion);
+	str_copy(Header.m_aMapName, pMap);
+	uint_to_bytes_be(Header.m_aMapSize, MapSize);
+	uint_to_bytes_be(Header.m_aMapCrc, Crc);
+	str_copy(Header.m_aType, pType);
+	// Header.m_Length - add this on stop
+	str_timestamp(Header.m_aTimestamp, sizeof(Header.m_aTimestamp));
+	io_write(DemoFile, &Header, sizeof(Header));
+
+	CTimelineMarkers TimelineMarkers;
+	mem_zero(&TimelineMarkers, sizeof(TimelineMarkers));
+	io_write(DemoFile, &TimelineMarkers, sizeof(TimelineMarkers)); // fill this on stop
+
+	// Write Sha256
+	io_write(DemoFile, SHA256_EXTENSION.m_aData, sizeof(SHA256_EXTENSION.m_aData));
+	io_write(DemoFile, &Sha256, sizeof(SHA256_DIGEST));
+
+	if(m_NoMapData)
+	{
+	}
+	else if(pMapData)
+	{
+		io_write(DemoFile, pMapData, MapSize);
+	}
+	else
+	{
+		// write map data
+		while(true)
+		{
+			unsigned char aChunk[1024 * 64];
+			mem_zero(aChunk, sizeof(aChunk));
+			int Bytes = io_read(MapFile, &aChunk, sizeof(aChunk));
+			if(Bytes <= 0)
+				break;
+			io_write(DemoFile, &aChunk, Bytes);
+		}
+		if(CloseMapFile)
+			io_close(MapFile);
+		else
+			io_seek(MapFile, 0, IOSEEK_START);
+	}
+
+	m_LastKeyFrame = -1;
+	m_LastTickMarker = -1;
+	m_FirstTick = -1;
+	m_NumTimelineMarkers = 0;
+
+	if(m_pConsole)
+	{
+		char aBuf[32 + IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "Recording to '%s'", pFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", aBuf, gs_DemoPrintColor);
+	}
+	m_File = DemoFile;
+	str_copy(m_aCurrentFilename, pFilename);
+
+	return 0;
+}
+
+/*
+	Tickmarker
+		7	= Always set
+		6	= Keyframe flag
+		0-5	= Delta tick
+
+	Normal
+		7 = Not set
+		5-6	= Type
+		0-4	= Size
+*/
+
+enum
+{
+	CHUNKTYPEFLAG_TICKMARKER = 0x80,
+	CHUNKTICKFLAG_KEYFRAME = 0x40, // only when tickmarker is set
+	CHUNKTICKFLAG_TICK_COMPRESSED = 0x20, // when we store the tick value in the first chunk
+
+	CHUNKMASK_TICK = 0x1f,
+	CHUNKMASK_TICK_LEGACY = 0x3f,
+	CHUNKMASK_TYPE = 0x60,
+	CHUNKMASK_SIZE = 0x1f,
+
+	CHUNKTYPE_SNAPSHOT = 1,
+	CHUNKTYPE_MESSAGE = 2,
+	CHUNKTYPE_DELTA = 3,
+};
+
+void CDemoRecorder::WriteTickMarker(int Tick, bool Keyframe)
+{
+	if(m_LastTickMarker == -1 || Tick - m_LastTickMarker > CHUNKMASK_TICK || Keyframe)
+	{
+		unsigned char aChunk[sizeof(int32_t) + 1];
+		aChunk[0] = CHUNKTYPEFLAG_TICKMARKER;
+		uint_to_bytes_be(aChunk + 1, Tick);
+
+		if(Keyframe)
+			aChunk[0] |= CHUNKTICKFLAG_KEYFRAME;
+
+		io_write(m_File, aChunk, sizeof(aChunk));
+	}
+	else
+	{
+		unsigned char aChunk[1];
+		aChunk[0] = CHUNKTYPEFLAG_TICKMARKER | CHUNKTICKFLAG_TICK_COMPRESSED | (Tick - m_LastTickMarker);
+		io_write(m_File, aChunk, sizeof(aChunk));
+	}
+
+	m_LastTickMarker = Tick;
+	if(m_FirstTick < 0)
+		m_FirstTick = Tick;
+}
+
+void CDemoRecorder::Write(int Type, const void *pData, int Size)
+{
+	if(!m_File)
+		return;
+
+	if(Size > 64 * 1024)
+		return;
+
+	/* pad the data with 0 so we get an alignment of 4,
+	else the compression won't work and miss some bytes */
+	char aBuffer[64 * 1024];
+	char aBuffer2[64 * 1024];
+	mem_copy(aBuffer2, pData, Size);
+	while(Size & 3)
+		aBuffer2[Size++] = 0;
+	Size = CVariableInt::Compress(aBuffer2, Size, aBuffer, sizeof(aBuffer)); // buffer2 -> buffer
+	if(Size < 0)
+		return;
+
+	Size = CNetBase::Compress(aBuffer, Size, aBuffer2, sizeof(aBuffer2)); // buffer -> buffer2
+	if(Size < 0)
+		return;
+
+	unsigned char aChunk[3];
+	aChunk[0] = ((Type & 0x3) << 5);
+	if(Size < 30)
+	{
+		aChunk[0] |= Size;
+		io_write(m_File, aChunk, 1);
+	}
+	else
+	{
+		if(Size < 256)
+		{
+			aChunk[0] |= 30;
+			aChunk[1] = Size & 0xff;
+			io_write(m_File, aChunk, 2);
+		}
+		else
+		{
+			aChunk[0] |= 31;
+			aChunk[1] = Size & 0xff;
+			aChunk[2] = Size >> 8;
+			io_write(m_File, aChunk, 3);
+		}
+	}
+
+	io_write(m_File, aBuffer2, Size);
+}
+
+void CDemoRecorder::RecordSnapshot(int Tick, const void *pData, int Size)
+{
+	if(m_LastKeyFrame == -1 || (Tick - m_LastKeyFrame) > SERVER_TICK_SPEED * 5)
+	{
+		// write full tickmarker
+		WriteTickMarker(Tick, true);
+
+		// write snapshot
+		Write(CHUNKTYPE_SNAPSHOT, pData, Size);
+
+		m_LastKeyFrame = Tick;
+		mem_copy(m_aLastSnapshotData, pData, Size);
+	}
+	else
+	{
+		// write tickmarker
+		WriteTickMarker(Tick, false);
+
+		// create delta
+		char aDeltaData[CSnapshot::MAX_SIZE + sizeof(int)];
+		const int DeltaSize = m_pSnapshotDelta->CreateDelta((CSnapshot *)m_aLastSnapshotData, (CSnapshot *)pData, &aDeltaData);
+		if(DeltaSize)
+		{
+			// record delta
+			Write(CHUNKTYPE_DELTA, aDeltaData, DeltaSize);
+			mem_copy(m_aLastSnapshotData, pData, Size);
+		}
+	}
+}
+
+void CDemoRecorder::RecordMessage(const void *pData, int Size)
+{
+	if(m_pfnFilter)
+	{
+		if(m_pfnFilter(pData, Size, m_pUser))
+		{
+			return;
+		}
+	}
+	Write(CHUNKTYPE_MESSAGE, pData, Size);
+}
+
+int CDemoRecorder::Stop()
+{
+	if(!m_File)
+		return -1;
+
+	// add the demo length to the header
+	io_seek(m_File, gs_LengthOffset, IOSEEK_START);
+	unsigned char aLength[sizeof(int32_t)];
+	uint_to_bytes_be(aLength, Length());
+	io_write(m_File, aLength, sizeof(aLength));
+
+	// add the timeline markers to the header
+	io_seek(m_File, gs_NumMarkersOffset, IOSEEK_START);
+	unsigned char aNumMarkers[sizeof(int32_t)];
+	uint_to_bytes_be(aNumMarkers, m_NumTimelineMarkers);
+	io_write(m_File, aNumMarkers, sizeof(aNumMarkers));
+	for(int i = 0; i < m_NumTimelineMarkers; i++)
+	{
+		unsigned char aMarker[sizeof(int32_t)];
+		uint_to_bytes_be(aMarker, m_aTimelineMarkers[i]);
+		io_write(m_File, aMarker, sizeof(aMarker));
+	}
+
+	io_close(m_File);
+	m_File = 0;
+	if(m_pConsole)
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Stopped recording", gs_DemoPrintColor);
+
+	return 0;
+}
+
+void CDemoRecorder::AddDemoMarker()
+{
+	if(m_LastTickMarker < 0)
+		return;
+	AddDemoMarker(m_LastTickMarker);
+}
+
+void CDemoRecorder::AddDemoMarker(int Tick)
+{
+	dbg_assert(Tick >= 0, "invalid marker tick");
+	if(m_NumTimelineMarkers >= MAX_TIMELINE_MARKERS)
+		return;
+
+	// not more than 1 marker in a second
+	if(m_NumTimelineMarkers > 0)
+	{
+		int Diff = Tick - m_aTimelineMarkers[m_NumTimelineMarkers - 1];
+		if(Diff < (float)SERVER_TICK_SPEED)
+			return;
+	}
+
+	m_aTimelineMarkers[m_NumTimelineMarkers++] = Tick;
+
+	if(m_pConsole)
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_recorder", "Added timeline marker", gs_DemoPrintColor);
+}
+
+CDemoPlayer::CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo, TUpdateIntraTimesFunc &&UpdateIntraTimesFunc)
+{
+	Construct(pSnapshotDelta, UseVideo);
+
+	m_UpdateIntraTimesFunc = UpdateIntraTimesFunc;
+}
+
+CDemoPlayer::CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo)
+{
+	Construct(pSnapshotDelta, UseVideo);
+}
+
+CDemoPlayer::~CDemoPlayer()
+{
+	dbg_assert(m_File == 0, "Demo player not stopped");
+}
+
+void CDemoPlayer::Construct(class CSnapshotDelta *pSnapshotDelta, bool UseVideo)
+{
+	m_File = 0;
+	m_SpeedIndex = 4;
+
+	m_pSnapshotDelta = pSnapshotDelta;
+	m_LastSnapshotDataSize = -1;
+	m_pListener = nullptr;
+	m_UseVideo = UseVideo;
+
+	m_aFilename[0] = '\0';
+	m_aErrorMessage[0] = '\0';
+}
+
+void CDemoPlayer::SetListener(IListener *pListener)
+{
+	m_pListener = pListener;
+}
+
+CDemoPlayer::EReadChunkHeaderResult CDemoPlayer::ReadChunkHeader(int *pType, int *pSize, int *pTick)
+{
+	*pSize = 0;
+	*pType = 0;
+
+	unsigned char Chunk = 0;
+	if(io_read(m_File, &Chunk, sizeof(Chunk)) != sizeof(Chunk))
+		return CHUNKHEADER_EOF;
+
+	if(Chunk & CHUNKTYPEFLAG_TICKMARKER)
+	{
+		// decode tick marker
+		int Tickdelta_legacy = Chunk & CHUNKMASK_TICK_LEGACY; // compatibility
+		*pType = Chunk & (CHUNKTYPEFLAG_TICKMARKER | CHUNKTICKFLAG_KEYFRAME);
+
+		int NewTick;
+		if(m_Info.m_Header.m_Version < gs_VersionTickCompression && Tickdelta_legacy != 0)
+		{
+			if(*pTick < 0) // initial tick not initialized before a tick delta
+				return CHUNKHEADER_ERROR;
+			NewTick = *pTick + Tickdelta_legacy;
+		}
+		else if(Chunk & CHUNKTICKFLAG_TICK_COMPRESSED)
+		{
+			if(*pTick < 0) // initial tick not initialized before a tick delta
+				return CHUNKHEADER_ERROR;
+			int Tickdelta = Chunk & CHUNKMASK_TICK;
+			NewTick = *pTick + Tickdelta;
+		}
+		else
+		{
+			unsigned char aTickdata[sizeof(int32_t)];
+			if(io_read(m_File, aTickdata, sizeof(aTickdata)) != sizeof(aTickdata))
+				return CHUNKHEADER_ERROR;
+			NewTick = bytes_be_to_uint(aTickdata);
+		}
+		if(NewTick < MIN_TICK || NewTick >= MAX_TICK) // invalid tick
+			return CHUNKHEADER_ERROR;
+		*pTick = NewTick;
+	}
+	else
+	{
+		// decode normal chunk
+		*pType = (Chunk & CHUNKMASK_TYPE) >> 5;
+		*pSize = Chunk & CHUNKMASK_SIZE;
+
+		if(*pSize == 30)
+		{
+			unsigned char aSizedata[1];
+			if(io_read(m_File, aSizedata, sizeof(aSizedata)) != sizeof(aSizedata))
+				return CHUNKHEADER_ERROR;
+			*pSize = aSizedata[0];
+		}
+		else if(*pSize == 31)
+		{
+			unsigned char aSizedata[2];
+			if(io_read(m_File, aSizedata, sizeof(aSizedata)) != sizeof(aSizedata))
+				return CHUNKHEADER_ERROR;
+			*pSize = (aSizedata[1] << 8) | aSizedata[0];
+		}
+	}
+
+	return CHUNKHEADER_SUCCESS;
+}
+
+bool CDemoPlayer::ScanFile()
+{
+	const long StartPos = io_tell(m_File);
+	m_vKeyFrames.clear();
+	if(StartPos < 0)
+		return false;
+
+	int ChunkTick = -1;
+	while(true)
+	{
+		const long CurrentPos = io_tell(m_File);
+		if(CurrentPos < 0)
+		{
+			m_vKeyFrames.clear();
+			return false;
+		}
+
+		int ChunkType, ChunkSize;
+		const EReadChunkHeaderResult Result = ReadChunkHeader(&ChunkType, &ChunkSize, &ChunkTick);
+		if(Result == CHUNKHEADER_EOF)
+		{
+			break;
+		}
+		else if(Result == CHUNKHEADER_ERROR)
+		{
+			m_vKeyFrames.clear();
+			return false;
+		}
+
+		if(ChunkType & CHUNKTYPEFLAG_TICKMARKER)
+		{
+			if(ChunkType & CHUNKTICKFLAG_KEYFRAME)
+			{
+				m_vKeyFrames.emplace_back(CurrentPos, ChunkTick);
+			}
+
+			if(m_Info.m_Info.m_FirstTick == -1)
+				m_Info.m_Info.m_FirstTick = ChunkTick;
+			m_Info.m_Info.m_LastTick = ChunkTick;
+		}
+		else if(ChunkSize)
+		{
+			if(io_skip(m_File, ChunkSize) != 0)
+			{
+				m_vKeyFrames.clear();
+				return false;
+			}
+		}
+	}
+
+	if(io_seek(m_File, StartPos, IOSEEK_START) != 0)
+	{
+		m_vKeyFrames.clear();
+		return false;
+	}
+	return true;
+}
+
+void CDemoPlayer::DoTick()
+{
+	// update ticks
+	m_Info.m_PreviousTick = m_Info.m_Info.m_CurrentTick;
+	m_Info.m_Info.m_CurrentTick = m_Info.m_NextTick;
+	int ChunkTick = m_Info.m_Info.m_CurrentTick;
+
+	int64_t Freq = time_freq();
+	int64_t CurtickStart = m_Info.m_Info.m_CurrentTick * Freq / SERVER_TICK_SPEED;
+	int64_t PrevtickStart = m_Info.m_PreviousTick * Freq / SERVER_TICK_SPEED;
+	m_Info.m_IntraTick = (m_Info.m_CurrentTime - PrevtickStart) / (float)(CurtickStart - PrevtickStart);
+	m_Info.m_IntraTickSincePrev = (m_Info.m_CurrentTime - PrevtickStart) / (float)(Freq / SERVER_TICK_SPEED);
+	m_Info.m_TickTime = (m_Info.m_CurrentTime - PrevtickStart) / (float)Freq;
+	if(m_UpdateIntraTimesFunc)
+		m_UpdateIntraTimesFunc();
+
+	bool GotSnapshot = false;
+	while(true)
+	{
+		int ChunkType, ChunkSize;
+		const EReadChunkHeaderResult Result = ReadChunkHeader(&ChunkType, &ChunkSize, &ChunkTick);
+		if(Result == CHUNKHEADER_EOF)
+		{
+			if(m_Info.m_PreviousTick == -1)
+			{
+				Stop("Empty demo");
+			}
+			else
+			{
+				Pause();
+				// Stop rendering when reaching end of file
+#if defined(CONF_VIDEORECORDER)
+				if(m_UseVideo && IVideo::Current())
+					Stop();
+#endif
+			}
+			break;
+		}
+		else if(Result == CHUNKHEADER_ERROR)
+		{
+			Stop("Error reading chunk header");
+			break;
+		}
+
+		// read the chunk
+		int DataSize = 0;
+		if(ChunkSize)
+		{
+			if(io_read(m_File, m_aCompressedSnapshotData, ChunkSize) != (unsigned)ChunkSize)
+			{
+				Stop("Error reading chunk data");
+				break;
+			}
+
+			DataSize = CNetBase::Decompress(m_aCompressedSnapshotData, ChunkSize, m_aDecompressedSnapshotData, sizeof(m_aDecompressedSnapshotData));
+			if(DataSize < 0)
+			{
+				Stop("Error during network decompression");
+				break;
+			}
+
+			DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aCurrentSnapshotData, sizeof(m_aCurrentSnapshotData));
+			if(DataSize < 0)
+			{
+				Stop("Error during intpack decompression");
+				break;
+			}
+		}
+
+		if(ChunkType == CHUNKTYPE_DELTA)
+		{
+			// process delta snapshot
+			CSnapshot *pNewsnap = (CSnapshot *)m_aDeltaSnapshotData;
+			DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aCurrentSnapshotData, DataSize);
+
+			if(DataSize < 0)
+			{
+				if(m_pConsole)
+				{
+					char aBuf[64];
+					str_format(aBuf, sizeof(aBuf), "Error unpacking snapshot delta. DataSize=%d", DataSize);
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "demo_player", aBuf);
+				}
+			}
+			else if(!pNewsnap->IsValid(DataSize))
+			{
+				if(m_pConsole)
+				{
+					char aBuf[64];
+					str_format(aBuf, sizeof(aBuf), "Snapshot delta invalid. DataSize=%d", DataSize);
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "demo_player", aBuf);
+				}
+			}
+			else
+			{
+				if(m_pListener)
+					m_pListener->OnDemoPlayerSnapshot(m_aDeltaSnapshotData, DataSize);
+
+				m_LastSnapshotDataSize = DataSize;
+				mem_copy(m_aLastSnapshotData, m_aDeltaSnapshotData, DataSize);
+				GotSnapshot = true;
+			}
+		}
+		else if(ChunkType == CHUNKTYPE_SNAPSHOT)
+		{
+			// process full snapshot
+			CSnapshot *pSnap = (CSnapshot *)m_aCurrentSnapshotData;
+			if(!pSnap->IsValid(DataSize))
+			{
+				if(m_pConsole)
+				{
+					char aBuf[64];
+					str_format(aBuf, sizeof(aBuf), "Snapshot invalid. DataSize=%d", DataSize);
+					m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "demo_player", aBuf);
+				}
+			}
+			else
+			{
+				GotSnapshot = true;
+
+				m_LastSnapshotDataSize = DataSize;
+				mem_copy(m_aLastSnapshotData, m_aCurrentSnapshotData, DataSize);
+				if(m_pListener)
+					m_pListener->OnDemoPlayerSnapshot(m_aCurrentSnapshotData, DataSize);
+			}
+		}
+		else
+		{
+			// if there were no snapshots in this tick, replay the last one
+			if(!GotSnapshot && m_pListener && m_LastSnapshotDataSize != -1)
+			{
+				GotSnapshot = true;
+				m_pListener->OnDemoPlayerSnapshot(m_aLastSnapshotData, m_LastSnapshotDataSize);
+			}
+
+			// check the remaining types
+			if(ChunkType & CHUNKTYPEFLAG_TICKMARKER)
+			{
+				m_Info.m_NextTick = ChunkTick;
+				break;
+			}
+			else if(ChunkType == CHUNKTYPE_MESSAGE)
+			{
+				if(m_pListener)
+					m_pListener->OnDemoPlayerMessage(m_aCurrentSnapshotData, DataSize);
+			}
+		}
+	}
+}
+
+void CDemoPlayer::Pause()
+{
+	m_Info.m_Info.m_Paused = true;
+#if defined(CONF_VIDEORECORDER)
+	if(m_UseVideo && IVideo::Current() && g_Config.m_ClVideoPauseWithDemo)
+		IVideo::Current()->Pause(true);
+#endif
+}
+
+void CDemoPlayer::Unpause()
+{
+	m_Info.m_Info.m_Paused = false;
+#if defined(CONF_VIDEORECORDER)
+	if(m_UseVideo && IVideo::Current() && g_Config.m_ClVideoPauseWithDemo)
+		IVideo::Current()->Pause(false);
+#endif
+}
+
+int CDemoPlayer::Load(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, int StorageType)
+{
+	dbg_assert(m_File == 0, "Demo player already playing");
+
+	m_pConsole = pConsole;
+	str_copy(m_aFilename, pFilename);
+	str_copy(m_aErrorMessage, "");
+
+	if(m_pConsole)
+	{
+		char aBuf[32 + IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "Loading demo '%s'", pFilename);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_player", aBuf);
+	}
+
+	// clear the playback info
+	mem_zero(&m_Info, sizeof(m_Info));
+	m_Info.m_Info.m_FirstTick = -1;
+	m_Info.m_Info.m_LastTick = -1;
+	m_Info.m_NextTick = -1;
+	m_Info.m_Info.m_CurrentTick = -1;
+	m_Info.m_PreviousTick = -1;
+	m_Info.m_Info.m_Speed = 1;
+	m_SpeedIndex = 4;
+	m_LastSnapshotDataSize = -1;
+
+	if(!GetDemoInfo(pStorage, m_pConsole, pFilename, StorageType, &m_Info.m_Header, &m_Info.m_TimelineMarkers, &m_MapInfo, &m_File, m_aErrorMessage, sizeof(m_aErrorMessage)))
+	{
+		str_copy(m_aFilename, "");
+		return -1;
+	}
+
+	// save byte offset of map for later use
+	m_MapOffset = io_tell(m_File);
+	if(m_MapOffset < 0 || io_skip(m_File, m_MapInfo.m_Size) != 0)
+	{
+		Stop("Error skipping map data");
+		return -1;
+	}
+
+	if(m_Info.m_Header.m_Version > gs_OldVersion)
+	{
+		// get timeline markers
+		int Num = bytes_be_to_uint(m_Info.m_TimelineMarkers.m_aNumTimelineMarkers);
+		m_Info.m_Info.m_NumTimelineMarkers = clamp<int>(Num, 0, MAX_TIMELINE_MARKERS);
+		for(int i = 0; i < m_Info.m_Info.m_NumTimelineMarkers; i++)
+		{
+			m_Info.m_Info.m_aTimelineMarkers[i] = bytes_be_to_uint(m_Info.m_TimelineMarkers.m_aTimelineMarkers[i]);
+		}
+	}
+
+	// scan the file for interesting points
+	if(!ScanFile())
+	{
+		Stop("Error scanning demo file");
+		return -1;
+	}
+
+	// reset slice markers
+	g_Config.m_ClDemoSliceBegin = -1;
+	g_Config.m_ClDemoSliceEnd = -1;
+
+	// ready for playback
+	return 0;
+}
+
+unsigned char *CDemoPlayer::GetMapData(class IStorage *pStorage)
+{
+	if(!m_MapInfo.m_Size)
+		return nullptr;
+
+	const long CurSeek = io_tell(m_File);
+	if(CurSeek < 0 || io_seek(m_File, m_MapOffset, IOSEEK_START) != 0)
+		return nullptr;
+	unsigned char *pMapData = (unsigned char *)malloc(m_MapInfo.m_Size);
+	if(io_read(m_File, pMapData, m_MapInfo.m_Size) != m_MapInfo.m_Size ||
+		io_seek(m_File, CurSeek, IOSEEK_START) != 0)
+	{
+		free(pMapData);
+		return nullptr;
+	}
+	return pMapData;
+}
+
+bool CDemoPlayer::ExtractMap(class IStorage *pStorage)
+{
+	unsigned char *pMapData = GetMapData(pStorage);
+	if(!pMapData)
+		return false;
+
+	// handle sha256
+	SHA256_DIGEST Sha256 = SHA256_ZEROED;
+	if(m_Info.m_Header.m_Version >= gs_Sha256Version)
+		Sha256 = m_MapInfo.m_Sha256;
+	else
+	{
+		Sha256 = sha256(pMapData, m_MapInfo.m_Size);
+		m_MapInfo.m_Sha256 = Sha256;
+	}
+
+	// construct name
+	char aSha[SHA256_MAXSTRSIZE], aMapFilename[IO_MAX_PATH_LENGTH];
+	sha256_str(Sha256, aSha, sizeof(aSha));
+	str_format(aMapFilename, sizeof(aMapFilename), "downloadedmaps/%s_%s.map", m_Info.m_Header.m_aMapName, aSha);
+
+	// save map
+	IOHANDLE MapFile = pStorage->OpenFile(aMapFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!MapFile)
+	{
+		free(pMapData);
+		return false;
+	}
+
+	io_write(MapFile, pMapData, m_MapInfo.m_Size);
+	io_close(MapFile);
+
+	// free data
+	free(pMapData);
+	return true;
+}
+
+int64_t CDemoPlayer::Time()
+{
+#if defined(CONF_VIDEORECORDER)
+	if(m_UseVideo && IVideo::Current())
+	{
+		if(!m_WasRecording)
+		{
+			m_WasRecording = true;
+			m_Info.m_LastUpdate = IVideo::Time();
+		}
+		return IVideo::Time();
+	}
+	else
+	{
+		const int64_t Now = time_get();
+		if(m_WasRecording)
+		{
+			m_WasRecording = false;
+			m_Info.m_LastUpdate = Now;
+		}
+		return Now;
+	}
+#else
+	return time_get();
+#endif
+}
+
+int CDemoPlayer::Play()
+{
+	// fill in previous and next tick
+	while(m_Info.m_PreviousTick == -1 && IsPlaying())
+		DoTick();
+
+	// set start info
+	m_Info.m_CurrentTime = m_Info.m_PreviousTick * time_freq() / SERVER_TICK_SPEED;
+	m_Info.m_LastUpdate = Time();
+	return 0;
+}
+
+int CDemoPlayer::SeekPercent(float Percent)
+{
+	int WantedTick = m_Info.m_Info.m_FirstTick + round_truncate((m_Info.m_Info.m_LastTick - m_Info.m_Info.m_FirstTick) * Percent);
+	return SetPos(WantedTick);
+}
+
+int CDemoPlayer::SeekTime(float Seconds)
+{
+	int WantedTick = m_Info.m_Info.m_CurrentTick + round_truncate(Seconds * (float)SERVER_TICK_SPEED);
+	return SetPos(WantedTick);
+}
+
+int CDemoPlayer::SeekTick(ETickOffset TickOffset)
+{
+	int WantedTick;
+	switch(TickOffset)
+	{
+	case TICK_CURRENT:
+		WantedTick = m_Info.m_Info.m_CurrentTick;
+		break;
+	case TICK_PREVIOUS:
+		WantedTick = m_Info.m_PreviousTick;
+		break;
+	case TICK_NEXT:
+		WantedTick = m_Info.m_NextTick;
+		break;
+	default:
+		dbg_assert(false, "Invalid TickOffset");
+		WantedTick = -1;
+		break;
+	}
+
+	// +1 because SetPos will seek until the given tick is the next tick that
+	// will be played back, whereas we want the wanted tick to be played now.
+	return SetPos(WantedTick + 1);
+}
+
+int CDemoPlayer::SetPos(int WantedTick)
+{
+	if(!m_File)
+		return -1;
+
+	WantedTick = clamp(WantedTick, m_Info.m_Info.m_FirstTick, m_Info.m_Info.m_LastTick);
+	const int KeyFrameWantedTick = WantedTick - 5; // -5 because we have to have a current tick and previous tick when we do the playback
+	const float Percent = (KeyFrameWantedTick - m_Info.m_Info.m_FirstTick) / (float)(m_Info.m_Info.m_LastTick - m_Info.m_Info.m_FirstTick);
+
+	// get correct key frame
+	size_t KeyFrame = clamp<size_t>(m_vKeyFrames.size() * Percent, 0, m_vKeyFrames.size() - 1);
+	while(KeyFrame < m_vKeyFrames.size() - 1 && m_vKeyFrames[KeyFrame].m_Tick < KeyFrameWantedTick)
+		KeyFrame++;
+	while(KeyFrame > 0 && m_vKeyFrames[KeyFrame].m_Tick > KeyFrameWantedTick)
+		KeyFrame--;
+
+	// seek to the correct key frame
+	if(io_seek(m_File, m_vKeyFrames[KeyFrame].m_Filepos, IOSEEK_START) != 0)
+	{
+		Stop("Error seeking keyframe position");
+		return -1;
+	}
+
+	m_Info.m_NextTick = -1;
+	m_Info.m_Info.m_CurrentTick = -1;
+	m_Info.m_PreviousTick = -1;
+
+	// playback everything until we hit our tick
+	while(m_Info.m_NextTick < WantedTick && IsPlaying())
+		DoTick();
+
+	Play();
+
+	return 0;
+}
+
+void CDemoPlayer::SetSpeed(float Speed)
+{
+	m_Info.m_Info.m_Speed = clamp(Speed, 0.f, 256.f);
+}
+
+void CDemoPlayer::SetSpeedIndex(int SpeedIndex)
+{
+	dbg_assert(SpeedIndex >= 0 && SpeedIndex < g_DemoSpeeds, "invalid SpeedIndex");
+	m_SpeedIndex = SpeedIndex;
+	SetSpeed(g_aSpeeds[m_SpeedIndex]);
+}
+
+void CDemoPlayer::AdjustSpeedIndex(int Offset)
+{
+	SetSpeedIndex(clamp(m_SpeedIndex + Offset, 0, (int)(std::size(g_aSpeeds) - 1)));
+}
+
+int CDemoPlayer::Update(bool RealTime)
+{
+	int64_t Now = Time();
+	int64_t Deltatime = Now - m_Info.m_LastUpdate;
+	m_Info.m_LastUpdate = Now;
+
+	if(!IsPlaying())
+		return 0;
+
+	const int64_t Freq = time_freq();
+	if(!m_Info.m_Info.m_Paused)
+	{
+		m_Info.m_CurrentTime += (int64_t)(Deltatime * (double)m_Info.m_Info.m_Speed);
+
+		while(!m_Info.m_Info.m_Paused && IsPlaying())
+		{
+			int64_t CurtickStart = m_Info.m_Info.m_CurrentTick * Freq / SERVER_TICK_SPEED;
+
+			// break if we are ready
+			if(RealTime && CurtickStart > m_Info.m_CurrentTime)
+				break;
+
+			// do one more tick
+			DoTick();
+		}
+	}
+
+	// update intratick
+	{
+		int64_t CurtickStart = m_Info.m_Info.m_CurrentTick * Freq / SERVER_TICK_SPEED;
+		int64_t PrevtickStart = m_Info.m_PreviousTick * Freq / SERVER_TICK_SPEED;
+		m_Info.m_IntraTick = (m_Info.m_CurrentTime - PrevtickStart) / (float)(CurtickStart - PrevtickStart);
+		m_Info.m_IntraTickSincePrev = (m_Info.m_CurrentTime - PrevtickStart) / (float)(Freq / SERVER_TICK_SPEED);
+		m_Info.m_TickTime = (m_Info.m_CurrentTime - PrevtickStart) / (float)Freq;
+		if(m_UpdateIntraTimesFunc)
+			m_UpdateIntraTimesFunc();
+	}
+
+	return 0;
+}
+
+void CDemoPlayer::Stop(const char *pErrorMessage)
+{
+#if defined(CONF_VIDEORECORDER)
+	if(m_UseVideo && IVideo::Current())
+		IVideo::Current()->Stop();
+#endif
+
+	if(!m_File)
+		return;
+
+	if(m_pConsole)
+	{
+		char aBuf[256];
+		if(pErrorMessage[0] == '\0')
+			str_copy(aBuf, "Stopped playback");
+		else
+			str_format(aBuf, sizeof(aBuf), "Stopped playback due to error: %s", pErrorMessage);
+		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_player", aBuf);
+	}
+
+	io_close(m_File);
+	m_File = 0;
+	m_vKeyFrames.clear();
+	str_copy(m_aFilename, "");
+	str_copy(m_aErrorMessage, pErrorMessage);
+}
+
+void CDemoPlayer::GetDemoName(char *pBuffer, size_t BufferSize) const
+{
+	IStorage::StripPathAndExtension(m_aFilename, pBuffer, BufferSize);
+}
+
+bool CDemoPlayer::GetDemoInfo(IStorage *pStorage, IConsole *pConsole, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo, IOHANDLE *pFile, char *pErrorMessage, size_t ErrorMessageSize) const
+{
+	mem_zero(pDemoHeader, sizeof(CDemoHeader));
+	mem_zero(pTimelineMarkers, sizeof(CTimelineMarkers));
+	mem_zero(pMapInfo, sizeof(CMapInfo));
+
+	IOHANDLE File = pStorage->OpenFile(pFilename, IOFLAG_READ, StorageType);
+	if(!File)
+	{
+		if(pErrorMessage != nullptr)
+			str_copy(pErrorMessage, "Could not open demo file", ErrorMessageSize);
+		return false;
+	}
+
+	if(io_read(File, pDemoHeader, sizeof(CDemoHeader)) != sizeof(CDemoHeader) || !pDemoHeader->Valid())
+	{
+		if(pErrorMessage != nullptr)
+			str_copy(pErrorMessage, "Error reading demo header", ErrorMessageSize);
+		mem_zero(pDemoHeader, sizeof(CDemoHeader));
+		io_close(File);
+		return false;
+	}
+
+	if(pDemoHeader->m_Version < gs_OldVersion)
+	{
+		if(pErrorMessage != nullptr)
+			str_format(pErrorMessage, ErrorMessageSize, "Demo version '%d' is not supported", pDemoHeader->m_Version);
+		mem_zero(pDemoHeader, sizeof(CDemoHeader));
+		io_close(File);
+		return false;
+	}
+	else if(pDemoHeader->m_Version > gs_OldVersion)
+	{
+		if(io_read(File, pTimelineMarkers, sizeof(CTimelineMarkers)) != sizeof(CTimelineMarkers))
+		{
+			if(pErrorMessage != nullptr)
+				str_copy(pErrorMessage, "Error reading timeline markers", ErrorMessageSize);
+			mem_zero(pDemoHeader, sizeof(CDemoHeader));
+			io_close(File);
+			return false;
+		}
+	}
+
+	SHA256_DIGEST Sha256 = SHA256_ZEROED;
+	if(pDemoHeader->m_Version >= gs_Sha256Version)
+	{
+		CUuid ExtensionUuid = {};
+		const unsigned ExtensionUuidSize = io_read(File, &ExtensionUuid.m_aData, sizeof(ExtensionUuid.m_aData));
+		if(ExtensionUuidSize == sizeof(ExtensionUuid.m_aData) && ExtensionUuid == SHA256_EXTENSION)
+		{
+			if(io_read(File, &Sha256, sizeof(SHA256_DIGEST)) != sizeof(SHA256_DIGEST))
+			{
+				if(pErrorMessage != nullptr)
+					str_copy(pErrorMessage, "Error reading SHA256", ErrorMessageSize);
+				mem_zero(pDemoHeader, sizeof(CDemoHeader));
+				mem_zero(pTimelineMarkers, sizeof(CTimelineMarkers));
+				io_close(File);
+				return false;
+			}
+		}
+		else
+		{
+			// This hopes whatever happened during the version increment didn't add something here
+			if(pConsole)
+			{
+				pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "demo_player", "Demo version incremented, but not by DDNet");
+			}
+			if(io_seek(File, -(int)ExtensionUuidSize, IOSEEK_CUR) != 0)
+			{
+				if(pErrorMessage != nullptr)
+					str_copy(pErrorMessage, "Error rewinding SHA256 extension UUID", ErrorMessageSize);
+				mem_zero(pDemoHeader, sizeof(CDemoHeader));
+				mem_zero(pTimelineMarkers, sizeof(CTimelineMarkers));
+				io_close(File);
+				return false;
+			}
+		}
+	}
+
+	str_copy(pMapInfo->m_aName, pDemoHeader->m_aMapName);
+	pMapInfo->m_Sha256 = Sha256;
+	pMapInfo->m_Crc = bytes_be_to_uint(pDemoHeader->m_aMapCrc);
+	pMapInfo->m_Size = bytes_be_to_uint(pDemoHeader->m_aMapSize);
+
+	if(pFile == nullptr)
+		io_close(File);
+	else
+		*pFile = File;
+
+	return true;
+}
+
+class CDemoRecordingListener : public CDemoPlayer::IListener
+{
+public:
+	CDemoRecorder *m_pDemoRecorder;
+	CDemoPlayer *m_pDemoPlayer;
+	bool m_Stop;
+	int m_StartTick;
+	int m_EndTick;
+
+	void OnDemoPlayerSnapshot(void *pData, int Size) override
+	{
+		const CDemoPlayer::CPlaybackInfo *pInfo = m_pDemoPlayer->Info();
+
+		if(m_EndTick != -1 && pInfo->m_Info.m_CurrentTick > m_EndTick)
+			m_Stop = true;
+		else if(m_StartTick == -1 || pInfo->m_Info.m_CurrentTick >= m_StartTick)
+			m_pDemoRecorder->RecordSnapshot(pInfo->m_Info.m_CurrentTick, pData, Size);
+	}
+
+	void OnDemoPlayerMessage(void *pData, int Size) override
+	{
+		const CDemoPlayer::CPlaybackInfo *pInfo = m_pDemoPlayer->Info();
+
+		if(m_EndTick != -1 && pInfo->m_Info.m_CurrentTick > m_EndTick)
+			m_Stop = true;
+		else if(m_StartTick == -1 || pInfo->m_Info.m_CurrentTick >= m_StartTick)
+			m_pDemoRecorder->RecordMessage(pData, Size);
+	}
+};
+
+void CDemoEditor::Init(const char *pNetVersion, class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage)
+{
+	m_pNetVersion = pNetVersion;
+	m_pSnapshotDelta = pSnapshotDelta;
+	m_pConsole = pConsole;
+	m_pStorage = pStorage;
+}
+
+void CDemoEditor::Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser)
+{
+	CDemoPlayer DemoPlayer(m_pSnapshotDelta, false);
+	if(DemoPlayer.Load(m_pStorage, m_pConsole, pDemo, IStorage::TYPE_ALL_OR_ABSOLUTE) == -1)
+		return;
+
+	const CMapInfo *pMapInfo = DemoPlayer.GetMapInfo();
+	const CDemoPlayer::CPlaybackInfo *pInfo = DemoPlayer.Info();
+
+	SHA256_DIGEST Sha256 = pMapInfo->m_Sha256;
+	if(pInfo->m_Header.m_Version < gs_Sha256Version)
+	{
+		if(DemoPlayer.ExtractMap(m_pStorage))
+			Sha256 = pMapInfo->m_Sha256;
+	}
+
+	CDemoRecorder DemoRecorder(m_pSnapshotDelta);
+	unsigned char *pMapData = DemoPlayer.GetMapData(m_pStorage);
+	const int Result = DemoRecorder.Start(m_pStorage, m_pConsole, pDst, m_pNetVersion, pMapInfo->m_aName, Sha256, pMapInfo->m_Crc, pInfo->m_Header.m_aType, pMapInfo->m_Size, pMapData, nullptr, pfnFilter, pUser) == -1;
+	free(pMapData);
+	if(Result != 0)
+	{
+		DemoPlayer.Stop();
+		return;
+	}
+
+	CDemoRecordingListener Listener;
+	Listener.m_pDemoRecorder = &DemoRecorder;
+	Listener.m_pDemoPlayer = &DemoPlayer;
+	Listener.m_Stop = false;
+	Listener.m_StartTick = StartTick;
+	Listener.m_EndTick = EndTick;
+	DemoPlayer.SetListener(&Listener);
+
+	DemoPlayer.Play();
+
+	while(DemoPlayer.IsPlaying() && !Listener.m_Stop)
+	{
+		DemoPlayer.Update(false);
+
+		if(pInfo->m_Info.m_Paused)
+			break;
+	}
+
+	// Copy timeline markers to sliced demo
+	for(int i = 0; i < pInfo->m_Info.m_NumTimelineMarkers; i++)
+	{
+		if((StartTick == -1 || pInfo->m_Info.m_aTimelineMarkers[i] >= StartTick) && (EndTick == -1 || pInfo->m_Info.m_aTimelineMarkers[i] <= EndTick))
+		{
+			DemoRecorder.AddDemoMarker(pInfo->m_Info.m_aTimelineMarkers[i]);
+		}
+	}
+
+	DemoPlayer.Stop();
+	DemoRecorder.Stop();
+}
diff --git a/src_bkp/engine/shared/demo.h b/src_bkp/engine/shared/demo.h
new file mode 100644
index 0000000000..0544f41786
--- /dev/null
+++ b/src_bkp/engine/shared/demo.h
@@ -0,0 +1,189 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_DEMO_H
+#define ENGINE_SHARED_DEMO_H
+
+#include <base/hash.h>
+
+#include <engine/demo.h>
+#include <engine/shared/protocol.h>
+
+#include <functional>
+#include <vector>
+
+#include "snapshot.h"
+
+typedef std::function<void()> TUpdateIntraTimesFunc;
+
+class CDemoRecorder : public IDemoRecorder
+{
+	class IConsole *m_pConsole;
+	IOHANDLE m_File;
+	char m_aCurrentFilename[IO_MAX_PATH_LENGTH];
+	int m_LastTickMarker;
+	int m_LastKeyFrame;
+	int m_FirstTick;
+	unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
+	class CSnapshotDelta *m_pSnapshotDelta;
+	int m_NumTimelineMarkers;
+	int m_aTimelineMarkers[MAX_TIMELINE_MARKERS];
+	bool m_NoMapData;
+	unsigned char *m_pMapData;
+
+	DEMOFUNC_FILTER m_pfnFilter;
+	void *m_pUser;
+
+	void WriteTickMarker(int Tick, bool Keyframe);
+	void Write(int Type, const void *pData, int Size);
+
+public:
+	CDemoRecorder(class CSnapshotDelta *pSnapshotDelta, bool NoMapData = false);
+	CDemoRecorder() {}
+	~CDemoRecorder() override;
+
+	int Start(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, const char *pNetversion, const char *pMap, const SHA256_DIGEST &Sha256, unsigned MapCrc, const char *pType, unsigned MapSize, unsigned char *pMapData, IOHANDLE MapFile = nullptr, DEMOFUNC_FILTER pfnFilter = nullptr, void *pUser = nullptr);
+	int Stop() override;
+
+	void AddDemoMarker();
+	void AddDemoMarker(int Tick);
+
+	void RecordSnapshot(int Tick, const void *pData, int Size);
+	void RecordMessage(const void *pData, int Size);
+
+	bool IsRecording() const override { return m_File != nullptr; }
+	char *GetCurrentFilename() override { return m_aCurrentFilename; }
+	void ClearCurrentFilename() { m_aCurrentFilename[0] = '\0'; }
+
+	int Length() const override { return (m_LastTickMarker - m_FirstTick) / SERVER_TICK_SPEED; }
+};
+
+class CDemoPlayer : public IDemoPlayer
+{
+public:
+	class IListener
+	{
+	public:
+		virtual ~IListener() {}
+		virtual void OnDemoPlayerSnapshot(void *pData, int Size) = 0;
+		virtual void OnDemoPlayerMessage(void *pData, int Size) = 0;
+	};
+
+	struct CPlaybackInfo
+	{
+		CDemoHeader m_Header;
+		CTimelineMarkers m_TimelineMarkers;
+
+		IDemoPlayer::CInfo m_Info;
+
+		int64_t m_LastUpdate;
+		int64_t m_CurrentTime;
+
+		int m_NextTick;
+		int m_PreviousTick;
+
+		float m_IntraTick;
+		float m_IntraTickSincePrev;
+		float m_TickTime;
+	};
+
+private:
+	IListener *m_pListener;
+
+	TUpdateIntraTimesFunc m_UpdateIntraTimesFunc;
+
+	// Playback
+	struct SKeyFrame
+	{
+		long m_Filepos;
+		int m_Tick;
+
+		SKeyFrame(long Filepos, int Tick) :
+			m_Filepos(Filepos), m_Tick(Tick)
+		{
+		}
+	};
+
+	class IConsole *m_pConsole;
+	IOHANDLE m_File;
+	long m_MapOffset;
+	char m_aFilename[IO_MAX_PATH_LENGTH];
+	char m_aErrorMessage[256];
+	std::vector<SKeyFrame> m_vKeyFrames;
+	CMapInfo m_MapInfo;
+	int m_SpeedIndex;
+
+	CPlaybackInfo m_Info;
+	unsigned char m_aCompressedSnapshotData[CSnapshot::MAX_SIZE];
+	unsigned char m_aDecompressedSnapshotData[CSnapshot::MAX_SIZE];
+	unsigned char m_aCurrentSnapshotData[CSnapshot::MAX_SIZE];
+	unsigned char m_aDeltaSnapshotData[CSnapshot::MAX_SIZE];
+	unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
+	int m_LastSnapshotDataSize;
+	class CSnapshotDelta *m_pSnapshotDelta;
+
+	bool m_UseVideo;
+#if defined(CONF_VIDEORECORDER)
+	bool m_WasRecording = false;
+#endif
+
+	enum EReadChunkHeaderResult
+	{
+		CHUNKHEADER_SUCCESS,
+		CHUNKHEADER_ERROR,
+		CHUNKHEADER_EOF,
+	};
+	EReadChunkHeaderResult ReadChunkHeader(int *pType, int *pSize, int *pTick);
+	void DoTick();
+	bool ScanFile();
+
+	int64_t Time();
+
+public:
+	CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo);
+	CDemoPlayer(class CSnapshotDelta *pSnapshotDelta, bool UseVideo, TUpdateIntraTimesFunc &&UpdateIntraTimesFunc);
+	~CDemoPlayer() override;
+
+	void Construct(class CSnapshotDelta *pSnapshotDelta, bool UseVideo);
+
+	void SetListener(IListener *pListener);
+
+	int Load(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, int StorageType);
+	unsigned char *GetMapData(class IStorage *pStorage);
+	bool ExtractMap(class IStorage *pStorage);
+	int Play();
+	void Pause() override;
+	void Unpause() override;
+	void Stop(const char *pErrorMessage = "");
+	void SetSpeed(float Speed) override;
+	void SetSpeedIndex(int SpeedIndex) override;
+	void AdjustSpeedIndex(int Offset) override;
+	int SeekPercent(float Percent) override;
+	int SeekTime(float Seconds) override;
+	int SeekTick(ETickOffset TickOffset) override;
+	int SetPos(int WantedTick) override;
+	const CInfo *BaseInfo() const override { return &m_Info.m_Info; }
+	void GetDemoName(char *pBuffer, size_t BufferSize) const override;
+	bool GetDemoInfo(class IStorage *pStorage, class IConsole *pConsole, const char *pFilename, int StorageType, CDemoHeader *pDemoHeader, CTimelineMarkers *pTimelineMarkers, CMapInfo *pMapInfo, IOHANDLE *pFile = nullptr, char *pErrorMessage = nullptr, size_t ErrorMessageSize = 0) const override;
+	const char *Filename() { return m_aFilename; }
+	const char *ErrorMessage() { return m_aErrorMessage; }
+
+	int Update(bool RealTime = true);
+
+	const CPlaybackInfo *Info() const { return &m_Info; }
+	bool IsPlaying() const override { return m_File != nullptr; }
+	const CMapInfo *GetMapInfo() const { return &m_MapInfo; }
+};
+
+class CDemoEditor : public IDemoEditor
+{
+	IConsole *m_pConsole;
+	IStorage *m_pStorage;
+	class CSnapshotDelta *m_pSnapshotDelta;
+	const char *m_pNetVersion;
+
+public:
+	virtual void Init(const char *pNetVersion, class CSnapshotDelta *pSnapshotDelta, class IConsole *pConsole, class IStorage *pStorage);
+	void Slice(const char *pDemo, const char *pDst, int StartTick, int EndTick, DEMOFUNC_FILTER pfnFilter, void *pUser) override;
+};
+
+#endif
diff --git a/src_bkp/engine/shared/econ.cpp b/src_bkp/engine/shared/econ.cpp
new file mode 100644
index 0000000000..7a00362cfd
--- /dev/null
+++ b/src_bkp/engine/shared/econ.cpp
@@ -0,0 +1,173 @@
+#include <engine/console.h>
+#include <engine/shared/config.h>
+
+#include "econ.h"
+#include "netban.h"
+
+CEcon::CEcon() :
+	m_Ready(false)
+{
+}
+
+int CEcon::NewClientCallback(int ClientID, void *pUser)
+{
+	CEcon *pThis = (CEcon *)pUser;
+
+	char aAddrStr[NETADDR_MAXSTRSIZE];
+	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "client accepted. cid=%d addr=%s'", ClientID, aAddrStr);
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "econ", aBuf);
+
+	pThis->m_aClients[ClientID].m_State = CClient::STATE_CONNECTED;
+	pThis->m_aClients[ClientID].m_TimeConnected = time_get();
+	pThis->m_aClients[ClientID].m_AuthTries = 0;
+
+	pThis->m_NetConsole.Send(ClientID, "Enter password:");
+	return 0;
+}
+
+int CEcon::DelClientCallback(int ClientID, const char *pReason, void *pUser)
+{
+	CEcon *pThis = (CEcon *)pUser;
+
+	char aAddrStr[NETADDR_MAXSTRSIZE];
+	net_addr_str(pThis->m_NetConsole.ClientAddr(ClientID), aAddrStr, sizeof(aAddrStr), true);
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d addr=%s reason='%s'", ClientID, aAddrStr, pReason);
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "econ", aBuf);
+
+	pThis->m_aClients[ClientID].m_State = CClient::STATE_EMPTY;
+	return 0;
+}
+
+void CEcon::ConLogout(IConsole::IResult *pResult, void *pUserData)
+{
+	CEcon *pThis = static_cast<CEcon *>(pUserData);
+
+	if(pThis->m_UserClientID >= 0 && pThis->m_UserClientID < NET_MAX_CONSOLE_CLIENTS && pThis->m_aClients[pThis->m_UserClientID].m_State != CClient::STATE_EMPTY)
+		pThis->m_NetConsole.Drop(pThis->m_UserClientID, "Logout");
+}
+
+void CEcon::Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan)
+{
+	m_pConfig = pConfig;
+	m_pConsole = pConsole;
+
+	for(auto &Client : m_aClients)
+		Client.m_State = CClient::STATE_EMPTY;
+
+	m_Ready = false;
+	m_UserClientID = -1;
+
+	if(g_Config.m_EcPort == 0 || g_Config.m_EcPassword[0] == 0)
+		return;
+
+	NETADDR BindAddr;
+	if(g_Config.m_EcBindaddr[0] == '\0')
+	{
+		mem_zero(&BindAddr, sizeof(BindAddr));
+	}
+	else if(net_host_lookup(g_Config.m_EcBindaddr, &BindAddr, NETTYPE_ALL) != 0)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "The configured bindaddr '%s' cannot be resolved.", g_Config.m_Bindaddr);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
+	}
+	BindAddr.type = NETTYPE_ALL;
+	BindAddr.port = g_Config.m_EcPort;
+
+	if(m_NetConsole.Open(BindAddr, pNetBan))
+	{
+		m_NetConsole.SetCallbacks(NewClientCallback, DelClientCallback, this);
+		m_Ready = true;
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "bound to %s:%d", g_Config.m_EcBindaddr, g_Config.m_EcPort);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
+		Console()->Register("logout", "", CFGFLAG_ECON, ConLogout, this, "Logout of econ");
+	}
+	else
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", "couldn't open socket. port might already be in use");
+}
+
+void CEcon::Update()
+{
+	if(!m_Ready)
+		return;
+
+	m_NetConsole.Update();
+
+	char aBuf[NET_MAX_PACKETSIZE];
+	int ClientID;
+
+	while(m_NetConsole.Recv(aBuf, (int)(sizeof(aBuf)) - 1, &ClientID))
+	{
+		dbg_assert(m_aClients[ClientID].m_State != CClient::STATE_EMPTY, "got message from empty slot");
+		if(m_aClients[ClientID].m_State == CClient::STATE_CONNECTED)
+		{
+			if(str_comp(aBuf, g_Config.m_EcPassword) == 0)
+			{
+				m_aClients[ClientID].m_State = CClient::STATE_AUTHED;
+				m_NetConsole.Send(ClientID, "Authentication successful. External console access granted.");
+
+				str_format(aBuf, sizeof(aBuf), "cid=%d authed", ClientID);
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
+			}
+			else
+			{
+				m_aClients[ClientID].m_AuthTries++;
+				char aMsg[128];
+				str_format(aMsg, sizeof(aMsg), "Wrong password %d/%d.", m_aClients[ClientID].m_AuthTries, MAX_AUTH_TRIES);
+				m_NetConsole.Send(ClientID, aMsg);
+				if(m_aClients[ClientID].m_AuthTries >= MAX_AUTH_TRIES)
+				{
+					if(!g_Config.m_EcBantime)
+						m_NetConsole.Drop(ClientID, "Too many authentication tries");
+					else
+						m_NetConsole.NetBan()->BanAddr(m_NetConsole.ClientAddr(ClientID), g_Config.m_EcBantime * 60, "Too many authentication tries");
+				}
+			}
+		}
+		else if(m_aClients[ClientID].m_State == CClient::STATE_AUTHED)
+		{
+			char aFormatted[256];
+			str_format(aFormatted, sizeof(aFormatted), "cid=%d cmd='%s'", ClientID, aBuf);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aFormatted);
+			m_UserClientID = ClientID;
+			Console()->ExecuteLine(aBuf);
+			m_UserClientID = -1;
+		}
+	}
+
+	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; ++i)
+	{
+		if(m_aClients[i].m_State == CClient::STATE_CONNECTED &&
+			time_get() > m_aClients[i].m_TimeConnected + g_Config.m_EcAuthTimeout * time_freq())
+			m_NetConsole.Drop(i, "authentication timeout");
+	}
+}
+
+void CEcon::Send(int ClientID, const char *pLine)
+{
+	if(!m_Ready)
+		return;
+
+	if(ClientID == -1)
+	{
+		for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
+		{
+			if(m_aClients[i].m_State == CClient::STATE_AUTHED)
+				m_NetConsole.Send(i, pLine);
+		}
+	}
+	else if(ClientID >= 0 && ClientID < NET_MAX_CONSOLE_CLIENTS && m_aClients[ClientID].m_State == CClient::STATE_AUTHED)
+		m_NetConsole.Send(ClientID, pLine);
+}
+
+void CEcon::Shutdown()
+{
+	if(!m_Ready)
+		return;
+
+	m_NetConsole.Close();
+}
diff --git a/src_bkp/engine/shared/econ.h b/src_bkp/engine/shared/econ.h
new file mode 100644
index 0000000000..c7cc60f526
--- /dev/null
+++ b/src_bkp/engine/shared/econ.h
@@ -0,0 +1,59 @@
+#ifndef ENGINE_SHARED_ECON_H
+#define ENGINE_SHARED_ECON_H
+
+#include "network.h"
+
+#include <engine/console.h>
+
+class CConfig;
+class CNetBan;
+class ColorRGBA;
+
+class CEcon
+{
+	enum
+	{
+		MAX_AUTH_TRIES = 3,
+	};
+
+	class CClient
+	{
+	public:
+		enum
+		{
+			STATE_EMPTY = 0,
+			STATE_CONNECTED,
+			STATE_AUTHED,
+		};
+
+		int m_State;
+		int64_t m_TimeConnected;
+		int m_AuthTries;
+	};
+	CClient m_aClients[NET_MAX_CONSOLE_CLIENTS];
+
+	CConfig *m_pConfig;
+	IConsole *m_pConsole;
+	CNetConsole m_NetConsole;
+
+	bool m_Ready;
+	int m_PrintCBIndex;
+	int m_UserClientID;
+
+	static void SendLineCB(const char *pLine, void *pUserData, ColorRGBA PrintColor = {1, 1, 1, 1});
+	static void ConLogout(IConsole::IResult *pResult, void *pUserData);
+
+	static int NewClientCallback(int ClientID, void *pUser);
+	static int DelClientCallback(int ClientID, const char *pReason, void *pUser);
+
+public:
+	CEcon();
+	IConsole *Console() { return m_pConsole; }
+
+	void Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan);
+	void Update();
+	void Send(int ClientID, const char *pLine);
+	void Shutdown();
+};
+
+#endif
diff --git a/src_bkp/engine/shared/engine.cpp b/src_bkp/engine/shared/engine.cpp
new file mode 100644
index 0000000000..9f0469e98d
--- /dev/null
+++ b/src_bkp/engine/shared/engine.cpp
@@ -0,0 +1,107 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/shared/config.h>
+#include <engine/shared/network.h>
+#include <engine/storage.h>
+
+class CEngine : public IEngine
+{
+public:
+	IConsole *m_pConsole;
+	IStorage *m_pStorage;
+	bool m_Logging;
+
+	std::shared_ptr<CFutureLogger> m_pFutureLogger;
+
+	char m_aAppName[256];
+
+	static void Con_DbgLognetwork(IConsole::IResult *pResult, void *pUserData)
+	{
+		CEngine *pEngine = static_cast<CEngine *>(pUserData);
+
+		if(pEngine->m_Logging)
+		{
+			CNetBase::CloseLog();
+			pEngine->m_Logging = false;
+		}
+		else
+		{
+			char aBuf[32];
+			str_timestamp(aBuf, sizeof(aBuf));
+			char aFilenameSent[IO_MAX_PATH_LENGTH], aFilenameRecv[IO_MAX_PATH_LENGTH];
+			str_format(aFilenameSent, sizeof(aFilenameSent), "dumps/network_sent_%s.txt", aBuf);
+			str_format(aFilenameRecv, sizeof(aFilenameRecv), "dumps/network_recv_%s.txt", aBuf);
+			CNetBase::OpenLog(pEngine->m_pStorage->OpenFile(aFilenameSent, IOFLAG_WRITE, IStorage::TYPE_SAVE),
+				pEngine->m_pStorage->OpenFile(aFilenameRecv, IOFLAG_WRITE, IStorage::TYPE_SAVE));
+			pEngine->m_Logging = true;
+		}
+	}
+
+	CEngine(bool Test, const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs) :
+		m_pFutureLogger(std::move(pFutureLogger))
+	{
+		str_copy(m_aAppName, pAppname);
+		if(!Test)
+		{
+			dbg_msg("engine", "running on %s-%s-%s", CONF_FAMILY_STRING, CONF_PLATFORM_STRING, CONF_ARCH_STRING);
+			dbg_msg("engine", "arch is %s", CONF_ARCH_ENDIAN_STRING);
+
+			char aVersionStr[128];
+			if(os_version_str(aVersionStr, sizeof(aVersionStr)))
+			{
+				dbg_msg("engine", "operating system version: %s", aVersionStr);
+			}
+
+			// init the network
+			net_init();
+			CNetBase::Init();
+		}
+
+		m_JobPool.Init(Jobs);
+
+		m_Logging = false;
+	}
+
+	~CEngine() override
+	{
+		m_JobPool.Destroy();
+		CNetBase::CloseLog();
+	}
+
+	void Init() override
+	{
+		m_pConsole = Kernel()->RequestInterface<IConsole>();
+		m_pStorage = Kernel()->RequestInterface<IStorage>();
+
+		if(!m_pConsole || !m_pStorage)
+			return;
+
+		m_pConsole->Register("dbg_lognetwork", "", CFGFLAG_SERVER | CFGFLAG_CLIENT, Con_DbgLognetwork, this, "Log the network");
+	}
+
+	void AddJob(std::shared_ptr<IJob> pJob) override
+	{
+		if(g_Config.m_Debug)
+			dbg_msg("engine", "job added");
+		m_JobPool.Add(std::move(pJob));
+	}
+
+	void SetAdditionalLogger(std::shared_ptr<ILogger> &&pLogger) override
+	{
+		m_pFutureLogger->Set(pLogger);
+	}
+};
+
+void IEngine::RunJobBlocking(IJob *pJob)
+{
+	CJobPool::RunBlocking(pJob);
+}
+
+IEngine *CreateEngine(const char *pAppname, std::shared_ptr<CFutureLogger> pFutureLogger, int Jobs) { return new CEngine(false, pAppname, std::move(pFutureLogger), Jobs); }
+IEngine *CreateTestEngine(const char *pAppname, int Jobs) { return new CEngine(true, pAppname, nullptr, Jobs); }
diff --git a/src_bkp/engine/shared/fifo.cpp b/src_bkp/engine/shared/fifo.cpp
new file mode 100644
index 0000000000..af2b49f09a
--- /dev/null
+++ b/src_bkp/engine/shared/fifo.cpp
@@ -0,0 +1,200 @@
+#include "fifo.h"
+
+#include <base/system.h>
+#if defined(CONF_FAMILY_UNIX)
+
+#include <cstdlib>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+void CFifo::Init(IConsole *pConsole, char *pFifoFile, int Flag)
+{
+	m_File = -1;
+
+	m_pConsole = pConsole;
+	if(pFifoFile[0] == '\0')
+		return;
+
+	str_copy(m_aFilename, pFifoFile);
+	m_Flag = Flag;
+
+	mkfifo(m_aFilename, 0600);
+
+	struct stat Attribute;
+	stat(m_aFilename, &Attribute);
+
+	if(!S_ISFIFO(Attribute.st_mode))
+	{
+		dbg_msg("fifo", "'%s' is not a fifo, removing", m_aFilename);
+		fs_remove(m_aFilename);
+		mkfifo(m_aFilename, 0600);
+		stat(m_aFilename, &Attribute);
+
+		if(!S_ISFIFO(Attribute.st_mode))
+		{
+			dbg_msg("fifo", "can't remove file '%s'", m_aFilename);
+			return;
+		}
+	}
+
+	m_File = open(m_aFilename, O_RDONLY | O_NONBLOCK);
+	if(m_File < 0)
+		dbg_msg("fifo", "can't open file '%s'", m_aFilename);
+}
+
+void CFifo::Shutdown()
+{
+	if(m_File < 0)
+		return;
+
+	close(m_File);
+	fs_remove(m_aFilename);
+}
+
+void CFifo::Update()
+{
+	if(m_File < 0)
+		return;
+
+	char aBuf[8192];
+	int Length = read(m_File, aBuf, sizeof(aBuf) - 1);
+	if(Length <= 0)
+		return;
+	aBuf[Length] = '\0';
+
+	char *pCur = aBuf;
+	for(int i = 0; i < Length; ++i)
+	{
+		if(aBuf[i] != '\n')
+			continue;
+		aBuf[i] = '\0';
+		m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+		pCur = aBuf + i + 1;
+	}
+	if(pCur < aBuf + Length) // missed the last line
+		m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+}
+
+#elif defined(CONF_FAMILY_WINDOWS)
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+void CFifo::Init(IConsole *pConsole, char *pFifoFile, int Flag)
+{
+	m_pConsole = pConsole;
+	if(pFifoFile[0] == '\0')
+	{
+		m_pPipe = INVALID_HANDLE_VALUE;
+		return;
+	}
+
+	str_copy(m_aFilename, "\\\\.\\pipe\\");
+	str_append(m_aFilename, pFifoFile);
+	m_Flag = Flag;
+
+	const std::wstring WideFilename = windows_utf8_to_wide(m_aFilename);
+	m_pPipe = CreateNamedPipeW(WideFilename.c_str(),
+		PIPE_ACCESS_DUPLEX,
+		PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_NOWAIT | PIPE_REJECT_REMOTE_CLIENTS,
+		PIPE_UNLIMITED_INSTANCES,
+		8192,
+		8192,
+		NMPWAIT_USE_DEFAULT_WAIT,
+		NULL);
+	if(m_pPipe == INVALID_HANDLE_VALUE)
+	{
+		const DWORD LastError = GetLastError();
+		const std::string ErrorMsg = windows_format_system_message(LastError);
+		dbg_msg("fifo", "failed to create named pipe '%s' (%ld %s)", m_aFilename, LastError, ErrorMsg.c_str());
+	}
+	else
+		dbg_msg("fifo", "created named pipe '%s'", m_aFilename);
+}
+
+void CFifo::Shutdown()
+{
+	if(m_pPipe == INVALID_HANDLE_VALUE)
+		return;
+
+	DisconnectNamedPipe(m_pPipe);
+	CloseHandle(m_pPipe);
+	m_pPipe = INVALID_HANDLE_VALUE;
+}
+
+void CFifo::Update()
+{
+	if(m_pPipe == INVALID_HANDLE_VALUE)
+		return;
+
+	if(!ConnectNamedPipe(m_pPipe, NULL))
+	{
+		const DWORD LastError = GetLastError();
+		if(LastError == ERROR_PIPE_LISTENING) // waiting for clients to connect
+			return;
+		if(LastError == ERROR_NO_DATA) // pipe was disconnected from the other end, also disconnect it from this end
+		{
+			// disconnect the previous client so we can connect to a new one
+			DisconnectNamedPipe(m_pPipe);
+			return;
+		}
+		if(LastError != ERROR_PIPE_CONNECTED) // pipe already connected, not an error
+		{
+			const std::string ErrorMsg = windows_format_system_message(LastError);
+			dbg_msg("fifo", "failed to connect named pipe '%s' (%ld %s)", m_aFilename, LastError, ErrorMsg.c_str());
+			return;
+		}
+	}
+
+	while(true) // read all messages from the pipe
+	{
+		DWORD BytesAvailable;
+		if(!PeekNamedPipe(m_pPipe, NULL, 0, NULL, &BytesAvailable, NULL))
+		{
+			const DWORD LastError = GetLastError();
+			if(LastError == ERROR_BROKEN_PIPE)
+			{
+				// Pipe was disconnected from the other side, either immediately
+				// after connecting or after reading the previous message.
+				DisconnectNamedPipe(m_pPipe);
+			}
+			else
+			{
+				const std::string ErrorMsg = windows_format_system_message(LastError);
+				dbg_msg("fifo", "failed to peek at pipe '%s' (%ld %s)", m_aFilename, LastError, ErrorMsg.c_str());
+			}
+			return;
+		}
+		if(BytesAvailable == 0) // pipe connected but no data available
+			return;
+
+		char *pBuf = static_cast<char *>(malloc(BytesAvailable + 1));
+		DWORD Length;
+		if(!ReadFile(m_pPipe, pBuf, BytesAvailable, &Length, NULL))
+		{
+			const DWORD LastError = GetLastError();
+			const std::string ErrorMsg = windows_format_system_message(LastError);
+			dbg_msg("fifo", "failed to read from pipe '%s' (%ld %s)", m_aFilename, LastError, ErrorMsg.c_str());
+			free(pBuf);
+			return;
+		}
+		pBuf[Length] = '\0';
+
+		char *pCur = pBuf;
+		for(DWORD i = 0; i < Length; ++i)
+		{
+			if(pBuf[i] != '\n')
+				continue;
+			pBuf[i] = '\0';
+			m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+			pCur = pBuf + i + 1;
+		}
+		if(pCur < pBuf + Length) // missed the last line
+			m_pConsole->ExecuteLineFlag(pCur, m_Flag, -1);
+
+		free(pBuf);
+	}
+}
+#endif
diff --git a/src_bkp/engine/shared/fifo.h b/src_bkp/engine/shared/fifo.h
new file mode 100644
index 0000000000..ad431b9bba
--- /dev/null
+++ b/src_bkp/engine/shared/fifo.h
@@ -0,0 +1,24 @@
+#ifndef ENGINE_SHARED_FIFO_H
+#define ENGINE_SHARED_FIFO_H
+
+#include <base/detect.h>
+#include <engine/console.h>
+
+class CFifo
+{
+	IConsole *m_pConsole;
+	char m_aFilename[IO_MAX_PATH_LENGTH];
+	int m_Flag;
+#if defined(CONF_FAMILY_UNIX)
+	int m_File;
+#elif defined(CONF_FAMILY_WINDOWS)
+	void *m_pPipe;
+#endif
+
+public:
+	void Init(IConsole *pConsole, char *pFifoFile, int Flag);
+	void Update();
+	void Shutdown();
+};
+
+#endif
diff --git a/src_bkp/engine/shared/filecollection.cpp b/src_bkp/engine/shared/filecollection.cpp
new file mode 100644
index 0000000000..0dab1c258f
--- /dev/null
+++ b/src_bkp/engine/shared/filecollection.cpp
@@ -0,0 +1,273 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/storage.h>
+
+#include "filecollection.h"
+
+bool CFileCollection::IsFilenameValid(const char *pFilename)
+{
+	if(m_aFileDesc[0] == '\0')
+	{
+		int FilenameLength = str_length(pFilename);
+		if(m_FileExtLength + TIMESTAMP_LENGTH > FilenameLength)
+		{
+			return false;
+		}
+
+		pFilename += FilenameLength - m_FileExtLength - TIMESTAMP_LENGTH;
+	}
+	else
+	{
+		if(str_length(pFilename) != m_FileDescLength + TIMESTAMP_LENGTH + m_FileExtLength ||
+			str_comp_num(pFilename, m_aFileDesc, m_FileDescLength) ||
+			str_comp(pFilename + m_FileDescLength + TIMESTAMP_LENGTH, m_aFileExt))
+			return false;
+
+		pFilename += m_FileDescLength;
+	}
+
+	return pFilename[0] == '_' &&
+	       pFilename[1] >= '0' && pFilename[1] <= '9' &&
+	       pFilename[2] >= '0' && pFilename[2] <= '9' &&
+	       pFilename[3] >= '0' && pFilename[3] <= '9' &&
+	       pFilename[4] >= '0' && pFilename[4] <= '9' &&
+	       pFilename[5] == '-' &&
+	       pFilename[6] >= '0' && pFilename[6] <= '9' &&
+	       pFilename[7] >= '0' && pFilename[7] <= '9' &&
+	       pFilename[8] == '-' &&
+	       pFilename[9] >= '0' && pFilename[9] <= '9' &&
+	       pFilename[10] >= '0' && pFilename[10] <= '9' &&
+	       pFilename[11] == '_' &&
+	       pFilename[12] >= '0' && pFilename[12] <= '9' &&
+	       pFilename[13] >= '0' && pFilename[13] <= '9' &&
+	       pFilename[14] == '-' &&
+	       pFilename[15] >= '0' && pFilename[15] <= '9' &&
+	       pFilename[16] >= '0' && pFilename[16] <= '9' &&
+	       pFilename[17] == '-' &&
+	       pFilename[18] >= '0' && pFilename[18] <= '9' &&
+	       pFilename[19] >= '0' && pFilename[19] <= '9';
+}
+
+int64_t CFileCollection::ExtractTimestamp(const char *pTimestring)
+{
+	int64_t Timestamp = pTimestring[0] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[1] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[2] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[3] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[5] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[6] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[8] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[9] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[11] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[12] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[14] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[15] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[17] - '0';
+	Timestamp <<= 4;
+	Timestamp += pTimestring[18] - '0';
+
+	return Timestamp;
+}
+
+void CFileCollection::BuildTimestring(int64_t Timestamp, char *pTimestring)
+{
+	pTimestring[19] = 0;
+	pTimestring[18] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[17] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[16] = '-';
+	pTimestring[15] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[14] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[13] = '-';
+	pTimestring[12] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[11] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[10] = '_';
+	pTimestring[9] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[8] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[7] = '-';
+	pTimestring[6] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[5] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[4] = '-';
+	pTimestring[3] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[2] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[1] = (Timestamp & 0xF) + '0';
+	Timestamp >>= 4;
+	pTimestring[0] = (Timestamp & 0xF) + '0';
+}
+
+void CFileCollection::Init(IStorage *pStorage, const char *pPath, const char *pFileDesc, const char *pFileExt, int MaxEntries)
+{
+	mem_zero(m_aTimestamps, sizeof(m_aTimestamps));
+	m_NumTimestamps = 0;
+	m_Remove = -1;
+	// MAX_ENTRIES - 1 to make sure that we can insert one entry into the sorted
+	// list and then remove the oldest one
+	m_MaxEntries = clamp(MaxEntries, 1, static_cast<int>(MAX_ENTRIES) - 1);
+	str_copy(m_aFileDesc, pFileDesc);
+	m_FileDescLength = str_length(m_aFileDesc);
+	str_copy(m_aFileExt, pFileExt);
+	m_FileExtLength = str_length(m_aFileExt);
+	str_copy(m_aPath, pPath);
+	m_pStorage = pStorage;
+
+	m_pStorage->ListDirectory(IStorage::TYPE_SAVE, m_aPath, FilelistCallback, this);
+}
+
+void CFileCollection::AddEntry(int64_t Timestamp)
+{
+	if(m_NumTimestamps == 0)
+	{
+		// empty list
+		m_aTimestamps[m_NumTimestamps++] = Timestamp;
+	}
+	else
+	{
+		// add entry to the sorted list
+		if(Timestamp < m_aTimestamps[0])
+		{
+			// first entry
+			if(m_NumTimestamps <= m_MaxEntries)
+			{
+				mem_move(m_aTimestamps + 1, m_aTimestamps, m_NumTimestamps * sizeof(int64_t));
+				m_aTimestamps[0] = Timestamp;
+				++m_NumTimestamps;
+			}
+		}
+		else if(Timestamp >= m_aTimestamps[m_NumTimestamps - 1])
+		{
+			// last entry
+			if(m_NumTimestamps > m_MaxEntries)
+			{
+				mem_move(m_aTimestamps, m_aTimestamps + 1, (m_NumTimestamps - 1) * sizeof(int64_t));
+				m_aTimestamps[m_NumTimestamps - 1] = Timestamp;
+			}
+			else
+				m_aTimestamps[m_NumTimestamps++] = Timestamp;
+		}
+		else
+		{
+			// middle entry
+			int Left = 0, Right = m_NumTimestamps - 1;
+			while(Right - Left > 1)
+			{
+				int Mid = (Left + Right) / 2;
+				if(m_aTimestamps[Mid] > Timestamp)
+					Right = Mid;
+				else
+					Left = Mid;
+			}
+
+			if(m_NumTimestamps > m_MaxEntries)
+			{
+				mem_move(m_aTimestamps, m_aTimestamps + 1, (Right - 1) * sizeof(int64_t));
+				m_aTimestamps[Right - 1] = Timestamp;
+			}
+			else
+			{
+				mem_move(m_aTimestamps + Right + 1, m_aTimestamps + Right, (m_NumTimestamps - Right) * sizeof(int64_t));
+				m_aTimestamps[Right] = Timestamp;
+				++m_NumTimestamps;
+			}
+		}
+
+		// remove old file only after we inserted the new entry, otherwise we can't
+		// know which one is the oldest
+		if(m_NumTimestamps > m_MaxEntries)
+		{
+			if(m_aFileDesc[0] == '\0') // consider an empty file desc as a wild card
+			{
+				m_Remove = m_aTimestamps[0];
+				m_pStorage->ListDirectory(IStorage::TYPE_SAVE, m_aPath, RemoveCallback, this);
+			}
+			else
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				char aTimestring[TIMESTAMP_LENGTH];
+				BuildTimestring(m_aTimestamps[0], aTimestring);
+
+				str_format(aBuf, sizeof(aBuf), "%s/%s_%s%s", m_aPath, m_aFileDesc, aTimestring, m_aFileExt);
+				m_pStorage->RemoveFile(aBuf, IStorage::TYPE_SAVE);
+			}
+		}
+	}
+}
+
+int64_t CFileCollection::GetTimestamp(const char *pFilename)
+{
+	if(m_aFileDesc[0] == '\0')
+	{
+		int FilenameLength = str_length(pFilename);
+		return ExtractTimestamp(pFilename + FilenameLength - m_FileExtLength - TIMESTAMP_LENGTH + 1);
+	}
+	else
+	{
+		return ExtractTimestamp(pFilename + m_FileDescLength + 1);
+	}
+}
+
+int CFileCollection::FilelistCallback(const char *pFilename, int IsDir, int StorageType, void *pUser)
+{
+	CFileCollection *pThis = static_cast<CFileCollection *>(pUser);
+
+	// check for valid file name format
+	if(IsDir || !pThis->IsFilenameValid(pFilename))
+		return 0;
+
+	// extract the timestamp
+	int64_t Timestamp = pThis->GetTimestamp(pFilename);
+
+	// add the entry
+	pThis->AddEntry(Timestamp);
+
+	return 0;
+}
+
+int CFileCollection::RemoveCallback(const char *pFilename, int IsDir, int StorageType, void *pUser)
+{
+	CFileCollection *pThis = static_cast<CFileCollection *>(pUser);
+
+	// check for valid file name format
+	if(IsDir || !pThis->IsFilenameValid(pFilename))
+		return 0;
+
+	// extract the timestamp
+	int64_t Timestamp = pThis->GetTimestamp(pFilename);
+
+	if(Timestamp == pThis->m_Remove)
+	{
+		char aBuf[IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "%s/%s", pThis->m_aPath, pFilename);
+		pThis->m_pStorage->RemoveFile(aBuf, IStorage::TYPE_SAVE);
+		pThis->m_Remove = -1;
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/src_bkp/engine/shared/filecollection.h b/src_bkp/engine/shared/filecollection.h
new file mode 100644
index 0000000000..9a4b561c65
--- /dev/null
+++ b/src_bkp/engine/shared/filecollection.h
@@ -0,0 +1,44 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_FILECOLLECTION_H
+#define ENGINE_SHARED_FILECOLLECTION_H
+
+#include <base/types.h>
+
+#include <cstdint>
+
+class IStorage;
+
+class CFileCollection
+{
+	enum
+	{
+		MAX_ENTRIES = 1001,
+		TIMESTAMP_LENGTH = 20, // _YYYY-MM-DD_HH-MM-SS
+	};
+
+	int64_t m_aTimestamps[MAX_ENTRIES];
+	int m_NumTimestamps;
+	int m_MaxEntries;
+	char m_aFileDesc[128];
+	int m_FileDescLength;
+	char m_aFileExt[32];
+	int m_FileExtLength;
+	char m_aPath[IO_MAX_PATH_LENGTH];
+	IStorage *m_pStorage;
+	int64_t m_Remove; // Timestamp we want to remove
+
+	bool IsFilenameValid(const char *pFilename);
+	int64_t ExtractTimestamp(const char *pTimestring);
+	void BuildTimestring(int64_t Timestamp, char *pTimestring);
+	int64_t GetTimestamp(const char *pFilename);
+
+public:
+	void Init(IStorage *pStorage, const char *pPath, const char *pFileDesc, const char *pFileExt, int MaxEntries);
+	void AddEntry(int64_t Timestamp);
+
+	static int FilelistCallback(const char *pFilename, int IsDir, int StorageType, void *pUser);
+	static int RemoveCallback(const char *pFilename, int IsDir, int StorageType, void *pUser);
+};
+
+#endif
diff --git a/src_bkp/engine/shared/global_uuid_manager.cpp b/src_bkp/engine/shared/global_uuid_manager.cpp
new file mode 100644
index 0000000000..e7223b9dae
--- /dev/null
+++ b/src_bkp/engine/shared/global_uuid_manager.cpp
@@ -0,0 +1,16 @@
+#include "protocol_ex.h"
+#include "teehistorian_ex.h"
+#include "uuid_manager.h"
+
+#include <engine/uuid.h>
+
+static CUuidManager CreateGlobalUuidManager()
+{
+	CUuidManager Manager;
+	RegisterUuids(&Manager);
+	RegisterTeehistorianUuids(&Manager);
+	RegisterGameUuids(&Manager);
+	return Manager;
+}
+
+CUuidManager g_UuidManager = CreateGlobalUuidManager();
diff --git a/src_bkp/engine/shared/host_lookup.cpp b/src_bkp/engine/shared/host_lookup.cpp
new file mode 100644
index 0000000000..ea79b97f0b
--- /dev/null
+++ b/src_bkp/engine/shared/host_lookup.cpp
@@ -0,0 +1,19 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "host_lookup.h"
+
+#include <base/system.h>
+
+CHostLookup::CHostLookup() = default;
+
+CHostLookup::CHostLookup(const char *pHostname, int Nettype)
+{
+	str_copy(m_aHostname, pHostname);
+	m_Nettype = Nettype;
+}
+
+void CHostLookup::Run()
+{
+	m_Result = net_host_lookup(m_aHostname, &m_Addr, m_Nettype);
+}
diff --git a/src_bkp/engine/shared/host_lookup.h b/src_bkp/engine/shared/host_lookup.h
new file mode 100644
index 0000000000..940be405b8
--- /dev/null
+++ b/src_bkp/engine/shared/host_lookup.h
@@ -0,0 +1,30 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_HOST_LOOKUP_H
+#define ENGINE_SHARED_HOST_LOOKUP_H
+
+#include <base/system.h>
+
+#include <engine/shared/jobs.h>
+
+class CHostLookup : public IJob
+{
+private:
+	int m_Result;
+	char m_aHostname[128];
+	int m_Nettype;
+	NETADDR m_Addr;
+
+	void Run() override;
+
+public:
+	CHostLookup();
+	CHostLookup(const char *pHostname, int Nettype);
+
+	int Result() const { return m_Result; }
+	const char *Hostname() const { return m_aHostname; }
+	int Nettype() const { return m_Nettype; }
+	NETADDR Addr() const { return m_Addr; }
+};
+
+#endif
diff --git a/src_bkp/engine/shared/http.cpp b/src_bkp/engine/shared/http.cpp
new file mode 100644
index 0000000000..259ff8d044
--- /dev/null
+++ b/src_bkp/engine/shared/http.cpp
@@ -0,0 +1,438 @@
+#include "http.h"
+
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/external/json-parser/json.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <game/version.h>
+
+#if !defined(CONF_FAMILY_WINDOWS)
+#include <csignal>
+#endif
+
+#define WIN32_LEAN_AND_MEAN
+#include <curl/curl.h>
+
+// TODO: Non-global pls?
+static CURLSH *gs_pShare;
+static CLock gs_aLocks[CURL_LOCK_DATA_LAST + 1];
+static bool gs_Initialized = false;
+
+static int GetLockIndex(int Data)
+{
+	if(!(0 <= Data && Data < CURL_LOCK_DATA_LAST))
+	{
+		Data = CURL_LOCK_DATA_LAST;
+	}
+	return Data;
+}
+
+static void CurlLock(CURL *pHandle, curl_lock_data Data, curl_lock_access Access, void *pUser) ACQUIRE(gs_aLocks[GetLockIndex(Data)])
+{
+	(void)pHandle;
+	(void)Access;
+	(void)pUser;
+	gs_aLocks[GetLockIndex(Data)].lock();
+}
+
+static void CurlUnlock(CURL *pHandle, curl_lock_data Data, void *pUser) RELEASE(gs_aLocks[GetLockIndex(Data)])
+{
+	(void)pHandle;
+	(void)pUser;
+	gs_aLocks[GetLockIndex(Data)].unlock();
+}
+
+int CurlDebug(CURL *pHandle, curl_infotype Type, char *pData, size_t DataSize, void *pUser)
+{
+	char TypeChar;
+	switch(Type)
+	{
+	case CURLINFO_TEXT:
+		TypeChar = '*';
+		break;
+	case CURLINFO_HEADER_OUT:
+		TypeChar = '<';
+		break;
+	case CURLINFO_HEADER_IN:
+		TypeChar = '>';
+		break;
+	default:
+		return 0;
+	}
+	while(const char *pLineEnd = (const char *)memchr(pData, '\n', DataSize))
+	{
+		int LineLength = pLineEnd - pData;
+		log_debug("curl", "%c %.*s", TypeChar, LineLength, pData);
+		pData += LineLength + 1;
+		DataSize -= LineLength + 1;
+	}
+	return 0;
+}
+
+bool HttpInit(IStorage *pStorage)
+{
+	if(curl_global_init(CURL_GLOBAL_DEFAULT))
+	{
+		return true;
+	}
+	gs_pShare = curl_share_init();
+	if(!gs_pShare)
+	{
+		return true;
+	}
+	// print curl version
+	{
+		curl_version_info_data *pVersion = curl_version_info(CURLVERSION_NOW);
+		dbg_msg("http", "libcurl version %s (compiled = " LIBCURL_VERSION ")", pVersion->version);
+	}
+
+	curl_share_setopt(gs_pShare, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
+	curl_share_setopt(gs_pShare, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
+	curl_share_setopt(gs_pShare, CURLSHOPT_LOCKFUNC, CurlLock);
+	curl_share_setopt(gs_pShare, CURLSHOPT_UNLOCKFUNC, CurlUnlock);
+
+#if !defined(CONF_FAMILY_WINDOWS)
+	// As a multithreaded application we have to tell curl to not install signal
+	// handlers and instead ignore SIGPIPE from OpenSSL ourselves.
+	signal(SIGPIPE, SIG_IGN);
+#endif
+
+	gs_Initialized = true;
+
+	return false;
+}
+
+void EscapeUrl(char *pBuf, int Size, const char *pStr)
+{
+	char *pEsc = curl_easy_escape(0, pStr, 0);
+	str_copy(pBuf, pEsc, Size);
+	curl_free(pEsc);
+}
+
+bool HttpHasIpresolveBug()
+{
+	// curl < 7.77.0 doesn't use CURLOPT_IPRESOLVE correctly wrt.
+	// connection caches.
+	return curl_version_info(CURLVERSION_NOW)->version_num < 0x074d00;
+}
+
+CHttpRequest::CHttpRequest(const char *pUrl)
+{
+	str_copy(m_aUrl, pUrl);
+	sha256_init(&m_ActualSha256);
+}
+
+CHttpRequest::~CHttpRequest()
+{
+	m_ResponseLength = 0;
+	if(!m_WriteToFile)
+	{
+		m_BufferSize = 0;
+		free(m_pBuffer);
+		m_pBuffer = nullptr;
+	}
+	curl_slist_free_all((curl_slist *)m_pHeaders);
+	m_pHeaders = nullptr;
+	if(m_pBody)
+	{
+		m_BodyLength = 0;
+		free(m_pBody);
+		m_pBody = nullptr;
+	}
+}
+
+void CHttpRequest::Run()
+{
+	dbg_assert(gs_Initialized, "must initialize HTTP before running HTTP requests");
+	int FinalState;
+	if(!BeforeInit())
+	{
+		FinalState = HTTP_ERROR;
+	}
+	else
+	{
+		CURL *pHandle = curl_easy_init();
+		FinalState = RunImpl(pHandle);
+		curl_easy_cleanup(pHandle);
+	}
+
+	m_State = OnCompletion(FinalState);
+}
+
+bool CHttpRequest::BeforeInit()
+{
+	if(m_WriteToFile)
+	{
+		if(fs_makedir_rec_for(m_aDestAbsolute) < 0)
+		{
+			dbg_msg("http", "i/o error, cannot create folder for: %s", m_aDest);
+			return false;
+		}
+
+		m_File = io_open(m_aDestAbsolute, IOFLAG_WRITE);
+		if(!m_File)
+		{
+			dbg_msg("http", "i/o error, cannot open file: %s", m_aDest);
+			return false;
+		}
+	}
+	return true;
+}
+
+int CHttpRequest::RunImpl(CURL *pUser)
+{
+	CURL *pHandle = (CURL *)pUser;
+	if(!pHandle)
+	{
+		return HTTP_ERROR;
+	}
+
+	if(g_Config.m_DbgCurl)
+	{
+		curl_easy_setopt(pHandle, CURLOPT_VERBOSE, 1L);
+		curl_easy_setopt(pHandle, CURLOPT_DEBUGFUNCTION, CurlDebug);
+	}
+	long Protocols = CURLPROTO_HTTPS;
+	if(g_Config.m_HttpAllowInsecure)
+	{
+		Protocols |= CURLPROTO_HTTP;
+	}
+	char aErr[CURL_ERROR_SIZE];
+	curl_easy_setopt(pHandle, CURLOPT_ERRORBUFFER, aErr);
+
+	curl_easy_setopt(pHandle, CURLOPT_CONNECTTIMEOUT_MS, m_Timeout.ConnectTimeoutMs);
+	curl_easy_setopt(pHandle, CURLOPT_TIMEOUT_MS, m_Timeout.TimeoutMs);
+	curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_LIMIT, m_Timeout.LowSpeedLimit);
+	curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_TIME, m_Timeout.LowSpeedTime);
+	if(m_MaxResponseSize >= 0)
+	{
+		curl_easy_setopt(pHandle, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)m_MaxResponseSize);
+	}
+
+	curl_easy_setopt(pHandle, CURLOPT_SHARE, gs_pShare);
+	// ‘CURLOPT_PROTOCOLS’ is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR
+	// Wait until all platforms have 7.85.0
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+	curl_easy_setopt(pHandle, CURLOPT_PROTOCOLS, Protocols);
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+	curl_easy_setopt(pHandle, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(pHandle, CURLOPT_MAXREDIRS, 4L);
+	curl_easy_setopt(pHandle, CURLOPT_FAILONERROR, 1L);
+	curl_easy_setopt(pHandle, CURLOPT_URL, m_aUrl);
+	curl_easy_setopt(pHandle, CURLOPT_NOSIGNAL, 1L);
+	curl_easy_setopt(pHandle, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
+	curl_easy_setopt(pHandle, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
+
+	curl_easy_setopt(pHandle, CURLOPT_WRITEDATA, this);
+	curl_easy_setopt(pHandle, CURLOPT_WRITEFUNCTION, WriteCallback);
+	curl_easy_setopt(pHandle, CURLOPT_NOPROGRESS, 0L);
+	curl_easy_setopt(pHandle, CURLOPT_PROGRESSDATA, this);
+	// ‘CURLOPT_PROGRESSFUNCTION’ is deprecated: since 7.32.0. Use CURLOPT_XFERINFOFUNCTION
+	// See problems with curl_off_t type in header file in https://github.com/ddnet/ddnet/pull/6185/
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+	curl_easy_setopt(pHandle, CURLOPT_PROGRESSFUNCTION, ProgressCallback);
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+	curl_easy_setopt(pHandle, CURLOPT_IPRESOLVE, m_IpResolve == IPRESOLVE::V4 ? CURL_IPRESOLVE_V4 : m_IpResolve == IPRESOLVE::V6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_WHATEVER);
+	if(g_Config.m_Bindaddr[0] != '\0')
+	{
+		curl_easy_setopt(pHandle, CURLOPT_INTERFACE, g_Config.m_Bindaddr);
+	}
+
+	if(curl_version_info(CURLVERSION_NOW)->version_num < 0x074400)
+	{
+		// Causes crashes, see https://github.com/ddnet/ddnet/issues/4342.
+		// No longer a problem in curl 7.68 and above, and 0x44 = 68.
+		curl_easy_setopt(pHandle, CURLOPT_FORBID_REUSE, 1L);
+	}
+
+#ifdef CONF_PLATFORM_ANDROID
+	curl_easy_setopt(pHandle, CURLOPT_CAINFO, "data/cacert.pem");
+#endif
+
+	switch(m_Type)
+	{
+	case REQUEST::GET:
+		break;
+	case REQUEST::HEAD:
+		curl_easy_setopt(pHandle, CURLOPT_NOBODY, 1L);
+		break;
+	case REQUEST::POST:
+	case REQUEST::POST_JSON:
+		if(m_Type == REQUEST::POST_JSON)
+		{
+			Header("Content-Type: application/json");
+		}
+		else
+		{
+			Header("Content-Type:");
+		}
+		curl_easy_setopt(pHandle, CURLOPT_POSTFIELDS, m_pBody);
+		curl_easy_setopt(pHandle, CURLOPT_POSTFIELDSIZE, m_BodyLength);
+		break;
+	}
+
+	curl_easy_setopt(pHandle, CURLOPT_HTTPHEADER, m_pHeaders);
+
+	if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::ALL)
+		dbg_msg("http", "fetching %s", m_aUrl);
+	m_State = HTTP_RUNNING;
+	int Ret = curl_easy_perform(pHandle);
+	if(Ret != CURLE_OK)
+	{
+		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::FAILURE)
+			dbg_msg("http", "%s failed. libcurl error (%d): %s", m_aUrl, (int)Ret, aErr);
+		return (Ret == CURLE_ABORTED_BY_CALLBACK) ? HTTP_ABORTED : HTTP_ERROR;
+	}
+	else
+	{
+		if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::ALL)
+			dbg_msg("http", "task done %s", m_aUrl);
+		return HTTP_DONE;
+	}
+}
+
+size_t CHttpRequest::OnData(char *pData, size_t DataSize)
+{
+	// Need to check for the maximum response size here as curl can only
+	// guarantee it if the server sets a Content-Length header.
+	if(m_MaxResponseSize >= 0 && m_ResponseLength + DataSize > (uint64_t)m_MaxResponseSize)
+	{
+		return 0;
+	}
+
+	sha256_update(&m_ActualSha256, pData, DataSize);
+
+	if(!m_WriteToFile)
+	{
+		if(DataSize == 0)
+		{
+			return DataSize;
+		}
+		size_t NewBufferSize = maximum((size_t)1024, m_BufferSize);
+		while(m_ResponseLength + DataSize > NewBufferSize)
+		{
+			NewBufferSize *= 2;
+		}
+		if(NewBufferSize != m_BufferSize)
+		{
+			m_pBuffer = (unsigned char *)realloc(m_pBuffer, NewBufferSize);
+			m_BufferSize = NewBufferSize;
+		}
+		mem_copy(m_pBuffer + m_ResponseLength, pData, DataSize);
+		m_ResponseLength += DataSize;
+		return DataSize;
+	}
+	else
+	{
+		m_ResponseLength += DataSize;
+		return io_write(m_File, pData, DataSize);
+	}
+}
+
+size_t CHttpRequest::WriteCallback(char *pData, size_t Size, size_t Number, void *pUser)
+{
+	return ((CHttpRequest *)pUser)->OnData(pData, Size * Number);
+}
+
+int CHttpRequest::ProgressCallback(void *pUser, double DlTotal, double DlCurr, double UlTotal, double UlCurr)
+{
+	CHttpRequest *pTask = (CHttpRequest *)pUser;
+	pTask->m_Current.store(DlCurr, std::memory_order_relaxed);
+	pTask->m_Size.store(DlTotal, std::memory_order_relaxed);
+	pTask->m_Progress.store((100 * DlCurr) / (DlTotal ? DlTotal : 1), std::memory_order_relaxed);
+	pTask->OnProgress();
+	return pTask->m_Abort ? -1 : 0;
+}
+
+int CHttpRequest::OnCompletion(int State)
+{
+	if(m_Abort)
+		State = HTTP_ABORTED;
+
+	if(State == HTTP_DONE && m_ExpectedSha256 != SHA256_ZEROED)
+	{
+		const SHA256_DIGEST ActualSha256 = sha256_finish(&m_ActualSha256);
+		if(ActualSha256 != m_ExpectedSha256)
+		{
+			if(g_Config.m_DbgCurl || m_LogProgress >= HTTPLOG::FAILURE)
+			{
+				char aActualSha256[SHA256_MAXSTRSIZE];
+				sha256_str(ActualSha256, aActualSha256, sizeof(aActualSha256));
+				char aExpectedSha256[SHA256_MAXSTRSIZE];
+				sha256_str(m_ExpectedSha256, aExpectedSha256, sizeof(aExpectedSha256));
+				dbg_msg("http", "SHA256 mismatch: got=%s, expected=%s, url=%s", aActualSha256, aExpectedSha256, m_aUrl);
+			}
+			State = HTTP_ERROR;
+		}
+	}
+
+	if(m_WriteToFile)
+	{
+		if(m_File && io_close(m_File) != 0)
+		{
+			dbg_msg("http", "i/o error, cannot close file: %s", m_aDest);
+			State = HTTP_ERROR;
+		}
+
+		if(State == HTTP_ERROR || State == HTTP_ABORTED)
+		{
+			fs_remove(m_aDestAbsolute);
+		}
+	}
+	return State;
+}
+
+void CHttpRequest::WriteToFile(IStorage *pStorage, const char *pDest, int StorageType)
+{
+	m_WriteToFile = true;
+	str_copy(m_aDest, pDest);
+	if(StorageType == -2)
+	{
+		pStorage->GetBinaryPath(m_aDest, m_aDestAbsolute, sizeof(m_aDestAbsolute));
+	}
+	else
+	{
+		pStorage->GetCompletePath(StorageType, m_aDest, m_aDestAbsolute, sizeof(m_aDestAbsolute));
+	}
+}
+
+void CHttpRequest::Header(const char *pNameColonValue)
+{
+	m_pHeaders = curl_slist_append((curl_slist *)m_pHeaders, pNameColonValue);
+}
+
+void CHttpRequest::Result(unsigned char **ppResult, size_t *pResultLength) const
+{
+	if(m_WriteToFile || State() != HTTP_DONE)
+	{
+		*ppResult = nullptr;
+		*pResultLength = 0;
+		return;
+	}
+	*ppResult = m_pBuffer;
+	*pResultLength = m_ResponseLength;
+}
+
+json_value *CHttpRequest::ResultJson() const
+{
+	unsigned char *pResult;
+	size_t ResultLength;
+	Result(&pResult, &ResultLength);
+	if(!pResult)
+	{
+		return nullptr;
+	}
+	return json_parse((char *)pResult, ResultLength);
+}
diff --git a/src_bkp/engine/shared/http.h b/src_bkp/engine/shared/http.h
new file mode 100644
index 0000000000..eb90fcaf11
--- /dev/null
+++ b/src_bkp/engine/shared/http.h
@@ -0,0 +1,205 @@
+#ifndef ENGINE_SHARED_HTTP_H
+#define ENGINE_SHARED_HTTP_H
+
+#include <base/hash_ctxt.h>
+
+#include <engine/shared/jobs.h>
+
+#include <algorithm>
+#include <atomic>
+
+typedef struct _json_value json_value;
+class IStorage;
+
+enum
+{
+	HTTP_ERROR = -1,
+	HTTP_QUEUED,
+	HTTP_RUNNING,
+	HTTP_DONE,
+	HTTP_ABORTED,
+};
+
+enum class HTTPLOG
+{
+	NONE,
+	FAILURE,
+	ALL,
+};
+
+enum class IPRESOLVE
+{
+	WHATEVER,
+	V4,
+	V6,
+};
+
+struct CTimeout
+{
+	long ConnectTimeoutMs;
+	long TimeoutMs;
+	long LowSpeedLimit;
+	long LowSpeedTime;
+};
+
+class CHttpRequest : public IJob
+{
+	enum class REQUEST
+	{
+		GET = 0,
+		HEAD,
+		POST,
+		POST_JSON,
+	};
+	char m_aUrl[256] = {0};
+
+	void *m_pHeaders = nullptr;
+	unsigned char *m_pBody = nullptr;
+	size_t m_BodyLength = 0;
+
+	CTimeout m_Timeout = CTimeout{0, 0, 0, 0};
+	int64_t m_MaxResponseSize = -1;
+	REQUEST m_Type = REQUEST::GET;
+
+	SHA256_CTX m_ActualSha256;
+	SHA256_DIGEST m_ExpectedSha256 = SHA256_ZEROED;
+
+	bool m_WriteToFile = false;
+
+	uint64_t m_ResponseLength = 0;
+
+	// If `m_WriteToFile` is false.
+	size_t m_BufferSize = 0;
+	unsigned char *m_pBuffer = nullptr;
+
+	// If `m_WriteToFile` is true.
+	IOHANDLE m_File = nullptr;
+	char m_aDestAbsolute[IO_MAX_PATH_LENGTH] = {0};
+	char m_aDest[IO_MAX_PATH_LENGTH] = {0};
+
+	std::atomic<double> m_Size{0.0};
+	std::atomic<double> m_Current{0.0};
+	std::atomic<int> m_Progress{0};
+	HTTPLOG m_LogProgress = HTTPLOG::ALL;
+	IPRESOLVE m_IpResolve = IPRESOLVE::WHATEVER;
+
+	std::atomic<int> m_State{HTTP_QUEUED};
+	std::atomic<bool> m_Abort{false};
+
+	void Run() override;
+	// Abort the request with an error if `BeforeInit()` returns false.
+	bool BeforeInit();
+	int RunImpl(void *pUser);
+
+	// Abort the request if `OnData()` returns something other than
+	// `DataSize`.
+	size_t OnData(char *pData, size_t DataSize);
+
+	static int ProgressCallback(void *pUser, double DlTotal, double DlCurr, double UlTotal, double UlCurr);
+	static size_t WriteCallback(char *pData, size_t Size, size_t Number, void *pUser);
+
+protected:
+	virtual void OnProgress() {}
+	virtual int OnCompletion(int State);
+
+public:
+	CHttpRequest(const char *pUrl);
+	~CHttpRequest();
+
+	void Timeout(CTimeout Timeout) { m_Timeout = Timeout; }
+	void MaxResponseSize(int64_t MaxResponseSize) { m_MaxResponseSize = MaxResponseSize; }
+	void LogProgress(HTTPLOG LogProgress) { m_LogProgress = LogProgress; }
+	void IpResolve(IPRESOLVE IpResolve) { m_IpResolve = IpResolve; }
+	void WriteToFile(IStorage *pStorage, const char *pDest, int StorageType);
+	void ExpectSha256(const SHA256_DIGEST &Sha256) { m_ExpectedSha256 = Sha256; }
+	void Head() { m_Type = REQUEST::HEAD; }
+	void Post(const unsigned char *pData, size_t DataLength)
+	{
+		m_Type = REQUEST::POST;
+		m_BodyLength = DataLength;
+		m_pBody = (unsigned char *)malloc(std::max((size_t)1, DataLength));
+		mem_copy(m_pBody, pData, DataLength);
+	}
+	void PostJson(const char *pJson)
+	{
+		m_Type = REQUEST::POST_JSON;
+		m_BodyLength = str_length(pJson);
+		m_pBody = (unsigned char *)malloc(m_BodyLength);
+		mem_copy(m_pBody, pJson, m_BodyLength);
+	}
+	void Header(const char *pNameColonValue);
+	void HeaderString(const char *pName, const char *pValue)
+	{
+		char aHeader[256];
+		str_format(aHeader, sizeof(aHeader), "%s: %s", pName, pValue);
+		Header(aHeader);
+	}
+	void HeaderInt(const char *pName, int Value)
+	{
+		char aHeader[256];
+		str_format(aHeader, sizeof(aHeader), "%s: %d", pName, Value);
+		Header(aHeader);
+	}
+
+	const char *Dest()
+	{
+		if(m_WriteToFile)
+		{
+			return m_aDest;
+		}
+		else
+		{
+			return nullptr;
+		}
+	}
+
+	double Current() const { return m_Current.load(std::memory_order_relaxed); }
+	double Size() const { return m_Size.load(std::memory_order_relaxed); }
+	int Progress() const { return m_Progress.load(std::memory_order_relaxed); }
+	int State() const { return m_State; }
+	void Abort() { m_Abort = true; }
+
+	void Result(unsigned char **ppResult, size_t *pResultLength) const;
+	json_value *ResultJson() const;
+};
+
+inline std::unique_ptr<CHttpRequest> HttpHead(const char *pUrl)
+{
+	auto pResult = std::make_unique<CHttpRequest>(pUrl);
+	pResult->Head();
+	return pResult;
+}
+
+inline std::unique_ptr<CHttpRequest> HttpGet(const char *pUrl)
+{
+	return std::make_unique<CHttpRequest>(pUrl);
+}
+
+inline std::unique_ptr<CHttpRequest> HttpGetFile(const char *pUrl, IStorage *pStorage, const char *pOutputFile, int StorageType)
+{
+	std::unique_ptr<CHttpRequest> pResult = HttpGet(pUrl);
+	pResult->WriteToFile(pStorage, pOutputFile, StorageType);
+	pResult->Timeout(CTimeout{4000, 0, 500, 5});
+	return pResult;
+}
+
+inline std::unique_ptr<CHttpRequest> HttpPost(const char *pUrl, const unsigned char *pData, size_t DataLength)
+{
+	auto pResult = std::make_unique<CHttpRequest>(pUrl);
+	pResult->Post(pData, DataLength);
+	pResult->Timeout(CTimeout{4000, 15000, 500, 5});
+	return pResult;
+}
+
+inline std::unique_ptr<CHttpRequest> HttpPostJson(const char *pUrl, const char *pJson)
+{
+	auto pResult = std::make_unique<CHttpRequest>(pUrl);
+	pResult->PostJson(pJson);
+	pResult->Timeout(CTimeout{4000, 15000, 500, 5});
+	return pResult;
+}
+
+bool HttpInit(IStorage *pStorage);
+void EscapeUrl(char *pBuf, int Size, const char *pStr);
+bool HttpHasIpresolveBug();
+#endif // ENGINE_SHARED_HTTP_H
diff --git a/src_bkp/engine/shared/huffman.cpp b/src_bkp/engine/shared/huffman.cpp
new file mode 100644
index 0000000000..79995e0ac4
--- /dev/null
+++ b/src_bkp/engine/shared/huffman.cpp
@@ -0,0 +1,283 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "huffman.h"
+#include <algorithm>
+#include <base/system.h>
+
+const unsigned CHuffman::ms_aFreqTable[HUFFMAN_MAX_SYMBOLS] = {
+	1 << 30, 4545, 2657, 431, 1950, 919, 444, 482, 2244, 617, 838, 542, 715, 1814, 304, 240, 754, 212, 647, 186,
+	283, 131, 146, 166, 543, 164, 167, 136, 179, 859, 363, 113, 157, 154, 204, 108, 137, 180, 202, 176,
+	872, 404, 168, 134, 151, 111, 113, 109, 120, 126, 129, 100, 41, 20, 16, 22, 18, 18, 17, 19,
+	16, 37, 13, 21, 362, 166, 99, 78, 95, 88, 81, 70, 83, 284, 91, 187, 77, 68, 52, 68,
+	59, 66, 61, 638, 71, 157, 50, 46, 69, 43, 11, 24, 13, 19, 10, 12, 12, 20, 14, 9,
+	20, 20, 10, 10, 15, 15, 12, 12, 7, 19, 15, 14, 13, 18, 35, 19, 17, 14, 8, 5,
+	15, 17, 9, 15, 14, 18, 8, 10, 2173, 134, 157, 68, 188, 60, 170, 60, 194, 62, 175, 71,
+	148, 67, 167, 78, 211, 67, 156, 69, 1674, 90, 174, 53, 147, 89, 181, 51, 174, 63, 163, 80,
+	167, 94, 128, 122, 223, 153, 218, 77, 200, 110, 190, 73, 174, 69, 145, 66, 277, 143, 141, 60,
+	136, 53, 180, 57, 142, 57, 158, 61, 166, 112, 152, 92, 26, 22, 21, 28, 20, 26, 30, 21,
+	32, 27, 20, 17, 23, 21, 30, 22, 22, 21, 27, 25, 17, 27, 23, 18, 39, 26, 15, 21,
+	12, 18, 18, 27, 20, 18, 15, 19, 11, 17, 33, 12, 18, 15, 19, 18, 16, 26, 17, 18,
+	9, 10, 25, 22, 22, 17, 20, 16, 6, 16, 15, 20, 14, 18, 24, 335, 1517};
+
+struct CHuffmanConstructNode
+{
+	unsigned short m_NodeId;
+	int m_Frequency;
+};
+
+bool CompareNodesByFrequencyDesc(const CHuffmanConstructNode *pNode1, const CHuffmanConstructNode *pNode2)
+{
+	return pNode2->m_Frequency < pNode1->m_Frequency;
+}
+
+void CHuffman::Setbits_r(CNode *pNode, int Bits, unsigned Depth)
+{
+	if(pNode->m_aLeafs[1] != 0xffff)
+		Setbits_r(&m_aNodes[pNode->m_aLeafs[1]], Bits | (1 << Depth), Depth + 1);
+	if(pNode->m_aLeafs[0] != 0xffff)
+		Setbits_r(&m_aNodes[pNode->m_aLeafs[0]], Bits, Depth + 1);
+
+	if(pNode->m_NumBits)
+	{
+		pNode->m_Bits = Bits;
+		pNode->m_NumBits = Depth;
+	}
+}
+
+void CHuffman::ConstructTree(const unsigned *pFrequencies)
+{
+	CHuffmanConstructNode aNodesLeftStorage[HUFFMAN_MAX_SYMBOLS];
+	CHuffmanConstructNode *apNodesLeft[HUFFMAN_MAX_SYMBOLS];
+	int NumNodesLeft = HUFFMAN_MAX_SYMBOLS;
+
+	// add the symbols
+	for(int i = 0; i < HUFFMAN_MAX_SYMBOLS; i++)
+	{
+		m_aNodes[i].m_NumBits = 0xFFFFFFFF;
+		m_aNodes[i].m_Symbol = i;
+		m_aNodes[i].m_aLeafs[0] = 0xffff;
+		m_aNodes[i].m_aLeafs[1] = 0xffff;
+
+		if(i == HUFFMAN_EOF_SYMBOL)
+			aNodesLeftStorage[i].m_Frequency = 1;
+		else
+			aNodesLeftStorage[i].m_Frequency = pFrequencies[i];
+		aNodesLeftStorage[i].m_NodeId = i;
+		apNodesLeft[i] = &aNodesLeftStorage[i];
+	}
+
+	m_NumNodes = HUFFMAN_MAX_SYMBOLS;
+
+	// construct the table
+	while(NumNodesLeft > 1)
+	{
+		std::stable_sort(apNodesLeft, apNodesLeft + NumNodesLeft, CompareNodesByFrequencyDesc);
+
+		m_aNodes[m_NumNodes].m_NumBits = 0;
+		m_aNodes[m_NumNodes].m_aLeafs[0] = apNodesLeft[NumNodesLeft - 1]->m_NodeId;
+		m_aNodes[m_NumNodes].m_aLeafs[1] = apNodesLeft[NumNodesLeft - 2]->m_NodeId;
+		apNodesLeft[NumNodesLeft - 2]->m_NodeId = m_NumNodes;
+		apNodesLeft[NumNodesLeft - 2]->m_Frequency = apNodesLeft[NumNodesLeft - 1]->m_Frequency + apNodesLeft[NumNodesLeft - 2]->m_Frequency;
+
+		m_NumNodes++;
+		NumNodesLeft--;
+	}
+
+	// set start node
+	m_pStartNode = &m_aNodes[m_NumNodes - 1];
+
+	// build symbol bits
+	Setbits_r(m_pStartNode, 0, 0);
+}
+
+void CHuffman::Init(const unsigned *pFrequencies)
+{
+	// make sure to cleanout every thing
+	mem_zero(m_aNodes, sizeof(m_aNodes));
+	mem_zero(m_apDecodeLut, sizeof(m_apDecodeLut));
+	m_pStartNode = 0x0;
+	m_NumNodes = 0;
+
+	// construct the tree
+	ConstructTree(pFrequencies);
+
+	// build decode LUT
+	for(int i = 0; i < HUFFMAN_LUTSIZE; i++)
+	{
+		unsigned Bits = i;
+		int k;
+		CNode *pNode = m_pStartNode;
+		for(k = 0; k < HUFFMAN_LUTBITS; k++)
+		{
+			pNode = &m_aNodes[pNode->m_aLeafs[Bits & 1]];
+			Bits >>= 1;
+
+			if(!pNode)
+				break;
+
+			if(pNode->m_NumBits)
+			{
+				m_apDecodeLut[i] = pNode;
+				break;
+			}
+		}
+
+		if(k == HUFFMAN_LUTBITS)
+			m_apDecodeLut[i] = pNode;
+	}
+}
+
+//***************************************************************
+int CHuffman::Compress(const void *pInput, int InputSize, void *pOutput, int OutputSize) const
+{
+	// this macro loads a symbol for a byte into bits and bitcount
+#define HUFFMAN_MACRO_LOADSYMBOL(Sym) \
+	do \
+	{ \
+		Bits |= m_aNodes[Sym].m_Bits << Bitcount; \
+		Bitcount += m_aNodes[Sym].m_NumBits; \
+	} while(0)
+
+	// this macro writes the symbol stored in bits and bitcount to the dst pointer
+#define HUFFMAN_MACRO_WRITE() \
+	do \
+	{ \
+		while(Bitcount >= 8) \
+		{ \
+			*pDst++ = (unsigned char)(Bits & 0xff); \
+			if(pDst == pDstEnd) \
+				return -1; \
+			Bits >>= 8; \
+			Bitcount -= 8; \
+		} \
+	} while(0)
+
+	// setup buffer pointers
+	const unsigned char *pSrc = (const unsigned char *)pInput;
+	const unsigned char *pSrcEnd = pSrc + InputSize;
+	unsigned char *pDst = (unsigned char *)pOutput;
+	unsigned char *pDstEnd = pDst + OutputSize;
+
+	// symbol variables
+	unsigned Bits = 0;
+	unsigned Bitcount = 0;
+
+	// make sure that we have data that we want to compress
+	if(InputSize)
+	{
+		// {A} load the first symbol
+		int Symbol = *pSrc++;
+
+		while(pSrc != pSrcEnd)
+		{
+			// {B} load the symbol
+			HUFFMAN_MACRO_LOADSYMBOL(Symbol);
+
+			// {C} fetch next symbol, this is done here because it will reduce dependency in the code
+			Symbol = *pSrc++;
+
+			// {B} write the symbol loaded at
+			HUFFMAN_MACRO_WRITE();
+		}
+
+		// write the last symbol loaded from {C} or {A} in the case of only 1 byte input buffer
+		HUFFMAN_MACRO_LOADSYMBOL(Symbol);
+		HUFFMAN_MACRO_WRITE();
+	}
+
+	// write EOF symbol
+	HUFFMAN_MACRO_LOADSYMBOL(HUFFMAN_EOF_SYMBOL);
+	HUFFMAN_MACRO_WRITE();
+
+	// write out the last bits
+	*pDst++ = Bits;
+
+	// return the size of the output
+	return (int)(pDst - (const unsigned char *)pOutput);
+
+	// remove macros
+#undef HUFFMAN_MACRO_LOADSYMBOL
+#undef HUFFMAN_MACRO_WRITE
+}
+
+//***************************************************************
+int CHuffman::Decompress(const void *pInput, int InputSize, void *pOutput, int OutputSize) const
+{
+	// setup buffer pointers
+	unsigned char *pDst = (unsigned char *)pOutput;
+	unsigned char *pSrc = (unsigned char *)pInput;
+	unsigned char *pDstEnd = pDst + OutputSize;
+	unsigned char *pSrcEnd = pSrc + InputSize;
+
+	unsigned Bits = 0;
+	unsigned Bitcount = 0;
+
+	const CNode *pEof = &m_aNodes[HUFFMAN_EOF_SYMBOL];
+
+	while(true)
+	{
+		// {A} try to load a node now, this will reduce dependency at location {D}
+		const CNode *pNode = 0;
+		if(Bitcount >= HUFFMAN_LUTBITS)
+			pNode = m_apDecodeLut[Bits & HUFFMAN_LUTMASK];
+
+		// {B} fill with new bits
+		while(Bitcount < 24 && pSrc != pSrcEnd)
+		{
+			Bits |= (*pSrc++) << Bitcount;
+			Bitcount += 8;
+		}
+
+		// {C} load symbol now if we didn't that earlier at location {A}
+		if(!pNode)
+			pNode = m_apDecodeLut[Bits & HUFFMAN_LUTMASK];
+
+		if(!pNode)
+			return -1;
+
+		// {D} check if we hit a symbol already
+		if(pNode->m_NumBits)
+		{
+			// remove the bits for that symbol
+			Bits >>= pNode->m_NumBits;
+			Bitcount -= pNode->m_NumBits;
+		}
+		else
+		{
+			// remove the bits that the lut checked up for us
+			Bits >>= HUFFMAN_LUTBITS;
+			Bitcount -= HUFFMAN_LUTBITS;
+
+			// walk the tree bit by bit
+			while(true)
+			{
+				// traverse tree
+				pNode = &m_aNodes[pNode->m_aLeafs[Bits & 1]];
+
+				// remove bit
+				Bitcount--;
+				Bits >>= 1;
+
+				// check if we hit a symbol
+				if(pNode->m_NumBits)
+					break;
+
+				// no more bits, decoding error
+				if(Bitcount == 0)
+					return -1;
+			}
+		}
+
+		// check for eof
+		if(pNode == pEof)
+			break;
+
+		// output character
+		if(pDst == pDstEnd)
+			return -1;
+		*pDst++ = pNode->m_Symbol;
+	}
+
+	// return the size of the decompressed buffer
+	return (int)(pDst - (const unsigned char *)pOutput);
+}
diff --git a/src_bkp/engine/shared/huffman.h b/src_bkp/engine/shared/huffman.h
new file mode 100644
index 0000000000..e0bc87cea4
--- /dev/null
+++ b/src_bkp/engine/shared/huffman.h
@@ -0,0 +1,87 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_HUFFMAN_H
+#define ENGINE_SHARED_HUFFMAN_H
+
+class CHuffman
+{
+	enum
+	{
+		HUFFMAN_EOF_SYMBOL = 256,
+
+		HUFFMAN_MAX_SYMBOLS = HUFFMAN_EOF_SYMBOL + 1,
+		HUFFMAN_MAX_NODES = HUFFMAN_MAX_SYMBOLS * 2 - 1,
+
+		HUFFMAN_LUTBITS = 10,
+		HUFFMAN_LUTSIZE = (1 << HUFFMAN_LUTBITS),
+		HUFFMAN_LUTMASK = (HUFFMAN_LUTSIZE - 1)
+	};
+
+	struct CNode
+	{
+		// symbol
+		unsigned m_Bits;
+		unsigned m_NumBits;
+
+		// don't use pointers for this. shorts are smaller so we can fit more data into the cache
+		unsigned short m_aLeafs[2];
+
+		// what the symbol represents
+		unsigned char m_Symbol;
+	};
+
+	static const unsigned ms_aFreqTable[HUFFMAN_MAX_SYMBOLS];
+
+	CNode m_aNodes[HUFFMAN_MAX_NODES];
+	CNode *m_apDecodeLut[HUFFMAN_LUTSIZE];
+	CNode *m_pStartNode;
+	int m_NumNodes;
+
+	void Setbits_r(CNode *pNode, int Bits, unsigned Depth);
+	void ConstructTree(const unsigned *pFrequencies);
+
+public:
+	/*
+		Function: Init
+			Inits the compressor/decompressor.
+
+		Parameters:
+			pFrequencies - A pointer to an array of 256 entries of the frequencies of the bytes
+
+		Remarks:
+			- Does no allocation whatsoever.
+			- You don't have to call any cleanup functions when you are done with it.
+	*/
+	void Init(const unsigned *pFrequencies = ms_aFreqTable);
+
+	/*
+		Function: Compress
+			Compresses a buffer and outputs a compressed buffer.
+
+		Parameters:
+			pInput - Buffer to compress
+			InputSize - Size of the buffer to compress
+			pOutput - Buffer to put the compressed data into
+			OutputSize - Size of the output buffer
+
+		Returns:
+			Returns the size of the compressed data. Negative value on failure.
+	*/
+	int Compress(const void *pInput, int InputSize, void *pOutput, int OutputSize) const;
+
+	/*
+		Function: Decompress
+			Decompresses a buffer
+
+		Parameters:
+			pInput - Buffer to decompress
+			InputSize - Size of the buffer to decompress
+			pOutput - Buffer to put the uncompressed data into
+			OutputSize - Size of the output buffer
+
+		Returns:
+			Returns the size of the uncompressed data. Negative value on failure.
+	*/
+	int Decompress(const void *pInput, int InputSize, void *pOutput, int OutputSize) const;
+};
+#endif // ENGINE_SHARED_HUFFMAN_H
diff --git a/src_bkp/engine/shared/jobs.cpp b/src_bkp/engine/shared/jobs.cpp
new file mode 100644
index 0000000000..852243367c
--- /dev/null
+++ b/src_bkp/engine/shared/jobs.cpp
@@ -0,0 +1,108 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "jobs.h"
+
+IJob::IJob() :
+	m_Status(STATE_PENDING)
+{
+}
+
+IJob::~IJob() = default;
+
+int IJob::Status()
+{
+	return m_Status.load();
+}
+
+CJobPool::CJobPool()
+{
+	// empty the pool
+	m_Shutdown = false;
+	sphore_init(&m_Semaphore);
+	m_pFirstJob = 0;
+	m_pLastJob = 0;
+}
+
+CJobPool::~CJobPool()
+{
+	if(!m_Shutdown)
+	{
+		Destroy();
+	}
+}
+
+void CJobPool::WorkerThread(void *pUser)
+{
+	CJobPool *pPool = (CJobPool *)pUser;
+
+	while(!pPool->m_Shutdown)
+	{
+		std::shared_ptr<IJob> pJob = 0;
+
+		// fetch job from queue
+		sphore_wait(&pPool->m_Semaphore);
+		{
+			CLockScope ls(pPool->m_Lock);
+			if(pPool->m_pFirstJob)
+			{
+				pJob = pPool->m_pFirstJob;
+				pPool->m_pFirstJob = pPool->m_pFirstJob->m_pNext;
+				// allow remaining objects in list to destruct, even when current object stays alive
+				pJob->m_pNext = nullptr;
+				if(!pPool->m_pFirstJob)
+					pPool->m_pLastJob = 0;
+			}
+		}
+
+		// do the job if we have one
+		if(pJob)
+		{
+			RunBlocking(pJob.get());
+		}
+	}
+}
+
+void CJobPool::Init(int NumThreads)
+{
+	// start threads
+	char aName[32];
+	m_vpThreads.reserve(NumThreads);
+	for(int i = 0; i < NumThreads; i++)
+	{
+		str_format(aName, sizeof(aName), "CJobPool worker %d", i);
+		m_vpThreads.push_back(thread_init(WorkerThread, this, aName));
+	}
+}
+
+void CJobPool::Destroy()
+{
+	m_Shutdown = true;
+	for(size_t i = 0; i < m_vpThreads.size(); i++)
+		sphore_signal(&m_Semaphore);
+	for(void *pThread : m_vpThreads)
+		thread_wait(pThread);
+	m_vpThreads.clear();
+	sphore_destroy(&m_Semaphore);
+}
+
+void CJobPool::Add(std::shared_ptr<IJob> pJob)
+{
+	{
+		CLockScope ls(m_Lock);
+		// add job to queue
+		if(m_pLastJob)
+			m_pLastJob->m_pNext = pJob;
+		m_pLastJob = std::move(pJob);
+		if(!m_pFirstJob)
+			m_pFirstJob = m_pLastJob;
+	}
+
+	sphore_signal(&m_Semaphore);
+}
+
+void CJobPool::RunBlocking(IJob *pJob)
+{
+	pJob->m_Status = IJob::STATE_RUNNING;
+	pJob->Run();
+	pJob->m_Status = IJob::STATE_DONE;
+}
diff --git a/src_bkp/engine/shared/jobs.h b/src_bkp/engine/shared/jobs.h
new file mode 100644
index 0000000000..8f347b16c3
--- /dev/null
+++ b/src_bkp/engine/shared/jobs.h
@@ -0,0 +1,61 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_JOBS_H
+#define ENGINE_SHARED_JOBS_H
+
+#include <base/lock.h>
+#include <base/system.h>
+
+#include <atomic>
+#include <memory>
+#include <vector>
+
+class CJobPool;
+
+class IJob
+{
+	friend CJobPool;
+
+private:
+	std::shared_ptr<IJob> m_pNext;
+
+	std::atomic<int> m_Status;
+	virtual void Run() = 0;
+
+public:
+	IJob();
+	IJob(const IJob &Other) = delete;
+	IJob &operator=(const IJob &Other) = delete;
+	virtual ~IJob();
+	int Status();
+
+	enum
+	{
+		STATE_PENDING = 0,
+		STATE_RUNNING,
+		STATE_DONE
+	};
+};
+
+class CJobPool
+{
+	std::vector<void *> m_vpThreads;
+	std::atomic<bool> m_Shutdown;
+
+	CLock m_Lock;
+	SEMAPHORE m_Semaphore;
+	std::shared_ptr<IJob> m_pFirstJob GUARDED_BY(m_Lock);
+	std::shared_ptr<IJob> m_pLastJob GUARDED_BY(m_Lock);
+
+	static void WorkerThread(void *pUser) NO_THREAD_SAFETY_ANALYSIS;
+
+public:
+	CJobPool();
+	~CJobPool();
+
+	void Init(int NumThreads);
+	void Destroy();
+	void Add(std::shared_ptr<IJob> pJob) REQUIRES(!m_Lock);
+	static void RunBlocking(IJob *pJob);
+};
+#endif
diff --git a/src_bkp/engine/shared/json.cpp b/src_bkp/engine/shared/json.cpp
new file mode 100644
index 0000000000..37338ff1bf
--- /dev/null
+++ b/src_bkp/engine/shared/json.cpp
@@ -0,0 +1,115 @@
+#include <base/system.h>
+#include <engine/shared/json.h>
+
+const struct _json_value *json_object_get(const json_value *object, const char *index)
+{
+	unsigned int i;
+
+	if(object->type != json_object)
+		return &json_value_none;
+
+	for(i = 0; i < object->u.object.length; ++i)
+		if(!str_comp(object->u.object.values[i].name, index))
+			return object->u.object.values[i].value;
+
+	return &json_value_none;
+}
+
+const struct _json_value *json_array_get(const json_value *array, int index)
+{
+	if(array->type != json_array || index >= (int)array->u.array.length)
+		return &json_value_none;
+
+	return array->u.array.values[index];
+}
+
+int json_array_length(const json_value *array)
+{
+	return array->u.array.length;
+}
+
+const char *json_string_get(const json_value *string)
+{
+	return string->u.string.ptr;
+}
+
+int json_int_get(const json_value *integer)
+{
+	return integer->u.integer;
+}
+
+int json_boolean_get(const json_value *boolean)
+{
+	return boolean->u.boolean != 0;
+}
+
+static char EscapeJsonChar(char c)
+{
+	switch(c)
+	{
+	case '\"': return '\"';
+	case '\\': return '\\';
+	case '\b': return 'b';
+	case '\n': return 'n';
+	case '\r': return 'r';
+	case '\t': return 't';
+	// Don't escape '\f', who uses that. :)
+	default: return 0;
+	}
+}
+
+char *EscapeJson(char *pBuffer, int BufferSize, const char *pString)
+{
+	dbg_assert(BufferSize > 0, "can't null-terminate the string");
+	// Subtract the space for null termination early.
+	BufferSize--;
+
+	char *pResult = pBuffer;
+	while(BufferSize && *pString)
+	{
+		char c = *pString;
+		pString++;
+		char Escaped = EscapeJsonChar(c);
+		if(Escaped)
+		{
+			if(BufferSize < 2)
+			{
+				break;
+			}
+			*pBuffer++ = '\\';
+			*pBuffer++ = Escaped;
+			BufferSize -= 2;
+		}
+		// Assuming ASCII/UTF-8, "if control character".
+		else if((unsigned char)c < 0x20)
+		{
+			// \uXXXX
+			if(BufferSize < 6)
+			{
+				break;
+			}
+			str_format(pBuffer, BufferSize, "\\u%04x", c);
+			pBuffer += 6;
+			BufferSize -= 6;
+		}
+		else
+		{
+			*pBuffer++ = c;
+			BufferSize--;
+		}
+	}
+	*pBuffer = 0;
+	return pResult;
+}
+
+const char *JsonBool(bool Bool)
+{
+	if(Bool)
+	{
+		return "true";
+	}
+	else
+	{
+		return "false";
+	}
+}
diff --git a/src_bkp/engine/shared/json.h b/src_bkp/engine/shared/json.h
new file mode 100644
index 0000000000..8a09b2c1a1
--- /dev/null
+++ b/src_bkp/engine/shared/json.h
@@ -0,0 +1,16 @@
+#ifndef ENGINE_SHARED_JSON_H
+#define ENGINE_SHARED_JSON_H
+
+#include <engine/external/json-parser/json.h>
+
+const struct _json_value *json_object_get(const json_value *object, const char *index);
+const struct _json_value *json_array_get(const json_value *array, int index);
+int json_array_length(const json_value *array);
+const char *json_string_get(const json_value *string);
+int json_int_get(const json_value *integer);
+int json_boolean_get(const json_value *boolean);
+
+char *EscapeJson(char *pBuffer, int BufferSize, const char *pString);
+const char *JsonBool(bool Bool);
+
+#endif // ENGINE_SHARED_JSON_H
diff --git a/src_bkp/engine/shared/jsonwriter.cpp b/src_bkp/engine/shared/jsonwriter.cpp
new file mode 100644
index 0000000000..ca703bf49c
--- /dev/null
+++ b/src_bkp/engine/shared/jsonwriter.cpp
@@ -0,0 +1,236 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "jsonwriter.h"
+
+#include <base/system.h>
+
+static char EscapeJsonChar(char c)
+{
+	switch(c)
+	{
+	case '\"': return '\"';
+	case '\\': return '\\';
+	case '\b': return 'b';
+	case '\n': return 'n';
+	case '\r': return 'r';
+	case '\t': return 't';
+	// Don't escape '\f', who uses that. :)
+	default: return 0;
+	}
+}
+
+CJsonWriter::CJsonWriter()
+{
+	m_Indentation = 0;
+}
+
+void CJsonWriter::BeginObject()
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write object here");
+	WriteIndent(false);
+	WriteInternal("{");
+	PushState(STATE_OBJECT);
+}
+
+void CJsonWriter::EndObject()
+{
+	dbg_assert(TopState()->m_Kind == STATE_OBJECT, "Cannot end object here");
+	PopState();
+	CompleteDataType();
+	WriteIndent(true);
+	WriteInternal("}");
+}
+
+void CJsonWriter::BeginArray()
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write array here");
+	WriteIndent(false);
+	WriteInternal("[");
+	PushState(STATE_ARRAY);
+}
+
+void CJsonWriter::EndArray()
+{
+	dbg_assert(TopState()->m_Kind == STATE_ARRAY, "Cannot end array here");
+	PopState();
+	CompleteDataType();
+	WriteIndent(true);
+	WriteInternal("]");
+}
+
+void CJsonWriter::WriteAttribute(const char *pName)
+{
+	dbg_assert(TopState()->m_Kind == STATE_OBJECT, "Cannot write attribute here");
+	WriteIndent(false);
+	WriteInternalEscaped(pName);
+	WriteInternal(": ");
+	PushState(STATE_ATTRIBUTE);
+}
+
+void CJsonWriter::WriteStrValue(const char *pValue)
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write value here");
+	WriteIndent(false);
+	WriteInternalEscaped(pValue);
+	CompleteDataType();
+}
+
+void CJsonWriter::WriteIntValue(int Value)
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write value here");
+	WriteIndent(false);
+	char aBuf[32];
+	str_from_int(Value, aBuf);
+	WriteInternal(aBuf);
+	CompleteDataType();
+}
+
+void CJsonWriter::WriteBoolValue(bool Value)
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write value here");
+	WriteIndent(false);
+	WriteInternal(Value ? "true" : "false");
+	CompleteDataType();
+}
+
+void CJsonWriter::WriteNullValue()
+{
+	dbg_assert(CanWriteDatatype(), "Cannot write value here");
+	WriteIndent(false);
+	WriteInternal("null");
+	CompleteDataType();
+}
+
+bool CJsonWriter::CanWriteDatatype()
+{
+	return m_States.empty() || TopState()->m_Kind == STATE_ARRAY || TopState()->m_Kind == STATE_ATTRIBUTE;
+}
+
+void CJsonWriter::WriteInternalEscaped(const char *pStr)
+{
+	WriteInternal("\"");
+	int UnwrittenFrom = 0;
+	int Length = str_length(pStr);
+	for(int i = 0; i < Length; i++)
+	{
+		char SimpleEscape = EscapeJsonChar(pStr[i]);
+		// Assuming ASCII/UTF-8, exactly everything below 0x20 is a
+		// control character.
+		bool NeedsEscape = SimpleEscape || (unsigned char)pStr[i] < 0x20;
+		if(NeedsEscape)
+		{
+			if(i - UnwrittenFrom > 0)
+			{
+				WriteInternal(pStr + UnwrittenFrom, i - UnwrittenFrom);
+			}
+
+			if(SimpleEscape)
+			{
+				char aStr[2];
+				aStr[0] = '\\';
+				aStr[1] = SimpleEscape;
+				WriteInternal(aStr, sizeof(aStr));
+			}
+			else
+			{
+				char aStr[7];
+				str_format(aStr, sizeof(aStr), "\\u%04x", pStr[i]);
+				WriteInternal(aStr);
+			}
+			UnwrittenFrom = i + 1;
+		}
+	}
+	if(Length - UnwrittenFrom > 0)
+	{
+		WriteInternal(pStr + UnwrittenFrom, Length - UnwrittenFrom);
+	}
+	WriteInternal("\"");
+}
+
+void CJsonWriter::WriteIndent(bool EndElement)
+{
+	const bool NotRootOrAttribute = !m_States.empty() && TopState()->m_Kind != STATE_ATTRIBUTE;
+
+	if(NotRootOrAttribute && !TopState()->m_Empty && !EndElement)
+		WriteInternal(",");
+
+	if(NotRootOrAttribute || EndElement)
+		WriteInternal("\n");
+
+	if(NotRootOrAttribute)
+		for(int i = 0; i < m_Indentation; i++)
+			WriteInternal("\t");
+}
+
+void CJsonWriter::PushState(EJsonStateKind NewState)
+{
+	if(!m_States.empty())
+	{
+		m_States.top().m_Empty = false;
+	}
+	m_States.emplace(NewState);
+	if(NewState != STATE_ATTRIBUTE)
+	{
+		m_Indentation++;
+	}
+}
+
+CJsonWriter::SState *CJsonWriter::TopState()
+{
+	dbg_assert(!m_States.empty(), "json stack is empty");
+	return &m_States.top();
+}
+
+CJsonWriter::EJsonStateKind CJsonWriter::PopState()
+{
+	dbg_assert(!m_States.empty(), "json stack is empty");
+	SState TopState = m_States.top();
+	m_States.pop();
+	if(TopState.m_Kind != STATE_ATTRIBUTE)
+	{
+		m_Indentation--;
+	}
+	return TopState.m_Kind;
+}
+
+void CJsonWriter::CompleteDataType()
+{
+	if(!m_States.empty() && TopState()->m_Kind == STATE_ATTRIBUTE)
+		PopState(); // automatically complete the attribute
+
+	if(!m_States.empty())
+		TopState()->m_Empty = false;
+}
+
+CJsonFileWriter::CJsonFileWriter(IOHANDLE IO)
+{
+	dbg_assert((bool)IO, "IO handle invalid");
+	m_IO = IO;
+}
+
+CJsonFileWriter::~CJsonFileWriter()
+{
+	// Ensure newline at the end
+	WriteInternal("\n");
+	io_close(m_IO);
+}
+
+void CJsonFileWriter::WriteInternal(const char *pStr, int Length)
+{
+	io_write(m_IO, pStr, Length < 0 ? str_length(pStr) : Length);
+}
+
+void CJsonStringWriter::WriteInternal(const char *pStr, int Length)
+{
+	dbg_assert(!m_RetrievedOutput, "Writer output has already been retrieved");
+	m_OutputString += Length < 0 ? pStr : std::string(pStr, Length);
+}
+
+std::string &&CJsonStringWriter::GetOutputString()
+{
+	// Ensure newline at the end. Modify member variable so we can move it when returning.
+	WriteInternal("\n");
+	m_RetrievedOutput = true; // prevent further usage of this writer
+	return std::move(m_OutputString);
+}
diff --git a/src_bkp/engine/shared/jsonwriter.h b/src_bkp/engine/shared/jsonwriter.h
new file mode 100644
index 0000000000..83086055a0
--- /dev/null
+++ b/src_bkp/engine/shared/jsonwriter.h
@@ -0,0 +1,118 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_JSONWRITER_H
+#define ENGINE_SHARED_JSONWRITER_H
+
+#include <base/types.h>
+
+#include <stack>
+#include <string>
+
+/**
+ * JSON writer with abstract writing function.
+ */
+class CJsonWriter
+{
+	enum EJsonStateKind
+	{
+		STATE_OBJECT,
+		STATE_ARRAY,
+		STATE_ATTRIBUTE,
+	};
+
+	struct SState
+	{
+		EJsonStateKind m_Kind;
+		bool m_Empty = true;
+
+		SState(EJsonStateKind Kind) :
+			m_Kind(Kind)
+		{
+		}
+	};
+
+	std::stack<SState> m_States;
+	int m_Indentation;
+
+	bool CanWriteDatatype();
+	void WriteInternalEscaped(const char *pStr);
+	void WriteIndent(bool EndElement);
+	void PushState(EJsonStateKind NewState);
+	SState *TopState();
+	EJsonStateKind PopState();
+	void CompleteDataType();
+
+protected:
+	// String must be zero-terminated when Length is -1.
+	virtual void WriteInternal(const char *pStr, int Length = -1) = 0;
+
+public:
+	CJsonWriter();
+	virtual ~CJsonWriter() = default;
+
+	// The root is created by beginning the first datatype (object, array, value).
+	// The writer must not be used after ending the root, which must be unique.
+
+	// Begin writing a new object
+	void BeginObject();
+	// End current object
+	void EndObject();
+
+	// Begin writing a new array
+	void BeginArray();
+	// End current array
+	void EndArray();
+
+	// Write attribute with the given name inside the current object.
+	// Names inside one object should be unique, but this is not checked here.
+	// Must be used to begin writing anything inside objects and only there.
+	// Must be followed by a datatype for the attribute value.
+	void WriteAttribute(const char *pName);
+
+	// Functions for writing value literals:
+	// - As array values in arrays.
+	// - As attribute values after beginning an attribute inside an object.
+	// - As root value (only once).
+	void WriteStrValue(const char *pValue);
+	void WriteIntValue(int Value);
+	void WriteBoolValue(bool Value);
+	void WriteNullValue();
+};
+
+/**
+ * Writes JSON to a file.
+ */
+class CJsonFileWriter : public CJsonWriter
+{
+	IOHANDLE m_IO;
+
+protected:
+	void WriteInternal(const char *pStr, int Length = -1) override;
+
+public:
+	/**
+	 * Create a new writer object without writing anything to the file yet.
+	 * The file will automatically be closed by the destructor.
+	 */
+	CJsonFileWriter(IOHANDLE IO);
+	~CJsonFileWriter();
+};
+
+/**
+ * Writes JSON to an std::string.
+ */
+class CJsonStringWriter : public CJsonWriter
+{
+	std::string m_OutputString;
+	bool m_RetrievedOutput = false;
+
+protected:
+	void WriteInternal(const char *pStr, int Length = -1) override;
+
+public:
+	CJsonStringWriter() = default;
+	~CJsonStringWriter() = default;
+	std::string &&GetOutputString();
+};
+
+#endif
diff --git a/src_bkp/engine/shared/kernel.cpp b/src_bkp/engine/shared/kernel.cpp
new file mode 100644
index 0000000000..f578cb6850
--- /dev/null
+++ b/src_bkp/engine/shared/kernel.cpp
@@ -0,0 +1,124 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+#include <engine/kernel.h>
+
+class CKernel : public IKernel
+{
+	enum
+	{
+		MAX_INTERFACES = 32,
+	};
+
+	class CInterfaceInfo
+	{
+	public:
+		CInterfaceInfo()
+		{
+			m_aName[0] = 0;
+			m_pInterface = 0x0;
+			m_AutoDestroy = false;
+		}
+
+		char m_aName[64];
+		IInterface *m_pInterface;
+		bool m_AutoDestroy;
+	};
+
+	CInterfaceInfo m_aInterfaces[MAX_INTERFACES];
+	int m_NumInterfaces;
+
+	CInterfaceInfo *FindInterfaceInfo(const char *pName)
+	{
+		for(int i = 0; i < m_NumInterfaces; i++)
+		{
+			if(str_comp(pName, m_aInterfaces[i].m_aName) == 0)
+				return &m_aInterfaces[i];
+		}
+		return 0x0;
+	}
+
+public:
+	CKernel()
+	{
+		m_NumInterfaces = 0;
+	}
+
+	void Shutdown() override
+	{
+		for(int i = m_NumInterfaces - 1; i >= 0; i--)
+		{
+			if(m_aInterfaces[i].m_AutoDestroy)
+				m_aInterfaces[i].m_pInterface->Shutdown();
+		}
+	}
+
+	~CKernel() override
+	{
+		// delete interfaces in reverse order just the way it would happen to objects on the stack
+		for(int i = m_NumInterfaces - 1; i >= 0; i--)
+		{
+			if(m_aInterfaces[i].m_AutoDestroy)
+			{
+				delete m_aInterfaces[i].m_pInterface;
+				m_aInterfaces[i].m_pInterface = 0;
+			}
+		}
+	}
+
+	bool RegisterInterfaceImpl(const char *pName, IInterface *pInterface, bool Destroy) override
+	{
+		// TODO: More error checks here
+		if(!pInterface)
+		{
+			dbg_msg("kernel", "ERROR: couldn't register interface %s. null pointer given", pName);
+			return false;
+		}
+
+		if(m_NumInterfaces == MAX_INTERFACES)
+		{
+			dbg_msg("kernel", "ERROR: couldn't register interface '%s'. maximum of interfaces reached", pName);
+			return false;
+		}
+
+		if(FindInterfaceInfo(pName) != 0)
+		{
+			dbg_msg("kernel", "ERROR: couldn't register interface '%s'. interface already exists", pName);
+			return false;
+		}
+
+		pInterface->m_pKernel = this;
+		m_aInterfaces[m_NumInterfaces].m_pInterface = pInterface;
+		str_copy(m_aInterfaces[m_NumInterfaces].m_aName, pName);
+		m_aInterfaces[m_NumInterfaces].m_AutoDestroy = Destroy;
+		m_NumInterfaces++;
+
+		return true;
+	}
+
+	bool ReregisterInterfaceImpl(const char *pName, IInterface *pInterface) override
+	{
+		if(FindInterfaceInfo(pName) == 0)
+		{
+			dbg_msg("kernel", "ERROR: couldn't reregister interface '%s'. interface doesn't exist", pName);
+			return false;
+		}
+
+		pInterface->m_pKernel = this;
+
+		return true;
+	}
+
+	IInterface *RequestInterfaceImpl(const char *pName) override
+	{
+		CInterfaceInfo *pInfo = FindInterfaceInfo(pName);
+		if(!pInfo)
+		{
+			dbg_msg("kernel", "failed to find interface with the name '%s'", pName);
+			return 0;
+		}
+		return pInfo->m_pInterface;
+	}
+};
+
+IKernel *IKernel::Create() { return new CKernel; }
diff --git a/src_bkp/engine/shared/lib.rs b/src_bkp/engine/shared/lib.rs
new file mode 100644
index 0000000000..95002283b4
--- /dev/null
+++ b/src_bkp/engine/shared/lib.rs
@@ -0,0 +1,21 @@
+//! DDNet's engine interfaces, Rust part.
+//!
+//! DDNet's code base is separated into three major parts, `base`, `engine` and
+//! `game`.
+//!
+//! The engine consists of game-independent code such as display setup,
+//! low-level network protocol, low-level map format, etc.
+//!
+//! This crate in particular corresponds to the `src/engine/shared` directory
+//! that contains code shared between client, server and other components.
+
+#![warn(missing_docs)]
+
+#[cfg(test)]
+extern crate ddnet_test;
+
+mod config;
+mod rust_version;
+
+pub use config::*;
+pub use rust_version::*;
diff --git a/src_bkp/engine/shared/linereader.cpp b/src_bkp/engine/shared/linereader.cpp
new file mode 100644
index 0000000000..d322ee2792
--- /dev/null
+++ b/src_bkp/engine/shared/linereader.cpp
@@ -0,0 +1,84 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "linereader.h"
+
+#include <base/system.h>
+
+void CLineReader::Init(IOHANDLE File)
+{
+	m_BufferMaxSize = sizeof(m_aBuffer) - 1;
+	m_BufferSize = 0;
+	m_BufferPos = 0;
+	m_File = File;
+}
+
+char *CLineReader::Get()
+{
+	unsigned LineStart = m_BufferPos;
+	bool CRLFBreak = false;
+
+	while(true)
+	{
+		if(m_BufferPos >= m_BufferSize)
+		{
+			// fetch more
+
+			// move the remaining part to the front
+			unsigned Read;
+			unsigned Left = m_BufferSize - LineStart;
+
+			if(LineStart > m_BufferSize)
+				Left = 0;
+			if(Left)
+				mem_move(m_aBuffer, &m_aBuffer[LineStart], Left);
+			m_BufferPos = Left;
+
+			// fill the buffer
+			Read = io_read(m_File, &m_aBuffer[m_BufferPos], m_BufferMaxSize - m_BufferPos);
+			m_BufferSize = Left + Read;
+			LineStart = 0;
+
+			if(!Read)
+			{
+				if(Left)
+				{
+					m_aBuffer[Left] = 0; // return the last line
+					m_BufferPos = Left;
+					m_BufferSize = Left;
+					return m_aBuffer;
+				}
+				else
+					return 0x0; // we are done!
+			}
+		}
+		else
+		{
+			if(m_aBuffer[m_BufferPos] == '\n' || m_aBuffer[m_BufferPos] == '\r')
+			{
+				// line found
+				if(m_aBuffer[m_BufferPos] == '\r')
+				{
+					if(m_BufferPos + 1 >= m_BufferSize)
+					{
+						// read more to get the connected '\n'
+						CRLFBreak = true;
+						++m_BufferPos;
+						continue;
+					}
+					else if(m_aBuffer[m_BufferPos + 1] == '\n')
+						m_aBuffer[m_BufferPos++] = 0;
+				}
+				m_aBuffer[m_BufferPos++] = 0;
+				return &m_aBuffer[LineStart];
+			}
+			else if(CRLFBreak)
+			{
+				if(m_aBuffer[m_BufferPos] == '\n')
+					m_aBuffer[m_BufferPos++] = 0;
+				return &m_aBuffer[LineStart];
+			}
+			else
+				m_BufferPos++;
+		}
+	}
+}
diff --git a/src_bkp/engine/shared/linereader.h b/src_bkp/engine/shared/linereader.h
new file mode 100644
index 0000000000..7d5f1c5ab4
--- /dev/null
+++ b/src_bkp/engine/shared/linereader.h
@@ -0,0 +1,20 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_LINEREADER_H
+#define ENGINE_SHARED_LINEREADER_H
+#include <base/types.h>
+
+// buffered stream for reading lines, should perhaps be something smaller
+class CLineReader
+{
+	char m_aBuffer[4 * 8192 + 1]; // 1 additional byte for null termination
+	unsigned m_BufferPos;
+	unsigned m_BufferSize;
+	unsigned m_BufferMaxSize;
+	IOHANDLE m_File;
+
+public:
+	void Init(IOHANDLE File);
+	char *Get(); // Returned string is only valid until next Get() call
+};
+#endif
diff --git a/src_bkp/engine/shared/localization.h b/src_bkp/engine/shared/localization.h
new file mode 100644
index 0000000000..bf78c41888
--- /dev/null
+++ b/src_bkp/engine/shared/localization.h
@@ -0,0 +1,12 @@
+#ifndef ENGINE_SHARED_LOCALIZATION_H
+#define ENGINE_SHARED_LOCALIZATION_H
+
+/**
+* An empty function that suits as a helper to identify strings that might get localized later
+*/
+static constexpr const char *Localizable(const char *pStr, const char *pContext = "")
+{
+	return pStr;
+}
+
+#endif
diff --git a/src_bkp/engine/shared/map.cpp b/src_bkp/engine/shared/map.cpp
new file mode 100644
index 0000000000..605f95e3e9
--- /dev/null
+++ b/src_bkp/engine/shared/map.cpp
@@ -0,0 +1,170 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "map.h"
+
+#include <base/log.h>
+
+#include <engine/storage.h>
+
+#include <game/mapitems.h>
+
+CMap::CMap() = default;
+
+int CMap::GetDataSize(int Index) const
+{
+	return m_DataFile.GetDataSize(Index);
+}
+
+void *CMap::GetData(int Index)
+{
+	return m_DataFile.GetData(Index);
+}
+
+void *CMap::GetDataSwapped(int Index)
+{
+	return m_DataFile.GetDataSwapped(Index);
+}
+
+const char *CMap::GetDataString(int Index)
+{
+	return m_DataFile.GetDataString(Index);
+}
+
+void CMap::UnloadData(int Index)
+{
+	m_DataFile.UnloadData(Index);
+}
+
+int CMap::NumData() const
+{
+	return m_DataFile.NumData();
+}
+
+int CMap::GetItemSize(int Index)
+{
+	return m_DataFile.GetItemSize(Index);
+}
+
+void *CMap::GetItem(int Index, int *pType, int *pID)
+{
+	return m_DataFile.GetItem(Index, pType, pID);
+}
+
+void CMap::GetType(int Type, int *pStart, int *pNum)
+{
+	m_DataFile.GetType(Type, pStart, pNum);
+}
+
+int CMap::FindItemIndex(int Type, int ID)
+{
+	return m_DataFile.FindItemIndex(Type, ID);
+}
+
+void *CMap::FindItem(int Type, int ID)
+{
+	return m_DataFile.FindItem(Type, ID);
+}
+
+int CMap::NumItems() const
+{
+	return m_DataFile.NumItems();
+}
+
+bool CMap::Load(const char *pMapName)
+{
+	IStorage *pStorage = Kernel()->RequestInterface<IStorage>();
+	if(!pStorage)
+		return false;
+
+	// Ensure current datafile is not left in an inconsistent state if loading fails,
+	// by loading the new datafile separately first.
+	CDataFileReader NewDataFile;
+	if(!NewDataFile.Open(pStorage, pMapName, IStorage::TYPE_ALL))
+		return false;
+
+	// Check version
+	const CMapItemVersion *pItem = (CMapItemVersion *)NewDataFile.FindItem(MAPITEMTYPE_VERSION, 0);
+	if(pItem == nullptr || pItem->m_Version != CMapItemVersion::CURRENT_VERSION)
+	{
+		log_error("map/load", "Error: map version not supported.");
+		NewDataFile.Close();
+		return false;
+	}
+
+	// Replace compressed tile layers with uncompressed ones
+	int GroupsStart, GroupsNum, LayersStart, LayersNum;
+	NewDataFile.GetType(MAPITEMTYPE_GROUP, &GroupsStart, &GroupsNum);
+	NewDataFile.GetType(MAPITEMTYPE_LAYER, &LayersStart, &LayersNum);
+	for(int g = 0; g < GroupsNum; g++)
+	{
+		const CMapItemGroup *pGroup = static_cast<CMapItemGroup *>(NewDataFile.GetItem(GroupsStart + g));
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = static_cast<CMapItemLayer *>(NewDataFile.GetItem(LayersStart + pGroup->m_StartLayer + l));
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTilemap = reinterpret_cast<CMapItemLayerTilemap *>(pLayer);
+				if(pTilemap->m_Version >= CMapItemLayerTilemap::TILE_SKIP_MIN_VERSION)
+				{
+					const size_t TilemapSize = (size_t)pTilemap->m_Width * pTilemap->m_Height * sizeof(CTile);
+					CTile *pTiles = static_cast<CTile *>(malloc(TilemapSize));
+					ExtractTiles(pTiles, (size_t)pTilemap->m_Width * pTilemap->m_Height, static_cast<CTile *>(NewDataFile.GetData(pTilemap->m_Data)), NewDataFile.GetDataSize(pTilemap->m_Data) / sizeof(CTile));
+					NewDataFile.ReplaceData(pTilemap->m_Data, reinterpret_cast<char *>(pTiles), TilemapSize);
+				}
+			}
+		}
+	}
+
+	// Replace existing datafile with new datafile
+	m_DataFile.Close();
+	m_DataFile = std::move(NewDataFile);
+	return true;
+}
+
+void CMap::Unload()
+{
+	m_DataFile.Close();
+}
+
+bool CMap::IsLoaded() const
+{
+	return m_DataFile.IsOpen();
+}
+
+IOHANDLE CMap::File() const
+{
+	return m_DataFile.File();
+}
+
+SHA256_DIGEST CMap::Sha256() const
+{
+	return m_DataFile.Sha256();
+}
+
+unsigned CMap::Crc() const
+{
+	return m_DataFile.Crc();
+}
+
+int CMap::MapSize() const
+{
+	return m_DataFile.MapSize();
+}
+
+void CMap::ExtractTiles(CTile *pDest, size_t DestSize, const CTile *pSrc, size_t SrcSize)
+{
+	size_t DestIndex = 0;
+	size_t SrcIndex = 0;
+	while(DestIndex < DestSize && SrcIndex < SrcSize)
+	{
+		for(unsigned Counter = 0; Counter <= pSrc[SrcIndex].m_Skip && DestIndex < DestSize; Counter++)
+		{
+			pDest[DestIndex] = pSrc[SrcIndex];
+			pDest[DestIndex].m_Skip = 0;
+			DestIndex++;
+		}
+		SrcIndex++;
+	}
+}
+
+extern IEngineMap *CreateEngineMap() { return new CMap; }
diff --git a/src_bkp/engine/shared/map.h b/src_bkp/engine/shared/map.h
new file mode 100644
index 0000000000..c104c6c0a6
--- /dev/null
+++ b/src_bkp/engine/shared/map.h
@@ -0,0 +1,46 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_MAP_H
+#define ENGINE_SHARED_MAP_H
+
+#include <base/types.h>
+
+#include "datafile.h"
+#include <engine/map.h>
+
+class CMap : public IEngineMap
+{
+	CDataFileReader m_DataFile;
+
+public:
+	CMap();
+
+	CDataFileReader *GetReader() { return &m_DataFile; }
+
+	int GetDataSize(int Index) const override;
+	void *GetData(int Index) override;
+	void *GetDataSwapped(int Index) override;
+	const char *GetDataString(int Index) override;
+	void UnloadData(int Index) override;
+	int NumData() const override;
+
+	int GetItemSize(int Index) override;
+	void *GetItem(int Index, int *pType = nullptr, int *pID = nullptr) override;
+	void GetType(int Type, int *pStart, int *pNum) override;
+	int FindItemIndex(int Type, int ID) override;
+	void *FindItem(int Type, int ID) override;
+	int NumItems() const override;
+
+	bool Load(const char *pMapName) override;
+	void Unload() override;
+	bool IsLoaded() const override;
+	IOHANDLE File() const override;
+
+	SHA256_DIGEST Sha256() const override;
+	unsigned Crc() const override;
+	int MapSize() const override;
+
+	static void ExtractTiles(class CTile *pDest, size_t DestSize, const class CTile *pSrc, size_t SrcSize);
+};
+
+#endif
diff --git a/src_bkp/engine/shared/masterserver.cpp b/src_bkp/engine/shared/masterserver.cpp
new file mode 100644
index 0000000000..f9d390c4d5
--- /dev/null
+++ b/src_bkp/engine/shared/masterserver.cpp
@@ -0,0 +1,12 @@
+#include "masterserver.h"
+
+const unsigned char SERVERBROWSE_GETINFO[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'g', 'i', 'e', '3'};
+const unsigned char SERVERBROWSE_INFO[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'i', 'n', 'f', '3'};
+
+const unsigned char SERVERBROWSE_GETINFO_64_LEGACY[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'f', 's', 't', 'd'};
+const unsigned char SERVERBROWSE_INFO_64_LEGACY[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'd', 't', 's', 'f'};
+
+const unsigned char SERVERBROWSE_INFO_EXTENDED[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'i', 'e', 'x', 't'};
+const unsigned char SERVERBROWSE_INFO_EXTENDED_MORE[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'i', 'e', 'x', '+'};
+
+const unsigned char SERVERBROWSE_CHALLENGE[SERVERBROWSE_SIZE] = {255, 255, 255, 255, 'c', 'h', 'a', 'l'};
diff --git a/src_bkp/engine/shared/masterserver.h b/src_bkp/engine/shared/masterserver.h
new file mode 100644
index 0000000000..c3a653a958
--- /dev/null
+++ b/src_bkp/engine/shared/masterserver.h
@@ -0,0 +1,26 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_MASTERSERVER_H
+#define ENGINE_SHARED_MASTERSERVER_H
+
+#define SERVERBROWSE_SIZE 8
+extern const unsigned char SERVERBROWSE_GETINFO[SERVERBROWSE_SIZE];
+extern const unsigned char SERVERBROWSE_INFO[SERVERBROWSE_SIZE];
+
+extern const unsigned char SERVERBROWSE_GETINFO_64_LEGACY[SERVERBROWSE_SIZE];
+extern const unsigned char SERVERBROWSE_INFO_64_LEGACY[SERVERBROWSE_SIZE];
+
+extern const unsigned char SERVERBROWSE_INFO_EXTENDED[SERVERBROWSE_SIZE];
+extern const unsigned char SERVERBROWSE_INFO_EXTENDED_MORE[SERVERBROWSE_SIZE];
+
+extern const unsigned char SERVERBROWSE_CHALLENGE[SERVERBROWSE_SIZE];
+
+enum
+{
+	SERVERINFO_VANILLA = 0,
+	SERVERINFO_64_LEGACY,
+	SERVERINFO_EXTENDED,
+	SERVERINFO_EXTENDED_MORE,
+	SERVERINFO_INGAME,
+};
+#endif // ENGINE_SHARED_MASTERSERVER_H
diff --git a/src_bkp/engine/shared/memheap.cpp b/src_bkp/engine/shared/memheap.cpp
new file mode 100644
index 0000000000..311a6ddb43
--- /dev/null
+++ b/src_bkp/engine/shared/memheap.cpp
@@ -0,0 +1,94 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "memheap.h"
+#include <base/system.h>
+#include <cstdint>
+#include <cstdlib>
+
+// allocates a new chunk to be used
+void CHeap::NewChunk()
+{
+	// the chunk structure is located in the beginning of the chunk
+	// init it and return the chunk
+	CChunk *pChunk = static_cast<CChunk *>(malloc(sizeof(CChunk) + CHUNK_SIZE));
+	if(!pChunk)
+		return;
+	pChunk->m_pMemory = static_cast<char *>(static_cast<void *>(pChunk + 1));
+	pChunk->m_pCurrent = pChunk->m_pMemory;
+	pChunk->m_pEnd = pChunk->m_pMemory + CHUNK_SIZE;
+	pChunk->m_pNext = nullptr;
+
+	pChunk->m_pNext = m_pCurrent;
+	m_pCurrent = pChunk;
+}
+
+//****************
+void *CHeap::AllocateFromChunk(unsigned int Size, unsigned Alignment)
+{
+	size_t Offset = reinterpret_cast<uintptr_t>(m_pCurrent->m_pCurrent) % Alignment;
+	if(Offset)
+		Offset = Alignment - Offset;
+
+	// check if we need can fit the allocation
+	if(m_pCurrent->m_pCurrent + Offset + Size > m_pCurrent->m_pEnd)
+		return nullptr;
+
+	// get memory and move the pointer forward
+	char *pMem = m_pCurrent->m_pCurrent + Offset;
+	m_pCurrent->m_pCurrent += Offset + Size;
+	return pMem;
+}
+
+// creates a heap
+CHeap::CHeap()
+{
+	m_pCurrent = nullptr;
+	Reset();
+}
+
+CHeap::~CHeap()
+{
+	Clear();
+}
+
+void CHeap::Reset()
+{
+	Clear();
+	NewChunk();
+}
+
+// destroys the heap
+void CHeap::Clear()
+{
+	while(m_pCurrent)
+	{
+		CChunk *pNext = m_pCurrent->m_pNext;
+		free(m_pCurrent);
+		m_pCurrent = pNext;
+	}
+}
+
+//
+void *CHeap::Allocate(unsigned Size, unsigned Alignment)
+{
+	// try to allocate from current chunk
+	void *pMem = AllocateFromChunk(Size, Alignment);
+	if(!pMem)
+	{
+		// allocate new chunk and add it to the heap
+		NewChunk();
+
+		// try to allocate again
+		pMem = AllocateFromChunk(Size, Alignment);
+	}
+
+	return pMem;
+}
+
+const char *CHeap::StoreString(const char *pSrc)
+{
+	const int Size = str_length(pSrc) + 1;
+	char *pMem = static_cast<char *>(Allocate(Size));
+	str_copy(pMem, pSrc, Size);
+	return pMem;
+}
diff --git a/src_bkp/engine/shared/memheap.h b/src_bkp/engine/shared/memheap.h
new file mode 100644
index 0000000000..acabfa6233
--- /dev/null
+++ b/src_bkp/engine/shared/memheap.h
@@ -0,0 +1,46 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_MEMHEAP_H
+#define ENGINE_SHARED_MEMHEAP_H
+
+#include <cstddef>
+#include <new>
+#include <utility>
+
+class CHeap
+{
+	struct CChunk
+	{
+		char *m_pMemory;
+		char *m_pCurrent;
+		char *m_pEnd;
+		CChunk *m_pNext;
+	};
+
+	enum
+	{
+		// how large each chunk should be
+		CHUNK_SIZE = 1025 * 64,
+	};
+
+	CChunk *m_pCurrent;
+
+	void Clear();
+	void NewChunk();
+	void *AllocateFromChunk(unsigned int Size, unsigned Alignment);
+
+public:
+	CHeap();
+	~CHeap();
+	void Reset();
+	void *Allocate(unsigned Size, unsigned Alignment = alignof(std::max_align_t));
+	const char *StoreString(const char *pSrc);
+
+	template<typename T, typename... TArgs>
+	T *Allocate(TArgs &&... Args)
+	{
+		return new(Allocate(sizeof(T), alignof(T))) T(std::forward<TArgs>(Args)...);
+	}
+};
+
+#endif
diff --git a/src_bkp/engine/shared/netban.cpp b/src_bkp/engine/shared/netban.cpp
new file mode 100644
index 0000000000..4f9d0ff441
--- /dev/null
+++ b/src_bkp/engine/shared/netban.cpp
@@ -0,0 +1,548 @@
+#include <base/math.h>
+
+#include <engine/console.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include "netban.h"
+
+CNetBan::CNetHash::CNetHash(const NETADDR *pAddr)
+{
+	if(pAddr->type == NETTYPE_IPV4)
+		m_Hash = (pAddr->ip[0] + pAddr->ip[1] + pAddr->ip[2] + pAddr->ip[3]) & 0xFF;
+	else
+		m_Hash = (pAddr->ip[0] + pAddr->ip[1] + pAddr->ip[2] + pAddr->ip[3] + pAddr->ip[4] + pAddr->ip[5] + pAddr->ip[6] + pAddr->ip[7] +
+				 pAddr->ip[8] + pAddr->ip[9] + pAddr->ip[10] + pAddr->ip[11] + pAddr->ip[12] + pAddr->ip[13] + pAddr->ip[14] + pAddr->ip[15]) &
+			 0xFF;
+	m_HashIndex = 0;
+}
+
+CNetBan::CNetHash::CNetHash(const CNetRange *pRange)
+{
+	m_Hash = 0;
+	m_HashIndex = 0;
+	for(int i = 0; pRange->m_LB.ip[i] == pRange->m_UB.ip[i]; ++i)
+	{
+		m_Hash += pRange->m_LB.ip[i];
+		++m_HashIndex;
+	}
+	m_Hash &= 0xFF;
+}
+
+int CNetBan::CNetHash::MakeHashArray(const NETADDR *pAddr, CNetHash aHash[17])
+{
+	int Length = pAddr->type == NETTYPE_IPV4 ? 4 : 16;
+	aHash[0].m_Hash = 0;
+	aHash[0].m_HashIndex = 0;
+	for(int i = 1, Sum = 0; i <= Length; ++i)
+	{
+		Sum += pAddr->ip[i - 1];
+		aHash[i].m_Hash = Sum & 0xFF;
+		aHash[i].m_HashIndex = i % Length;
+	}
+	return Length;
+}
+
+template<class T, int HashCount>
+void CNetBan::CBanPool<T, HashCount>::InsertUsed(CBan<T> *pBan)
+{
+	if(m_pFirstUsed)
+	{
+		for(CBan<T> *p = m_pFirstUsed;; p = p->m_pNext)
+		{
+			if(p->m_Info.m_Expires == CBanInfo::EXPIRES_NEVER || (pBan->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER && pBan->m_Info.m_Expires <= p->m_Info.m_Expires))
+			{
+				// insert before
+				pBan->m_pNext = p;
+				pBan->m_pPrev = p->m_pPrev;
+				if(p->m_pPrev)
+					p->m_pPrev->m_pNext = pBan;
+				else
+					m_pFirstUsed = pBan;
+				p->m_pPrev = pBan;
+				break;
+			}
+
+			if(!p->m_pNext)
+			{
+				// last entry
+				p->m_pNext = pBan;
+				pBan->m_pPrev = p;
+				pBan->m_pNext = 0;
+				break;
+			}
+		}
+	}
+	else
+	{
+		m_pFirstUsed = pBan;
+		pBan->m_pNext = pBan->m_pPrev = 0;
+	}
+}
+
+template<class T, int HashCount>
+typename CNetBan::CBan<T> *CNetBan::CBanPool<T, HashCount>::Add(const T *pData, const CBanInfo *pInfo, const CNetHash *pNetHash)
+{
+	if(!m_pFirstFree)
+		return 0;
+
+	// create new ban
+	CBan<T> *pBan = m_pFirstFree;
+	pBan->m_Data = *pData;
+	pBan->m_Info = *pInfo;
+	pBan->m_NetHash = *pNetHash;
+	if(pBan->m_pNext)
+		pBan->m_pNext->m_pPrev = pBan->m_pPrev;
+	if(pBan->m_pPrev)
+		pBan->m_pPrev->m_pNext = pBan->m_pNext;
+	else
+		m_pFirstFree = pBan->m_pNext;
+
+	// add it to the hash list
+	if(m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash])
+		m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash]->m_pHashPrev = pBan;
+	pBan->m_pHashPrev = 0;
+	pBan->m_pHashNext = m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash];
+	m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash] = pBan;
+
+	// insert it into the used list
+	InsertUsed(pBan);
+
+	// update ban count
+	++m_CountUsed;
+
+	return pBan;
+}
+
+template<class T, int HashCount>
+int CNetBan::CBanPool<T, HashCount>::Remove(CBan<T> *pBan)
+{
+	if(pBan == 0)
+		return -1;
+
+	// remove from hash list
+	if(pBan->m_pHashNext)
+		pBan->m_pHashNext->m_pHashPrev = pBan->m_pHashPrev;
+	if(pBan->m_pHashPrev)
+		pBan->m_pHashPrev->m_pHashNext = pBan->m_pHashNext;
+	else
+		m_aapHashList[pBan->m_NetHash.m_HashIndex][pBan->m_NetHash.m_Hash] = pBan->m_pHashNext;
+	pBan->m_pHashNext = pBan->m_pHashPrev = 0;
+
+	// remove from used list
+	if(pBan->m_pNext)
+		pBan->m_pNext->m_pPrev = pBan->m_pPrev;
+	if(pBan->m_pPrev)
+		pBan->m_pPrev->m_pNext = pBan->m_pNext;
+	else
+		m_pFirstUsed = pBan->m_pNext;
+
+	// add to recycle list
+	if(m_pFirstFree)
+		m_pFirstFree->m_pPrev = pBan;
+	pBan->m_pPrev = 0;
+	pBan->m_pNext = m_pFirstFree;
+	m_pFirstFree = pBan;
+
+	// update ban count
+	--m_CountUsed;
+
+	return 0;
+}
+
+template<class T, int HashCount>
+void CNetBan::CBanPool<T, HashCount>::Update(CBan<CDataType> *pBan, const CBanInfo *pInfo)
+{
+	pBan->m_Info = *pInfo;
+
+	// remove from used list
+	if(pBan->m_pNext)
+		pBan->m_pNext->m_pPrev = pBan->m_pPrev;
+	if(pBan->m_pPrev)
+		pBan->m_pPrev->m_pNext = pBan->m_pNext;
+	else
+		m_pFirstUsed = pBan->m_pNext;
+
+	// insert it into the used list
+	InsertUsed(pBan);
+}
+
+void CNetBan::UnbanAll()
+{
+	m_BanAddrPool.Reset();
+	m_BanRangePool.Reset();
+}
+
+template<class T, int HashCount>
+void CNetBan::CBanPool<T, HashCount>::Reset()
+{
+	mem_zero(m_aapHashList, sizeof(m_aapHashList));
+	mem_zero(m_aBans, sizeof(m_aBans));
+	m_pFirstUsed = 0;
+	m_CountUsed = 0;
+
+	for(int i = 1; i < MAX_BANS - 1; ++i)
+	{
+		m_aBans[i].m_pNext = &m_aBans[i + 1];
+		m_aBans[i].m_pPrev = &m_aBans[i - 1];
+	}
+
+	m_aBans[0].m_pNext = &m_aBans[1];
+	m_aBans[MAX_BANS - 1].m_pPrev = &m_aBans[MAX_BANS - 2];
+	m_pFirstFree = &m_aBans[0];
+}
+
+template<class T, int HashCount>
+typename CNetBan::CBan<T> *CNetBan::CBanPool<T, HashCount>::Get(int Index) const
+{
+	if(Index < 0 || Index >= Num())
+		return 0;
+
+	for(CNetBan::CBan<T> *pBan = m_pFirstUsed; pBan; pBan = pBan->m_pNext, --Index)
+	{
+		if(Index == 0)
+			return pBan;
+	}
+
+	return 0;
+}
+
+template<class T>
+int CNetBan::Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason)
+{
+	// do not ban localhost
+	if(NetMatch(pData, &m_LocalhostIPV4) || NetMatch(pData, &m_LocalhostIPV6))
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (localhost)");
+		return -1;
+	}
+
+	int Stamp = Seconds > 0 ? time_timestamp() + Seconds : CBanInfo::EXPIRES_NEVER;
+
+	// set up info
+	CBanInfo Info = {0};
+	Info.m_Expires = Stamp;
+	str_copy(Info.m_aReason, pReason);
+
+	// check if it already exists
+	CNetHash NetHash(pData);
+	CBan<typename T::CDataType> *pBan = pBanPool->Find(pData, &NetHash);
+	if(pBan)
+	{
+		// adjust the ban
+		pBanPool->Update(pBan, &Info);
+		char aBuf[128];
+		MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_LIST);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		return 1;
+	}
+
+	// add ban and print result
+	pBan = pBanPool->Add(pData, &Info, &NetHash);
+	if(pBan)
+	{
+		char aBuf[128];
+		MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_BANADD);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		return 0;
+	}
+	else
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (full banlist)");
+	return -1;
+}
+
+template<class T>
+int CNetBan::Unban(T *pBanPool, const typename T::CDataType *pData)
+{
+	CNetHash NetHash(pData);
+	CBan<typename T::CDataType> *pBan = pBanPool->Find(pData, &NetHash);
+	if(pBan)
+	{
+		char aBuf[256];
+		MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_BANREM);
+		pBanPool->Remove(pBan);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		return 0;
+	}
+	else
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "unban failed (invalid entry)");
+	return -1;
+}
+
+void CNetBan::Init(IConsole *pConsole, IStorage *pStorage)
+{
+	m_pConsole = pConsole;
+	m_pStorage = pStorage;
+	m_BanAddrPool.Reset();
+	m_BanRangePool.Reset();
+
+	net_host_lookup("localhost", &m_LocalhostIPV4, NETTYPE_IPV4);
+	net_host_lookup("localhost", &m_LocalhostIPV6, NETTYPE_IPV6);
+
+	Console()->Register("ban", "s[ip|id] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBan, this, "Ban ip for x minutes for any reason");
+	Console()->Register("ban_range", "s[first ip] s[last ip] ?i[minutes] r[reason]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBanRange, this, "Ban ip range for x minutes for any reason");
+	Console()->Register("unban", "s[ip|entry]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnban, this, "Unban ip/banlist entry");
+	Console()->Register("unban_range", "s[first ip] s[last ip]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnbanRange, this, "Unban ip range");
+	Console()->Register("unban_all", "", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConUnbanAll, this, "Unban all entries");
+	Console()->Register("bans", "?i[page]", CFGFLAG_SERVER | CFGFLAG_MASTER, ConBans, this, "Show banlist (page 0 by default, 20 entries per page)");
+	Console()->Register("bans_save", "s[file]", CFGFLAG_SERVER | CFGFLAG_MASTER | CFGFLAG_STORE, ConBansSave, this, "Save banlist in a file");
+}
+
+void CNetBan::Update()
+{
+	int Now = time_timestamp();
+
+	// remove expired bans
+	char aBuf[256], aNetStr[256];
+	while(m_BanAddrPool.First() && m_BanAddrPool.First()->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER && m_BanAddrPool.First()->m_Info.m_Expires < Now)
+	{
+		str_format(aBuf, sizeof(aBuf), "ban %s expired", NetToString(&m_BanAddrPool.First()->m_Data, aNetStr, sizeof(aNetStr)));
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		m_BanAddrPool.Remove(m_BanAddrPool.First());
+	}
+	while(m_BanRangePool.First() && m_BanRangePool.First()->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER && m_BanRangePool.First()->m_Info.m_Expires < Now)
+	{
+		str_format(aBuf, sizeof(aBuf), "ban %s expired", NetToString(&m_BanRangePool.First()->m_Data, aNetStr, sizeof(aNetStr)));
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		m_BanRangePool.Remove(m_BanRangePool.First());
+	}
+}
+
+int CNetBan::BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason)
+{
+	return Ban(&m_BanAddrPool, pAddr, Seconds, pReason);
+}
+
+int CNetBan::BanRange(const CNetRange *pRange, int Seconds, const char *pReason)
+{
+	if(pRange->IsValid())
+		return Ban(&m_BanRangePool, pRange, Seconds, pReason);
+
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (invalid range)");
+	return -1;
+}
+
+int CNetBan::UnbanByAddr(const NETADDR *pAddr)
+{
+	return Unban(&m_BanAddrPool, pAddr);
+}
+
+int CNetBan::UnbanByRange(const CNetRange *pRange)
+{
+	if(pRange->IsValid())
+		return Unban(&m_BanRangePool, pRange);
+
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban failed (invalid range)");
+	return -1;
+}
+
+int CNetBan::UnbanByIndex(int Index)
+{
+	int Result;
+	char aBuf[256];
+	CBanAddr *pBan = m_BanAddrPool.Get(Index);
+	if(pBan)
+	{
+		NetToString(&pBan->m_Data, aBuf, sizeof(aBuf));
+		Result = m_BanAddrPool.Remove(pBan);
+	}
+	else
+	{
+		CBanRange *pBanRange = m_BanRangePool.Get(Index - m_BanAddrPool.Num());
+		if(pBanRange)
+		{
+			NetToString(&pBanRange->m_Data, aBuf, sizeof(aBuf));
+			Result = m_BanRangePool.Remove(pBanRange);
+		}
+		else
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "unban failed (invalid index)");
+			return -1;
+		}
+	}
+
+	char aMsg[256];
+	str_format(aMsg, sizeof(aMsg), "unbanned index %i (%s)", Index, aBuf);
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
+	return Result;
+}
+
+bool CNetBan::IsBanned(const NETADDR *pOrigAddr, char *pBuf, unsigned BufferSize) const
+{
+	NETADDR Addr;
+	const NETADDR *pAddr = pOrigAddr;
+	if(pOrigAddr->type == NETTYPE_WEBSOCKET_IPV4)
+	{
+		mem_copy(&Addr, pOrigAddr, sizeof(NETADDR));
+		pAddr = &Addr;
+		Addr.type = NETTYPE_IPV4;
+	}
+	CNetHash aHash[17];
+	int Length = CNetHash::MakeHashArray(pAddr, aHash);
+
+	// check ban addresses
+	CBanAddr *pBan = m_BanAddrPool.Find(pAddr, &aHash[Length]);
+	if(pBan)
+	{
+		MakeBanInfo(pBan, pBuf, BufferSize, MSGTYPE_PLAYER);
+		return true;
+	}
+
+	// check ban ranges
+	for(int i = Length - 1; i >= 0; --i)
+	{
+		for(CBanRange *pBanRange = m_BanRangePool.First(&aHash[i]); pBanRange; pBanRange = pBanRange->m_pHashNext)
+		{
+			if(NetMatch(&pBanRange->m_Data, pAddr, i, Length))
+			{
+				MakeBanInfo(pBanRange, pBuf, BufferSize, MSGTYPE_PLAYER);
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+void CNetBan::ConBan(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	const char *pStr = pResult->GetString(0);
+	int Minutes = pResult->NumArguments() > 1 ? clamp(pResult->GetInteger(1), 0, 525600) : 30;
+	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "No reason given";
+
+	NETADDR Addr;
+	if(net_addr_from_str(&Addr, pStr) == 0)
+		pThis->BanAddr(&Addr, Minutes * 60, pReason);
+	else
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (invalid network address)");
+}
+
+void CNetBan::ConBanRange(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	const char *pStr1 = pResult->GetString(0);
+	const char *pStr2 = pResult->GetString(1);
+	int Minutes = pResult->NumArguments() > 2 ? clamp(pResult->GetInteger(2), 0, 525600) : 30;
+	const char *pReason = pResult->NumArguments() > 3 ? pResult->GetString(3) : "No reason given";
+
+	CNetRange Range;
+	if(net_addr_from_str(&Range.m_LB, pStr1) == 0 && net_addr_from_str(&Range.m_UB, pStr2) == 0)
+		pThis->BanRange(&Range, Minutes * 60, pReason);
+	else
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "ban error (invalid range)");
+}
+
+void CNetBan::ConUnban(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	const char *pStr = pResult->GetString(0);
+	if(str_isallnum(pStr))
+		pThis->UnbanByIndex(str_toint(pStr));
+	else
+	{
+		NETADDR Addr;
+		if(net_addr_from_str(&Addr, pStr) == 0)
+			pThis->UnbanByAddr(&Addr);
+		else
+			pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "unban error (invalid network address)");
+	}
+}
+
+void CNetBan::ConUnbanRange(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	const char *pStr1 = pResult->GetString(0);
+	const char *pStr2 = pResult->GetString(1);
+
+	CNetRange Range;
+	if(net_addr_from_str(&Range.m_LB, pStr1) == 0 && net_addr_from_str(&Range.m_UB, pStr2) == 0)
+		pThis->UnbanByRange(&Range);
+	else
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "unban error (invalid range)");
+}
+
+void CNetBan::ConUnbanAll(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	pThis->UnbanAll();
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "unbanned all entries");
+}
+
+void CNetBan::ConBans(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	int Page = pResult->NumArguments() > 0 ? pResult->GetInteger(0) : 0;
+	static const int s_EntriesPerPage = 20;
+	const int Start = Page * s_EntriesPerPage;
+	const int End = (Page + 1) * s_EntriesPerPage;
+
+	int Count = 0;
+	char aBuf[256], aMsg[256];
+	for(CBanAddr *pBan = pThis->m_BanAddrPool.First(); pBan; pBan = pBan->m_pNext, Count++)
+	{
+		if(Count < Start || Count >= End)
+		{
+			continue;
+		}
+		pThis->MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_LIST);
+		str_format(aMsg, sizeof(aMsg), "#%i %s", Count, aBuf);
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
+	}
+	for(CBanRange *pBan = pThis->m_BanRangePool.First(); pBan; pBan = pBan->m_pNext, Count++)
+	{
+		if(Count < Start || Count >= End)
+		{
+			continue;
+		}
+		pThis->MakeBanInfo(pBan, aBuf, sizeof(aBuf), MSGTYPE_LIST);
+		str_format(aMsg, sizeof(aMsg), "#%i %s", Count, aBuf);
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
+	}
+	str_format(aMsg, sizeof(aMsg), "%d %s, showing entries %d - %d", Count, Count == 1 ? "ban" : "bans", Start, End - 1);
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
+}
+
+void CNetBan::ConBansSave(IConsole::IResult *pResult, void *pUser)
+{
+	CNetBan *pThis = static_cast<CNetBan *>(pUser);
+
+	char aBuf[256];
+	IOHANDLE File = pThis->Storage()->OpenFile(pResult->GetString(0), IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(!File)
+	{
+		str_format(aBuf, sizeof(aBuf), "failed to save banlist to '%s'", pResult->GetString(0));
+		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+		return;
+	}
+
+	int Now = time_timestamp();
+	char aAddrStr1[NETADDR_MAXSTRSIZE], aAddrStr2[NETADDR_MAXSTRSIZE];
+	for(CBanAddr *pBan = pThis->m_BanAddrPool.First(); pBan; pBan = pBan->m_pNext)
+	{
+		int Min = pBan->m_Info.m_Expires > -1 ? (pBan->m_Info.m_Expires - Now + 59) / 60 : -1;
+		net_addr_str(&pBan->m_Data, aAddrStr1, sizeof(aAddrStr1), false);
+		str_format(aBuf, sizeof(aBuf), "ban %s %i %s", aAddrStr1, Min, pBan->m_Info.m_aReason);
+		io_write(File, aBuf, str_length(aBuf));
+		io_write_newline(File);
+	}
+	for(CBanRange *pBan = pThis->m_BanRangePool.First(); pBan; pBan = pBan->m_pNext)
+	{
+		int Min = pBan->m_Info.m_Expires > -1 ? (pBan->m_Info.m_Expires - Now + 59) / 60 : -1;
+		net_addr_str(&pBan->m_Data.m_LB, aAddrStr1, sizeof(aAddrStr1), false);
+		net_addr_str(&pBan->m_Data.m_UB, aAddrStr2, sizeof(aAddrStr2), false);
+		str_format(aBuf, sizeof(aBuf), "ban_range %s %s %i %s", aAddrStr1, aAddrStr2, Min, pBan->m_Info.m_aReason);
+		io_write(File, aBuf, str_length(aBuf));
+		io_write_newline(File);
+	}
+
+	io_close(File);
+	str_format(aBuf, sizeof(aBuf), "saved banlist to '%s'", pResult->GetString(0));
+	pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aBuf);
+}
diff --git a/src_bkp/engine/shared/netban.h b/src_bkp/engine/shared/netban.h
new file mode 100644
index 0000000000..6de37e51d9
--- /dev/null
+++ b/src_bkp/engine/shared/netban.h
@@ -0,0 +1,242 @@
+#ifndef ENGINE_SHARED_NETBAN_H
+#define ENGINE_SHARED_NETBAN_H
+
+#include <base/system.h>
+#include <engine/console.h>
+
+inline int NetComp(const NETADDR *pAddr1, const NETADDR *pAddr2)
+{
+	return mem_comp(pAddr1, pAddr2, pAddr1->type == NETTYPE_IPV4 ? 8 : 20);
+}
+
+class CNetRange
+{
+public:
+	NETADDR m_LB;
+	NETADDR m_UB;
+
+	bool IsValid() const { return m_LB.type == m_UB.type && NetComp(&m_LB, &m_UB) < 0; }
+};
+
+inline int NetComp(const CNetRange *pRange1, const CNetRange *pRange2)
+{
+	return NetComp(&pRange1->m_LB, &pRange2->m_LB) || NetComp(&pRange1->m_UB, &pRange2->m_UB);
+}
+
+class CNetBan
+{
+protected:
+	bool NetMatch(const NETADDR *pAddr1, const NETADDR *pAddr2) const
+	{
+		return NetComp(pAddr1, pAddr2) == 0;
+	}
+
+	bool NetMatch(const CNetRange *pRange, const NETADDR *pAddr, int Start, int Length) const
+	{
+		return pRange->m_LB.type == pAddr->type && (Start == 0 || mem_comp(&pRange->m_LB.ip[0], &pAddr->ip[0], Start) == 0) &&
+		       mem_comp(&pRange->m_LB.ip[Start], &pAddr->ip[Start], Length - Start) <= 0 && mem_comp(&pRange->m_UB.ip[Start], &pAddr->ip[Start], Length - Start) >= 0;
+	}
+
+	bool NetMatch(const CNetRange *pRange, const NETADDR *pAddr) const
+	{
+		return NetMatch(pRange, pAddr, 0, pRange->m_LB.type == NETTYPE_IPV4 ? 4 : 16);
+	}
+
+	const char *NetToString(const NETADDR *pData, char *pBuffer, unsigned BufferSize) const
+	{
+		char aAddrStr[NETADDR_MAXSTRSIZE];
+		net_addr_str(pData, aAddrStr, sizeof(aAddrStr), false);
+		str_format(pBuffer, BufferSize, "'%s'", aAddrStr);
+		return pBuffer;
+	}
+
+	const char *NetToString(const CNetRange *pData, char *pBuffer, unsigned BufferSize) const
+	{
+		char aAddrStr1[NETADDR_MAXSTRSIZE], aAddrStr2[NETADDR_MAXSTRSIZE];
+		net_addr_str(&pData->m_LB, aAddrStr1, sizeof(aAddrStr1), false);
+		net_addr_str(&pData->m_UB, aAddrStr2, sizeof(aAddrStr2), false);
+		str_format(pBuffer, BufferSize, "'%s' - '%s'", aAddrStr1, aAddrStr2);
+		return pBuffer;
+	}
+
+	class CNetHash
+	{
+	public:
+		int m_Hash;
+		int m_HashIndex; // matching parts for ranges, 0 for addr
+
+		CNetHash() = default;
+		CNetHash(const NETADDR *pAddr);
+		CNetHash(const CNetRange *pRange);
+
+		static int MakeHashArray(const NETADDR *pAddr, CNetHash aHash[17]);
+	};
+
+	struct CBanInfo
+	{
+		enum
+		{
+			EXPIRES_NEVER = -1,
+			REASON_LENGTH = 64,
+		};
+		int m_Expires;
+		char m_aReason[REASON_LENGTH];
+	};
+
+	template<class T>
+	struct CBan
+	{
+		T m_Data;
+		CBanInfo m_Info;
+		CNetHash m_NetHash;
+
+		// hash list
+		CBan *m_pHashNext;
+		CBan *m_pHashPrev;
+
+		// used or free list
+		CBan *m_pNext;
+		CBan *m_pPrev;
+	};
+
+	template<class T, int HashCount>
+	class CBanPool
+	{
+	public:
+		typedef T CDataType;
+
+		CBan<CDataType> *Add(const CDataType *pData, const CBanInfo *pInfo, const CNetHash *pNetHash);
+		int Remove(CBan<CDataType> *pBan);
+		void Update(CBan<CDataType> *pBan, const CBanInfo *pInfo);
+		void Reset();
+
+		int Num() const { return m_CountUsed; }
+		bool IsFull() const { return m_CountUsed == MAX_BANS; }
+
+		CBan<CDataType> *First() const { return m_pFirstUsed; }
+		CBan<CDataType> *First(const CNetHash *pNetHash) const { return m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash]; }
+		CBan<CDataType> *Find(const CDataType *pData, const CNetHash *pNetHash) const
+		{
+			for(CBan<CDataType> *pBan = m_aapHashList[pNetHash->m_HashIndex][pNetHash->m_Hash]; pBan; pBan = pBan->m_pHashNext)
+			{
+				if(NetComp(&pBan->m_Data, pData) == 0)
+					return pBan;
+			}
+
+			return 0;
+		}
+		CBan<CDataType> *Get(int Index) const;
+
+	private:
+		enum
+		{
+			MAX_BANS = 1024,
+		};
+
+		CBan<CDataType> *m_aapHashList[HashCount][256];
+		CBan<CDataType> m_aBans[MAX_BANS];
+		CBan<CDataType> *m_pFirstFree;
+		CBan<CDataType> *m_pFirstUsed;
+		int m_CountUsed;
+
+		void InsertUsed(CBan<CDataType> *pBan);
+	};
+
+	typedef CBanPool<NETADDR, 1> CBanAddrPool;
+	typedef CBanPool<CNetRange, 16> CBanRangePool;
+	typedef CBan<NETADDR> CBanAddr;
+	typedef CBan<CNetRange> CBanRange;
+
+	template<class T>
+	void MakeBanInfo(const CBan<T> *pBan, char *pBuf, unsigned BuffSize, int Type) const;
+	template<class T>
+	int Ban(T *pBanPool, const typename T::CDataType *pData, int Seconds, const char *pReason);
+	template<class T>
+	int Unban(T *pBanPool, const typename T::CDataType *pData);
+
+	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+	CBanAddrPool m_BanAddrPool;
+	CBanRangePool m_BanRangePool;
+	NETADDR m_LocalhostIPV4, m_LocalhostIPV6;
+
+public:
+	enum
+	{
+		MSGTYPE_PLAYER = 0,
+		MSGTYPE_LIST,
+		MSGTYPE_BANADD,
+		MSGTYPE_BANREM,
+	};
+
+	class IConsole *Console() const { return m_pConsole; }
+	class IStorage *Storage() const { return m_pStorage; }
+
+	virtual ~CNetBan() {}
+	void Init(class IConsole *pConsole, class IStorage *pStorage);
+	void Update();
+
+	virtual int BanAddr(const NETADDR *pAddr, int Seconds, const char *pReason);
+	virtual int BanRange(const CNetRange *pRange, int Seconds, const char *pReason);
+	int UnbanByAddr(const NETADDR *pAddr);
+	int UnbanByRange(const CNetRange *pRange);
+	int UnbanByIndex(int Index);
+	void UnbanAll();
+	bool IsBanned(const NETADDR *pOrigAddr, char *pBuf, unsigned BufferSize) const;
+
+	static void ConBan(class IConsole::IResult *pResult, void *pUser);
+	static void ConBanRange(class IConsole::IResult *pResult, void *pUser);
+	static void ConUnban(class IConsole::IResult *pResult, void *pUser);
+	static void ConUnbanRange(class IConsole::IResult *pResult, void *pUser);
+	static void ConUnbanAll(class IConsole::IResult *pResult, void *pUser);
+	static void ConBans(class IConsole::IResult *pResult, void *pUser);
+	static void ConBansSave(class IConsole::IResult *pResult, void *pUser);
+};
+
+template<class T>
+void CNetBan::MakeBanInfo(const CBan<T> *pBan, char *pBuf, unsigned BuffSize, int Type) const
+{
+	if(pBan == 0 || pBuf == 0)
+	{
+		if(BuffSize > 0)
+			pBuf[0] = 0;
+		return;
+	}
+
+	// build type based part
+	char aBuf[256];
+	if(Type == MSGTYPE_PLAYER)
+		str_copy(aBuf, "You have been banned");
+	else
+	{
+		char aTemp[256];
+		switch(Type)
+		{
+		case MSGTYPE_LIST:
+			str_format(aBuf, sizeof(aBuf), "%s banned", NetToString(&pBan->m_Data, aTemp, sizeof(aTemp)));
+			break;
+		case MSGTYPE_BANADD:
+			str_format(aBuf, sizeof(aBuf), "banned %s", NetToString(&pBan->m_Data, aTemp, sizeof(aTemp)));
+			break;
+		case MSGTYPE_BANREM:
+			str_format(aBuf, sizeof(aBuf), "unbanned %s", NetToString(&pBan->m_Data, aTemp, sizeof(aTemp)));
+			break;
+		default:
+			aBuf[0] = 0;
+		}
+	}
+
+	// add info part
+	if(pBan->m_Info.m_Expires != CBanInfo::EXPIRES_NEVER)
+	{
+		int Mins = ((pBan->m_Info.m_Expires - time_timestamp()) + 59) / 60;
+		if(Mins <= 1)
+			str_format(pBuf, BuffSize, "%s for 1 minute (%s)", aBuf, pBan->m_Info.m_aReason);
+		else
+			str_format(pBuf, BuffSize, "%s for %d minutes (%s)", aBuf, Mins, pBan->m_Info.m_aReason);
+	}
+	else
+		str_format(pBuf, BuffSize, "%s (%s)", aBuf, pBan->m_Info.m_aReason);
+}
+
+#endif
diff --git a/src_bkp/engine/shared/network.cpp b/src_bkp/engine/shared/network.cpp
new file mode 100644
index 0000000000..92e87ce8a0
--- /dev/null
+++ b/src_bkp/engine/shared/network.cpp
@@ -0,0 +1,418 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+#include "config.h"
+#include "huffman.h"
+#include "network.h"
+
+const unsigned char SECURITY_TOKEN_MAGIC[4] = {'T', 'K', 'E', 'N'};
+
+void CNetRecvUnpacker::Clear()
+{
+	m_Valid = false;
+}
+
+void CNetRecvUnpacker::Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientID)
+{
+	m_Addr = *pAddr;
+	m_pConnection = pConnection;
+	m_ClientID = ClientID;
+	m_CurrentChunk = 0;
+	m_Valid = true;
+}
+
+// TODO: rename this function
+int CNetRecvUnpacker::FetchChunk(CNetChunk *pChunk)
+{
+	CNetChunkHeader Header;
+	unsigned char *pEnd = m_Data.m_aChunkData + m_Data.m_DataSize;
+
+	while(true)
+	{
+		unsigned char *pData = m_Data.m_aChunkData;
+
+		// check for old data to unpack
+		if(!m_Valid || m_CurrentChunk >= m_Data.m_NumChunks)
+		{
+			Clear();
+			return 0;
+		}
+
+		// TODO: add checking here so we don't read too far
+		for(int i = 0; i < m_CurrentChunk; i++)
+		{
+			pData = Header.Unpack(pData, (m_pConnection && m_pConnection->m_Sixup) ? 6 : 4);
+			pData += Header.m_Size;
+		}
+
+		// unpack the header
+		pData = Header.Unpack(pData, (m_pConnection && m_pConnection->m_Sixup) ? 6 : 4);
+		m_CurrentChunk++;
+
+		if(pData + Header.m_Size > pEnd)
+		{
+			Clear();
+			return 0;
+		}
+
+		// handle sequence stuff
+		if(m_pConnection && (Header.m_Flags & NET_CHUNKFLAG_VITAL))
+		{
+			// anti spoof: ignore unknown sequence
+			if(Header.m_Sequence == (m_pConnection->m_Ack + 1) % NET_MAX_SEQUENCE || m_pConnection->m_UnknownSeq)
+			{
+				m_pConnection->m_UnknownSeq = false;
+
+				// in sequence
+				m_pConnection->m_Ack = Header.m_Sequence;
+			}
+			else
+			{
+				// old packet that we already got
+				if(CNetBase::IsSeqInBackroom(Header.m_Sequence, m_pConnection->m_Ack))
+					continue;
+
+				// out of sequence, request resend
+				if(g_Config.m_Debug)
+					dbg_msg("conn", "asking for resend %d %d", Header.m_Sequence, (m_pConnection->m_Ack + 1) % NET_MAX_SEQUENCE);
+				m_pConnection->SignalResend();
+				continue; // take the next chunk in the packet
+			}
+		}
+
+		// fill in the info
+		pChunk->m_ClientID = m_ClientID;
+		pChunk->m_Address = m_Addr;
+		pChunk->m_Flags = Header.m_Flags;
+		pChunk->m_DataSize = Header.m_Size;
+		pChunk->m_pData = pData;
+		return 1;
+	}
+}
+
+static const unsigned char NET_HEADER_EXTENDED[] = {'x', 'e'};
+// packs the data tight and sends it
+void CNetBase::SendPacketConnless(NETSOCKET Socket, NETADDR *pAddr, const void *pData, int DataSize, bool Extended, unsigned char aExtra[4])
+{
+	unsigned char aBuffer[NET_MAX_PACKETSIZE];
+	const int DATA_OFFSET = 6;
+	if(!Extended)
+	{
+		for(int i = 0; i < DATA_OFFSET; i++)
+			aBuffer[i] = 0xff;
+	}
+	else
+	{
+		mem_copy(aBuffer, NET_HEADER_EXTENDED, sizeof(NET_HEADER_EXTENDED));
+		mem_copy(aBuffer + sizeof(NET_HEADER_EXTENDED), aExtra, 4);
+	}
+	mem_copy(aBuffer + DATA_OFFSET, pData, DataSize);
+	net_udp_send(Socket, pAddr, aBuffer, DataSize + DATA_OFFSET);
+}
+
+void CNetBase::SendPacket(NETSOCKET Socket, NETADDR *pAddr, CNetPacketConstruct *pPacket, SECURITY_TOKEN SecurityToken, bool Sixup, bool NoCompress)
+{
+	unsigned char aBuffer[NET_MAX_PACKETSIZE];
+	int CompressedSize = -1;
+	int FinalSize = -1;
+
+	// log the data
+	if(ms_DataLogSent)
+	{
+		int Type = 1;
+		io_write(ms_DataLogSent, &Type, sizeof(Type));
+		io_write(ms_DataLogSent, &pPacket->m_DataSize, sizeof(pPacket->m_DataSize));
+		io_write(ms_DataLogSent, &pPacket->m_aChunkData, pPacket->m_DataSize);
+		io_flush(ms_DataLogSent);
+	}
+
+	int HeaderSize = NET_PACKETHEADERSIZE;
+	if(Sixup)
+	{
+		HeaderSize += sizeof(SecurityToken);
+		mem_copy(&aBuffer[3], &SecurityToken, sizeof(SecurityToken));
+	}
+	else if(SecurityToken != NET_SECURITY_TOKEN_UNSUPPORTED)
+	{
+		// append security token
+		// if SecurityToken is NET_SECURITY_TOKEN_UNKNOWN we will still append it hoping to negotiate it
+		mem_copy(&pPacket->m_aChunkData[pPacket->m_DataSize], &SecurityToken, sizeof(SecurityToken));
+		pPacket->m_DataSize += sizeof(SecurityToken);
+	}
+
+	// compress
+	if(!NoCompress)
+		CompressedSize = ms_Huffman.Compress(pPacket->m_aChunkData, pPacket->m_DataSize, &aBuffer[HeaderSize], NET_MAX_PACKETSIZE - HeaderSize);
+
+	// check if the compression was enabled, successful and good enough
+	if(!NoCompress && CompressedSize > 0 && CompressedSize < pPacket->m_DataSize)
+	{
+		FinalSize = CompressedSize;
+		pPacket->m_Flags |= NET_PACKETFLAG_COMPRESSION;
+	}
+	else
+	{
+		// use uncompressed data
+		FinalSize = pPacket->m_DataSize;
+		mem_copy(&aBuffer[HeaderSize], pPacket->m_aChunkData, pPacket->m_DataSize);
+		pPacket->m_Flags &= ~NET_PACKETFLAG_COMPRESSION;
+	}
+
+	if(Sixup)
+	{
+		unsigned Flags = 0;
+		if(pPacket->m_Flags & NET_PACKETFLAG_CONTROL)
+			Flags |= 1;
+		if(pPacket->m_Flags & NET_PACKETFLAG_RESEND)
+			Flags |= 2;
+		if(pPacket->m_Flags & NET_PACKETFLAG_COMPRESSION)
+			Flags |= 4;
+		pPacket->m_Flags = Flags;
+	}
+
+	// set header and send the packet if all things are good
+	if(FinalSize >= 0)
+	{
+		FinalSize += HeaderSize;
+		aBuffer[0] = ((pPacket->m_Flags << 2) & 0xfc) | ((pPacket->m_Ack >> 8) & 0x3);
+		aBuffer[1] = pPacket->m_Ack & 0xff;
+		aBuffer[2] = pPacket->m_NumChunks;
+		net_udp_send(Socket, pAddr, aBuffer, FinalSize);
+
+		// log raw socket data
+		if(ms_DataLogSent)
+		{
+			int Type = 0;
+			io_write(ms_DataLogSent, &Type, sizeof(Type));
+			io_write(ms_DataLogSent, &FinalSize, sizeof(FinalSize));
+			io_write(ms_DataLogSent, aBuffer, FinalSize);
+			io_flush(ms_DataLogSent);
+		}
+	}
+}
+
+// TODO: rename this function
+int CNetBase::UnpackPacket(unsigned char *pBuffer, int Size, CNetPacketConstruct *pPacket, bool &Sixup, SECURITY_TOKEN *pSecurityToken, SECURITY_TOKEN *pResponseToken)
+{
+	// check the size
+	if(Size < NET_PACKETHEADERSIZE || Size > NET_MAX_PACKETSIZE)
+		return -1;
+
+	// log the data
+	if(ms_DataLogRecv)
+	{
+		int Type = 0;
+		io_write(ms_DataLogRecv, &Type, sizeof(Type));
+		io_write(ms_DataLogRecv, &Size, sizeof(Size));
+		io_write(ms_DataLogRecv, pBuffer, Size);
+		io_flush(ms_DataLogRecv);
+	}
+
+	// read the packet
+	pPacket->m_Flags = pBuffer[0] >> 2;
+
+	if(pPacket->m_Flags & NET_PACKETFLAG_CONNLESS)
+	{
+		Sixup = (pBuffer[0] & 0x3) == 1;
+		if(Sixup && (pSecurityToken == nullptr || pResponseToken == nullptr))
+			return -1;
+		int Offset = Sixup ? 9 : 6;
+		if(Size < Offset)
+			return -1;
+
+		if(Sixup)
+		{
+			mem_copy(pSecurityToken, &pBuffer[1], sizeof(*pSecurityToken));
+			mem_copy(pResponseToken, &pBuffer[5], sizeof(*pResponseToken));
+		}
+
+		pPacket->m_Flags = NET_PACKETFLAG_CONNLESS;
+		pPacket->m_Ack = 0;
+		pPacket->m_NumChunks = 0;
+		pPacket->m_DataSize = Size - Offset;
+		mem_copy(pPacket->m_aChunkData, pBuffer + Offset, pPacket->m_DataSize);
+
+		if(!Sixup && mem_comp(pBuffer, NET_HEADER_EXTENDED, sizeof(NET_HEADER_EXTENDED)) == 0)
+		{
+			pPacket->m_Flags |= NET_PACKETFLAG_EXTENDED;
+			mem_copy(pPacket->m_aExtraData, pBuffer + sizeof(NET_HEADER_EXTENDED), sizeof(pPacket->m_aExtraData));
+		}
+	}
+	else
+	{
+		if(pPacket->m_Flags & NET_PACKETFLAG_UNUSED)
+			Sixup = true;
+		if(Sixup && pSecurityToken == nullptr)
+			return -1;
+		int DataStart = Sixup ? 7 : NET_PACKETHEADERSIZE;
+		if(Size < DataStart)
+			return -1;
+
+		pPacket->m_Ack = ((pBuffer[0] & 0x3) << 8) | pBuffer[1];
+		pPacket->m_NumChunks = pBuffer[2];
+		pPacket->m_DataSize = Size - DataStart;
+
+		if(Sixup)
+		{
+			unsigned Flags = 0;
+			if(pPacket->m_Flags & 1)
+				Flags |= NET_PACKETFLAG_CONTROL;
+			if(pPacket->m_Flags & 2)
+				Flags |= NET_PACKETFLAG_RESEND;
+			if(pPacket->m_Flags & 4)
+				Flags |= NET_PACKETFLAG_COMPRESSION;
+			pPacket->m_Flags = Flags;
+
+			mem_copy(pSecurityToken, &pBuffer[3], sizeof(*pSecurityToken));
+		}
+
+		if(pPacket->m_Flags & NET_PACKETFLAG_COMPRESSION)
+		{
+			// Don't allow compressed control packets.
+			if(pPacket->m_Flags & NET_PACKETFLAG_CONTROL)
+			{
+				return -1;
+			}
+			pPacket->m_DataSize = ms_Huffman.Decompress(&pBuffer[DataStart], pPacket->m_DataSize, pPacket->m_aChunkData, sizeof(pPacket->m_aChunkData));
+		}
+		else
+			mem_copy(pPacket->m_aChunkData, &pBuffer[DataStart], pPacket->m_DataSize);
+	}
+
+	// check for errors
+	if(pPacket->m_DataSize < 0)
+	{
+		if(g_Config.m_Debug)
+			dbg_msg("network", "error during packet decoding");
+		return -1;
+	}
+
+	// log the data
+	if(ms_DataLogRecv)
+	{
+		int Type = 1;
+		io_write(ms_DataLogRecv, &Type, sizeof(Type));
+		io_write(ms_DataLogRecv, &pPacket->m_DataSize, sizeof(pPacket->m_DataSize));
+		io_write(ms_DataLogRecv, pPacket->m_aChunkData, pPacket->m_DataSize);
+		io_flush(ms_DataLogRecv);
+	}
+
+	// return success
+	return 0;
+}
+
+void CNetBase::SendControlMsg(NETSOCKET Socket, NETADDR *pAddr, int Ack, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken, bool Sixup)
+{
+	CNetPacketConstruct Construct;
+	Construct.m_Flags = NET_PACKETFLAG_CONTROL;
+	Construct.m_Ack = Ack;
+	Construct.m_NumChunks = 0;
+	Construct.m_DataSize = 1 + ExtraSize;
+	Construct.m_aChunkData[0] = ControlMsg;
+	if(pExtra)
+		mem_copy(&Construct.m_aChunkData[1], pExtra, ExtraSize);
+
+	// send the control message
+	CNetBase::SendPacket(Socket, pAddr, &Construct, SecurityToken, Sixup, true);
+}
+
+unsigned char *CNetChunkHeader::Pack(unsigned char *pData, int Split) const
+{
+	pData[0] = ((m_Flags & 3) << 6) | ((m_Size >> Split) & 0x3f);
+	pData[1] = (m_Size & ((1 << Split) - 1));
+	if(m_Flags & NET_CHUNKFLAG_VITAL)
+	{
+		pData[1] |= (m_Sequence >> 2) & (~((1 << Split) - 1));
+		pData[2] = m_Sequence & 0xff;
+		return pData + 3;
+	}
+	return pData + 2;
+}
+
+unsigned char *CNetChunkHeader::Unpack(unsigned char *pData, int Split)
+{
+	m_Flags = (pData[0] >> 6) & 3;
+	m_Size = ((pData[0] & 0x3f) << Split) | (pData[1] & ((1 << Split) - 1));
+	m_Sequence = -1;
+	if(m_Flags & NET_CHUNKFLAG_VITAL)
+	{
+		m_Sequence = ((pData[1] & (~((1 << Split) - 1))) << 2) | pData[2];
+		return pData + 3;
+	}
+	return pData + 2;
+}
+
+bool CNetBase::IsSeqInBackroom(int Seq, int Ack)
+{
+	int Bottom = (Ack - NET_MAX_SEQUENCE / 2);
+	if(Bottom < 0)
+	{
+		if(Seq <= Ack)
+			return true;
+		if(Seq >= (Bottom + NET_MAX_SEQUENCE))
+			return true;
+	}
+	else
+	{
+		if(Seq <= Ack && Seq >= Bottom)
+			return true;
+	}
+
+	return false;
+}
+
+IOHANDLE CNetBase::ms_DataLogSent = 0;
+IOHANDLE CNetBase::ms_DataLogRecv = 0;
+CHuffman CNetBase::ms_Huffman;
+
+void CNetBase::OpenLog(IOHANDLE DataLogSent, IOHANDLE DataLogRecv)
+{
+	if(DataLogSent)
+	{
+		ms_DataLogSent = DataLogSent;
+		dbg_msg("network", "logging sent packages");
+	}
+	else
+		dbg_msg("network", "failed to start logging sent packages");
+
+	if(DataLogRecv)
+	{
+		ms_DataLogRecv = DataLogRecv;
+		dbg_msg("network", "logging recv packages");
+	}
+	else
+		dbg_msg("network", "failed to start logging recv packages");
+}
+
+void CNetBase::CloseLog()
+{
+	if(ms_DataLogSent)
+	{
+		dbg_msg("network", "stopped logging sent packages");
+		io_close(ms_DataLogSent);
+		ms_DataLogSent = 0;
+	}
+
+	if(ms_DataLogRecv)
+	{
+		dbg_msg("network", "stopped logging recv packages");
+		io_close(ms_DataLogRecv);
+		ms_DataLogRecv = 0;
+	}
+}
+
+int CNetBase::Compress(const void *pData, int DataSize, void *pOutput, int OutputSize)
+{
+	return ms_Huffman.Compress(pData, DataSize, pOutput, OutputSize);
+}
+
+int CNetBase::Decompress(const void *pData, int DataSize, void *pOutput, int OutputSize)
+{
+	return ms_Huffman.Decompress(pData, DataSize, pOutput, OutputSize);
+}
+
+void CNetBase::Init()
+{
+	ms_Huffman.Init();
+}
diff --git a/src_bkp/engine/shared/network.h b/src_bkp/engine/shared/network.h
new file mode 100644
index 0000000000..7ab0de5b5f
--- /dev/null
+++ b/src_bkp/engine/shared/network.h
@@ -0,0 +1,550 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_NETWORK_H
+#define ENGINE_SHARED_NETWORK_H
+
+#include "ringbuffer.h"
+#include "stun.h"
+
+#include <base/math.h>
+#include <base/system.h>
+
+class CHuffman;
+class CNetBan;
+class CPacker;
+
+/*
+
+CURRENT:
+	packet header: 3 bytes
+		unsigned char flags_ack; // 6bit flags, 2bit ack
+			0.6:   ORNCaaAA
+			0.6.5: ORNCTUAA
+			0.7:   --NORCAA
+
+		unsigned char ack; // 8 bit ack
+		unsigned char num_chunks; // 8 bit chunks
+
+		(unsigned char padding[3])	// 24 bit extra in case it's a connection less packet
+									// this is to make sure that it's compatible with the
+									// old protocol
+
+	chunk header: 2-3 bytes
+		unsigned char flags_size; // 2bit flags, 6 bit size
+		unsigned char size_seq; // 4bit size, 4bit seq
+		(unsigned char seq;) // 8bit seq, if vital flag is set
+*/
+
+enum
+{
+	NETFLAG_ALLOWSTATELESS = 1,
+	NETSENDFLAG_VITAL = 1,
+	NETSENDFLAG_CONNLESS = 2,
+	NETSENDFLAG_FLUSH = 4,
+	NETSENDFLAG_EXTENDED = 8,
+
+	NETSTATE_OFFLINE = 0,
+	NETSTATE_CONNECTING,
+	NETSTATE_ONLINE,
+
+	NETBANTYPE_SOFT = 1,
+	NETBANTYPE_DROP = 2
+};
+
+enum
+{
+	NET_VERSION = 2,
+
+	NET_MAX_PACKETSIZE = 1400,
+	NET_MAX_PAYLOAD = NET_MAX_PACKETSIZE - 6,
+	NET_MAX_CHUNKHEADERSIZE = 3,
+	NET_PACKETHEADERSIZE = 3,
+	NET_MAX_CLIENTS = 64,
+	NET_MAX_CONSOLE_CLIENTS = 4,
+	NET_MAX_SEQUENCE = 1 << 10,
+	NET_SEQUENCE_MASK = NET_MAX_SEQUENCE - 1,
+
+	NET_CONNSTATE_OFFLINE = 0,
+	NET_CONNSTATE_CONNECT = 1,
+	NET_CONNSTATE_PENDING = 2,
+	NET_CONNSTATE_ONLINE = 3,
+	NET_CONNSTATE_ERROR = 4,
+
+	NET_PACKETFLAG_UNUSED = 1 << 0,
+	NET_PACKETFLAG_TOKEN = 1 << 1,
+	NET_PACKETFLAG_CONTROL = 1 << 2,
+	NET_PACKETFLAG_CONNLESS = 1 << 3,
+	NET_PACKETFLAG_RESEND = 1 << 4,
+	NET_PACKETFLAG_COMPRESSION = 1 << 5,
+	// NOT SENT VIA THE NETWORK DIRECTLY:
+	NET_PACKETFLAG_EXTENDED = 1 << 6,
+
+	NET_CHUNKFLAG_VITAL = 1,
+	NET_CHUNKFLAG_RESEND = 2,
+
+	NET_CTRLMSG_KEEPALIVE = 0,
+	NET_CTRLMSG_CONNECT = 1,
+	NET_CTRLMSG_CONNECTACCEPT = 2,
+	NET_CTRLMSG_ACCEPT = 3,
+	NET_CTRLMSG_CLOSE = 4,
+
+	NET_CONN_BUFFERSIZE = 1024 * 32,
+
+	NET_CONNLIMIT_IPS = 16,
+
+	NET_ENUM_TERMINATOR
+};
+
+typedef int SECURITY_TOKEN;
+
+SECURITY_TOKEN ToSecurityToken(unsigned char *pData);
+
+extern const unsigned char SECURITY_TOKEN_MAGIC[4];
+
+enum
+{
+	NET_SECURITY_TOKEN_UNKNOWN = -1,
+	NET_SECURITY_TOKEN_UNSUPPORTED = 0,
+};
+
+typedef int (*NETFUNC_DELCLIENT)(int ClientID, const char *pReason, void *pUser);
+typedef int (*NETFUNC_NEWCLIENT_CON)(int ClientID, void *pUser);
+typedef int (*NETFUNC_NEWCLIENT)(int ClientID, void *pUser, bool Sixup);
+typedef int (*NETFUNC_NEWCLIENT_NOAUTH)(int ClientID, void *pUser);
+typedef int (*NETFUNC_CLIENTREJOIN)(int ClientID, void *pUser);
+
+struct CNetChunk
+{
+	// -1 means that it's a stateless packet
+	// 0 on the client means the server
+	int m_ClientID;
+	NETADDR m_Address; // only used when client_id == -1
+	int m_Flags;
+	int m_DataSize;
+	const void *m_pData;
+	// only used if the flags contain NETSENDFLAG_EXTENDED and NETSENDFLAG_CONNLESS
+	unsigned char m_aExtraData[4];
+};
+
+class CNetChunkHeader
+{
+public:
+	int m_Flags;
+	int m_Size;
+	int m_Sequence;
+
+	unsigned char *Pack(unsigned char *pData, int Split = 4) const;
+	unsigned char *Unpack(unsigned char *pData, int Split = 4);
+};
+
+class CNetChunkResend
+{
+public:
+	int m_Flags;
+	int m_DataSize;
+	unsigned char *m_pData;
+
+	int m_Sequence;
+	int64_t m_LastSendTime;
+	int64_t m_FirstSendTime;
+};
+
+class CNetPacketConstruct
+{
+public:
+	int m_Flags;
+	int m_Ack;
+	int m_NumChunks;
+	int m_DataSize;
+	unsigned char m_aChunkData[NET_MAX_PAYLOAD];
+	unsigned char m_aExtraData[4];
+};
+
+enum class CONNECTIVITY
+{
+	UNKNOWN,
+	CHECKING,
+	UNREACHABLE,
+	REACHABLE,
+	ADDRESS_KNOWN,
+};
+
+class CStun
+{
+	class CProtocol
+	{
+		int m_Index;
+		NETSOCKET m_Socket;
+		CStunData m_Stun;
+		bool m_HaveStunServer = false;
+		NETADDR m_StunServer;
+		bool m_HaveAddr = false;
+		NETADDR m_Addr;
+		int64_t m_LastResponse = -1;
+		int64_t m_NextTry = -1;
+		int m_NumUnsuccessfulTries = -1;
+
+	public:
+		CProtocol(int Index, NETSOCKET Socket);
+		void FeedStunServer(NETADDR StunServer);
+		void Refresh();
+		void Update();
+		bool OnPacket(NETADDR Addr, unsigned char *pData, int DataSize);
+		CONNECTIVITY GetConnectivity(NETADDR *pGlobalAddr);
+	};
+	CProtocol m_aProtocols[2];
+
+public:
+	CStun(NETSOCKET Socket);
+	void FeedStunServer(NETADDR StunServer);
+	void Refresh();
+	void Update();
+	bool OnPacket(NETADDR Addr, unsigned char *pData, int DataSize);
+	CONNECTIVITY GetConnectivity(int NetType, NETADDR *pGlobalAddr);
+};
+
+class CNetConnection
+{
+	// TODO: is this needed because this needs to be aware of
+	// the ack sequencing number and is also responible for updating
+	// that. this should be fixed.
+	friend class CNetRecvUnpacker;
+
+private:
+	unsigned short m_Sequence;
+	unsigned short m_Ack;
+	unsigned short m_PeerAck;
+	unsigned m_State;
+
+	SECURITY_TOKEN m_SecurityToken;
+	int m_RemoteClosed;
+	bool m_BlockCloseMsg;
+	bool m_UnknownSeq;
+
+	CStaticRingBuffer<CNetChunkResend, NET_CONN_BUFFERSIZE> m_Buffer;
+
+	int64_t m_LastUpdateTime;
+	int64_t m_LastRecvTime;
+	int64_t m_LastSendTime;
+
+	char m_aErrorString[256];
+
+	CNetPacketConstruct m_Construct;
+
+	NETADDR m_aConnectAddrs[16];
+	int m_NumConnectAddrs;
+	NETADDR m_PeerAddr;
+	NETSOCKET m_Socket;
+	NETSTATS m_Stats;
+
+	//
+	void ResetStats();
+	void SetError(const char *pString);
+	void AckChunks(int Ack);
+
+	int QueueChunkEx(int Flags, int DataSize, const void *pData, int Sequence);
+	void SendConnect();
+	void SendControl(int ControlMsg, const void *pExtra, int ExtraSize);
+	void ResendChunk(CNetChunkResend *pResend);
+	void Resend();
+
+public:
+	bool m_TimeoutProtected;
+	bool m_TimeoutSituation;
+
+	void Reset(bool Rejoin = false);
+	void Init(NETSOCKET Socket, bool BlockCloseMsg);
+	int Connect(const NETADDR *pAddr, int NumAddrs);
+	void Disconnect(const char *pReason);
+
+	int Update();
+	int Flush();
+
+	int Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED);
+	int QueueChunk(int Flags, int DataSize, const void *pData);
+
+	const char *ErrorString();
+	void SignalResend();
+	int State() const { return m_State; }
+	const NETADDR *PeerAddress() const { return &m_PeerAddr; }
+	void ConnectAddresses(const NETADDR **ppAddrs, int *pNumAddrs) const
+	{
+		*ppAddrs = m_aConnectAddrs;
+		*pNumAddrs = m_NumConnectAddrs;
+	}
+
+	void ResetErrorString() { m_aErrorString[0] = 0; }
+	const char *ErrorString() const { return m_aErrorString; }
+
+	// Needed for GotProblems in NetClient
+	int64_t LastRecvTime() const { return m_LastRecvTime; }
+	int64_t ConnectTime() const { return m_LastUpdateTime; }
+
+	int AckSequence() const { return m_Ack; }
+	int SeqSequence() const { return m_Sequence; }
+	int SecurityToken() const { return m_SecurityToken; }
+	CStaticRingBuffer<CNetChunkResend, NET_CONN_BUFFERSIZE> *ResendBuffer() { return &m_Buffer; }
+
+	void SetTimedOut(const NETADDR *pAddr, int Sequence, int Ack, SECURITY_TOKEN SecurityToken, CStaticRingBuffer<CNetChunkResend, NET_CONN_BUFFERSIZE> *pResendBuffer, bool Sixup);
+
+	// anti spoof
+	void DirectInit(const NETADDR &Addr, SECURITY_TOKEN SecurityToken, SECURITY_TOKEN Token, bool Sixup);
+	void SetUnknownSeq() { m_UnknownSeq = true; }
+	void SetSequence(int Sequence) { m_Sequence = Sequence; }
+
+	bool m_Sixup;
+	SECURITY_TOKEN m_Token;
+};
+
+class CConsoleNetConnection
+{
+private:
+	int m_State;
+
+	NETADDR m_PeerAddr;
+	NETSOCKET m_Socket;
+
+	char m_aBuffer[NET_MAX_PACKETSIZE];
+	int m_BufferOffset;
+
+	char m_aErrorString[256];
+
+	bool m_LineEndingDetected;
+	char m_aLineEnding[3];
+
+public:
+	void Init(NETSOCKET Socket, const NETADDR *pAddr);
+	void Disconnect(const char *pReason);
+
+	int State() const { return m_State; }
+	const NETADDR *PeerAddress() const { return &m_PeerAddr; }
+	const char *ErrorString() const { return m_aErrorString; }
+
+	void Reset();
+	int Update();
+	int Send(const char *pLine);
+	int Recv(char *pLine, int MaxLength);
+};
+
+class CNetRecvUnpacker
+{
+public:
+	bool m_Valid;
+
+	NETADDR m_Addr;
+	CNetConnection *m_pConnection;
+	int m_CurrentChunk;
+	int m_ClientID;
+	CNetPacketConstruct m_Data;
+	unsigned char m_aBuffer[NET_MAX_PACKETSIZE];
+
+	CNetRecvUnpacker() { Clear(); }
+	void Clear();
+	void Start(const NETADDR *pAddr, CNetConnection *pConnection, int ClientID);
+	int FetchChunk(CNetChunk *pChunk);
+};
+
+// server side
+class CNetServer
+{
+	struct CSlot
+	{
+	public:
+		CNetConnection m_Connection;
+	};
+
+	struct CSpamConn
+	{
+		NETADDR m_Addr;
+		int64_t m_Time;
+		int m_Conns;
+	};
+
+	NETADDR m_Address;
+	NETSOCKET m_Socket;
+	CNetBan *m_pNetBan;
+	CSlot m_aSlots[NET_MAX_CLIENTS];
+	int m_MaxClients;
+	int m_MaxClientsPerIP;
+
+	NETFUNC_NEWCLIENT m_pfnNewClient;
+	NETFUNC_NEWCLIENT_NOAUTH m_pfnNewClientNoAuth;
+	NETFUNC_DELCLIENT m_pfnDelClient;
+	NETFUNC_CLIENTREJOIN m_pfnClientRejoin;
+	void *m_pUser;
+
+	int m_NumConAttempts; // log flooding attacks
+	int64_t m_TimeNumConAttempts;
+	unsigned char m_aSecurityTokenSeed[16];
+
+	// vanilla connect flood detection
+	int64_t m_VConnFirst;
+	int m_VConnNum;
+
+	CSpamConn m_aSpamConns[NET_CONNLIMIT_IPS];
+
+	CNetRecvUnpacker m_RecvUnpacker;
+
+	void OnTokenCtrlMsg(NETADDR &Addr, int ControlMsg, const CNetPacketConstruct &Packet);
+	int OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg, const CNetPacketConstruct &Packet, SECURITY_TOKEN &ResponseToken, SECURITY_TOKEN Token);
+	void OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet);
+	void OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, const CNetPacketConstruct &Packet);
+	bool ClientExists(const NETADDR &Addr) { return GetClientSlot(Addr) != -1; }
+	int GetClientSlot(const NETADDR &Addr);
+	void SendControl(NETADDR &Addr, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken);
+
+	int TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, bool VanillaAuth = false, bool Sixup = false, SECURITY_TOKEN Token = 0);
+	int NumClientsWithAddr(NETADDR Addr);
+	bool Connlimit(NETADDR Addr);
+	void SendMsgs(NETADDR &Addr, const CPacker **ppMsgs, int Num);
+
+public:
+	int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
+	int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_NEWCLIENT_NOAUTH pfnNewClientNoAuth, NETFUNC_CLIENTREJOIN pfnClientRejoin, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
+
+	//
+	bool Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIP);
+	int Close();
+
+	//
+	int Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken);
+	int Send(CNetChunk *pChunk);
+	int Update();
+
+	//
+	int Drop(int ClientID, const char *pReason);
+
+	// status requests
+	const NETADDR *ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
+	bool HasSecurityToken(int ClientID) const { return m_aSlots[ClientID].m_Connection.SecurityToken() != NET_SECURITY_TOKEN_UNSUPPORTED; }
+	NETADDR Address() const { return m_Address; }
+	NETSOCKET Socket() const { return m_Socket; }
+	CNetBan *NetBan() const { return m_pNetBan; }
+	int NetType() const { return net_socket_type(m_Socket); }
+	int MaxClients() const { return m_MaxClients; }
+
+	void SendTokenSixup(NETADDR &Addr, SECURITY_TOKEN Token);
+	int SendConnlessSixup(CNetChunk *pChunk, SECURITY_TOKEN ResponseToken);
+
+	//
+	void SetMaxClientsPerIP(int Max);
+	bool SetTimedOut(int ClientID, int OrigID);
+	void SetTimeoutProtected(int ClientID);
+
+	int ResetErrorString(int ClientID);
+	const char *ErrorString(int ClientID);
+
+	// anti spoof
+	SECURITY_TOKEN GetGlobalToken();
+	SECURITY_TOKEN GetToken(const NETADDR &Addr);
+	// vanilla token/gametick shouldn't be negative
+	SECURITY_TOKEN GetVanillaToken(const NETADDR &Addr) { return absolute(GetToken(Addr)); }
+};
+
+class CNetConsole
+{
+	struct CSlot
+	{
+		CConsoleNetConnection m_Connection;
+	};
+
+	NETSOCKET m_Socket;
+	CNetBan *m_pNetBan;
+	CSlot m_aSlots[NET_MAX_CONSOLE_CLIENTS];
+
+	NETFUNC_NEWCLIENT_CON m_pfnNewClient;
+	NETFUNC_DELCLIENT m_pfnDelClient;
+	void *m_pUser;
+
+	CNetRecvUnpacker m_RecvUnpacker;
+
+public:
+	void SetCallbacks(NETFUNC_NEWCLIENT_CON pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
+
+	//
+	bool Open(NETADDR BindAddr, CNetBan *pNetBan);
+	int Close();
+
+	//
+	int Recv(char *pLine, int MaxLength, int *pClientID = nullptr);
+	int Send(int ClientID, const char *pLine);
+	int Update();
+
+	//
+	int AcceptClient(NETSOCKET Socket, const NETADDR *pAddr);
+	int Drop(int ClientID, const char *pReason);
+
+	// status requests
+	const NETADDR *ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
+	CNetBan *NetBan() const { return m_pNetBan; }
+};
+
+// client side
+class CNetClient
+{
+	CNetConnection m_Connection;
+	CNetRecvUnpacker m_RecvUnpacker;
+
+	CStun *m_pStun = nullptr;
+
+public:
+	NETSOCKET m_Socket;
+	// openness
+	bool Open(NETADDR BindAddr);
+	int Close();
+
+	// connection state
+	int Disconnect(const char *pReason);
+	int Connect(const NETADDR *pAddr, int NumAddrs);
+
+	// communication
+	int Recv(CNetChunk *pChunk);
+	int Send(CNetChunk *pChunk);
+
+	// pumping
+	int Update();
+	int Flush();
+
+	int ResetErrorString();
+
+	// error and state
+	int NetType() const { return net_socket_type(m_Socket); }
+	int State();
+	const NETADDR *ServerAddress() const { return m_Connection.PeerAddress(); }
+	void ConnectAddresses(const NETADDR **ppAddrs, int *pNumAddrs) const { m_Connection.ConnectAddresses(ppAddrs, pNumAddrs); }
+	int GotProblems(int64_t MaxLatency) const;
+	const char *ErrorString() const;
+
+	bool SecurityTokenUnknown() { return m_Connection.SecurityToken() == NET_SECURITY_TOKEN_UNKNOWN; }
+
+	// stun
+	void FeedStunServer(NETADDR StunServer);
+	void RefreshStun();
+	CONNECTIVITY GetConnectivity(int NetType, NETADDR *pGlobalAddr);
+};
+
+// TODO: both, fix these. This feels like a junk class for stuff that doesn't fit anywhere
+class CNetBase
+{
+	static IOHANDLE ms_DataLogSent;
+	static IOHANDLE ms_DataLogRecv;
+	static CHuffman ms_Huffman;
+
+public:
+	static void OpenLog(IOHANDLE DataLogSent, IOHANDLE DataLogRecv);
+	static void CloseLog();
+	static void Init();
+	static int Compress(const void *pData, int DataSize, void *pOutput, int OutputSize);
+	static int Decompress(const void *pData, int DataSize, void *pOutput, int OutputSize);
+
+	static void SendControlMsg(NETSOCKET Socket, NETADDR *pAddr, int Ack, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken, bool Sixup = false);
+	static void SendPacketConnless(NETSOCKET Socket, NETADDR *pAddr, const void *pData, int DataSize, bool Extended, unsigned char aExtra[4]);
+	static void SendPacket(NETSOCKET Socket, NETADDR *pAddr, CNetPacketConstruct *pPacket, SECURITY_TOKEN SecurityToken, bool Sixup = false, bool NoCompress = false);
+
+	static int UnpackPacket(unsigned char *pBuffer, int Size, CNetPacketConstruct *pPacket, bool &Sixup, SECURITY_TOKEN *pSecurityToken = nullptr, SECURITY_TOKEN *pResponseToken = nullptr);
+
+	// The backroom is ack-NET_MAX_SEQUENCE/2. Used for knowing if we acked a packet or not
+	static bool IsSeqInBackroom(int Seq, int Ack);
+};
+
+#endif
diff --git a/src_bkp/engine/shared/network_client.cpp b/src_bkp/engine/shared/network_client.cpp
new file mode 100644
index 0000000000..a978154752
--- /dev/null
+++ b/src_bkp/engine/shared/network_client.cpp
@@ -0,0 +1,183 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "network.h"
+#include <base/system.h>
+
+bool CNetClient::Open(NETADDR BindAddr)
+{
+	// open socket
+	NETSOCKET Socket;
+	Socket = net_udp_create(BindAddr);
+	if(!Socket)
+		return false;
+
+	// clean it
+	*this = CNetClient{};
+
+	// init
+	m_Socket = Socket;
+	m_pStun = new CStun(m_Socket);
+	m_Connection.Init(m_Socket, false);
+
+	return true;
+}
+
+int CNetClient::Close()
+{
+	if(!m_Socket)
+		return 0;
+	if(m_pStun)
+	{
+		delete m_pStun;
+		m_pStun = nullptr;
+	}
+	return net_udp_close(m_Socket);
+}
+
+int CNetClient::Disconnect(const char *pReason)
+{
+	//dbg_msg("netclient", "disconnected. reason=\"%s\"", pReason);
+	m_Connection.Disconnect(pReason);
+	return 0;
+}
+
+int CNetClient::Update()
+{
+	m_Connection.Update();
+	if(m_Connection.State() == NET_CONNSTATE_ERROR)
+		Disconnect(m_Connection.ErrorString());
+	m_pStun->Update();
+	return 0;
+}
+
+int CNetClient::Connect(const NETADDR *pAddr, int NumAddrs)
+{
+	m_Connection.Connect(pAddr, NumAddrs);
+	return 0;
+}
+
+int CNetClient::ResetErrorString()
+{
+	m_Connection.ResetErrorString();
+	return 0;
+}
+
+int CNetClient::Recv(CNetChunk *pChunk)
+{
+	while(true)
+	{
+		// check for a chunk
+		if(m_RecvUnpacker.FetchChunk(pChunk))
+			return 1;
+
+		// TODO: empty the recvinfo
+		NETADDR Addr;
+		unsigned char *pData;
+		int Bytes = net_udp_recv(m_Socket, &Addr, &pData);
+
+		// no more packets for now
+		if(Bytes <= 0)
+			break;
+
+		if(m_pStun->OnPacket(Addr, pData, Bytes))
+		{
+			continue;
+		}
+
+		bool Sixup = false;
+		if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup) == 0)
+		{
+			if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONNLESS)
+			{
+				pChunk->m_Flags = NETSENDFLAG_CONNLESS;
+				pChunk->m_ClientID = -1;
+				pChunk->m_Address = Addr;
+				pChunk->m_DataSize = m_RecvUnpacker.m_Data.m_DataSize;
+				pChunk->m_pData = m_RecvUnpacker.m_Data.m_aChunkData;
+				if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_EXTENDED)
+				{
+					pChunk->m_Flags |= NETSENDFLAG_EXTENDED;
+					mem_copy(pChunk->m_aExtraData, m_RecvUnpacker.m_Data.m_aExtraData, sizeof(pChunk->m_aExtraData));
+				}
+				return 1;
+			}
+			else
+			{
+				if(m_Connection.State() != NET_CONNSTATE_OFFLINE && m_Connection.State() != NET_CONNSTATE_ERROR && m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr))
+					m_RecvUnpacker.Start(&Addr, &m_Connection, 0);
+			}
+		}
+	}
+	return 0;
+}
+
+int CNetClient::Send(CNetChunk *pChunk)
+{
+	if(pChunk->m_DataSize >= NET_MAX_PAYLOAD)
+	{
+		dbg_msg("netclient", "chunk payload too big. %d. dropping chunk", pChunk->m_DataSize);
+		return -1;
+	}
+
+	if(pChunk->m_Flags & NETSENDFLAG_CONNLESS)
+	{
+		// send connectionless packet
+		CNetBase::SendPacketConnless(m_Socket, &pChunk->m_Address, pChunk->m_pData, pChunk->m_DataSize,
+			pChunk->m_Flags & NETSENDFLAG_EXTENDED, pChunk->m_aExtraData);
+	}
+	else
+	{
+		int Flags = 0;
+		dbg_assert(pChunk->m_ClientID == 0, "erroneous client id");
+
+		if(pChunk->m_Flags & NETSENDFLAG_VITAL)
+			Flags = NET_CHUNKFLAG_VITAL;
+
+		m_Connection.QueueChunk(Flags, pChunk->m_DataSize, pChunk->m_pData);
+
+		if(pChunk->m_Flags & NETSENDFLAG_FLUSH)
+			m_Connection.Flush();
+	}
+	return 0;
+}
+
+int CNetClient::State()
+{
+	if(m_Connection.State() == NET_CONNSTATE_ONLINE)
+		return NETSTATE_ONLINE;
+	if(m_Connection.State() == NET_CONNSTATE_OFFLINE)
+		return NETSTATE_OFFLINE;
+	return NETSTATE_CONNECTING;
+}
+
+int CNetClient::Flush()
+{
+	return m_Connection.Flush();
+}
+
+int CNetClient::GotProblems(int64_t MaxLatency) const
+{
+	if(time_get() - m_Connection.LastRecvTime() > MaxLatency)
+		return 1;
+	return 0;
+}
+
+const char *CNetClient::ErrorString() const
+{
+	return m_Connection.ErrorString();
+}
+
+void CNetClient::FeedStunServer(NETADDR StunServer)
+{
+	m_pStun->FeedStunServer(StunServer);
+}
+
+void CNetClient::RefreshStun()
+{
+	m_pStun->Refresh();
+}
+
+CONNECTIVITY CNetClient::GetConnectivity(int NetType, NETADDR *pGlobalAddr)
+{
+	return m_pStun->GetConnectivity(NetType, pGlobalAddr);
+}
diff --git a/src_bkp/engine/shared/network_conn.cpp b/src_bkp/engine/shared/network_conn.cpp
new file mode 100644
index 0000000000..50961465d8
--- /dev/null
+++ b/src_bkp/engine/shared/network_conn.cpp
@@ -0,0 +1,531 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "config.h"
+#include "network.h"
+#include <base/system.h>
+
+SECURITY_TOKEN ToSecurityToken(unsigned char *pData)
+{
+	return (int)pData[0] | (pData[1] << 8) | (pData[2] << 16) | (pData[3] << 24);
+}
+
+void CNetConnection::ResetStats()
+{
+	mem_zero(&m_Stats, sizeof(m_Stats));
+	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	m_LastUpdateTime = 0;
+}
+
+void CNetConnection::Reset(bool Rejoin)
+{
+	m_Sequence = 0;
+	m_Ack = 0;
+	m_PeerAck = 0;
+	m_RemoteClosed = 0;
+
+	if(!Rejoin)
+	{
+		m_TimeoutProtected = false;
+		m_TimeoutSituation = false;
+
+		m_State = NET_CONNSTATE_OFFLINE;
+		m_Token = -1;
+		m_SecurityToken = NET_SECURITY_TOKEN_UNKNOWN;
+		m_Sixup = false;
+	}
+
+	m_LastSendTime = 0;
+	m_LastRecvTime = 0;
+	//m_LastUpdateTime = 0;
+
+	mem_zero(&m_aConnectAddrs, sizeof(m_aConnectAddrs));
+	m_NumConnectAddrs = 0;
+	//mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	m_UnknownSeq = false;
+
+	m_Buffer.Init();
+
+	mem_zero(&m_Construct, sizeof(m_Construct));
+}
+
+const char *CNetConnection::ErrorString()
+{
+	return m_aErrorString;
+}
+
+void CNetConnection::SetError(const char *pString)
+{
+	str_copy(m_aErrorString, pString);
+}
+
+void CNetConnection::Init(NETSOCKET Socket, bool BlockCloseMsg)
+{
+	Reset();
+	ResetStats();
+
+	m_Socket = Socket;
+	m_BlockCloseMsg = BlockCloseMsg;
+	mem_zero(m_aErrorString, sizeof(m_aErrorString));
+}
+
+void CNetConnection::AckChunks(int Ack)
+{
+	while(true)
+	{
+		CNetChunkResend *pResend = m_Buffer.First();
+		if(!pResend)
+			break;
+
+		if(CNetBase::IsSeqInBackroom(pResend->m_Sequence, Ack))
+			m_Buffer.PopFirst();
+		else
+			break;
+	}
+}
+
+void CNetConnection::SignalResend()
+{
+	m_Construct.m_Flags |= NET_PACKETFLAG_RESEND;
+}
+
+int CNetConnection::Flush()
+{
+	int NumChunks = m_Construct.m_NumChunks;
+	if(!NumChunks && !m_Construct.m_Flags)
+		return 0;
+
+	// send of the packets
+	m_Construct.m_Ack = m_Ack;
+	CNetBase::SendPacket(m_Socket, &m_PeerAddr, &m_Construct, m_SecurityToken, m_Sixup);
+
+	// update send times
+	m_LastSendTime = time_get();
+
+	// clear construct so we can start building a new package
+	mem_zero(&m_Construct, sizeof(m_Construct));
+	return NumChunks;
+}
+
+int CNetConnection::QueueChunkEx(int Flags, int DataSize, const void *pData, int Sequence)
+{
+	if(m_State == NET_CONNSTATE_OFFLINE || m_State == NET_CONNSTATE_ERROR)
+		return -1;
+
+	unsigned char *pChunkData;
+
+	// check if we have space for it, if not, flush the connection
+	if(m_Construct.m_DataSize + DataSize + NET_MAX_CHUNKHEADERSIZE > (int)sizeof(m_Construct.m_aChunkData) - (int)sizeof(SECURITY_TOKEN))
+		Flush();
+
+	// pack all the data
+	CNetChunkHeader Header;
+	Header.m_Flags = Flags;
+	Header.m_Size = DataSize;
+	Header.m_Sequence = Sequence;
+	pChunkData = &m_Construct.m_aChunkData[m_Construct.m_DataSize];
+	pChunkData = Header.Pack(pChunkData, m_Sixup ? 6 : 4);
+	mem_copy(pChunkData, pData, DataSize);
+	pChunkData += DataSize;
+
+	//
+	m_Construct.m_NumChunks++;
+	m_Construct.m_DataSize = (int)(pChunkData - m_Construct.m_aChunkData);
+
+	// set packet flags as well
+
+	if(Flags & NET_CHUNKFLAG_VITAL && !(Flags & NET_CHUNKFLAG_RESEND))
+	{
+		// save packet if we need to resend
+		CNetChunkResend *pResend = m_Buffer.Allocate(sizeof(CNetChunkResend) + DataSize);
+		if(pResend)
+		{
+			pResend->m_Sequence = Sequence;
+			pResend->m_Flags = Flags;
+			pResend->m_DataSize = DataSize;
+			pResend->m_pData = (unsigned char *)(pResend + 1);
+			pResend->m_FirstSendTime = time_get();
+			pResend->m_LastSendTime = pResend->m_FirstSendTime;
+			mem_copy(pResend->m_pData, pData, DataSize);
+		}
+		else
+		{
+			// out of buffer, don't save the packet and hope nobody will ask for resend
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int CNetConnection::QueueChunk(int Flags, int DataSize, const void *pData)
+{
+	if(Flags & NET_CHUNKFLAG_VITAL)
+		m_Sequence = (m_Sequence + 1) % NET_MAX_SEQUENCE;
+	return QueueChunkEx(Flags, DataSize, pData, m_Sequence);
+}
+
+void CNetConnection::SendConnect()
+{
+	// send the connect message
+	m_LastSendTime = time_get();
+	for(int i = 0; i < m_NumConnectAddrs; i++)
+	{
+		CNetBase::SendControlMsg(m_Socket, &m_aConnectAddrs[i], m_Ack, NET_CTRLMSG_CONNECT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC), m_SecurityToken, m_Sixup);
+	}
+}
+
+void CNetConnection::SendControl(int ControlMsg, const void *pExtra, int ExtraSize)
+{
+	// send the control message
+	m_LastSendTime = time_get();
+	CNetBase::SendControlMsg(m_Socket, &m_PeerAddr, m_Ack, ControlMsg, pExtra, ExtraSize, m_SecurityToken, m_Sixup);
+}
+
+void CNetConnection::ResendChunk(CNetChunkResend *pResend)
+{
+	QueueChunkEx(pResend->m_Flags | NET_CHUNKFLAG_RESEND, pResend->m_DataSize, pResend->m_pData, pResend->m_Sequence);
+	pResend->m_LastSendTime = time_get();
+}
+
+void CNetConnection::Resend()
+{
+	for(CNetChunkResend *pResend = m_Buffer.First(); pResend; pResend = m_Buffer.Next(pResend))
+		ResendChunk(pResend);
+}
+
+int CNetConnection::Connect(const NETADDR *pAddr, int NumAddrs)
+{
+	if(State() != NET_CONNSTATE_OFFLINE)
+		return -1;
+
+	// init connection
+	Reset();
+	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	for(int i = 0; i < NumAddrs; i++)
+	{
+		m_aConnectAddrs[i] = pAddr[i];
+	}
+	m_NumConnectAddrs = NumAddrs;
+	mem_zero(m_aErrorString, sizeof(m_aErrorString));
+	m_State = NET_CONNSTATE_CONNECT;
+	SendConnect();
+	return 0;
+}
+
+void CNetConnection::Disconnect(const char *pReason)
+{
+	if(State() == NET_CONNSTATE_OFFLINE)
+		return;
+
+	if(m_RemoteClosed == 0)
+	{
+		if(!m_TimeoutSituation)
+		{
+			if(pReason)
+				SendControl(NET_CTRLMSG_CLOSE, pReason, str_length(pReason) + 1);
+			else
+				SendControl(NET_CTRLMSG_CLOSE, 0, 0);
+		}
+
+		if(pReason != m_aErrorString)
+		{
+			m_aErrorString[0] = 0;
+			if(pReason)
+				str_copy(m_aErrorString, pReason);
+		}
+	}
+
+	Reset();
+}
+
+void CNetConnection::DirectInit(const NETADDR &Addr, SECURITY_TOKEN SecurityToken, SECURITY_TOKEN Token, bool Sixup)
+{
+	Reset();
+
+	m_State = NET_CONNSTATE_ONLINE;
+
+	m_PeerAddr = Addr;
+	mem_zero(m_aErrorString, sizeof(m_aErrorString));
+
+	int64_t Now = time_get();
+	m_LastSendTime = Now;
+	m_LastRecvTime = Now;
+	m_LastUpdateTime = Now;
+
+	m_SecurityToken = SecurityToken;
+	m_Token = Token;
+	m_Sixup = Sixup;
+}
+
+int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_TOKEN SecurityToken)
+{
+	// Disregard packets from the wrong address, unless we don't know our peer yet.
+	if(State() != NET_CONNSTATE_OFFLINE && State() != NET_CONNSTATE_CONNECT && *pAddr != m_PeerAddr)
+	{
+		return 0;
+	}
+
+	if(!m_Sixup && State() != NET_CONNSTATE_OFFLINE && m_SecurityToken != NET_SECURITY_TOKEN_UNKNOWN && m_SecurityToken != NET_SECURITY_TOKEN_UNSUPPORTED)
+	{
+		// supposed to have a valid token in this packet, check it
+		if(pPacket->m_DataSize < (int)sizeof(m_SecurityToken))
+			return 0;
+		pPacket->m_DataSize -= sizeof(m_SecurityToken);
+		if(m_SecurityToken != ToSecurityToken(&pPacket->m_aChunkData[pPacket->m_DataSize]))
+		{
+			if(g_Config.m_Debug)
+				dbg_msg("security", "token mismatch, expected %d got %d", m_SecurityToken, ToSecurityToken(&pPacket->m_aChunkData[pPacket->m_DataSize]));
+			return 0;
+		}
+	}
+
+	if(m_Sixup && SecurityToken != m_Token)
+		return 0;
+
+	// check if actual ack value is valid(own sequence..latest peer ack)
+	if(m_Sequence >= m_PeerAck)
+	{
+		if(pPacket->m_Ack < m_PeerAck || pPacket->m_Ack > m_Sequence)
+			return 0;
+	}
+	else
+	{
+		if(pPacket->m_Ack < m_PeerAck && pPacket->m_Ack > m_Sequence)
+			return 0;
+	}
+	m_PeerAck = pPacket->m_Ack;
+
+	int64_t Now = time_get();
+
+	// check if resend is requested
+	if(pPacket->m_Flags & NET_PACKETFLAG_RESEND)
+		Resend();
+
+	//
+	if(pPacket->m_Flags & NET_PACKETFLAG_CONTROL)
+	{
+		int CtrlMsg = pPacket->m_aChunkData[0];
+
+		if(CtrlMsg == NET_CTRLMSG_CLOSE)
+		{
+			bool IsPeer;
+			if(m_State != NET_CONNSTATE_CONNECT)
+			{
+				IsPeer = m_PeerAddr == *pAddr;
+			}
+			else
+			{
+				IsPeer = false;
+				for(int i = 0; i < m_NumConnectAddrs; i++)
+				{
+					IsPeer = IsPeer || m_aConnectAddrs[i] == *pAddr;
+				}
+			}
+			if(IsPeer)
+			{
+				m_State = NET_CONNSTATE_ERROR;
+				m_RemoteClosed = 1;
+
+				char aStr[128] = {0};
+				if(pPacket->m_DataSize > 1)
+				{
+					// make sure to sanitize the error string form the other party
+					str_copy(aStr, (char *)&pPacket->m_aChunkData[1], minimum(pPacket->m_DataSize, (int)sizeof(aStr)));
+					str_sanitize_cc(aStr);
+				}
+
+				if(!m_BlockCloseMsg)
+				{
+					// set the error string
+					SetError(aStr);
+				}
+
+				if(g_Config.m_Debug)
+					dbg_msg("conn", "closed reason='%s'", aStr);
+			}
+			return 0;
+		}
+		else
+		{
+			if(State() == NET_CONNSTATE_OFFLINE)
+			{
+				if(CtrlMsg == NET_CTRLMSG_CONNECT)
+				{
+					if(net_addr_comp_noport(&m_PeerAddr, pAddr) == 0 && time_get() - m_LastUpdateTime < time_freq() * 3)
+						return 0;
+
+					// send response and init connection
+					Reset();
+					m_State = NET_CONNSTATE_PENDING;
+					m_PeerAddr = *pAddr;
+					mem_zero(m_aErrorString, sizeof(m_aErrorString));
+					m_LastSendTime = Now;
+					m_LastRecvTime = Now;
+					m_LastUpdateTime = Now;
+					if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
+					{
+						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+						if(g_Config.m_Debug)
+							dbg_msg("security", "generated token %d", m_SecurityToken);
+					}
+					else
+					{
+						if(g_Config.m_Debug)
+							dbg_msg("security", "token not supported by client (packet size %d)", pPacket->m_DataSize);
+						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+					}
+					SendControl(NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC));
+					if(g_Config.m_Debug)
+						dbg_msg("connection", "got connection, sending connect+accept");
+				}
+			}
+			else if(State() == NET_CONNSTATE_CONNECT)
+			{
+				// connection made
+				if(CtrlMsg == NET_CTRLMSG_CONNECTACCEPT)
+				{
+					m_PeerAddr = *pAddr;
+					if(m_SecurityToken == NET_SECURITY_TOKEN_UNKNOWN && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(m_SecurityToken)) && !mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)))
+					{
+						m_SecurityToken = ToSecurityToken(&pPacket->m_aChunkData[1 + sizeof(SECURITY_TOKEN_MAGIC)]);
+						if(g_Config.m_Debug)
+							dbg_msg("security", "got token %d", m_SecurityToken);
+					}
+					else
+					{
+						m_SecurityToken = NET_SECURITY_TOKEN_UNSUPPORTED;
+						if(g_Config.m_Debug)
+							dbg_msg("security", "token not supported by server");
+					}
+					m_LastRecvTime = Now;
+					SendControl(NET_CTRLMSG_ACCEPT, 0, 0);
+					m_State = NET_CONNSTATE_ONLINE;
+					if(g_Config.m_Debug)
+						dbg_msg("connection", "got connect+accept, sending accept. connection online");
+				}
+			}
+		}
+	}
+	else
+	{
+		if(State() == NET_CONNSTATE_PENDING)
+		{
+			m_LastRecvTime = Now;
+			m_State = NET_CONNSTATE_ONLINE;
+			if(g_Config.m_Debug)
+				dbg_msg("connection", "connecting online");
+		}
+	}
+
+	if(State() == NET_CONNSTATE_ONLINE)
+	{
+		m_LastRecvTime = Now;
+		AckChunks(pPacket->m_Ack);
+	}
+
+	return 1;
+}
+
+int CNetConnection::Update()
+{
+	int64_t Now = time_get();
+
+	if(State() == NET_CONNSTATE_ERROR && m_TimeoutSituation && (Now - m_LastRecvTime) > time_freq() * g_Config.m_ConnTimeoutProtection)
+	{
+		m_TimeoutSituation = false;
+		SetError("Timeout Protection over");
+	}
+
+	if(State() == NET_CONNSTATE_OFFLINE || State() == NET_CONNSTATE_ERROR)
+		return 0;
+
+	m_TimeoutSituation = false;
+
+	// check for timeout
+	if(State() != NET_CONNSTATE_OFFLINE &&
+		State() != NET_CONNSTATE_CONNECT &&
+		(Now - m_LastRecvTime) > time_freq() * g_Config.m_ConnTimeout)
+	{
+		m_State = NET_CONNSTATE_ERROR;
+		SetError("Timeout");
+		m_TimeoutSituation = true;
+	}
+
+	// fix resends
+	if(m_Buffer.First())
+	{
+		CNetChunkResend *pResend = m_Buffer.First();
+
+		// check if we have some really old stuff laying around and abort if not acked
+		if(Now - pResend->m_FirstSendTime > time_freq() * g_Config.m_ConnTimeout)
+		{
+			m_State = NET_CONNSTATE_ERROR;
+			char aBuf[512];
+			str_format(aBuf, sizeof(aBuf), "Too weak connection (not acked for %d seconds)", g_Config.m_ConnTimeout);
+			SetError(aBuf);
+			m_TimeoutSituation = true;
+		}
+		else
+		{
+			// resend packet if we haven't got it acked in 1 second
+			if(Now - pResend->m_LastSendTime > time_freq())
+				ResendChunk(pResend);
+		}
+	}
+
+	// send keep alives if nothing has happened for 250ms
+	if(State() == NET_CONNSTATE_ONLINE)
+	{
+		if(time_get() - m_LastSendTime > time_freq() / 2) // flush connection after 500ms if needed
+		{
+			int NumFlushedChunks = Flush();
+			if(NumFlushedChunks && g_Config.m_Debug)
+				dbg_msg("connection", "flushed connection due to timeout. %d chunks.", NumFlushedChunks);
+		}
+
+		if(time_get() - m_LastSendTime > time_freq())
+			SendControl(NET_CTRLMSG_KEEPALIVE, 0, 0);
+	}
+	else if(State() == NET_CONNSTATE_CONNECT)
+	{
+		if(time_get() - m_LastSendTime > time_freq() / 2) // send a new connect every 500ms
+			SendConnect();
+	}
+	else if(State() == NET_CONNSTATE_PENDING)
+	{
+		if(time_get() - m_LastSendTime > time_freq() / 2) // send a new connect/accept every 500ms
+			SendControl(NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC));
+	}
+
+	return 0;
+}
+
+void CNetConnection::SetTimedOut(const NETADDR *pAddr, int Sequence, int Ack, SECURITY_TOKEN SecurityToken, CStaticRingBuffer<CNetChunkResend, NET_CONN_BUFFERSIZE> *pResendBuffer, bool Sixup)
+{
+	int64_t Now = time_get();
+
+	m_Sequence = Sequence;
+	m_Ack = Ack;
+	m_RemoteClosed = 0;
+
+	m_State = NET_CONNSTATE_ONLINE;
+	m_PeerAddr = *pAddr;
+	mem_zero(m_aErrorString, sizeof(m_aErrorString));
+	m_LastSendTime = Now;
+	m_LastRecvTime = Now;
+	m_LastUpdateTime = Now;
+	m_SecurityToken = SecurityToken;
+	m_Sixup = Sixup;
+
+	// copy resend buffer
+	m_Buffer.Init();
+	while(pResendBuffer->First())
+	{
+		CNetChunkResend *pFirst = pResendBuffer->First();
+
+		CNetChunkResend *pResend = m_Buffer.Allocate(sizeof(CNetChunkResend) + pFirst->m_DataSize);
+		mem_copy(pResend, pFirst, sizeof(CNetChunkResend) + pFirst->m_DataSize);
+
+		pResendBuffer->PopFirst();
+	}
+}
diff --git a/src_bkp/engine/shared/network_console.cpp b/src_bkp/engine/shared/network_console.cpp
new file mode 100644
index 0000000000..27c2fd2d16
--- /dev/null
+++ b/src_bkp/engine/shared/network_console.cpp
@@ -0,0 +1,144 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+#include "netban.h"
+#include "network.h"
+
+bool CNetConsole::Open(NETADDR BindAddr, CNetBan *pNetBan)
+{
+	// zero out the whole structure
+	*this = CNetConsole{};
+	m_pNetBan = pNetBan;
+
+	// open socket
+	m_Socket = net_tcp_create(BindAddr);
+	if(!m_Socket)
+		return false;
+	if(net_tcp_listen(m_Socket, NET_MAX_CONSOLE_CLIENTS))
+		return false;
+	net_set_non_blocking(m_Socket);
+
+	for(auto &Slot : m_aSlots)
+		Slot.m_Connection.Reset();
+
+	return true;
+}
+
+void CNetConsole::SetCallbacks(NETFUNC_NEWCLIENT_CON pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser)
+{
+	m_pfnNewClient = pfnNewClient;
+	m_pfnDelClient = pfnDelClient;
+	m_pUser = pUser;
+}
+
+int CNetConsole::Close()
+{
+	for(auto &Slot : m_aSlots)
+		Slot.m_Connection.Disconnect("closing console");
+
+	net_tcp_close(m_Socket);
+
+	return 0;
+}
+
+int CNetConsole::Drop(int ClientID, const char *pReason)
+{
+	if(m_pfnDelClient)
+		m_pfnDelClient(ClientID, pReason, m_pUser);
+
+	m_aSlots[ClientID].m_Connection.Disconnect(pReason);
+
+	return 0;
+}
+
+int CNetConsole::AcceptClient(NETSOCKET Socket, const NETADDR *pAddr)
+{
+	char aError[256] = {0};
+	int FreeSlot = -1;
+
+	// look for free slot or multiple client
+	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
+	{
+		if(FreeSlot == -1 && m_aSlots[i].m_Connection.State() == NET_CONNSTATE_OFFLINE)
+			FreeSlot = i;
+		if(m_aSlots[i].m_Connection.State() != NET_CONNSTATE_OFFLINE)
+		{
+			if(net_addr_comp(pAddr, m_aSlots[i].m_Connection.PeerAddress()) == 0)
+			{
+				str_copy(aError, "only one client per IP allowed");
+				break;
+			}
+		}
+	}
+
+	// accept client
+	if(!aError[0] && FreeSlot != -1)
+	{
+		m_aSlots[FreeSlot].m_Connection.Init(Socket, pAddr);
+		if(m_pfnNewClient)
+			m_pfnNewClient(FreeSlot, m_pUser);
+		return 0;
+	}
+
+	// reject client
+	if(!aError[0])
+		str_copy(aError, "no free slot available");
+
+	net_tcp_send(Socket, aError, str_length(aError));
+	net_tcp_close(Socket);
+
+	return -1;
+}
+
+int CNetConsole::Update()
+{
+	NETSOCKET Socket;
+	NETADDR Addr;
+
+	if(net_tcp_accept(m_Socket, &Socket, &Addr) > 0)
+	{
+		// check if we just should drop the packet
+		char aBuf[128];
+		if(NetBan() && NetBan()->IsBanned(&Addr, aBuf, sizeof(aBuf)))
+		{
+			// banned, reply with a message and drop
+			net_tcp_send(Socket, aBuf, str_length(aBuf));
+			net_tcp_close(Socket);
+		}
+		else
+			AcceptClient(Socket, &Addr);
+	}
+
+	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
+	{
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ONLINE)
+			m_aSlots[i].m_Connection.Update();
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ERROR)
+			Drop(i, m_aSlots[i].m_Connection.ErrorString());
+	}
+
+	return 0;
+}
+
+int CNetConsole::Recv(char *pLine, int MaxLength, int *pClientID)
+{
+	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
+	{
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ONLINE && m_aSlots[i].m_Connection.Recv(pLine, MaxLength))
+		{
+			if(pClientID)
+				*pClientID = i;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+int CNetConsole::Send(int ClientID, const char *pLine)
+{
+	if(m_aSlots[ClientID].m_Connection.State() == NET_CONNSTATE_ONLINE)
+		return m_aSlots[ClientID].m_Connection.Send(pLine);
+	else
+		return -1;
+}
diff --git a/src_bkp/engine/shared/network_console_conn.cpp b/src_bkp/engine/shared/network_console_conn.cpp
new file mode 100644
index 0000000000..7bae792fc3
--- /dev/null
+++ b/src_bkp/engine/shared/network_console_conn.cpp
@@ -0,0 +1,184 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "network.h"
+#include <base/system.h>
+
+void CConsoleNetConnection::Reset()
+{
+	m_State = NET_CONNSTATE_OFFLINE;
+	mem_zero(&m_PeerAddr, sizeof(m_PeerAddr));
+	m_aErrorString[0] = 0;
+
+	m_Socket = nullptr;
+	m_aBuffer[0] = 0;
+	m_BufferOffset = 0;
+
+	m_LineEndingDetected = false;
+#if defined(CONF_FAMILY_WINDOWS)
+	m_aLineEnding[0] = '\r';
+	m_aLineEnding[1] = '\n';
+	m_aLineEnding[2] = 0;
+#else
+	m_aLineEnding[0] = '\n';
+	m_aLineEnding[1] = 0;
+	m_aLineEnding[2] = 0;
+#endif
+}
+
+void CConsoleNetConnection::Init(NETSOCKET Socket, const NETADDR *pAddr)
+{
+	Reset();
+
+	m_Socket = Socket;
+	net_set_non_blocking(m_Socket);
+
+	m_PeerAddr = *pAddr;
+	m_State = NET_CONNSTATE_ONLINE;
+}
+
+void CConsoleNetConnection::Disconnect(const char *pReason)
+{
+	if(State() == NET_CONNSTATE_OFFLINE)
+		return;
+
+	if(pReason && pReason[0])
+		Send(pReason);
+
+	net_tcp_close(m_Socket);
+
+	Reset();
+}
+
+int CConsoleNetConnection::Update()
+{
+	if(State() == NET_CONNSTATE_ONLINE)
+	{
+		if((int)(sizeof(m_aBuffer)) <= m_BufferOffset)
+		{
+			m_State = NET_CONNSTATE_ERROR;
+			str_copy(m_aErrorString, "too weak connection (out of buffer)");
+			return -1;
+		}
+
+		int Bytes = net_tcp_recv(m_Socket, m_aBuffer + m_BufferOffset, (int)(sizeof(m_aBuffer)) - m_BufferOffset);
+
+		if(Bytes > 0)
+		{
+			m_BufferOffset += Bytes;
+		}
+		else if(Bytes < 0)
+		{
+			if(net_would_block()) // no data received
+				return 0;
+
+			m_State = NET_CONNSTATE_ERROR; // error
+			str_copy(m_aErrorString, "connection failure");
+			return -1;
+		}
+		else
+		{
+			m_State = NET_CONNSTATE_ERROR;
+			str_copy(m_aErrorString, "remote end closed the connection");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int CConsoleNetConnection::Recv(char *pLine, int MaxLength)
+{
+	if(State() == NET_CONNSTATE_ONLINE)
+	{
+		if(m_BufferOffset)
+		{
+			// find message start
+			int StartOffset = 0;
+			while(m_aBuffer[StartOffset] == '\r' || m_aBuffer[StartOffset] == '\n')
+			{
+				// detect clients line ending format
+				if(!m_LineEndingDetected)
+				{
+					m_aLineEnding[0] = m_aBuffer[StartOffset];
+					if(StartOffset + 1 < m_BufferOffset && (m_aBuffer[StartOffset + 1] == '\r' || m_aBuffer[StartOffset + 1] == '\n') &&
+						m_aBuffer[StartOffset] != m_aBuffer[StartOffset + 1])
+						m_aLineEnding[1] = m_aBuffer[StartOffset + 1];
+					m_LineEndingDetected = true;
+				}
+
+				if(++StartOffset >= m_BufferOffset)
+				{
+					m_BufferOffset = 0;
+					return 0;
+				}
+			}
+
+			// find message end
+			int EndOffset = StartOffset;
+			while(m_aBuffer[EndOffset] != '\r' && m_aBuffer[EndOffset] != '\n')
+			{
+				if(++EndOffset >= m_BufferOffset)
+				{
+					if(StartOffset > 0)
+					{
+						mem_move(m_aBuffer, m_aBuffer + StartOffset, m_BufferOffset - StartOffset);
+						m_BufferOffset -= StartOffset;
+					}
+					return 0;
+				}
+			}
+
+			// extract message and update buffer
+			if(MaxLength - 1 < EndOffset - StartOffset)
+			{
+				if(StartOffset > 0)
+				{
+					mem_move(m_aBuffer, m_aBuffer + StartOffset, m_BufferOffset - StartOffset);
+					m_BufferOffset -= StartOffset;
+				}
+				return 0;
+			}
+			mem_copy(pLine, m_aBuffer + StartOffset, EndOffset - StartOffset);
+			pLine[EndOffset - StartOffset] = 0;
+			str_sanitize_cc(pLine);
+			mem_move(m_aBuffer, m_aBuffer + EndOffset, m_BufferOffset - EndOffset);
+			m_BufferOffset -= EndOffset;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+int CConsoleNetConnection::Send(const char *pLine)
+{
+	if(State() != NET_CONNSTATE_ONLINE)
+		return -1;
+
+	char aBuf[1024];
+	str_copy(aBuf, pLine, (int)(sizeof(aBuf)) - 2);
+	int Length = str_length(aBuf);
+	aBuf[Length] = m_aLineEnding[0];
+	aBuf[Length + 1] = m_aLineEnding[1];
+	aBuf[Length + 2] = m_aLineEnding[2];
+	Length += 3;
+	const char *pData = aBuf;
+
+	while(true)
+	{
+		int Send = net_tcp_send(m_Socket, pData, Length);
+		if(Send < 0)
+		{
+			m_State = NET_CONNSTATE_ERROR;
+			str_copy(m_aErrorString, "failed to send packet");
+			return -1;
+		}
+
+		if(Send >= Length)
+			break;
+
+		pData += Send;
+		Length -= Send;
+	}
+
+	return 0;
+}
diff --git a/src_bkp/engine/shared/network_server.cpp b/src_bkp/engine/shared/network_server.cpp
new file mode 100644
index 0000000000..0dd81393c7
--- /dev/null
+++ b/src_bkp/engine/shared/network_server.cpp
@@ -0,0 +1,822 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/hash_ctxt.h>
+#include <base/system.h>
+
+#include "config.h"
+#include "netban.h"
+#include "network.h"
+#include <engine/shared/compression.h>
+#include <engine/shared/packer.h>
+#include <engine/shared/protocol.h>
+
+const int g_DummyMapCrc = 0xD6909B17;
+const unsigned char g_aDummyMapData[] = {
+	0x44, 0x41, 0x54, 0x41, 0x04, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00,
+	0xEC, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0xAC, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+	0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
+	0x1C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+	0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x00, 0x3C, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x78, 0x9C, 0x63, 0x64, 0x60, 0x60, 0x60, 0x44, 0xC2, 0x00, 0x00, 0x38,
+	0x00, 0x05};
+
+static SECURITY_TOKEN ToSecurityToken(const unsigned char *pData)
+{
+	return (int)pData[0] | (pData[1] << 8) | (pData[2] << 16) | (pData[3] << 24);
+}
+
+bool CNetServer::Open(NETADDR BindAddr, CNetBan *pNetBan, int MaxClients, int MaxClientsPerIP)
+{
+	// zero out the whole structure
+	this->~CNetServer();
+	new(this) CNetServer{};
+
+	// open socket
+	m_Socket = net_udp_create(BindAddr);
+	if(!m_Socket)
+		return false;
+
+	m_Address = BindAddr;
+	m_pNetBan = pNetBan;
+
+	m_MaxClients = clamp(MaxClients, 1, (int)NET_MAX_CLIENTS);
+	m_MaxClientsPerIP = MaxClientsPerIP;
+
+	m_NumConAttempts = 0;
+	m_TimeNumConAttempts = time_get();
+
+	m_VConnNum = 0;
+	m_VConnFirst = 0;
+
+	secure_random_fill(m_aSecurityTokenSeed, sizeof(m_aSecurityTokenSeed));
+
+	for(auto &Slot : m_aSlots)
+		Slot.m_Connection.Init(m_Socket, true);
+
+	return true;
+}
+
+int CNetServer::SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser)
+{
+	m_pfnNewClient = pfnNewClient;
+	m_pfnDelClient = pfnDelClient;
+	m_pUser = pUser;
+	return 0;
+}
+
+int CNetServer::SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_NEWCLIENT_NOAUTH pfnNewClientNoAuth, NETFUNC_CLIENTREJOIN pfnClientRejoin, NETFUNC_DELCLIENT pfnDelClient, void *pUser)
+{
+	m_pfnNewClient = pfnNewClient;
+	m_pfnNewClientNoAuth = pfnNewClientNoAuth;
+	m_pfnClientRejoin = pfnClientRejoin;
+	m_pfnDelClient = pfnDelClient;
+	m_pUser = pUser;
+	return 0;
+}
+
+int CNetServer::Close()
+{
+	if(!m_Socket)
+		return 0;
+	return net_udp_close(m_Socket);
+}
+
+int CNetServer::Drop(int ClientID, const char *pReason)
+{
+	// TODO: insert lots of checks here
+
+	if(m_pfnDelClient)
+		m_pfnDelClient(ClientID, pReason, m_pUser);
+
+	m_aSlots[ClientID].m_Connection.Disconnect(pReason);
+
+	return 0;
+}
+
+int CNetServer::Update()
+{
+	for(int i = 0; i < MaxClients(); i++)
+	{
+		m_aSlots[i].m_Connection.Update();
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ERROR &&
+			(!m_aSlots[i].m_Connection.m_TimeoutProtected ||
+				!m_aSlots[i].m_Connection.m_TimeoutSituation))
+		{
+			Drop(i, m_aSlots[i].m_Connection.ErrorString());
+		}
+	}
+
+	return 0;
+}
+
+SECURITY_TOKEN CNetServer::GetGlobalToken()
+{
+	static NETADDR NullAddr = {0};
+	return GetToken(NullAddr);
+}
+SECURITY_TOKEN CNetServer::GetToken(const NETADDR &Addr)
+{
+	SHA256_CTX Sha256;
+	sha256_init(&Sha256);
+	sha256_update(&Sha256, (unsigned char *)m_aSecurityTokenSeed, sizeof(m_aSecurityTokenSeed));
+	sha256_update(&Sha256, (unsigned char *)&Addr, 20); // omit port, bad idea!
+
+	SECURITY_TOKEN SecurityToken = ToSecurityToken(sha256_finish(&Sha256).data);
+
+	if(SecurityToken == NET_SECURITY_TOKEN_UNKNOWN ||
+		SecurityToken == NET_SECURITY_TOKEN_UNSUPPORTED)
+		SecurityToken = 1;
+
+	return SecurityToken;
+}
+
+void CNetServer::SendControl(NETADDR &Addr, int ControlMsg, const void *pExtra, int ExtraSize, SECURITY_TOKEN SecurityToken)
+{
+	CNetBase::SendControlMsg(m_Socket, &Addr, 0, ControlMsg, pExtra, ExtraSize, SecurityToken);
+}
+
+int CNetServer::NumClientsWithAddr(NETADDR Addr)
+{
+	int FoundAddr = 0;
+	for(int i = 0; i < MaxClients(); ++i)
+	{
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_OFFLINE ||
+			(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_ERROR &&
+				(!m_aSlots[i].m_Connection.m_TimeoutProtected ||
+					!m_aSlots[i].m_Connection.m_TimeoutSituation)))
+			continue;
+
+		if(!net_addr_comp_noport(&Addr, m_aSlots[i].m_Connection.PeerAddress()))
+			FoundAddr++;
+	}
+
+	return FoundAddr;
+}
+
+bool CNetServer::Connlimit(NETADDR Addr)
+{
+	int64_t Now = time_get();
+	int Oldest = 0;
+
+	for(int i = 0; i < NET_CONNLIMIT_IPS; ++i)
+	{
+		if(!net_addr_comp(&m_aSpamConns[i].m_Addr, &Addr))
+		{
+			if(m_aSpamConns[i].m_Time > Now - time_freq() * g_Config.m_SvConnlimitTime)
+			{
+				if(m_aSpamConns[i].m_Conns >= g_Config.m_SvConnlimit)
+					return true;
+			}
+			else
+			{
+				m_aSpamConns[i].m_Time = Now;
+				m_aSpamConns[i].m_Conns = 0;
+			}
+			m_aSpamConns[i].m_Conns++;
+			return false;
+		}
+
+		if(m_aSpamConns[i].m_Time < m_aSpamConns[Oldest].m_Time)
+			Oldest = i;
+	}
+
+	m_aSpamConns[Oldest].m_Addr = Addr;
+	m_aSpamConns[Oldest].m_Time = Now;
+	m_aSpamConns[Oldest].m_Conns = 1;
+	return false;
+}
+
+int CNetServer::TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, bool VanillaAuth, bool Sixup, SECURITY_TOKEN Token)
+{
+	if(Sixup && !g_Config.m_SvSixup)
+	{
+		const char aMsg[] = "0.7 connections are not accepted at this time";
+		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aMsg, sizeof(aMsg), SecurityToken, Sixup);
+		return -1; // failed to add client?
+	}
+
+	if(Connlimit(Addr))
+	{
+		const char aMsg[] = "Too many connections in a short time";
+		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aMsg, sizeof(aMsg), SecurityToken, Sixup);
+		return -1; // failed to add client
+	}
+
+	// check for sv_max_clients_per_ip
+	if(NumClientsWithAddr(Addr) + 1 > m_MaxClientsPerIP)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "Only %d players with the same IP are allowed", m_MaxClientsPerIP);
+		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aBuf, str_length(aBuf) + 1, SecurityToken, Sixup);
+		return -1; // failed to add client
+	}
+
+	int Slot = -1;
+	for(int i = 0; i < MaxClients(); i++)
+	{
+		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_OFFLINE)
+		{
+			Slot = i;
+			break;
+		}
+	}
+
+	if(Slot == -1)
+	{
+		const char aFullMsg[] = "This server is full";
+		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aFullMsg, sizeof(aFullMsg), SecurityToken, Sixup);
+
+		return -1; // failed to add client
+	}
+
+	// init connection slot
+	m_aSlots[Slot].m_Connection.DirectInit(Addr, SecurityToken, Token, Sixup);
+
+	if(VanillaAuth)
+	{
+		// client sequence is unknown if the auth was done
+		// connection-less
+		m_aSlots[Slot].m_Connection.SetUnknownSeq();
+		// correct sequence
+		m_aSlots[Slot].m_Connection.SetSequence(6);
+	}
+
+	if(g_Config.m_Debug)
+	{
+		char aAddrStr[NETADDR_MAXSTRSIZE];
+		net_addr_str(&Addr, aAddrStr, sizeof(aAddrStr), true);
+		dbg_msg("security", "client accepted %s", aAddrStr);
+	}
+
+	if(VanillaAuth)
+		m_pfnNewClientNoAuth(Slot, m_pUser);
+	else
+		m_pfnNewClient(Slot, m_pUser, Sixup);
+
+	return Slot; // done
+}
+
+void CNetServer::SendMsgs(NETADDR &Addr, const CPacker **ppMsgs, int Num)
+{
+	CNetPacketConstruct Construct;
+	mem_zero(&Construct, sizeof(Construct));
+	unsigned char *pChunkData = &Construct.m_aChunkData[Construct.m_DataSize];
+
+	for(int i = 0; i < Num; i++)
+	{
+		const CPacker *pMsg = ppMsgs[i];
+		CNetChunkHeader Header;
+		Header.m_Flags = NET_CHUNKFLAG_VITAL;
+		Header.m_Size = pMsg->Size();
+		Header.m_Sequence = i + 1;
+		pChunkData = Header.Pack(pChunkData);
+		mem_copy(pChunkData, pMsg->Data(), pMsg->Size());
+		pChunkData += pMsg->Size();
+		Construct.m_NumChunks++;
+	}
+
+	Construct.m_DataSize = (int)(pChunkData - Construct.m_aChunkData);
+	CNetBase::SendPacket(m_Socket, &Addr, &Construct, NET_SECURITY_TOKEN_UNSUPPORTED);
+}
+
+// connection-less msg packet without token-support
+void CNetServer::OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet)
+{
+	bool IsCtrl = Packet.m_Flags & NET_PACKETFLAG_CONTROL;
+	int CtrlMsg = m_RecvUnpacker.m_Data.m_aChunkData[0];
+
+	// log flooding
+	//TODO: remove
+	if(g_Config.m_Debug)
+	{
+		int64_t Now = time_get();
+
+		if(Now - m_TimeNumConAttempts > time_freq())
+			// reset
+			m_NumConAttempts = 0;
+
+		m_NumConAttempts++;
+
+		if(m_NumConAttempts > 100)
+		{
+			dbg_msg("security", "flooding detected");
+
+			m_TimeNumConAttempts = Now;
+			m_NumConAttempts = 0;
+		}
+	}
+
+	if(IsCtrl && CtrlMsg == NET_CTRLMSG_CONNECT)
+	{
+		if(g_Config.m_SvVanillaAntiSpoof && g_Config.m_Password[0] == '\0')
+		{
+			bool Flooding = false;
+
+			if(g_Config.m_SvVanConnPerSecond)
+			{
+				// detect flooding
+				Flooding = m_VConnNum > g_Config.m_SvVanConnPerSecond;
+				const int64_t Now = time_get();
+
+				if(Now <= m_VConnFirst + time_freq())
+				{
+					m_VConnNum++;
+				}
+				else
+				{
+					m_VConnNum = 1;
+					m_VConnFirst = Now;
+				}
+			}
+
+			if(g_Config.m_Debug && Flooding)
+			{
+				dbg_msg("security", "vanilla connection flooding detected");
+			}
+
+			// simulate accept
+			SendControl(Addr, NET_CTRLMSG_CONNECTACCEPT, NULL, 0, NET_SECURITY_TOKEN_UNSUPPORTED);
+
+			// Begin vanilla compatible token handshake
+			// The idea is to pack a security token in the gametick
+			// parameter of NETMSG_SNAPEMPTY. The Client then will
+			// return the token/gametick in NETMSG_INPUT, allowing
+			// us to validate the token.
+			// https://github.com/eeeee/ddnet/commit/b8e40a244af4e242dc568aa34854c5754c75a39a
+
+			// Before we can send NETMSG_SNAPEMPTY, the client needs
+			// to load a map, otherwise it might crash. The map
+			// should be as small as is possible and directly available
+			// to the client. Therefore a dummy map is sent in the same
+			// packet. To reduce the traffic we'll fallback to a default
+			// map if there are too many connection attempts at once.
+
+			// send mapchange + map data + con_ready + 3 x empty snap (with token)
+			CPacker MapChangeMsg;
+			MapChangeMsg.Reset();
+			MapChangeMsg.AddInt((NETMSG_MAP_CHANGE << 1) | 1);
+			if(Flooding)
+			{
+				// Fallback to dm1
+				MapChangeMsg.AddString("dm1", 0);
+				MapChangeMsg.AddInt(0xf2159e6e);
+				MapChangeMsg.AddInt(5805);
+			}
+			else
+			{
+				// dummy map
+				MapChangeMsg.AddString("dummy", 0);
+				MapChangeMsg.AddInt(g_DummyMapCrc);
+				MapChangeMsg.AddInt(sizeof(g_aDummyMapData));
+			}
+
+			CPacker MapDataMsg;
+			MapDataMsg.Reset();
+			MapDataMsg.AddInt((NETMSG_MAP_DATA << 1) | 1);
+			if(Flooding)
+			{
+				// send empty map data to keep 0.6.4 support
+				MapDataMsg.AddInt(1); // last chunk
+				MapDataMsg.AddInt(0); // crc
+				MapDataMsg.AddInt(0); // chunk index
+				MapDataMsg.AddInt(0); // map size
+				MapDataMsg.AddRaw(NULL, 0); // map data
+			}
+			else
+			{
+				// send dummy map data
+				MapDataMsg.AddInt(1); // last chunk
+				MapDataMsg.AddInt(g_DummyMapCrc); // crc
+				MapDataMsg.AddInt(0); // chunk index
+				MapDataMsg.AddInt(sizeof(g_aDummyMapData)); // map size
+				MapDataMsg.AddRaw(g_aDummyMapData, sizeof(g_aDummyMapData)); // map data
+			}
+
+			CPacker ConReadyMsg;
+			ConReadyMsg.Reset();
+			ConReadyMsg.AddInt((NETMSG_CON_READY << 1) | 1);
+
+			CPacker SnapEmptyMsg;
+			SnapEmptyMsg.Reset();
+			SnapEmptyMsg.AddInt((NETMSG_SNAPEMPTY << 1) | 1);
+			SECURITY_TOKEN SecurityToken = GetVanillaToken(Addr);
+			SnapEmptyMsg.AddInt(SecurityToken);
+			SnapEmptyMsg.AddInt(SecurityToken + 1);
+
+			// send all chunks/msgs in one packet
+			const CPacker *apMsgs[] = {&MapChangeMsg, &MapDataMsg, &ConReadyMsg,
+				&SnapEmptyMsg, &SnapEmptyMsg, &SnapEmptyMsg};
+			SendMsgs(Addr, apMsgs, std::size(apMsgs));
+		}
+		else
+		{
+			// accept client directly
+			SendControl(Addr, NET_CTRLMSG_CONNECTACCEPT, NULL, 0, NET_SECURITY_TOKEN_UNSUPPORTED);
+
+			TryAcceptClient(Addr, NET_SECURITY_TOKEN_UNSUPPORTED);
+		}
+	}
+	else if(!IsCtrl && g_Config.m_SvVanillaAntiSpoof && g_Config.m_Password[0] == '\0')
+	{
+		CNetChunkHeader h;
+
+		unsigned char *pData = Packet.m_aChunkData;
+		pData = h.Unpack(pData);
+		CUnpacker Unpacker;
+		Unpacker.Reset(pData, h.m_Size);
+		int Msg = Unpacker.GetInt() >> 1;
+
+		if(Msg == NETMSG_INPUT)
+		{
+			SECURITY_TOKEN SecurityToken = Unpacker.GetInt();
+			if(SecurityToken == GetVanillaToken(Addr))
+			{
+				if(g_Config.m_Debug)
+					dbg_msg("security", "new client (vanilla handshake)");
+				// try to accept client skipping auth state
+				TryAcceptClient(Addr, NET_SECURITY_TOKEN_UNSUPPORTED, true);
+			}
+			else if(g_Config.m_Debug)
+				dbg_msg("security", "invalid token (vanilla handshake)");
+		}
+		else
+		{
+			if(g_Config.m_Debug)
+			{
+				dbg_msg("security", "invalid preconn msg %d", Msg);
+			}
+		}
+	}
+}
+
+void CNetServer::OnConnCtrlMsg(NETADDR &Addr, int ClientID, int ControlMsg, const CNetPacketConstruct &Packet)
+{
+	if(ControlMsg == NET_CTRLMSG_CONNECT)
+	{
+		// got connection attempt inside of valid session
+		// the client probably wants to reconnect
+		bool SupportsToken = Packet.m_DataSize >=
+					     (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(SECURITY_TOKEN)) &&
+				     !mem_comp(&Packet.m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC));
+
+		if(SupportsToken)
+		{
+			// response connection request with token
+			SECURITY_TOKEN Token = GetToken(Addr);
+			SendControl(Addr, NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC), Token);
+		}
+
+		if(g_Config.m_Debug)
+			dbg_msg("security", "client %d wants to reconnect", ClientID);
+	}
+	else if(ControlMsg == NET_CTRLMSG_ACCEPT && Packet.m_DataSize == 1 + sizeof(SECURITY_TOKEN))
+	{
+		SECURITY_TOKEN Token = ToSecurityToken(&Packet.m_aChunkData[1]);
+		if(Token == GetToken(Addr))
+		{
+			// correct token
+			// try to accept client
+			if(g_Config.m_Debug)
+				dbg_msg("security", "client %d reconnect", ClientID);
+
+			// reset netconn and process rejoin
+			m_aSlots[ClientID].m_Connection.Reset(true);
+			m_pfnClientRejoin(ClientID, m_pUser);
+		}
+	}
+}
+
+void CNetServer::OnTokenCtrlMsg(NETADDR &Addr, int ControlMsg, const CNetPacketConstruct &Packet)
+{
+	if(ClientExists(Addr))
+		return; // silently ignore
+
+	if(Addr.type == NETTYPE_WEBSOCKET_IPV4)
+	{
+		// websocket client doesn't send token
+		// direct accept
+		SendControl(Addr, NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC), NET_SECURITY_TOKEN_UNSUPPORTED);
+		TryAcceptClient(Addr, NET_SECURITY_TOKEN_UNSUPPORTED);
+	}
+	else if(ControlMsg == NET_CTRLMSG_CONNECT)
+	{
+		// response connection request with token
+		SECURITY_TOKEN Token = GetToken(Addr);
+		SendControl(Addr, NET_CTRLMSG_CONNECTACCEPT, SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC), Token);
+	}
+	else if(ControlMsg == NET_CTRLMSG_ACCEPT)
+	{
+		SECURITY_TOKEN Token = ToSecurityToken(&Packet.m_aChunkData[1]);
+		if(Token == GetToken(Addr))
+		{
+			// correct token
+			// try to accept client
+			if(g_Config.m_Debug)
+				dbg_msg("security", "new client (ddnet token)");
+			TryAcceptClient(Addr, Token);
+		}
+		else
+		{
+			// invalid token
+			if(g_Config.m_Debug)
+				dbg_msg("security", "invalid token");
+		}
+	}
+}
+
+int CNetServer::OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg, const CNetPacketConstruct &Packet, SECURITY_TOKEN &ResponseToken, SECURITY_TOKEN Token)
+{
+	if(m_RecvUnpacker.m_Data.m_DataSize < 5 || ClientExists(Addr))
+		return 0; // silently ignore
+
+	mem_copy(&ResponseToken, Packet.m_aChunkData + 1, 4);
+
+	if(ControlMsg == 5)
+	{
+		if(m_RecvUnpacker.m_Data.m_DataSize >= 512)
+		{
+			SendTokenSixup(Addr, ResponseToken);
+			return 0;
+		}
+
+		// Is this behaviour safe to rely on?
+		pChunk->m_Flags = 0;
+		pChunk->m_ClientID = -1;
+		pChunk->m_Address = Addr;
+		pChunk->m_DataSize = 0;
+		return 1;
+	}
+	else if(ControlMsg == NET_CTRLMSG_CONNECT)
+	{
+		SECURITY_TOKEN MyToken = GetToken(Addr);
+		unsigned char aToken[sizeof(SECURITY_TOKEN)];
+		mem_copy(aToken, &MyToken, sizeof(aToken));
+
+		CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CONNECTACCEPT, aToken, sizeof(aToken), ResponseToken, true);
+		if(Token == MyToken)
+			TryAcceptClient(Addr, ResponseToken, false, true, Token);
+	}
+
+	return 0;
+}
+
+int CNetServer::GetClientSlot(const NETADDR &Addr)
+{
+	int Slot = -1;
+
+	for(int i = 0; i < MaxClients(); i++)
+	{
+		if(m_aSlots[i].m_Connection.State() != NET_CONNSTATE_OFFLINE &&
+			m_aSlots[i].m_Connection.State() != NET_CONNSTATE_ERROR &&
+			net_addr_comp(m_aSlots[i].m_Connection.PeerAddress(), &Addr) == 0)
+
+		{
+			Slot = i;
+		}
+	}
+
+	return Slot;
+}
+
+static bool IsDDNetControlMsg(const CNetPacketConstruct *pPacket)
+{
+	if(!(pPacket->m_Flags & NET_PACKETFLAG_CONTROL) || pPacket->m_DataSize < 1)
+	{
+		return false;
+	}
+	if(pPacket->m_aChunkData[0] == NET_CTRLMSG_CONNECT && pPacket->m_DataSize >= (int)(1 + sizeof(SECURITY_TOKEN_MAGIC) + sizeof(SECURITY_TOKEN)) && mem_comp(&pPacket->m_aChunkData[1], SECURITY_TOKEN_MAGIC, sizeof(SECURITY_TOKEN_MAGIC)) == 0)
+	{
+		// DDNet CONNECT
+		return true;
+	}
+	if(pPacket->m_aChunkData[0] == NET_CTRLMSG_ACCEPT && pPacket->m_DataSize >= 1 + (int)sizeof(SECURITY_TOKEN))
+	{
+		// DDNet ACCEPT
+		return true;
+	}
+	return false;
+}
+
+/*
+	TODO: chopp up this function into smaller working parts
+*/
+int CNetServer::Recv(CNetChunk *pChunk, SECURITY_TOKEN *pResponseToken)
+{
+	while(true)
+	{
+		NETADDR Addr;
+
+		// check for a chunk
+		if(m_RecvUnpacker.FetchChunk(pChunk))
+			return 1;
+
+		// TODO: empty the recvinfo
+		unsigned char *pData;
+		int Bytes = net_udp_recv(m_Socket, &Addr, &pData);
+
+		// no more packets for now
+		if(Bytes <= 0)
+			break;
+
+		// check if we just should drop the packet
+		char aBuf[128];
+		if(NetBan() && NetBan()->IsBanned(&Addr, aBuf, sizeof(aBuf)))
+		{
+			// banned, reply with a message
+			CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, aBuf, str_length(aBuf) + 1, NET_SECURITY_TOKEN_UNSUPPORTED);
+			continue;
+		}
+
+		SECURITY_TOKEN Token;
+		bool Sixup = false;
+		*pResponseToken = NET_SECURITY_TOKEN_UNKNOWN;
+		if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup, &Token, pResponseToken) == 0)
+		{
+			if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONNLESS)
+			{
+				if(Sixup && Token != GetToken(Addr) && Token != GetGlobalToken())
+					continue;
+
+				pChunk->m_Flags = NETSENDFLAG_CONNLESS;
+				pChunk->m_ClientID = -1;
+				pChunk->m_Address = Addr;
+				pChunk->m_DataSize = m_RecvUnpacker.m_Data.m_DataSize;
+				pChunk->m_pData = m_RecvUnpacker.m_Data.m_aChunkData;
+				if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_EXTENDED)
+				{
+					pChunk->m_Flags |= NETSENDFLAG_EXTENDED;
+					mem_copy(pChunk->m_aExtraData, m_RecvUnpacker.m_Data.m_aExtraData, sizeof(pChunk->m_aExtraData));
+				}
+				return 1;
+			}
+			else
+			{
+				// drop invalid ctrl packets
+				if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONTROL &&
+					m_RecvUnpacker.m_Data.m_DataSize == 0)
+					continue;
+
+				// normal packet, find matching slot
+				int Slot = GetClientSlot(Addr);
+
+				if(!Sixup && Slot != -1 && m_aSlots[Slot].m_Connection.m_Sixup)
+				{
+					Sixup = true;
+					if(CNetBase::UnpackPacket(pData, Bytes, &m_RecvUnpacker.m_Data, Sixup, &Token))
+						continue;
+				}
+
+				if(Slot != -1)
+				{
+					// found
+
+					// control
+					if(m_RecvUnpacker.m_Data.m_Flags & NET_PACKETFLAG_CONTROL)
+						OnConnCtrlMsg(Addr, Slot, m_RecvUnpacker.m_Data.m_aChunkData[0], m_RecvUnpacker.m_Data);
+
+					if(m_aSlots[Slot].m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr, Token))
+					{
+						if(m_RecvUnpacker.m_Data.m_DataSize)
+							m_RecvUnpacker.Start(&Addr, &m_aSlots[Slot].m_Connection, Slot);
+					}
+				}
+				else
+				{
+					// not found, client that wants to connect
+
+					if(Sixup)
+					{
+						// got 0.7 control msg
+						if(OnSixupCtrlMsg(Addr, pChunk, m_RecvUnpacker.m_Data.m_aChunkData[0], m_RecvUnpacker.m_Data, *pResponseToken, Token) == 1)
+							return 1;
+					}
+					else if(IsDDNetControlMsg(&m_RecvUnpacker.m_Data))
+					{
+						// got ddnet control msg
+						OnTokenCtrlMsg(Addr, m_RecvUnpacker.m_Data.m_aChunkData[0], m_RecvUnpacker.m_Data);
+					}
+					else
+					{
+						// got connection-less ctrl or sys msg
+						OnPreConnMsg(Addr, m_RecvUnpacker.m_Data);
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+int CNetServer::Send(CNetChunk *pChunk)
+{
+	if(pChunk->m_DataSize >= NET_MAX_PAYLOAD)
+	{
+		dbg_msg("netserver", "packet payload too big. %d. dropping packet", pChunk->m_DataSize);
+		return -1;
+	}
+
+	if(pChunk->m_Flags & NETSENDFLAG_CONNLESS)
+	{
+		// send connectionless packet
+		CNetBase::SendPacketConnless(m_Socket, &pChunk->m_Address, pChunk->m_pData, pChunk->m_DataSize,
+			pChunk->m_Flags & NETSENDFLAG_EXTENDED, pChunk->m_aExtraData);
+	}
+	else
+	{
+		int Flags = 0;
+		dbg_assert(pChunk->m_ClientID >= 0, "erroneous client id");
+		dbg_assert(pChunk->m_ClientID < MaxClients(), "erroneous client id");
+
+		if(pChunk->m_Flags & NETSENDFLAG_VITAL)
+			Flags = NET_CHUNKFLAG_VITAL;
+
+		if(m_aSlots[pChunk->m_ClientID].m_Connection.QueueChunk(Flags, pChunk->m_DataSize, pChunk->m_pData) == 0)
+		{
+			if(pChunk->m_Flags & NETSENDFLAG_FLUSH)
+				m_aSlots[pChunk->m_ClientID].m_Connection.Flush();
+		}
+		else
+		{
+			//Drop(pChunk->m_ClientID, "Error sending data");
+		}
+	}
+	return 0;
+}
+
+void CNetServer::SendTokenSixup(NETADDR &Addr, SECURITY_TOKEN Token)
+{
+	SECURITY_TOKEN MyToken = GetToken(Addr);
+	unsigned char aBuf[512] = {};
+	mem_copy(aBuf, &MyToken, 4);
+	int Size = (Token == NET_SECURITY_TOKEN_UNKNOWN) ? 512 : 4;
+	CNetBase::SendControlMsg(m_Socket, &Addr, 0, 5, aBuf, Size, Token, true);
+}
+
+int CNetServer::SendConnlessSixup(CNetChunk *pChunk, SECURITY_TOKEN ResponseToken)
+{
+	if(pChunk->m_DataSize > NET_MAX_PACKETSIZE - 9)
+		return -1;
+
+	unsigned char aBuffer[NET_MAX_PACKETSIZE];
+	aBuffer[0] = NET_PACKETFLAG_CONNLESS << 2 | 1;
+	SECURITY_TOKEN Token = GetToken(pChunk->m_Address);
+	mem_copy(aBuffer + 1, &ResponseToken, 4);
+	mem_copy(aBuffer + 5, &Token, 4);
+	mem_copy(aBuffer + 9, pChunk->m_pData, pChunk->m_DataSize);
+	net_udp_send(m_Socket, &pChunk->m_Address, aBuffer, pChunk->m_DataSize + 9);
+
+	return 0;
+}
+
+void CNetServer::SetMaxClientsPerIP(int Max)
+{
+	// clamp
+	if(Max < 1)
+		Max = 1;
+	else if(Max > NET_MAX_CLIENTS)
+		Max = NET_MAX_CLIENTS;
+
+	m_MaxClientsPerIP = Max;
+}
+
+bool CNetServer::SetTimedOut(int ClientID, int OrigID)
+{
+	if(m_aSlots[ClientID].m_Connection.State() != NET_CONNSTATE_ERROR)
+		return false;
+
+	m_aSlots[ClientID].m_Connection.SetTimedOut(ClientAddr(OrigID), m_aSlots[OrigID].m_Connection.SeqSequence(), m_aSlots[OrigID].m_Connection.AckSequence(), m_aSlots[OrigID].m_Connection.SecurityToken(), m_aSlots[OrigID].m_Connection.ResendBuffer(), m_aSlots[OrigID].m_Connection.m_Sixup);
+	m_aSlots[OrigID].m_Connection.Reset();
+	return true;
+}
+
+void CNetServer::SetTimeoutProtected(int ClientID)
+{
+	m_aSlots[ClientID].m_Connection.m_TimeoutProtected = true;
+}
+
+int CNetServer::ResetErrorString(int ClientID)
+{
+	m_aSlots[ClientID].m_Connection.ResetErrorString();
+	return 0;
+}
+
+const char *CNetServer::ErrorString(int ClientID)
+{
+	return m_aSlots[ClientID].m_Connection.ErrorString();
+}
diff --git a/src_bkp/engine/shared/network_stun.cpp b/src_bkp/engine/shared/network_stun.cpp
new file mode 100644
index 0000000000..a2e406eec2
--- /dev/null
+++ b/src_bkp/engine/shared/network_stun.cpp
@@ -0,0 +1,185 @@
+#include "network.h"
+
+#include <base/log.h>
+#include <base/system.h>
+
+static int IndexFromNetType(int NetType)
+{
+	switch(NetType)
+	{
+	case NETTYPE_IPV6:
+		return 0;
+	case NETTYPE_IPV4:
+		return 1;
+	}
+	return -1;
+}
+
+static const char *IndexToSystem(int Index)
+{
+	switch(Index)
+	{
+	case 0:
+		return "stun/6";
+	case 1:
+		return "stun/4";
+	}
+	dbg_break();
+	return nullptr;
+}
+
+static int RetryWaitSeconds(int NumUnsuccessfulTries)
+{
+	return (1 << clamp(NumUnsuccessfulTries, 0, 9));
+}
+
+CStun::CProtocol::CProtocol(int Index, NETSOCKET Socket) :
+	m_Index(Index),
+	m_Socket(Socket)
+{
+	mem_zero(&m_StunServer, sizeof(NETADDR));
+	// Initialize `m_Stun` with random data.
+	unsigned char aBuf[32];
+	StunMessagePrepare(aBuf, sizeof(aBuf), &m_Stun);
+}
+
+void CStun::CProtocol::FeedStunServer(NETADDR StunServer)
+{
+	if(m_HaveStunServer && net_addr_comp(&m_StunServer, &StunServer) == 0)
+	{
+		return;
+	}
+	m_HaveStunServer = true;
+	m_StunServer = StunServer;
+	m_NumUnsuccessfulTries = 0;
+	Refresh();
+}
+
+void CStun::CProtocol::Refresh()
+{
+	m_NextTry = time_get();
+}
+
+void CStun::CProtocol::Update()
+{
+	int64_t Now = time_get();
+	if(m_NextTry == -1 || Now < m_NextTry || !m_HaveStunServer)
+	{
+		return;
+	}
+	m_NextTry = Now + RetryWaitSeconds(m_NumUnsuccessfulTries) * time_freq();
+	m_NumUnsuccessfulTries += 1;
+	unsigned char aBuf[32];
+	int Size = StunMessagePrepare(aBuf, sizeof(aBuf), &m_Stun);
+	if(net_udp_send(m_Socket, &m_StunServer, aBuf, Size) == -1)
+	{
+		log_debug(IndexToSystem(m_Index), "couldn't send stun request");
+		return;
+	}
+}
+
+bool CStun::CProtocol::OnPacket(NETADDR Addr, unsigned char *pData, int DataSize)
+{
+	if(m_NextTry < 0 || !m_HaveStunServer)
+	{
+		return false;
+	}
+	bool Success;
+	NETADDR StunAddr;
+	if(StunMessageParse(pData, DataSize, &m_Stun, &Success, &StunAddr))
+	{
+		return false;
+	}
+	m_LastResponse = time_get();
+	if(!Success)
+	{
+		m_HaveAddr = false;
+		log_debug(IndexToSystem(m_Index), "got error response");
+		return true;
+	}
+	m_NextTry = -1;
+	m_NumUnsuccessfulTries = -1;
+	m_HaveAddr = true;
+	m_Addr = StunAddr;
+
+	char aStunAddr[NETADDR_MAXSTRSIZE];
+	net_addr_str(&StunAddr, aStunAddr, sizeof(aStunAddr), true);
+	log_debug(IndexToSystem(m_Index), "got address: %s", aStunAddr);
+	return true;
+}
+
+CONNECTIVITY CStun::CProtocol::GetConnectivity(NETADDR *pGlobalAddr)
+{
+	if(!m_HaveStunServer)
+	{
+		return CONNECTIVITY::UNKNOWN;
+	}
+	int64_t Now = time_get();
+	int64_t Freq = time_freq();
+	bool HaveTriedALittle = m_NumUnsuccessfulTries >= 5 && (m_LastResponse == -1 || Now - m_LastResponse >= 30 * Freq);
+	if(m_LastResponse == -1 && !HaveTriedALittle)
+	{
+		return CONNECTIVITY::CHECKING;
+	}
+	else if(HaveTriedALittle)
+	{
+		return CONNECTIVITY::UNREACHABLE;
+	}
+	else if(!m_HaveAddr)
+	{
+		return CONNECTIVITY::REACHABLE;
+	}
+	else
+	{
+		*pGlobalAddr = m_Addr;
+		return CONNECTIVITY::ADDRESS_KNOWN;
+	}
+}
+
+CStun::CStun(NETSOCKET Socket) :
+	m_aProtocols{CProtocol(0, Socket), CProtocol(1, Socket)}
+{
+}
+
+void CStun::FeedStunServer(NETADDR StunServer)
+{
+	int Index = IndexFromNetType(StunServer.type);
+	if(Index < 0)
+	{
+		return;
+	}
+	m_aProtocols[Index].FeedStunServer(StunServer);
+}
+
+void CStun::Refresh()
+{
+	for(auto &Protocol : m_aProtocols)
+	{
+		Protocol.Refresh();
+	}
+}
+
+void CStun::Update()
+{
+	for(auto &Protocol : m_aProtocols)
+	{
+		Protocol.Update();
+	}
+}
+
+bool CStun::OnPacket(NETADDR Addr, unsigned char *pData, int DataSize)
+{
+	int Index = IndexFromNetType(Addr.type);
+	if(Index < 0)
+	{
+		return false;
+	}
+	return m_aProtocols[Index].OnPacket(Addr, pData, DataSize);
+}
+
+CONNECTIVITY CStun::GetConnectivity(int NetType, NETADDR *pGlobalAddr)
+{
+	int Index = IndexFromNetType(NetType);
+	dbg_assert(Index != -1, "invalid nettype");
+	return m_aProtocols[Index].GetConnectivity(pGlobalAddr);
+}
diff --git a/src_bkp/engine/shared/packer.cpp b/src_bkp/engine/shared/packer.cpp
new file mode 100644
index 0000000000..2b183113b1
--- /dev/null
+++ b/src_bkp/engine/shared/packer.cpp
@@ -0,0 +1,199 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+#include "compression.h"
+#include "packer.h"
+
+void CPacker::Reset()
+{
+	m_Error = false;
+	m_pCurrent = m_aBuffer;
+	m_pEnd = m_pCurrent + PACKER_BUFFER_SIZE;
+}
+
+void CPacker::AddInt(int i)
+{
+	if(m_Error)
+		return;
+
+	unsigned char *pNext = CVariableInt::Pack(m_pCurrent, i, m_pEnd - m_pCurrent);
+	if(!pNext)
+	{
+		m_Error = true;
+		return;
+	}
+	m_pCurrent = pNext;
+}
+
+void CPacker::AddString(const char *pStr, int Limit)
+{
+	if(m_Error)
+		return;
+
+	if(Limit <= 0)
+	{
+		Limit = PACKER_BUFFER_SIZE;
+	}
+	while(*pStr && Limit != 0)
+	{
+		int Codepoint = str_utf8_decode(&pStr);
+		if(Codepoint == -1)
+		{
+			Codepoint = 0xfffd; // Unicode replacement character.
+		}
+		char aGarbage[4];
+		int Length = str_utf8_encode(aGarbage, Codepoint);
+		if(Limit < Length)
+		{
+			break;
+		}
+		// Ensure space for the null termination.
+		if(m_pEnd - m_pCurrent < Length + 1)
+		{
+			m_Error = true;
+			break;
+		}
+		Length = str_utf8_encode((char *)m_pCurrent, Codepoint);
+		m_pCurrent += Length;
+		Limit -= Length;
+	}
+	*m_pCurrent++ = 0;
+}
+
+void CPacker::AddRaw(const void *pData, int Size)
+{
+	if(m_Error)
+		return;
+
+	if(m_pCurrent + Size > m_pEnd)
+	{
+		m_Error = true;
+		return;
+	}
+
+	mem_copy(m_pCurrent, pData, Size);
+	m_pCurrent += Size;
+}
+
+void CUnpacker::Reset(const void *pData, int Size)
+{
+	m_Error = false;
+	m_pStart = (const unsigned char *)pData;
+	m_pEnd = m_pStart + Size;
+	m_pCurrent = m_pStart;
+}
+
+int CUnpacker::GetInt()
+{
+	if(m_Error)
+		return 0;
+
+	if(m_pCurrent >= m_pEnd)
+	{
+		m_Error = true;
+		return 0;
+	}
+
+	int i;
+	const unsigned char *pNext = CVariableInt::Unpack(m_pCurrent, &i, m_pEnd - m_pCurrent);
+	if(!pNext)
+	{
+		m_Error = true;
+		return 0;
+	}
+	m_pCurrent = pNext;
+	return i;
+}
+
+int CUnpacker::GetIntOrDefault(int Default)
+{
+	if(m_Error)
+	{
+		return 0;
+	}
+	if(m_pCurrent == m_pEnd)
+	{
+		return Default;
+	}
+	return GetInt();
+}
+
+int CUnpacker::GetUncompressedInt()
+{
+	if(m_Error)
+		return 0;
+
+	if(m_pCurrent + sizeof(int) > m_pEnd)
+	{
+		m_Error = true;
+		return 0;
+	}
+
+	int i;
+	mem_copy(&i, m_pCurrent, sizeof(int));
+	m_pCurrent += sizeof(int);
+	return i;
+}
+
+int CUnpacker::GetUncompressedIntOrDefault(int Default)
+{
+	if(m_Error)
+	{
+		return 0;
+	}
+	if(m_pCurrent == m_pEnd)
+	{
+		return Default;
+	}
+	return GetUncompressedInt();
+}
+
+const char *CUnpacker::GetString(int SanitizeType)
+{
+	if(m_Error)
+		return "";
+
+	if(m_pCurrent >= m_pEnd)
+	{
+		m_Error = true;
+		return "";
+	}
+
+	char *pPtr = (char *)m_pCurrent;
+	while(*m_pCurrent) // skip the string
+	{
+		m_pCurrent++;
+		if(m_pCurrent == m_pEnd)
+		{
+			m_Error = true;
+			return "";
+		}
+	}
+	m_pCurrent++;
+
+	// sanitize all strings
+	if(SanitizeType & SANITIZE)
+		str_sanitize(pPtr);
+	else if(SanitizeType & SANITIZE_CC)
+		str_sanitize_cc(pPtr);
+	return SanitizeType & SKIP_START_WHITESPACES ? str_utf8_skip_whitespaces(pPtr) : pPtr;
+}
+
+const unsigned char *CUnpacker::GetRaw(int Size)
+{
+	const unsigned char *pPtr = m_pCurrent;
+	if(m_Error)
+		return 0;
+
+	// check for nasty sizes
+	if(Size < 0 || m_pCurrent + Size > m_pEnd)
+	{
+		m_Error = true;
+		return 0;
+	}
+
+	// "unpack" the data
+	m_pCurrent += Size;
+	return pPtr;
+}
diff --git a/src_bkp/engine/shared/packer.h b/src_bkp/engine/shared/packer.h
new file mode 100644
index 0000000000..7b633c4174
--- /dev/null
+++ b/src_bkp/engine/shared/packer.h
@@ -0,0 +1,59 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_PACKER_H
+#define ENGINE_SHARED_PACKER_H
+
+class CPacker
+{
+public:
+	enum
+	{
+		PACKER_BUFFER_SIZE = 1024 * 2
+	};
+
+private:
+	unsigned char m_aBuffer[PACKER_BUFFER_SIZE];
+	unsigned char *m_pCurrent;
+	unsigned char *m_pEnd;
+	bool m_Error;
+
+public:
+	void Reset();
+	void AddInt(int i);
+	void AddString(const char *pStr, int Limit = PACKER_BUFFER_SIZE);
+	void AddRaw(const void *pData, int Size);
+
+	int Size() const { return (int)(m_pCurrent - m_aBuffer); }
+	const unsigned char *Data() const { return m_aBuffer; }
+	bool Error() const { return m_Error; }
+};
+
+class CUnpacker
+{
+	const unsigned char *m_pStart;
+	const unsigned char *m_pCurrent;
+	const unsigned char *m_pEnd;
+	bool m_Error;
+
+public:
+	enum
+	{
+		SANITIZE = 1,
+		SANITIZE_CC = 2,
+		SKIP_START_WHITESPACES = 4
+	};
+
+	void Reset(const void *pData, int Size);
+	int GetInt();
+	int GetIntOrDefault(int Default);
+	int GetUncompressedInt();
+	int GetUncompressedIntOrDefault(int Default);
+	const char *GetString(int SanitizeType = SANITIZE);
+	const unsigned char *GetRaw(int Size);
+	bool Error() const { return m_Error; }
+
+	int CompleteSize() const { return m_pEnd - m_pStart; }
+	const unsigned char *CompleteData() const { return m_pStart; }
+};
+
+#endif
diff --git a/src_bkp/engine/shared/protocol.h b/src_bkp/engine/shared/protocol.h
new file mode 100644
index 0000000000..6c00a487bd
--- /dev/null
+++ b/src_bkp/engine/shared/protocol.h
@@ -0,0 +1,132 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_PROTOCOL_H
+#define ENGINE_SHARED_PROTOCOL_H
+
+#include <bitset>
+
+/*
+	Connection diagram - How the initialization works.
+
+	Client -> INFO -> Server
+		Contains version info, name, and some other info.
+
+	Client <- MAP <- Server
+		Contains current map.
+
+	Client -> READY -> Server
+		The client has loaded the map and is ready to go,
+		but the mod needs to send it's information as well.
+		modc_connected is called on the client and
+		mods_connected is called on the server.
+		The client should call client_entergame when the
+		mod has done it's initialization.
+
+	Client -> ENTERGAME -> Server
+		Tells the server to start sending snapshots.
+		client_entergame and server_client_enter is called.
+*/
+
+enum
+{
+	NETMSG_EX = 0,
+
+	// the first thing sent by the client
+	// contains the version info for the client
+	NETMSG_INFO = 1,
+
+	// sent by server
+	NETMSG_MAP_CHANGE, // sent when client should switch map
+	NETMSG_MAP_DATA, // map transfer, contains a chunk of the map file
+	NETMSG_CON_READY, // connection is ready, client should send start info
+	NETMSG_SNAP, // normal snapshot, multiple parts
+	NETMSG_SNAPEMPTY, // empty snapshot
+	NETMSG_SNAPSINGLE, // ?
+	NETMSG_SNAPSMALL, //
+	NETMSG_INPUTTIMING, // reports how off the input was
+	NETMSG_RCON_AUTH_STATUS, // result of the authentication
+	NETMSG_RCON_LINE, // line that should be printed to the remote console
+
+	NETMSG_UNUSED1,
+	NETMSG_UNUSED2,
+
+	// sent by client
+	NETMSG_READY, //
+	NETMSG_ENTERGAME,
+	NETMSG_INPUT, // contains the inputdata from the client
+	NETMSG_RCON_CMD, //
+	NETMSG_RCON_AUTH, //
+	NETMSG_REQUEST_MAP_DATA, //
+
+	NETMSG_UNUSED3,
+	NETMSG_UNUSED4,
+
+	// sent by both
+	NETMSG_PING,
+	NETMSG_PING_REPLY,
+	NETMSG_UNUSED5,
+
+	// sent by server (todo: move it up)
+	NETMSG_RCON_CMD_ADD,
+	NETMSG_RCON_CMD_REM,
+
+	NUM_NETMSGS,
+};
+
+// this should be revised
+enum
+{
+	SERVER_TICK_SPEED = 50,
+	SERVER_FLAG_PASSWORD = 1 << 0,
+	SERVER_FLAG_TIMESCORE = 1 << 1,
+	SERVERINFO_LEVEL_MIN = 0,
+	SERVERINFO_LEVEL_MAX = 2,
+
+	MAX_SERVER_ADDRESSES = 16,
+	SERVERINFO_MAX_CLIENTS = 128,
+	MAX_CLIENTS = 64,
+	VANILLA_MAX_CLIENTS = 16,
+	MAX_CHECKPOINTS = 25,
+	MIN_TICK = 0,
+	MAX_TICK = 0x6FFFFFFF,
+
+	MAX_INPUT_SIZE = 128,
+	MAX_SNAPSHOT_PACKSIZE = 900,
+
+	MAX_NAME_LENGTH = 16,
+	MAX_CLAN_LENGTH = 12,
+
+	// message packing
+	MSGFLAG_VITAL = 1,
+	MSGFLAG_FLUSH = 2,
+	MSGFLAG_NORECORD = 4,
+	MSGFLAG_RECORD = 8,
+	MSGFLAG_NOSEND = 16
+};
+
+enum
+{
+	VERSION_NONE = -1,
+	VERSION_VANILLA = 0,
+	VERSION_DDRACE = 1,
+	VERSION_DDNET_OLD = 2,
+	VERSION_DDNET_WHISPER = 217,
+	VERSION_DDNET_GOODHOOK = 221,
+	VERSION_DDNET_RCONPROTECT = 408,
+	VERSION_DDNET_ANTIPING_PROJECTILE = 604,
+	VERSION_DDNET_UPDATER_FIXED = 707,
+	VERSION_DDNET_GAMETICK = 10042,
+	VERSION_DDNET_EARLY_VERSION = 13020,
+	VERSION_DDNET_MSG_LEGACY = 15040,
+	VERSION_DDNET_SWITCH = 15060,
+	VERSION_DDNET_INDEPENDENT_SPECTATORS_TEAM = 16000,
+	VERSION_DDNET_WEAPON_SHIELDS = 16010,
+	VERSION_DDNET_NEW_HUD = 16020,
+	VERSION_DDNET_MULTI_LASER = 16040,
+	VERSION_DDNET_ENTITY_NETOBJS = 16200,
+	VERSION_DDNET_REDIRECT = 17020,
+};
+
+typedef std::bitset<MAX_CLIENTS> CClientMask;
+
+#endif
diff --git a/src_bkp/engine/shared/protocol7.h b/src_bkp/engine/shared/protocol7.h
new file mode 100644
index 0000000000..c8524ef78c
--- /dev/null
+++ b/src_bkp/engine/shared/protocol7.h
@@ -0,0 +1,57 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_PROTOCOL7_H
+#define ENGINE_SHARED_PROTOCOL7_H
+
+namespace protocol7 {
+
+enum
+{
+	NETMSG_NULL = 0,
+
+	// the first thing sent by the client
+	// contains the version info for the client
+	NETMSG_INFO = 1,
+
+	// sent by server
+	NETMSG_MAP_CHANGE, // sent when client should switch map
+	NETMSG_MAP_DATA, // map transfer, contains a chunk of the map file
+	NETMSG_SERVERINFO,
+	NETMSG_CON_READY, // connection is ready, client should send start info
+	NETMSG_SNAP, // normal snapshot, multiple parts
+	NETMSG_SNAPEMPTY, // empty snapshot
+	NETMSG_SNAPSINGLE, // ?
+	NETMSG_SNAPSMALL, //
+	NETMSG_INPUTTIMING, // reports how off the input was
+	NETMSG_RCON_AUTH_ON, // rcon authentication enabled
+	NETMSG_RCON_AUTH_OFF, // rcon authentication disabled
+	NETMSG_RCON_LINE, // line that should be printed to the remote console
+	NETMSG_RCON_CMD_ADD,
+	NETMSG_RCON_CMD_REM,
+
+	NETMSG_UNUSED1,
+	NETMSG_UNUSED2,
+
+	// sent by client
+	NETMSG_READY, //
+	NETMSG_ENTERGAME,
+	NETMSG_INPUT, // contains the inputdata from the client
+	NETMSG_RCON_CMD, //
+	NETMSG_RCON_AUTH, //
+	NETMSG_REQUEST_MAP_DATA, //
+
+	NETMSG_UNUSED3,
+	NETMSG_UNUSED4,
+
+	// sent by both
+	NETMSG_PING,
+	NETMSG_PING_REPLY,
+	NETMSG_UNUSED5,
+
+	NETMSG_MAPLIST_ENTRY_ADD, // todo 0.8: move up
+	NETMSG_MAPLIST_ENTRY_REM,
+};
+
+}
+
+#endif
diff --git a/src_bkp/engine/shared/protocol_ex.cpp b/src_bkp/engine/shared/protocol_ex.cpp
new file mode 100644
index 0000000000..51f4b286ad
--- /dev/null
+++ b/src_bkp/engine/shared/protocol_ex.cpp
@@ -0,0 +1,104 @@
+#include "protocol_ex.h"
+
+#include "config.h"
+#include "uuid_manager.h"
+
+#include <base/system.h>
+#include <engine/message.h>
+
+#include <new>
+
+void RegisterUuids(CUuidManager *pManager)
+{
+#define UUID(id, name) pManager->RegisterName(id, name);
+#include "protocol_ex_msgs.h"
+#undef UUID
+}
+
+int UnpackMessageID(int *pID, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker)
+{
+	*pID = 0;
+	*pSys = false;
+	mem_zero(pUuid, sizeof(*pUuid));
+
+	int MsgID = pUnpacker->GetInt();
+
+	if(pUnpacker->Error())
+	{
+		return UNPACKMESSAGE_ERROR;
+	}
+
+	*pID = MsgID >> 1;
+	*pSys = MsgID & 1;
+
+	if(*pID < 0 || *pID >= OFFSET_UUID)
+	{
+		return UNPACKMESSAGE_ERROR;
+	}
+
+	if(*pID != 0) // NETMSG_EX, NETMSGTYPE_EX
+	{
+		return UNPACKMESSAGE_OK;
+	}
+
+	*pID = g_UuidManager.UnpackUuid(pUnpacker, pUuid);
+
+	if(*pID == UUID_INVALID || *pID == UUID_UNKNOWN)
+	{
+		return UNPACKMESSAGE_ERROR;
+	}
+
+	if(*pSys)
+	{
+		switch(*pID)
+		{
+		case NETMSG_WHATIS:
+		{
+			CUuid Uuid2;
+			int ID2 = g_UuidManager.UnpackUuid(pUnpacker, &Uuid2);
+			if(ID2 == UUID_INVALID)
+			{
+				break;
+			}
+			if(ID2 == UUID_UNKNOWN)
+			{
+				new(pPacker) CMsgPacker(NETMSG_IDONTKNOW, true);
+				pPacker->AddRaw(&Uuid2, sizeof(Uuid2));
+			}
+			else
+			{
+				new(pPacker) CMsgPacker(NETMSG_ITIS, true);
+				pPacker->AddRaw(&Uuid2, sizeof(Uuid2));
+				pPacker->AddString(g_UuidManager.GetName(ID2), 0);
+			}
+			return UNPACKMESSAGE_ANSWER;
+		}
+		case NETMSG_IDONTKNOW:
+			if(g_Config.m_Debug)
+			{
+				CUuid Uuid2;
+				g_UuidManager.UnpackUuid(pUnpacker, &Uuid2);
+				if(pUnpacker->Error())
+					break;
+				char aBuf[UUID_MAXSTRSIZE];
+				FormatUuid(Uuid2, aBuf, sizeof(aBuf));
+				dbg_msg("uuid", "peer: unknown %s", aBuf);
+			}
+			break;
+		case NETMSG_ITIS:
+			if(g_Config.m_Debug)
+			{
+				CUuid Uuid2;
+				g_UuidManager.UnpackUuid(pUnpacker, &Uuid2);
+				const char *pName = pUnpacker->GetString(CUnpacker::SANITIZE_CC);
+				if(pUnpacker->Error())
+					break;
+				char aBuf[UUID_MAXSTRSIZE];
+				FormatUuid(Uuid2, aBuf, sizeof(aBuf));
+				dbg_msg("uuid", "peer: %s %s", aBuf, pName);
+			}
+			break;
+		}
+	}
+	return UNPACKMESSAGE_OK;
+}
diff --git a/src_bkp/engine/shared/protocol_ex.h b/src_bkp/engine/shared/protocol_ex.h
new file mode 100644
index 0000000000..2ca61ac0ce
--- /dev/null
+++ b/src_bkp/engine/shared/protocol_ex.h
@@ -0,0 +1,40 @@
+#ifndef ENGINE_SHARED_PROTOCOL_EX_H
+#define ENGINE_SHARED_PROTOCOL_EX_H
+
+#include <engine/shared/uuid_manager.h>
+
+class CMsgPacker;
+class CUnpacker;
+
+enum
+{
+	NETMSG_EX_INVALID = UUID_INVALID,
+	NETMSG_EX_UNKNOWN = UUID_UNKNOWN,
+
+	OFFSET_NETMSG_UUID = OFFSET_UUID,
+
+	__NETMSG_UUID_HELPER = OFFSET_NETMSG_UUID - 1,
+#define UUID(id, name) id,
+#include "protocol_ex_msgs.h"
+#undef UUID
+	OFFSET_TEEHISTORIAN_UUID,
+
+	UNPACKMESSAGE_ERROR = 0,
+	UNPACKMESSAGE_OK,
+	UNPACKMESSAGE_ANSWER,
+
+	SERVERCAP_CURVERSION = 5,
+	SERVERCAPFLAG_DDNET = 1 << 0,
+	SERVERCAPFLAG_CHATTIMEOUTCODE = 1 << 1,
+	SERVERCAPFLAG_ANYPLAYERFLAG = 1 << 2,
+	SERVERCAPFLAG_PINGEX = 1 << 3,
+	SERVERCAPFLAG_ALLOWDUMMY = 1 << 4,
+	SERVERCAPFLAG_SYNCWEAPONINPUT = 1 << 5,
+};
+
+void RegisterUuids(CUuidManager *pManager);
+bool NetworkExDefaultHandler(int *pID, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker, int Type);
+
+int UnpackMessageID(int *pID, bool *pSys, CUuid *pUuid, CUnpacker *pUnpacker, CMsgPacker *pPacker);
+
+#endif // ENGINE_SHARED_PROTOCOL_EX_H
diff --git a/src_bkp/engine/shared/protocol_ex_msgs.h b/src_bkp/engine/shared/protocol_ex_msgs.h
new file mode 100644
index 0000000000..c3f760a845
--- /dev/null
+++ b/src_bkp/engine/shared/protocol_ex_msgs.h
@@ -0,0 +1,36 @@
+// UUID(name_in_code, name)
+//
+// When adding your own extended net messages, choose the name (third
+// parameter) as `<name>@<domain>` where `<name>` is a name you can choose
+// freely and `<domain>` is a domain you own. If you don't own a domain, try
+// choosing a string that is not a domain and uniquely identifies you, e.g. use
+// the name of the client/server you develop.
+//
+// Example:
+//
+// 1) `i-unfreeze-you@ddnet.org`
+// 2) `creeper@minetee`
+//
+// The first example applies if you own the `ddnet.org` domain, that is, if you
+// are adding this message on behalf of the DDNet team.
+//
+// The second example shows how you could add a message if you don't own a
+// domain, but need a message for your minetee client/server.
+
+// This file can be included several times.
+
+UUID(NETMSG_WHATIS, "what-is@ddnet.tw")
+UUID(NETMSG_ITIS, "it-is@ddnet.tw")
+UUID(NETMSG_IDONTKNOW, "i-dont-know@ddnet.tw")
+UUID(NETMSG_IAMSTA, "i-am-StA@stormaxs.github.io/sta.github.io")
+
+UUID(NETMSG_RCONTYPE, "rcon-type@ddnet.tw")
+UUID(NETMSG_MAP_DETAILS, "map-details@ddnet.tw")
+UUID(NETMSG_CAPABILITIES, "capabilities@ddnet.tw")
+UUID(NETMSG_CLIENTVER, "clientver@ddnet.tw")
+UUID(NETMSG_PINGEX, "ping@ddnet.tw")
+UUID(NETMSG_PONGEX, "pong@ddnet.tw")
+UUID(NETMSG_CHECKSUM_REQUEST, "checksum-request@ddnet.tw")
+UUID(NETMSG_CHECKSUM_RESPONSE, "checksum-response@ddnet.tw")
+UUID(NETMSG_CHECKSUM_ERROR, "checksum-error@ddnet.tw")
+UUID(NETMSG_REDIRECT, "redirect@ddnet.org")
diff --git a/src_bkp/engine/shared/ringbuffer.cpp b/src_bkp/engine/shared/ringbuffer.cpp
new file mode 100644
index 0000000000..23301a669b
--- /dev/null
+++ b/src_bkp/engine/shared/ringbuffer.cpp
@@ -0,0 +1,191 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+#include "ringbuffer.h"
+
+CRingBufferBase::CItem *CRingBufferBase::NextBlock(CItem *pItem)
+{
+	if(pItem->m_pNext)
+		return pItem->m_pNext;
+	return m_pFirst;
+}
+
+CRingBufferBase::CItem *CRingBufferBase::PrevBlock(CItem *pItem)
+{
+	if(pItem->m_pPrev)
+		return pItem->m_pPrev;
+	return m_pLast;
+}
+
+CRingBufferBase::CItem *CRingBufferBase::MergeBack(CItem *pItem)
+{
+	// make sure that this block and previous block is free
+	if(!pItem->m_Free || !pItem->m_pPrev || !pItem->m_pPrev->m_Free)
+		return pItem;
+
+	// merge the blocks
+	pItem->m_pPrev->m_Size += pItem->m_Size;
+	pItem->m_pPrev->m_pNext = pItem->m_pNext;
+
+	// fixup pointers
+	if(pItem->m_pNext)
+		pItem->m_pNext->m_pPrev = pItem->m_pPrev;
+	else
+		m_pLast = pItem->m_pPrev;
+
+	if(pItem == m_pProduce)
+		m_pProduce = pItem->m_pPrev;
+
+	if(pItem == m_pConsume)
+		m_pConsume = pItem->m_pPrev;
+
+	// return the current block
+	return pItem->m_pPrev;
+}
+
+void CRingBufferBase::Init(void *pMemory, int Size, int Flags)
+{
+	m_Size = (Size) / sizeof(CItem) * sizeof(CItem);
+	m_pFirst = (CItem *)pMemory;
+	m_pFirst->m_pPrev = nullptr;
+	m_pFirst->m_pNext = nullptr;
+	m_pFirst->m_Free = 1;
+	m_pFirst->m_Size = m_Size;
+	m_pLast = m_pFirst;
+	m_pProduce = m_pFirst;
+	m_pConsume = m_pFirst;
+	m_Flags = Flags;
+}
+
+void *CRingBufferBase::Allocate(int Size)
+{
+	int WantedSize = (Size + sizeof(CItem) + sizeof(CItem) - 1) / sizeof(CItem) * sizeof(CItem);
+	CItem *pBlock = 0;
+
+	// check if we even can fit this block
+	if(WantedSize > m_Size)
+		return 0;
+
+	while(true)
+	{
+		// check for space
+		if(m_pProduce->m_Free)
+		{
+			if(m_pProduce->m_Size >= WantedSize)
+				pBlock = m_pProduce;
+			else
+			{
+				// wrap around to try to find a block
+				if(m_pFirst->m_Free && m_pFirst->m_Size >= WantedSize)
+					pBlock = m_pFirst;
+			}
+		}
+
+		if(pBlock)
+			break;
+		else
+		{
+			// we have no block, check our policy and see what todo
+			if(m_Flags & FLAG_RECYCLE)
+			{
+				if(!PopFirst())
+					return 0;
+			}
+			else
+				return 0;
+		}
+	}
+
+	// okey, we have our block
+
+	// split the block if needed
+	if(pBlock->m_Size > WantedSize + (int)sizeof(CItem))
+	{
+		CItem *pNewItem = (CItem *)((char *)pBlock + WantedSize);
+		pNewItem->m_pPrev = pBlock;
+		pNewItem->m_pNext = pBlock->m_pNext;
+		if(pNewItem->m_pNext)
+			pNewItem->m_pNext->m_pPrev = pNewItem;
+		pBlock->m_pNext = pNewItem;
+
+		pNewItem->m_Free = 1;
+		pNewItem->m_Size = pBlock->m_Size - WantedSize;
+		pBlock->m_Size = WantedSize;
+
+		if(!pNewItem->m_pNext)
+			m_pLast = pNewItem;
+	}
+
+	// set next block
+	m_pProduce = NextBlock(pBlock);
+
+	// set as used and return the item pointer
+	pBlock->m_Free = 0;
+	return (void *)(pBlock + 1);
+}
+
+int CRingBufferBase::PopFirst()
+{
+	if(m_pConsume->m_Free)
+		return 0;
+
+	// set the free flag
+	m_pConsume->m_Free = 1;
+
+	// previous block is also free, merge them
+	m_pConsume = MergeBack(m_pConsume);
+
+	// advance the consume pointer
+	m_pConsume = NextBlock(m_pConsume);
+	while(m_pConsume->m_Free && m_pConsume != m_pProduce)
+	{
+		m_pConsume = MergeBack(m_pConsume);
+		m_pConsume = NextBlock(m_pConsume);
+	}
+
+	// in the case that we have caught up with the produce pointer
+	// we might stand on a free block so merge em
+	MergeBack(m_pConsume);
+	return 1;
+}
+
+void *CRingBufferBase::Prev(void *pCurrent)
+{
+	CItem *pItem = ((CItem *)pCurrent) - 1;
+
+	while(true)
+	{
+		pItem = PrevBlock(pItem);
+		if(pItem == m_pProduce)
+			return 0;
+		if(!pItem->m_Free)
+			return pItem + 1;
+	}
+}
+
+void *CRingBufferBase::Next(void *pCurrent)
+{
+	CItem *pItem = ((CItem *)pCurrent) - 1;
+
+	while(true)
+	{
+		pItem = NextBlock(pItem);
+		if(pItem == m_pProduce)
+			return 0;
+		if(!pItem->m_Free)
+			return pItem + 1;
+	}
+}
+
+void *CRingBufferBase::First()
+{
+	if(m_pConsume->m_Free)
+		return 0;
+	return (void *)(m_pConsume + 1);
+}
+
+void *CRingBufferBase::Last()
+{
+	return Prev(m_pProduce + 1);
+}
diff --git a/src_bkp/engine/shared/ringbuffer.h b/src_bkp/engine/shared/ringbuffer.h
new file mode 100644
index 0000000000..842e0520c4
--- /dev/null
+++ b/src_bkp/engine/shared/ringbuffer.h
@@ -0,0 +1,68 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_RINGBUFFER_H
+#define ENGINE_SHARED_RINGBUFFER_H
+
+class CRingBufferBase
+{
+	class CItem
+	{
+	public:
+		CItem *m_pPrev;
+		CItem *m_pNext;
+		int m_Free;
+		int m_Size;
+	};
+
+	CItem *m_pProduce;
+	CItem *m_pConsume;
+
+	CItem *m_pFirst;
+	CItem *m_pLast;
+
+	int m_Size;
+	int m_Flags;
+
+	CItem *NextBlock(CItem *pItem);
+	CItem *PrevBlock(CItem *pItem);
+	CItem *MergeBack(CItem *pItem);
+
+protected:
+	void *Allocate(int Size);
+
+	void *Prev(void *pCurrent);
+	void *Next(void *pCurrent);
+	void *First();
+	void *Last();
+
+	void Init(void *pMemory, int Size, int Flags);
+	int PopFirst();
+
+public:
+	enum
+	{
+		// Will start to destroy items to try to fit the next one
+		FLAG_RECYCLE = 1
+	};
+};
+
+template<typename T, int TSIZE, int TFLAGS = 0>
+class CStaticRingBuffer : public CRingBufferBase
+{
+	unsigned char m_aBuffer[TSIZE];
+
+public:
+	CStaticRingBuffer() { Init(); }
+
+	void Init() { CRingBufferBase::Init(m_aBuffer, TSIZE, TFLAGS); }
+
+	T *Allocate(int Size) { return (T *)CRingBufferBase::Allocate(Size); }
+	int PopFirst() { return CRingBufferBase::PopFirst(); }
+
+	T *Prev(T *pCurrent) { return (T *)CRingBufferBase::Prev(pCurrent); }
+	T *Next(T *pCurrent) { return (T *)CRingBufferBase::Next(pCurrent); }
+	T *First() { return (T *)CRingBufferBase::First(); }
+	T *Last() { return (T *)CRingBufferBase::Last(); }
+};
+
+#endif
diff --git a/src_bkp/engine/shared/rust_version.rs b/src_bkp/engine/shared/rust_version.rs
new file mode 100644
index 0000000000..dc65764dcb
--- /dev/null
+++ b/src_bkp/engine/shared/rust_version.rs
@@ -0,0 +1,59 @@
+use super::CFGFLAG_CLIENT;
+use super::CFGFLAG_SERVER;
+use ddnet_base::s;
+use ddnet_base::UserPtr;
+use ddnet_engine::gs_ConsoleDefaultColor;
+use ddnet_engine::IConsole;
+use ddnet_engine::IConsole_FCommandCallback;
+use ddnet_engine::IConsole_IResult;
+use ddnet_engine::IConsole_OUTPUT_LEVEL_STANDARD;
+use std::pin::Pin;
+
+#[cxx::bridge]
+mod ffi {
+    extern "C++" {
+        include!("base/rust.h");
+        include!("engine/console.h");
+
+        type IConsole = ddnet_engine::IConsole;
+    }
+    extern "Rust" {
+        fn RustVersionPrint(console: &IConsole);
+        fn RustVersionRegister(console: Pin<&mut IConsole>);
+    }
+}
+
+/// Print the Rust version used for compiling this crate.
+///
+/// Uses [`IConsole::Print`] for printing.
+#[allow(non_snake_case)]
+pub fn RustVersionPrint(console: &IConsole) {
+    console.Print(
+        IConsole_OUTPUT_LEVEL_STANDARD,
+        s!("rust_version"),
+        s!(include_str!(concat!(env!("OUT_DIR"), "/rustc-version"))),
+        gs_ConsoleDefaultColor,
+    );
+}
+
+#[allow(non_snake_case)]
+extern "C" fn PrintRustVersionCallback(_: &IConsole_IResult, user: UserPtr) {
+    RustVersionPrint(unsafe { user.cast() })
+}
+
+/// Register the `rust_version` command to the given console instance.
+///
+/// This command calls the [`RustVersionPrint`] function to print the Rust
+/// version used for compiling this crate.
+#[allow(non_snake_case)]
+pub fn RustVersionRegister(console: Pin<&mut IConsole>) {
+    let user = console.as_ref().get_ref().into();
+    console.Register(
+        s!("rust_version"),
+        s!(""),
+        CFGFLAG_CLIENT | CFGFLAG_SERVER,
+        IConsole_FCommandCallback(PrintRustVersionCallback),
+        user,
+        s!("Prints the Rust version used to compile DDNet"),
+    );
+}
diff --git a/src_bkp/engine/shared/serverinfo.cpp b/src_bkp/engine/shared/serverinfo.cpp
new file mode 100644
index 0000000000..ecccfa5994
--- /dev/null
+++ b/src_bkp/engine/shared/serverinfo.cpp
@@ -0,0 +1,253 @@
+#include "serverinfo.h"
+
+#include "json.h"
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/external/json-parser/json.h>
+
+#include <cstdio>
+
+static bool IsAllowedHex(char c)
+{
+	static const char ALLOWED[] = "0123456789abcdefABCDEF";
+	for(int i = 0; i < (int)sizeof(ALLOWED) - 1; i++)
+	{
+		if(c == ALLOWED[i])
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool ParseCrc(unsigned int *pResult, const char *pString)
+{
+	if(str_length(pString) != 8)
+	{
+		return true;
+	}
+	for(int i = 0; i < 8; i++)
+	{
+		if(!IsAllowedHex(pString[i]))
+		{
+			return true;
+		}
+	}
+	return sscanf(pString, "%08x", pResult) != 1;
+}
+
+bool CServerInfo2::FromJson(CServerInfo2 *pOut, const json_value *pJson)
+{
+	bool Result = FromJsonRaw(pOut, pJson);
+	if(Result)
+	{
+		return Result;
+	}
+	return pOut->Validate();
+}
+
+bool CServerInfo2::Validate() const
+{
+	bool Error = false;
+	Error = Error || m_MaxClients < m_MaxPlayers;
+	Error = Error || m_NumClients < m_NumPlayers;
+	Error = Error || m_MaxClients < m_NumClients;
+	Error = Error || m_MaxPlayers < m_NumPlayers;
+	return Error;
+}
+
+bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
+{
+	mem_zero(pOut, sizeof(*pOut));
+	bool Error;
+
+	const json_value &ServerInfo = *pJson;
+	const json_value &MaxClients = ServerInfo["max_clients"];
+	const json_value &MaxPlayers = ServerInfo["max_players"];
+	const json_value &ClientScoreKind = ServerInfo["client_score_kind"];
+	const json_value &Passworded = ServerInfo["passworded"];
+	const json_value &GameType = ServerInfo["game_type"];
+	const json_value &Name = ServerInfo["name"];
+	const json_value &MapName = ServerInfo["map"]["name"];
+	const json_value &Version = ServerInfo["version"];
+	const json_value &Clients = ServerInfo["clients"];
+	Error = false;
+	Error = Error || MaxClients.type != json_integer;
+	Error = Error || MaxPlayers.type != json_integer;
+	Error = Error || Passworded.type != json_boolean;
+	Error = Error || (ClientScoreKind.type != json_none && ClientScoreKind.type != json_string);
+	Error = Error || GameType.type != json_string || str_has_cc(GameType);
+	Error = Error || Name.type != json_string || str_has_cc(Name);
+	Error = Error || MapName.type != json_string || str_has_cc(MapName);
+	Error = Error || Version.type != json_string || str_has_cc(Version);
+	Error = Error || Clients.type != json_array;
+	if(Error)
+	{
+		return true;
+	}
+	pOut->m_MaxClients = json_int_get(&MaxClients);
+	pOut->m_MaxPlayers = json_int_get(&MaxPlayers);
+	pOut->m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_UNSPECIFIED;
+	if(ClientScoreKind.type == json_string && str_startswith(ClientScoreKind, "points"))
+	{
+		pOut->m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_POINTS;
+	}
+	else if(ClientScoreKind.type == json_string && str_startswith(ClientScoreKind, "time"))
+	{
+		pOut->m_ClientScoreKind = CServerInfo::CLIENT_SCORE_KIND_TIME;
+	}
+	pOut->m_Passworded = Passworded;
+	str_copy(pOut->m_aGameType, GameType);
+	str_copy(pOut->m_aName, Name);
+	str_copy(pOut->m_aMapName, MapName);
+	str_copy(pOut->m_aVersion, Version);
+
+	pOut->m_NumClients = 0;
+	pOut->m_NumPlayers = 0;
+	for(unsigned i = 0; i < Clients.u.array.length; i++)
+	{
+		const json_value &Client = Clients[i];
+		const json_value &ClientName = Client["name"];
+		const json_value &Clan = Client["clan"];
+		const json_value &Country = Client["country"];
+		const json_value &Score = Client["score"];
+		const json_value &IsPlayer = Client["is_player"];
+		const json_value &IsAfk = Client["afk"];
+		Error = false;
+		Error = Error || ClientName.type != json_string || str_has_cc(ClientName);
+		Error = Error || Clan.type != json_string || str_has_cc(ClientName);
+		Error = Error || Country.type != json_integer;
+		Error = Error || Score.type != json_integer;
+		Error = Error || IsPlayer.type != json_boolean;
+		if(Error)
+		{
+			return true;
+		}
+		if(i < SERVERINFO_MAX_CLIENTS)
+		{
+			CClient *pClient = &pOut->m_aClients[i];
+			str_copy(pClient->m_aName, ClientName);
+			str_copy(pClient->m_aClan, Clan);
+			pClient->m_Country = json_int_get(&Country);
+			pClient->m_Score = json_int_get(&Score);
+			pClient->m_IsPlayer = IsPlayer;
+
+			pClient->m_IsAfk = false;
+			if(IsAfk.type == json_boolean)
+				pClient->m_IsAfk = IsAfk;
+
+			// check if a skin is also available
+			bool HasSkin = false;
+			const json_value &SkinObj = Client["skin"];
+			if(SkinObj.type == json_object)
+			{
+				const json_value &SkinName = SkinObj["name"];
+				const json_value &SkinBodyColor = SkinObj["color_body"];
+				const json_value &SkinFeetColor = SkinObj["color_feet"];
+				if(SkinName.type == json_string)
+				{
+					HasSkin = true;
+					str_copy(pClient->m_aSkin, SkinName.u.string.ptr);
+					// if skin json value existed, then always at least default to "default"
+					if(pClient->m_aSkin[0] == '\0')
+						str_copy(pClient->m_aSkin, "default");
+					// if skin also has custom colors, add them
+					if(SkinBodyColor.type == json_integer && SkinFeetColor.type == json_integer)
+					{
+						pClient->m_CustomSkinColors = true;
+						pClient->m_CustomSkinColorBody = SkinBodyColor.u.integer;
+						pClient->m_CustomSkinColorFeet = SkinFeetColor.u.integer;
+					}
+					// else set custom colors off
+					else
+					{
+						pClient->m_CustomSkinColors = false;
+					}
+				}
+			}
+
+			// else make it null terminated
+			if(!HasSkin)
+			{
+				pClient->m_aSkin[0] = '\0';
+			}
+		}
+
+		pOut->m_NumClients++;
+		if((bool)IsPlayer)
+		{
+			pOut->m_NumPlayers++;
+		}
+	}
+	return false;
+}
+
+bool CServerInfo2::operator==(const CServerInfo2 &Other) const
+{
+	bool Unequal;
+	Unequal = false;
+	Unequal = Unequal || m_MaxClients != Other.m_MaxClients;
+	Unequal = Unequal || m_NumClients != Other.m_NumClients;
+	Unequal = Unequal || m_MaxPlayers != Other.m_MaxPlayers;
+	Unequal = Unequal || m_NumPlayers != Other.m_NumPlayers;
+	Unequal = Unequal || m_ClientScoreKind != Other.m_ClientScoreKind;
+	Unequal = Unequal || m_Passworded != Other.m_Passworded;
+	Unequal = Unequal || str_comp(m_aGameType, Other.m_aGameType) != 0;
+	Unequal = Unequal || str_comp(m_aName, Other.m_aName) != 0;
+	Unequal = Unequal || str_comp(m_aMapName, Other.m_aMapName) != 0;
+	Unequal = Unequal || str_comp(m_aVersion, Other.m_aVersion) != 0;
+	if(Unequal)
+	{
+		return false;
+	}
+	for(int i = 0; i < m_NumClients; i++)
+	{
+		Unequal = false;
+		Unequal = Unequal || str_comp(m_aClients[i].m_aName, Other.m_aClients[i].m_aName) != 0;
+		Unequal = Unequal || str_comp(m_aClients[i].m_aClan, Other.m_aClients[i].m_aClan) != 0;
+		Unequal = Unequal || m_aClients[i].m_Country != Other.m_aClients[i].m_Country;
+		Unequal = Unequal || m_aClients[i].m_Score != Other.m_aClients[i].m_Score;
+		Unequal = Unequal || m_aClients[i].m_IsPlayer != Other.m_aClients[i].m_IsPlayer;
+		Unequal = Unequal || m_aClients[i].m_IsAfk != Other.m_aClients[i].m_IsAfk;
+		if(Unequal)
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+CServerInfo2::operator CServerInfo() const
+{
+	CServerInfo Result = {0};
+	Result.m_MaxClients = m_MaxClients;
+	Result.m_NumClients = m_NumClients;
+	Result.m_MaxPlayers = m_MaxPlayers;
+	Result.m_NumPlayers = m_NumPlayers;
+	Result.m_ClientScoreKind = m_ClientScoreKind;
+	Result.m_Flags = m_Passworded ? SERVER_FLAG_PASSWORD : 0;
+	str_copy(Result.m_aGameType, m_aGameType);
+	str_copy(Result.m_aName, m_aName);
+	str_copy(Result.m_aMap, m_aMapName);
+	str_copy(Result.m_aVersion, m_aVersion);
+
+	for(int i = 0; i < minimum(m_NumClients, (int)SERVERINFO_MAX_CLIENTS); i++)
+	{
+		str_copy(Result.m_aClients[i].m_aName, m_aClients[i].m_aName);
+		str_copy(Result.m_aClients[i].m_aClan, m_aClients[i].m_aClan);
+		Result.m_aClients[i].m_Country = m_aClients[i].m_Country;
+		Result.m_aClients[i].m_Score = m_aClients[i].m_Score;
+		Result.m_aClients[i].m_Player = m_aClients[i].m_IsPlayer;
+		Result.m_aClients[i].m_Afk = m_aClients[i].m_IsAfk;
+
+		str_copy(Result.m_aClients[i].m_aSkin, m_aClients[i].m_aSkin);
+		Result.m_aClients[i].m_CustomSkinColors = m_aClients[i].m_CustomSkinColors;
+		Result.m_aClients[i].m_CustomSkinColorBody = m_aClients[i].m_CustomSkinColorBody;
+		Result.m_aClients[i].m_CustomSkinColorFeet = m_aClients[i].m_CustomSkinColorFeet;
+	}
+
+	Result.m_NumReceivedClients = minimum(m_NumClients, (int)SERVERINFO_MAX_CLIENTS);
+	Result.m_Latency = -1;
+
+	return Result;
+}
diff --git a/src_bkp/engine/shared/serverinfo.h b/src_bkp/engine/shared/serverinfo.h
new file mode 100644
index 0000000000..edb06a467d
--- /dev/null
+++ b/src_bkp/engine/shared/serverinfo.h
@@ -0,0 +1,54 @@
+#ifndef ENGINE_SHARED_SERVERINFO_H
+#define ENGINE_SHARED_SERVERINFO_H
+
+#include "protocol.h"
+
+#include <engine/map.h>
+#include <engine/serverbrowser.h>
+
+typedef struct _json_value json_value;
+class CServerInfo;
+
+class CServerInfo2
+{
+public:
+	class CClient
+	{
+	public:
+		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
+		int m_Country;
+		int m_Score;
+		bool m_IsPlayer;
+		bool m_IsAfk;
+		char m_aSkin[24 + 1];
+		bool m_CustomSkinColors;
+		int m_CustomSkinColorBody;
+		int m_CustomSkinColorFeet;
+	};
+
+	CClient m_aClients[SERVERINFO_MAX_CLIENTS];
+	int m_MaxClients;
+	int m_NumClients; // Indirectly serialized.
+	int m_MaxPlayers;
+	int m_NumPlayers; // Not serialized.
+	CServerInfo::EClientScoreKind m_ClientScoreKind;
+	bool m_Passworded;
+	char m_aGameType[16];
+	char m_aName[64];
+	char m_aMapName[MAX_MAP_LENGTH];
+	char m_aVersion[32];
+
+	bool operator==(const CServerInfo2 &Other) const;
+	bool operator!=(const CServerInfo2 &Other) const { return !(*this == Other); }
+	static bool FromJson(CServerInfo2 *pOut, const json_value *pJson);
+	static bool FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson);
+	bool Validate() const;
+	void ToJson(char *pBuffer, int BufferSize) const;
+
+	operator CServerInfo() const;
+};
+
+bool ParseCrc(unsigned int *pResult, const char *pString);
+
+#endif // ENGINE_SHARED_SERVERINFO_H
diff --git a/src_bkp/engine/shared/snapshot.cpp b/src_bkp/engine/shared/snapshot.cpp
new file mode 100644
index 0000000000..7481eb63e4
--- /dev/null
+++ b/src_bkp/engine/shared/snapshot.cpp
@@ -0,0 +1,685 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "snapshot.h"
+#include "compression.h"
+#include "uuid_manager.h"
+
+#include <cstdlib>
+#include <limits>
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include <game/generated/protocolglue.h>
+
+// CSnapshot
+
+const CSnapshotItem *CSnapshot::GetItem(int Index) const
+{
+	return (const CSnapshotItem *)(DataStart() + Offsets()[Index]);
+}
+
+const CSnapshot CSnapshot::ms_EmptySnapshot;
+
+int CSnapshot::GetItemSize(int Index) const
+{
+	if(Index == m_NumItems - 1)
+		return (m_DataSize - Offsets()[Index]) - sizeof(CSnapshotItem);
+	return (Offsets()[Index + 1] - Offsets()[Index]) - sizeof(CSnapshotItem);
+}
+
+int CSnapshot::GetItemType(int Index) const
+{
+	int InternalType = GetItem(Index)->Type();
+	return GetExternalItemType(InternalType);
+}
+
+int CSnapshot::GetExternalItemType(int InternalType) const
+{
+	if(InternalType < OFFSET_UUID_TYPE)
+	{
+		return InternalType;
+	}
+
+	int TypeItemIndex = GetItemIndex(InternalType); // NETOBJTYPE_EX
+	if(TypeItemIndex == -1 || GetItemSize(TypeItemIndex) < (int)sizeof(CUuid))
+	{
+		return InternalType;
+	}
+	const CSnapshotItem *pTypeItem = GetItem(TypeItemIndex);
+	CUuid Uuid;
+	for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+		uint_to_bytes_be(&Uuid.m_aData[i * sizeof(int32_t)], pTypeItem->Data()[i]);
+
+	return g_UuidManager.LookupUuid(Uuid);
+}
+
+int CSnapshot::GetItemIndex(int Key) const
+{
+	// TODO: OPT: this should not be a linear search. very bad
+	for(int i = 0; i < m_NumItems; i++)
+	{
+		if(GetItem(i)->Key() == Key)
+			return i;
+	}
+	return -1;
+}
+
+const void *CSnapshot::FindItem(int Type, int ID) const
+{
+	int InternalType = Type;
+	if(Type >= OFFSET_UUID)
+	{
+		CUuid TypeUuid = g_UuidManager.GetUuid(Type);
+		int aTypeUuidItem[sizeof(CUuid) / sizeof(int32_t)];
+		for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+			aTypeUuidItem[i] = bytes_be_to_uint(&TypeUuid.m_aData[i * sizeof(int32_t)]);
+
+		bool Found = false;
+		for(int i = 0; i < m_NumItems; i++)
+		{
+			const CSnapshotItem *pItem = GetItem(i);
+			if(pItem->Type() == 0 && pItem->ID() >= OFFSET_UUID_TYPE) // NETOBJTYPE_EX
+			{
+				if(mem_comp(pItem->Data(), aTypeUuidItem, sizeof(CUuid)) == 0)
+				{
+					InternalType = pItem->ID();
+					Found = true;
+					break;
+				}
+			}
+		}
+		if(!Found)
+		{
+			return nullptr;
+		}
+	}
+	int Index = GetItemIndex((InternalType << 16) | ID);
+	return Index < 0 ? nullptr : GetItem(Index)->Data();
+}
+
+unsigned CSnapshot::Crc() const
+{
+	unsigned int Crc = 0;
+
+	for(int i = 0; i < m_NumItems; i++)
+	{
+		const CSnapshotItem *pItem = GetItem(i);
+		int Size = GetItemSize(i);
+
+		for(size_t b = 0; b < Size / sizeof(int32_t); b++)
+			Crc += pItem->Data()[b];
+	}
+	return Crc;
+}
+
+void CSnapshot::DebugDump() const
+{
+	dbg_msg("snapshot", "data_size=%d num_items=%d", m_DataSize, m_NumItems);
+	for(int i = 0; i < m_NumItems; i++)
+	{
+		const CSnapshotItem *pItem = GetItem(i);
+		int Size = GetItemSize(i);
+		dbg_msg("snapshot", "\ttype=%d id=%d", pItem->Type(), pItem->ID());
+		for(size_t b = 0; b < Size / sizeof(int32_t); b++)
+			dbg_msg("snapshot", "\t\t%3d %12d\t%08x", (int)b, pItem->Data()[b], pItem->Data()[b]);
+	}
+}
+
+bool CSnapshot::IsValid(size_t ActualSize) const
+{
+	// validate total size
+	if(ActualSize < sizeof(CSnapshot) || m_NumItems < 0 || m_DataSize < 0 || ActualSize != TotalSize())
+		return false;
+
+	// validate item offsets
+	const int *pOffsets = Offsets();
+	for(int Index = 0; Index < m_NumItems; Index++)
+		if(pOffsets[Index] < 0 || pOffsets[Index] > m_DataSize)
+			return false;
+
+	// validate item sizes
+	for(int Index = 0; Index < m_NumItems; Index++)
+		if(GetItemSize(Index) < 0) // the offsets must be validated before using this
+			return false;
+
+	return true;
+}
+
+// CSnapshotDelta
+
+enum
+{
+	HASHLIST_SIZE = 256,
+	HASHLIST_BUCKET_SIZE = 64,
+};
+
+struct CItemList
+{
+	int m_Num;
+	int m_aKeys[HASHLIST_BUCKET_SIZE];
+	int m_aIndex[HASHLIST_BUCKET_SIZE];
+};
+
+inline size_t CalcHashID(int Key)
+{
+	// djb2 (http://www.cse.yorku.ca/~oz/hash.html)
+	unsigned Hash = 5381;
+	for(unsigned Shift = 0; Shift < sizeof(int); Shift++)
+		Hash = ((Hash << 5) + Hash) + ((Key >> (Shift * 8)) & 0xFF);
+	return Hash % HASHLIST_SIZE;
+}
+
+static void GenerateHash(CItemList *pHashlist, const CSnapshot *pSnapshot)
+{
+	for(int i = 0; i < HASHLIST_SIZE; i++)
+		pHashlist[i].m_Num = 0;
+
+	for(int i = 0; i < pSnapshot->NumItems(); i++)
+	{
+		int Key = pSnapshot->GetItem(i)->Key();
+		size_t HashID = CalcHashID(Key);
+		if(pHashlist[HashID].m_Num < HASHLIST_BUCKET_SIZE)
+		{
+			pHashlist[HashID].m_aIndex[pHashlist[HashID].m_Num] = i;
+			pHashlist[HashID].m_aKeys[pHashlist[HashID].m_Num] = Key;
+			pHashlist[HashID].m_Num++;
+		}
+	}
+}
+
+static int GetItemIndexHashed(int Key, const CItemList *pHashlist)
+{
+	size_t HashID = CalcHashID(Key);
+	for(int i = 0; i < pHashlist[HashID].m_Num; i++)
+	{
+		if(pHashlist[HashID].m_aKeys[i] == Key)
+			return pHashlist[HashID].m_aIndex[i];
+	}
+
+	return -1;
+}
+
+int CSnapshotDelta::DiffItem(const int *pPast, const int *pCurrent, int *pOut, int Size)
+{
+	int Needed = 0;
+	while(Size)
+	{
+		// subtraction with wrapping by casting to unsigned
+		*pOut = (unsigned)*pCurrent - (unsigned)*pPast;
+		Needed |= *pOut;
+		pOut++;
+		pPast++;
+		pCurrent++;
+		Size--;
+	}
+
+	return Needed;
+}
+
+void CSnapshotDelta::UndiffItem(const int *pPast, const int *pDiff, int *pOut, int Size, int *pDataRate)
+{
+	while(Size)
+	{
+		// addition with wrapping by casting to unsigned
+		*pOut = (unsigned)*pPast + (unsigned)*pDiff;
+
+		if(*pDiff == 0)
+			*pDataRate += 1;
+		else
+		{
+			unsigned char aBuf[CVariableInt::MAX_BYTES_PACKED];
+			unsigned char *pEnd = CVariableInt::Pack(aBuf, *pDiff, sizeof(aBuf));
+			*pDataRate += (int)(pEnd - (unsigned char *)aBuf) * 8;
+		}
+
+		pOut++;
+		pPast++;
+		pDiff++;
+		Size--;
+	}
+}
+
+CSnapshotDelta::CSnapshotDelta()
+{
+	mem_zero(m_aItemSizes, sizeof(m_aItemSizes));
+	mem_zero(m_aSnapshotDataRate, sizeof(m_aSnapshotDataRate));
+	mem_zero(m_aSnapshotDataUpdates, sizeof(m_aSnapshotDataUpdates));
+	mem_zero(&m_Empty, sizeof(m_Empty));
+}
+
+CSnapshotDelta::CSnapshotDelta(const CSnapshotDelta &Old)
+{
+	mem_copy(m_aItemSizes, Old.m_aItemSizes, sizeof(m_aItemSizes));
+	mem_copy(m_aSnapshotDataRate, Old.m_aSnapshotDataRate, sizeof(m_aSnapshotDataRate));
+	mem_copy(m_aSnapshotDataUpdates, Old.m_aSnapshotDataUpdates, sizeof(m_aSnapshotDataUpdates));
+	mem_zero(&m_Empty, sizeof(m_Empty));
+}
+
+void CSnapshotDelta::SetStaticsize(int ItemType, size_t Size)
+{
+	dbg_assert(ItemType >= 0 && ItemType < MAX_NETOBJSIZES, "ItemType invalid");
+	dbg_assert(Size <= (size_t)std::numeric_limits<int16_t>::max(), "Size invalid");
+	m_aItemSizes[ItemType] = Size;
+}
+
+const CSnapshotDelta::CData *CSnapshotDelta::EmptyDelta() const
+{
+	return &m_Empty;
+}
+
+// TODO: OPT: this should be made much faster
+int CSnapshotDelta::CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, void *pDstData)
+{
+	CData *pDelta = (CData *)pDstData;
+	int *pData = (int *)pDelta->m_aData;
+
+	pDelta->m_NumDeletedItems = 0;
+	pDelta->m_NumUpdateItems = 0;
+	pDelta->m_NumTempItems = 0;
+
+	CItemList aHashlist[HASHLIST_SIZE];
+	GenerateHash(aHashlist, pTo);
+
+	// pack deleted stuff
+	for(int i = 0; i < pFrom->NumItems(); i++)
+	{
+		const CSnapshotItem *pFromItem = pFrom->GetItem(i);
+		if(GetItemIndexHashed(pFromItem->Key(), aHashlist) == -1)
+		{
+			// deleted
+			pDelta->m_NumDeletedItems++;
+			*pData = pFromItem->Key();
+			pData++;
+		}
+	}
+
+	GenerateHash(aHashlist, pFrom);
+
+	// fetch previous indices
+	// we do this as a separate pass because it helps the cache
+	int aPastIndices[CSnapshot::MAX_ITEMS];
+	const int NumItems = pTo->NumItems();
+	for(int i = 0; i < NumItems; i++)
+	{
+		const CSnapshotItem *pCurItem = pTo->GetItem(i); // O(1) .. O(n)
+		aPastIndices[i] = GetItemIndexHashed(pCurItem->Key(), aHashlist); // O(n) .. O(n^n)
+	}
+
+	for(int i = 0; i < NumItems; i++)
+	{
+		// do delta
+		const int ItemSize = pTo->GetItemSize(i); // O(1) .. O(n)
+		const CSnapshotItem *pCurItem = pTo->GetItem(i); // O(1) .. O(n)
+		const int PastIndex = aPastIndices[i];
+		const bool IncludeSize = pCurItem->Type() >= MAX_NETOBJSIZES || !m_aItemSizes[pCurItem->Type()];
+
+		if(PastIndex != -1)
+		{
+			int *pItemDataDst = pData + 3;
+
+			const CSnapshotItem *pPastItem = pFrom->GetItem(PastIndex);
+
+			if(!IncludeSize)
+				pItemDataDst = pData + 2;
+
+			if(DiffItem(pPastItem->Data(), pCurItem->Data(), pItemDataDst, ItemSize / sizeof(int32_t)))
+			{
+				*pData++ = pCurItem->Type();
+				*pData++ = pCurItem->ID();
+				if(IncludeSize)
+					*pData++ = ItemSize / sizeof(int32_t);
+				pData += ItemSize / sizeof(int32_t);
+				pDelta->m_NumUpdateItems++;
+			}
+		}
+		else
+		{
+			*pData++ = pCurItem->Type();
+			*pData++ = pCurItem->ID();
+			if(IncludeSize)
+				*pData++ = ItemSize / sizeof(int32_t);
+
+			mem_copy(pData, pCurItem->Data(), ItemSize);
+			pData += ItemSize / sizeof(int32_t);
+			pDelta->m_NumUpdateItems++;
+		}
+	}
+
+	if(!pDelta->m_NumDeletedItems && !pDelta->m_NumUpdateItems && !pDelta->m_NumTempItems)
+		return 0;
+
+	return (int)((char *)pData - (char *)pDstData);
+}
+
+int CSnapshotDelta::UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize)
+{
+	CData *pDelta = (CData *)pSrcData;
+	int *pData = (int *)pDelta->m_aData;
+	int *pEnd = (int *)(((char *)pSrcData + DataSize));
+
+	CSnapshotBuilder Builder;
+	Builder.Init();
+
+	// unpack deleted stuff
+	int *pDeleted = pData;
+	if(pDelta->m_NumDeletedItems < 0)
+		return -201;
+	pData += pDelta->m_NumDeletedItems;
+	if(pData > pEnd)
+		return -101;
+
+	// copy all non deleted stuff
+	for(int i = 0; i < pFrom->NumItems(); i++)
+	{
+		const CSnapshotItem *pFromItem = pFrom->GetItem(i);
+		const int ItemSize = pFrom->GetItemSize(i);
+		bool Keep = true;
+		for(int d = 0; d < pDelta->m_NumDeletedItems; d++)
+		{
+			if(pDeleted[d] == pFromItem->Key())
+			{
+				Keep = false;
+				break;
+			}
+		}
+
+		if(Keep)
+		{
+			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+			if(!pObj)
+				return -301;
+
+			// keep it
+			mem_copy(pObj, pFromItem->Data(), ItemSize);
+		}
+	}
+
+	// unpack updated stuff
+	for(int i = 0; i < pDelta->m_NumUpdateItems; i++)
+	{
+		if(pData + 2 > pEnd)
+			return -102;
+
+		const int Type = *pData++;
+		if(Type < 0 || Type > CSnapshot::MAX_TYPE)
+			return -202;
+
+		const int ID = *pData++;
+		if(ID < 0 || ID > CSnapshot::MAX_ID)
+			return -203;
+
+		int ItemSize;
+		if(Type < MAX_NETOBJSIZES && m_aItemSizes[Type])
+			ItemSize = m_aItemSizes[Type];
+		else
+		{
+			if(pData + 1 > pEnd)
+				return -103;
+			if(*pData < 0 || (size_t)*pData > std::numeric_limits<int32_t>::max() / sizeof(int32_t))
+				return -204;
+			ItemSize = (*pData++) * sizeof(int32_t);
+		}
+
+		if(ItemSize < 0 || (const char *)pEnd - (const char *)pData < ItemSize)
+			return -205;
+
+		const int Key = (Type << 16) | ID;
+
+		// create the item if needed
+		int *pNewData = Builder.GetItemData(Key);
+		if(!pNewData)
+			pNewData = (int *)Builder.NewItem(Type, ID, ItemSize);
+
+		if(!pNewData)
+			return -302;
+
+		const int FromIndex = pFrom->GetItemIndex(Key);
+		if(FromIndex != -1)
+		{
+			// we got an update so we need to apply the diff
+			UndiffItem(pFrom->GetItem(FromIndex)->Data(), pData, pNewData, ItemSize / sizeof(int32_t), &m_aSnapshotDataRate[Type]);
+		}
+		else // no previous, just copy the pData
+		{
+			mem_copy(pNewData, pData, ItemSize);
+			m_aSnapshotDataRate[Type] += ItemSize * 8;
+		}
+		m_aSnapshotDataUpdates[Type]++;
+
+		pData += ItemSize / sizeof(int32_t);
+	}
+
+	// finish up
+	return Builder.Finish(pTo);
+}
+
+// CSnapshotStorage
+
+void CSnapshotStorage::Init()
+{
+	m_pFirst = nullptr;
+	m_pLast = nullptr;
+}
+
+void CSnapshotStorage::PurgeAll()
+{
+	while(m_pFirst)
+	{
+		CHolder *pNext = m_pFirst->m_pNext;
+		free(m_pFirst->m_pSnap);
+		free(m_pFirst->m_pAltSnap);
+		free(m_pFirst);
+		m_pFirst = pNext;
+	}
+	m_pLast = nullptr;
+}
+
+void CSnapshotStorage::PurgeUntil(int Tick)
+{
+	CHolder *pHolder = m_pFirst;
+
+	while(pHolder)
+	{
+		CHolder *pNext = pHolder->m_pNext;
+		if(pHolder->m_Tick >= Tick)
+			return; // no more to remove
+		free(pHolder->m_pSnap);
+		free(pHolder->m_pAltSnap);
+		free(pHolder);
+
+		// did we come to the end of the list?
+		if(!pNext)
+			break;
+
+		m_pFirst = pNext;
+		pNext->m_pPrev = nullptr;
+		pHolder = pNext;
+	}
+
+	// no more snapshots in storage
+	m_pFirst = nullptr;
+	m_pLast = nullptr;
+}
+
+void CSnapshotStorage::Add(int Tick, int64_t Tagtime, size_t DataSize, const void *pData, size_t AltDataSize, const void *pAltData)
+{
+	dbg_assert(DataSize <= (size_t)CSnapshot::MAX_SIZE, "Snapshot data size invalid");
+	dbg_assert(AltDataSize <= (size_t)CSnapshot::MAX_SIZE, "Alt snapshot data size invalid");
+
+	CHolder *pHolder = static_cast<CHolder *>(malloc(sizeof(CHolder)));
+	pHolder->m_Tick = Tick;
+	pHolder->m_Tagtime = Tagtime;
+
+	pHolder->m_pSnap = static_cast<CSnapshot *>(malloc(DataSize));
+	mem_copy(pHolder->m_pSnap, pData, DataSize);
+	pHolder->m_SnapSize = DataSize;
+
+	if(AltDataSize) // create alternative if wanted
+	{
+		pHolder->m_pAltSnap = static_cast<CSnapshot *>(malloc(AltDataSize));
+		mem_copy(pHolder->m_pAltSnap, pAltData, AltDataSize);
+		pHolder->m_AltSnapSize = AltDataSize;
+	}
+	else
+	{
+		pHolder->m_pAltSnap = nullptr;
+		pHolder->m_AltSnapSize = 0;
+	}
+
+	// link
+	pHolder->m_pNext = nullptr;
+	pHolder->m_pPrev = m_pLast;
+	if(m_pLast)
+		m_pLast->m_pNext = pHolder;
+	else
+		m_pFirst = pHolder;
+	m_pLast = pHolder;
+}
+
+int CSnapshotStorage::Get(int Tick, int64_t *pTagtime, const CSnapshot **ppData, const CSnapshot **ppAltData) const
+{
+	CHolder *pHolder = m_pFirst;
+
+	while(pHolder)
+	{
+		if(pHolder->m_Tick == Tick)
+		{
+			if(pTagtime)
+				*pTagtime = pHolder->m_Tagtime;
+			if(ppData)
+				*ppData = pHolder->m_pSnap;
+			if(ppAltData)
+				*ppAltData = pHolder->m_pAltSnap;
+			return pHolder->m_SnapSize;
+		}
+
+		pHolder = pHolder->m_pNext;
+	}
+
+	return -1;
+}
+
+// CSnapshotBuilder
+CSnapshotBuilder::CSnapshotBuilder()
+{
+	m_NumExtendedItemTypes = 0;
+}
+
+void CSnapshotBuilder::Init(bool Sixup)
+{
+	m_DataSize = 0;
+	m_NumItems = 0;
+	m_Sixup = Sixup;
+
+	for(int i = 0; i < m_NumExtendedItemTypes; i++)
+	{
+		AddExtendedItemType(i);
+	}
+}
+
+CSnapshotItem *CSnapshotBuilder::GetItem(int Index)
+{
+	return (CSnapshotItem *)&(m_aData[m_aOffsets[Index]]);
+}
+
+int *CSnapshotBuilder::GetItemData(int Key)
+{
+	for(int i = 0; i < m_NumItems; i++)
+	{
+		if(GetItem(i)->Key() == Key)
+			return GetItem(i)->Data();
+	}
+	return nullptr;
+}
+
+int CSnapshotBuilder::Finish(void *pSnapData)
+{
+	// flatten and make the snapshot
+	CSnapshot *pSnap = (CSnapshot *)pSnapData;
+	pSnap->m_DataSize = m_DataSize;
+	pSnap->m_NumItems = m_NumItems;
+	mem_copy(pSnap->Offsets(), m_aOffsets, pSnap->OffsetSize());
+	mem_copy(pSnap->DataStart(), m_aData, m_DataSize);
+	return pSnap->TotalSize();
+}
+
+int CSnapshotBuilder::GetTypeFromIndex(int Index) const
+{
+	return CSnapshot::MAX_TYPE - Index;
+}
+
+void CSnapshotBuilder::AddExtendedItemType(int Index)
+{
+	dbg_assert(0 <= Index && Index < m_NumExtendedItemTypes, "index out of range");
+	int TypeID = m_aExtendedItemTypes[Index];
+	CUuid Uuid = g_UuidManager.GetUuid(TypeID);
+	int *pUuidItem = (int *)NewItem(0, GetTypeFromIndex(Index), sizeof(Uuid)); // NETOBJTYPE_EX
+	if(pUuidItem)
+	{
+		for(size_t i = 0; i < sizeof(CUuid) / sizeof(int32_t); i++)
+			pUuidItem[i] = bytes_be_to_uint(&Uuid.m_aData[i * sizeof(int32_t)]);
+	}
+}
+
+int CSnapshotBuilder::GetExtendedItemTypeIndex(int TypeID)
+{
+	for(int i = 0; i < m_NumExtendedItemTypes; i++)
+	{
+		if(m_aExtendedItemTypes[i] == TypeID)
+		{
+			return i;
+		}
+	}
+	dbg_assert(m_NumExtendedItemTypes < MAX_EXTENDED_ITEM_TYPES, "too many extended item types");
+	int Index = m_NumExtendedItemTypes;
+	m_aExtendedItemTypes[Index] = TypeID;
+	m_NumExtendedItemTypes++;
+	return Index;
+}
+
+void *CSnapshotBuilder::NewItem(int Type, int ID, int Size)
+{
+	if(ID == -1)
+	{
+		return nullptr;
+	}
+
+	if(m_DataSize + sizeof(CSnapshotItem) + Size >= CSnapshot::MAX_SIZE ||
+		m_NumItems + 1 >= CSnapshot::MAX_ITEMS)
+	{
+		dbg_assert(m_DataSize < CSnapshot::MAX_SIZE, "too much data");
+		dbg_assert(m_NumItems < CSnapshot::MAX_ITEMS, "too many items");
+		return nullptr;
+	}
+
+	bool Extended = false;
+	if(Type >= OFFSET_UUID)
+	{
+		Extended = true;
+		Type = GetTypeFromIndex(GetExtendedItemTypeIndex(Type));
+	}
+
+	CSnapshotItem *pObj = (CSnapshotItem *)(m_aData + m_DataSize);
+
+	if(m_Sixup && !Extended)
+	{
+		if(Type >= 0)
+			Type = Obj_SixToSeven(Type);
+		else
+			Type *= -1;
+
+		if(Type < 0)
+			return pObj;
+	}
+	else if(Type < 0)
+		return nullptr;
+
+	mem_zero(pObj, sizeof(CSnapshotItem) + Size);
+	pObj->m_TypeAndID = (Type << 16) | ID;
+	m_aOffsets[m_NumItems] = m_DataSize;
+	m_DataSize += sizeof(CSnapshotItem) + Size;
+	m_NumItems++;
+
+	return pObj->Data();
+}
diff --git a/src_bkp/engine/shared/snapshot.h b/src_bkp/engine/shared/snapshot.h
new file mode 100644
index 0000000000..6947db1bce
--- /dev/null
+++ b/src_bkp/engine/shared/snapshot.h
@@ -0,0 +1,172 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SHARED_SNAPSHOT_H
+#define ENGINE_SHARED_SNAPSHOT_H
+
+#include <cstddef>
+#include <cstdint>
+
+// CSnapshot
+
+class CSnapshotItem
+{
+	friend class CSnapshotBuilder;
+
+	int *Data() { return (int *)(this + 1); }
+
+public:
+	int m_TypeAndID;
+
+	const int *Data() const { return (int *)(this + 1); }
+	int Type() const { return m_TypeAndID >> 16; }
+	int ID() const { return m_TypeAndID & 0xffff; }
+	int Key() const { return m_TypeAndID; }
+};
+
+class CSnapshot
+{
+	friend class CSnapshotBuilder;
+	int m_DataSize = 0;
+	int m_NumItems = 0;
+
+	int *Offsets() const { return (int *)(this + 1); }
+	char *DataStart() const { return (char *)(Offsets() + m_NumItems); }
+
+	size_t OffsetSize() const { return sizeof(int) * m_NumItems; }
+	size_t TotalSize() const { return sizeof(CSnapshot) + OffsetSize() + m_DataSize; }
+
+	static const CSnapshot ms_EmptySnapshot;
+
+public:
+	enum
+	{
+		OFFSET_UUID_TYPE = 0x4000,
+		MAX_TYPE = 0x7fff,
+		MAX_ID = 0xffff,
+		MAX_ITEMS = 1024,
+		MAX_PARTS = 64,
+		MAX_SIZE = MAX_PARTS * 1024
+	};
+
+	int NumItems() const { return m_NumItems; }
+	const CSnapshotItem *GetItem(int Index) const;
+	int GetItemSize(int Index) const;
+	int GetItemIndex(int Key) const;
+	int GetItemType(int Index) const;
+	int GetExternalItemType(int InternalType) const;
+	const void *FindItem(int Type, int ID) const;
+
+	unsigned Crc() const;
+	void DebugDump() const;
+	bool IsValid(size_t ActualSize) const;
+
+	static const CSnapshot *EmptySnapshot() { return &ms_EmptySnapshot; }
+};
+
+// CSnapshotDelta
+
+class CSnapshotDelta
+{
+public:
+	class CData
+	{
+	public:
+		int m_NumDeletedItems;
+		int m_NumUpdateItems;
+		int m_NumTempItems; // needed?
+		int m_aData[1];
+	};
+
+private:
+	enum
+	{
+		MAX_NETOBJSIZES = 64
+	};
+	short m_aItemSizes[MAX_NETOBJSIZES];
+	int m_aSnapshotDataRate[CSnapshot::MAX_TYPE + 1];
+	int m_aSnapshotDataUpdates[CSnapshot::MAX_TYPE + 1];
+	CData m_Empty;
+
+	static void UndiffItem(const int *pPast, const int *pDiff, int *pOut, int Size, int *pDataRate);
+
+public:
+	static int DiffItem(const int *pPast, const int *pCurrent, int *pOut, int Size);
+	CSnapshotDelta();
+	CSnapshotDelta(const CSnapshotDelta &Old);
+	int GetDataRate(int Index) const { return m_aSnapshotDataRate[Index]; }
+	int GetDataUpdates(int Index) const { return m_aSnapshotDataUpdates[Index]; }
+	void SetStaticsize(int ItemType, size_t Size);
+	const CData *EmptyDelta() const;
+	int CreateDelta(const CSnapshot *pFrom, const CSnapshot *pTo, void *pDstData);
+	int UnpackDelta(const CSnapshot *pFrom, CSnapshot *pTo, const void *pSrcData, int DataSize);
+};
+
+// CSnapshotStorage
+
+class CSnapshotStorage
+{
+public:
+	class CHolder
+	{
+	public:
+		CHolder *m_pPrev;
+		CHolder *m_pNext;
+
+		int64_t m_Tagtime;
+		int m_Tick;
+
+		int m_SnapSize;
+		int m_AltSnapSize;
+
+		CSnapshot *m_pSnap;
+		CSnapshot *m_pAltSnap;
+	};
+
+	CHolder *m_pFirst;
+	CHolder *m_pLast;
+
+	CSnapshotStorage() { Init(); }
+	~CSnapshotStorage() { PurgeAll(); }
+	void Init();
+	void PurgeAll();
+	void PurgeUntil(int Tick);
+	void Add(int Tick, int64_t Tagtime, size_t DataSize, const void *pData, size_t AltDataSize, const void *pAltData);
+	int Get(int Tick, int64_t *pTagtime, const CSnapshot **ppData, const CSnapshot **ppAltData) const;
+};
+
+class CSnapshotBuilder
+{
+	enum
+	{
+		MAX_EXTENDED_ITEM_TYPES = 64,
+	};
+
+	char m_aData[CSnapshot::MAX_SIZE];
+	int m_DataSize;
+
+	int m_aOffsets[CSnapshot::MAX_ITEMS];
+	int m_NumItems;
+
+	int m_aExtendedItemTypes[MAX_EXTENDED_ITEM_TYPES];
+	int m_NumExtendedItemTypes;
+
+	void AddExtendedItemType(int Index);
+	int GetExtendedItemTypeIndex(int TypeID);
+	int GetTypeFromIndex(int Index) const;
+
+	bool m_Sixup;
+
+public:
+	CSnapshotBuilder();
+
+	void Init(bool Sixup = false);
+
+	void *NewItem(int Type, int ID, int Size);
+
+	CSnapshotItem *GetItem(int Index);
+	int *GetItemData(int Key);
+
+	int Finish(void *pSnapdata);
+};
+
+#endif // ENGINE_SNAPSHOT_H
diff --git a/src_bkp/engine/shared/storage.cpp b/src_bkp/engine/shared/storage.cpp
new file mode 100644
index 0000000000..3782830a66
--- /dev/null
+++ b/src_bkp/engine/shared/storage.cpp
@@ -0,0 +1,920 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/hash_ctxt.h>
+#include <base/log.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/client/updater.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+
+#include <unordered_set>
+
+#ifdef CONF_PLATFORM_HAIKU
+#include <cstdlib>
+#endif
+
+#include <zlib.h>
+
+class CStorage : public IStorage
+{
+public:
+	char m_aaStoragePaths[MAX_PATHS][IO_MAX_PATH_LENGTH];
+	int m_NumPaths;
+	char m_aDatadir[IO_MAX_PATH_LENGTH];
+	char m_aUserdir[IO_MAX_PATH_LENGTH];
+	char m_aCurrentdir[IO_MAX_PATH_LENGTH];
+	char m_aBinarydir[IO_MAX_PATH_LENGTH];
+
+	CStorage()
+	{
+		mem_zero(m_aaStoragePaths, sizeof(m_aaStoragePaths));
+		m_NumPaths = 0;
+		m_aDatadir[0] = '\0';
+		m_aUserdir[0] = '\0';
+		m_aCurrentdir[0] = '\0';
+		m_aBinarydir[0] = '\0';
+	}
+
+	int Init(int StorageType, int NumArgs, const char **ppArguments)
+	{
+#if !defined(CONF_PLATFORM_ANDROID)
+		// get userdir, just use data directory on android
+		char aFallbackUserdir[IO_MAX_PATH_LENGTH];
+		if(fs_storage_path("DDNet", m_aUserdir, sizeof(m_aUserdir)))
+		{
+			log_error("storage", "could not determine user directory");
+		}
+		if(fs_storage_path("Teeworlds", aFallbackUserdir, sizeof(aFallbackUserdir)))
+		{
+			log_error("storage", "could not determine fallback user directory");
+		}
+
+		if((m_aUserdir[0] == '\0' || !fs_is_dir(m_aUserdir)) && aFallbackUserdir[0] != '\0' && fs_is_dir(aFallbackUserdir))
+		{
+			str_copy(m_aUserdir, aFallbackUserdir);
+		}
+#endif
+
+		// get datadir
+		FindDatadir(ppArguments[0]);
+
+		// get binarydir
+		FindBinarydir(ppArguments[0]);
+
+		// get currentdir
+		if(!fs_getcwd(m_aCurrentdir, sizeof(m_aCurrentdir)))
+		{
+			log_error("storage", "could not determine current directory");
+		}
+
+		// load paths from storage.cfg
+		LoadPaths(ppArguments[0]);
+
+		if(!m_NumPaths)
+		{
+			dbg_msg("storage", "using standard paths");
+			AddDefaultPaths();
+		}
+
+		// add save directories
+		if(StorageType != STORAGETYPE_BASIC && m_NumPaths && (!m_aaStoragePaths[TYPE_SAVE][0] || fs_makedir_rec_for(m_aaStoragePaths[TYPE_SAVE]) || !fs_makedir(m_aaStoragePaths[TYPE_SAVE])))
+		{
+			if(StorageType == STORAGETYPE_CLIENT)
+			{
+				CreateFolder("screenshots", TYPE_SAVE);
+				CreateFolder("screenshots/auto", TYPE_SAVE);
+				CreateFolder("screenshots/auto/stats", TYPE_SAVE);
+				CreateFolder("maps", TYPE_SAVE);
+				CreateFolder("maps/auto", TYPE_SAVE);
+				CreateFolder("mapres", TYPE_SAVE);
+				CreateFolder("downloadedmaps", TYPE_SAVE);
+				CreateFolder("skins", TYPE_SAVE);
+				CreateFolder("downloadedskins", TYPE_SAVE);
+				CreateFolder("themes", TYPE_SAVE);
+				CreateFolder("communityicons", TYPE_SAVE);
+				CreateFolder("assets", TYPE_SAVE);
+				CreateFolder("assets/emoticons", TYPE_SAVE);
+				CreateFolder("assets/entities", TYPE_SAVE);
+				CreateFolder("assets/game", TYPE_SAVE);
+				CreateFolder("assets/particles", TYPE_SAVE);
+				CreateFolder("assets/hud", TYPE_SAVE);
+				CreateFolder("assets/extras", TYPE_SAVE);
+#if defined(CONF_VIDEORECORDER)
+				CreateFolder("videos", TYPE_SAVE);
+#endif
+			}
+			CreateFolder("dumps", TYPE_SAVE);
+			CreateFolder("demos", TYPE_SAVE);
+			CreateFolder("demos/auto", TYPE_SAVE);
+			CreateFolder("demos/auto/race", TYPE_SAVE);
+			CreateFolder("demos/replays", TYPE_SAVE);
+			CreateFolder("editor", TYPE_SAVE);
+			CreateFolder("ghosts", TYPE_SAVE);
+			CreateFolder("teehistorian", TYPE_SAVE);
+		}
+
+		return m_NumPaths ? 0 : 1;
+	}
+
+	void LoadPaths(const char *pArgv0)
+	{
+		// check current directory
+		IOHANDLE File = io_open("storage.cfg", IOFLAG_READ | IOFLAG_SKIP_BOM);
+		if(!File)
+		{
+			// check usable path in argv[0]
+			unsigned int Pos = ~0U;
+			for(unsigned i = 0; pArgv0[i]; i++)
+				if(pArgv0[i] == '/' || pArgv0[i] == '\\')
+					Pos = i;
+			if(Pos < IO_MAX_PATH_LENGTH)
+			{
+				char aBuffer[IO_MAX_PATH_LENGTH];
+				str_copy(aBuffer, pArgv0, Pos + 1);
+				str_append(aBuffer, "/storage.cfg");
+				File = io_open(aBuffer, IOFLAG_READ | IOFLAG_SKIP_BOM);
+			}
+
+			if(Pos >= IO_MAX_PATH_LENGTH || !File)
+			{
+				dbg_msg("storage", "couldn't open storage.cfg");
+				return;
+			}
+		}
+
+		CLineReader LineReader;
+		LineReader.Init(File);
+
+		char *pLine;
+		while((pLine = LineReader.Get()))
+		{
+			const char *pLineWithoutPrefix = str_startswith(pLine, "add_path ");
+			if(pLineWithoutPrefix)
+			{
+				AddPath(pLineWithoutPrefix);
+			}
+		}
+
+		io_close(File);
+
+		if(!m_NumPaths)
+			dbg_msg("storage", "no paths found in storage.cfg");
+	}
+
+	void AddDefaultPaths()
+	{
+		AddPath("$USERDIR");
+		AddPath("$DATADIR");
+		AddPath("$CURRENTDIR");
+	}
+
+	void AddPath(const char *pPath)
+	{
+		if(!pPath[0])
+		{
+			log_error("storage", "cannot add empty path");
+			return;
+		}
+		if(m_NumPaths >= MAX_PATHS)
+		{
+			log_error("storage", "cannot add path '%s', the maximum number of paths is %d", pPath, MAX_PATHS);
+			return;
+		}
+
+		if(!str_comp(pPath, "$USERDIR"))
+		{
+			if(m_aUserdir[0])
+			{
+				str_copy(m_aaStoragePaths[m_NumPaths++], m_aUserdir);
+				dbg_msg("storage", "added path '$USERDIR' ('%s')", m_aUserdir);
+			}
+			else
+			{
+				log_error("storage", "cannot add path '$USERDIR' because it could not be determined");
+			}
+		}
+		else if(!str_comp(pPath, "$DATADIR"))
+		{
+			if(m_aDatadir[0])
+			{
+				str_copy(m_aaStoragePaths[m_NumPaths++], m_aDatadir);
+				dbg_msg("storage", "added path '$DATADIR' ('%s')", m_aDatadir);
+			}
+			else
+			{
+				log_error("storage", "cannot add path '$DATADIR' because it could not be determined");
+			}
+		}
+		else if(!str_comp(pPath, "$CURRENTDIR"))
+		{
+			m_aaStoragePaths[m_NumPaths++][0] = '\0';
+			dbg_msg("storage", "added path '$CURRENTDIR' ('%s')", m_aCurrentdir);
+		}
+		else if(str_utf8_check(pPath))
+		{
+			if(fs_is_dir(pPath))
+			{
+				str_copy(m_aaStoragePaths[m_NumPaths++], pPath);
+				dbg_msg("storage", "added path '%s'", pPath);
+			}
+			else
+			{
+				log_error("storage", "cannot add path '%s', which is not a directory", pPath);
+			}
+		}
+		else
+		{
+			log_error("storage", "cannot add path containing invalid UTF-8");
+		}
+	}
+
+	void FindDatadir(const char *pArgv0)
+	{
+		// 1) use data-dir in PWD if present
+		if(fs_is_dir("data/mapres"))
+		{
+			str_copy(m_aDatadir, "data");
+			return;
+		}
+
+#if defined(DATA_DIR)
+		// 2) use compiled-in data-dir if present
+		if(fs_is_dir(DATA_DIR "/mapres"))
+		{
+			str_copy(m_aDatadir, DATA_DIR, sizeof(m_aDatadir));
+			return;
+		}
+#endif
+
+		// 3) check for usable path in argv[0]
+		{
+#ifdef CONF_PLATFORM_HAIKU
+			pArgv0 = realpath(pArgv0, NULL);
+#endif
+			unsigned int Pos = ~0U;
+			for(unsigned i = 0; pArgv0[i]; i++)
+				if(pArgv0[i] == '/' || pArgv0[i] == '\\')
+					Pos = i;
+
+			if(Pos < IO_MAX_PATH_LENGTH)
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				char aDir[IO_MAX_PATH_LENGTH];
+				str_copy(aDir, pArgv0, Pos + 1);
+				str_format(aBuf, sizeof(aBuf), "%s/data/mapres", aDir);
+				if(fs_is_dir(aBuf))
+				{
+					str_format(m_aDatadir, sizeof(m_aDatadir), "%s/data", aDir);
+					return;
+				}
+			}
+		}
+#ifdef CONF_PLATFORM_HAIKU
+		free((void *)pArgv0);
+#endif
+
+#if defined(CONF_FAMILY_UNIX)
+		// 4) check for all default locations
+		{
+			const char *apDirs[] = {
+				"/usr/share/ddnet",
+				"/usr/share/games/ddnet",
+				"/usr/local/share/ddnet",
+				"/usr/local/share/games/ddnet",
+				"/usr/pkg/share/ddnet",
+				"/usr/pkg/share/games/ddnet",
+				"/opt/ddnet"};
+
+			for(const char *pDir : apDirs)
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "%s/data/mapres", pDir);
+				if(fs_is_dir(aBuf))
+				{
+					str_format(m_aDatadir, sizeof(m_aDatadir), "%s/data", pDir);
+					return;
+				}
+			}
+		}
+#endif
+
+		dbg_msg("storage", "warning: no data directory found");
+	}
+
+	void FindBinarydir(const char *pArgv0)
+	{
+#if defined(BINARY_DIR)
+		str_copy(m_aBinarydir, BINARY_DIR, sizeof(m_aBinarydir));
+		return;
+#endif
+
+		// check for usable path in argv[0]
+		{
+			unsigned int Pos = ~0U;
+			for(unsigned i = 0; pArgv0[i]; i++)
+				if(pArgv0[i] == '/' || pArgv0[i] == '\\')
+					Pos = i;
+
+			if(Pos < IO_MAX_PATH_LENGTH)
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				str_copy(m_aBinarydir, pArgv0, Pos + 1);
+				str_format(aBuf, sizeof(aBuf), "%s/" PLAT_SERVER_EXEC, m_aBinarydir);
+				if(fs_is_file(aBuf))
+				{
+					return;
+				}
+#if defined(CONF_PLATFORM_MACOS)
+				str_append(m_aBinarydir, "/../../../DDNet-Server.app/Contents/MacOS");
+				str_format(aBuf, sizeof(aBuf), "%s/" PLAT_SERVER_EXEC, m_aBinarydir);
+				if(fs_is_file(aBuf))
+				{
+					return;
+				}
+#endif
+			}
+		}
+
+		// no binary directory found, use $PATH on Posix, $PWD on Windows
+		m_aBinarydir[0] = '\0';
+	}
+
+	int NumPaths() const override
+	{
+		return m_NumPaths;
+	}
+
+	struct SListDirectoryInfoUniqueCallbackData
+	{
+		FS_LISTDIR_CALLBACK_FILEINFO m_pfnDelegate;
+		void *m_pDelegateUser;
+		std::unordered_set<std::string> m_Seen;
+	};
+
+	static int ListDirectoryInfoUniqueCallback(const CFsFileInfo *pInfo, int IsDir, int Type, void *pUser)
+	{
+		SListDirectoryInfoUniqueCallbackData *pData = static_cast<SListDirectoryInfoUniqueCallbackData *>(pUser);
+		auto [_, InsertionTookPlace] = pData->m_Seen.emplace(pInfo->m_pName);
+		if(InsertionTookPlace)
+			return pData->m_pfnDelegate(pInfo, IsDir, Type, pData->m_pDelegateUser);
+		return 0;
+	}
+
+	void ListDirectoryInfo(int Type, const char *pPath, FS_LISTDIR_CALLBACK_FILEINFO pfnCallback, void *pUser) override
+	{
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		if(Type == TYPE_ALL)
+		{
+			SListDirectoryInfoUniqueCallbackData Data;
+			Data.m_pfnDelegate = pfnCallback;
+			Data.m_pDelegateUser = pUser;
+			// list all available directories
+			for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+				fs_listdir_fileinfo(GetPath(i, pPath, aBuffer, sizeof(aBuffer)), ListDirectoryInfoUniqueCallback, i, &Data);
+		}
+		else if(Type >= TYPE_SAVE && Type < m_NumPaths)
+		{
+			// list wanted directory
+			fs_listdir_fileinfo(GetPath(Type, pPath, aBuffer, sizeof(aBuffer)), pfnCallback, Type, pUser);
+		}
+		else
+		{
+			dbg_assert(false, "Type invalid");
+		}
+	}
+
+	struct SListDirectoryUniqueCallbackData
+	{
+		FS_LISTDIR_CALLBACK m_pfnDelegate;
+		void *m_pDelegateUser;
+		std::unordered_set<std::string> m_Seen;
+	};
+
+	static int ListDirectoryUniqueCallback(const char *pName, int IsDir, int Type, void *pUser)
+	{
+		SListDirectoryUniqueCallbackData *pData = static_cast<SListDirectoryUniqueCallbackData *>(pUser);
+		auto [_, InsertionTookPlace] = pData->m_Seen.emplace(pName);
+		if(InsertionTookPlace)
+			return pData->m_pfnDelegate(pName, IsDir, Type, pData->m_pDelegateUser);
+		return 0;
+	}
+
+	void ListDirectory(int Type, const char *pPath, FS_LISTDIR_CALLBACK pfnCallback, void *pUser) override
+	{
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		if(Type == TYPE_ALL)
+		{
+			SListDirectoryUniqueCallbackData Data;
+			Data.m_pfnDelegate = pfnCallback;
+			Data.m_pDelegateUser = pUser;
+			// list all available directories
+			for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+				fs_listdir(GetPath(i, pPath, aBuffer, sizeof(aBuffer)), ListDirectoryUniqueCallback, i, &Data);
+		}
+		else if(Type >= TYPE_SAVE && Type < m_NumPaths)
+		{
+			// list wanted directory
+			fs_listdir(GetPath(Type, pPath, aBuffer, sizeof(aBuffer)), pfnCallback, Type, pUser);
+		}
+		else
+		{
+			dbg_assert(false, "Type invalid");
+		}
+	}
+
+	const char *GetPath(int Type, const char *pDir, char *pBuffer, unsigned BufferSize)
+	{
+		if(Type == TYPE_ABSOLUTE)
+		{
+			str_copy(pBuffer, pDir, BufferSize);
+		}
+		else
+		{
+			str_format(pBuffer, BufferSize, "%s%s%s", m_aaStoragePaths[Type], !m_aaStoragePaths[Type][0] ? "" : "/", pDir);
+		}
+		return pBuffer;
+	}
+
+	void TranslateType(int &Type, const char *pPath)
+	{
+		if(Type == TYPE_SAVE_OR_ABSOLUTE)
+			Type = fs_is_relative_path(pPath) ? TYPE_SAVE : TYPE_ABSOLUTE;
+		else if(Type == TYPE_ALL_OR_ABSOLUTE)
+			Type = fs_is_relative_path(pPath) ? TYPE_ALL : TYPE_ABSOLUTE;
+	}
+
+	IOHANDLE OpenFile(const char *pFilename, int Flags, int Type, char *pBuffer = 0, int BufferSize = 0) override
+	{
+		TranslateType(Type, pFilename);
+
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		if(!pBuffer)
+		{
+			pBuffer = aBuffer;
+			BufferSize = sizeof(aBuffer);
+		}
+
+		if(Type == TYPE_ABSOLUTE)
+		{
+			return io_open(GetPath(TYPE_ABSOLUTE, pFilename, pBuffer, BufferSize), Flags);
+		}
+		if(str_startswith(pFilename, "mapres/../skins/"))
+		{
+			pFilename = pFilename + 10; // just start from skins/
+		}
+		if(pFilename[0] == '/' || pFilename[0] == '\\' || str_find(pFilename, "../") != NULL || str_find(pFilename, "..\\") != NULL
+#ifdef CONF_FAMILY_WINDOWS
+			|| (pFilename[0] && pFilename[1] == ':')
+#endif
+		)
+		{
+			// don't escape base directory
+		}
+		else if(Flags & IOFLAG_WRITE)
+		{
+			return io_open(GetPath(TYPE_SAVE, pFilename, pBuffer, BufferSize), Flags);
+		}
+		else
+		{
+			if(Type == TYPE_ALL)
+			{
+				// check all available directories
+				for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+				{
+					IOHANDLE Handle = io_open(GetPath(i, pFilename, pBuffer, BufferSize), Flags);
+					if(Handle)
+						return Handle;
+				}
+			}
+			else if(Type >= TYPE_SAVE && Type < m_NumPaths)
+			{
+				// check wanted directory
+				IOHANDLE Handle = io_open(GetPath(Type, pFilename, pBuffer, BufferSize), Flags);
+				if(Handle)
+					return Handle;
+			}
+			else
+			{
+				dbg_assert(false, "Type invalid");
+			}
+		}
+
+		pBuffer[0] = 0;
+		return 0;
+	}
+
+	template<typename F>
+	bool GenericExists(const char *pFilename, int Type, F &&CheckFunction)
+	{
+		TranslateType(Type, pFilename);
+
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		if(Type == TYPE_ALL)
+		{
+			// check all available directories
+			for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+			{
+				if(CheckFunction(GetPath(i, pFilename, aBuffer, sizeof(aBuffer))))
+					return true;
+			}
+			return false;
+		}
+		else if(Type == TYPE_ABSOLUTE || (Type >= TYPE_SAVE && Type < m_NumPaths))
+		{
+			// check wanted directory
+			return CheckFunction(GetPath(Type, pFilename, aBuffer, sizeof(aBuffer)));
+		}
+		else
+		{
+			dbg_assert(false, "Type invalid");
+			return false;
+		}
+	}
+
+	bool FileExists(const char *pFilename, int Type) override
+	{
+		return GenericExists(pFilename, Type, fs_is_file);
+	}
+
+	bool FolderExists(const char *pFilename, int Type) override
+	{
+		return GenericExists(pFilename, Type, fs_is_dir);
+	}
+
+	bool ReadFile(const char *pFilename, int Type, void **ppResult, unsigned *pResultLen) override
+	{
+		IOHANDLE File = OpenFile(pFilename, IOFLAG_READ, Type);
+		if(!File)
+		{
+			*ppResult = nullptr;
+			*pResultLen = 0;
+			return false;
+		}
+		io_read_all(File, ppResult, pResultLen);
+		io_close(File);
+		return true;
+	}
+
+	char *ReadFileStr(const char *pFilename, int Type) override
+	{
+		IOHANDLE File = OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, Type);
+		if(!File)
+			return nullptr;
+		char *pResult = io_read_all_str(File);
+		io_close(File);
+		return pResult;
+	}
+
+	bool CalculateHashes(const char *pFilename, int Type, SHA256_DIGEST *pSha256, unsigned *pCrc) override
+	{
+		dbg_assert(pSha256 != nullptr || pCrc != nullptr, "At least one output argument required");
+
+		IOHANDLE File = OpenFile(pFilename, IOFLAG_READ, Type);
+		if(!File)
+			return false;
+
+		SHA256_CTX Sha256Ctxt;
+		if(pSha256 != nullptr)
+			sha256_init(&Sha256Ctxt);
+		if(pCrc != nullptr)
+			*pCrc = 0;
+		unsigned char aBuffer[64 * 1024];
+		while(true)
+		{
+			unsigned Bytes = io_read(File, aBuffer, sizeof(aBuffer));
+			if(Bytes == 0)
+				break;
+			if(pSha256 != nullptr)
+				sha256_update(&Sha256Ctxt, aBuffer, Bytes);
+			if(pCrc != nullptr)
+				*pCrc = crc32(*pCrc, aBuffer, Bytes);
+		}
+		if(pSha256 != nullptr)
+			*pSha256 = sha256_finish(&Sha256Ctxt);
+
+		io_close(File);
+		return true;
+	}
+
+	struct CFindCBData
+	{
+		CStorage *m_pStorage;
+		const char *m_pFilename;
+		const char *m_pPath;
+		char *m_pBuffer;
+		int m_BufferSize;
+	};
+
+	static int FindFileCallback(const char *pName, int IsDir, int Type, void *pUser)
+	{
+		CFindCBData Data = *static_cast<CFindCBData *>(pUser);
+		if(IsDir)
+		{
+			if(pName[0] == '.')
+				return 0;
+
+			// search within the folder
+			char aBuf[IO_MAX_PATH_LENGTH];
+			char aPath[IO_MAX_PATH_LENGTH];
+			str_format(aPath, sizeof(aPath), "%s/%s", Data.m_pPath, pName);
+			Data.m_pPath = aPath;
+			fs_listdir(Data.m_pStorage->GetPath(Type, aPath, aBuf, sizeof(aBuf)), FindFileCallback, Type, &Data);
+			if(Data.m_pBuffer[0])
+				return 1;
+		}
+		else if(!str_comp(pName, Data.m_pFilename))
+		{
+			// found the file = end
+			str_format(Data.m_pBuffer, Data.m_BufferSize, "%s/%s", Data.m_pPath, Data.m_pFilename);
+			return 1;
+		}
+
+		return 0;
+	}
+
+	bool FindFile(const char *pFilename, const char *pPath, int Type, char *pBuffer, int BufferSize) override
+	{
+		dbg_assert(BufferSize >= 1, "BufferSize invalid");
+
+		pBuffer[0] = 0;
+
+		CFindCBData Data;
+		Data.m_pStorage = this;
+		Data.m_pFilename = pFilename;
+		Data.m_pPath = pPath;
+		Data.m_pBuffer = pBuffer;
+		Data.m_BufferSize = BufferSize;
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		if(Type == TYPE_ALL)
+		{
+			// search within all available directories
+			for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+			{
+				fs_listdir(GetPath(i, pPath, aBuf, sizeof(aBuf)), FindFileCallback, i, &Data);
+				if(pBuffer[0])
+					return true;
+			}
+		}
+		else if(Type >= TYPE_SAVE && Type < m_NumPaths)
+		{
+			// search within wanted directory
+			fs_listdir(GetPath(Type, pPath, aBuf, sizeof(aBuf)), FindFileCallback, Type, &Data);
+		}
+		else
+		{
+			dbg_assert(false, "Type invalid");
+		}
+
+		return pBuffer[0] != 0;
+	}
+
+	struct SFindFilesCallbackData
+	{
+		CStorage *m_pStorage;
+		const char *m_pFilename;
+		const char *m_pPath;
+		std::set<std::string> *m_pEntries;
+	};
+
+	static int FindFilesCallback(const char *pName, int IsDir, int Type, void *pUser)
+	{
+		SFindFilesCallbackData Data = *static_cast<SFindFilesCallbackData *>(pUser);
+		if(IsDir)
+		{
+			if(pName[0] == '.')
+				return 0;
+
+			// search within the folder
+			char aBuf[IO_MAX_PATH_LENGTH];
+			char aPath[IO_MAX_PATH_LENGTH];
+			str_format(aPath, sizeof(aPath), "%s/%s", Data.m_pPath, pName);
+			Data.m_pPath = aPath;
+			fs_listdir(Data.m_pStorage->GetPath(Type, aPath, aBuf, sizeof(aBuf)), FindFilesCallback, Type, &Data);
+		}
+		else if(!str_comp(pName, Data.m_pFilename))
+		{
+			char aBuffer[IO_MAX_PATH_LENGTH];
+			str_format(aBuffer, sizeof(aBuffer), "%s/%s", Data.m_pPath, Data.m_pFilename);
+			Data.m_pEntries->emplace(aBuffer);
+		}
+
+		return 0;
+	}
+
+	size_t FindFiles(const char *pFilename, const char *pPath, int Type, std::set<std::string> *pEntries) override
+	{
+		SFindFilesCallbackData Data;
+		Data.m_pStorage = this;
+		Data.m_pFilename = pFilename;
+		Data.m_pPath = pPath;
+		Data.m_pEntries = pEntries;
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		if(Type == TYPE_ALL)
+		{
+			// search within all available directories
+			for(int i = TYPE_SAVE; i < m_NumPaths; ++i)
+			{
+				fs_listdir(GetPath(i, pPath, aBuf, sizeof(aBuf)), FindFilesCallback, i, &Data);
+			}
+		}
+		else if(Type >= TYPE_SAVE && Type < m_NumPaths)
+		{
+			// search within wanted directory
+			fs_listdir(GetPath(Type, pPath, aBuf, sizeof(aBuf)), FindFilesCallback, Type, &Data);
+		}
+		else
+		{
+			dbg_assert(false, "Type invalid");
+		}
+
+		return pEntries->size();
+	}
+
+	bool RemoveFile(const char *pFilename, int Type) override
+	{
+		dbg_assert(Type == TYPE_ABSOLUTE || (Type >= TYPE_SAVE && Type < m_NumPaths), "Type invalid");
+
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		GetPath(Type, pFilename, aBuffer, sizeof(aBuffer));
+
+		bool Success = !fs_remove(aBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to remove: %s", aBuffer);
+		return Success;
+	}
+
+	bool RemoveFolder(const char *pFilename, int Type) override
+	{
+		dbg_assert(Type == TYPE_ABSOLUTE || (Type >= TYPE_SAVE && Type < m_NumPaths), "Type invalid");
+
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		GetPath(Type, pFilename, aBuffer, sizeof(aBuffer));
+
+		bool Success = !fs_removedir(aBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to remove: %s", aBuffer);
+		return Success;
+	}
+
+	bool RemoveBinaryFile(const char *pFilename) override
+	{
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		GetBinaryPath(pFilename, aBuffer, sizeof(aBuffer));
+
+		bool Success = !fs_remove(aBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to remove binary: %s", aBuffer);
+		return Success;
+	}
+
+	bool RenameFile(const char *pOldFilename, const char *pNewFilename, int Type) override
+	{
+		dbg_assert(Type >= TYPE_SAVE && Type < m_NumPaths, "Type invalid");
+
+		char aOldBuffer[IO_MAX_PATH_LENGTH];
+		char aNewBuffer[IO_MAX_PATH_LENGTH];
+		GetPath(Type, pOldFilename, aOldBuffer, sizeof(aOldBuffer));
+		GetPath(Type, pNewFilename, aNewBuffer, sizeof(aNewBuffer));
+
+		bool Success = !fs_rename(aOldBuffer, aNewBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to rename: %s -> %s", aOldBuffer, aNewBuffer);
+		return Success;
+	}
+
+	bool RenameBinaryFile(const char *pOldFilename, const char *pNewFilename) override
+	{
+		char aOldBuffer[IO_MAX_PATH_LENGTH];
+		char aNewBuffer[IO_MAX_PATH_LENGTH];
+		GetBinaryPath(pOldFilename, aOldBuffer, sizeof(aOldBuffer));
+		GetBinaryPath(pNewFilename, aNewBuffer, sizeof(aNewBuffer));
+
+		if(fs_makedir_rec_for(aNewBuffer) < 0)
+		{
+			dbg_msg("storage", "cannot create folder for: %s", aNewBuffer);
+			return false;
+		}
+
+		bool Success = !fs_rename(aOldBuffer, aNewBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to rename: %s -> %s", aOldBuffer, aNewBuffer);
+		return Success;
+	}
+
+	bool CreateFolder(const char *pFoldername, int Type) override
+	{
+		dbg_assert(Type >= TYPE_SAVE && Type < m_NumPaths, "Type invalid");
+
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		GetPath(Type, pFoldername, aBuffer, sizeof(aBuffer));
+
+		bool Success = !fs_makedir(aBuffer);
+		if(!Success)
+			dbg_msg("storage", "failed to create folder: %s", aBuffer);
+		return Success;
+	}
+
+	void GetCompletePath(int Type, const char *pDir, char *pBuffer, unsigned BufferSize) override
+	{
+		TranslateType(Type, pDir);
+		dbg_assert(Type >= TYPE_SAVE && Type < m_NumPaths, "Type invalid");
+		GetPath(Type, pDir, pBuffer, BufferSize);
+	}
+
+	const char *GetBinaryPath(const char *pFilename, char *pBuffer, unsigned BufferSize) override
+	{
+		str_format(pBuffer, BufferSize, "%s%s%s", m_aBinarydir, !m_aBinarydir[0] ? "" : "/", pFilename);
+		return pBuffer;
+	}
+
+	const char *GetBinaryPathAbsolute(const char *pFilename, char *pBuffer, unsigned BufferSize) override
+	{
+		char aBinaryPath[IO_MAX_PATH_LENGTH];
+		GetBinaryPath(PLAT_CLIENT_EXEC, aBinaryPath, sizeof(aBinaryPath));
+		if(fs_is_relative_path(aBinaryPath))
+		{
+			if(fs_getcwd(pBuffer, BufferSize))
+			{
+				str_append(pBuffer, "/", BufferSize);
+				str_append(pBuffer, aBinaryPath, BufferSize);
+			}
+		}
+		else
+			str_copy(pBuffer, aBinaryPath, BufferSize);
+		return pBuffer;
+	}
+
+	static IStorage *Create(int StorageType, int NumArgs, const char **ppArguments)
+	{
+		CStorage *pStorage = new CStorage();
+		if(pStorage && pStorage->Init(StorageType, NumArgs, ppArguments))
+		{
+			dbg_msg("storage", "initialisation failed");
+			delete pStorage;
+			pStorage = nullptr;
+		}
+		return pStorage;
+	}
+};
+
+void IStorage::StripPathAndExtension(const char *pFilename, char *pBuffer, int BufferSize)
+{
+	const char *pFilenameEnd = pFilename + str_length(pFilename);
+	const char *pExtractedName = pFilename;
+	const char *pEnd = pFilenameEnd;
+	for(const char *pIter = pFilename; *pIter; pIter++)
+	{
+		if(*pIter == '/' || *pIter == '\\')
+		{
+			pExtractedName = pIter + 1;
+			pEnd = pFilenameEnd;
+		}
+		else if(*pIter == '.')
+		{
+			pEnd = pIter;
+		}
+	}
+
+	int Length = minimum(BufferSize, (int)(pEnd - pExtractedName + 1));
+	str_copy(pBuffer, pExtractedName, Length);
+}
+
+const char *IStorage::FormatTmpPath(char *aBuf, unsigned BufSize, const char *pPath)
+{
+	str_format(aBuf, BufSize, "%s.%d.tmp", pPath, pid());
+	return aBuf;
+}
+
+IStorage *CreateStorage(int StorageType, int NumArgs, const char **ppArguments)
+{
+	return CStorage::Create(StorageType, NumArgs, ppArguments);
+}
+
+IStorage *CreateLocalStorage()
+{
+	CStorage *pStorage = new CStorage();
+	if(pStorage)
+	{
+		if(!fs_getcwd(pStorage->m_aCurrentdir, sizeof(pStorage->m_aCurrentdir)))
+		{
+			delete pStorage;
+			return NULL;
+		}
+		pStorage->AddPath("$CURRENTDIR");
+	}
+	return pStorage;
+}
+IStorage *CreateTempStorage(const char *pDirectory)
+{
+	CStorage *pStorage = new CStorage();
+	if(!pStorage)
+	{
+		return nullptr;
+	}
+	pStorage->AddPath(pDirectory);
+	return pStorage;
+}
diff --git a/src_bkp/engine/shared/stun.cpp b/src_bkp/engine/shared/stun.cpp
new file mode 100644
index 0000000000..937007c3f1
--- /dev/null
+++ b/src_bkp/engine/shared/stun.cpp
@@ -0,0 +1,158 @@
+#include "stun.h"
+
+#include <base/system.h>
+
+// STUN header (from RFC 5389, section 6, figure 2):
+//
+//        0                   1                   2                   3
+//       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//      |0 0|     STUN Message Type     |         Message Length        |
+//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//      |                         Magic Cookie                          |
+//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//      |                                                               |
+//      |                     Transaction ID (96 bits)                  |
+//      |                                                               |
+//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+size_t StunMessagePrepare(unsigned char *pBuffer, size_t BufferSize, CStunData *pData)
+{
+	dbg_assert(BufferSize >= 20, "stun message buffer too small");
+	secure_random_fill(pData->m_aSecret, sizeof(pData->m_aSecret));
+	pBuffer[0] = 0x00; // STUN Request Message Type 1: Binding
+	pBuffer[1] = 0x01;
+	pBuffer[2] = 0x00; // Message Length: 0 (extra bytes after the header)
+	pBuffer[3] = 0x00;
+	pBuffer[4] = 0x21; // Magic Cookie: 0x2112A442
+	pBuffer[5] = 0x12;
+	pBuffer[6] = 0xA4;
+	pBuffer[7] = 0x42;
+	mem_copy(pBuffer + 8, pData->m_aSecret, sizeof(pData->m_aSecret)); // Transaction ID
+	return 20;
+}
+
+bool StunMessageParse(const unsigned char *pMessage, size_t MessageSize, const CStunData *pData, bool *pSuccess, NETADDR *pAddr)
+{
+	*pSuccess = false;
+	mem_zero(pAddr, sizeof(*pAddr));
+	if(MessageSize < 20)
+	{
+		return true;
+	}
+	bool Parsed = true;
+	// STUN Success/Error Response Type 1: Binding
+	Parsed = Parsed && pMessage[0] == 0x01 && (pMessage[1] == 0x01 || pMessage[1] == 0x11);
+	uint16_t MessageLength = (pMessage[2] << 8) | pMessage[3];
+	Parsed = Parsed && MessageSize >= 20 + (size_t)MessageLength && MessageLength % 4 == 0;
+	// Magic Cookie: 0x2112A442
+	Parsed = Parsed && pMessage[4] == 0x21 && pMessage[5] == 0x12;
+	Parsed = Parsed && pMessage[6] == 0xA4 && pMessage[7] == 0x42;
+	// Transaction ID
+	Parsed = Parsed && mem_comp(pMessage + 8, pData->m_aSecret, sizeof(pData->m_aSecret)) == 0;
+	if(!Parsed)
+	{
+		return true;
+	}
+
+	*pSuccess = pMessage[1] == 0x01;
+
+	MessageSize = 20 + MessageLength;
+	size_t Offset = 20;
+	bool FoundAddr = false;
+	while(true)
+	{
+		// STUN attribute format (from RFC 5389, section 15, figure 4):
+		//
+		//        0                   1                   2                   3
+		//       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+		//      |         Type                  |            Length             |
+		//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+		//      |                         Value (variable)                ....
+		//      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+		if(MessageSize == Offset)
+		{
+			break;
+		}
+		else if(MessageSize < Offset + 4)
+		{
+			return true;
+		}
+		uint16_t Type = (pMessage[Offset] << 8) | pMessage[Offset + 1];
+		uint16_t Length = (pMessage[Offset + 2] << 8) | pMessage[Offset + 3];
+		if(MessageSize < Offset + 4 + Length)
+		{
+			return true;
+		}
+		if(*pSuccess && Type == 0x0020) // XOR-MAPPED-ADDRESS
+		{
+			// STUN XOR-MAPPED-ADDRESS attribute format (from RFC 5389, section 15,
+			// figure 6):
+			//
+			//       0                   1                   2                   3
+			//      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+			//     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+			//     |x x x x x x x x|    Family     |         X-Port                |
+			//     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+			//     |                X-Address (Variable)
+			//     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+			if(Length < 4)
+			{
+				return true;
+			}
+			// Only use the first found address.
+			uint8_t Family = pMessage[Offset + 4 + 1];
+			uint16_t Port = (pMessage[Offset + 4 + 2] << 8) | pMessage[Offset + 4 + 3];
+			Port ^= 0x2112;
+			if(Family == 0x01) // IPv4
+			{
+				if(Length != 8)
+				{
+					return true;
+				}
+				if(!FoundAddr)
+				{
+					pAddr->type = NETTYPE_IPV4;
+					mem_copy(pAddr->ip, pMessage + Offset + 4 + 4, 4);
+					pAddr->ip[0] ^= 0x21;
+					pAddr->ip[1] ^= 0x12;
+					pAddr->ip[2] ^= 0xA4;
+					pAddr->ip[3] ^= 0x42;
+					pAddr->port = Port;
+					FoundAddr = true;
+				}
+			}
+			else if(Family == 0x02) // IPv6
+			{
+				if(Length != 20)
+				{
+					return true;
+				}
+				if(!FoundAddr)
+				{
+					pAddr->type = NETTYPE_IPV6;
+					mem_copy(pAddr->ip, pMessage + Offset + 4 + 4, 16);
+					pAddr->ip[0] ^= 0x21;
+					pAddr->ip[1] ^= 0x12;
+					pAddr->ip[2] ^= 0xA4;
+					pAddr->ip[3] ^= 0x42;
+					for(size_t i = 0; i < sizeof(pData->m_aSecret); i++)
+					{
+						pAddr->ip[4 + i] ^= pData->m_aSecret[i];
+					}
+					pAddr->port = Port;
+					FoundAddr = true;
+				}
+			}
+		}
+		// comprehension-required
+		else if(Type <= 0x7fff)
+		{
+			return true;
+		}
+		Offset += 4 + Length;
+	}
+	return *pSuccess && !FoundAddr;
+}
diff --git a/src_bkp/engine/shared/stun.h b/src_bkp/engine/shared/stun.h
new file mode 100644
index 0000000000..a27f9824d2
--- /dev/null
+++ b/src_bkp/engine/shared/stun.h
@@ -0,0 +1,15 @@
+#ifndef ENGINE_SHARED_STUN_H
+#define ENGINE_SHARED_STUN_H
+#include <cstddef>
+
+struct NETADDR;
+
+class CStunData
+{
+public:
+	unsigned char m_aSecret[12];
+};
+
+size_t StunMessagePrepare(unsigned char *pBuffer, size_t BufferSize, CStunData *pData);
+bool StunMessageParse(const unsigned char *pMessage, size_t MessageSize, const CStunData *pData, bool *pSuccess, NETADDR *pAddr);
+#endif // ENGINE_SHARED_STUN_H
diff --git a/src_bkp/engine/shared/teehistorian_ex.cpp b/src_bkp/engine/shared/teehistorian_ex.cpp
new file mode 100644
index 0000000000..558e84575f
--- /dev/null
+++ b/src_bkp/engine/shared/teehistorian_ex.cpp
@@ -0,0 +1,10 @@
+#include "teehistorian_ex.h"
+
+#include <engine/shared/uuid_manager.h>
+
+void RegisterTeehistorianUuids(CUuidManager *pManager)
+{
+#define UUID(id, name) pManager->RegisterName(id, name);
+#include "teehistorian_ex_chunks.h"
+#undef UUID
+}
diff --git a/src_bkp/engine/shared/teehistorian_ex.h b/src_bkp/engine/shared/teehistorian_ex.h
new file mode 100644
index 0000000000..cdc3b8c817
--- /dev/null
+++ b/src_bkp/engine/shared/teehistorian_ex.h
@@ -0,0 +1,15 @@
+#ifndef ENGINE_SHARED_TEEHISTORIAN_EX_H
+#define ENGINE_SHARED_TEEHISTORIAN_EX_H
+#include "protocol_ex.h"
+
+enum
+{
+	__TEEHISTORIAN_UUID_HELPER = OFFSET_TEEHISTORIAN_UUID - 1,
+#define UUID(id, name) id,
+#include "teehistorian_ex_chunks.h"
+#undef UUID
+	OFFSET_GAME_UUID
+};
+
+void RegisterTeehistorianUuids(class CUuidManager *pManager);
+#endif // ENGINE_SHARED_TEEHISTORIAN_EX_H
diff --git a/src_bkp/engine/shared/teehistorian_ex_chunks.h b/src_bkp/engine/shared/teehistorian_ex_chunks.h
new file mode 100644
index 0000000000..b1f07fefd1
--- /dev/null
+++ b/src_bkp/engine/shared/teehistorian_ex_chunks.h
@@ -0,0 +1,20 @@
+// This file can be included several times.
+
+UUID(TEEHISTORIAN_TEST, "teehistorian-test@ddnet.tw")
+UUID(TEEHISTORIAN_DDNETVER_OLD, "teehistorian-ddnetver-old@ddnet.tw")
+UUID(TEEHISTORIAN_DDNETVER, "teehistorian-ddnetver@ddnet.tw")
+UUID(TEEHISTORIAN_AUTH_INIT, "teehistorian-auth-init@ddnet.tw")
+UUID(TEEHISTORIAN_AUTH_LOGIN, "teehistorian-auth-login@ddnet.tw")
+UUID(TEEHISTORIAN_AUTH_LOGOUT, "teehistorian-auth-logout@ddnet.tw")
+UUID(TEEHISTORIAN_JOINVER6, "teehistorian-joinver6@ddnet.tw")
+UUID(TEEHISTORIAN_JOINVER7, "teehistorian-joinver7@ddnet.tw")
+UUID(TEEHISTORIAN_PLAYER_SWITCH, "teehistorian-player-swap@ddnet.tw")
+UUID(TEEHISTORIAN_SAVE_SUCCESS, "teehistorian-save-success@ddnet.tw")
+UUID(TEEHISTORIAN_SAVE_FAILURE, "teehistorian-save-failure@ddnet.tw")
+UUID(TEEHISTORIAN_LOAD_SUCCESS, "teehistorian-load-success@ddnet.tw")
+UUID(TEEHISTORIAN_LOAD_FAILURE, "teehistorian-load-failure@ddnet.tw")
+UUID(TEEHISTORIAN_PLAYER_TEAM, "teehistorian-player-team@ddnet.tw")
+UUID(TEEHISTORIAN_TEAM_PRACTICE, "teehistorian-team-practice@ddnet.tw")
+UUID(TEEHISTORIAN_PLAYER_READY, "teehistorian-player-ready@ddnet.tw")
+UUID(TEEHISTORIAN_PLAYER_REJOIN, "teehistorian-rejoinver6@ddnet.org")
+UUID(TEEHISTORIAN_ANTIBOT, "teehistorian-antibot@ddnet.org")
diff --git a/src_bkp/engine/shared/uuid_manager.cpp b/src_bkp/engine/shared/uuid_manager.cpp
new file mode 100644
index 0000000000..3cff589d60
--- /dev/null
+++ b/src_bkp/engine/shared/uuid_manager.cpp
@@ -0,0 +1,194 @@
+#include "uuid_manager.h"
+
+#include <base/hash_ctxt.h>
+#include <base/system.h>
+#include <engine/shared/packer.h>
+
+#include <algorithm>
+#include <cstdio>
+
+static const CUuid TEEWORLDS_NAMESPACE = {{// "e05ddaaa-c4e6-4cfb-b642-5d48e80c0029"
+	0xe0, 0x5d, 0xda, 0xaa, 0xc4, 0xe6, 0x4c, 0xfb,
+	0xb6, 0x42, 0x5d, 0x48, 0xe8, 0x0c, 0x00, 0x29}};
+
+const CUuid UUID_ZEROED = {{// "00000000-0000-0000-0000-000000000000"
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+
+CUuid RandomUuid()
+{
+	CUuid Result;
+	secure_random_fill(&Result, sizeof(Result));
+
+	// set version 4 (UUID is randomly generated)
+	Result.m_aData[6] &= 0x0f;
+	Result.m_aData[6] |= 0x40;
+
+	// set variant 1 (RFC 4122)
+	Result.m_aData[8] &= 0x3f;
+	Result.m_aData[8] |= 0x80;
+
+	return Result;
+}
+
+CUuid CalculateUuid(const char *pName)
+{
+	MD5_CTX Md5;
+	md5_init(&Md5);
+	md5_update(&Md5, TEEWORLDS_NAMESPACE.m_aData, sizeof(TEEWORLDS_NAMESPACE.m_aData));
+	// Without terminating NUL.
+	md5_update(&Md5, (const unsigned char *)pName, str_length(pName));
+	MD5_DIGEST Digest = md5_finish(&Md5);
+
+	CUuid Result;
+	for(unsigned i = 0; i < sizeof(Result.m_aData); i++)
+	{
+		Result.m_aData[i] = Digest.data[i];
+	}
+
+	// set version 3 (UUID is generated by MD5 hashing a namespace identifier and a name)
+	Result.m_aData[6] &= 0x0f;
+	Result.m_aData[6] |= 0x30;
+
+	// set variant 1 (RFC 4122)
+	Result.m_aData[8] &= 0x3f;
+	Result.m_aData[8] |= 0x80;
+
+	return Result;
+}
+
+void FormatUuid(CUuid Uuid, char *pBuffer, unsigned BufferLength)
+{
+	unsigned char *p = Uuid.m_aData;
+	str_format(pBuffer, BufferLength,
+		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
+		p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]);
+}
+
+int ParseUuid(CUuid *pUuid, const char *pBuffer)
+{
+	if(str_length(pBuffer) + 1 != UUID_MAXSTRSIZE)
+	{
+		return 2;
+	}
+	char aCopy[UUID_MAXSTRSIZE];
+	str_copy(aCopy, pBuffer);
+	// 01234567-9012-4567-9012-456789012345
+	if(aCopy[8] != '-' || aCopy[13] != '-' || aCopy[18] != '-' || aCopy[23] != '-')
+	{
+		return 1;
+	}
+	aCopy[8] = aCopy[13] = aCopy[18] = aCopy[23] = 0;
+	if(static_cast<bool>(str_hex_decode(pUuid->m_aData + 0, 4, aCopy + 0)) ||
+		str_hex_decode(pUuid->m_aData + 4, 2, aCopy + 9) ||
+		str_hex_decode(pUuid->m_aData + 6, 2, aCopy + 14) ||
+		str_hex_decode(pUuid->m_aData + 8, 2, aCopy + 19) ||
+		str_hex_decode(pUuid->m_aData + 10, 6, aCopy + 24))
+	{
+		return 1;
+	}
+	return 0;
+}
+
+bool CUuid::operator==(const CUuid &Other) const
+{
+	return mem_comp(this, &Other, sizeof(*this)) == 0;
+}
+
+bool CUuid::operator!=(const CUuid &Other) const
+{
+	return !(*this == Other);
+}
+
+bool CUuid::operator<(const CUuid &Other) const
+{
+	return mem_comp(this, &Other, sizeof(*this)) < 0;
+}
+
+static int GetIndex(int ID)
+{
+	return ID - OFFSET_UUID;
+}
+
+static int GetID(int Index)
+{
+	return Index + OFFSET_UUID;
+}
+
+void CUuidManager::RegisterName(int ID, const char *pName)
+{
+	dbg_assert(GetIndex(ID) == (int)m_vNames.size(), "names must be registered with increasing ID");
+	CName Name;
+	Name.m_pName = pName;
+	Name.m_Uuid = CalculateUuid(pName);
+	dbg_assert(LookupUuid(Name.m_Uuid) == -1, "duplicate uuid");
+
+	m_vNames.push_back(Name);
+
+	CNameIndexed NameIndexed;
+	NameIndexed.m_Uuid = Name.m_Uuid;
+	NameIndexed.m_ID = GetIndex(ID);
+	m_vNamesSorted.insert(std::lower_bound(m_vNamesSorted.begin(), m_vNamesSorted.end(), NameIndexed), NameIndexed);
+}
+
+CUuid CUuidManager::GetUuid(int ID) const
+{
+	return m_vNames[GetIndex(ID)].m_Uuid;
+}
+
+const char *CUuidManager::GetName(int ID) const
+{
+	return m_vNames[GetIndex(ID)].m_pName;
+}
+
+int CUuidManager::LookupUuid(CUuid Uuid) const
+{
+	CNameIndexed Needle;
+	Needle.m_Uuid = Uuid;
+	Needle.m_ID = 0;
+	auto Range = std::equal_range(m_vNamesSorted.begin(), m_vNamesSorted.end(), Needle);
+	if(std::distance(Range.first, Range.second) == 1)
+	{
+		return GetID(Range.first->m_ID);
+	}
+	return UUID_UNKNOWN;
+}
+
+int CUuidManager::NumUuids() const
+{
+	return m_vNames.size();
+}
+
+int CUuidManager::UnpackUuid(CUnpacker *pUnpacker) const
+{
+	CUuid Temp;
+	return UnpackUuid(pUnpacker, &Temp);
+}
+
+int CUuidManager::UnpackUuid(CUnpacker *pUnpacker, CUuid *pOut) const
+{
+	const CUuid *pUuid = (const CUuid *)pUnpacker->GetRaw(sizeof(*pUuid));
+	if(pUuid == NULL)
+	{
+		return UUID_INVALID;
+	}
+	*pOut = *pUuid;
+	return LookupUuid(*pUuid);
+}
+
+void CUuidManager::PackUuid(int ID, CPacker *pPacker) const
+{
+	CUuid Uuid = GetUuid(ID);
+	pPacker->AddRaw(&Uuid, sizeof(Uuid));
+}
+
+void CUuidManager::DebugDump() const
+{
+	for(const auto &Name : m_vNames)
+	{
+		char aBuf[UUID_MAXSTRSIZE];
+		FormatUuid(Name.m_Uuid, aBuf, sizeof(aBuf));
+		dbg_msg("uuid", "%s %s", aBuf, Name.m_pName);
+	}
+}
diff --git a/src_bkp/engine/shared/uuid_manager.h b/src_bkp/engine/shared/uuid_manager.h
new file mode 100644
index 0000000000..00d1a4822f
--- /dev/null
+++ b/src_bkp/engine/shared/uuid_manager.h
@@ -0,0 +1,73 @@
+#ifndef ENGINE_SHARED_UUID_MANAGER_H
+#define ENGINE_SHARED_UUID_MANAGER_H
+
+#include <vector>
+
+enum
+{
+	UUID_MAXSTRSIZE = 37, // 12345678-0123-5678-0123-567890123456
+
+	UUID_INVALID = -2,
+	UUID_UNKNOWN = -1,
+
+	OFFSET_UUID = 1 << 16,
+};
+
+struct CUuid
+{
+	unsigned char m_aData[16];
+
+	bool operator==(const CUuid &Other) const;
+	bool operator!=(const CUuid &Other) const;
+	bool operator<(const CUuid &Other) const;
+};
+
+extern const CUuid UUID_ZEROED;
+
+CUuid RandomUuid();
+CUuid CalculateUuid(const char *pName);
+// The buffer length should be at least UUID_MAXSTRSIZE.
+void FormatUuid(CUuid Uuid, char *pBuffer, unsigned BufferLength);
+// Returns nonzero on failure.
+int ParseUuid(CUuid *pUuid, const char *pBuffer);
+
+struct CName
+{
+	CUuid m_Uuid;
+	const char *m_pName;
+};
+
+struct CNameIndexed
+{
+	CUuid m_Uuid;
+	int m_ID;
+
+	bool operator<(const CNameIndexed &Other) const { return m_Uuid < Other.m_Uuid; }
+	bool operator==(const CNameIndexed &Other) const { return m_Uuid == Other.m_Uuid; }
+};
+
+class CPacker;
+class CUnpacker;
+
+class CUuidManager
+{
+	std::vector<CName> m_vNames;
+	std::vector<CNameIndexed> m_vNamesSorted;
+
+public:
+	void RegisterName(int ID, const char *pName);
+	CUuid GetUuid(int ID) const;
+	const char *GetName(int ID) const;
+	int LookupUuid(CUuid Uuid) const;
+	int NumUuids() const;
+
+	int UnpackUuid(CUnpacker *pUnpacker) const;
+	int UnpackUuid(CUnpacker *pUnpacker, CUuid *pOut) const;
+	void PackUuid(int ID, CPacker *pPacker) const;
+
+	void DebugDump() const;
+};
+
+extern CUuidManager g_UuidManager;
+
+#endif // ENGINE_SHARED_UUID_MANAGER_H
diff --git a/src_bkp/engine/shared/video.cpp b/src_bkp/engine/shared/video.cpp
new file mode 100644
index 0000000000..39d23b5248
--- /dev/null
+++ b/src_bkp/engine/shared/video.cpp
@@ -0,0 +1,12 @@
+#if defined(CONF_VIDEORECORDER)
+
+#include "video.h"
+
+IVideo *IVideo::ms_pCurrentVideo = 0;
+
+int64_t IVideo::ms_Time = 0;
+float IVideo::ms_LocalTime = 0;
+int64_t IVideo::ms_LocalStartTime = 0;
+int64_t IVideo::ms_TickTime = 0;
+
+#endif
diff --git a/src_bkp/engine/shared/video.h b/src_bkp/engine/shared/video.h
new file mode 100644
index 0000000000..c93cdd80a9
--- /dev/null
+++ b/src_bkp/engine/shared/video.h
@@ -0,0 +1,41 @@
+#ifndef ENGINE_SHARED_VIDEO_H
+#define ENGINE_SHARED_VIDEO_H
+
+#include <base/system.h>
+
+#include <functional>
+
+typedef std::function<void(short *pFinalOut, unsigned Frames)> ISoundMixFunc;
+
+class IVideo
+{
+public:
+	virtual ~IVideo(){};
+
+	virtual void Start() = 0;
+	virtual void Stop() = 0;
+	virtual void Pause(bool Pause) = 0;
+	virtual bool IsRecording() = 0;
+
+	virtual void NextVideoFrame() = 0;
+	virtual void NextVideoFrameThread() = 0;
+
+	virtual void NextAudioFrame(ISoundMixFunc Mix) = 0;
+	virtual void NextAudioFrameTimeline(ISoundMixFunc Mix) = 0;
+
+	static IVideo *Current() { return ms_pCurrentVideo; }
+
+	static int64_t Time() { return ms_Time; }
+	static float LocalTime() { return ms_LocalTime; }
+	static void SetLocalStartTime(int64_t LocalStartTime) { ms_LocalStartTime = LocalStartTime; }
+	static void SetFPS(int FPS) { ms_TickTime = time_freq() / FPS; }
+
+protected:
+	static IVideo *ms_pCurrentVideo;
+	static int64_t ms_Time;
+	static int64_t ms_LocalStartTime;
+	static float ms_LocalTime;
+	static int64_t ms_TickTime;
+};
+
+#endif
diff --git a/src_bkp/engine/shared/websockets.cpp b/src_bkp/engine/shared/websockets.cpp
new file mode 100644
index 0000000000..2518578cbb
--- /dev/null
+++ b/src_bkp/engine/shared/websockets.cpp
@@ -0,0 +1,311 @@
+#if defined(CONF_WEBSOCKETS)
+
+#include <cstdlib>
+#include <map>
+#include <string>
+
+#include "protocol.h"
+#include "ringbuffer.h"
+#include <base/system.h>
+#if defined(CONF_FAMILY_UNIX)
+#include <arpa/inet.h>
+#elif defined(CONF_FAMILY_WINDOWS)
+#include <ws2tcpip.h>
+#endif
+#include <libwebsockets.h>
+
+#include "websockets.h"
+
+// not sure why would anyone need more than one but well...
+#define WS_CONTEXTS 4
+// ddnet client opens two connections for whatever reason
+#define WS_CLIENTS (MAX_CLIENTS * 2)
+
+typedef CStaticRingBuffer<unsigned char, WS_CLIENTS * 4 * 1024,
+	CRingBufferBase::FLAG_RECYCLE>
+	TRecvBuffer;
+typedef CStaticRingBuffer<unsigned char, 4 * 1024,
+	CRingBufferBase::FLAG_RECYCLE>
+	TSendBuffer;
+
+struct websocket_chunk
+{
+	size_t size;
+	size_t read;
+	sockaddr_in addr;
+	unsigned char data[0];
+};
+
+struct per_session_data
+{
+	struct lws *wsi;
+	std::string addr_str;
+	sockaddr_in addr;
+	TSendBuffer send_buffer;
+};
+
+struct context_data
+{
+	lws_context *context;
+	std::map<std::string, per_session_data *> port_map;
+	TRecvBuffer recv_buffer;
+};
+
+static int receive_chunk(context_data *ctx_data, struct per_session_data *pss,
+	void *in, size_t len)
+{
+	websocket_chunk *chunk = (websocket_chunk *)ctx_data->recv_buffer.Allocate(
+		len + sizeof(websocket_chunk));
+	if(chunk == 0)
+		return 1;
+	chunk->size = len;
+	chunk->read = 0;
+	mem_copy(&chunk->addr, &pss->addr, sizeof(sockaddr_in));
+	mem_copy(&chunk->data[0], in, len);
+	return 0;
+}
+
+static int websocket_callback(struct lws *wsi, enum lws_callback_reasons reason,
+	void *user, void *in, size_t len)
+{
+	struct per_session_data *pss = (struct per_session_data *)user;
+	lws_context *context = lws_get_context(wsi);
+	context_data *ctx_data = (context_data *)lws_context_user(context);
+	switch(reason)
+	{
+	case LWS_CALLBACK_WSI_CREATE:
+		if(pss == NULL)
+		{
+			return 0;
+		}
+		[[fallthrough]];
+	case LWS_CALLBACK_ESTABLISHED:
+	{
+		pss->wsi = wsi;
+		int fd = lws_get_socket_fd(wsi);
+		socklen_t addr_size = sizeof(pss->addr);
+		getpeername(fd, (struct sockaddr *)&pss->addr, &addr_size);
+		int orig_port = ntohs(pss->addr.sin_port);
+		pss->send_buffer.Init();
+
+		char addr_str[NETADDR_MAXSTRSIZE];
+		int ip_uint32 = pss->addr.sin_addr.s_addr;
+		str_format(addr_str, sizeof(addr_str), "%d.%d.%d.%d:%d", (ip_uint32)&0xff, (ip_uint32 >> 8) & 0xff, (ip_uint32 >> 16) & 0xff, (ip_uint32 >> 24) & 0xff, orig_port);
+
+		dbg_msg("websockets", "connection established with %s", addr_str);
+
+		std::string addr_str_final;
+		addr_str_final.append(addr_str);
+
+		pss->addr_str = addr_str_final;
+		ctx_data->port_map[pss->addr_str] = pss;
+	}
+	break;
+
+	case LWS_CALLBACK_CLOSED:
+	{
+		dbg_msg("websockets", "connection with addr string %s closed", pss->addr_str.c_str());
+		if(!pss->addr_str.empty())
+		{
+			unsigned char close_packet[] = {0x10, 0x0e, 0x00, 0x04};
+			receive_chunk(ctx_data, pss, &close_packet, sizeof(close_packet));
+			pss->wsi = 0;
+			ctx_data->port_map.erase(pss->addr_str);
+		}
+	}
+	break;
+
+	case LWS_CALLBACK_CLIENT_WRITEABLE:
+		[[fallthrough]];
+	case LWS_CALLBACK_SERVER_WRITEABLE:
+	{
+		websocket_chunk *chunk = (websocket_chunk *)pss->send_buffer.First();
+		if(chunk == NULL)
+			break;
+		int chunk_len = chunk->size - chunk->read;
+		int n =
+			lws_write(wsi, &chunk->data[LWS_SEND_BUFFER_PRE_PADDING + chunk->read],
+				chunk->size - chunk->read, LWS_WRITE_BINARY);
+		if(n < 0)
+			return 1;
+		if(n < chunk_len)
+		{
+			chunk->read += n;
+			lws_callback_on_writable(wsi);
+			break;
+		}
+		pss->send_buffer.PopFirst();
+		lws_callback_on_writable(wsi);
+	}
+	break;
+
+	case LWS_CALLBACK_CLIENT_RECEIVE:
+		[[fallthrough]];
+	case LWS_CALLBACK_RECEIVE:
+		if(pss->addr_str.empty())
+			return -1;
+		if(receive_chunk(ctx_data, pss, in, len))
+			return 1;
+		break;
+
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+static struct lws_protocols protocols[] = {
+	{
+		"binary", /* name */
+		websocket_callback, /* callback */
+		sizeof(struct per_session_data) /* per_session_data_size */
+	},
+	{
+		NULL, NULL, 0 /* End of list */
+	}};
+
+static context_data contexts[WS_CONTEXTS];
+
+int websocket_create(const char *addr, int port)
+{
+	struct lws_context_creation_info info;
+	mem_zero(&info, sizeof(info));
+	info.port = port;
+	info.iface = addr;
+	info.protocols = protocols;
+	info.gid = -1;
+	info.uid = -1;
+
+	// find free context
+	int first_free = -1;
+	for(int i = 0; i < WS_CONTEXTS; i++)
+	{
+		if(contexts[i].context == NULL)
+		{
+			first_free = i;
+			break;
+		}
+	}
+	if(first_free == -1)
+		return -1;
+
+	context_data *ctx_data = &contexts[first_free];
+	info.user = (void *)ctx_data;
+
+	ctx_data->context = lws_create_context(&info);
+	if(ctx_data->context == NULL)
+	{
+		return -1;
+	}
+	ctx_data->recv_buffer.Init();
+	return first_free;
+}
+
+int websocket_destroy(int socket)
+{
+	lws_context *context = contexts[socket].context;
+	if(context == NULL)
+		return -1;
+	lws_context_destroy(context);
+	contexts[socket].context = NULL;
+	return 0;
+}
+
+int websocket_recv(int socket, unsigned char *data, size_t maxsize,
+	struct sockaddr_in *sockaddrbuf, size_t fromLen)
+{
+	lws_context *context = contexts[socket].context;
+	if(context == NULL)
+		return -1;
+	int n = lws_service(context, -1);
+	if(n < 0)
+		return n;
+	context_data *ctx_data = (context_data *)lws_context_user(context);
+	websocket_chunk *chunk = (websocket_chunk *)ctx_data->recv_buffer.First();
+	if(chunk == 0)
+		return 0;
+	if(maxsize >= chunk->size - chunk->read)
+	{
+		int len = chunk->size - chunk->read;
+		mem_copy(data, &chunk->data[chunk->read], len);
+		mem_copy(sockaddrbuf, &chunk->addr, fromLen);
+		ctx_data->recv_buffer.PopFirst();
+		return len;
+	}
+	else
+	{
+		mem_copy(data, &chunk->data[chunk->read], maxsize);
+		mem_copy(sockaddrbuf, &chunk->addr, fromLen);
+		chunk->read += maxsize;
+		return maxsize;
+	}
+}
+
+int websocket_send(int socket, const unsigned char *data, size_t size,
+	const char *addr_str, int port)
+{
+	lws_context *context = contexts[socket].context;
+	if(context == NULL)
+	{
+		return -1;
+	}
+	context_data *ctx_data = (context_data *)lws_context_user(context);
+	char aBuf[100];
+	snprintf(aBuf, sizeof(aBuf), "%s:%d", addr_str, port);
+	std::string addr_str_with_port = std::string(aBuf);
+	struct per_session_data *pss = ctx_data->port_map[addr_str_with_port];
+	if(pss == NULL)
+	{
+		struct lws_client_connect_info ccinfo = {0};
+		ccinfo.context = context;
+		ccinfo.address = addr_str;
+		ccinfo.port = port;
+		ccinfo.protocol = protocols[0].name;
+		lws *wsi = lws_client_connect_via_info(&ccinfo);
+		if(wsi == NULL)
+		{
+			return -1;
+		}
+		lws_service(context, -1);
+		pss = ctx_data->port_map[addr_str_with_port];
+		if(pss == NULL)
+		{
+			return -1;
+		}
+	}
+	websocket_chunk *chunk = (websocket_chunk *)pss->send_buffer.Allocate(
+		size + sizeof(websocket_chunk) + LWS_SEND_BUFFER_PRE_PADDING +
+		LWS_SEND_BUFFER_POST_PADDING);
+	if(chunk == NULL)
+		return -1;
+	chunk->size = size;
+	chunk->read = 0;
+	mem_copy(&chunk->addr, &pss->addr, sizeof(sockaddr_in));
+	mem_copy(&chunk->data[LWS_SEND_BUFFER_PRE_PADDING], data, size);
+	lws_callback_on_writable(pss->wsi);
+	lws_service(context, -1);
+	return size;
+}
+
+int websocket_fd_set(int socket, fd_set *set)
+{
+	lws_context *context = contexts[socket].context;
+	if(context == NULL)
+		return -1;
+	lws_service(context, -1);
+	context_data *ctx_data = (context_data *)lws_context_user(context);
+	int max = 0;
+	for(auto const &x : ctx_data->port_map)
+	{
+		if(x.second == NULL)
+			continue;
+		int fd = lws_get_socket_fd(x.second->wsi);
+		if(fd > max)
+			max = fd;
+		FD_SET(fd, set);
+	}
+	return max;
+}
+
+#endif
diff --git a/src_bkp/engine/shared/websockets.h b/src_bkp/engine/shared/websockets.h
new file mode 100644
index 0000000000..afc78f8ec1
--- /dev/null
+++ b/src_bkp/engine/shared/websockets.h
@@ -0,0 +1,18 @@
+#ifndef ENGINE_SHARED_WEBSOCKETS_H
+#define ENGINE_SHARED_WEBSOCKETS_H
+
+#if defined(CONF_FAMILY_UNIX)
+#elif defined(CONF_FAMILY_WINDOWS)
+#include <winsock2.h>
+#endif
+
+#include <cstddef>
+
+int websocket_create(const char *addr, int port);
+int websocket_destroy(int socket);
+int websocket_recv(int socket, unsigned char *data, size_t maxsize, struct sockaddr_in *sockaddrbuf, size_t fromLen);
+int websocket_send(int socket, const unsigned char *data, size_t size,
+	const char *addr_str, int port);
+int websocket_fd_set(int socket, fd_set *set);
+
+#endif // ENGINE_SHARED_WEBSOCKETS_H
diff --git a/src_bkp/engine/sound.h b/src_bkp/engine/sound.h
new file mode 100644
index 0000000000..f5e2c08d54
--- /dev/null
+++ b/src_bkp/engine/sound.h
@@ -0,0 +1,121 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_SOUND_H
+#define ENGINE_SOUND_H
+
+#include <engine/kernel.h>
+#include <engine/storage.h>
+
+class ISound : public IInterface
+{
+	MACRO_INTERFACE("sound")
+public:
+	enum
+	{
+		FLAG_LOOP = 1 << 0,
+		FLAG_POS = 1 << 1,
+		FLAG_NO_PANNING = 1 << 2,
+		FLAG_PREVIEW = 1 << 3,
+		FLAG_ALL = FLAG_LOOP | FLAG_POS | FLAG_NO_PANNING | FLAG_PREVIEW,
+	};
+
+	enum
+	{
+		SHAPE_CIRCLE,
+		SHAPE_RECTANGLE,
+	};
+
+	// unused
+	struct CSampleHandle
+	{
+		int m_SampleID;
+	};
+
+	struct CVoiceShapeCircle
+	{
+		float m_Radius;
+	};
+
+	struct CVoiceShapeRectangle
+	{
+		float m_Width;
+		float m_Height;
+	};
+
+	class CVoiceHandle
+	{
+		friend class ISound;
+		int m_Id;
+		int m_Age;
+
+	public:
+		CVoiceHandle() :
+			m_Id(-1), m_Age(-1)
+		{
+		}
+
+		bool IsValid() const { return (Id() >= 0) && (Age() >= 0); }
+		int Id() const { return m_Id; }
+		int Age() const { return m_Age; }
+
+		bool operator==(const CVoiceHandle &Other) const { return m_Id == Other.m_Id && m_Age == Other.m_Age; }
+	};
+
+	virtual bool IsSoundEnabled() = 0;
+
+	virtual int LoadOpus(const char *pFilename, int StorageType = IStorage::TYPE_ALL) = 0;
+	virtual int LoadWV(const char *pFilename, int StorageType = IStorage::TYPE_ALL) = 0;
+	virtual int LoadOpusFromMem(const void *pData, unsigned DataSize, bool FromEditor = false) = 0;
+	virtual int LoadWVFromMem(const void *pData, unsigned DataSize, bool FromEditor = false) = 0;
+	virtual void UnloadSample(int SampleID) = 0;
+
+	virtual float GetSampleTotalTime(int SampleID) = 0; // in s
+	virtual float GetSampleCurrentTime(int SampleID) = 0; // in s
+	virtual void SetSampleCurrentTime(int SampleID, float Time) = 0;
+
+	virtual void SetChannel(int ChannelID, float Volume, float Panning) = 0;
+	virtual void SetListenerPos(float x, float y) = 0;
+
+	virtual void SetVoiceVolume(CVoiceHandle Voice, float Volume) = 0;
+	virtual void SetVoiceFalloff(CVoiceHandle Voice, float Falloff) = 0;
+	virtual void SetVoiceLocation(CVoiceHandle Voice, float x, float y) = 0;
+	virtual void SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset) = 0; // in s
+
+	virtual void SetVoiceCircle(CVoiceHandle Voice, float Radius) = 0;
+	virtual void SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height) = 0;
+
+	virtual CVoiceHandle PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) = 0;
+	virtual CVoiceHandle Play(int ChannelID, int SampleID, int Flags) = 0;
+	virtual void Pause(int SampleID) = 0;
+	virtual void Stop(int SampleID) = 0;
+	virtual void StopAll() = 0;
+	virtual void StopVoice(CVoiceHandle Voice) = 0;
+	virtual bool IsPlaying(int SampleID) = 0;
+
+	virtual void Mix(short *pFinalOut, unsigned Frames) = 0;
+	// useful for thread synchronization
+	virtual void PauseAudioDevice() = 0;
+	virtual void UnpauseAudioDevice() = 0;
+
+protected:
+	inline CVoiceHandle CreateVoiceHandle(int Index, int Age)
+	{
+		CVoiceHandle Voice;
+		Voice.m_Id = Index;
+		Voice.m_Age = Age;
+		return Voice;
+	}
+};
+
+class IEngineSound : public ISound
+{
+	MACRO_INTERFACE("enginesound")
+public:
+	virtual int Init() = 0;
+	virtual int Update() = 0;
+	virtual void Shutdown() override = 0;
+};
+
+extern IEngineSound *CreateEngineSound();
+
+#endif
diff --git a/src_bkp/engine/sqlite.h b/src_bkp/engine/sqlite.h
new file mode 100644
index 0000000000..348322a4e9
--- /dev/null
+++ b/src_bkp/engine/sqlite.h
@@ -0,0 +1,28 @@
+#ifndef ENGINE_SQLITE_H
+#define ENGINE_SQLITE_H
+#include <memory>
+
+struct sqlite3;
+struct sqlite3_stmt;
+class IConsole;
+class IStorage;
+
+class CSqliteDeleter
+{
+public:
+	void operator()(sqlite3 *pSqlite);
+};
+class CSqliteStmtDeleter
+{
+public:
+	void operator()(sqlite3_stmt *pStmt);
+};
+typedef std::unique_ptr<sqlite3, CSqliteDeleter> CSqlite;
+typedef std::unique_ptr<sqlite3_stmt, CSqliteStmtDeleter> CSqliteStmt;
+
+int SqliteHandleError(IConsole *pConsole, int Error, sqlite3 *pSqlite, const char *pContext);
+#define SQLITE_HANDLE_ERROR(x) SqliteHandleError(pConsole, x, &*pSqlite, #x)
+
+CSqlite SqliteOpen(IConsole *pConsole, IStorage *pStorage, const char *pPath);
+CSqliteStmt SqlitePrepare(IConsole *pConsole, sqlite3 *pSqlite, const char *pStatement);
+#endif // ENGINE_SQLITE_H
diff --git a/src_bkp/engine/steam.h b/src_bkp/engine/steam.h
new file mode 100644
index 0000000000..20341e2b04
--- /dev/null
+++ b/src_bkp/engine/steam.h
@@ -0,0 +1,28 @@
+#ifndef ENGINE_STEAM_H
+#define ENGINE_STEAM_H
+
+#include <base/types.h>
+
+#include "kernel.h"
+
+class ISteam : public IInterface
+{
+	MACRO_INTERFACE("steam")
+public:
+	// Returns NULL if the name cannot be determined.
+	virtual const char *GetPlayerName() = 0;
+
+	// Returns NULL if the no server needs to be joined.
+	// Can change while the game is running.
+	virtual const NETADDR *GetConnectAddress() = 0;
+	virtual void ClearConnectAddress() = 0;
+
+	virtual void Update() = 0;
+
+	virtual void ClearGameInfo() = 0;
+	virtual void SetGameInfo(const NETADDR &ServerAddr, const char *pMapName, bool AnnounceAddr) = 0;
+};
+
+ISteam *CreateSteam();
+
+#endif // ENGINE_STEAM_H
diff --git a/src_bkp/engine/storage.h b/src_bkp/engine/storage.h
new file mode 100644
index 0000000000..9380d0dd5e
--- /dev/null
+++ b/src_bkp/engine/storage.h
@@ -0,0 +1,79 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_STORAGE_H
+#define ENGINE_STORAGE_H
+
+#include <base/hash.h>
+#include <base/types.h>
+
+#include "kernel.h"
+
+#include <set>
+#include <string>
+
+enum
+{
+	MAX_PATHS = 16
+};
+
+class IStorage : public IInterface
+{
+	MACRO_INTERFACE("storage")
+public:
+	enum
+	{
+		TYPE_SAVE = 0,
+		TYPE_ALL = -1,
+		TYPE_ABSOLUTE = -2,
+		/**
+		 * Translates to TYPE_SAVE if a path is relative
+		 * and to TYPE_ABSOLUTE if a path is absolute.
+		 * Only usable with OpenFile, ReadFile, ReadFileStr,
+		 * GetCompletePath, FileExists and FolderExists.
+		 */
+		TYPE_SAVE_OR_ABSOLUTE = -3,
+		/**
+		 * Translates to TYPE_ALL if a path is relative
+		 * and to TYPE_ABSOLUTE if a path is absolute.
+		 * Only usable with OpenFile, ReadFile, ReadFileStr,
+		 * GetCompletePath, FileExists and FolderExists.
+		 */
+		TYPE_ALL_OR_ABSOLUTE = -4,
+
+		STORAGETYPE_BASIC = 0,
+		STORAGETYPE_SERVER,
+		STORAGETYPE_CLIENT,
+	};
+
+	virtual int NumPaths() const = 0;
+
+	virtual void ListDirectory(int Type, const char *pPath, FS_LISTDIR_CALLBACK pfnCallback, void *pUser) = 0;
+	virtual void ListDirectoryInfo(int Type, const char *pPath, FS_LISTDIR_CALLBACK_FILEINFO pfnCallback, void *pUser) = 0;
+	virtual IOHANDLE OpenFile(const char *pFilename, int Flags, int Type, char *pBuffer = nullptr, int BufferSize = 0) = 0;
+	virtual bool FileExists(const char *pFilename, int Type) = 0;
+	virtual bool FolderExists(const char *pFilename, int Type) = 0;
+	virtual bool ReadFile(const char *pFilename, int Type, void **ppResult, unsigned *pResultLen) = 0;
+	virtual char *ReadFileStr(const char *pFilename, int Type) = 0;
+	virtual bool CalculateHashes(const char *pFilename, int Type, SHA256_DIGEST *pSha256, unsigned *pCrc = nullptr) = 0;
+	virtual bool FindFile(const char *pFilename, const char *pPath, int Type, char *pBuffer, int BufferSize) = 0;
+	virtual size_t FindFiles(const char *pFilename, const char *pPath, int Type, std::set<std::string> *pEntries) = 0;
+	virtual bool RemoveFile(const char *pFilename, int Type) = 0;
+	virtual bool RemoveFolder(const char *pFilename, int Type) = 0;
+	virtual bool RenameFile(const char *pOldFilename, const char *pNewFilename, int Type) = 0;
+	virtual bool CreateFolder(const char *pFoldername, int Type) = 0;
+	virtual void GetCompletePath(int Type, const char *pDir, char *pBuffer, unsigned BufferSize) = 0;
+
+	virtual bool RemoveBinaryFile(const char *pFilename) = 0;
+	virtual bool RenameBinaryFile(const char *pOldFilename, const char *pNewFilename) = 0;
+	virtual const char *GetBinaryPath(const char *pFilename, char *pBuffer, unsigned BufferSize) = 0;
+	virtual const char *GetBinaryPathAbsolute(const char *pFilename, char *pBuffer, unsigned BufferSize) = 0;
+
+	static void StripPathAndExtension(const char *pFilename, char *pBuffer, int BufferSize);
+	static const char *FormatTmpPath(char *aBuf, unsigned BufSize, const char *pPath);
+};
+
+extern IStorage *CreateStorage(int StorageType, int NumArgs, const char **ppArguments);
+extern IStorage *CreateLocalStorage();
+extern IStorage *CreateTempStorage(const char *pDirectory);
+
+#endif
diff --git a/src_bkp/engine/textrender.h b/src_bkp/engine/textrender.h
new file mode 100644
index 0000000000..0d1287c3d4
--- /dev/null
+++ b/src_bkp/engine/textrender.h
@@ -0,0 +1,374 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef ENGINE_TEXTRENDER_H
+#define ENGINE_TEXTRENDER_H
+#include "kernel.h"
+
+#include <base/color.h>
+
+#include <engine/graphics.h>
+
+#include <cstdint>
+#include <memory>
+
+enum
+{
+	TEXTFLAG_RENDER = 1 << 0,
+	TEXTFLAG_DISALLOW_NEWLINE = 1 << 1,
+	TEXTFLAG_STOP_AT_END = 1 << 2,
+	TEXTFLAG_ELLIPSIS_AT_END = 1 << 3,
+};
+
+enum ETextAlignment
+{
+	TEXTALIGN_LEFT = 0,
+	TEXTALIGN_CENTER = 1 << 1,
+	TEXTALIGN_RIGHT = 1 << 2,
+	TEXTALIGN_TOP = 0, // this is also 0, so the default alignment is top-left
+	TEXTALIGN_MIDDLE = 1 << 3,
+	TEXTALIGN_BOTTOM = 1 << 4,
+
+	TEXTALIGN_TL = TEXTALIGN_TOP | TEXTALIGN_LEFT,
+	TEXTALIGN_TC = TEXTALIGN_TOP | TEXTALIGN_CENTER,
+	TEXTALIGN_TR = TEXTALIGN_TOP | TEXTALIGN_RIGHT,
+	TEXTALIGN_ML = TEXTALIGN_MIDDLE | TEXTALIGN_LEFT,
+	TEXTALIGN_MC = TEXTALIGN_MIDDLE | TEXTALIGN_CENTER,
+	TEXTALIGN_MR = TEXTALIGN_MIDDLE | TEXTALIGN_RIGHT,
+	TEXTALIGN_BL = TEXTALIGN_BOTTOM | TEXTALIGN_LEFT,
+	TEXTALIGN_BC = TEXTALIGN_BOTTOM | TEXTALIGN_CENTER,
+	TEXTALIGN_BR = TEXTALIGN_BOTTOM | TEXTALIGN_RIGHT,
+
+	TEXTALIGN_MASK_HORIZONTAL = TEXTALIGN_LEFT | TEXTALIGN_CENTER | TEXTALIGN_RIGHT,
+	TEXTALIGN_MASK_VERTICAL = TEXTALIGN_TOP | TEXTALIGN_MIDDLE | TEXTALIGN_BOTTOM,
+};
+
+enum ETextRenderFlags
+{
+	TEXT_RENDER_FLAG_NO_X_BEARING = 1 << 0,
+	TEXT_RENDER_FLAG_NO_Y_BEARING = 1 << 1,
+	TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH = 1 << 2,
+	TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT = 1 << 3,
+	TEXT_RENDER_FLAG_KERNING = 1 << 4,
+	TEXT_RENDER_FLAG_NO_OVERSIZE = 1 << 5,
+	TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING = 1 << 6,
+	TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE = 1 << 7,
+	TEXT_RENDER_FLAG_NO_AUTOMATIC_QUAD_UPLOAD = 1 << 8,
+	// text is only rendered once and then discarded (a hint for buffer creation)
+	TEXT_RENDER_FLAG_ONE_TIME_USE = 1 << 9,
+};
+
+enum class EFontPreset
+{
+	DEFAULT_FONT,
+	ICON_FONT,
+};
+
+namespace FontIcons {
+// Each font icon is named according to its official name in Font Awesome
+MAYBE_UNUSED static const char *FONT_ICON_PLUS = "+";
+MAYBE_UNUSED static const char *FONT_ICON_LOCK = "\xEF\x80\xA3";
+MAYBE_UNUSED static const char *FONT_ICON_MAGNIFYING_GLASS = "\xEF\x80\x82";
+MAYBE_UNUSED static const char *FONT_ICON_HEART = "\xEF\x80\x84";
+MAYBE_UNUSED static const char *FONT_ICON_STAR = "\xEF\x80\x85";
+MAYBE_UNUSED static const char *FONT_ICON_XMARK = "\xEF\x80\x8D";
+MAYBE_UNUSED static const char *FONT_ICON_CIRCLE = "\xEF\x84\x91";
+MAYBE_UNUSED static const char *FONT_ICON_ARROW_ROTATE_LEFT = "\xEF\x83\xA2";
+MAYBE_UNUSED static const char *FONT_ICON_ARROW_ROTATE_RIGHT = "\xEF\x80\x9E";
+MAYBE_UNUSED static const char *FONT_ICON_FLAG_CHECKERED = "\xEF\x84\x9E";
+MAYBE_UNUSED static const char *FONT_ICON_BAN = "\xEF\x81\x9E";
+MAYBE_UNUSED static const char *FONT_ICON_CIRCLE_CHEVRON_DOWN = "\xEF\x84\xBA";
+MAYBE_UNUSED static const char *FONT_ICON_SQUARE_MINUS = "\xEF\x85\x86";
+MAYBE_UNUSED static const char *FONT_ICON_SQUARE_PLUS = "\xEF\x83\xBE";
+MAYBE_UNUSED static const char *FONT_ICON_SORT_UP = "\xEF\x83\x9E";
+MAYBE_UNUSED static const char *FONT_ICON_SORT_DOWN = "\xEF\x83\x9D";
+
+MAYBE_UNUSED static const char *FONT_ICON_HOUSE = "\xEF\x80\x95";
+MAYBE_UNUSED static const char *FONT_ICON_NEWSPAPER = "\xEF\x87\xAA";
+MAYBE_UNUSED static const char *FONT_ICON_POWER_OFF = "\xEF\x80\x91";
+MAYBE_UNUSED static const char *FONT_ICON_GEAR = "\xEF\x80\x93";
+MAYBE_UNUSED static const char *FONT_ICON_PEN_TO_SQUARE = "\xEF\x81\x84";
+MAYBE_UNUSED static const char *FONT_ICON_CLAPPERBOARD = "\xEE\x84\xB1";
+MAYBE_UNUSED static const char *FONT_ICON_EARTH_AMERICAS = "\xEF\x95\xBD";
+MAYBE_UNUSED static const char *FONT_ICON_LIST_UL = "\xEF\x83\x8A";
+MAYBE_UNUSED static const char *FONT_ICON_INFO = "\xEF\x84\xA9";
+
+MAYBE_UNUSED static const char *FONT_ICON_SLASH = "\xEF\x9C\x95";
+MAYBE_UNUSED static const char *FONT_ICON_PLAY = "\xEF\x81\x8B";
+MAYBE_UNUSED static const char *FONT_ICON_PAUSE = "\xEF\x81\x8C";
+MAYBE_UNUSED static const char *FONT_ICON_STOP = "\xEF\x81\x8D";
+MAYBE_UNUSED static const char *FONT_ICON_CHEVRON_LEFT = "\xEF\x81\x93";
+MAYBE_UNUSED static const char *FONT_ICON_CHEVRON_RIGHT = "\xEF\x81\x94";
+MAYBE_UNUSED static const char *FONT_ICON_CHEVRON_UP = "\xEF\x81\xB7";
+MAYBE_UNUSED static const char *FONT_ICON_CHEVRON_DOWN = "\xEF\x81\xB8";
+MAYBE_UNUSED static const char *FONT_ICON_BACKWARD = "\xEF\x81\x8A";
+MAYBE_UNUSED static const char *FONT_ICON_FORWARD = "\xEF\x81\x8E";
+MAYBE_UNUSED static const char *FONT_ICON_RIGHT_FROM_BRACKET = "\xEF\x8B\xB5";
+MAYBE_UNUSED static const char *FONT_ICON_RIGHT_TO_BRACKET = "\xEF\x8B\xB6";
+MAYBE_UNUSED static const char *FONT_ICON_ARROW_UP_RIGHT_FROM_SQUARE = "\xEF\x82\x8E";
+MAYBE_UNUSED static const char *FONT_ICON_BACKWARD_STEP = "\xEF\x81\x88";
+MAYBE_UNUSED static const char *FONT_ICON_FORWARD_STEP = "\xEF\x81\x91";
+MAYBE_UNUSED static const char *FONT_ICON_BACKWARD_FAST = "\xEF\x81\x89";
+MAYBE_UNUSED static const char *FONT_ICON_FORWARD_FAST = "\xEF\x81\x90";
+MAYBE_UNUSED static const char *FONT_ICON_KEYBOARD = "\xE2\x8C\xA8";
+MAYBE_UNUSED static const char *FONT_ICON_ELLIPSIS = "\xEF\x85\x81";
+
+MAYBE_UNUSED static const char *FONT_ICON_FOLDER = "\xEF\x81\xBB";
+MAYBE_UNUSED static const char *FONT_ICON_FOLDER_OPEN = "\xEF\x81\xBC";
+MAYBE_UNUSED static const char *FONT_ICON_FOLDER_TREE = "\xEF\xA0\x82";
+MAYBE_UNUSED static const char *FONT_ICON_FILM = "\xEF\x80\x88";
+MAYBE_UNUSED static const char *FONT_ICON_VIDEO = "\xEF\x80\xBD";
+MAYBE_UNUSED static const char *FONT_ICON_MAP = "\xEF\x89\xB9";
+MAYBE_UNUSED static const char *FONT_ICON_IMAGE = "\xEF\x80\xBE";
+MAYBE_UNUSED static const char *FONT_ICON_MUSIC = "\xEF\x80\x81";
+MAYBE_UNUSED static const char *FONT_ICON_FILE = "\xEF\x85\x9B";
+
+MAYBE_UNUSED static const char *FONT_ICON_PENCIL = "\xEF\x8C\x83";
+MAYBE_UNUSED static const char *FONT_ICON_TRASH = "\xEF\x87\xB8";
+
+MAYBE_UNUSED static const char *FONT_ICON_ARROWS_LEFT_RIGHT = "\xEF\x8C\xB7";
+MAYBE_UNUSED static const char *FONT_ICON_ARROWS_UP_DOWN = "\xEF\x81\xBD";
+MAYBE_UNUSED static const char *FONT_ICON_CIRCLE_PLAY = "\xEF\x85\x84";
+MAYBE_UNUSED static const char *FONT_ICON_BORDER_ALL = "\xEF\xA1\x8C";
+MAYBE_UNUSED static const char *FONT_ICON_EYE = "\xEF\x81\xAE";
+MAYBE_UNUSED static const char *FONT_ICON_EYE_SLASH = "\xEF\x81\xB0";
+
+MAYBE_UNUSED static const char *FONT_ICON_DICE_ONE = "\xEF\x94\xA5";
+MAYBE_UNUSED static const char *FONT_ICON_DICE_TWO = "\xEF\x94\xA8";
+MAYBE_UNUSED static const char *FONT_ICON_DICE_THREE = "\xEF\x94\xA7";
+MAYBE_UNUSED static const char *FONT_ICON_DICE_FOUR = "\xEF\x94\xA4";
+MAYBE_UNUSED static const char *FONT_ICON_DICE_FIVE = "\xEF\x94\xA3";
+MAYBE_UNUSED static const char *FONT_ICON_DICE_SIX = "\xEF\x94\xA6";
+
+MAYBE_UNUSED static const char *FONT_ICON_LAYER_GROUP = "\xEF\x97\xBD";
+MAYBE_UNUSED static const char *FONT_ICON_UNDO = "\xEF\x8B\xAA";
+MAYBE_UNUSED static const char *FONT_ICON_REDO = "\xEF\x8B\xB9";
+} // end namespace FontIcons
+
+enum ETextCursorSelectionMode
+{
+	// ignore any kind of selection
+	TEXT_CURSOR_SELECTION_MODE_NONE = 0,
+	// calculates the selection based on the mouse press and release cursor position
+	TEXT_CURSOR_SELECTION_MODE_CALCULATE,
+	// sets the selection based on the character start and end count(these values have to be decoded character offsets)
+	TEXT_CURSOR_SELECTION_MODE_SET,
+};
+
+enum ETextCursorCursorMode
+{
+	// ignore any kind of cursor
+	TEXT_CURSOR_CURSOR_MODE_NONE = 0,
+	// calculates the cursor based on the mouse release cursor position
+	TEXT_CURSOR_CURSOR_MODE_CALCULATE,
+	// sets the cursor based on the current character (this value has to be decoded character offset)
+	TEXT_CURSOR_CURSOR_MODE_SET,
+};
+
+struct STextBoundingBox
+{
+	float m_X;
+	float m_Y;
+	float m_W;
+	float m_H;
+
+	float Right() const { return m_X + m_W; }
+	float Bottom() const { return m_Y + m_H; }
+	vec2 Size() const { return vec2(m_W, m_H); }
+	void MoveBy(vec2 Offset)
+	{
+		m_X += Offset.x;
+		m_Y += Offset.y;
+	}
+};
+
+// Allow to render multi colored text in one go without having to call TextEx() multiple times.
+// Needed to allow multi colored multi line texts
+struct STextColorSplit
+{
+	int m_CharIndex; // Which index within the text should the split occur
+	int m_Length; // How long is the split
+	ColorRGBA m_Color; // The color the text should be starting from m_CharIndex
+
+	STextColorSplit(int CharIndex, int Length, const ColorRGBA &Color) :
+		m_CharIndex(CharIndex), m_Length(Length), m_Color(Color) {}
+};
+
+class CTextCursor
+{
+public:
+	int m_Flags;
+	int m_LineCount;
+	int m_GlyphCount;
+	int m_CharCount;
+	int m_MaxLines;
+
+	float m_StartX;
+	float m_StartY;
+	float m_LineWidth;
+	float m_X, m_Y;
+	float m_MaxCharacterHeight;
+	float m_LongestLineWidth;
+
+	float m_FontSize;
+	float m_AlignedFontSize;
+	float m_LineSpacing;
+
+	ETextCursorSelectionMode m_CalculateSelectionMode;
+	float m_SelectionHeightFactor;
+
+	// these coordinates are respected if selection mode is set to calculate @see ETextCursorSelectionMode
+	vec2 m_PressMouse;
+	// these coordinates are respected if selection/cursor mode is set to calculate @see ETextCursorSelectionMode / @see ETextCursorCursorMode
+	vec2 m_ReleaseMouse;
+
+	// note m_SelectionStart can be bigger than m_SelectionEnd, depending on how the mouse cursor was dragged
+	// also note, that these are the character offsets decoded
+	int m_SelectionStart;
+	int m_SelectionEnd;
+
+	ETextCursorCursorMode m_CursorMode;
+	bool m_ForceCursorRendering;
+	// note this is the decoded character offset
+	int m_CursorCharacter;
+	vec2 m_CursorRenderedPosition;
+
+	// Color splits of the cursor to allow multicolored text
+	std::vector<STextColorSplit> m_vColorSplits;
+
+	float Height() const
+	{
+		return m_LineCount * m_AlignedFontSize + std::max(0, m_LineCount - 1) * m_LineSpacing;
+	}
+
+	STextBoundingBox BoundingBox() const
+	{
+		return {m_StartX, m_StartY, m_LongestLineWidth, Height()};
+	}
+
+	void Reset()
+	{
+		m_Flags = 0;
+		m_LineCount = 0;
+		m_GlyphCount = 0;
+		m_CharCount = 0;
+		m_MaxLines = 0;
+		m_StartX = 0;
+		m_StartY = 0;
+		m_LineWidth = 0;
+		m_X = 0;
+		m_Y = 0;
+		m_MaxCharacterHeight = 0;
+		m_LongestLineWidth = 0;
+		m_FontSize = 0;
+		m_AlignedFontSize = 0;
+		m_LineSpacing = 0;
+		m_CalculateSelectionMode = TEXT_CURSOR_SELECTION_MODE_NONE;
+		m_SelectionHeightFactor = 0;
+		m_PressMouse = vec2();
+		m_ReleaseMouse = vec2();
+		m_SelectionStart = 0;
+		m_SelectionEnd = 0;
+		m_CursorMode = TEXT_CURSOR_CURSOR_MODE_NONE;
+		m_ForceCursorRendering = false;
+		m_CursorCharacter = 0;
+		m_CursorRenderedPosition = vec2();
+		m_vColorSplits.clear();
+	}
+};
+
+struct STextContainerUsages
+{
+	int m_Dummy = 0;
+};
+
+struct STextContainerIndex
+{
+	int m_Index;
+	std::shared_ptr<STextContainerUsages> m_UseCount =
+		std::make_shared<STextContainerUsages>(STextContainerUsages());
+
+	STextContainerIndex() { Reset(); }
+	bool Valid() const { return m_Index >= 0; }
+	void Reset() { m_Index = -1; }
+};
+
+struct STextSizeProperties
+{
+	float *m_pHeight = nullptr;
+	float *m_pAlignedFontSize = nullptr;
+	float *m_pMaxCharacterHeightInLine = nullptr;
+	int *m_pLineCount = nullptr;
+};
+
+class ITextRender : public IInterface
+{
+	MACRO_INTERFACE("textrender")
+public:
+	virtual void SetCursor(CTextCursor *pCursor, float x, float y, float FontSize, int Flags) const = 0;
+	virtual void MoveCursor(CTextCursor *pCursor, float x, float y) const = 0;
+	virtual void SetCursorPosition(CTextCursor *pCursor, float x, float y) const = 0;
+
+	virtual void LoadFonts() = 0;
+	virtual void SetFontPreset(EFontPreset FontPreset) = 0;
+	virtual void SetFontLanguageVariant(const char *pLanguageFile) = 0;
+
+	virtual void SetRenderFlags(unsigned Flags) = 0;
+	virtual unsigned GetRenderFlags() const = 0;
+
+	ColorRGBA DefaultTextColor() const { return ColorRGBA(1, 1, 1, 1); }
+	ColorRGBA DefaultTextOutlineColor() const { return ColorRGBA(0, 0, 0, 0.3f); }
+	ColorRGBA DefaultTextSelectionColor() const { return ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f); }
+
+	//
+	virtual void TextEx(CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	virtual bool CreateTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	virtual void AppendTextContainer(STextContainerIndex TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	// either creates a new text container or appends to a existing one
+	virtual bool CreateOrAppendTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	// just deletes and creates text container
+	virtual void RecreateTextContainer(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	virtual void RecreateTextContainerSoft(STextContainerIndex &TextContainerIndex, CTextCursor *pCursor, const char *pText, int Length = -1) = 0;
+	virtual void DeleteTextContainer(STextContainerIndex &TextContainerIndex) = 0;
+
+	virtual void UploadTextContainer(STextContainerIndex TextContainerIndex) = 0;
+
+	virtual void RenderTextContainer(STextContainerIndex TextContainerIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor) = 0;
+	virtual void RenderTextContainer(STextContainerIndex TextContainerIndex, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor, float X, float Y) = 0;
+
+	virtual STextBoundingBox GetBoundingBoxTextContainer(STextContainerIndex TextContainerIndex) = 0;
+
+	virtual void UploadEntityLayerText(void *pTexBuff, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TexSubWidth, int TexSubHeight, const char *pText, int Length, float x, float y, int FontSize) = 0;
+	virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth) const = 0;
+	virtual float GetGlyphOffsetX(int FontSize, char TextCharacter) const = 0;
+	virtual int CalculateTextWidth(const char *pText, int TextLength, int FontWidth, int FontSize) const = 0;
+
+	// old foolish interface
+	virtual void TextColor(float r, float g, float b, float a) = 0;
+	virtual void TextColor(ColorRGBA rgb) = 0;
+	virtual void TextOutlineColor(float r, float g, float b, float a) = 0;
+	virtual void TextOutlineColor(ColorRGBA rgb) = 0;
+	virtual void TextSelectionColor(float r, float g, float b, float a) = 0;
+	virtual void TextSelectionColor(ColorRGBA rgb) = 0;
+	virtual void Text(float x, float y, float Size, const char *pText, float LineWidth = -1.0f) = 0;
+	virtual float TextWidth(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, int Flags = 0, const STextSizeProperties &TextSizeProps = {}) = 0;
+	virtual STextBoundingBox TextBoundingBox(float Size, const char *pText, int StrLength = -1, float LineWidth = -1.0f, float LineSpacing = 0.0f, int Flags = 0) = 0;
+
+	virtual ColorRGBA GetTextColor() const = 0;
+	virtual ColorRGBA GetTextOutlineColor() const = 0;
+	virtual ColorRGBA GetTextSelectionColor() const = 0;
+
+	virtual void OnPreWindowResize() = 0;
+	virtual void OnWindowResize() = 0;
+};
+
+class IEngineTextRender : public ITextRender
+{
+	MACRO_INTERFACE("enginetextrender")
+public:
+	virtual void Init() = 0;
+	virtual void Shutdown() override = 0;
+};
+
+extern IEngineTextRender *CreateEngineTextRender();
+
+#endif
diff --git a/src_bkp/engine/updater.h b/src_bkp/engine/updater.h
new file mode 100644
index 0000000000..8a3be8651f
--- /dev/null
+++ b/src_bkp/engine/updater.h
@@ -0,0 +1,30 @@
+#ifndef ENGINE_UPDATER_H
+#define ENGINE_UPDATER_H
+
+#include "kernel.h"
+
+class IUpdater : public IInterface
+{
+	MACRO_INTERFACE("updater")
+public:
+	enum
+	{
+		CLEAN = 0,
+		GETTING_MANIFEST,
+		GOT_MANIFEST,
+		PARSING_UPDATE,
+		DOWNLOADING,
+		MOVE_FILES,
+		NEED_RESTART,
+		FAIL,
+	};
+
+	virtual void Update() = 0;
+	virtual void InitiateUpdate() = 0;
+
+	virtual int GetCurrentState() = 0;
+	virtual void GetCurrentFile(char *pBuf, int BufSize) = 0;
+	virtual int GetCurrentPercent() = 0;
+};
+
+#endif
diff --git a/src_bkp/engine/uuid.h b/src_bkp/engine/uuid.h
new file mode 100644
index 0000000000..6063f63e2f
--- /dev/null
+++ b/src_bkp/engine/uuid.h
@@ -0,0 +1,6 @@
+#ifndef ENGINE_UUID_H
+#define ENGINE_UUID_H
+#include <engine/shared/uuid_manager.h>
+
+void RegisterGameUuids(CUuidManager *pManager);
+#endif // ENGINE_UUID_H
diff --git a/src_bkp/engine/warning.h b/src_bkp/engine/warning.h
new file mode 100644
index 0000000000..bd1e45e752
--- /dev/null
+++ b/src_bkp/engine/warning.h
@@ -0,0 +1,16 @@
+#ifndef ENGINE_WARNING_H
+#define ENGINE_WARNING_H
+
+struct SWarning
+{
+	SWarning() = default;
+	SWarning(const char *pMsg);
+	SWarning(const char *pTitle, const char *pMsg);
+
+	char m_aWarningTitle[128];
+	char m_aWarningMsg[256];
+	bool m_WasShown = false;
+	bool m_AutoHide = true;
+};
+
+#endif
diff --git a/src_bkp/game/alloc.h b/src_bkp/game/alloc.h
new file mode 100644
index 0000000000..b4a76a9bd9
--- /dev/null
+++ b/src_bkp/game/alloc.h
@@ -0,0 +1,80 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_ALLOC_H
+#define GAME_ALLOC_H
+
+#include <new>
+
+#include <base/system.h>
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+#if __has_feature(address_sanitizer)
+#include <sanitizer/asan_interface.h>
+#else
+#define ASAN_POISON_MEMORY_REGION(addr, size) \
+	((void)(addr), (void)(size))
+#define ASAN_UNPOISON_MEMORY_REGION(addr, size) \
+	((void)(addr), (void)(size))
+#endif
+
+#define MACRO_ALLOC_HEAP() \
+public: \
+	void *operator new(size_t Size) \
+	{ \
+		void *p = malloc(Size); \
+		mem_zero(p, Size); \
+		return p; \
+	} \
+	void operator delete(void *pPtr) \
+	{ \
+		free(pPtr); \
+	} \
+\
+private:
+
+#define MACRO_ALLOC_POOL_ID() \
+public: \
+	void *operator new(size_t Size, int id); \
+	void operator delete(void *p, int id); \
+	void operator delete(void *p); /* NOLINT(misc-new-delete-overloads) */ \
+\
+private:
+
+#if __has_feature(address_sanitizer)
+#define MACRO_ALLOC_GET_SIZE(POOLTYPE) ((sizeof(POOLTYPE) + 7) & ~7)
+#else
+#define MACRO_ALLOC_GET_SIZE(POOLTYPE) (sizeof(POOLTYPE))
+#endif
+
+#define MACRO_ALLOC_POOL_ID_IMPL(POOLTYPE, PoolSize) \
+	static char gs_PoolData##POOLTYPE[PoolSize][MACRO_ALLOC_GET_SIZE(POOLTYPE)] = {{0}}; \
+	static int gs_PoolUsed##POOLTYPE[PoolSize] = {0}; \
+	MAYBE_UNUSED static int gs_PoolDummy##POOLTYPE = (ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE, sizeof(gs_PoolData##POOLTYPE)), 0); \
+	void *POOLTYPE::operator new(size_t Size, int id) \
+	{ \
+		dbg_assert(sizeof(POOLTYPE) >= Size, "size error"); \
+		dbg_assert(!gs_PoolUsed##POOLTYPE[id], "already used"); \
+		ASAN_UNPOISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		gs_PoolUsed##POOLTYPE[id] = 1; \
+		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		return gs_PoolData##POOLTYPE[id]; \
+	} \
+	void POOLTYPE::operator delete(void *p, int id) \
+	{ \
+		dbg_assert(gs_PoolUsed##POOLTYPE[id], "not used"); \
+		dbg_assert(id == (POOLTYPE *)p - (POOLTYPE *)gs_PoolData##POOLTYPE, "invalid id"); \
+		gs_PoolUsed##POOLTYPE[id] = 0; \
+		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+	} \
+	void POOLTYPE::operator delete(void *p) /* NOLINT(misc-new-delete-overloads) */ \
+	{ \
+		int id = (POOLTYPE *)p - (POOLTYPE *)gs_PoolData##POOLTYPE; \
+		dbg_assert(gs_PoolUsed##POOLTYPE[id], "not used"); \
+		gs_PoolUsed##POOLTYPE[id] = 0; \
+		mem_zero(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+		ASAN_POISON_MEMORY_REGION(gs_PoolData##POOLTYPE[id], sizeof(gs_PoolData##POOLTYPE[id])); \
+	}
+
+#endif
diff --git a/src_bkp/game/client/animstate.cpp b/src_bkp/game/client/animstate.cpp
new file mode 100644
index 0000000000..2a61155a28
--- /dev/null
+++ b/src_bkp/game/client/animstate.cpp
@@ -0,0 +1,95 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/math.h>
+#include <game/generated/client_data.h>
+
+#include "animstate.h"
+
+static void AnimSeqEval(const CAnimSequence *pSeq, float Time, CAnimKeyframe *pFrame)
+{
+	if(pSeq->m_NumFrames == 0)
+	{
+		pFrame->m_Time = 0;
+		pFrame->m_X = 0;
+		pFrame->m_Y = 0;
+		pFrame->m_Angle = 0;
+	}
+	else if(pSeq->m_NumFrames == 1)
+	{
+		*pFrame = pSeq->m_aFrames[0];
+	}
+	else
+	{
+		CAnimKeyframe *pFrame1 = nullptr;
+		CAnimKeyframe *pFrame2 = nullptr;
+		float Blend = 0.0f;
+
+		// TODO: make this smarter.. binary search
+		for(int i = 1; i < pSeq->m_NumFrames; i++)
+		{
+			if(pSeq->m_aFrames[i - 1].m_Time <= Time && pSeq->m_aFrames[i].m_Time >= Time)
+			{
+				pFrame1 = &pSeq->m_aFrames[i - 1];
+				pFrame2 = &pSeq->m_aFrames[i];
+				Blend = (Time - pFrame1->m_Time) / (pFrame2->m_Time - pFrame1->m_Time);
+				break;
+			}
+		}
+
+		if(pFrame1 != nullptr && pFrame2 != nullptr)
+		{
+			pFrame->m_Time = Time;
+			pFrame->m_X = mix(pFrame1->m_X, pFrame2->m_X, Blend);
+			pFrame->m_Y = mix(pFrame1->m_Y, pFrame2->m_Y, Blend);
+			pFrame->m_Angle = mix(pFrame1->m_Angle, pFrame2->m_Angle, Blend);
+		}
+	}
+}
+
+static void AnimAddKeyframe(CAnimKeyframe *pSeq, const CAnimKeyframe *pAdded, float Amount)
+{
+	// AnimSeqEval fills m_X for any case, clang-analyzer assumes going into the
+	// final else branch with pSeq->m_NumFrames < 2, which is impossible.
+	pSeq->m_X += pAdded->m_X * Amount; // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
+	pSeq->m_Y += pAdded->m_Y * Amount;
+	pSeq->m_Angle += pAdded->m_Angle * Amount;
+}
+
+void CAnimState::AnimAdd(CAnimState *pState, const CAnimState *pAdded, float Amount)
+{
+	AnimAddKeyframe(&pState->m_Body, pAdded->GetBody(), Amount);
+	AnimAddKeyframe(&pState->m_BackFoot, pAdded->GetBackFoot(), Amount);
+	AnimAddKeyframe(&pState->m_FrontFoot, pAdded->GetFrontFoot(), Amount);
+	AnimAddKeyframe(&pState->m_Attach, pAdded->GetAttach(), Amount);
+}
+
+void CAnimState::Set(CAnimation *pAnim, float Time)
+{
+	AnimSeqEval(&pAnim->m_Body, Time, &m_Body);
+	AnimSeqEval(&pAnim->m_BackFoot, Time, &m_BackFoot);
+	AnimSeqEval(&pAnim->m_FrontFoot, Time, &m_FrontFoot);
+	AnimSeqEval(&pAnim->m_Attach, Time, &m_Attach);
+}
+
+void CAnimState::Add(CAnimation *pAnim, float Time, float Amount)
+{
+	CAnimState Add;
+	Add.Set(pAnim, Time);
+	AnimAdd(this, &Add, Amount);
+}
+
+const CAnimState *CAnimState::GetIdle()
+{
+	static CAnimState s_State;
+	static bool s_Init = true;
+
+	if(s_Init)
+	{
+		s_State.Set(&g_pData->m_aAnimations[ANIM_BASE], 0.0f);
+		s_State.Add(&g_pData->m_aAnimations[ANIM_IDLE], 0.0f, 1.0f);
+		s_Init = false;
+	}
+
+	return &s_State;
+}
diff --git a/src_bkp/game/client/animstate.h b/src_bkp/game/client/animstate.h
new file mode 100644
index 0000000000..45accba6f3
--- /dev/null
+++ b/src_bkp/game/client/animstate.h
@@ -0,0 +1,28 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_ANIMSTATE_H
+#define GAME_CLIENT_ANIMSTATE_H
+
+#include <game/generated/client_data.h>
+
+class CAnimState
+{
+	CAnimKeyframe m_Body;
+	CAnimKeyframe m_BackFoot;
+	CAnimKeyframe m_FrontFoot;
+	CAnimKeyframe m_Attach;
+
+	void AnimAdd(CAnimState *pState, const CAnimState *pAdded, float Amount);
+
+public:
+	const CAnimKeyframe *GetBody() const { return &m_Body; }
+	const CAnimKeyframe *GetBackFoot() const { return &m_BackFoot; }
+	const CAnimKeyframe *GetFrontFoot() const { return &m_FrontFoot; }
+	const CAnimKeyframe *GetAttach() const { return &m_Attach; }
+	void Set(CAnimation *pAnim, float Time);
+	void Add(CAnimation *pAnim, float Time, float Amount);
+
+	const static CAnimState *GetIdle();
+};
+
+#endif
diff --git a/src_bkp/game/client/component.cpp b/src_bkp/game/client/component.cpp
new file mode 100644
index 0000000000..754aea48d5
--- /dev/null
+++ b/src_bkp/game/client/component.cpp
@@ -0,0 +1,42 @@
+#include "component.h"
+
+#include "gameclient.h"
+
+class IKernel *CComponent::Kernel() const { return m_pClient->Kernel(); }
+class IEngine *CComponent::Engine() const { return m_pClient->Engine(); }
+class IGraphics *CComponent::Graphics() const { return m_pClient->Graphics(); }
+class ITextRender *CComponent::TextRender() const { return m_pClient->TextRender(); }
+class IInput *CComponent::Input() const { return m_pClient->Input(); }
+class IStorage *CComponent::Storage() const { return m_pClient->Storage(); }
+class CUI *CComponent::UI() const { return m_pClient->UI(); }
+class ISound *CComponent::Sound() const { return m_pClient->Sound(); }
+class CRenderTools *CComponent::RenderTools() const { return m_pClient->RenderTools(); }
+class IConfigManager *CComponent::ConfigManager() const { return m_pClient->ConfigManager(); }
+class CConfig *CComponent::Config() const { return m_pClient->Config(); }
+class IConsole *CComponent::Console() const { return m_pClient->Console(); }
+class IDemoPlayer *CComponent::DemoPlayer() const { return m_pClient->DemoPlayer(); }
+class IDemoRecorder *CComponent::DemoRecorder(int Recorder) const { return m_pClient->DemoRecorder(Recorder); }
+class IFavorites *CComponent::Favorites() const { return m_pClient->Favorites(); }
+class IServerBrowser *CComponent::ServerBrowser() const { return m_pClient->ServerBrowser(); }
+class CLayers *CComponent::Layers() const { return m_pClient->Layers(); }
+class CCollision *CComponent::Collision() const { return m_pClient->Collision(); }
+#if defined(CONF_AUTOUPDATE)
+class IUpdater *CComponent::Updater() const
+{
+	return m_pClient->Updater();
+}
+#endif
+
+float CComponent::LocalTime() const
+{
+#if defined(CONF_VIDEORECORDER)
+	return IVideo::Current() ? IVideo::LocalTime() : Client()->LocalTime();
+#else
+	return Client()->LocalTime();
+#endif
+}
+
+class IClient *CComponent::Client() const
+{
+	return m_pClient->Client();
+}
diff --git a/src_bkp/game/client/component.h b/src_bkp/game/client/component.h
new file mode 100644
index 0000000000..8e754e7f32
--- /dev/null
+++ b/src_bkp/game/client/component.h
@@ -0,0 +1,221 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENT_H
+#define GAME_CLIENT_COMPONENT_H
+
+#if defined(CONF_VIDEORECORDER)
+#include <engine/shared/video.h>
+#endif
+
+#include <engine/input.h>
+
+class CGameClient;
+
+/**
+* This class is inherited by all the client components.
+*
+* These components can implement the virtual methods such as OnInit(), OnMessage(int Msg, void *pRawMsg) to provide their functionality.
+*/
+class CComponent
+{
+protected:
+	friend class CGameClient;
+
+	CGameClient *m_pClient;
+
+	// perhaps propagate pointers for these as well
+
+	/**
+	 * Get the kernel interface.
+	 */
+	class IKernel *Kernel() const;
+	class IEngine *Engine() const;
+	/**
+	 * Get the graphics interface.
+	 */
+	class IGraphics *Graphics() const;
+	/**
+	 * Get the text rendering interface.
+	 */
+	class ITextRender *TextRender() const;
+	/**
+	 * Get the input interface.
+	 */
+	class IInput *Input() const;
+	/**
+	 * Get the storage interface.
+	 */
+	class IStorage *Storage() const;
+	/**
+	 * Get the ui interface.
+	 */
+	class CUI *UI() const;
+	/**
+	 * Get the sound interface.
+	 */
+	class ISound *Sound() const;
+	/**
+	 * Get the render tools interface.
+	 */
+	class CRenderTools *RenderTools() const;
+	/**
+	 * Get the config manager interface.
+	 */
+	class IConfigManager *ConfigManager() const;
+	/**
+	 * Get the config interface.
+	 */
+	class CConfig *Config() const;
+	/**
+	 * Get the console interface.
+	 */
+	class IConsole *Console() const;
+	/**
+	 * Get the demo player interface.
+	 */
+	class IDemoPlayer *DemoPlayer() const;
+	/**
+	 * Get the demo recorder interface.
+	 *
+	 * @param Recorder A member of the RECORDER_x enum
+	 * @see RECORDER_MANUAL
+	 * @see RECORDER_AUTO
+	 * @see RECORDER_RACE
+	 * @see RECORDER_REPLAYS
+	 */
+	class IDemoRecorder *DemoRecorder(int Recorder) const;
+	class IFavorites *Favorites() const;
+	/**
+	 * Get the server browser interface.
+	 */
+	class IServerBrowser *ServerBrowser() const;
+	/**
+	 * Get the layers interface.
+	 */
+	class CLayers *Layers() const;
+	/**
+	 * Get the collision interface.
+	 */
+	class CCollision *Collision() const;
+#if defined(CONF_AUTOUPDATE)
+	/**
+	 * Get the updater interface.
+	 */
+	class IUpdater *Updater() const;
+#endif
+
+#if defined(CONF_VIDEORECORDER)
+	/**
+	 * Gets the current time.
+	 * @see time_get()
+	 */
+	int64_t time() const
+	{
+		return IVideo::Current() ? IVideo::Time() : time_get();
+	}
+#else
+	/**
+	 * Gets the current time.
+	 * @see time_get()
+	 */
+	int64_t time() const
+	{
+		return time_get();
+	}
+#endif
+	/**
+	 * Gets the local time.
+	 */
+	float LocalTime() const;
+
+public:
+	/**
+	 * The component virtual destructor.
+	 */
+	virtual ~CComponent() {}
+	/**
+	 * Gets the size of the non-abstract component.
+	 */
+	virtual int Sizeof() const = 0;
+	/**
+	 * Get a pointer to the game client.
+	 */
+	class CGameClient *GameClient() const { return m_pClient; }
+	/**
+	 * Get the client interface.
+	 */
+	class IClient *Client() const;
+
+	/**
+	 * This method is called when the client changes state, e.g from offline to online.
+	 * @see IClient::STATE_CONNECTING
+	 * @see IClient::STATE_LOADING
+	 * @see IClient::STATE_ONLINE
+	 */
+	virtual void OnStateChange(int NewState, int OldState){};
+	/**
+	 * Called to let the components register their console commands.
+	 */
+	virtual void OnConsoleInit(){};
+	/**
+	 * Called to let the components run initialization code.
+	 */
+	virtual void OnInit(){};
+	/**
+	 * Called to cleanup the component.
+	 * This method is called when the client is closed.
+	 */
+	virtual void OnShutdown(){};
+	/**
+	 * Called to reset the component.
+	 * This method is usually called on your component constructor to avoid code duplication.
+	 * @see CHud::CHud()
+	 * @see CHud::OnReset()
+	 */
+	virtual void OnReset(){};
+	/**
+	 * Called when the window has been resized.
+	 */
+	virtual void OnWindowResize() {}
+	/**
+	 * Called when the component should get rendered.
+	 *
+	 * The render order depends on the component insertion order.
+	 */
+	virtual void OnRender(){};
+	/**
+	 * Called when a new snapshot is received.
+	 */
+	virtual void OnNewSnapshot(){};
+	/**
+	 * Called when the input gets released, for example when a text box loses focus.
+	 */
+	virtual void OnRelease(){};
+	/**
+	 * Called on map load.
+	 */
+	virtual void OnMapLoad(){};
+	/**
+	 * Called when receiving a network message.
+	 * @param Msg The message type.
+	 * @param pRawMsg The message data.
+	 * @see NETMSGTYPE_SV_DDRACETIME
+	 * @see CNetMsg_Sv_DDRaceTime
+	 */
+	virtual void OnMessage(int Msg, void *pRawMsg) {}
+	/**
+	 * Called on mouse movement, where the x and y values are deltas.
+	 *
+	 * @param x The amount of change in the x coordinate since the last call.
+	 * @param y The amount of change in the y coordinate since the last call.
+	 * @param CursorType The type of cursor that caused the movement.
+	 */
+	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) { return false; }
+	/**
+	 * Called on a input event.
+	 * @param Event The input event.
+	 */
+	virtual bool OnInput(const IInput::CEvent &Event) { return false; }
+};
+
+#endif
diff --git a/src_bkp/game/client/components/background.cpp b/src_bkp/game/client/components/background.cpp
new file mode 100644
index 0000000000..425ec5bf64
--- /dev/null
+++ b/src_bkp/game/client/components/background.cpp
@@ -0,0 +1,110 @@
+#include <base/system.h>
+
+#include <engine/map.h>
+#include <engine/shared/config.h>
+
+#include <game/client/components/mapimages.h>
+#include <game/client/components/maplayers.h>
+
+#include <game/client/gameclient.h>
+#include <game/layers.h>
+
+#include "background.h"
+
+CBackground::CBackground(int MapType, bool OnlineOnly) :
+	CMapLayers(MapType, OnlineOnly)
+{
+	m_pLayers = new CLayers;
+	m_pBackgroundLayers = m_pLayers;
+	m_pImages = new CMapImages;
+	m_pBackgroundImages = m_pImages;
+	m_Loaded = false;
+	m_aMapName[0] = '\0';
+}
+
+CBackground::~CBackground()
+{
+	delete m_pBackgroundLayers;
+	delete m_pBackgroundImages;
+}
+
+CBackgroundEngineMap *CBackground::CreateBGMap()
+{
+	return new CBackgroundEngineMap;
+}
+
+void CBackground::OnInit()
+{
+	m_pBackgroundMap = CreateBGMap();
+	m_pMap = m_pBackgroundMap;
+
+	m_pImages->m_pClient = GameClient();
+	Kernel()->RegisterInterface(m_pBackgroundMap);
+	if(g_Config.m_ClBackgroundEntities[0] != '\0' && str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP))
+		LoadBackground();
+}
+
+void CBackground::LoadBackground()
+{
+	if(m_Loaded && m_pMap == m_pBackgroundMap)
+		m_pMap->Unload();
+
+	m_Loaded = false;
+	m_pMap = m_pBackgroundMap;
+	m_pLayers = m_pBackgroundLayers;
+	m_pImages = m_pBackgroundImages;
+
+	str_copy(m_aMapName, g_Config.m_ClBackgroundEntities);
+	if(g_Config.m_ClBackgroundEntities[0] != '\0')
+	{
+		bool NeedImageLoading = false;
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "maps/%s", g_Config.m_ClBackgroundEntities);
+		if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0)
+		{
+			m_pMap = Kernel()->RequestInterface<IEngineMap>();
+			if(m_pMap->IsLoaded())
+			{
+				m_pLayers = GameClient()->Layers();
+				m_pImages = &GameClient()->m_MapImages;
+				m_Loaded = true;
+			}
+		}
+		else if(m_pMap->Load(aBuf))
+		{
+			m_pLayers->InitBackground(m_pMap);
+			NeedImageLoading = true;
+			m_Loaded = true;
+		}
+
+		if(m_Loaded)
+		{
+			CMapLayers::OnMapLoad();
+			if(NeedImageLoading)
+				m_pImages->LoadBackground(m_pLayers, m_pMap);
+		}
+	}
+}
+
+void CBackground::OnMapLoad()
+{
+	if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0 || str_comp(g_Config.m_ClBackgroundEntities, m_aMapName))
+	{
+		LoadBackground();
+	}
+}
+
+void CBackground::OnRender()
+{
+	if(!m_Loaded)
+		return;
+
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	if(g_Config.m_ClOverlayEntities != 100)
+		return;
+
+	CMapLayers::OnRender();
+}
diff --git a/src_bkp/game/client/components/background.h b/src_bkp/game/client/components/background.h
new file mode 100644
index 0000000000..45e3066c46
--- /dev/null
+++ b/src_bkp/game/client/components/background.h
@@ -0,0 +1,48 @@
+#ifndef GAME_CLIENT_COMPONENTS_BACKGROUND_H
+#define GAME_CLIENT_COMPONENTS_BACKGROUND_H
+
+#include <engine/shared/map.h>
+
+#include <game/client/components/maplayers.h>
+
+#include <cstdint>
+
+class CLayers;
+class CMapImages;
+
+// Special value to use background of current map
+#define CURRENT_MAP "%current%"
+
+class CBackgroundEngineMap : public CMap
+{
+	MACRO_INTERFACE("background_enginemap")
+};
+
+class CBackground : public CMapLayers
+{
+protected:
+	IEngineMap *m_pMap;
+	bool m_Loaded;
+	char m_aMapName[MAX_MAP_LENGTH];
+
+	//to avoid memory leak when switching to %current%
+	CBackgroundEngineMap *m_pBackgroundMap;
+	CLayers *m_pBackgroundLayers;
+	CMapImages *m_pBackgroundImages;
+
+	virtual CBackgroundEngineMap *CreateBGMap();
+
+public:
+	CBackground(int MapType = CMapLayers::TYPE_BACKGROUND_FORCE, bool OnlineOnly = true);
+	virtual ~CBackground();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnInit() override;
+	virtual void OnMapLoad() override;
+	virtual void OnRender() override;
+
+	void LoadBackground();
+	const char *MapName() const { return m_aMapName; }
+};
+
+#endif
diff --git a/src_bkp/game/client/components/binds.cpp b/src_bkp/game/client/components/binds.cpp
new file mode 100644
index 0000000000..1ec52bc76f
--- /dev/null
+++ b/src_bkp/game/client/components/binds.cpp
@@ -0,0 +1,529 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "binds.h"
+#include <base/system.h>
+#include <engine/config.h>
+#include <engine/shared/config.h>
+
+#include <game/client/gameclient.h>
+
+static const ColorRGBA gs_BindPrintColor{1.0f, 1.0f, 0.8f, 1.0f};
+
+bool CBinds::CBindsSpecial::OnInput(const IInput::CEvent &Event)
+{
+	// only handle F and composed F binds
+	if(((Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) || (Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24)) && (Event.m_Key != KEY_F5 || !m_pClient->m_Menus.IsActive()))
+	{
+		int Mask = CBinds::GetModifierMask(Input());
+
+		// Look for a composed bind
+		bool ret = false;
+		if(m_pBinds->m_aapKeyBindings[Mask][Event.m_Key])
+		{
+			m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mask][Event.m_Key]);
+			ret = true;
+		}
+		// Look for a non composed bind
+		if(!ret && m_pBinds->m_aapKeyBindings[0][Event.m_Key])
+		{
+			m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[0][Event.m_Key]);
+			ret = true;
+		}
+
+		return ret;
+	}
+
+	return false;
+}
+
+CBinds::CBinds()
+{
+	mem_zero(m_aapKeyBindings, sizeof(m_aapKeyBindings));
+	m_SpecialBinds.m_pBinds = this;
+}
+
+CBinds::~CBinds()
+{
+	for(int i = 0; i < KEY_LAST; i++)
+		for(auto &apKeyBinding : m_aapKeyBindings)
+			free(apKeyBinding[i]);
+}
+
+void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int ModifierCombination)
+{
+	if(KeyID < 0 || KeyID >= KEY_LAST)
+		return;
+
+	if(FreeOnly && Get(KeyID, ModifierCombination)[0])
+		return;
+
+	free(m_aapKeyBindings[ModifierCombination][KeyID]);
+	m_aapKeyBindings[ModifierCombination][KeyID] = 0;
+
+	// skip modifiers for +xxx binds
+	if(pStr[0] == '+')
+		ModifierCombination = 0;
+
+	char aBuf[256];
+	if(!pStr[0])
+	{
+		str_format(aBuf, sizeof(aBuf), "unbound %s%s (%d)", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID);
+	}
+	else
+	{
+		int Size = str_length(pStr) + 1;
+		m_aapKeyBindings[ModifierCombination][KeyID] = (char *)malloc(Size);
+		str_copy(m_aapKeyBindings[ModifierCombination][KeyID], pStr, Size);
+		str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", GetKeyBindModifiersName(ModifierCombination), Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[ModifierCombination][KeyID]);
+	}
+	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "binds", aBuf, gs_BindPrintColor);
+}
+
+int CBinds::GetModifierMask(IInput *pInput)
+{
+	int Mask = 0;
+	static const auto s_aModifierKeys = {
+		KEY_LSHIFT,
+		KEY_RSHIFT,
+		KEY_LCTRL,
+		KEY_RCTRL,
+		KEY_LALT,
+		KEY_RALT,
+		KEY_LGUI,
+		KEY_RGUI,
+	};
+	for(const auto Key : s_aModifierKeys)
+	{
+		if(pInput->KeyIsPressed(Key))
+		{
+			Mask |= GetModifierMaskOfKey(Key);
+		}
+	}
+
+	return Mask;
+}
+
+int CBinds::GetModifierMaskOfKey(int Key)
+{
+	switch(Key)
+	{
+	case KEY_LSHIFT:
+	case KEY_RSHIFT:
+		return 1 << CBinds::MODIFIER_SHIFT;
+	case KEY_LCTRL:
+	case KEY_RCTRL:
+		return 1 << CBinds::MODIFIER_CTRL;
+	case KEY_LALT:
+	case KEY_RALT:
+		return 1 << CBinds::MODIFIER_ALT;
+	case KEY_LGUI:
+	case KEY_RGUI:
+		return 1 << CBinds::MODIFIER_GUI;
+	default:
+		return 0;
+	}
+}
+
+bool CBinds::OnInput(const IInput::CEvent &Event)
+{
+	// don't handle invalid events
+	if(Event.m_Key <= KEY_FIRST || Event.m_Key >= KEY_LAST)
+		return false;
+
+	int Mask = GetModifierMask(Input());
+	int KeyModifierMask = GetModifierMaskOfKey(Event.m_Key);
+	Mask &= ~KeyModifierMask;
+
+	bool ret = false;
+	const char *pKey = nullptr;
+
+	if(m_aapKeyBindings[Mask][Event.m_Key])
+	{
+		if(Event.m_Flags & IInput::FLAG_PRESS)
+		{
+			Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mask][Event.m_Key]);
+			pKey = m_aapKeyBindings[Mask][Event.m_Key];
+		}
+		// Have to check for nullptr again because the previous execute can unbind itself
+		if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[Mask][Event.m_Key])
+			Console()->ExecuteLineStroked(0, m_aapKeyBindings[Mask][Event.m_Key]);
+		ret = true;
+	}
+
+	if(m_aapKeyBindings[0][Event.m_Key] && !ret)
+	{
+		// When ctrl+shift are pressed (ctrl+shift binds and also the hard-coded ctrl+shift+d, ctrl+shift+g, ctrl+shift+e), ignore other +xxx binds
+		if(Event.m_Flags & IInput::FLAG_PRESS && Mask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) && Mask != ((1 << MODIFIER_GUI) | (1 << MODIFIER_SHIFT)))
+		{
+			Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][Event.m_Key]);
+			pKey = m_aapKeyBindings[Mask][Event.m_Key];
+		}
+		// Have to check for nullptr again because the previous execute can unbind itself
+		if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[0][Event.m_Key])
+			Console()->ExecuteLineStroked(0, m_aapKeyBindings[0][Event.m_Key]);
+		ret = true;
+	}
+
+	if(g_Config.m_ClSubTickAiming && pKey)
+	{
+		if(str_comp("+fire", pKey) == 0 || str_comp("+hook", pKey) == 0)
+		{
+			m_MouseOnAction = true;
+		}
+	}
+
+	return ret;
+}
+
+void CBinds::UnbindAll()
+{
+	for(auto &apKeyBinding : m_aapKeyBindings)
+	{
+		for(auto &pKeyBinding : apKeyBinding)
+		{
+			free(pKeyBinding);
+			pKeyBinding = 0;
+		}
+	}
+}
+
+const char *CBinds::Get(int KeyID, int ModifierCombination)
+{
+	if(KeyID > 0 && KeyID < KEY_LAST && m_aapKeyBindings[ModifierCombination][KeyID])
+		return m_aapKeyBindings[ModifierCombination][KeyID];
+	return "";
+}
+
+void CBinds::GetKey(const char *pBindStr, char *pBuf, size_t BufSize)
+{
+	pBuf[0] = 0;
+	for(int Mod = 0; Mod < MODIFIER_COMBINATION_COUNT; Mod++)
+	{
+		for(int KeyId = 0; KeyId < KEY_LAST; KeyId++)
+		{
+			const char *pBind = Get(KeyId, Mod);
+			if(!pBind[0])
+				continue;
+
+			if(str_comp(pBind, pBindStr) == 0)
+			{
+				if(Mod)
+					str_format(pBuf, BufSize, "%s+%s", GetModifierName(Mod), Input()->KeyName(KeyId));
+				else
+					str_copy(pBuf, Input()->KeyName(KeyId), BufSize);
+				return;
+			}
+		}
+	}
+}
+
+void CBinds::StaBinds()
+{
+	Bind(KEY_X, "exec TripleFlyON.cfg ");
+	Bind(KEY_V, "exec DeepFlyOn.cfg ");
+}
+
+void CBinds::SetDefaults()
+{
+	// set default key bindings
+	UnbindAll();
+	Bind(KEY_F1, "toggle_local_console");
+	Bind(KEY_F2, "toggle_remote_console");
+	Bind(KEY_TAB, "+scoreboard");
+	Bind(KEY_EQUALS, "+statboard");
+	Bind(KEY_F10, "screenshot");
+
+	Bind(KEY_A, "+left");
+	Bind(KEY_D, "+right");
+
+	Bind(KEY_SPACE, "+jump");
+	Bind(KEY_MOUSE_1, "+fire");
+	Bind(KEY_MOUSE_2, "+hook");
+	Bind(KEY_LSHIFT, "+emote");
+	Bind(KEY_RETURN, "+show_chat; chat all");
+	Bind(KEY_RIGHT, "spectate_next");
+	Bind(KEY_LEFT, "spectate_previous");
+	Bind(KEY_RSHIFT, "+spectate");
+
+	Bind(KEY_1, "+weapon1");
+	Bind(KEY_2, "+weapon2");
+	Bind(KEY_3, "+weapon3");
+	Bind(KEY_4, "+weapon4");
+	Bind(KEY_5, "+weapon5");
+
+	Bind(KEY_MOUSE_WHEEL_UP, "+prevweapon");
+	Bind(KEY_MOUSE_WHEEL_DOWN, "+nextweapon");
+
+	Bind(KEY_T, "+show_chat; chat all");
+	Bind(KEY_Y, "+show_chat; chat team");
+	Bind(KEY_U, "+show_chat");
+	Bind(KEY_I, "+show_chat; chat all /c ");
+
+	Bind(KEY_F3, "vote yes");
+	Bind(KEY_F4, "vote no");
+
+	Bind(KEY_K, "kill");
+	Bind(KEY_Q, "say /pause");
+	Bind(KEY_P, "say /pause");
+
+	// DDRace
+	g_Config.m_ClDDRaceBindsSet = 0;
+	SetDDRaceBinds(false);
+}
+
+void CBinds::OnConsoleInit()
+{
+	ConfigManager()->RegisterCallback(ConfigSaveCallback, this);
+
+	Console()->Register("bind", "s[key] ?r[command]", CFGFLAG_CLIENT, ConBind, this, "Bind key to execute a command or view keybindings");
+	Console()->Register("binds", "?s[key]", CFGFLAG_CLIENT, ConBinds, this, "Print command executed by this keybinding or all binds");
+	Console()->Register("unbind", "s[key]", CFGFLAG_CLIENT, ConUnbind, this, "Unbind key");
+	Console()->Register("unbindall", "", CFGFLAG_CLIENT, ConUnbindAll, this, "Unbind all keys");
+
+	// default bindings
+	SetDefaults();
+}
+
+void CBinds::ConBind(IConsole::IResult *pResult, void *pUserData)
+{
+	CBinds *pBinds = (CBinds *)pUserData;
+	const char *pBindStr = pResult->GetString(0);
+	int Modifier;
+	int KeyID = pBinds->GetBindSlot(pBindStr, &Modifier);
+
+	if(!KeyID)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "key %s not found", pBindStr);
+		pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+		return;
+	}
+
+	if(pResult->NumArguments() == 1)
+	{
+		char aBuf[256];
+		const char *pKeyName = pResult->GetString(0);
+
+		if(!pBinds->m_aapKeyBindings[Modifier][KeyID])
+			str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, KeyID);
+		else
+			str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, KeyID, pBinds->m_aapKeyBindings[Modifier][KeyID]);
+
+		pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+		return;
+	}
+
+	pBinds->Bind(KeyID, pResult->GetString(1), false, Modifier);
+}
+
+void CBinds::ConBinds(IConsole::IResult *pResult, void *pUserData)
+{
+	CBinds *pBinds = (CBinds *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		char aBuf[256];
+		const char *pKeyName = pResult->GetString(0);
+
+		int Modifier;
+		int KeyID = pBinds->GetBindSlot(pKeyName, &Modifier);
+		if(!KeyID)
+		{
+			str_format(aBuf, sizeof(aBuf), "key '%s' not found", pKeyName);
+			pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+		}
+		else
+		{
+			if(!pBinds->m_aapKeyBindings[Modifier][KeyID])
+				str_format(aBuf, sizeof(aBuf), "%s (%d) is not bound", pKeyName, KeyID);
+			else
+				str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pKeyName, KeyID, pBinds->m_aapKeyBindings[Modifier][KeyID]);
+
+			pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+		}
+	}
+	else if(pResult->NumArguments() == 0)
+	{
+		char aBuf[1024];
+		for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++)
+		{
+			for(int j = 0; j < KEY_LAST; j++)
+			{
+				if(!pBinds->m_aapKeyBindings[i][j])
+					continue;
+
+				str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", GetKeyBindModifiersName(i), pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]);
+				pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+			}
+		}
+	}
+}
+
+void CBinds::ConUnbind(IConsole::IResult *pResult, void *pUserData)
+{
+	CBinds *pBinds = (CBinds *)pUserData;
+	const char *pKeyName = pResult->GetString(0);
+	int Modifier;
+	int KeyID = pBinds->GetBindSlot(pKeyName, &Modifier);
+
+	if(!KeyID)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "key %s not found", pKeyName);
+		pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
+		return;
+	}
+
+	pBinds->Bind(KeyID, "", false, Modifier);
+}
+
+void CBinds::ConUnbindAll(IConsole::IResult *pResult, void *pUserData)
+{
+	CBinds *pBinds = (CBinds *)pUserData;
+	pBinds->UnbindAll();
+}
+
+int CBinds::GetKeyID(const char *pKeyName)
+{
+	// check for numeric
+	if(pKeyName[0] == '&')
+	{
+		int i = str_toint(pKeyName + 1);
+		if(i > 0 && i < KEY_LAST)
+			return i; // numeric
+	}
+
+	// search for key
+	for(int i = 0; i < KEY_LAST; i++)
+	{
+		if(str_comp_nocase(pKeyName, Input()->KeyName(i)) == 0)
+			return i;
+	}
+
+	return 0;
+}
+
+int CBinds::GetBindSlot(const char *pBindString, int *pModifierCombination)
+{
+	*pModifierCombination = MODIFIER_NONE;
+	char aMod[32];
+	aMod[0] = '\0';
+	const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
+	while(aMod[0] && *(pKey))
+	{
+		if(!str_comp_nocase(aMod, "shift"))
+			*pModifierCombination |= (1 << MODIFIER_SHIFT);
+		else if(!str_comp_nocase(aMod, "ctrl"))
+			*pModifierCombination |= (1 << MODIFIER_CTRL);
+		else if(!str_comp_nocase(aMod, "alt"))
+			*pModifierCombination |= (1 << MODIFIER_ALT);
+		else if(!str_comp_nocase(aMod, "gui"))
+			*pModifierCombination |= (1 << MODIFIER_GUI);
+		else
+			return 0;
+
+		if(str_find(pKey + 1, "+"))
+			pKey = str_next_token(pKey + 1, "+", aMod, sizeof(aMod));
+		else
+			break;
+	}
+	return GetKeyID(*pModifierCombination == MODIFIER_NONE ? aMod : pKey + 1);
+}
+
+const char *CBinds::GetModifierName(int Modifier)
+{
+	switch(Modifier)
+	{
+	case MODIFIER_SHIFT:
+		return "shift";
+	case MODIFIER_CTRL:
+		return "ctrl";
+	case MODIFIER_ALT:
+		return "alt";
+	case MODIFIER_GUI:
+		return "gui";
+	case MODIFIER_NONE:
+	default:
+		return "";
+	}
+}
+
+const char *CBinds::GetKeyBindModifiersName(int ModifierCombination)
+{
+	static char aModifier[256];
+	aModifier[0] = '\0';
+	for(int k = 1; k < MODIFIER_COUNT; k++)
+	{
+		if(ModifierCombination & (1 << k))
+		{
+			str_append(aModifier, GetModifierName(k));
+			str_append(aModifier, "+");
+		}
+	}
+	return aModifier;
+}
+
+void CBinds::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
+{
+	CBinds *pSelf = (CBinds *)pUserData;
+
+	pConfigManager->WriteLine("unbindall");
+	for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++)
+	{
+		for(int j = 0; j < KEY_LAST; j++)
+		{
+			if(!pSelf->m_aapKeyBindings[i][j])
+				continue;
+
+			// worst case the str_escape can double the string length
+			int Size = str_length(pSelf->m_aapKeyBindings[i][j]) * 2 + 30;
+			char *pBuffer = (char *)malloc(Size);
+			char *pEnd = pBuffer + Size;
+
+			str_format(pBuffer, Size, "bind %s%s \"", GetKeyBindModifiersName(i), pSelf->Input()->KeyName(j));
+			// process the string. we need to escape some characters
+			char *pDst = pBuffer + str_length(pBuffer);
+			str_escape(&pDst, pSelf->m_aapKeyBindings[i][j], pEnd);
+			str_append(pBuffer, "\"", Size);
+
+			pConfigManager->WriteLine(pBuffer);
+			free(pBuffer);
+		}
+	}
+}
+
+// DDRace
+
+void CBinds::SetDDRaceBinds(bool FreeOnly)
+{
+	if(g_Config.m_ClDDRaceBindsSet < 1)
+	{
+		Bind(KEY_KP_PLUS, "zoom+", FreeOnly);
+		Bind(KEY_KP_MINUS, "zoom-", FreeOnly);
+		Bind(KEY_KP_MULTIPLY, "zoom", FreeOnly);
+		Bind(KEY_PAUSE, "say /pause", FreeOnly);
+		Bind(KEY_UP, "+jump", FreeOnly);
+		Bind(KEY_LEFT, "+left", FreeOnly);
+		Bind(KEY_RIGHT, "+right", FreeOnly);
+		Bind(KEY_LEFTBRACKET, "+prevweapon", FreeOnly);
+		Bind(KEY_RIGHTBRACKET, "+nextweapon", FreeOnly);
+		Bind(KEY_C, "say /rank", FreeOnly);
+		Bind(KEY_V, "say /info", FreeOnly);
+		Bind(KEY_B, "say /top5", FreeOnly);
+		Bind(KEY_S, "+showhookcoll", FreeOnly);
+		Bind(KEY_X, "toggle cl_dummy 0 1", FreeOnly);
+		Bind(KEY_H, "toggle cl_dummy_hammer 0 1", FreeOnly);
+		Bind(KEY_SLASH, "+show_chat; chat all /", FreeOnly);
+		Bind(KEY_PAGEUP, "toggle cl_overlay_entities 0 100", FreeOnly);
+		Bind(KEY_KP_0, "say /emote normal 999999", FreeOnly);
+		Bind(KEY_KP_1, "say /emote happy 999999", FreeOnly);
+		Bind(KEY_KP_2, "say /emote angry 999999", FreeOnly);
+		Bind(KEY_KP_3, "say /emote pain 999999", FreeOnly);
+		Bind(KEY_KP_4, "say /emote surprise 999999", FreeOnly);
+		Bind(KEY_KP_5, "say /emote blink 999999", FreeOnly);
+		Bind(KEY_MOUSE_3, "+spectate", FreeOnly);
+		Bind(KEY_MINUS, "spectate_previous", FreeOnly);
+		Bind(KEY_EQUALS, "spectate_next", FreeOnly);
+	}
+
+	g_Config.m_ClDDRaceBindsSet = 1;
+}
diff --git a/src_bkp/game/client/components/binds.h b/src_bkp/game/client/components/binds.h
new file mode 100644
index 0000000000..5b9ceadb8d
--- /dev/null
+++ b/src_bkp/game/client/components/binds.h
@@ -0,0 +1,75 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_BINDS_H
+#define GAME_CLIENT_COMPONENTS_BINDS_H
+
+#include <engine/console.h>
+#include <engine/keys.h>
+
+#include <game/client/component.h>
+
+class IConfigManager;
+
+class CBinds : public CComponent
+{
+	int GetKeyID(const char *pKeyName);
+
+	static void ConBind(IConsole::IResult *pResult, void *pUserData);
+	static void ConBinds(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnbind(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnbindAll(IConsole::IResult *pResult, void *pUserData);
+	class IConsole *GetConsole() const { return Console(); }
+
+	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
+
+public:
+	CBinds();
+	~CBinds();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	class CBindsSpecial : public CComponent
+	{
+	public:
+		CBinds *m_pBinds;
+		virtual int Sizeof() const override { return sizeof(*this); }
+		virtual bool OnInput(const IInput::CEvent &Event) override;
+	};
+
+	bool m_MouseOnAction;
+
+	enum
+	{
+		MODIFIER_NONE = 0,
+		MODIFIER_CTRL,
+		MODIFIER_ALT,
+		MODIFIER_SHIFT,
+		MODIFIER_GUI,
+		MODIFIER_COUNT,
+		MODIFIER_COMBINATION_COUNT = 1 << MODIFIER_COUNT
+	};
+
+	CBindsSpecial m_SpecialBinds;
+
+	void Bind(int KeyID, const char *pStr, bool FreeOnly = false, int ModifierCombination = MODIFIER_NONE);
+	void SetDefaults();
+	void StaBinds();
+	void UnbindAll();
+	const char *Get(int KeyID, int ModifierCombination);
+	void GetKey(const char *pBindStr, char *pBuf, size_t BufSize);
+	int GetBindSlot(const char *pBindString, int *pModifierCombination);
+	static int GetModifierMask(IInput *pInput);
+	static int GetModifierMaskOfKey(int Key);
+	static const char *GetModifierName(int Modifier);
+	static const char *GetKeyBindModifiersName(int ModifierCombination);
+
+	virtual void OnConsoleInit() override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+
+	// DDRace
+
+	void SetDDRaceBinds(bool FreeOnly);
+
+private:
+	char *m_aapKeyBindings[MODIFIER_COMBINATION_COUNT][KEY_LAST];
+};
+#endif
diff --git a/src/game/client/components/bindwheel.cpp b/src_bkp/game/client/components/bindwheel.cpp
similarity index 100%
rename from src/game/client/components/bindwheel.cpp
rename to src_bkp/game/client/components/bindwheel.cpp
diff --git a/src/game/client/components/bindwheel.h b/src_bkp/game/client/components/bindwheel.h
similarity index 100%
rename from src/game/client/components/bindwheel.h
rename to src_bkp/game/client/components/bindwheel.h
diff --git a/src_bkp/game/client/components/broadcast.cpp b/src_bkp/game/client/components/broadcast.cpp
new file mode 100644
index 0000000000..5683705dae
--- /dev/null
+++ b/src_bkp/game/client/components/broadcast.cpp
@@ -0,0 +1,100 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/generated/protocol.h>
+
+#include <game/client/gameclient.h>
+
+#include <game/client/components/motd.h>
+#include <game/client/components/scoreboard.h>
+
+#include "broadcast.h"
+
+void CBroadcast::OnReset()
+{
+	m_BroadcastTick = 0;
+	m_BroadcastRenderOffset = -1.0f;
+	TextRender()->DeleteTextContainer(m_TextContainerIndex);
+}
+
+void CBroadcast::OnWindowResize()
+{
+	m_BroadcastRenderOffset = -1.0f;
+	TextRender()->DeleteTextContainer(m_TextContainerIndex);
+}
+
+void CBroadcast::OnRender()
+{
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	RenderServerBroadcast();
+}
+
+void CBroadcast::RenderServerBroadcast()
+{
+	if(m_pClient->m_Scoreboard.Active() || m_pClient->m_Motd.IsActive() || !g_Config.m_ClShowBroadcasts)
+		return;
+	const float SecondsRemaining = (m_BroadcastTick - Client()->GameTick(g_Config.m_ClDummy)) / (float)Client()->GameTickSpeed();
+	if(SecondsRemaining <= 0.0f)
+	{
+		TextRender()->DeleteTextContainer(m_TextContainerIndex);
+		return;
+	}
+
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	if(m_BroadcastRenderOffset < 0.0f)
+		m_BroadcastRenderOffset = Width / 2.0f - TextRender()->TextWidth(12.0f, m_aBroadcastText, -1, Width) / 2.0f;
+
+	if(!m_TextContainerIndex.Valid())
+	{
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, m_BroadcastRenderOffset, 40.0f, 12.0f, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = Width;
+		TextRender()->CreateTextContainer(m_TextContainerIndex, &Cursor, m_aBroadcastText);
+	}
+	if(m_TextContainerIndex.Valid())
+	{
+		const float Alpha = SecondsRemaining >= 1.0f ? 1.0f : SecondsRemaining;
+		ColorRGBA TextColor = TextRender()->DefaultTextColor();
+		TextColor.a *= Alpha;
+		ColorRGBA OutlineColor = TextRender()->DefaultTextOutlineColor();
+		OutlineColor.a *= Alpha;
+		TextRender()->RenderTextContainer(m_TextContainerIndex, TextColor, OutlineColor);
+	}
+}
+
+void CBroadcast::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(MsgType == NETMSGTYPE_SV_BROADCAST)
+	{
+		OnBroadcastMessage((CNetMsg_Sv_Broadcast *)pRawMsg);
+	}
+}
+
+void CBroadcast::OnBroadcastMessage(const CNetMsg_Sv_Broadcast *pMsg)
+{
+	str_copy(m_aBroadcastText, pMsg->m_pMessage);
+	m_BroadcastTick = Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed() * 10;
+	m_BroadcastRenderOffset = -1.0f;
+	TextRender()->DeleteTextContainer(m_TextContainerIndex);
+
+	if(g_Config.m_ClPrintBroadcasts)
+	{
+		const char *pText = m_aBroadcastText;
+		char aLine[sizeof(m_aBroadcastText)];
+		while((pText = str_next_token(pText, "\n", aLine, sizeof(aLine))))
+		{
+			if(aLine[0] != '\0')
+			{
+				m_pClient->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "broadcast", aLine, color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor)));
+			}
+		}
+	}
+}
diff --git a/src_bkp/game/client/components/broadcast.h b/src_bkp/game/client/components/broadcast.h
new file mode 100644
index 0000000000..056adce91b
--- /dev/null
+++ b/src_bkp/game/client/components/broadcast.h
@@ -0,0 +1,29 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_BROADCAST_H
+#define GAME_CLIENT_COMPONENTS_BROADCAST_H
+
+#include <engine/textrender.h>
+
+#include <game/client/component.h>
+
+class CBroadcast : public CComponent
+{
+	// broadcasts
+	char m_aBroadcastText[1024];
+	int m_BroadcastTick;
+	float m_BroadcastRenderOffset;
+	STextContainerIndex m_TextContainerIndex;
+
+	void RenderServerBroadcast();
+	void OnBroadcastMessage(const CNetMsg_Sv_Broadcast *pMsg);
+
+public:
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnReset() override;
+	virtual void OnWindowResize() override;
+	virtual void OnRender() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/camera.cpp b/src_bkp/game/client/components/camera.cpp
new file mode 100644
index 0000000000..4837be0ba3
--- /dev/null
+++ b/src_bkp/game/client/components/camera.cpp
@@ -0,0 +1,360 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <engine/shared/config.h>
+
+#include <base/math.h>
+#include <game/client/gameclient.h>
+#include <game/collision.h>
+#include <game/mapitems.h>
+
+#include "camera.h"
+#include "controls.h"
+
+#include <limits>
+
+CCamera::CCamera()
+{
+	m_CamType = CAMTYPE_UNDEFINED;
+	m_ZoomSet = false;
+	m_Zoom = 1.0f;
+	m_Zooming = false;
+	m_ForceFreeviewPos = vec2(-1, -1);
+	m_GotoSwitchOffset = 0;
+	m_GotoTeleOffset = 0;
+	m_GotoSwitchLastPos = ivec2(-1, -1);
+	m_GotoTeleLastPos = ivec2(-1, -1);
+
+	mem_zero(m_aLastPos, sizeof(m_aLastPos));
+	m_PrevCenter = vec2(0, 0);
+	m_Center = vec2(0, 0);
+}
+
+float CCamera::ZoomProgress(float CurrentTime) const
+{
+	return (CurrentTime - m_ZoomSmoothingStart) / (m_ZoomSmoothingEnd - m_ZoomSmoothingStart);
+}
+
+void CCamera::ScaleZoom(float Factor)
+{
+	float CurrentTarget = m_Zooming ? m_ZoomSmoothingTarget : m_Zoom;
+	ChangeZoom(CurrentTarget * Factor, m_pClient->m_Snap.m_SpecInfo.m_Active && GameClient()->m_MultiViewActivated ? g_Config.m_ClMultiViewZoomSmoothness : g_Config.m_ClSmoothZoomTime);
+}
+
+float CCamera::MaxZoomLevel()
+{
+	return (g_Config.m_ClLimitMaxZoomLevel) ? ((Graphics()->IsTileBufferingEnabled() ? 240 : 30)) : std::numeric_limits<float>::max();
+}
+
+float CCamera::MinZoomLevel()
+{
+	return 0.01f;
+}
+
+void CCamera::ChangeZoom(float Target, int Smoothness)
+{
+	if(Target > MaxZoomLevel() || Target < MinZoomLevel())
+	{
+		return;
+	}
+
+	float Now = Client()->LocalTime();
+	float Current = m_Zoom;
+	float Derivative = 0.0f;
+	if(m_Zooming)
+	{
+		float Progress = ZoomProgress(Now);
+		Current = m_ZoomSmoothing.Evaluate(Progress);
+		Derivative = m_ZoomSmoothing.Derivative(Progress);
+	}
+
+	m_ZoomSmoothingTarget = Target;
+	m_ZoomSmoothing = CCubicBezier::With(Current, Derivative, 0, m_ZoomSmoothingTarget);
+	m_ZoomSmoothingStart = Now;
+	m_ZoomSmoothingEnd = Now + (float)Smoothness / 1000;
+
+	m_Zooming = true;
+}
+
+void CCamera::OnRender()
+{
+	if(m_Zooming)
+	{
+		float Time = Client()->LocalTime();
+		if(Time >= m_ZoomSmoothingEnd)
+		{
+			m_Zoom = m_ZoomSmoothingTarget;
+			m_Zooming = false;
+		}
+		else
+		{
+			const float OldLevel = m_Zoom;
+			m_Zoom = m_ZoomSmoothing.Evaluate(ZoomProgress(Time));
+			if((OldLevel < m_ZoomSmoothingTarget && m_Zoom > m_ZoomSmoothingTarget) || (OldLevel > m_ZoomSmoothingTarget && m_Zoom < m_ZoomSmoothingTarget))
+			{
+				m_Zoom = m_ZoomSmoothingTarget;
+				m_Zooming = false;
+			}
+		}
+		m_Zoom = clamp(m_Zoom, MinZoomLevel(), MaxZoomLevel());
+	}
+
+	if(!(m_pClient->m_Snap.m_SpecInfo.m_Active || GameClient()->m_GameInfo.m_AllowZoom || Client()->State() == IClient::STATE_DEMOPLAYBACK))
+	{
+		m_ZoomSet = false;
+		m_Zoom = 1.0f;
+		m_Zooming = false;
+	}
+	else if(!m_ZoomSet && g_Config.m_ClDefaultZoom != 10)
+	{
+		m_ZoomSet = true;
+		OnReset();
+	}
+
+	// update camera center
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active && !m_pClient->m_Snap.m_SpecInfo.m_UsePosition)
+	{
+		if(m_CamType != CAMTYPE_SPEC)
+		{
+			m_aLastPos[g_Config.m_ClDummy] = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy];
+			m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] = m_PrevCenter;
+			m_pClient->m_Controls.ClampMousePos();
+			m_CamType = CAMTYPE_SPEC;
+		}
+		m_Center = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy];
+	}
+	else
+	{
+		if(m_CamType != CAMTYPE_PLAYER)
+		{
+			m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] = m_aLastPos[g_Config.m_ClDummy];
+			m_pClient->m_Controls.ClampMousePos();
+			m_CamType = CAMTYPE_PLAYER;
+		}
+
+		float DeltaTime = Client()->RenderFrameTime();
+		static vec2 s_LastMousePos(0, 0);
+		static vec2 s_aCurrentCameraOffset[NUM_DUMMIES] = {vec2(0, 0), vec2(0, 0)};
+		static float s_SpeedBias = 0.5f;
+
+		if(g_Config.m_ClDyncamSmoothness > 0)
+		{
+			float CameraSpeed = (1.0f - (g_Config.m_ClDyncamSmoothness / 100.0f)) * 9.5f + 0.5f;
+			float CameraStabilizingFactor = 1 + g_Config.m_ClDyncamStabilizing / 100.0f;
+
+			s_SpeedBias += CameraSpeed * DeltaTime;
+			if(g_Config.m_ClDyncam)
+			{
+				s_SpeedBias -= length(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] - s_LastMousePos) * std::log10(CameraStabilizingFactor) * 0.02f;
+				s_SpeedBias = clamp(s_SpeedBias, 0.5f, CameraSpeed);
+			}
+			else
+			{
+				s_SpeedBias = maximum(5.0f, CameraSpeed); // make sure toggle back is fast
+			}
+		}
+
+		vec2 TargetCameraOffset(0, 0);
+		s_LastMousePos = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy];
+		float l = length(s_LastMousePos);
+		if(l > 0.0001f) // make sure that this isn't 0
+		{
+			float DeadZone = g_Config.m_ClDyncam ? g_Config.m_ClDyncamDeadzone : g_Config.m_ClMouseDeadzone;
+			float FollowFactor = (g_Config.m_ClDyncam ? g_Config.m_ClDyncamFollowFactor : g_Config.m_ClMouseFollowfactor) / 100.0f;
+			float OffsetAmount = maximum(l - DeadZone, 0.0f) * FollowFactor;
+
+			TargetCameraOffset = normalize(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy]) * OffsetAmount;
+		}
+
+		if(g_Config.m_ClDyncamSmoothness > 0)
+			s_aCurrentCameraOffset[g_Config.m_ClDummy] += (TargetCameraOffset - s_aCurrentCameraOffset[g_Config.m_ClDummy]) * minimum(DeltaTime * s_SpeedBias, 1.0f);
+		else
+			s_aCurrentCameraOffset[g_Config.m_ClDummy] = TargetCameraOffset;
+
+		if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+			m_Center = m_pClient->m_Snap.m_SpecInfo.m_Position + s_aCurrentCameraOffset[g_Config.m_ClDummy];
+		else
+			m_Center = m_pClient->m_LocalCharacterPos + s_aCurrentCameraOffset[g_Config.m_ClDummy];
+	}
+
+	if(m_ForceFreeviewPos != vec2(-1, -1) && m_CamType == CAMTYPE_SPEC)
+	{
+		m_Center = m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy] = m_ForceFreeviewPos;
+		m_ForceFreeviewPos = vec2(-1, -1);
+	}
+	m_PrevCenter = m_Center;
+}
+
+void CCamera::OnConsoleInit()
+{
+	Console()->Register("zoom+", "", CFGFLAG_CLIENT, ConZoomPlus, this, "Zoom increase");
+	Console()->Register("zoom-", "", CFGFLAG_CLIENT, ConZoomMinus, this, "Zoom decrease");
+	Console()->Register("zoom", "?i", CFGFLAG_CLIENT, ConZoom, this, "Change zoom");
+	Console()->Register("set_view", "i[x]i[y]", CFGFLAG_CLIENT, ConSetView, this, "Set camera position to x and y in the map");
+	Console()->Register("goto_switch", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoSwitch, this, "View switch found (at offset) with given number");
+	Console()->Register("goto_tele", "i[number]?i[offset]", CFGFLAG_CLIENT, ConGotoTele, this, "View tele found (at offset) with given number");
+}
+
+void CCamera::OnReset()
+{
+	m_Zoom = std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10);
+	m_Zooming = false;
+}
+
+void CCamera::ConZoomPlus(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || pSelf->GameClient()->m_GameInfo.m_AllowZoom || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		pSelf->ScaleZoom(CCamera::ZOOM_STEP);
+
+		if(pSelf->GameClient()->m_MultiViewActivated)
+			pSelf->GameClient()->m_MultiViewPersonalZoom++;
+	}
+}
+void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || pSelf->GameClient()->m_GameInfo.m_AllowZoom || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		pSelf->ScaleZoom(1 / CCamera::ZOOM_STEP);
+
+		if(pSelf->GameClient()->m_MultiViewActivated)
+			pSelf->GameClient()->m_MultiViewPersonalZoom--;
+	}
+}
+void CCamera::ConZoom(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	float TargetLevel = pResult->NumArguments() ? pResult->GetFloat(0) : g_Config.m_ClDefaultZoom;
+	pSelf->ChangeZoom(std::pow(CCamera::ZOOM_STEP, TargetLevel - 10), pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active && pSelf->GameClient()->m_MultiViewActivated ? g_Config.m_ClMultiViewZoomSmoothness : g_Config.m_ClSmoothZoomTime);
+
+	if(pSelf->GameClient()->m_MultiViewActivated && pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active)
+		pSelf->GameClient()->m_MultiViewPersonalZoom = 0;
+}
+void CCamera::ConSetView(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	// wait until free view camera type to update the position
+	pSelf->SetView(ivec2(pResult->GetInteger(0), pResult->GetInteger(1)));
+}
+void CCamera::ConGotoSwitch(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	pSelf->GotoSwitch(pResult->GetInteger(0), pResult->NumArguments() > 1 ? pResult->GetInteger(1) : -1);
+}
+void CCamera::ConGotoTele(IConsole::IResult *pResult, void *pUserData)
+{
+	CCamera *pSelf = (CCamera *)pUserData;
+	pSelf->GotoTele(pResult->GetInteger(0), pResult->NumArguments() > 1 ? pResult->GetInteger(1) : -1);
+}
+
+void CCamera::SetView(ivec2 Pos)
+{
+	m_ForceFreeviewPos = vec2(
+		clamp(Pos.x * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f),
+		clamp(Pos.y * 32.0f, 200.0f, Collision()->GetWidth() * 32 - 200.0f));
+}
+
+void CCamera::GotoSwitch(int Number, int Offset)
+{
+	if(Collision()->SwitchLayer() == nullptr)
+		return;
+
+	int Match = -1;
+	ivec2 MatchPos = ivec2(-1, -1);
+
+	auto FindTile = [this, &Match, &MatchPos, &Number, &Offset]() {
+		for(int x = 0; x < Collision()->GetWidth(); x++)
+		{
+			for(int y = 0; y < Collision()->GetHeight(); y++)
+			{
+				int i = y * Collision()->GetWidth() + x;
+				if(Number == Collision()->GetSwitchNumber(i))
+				{
+					Match++;
+					if(Offset != -1)
+					{
+						if(Match == Offset)
+						{
+							MatchPos = ivec2(x, y);
+							m_GotoSwitchOffset = Match;
+							return;
+						}
+						continue;
+					}
+					MatchPos = ivec2(x, y);
+					if(Match == m_GotoSwitchOffset)
+						return;
+				}
+			}
+		}
+	};
+	FindTile();
+
+	if(MatchPos == ivec2(-1, -1))
+		return;
+	if(Match < m_GotoSwitchOffset)
+		m_GotoSwitchOffset = -1;
+	SetView(MatchPos);
+	m_GotoSwitchOffset++;
+}
+
+void CCamera::GotoTele(int Number, int Offset)
+{
+	if(Collision()->TeleLayer() == nullptr)
+		return;
+
+	int Match = -1;
+	ivec2 MatchPos = ivec2(-1, -1);
+
+	auto FindTile = [this, &Match, &MatchPos, &Number, &Offset]() {
+		for(int x = 0; x < Collision()->GetWidth(); x++)
+		{
+			for(int y = 0; y < Collision()->GetHeight(); y++)
+			{
+				int i = y * Collision()->GetWidth() + x;
+				int Tele = Collision()->TeleLayer()[i].m_Number;
+				if(Number == Tele)
+				{
+					Match++;
+					if(Offset != -1)
+					{
+						if(Match == Offset)
+						{
+							MatchPos = ivec2(x, y);
+							m_GotoTeleOffset = Match;
+							return;
+						}
+						continue;
+					}
+					MatchPos = ivec2(x, y);
+					if(m_GotoTeleLastPos != ivec2(-1, -1))
+					{
+						if(distance(m_GotoTeleLastPos, MatchPos) < 10.0f)
+						{
+							m_GotoTeleOffset++;
+							continue;
+						}
+					}
+					m_GotoTeleLastPos = MatchPos;
+					if(Match == m_GotoTeleOffset)
+						return;
+				}
+			}
+		}
+	};
+	FindTile();
+
+	if(MatchPos == ivec2(-1, -1))
+		return;
+	if(Match < m_GotoTeleOffset)
+		m_GotoTeleOffset = -1;
+	SetView(MatchPos);
+	m_GotoTeleOffset++;
+}
+
+void CCamera::SetZoom(float Target, int Smoothness)
+{
+	ChangeZoom(Target, Smoothness);
+}
diff --git a/src_bkp/game/client/components/camera.h b/src_bkp/game/client/components/camera.h
new file mode 100644
index 0000000000..ae8798d863
--- /dev/null
+++ b/src_bkp/game/client/components/camera.h
@@ -0,0 +1,77 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_CAMERA_H
+#define GAME_CLIENT_COMPONENTS_CAMERA_H
+#include <base/bezier.h>
+#include <base/vmath.h>
+
+#include <engine/client.h>
+#include <engine/console.h>
+
+#include <game/client/component.h>
+
+class CCamera : public CComponent
+{
+	friend class CMenuBackground;
+
+	enum
+	{
+		CAMTYPE_UNDEFINED = -1,
+		CAMTYPE_SPEC,
+		CAMTYPE_PLAYER,
+	};
+
+	int m_CamType;
+	vec2 m_aLastPos[NUM_DUMMIES];
+	vec2 m_PrevCenter;
+
+	CCubicBezier m_ZoomSmoothing;
+	float m_ZoomSmoothingStart;
+	float m_ZoomSmoothingEnd;
+
+	void ScaleZoom(float Factor);
+	void ChangeZoom(float Target, int Smoothness);
+	float ZoomProgress(float CurrentTime) const;
+
+	float MinZoomLevel();
+	float MaxZoomLevel();
+
+public:
+	static constexpr float ZOOM_STEP = 0.866025f;
+
+	vec2 m_Center;
+	bool m_ZoomSet;
+	bool m_Zooming;
+	float m_Zoom;
+	float m_ZoomSmoothingTarget;
+
+	CCamera();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnRender() override;
+
+	// DDRace
+
+	virtual void OnConsoleInit() override;
+	virtual void OnReset() override;
+
+	void SetZoom(float Target, int Smoothness);
+	void SetView(ivec2 Pos);
+	void GotoSwitch(int Number, int Offset = -1);
+	void GotoTele(int Number, int Offset = -1);
+
+private:
+	static void ConZoomPlus(IConsole::IResult *pResult, void *pUserData);
+	static void ConZoomMinus(IConsole::IResult *pResult, void *pUserData);
+	static void ConZoom(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetView(IConsole::IResult *pResult, void *pUserData);
+	static void ConGotoSwitch(IConsole::IResult *pResult, void *pUserData);
+	static void ConGotoTele(IConsole::IResult *pResult, void *pUserData);
+
+	vec2 m_ForceFreeviewPos;
+	int m_GotoSwitchOffset;
+	int m_GotoTeleOffset;
+	ivec2 m_GotoSwitchLastPos;
+	ivec2 m_GotoTeleLastPos;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/chat.cpp b/src_bkp/game/client/components/chat.cpp
new file mode 100644
index 0000000000..3d9ea8a105
--- /dev/null
+++ b/src_bkp/game/client/components/chat.cpp
@@ -0,0 +1,1386 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <engine/editor.h>
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/shared/csv.h>
+#include <engine/textrender.h>
+
+#include <game/generated/protocol.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/scoreboard.h>
+#include <game/client/components/skins.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+#include <game/localization.h>
+
+#include "chat.h"
+
+char CChat::ms_aDisplayText[MAX_LINE_LENGTH] = {'\0'};
+
+CChat::CChat()
+{
+	for(auto &Line : m_aLines)
+	{
+		// reset the container indices, so the text containers can be deleted on reset
+		Line.m_TextContainerIndex.Reset();
+		Line.m_QuadContainerIndex = -1;
+	}
+
+#define CHAT_COMMAND(name, params, flags, callback, userdata, help) m_vDefaultCommands.emplace_back(name, params, help);
+#include <game/ddracechat.h>
+#undef CHAT_COMMAND
+
+	std::sort(m_vDefaultCommands.begin(), m_vDefaultCommands.end());
+	m_Mode = MODE_NONE;
+
+	m_Input.SetClipboardLineCallback([this](const char *pStr) { SayChat(pStr); });
+	m_Input.SetCalculateOffsetCallback([this]() { return m_IsInputCensored; });
+	m_Input.SetDisplayTextCallback([this](char *pStr, size_t NumChars) {
+		m_IsInputCensored = false;
+		if(
+			g_Config.m_ClStreamerMode &&
+			(str_startswith(pStr, "/login ") ||
+				str_startswith(pStr, "/register ") ||
+				str_startswith(pStr, "/code ") ||
+				str_startswith(pStr, "/timeout ") ||
+				str_startswith(pStr, "/save ") ||
+				str_startswith(pStr, "/load ")))
+		{
+			bool Censor = false;
+			const size_t NumLetters = minimum(NumChars, sizeof(ms_aDisplayText) - 1);
+			for(size_t i = 0; i < NumLetters; ++i)
+			{
+				if(Censor)
+					ms_aDisplayText[i] = '*';
+				else
+					ms_aDisplayText[i] = pStr[i];
+				if(pStr[i] == ' ')
+				{
+					Censor = true;
+					m_IsInputCensored = true;
+				}
+			}
+			ms_aDisplayText[NumLetters] = '\0';
+			return ms_aDisplayText;
+		}
+		return pStr;
+	});
+}
+
+void CChat::RegisterCommand(const char *pName, const char *pParams, const char *pHelpText)
+{
+	// Don't allow duplicate commands.
+	for(const auto &Command : m_vCommands)
+		if(str_comp(Command.m_aName, pName) == 0)
+			return;
+
+	m_vCommands.emplace_back(pName, pParams, pHelpText);
+	m_CommandsNeedSorting = true;
+}
+
+void CChat::UnregisterCommand(const char *pName)
+{
+	m_vCommands.erase(std::remove_if(m_vCommands.begin(), m_vCommands.end(), [pName](const CCommand &Command) { return str_comp(Command.m_aName, pName) == 0; }), m_vCommands.end());
+}
+
+void CChat::RebuildChat()
+{
+	for(auto &Line : m_aLines)
+	{
+		TextRender()->DeleteTextContainer(Line.m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(Line.m_QuadContainerIndex);
+		// recalculate sizes
+		Line.m_aYOffset[0] = -1.f;
+		Line.m_aYOffset[1] = -1.f;
+	}
+}
+
+void CChat::OnWindowResize()
+{
+	RebuildChat();
+}
+
+void CChat::Reset()
+{
+	for(auto &Line : m_aLines)
+	{
+		TextRender()->DeleteTextContainer(Line.m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(Line.m_QuadContainerIndex);
+		Line.m_Time = 0;
+		Line.m_aText[0] = 0;
+		Line.m_aName[0] = 0;
+		Line.m_Friend = false;
+		Line.m_TimesRepeated = 0;
+		Line.m_HasRenderTee = false;
+	}
+	m_PrevScoreBoardShowed = false;
+	m_PrevShowChat = false;
+
+	m_Show = false;
+	m_CompletionUsed = false;
+	m_CompletionChosen = -1;
+	m_aCompletionBuffer[0] = 0;
+	m_PlaceholderOffset = 0;
+	m_PlaceholderLength = 0;
+	m_pHistoryEntry = 0x0;
+	m_PendingChatCounter = 0;
+	m_LastChatSend = 0;
+	m_CurrentLine = 0;
+	m_IsInputCensored = false;
+	m_EditingNewLine = true;
+	m_ServerSupportsCommandInfo = false;
+	m_CommandsNeedSorting = false;
+	mem_zero(m_aCurrentInputText, sizeof(m_aCurrentInputText));
+	DisableMode();
+
+	for(int64_t &LastSoundPlayed : m_aLastSoundPlayed)
+		LastSoundPlayed = 0;
+}
+
+void CChat::OnRelease()
+{
+	m_Show = false;
+}
+
+void CChat::OnStateChange(int NewState, int OldState)
+{
+	if(OldState <= IClient::STATE_CONNECTING)
+		Reset();
+}
+
+void CChat::ConSay(IConsole::IResult *pResult, void *pUserData)
+{
+	((CChat *)pUserData)->Say(0, pResult->GetString(0));
+}
+
+void CChat::ConSayTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	((CChat *)pUserData)->Say(1, pResult->GetString(0));
+}
+
+void CChat::ConChat(IConsole::IResult *pResult, void *pUserData)
+{
+	const char *pMode = pResult->GetString(0);
+	if(str_comp(pMode, "all") == 0)
+		((CChat *)pUserData)->EnableMode(0);
+	else if(str_comp(pMode, "team") == 0)
+		((CChat *)pUserData)->EnableMode(1);
+	else
+		((CChat *)pUserData)->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", "expected all or team as mode");
+
+	if(pResult->GetString(1)[0] || g_Config.m_ClChatReset)
+		((CChat *)pUserData)->m_Input.Set(pResult->GetString(1));
+}
+
+void CChat::ConShowChat(IConsole::IResult *pResult, void *pUserData)
+{
+	((CChat *)pUserData)->m_Show = pResult->GetInteger(0) != 0;
+}
+
+void CChat::ConEcho(IConsole::IResult *pResult, void *pUserData)
+{
+	((CChat *)pUserData)->Echo(pResult->GetString(0));
+}
+
+void CChat::ConchainChatOld(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	((CChat *)pUserData)->RebuildChat();
+}
+
+void CChat::ConchainChatFontSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	CChat *pChat = (CChat *)pUserData;
+	pChat->EnsureCoherentWidth();
+	pChat->RebuildChat();
+}
+
+void CChat::ConchainChatWidth(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	CChat *pChat = (CChat *)pUserData;
+	pChat->EnsureCoherentFontSize();
+	pChat->RebuildChat();
+}
+
+void CChat::Echo(const char *pString)
+{
+	AddLine(CLIENT_MSG, 0, pString);
+}
+
+void CChat::OnConsoleInit()
+{
+	Console()->Register("say", "r[message]", CFGFLAG_CLIENT, ConSay, this, "Say in chat");
+	Console()->Register("say_team", "r[message]", CFGFLAG_CLIENT, ConSayTeam, this, "Say in team chat");
+	Console()->Register("chat", "s['team'|'all'] ?r[message]", CFGFLAG_CLIENT, ConChat, this, "Enable chat with all/team mode");
+	Console()->Register("+show_chat", "", CFGFLAG_CLIENT, ConShowChat, this, "Show chat");
+	Console()->Register("echo", "r[message]", CFGFLAG_CLIENT | CFGFLAG_STORE, ConEcho, this, "Echo the text in chat window");
+}
+
+void CChat::OnInit()
+{
+	Reset();
+	Console()->Chain("cl_chat_old", ConchainChatOld, this);
+	Console()->Chain("cl_chat_size", ConchainChatFontSize, this);
+	Console()->Chain("cl_chat_width", ConchainChatWidth, this);
+}
+
+void CChat::OnMapLoad()
+{
+	m_vCommands = m_vDefaultCommands;
+}
+
+bool CChat::OnInput(const IInput::CEvent &Event)
+{
+	if(m_Mode == MODE_NONE)
+		return false;
+
+	if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE)
+	{
+		DisableMode();
+		m_pClient->OnRelease();
+		if(g_Config.m_ClChatReset)
+		{
+			m_Input.Clear();
+			m_pHistoryEntry = nullptr;
+		}
+	}
+	else if(Event.m_Flags & IInput::FLAG_PRESS && (Event.m_Key == KEY_RETURN || Event.m_Key == KEY_KP_ENTER))
+	{
+		if(m_CommandsNeedSorting)
+		{
+			std::sort(m_vCommands.begin(), m_vCommands.end());
+			m_CommandsNeedSorting = false;
+		}
+
+		if(m_Input.GetString()[0])
+		{
+			bool AddEntry = false;
+
+			if(m_LastChatSend + time_freq() < time())
+			{
+				Say(m_Mode == MODE_ALL ? 0 : 1, m_Input.GetString());
+				AddEntry = true;
+			}
+			else if(m_PendingChatCounter < 3)
+			{
+				++m_PendingChatCounter;
+				AddEntry = true;
+			}
+
+			if(AddEntry)
+			{
+				CHistoryEntry *pEntry = m_History.Allocate(sizeof(CHistoryEntry) + m_Input.GetLength());
+				pEntry->m_Team = m_Mode == MODE_ALL ? 0 : 1;
+				mem_copy(pEntry->m_aText, m_Input.GetString(), m_Input.GetLength() + 1);
+			}
+		}
+		m_pHistoryEntry = nullptr;
+		DisableMode();
+		m_pClient->OnRelease();
+		m_Input.Clear();
+	}
+	if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_TAB)
+	{
+		const bool ShiftPressed = Input()->ShiftIsPressed();
+
+		// fill the completion buffer
+		if(!m_CompletionUsed)
+		{
+			const char *pCursor = m_Input.GetString() + m_Input.GetCursorOffset();
+			for(size_t Count = 0; Count < m_Input.GetCursorOffset() && *(pCursor - 1) != ' '; --pCursor, ++Count)
+				;
+			m_PlaceholderOffset = pCursor - m_Input.GetString();
+
+			for(m_PlaceholderLength = 0; *pCursor && *pCursor != ' '; ++pCursor)
+				++m_PlaceholderLength;
+
+			str_truncate(m_aCompletionBuffer, sizeof(m_aCompletionBuffer), m_Input.GetString() + m_PlaceholderOffset, m_PlaceholderLength);
+		}
+
+		if(!m_CompletionUsed && m_aCompletionBuffer[0] != '/')
+		{
+			// Create the completion list of player names through which the player can iterate
+			const char *PlayerName, *FoundInput;
+			m_PlayerCompletionListLength = 0;
+			for(auto &PlayerInfo : m_pClient->m_Snap.m_apInfoByName)
+			{
+				if(PlayerInfo)
+				{
+					PlayerName = m_pClient->m_aClients[PlayerInfo->m_ClientID].m_aName;
+					FoundInput = str_utf8_find_nocase(PlayerName, m_aCompletionBuffer);
+					if(FoundInput != 0)
+					{
+						m_aPlayerCompletionList[m_PlayerCompletionListLength].ClientID = PlayerInfo->m_ClientID;
+						// The score for suggesting a player name is determined by the distance of the search input to the beginning of the player name
+						m_aPlayerCompletionList[m_PlayerCompletionListLength].Score = (int)(FoundInput - PlayerName);
+						m_PlayerCompletionListLength++;
+					}
+				}
+			}
+			std::stable_sort(m_aPlayerCompletionList, m_aPlayerCompletionList + m_PlayerCompletionListLength,
+				[](const CRateablePlayer &p1, const CRateablePlayer &p2) -> bool {
+					return p1.Score < p2.Score;
+				});
+		}
+
+		if(m_aCompletionBuffer[0] == '/' && !m_vCommands.empty())
+		{
+			CCommand *pCompletionCommand = 0;
+
+			const size_t NumCommands = m_vCommands.size();
+
+			if(ShiftPressed && m_CompletionUsed)
+				m_CompletionChosen--;
+			else if(!ShiftPressed)
+				m_CompletionChosen++;
+			m_CompletionChosen = (m_CompletionChosen + 2 * NumCommands) % (2 * NumCommands);
+
+			m_CompletionUsed = true;
+
+			const char *pCommandStart = m_aCompletionBuffer + 1;
+			for(size_t i = 0; i < 2 * NumCommands; ++i)
+			{
+				int SearchType;
+				int Index;
+
+				if(ShiftPressed)
+				{
+					SearchType = ((m_CompletionChosen - i + 2 * NumCommands) % (2 * NumCommands)) / NumCommands;
+					Index = (m_CompletionChosen - i + NumCommands) % NumCommands;
+				}
+				else
+				{
+					SearchType = ((m_CompletionChosen + i) % (2 * NumCommands)) / NumCommands;
+					Index = (m_CompletionChosen + i) % NumCommands;
+				}
+
+				auto &Command = m_vCommands[Index];
+
+				if(str_startswith(Command.m_aName, pCommandStart))
+				{
+					pCompletionCommand = &Command;
+					m_CompletionChosen = Index + SearchType * NumCommands;
+					break;
+				}
+			}
+
+			// insert the command
+			if(pCompletionCommand)
+			{
+				char aBuf[MAX_LINE_LENGTH];
+				// add part before the name
+				str_truncate(aBuf, sizeof(aBuf), m_Input.GetString(), m_PlaceholderOffset);
+
+				// add the command
+				str_append(aBuf, "/");
+				str_append(aBuf, pCompletionCommand->m_aName);
+
+				// add separator
+				const char *pSeparator = pCompletionCommand->m_aParams[0] == '\0' ? "" : " ";
+				str_append(aBuf, pSeparator);
+				if(*pSeparator)
+					str_append(aBuf, pSeparator);
+
+				// add part after the name
+				str_append(aBuf, m_Input.GetString() + m_PlaceholderOffset + m_PlaceholderLength);
+
+				m_PlaceholderLength = str_length(pSeparator) + str_length(pCompletionCommand->m_aName) + 1;
+				m_Input.Set(aBuf);
+				m_Input.SetCursorOffset(m_PlaceholderOffset + m_PlaceholderLength);
+			}
+		}
+		else
+		{
+			// find next possible name
+			const char *pCompletionString = 0;
+			if(m_PlayerCompletionListLength > 0)
+			{
+				// We do this in a loop, if a player left the game during the repeated pressing of Tab, they are skipped
+				CGameClient::CClientData *pCompletionClientData;
+				for(int i = 0; i < m_PlayerCompletionListLength; ++i)
+				{
+					if(ShiftPressed && m_CompletionUsed)
+					{
+						m_CompletionChosen--;
+					}
+					else if(!ShiftPressed)
+					{
+						m_CompletionChosen++;
+					}
+					if(m_CompletionChosen < 0)
+					{
+						m_CompletionChosen += m_PlayerCompletionListLength;
+					}
+					m_CompletionChosen %= m_PlayerCompletionListLength;
+					m_CompletionUsed = true;
+
+					pCompletionClientData = &m_pClient->m_aClients[m_aPlayerCompletionList[m_CompletionChosen].ClientID];
+					if(!pCompletionClientData->m_Active)
+					{
+						continue;
+					}
+
+					pCompletionString = pCompletionClientData->m_aName;
+					break;
+				}
+			}
+
+			// insert the name
+			if(pCompletionString)
+			{
+				char aBuf[MAX_LINE_LENGTH];
+				// add part before the name
+				str_truncate(aBuf, sizeof(aBuf), m_Input.GetString(), m_PlaceholderOffset);
+
+				// quote the name
+				char aQuoted[128];
+				if(m_Input.GetString()[0] == '/' && (str_find(pCompletionString, " ") || str_find(pCompletionString, "\"")))
+				{
+					// escape the name
+					str_copy(aQuoted, "\"");
+					char *pDst = aQuoted + str_length(aQuoted);
+					str_escape(&pDst, pCompletionString, aQuoted + sizeof(aQuoted));
+					str_append(aQuoted, "\"");
+
+					pCompletionString = aQuoted;
+				}
+
+				// add the name
+				str_append(aBuf, pCompletionString);
+
+				// add separator
+				const char *pSeparator = "";
+				if(*(m_Input.GetString() + m_PlaceholderOffset + m_PlaceholderLength) != ' ')
+					pSeparator = m_PlaceholderOffset == 0 ? ": " : " ";
+				else if(m_PlaceholderOffset == 0)
+					pSeparator = ":";
+				if(*pSeparator)
+					str_append(aBuf, pSeparator);
+
+				// add part after the name
+				str_append(aBuf, m_Input.GetString() + m_PlaceholderOffset + m_PlaceholderLength);
+
+				m_PlaceholderLength = str_length(pSeparator) + str_length(pCompletionString);
+				m_Input.Set(aBuf);
+				m_Input.SetCursorOffset(m_PlaceholderOffset + m_PlaceholderLength);
+			}
+		}
+	}
+	else
+	{
+		// reset name completion process
+		if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key != KEY_TAB && Event.m_Key != KEY_LSHIFT && Event.m_Key != KEY_RSHIFT)
+		{
+			m_CompletionChosen = -1;
+			m_CompletionUsed = false;
+		}
+
+		m_Input.ProcessInput(Event);
+	}
+
+	if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_UP)
+	{
+		if(m_EditingNewLine)
+		{
+			str_copy(m_aCurrentInputText, m_Input.GetString());
+			m_EditingNewLine = false;
+		}
+
+		if(m_pHistoryEntry)
+		{
+			CHistoryEntry *pTest = m_History.Prev(m_pHistoryEntry);
+
+			if(pTest)
+				m_pHistoryEntry = pTest;
+		}
+		else
+			m_pHistoryEntry = m_History.Last();
+
+		if(m_pHistoryEntry)
+			m_Input.Set(m_pHistoryEntry->m_aText);
+	}
+	else if(Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_DOWN)
+	{
+		if(m_pHistoryEntry)
+			m_pHistoryEntry = m_History.Next(m_pHistoryEntry);
+
+		if(m_pHistoryEntry)
+		{
+			m_Input.Set(m_pHistoryEntry->m_aText);
+		}
+		else if(!m_EditingNewLine)
+		{
+			m_Input.Set(m_aCurrentInputText);
+			m_EditingNewLine = true;
+		}
+	}
+
+	return true;
+}
+
+void CChat::EnableMode(int Team)
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	if(m_Mode == MODE_NONE)
+	{
+		if(Team)
+			m_Mode = MODE_TEAM;
+		else
+			m_Mode = MODE_ALL;
+
+		Input()->Clear();
+		m_CompletionChosen = -1;
+		m_CompletionUsed = false;
+		m_Input.Activate(EInputPriority::CHAT);
+	}
+}
+
+void CChat::DisableMode()
+{
+	if(m_Mode != MODE_NONE)
+	{
+		m_Mode = MODE_NONE;
+		m_Input.Deactivate();
+	}
+}
+
+void CChat::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+
+	if(MsgType == NETMSGTYPE_SV_CHAT)
+	{
+		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+		AddLine(pMsg->m_ClientID, pMsg->m_Team, pMsg->m_pMessage);
+	}
+	else if(MsgType == NETMSGTYPE_SV_COMMANDINFO)
+	{
+		CNetMsg_Sv_CommandInfo *pMsg = (CNetMsg_Sv_CommandInfo *)pRawMsg;
+		if(!m_ServerSupportsCommandInfo)
+		{
+			m_vCommands.clear();
+			m_ServerSupportsCommandInfo = true;
+		}
+		RegisterCommand(pMsg->m_pName, pMsg->m_pArgsFormat, pMsg->m_pHelpText);
+	}
+	else if(MsgType == NETMSGTYPE_SV_COMMANDINFOREMOVE)
+	{
+		CNetMsg_Sv_CommandInfoRemove *pMsg = (CNetMsg_Sv_CommandInfoRemove *)pRawMsg;
+		UnregisterCommand(pMsg->m_pName);
+	}
+}
+
+bool CChat::LineShouldHighlight(const char *pLine, const char *pName)
+{
+	const char *pHL = str_utf8_find_nocase(pLine, pName);
+
+	if(pHL)
+	{
+		int Length = str_length(pName);
+
+		if(Length > 0 && (pLine == pHL || pHL[-1] == ' ') && (pHL[Length] == 0 || pHL[Length] == ' ' || pHL[Length] == '.' || pHL[Length] == '!' || pHL[Length] == ',' || pHL[Length] == '?' || pHL[Length] == ':'))
+			return true;
+	}
+
+	return false;
+}
+
+#define SAVES_FILE "ddnet-saves.txt"
+const char *SAVES_HEADER[] = {
+	"Time",
+	"Player",
+	"Map",
+	"Code",
+};
+
+void CChat::StoreSave(const char *pText)
+{
+	const char *pStart = str_find(pText, "Team successfully saved by ");
+	const char *pMid = str_find(pText, ". Use '/load ");
+	const char *pOn = str_find(pText, "' on ");
+	const char *pEnd = str_find(pText, pOn ? " to continue" : "' to continue");
+
+	if(!pStart || !pMid || !pEnd || pMid < pStart || pEnd < pMid || (pOn && (pOn < pMid || pEnd < pOn)))
+		return;
+
+	char aName[16];
+	str_truncate(aName, sizeof(aName), pStart + 27, pMid - pStart - 27);
+
+	char aSaveCode[64];
+
+	str_truncate(aSaveCode, sizeof(aSaveCode), pMid + 13, (pOn ? pOn : pEnd) - pMid - 13);
+
+	char aTimestamp[20];
+	str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE);
+
+	// TODO: Find a simple way to get the names of team members. This doesn't
+	// work since team is killed first, then save message gets sent:
+	/*
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		const CNetObj_PlayerInfo *pInfo = GameClient()->m_Snap.m_paInfoByDDTeam[i];
+		if(!pInfo)
+			continue;
+		pInfo->m_Team // All 0
+	}
+	*/
+
+	IOHANDLE File = Storage()->OpenFile(SAVES_FILE, IOFLAG_APPEND, IStorage::TYPE_SAVE);
+	if(!File)
+		return;
+
+	const char *apColumns[4] = {
+		aTimestamp,
+		aName,
+		Client()->GetCurrentMap(),
+		aSaveCode,
+	};
+
+	if(io_tell(File) == 0)
+	{
+		CsvWrite(File, 4, SAVES_HEADER);
+	}
+	CsvWrite(File, 4, apColumns);
+	io_close(File);
+}
+
+void CChat::AddLine(int ClientID, int Team, const char *pLine)
+{
+	if(*pLine == 0 ||
+		(ClientID == SERVER_MSG && !g_Config.m_ClShowChatSystem) ||
+		(ClientID >= 0 && (m_pClient->m_aClients[ClientID].m_aName[0] == '\0' || // unknown client
+					  m_pClient->m_aClients[ClientID].m_ChatIgnore ||
+					  (m_pClient->m_Snap.m_LocalClientID != ClientID && g_Config.m_ClShowChatFriends && !m_pClient->m_aClients[ClientID].m_Friend) ||
+					  (m_pClient->m_Snap.m_LocalClientID != ClientID && m_pClient->m_aClients[ClientID].m_Foe))))
+		return;
+
+	// trim right and set maximum length to 256 utf8-characters
+	int Length = 0;
+	const char *pStr = pLine;
+	const char *pEnd = 0;
+	while(*pStr)
+	{
+		const char *pStrOld = pStr;
+		int Code = str_utf8_decode(&pStr);
+
+		// check if unicode is not empty
+		if(!str_utf8_isspace(Code))
+		{
+			pEnd = 0;
+		}
+		else if(pEnd == 0)
+			pEnd = pStrOld;
+
+		if(++Length >= MAX_LINE_LENGTH)
+		{
+			*(const_cast<char *>(pStr)) = 0;
+			break;
+		}
+	}
+	if(pEnd != 0)
+		*(const_cast<char *>(pEnd)) = 0;
+
+	bool Highlighted = false;
+	char *p = const_cast<char *>(pLine);
+
+	// Only empty string left
+	if(*p == 0)
+		return;
+
+	auto &&FChatMsgCheckAndPrint = [this](CLine *pLine_) {
+		if(pLine_->m_ClientID < 0) // server or client message
+		{
+			if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+				StoreSave(pLine_->m_aText);
+		}
+
+		char aBuf[1024];
+		str_format(aBuf, sizeof(aBuf), "%s%s%s", pLine_->m_aName, pLine_->m_ClientID >= 0 ? ": " : "", pLine_->m_aText);
+
+		ColorRGBA ChatLogColor{1, 1, 1, 1};
+		if(pLine_->m_Highlighted)
+		{
+			ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
+		}
+		else
+		{
+			if(pLine_->m_Friend && g_Config.m_ClMessageFriend)
+				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
+			else if(pLine_->m_Team)
+				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
+			else if(pLine_->m_ClientID == SERVER_MSG)
+				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
+			else if(pLine_->m_ClientID == CLIENT_MSG)
+				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
+			else // regular message
+				ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
+		}
+
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, pLine_->m_Whisper ? "whisper" : (pLine_->m_Team ? "teamchat" : "chat"), aBuf, ChatLogColor);
+	};
+
+	while(*p)
+	{
+		Highlighted = false;
+		pLine = p;
+		// find line separator and strip multiline
+		while(*p)
+		{
+			if(*p++ == '\n')
+			{
+				*(p - 1) = 0;
+				break;
+			}
+		}
+
+		CLine *pCurrentLine = &m_aLines[m_CurrentLine];
+
+		// Team Number:
+		// 0 = global; 1 = team; 2 = sending whisper; 3 = receiving whisper
+
+		// If it's a client message, m_aText will have ": " prepended so we have to work around it.
+		if(pCurrentLine->m_TeamNumber == Team && pCurrentLine->m_ClientID == ClientID && str_comp(pCurrentLine->m_aText, pLine) == 0)
+		{
+			pCurrentLine->m_TimesRepeated++;
+			TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
+			Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
+			pCurrentLine->m_Time = time();
+			pCurrentLine->m_aYOffset[0] = -1.f;
+			pCurrentLine->m_aYOffset[1] = -1.f;
+
+			FChatMsgCheckAndPrint(pCurrentLine);
+			return;
+		}
+
+		m_CurrentLine = (m_CurrentLine + 1) % MAX_LINES;
+
+		pCurrentLine = &m_aLines[m_CurrentLine];
+		pCurrentLine->m_TimesRepeated = 0;
+		pCurrentLine->m_Time = time();
+		pCurrentLine->m_aYOffset[0] = -1.0f;
+		pCurrentLine->m_aYOffset[1] = -1.0f;
+		pCurrentLine->m_ClientID = ClientID;
+		pCurrentLine->m_TeamNumber = Team;
+		pCurrentLine->m_Team = Team == 1;
+		pCurrentLine->m_Whisper = Team >= 2;
+		pCurrentLine->m_NameColor = -2;
+
+		TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
+
+		// check for highlighted name
+		if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		{
+			if(ClientID >= 0 && ClientID != m_pClient->m_aLocalIDs[0] && (!m_pClient->Client()->DummyConnected() || ClientID != m_pClient->m_aLocalIDs[1]))
+			{
+				// main character
+				Highlighted |= LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIDs[0]].m_aName);
+				// dummy
+				Highlighted |= m_pClient->Client()->DummyConnected() && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_aLocalIDs[1]].m_aName);
+			}
+		}
+		else
+		{
+			// on demo playback use local id from snap directly,
+			// since m_aLocalIDs isn't valid there
+			Highlighted |= m_pClient->m_Snap.m_LocalClientID >= 0 && LineShouldHighlight(pLine, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName);
+		}
+
+		pCurrentLine->m_Highlighted = Highlighted;
+
+		if(pCurrentLine->m_ClientID == SERVER_MSG)
+		{
+			str_copy(pCurrentLine->m_aName, "*** ");
+			str_copy(pCurrentLine->m_aText, pLine);
+		}
+		else if(pCurrentLine->m_ClientID == CLIENT_MSG)
+		{
+			str_copy(pCurrentLine->m_aName, "— ");
+			str_copy(pCurrentLine->m_aText, pLine);
+		}
+		else
+		{
+			if(m_pClient->m_aClients[ClientID].m_Team == TEAM_SPECTATORS)
+				pCurrentLine->m_NameColor = TEAM_SPECTATORS;
+
+			if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+			{
+				if(m_pClient->m_aClients[ClientID].m_Team == TEAM_RED)
+					pCurrentLine->m_NameColor = TEAM_RED;
+				else if(m_pClient->m_aClients[ClientID].m_Team == TEAM_BLUE)
+					pCurrentLine->m_NameColor = TEAM_BLUE;
+			}
+
+			if(Team == 2) // whisper send
+			{
+				str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "→ %s", m_pClient->m_aClients[ClientID].m_aName);
+				pCurrentLine->m_NameColor = TEAM_BLUE;
+				pCurrentLine->m_Highlighted = false;
+				Highlighted = false;
+			}
+			else if(Team == 3) // whisper recv
+			{
+				str_format(pCurrentLine->m_aName, sizeof(pCurrentLine->m_aName), "← %s", m_pClient->m_aClients[ClientID].m_aName);
+				pCurrentLine->m_NameColor = TEAM_RED;
+				pCurrentLine->m_Highlighted = true;
+				Highlighted = true;
+			}
+			else
+				str_copy(pCurrentLine->m_aName, m_pClient->m_aClients[ClientID].m_aName);
+
+			str_copy(pCurrentLine->m_aText, pLine);
+			pCurrentLine->m_Friend = m_pClient->m_aClients[ClientID].m_Friend;
+		}
+
+		pCurrentLine->m_HasRenderTee = false;
+
+		pCurrentLine->m_Friend = ClientID >= 0 ? m_pClient->m_aClients[ClientID].m_Friend : false;
+
+		if(pCurrentLine->m_ClientID >= 0 && pCurrentLine->m_aName[0] != '\0')
+		{
+			if(!g_Config.m_ClChatOld)
+			{
+				pCurrentLine->m_CustomColoredSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_CustomColoredSkin;
+				if(pCurrentLine->m_CustomColoredSkin)
+					pCurrentLine->m_RenderSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorableRenderSkin;
+				else
+					pCurrentLine->m_RenderSkin = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_OriginalRenderSkin;
+
+				str_copy(pCurrentLine->m_aSkinName, m_pClient->m_aClients[pCurrentLine->m_ClientID].m_aSkinName);
+				pCurrentLine->m_ColorBody = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorBody;
+				pCurrentLine->m_ColorFeet = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_ColorFeet;
+
+				pCurrentLine->m_RenderSkinMetrics = m_pClient->m_aClients[pCurrentLine->m_ClientID].m_RenderInfo.m_SkinMetrics;
+				pCurrentLine->m_HasRenderTee = true;
+			}
+		}
+
+		FChatMsgCheckAndPrint(pCurrentLine);
+	}
+
+	// play sound
+	int64_t Now = time();
+	if(ClientID == SERVER_MSG)
+	{
+		if(Now - m_aLastSoundPlayed[CHAT_SERVER] >= time_freq() * 3 / 10)
+		{
+			if(g_Config.m_SndServerMessage)
+			{
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_SERVER, 0);
+				m_aLastSoundPlayed[CHAT_SERVER] = Now;
+			}
+		}
+	}
+	else if(ClientID == CLIENT_MSG)
+	{
+		// No sound yet
+	}
+	else if(Highlighted && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		if(Now - m_aLastSoundPlayed[CHAT_HIGHLIGHT] >= time_freq() * 3 / 10)
+		{
+			char aBuf[1024];
+			str_format(aBuf, sizeof(aBuf), "%s: %s", m_aLines[m_CurrentLine].m_aName, m_aLines[m_CurrentLine].m_aText);
+			Client()->Notify("DDNet Chat", aBuf);
+			if(g_Config.m_SndHighlight)
+			{
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0);
+				m_aLastSoundPlayed[CHAT_HIGHLIGHT] = Now;
+			}
+
+			if(g_Config.m_ClEditor)
+			{
+				GameClient()->Editor()->UpdateMentions();
+			}
+		}
+	}
+	else if(Team != 2)
+	{
+		if(Now - m_aLastSoundPlayed[CHAT_CLIENT] >= time_freq() * 3 / 10)
+		{
+			bool PlaySound = m_aLines[m_CurrentLine].m_Team ? g_Config.m_SndTeamChat : g_Config.m_SndChat;
+#if defined(CONF_VIDEORECORDER)
+			if(IVideo::Current())
+			{
+				PlaySound &= (bool)g_Config.m_ClVideoShowChat;
+			}
+#endif
+			if(PlaySound)
+			{
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_CLIENT, 0);
+				m_aLastSoundPlayed[CHAT_CLIENT] = Now;
+			}
+		}
+	}
+}
+
+void CChat::RefindSkins()
+{
+	for(auto &Line : m_aLines)
+	{
+		if(Line.m_HasRenderTee)
+		{
+			const CSkin *pSkin = m_pClient->m_Skins.Find(Line.m_aSkinName);
+			if(Line.m_CustomColoredSkin)
+				Line.m_RenderSkin = pSkin->m_ColorableSkin;
+			else
+				Line.m_RenderSkin = pSkin->m_OriginalSkin;
+
+			Line.m_RenderSkinMetrics = pSkin->m_Metrics;
+		}
+		else
+		{
+			Line.m_RenderSkin.Reset();
+		}
+	}
+}
+
+void CChat::OnPrepareLines(float y)
+{
+	float x = 5.0f;
+	float FontSize = this->FontSize();
+
+	float ScreenRatio = Graphics()->ScreenAspect();
+
+	const bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (ScreenRatio > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
+	const bool ShowLargeArea = m_Show || (m_Mode != MODE_NONE && g_Config.m_ClShowChat == 1) || g_Config.m_ClShowChat == 2;
+	const bool ForceRecreate = IsScoreBoardOpen != m_PrevScoreBoardShowed || ShowLargeArea != m_PrevShowChat;
+	m_PrevScoreBoardShowed = IsScoreBoardOpen;
+	m_PrevShowChat = ShowLargeArea;
+
+	const int TeeSize = MessageTeeSize();
+	float RealMsgPaddingX = MessagePaddingX();
+	float RealMsgPaddingY = MessagePaddingY();
+	float RealMsgPaddingTee = TeeSize + MESSAGE_TEE_PADDING_RIGHT;
+
+	if(g_Config.m_ClChatOld)
+	{
+		RealMsgPaddingX = 0;
+		RealMsgPaddingY = 0;
+		RealMsgPaddingTee = 0;
+	}
+
+	int64_t Now = time();
+	float LineWidth = (IsScoreBoardOpen ? maximum(85.f, (FontSize * 85.0f / 6.f)) : g_Config.m_ClChatWidth) - (RealMsgPaddingX * 1.5f) - RealMsgPaddingTee;
+
+	float HeightLimit = IsScoreBoardOpen ? 180.0f : (m_PrevShowChat ? 50.0f : 200.0f);
+	float Begin = x;
+	float TextBegin = Begin + RealMsgPaddingX / 2.0f;
+	CTextCursor Cursor;
+	int OffsetType = IsScoreBoardOpen ? 1 : 0;
+
+	for(int i = 0; i < MAX_LINES; i++)
+	{
+		int r = ((m_CurrentLine - i) + MAX_LINES) % MAX_LINES;
+
+		if(Now > m_aLines[r].m_Time + 16 * time_freq() && !m_PrevShowChat)
+			break;
+
+		if(m_aLines[r].m_TextContainerIndex.Valid() && !ForceRecreate)
+			continue;
+
+		TextRender()->DeleteTextContainer(m_aLines[r].m_TextContainerIndex);
+		Graphics()->DeleteQuadContainer(m_aLines[r].m_QuadContainerIndex);
+
+		char aName[64 + 12] = "";
+
+		if(g_Config.m_ClShowIDs && m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		{
+			if(m_aLines[r].m_ClientID < 10)
+				str_format(aName, sizeof(aName), " %d: ", m_aLines[r].m_ClientID);
+			else
+				str_format(aName, sizeof(aName), "%d: ", m_aLines[r].m_ClientID);
+		}
+
+		str_append(aName, m_aLines[r].m_aName);
+
+		char aCount[12];
+		if(m_aLines[r].m_ClientID < 0)
+			str_format(aCount, sizeof(aCount), "[%d] ", m_aLines[r].m_TimesRepeated + 1);
+		else
+			str_format(aCount, sizeof(aCount), " [%d]", m_aLines[r].m_TimesRepeated + 1);
+
+		if(g_Config.m_ClChatOld)
+		{
+			m_aLines[r].m_HasRenderTee = false;
+		}
+
+		// get the y offset (calculate it if we haven't done that yet)
+		if(m_aLines[r].m_aYOffset[OffsetType] < 0.0f)
+		{
+			TextRender()->SetCursor(&Cursor, TextBegin, 0.0f, FontSize, 0);
+			Cursor.m_LineWidth = LineWidth;
+
+			if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+			{
+				Cursor.m_X += RealMsgPaddingTee;
+
+				if(m_aLines[r].m_Friend && g_Config.m_ClMessageFriend)
+				{
+					TextRender()->TextEx(&Cursor, "♥ ", -1);
+				}
+			}
+
+			TextRender()->TextEx(&Cursor, aName, -1);
+			if(m_aLines[r].m_TimesRepeated > 0)
+				TextRender()->TextEx(&Cursor, aCount, -1);
+
+			if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+			{
+				TextRender()->TextEx(&Cursor, ": ", -1);
+			}
+
+			CTextCursor AppendCursor = Cursor;
+			AppendCursor.m_LongestLineWidth = 0.0f;
+			if(!IsScoreBoardOpen && !g_Config.m_ClChatOld)
+			{
+				AppendCursor.m_StartX = Cursor.m_X;
+				AppendCursor.m_LineWidth -= Cursor.m_LongestLineWidth;
+			}
+
+			TextRender()->TextEx(&AppendCursor, m_aLines[r].m_aText, -1);
+
+			m_aLines[r].m_aYOffset[OffsetType] = AppendCursor.m_Y + AppendCursor.m_FontSize + RealMsgPaddingY;
+		}
+
+		y -= m_aLines[r].m_aYOffset[OffsetType];
+
+		// cut off if msgs waste too much space
+		if(y < HeightLimit)
+			break;
+
+		// the position the text was created
+		m_aLines[r].m_TextYOffset = y + RealMsgPaddingY / 2.f;
+
+		int CurRenderFlags = TextRender()->GetRenderFlags();
+		TextRender()->SetRenderFlags(CurRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_AUTOMATIC_QUAD_UPLOAD);
+
+		// reset the cursor
+		TextRender()->SetCursor(&Cursor, TextBegin, m_aLines[r].m_TextYOffset, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = LineWidth;
+
+		// Message is from valid player
+		if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		{
+			Cursor.m_X += RealMsgPaddingTee;
+
+			if(m_aLines[r].m_Friend && g_Config.m_ClMessageFriend)
+			{
+				const char *pHeartStr = "♥ ";
+				ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
+				TextRender()->TextColor(rgb.WithAlpha(1.f));
+				TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, pHeartStr);
+			}
+		}
+
+		// render name
+		ColorRGBA NameColor;
+		if(m_aLines[r].m_ClientID == SERVER_MSG)
+			NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
+		else if(m_aLines[r].m_ClientID == CLIENT_MSG)
+			NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
+		else if(m_aLines[r].m_Team)
+			NameColor = CalculateNameColor(ColorHSLA(g_Config.m_ClMessageTeamColor));
+		else if(m_aLines[r].m_NameColor == TEAM_RED)
+			NameColor = ColorRGBA(1.0f, 0.5f, 0.5f, 1.f);
+		else if(m_aLines[r].m_NameColor == TEAM_BLUE)
+			NameColor = ColorRGBA(0.7f, 0.7f, 1.0f, 1.f);
+		else if(m_aLines[r].m_NameColor == TEAM_SPECTATORS)
+			NameColor = ColorRGBA(0.75f, 0.5f, 0.75f, 1.f);
+		else if(m_aLines[r].m_ClientID >= 0 && g_Config.m_ClChatTeamColors && m_pClient->m_Teams.Team(m_aLines[r].m_ClientID))
+			NameColor = m_pClient->GetDDTeamColor(m_pClient->m_Teams.Team(m_aLines[r].m_ClientID), 0.75f);
+		else
+			NameColor = ColorRGBA(0.8f, 0.8f, 0.8f, 1.f);
+
+		TextRender()->TextColor(NameColor);
+		TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, aName);
+
+		if(m_aLines[r].m_TimesRepeated > 0)
+		{
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.3f);
+			TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, aCount);
+		}
+
+		if(m_aLines[r].m_ClientID >= 0 && m_aLines[r].m_aName[0] != '\0')
+		{
+			TextRender()->TextColor(NameColor);
+			TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &Cursor, ": ");
+		}
+
+		// render line
+		ColorRGBA Color;
+		if(m_aLines[r].m_ClientID == SERVER_MSG)
+			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
+		else if(m_aLines[r].m_ClientID == CLIENT_MSG)
+			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
+		else if(m_aLines[r].m_Highlighted)
+			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
+		else if(m_aLines[r].m_Team)
+			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
+		else // regular message
+			Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
+
+		TextRender()->TextColor(Color);
+
+		CTextCursor AppendCursor = Cursor;
+		AppendCursor.m_LongestLineWidth = 0.0f;
+		float OriginalWidth = 0.0f;
+		if(!IsScoreBoardOpen && !g_Config.m_ClChatOld)
+		{
+			AppendCursor.m_StartX = Cursor.m_X;
+			AppendCursor.m_LineWidth -= Cursor.m_LongestLineWidth;
+			OriginalWidth = Cursor.m_LongestLineWidth;
+		}
+
+		const char *pText = m_aLines[r].m_aText;
+		if(Config()->m_ClStreamerMode && m_aLines[r].m_ClientID == SERVER_MSG)
+		{
+			if(str_startswith(m_aLines[r].m_aText, "Team save in progress. You'll be able to load with '/load") && str_endswith(m_aLines[r].m_aText, "if it fails"))
+				pText = "Team save in progress. You'll be able to load with '/load ***' if save is successful or with '/load *** *** ***' if it fails";
+			else if(str_startswith(m_aLines[r].m_aText, "Team successfully saved by ") && str_endswith(m_aLines[r].m_aText, " to continue"))
+				pText = "Team successfully saved by ***. Use '/load ***' to continue";
+		}
+		TextRender()->CreateOrAppendTextContainer(m_aLines[r].m_TextContainerIndex, &AppendCursor, pText);
+
+		if(!g_Config.m_ClChatOld && (m_aLines[r].m_aText[0] != '\0' || m_aLines[r].m_aName[0] != '\0'))
+		{
+			float Height = m_aLines[r].m_aYOffset[OffsetType];
+			Graphics()->SetColor(1, 1, 1, 1);
+			m_aLines[r].m_QuadContainerIndex = Graphics()->CreateRectQuadContainer(Begin, y, OriginalWidth + AppendCursor.m_LongestLineWidth + RealMsgPaddingX * 1.5f, Height, MessageRounding(), IGraphics::CORNER_ALL);
+		}
+
+		TextRender()->SetRenderFlags(CurRenderFlags);
+		if(m_aLines[r].m_TextContainerIndex.Valid())
+			TextRender()->UploadTextContainer(m_aLines[r].m_TextContainerIndex);
+	}
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+}
+
+void CChat::OnRender()
+{
+	// send pending chat messages
+	if(m_PendingChatCounter > 0 && m_LastChatSend + time_freq() < time())
+	{
+		CHistoryEntry *pEntry = m_History.Last();
+		for(int i = m_PendingChatCounter - 1; pEntry; --i, pEntry = m_History.Prev(pEntry))
+		{
+			if(i == 0)
+			{
+				Say(pEntry->m_Team, pEntry->m_aText);
+				break;
+			}
+		}
+		--m_PendingChatCounter;
+	}
+
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	float x = 5.0f;
+	float y = 300.0f - 20.0f * FontSize() / 6.f;
+	float ScaledFontSize = FontSize() * (8 / 6.f);
+	if(m_Mode != MODE_NONE)
+	{
+		// render chat input
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, x, y, ScaledFontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = Width - 190.0f;
+
+		if(m_Mode == MODE_ALL)
+			TextRender()->TextEx(&Cursor, Localize("All"), -1);
+		else if(m_Mode == MODE_TEAM)
+			TextRender()->TextEx(&Cursor, Localize("Team"), -1);
+		else
+			TextRender()->TextEx(&Cursor, Localize("Chat"), -1);
+
+		TextRender()->TextEx(&Cursor, ": ", -1);
+
+		const float MessageMaxWidth = Cursor.m_LineWidth - (Cursor.m_X - Cursor.m_StartX);
+		const CUIRect ClippingRect = {Cursor.m_X, Cursor.m_Y, MessageMaxWidth, 2.25f * Cursor.m_FontSize};
+		const float XScale = Graphics()->ScreenWidth() / Width;
+		const float YScale = Graphics()->ScreenHeight() / Height;
+		Graphics()->ClipEnable((int)(ClippingRect.x * XScale), (int)(ClippingRect.y * YScale), (int)(ClippingRect.w * XScale), (int)(ClippingRect.h * YScale));
+
+		float ScrollOffset = m_Input.GetScrollOffset();
+		float ScrollOffsetChange = m_Input.GetScrollOffsetChange();
+
+		m_Input.Activate(EInputPriority::CHAT); // Ensure that the input is active
+		const CUIRect InputCursorRect = {Cursor.m_X, Cursor.m_Y - ScrollOffset, 0.0f, 0.0f};
+		const bool WasChanged = m_Input.WasChanged();
+		const bool WasCursorChanged = m_Input.WasCursorChanged();
+		const bool Changed = WasChanged || WasCursorChanged;
+		const STextBoundingBox BoundingBox = m_Input.Render(&InputCursorRect, Cursor.m_FontSize, TEXTALIGN_TL, Changed, MessageMaxWidth, 0.0f);
+
+		Graphics()->ClipDisable();
+
+		// Scroll up or down to keep the caret inside the clipping rect
+		const float CaretPositionY = m_Input.GetCaretPosition().y - ScrollOffsetChange;
+		if(CaretPositionY < ClippingRect.y)
+			ScrollOffsetChange -= ClippingRect.y - CaretPositionY;
+		else if(CaretPositionY + Cursor.m_FontSize > ClippingRect.y + ClippingRect.h)
+			ScrollOffsetChange += CaretPositionY + Cursor.m_FontSize - (ClippingRect.y + ClippingRect.h);
+
+		UI()->DoSmoothScrollLogic(&ScrollOffset, &ScrollOffsetChange, ClippingRect.h, BoundingBox.m_H);
+
+		m_Input.SetScrollOffset(ScrollOffset);
+		m_Input.SetScrollOffsetChange(ScrollOffsetChange);
+	}
+
+#if defined(CONF_VIDEORECORDER)
+	if(!((g_Config.m_ClShowChat && !IVideo::Current()) || (g_Config.m_ClVideoShowChat && IVideo::Current())))
+#else
+	if(!g_Config.m_ClShowChat)
+#endif
+		return;
+
+	y -= ScaledFontSize;
+
+	OnPrepareLines(y);
+
+	float ScreenRatio = Graphics()->ScreenAspect();
+	bool IsScoreBoardOpen = m_pClient->m_Scoreboard.Active() && (ScreenRatio > 1.7f); // only assume scoreboard when screen ratio is widescreen(something around 16:9)
+
+	int64_t Now = time();
+	float HeightLimit = IsScoreBoardOpen ? 180.0f : (m_PrevShowChat ? 50.0f : 200.0f);
+	int OffsetType = IsScoreBoardOpen ? 1 : 0;
+
+	float RealMsgPaddingX = MessagePaddingX();
+	float RealMsgPaddingY = MessagePaddingY();
+
+	if(g_Config.m_ClChatOld)
+	{
+		RealMsgPaddingX = 0;
+		RealMsgPaddingY = 0;
+	}
+
+	for(int i = 0; i < MAX_LINES; i++)
+	{
+		int r = ((m_CurrentLine - i) + MAX_LINES) % MAX_LINES;
+		if(Now > m_aLines[r].m_Time + 16 * time_freq() && !m_PrevShowChat)
+			break;
+
+		y -= m_aLines[r].m_aYOffset[OffsetType];
+
+		// cut off if msgs waste too much space
+		if(y < HeightLimit)
+			break;
+
+		float Blend = Now > m_aLines[r].m_Time + 14 * time_freq() && !m_PrevShowChat ? 1.0f - (Now - m_aLines[r].m_Time - 14 * time_freq()) / (2.0f * time_freq()) : 1.0f;
+
+		// Draw backgrounds for messages in one batch
+		if(!g_Config.m_ClChatOld)
+		{
+			Graphics()->TextureClear();
+			if(m_aLines[r].m_QuadContainerIndex != -1)
+			{
+				Graphics()->SetColor(0, 0, 0, 0.12f * Blend);
+				Graphics()->RenderQuadContainerEx(m_aLines[r].m_QuadContainerIndex, 0, -1, 0, ((y + RealMsgPaddingY / 2.0f) - m_aLines[r].m_TextYOffset));
+			}
+		}
+
+		if(m_aLines[r].m_TextContainerIndex.Valid())
+		{
+			if(!g_Config.m_ClChatOld && m_aLines[r].m_HasRenderTee)
+			{
+				const int TeeSize = MessageTeeSize();
+				CTeeRenderInfo RenderInfo;
+				RenderInfo.m_CustomColoredSkin = m_aLines[r].m_CustomColoredSkin;
+				if(m_aLines[r].m_CustomColoredSkin)
+					RenderInfo.m_ColorableRenderSkin = m_aLines[r].m_RenderSkin;
+				else
+					RenderInfo.m_OriginalRenderSkin = m_aLines[r].m_RenderSkin;
+				RenderInfo.m_SkinMetrics = m_aLines[r].m_RenderSkinMetrics;
+
+				RenderInfo.m_ColorBody = m_aLines[r].m_ColorBody;
+				RenderInfo.m_ColorFeet = m_aLines[r].m_ColorFeet;
+				RenderInfo.m_Size = TeeSize;
+
+				float RowHeight = FontSize() + RealMsgPaddingY;
+				float OffsetTeeY = TeeSize / 2.0f;
+				float FullHeightMinusTee = RowHeight - TeeSize;
+
+				const CAnimState *pIdleState = CAnimState::GetIdle();
+				vec2 OffsetToMid;
+				RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &RenderInfo, OffsetToMid);
+				vec2 TeeRenderPos(x + (RealMsgPaddingX + TeeSize) / 2.0f, y + OffsetTeeY + FullHeightMinusTee / 2.0f + OffsetToMid.y);
+				RenderTools()->RenderTee(pIdleState, &RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
+			}
+
+			const ColorRGBA TextColor = TextRender()->DefaultTextColor().WithMultipliedAlpha(Blend);
+			const ColorRGBA TextOutlineColor = TextRender()->DefaultTextOutlineColor().WithMultipliedAlpha(Blend);
+			TextRender()->RenderTextContainer(m_aLines[r].m_TextContainerIndex, TextColor, TextOutlineColor, 0, (y + RealMsgPaddingY / 2.0f) - m_aLines[r].m_TextYOffset);
+		}
+	}
+}
+
+void CChat::Say(int Team, const char *pLine)
+{
+	// don't send empty messages
+	if(*str_utf8_skip_whitespaces(pLine) == '\0')
+		return;
+
+	m_LastChatSend = time();
+
+	// send chat message
+	CNetMsg_Cl_Say Msg;
+	Msg.m_Team = Team;
+	Msg.m_pMessage = pLine;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+void CChat::SayChat(const char *pLine)
+{
+	if(!pLine || str_length(pLine) < 1)
+		return;
+
+	bool AddEntry = false;
+
+	if(m_LastChatSend + time_freq() < time())
+	{
+		Say(m_Mode == MODE_ALL ? 0 : 1, pLine);
+		AddEntry = true;
+	}
+	else if(m_PendingChatCounter < 3)
+	{
+		++m_PendingChatCounter;
+		AddEntry = true;
+	}
+
+	if(AddEntry)
+	{
+		CHistoryEntry *pEntry = m_History.Allocate(sizeof(CHistoryEntry) + str_length(pLine) - 1);
+		pEntry->m_Team = m_Mode == MODE_ALL ? 0 : 1;
+		mem_copy(pEntry->m_aText, pLine, str_length(pLine));
+	}
+}
+
+void CChat::EnsureCoherentFontSize() const
+{
+	// Adjust font size based on width
+	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
+		return;
+
+	// We want to keep a ration between font size and font width so that we don't have a weird rendering
+	g_Config.m_ClChatFontSize = g_Config.m_ClChatWidth / CHAT_FONTSIZE_WIDTH_RATIO;
+}
+
+void CChat::EnsureCoherentWidth() const
+{
+	// Adjust width based on font size
+	if(g_Config.m_ClChatWidth / (float)g_Config.m_ClChatFontSize >= CHAT_FONTSIZE_WIDTH_RATIO)
+		return;
+
+	// We want to keep a ration between font size and font width so that we don't have a weird rendering
+	g_Config.m_ClChatWidth = CHAT_FONTSIZE_WIDTH_RATIO * g_Config.m_ClChatFontSize;
+}
diff --git a/src_bkp/game/client/components/chat.h b/src_bkp/game/client/components/chat.h
new file mode 100644
index 0000000000..cf23efc935
--- /dev/null
+++ b/src_bkp/game/client/components/chat.h
@@ -0,0 +1,189 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_CHAT_H
+#define GAME_CLIENT_COMPONENTS_CHAT_H
+#include <vector>
+
+#include <engine/console.h>
+#include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/ringbuffer.h>
+
+#include <game/client/component.h>
+#include <game/client/lineinput.h>
+#include <game/client/skin.h>
+
+class CChat : public CComponent
+{
+	static constexpr float CHAT_HEIGHT_FULL = 200.0f;
+	static constexpr float CHAT_HEIGHT_MIN = 50.0f;
+	static constexpr float CHAT_FONTSIZE_WIDTH_RATIO = 2.5f;
+
+	enum
+	{
+		MAX_LINES = 64,
+		MAX_LINE_LENGTH = 256
+	};
+
+	CLineInputBuffered<MAX_LINE_LENGTH> m_Input;
+	struct CLine
+	{
+		int64_t m_Time;
+		float m_aYOffset[2];
+		int m_ClientID;
+		int m_TeamNumber;
+		bool m_Team;
+		bool m_Whisper;
+		int m_NameColor;
+		char m_aName[64];
+		char m_aText[MAX_LINE_LENGTH];
+		bool m_Friend;
+		bool m_Highlighted;
+
+		STextContainerIndex m_TextContainerIndex;
+		int m_QuadContainerIndex;
+
+		char m_aSkinName[std::size(g_Config.m_ClPlayerSkin)];
+		CSkin::SSkinTextures m_RenderSkin;
+		CSkin::SSkinMetrics m_RenderSkinMetrics;
+		bool m_CustomColoredSkin;
+		ColorRGBA m_ColorBody;
+		ColorRGBA m_ColorFeet;
+
+		bool m_HasRenderTee;
+		float m_TextYOffset;
+
+		int m_TimesRepeated;
+	};
+
+	bool m_PrevScoreBoardShowed;
+	bool m_PrevShowChat;
+
+	CLine m_aLines[MAX_LINES];
+	int m_CurrentLine;
+
+	enum
+	{
+		// client IDs for special messages
+		CLIENT_MSG = -2,
+		SERVER_MSG = -1,
+
+		MODE_NONE = 0,
+		MODE_ALL,
+		MODE_TEAM,
+
+		CHAT_SERVER = 0,
+		CHAT_HIGHLIGHT,
+		CHAT_CLIENT,
+		CHAT_NUM,
+	};
+
+	int m_Mode;
+	bool m_Show;
+	bool m_CompletionUsed;
+	int m_CompletionChosen;
+	char m_aCompletionBuffer[MAX_LINE_LENGTH];
+	int m_PlaceholderOffset;
+	int m_PlaceholderLength;
+	static char ms_aDisplayText[MAX_LINE_LENGTH];
+	struct CRateablePlayer
+	{
+		int ClientID;
+		int Score;
+	};
+	CRateablePlayer m_aPlayerCompletionList[MAX_CLIENTS];
+	int m_PlayerCompletionListLength;
+
+	struct CCommand
+	{
+		char m_aName[IConsole::TEMPCMD_NAME_LENGTH];
+		char m_aParams[IConsole::TEMPCMD_PARAMS_LENGTH];
+		char m_aHelpText[IConsole::TEMPCMD_HELP_LENGTH];
+
+		CCommand() = default;
+		CCommand(const char *pName, const char *pParams, const char *pHelpText)
+		{
+			str_copy(m_aName, pName);
+			str_copy(m_aParams, pParams);
+			str_copy(m_aHelpText, pHelpText);
+		}
+
+		bool operator<(const CCommand &Other) const { return str_comp(m_aName, Other.m_aName) < 0; }
+		bool operator<=(const CCommand &Other) const { return str_comp(m_aName, Other.m_aName) <= 0; }
+		bool operator==(const CCommand &Other) const { return str_comp(m_aName, Other.m_aName) == 0; }
+	};
+
+	std::vector<CCommand> m_vCommands;
+	std::vector<CCommand> m_vDefaultCommands;
+	bool m_CommandsNeedSorting;
+
+	struct CHistoryEntry
+	{
+		int m_Team;
+		char m_aText[1];
+	};
+	CHistoryEntry *m_pHistoryEntry;
+	CStaticRingBuffer<CHistoryEntry, 64 * 1024, CRingBufferBase::FLAG_RECYCLE> m_History;
+	int m_PendingChatCounter;
+	int64_t m_LastChatSend;
+	int64_t m_aLastSoundPlayed[CHAT_NUM];
+	bool m_IsInputCensored;
+	char m_aCurrentInputText[MAX_LINE_LENGTH];
+	bool m_EditingNewLine;
+
+	bool m_ServerSupportsCommandInfo;
+
+	static void ConSay(IConsole::IResult *pResult, void *pUserData);
+	static void ConSayTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConChat(IConsole::IResult *pResult, void *pUserData);
+	static void ConShowChat(IConsole::IResult *pResult, void *pUserData);
+	static void ConEcho(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConchainChatOld(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainChatFontSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainChatWidth(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	bool LineShouldHighlight(const char *pLine, const char *pName);
+	void StoreSave(const char *pText);
+
+public:
+	CChat();
+	int Sizeof() const override { return sizeof(*this); }
+
+	static constexpr float MESSAGE_TEE_PADDING_RIGHT = 0.5f;
+
+	bool IsActive() const { return m_Mode != MODE_NONE; }
+	void AddLine(int ClientID, int Team, const char *pLine);
+	void EnableMode(int Team);
+	void DisableMode();
+	void Say(int Team, const char *pLine);
+	void SayChat(const char *pLine);
+	void RegisterCommand(const char *pName, const char *pParams, const char *pHelpText);
+	void UnregisterCommand(const char *pName);
+	void Echo(const char *pString);
+
+	void OnWindowResize() override;
+	void OnConsoleInit() override;
+	void OnStateChange(int NewState, int OldState) override;
+	void OnRender() override;
+	void RefindSkins();
+	void OnPrepareLines(float y);
+	void Reset();
+	void OnRelease() override;
+	void OnMessage(int MsgType, void *pRawMsg) override;
+	bool OnInput(const IInput::CEvent &Event) override;
+	void OnInit() override;
+	void OnMapLoad() override;
+
+	void RebuildChat();
+
+	void EnsureCoherentFontSize() const;
+	void EnsureCoherentWidth() const;
+
+	float FontSize() const { return g_Config.m_ClChatFontSize / 10.0f; }
+	float MessagePaddingX() const { return FontSize() * (5 / 6.f); }
+	float MessagePaddingY() const { return FontSize() * (1 / 6.f); }
+	float MessageTeeSize() const { return FontSize() * (7 / 6.f); }
+	float MessageRounding() const { return FontSize() * (1 / 2.f); }
+};
+#endif
diff --git a/src_bkp/game/client/components/console.cpp b/src_bkp/game/client/components/console.cpp
new file mode 100644
index 0000000000..4c11fdd78b
--- /dev/null
+++ b/src_bkp/game/client/components/console.cpp
@@ -0,0 +1,1452 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/lock.h>
+#include <base/logger.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <game/generated/client_data.h>
+
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/shared/ringbuffer.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/localization.h>
+#include <game/version.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+
+#include <iterator>
+
+#include "console.h"
+
+static constexpr float FONT_SIZE = 10.0f;
+static constexpr float LINE_SPACING = 1.0f;
+
+class CConsoleLogger : public ILogger
+{
+	CGameConsole *m_pConsole;
+	CLock m_ConsoleMutex;
+
+public:
+	CConsoleLogger(CGameConsole *pConsole) :
+		m_pConsole(pConsole)
+	{
+		dbg_assert(pConsole != nullptr, "console pointer must not be null");
+	}
+
+	void Log(const CLogMessage *pMessage) override REQUIRES(!m_ConsoleMutex);
+	void OnConsoleDeletion() REQUIRES(!m_ConsoleMutex);
+};
+
+void CConsoleLogger::Log(const CLogMessage *pMessage)
+{
+	if(m_Filter.Filters(pMessage))
+	{
+		return;
+	}
+	ColorRGBA Color = gs_ConsoleDefaultColor;
+	if(pMessage->m_HaveColor)
+	{
+		Color.r = pMessage->m_Color.r / 255.0;
+		Color.g = pMessage->m_Color.g / 255.0;
+		Color.b = pMessage->m_Color.b / 255.0;
+	}
+	const CLockScope LockScope(m_ConsoleMutex);
+	if(m_pConsole)
+	{
+		m_pConsole->m_LocalConsole.PrintLine(pMessage->m_aLine, pMessage->m_LineLength, Color);
+	}
+}
+
+void CConsoleLogger::OnConsoleDeletion()
+{
+	const CLockScope LockScope(m_ConsoleMutex);
+	m_pConsole = nullptr;
+}
+
+// TODO: support "tune_zone", which has tuning as second argument
+static const char *gs_apTuningCommands[] = {"tune ", "tune_reset ", "toggle_tune "};
+static bool IsTuningCommandPrefix(const char *pStr)
+{
+	return std::any_of(std::begin(gs_apTuningCommands), std::end(gs_apTuningCommands), [pStr](auto *pCmd) { return str_startswith_nocase(pStr, pCmd); });
+}
+
+static int PossibleTunings(const char *pStr, IConsole::FPossibleCallback pfnCallback = IConsole::EmptyPossibleCommandCallback, void *pUser = nullptr)
+{
+	int Index = 0;
+	for(int i = 0; i < CTuningParams::Num(); i++)
+	{
+		if(str_find_nocase(CTuningParams::Name(i), pStr))
+		{
+			pfnCallback(Index, CTuningParams::Name(i), pUser);
+			Index++;
+		}
+	}
+	return Index;
+}
+
+static const char *gs_apSettingCommands[] = {"reset ", "toggle ", "access_level ", "+toggle "};
+static bool IsSettingCommandPrefix(const char *pStr)
+{
+	return std::any_of(std::begin(gs_apSettingCommands), std::end(gs_apSettingCommands), [pStr](auto *pCmd) { return str_startswith_nocase(pStr, pCmd); });
+}
+
+const ColorRGBA CGameConsole::ms_SearchHighlightColor = ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f);
+const ColorRGBA CGameConsole::ms_SearchSelectedColor = ColorRGBA(1.0f, 1.0f, 0.0f, 1.0f);
+
+CGameConsole::CInstance::CInstance(int Type)
+{
+	m_pHistoryEntry = 0x0;
+
+	m_Type = Type;
+
+	if(Type == CGameConsole::CONSOLETYPE_LOCAL)
+	{
+		m_pName = "local_console";
+		m_CompletionFlagmask = CFGFLAG_CLIENT;
+	}
+	else
+	{
+		m_pName = "remote_console";
+		m_CompletionFlagmask = CFGFLAG_SERVER;
+	}
+
+	m_aCompletionBuffer[0] = 0;
+	m_CompletionChosen = -1;
+	m_aCompletionBufferArgument[0] = 0;
+	m_CompletionChosenArgument = -1;
+	Reset();
+
+	m_aUser[0] = '\0';
+	m_UserGot = false;
+	m_UsernameReq = false;
+
+	m_IsCommand = false;
+
+	m_Input.SetClipboardLineCallback([this](const char *pStr) { ExecuteLine(pStr); });
+
+	m_CurrentMatchIndex = -1;
+	m_aCurrentSearchString[0] = '\0';
+}
+
+void CGameConsole::CInstance::Init(CGameConsole *pGameConsole)
+{
+	m_pGameConsole = pGameConsole;
+}
+
+void CGameConsole::CInstance::ClearBacklog()
+{
+	{
+		// We must ensure that no log messages are printed while owning
+		// m_BacklogPendingLock or this will result in a dead lock.
+		const CLockScope LockScope(m_BacklogPendingLock);
+		m_BacklogPending.Init();
+	}
+
+	m_Backlog.Init();
+	m_BacklogCurLine = 0;
+	UpdateSearch();
+}
+
+void CGameConsole::CInstance::UpdateBacklogTextAttributes()
+{
+	// Pending backlog entries are not handled because they don't have text attributes yet.
+	for(CInstance::CBacklogEntry *pEntry = m_Backlog.First(); pEntry; pEntry = m_Backlog.Next(pEntry))
+	{
+		UpdateEntryTextAttributes(pEntry);
+	}
+}
+
+void CGameConsole::CInstance::PumpBacklogPending()
+{
+	std::vector<CInstance::CBacklogEntry *> vpEntries;
+	{
+		// We must ensure that no log messages are printed while owning
+		// m_BacklogPendingLock or this will result in a dead lock.
+		const CLockScope LockScopePending(m_BacklogPendingLock);
+		for(CInstance::CBacklogEntry *pPendingEntry = m_BacklogPending.First(); pPendingEntry; pPendingEntry = m_BacklogPending.Next(pPendingEntry))
+		{
+			const size_t EntrySize = sizeof(CBacklogEntry) + pPendingEntry->m_Length;
+			CBacklogEntry *pEntry = m_Backlog.Allocate(EntrySize);
+			mem_copy(pEntry, pPendingEntry, EntrySize);
+			vpEntries.push_back(pEntry);
+		}
+
+		m_BacklogPending.Init();
+	}
+
+	m_pGameConsole->UI()->MapScreen();
+	for(CInstance::CBacklogEntry *pEntry : vpEntries)
+	{
+		UpdateEntryTextAttributes(pEntry);
+		m_NewLineCounter += pEntry->m_LineCount;
+	}
+}
+
+void CGameConsole::CInstance::ClearHistory()
+{
+	m_History.Init();
+	m_pHistoryEntry = 0;
+}
+
+void CGameConsole::CInstance::Reset()
+{
+	m_CompletionRenderOffset = 0.0f;
+	m_CompletionRenderOffsetChange = 0.0f;
+	m_pCommandName = "";
+	m_pCommandHelp = "";
+	m_pCommandParams = "";
+}
+
+void CGameConsole::CInstance::ExecuteLine(const char *pLine)
+{
+	if(m_Type == CGameConsole::CONSOLETYPE_LOCAL)
+		m_pGameConsole->m_pConsole->ExecuteLine(pLine);
+	else
+	{
+		if(m_pGameConsole->Client()->RconAuthed())
+			m_pGameConsole->Client()->Rcon(pLine);
+		else
+		{
+			if(!m_UserGot && m_UsernameReq)
+			{
+				m_UserGot = true;
+				str_copy(m_aUser, pLine);
+			}
+			else
+			{
+				m_pGameConsole->Client()->RconAuth(m_aUser, pLine);
+				m_UserGot = false;
+			}
+		}
+	}
+}
+
+void CGameConsole::CInstance::PossibleCommandsCompleteCallback(int Index, const char *pStr, void *pUser)
+{
+	CGameConsole::CInstance *pInstance = (CGameConsole::CInstance *)pUser;
+	if(pInstance->m_CompletionChosen == Index)
+		pInstance->m_Input.Set(pStr);
+}
+
+static void StrCopyUntilSpace(char *pDest, size_t DestSize, const char *pSrc)
+{
+	const char *pSpace = str_find(pSrc, " ");
+	str_copy(pDest, pSrc, minimum<size_t>(pSpace ? pSpace - pSrc + 1 : 1, DestSize));
+}
+
+void CGameConsole::CInstance::PossibleArgumentsCompleteCallback(int Index, const char *pStr, void *pUser)
+{
+	CGameConsole::CInstance *pInstance = (CGameConsole::CInstance *)pUser;
+	if(pInstance->m_CompletionChosenArgument == Index)
+	{
+		// get command
+		char aBuf[IConsole::CMDLINE_LENGTH];
+		StrCopyUntilSpace(aBuf, sizeof(aBuf), pInstance->GetString());
+		str_append(aBuf, " ");
+
+		// append argument
+		str_append(aBuf, pStr);
+		pInstance->m_Input.Set(aBuf);
+	}
+}
+
+bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
+{
+	bool Handled = false;
+
+	auto &&SelectNextSearchMatch = [&](int Direction) {
+		if(!m_vSearchMatches.empty())
+		{
+			m_CurrentMatchIndex += Direction;
+			if(m_CurrentMatchIndex >= (int)m_vSearchMatches.size())
+				m_CurrentMatchIndex = 0;
+			if(m_CurrentMatchIndex < 0)
+				m_CurrentMatchIndex = (int)m_vSearchMatches.size() - 1;
+			m_HasSelection = false;
+			// Also scroll to the correct line
+			ScrollToCenter(m_vSearchMatches[m_CurrentMatchIndex].m_StartLine, m_vSearchMatches[m_CurrentMatchIndex].m_EndLine);
+		}
+	};
+
+	if(Event.m_Flags & IInput::FLAG_PRESS)
+	{
+		if(Event.m_Key == KEY_RETURN || Event.m_Key == KEY_KP_ENTER)
+		{
+			if(!m_Searching)
+			{
+				if(!m_Input.IsEmpty() || (m_UsernameReq && !m_pGameConsole->Client()->RconAuthed() && !m_UserGot))
+				{
+					if(m_Type == CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
+					{
+						const char *pPrevEntry = m_History.Last();
+						if(pPrevEntry == nullptr || str_comp(pPrevEntry, m_Input.GetString()) != 0)
+						{
+							char *pEntry = m_History.Allocate(m_Input.GetLength() + 1);
+							str_copy(pEntry, m_Input.GetString(), m_Input.GetLength() + 1);
+						}
+						// print out the user's commands before they get run
+						char aBuf[IConsole::CMDLINE_LENGTH + 3];
+						str_format(aBuf, sizeof(aBuf), "> %s", m_Input.GetString());
+						m_pGameConsole->PrintLine(m_Type, aBuf);
+					}
+					ExecuteLine(m_Input.GetString());
+					m_Input.Clear();
+					m_pHistoryEntry = 0x0;
+				}
+			}
+			else
+			{
+				SelectNextSearchMatch(m_pGameConsole->m_pClient->Input()->ShiftIsPressed() ? -1 : 1);
+			}
+
+			Handled = true;
+		}
+		else if(Event.m_Key == KEY_UP)
+		{
+			if(m_Searching)
+			{
+				SelectNextSearchMatch(-1);
+			}
+			else if(m_Type == CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
+			{
+				if(m_pHistoryEntry)
+				{
+					char *pTest = m_History.Prev(m_pHistoryEntry);
+
+					if(pTest)
+						m_pHistoryEntry = pTest;
+				}
+				else
+					m_pHistoryEntry = m_History.Last();
+
+				if(m_pHistoryEntry)
+					m_Input.Set(m_pHistoryEntry);
+			}
+			Handled = true;
+		}
+		else if(Event.m_Key == KEY_DOWN)
+		{
+			if(m_Searching)
+			{
+				SelectNextSearchMatch(1);
+			}
+			else if(m_Type == CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
+			{
+				if(m_pHistoryEntry)
+					m_pHistoryEntry = m_History.Next(m_pHistoryEntry);
+
+				if(m_pHistoryEntry)
+					m_Input.Set(m_pHistoryEntry);
+				else
+					m_Input.Clear();
+			}
+			Handled = true;
+		}
+		else if(Event.m_Key == KEY_TAB)
+		{
+			const int Direction = m_pGameConsole->m_pClient->Input()->ShiftIsPressed() ? -1 : 1;
+
+			if(!m_Searching)
+			{
+				// command completion
+				const bool UseTempCommands = m_Type == CGameConsole::CONSOLETYPE_REMOTE && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands();
+				int CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands);
+				if(m_Type == CGameConsole::CONSOLETYPE_LOCAL || m_pGameConsole->Client()->RconAuthed())
+				{
+					if(CompletionEnumerationCount)
+					{
+						if(m_CompletionChosen == -1 && Direction < 0)
+							m_CompletionChosen = 0;
+						m_CompletionChosen = (m_CompletionChosen + Direction + CompletionEnumerationCount) % CompletionEnumerationCount;
+						m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBuffer, m_CompletionFlagmask, UseTempCommands, PossibleCommandsCompleteCallback, this);
+					}
+					else if(m_CompletionChosen != -1)
+					{
+						m_CompletionChosen = -1;
+						Reset();
+					}
+				}
+
+				// Argument completion
+				const bool TuningCompletion = IsTuningCommandPrefix(GetString());
+				const bool SettingCompletion = IsSettingCommandPrefix(GetString());
+				if(TuningCompletion)
+					CompletionEnumerationCount = PossibleTunings(m_aCompletionBufferArgument);
+				else if(SettingCompletion)
+					CompletionEnumerationCount = m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBufferArgument, m_CompletionFlagmask, UseTempCommands);
+
+				if(CompletionEnumerationCount)
+				{
+					if(m_CompletionChosenArgument == -1 && Direction < 0)
+						m_CompletionChosenArgument = 0;
+					m_CompletionChosenArgument = (m_CompletionChosenArgument + Direction + CompletionEnumerationCount) % CompletionEnumerationCount;
+					if(TuningCompletion && m_pGameConsole->Client()->RconAuthed() && m_Type == CGameConsole::CONSOLETYPE_REMOTE)
+						PossibleTunings(m_aCompletionBufferArgument, PossibleArgumentsCompleteCallback, this);
+					else if(SettingCompletion)
+						m_pGameConsole->m_pConsole->PossibleCommands(m_aCompletionBufferArgument, m_CompletionFlagmask, UseTempCommands, PossibleArgumentsCompleteCallback, this);
+				}
+				else if(m_CompletionChosenArgument != -1)
+				{
+					m_CompletionChosenArgument = -1;
+					Reset();
+				}
+			}
+			else
+			{
+				// Use Tab / Shift-Tab to cycle through search matches
+				SelectNextSearchMatch(Direction);
+			}
+		}
+		else if(Event.m_Key == KEY_PAGEUP)
+		{
+			m_BacklogCurLine += GetLinesToScroll(-1, m_LinesRendered);
+			m_HasSelection = false;
+		}
+		else if(Event.m_Key == KEY_PAGEDOWN)
+		{
+			m_HasSelection = false;
+			m_BacklogCurLine -= GetLinesToScroll(1, m_LinesRendered);
+
+			if(m_BacklogCurLine < 0)
+				m_BacklogCurLine = 0;
+		}
+		else if(Event.m_Key == KEY_MOUSE_WHEEL_UP)
+		{
+			m_BacklogCurLine += GetLinesToScroll(-1, 1);
+			m_HasSelection = false;
+		}
+		else if(Event.m_Key == KEY_MOUSE_WHEEL_DOWN)
+		{
+			m_HasSelection = false;
+			--m_BacklogCurLine;
+			if(m_BacklogCurLine < 0)
+				m_BacklogCurLine = 0;
+		}
+		// in order not to conflict with CLineInput's handling of Home/End only
+		// react to it when the input is empty
+		else if(Event.m_Key == KEY_HOME && m_Input.IsEmpty())
+		{
+			int Lines = GetLinesToScroll(-1, -1);
+			m_BacklogCurLine += Lines;
+			m_BacklogLastActiveLine = m_BacklogCurLine;
+			m_HasSelection = false;
+		}
+		else if(Event.m_Key == KEY_END && m_Input.IsEmpty())
+		{
+			m_BacklogCurLine = 0;
+			m_HasSelection = false;
+		}
+		else if(Event.m_Key == KEY_F && m_pGameConsole->Input()->ModifierIsPressed() && Event.m_Flags & IInput::FLAG_PRESS)
+		{
+			m_Searching = !m_Searching;
+			ClearSearch();
+
+			Handled = true;
+		}
+	}
+
+	if(!Handled)
+	{
+		Handled = m_Input.ProcessInput(Event);
+		if(Handled)
+			UpdateSearch();
+	}
+
+	if(Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_TEXT))
+	{
+		if(Event.m_Key != KEY_TAB && Event.m_Key != KEY_LSHIFT && Event.m_Key != KEY_RSHIFT)
+		{
+			m_CompletionChosen = -1;
+			str_copy(m_aCompletionBuffer, m_Input.GetString());
+
+			for(const auto *pCmd : gs_apTuningCommands)
+			{
+				if(str_startswith_nocase(m_Input.GetString(), pCmd))
+				{
+					m_CompletionChosenArgument = -1;
+					str_copy(m_aCompletionBufferArgument, &m_Input.GetString()[str_length(pCmd)]);
+				}
+			}
+
+			for(const auto *pCmd : gs_apSettingCommands)
+			{
+				if(str_startswith_nocase(m_Input.GetString(), pCmd))
+				{
+					m_CompletionChosenArgument = -1;
+					str_copy(m_aCompletionBufferArgument, &m_Input.GetString()[str_length(pCmd)]);
+				}
+			}
+
+			Reset();
+		}
+
+		// find the current command
+		{
+			char aBuf[IConsole::CMDLINE_LENGTH];
+			StrCopyUntilSpace(aBuf, sizeof(aBuf), GetString());
+			const IConsole::CCommandInfo *pCommand = m_pGameConsole->m_pConsole->GetCommandInfo(aBuf, m_CompletionFlagmask,
+				m_Type != CGameConsole::CONSOLETYPE_LOCAL && m_pGameConsole->Client()->RconAuthed() && m_pGameConsole->Client()->UseTempRconCommands());
+			if(pCommand)
+			{
+				m_IsCommand = true;
+				m_pCommandName = pCommand->m_pName;
+				m_pCommandHelp = pCommand->m_pHelp;
+				m_pCommandParams = pCommand->m_pParams;
+			}
+			else
+				m_IsCommand = false;
+		}
+	}
+
+	return Handled;
+}
+
+void CGameConsole::CInstance::PrintLine(const char *pLine, int Len, ColorRGBA PrintColor)
+{
+	// We must ensure that no log messages are printed while owning
+	// m_BacklogPendingLock or this will result in a dead lock.
+	const CLockScope LockScope(m_BacklogPendingLock);
+	CBacklogEntry *pEntry = m_BacklogPending.Allocate(sizeof(CBacklogEntry) + Len);
+	pEntry->m_YOffset = -1.0f;
+	pEntry->m_PrintColor = PrintColor;
+	pEntry->m_Length = Len;
+	pEntry->m_LineCount = -1;
+	str_copy(pEntry->m_aText, pLine, Len + 1);
+}
+
+int CGameConsole::CInstance::GetLinesToScroll(int Direction, int LinesToScroll)
+{
+	auto *pEntry = m_Backlog.Last();
+	int Line = 0;
+	int LinesToSkip = (Direction == -1 ? m_BacklogCurLine + m_LinesRendered : m_BacklogCurLine - 1);
+	while(Line < LinesToSkip && pEntry)
+	{
+		if(pEntry->m_LineCount == -1)
+			UpdateEntryTextAttributes(pEntry);
+		Line += pEntry->m_LineCount;
+		pEntry = m_Backlog.Prev(pEntry);
+	}
+
+	int Amount = maximum(0, Line - LinesToSkip);
+	while(pEntry && (LinesToScroll > 0 ? Amount < LinesToScroll : true))
+	{
+		if(pEntry->m_LineCount == -1)
+			UpdateEntryTextAttributes(pEntry);
+		Amount += pEntry->m_LineCount;
+		pEntry = Direction == -1 ? m_Backlog.Prev(pEntry) : m_Backlog.Next(pEntry);
+	}
+
+	return LinesToScroll > 0 ? minimum(Amount, LinesToScroll) : Amount;
+}
+
+void CGameConsole::CInstance::ScrollToCenter(int StartLine, int EndLine)
+{
+	// This method is used to scroll lines from `StartLine` to `EndLine` to the center of the screen, if possible.
+
+	// Find target line
+	int Target = maximum(0, (int)ceil(StartLine - minimum(StartLine - EndLine, m_LinesRendered) / 2) - m_LinesRendered / 2);
+	if(m_BacklogCurLine == Target)
+		return;
+
+	// Compute acutal amount of lines to scroll to make sure lines fit in viewport and we don't have empty space
+	int Direction = m_BacklogCurLine - Target < 0 ? -1 : 1;
+	int LinesToScroll = absolute(Target - m_BacklogCurLine);
+	int ComputedLines = GetLinesToScroll(Direction, LinesToScroll);
+
+	if(Direction == -1)
+		m_BacklogCurLine += ComputedLines;
+	else
+		m_BacklogCurLine -= ComputedLines;
+}
+
+void CGameConsole::CInstance::UpdateEntryTextAttributes(CBacklogEntry *pEntry) const
+{
+	CTextCursor Cursor;
+	m_pGameConsole->TextRender()->SetCursor(&Cursor, 0.0f, 0.0f, FONT_SIZE, 0);
+	Cursor.m_LineWidth = m_pGameConsole->UI()->Screen()->w - 10;
+	Cursor.m_MaxLines = 10;
+	Cursor.m_LineSpacing = LINE_SPACING;
+	m_pGameConsole->TextRender()->TextEx(&Cursor, pEntry->m_aText, -1);
+	pEntry->m_YOffset = Cursor.Height() + LINE_SPACING;
+	pEntry->m_LineCount = Cursor.m_LineCount;
+}
+
+void CGameConsole::CInstance::ClearSearch()
+{
+	m_vSearchMatches.clear();
+	m_CurrentMatchIndex = -1;
+	m_Input.Clear();
+	m_aCurrentSearchString[0] = '\0';
+}
+
+void CGameConsole::CInstance::UpdateSearch()
+{
+	if(!m_Searching)
+		return;
+
+	const char *pSearchText = m_Input.GetString();
+	bool SearchChanged = str_utf8_comp_nocase(pSearchText, m_aCurrentSearchString) != 0;
+
+	int SearchLength = m_Input.GetLength();
+	str_copy(m_aCurrentSearchString, pSearchText);
+
+	m_vSearchMatches.clear();
+	if(pSearchText[0] == '\0')
+	{
+		m_CurrentMatchIndex = -1;
+		return;
+	}
+
+	if(SearchChanged)
+	{
+		m_CurrentMatchIndex = -1;
+		m_HasSelection = false;
+	}
+
+	ITextRender *pTextRender = m_pGameConsole->UI()->TextRender();
+	const int LineWidth = m_pGameConsole->UI()->Screen()->w - 10.0f;
+
+	CBacklogEntry *pEntry = m_Backlog.Last();
+	int EntryLine = 0, LineToScrollStart = 0, LineToScrollEnd = 0;
+
+	for(; pEntry; EntryLine += pEntry->m_LineCount, pEntry = m_Backlog.Prev(pEntry))
+	{
+		const char *pSearchPos = str_utf8_find_nocase(pEntry->m_aText, pSearchText);
+		if(!pSearchPos)
+			continue;
+
+		int EntryLineCount = pEntry->m_LineCount;
+
+		// Find all occurences of the search string and save their positions
+		while(pSearchPos)
+		{
+			int Pos = pSearchPos - pEntry->m_aText;
+
+			if(EntryLineCount == 1)
+			{
+				m_vSearchMatches.emplace_back(Pos, EntryLine, EntryLine, EntryLine);
+				if(EntryLine > LineToScrollStart)
+				{
+					LineToScrollStart = EntryLine;
+					LineToScrollEnd = EntryLine;
+				}
+			}
+			else
+			{
+				// A match can span multiple lines in case of a multiline entry, so we need to know which line the match starts at
+				// and which line it ends at in order to put it in viewport properly
+				STextSizeProperties Props;
+				int LineCount;
+				Props.m_pLineCount = &LineCount;
+
+				// Compute line of end match
+				pTextRender->TextWidth(FONT_SIZE, pEntry->m_aText, Pos + SearchLength, LineWidth, 0, Props);
+				int EndLine = (EntryLineCount - LineCount);
+				int MatchEndLine = EntryLine + EndLine;
+
+				// Compute line of start of match
+				int MatchStartLine = MatchEndLine;
+				if(LineCount > 1)
+				{
+					pTextRender->TextWidth(FONT_SIZE, pEntry->m_aText, Pos, LineWidth, 0, Props);
+					int StartLine = (EntryLineCount - LineCount);
+					MatchStartLine = EntryLine + StartLine;
+				}
+
+				if(MatchStartLine > LineToScrollStart)
+				{
+					LineToScrollStart = MatchStartLine;
+					LineToScrollEnd = MatchEndLine;
+				}
+
+				m_vSearchMatches.emplace_back(Pos, MatchStartLine, MatchEndLine, EntryLine);
+			}
+
+			pSearchPos = str_utf8_find_nocase(pEntry->m_aText + Pos + SearchLength, pSearchText);
+		}
+	}
+
+	if(!m_vSearchMatches.empty() && SearchChanged)
+		m_CurrentMatchIndex = 0;
+	else
+		m_CurrentMatchIndex = std::clamp(m_CurrentMatchIndex, -1, (int)m_vSearchMatches.size() - 1);
+
+	// Reverse order of lines by sorting so we have matches from top to bottom instead of bottom to top
+	std::sort(m_vSearchMatches.begin(), m_vSearchMatches.end(), [](const SSearchMatch &MatchA, const SSearchMatch &MatchB) {
+		if(MatchA.m_StartLine == MatchB.m_StartLine)
+			return MatchA.m_Pos < MatchB.m_Pos; // Make sure to keep position order
+		return MatchA.m_StartLine > MatchB.m_StartLine;
+	});
+
+	if(!m_vSearchMatches.empty() && SearchChanged)
+	{
+		ScrollToCenter(LineToScrollStart, LineToScrollEnd);
+	}
+}
+
+CGameConsole::CGameConsole() :
+	m_LocalConsole(CONSOLETYPE_LOCAL), m_RemoteConsole(CONSOLETYPE_REMOTE)
+{
+	m_ConsoleType = CONSOLETYPE_LOCAL;
+	m_ConsoleState = CONSOLE_CLOSED;
+	m_StateChangeEnd = 0.0f;
+	m_StateChangeDuration = 0.1f;
+
+	m_pConsoleLogger = new CConsoleLogger(this);
+}
+
+CGameConsole::~CGameConsole()
+{
+	if(m_pConsoleLogger)
+		m_pConsoleLogger->OnConsoleDeletion();
+}
+
+CGameConsole::CInstance *CGameConsole::CurrentConsole()
+{
+	if(m_ConsoleType == CONSOLETYPE_REMOTE)
+		return &m_RemoteConsole;
+	return &m_LocalConsole;
+}
+
+void CGameConsole::OnReset()
+{
+	m_RemoteConsole.Reset();
+}
+
+// only defined for 0<=t<=1
+static float ConsoleScaleFunc(float t)
+{
+	return std::sin(std::acos(1.0f - t));
+}
+
+struct CCompletionOptionRenderInfo
+{
+	CGameConsole *m_pSelf;
+	CTextCursor m_Cursor;
+	const char *m_pCurrentCmd;
+	int m_WantedCompletion;
+	float m_Offset;
+	float *m_pOffsetChange;
+	float m_Width;
+	float m_TotalWidth;
+};
+
+void CGameConsole::PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser)
+{
+	CCompletionOptionRenderInfo *pInfo = static_cast<CCompletionOptionRenderInfo *>(pUser);
+
+	if(Index == pInfo->m_WantedCompletion)
+	{
+		float TextWidth = pInfo->m_pSelf->TextRender()->TextWidth(pInfo->m_Cursor.m_FontSize, pStr, -1, -1.0f);
+		const CUIRect Rect = {pInfo->m_Cursor.m_X - 2.5f, pInfo->m_Cursor.m_Y - 4.f / 2.f, TextWidth + 5.f, pInfo->m_Cursor.m_FontSize + 4.f};
+		Rect.Draw(ColorRGBA(229.0f / 255.0f, 185.0f / 255.0f, 4.0f / 255.0f, 0.85f), IGraphics::CORNER_ALL, pInfo->m_Cursor.m_FontSize / 3.f);
+
+		// scroll when out of sight
+		const bool MoveLeft = Rect.x - *pInfo->m_pOffsetChange < 0.0f;
+		const bool MoveRight = Rect.x + Rect.w - *pInfo->m_pOffsetChange > pInfo->m_Width;
+		if(MoveLeft && !MoveRight)
+			*pInfo->m_pOffsetChange -= -Rect.x + pInfo->m_Width / 4.0f;
+		else if(!MoveLeft && MoveRight)
+			*pInfo->m_pOffsetChange += Rect.x + Rect.w - pInfo->m_Width + pInfo->m_Width / 4.0f;
+
+		pInfo->m_pSelf->TextRender()->TextColor(0.05f, 0.05f, 0.05f, 1);
+		pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pStr, -1);
+	}
+	else
+	{
+		const char *pMatchStart = str_find_nocase(pStr, pInfo->m_pCurrentCmd);
+
+		if(pMatchStart)
+		{
+			pInfo->m_pSelf->TextRender()->TextColor(0.5f, 0.5f, 0.5f, 1);
+			pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pStr, pMatchStart - pStr);
+			pInfo->m_pSelf->TextRender()->TextColor(229.0f / 255.0f, 185.0f / 255.0f, 4.0f / 255.0f, 1);
+			pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pMatchStart, str_length(pInfo->m_pCurrentCmd));
+			pInfo->m_pSelf->TextRender()->TextColor(0.5f, 0.5f, 0.5f, 1);
+			pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pMatchStart + str_length(pInfo->m_pCurrentCmd), -1);
+		}
+		else
+		{
+			pInfo->m_pSelf->TextRender()->TextColor(0.75f, 0.75f, 0.75f, 1);
+			pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pStr, -1);
+		}
+	}
+
+	pInfo->m_Cursor.m_X += 7.0f;
+	pInfo->m_TotalWidth = pInfo->m_Cursor.m_X + pInfo->m_Offset;
+}
+
+void CGameConsole::Prompt(char (&aPrompt)[32])
+{
+	CInstance *pConsole = CurrentConsole();
+	if(pConsole->m_Searching)
+	{
+		str_format(aPrompt, sizeof(aPrompt), "%s: ", Localize("Searching"));
+	}
+	else if(m_ConsoleType == CONSOLETYPE_REMOTE)
+	{
+		if(Client()->State() == IClient::STATE_LOADING || Client()->State() == IClient::STATE_ONLINE)
+		{
+			if(Client()->RconAuthed())
+				str_copy(aPrompt, "rcon> ");
+			else if(pConsole->m_UsernameReq && !pConsole->m_UserGot)
+				str_format(aPrompt, sizeof(aPrompt), "%s> ", Localize("Enter Username"));
+			else
+				str_format(aPrompt, sizeof(aPrompt), "%s> ", Localize("Enter Password"));
+		}
+		else
+			str_format(aPrompt, sizeof(aPrompt), "%s> ", Localize("NOT CONNECTED"));
+	}
+	else
+	{
+		str_copy(aPrompt, "> ");
+	}
+}
+
+void CGameConsole::OnRender()
+{
+	CUIRect Screen = *UI()->Screen();
+	CInstance *pConsole = CurrentConsole();
+
+	float MaxConsoleHeight = Screen.h * 3 / 5.0f;
+	float ConsoleHeight;
+
+	float Progress = (Client()->GlobalTime() - (m_StateChangeEnd - m_StateChangeDuration)) / m_StateChangeDuration / 2;
+
+	if(Progress >= 1.0f)
+	{
+		if(m_ConsoleState == CONSOLE_CLOSING)
+		{
+			m_ConsoleState = CONSOLE_CLOSED;
+			pConsole->m_Input.Deactivate();
+			pConsole->m_BacklogLastActiveLine = -1;
+		}
+		else if(m_ConsoleState == CONSOLE_OPENING)
+		{
+			m_ConsoleState = CONSOLE_OPEN;
+			pConsole->m_Input.Activate(EInputPriority::CONSOLE);
+		}
+
+		Progress = 1.0f;
+	}
+
+	if(m_ConsoleState == CONSOLE_OPEN && g_Config.m_ClEditor)
+		Toggle(CONSOLETYPE_LOCAL);
+
+	if(m_ConsoleState == CONSOLE_CLOSED)
+		return;
+
+	if(m_ConsoleState == CONSOLE_OPEN)
+		Input()->MouseModeAbsolute();
+
+	float ConsoleHeightScale;
+
+	if(m_ConsoleState == CONSOLE_OPENING)
+		ConsoleHeightScale = ConsoleScaleFunc(Progress);
+	else if(m_ConsoleState == CONSOLE_CLOSING)
+		ConsoleHeightScale = ConsoleScaleFunc(1.0f - Progress);
+	else // if (console_state == CONSOLE_OPEN)
+		ConsoleHeightScale = ConsoleScaleFunc(1.0f);
+
+	ConsoleHeight = ConsoleHeightScale * MaxConsoleHeight;
+
+	UI()->MapScreen();
+
+	// do console shadow
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	IGraphics::CColorVertex Array[4] = {
+		IGraphics::CColorVertex(0, 0, 0, 0, 0.5f),
+		IGraphics::CColorVertex(1, 0, 0, 0, 0.5f),
+		IGraphics::CColorVertex(2, 0, 0, 0, 0.0f),
+		IGraphics::CColorVertex(3, 0, 0, 0, 0.0f)};
+	Graphics()->SetColorVertex(Array, 4);
+	IGraphics::CQuadItem QuadItem(0, ConsoleHeight, Screen.w, 10.0f);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// do background
+	ColorRGBA ScLocalConsoleColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScLocalConsoleColor));
+	ScLocalConsoleColor.a = g_Config.m_ClLocalConsolaAlpha / 100.0f;
+	ColorRGBA ScRemoteConsoleColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScRemoteConsoleColor));
+	ScRemoteConsoleColor.a = g_Config.m_ClRemoteConsolaAlpha / 100.0f;
+
+	ColorRGBA ScConsoleBarColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScConsoleBarColor));
+
+	if(g_Config.m_ClConsoleSimple == 1)
+	{
+		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_SIMPLE].m_Id);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(ScLocalConsoleColor);
+		if(m_ConsoleType == CONSOLETYPE_REMOTE)
+			Graphics()->SetColor(ScRemoteConsoleColor);
+		Graphics()->QuadsSetSubset(0, -ConsoleHeight * 0.075f, Screen.w * 0.075f * 0.5f, 0);
+		QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight);
+		Graphics()->QuadsDrawTL(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	else
+	{
+		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BG].m_Id);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(ScLocalConsoleColor);
+		if(m_ConsoleType == CONSOLETYPE_REMOTE)
+			Graphics()->SetColor(ScRemoteConsoleColor);
+		Graphics()->QuadsSetSubset(0, -ConsoleHeight * 0.075f, Screen.w * 0.075f * 0.5f, 0);
+		QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight);
+		Graphics()->QuadsDrawTL(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	// do small bar shadow
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	Array[0] = IGraphics::CColorVertex(0, 0, 0, 0, 0.0f);
+	Array[1] = IGraphics::CColorVertex(1, 0, 0, 0, 0.0f);
+	Array[2] = IGraphics::CColorVertex(2, 0, 0, 0, 0.25f);
+	Array[3] = IGraphics::CColorVertex(3, 0, 0, 0, 0.25f);
+	Graphics()->SetColorVertex(Array, 4);
+	QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 20, Screen.w, 10);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// do the lower bar
+	if(g_Config.m_ClConsoleBarSimple == 1)
+	{
+		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BAR_SIMPLE].m_Id);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(ScConsoleBarColor);
+		Graphics()->QuadsSetSubset(0, 0.1f, Screen.w * 0.015f, 1 - 0.1f);
+		QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 10.0f, Screen.w, 10.0f);
+		Graphics()->QuadsDrawTL(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	else
+	{
+		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CONSOLE_BAR].m_Id);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.9f);
+		Graphics()->QuadsSetSubset(0, 0.1f, Screen.w * 0.015f, 1 - 0.1f);
+		QuadItem = IGraphics::CQuadItem(0, ConsoleHeight - 10.0f, Screen.w, 10.0f);
+		Graphics()->QuadsDrawTL(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	ConsoleHeight -= 22.0f;
+
+	{
+		// Get height of 1 line
+		float LineHeight = TextRender()->TextBoundingBox(FONT_SIZE, " ", -1, -1, LINE_SPACING).m_H + LINE_SPACING;
+
+		float RowHeight = FONT_SIZE * 1.25f;
+		float x = 3;
+		float y = ConsoleHeight - RowHeight - 5.0f;
+
+		const float InitialX = x;
+		const float InitialY = y;
+
+		// render prompt
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, x, y, FONT_SIZE, TEXTFLAG_RENDER);
+
+		char aPrompt[32];
+		Prompt(aPrompt);
+		TextRender()->TextEx(&Cursor, aPrompt);
+
+		// check if mouse is pressed
+		if(!pConsole->m_MouseIsPress && Input()->NativeMousePressed(1))
+		{
+			pConsole->m_MouseIsPress = true;
+			ivec2 MousePress;
+			Input()->NativeMousePos(&MousePress.x, &MousePress.y);
+			pConsole->m_MousePress.x = (MousePress.x / (float)Graphics()->WindowWidth()) * Screen.w;
+			pConsole->m_MousePress.y = (MousePress.y / (float)Graphics()->WindowHeight()) * Screen.h;
+		}
+		if(pConsole->m_MouseIsPress)
+		{
+			ivec2 MouseRelease;
+			Input()->NativeMousePos(&MouseRelease.x, &MouseRelease.y);
+			pConsole->m_MouseRelease.x = (MouseRelease.x / (float)Graphics()->WindowWidth()) * Screen.w;
+			pConsole->m_MouseRelease.y = (MouseRelease.y / (float)Graphics()->WindowHeight()) * Screen.h;
+		}
+		if(pConsole->m_MouseIsPress && !Input()->NativeMousePressed(1))
+		{
+			pConsole->m_MouseIsPress = false;
+		}
+
+		x = Cursor.m_X;
+
+		if(m_ConsoleState == CONSOLE_OPEN)
+		{
+			if(pConsole->m_MousePress.y >= pConsole->m_BoundingBox.m_Y && pConsole->m_MousePress.y < pConsole->m_BoundingBox.m_Y + pConsole->m_BoundingBox.m_H)
+			{
+				CLineInput::SMouseSelection *pMouseSelection = pConsole->m_Input.GetMouseSelection();
+				pMouseSelection->m_Selecting = pConsole->m_MouseIsPress;
+				pMouseSelection->m_PressMouse = pConsole->m_MousePress;
+				pMouseSelection->m_ReleaseMouse = pConsole->m_MouseRelease;
+			}
+			else if(pConsole->m_MouseIsPress)
+			{
+				pConsole->m_Input.SelectNothing();
+			}
+		}
+
+		// render console input (wrap line)
+		pConsole->m_Input.SetHidden(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed() && (pConsole->m_UserGot || !pConsole->m_UsernameReq));
+		pConsole->m_Input.Activate(EInputPriority::CONSOLE); // Ensure that the input is active
+		const CUIRect InputCursorRect = {x, y + FONT_SIZE, 0.0f, 0.0f};
+		const bool WasChanged = pConsole->m_Input.WasChanged();
+		const bool WasCursorChanged = pConsole->m_Input.WasCursorChanged();
+		const bool Changed = WasChanged || WasCursorChanged;
+		pConsole->m_BoundingBox = pConsole->m_Input.Render(&InputCursorRect, FONT_SIZE, TEXTALIGN_BL, Changed, Screen.w - 10.0f - x, LINE_SPACING);
+		if(pConsole->m_LastInputHeight == 0.0f && pConsole->m_BoundingBox.m_H != 0.0f)
+			pConsole->m_LastInputHeight = pConsole->m_BoundingBox.m_H;
+		if(pConsole->m_Input.HasSelection())
+			pConsole->m_HasSelection = false; // Clear console selection if we have a line input selection
+
+		y -= pConsole->m_BoundingBox.m_H - FONT_SIZE;
+		TextRender()->SetCursor(&Cursor, x, y, FONT_SIZE, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = Screen.w - 10.0f - x;
+		Cursor.m_LineSpacing = LINE_SPACING;
+
+		if(pConsole->m_LastInputHeight != pConsole->m_BoundingBox.m_H)
+		{
+			pConsole->m_HasSelection = false;
+			pConsole->m_MouseIsPress = false;
+			pConsole->m_LastInputHeight = pConsole->m_BoundingBox.m_H;
+		}
+
+		// render possible commands
+		if(!pConsole->m_Searching && (m_ConsoleType == CONSOLETYPE_LOCAL || Client()->RconAuthed()) && !pConsole->m_Input.IsEmpty())
+		{
+			CCompletionOptionRenderInfo Info;
+			Info.m_pSelf = this;
+			Info.m_WantedCompletion = pConsole->m_CompletionChosen;
+			Info.m_Offset = pConsole->m_CompletionRenderOffset;
+			Info.m_pOffsetChange = &pConsole->m_CompletionRenderOffsetChange;
+			Info.m_Width = Screen.w;
+			Info.m_TotalWidth = 0.0f;
+			Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer;
+			TextRender()->SetCursor(&Info.m_Cursor, InitialX - Info.m_Offset, InitialY + RowHeight + 2.0f, FONT_SIZE, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+			Info.m_Cursor.m_LineWidth = std::numeric_limits<float>::max();
+			const int NumCommands = m_pConsole->PossibleCommands(Info.m_pCurrentCmd, pConsole->m_CompletionFlagmask, m_ConsoleType != CGameConsole::CONSOLETYPE_LOCAL && Client()->RconAuthed() && Client()->UseTempRconCommands(), PossibleCommandsRenderCallback, &Info);
+			pConsole->m_CompletionRenderOffset = Info.m_Offset;
+
+			if(NumCommands <= 0 && pConsole->m_IsCommand)
+			{
+				const bool TuningCompletion = IsTuningCommandPrefix(Info.m_pCurrentCmd);
+				const bool SettingCompletion = IsSettingCommandPrefix(Info.m_pCurrentCmd);
+				int NumArguments = 0;
+				if(TuningCompletion || SettingCompletion)
+				{
+					Info.m_WantedCompletion = pConsole->m_CompletionChosenArgument;
+					Info.m_TotalWidth = 0.0f;
+					Info.m_pCurrentCmd = pConsole->m_aCompletionBufferArgument;
+					if(TuningCompletion)
+						NumArguments = PossibleTunings(Info.m_pCurrentCmd, PossibleCommandsRenderCallback, &Info);
+					else if(SettingCompletion)
+						NumArguments = m_pConsole->PossibleCommands(Info.m_pCurrentCmd, pConsole->m_CompletionFlagmask, m_ConsoleType != CGameConsole::CONSOLETYPE_LOCAL && Client()->RconAuthed() && Client()->UseTempRconCommands(), PossibleCommandsRenderCallback, &Info);
+					pConsole->m_CompletionRenderOffset = Info.m_Offset;
+				}
+
+				if(NumArguments <= 0 && pConsole->m_IsCommand)
+				{
+					char aBuf[1024];
+					str_format(aBuf, sizeof(aBuf), "Help: %s ", pConsole->m_pCommandHelp);
+					TextRender()->TextEx(&Info.m_Cursor, aBuf, -1);
+					TextRender()->TextColor(0.75f, 0.75f, 0.75f, 1);
+					str_format(aBuf, sizeof(aBuf), "Usage: %s %s", pConsole->m_pCommandName, pConsole->m_pCommandParams);
+					TextRender()->TextEx(&Info.m_Cursor, aBuf, -1);
+				}
+			}
+
+			UI()->DoSmoothScrollLogic(&pConsole->m_CompletionRenderOffset, &pConsole->m_CompletionRenderOffsetChange, Info.m_Width, Info.m_TotalWidth);
+		}
+		else if(pConsole->m_Searching && !pConsole->m_Input.IsEmpty())
+		{ // Render current match and match count
+			CTextCursor MatchInfoCursor;
+			TextRender()->SetCursor(&MatchInfoCursor, InitialX, InitialY + RowHeight + 2.0f, FONT_SIZE, TEXTFLAG_RENDER);
+			TextRender()->TextColor(0.8f, 0.8f, 0.8f, 1.0f);
+			if(!pConsole->m_vSearchMatches.empty())
+			{
+				char aBuf[64];
+				str_format(aBuf, sizeof(aBuf), Localize("Match %d of %d"), pConsole->m_CurrentMatchIndex + 1, (int)pConsole->m_vSearchMatches.size());
+				TextRender()->TextEx(&MatchInfoCursor, aBuf, -1);
+			}
+			else
+			{
+				TextRender()->TextEx(&MatchInfoCursor, Localize("No results"), -1);
+			}
+		}
+
+		pConsole->PumpBacklogPending();
+		if(pConsole->m_NewLineCounter > 0)
+			pConsole->UpdateSearch();
+
+		// render console log (current entry, status, wrap lines)
+		CInstance::CBacklogEntry *pEntry = pConsole->m_Backlog.Last();
+		float OffsetY = 0.0f;
+
+		std::string SelectionString;
+
+		if(pConsole->m_BacklogLastActiveLine < 0)
+			pConsole->m_BacklogLastActiveLine = pConsole->m_BacklogCurLine;
+
+		int LineNum = -1;
+		pConsole->m_LinesRendered = 0;
+
+		int SkippedLines = 0;
+		bool First = true;
+
+		const float XScale = Graphics()->ScreenWidth() / Screen.w;
+		const float YScale = Graphics()->ScreenHeight() / Screen.h;
+		float CalcOffsetY = 0;
+		while(y - (CalcOffsetY + LineHeight) > RowHeight)
+			CalcOffsetY += LineHeight;
+		float ClipStartY = y - CalcOffsetY;
+		Graphics()->ClipEnable(0, ClipStartY * YScale, Screen.w * XScale, y * YScale - ClipStartY * YScale);
+
+		while(pEntry)
+		{
+			if(pEntry->m_LineCount == -1)
+				pConsole->UpdateEntryTextAttributes(pEntry);
+
+			LineNum += pEntry->m_LineCount;
+			while(pConsole->m_NewLineCounter > 0)
+			{
+				--pConsole->m_NewLineCounter;
+
+				// keep scroll position when new entries are printed.
+				if(pConsole->m_BacklogCurLine != 0)
+				{
+					pConsole->m_BacklogCurLine++;
+					pConsole->m_BacklogLastActiveLine++;
+				}
+			}
+			if(LineNum < pConsole->m_BacklogLastActiveLine)
+			{
+				SkippedLines += pEntry->m_LineCount;
+				pEntry = pConsole->m_Backlog.Prev(pEntry);
+				continue;
+			}
+			TextRender()->TextColor(pEntry->m_PrintColor);
+
+			if(First)
+			{
+				int Diff = pConsole->m_BacklogLastActiveLine - SkippedLines;
+				OffsetY -= Diff * LineHeight - LINE_SPACING;
+			}
+
+			float LocalOffsetY = OffsetY + pEntry->m_YOffset / (float)pEntry->m_LineCount;
+			OffsetY += pEntry->m_YOffset;
+
+			if((pConsole->m_HasSelection || pConsole->m_MouseIsPress) && pConsole->m_NewLineCounter > 0)
+			{
+				float MouseExtraOff = pEntry->m_YOffset;
+				pConsole->m_MousePress.y -= MouseExtraOff;
+				if(!pConsole->m_MouseIsPress)
+					pConsole->m_MouseRelease.y -= MouseExtraOff;
+			}
+
+			// stop rendering when lines reach the top
+			bool Outside = y - OffsetY <= RowHeight;
+			int CanRenderOneLine = y - LocalOffsetY > RowHeight;
+			if(Outside && !CanRenderOneLine)
+				break;
+
+			int LinesNotRendered = pEntry->m_LineCount - minimum((int)std::floor((y - LocalOffsetY) / RowHeight), pEntry->m_LineCount);
+			pConsole->m_LinesRendered -= LinesNotRendered;
+
+			TextRender()->SetCursor(&Cursor, 0.0f, y - OffsetY, FONT_SIZE, TEXTFLAG_RENDER);
+			Cursor.m_LineWidth = Screen.w - 10.0f;
+			Cursor.m_MaxLines = pEntry->m_LineCount;
+			Cursor.m_LineSpacing = LINE_SPACING;
+			Cursor.m_CalculateSelectionMode = (m_ConsoleState == CONSOLE_OPEN && pConsole->m_MousePress.y < pConsole->m_BoundingBox.m_Y && (pConsole->m_MouseIsPress || (pConsole->m_CurSelStart != pConsole->m_CurSelEnd) || pConsole->m_HasSelection)) ? TEXT_CURSOR_SELECTION_MODE_CALCULATE : TEXT_CURSOR_SELECTION_MODE_NONE;
+			Cursor.m_PressMouse = pConsole->m_MousePress;
+			Cursor.m_ReleaseMouse = pConsole->m_MouseRelease;
+
+			if(pConsole->m_Searching && pConsole->m_CurrentMatchIndex != -1)
+			{
+				std::vector<CInstance::SSearchMatch> vMatches;
+				std::copy_if(pConsole->m_vSearchMatches.begin(), pConsole->m_vSearchMatches.end(), std::back_inserter(vMatches), [&](const CInstance::SSearchMatch &Match) { return Match.m_EntryLine == LineNum + 1 - pEntry->m_LineCount; });
+
+				auto CurrentSelectedOccurrence = pConsole->m_vSearchMatches[pConsole->m_CurrentMatchIndex];
+
+				std::vector<STextColorSplit> vColorSplits;
+				for(const auto &Match : vMatches)
+				{
+					bool IsSelected = CurrentSelectedOccurrence.m_EntryLine == Match.m_EntryLine && CurrentSelectedOccurrence.m_Pos == Match.m_Pos;
+					Cursor.m_vColorSplits.emplace_back(
+						Match.m_Pos,
+						pConsole->m_Input.GetLength(),
+						IsSelected ? ms_SearchSelectedColor : ms_SearchHighlightColor);
+				}
+			}
+
+			TextRender()->TextEx(&Cursor, pEntry->m_aText, -1);
+			Cursor.m_vColorSplits = {};
+
+			if(Cursor.m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE)
+			{
+				pConsole->m_CurSelStart = minimum(Cursor.m_SelectionStart, Cursor.m_SelectionEnd);
+				pConsole->m_CurSelEnd = maximum(Cursor.m_SelectionStart, Cursor.m_SelectionEnd);
+			}
+			pConsole->m_LinesRendered += First ? pEntry->m_LineCount - (pConsole->m_BacklogLastActiveLine - SkippedLines) : pEntry->m_LineCount;
+
+			if(pConsole->m_CurSelStart != pConsole->m_CurSelEnd)
+			{
+				if(m_WantsSelectionCopy)
+				{
+					const bool HasNewLine = !SelectionString.empty();
+					const size_t OffUTF8Start = str_utf8_offset_chars_to_bytes(pEntry->m_aText, pConsole->m_CurSelStart);
+					const size_t OffUTF8End = str_utf8_offset_chars_to_bytes(pEntry->m_aText, pConsole->m_CurSelEnd);
+					SelectionString.insert(0, (std::string(&pEntry->m_aText[OffUTF8Start], OffUTF8End - OffUTF8Start) + (HasNewLine ? "\n" : "")));
+				}
+				pConsole->m_HasSelection = true;
+			}
+
+			pEntry = pConsole->m_Backlog.Prev(pEntry);
+
+			// reset color
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+			First = false;
+
+			if(!pEntry)
+				break;
+		}
+
+		Graphics()->ClipDisable();
+
+		pConsole->m_BacklogLastActiveLine = pConsole->m_BacklogCurLine;
+
+		if(m_WantsSelectionCopy && !SelectionString.empty())
+		{
+			pConsole->m_HasSelection = false;
+			pConsole->m_CurSelStart = -1;
+			pConsole->m_CurSelEnd = -1;
+			Input()->SetClipboardText(SelectionString.c_str());
+			m_WantsSelectionCopy = false;
+		}
+
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+		// render current lines and status (locked, following)
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), Localize("Lines %d - %d (%s)"), pConsole->m_BacklogCurLine + 1, pConsole->m_BacklogCurLine + pConsole->m_LinesRendered, pConsole->m_BacklogCurLine != 0 ? Localize("Locked") : Localize("Following"));
+		TextRender()->Text(10.0f, FONT_SIZE / 2.f, FONT_SIZE, aBuf);
+
+		// render version
+		str_copy(aBuf, "v" GAME_VERSION " on " CONF_PLATFORM_STRING " " CONF_ARCH_STRING);
+		float Width = TextRender()->TextWidth(FONT_SIZE, aBuf, -1, -1.0f);
+		TextRender()->Text(Screen.w - Width - 10.0f, FONT_SIZE / 2.f, FONT_SIZE, aBuf);
+	}
+}
+
+void CGameConsole::OnMessage(int MsgType, void *pRawMsg)
+{
+}
+
+bool CGameConsole::OnInput(const IInput::CEvent &Event)
+{
+	// accept input when opening, but not at first frame to discard the input that caused the console to open
+	if(m_ConsoleState != CONSOLE_OPEN && (m_ConsoleState != CONSOLE_OPENING || m_StateChangeEnd == Client()->GlobalTime() + m_StateChangeDuration))
+		return false;
+	if((Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) || (Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24))
+		return false;
+
+	if(Event.m_Key == KEY_ESCAPE && (Event.m_Flags & IInput::FLAG_PRESS))
+		Toggle(m_ConsoleType);
+	else if(!CurrentConsole()->OnInput(Event))
+	{
+		if(m_pClient->Input()->ModifierIsPressed() && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_C)
+			m_WantsSelectionCopy = true;
+	}
+
+	return true;
+}
+
+void CGameConsole::Toggle(int Type)
+{
+	if(m_ConsoleType != Type && (m_ConsoleState == CONSOLE_OPEN || m_ConsoleState == CONSOLE_OPENING))
+	{
+		// don't toggle console, just switch what console to use
+	}
+	else
+	{
+		if(m_ConsoleState == CONSOLE_CLOSED || m_ConsoleState == CONSOLE_OPEN)
+		{
+			m_StateChangeEnd = Client()->GlobalTime() + m_StateChangeDuration;
+		}
+		else
+		{
+			float Progress = m_StateChangeEnd - Client()->GlobalTime();
+			float ReversedProgress = m_StateChangeDuration - Progress;
+
+			m_StateChangeEnd = Client()->GlobalTime() + ReversedProgress;
+		}
+
+		if(m_ConsoleState == CONSOLE_CLOSED || m_ConsoleState == CONSOLE_CLOSING)
+		{
+			UI()->SetEnabled(false);
+			m_ConsoleState = CONSOLE_OPENING;
+		}
+		else
+		{
+			Input()->MouseModeRelative();
+			UI()->SetEnabled(true);
+			m_pClient->OnRelease();
+			m_ConsoleState = CONSOLE_CLOSING;
+		}
+	}
+	m_ConsoleType = Type;
+}
+
+void CGameConsole::Dump(int Type)
+{
+	CInstance *pConsole = Type == CONSOLETYPE_REMOTE ? &m_RemoteConsole : &m_LocalConsole;
+	char aBuf[IO_MAX_PATH_LENGTH + 64];
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_timestamp(aBuf, sizeof(aBuf));
+	str_format(aFilename, sizeof(aFilename), "dumps/%s_dump_%s.txt", pConsole->m_pName, aBuf);
+	IOHANDLE File = Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+	if(File)
+	{
+		pConsole->PumpBacklogPending();
+		for(CInstance::CBacklogEntry *pEntry = pConsole->m_Backlog.First(); pEntry; pEntry = pConsole->m_Backlog.Next(pEntry))
+		{
+			io_write(File, pEntry->m_aText, pEntry->m_Length);
+			io_write_newline(File);
+		}
+		io_close(File);
+		str_format(aBuf, sizeof(aBuf), "%s contents were written to '%s'", pConsole->m_pName, aFilename);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf), "Failed to open '%s'", aFilename);
+	}
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "console", aBuf);
+}
+
+void CGameConsole::ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->Toggle(CONSOLETYPE_LOCAL);
+}
+
+void CGameConsole::ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->Toggle(CONSOLETYPE_REMOTE);
+}
+
+void CGameConsole::ConClearLocalConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->m_LocalConsole.ClearBacklog();
+}
+
+void CGameConsole::ConClearRemoteConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->m_RemoteConsole.ClearBacklog();
+}
+
+void CGameConsole::ConDumpLocalConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->Dump(CONSOLETYPE_LOCAL);
+}
+
+void CGameConsole::ConDumpRemoteConsole(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameConsole *)pUserData)->Dump(CONSOLETYPE_REMOTE);
+}
+
+void CGameConsole::ConConsolePageUp(IConsole::IResult *pResult, void *pUserData)
+{
+	CInstance *pConsole = ((CGameConsole *)pUserData)->CurrentConsole();
+	pConsole->m_BacklogCurLine += pConsole->GetLinesToScroll(-1, pConsole->m_LinesRendered);
+	pConsole->m_HasSelection = false;
+}
+
+void CGameConsole::ConConsolePageDown(IConsole::IResult *pResult, void *pUserData)
+{
+	CInstance *pConsole = ((CGameConsole *)pUserData)->CurrentConsole();
+	pConsole->m_BacklogCurLine -= pConsole->GetLinesToScroll(1, pConsole->m_LinesRendered);
+	pConsole->m_HasSelection = false;
+	if(pConsole->m_BacklogCurLine < 0)
+		pConsole->m_BacklogCurLine = 0;
+}
+
+void CGameConsole::ConchainConsoleOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CGameConsole *pSelf = (CGameConsole *)pUserData;
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		pSelf->m_pConsoleLogger->SetFilter(CLogFilter{IConsole::ToLogLevelFilter(g_Config.m_ConsoleOutputLevel)});
+	}
+}
+
+void CGameConsole::RequireUsername(bool UsernameReq)
+{
+	if((m_RemoteConsole.m_UsernameReq = UsernameReq))
+	{
+		m_RemoteConsole.m_aUser[0] = '\0';
+		m_RemoteConsole.m_UserGot = false;
+	}
+}
+
+void CGameConsole::PrintLine(int Type, const char *pLine)
+{
+	if(Type == CONSOLETYPE_LOCAL)
+		m_LocalConsole.PrintLine(pLine, str_length(pLine), TextRender()->DefaultTextColor());
+	else if(Type == CONSOLETYPE_REMOTE)
+		m_RemoteConsole.PrintLine(pLine, str_length(pLine), TextRender()->DefaultTextColor());
+}
+
+void CGameConsole::OnConsoleInit()
+{
+	// init console instances
+	m_LocalConsole.Init(this);
+	m_RemoteConsole.Init(this);
+
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+
+	Console()->Register("toggle_local_console", "", CFGFLAG_CLIENT, ConToggleLocalConsole, this, "Toggle local console");
+	Console()->Register("toggle_remote_console", "", CFGFLAG_CLIENT, ConToggleRemoteConsole, this, "Toggle remote console");
+	Console()->Register("clear_local_console", "", CFGFLAG_CLIENT, ConClearLocalConsole, this, "Clear local console");
+	Console()->Register("clear_remote_console", "", CFGFLAG_CLIENT, ConClearRemoteConsole, this, "Clear remote console");
+	Console()->Register("dump_local_console", "", CFGFLAG_CLIENT, ConDumpLocalConsole, this, "Write local console contents to a text file");
+	Console()->Register("dump_remote_console", "", CFGFLAG_CLIENT, ConDumpRemoteConsole, this, "Write remote console contents to a text file");
+
+	Console()->Register("console_page_up", "", CFGFLAG_CLIENT, ConConsolePageUp, this, "Previous page in console");
+	Console()->Register("console_page_down", "", CFGFLAG_CLIENT, ConConsolePageDown, this, "Next page in console");
+	Console()->Chain("console_output_level", ConchainConsoleOutputLevel, this);
+}
+
+void CGameConsole::OnInit()
+{
+	Engine()->SetAdditionalLogger(std::unique_ptr<ILogger>(m_pConsoleLogger));
+	// add resize event
+	Graphics()->AddWindowResizeListener([this]() {
+		m_LocalConsole.UpdateBacklogTextAttributes();
+		m_LocalConsole.m_HasSelection = false;
+		m_RemoteConsole.UpdateBacklogTextAttributes();
+		m_RemoteConsole.m_HasSelection = false;
+	});
+}
+
+void CGameConsole::OnStateChange(int NewState, int OldState)
+{
+	if(OldState == IClient::STATE_ONLINE && NewState < IClient::STATE_LOADING)
+	{
+		m_RemoteConsole.m_UserGot = false;
+		m_RemoteConsole.m_aUser[0] = '\0';
+		m_RemoteConsole.m_Input.Clear();
+		m_RemoteConsole.m_UsernameReq = false;
+	}
+}
diff --git a/src_bkp/game/client/components/console.h b/src_bkp/game/client/components/console.h
new file mode 100644
index 0000000000..66e3c90e0b
--- /dev/null
+++ b/src_bkp/game/client/components/console.h
@@ -0,0 +1,182 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_CONSOLE_H
+#define GAME_CLIENT_COMPONENTS_CONSOLE_H
+
+#include <base/lock.h>
+
+#include <engine/console.h>
+#include <engine/shared/ringbuffer.h>
+
+#include <game/client/component.h>
+#include <game/client/lineinput.h>
+
+enum
+{
+	CONSOLE_CLOSED,
+	CONSOLE_OPENING,
+	CONSOLE_OPEN,
+	CONSOLE_CLOSING,
+};
+
+class CConsoleLogger;
+
+class CGameConsole : public CComponent
+{
+	friend class CConsoleLogger;
+	class CInstance
+	{
+	public:
+		struct CBacklogEntry
+		{
+			float m_YOffset;
+			int m_LineCount;
+			ColorRGBA m_PrintColor;
+			size_t m_Length;
+			char m_aText[1];
+		};
+		CStaticRingBuffer<CBacklogEntry, 1024 * 1024, CRingBufferBase::FLAG_RECYCLE> m_Backlog;
+		CLock m_BacklogPendingLock;
+		CStaticRingBuffer<CBacklogEntry, 1024 * 1024, CRingBufferBase::FLAG_RECYCLE> m_BacklogPending GUARDED_BY(m_BacklogPendingLock);
+		CStaticRingBuffer<char, 64 * 1024, CRingBufferBase::FLAG_RECYCLE> m_History;
+		char *m_pHistoryEntry;
+
+		CLineInputBuffered<IConsole::CMDLINE_LENGTH> m_Input;
+		const char *m_pName;
+		int m_Type;
+		int m_BacklogCurLine;
+		int m_BacklogLastActiveLine = -1;
+		int m_LinesRendered;
+
+		STextBoundingBox m_BoundingBox = {0.0f, 0.0f, 0.0f, 0.0f};
+		float m_LastInputHeight = 0.0f;
+
+		bool m_MouseIsPress = false;
+		vec2 m_MousePress = vec2(0.0f, 0.0f);
+		vec2 m_MouseRelease = vec2(0.0f, 0.0f);
+		int m_CurSelStart = 0;
+		int m_CurSelEnd = 0;
+		bool m_HasSelection = false;
+		int m_NewLineCounter = 0;
+
+		CGameConsole *m_pGameConsole;
+
+		char m_aCompletionBuffer[IConsole::CMDLINE_LENGTH];
+		int m_CompletionChosen;
+		char m_aCompletionBufferArgument[IConsole::CMDLINE_LENGTH];
+		int m_CompletionChosenArgument;
+		int m_CompletionFlagmask;
+		float m_CompletionRenderOffset;
+		float m_CompletionRenderOffsetChange;
+
+		char m_aUser[32];
+		bool m_UserGot;
+		bool m_UsernameReq;
+
+		bool m_IsCommand;
+		const char *m_pCommandName;
+		const char *m_pCommandHelp;
+		const char *m_pCommandParams;
+
+		bool m_Searching = false;
+		struct SSearchMatch
+		{
+			int m_Pos;
+			int m_StartLine;
+			int m_EndLine;
+			int m_EntryLine;
+
+			SSearchMatch(int Pos, int StartLine, int EndLine, int EntryLine) :
+				m_Pos(Pos), m_StartLine(StartLine), m_EndLine(EndLine), m_EntryLine(EntryLine) {}
+		};
+		int m_CurrentMatchIndex;
+		char m_aCurrentSearchString[IConsole::CMDLINE_LENGTH];
+		std::vector<SSearchMatch> m_vSearchMatches;
+
+		CInstance(int t);
+		void Init(CGameConsole *pGameConsole);
+
+		void ClearBacklog() REQUIRES(!m_BacklogPendingLock);
+		void UpdateBacklogTextAttributes();
+		void PumpBacklogPending() REQUIRES(!m_BacklogPendingLock);
+		void ClearHistory();
+		void Reset();
+
+		void ExecuteLine(const char *pLine);
+
+		bool OnInput(const IInput::CEvent &Event);
+		void PrintLine(const char *pLine, int Len, ColorRGBA PrintColor) REQUIRES(!m_BacklogPendingLock);
+		int GetLinesToScroll(int Direction, int LinesToScroll);
+		void ScrollToCenter(int StartLine, int EndLine);
+		void ClearSearch();
+
+		const char *GetString() const { return m_Input.GetString(); }
+		static void PossibleCommandsCompleteCallback(int Index, const char *pStr, void *pUser);
+		static void PossibleArgumentsCompleteCallback(int Index, const char *pStr, void *pUser);
+
+		void UpdateEntryTextAttributes(CBacklogEntry *pEntry) const;
+
+	private:
+		void UpdateSearch();
+
+		friend class CGameConsole;
+	};
+
+	class IConsole *m_pConsole;
+	CConsoleLogger *m_pConsoleLogger = nullptr;
+
+	CInstance m_LocalConsole;
+	CInstance m_RemoteConsole;
+
+	CInstance *CurrentConsole();
+
+	int m_ConsoleType;
+	int m_ConsoleState;
+	float m_StateChangeEnd;
+	float m_StateChangeDuration;
+
+	bool m_WantsSelectionCopy = false;
+
+	static const ColorRGBA ms_SearchHighlightColor;
+	static const ColorRGBA ms_SearchSelectedColor;
+
+	void Toggle(int Type);
+	void Dump(int Type);
+
+	static void PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser);
+	static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConClearLocalConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConClearRemoteConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConDumpLocalConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConDumpRemoteConsole(IConsole::IResult *pResult, void *pUserData);
+	static void ConConsolePageUp(IConsole::IResult *pResult, void *pUserData);
+	static void ConConsolePageDown(IConsole::IResult *pResult, void *pUserData);
+	static void ConchainConsoleOutputLevel(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+public:
+	enum
+	{
+		CONSOLETYPE_LOCAL = 0,
+		CONSOLETYPE_REMOTE,
+	};
+
+	CGameConsole();
+	~CGameConsole();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void PrintLine(int Type, const char *pLine);
+	void RequireUsername(bool UsernameReq);
+
+	virtual void OnStateChange(int NewState, int OldState) override;
+	virtual void OnConsoleInit() override;
+	virtual void OnInit() override;
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+	void Prompt(char (&aPrompt)[32]);
+
+	bool IsClosed() { return m_ConsoleState == CONSOLE_CLOSED; }
+};
+#endif
diff --git a/src_bkp/game/client/components/controls.cpp b/src_bkp/game/client/components/controls.cpp
new file mode 100644
index 0000000000..f72cce98f7
--- /dev/null
+++ b/src_bkp/game/client/components/controls.cpp
@@ -0,0 +1,466 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+
+#include <engine/shared/config.h>
+
+#include <game/client/components/camera.h>
+#include <game/client/components/chat.h>
+#include <game/client/components/menus.h>
+#include <game/client/components/scoreboard.h>
+#include <game/client/gameclient.h>
+#include <game/collision.h>
+
+#include <base/vmath.h>
+
+#include "controls.h"
+
+CControls::CControls()
+{
+	mem_zero(&m_aLastData, sizeof(m_aLastData));
+	m_LastDummy = 0;
+	m_OtherFire = 0;
+
+	mem_zero(m_aMousePos, sizeof(m_aMousePos));
+	mem_zero(m_aMousePosOnAction, sizeof(m_aMousePosOnAction));
+	mem_zero(m_aTargetPos, sizeof(m_aTargetPos));
+}
+
+void CControls::OnReset()
+{
+	ResetInput(0);
+	ResetInput(1);
+
+	for(int &AmmoCount : m_aAmmoCount)
+		AmmoCount = 0;
+	m_OldMouseX = m_OldMouseY = 0.0f;
+}
+
+void CControls::ResetInput(int Dummy)
+{
+	m_aLastData[Dummy].m_Direction = 0;
+	//m_aLastData[Dummy].m_Hook = 0;
+	// simulate releasing the fire button
+	if((m_aLastData[Dummy].m_Fire & 1) != 0)
+		m_aLastData[Dummy].m_Fire++;
+	m_aLastData[Dummy].m_Fire &= INPUT_STATE_MASK;
+	m_aLastData[Dummy].m_Jump = 0;
+	m_aInputData[Dummy] = m_aLastData[Dummy];
+
+	m_aInputDirectionLeft[Dummy] = 0;
+	m_aInputDirectionRight[Dummy] = 0;
+}
+
+void CControls::OnRelease()
+{
+	//OnReset();
+}
+
+void CControls::OnPlayerDeath()
+{
+	for(int &AmmoCount : m_aAmmoCount)
+		AmmoCount = 0;
+}
+
+struct CInputState
+{
+	CControls *m_pControls;
+	int *m_pVariable1;
+	int *m_pVariable2;
+};
+
+static void ConKeyInputState(IConsole::IResult *pResult, void *pUserData)
+{
+	CInputState *pState = (CInputState *)pUserData;
+
+	if(pState->m_pControls->GameClient()->m_GameInfo.m_BugDDRaceInput && pState->m_pControls->GameClient()->m_Snap.m_SpecInfo.m_Active)
+		return;
+
+	if(g_Config.m_ClDummy)
+		*pState->m_pVariable2 = pResult->GetInteger(0);
+	else
+		*pState->m_pVariable1 = pResult->GetInteger(0);
+}
+
+static void ConKeyInputCounter(IConsole::IResult *pResult, void *pUserData)
+{
+	CInputState *pState = (CInputState *)pUserData;
+
+	if(pState->m_pControls->GameClient()->m_GameInfo.m_BugDDRaceInput && pState->m_pControls->GameClient()->m_Snap.m_SpecInfo.m_Active)
+		return;
+
+	int *v;
+	if(g_Config.m_ClDummy)
+		v = pState->m_pVariable2;
+	else
+		v = pState->m_pVariable1;
+
+	if(((*v) & 1) != pResult->GetInteger(0))
+		(*v)++;
+	*v &= INPUT_STATE_MASK;
+}
+
+struct CInputSet
+{
+	CControls *m_pControls;
+	int *m_pVariable1;
+	int *m_pVariable2;
+	int m_Value;
+};
+
+static void ConKeyInputSet(IConsole::IResult *pResult, void *pUserData)
+{
+	CInputSet *pSet = (CInputSet *)pUserData;
+	if(pResult->GetInteger(0))
+	{
+		if(g_Config.m_ClDummy)
+			*pSet->m_pVariable2 = pSet->m_Value;
+		else
+			*pSet->m_pVariable1 = pSet->m_Value;
+	}
+}
+
+static void ConKeyInputNextPrevWeapon(IConsole::IResult *pResult, void *pUserData)
+{
+	CInputSet *pSet = (CInputSet *)pUserData;
+	ConKeyInputCounter(pResult, pSet);
+	pSet->m_pControls->m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = 0;
+}
+
+void CControls::OnConsoleInit()
+{
+	// game commands
+	{
+		static CInputState s_State = {this, &m_aInputDirectionLeft[0], &m_aInputDirectionLeft[1]};
+		Console()->Register("+left", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Move left");
+	}
+	{
+		static CInputState s_State = {this, &m_aInputDirectionRight[0], &m_aInputDirectionRight[1]};
+		Console()->Register("+right", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Move right");
+	}
+	{
+		static CInputState s_State = {this, &m_aInputData[0].m_Jump, &m_aInputData[1].m_Jump};
+		Console()->Register("+jump", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Jump");
+	}
+	{
+		static CInputState s_State = {this, &m_aInputData[0].m_Hook, &m_aInputData[1].m_Hook};
+		Console()->Register("+hook", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Hook");
+	}
+	{
+		static CInputState s_State = {this, &m_aInputData[0].m_Fire, &m_aInputData[1].m_Fire};
+		Console()->Register("+fire", "", CFGFLAG_CLIENT, ConKeyInputCounter, (void *)&s_State, "Fire");
+	}
+	{
+		static CInputState s_State = {this, &m_aShowHookColl[0], &m_aShowHookColl[1]};
+		Console()->Register("+showhookcoll", "", CFGFLAG_CLIENT, ConKeyInputState, (void *)&s_State, "Show Hook Collision");
+	}
+
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 1};
+		Console()->Register("+weapon1", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to hammer");
+	}
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 2};
+		Console()->Register("+weapon2", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to gun");
+	}
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 3};
+		Console()->Register("+weapon3", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to shotgun");
+	}
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 4};
+		Console()->Register("+weapon4", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to grenade");
+	}
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_WantedWeapon, &m_aInputData[1].m_WantedWeapon, 5};
+		Console()->Register("+weapon5", "", CFGFLAG_CLIENT, ConKeyInputSet, (void *)&s_Set, "Switch to laser");
+	}
+
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_NextWeapon, &m_aInputData[1].m_NextWeapon, 0};
+		Console()->Register("+nextweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, (void *)&s_Set, "Switch to next weapon");
+	}
+	{
+		static CInputSet s_Set = {this, &m_aInputData[0].m_PrevWeapon, &m_aInputData[1].m_PrevWeapon, 0};
+		Console()->Register("+prevweapon", "", CFGFLAG_CLIENT, ConKeyInputNextPrevWeapon, (void *)&s_Set, "Switch to previous weapon");
+	}
+}
+
+void CControls::OnMessage(int Msg, void *pRawMsg)
+{
+	if(Msg == NETMSGTYPE_SV_WEAPONPICKUP)
+	{
+		CNetMsg_Sv_WeaponPickup *pMsg = (CNetMsg_Sv_WeaponPickup *)pRawMsg;
+		if(g_Config.m_ClAutoswitchWeapons)
+			m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = pMsg->m_Weapon + 1;
+		// We don't really know ammo count, until we'll switch to that weapon, but any non-zero count will suffice here
+		m_aAmmoCount[pMsg->m_Weapon % NUM_WEAPONS] = 10;
+	}
+}
+
+int CControls::SnapInput(int *pData)
+{
+	static int64_t LastSendTime = 0;
+	bool Send = false;
+
+	// update player state
+	if(m_pClient->m_Chat.IsActive())
+		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags = PLAYERFLAG_CHATTING;
+	else if(m_pClient->m_Menus.IsActive())
+		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags = PLAYERFLAG_IN_MENU;
+	else
+		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags = PLAYERFLAG_PLAYING;
+
+	if(m_pClient->m_Scoreboard.Active())
+		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags |= PLAYERFLAG_SCOREBOARD;
+
+	if(m_pClient->m_Controls.m_aShowHookColl[g_Config.m_ClDummy])
+		m_aInputData[g_Config.m_ClDummy].m_PlayerFlags |= PLAYERFLAG_AIM;
+
+	if(m_aLastData[g_Config.m_ClDummy].m_PlayerFlags != m_aInputData[g_Config.m_ClDummy].m_PlayerFlags)
+		Send = true;
+
+	m_aLastData[g_Config.m_ClDummy].m_PlayerFlags = m_aInputData[g_Config.m_ClDummy].m_PlayerFlags;
+
+	// we freeze the input if chat or menu is activated
+	if(!(m_aInputData[g_Config.m_ClDummy].m_PlayerFlags & PLAYERFLAG_PLAYING))
+	{
+		if(!GameClient()->m_GameInfo.m_BugDDRaceInput)
+			ResetInput(g_Config.m_ClDummy);
+
+		mem_copy(pData, &m_aInputData[g_Config.m_ClDummy], sizeof(m_aInputData[0]));
+
+		// set the target anyway though so that we can keep seeing our surroundings,
+		// even if chat or menu are activated
+		m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePos[g_Config.m_ClDummy].x;
+		m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePos[g_Config.m_ClDummy].y;
+
+		// send once a second just to be sure
+		if(time_get() > LastSendTime + time_freq())
+			Send = true;
+	}
+	else
+	{
+		m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePos[g_Config.m_ClDummy].x;
+		m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePos[g_Config.m_ClDummy].y;
+
+		if(g_Config.m_ClSubTickAiming && m_aMousePosOnAction[g_Config.m_ClDummy].x != 0 && m_aMousePosOnAction[g_Config.m_ClDummy].y != 0)
+		{
+			m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)m_aMousePosOnAction[g_Config.m_ClDummy].x;
+			m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePosOnAction[g_Config.m_ClDummy].y;
+
+			m_aMousePosOnAction[g_Config.m_ClDummy].x = 0;
+			m_aMousePosOnAction[g_Config.m_ClDummy].y = 0;
+		}
+
+		if(!m_aInputData[g_Config.m_ClDummy].m_TargetX && !m_aInputData[g_Config.m_ClDummy].m_TargetY)
+		{
+			m_aInputData[g_Config.m_ClDummy].m_TargetX = 1;
+			m_aMousePos[g_Config.m_ClDummy].x = 1;
+		}
+
+		// set direction
+		m_aInputData[g_Config.m_ClDummy].m_Direction = 0;
+		if(m_aInputDirectionLeft[g_Config.m_ClDummy] && !m_aInputDirectionRight[g_Config.m_ClDummy])
+			m_aInputData[g_Config.m_ClDummy].m_Direction = -1;
+		if(!m_aInputDirectionLeft[g_Config.m_ClDummy] && m_aInputDirectionRight[g_Config.m_ClDummy])
+			m_aInputData[g_Config.m_ClDummy].m_Direction = 1;
+
+		// scale TargetX, TargetY by zoom.
+		if(!m_pClient->m_Snap.m_SpecInfo.m_Active)
+		{
+			m_aInputData[g_Config.m_ClDummy].m_TargetX *= m_pClient->m_Camera.m_Zoom;
+			m_aInputData[g_Config.m_ClDummy].m_TargetY *= m_pClient->m_Camera.m_Zoom;
+		}
+
+		// dummy copy moves
+		if(g_Config.m_ClDummyCopyMoves)
+		{
+			CNetObj_PlayerInput *pDummyInput = &m_pClient->m_DummyInput;
+			pDummyInput->m_Direction = m_aInputData[g_Config.m_ClDummy].m_Direction;
+			pDummyInput->m_Hook = m_aInputData[g_Config.m_ClDummy].m_Hook;
+			pDummyInput->m_Jump = m_aInputData[g_Config.m_ClDummy].m_Jump;
+			pDummyInput->m_PlayerFlags = m_aInputData[g_Config.m_ClDummy].m_PlayerFlags;
+			pDummyInput->m_TargetX = m_aInputData[g_Config.m_ClDummy].m_TargetX;
+			pDummyInput->m_TargetY = m_aInputData[g_Config.m_ClDummy].m_TargetY;
+			pDummyInput->m_WantedWeapon = m_aInputData[g_Config.m_ClDummy].m_WantedWeapon;
+
+			pDummyInput->m_Fire += m_aInputData[g_Config.m_ClDummy].m_Fire - m_aLastData[g_Config.m_ClDummy].m_Fire;
+			pDummyInput->m_NextWeapon += m_aInputData[g_Config.m_ClDummy].m_NextWeapon - m_aLastData[g_Config.m_ClDummy].m_NextWeapon;
+			pDummyInput->m_PrevWeapon += m_aInputData[g_Config.m_ClDummy].m_PrevWeapon - m_aLastData[g_Config.m_ClDummy].m_PrevWeapon;
+
+			m_aInputData[!g_Config.m_ClDummy] = *pDummyInput;
+		}
+
+		if(g_Config.m_ClDummyControl)
+		{
+			CNetObj_PlayerInput *pDummyInput = &m_pClient->m_DummyInput;
+			pDummyInput->m_Jump = g_Config.m_ClDummyJump;
+			pDummyInput->m_Fire = g_Config.m_ClDummyFire;
+			pDummyInput->m_Hook = g_Config.m_ClDummyHook;
+		}
+
+		// stress testing
+#ifdef CONF_DEBUG
+		if(g_Config.m_DbgStress)
+		{
+			float t = Client()->LocalTime();
+			mem_zero(&m_aInputData[g_Config.m_ClDummy], sizeof(m_aInputData[0]));
+
+			m_aInputData[g_Config.m_ClDummy].m_Direction = ((int)t / 2) & 1;
+			m_aInputData[g_Config.m_ClDummy].m_Jump = ((int)t);
+			m_aInputData[g_Config.m_ClDummy].m_Fire = ((int)(t * 10));
+			m_aInputData[g_Config.m_ClDummy].m_Hook = ((int)(t * 2)) & 1;
+			m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = ((int)t) % NUM_WEAPONS;
+			m_aInputData[g_Config.m_ClDummy].m_TargetX = (int)(std::sin(t * 3) * 100.0f);
+			m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)(std::cos(t * 3) * 100.0f);
+		}
+#endif
+		// check if we need to send input
+		if(m_aInputData[g_Config.m_ClDummy].m_Direction != m_aLastData[g_Config.m_ClDummy].m_Direction)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_Jump != m_aLastData[g_Config.m_ClDummy].m_Jump)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_Fire != m_aLastData[g_Config.m_ClDummy].m_Fire)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_Hook != m_aLastData[g_Config.m_ClDummy].m_Hook)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_WantedWeapon != m_aLastData[g_Config.m_ClDummy].m_WantedWeapon)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_NextWeapon != m_aLastData[g_Config.m_ClDummy].m_NextWeapon)
+			Send = true;
+		else if(m_aInputData[g_Config.m_ClDummy].m_PrevWeapon != m_aLastData[g_Config.m_ClDummy].m_PrevWeapon)
+			Send = true;
+
+		// send at at least 10hz
+		if(time_get() > LastSendTime + time_freq() / 25)
+			Send = true;
+
+		if(m_pClient->m_Snap.m_pLocalCharacter && m_pClient->m_Snap.m_pLocalCharacter->m_Weapon == WEAPON_NINJA && (m_aInputData[g_Config.m_ClDummy].m_Direction || m_aInputData[g_Config.m_ClDummy].m_Jump || m_aInputData[g_Config.m_ClDummy].m_Hook))
+			Send = true;
+	}
+
+	// copy and return size
+	m_aLastData[g_Config.m_ClDummy] = m_aInputData[g_Config.m_ClDummy];
+
+	if(!Send)
+		return 0;
+
+	LastSendTime = time_get();
+	mem_copy(pData, &m_aInputData[g_Config.m_ClDummy], sizeof(m_aInputData[0]));
+	return sizeof(m_aInputData[0]);
+}
+
+void CControls::OnRender()
+{
+	if(g_Config.m_ClAutoswitchWeaponsOutOfAmmo && !GameClient()->m_GameInfo.m_UnlimitedAmmo && m_pClient->m_Snap.m_pLocalCharacter)
+	{
+		// Keep track of ammo count, we know weapon ammo only when we switch to that weapon, this is tracked on server and protocol does not track that
+		m_aAmmoCount[m_pClient->m_Snap.m_pLocalCharacter->m_Weapon % NUM_WEAPONS] = m_pClient->m_Snap.m_pLocalCharacter->m_AmmoCount;
+		// Autoswitch weapon if we're out of ammo
+		if(m_aInputData[g_Config.m_ClDummy].m_Fire % 2 != 0 &&
+			m_pClient->m_Snap.m_pLocalCharacter->m_AmmoCount == 0 &&
+			m_pClient->m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_HAMMER &&
+			m_pClient->m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_NINJA)
+		{
+			int w;
+			for(w = WEAPON_LASER; w > WEAPON_GUN; w--)
+			{
+				if(w == m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
+					continue;
+				if(m_aAmmoCount[w] > 0)
+					break;
+			}
+			if(w != m_pClient->m_Snap.m_pLocalCharacter->m_Weapon)
+				m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = w + 1;
+		}
+	}
+
+	// update target pos
+	if(m_pClient->m_Snap.m_pGameInfoObj && !m_pClient->m_Snap.m_SpecInfo.m_Active)
+		m_aTargetPos[g_Config.m_ClDummy] = m_pClient->m_LocalCharacterPos + m_aMousePos[g_Config.m_ClDummy];
+	else if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_UsePosition)
+		m_aTargetPos[g_Config.m_ClDummy] = m_pClient->m_Snap.m_SpecInfo.m_Position + m_aMousePos[g_Config.m_ClDummy];
+	else
+		m_aTargetPos[g_Config.m_ClDummy] = m_aMousePos[g_Config.m_ClDummy];
+}
+
+bool CControls::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
+{
+	if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+		return false;
+
+	if(CursorType == IInput::CURSOR_JOYSTICK && g_Config.m_InpControllerAbsolute && m_pClient->m_Snap.m_pGameInfoObj && !m_pClient->m_Snap.m_SpecInfo.m_Active)
+	{
+		float AbsX = 0.0f, AbsY = 0.0f;
+		if(Input()->GetActiveJoystick()->Absolute(&AbsX, &AbsY))
+			m_aMousePos[g_Config.m_ClDummy] = vec2(AbsX, AbsY) * GetMaxMouseDistance();
+		return true;
+	}
+
+	float Factor = 1.0f;
+	if(g_Config.m_ClDyncam && g_Config.m_ClDyncamMousesens)
+	{
+		Factor = g_Config.m_ClDyncamMousesens / 100.0f;
+	}
+	else
+	{
+		switch(CursorType)
+		{
+		case IInput::CURSOR_MOUSE:
+			Factor = g_Config.m_InpMousesens / 100.0f;
+			break;
+		case IInput::CURSOR_JOYSTICK:
+			Factor = g_Config.m_InpControllerSens / 100.0f;
+			break;
+		default:
+			dbg_msg("assert", "CControls::OnCursorMove CursorType %d", (int)CursorType);
+			dbg_break();
+			break;
+		}
+	}
+
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID < 0)
+		Factor *= m_pClient->m_Camera.m_Zoom;
+
+	m_aMousePos[g_Config.m_ClDummy] += vec2(x, y) * Factor;
+	ClampMousePos();
+	return true;
+}
+
+void CControls::ClampMousePos()
+{
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID < 0)
+	{
+		m_aMousePos[g_Config.m_ClDummy].x = clamp(m_aMousePos[g_Config.m_ClDummy].x, -201.0f * 32, (Collision()->GetWidth() + 201.0f) * 32.0f);
+		m_aMousePos[g_Config.m_ClDummy].y = clamp(m_aMousePos[g_Config.m_ClDummy].y, -201.0f * 32, (Collision()->GetHeight() + 201.0f) * 32.0f);
+	}
+	else
+	{
+		float MouseMax = GetMaxMouseDistance();
+		float MinDistance = g_Config.m_ClDyncam ? g_Config.m_ClDyncamMinDistance : g_Config.m_ClMouseMinDistance;
+		float MouseMin = MinDistance;
+
+		float MDistance = length(m_aMousePos[g_Config.m_ClDummy]);
+		if(MDistance < 0.001f)
+		{
+			m_aMousePos[g_Config.m_ClDummy].x = 0.001f;
+			m_aMousePos[g_Config.m_ClDummy].y = 0;
+			MDistance = 0.001f;
+		}
+		if(MDistance < MouseMin)
+			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MDistance) * MouseMin;
+		MDistance = length(m_aMousePos[g_Config.m_ClDummy]);
+		if(MDistance > MouseMax)
+			m_aMousePos[g_Config.m_ClDummy] = normalize_pre_length(m_aMousePos[g_Config.m_ClDummy], MDistance) * MouseMax;
+	}
+}
+
+float CControls::GetMaxMouseDistance() const
+{
+	float CameraMaxDistance = 200.0f;
+	float FollowFactor = (g_Config.m_ClDyncam ? g_Config.m_ClDyncamFollowFactor : g_Config.m_ClMouseFollowfactor) / 100.0f;
+	float DeadZone = g_Config.m_ClDyncam ? g_Config.m_ClDyncamDeadzone : g_Config.m_ClMouseDeadzone;
+	float MaxDistance = g_Config.m_ClDyncam ? g_Config.m_ClDyncamMaxDistance : g_Config.m_ClMouseMaxDistance;
+	return minimum((FollowFactor != 0 ? CameraMaxDistance / FollowFactor + DeadZone : MaxDistance), MaxDistance);
+}
diff --git a/src_bkp/game/client/components/controls.h b/src_bkp/game/client/components/controls.h
new file mode 100644
index 0000000000..67323a12a3
--- /dev/null
+++ b/src_bkp/game/client/components/controls.h
@@ -0,0 +1,49 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_CONTROLS_H
+#define GAME_CLIENT_COMPONENTS_CONTROLS_H
+
+#include <base/vmath.h>
+
+#include <engine/client.h>
+
+#include <game/client/component.h>
+#include <game/generated/protocol.h>
+
+class CControls : public CComponent
+{
+	float GetMaxMouseDistance() const;
+
+public:
+	vec2 m_aMousePos[NUM_DUMMIES];
+	vec2 m_aMousePosOnAction[NUM_DUMMIES];
+	vec2 m_aTargetPos[NUM_DUMMIES];
+	float m_OldMouseX;
+	float m_OldMouseY;
+
+	int m_aAmmoCount[NUM_WEAPONS];
+
+	CNetObj_PlayerInput m_aInputData[NUM_DUMMIES];
+	CNetObj_PlayerInput m_aLastData[NUM_DUMMIES];
+	int m_aInputDirectionLeft[NUM_DUMMIES];
+	int m_aInputDirectionRight[NUM_DUMMIES];
+	int m_aShowHookColl[NUM_DUMMIES];
+	int m_LastDummy;
+	int m_OtherFire;
+
+	CControls();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnReset() override;
+	virtual void OnRelease() override;
+	virtual void OnRender() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+	virtual void OnConsoleInit() override;
+	virtual void OnPlayerDeath();
+
+	int SnapInput(int *pData);
+	void ClampMousePos();
+	void ResetInput(int Dummy);
+};
+#endif
diff --git a/src_bkp/game/client/components/countryflags.cpp b/src_bkp/game/client/components/countryflags.cpp
new file mode 100644
index 0000000000..1f28a4bc5f
--- /dev/null
+++ b/src_bkp/game/client/components/countryflags.cpp
@@ -0,0 +1,159 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/console.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+
+#include "countryflags.h"
+
+#include <game/client/render.h>
+
+void CCountryFlags::LoadCountryflagsIndexfile()
+{
+	const char *pFilename = "countryflags/index.txt";
+	IOHANDLE File = Storage()->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!File)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "couldn't open index file '%s'", pFilename);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", aBuf);
+		return;
+	}
+
+	char aOrigin[128];
+	CLineReader LineReader;
+	LineReader.Init(File);
+	char *pLine;
+	while((pLine = LineReader.Get()))
+	{
+		if(!str_length(pLine) || pLine[0] == '#') // skip empty lines and comments
+			continue;
+
+		str_copy(aOrigin, pLine);
+		char *pReplacement = LineReader.Get();
+		if(!pReplacement)
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", "unexpected end of index file");
+			break;
+		}
+
+		if(pReplacement[0] != '=' || pReplacement[1] != '=' || pReplacement[2] != ' ')
+		{
+			char aBuf[128];
+			str_format(aBuf, sizeof(aBuf), "malform replacement for index '%s'", aOrigin);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", aBuf);
+			continue;
+		}
+
+		int CountryCode = str_toint(pReplacement + 3);
+		if(CountryCode < CODE_LB || CountryCode > CODE_UB)
+		{
+			char aBuf[128];
+			str_format(aBuf, sizeof(aBuf), "country code '%i' not within valid code range [%i..%i]", CountryCode, CODE_LB, CODE_UB);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", aBuf);
+			continue;
+		}
+
+		// load the graphic file
+		char aBuf[128];
+		CImageInfo Info;
+		str_format(aBuf, sizeof(aBuf), "countryflags/%s.png", aOrigin);
+		if(!Graphics()->LoadPNG(&Info, aBuf, IStorage::TYPE_ALL))
+		{
+			char aMsg[128];
+			str_format(aMsg, sizeof(aMsg), "failed to load '%s'", aBuf);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", aMsg);
+			continue;
+		}
+
+		// add entry
+		CCountryFlag CountryFlag;
+		CountryFlag.m_CountryCode = CountryCode;
+		str_copy(CountryFlag.m_aCountryCodeString, aOrigin);
+		CountryFlag.m_Texture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0, aOrigin);
+		Graphics()->FreePNG(&Info);
+
+		if(g_Config.m_Debug)
+		{
+			str_format(aBuf, sizeof(aBuf), "loaded country flag '%s'", aOrigin);
+			Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "countryflags", aBuf);
+		}
+		m_vCountryFlags.push_back(CountryFlag);
+	}
+	io_close(File);
+	std::sort(m_vCountryFlags.begin(), m_vCountryFlags.end());
+
+	// find index of default item
+	size_t DefaultIndex = 0;
+	for(size_t Index = 0; Index < m_vCountryFlags.size(); ++Index)
+		if(m_vCountryFlags[Index].m_CountryCode == -1)
+		{
+			DefaultIndex = Index;
+			break;
+		}
+
+	// init LUT
+	if(DefaultIndex != 0)
+		for(size_t &CodeIndexLUT : m_aCodeIndexLUT)
+			CodeIndexLUT = DefaultIndex;
+	else
+		mem_zero(m_aCodeIndexLUT, sizeof(m_aCodeIndexLUT));
+	for(size_t i = 0; i < m_vCountryFlags.size(); ++i)
+		m_aCodeIndexLUT[maximum(0, (m_vCountryFlags[i].m_CountryCode - CODE_LB) % CODE_RANGE)] = i;
+}
+
+void CCountryFlags::OnInit()
+{
+	// load country flags
+	m_vCountryFlags.clear();
+	LoadCountryflagsIndexfile();
+	if(m_vCountryFlags.empty())
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "countryflags", "failed to load country flags. folder='countryflags/'");
+		CCountryFlag DummyEntry;
+		DummyEntry.m_CountryCode = -1;
+		mem_zero(DummyEntry.m_aCountryCodeString, sizeof(DummyEntry.m_aCountryCodeString));
+		m_vCountryFlags.push_back(DummyEntry);
+	}
+
+	m_FlagsQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_FlagsQuadContainerIndex, 0, 0, 1, 1);
+	Graphics()->QuadContainerUpload(m_FlagsQuadContainerIndex);
+}
+
+size_t CCountryFlags::Num() const
+{
+	return m_vCountryFlags.size();
+}
+
+const CCountryFlags::CCountryFlag *CCountryFlags::GetByCountryCode(int CountryCode) const
+{
+	return GetByIndex(m_aCodeIndexLUT[maximum(0, (CountryCode - CODE_LB) % CODE_RANGE)]);
+}
+
+const CCountryFlags::CCountryFlag *CCountryFlags::GetByIndex(size_t Index) const
+{
+	return &m_vCountryFlags[Index % m_vCountryFlags.size()];
+}
+
+void CCountryFlags::Render(const CCountryFlag *pFlag, ColorRGBA Color, float x, float y, float w, float h)
+{
+	if(pFlag->m_Texture.IsValid())
+	{
+		Graphics()->TextureSet(pFlag->m_Texture);
+		Graphics()->SetColor(Color);
+		Graphics()->RenderQuadContainerEx(m_FlagsQuadContainerIndex, 0, -1, x, y, w, h);
+	}
+}
+
+void CCountryFlags::Render(int CountryCode, ColorRGBA Color, float x, float y, float w, float h)
+{
+	Render(GetByCountryCode(CountryCode), Color, x, y, w, h);
+}
diff --git a/src_bkp/game/client/components/countryflags.h b/src_bkp/game/client/components/countryflags.h
new file mode 100644
index 0000000000..d928e8d3b0
--- /dev/null
+++ b/src_bkp/game/client/components/countryflags.h
@@ -0,0 +1,44 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
+#define GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
+
+#include <game/client/component.h>
+#include <vector>
+
+class CCountryFlags : public CComponent
+{
+public:
+	struct CCountryFlag
+	{
+		int m_CountryCode;
+		char m_aCountryCodeString[8];
+		IGraphics::CTextureHandle m_Texture;
+
+		bool operator<(const CCountryFlag &Other) const { return str_comp(m_aCountryCodeString, Other.m_aCountryCodeString) < 0; }
+	};
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+	void OnInit() override;
+
+	size_t Num() const;
+	const CCountryFlag *GetByCountryCode(int CountryCode) const;
+	const CCountryFlag *GetByIndex(size_t Index) const;
+	void Render(const CCountryFlag *pFlag, ColorRGBA Color, float x, float y, float w, float h);
+	void Render(int CountryCode, ColorRGBA Color, float x, float y, float w, float h);
+
+private:
+	enum
+	{
+		CODE_LB = -1,
+		CODE_UB = 999,
+		CODE_RANGE = CODE_UB - CODE_LB + 1,
+	};
+	std::vector<CCountryFlag> m_vCountryFlags;
+	size_t m_aCodeIndexLUT[CODE_RANGE];
+
+	int m_FlagsQuadContainerIndex;
+
+	void LoadCountryflagsIndexfile();
+};
+#endif
diff --git a/src_bkp/game/client/components/damageind.cpp b/src_bkp/game/client/components/damageind.cpp
new file mode 100644
index 0000000000..aeed8b0d09
--- /dev/null
+++ b/src_bkp/game/client/components/damageind.cpp
@@ -0,0 +1,123 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/color.h>
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include "damageind.h"
+
+CDamageInd::CDamageInd()
+{
+	m_Lastupdate = 0;
+	m_NumItems = 0;
+}
+
+CDamageInd::CItem *CDamageInd::CreateI()
+{
+	if(m_NumItems < MAX_ITEMS)
+	{
+		CItem *p = &m_aItems[m_NumItems];
+		m_NumItems++;
+		return p;
+	}
+	return 0;
+}
+
+void CDamageInd::DestroyI(CDamageInd::CItem *pItem)
+{
+	m_NumItems--;
+	*pItem = m_aItems[m_NumItems];
+}
+
+void CDamageInd::CreateDamageInd(vec2 Pos, float Angle, float Alpha, int Amount)
+{
+	float a = 3 * pi / 2 + Angle;
+	float s = a - pi / 3;
+	float e = a + pi / 3;
+	for(int i = 0; i < Amount; i++)
+	{
+		float f = mix(s, e, (i + 1) / (float)(Amount + 2));
+		Create(Pos, direction(f), Alpha);
+	}
+}
+
+void CDamageInd::Create(vec2 Pos, vec2 Dir, float Alpha)
+{
+	CItem *pItem = CreateI();
+	if(pItem)
+	{
+		pItem->m_Pos = Pos;
+		pItem->m_StartTime = LocalTime();
+		pItem->m_Dir = -Dir;
+		pItem->m_StartAngle = -random_angle();
+		pItem->m_Color = ColorRGBA(1.0f, 1.0f, 1.0f, Alpha);
+		pItem->m_StartAlpha = Alpha;
+	}
+}
+
+void CDamageInd::OnRender()
+{
+	Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteStars[0]);
+	static float s_LastLocalTime = LocalTime();
+	for(int i = 0; i < m_NumItems;)
+	{
+		if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		{
+			const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+			if(pInfo->m_Paused)
+				m_aItems[i].m_StartTime += LocalTime() - s_LastLocalTime;
+			else
+				m_aItems[i].m_StartTime += (LocalTime() - s_LastLocalTime) * (1.0f - pInfo->m_Speed);
+		}
+		else
+		{
+			if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+				m_aItems[i].m_StartTime += LocalTime() - s_LastLocalTime;
+		}
+
+		float Life = 0.75f - (LocalTime() - m_aItems[i].m_StartTime);
+		if(Life < 0.0f)
+			DestroyI(&m_aItems[i]);
+		else
+		{
+			vec2 Pos = mix(m_aItems[i].m_Pos + m_aItems[i].m_Dir * 75.0f, m_aItems[i].m_Pos, clamp((Life - 0.60f) / 0.15f, 0.0f, 1.0f));
+			ColorRGBA Color = m_aItems[i].m_Color;
+
+			Color.a = m_aItems[i].m_StartAlpha * fmin(1, Life / 0.1f);
+
+			Graphics()->SetColor(Color);
+			Graphics()->QuadsSetRotation(m_aItems[i].m_StartAngle + Life * 2.0f);
+			Graphics()->RenderQuadContainerAsSprite(m_DmgIndQuadContainerIndex, 0, Pos.x, Pos.y);
+			i++;
+		}
+	}
+	s_LastLocalTime = LocalTime();
+
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+}
+
+void CDamageInd::OnInit()
+{
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	m_DmgIndQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+	float ScaleX, ScaleY;
+	RenderTools()->GetSpriteScale(SPRITE_STAR1, ScaleX, ScaleY);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_DmgIndQuadContainerIndex, 48.f * ScaleX, 48.f * ScaleY);
+	Graphics()->QuadContainerUpload(m_DmgIndQuadContainerIndex);
+}
+
+void CDamageInd::Reset()
+{
+	for(int i = 0; i < m_NumItems;)
+	{
+		DestroyI(&m_aItems[i]);
+	}
+}
diff --git a/src_bkp/game/client/components/damageind.h b/src_bkp/game/client/components/damageind.h
new file mode 100644
index 0000000000..9324a68da2
--- /dev/null
+++ b/src_bkp/game/client/components/damageind.h
@@ -0,0 +1,45 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_DAMAGEIND_H
+#define GAME_CLIENT_COMPONENTS_DAMAGEIND_H
+#include <base/color.h>
+#include <base/vmath.h>
+#include <game/client/component.h>
+
+class CDamageInd : public CComponent
+{
+	int64_t m_Lastupdate;
+	struct CItem
+	{
+		vec2 m_Pos;
+		vec2 m_Dir;
+		float m_StartTime;
+		float m_StartAngle;
+		ColorRGBA m_Color;
+		float m_StartAlpha;
+	};
+
+	enum
+	{
+		MAX_ITEMS = 64,
+	};
+
+	CItem m_aItems[MAX_ITEMS];
+	int m_NumItems;
+
+	CItem *CreateI();
+	void DestroyI(CItem *pItem);
+
+	int m_DmgIndQuadContainerIndex;
+
+public:
+	CDamageInd();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void CreateDamageInd(vec2 Pos, float Angle, float Alpha, int Amount);
+	void Create(vec2 Pos, vec2 Dir, float Alpha);
+	void Reset();
+	virtual void OnRender() override;
+	virtual void OnInit() override;
+};
+#endif
diff --git a/src_bkp/game/client/components/debughud.cpp b/src_bkp/game/client/components/debughud.cpp
new file mode 100644
index 0000000000..212744b24c
--- /dev/null
+++ b/src_bkp/game/client/components/debughud.cpp
@@ -0,0 +1,259 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/generated/protocol.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/prediction/entities/character.h>
+#include <game/localization.h>
+
+#include "debughud.h"
+
+void CDebugHud::RenderNetCorrections()
+{
+	if(!g_Config.m_Debug || g_Config.m_DbgGraphs || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
+		return;
+
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	const float Velspeed = length(vec2(m_pClient->m_Snap.m_pLocalCharacter->m_VelX / 256.0f, m_pClient->m_Snap.m_pLocalCharacter->m_VelY / 256.0f)) * Client()->GameTickSpeed();
+	const float VelspeedX = m_pClient->m_Snap.m_pLocalCharacter->m_VelX / 256.0f * Client()->GameTickSpeed();
+	const float VelspeedY = m_pClient->m_Snap.m_pLocalCharacter->m_VelY / 256.0f * Client()->GameTickSpeed();
+	const float Ramp = VelocityRamp(Velspeed, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampStart, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampRange, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampCurvature);
+	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
+
+	const float FontSize = 5.0f;
+	const float LineHeight = FontSize + 1.0f;
+
+	float y = 50.0f;
+	char aBuf[128];
+	const auto &&RenderRow = [&](const char *pLabel, const char *pValue) {
+		TextRender()->Text(Width - 100.0f, y, FontSize, pLabel);
+		TextRender()->Text(Width - 10.0f - TextRender()->TextWidth(FontSize, pValue), y, FontSize, pValue);
+		y += LineHeight;
+	};
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+	str_format(aBuf, sizeof(aBuf), "%.0f Bps", Velspeed / 32);
+	RenderRow("Velspeed:", aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.0f Bps", VelspeedX / 32 * Ramp);
+	RenderRow("Velspeed.x * Ramp:", aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.0f Bps", VelspeedY / 32);
+	RenderRow("Velspeed.y:", aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.2f", Ramp);
+	RenderRow("Ramp:", aBuf);
+
+	str_from_int(pCharacter == nullptr ? -1 : pCharacter->m_TeleCheckpoint, aBuf);
+	RenderRow("Checkpoint:", aBuf);
+
+	str_from_int(pCharacter == nullptr ? -1 : pCharacter->m_TuneZone, aBuf);
+	RenderRow("Tune zone:", aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.2f", m_pClient->m_Snap.m_pLocalCharacter->m_X / 32.0f);
+	RenderRow("Pos.x:", aBuf);
+
+	str_format(aBuf, sizeof(aBuf), "%.2f", m_pClient->m_Snap.m_pLocalCharacter->m_Y / 32.0f);
+	RenderRow("Pos.y:", aBuf);
+
+	str_from_int(m_pClient->m_Snap.m_pLocalCharacter->m_Angle, aBuf);
+	RenderRow("Angle:", aBuf);
+
+	str_from_int(m_pClient->NetobjNumCorrections(), aBuf);
+	RenderRow("Netobj corrections", aBuf);
+	RenderRow(" on:", m_pClient->NetobjCorrectedOn());
+}
+
+void CDebugHud::RenderTuning()
+{
+	enum
+	{
+		DBG_TUNING_OFF = 0,
+		DBG_TUNING_SHOW_CHANGED,
+		DBG_TUNING_SHOW_ALL,
+	};
+
+	if(g_Config.m_DbgTuning == DBG_TUNING_OFF)
+		return;
+
+	const CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
+
+	const CTuningParams StandardTuning;
+	const CTuningParams *pGlobalTuning = m_pClient->GetTuning(0);
+	const CTuningParams *pZoneTuning = !m_pClient->m_GameWorld.m_WorldConfig.m_UseTuneZones || pCharacter == nullptr ? nullptr : m_pClient->GetTuning(pCharacter->m_TuneZone);
+	const CTuningParams *pActiveTuning = pZoneTuning == nullptr ? pGlobalTuning : pZoneTuning;
+
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	const float FontSize = 5.0f;
+
+	const float StartY = 50.0f;
+	float y = StartY;
+	float StartX = 30.0f;
+	const auto &&RenderRow = [&](const char *pCol1, const char *pCol2, const char *pCol3) {
+		float x = StartX;
+		TextRender()->Text(x - TextRender()->TextWidth(FontSize, pCol1), y, FontSize, pCol1);
+
+		x += 30.0f;
+		TextRender()->Text(x - TextRender()->TextWidth(FontSize, pCol2), y, FontSize, pCol2);
+
+		x += 10.0f;
+		TextRender()->Text(x, y, FontSize, pCol3);
+
+		y += FontSize + 1.0f;
+
+		if(y >= Height - 80.0f)
+		{
+			y = StartY;
+			StartX += 130.0f;
+		}
+	};
+
+	for(int i = 0; i < CTuningParams::Num(); i++)
+	{
+		float CurrentGlobal, CurrentZone, Standard;
+		pGlobalTuning->Get(i, &CurrentGlobal);
+		if(pZoneTuning == nullptr)
+			CurrentZone = 0.0f;
+		else
+			pZoneTuning->Get(i, &CurrentZone);
+		StandardTuning.Get(i, &Standard);
+
+		if(g_Config.m_DbgTuning == DBG_TUNING_SHOW_CHANGED && Standard == CurrentGlobal && (pZoneTuning == nullptr || Standard == CurrentZone))
+			continue; // skip unchanged params
+
+		if(y == StartY)
+		{
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+			RenderRow("Standard", "Current", "Tuning");
+		}
+
+		ColorRGBA TextColor;
+		if(g_Config.m_DbgTuning == DBG_TUNING_SHOW_ALL && Standard == CurrentGlobal && (pZoneTuning == nullptr || Standard == CurrentZone))
+			TextColor = ColorRGBA(0.75f, 0.75f, 0.75f, 1.0f); // grey: value unchanged globally and in current zone
+		else if(Standard == CurrentGlobal && pZoneTuning != nullptr && Standard != CurrentZone)
+			TextColor = ColorRGBA(0.6f, 0.6f, 1.0f, 1.0f); // blue: value changed only in current zone
+		else if(Standard != CurrentGlobal && pZoneTuning != nullptr && Standard == CurrentZone)
+			TextColor = ColorRGBA(0.4f, 1.0f, 0.4f, 1.0f); // green: value changed globally but reset to default by tune zone
+		else
+			TextColor = ColorRGBA(1.0f, 0.5f, 0.5f, 1.0f); // red: value changed globally
+		TextRender()->TextColor(TextColor);
+
+		char aBufStandard[32];
+		str_format(aBufStandard, sizeof(aBufStandard), "%.2f", Standard);
+		char aBufCurrent[32];
+		str_format(aBufCurrent, sizeof(aBufCurrent), "%.2f", pZoneTuning == nullptr ? CurrentGlobal : CurrentZone);
+		RenderRow(aBufStandard, aBufCurrent, CTuningParams::Name(i));
+	}
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	if(g_Config.m_DbgTuning == DBG_TUNING_SHOW_CHANGED)
+		return;
+
+	// Render Velspeed.X * Ramp Graphs
+	Graphics()->MapScreen(0.0f, 0.0f, Graphics()->ScreenWidth(), Graphics()->ScreenHeight());
+	const float GraphSpacing = Graphics()->ScreenWidth() / 100.0f;
+	const float GraphW = Graphics()->ScreenWidth() / 4.0f;
+	const float GraphH = Graphics()->ScreenHeight() / 6.0f;
+	const float GraphX = GraphW;
+	const float GraphY = Graphics()->ScreenHeight() - GraphH - GraphSpacing;
+
+	const int StepSizeRampGraph = 270;
+	const int StepSizeZoomedInGraph = 14;
+	if(m_OldVelrampStart != pActiveTuning->m_VelrampStart || m_OldVelrampRange != pActiveTuning->m_VelrampRange || m_OldVelrampCurvature != pActiveTuning->m_VelrampCurvature)
+	{
+		m_OldVelrampStart = pActiveTuning->m_VelrampStart;
+		m_OldVelrampRange = pActiveTuning->m_VelrampRange;
+		m_OldVelrampCurvature = pActiveTuning->m_VelrampCurvature;
+
+		m_RampGraph.Init(0.0f, 0.0f);
+		m_SpeedTurningPoint = 0;
+		float PreviousRampedSpeed = 1.0f;
+		for(size_t i = 0; i < CGraph::MAX_VALUES; i++)
+		{
+			// This is a calculation of the speed values per second on the X axis, from 270 to 34560 in steps of 270
+			const float Speed = (i + 1) * StepSizeRampGraph;
+			const float Ramp = VelocityRamp(Speed, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampStart, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampRange, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampCurvature);
+			const float RampedSpeed = Speed * Ramp;
+			if(RampedSpeed >= PreviousRampedSpeed)
+			{
+				m_RampGraph.InsertAt(i, RampedSpeed / 32, ColorRGBA(0.0f, 1.0f, 0.0f, 0.75f));
+				m_SpeedTurningPoint = Speed;
+			}
+			else
+			{
+				m_RampGraph.InsertAt(i, RampedSpeed / 32, ColorRGBA(1.0f, 0.0f, 0.0f, 0.75f));
+			}
+			PreviousRampedSpeed = RampedSpeed;
+		}
+		m_RampGraph.Scale();
+
+		m_ZoomedInGraph.Init(0.0f, 0.0f);
+		PreviousRampedSpeed = 1.0f;
+		MiddleOfZoomedInGraph = m_SpeedTurningPoint;
+		for(size_t i = 0; i < CGraph::MAX_VALUES; i++)
+		{
+			// This is a calculation of the speed values per second on the X axis, from (MiddleOfZoomedInGraph - 64 * StepSize) to (MiddleOfZoomedInGraph + 64 * StepSize)
+			const float Speed = MiddleOfZoomedInGraph - 64 * StepSizeZoomedInGraph + i * StepSizeZoomedInGraph;
+			const float Ramp = VelocityRamp(Speed, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampStart, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampRange, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampCurvature);
+			const float RampedSpeed = Speed * Ramp;
+			if(RampedSpeed >= PreviousRampedSpeed)
+			{
+				m_ZoomedInGraph.InsertAt(i, RampedSpeed / 32, ColorRGBA(0.0f, 1.0f, 0.0f, 0.75f));
+				m_SpeedTurningPoint = Speed;
+			}
+			else
+			{
+				m_ZoomedInGraph.InsertAt(i, RampedSpeed / 32, ColorRGBA(1.0f, 0.0f, 0.0f, 0.75f));
+			}
+			if(i == 0)
+			{
+				m_ZoomedInGraph.SetMin(RampedSpeed / 32);
+			}
+			PreviousRampedSpeed = RampedSpeed;
+		}
+		m_ZoomedInGraph.Scale();
+	}
+
+	const float GraphFontSize = 12.0f;
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "Velspeed.X * Ramp in Bps (Velspeed %d to %d)", StepSizeRampGraph / 32, 128 * StepSizeRampGraph / 32);
+	m_RampGraph.Render(Graphics(), TextRender(), GraphX, GraphY, GraphW, GraphH, aBuf);
+	str_format(aBuf, sizeof(aBuf), "Max Velspeed before it ramps off:  %.2f Bps", m_SpeedTurningPoint / 32);
+	TextRender()->Text(GraphX, GraphY - GraphFontSize, GraphFontSize, aBuf);
+	str_format(aBuf, sizeof(aBuf), "Zoomed in on turning point (Velspeed %d to %d)", ((int)MiddleOfZoomedInGraph - 64 * StepSizeZoomedInGraph) / 32, ((int)MiddleOfZoomedInGraph + 64 * StepSizeZoomedInGraph) / 32);
+	m_ZoomedInGraph.Render(Graphics(), TextRender(), GraphX + GraphW + GraphSpacing, GraphY, GraphW, GraphH, aBuf);
+}
+
+void CDebugHud::RenderHint()
+{
+	if(!g_Config.m_Debug)
+		return;
+
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	const float FontSize = 5.0f;
+	const float Spacing = 5.0f;
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	TextRender()->Text(Spacing, Height - FontSize - Spacing, FontSize, Localize("Debug mode enabled. Press Ctrl+Shift+D to disable debug mode."));
+}
+
+void CDebugHud::OnRender()
+{
+	RenderTuning();
+	RenderNetCorrections();
+	RenderHint();
+}
diff --git a/src_bkp/game/client/components/debughud.h b/src_bkp/game/client/components/debughud.h
new file mode 100644
index 0000000000..67b9019d35
--- /dev/null
+++ b/src_bkp/game/client/components/debughud.h
@@ -0,0 +1,28 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_DEBUGHUD_H
+#define GAME_CLIENT_COMPONENTS_DEBUGHUD_H
+#include <engine/client/client.h>
+
+#include <game/client/component.h>
+
+class CDebugHud : public CComponent
+{
+	void RenderNetCorrections();
+	void RenderTuning();
+	void RenderHint();
+
+	CGraph m_RampGraph;
+	CGraph m_ZoomedInGraph;
+	float m_SpeedTurningPoint;
+	float MiddleOfZoomedInGraph;
+	float m_OldVelrampStart;
+	float m_OldVelrampRange;
+	float m_OldVelrampCurvature;
+
+public:
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnRender() override;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/effects.cpp b/src_bkp/game/client/components/effects.cpp
new file mode 100644
index 0000000000..d22999367b
--- /dev/null
+++ b/src_bkp/game/client/components/effects.cpp
@@ -0,0 +1,333 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <engine/demo.h>
+
+#include <engine/shared/config.h>
+
+#include <game/generated/client_data.h>
+
+#include <game/client/components/damageind.h>
+#include <game/client/components/flow.h>
+#include <game/client/components/particles.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+
+#include "effects.h"
+
+CEffects::CEffects()
+{
+	m_Add5hz = false;
+	m_Add50hz = false;
+	m_Add100hz = false;
+}
+
+void CEffects::AirJump(vec2 Pos, float Alpha)
+{
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_AIRJUMP;
+	p.m_Pos = Pos + vec2(-6.0f, 16.0f);
+	p.m_Vel = vec2(0, -200);
+	p.m_LifeSpan = 0.5f;
+	p.m_StartSize = 48.0f;
+	p.m_EndSize = 0;
+	p.m_Rot = random_angle();
+	p.m_Rotspeed = pi * 2;
+	p.m_Gravity = 500;
+	p.m_Friction = 0.7f;
+	p.m_FlowAffected = 0.0f;
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+
+	p.m_Pos = Pos + vec2(6.0f, 16.0f);
+	m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+
+	if(g_Config.m_SndGame)
+		m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_AIRJUMP, 1.0f, Pos);
+}
+
+void CEffects::DamageIndicator(vec2 Pos, vec2 Dir, float Alpha)
+{
+	m_pClient->m_DamageInd.Create(Pos, Dir, Alpha);
+}
+
+void CEffects::ResetDamageIndicator()
+{
+	m_pClient->m_DamageInd.Reset();
+}
+
+void CEffects::PowerupShine(vec2 Pos, vec2 Size, float Alpha)
+{
+	if(!m_Add50hz)
+		return;
+
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_SLICE;
+	p.m_Pos = Pos + vec2(random_float(-0.5f, 0.5f), random_float(-0.5f, 0.5f)) * Size;
+	p.m_Vel = vec2(0, 0);
+	p.m_LifeSpan = 0.5f;
+	p.m_StartSize = 16.0f;
+	p.m_EndSize = 0;
+	p.m_Rot = random_angle();
+	p.m_Rotspeed = pi * 2;
+	p.m_Gravity = 500;
+	p.m_Friction = 0.9f;
+	p.m_FlowAffected = 0.0f;
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+}
+
+void CEffects::FreezingFlakes(vec2 Pos, vec2 Size, float Alpha)
+{
+	if(!m_Add5hz)
+		return;
+
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_SNOWFLAKE;
+	p.m_Pos = Pos + vec2(random_float(-0.5f, 0.5f), random_float(-0.5f, 0.5f)) * Size;
+	p.m_Vel = vec2(0, 0);
+	p.m_LifeSpan = 1.5f;
+	p.m_StartSize = random_float(0.5f, 1.5f) * 16.0f;
+	p.m_EndSize = p.m_StartSize * 0.5f;
+	p.m_UseAlphaFading = true;
+	p.m_StartAlpha = 1.0f;
+	p.m_EndAlpha = 0.0f;
+	p.m_Rot = random_angle();
+	p.m_Rotspeed = pi;
+	p.m_Gravity = random_float(250.0f);
+	p.m_Friction = 0.9f;
+	p.m_FlowAffected = 0.0f;
+	p.m_Collides = false;
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_EXTRA, &p);
+}
+
+void CEffects::SmokeTrail(vec2 Pos, vec2 Vel, float Alpha, float TimePassed)
+{
+	if(!m_Add50hz && TimePassed < 0.001f)
+		return;
+
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_SMOKE;
+	p.m_Pos = Pos;
+	p.m_Vel = Vel + random_direction() * 50.0f;
+	p.m_LifeSpan = random_float(0.5f, 1.0f);
+	p.m_StartSize = random_float(12.0f, 20.0f);
+	p.m_EndSize = 0;
+	p.m_Friction = 0.7f;
+	p.m_Gravity = random_float(-500.0f);
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_PROJECTILE_TRAIL, &p, TimePassed);
+}
+
+void CEffects::SkidTrail(vec2 Pos, vec2 Vel, float Alpha)
+{
+	if(!m_Add100hz)
+		return;
+
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_SMOKE;
+	p.m_Pos = Pos;
+	p.m_Vel = Vel + random_direction() * 50.0f;
+	p.m_LifeSpan = random_float(0.5f, 1.0f);
+	p.m_StartSize = random_float(24.0f, 36.0f);
+	p.m_EndSize = 0;
+	p.m_Friction = 0.7f;
+	p.m_Gravity = random_float(-500.0f);
+	p.m_Color = ColorRGBA(0.75f, 0.75f, 0.75f, Alpha);
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+}
+
+void CEffects::BulletTrail(vec2 Pos, float Alpha, float TimePassed)
+{
+	if(!m_Add100hz && TimePassed < 0.001f)
+		return;
+
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_BALL;
+	p.m_Pos = Pos;
+	p.m_LifeSpan = random_float(0.25f, 0.5f);
+	p.m_StartSize = 8.0f;
+	p.m_EndSize = 0;
+	p.m_Friction = 0.7f;
+	p.m_Color.a *= Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_PROJECTILE_TRAIL, &p, TimePassed);
+}
+
+void CEffects::PlayerSpawn(vec2 Pos, float Alpha)
+{
+	for(int i = 0; i < 32; i++)
+	{
+		CParticle p;
+		p.SetDefault();
+		p.m_Spr = SPRITE_PART_SHELL;
+		p.m_Pos = Pos;
+		p.m_Vel = random_direction() * (std::pow(random_float(), 3) * 600.0f);
+		p.m_LifeSpan = random_float(0.3f, 0.6f);
+		p.m_StartSize = random_float(64.0f, 96.0f);
+		p.m_EndSize = 0;
+		p.m_Rot = random_angle();
+		p.m_Rotspeed = random_float();
+		p.m_Gravity = random_float(-400.0f);
+		p.m_Friction = 0.7f;
+		p.m_Color = ColorRGBA(0xb5 / 255.0f, 0x50 / 255.0f, 0xcb / 255.0f, Alpha);
+		p.m_StartAlpha = Alpha;
+		m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+	}
+	if(g_Config.m_SndGame)
+		m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_SPAWN, 1.0f, Pos);
+}
+
+void CEffects::PlayerDeath(vec2 Pos, int ClientID, float Alpha)
+{
+	ColorRGBA BloodColor(1.0f, 1.0f, 1.0f);
+
+	if(ClientID >= 0)
+	{
+		// Use m_RenderInfo.m_CustomColoredSkin instead of m_UseCustomColor
+		// m_UseCustomColor says if the player's skin has a custom color (value sent from the client side)
+
+		// m_RenderInfo.m_CustomColoredSkin Defines if in the context of the game the color is being customized,
+		// Using this value if the game is teams (red and blue), this value will be true even if the skin is with the normal color.
+		// And will use the team body color to create player death effect instead of tee color
+		if(m_pClient->m_aClients[ClientID].m_RenderInfo.m_CustomColoredSkin)
+			BloodColor = m_pClient->m_aClients[ClientID].m_RenderInfo.m_ColorBody;
+		else
+		{
+			BloodColor = m_pClient->m_aClients[ClientID].m_RenderInfo.m_BloodColor;
+		}
+	}
+
+	for(int i = 0; i < 64; i++)
+	{
+		CParticle p;
+		p.SetDefault();
+		p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
+		p.m_Pos = Pos;
+		p.m_Vel = random_direction() * (random_float(0.1f, 1.1f) * 900.0f);
+		p.m_LifeSpan = random_float(0.3f, 0.6f);
+		p.m_StartSize = random_float(24.0f, 40.0f);
+		p.m_EndSize = 0;
+		p.m_Rot = random_angle();
+		p.m_Rotspeed = random_float(-0.5f, 0.5f) * pi;
+		p.m_Gravity = 800.0f;
+		p.m_Friction = 0.8f;
+		ColorRGBA c = BloodColor.v4() * random_float(0.75f, 1.0f);
+		p.m_Color = ColorRGBA(c.r, c.g, c.b, 0.75f * Alpha);
+		p.m_StartAlpha = Alpha;
+		m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+	}
+}
+
+void CEffects::Explosion(vec2 Pos, float Alpha)
+{
+	// add to flow
+	for(int y = -8; y <= 8; y++)
+		for(int x = -8; x <= 8; x++)
+		{
+			if(x == 0 && y == 0)
+				continue;
+
+			float a = 1 - (length(vec2(x, y)) / length(vec2(8, 8)));
+			m_pClient->m_Flow.Add(Pos + vec2(x, y) * 16, normalize(vec2(x, y)) * 5000.0f * a, 10.0f);
+		}
+
+	// add the explosion
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_EXPL01;
+	p.m_Pos = Pos;
+	p.m_LifeSpan = 0.4f;
+	p.m_StartSize = 150.0f;
+	p.m_EndSize = 0;
+	p.m_Rot = random_angle();
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
+
+	// add the smoke
+	for(int i = 0; i < 24; i++)
+	{
+		p.SetDefault();
+		p.m_Spr = SPRITE_PART_SMOKE;
+		p.m_Pos = Pos;
+		p.m_Vel = random_direction() * (random_float(1.0f, 1.2f) * 1000.0f);
+		p.m_LifeSpan = random_float(0.5f, 0.9f);
+		p.m_StartSize = random_float(32.0f, 40.0f);
+		p.m_EndSize = 0;
+		p.m_Gravity = random_float(-800.0f);
+		p.m_Friction = 0.4f;
+		p.m_Color = mix(vec4(0.75f, 0.75f, 0.75f, 1.0f), vec4(0.5f, 0.5f, 0.5f, 1.0f), random_float());
+		p.m_Color.a *= Alpha;
+		p.m_StartAlpha = p.m_Color.a;
+		m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
+	}
+}
+
+void CEffects::HammerHit(vec2 Pos, float Alpha)
+{
+	// add the explosion
+	CParticle p;
+	p.SetDefault();
+	p.m_Spr = SPRITE_PART_HIT01;
+	p.m_Pos = Pos;
+	p.m_LifeSpan = 0.3f;
+	p.m_StartSize = 120.0f;
+	p.m_EndSize = 0;
+	p.m_Rot = random_angle();
+	p.m_Color.a = Alpha;
+	p.m_StartAlpha = Alpha;
+	m_pClient->m_Particles.Add(CParticles::GROUP_EXPLOSIONS, &p);
+	if(g_Config.m_SndGame)
+		m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_HAMMER_HIT, 1.0f, Pos);
+}
+
+void CEffects::OnRender()
+{
+	static int64_t s_LastUpdate100hz = 0;
+	static int64_t s_LastUpdate50hz = 0;
+	static int64_t s_LastUpdate5hz = 0;
+
+	float Speed = 1.0f;
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		Speed = DemoPlayer()->BaseInfo()->m_Speed;
+
+	if(time() - s_LastUpdate100hz > time_freq() / (100 * Speed))
+	{
+		m_Add100hz = true;
+		s_LastUpdate100hz = time();
+	}
+	else
+		m_Add100hz = false;
+
+	if(time() - s_LastUpdate50hz > time_freq() / (50 * Speed))
+	{
+		m_Add50hz = true;
+		s_LastUpdate50hz = time();
+	}
+	else
+		m_Add50hz = false;
+
+	if(time() - s_LastUpdate5hz > time_freq() / (5 * Speed))
+	{
+		m_Add5hz = true;
+		s_LastUpdate5hz = time();
+	}
+	else
+		m_Add5hz = false;
+
+	if(m_Add50hz)
+		m_pClient->m_Flow.Update();
+}
diff --git a/src_bkp/game/client/components/effects.h b/src_bkp/game/client/components/effects.h
new file mode 100644
index 0000000000..02acc90f66
--- /dev/null
+++ b/src_bkp/game/client/components/effects.h
@@ -0,0 +1,34 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_EFFECTS_H
+#define GAME_CLIENT_COMPONENTS_EFFECTS_H
+#include <game/client/component.h>
+
+class CEffects : public CComponent
+{
+	bool m_Add5hz;
+	bool m_Add50hz;
+	bool m_Add100hz;
+
+public:
+	CEffects();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnRender() override;
+
+	void BulletTrail(vec2 Pos, float Alpha = 1.f, float TimePassed = 0.f);
+	void SmokeTrail(vec2 Pos, vec2 Vel, float Alpha = 1.f, float TimePassed = 0.f);
+	void SkidTrail(vec2 Pos, vec2 Vel, float Alpha = 1.0f);
+	void Explosion(vec2 Pos, float Alpha = 1.0f);
+	void HammerHit(vec2 Pos, float Alpha = 1.0f);
+	void AirJump(vec2 Pos, float Alpha = 1.0f);
+	void DamageIndicator(vec2 Pos, vec2 Dir, float Alpha = 1.0f);
+	void ResetDamageIndicator();
+	void PlayerSpawn(vec2 Pos, float Alpha = 1.0f);
+	void PlayerDeath(vec2 Pos, int ClientID, float Alpha = 1.0f);
+	void PowerupShine(vec2 Pos, vec2 Size, float Alpha = 1.0f);
+	void FreezingFlakes(vec2 Pos, vec2 Size, float Alpha = 1.0f);
+
+	void Update();
+};
+#endif
diff --git a/src_bkp/game/client/components/emoticon.cpp b/src_bkp/game/client/components/emoticon.cpp
new file mode 100644
index 0000000000..16c6c32b47
--- /dev/null
+++ b/src_bkp/game/client/components/emoticon.cpp
@@ -0,0 +1,204 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <game/generated/protocol.h>
+
+#include "chat.h"
+#include "emoticon.h"
+#include <game/client/animstate.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+
+#include <game/client/gameclient.h>
+
+CEmoticon::CEmoticon()
+{
+	OnReset();
+}
+
+void CEmoticon::ConKeyEmoticon(IConsole::IResult *pResult, void *pUserData)
+{
+	CEmoticon *pSelf = (CEmoticon *)pUserData;
+	if(!pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active && pSelf->Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		pSelf->m_Active = pResult->GetInteger(0) != 0;
+}
+
+void CEmoticon::ConEmote(IConsole::IResult *pResult, void *pUserData)
+{
+	((CEmoticon *)pUserData)->Emote(pResult->GetInteger(0));
+}
+
+void CEmoticon::OnConsoleInit()
+{
+	Console()->Register("+emote", "", CFGFLAG_CLIENT, ConKeyEmoticon, this, "Open emote selector");
+	Console()->Register("emote", "i[emote-id]", CFGFLAG_CLIENT, ConEmote, this, "Use emote");
+}
+
+void CEmoticon::OnReset()
+{
+	m_WasActive = false;
+	m_Active = false;
+	m_SelectedEmote = -1;
+	m_SelectedEyeEmote = -1;
+}
+
+void CEmoticon::OnRelease()
+{
+	m_Active = false;
+}
+
+bool CEmoticon::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
+{
+	if(!m_Active)
+		return false;
+
+	UI()->ConvertMouseMove(&x, &y, CursorType);
+	m_SelectorMouse += vec2(x, y);
+	return true;
+}
+
+void CEmoticon::OnRender()
+{
+	if(!m_Active)
+	{
+		if(m_WasActive && m_SelectedEmote != -1)
+			Emote(m_SelectedEmote);
+		if(m_WasActive && m_SelectedEyeEmote != -1)
+			EyeEmote(m_SelectedEyeEmote);
+		m_WasActive = false;
+		return;
+	}
+
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+	{
+		m_Active = false;
+		m_WasActive = false;
+		return;
+	}
+
+	m_WasActive = true;
+
+	if(length(m_SelectorMouse) > 170.0f)
+		m_SelectorMouse = normalize(m_SelectorMouse) * 170.0f;
+
+	float SelectedAngle = angle(m_SelectorMouse) + 2 * pi / 24;
+	if(SelectedAngle < 0)
+		SelectedAngle += 2 * pi;
+
+	m_SelectedEmote = -1;
+	m_SelectedEyeEmote = -1;
+	if(length(m_SelectorMouse) > 110.0f)
+		m_SelectedEmote = (int)(SelectedAngle / (2 * pi) * NUM_EMOTICONS);
+	else if(length(m_SelectorMouse) > 40.0f)
+		m_SelectedEyeEmote = (int)(SelectedAngle / (2 * pi) * NUM_EMOTES);
+
+	CUIRect Screen = *UI()->Screen();
+
+	UI()->MapScreen();
+
+	Graphics()->BlendNormal();
+
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(0, 0, 0, 0.3f);
+	Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 190.0f, 64);
+	Graphics()->QuadsEnd();
+
+	Graphics()->WrapClamp();
+	for(int i = 0; i < NUM_EMOTICONS; i++)
+	{
+		float Angle = 2 * pi * i / NUM_EMOTICONS;
+		if(Angle > pi)
+			Angle -= 2 * pi;
+
+		bool Selected = m_SelectedEmote == i;
+
+		float Size = Selected ? 80.0f : 50.0f;
+
+		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[i]);
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+
+		Graphics()->QuadsBegin();
+		const vec2 Nudge = direction(Angle) * 150.0f;
+		IGraphics::CQuadItem QuadItem(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y, Size, Size);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	Graphics()->WrapNormal();
+
+	if(GameClient()->m_GameInfo.m_AllowEyeWheel && g_Config.m_ClEyeWheel)
+	{
+		Graphics()->TextureClear();
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.0, 1.0, 1.0, 0.3f);
+		Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 100.0f, 64);
+		Graphics()->QuadsEnd();
+
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_aLocalIDs[g_Config.m_ClDummy]].m_RenderInfo;
+
+		for(int i = 0; i < NUM_EMOTES; i++)
+		{
+			float Angle = 2 * pi * i / NUM_EMOTES;
+			if(Angle > pi)
+				Angle -= 2 * pi;
+
+			const bool Selected = m_SelectedEyeEmote == i;
+
+			const vec2 Nudge = direction(Angle) * 70.0f;
+			TeeInfo.m_Size = Selected ? 64.0f : 48.0f;
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, i, vec2(-1, 0), vec2(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y));
+		}
+
+		Graphics()->TextureClear();
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(0, 0, 0, 0.3f);
+		Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 30.0f, 64);
+		Graphics()->QuadsEnd();
+	}
+	else
+		m_SelectedEyeEmote = -1;
+
+	RenderTools()->RenderCursor(m_SelectorMouse + vec2(Screen.w, Screen.h) / 2, 24.0f);
+}
+
+void CEmoticon::Emote(int Emoticon)
+{
+	CNetMsg_Cl_Emoticon Msg;
+	Msg.m_Emoticon = Emoticon;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+
+	if(g_Config.m_ClDummyCopyMoves)
+	{
+		CMsgPacker MsgDummy(NETMSGTYPE_CL_EMOTICON, false);
+		MsgDummy.AddInt(Emoticon);
+		Client()->SendMsg(!g_Config.m_ClDummy, &MsgDummy, MSGFLAG_VITAL);
+	}
+}
+
+void CEmoticon::EyeEmote(int Emote)
+{
+	char aBuf[32];
+	switch(Emote)
+	{
+	case EMOTE_NORMAL:
+		str_format(aBuf, sizeof(aBuf), "/emote normal %d", g_Config.m_ClEyeDuration);
+		break;
+	case EMOTE_PAIN:
+		str_format(aBuf, sizeof(aBuf), "/emote pain %d", g_Config.m_ClEyeDuration);
+		break;
+	case EMOTE_HAPPY:
+		str_format(aBuf, sizeof(aBuf), "/emote happy %d", g_Config.m_ClEyeDuration);
+		break;
+	case EMOTE_SURPRISE:
+		str_format(aBuf, sizeof(aBuf), "/emote surprise %d", g_Config.m_ClEyeDuration);
+		break;
+	case EMOTE_ANGRY:
+		str_format(aBuf, sizeof(aBuf), "/emote angry %d", g_Config.m_ClEyeDuration);
+		break;
+	case EMOTE_BLINK:
+		str_format(aBuf, sizeof(aBuf), "/emote blink %d", g_Config.m_ClEyeDuration);
+		break;
+	}
+	GameClient()->m_Chat.Say(0, aBuf);
+}
diff --git a/src_bkp/game/client/components/emoticon.h b/src_bkp/game/client/components/emoticon.h
new file mode 100644
index 0000000000..aec896cfa9
--- /dev/null
+++ b/src_bkp/game/client/components/emoticon.h
@@ -0,0 +1,34 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_EMOTICON_H
+#define GAME_CLIENT_COMPONENTS_EMOTICON_H
+#include <base/vmath.h>
+#include <game/client/component.h>
+
+class CEmoticon : public CComponent
+{
+	bool m_WasActive;
+	bool m_Active;
+
+	vec2 m_SelectorMouse;
+	int m_SelectedEmote;
+	int m_SelectedEyeEmote;
+
+	static void ConKeyEmoticon(IConsole::IResult *pResult, void *pUserData);
+	static void ConEmote(IConsole::IResult *pResult, void *pUserData);
+
+public:
+	CEmoticon();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnReset() override;
+	virtual void OnConsoleInit() override;
+	virtual void OnRender() override;
+	virtual void OnRelease() override;
+	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+
+	void Emote(int Emoticon);
+	void EyeEmote(int EyeEmote);
+};
+
+#endif
diff --git a/src_bkp/game/client/components/flow.cpp b/src_bkp/game/client/components/flow.cpp
new file mode 100644
index 0000000000..634edb29b2
--- /dev/null
+++ b/src_bkp/game/client/components/flow.cpp
@@ -0,0 +1,93 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "flow.h"
+#include <engine/graphics.h>
+#include <game/layers.h>
+#include <game/mapitems.h>
+
+CFlow::CFlow()
+{
+	m_pCells = 0;
+	m_Height = 0;
+	m_Width = 0;
+	m_Spacing = 16;
+}
+
+void CFlow::DbgRender()
+{
+	if(!m_pCells)
+		return;
+
+	IGraphics::CLineItem Array[1024];
+	int NumItems = 0;
+	Graphics()->TextureClear();
+	Graphics()->LinesBegin();
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+		{
+			vec2 Pos(x * m_Spacing, y * m_Spacing);
+			vec2 Vel = m_pCells[y * m_Width + x].m_Vel * 0.01f;
+			Array[NumItems++] = IGraphics::CLineItem(Pos.x, Pos.y, Pos.x + Vel.x, Pos.y + Vel.y);
+			if(NumItems == 1024)
+			{
+				Graphics()->LinesDraw(Array, 1024);
+				NumItems = 0;
+			}
+		}
+
+	if(NumItems)
+		Graphics()->LinesDraw(Array, NumItems);
+	Graphics()->LinesEnd();
+}
+
+void CFlow::Init()
+{
+	free(m_pCells);
+	m_pCells = 0;
+
+	CMapItemLayerTilemap *pTilemap = Layers()->GameLayer();
+	m_Width = pTilemap->m_Width * 32 / m_Spacing;
+	m_Height = pTilemap->m_Height * 32 / m_Spacing;
+
+	// allocate and clear
+	m_pCells = (CCell *)calloc((size_t)m_Width * m_Height, sizeof(CCell));
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			m_pCells[y * m_Width + x].m_Vel = vec2(0.0f, 0.0f);
+}
+
+void CFlow::Update()
+{
+	if(!m_pCells)
+		return;
+
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			m_pCells[y * m_Width + x].m_Vel *= 0.85f;
+}
+
+vec2 CFlow::Get(vec2 Pos)
+{
+	if(!m_pCells)
+		return vec2(0, 0);
+
+	int x = (int)(Pos.x / m_Spacing);
+	int y = (int)(Pos.y / m_Spacing);
+	if(x < 0 || y < 0 || x >= m_Width || y >= m_Height)
+		return vec2(0, 0);
+
+	return m_pCells[y * m_Width + x].m_Vel;
+}
+
+void CFlow::Add(vec2 Pos, vec2 Vel, float Size)
+{
+	if(!m_pCells)
+		return;
+
+	int x = (int)(Pos.x / m_Spacing);
+	int y = (int)(Pos.y / m_Spacing);
+	if(x < 0 || y < 0 || x >= m_Width || y >= m_Height)
+		return;
+
+	m_pCells[y * m_Width + x].m_Vel += Vel;
+}
diff --git a/src_bkp/game/client/components/flow.h b/src_bkp/game/client/components/flow.h
new file mode 100644
index 0000000000..ab4274e134
--- /dev/null
+++ b/src_bkp/game/client/components/flow.h
@@ -0,0 +1,32 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_FLOW_H
+#define GAME_CLIENT_COMPONENTS_FLOW_H
+#include <base/vmath.h>
+#include <game/client/component.h>
+
+class CFlow : public CComponent
+{
+	struct CCell
+	{
+		vec2 m_Vel;
+	};
+
+	CCell *m_pCells;
+	int m_Height;
+	int m_Width;
+	int m_Spacing;
+
+	void DbgRender();
+	void Init();
+
+public:
+	CFlow();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	vec2 Get(vec2 Pos);
+	void Add(vec2 Pos, vec2 Vel, float Size);
+	void Update();
+};
+
+#endif
diff --git a/src_bkp/game/client/components/freezebars.cpp b/src_bkp/game/client/components/freezebars.cpp
new file mode 100644
index 0000000000..817be51129
--- /dev/null
+++ b/src_bkp/game/client/components/freezebars.cpp
@@ -0,0 +1,239 @@
+#include <game/client/gameclient.h>
+
+#include "freezebars.h"
+
+void CFreezeBars::RenderFreezeBar(const int ClientID)
+{
+	const float FreezeBarWidth = 64.0f;
+	const float FreezeBarHalfWidth = 32.0f;
+	const float FreezeBarHight = 16.0f;
+
+	// pCharacter contains the predicted character for local players or the last snap for players who are spectated
+	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientID].m_Predicted;
+
+	if(pCharacter->m_FreezeEnd <= 0 || pCharacter->m_FreezeStart == 0 || pCharacter->m_FreezeEnd <= pCharacter->m_FreezeStart || !m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo || (pCharacter->m_IsInFreeze && g_Config.m_ClFreezeBarsAlphaInsideFreeze == 0))
+	{
+		return;
+	}
+
+	const int Max = pCharacter->m_FreezeEnd - pCharacter->m_FreezeStart;
+	float FreezeProgress = clamp(Max - (Client()->GameTick(g_Config.m_ClDummy) - pCharacter->m_FreezeStart), 0, Max) / (float)Max;
+	if(FreezeProgress <= 0.0f)
+	{
+		return;
+	}
+
+	vec2 Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	Position.x -= FreezeBarHalfWidth;
+	Position.y += 32;
+
+	float Alpha = m_pClient->IsOtherTeam(ClientID) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	if(pCharacter->m_IsInFreeze)
+	{
+		Alpha *= g_Config.m_ClFreezeBarsAlphaInsideFreeze / 100.0f;
+	}
+
+	RenderFreezeBarPos(Position.x, Position.y, FreezeBarWidth, FreezeBarHight, FreezeProgress, Alpha);
+}
+
+void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width, const float height, float Progress, const float Alpha)
+{
+	Progress = clamp(Progress, 0.0f, 1.0f);
+
+	// what percentage of the end pieces is used for the progress indicator and how much is the rest
+	// half of the ends are used for the progress display
+	const float RestPct = 0.5f;
+	const float ProgPct = 0.5f;
+
+	const float EndWidth = height; // to keep the correct scale - the height of the sprite is as long as the width
+	const float BarHeight = height;
+	const float WholeBarWidth = width;
+	const float MiddleBarWidth = WholeBarWidth - (EndWidth * 2.0f);
+	const float EndProgressWidth = EndWidth * ProgPct;
+	const float EndRestWidth = EndWidth * RestPct;
+	const float ProgressBarWidth = WholeBarWidth - (EndProgressWidth * 2.0f);
+	const float EndProgressProportion = EndProgressWidth / ProgressBarWidth;
+	const float MiddleProgressProportion = MiddleBarWidth / ProgressBarWidth;
+
+	// beginning piece
+	float BeginningPieceProgress = 1;
+	if(Progress <= EndProgressProportion)
+	{
+		BeginningPieceProgress = Progress / EndProgressProportion;
+	}
+
+	// full
+	Graphics()->WrapClamp();
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarFullLeft);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// Subset: top_l, top_m, btm_m, btm_l
+	Graphics()->QuadsSetSubsetFree(0, 0, RestPct + ProgPct * BeginningPieceProgress, 0, RestPct + ProgPct * BeginningPieceProgress, 1, 0, 1);
+	IGraphics::CQuadItem QuadFullBeginning(x, y, EndRestWidth + EndProgressWidth * BeginningPieceProgress, BarHeight);
+	Graphics()->QuadsDrawTL(&QuadFullBeginning, 1);
+	Graphics()->QuadsEnd();
+
+	// empty
+	if(BeginningPieceProgress < 1.0f)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarEmptyRight);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		// Subset: top_m, top_l, btm_l, btm_m | it is mirrored on the horizontal axe and rotated 180 degrees
+		Graphics()->QuadsSetSubsetFree(ProgPct - ProgPct * BeginningPieceProgress, 0, 0, 0, 0, 1, ProgPct - ProgPct * BeginningPieceProgress, 1);
+		IGraphics::CQuadItem QuadEmptyBeginning(x + EndRestWidth + EndProgressWidth * BeginningPieceProgress, y, EndProgressWidth * (1.0f - BeginningPieceProgress), BarHeight);
+		Graphics()->QuadsDrawTL(&QuadEmptyBeginning, 1);
+		Graphics()->QuadsEnd();
+	}
+
+	// middle piece
+	x += EndWidth;
+
+	float MiddlePieceProgress = 1;
+	if(Progress <= EndProgressProportion + MiddleProgressProportion)
+	{
+		if(Progress <= EndProgressProportion)
+		{
+			MiddlePieceProgress = 0;
+		}
+		else
+		{
+			MiddlePieceProgress = (Progress - EndProgressProportion) / MiddleProgressProportion;
+		}
+	}
+
+	const float FullMiddleBarWidth = MiddleBarWidth * MiddlePieceProgress;
+	const float EmptyMiddleBarWidth = MiddleBarWidth - FullMiddleBarWidth;
+
+	// full freeze bar
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarFull);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// select the middle portion of the sprite so we don't get edge bleeding
+	if(FullMiddleBarWidth <= EndWidth)
+	{
+		// prevent pixel puree, select only a small slice
+		// Subset: top_l, top_m, btm_m, btm_l
+		Graphics()->QuadsSetSubsetFree(0, 0, FullMiddleBarWidth / EndWidth, 0, FullMiddleBarWidth / EndWidth, 1, 0, 1);
+	}
+	else
+	{
+		// Subset: top_l, top_r, btm_r, btm_l
+		Graphics()->QuadsSetSubsetFree(0, 0, 1, 0, 1, 1, 0, 1);
+	}
+	IGraphics::CQuadItem QuadFull(x, y, FullMiddleBarWidth, BarHeight);
+	Graphics()->QuadsDrawTL(&QuadFull, 1);
+	Graphics()->QuadsEnd();
+
+	// empty freeze bar
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarEmpty);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// select the middle portion of the sprite so we don't get edge bleeding
+	if(EmptyMiddleBarWidth <= EndWidth)
+	{
+		// prevent pixel puree, select only a small slice
+		// Subset: top_m, top_l, btm_l, btm_m | it is mirrored on the horizontal axe and rotated 180 degrees
+		Graphics()->QuadsSetSubsetFree(EmptyMiddleBarWidth / EndWidth, 0, 0, 0, 0, 1, EmptyMiddleBarWidth / EndWidth, 1);
+	}
+	else
+	{
+		// Subset: top_r, top_l, btm_l, btm_r | it is mirrored on the horizontal axe and rotated 180 degrees
+		Graphics()->QuadsSetSubsetFree(1, 0, 0, 0, 0, 1, 1, 1);
+	}
+
+	IGraphics::CQuadItem QuadEmpty(x + FullMiddleBarWidth, y, EmptyMiddleBarWidth, BarHeight);
+	Graphics()->QuadsDrawTL(&QuadEmpty, 1);
+	Graphics()->QuadsEnd();
+
+	// end piece
+	x += MiddleBarWidth;
+	float EndingPieceProgress = 1;
+	if(Progress <= 1)
+	{
+		if(Progress <= (EndProgressProportion + MiddleProgressProportion))
+		{
+			EndingPieceProgress = 0;
+		}
+		else
+		{
+			EndingPieceProgress = (Progress - EndProgressProportion - MiddleProgressProportion) / EndProgressProportion;
+		}
+	}
+	if(EndingPieceProgress > 0.0f)
+	{
+		// full
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarFullLeft);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		// Subset: top_r, top_m, btm_m, btm_r | it is mirrored on the horizontal axe and rotated 180 degrees
+		Graphics()->QuadsSetSubsetFree(1, 0, 1.0f - ProgPct * EndingPieceProgress, 0, 1.0f - ProgPct * EndingPieceProgress, 1, 1, 1);
+		IGraphics::CQuadItem QuadFullEnding(x, y, EndProgressWidth * EndingPieceProgress, BarHeight);
+		Graphics()->QuadsDrawTL(&QuadFullEnding, 1);
+		Graphics()->QuadsEnd();
+	}
+	// empty
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarEmptyRight);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// Subset: top_m, top_r, btm_r, btm_m
+	Graphics()->QuadsSetSubsetFree(ProgPct - ProgPct * (1.0f - EndingPieceProgress), 0, 1, 0, 1, 1, ProgPct - ProgPct * (1.0f - EndingPieceProgress), 1);
+	IGraphics::CQuadItem QuadEmptyEnding(x + EndProgressWidth * EndingPieceProgress, y, EndProgressWidth * (1.0f - EndingPieceProgress) + EndRestWidth, BarHeight);
+	Graphics()->QuadsDrawTL(&QuadEmptyEnding, 1);
+	Graphics()->QuadsEnd();
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->WrapNormal();
+}
+
+inline bool CFreezeBars::IsPlayerInfoAvailable(int ClientID) const
+{
+	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientID);
+	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientID);
+	return pPrevInfo && pInfo;
+}
+
+void CFreezeBars::OnRender()
+{
+	if(!g_Config.m_ClShowFreezeBars)
+	{
+		return;
+	}
+	// get screen edges to avoid rendering offscreen
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	// expand the edges to prevent popping in/out onscreen
+	//
+	// it is assumed that the tee with the freeze bar fit into a 240x240 box centered on the tee
+	// this may need to be changed or calculated differently in the future
+	float BorderBuffer = 120;
+	ScreenX0 -= BorderBuffer;
+	ScreenX1 += BorderBuffer;
+	ScreenY0 -= BorderBuffer;
+	ScreenY1 += BorderBuffer;
+
+	int LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+
+	// render everyone else's freeze bar, then our own
+	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	{
+		if(ClientID == LocalClientID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		{
+			continue;
+		}
+
+		//don't render if the tee is offscreen
+		vec2 *pRenderPos = &m_pClient->m_aClients[ClientID].m_RenderPos;
+		if(pRenderPos->x < ScreenX0 || pRenderPos->x > ScreenX1 || pRenderPos->y < ScreenY0 || pRenderPos->y > ScreenY1)
+		{
+			continue;
+		}
+
+		RenderFreezeBar(ClientID);
+	}
+	if(LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientID].m_Active && IsPlayerInfoAvailable(LocalClientID))
+	{
+		RenderFreezeBar(LocalClientID);
+	}
+}
\ No newline at end of file
diff --git a/src_bkp/game/client/components/freezebars.h b/src_bkp/game/client/components/freezebars.h
new file mode 100644
index 0000000000..f0f76110d1
--- /dev/null
+++ b/src_bkp/game/client/components/freezebars.h
@@ -0,0 +1,16 @@
+#ifndef GAME_CLIENT_COMPONENTS_FREEZEBARS_H
+#define GAME_CLIENT_COMPONENTS_FREEZEBARS_H
+#include <game/client/component.h>
+
+class CFreezeBars : public CComponent
+{
+	void RenderFreezeBar(const int ClientID);
+	void RenderFreezeBarPos(float x, const float y, const float width, const float height, float Progress, float Alpha = 1.0f);
+	bool IsPlayerInfoAvailable(int ClientID) const;
+
+public:
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnRender() override;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/ghost.cpp b/src_bkp/game/client/components/ghost.cpp
new file mode 100644
index 0000000000..2a55688f15
--- /dev/null
+++ b/src_bkp/game/client/components/ghost.cpp
@@ -0,0 +1,715 @@
+/* (c) Rajh, Redix and Sushi. */
+
+#include <engine/ghost.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include <game/client/race.h>
+
+#include "ghost.h"
+#include "menus.h"
+#include "players.h"
+#include "skins.h"
+
+#include <game/client/gameclient.h>
+
+const char *CGhost::ms_pGhostDir = "ghosts";
+
+CGhost::CGhost() :
+	m_NewRenderTick(-1), m_StartRenderTick(-1), m_LastDeathTick(-1), m_LastRaceTick(-1), m_Recording(false), m_Rendering(false) {}
+
+void CGhost::GetGhostSkin(CGhostSkin *pSkin, const char *pSkinName, int UseCustomColor, int ColorBody, int ColorFeet)
+{
+	StrToInts(&pSkin->m_Skin0, 6, pSkinName);
+	pSkin->m_UseCustomColor = UseCustomColor;
+	pSkin->m_ColorBody = ColorBody;
+	pSkin->m_ColorFeet = ColorFeet;
+}
+
+void CGhost::GetGhostCharacter(CGhostCharacter *pGhostChar, const CNetObj_Character *pChar, const CNetObj_DDNetCharacter *pDDnetChar)
+{
+	pGhostChar->m_X = pChar->m_X;
+	pGhostChar->m_Y = pChar->m_Y;
+	pGhostChar->m_VelX = pChar->m_VelX;
+	pGhostChar->m_VelY = 0;
+	pGhostChar->m_Angle = pChar->m_Angle;
+	pGhostChar->m_Direction = pChar->m_Direction;
+	int Weapon = pChar->m_Weapon;
+	if(pDDnetChar != nullptr && pDDnetChar->m_FreezeEnd != 0)
+	{
+		Weapon = WEAPON_NINJA;
+	}
+	pGhostChar->m_Weapon = Weapon;
+	pGhostChar->m_HookState = pChar->m_HookState;
+	pGhostChar->m_HookX = pChar->m_HookX;
+	pGhostChar->m_HookY = pChar->m_HookY;
+	pGhostChar->m_AttackTick = pChar->m_AttackTick;
+	pGhostChar->m_Tick = pChar->m_Tick;
+}
+
+void CGhost::GetNetObjCharacter(CNetObj_Character *pChar, const CGhostCharacter *pGhostChar)
+{
+	mem_zero(pChar, sizeof(CNetObj_Character));
+	pChar->m_X = pGhostChar->m_X;
+	pChar->m_Y = pGhostChar->m_Y;
+	pChar->m_VelX = pGhostChar->m_VelX;
+	pChar->m_VelY = 0;
+	pChar->m_Angle = pGhostChar->m_Angle;
+	pChar->m_Direction = pGhostChar->m_Direction;
+	pChar->m_Weapon = pGhostChar->m_Weapon;
+	pChar->m_HookState = pGhostChar->m_HookState;
+	pChar->m_HookX = pGhostChar->m_HookX;
+	pChar->m_HookY = pGhostChar->m_HookY;
+	pChar->m_AttackTick = pGhostChar->m_AttackTick;
+	pChar->m_HookedPlayer = -1;
+	pChar->m_Tick = pGhostChar->m_Tick;
+}
+
+CGhost::CGhostPath::CGhostPath(CGhostPath &&Other) noexcept :
+	m_ChunkSize(Other.m_ChunkSize), m_NumItems(Other.m_NumItems), m_vpChunks(std::move(Other.m_vpChunks))
+{
+	Other.m_NumItems = 0;
+	Other.m_vpChunks.clear();
+}
+
+CGhost::CGhostPath &CGhost::CGhostPath::operator=(CGhostPath &&Other) noexcept
+{
+	Reset(Other.m_ChunkSize);
+	m_NumItems = Other.m_NumItems;
+	m_vpChunks = std::move(Other.m_vpChunks);
+	Other.m_NumItems = 0;
+	Other.m_vpChunks.clear();
+	return *this;
+}
+
+void CGhost::CGhostPath::Reset(int ChunkSize)
+{
+	for(auto &pChunk : m_vpChunks)
+		free(pChunk);
+	m_vpChunks.clear();
+	m_ChunkSize = ChunkSize;
+	m_NumItems = 0;
+}
+
+void CGhost::CGhostPath::SetSize(int Items)
+{
+	int Chunks = m_vpChunks.size();
+	int NeededChunks = (Items + m_ChunkSize - 1) / m_ChunkSize;
+
+	if(NeededChunks > Chunks)
+	{
+		m_vpChunks.resize(NeededChunks);
+		for(int i = Chunks; i < NeededChunks; i++)
+			m_vpChunks[i] = (CGhostCharacter *)calloc(m_ChunkSize, sizeof(CGhostCharacter));
+	}
+
+	m_NumItems = Items;
+}
+
+void CGhost::CGhostPath::Add(const CGhostCharacter &Char)
+{
+	SetSize(m_NumItems + 1);
+	*Get(m_NumItems - 1) = Char;
+}
+
+CGhostCharacter *CGhost::CGhostPath::Get(int Index)
+{
+	if(Index < 0 || Index >= m_NumItems)
+		return 0;
+
+	int Chunk = Index / m_ChunkSize;
+	int Pos = Index % m_ChunkSize;
+	return &m_vpChunks[Chunk][Pos];
+}
+
+void CGhost::GetPath(char *pBuf, int Size, const char *pPlayerName, int Time) const
+{
+	const char *pMap = Client()->GetCurrentMap();
+	SHA256_DIGEST Sha256 = Client()->GetCurrentMapSha256();
+	char aSha256[SHA256_MAXSTRSIZE];
+	sha256_str(Sha256, aSha256, sizeof(aSha256));
+
+	char aPlayerName[MAX_NAME_LENGTH];
+	str_copy(aPlayerName, pPlayerName);
+	str_sanitize_filename(aPlayerName);
+
+	char aTimestamp[32];
+	str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_NOSPACE);
+
+	if(Time < 0)
+		str_format(pBuf, Size, "%s/%s_%s_%s_tmp_%d.gho", ms_pGhostDir, pMap, aPlayerName, aSha256, pid());
+	else
+		str_format(pBuf, Size, "%s/%s_%s_%d.%03d_%s_%s.gho", ms_pGhostDir, pMap, aPlayerName, Time / 1000, Time % 1000, aTimestamp, aSha256);
+}
+
+void CGhost::AddInfos(const CNetObj_Character *pChar, const CNetObj_DDNetCharacter *pDDnetChar)
+{
+	int NumTicks = m_CurGhost.m_Path.Size();
+
+	// do not start writing to file as long as we still touch the start line
+	if(g_Config.m_ClRaceSaveGhost && !GhostRecorder()->IsRecording() && NumTicks > 0)
+	{
+		GetPath(m_aTmpFilename, sizeof(m_aTmpFilename), m_CurGhost.m_aPlayer);
+		GhostRecorder()->Start(m_aTmpFilename, Client()->GetCurrentMap(), Client()->GetCurrentMapSha256(), m_CurGhost.m_aPlayer);
+
+		GhostRecorder()->WriteData(GHOSTDATA_TYPE_START_TICK, &m_CurGhost.m_StartTick, sizeof(int));
+		GhostRecorder()->WriteData(GHOSTDATA_TYPE_SKIN, &m_CurGhost.m_Skin, sizeof(CGhostSkin));
+		for(int i = 0; i < NumTicks; i++)
+			GhostRecorder()->WriteData(GHOSTDATA_TYPE_CHARACTER, m_CurGhost.m_Path.Get(i), sizeof(CGhostCharacter));
+	}
+
+	CGhostCharacter GhostChar;
+	GetGhostCharacter(&GhostChar, pChar, pDDnetChar);
+	m_CurGhost.m_Path.Add(GhostChar);
+	if(GhostRecorder()->IsRecording())
+		GhostRecorder()->WriteData(GHOSTDATA_TYPE_CHARACTER, &GhostChar, sizeof(CGhostCharacter));
+}
+
+int CGhost::GetSlot() const
+{
+	for(int i = 0; i < MAX_ACTIVE_GHOSTS; i++)
+		if(m_aActiveGhosts[i].Empty())
+			return i;
+	return -1;
+}
+
+int CGhost::FreeSlots() const
+{
+	int Num = 0;
+	for(const auto &ActiveGhost : m_aActiveGhosts)
+		if(ActiveGhost.Empty())
+			Num++;
+	return Num;
+}
+
+void CGhost::CheckStart()
+{
+	int RaceTick = -m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer;
+	int RenderTick = m_NewRenderTick;
+
+	if(m_LastRaceTick != RaceTick && Client()->GameTick(g_Config.m_ClDummy) - RaceTick < Client()->GameTickSpeed())
+	{
+		if(m_Rendering && m_RenderingStartedByServer) // race restarted: stop rendering
+			StopRender();
+		if(m_Recording && m_LastRaceTick != -1) // race restarted: activate restarting for local start detection so we have a smooth transition
+			m_AllowRestart = true;
+		if(m_LastRaceTick == -1) // no restart: reset rendering preparations
+			m_NewRenderTick = -1;
+		if(GhostRecorder()->IsRecording()) // race restarted: stop recording
+			GhostRecorder()->Stop(0, -1);
+		int StartTick = RaceTick;
+
+		if(GameClient()->m_GameInfo.m_BugDDRaceGhost) // the client recognizes the start one tick earlier than ddrace servers
+			StartTick--;
+		StartRecord(StartTick);
+		RenderTick = StartTick;
+	}
+
+	TryRenderStart(RenderTick, true);
+}
+
+void CGhost::CheckStartLocal(bool Predicted)
+{
+	if(Predicted) // rendering
+	{
+		int RenderTick = m_NewRenderTick;
+
+		vec2 PrevPos = m_pClient->m_PredictedPrevChar.m_Pos;
+		vec2 Pos = m_pClient->m_PredictedChar.m_Pos;
+		if(((!m_Rendering && RenderTick == -1) || m_AllowRestart) && CRaceHelper::IsStart(m_pClient, PrevPos, Pos))
+		{
+			if(m_Rendering && !m_RenderingStartedByServer) // race restarted: stop rendering
+				StopRender();
+			RenderTick = Client()->PredGameTick(g_Config.m_ClDummy);
+		}
+
+		TryRenderStart(RenderTick, false);
+	}
+	else // recording
+	{
+		int PrevTick = m_pClient->m_Snap.m_pLocalPrevCharacter->m_Tick;
+		int CurTick = m_pClient->m_Snap.m_pLocalCharacter->m_Tick;
+		vec2 PrevPos = vec2(m_pClient->m_Snap.m_pLocalPrevCharacter->m_X, m_pClient->m_Snap.m_pLocalPrevCharacter->m_Y);
+		vec2 Pos = vec2(m_pClient->m_Snap.m_pLocalCharacter->m_X, m_pClient->m_Snap.m_pLocalCharacter->m_Y);
+
+		// detecting death, needed because race allows immediate respawning
+		if((!m_Recording || m_AllowRestart) && m_LastDeathTick < PrevTick)
+		{
+			// estimate the exact start tick
+			int RecordTick = -1;
+			int TickDiff = CurTick - PrevTick;
+			for(int i = 0; i < TickDiff; i++)
+			{
+				if(CRaceHelper::IsStart(m_pClient, mix(PrevPos, Pos, (float)i / TickDiff), mix(PrevPos, Pos, (float)(i + 1) / TickDiff)))
+				{
+					RecordTick = PrevTick + i + 1;
+					if(!m_AllowRestart)
+						break;
+				}
+			}
+			if(RecordTick != -1)
+			{
+				if(GhostRecorder()->IsRecording()) // race restarted: stop recording
+					GhostRecorder()->Stop(0, -1);
+				StartRecord(RecordTick);
+			}
+		}
+	}
+}
+
+void CGhost::TryRenderStart(int Tick, bool ServerControl)
+{
+	// only restart rendering if it did not change since last tick to prevent stuttering
+	if(m_NewRenderTick != -1 && m_NewRenderTick == Tick)
+	{
+		StartRender(Tick);
+		Tick = -1;
+		m_RenderingStartedByServer = ServerControl;
+	}
+	m_NewRenderTick = Tick;
+}
+
+void CGhost::OnNewSnapshot()
+{
+	if(!GameClient()->m_GameInfo.m_Race || Client()->State() != IClient::STATE_ONLINE)
+		return;
+	if(!m_pClient->m_Snap.m_pGameInfoObj || m_pClient->m_Snap.m_SpecInfo.m_Active || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
+		return;
+
+	bool RaceFlag = m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_RACETIME;
+	bool ServerControl = RaceFlag && g_Config.m_ClRaceGhostServerControl;
+
+	if(g_Config.m_ClRaceGhost)
+	{
+		if(!ServerControl)
+			CheckStartLocal(false);
+		else
+			CheckStart();
+
+		if(m_Recording)
+			AddInfos(m_pClient->m_Snap.m_pLocalCharacter, (m_pClient->m_Snap.m_LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData) ? &m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_ExtendedData : nullptr);
+	}
+
+	// Record m_LastRaceTick for g_Config.m_ClConfirmDisconnect/QuitTime anyway
+	int RaceTick = -m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer;
+	m_LastRaceTick = RaceFlag ? RaceTick : -1;
+}
+
+void CGhost::OnNewPredictedSnapshot()
+{
+	if(!GameClient()->m_GameInfo.m_Race || !g_Config.m_ClRaceGhost || Client()->State() != IClient::STATE_ONLINE)
+		return;
+	if(!m_pClient->m_Snap.m_pGameInfoObj || m_pClient->m_Snap.m_SpecInfo.m_Active || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
+		return;
+
+	bool RaceFlag = m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_RACETIME;
+	bool ServerControl = RaceFlag && g_Config.m_ClRaceGhostServerControl;
+
+	if(!ServerControl)
+		CheckStartLocal(true);
+}
+
+void CGhost::OnRender()
+{
+	// Play the ghost
+	if(!m_Rendering || !g_Config.m_ClRaceShowGhost)
+		return;
+
+	int PlaybackTick = Client()->PredGameTick(g_Config.m_ClDummy) - m_StartRenderTick;
+
+	for(auto &Ghost : m_aActiveGhosts)
+	{
+		if(Ghost.Empty())
+			continue;
+
+		int GhostTick = Ghost.m_StartTick + PlaybackTick;
+		while(Ghost.m_PlaybackPos >= 0 && Ghost.m_Path.Get(Ghost.m_PlaybackPos)->m_Tick < GhostTick)
+		{
+			if(Ghost.m_PlaybackPos < Ghost.m_Path.Size() - 1)
+				Ghost.m_PlaybackPos++;
+			else
+				Ghost.m_PlaybackPos = -1;
+		}
+
+		if(Ghost.m_PlaybackPos < 0)
+			continue;
+
+		int CurPos = Ghost.m_PlaybackPos;
+		int PrevPos = maximum(0, CurPos - 1);
+		if(Ghost.m_Path.Get(PrevPos)->m_Tick > GhostTick)
+			continue;
+
+		CNetObj_Character Player, Prev;
+		GetNetObjCharacter(&Player, Ghost.m_Path.Get(CurPos));
+		GetNetObjCharacter(&Prev, Ghost.m_Path.Get(PrevPos));
+
+		int TickDiff = Player.m_Tick - Prev.m_Tick;
+		float IntraTick = 0.f;
+		if(TickDiff > 0)
+			IntraTick = (GhostTick - Prev.m_Tick - 1 + Client()->PredIntraGameTick(g_Config.m_ClDummy)) / TickDiff;
+
+		Player.m_AttackTick += Client()->GameTick(g_Config.m_ClDummy) - GhostTick;
+
+		CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
+		CTeeRenderInfo GhostNinjaRenderInfo;
+		if(Player.m_Weapon == WEAPON_NINJA && g_Config.m_ClShowNinja)
+		{
+			// change the skin for the ghost to the ninja
+			const auto *pSkin = m_pClient->m_Skins.FindOrNullptr("x_ninja");
+			if(pSkin != nullptr)
+			{
+				bool IsTeamplay = false;
+				if(m_pClient->m_Snap.m_pGameInfoObj)
+					IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;
+
+				GhostNinjaRenderInfo = Ghost.m_RenderInfo;
+				GhostNinjaRenderInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+				GhostNinjaRenderInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+				GhostNinjaRenderInfo.m_BloodColor = pSkin->m_BloodColor;
+				GhostNinjaRenderInfo.m_SkinMetrics = pSkin->m_Metrics;
+				GhostNinjaRenderInfo.m_CustomColoredSkin = IsTeamplay;
+				if(!IsTeamplay)
+				{
+					GhostNinjaRenderInfo.m_ColorBody = ColorRGBA(1, 1, 1);
+					GhostNinjaRenderInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
+				}
+				pRenderInfo = &GhostNinjaRenderInfo;
+			}
+		}
+
+		m_pClient->m_Players.RenderHook(&Prev, &Player, pRenderInfo, -2, IntraTick);
+		m_pClient->m_Players.RenderHookCollLine(&Prev, &Player, -2, IntraTick);
+		m_pClient->m_Players.RenderPlayer(&Prev, &Player, pRenderInfo, -2, IntraTick);
+	}
+}
+
+void CGhost::InitRenderInfos(CGhostItem *pGhost)
+{
+	char aSkinName[64];
+	IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName);
+	CTeeRenderInfo *pRenderInfo = &pGhost->m_RenderInfo;
+
+	const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
+	pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
+	pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
+	pRenderInfo->m_CustomColoredSkin = pGhost->m_Skin.m_UseCustomColor;
+	if(pGhost->m_Skin.m_UseCustomColor)
+	{
+		pRenderInfo->m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorBody).UnclampLighting());
+		pRenderInfo->m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pGhost->m_Skin.m_ColorFeet).UnclampLighting());
+	}
+	else
+	{
+		pRenderInfo->m_ColorBody = ColorRGBA(1, 1, 1);
+		pRenderInfo->m_ColorFeet = ColorRGBA(1, 1, 1);
+	}
+
+	pRenderInfo->m_Size = 64;
+}
+
+void CGhost::StartRecord(int Tick)
+{
+	m_Recording = true;
+	m_CurGhost.Reset();
+	m_CurGhost.m_StartTick = Tick;
+
+	const CGameClient::CClientData *pData = &m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID];
+	str_copy(m_CurGhost.m_aPlayer, Client()->PlayerName());
+	GetGhostSkin(&m_CurGhost.m_Skin, pData->m_aSkinName, pData->m_UseCustomColor, pData->m_ColorBody, pData->m_ColorFeet);
+	InitRenderInfos(&m_CurGhost);
+}
+
+void CGhost::StopRecord(int Time)
+{
+	m_Recording = false;
+	bool RecordingToFile = GhostRecorder()->IsRecording();
+
+	if(RecordingToFile)
+		GhostRecorder()->Stop(m_CurGhost.m_Path.Size(), Time);
+
+	CMenus::CGhostItem *pOwnGhost = m_pClient->m_Menus.GetOwnGhost();
+	if(Time > 0 && (!pOwnGhost || Time < pOwnGhost->m_Time || !g_Config.m_ClRaceGhostSaveBest))
+	{
+		// add to active ghosts
+		int Slot = GetSlot();
+		if(Slot != -1 && (!pOwnGhost || Time < pOwnGhost->m_Time))
+			m_aActiveGhosts[Slot] = std::move(m_CurGhost);
+
+		if(pOwnGhost && pOwnGhost->Active() && Time < pOwnGhost->m_Time)
+			Unload(pOwnGhost->m_Slot);
+
+		// create ghost item
+		CMenus::CGhostItem Item;
+		if(RecordingToFile)
+			GetPath(Item.m_aFilename, sizeof(Item.m_aFilename), m_CurGhost.m_aPlayer, Time);
+		str_copy(Item.m_aPlayer, m_CurGhost.m_aPlayer);
+		Item.m_Time = Time;
+		Item.m_Slot = Slot;
+
+		// save new ghost file
+		if(Item.HasFile())
+			Storage()->RenameFile(m_aTmpFilename, Item.m_aFilename, IStorage::TYPE_SAVE);
+
+		// add item to menu list
+		m_pClient->m_Menus.UpdateOwnGhost(Item);
+	}
+	else if(RecordingToFile) // no new record
+		Storage()->RemoveFile(m_aTmpFilename, IStorage::TYPE_SAVE);
+
+	m_aTmpFilename[0] = 0;
+
+	m_CurGhost.Reset();
+}
+
+void CGhost::StartRender(int Tick)
+{
+	m_Rendering = true;
+	m_StartRenderTick = Tick;
+	for(auto &Ghost : m_aActiveGhosts)
+		Ghost.m_PlaybackPos = 0;
+}
+
+void CGhost::StopRender()
+{
+	m_Rendering = false;
+	m_NewRenderTick = -1;
+}
+
+int CGhost::Load(const char *pFilename)
+{
+	int Slot = GetSlot();
+	if(Slot == -1)
+		return -1;
+
+	if(GhostLoader()->Load(pFilename, Client()->GetCurrentMap(), Client()->GetCurrentMapSha256(), Client()->GetCurrentMapCrc()) != 0)
+		return -1;
+
+	const CGhostInfo *pInfo = GhostLoader()->GetInfo();
+
+	if(pInfo->m_NumTicks <= 0 || pInfo->m_Time <= 0)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost", "invalid header info");
+		GhostLoader()->Close();
+		return -1;
+	}
+
+	// select ghost
+	CGhostItem *pGhost = &m_aActiveGhosts[Slot];
+	pGhost->Reset();
+	pGhost->m_Path.SetSize(pInfo->m_NumTicks);
+
+	str_copy(pGhost->m_aPlayer, pInfo->m_aOwner);
+
+	int Index = 0;
+	bool FoundSkin = false;
+	bool NoTick = false;
+	bool Error = false;
+
+	int Type;
+	while(!Error && GhostLoader()->ReadNextType(&Type))
+	{
+		if(Index == pInfo->m_NumTicks && (Type == GHOSTDATA_TYPE_CHARACTER || Type == GHOSTDATA_TYPE_CHARACTER_NO_TICK))
+		{
+			Error = true;
+			break;
+		}
+
+		if(Type == GHOSTDATA_TYPE_SKIN && !FoundSkin)
+		{
+			FoundSkin = true;
+			if(!GhostLoader()->ReadData(Type, &pGhost->m_Skin, sizeof(CGhostSkin)))
+				Error = true;
+		}
+		else if(Type == GHOSTDATA_TYPE_CHARACTER_NO_TICK)
+		{
+			NoTick = true;
+			if(!GhostLoader()->ReadData(Type, pGhost->m_Path.Get(Index++), sizeof(CGhostCharacter_NoTick)))
+				Error = true;
+		}
+		else if(Type == GHOSTDATA_TYPE_CHARACTER)
+		{
+			if(!GhostLoader()->ReadData(Type, pGhost->m_Path.Get(Index++), sizeof(CGhostCharacter)))
+				Error = true;
+		}
+		else if(Type == GHOSTDATA_TYPE_START_TICK)
+		{
+			if(!GhostLoader()->ReadData(Type, &pGhost->m_StartTick, sizeof(int)))
+				Error = true;
+		}
+	}
+
+	GhostLoader()->Close();
+
+	if(Error || Index != pInfo->m_NumTicks)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "ghost", "invalid ghost data");
+		pGhost->Reset();
+		return -1;
+	}
+
+	if(NoTick)
+	{
+		int StartTick = 0;
+		for(int i = 1; i < pInfo->m_NumTicks; i++) // estimate start tick
+			if(pGhost->m_Path.Get(i)->m_AttackTick != pGhost->m_Path.Get(i - 1)->m_AttackTick)
+				StartTick = pGhost->m_Path.Get(i)->m_AttackTick - i;
+		for(int i = 0; i < pInfo->m_NumTicks; i++)
+			pGhost->m_Path.Get(i)->m_Tick = StartTick + i;
+	}
+
+	if(pGhost->m_StartTick == -1)
+		pGhost->m_StartTick = pGhost->m_Path.Get(0)->m_Tick;
+
+	if(!FoundSkin)
+		GetGhostSkin(&pGhost->m_Skin, "default", 0, 0, 0);
+	InitRenderInfos(pGhost);
+
+	return Slot;
+}
+
+void CGhost::Unload(int Slot)
+{
+	m_aActiveGhosts[Slot].Reset();
+}
+
+void CGhost::UnloadAll()
+{
+	for(int i = 0; i < MAX_ACTIVE_GHOSTS; i++)
+		Unload(i);
+}
+
+void CGhost::SaveGhost(CMenus::CGhostItem *pItem)
+{
+	int Slot = pItem->m_Slot;
+	if(!pItem->Active() || pItem->HasFile() || m_aActiveGhosts[Slot].Empty() || GhostRecorder()->IsRecording())
+		return;
+
+	CGhostItem *pGhost = &m_aActiveGhosts[Slot];
+
+	int NumTicks = pGhost->m_Path.Size();
+	GetPath(pItem->m_aFilename, sizeof(pItem->m_aFilename), pItem->m_aPlayer, pItem->m_Time);
+	GhostRecorder()->Start(pItem->m_aFilename, Client()->GetCurrentMap(), Client()->GetCurrentMapSha256(), pItem->m_aPlayer);
+
+	GhostRecorder()->WriteData(GHOSTDATA_TYPE_START_TICK, &pGhost->m_StartTick, sizeof(int));
+	GhostRecorder()->WriteData(GHOSTDATA_TYPE_SKIN, &pGhost->m_Skin, sizeof(CGhostSkin));
+	for(int i = 0; i < NumTicks; i++)
+		GhostRecorder()->WriteData(GHOSTDATA_TYPE_CHARACTER, pGhost->m_Path.Get(i), sizeof(CGhostCharacter));
+
+	GhostRecorder()->Stop(NumTicks, pItem->m_Time);
+}
+
+void CGhost::ConGPlay(IConsole::IResult *pResult, void *pUserData)
+{
+	CGhost *pGhost = (CGhost *)pUserData;
+	pGhost->StartRender(pGhost->Client()->PredGameTick(g_Config.m_ClDummy));
+}
+
+void CGhost::OnConsoleInit()
+{
+	m_pGhostLoader = Kernel()->RequestInterface<IGhostLoader>();
+	m_pGhostRecorder = Kernel()->RequestInterface<IGhostRecorder>();
+
+	Console()->Register("gplay", "", CFGFLAG_CLIENT, ConGPlay, this, "Start playback of ghosts");
+}
+
+void CGhost::OnMessage(int MsgType, void *pRawMsg)
+{
+	// check for messages from server
+	if(MsgType == NETMSGTYPE_SV_KILLMSG)
+	{
+		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
+		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientID)
+		{
+			if(m_Recording)
+				StopRecord();
+			StopRender();
+			m_LastDeathTick = Client()->GameTick(g_Config.m_ClDummy);
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM)
+	{
+		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientID)
+			{
+				if(m_Recording)
+					StopRecord();
+				StopRender();
+				m_LastDeathTick = Client()->GameTick(g_Config.m_ClDummy);
+			}
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_CHAT)
+	{
+		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+		if(pMsg->m_ClientID == -1 && m_Recording)
+		{
+			char aName[MAX_NAME_LENGTH];
+			int Time = CRaceHelper::TimeFromFinishMessage(pMsg->m_pMessage, aName, sizeof(aName));
+			if(Time > 0 && m_pClient->m_Snap.m_LocalClientID >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName) == 0)
+			{
+				StopRecord(Time);
+				StopRender();
+			}
+		}
+	}
+}
+
+void CGhost::OnReset()
+{
+	StopRecord();
+	StopRender();
+	m_LastDeathTick = -1;
+	m_LastRaceTick = -1;
+}
+
+void CGhost::OnShutdown()
+{
+	OnReset();
+}
+
+void CGhost::OnMapLoad()
+{
+	OnReset();
+	UnloadAll();
+	m_pClient->m_Menus.GhostlistPopulate();
+	m_AllowRestart = false;
+}
+
+int CGhost::GetLastRaceTick() const
+{
+	return m_LastRaceTick;
+}
+
+void CGhost::RefindSkins()
+{
+	const auto &&RefindSkin = [&](auto &Ghost) {
+		if(Ghost.Empty())
+			return;
+		char aSkinName[64];
+		IntsToStr(&Ghost.m_Skin.m_Skin0, 6, aSkinName);
+		CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
+		if(aSkinName[0] != '\0')
+		{
+			const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
+			pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+			pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
+			pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
+		}
+		else
+		{
+			pRenderInfo->m_OriginalRenderSkin.Reset();
+			pRenderInfo->m_ColorableRenderSkin.Reset();
+		}
+	};
+
+	for(auto &Ghost : m_aActiveGhosts)
+	{
+		RefindSkin(Ghost);
+	}
+	RefindSkin(m_CurGhost);
+}
diff --git a/src_bkp/game/client/components/ghost.h b/src_bkp/game/client/components/ghost.h
new file mode 100644
index 0000000000..c7582523e8
--- /dev/null
+++ b/src_bkp/game/client/components/ghost.h
@@ -0,0 +1,182 @@
+/* (c) Rajh, Redix and Sushi. */
+
+#ifndef GAME_CLIENT_COMPONENTS_GHOST_H
+#define GAME_CLIENT_COMPONENTS_GHOST_H
+
+#include <game/client/component.h>
+#include <game/client/components/menus.h>
+#include <game/generated/protocol.h>
+
+#include <game/client/render.h>
+
+struct CNetObj_Character;
+
+enum
+{
+	GHOSTDATA_TYPE_SKIN = 0,
+	GHOSTDATA_TYPE_CHARACTER_NO_TICK,
+	GHOSTDATA_TYPE_CHARACTER,
+	GHOSTDATA_TYPE_START_TICK
+};
+
+struct CGhostSkin
+{
+	int m_Skin0;
+	int m_Skin1;
+	int m_Skin2;
+	int m_Skin3;
+	int m_Skin4;
+	int m_Skin5;
+	int m_UseCustomColor;
+	int m_ColorBody;
+	int m_ColorFeet;
+};
+
+struct CGhostCharacter_NoTick
+{
+	int m_X;
+	int m_Y;
+	int m_VelX;
+	int m_VelY;
+	int m_Angle;
+	int m_Direction;
+	int m_Weapon;
+	int m_HookState;
+	int m_HookX;
+	int m_HookY;
+	int m_AttackTick;
+};
+
+struct CGhostCharacter : public CGhostCharacter_NoTick
+{
+	int m_Tick;
+};
+
+class CGhost : public CComponent
+{
+private:
+	enum
+	{
+		MAX_ACTIVE_GHOSTS = 256,
+	};
+
+	class CGhostPath
+	{
+		int m_ChunkSize;
+		int m_NumItems;
+
+		std::vector<CGhostCharacter *> m_vpChunks;
+
+	public:
+		CGhostPath() { Reset(); }
+		~CGhostPath() { Reset(); }
+		CGhostPath(const CGhostPath &Other) = delete;
+		CGhostPath &operator=(const CGhostPath &Other) = delete;
+
+		CGhostPath(CGhostPath &&Other) noexcept;
+		CGhostPath &operator=(CGhostPath &&Other) noexcept;
+
+		void Reset(int ChunkSize = 25 * 60); // one minute with default snap rate
+		void SetSize(int Items);
+		int Size() const { return m_NumItems; }
+
+		void Add(const CGhostCharacter &Char);
+		CGhostCharacter *Get(int Index);
+	};
+
+	class CGhostItem
+	{
+	public:
+		CTeeRenderInfo m_RenderInfo;
+		CGhostSkin m_Skin;
+		CGhostPath m_Path;
+		int m_StartTick;
+		char m_aPlayer[MAX_NAME_LENGTH];
+		int m_PlaybackPos;
+
+		CGhostItem() { Reset(); }
+
+		bool Empty() const { return m_Path.Size() == 0; }
+		void Reset()
+		{
+			m_Path.Reset();
+			m_StartTick = -1;
+			m_PlaybackPos = -1;
+		}
+	};
+
+	static const char *ms_pGhostDir;
+
+	class IGhostLoader *m_pGhostLoader;
+	class IGhostRecorder *m_pGhostRecorder;
+
+	CGhostItem m_aActiveGhosts[MAX_ACTIVE_GHOSTS];
+	CGhostItem m_CurGhost;
+
+	char m_aTmpFilename[128];
+
+	int m_NewRenderTick;
+	int m_StartRenderTick;
+	int m_LastDeathTick;
+	int m_LastRaceTick;
+	bool m_Recording;
+	bool m_Rendering;
+
+	bool m_RenderingStartedByServer;
+
+	static void GetGhostSkin(CGhostSkin *pSkin, const char *pSkinName, int UseCustomColor, int ColorBody, int ColorFeet);
+	static void GetGhostCharacter(CGhostCharacter *pGhostChar, const CNetObj_Character *pChar, const CNetObj_DDNetCharacter *pDDnetChar);
+	static void GetNetObjCharacter(CNetObj_Character *pChar, const CGhostCharacter *pGhostChar);
+
+	void GetPath(char *pBuf, int Size, const char *pPlayerName, int Time = -1) const;
+
+	void AddInfos(const CNetObj_Character *pChar, const CNetObj_DDNetCharacter *pDDnetChar);
+	int GetSlot() const;
+
+	void CheckStart();
+	void CheckStartLocal(bool Predicted);
+	void TryRenderStart(int Tick, bool ServerControl);
+
+	void StartRecord(int Tick);
+	void StopRecord(int Time = -1);
+	void StartRender(int Tick);
+	void StopRender();
+
+	void InitRenderInfos(CGhostItem *pGhost);
+
+	static void ConGPlay(IConsole::IResult *pResult, void *pUserData);
+
+public:
+	bool m_AllowRestart;
+
+	CGhost();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnRender() override;
+	virtual void OnConsoleInit() override;
+	virtual void OnReset() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual void OnMapLoad() override;
+	virtual void OnShutdown() override;
+	virtual void OnNewSnapshot() override;
+
+	void OnNewPredictedSnapshot();
+
+	int FreeSlots() const;
+	int Load(const char *pFilename);
+	void Unload(int Slot);
+	void UnloadAll();
+
+	void SaveGhost(CMenus::CGhostItem *pItem);
+
+	const char *GetGhostDir() const { return ms_pGhostDir; }
+
+	class IGhostLoader *GhostLoader() const { return m_pGhostLoader; }
+	class IGhostRecorder *GhostRecorder() const { return m_pGhostRecorder; }
+
+	int GetLastRaceTick() const;
+
+	void RefindSkins();
+};
+
+#endif
diff --git a/src_bkp/game/client/components/hud.cpp b/src_bkp/game/client/components/hud.cpp
new file mode 100644
index 0000000000..4b4648f71b
--- /dev/null
+++ b/src_bkp/game/client/components/hud.cpp
@@ -0,0 +1,1795 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/scoreboard.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include <game/layers.h>
+#include <game/localization.h>
+
+#include <cmath>
+
+#include "binds.h"
+#include "camera.h"
+#include "controls.h"
+#include "hud.h"
+#include "voting.h"
+
+CHud::CHud()
+{
+	// won't work if zero
+	m_FrameTimeAvg = 0.0f;
+	m_FPSTextContainerIndex.Reset();
+	m_DDRaceEffectsTextContainerIndex.Reset();
+}
+
+void CHud::ResetHudContainers()
+{
+	for(auto &ScoreInfo : m_aScoreInfo)
+	{
+		TextRender()->DeleteTextContainer(ScoreInfo.m_OptionalNameTextContainerIndex);
+		TextRender()->DeleteTextContainer(ScoreInfo.m_TextRankContainerIndex);
+		TextRender()->DeleteTextContainer(ScoreInfo.m_TextScoreContainerIndex);
+		Graphics()->DeleteQuadContainer(ScoreInfo.m_RoundRectQuadContainerIndex);
+
+		ScoreInfo.Reset();
+	}
+
+	TextRender()->DeleteTextContainer(m_FPSTextContainerIndex);
+	TextRender()->DeleteTextContainer(m_DDRaceEffectsTextContainerIndex);
+}
+
+void CHud::OnWindowResize()
+{
+	ResetHudContainers();
+}
+
+void CHud::OnReset()
+{
+	m_TimeCpDiff = 0.0f;
+	m_DDRaceTime = 0;
+	m_FinishTimeLastReceivedTick = 0;
+	m_TimeCpLastReceivedTick = 0;
+	m_ShowFinishTime = false;
+	m_ServerRecord = -1.0f;
+	m_aPlayerRecord[0] = -1.0f;
+	m_aPlayerRecord[1] = -1.0f;
+
+	ResetHudContainers();
+}
+
+void CHud::OnInit()
+{
+	OnReset();
+
+	m_HudQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	PrepareAmmoHealthAndArmorQuads();
+
+	// all cursors for the different weapons
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		float ScaleX, ScaleY;
+		RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_pSpriteCursor, ScaleX, ScaleY);
+		m_aCursorOffset[i] = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 64.f * ScaleX, 64.f * ScaleY);
+	}
+
+	// the flags
+	m_FlagOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 8.f, 16.f);
+
+	PreparePlayerStateQuads();
+
+	Graphics()->QuadContainerUpload(m_HudQuadContainerIndex);
+}
+
+void CHud::RenderGameTimer()
+{
+	float Half = m_Width / 2.0f;
+
+	if(!(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_SUDDENDEATH))
+	{
+		char aBuf[32];
+		int Time = 0;
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit && (m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer <= 0))
+		{
+			Time = m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit * 60 - ((Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / Client()->GameTickSpeed());
+
+			if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
+				Time = 0;
+		}
+		else if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_RACETIME)
+		{
+			// The Warmup timer is negative in this case to make sure that incompatible clients will not see a warmup timer
+			Time = (Client()->GameTick(g_Config.m_ClDummy) + m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer) / Client()->GameTickSpeed();
+		}
+		else
+			Time = (Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / Client()->GameTickSpeed();
+
+		str_time((int64_t)Time * 100, TIME_DAYS, aBuf, sizeof(aBuf));
+		float FontSize = 10.0f;
+		static float s_TextWidthM = TextRender()->TextWidth(FontSize, "00:00", -1, -1.0f);
+		static float s_TextWidthH = TextRender()->TextWidth(FontSize, "00:00:00", -1, -1.0f);
+		static float s_TextWidth0D = TextRender()->TextWidth(FontSize, "0d 00:00:00", -1, -1.0f);
+		static float s_TextWidth00D = TextRender()->TextWidth(FontSize, "00d 00:00:00", -1, -1.0f);
+		static float s_TextWidth000D = TextRender()->TextWidth(FontSize, "000d 00:00:00", -1, -1.0f);
+		float w = Time >= 3600 * 24 * 100 ? s_TextWidth000D : Time >= 3600 * 24 * 10 ? s_TextWidth00D : Time >= 3600 * 24 ? s_TextWidth0D : Time >= 3600 ? s_TextWidthH : s_TextWidthM;
+		// last 60 sec red, last 10 sec blink
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit && Time <= 60 && (m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer <= 0))
+		{
+			float Alpha = Time <= 10 && (2 * time() / time_freq()) % 2 ? 0.5f : 1.0f;
+			TextRender()->TextColor(1.0f, 0.25f, 0.25f, Alpha);
+		}
+		TextRender()->Text(Half - w / 2, 2, FontSize, aBuf, -1.0f);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+}
+
+void CHud::RenderPauseNotification()
+{
+	if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED &&
+		!(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+	{
+		const char *pText = Localize("Game paused");
+		float FontSize = 20.0f;
+		float w = TextRender()->TextWidth(FontSize, pText, -1, -1.0f);
+		TextRender()->Text(150.0f * Graphics()->ScreenAspect() + -w / 2.0f, 50.0f, FontSize, pText, -1.0f);
+	}
+}
+
+void CHud::RenderSuddenDeath()
+{
+	if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_SUDDENDEATH)
+	{
+		float Half = m_Width / 2.0f;
+		const char *pText = Localize("Sudden Death");
+		float FontSize = 12.0f;
+		float w = TextRender()->TextWidth(FontSize, pText, -1, -1.0f);
+		TextRender()->Text(Half - w / 2, 2, FontSize, pText, -1.0f);
+	}
+}
+
+void CHud::RenderScoreHud()
+{
+	// render small score hud
+	if(!(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+	{
+		int GameFlags = m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags;
+		float StartY = 229.0f; // the height of this display is 56, so EndY is 285
+
+		const float ScoreSingleBoxHeight = 18.0f;
+
+		bool ForceScoreInfoInit = !m_aScoreInfo[0].m_Initialized || !m_aScoreInfo[1].m_Initialized;
+		m_aScoreInfo[0].m_Initialized = m_aScoreInfo[1].m_Initialized = true;
+
+		if(GameFlags & GAMEFLAG_TEAMS && m_pClient->m_Snap.m_pGameDataObj)
+		{
+			char aScoreTeam[2][16];
+			str_from_int(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed, aScoreTeam[TEAM_RED]);
+			str_from_int(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue, aScoreTeam[TEAM_BLUE]);
+
+			bool aRecreateTeamScore[2] = {str_comp(aScoreTeam[0], m_aScoreInfo[0].m_aScoreText) != 0, str_comp(aScoreTeam[1], m_aScoreInfo[1].m_aScoreText) != 0};
+
+			const int aFlagCarrier[2] = {
+				m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed,
+				m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue};
+
+			bool RecreateRect = ForceScoreInfoInit;
+			for(int t = 0; t < 2; t++)
+			{
+				if(aRecreateTeamScore[t])
+				{
+					m_aScoreInfo[t].m_ScoreTextWidth = TextRender()->TextWidth(14.0f, aScoreTeam[t == 0 ? TEAM_RED : TEAM_BLUE], -1, -1.0f);
+					mem_copy(m_aScoreInfo[t].m_aScoreText, aScoreTeam[t == 0 ? TEAM_RED : TEAM_BLUE], sizeof(m_aScoreInfo[t].m_aScoreText));
+					RecreateRect = true;
+				}
+			}
+
+			static float s_TextWidth100 = TextRender()->TextWidth(14.0f, "100", -1, -1.0f);
+			float ScoreWidthMax = maximum(maximum(m_aScoreInfo[0].m_ScoreTextWidth, m_aScoreInfo[1].m_ScoreTextWidth), s_TextWidth100);
+			float Split = 3.0f;
+			float ImageSize = (GameFlags & GAMEFLAG_FLAGS) ? 16.0f : Split;
+			for(int t = 0; t < 2; t++)
+			{
+				// draw box
+				if(RecreateRect)
+				{
+					Graphics()->DeleteQuadContainer(m_aScoreInfo[t].m_RoundRectQuadContainerIndex);
+
+					if(t == 0)
+						Graphics()->SetColor(1.0f, 0.0f, 0.0f, 0.25f);
+					else
+						Graphics()->SetColor(0.0f, 0.0f, 1.0f, 0.25f);
+					m_aScoreInfo[t].m_RoundRectQuadContainerIndex = Graphics()->CreateRectQuadContainer(m_Width - ScoreWidthMax - ImageSize - 2 * Split, StartY + t * 20, ScoreWidthMax + ImageSize + 2 * Split, ScoreSingleBoxHeight, 5.0f, IGraphics::CORNER_L);
+				}
+				Graphics()->TextureClear();
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+				if(m_aScoreInfo[t].m_RoundRectQuadContainerIndex != -1)
+					Graphics()->RenderQuadContainer(m_aScoreInfo[t].m_RoundRectQuadContainerIndex, -1);
+
+				// draw score
+				if(aRecreateTeamScore[t])
+				{
+					CTextCursor Cursor;
+					TextRender()->SetCursor(&Cursor, m_Width - ScoreWidthMax + (ScoreWidthMax - m_aScoreInfo[t].m_ScoreTextWidth) / 2 - Split, StartY + t * 20 + (18.f - 14.f) / 2.f, 14.0f, TEXTFLAG_RENDER);
+					Cursor.m_LineWidth = -1;
+					TextRender()->RecreateTextContainer(m_aScoreInfo[t].m_TextScoreContainerIndex, &Cursor, aScoreTeam[t]);
+				}
+				if(m_aScoreInfo[t].m_TextScoreContainerIndex.Valid())
+				{
+					ColorRGBA TColor(1.f, 1.f, 1.f, 1.f);
+					ColorRGBA TOutlineColor(0.f, 0.f, 0.f, 0.3f);
+					TextRender()->RenderTextContainer(m_aScoreInfo[t].m_TextScoreContainerIndex, TColor, TOutlineColor);
+				}
+
+				if(GameFlags & GAMEFLAG_FLAGS)
+				{
+					int BlinkTimer = (m_pClient->m_aFlagDropTick[t] != 0 &&
+								 (Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_aFlagDropTick[t]) / Client()->GameTickSpeed() >= 25) ?
+								 10 :
+								 20;
+					if(aFlagCarrier[t] == FLAG_ATSTAND || (aFlagCarrier[t] == FLAG_TAKEN && ((Client()->GameTick(g_Config.m_ClDummy) / BlinkTimer) & 1)))
+					{
+						// draw flag
+						Graphics()->TextureSet(t == 0 ? m_pClient->m_GameSkin.m_SpriteFlagRed : m_pClient->m_GameSkin.m_SpriteFlagBlue);
+						Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+						Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_FlagOffset, m_Width - ScoreWidthMax - ImageSize, StartY + 1.0f + t * 20);
+					}
+					else if(aFlagCarrier[t] >= 0)
+					{
+						// draw name of the flag holder
+						int ID = aFlagCarrier[t] % MAX_CLIENTS;
+						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						if(str_comp(pName, m_aScoreInfo[t].m_aPlayerNameText) != 0 || RecreateRect)
+						{
+							mem_copy(m_aScoreInfo[t].m_aPlayerNameText, pName, sizeof(m_aScoreInfo[t].m_aPlayerNameText));
+
+							float w = TextRender()->TextWidth(8.0f, pName, -1, -1.0f);
+
+							CTextCursor Cursor;
+							TextRender()->SetCursor(&Cursor, minimum(m_Width - w - 1.0f, m_Width - ScoreWidthMax - ImageSize - 2 * Split), StartY + (t + 1) * 20.0f - 2.0f, 8.0f, TEXTFLAG_RENDER);
+							Cursor.m_LineWidth = -1;
+							TextRender()->RecreateTextContainer(m_aScoreInfo[t].m_OptionalNameTextContainerIndex, &Cursor, pName);
+						}
+
+						if(m_aScoreInfo[t].m_OptionalNameTextContainerIndex.Valid())
+						{
+							ColorRGBA TColor(1.f, 1.f, 1.f, 1.f);
+							ColorRGBA TOutlineColor(0.f, 0.f, 0.f, 0.3f);
+							TextRender()->RenderTextContainer(m_aScoreInfo[t].m_OptionalNameTextContainerIndex, TColor, TOutlineColor);
+						}
+
+						// draw tee of the flag holder
+						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[ID].m_RenderInfo;
+						TeeInfo.m_Size = ScoreSingleBoxHeight;
+
+						const CAnimState *pIdleState = CAnimState::GetIdle();
+						vec2 OffsetToMid;
+						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+						vec2 TeeRenderPos(m_Width - ScoreWidthMax - TeeInfo.m_Size / 2 - Split, StartY + (t * 20) + ScoreSingleBoxHeight / 2.0f + OffsetToMid.y);
+
+						RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+					}
+				}
+				StartY += 8.0f;
+			}
+		}
+		else
+		{
+			int Local = -1;
+			int aPos[2] = {1, 2};
+			const CNetObj_PlayerInfo *apPlayerInfo[2] = {0, 0};
+			int i = 0;
+			for(int t = 0; t < 2 && i < MAX_CLIENTS && m_pClient->m_Snap.m_apInfoByScore[i]; ++i)
+			{
+				if(m_pClient->m_Snap.m_apInfoByScore[i]->m_Team != TEAM_SPECTATORS)
+				{
+					apPlayerInfo[t] = m_pClient->m_Snap.m_apInfoByScore[i];
+					if(apPlayerInfo[t]->m_ClientID == m_pClient->m_Snap.m_LocalClientID)
+						Local = t;
+					++t;
+				}
+			}
+			// search local player info if not a spectator, nor within top2 scores
+			if(Local == -1 && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
+			{
+				for(; i < MAX_CLIENTS && m_pClient->m_Snap.m_apInfoByScore[i]; ++i)
+				{
+					if(m_pClient->m_Snap.m_apInfoByScore[i]->m_Team != TEAM_SPECTATORS)
+						++aPos[1];
+					if(m_pClient->m_Snap.m_apInfoByScore[i]->m_ClientID == m_pClient->m_Snap.m_LocalClientID)
+					{
+						apPlayerInfo[1] = m_pClient->m_Snap.m_apInfoByScore[i];
+						Local = 1;
+						break;
+					}
+				}
+			}
+			char aScore[2][16];
+			for(int t = 0; t < 2; ++t)
+			{
+				if(apPlayerInfo[t])
+				{
+					if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
+					{
+						if(apPlayerInfo[t]->m_Score != -9999)
+							str_time((int64_t)absolute(apPlayerInfo[t]->m_Score) * 100, TIME_HOURS, aScore[t], sizeof(aScore[t]));
+						else
+							aScore[t][0] = 0;
+					}
+					else
+						str_from_int(apPlayerInfo[t]->m_Score, aScore[t]);
+				}
+				else
+					aScore[t][0] = 0;
+			}
+
+			static int LocalClientID = -1;
+			bool RecreateScores = str_comp(aScore[0], m_aScoreInfo[0].m_aScoreText) != 0 || str_comp(aScore[1], m_aScoreInfo[1].m_aScoreText) != 0 || LocalClientID != m_pClient->m_Snap.m_LocalClientID;
+			LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+
+			bool RecreateRect = ForceScoreInfoInit;
+			for(int t = 0; t < 2; t++)
+			{
+				if(RecreateScores)
+				{
+					m_aScoreInfo[t].m_ScoreTextWidth = TextRender()->TextWidth(14.0f, aScore[t], -1, -1.0f);
+					mem_copy(m_aScoreInfo[t].m_aScoreText, aScore[t], sizeof(m_aScoreInfo[t].m_aScoreText));
+					RecreateRect = true;
+				}
+
+				if(apPlayerInfo[t])
+				{
+					int ID = apPlayerInfo[t]->m_ClientID;
+					if(ID >= 0 && ID < MAX_CLIENTS)
+					{
+						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						if(str_comp(pName, m_aScoreInfo[t].m_aPlayerNameText) != 0)
+							RecreateRect = true;
+					}
+				}
+				else
+				{
+					if(m_aScoreInfo[t].m_aPlayerNameText[0] != 0)
+						RecreateRect = true;
+				}
+
+				char aBuf[16];
+				str_format(aBuf, sizeof(aBuf), "%d.", aPos[t]);
+				if(str_comp(aBuf, m_aScoreInfo[t].m_aRankText) != 0)
+					RecreateRect = true;
+			}
+
+			static float s_TextWidth10 = TextRender()->TextWidth(14.0f, "10", -1, -1.0f);
+			float ScoreWidthMax = maximum(maximum(m_aScoreInfo[0].m_ScoreTextWidth, m_aScoreInfo[1].m_ScoreTextWidth), s_TextWidth10);
+			float Split = 3.0f, ImageSize = 16.0f, PosSize = 16.0f;
+
+			for(int t = 0; t < 2; t++)
+			{
+				// draw box
+				if(RecreateRect)
+				{
+					Graphics()->DeleteQuadContainer(m_aScoreInfo[t].m_RoundRectQuadContainerIndex);
+
+					if(t == Local)
+						Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.25f);
+					else
+						Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.25f);
+					m_aScoreInfo[t].m_RoundRectQuadContainerIndex = Graphics()->CreateRectQuadContainer(m_Width - ScoreWidthMax - ImageSize - 2 * Split - PosSize, StartY + t * 20, ScoreWidthMax + ImageSize + 2 * Split + PosSize, ScoreSingleBoxHeight, 5.0f, IGraphics::CORNER_L);
+				}
+				Graphics()->TextureClear();
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+				if(m_aScoreInfo[t].m_RoundRectQuadContainerIndex != -1)
+					Graphics()->RenderQuadContainer(m_aScoreInfo[t].m_RoundRectQuadContainerIndex, -1);
+
+				if(RecreateScores)
+				{
+					CTextCursor Cursor;
+					TextRender()->SetCursor(&Cursor, m_Width - ScoreWidthMax + (ScoreWidthMax - m_aScoreInfo[t].m_ScoreTextWidth) - Split, StartY + t * 20 + (18.f - 14.f) / 2.f, 14.0f, TEXTFLAG_RENDER);
+					Cursor.m_LineWidth = -1;
+					TextRender()->RecreateTextContainer(m_aScoreInfo[t].m_TextScoreContainerIndex, &Cursor, aScore[t]);
+				}
+				// draw score
+				if(m_aScoreInfo[t].m_TextScoreContainerIndex.Valid())
+				{
+					ColorRGBA TColor(1.f, 1.f, 1.f, 1.f);
+					ColorRGBA TOutlineColor(0.f, 0.f, 0.f, 0.3f);
+					TextRender()->RenderTextContainer(m_aScoreInfo[t].m_TextScoreContainerIndex, TColor, TOutlineColor);
+				}
+
+				if(apPlayerInfo[t])
+				{
+					// draw name
+					int ID = apPlayerInfo[t]->m_ClientID;
+					if(ID >= 0 && ID < MAX_CLIENTS)
+					{
+						const char *pName = m_pClient->m_aClients[ID].m_aName;
+						if(RecreateRect)
+						{
+							mem_copy(m_aScoreInfo[t].m_aPlayerNameText, pName, sizeof(m_aScoreInfo[t].m_aPlayerNameText));
+
+							CTextCursor Cursor;
+							float w = TextRender()->TextWidth(8.0f, pName, -1, -1.0f);
+							TextRender()->SetCursor(&Cursor, minimum(m_Width - w - 1.0f, m_Width - ScoreWidthMax - ImageSize - 2 * Split - PosSize), StartY + (t + 1) * 20.0f - 2.0f, 8.0f, TEXTFLAG_RENDER);
+							Cursor.m_LineWidth = -1;
+							TextRender()->RecreateTextContainer(m_aScoreInfo[t].m_OptionalNameTextContainerIndex, &Cursor, pName);
+						}
+
+						if(m_aScoreInfo[t].m_OptionalNameTextContainerIndex.Valid())
+						{
+							ColorRGBA TColor(1.f, 1.f, 1.f, 1.f);
+							ColorRGBA TOutlineColor(0.f, 0.f, 0.f, 0.3f);
+							TextRender()->RenderTextContainer(m_aScoreInfo[t].m_OptionalNameTextContainerIndex, TColor, TOutlineColor);
+						}
+
+						// draw tee
+						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[ID].m_RenderInfo;
+						TeeInfo.m_Size = ScoreSingleBoxHeight;
+
+						const CAnimState *pIdleState = CAnimState::GetIdle();
+						vec2 OffsetToMid;
+						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+						vec2 TeeRenderPos(m_Width - ScoreWidthMax - TeeInfo.m_Size / 2 - Split, StartY + (t * 20) + ScoreSingleBoxHeight / 2.0f + OffsetToMid.y);
+
+						RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+					}
+				}
+				else
+				{
+					m_aScoreInfo[t].m_aPlayerNameText[0] = 0;
+				}
+
+				// draw position
+				char aBuf[16];
+				str_format(aBuf, sizeof(aBuf), "%d.", aPos[t]);
+				if(RecreateRect)
+				{
+					mem_copy(m_aScoreInfo[t].m_aRankText, aBuf, sizeof(m_aScoreInfo[t].m_aRankText));
+
+					CTextCursor Cursor;
+					TextRender()->SetCursor(&Cursor, m_Width - ScoreWidthMax - ImageSize - Split - PosSize, StartY + t * 20 + (18.f - 10.f) / 2.f, 10.0f, TEXTFLAG_RENDER);
+					Cursor.m_LineWidth = -1;
+					TextRender()->RecreateTextContainer(m_aScoreInfo[t].m_TextRankContainerIndex, &Cursor, aBuf);
+				}
+				if(m_aScoreInfo[t].m_TextRankContainerIndex.Valid())
+				{
+					ColorRGBA TColor(1.f, 1.f, 1.f, 1.f);
+					ColorRGBA TOutlineColor(0.f, 0.f, 0.f, 0.3f);
+					TextRender()->RenderTextContainer(m_aScoreInfo[t].m_TextRankContainerIndex, TColor, TOutlineColor);
+				}
+
+				StartY += 8.0f;
+			}
+		}
+	}
+}
+
+void CHud::RenderWarmupTimer()
+{
+	// render warmup timer
+	if(m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer > 0 && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_RACETIME))
+	{
+		char aBuf[256];
+		float FontSize = 20.0f;
+		float w = TextRender()->TextWidth(FontSize, Localize("Warmup"), -1, -1.0f);
+		TextRender()->Text(150 * Graphics()->ScreenAspect() + -w / 2, 50, FontSize, Localize("Warmup"), -1.0f);
+
+		int Seconds = m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer / Client()->GameTickSpeed();
+		if(Seconds < 5)
+			str_format(aBuf, sizeof(aBuf), "%d.%d", Seconds, (m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer * 10 / Client()->GameTickSpeed()) % 10);
+		else
+			str_from_int(Seconds, aBuf);
+		w = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+		TextRender()->Text(150 * Graphics()->ScreenAspect() + -w / 2, 75, FontSize, aBuf, -1.0f);
+	}
+}
+
+void CHud::RenderTextInfo()
+{
+	if(g_Config.m_ClShowfps)
+	{
+		// calculate avg. fps
+		m_FrameTimeAvg = m_FrameTimeAvg * 0.9f + Client()->RenderFrameTime() * 0.1f;
+		char aBuf[64];
+		int FrameTime = (int)(1.0f / m_FrameTimeAvg + 0.5f);
+		str_from_int(FrameTime, aBuf);
+
+		static float s_TextWidth0 = TextRender()->TextWidth(12.f, "0", -1, -1.0f);
+		static float s_TextWidth00 = TextRender()->TextWidth(12.f, "00", -1, -1.0f);
+		static float s_TextWidth000 = TextRender()->TextWidth(12.f, "000", -1, -1.0f);
+		static float s_TextWidth0000 = TextRender()->TextWidth(12.f, "0000", -1, -1.0f);
+		static float s_TextWidth00000 = TextRender()->TextWidth(12.f, "00000", -1, -1.0f);
+		static const float s_aTextWidth[5] = {s_TextWidth0, s_TextWidth00, s_TextWidth000, s_TextWidth0000, s_TextWidth00000};
+
+		int DigitIndex = GetDigitsIndex(FrameTime, 4);
+
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, m_Width - 10 - s_aTextWidth[DigitIndex], 5, 12, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = -1;
+		auto OldFlags = TextRender()->GetRenderFlags();
+		TextRender()->SetRenderFlags(OldFlags | TEXT_RENDER_FLAG_ONE_TIME_USE);
+		if(m_FPSTextContainerIndex.Valid())
+			TextRender()->RecreateTextContainerSoft(m_FPSTextContainerIndex, &Cursor, aBuf);
+		else
+			TextRender()->CreateTextContainer(m_FPSTextContainerIndex, &Cursor, "0");
+		TextRender()->SetRenderFlags(OldFlags);
+		if(m_FPSTextContainerIndex.Valid())
+		{
+			TextRender()->RenderTextContainer(m_FPSTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor());
+		}
+	}
+	if(g_Config.m_ClShowpred && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		char aBuf[64];
+		str_from_int(Client()->GetPredictionTime(), aBuf);
+		TextRender()->Text(m_Width - 10 - TextRender()->TextWidth(12, aBuf, -1, -1.0f), g_Config.m_ClShowfps ? 20 : 5, 12, aBuf, -1.0f);
+	}
+
+	//initial idea from tater - tater uses "notifyWhenLast" aswell, i dont like that - because it seems scripty to use (alerts you when everyone except you is in freeze)
+
+	if((g_Config.m_ClShowFrozenText > 0 || g_Config.m_ClShowFrozenHud > 0) && GameClient()->m_GameInfo.m_EntitiesDDRace)
+	{
+		int NumInTeam = 0;
+		int NumFrozen = 0;
+		int LocalTeamID = m_pClient->m_Snap.m_SpecInfo.m_Active == 1 && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != -1 ?
+					  m_pClient->m_Teams.Team(m_pClient->m_Snap.m_SpecInfo.m_SpectatorID) :
+					  m_pClient->m_Teams.Team(m_pClient->m_Snap.m_LocalClientID);
+
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(!m_pClient->m_Snap.m_apPlayerInfos[i])
+				continue;
+
+			if(m_pClient->m_Teams.Team(i) == LocalTeamID)
+			{
+				NumInTeam++;
+				if(m_pClient->m_aClients[i].m_FreezeEnd > 0 || m_pClient->m_aClients[i].m_DeepFrozen)
+					NumFrozen++;
+			}
+		}
+
+		char aBuf[64];
+		if(g_Config.m_ClShowFrozenText == 1)
+			str_format(aBuf, sizeof(aBuf), "%d / %d", NumInTeam - NumFrozen, NumInTeam);
+		else if(g_Config.m_ClShowFrozenText == 2)
+			str_format(aBuf, sizeof(aBuf), "%d / %d", NumFrozen, NumInTeam);
+		if(g_Config.m_ClShowFrozenText > 0)
+			TextRender()->Text(m_Width / 2 - TextRender()->TextWidth(10, aBuf, -1, -1.0f) / 2, 12, 10, aBuf, -1.0f);
+
+		if(g_Config.m_ClShowFrozenHud > 0 && !m_pClient->m_Scoreboard.Active() && !(LocalTeamID == 0 && g_Config.m_ClFrozenHudTeamOnly))
+		{
+			CTeeRenderInfo FreezeInfo;
+			const CSkin *pSkin = m_pClient->m_Skins.Find("x_ninja");
+			FreezeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			FreezeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+			FreezeInfo.m_BloodColor = pSkin->m_BloodColor;
+			FreezeInfo.m_SkinMetrics = pSkin->m_Metrics;
+			FreezeInfo.m_ColorBody = ColorRGBA(1, 1, 1);
+			FreezeInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
+			FreezeInfo.m_CustomColoredSkin = false;
+
+			float progressiveOffset = 0.0f;
+			float TeeSize = g_Config.m_ClFrozenHudTeeSize;
+			int MaxTees = (int)(8.3 * (m_Width / m_Height) * 13.0f / TeeSize);
+			if(!g_Config.m_ClShowfps && !g_Config.m_ClShowpred)
+				MaxTees = (int)(9.5 * (m_Width / m_Height) * 13.0f / TeeSize);
+			int MaxRows = g_Config.m_ClFrozenMaxRows;
+			float StartPos = m_Width / 2 + 38.0f * (m_Width / m_Height) / 1.78;
+
+			int TotalRows = std::min(MaxRows, (NumInTeam + MaxTees - 1) / MaxTees);
+			//create quad layer a little better than tater >:3
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.35f);
+			Graphics()->DrawRectExt(StartPos - TeeSize / 2, 0.0f, TeeSize * std::min(NumInTeam, MaxTees), TeeSize + 2.0f + (TotalRows - 1) * TeeSize, 4.0f, IGraphics::CORNER_B);
+			Graphics()->QuadsEnd();
+
+			bool Overflow = NumInTeam > MaxTees * MaxRows;
+
+			int NumDisplayed = 0;
+			int NumInRow = 0;
+			int CurrentRow = 0;
+
+			for(int OverflowIndex = 0; OverflowIndex < 1 + Overflow; OverflowIndex++)
+			{
+				for(int i = 0; i < MAX_CLIENTS && NumDisplayed < MaxTees * MaxRows; i++)
+				{
+					if(!m_pClient->m_Snap.m_apPlayerInfos[i])
+						continue;
+					if(m_pClient->m_Teams.Team(i) == LocalTeamID)
+					{
+						bool Frozen = false;
+						CTeeRenderInfo TeeInfo = m_pClient->m_aClients[i].m_RenderInfo;
+						if(m_pClient->m_aClients[i].m_FreezeEnd > 0 || m_pClient->m_aClients[i].m_DeepFrozen)
+						{
+							if(!g_Config.m_ClShowFrozenHudSkins)
+								TeeInfo = FreezeInfo;
+							Frozen = true;
+						}
+
+						if(Overflow && Frozen && OverflowIndex == 0)
+							continue;
+						if(Overflow && !Frozen && OverflowIndex == 1)
+							continue;
+
+						NumDisplayed++;
+						NumInRow++;
+						if(NumInRow > MaxTees)
+						{
+							NumInRow = 1;
+							progressiveOffset = 0.0f;
+							CurrentRow++;
+						}
+
+						TeeInfo.m_Size = TeeSize;
+						const CAnimState *pIdleState = CAnimState::GetIdle();
+						vec2 OffsetToMid;
+						RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+						vec2 TeeRenderPos(StartPos + progressiveOffset, TeeSize * (0.7f) + CurrentRow * TeeSize);
+						float Alpha = 1.0f;
+						CNetObj_Character CurChar = m_pClient->m_aClients[i].m_RenderCur;
+						if(g_Config.m_ClShowFrozenHudSkins && Frozen)
+						{
+							Alpha = 0.6f;
+							TeeInfo.m_ColorBody.r *= 0.4;
+							TeeInfo.m_ColorBody.g *= 0.4;
+							TeeInfo.m_ColorBody.b *= 0.4;
+							TeeInfo.m_ColorFeet.r *= 0.4;
+							TeeInfo.m_ColorFeet.g *= 0.4;
+							TeeInfo.m_ColorFeet.b *= 0.4;
+						}
+						if(Frozen)
+							RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_HAPPY, vec2(1.0f, 0.0f), TeeRenderPos, Alpha);
+						else
+							RenderTools()->RenderTee(pIdleState, &TeeInfo, CurChar.m_Emote, vec2(1.0f, 0.0f), TeeRenderPos);
+						progressiveOffset += TeeSize;
+					}
+				}
+			}
+		}
+	}
+}
+
+void CHud::RenderConnectionWarning()
+{
+	if(Client()->ConnectionProblems())
+	{
+		const char *pText = Localize("Connection Problems...");
+		float w = TextRender()->TextWidth(24, pText, -1, -1.0f);
+		TextRender()->Text(150 * Graphics()->ScreenAspect() - w / 2, 50, 24, pText, -1.0f);
+	}
+}
+
+void CHud::RenderTeambalanceWarning()
+{
+	// render prompt about team-balance
+	bool Flash = time() / (time_freq() / 2) % 2 == 0;
+	if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+	{
+		int TeamDiff = m_pClient->m_Snap.m_aTeamSize[TEAM_RED] - m_pClient->m_Snap.m_aTeamSize[TEAM_BLUE];
+		if(g_Config.m_ClWarningTeambalance && (TeamDiff >= 2 || TeamDiff <= -2))
+		{
+			const char *pText = Localize("Please balance teams!");
+			if(Flash)
+				TextRender()->TextColor(1, 1, 0.5f, 1);
+			else
+				TextRender()->TextColor(0.7f, 0.7f, 0.2f, 1.0f);
+			TextRender()->Text(5, 50, 6, pText, -1.0f);
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+		}
+	}
+}
+
+void CHud::RenderVoting()
+{
+	if((!g_Config.m_ClShowVotesAfterVoting && !m_pClient->m_Scoreboard.Active() && m_pClient->m_Voting.TakenChoice()) || !m_pClient->m_Voting.IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	Graphics()->DrawRect(-10, 60 - 2, 100 + 10 + 4 + 5, 46, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 5.0f);
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+	CTextCursor Cursor;
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), Localize("%ds left"), m_pClient->m_Voting.SecondsLeft());
+	float tw = TextRender()->TextWidth(6, aBuf, -1, -1.0f);
+	TextRender()->SetCursor(&Cursor, 5.0f + 100.0f - tw, 60.0f, 6.0f, TEXTFLAG_RENDER);
+	TextRender()->TextEx(&Cursor, aBuf, -1);
+
+	TextRender()->SetCursor(&Cursor, 5.0f, 60.0f, 6.0f, TEXTFLAG_RENDER);
+	Cursor.m_LineWidth = 100.0f - tw;
+	Cursor.m_MaxLines = 3;
+	TextRender()->TextEx(&Cursor, m_pClient->m_Voting.VoteDescription(), -1);
+
+	// reason
+	str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), m_pClient->m_Voting.VoteReason());
+	TextRender()->SetCursor(&Cursor, 5.0f, 79.0f, 6.0f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+	Cursor.m_LineWidth = 100.0f;
+	TextRender()->TextEx(&Cursor, aBuf, -1);
+
+	CUIRect Base = {5, 88, 100, 4};
+	m_pClient->m_Voting.RenderBars(Base, false);
+
+	char aKey[64];
+	m_pClient->m_Binds.GetKey("vote yes", aKey, sizeof(aKey));
+
+	str_format(aBuf, sizeof(aBuf), "%s - %s", aKey, Localize("Vote yes"));
+	Base.y += Base.h;
+	Base.h = 12.0f;
+	if(m_pClient->m_Voting.TakenChoice() == 1)
+		TextRender()->TextColor(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f));
+	UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_ML);
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+	m_pClient->m_Binds.GetKey("vote no", aKey, sizeof(aKey));
+	str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), aKey);
+	if(m_pClient->m_Voting.TakenChoice() == -1)
+		TextRender()->TextColor(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f));
+	UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_MR);
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+}
+
+void CHud::RenderCursor()
+{
+	if(!m_pClient->m_Snap.m_pLocalCharacter || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	RenderTools()->MapScreenToInterface(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
+
+	// render cursor
+	int CurWeapon = m_pClient->m_Snap.m_pLocalCharacter->m_Weapon % NUM_WEAPONS;
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->TextureSet(m_pClient->m_GameSkin.m_aSpriteWeaponCursors[CurWeapon]);
+	Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_aCursorOffset[CurWeapon], m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy].x, m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy].y);
+}
+
+void CHud::PrepareAmmoHealthAndArmorQuads()
+{
+	float x = 5;
+	float y = 5;
+	IGraphics::CQuadItem Array[10];
+
+	// ammo of the different weapons
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		// 0.6
+		for(int n = 0; n < 10; n++)
+			Array[n] = IGraphics::CQuadItem(x + n * 12, y, 10, 10);
+
+		m_aAmmoOffset[i] = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+		// 0.7
+		if(i == WEAPON_GRENADE)
+		{
+			// special case for 0.7 grenade
+			for(int n = 0; n < 10; n++)
+				Array[n] = IGraphics::CQuadItem(1 + x + n * 12, y, 10, 10);
+		}
+		else
+		{
+			for(int n = 0; n < 10; n++)
+				Array[n] = IGraphics::CQuadItem(x + n * 12, y, 12, 12);
+		}
+
+		Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+	}
+
+	// health
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 10, 10);
+	m_HealthOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// 0.7
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 12, 12);
+	Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// empty health
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 10, 10);
+	m_EmptyHealthOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// 0.7
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 12, 12);
+	Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// armor meter
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y + 12, 10, 10);
+	m_ArmorOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// 0.7
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y + 12, 12, 12);
+	Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// empty armor meter
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y + 12, 10, 10);
+	m_EmptyArmorOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// 0.7
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y + 12, 12, 12);
+	Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+}
+
+void CHud::RenderAmmoHealthAndArmor(const CNetObj_Character *pCharacter)
+{
+	if(!pCharacter)
+		return;
+
+	bool IsSixupGameSkin = m_pClient->m_GameSkin.IsSixup();
+	int QuadOffsetSixup = (IsSixupGameSkin ? 10 : 0);
+
+	if(GameClient()->m_GameInfo.m_HudAmmo)
+	{
+		// ammo display
+		float AmmoOffsetY = GameClient()->m_GameInfo.m_HudHealthArmor ? 24 : 0;
+		int CurWeapon = pCharacter->m_Weapon % NUM_WEAPONS;
+		if(m_pClient->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon].IsValid())
+		{
+			Graphics()->TextureSet(m_pClient->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon]);
+			if(AmmoOffsetY > 0)
+			{
+				Graphics()->RenderQuadContainerEx(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, minimum(pCharacter->m_AmmoCount, 10), 0, AmmoOffsetY);
+			}
+			else
+			{
+				Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, minimum(pCharacter->m_AmmoCount, 10));
+			}
+		}
+	}
+
+	if(GameClient()->m_GameInfo.m_HudHealthArmor)
+	{
+		// health display
+		Graphics()->TextureSet(m_pClient->m_GameSkin.m_SpriteHealthFull);
+		Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_HealthOffset + QuadOffsetSixup, minimum(pCharacter->m_Health, 10));
+		Graphics()->TextureSet(m_pClient->m_GameSkin.m_SpriteHealthEmpty);
+		Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_EmptyHealthOffset + QuadOffsetSixup + minimum(pCharacter->m_Health, 10), 10 - minimum(pCharacter->m_Health, 10));
+
+		// armor display
+		Graphics()->TextureSet(m_pClient->m_GameSkin.m_SpriteArmorFull);
+		Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_ArmorOffset + QuadOffsetSixup, minimum(pCharacter->m_Armor, 10));
+		Graphics()->TextureSet(m_pClient->m_GameSkin.m_SpriteArmorEmpty);
+		Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_ArmorOffset + QuadOffsetSixup + minimum(pCharacter->m_Armor, 10), 10 - minimum(pCharacter->m_Armor, 10));
+	}
+}
+
+void CHud::PreparePlayerStateQuads()
+{
+	float x = 5;
+	float y = 5 + 24;
+	IGraphics::CQuadItem Array[10];
+
+	// Quads for displaying the available and used jumps
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 12, 12);
+	m_AirjumpOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	for(int i = 0; i < 10; ++i)
+		Array[i] = IGraphics::CQuadItem(x + i * 12, y, 12, 12);
+	m_AirjumpEmptyOffset = Graphics()->QuadContainerAddQuads(m_HudQuadContainerIndex, Array, 10);
+
+	// Quads for displaying weapons
+	for(int Weapon = 0; Weapon < NUM_WEAPONS; ++Weapon)
+	{
+		const CDataWeaponspec &WeaponSpec = g_pData->m_Weapons.m_aId[Weapon];
+		float ScaleX, ScaleY;
+		RenderTools()->GetSpriteScale(WeaponSpec.m_pSpriteBody, ScaleX, ScaleY);
+		constexpr float HudWeaponScale = 0.25f;
+		float Width = WeaponSpec.m_VisualSize * ScaleX * HudWeaponScale;
+		float Height = WeaponSpec.m_VisualSize * ScaleY * HudWeaponScale;
+		m_aWeaponOffset[Weapon] = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, Width, Height);
+	}
+
+	// Quads for displaying capabilities
+	m_EndlessJumpOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_EndlessHookOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_JetpackOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_TeleportGrenadeOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_TeleportGunOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_TeleportLaserOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+
+	// Quads for displaying prohibited capabilities
+	m_SoloOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_CollisionDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_HookHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_HammerHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_GunHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_ShotgunHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_GrenadeHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_LaserHitDisabledOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+
+	// Quads for displaying freeze status
+	m_DeepFrozenOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_LiveFrozenOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+
+	// Quads for displaying dummy actions
+	m_DummyHammerOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+	m_DummyCopyOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+
+	// Quad for displaying practice mode
+	m_PracticeModeOffset = RenderTools()->QuadContainerAddSprite(m_HudQuadContainerIndex, 0.f, 0.f, 12.f, 12.f);
+}
+
+void CHud::RenderPlayerState(const int ClientID)
+{
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	// pCharacter contains the predicted character for local players or the last snap for players who are spectated
+	CCharacterCore *pCharacter = &m_pClient->m_aClients[ClientID].m_Predicted;
+	CNetObj_Character *pPlayer = &m_pClient->m_aClients[ClientID].m_RenderCur;
+	int TotalJumpsToDisplay = 0;
+	if(g_Config.m_ClShowhudJumpsIndicator)
+	{
+		int AvailableJumpsToDisplay;
+		if(m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+		{
+			bool Grounded = false;
+			if(Collision()->CheckPoint(pPlayer->m_X + CCharacterCore::PhysicalSize() / 2,
+				   pPlayer->m_Y + CCharacterCore::PhysicalSize() / 2 + 5))
+			{
+				Grounded = true;
+			}
+			if(Collision()->CheckPoint(pPlayer->m_X - CCharacterCore::PhysicalSize() / 2,
+				   pPlayer->m_Y + CCharacterCore::PhysicalSize() / 2 + 5))
+			{
+				Grounded = true;
+			}
+
+			int UsedJumps = pCharacter->m_JumpedTotal;
+			if(pCharacter->m_Jumps > 1)
+			{
+				UsedJumps += !Grounded;
+			}
+			else if(pCharacter->m_Jumps == 1)
+			{
+				// If the player has only one jump, each jump is the last one
+				UsedJumps = pPlayer->m_Jumped & 2;
+			}
+			else if(pCharacter->m_Jumps == -1)
+			{
+				// The player has only one ground jump
+				UsedJumps = !Grounded;
+			}
+
+			if(pCharacter->m_EndlessJump && UsedJumps >= absolute(pCharacter->m_Jumps))
+			{
+				UsedJumps = absolute(pCharacter->m_Jumps) - 1;
+			}
+
+			int UnusedJumps = absolute(pCharacter->m_Jumps) - UsedJumps;
+			if(!(pPlayer->m_Jumped & 2) && UnusedJumps <= 0)
+			{
+				// In some edge cases when the player just got another number of jumps, UnusedJumps is not correct
+				UnusedJumps = 1;
+			}
+			TotalJumpsToDisplay = maximum(minimum(absolute(pCharacter->m_Jumps), 10), 0);
+			AvailableJumpsToDisplay = maximum(minimum(UnusedJumps, TotalJumpsToDisplay), 0);
+		}
+		else
+		{
+			TotalJumpsToDisplay = AvailableJumpsToDisplay = absolute(m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData.m_Jumps);
+		}
+
+		// render available and used jumps
+		int JumpsOffsetY = ((GameClient()->m_GameInfo.m_HudHealthArmor && g_Config.m_ClShowhudHealthAmmo ? 24 : 0) +
+				    (GameClient()->m_GameInfo.m_HudAmmo && g_Config.m_ClShowhudHealthAmmo ? 12 : 0));
+		if(JumpsOffsetY > 0)
+		{
+			Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudAirjump);
+			Graphics()->RenderQuadContainerEx(m_HudQuadContainerIndex, m_AirjumpOffset, AvailableJumpsToDisplay, 0, JumpsOffsetY);
+			Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudAirjumpEmpty);
+			Graphics()->RenderQuadContainerEx(m_HudQuadContainerIndex, m_AirjumpEmptyOffset + AvailableJumpsToDisplay, TotalJumpsToDisplay - AvailableJumpsToDisplay, 0, JumpsOffsetY);
+		}
+		else
+		{
+			Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudAirjump);
+			Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_AirjumpOffset, AvailableJumpsToDisplay);
+			Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudAirjumpEmpty);
+			Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_AirjumpEmptyOffset + AvailableJumpsToDisplay, TotalJumpsToDisplay - AvailableJumpsToDisplay);
+		}
+	}
+
+	float x = 5 + 12;
+	float y = (5 + 12 + (GameClient()->m_GameInfo.m_HudHealthArmor && g_Config.m_ClShowhudHealthAmmo ? 24 : 0) +
+		   (GameClient()->m_GameInfo.m_HudAmmo && g_Config.m_ClShowhudHealthAmmo ? 12 : 0));
+
+	// render weapons
+	{
+		constexpr float aWeaponWidth[NUM_WEAPONS] = {16, 12, 12, 12, 12, 12};
+		constexpr float aWeaponInitialOffset[NUM_WEAPONS] = {-3, -4, -1, -1, -2, -4};
+		bool InitialOffsetAdded = false;
+		for(int Weapon = 0; Weapon < NUM_WEAPONS; ++Weapon)
+		{
+			if(!pCharacter->m_aWeapons[Weapon].m_Got)
+				continue;
+			if(!InitialOffsetAdded)
+			{
+				x += aWeaponInitialOffset[Weapon];
+				InitialOffsetAdded = true;
+			}
+			if(pPlayer->m_Weapon != Weapon)
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+			Graphics()->QuadsSetRotation(pi * 7 / 4);
+			Graphics()->TextureSet(m_pClient->m_GameSkin.m_aSpritePickupWeapons[Weapon]);
+			Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_aWeaponOffset[Weapon], x, y);
+			Graphics()->QuadsSetRotation(0);
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			x += aWeaponWidth[Weapon];
+		}
+		if(pCharacter->m_aWeapons[WEAPON_NINJA].m_Got)
+		{
+			const int Max = g_pData->m_Weapons.m_Ninja.m_Duration * Client()->GameTickSpeed() / 1000;
+			float NinjaProgress = clamp(pCharacter->m_Ninja.m_ActivationTick + g_pData->m_Weapons.m_Ninja.m_Duration * Client()->GameTickSpeed() / 1000 - Client()->GameTick(g_Config.m_ClDummy), 0, Max) / (float)Max;
+			if(NinjaProgress > 0.0f && m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+			{
+				RenderNinjaBarPos(x, y - 12, 6.f, 24.f, NinjaProgress);
+			}
+		}
+	}
+
+	// render capabilities
+	x = 5;
+	y += 12;
+	if(TotalJumpsToDisplay > 0)
+	{
+		y += 12;
+	}
+	bool HasCapabilities = false;
+	if(pCharacter->m_EndlessJump)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudEndlessJump);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_EndlessJumpOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_EndlessHook)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudEndlessHook);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_EndlessHookOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_Jetpack)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudJetpack);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_JetpackOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_HasTelegunGun && pCharacter->m_aWeapons[WEAPON_GUN].m_Got)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudTeleportGun);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_TeleportGunOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_HasTelegunGrenade && pCharacter->m_aWeapons[WEAPON_GRENADE].m_Got)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudTeleportGrenade);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_TeleportGrenadeOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_HasTelegunLaser && pCharacter->m_aWeapons[WEAPON_LASER].m_Got)
+	{
+		HasCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudTeleportLaser);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_TeleportLaserOffset, x, y);
+	}
+
+	// render prohibited capabilities
+	x = 5;
+	if(HasCapabilities)
+	{
+		y += 12;
+	}
+	bool HasProhibitedCapabilities = false;
+	if(pCharacter->m_Solo)
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudSolo);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_SoloOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_CollisionDisabled)
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudCollisionDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_CollisionDisabledOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_HookHitDisabled)
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudHookHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_HookHitDisabledOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_HammerHitDisabled)
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudHammerHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_HammerHitDisabledOffset, x, y);
+		x += 12;
+	}
+	if((pCharacter->m_GrenadeHitDisabled && pCharacter->m_HasTelegunGun && pCharacter->m_aWeapons[WEAPON_GUN].m_Got))
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudGunHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_LaserHitDisabledOffset, x, y);
+		x += 12;
+	}
+	if((pCharacter->m_ShotgunHitDisabled && pCharacter->m_aWeapons[WEAPON_SHOTGUN].m_Got))
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudShotgunHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_ShotgunHitDisabledOffset, x, y);
+		x += 12;
+	}
+	if((pCharacter->m_GrenadeHitDisabled && pCharacter->m_aWeapons[WEAPON_GRENADE].m_Got))
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudGrenadeHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_GrenadeHitDisabledOffset, x, y);
+		x += 12;
+	}
+	if((pCharacter->m_LaserHitDisabled && pCharacter->m_aWeapons[WEAPON_LASER].m_Got))
+	{
+		HasProhibitedCapabilities = true;
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudLaserHitDisabled);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_LaserHitDisabledOffset, x, y);
+	}
+
+	// render dummy actions and freeze state
+	x = 5;
+	if(HasProhibitedCapabilities)
+	{
+		y += 12;
+	}
+	if(m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo && m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData.m_Flags & CHARACTERFLAG_PRACTICE_MODE)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudPracticeMode);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_PracticeModeOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_DeepFrozen)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudDeepFrozen);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_DeepFrozenOffset, x, y);
+		x += 12;
+	}
+	if(pCharacter->m_LiveFrozen)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudLiveFrozen);
+		Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_LiveFrozenOffset, x, y);
+	}
+}
+
+void CHud::RenderNinjaBarPos(const float x, float y, const float width, const float height, float Progress, const float Alpha)
+{
+	Progress = clamp(Progress, 0.0f, 1.0f);
+
+	// what percentage of the end pieces is used for the progress indicator and how much is the rest
+	// half of the ends are used for the progress display
+	const float RestPct = 0.5f;
+	const float ProgPct = 0.5f;
+
+	const float EndHeight = width; // to keep the correct scale - the width of the sprite is as long as the height
+	const float BarWidth = width;
+	const float WholeBarHeight = height;
+	const float MiddleBarHeight = WholeBarHeight - (EndHeight * 2.0f);
+	const float EndProgressHeight = EndHeight * ProgPct;
+	const float EndRestHeight = EndHeight * RestPct;
+	const float ProgressBarHeight = WholeBarHeight - (EndProgressHeight * 2.0f);
+	const float EndProgressProportion = EndProgressHeight / ProgressBarHeight;
+	const float MiddleProgressProportion = MiddleBarHeight / ProgressBarHeight;
+
+	// beginning piece
+	float BeginningPieceProgress = 1;
+	if(Progress <= 1)
+	{
+		if(Progress <= (EndProgressProportion + MiddleProgressProportion))
+		{
+			BeginningPieceProgress = 0;
+		}
+		else
+		{
+			BeginningPieceProgress = (Progress - EndProgressProportion - MiddleProgressProportion) / EndProgressProportion;
+		}
+	}
+	// empty
+	Graphics()->WrapClamp();
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarEmptyRight);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// Subset: btm_r, top_r, top_m, btm_m | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
+	Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, ProgPct - ProgPct * (1.0f - BeginningPieceProgress), 0, ProgPct - ProgPct * (1.0f - BeginningPieceProgress), 1);
+	IGraphics::CQuadItem QuadEmptyBeginning(x, y, BarWidth, EndRestHeight + EndProgressHeight * (1.0f - BeginningPieceProgress));
+	Graphics()->QuadsDrawTL(&QuadEmptyBeginning, 1);
+	Graphics()->QuadsEnd();
+	// full
+	if(BeginningPieceProgress > 0.0f)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarFullLeft);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		// Subset: btm_m, top_m, top_r, btm_r | it is rotated 90 degrees clockwise
+		Graphics()->QuadsSetSubsetFree(RestPct + ProgPct * (1.0f - BeginningPieceProgress), 1, RestPct + ProgPct * (1.0f - BeginningPieceProgress), 0, 1, 0, 1, 1);
+		IGraphics::CQuadItem QuadFullBeginning(x, y + (EndRestHeight + EndProgressHeight * (1.0f - BeginningPieceProgress)), BarWidth, EndProgressHeight * BeginningPieceProgress);
+		Graphics()->QuadsDrawTL(&QuadFullBeginning, 1);
+		Graphics()->QuadsEnd();
+	}
+
+	// middle piece
+	y += EndHeight;
+
+	float MiddlePieceProgress = 1;
+	if(Progress <= EndProgressProportion + MiddleProgressProportion)
+	{
+		if(Progress <= EndProgressProportion)
+		{
+			MiddlePieceProgress = 0;
+		}
+		else
+		{
+			MiddlePieceProgress = (Progress - EndProgressProportion) / MiddleProgressProportion;
+		}
+	}
+
+	const float FullMiddleBarHeight = MiddleBarHeight * MiddlePieceProgress;
+	const float EmptyMiddleBarHeight = MiddleBarHeight - FullMiddleBarHeight;
+
+	// empty ninja bar
+	if(EmptyMiddleBarHeight > 0.0f)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarEmpty);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		// select the middle portion of the sprite so we don't get edge bleeding
+		if(EmptyMiddleBarHeight <= EndHeight)
+		{
+			// prevent pixel puree, select only a small slice
+			// Subset: btm_r, top_r, top_m, btm_m | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
+			Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, 1.0f - (EmptyMiddleBarHeight / EndHeight), 0, 1.0f - (EmptyMiddleBarHeight / EndHeight), 1);
+		}
+		else
+		{
+			// Subset: btm_r, top_r, top_l, btm_l | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
+			Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, 0, 0, 0, 1);
+		}
+		IGraphics::CQuadItem QuadEmpty(x, y, BarWidth, EmptyMiddleBarHeight);
+		Graphics()->QuadsDrawTL(&QuadEmpty, 1);
+		Graphics()->QuadsEnd();
+	}
+
+	// full ninja bar
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarFull);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// select the middle portion of the sprite so we don't get edge bleeding
+	if(FullMiddleBarHeight <= EndHeight)
+	{
+		// prevent pixel puree, select only a small slice
+		// Subset: btm_m, top_m, top_r, btm_r | it is rotated 90 degrees clockwise
+		Graphics()->QuadsSetSubsetFree(1.0f - (FullMiddleBarHeight / EndHeight), 1, 1.0f - (FullMiddleBarHeight / EndHeight), 0, 1, 0, 1, 1);
+	}
+	else
+	{
+		// Subset: btm_l, top_l, top_r, btm_r | it is rotated 90 degrees clockwise
+		Graphics()->QuadsSetSubsetFree(0, 1, 0, 0, 1, 0, 1, 1);
+	}
+	IGraphics::CQuadItem QuadFull(x, y + EmptyMiddleBarHeight, BarWidth, FullMiddleBarHeight);
+	Graphics()->QuadsDrawTL(&QuadFull, 1);
+	Graphics()->QuadsEnd();
+
+	// ending piece
+	y += MiddleBarHeight;
+	float EndingPieceProgress = 1;
+	if(Progress <= EndProgressProportion)
+	{
+		EndingPieceProgress = Progress / EndProgressProportion;
+	}
+	// empty
+	if(EndingPieceProgress < 1.0f)
+	{
+		Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarEmptyRight);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		// Subset: btm_l, top_l, top_m, btm_m | it is rotated 90 degrees clockwise
+		Graphics()->QuadsSetSubsetFree(0, 1, 0, 0, ProgPct - ProgPct * EndingPieceProgress, 0, ProgPct - ProgPct * EndingPieceProgress, 1);
+		IGraphics::CQuadItem QuadEmptyEnding(x, y, BarWidth, EndProgressHeight * (1.0f - EndingPieceProgress));
+		Graphics()->QuadsDrawTL(&QuadEmptyEnding, 1);
+		Graphics()->QuadsEnd();
+	}
+	// full
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarFullLeft);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+	// Subset: btm_m, top_m, top_l, btm_l | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
+	Graphics()->QuadsSetSubsetFree(RestPct + ProgPct * EndingPieceProgress, 1, RestPct + ProgPct * EndingPieceProgress, 0, 0, 0, 0, 1);
+	IGraphics::CQuadItem QuadFullEnding(x, y + (EndProgressHeight * (1.0f - EndingPieceProgress)), BarWidth, EndRestHeight + EndProgressHeight * EndingPieceProgress);
+	Graphics()->QuadsDrawTL(&QuadFullEnding, 1);
+	Graphics()->QuadsEnd();
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->WrapNormal();
+}
+
+void CHud::RenderDummyActions()
+{
+	if(!g_Config.m_ClShowhudDummyActions || (m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER) || !Client()->DummyConnected())
+	{
+		return;
+	}
+	// render small dummy actions hud
+	const float BoxHeight = 29.0f;
+	const float BoxWidth = 16.0f;
+
+	float StartX = m_Width - BoxWidth;
+	float StartY = 285.0f - BoxHeight - 4; // 4 units distance to the next display;
+	if(g_Config.m_ClShowhudPlayerPosition || g_Config.m_ClShowhudPlayerSpeed || g_Config.m_ClShowhudPlayerAngle)
+	{
+		StartY -= 4;
+	}
+	StartY -= GetMovementInformationBoxHeight();
+
+	if(g_Config.m_ClShowhudScore)
+	{
+		StartY -= 56;
+	}
+
+	Graphics()->DrawRect(StartX, StartY, BoxWidth, BoxHeight, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_L, 5.0f);
+
+	float y = StartY + 2;
+	float x = StartX + 2;
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+	if(g_Config.m_ClDummyHammer)
+	{
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudDummyHammer);
+	Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_DummyHammerOffset, x, y);
+	y += 13;
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+	if(g_Config.m_ClDummyCopyMoves)
+	{
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudDummyCopy);
+	Graphics()->RenderQuadContainerAsSprite(m_HudQuadContainerIndex, m_DummyCopyOffset, x, y);
+}
+
+inline int CHud::GetDigitsIndex(int Value, int Max)
+{
+	if(Value < 0)
+	{
+		Value *= -1;
+	}
+	int DigitsIndex = std::log10((Value ? Value : 1));
+	if(DigitsIndex > Max)
+	{
+		DigitsIndex = Max;
+	}
+	if(DigitsIndex < 0)
+	{
+		DigitsIndex = 0;
+	}
+	return DigitsIndex;
+}
+
+inline float CHud::GetMovementInformationBoxHeight()
+{
+	float BoxHeight = 3 * MOVEMENT_INFORMATION_LINE_HEIGHT * (g_Config.m_ClShowhudPlayerPosition + g_Config.m_ClShowhudPlayerSpeed) + 2 * MOVEMENT_INFORMATION_LINE_HEIGHT * g_Config.m_ClShowhudPlayerAngle;
+	if(g_Config.m_ClShowhudPlayerPosition || g_Config.m_ClShowhudPlayerSpeed || g_Config.m_ClShowhudPlayerAngle)
+	{
+		BoxHeight += 2;
+	}
+	return BoxHeight;
+}
+
+void CHud::RenderMovementInformation(const int ClientID)
+{
+	// Draw the infomations depending on settings: Position, speed and target angle
+	// This display is only to present the available information from the last snapshot, not to interpolate or predict
+	if(!g_Config.m_ClShowhudPlayerPosition && !g_Config.m_ClShowhudPlayerSpeed && !g_Config.m_ClShowhudPlayerAngle)
+	{
+		return;
+	}
+	const float LineSpacer = 1.0f; // above and below each entry
+	const float Fontsize = 6.0f;
+
+	float BoxHeight = GetMovementInformationBoxHeight();
+	const float BoxWidth = 62.0f;
+
+	float StartX = m_Width - BoxWidth;
+	float StartY = 285.0f - BoxHeight - 4; // 4 units distance to the next display;
+	if(g_Config.m_ClShowhudScore)
+	{
+		StartY -= 56;
+	}
+
+	Graphics()->DrawRect(StartX, StartY, BoxWidth, BoxHeight, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_L, 5.0f);
+
+	const CNetObj_Character *pPrevChar = &m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev;
+	const CNetObj_Character *pCurChar = &m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur;
+	const float IntraTick = Client()->IntraGameTick(g_Config.m_ClDummy);
+
+	// To make the player position relative to blocks we need to divide by the block size
+	const vec2 Pos = mix(vec2(pPrevChar->m_X, pPrevChar->m_Y), vec2(pCurChar->m_X, pCurChar->m_Y), IntraTick) / 32.0f;
+
+	const vec2 Vel = mix(vec2(pPrevChar->m_VelX, pPrevChar->m_VelY), vec2(pCurChar->m_VelX, pCurChar->m_VelY), IntraTick);
+
+	float VelspeedX = Vel.x / 256.0f * Client()->GameTickSpeed();
+	if(Vel.x >= -1 && Vel.x <= 1)
+	{
+		VelspeedX = 0;
+	}
+	float VelspeedY = Vel.y / 256.0f * Client()->GameTickSpeed();
+	if(Vel.y >= -128 && Vel.y <= 128)
+	{
+		VelspeedY = 0;
+	}
+	// We show the speed in Blocks per Second (Bps) and therefore have to divide by the block size
+	float DisplaySpeedX = VelspeedX / 32;
+	float VelspeedLength = length(vec2(Vel.x, Vel.y) / 256.0f) * Client()->GameTickSpeed();
+	// Todo: Use Velramp tuning of each individual player
+	// Since these tuning parameters are almost never changed, the default values are sufficient in most cases
+	float Ramp = VelocityRamp(VelspeedLength, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampStart, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampRange, m_pClient->m_aTuning[g_Config.m_ClDummy].m_VelrampCurvature);
+	DisplaySpeedX *= Ramp;
+	float DisplaySpeedY = VelspeedY / 32;
+
+	float Angle = m_pClient->m_Players.GetPlayerTargetAngle(pPrevChar, pCurChar, ClientID, IntraTick);
+	if(Angle < 0)
+	{
+		Angle += 2.0f * pi;
+	}
+	float DisplayAngle = Angle * 180.0f / pi;
+
+	char aBuf[128];
+	float w;
+
+	float y = StartY + LineSpacer * 2;
+	float xl = StartX + 2;
+	float xr = m_Width - 2;
+	int DigitsIndex;
+
+	static float s_TextWidth0 = TextRender()->TextWidth(Fontsize, "0.00", -1, -1.0f);
+	static float s_TextWidth00 = TextRender()->TextWidth(Fontsize, "00.00", -1, -1.0f);
+	static float s_TextWidth000 = TextRender()->TextWidth(Fontsize, "000.00", -1, -1.0f);
+	static float s_TextWidth0000 = TextRender()->TextWidth(Fontsize, "0000.00", -1, -1.0f);
+	static float s_TextWidth00000 = TextRender()->TextWidth(Fontsize, "00000.00", -1, -1.0f);
+	static float s_TextWidth000000 = TextRender()->TextWidth(Fontsize, "000000.00", -1, -1.0f);
+	static float s_aTextWidth[6] = {s_TextWidth0, s_TextWidth00, s_TextWidth000, s_TextWidth0000, s_TextWidth00000, s_TextWidth000000};
+	static float s_TextWidthMinus0 = TextRender()->TextWidth(Fontsize, "-0.00", -1, -1.0f);
+	static float s_TextWidthMinus00 = TextRender()->TextWidth(Fontsize, "-00.00", -1, -1.0f);
+	static float s_TextWidthMinus000 = TextRender()->TextWidth(Fontsize, "-000.00", -1, -1.0f);
+	static float s_TextWidthMinus0000 = TextRender()->TextWidth(Fontsize, "-0000.00", -1, -1.0f);
+	static float s_TextWidthMinus00000 = TextRender()->TextWidth(Fontsize, "-00000.00", -1, -1.0f);
+	static float s_TextWidthMinus000000 = TextRender()->TextWidth(Fontsize, "-000000.00", -1, -1.0f);
+	static float s_aTextWidthMinus[6] = {s_TextWidthMinus0, s_TextWidthMinus00, s_TextWidthMinus000, s_TextWidthMinus0000, s_TextWidthMinus00000, s_TextWidthMinus000000};
+
+	if(g_Config.m_ClShowhudPlayerPosition)
+	{
+		TextRender()->Text(xl, y, Fontsize, Localize("Position:"), -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+
+		TextRender()->Text(xl, y, Fontsize, "X:", -1.0f);
+		str_format(aBuf, sizeof(aBuf), "%.2f", Pos.x);
+		DigitsIndex = GetDigitsIndex(Pos.x, 5);
+		w = (Pos.x < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
+		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+
+		TextRender()->Text(xl, y, Fontsize, "Y:", -1.0f);
+		str_format(aBuf, sizeof(aBuf), "%.2f", Pos.y);
+		DigitsIndex = GetDigitsIndex(Pos.y, 5);
+		w = (Pos.y < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
+		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+	}
+
+	if(g_Config.m_ClShowhudPlayerSpeed)
+	{
+		TextRender()->Text(xl, y, Fontsize, Localize("Speed:"), -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+
+		TextRender()->Text(xl, y, Fontsize, "X:", -1.0f);
+		str_format(aBuf, sizeof(aBuf), "%.2f", DisplaySpeedX);
+		DigitsIndex = GetDigitsIndex(DisplaySpeedX, 5);
+		w = (DisplaySpeedX < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
+		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+
+		TextRender()->Text(xl, y, Fontsize, "Y:", -1.0f);
+		str_format(aBuf, sizeof(aBuf), "%.2f", DisplaySpeedY);
+		DigitsIndex = GetDigitsIndex(DisplaySpeedY, 5);
+		w = (DisplaySpeedY < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
+		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+	}
+
+	if(g_Config.m_ClShowhudPlayerAngle)
+	{
+		TextRender()->Text(xl, y, Fontsize, Localize("Angle:"), -1.0f);
+		y += MOVEMENT_INFORMATION_LINE_HEIGHT;
+		str_format(aBuf, sizeof(aBuf), "%.2f", DisplayAngle);
+		DigitsIndex = GetDigitsIndex(DisplayAngle, 5);
+		w = (DisplayAngle < 0) ? s_aTextWidthMinus[DigitsIndex] : s_aTextWidth[DigitsIndex];
+		TextRender()->Text(xr - w, y, Fontsize, aBuf, -1.0f);
+	}
+}
+
+void CHud::RenderSpectatorHud()
+{
+	// draw the box
+	Graphics()->DrawRect(m_Width - 180.0f, m_Height - 15.0f, 180.0f, 15.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_TL, 5.0f);
+
+	// draw the text
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Spectate"), GameClient()->m_MultiViewActivated ? Localize("Multi-View") : m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW ? m_pClient->m_aClients[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID].m_aName : Localize("Free-View"));
+	TextRender()->Text(m_Width - 174.0f, m_Height - 15.0f + (15.f - 8.f) / 2.f, 8.0f, aBuf, -1.0f);
+}
+
+void CHud::RenderLocalTime(float x)
+{
+	if(!g_Config.m_ClShowLocalTimeAlways && !m_pClient->m_Scoreboard.Active())
+		return;
+
+	// draw the box
+	Graphics()->DrawRect(x - 30.0f, 0.0f, 25.0f, 12.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_B, 3.75f);
+
+	// draw the text
+	char aTimeStr[6];
+	str_timestamp_format(aTimeStr, sizeof(aTimeStr), "%H:%M");
+	TextRender()->Text(x - 25.0f, (12.5f - 5.f) / 2.f, 5.0f, aTimeStr, -1.0f);
+}
+
+void CHud::OnRender()
+{
+	if(!m_pClient->m_Snap.m_pGameInfoObj)
+		return;
+
+	m_Width = 300.0f * Graphics()->ScreenAspect();
+	m_Height = 300.0f;
+	Graphics()->MapScreen(0.0f, 0.0f, m_Width, m_Height);
+
+#if defined(CONF_VIDEORECORDER)
+	if((IVideo::Current() && g_Config.m_ClVideoShowhud) || (!IVideo::Current() && g_Config.m_ClShowhud))
+#else
+	if(g_Config.m_ClShowhud)
+#endif
+	{
+		if(m_pClient->m_Snap.m_pLocalCharacter && !m_pClient->m_Snap.m_SpecInfo.m_Active && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+		{
+			if(g_Config.m_ClShowhudHealthAmmo)
+			{
+				RenderAmmoHealthAndArmor(m_pClient->m_Snap.m_pLocalCharacter);
+			}
+			if(m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData && g_Config.m_ClShowhudDDRace && GameClient()->m_GameInfo.m_HudDDRace)
+			{
+				RenderPlayerState(m_pClient->m_Snap.m_LocalClientID);
+			}
+			RenderMovementInformation(m_pClient->m_Snap.m_LocalClientID);
+			RenderDDRaceEffects();
+		}
+		else if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+		{
+			int SpectatorID = m_pClient->m_Snap.m_SpecInfo.m_SpectatorID;
+			if(SpectatorID != SPEC_FREEVIEW && g_Config.m_ClShowhudHealthAmmo)
+			{
+				RenderAmmoHealthAndArmor(&m_pClient->m_Snap.m_aCharacters[SpectatorID].m_Cur);
+			}
+			if(SpectatorID != SPEC_FREEVIEW &&
+				m_pClient->m_Snap.m_aCharacters[SpectatorID].m_HasExtendedData &&
+				g_Config.m_ClShowhudDDRace &&
+				(!GameClient()->m_MultiViewActivated || GameClient()->m_MultiViewShowHud) &&
+				GameClient()->m_GameInfo.m_HudDDRace)
+			{
+				RenderPlayerState(SpectatorID);
+			}
+			if(SpectatorID != SPEC_FREEVIEW)
+			{
+				RenderMovementInformation(SpectatorID);
+			}
+			RenderSpectatorHud();
+		}
+
+		if(g_Config.m_ClShowhudTimer)
+			RenderGameTimer();
+		RenderPauseNotification();
+		RenderSuddenDeath();
+		if(g_Config.m_ClShowhudScore)
+			RenderScoreHud();
+		RenderDummyActions();
+		RenderWarmupTimer();
+		RenderTextInfo();
+		RenderLocalTime((m_Width / 7) * 3);
+		if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+			RenderConnectionWarning();
+		RenderTeambalanceWarning();
+		RenderVoting();
+		if(g_Config.m_ClShowRecord)
+			RenderRecord();
+	}
+	RenderCursor();
+}
+
+void CHud::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(MsgType == NETMSGTYPE_SV_DDRACETIME || MsgType == NETMSGTYPE_SV_DDRACETIMELEGACY)
+	{
+		CNetMsg_Sv_DDRaceTime *pMsg = (CNetMsg_Sv_DDRaceTime *)pRawMsg;
+
+		m_DDRaceTime = pMsg->m_Time;
+
+		m_ShowFinishTime = pMsg->m_Finish != 0;
+
+		if(!m_ShowFinishTime)
+		{
+			m_TimeCpDiff = (float)pMsg->m_Check / 100;
+			m_TimeCpLastReceivedTick = Client()->GameTick(g_Config.m_ClDummy);
+		}
+		else
+		{
+			m_FinishTimeDiff = (float)pMsg->m_Check / 100;
+			m_FinishTimeLastReceivedTick = Client()->GameTick(g_Config.m_ClDummy);
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_RECORD || MsgType == NETMSGTYPE_SV_RECORDLEGACY)
+	{
+		CNetMsg_Sv_Record *pMsg = (CNetMsg_Sv_Record *)pRawMsg;
+
+		// NETMSGTYPE_SV_RACETIME on old race servers
+		if(MsgType == NETMSGTYPE_SV_RECORDLEGACY && m_pClient->m_GameInfo.m_DDRaceRecordMessage)
+		{
+			m_DDRaceTime = pMsg->m_ServerTimeBest; // First value: m_Time
+
+			m_FinishTimeLastReceivedTick = Client()->GameTick(g_Config.m_ClDummy);
+
+			if(pMsg->m_PlayerTimeBest) // Second value: m_Check
+			{
+				m_TimeCpDiff = (float)pMsg->m_PlayerTimeBest / 100;
+				m_TimeCpLastReceivedTick = Client()->GameTick(g_Config.m_ClDummy);
+			}
+		}
+		else if(MsgType == NETMSGTYPE_SV_RECORD || m_pClient->m_GameInfo.m_RaceRecordMessage)
+		{
+			m_ServerRecord = (float)pMsg->m_ServerTimeBest / 100;
+			m_aPlayerRecord[g_Config.m_ClDummy] = (float)pMsg->m_PlayerTimeBest / 100;
+		}
+	}
+}
+
+void CHud::RenderDDRaceEffects()
+{
+	if(m_DDRaceTime)
+	{
+		char aBuf[64];
+		char aTime[32];
+		if(m_ShowFinishTime && m_FinishTimeLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
+		{
+			str_time(m_DDRaceTime, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+			str_format(aBuf, sizeof(aBuf), "Finish time: %s", aTime);
+
+			// calculate alpha (4 sec 1 than get lower the next 2 sec)
+			float Alpha = 1.0f;
+			if(m_FinishTimeLastReceivedTick + Client()->GameTickSpeed() * 4 < Client()->GameTick(g_Config.m_ClDummy) && m_FinishTimeLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
+			{
+				// lower the alpha slowly to blend text out
+				Alpha = ((float)(m_FinishTimeLastReceivedTick + Client()->GameTickSpeed() * 6) - (float)Client()->GameTick(g_Config.m_ClDummy)) / (float)(Client()->GameTickSpeed() * 2);
+			}
+
+			TextRender()->TextColor(1, 1, 1, Alpha);
+			CTextCursor Cursor;
+			TextRender()->SetCursor(&Cursor, 150 * Graphics()->ScreenAspect() - TextRender()->TextWidth(12, aBuf, -1, -1.0f) / 2, 20, 12, TEXTFLAG_RENDER);
+			Cursor.m_LineWidth = -1.0f;
+			TextRender()->RecreateTextContainer(m_DDRaceEffectsTextContainerIndex, &Cursor, aBuf);
+			if(m_FinishTimeDiff != 0.0f && m_DDRaceEffectsTextContainerIndex.Valid())
+			{
+				if(m_FinishTimeDiff < 0)
+				{
+					str_time_float(-m_FinishTimeDiff, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+					str_format(aBuf, sizeof(aBuf), "-%s", aTime);
+					TextRender()->TextColor(0.5f, 1.0f, 0.5f, Alpha); // green
+				}
+				else
+				{
+					str_time_float(m_FinishTimeDiff, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+					str_format(aBuf, sizeof(aBuf), "+%s", aTime);
+					TextRender()->TextColor(1.0f, 0.5f, 0.5f, Alpha); // red
+				}
+				TextRender()->SetCursor(&Cursor, 150 * Graphics()->ScreenAspect() - TextRender()->TextWidth(10, aBuf, -1, -1.0f) / 2, 34, 10, TEXTFLAG_RENDER);
+				Cursor.m_LineWidth = -1.0f;
+				TextRender()->AppendTextContainer(m_DDRaceEffectsTextContainerIndex, &Cursor, aBuf);
+			}
+			if(m_DDRaceEffectsTextContainerIndex.Valid())
+			{
+				auto OutlineColor = TextRender()->DefaultTextOutlineColor();
+				OutlineColor.a *= Alpha;
+				TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor);
+			}
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+		}
+		else if(!m_ShowFinishTime && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
+		{
+			if(m_TimeCpDiff < 0)
+			{
+				str_time_float(-m_TimeCpDiff, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+				str_format(aBuf, sizeof(aBuf), "-%s", aTime);
+			}
+			else
+			{
+				str_time_float(m_TimeCpDiff, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+				str_format(aBuf, sizeof(aBuf), "+%s", aTime);
+			}
+
+			// calculate alpha (4 sec 1 than get lower the next 2 sec)
+			float Alpha = 1.0f;
+			if(m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 4 < Client()->GameTick(g_Config.m_ClDummy) && m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6 > Client()->GameTick(g_Config.m_ClDummy))
+			{
+				// lower the alpha slowly to blend text out
+				Alpha = ((float)(m_TimeCpLastReceivedTick + Client()->GameTickSpeed() * 6) - (float)Client()->GameTick(g_Config.m_ClDummy)) / (float)(Client()->GameTickSpeed() * 2);
+			}
+
+			if(m_TimeCpDiff > 0)
+				TextRender()->TextColor(1.0f, 0.5f, 0.5f, Alpha); // red
+			else if(m_TimeCpDiff < 0)
+				TextRender()->TextColor(0.5f, 1.0f, 0.5f, Alpha); // green
+			else if(!m_TimeCpDiff)
+				TextRender()->TextColor(1, 1, 1, Alpha); // white
+
+			CTextCursor Cursor;
+			TextRender()->SetCursor(&Cursor, 150 * Graphics()->ScreenAspect() - TextRender()->TextWidth(10, aBuf, -1, -1.0f) / 2, 20, 10, TEXTFLAG_RENDER);
+			Cursor.m_LineWidth = -1.0f;
+			TextRender()->RecreateTextContainer(m_DDRaceEffectsTextContainerIndex, &Cursor, aBuf);
+
+			if(m_DDRaceEffectsTextContainerIndex.Valid())
+			{
+				auto OutlineColor = TextRender()->DefaultTextOutlineColor();
+				OutlineColor.a *= Alpha;
+				TextRender()->RenderTextContainer(m_DDRaceEffectsTextContainerIndex, TextRender()->DefaultTextColor(), OutlineColor);
+			}
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+		}
+	}
+}
+
+void CHud::RenderRecord()
+{
+	if(m_ServerRecord > 0.0f)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), Localize("Server best:"));
+		TextRender()->Text(5, 75, 6, aBuf, -1.0f);
+		char aTime[32];
+		str_time_float(m_ServerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+		str_format(aBuf, sizeof(aBuf), "%s%s", m_ServerRecord > 3600 ? "" : "   ", aTime);
+		TextRender()->Text(53, 75, 6, aBuf, -1.0f);
+	}
+
+	const float PlayerRecord = m_aPlayerRecord[g_Config.m_ClDummy];
+	if(PlayerRecord > 0.0f)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"));
+		TextRender()->Text(5, 82, 6, aBuf, -1.0f);
+		char aTime[32];
+		str_time_float(PlayerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+		str_format(aBuf, sizeof(aBuf), "%s%s", PlayerRecord > 3600 ? "" : "   ", aTime);
+		TextRender()->Text(53, 82, 6, aBuf, -1.0f);
+	}
+}
diff --git a/src_bkp/game/client/components/hud.h b/src_bkp/game/client/components/hud.h
new file mode 100644
index 0000000000..f292dd0b1c
--- /dev/null
+++ b/src_bkp/game/client/components/hud.h
@@ -0,0 +1,136 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_HUD_H
+#define GAME_CLIENT_COMPONENTS_HUD_H
+#include <game/client/component.h>
+
+struct SScoreInfo
+{
+	SScoreInfo()
+	{
+		Reset();
+	}
+
+	void Reset()
+	{
+		m_TextRankContainerIndex.Reset();
+		m_TextScoreContainerIndex.Reset();
+		m_RoundRectQuadContainerIndex = -1;
+		m_OptionalNameTextContainerIndex.Reset();
+		m_aScoreText[0] = 0;
+		m_aRankText[0] = 0;
+		m_aPlayerNameText[0] = 0;
+		m_ScoreTextWidth = 0.f;
+		m_Initialized = false;
+	}
+
+	STextContainerIndex m_TextRankContainerIndex;
+	STextContainerIndex m_TextScoreContainerIndex;
+	float m_ScoreTextWidth;
+	char m_aScoreText[16];
+	char m_aRankText[16];
+	char m_aPlayerNameText[MAX_NAME_LENGTH];
+	int m_RoundRectQuadContainerIndex;
+	STextContainerIndex m_OptionalNameTextContainerIndex;
+
+	bool m_Initialized;
+};
+
+class CHud : public CComponent
+{
+	float m_Width, m_Height;
+	float m_FrameTimeAvg;
+
+	int m_HudQuadContainerIndex;
+	SScoreInfo m_aScoreInfo[2];
+	STextContainerIndex m_FPSTextContainerIndex;
+	STextContainerIndex m_DDRaceEffectsTextContainerIndex;
+
+	void RenderCursor();
+
+	void RenderTextInfo();
+	void RenderConnectionWarning();
+	void RenderTeambalanceWarning();
+	void RenderVoting();
+
+	void PrepareAmmoHealthAndArmorQuads();
+	void RenderAmmoHealthAndArmor(const CNetObj_Character *pCharacter);
+
+	void PreparePlayerStateQuads();
+	void RenderPlayerState(const int ClientID);
+	void RenderDummyActions();
+	void RenderMovementInformation(const int ClientID);
+
+	void RenderGameTimer();
+	void RenderPauseNotification();
+	void RenderSuddenDeath();
+	void RenderScoreHud();
+	void RenderSpectatorHud();
+	void RenderWarmupTimer();
+	void RenderLocalTime(float x);
+
+	static constexpr float MOVEMENT_INFORMATION_LINE_HEIGHT = 8.0f;
+
+public:
+	CHud();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void ResetHudContainers();
+	virtual void OnWindowResize() override;
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+	virtual void OnInit() override;
+
+	// DDRace
+
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	void RenderNinjaBarPos(float x, const float y, const float width, const float height, float Progress, float Alpha = 1.0f);
+
+private:
+	void RenderRecord();
+	void RenderDDRaceEffects();
+	float m_TimeCpDiff;
+	float m_ServerRecord;
+	float m_aPlayerRecord[NUM_DUMMIES];
+	float m_FinishTimeDiff;
+	int m_DDRaceTime;
+	int m_FinishTimeLastReceivedTick;
+	int m_TimeCpLastReceivedTick;
+	bool m_ShowFinishTime;
+
+	inline float GetMovementInformationBoxHeight();
+	inline int GetDigitsIndex(int Value, int Max);
+
+	// Quad Offsets
+	int m_aAmmoOffset[NUM_WEAPONS];
+	int m_HealthOffset;
+	int m_EmptyHealthOffset;
+	int m_ArmorOffset;
+	int m_EmptyArmorOffset;
+	int m_aCursorOffset[NUM_WEAPONS];
+	int m_FlagOffset;
+	int m_AirjumpOffset;
+	int m_AirjumpEmptyOffset;
+	int m_aWeaponOffset[NUM_WEAPONS];
+	int m_EndlessJumpOffset;
+	int m_EndlessHookOffset;
+	int m_JetpackOffset;
+	int m_TeleportGrenadeOffset;
+	int m_TeleportGunOffset;
+	int m_TeleportLaserOffset;
+	int m_SoloOffset;
+	int m_CollisionDisabledOffset;
+	int m_HookHitDisabledOffset;
+	int m_HammerHitDisabledOffset;
+	int m_GunHitDisabledOffset;
+	int m_ShotgunHitDisabledOffset;
+	int m_GrenadeHitDisabledOffset;
+	int m_LaserHitDisabledOffset;
+	int m_DeepFrozenOffset;
+	int m_LiveFrozenOffset;
+	int m_DummyHammerOffset;
+	int m_DummyCopyOffset;
+	int m_PracticeModeOffset;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/infomessages.cpp b/src_bkp/game/client/components/infomessages.cpp
new file mode 100644
index 0000000000..d461d67051
--- /dev/null
+++ b/src_bkp/game/client/components/infomessages.cpp
@@ -0,0 +1,566 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
+#include <engine/textrender.h>
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+#include <game/localization.h>
+
+#include "infomessages.h"
+#include <game/client/animstate.h>
+#include <game/client/gameclient.h>
+#include <game/client/prediction/entities/character.h>
+#include <game/client/prediction/gameworld.h>
+
+void CInfoMessages::OnWindowResize()
+{
+	for(auto &InfoMsg : m_aInfoMsgs)
+	{
+		DeleteTextContainers(&InfoMsg);
+	}
+}
+
+void CInfoMessages::OnReset()
+{
+	m_InfoMsgCurrent = 0;
+	for(auto &InfoMsg : m_aInfoMsgs)
+	{
+		InfoMsg.m_Tick = -100000;
+		DeleteTextContainers(&InfoMsg);
+	}
+}
+
+void CInfoMessages::DeleteTextContainers(CInfoMsg *pInfoMsg)
+{
+	TextRender()->DeleteTextContainer(pInfoMsg->m_VictimTextContainerIndex);
+	TextRender()->DeleteTextContainer(pInfoMsg->m_KillerTextContainerIndex);
+	TextRender()->DeleteTextContainer(pInfoMsg->m_DiffTextContainerIndex);
+	TextRender()->DeleteTextContainer(pInfoMsg->m_TimeTextContainerIndex);
+}
+
+void CInfoMessages::OnInit()
+{
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	m_SpriteQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_SpriteQuadContainerIndex, 0.f, 0.f, 28.f, 56.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_SpriteQuadContainerIndex, 0.f, 0.f, 28.f, 56.f);
+
+	Graphics()->QuadsSetSubset(1, 0, 0, 1);
+	RenderTools()->QuadContainerAddSprite(m_SpriteQuadContainerIndex, 0.f, 0.f, 28.f, 56.f);
+	Graphics()->QuadsSetSubset(1, 0, 0, 1);
+	RenderTools()->QuadContainerAddSprite(m_SpriteQuadContainerIndex, 0.f, 0.f, 28.f, 56.f);
+
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		float ScaleX, ScaleY;
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_pSpriteBody, ScaleX, ScaleY);
+		RenderTools()->QuadContainerAddSprite(m_SpriteQuadContainerIndex, 96.f * ScaleX, 96.f * ScaleY);
+	}
+	Graphics()->QuadContainerUpload(m_SpriteQuadContainerIndex);
+}
+
+void CInfoMessages::AddInfoMsg(EType Type, CInfoMsg NewMsg)
+{
+	NewMsg.m_Type = Type;
+	NewMsg.m_Tick = Client()->GameTick(g_Config.m_ClDummy);
+
+	m_InfoMsgCurrent = (m_InfoMsgCurrent + 1) % MAX_INFOMSGS;
+	DeleteTextContainers(&m_aInfoMsgs[m_InfoMsgCurrent]);
+	m_aInfoMsgs[m_InfoMsgCurrent] = NewMsg;
+}
+
+void CInfoMessages::CreateNamesIfNotCreated(CInfoMsg *pInfoMsg)
+{
+	const float FontSize = 36.0f;
+	if(!pInfoMsg->m_VictimTextContainerIndex.Valid() && pInfoMsg->m_aVictimName[0] != 0)
+	{
+		pInfoMsg->m_VictimTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aVictimName);
+
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = -1;
+
+		unsigned Color = g_Config.m_ClKillMessageNormalColor;
+		if(pInfoMsg->m_aVictimIds[0] == m_pClient->m_Snap.m_LocalClientID)
+		{
+			Color = g_Config.m_ClKillMessageHighlightColor;
+		}
+		TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(Color)));
+
+		TextRender()->CreateTextContainer(pInfoMsg->m_VictimTextContainerIndex, &Cursor, pInfoMsg->m_aVictimName);
+	}
+
+	if(!pInfoMsg->m_KillerTextContainerIndex.Valid() && pInfoMsg->m_aKillerName[0] != 0)
+	{
+		pInfoMsg->m_KillerTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aKillerName);
+
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = -1;
+
+		unsigned Color = g_Config.m_ClKillMessageNormalColor;
+		if(pInfoMsg->m_KillerID == m_pClient->m_Snap.m_LocalClientID)
+		{
+			Color = g_Config.m_ClKillMessageHighlightColor;
+		}
+		TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(Color)));
+
+		TextRender()->CreateTextContainer(pInfoMsg->m_KillerTextContainerIndex, &Cursor, pInfoMsg->m_aKillerName);
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+}
+
+void CInfoMessages::CreateFinishTextContainersIfNotCreated(CInfoMsg *pInfoMsg)
+{
+	const float FontSize = 36.0f;
+	if(!pInfoMsg->m_DiffTextContainerIndex.Valid() && pInfoMsg->m_aDiffText[0] != 0)
+	{
+		pInfoMsg->m_DiffTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aDiffText);
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = -1;
+
+		if(pInfoMsg->m_Diff > 0)
+			TextRender()->TextColor(1.0f, 0.5f, 0.5f, 1); // red
+		else if(pInfoMsg->m_Diff < 0)
+			TextRender()->TextColor(0.5f, 1.0f, 0.5f, 1); // green
+		else
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+		TextRender()->CreateTextContainer(pInfoMsg->m_DiffTextContainerIndex, &Cursor, pInfoMsg->m_aDiffText);
+	}
+	if(!pInfoMsg->m_TimeTextContainerIndex.Valid() && pInfoMsg->m_aTimeText[0] != 0)
+	{
+		pInfoMsg->m_TimeTextWidth = TextRender()->TextWidth(FontSize, pInfoMsg->m_aTimeText);
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = -1;
+
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+		TextRender()->CreateTextContainer(pInfoMsg->m_TimeTextContainerIndex, &Cursor, pInfoMsg->m_aTimeText);
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+}
+
+void CInfoMessages::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+
+	if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM && g_Config.m_ClShowKillMessages)
+	{
+		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
+
+		CInfoMsg Kill{};
+
+		std::vector<std::pair<int, int>> vStrongWeakSorted;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team)
+			{
+				CCharacter *pChr = m_pClient->m_GameWorld.GetCharacterByID(i);
+				vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChr ? pChr->GetStrongWeakID() : 0);
+			}
+		}
+
+		std::stable_sort(vStrongWeakSorted.begin(), vStrongWeakSorted.end(), [](auto &Left, auto &Right) { return Left.second > Right.second; });
+
+		Kill.m_TeamSize = vStrongWeakSorted.size();
+		if(Kill.m_TeamSize > MAX_KILLMSG_TEAM_MEMBERS)
+			Kill.m_TeamSize = MAX_KILLMSG_TEAM_MEMBERS;
+
+		Kill.m_VictimDDTeam = pMsg->m_Team;
+		for(int i = 0; i < Kill.m_TeamSize; i++)
+		{
+			if(m_pClient->m_aClients[vStrongWeakSorted[i].first].m_Active)
+			{
+				Kill.m_aVictimIds[i] = vStrongWeakSorted[i].first;
+				Kill.m_aVictimRenderInfo[i] = m_pClient->m_aClients[vStrongWeakSorted[i].first].m_RenderInfo;
+			}
+			else
+			{
+				Kill.m_aVictimIds[i] = -1;
+				Kill.m_aVictimRenderInfo[i].Reset();
+			}
+		}
+		for(int i = Kill.m_TeamSize; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
+		{
+			Kill.m_aVictimIds[i] = -1;
+			Kill.m_aVictimRenderInfo[i].Reset();
+		}
+		str_format(Kill.m_aVictimName, sizeof(Kill.m_aVictimName), Localize("Team %d"), pMsg->m_Team);
+
+		Kill.m_KillerID = -1;
+		Kill.m_aKillerName[0] = '\0';
+		Kill.m_KillerRenderInfo.Reset();
+
+		Kill.m_Weapon = -1;
+		Kill.m_ModeSpecial = 0;
+
+		Kill.m_VictimTextWidth = Kill.m_KillerTextWidth = 0.f;
+
+		float Height = 400 * 3.0f;
+		float Width = Height * Graphics()->ScreenAspect();
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
+
+		CreateNamesIfNotCreated(&Kill);
+
+		bool KillMsgValid = true;
+		for(int i = 0; i < Kill.m_TeamSize; i++)
+		{
+			KillMsgValid = KillMsgValid && Kill.m_aVictimIds[i] >= 0 && ((Kill.m_aVictimRenderInfo[i].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[i].m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_aVictimRenderInfo[i].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[i].m_OriginalRenderSkin.m_Body.IsValid()));
+		}
+
+		if(KillMsgValid)
+		{
+			AddInfoMsg(EType::TYPE_KILL, Kill);
+		}
+		else
+		{
+			DeleteTextContainers(&Kill);
+		}
+
+		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	}
+
+	if(MsgType == NETMSGTYPE_SV_KILLMSG && g_Config.m_ClShowKillMessages)
+	{
+		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
+
+		CInfoMsg Kill{};
+
+		Kill.m_TeamSize = 1;
+		Kill.m_aVictimIds[0] = pMsg->m_Victim;
+		if(Kill.m_aVictimIds[0] >= 0 && Kill.m_aVictimIds[0] < MAX_CLIENTS)
+		{
+			Kill.m_VictimDDTeam = m_pClient->m_Teams.Team(Kill.m_aVictimIds[0]);
+			str_copy(Kill.m_aVictimName, m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_aName);
+			Kill.m_aVictimRenderInfo[0] = m_pClient->m_aClients[Kill.m_aVictimIds[0]].m_RenderInfo;
+		}
+		else
+		{
+			Kill.m_VictimDDTeam = 0;
+			Kill.m_aVictimName[0] = '\0';
+		}
+		for(int i = Kill.m_TeamSize; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
+		{
+			Kill.m_aVictimIds[i] = -1;
+			Kill.m_aVictimRenderInfo[i].Reset();
+		}
+
+		Kill.m_KillerID = pMsg->m_Killer;
+		if(Kill.m_KillerID >= 0 && Kill.m_KillerID < MAX_CLIENTS)
+		{
+			str_copy(Kill.m_aKillerName, m_pClient->m_aClients[Kill.m_KillerID].m_aName);
+			Kill.m_KillerRenderInfo = m_pClient->m_aClients[Kill.m_KillerID].m_RenderInfo;
+		}
+		else
+		{
+			Kill.m_aKillerName[0] = '\0';
+			Kill.m_KillerRenderInfo.Reset();
+		}
+
+		Kill.m_Weapon = pMsg->m_Weapon;
+		Kill.m_ModeSpecial = pMsg->m_ModeSpecial;
+
+		Kill.m_FlagCarrierBlue = m_pClient->m_Snap.m_pGameDataObj ? m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue : -1;
+
+		Kill.m_VictimTextWidth = Kill.m_KillerTextWidth = 0.f;
+
+		float Height = 400 * 3.0f;
+		float Width = Height * Graphics()->ScreenAspect();
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
+
+		CreateNamesIfNotCreated(&Kill);
+
+		bool KillMsgValid = (Kill.m_aVictimRenderInfo[0].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[0].m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_aVictimRenderInfo[0].m_CustomColoredSkin && Kill.m_aVictimRenderInfo[0].m_OriginalRenderSkin.m_Body.IsValid());
+		KillMsgValid &= Kill.m_KillerID == -1 || ((Kill.m_KillerRenderInfo.m_CustomColoredSkin && Kill.m_KillerRenderInfo.m_ColorableRenderSkin.m_Body.IsValid()) || (!Kill.m_KillerRenderInfo.m_CustomColoredSkin && Kill.m_KillerRenderInfo.m_OriginalRenderSkin.m_Body.IsValid()));
+		if(KillMsgValid)
+		{
+			AddInfoMsg(EType::TYPE_KILL, Kill);
+		}
+		else
+		{
+			DeleteTextContainers(&Kill);
+		}
+
+		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	}
+
+	if(MsgType == NETMSGTYPE_SV_RACEFINISH && g_Config.m_ClShowFinishMessages)
+	{
+		CNetMsg_Sv_RaceFinish *pMsg = (CNetMsg_Sv_RaceFinish *)pRawMsg;
+
+		char aBuf[256];
+
+		CInfoMsg Finish;
+		Finish.m_TeamSize = 1;
+		Finish.m_aVictimIds[0] = pMsg->m_ClientID;
+		Finish.m_VictimDDTeam = m_pClient->m_Teams.Team(Finish.m_aVictimIds[0]);
+		str_copy(Finish.m_aVictimName, m_pClient->m_aClients[Finish.m_aVictimIds[0]].m_aName);
+		Finish.m_aVictimRenderInfo[0] = m_pClient->m_aClients[pMsg->m_ClientID].m_RenderInfo;
+
+		Finish.m_aKillerName[0] = '\0';
+
+		Finish.m_Diff = pMsg->m_Diff;
+		Finish.m_RecordPersonal = (pMsg->m_RecordPersonal || pMsg->m_RecordServer);
+
+		// diff time text
+		if(Finish.m_Diff)
+		{
+			if(Finish.m_Diff < 0)
+			{
+				str_time_float(-Finish.m_Diff / 1000.0f, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+				str_format(Finish.m_aDiffText, sizeof(Finish.m_aDiffText), "(-%s)", aBuf);
+			}
+			else
+			{
+				str_time_float(Finish.m_Diff / 1000.0f, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+				str_format(Finish.m_aDiffText, sizeof(Finish.m_aDiffText), "(+%s)", aBuf);
+			}
+		}
+		else
+		{
+			Finish.m_aDiffText[0] = '\0';
+		}
+
+		// finish time text
+		str_time_float(pMsg->m_Time / 1000.0f, TIME_HOURS_CENTISECS, Finish.m_aTimeText, sizeof(Finish.m_aTimeText));
+
+		float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+		float Height = 400 * 3.0f;
+		float Width = Height * Graphics()->ScreenAspect();
+		Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+		Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
+
+		CreateNamesIfNotCreated(&Finish);
+		CreateFinishTextContainersIfNotCreated(&Finish);
+
+		AddInfoMsg(EType::TYPE_FINISH, Finish);
+
+		Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+	}
+}
+
+void CInfoMessages::RenderKillMsg(CInfoMsg *pInfoMsg, float x, float y)
+{
+	// render victim name
+	x -= pInfoMsg->m_VictimTextWidth;
+	ColorRGBA TextColor;
+	if(g_Config.m_ClChatTeamColors && pInfoMsg->m_VictimDDTeam)
+		TextColor = m_pClient->GetDDTeamColor(pInfoMsg->m_VictimDDTeam, 0.75f);
+	else
+		TextColor = TextRender()->DefaultTextColor();
+
+	CreateNamesIfNotCreated(pInfoMsg);
+
+	if(pInfoMsg->m_VictimTextContainerIndex.Valid())
+		TextRender()->RenderTextContainer(pInfoMsg->m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+
+	// render victim tee
+	x -= 24.0f;
+
+	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS)
+	{
+		if(pInfoMsg->m_ModeSpecial & 1)
+		{
+			int QuadOffset = 0;
+			if(pInfoMsg->m_aVictimIds[0] == pInfoMsg->m_FlagCarrierBlue)
+				++QuadOffset;
+
+			if(QuadOffset == 0)
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+			else
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+
+			Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x, y - 16);
+		}
+	}
+
+	for(int j = (pInfoMsg->m_TeamSize - 1); j >= 0; j--)
+	{
+		if(pInfoMsg->m_aVictimIds[j] < 0)
+			continue;
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[j], OffsetToMid);
+		const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
+		RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[j], EMOTE_PAIN, vec2(-1, 0), TeeRenderPos);
+
+		x -= 44.0f;
+	}
+
+	// render weapon
+	x -= 32.0f;
+	if(pInfoMsg->m_Weapon >= 0)
+	{
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[pInfoMsg->m_Weapon]);
+		Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, 4 + pInfoMsg->m_Weapon, x, y + 28);
+	}
+	x -= 52.0f;
+
+	if(pInfoMsg->m_aVictimIds[0] != pInfoMsg->m_KillerID)
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS)
+		{
+			if(pInfoMsg->m_ModeSpecial & 2)
+			{
+				int QuadOffset = 2;
+				if(pInfoMsg->m_KillerID == pInfoMsg->m_FlagCarrierBlue)
+					++QuadOffset;
+
+				if(QuadOffset == 2)
+					Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+				else
+					Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+
+				Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, QuadOffset, x - 56, y - 16);
+			}
+		}
+
+		// render killer tee
+		x -= 24.0f;
+
+		if(pInfoMsg->m_KillerID >= 0)
+		{
+			const CAnimState *pIdleState = CAnimState::GetIdle();
+			vec2 OffsetToMid;
+			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_KillerRenderInfo, OffsetToMid);
+			const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
+			RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_KillerRenderInfo, EMOTE_ANGRY, vec2(1, 0), TeeRenderPos);
+		}
+
+		x -= 32.0f;
+
+		// render killer name
+		x -= pInfoMsg->m_KillerTextWidth;
+
+		if(pInfoMsg->m_KillerTextContainerIndex.Valid())
+			TextRender()->RenderTextContainer(pInfoMsg->m_KillerTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+	}
+}
+
+void CInfoMessages::RenderFinishMsg(CInfoMsg *pInfoMsg, float x, float y)
+{
+	// render time diff
+	CreateFinishTextContainersIfNotCreated(pInfoMsg);
+
+	if(pInfoMsg->m_Diff)
+	{
+		x -= pInfoMsg->m_DiffTextWidth;
+
+		if(pInfoMsg->m_DiffTextContainerIndex.Valid())
+			TextRender()->RenderTextContainer(pInfoMsg->m_DiffTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+	}
+
+	// render time
+	x -= pInfoMsg->m_TimeTextWidth;
+
+	if(pInfoMsg->m_TimeTextContainerIndex.Valid())
+		TextRender()->RenderTextContainer(pInfoMsg->m_TimeTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+
+	// render flag
+	x -= 52.0f;
+
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_RACEFLAG].m_Id);
+	Graphics()->QuadsBegin();
+	IGraphics::CQuadItem QuadItem(x, y, 52, 52);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// render victim name
+	ColorRGBA TextColor;
+	x -= pInfoMsg->m_VictimTextWidth;
+	if(g_Config.m_ClChatTeamColors && pInfoMsg->m_VictimDDTeam)
+		TextColor = m_pClient->GetDDTeamColor(pInfoMsg->m_VictimDDTeam, 0.75f);
+	else
+		TextColor = TextRender()->DefaultTextColor();
+
+	CreateNamesIfNotCreated(pInfoMsg);
+
+	if(pInfoMsg->m_VictimTextContainerIndex.Valid())
+		TextRender()->RenderTextContainer(pInfoMsg->m_VictimTextContainerIndex, TextColor, TextRender()->DefaultTextOutlineColor(), x, y + (46.f - 36.f) / 2.f);
+
+	// render victim tee
+	x -= 24.0f;
+
+	const CAnimState *pIdleState = CAnimState::GetIdle();
+	vec2 OffsetToMid;
+	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[0], OffsetToMid);
+	const vec2 TeeRenderPos = vec2(x, y + 46.0f / 2.0f + OffsetToMid.y);
+	const int Emote = pInfoMsg->m_RecordPersonal ? EMOTE_HAPPY : EMOTE_NORMAL;
+	RenderTools()->RenderTee(pIdleState, &pInfoMsg->m_aVictimRenderInfo[0], Emote, vec2(-1, 0), TeeRenderPos);
+}
+
+void CInfoMessages::OnRender()
+{
+	float Height = 400 * 3.0f;
+	float Width = Height * Graphics()->ScreenAspect();
+
+	Graphics()->MapScreen(0, 0, Width * 1.5f, Height * 1.5f);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	float StartX = Width * 1.5f - 10.0f;
+	float y = 30.0f + 100.0f * ((g_Config.m_ClShowfps ? 1 : 0) + (g_Config.m_ClShowpred && Client()->State() != IClient::STATE_DEMOPLAYBACK));
+
+	for(int i = 1; i <= MAX_INFOMSGS; i++)
+	{
+		CInfoMsg *pInfoMsg = &m_aInfoMsgs[(m_InfoMsgCurrent + i) % MAX_INFOMSGS];
+		if(Client()->GameTick(g_Config.m_ClDummy) > pInfoMsg->m_Tick + Client()->GameTickSpeed() * 10)
+			continue;
+
+		if(pInfoMsg->m_Type == EType::TYPE_KILL && g_Config.m_ClShowKillMessages)
+		{
+			RenderKillMsg(pInfoMsg, StartX, y);
+			y += 46.0f;
+		}
+		else if(pInfoMsg->m_Type == EType::TYPE_FINISH && g_Config.m_ClShowFinishMessages)
+		{
+			RenderFinishMsg(pInfoMsg, StartX, y);
+			y += 46.0f;
+		}
+	}
+}
+
+void CInfoMessages::RefindSkins()
+{
+	for(auto &InfoMsg : m_aInfoMsgs)
+	{
+		InfoMsg.m_KillerRenderInfo.Reset();
+		if(InfoMsg.m_KillerID >= 0)
+		{
+			const CGameClient::CClientData &Client = GameClient()->m_aClients[InfoMsg.m_KillerID];
+			if(Client.m_Active && Client.m_aSkinName[0] != '\0')
+				InfoMsg.m_KillerRenderInfo = Client.m_RenderInfo;
+			else
+				InfoMsg.m_KillerID = -1;
+		}
+
+		for(int i = 0; i < MAX_KILLMSG_TEAM_MEMBERS; i++)
+		{
+			InfoMsg.m_aVictimRenderInfo[i].Reset();
+			if(InfoMsg.m_aVictimIds[i] >= 0)
+			{
+				const CGameClient::CClientData &Client = GameClient()->m_aClients[InfoMsg.m_aVictimIds[i]];
+				if(Client.m_Active && Client.m_aSkinName[0] != '\0')
+					InfoMsg.m_aVictimRenderInfo[i] = Client.m_RenderInfo;
+				else
+					InfoMsg.m_aVictimIds[i] = -1;
+			}
+		}
+	}
+}
diff --git a/src_bkp/game/client/components/infomessages.h b/src_bkp/game/client/components/infomessages.h
new file mode 100644
index 0000000000..680c46c651
--- /dev/null
+++ b/src_bkp/game/client/components/infomessages.h
@@ -0,0 +1,83 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_INFOMESSAGES_H
+#define GAME_CLIENT_COMPONENTS_INFOMESSAGES_H
+#include <game/client/component.h>
+
+#include <game/client/render.h>
+class CInfoMessages : public CComponent
+{
+	int m_SpriteQuadContainerIndex;
+	enum
+	{
+		MAX_INFOMSGS = 5,
+		MAX_KILLMSG_TEAM_MEMBERS = 4,
+	};
+
+	enum EType
+	{
+		TYPE_KILL,
+		TYPE_FINISH,
+	};
+
+public:
+	// info messages
+	struct CInfoMsg
+	{
+		EType m_Type;
+		int m_Tick;
+
+		int m_aVictimIds[MAX_KILLMSG_TEAM_MEMBERS];
+		int m_VictimDDTeam;
+		char m_aVictimName[64];
+		STextContainerIndex m_VictimTextContainerIndex;
+		float m_VictimTextWidth;
+		CTeeRenderInfo m_aVictimRenderInfo[MAX_KILLMSG_TEAM_MEMBERS];
+		int m_KillerID;
+		char m_aKillerName[64];
+		STextContainerIndex m_KillerTextContainerIndex;
+		float m_KillerTextWidth;
+		CTeeRenderInfo m_KillerRenderInfo;
+
+		// kill msg
+		int m_Weapon;
+		int m_ModeSpecial; // for CTF, if the guy is carrying a flag for example
+		int m_FlagCarrierBlue;
+		int m_TeamSize;
+
+		// finish msg
+		int m_Diff;
+		char m_aTimeText[32];
+		char m_aDiffText[32];
+		STextContainerIndex m_TimeTextContainerIndex;
+		STextContainerIndex m_DiffTextContainerIndex;
+		float m_TimeTextWidth;
+		float m_DiffTextWidth;
+		bool m_RecordPersonal;
+	};
+
+private:
+	void AddInfoMsg(EType Type, CInfoMsg NewMsg);
+	void RenderKillMsg(CInfoMsg *pInfoMsg, float x, float y);
+	void RenderFinishMsg(CInfoMsg *pInfoMsg, float x, float y);
+
+	void CreateNamesIfNotCreated(CInfoMsg *pInfoMsg);
+	void CreateFinishTextContainersIfNotCreated(CInfoMsg *pInfoMsg);
+
+	void DeleteTextContainers(CInfoMsg *pInfoMsg);
+
+public:
+	CInfoMsg m_aInfoMsgs[MAX_INFOMSGS];
+	int m_InfoMsgCurrent;
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnWindowResize() override;
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual void OnInit() override;
+
+	void RefindSkins();
+};
+
+#endif
diff --git a/src_bkp/game/client/components/items.cpp b/src_bkp/game/client/components/items.cpp
new file mode 100644
index 0000000000..d3f8b21dd3
--- /dev/null
+++ b/src_bkp/game/client/components/items.cpp
@@ -0,0 +1,662 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include <game/mapitems.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/laser_data.h>
+#include <game/client/pickup_data.h>
+#include <game/client/projectile_data.h>
+#include <game/client/render.h>
+
+#include <game/client/prediction/entities/laser.h>
+#include <game/client/prediction/entities/pickup.h>
+#include <game/client/prediction/entities/projectile.h>
+
+#include <game/client/components/effects.h>
+
+#include "items.h"
+
+void CItems::RenderProjectile(const CProjectileData *pCurrent, int ItemID)
+{
+	int CurWeapon = clamp(pCurrent->m_Type, 0, NUM_WEAPONS - 1);
+
+	// get positions
+	float Curvature = 0;
+	float Speed = 0;
+	const CTuningParams *pTuning = GameClient()->GetTuning(pCurrent->m_TuneZone);
+	if(CurWeapon == WEAPON_GRENADE)
+	{
+		Curvature = pTuning->m_GrenadeCurvature;
+		Speed = pTuning->m_GrenadeSpeed;
+	}
+	else if(CurWeapon == WEAPON_SHOTGUN)
+	{
+		Curvature = pTuning->m_ShotgunCurvature;
+		Speed = pTuning->m_ShotgunSpeed;
+	}
+	else if(CurWeapon == WEAPON_GUN)
+	{
+		Curvature = pTuning->m_GunCurvature;
+		Speed = pTuning->m_GunSpeed;
+	}
+
+	bool LocalPlayerInGame = false;
+
+	if(m_pClient->m_Snap.m_pLocalInfo)
+		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientID].m_Team != TEAM_SPECTATORS;
+
+	static float s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
+	if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+		s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
+
+	bool IsOtherTeam = (pCurrent->m_ExtraInfo && pCurrent->m_Owner >= 0 && m_pClient->IsOtherTeam(pCurrent->m_Owner));
+
+	float Ct;
+	if(m_pClient->Predict() && m_pClient->AntiPingGrenade() && LocalPlayerInGame && !IsOtherTeam)
+		Ct = ((float)(Client()->PredGameTick(g_Config.m_ClDummy) - 1 - pCurrent->m_StartTick) + Client()->PredIntraGameTick(g_Config.m_ClDummy)) / (float)Client()->GameTickSpeed();
+	else
+		Ct = (Client()->PrevGameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) / (float)Client()->GameTickSpeed() + s_LastGameTickTime;
+	if(Ct < 0)
+	{
+		if(Ct > -s_LastGameTickTime / 2)
+		{
+			// Fixup the timing which might be screwed during demo playback because
+			// s_LastGameTickTime depends on the system timer, while the other part
+			// (Client()->PrevGameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) / (float)Client()->GameTickSpeed()
+			// is virtually constant (for projectiles fired on the current game tick):
+			// (x - (x+2)) / 50 = -0.04
+			//
+			// We have a strict comparison for the passed time being more than the time between ticks
+			// if(CurtickStart > m_Info.m_CurrentTime) in CDemoPlayer::Update()
+			// so on the practice the typical value of s_LastGameTickTime varies from 0.02386 to 0.03999
+			// which leads to Ct from -0.00001 to -0.01614.
+			// Round up those to 0.0 to fix missing rendering of the projectile.
+			Ct = 0;
+		}
+		else
+		{
+			return; // projectile haven't been shot yet
+		}
+	}
+
+	vec2 Pos = CalcPos(pCurrent->m_StartPos, pCurrent->m_StartVel, Curvature, Speed, Ct);
+	vec2 PrevPos = CalcPos(pCurrent->m_StartPos, pCurrent->m_StartVel, Curvature, Speed, Ct - 0.001f);
+
+	float Alpha = 1.f;
+	if(IsOtherTeam)
+	{
+		Alpha = g_Config.m_ClShowOthersAlpha / 100.0f;
+	}
+
+	vec2 Vel = Pos - PrevPos;
+
+	// add particle for this projectile
+	// don't check for validity of the projectile for the current weapon here, so particle effects are rendered for mod compatibility
+	if(CurWeapon == WEAPON_GRENADE)
+	{
+		m_pClient->m_Effects.SmokeTrail(Pos, Vel * -1, Alpha);
+		static float s_Time = 0.0f;
+		static float s_LastLocalTime = LocalTime();
+
+		if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		{
+			const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+			if(!pInfo->m_Paused)
+				s_Time += (LocalTime() - s_LastLocalTime) * pInfo->m_Speed;
+		}
+		else
+		{
+			if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+				s_Time += LocalTime() - s_LastLocalTime;
+		}
+
+		Graphics()->QuadsSetRotation(s_Time * pi * 2 * 2 + ItemID);
+		s_LastLocalTime = LocalTime();
+	}
+	else
+	{
+		m_pClient->m_Effects.BulletTrail(Pos, Alpha);
+
+		if(length(Vel) > 0.00001f)
+			Graphics()->QuadsSetRotation(angle(Vel));
+		else
+			Graphics()->QuadsSetRotation(0);
+	}
+
+	if(GameClient()->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon].IsValid())
+	{
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon]);
+		Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
+		Graphics()->RenderQuadContainerAsSprite(m_ItemsQuadContainerIndex, m_aProjectileOffset[CurWeapon], Pos.x, Pos.y);
+	}
+}
+
+void CItems::RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCurrent, bool IsPredicted)
+{
+	int CurWeapon = clamp(pCurrent->m_Subtype, 0, NUM_WEAPONS - 1);
+	int QuadOffset = 2;
+	float Angle = 0.0f;
+	float IntraTick = IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+	vec2 Pos = mix(vec2(pPrev->m_X, pPrev->m_Y), vec2(pCurrent->m_X, pCurrent->m_Y), IntraTick);
+	if(pCurrent->m_Type == POWERUP_HEALTH)
+	{
+		QuadOffset = m_PickupHealthOffset;
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpritePickupHealth);
+	}
+	else if(pCurrent->m_Type == POWERUP_ARMOR)
+	{
+		QuadOffset = m_PickupArmorOffset;
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpritePickupArmor);
+	}
+	else if(pCurrent->m_Type == POWERUP_WEAPON)
+	{
+		QuadOffset = m_aPickupWeaponOffset[CurWeapon];
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpritePickupWeapons[CurWeapon]);
+	}
+	else if(pCurrent->m_Type == POWERUP_NINJA)
+	{
+		QuadOffset = m_PickupNinjaOffset;
+		m_pClient->m_Effects.PowerupShine(Pos, vec2(96, 18), 1.0f);
+		Pos.x -= 10.0f;
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpritePickupNinja);
+	}
+	else if(pCurrent->m_Type >= POWERUP_ARMOR_SHOTGUN && pCurrent->m_Type <= POWERUP_ARMOR_LASER)
+	{
+		QuadOffset = m_aPickupWeaponArmorOffset[pCurrent->m_Type - POWERUP_ARMOR_SHOTGUN];
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpritePickupWeaponArmor[pCurrent->m_Type - POWERUP_ARMOR_SHOTGUN]);
+	}
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->QuadsSetRotation(Angle);
+
+	static float s_Time = 0.0f;
+	static float s_LastLocalTime = LocalTime();
+	float Offset = Pos.y / 32.0f + Pos.x / 32.0f;
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		if(!pInfo->m_Paused)
+			s_Time += (LocalTime() - s_LastLocalTime) * pInfo->m_Speed;
+	}
+	else
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+			s_Time += LocalTime() - s_LastLocalTime;
+	}
+	Pos += direction(s_Time * 2.0f + Offset) * 2.5f;
+	s_LastLocalTime = LocalTime();
+
+	Graphics()->RenderQuadContainerAsSprite(m_ItemsQuadContainerIndex, QuadOffset, Pos.x, Pos.y);
+}
+
+void CItems::RenderFlag(const CNetObj_Flag *pPrev, const CNetObj_Flag *pCurrent, const CNetObj_GameData *pPrevGameData, const CNetObj_GameData *pCurGameData)
+{
+	float Angle = 0.0f;
+	float Size = 42.0f;
+
+	if(pCurrent->m_Team == TEAM_RED)
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+	else
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	int QuadOffset;
+	if(pCurrent->m_Team == TEAM_RED)
+	{
+		QuadOffset = m_RedFlagOffset;
+	}
+	else
+	{
+		QuadOffset = m_BlueFlagOffset;
+	}
+
+	Graphics()->QuadsSetRotation(Angle);
+
+	vec2 Pos = mix(vec2(pPrev->m_X, pPrev->m_Y), vec2(pCurrent->m_X, pCurrent->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
+
+	if(pCurGameData)
+	{
+		int FlagCarrier = (pCurrent->m_Team == TEAM_RED) ? pCurGameData->m_FlagCarrierRed : pCurGameData->m_FlagCarrierBlue;
+		// use the flagcarriers position if available
+		if(FlagCarrier >= 0 && m_pClient->m_Snap.m_aCharacters[FlagCarrier].m_Active)
+			Pos = m_pClient->m_aClients[FlagCarrier].m_RenderPos;
+
+		// make sure that the flag isn't interpolated between capture and return
+		if(pPrevGameData &&
+			((pCurrent->m_Team == TEAM_RED && pPrevGameData->m_FlagCarrierRed != pCurGameData->m_FlagCarrierRed) ||
+				(pCurrent->m_Team == TEAM_BLUE && pPrevGameData->m_FlagCarrierBlue != pCurGameData->m_FlagCarrierBlue)))
+			Pos = vec2(pCurrent->m_X, pCurrent->m_Y);
+	}
+
+	Graphics()->RenderQuadContainerAsSprite(m_ItemsQuadContainerIndex, QuadOffset, Pos.x, Pos.y - Size * 0.75f);
+}
+
+void CItems::RenderLaser(const CLaserData *pCurrent, bool IsPredicted)
+{
+	int Type = clamp(pCurrent->m_Type, -1, NUM_LASERTYPES - 1);
+
+	ColorRGBA RGB;
+	vec2 Pos = pCurrent->m_To;
+	vec2 From = pCurrent->m_From;
+	float Len = distance(Pos, From);
+
+	int ColorIn, ColorOut;
+	switch(Type)
+	{
+	case LASERTYPE_RIFLE:
+		ColorOut = g_Config.m_ClLaserRifleOutlineColor;
+		ColorIn = g_Config.m_ClLaserRifleInnerColor;
+		break;
+	case LASERTYPE_SHOTGUN:
+		ColorOut = g_Config.m_ClLaserShotgunOutlineColor;
+		ColorIn = g_Config.m_ClLaserShotgunInnerColor;
+		break;
+	case LASERTYPE_DRAGGER:
+	case LASERTYPE_DOOR:
+		ColorOut = g_Config.m_ClLaserDoorOutlineColor;
+		ColorIn = g_Config.m_ClLaserDoorInnerColor;
+		break;
+	case LASERTYPE_FREEZE:
+		ColorOut = g_Config.m_ClLaserFreezeOutlineColor;
+		ColorIn = g_Config.m_ClLaserFreezeInnerColor;
+		break;
+	case LASERTYPE_GUN:
+	case LASERTYPE_PLASMA:
+		if(pCurrent->m_Subtype == LASERGUNTYPE_FREEZE || pCurrent->m_Subtype == LASERGUNTYPE_EXPFREEZE)
+		{
+			ColorOut = g_Config.m_ClLaserFreezeOutlineColor;
+			ColorIn = g_Config.m_ClLaserFreezeInnerColor;
+		}
+		else
+		{
+			ColorOut = g_Config.m_ClLaserRifleOutlineColor;
+			ColorIn = g_Config.m_ClLaserRifleInnerColor;
+		}
+		break;
+	default:
+		ColorOut = g_Config.m_ClLaserRifleOutlineColor;
+		ColorIn = g_Config.m_ClLaserRifleInnerColor;
+	}
+
+	RGB = color_cast<ColorRGBA>(ColorHSLA(ColorOut));
+	ColorRGBA OuterColor(RGB.r, RGB.g, RGB.b, 1.0f);
+	RGB = color_cast<ColorRGBA>(ColorHSLA(ColorIn));
+	ColorRGBA InnerColor(RGB.r, RGB.g, RGB.b, 1.0f);
+
+	int TuneZone = GameClient()->m_GameWorld.m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(Collision()->GetMapIndex(From)) : 0;
+	bool IsOtherTeam = (pCurrent->m_ExtraInfo && pCurrent->m_Owner >= 0 && m_pClient->IsOtherTeam(pCurrent->m_Owner));
+
+	float Alpha = 1.f;
+	if(IsOtherTeam)
+	{
+		Alpha = g_Config.m_ClShowOthersAlpha / 100.0f;
+	}
+
+	vec2 Dir;
+	if(Len > 0)
+	{
+		Dir = normalize_pre_length(Pos - From, Len);
+
+		float Ticks;
+		if(IsPredicted)
+			Ticks = (float)(Client()->PredGameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) + Client()->PredIntraGameTick(g_Config.m_ClDummy);
+		else
+			Ticks = (float)(Client()->GameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) + Client()->IntraGameTick(g_Config.m_ClDummy);
+		float Ms = (Ticks / Client()->GameTickSpeed()) * 1000.0f;
+		float a = Ms / m_pClient->GetTuning(TuneZone)->m_LaserBounceDelay;
+		a = clamp(a, 0.0f, 1.0f);
+		float Ia = 1 - a;
+
+		vec2 Out;
+
+		Graphics()->TextureClear();
+		Graphics()->QuadsBegin();
+
+		// do outline
+		Graphics()->SetColor(OuterColor.r, OuterColor.g, OuterColor.b, Alpha);
+		Out = vec2(Dir.y, -Dir.x) * (7.0f * Ia);
+
+		IGraphics::CFreeformItem Freeform(
+			From.x - Out.x, From.y - Out.y,
+			From.x + Out.x, From.y + Out.y,
+			Pos.x - Out.x, Pos.y - Out.y,
+			Pos.x + Out.x, Pos.y + Out.y);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
+
+		// do inner
+		Out = vec2(Dir.y, -Dir.x) * (5.0f * Ia);
+		Graphics()->SetColor(InnerColor.r, InnerColor.g, InnerColor.b, Alpha); // center
+
+		Freeform = IGraphics::CFreeformItem(
+			From.x - Out.x, From.y - Out.y,
+			From.x + Out.x, From.y + Out.y,
+			Pos.x - Out.x, Pos.y - Out.y,
+			Pos.x + Out.x, Pos.y + Out.y);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
+
+		Graphics()->QuadsEnd();
+	}
+
+	// render head
+	{
+		int CurParticle = (Client()->GameTick(g_Config.m_ClDummy) % 3);
+		Graphics()->TextureSet(GameClient()->m_ParticlesSkin.m_aSpriteParticleSplat[CurParticle]);
+		Graphics()->QuadsSetRotation(Client()->GameTick(g_Config.m_ClDummy));
+		Graphics()->SetColor(OuterColor.r, OuterColor.g, OuterColor.b, Alpha);
+		Graphics()->RenderQuadContainerAsSprite(m_ItemsQuadContainerIndex, m_aParticleSplatOffset[CurParticle], Pos.x, Pos.y);
+		Graphics()->SetColor(InnerColor.r, InnerColor.g, InnerColor.b, Alpha);
+		Graphics()->RenderQuadContainerAsSprite(m_ItemsQuadContainerIndex, m_aParticleSplatOffset[CurParticle], Pos.x, Pos.y, 20.f / 24.f, 20.f / 24.f);
+	}
+}
+
+void CItems::OnRender()
+{
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	bool IsSuper = m_pClient->IsLocalCharSuper();
+	int Ticks = Client()->GameTick(g_Config.m_ClDummy) % Client()->GameTickSpeed();
+	bool BlinkingPickup = (Ticks % 22) < 4;
+	bool BlinkingGun = (Ticks % 22) < 4;
+	bool BlinkingDragger = (Ticks % 22) < 4;
+	bool BlinkingProj = (Ticks % 20) < 2;
+	bool BlinkingProjEx = (Ticks % 6) < 2;
+	bool BlinkingLight = (Ticks % 6) < 2;
+	int SwitcherTeam = m_pClient->SwitchStateTeam();
+	int DraggerStartTick = maximum((Client()->GameTick(g_Config.m_ClDummy) / 7) * 7, Client()->GameTick(g_Config.m_ClDummy) - 4);
+	int GunStartTick = (Client()->GameTick(g_Config.m_ClDummy) / 7) * 7;
+
+	bool UsePredicted = GameClient()->Predict() && GameClient()->AntiPingGunfire();
+	auto &aSwitchers = GameClient()->Switchers();
+	if(UsePredicted)
+	{
+		for(auto *pProj = (CProjectile *)GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_PROJECTILE); pProj; pProj = (CProjectile *)pProj->NextEntity())
+		{
+			if(!IsSuper && pProj->m_Number > 0 && pProj->m_Number < (int)aSwitchers.size() && !aSwitchers[pProj->m_Number].m_aStatus[SwitcherTeam] && (pProj->m_Explosive ? BlinkingProjEx : BlinkingProj))
+				continue;
+
+			CProjectileData Data = pProj->GetData();
+			RenderProjectile(&Data, pProj->GetID());
+		}
+		for(CEntity *pEnt = GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->NextEntity())
+		{
+			auto *const pLaser = dynamic_cast<CLaser *>(pEnt);
+			if(!pLaser || pLaser->GetOwner() < 0 || !GameClient()->m_aClients[pLaser->GetOwner()].m_IsPredictedLocal)
+				continue;
+			CLaserData Data = pLaser->GetData();
+			RenderLaser(&Data, true);
+		}
+		for(auto *pPickup = (CPickup *)GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_PICKUP); pPickup; pPickup = (CPickup *)pPickup->NextEntity())
+		{
+			if(!IsSuper && pPickup->m_Layer == LAYER_SWITCH && pPickup->m_Number > 0 && pPickup->m_Number < (int)aSwitchers.size() && !aSwitchers[pPickup->m_Number].m_aStatus[SwitcherTeam] && BlinkingPickup)
+				continue;
+
+			if(pPickup->InDDNetTile())
+			{
+				if(auto *pPrev = (CPickup *)GameClient()->m_PrevPredictedWorld.GetEntity(pPickup->GetID(), CGameWorld::ENTTYPE_PICKUP))
+				{
+					CNetObj_Pickup Data, Prev;
+					pPickup->FillInfo(&Data);
+					pPrev->FillInfo(&Prev);
+					RenderPickup(&Prev, &Data, true);
+				}
+			}
+		}
+	}
+
+	for(const CSnapEntities &Ent : m_pClient->SnapEntities())
+	{
+		const IClient::CSnapItem Item = Ent.m_Item;
+		const void *pData = Ent.m_pData;
+		const CNetObj_EntityEx *pEntEx = Ent.m_pDataEx;
+
+		if(Item.m_Type == NETOBJTYPE_PROJECTILE || Item.m_Type == NETOBJTYPE_DDRACEPROJECTILE || Item.m_Type == NETOBJTYPE_DDNETPROJECTILE)
+		{
+			CProjectileData Data = ExtractProjectileInfo(Item.m_Type, pData, &GameClient()->m_GameWorld, pEntEx);
+			bool Inactive = !IsSuper && Data.m_SwitchNumber > 0 && Data.m_SwitchNumber < (int)aSwitchers.size() && !aSwitchers[Data.m_SwitchNumber].m_aStatus[SwitcherTeam];
+			if(Inactive && (Data.m_Explosive ? BlinkingProjEx : BlinkingProj))
+				continue;
+			if(UsePredicted)
+
+			{
+				if(auto *pProj = (CProjectile *)GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData))
+				{
+					bool IsOtherTeam = m_pClient->IsOtherTeam(pProj->GetOwner());
+					if(pProj->m_LastRenderTick <= 0 && (pProj->m_Type != WEAPON_SHOTGUN || (!pProj->m_Freeze && !pProj->m_Explosive)) // skip ddrace shotgun bullets
+						&& (pProj->m_Type == WEAPON_SHOTGUN || absolute(length(pProj->m_Direction) - 1.f) < 0.02f) // workaround to skip grenades on ball mod
+						&& (pProj->GetOwner() < 0 || !GameClient()->m_aClients[pProj->GetOwner()].m_IsPredictedLocal || IsOtherTeam) // skip locally predicted projectiles
+						&& !Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID))
+					{
+						ReconstructSmokeTrail(&Data, pProj->m_DestroyTick);
+					}
+					pProj->m_LastRenderTick = Client()->GameTick(g_Config.m_ClDummy);
+					if(!IsOtherTeam)
+						continue;
+				}
+			}
+			RenderProjectile(&Data, Item.m_ID);
+		}
+		else if(Item.m_Type == NETOBJTYPE_PICKUP || Item.m_Type == NETOBJTYPE_DDNETPICKUP)
+		{
+			CPickupData Data = ExtractPickupInfo(Item.m_Type, pData, pEntEx);
+			bool Inactive = !IsSuper && Data.m_SwitchNumber > 0 && Data.m_SwitchNumber < (int)aSwitchers.size() && !aSwitchers[Data.m_SwitchNumber].m_aStatus[SwitcherTeam];
+
+			if(Inactive && BlinkingPickup)
+				continue;
+			if(UsePredicted)
+			{
+				auto *pPickup = (CPickup *)GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData);
+				if(pPickup && pPickup->InDDNetTile())
+					continue;
+			}
+			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID);
+			if(pPrev)
+				RenderPickup((const CNetObj_Pickup *)pPrev, (const CNetObj_Pickup *)pData);
+		}
+		else if(Item.m_Type == NETOBJTYPE_LASER || Item.m_Type == NETOBJTYPE_DDNETLASER)
+		{
+			if(UsePredicted)
+			{
+				auto *pLaser = dynamic_cast<CLaser *>(GameClient()->m_GameWorld.FindMatch(Item.m_ID, Item.m_Type, pData));
+				if(pLaser && pLaser->GetOwner() >= 0 && GameClient()->m_aClients[pLaser->GetOwner()].m_IsPredictedLocal)
+					continue;
+			}
+
+			CLaserData Data = ExtractLaserInfo(Item.m_Type, pData, &GameClient()->m_GameWorld, pEntEx);
+			bool Inactive = !IsSuper && Data.m_SwitchNumber > 0 && Data.m_SwitchNumber < (int)aSwitchers.size() && !aSwitchers[Data.m_SwitchNumber].m_aStatus[SwitcherTeam];
+
+			bool IsEntBlink = false;
+			int EntStartTick = -1;
+			if(Data.m_Type == LASERTYPE_FREEZE)
+			{
+				IsEntBlink = BlinkingLight;
+				EntStartTick = DraggerStartTick;
+			}
+			else if(Data.m_Type == LASERTYPE_GUN)
+			{
+				IsEntBlink = BlinkingGun;
+				EntStartTick = GunStartTick;
+			}
+			else if(Data.m_Type == LASERTYPE_DRAGGER)
+			{
+				IsEntBlink = BlinkingDragger;
+				EntStartTick = DraggerStartTick;
+			}
+			else if(Data.m_Type == LASERTYPE_DOOR)
+			{
+				if(Data.m_Predict && (Inactive || IsSuper))
+				{
+					Data.m_From.x = Data.m_To.x;
+					Data.m_From.y = Data.m_To.y;
+				}
+				EntStartTick = Client()->GameTick(g_Config.m_ClDummy);
+			}
+			else
+			{
+				IsEntBlink = BlinkingDragger;
+				EntStartTick = Client()->GameTick(g_Config.m_ClDummy);
+			}
+
+			if(Data.m_Predict && Inactive && IsEntBlink)
+			{
+				continue;
+			}
+
+			if(Data.m_StartTick <= 0 && EntStartTick != -1)
+			{
+				Data.m_StartTick = EntStartTick;
+			}
+
+			RenderLaser(&Data);
+		}
+	}
+
+	int Num = Client()->SnapNumItems(IClient::SNAP_CURRENT);
+
+	// render flag
+	for(int i = 0; i < Num; i++)
+	{
+		IClient::CSnapItem Item;
+		const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+
+		if(Item.m_Type == NETOBJTYPE_FLAG)
+		{
+			const void *pPrev = Client()->SnapFindItem(IClient::SNAP_PREV, Item.m_Type, Item.m_ID);
+			if(pPrev)
+			{
+				const void *pPrevGameData = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_GAMEDATA, m_pClient->m_Snap.m_GameDataSnapID);
+				RenderFlag(static_cast<const CNetObj_Flag *>(pPrev), static_cast<const CNetObj_Flag *>(pData),
+					static_cast<const CNetObj_GameData *>(pPrevGameData), m_pClient->m_Snap.m_pGameDataObj);
+			}
+		}
+	}
+
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+}
+
+void CItems::OnInit()
+{
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	m_ItemsQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	m_RedFlagOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, -21.f, -42.f, 42.f, 84.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	m_BlueFlagOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, -21.f, -42.f, 42.f, 84.f);
+
+	float ScaleX, ScaleY;
+	RenderTools()->GetSpriteScale(SPRITE_PICKUP_HEALTH, ScaleX, ScaleY);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	m_PickupHealthOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 64.f * ScaleX, 64.f * ScaleY);
+	RenderTools()->GetSpriteScale(SPRITE_PICKUP_ARMOR, ScaleX, ScaleY);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	m_PickupArmorOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 64.f * ScaleX, 64.f * ScaleY);
+
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_pSpriteBody, ScaleX, ScaleY);
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		m_aPickupWeaponOffset[i] = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleX, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleY);
+	}
+	RenderTools()->GetSpriteScale(SPRITE_PICKUP_NINJA, ScaleX, ScaleY);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	m_PickupNinjaOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 128.f * ScaleX, 128.f * ScaleY);
+
+	for(int i = 0; i < 4; i++)
+	{
+		RenderTools()->GetSpriteScale(SPRITE_PICKUP_ARMOR_SHOTGUN + i, ScaleX, ScaleY);
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		m_aPickupWeaponArmorOffset[i] = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 64.f * ScaleX, 64.f * ScaleY);
+	}
+
+	for(int &ProjectileOffset : m_aProjectileOffset)
+	{
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		ProjectileOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 32.f);
+	}
+
+	for(int &ParticleSplatOffset : m_aParticleSplatOffset)
+	{
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		ParticleSplatOffset = RenderTools()->QuadContainerAddSprite(m_ItemsQuadContainerIndex, 24.f);
+	}
+
+	Graphics()->QuadContainerUpload(m_ItemsQuadContainerIndex);
+}
+
+void CItems::ReconstructSmokeTrail(const CProjectileData *pCurrent, int DestroyTick)
+{
+	bool LocalPlayerInGame = false;
+
+	if(m_pClient->m_Snap.m_pLocalInfo)
+		LocalPlayerInGame = m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientID].m_Team != TEAM_SPECTATORS;
+	if(!m_pClient->AntiPingGunfire() || !LocalPlayerInGame)
+		return;
+	if(Client()->PredGameTick(g_Config.m_ClDummy) == pCurrent->m_StartTick)
+		return;
+
+	// get positions
+	float Curvature = 0;
+	float Speed = 0;
+	const CTuningParams *pTuning = GameClient()->GetTuning(pCurrent->m_TuneZone);
+
+	if(pCurrent->m_Type == WEAPON_GRENADE)
+	{
+		Curvature = pTuning->m_GrenadeCurvature;
+		Speed = pTuning->m_GrenadeSpeed;
+	}
+	else if(pCurrent->m_Type == WEAPON_SHOTGUN)
+	{
+		Curvature = pTuning->m_ShotgunCurvature;
+		Speed = pTuning->m_ShotgunSpeed;
+	}
+	else if(pCurrent->m_Type == WEAPON_GUN)
+	{
+		Curvature = pTuning->m_GunCurvature;
+		Speed = pTuning->m_GunSpeed;
+	}
+
+	float Pt = ((float)(Client()->PredGameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) + Client()->PredIntraGameTick(g_Config.m_ClDummy)) / (float)Client()->GameTickSpeed();
+	if(Pt < 0)
+		return; // projectile haven't been shot yet
+
+	float Gt = (Client()->PrevGameTick(g_Config.m_ClDummy) - pCurrent->m_StartTick) / (float)Client()->GameTickSpeed() + Client()->GameTickTime(g_Config.m_ClDummy);
+
+	float Alpha = 1.f;
+	if(pCurrent->m_ExtraInfo && pCurrent->m_Owner >= 0 && m_pClient->IsOtherTeam(pCurrent->m_Owner))
+	{
+		Alpha = g_Config.m_ClShowOthersAlpha / 100.0f;
+	}
+
+	float T = Pt;
+	if(DestroyTick >= 0)
+		T = minimum(Pt, ((float)(DestroyTick - 1 - pCurrent->m_StartTick) + Client()->PredIntraGameTick(g_Config.m_ClDummy)) / (float)Client()->GameTickSpeed());
+
+	float MinTrailSpan = 0.4f * ((pCurrent->m_Type == WEAPON_GRENADE) ? 0.5f : 0.25f);
+	float Step = maximum(Client()->FrameTimeAvg(), (pCurrent->m_Type == WEAPON_GRENADE) ? 0.02f : 0.01f);
+	for(int i = 1 + (int)(Gt / Step); i < (int)(T / Step); i++)
+	{
+		float t = Step * (float)i + 0.4f * Step * random_float(-0.5f, 0.5f);
+		vec2 Pos = CalcPos(pCurrent->m_StartPos, pCurrent->m_StartVel, Curvature, Speed, t);
+		vec2 PrevPos = CalcPos(pCurrent->m_StartPos, pCurrent->m_StartVel, Curvature, Speed, t - 0.001f);
+		vec2 Vel = Pos - PrevPos;
+		float TimePassed = Pt - t;
+		if(Pt - MinTrailSpan > 0.01f)
+			TimePassed = minimum(TimePassed, (TimePassed - MinTrailSpan) / (Pt - MinTrailSpan) * (MinTrailSpan * 0.5f) + MinTrailSpan);
+		// add particle for this projectile
+		if(pCurrent->m_Type == WEAPON_GRENADE)
+			m_pClient->m_Effects.SmokeTrail(Pos, Vel * -1, Alpha, TimePassed);
+		else
+			m_pClient->m_Effects.BulletTrail(Pos, Alpha, TimePassed);
+	}
+}
diff --git a/src_bkp/game/client/components/items.h b/src_bkp/game/client/components/items.h
new file mode 100644
index 0000000000..d7fef4d972
--- /dev/null
+++ b/src_bkp/game/client/components/items.h
@@ -0,0 +1,39 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_ITEMS_H
+#define GAME_CLIENT_COMPONENTS_ITEMS_H
+#include <game/client/component.h>
+#include <game/generated/protocol.h>
+
+class CProjectileData;
+class CLaserData;
+
+class CItems : public CComponent
+{
+	void RenderProjectile(const CProjectileData *pCurrent, int ItemID);
+	void RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCurrent, bool IsPredicted = false);
+	void RenderFlag(const CNetObj_Flag *pPrev, const CNetObj_Flag *pCurrent, const CNetObj_GameData *pPrevGameData, const CNetObj_GameData *pCurGameData);
+	void RenderLaser(const CLaserData *pCurrent, bool IsPredicted = false);
+
+	int m_ItemsQuadContainerIndex;
+
+public:
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnRender() override;
+	virtual void OnInit() override;
+
+	void ReconstructSmokeTrail(const CProjectileData *pCurrent, int DestroyTick);
+
+private:
+	int m_BlueFlagOffset;
+	int m_RedFlagOffset;
+	int m_PickupHealthOffset;
+	int m_PickupArmorOffset;
+	int m_aPickupWeaponOffset[NUM_WEAPONS];
+	int m_PickupNinjaOffset;
+	int m_aPickupWeaponArmorOffset[4];
+	int m_aProjectileOffset[NUM_WEAPONS];
+	int m_aParticleSplatOffset[3];
+};
+
+#endif
diff --git a/src_bkp/game/client/components/mapimages.cpp b/src_bkp/game/client/components/mapimages.cpp
new file mode 100644
index 0000000000..9a4733f161
--- /dev/null
+++ b/src_bkp/game/client/components/mapimages.cpp
@@ -0,0 +1,505 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "mapimages.h"
+
+#include <base/log.h>
+
+#include <engine/graphics.h>
+#include <engine/map.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/client/gameclient.h>
+#include <game/generated/client_data.h>
+#include <game/layers.h>
+#include <game/localization.h>
+#include <game/mapitems.h>
+
+const char *const gs_apModEntitiesNames[] = {
+	"ddnet",
+	"ddrace",
+	"race",
+	"blockworlds",
+	"fng",
+	"vanilla",
+	"f-ddrace",
+};
+
+CMapImages::CMapImages() :
+	CMapImages(100)
+{
+}
+
+CMapImages::CMapImages(int TextureSize)
+{
+	m_Count = 0;
+	m_TextureScale = TextureSize;
+	mem_zero(m_aEntitiesIsLoaded, sizeof(m_aEntitiesIsLoaded));
+	m_SpeedupArrowIsLoaded = false;
+
+	mem_zero(m_aTextureUsedByTileOrQuadLayerFlag, sizeof(m_aTextureUsedByTileOrQuadLayerFlag));
+
+	str_copy(m_aEntitiesPath, "editor/entities_clear");
+
+	static_assert(std::size(gs_apModEntitiesNames) == MAP_IMAGE_MOD_TYPE_COUNT, "Mod name string count is not equal to mod type count");
+}
+
+void CMapImages::OnInit()
+{
+	InitOverlayTextures();
+
+	if(str_comp(g_Config.m_ClAssetsEntities, "default") == 0)
+		str_copy(m_aEntitiesPath, "editor/entities_clear");
+	else
+	{
+		str_format(m_aEntitiesPath, sizeof(m_aEntitiesPath), "assets/entities/%s", g_Config.m_ClAssetsEntities);
+	}
+}
+
+void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
+{
+	// unload all textures
+	for(int i = 0; i < m_Count; i++)
+	{
+		Graphics()->UnloadTexture(&(m_aTextures[i]));
+		m_aTextureUsedByTileOrQuadLayerFlag[i] = 0;
+	}
+	m_Count = 0;
+
+	int Start;
+	pMap->GetType(MAPITEMTYPE_IMAGE, &Start, &m_Count);
+
+	m_Count = clamp<int>(m_Count, 0, MAX_MAPIMAGES);
+
+	for(int g = 0; g < pLayers->NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = pLayers->GetGroup(g);
+		if(!pGroup)
+		{
+			continue;
+		}
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = pLayers->GetLayer(pGroup->m_StartLayer + l);
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTLayer = (CMapItemLayerTilemap *)pLayer;
+				if(pTLayer->m_Image >= 0 && pTLayer->m_Image < m_Count)
+				{
+					m_aTextureUsedByTileOrQuadLayerFlag[pTLayer->m_Image] |= 1;
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				CMapItemLayerQuads *pQLayer = (CMapItemLayerQuads *)pLayer;
+				if(pQLayer->m_Image >= 0 && pQLayer->m_Image < m_Count)
+				{
+					m_aTextureUsedByTileOrQuadLayerFlag[pQLayer->m_Image] |= 2;
+				}
+			}
+		}
+	}
+
+	const int TextureLoadFlag = Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+
+	// load new textures
+	bool ShowWarning = false;
+	for(int i = 0; i < m_Count; i++)
+	{
+		const int LoadFlag = (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 1) != 0) ? TextureLoadFlag : 0) | (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 2) != 0) ? 0 : (Graphics()->HasTextureArraysSupport() ? IGraphics::TEXLOAD_NO_2D_TEXTURE : 0));
+		const CMapItemImage_v2 *pImg = (CMapItemImage_v2 *)pMap->GetItem(Start + i);
+		const CImageInfo::EImageFormat Format = pImg->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : CImageInfo::ImageFormatFromInt(pImg->m_Format);
+
+		const char *pName = pMap->GetDataString(pImg->m_ImageName);
+		if(pName == nullptr || pName[0] == '\0')
+		{
+			if(pImg->m_External)
+			{
+				log_error("mapimages", "Failed to load map image %d: failed to load name.", i);
+				ShowWarning = true;
+				continue;
+			}
+			pName = "(error)";
+		}
+
+		if(pImg->m_External)
+		{
+			char aPath[IO_MAX_PATH_LENGTH];
+			str_format(aPath, sizeof(aPath), "mapres/%s.png", pName);
+			m_aTextures[i] = Graphics()->LoadTexture(aPath, IStorage::TYPE_ALL, LoadFlag);
+		}
+		else if(Format == CImageInfo::FORMAT_RGBA)
+		{
+			void *pData = pMap->GetData(pImg->m_ImageData);
+			char aTexName[IO_MAX_PATH_LENGTH];
+			str_format(aTexName, sizeof(aTexName), "embedded: %s", pName);
+			m_aTextures[i] = Graphics()->LoadTextureRaw(pImg->m_Width, pImg->m_Height, Format, pData, LoadFlag, aTexName);
+			pMap->UnloadData(pImg->m_ImageData);
+		}
+		pMap->UnloadData(pImg->m_ImageName);
+		ShowWarning = ShowWarning || m_aTextures[i].IsNullTexture();
+	}
+	if(ShowWarning)
+	{
+		Client()->AddWarning(SWarning(Localize("Some map images could not be loaded. Check the local console for details.")));
+	}
+}
+
+void CMapImages::OnMapLoad()
+{
+	IMap *pMap = Kernel()->RequestInterface<IMap>();
+	CLayers *pLayers = m_pClient->Layers();
+	OnMapLoadImpl(pLayers, pMap);
+}
+
+void CMapImages::LoadBackground(class CLayers *pLayers, class IMap *pMap)
+{
+	OnMapLoadImpl(pLayers, pMap);
+}
+
+bool CMapImages::HasFrontLayer(EMapImageModType ModType)
+{
+	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+}
+
+bool CMapImages::HasSpeedupLayer(EMapImageModType ModType)
+{
+	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+}
+
+bool CMapImages::HasSwitchLayer(EMapImageModType ModType)
+{
+	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+}
+
+bool CMapImages::HasTeleLayer(EMapImageModType ModType)
+{
+	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+}
+
+bool CMapImages::HasTuneLayer(EMapImageModType ModType)
+{
+	return ModType == MAP_IMAGE_MOD_TYPE_DDNET || ModType == MAP_IMAGE_MOD_TYPE_DDRACE;
+}
+
+IGraphics::CTextureHandle CMapImages::GetEntities(EMapImageEntityLayerType EntityLayerType)
+{
+	EMapImageModType EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
+	bool EntitiesAreMasked = !GameClient()->m_GameInfo.m_DontMaskEntities;
+
+	if(GameClient()->m_GameInfo.m_EntitiesFDDrace)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_FDDRACE;
+	else if(GameClient()->m_GameInfo.m_EntitiesDDNet)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
+	else if(GameClient()->m_GameInfo.m_EntitiesDDRace)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_DDRACE;
+	else if(GameClient()->m_GameInfo.m_EntitiesRace)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_RACE;
+	else if(GameClient()->m_GameInfo.m_EntitiesBW)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_BLOCKWORLDS;
+	else if(GameClient()->m_GameInfo.m_EntitiesFNG)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_FNG;
+	else if(GameClient()->m_GameInfo.m_EntitiesVanilla)
+		EntitiesModType = MAP_IMAGE_MOD_TYPE_VANILLA;
+
+	if(!m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked])
+	{
+		m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked] = true;
+
+		// any mod that does not mask, will get all layers unmasked
+		bool WasUnknown = !EntitiesAreMasked;
+
+		char aPath[64];
+		str_format(aPath, sizeof(aPath), "%s/%s.png", m_aEntitiesPath, gs_apModEntitiesNames[EntitiesModType]);
+
+		bool GameTypeHasFrontLayer = HasFrontLayer(EntitiesModType) || WasUnknown;
+		bool GameTypeHasSpeedupLayer = HasSpeedupLayer(EntitiesModType) || WasUnknown;
+		bool GameTypeHasSwitchLayer = HasSwitchLayer(EntitiesModType) || WasUnknown;
+		bool GameTypeHasTeleLayer = HasTeleLayer(EntitiesModType) || WasUnknown;
+		bool GameTypeHasTuneLayer = HasTuneLayer(EntitiesModType) || WasUnknown;
+
+		int TextureLoadFlag = 0;
+		if(Graphics()->HasTextureArraysSupport())
+			TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
+
+		CImageInfo ImgInfo;
+		bool ImagePNGLoaded = false;
+		if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
+			ImagePNGLoaded = true;
+		else
+		{
+			bool TryDefault = true;
+			// try as single ddnet replacement
+			if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET)
+			{
+				str_format(aPath, sizeof(aPath), "%s.png", m_aEntitiesPath);
+				if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
+				{
+					ImagePNGLoaded = true;
+					TryDefault = false;
+				}
+			}
+
+			if(!ImagePNGLoaded && TryDefault)
+			{
+				// try default
+				str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[EntitiesModType]);
+				if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
+				{
+					ImagePNGLoaded = true;
+				}
+			}
+		}
+
+		if(ImagePNGLoaded && ImgInfo.m_Width > 0 && ImgInfo.m_Height > 0)
+		{
+			const size_t PixelSize = ImgInfo.PixelSize();
+			const size_t BuildImageSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * PixelSize;
+
+			uint8_t *pTmpImgData = (uint8_t *)ImgInfo.m_pData;
+			uint8_t *pBuildImgData = (uint8_t *)malloc(BuildImageSize);
+
+			// build game layer
+			for(int n = 0; n < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++n)
+			{
+				bool BuildThisLayer = true;
+				if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH && !GameTypeHasFrontLayer &&
+					!GameTypeHasSpeedupLayer && !GameTypeHasTeleLayer && !GameTypeHasTuneLayer)
+					BuildThisLayer = false;
+				else if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH && !GameTypeHasSwitchLayer)
+					BuildThisLayer = false;
+
+				dbg_assert(!m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n].IsValid(), "entities texture already loaded when it should not be");
+
+				if(BuildThisLayer)
+				{
+					// set everything transparent
+					mem_zero(pBuildImgData, BuildImageSize);
+
+					for(int i = 0; i < 256; ++i)
+					{
+						bool ValidTile = i != 0;
+						int TileIndex = i;
+						if(EntitiesAreMasked)
+						{
+							if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || EntitiesModType == MAP_IMAGE_MOD_TYPE_DDRACE)
+							{
+								if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || TileIndex != TILE_BOOST)
+								{
+									if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH && !IsValidGameTile((int)TileIndex) && !IsValidFrontTile((int)TileIndex) && !IsValidSpeedupTile((int)TileIndex) &&
+										!IsValidTeleTile((int)TileIndex) && !IsValidTuneTile((int)TileIndex))
+										ValidTile = false;
+									else if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH)
+									{
+										if(!IsValidSwitchTile((int)TileIndex))
+											ValidTile = false;
+									}
+								}
+							}
+							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_RACE) && IsCreditsTile((int)TileIndex))
+							{
+								ValidTile = false;
+							}
+							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_FNG) && IsCreditsTile((int)TileIndex))
+							{
+								ValidTile = false;
+							}
+							else if((EntitiesModType == MAP_IMAGE_MOD_TYPE_VANILLA) && IsCreditsTile((int)TileIndex))
+							{
+								ValidTile = false;
+							}
+						}
+
+						if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET || EntitiesModType == MAP_IMAGE_MOD_TYPE_DDRACE)
+						{
+							if(n == MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH && TileIndex == TILE_SWITCHTIMEDOPEN)
+								TileIndex = 8;
+						}
+
+						int X = TileIndex % 16;
+						int Y = TileIndex / 16;
+
+						int CopyWidth = ImgInfo.m_Width / 16;
+						int CopyHeight = ImgInfo.m_Height / 16;
+						if(ValidTile)
+						{
+							Graphics()->CopyTextureBufferSub(pBuildImgData, pTmpImgData, ImgInfo.m_Width, ImgInfo.m_Height, PixelSize, (size_t)X * CopyWidth, (size_t)Y * CopyHeight, CopyWidth, CopyHeight);
+						}
+					}
+
+					m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n] = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, pBuildImgData, TextureLoadFlag, aPath);
+				}
+				else
+				{
+					if(!m_TransparentTexture.IsValid())
+					{
+						// set everything transparent
+						mem_zero(pBuildImgData, BuildImageSize);
+
+						m_TransparentTexture = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, pBuildImgData, TextureLoadFlag, aPath);
+					}
+					m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][n] = m_TransparentTexture;
+				}
+			}
+
+			free(pBuildImgData);
+
+			Graphics()->FreePNG(&ImgInfo);
+		}
+	}
+
+	return m_aaEntitiesTextures[(EntitiesModType * 2) + (int)EntitiesAreMasked][EntityLayerType];
+}
+
+IGraphics::CTextureHandle CMapImages::GetSpeedupArrow()
+{
+	if(!m_SpeedupArrowIsLoaded)
+	{
+		int TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
+		m_SpeedupArrowTexture = Graphics()->LoadTexture("editor/speed_arrow_array.png", IStorage::TYPE_ALL, TextureLoadFlag);
+
+		m_SpeedupArrowIsLoaded = true;
+	}
+
+	return m_SpeedupArrowTexture;
+}
+
+IGraphics::CTextureHandle CMapImages::GetOverlayBottom()
+{
+	return m_OverlayBottomTexture;
+}
+
+IGraphics::CTextureHandle CMapImages::GetOverlayTop()
+{
+	return m_OverlayTopTexture;
+}
+
+IGraphics::CTextureHandle CMapImages::GetOverlayCenter()
+{
+	return m_OverlayCenterTexture;
+}
+
+void CMapImages::ChangeEntitiesPath(const char *pPath)
+{
+	if(str_comp(pPath, "default") == 0)
+		str_copy(m_aEntitiesPath, "editor/entities_clear");
+	else
+	{
+		str_format(m_aEntitiesPath, sizeof(m_aEntitiesPath), "assets/entities/%s", pPath);
+	}
+
+	for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT * 2; ++i)
+	{
+		if(m_aEntitiesIsLoaded[i])
+		{
+			for(int n = 0; n < MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT; ++n)
+			{
+				if(m_aaEntitiesTextures[i][n].IsValid())
+					Graphics()->UnloadTexture(&(m_aaEntitiesTextures[i][n]));
+				m_aaEntitiesTextures[i][n] = IGraphics::CTextureHandle();
+			}
+
+			m_aEntitiesIsLoaded[i] = false;
+		}
+	}
+}
+
+void CMapImages::SetTextureScale(int Scale)
+{
+	if(m_TextureScale == Scale)
+		return;
+
+	m_TextureScale = Scale;
+
+	if(Graphics() && m_OverlayCenterTexture.IsValid()) // check if component was initialized
+	{
+		// reinitialize component
+		Graphics()->UnloadTexture(&m_OverlayBottomTexture);
+		Graphics()->UnloadTexture(&m_OverlayTopTexture);
+		Graphics()->UnloadTexture(&m_OverlayCenterTexture);
+
+		m_OverlayBottomTexture = IGraphics::CTextureHandle();
+		m_OverlayTopTexture = IGraphics::CTextureHandle();
+		m_OverlayCenterTexture = IGraphics::CTextureHandle();
+
+		InitOverlayTextures();
+	}
+}
+
+int CMapImages::GetTextureScale() const
+{
+	return m_TextureScale;
+}
+
+IGraphics::CTextureHandle CMapImages::UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset)
+{
+	const size_t Width = 1024;
+	const size_t Height = 1024;
+	const size_t PixelSize = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+
+	void *pMem = calloc(Width * Height * PixelSize, 1);
+
+	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 0);
+	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 1);
+	UpdateEntityLayerText(pMem, PixelSize, Width, Height, TextureSize, MaxWidth, YOffset, 2, 255);
+
+	const int TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
+	IGraphics::CTextureHandle Texture = Graphics()->LoadTextureRaw(Width, Height, CImageInfo::FORMAT_RGBA, pMem, TextureLoadFlag);
+	free(pMem);
+
+	return Texture;
+}
+
+void CMapImages::UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber)
+{
+	char aBuf[4];
+	int DigitsCount = NumbersPower + 1;
+
+	int CurrentNumber = std::pow(10, NumbersPower);
+
+	if(MaxNumber == -1)
+		MaxNumber = CurrentNumber * 10 - 1;
+
+	str_from_int(CurrentNumber, aBuf);
+
+	int CurrentNumberSuitableFontSize = TextRender()->AdjustFontSize(aBuf, DigitsCount, TextureSize, MaxWidth);
+	int UniversalSuitableFontSize = CurrentNumberSuitableFontSize * 0.92f; // should be smoothed enough to fit any digits combination
+
+	YOffset += ((TextureSize - UniversalSuitableFontSize) / 2);
+
+	for(; CurrentNumber <= MaxNumber; ++CurrentNumber)
+	{
+		str_from_int(CurrentNumber, aBuf);
+
+		float x = (CurrentNumber % 16) * 64;
+		float y = (CurrentNumber / 16) * 64;
+
+		int ApproximateTextWidth = TextRender()->CalculateTextWidth(aBuf, DigitsCount, 0, UniversalSuitableFontSize);
+		int XOffSet = (MaxWidth - clamp(ApproximateTextWidth, 0, MaxWidth)) / 2;
+
+		TextRender()->UploadEntityLayerText(pTexBuffer, PixelSize, TexWidth, TexHeight, (TexWidth / 16) - XOffSet, (TexHeight / 16) - YOffset, aBuf, DigitsCount, x + XOffSet, y + YOffset, UniversalSuitableFontSize);
+	}
+}
+
+void CMapImages::InitOverlayTextures()
+{
+	int TextureSize = 64 * m_TextureScale / 100;
+	TextureSize = clamp(TextureSize, 2, 64);
+	int TextureToVerticalCenterOffset = (64 - TextureSize) / 2; // should be used to move texture to the center of 64 pixels area
+
+	if(!m_OverlayBottomTexture.IsValid())
+	{
+		m_OverlayBottomTexture = UploadEntityLayerText(TextureSize / 2, 64, 32 + TextureToVerticalCenterOffset / 2);
+	}
+
+	if(!m_OverlayTopTexture.IsValid())
+	{
+		m_OverlayTopTexture = UploadEntityLayerText(TextureSize / 2, 64, TextureToVerticalCenterOffset / 2);
+	}
+
+	if(!m_OverlayCenterTexture.IsValid())
+	{
+		m_OverlayCenterTexture = UploadEntityLayerText(TextureSize, 64, TextureToVerticalCenterOffset);
+	}
+}
diff --git a/src_bkp/game/client/components/mapimages.h b/src_bkp/game/client/components/mapimages.h
new file mode 100644
index 0000000000..66bd83df56
--- /dev/null
+++ b/src_bkp/game/client/components/mapimages.h
@@ -0,0 +1,93 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_MAPIMAGES_H
+#define GAME_CLIENT_COMPONENTS_MAPIMAGES_H
+
+#include <engine/graphics.h>
+
+#include <game/client/component.h>
+#include <game/mapitems.h>
+
+enum EMapImageEntityLayerType
+{
+	MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH = 0,
+	MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH,
+
+	MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT,
+};
+
+enum EMapImageModType
+{
+	MAP_IMAGE_MOD_TYPE_DDNET = 0,
+	MAP_IMAGE_MOD_TYPE_DDRACE,
+	MAP_IMAGE_MOD_TYPE_RACE,
+	MAP_IMAGE_MOD_TYPE_BLOCKWORLDS,
+	MAP_IMAGE_MOD_TYPE_FNG,
+	MAP_IMAGE_MOD_TYPE_VANILLA,
+	MAP_IMAGE_MOD_TYPE_FDDRACE,
+
+	MAP_IMAGE_MOD_TYPE_COUNT,
+};
+
+extern const char *const gs_apModEntitiesNames[];
+
+class CMapImages : public CComponent
+{
+	friend class CBackground;
+	friend class CMenuBackground;
+
+	IGraphics::CTextureHandle m_aTextures[MAX_MAPIMAGES];
+	int m_aTextureUsedByTileOrQuadLayerFlag[MAX_MAPIMAGES]; // 0: nothing, 1(as flag): tile layer, 2(as flag): quad layer
+	int m_Count;
+
+	char m_aEntitiesPath[IO_MAX_PATH_LENGTH];
+
+	bool HasFrontLayer(EMapImageModType ModType);
+	bool HasSpeedupLayer(EMapImageModType ModType);
+	bool HasSwitchLayer(EMapImageModType ModType);
+	bool HasTeleLayer(EMapImageModType ModType);
+	bool HasTuneLayer(EMapImageModType ModType);
+
+public:
+	CMapImages();
+	CMapImages(int TextureSize);
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	IGraphics::CTextureHandle Get(int Index) const { return m_aTextures[Index]; }
+	int Num() const { return m_Count; }
+
+	void OnMapLoadImpl(class CLayers *pLayers, class IMap *pMap);
+	virtual void OnMapLoad() override;
+	virtual void OnInit() override;
+	void LoadBackground(class CLayers *pLayers, class IMap *pMap);
+
+	// DDRace
+	IGraphics::CTextureHandle GetEntities(EMapImageEntityLayerType EntityLayerType);
+	IGraphics::CTextureHandle GetSpeedupArrow();
+
+	IGraphics::CTextureHandle GetOverlayBottom();
+	IGraphics::CTextureHandle GetOverlayTop();
+	IGraphics::CTextureHandle GetOverlayCenter();
+
+	void SetTextureScale(int Scale);
+	int GetTextureScale() const;
+
+	void ChangeEntitiesPath(const char *pPath);
+
+private:
+	bool m_aEntitiesIsLoaded[MAP_IMAGE_MOD_TYPE_COUNT * 2];
+	bool m_SpeedupArrowIsLoaded;
+	IGraphics::CTextureHandle m_aaEntitiesTextures[MAP_IMAGE_MOD_TYPE_COUNT * 2][MAP_IMAGE_ENTITY_LAYER_TYPE_COUNT];
+	IGraphics::CTextureHandle m_SpeedupArrowTexture;
+	IGraphics::CTextureHandle m_OverlayBottomTexture;
+	IGraphics::CTextureHandle m_OverlayTopTexture;
+	IGraphics::CTextureHandle m_OverlayCenterTexture;
+	IGraphics::CTextureHandle m_TransparentTexture;
+	int m_TextureScale;
+
+	void InitOverlayTextures();
+	IGraphics::CTextureHandle UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset);
+	void UpdateEntityLayerText(void *pTexBuffer, size_t PixelSize, size_t TexWidth, size_t TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber = -1);
+};
+
+#endif
diff --git a/src_bkp/game/client/components/maplayers.cpp b/src_bkp/game/client/components/maplayers.cpp
new file mode 100644
index 0000000000..191e613a9f
--- /dev/null
+++ b/src_bkp/game/client/components/maplayers.cpp
@@ -0,0 +1,1895 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+
+#include <game/layers.h>
+#include <game/mapitems.h>
+#include <game/mapitems_ex.h>
+
+#include <game/client/components/camera.h>
+#include <game/client/components/mapimages.h>
+#include <game/localization.h>
+
+#include "maplayers.h"
+
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+CMapLayers::CMapLayers(int t, bool OnlineOnly)
+{
+	m_Type = t;
+	m_pLayers = 0;
+	m_CurrentLocalTick = 0;
+	m_LastLocalTick = 0;
+	m_EnvelopeUpdate = false;
+	m_OnlineOnly = OnlineOnly;
+}
+
+void CMapLayers::OnInit()
+{
+	m_pLayers = Layers();
+	m_pImages = &m_pClient->m_MapImages;
+}
+
+CCamera *CMapLayers::GetCurCamera()
+{
+	return &m_pClient->m_Camera;
+}
+
+void CMapLayers::EnvelopeUpdate()
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		m_CurrentLocalTick = pInfo->m_CurrentTick;
+		m_LastLocalTick = pInfo->m_CurrentTick;
+		m_EnvelopeUpdate = true;
+	}
+}
+
+void CMapLayers::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser)
+{
+	CMapLayers *pThis = (CMapLayers *)pUser;
+	Channels = ColorRGBA();
+
+	int EnvStart, EnvNum;
+	pThis->m_pLayers->Map()->GetType(MAPITEMTYPE_ENVELOPE, &EnvStart, &EnvNum);
+
+	if(Env < 0 || Env >= EnvNum)
+		return;
+
+	const CMapItemEnvelope *pItem = (CMapItemEnvelope *)pThis->m_pLayers->Map()->GetItem(EnvStart + Env);
+
+	CMapBasedEnvelopePointAccess EnvelopePoints(pThis->m_pLayers->Map());
+	EnvelopePoints.SetPointsRange(pItem->m_StartPoint, pItem->m_NumPoints);
+	if(EnvelopePoints.NumPoints() == 0)
+		return;
+
+	const auto TickToNanoSeconds = std::chrono::nanoseconds(1s) / (int64_t)pThis->Client()->GameTickSpeed();
+
+	static std::chrono::nanoseconds s_Time{0};
+	static auto s_LastLocalTime = time_get_nanoseconds();
+	if(pThis->Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = pThis->DemoPlayer()->BaseInfo();
+
+		if(!pInfo->m_Paused || pThis->m_EnvelopeUpdate)
+		{
+			if(pThis->m_CurrentLocalTick != pInfo->m_CurrentTick)
+			{
+				pThis->m_LastLocalTick = pThis->m_CurrentLocalTick;
+				pThis->m_CurrentLocalTick = pInfo->m_CurrentTick;
+			}
+			if(pItem->m_Version < 2 || pItem->m_Synchronized)
+			{
+				if(pThis->m_pClient->m_Snap.m_pGameInfoObj)
+				{
+					// get the lerp of the current tick and prev
+					int MinTick = pThis->Client()->PrevGameTick(g_Config.m_ClDummy) - pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick;
+					int CurTick = pThis->Client()->GameTick(g_Config.m_ClDummy) - pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick;
+					s_Time = std::chrono::nanoseconds((int64_t)(mix<double>(
+											    0,
+											    (CurTick - MinTick),
+											    (double)pThis->Client()->IntraGameTick(g_Config.m_ClDummy)) *
+										    TickToNanoSeconds.count())) +
+						 MinTick * TickToNanoSeconds;
+				}
+			}
+			else
+			{
+				int MinTick = pThis->m_LastLocalTick;
+				s_Time = std::chrono::nanoseconds((int64_t)(mix<double>(0,
+										    pThis->m_CurrentLocalTick - MinTick,
+										    (double)pThis->Client()->IntraGameTick(g_Config.m_ClDummy)) *
+									    TickToNanoSeconds.count())) +
+					 MinTick * TickToNanoSeconds;
+			}
+		}
+		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, 4, s_Time + (int64_t)TimeOffsetMillis * std::chrono::nanoseconds(1ms), Channels);
+	}
+	else
+	{
+		if(pThis->m_OnlineOnly && (pItem->m_Version < 2 || pItem->m_Synchronized))
+		{
+			if(pThis->m_pClient->m_Snap.m_pGameInfoObj) // && !(pThis->m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_PAUSED))
+			{
+				// get the lerp of the current tick and prev
+				int MinTick = pThis->Client()->PrevGameTick(g_Config.m_ClDummy) - pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick;
+				int CurTick = pThis->Client()->GameTick(g_Config.m_ClDummy) - pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick;
+				s_Time = std::chrono::nanoseconds((int64_t)(mix<double>(
+										    0,
+										    (CurTick - MinTick),
+										    (double)pThis->Client()->IntraGameTick(g_Config.m_ClDummy)) *
+									    TickToNanoSeconds.count())) +
+					 MinTick * TickToNanoSeconds;
+			}
+		}
+		else
+		{
+			auto CurTime = time_get_nanoseconds();
+			s_Time += CurTime - s_LastLocalTime;
+			s_LastLocalTime = CurTime;
+		}
+		CRenderTools::RenderEvalEnvelope(&EnvelopePoints, 4, s_Time + std::chrono::nanoseconds(std::chrono::milliseconds(TimeOffsetMillis)), Channels);
+	}
+}
+
+void FillTmpTile(SGraphicTile *pTmpTile, SGraphicTileTexureCoords *pTmpTex, unsigned char Flags, unsigned char Index, int x, int y, const ivec2 &Offset, int Scale, CMapItemGroup *pGroup)
+{
+	if(pTmpTex)
+	{
+		unsigned char x0 = 0;
+		unsigned char y0 = 0;
+		unsigned char x1 = x0 + 1;
+		unsigned char y1 = y0;
+		unsigned char x2 = x0 + 1;
+		unsigned char y2 = y0 + 1;
+		unsigned char x3 = x0;
+		unsigned char y3 = y0 + 1;
+
+		if(Flags & TILEFLAG_XFLIP)
+		{
+			x0 = x2;
+			x1 = x3;
+			x2 = x3;
+			x3 = x0;
+		}
+
+		if(Flags & TILEFLAG_YFLIP)
+		{
+			y0 = y3;
+			y2 = y1;
+			y3 = y1;
+			y1 = y0;
+		}
+
+		if(Flags & TILEFLAG_ROTATE)
+		{
+			unsigned char Tmp = x0;
+			x0 = x3;
+			x3 = x2;
+			x2 = x1;
+			x1 = Tmp;
+			Tmp = y0;
+			y0 = y3;
+			y3 = y2;
+			y2 = y1;
+			y1 = Tmp;
+		}
+
+		pTmpTex->m_TexCoordTopLeft.x = x0;
+		pTmpTex->m_TexCoordTopLeft.y = y0;
+		pTmpTex->m_TexCoordBottomLeft.x = x3;
+		pTmpTex->m_TexCoordBottomLeft.y = y3;
+		pTmpTex->m_TexCoordTopRight.x = x1;
+		pTmpTex->m_TexCoordTopRight.y = y1;
+		pTmpTex->m_TexCoordBottomRight.x = x2;
+		pTmpTex->m_TexCoordBottomRight.y = y2;
+
+		pTmpTex->m_TexCoordTopLeft.z = Index;
+		pTmpTex->m_TexCoordBottomLeft.z = Index;
+		pTmpTex->m_TexCoordTopRight.z = Index;
+		pTmpTex->m_TexCoordBottomRight.z = Index;
+
+		bool HasRotation = (Flags & TILEFLAG_ROTATE) != 0;
+		pTmpTex->m_TexCoordTopLeft.w = HasRotation;
+		pTmpTex->m_TexCoordBottomLeft.w = HasRotation;
+		pTmpTex->m_TexCoordTopRight.w = HasRotation;
+		pTmpTex->m_TexCoordBottomRight.w = HasRotation;
+	}
+
+	pTmpTile->m_TopLeft.x = x * Scale + Offset.x;
+	pTmpTile->m_TopLeft.y = y * Scale + Offset.y;
+	pTmpTile->m_BottomLeft.x = x * Scale + Offset.x;
+	pTmpTile->m_BottomLeft.y = y * Scale + Scale + Offset.y;
+	pTmpTile->m_TopRight.x = x * Scale + Scale + Offset.x;
+	pTmpTile->m_TopRight.y = y * Scale + Offset.y;
+	pTmpTile->m_BottomRight.x = x * Scale + Scale + Offset.x;
+	pTmpTile->m_BottomRight.y = y * Scale + Scale + Offset.y;
+}
+
+void FillTmpTileSpeedup(SGraphicTile *pTmpTile, SGraphicTileTexureCoords *pTmpTex, unsigned char Flags, unsigned char Index, int x, int y, const ivec2 &Offset, int Scale, CMapItemGroup *pGroup, short AngleRotate)
+{
+	int Angle = AngleRotate % 360;
+	FillTmpTile(pTmpTile, pTmpTex, Angle >= 270 ? ROTATION_270 : (Angle >= 180 ? ROTATION_180 : (Angle >= 90 ? ROTATION_90 : 0)), AngleRotate % 90, x, y, Offset, Scale, pGroup);
+}
+
+bool CMapLayers::STileLayerVisuals::Init(unsigned int Width, unsigned int Height)
+{
+	m_Width = Width;
+	m_Height = Height;
+	if(Width == 0 || Height == 0)
+		return false;
+	if constexpr(sizeof(unsigned int) >= sizeof(ptrdiff_t))
+		if(Width >= std::numeric_limits<std::ptrdiff_t>::max() || Height >= std::numeric_limits<std::ptrdiff_t>::max())
+			return false;
+
+	m_pTilesOfLayer = new CMapLayers::STileLayerVisuals::STileVisual[Height * Width];
+
+	m_vBorderTop.resize(Width);
+	m_vBorderBottom.resize(Width);
+
+	m_vBorderLeft.resize(Height);
+	m_vBorderRight.resize(Height);
+	return true;
+}
+
+CMapLayers::STileLayerVisuals::~STileLayerVisuals()
+{
+	delete[] m_pTilesOfLayer;
+
+	m_pTilesOfLayer = NULL;
+}
+
+bool AddTile(std::vector<SGraphicTile> &vTmpTiles, std::vector<SGraphicTileTexureCoords> &vTmpTileTexCoords, unsigned char Index, unsigned char Flags, int x, int y, CMapItemGroup *pGroup, bool DoTextureCoords, bool FillSpeedup = false, int AngleRotate = -1, const ivec2 &Offset = ivec2{0, 0}, int Scale = 32)
+{
+	if(Index)
+	{
+		vTmpTiles.emplace_back();
+		SGraphicTile &Tile = vTmpTiles.back();
+		SGraphicTileTexureCoords *pTileTex = NULL;
+		if(DoTextureCoords)
+		{
+			vTmpTileTexCoords.emplace_back();
+			SGraphicTileTexureCoords &TileTex = vTmpTileTexCoords.back();
+			pTileTex = &TileTex;
+		}
+		if(FillSpeedup)
+			FillTmpTileSpeedup(&Tile, pTileTex, Flags, 0, x, y, Offset, Scale, pGroup, AngleRotate);
+		else
+			FillTmpTile(&Tile, pTileTex, Flags, Index, x, y, Offset, Scale, pGroup);
+
+		return true;
+	}
+	return false;
+}
+
+struct STmpQuadVertexTextured
+{
+	float m_X, m_Y, m_CenterX, m_CenterY;
+	unsigned char m_R, m_G, m_B, m_A;
+	float m_U, m_V;
+};
+
+struct STmpQuadVertex
+{
+	float m_X, m_Y, m_CenterX, m_CenterY;
+	unsigned char m_R, m_G, m_B, m_A;
+};
+
+struct STmpQuad
+{
+	STmpQuadVertex m_aVertices[4];
+};
+
+struct STmpQuadTextured
+{
+	STmpQuadVertexTextured m_aVertices[4];
+};
+
+void mem_copy_special(void *pDest, void *pSource, size_t Size, size_t Count, size_t Steps)
+{
+	size_t CurStep = 0;
+	for(size_t i = 0; i < Count; ++i)
+	{
+		mem_copy(((char *)pDest) + CurStep + i * Size, ((char *)pSource) + i * Size, Size);
+		CurStep += Steps;
+	}
+}
+
+CMapLayers::~CMapLayers()
+{
+	//clear everything and destroy all buffers
+	if(!m_vpTileLayerVisuals.empty())
+	{
+		int s = m_vpTileLayerVisuals.size();
+		for(int i = 0; i < s; ++i)
+		{
+			delete m_vpTileLayerVisuals[i];
+		}
+	}
+	if(!m_vpQuadLayerVisuals.empty())
+	{
+		int s = m_vpQuadLayerVisuals.size();
+		for(int i = 0; i < s; ++i)
+		{
+			delete m_vpQuadLayerVisuals[i];
+		}
+	}
+}
+
+void CMapLayers::OnMapLoad()
+{
+	if(!Graphics()->IsTileBufferingEnabled() && !Graphics()->IsQuadBufferingEnabled())
+		return;
+
+	const char *pConnectCaption = GameClient()->DemoPlayer()->IsPlaying() ? Localize("Preparing demo playback") : Localize("Connected");
+	const char *pLoadMapContent = Localize("Uploading map data to GPU");
+
+	auto CurTime = time_get_nanoseconds();
+	auto &&RenderLoading = [&]() {
+		if(CanRenderMenuBackground())
+			GameClient()->m_Menus.RenderLoading(pConnectCaption, pLoadMapContent, 0, false);
+		else if(time_get_nanoseconds() - CurTime > 500ms)
+			GameClient()->m_Menus.RenderLoading(pConnectCaption, pLoadMapContent, 0, false, false);
+	};
+
+	//clear everything and destroy all buffers
+	if(!m_vpTileLayerVisuals.empty())
+	{
+		int s = m_vpTileLayerVisuals.size();
+		for(int i = 0; i < s; ++i)
+		{
+			Graphics()->DeleteBufferContainer(m_vpTileLayerVisuals[i]->m_BufferContainerIndex, true);
+			delete m_vpTileLayerVisuals[i];
+		}
+		m_vpTileLayerVisuals.clear();
+	}
+	if(!m_vpQuadLayerVisuals.empty())
+	{
+		int s = m_vpQuadLayerVisuals.size();
+		for(int i = 0; i < s; ++i)
+		{
+			Graphics()->DeleteBufferContainer(m_vpQuadLayerVisuals[i]->m_BufferContainerIndex, true);
+			delete m_vpQuadLayerVisuals[i];
+		}
+		m_vpQuadLayerVisuals.clear();
+
+		RenderLoading();
+	}
+
+	bool PassedGameLayer = false;
+	//prepare all visuals for all tile layers
+	std::vector<SGraphicTile> vtmpTiles;
+	std::vector<SGraphicTileTexureCoords> vtmpTileTexCoords;
+	std::vector<SGraphicTile> vtmpBorderTopTiles;
+	std::vector<SGraphicTileTexureCoords> vtmpBorderTopTilesTexCoords;
+	std::vector<SGraphicTile> vtmpBorderLeftTiles;
+	std::vector<SGraphicTileTexureCoords> vtmpBorderLeftTilesTexCoords;
+	std::vector<SGraphicTile> vtmpBorderRightTiles;
+	std::vector<SGraphicTileTexureCoords> vtmpBorderRightTilesTexCoords;
+	std::vector<SGraphicTile> vtmpBorderBottomTiles;
+	std::vector<SGraphicTileTexureCoords> vtmpBorderBottomTilesTexCoords;
+	std::vector<SGraphicTile> vtmpBorderCorners;
+	std::vector<SGraphicTileTexureCoords> vtmpBorderCornersTexCoords;
+
+	std::vector<STmpQuad> vtmpQuads;
+	std::vector<STmpQuadTextured> vtmpQuadsTextured;
+
+	for(int g = 0; g < m_pLayers->NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = m_pLayers->GetGroup(g);
+		if(!pGroup)
+		{
+			dbg_msg("maplayers", "error group was null, group number = %d, total groups = %d", g, m_pLayers->NumGroups());
+			dbg_msg("maplayers", "this is here to prevent a crash but the source of this is unknown, please report this for it to get fixed");
+			dbg_msg("maplayers", "we need mapname and crc and the map that caused this if possible, and anymore info you think is relevant");
+			continue;
+		}
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = m_pLayers->GetLayer(pGroup->m_StartLayer + l);
+			bool IsFrontLayer = false;
+			bool IsSwitchLayer = false;
+			bool IsTeleLayer = false;
+			bool IsSpeedupLayer = false;
+			bool IsTuneLayer = false;
+			bool IsGameLayer = false;
+			bool IsEntityLayer = false;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->GameLayer())
+			{
+				IsGameLayer = true;
+				IsEntityLayer = true;
+				PassedGameLayer = true;
+			}
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->FrontLayer())
+				IsEntityLayer = IsFrontLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->SwitchLayer())
+				IsEntityLayer = IsSwitchLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->TeleLayer())
+				IsEntityLayer = IsTeleLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->SpeedupLayer())
+				IsEntityLayer = IsSpeedupLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->TuneLayer())
+				IsEntityLayer = IsTuneLayer = true;
+
+			if(m_Type <= TYPE_BACKGROUND_FORCE)
+			{
+				if(PassedGameLayer)
+					return;
+			}
+			else if(m_Type == TYPE_FOREGROUND)
+			{
+				if(!PassedGameLayer)
+					continue;
+			}
+
+			if(pLayer->m_Type == LAYERTYPE_TILES && Graphics()->IsTileBufferingEnabled())
+			{
+				bool DoTextureCoords = false;
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				if(pTMap->m_Image == -1)
+				{
+					if(IsEntityLayer)
+						DoTextureCoords = true;
+				}
+				else
+					DoTextureCoords = true;
+
+				int DataIndex = 0;
+				unsigned int TileSize = 0;
+				int OverlayCount = 0;
+				if(IsFrontLayer)
+				{
+					DataIndex = pTMap->m_Front;
+					TileSize = sizeof(CTile);
+				}
+				else if(IsSwitchLayer)
+				{
+					DataIndex = pTMap->m_Switch;
+					TileSize = sizeof(CSwitchTile);
+					OverlayCount = 2;
+				}
+				else if(IsTeleLayer)
+				{
+					DataIndex = pTMap->m_Tele;
+					TileSize = sizeof(CTeleTile);
+					OverlayCount = 1;
+				}
+				else if(IsSpeedupLayer)
+				{
+					DataIndex = pTMap->m_Speedup;
+					TileSize = sizeof(CSpeedupTile);
+					OverlayCount = 2;
+				}
+				else if(IsTuneLayer)
+				{
+					DataIndex = pTMap->m_Tune;
+					TileSize = sizeof(CTuneTile);
+				}
+				else
+				{
+					DataIndex = pTMap->m_Data;
+					TileSize = sizeof(CTile);
+				}
+				unsigned int Size = m_pLayers->Map()->GetDataSize(DataIndex);
+				void *pTiles = m_pLayers->Map()->GetData(DataIndex);
+
+				if(Size >= pTMap->m_Width * pTMap->m_Height * TileSize)
+				{
+					int CurOverlay = 0;
+					while(CurOverlay < OverlayCount + 1)
+					{
+						// We can later just count the tile layers to get the idx in the vector
+						m_vpTileLayerVisuals.push_back(new STileLayerVisuals());
+						STileLayerVisuals &Visuals = *m_vpTileLayerVisuals.back();
+						if(!Visuals.Init(pTMap->m_Width, pTMap->m_Height))
+						{
+							++CurOverlay;
+							continue;
+						}
+						Visuals.m_IsTextured = DoTextureCoords;
+
+						vtmpTiles.clear();
+						vtmpTileTexCoords.clear();
+
+						vtmpBorderTopTiles.clear();
+						vtmpBorderLeftTiles.clear();
+						vtmpBorderRightTiles.clear();
+						vtmpBorderBottomTiles.clear();
+						vtmpBorderCorners.clear();
+						vtmpBorderTopTilesTexCoords.clear();
+						vtmpBorderLeftTilesTexCoords.clear();
+						vtmpBorderRightTilesTexCoords.clear();
+						vtmpBorderBottomTilesTexCoords.clear();
+						vtmpBorderCornersTexCoords.clear();
+
+						if(!DoTextureCoords)
+						{
+							vtmpTiles.reserve((size_t)pTMap->m_Width * pTMap->m_Height);
+							vtmpBorderTopTiles.reserve((size_t)pTMap->m_Width);
+							vtmpBorderBottomTiles.reserve((size_t)pTMap->m_Width);
+							vtmpBorderLeftTiles.reserve((size_t)pTMap->m_Height);
+							vtmpBorderRightTiles.reserve((size_t)pTMap->m_Height);
+							vtmpBorderCorners.reserve((size_t)4);
+						}
+						else
+						{
+							vtmpTileTexCoords.reserve((size_t)pTMap->m_Width * pTMap->m_Height);
+							vtmpBorderTopTilesTexCoords.reserve((size_t)pTMap->m_Width);
+							vtmpBorderBottomTilesTexCoords.reserve((size_t)pTMap->m_Width);
+							vtmpBorderLeftTilesTexCoords.reserve((size_t)pTMap->m_Height);
+							vtmpBorderRightTilesTexCoords.reserve((size_t)pTMap->m_Height);
+							vtmpBorderCornersTexCoords.reserve((size_t)4);
+						}
+
+						int x = 0;
+						int y = 0;
+						for(y = 0; y < pTMap->m_Height; ++y)
+						{
+							for(x = 0; x < pTMap->m_Width; ++x)
+							{
+								unsigned char Index = 0;
+								unsigned char Flags = 0;
+								int AngleRotate = -1;
+								if(IsEntityLayer)
+								{
+									if(IsGameLayer)
+									{
+										Index = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Index;
+										Flags = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Flags;
+									}
+									if(IsFrontLayer)
+									{
+										Index = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Index;
+										Flags = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Flags;
+									}
+									if(IsSwitchLayer)
+									{
+										Flags = 0;
+										Index = ((CSwitchTile *)pTiles)[y * pTMap->m_Width + x].m_Type;
+										if(CurOverlay == 0)
+										{
+											Flags = ((CSwitchTile *)pTiles)[y * pTMap->m_Width + x].m_Flags;
+											if(Index == TILE_SWITCHTIMEDOPEN)
+												Index = 8;
+										}
+										else if(CurOverlay == 1)
+											Index = ((CSwitchTile *)pTiles)[y * pTMap->m_Width + x].m_Number;
+										else if(CurOverlay == 2)
+											Index = ((CSwitchTile *)pTiles)[y * pTMap->m_Width + x].m_Delay;
+									}
+									if(IsTeleLayer)
+									{
+										Index = ((CTeleTile *)pTiles)[y * pTMap->m_Width + x].m_Type;
+										Flags = 0;
+										if(CurOverlay == 1)
+										{
+											if(IsTeleTileNumberUsed(Index))
+												Index = ((CTeleTile *)pTiles)[y * pTMap->m_Width + x].m_Number;
+											else
+												Index = 0;
+										}
+									}
+									if(IsSpeedupLayer)
+									{
+										Index = ((CSpeedupTile *)pTiles)[y * pTMap->m_Width + x].m_Type;
+										Flags = 0;
+										AngleRotate = ((CSpeedupTile *)pTiles)[y * pTMap->m_Width + x].m_Angle;
+										if(((CSpeedupTile *)pTiles)[y * pTMap->m_Width + x].m_Force == 0)
+											Index = 0;
+										else if(CurOverlay == 1)
+											Index = ((CSpeedupTile *)pTiles)[y * pTMap->m_Width + x].m_Force;
+										else if(CurOverlay == 2)
+											Index = ((CSpeedupTile *)pTiles)[y * pTMap->m_Width + x].m_MaxSpeed;
+									}
+									if(IsTuneLayer)
+									{
+										Index = ((CTuneTile *)pTiles)[y * pTMap->m_Width + x].m_Type;
+										Flags = 0;
+									}
+								}
+								else
+								{
+									Index = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Index;
+									Flags = ((CTile *)pTiles)[y * pTMap->m_Width + x].m_Flags;
+								}
+
+								//the amount of tiles handled before this tile
+								int TilesHandledCount = vtmpTiles.size();
+								Visuals.m_pTilesOfLayer[y * pTMap->m_Width + x].SetIndexBufferByteOffset((offset_ptr32)(TilesHandledCount));
+
+								bool AddAsSpeedup = false;
+								if(IsSpeedupLayer && CurOverlay == 0)
+									AddAsSpeedup = true;
+
+								if(AddTile(vtmpTiles, vtmpTileTexCoords, Index, Flags, x, y, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate))
+									Visuals.m_pTilesOfLayer[y * pTMap->m_Width + x].Draw(true);
+
+								//do the border tiles
+								if(x == 0)
+								{
+									if(y == 0)
+									{
+										Visuals.m_BorderTopLeft.SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderCorners.size()));
+										if(AddTile(vtmpBorderCorners, vtmpBorderCornersTexCoords, Index, Flags, 0, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{-32, -32}))
+											Visuals.m_BorderTopLeft.Draw(true);
+									}
+									else if(y == pTMap->m_Height - 1)
+									{
+										Visuals.m_BorderBottomLeft.SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderCorners.size()));
+										if(AddTile(vtmpBorderCorners, vtmpBorderCornersTexCoords, Index, Flags, 0, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{-32, 0}))
+											Visuals.m_BorderBottomLeft.Draw(true);
+									}
+									Visuals.m_vBorderLeft[y].SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderLeftTiles.size()));
+									if(AddTile(vtmpBorderLeftTiles, vtmpBorderLeftTilesTexCoords, Index, Flags, 0, y, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{-32, 0}))
+										Visuals.m_vBorderLeft[y].Draw(true);
+								}
+								else if(x == pTMap->m_Width - 1)
+								{
+									if(y == 0)
+									{
+										Visuals.m_BorderTopRight.SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderCorners.size()));
+										if(AddTile(vtmpBorderCorners, vtmpBorderCornersTexCoords, Index, Flags, 0, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{0, -32}))
+											Visuals.m_BorderTopRight.Draw(true);
+									}
+									else if(y == pTMap->m_Height - 1)
+									{
+										Visuals.m_BorderBottomRight.SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderCorners.size()));
+										if(AddTile(vtmpBorderCorners, vtmpBorderCornersTexCoords, Index, Flags, 0, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{0, 0}))
+											Visuals.m_BorderBottomRight.Draw(true);
+									}
+									Visuals.m_vBorderRight[y].SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderRightTiles.size()));
+									if(AddTile(vtmpBorderRightTiles, vtmpBorderRightTilesTexCoords, Index, Flags, 0, y, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{0, 0}))
+										Visuals.m_vBorderRight[y].Draw(true);
+								}
+								if(y == 0)
+								{
+									Visuals.m_vBorderTop[x].SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderTopTiles.size()));
+									if(AddTile(vtmpBorderTopTiles, vtmpBorderTopTilesTexCoords, Index, Flags, x, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{0, -32}))
+										Visuals.m_vBorderTop[x].Draw(true);
+								}
+								else if(y == pTMap->m_Height - 1)
+								{
+									Visuals.m_vBorderBottom[x].SetIndexBufferByteOffset((offset_ptr32)(vtmpBorderBottomTiles.size()));
+									if(AddTile(vtmpBorderBottomTiles, vtmpBorderBottomTilesTexCoords, Index, Flags, x, 0, pGroup, DoTextureCoords, AddAsSpeedup, AngleRotate, ivec2{0, 0}))
+										Visuals.m_vBorderBottom[x].Draw(true);
+								}
+							}
+						}
+
+						//append one kill tile to the gamelayer
+						if(IsGameLayer)
+						{
+							Visuals.m_BorderKillTile.SetIndexBufferByteOffset((offset_ptr32)(vtmpTiles.size()));
+							if(AddTile(vtmpTiles, vtmpTileTexCoords, TILE_DEATH, 0, 0, 0, pGroup, DoTextureCoords))
+								Visuals.m_BorderKillTile.Draw(true);
+						}
+
+						//add the border corners, then the borders and fix their byte offsets
+						int TilesHandledCount = vtmpTiles.size();
+						Visuals.m_BorderTopLeft.AddIndexBufferByteOffset(TilesHandledCount);
+						Visuals.m_BorderTopRight.AddIndexBufferByteOffset(TilesHandledCount);
+						Visuals.m_BorderBottomLeft.AddIndexBufferByteOffset(TilesHandledCount);
+						Visuals.m_BorderBottomRight.AddIndexBufferByteOffset(TilesHandledCount);
+						//add the Corners to the tiles
+						vtmpTiles.insert(vtmpTiles.end(), vtmpBorderCorners.begin(), vtmpBorderCorners.end());
+						vtmpTileTexCoords.insert(vtmpTileTexCoords.end(), vtmpBorderCornersTexCoords.begin(), vtmpBorderCornersTexCoords.end());
+
+						//now the borders
+						TilesHandledCount = vtmpTiles.size();
+						if(pTMap->m_Width > 0)
+						{
+							for(int i = 0; i < pTMap->m_Width; ++i)
+							{
+								Visuals.m_vBorderTop[i].AddIndexBufferByteOffset(TilesHandledCount);
+							}
+						}
+						vtmpTiles.insert(vtmpTiles.end(), vtmpBorderTopTiles.begin(), vtmpBorderTopTiles.end());
+						vtmpTileTexCoords.insert(vtmpTileTexCoords.end(), vtmpBorderTopTilesTexCoords.begin(), vtmpBorderTopTilesTexCoords.end());
+
+						TilesHandledCount = vtmpTiles.size();
+						if(pTMap->m_Width > 0)
+						{
+							for(int i = 0; i < pTMap->m_Width; ++i)
+							{
+								Visuals.m_vBorderBottom[i].AddIndexBufferByteOffset(TilesHandledCount);
+							}
+						}
+						vtmpTiles.insert(vtmpTiles.end(), vtmpBorderBottomTiles.begin(), vtmpBorderBottomTiles.end());
+						vtmpTileTexCoords.insert(vtmpTileTexCoords.end(), vtmpBorderBottomTilesTexCoords.begin(), vtmpBorderBottomTilesTexCoords.end());
+
+						TilesHandledCount = vtmpTiles.size();
+						if(pTMap->m_Height > 0)
+						{
+							for(int i = 0; i < pTMap->m_Height; ++i)
+							{
+								Visuals.m_vBorderLeft[i].AddIndexBufferByteOffset(TilesHandledCount);
+							}
+						}
+						vtmpTiles.insert(vtmpTiles.end(), vtmpBorderLeftTiles.begin(), vtmpBorderLeftTiles.end());
+						vtmpTileTexCoords.insert(vtmpTileTexCoords.end(), vtmpBorderLeftTilesTexCoords.begin(), vtmpBorderLeftTilesTexCoords.end());
+
+						TilesHandledCount = vtmpTiles.size();
+						if(pTMap->m_Height > 0)
+						{
+							for(int i = 0; i < pTMap->m_Height; ++i)
+							{
+								Visuals.m_vBorderRight[i].AddIndexBufferByteOffset(TilesHandledCount);
+							}
+						}
+						vtmpTiles.insert(vtmpTiles.end(), vtmpBorderRightTiles.begin(), vtmpBorderRightTiles.end());
+						vtmpTileTexCoords.insert(vtmpTileTexCoords.end(), vtmpBorderRightTilesTexCoords.begin(), vtmpBorderRightTilesTexCoords.end());
+
+						//setup params
+						float *pTmpTiles = vtmpTiles.empty() ? NULL : (float *)vtmpTiles.data();
+						unsigned char *pTmpTileTexCoords = vtmpTileTexCoords.empty() ? NULL : (unsigned char *)vtmpTileTexCoords.data();
+
+						Visuals.m_BufferContainerIndex = -1;
+						size_t UploadDataSize = vtmpTileTexCoords.size() * sizeof(SGraphicTileTexureCoords) + vtmpTiles.size() * sizeof(SGraphicTile);
+						if(UploadDataSize > 0)
+						{
+							char *pUploadData = (char *)malloc(sizeof(char) * UploadDataSize);
+
+							mem_copy_special(pUploadData, pTmpTiles, sizeof(vec2), vtmpTiles.size() * 4, (DoTextureCoords ? sizeof(ubvec4) : 0));
+							if(DoTextureCoords)
+							{
+								mem_copy_special(pUploadData + sizeof(vec2), pTmpTileTexCoords, sizeof(ubvec4), vtmpTiles.size() * 4, sizeof(vec2));
+							}
+
+							// first create the buffer object
+							int BufferObjectIndex = Graphics()->CreateBufferObject(UploadDataSize, pUploadData, 0, true);
+
+							// then create the buffer container
+							SBufferContainerInfo ContainerInfo;
+							ContainerInfo.m_Stride = (DoTextureCoords ? (sizeof(float) * 2 + sizeof(ubvec4)) : 0);
+							ContainerInfo.m_VertBufferBindingIndex = BufferObjectIndex;
+							ContainerInfo.m_vAttributes.emplace_back();
+							SBufferContainerInfo::SAttribute *pAttr = &ContainerInfo.m_vAttributes.back();
+							pAttr->m_DataTypeCount = 2;
+							pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+							pAttr->m_Normalized = false;
+							pAttr->m_pOffset = 0;
+							pAttr->m_FuncType = 0;
+							if(DoTextureCoords)
+							{
+								ContainerInfo.m_vAttributes.emplace_back();
+								pAttr = &ContainerInfo.m_vAttributes.back();
+								pAttr->m_DataTypeCount = 4;
+								pAttr->m_Type = GRAPHICS_TYPE_UNSIGNED_BYTE;
+								pAttr->m_Normalized = false;
+								pAttr->m_pOffset = (void *)(sizeof(vec2));
+								pAttr->m_FuncType = 1;
+							}
+
+							Visuals.m_BufferContainerIndex = Graphics()->CreateBufferContainer(&ContainerInfo);
+							// and finally inform the backend how many indices are required
+							Graphics()->IndicesNumRequiredNotify(vtmpTiles.size() * 6);
+
+							RenderLoading();
+						}
+
+						++CurOverlay;
+					}
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_QUADS && Graphics()->IsQuadBufferingEnabled())
+			{
+				CMapItemLayerQuads *pQLayer = (CMapItemLayerQuads *)pLayer;
+
+				m_vpQuadLayerVisuals.push_back(new SQuadLayerVisuals());
+				SQuadLayerVisuals *pQLayerVisuals = m_vpQuadLayerVisuals.back();
+
+				bool Textured = (pQLayer->m_Image != -1);
+
+				vtmpQuads.clear();
+				vtmpQuadsTextured.clear();
+
+				if(Textured)
+					vtmpQuadsTextured.resize(pQLayer->m_NumQuads);
+				else
+					vtmpQuads.resize(pQLayer->m_NumQuads);
+
+				CQuad *pQuads = (CQuad *)m_pLayers->Map()->GetDataSwapped(pQLayer->m_Data);
+				for(int i = 0; i < pQLayer->m_NumQuads; ++i)
+				{
+					CQuad *pQuad = &pQuads[i];
+					for(int j = 0; j < 4; ++j)
+					{
+						int QuadIDX = j;
+						if(j == 2)
+							QuadIDX = 3;
+						else if(j == 3)
+							QuadIDX = 2;
+						if(!Textured)
+						{
+							// ignore the conversion for the position coordinates
+							vtmpQuads[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIDX].x);
+							vtmpQuads[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIDX].y);
+							vtmpQuads[i].m_aVertices[j].m_CenterX = (pQuad->m_aPoints[4].x);
+							vtmpQuads[i].m_aVertices[j].m_CenterY = (pQuad->m_aPoints[4].y);
+							vtmpQuads[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIDX].r;
+							vtmpQuads[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIDX].g;
+							vtmpQuads[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIDX].b;
+							vtmpQuads[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIDX].a;
+						}
+						else
+						{
+							// ignore the conversion for the position coordinates
+							vtmpQuadsTextured[i].m_aVertices[j].m_X = (pQuad->m_aPoints[QuadIDX].x);
+							vtmpQuadsTextured[i].m_aVertices[j].m_Y = (pQuad->m_aPoints[QuadIDX].y);
+							vtmpQuadsTextured[i].m_aVertices[j].m_CenterX = (pQuad->m_aPoints[4].x);
+							vtmpQuadsTextured[i].m_aVertices[j].m_CenterY = (pQuad->m_aPoints[4].y);
+							vtmpQuadsTextured[i].m_aVertices[j].m_U = fx2f(pQuad->m_aTexcoords[QuadIDX].x);
+							vtmpQuadsTextured[i].m_aVertices[j].m_V = fx2f(pQuad->m_aTexcoords[QuadIDX].y);
+							vtmpQuadsTextured[i].m_aVertices[j].m_R = (unsigned char)pQuad->m_aColors[QuadIDX].r;
+							vtmpQuadsTextured[i].m_aVertices[j].m_G = (unsigned char)pQuad->m_aColors[QuadIDX].g;
+							vtmpQuadsTextured[i].m_aVertices[j].m_B = (unsigned char)pQuad->m_aColors[QuadIDX].b;
+							vtmpQuadsTextured[i].m_aVertices[j].m_A = (unsigned char)pQuad->m_aColors[QuadIDX].a;
+						}
+					}
+				}
+
+				size_t UploadDataSize = 0;
+				if(Textured)
+					UploadDataSize = vtmpQuadsTextured.size() * sizeof(STmpQuadTextured);
+				else
+					UploadDataSize = vtmpQuads.size() * sizeof(STmpQuad);
+
+				if(UploadDataSize > 0)
+				{
+					void *pUploadData = NULL;
+					if(Textured)
+						pUploadData = vtmpQuadsTextured.data();
+					else
+						pUploadData = vtmpQuads.data();
+					// create the buffer object
+					int BufferObjectIndex = Graphics()->CreateBufferObject(UploadDataSize, pUploadData, 0);
+					// then create the buffer container
+					SBufferContainerInfo ContainerInfo;
+					ContainerInfo.m_Stride = (Textured ? (sizeof(STmpQuadTextured) / 4) : (sizeof(STmpQuad) / 4));
+					ContainerInfo.m_VertBufferBindingIndex = BufferObjectIndex;
+					ContainerInfo.m_vAttributes.emplace_back();
+					SBufferContainerInfo::SAttribute *pAttr = &ContainerInfo.m_vAttributes.back();
+					pAttr->m_DataTypeCount = 4;
+					pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+					pAttr->m_Normalized = false;
+					pAttr->m_pOffset = 0;
+					pAttr->m_FuncType = 0;
+					ContainerInfo.m_vAttributes.emplace_back();
+					pAttr = &ContainerInfo.m_vAttributes.back();
+					pAttr->m_DataTypeCount = 4;
+					pAttr->m_Type = GRAPHICS_TYPE_UNSIGNED_BYTE;
+					pAttr->m_Normalized = true;
+					pAttr->m_pOffset = (void *)(sizeof(float) * 4);
+					pAttr->m_FuncType = 0;
+					if(Textured)
+					{
+						ContainerInfo.m_vAttributes.emplace_back();
+						pAttr = &ContainerInfo.m_vAttributes.back();
+						pAttr->m_DataTypeCount = 2;
+						pAttr->m_Type = GRAPHICS_TYPE_FLOAT;
+						pAttr->m_Normalized = false;
+						pAttr->m_pOffset = (void *)(sizeof(float) * 4 + sizeof(unsigned char) * 4);
+						pAttr->m_FuncType = 0;
+					}
+
+					pQLayerVisuals->m_BufferContainerIndex = Graphics()->CreateBufferContainer(&ContainerInfo);
+					// and finally inform the backend how many indices are required
+					Graphics()->IndicesNumRequiredNotify(pQLayer->m_NumQuads * 6);
+
+					RenderLoading();
+				}
+			}
+		}
+	}
+}
+
+void CMapLayers::RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup)
+{
+	STileLayerVisuals &Visuals = *m_vpTileLayerVisuals[LayerIndex];
+	if(Visuals.m_BufferContainerIndex == -1)
+		return; //no visuals were created
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
+	if(pTileLayer->m_ColorEnv >= 0)
+	{
+		EnvelopeEval(pTileLayer->m_ColorEnvOffset, pTileLayer->m_ColorEnv, Channels, this);
+	}
+
+	int BorderX0, BorderY0, BorderX1, BorderY1;
+	bool DrawBorder = false;
+
+	int Y0 = BorderY0 = std::floor(ScreenY0 / 32);
+	int X0 = BorderX0 = std::floor(ScreenX0 / 32);
+	int Y1 = BorderY1 = std::ceil(ScreenY1 / 32);
+	int X1 = BorderX1 = std::ceil(ScreenX1 / 32);
+
+	if(X0 < 0)
+	{
+		X0 = 0;
+		DrawBorder = true;
+	}
+	if(Y0 < 0)
+	{
+		Y0 = 0;
+		DrawBorder = true;
+	}
+	if(X1 > pTileLayer->m_Width)
+	{
+		X1 = pTileLayer->m_Width;
+		DrawBorder = true;
+	}
+	if(Y1 > pTileLayer->m_Height)
+	{
+		Y1 = pTileLayer->m_Height;
+		DrawBorder = true;
+	}
+
+	bool DrawLayer = true;
+	if(X1 <= 0)
+		DrawLayer = false;
+	if(Y1 <= 0)
+		DrawLayer = false;
+	if(X0 >= pTileLayer->m_Width)
+		DrawLayer = false;
+	if(Y0 >= pTileLayer->m_Height)
+		DrawLayer = false;
+
+	if(DrawLayer)
+	{
+		//create the indice buffers we want to draw -- reuse them
+		static std::vector<char *> s_vpIndexOffsets;
+		static std::vector<unsigned int> s_vDrawCounts;
+
+		s_vpIndexOffsets.clear();
+		s_vDrawCounts.clear();
+
+		unsigned long long Reserve = absolute(Y1 - Y0) + 1;
+		s_vpIndexOffsets.reserve(Reserve);
+		s_vDrawCounts.reserve(Reserve);
+
+		for(int y = Y0; y < Y1; ++y)
+		{
+			if(X0 > X1)
+				continue;
+			int XR = X1 - 1;
+
+			dbg_assert(Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + XR].IndexBufferByteOffset() >= Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + X0].IndexBufferByteOffset(), "Tile count wrong.");
+
+			unsigned int NumVertices = ((Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + XR].IndexBufferByteOffset() - Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + X0].IndexBufferByteOffset()) / sizeof(unsigned int)) + (Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + XR].DoDraw() ? 6lu : 0lu);
+
+			if(NumVertices)
+			{
+				s_vpIndexOffsets.push_back((offset_ptr_size)Visuals.m_pTilesOfLayer[y * pTileLayer->m_Width + X0].IndexBufferByteOffset());
+				s_vDrawCounts.push_back(NumVertices);
+			}
+		}
+
+		Color.x *= Channels.r;
+		Color.y *= Channels.g;
+		Color.z *= Channels.b;
+		Color.w *= Channels.a;
+
+		int DrawCount = s_vpIndexOffsets.size();
+		if(DrawCount != 0)
+		{
+			Graphics()->RenderTileLayer(Visuals.m_BufferContainerIndex, Color, s_vpIndexOffsets.data(), s_vDrawCounts.data(), DrawCount);
+		}
+	}
+
+	if(DrawBorder)
+		RenderTileBorder(LayerIndex, Color, pTileLayer, pGroup, BorderX0, BorderY0, BorderX1, BorderY1);
+}
+
+void CMapLayers::RenderTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup, int BorderX0, int BorderY0, int BorderX1, int BorderY1)
+{
+	STileLayerVisuals &Visuals = *m_vpTileLayerVisuals[LayerIndex];
+
+	int Y0 = BorderY0;
+	int X0 = BorderX0;
+	int Y1 = BorderY1;
+	int X1 = BorderX1;
+
+	if(X0 < 0)
+		X0 = 0;
+	if(Y0 < 0)
+		Y0 = 0;
+	if(X1 > pTileLayer->m_Width)
+		X1 = pTileLayer->m_Width;
+	if(Y1 > pTileLayer->m_Height)
+		Y1 = pTileLayer->m_Height;
+
+	// corners
+	if(BorderX0 < 0)
+	{
+		// Draw corners on left side
+		if(BorderY0 < 0)
+		{
+			if(Visuals.m_BorderTopLeft.DoDraw())
+			{
+				vec2 Offset;
+				Offset.x = 0;
+				Offset.y = 0;
+				vec2 Scale;
+				Scale.x = absolute(BorderX0);
+				Scale.y = absolute(BorderY0);
+
+				Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, (offset_ptr_size)Visuals.m_BorderTopLeft.IndexBufferByteOffset(), Offset, Scale, 1);
+			}
+		}
+		if(BorderY1 > pTileLayer->m_Height)
+		{
+			if(Visuals.m_BorderBottomLeft.DoDraw())
+			{
+				vec2 Offset;
+				Offset.x = 0;
+				Offset.y = pTileLayer->m_Height * 32.0f;
+				vec2 Scale;
+				Scale.x = absolute(BorderX0);
+				Scale.y = BorderY1 - pTileLayer->m_Height;
+
+				Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, (offset_ptr_size)Visuals.m_BorderBottomLeft.IndexBufferByteOffset(), Offset, Scale, 1);
+			}
+		}
+	}
+	if(BorderX1 > pTileLayer->m_Width)
+	{
+		// Draw corners on right side
+		if(BorderY0 < 0)
+		{
+			if(Visuals.m_BorderTopRight.DoDraw())
+			{
+				vec2 Offset;
+				Offset.x = pTileLayer->m_Width * 32.0f;
+				Offset.y = 0;
+				vec2 Scale;
+				Scale.x = BorderX1 - pTileLayer->m_Width;
+				Scale.y = absolute(BorderY0);
+
+				Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, (offset_ptr_size)Visuals.m_BorderTopRight.IndexBufferByteOffset(), Offset, Scale, 1);
+			}
+		}
+		if(BorderY1 > pTileLayer->m_Height)
+		{
+			if(Visuals.m_BorderBottomRight.DoDraw())
+			{
+				vec2 Offset;
+				Offset.x = pTileLayer->m_Width * 32.0f;
+				Offset.y = pTileLayer->m_Height * 32.0f;
+				vec2 Scale;
+				Scale.x = BorderX1 - pTileLayer->m_Width;
+				Scale.y = BorderY1 - pTileLayer->m_Height;
+
+				Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, (offset_ptr_size)Visuals.m_BorderBottomRight.IndexBufferByteOffset(), Offset, Scale, 1);
+			}
+		}
+	}
+
+	if(BorderX1 > pTileLayer->m_Width)
+	{
+		// Draw right border
+		if(Y0 < pTileLayer->m_Height && Y1 > 0)
+		{
+			int YB = Y1 - 1;
+			unsigned int DrawNum = ((Visuals.m_vBorderRight[YB].IndexBufferByteOffset() - Visuals.m_vBorderRight[Y0].IndexBufferByteOffset()) / (sizeof(unsigned int) * 6)) + (Visuals.m_vBorderRight[YB].DoDraw() ? 1lu : 0lu);
+			offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_vBorderRight[Y0].IndexBufferByteOffset();
+			vec2 Offset;
+			Offset.x = 32.f * pTileLayer->m_Width;
+			Offset.y = 0.f;
+			vec2 Scale;
+			Scale.x = BorderX1 - pTileLayer->m_Width;
+			Scale.y = 1.f;
+			Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+		}
+	}
+	if(BorderX0 < 0)
+	{
+		// Draw left border
+		if(Y0 < pTileLayer->m_Height && Y1 > 0)
+		{
+			int YB = Y1 - 1;
+			unsigned int DrawNum = ((Visuals.m_vBorderLeft[YB].IndexBufferByteOffset() - Visuals.m_vBorderLeft[Y0].IndexBufferByteOffset()) / (sizeof(unsigned int) * 6)) + (Visuals.m_vBorderLeft[YB].DoDraw() ? 1lu : 0lu);
+			offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_vBorderLeft[Y0].IndexBufferByteOffset();
+			vec2 Offset;
+			Offset.x = 0;
+			Offset.y = 0;
+			vec2 Scale;
+			Scale.x = absolute(BorderX0);
+			Scale.y = 1;
+			Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+		}
+	}
+	if(BorderY0 < 0)
+	{
+		// Draw top border
+		if(X0 < pTileLayer->m_Width && X1 > 0)
+		{
+			int XR = X1 - 1;
+			unsigned int DrawNum = ((Visuals.m_vBorderTop[XR].IndexBufferByteOffset() - Visuals.m_vBorderTop[X0].IndexBufferByteOffset()) / (sizeof(unsigned int) * 6)) + (Visuals.m_vBorderTop[XR].DoDraw() ? 1lu : 0lu);
+			offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_vBorderTop[X0].IndexBufferByteOffset();
+			vec2 Offset;
+			Offset.x = 0.f;
+			Offset.y = 0;
+			vec2 Scale;
+			Scale.x = 1;
+			Scale.y = absolute(BorderY0);
+			Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+		}
+	}
+	if(BorderY1 > pTileLayer->m_Height)
+	{
+		// Draw bottom border
+		if(X0 < pTileLayer->m_Width && X1 > 0)
+		{
+			int XR = X1 - 1;
+			unsigned int DrawNum = ((Visuals.m_vBorderBottom[XR].IndexBufferByteOffset() - Visuals.m_vBorderBottom[X0].IndexBufferByteOffset()) / (sizeof(unsigned int) * 6)) + (Visuals.m_vBorderBottom[XR].DoDraw() ? 1lu : 0lu);
+			offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_vBorderBottom[X0].IndexBufferByteOffset();
+			vec2 Offset;
+			Offset.x = 0.f;
+			Offset.y = 32.f * pTileLayer->m_Height;
+			vec2 Scale;
+			Scale.x = 1;
+			Scale.y = BorderY1 - pTileLayer->m_Height;
+			Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+		}
+	}
+}
+
+void CMapLayers::RenderKillTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup)
+{
+	STileLayerVisuals &Visuals = *m_vpTileLayerVisuals[LayerIndex];
+	if(Visuals.m_BufferContainerIndex == -1)
+		return; //no visuals were created
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	bool DrawBorder = false;
+
+	int BorderY0 = std::floor(ScreenY0 / 32);
+	int BorderX0 = std::floor(ScreenX0 / 32);
+	int BorderY1 = std::ceil(ScreenY1 / 32);
+	int BorderX1 = std::ceil(ScreenX1 / 32);
+
+	if(BorderX0 < -201)
+		DrawBorder = true;
+	if(BorderY0 < -201)
+		DrawBorder = true;
+	if(BorderX1 > pTileLayer->m_Width + 201)
+		DrawBorder = true;
+	if(BorderY1 > pTileLayer->m_Height + 201)
+		DrawBorder = true;
+
+	if(!DrawBorder)
+		return;
+	if(!Visuals.m_BorderKillTile.DoDraw())
+		return;
+
+	if(BorderX0 < -300)
+		BorderX0 = -300;
+	if(BorderY0 < -300)
+		BorderY0 = -300;
+	if(BorderX1 >= pTileLayer->m_Width + 300)
+		BorderX1 = pTileLayer->m_Width + 299;
+	if(BorderY1 >= pTileLayer->m_Height + 300)
+		BorderY1 = pTileLayer->m_Height + 299;
+
+	if(BorderX1 < -300)
+		BorderX1 = -300;
+	if(BorderY1 < -300)
+		BorderY1 = -300;
+	if(BorderX0 >= pTileLayer->m_Width + 300)
+		BorderX0 = pTileLayer->m_Width + 299;
+	if(BorderY0 >= pTileLayer->m_Height + 300)
+		BorderY0 = pTileLayer->m_Height + 299;
+
+	// Draw left kill tile border
+	if(BorderX0 < -201)
+	{
+		unsigned int DrawNum = 1;
+		offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_BorderKillTile.IndexBufferByteOffset();
+		vec2 Offset;
+		Offset.x = 32.f * BorderX0;
+		Offset.y = 32.f * BorderY0;
+		vec2 Scale;
+		Scale.x = -201 - BorderX0;
+		Scale.y = BorderY1 - BorderY0;
+		Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+	}
+	// Draw top kill tile border
+	if(BorderY0 < -201)
+	{
+		unsigned int DrawNum = 1;
+		offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_BorderKillTile.IndexBufferByteOffset();
+		vec2 Offset;
+		Offset.x = maximum(BorderX0, -201) * 32.0f;
+		Offset.y = 32.f * BorderY0;
+		vec2 Scale;
+		Scale.x = minimum(BorderX1, pTileLayer->m_Width + 201) - maximum(BorderX0, -201);
+		Scale.y = -201 - BorderY0;
+		Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+	}
+	// Draw right kill tile border
+	if(BorderX1 > pTileLayer->m_Width + 201)
+	{
+		unsigned int DrawNum = 1;
+		offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_BorderKillTile.IndexBufferByteOffset();
+		vec2 Offset;
+		Offset.x = 32.0f * (pTileLayer->m_Width + 201);
+		Offset.y = 32.0f * BorderY0;
+		vec2 Scale;
+		Scale.x = BorderX1 - (pTileLayer->m_Width + 201);
+		Scale.y = BorderY1 - BorderY0;
+		Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+	}
+	// Draw bottom kill tile border
+	if(BorderY1 > pTileLayer->m_Height + 201)
+	{
+		unsigned int DrawNum = 1;
+		offset_ptr_size pOffset = (offset_ptr_size)Visuals.m_BorderKillTile.IndexBufferByteOffset();
+		vec2 Offset;
+		Offset.x = maximum(BorderX0, -201) * 32.0f;
+		Offset.y = 32.0f * (pTileLayer->m_Height + 201);
+		vec2 Scale;
+		Scale.x = minimum(BorderX1, pTileLayer->m_Width + 201) - maximum(BorderX0, -201);
+		Scale.y = BorderY1 - (pTileLayer->m_Height + 201);
+		Graphics()->RenderBorderTiles(Visuals.m_BufferContainerIndex, Color, pOffset, Offset, Scale, DrawNum);
+	}
+}
+
+void CMapLayers::RenderQuadLayer(int LayerIndex, CMapItemLayerQuads *pQuadLayer, CMapItemGroup *pGroup, bool Force)
+{
+	SQuadLayerVisuals &Visuals = *m_vpQuadLayerVisuals[LayerIndex];
+	if(Visuals.m_BufferContainerIndex == -1)
+		return; //no visuals were created
+
+	if(!Force && (!g_Config.m_ClShowQuads || g_Config.m_ClOverlayEntities == 100))
+		return;
+
+	CQuad *pQuads = (CQuad *)m_pLayers->Map()->GetDataSwapped(pQuadLayer->m_Data);
+
+	static std::vector<SQuadRenderInfo> s_vQuadRenderInfo;
+
+	s_vQuadRenderInfo.resize(pQuadLayer->m_NumQuads);
+	size_t QuadsRenderCount = 0;
+	size_t CurQuadOffset = 0;
+	for(int i = 0; i < pQuadLayer->m_NumQuads; ++i)
+	{
+		CQuad *pQuad = &pQuads[i];
+
+		ColorRGBA Color(1.f, 1.f, 1.f, 1.f);
+		if(pQuad->m_ColorEnv >= 0)
+		{
+			EnvelopeEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, this);
+		}
+
+		float OffsetX = 0;
+		float OffsetY = 0;
+		float Rot = 0;
+
+		if(pQuad->m_PosEnv >= 0)
+		{
+			ColorRGBA Channels;
+			EnvelopeEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Channels, this);
+			OffsetX = Channels.r;
+			OffsetY = Channels.g;
+			Rot = Channels.b / 180.0f * pi;
+		}
+
+		const bool IsFullyTransparent = Color.a <= 0;
+		bool NeedsFlush = QuadsRenderCount == gs_GraphicsMaxQuadsRenderCount || IsFullyTransparent;
+
+		if(NeedsFlush)
+		{
+			// render quads of the current offset directly(cancel batching)
+			Graphics()->RenderQuadLayer(Visuals.m_BufferContainerIndex, s_vQuadRenderInfo.data(), QuadsRenderCount, CurQuadOffset);
+			QuadsRenderCount = 0;
+			CurQuadOffset = i;
+			if(IsFullyTransparent)
+			{
+				// since this quad is ignored, the offset is the next quad
+				++CurQuadOffset;
+			}
+		}
+
+		if(!IsFullyTransparent)
+		{
+			SQuadRenderInfo &QInfo = s_vQuadRenderInfo[QuadsRenderCount++];
+			QInfo.m_Color = Color;
+			QInfo.m_Offsets.x = OffsetX;
+			QInfo.m_Offsets.y = OffsetY;
+			QInfo.m_Rotation = Rot;
+		}
+	}
+	Graphics()->RenderQuadLayer(Visuals.m_BufferContainerIndex, s_vQuadRenderInfo.data(), QuadsRenderCount, CurQuadOffset);
+}
+
+void CMapLayers::LayersOfGroupCount(CMapItemGroup *pGroup, int &TileLayerCount, int &QuadLayerCount, bool &PassedGameLayer)
+{
+	int TileLayerCounter = 0;
+	int QuadLayerCounter = 0;
+	for(int l = 0; l < pGroup->m_NumLayers; l++)
+	{
+		CMapItemLayer *pLayer = m_pLayers->GetLayer(pGroup->m_StartLayer + l);
+		bool IsFrontLayer = false;
+		bool IsSwitchLayer = false;
+		bool IsTeleLayer = false;
+		bool IsSpeedupLayer = false;
+		bool IsTuneLayer = false;
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->GameLayer())
+		{
+			PassedGameLayer = true;
+		}
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->FrontLayer())
+			IsFrontLayer = true;
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->SwitchLayer())
+			IsSwitchLayer = true;
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->TeleLayer())
+			IsTeleLayer = true;
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->SpeedupLayer())
+			IsSpeedupLayer = true;
+
+		if(pLayer == (CMapItemLayer *)m_pLayers->TuneLayer())
+			IsTuneLayer = true;
+
+		if(m_Type <= TYPE_BACKGROUND_FORCE)
+		{
+			if(PassedGameLayer)
+				break;
+		}
+		else if(m_Type == TYPE_FOREGROUND)
+		{
+			if(!PassedGameLayer)
+				continue;
+		}
+
+		if(pLayer->m_Type == LAYERTYPE_TILES)
+		{
+			CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+			int DataIndex = 0;
+			unsigned int TileSize = 0;
+			int TileLayerAndOverlayCount = 0;
+			if(IsFrontLayer)
+			{
+				DataIndex = pTMap->m_Front;
+				TileSize = sizeof(CTile);
+				TileLayerAndOverlayCount = 1;
+			}
+			else if(IsSwitchLayer)
+			{
+				DataIndex = pTMap->m_Switch;
+				TileSize = sizeof(CSwitchTile);
+				TileLayerAndOverlayCount = 3;
+			}
+			else if(IsTeleLayer)
+			{
+				DataIndex = pTMap->m_Tele;
+				TileSize = sizeof(CTeleTile);
+				TileLayerAndOverlayCount = 2;
+			}
+			else if(IsSpeedupLayer)
+			{
+				DataIndex = pTMap->m_Speedup;
+				TileSize = sizeof(CSpeedupTile);
+				TileLayerAndOverlayCount = 3;
+			}
+			else if(IsTuneLayer)
+			{
+				DataIndex = pTMap->m_Tune;
+				TileSize = sizeof(CTuneTile);
+				TileLayerAndOverlayCount = 1;
+			}
+			else
+			{
+				DataIndex = pTMap->m_Data;
+				TileSize = sizeof(CTile);
+				TileLayerAndOverlayCount = 1;
+			}
+
+			unsigned int Size = m_pLayers->Map()->GetDataSize(DataIndex);
+			if(Size >= pTMap->m_Width * pTMap->m_Height * TileSize)
+			{
+				TileLayerCounter += TileLayerAndOverlayCount;
+			}
+		}
+		else if(pLayer->m_Type == LAYERTYPE_QUADS)
+		{
+			++QuadLayerCounter;
+		}
+	}
+
+	TileLayerCount += TileLayerCounter;
+	QuadLayerCount += QuadLayerCounter;
+}
+
+void CMapLayers::OnRender()
+{
+	if(m_OnlineOnly && Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	CUIRect Screen;
+	Graphics()->GetScreen(&Screen.x, &Screen.y, &Screen.w, &Screen.h);
+
+	vec2 Center = GetCurCamera()->m_Center;
+
+	bool PassedGameLayer = false;
+	int TileLayerCounter = 0;
+	int QuadLayerCounter = 0;
+
+	for(int g = 0; g < m_pLayers->NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = m_pLayers->GetGroup(g);
+
+		if(!pGroup)
+		{
+			dbg_msg("maplayers", "error group was null, group number = %d, total groups = %d", g, m_pLayers->NumGroups());
+			dbg_msg("maplayers", "this is here to prevent a crash but the source of this is unknown, please report this for it to get fixed");
+			dbg_msg("maplayers", "we need mapname and crc and the map that caused this if possible, and anymore info you think is relevant");
+			continue;
+		}
+
+		if((!g_Config.m_GfxNoclip || m_Type == TYPE_FULL_DESIGN) && pGroup->m_Version >= 2 && pGroup->m_UseClipping)
+		{
+			// set clipping
+			float aPoints[4];
+			RenderTools()->MapScreenToGroup(Center.x, Center.y, m_pLayers->GameGroup(), GetCurCamera()->m_Zoom);
+			Graphics()->GetScreen(&aPoints[0], &aPoints[1], &aPoints[2], &aPoints[3]);
+			float x0 = (pGroup->m_ClipX - aPoints[0]) / (aPoints[2] - aPoints[0]);
+			float y0 = (pGroup->m_ClipY - aPoints[1]) / (aPoints[3] - aPoints[1]);
+			float x1 = ((pGroup->m_ClipX + pGroup->m_ClipW) - aPoints[0]) / (aPoints[2] - aPoints[0]);
+			float y1 = ((pGroup->m_ClipY + pGroup->m_ClipH) - aPoints[1]) / (aPoints[3] - aPoints[1]);
+
+			if(x1 < 0.0f || x0 > 1.0f || y1 < 0.0f || y0 > 1.0f)
+			{
+				//check tile layer count of this group
+				LayersOfGroupCount(pGroup, TileLayerCounter, QuadLayerCounter, PassedGameLayer);
+				continue;
+			}
+
+			Graphics()->ClipEnable((int)(x0 * Graphics()->ScreenWidth()), (int)(y0 * Graphics()->ScreenHeight()),
+				(int)((x1 - x0) * Graphics()->ScreenWidth()), (int)((y1 - y0) * Graphics()->ScreenHeight()));
+		}
+
+		RenderTools()->MapScreenToGroup(Center.x, Center.y, pGroup, GetCurCamera()->m_Zoom);
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = m_pLayers->GetLayer(pGroup->m_StartLayer + l);
+			bool Render = false;
+			bool IsGameLayer = false;
+			bool IsFrontLayer = false;
+			bool IsSwitchLayer = false;
+			bool IsTeleLayer = false;
+			bool IsSpeedupLayer = false;
+			bool IsTuneLayer = false;
+			bool IsEntityLayer = false;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->GameLayer())
+			{
+				IsEntityLayer = IsGameLayer = true;
+				PassedGameLayer = true;
+			}
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->FrontLayer())
+				IsEntityLayer = IsFrontLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->SwitchLayer())
+				IsEntityLayer = IsSwitchLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->TeleLayer())
+				IsEntityLayer = IsTeleLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->SpeedupLayer())
+				IsEntityLayer = IsSpeedupLayer = true;
+
+			if(pLayer == (CMapItemLayer *)m_pLayers->TuneLayer())
+				IsEntityLayer = IsTuneLayer = true;
+
+			if(m_Type == -1)
+				Render = true;
+			else if(m_Type <= TYPE_BACKGROUND_FORCE)
+			{
+				if(PassedGameLayer)
+					return;
+				Render = true;
+
+				if(m_Type == TYPE_BACKGROUND_FORCE)
+				{
+					if(pLayer->m_Type == LAYERTYPE_TILES && !g_Config.m_ClBackgroundShowTilesLayers)
+						continue;
+				}
+			}
+			else if(m_Type == TYPE_FOREGROUND)
+			{
+				if(PassedGameLayer && !IsGameLayer)
+					Render = true;
+			}
+			else if(m_Type == TYPE_FULL_DESIGN)
+			{
+				if(!IsGameLayer)
+					Render = true;
+			}
+
+			if(Render && pLayer->m_Type == LAYERTYPE_TILES && Input()->ModifierIsPressed() && Input()->ShiftIsPressed() && Input()->KeyPress(KEY_KP_0))
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				CTile *pTiles = (CTile *)m_pLayers->Map()->GetData(pTMap->m_Data);
+				CServerInfo CurrentServerInfo;
+				Client()->GetServerInfo(&CurrentServerInfo);
+				char aFilename[IO_MAX_PATH_LENGTH];
+				str_format(aFilename, sizeof(aFilename), "dumps/tilelayer_dump_%s-%d-%d-%dx%d.txt", CurrentServerInfo.m_aMap, g, l, pTMap->m_Width, pTMap->m_Height);
+				IOHANDLE File = Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+				if(File)
+				{
+					for(int y = 0; y < pTMap->m_Height; y++)
+					{
+						for(int x = 0; x < pTMap->m_Width; x++)
+							io_write(File, &(pTiles[y * pTMap->m_Width + x].m_Index), sizeof(pTiles[y * pTMap->m_Width + x].m_Index));
+						io_write_newline(File);
+					}
+					io_close(File);
+				}
+			}
+
+			if((Render || IsGameLayer) && pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				int DataIndex = 0;
+				unsigned int TileSize = 0;
+				int TileLayerAndOverlayCount = 0;
+				if(IsFrontLayer)
+				{
+					DataIndex = pTMap->m_Front;
+					TileSize = sizeof(CTile);
+					TileLayerAndOverlayCount = 1;
+				}
+				else if(IsSwitchLayer)
+				{
+					DataIndex = pTMap->m_Switch;
+					TileSize = sizeof(CSwitchTile);
+					TileLayerAndOverlayCount = 3;
+				}
+				else if(IsTeleLayer)
+				{
+					DataIndex = pTMap->m_Tele;
+					TileSize = sizeof(CTeleTile);
+					TileLayerAndOverlayCount = 2;
+				}
+				else if(IsSpeedupLayer)
+				{
+					DataIndex = pTMap->m_Speedup;
+					TileSize = sizeof(CSpeedupTile);
+					TileLayerAndOverlayCount = 3;
+				}
+				else if(IsTuneLayer)
+				{
+					DataIndex = pTMap->m_Tune;
+					TileSize = sizeof(CTuneTile);
+					TileLayerAndOverlayCount = 1;
+				}
+				else
+				{
+					DataIndex = pTMap->m_Data;
+					TileSize = sizeof(CTile);
+					TileLayerAndOverlayCount = 1;
+				}
+
+				unsigned int Size = m_pLayers->Map()->GetDataSize(DataIndex);
+				if(Size >= pTMap->m_Width * pTMap->m_Height * TileSize)
+				{
+					TileLayerCounter += TileLayerAndOverlayCount;
+				}
+			}
+			else if(Render && pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				++QuadLayerCounter;
+			}
+
+			// skip rendering if detail layers if not wanted, or is entity layer and we are a background map
+			if((pLayer->m_Flags & LAYERFLAG_DETAIL && (!g_Config.m_GfxHighDetail && !(m_Type == TYPE_FULL_DESIGN)) && !IsGameLayer) || (m_Type == TYPE_BACKGROUND_FORCE && IsEntityLayer) || (m_Type == TYPE_FULL_DESIGN && IsEntityLayer))
+				continue;
+
+			int EntityOverlayVal = g_Config.m_ClOverlayEntities;
+			if(m_Type == TYPE_FULL_DESIGN)
+				EntityOverlayVal = 0;
+
+			if((Render && EntityOverlayVal < 100 && !IsGameLayer && !IsFrontLayer && !IsSwitchLayer && !IsTeleLayer && !IsSpeedupLayer && !IsTuneLayer) || (EntityOverlayVal && IsGameLayer) || (m_Type == TYPE_BACKGROUND_FORCE))
+			{
+				if(pLayer->m_Type == LAYERTYPE_TILES)
+				{
+					CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+					if(pTMap->m_Image < 0 || pTMap->m_Image >= m_pImages->Num())
+					{
+						if(!IsGameLayer)
+							Graphics()->TextureClear();
+						else
+							Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH));
+					}
+					else
+						Graphics()->TextureSet(m_pImages->Get(pTMap->m_Image));
+
+					CTile *pTiles = (CTile *)m_pLayers->Map()->GetData(pTMap->m_Data);
+					unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Data);
+
+					if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTile))
+					{
+						ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f);
+						if(IsGameLayer && EntityOverlayVal)
+							Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+						else if(!IsGameLayer && EntityOverlayVal && !(m_Type == TYPE_BACKGROUND_FORCE))
+							Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * (100 - EntityOverlayVal) / 100.0f);
+						if(!Graphics()->IsTileBufferingEnabled())
+						{
+							Graphics()->BlendNone();
+							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE,
+								EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+
+							Graphics()->BlendNormal();
+
+							// draw kill tiles outside the entity clipping rectangle
+							if(IsGameLayer)
+							{
+								// slow blinking to hint that it's not a part of the map
+								double Seconds = time_get() / (double)time_freq();
+								ColorRGBA ColorHint = ColorRGBA(1.0f, 1.0f, 1.0f, 0.3 + 0.7 * (1 + std::sin(2 * (double)pi * Seconds / 3)) / 2);
+
+								RenderTools()->RenderTileRectangle(-201, -201, pTMap->m_Width + 402, pTMap->m_Height + 402,
+									0, TILE_DEATH, // display air inside, death outside
+									32.0f, Color.v4() * ColorHint.v4(), TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
+									EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+							}
+
+							RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
+								EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+						}
+						else
+						{
+							Graphics()->BlendNormal();
+							// draw kill tiles outside the entity clipping rectangle
+							if(IsGameLayer)
+							{
+								// slow blinking to hint that it's not a part of the map
+								double Seconds = time_get() / (double)time_freq();
+								ColorRGBA ColorHint = ColorRGBA(1.0f, 1.0f, 1.0f, 0.3 + 0.7 * (1.0 + std::sin(2 * (double)pi * Seconds / 3)) / 2);
+
+								ColorRGBA ColorKill(Color.x * ColorHint.x, Color.y * ColorHint.y, Color.z * ColorHint.z, Color.w * ColorHint.w);
+								RenderKillTileBorder(TileLayerCounter - 1, ColorKill, pTMap, pGroup);
+							}
+							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+						}
+					}
+				}
+				else if(pLayer->m_Type == LAYERTYPE_QUADS)
+				{
+					CMapItemLayerQuads *pQLayer = (CMapItemLayerQuads *)pLayer;
+					if(pQLayer->m_Image < 0 || pQLayer->m_Image >= m_pImages->Num())
+						Graphics()->TextureClear();
+					else
+						Graphics()->TextureSet(m_pImages->Get(pQLayer->m_Image));
+
+					CQuad *pQuads = (CQuad *)m_pLayers->Map()->GetDataSwapped(pQLayer->m_Data);
+					if(m_Type == TYPE_BACKGROUND_FORCE || m_Type == TYPE_FULL_DESIGN)
+					{
+						if(g_Config.m_ClShowQuads || m_Type == TYPE_FULL_DESIGN)
+						{
+							if(!Graphics()->IsQuadBufferingEnabled())
+							{
+								//Graphics()->BlendNone();
+								//RenderTools()->ForceRenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_OPAQUE, EnvelopeEval, this, 1.f);
+								Graphics()->BlendNormal();
+								RenderTools()->ForceRenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_TRANSPARENT, EnvelopeEval, this, 1.f);
+							}
+							else
+							{
+								RenderQuadLayer(QuadLayerCounter - 1, pQLayer, pGroup, true);
+							}
+						}
+					}
+					else
+					{
+						if(!Graphics()->IsQuadBufferingEnabled())
+						{
+							//Graphics()->BlendNone();
+							//RenderTools()->RenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_OPAQUE, EnvelopeEval, this);
+							Graphics()->BlendNormal();
+							RenderTools()->RenderQuads(pQuads, pQLayer->m_NumQuads, LAYERRENDERFLAG_TRANSPARENT, EnvelopeEval, this);
+						}
+						else
+						{
+							RenderQuadLayer(QuadLayerCounter - 1, pQLayer, pGroup, false);
+						}
+					}
+				}
+			}
+			else if(Render && EntityOverlayVal && IsFrontLayer)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH));
+
+				CTile *pFrontTiles = (CTile *)m_pLayers->Map()->GetData(pTMap->m_Front);
+				unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Front);
+
+				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTile))
+				{
+					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					if(!Graphics()->IsTileBufferingEnabled())
+					{
+						Graphics()->BlendNone();
+						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE,
+							EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+						Graphics()->BlendNormal();
+						RenderTools()->RenderTilemap(pFrontTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT,
+							EnvelopeEval, this, pTMap->m_ColorEnv, pTMap->m_ColorEnvOffset);
+					}
+					else
+					{
+						Graphics()->BlendNormal();
+						RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+					}
+				}
+			}
+			else if(Render && EntityOverlayVal && IsSwitchLayer)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_SWITCH));
+
+				CSwitchTile *pSwitchTiles = (CSwitchTile *)m_pLayers->Map()->GetData(pTMap->m_Switch);
+				unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Switch);
+
+				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CSwitchTile))
+				{
+					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					if(!Graphics()->IsTileBufferingEnabled())
+					{
+						Graphics()->BlendNone();
+						RenderTools()->RenderSwitchmap(pSwitchTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
+						Graphics()->BlendNormal();
+						RenderTools()->RenderSwitchmap(pSwitchTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
+						RenderTools()->RenderSwitchOverlay(pSwitchTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, EntityOverlayVal / 100.0f);
+					}
+					else
+					{
+						Graphics()->BlendNormal();
+						RenderTileLayer(TileLayerCounter - 3, Color, pTMap, pGroup);
+						if(g_Config.m_ClTextEntities)
+						{
+							Graphics()->TextureSet(m_pImages->GetOverlayBottom());
+							RenderTileLayer(TileLayerCounter - 2, Color, pTMap, pGroup);
+							Graphics()->TextureSet(m_pImages->GetOverlayTop());
+							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+						}
+					}
+				}
+			}
+			else if(Render && EntityOverlayVal && IsTeleLayer)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH));
+
+				CTeleTile *pTeleTiles = (CTeleTile *)m_pLayers->Map()->GetData(pTMap->m_Tele);
+				unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Tele);
+
+				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTeleTile))
+				{
+					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					if(!Graphics()->IsTileBufferingEnabled())
+					{
+						Graphics()->BlendNone();
+						RenderTools()->RenderTelemap(pTeleTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
+						Graphics()->BlendNormal();
+						RenderTools()->RenderTelemap(pTeleTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
+						RenderTools()->RenderTeleOverlay(pTeleTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, EntityOverlayVal / 100.0f);
+					}
+					else
+					{
+						Graphics()->BlendNormal();
+						RenderTileLayer(TileLayerCounter - 2, Color, pTMap, pGroup);
+						if(g_Config.m_ClTextEntities)
+						{
+							Graphics()->TextureSet(m_pImages->GetOverlayCenter());
+							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+						}
+					}
+				}
+			}
+			else if(Render && EntityOverlayVal && IsSpeedupLayer)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH));
+
+				CSpeedupTile *pSpeedupTiles = (CSpeedupTile *)m_pLayers->Map()->GetData(pTMap->m_Speedup);
+				unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Speedup);
+
+				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CSpeedupTile))
+				{
+					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					if(!Graphics()->IsTileBufferingEnabled())
+					{
+						Graphics()->BlendNone();
+						RenderTools()->RenderSpeedupmap(pSpeedupTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
+						Graphics()->BlendNormal();
+						RenderTools()->RenderSpeedupmap(pSpeedupTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
+						RenderTools()->RenderSpeedupOverlay(pSpeedupTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, EntityOverlayVal / 100.0f);
+					}
+					else
+					{
+						Graphics()->BlendNormal();
+
+						// draw arrow -- clamp to the edge of the arrow image
+						Graphics()->WrapClamp();
+						Graphics()->TextureSet(m_pImages->GetSpeedupArrow());
+						RenderTileLayer(TileLayerCounter - 3, Color, pTMap, pGroup);
+						Graphics()->WrapNormal();
+
+						if(g_Config.m_ClTextEntities)
+						{
+							Graphics()->TextureSet(m_pImages->GetOverlayBottom());
+							RenderTileLayer(TileLayerCounter - 2, Color, pTMap, pGroup);
+							Graphics()->TextureSet(m_pImages->GetOverlayTop());
+							RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+						}
+					}
+				}
+			}
+			else if(Render && EntityOverlayVal && IsTuneLayer)
+			{
+				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				Graphics()->TextureSet(m_pImages->GetEntities(MAP_IMAGE_ENTITY_LAYER_TYPE_ALL_EXCEPT_SWITCH));
+
+				CTuneTile *pTuneTiles = (CTuneTile *)m_pLayers->Map()->GetData(pTMap->m_Tune);
+				unsigned int Size = m_pLayers->Map()->GetDataSize(pTMap->m_Tune);
+
+				if(Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTuneTile))
+				{
+					ColorRGBA Color = ColorRGBA(pTMap->m_Color.r / 255.0f, pTMap->m_Color.g / 255.0f, pTMap->m_Color.b / 255.0f, pTMap->m_Color.a / 255.0f * EntityOverlayVal / 100.0f);
+					if(!Graphics()->IsTileBufferingEnabled())
+					{
+						Graphics()->BlendNone();
+						RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_OPAQUE);
+						Graphics()->BlendNormal();
+						RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND | LAYERRENDERFLAG_TRANSPARENT);
+						//RenderTools()->RenderTuneOverlay(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, EntityOverlayVal/100.0f);
+					}
+					else
+					{
+						Graphics()->BlendNormal();
+						RenderTileLayer(TileLayerCounter - 1, Color, pTMap, pGroup);
+					}
+				}
+			}
+		}
+		if(!g_Config.m_GfxNoclip || m_Type == TYPE_FULL_DESIGN)
+			Graphics()->ClipDisable();
+	}
+
+	if(!g_Config.m_GfxNoclip || m_Type == TYPE_FULL_DESIGN)
+		Graphics()->ClipDisable();
+
+	// reset the screen like it was before
+	Graphics()->MapScreen(Screen.x, Screen.y, Screen.w, Screen.h);
+}
diff --git a/src_bkp/game/client/components/maplayers.h b/src_bkp/game/client/components/maplayers.h
new file mode 100644
index 0000000000..dbc4f05136
--- /dev/null
+++ b/src_bkp/game/client/components/maplayers.h
@@ -0,0 +1,164 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_MAPLAYERS_H
+#define GAME_CLIENT_COMPONENTS_MAPLAYERS_H
+#include <game/client/component.h>
+
+#include <cstdint>
+#include <vector>
+
+#define INDEX_BUFFER_GROUP_WIDTH 12
+#define INDEX_BUFFER_GROUP_HEIGHT 9
+#define INDEX_BORDER_BUFFER_GROUP_SIZE 20
+
+typedef char *offset_ptr_size;
+typedef uintptr_t offset_ptr;
+typedef unsigned int offset_ptr32;
+
+class CCamera;
+class CLayers;
+class CMapImages;
+class ColorRGBA;
+struct CMapItemGroup;
+struct CMapItemLayerTilemap;
+struct CMapItemLayerQuads;
+
+class CMapLayers : public CComponent
+{
+	friend class CBackground;
+	friend class CMenuBackground;
+
+	CLayers *m_pLayers;
+	CMapImages *m_pImages;
+	int m_Type;
+	int m_CurrentLocalTick;
+	int m_LastLocalTick;
+	bool m_EnvelopeUpdate;
+
+	struct STileLayerVisuals
+	{
+		STileLayerVisuals() :
+			m_pTilesOfLayer(nullptr)
+		{
+			m_Width = 0;
+			m_Height = 0;
+			m_BufferContainerIndex = -1;
+			m_IsTextured = false;
+		}
+
+		bool Init(unsigned int Width, unsigned int Height);
+
+		~STileLayerVisuals();
+
+		struct STileVisual
+		{
+			STileVisual() :
+				m_IndexBufferByteOffset(0) {}
+
+		private:
+			offset_ptr32 m_IndexBufferByteOffset;
+
+		public:
+			bool DoDraw()
+			{
+				return (m_IndexBufferByteOffset & 0x10000000) != 0;
+			}
+
+			void Draw(bool SetDraw)
+			{
+				m_IndexBufferByteOffset = (SetDraw ? 0x10000000 : (offset_ptr32)0) | (m_IndexBufferByteOffset & 0xEFFFFFFF);
+			}
+
+			offset_ptr IndexBufferByteOffset()
+			{
+				return ((offset_ptr)(m_IndexBufferByteOffset & 0xEFFFFFFF) * 6 * sizeof(uint32_t));
+			}
+
+			void SetIndexBufferByteOffset(offset_ptr32 IndexBufferByteOff)
+			{
+				m_IndexBufferByteOffset = IndexBufferByteOff | (m_IndexBufferByteOffset & 0x10000000);
+			}
+
+			void AddIndexBufferByteOffset(offset_ptr32 IndexBufferByteOff)
+			{
+				m_IndexBufferByteOffset = ((m_IndexBufferByteOffset & 0xEFFFFFFF) + IndexBufferByteOff) | (m_IndexBufferByteOffset & 0x10000000);
+			}
+		};
+		STileVisual *m_pTilesOfLayer;
+
+		STileVisual m_BorderTopLeft;
+		STileVisual m_BorderTopRight;
+		STileVisual m_BorderBottomRight;
+		STileVisual m_BorderBottomLeft;
+
+		STileVisual m_BorderKillTile; //end of map kill tile -- game layer only
+
+		std::vector<STileVisual> m_vBorderTop;
+		std::vector<STileVisual> m_vBorderLeft;
+		std::vector<STileVisual> m_vBorderRight;
+		std::vector<STileVisual> m_vBorderBottom;
+
+		unsigned int m_Width;
+		unsigned int m_Height;
+		int m_BufferContainerIndex;
+		bool m_IsTextured;
+	};
+	std::vector<STileLayerVisuals *> m_vpTileLayerVisuals;
+
+	struct SQuadLayerVisuals
+	{
+		SQuadLayerVisuals() :
+			m_QuadNum(0), m_pQuadsOfLayer(nullptr), m_BufferContainerIndex(-1), m_IsTextured(false) {}
+
+		struct SQuadVisual
+		{
+			SQuadVisual() :
+				m_IndexBufferByteOffset(0) {}
+
+			offset_ptr m_IndexBufferByteOffset;
+		};
+
+		int m_QuadNum;
+		SQuadVisual *m_pQuadsOfLayer;
+
+		int m_BufferContainerIndex;
+		bool m_IsTextured;
+	};
+	std::vector<SQuadLayerVisuals *> m_vpQuadLayerVisuals;
+
+	virtual CCamera *GetCurCamera();
+
+	void LayersOfGroupCount(CMapItemGroup *pGroup, int &TileLayerCount, int &QuadLayerCount, bool &PassedGameLayer);
+
+protected:
+	virtual bool CanRenderMenuBackground() { return true; }
+
+public:
+	enum
+	{
+		TYPE_BACKGROUND = 0,
+		TYPE_BACKGROUND_FORCE,
+		TYPE_FOREGROUND,
+		TYPE_FULL_DESIGN,
+		TYPE_ALL = -1,
+	};
+
+	CMapLayers(int Type, bool OnlineOnly = true);
+	virtual ~CMapLayers();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnInit() override;
+	virtual void OnRender() override;
+	virtual void OnMapLoad() override;
+
+	void RenderTileLayer(int LayerIndex, ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup);
+	void RenderTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup, int BorderX0, int BorderY0, int BorderX1, int BorderY1);
+	void RenderKillTileBorder(int LayerIndex, const ColorRGBA &Color, CMapItemLayerTilemap *pTileLayer, CMapItemGroup *pGroup);
+	void RenderQuadLayer(int LayerIndex, CMapItemLayerQuads *pQuadLayer, CMapItemGroup *pGroup, bool ForceRender = false);
+
+	void EnvelopeUpdate();
+
+	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
+	bool m_OnlineOnly;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/mapsounds.cpp b/src_bkp/game/client/components/mapsounds.cpp
new file mode 100644
index 0000000000..9f7c0b93e3
--- /dev/null
+++ b/src_bkp/game/client/components/mapsounds.cpp
@@ -0,0 +1,261 @@
+#include "mapsounds.h"
+
+#include <base/log.h>
+
+#include <engine/demo.h>
+#include <engine/sound.h>
+
+#include <game/client/components/camera.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+#include <game/layers.h>
+#include <game/localization.h>
+#include <game/mapitems.h>
+
+CMapSounds::CMapSounds()
+{
+	m_Count = 0;
+}
+
+void CMapSounds::OnMapLoad()
+{
+	IMap *pMap = Kernel()->RequestInterface<IMap>();
+
+	Clear();
+
+	// load samples
+	int Start;
+	pMap->GetType(MAPITEMTYPE_SOUND, &Start, &m_Count);
+
+	m_Count = clamp<int>(m_Count, 0, MAX_MAPSOUNDS);
+
+	// load new samples
+	bool ShowWarning = false;
+	for(int i = 0; i < m_Count; i++)
+	{
+		CMapItemSound *pSound = (CMapItemSound *)pMap->GetItem(Start + i);
+		if(pSound->m_External)
+		{
+			const char *pName = pMap->GetDataString(pSound->m_SoundName);
+			if(pName == nullptr || pName[0] == '\0')
+			{
+				log_error("mapsounds", "Failed to load map sound %d: failed to load name.", i);
+				ShowWarning = true;
+				continue;
+			}
+
+			char aBuf[IO_MAX_PATH_LENGTH];
+			str_format(aBuf, sizeof(aBuf), "mapres/%s.opus", pName);
+			m_aSounds[i] = Sound()->LoadOpus(aBuf);
+			pMap->UnloadData(pSound->m_SoundName);
+		}
+		else
+		{
+			void *pData = pMap->GetData(pSound->m_SoundData);
+			m_aSounds[i] = Sound()->LoadOpusFromMem(pData, pSound->m_SoundDataSize);
+			pMap->UnloadData(pSound->m_SoundData);
+		}
+		ShowWarning = ShowWarning || m_aSounds[i] == -1;
+	}
+	if(ShowWarning)
+	{
+		Client()->AddWarning(SWarning(Localize("Some map sounds could not be loaded. Check the local console for details.")));
+	}
+
+	// enqueue sound sources
+	m_vSourceQueue.clear();
+	for(int g = 0; g < Layers()->NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = Layers()->GetGroup(g);
+
+		if(!pGroup)
+			continue;
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = Layers()->GetLayer(pGroup->m_StartLayer + l);
+
+			if(!pLayer)
+				continue;
+
+			if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				CMapItemLayerSounds *pSoundLayer = (CMapItemLayerSounds *)pLayer;
+
+				if(pSoundLayer->m_Version < 1 || pSoundLayer->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
+					continue;
+
+				if(pSoundLayer->m_Sound == -1)
+					continue;
+
+				CSoundSource *pSources = (CSoundSource *)Layers()->Map()->GetDataSwapped(pSoundLayer->m_Data);
+
+				if(!pSources)
+					continue;
+
+				for(int i = 0; i < pSoundLayer->m_NumSources; i++)
+				{
+					CSourceQueueEntry Source;
+					Source.m_Sound = pSoundLayer->m_Sound;
+					Source.m_pSource = &pSources[i];
+
+					if(!Source.m_pSource || Source.m_Sound < 0 || Source.m_Sound >= m_Count)
+						continue;
+
+					m_vSourceQueue.push_back(Source);
+				}
+			}
+		}
+	}
+}
+
+void CMapSounds::OnRender()
+{
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	bool DemoPlayerPaused = Client()->State() == IClient::STATE_DEMOPLAYBACK && DemoPlayer()->BaseInfo()->m_Paused;
+
+	// enqueue sounds
+	for(auto &Source : m_vSourceQueue)
+	{
+		static float s_Time = 0.0f;
+		if(m_pClient->m_Snap.m_pGameInfoObj) // && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_PAUSED))
+		{
+			s_Time = mix((Client()->PrevGameTick(g_Config.m_ClDummy) - m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)Client()->GameTickSpeed(),
+				(Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)Client()->GameTickSpeed(),
+				Client()->IntraGameTick(g_Config.m_ClDummy));
+		}
+		float Offset = s_Time - Source.m_pSource->m_TimeDelay;
+		if(!DemoPlayerPaused && Offset >= 0.0f && g_Config.m_SndEnable)
+		{
+			if(Source.m_Voice.IsValid())
+			{
+				// currently playing, set offset
+				Sound()->SetVoiceTimeOffset(Source.m_Voice, Offset);
+			}
+			else
+			{
+				// need to enqueue
+				int Flags = 0;
+				if(Source.m_pSource->m_Loop)
+					Flags |= ISound::FLAG_LOOP;
+				if(!Source.m_pSource->m_Pan)
+					Flags |= ISound::FLAG_NO_PANNING;
+
+				Source.m_Voice = m_pClient->m_Sounds.PlaySampleAt(CSounds::CHN_MAPSOUND, m_aSounds[Source.m_Sound], 1.0f, vec2(fx2f(Source.m_pSource->m_Position.x), fx2f(Source.m_pSource->m_Position.y)), Flags);
+				Sound()->SetVoiceTimeOffset(Source.m_Voice, Offset);
+				Sound()->SetVoiceFalloff(Source.m_Voice, Source.m_pSource->m_Falloff / 255.0f);
+				switch(Source.m_pSource->m_Shape.m_Type)
+				{
+				case CSoundShape::SHAPE_CIRCLE:
+				{
+					Sound()->SetVoiceCircle(Source.m_Voice, Source.m_pSource->m_Shape.m_Circle.m_Radius);
+					break;
+				}
+
+				case CSoundShape::SHAPE_RECTANGLE:
+				{
+					Sound()->SetVoiceRectangle(Source.m_Voice, fx2f(Source.m_pSource->m_Shape.m_Rectangle.m_Width), fx2f(Source.m_pSource->m_Shape.m_Rectangle.m_Height));
+					break;
+				}
+				};
+			}
+		}
+		else
+		{
+			// stop voice
+			Sound()->StopVoice(Source.m_Voice);
+			Source.m_Voice = ISound::CVoiceHandle();
+		}
+	}
+
+	vec2 Center = m_pClient->m_Camera.m_Center;
+	for(int g = 0; g < Layers()->NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = Layers()->GetGroup(g);
+
+		if(!pGroup)
+			continue;
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = Layers()->GetLayer(pGroup->m_StartLayer + l);
+
+			if(!pLayer)
+				continue;
+
+			if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				CMapItemLayerSounds *pSoundLayer = (CMapItemLayerSounds *)pLayer;
+
+				if(pSoundLayer->m_Version < 1 || pSoundLayer->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
+					continue;
+
+				CSoundSource *pSources = (CSoundSource *)Layers()->Map()->GetDataSwapped(pSoundLayer->m_Data);
+
+				if(!pSources)
+					continue;
+
+				for(int s = 0; s < pSoundLayer->m_NumSources; s++)
+				{
+					for(auto &Voice : m_vSourceQueue)
+					{
+						if(Voice.m_pSource != &pSources[s])
+							continue;
+
+						if(!Voice.m_Voice.IsValid())
+							continue;
+
+						float OffsetX = 0, OffsetY = 0;
+
+						if(Voice.m_pSource->m_PosEnv >= 0)
+						{
+							ColorRGBA Channels;
+							CMapLayers::EnvelopeEval(Voice.m_pSource->m_PosEnvOffset, Voice.m_pSource->m_PosEnv, Channels, &m_pClient->m_MapLayersBackground);
+							OffsetX = Channels.r;
+							OffsetY = Channels.g;
+						}
+
+						float x = fx2f(Voice.m_pSource->m_Position.x) + OffsetX;
+						float y = fx2f(Voice.m_pSource->m_Position.y) + OffsetY;
+
+						x += Center.x * (1.0f - pGroup->m_ParallaxX / 100.0f);
+						y += Center.y * (1.0f - pGroup->m_ParallaxY / 100.0f);
+
+						x -= pGroup->m_OffsetX;
+						y -= pGroup->m_OffsetY;
+
+						Sound()->SetVoiceLocation(Voice.m_Voice, x, y);
+
+						if(Voice.m_pSource->m_SoundEnv >= 0)
+						{
+							ColorRGBA Channels;
+							CMapLayers::EnvelopeEval(Voice.m_pSource->m_SoundEnvOffset, Voice.m_pSource->m_SoundEnv, Channels, &m_pClient->m_MapLayersBackground);
+							float Volume = clamp(Channels.r, 0.0f, 1.0f);
+
+							Sound()->SetVoiceVolume(Voice.m_Voice, Volume);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void CMapSounds::Clear()
+{
+	// unload all samples
+	for(int i = 0; i < m_Count; i++)
+	{
+		Sound()->UnloadSample(m_aSounds[i]);
+		m_aSounds[i] = -1;
+	}
+	m_Count = 0;
+}
+
+void CMapSounds::OnStateChange(int NewState, int OldState)
+{
+	if(NewState < IClient::STATE_ONLINE)
+		Clear();
+}
diff --git a/src_bkp/game/client/components/mapsounds.h b/src_bkp/game/client/components/mapsounds.h
new file mode 100644
index 0000000000..afdd7353fb
--- /dev/null
+++ b/src_bkp/game/client/components/mapsounds.h
@@ -0,0 +1,40 @@
+#ifndef GAME_CLIENT_COMPONENTS_MAPSOUNDS_H
+#define GAME_CLIENT_COMPONENTS_MAPSOUNDS_H
+
+#include <vector>
+
+#include <engine/sound.h>
+
+#include <game/client/component.h>
+#include <game/mapitems.h>
+
+struct CSoundSource;
+
+class CMapSounds : public CComponent
+{
+	int m_aSounds[MAX_MAPSOUNDS];
+	int m_Count;
+
+	struct CSourceQueueEntry
+	{
+		int m_Sound;
+		ISound::CVoiceHandle m_Voice;
+		CSoundSource *m_pSource;
+
+		bool operator==(const CSourceQueueEntry &Other) const { return (m_Sound == Other.m_Sound) && (m_Voice == Other.m_Voice) && (m_pSource == Other.m_pSource); }
+	};
+
+	std::vector<CSourceQueueEntry> m_vSourceQueue;
+
+	void Clear();
+
+public:
+	CMapSounds();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnMapLoad() override;
+	virtual void OnRender() override;
+	virtual void OnStateChange(int NewState, int OldState) override;
+};
+
+#endif // GAME_CLIENT_COMPONENTS_MAPSOUNDS_H
diff --git a/src_bkp/game/client/components/menu_background.cpp b/src_bkp/game/client/components/menu_background.cpp
new file mode 100644
index 0000000000..7a6ee7b783
--- /dev/null
+++ b/src_bkp/game/client/components/menu_background.cpp
@@ -0,0 +1,402 @@
+#include <base/system.h>
+
+#include <algorithm>
+
+#include <engine/graphics.h>
+#include <engine/map.h>
+#include <engine/shared/config.h>
+
+#include <game/client/components/camera.h>
+#include <game/client/components/mapimages.h>
+#include <game/client/components/maplayers.h>
+#include <game/client/gameclient.h>
+
+#include <game/layers.h>
+#include <game/localization.h>
+#include <game/mapitems.h>
+
+#include "menu_background.h"
+
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+std::array<vec2, CMenuBackground::NUM_POS> GenerateMenuBackgroundPositions()
+{
+	std::array<vec2, CMenuBackground::NUM_POS> Positions;
+
+	Positions[CMenuBackground::POS_START] = vec2(500.0f, 500.0f);
+	Positions[CMenuBackground::POS_BROWSER_INTERNET] = vec2(1000.0f, 1000.0f);
+	Positions[CMenuBackground::POS_BROWSER_LAN] = vec2(1100.0f, 1000.0f);
+	Positions[CMenuBackground::POS_DEMOS] = vec2(900.0f, 100.0f);
+	Positions[CMenuBackground::POS_NEWS] = vec2(500.0f, 750.0f);
+	Positions[CMenuBackground::POS_BROWSER_FAVORITES] = vec2(1250.0f, 500.0f);
+	Positions[CMenuBackground::POS_SETTINGS_LANGUAGE] = vec2(500.0f, 1200.0f);
+	Positions[CMenuBackground::POS_SETTINGS_GENERAL] = vec2(500.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_PLAYER] = vec2(600.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_TEE] = vec2(700.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_APPEARANCE] = vec2(200.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_CONTROLS] = vec2(800.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_GRAPHICS] = vec2(900.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_SOUND] = vec2(1000.0f, 1000.0f);
+	Positions[CMenuBackground::POS_SETTINGS_DDNET] = vec2(1200.0f, 200.0f);
+	Positions[CMenuBackground::POS_SETTINGS_ASSETS] = vec2(500.0f, 500.0f);
+	for(int i = 0; i < CMenuBackground::POS_BROWSER_CUSTOM_NUM; ++i)
+		Positions[CMenuBackground::POS_BROWSER_CUSTOM0 + i] = vec2(500.0f + (75.0f * (float)i), 650.0f - (75.0f * (float)i));
+	for(int i = 0; i < CMenuBackground::POS_SETTINGS_RESERVED_NUM; ++i)
+		Positions[CMenuBackground::POS_SETTINGS_RESERVED0 + i] = vec2(0, 0);
+	for(int i = 0; i < CMenuBackground::POS_RESERVED_NUM; ++i)
+		Positions[CMenuBackground::POS_RESERVED0 + i] = vec2(0, 0);
+
+	return Positions;
+}
+
+CMenuBackground::CMenuBackground() :
+	CBackground(CMapLayers::TYPE_FULL_DESIGN, false)
+{
+	m_RotationCenter = vec2(0.0f, 0.0f);
+	m_AnimationStartPos = vec2(0.0f, 0.0f);
+	m_Camera.m_Center = vec2(0.0f, 0.0f);
+	m_Camera.m_PrevCenter = vec2(0.0f, 0.0f); // unused in this class
+	m_ChangedPosition = false;
+
+	ResetPositions();
+
+	m_CurrentPosition = -1;
+	m_MoveTime = 0.0f;
+
+	m_IsInit = false;
+}
+
+CBackgroundEngineMap *CMenuBackground::CreateBGMap()
+{
+	return new CMenuMap;
+}
+
+void CMenuBackground::OnInit()
+{
+	m_pBackgroundMap = CreateBGMap();
+	m_pMap = m_pBackgroundMap;
+
+	m_IsInit = true;
+
+	m_pImages->m_pClient = GameClient();
+	Kernel()->RegisterInterface<CMenuMap>((CMenuMap *)m_pBackgroundMap);
+	if(g_Config.m_ClMenuMap[0] != '\0')
+		LoadMenuBackground();
+
+	m_Camera.m_pClient = GameClient();
+	m_Camera.m_ZoomSet = false;
+	m_Camera.m_ZoomSmoothingTarget = 0;
+}
+
+void CMenuBackground::ResetPositions()
+{
+	m_aPositions = GenerateMenuBackgroundPositions();
+}
+
+void CMenuBackground::LoadThemeIcon(CTheme &Theme)
+{
+	char aIconPath[IO_MAX_PATH_LENGTH];
+	str_format(aIconPath, sizeof(aIconPath), "themes/%s.png", Theme.m_Name.empty() ? "none" : Theme.m_Name.c_str());
+	Theme.m_IconTexture = Graphics()->LoadTexture(aIconPath, IStorage::TYPE_ALL);
+
+	char aBuf[32 + IO_MAX_PATH_LENGTH];
+	if(Theme.m_IconTexture.IsNullTexture())
+		str_format(aBuf, sizeof(aBuf), "failed to load theme icon '%s'", aIconPath);
+	else
+		str_format(aBuf, sizeof(aBuf), "loaded theme icon '%s'", aIconPath);
+	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menuthemes", aBuf);
+}
+
+int CMenuBackground::ThemeScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	CMenuBackground *pSelf = (CMenuBackground *)pUser;
+	const char *pSuffix = str_endswith(pName, ".map");
+	if(IsDir || !pSuffix)
+		return 0;
+	char aFullName[128];
+	char aThemeName[128];
+	str_truncate(aFullName, sizeof(aFullName), pName, pSuffix - pName);
+
+	bool IsDay = false;
+	bool IsNight = false;
+	if((pSuffix = str_endswith(aFullName, "_day")))
+	{
+		str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aFullName);
+		IsDay = true;
+	}
+	else if((pSuffix = str_endswith(aFullName, "_night")))
+	{
+		str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aFullName);
+		IsNight = true;
+	}
+	else
+		str_copy(aThemeName, aFullName);
+
+	if(str_comp(aThemeName, "none") == 0 || str_comp(aThemeName, "auto") == 0 || str_comp(aThemeName, "rand") == 0) // "none", "auto" and "rand" reserved, disallowed for maps
+		return 0;
+
+	// try to edit an existing theme
+	for(auto &Theme : pSelf->m_vThemes)
+	{
+		if(str_comp(Theme.m_Name.c_str(), aThemeName) == 0)
+		{
+			if(IsDay)
+				Theme.m_HasDay = true;
+			if(IsNight)
+				Theme.m_HasNight = true;
+			return 0;
+		}
+	}
+
+	// make new theme
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "added theme '%s' from 'themes/%s'", aThemeName, pName);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menuthemes", aBuf);
+	pSelf->m_vThemes.emplace_back(aThemeName, IsDay, IsNight);
+	pSelf->LoadThemeIcon(pSelf->m_vThemes.back());
+
+	if(time_get_nanoseconds() - pSelf->m_ThemeScanStartTime > 500ms)
+	{
+		pSelf->GameClient()->m_Menus.RenderLoading(Localize("Loading menu themes"), "", 0, false);
+	}
+	return 0;
+}
+
+void CMenuBackground::LoadMenuBackground(bool HasDayHint, bool HasNightHint)
+{
+	if(!m_IsInit)
+		return;
+
+	if(m_Loaded && m_pMap == m_pBackgroundMap)
+		m_pMap->Unload();
+
+	m_Loaded = false;
+	m_pMap = m_pBackgroundMap;
+	m_pLayers = m_pBackgroundLayers;
+	m_pImages = m_pBackgroundImages;
+
+	ResetPositions();
+
+	str_copy(m_aMapName, g_Config.m_ClMenuMap);
+
+	if(g_Config.m_ClMenuMap[0] != '\0')
+	{
+		const char *pMenuMap = g_Config.m_ClMenuMap;
+		if(str_comp(pMenuMap, "auto") == 0)
+		{
+			switch(time_season())
+			{
+			case SEASON_SPRING:
+			case SEASON_EASTER:
+				pMenuMap = "heavens";
+				break;
+			case SEASON_SUMMER:
+				pMenuMap = "jungle";
+				break;
+			case SEASON_AUTUMN:
+			case SEASON_HALLOWEEN:
+				pMenuMap = "autumn";
+				break;
+			case SEASON_WINTER:
+			case SEASON_XMAS:
+				pMenuMap = "winter";
+				break;
+			case SEASON_NEWYEAR:
+				pMenuMap = "newyear";
+				break;
+			}
+		}
+		else if(str_comp(pMenuMap, "rand") == 0)
+		{
+			// make sure to load themes
+			const std::vector<CTheme> &vThemesRef = GetThemes();
+			if(vThemesRef.size() > PREDEFINED_THEMES_COUNT)
+			{
+				int RandomThemeIndex = rand() % (vThemesRef.size() - PREDEFINED_THEMES_COUNT);
+				if(RandomThemeIndex + PREDEFINED_THEMES_COUNT < (int)vThemesRef.size())
+					pMenuMap = vThemesRef[RandomThemeIndex + PREDEFINED_THEMES_COUNT].m_Name.c_str();
+			}
+		}
+
+		char aBuf[128];
+
+		const int HourOfTheDay = time_houroftheday();
+		const bool IsDaytime = HourOfTheDay >= 6 && HourOfTheDay < 18;
+
+		if(!m_Loaded && ((HasDayHint && IsDaytime) || (HasNightHint && !IsDaytime)))
+		{
+			str_format(aBuf, sizeof(aBuf), "themes/%s_%s.map", pMenuMap, IsDaytime ? "day" : "night");
+			if(m_pMap->Load(aBuf))
+			{
+				m_Loaded = true;
+			}
+		}
+
+		if(!m_Loaded)
+		{
+			str_format(aBuf, sizeof(aBuf), "themes/%s.map", pMenuMap);
+			if(m_pMap->Load(aBuf))
+			{
+				m_Loaded = true;
+			}
+		}
+
+		if(!m_Loaded && ((HasDayHint && !IsDaytime) || (HasNightHint && IsDaytime)))
+		{
+			str_format(aBuf, sizeof(aBuf), "themes/%s_%s.map", pMenuMap, IsDaytime ? "night" : "day");
+			if(m_pMap->Load(aBuf))
+			{
+				m_Loaded = true;
+			}
+		}
+
+		if(m_Loaded)
+		{
+			m_pLayers->InitBackground(m_pMap);
+
+			CMapLayers::OnMapLoad();
+			m_pImages->LoadBackground(m_pLayers, m_pMap);
+
+			// look for custom positions
+			CMapItemLayerTilemap *pTLayer = m_pLayers->GameLayer();
+			if(pTLayer)
+			{
+				int DataIndex = pTLayer->m_Data;
+				unsigned int Size = m_pLayers->Map()->GetDataSize(DataIndex);
+				void *pTiles = m_pLayers->Map()->GetData(DataIndex);
+				unsigned int TileSize = sizeof(CTile);
+
+				if(Size >= pTLayer->m_Width * pTLayer->m_Height * TileSize)
+				{
+					for(int y = 0; y < pTLayer->m_Height; ++y)
+					{
+						for(int x = 0; x < pTLayer->m_Width; ++x)
+						{
+							unsigned char Index = ((CTile *)pTiles)[y * pTLayer->m_Width + x].m_Index;
+							if(Index >= TILE_TIME_CHECKPOINT_FIRST && Index <= TILE_TIME_CHECKPOINT_LAST)
+							{
+								int ArrayIndex = clamp<int>((Index - TILE_TIME_CHECKPOINT_FIRST), 0, NUM_POS);
+								m_aPositions[ArrayIndex] = vec2(x * 32.0f + 16.0f, y * 32.0f + 16.0f);
+							}
+
+							x += ((CTile *)pTiles)[y * pTLayer->m_Width + x].m_Skip;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void CMenuBackground::OnMapLoad()
+{
+}
+
+void CMenuBackground::OnRender()
+{
+}
+
+bool CMenuBackground::Render()
+{
+	if(!m_Loaded)
+		return false;
+
+	if(Client()->State() == IClient::STATE_ONLINE || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return false;
+
+	m_Camera.m_Zoom = 0.7f;
+	static vec2 Dir = vec2(1.0f, 0.0f);
+
+	float DistToCenter = distance(m_Camera.m_Center, m_RotationCenter);
+	if(!m_ChangedPosition && absolute(DistToCenter - (float)g_Config.m_ClRotationRadius) <= 0.5f)
+	{
+		// do little rotation
+		float RotPerTick = 360.0f / (float)g_Config.m_ClRotationSpeed * clamp(Client()->RenderFrameTime(), 0.0f, 0.1f);
+		Dir = rotate(Dir, RotPerTick);
+		m_Camera.m_Center = m_RotationCenter + Dir * (float)g_Config.m_ClRotationRadius;
+	}
+	else
+	{
+		// positions for the animation
+		vec2 DirToCenter;
+		if(DistToCenter > 0.5f)
+			DirToCenter = normalize(m_AnimationStartPos - m_RotationCenter);
+		else
+			DirToCenter = vec2(1, 0);
+		vec2 TargetPos = m_RotationCenter + DirToCenter * (float)g_Config.m_ClRotationRadius;
+		float Distance = distance(m_AnimationStartPos, TargetPos);
+		if(Distance > 0.001f)
+			Dir = normalize(m_AnimationStartPos - TargetPos);
+		else
+			Dir = vec2(1, 0);
+
+		// move time
+		m_MoveTime += clamp(Client()->RenderFrameTime(), 0.0f, 0.1f) * g_Config.m_ClCameraSpeed / 10.0f;
+		float XVal = 1 - m_MoveTime;
+		XVal = std::pow(XVal, 7.0f);
+
+		m_Camera.m_Center = TargetPos + Dir * (XVal * Distance);
+		if(m_CurrentPosition < 0)
+		{
+			m_AnimationStartPos = m_Camera.m_Center;
+			m_MoveTime = 0.0f;
+		}
+
+		m_ChangedPosition = false;
+	}
+
+	CMapLayers::OnRender();
+
+	m_CurrentPosition = -1;
+
+	return true;
+}
+
+CCamera *CMenuBackground::GetCurCamera()
+{
+	return &m_Camera;
+}
+
+void CMenuBackground::ChangePosition(int PositionNumber)
+{
+	if(PositionNumber != m_CurrentPosition)
+	{
+		if(PositionNumber >= POS_START && PositionNumber < NUM_POS)
+		{
+			m_CurrentPosition = PositionNumber;
+		}
+		else
+		{
+			m_CurrentPosition = POS_START;
+		}
+
+		m_ChangedPosition = true;
+	}
+	m_AnimationStartPos = m_Camera.m_Center;
+	m_RotationCenter = m_aPositions[m_CurrentPosition];
+	m_MoveTime = 0.0f;
+}
+
+std::vector<CTheme> &CMenuBackground::GetThemes()
+{
+	if(m_vThemes.empty()) // not loaded yet
+	{
+		// when adding more here, make sure to change the value of PREDEFINED_THEMES_COUNT too
+		m_vThemes.emplace_back("", true, true); // no theme
+		LoadThemeIcon(m_vThemes.back());
+
+		m_vThemes.emplace_back("auto", true, true); // auto theme
+		LoadThemeIcon(m_vThemes.back());
+
+		m_vThemes.emplace_back("rand", true, true); // random theme
+		LoadThemeIcon(m_vThemes.back());
+
+		m_ThemeScanStartTime = time_get_nanoseconds();
+		Storage()->ListDirectory(IStorage::TYPE_ALL, "themes", ThemeScan, this);
+
+		std::sort(m_vThemes.begin() + PREDEFINED_THEMES_COUNT, m_vThemes.end());
+	}
+	return m_vThemes;
+}
diff --git a/src_bkp/game/client/components/menu_background.h b/src_bkp/game/client/components/menu_background.h
new file mode 100644
index 0000000000..5cc7e2066b
--- /dev/null
+++ b/src_bkp/game/client/components/menu_background.h
@@ -0,0 +1,121 @@
+#ifndef GAME_CLIENT_COMPONENTS_MENU_BACKGROUND_H
+#define GAME_CLIENT_COMPONENTS_MENU_BACKGROUND_H
+
+#include <game/client/components/background.h>
+#include <game/client/components/camera.h>
+
+#include <array>
+#include <chrono>
+#include <string>
+#include <vector>
+
+class CMenuMap : public CBackgroundEngineMap
+{
+	MACRO_INTERFACE("menu_enginemap")
+};
+
+// themes
+class CTheme
+{
+public:
+	CTheme() {}
+	CTheme(const char *pName, bool HasDay, bool HasNight) :
+		m_Name(pName), m_HasDay(HasDay), m_HasNight(HasNight) {}
+
+	std::string m_Name;
+	bool m_HasDay;
+	bool m_HasNight;
+	IGraphics::CTextureHandle m_IconTexture;
+	bool operator<(const CTheme &Other) const { return m_Name < Other.m_Name; }
+};
+
+class CMenuBackground : public CBackground
+{
+	std::chrono::nanoseconds m_ThemeScanStartTime{0};
+
+protected:
+	bool CanRenderMenuBackground() override { return false; }
+
+public:
+	enum
+	{
+		POS_START = 0,
+		POS_DEMOS,
+		POS_NEWS,
+		POS_SETTINGS_LANGUAGE,
+		POS_SETTINGS_GENERAL,
+		POS_SETTINGS_PLAYER,
+		POS_SETTINGS_TEE,
+		POS_SETTINGS_APPEARANCE,
+		POS_SETTINGS_CONTROLS,
+		POS_SETTINGS_GRAPHICS,
+		POS_SETTINGS_SOUND,
+		POS_SETTINGS_DDNET,
+		POS_SETTINGS_ASSETS,
+		POS_SETTINGS_RESERVED0,
+		POS_SETTINGS_RESERVED1,
+		POS_BROWSER_INTERNET,
+		POS_BROWSER_LAN,
+		POS_BROWSER_FAVORITES,
+		POS_BROWSER_CUSTOM0,
+		POS_BROWSER_CUSTOM1,
+		POS_BROWSER_CUSTOM2,
+		POS_BROWSER_CUSTOM3,
+		POS_RESERVED0,
+		POS_RESERVED1,
+		POS_RESERVED2,
+
+		NUM_POS,
+
+		POS_BROWSER_CUSTOM_NUM = (POS_BROWSER_CUSTOM3 - POS_BROWSER_CUSTOM0) + 1,
+		POS_SETTINGS_RESERVED_NUM = (POS_SETTINGS_RESERVED1 - POS_SETTINGS_RESERVED0) + 1,
+		POS_RESERVED_NUM = (POS_RESERVED2 - POS_RESERVED0) + 1,
+	};
+
+	enum
+	{
+		PREDEFINED_THEMES_COUNT = 3,
+	};
+
+	CCamera m_Camera;
+
+	CBackgroundEngineMap *CreateBGMap() override;
+
+	vec2 m_RotationCenter;
+	std::array<vec2, NUM_POS> m_aPositions;
+	int m_CurrentPosition;
+	vec2 m_AnimationStartPos;
+	bool m_ChangedPosition;
+	float m_MoveTime;
+
+	bool m_IsInit;
+
+	void ResetPositions();
+
+	void LoadThemeIcon(CTheme &Theme);
+	static int ThemeScan(const char *pName, int IsDir, int DirType, void *pUser);
+
+	std::vector<CTheme> m_vThemes;
+
+	CMenuBackground();
+	~CMenuBackground() override {}
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void OnInit() override;
+	void OnMapLoad() override;
+	void OnRender() override;
+
+	void LoadMenuBackground(bool HasDayHint = true, bool HasNightHint = true);
+
+	bool Render();
+
+	class CCamera *GetCurCamera() override;
+
+	void ChangePosition(int PositionNumber);
+
+	std::vector<CTheme> &GetThemes();
+};
+
+std::array<vec2, CMenuBackground::NUM_POS> GenerateMenuBackgroundPositions();
+
+#endif
diff --git a/src_bkp/game/client/components/menus.cpp b/src_bkp/game/client/components/menus.cpp
new file mode 100644
index 0000000000..8cd07433c3
--- /dev/null
+++ b/src_bkp/game/client/components/menus.cpp
@@ -0,0 +1,2249 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <vector>
+
+#include <base/math.h>
+#include <base/system.h>
+#include <base/vmath.h>
+
+#include <engine/client.h>
+#include <engine/config.h>
+#include <engine/editor.h>
+#include <engine/friends.h>
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/generated/protocol.h>
+
+#include <engine/client/updater.h>
+
+#include <game/client/components/binds.h>
+#include <game/client/components/console.h>
+#include <game/client/components/menu_background.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+#include <game/client/ui_listbox.h>
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+
+#include "menus.h"
+
+using namespace FontIcons;
+using namespace std::chrono_literals;
+
+ColorRGBA CMenus::ms_GuiColor;
+ColorRGBA CMenus::ms_ColorTabbarInactiveOutgame;
+ColorRGBA CMenus::ms_ColorTabbarActiveOutgame;
+ColorRGBA CMenus::ms_ColorTabbarHoverOutgame;
+ColorRGBA CMenus::ms_ColorTabbarInactive;
+ColorRGBA CMenus::ms_ColorTabbarActive = ColorRGBA(0, 0, 0, 0.5f);
+ColorRGBA CMenus::ms_ColorTabbarHover;
+ColorRGBA CMenus::ms_ColorTabbarInactiveIngame;
+ColorRGBA CMenus::ms_ColorTabbarActiveIngame;
+ColorRGBA CMenus::ms_ColorTabbarHoverIngame;
+
+float CMenus::ms_ButtonHeight = 25.0f;
+float CMenus::ms_ListheaderHeight = 17.0f;
+
+CMenus::CMenus()
+{
+	m_Popup = POPUP_NONE;
+	m_ActivePage = PAGE_INTERNET;
+	m_MenuPage = 0;
+	m_GamePage = PAGE_GAME;
+	m_JoinTutorial = false;
+
+	m_NeedRestartGraphics = false;
+	m_NeedRestartSound = false;
+	m_NeedSendinfo = false;
+	m_NeedSendDummyinfo = false;
+	m_MenuActive = true;
+	m_ShowStart = true;
+
+	str_copy(m_aCurrentDemoFolder, "demos");
+	m_DemolistStorageType = IStorage::TYPE_ALL;
+
+	m_DemoPlayerState = DEMOPLAYER_NONE;
+	m_Dummy = false;
+
+	m_ServerProcess.m_Process = INVALID_PROCESS;
+
+	for(SUIAnimator &animator : m_aAnimatorsSettingsTab)
+	{
+		animator.m_YOffset = -2.5f;
+		animator.m_HOffset = 5.0f;
+		animator.m_WOffset = 5.0f;
+		animator.m_RepositionLabel = true;
+	}
+
+	for(SUIAnimator &animator : m_aAnimatorsBigPage)
+	{
+		animator.m_YOffset = -5.0f;
+		animator.m_HOffset = 5.0f;
+	}
+
+	for(SUIAnimator &animator : m_aAnimatorsSmallPage)
+	{
+		animator.m_YOffset = -2.5f;
+		animator.m_HOffset = 2.5f;
+	}
+
+	m_PasswordInput.SetBuffer(g_Config.m_Password, sizeof(g_Config.m_Password));
+	m_PasswordInput.SetHidden(true);
+}
+
+int CMenus::DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect, bool Active)
+{
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GUIBUTTONS].m_Id);
+	Graphics()->QuadsBegin();
+	if(!Active)
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
+	RenderTools()->SelectSprite(Checked ? SPRITE_GUIBUTTON_ON : SPRITE_GUIBUTTON_OFF);
+	IGraphics::CQuadItem QuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	if(UI()->HotItem() == pID && Active)
+	{
+		RenderTools()->SelectSprite(SPRITE_GUIBUTTON_HOVER);
+		QuadItem = IGraphics::CQuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
+		Graphics()->QuadsDrawTL(&QuadItem, 1);
+	}
+	Graphics()->QuadsEnd();
+
+	return Active ? UI()->DoButtonLogic(pID, Checked, pRect) : 0;
+}
+
+int CMenus::DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, const char *pImageName, int Corners, float Rounding, float FontFactor, ColorRGBA Color)
+{
+	CUIRect Text = *pRect;
+
+	if(Checked)
+		Color = ColorRGBA(0.6f, 0.6f, 0.6f, 0.5f);
+	Color.a *= UI()->ButtonColorMul(pButtonContainer);
+
+	pRect->Draw(Color, Corners, Rounding);
+
+	if(pImageName)
+	{
+		CUIRect Image;
+		pRect->VSplitRight(pRect->h * 4.0f, &Text, &Image); // always correct ratio for image
+
+		// render image
+		const CMenuImage *pImage = FindMenuImage(pImageName);
+		if(pImage)
+		{
+			Graphics()->TextureSet(UI()->HotItem() == pButtonContainer ? pImage->m_OrgTexture : pImage->m_GreyTexture);
+			Graphics()->WrapClamp();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			IGraphics::CQuadItem QuadItem(Image.x, Image.y, Image.w, Image.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+			Graphics()->WrapNormal();
+		}
+	}
+
+	Text.HMargin(pRect->h >= 20.0f ? 2.0f : 1.0f, &Text);
+	Text.HMargin((Text.h * FontFactor) / 2.0f, &Text);
+	UI()->DoLabel(&Text, pText, Text.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+
+	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+}
+
+int CMenus::DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator, const ColorRGBA *pDefaultColor, const ColorRGBA *pActiveColor, const ColorRGBA *pHoverColor, float EdgeRounding)
+{
+	const bool MouseInside = UI()->HotItem() == pButtonContainer;
+	CUIRect Rect = *pRect;
+
+	if(pAnimator != NULL)
+	{
+		auto Time = time_get_nanoseconds();
+
+		if(pAnimator->m_Time + 100ms < Time)
+		{
+			pAnimator->m_Value = pAnimator->m_Active ? 1 : 0;
+			pAnimator->m_Time = Time;
+		}
+
+		pAnimator->m_Active = Checked || MouseInside;
+
+		if(pAnimator->m_Active)
+			pAnimator->m_Value = clamp<float>(pAnimator->m_Value + (Time - pAnimator->m_Time).count() / (double)std::chrono::nanoseconds(100ms).count(), 0, 1);
+		else
+			pAnimator->m_Value = clamp<float>(pAnimator->m_Value - (Time - pAnimator->m_Time).count() / (double)std::chrono::nanoseconds(100ms).count(), 0, 1);
+
+		Rect.w += pAnimator->m_Value * pAnimator->m_WOffset;
+		Rect.h += pAnimator->m_Value * pAnimator->m_HOffset;
+		Rect.x += pAnimator->m_Value * pAnimator->m_XOffset;
+		Rect.y += pAnimator->m_Value * pAnimator->m_YOffset;
+
+		pAnimator->m_Time = Time;
+	}
+
+	if(Checked)
+	{
+		ColorRGBA ColorMenuTab = ms_ColorTabbarActive;
+		if(pActiveColor)
+			ColorMenuTab = *pActiveColor;
+
+		Rect.Draw(ColorMenuTab, Corners, EdgeRounding);
+	}
+	else
+	{
+		if(MouseInside)
+		{
+			ColorRGBA HoverColorMenuTab = ms_ColorTabbarHover;
+			if(pHoverColor)
+				HoverColorMenuTab = *pHoverColor;
+
+			Rect.Draw(HoverColorMenuTab, Corners, EdgeRounding);
+		}
+		else
+		{
+			ColorRGBA ColorMenuTab = ms_ColorTabbarInactive;
+			if(pDefaultColor)
+				ColorMenuTab = *pDefaultColor;
+
+			Rect.Draw(ColorMenuTab, Corners, EdgeRounding);
+		}
+	}
+
+	if(pAnimator != NULL)
+	{
+		if(pAnimator->m_RepositionLabel)
+		{
+			Rect.x += Rect.w - pRect->w + Rect.x - pRect->x;
+			Rect.y += Rect.h - pRect->h + Rect.y - pRect->y;
+		}
+
+		if(!pAnimator->m_ScaleLabel)
+		{
+			Rect.w = pRect->w;
+			Rect.h = pRect->h;
+		}
+	}
+
+	CUIRect Temp;
+	Rect.HMargin(2.0f, &Temp);
+	UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+
+	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+}
+
+int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+{
+	if(Checked == 2)
+		pRect->Draw(ColorRGBA(1, 0.98f, 0.5f, 0.55f), IGraphics::CORNER_T, 5.0f);
+	else if(Checked)
+		pRect->Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_T, 5.0f);
+
+	CUIRect Temp;
+	pRect->VSplitLeft(5.0f, nullptr, &Temp);
+	UI()->DoLabel(&Temp, pText, pRect->h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+	return UI()->DoButtonLogic(pID, Checked, pRect);
+}
+
+int CMenus::DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect)
+{
+	CUIRect Box, Label;
+	pRect->VSplitLeft(pRect->h, &Box, &Label);
+	Label.VSplitLeft(5.0f, nullptr, &Label);
+
+	Box.Margin(2.0f, &Box);
+	Box.Draw(ColorRGBA(1, 1, 1, 0.25f * UI()->ButtonColorMul(pID)), IGraphics::CORNER_ALL, 3.0f);
+
+	const bool Checkable = *pBoxText == 'X';
+	if(Checkable)
+	{
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT);
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		UI()->DoLabel(&Box, FONT_ICON_XMARK, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	}
+	else
+		UI()->DoLabel(&Box, pBoxText, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+
+	TextRender()->SetRenderFlags(0);
+	UI()->DoLabel(&Label, pText, Box.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+
+	return UI()->DoButtonLogic(pID, 0, pRect);
+}
+
+void CMenus::DoLaserPreview(const CUIRect *pRect, const ColorHSLA LaserOutlineColor, const ColorHSLA LaserInnerColor, const int LaserType)
+{
+	ColorRGBA LaserRGB;
+	CUIRect Section = *pRect;
+	vec2 From = vec2(Section.x + 50.0f, Section.y + Section.h / 2.0f);
+	vec2 Pos = vec2(Section.x + Section.w - 10.0f, Section.y + Section.h / 2.0f);
+
+	Graphics()->BlendNormal();
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+
+	LaserRGB = color_cast<ColorRGBA, ColorHSLA>(LaserOutlineColor);
+	ColorRGBA OuterColor(LaserRGB.r, LaserRGB.g, LaserRGB.b, 1.0f);
+	Graphics()->SetColor(LaserRGB.r, LaserRGB.g, LaserRGB.b, 1.0f);
+	vec2 Out = vec2(0.0f, -1.0f) * (3.15f);
+
+	IGraphics::CFreeformItem Freeform(From.x - Out.x, From.y - Out.y, From.x + Out.x, From.y + Out.y, Pos.x - Out.x, Pos.y - Out.y, Pos.x + Out.x, Pos.y + Out.y);
+	Graphics()->QuadsDrawFreeform(&Freeform, 1);
+
+	LaserRGB = color_cast<ColorRGBA, ColorHSLA>(LaserInnerColor);
+	ColorRGBA InnerColor(LaserRGB.r, LaserRGB.g, LaserRGB.b, 1.0f);
+	Out = vec2(0.0f, -1.0f) * (2.25f);
+	Graphics()->SetColor(InnerColor.r, InnerColor.g, InnerColor.b, 1.0f);
+
+	Freeform = IGraphics::CFreeformItem(From.x - Out.x, From.y - Out.y, From.x + Out.x, From.y + Out.y, Pos.x - Out.x, Pos.y - Out.y, Pos.x + Out.x, Pos.y + Out.y);
+	Graphics()->QuadsDrawFreeform(&Freeform, 1);
+	Graphics()->QuadsEnd();
+
+	Graphics()->BlendNormal();
+	int SpriteIndex = time_get() % 3;
+	Graphics()->TextureSet(GameClient()->m_ParticlesSkin.m_aSpriteParticleSplat[SpriteIndex]);
+	Graphics()->QuadsBegin();
+	Graphics()->QuadsSetRotation(time_get());
+	Graphics()->SetColor(OuterColor.r, OuterColor.g, OuterColor.b, 1.0f);
+	IGraphics::CQuadItem QuadItem(Pos.x, Pos.y, 24, 24);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+	Graphics()->SetColor(InnerColor.r, InnerColor.g, InnerColor.b, 1.0f);
+	QuadItem = IGraphics::CQuadItem(Pos.x, Pos.y, 20, 20);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	switch(LaserType)
+	{
+	case LASERTYPE_RIFLE:
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteWeaponLaser);
+		RenderTools()->SelectSprite(SPRITE_WEAPON_LASER_BODY);
+		Graphics()->QuadsBegin();
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->DrawSprite(Section.x + 30.0f, Section.y + Section.h / 2.0f, 60.0f);
+		Graphics()->QuadsEnd();
+		break;
+	case LASERTYPE_SHOTGUN:
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteWeaponShotgun);
+		RenderTools()->SelectSprite(SPRITE_WEAPON_SHOTGUN_BODY);
+		Graphics()->QuadsBegin();
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->DrawSprite(Section.x + 30.0f, Section.y + Section.h / 2.0f, 60.0f);
+		Graphics()->QuadsEnd();
+		break;
+	default:
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(OuterColor.r, OuterColor.g, OuterColor.b, 1.0f);
+		QuadItem = IGraphics::CQuadItem(From.x, From.y, 24, 24);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+		Graphics()->SetColor(InnerColor.r, InnerColor.g, InnerColor.b, 1.0f);
+		QuadItem = IGraphics::CQuadItem(From.x, From.y, 20, 20);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+}
+
+ColorHSLA CMenus::DoLine_ColorPicker(CButtonContainer *pResetID, const float LineSize, const float LabelSize, const float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, const ColorRGBA DefaultColor, bool CheckBoxSpacing, int *pCheckBoxValue, bool Alpha)
+{
+	CUIRect Section, ColorPickerButton, ResetButton, Label;
+
+	pMainRect->HSplitTop(LineSize, &Section, pMainRect);
+	pMainRect->HSplitTop(BottomMargin, nullptr, pMainRect);
+
+	if(CheckBoxSpacing || pCheckBoxValue != nullptr)
+	{
+		CUIRect CheckBox;
+		Section.VSplitLeft(Section.h, &CheckBox, &Section);
+		if(pCheckBoxValue != nullptr)
+		{
+			CheckBox.Margin(2.0f, &CheckBox);
+			if(DoButton_CheckBox(pCheckBoxValue, "", *pCheckBoxValue, &CheckBox))
+				*pCheckBoxValue ^= 1;
+		}
+		Section.VSplitLeft(5.0f, nullptr, &Section);
+	}
+
+	Section.VSplitMid(&Label, &Section, 4.0f);
+	Section.VSplitRight(60.0f, &Section, &ResetButton);
+	Section.VSplitRight(8.0f, &Section, nullptr);
+	Section.VSplitRight(Section.h, &Section, &ColorPickerButton);
+
+	UI()->DoLabel(&Label, pText, LabelSize, TEXTALIGN_ML);
+
+	ColorHSLA PickedColor = DoButton_ColorPicker(&ColorPickerButton, pColorValue, Alpha);
+
+	ResetButton.HMargin(2.0f, &ResetButton);
+	if(DoButton_Menu(pResetID, Localize("Reset"), 0, &ResetButton, nullptr, IGraphics::CORNER_ALL, 4.0f, 0.1f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f)))
+	{
+		*pColorValue = color_cast<ColorHSLA>(DefaultColor).Pack(Alpha);
+	}
+
+	return PickedColor;
+}
+
+ColorHSLA CMenus::DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHslaColor, bool Alpha)
+{
+	ColorHSLA HslaColor = ColorHSLA(*pHslaColor, Alpha);
+
+	ColorRGBA Outline = ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f);
+	Outline.a *= UI()->ButtonColorMul(pHslaColor);
+
+	CUIRect Rect;
+	pRect->Margin(3.0f, &Rect);
+
+	pRect->Draw(Outline, IGraphics::CORNER_ALL, 4.0f);
+	Rect.Draw(color_cast<ColorRGBA>(HslaColor), IGraphics::CORNER_ALL, 4.0f);
+
+	static CUI::SColorPickerPopupContext s_ColorPickerPopupContext;
+	if(UI()->DoButtonLogic(pHslaColor, 0, pRect))
+	{
+		s_ColorPickerPopupContext.m_pHslaColor = pHslaColor;
+		s_ColorPickerPopupContext.m_HslaColor = HslaColor;
+		s_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(HslaColor);
+		s_ColorPickerPopupContext.m_RgbaColor = color_cast<ColorRGBA>(s_ColorPickerPopupContext.m_HsvaColor);
+		s_ColorPickerPopupContext.m_Alpha = Alpha;
+		UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &s_ColorPickerPopupContext);
+	}
+	else if(UI()->IsPopupOpen(&s_ColorPickerPopupContext) && s_ColorPickerPopupContext.m_pHslaColor == pHslaColor)
+	{
+		HslaColor = color_cast<ColorHSLA>(s_ColorPickerPopupContext.m_HsvaColor);
+	}
+
+	return HslaColor;
+}
+
+int CMenus::DoButton_CheckBoxAutoVMarginAndSet(const void *pID, const char *pText, int *pValue, CUIRect *pRect, float VMargin)
+{
+	CUIRect CheckBoxRect;
+	pRect->HSplitTop(VMargin, &CheckBoxRect, pRect);
+
+	int Logic = DoButton_CheckBox_Common(pID, pText, *pValue ? "X" : "", &CheckBoxRect);
+
+	if(Logic)
+		*pValue ^= 1;
+
+	return Logic;
+}
+
+int CMenus::DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+{
+	return DoButton_CheckBox_Common(pID, pText, Checked ? "X" : "", pRect);
+}
+
+int CMenus::DoButton_CheckBox_Number(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
+{
+	char aBuf[16];
+	str_from_int(Checked, aBuf);
+	return DoButton_CheckBox_Common(pID, pText, aBuf, pRect);
+}
+
+int CMenus::DoKeyReader(const void *pID, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination)
+{
+	// process
+	static const void *s_pGrabbedID = nullptr;
+	static bool s_MouseReleased = true;
+	static int s_ButtonUsed = 0;
+	const bool Inside = UI()->MouseHovered(pRect);
+	int NewKey = Key;
+	*pNewModifierCombination = ModifierCombination;
+
+	if(!UI()->MouseButton(0) && !UI()->MouseButton(1) && s_pGrabbedID == pID)
+		s_MouseReleased = true;
+
+	if(UI()->CheckActiveItem(pID))
+	{
+		if(m_Binder.m_GotKey)
+		{
+			// abort with escape key
+			if(m_Binder.m_Key.m_Key != KEY_ESCAPE)
+			{
+				NewKey = m_Binder.m_Key.m_Key;
+				*pNewModifierCombination = m_Binder.m_ModifierCombination;
+			}
+			m_Binder.m_GotKey = false;
+			UI()->SetActiveItem(nullptr);
+			s_MouseReleased = false;
+			s_pGrabbedID = pID;
+		}
+
+		if(s_ButtonUsed == 1 && !UI()->MouseButton(1))
+		{
+			if(Inside)
+				NewKey = 0;
+			UI()->SetActiveItem(nullptr);
+		}
+	}
+	else if(UI()->HotItem() == pID)
+	{
+		if(s_MouseReleased)
+		{
+			if(UI()->MouseButton(0))
+			{
+				m_Binder.m_TakeKey = true;
+				m_Binder.m_GotKey = false;
+				UI()->SetActiveItem(pID);
+				s_ButtonUsed = 0;
+			}
+
+			if(UI()->MouseButton(1))
+			{
+				UI()->SetActiveItem(pID);
+				s_ButtonUsed = 1;
+			}
+		}
+	}
+
+	if(Inside)
+		UI()->SetHotItem(pID);
+
+	char aBuf[64];
+	if(UI()->CheckActiveItem(pID) && s_ButtonUsed == 0)
+		str_copy(aBuf, Localize("Press a key…"));
+	else if(NewKey == 0)
+		aBuf[0] = '\0';
+	else
+		str_format(aBuf, sizeof(aBuf), "%s%s", CBinds::GetKeyBindModifiersName(*pNewModifierCombination), Input()->KeyName(NewKey));
+
+	const ColorRGBA Color = UI()->CheckActiveItem(pID) && m_Binder.m_TakeKey ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.4f) : ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(pID));
+	pRect->Draw(Color, IGraphics::CORNER_ALL, 5.0f);
+	CUIRect Temp;
+	pRect->HMargin(1.0f, &Temp);
+	UI()->DoLabel(&Temp, aBuf, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+
+	return NewKey;
+}
+
+int CMenus::RenderMenubar(CUIRect r)
+{
+	CUIRect Box = r;
+	CUIRect Button;
+
+	m_ActivePage = m_MenuPage;
+	int NewPage = -1;
+
+	if(Client()->State() != IClient::STATE_OFFLINE)
+		m_ActivePage = m_GamePage;
+
+	if(Client()->State() == IClient::STATE_OFFLINE)
+	{
+		Box.VSplitLeft(33.0f, &Button, &Box);
+		static CButtonContainer s_StartButton;
+
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+		bool GotNewsOrUpdate = false;
+
+#if defined(CONF_AUTOUPDATE)
+		int State = Updater()->GetCurrentState();
+		bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
+		if(State == IUpdater::CLEAN && NeedUpdate)
+		{
+			GotNewsOrUpdate = true;
+		}
+#endif
+
+		GotNewsOrUpdate |= (bool)g_Config.m_UiUnreadNews;
+
+		ColorRGBA HomeButtonColorAlert(0, 1, 0, 0.25f);
+		ColorRGBA HomeButtonColorAlertHover(0, 1, 0, 0.5f);
+		ColorRGBA *pHomeButtonColor = NULL;
+		ColorRGBA *pHomeButtonColorHover = NULL;
+
+		const char *pHomeScreenButtonLabel = FONT_ICON_HOUSE;
+		if(GotNewsOrUpdate)
+		{
+			pHomeScreenButtonLabel = FONT_ICON_NEWSPAPER;
+			pHomeButtonColor = &HomeButtonColorAlert;
+			pHomeButtonColorHover = &HomeButtonColorAlertHover;
+		}
+
+		if(DoButton_MenuTab(&s_StartButton, pHomeScreenButtonLabel, false, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_HOME], pHomeButtonColor, pHomeButtonColor, pHomeButtonColorHover, 10.0f))
+		{
+			m_ShowStart = true;
+		}
+
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+		Box.VSplitLeft(10.0f, 0, &Box);
+
+		// offline menus
+		if(m_ActivePage == PAGE_NEWS)
+		{
+			Box.VSplitLeft(100.0f, &Button, &Box);
+			static CButtonContainer s_NewsButton;
+			if(DoButton_MenuTab(&s_NewsButton, Localize("Hall of fame"), m_ActivePage == PAGE_NEWS, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_NEWS]))
+			{
+				NewPage = PAGE_NEWS;
+			}
+		}
+		else if(m_ActivePage == PAGE_DEMOS)
+		{
+			Box.VSplitLeft(100.0f, &Button, &Box);
+			static CButtonContainer s_DemosButton;
+			if(DoButton_MenuTab(&s_DemosButton, Localize("Demos"), m_ActivePage == PAGE_DEMOS, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_DEMOS]))
+			{
+				DemolistPopulate();
+				NewPage = PAGE_DEMOS;
+			}
+		}
+		else
+		{
+			Box.VSplitLeft(100.0f, &Button, &Box);
+			static CButtonContainer s_InternetButton;
+			if(DoButton_MenuTab(&s_InternetButton, Localize("Internet"), m_ActivePage == PAGE_INTERNET, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_INTERNET]))
+			{
+				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_INTERNET)
+				{
+					if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_FAVORITES)
+						Client()->RequestDDNetInfo();
+					ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+				}
+				NewPage = PAGE_INTERNET;
+			}
+
+			Box.VSplitLeft(100.0f, &Button, &Box);
+			static CButtonContainer s_LanButton;
+			if(DoButton_MenuTab(&s_LanButton, Localize("LAN"), m_ActivePage == PAGE_LAN, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_LAN]))
+			{
+				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_LAN)
+					ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
+				NewPage = PAGE_LAN;
+			}
+
+			Box.VSplitLeft(100.0f, &Button, &Box);
+			static CButtonContainer s_FavoritesButton;
+			if(DoButton_MenuTab(&s_FavoritesButton, Localize("Favorites"), m_ActivePage == PAGE_FAVORITES, &Button, IGraphics::CORNER_T, &m_aAnimatorsBigPage[BIG_TAB_FAVORITES]))
+			{
+				if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_FAVORITES)
+				{
+					if(ServerBrowser()->GetCurrentType() != IServerBrowser::TYPE_INTERNET)
+						Client()->RequestDDNetInfo();
+					ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+				}
+				NewPage = PAGE_FAVORITES;
+			}
+
+			//Box.VSplitLeft(100.0f, &Button, &Box);
+			//static CButtonContainer s_StatsButton;
+			//if(DoButton_MenuTab(&s_StatsButton, Localize("DDRace Stats"), m_ActivePage == PAGE_STATS, &Button, IGraphics::CORNER_T))
+			//{
+			//	NewPage = PAGE_STATS;
+			//}
+		}
+	}
+	else
+	{
+		// online menus
+		Box.VSplitLeft(90.0f, &Button, &Box);
+		static CButtonContainer s_GameButton;
+		if(DoButton_MenuTab(&s_GameButton, Localize("Game"), m_ActivePage == PAGE_GAME, &Button, IGraphics::CORNER_TL))
+			NewPage = PAGE_GAME;
+
+		Box.VSplitLeft(90.0f, &Button, &Box);
+		static CButtonContainer s_PlayersButton;
+		if(DoButton_MenuTab(&s_PlayersButton, Localize("Players"), m_ActivePage == PAGE_PLAYERS, &Button, 0))
+			NewPage = PAGE_PLAYERS;
+
+		Box.VSplitLeft(130.0f, &Button, &Box);
+		static CButtonContainer s_ServerInfoButton;
+		if(DoButton_MenuTab(&s_ServerInfoButton, Localize("Server info"), m_ActivePage == PAGE_SERVER_INFO, &Button, 0))
+			NewPage = PAGE_SERVER_INFO;
+
+		Box.VSplitLeft(90.0f, &Button, &Box);
+		static CButtonContainer s_NetworkButton;
+		if(DoButton_MenuTab(&s_NetworkButton, Localize("Browser"), m_ActivePage == PAGE_NETWORK, &Button, 0))
+			NewPage = PAGE_NETWORK;
+
+		{
+			static CButtonContainer s_GhostButton;
+			if(GameClient()->m_GameInfo.m_Race)
+			{
+				Box.VSplitLeft(90.0f, &Button, &Box);
+				if(DoButton_MenuTab(&s_GhostButton, Localize("Ghost"), m_ActivePage == PAGE_GHOST, &Button, 0))
+					NewPage = PAGE_GHOST;
+			}
+		}
+
+		Box.VSplitLeft(100.0f, &Button, &Box);
+		static CButtonContainer s_CallVoteButton;
+		if(DoButton_MenuTab(&s_CallVoteButton, Localize("Call vote"), m_ActivePage == PAGE_CALLVOTE, &Button, 0))
+		{
+			NewPage = PAGE_CALLVOTE;
+			m_ControlPageOpening = true;
+		}
+		Box.VSplitLeft(90.0f, &Button, &Box);
+		Box.VSplitLeft(4.0f, 0, &Box);
+		static CButtonContainer s_StatsButton;
+		if(DoButton_MenuTab(&s_StatsButton, Localize("Stats"), m_ActivePage == PAGE_STATS, &Button, IGraphics::CORNER_TR))
+		{
+			NewPage = PAGE_STATS;
+		}
+	}
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_QuitButton;
+	ColorRGBA QuitColor(1, 0, 0, 0.5f);
+	if(DoButton_MenuTab(&s_QuitButton, FONT_ICON_POWER_OFF, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_QUIT], nullptr, nullptr, &QuitColor, 10.0f))
+	{
+		if(m_pClient->Editor()->HasUnsavedData() || (Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmQuitTime && g_Config.m_ClConfirmQuitTime >= 0))
+		{
+			m_Popup = POPUP_QUIT;
+		}
+		else
+		{
+			Client()->Quit();
+		}
+	}
+
+	Box.VSplitRight(10.0f, &Box, &Button);
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_SettingsButton;
+
+	if(DoButton_MenuTab(&s_SettingsButton, FONT_ICON_GEAR, m_ActivePage == PAGE_SETTINGS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_SETTINGS], nullptr, nullptr, nullptr, 10.0f))
+		NewPage = PAGE_SETTINGS;
+
+	Box.VSplitRight(10.0f, &Box, &Button);
+	Box.VSplitRight(33.0f, &Box, &Button);
+	static CButtonContainer s_EditorButton;
+	if(DoButton_MenuTab(&s_EditorButton, FONT_ICON_PEN_TO_SQUARE, 0, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_EDITOR], nullptr, nullptr, nullptr, 10.0f))
+	{
+		g_Config.m_ClEditor = 1;
+	}
+
+	if(Client()->State() == IClient::STATE_OFFLINE)
+	{
+		Box.VSplitRight(10.0f, &Box, &Button);
+		Box.VSplitRight(33.0f, &Box, &Button);
+		static CButtonContainer s_DemoButton;
+
+		if(DoButton_MenuTab(&s_DemoButton, FONT_ICON_CLAPPERBOARD, m_ActivePage == PAGE_DEMOS, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_DEMOBUTTON], nullptr, nullptr, nullptr, 10.0f))
+			NewPage = PAGE_DEMOS;
+
+		Box.VSplitRight(10.0f, &Box, &Button);
+		Box.VSplitRight(33.0f, &Box, &Button);
+		static CButtonContainer s_ServerButton;
+
+		if(DoButton_MenuTab(&s_ServerButton, FONT_ICON_EARTH_AMERICAS, m_ActivePage == g_Config.m_UiPage, &Button, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_SERVER], nullptr, nullptr, nullptr, 10.0f))
+			NewPage = g_Config.m_UiPage;
+	}
+
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+	if(NewPage != -1)
+	{
+		if(Client()->State() == IClient::STATE_OFFLINE)
+			SetMenuPage(NewPage);
+		else
+			m_GamePage = NewPage;
+	}
+
+	return 0;
+}
+
+void CMenus::RenderLoading(const char *pCaption, const char *pContent, int IncreaseCounter, bool RenderLoadingBar, bool RenderMenuBackgroundMap)
+{
+	// TODO: not supported right now due to separate render thread
+
+	static std::chrono::nanoseconds s_LastLoadRender{0};
+	const int CurLoadRenderCount = m_LoadCurrent;
+	m_LoadCurrent += IncreaseCounter;
+	const float Percent = CurLoadRenderCount / (float)m_LoadTotal;
+
+	// make sure that we don't render for each little thing we load
+	// because that will slow down loading if we have vsync
+	if(time_get_nanoseconds() - s_LastLoadRender < std::chrono::nanoseconds(1s) / 60l)
+		return;
+
+	s_LastLoadRender = time_get_nanoseconds();
+
+	// need up date this here to get correct
+	ms_GuiColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_UiColor, true));
+
+	UI()->MapScreen();
+
+	if(!RenderMenuBackgroundMap || !m_pBackground->Render())
+	{
+		RenderBackground();
+	}
+
+	CUIRect Box = *UI()->Screen();
+	Box.Margin(160.0f, &Box);
+
+	Graphics()->BlendNormal();
+
+	Graphics()->TextureClear();
+	Box.Draw(ColorRGBA{0, 0, 0, 0.50f}, IGraphics::CORNER_ALL, 15.0f);
+
+	CUIRect Part;
+	Box.HSplitTop(20.f, nullptr, &Box);
+	Box.HSplitTop(24.f, &Part, &Box);
+	Part.VMargin(20.f, &Part);
+	UI()->DoLabel(&Part, pCaption, 24.f, TEXTALIGN_MC);
+
+	Box.HSplitTop(20.f, nullptr, &Box);
+	Box.HSplitTop(24.f, &Part, &Box);
+	Part.VMargin(20.f, &Part);
+	UI()->DoLabel(&Part, pContent, 20.0f, TEXTALIGN_MC);
+
+	if(RenderLoadingBar)
+		Graphics()->DrawRect(Box.x + 40, Box.y + Box.h - 75, (Box.w - 80) * Percent, 25, ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f), IGraphics::CORNER_ALL, 5.0f);
+
+	Client()->UpdateAndSwap();
+}
+
+void CMenus::RenderNews(CUIRect MainView)
+{
+	g_Config.m_UiUnreadNews = false;
+
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+	MainView.VSplitLeft(15.0f, nullptr, &MainView);
+
+	CUIRect Label;
+
+	const char *pStr = Client()->News();
+	char aLine[256];
+	while((pStr = str_next_token(pStr, "\n", aLine, sizeof(aLine))))
+	{
+		const int Len = str_length(aLine);
+		if(Len > 0 && aLine[0] == '|' && aLine[Len - 1] == '|')
+		{
+			MainView.HSplitTop(30.0f, &Label, &MainView);
+			aLine[Len - 1] = '\0';
+			UI()->DoLabel(&Label, aLine + 1, 20.0f, TEXTALIGN_ML);
+		}
+		else
+		{
+			MainView.HSplitTop(20.0f, &Label, &MainView);
+			UI()->DoLabel(&Label, aLine, 15.f, TEXTALIGN_ML);
+		}
+	}
+}
+
+void CMenus::OnInit()
+{
+	if(g_Config.m_ClShowWelcome)
+	{
+		m_Popup = POPUP_LANGUAGE;
+		str_copy(g_Config.m_BrFilterExcludeCommunities, "*ddnet");
+	}
+	if(g_Config.m_ClSkipStartMenu)
+		m_ShowStart = false;
+
+	m_RefreshButton.Init(UI(), -1);
+	m_ConnectButton.Init(UI(), -1);
+
+	Console()->Chain("add_favorite", ConchainFavoritesUpdate, this);
+	Console()->Chain("remove_favorite", ConchainFavoritesUpdate, this);
+	Console()->Chain("add_friend", ConchainFriendlistUpdate, this);
+	Console()->Chain("remove_friend", ConchainFriendlistUpdate, this);
+	Console()->Chain("br_filter_exclude_communities", ConchainCommunitiesUpdate, this);
+
+	Console()->Chain("snd_enable", ConchainUpdateMusicState, this);
+	Console()->Chain("snd_enable_music", ConchainUpdateMusicState, this);
+
+	Console()->Chain("cl_assets_entities", ConchainAssetsEntities, this);
+	Console()->Chain("cl_asset_game", ConchainAssetGame, this);
+	Console()->Chain("cl_asset_emoticons", ConchainAssetEmoticons, this);
+	Console()->Chain("cl_asset_particles", ConchainAssetParticles, this);
+	Console()->Chain("cl_asset_hud", ConchainAssetHud, this);
+	Console()->Chain("cl_asset_extras", ConchainAssetExtras, this);
+
+	m_TextureBlob = Graphics()->LoadTexture("blob.png", IStorage::TYPE_ALL);
+
+	// setup load amount
+	const int NumMenuImages = 5;
+	m_LoadCurrent = 0;
+	m_LoadTotal = g_pData->m_NumImages + NumMenuImages + GameClient()->ComponentCount();
+	if(!g_Config.m_ClThreadsoundloading)
+		m_LoadTotal += g_pData->m_NumSounds;
+
+	m_IsInit = true;
+
+	// load menu images
+	m_vMenuImages.clear();
+	Storage()->ListDirectory(IStorage::TYPE_ALL, "menuimages", MenuImageScan, this);
+
+	// load community icons
+	m_vCommunityIcons.clear();
+	Storage()->ListDirectory(IStorage::TYPE_ALL, "communityicons", CommunityIconScan, this);
+}
+
+void CMenus::OnConsoleInit()
+{
+	ConfigManager()->RegisterCallback(CMenus::ConfigSaveCallback, this);
+	Console()->Register("add_favorite_skin", "s[skin_name]", CFGFLAG_CLIENT, Con_AddFavoriteSkin, this, "Add a skin as a favorite");
+	Console()->Register("remove_favorite_skin", "s[skin_name]", CFGFLAG_CLIENT, Con_RemFavoriteSkin, this, "Remove a skin from the favorites");
+}
+
+void CMenus::ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	auto *pSelf = (CMenus *)pUserData;
+	if(pResult->NumArguments())
+		pSelf->UpdateMusicState();
+}
+
+void CMenus::UpdateMusicState()
+{
+	const bool ShouldPlay = Client()->State() == IClient::STATE_OFFLINE && g_Config.m_SndEnable && g_Config.m_SndMusic;
+	if(ShouldPlay && !m_pClient->m_Sounds.IsPlaying(SOUND_MENU))
+		m_pClient->m_Sounds.Enqueue(CSounds::CHN_MUSIC, SOUND_MENU);
+	else if(!ShouldPlay && m_pClient->m_Sounds.IsPlaying(SOUND_MENU))
+		m_pClient->m_Sounds.Stop(SOUND_MENU);
+}
+
+void CMenus::PopupMessage(const char *pTitle, const char *pMessage, const char *pButtonLabel, int NextPopup, FPopupButtonCallback pfnButtonCallback)
+{
+	// reset active item
+	UI()->SetActiveItem(nullptr);
+
+	str_copy(m_aPopupTitle, pTitle);
+	str_copy(m_aPopupMessage, pMessage);
+	str_copy(m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, pButtonLabel);
+	m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup = NextPopup;
+	m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback = pfnButtonCallback;
+	m_Popup = POPUP_MESSAGE;
+}
+
+void CMenus::PopupConfirm(const char *pTitle, const char *pMessage, const char *pConfirmButtonLabel, const char *pCancelButtonLabel,
+	FPopupButtonCallback pfnConfirmButtonCallback, int ConfirmNextPopup, FPopupButtonCallback pfnCancelButtonCallback, int CancelNextPopup)
+{
+	// reset active item
+	UI()->SetActiveItem(nullptr);
+
+	str_copy(m_aPopupTitle, pTitle);
+	str_copy(m_aPopupMessage, pMessage);
+	str_copy(m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, pConfirmButtonLabel);
+	m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup = ConfirmNextPopup;
+	m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback = pfnConfirmButtonCallback;
+	str_copy(m_aPopupButtons[BUTTON_CANCEL].m_aLabel, pCancelButtonLabel);
+	m_aPopupButtons[BUTTON_CANCEL].m_NextPopup = CancelNextPopup;
+	m_aPopupButtons[BUTTON_CANCEL].m_pfnCallback = pfnCancelButtonCallback;
+	m_Popup = POPUP_CONFIRM;
+}
+
+void CMenus::PopupWarning(const char *pTopic, const char *pBody, const char *pButton, std::chrono::nanoseconds Duration)
+{
+	// no multiline support for console
+	std::string BodyStr = pBody;
+	while(BodyStr.find('\n') != std::string::npos)
+		BodyStr.replace(BodyStr.find('\n'), 1, " ");
+	dbg_msg(pTopic, "%s", BodyStr.c_str());
+
+	// reset active item
+	UI()->SetActiveItem(nullptr);
+
+	str_copy(m_aMessageTopic, pTopic);
+	str_copy(m_aMessageBody, pBody);
+	str_copy(m_aMessageButton, pButton);
+	m_Popup = POPUP_WARNING;
+	SetActive(true);
+
+	m_PopupWarningDuration = Duration;
+	m_PopupWarningLastTime = time_get_nanoseconds();
+}
+
+bool CMenus::CanDisplayWarning() const
+{
+	return m_Popup == POPUP_NONE;
+}
+
+int CMenus::Render()
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_Popup == POPUP_NONE)
+		return 0;
+
+	CUIRect Screen = *UI()->Screen();
+	UI()->MapScreen();
+	UI()->ResetMouseSlow();
+
+	static int s_Frame = 0;
+	if(s_Frame == 0)
+	{
+		SetMenuPage(g_Config.m_UiPage);
+		s_Frame++;
+	}
+	else if(s_Frame == 1)
+	{
+		UpdateMusicState();
+		RefreshBrowserTab(g_Config.m_UiPage);
+		s_Frame++;
+	}
+
+	if(Client()->State() == IClient::STATE_ONLINE || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		ms_ColorTabbarInactive = ms_ColorTabbarInactiveIngame;
+		ms_ColorTabbarActive = ms_ColorTabbarActiveIngame;
+		ms_ColorTabbarHover = ms_ColorTabbarHoverIngame;
+	}
+	else
+	{
+		if(!m_pBackground->Render())
+		{
+			RenderBackground();
+		}
+		ms_ColorTabbarInactive = ms_ColorTabbarInactiveOutgame;
+		ms_ColorTabbarActive = ms_ColorTabbarActiveOutgame;
+		ms_ColorTabbarHover = ms_ColorTabbarHoverOutgame;
+	}
+
+	CUIRect TabBar;
+	CUIRect MainView;
+
+	// some margin around the screen
+	Screen.Margin(10.0f, &Screen);
+
+	static bool s_SoundCheck = false;
+	if(!s_SoundCheck && m_Popup == POPUP_NONE)
+	{
+		if(Client()->SoundInitFailed())
+			PopupMessage(Localize("Sound error"), Localize("The audio device couldn't be initialised."), Localize("Ok"));
+		s_SoundCheck = true;
+	}
+
+	if(m_Popup == POPUP_NONE)
+	{
+		if(m_JoinTutorial && !Client()->InfoTaskRunning() && !ServerBrowser()->IsGettingServerlist())
+		{
+			m_JoinTutorial = false;
+			const char *pAddr = ServerBrowser()->GetTutorialServer();
+			if(pAddr)
+				Client()->Connect(pAddr);
+		}
+		if(m_ShowStart && Client()->State() == IClient::STATE_OFFLINE)
+		{
+			m_pBackground->ChangePosition(CMenuBackground::POS_START);
+			RenderStartMenu(Screen);
+		}
+		else
+		{
+			Screen.HSplitTop(24.0f, &TabBar, &MainView);
+
+			// render news
+			if(m_MenuPage < PAGE_NEWS || m_MenuPage > PAGE_SETTINGS || (Client()->State() == IClient::STATE_OFFLINE && m_MenuPage >= PAGE_GAME && m_MenuPage <= PAGE_CALLVOTE))
+			{
+				ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+				SetMenuPage(PAGE_INTERNET);
+			}
+
+			// render current page
+			if(Client()->State() != IClient::STATE_OFFLINE)
+			{
+				if(m_GamePage == PAGE_GAME)
+				{
+					RenderGame(MainView);
+					RenderIngameHint();
+				}
+				else if(m_GamePage == PAGE_PLAYERS)
+				{
+					RenderPlayers(MainView);
+				}
+				else if(m_GamePage == PAGE_SERVER_INFO)
+				{
+					RenderServerInfo(MainView);
+				}
+				else if(m_GamePage == PAGE_NETWORK)
+				{
+					RenderInGameNetwork(MainView);
+				}
+				else if(m_GamePage == PAGE_GHOST)
+				{
+					RenderGhost(MainView);
+				}
+				else if(m_GamePage == PAGE_CALLVOTE)
+				{
+					RenderServerControl(MainView);
+				}
+				else if(m_GamePage == PAGE_STATS)
+				{
+					RenderStats(MainView);
+				}
+				else if(m_GamePage == PAGE_SETTINGS)
+				{
+					RenderSettings(MainView);
+				}
+			}
+			else if(m_MenuPage == PAGE_NEWS)
+			{
+				m_pBackground->ChangePosition(CMenuBackground::POS_NEWS);
+				RenderNews(MainView);
+			}
+			else if(m_MenuPage == PAGE_INTERNET)
+			{
+				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_INTERNET);
+				RenderServerbrowser(MainView);
+			}
+			else if(m_MenuPage == PAGE_LAN)
+			{
+				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_LAN);
+				RenderServerbrowser(MainView);
+			}
+			else if(m_MenuPage == PAGE_DEMOS)
+			{
+				m_pBackground->ChangePosition(CMenuBackground::POS_DEMOS);
+				RenderDemoBrowser(MainView);
+			}
+			else if(m_MenuPage == PAGE_FAVORITES)
+			{
+				m_pBackground->ChangePosition(CMenuBackground::POS_BROWSER_FAVORITES);
+				RenderServerbrowser(MainView);
+			}
+			else if(m_MenuPage == PAGE_SETTINGS)
+				RenderSettings(MainView);
+
+			// do tab bar
+			RenderMenubar(TabBar);
+		}
+	}
+	else
+	{
+		char aBuf[1536];
+		const char *pTitle = "";
+		const char *pExtraText = "";
+		const char *pButtonText = "";
+		bool TopAlign = false;
+		bool UseIpLabel = false;
+
+		ColorRGBA BgColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f);
+		if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+		{
+			pTitle = m_aPopupTitle;
+			pExtraText = m_aPopupMessage;
+			TopAlign = true;
+		}
+		else if(m_Popup == POPUP_CONNECTING)
+		{
+			pTitle = Localize("Connecting to");
+			UseIpLabel = true;
+			pButtonText = Localize("Abort");
+			if(Client()->State() == IClient::STATE_CONNECTING && time_get() - Client()->StateStartTime() > time_freq())
+			{
+				int Connectivity = Client()->UdpConnectivity(Client()->ConnectNetTypes());
+				switch(Connectivity)
+				{
+				case IClient::CONNECTIVITY_UNKNOWN:
+					break;
+				case IClient::CONNECTIVITY_CHECKING:
+					pExtraText = Localize("Trying to determine UDP connectivity...");
+					break;
+				case IClient::CONNECTIVITY_UNREACHABLE:
+					pExtraText = Localize("UDP seems to be filtered.");
+					break;
+				case IClient::CONNECTIVITY_DIFFERING_UDP_TCP_IP_ADDRESSES:
+					pExtraText = Localize("UDP and TCP IP addresses seem to be different. Try disabling VPN, proxy or network accelerators.");
+					break;
+				case IClient::CONNECTIVITY_REACHABLE:
+					pExtraText = Localize("No answer from server yet.");
+					break;
+				}
+			}
+			else if(Client()->MapDownloadTotalsize() > 0)
+			{
+				str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Downloading map"), Client()->MapDownloadName());
+				pTitle = aBuf;
+				UseIpLabel = false;
+			}
+			else if(Client()->State() == IClient::STATE_LOADING)
+			{
+				UseIpLabel = false;
+				if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_INITIAL)
+				{
+					pTitle = Localize("Connected");
+					pExtraText = Localize("Getting game info");
+				}
+				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_LOADING_MAP)
+				{
+					pTitle = Localize("Connected");
+					pExtraText = Localize("Loading map file from storage");
+				}
+				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_SENDING_READY)
+				{
+					pTitle = Localize("Connected");
+					pExtraText = Localize("Requesting to join the game");
+				}
+				else if(Client()->LoadingStateDetail() == IClient::LOADING_STATE_DETAIL_GETTING_READY)
+				{
+					pTitle = Localize("Connected");
+					pExtraText = Localize("Sending initial client info");
+				}
+			}
+		}
+		else if(m_Popup == POPUP_DISCONNECTED)
+		{
+			pTitle = Localize("Disconnected");
+			pExtraText = Client()->ErrorString();
+			pButtonText = Localize("Ok");
+			if(Client()->ReconnectTime() > 0)
+			{
+				str_format(aBuf, sizeof(aBuf), Localize("Reconnect in %d sec"), (int)((Client()->ReconnectTime() - time_get()) / time_freq()));
+				pTitle = Client()->ErrorString();
+				pExtraText = aBuf;
+				pButtonText = Localize("Abort");
+			}
+		}
+		else if(m_Popup == POPUP_RENAME_DEMO)
+		{
+			dbg_assert(m_DemolistSelectedIndex >= 0, "m_DemolistSelectedIndex invalid for POPUP_RENAME_DEMO");
+			pTitle = m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Rename folder") : Localize("Rename demo");
+		}
+#if defined(CONF_VIDEORECORDER)
+		else if(m_Popup == POPUP_RENDER_DEMO)
+		{
+			pTitle = Localize("Render demo");
+		}
+		else if(m_Popup == POPUP_RENDER_DONE)
+		{
+			pTitle = Localize("Render complete");
+		}
+#endif
+		else if(m_Popup == POPUP_PASSWORD)
+		{
+			pTitle = Localize("Password incorrect");
+			pButtonText = Localize("Try again");
+		}
+		else if(m_Popup == POPUP_QUIT)
+		{
+			pTitle = Localize("Quit");
+			pExtraText = Localize("Are you sure that you want to quit?");
+		}
+		else if(m_Popup == POPUP_FIRST_LAUNCH)
+		{
+			pTitle = Localize("Welcome to DDNet");
+			str_format(aBuf, sizeof(aBuf), "%s\n\n%s\n\n%s\n\n%s",
+				Localize("DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you."),
+				Localize("Use k key to kill (restart), q to pause and watch other players. See settings for other key binds."),
+				Localize("It's recommended that you check the settings to adjust them to your liking before joining a server."),
+				Localize("Please enter your nickname below."));
+			pExtraText = aBuf;
+			pButtonText = Localize("Ok");
+			TopAlign = true;
+		}
+		else if(m_Popup == POPUP_POINTS)
+		{
+			pTitle = Localize("Existing Player");
+			if(Client()->Points() > 50)
+			{
+				str_format(aBuf, sizeof(aBuf), Localize("Your nickname '%s' is already used (%d points). Do you still want to use it?"), Client()->PlayerName(), Client()->Points());
+				pExtraText = aBuf;
+				TopAlign = true;
+			}
+			else if(Client()->Points() >= 0)
+			{
+				m_Popup = POPUP_NONE;
+			}
+			else
+			{
+				pExtraText = Localize("Checking for existing player with your name");
+			}
+		}
+		else if(m_Popup == POPUP_WARNING)
+		{
+			BgColor = ColorRGBA(0.5f, 0.0f, 0.0f, 0.7f);
+			pTitle = m_aMessageTopic;
+			pExtraText = m_aMessageBody;
+			pButtonText = m_aMessageButton;
+			TopAlign = true;
+		}
+
+		CUIRect Box, Part;
+		Box = Screen;
+		if(m_Popup != POPUP_FIRST_LAUNCH)
+			Box.Margin(150.0f, &Box);
+
+		// render the box
+		Box.Draw(BgColor, IGraphics::CORNER_ALL, 15.0f);
+
+		Box.HSplitTop(20.f, &Part, &Box);
+		Box.HSplitTop(24.f, &Part, &Box);
+		Part.VMargin(20.f, &Part);
+		SLabelProperties Props;
+		Props.m_MaxWidth = (int)Part.w;
+
+		if(TextRender()->TextWidth(24.f, pTitle, -1, -1.0f) > Part.w)
+			UI()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_ML, Props);
+		else
+			UI()->DoLabel(&Part, pTitle, 24.f, TEXTALIGN_MC);
+
+		Box.HSplitTop(20.f, &Part, &Box);
+		Box.HSplitTop(24.f, &Part, &Box);
+		Part.VMargin(20.f, &Part);
+
+		float FontSize = m_Popup == POPUP_FIRST_LAUNCH ? 16.0f : 20.f;
+
+		if(UseIpLabel)
+		{
+			SLabelProperties IpLabelProps;
+			IpLabelProps.m_MaxWidth = Part.w;
+			IpLabelProps.m_EllipsisAtEnd = true;
+			UI()->DoLabel(&Part, Client()->ConnectAddressString(), FontSize, TEXTALIGN_MC, IpLabelProps);
+			Box.HSplitTop(20.f, &Part, &Box);
+			Box.HSplitTop(24.f, &Part, &Box);
+		}
+
+		Props.m_MaxWidth = (int)Part.w;
+		if(TopAlign)
+			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_TL, Props);
+		else if(TextRender()->TextWidth(FontSize, pExtraText, -1, -1.0f) > Part.w)
+			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_ML, Props);
+		else
+			UI()->DoLabel(&Part, pExtraText, FontSize, TEXTALIGN_MC);
+
+		if(m_Popup == POPUP_MESSAGE || m_Popup == POPUP_CONFIRM)
+		{
+			CUIRect ButtonBar;
+			Box.HSplitBottom(20.0f, &Box, nullptr);
+			Box.HSplitBottom(24.0f, &Box, &ButtonBar);
+			ButtonBar.VMargin(100.0f, &ButtonBar);
+
+			if(m_Popup == POPUP_MESSAGE)
+			{
+				static CButtonContainer s_ButtonConfirm;
+				if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ButtonBar) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+				{
+					m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
+					(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
+				}
+			}
+			else if(m_Popup == POPUP_CONFIRM)
+			{
+				CUIRect CancelButton, ConfirmButton;
+				ButtonBar.VSplitMid(&CancelButton, &ConfirmButton, 40.0f);
+
+				static CButtonContainer s_ButtonCancel;
+				if(DoButton_Menu(&s_ButtonCancel, m_aPopupButtons[BUTTON_CANCEL].m_aLabel, 0, &CancelButton) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+				{
+					m_Popup = m_aPopupButtons[BUTTON_CANCEL].m_NextPopup;
+					(this->*m_aPopupButtons[BUTTON_CANCEL].m_pfnCallback)();
+				}
+
+				static CButtonContainer s_ButtonConfirm;
+				if(DoButton_Menu(&s_ButtonConfirm, m_aPopupButtons[BUTTON_CONFIRM].m_aLabel, 0, &ConfirmButton) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+				{
+					m_Popup = m_aPopupButtons[BUTTON_CONFIRM].m_NextPopup;
+					(this->*m_aPopupButtons[BUTTON_CONFIRM].m_pfnCallback)();
+				}
+			}
+		}
+		else if(m_Popup == POPUP_QUIT)
+		{
+			CUIRect Yes, No;
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+
+			// additional info
+			Box.VMargin(20.f, &Box);
+			if(m_pClient->Editor()->HasUnsavedData())
+			{
+				str_format(aBuf, sizeof(aBuf), "%s\n%s", Localize("There's an unsaved map in the editor, you might want to save it before you quit the game."), Localize("Quit anyway?"));
+				Props.m_MaxWidth = Part.w - 20.0f;
+				UI()->DoLabel(&Box, aBuf, 20.f, TEXTALIGN_ML, Props);
+			}
+
+			// buttons
+			Part.VMargin(80.0f, &Part);
+			Part.VSplitMid(&No, &Yes);
+			Yes.VMargin(20.0f, &Yes);
+			No.VMargin(20.0f, &No);
+
+			static CButtonContainer s_ButtonAbort;
+			if(DoButton_Menu(&s_ButtonAbort, Localize("No"), 0, &No) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+				m_Popup = POPUP_NONE;
+
+			static CButtonContainer s_ButtonTryAgain;
+			if(DoButton_Menu(&s_ButtonTryAgain, Localize("Yes"), 0, &Yes) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				m_Popup = POPUP_NONE;
+				Client()->Quit();
+			}
+		}
+		else if(m_Popup == POPUP_PASSWORD)
+		{
+			CUIRect Label, TextBox, TryAgain, Abort;
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(80.0f, &Part);
+
+			Part.VSplitMid(&Abort, &TryAgain);
+
+			TryAgain.VMargin(20.0f, &TryAgain);
+			Abort.VMargin(20.0f, &Abort);
+
+			static CButtonContainer s_ButtonAbort;
+			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+				m_Popup = POPUP_NONE;
+
+			static CButtonContainer s_ButtonTryAgain;
+			if(DoButton_Menu(&s_ButtonTryAgain, Localize("Try again"), 0, &TryAgain) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				Client()->Connect(g_Config.m_UiServerAddress, g_Config.m_Password);
+			}
+
+			Box.HSplitBottom(60.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+
+			Part.VSplitLeft(60.0f, 0, &Label);
+			Label.VSplitLeft(100.0f, 0, &TextBox);
+			TextBox.VSplitLeft(20.0f, 0, &TextBox);
+			TextBox.VSplitRight(60.0f, &TextBox, 0);
+			UI()->DoLabel(&Label, Localize("Password"), 18.0f, TEXTALIGN_ML);
+			UI()->DoClearableEditBox(&m_PasswordInput, &TextBox, 12.0f);
+		}
+		else if(m_Popup == POPUP_CONNECTING)
+		{
+			Box = Screen;
+			Box.Margin(150.0f, &Box);
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(120.0f, &Part);
+
+			static CButtonContainer s_Button;
+			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			{
+				Client()->Disconnect();
+				m_Popup = POPUP_NONE;
+				RefreshBrowserTab(g_Config.m_UiPage);
+			}
+
+			if(Client()->MapDownloadTotalsize() > 0)
+			{
+				int64_t Now = time_get();
+				if(Now - m_DownloadLastCheckTime >= time_freq())
+				{
+					if(m_DownloadLastCheckSize > Client()->MapDownloadAmount())
+					{
+						// map downloaded restarted
+						m_DownloadLastCheckSize = 0;
+					}
+
+					// update download speed
+					float Diff = (Client()->MapDownloadAmount() - m_DownloadLastCheckSize) / ((int)((Now - m_DownloadLastCheckTime) / time_freq()));
+					float StartDiff = m_DownloadLastCheckSize - 0.0f;
+					if(StartDiff + Diff > 0.0f)
+						m_DownloadSpeed = (Diff / (StartDiff + Diff)) * (Diff / 1.0f) + (StartDiff / (Diff + StartDiff)) * m_DownloadSpeed;
+					else
+						m_DownloadSpeed = 0.0f;
+					m_DownloadLastCheckTime = Now;
+					m_DownloadLastCheckSize = Client()->MapDownloadAmount();
+				}
+
+				Box.HSplitTop(64.f, 0, &Box);
+				Box.HSplitTop(24.f, &Part, &Box);
+				str_format(aBuf, sizeof(aBuf), "%d/%d KiB (%.1f KiB/s)", Client()->MapDownloadAmount() / 1024, Client()->MapDownloadTotalsize() / 1024, m_DownloadSpeed / 1024.0f);
+				UI()->DoLabel(&Part, aBuf, 20.f, TEXTALIGN_MC);
+
+				// time left
+				int TimeLeft = maximum(1, m_DownloadSpeed > 0.0f ? static_cast<int>((Client()->MapDownloadTotalsize() - Client()->MapDownloadAmount()) / m_DownloadSpeed) : 1);
+				if(TimeLeft >= 60)
+				{
+					TimeLeft /= 60;
+					str_format(aBuf, sizeof(aBuf), TimeLeft == 1 ? Localize("%i minute left") : Localize("%i minutes left"), TimeLeft);
+				}
+				else
+				{
+					str_format(aBuf, sizeof(aBuf), TimeLeft == 1 ? Localize("%i second left") : Localize("%i seconds left"), TimeLeft);
+				}
+				Box.HSplitTop(20.f, 0, &Box);
+				Box.HSplitTop(24.f, &Part, &Box);
+				UI()->DoLabel(&Part, aBuf, 20.f, TEXTALIGN_MC);
+
+				// progress bar
+				Box.HSplitTop(20.f, 0, &Box);
+				Box.HSplitTop(24.f, &Part, &Box);
+				Part.VMargin(40.0f, &Part);
+				Part.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
+				Part.w = maximum(10.0f, (Part.w * Client()->MapDownloadAmount()) / Client()->MapDownloadTotalsize());
+				Part.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), IGraphics::CORNER_ALL, 5.0f);
+			}
+		}
+		else if(m_Popup == POPUP_LANGUAGE)
+		{
+			CUIRect Button;
+			Screen.Margin(150.0f, &Box);
+			Box.HSplitTop(20.0f, nullptr, &Box);
+			Box.HSplitBottom(20.0f, &Box, nullptr);
+			Box.HSplitBottom(24.0f, &Box, &Button);
+			Box.HSplitBottom(20.0f, &Box, nullptr);
+			Box.VMargin(20.0f, &Box);
+			const bool Activated = RenderLanguageSelection(Box);
+			Button.VMargin(120.0f, &Button);
+
+			static CButtonContainer s_Button;
+			if(DoButton_Menu(&s_Button, Localize("Ok"), 0, &Button) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || Activated)
+				m_Popup = POPUP_FIRST_LAUNCH;
+		}
+		else if(m_Popup == POPUP_RENAME_DEMO)
+		{
+			CUIRect Label, TextBox, Ok, Abort;
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(80.0f, &Part);
+
+			Part.VSplitMid(&Abort, &Ok);
+
+			Ok.VMargin(20.0f, &Ok);
+			Abort.VMargin(20.0f, &Abort);
+
+			static CButtonContainer s_ButtonAbort;
+			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+				m_Popup = POPUP_NONE;
+
+			static CButtonContainer s_ButtonOk;
+			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				m_Popup = POPUP_NONE;
+				// rename demo
+				char aBufOld[IO_MAX_PATH_LENGTH];
+				str_format(aBufOld, sizeof(aBufOld), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+				char aBufNew[IO_MAX_PATH_LENGTH];
+				str_format(aBufNew, sizeof(aBufNew), "%s/%s", m_aCurrentDemoFolder, m_DemoRenameInput.GetString());
+				if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir && !str_endswith(aBufNew, ".demo"))
+					str_append(aBufNew, ".demo");
+
+				if(Storage()->FileExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+				{
+					PopupMessage(Localize("Error"), Localize("A demo with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
+				}
+				else if(Storage()->FolderExists(aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+				{
+					PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENAME_DEMO);
+				}
+				else if(Storage()->RenameFile(aBufOld, aBufNew, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+				{
+					str_copy(m_aCurrentDemoSelectionName, m_DemoRenameInput.GetString());
+					if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir)
+						fs_split_file_extension(m_DemoRenameInput.GetString(), m_aCurrentDemoSelectionName, sizeof(m_aCurrentDemoSelectionName));
+					DemolistPopulate();
+					DemolistOnUpdate(false);
+				}
+				else
+				{
+					PopupMessage(Localize("Error"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Unable to rename the folder") : Localize("Unable to rename the demo"), Localize("Ok"), POPUP_RENAME_DEMO);
+				}
+			}
+
+			Box.HSplitBottom(60.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+
+			Part.VSplitLeft(60.0f, 0, &Label);
+			Label.VSplitLeft(120.0f, 0, &TextBox);
+			TextBox.VSplitLeft(20.0f, 0, &TextBox);
+			TextBox.VSplitRight(60.0f, &TextBox, 0);
+			UI()->DoLabel(&Label, Localize("New name:"), 18.0f, TEXTALIGN_ML);
+			UI()->DoEditBox(&m_DemoRenameInput, &TextBox, 12.0f);
+		}
+#if defined(CONF_VIDEORECORDER)
+		else if(m_Popup == POPUP_RENDER_DEMO)
+		{
+			CUIRect Row, Ok, Abort;
+			Box.VMargin(60.0f, &Box);
+			Box.HMargin(20.0f, &Box);
+			Box.HSplitBottom(24.0f, &Box, &Row);
+			Box.HSplitBottom(40.0f, &Box, nullptr);
+			Row.VMargin(40.0f, &Row);
+			Row.VSplitMid(&Abort, &Ok, 40.0f);
+
+			static CButtonContainer s_ButtonAbort;
+			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			{
+				m_DemoRenderInput.Clear();
+				m_Popup = POPUP_NONE;
+			}
+
+			static CButtonContainer s_ButtonOk;
+			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				m_Popup = POPUP_NONE;
+				// render video
+				char aVideoPath[IO_MAX_PATH_LENGTH];
+				str_format(aVideoPath, sizeof(aVideoPath), "videos/%s", m_DemoRenderInput.GetString());
+				if(!str_endswith(aVideoPath, ".mp4"))
+					str_append(aVideoPath, ".mp4");
+				if(Storage()->FolderExists(aVideoPath, IStorage::TYPE_SAVE))
+				{
+					PopupMessage(Localize("Error"), Localize("A folder with this name already exists"), Localize("Ok"), POPUP_RENDER_DEMO);
+				}
+				else if(Storage()->FileExists(aVideoPath, IStorage::TYPE_SAVE))
+				{
+					char aMessage[128 + IO_MAX_PATH_LENGTH];
+					str_format(aMessage, sizeof(aMessage), Localize("File '%s' already exists, do you want to overwrite it?"), m_DemoRenderInput.GetString());
+					PopupConfirm(Localize("Replace video"), aMessage, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDemoReplaceVideo, POPUP_NONE, &CMenus::DefaultButtonCallback, POPUP_RENDER_DEMO);
+				}
+				else
+				{
+					PopupConfirmDemoReplaceVideo();
+				}
+			}
+
+			CUIRect ShowChatCheckbox, UseSoundsCheckbox;
+			Box.HSplitBottom(20.0f, &Box, &Row);
+			Box.HSplitBottom(10.0f, &Box, nullptr);
+			Row.VSplitMid(&ShowChatCheckbox, &UseSoundsCheckbox, 20.0f);
+
+			if(DoButton_CheckBox(&g_Config.m_ClVideoShowChat, Localize("Show chat"), g_Config.m_ClVideoShowChat, &ShowChatCheckbox))
+				g_Config.m_ClVideoShowChat ^= 1;
+
+			if(DoButton_CheckBox(&g_Config.m_ClVideoSndEnable, Localize("Use sounds"), g_Config.m_ClVideoSndEnable, &UseSoundsCheckbox))
+				g_Config.m_ClVideoSndEnable ^= 1;
+
+			CUIRect ShowHudButton;
+			Box.HSplitBottom(20.0f, &Box, &Row);
+			Row.VSplitMid(&Row, &ShowHudButton, 20.0f);
+
+			if(DoButton_CheckBox(&g_Config.m_ClVideoShowhud, Localize("Show ingame HUD"), g_Config.m_ClVideoShowhud, &ShowHudButton))
+				g_Config.m_ClVideoShowhud ^= 1;
+
+			// slowdown
+			CUIRect SlowDownButton;
+			Row.VSplitLeft(20.0f, &SlowDownButton, &Row);
+			Row.VSplitLeft(5.0f, nullptr, &Row);
+			static CButtonContainer s_SlowDownButton;
+			if(DoButton_FontIcon(&s_SlowDownButton, FONT_ICON_BACKWARD, 0, &SlowDownButton, IGraphics::CORNER_ALL))
+				m_Speed = clamp(m_Speed - 1, 0, (int)(g_DemoSpeeds - 1));
+
+			// paused
+			CUIRect PausedButton;
+			Row.VSplitLeft(20.0f, &PausedButton, &Row);
+			Row.VSplitLeft(5.0f, nullptr, &Row);
+			static CButtonContainer s_PausedButton;
+			if(DoButton_FontIcon(&s_PausedButton, FONT_ICON_PAUSE, 0, &PausedButton, IGraphics::CORNER_ALL))
+				m_StartPaused ^= 1;
+
+			// fastforward
+			CUIRect FastForwardButton;
+			Row.VSplitLeft(20.0f, &FastForwardButton, &Row);
+			Row.VSplitLeft(8.0f, nullptr, &Row);
+			static CButtonContainer s_FastForwardButton;
+			if(DoButton_FontIcon(&s_FastForwardButton, FONT_ICON_FORWARD, 0, &FastForwardButton, IGraphics::CORNER_ALL))
+				m_Speed = clamp(m_Speed + 1, 0, (int)(g_DemoSpeeds - 1));
+
+			// speed meter
+			char aBuffer[128];
+			const char *pPaused = m_StartPaused ? Localize("(paused)") : "";
+			str_format(aBuffer, sizeof(aBuffer), "%s: ×%g %s", Localize("Speed"), g_aSpeeds[m_Speed], pPaused);
+			UI()->DoLabel(&Row, aBuffer, 12.8f, TEXTALIGN_ML);
+
+			Box.HSplitBottom(16.0f, &Box, nullptr);
+			Box.HSplitBottom(24.0f, &Box, &Row);
+
+			CUIRect Label, TextBox;
+			Row.VSplitLeft(110.0f, &Label, &TextBox);
+			TextBox.VSplitLeft(10.0f, nullptr, &TextBox);
+			UI()->DoLabel(&Label, Localize("Video name:"), 12.8f, TEXTALIGN_ML);
+			UI()->DoEditBox(&m_DemoRenderInput, &TextBox, 12.8f);
+		}
+		else if(m_Popup == POPUP_RENDER_DONE)
+		{
+			CUIRect Ok, OpenFolder;
+
+			char aFilePath[IO_MAX_PATH_LENGTH];
+			char aSaveFolder[IO_MAX_PATH_LENGTH];
+			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "videos", aSaveFolder, sizeof(aSaveFolder));
+			str_format(aFilePath, sizeof(aFilePath), "%s/%s.mp4", aSaveFolder, m_DemoRenderInput.GetString());
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(80.0f, &Part);
+
+			Part.VSplitMid(&OpenFolder, &Ok);
+
+			Ok.VMargin(20.0f, &Ok);
+			OpenFolder.VMargin(20.0f, &OpenFolder);
+
+			static CButtonContainer s_ButtonOpenFolder;
+			if(DoButton_Menu(&s_ButtonOpenFolder, Localize("Videos directory"), 0, &OpenFolder))
+			{
+				if(!open_file(aSaveFolder))
+				{
+					dbg_msg("menus", "couldn't open file '%s'", aSaveFolder);
+				}
+			}
+
+			static CButtonContainer s_ButtonOk;
+			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				m_Popup = POPUP_NONE;
+				m_DemoRenderInput.Clear();
+			}
+
+			Box.HSplitBottom(160.f, &Box, &Part);
+			Part.VMargin(20.0f, &Part);
+
+			str_format(aBuf, sizeof(aBuf), Localize("Video was saved to '%s'"), aFilePath);
+
+			SLabelProperties MessageProps;
+			MessageProps.m_MaxWidth = (int)Part.w;
+			UI()->DoLabel(&Part, aBuf, 18.0f, TEXTALIGN_TL, MessageProps);
+		}
+#endif
+		else if(m_Popup == POPUP_FIRST_LAUNCH)
+		{
+			CUIRect Label, TextBox, Skip, Join;
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(80.0f, &Part);
+			Part.VSplitMid(&Skip, &Join);
+			Skip.VMargin(20.0f, &Skip);
+			Join.VMargin(20.0f, &Join);
+
+			static CButtonContainer s_JoinTutorialButton;
+			if(DoButton_Menu(&s_JoinTutorialButton, Localize("Join Tutorial Server"), 0, &Join) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				m_JoinTutorial = true;
+				Client()->RequestDDNetInfo();
+				m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
+			}
+
+			static CButtonContainer s_SkipTutorialButton;
+			if(DoButton_Menu(&s_SkipTutorialButton, Localize("Skip Tutorial"), 0, &Skip) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			{
+				m_JoinTutorial = false;
+				Client()->RequestDDNetInfo();
+				m_Popup = g_Config.m_BrIndicateFinished ? POPUP_POINTS : POPUP_NONE;
+			}
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+
+			Part.VSplitLeft(30.0f, 0, &Part);
+			str_format(aBuf, sizeof(aBuf), "%s\n(%s)",
+				Localize("Show DDNet map finishes in server browser"),
+				Localize("transmits your player name to info.ddnet.org"));
+
+			if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, aBuf, g_Config.m_BrIndicateFinished, &Part))
+				g_Config.m_BrIndicateFinished ^= 1;
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+
+			Part.VSplitLeft(60.0f, 0, &Label);
+			Label.VSplitLeft(100.0f, 0, &TextBox);
+			TextBox.VSplitLeft(20.0f, 0, &TextBox);
+			TextBox.VSplitRight(60.0f, &TextBox, 0);
+			UI()->DoLabel(&Label, Localize("Nickname"), 16.0f, TEXTALIGN_ML);
+			static CLineInput s_PlayerNameInput(g_Config.m_PlayerName, sizeof(g_Config.m_PlayerName));
+			s_PlayerNameInput.SetEmptyText(Client()->PlayerName());
+			UI()->DoEditBox(&s_PlayerNameInput, &TextBox, 12.0f);
+		}
+		else if(m_Popup == POPUP_POINTS)
+		{
+			CUIRect Yes, No;
+
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(80.0f, &Part);
+
+			Part.VSplitMid(&No, &Yes);
+
+			Yes.VMargin(20.0f, &Yes);
+			No.VMargin(20.0f, &No);
+
+			static CButtonContainer s_ButtonNo;
+			if(DoButton_Menu(&s_ButtonNo, Localize("No"), 0, &No) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+				m_Popup = POPUP_FIRST_LAUNCH;
+
+			static CButtonContainer s_ButtonYes;
+			if(DoButton_Menu(&s_ButtonYes, Localize("Yes"), 0, &Yes) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+				m_Popup = POPUP_NONE;
+		}
+		else if(m_Popup == POPUP_WARNING)
+		{
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(120.0f, &Part);
+
+			static CButtonContainer s_Button;
+			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (m_PopupWarningDuration > 0s && time_get_nanoseconds() - m_PopupWarningLastTime >= m_PopupWarningDuration))
+			{
+				m_Popup = POPUP_NONE;
+				SetActive(false);
+			}
+		}
+		else
+		{
+			Box.HSplitBottom(20.f, &Box, &Part);
+			Box.HSplitBottom(24.f, &Box, &Part);
+			Part.VMargin(120.0f, &Part);
+
+			static CButtonContainer s_Button;
+			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
+			{
+				if(m_Popup == POPUP_DISCONNECTED && Client()->ReconnectTime() > 0)
+					Client()->SetReconnectTime(0);
+				m_Popup = POPUP_NONE;
+			}
+		}
+
+		if(m_Popup == POPUP_NONE)
+			UI()->SetActiveItem(nullptr);
+	}
+
+	UI()->RenderPopupMenus();
+
+	// Handle this escape hotkey after popup menus
+	if(!m_ShowStart && Client()->State() == IClient::STATE_OFFLINE && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+	{
+		m_ShowStart = true;
+	}
+
+	return 0;
+}
+
+#if defined(CONF_VIDEORECORDER)
+void CMenus::PopupConfirmDemoReplaceVideo()
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s/%s.demo", m_aCurrentDemoFolder, m_aCurrentDemoSelectionName);
+	char aVideoName[IO_MAX_PATH_LENGTH];
+	str_copy(aVideoName, m_DemoRenderInput.GetString());
+	if(!str_endswith(aVideoName, ".mp4"))
+		str_append(aVideoName, ".mp4");
+	const char *pError = Client()->DemoPlayer_Render(aBuf, m_DemolistStorageType, aVideoName, m_Speed, m_StartPaused);
+	m_Speed = 4;
+	m_StartPaused = false;
+	m_LastPauseChange = -1.0f;
+	m_LastSpeedChange = -1.0f;
+	if(pError)
+	{
+		m_DemoRenderInput.Clear();
+		PopupMessage(Localize("Error loading demo"), pError, Localize("Ok"));
+	}
+}
+#endif
+
+void CMenus::RenderThemeSelection(CUIRect MainView)
+{
+	const std::vector<CTheme> &vThemes = m_pBackground->GetThemes();
+
+	int SelectedTheme = -1;
+	for(int i = 0; i < (int)vThemes.size(); i++)
+	{
+		if(str_comp(vThemes[i].m_Name.c_str(), g_Config.m_ClMenuMap) == 0)
+		{
+			SelectedTheme = i;
+			break;
+		}
+	}
+	const int OldSelected = SelectedTheme;
+
+	static CListBox s_ListBox;
+	s_ListBox.DoHeader(&MainView, Localize("Theme"), 20.0f);
+	s_ListBox.DoStart(20.0f, vThemes.size(), 1, 3, SelectedTheme);
+
+	for(int i = 0; i < (int)vThemes.size(); i++)
+	{
+		const CTheme &Theme = vThemes[i];
+		const CListboxItem Item = s_ListBox.DoNextItem(&Theme.m_Name, i == SelectedTheme);
+
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Icon, Label;
+		Item.m_Rect.VSplitLeft(Item.m_Rect.h * 2.0f, &Icon, &Label);
+
+		// draw icon if it exists
+		if(Theme.m_IconTexture.IsValid())
+		{
+			Icon.VMargin(6.0f, &Icon);
+			Icon.HMargin(3.0f, &Icon);
+			Graphics()->TextureSet(Theme.m_IconTexture);
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			IGraphics::CQuadItem QuadItem(Icon.x, Icon.y, Icon.w, Icon.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		char aName[128];
+		if(Theme.m_Name.empty())
+			str_copy(aName, "(none)");
+		else if(str_comp(Theme.m_Name.c_str(), "auto") == 0)
+			str_copy(aName, "(seasons)");
+		else if(str_comp(Theme.m_Name.c_str(), "rand") == 0)
+			str_copy(aName, "(random)");
+		else if(Theme.m_HasDay && Theme.m_HasNight)
+			str_copy(aName, Theme.m_Name.c_str());
+		else if(Theme.m_HasDay && !Theme.m_HasNight)
+			str_format(aName, sizeof(aName), "%s (day)", Theme.m_Name.c_str());
+		else if(!Theme.m_HasDay && Theme.m_HasNight)
+			str_format(aName, sizeof(aName), "%s (night)", Theme.m_Name.c_str());
+		else // generic
+			str_copy(aName, Theme.m_Name.c_str());
+
+		UI()->DoLabel(&Label, aName, 16.0f * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+	}
+
+	SelectedTheme = s_ListBox.DoEnd();
+
+	if(OldSelected != SelectedTheme)
+	{
+		const CTheme &Theme = vThemes[SelectedTheme];
+		str_copy(g_Config.m_ClMenuMap, Theme.m_Name.c_str());
+		m_pBackground->LoadMenuBackground(Theme.m_HasDay, Theme.m_HasNight);
+	}
+}
+
+void CMenus::SetActive(bool Active)
+{
+	if(Active != m_MenuActive)
+	{
+		UI()->SetHotItem(nullptr);
+		UI()->SetActiveItem(nullptr);
+	}
+	m_MenuActive = Active;
+	if(!m_MenuActive)
+	{
+		if(m_NeedSendinfo)
+		{
+			m_pClient->SendInfo(false);
+			m_NeedSendinfo = false;
+		}
+
+		if(m_NeedSendDummyinfo)
+		{
+			m_pClient->SendDummyInfo(false);
+			m_NeedSendDummyinfo = false;
+		}
+
+		if(Client()->State() == IClient::STATE_ONLINE)
+		{
+			m_pClient->OnRelease();
+		}
+	}
+	else if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		m_pClient->OnRelease();
+	}
+}
+
+void CMenus::OnReset()
+{
+}
+
+void CMenus::OnShutdown()
+{
+	KillServer();
+}
+
+bool CMenus::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
+{
+	if(!m_MenuActive)
+		return false;
+
+	UI()->ConvertMouseMove(&x, &y, CursorType);
+	UI()->OnCursorMove(x, y);
+
+	return true;
+}
+
+bool CMenus::OnInput(const IInput::CEvent &Event)
+{
+	// Escape key is always handled to activate/deactivate menu
+	if((Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE) || IsActive())
+	{
+		UI()->OnInput(Event);
+		return true;
+	}
+	return false;
+}
+
+void CMenus::OnStateChange(int NewState, int OldState)
+{
+	// reset active item
+	UI()->SetActiveItem(nullptr);
+
+	if(OldState == IClient::STATE_ONLINE || OldState == IClient::STATE_OFFLINE)
+		TextRender()->DeleteTextContainer(m_MotdTextContainerIndex);
+
+	if(NewState == IClient::STATE_OFFLINE)
+	{
+		if(OldState >= IClient::STATE_ONLINE && NewState < IClient::STATE_QUITTING)
+			UpdateMusicState();
+		m_Popup = POPUP_NONE;
+		if(Client()->ErrorString() && Client()->ErrorString()[0] != 0)
+		{
+			if(str_find(Client()->ErrorString(), "password"))
+			{
+				m_Popup = POPUP_PASSWORD;
+				m_PasswordInput.SelectAll();
+				UI()->SetActiveItem(&m_PasswordInput);
+			}
+			else
+				m_Popup = POPUP_DISCONNECTED;
+		}
+	}
+	else if(NewState == IClient::STATE_LOADING)
+	{
+		m_Popup = POPUP_CONNECTING;
+		m_DownloadLastCheckTime = time_get();
+		m_DownloadLastCheckSize = 0;
+		m_DownloadSpeed = 0.0f;
+	}
+	else if(NewState == IClient::STATE_CONNECTING)
+	{
+		m_Popup = POPUP_CONNECTING;
+	}
+	else if(NewState == IClient::STATE_ONLINE || NewState == IClient::STATE_DEMOPLAYBACK)
+	{
+		if(m_Popup != POPUP_WARNING)
+		{
+			m_Popup = POPUP_NONE;
+			SetActive(false);
+		}
+	}
+}
+
+void CMenus::OnWindowResize()
+{
+	TextRender()->DeleteTextContainer(m_MotdTextContainerIndex);
+}
+
+void CMenus::OnRender()
+{
+	UI()->StartCheck();
+
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		SetActive(true);
+
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		UI()->MapScreen();
+		RenderDemoPlayer(*UI()->Screen());
+	}
+
+	if(Client()->State() == IClient::STATE_ONLINE && m_pClient->m_ServerMode == CGameClient::SERVERMODE_PUREMOD)
+	{
+		Client()->Disconnect();
+		SetActive(true);
+		PopupMessage(Localize("Disconnected"), Localize("The server is running a non-standard tuning on a pure game type."), Localize("Ok"));
+	}
+
+	if(!IsActive())
+	{
+		if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			SetActive(true);
+		UI()->FinishCheck();
+		UI()->ClearHotkeys();
+		return;
+	}
+
+	UpdateColors();
+
+	UI()->Update();
+
+	Render();
+	RenderTools()->RenderCursor(UI()->MousePos(), 24.0f);
+
+	// render debug information
+	if(g_Config.m_Debug)
+		UI()->DebugRender();
+
+	if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+		SetActive(false);
+
+	UI()->FinishCheck();
+	UI()->ClearHotkeys();
+}
+
+void CMenus::UpdateColors()
+{
+	ms_GuiColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_UiColor, true));
+
+	ms_ColorTabbarInactiveOutgame = ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f);
+	ms_ColorTabbarActiveOutgame = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f);
+	ms_ColorTabbarHoverOutgame = ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f);
+
+	const float ColorIngameScaleI = 0.5f;
+	const float ColorIngameAcaleA = 0.2f;
+
+	ms_ColorTabbarInactiveIngame = ColorRGBA(
+		ms_GuiColor.r * ColorIngameScaleI,
+		ms_GuiColor.g * ColorIngameScaleI,
+		ms_GuiColor.b * ColorIngameScaleI,
+		ms_GuiColor.a * 0.8f);
+
+	ms_ColorTabbarActiveIngame = ColorRGBA(
+		ms_GuiColor.r * ColorIngameAcaleA,
+		ms_GuiColor.g * ColorIngameAcaleA,
+		ms_GuiColor.b * ColorIngameAcaleA,
+		ms_GuiColor.a);
+
+	ms_ColorTabbarHoverIngame = ColorRGBA(1.0f, 1.0f, 1.0f, 0.75f);
+}
+
+void CMenus::RenderBackground()
+{
+	Graphics()->BlendNormal();
+
+	const float ScreenHeight = 300.0f;
+	const float ScreenWidth = ScreenHeight * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, ScreenWidth, ScreenHeight);
+
+	// render background color
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(ms_GuiColor.WithAlpha(1.0f));
+	const IGraphics::CQuadItem BackgroundQuadItem = IGraphics::CQuadItem(0, 0, ScreenWidth, ScreenHeight);
+	Graphics()->QuadsDrawTL(&BackgroundQuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// render the tiles
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.045f);
+	const float Size = 15.0f;
+	const float OffsetTime = std::fmod(LocalTime() * 0.15f, 2.0f);
+	IGraphics::CQuadItem aCheckerItems[64];
+	size_t NumCheckerItems = 0;
+	for(int y = -2; y < (int)(ScreenWidth / Size); y++)
+	{
+		for(int x = -2; x < (int)(ScreenHeight / Size); x++)
+		{
+			aCheckerItems[NumCheckerItems] = IGraphics::CQuadItem((x - OffsetTime) * Size * 2 + (y & 1) * Size, (y + OffsetTime) * Size, Size, Size);
+			NumCheckerItems++;
+			if(NumCheckerItems == std::size(aCheckerItems))
+			{
+				Graphics()->QuadsDrawTL(aCheckerItems, NumCheckerItems);
+				NumCheckerItems = 0;
+			}
+		}
+	}
+	if(NumCheckerItems != 0)
+		Graphics()->QuadsDrawTL(aCheckerItems, NumCheckerItems);
+	Graphics()->QuadsEnd();
+
+	// render border fade
+	Graphics()->TextureSet(m_TextureBlob);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	const IGraphics::CQuadItem BlobQuadItem = IGraphics::CQuadItem(-100, -100, ScreenWidth + 200, ScreenHeight + 200);
+	Graphics()->QuadsDrawTL(&BlobQuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// restore screen
+	UI()->MapScreen();
+}
+
+bool CMenus::CheckHotKey(int Key) const
+{
+	return m_Popup == POPUP_NONE &&
+	       !Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && // no modifier
+	       Input()->KeyIsPressed(Key) && m_pClient->m_GameConsole.IsClosed();
+}
+
+int CMenus::DoButton_CheckBox_Tristate(const void *pID, const char *pText, TRISTATE Checked, const CUIRect *pRect)
+{
+	switch(Checked)
+	{
+	case TRISTATE::NONE:
+		return DoButton_CheckBox_Common(pID, pText, "", pRect);
+	case TRISTATE::SOME:
+		return DoButton_CheckBox_Common(pID, pText, "O", pRect);
+	case TRISTATE::ALL:
+		return DoButton_CheckBox_Common(pID, pText, "X", pRect);
+	default:
+		dbg_assert(false, "invalid tristate");
+	}
+	dbg_break();
+}
+
+int CMenus::MenuImageScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	const char *pExtension = ".png";
+	CMenuImage MenuImage;
+	CMenus *pSelf = static_cast<CMenus *>(pUser);
+	if(IsDir || !str_endswith(pName, pExtension) || str_length(pName) - str_length(pExtension) >= (int)sizeof(MenuImage.m_aName))
+		return 0;
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	str_format(aPath, sizeof(aPath), "menuimages/%s", pName);
+
+	CImageInfo Info;
+	if(!pSelf->Graphics()->LoadPNG(&Info, aPath, DirType))
+	{
+		char aError[IO_MAX_PATH_LENGTH + 64];
+		str_format(aError, sizeof(aError), "Failed to load menu image from '%s'", aPath);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus", aError);
+		return 0;
+	}
+	if(Info.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		pSelf->Graphics()->FreePNG(&Info);
+		char aError[IO_MAX_PATH_LENGTH + 64];
+		str_format(aError, sizeof(aError), "Failed to load menu image from '%s': must be an RGBA image", aPath);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus", aError);
+		return 0;
+	}
+
+	MenuImage.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+
+	// create gray scale version
+	unsigned char *pData = static_cast<unsigned char *>(Info.m_pData);
+	const size_t Step = Info.PixelSize();
+	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
+	{
+		int v = (pData[i * Step] + pData[i * Step + 1] + pData[i * Step + 2]) / 3;
+		pData[i * Step] = v;
+		pData[i * Step + 1] = v;
+		pData[i * Step + 2] = v;
+	}
+	MenuImage.m_GreyTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+	pSelf->Graphics()->FreePNG(&Info);
+
+	str_truncate(MenuImage.m_aName, sizeof(MenuImage.m_aName), pName, str_length(pName) - str_length(pExtension));
+	pSelf->m_vMenuImages.push_back(MenuImage);
+
+	pSelf->RenderLoading(Localize("Loading StormA Client"), Localize("Loading menu images"), 1);
+
+	return 0;
+}
+
+const CMenus::CMenuImage *CMenus::FindMenuImage(const char *pName)
+{
+	for(auto &Image : m_vMenuImages)
+		if(str_comp(Image.m_aName, pName) == 0)
+			return &Image;
+	return nullptr;
+}
+
+void CMenus::SetMenuPage(int NewPage)
+{
+	if(NewPage == PAGE_DDNET_LEGACY || NewPage == PAGE_KOG_LEGACY)
+		NewPage = PAGE_INTERNET;
+
+	m_MenuPage = NewPage;
+	if(NewPage >= PAGE_INTERNET && NewPage <= PAGE_FAVORITES)
+		g_Config.m_UiPage = NewPage;
+}
+
+void CMenus::RefreshBrowserTab(int UiPage)
+{
+	if(UiPage == PAGE_INTERNET)
+	{
+		Client()->RequestDDNetInfo();
+		ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+	}
+	else if(UiPage == PAGE_LAN)
+	{
+		ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
+	}
+	else if(UiPage == PAGE_FAVORITES)
+	{
+		Client()->RequestDDNetInfo();
+		ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+	}
+}
diff --git a/src_bkp/game/client/components/menus.h b/src_bkp/game/client/components/menus.h
new file mode 100644
index 0000000000..98eeeb4e06
--- /dev/null
+++ b/src_bkp/game/client/components/menus.h
@@ -0,0 +1,781 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_MENUS_H
+#define GAME_CLIENT_COMPONENTS_MENUS_H
+
+#include <base/types.h>
+#include <base/vmath.h>
+
+#include <chrono>
+#include <deque>
+#include <unordered_set>
+#include <vector>
+
+#include <engine/console.h>
+#include <engine/demo.h>
+#include <engine/friends.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/shared/http.h>
+#include <engine/shared/linereader.h>
+#include <engine/textrender.h>
+
+#include <game/client/component.h>
+#include <game/client/components/mapimages.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/voting.h>
+
+struct CServerProcess
+{
+	PROCESS m_Process;
+};
+
+// component to fetch keypresses, override all other input
+class CMenusKeyBinder : public CComponent
+{
+public:
+	bool m_TakeKey;
+	bool m_GotKey;
+	IInput::CEvent m_Key;
+	int m_ModifierCombination;
+	CMenusKeyBinder();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+};
+
+class CMenus : public CComponent
+{
+	static ColorRGBA ms_GuiColor;
+	static ColorRGBA ms_ColorTabbarInactiveOutgame;
+	static ColorRGBA ms_ColorTabbarActiveOutgame;
+	static ColorRGBA ms_ColorTabbarHoverOutgame;
+	static ColorRGBA ms_ColorTabbarInactiveIngame;
+	static ColorRGBA ms_ColorTabbarActiveIngame;
+	static ColorRGBA ms_ColorTabbarHoverIngame;
+	static ColorRGBA ms_ColorTabbarInactive;
+	static ColorRGBA ms_ColorTabbarActive;
+	static ColorRGBA ms_ColorTabbarHover;
+
+	int DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners = IGraphics::CORNER_ALL, bool Enabled = true);
+	int DoButton_Toggle(const void *pID, int Checked, const CUIRect *pRect, bool Active);
+	int DoButton_Menu(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, const char *pImageName = nullptr, int Corners = IGraphics::CORNER_ALL, float Rounding = 5.0f, float FontFactor = 0.0f, ColorRGBA Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
+	int DoButton_MenuTab(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator = nullptr, const ColorRGBA *pDefaultColor = nullptr, const ColorRGBA *pActiveColor = nullptr, const ColorRGBA *pHoverColor = nullptr, float EdgeRounding = 10);
+
+	int DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect);
+	int DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
+	int DoButton_CheckBoxAutoVMarginAndSet(const void *pID, const char *pText, int *pValue, CUIRect *pRect, float VMargin);
+	int DoButton_CheckBox_Number(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
+
+	ColorHSLA DoLine_ColorPicker(CButtonContainer *pResetID, float LineSize, float LabelSize, float BottomMargin, CUIRect *pMainRect, const char *pText, unsigned int *pColorValue, ColorRGBA DefaultColor, bool CheckBoxSpacing = true, int *pCheckBoxValue = nullptr, bool Alpha = false);
+	ColorHSLA DoButton_ColorPicker(const CUIRect *pRect, unsigned int *pHslaColor, bool Alpha);
+	void DoLaserPreview(const CUIRect *pRect, ColorHSLA OutlineColor, ColorHSLA InnerColor, const int LaserType);
+	int DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
+
+	int DoKeyReader(const void *pID, const CUIRect *pRect, int Key, int ModifierCombination, int *pNewModifierCombination);
+
+	void DoSettingsControlsButtons(int Start, int Stop, CUIRect View);
+
+	float RenderSettingsControlsJoystick(CUIRect View);
+	void DoJoystickAxisPicker(CUIRect View);
+	void DoJoystickBar(const CUIRect *pRect, float Current, float Tolerance, bool Active);
+
+	void RefreshSkins();
+
+	void RandomSkin();
+
+	// menus_settings_assets.cpp
+public:
+	struct SCustomItem
+	{
+		IGraphics::CTextureHandle m_RenderTexture;
+
+		char m_aName[50];
+
+		bool operator<(const SCustomItem &Other) const { return str_comp(m_aName, Other.m_aName) < 0; }
+	};
+
+	struct SCustomEntities : public SCustomItem
+	{
+		struct SEntitiesImage
+		{
+			IGraphics::CTextureHandle m_Texture;
+		};
+		SEntitiesImage m_aImages[MAP_IMAGE_MOD_TYPE_COUNT];
+	};
+
+	struct SCustomGame : public SCustomItem
+	{
+	};
+
+	struct SCustomEmoticon : public SCustomItem
+	{
+	};
+
+	struct SCustomParticle : public SCustomItem
+	{
+	};
+
+	struct SCustomHud : public SCustomItem
+	{
+	};
+
+	struct SCustomExtras : public SCustomItem
+	{
+	};
+
+protected:
+	std::vector<SCustomEntities> m_vEntitiesList;
+	std::vector<SCustomGame> m_vGameList;
+	std::vector<SCustomEmoticon> m_vEmoticonList;
+	std::vector<SCustomParticle> m_vParticlesList;
+	std::vector<SCustomHud> m_vHudList;
+	std::vector<SCustomExtras> m_vExtrasList;
+
+	bool m_IsInit = false;
+
+	static void LoadEntities(struct SCustomEntities *pEntitiesItem, void *pUser);
+	static int EntitiesScan(const char *pName, int IsDir, int DirType, void *pUser);
+
+	static int GameScan(const char *pName, int IsDir, int DirType, void *pUser);
+	static int EmoticonsScan(const char *pName, int IsDir, int DirType, void *pUser);
+	static int ParticlesScan(const char *pName, int IsDir, int DirType, void *pUser);
+	static int HudScan(const char *pName, int IsDir, int DirType, void *pUser);
+	static int ExtrasScan(const char *pName, int IsDir, int DirType, void *pUser);
+
+	static void ConchainAssetsEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAssetGame(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAssetParticles(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAssetEmoticons(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAssetHud(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainAssetExtras(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	void ClearCustomItems(int CurTab);
+
+	int m_MenuPage;
+	int m_GamePage;
+	int m_Popup;
+	int m_ActivePage;
+	bool m_ShowStart;
+	bool m_MenuActive;
+	bool m_JoinTutorial;
+
+	char m_aNextServer[256];
+
+	// images
+	struct CMenuImage
+	{
+		char m_aName[64];
+		IGraphics::CTextureHandle m_OrgTexture;
+		IGraphics::CTextureHandle m_GreyTexture;
+	};
+	std::vector<CMenuImage> m_vMenuImages;
+	static int MenuImageScan(const char *pName, int IsDir, int DirType, void *pUser);
+	const CMenuImage *FindMenuImage(const char *pName);
+
+	// loading
+	int m_LoadCurrent;
+	int m_LoadTotal;
+
+	//
+	char m_aMessageTopic[512];
+	char m_aMessageBody[512];
+	char m_aMessageButton[512];
+
+	CUIElement m_RefreshButton;
+	CUIElement m_ConnectButton;
+
+	// generic popups
+	typedef void (CMenus::*FPopupButtonCallback)();
+	void DefaultButtonCallback()
+	{
+		// do nothing
+	}
+	enum
+	{
+		BUTTON_CONFIRM = 0, // confirm / yes / close / ok
+		BUTTON_CANCEL, // cancel / no
+		NUM_BUTTONS
+	};
+	char m_aPopupTitle[128];
+	char m_aPopupMessage[IO_MAX_PATH_LENGTH + 256];
+	struct
+	{
+		char m_aLabel[64];
+		int m_NextPopup;
+		FPopupButtonCallback m_pfnCallback;
+	} m_aPopupButtons[NUM_BUTTONS];
+
+	void PopupMessage(const char *pTitle, const char *pMessage,
+		const char *pButtonLabel, int NextPopup = POPUP_NONE, FPopupButtonCallback pfnButtonCallback = &CMenus::DefaultButtonCallback);
+	void PopupConfirm(const char *pTitle, const char *pMessage,
+		const char *pConfirmButtonLabel, const char *pCancelButtonLabel,
+		FPopupButtonCallback pfnConfirmButtonCallback = &CMenus::DefaultButtonCallback, int ConfirmNextPopup = POPUP_NONE,
+		FPopupButtonCallback pfnCancelButtonCallback = &CMenus::DefaultButtonCallback, int CancelNextPopup = POPUP_NONE);
+
+	// some settings
+	static float ms_ButtonHeight;
+	static float ms_ListheaderHeight;
+	static float ms_ListitemAdditionalHeight;
+
+	// for settings
+	bool m_NeedRestartGeneral;
+	bool m_NeedRestartSkins;
+	bool m_NeedRestartGraphics;
+	bool m_NeedRestartSound;
+	bool m_NeedRestartUpdate;
+	bool m_NeedRestartDDNet;
+	bool m_NeedSendinfo;
+	bool m_NeedSendDummyinfo;
+	int m_SettingPlayerPage;
+
+	// for map download popup
+	int64_t m_DownloadLastCheckTime;
+	int m_DownloadLastCheckSize;
+	float m_DownloadSpeed;
+
+	// for password popup
+	CLineInput m_PasswordInput;
+
+	// for call vote
+	int m_CallvoteSelectedOption;
+	int m_CallvoteSelectedPlayer;
+	CLineInputBuffered<VOTE_REASON_LENGTH> m_CallvoteReasonInput;
+	CLineInputBuffered<64> m_FilterInput;
+	bool m_ControlPageOpening;
+
+	// for stats
+	CLineInputBuffered<MAX_NAME_LENGTH> m_StatsPlayerInput;
+	// demo
+	enum
+	{
+		SORT_DEMONAME = 0,
+		SORT_LENGTH,
+		SORT_DATE,
+	};
+
+	struct CDemoItem
+	{
+		char m_aFilename[IO_MAX_PATH_LENGTH];
+		char m_aName[IO_MAX_PATH_LENGTH];
+		bool m_IsDir;
+		bool m_IsLink;
+		int m_StorageType;
+		time_t m_Date;
+
+		bool m_InfosLoaded;
+		bool m_Valid;
+		CDemoHeader m_Info;
+		CTimelineMarkers m_TimelineMarkers;
+		CMapInfo m_MapInfo;
+
+		int NumMarkers() const
+		{
+			return clamp<int>(bytes_be_to_uint(m_TimelineMarkers.m_aNumTimelineMarkers), 0, MAX_TIMELINE_MARKERS);
+		}
+
+		int Length() const
+		{
+			return bytes_be_to_uint(m_Info.m_aLength);
+		}
+
+		unsigned Size() const
+		{
+			return bytes_be_to_uint(m_Info.m_aMapSize);
+		}
+
+		bool operator<(const CDemoItem &Other) const
+		{
+			if(!str_comp(m_aFilename, ".."))
+				return true;
+			if(!str_comp(Other.m_aFilename, ".."))
+				return false;
+			if(m_IsDir && !Other.m_IsDir)
+				return true;
+			if(!m_IsDir && Other.m_IsDir)
+				return false;
+
+			const CDemoItem &Left = g_Config.m_BrDemoSortOrder ? Other : *this;
+			const CDemoItem &Right = g_Config.m_BrDemoSortOrder ? *this : Other;
+
+			if(g_Config.m_BrDemoSort == SORT_DEMONAME)
+				return str_comp_filenames(Left.m_aFilename, Right.m_aFilename) < 0;
+			if(g_Config.m_BrDemoSort == SORT_DATE)
+				return Left.m_Date < Right.m_Date;
+
+			if(!Other.m_InfosLoaded)
+				return m_InfosLoaded;
+			if(!m_InfosLoaded)
+				return !Other.m_InfosLoaded;
+
+			if(g_Config.m_BrDemoSort == SORT_LENGTH)
+				return Left.Length() < Right.Length();
+
+			// Unknown sort
+			return true;
+		}
+	};
+
+	char m_aCurrentDemoFolder[IO_MAX_PATH_LENGTH];
+	char m_aCurrentDemoSelectionName[IO_MAX_PATH_LENGTH];
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_DemoRenameInput;
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_DemoSliceInput;
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_DemoSearchInput;
+#if defined(CONF_VIDEORECORDER)
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_DemoRenderInput;
+#endif
+	int m_DemolistSelectedIndex;
+	bool m_DemolistSelectedReveal = false;
+	int m_DemolistStorageType;
+	bool m_DemolistMultipleStorages = false;
+	int m_Speed = 4;
+	bool m_StartPaused = false;
+
+	std::chrono::nanoseconds m_DemoPopulateStartTime{0};
+
+	void DemolistOnUpdate(bool Reset);
+	static int DemolistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser);
+
+	// friends
+	class CFriendItem
+	{
+		char m_aName[MAX_NAME_LENGTH];
+		char m_aClan[MAX_CLAN_LENGTH];
+		const CServerInfo *m_pServerInfo;
+		int m_FriendState;
+		bool m_IsPlayer;
+		bool m_IsAfk;
+		// skin
+		char m_aSkin[24 + 1];
+		bool m_CustomSkinColors;
+		int m_CustomSkinColorBody;
+		int m_CustomSkinColorFeet;
+
+	public:
+		CFriendItem() {}
+		CFriendItem(const CFriendInfo *pFriendInfo) :
+			m_pServerInfo(nullptr),
+			m_IsPlayer(false),
+			m_IsAfk(false),
+			m_CustomSkinColors(false),
+			m_CustomSkinColorBody(0),
+			m_CustomSkinColorFeet(0)
+		{
+			str_copy(m_aName, pFriendInfo->m_aName);
+			str_copy(m_aClan, pFriendInfo->m_aClan);
+			m_FriendState = m_aName[0] == '\0' ? IFriends::FRIEND_CLAN : IFriends::FRIEND_PLAYER;
+			m_aSkin[0] = '\0';
+		}
+		CFriendItem(const CServerInfo::CClient &CurrentClient, const CServerInfo *pServerInfo) :
+			m_pServerInfo(pServerInfo),
+			m_FriendState(CurrentClient.m_FriendState),
+			m_IsPlayer(CurrentClient.m_Player),
+			m_IsAfk(CurrentClient.m_Afk),
+			m_CustomSkinColors(CurrentClient.m_CustomSkinColors),
+			m_CustomSkinColorBody(CurrentClient.m_CustomSkinColorBody),
+			m_CustomSkinColorFeet(CurrentClient.m_CustomSkinColorFeet)
+		{
+			str_copy(m_aName, CurrentClient.m_aName);
+			str_copy(m_aClan, CurrentClient.m_aClan);
+			str_copy(m_aSkin, CurrentClient.m_aSkin);
+		}
+
+		const char *Name() const { return m_aName; }
+		const char *Clan() const { return m_aClan; }
+		const CServerInfo *ServerInfo() const { return m_pServerInfo; }
+		int FriendState() const { return m_FriendState; }
+		bool IsPlayer() const { return m_IsPlayer; }
+		bool IsAfk() const { return m_IsAfk; }
+		const char *Skin() const { return m_aSkin; }
+		bool CustomSkinColors() const { return m_CustomSkinColors; }
+		int CustomSkinColorBody() const { return m_CustomSkinColorBody; }
+		int CustomSkinColorFeet() const { return m_CustomSkinColorFeet; }
+
+		const void *ListItemId() const { return &m_aName; }
+		const void *RemoveButtonId() const { return &m_FriendState; }
+		const void *CommunityTooltipId() const { return &m_IsPlayer; }
+
+		bool operator<(const CFriendItem &Other) const
+		{
+			const int Result = str_comp(m_aName, Other.m_aName);
+			return Result < 0 || (Result == 0 && str_comp(m_aClan, Other.m_aClan) < 0);
+		}
+	};
+
+	enum
+	{
+		FRIEND_PLAYER_ON = 0,
+		FRIEND_CLAN_ON,
+		FRIEND_OFF,
+		NUM_FRIEND_TYPES
+	};
+	std::vector<CFriendItem> m_avFriends[NUM_FRIEND_TYPES];
+	const CFriendItem *m_pRemoveFriend = nullptr;
+
+	// found in menus.cpp
+	int Render();
+#if defined(CONF_VIDEORECORDER)
+	void PopupConfirmDemoReplaceVideo();
+#endif
+	int RenderMenubar(CUIRect r);
+	void RenderNews(CUIRect MainView);
+	static void ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	void UpdateMusicState();
+
+	// found in menus_demo.cpp
+	vec2 m_DemoControlsPositionOffset = vec2(0.0f, 0.0f);
+	float m_LastPauseChange = -1.0f;
+	float m_LastSpeedChange = -1.0f;
+	static bool DemoFilterChat(const void *pData, int Size, void *pUser);
+	bool FetchHeader(CDemoItem &Item);
+	void FetchAllHeaders();
+	void HandleDemoSeeking(float PositionToSeek, float TimeToSeek);
+	void RenderDemoPlayer(CUIRect MainView);
+	void RenderDemoPlayerSliceSavePopup(CUIRect MainView);
+	bool m_DemoBrowserListInitialized = false;
+	void RenderDemoBrowser(CUIRect MainView);
+	void RenderDemoBrowserList(CUIRect ListView, bool &WasListboxItemActivated);
+	void RenderDemoBrowserDetails(CUIRect DetailsView);
+	void RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemActivated);
+	void PopupConfirmDeleteDemo();
+	void PopupConfirmDeleteFolder();
+
+	// found in menus_start.cpp
+	void RenderStartMenu(CUIRect MainView);
+
+	// found in menus_ingame.cpp
+	STextContainerIndex m_MotdTextContainerIndex;
+	void RenderGame(CUIRect MainView);
+	void PopupConfirmDisconnect();
+	void PopupConfirmDisconnectDummy();
+	void RenderPlayers(CUIRect MainView);
+	void RenderServerInfo(CUIRect MainView);
+	void RenderServerInfoMotd(CUIRect Motd);
+	void RenderServerControl(CUIRect MainView);
+	void RenderStats(CUIRect MainView);
+	bool RenderServerControlKick(CUIRect MainView, bool FilterSpectators);
+	bool RenderServerControlServer(CUIRect MainView);
+	void RenderIngameHint();
+
+	// found in menus_browser.cpp
+	int m_SelectedIndex;
+	bool m_ServerBrowserShouldRevealSelection;
+	std::vector<CUIElement *> m_avpServerBrowserUiElements[IServerBrowser::NUM_TYPES];
+	void RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemActivated);
+	void RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItemActivated);
+	void Connect(const char *pAddress);
+	void PopupConfirmSwitchServer();
+	void RenderServerbrowserFilters(CUIRect View);
+	void RenderServerbrowserDDNetFilter(CUIRect View,
+		IFilterList &Filter,
+		float ItemHeight, int MaxItems, int ItemsPerRow,
+		CScrollRegion &ScrollRegion, std::vector<unsigned char> &vItemIds,
+		bool UpdateCommunityCacheOnChange,
+		const std::function<const char *(int ItemIndex)> &GetItemName,
+		const std::function<void(int ItemIndex, CUIRect Item, const void *pItemId, bool Active)> &RenderItem);
+	void RenderServerbrowserCommunitiesFilter(CUIRect View);
+	void RenderServerbrowserCountriesFilter(CUIRect View);
+	void RenderServerbrowserTypesFilter(CUIRect View);
+	struct SPopupCountrySelectionContext
+	{
+		CMenus *m_pMenus;
+		int m_Selection;
+		bool m_New;
+	};
+	static CUI::EPopupMenuFunctionResult PopupCountrySelection(void *pContext, CUIRect View, bool Active);
+	void RenderServerbrowserInfo(CUIRect View);
+	void RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *pSelectedServer);
+	void RenderServerbrowserFriends(CUIRect View);
+	void FriendlistOnUpdate();
+	void PopupConfirmRemoveFriend();
+	void RenderServerbrowserTabBar(CUIRect TabBar);
+	void RenderServerbrowserToolBox(CUIRect ToolBox);
+	void RenderServerbrowser(CUIRect MainView);
+	template<typename F>
+	bool PrintHighlighted(const char *pName, F &&PrintFn);
+	CTeeRenderInfo GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const;
+	static void ConchainFriendlistUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainFavoritesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainCommunitiesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	struct SCommunityCache
+	{
+		int64_t m_UpdateTime = 0;
+		bool m_PageWithCommunities;
+		std::vector<const CCommunity *> m_vpSelectedCommunities;
+		std::vector<const CCommunityCountry *> m_vpSelectableCountries;
+		std::vector<const CCommunityType *> m_vpSelectableTypes;
+		bool m_AnyRanksAvailable;
+	};
+	SCommunityCache m_CommunityCache;
+	void UpdateCommunityCache(bool Force);
+
+	// community icons
+	class CAbstractCommunityIconJob
+	{
+	protected:
+		CMenus *m_pMenus;
+		char m_aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+		char m_aPath[IO_MAX_PATH_LENGTH];
+		int m_StorageType;
+		bool m_Success = false;
+		CImageInfo m_ImageInfo;
+		SHA256_DIGEST m_Sha256;
+
+		CAbstractCommunityIconJob(CMenus *pMenus, const char *pCommunityId, int StorageType);
+		virtual ~CAbstractCommunityIconJob();
+
+	public:
+		const char *CommunityId() const { return m_aCommunityId; }
+		bool Success() const { return m_Success; }
+		CImageInfo &&ImageInfo() { return std::move(m_ImageInfo); }
+		SHA256_DIGEST &&Sha256() { return std::move(m_Sha256); }
+	};
+	class CCommunityIconLoadJob : public IJob, public CAbstractCommunityIconJob
+	{
+	protected:
+		void Run() override;
+
+	public:
+		CCommunityIconLoadJob(CMenus *pMenus, const char *pCommunityId, int StorageType);
+	};
+	class CCommunityIconDownloadJob : public CHttpRequest, public CAbstractCommunityIconJob
+	{
+	protected:
+		int OnCompletion(int State) override;
+
+	public:
+		CCommunityIconDownloadJob(CMenus *pMenus, const char *pCommunityId, const char *pUrl, const SHA256_DIGEST &Sha256);
+	};
+	struct SCommunityIcon
+	{
+		char m_aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+		SHA256_DIGEST m_Sha256;
+		IGraphics::CTextureHandle m_OrgTexture;
+		IGraphics::CTextureHandle m_GreyTexture;
+	};
+	std::vector<SCommunityIcon> m_vCommunityIcons;
+	std::deque<std::shared_ptr<CCommunityIconLoadJob>> m_CommunityIconLoadJobs;
+	std::deque<std::shared_ptr<CCommunityIconDownloadJob>> m_CommunityIconDownloadJobs;
+	int64_t m_CommunityIconsUpdateTime = 0;
+	static int CommunityIconScan(const char *pName, int IsDir, int DirType, void *pUser);
+	const SCommunityIcon *FindCommunityIcon(const char *pCommunityId);
+	bool LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &Info, SHA256_DIGEST &Sha256);
+	void LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &&Info, SHA256_DIGEST &&Sha256);
+	void RenderCommunityIcon(const SCommunityIcon *pIcon, CUIRect Rect, bool Active);
+	void UpdateCommunityIcons();
+
+	// skin favorite list
+	bool m_SkinFavoritesChanged = false;
+	std::unordered_set<std::string> m_SkinFavorites;
+	static void Con_AddFavoriteSkin(IConsole::IResult *pResult, void *pUserData);
+	static void Con_RemFavoriteSkin(IConsole::IResult *pResult, void *pUserData);
+	static void ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData);
+	void OnConfigSave(IConfigManager *pConfigManager);
+
+	// found in menus_settings.cpp
+	bool RenderLanguageSelection(CUIRect MainView);
+	void RenderThemeSelection(CUIRect MainView);
+	void RenderSettingsGeneral(CUIRect MainView);
+	int RenderSettingsPlayer(CUIRect MainView);
+	void RenderSettingsDummyPlayer(CUIRect MainView);
+	void RenderSettingsTee(CUIRect MainView);
+	void RenderSettingsControls(CUIRect MainView);
+	void ResetSettingsControls();
+	void RenderSettingsGraphics(CUIRect MainView);
+	void RenderSettingsSound(CUIRect MainView);
+	void RenderSettings(CUIRect MainView);
+	void RenderSettingsCustom(CUIRect MainView);
+
+	void SetNeedSendInfo();
+	void SetActive(bool Active);
+	void UpdateColors();
+
+	IGraphics::CTextureHandle m_TextureBlob;
+
+	bool CheckHotKey(int Key) const;
+
+	class CMenuBackground *m_pBackground;
+
+public:
+	void RenderBackground();
+
+	void SetMenuBackground(class CMenuBackground *pBackground) { m_pBackground = pBackground; }
+
+	static CMenusKeyBinder m_Binder;
+
+	CMenus();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void RenderLoading(const char *pCaption, const char *pContent, int IncreaseCounter, bool RenderLoadingBar = true, bool RenderMenuBackgroundMap = true);
+
+	bool IsInit() { return m_IsInit; }
+
+	bool IsActive() const { return m_MenuActive; }
+	void KillServer();
+
+	virtual void OnInit() override;
+	void OnConsoleInit() override;
+
+	virtual void OnStateChange(int NewState, int OldState) override;
+	virtual void OnWindowResize() override;
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+	virtual void OnShutdown() override;
+
+	enum
+	{
+		PAGE_NEWS = 1,
+		PAGE_GAME,
+		PAGE_PLAYERS,
+		PAGE_SERVER_INFO,
+		PAGE_STATS,
+		PAGE_CALLVOTE,
+		PAGE_INTERNET,
+		PAGE_LAN,
+		PAGE_FAVORITES,
+		PAGE_DDNET_LEGACY, // removed, redirects to PAGE_INTERNET
+		PAGE_KOG_LEGACY, // removed, redirects to PAGE_INTERNET //fuckers ;c
+		PAGE_DEMOS,
+		PAGE_SETTINGS,
+		PAGE_SYSTEM,
+		PAGE_NETWORK,
+		PAGE_GHOST,
+
+		PAGE_LENGTH,
+
+		SETTINGS_LANGUAGE = 0,
+		SETTINGS_GENERAL,
+		SETTINGS_PLAYER,
+		SETTINGS_TEE,
+		SETTINGS_APPEARANCE,
+		SETTINGS_CONTROLS,
+		SETTINGS_GRAPHICS,
+		SETTINGS_SOUND,
+		SETTINGS_DDNET,
+		SETTINGS_ASSETS,
+		SETTINGS_STA,
+		SETTINGS_PROFILES,
+
+		SETTINGS_LENGTH,
+
+		BIG_TAB_NEWS = 0,
+		BIG_TAB_INTERNET,
+		BIG_TAB_LAN,
+		BIG_TAB_FAVORITES,
+		BIG_TAB_STATS,
+		BIG_TAB_DEMOS,
+
+		BIG_TAB_LENGTH,
+
+		SMALL_TAB_HOME = 0,
+		SMALL_TAB_QUIT,
+		SMALL_TAB_SETTINGS,
+		SMALL_TAB_EDITOR,
+		SMALL_TAB_DEMOBUTTON,
+		SMALL_TAB_SERVER,
+		SMALL_TAB_BROWSER_FILTER,
+		SMALL_TAB_BROWSER_INFO,
+		SMALL_TAB_BROWSER_FRIENDS,
+
+		SMALL_TAB_LENGTH,
+	};
+
+	SUIAnimator m_aAnimatorsBigPage[BIG_TAB_LENGTH];
+	SUIAnimator m_aAnimatorsSmallPage[SMALL_TAB_LENGTH];
+	SUIAnimator m_aAnimatorsSettingsTab[SETTINGS_LENGTH];
+
+	// DDRace
+	int DoButton_CheckBox_Tristate(const void *pID, const char *pText, TRISTATE Checked, const CUIRect *pRect);
+	std::vector<CDemoItem> m_vDemos;
+	std::vector<CDemoItem *> m_vpFilteredDemos;
+	void DemolistPopulate();
+	void RefreshFilteredDemos();
+	void DemoSeekTick(IDemoPlayer::ETickOffset TickOffset);
+	bool m_Dummy;
+
+	const char *GetCurrentDemoFolder() const { return m_aCurrentDemoFolder; }
+
+	// Ghost
+	struct CGhostItem
+	{
+		char m_aFilename[IO_MAX_PATH_LENGTH];
+		char m_aPlayer[MAX_NAME_LENGTH];
+
+		bool m_Failed;
+		int m_Time;
+		int m_Slot;
+		bool m_Own;
+		time_t m_Date;
+
+		CGhostItem() :
+			m_Slot(-1), m_Own(false) { m_aFilename[0] = 0; }
+
+		bool operator<(const CGhostItem &Other) const { return m_Time < Other.m_Time; }
+
+		bool Active() const { return m_Slot != -1; }
+		bool HasFile() const { return m_aFilename[0]; }
+	};
+
+	std::vector<CGhostItem> m_vGhosts;
+
+	std::chrono::nanoseconds m_GhostPopulateStartTime{0};
+
+	void GhostlistPopulate();
+	CGhostItem *GetOwnGhost();
+	void UpdateOwnGhost(CGhostItem Item);
+	void DeleteGhostItem(int Index);
+
+	int GetCurPopup() const { return m_Popup; }
+	bool CanDisplayWarning() const;
+
+	void PopupWarning(const char *pTopic, const char *pBody, const char *pButton, std::chrono::nanoseconds Duration);
+
+	std::chrono::nanoseconds m_PopupWarningLastTime;
+	std::chrono::nanoseconds m_PopupWarningDuration;
+
+	int m_DemoPlayerState;
+
+	enum
+	{
+		POPUP_NONE = 0,
+		POPUP_MESSAGE, // generic message popup (one button)
+		POPUP_CONFIRM, // generic confirmation popup (two buttons)
+		POPUP_FIRST_LAUNCH,
+		POPUP_POINTS,
+		POPUP_CONNECTING,
+		POPUP_DISCONNECTED,
+		POPUP_LANGUAGE,
+		POPUP_RENAME_DEMO,
+		POPUP_RENDER_DEMO,
+		POPUP_RENDER_DONE,
+		POPUP_PASSWORD,
+		POPUP_QUIT,
+		POPUP_WARNING,
+
+		// demo player states
+		DEMOPLAYER_NONE = 0,
+		DEMOPLAYER_SLICE_SAVE,
+	};
+
+private:
+	static int GhostlistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser);
+	void SetMenuPage(int NewPage);
+	void RefreshBrowserTab(int UiPage);
+
+	// found in menus_ingame.cpp
+	void RenderInGameNetwork(CUIRect MainView);
+	void RenderGhost(CUIRect MainView);
+
+	// found in menus_settings.cpp
+	void RenderSettingsProfiles(CUIRect MainView);
+	void RenderSettingsDDNet(CUIRect MainView);
+	void RenderSettingsAppearance(CUIRect MainView);
+	void RenderSettingsStA(CUIRect MainView);
+	ColorHSLA RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha = false, bool ClampedLight = false);
+
+	CServerProcess m_ServerProcess;
+	void RotateLabel(CUIRect rect, void *pVoid, const char *str, float d, ETextAlignment alignment, SLabelProperties properties, int i, void *pVoid1, float d1);
+};
+#endif
diff --git a/src_bkp/game/client/components/menus_browser.cpp b/src_bkp/game/client/components/menus_browser.cpp
new file mode 100644
index 0000000000..34d0250a11
--- /dev/null
+++ b/src_bkp/game/client/components/menus_browser.cpp
@@ -0,0 +1,2014 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/log.h>
+
+#include <engine/engine.h>
+#include <engine/favorites.h>
+#include <engine/friends.h>
+#include <engine/keys.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/shared/localization.h>
+#include <engine/textrender.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/countryflags.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/localization.h>
+
+#include "menus.h"
+
+using namespace FontIcons;
+
+static const ColorRGBA gs_HighlightedTextColor = ColorRGBA(0.4f, 0.4f, 1.0f, 1.0f);
+
+template<size_t N>
+static void FormatServerbrowserPing(char (&aBuffer)[N], const CServerInfo *pInfo)
+{
+	if(!pInfo->m_LatencyIsEstimated)
+	{
+		str_from_int(pInfo->m_Latency, aBuffer);
+		return;
+	}
+	static const char *LOCATION_NAMES[CServerInfo::NUM_LOCS] = {
+		"", // LOC_UNKNOWN
+		Localizable("AFR"), // LOC_AFRICA
+		Localizable("ASI"), // LOC_ASIA
+		Localizable("AUS"), // LOC_AUSTRALIA
+		Localizable("EUR"), // LOC_EUROPE
+		Localizable("NA"), // LOC_NORTH_AMERICA
+		Localizable("SA"), // LOC_SOUTH_AMERICA
+		Localizable("CHN"), // LOC_CHINA
+	};
+	dbg_assert(0 <= pInfo->m_Location && pInfo->m_Location < CServerInfo::NUM_LOCS, "location out of range");
+	str_copy(aBuffer, Localize(LOCATION_NAMES[pInfo->m_Location]));
+}
+
+static ColorRGBA GetPingTextColor(int Latency)
+{
+	return color_cast<ColorRGBA>(ColorHSLA((300.0f - clamp(Latency, 0, 300)) / 1000.0f, 1.0f, 0.5f));
+}
+
+static ColorRGBA GetGametypeTextColor(const char *pGametype)
+{
+	ColorHSLA HslaColor;
+	if(str_comp(pGametype, "DM") == 0 || str_comp(pGametype, "TDM") == 0 || str_comp(pGametype, "CTF") == 0)
+		HslaColor = ColorHSLA(0.33f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "catch"))
+		HslaColor = ColorHSLA(0.17f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "idm") || str_find_nocase(pGametype, "itdm") || str_find_nocase(pGametype, "ictf") || str_find_nocase(pGametype, "f-ddrace"))
+		HslaColor = ColorHSLA(0.0f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "fng"))
+		HslaColor = ColorHSLA(0.83f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "gores"))
+		HslaColor = ColorHSLA(0.525f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "BW"))
+		HslaColor = ColorHSLA(0.05f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "ddracenet") || str_find_nocase(pGametype, "ddnet") || str_find_nocase(pGametype, "0xf"))
+		HslaColor = ColorHSLA(0.58f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "ddrace") || str_find_nocase(pGametype, "mkrace"))
+		HslaColor = ColorHSLA(0.75f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "race") || str_find_nocase(pGametype, "fastcap"))
+		HslaColor = ColorHSLA(0.46f, 1.0f, 0.75f);
+	else if(str_find_nocase(pGametype, "s-ddr"))
+		HslaColor = ColorHSLA(1.0f, 1.0f, 0.7f);
+	else
+		HslaColor = ColorHSLA(1.0f, 1.0f, 1.0f);
+	return color_cast<ColorRGBA>(HslaColor);
+}
+
+void CMenus::RenderServerbrowserServerList(CUIRect View, bool &WasListboxItemActivated)
+{
+	static CListBox s_ListBox;
+
+	CUIRect Headers;
+	View.HSplitTop(ms_ListheaderHeight, &Headers, &View);
+	Headers.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_T, 5.0f);
+	Headers.VSplitRight(s_ListBox.ScrollbarWidthMax(), &Headers, nullptr);
+	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_NONE, 0.0f);
+
+	struct SColumn
+	{
+		int m_ID;
+		int m_Sort;
+		const char *m_pCaption;
+		int m_Direction;
+		float m_Width;
+		CUIRect m_Rect;
+	};
+
+	enum
+	{
+		COL_FLAG_LOCK = 0,
+		COL_FLAG_FAV,
+		COL_COMMUNITY,
+		COL_NAME,
+		COL_GAMETYPE,
+		COL_MAP,
+		COL_PLAYERS,
+		COL_PING,
+
+		UI_ELEM_LOCK_ICON = 0,
+		UI_ELEM_FAVORITE_ICON,
+		UI_ELEM_NAME_1,
+		UI_ELEM_NAME_2,
+		UI_ELEM_NAME_3,
+		UI_ELEM_GAMETYPE,
+		UI_ELEM_MAP_1,
+		UI_ELEM_MAP_2,
+		UI_ELEM_MAP_3,
+		UI_ELEM_FINISH_ICON,
+		UI_ELEM_PLAYERS,
+		UI_ELEM_FRIEND_ICON,
+		UI_ELEM_PING,
+		NUM_UI_ELEMS,
+	};
+
+	static SColumn s_aCols[] = {
+		{-1, -1, "", -1, 2.0f, {0}},
+		{COL_FLAG_LOCK, -1, "", -1, 14.0f, {0}},
+		{COL_FLAG_FAV, -1, "", -1, 14.0f, {0}},
+		{COL_COMMUNITY, -1, "", -1, 28.0f, {0}},
+		{COL_NAME, IServerBrowser::SORT_NAME, Localizable("Name"), 0, 50.0f, {0}},
+		{COL_GAMETYPE, IServerBrowser::SORT_GAMETYPE, Localizable("Type"), 1, 50.0f, {0}},
+		{COL_MAP, IServerBrowser::SORT_MAP, Localizable("Map"), 1, 120.0f + (Headers.w - 480) / 8, {0}},
+		{COL_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, Localizable("Players"), 1, 85.0f, {0}},
+		{-1, -1, "", 1, 4.0f, {0}},
+		{COL_PING, IServerBrowser::SORT_PING, Localizable("Ping"), 1, 40.0f, {0}},
+	};
+
+	const int NumCols = std::size(s_aCols);
+
+	// do layout
+	for(int i = 0; i < NumCols; i++)
+	{
+		if(s_aCols[i].m_Direction == -1)
+		{
+			Headers.VSplitLeft(s_aCols[i].m_Width, &s_aCols[i].m_Rect, &Headers);
+
+			if(i + 1 < NumCols)
+			{
+				Headers.VSplitLeft(2.0f, nullptr, &Headers);
+			}
+		}
+	}
+
+	for(int i = NumCols - 1; i >= 0; i--)
+	{
+		if(s_aCols[i].m_Direction == 1)
+		{
+			Headers.VSplitRight(s_aCols[i].m_Width, &Headers, &s_aCols[i].m_Rect);
+			Headers.VSplitRight(2.0f, &Headers, nullptr);
+		}
+	}
+
+	for(auto &Col : s_aCols)
+	{
+		if(Col.m_Direction == 0)
+			Col.m_Rect = Headers;
+	}
+
+	const bool PlayersOrPing = (g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS || g_Config.m_BrSort == IServerBrowser::SORT_PING);
+
+	// do headers
+	for(const auto &Col : s_aCols)
+	{
+		int Checked = g_Config.m_BrSort == Col.m_Sort;
+		if(PlayersOrPing && g_Config.m_BrSortOrder == 2 && (Col.m_Sort == IServerBrowser::SORT_NUMPLAYERS || Col.m_Sort == IServerBrowser::SORT_PING))
+			Checked = 2;
+
+		if(DoButton_GridHeader(&Col.m_ID, Localize(Col.m_pCaption), Checked, &Col.m_Rect))
+		{
+			if(Col.m_Sort != -1)
+			{
+				if(g_Config.m_BrSort == Col.m_Sort)
+					g_Config.m_BrSortOrder = (g_Config.m_BrSortOrder + 1) % (PlayersOrPing ? 3 : 2);
+				else
+					g_Config.m_BrSortOrder = 0;
+				g_Config.m_BrSort = Col.m_Sort;
+			}
+		}
+	}
+
+	const int NumServers = ServerBrowser()->NumSortedServers();
+
+	// display important messages in the middle of the screen so no
+	// users misses it
+	{
+		if(!ServerBrowser()->NumServers() && ServerBrowser()->IsGettingServerlist())
+			UI()->DoLabel(&View, Localize("Getting server list from master server"), 16.0f, TEXTALIGN_MC);
+		else if(!ServerBrowser()->NumServers())
+			UI()->DoLabel(&View, Localize("No servers found"), 16.0f, TEXTALIGN_MC);
+		else if(ServerBrowser()->NumServers() && !NumServers)
+			UI()->DoLabel(&View, Localize("No servers match your filter criteria"), 16.0f, TEXTALIGN_MC);
+	}
+
+	s_ListBox.SetActive(!UI()->IsPopupOpen());
+	s_ListBox.DoStart(ms_ListheaderHeight, NumServers, 1, 3, -1, &View, false);
+
+	if(m_ServerBrowserShouldRevealSelection)
+	{
+		s_ListBox.ScrollToSelected();
+		m_ServerBrowserShouldRevealSelection = false;
+	}
+	m_SelectedIndex = -1;
+
+	const auto &&RenderBrowserIcons = [this](CUIElement::SUIElementRect &UIRect, CUIRect *pRect, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor, const char *pText, int TextAlign, bool SmallFont = false) {
+		const float FontSize = SmallFont ? 6.0f : 14.0f;
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		TextRender()->TextColor(TextColor);
+		TextRender()->TextOutlineColor(TextOutlineColor);
+		UI()->DoLabelStreamed(UIRect, pRect, pText, FontSize, TextAlign);
+		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	};
+
+	std::vector<CUIElement *> &vpServerBrowserUiElements = m_avpServerBrowserUiElements[ServerBrowser()->GetCurrentType()];
+	if(vpServerBrowserUiElements.size() < (size_t)NumServers)
+		vpServerBrowserUiElements.resize(NumServers, nullptr);
+
+	for(int i = 0; i < NumServers; i++)
+	{
+		const CServerInfo *pItem = ServerBrowser()->SortedGet(i);
+		const CCommunity *pCommunity = ServerBrowser()->Community(pItem->m_aCommunityId);
+
+		if(vpServerBrowserUiElements[i] == nullptr)
+		{
+			vpServerBrowserUiElements[i] = UI()->GetNewUIElement(NUM_UI_ELEMS);
+		}
+		CUIElement *pUiElement = vpServerBrowserUiElements[i];
+
+		const CListboxItem ListItem = s_ListBox.DoNextItem(pItem, str_comp(pItem->m_aAddress, g_Config.m_UiServerAddress) == 0);
+		if(ListItem.m_Selected)
+			m_SelectedIndex = i;
+
+		if(!ListItem.m_Visible)
+		{
+			// reset active item, if not visible
+			if(UI()->CheckActiveItem(pItem))
+				UI()->SetActiveItem(nullptr);
+
+			// don't render invisible items
+			continue;
+		}
+
+		const float FontSize = 12.0f;
+		char aTemp[64];
+		for(const auto &Col : s_aCols)
+		{
+			CUIRect Button;
+			Button.x = Col.m_Rect.x;
+			Button.y = ListItem.m_Rect.y;
+			Button.h = ListItem.m_Rect.h;
+			Button.w = Col.m_Rect.w;
+
+			const int ID = Col.m_ID;
+			if(ID == COL_FLAG_LOCK)
+			{
+				if(pItem->m_Flags & SERVER_FLAG_PASSWORD)
+				{
+					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_LOCK_ICON), &Button, ColorRGBA(0.75f, 0.75f, 0.75f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_LOCK, TEXTALIGN_MC);
+				}
+			}
+			else if(ID == COL_FLAG_FAV)
+			{
+				if(pItem->m_Favorite != TRISTATE::NONE)
+				{
+					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FAVORITE_ICON), &Button, ColorRGBA(0.94f, 0.4f, 0.4f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_HEART, TEXTALIGN_MC);
+				}
+			}
+			else if(ID == COL_COMMUNITY)
+			{
+				if(pCommunity != nullptr)
+				{
+					const SCommunityIcon *pIcon = FindCommunityIcon(pCommunity->Id());
+					if(pIcon != nullptr)
+					{
+						CUIRect CommunityIcon;
+						Button.Margin(2.0f, &CommunityIcon);
+						RenderCommunityIcon(pIcon, CommunityIcon, true);
+						UI()->DoButtonLogic(&pItem->m_aCommunityId, 0, &CommunityIcon);
+						GameClient()->m_Tooltips.DoToolTip(&pItem->m_aCommunityId, &CommunityIcon, pCommunity->Name());
+					}
+				}
+			}
+			else if(ID == COL_NAME)
+			{
+				SLabelProperties Props;
+				Props.m_MaxWidth = Button.w;
+				Props.m_StopAtEnd = true;
+				Props.m_EnableWidthCheck = false;
+				bool Printed = false;
+				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_SERVERNAME))
+					Printed = PrintHighlighted(pItem->m_aName, [&](const char *pFilteredStr, const int FilterLen) {
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aName));
+						TextRender()->TextColor(gs_HighlightedTextColor);
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_NAME_1)->m_Cursor);
+						TextRender()->TextColor(TextRender()->DefaultTextColor());
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_NAME_2)->m_Cursor);
+					});
+				if(!Printed)
+					UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_NAME_1), &Button, pItem->m_aName, FontSize, TEXTALIGN_ML, Props);
+			}
+			else if(ID == COL_GAMETYPE)
+			{
+				SLabelProperties Props;
+				Props.m_MaxWidth = Button.w;
+				Props.m_StopAtEnd = true;
+				Props.m_EnableWidthCheck = false;
+				if(g_Config.m_UiColorizeGametype)
+				{
+					TextRender()->TextColor(GetGametypeTextColor(pItem->m_aGameType));
+				}
+				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_GAMETYPE), &Button, pItem->m_aGameType, FontSize, TEXTALIGN_ML, Props);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+			}
+			else if(ID == COL_MAP)
+			{
+				{
+					CUIRect Icon;
+					Button.VMargin(4.0f, &Button);
+					Button.VSplitLeft(Button.h, &Icon, &Button);
+					if(g_Config.m_BrIndicateFinished && pItem->m_HasRank == CServerInfo::RANK_RANKED)
+					{
+						Icon.Margin(2.0f, &Icon);
+						RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FINISH_ICON), &Icon, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), FONT_ICON_FLAG_CHECKERED, TEXTALIGN_MC);
+					}
+				}
+
+				SLabelProperties Props;
+				Props.m_MaxWidth = Button.w;
+				Props.m_StopAtEnd = true;
+				Props.m_EnableWidthCheck = false;
+				bool Printed = false;
+				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_MAPNAME))
+					Printed = PrintHighlighted(pItem->m_aMap, [&](const char *pFilteredStr, const int FilterLen) {
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props, (int)(pFilteredStr - pItem->m_aMap));
+						TextRender()->TextColor(gs_HighlightedTextColor);
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_2), &Button, pFilteredStr, FontSize, TEXTALIGN_ML, Props, FilterLen, &pUiElement->Rect(UI_ELEM_MAP_1)->m_Cursor);
+						TextRender()->TextColor(TextRender()->DefaultTextColor());
+						UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_3), &Button, pFilteredStr + FilterLen, FontSize, TEXTALIGN_ML, Props, -1, &pUiElement->Rect(UI_ELEM_MAP_2)->m_Cursor);
+					});
+				if(!Printed)
+					UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_MAP_1), &Button, pItem->m_aMap, FontSize, TEXTALIGN_ML, Props);
+			}
+			else if(ID == COL_PLAYERS)
+			{
+				Button.VMargin(2.0f, &Button);
+				if(pItem->m_FriendState != IFriends::FRIEND_NO)
+				{
+					CUIRect Icon;
+					Button.VSplitRight(50.0f, &Icon, &Button);
+					Icon.Margin(2.0f, &Icon);
+					RenderBrowserIcons(*pUiElement->Rect(UI_ELEM_FRIEND_ICON), &Icon, ColorRGBA(0.94f, 0.4f, 0.4f, 1.0f), TextRender()->DefaultTextOutlineColor(), FONT_ICON_HEART, TEXTALIGN_MC);
+
+					if(pItem->m_FriendNum > 1)
+					{
+						str_from_int(pItem->m_FriendNum, aTemp);
+						TextRender()->TextColor(0.94f, 0.8f, 0.8f, 1.0f);
+						UI()->DoLabel(&Icon, aTemp, 9.0f, TEXTALIGN_MC);
+						TextRender()->TextColor(TextRender()->DefaultTextColor());
+					}
+				}
+
+				str_format(aTemp, sizeof(aTemp), "%i/%i", pItem->m_NumFilteredPlayers, ServerBrowser()->Max(*pItem));
+				if(g_Config.m_BrFilterString[0] && (pItem->m_QuickSearchHit & IServerBrowser::QUICK_PLAYER))
+				{
+					TextRender()->TextColor(gs_HighlightedTextColor);
+				}
+				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PLAYERS), &Button, aTemp, FontSize, TEXTALIGN_MR);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+			}
+			else if(ID == COL_PING)
+			{
+				Button.VMargin(4.0f, &Button);
+				FormatServerbrowserPing(aTemp, pItem);
+				if(g_Config.m_UiColorizePing)
+				{
+					TextRender()->TextColor(GetPingTextColor(pItem->m_Latency));
+				}
+				UI()->DoLabelStreamed(*pUiElement->Rect(UI_ELEM_PING), &Button, aTemp, FontSize, TEXTALIGN_MR);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+			}
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(NewSelected != m_SelectedIndex)
+	{
+		m_SelectedIndex = NewSelected;
+		if(m_SelectedIndex >= 0)
+		{
+			// select the new server
+			const CServerInfo *pItem = ServerBrowser()->SortedGet(NewSelected);
+			if(pItem)
+			{
+				str_copy(g_Config.m_UiServerAddress, pItem->m_aAddress);
+				m_ServerBrowserShouldRevealSelection = true;
+			}
+		}
+	}
+
+	WasListboxItemActivated = s_ListBox.WasItemActivated();
+}
+
+void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItemActivated)
+{
+	// Render bar that shows the loading progression.
+	// The bar is only shown while loading and fades out when it's done.
+	CUIRect RefreshBar;
+	StatusBox.HSplitTop(5.0f, &RefreshBar, &StatusBox);
+	static float s_LoadingProgressionFadeEnd = 0.0f;
+	if(ServerBrowser()->IsRefreshing() && ServerBrowser()->LoadingProgression() < 100)
+	{
+		s_LoadingProgressionFadeEnd = Client()->GlobalTime() + 2.0f;
+	}
+	const float LoadingProgressionTimeDiff = s_LoadingProgressionFadeEnd - Client()->GlobalTime();
+	if(LoadingProgressionTimeDiff > 0.0f)
+	{
+		const float RefreshBarAlpha = minimum(LoadingProgressionTimeDiff, 0.8f);
+		RefreshBar.h = 2.0f;
+		RefreshBar.w *= ServerBrowser()->LoadingProgression() / 100.0f;
+		RefreshBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, RefreshBarAlpha), IGraphics::CORNER_NONE, 0.0f);
+	}
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	const float SearchExcludeAddrStrMax = 130.0f;
+	const float SearchIconWidth = TextRender()->TextWidth(16.0f, FONT_ICON_MAGNIFYING_GLASS);
+	const float ExcludeIconWidth = TextRender()->TextWidth(16.0f, FONT_ICON_BAN);
+	const float ExcludeSearchIconMax = maximum(SearchIconWidth, ExcludeIconWidth);
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+	CUIRect SearchInfoAndAddr, ServersAndConnect, ServersPlayersOnline, SearchAndInfo, ServerAddr, ConnectButtons;
+	StatusBox.VSplitRight(135.0f, &SearchInfoAndAddr, &ServersAndConnect);
+	if(SearchInfoAndAddr.w > 350.0f)
+		SearchInfoAndAddr.VSplitLeft(350.0f, &SearchInfoAndAddr, nullptr);
+	SearchInfoAndAddr.HSplitTop(40.0f, &SearchAndInfo, &ServerAddr);
+	ServersAndConnect.HSplitTop(35.0f, &ServersPlayersOnline, &ConnectButtons);
+	ConnectButtons.HSplitTop(5.0f, nullptr, &ConnectButtons);
+
+	CUIRect QuickSearch, QuickExclude;
+	SearchAndInfo.HSplitTop(20.0f, &QuickSearch, &QuickExclude);
+	QuickSearch.Margin(2.0f, &QuickSearch);
+	QuickExclude.Margin(2.0f, &QuickExclude);
+
+	// render quick search
+	{
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 16.0f, TEXTALIGN_ML);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		QuickSearch.VSplitLeft(ExcludeSearchIconMax, nullptr, &QuickSearch);
+		QuickSearch.VSplitLeft(5.0f, nullptr, &QuickSearch);
+
+		char aBufSearch[64];
+		str_format(aBufSearch, sizeof(aBufSearch), "%s:", Localize("Search"));
+		UI()->DoLabel(&QuickSearch, aBufSearch, 14.0f, TEXTALIGN_ML);
+		QuickSearch.VSplitLeft(SearchExcludeAddrStrMax, nullptr, &QuickSearch);
+		QuickSearch.VSplitLeft(5.0f, nullptr, &QuickSearch);
+
+		static CLineInput s_FilterInput(g_Config.m_BrFilterString, sizeof(g_Config.m_BrFilterString));
+		if(!UI()->IsPopupOpen() && Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
+		{
+			UI()->SetActiveItem(&s_FilterInput);
+			s_FilterInput.SelectAll();
+		}
+		if(UI()->DoClearableEditBox(&s_FilterInput, &QuickSearch, 12.0f))
+			Client()->ServerBrowserUpdate();
+	}
+
+	// render quick exclude
+	{
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		UI()->DoLabel(&QuickExclude, FONT_ICON_BAN, 16.0f, TEXTALIGN_ML);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		QuickExclude.VSplitLeft(ExcludeSearchIconMax, nullptr, &QuickExclude);
+		QuickExclude.VSplitLeft(5.0f, nullptr, &QuickExclude);
+
+		char aBufExclude[64];
+		str_format(aBufExclude, sizeof(aBufExclude), "%s:", Localize("Exclude"));
+		UI()->DoLabel(&QuickExclude, aBufExclude, 14.0f, TEXTALIGN_ML);
+		QuickExclude.VSplitLeft(SearchExcludeAddrStrMax, nullptr, &QuickExclude);
+		QuickExclude.VSplitLeft(5.0f, nullptr, &QuickExclude);
+
+		static CLineInput s_ExcludeInput(g_Config.m_BrExcludeString, sizeof(g_Config.m_BrExcludeString));
+		if(!UI()->IsPopupOpen() && Input()->KeyPress(KEY_X) && Input()->ShiftIsPressed() && Input()->ModifierIsPressed())
+		{
+			UI()->SetActiveItem(&s_ExcludeInput);
+			s_ExcludeInput.SelectAll();
+		}
+		if(UI()->DoClearableEditBox(&s_ExcludeInput, &QuickExclude, 12.0f))
+			Client()->ServerBrowserUpdate();
+	}
+
+	// render status
+	{
+		CUIRect ServersOnline, PlayersOnline;
+		ServersPlayersOnline.HSplitMid(&PlayersOnline, &ServersOnline);
+
+		char aBuf[128];
+		if(ServerBrowser()->NumServers() != 1)
+			str_format(aBuf, sizeof(aBuf), Localize("%d of %d servers"), ServerBrowser()->NumSortedServers(), ServerBrowser()->NumServers());
+		else
+			str_format(aBuf, sizeof(aBuf), Localize("%d of %d server"), ServerBrowser()->NumSortedServers(), ServerBrowser()->NumServers());
+		UI()->DoLabel(&ServersOnline, aBuf, 12.0f, TEXTALIGN_MR);
+
+		if(ServerBrowser()->NumSortedPlayers() != 1)
+			str_format(aBuf, sizeof(aBuf), Localize("%d players"), ServerBrowser()->NumSortedPlayers());
+		else
+			str_format(aBuf, sizeof(aBuf), Localize("%d player"), ServerBrowser()->NumSortedPlayers());
+		UI()->DoLabel(&PlayersOnline, aBuf, 12.0f, TEXTALIGN_MR);
+	}
+
+	// address info
+	{
+		CUIRect ServerAddrLabel, ServerAddrEditBox;
+		ServerAddr.Margin(2.0f, &ServerAddr);
+		ServerAddr.VSplitLeft(SearchExcludeAddrStrMax + 5.0f + ExcludeSearchIconMax + 5.0f, &ServerAddrLabel, &ServerAddrEditBox);
+
+		UI()->DoLabel(&ServerAddrLabel, Localize("Server address:"), 14.0f, TEXTALIGN_ML);
+		static CLineInput s_ServerAddressInput(g_Config.m_UiServerAddress, sizeof(g_Config.m_UiServerAddress));
+		if(UI()->DoClearableEditBox(&s_ServerAddressInput, &ServerAddrEditBox, 12.0f))
+			m_ServerBrowserShouldRevealSelection = true;
+	}
+
+	// buttons
+	{
+		CUIRect ButtonRefresh, ButtonConnect;
+		ConnectButtons.VSplitMid(&ButtonRefresh, &ButtonConnect, 5.0f);
+
+		// refresh button
+		{
+			char aLabelBuf[32] = {0};
+			const auto &&RefreshLabelFunc = [this, aLabelBuf]() mutable {
+				if(ServerBrowser()->IsRefreshing() || ServerBrowser()->IsGettingServerlist())
+					str_format(aLabelBuf, sizeof(aLabelBuf), "%s%s", FONT_ICON_ARROW_ROTATE_RIGHT, FONT_ICON_ELLIPSIS);
+				else
+					str_copy(aLabelBuf, FONT_ICON_ARROW_ROTATE_RIGHT);
+				return aLabelBuf;
+			};
+
+			SMenuButtonProperties Props;
+			Props.m_HintRequiresStringCheck = true;
+			Props.m_UseIconFont = true;
+
+			static CButtonContainer s_RefreshButton;
+			if(UI()->DoButton_Menu(m_RefreshButton, &s_RefreshButton, RefreshLabelFunc, &ButtonRefresh, Props) || (!UI()->IsPopupOpen() && (Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))))
+			{
+				RefreshBrowserTab(g_Config.m_UiPage);
+			}
+		}
+
+		// connect button
+		{
+			const auto &&ConnectLabelFunc = []() { return FONT_ICON_RIGHT_TO_BRACKET; };
+
+			SMenuButtonProperties Props;
+			Props.m_UseIconFont = true;
+			Props.m_Color = ColorRGBA(0.5f, 1.0f, 0.5f, 0.5f);
+
+			static CButtonContainer s_ConnectButton;
+			if(UI()->DoButton_Menu(m_ConnectButton, &s_ConnectButton, ConnectLabelFunc, &ButtonConnect, Props) || WasListboxItemActivated || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+			{
+				Connect(g_Config.m_UiServerAddress);
+			}
+		}
+	}
+}
+
+void CMenus::Connect(const char *pAddress)
+{
+	if(Client()->State() == IClient::STATE_ONLINE && Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0)
+	{
+		str_copy(m_aNextServer, pAddress);
+		PopupConfirm(Localize("Disconnect"), Localize("Are you sure that you want to disconnect and switch to a different server?"), Localize("Yes"), Localize("No"), &CMenus::PopupConfirmSwitchServer);
+	}
+	else
+		Client()->Connect(pAddress);
+}
+
+void CMenus::PopupConfirmSwitchServer()
+{
+	Client()->Connect(m_aNextServer);
+}
+
+void CMenus::RenderServerbrowserFilters(CUIRect View)
+{
+	const float RowHeight = 18.0f;
+	const float FontSize = (RowHeight - 4.0f) * CUI::ms_FontmodHeight; // based on DoButton_CheckBox
+
+	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
+	View.Margin(5.0f, &View);
+
+	CUIRect Button, ResetButton;
+	View.HSplitBottom(RowHeight, &View, &ResetButton);
+	View.HSplitBottom(3.0f, &View, nullptr);
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterEmpty, Localize("Has people playing"), g_Config.m_BrFilterEmpty, &Button))
+		g_Config.m_BrFilterEmpty ^= 1;
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterSpectators, Localize("Count players only"), g_Config.m_BrFilterSpectators, &Button))
+		g_Config.m_BrFilterSpectators ^= 1;
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterFull, Localize("Server not full"), g_Config.m_BrFilterFull, &Button))
+		g_Config.m_BrFilterFull ^= 1;
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterFriends, Localize("Show friends only"), g_Config.m_BrFilterFriends, &Button))
+		g_Config.m_BrFilterFriends ^= 1;
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterPw, Localize("No password"), g_Config.m_BrFilterPw, &Button))
+		g_Config.m_BrFilterPw ^= 1;
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterGametypeStrict, Localize("Strict gametype filter"), g_Config.m_BrFilterGametypeStrict, &Button))
+		g_Config.m_BrFilterGametypeStrict ^= 1;
+
+	View.HSplitTop(3.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Button, &View);
+	UI()->DoLabel(&Button, Localize("Game types:"), FontSize, TEXTALIGN_ML);
+	Button.VSplitRight(60.0f, nullptr, &Button);
+	static CLineInput s_GametypeInput(g_Config.m_BrFilterGametype, sizeof(g_Config.m_BrFilterGametype));
+	if(UI()->DoEditBox(&s_GametypeInput, &Button, FontSize))
+		Client()->ServerBrowserUpdate();
+
+	// server address
+	View.HSplitTop(6.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Button, &View);
+	View.HSplitTop(6.0f, nullptr, &View);
+	UI()->DoLabel(&Button, Localize("Server address:"), FontSize, TEXTALIGN_ML);
+	Button.VSplitRight(60.0f, nullptr, &Button);
+	static CLineInput s_FilterServerAddressInput(g_Config.m_BrFilterServerAddress, sizeof(g_Config.m_BrFilterServerAddress));
+	if(UI()->DoEditBox(&s_FilterServerAddressInput, &Button, FontSize))
+		Client()->ServerBrowserUpdate();
+
+	// player country
+	{
+		CUIRect Flag;
+		View.HSplitTop(RowHeight, &Button, &View);
+		Button.VSplitRight(60.0f, &Button, &Flag);
+		if(DoButton_CheckBox(&g_Config.m_BrFilterCountry, Localize("Player country:"), g_Config.m_BrFilterCountry, &Button))
+			g_Config.m_BrFilterCountry ^= 1;
+
+		const float OldWidth = Flag.w;
+		Flag.w = Flag.h * 2.0f;
+		Flag.x += (OldWidth - Flag.w) / 2.0f;
+		m_pClient->m_CountryFlags.Render(g_Config.m_BrFilterCountryIndex, ColorRGBA(1.0f, 1.0f, 1.0f, UI()->HotItem() == &g_Config.m_BrFilterCountryIndex ? 1.0f : g_Config.m_BrFilterCountry ? 0.9f : 0.5f), Flag.x, Flag.y, Flag.w, Flag.h);
+
+		if(UI()->DoButtonLogic(&g_Config.m_BrFilterCountryIndex, 0, &Flag))
+		{
+			static SPopupMenuId s_PopupCountryId;
+			static SPopupCountrySelectionContext s_PopupCountryContext;
+			s_PopupCountryContext.m_pMenus = this;
+			s_PopupCountryContext.m_Selection = g_Config.m_BrFilterCountryIndex;
+			s_PopupCountryContext.m_New = true;
+			UI()->DoPopupMenu(&s_PopupCountryId, Flag.x, Flag.y + Flag.h, 490, 210, &s_PopupCountryContext, PopupCountrySelection);
+		}
+	}
+
+	View.HSplitTop(RowHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_BrFilterConnectingPlayers, Localize("Filter connecting players"), g_Config.m_BrFilterConnectingPlayers, &Button))
+		g_Config.m_BrFilterConnectingPlayers ^= 1;
+
+	// community filter
+	if((g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES) && !ServerBrowser()->Communities().empty())
+	{
+		CUIRect Row;
+		View.HSplitTop(6.0f, nullptr, &View);
+		View.HSplitTop(19.0f, &Row, &View);
+		Row.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_T, 4.0f);
+		UI()->DoLabel(&Row, Localize("Communities"), 12.0f, TEXTALIGN_MC);
+
+		View.HSplitTop(4.0f * 17.0f + CScrollRegion::HEIGHT_MAGIC_FIX, &Row, &View);
+		View.HSplitTop(3.0f, nullptr, &View);
+		Row.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
+		RenderServerbrowserCommunitiesFilter(Row);
+	}
+
+	// map finish filters
+	if(m_CommunityCache.m_AnyRanksAvailable)
+	{
+		View.HSplitTop(RowHeight, &Button, &View);
+		if(DoButton_CheckBox(&g_Config.m_BrIndicateFinished, Localize("Indicate map finish"), g_Config.m_BrIndicateFinished, &Button))
+		{
+			g_Config.m_BrIndicateFinished ^= 1;
+			if(g_Config.m_BrIndicateFinished)
+				ServerBrowser()->Refresh(ServerBrowser()->GetCurrentType());
+		}
+
+		if(g_Config.m_BrIndicateFinished)
+		{
+			View.HSplitTop(RowHeight, &Button, &View);
+			if(DoButton_CheckBox(&g_Config.m_BrFilterUnfinishedMap, Localize("Unfinished map"), g_Config.m_BrFilterUnfinishedMap, &Button))
+				g_Config.m_BrFilterUnfinishedMap ^= 1;
+		}
+		else
+		{
+			g_Config.m_BrFilterUnfinishedMap = 0;
+		}
+	}
+
+	if(!m_CommunityCache.m_vpSelectableCountries.empty() || !m_CommunityCache.m_vpSelectableTypes.empty())
+	{
+		const ColorRGBA ColorActive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f);
+		const ColorRGBA ColorInactive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f);
+
+		CUIRect TabContents, CountriesTab, TypesTab;
+		View.HSplitTop(6.0f, nullptr, &View);
+		View.HSplitTop(19.0f, &Button, &View);
+		View.HSplitTop(minimum(4.0f * 22.0f + CScrollRegion::HEIGHT_MAGIC_FIX, View.h), &TabContents, &View);
+		Button.VSplitMid(&CountriesTab, &TypesTab);
+		TabContents.Draw(ColorActive, IGraphics::CORNER_B, 4.0f);
+
+		enum EFilterTab
+		{
+			FILTERTAB_COUNTRIES = 0,
+			FILTERTAB_TYPES,
+		};
+		static EFilterTab s_ActiveTab = FILTERTAB_COUNTRIES;
+
+		static CButtonContainer s_CountriesButton;
+		if(DoButton_MenuTab(&s_CountriesButton, Localize("Countries"), s_ActiveTab == FILTERTAB_COUNTRIES, &CountriesTab, IGraphics::CORNER_TL, nullptr, &ColorInactive, &ColorActive, nullptr, 4.0f))
+		{
+			s_ActiveTab = FILTERTAB_COUNTRIES;
+		}
+
+		static CButtonContainer s_TypesButton;
+		if(DoButton_MenuTab(&s_TypesButton, Localize("Types"), s_ActiveTab == FILTERTAB_TYPES, &TypesTab, IGraphics::CORNER_TR, nullptr, &ColorInactive, &ColorActive, nullptr, 4.0f))
+		{
+			s_ActiveTab = FILTERTAB_TYPES;
+		}
+
+		if(s_ActiveTab == FILTERTAB_COUNTRIES)
+		{
+			RenderServerbrowserCountriesFilter(TabContents);
+		}
+		else if(s_ActiveTab == FILTERTAB_TYPES)
+		{
+			RenderServerbrowserTypesFilter(TabContents);
+		}
+	}
+
+	static CButtonContainer s_ResetButton;
+	if(DoButton_Menu(&s_ResetButton, Localize("Reset filter"), 0, &ResetButton))
+	{
+		g_Config.m_BrFilterString[0] = '\0';
+		g_Config.m_BrExcludeString[0] = '\0';
+		g_Config.m_BrFilterFull = 0;
+		g_Config.m_BrFilterEmpty = 0;
+		g_Config.m_BrFilterSpectators = 0;
+		g_Config.m_BrFilterFriends = 0;
+		g_Config.m_BrFilterCountry = 0;
+		g_Config.m_BrFilterCountryIndex = -1;
+		g_Config.m_BrFilterPw = 0;
+		g_Config.m_BrFilterGametype[0] = '\0';
+		g_Config.m_BrFilterGametypeStrict = 0;
+		g_Config.m_BrFilterConnectingPlayers = 1;
+		g_Config.m_BrFilterUnfinishedMap = 0;
+		g_Config.m_BrFilterServerAddress[0] = '\0';
+		ConfigManager()->Reset("br_filter_exclude_communities");
+		ConfigManager()->Reset("br_filter_exclude_countries");
+		ConfigManager()->Reset("br_filter_exclude_types");
+		Client()->ServerBrowserUpdate();
+		UpdateCommunityCache(true);
+	}
+}
+
+void CMenus::RenderServerbrowserDDNetFilter(CUIRect View,
+	IFilterList &Filter,
+	float ItemHeight, int MaxItems, int ItemsPerRow,
+	CScrollRegion &ScrollRegion, std::vector<unsigned char> &vItemIds,
+	bool UpdateCommunityCacheOnChange,
+	const std::function<const char *(int ItemIndex)> &GetItemName,
+	const std::function<void(int ItemIndex, CUIRect Item, const void *pItemId, bool Active)> &RenderItem)
+{
+	vItemIds.resize(MaxItems);
+
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = 2.0f * ItemHeight;
+	ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
+	View.y += ScrollOffset.y;
+
+	CUIRect Row;
+	int ColumnIndex = 0;
+	for(int ItemIndex = 0; ItemIndex < MaxItems; ++ItemIndex)
+	{
+		CUIRect Item;
+		if(ColumnIndex == 0)
+			View.HSplitTop(ItemHeight, &Row, &View);
+		Row.VSplitLeft(View.w / ItemsPerRow, &Item, &Row);
+		ColumnIndex = (ColumnIndex + 1) % ItemsPerRow;
+		if(!ScrollRegion.AddRect(Item))
+			continue;
+
+		const void *pItemId = &vItemIds[ItemIndex];
+		const char *pName = GetItemName(ItemIndex);
+		const bool Active = !Filter.Filtered(pName);
+
+		const int Click = UI()->DoButtonLogic(pItemId, 0, &Item);
+		if(Click == 1 || Click == 2)
+		{
+			// left/right click to toggle filter
+			if(Filter.Empty())
+			{
+				if(Click == 1)
+				{
+					// Left click: when all are active, only activate one
+					for(int j = 0; j < MaxItems; ++j)
+					{
+						if(j != ItemIndex)
+							Filter.Add(GetItemName(j));
+					}
+				}
+				else if(Click == 2)
+				{
+					// Right click: when all are active, only deactivate one
+					Filter.Add(GetItemName(ItemIndex));
+				}
+			}
+			else
+			{
+				bool AllFilteredExceptUs = true;
+				for(int j = 0; j < MaxItems; ++j)
+				{
+					if(j != ItemIndex && !Filter.Filtered(GetItemName(j)))
+					{
+						AllFilteredExceptUs = false;
+						break;
+					}
+				}
+				// when last one is removed, reset (re-enable all)
+				if(AllFilteredExceptUs)
+				{
+					Filter.Clear();
+				}
+				else if(Active)
+				{
+					Filter.Add(pName);
+				}
+				else
+				{
+					Filter.Remove(pName);
+				}
+			}
+
+			Client()->ServerBrowserUpdate();
+			if(UpdateCommunityCacheOnChange)
+				UpdateCommunityCache(true);
+		}
+		else if(Click == 3)
+		{
+			// middle click to reset (re-enable all)
+			Filter.Clear();
+			Client()->ServerBrowserUpdate();
+			if(UpdateCommunityCacheOnChange)
+				UpdateCommunityCache(true);
+		}
+
+		if(UI()->HotItem() == pItemId && !ScrollRegion.Animating())
+			Item.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f), IGraphics::CORNER_ALL, 2.0f);
+		RenderItem(ItemIndex, Item, pItemId, Active);
+	}
+
+	ScrollRegion.End();
+}
+
+void CMenus::RenderServerbrowserCommunitiesFilter(CUIRect View)
+{
+	const int MaxEntries = ServerBrowser()->Communities().size();
+	const int EntriesPerRow = 1;
+
+	static CScrollRegion s_ScrollRegion;
+	static std::vector<unsigned char> s_vItemIds;
+
+	const float ItemHeight = 13.0f;
+	const float Spacing = 2.0f;
+
+	const auto &&GetItemName = [&](int ItemIndex) {
+		return ServerBrowser()->Communities()[ItemIndex].Id();
+	};
+	const auto &&GetItemDisplayName = [&](int ItemIndex) {
+		return ServerBrowser()->Communities()[ItemIndex].Name();
+	};
+	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
+		const float Alpha = (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f);
+
+		CUIRect Icon, Label;
+		Item.Margin(Spacing, &Item);
+		Item.VSplitLeft(Item.h * 2.0f, &Icon, &Label);
+		Label.VSplitLeft(Spacing, nullptr, &Label);
+
+		const SCommunityIcon *pIcon = FindCommunityIcon(GetItemName(ItemIndex));
+		if(pIcon != nullptr)
+		{
+			RenderCommunityIcon(pIcon, Icon, Active);
+		}
+
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+		UI()->DoLabel(&Label, GetItemDisplayName(ItemIndex), Label.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	};
+
+	RenderServerbrowserDDNetFilter(View, ServerBrowser()->CommunitiesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, true, GetItemName, RenderItem);
+}
+
+void CMenus::RenderServerbrowserCountriesFilter(CUIRect View)
+{
+	const int MaxEntries = m_CommunityCache.m_vpSelectableCountries.size();
+	const int EntriesPerRow = MaxEntries > 8 ? 5 : 4;
+
+	static CScrollRegion s_ScrollRegion;
+	static std::vector<unsigned char> s_vItemIds;
+
+	const float ItemHeight = 18.0f;
+	const float Spacing = 2.0f;
+
+	const auto &&GetItemName = [&](int ItemIndex) {
+		return m_CommunityCache.m_vpSelectableCountries[ItemIndex]->Name();
+	};
+	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
+		Item.Margin(Spacing, &Item);
+		const float OldWidth = Item.w;
+		Item.w = Item.h * 2.0f;
+		Item.x += (OldWidth - Item.w) / 2.0f;
+		m_pClient->m_CountryFlags.Render(m_CommunityCache.m_vpSelectableCountries[ItemIndex]->FlagId(), ColorRGBA(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f)), Item.x, Item.y, Item.w, Item.h);
+	};
+
+	RenderServerbrowserDDNetFilter(View, ServerBrowser()->CountriesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, false, GetItemName, RenderItem);
+}
+
+void CMenus::RenderServerbrowserTypesFilter(CUIRect View)
+{
+	const int MaxEntries = m_CommunityCache.m_vpSelectableTypes.size();
+	const int EntriesPerRow = 3;
+
+	static CScrollRegion s_ScrollRegion;
+	static std::vector<unsigned char> s_vItemIds;
+
+	const float ItemHeight = 13.0f;
+	const float Spacing = 2.0f;
+
+	const auto &&GetItemName = [&](int ItemIndex) {
+		return m_CommunityCache.m_vpSelectableTypes[ItemIndex]->Name();
+	};
+	const auto &&RenderItem = [&](int ItemIndex, CUIRect Item, const void *pItemId, bool Active) {
+		Item.Margin(Spacing, &Item);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, (Active ? 0.9f : 0.2f) + (UI()->HotItem() == pItemId ? 0.1f : 0.0f));
+		UI()->DoLabel(&Item, GetItemName(ItemIndex), Item.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	};
+
+	RenderServerbrowserDDNetFilter(View, ServerBrowser()->TypesFilter(), ItemHeight + 2.0f * Spacing, MaxEntries, EntriesPerRow, s_ScrollRegion, s_vItemIds, false, GetItemName, RenderItem);
+}
+
+CUI::EPopupMenuFunctionResult CMenus::PopupCountrySelection(void *pContext, CUIRect View, bool Active)
+{
+	SPopupCountrySelectionContext *pPopupContext = static_cast<SPopupCountrySelectionContext *>(pContext);
+	CMenus *pMenus = pPopupContext->m_pMenus;
+
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(Active);
+	s_ListBox.DoStart(50.0f, pMenus->m_pClient->m_CountryFlags.Num(), 8, 1, -1, &View, false);
+
+	if(pPopupContext->m_New)
+	{
+		pPopupContext->m_New = false;
+		s_ListBox.ScrollToSelected();
+	}
+
+	for(size_t i = 0; i < pMenus->m_pClient->m_CountryFlags.Num(); ++i)
+	{
+		const CCountryFlags::CCountryFlag *pEntry = pMenus->m_pClient->m_CountryFlags.GetByIndex(i);
+
+		const CListboxItem Item = s_ListBox.DoNextItem(pEntry, pEntry->m_CountryCode == pPopupContext->m_Selection);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect FlagRect, Label;
+		Item.m_Rect.Margin(5.0f, &FlagRect);
+		FlagRect.HSplitBottom(12.0f, &FlagRect, &Label);
+		Label.HSplitTop(2.0f, nullptr, &Label);
+		const float OldWidth = FlagRect.w;
+		FlagRect.w = FlagRect.h * 2.0f;
+		FlagRect.x += (OldWidth - FlagRect.w) / 2.0f;
+		pMenus->m_pClient->m_CountryFlags.Render(pEntry->m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+		pMenus->UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	pPopupContext->m_Selection = NewSelected >= 0 ? pMenus->m_pClient->m_CountryFlags.GetByIndex(NewSelected)->m_CountryCode : -1;
+	if(s_ListBox.WasItemSelected() || s_ListBox.WasItemActivated())
+	{
+		g_Config.m_BrFilterCountry = 1;
+		g_Config.m_BrFilterCountryIndex = pPopupContext->m_Selection;
+		pMenus->Client()->ServerBrowserUpdate();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CMenus::RenderServerbrowserInfo(CUIRect View)
+{
+	const CServerInfo *pSelectedServer = ServerBrowser()->SortedGet(m_SelectedIndex);
+
+	const float RowHeight = 18.0f;
+	const float FontSize = (RowHeight - 4.0f) * CUI::ms_FontmodHeight; // based on DoButton_CheckBox
+
+	CUIRect ServerDetails, Scoreboard;
+	View.HSplitTop(4.0f * 15.0f + RowHeight + 2.0f * 5.0f + 2.0f * 2.0f, &ServerDetails, &Scoreboard);
+	ServerDetails.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
+
+	if(pSelectedServer)
+	{
+		ServerDetails.Margin(5.0f, &ServerDetails);
+
+		// copy info button
+		{
+			CUIRect Button;
+			ServerDetails.HSplitBottom(15.0f, &ServerDetails, &Button);
+			static CButtonContainer s_CopyButton;
+			if(DoButton_Menu(&s_CopyButton, Localize("Copy info"), 0, &Button))
+			{
+				char aInfo[256];
+				pSelectedServer->InfoToString(aInfo, sizeof(aInfo));
+				Input()->SetClipboardText(aInfo);
+			}
+		}
+
+		// favorite checkbox
+		{
+			CUIRect ButtonAddFav, ButtonLeakIp;
+			ServerDetails.HSplitBottom(2.0f, &ServerDetails, nullptr);
+			ServerDetails.HSplitBottom(RowHeight, &ServerDetails, &ButtonAddFav);
+			ServerDetails.HSplitBottom(2.0f, &ServerDetails, nullptr);
+			ButtonAddFav.VSplitMid(&ButtonAddFav, &ButtonLeakIp);
+			static int s_AddFavButton = 0;
+			if(DoButton_CheckBox_Tristate(&s_AddFavButton, Localize("Favorite"), pSelectedServer->m_Favorite, &ButtonAddFav))
+			{
+				if(pSelectedServer->m_Favorite != TRISTATE::NONE)
+				{
+					Favorites()->Remove(pSelectedServer->m_aAddresses, pSelectedServer->m_NumAddresses);
+				}
+				else
+				{
+					Favorites()->Add(pSelectedServer->m_aAddresses, pSelectedServer->m_NumAddresses);
+					if(g_Config.m_UiPage == PAGE_LAN)
+					{
+						Favorites()->AllowPing(pSelectedServer->m_aAddresses, pSelectedServer->m_NumAddresses, true);
+					}
+				}
+				Client()->ServerBrowserUpdate();
+			}
+			if(pSelectedServer->m_Favorite != TRISTATE::NONE)
+			{
+				static int s_LeakIpButton = 0;
+				if(DoButton_CheckBox_Tristate(&s_LeakIpButton, Localize("Leak IP"), pSelectedServer->m_FavoriteAllowPing, &ButtonLeakIp))
+				{
+					Favorites()->AllowPing(pSelectedServer->m_aAddresses, pSelectedServer->m_NumAddresses, pSelectedServer->m_FavoriteAllowPing == TRISTATE::NONE);
+					Client()->ServerBrowserUpdate();
+				}
+			}
+		}
+
+		CUIRect LeftColumn, RightColumn, Row;
+		ServerDetails.VSplitLeft(80.0f, &LeftColumn, &RightColumn);
+
+		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
+		UI()->DoLabel(&Row, Localize("Version"), FontSize, TEXTALIGN_ML);
+
+		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
+		UI()->DoLabel(&Row, pSelectedServer->m_aVersion, FontSize, TEXTALIGN_ML);
+
+		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
+		UI()->DoLabel(&Row, Localize("Game type"), FontSize, TEXTALIGN_ML);
+
+		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
+		UI()->DoLabel(&Row, pSelectedServer->m_aGameType, FontSize, TEXTALIGN_ML);
+
+		LeftColumn.HSplitTop(15.0f, &Row, &LeftColumn);
+		UI()->DoLabel(&Row, Localize("Ping"), FontSize, TEXTALIGN_ML);
+
+		char aTemp[16];
+		FormatServerbrowserPing(aTemp, pSelectedServer);
+		RightColumn.HSplitTop(15.0f, &Row, &RightColumn);
+		UI()->DoLabel(&Row, aTemp, FontSize, TEXTALIGN_ML);
+
+		RenderServerbrowserInfoScoreboard(Scoreboard, pSelectedServer);
+	}
+	else
+	{
+		UI()->DoLabel(&ServerDetails, Localize("No server selected"), FontSize, TEXTALIGN_MC);
+	}
+}
+
+void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *pSelectedServer)
+{
+	const float FontSize = 10.0f;
+
+	static CListBox s_ListBox;
+	View.VSplitLeft(5.0f, nullptr, &View);
+	if(!s_ListBox.ScrollbarShown())
+		View.VSplitRight(5.0f, &View, nullptr);
+	s_ListBox.DoAutoSpacing(1.0f);
+	s_ListBox.SetScrollbarWidth(16.0f);
+	s_ListBox.SetScrollbarMargin(5.0f);
+	s_ListBox.DoStart(25.0f, pSelectedServer->m_NumReceivedClients, 1, 3, -1, &View);
+
+	for(int i = 0; i < pSelectedServer->m_NumReceivedClients; i++)
+	{
+		const CServerInfo::CClient &CurrentClient = pSelectedServer->m_aClients[i];
+		const CListboxItem Item = s_ListBox.DoNextItem(&CurrentClient);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Skin, Name, Clan, Score, Flag;
+		Name = Item.m_Rect;
+
+		ColorRGBA Color;
+		const float Alpha = (i % 2 + 1) * 0.05f;
+		switch(CurrentClient.m_FriendState)
+		{
+		case IFriends::FRIEND_NO:
+			Color = ColorRGBA(1.0f, 1.0f, 1.0f, Alpha);
+			break;
+		case IFriends::FRIEND_PLAYER:
+			if(CurrentClient.m_Afk)
+				Color = ColorRGBA(1.0f, 1.0f, 0.5f, 0.15f + Alpha);
+			else
+				Color = ColorRGBA(0.5f, 1.0f, 0.5f, 0.15f + Alpha);
+			break;
+		case IFriends::FRIEND_CLAN:
+			if(CurrentClient.m_Afk)
+				Color = ColorRGBA(0.4f, 0.75f, 1.0f, 0.15f + Alpha);
+			else
+				Color = ColorRGBA(0.4f, 0.4f, 1.0f, 0.15f + Alpha);
+			break;
+		default:
+			dbg_assert(false, "Invalid friend state");
+			dbg_break();
+			break;
+		}
+
+		Name.Draw(Color, IGraphics::CORNER_ALL, 4.0f);
+		Name.VSplitLeft(1.0f, nullptr, &Name);
+		Name.VSplitLeft(34.0f, &Score, &Name);
+		Name.VSplitLeft(18.0f, &Skin, &Name);
+		Name.VSplitRight(26.0f, &Name, &Flag);
+		Flag.HMargin(6.0f, &Flag);
+		Name.HSplitTop(12.0f, &Name, &Clan);
+
+		// score
+		char aTemp[16];
+		if(!CurrentClient.m_Player)
+		{
+			str_copy(aTemp, "SPEC");
+		}
+		else if(pSelectedServer->m_ClientScoreKind == CServerInfo::CLIENT_SCORE_KIND_POINTS)
+		{
+			str_from_int(CurrentClient.m_Score, aTemp);
+		}
+		else
+		{
+			std::optional<int> Time = {};
+
+			if(pSelectedServer->m_ClientScoreKind == CServerInfo::CLIENT_SCORE_KIND_TIME_BACKCOMPAT)
+			{
+				const int TempTime = absolute(CurrentClient.m_Score);
+				if(TempTime != 0 && TempTime != 9999)
+					Time = TempTime;
+			}
+			else
+			{
+				// CServerInfo::CLIENT_SCORE_KIND_POINTS
+				if(CurrentClient.m_Score >= 0)
+					Time = CurrentClient.m_Score;
+			}
+
+			if(Time.has_value())
+			{
+				str_time((int64_t)Time.value() * 100, TIME_HOURS, aTemp, sizeof(aTemp));
+			}
+			else
+			{
+				aTemp[0] = '\0';
+			}
+		}
+
+		UI()->DoLabel(&Score, aTemp, FontSize, TEXTALIGN_ML);
+
+		// render tee if available
+		if(CurrentClient.m_aSkin[0] != '\0')
+		{
+			const CTeeRenderInfo TeeInfo = GetTeeRenderInfo(vec2(Skin.w, Skin.h), CurrentClient.m_aSkin, CurrentClient.m_CustomSkinColors, CurrentClient.m_CustomSkinColorBody, CurrentClient.m_CustomSkinColorFeet);
+			const CAnimState *pIdleState = CAnimState::GetIdle();
+			vec2 OffsetToMid;
+			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+			const vec2 TeeRenderPos = vec2(Skin.x + TeeInfo.m_Size / 2.0f, Skin.y + Skin.h / 2.0f + OffsetToMid.y);
+			RenderTools()->RenderTee(pIdleState, &TeeInfo, CurrentClient.m_Afk ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+		}
+
+		// name
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, Name.x, Name.y + (Name.h - (FontSize - 1.0f)) / 2.0f, FontSize - 1.0f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+		Cursor.m_LineWidth = Name.w;
+		const char *pName = CurrentClient.m_aName;
+		bool Printed = false;
+		if(g_Config.m_BrFilterString[0])
+			Printed = PrintHighlighted(pName, [&](const char *pFilteredStr, const int FilterLen) {
+				TextRender()->TextEx(&Cursor, pName, (int)(pFilteredStr - pName));
+				TextRender()->TextColor(gs_HighlightedTextColor);
+				TextRender()->TextEx(&Cursor, pFilteredStr, FilterLen);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+				TextRender()->TextEx(&Cursor, pFilteredStr + FilterLen, -1);
+			});
+		if(!Printed)
+			TextRender()->TextEx(&Cursor, pName, -1);
+
+		// clan
+		TextRender()->SetCursor(&Cursor, Clan.x, Clan.y + (Clan.h - (FontSize - 2.0f)) / 2.0f, FontSize - 2.0f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+		Cursor.m_LineWidth = Clan.w;
+		const char *pClan = CurrentClient.m_aClan;
+		Printed = false;
+		if(g_Config.m_BrFilterString[0])
+			Printed = PrintHighlighted(pClan, [&](const char *pFilteredStr, const int FilterLen) {
+				TextRender()->TextEx(&Cursor, pClan, (int)(pFilteredStr - pClan));
+				TextRender()->TextColor(0.4f, 0.4f, 1.0f, 1.0f);
+				TextRender()->TextEx(&Cursor, pFilteredStr, FilterLen);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+				TextRender()->TextEx(&Cursor, pFilteredStr + FilterLen, -1);
+			});
+		if(!Printed)
+			TextRender()->TextEx(&Cursor, pClan, -1);
+
+		// flag
+		m_pClient->m_CountryFlags.Render(CurrentClient.m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), Flag.x, Flag.y, Flag.w, Flag.h);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(s_ListBox.WasItemSelected())
+	{
+		const CServerInfo::CClient &SelectedClient = pSelectedServer->m_aClients[NewSelected];
+		if(SelectedClient.m_FriendState == IFriends::FRIEND_PLAYER)
+			m_pClient->Friends()->RemoveFriend(SelectedClient.m_aName, SelectedClient.m_aClan);
+		else
+			m_pClient->Friends()->AddFriend(SelectedClient.m_aName, SelectedClient.m_aClan);
+		FriendlistOnUpdate();
+		Client()->ServerBrowserUpdate();
+	}
+}
+
+void CMenus::RenderServerbrowserFriends(CUIRect View)
+{
+	const float FontSize = 10.0f;
+	static bool s_aListExtended[NUM_FRIEND_TYPES] = {true, true, false};
+	static const ColorRGBA s_aListColors[NUM_FRIEND_TYPES] = {ColorRGBA(0.5f, 1.0f, 0.5f, 1.0f), ColorRGBA(0.4f, 0.4f, 1.0f, 1.0f), ColorRGBA(1.0f, 0.5f, 0.5f, 1.0f)};
+	// Alternates of s_aListColors include: AFK friend color, AFK clanmate color, Offline clan color.
+	static const ColorRGBA s_aListColorAlternates[NUM_FRIEND_TYPES] = {ColorRGBA(1.0f, 1.0f, 0.5f, 1.0f), ColorRGBA(0.4f, 0.75f, 1.0f, 1.0f), ColorRGBA(0.7f, 0.45f, 0.75f, 1.0f)};
+	const float SpacingH = 2.0f;
+
+	CUIRect List, ServerFriends;
+	View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_NONE, 0.0f);
+	View.HSplitBottom(70.0f, &List, &ServerFriends);
+	List.HSplitTop(5.0f, nullptr, &List);
+	List.VSplitLeft(5.0f, nullptr, &List);
+
+	// calculate friends
+	// TODO: optimize this
+	m_pRemoveFriend = nullptr;
+	for(auto &vFriends : m_avFriends)
+		vFriends.clear();
+
+	for(int FriendIndex = 0; FriendIndex < m_pClient->Friends()->NumFriends(); ++FriendIndex)
+	{
+		m_avFriends[FRIEND_OFF].emplace_back(m_pClient->Friends()->GetFriend(FriendIndex));
+	}
+
+	for(int ServerIndex = 0; ServerIndex < ServerBrowser()->NumSortedServers(); ++ServerIndex)
+	{
+		const CServerInfo *pEntry = ServerBrowser()->SortedGet(ServerIndex);
+		if(pEntry->m_FriendState == IFriends::FRIEND_NO)
+			continue;
+
+		for(int ClientIndex = 0; ClientIndex < pEntry->m_NumClients; ++ClientIndex)
+		{
+			const CServerInfo::CClient &CurrentClient = pEntry->m_aClients[ClientIndex];
+			if(CurrentClient.m_FriendState == IFriends::FRIEND_NO)
+				continue;
+
+			const int FriendIndex = CurrentClient.m_FriendState == IFriends::FRIEND_PLAYER ? FRIEND_PLAYER_ON : FRIEND_CLAN_ON;
+			m_avFriends[FriendIndex].emplace_back(CurrentClient, pEntry);
+			const auto &&RemovalPredicate = [CurrentClient](const CFriendItem &Friend) {
+				return (Friend.Name()[0] == '\0' || str_comp(Friend.Name(), CurrentClient.m_aName) == 0) && ((Friend.Name()[0] != '\0' && g_Config.m_ClFriendsIgnoreClan) || str_comp(Friend.Clan(), CurrentClient.m_aClan) == 0);
+			};
+			m_avFriends[FRIEND_OFF].erase(std::remove_if(m_avFriends[FRIEND_OFF].begin(), m_avFriends[FRIEND_OFF].end(), RemovalPredicate), m_avFriends[FRIEND_OFF].end());
+		}
+	}
+	for(auto &vFriends : m_avFriends)
+		std::sort(vFriends.begin(), vFriends.end());
+
+	// friends list
+	static CScrollRegion s_ScrollRegion;
+	if(!s_ScrollRegion.ScrollbarShown())
+		List.VSplitRight(5.0f, &List, nullptr);
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 16.0f;
+	ScrollParams.m_ScrollbarMargin = 5.0f;
+	ScrollParams.m_ScrollUnit = 80.0f;
+	s_ScrollRegion.Begin(&List, &ScrollOffset, &ScrollParams);
+	List.y += ScrollOffset.y;
+
+	char aBuf[256];
+	for(size_t FriendType = 0; FriendType < NUM_FRIEND_TYPES; ++FriendType)
+	{
+		// header
+		CUIRect Header, GroupIcon, GroupLabel;
+		List.HSplitTop(ms_ListheaderHeight, &Header, &List);
+		s_ScrollRegion.AddRect(Header);
+		Header.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, UI()->HotItem() == &s_aListExtended[FriendType] ? 0.4f : 0.25f), IGraphics::CORNER_ALL, 5.0f);
+		Header.VSplitLeft(Header.h, &GroupIcon, &GroupLabel);
+		GroupIcon.Margin(2.0f, &GroupIcon);
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->TextColor(UI()->HotItem() == &s_aListExtended[FriendType] ? TextRender()->DefaultTextColor() : ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f));
+		UI()->DoLabel(&GroupIcon, s_aListExtended[FriendType] ? FONT_ICON_SQUARE_MINUS : FONT_ICON_SQUARE_PLUS, GroupIcon.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		switch(FriendType)
+		{
+		case FRIEND_PLAYER_ON:
+			str_format(aBuf, sizeof(aBuf), Localize("Online players (%d)"), (int)m_avFriends[FriendType].size());
+			break;
+		case FRIEND_CLAN_ON:
+			str_format(aBuf, sizeof(aBuf), Localize("Online clanmates (%d)"), (int)m_avFriends[FriendType].size());
+			break;
+		case FRIEND_OFF:
+			str_format(aBuf, sizeof(aBuf), Localize("Offline (%d)", "friends (server browser)"), (int)m_avFriends[FriendType].size());
+			break;
+		default:
+			dbg_assert(false, "FriendType invalid");
+			break;
+		}
+		UI()->DoLabel(&GroupLabel, aBuf, FontSize, TEXTALIGN_ML);
+		if(UI()->DoButtonLogic(&s_aListExtended[FriendType], 0, &Header))
+		{
+			s_aListExtended[FriendType] = !s_aListExtended[FriendType];
+		}
+
+		// entries
+		if(s_aListExtended[FriendType])
+		{
+			for(size_t FriendIndex = 0; FriendIndex < m_avFriends[FriendType].size(); ++FriendIndex)
+			{
+				// space
+				{
+					CUIRect Space;
+					List.HSplitTop(SpacingH, &Space, &List);
+					s_ScrollRegion.AddRect(Space);
+				}
+
+				CUIRect Rect;
+				const auto &Friend = m_avFriends[FriendType][FriendIndex];
+				List.HSplitTop(11.0f + 10.0f + 2 * 2.0f + 1.0f + (Friend.ServerInfo() == nullptr ? 0.0f : 10.0f), &Rect, &List);
+				s_ScrollRegion.AddRect(Rect);
+				if(s_ScrollRegion.RectClipped(Rect))
+					continue;
+
+				const bool Inside = UI()->HotItem() == Friend.ListItemId() || UI()->HotItem() == Friend.RemoveButtonId() || UI()->HotItem() == Friend.CommunityTooltipId();
+				bool ButtonResult = UI()->DoButtonLogic(Friend.ListItemId(), 0, &Rect);
+				if(Friend.ServerInfo())
+				{
+					GameClient()->m_Tooltips.DoToolTip(Friend.ListItemId(), &Rect, Localize("Click to select server. Double click to join your friend."));
+				}
+				const bool AlternateColor = (FriendType != FRIEND_OFF && Friend.IsAfk()) || (Friend.FriendState() == IFriends::FRIEND_CLAN && FriendType == FRIEND_OFF);
+				Rect.Draw((AlternateColor ? s_aListColorAlternates[FriendType] : s_aListColors[FriendType]).WithAlpha(Inside ? 0.5f : 0.3f), IGraphics::CORNER_ALL, 5.0f);
+				Rect.Margin(2.0f, &Rect);
+
+				CUIRect RemoveButton, NameLabel, ClanLabel, InfoLabel;
+				Rect.HSplitTop(16.0f, &RemoveButton, nullptr);
+				RemoveButton.VSplitRight(13.0f, nullptr, &RemoveButton);
+				RemoveButton.HMargin((RemoveButton.h - RemoveButton.w) / 2.0f, &RemoveButton);
+				Rect.VSplitLeft(2.0f, nullptr, &Rect);
+
+				if(Friend.ServerInfo())
+					Rect.HSplitBottom(10.0f, &Rect, &InfoLabel);
+				Rect.HSplitTop(11.0f + 10.0f, &Rect, nullptr);
+
+				// tee
+				if(Friend.Skin()[0] != '\0')
+				{
+					CUIRect Skin;
+					Rect.VSplitLeft(Rect.h, &Skin, &Rect);
+					Rect.VSplitLeft(2.0f, nullptr, &Rect);
+
+					const CTeeRenderInfo TeeInfo = GetTeeRenderInfo(vec2(Skin.w, Skin.h), Friend.Skin(), Friend.CustomSkinColors(), Friend.CustomSkinColorBody(), Friend.CustomSkinColorFeet());
+					const CAnimState *pIdleState = CAnimState::GetIdle();
+					vec2 OffsetToMid;
+					RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+					const vec2 TeeRenderPos = vec2(Skin.x + Skin.w / 2.0f, Skin.y + Skin.h * 0.55f + OffsetToMid.y);
+					RenderTools()->RenderTee(pIdleState, &TeeInfo, Friend.IsAfk() ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+				}
+				Rect.HSplitTop(11.0f, &NameLabel, &ClanLabel);
+
+				// name
+				UI()->DoLabel(&NameLabel, Friend.Name(), FontSize - 1.0f, TEXTALIGN_ML);
+
+				// clan
+				UI()->DoLabel(&ClanLabel, Friend.Clan(), FontSize - 2.0f, TEXTALIGN_ML);
+
+				// server info
+				if(Friend.ServerInfo())
+				{
+					// community icon
+					const CCommunity *pCommunity = ServerBrowser()->Community(Friend.ServerInfo()->m_aCommunityId);
+					if(pCommunity != nullptr)
+					{
+						const SCommunityIcon *pIcon = FindCommunityIcon(pCommunity->Id());
+						if(pIcon != nullptr)
+						{
+							CUIRect CommunityIcon;
+							InfoLabel.VSplitLeft(21.0f, &CommunityIcon, &InfoLabel);
+							InfoLabel.VSplitLeft(2.0f, nullptr, &InfoLabel);
+							RenderCommunityIcon(pIcon, CommunityIcon, true);
+							UI()->DoButtonLogic(Friend.CommunityTooltipId(), 0, &CommunityIcon);
+							GameClient()->m_Tooltips.DoToolTip(Friend.CommunityTooltipId(), &CommunityIcon, pCommunity->Name());
+						}
+					}
+
+					// server info text
+					char aLatency[16];
+					FormatServerbrowserPing(aLatency, Friend.ServerInfo());
+					if(aLatency[0] != '\0')
+						str_format(aBuf, sizeof(aBuf), "%s | %s | %s", Friend.ServerInfo()->m_aMap, Friend.ServerInfo()->m_aGameType, aLatency);
+					else
+						str_format(aBuf, sizeof(aBuf), "%s | %s", Friend.ServerInfo()->m_aMap, Friend.ServerInfo()->m_aGameType);
+					UI()->DoLabel(&InfoLabel, aBuf, FontSize - 2.0f, TEXTALIGN_ML);
+				}
+
+				// remove button
+				if(Inside)
+				{
+					TextRender()->TextColor(UI()->HotItem() == Friend.RemoveButtonId() ? TextRender()->DefaultTextColor() : ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
+					TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+					TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+					UI()->DoLabel(&RemoveButton, FONT_ICON_TRASH, RemoveButton.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+					TextRender()->SetRenderFlags(0);
+					TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+					TextRender()->TextColor(TextRender()->DefaultTextColor());
+					if(UI()->DoButtonLogic(Friend.RemoveButtonId(), 0, &RemoveButton))
+					{
+						m_pRemoveFriend = &Friend;
+						ButtonResult = false;
+					}
+					GameClient()->m_Tooltips.DoToolTip(Friend.RemoveButtonId(), &RemoveButton, Friend.FriendState() == IFriends::FRIEND_PLAYER ? Localize("Click to remove this player from your friends list.") : Localize("Click to remove this clan from your friends list."));
+				}
+
+				// handle click and double click on item
+				if(ButtonResult && Friend.ServerInfo())
+				{
+					str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress);
+					m_ServerBrowserShouldRevealSelection = true;
+					if(Input()->MouseDoubleClick())
+					{
+						Connect(g_Config.m_UiServerAddress);
+					}
+				}
+			}
+
+			if(m_avFriends[FriendType].empty())
+			{
+				CUIRect Label;
+				List.HSplitTop(12.0f, &Label, &List);
+				s_ScrollRegion.AddRect(Label);
+				UI()->DoLabel(&Label, Localize("None"), Label.h * CUI::ms_FontmodHeight, TEXTALIGN_ML);
+			}
+		}
+
+		// space
+		{
+			CUIRect Space;
+			List.HSplitTop(SpacingH, &Space, &List);
+			s_ScrollRegion.AddRect(Space);
+		}
+	}
+	s_ScrollRegion.End();
+
+	if(m_pRemoveFriend != nullptr)
+	{
+		char aMessage[256];
+		str_format(aMessage, sizeof(aMessage),
+			m_pRemoveFriend->FriendState() == IFriends::FRIEND_PLAYER ? Localize("Are you sure that you want to remove the player '%s' from your friends list?") : Localize("Are you sure that you want to remove the clan '%s' from your friends list?"),
+			m_pRemoveFriend->FriendState() == IFriends::FRIEND_PLAYER ? m_pRemoveFriend->Name() : m_pRemoveFriend->Clan());
+		PopupConfirm(Localize("Remove friend"), aMessage, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmRemoveFriend);
+	}
+
+	// add friend
+	if(m_pClient->Friends()->NumFriends() < IFriends::MAX_FRIENDS)
+	{
+		CUIRect Button;
+		ServerFriends.Margin(5.0f, &ServerFriends);
+
+		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
+		str_format(aBuf, sizeof(aBuf), "%s:", Localize("Name"));
+		UI()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
+		Button.VSplitLeft(80.0f, nullptr, &Button);
+		static CLineInputBuffered<MAX_NAME_LENGTH> s_NameInput;
+		UI()->DoEditBox(&s_NameInput, &Button, FontSize + 2.0f);
+
+		ServerFriends.HSplitTop(3.0f, nullptr, &ServerFriends);
+		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
+		str_format(aBuf, sizeof(aBuf), "%s:", Localize("Clan"));
+		UI()->DoLabel(&Button, aBuf, FontSize + 2.0f, TEXTALIGN_ML);
+		Button.VSplitLeft(80.0f, nullptr, &Button);
+		static CLineInputBuffered<MAX_CLAN_LENGTH> s_ClanInput;
+		UI()->DoEditBox(&s_ClanInput, &Button, FontSize + 2.0f);
+
+		ServerFriends.HSplitTop(3.0f, nullptr, &ServerFriends);
+		ServerFriends.HSplitTop(18.0f, &Button, &ServerFriends);
+		static CButtonContainer s_AddButton;
+		if(DoButton_Menu(&s_AddButton, s_NameInput.IsEmpty() && !s_ClanInput.IsEmpty() ? Localize("Add Clan") : Localize("Add Friend"), 0, &Button))
+		{
+			m_pClient->Friends()->AddFriend(s_NameInput.GetString(), s_ClanInput.GetString());
+			s_NameInput.Clear();
+			s_ClanInput.Clear();
+			FriendlistOnUpdate();
+			Client()->ServerBrowserUpdate();
+		}
+	}
+}
+
+void CMenus::FriendlistOnUpdate()
+{
+	// TODO: friends are currently updated every frame; optimize and only update friends when necessary
+}
+
+void CMenus::PopupConfirmRemoveFriend()
+{
+	m_pClient->Friends()->RemoveFriend(m_pRemoveFriend->FriendState() == IFriends::FRIEND_PLAYER ? m_pRemoveFriend->Name() : "", m_pRemoveFriend->Clan());
+	FriendlistOnUpdate();
+	Client()->ServerBrowserUpdate();
+	m_pRemoveFriend = nullptr;
+}
+
+enum
+{
+	UI_TOOLBOX_PAGE_FILTERS = 0,
+	UI_TOOLBOX_PAGE_INFO,
+	UI_TOOLBOX_PAGE_FRIENDS,
+	NUM_UI_TOOLBOX_PAGES,
+};
+
+void CMenus::RenderServerbrowserTabBar(CUIRect TabBar)
+{
+	CUIRect FilterTabButton, InfoTabButton, FriendsTabButton;
+	TabBar.VSplitLeft(TabBar.w / 3.0f, &FilterTabButton, &TabBar);
+	TabBar.VSplitMid(&InfoTabButton, &FriendsTabButton);
+
+	const ColorRGBA ColorActive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f);
+	const ColorRGBA ColorInactive = ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f);
+
+	if(!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_TAB))
+	{
+		const int Direction = Input()->ShiftIsPressed() ? -1 : 1;
+		g_Config.m_UiToolboxPage = (g_Config.m_UiToolboxPage + NUM_UI_TOOLBOX_PAGES + Direction) % NUM_UI_TOOLBOX_PAGES;
+	}
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+	static CButtonContainer s_FilterTabButton;
+	if(DoButton_MenuTab(&s_FilterTabButton, FONT_ICON_LIST_UL, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_FILTERS, &FilterTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_FILTER], &ColorInactive, &ColorActive))
+		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_FILTERS;
+
+	static CButtonContainer s_InfoTabButton;
+	if(DoButton_MenuTab(&s_InfoTabButton, FONT_ICON_INFO, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_INFO, &InfoTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_INFO], &ColorInactive, &ColorActive))
+		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_INFO;
+
+	static CButtonContainer s_FriendsTabButton;
+	if(DoButton_MenuTab(&s_FriendsTabButton, FONT_ICON_HEART, g_Config.m_UiToolboxPage == UI_TOOLBOX_PAGE_FRIENDS, &FriendsTabButton, IGraphics::CORNER_T, &m_aAnimatorsSmallPage[SMALL_TAB_BROWSER_FRIENDS], &ColorInactive, &ColorActive))
+		g_Config.m_UiToolboxPage = UI_TOOLBOX_PAGE_FRIENDS;
+
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+}
+
+void CMenus::RenderServerbrowserToolBox(CUIRect ToolBox)
+{
+	ToolBox.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 4.0f);
+
+	switch(g_Config.m_UiToolboxPage)
+	{
+	case UI_TOOLBOX_PAGE_FILTERS:
+		RenderServerbrowserFilters(ToolBox);
+		return;
+	case UI_TOOLBOX_PAGE_INFO:
+		RenderServerbrowserInfo(ToolBox);
+		return;
+	case UI_TOOLBOX_PAGE_FRIENDS:
+		RenderServerbrowserFriends(ToolBox);
+		return;
+	default:
+		dbg_assert(false, "ui_toolbox_page invalid");
+		return;
+	}
+}
+
+void CMenus::RenderServerbrowser(CUIRect MainView)
+{
+	UpdateCommunityCache(false);
+	UpdateCommunityIcons();
+
+	/*
+		+-----------------+	+--tabs--+
+		|				  |	|		 |
+		|				  |	|		 |
+		|   server list	  |	|  tool	 |
+		|				  |	|  box	 |
+		|				  |	|		 |
+		+-----------------+	|	 	 |
+			status box		+--------+
+	*/
+
+	CUIRect ServerList, StatusBox, ToolBox, TabBar;
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+	MainView.Margin(10.0f, &MainView);
+	MainView.VSplitRight(205.0f, &ServerList, &ToolBox);
+	ServerList.VSplitRight(5.0f, &ServerList, nullptr);
+	ToolBox.HSplitTop(24.0f, &TabBar, &ToolBox);
+	ServerList.HSplitBottom(65.0f, &ServerList, &StatusBox);
+
+	bool WasListboxItemActivated;
+	RenderServerbrowserServerList(ServerList, WasListboxItemActivated);
+	RenderServerbrowserStatusBox(StatusBox, WasListboxItemActivated);
+
+	RenderServerbrowserTabBar(TabBar);
+	RenderServerbrowserToolBox(ToolBox);
+}
+
+template<typename F>
+bool CMenus::PrintHighlighted(const char *pName, F &&PrintFn)
+{
+	const char *pStr = g_Config.m_BrFilterString;
+	char aFilterStr[sizeof(g_Config.m_BrFilterString)];
+	while((pStr = str_next_token(pStr, IServerBrowser::SEARCH_EXCLUDE_TOKEN, aFilterStr, sizeof(aFilterStr))))
+	{
+		// highlight the parts that matches
+		const char *pFilteredStr;
+		int FilterLen = str_length(aFilterStr);
+		if(aFilterStr[0] == '"' && aFilterStr[FilterLen - 1] == '"')
+		{
+			aFilterStr[FilterLen - 1] = '\0';
+			pFilteredStr = str_comp(pName, &aFilterStr[1]) == 0 ? pName : nullptr;
+			FilterLen -= 2;
+		}
+		else
+		{
+			const char *pFilteredStrEnd;
+			pFilteredStr = str_utf8_find_nocase(pName, aFilterStr, &pFilteredStrEnd);
+			if(pFilteredStr != nullptr && pFilteredStrEnd != nullptr)
+				FilterLen = pFilteredStrEnd - pFilteredStr;
+		}
+		if(pFilteredStr)
+		{
+			PrintFn(pFilteredStr, FilterLen);
+			return true;
+		}
+	}
+	return false;
+}
+
+CTeeRenderInfo CMenus::GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const
+{
+	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
+
+	CTeeRenderInfo TeeInfo;
+	TeeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	TeeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	TeeInfo.m_SkinMetrics = pSkin->m_Metrics;
+	TeeInfo.m_CustomColoredSkin = CustomSkinColors;
+	if(CustomSkinColors)
+	{
+		TeeInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorBody).UnclampLighting());
+		TeeInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(CustomSkinColorFeet).UnclampLighting());
+	}
+	else
+	{
+		TeeInfo.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
+		TeeInfo.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
+	}
+	TeeInfo.m_Size = minimum(Size.x, Size.y);
+	return TeeInfo;
+}
+
+void CMenus::ConchainFriendlistUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	CMenus *pThis = ((CMenus *)pUserData);
+	if(pResult->NumArguments() >= 1 && (pThis->Client()->State() == IClient::STATE_OFFLINE || pThis->Client()->State() == IClient::STATE_ONLINE))
+	{
+		pThis->FriendlistOnUpdate();
+		pThis->Client()->ServerBrowserUpdate();
+	}
+}
+
+void CMenus::ConchainFavoritesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments() >= 1 && g_Config.m_UiPage == PAGE_FAVORITES)
+		((CMenus *)pUserData)->ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+}
+
+void CMenus::ConchainCommunitiesUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	CMenus *pThis = static_cast<CMenus *>(pUserData);
+	if(pResult->NumArguments() >= 1 && (g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES))
+	{
+		pThis->ServerBrowser()->CleanFilters();
+		pThis->UpdateCommunityCache(true);
+		pThis->Client()->ServerBrowserUpdate();
+	}
+}
+
+void CMenus::UpdateCommunityCache(bool Force)
+{
+	const bool PageWithCommunities = g_Config.m_UiPage == PAGE_INTERNET || g_Config.m_UiPage == PAGE_FAVORITES;
+	if(!Force && m_CommunityCache.m_UpdateTime != 0 && m_CommunityCache.m_UpdateTime == ServerBrowser()->DDNetInfoUpdateTime() && m_CommunityCache.m_PageWithCommunities == PageWithCommunities)
+		return;
+
+	m_CommunityCache.m_UpdateTime = ServerBrowser()->DDNetInfoUpdateTime();
+	m_CommunityCache.m_PageWithCommunities = PageWithCommunities;
+
+	if(m_CommunityCache.m_PageWithCommunities)
+		m_CommunityCache.m_vpSelectedCommunities = ServerBrowser()->SelectedCommunities();
+	else
+		m_CommunityCache.m_vpSelectedCommunities.clear();
+
+	m_CommunityCache.m_vpSelectableCountries.clear();
+	m_CommunityCache.m_vpSelectableTypes.clear();
+	for(const CCommunity *pCommunity : m_CommunityCache.m_vpSelectedCommunities)
+	{
+		for(const auto &Country : pCommunity->Countries())
+		{
+			const auto ExistingCountry = std::find_if(m_CommunityCache.m_vpSelectableCountries.begin(), m_CommunityCache.m_vpSelectableCountries.end(), [&](const CCommunityCountry *pOther) {
+				return str_comp(Country.Name(), pOther->Name()) == 0 && Country.FlagId() == pOther->FlagId();
+			});
+			if(ExistingCountry == m_CommunityCache.m_vpSelectableCountries.end())
+			{
+				m_CommunityCache.m_vpSelectableCountries.push_back(&Country);
+			}
+		}
+		for(const auto &Type : pCommunity->Types())
+		{
+			const auto ExistingType = std::find_if(m_CommunityCache.m_vpSelectableTypes.begin(), m_CommunityCache.m_vpSelectableTypes.end(), [&](const CCommunityType *pOther) {
+				return str_comp(Type.Name(), pOther->Name()) == 0;
+			});
+			if(ExistingType == m_CommunityCache.m_vpSelectableTypes.end())
+			{
+				m_CommunityCache.m_vpSelectableTypes.push_back(&Type);
+			}
+		}
+	}
+
+	m_CommunityCache.m_AnyRanksAvailable = std::any_of(m_CommunityCache.m_vpSelectedCommunities.begin(), m_CommunityCache.m_vpSelectedCommunities.end(), [](const CCommunity *pCommunity) {
+		return pCommunity->HasRanks();
+	});
+}
+
+CMenus::CAbstractCommunityIconJob::CAbstractCommunityIconJob(CMenus *pMenus, const char *pCommunityId, int StorageType) :
+	m_pMenus(pMenus),
+	m_StorageType(StorageType)
+{
+	str_copy(m_aCommunityId, pCommunityId);
+	str_format(m_aPath, sizeof(m_aPath), "communityicons/%s.png", pCommunityId);
+}
+
+CMenus::CAbstractCommunityIconJob::~CAbstractCommunityIconJob()
+{
+	free(m_ImageInfo.m_pData);
+	m_ImageInfo.m_pData = nullptr;
+}
+
+int CMenus::CCommunityIconDownloadJob::OnCompletion(int State)
+{
+	State = CHttpRequest::OnCompletion(State);
+	if(State == HTTP_DONE)
+	{
+		if(m_pMenus->LoadCommunityIconFile(Dest(), IStorage::TYPE_SAVE, m_ImageInfo, m_Sha256))
+			m_Success = true;
+		else
+			State = HTTP_ERROR;
+	}
+	return State;
+}
+
+CMenus::CCommunityIconDownloadJob::CCommunityIconDownloadJob(CMenus *pMenus, const char *pCommunityId, const char *pUrl, const SHA256_DIGEST &Sha256) :
+	CHttpRequest(pUrl),
+	CAbstractCommunityIconJob(pMenus, pCommunityId, IStorage::TYPE_SAVE)
+{
+	WriteToFile(pMenus->Storage(), m_aPath, IStorage::TYPE_SAVE);
+	ExpectSha256(Sha256);
+	Timeout(CTimeout{0, 0, 0, 0});
+	LogProgress(HTTPLOG::FAILURE);
+}
+
+void CMenus::CCommunityIconLoadJob::Run()
+{
+	m_Success = m_pMenus->LoadCommunityIconFile(m_aPath, m_StorageType, m_ImageInfo, m_Sha256);
+}
+
+CMenus::CCommunityIconLoadJob::CCommunityIconLoadJob(CMenus *pMenus, const char *pCommunityId, int StorageType) :
+	CAbstractCommunityIconJob(pMenus, pCommunityId, StorageType)
+{
+}
+
+int CMenus::CommunityIconScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	const char *pExtension = ".png";
+	CMenus *pSelf = static_cast<CMenus *>(pUser);
+	if(IsDir || !str_endswith(pName, pExtension) || str_length(pName) - str_length(pExtension) >= (int)CServerInfo::MAX_COMMUNITY_ID_LENGTH)
+		return 0;
+
+	char aCommunityId[CServerInfo::MAX_COMMUNITY_ID_LENGTH];
+	str_truncate(aCommunityId, sizeof(aCommunityId), pName, str_length(pName) - str_length(pExtension));
+
+	std::shared_ptr<CCommunityIconLoadJob> pJob = std::make_shared<CCommunityIconLoadJob>(pSelf, aCommunityId, DirType);
+	pSelf->Engine()->AddJob(pJob);
+	pSelf->m_CommunityIconLoadJobs.push_back(pJob);
+	return 0;
+}
+
+const CMenus::SCommunityIcon *CMenus::FindCommunityIcon(const char *pCommunityId)
+{
+	auto Icon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) {
+		return str_comp(Element.m_aCommunityId, pCommunityId) == 0;
+	});
+	return Icon == m_vCommunityIcons.end() ? nullptr : &(*Icon);
+}
+
+bool CMenus::LoadCommunityIconFile(const char *pPath, int DirType, CImageInfo &Info, SHA256_DIGEST &Sha256)
+{
+	char aError[IO_MAX_PATH_LENGTH + 128];
+	if(!Graphics()->LoadPNG(&Info, pPath, DirType))
+	{
+		str_format(aError, sizeof(aError), "Failed to load community icon from '%s'", pPath);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
+		return false;
+	}
+	if(Info.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		Graphics()->FreePNG(&Info);
+		str_format(aError, sizeof(aError), "Failed to load community icon from '%s': must be an RGBA image", pPath);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
+		return false;
+	}
+	if(!Storage()->CalculateHashes(pPath, DirType, &Sha256))
+	{
+		Graphics()->FreePNG(&Info);
+		str_format(aError, sizeof(aError), "Failed to load community icon from '%s': could not calculate hash", pPath);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "menus/browser", aError);
+		return false;
+	}
+	return true;
+}
+
+void CMenus::LoadCommunityIconFinish(const char *pCommunityId, CImageInfo &&Info, SHA256_DIGEST &&Sha256)
+{
+	SCommunityIcon CommunityIcon;
+	str_copy(CommunityIcon.m_aCommunityId, pCommunityId);
+	CommunityIcon.m_Sha256 = Sha256;
+	CommunityIcon.m_OrgTexture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+
+	// create gray scale version
+	unsigned char *pData = static_cast<unsigned char *>(Info.m_pData);
+	const size_t Step = Info.PixelSize();
+	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
+	{
+		int v = (pData[i * Step] + pData[i * Step + 1] + pData[i * Step + 2]) / 3;
+		pData[i * Step] = v;
+		pData[i * Step + 1] = v;
+		pData[i * Step + 2] = v;
+	}
+	CommunityIcon.m_GreyTexture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, 0);
+	Graphics()->FreePNG(&Info);
+
+	auto ExistingIcon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [pCommunityId](const SCommunityIcon &Element) {
+		return str_comp(Element.m_aCommunityId, pCommunityId) == 0;
+	});
+	if(ExistingIcon == m_vCommunityIcons.end())
+	{
+		m_vCommunityIcons.push_back(CommunityIcon);
+	}
+	else
+	{
+		Graphics()->UnloadTexture(&ExistingIcon->m_OrgTexture);
+		Graphics()->UnloadTexture(&ExistingIcon->m_GreyTexture);
+		*ExistingIcon = CommunityIcon;
+	}
+
+	char aBuf[CServerInfo::MAX_COMMUNITY_ID_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "Loaded community icon '%s'", pCommunityId);
+	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "menus/browser", aBuf);
+}
+
+void CMenus::RenderCommunityIcon(const SCommunityIcon *pIcon, CUIRect Rect, bool Active)
+{
+	Rect.VMargin(Rect.w / 2.0f - Rect.h, &Rect);
+
+	Graphics()->TextureSet(Active ? pIcon->m_OrgTexture : pIcon->m_GreyTexture);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, Active ? 1.0f : 0.5f);
+	IGraphics::CQuadItem QuadItem(Rect.x, Rect.y, Rect.w, Rect.h);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+}
+
+void CMenus::UpdateCommunityIcons()
+{
+	// Update load jobs (icon is loaded from existing file)
+	if(!m_CommunityIconLoadJobs.empty())
+	{
+		std::shared_ptr<CCommunityIconLoadJob> pJob = m_CommunityIconLoadJobs.front();
+		if(pJob->Status() == IJob::STATE_DONE)
+		{
+			if(pJob->Success())
+				LoadCommunityIconFinish(pJob->CommunityId(), pJob->ImageInfo(), pJob->Sha256());
+			m_CommunityIconLoadJobs.pop_front();
+		}
+
+		// Don't start download jobs until all load jobs are done
+		if(!m_CommunityIconLoadJobs.empty())
+			return;
+	}
+
+	// Update download jobs (icon is downloaded and loaded from new file)
+	if(!m_CommunityIconDownloadJobs.empty())
+	{
+		std::shared_ptr<CCommunityIconDownloadJob> pJob = m_CommunityIconDownloadJobs.front();
+		if(pJob->Status() == IJob::STATE_DONE)
+		{
+			if(pJob->Success())
+				LoadCommunityIconFinish(pJob->CommunityId(), pJob->ImageInfo(), pJob->Sha256());
+			m_CommunityIconDownloadJobs.pop_front();
+		}
+	}
+
+	// Rescan for changed communities only when necessary
+	if(m_CommunityIconsUpdateTime != 0 && m_CommunityIconsUpdateTime == ServerBrowser()->DDNetInfoUpdateTime())
+		return;
+	m_CommunityIconsUpdateTime = ServerBrowser()->DDNetInfoUpdateTime();
+
+	// Remove icons for removed communities
+	auto RemovalIterator = m_vCommunityIcons.begin();
+	while(RemovalIterator != m_vCommunityIcons.end())
+	{
+		if(ServerBrowser()->Community(RemovalIterator->m_aCommunityId) == nullptr)
+		{
+			Graphics()->UnloadTexture(&RemovalIterator->m_OrgTexture);
+			Graphics()->UnloadTexture(&RemovalIterator->m_GreyTexture);
+			RemovalIterator = m_vCommunityIcons.erase(RemovalIterator);
+		}
+		else
+		{
+			++RemovalIterator;
+		}
+	}
+
+	// Find added and updated community icons
+	for(const auto &Community : ServerBrowser()->Communities())
+	{
+		if(str_comp(Community.Id(), IServerBrowser::COMMUNITY_NONE) == 0)
+			continue;
+		auto ExistingIcon = std::find_if(m_vCommunityIcons.begin(), m_vCommunityIcons.end(), [Community](const auto &Element) {
+			return str_comp(Element.m_aCommunityId, Community.Id()) == 0;
+		});
+		auto pExistingDownload = std::find_if(m_CommunityIconDownloadJobs.begin(), m_CommunityIconDownloadJobs.end(), [Community](const auto &Element) {
+			return str_comp(Element->CommunityId(), Community.Id()) == 0;
+		});
+		if(pExistingDownload == m_CommunityIconDownloadJobs.end() && (ExistingIcon == m_vCommunityIcons.end() || ExistingIcon->m_Sha256 != Community.IconSha256()))
+		{
+			std::shared_ptr<CCommunityIconDownloadJob> pJob = std::make_shared<CCommunityIconDownloadJob>(this, Community.Id(), Community.IconUrl(), Community.IconSha256());
+			Engine()->AddJob(pJob);
+			m_CommunityIconDownloadJobs.push_back(pJob);
+		}
+	}
+}
diff --git a/src_bkp/game/client/components/menus_demo.cpp b/src_bkp/game/client/components/menus_demo.cpp
new file mode 100644
index 0000000000..506af175ed
--- /dev/null
+++ b/src_bkp/game/client/components/menus_demo.cpp
@@ -0,0 +1,1626 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/hash.h>
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/shared/localization.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/client/components/console.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+
+#include "maplayers.h"
+#include "menus.h"
+
+#include <chrono>
+
+using namespace FontIcons;
+using namespace std::chrono_literals;
+
+int CMenus::DoButton_FontIcon(CButtonContainer *pButtonContainer, const char *pText, int Checked, const CUIRect *pRect, int Corners, bool Enabled)
+{
+	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, (Checked ? 0.10f : 0.5f) * UI()->ButtonColorMul(pButtonContainer)), Corners, 5.0f);
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+	TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	CUIRect Temp;
+	pRect->HMargin(2.0f, &Temp);
+	UI()->DoLabel(&Temp, pText, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+
+	if(!Enabled)
+	{
+		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
+		TextRender()->TextOutlineColor(ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f));
+		UI()->DoLabel(&Temp, FONT_ICON_SLASH, Temp.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+	return UI()->DoButtonLogic(pButtonContainer, Checked, pRect);
+}
+
+bool CMenus::DemoFilterChat(const void *pData, int Size, void *pUser)
+{
+	bool DoFilterChat = *(bool *)pUser;
+	if(!DoFilterChat)
+	{
+		return false;
+	}
+
+	CUnpacker Unpacker;
+	Unpacker.Reset(pData, Size);
+
+	int Msg = Unpacker.GetInt();
+	int Sys = Msg & 1;
+	Msg >>= 1;
+
+	return !Unpacker.Error() && !Sys && Msg == NETMSGTYPE_SV_CHAT;
+}
+
+void CMenus::HandleDemoSeeking(float PositionToSeek, float TimeToSeek)
+{
+	if((PositionToSeek >= 0.0f && PositionToSeek <= 1.0f) || TimeToSeek != 0.0f)
+	{
+		m_pClient->m_Chat.Reset();
+		m_pClient->m_InfoMessages.OnReset();
+		m_pClient->m_Particles.OnReset();
+		m_pClient->m_Sounds.OnReset();
+		m_pClient->m_Scoreboard.OnReset();
+		m_pClient->m_Statboard.OnReset();
+		m_pClient->m_SuppressEvents = true;
+		if(TimeToSeek != 0.0f)
+			DemoPlayer()->SeekTime(TimeToSeek);
+		else
+			DemoPlayer()->SeekPercent(PositionToSeek);
+		m_pClient->m_SuppressEvents = false;
+		m_pClient->m_MapLayersBackground.EnvelopeUpdate();
+		m_pClient->m_MapLayersForeground.EnvelopeUpdate();
+		if(!DemoPlayer()->BaseInfo()->m_Paused && PositionToSeek == 1.0f)
+			DemoPlayer()->Pause();
+	}
+}
+
+void CMenus::DemoSeekTick(IDemoPlayer::ETickOffset TickOffset)
+{
+	m_pClient->m_SuppressEvents = true;
+	DemoPlayer()->SeekTick(TickOffset);
+	m_pClient->m_SuppressEvents = false;
+	DemoPlayer()->Pause();
+	m_pClient->m_MapLayersBackground.EnvelopeUpdate();
+	m_pClient->m_MapLayersForeground.EnvelopeUpdate();
+}
+
+void CMenus::RenderDemoPlayer(CUIRect MainView)
+{
+	const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+	const int CurrentTick = pInfo->m_CurrentTick - pInfo->m_FirstTick;
+	const int TotalTicks = pInfo->m_LastTick - pInfo->m_FirstTick;
+
+	// When rendering a demo and starting paused, render the pause indicator permanently.
+#if defined(CONF_VIDEORECORDER)
+	const bool VideoRendering = IVideo::Current() != nullptr;
+	bool InitialVideoPause = VideoRendering && m_LastPauseChange < 0.0f && pInfo->m_Paused;
+#else
+	const bool VideoRendering = false;
+	bool InitialVideoPause = false;
+#endif
+
+	const auto &&UpdateLastPauseChange = [&]() {
+		// Immediately hide the pause indicator when unpausing the initial pause when rendering a demo.
+		m_LastPauseChange = InitialVideoPause ? 0.0f : Client()->GlobalTime();
+		InitialVideoPause = false;
+	};
+	const auto &&UpdateLastSpeedChange = [&]() {
+		m_LastSpeedChange = Client()->GlobalTime();
+	};
+
+	// threshold value, accounts for slight inaccuracy when setting demo position
+	constexpr int Threshold = 10;
+	const auto &&FindPreviousMarkerPosition = [&]() {
+		for(int i = pInfo->m_NumTimelineMarkers - 1; i >= 0; i--)
+		{
+			if((pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) < CurrentTick && absolute(((pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) - CurrentTick)) > Threshold)
+			{
+				return (float)(pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) / TotalTicks;
+			}
+		}
+		return 0.0f;
+	};
+	const auto &&FindNextMarkerPosition = [&]() {
+		for(int i = 0; i < pInfo->m_NumTimelineMarkers; i++)
+		{
+			if((pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) > CurrentTick && absolute(((pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) - CurrentTick)) > Threshold)
+			{
+				return (float)(pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) / TotalTicks;
+			}
+		}
+		return 1.0f;
+	};
+
+	static int s_SkipDurationIndex = 1;
+	static const int s_aSkipDurationsSeconds[] = {1, 5, 10, 30, 60, 5 * 60, 10 * 60};
+	const int DemoLengthSeconds = TotalTicks / Client()->GameTickSpeed();
+	int NumDurationLabels = 0;
+	for(size_t i = 0; i < std::size(s_aSkipDurationsSeconds); ++i)
+	{
+		if(s_aSkipDurationsSeconds[i] >= DemoLengthSeconds)
+			break;
+		NumDurationLabels = i + 1;
+	}
+	if(NumDurationLabels > 0 && s_SkipDurationIndex >= NumDurationLabels)
+		s_SkipDurationIndex = maximum(0, NumDurationLabels - 1);
+
+	// handle keyboard shortcuts independent of active menu
+	float PositionToSeek = -1.0f;
+	float TimeToSeek = 0.0f;
+	if(m_pClient->m_GameConsole.IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE && g_Config.m_ClDemoKeyboardShortcuts && !UI()->IsPopupOpen())
+	{
+		// increase/decrease speed
+		if(!Input()->ModifierIsPressed() && !Input()->ShiftIsPressed() && !Input()->AltIsPressed())
+		{
+			if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP) || Input()->KeyPress(KEY_UP))
+			{
+				DemoPlayer()->AdjustSpeedIndex(+1);
+				UpdateLastSpeedChange();
+			}
+			else if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN) || Input()->KeyPress(KEY_DOWN))
+			{
+				DemoPlayer()->AdjustSpeedIndex(-1);
+				UpdateLastSpeedChange();
+			}
+		}
+
+		// pause/unpause
+		if(Input()->KeyPress(KEY_SPACE) || Input()->KeyPress(KEY_RETURN) || Input()->KeyPress(KEY_KP_ENTER) || Input()->KeyPress(KEY_K))
+		{
+			if(pInfo->m_Paused)
+			{
+				DemoPlayer()->Unpause();
+			}
+			else
+			{
+				DemoPlayer()->Pause();
+			}
+			UpdateLastPauseChange();
+		}
+
+		// seek backward/forward configured time
+		if(Input()->KeyPress(KEY_LEFT) || Input()->KeyPress(KEY_J))
+		{
+			if(Input()->ModifierIsPressed())
+				PositionToSeek = FindPreviousMarkerPosition();
+			else if(Input()->ShiftIsPressed())
+				s_SkipDurationIndex = maximum(s_SkipDurationIndex - 1, 0);
+			else
+				TimeToSeek = -s_aSkipDurationsSeconds[s_SkipDurationIndex];
+		}
+		else if(Input()->KeyPress(KEY_RIGHT) || Input()->KeyPress(KEY_L))
+		{
+			if(Input()->ModifierIsPressed())
+				PositionToSeek = FindNextMarkerPosition();
+			else if(Input()->ShiftIsPressed())
+				s_SkipDurationIndex = minimum(s_SkipDurationIndex + 1, NumDurationLabels - 1);
+			else
+				TimeToSeek = s_aSkipDurationsSeconds[s_SkipDurationIndex];
+		}
+
+		// seek to 0-90%
+		const int aSeekPercentKeys[] = {KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9};
+		for(unsigned i = 0; i < std::size(aSeekPercentKeys); i++)
+		{
+			if(Input()->KeyPress(aSeekPercentKeys[i]))
+			{
+				PositionToSeek = i * 0.1f;
+				break;
+			}
+		}
+
+		// seek to the beginning/end
+		if(Input()->KeyPress(KEY_HOME))
+		{
+			PositionToSeek = 0.0f;
+		}
+		else if(Input()->KeyPress(KEY_END))
+		{
+			PositionToSeek = 1.0f;
+		}
+
+		// Advance single frame forward/backward with period/comma key
+		if(Input()->KeyPress(KEY_PERIOD))
+		{
+			DemoSeekTick(IDemoPlayer::TICK_NEXT);
+		}
+		else if(Input()->KeyPress(KEY_COMMA))
+		{
+			DemoSeekTick(IDemoPlayer::TICK_PREVIOUS);
+		}
+	}
+
+	const float SeekBarHeight = 15.0f;
+	const float ButtonbarHeight = 20.0f;
+	const float NameBarHeight = 20.0f;
+	const float Margins = 5.0f;
+	const float TotalHeight = SeekBarHeight + ButtonbarHeight + NameBarHeight + Margins * 3;
+
+	if(!m_MenuActive)
+	{
+		// Render pause indicator
+		if(g_Config.m_ClDemoShowPause && (InitialVideoPause || (!VideoRendering && Client()->GlobalTime() - m_LastPauseChange < 0.5f)))
+		{
+			const float Time = InitialVideoPause ? 0.5f : ((Client()->GlobalTime() - m_LastPauseChange) / 0.5f);
+			const float Alpha = (Time < 0.5f ? Time : (1.0f - Time)) * 2.0f;
+			if(Alpha > 0.0f)
+			{
+				TextRender()->TextColor(TextRender()->DefaultTextColor().WithMultipliedAlpha(Alpha));
+				TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor().WithMultipliedAlpha(Alpha));
+				TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+				TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+				UI()->DoLabel(UI()->Screen(), pInfo->m_Paused ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 36.0f + Time * 12.0f, TEXTALIGN_MC);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+				TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+				TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+				TextRender()->SetRenderFlags(0);
+			}
+		}
+
+		// Render speed info
+		if(g_Config.m_ClDemoShowSpeed && Client()->GlobalTime() - m_LastSpeedChange < 1.0f)
+		{
+			CUIRect Screen = *UI()->Screen();
+
+			char aSpeedBuf[16];
+			str_format(aSpeedBuf, sizeof(aSpeedBuf), "×%.2f", pInfo->m_Speed);
+			TextRender()->Text(120.0f, Screen.y + Screen.h - 120.0f - TotalHeight, 60.0f, aSpeedBuf, -1.0f);
+		}
+	}
+	else
+	{
+		if(m_LastPauseChange > 0.0f)
+			m_LastPauseChange = 0.0f;
+		if(m_LastSpeedChange > 0.0f)
+			m_LastSpeedChange = 0.0f;
+	}
+
+	if(CurrentTick == TotalTicks)
+	{
+		DemoPlayer()->Pause();
+		PositionToSeek = 0.0f;
+		UpdateLastPauseChange();
+	}
+
+	if(!m_MenuActive)
+	{
+		HandleDemoSeeking(PositionToSeek, TimeToSeek);
+		return;
+	}
+
+	CUIRect DemoControls;
+	MainView.HSplitBottom(TotalHeight, nullptr, &DemoControls);
+	DemoControls.VSplitLeft(50.0f, nullptr, &DemoControls);
+	DemoControls.VSplitLeft(600.0f, &DemoControls, nullptr);
+	const CUIRect DemoControlsOriginal = DemoControls;
+	DemoControls.x += m_DemoControlsPositionOffset.x;
+	DemoControls.y += m_DemoControlsPositionOffset.y;
+	int Corners = IGraphics::CORNER_NONE;
+	if(DemoControls.x > 0.0f && DemoControls.y > 0.0f)
+		Corners |= IGraphics::CORNER_TL;
+	if(DemoControls.x < MainView.w - DemoControls.w && DemoControls.y > 0.0f)
+		Corners |= IGraphics::CORNER_TR;
+	if(DemoControls.x > 0.0f && DemoControls.y < MainView.h - DemoControls.h)
+		Corners |= IGraphics::CORNER_BL;
+	if(DemoControls.x < MainView.w - DemoControls.w && DemoControls.y < MainView.h - DemoControls.h)
+		Corners |= IGraphics::CORNER_BR;
+	DemoControls.Draw(ms_ColorTabbarActive, Corners, 10.0f);
+	const CUIRect DemoControlsDragRect = DemoControls;
+
+	CUIRect SeekBar, ButtonBar, NameBar, SpeedBar;
+	DemoControls.Margin(5.0f, &DemoControls);
+	DemoControls.HSplitTop(SeekBarHeight, &SeekBar, &ButtonBar);
+	ButtonBar.HSplitTop(Margins, nullptr, &ButtonBar);
+	ButtonBar.HSplitBottom(NameBarHeight, &ButtonBar, &NameBar);
+	NameBar.HSplitTop(4.0f, nullptr, &NameBar);
+
+	// handle draggable demo controls
+	{
+		enum EDragOperation
+		{
+			OP_NONE,
+			OP_DRAGGING,
+			OP_CLICKED
+		};
+		static EDragOperation s_Operation = OP_NONE;
+		static vec2 s_InitialMouse = vec2(0.0f, 0.0f);
+
+		bool Clicked;
+		bool Abrupted;
+		if(int Result = UI()->DoDraggableButtonLogic(&s_Operation, 8, &DemoControlsDragRect, &Clicked, &Abrupted))
+		{
+			if(s_Operation == OP_NONE && Result == 1)
+			{
+				s_InitialMouse = UI()->MousePos();
+				s_Operation = OP_CLICKED;
+			}
+
+			if(Clicked || Abrupted)
+				s_Operation = OP_NONE;
+
+			if(s_Operation == OP_CLICKED && length(UI()->MousePos() - s_InitialMouse) > 5.0f)
+			{
+				s_Operation = OP_DRAGGING;
+				s_InitialMouse -= m_DemoControlsPositionOffset;
+			}
+
+			if(s_Operation == OP_DRAGGING)
+			{
+				m_DemoControlsPositionOffset = UI()->MousePos() - s_InitialMouse;
+				m_DemoControlsPositionOffset.x = clamp(m_DemoControlsPositionOffset.x, -DemoControlsOriginal.x, MainView.w - DemoControlsDragRect.w - DemoControlsOriginal.x);
+				m_DemoControlsPositionOffset.y = clamp(m_DemoControlsPositionOffset.y, -DemoControlsOriginal.y, MainView.h - DemoControlsDragRect.h - DemoControlsOriginal.y);
+			}
+		}
+	}
+
+	// do seekbar
+	{
+		const float Rounding = 5.0f;
+
+		static int s_SeekBarID = 0;
+		void *pId = &s_SeekBarID;
+		char aBuffer[128];
+
+		// draw seek bar
+		SeekBar.Draw(ColorRGBA(0, 0, 0, 0.5f), IGraphics::CORNER_ALL, Rounding);
+
+		// draw filled bar
+		float Amount = CurrentTick / (float)TotalTicks;
+		CUIRect FilledBar = SeekBar;
+		FilledBar.w = 2 * Rounding + (FilledBar.w - 2 * Rounding) * Amount;
+		FilledBar.Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_ALL, Rounding);
+
+		// draw highlighting
+		if(g_Config.m_ClDemoSliceBegin != -1 && g_Config.m_ClDemoSliceEnd != -1)
+		{
+			float RatioBegin = (g_Config.m_ClDemoSliceBegin - pInfo->m_FirstTick) / (float)TotalTicks;
+			float RatioEnd = (g_Config.m_ClDemoSliceEnd - pInfo->m_FirstTick) / (float)TotalTicks;
+			float Span = ((SeekBar.w - 2 * Rounding) * RatioEnd) - ((SeekBar.w - 2 * Rounding) * RatioBegin);
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 0.0f, 0.0f, 0.25f);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * RatioBegin, SeekBar.y, Span, SeekBar.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// draw markers
+		for(int i = 0; i < pInfo->m_NumTimelineMarkers; i++)
+		{
+			float Ratio = (pInfo->m_aTimelineMarkers[i] - pInfo->m_FirstTick) / (float)TotalTicks;
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// draw slice markers
+		// begin
+		if(g_Config.m_ClDemoSliceBegin != -1)
+		{
+			float Ratio = (g_Config.m_ClDemoSliceBegin - pInfo->m_FirstTick) / (float)TotalTicks;
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 0.0f, 0.0f, 1.0f);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// end
+		if(g_Config.m_ClDemoSliceEnd != -1)
+		{
+			float Ratio = (g_Config.m_ClDemoSliceEnd - pInfo->m_FirstTick) / (float)TotalTicks;
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1.0f, 0.0f, 0.0f, 1.0f);
+			IGraphics::CQuadItem QuadItem(2 * Rounding + SeekBar.x + (SeekBar.w - 2 * Rounding) * Ratio, SeekBar.y, UI()->PixelSize(), SeekBar.h);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// draw time
+		char aCurrentTime[32];
+		str_time((int64_t)CurrentTick / Client()->GameTickSpeed() * 100, TIME_HOURS, aCurrentTime, sizeof(aCurrentTime));
+		char aTotalTime[32];
+		str_time((int64_t)TotalTicks / Client()->GameTickSpeed() * 100, TIME_HOURS, aTotalTime, sizeof(aTotalTime));
+		str_format(aBuffer, sizeof(aBuffer), "%s / %s", aCurrentTime, aTotalTime);
+		UI()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
+
+		// do the logic
+		const bool Inside = UI()->MouseInside(&SeekBar);
+
+		if(UI()->CheckActiveItem(pId))
+		{
+			if(!UI()->MouseButton(0))
+				UI()->SetActiveItem(nullptr);
+			else
+			{
+				static float s_PrevAmount = 0.0f;
+				float AmountSeek = clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
+
+				if(Input()->ShiftIsPressed())
+				{
+					AmountSeek = s_PrevAmount + (AmountSeek - s_PrevAmount) * 0.05f;
+					if(AmountSeek >= 0.0f && AmountSeek <= 1.0f && absolute(s_PrevAmount - AmountSeek) >= 0.0001f)
+					{
+						PositionToSeek = AmountSeek;
+					}
+				}
+				else
+				{
+					if(AmountSeek >= 0.0f && AmountSeek <= 1.0f && absolute(s_PrevAmount - AmountSeek) >= 0.001f)
+					{
+						s_PrevAmount = AmountSeek;
+						PositionToSeek = AmountSeek;
+					}
+				}
+			}
+		}
+		else if(UI()->HotItem() == pId)
+		{
+			if(UI()->MouseButton(0))
+			{
+				UI()->SetActiveItem(pId);
+			}
+			else
+			{
+				const int HoveredTick = (int)(clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f) * TotalTicks);
+				static char s_aHoveredTime[32];
+				str_time((int64_t)HoveredTick / Client()->GameTickSpeed() * 100, TIME_HOURS, s_aHoveredTime, sizeof(s_aHoveredTime));
+				GameClient()->m_Tooltips.DoToolTip(pId, &SeekBar, s_aHoveredTime);
+			}
+		}
+
+		if(Inside)
+			UI()->SetHotItem(pId);
+	}
+
+	bool IncreaseDemoSpeed = false, DecreaseDemoSpeed = false;
+
+	// do buttons
+	CUIRect Button;
+
+	// combined play and pause button
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_PlayPauseButton;
+	if(DoButton_FontIcon(&s_PlayPauseButton, pInfo->m_Paused ? FONT_ICON_PLAY : FONT_ICON_PAUSE, false, &Button, IGraphics::CORNER_ALL))
+	{
+		if(pInfo->m_Paused)
+		{
+			DemoPlayer()->Unpause();
+		}
+		else
+		{
+			DemoPlayer()->Pause();
+		}
+		UpdateLastPauseChange();
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_PlayPauseButton, &Button, pInfo->m_Paused ? Localize("Play the current demo") : Localize("Pause the current demo"));
+
+	// stop button
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_ResetButton;
+	if(DoButton_FontIcon(&s_ResetButton, FONT_ICON_STOP, false, &Button, IGraphics::CORNER_ALL))
+	{
+		DemoPlayer()->Pause();
+		PositionToSeek = 0.0f;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_ResetButton, &Button, Localize("Stop the current demo"));
+
+	// skip time back
+	ButtonBar.VSplitLeft(Margins + 10.0f, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_TimeBackButton;
+	if(DoButton_FontIcon(&s_TimeBackButton, FONT_ICON_BACKWARD, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		TimeToSeek = -s_aSkipDurationsSeconds[s_SkipDurationIndex];
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_TimeBackButton, &Button, Localize("Go back the specified duration"));
+
+	// skip time dropdown
+	if(NumDurationLabels >= 2)
+	{
+		ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+		ButtonBar.VSplitLeft(4 * ButtonbarHeight, &Button, &ButtonBar);
+
+		static std::vector<std::string> s_vDurationNames;
+		static std::vector<const char *> s_vpDurationNames;
+		s_vDurationNames.resize(NumDurationLabels);
+		s_vpDurationNames.resize(NumDurationLabels);
+
+		for(int i = 0; i < NumDurationLabels; ++i)
+		{
+			char aBuf[256];
+			if(s_aSkipDurationsSeconds[i] >= 60)
+				str_format(aBuf, sizeof(aBuf), Localize("%d min.", "Demo player duration"), s_aSkipDurationsSeconds[i] / 60);
+			else
+				str_format(aBuf, sizeof(aBuf), Localize("%d sec.", "Demo player duration"), s_aSkipDurationsSeconds[i]);
+			s_vDurationNames[i] = aBuf;
+			s_vpDurationNames[i] = s_vDurationNames[i].c_str();
+		}
+
+		static CUI::SDropDownState s_SkipDurationDropDownState;
+		static CScrollRegion s_SkipDurationDropDownScrollRegion;
+		s_SkipDurationDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_SkipDurationDropDownScrollRegion;
+		s_SkipDurationIndex = UI()->DoDropDown(&Button, s_SkipDurationIndex, s_vpDurationNames.data(), NumDurationLabels, s_SkipDurationDropDownState);
+		GameClient()->m_Tooltips.DoToolTip(&s_SkipDurationDropDownState.m_ButtonContainer, &Button, Localize("Change the skip duration"));
+	}
+
+	// skip time forward
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_TimeForwardButton;
+	if(DoButton_FontIcon(&s_TimeForwardButton, FONT_ICON_FORWARD, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		TimeToSeek = s_aSkipDurationsSeconds[s_SkipDurationIndex];
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_TimeForwardButton, &Button, Localize("Go forward the specified duration"));
+
+	// one tick back
+	ButtonBar.VSplitLeft(Margins + 10.0f, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_OneTickBackButton;
+	if(DoButton_FontIcon(&s_OneTickBackButton, FONT_ICON_BACKWARD_STEP, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		DemoSeekTick(IDemoPlayer::TICK_PREVIOUS);
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_OneTickBackButton, &Button, Localize("Go back one tick"));
+
+	// one tick forward
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_OneTickForwardButton;
+	if(DoButton_FontIcon(&s_OneTickForwardButton, FONT_ICON_FORWARD_STEP, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		DemoSeekTick(IDemoPlayer::TICK_NEXT);
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_OneTickForwardButton, &Button, Localize("Go forward one tick"));
+
+	// one marker back
+	ButtonBar.VSplitLeft(Margins + 10.0f, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_OneMarkerBackButton;
+	if(DoButton_FontIcon(&s_OneMarkerBackButton, FONT_ICON_BACKWARD_FAST, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		PositionToSeek = FindPreviousMarkerPosition();
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_OneMarkerBackButton, &Button, Localize("Go back one marker"));
+
+	// one marker forward
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_OneMarkerForwardButton;
+	if(DoButton_FontIcon(&s_OneMarkerForwardButton, FONT_ICON_FORWARD_FAST, 0, &Button, IGraphics::CORNER_ALL))
+	{
+		PositionToSeek = FindNextMarkerPosition();
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_OneMarkerForwardButton, &Button, Localize("Go forward one marker"));
+
+	// slowdown
+	ButtonBar.VSplitLeft(Margins + 10.0f, 0, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_SlowDownButton;
+	if(DoButton_FontIcon(&s_SlowDownButton, FONT_ICON_CHEVRON_DOWN, 0, &Button, IGraphics::CORNER_ALL))
+		DecreaseDemoSpeed = true;
+	GameClient()->m_Tooltips.DoToolTip(&s_SlowDownButton, &Button, Localize("Slow down the demo"));
+
+	// fastforward
+	ButtonBar.VSplitLeft(Margins, 0, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_SpeedUpButton;
+	if(DoButton_FontIcon(&s_SpeedUpButton, FONT_ICON_CHEVRON_UP, 0, &Button, IGraphics::CORNER_ALL))
+		IncreaseDemoSpeed = true;
+	GameClient()->m_Tooltips.DoToolTip(&s_SpeedUpButton, &Button, Localize("Speed up the demo"));
+
+	// speed meter
+	ButtonBar.VSplitLeft(Margins * 12, &SpeedBar, &ButtonBar);
+	char aBuffer[64];
+	str_format(aBuffer, sizeof(aBuffer), "×%g", pInfo->m_Speed);
+	UI()->DoLabel(&SpeedBar, aBuffer, Button.h * 0.7f, TEXTALIGN_MC);
+
+	// slice begin button
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_SliceBeginButton;
+	const int SliceBeginButtonResult = DoButton_FontIcon(&s_SliceBeginButton, FONT_ICON_RIGHT_FROM_BRACKET, 0, &Button, IGraphics::CORNER_ALL);
+	if(SliceBeginButtonResult == 1)
+	{
+		Client()->DemoSliceBegin();
+		if(CurrentTick > (g_Config.m_ClDemoSliceEnd - pInfo->m_FirstTick))
+			g_Config.m_ClDemoSliceEnd = -1;
+	}
+	else if(SliceBeginButtonResult == 2)
+	{
+		g_Config.m_ClDemoSliceBegin = -1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_SliceBeginButton, &Button, Localize("Mark the beginning of a cut (right click to reset)"));
+
+	// slice end button
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_SliceEndButton;
+	const int SliceEndButtonResult = DoButton_FontIcon(&s_SliceEndButton, FONT_ICON_RIGHT_TO_BRACKET, 0, &Button, IGraphics::CORNER_ALL);
+	if(SliceEndButtonResult == 1)
+	{
+		Client()->DemoSliceEnd();
+		if(CurrentTick < (g_Config.m_ClDemoSliceBegin - pInfo->m_FirstTick))
+			g_Config.m_ClDemoSliceBegin = -1;
+	}
+	else if(SliceEndButtonResult == 2)
+	{
+		g_Config.m_ClDemoSliceEnd = -1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_SliceEndButton, &Button, Localize("Mark the end of a cut (right click to reset)"));
+
+	// slice save button
+#if defined(CONF_VIDEORECORDER)
+	const bool SliceEnabled = IVideo::Current() == nullptr;
+#else
+	const bool SliceEnabled = true;
+#endif
+	ButtonBar.VSplitLeft(Margins, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
+	static CButtonContainer s_SliceSaveButton;
+	if(DoButton_FontIcon(&s_SliceSaveButton, FONT_ICON_ARROW_UP_RIGHT_FROM_SQUARE, 0, &Button, IGraphics::CORNER_ALL, SliceEnabled) && SliceEnabled)
+	{
+		char aDemoName[IO_MAX_PATH_LENGTH];
+		DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));
+		m_DemoSliceInput.Set(aDemoName);
+		UI()->SetActiveItem(&m_DemoSliceInput);
+		m_DemoPlayerState = DEMOPLAYER_SLICE_SAVE;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_SliceSaveButton, &Button, Localize("Export cut as a separate demo"));
+
+	// close button
+	ButtonBar.VSplitRight(ButtonbarHeight, &ButtonBar, &Button);
+	static CButtonContainer s_ExitButton;
+	if(DoButton_FontIcon(&s_ExitButton, FONT_ICON_XMARK, 0, &Button) || (Input()->KeyPress(KEY_C) && m_pClient->m_GameConsole.IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE))
+	{
+		Client()->Disconnect();
+		DemolistOnUpdate(false);
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_ExitButton, &Button, Localize("Close the demo player"));
+
+	// toggle keyboard shortcuts button
+	ButtonBar.VSplitRight(Margins, &ButtonBar, nullptr);
+	ButtonBar.VSplitRight(ButtonbarHeight, &ButtonBar, &Button);
+	static CButtonContainer s_KeyboardShortcutsButton;
+	if(DoButton_FontIcon(&s_KeyboardShortcutsButton, FONT_ICON_KEYBOARD, 0, &Button, IGraphics::CORNER_ALL, g_Config.m_ClDemoKeyboardShortcuts != 0))
+	{
+		g_Config.m_ClDemoKeyboardShortcuts ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_KeyboardShortcutsButton, &Button, Localize("Toggle keyboard shortcuts"));
+
+	// demo name
+	char aDemoName[IO_MAX_PATH_LENGTH];
+	DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));
+	char aBuf[IO_MAX_PATH_LENGTH + 128];
+	str_format(aBuf, sizeof(aBuf), Localize("Demofile: %s"), aDemoName);
+	SLabelProperties Props;
+	Props.m_MaxWidth = NameBar.w;
+	Props.m_EllipsisAtEnd = true;
+	Props.m_EnableWidthCheck = false;
+	UI()->DoLabel(&NameBar, aBuf, Button.h * 0.5f, TEXTALIGN_ML, Props);
+
+	if(IncreaseDemoSpeed)
+	{
+		DemoPlayer()->AdjustSpeedIndex(+1);
+		UpdateLastSpeedChange();
+	}
+	else if(DecreaseDemoSpeed)
+	{
+		DemoPlayer()->AdjustSpeedIndex(-1);
+		UpdateLastSpeedChange();
+	}
+
+	HandleDemoSeeking(PositionToSeek, TimeToSeek);
+
+	// render popups
+	if(m_DemoPlayerState != DEMOPLAYER_NONE)
+	{
+		// prevent element under the active popup from being activated
+		UI()->SetHotItem(nullptr);
+	}
+	if(m_DemoPlayerState == DEMOPLAYER_SLICE_SAVE)
+	{
+		RenderDemoPlayerSliceSavePopup(MainView);
+	}
+
+	UI()->RenderPopupMenus();
+}
+
+void CMenus::RenderDemoPlayerSliceSavePopup(CUIRect MainView)
+{
+	const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+
+	CUIRect Box;
+	MainView.Margin(150.0f, &Box);
+
+	// background
+	Box.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 15.0f);
+	Box.Margin(24.0f, &Box);
+
+	// title
+	CUIRect Title;
+	Box.HSplitTop(24.0f, &Title, &Box);
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	UI()->DoLabel(&Title, Localize("Export demo cut"), 24.0f, TEXTALIGN_MC);
+
+	// slice times
+	CUIRect SliceTimesBar, SliceInterval, SliceLength;
+	Box.HSplitTop(24.0f, &SliceTimesBar, &Box);
+	SliceTimesBar.VSplitMid(&SliceInterval, &SliceLength, 40.0f);
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	const int64_t RealSliceBegin = g_Config.m_ClDemoSliceBegin == -1 ? 0 : (g_Config.m_ClDemoSliceBegin - pInfo->m_FirstTick);
+	const int64_t RealSliceEnd = (g_Config.m_ClDemoSliceEnd == -1 ? pInfo->m_LastTick : g_Config.m_ClDemoSliceEnd) - pInfo->m_FirstTick;
+	char aSliceBegin[32];
+	str_time(RealSliceBegin / Client()->GameTickSpeed() * 100, TIME_HOURS, aSliceBegin, sizeof(aSliceBegin));
+	char aSliceEnd[32];
+	str_time(RealSliceEnd / Client()->GameTickSpeed() * 100, TIME_HOURS, aSliceEnd, sizeof(aSliceEnd));
+	char aSliceLength[32];
+	str_time((RealSliceEnd - RealSliceBegin) / Client()->GameTickSpeed() * 100, TIME_HOURS, aSliceLength, sizeof(aSliceLength));
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "%s: %s – %s", Localize("Cut interval"), aSliceBegin, aSliceEnd);
+	UI()->DoLabel(&SliceInterval, aBuf, 18.0f, TEXTALIGN_ML);
+	str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Cut length"), aSliceLength);
+	UI()->DoLabel(&SliceLength, aBuf, 18.0f, TEXTALIGN_ML);
+
+	// file name
+	CUIRect NameLabel, NameBox;
+	Box.HSplitTop(24.0f, &NameLabel, &Box);
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	NameLabel.VSplitLeft(150.0f, &NameLabel, &NameBox);
+	NameBox.VSplitLeft(20.0f, nullptr, &NameBox);
+	UI()->DoLabel(&NameLabel, Localize("New name:"), 18.0f, TEXTALIGN_ML);
+	UI()->DoEditBox(&m_DemoSliceInput, &NameBox, 12.0f);
+
+	// remove chat checkbox
+	static int s_RemoveChat = 0;
+
+	CUIRect CheckBoxBar, RemoveChatCheckBox, RenderCutCheckBox;
+	Box.HSplitTop(24.0f, &CheckBoxBar, &Box);
+	Box.HSplitTop(20.0f, nullptr, &Box);
+	CheckBoxBar.VSplitMid(&RemoveChatCheckBox, &RenderCutCheckBox, 40.0f);
+	if(DoButton_CheckBox(&s_RemoveChat, Localize("Remove chat"), s_RemoveChat, &RemoveChatCheckBox))
+	{
+		s_RemoveChat ^= 1;
+	}
+#if defined(CONF_VIDEORECORDER)
+	static int s_RenderCut = 0;
+	if(DoButton_CheckBox(&s_RenderCut, Localize("Render cut to video"), s_RenderCut, &RenderCutCheckBox))
+	{
+		s_RenderCut ^= 1;
+	}
+#endif
+
+	// buttons
+	CUIRect ButtonBar, AbortButton, OkButton;
+	Box.HSplitBottom(24.0f, &Box, &ButtonBar);
+	ButtonBar.VSplitMid(&AbortButton, &OkButton, 40.0f);
+
+	static CButtonContainer s_ButtonAbort;
+	if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &AbortButton) || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)))
+		m_DemoPlayerState = DEMOPLAYER_NONE;
+
+	static CUI::SConfirmPopupContext s_ConfirmPopupContext;
+	static CButtonContainer s_ButtonOk;
+	if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &OkButton) || (!UI()->IsPopupOpen() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		char aDemoName[IO_MAX_PATH_LENGTH];
+		char aNameWithoutExt[IO_MAX_PATH_LENGTH];
+		DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));
+
+		fs_split_file_extension(m_DemoSliceInput.GetString(), aNameWithoutExt, sizeof(aNameWithoutExt));
+		m_DemoSliceInput.Set(aNameWithoutExt);
+
+		if(str_comp(aDemoName, m_DemoSliceInput.GetString()) == 0)
+		{
+			static CUI::SMessagePopupContext s_MessagePopupContext;
+			s_MessagePopupContext.ErrorColor();
+			str_copy(s_MessagePopupContext.m_aMessage, Localize("Please use a different filename"));
+			UI()->ShowPopupMessage(UI()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_MessagePopupContext);
+		}
+		else
+		{
+			char aPath[IO_MAX_PATH_LENGTH];
+			str_format(aPath, sizeof(aPath), "%s/%s.demo", m_aCurrentDemoFolder, m_DemoSliceInput.GetString());
+			if(Storage()->FileExists(aPath, IStorage::TYPE_SAVE))
+			{
+				s_ConfirmPopupContext.Reset();
+				s_ConfirmPopupContext.YesNoButtons();
+				str_copy(s_ConfirmPopupContext.m_aMessage, Localize("File already exists, do you want to overwrite it?"));
+				UI()->ShowPopupConfirm(UI()->MouseX(), OkButton.y + OkButton.h + 5.0f, &s_ConfirmPopupContext);
+			}
+			else
+				s_ConfirmPopupContext.m_Result = CUI::SConfirmPopupContext::CONFIRMED;
+		}
+	}
+
+	if(s_ConfirmPopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+	{
+		char aPath[IO_MAX_PATH_LENGTH];
+		str_format(aPath, sizeof(aPath), "%s/%s.demo", m_aCurrentDemoFolder, m_DemoSliceInput.GetString());
+		str_copy(m_aCurrentDemoSelectionName, m_DemoSliceInput.GetString());
+		if(str_endswith(m_aCurrentDemoSelectionName, ".demo"))
+			m_aCurrentDemoSelectionName[str_length(m_aCurrentDemoSelectionName) - str_length(".demo")] = '\0';
+
+		Client()->DemoSlice(aPath, CMenus::DemoFilterChat, &s_RemoveChat);
+		DemolistPopulate();
+		DemolistOnUpdate(false);
+		m_DemoPlayerState = DEMOPLAYER_NONE;
+#if defined(CONF_VIDEORECORDER)
+		if(s_RenderCut)
+		{
+			m_Popup = POPUP_RENDER_DEMO;
+			m_StartPaused = false;
+			m_DemoRenderInput.Set(m_aCurrentDemoSelectionName);
+			UI()->SetActiveItem(&m_DemoRenderInput);
+			if(m_DemolistStorageType != IStorage::TYPE_ALL && m_DemolistStorageType != IStorage::TYPE_SAVE)
+				m_DemolistStorageType = IStorage::TYPE_ALL; // Select a storage type containing the sliced demo
+		}
+#endif
+	}
+	if(s_ConfirmPopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+	{
+		s_ConfirmPopupContext.Reset();
+	}
+}
+
+int CMenus::DemolistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser)
+{
+	CMenus *pSelf = (CMenus *)pUser;
+	if(str_comp(pInfo->m_pName, ".") == 0 ||
+		(str_comp(pInfo->m_pName, "..") == 0 && (pSelf->m_aCurrentDemoFolder[0] == '\0' || (!pSelf->m_DemolistMultipleStorages && str_comp(pSelf->m_aCurrentDemoFolder, "demos") == 0))) ||
+		(!IsDir && !str_endswith(pInfo->m_pName, ".demo")))
+	{
+		return 0;
+	}
+
+	CDemoItem Item;
+	str_copy(Item.m_aFilename, pInfo->m_pName);
+	if(IsDir)
+	{
+		str_format(Item.m_aName, sizeof(Item.m_aName), "%s/", pInfo->m_pName);
+		Item.m_Date = 0;
+	}
+	else
+	{
+		str_truncate(Item.m_aName, sizeof(Item.m_aName), pInfo->m_pName, str_length(pInfo->m_pName) - str_length(".demo"));
+		Item.m_Date = pInfo->m_TimeModified;
+	}
+	Item.m_InfosLoaded = false;
+	Item.m_Valid = false;
+	Item.m_IsDir = IsDir != 0;
+	Item.m_IsLink = false;
+	Item.m_StorageType = StorageType;
+	pSelf->m_vDemos.push_back(Item);
+
+	if(time_get_nanoseconds() - pSelf->m_DemoPopulateStartTime > 500ms)
+	{
+		pSelf->RenderLoading(Localize("Loading demo files"), "", 0, false);
+	}
+
+	return 0;
+}
+
+void CMenus::DemolistPopulate()
+{
+	m_vDemos.clear();
+
+	int NumStoragesWithDemos = 0;
+	for(int StorageType = IStorage::TYPE_SAVE; StorageType < Storage()->NumPaths(); ++StorageType)
+	{
+		if(Storage()->FolderExists("demos", StorageType))
+		{
+			NumStoragesWithDemos++;
+		}
+	}
+	m_DemolistMultipleStorages = NumStoragesWithDemos > 1;
+
+	if(m_aCurrentDemoFolder[0] == '\0')
+	{
+		{
+			CDemoItem Item;
+			str_copy(Item.m_aFilename, "demos");
+			str_copy(Item.m_aName, Localize("All combined"));
+			Item.m_InfosLoaded = false;
+			Item.m_Valid = false;
+			Item.m_Date = 0;
+			Item.m_IsDir = true;
+			Item.m_IsLink = true;
+			Item.m_StorageType = IStorage::TYPE_ALL;
+			m_vDemos.push_back(Item);
+		}
+
+		for(int StorageType = IStorage::TYPE_SAVE; StorageType < Storage()->NumPaths(); ++StorageType)
+		{
+			if(Storage()->FolderExists("demos", StorageType))
+			{
+				CDemoItem Item;
+				str_copy(Item.m_aFilename, "demos");
+				Storage()->GetCompletePath(StorageType, "demos", Item.m_aName, sizeof(Item.m_aName));
+				str_append(Item.m_aName, "/", sizeof(Item.m_aName));
+				Item.m_InfosLoaded = false;
+				Item.m_Valid = false;
+				Item.m_Date = 0;
+				Item.m_IsDir = true;
+				Item.m_IsLink = true;
+				Item.m_StorageType = StorageType;
+				m_vDemos.push_back(Item);
+			}
+		}
+	}
+	else
+	{
+		m_DemoPopulateStartTime = time_get_nanoseconds();
+		Storage()->ListDirectoryInfo(m_DemolistStorageType, m_aCurrentDemoFolder, DemolistFetchCallback, this);
+
+		if(g_Config.m_BrDemoFetchInfo)
+			FetchAllHeaders();
+
+		std::stable_sort(m_vDemos.begin(), m_vDemos.end());
+	}
+	RefreshFilteredDemos();
+}
+
+void CMenus::RefreshFilteredDemos()
+{
+	m_vpFilteredDemos.clear();
+	for(auto &Demo : m_vDemos)
+	{
+		if(str_find_nocase(Demo.m_aFilename, m_DemoSearchInput.GetString()))
+		{
+			m_vpFilteredDemos.push_back(&Demo);
+		}
+	}
+}
+
+void CMenus::DemolistOnUpdate(bool Reset)
+{
+	if(Reset)
+	{
+		if(m_vpFilteredDemos.empty())
+		{
+			m_DemolistSelectedIndex = -1;
+			m_aCurrentDemoSelectionName[0] = '\0';
+		}
+		else
+		{
+			m_DemolistSelectedIndex = 0;
+			str_copy(m_aCurrentDemoSelectionName, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aName);
+		}
+	}
+	else
+	{
+		RefreshFilteredDemos();
+
+		// search for selected index
+		m_DemolistSelectedIndex = -1;
+		int SelectedIndex = -1;
+		for(const auto &pItem : m_vpFilteredDemos)
+		{
+			SelectedIndex++;
+			if(str_comp(m_aCurrentDemoSelectionName, pItem->m_aName) == 0)
+			{
+				m_DemolistSelectedIndex = SelectedIndex;
+				break;
+			}
+		}
+	}
+
+	if(m_DemolistSelectedIndex >= 0)
+		m_DemolistSelectedReveal = true;
+}
+
+bool CMenus::FetchHeader(CDemoItem &Item)
+{
+	if(!Item.m_InfosLoaded)
+	{
+		char aBuffer[IO_MAX_PATH_LENGTH];
+		str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_aCurrentDemoFolder, Item.m_aFilename);
+		Item.m_Valid = DemoPlayer()->GetDemoInfo(Storage(), nullptr, aBuffer, Item.m_StorageType, &Item.m_Info, &Item.m_TimelineMarkers, &Item.m_MapInfo);
+		Item.m_InfosLoaded = true;
+	}
+	return Item.m_Valid;
+}
+
+void CMenus::FetchAllHeaders()
+{
+	for(auto &Item : m_vDemos)
+	{
+		FetchHeader(Item);
+	}
+	std::stable_sort(m_vDemos.begin(), m_vDemos.end());
+}
+
+void CMenus::RenderDemoBrowser(CUIRect MainView)
+{
+	CUIRect ListView, DetailsView, ButtonsView;
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+	MainView.Margin(10.0f, &MainView);
+	MainView.HSplitBottom(22.0f * 2.0f + 5.0f, &ListView, &ButtonsView);
+	ListView.VSplitRight(205.0f, &ListView, &DetailsView);
+	ListView.VSplitRight(5.0f, &ListView, nullptr);
+
+	bool WasListboxItemActivated;
+	RenderDemoBrowserList(ListView, WasListboxItemActivated);
+	RenderDemoBrowserDetails(DetailsView);
+	RenderDemoBrowserButtons(ButtonsView, WasListboxItemActivated);
+}
+
+void CMenus::RenderDemoBrowserList(CUIRect ListView, bool &WasListboxItemActivated)
+{
+	if(!m_DemoBrowserListInitialized)
+	{
+		DemolistPopulate();
+		DemolistOnUpdate(true);
+		m_DemoBrowserListInitialized = true;
+	}
+
+#if defined(CONF_VIDEORECORDER)
+	if(!m_DemoRenderInput.IsEmpty())
+	{
+		m_Popup = POPUP_RENDER_DONE;
+	}
+#endif
+
+	struct SColumn
+	{
+		int m_Id;
+		int m_Sort;
+		const char *m_pCaption;
+		int m_Direction;
+		float m_Width;
+		CUIRect m_Rect;
+	};
+
+	enum
+	{
+		COL_ICON = 0,
+		COL_DEMONAME,
+		COL_LENGTH,
+		COL_DATE,
+	};
+
+	static CListBox s_ListBox;
+	static SColumn s_aCols[] = {
+		{-1, -1, "", -1, 2.0f, {0}},
+		{COL_ICON, -1, "", -1, ms_ListheaderHeight, {0}},
+		{-1, -1, "", -1, 2.0f, {0}},
+		{COL_DEMONAME, SORT_DEMONAME, Localizable("Demo"), 0, 0.0f, {0}},
+		{-1, -1, "", 1, 2.0f, {0}},
+		{COL_LENGTH, SORT_LENGTH, Localizable("Length"), 1, 75.0f, {0}},
+		{-1, -1, "", 1, 2.0f, {0}},
+		{COL_DATE, SORT_DATE, Localizable("Date"), 1, 150.0f, {0}},
+		{-1, -1, "", 1, s_ListBox.ScrollbarWidthMax(), {0}},
+	};
+
+	CUIRect Headers, ListBox;
+	ListView.HSplitTop(ms_ListheaderHeight, &Headers, &ListBox);
+	Headers.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_T, 5.0f);
+	ListBox.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 5.0f);
+
+	for(auto &Col : s_aCols)
+	{
+		if(Col.m_Direction == -1)
+		{
+			Headers.VSplitLeft(Col.m_Width, &Col.m_Rect, &Headers);
+		}
+	}
+
+	for(int i = std::size(s_aCols) - 1; i >= 0; i--)
+	{
+		if(s_aCols[i].m_Direction == 1)
+		{
+			Headers.VSplitRight(s_aCols[i].m_Width, &Headers, &s_aCols[i].m_Rect);
+		}
+	}
+
+	for(auto &Col : s_aCols)
+	{
+		if(Col.m_Direction == 0)
+			Col.m_Rect = Headers;
+	}
+
+	for(auto &Col : s_aCols)
+	{
+		if(Col.m_pCaption[0] != '\0' && Col.m_Sort != -1)
+		{
+			if(DoButton_GridHeader(&Col.m_Id, Localize(Col.m_pCaption), g_Config.m_BrDemoSort == Col.m_Sort, &Col.m_Rect))
+			{
+				if(g_Config.m_BrDemoSort == Col.m_Sort)
+					g_Config.m_BrDemoSortOrder ^= 1;
+				else
+					g_Config.m_BrDemoSortOrder = 0;
+				g_Config.m_BrDemoSort = Col.m_Sort;
+				// Don't rescan in order to keep fetched headers, just resort
+				std::stable_sort(m_vDemos.begin(), m_vDemos.end());
+				DemolistOnUpdate(false);
+			}
+		}
+	}
+
+	if(m_DemolistSelectedReveal)
+	{
+		s_ListBox.ScrollToSelected();
+		m_DemolistSelectedReveal = false;
+	}
+
+	s_ListBox.DoStart(ms_ListheaderHeight, m_vpFilteredDemos.size(), 1, 3, m_DemolistSelectedIndex, &ListBox, false, IGraphics::CORNER_ALL, true);
+
+	char aBuf[64];
+	int ItemIndex = -1;
+	for(auto &pItem : m_vpFilteredDemos)
+	{
+		ItemIndex++;
+
+		const CListboxItem ListItem = s_ListBox.DoNextItem(pItem, ItemIndex == m_DemolistSelectedIndex);
+		if(!ListItem.m_Visible)
+			continue;
+
+		for(const auto &Col : s_aCols)
+		{
+			CUIRect Button;
+			Button.x = Col.m_Rect.x;
+			Button.y = ListItem.m_Rect.y;
+			Button.h = ListItem.m_Rect.h;
+			Button.w = Col.m_Rect.w;
+
+			if(Col.m_Id == COL_ICON)
+			{
+				Button.Margin(1.0f, &Button);
+
+				const char *pIconType;
+				if(pItem->m_IsLink || str_comp(pItem->m_aFilename, "..") == 0)
+					pIconType = FONT_ICON_FOLDER_TREE;
+				else if(pItem->m_IsDir)
+					pIconType = FONT_ICON_FOLDER;
+				else
+					pIconType = FONT_ICON_FILM;
+
+				ColorRGBA IconColor;
+				if(!pItem->m_IsDir && (!pItem->m_InfosLoaded || !pItem->m_Valid))
+					IconColor = ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f); // not loaded
+				else
+					IconColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+
+				TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+				TextRender()->TextColor(IconColor);
+				TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+				UI()->DoLabel(&Button, pIconType, 12.0f, TEXTALIGN_ML);
+				TextRender()->SetRenderFlags(0);
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+				TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+			}
+			else if(Col.m_Id == COL_DEMONAME)
+			{
+				SLabelProperties Props;
+				Props.m_MaxWidth = Button.w;
+				Props.m_EllipsisAtEnd = true;
+				Props.m_EnableWidthCheck = false;
+				UI()->DoLabel(&Button, pItem->m_aName, 12.0f, TEXTALIGN_ML, Props);
+			}
+			else if(Col.m_Id == COL_LENGTH && !pItem->m_IsDir && pItem->m_Valid)
+			{
+				str_time((int64_t)pItem->Length() * 100, TIME_HOURS, aBuf, sizeof(aBuf));
+				Button.VMargin(4.0f, &Button);
+				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
+			}
+			else if(Col.m_Id == COL_DATE && !pItem->m_IsDir)
+			{
+				str_timestamp_ex(pItem->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
+				Button.VMargin(4.0f, &Button);
+				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_MR);
+			}
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(NewSelected != m_DemolistSelectedIndex)
+	{
+		m_DemolistSelectedIndex = NewSelected;
+		if(m_DemolistSelectedIndex >= 0)
+			str_copy(m_aCurrentDemoSelectionName, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aName);
+		DemolistOnUpdate(false);
+	}
+
+	WasListboxItemActivated = s_ListBox.WasItemActivated();
+}
+
+void CMenus::RenderDemoBrowserDetails(CUIRect DetailsView)
+{
+	CUIRect Contents, Header;
+	DetailsView.HSplitTop(ms_ListheaderHeight, &Header, &Contents);
+	Contents.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), IGraphics::CORNER_B, 5.0f);
+	Contents.Margin(5.0f, &Contents);
+
+	const float FontSize = 12.0f;
+	CDemoItem *pItem = m_DemolistSelectedIndex >= 0 ? m_vpFilteredDemos[m_DemolistSelectedIndex] : nullptr;
+
+	Header.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_T, 5.0f);
+	const char *pHeaderLabel;
+	if(pItem == nullptr)
+		pHeaderLabel = Localize("No demo selected");
+	else if(str_comp(pItem->m_aFilename, "..") == 0)
+		pHeaderLabel = Localize("Parent Folder");
+	else if(pItem->m_IsLink)
+		pHeaderLabel = Localize("Folder Link");
+	else if(pItem->m_IsDir)
+		pHeaderLabel = Localize("Folder");
+	else if(!FetchHeader(*pItem))
+		pHeaderLabel = Localize("Invalid Demo");
+	else
+		pHeaderLabel = Localize("Demo");
+	UI()->DoLabel(&Header, pHeaderLabel, FontSize + 2.0f, TEXTALIGN_MC);
+
+	if(pItem == nullptr || pItem->m_IsDir)
+		return;
+
+	char aBuf[256];
+	CUIRect Left, Right;
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, Localize("Created"), FontSize, TEXTALIGN_ML);
+	str_timestamp_ex(pItem->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+
+	if(!pItem->m_Valid)
+		return;
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	Left.VSplitMid(&Left, &Right, 4.0f);
+	UI()->DoLabel(&Left, Localize("Type"), FontSize, TEXTALIGN_ML);
+	UI()->DoLabel(&Right, Localize("Version"), FontSize, TEXTALIGN_ML);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	Left.VSplitMid(&Left, &Right, 4.0f);
+	UI()->DoLabel(&Left, pItem->m_Info.m_aType, FontSize - 1.0f, TEXTALIGN_ML);
+	str_from_int(pItem->m_Info.m_Version, aBuf);
+	UI()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	Left.VSplitMid(&Left, &Right, 4.0f);
+	UI()->DoLabel(&Left, Localize("Length"), FontSize, TEXTALIGN_ML);
+	UI()->DoLabel(&Right, Localize("Markers"), FontSize, TEXTALIGN_ML);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	Left.VSplitMid(&Left, &Right, 4.0f);
+	str_time((int64_t)pItem->Length() * 100, TIME_HOURS, aBuf, sizeof(aBuf));
+	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	str_from_int(pItem->NumMarkers(), aBuf);
+	UI()->DoLabel(&Right, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, Localize("Netversion"), FontSize, TEXTALIGN_ML);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, pItem->m_Info.m_aNetversion, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(16.0f, nullptr, &Contents);
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, Localize("Map"), FontSize, TEXTALIGN_ML);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, pItem->m_Info.m_aMapName, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	UI()->DoLabel(&Left, Localize("Size"), FontSize, TEXTALIGN_ML);
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	const float Size = pItem->Size() / 1024.0f;
+	if(Size == 0.0f)
+		str_copy(aBuf, Localize("map not included", "Demo details"));
+	else if(Size > 1024)
+		str_format(aBuf, sizeof(aBuf), Localize("%.2f MiB"), Size / 1024.0f);
+	else
+		str_format(aBuf, sizeof(aBuf), Localize("%.2f KiB"), Size);
+	UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+
+	Contents.HSplitTop(18.0f, &Left, &Contents);
+	if(pItem->m_MapInfo.m_Sha256 != SHA256_ZEROED)
+	{
+		UI()->DoLabel(&Left, "SHA256", FontSize, TEXTALIGN_ML);
+		Contents.HSplitTop(18.0f, &Left, &Contents);
+		char aSha[SHA256_MAXSTRSIZE];
+		sha256_str(pItem->m_MapInfo.m_Sha256, aSha, sizeof(aSha));
+		SLabelProperties Props;
+		Props.m_MaxWidth = Left.w;
+		Props.m_EllipsisAtEnd = true;
+		Props.m_EnableWidthCheck = false;
+		UI()->DoLabel(&Left, aSha, FontSize - 1.0f, TEXTALIGN_ML, Props);
+	}
+	else
+	{
+		UI()->DoLabel(&Left, "CRC32", FontSize, TEXTALIGN_ML);
+		Contents.HSplitTop(18.0f, &Left, &Contents);
+		str_format(aBuf, sizeof(aBuf), "%08x", pItem->m_MapInfo.m_Crc);
+		UI()->DoLabel(&Left, aBuf, FontSize - 1.0f, TEXTALIGN_ML);
+	}
+	Contents.HSplitTop(4.0f, nullptr, &Contents);
+}
+
+void CMenus::RenderDemoBrowserButtons(CUIRect ButtonsView, bool WasListboxItemActivated)
+{
+	const auto &&SetIconMode = [&](bool Enable) {
+		if(Enable)
+		{
+			TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+			TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		}
+		else
+		{
+			TextRender()->SetRenderFlags(0);
+			TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		}
+	};
+
+	CUIRect ButtonBarTop, ButtonBarBottom;
+	ButtonsView.HSplitTop(5.0f, nullptr, &ButtonsView);
+	ButtonsView.HSplitMid(&ButtonBarTop, &ButtonBarBottom, 5.0f);
+
+	// quick search
+	{
+		SetIconMode(true);
+		CUIRect DemoSearch, SearchIcon;
+		ButtonBarTop.VSplitLeft(ButtonBarBottom.h * 21.0f, &DemoSearch, &ButtonBarTop);
+		ButtonBarTop.VSplitLeft(ButtonBarTop.h / 2.0f, nullptr, &ButtonBarTop);
+		DemoSearch.VSplitLeft(TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS), &SearchIcon, &DemoSearch);
+		DemoSearch.VSplitLeft(5.0f, nullptr, &DemoSearch);
+		UI()->DoLabel(&SearchIcon, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
+		SetIconMode(false);
+		m_DemoSearchInput.SetEmptyText(Localize("Search"));
+
+		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
+		{
+			UI()->SetActiveItem(&m_DemoSearchInput);
+			m_DemoSearchInput.SelectAll();
+		}
+		if(UI()->DoClearableEditBox(&m_DemoSearchInput, &DemoSearch, 12.0f))
+		{
+			RefreshFilteredDemos();
+			DemolistOnUpdate(false);
+		}
+	}
+
+	// refresh button
+	{
+		CUIRect RefreshButton;
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h * 3.0f, &RefreshButton, &ButtonBarBottom);
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h / 2.0f, nullptr, &ButtonBarBottom);
+		SetIconMode(true);
+		static CButtonContainer s_RefreshButton;
+		if(DoButton_Menu(&s_RefreshButton, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+		{
+			SetIconMode(false);
+			DemolistPopulate();
+			DemolistOnUpdate(false);
+		}
+		SetIconMode(false);
+	}
+
+	// fetch info checkbox
+	{
+		CUIRect FetchInfo;
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h * 7.0f, &FetchInfo, &ButtonBarBottom);
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h / 2.0f, nullptr, &ButtonBarBottom);
+		if(DoButton_CheckBox(&g_Config.m_BrDemoFetchInfo, Localize("Fetch Info"), g_Config.m_BrDemoFetchInfo, &FetchInfo))
+		{
+			g_Config.m_BrDemoFetchInfo ^= 1;
+			if(g_Config.m_BrDemoFetchInfo)
+				FetchAllHeaders();
+		}
+	}
+
+	// demos directory button
+	if(m_DemolistSelectedIndex >= 0 && m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType != IStorage::TYPE_ALL)
+	{
+		CUIRect DemosDirectoryButton;
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h * 10.0f, &DemosDirectoryButton, &ButtonBarBottom);
+		ButtonBarBottom.VSplitLeft(ButtonBarBottom.h / 2.0f, nullptr, &ButtonBarBottom);
+		static CButtonContainer s_DemosDirectoryButton;
+		if(DoButton_Menu(&s_DemosDirectoryButton, Localize("Demos directory"), 0, &DemosDirectoryButton))
+		{
+			char aBuf[IO_MAX_PATH_LENGTH];
+			Storage()->GetCompletePath(m_DemolistSelectedIndex >= 0 ? m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType : IStorage::TYPE_SAVE, m_aCurrentDemoFolder[0] == '\0' ? "demos" : m_aCurrentDemoFolder, aBuf, sizeof(aBuf));
+			if(!open_file(aBuf))
+			{
+				dbg_msg("menus", "couldn't open file '%s'", aBuf);
+			}
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_DemosDirectoryButton, &DemosDirectoryButton, Localize("Open the directory that contains the demo files"));
+	}
+
+	// play/open button
+	if(m_DemolistSelectedIndex >= 0)
+	{
+		CUIRect PlayButton;
+		ButtonBarBottom.VSplitRight(ButtonBarBottom.h * 3.0f, &ButtonBarBottom, &PlayButton);
+		ButtonBarBottom.VSplitRight(ButtonBarBottom.h, &ButtonBarBottom, nullptr);
+		SetIconMode(true);
+		static CButtonContainer s_PlayButton;
+		if(DoButton_Menu(&s_PlayButton, (m_DemolistSelectedIndex >= 0 && m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir) ? FONT_ICON_FOLDER_OPEN : FONT_ICON_PLAY, 0, &PlayButton) || WasListboxItemActivated || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (Input()->KeyPress(KEY_P) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
+		{
+			SetIconMode(false);
+			if(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir) // folder
+			{
+				m_DemoSearchInput.Clear();
+				const bool ParentFolder = str_comp(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, "..") == 0;
+				if(ParentFolder) // parent folder
+				{
+					str_copy(m_aCurrentDemoSelectionName, fs_filename(m_aCurrentDemoFolder));
+					str_append(m_aCurrentDemoSelectionName, "/");
+					if(fs_parent_dir(m_aCurrentDemoFolder))
+					{
+						m_aCurrentDemoFolder[0] = '\0';
+						if(m_DemolistStorageType == IStorage::TYPE_ALL)
+						{
+							m_aCurrentDemoSelectionName[0] = '\0'; // will select first list item
+						}
+						else
+						{
+							Storage()->GetCompletePath(m_DemolistStorageType, "demos", m_aCurrentDemoSelectionName, sizeof(m_aCurrentDemoSelectionName));
+							str_append(m_aCurrentDemoSelectionName, "/");
+						}
+					}
+				}
+				else // sub folder
+				{
+					if(m_aCurrentDemoFolder[0] != '\0')
+						str_append(m_aCurrentDemoFolder, "/");
+					else
+						m_DemolistStorageType = m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType;
+					str_append(m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+				}
+				DemolistPopulate();
+				DemolistOnUpdate(!ParentFolder);
+			}
+			else // file
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+				const char *pError = Client()->DemoPlayer_Play(aBuf, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType);
+				m_LastPauseChange = -1.0f;
+				m_LastSpeedChange = -1.0f;
+				if(pError)
+				{
+					PopupMessage(Localize("Error loading demo"), pError, Localize("Ok"));
+				}
+				else
+				{
+					UI()->SetActiveItem(nullptr);
+					return;
+				}
+			}
+		}
+		SetIconMode(false);
+
+		if(m_aCurrentDemoFolder[0] != '\0')
+		{
+			if(str_comp(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, "..") != 0 && m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType == IStorage::TYPE_SAVE)
+			{
+				// rename button
+				CUIRect RenameButton;
+				ButtonBarBottom.VSplitRight(ButtonBarBottom.h * 3.0f, &ButtonBarBottom, &RenameButton);
+				ButtonBarBottom.VSplitRight(ButtonBarBottom.h / 2.0f, &ButtonBarBottom, nullptr);
+				SetIconMode(true);
+				static CButtonContainer s_RenameButton;
+				if(DoButton_Menu(&s_RenameButton, FONT_ICON_PENCIL, 0, &RenameButton))
+				{
+					SetIconMode(false);
+					m_Popup = POPUP_RENAME_DEMO;
+					if(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir)
+					{
+						m_DemoRenameInput.Set(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+					}
+					else
+					{
+						char aNameWithoutExt[IO_MAX_PATH_LENGTH];
+						fs_split_file_extension(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, aNameWithoutExt, sizeof(aNameWithoutExt));
+						m_DemoRenameInput.Set(aNameWithoutExt);
+					}
+					UI()->SetActiveItem(&m_DemoRenameInput);
+					return;
+				}
+
+				// delete button
+				static CButtonContainer s_DeleteButton;
+				CUIRect DeleteButton;
+				ButtonBarBottom.VSplitRight(ButtonBarBottom.h * 3.0f, &ButtonBarBottom, &DeleteButton);
+				ButtonBarBottom.VSplitRight(ButtonBarBottom.h / 2.0f, &ButtonBarBottom, nullptr);
+				if(DoButton_Menu(&s_DeleteButton, FONT_ICON_TRASH, 0, &DeleteButton) || UI()->ConsumeHotkey(CUI::HOTKEY_DELETE) || (Input()->KeyPress(KEY_D) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
+				{
+					SetIconMode(false);
+					char aBuf[128 + IO_MAX_PATH_LENGTH];
+					str_format(aBuf, sizeof(aBuf), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Are you sure that you want to delete the folder '%s'?") : Localize("Are you sure that you want to delete the demo '%s'?"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+					PopupConfirm(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? Localize("Delete folder") : Localize("Delete demo"), aBuf, Localize("Yes"), Localize("No"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir ? &CMenus::PopupConfirmDeleteFolder : &CMenus::PopupConfirmDeleteDemo);
+					return;
+				}
+				SetIconMode(false);
+			}
+
+#if defined(CONF_VIDEORECORDER)
+			// render demo button
+			if(!m_vpFilteredDemos[m_DemolistSelectedIndex]->m_IsDir)
+			{
+				CUIRect RenderButton;
+				ButtonBarTop.VSplitRight(ButtonBarBottom.h * 3.0f, &ButtonBarTop, &RenderButton);
+				ButtonBarTop.VSplitRight(ButtonBarBottom.h, &ButtonBarTop, nullptr);
+				SetIconMode(true);
+				static CButtonContainer s_RenderButton;
+				if(DoButton_Menu(&s_RenderButton, FONT_ICON_VIDEO, 0, &RenderButton) || (Input()->KeyPress(KEY_R) && m_pClient->m_GameConsole.IsClosed() && !m_DemoSearchInput.IsActive()))
+				{
+					SetIconMode(false);
+					m_Popup = POPUP_RENDER_DEMO;
+					m_StartPaused = false;
+					char aNameWithoutExt[IO_MAX_PATH_LENGTH];
+					fs_split_file_extension(m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename, aNameWithoutExt, sizeof(aNameWithoutExt));
+					m_DemoRenderInput.Set(aNameWithoutExt);
+					UI()->SetActiveItem(&m_DemoRenderInput);
+					return;
+				}
+				SetIconMode(false);
+			}
+#endif
+		}
+	}
+}
+
+void CMenus::PopupConfirmDeleteDemo()
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+	if(Storage()->RemoveFile(aBuf, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+	{
+		DemolistPopulate();
+		DemolistOnUpdate(false);
+	}
+	else
+	{
+		char aError[128 + IO_MAX_PATH_LENGTH];
+		str_format(aError, sizeof(aError), Localize("Unable to delete the demo '%s'"), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+		PopupMessage(Localize("Error"), aError, Localize("Ok"));
+	}
+}
+
+void CMenus::PopupConfirmDeleteFolder()
+{
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s/%s", m_aCurrentDemoFolder, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+	if(Storage()->RemoveFolder(aBuf, m_vpFilteredDemos[m_DemolistSelectedIndex]->m_StorageType))
+	{
+		DemolistPopulate();
+		DemolistOnUpdate(false);
+	}
+	else
+	{
+		char aError[128 + IO_MAX_PATH_LENGTH];
+		str_format(aError, sizeof(aError), Localize("Unable to delete the folder '%s'. Make sure it's empty first."), m_vpFilteredDemos[m_DemolistSelectedIndex]->m_aFilename);
+		PopupMessage(Localize("Error"), aError, Localize("Ok"));
+	}
+}
diff --git a/src_bkp/game/client/components/menus_ingame.cpp b/src_bkp/game/client/components/menus_ingame.cpp
new file mode 100644
index 0000000000..d3b2099f95
--- /dev/null
+++ b/src_bkp/game/client/components/menus_ingame.cpp
@@ -0,0 +1,1251 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/demo.h>
+#include <engine/favorites.h>
+#include <engine/friends.h>
+#include <engine/ghost.h>
+#include <engine/graphics.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/shared/localization.h>
+#include <engine/textrender.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/countryflags.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/client/ui_scrollregion.h>
+#include <game/localization.h>
+
+#include "menus.h"
+#include "motd.h"
+#include "voting.h"
+
+#include "ghost.h"
+#include <engine/keys.h>
+#include <engine/storage.h>
+
+#include <chrono>
+
+using namespace FontIcons;
+using namespace std::chrono_literals;
+
+void CMenus::RenderGame(CUIRect MainView)
+{
+	CUIRect Button, ButtonBar, ButtonBar2;
+	MainView.HSplitTop(45.0f, &ButtonBar, &MainView);
+	ButtonBar.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	// button bar
+	ButtonBar.HSplitTop(10.0f, 0, &ButtonBar);
+	ButtonBar.HSplitTop(25.0f, &ButtonBar, 0);
+	ButtonBar.VMargin(10.0f, &ButtonBar);
+
+	ButtonBar.HSplitTop(30.0f, 0, &ButtonBar2);
+	ButtonBar2.HSplitTop(25.0f, &ButtonBar2, 0);
+
+	ButtonBar.VSplitRight(120.0f, &ButtonBar, &Button);
+
+	static CButtonContainer s_DisconnectButton;
+	if(DoButton_Menu(&s_DisconnectButton, Localize("Disconnect"), 0, &Button))
+	{
+		if(Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0)
+		{
+			PopupConfirm(Localize("Disconnect"), Localize("Are you sure that you want to disconnect?"), Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDisconnect);
+		}
+		else
+		{
+			Client()->Disconnect();
+			RefreshBrowserTab(g_Config.m_UiPage);
+		}
+	}
+
+	ButtonBar.VSplitRight(5.0f, &ButtonBar, 0);
+	ButtonBar.VSplitRight(170.0f, &ButtonBar, &Button);
+
+	bool DummyConnecting = Client()->DummyConnecting();
+	static CButtonContainer s_DummyButton;
+	if(!Client()->DummyAllowed())
+	{
+		DoButton_Menu(&s_DummyButton, Localize("Connect Dummy"), 1, &Button);
+	}
+	else if(DummyConnecting)
+	{
+		DoButton_Menu(&s_DummyButton, Localize("Connecting dummy"), 1, &Button);
+	}
+	else if(DoButton_Menu(&s_DummyButton, Client()->DummyConnected() ? Localize("Disconnect Dummy") : Localize("Connect Dummy"), 0, &Button))
+	{
+		if(!Client()->DummyConnected())
+		{
+			Client()->DummyConnect();
+		}
+		else
+		{
+			if(Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0)
+			{
+				PopupConfirm(Localize("Disconnect Dummy"), Localize("Are you sure that you want to disconnect your dummy?"), Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDisconnectDummy);
+			}
+			else
+			{
+				Client()->DummyDisconnect(0);
+				SetActive(false);
+			}
+		}
+	}
+
+	ButtonBar.VSplitRight(5.0f, &ButtonBar, 0);
+	ButtonBar.VSplitRight(140.0f, &ButtonBar, &Button);
+
+	static CButtonContainer s_DemoButton;
+	bool Recording = DemoRecorder(RECORDER_MANUAL)->IsRecording();
+	if(DoButton_Menu(&s_DemoButton, Recording ? Localize("Stop record") : Localize("Record demo"), 0, &Button))
+	{
+		if(!Recording)
+			Client()->DemoRecorder_Start(Client()->GetCurrentMap(), true, RECORDER_MANUAL);
+		else
+			Client()->DemoRecorder_Stop(RECORDER_MANUAL);
+	}
+
+	static CButtonContainer s_SpectateButton;
+	static CButtonContainer s_JoinRedButton;
+	static CButtonContainer s_JoinBlueButton;
+
+	bool Paused = false;
+	bool Spec = false;
+	if(m_pClient->m_Snap.m_LocalClientID >= 0)
+	{
+		Paused = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_Paused;
+		Spec = m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_Spec;
+	}
+
+	if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && !Paused && !Spec)
+	{
+		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
+		{
+			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+			ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
+			if(!DummyConnecting && DoButton_Menu(&s_SpectateButton, Localize("Spectate"), 0, &Button))
+			{
+				if(g_Config.m_ClDummy == 0 || Client()->DummyConnected())
+				{
+					m_pClient->SendSwitchTeam(TEAM_SPECTATORS);
+					SetActive(false);
+				}
+			}
+		}
+
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+		{
+			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED)
+			{
+				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
+				if(!DummyConnecting && DoButton_Menu(&s_JoinRedButton, Localize("Join red"), 0, &Button))
+				{
+					m_pClient->SendSwitchTeam(TEAM_RED);
+					SetActive(false);
+				}
+			}
+
+			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_BLUE)
+			{
+				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
+				if(!DummyConnecting && DoButton_Menu(&s_JoinBlueButton, Localize("Join blue"), 0, &Button))
+				{
+					m_pClient->SendSwitchTeam(TEAM_BLUE);
+					SetActive(false);
+				}
+			}
+		}
+		else
+		{
+			if(m_pClient->m_Snap.m_pLocalInfo->m_Team != 0)
+			{
+				ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+				ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
+				if(!DummyConnecting && DoButton_Menu(&s_SpectateButton, Localize("Join game"), 0, &Button))
+				{
+					m_pClient->SendSwitchTeam(0);
+					SetActive(false);
+				}
+			}
+		}
+
+		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
+		{
+			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+			ButtonBar.VSplitLeft(65.0f, &Button, &ButtonBar);
+
+			static CButtonContainer s_KillButton;
+			if(DoButton_Menu(&s_KillButton, Localize("Kill"), 0, &Button))
+			{
+				m_pClient->SendKill(-1);
+				SetActive(false);
+			}
+		}
+	}
+
+	if(m_pClient->m_ReceivedDDNetPlayer && m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj)
+	{
+		if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS || Paused || Spec)
+		{
+			ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
+			ButtonBar.VSplitLeft((!Paused && !Spec) ? 65.0f : 120.0f, &Button, &ButtonBar);
+
+			static CButtonContainer s_PauseButton;
+			if(DoButton_Menu(&s_PauseButton, (!Paused && !Spec) ? Localize("Pause") : Localize("Join game"), 0, &Button))
+			{
+				m_pClient->Console()->ExecuteLine("say /pause");
+				SetActive(false);
+			}
+		}
+	}
+}
+
+void CMenus::PopupConfirmDisconnect()
+{
+	Client()->Disconnect();
+}
+
+void CMenus::PopupConfirmDisconnectDummy()
+{
+	Client()->DummyDisconnect(0);
+	SetActive(false);
+}
+
+void CMenus::RenderPlayers(CUIRect MainView)
+{
+	CUIRect Button, Button2, ButtonBar, Options, Player;
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	// player options
+	MainView.Margin(10.0f, &Options);
+	Options.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+	Options.Margin(10.0f, &Options);
+	Options.HSplitTop(50.0f, &Button, &Options);
+	UI()->DoLabel(&Button, Localize("Player options"), 34.0f, TEXTALIGN_ML);
+
+	// headline
+	Options.HSplitTop(34.0f, &ButtonBar, &Options);
+	ButtonBar.VSplitRight(231.0f, &Player, &ButtonBar);
+	UI()->DoLabel(&Player, Localize("Player"), 24.0f, TEXTALIGN_ML);
+
+	ButtonBar.HMargin(1.0f, &ButtonBar);
+	float Width = ButtonBar.h * 2.0f;
+	ButtonBar.VSplitLeft(Width, &Button, &ButtonBar);
+	RenderTools()->RenderIcon(IMAGE_GUIICONS, SPRITE_GUIICON_MUTE, &Button);
+
+	ButtonBar.VSplitLeft(20.0f, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(Width, &Button, &ButtonBar);
+	RenderTools()->RenderIcon(IMAGE_GUIICONS, SPRITE_GUIICON_EMOTICON_MUTE, &Button);
+
+	ButtonBar.VSplitLeft(20.0f, nullptr, &ButtonBar);
+	ButtonBar.VSplitLeft(Width, &Button, &ButtonBar);
+	RenderTools()->RenderIcon(IMAGE_GUIICONS, SPRITE_GUIICON_FRIEND, &Button);
+
+	Options.HSplitTop(34.0f, &ButtonBar, &Options);
+	ButtonBar.VSplitRight(310.0f, &Player, &ButtonBar);
+	UI()->DoLabel(&Player, Localize("Blacklist"), 10.0f, TEXTALIGN_MR);
+
+	int TotalPlayers = 0;
+	for(const auto &pInfoByName : m_pClient->m_Snap.m_apInfoByName)
+	{
+		if(!pInfoByName)
+			continue;
+
+		int Index = pInfoByName->m_ClientID;
+
+		if(Index == m_pClient->m_Snap.m_LocalClientID)
+			continue;
+
+		TotalPlayers++;
+	}
+
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(24.0f, TotalPlayers, 1, 3, -1, &Options);
+
+	// options
+	static char s_aPlayerIDs[MAX_CLIENTS][4] = {{0}};
+
+	for(int i = 0, Count = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(!m_pClient->m_Snap.m_apInfoByName[i])
+			continue;
+
+		int Index = m_pClient->m_Snap.m_apInfoByName[i]->m_ClientID;
+		if(Index == m_pClient->m_Snap.m_LocalClientID)
+			continue;
+
+		CGameClient::CClientData &CurrentClient = m_pClient->m_aClients[Index];
+		const CListboxItem Item = s_ListBox.DoNextItem(&CurrentClient);
+
+		Count++;
+
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Row = Item.m_Rect;
+		if(Count % 2 == 1)
+			Row.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
+		Row.VSplitRight(s_ListBox.ScrollbarWidthMax() - s_ListBox.ScrollbarWidth(), &Row, nullptr);
+		Row.VSplitRight(300.0f, &Player, &Row);
+
+		// player info
+		Player.VSplitLeft(28.0f, &Button, &Player);
+
+		CTeeRenderInfo TeeInfo = CurrentClient.m_RenderInfo;
+
+		TeeInfo.m_Size = Button.h;
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		vec2 TeeRenderPos(Button.x + Button.h / 2, Button.y + Button.h / 2 + OffsetToMid.y);
+
+		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+
+		Player.HSplitTop(1.5f, nullptr, &Player);
+		Player.VSplitMid(&Player, &Button);
+		Row.VSplitRight(210.0f, &Button2, &Row);
+
+		UI()->DoLabel(&Player, CurrentClient.m_aName, 14.0f, TEXTALIGN_ML);
+		UI()->DoLabel(&Button, CurrentClient.m_aClan, 14.0f, TEXTALIGN_ML);
+
+		m_pClient->m_CountryFlags.Render(CurrentClient.m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f),
+			Button2.x, Button2.y + Button2.h / 2.0f - 0.75f * Button2.h / 2.0f, 1.5f * Button2.h, 0.75f * Button2.h);
+
+		//blacklisting hahxd
+		Row.VSplitLeft(5.0f, &Row, nullptr);
+		//  Row.VSplitLeft(Width, &Button, &Row);
+		Button.VSplitRight((Width - Button.h) / 4.0f, nullptr, &Button);
+		Button.VSplitRight(Button.h, nullptr, &Button);
+
+		if(DoButton_CheckBox(&s_aPlayerIDs[Index][3], Localize(""), CurrentClient.m_Foe, &Button))
+		{
+			CurrentClient.m_Foe ^= 1;
+			if(CurrentClient.m_Foe)
+				Client()->Foes()->AddFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
+			else
+				Client()->Foes()->RemoveFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
+		}
+
+		// ignore chat button
+		Row.HMargin(2.0f, &Row);
+		Row.VSplitLeft(Width, &Button, &Row);
+		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
+		Button.VSplitLeft(Button.h, &Button, nullptr);
+		if(g_Config.m_ClShowChatFriends && !CurrentClient.m_Friend)
+			DoButton_Toggle(&s_aPlayerIDs[Index][0], 1, &Button, false);
+		else if(DoButton_Toggle(&s_aPlayerIDs[Index][0], CurrentClient.m_ChatIgnore, &Button, true))
+			CurrentClient.m_ChatIgnore ^= 1;
+
+		// ignore emoticon button
+		Row.VSplitLeft(30.0f, nullptr, &Row);
+		Row.VSplitLeft(Width, &Button, &Row);
+		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
+		Button.VSplitLeft(Button.h, &Button, nullptr);
+		if(g_Config.m_ClShowChatFriends && !CurrentClient.m_Friend)
+			DoButton_Toggle(&s_aPlayerIDs[Index][1], 1, &Button, false);
+		else if(DoButton_Toggle(&s_aPlayerIDs[Index][1], CurrentClient.m_EmoticonIgnore, &Button, true))
+			CurrentClient.m_EmoticonIgnore ^= 1;
+
+		// friend button
+		Row.VSplitLeft(10.0f, nullptr, &Row);
+		Row.VSplitLeft(Width, &Button, &Row);
+		Button.VSplitLeft((Width - Button.h) / 4.0f, nullptr, &Button);
+		Button.VSplitLeft(Button.h, &Button, nullptr);
+		if(DoButton_Toggle(&s_aPlayerIDs[Index][2], CurrentClient.m_Friend, &Button, true))
+		{
+			if(CurrentClient.m_Friend)
+				m_pClient->Friends()->RemoveFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
+			else
+				m_pClient->Friends()->AddFriend(CurrentClient.m_aName, CurrentClient.m_aClan);
+
+			m_pClient->Client()->ServerBrowserUpdate();
+		}
+	}
+
+	s_ListBox.DoEnd();
+}
+
+void CMenus::RenderServerInfo(CUIRect MainView)
+{
+	if(!m_pClient->m_Snap.m_pLocalInfo)
+		return;
+
+	// fetch server info
+	CServerInfo CurrentServerInfo;
+	Client()->GetServerInfo(&CurrentServerInfo);
+
+	// render background
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	CUIRect View, ServerInfo, GameInfo, Motd;
+
+	float x = 0.0f;
+	float y = 0.0f;
+
+	char aBuf[1024];
+
+	// set view to use for all submodules
+	MainView.Margin(10.0f, &View);
+
+	// serverinfo
+	View.HSplitTop(View.h / 2 - 5.0f, &ServerInfo, &Motd);
+	ServerInfo.VSplitLeft(View.w / 2 - 5.0f, &ServerInfo, &GameInfo);
+	ServerInfo.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+
+	ServerInfo.Margin(5.0f, &ServerInfo);
+
+	x = 5.0f;
+	y = 0.0f;
+
+	TextRender()->Text(ServerInfo.x + x, ServerInfo.y + y, 32, Localize("Server info"), -1.0f);
+	y += 32.0f + 5.0f;
+
+	mem_zero(aBuf, sizeof(aBuf));
+	str_format(
+		aBuf,
+		sizeof(aBuf),
+		"%s\n\n"
+		"%s: %s\n"
+		"%s: %d\n"
+		"%s: %s\n"
+		"%s: %s\n",
+		CurrentServerInfo.m_aName,
+		Localize("Address"), CurrentServerInfo.m_aAddress,
+		Localize("Ping"), m_pClient->m_Snap.m_pLocalInfo->m_Latency,
+		Localize("Version"), CurrentServerInfo.m_aVersion,
+		Localize("Password"), CurrentServerInfo.m_Flags & 1 ? Localize("Yes") : Localize("No"));
+
+	TextRender()->Text(ServerInfo.x + x, ServerInfo.y + y, 20, aBuf, ServerInfo.w - 10.0f);
+
+	// copy info button
+	{
+		CUIRect Button;
+		ServerInfo.HSplitBottom(20.0f, &ServerInfo, &Button);
+		Button.VSplitRight(200.0f, &ServerInfo, &Button);
+		static CButtonContainer s_CopyButton;
+		if(DoButton_Menu(&s_CopyButton, Localize("Copy info"), 0, &Button))
+		{
+			char aInfo[256];
+			CurrentServerInfo.InfoToString(aInfo, sizeof(aInfo));
+			Input()->SetClipboardText(aInfo);
+		}
+	}
+
+	// favorite checkbox
+	{
+		CUIRect Button;
+		NETADDR ServerAddr = Client()->ServerAddress();
+		TRISTATE IsFavorite = Favorites()->IsFavorite(&ServerAddr, 1);
+		ServerInfo.HSplitBottom(20.0f, &ServerInfo, &Button);
+		static int s_AddFavButton = 0;
+		if(DoButton_CheckBox(&s_AddFavButton, Localize("Favorite"), IsFavorite != TRISTATE::NONE, &Button))
+		{
+			if(IsFavorite != TRISTATE::NONE)
+				Favorites()->Remove(&ServerAddr, 1);
+			else
+				Favorites()->Add(&ServerAddr, 1);
+		}
+	}
+
+	// gameinfo
+	GameInfo.VSplitLeft(10.0f, 0x0, &GameInfo);
+	GameInfo.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+
+	GameInfo.Margin(5.0f, &GameInfo);
+
+	x = 5.0f;
+	y = 0.0f;
+
+	TextRender()->Text(GameInfo.x + x, GameInfo.y + y, 32, Localize("Game info"), -1.0f);
+	y += 32.0f + 5.0f;
+
+	if(m_pClient->m_Snap.m_pGameInfoObj)
+	{
+		mem_zero(aBuf, sizeof(aBuf));
+		str_format(
+			aBuf,
+			sizeof(aBuf),
+			"\n\n"
+			"%s: %s\n"
+			"%s: %s\n"
+			"%s: %d\n"
+			"%s: %d\n"
+			"\n"
+			"%s: %d/%d\n",
+			Localize("Game type"), CurrentServerInfo.m_aGameType,
+			Localize("Map"), CurrentServerInfo.m_aMap,
+			Localize("Score limit"), m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit,
+			Localize("Time limit"), m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit,
+			Localize("Players"), m_pClient->m_Snap.m_NumPlayers, CurrentServerInfo.m_MaxClients);
+		TextRender()->Text(GameInfo.x + x, GameInfo.y + y, 20, aBuf, GameInfo.w - 10.0f);
+	}
+
+	RenderServerInfoMotd(Motd);
+}
+
+void CMenus::RenderServerInfoMotd(CUIRect Motd)
+{
+	const float MotdFontSize = 16.0f;
+	Motd.HSplitTop(10.0f, nullptr, &Motd);
+	Motd.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+	Motd.HMargin(5.0f, &Motd);
+	Motd.VMargin(10.0f, &Motd);
+
+	CUIRect MotdHeader;
+	Motd.HSplitTop(2.0f * MotdFontSize, &MotdHeader, &Motd);
+	Motd.HSplitTop(5.0f, nullptr, &Motd);
+	TextRender()->Text(MotdHeader.x, MotdHeader.y, 2.0f * MotdFontSize, Localize("MOTD"), -1.0f);
+
+	if(!m_pClient->m_Motd.ServerMotd()[0])
+		return;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollUnit = 5 * MotdFontSize;
+	s_ScrollRegion.Begin(&Motd, &ScrollOffset, &ScrollParams);
+	Motd.y += ScrollOffset.y;
+
+	static float s_MotdHeight = 0.0f;
+	static int64_t s_MotdLastUpdateTime = -1;
+	if(!m_MotdTextContainerIndex.Valid() || s_MotdLastUpdateTime == -1 || s_MotdLastUpdateTime != m_pClient->m_Motd.ServerMotdUpdateTime())
+	{
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, 0.0f, 0.0f, MotdFontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = Motd.w;
+		TextRender()->RecreateTextContainer(m_MotdTextContainerIndex, &Cursor, m_pClient->m_Motd.ServerMotd());
+		s_MotdHeight = Cursor.Height();
+		s_MotdLastUpdateTime = m_pClient->m_Motd.ServerMotdUpdateTime();
+	}
+
+	CUIRect MotdTextArea;
+	Motd.HSplitTop(s_MotdHeight, &MotdTextArea, &Motd);
+	s_ScrollRegion.AddRect(MotdTextArea);
+
+	if(m_MotdTextContainerIndex.Valid())
+		TextRender()->RenderTextContainer(m_MotdTextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor(), MotdTextArea.x, MotdTextArea.y);
+
+	s_ScrollRegion.End();
+}
+
+bool CMenus::RenderServerControlServer(CUIRect MainView)
+{
+	CUIRect List = MainView;
+	int Total = m_pClient->m_Voting.m_NumVoteOptions;
+	int NumVoteOptions = 0;
+	int aIndices[MAX_VOTE_OPTIONS];
+	static int s_CurVoteOption = 0;
+	int TotalShown = 0;
+
+	for(CVoteOptionClient *pOption = m_pClient->m_Voting.m_pFirst; pOption; pOption = pOption->m_pNext)
+	{
+		if(!m_FilterInput.IsEmpty() && !str_utf8_find_nocase(pOption->m_aDescription, m_FilterInput.GetString()))
+			continue;
+		TotalShown++;
+	}
+
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(19.0f, TotalShown, 1, 3, s_CurVoteOption, &List);
+
+	int i = -1;
+	for(CVoteOptionClient *pOption = m_pClient->m_Voting.m_pFirst; pOption; pOption = pOption->m_pNext)
+	{
+		i++;
+		if(!m_FilterInput.IsEmpty() && !str_utf8_find_nocase(pOption->m_aDescription, m_FilterInput.GetString()))
+			continue;
+
+		if(NumVoteOptions < Total)
+			aIndices[NumVoteOptions] = i;
+		NumVoteOptions++;
+
+		const CListboxItem Item = s_ListBox.DoNextItem(pOption);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Label;
+		Item.m_Rect.VMargin(2.0f, &Label);
+		UI()->DoLabel(&Label, pOption->m_aDescription, 13.0f, TEXTALIGN_ML);
+	}
+
+	s_CurVoteOption = s_ListBox.DoEnd();
+	if(s_CurVoteOption < Total)
+		m_CallvoteSelectedOption = aIndices[s_CurVoteOption];
+	return s_ListBox.WasItemActivated();
+}
+
+bool CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
+{
+	int NumOptions = 0;
+	int Selected = 0;
+	static int aPlayerIDs[MAX_CLIENTS];
+	for(const auto &pInfoByName : m_pClient->m_Snap.m_apInfoByName)
+	{
+		if(!pInfoByName)
+			continue;
+
+		int Index = pInfoByName->m_ClientID;
+		if(Index == m_pClient->m_Snap.m_LocalClientID || (FilterSpectators && pInfoByName->m_Team == TEAM_SPECTATORS))
+			continue;
+
+		if(!str_utf8_find_nocase(m_pClient->m_aClients[Index].m_aName, m_FilterInput.GetString()))
+			continue;
+
+		if(m_CallvoteSelectedPlayer == Index)
+			Selected = NumOptions;
+		aPlayerIDs[NumOptions++] = Index;
+	}
+
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(24.0f, NumOptions, 1, 3, Selected, &MainView);
+
+	for(int i = 0; i < NumOptions; i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&aPlayerIDs[i]);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect TeeRect, Label;
+		Item.m_Rect.VSplitLeft(Item.m_Rect.h, &TeeRect, &Label);
+
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[aPlayerIDs[i]].m_RenderInfo;
+		TeeInfo.m_Size = TeeRect.h;
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		vec2 TeeRenderPos(TeeRect.x + TeeInfo.m_Size / 2, TeeRect.y + TeeInfo.m_Size / 2 + OffsetToMid.y);
+
+		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+
+		UI()->DoLabel(&Label, m_pClient->m_aClients[aPlayerIDs[i]].m_aName, 16.0f, TEXTALIGN_ML);
+	}
+
+	Selected = s_ListBox.DoEnd();
+	m_CallvoteSelectedPlayer = Selected != -1 ? aPlayerIDs[Selected] : -1;
+	return s_ListBox.WasItemActivated();
+}
+
+void CMenus::RenderServerControl(CUIRect MainView)
+{
+	static int s_ControlPage = 0;
+	// render background
+	CUIRect Bottom, RconExtension, TabBar, Button;
+	MainView.HSplitTop(20.0f, &Bottom, &MainView);
+	Bottom.Draw(ms_ColorTabbarActive, 0, 10.0f);
+	MainView.HSplitTop(20.0f, &TabBar, &MainView);
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+	MainView.Margin(10.0f, &MainView);
+
+	if(Client()->RconAuthed())
+		MainView.HSplitBottom(90.0f, &MainView, &RconExtension);
+
+	// tab bar
+	TabBar.VSplitLeft(TabBar.w / 3, &Button, &TabBar);
+	static CButtonContainer s_Button0;
+	if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == 0, &Button, 0))
+		s_ControlPage = 0;
+
+	TabBar.VSplitMid(&Button, &TabBar);
+	static CButtonContainer s_Button1;
+	if(DoButton_MenuTab(&s_Button1, Localize("Kick player"), s_ControlPage == 1, &Button, 0))
+		s_ControlPage = 1;
+
+	static CButtonContainer s_Button2;
+	if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == 2, &TabBar, 0))
+		s_ControlPage = 2;
+
+	// render page
+	MainView.HSplitBottom(ms_ButtonHeight + 5 * 2, &MainView, &Bottom);
+	Bottom.HMargin(5.0f, &Bottom);
+
+	bool Call = false;
+	if(s_ControlPage == 0)
+		Call = RenderServerControlServer(MainView);
+	else if(s_ControlPage == 1)
+		Call = RenderServerControlKick(MainView, false);
+	else if(s_ControlPage == 2)
+		Call = RenderServerControlKick(MainView, true);
+
+	// vote menu
+	CUIRect QuickSearch;
+
+	// render quick search
+	Bottom.VSplitLeft(5.0f, 0, &Bottom);
+	Bottom.VSplitLeft(250.0f, &QuickSearch, &Bottom);
+	QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+	UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
+	float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
+	QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
+
+	if(m_ControlPageOpening || (Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed()))
+	{
+		UI()->SetActiveItem(&m_FilterInput);
+		m_ControlPageOpening = false;
+		m_FilterInput.SelectAll();
+	}
+	m_FilterInput.SetEmptyText(Localize("Search"));
+	UI()->DoClearableEditBox(&m_FilterInput, &QuickSearch, 14.0f);
+
+	// call vote
+	Bottom.VSplitRight(10.0f, &Bottom, 0);
+	Bottom.VSplitRight(120.0f, &Bottom, &Button);
+	Button.HSplitTop(5.0f, 0, &Button);
+
+	static CButtonContainer s_CallVoteButton;
+	if(DoButton_Menu(&s_CallVoteButton, Localize("Call vote"), 0, &Button) || Call)
+	{
+		if(s_ControlPage == 0)
+		{
+			m_pClient->m_Voting.CallvoteOption(m_CallvoteSelectedOption, m_CallvoteReasonInput.GetString());
+			if(g_Config.m_UiCloseWindowAfterChangingSetting)
+				SetActive(false);
+		}
+		else if(s_ControlPage == 1)
+		{
+			if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
+				m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
+			{
+				m_pClient->m_Voting.CallvoteKick(m_CallvoteSelectedPlayer, m_CallvoteReasonInput.GetString());
+				SetActive(false);
+			}
+		}
+		else if(s_ControlPage == 2)
+		{
+			if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
+				m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
+			{
+				m_pClient->m_Voting.CallvoteSpectate(m_CallvoteSelectedPlayer, m_CallvoteReasonInput.GetString());
+				SetActive(false);
+			}
+		}
+		m_CallvoteReasonInput.Clear();
+	}
+
+	// render kick reason
+	CUIRect Reason;
+	Bottom.VSplitRight(20.0f, &Bottom, 0);
+	Bottom.VSplitRight(200.0f, &Bottom, &Reason);
+	Reason.HSplitTop(5.0f, 0, &Reason);
+	const char *pLabel = Localize("Reason:");
+	UI()->DoLabel(&Reason, pLabel, 14.0f, TEXTALIGN_ML);
+	float w = TextRender()->TextWidth(14.0f, pLabel, -1, -1.0f);
+	Reason.VSplitLeft(w + 10.0f, 0, &Reason);
+	if(Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed())
+	{
+		UI()->SetActiveItem(&m_CallvoteReasonInput);
+		m_CallvoteReasonInput.SelectAll();
+	}
+	UI()->DoEditBox(&m_CallvoteReasonInput, &Reason, 14.0f);
+
+	// extended features (only available when authed in rcon)
+	if(Client()->RconAuthed())
+	{
+		// background
+		RconExtension.HSplitTop(10.0f, 0, &RconExtension);
+		RconExtension.HSplitTop(20.0f, &Bottom, &RconExtension);
+		RconExtension.HSplitTop(5.0f, 0, &RconExtension);
+
+		// force vote
+		Bottom.VSplitLeft(5.0f, 0, &Bottom);
+		Bottom.VSplitLeft(120.0f, &Button, &Bottom);
+
+		static CButtonContainer s_ForceVoteButton;
+		if(DoButton_Menu(&s_ForceVoteButton, Localize("Force vote"), 0, &Button))
+		{
+			if(s_ControlPage == 0)
+				m_pClient->m_Voting.CallvoteOption(m_CallvoteSelectedOption, m_CallvoteReasonInput.GetString(), true);
+			else if(s_ControlPage == 1)
+			{
+				if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
+					m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
+				{
+					m_pClient->m_Voting.CallvoteKick(m_CallvoteSelectedPlayer, m_CallvoteReasonInput.GetString(), true);
+					SetActive(false);
+				}
+			}
+			else if(s_ControlPage == 2)
+			{
+				if(m_CallvoteSelectedPlayer >= 0 && m_CallvoteSelectedPlayer < MAX_CLIENTS &&
+					m_pClient->m_Snap.m_apPlayerInfos[m_CallvoteSelectedPlayer])
+				{
+					m_pClient->m_Voting.CallvoteSpectate(m_CallvoteSelectedPlayer, m_CallvoteReasonInput.GetString(), true);
+					SetActive(false);
+				}
+			}
+			m_CallvoteReasonInput.Clear();
+		}
+
+		if(s_ControlPage == 0)
+		{
+			// remove vote
+			Bottom.VSplitRight(10.0f, &Bottom, 0);
+			Bottom.VSplitRight(120.0f, 0, &Button);
+			static CButtonContainer s_RemoveVoteButton;
+			if(DoButton_Menu(&s_RemoveVoteButton, Localize("Remove"), 0, &Button))
+				m_pClient->m_Voting.RemovevoteOption(m_CallvoteSelectedOption);
+
+			// add vote
+			RconExtension.HSplitTop(20.0f, &Bottom, &RconExtension);
+			Bottom.VSplitLeft(5.0f, 0, &Bottom);
+			Bottom.VSplitLeft(250.0f, &Button, &Bottom);
+			UI()->DoLabel(&Button, Localize("Vote description:"), 14.0f, TEXTALIGN_ML);
+
+			Bottom.VSplitLeft(20.0f, 0, &Button);
+			UI()->DoLabel(&Button, Localize("Vote command:"), 14.0f, TEXTALIGN_ML);
+
+			static CLineInputBuffered<VOTE_DESC_LENGTH> s_VoteDescriptionInput;
+			static CLineInputBuffered<VOTE_CMD_LENGTH> s_VoteCommandInput;
+			RconExtension.HSplitTop(20.0f, &Bottom, &RconExtension);
+			Bottom.VSplitRight(10.0f, &Bottom, 0);
+			Bottom.VSplitRight(120.0f, &Bottom, &Button);
+			static CButtonContainer s_AddVoteButton;
+			if(DoButton_Menu(&s_AddVoteButton, Localize("Add"), 0, &Button))
+				if(!s_VoteDescriptionInput.IsEmpty() && !s_VoteCommandInput.IsEmpty())
+					m_pClient->m_Voting.AddvoteOption(s_VoteDescriptionInput.GetString(), s_VoteCommandInput.GetString());
+
+			Bottom.VSplitLeft(5.0f, 0, &Bottom);
+			Bottom.VSplitLeft(250.0f, &Button, &Bottom);
+			UI()->DoEditBox(&s_VoteDescriptionInput, &Button, 14.0f);
+
+			Bottom.VMargin(20.0f, &Button);
+			UI()->DoEditBox(&s_VoteCommandInput, &Button, 14.0f);
+		}
+	}
+}
+
+void CMenus::RenderInGameNetwork(CUIRect MainView)
+{
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	CUIRect TabBar, Button;
+	MainView.HSplitTop(24.0f, &TabBar, &MainView);
+
+	int NewPage = g_Config.m_UiPage;
+
+	TabBar.VSplitLeft(100.0f, &Button, &TabBar);
+	static CButtonContainer s_InternetButton;
+	if(DoButton_MenuTab(&s_InternetButton, Localize("Internet"), g_Config.m_UiPage == PAGE_INTERNET, &Button, IGraphics::CORNER_NONE))
+	{
+		if(g_Config.m_UiPage != PAGE_INTERNET)
+		{
+			if(g_Config.m_UiPage != PAGE_FAVORITES)
+				Client()->RequestDDNetInfo();
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_INTERNET);
+		}
+		NewPage = PAGE_INTERNET;
+	}
+
+	TabBar.VSplitLeft(80.0f, &Button, &TabBar);
+	static CButtonContainer s_LanButton;
+	if(DoButton_MenuTab(&s_LanButton, Localize("LAN"), g_Config.m_UiPage == PAGE_LAN, &Button, IGraphics::CORNER_NONE))
+	{
+		if(g_Config.m_UiPage != PAGE_LAN)
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_LAN);
+		NewPage = PAGE_LAN;
+	}
+
+	TabBar.VSplitLeft(110.0f, &Button, &TabBar);
+	static CButtonContainer s_FavoritesButton;
+	if(DoButton_MenuTab(&s_FavoritesButton, Localize("Favorites"), g_Config.m_UiPage == PAGE_FAVORITES, &Button, IGraphics::CORNER_NONE))
+	{
+		if(g_Config.m_UiPage != PAGE_FAVORITES)
+		{
+			if(g_Config.m_UiPage != PAGE_INTERNET)
+				Client()->RequestDDNetInfo();
+			ServerBrowser()->Refresh(IServerBrowser::TYPE_FAVORITES);
+		}
+		NewPage = PAGE_FAVORITES;
+	}
+
+	if(NewPage != g_Config.m_UiPage)
+	{
+		if(Client()->State() != IClient::STATE_OFFLINE)
+			SetMenuPage(NewPage);
+	}
+
+	RenderServerbrowser(MainView);
+}
+
+// ghost stuff
+int CMenus::GhostlistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser)
+{
+	CMenus *pSelf = (CMenus *)pUser;
+	const char *pMap = pSelf->Client()->GetCurrentMap();
+	if(IsDir || !str_endswith(pInfo->m_pName, ".gho") || !str_startswith(pInfo->m_pName, pMap))
+		return 0;
+
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), "%s/%s", pSelf->m_pClient->m_Ghost.GetGhostDir(), pInfo->m_pName);
+
+	CGhostInfo Info;
+	if(!pSelf->m_pClient->m_Ghost.GhostLoader()->GetGhostInfo(aFilename, &Info, pMap, pSelf->Client()->GetCurrentMapSha256(), pSelf->Client()->GetCurrentMapCrc()))
+		return 0;
+
+	CGhostItem Item;
+	str_copy(Item.m_aFilename, aFilename);
+	str_copy(Item.m_aPlayer, Info.m_aOwner);
+	Item.m_Date = pInfo->m_TimeModified;
+	Item.m_Time = Info.m_Time;
+	if(Item.m_Time > 0)
+		pSelf->m_vGhosts.push_back(Item);
+
+	if(time_get_nanoseconds() - pSelf->m_GhostPopulateStartTime > 500ms)
+	{
+		pSelf->RenderLoading(Localize("Loading ghost files"), "", 0, false);
+	}
+
+	return 0;
+}
+
+void CMenus::GhostlistPopulate()
+{
+	m_vGhosts.clear();
+	m_GhostPopulateStartTime = time_get_nanoseconds();
+	Storage()->ListDirectoryInfo(IStorage::TYPE_ALL, m_pClient->m_Ghost.GetGhostDir(), GhostlistFetchCallback, this);
+	std::sort(m_vGhosts.begin(), m_vGhosts.end());
+
+	CGhostItem *pOwnGhost = 0;
+	for(auto &Ghost : m_vGhosts)
+	{
+		Ghost.m_Failed = false;
+		if(str_comp(Ghost.m_aPlayer, Client()->PlayerName()) == 0 && (!pOwnGhost || Ghost < *pOwnGhost))
+			pOwnGhost = &Ghost;
+	}
+
+	if(pOwnGhost)
+	{
+		pOwnGhost->m_Own = true;
+		pOwnGhost->m_Slot = m_pClient->m_Ghost.Load(pOwnGhost->m_aFilename);
+	}
+}
+
+CMenus::CGhostItem *CMenus::GetOwnGhost()
+{
+	for(auto &Ghost : m_vGhosts)
+		if(Ghost.m_Own)
+			return &Ghost;
+	return nullptr;
+}
+
+void CMenus::UpdateOwnGhost(CGhostItem Item)
+{
+	int Own = -1;
+	for(size_t i = 0; i < m_vGhosts.size(); i++)
+		if(m_vGhosts[i].m_Own)
+			Own = i;
+
+	if(Own != -1)
+	{
+		if(g_Config.m_ClRaceGhostSaveBest)
+		{
+			if(Item.HasFile() || !m_vGhosts[Own].HasFile())
+				DeleteGhostItem(Own);
+		}
+		if(m_vGhosts[Own].m_Time > Item.m_Time)
+		{
+			Item.m_Own = true;
+			m_vGhosts[Own].m_Own = false;
+			m_vGhosts[Own].m_Slot = -1;
+		}
+		else
+		{
+			Item.m_Own = false;
+			Item.m_Slot = -1;
+		}
+	}
+	else
+	{
+		Item.m_Own = true;
+	}
+
+	Item.m_Date = std::time(0);
+	Item.m_Failed = false;
+	m_vGhosts.insert(std::lower_bound(m_vGhosts.begin(), m_vGhosts.end(), Item), Item);
+}
+
+void CMenus::DeleteGhostItem(int Index)
+{
+	if(m_vGhosts[Index].HasFile())
+		Storage()->RemoveFile(m_vGhosts[Index].m_aFilename, IStorage::TYPE_SAVE);
+	m_vGhosts.erase(m_vGhosts.begin() + Index);
+}
+
+void CMenus::RenderGhost(CUIRect MainView)
+{
+	// render background
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+
+	MainView.HSplitTop(10.0f, 0, &MainView);
+	MainView.HSplitBottom(5.0f, &MainView, 0);
+	MainView.VSplitLeft(5.0f, 0, &MainView);
+	MainView.VSplitRight(5.0f, &MainView, 0);
+
+	CUIRect Headers, Status;
+	CUIRect View = MainView;
+
+	View.HSplitTop(17.0f, &Headers, &View);
+	View.HSplitBottom(28.0f, &View, &Status);
+
+	// split of the scrollbar
+	Headers.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_T, 5.0f);
+	Headers.VSplitRight(20.0f, &Headers, 0);
+
+	struct CColumn
+	{
+		const char *m_pCaption;
+		int m_Id;
+		float m_Width;
+		CUIRect m_Rect;
+		CUIRect m_Spacer;
+	};
+
+	enum
+	{
+		COL_ACTIVE = 0,
+		COL_NAME,
+		COL_TIME,
+		COL_DATE,
+	};
+
+	static CColumn s_aCols[] = {
+		{"", -1, 2.0f, {0}, {0}},
+		{"", COL_ACTIVE, 30.0f, {0}, {0}},
+		{Localizable("Name"), COL_NAME, 200.0f, {0}, {0}},
+		{Localizable("Time"), COL_TIME, 90.0f, {0}, {0}},
+		{Localizable("Date"), COL_DATE, 150.0f, {0}, {0}},
+	};
+
+	int NumCols = std::size(s_aCols);
+
+	// do layout
+	for(int i = 0; i < NumCols; i++)
+	{
+		Headers.VSplitLeft(s_aCols[i].m_Width, &s_aCols[i].m_Rect, &Headers);
+
+		if(i + 1 < NumCols)
+			Headers.VSplitLeft(2, &s_aCols[i].m_Spacer, &Headers);
+	}
+
+	// do headers
+	for(int i = 0; i < NumCols; i++)
+		DoButton_GridHeader(&s_aCols[i].m_Id, Localize(s_aCols[i].m_pCaption), 0, &s_aCols[i].m_Rect);
+
+	View.Draw(ColorRGBA(0, 0, 0, 0.15f), 0, 0);
+
+	const int NumGhosts = m_vGhosts.size();
+	int NumFailed = 0;
+	int NumActivated = 0;
+	static int s_SelectedIndex = 0;
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(17.0f, NumGhosts, 1, 3, s_SelectedIndex, &View, false);
+
+	for(int i = 0; i < NumGhosts; i++)
+	{
+		const CGhostItem *pGhost = &m_vGhosts[i];
+		const CListboxItem Item = s_ListBox.DoNextItem(pGhost);
+
+		if(pGhost->m_Failed)
+			NumFailed++;
+		if(pGhost->Active())
+			NumActivated++;
+
+		if(!Item.m_Visible)
+			continue;
+
+		ColorRGBA rgb = ColorRGBA(1.0f, 1.0f, 1.0f);
+		if(pGhost->m_Own)
+			rgb = color_cast<ColorRGBA>(ColorHSLA(0.33f, 1.0f, 0.75f));
+
+		if(pGhost->m_Failed)
+			rgb = ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f);
+
+		TextRender()->TextColor(rgb.WithAlpha(pGhost->HasFile() ? 1.0f : 0.5f));
+
+		for(int c = 0; c < NumCols; c++)
+		{
+			CUIRect Button;
+			Button.x = s_aCols[c].m_Rect.x;
+			Button.y = Item.m_Rect.y;
+			Button.h = Item.m_Rect.h;
+			Button.w = s_aCols[c].m_Rect.w;
+
+			int Id = s_aCols[c].m_Id;
+
+			if(Id == COL_ACTIVE)
+			{
+				if(pGhost->Active())
+				{
+					Graphics()->WrapClamp();
+					Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[(SPRITE_OOP + 7) - SPRITE_OOP]);
+					Graphics()->QuadsBegin();
+					IGraphics::CQuadItem QuadItem(Button.x + Button.w / 2, Button.y + Button.h / 2, 20.0f, 20.0f);
+					Graphics()->QuadsDraw(&QuadItem, 1);
+
+					Graphics()->QuadsEnd();
+					Graphics()->WrapNormal();
+				}
+			}
+			else if(Id == COL_NAME)
+			{
+				UI()->DoLabel(&Button, pGhost->m_aPlayer, 12.0f, TEXTALIGN_ML);
+			}
+			else if(Id == COL_TIME)
+			{
+				char aBuf[64];
+				str_time(pGhost->m_Time / 10, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
+			}
+			else if(Id == COL_DATE)
+			{
+				char aBuf[64];
+				str_timestamp_ex(pGhost->m_Date, aBuf, sizeof(aBuf), FORMAT_SPACE);
+				UI()->DoLabel(&Button, aBuf, 12.0f, TEXTALIGN_ML);
+			}
+		}
+
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+
+	s_SelectedIndex = s_ListBox.DoEnd();
+
+	Status.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_B, 5.0f);
+	Status.Margin(5.0f, &Status);
+
+	CUIRect Button;
+	Status.VSplitLeft(25.0f, &Button, &Status);
+
+	static CButtonContainer s_ReloadButton;
+	static CButtonContainer s_DirectoryButton;
+	static CButtonContainer s_ActivateAll;
+
+	if(DoButton_FontIcon(&s_ReloadButton, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &Button) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+	{
+		m_pClient->m_Ghost.UnloadAll();
+		GhostlistPopulate();
+	}
+
+	Status.VSplitLeft(5.0f, &Button, &Status);
+	Status.VSplitLeft(175.0f, &Button, &Status);
+	if(DoButton_Menu(&s_DirectoryButton, Localize("Ghosts directory"), 0, &Button))
+	{
+		char aBuf[IO_MAX_PATH_LENGTH];
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "ghosts", aBuf, sizeof(aBuf));
+		Storage()->CreateFolder("ghosts", IStorage::TYPE_SAVE);
+		if(!open_file(aBuf))
+		{
+			dbg_msg("menus", "couldn't open file '%s'", aBuf);
+		}
+	}
+
+	Status.VSplitLeft(5.0f, &Button, &Status);
+	if(NumGhosts - NumFailed > 0)
+	{
+		Status.VSplitLeft(175.0f, &Button, &Status);
+		bool ActivateAll = ((NumGhosts - NumFailed) != NumActivated) && m_pClient->m_Ghost.FreeSlots();
+
+		const char *pActionText = ActivateAll ? Localize("Activate all") : Localize("Deactivate all");
+		if(DoButton_Menu(&s_ActivateAll, pActionText, 0, &Button))
+		{
+			for(int i = 0; i < NumGhosts; i++)
+			{
+				CGhostItem *pGhost = &m_vGhosts[i];
+				if(pGhost->m_Failed || (ActivateAll && pGhost->m_Slot != -1))
+					continue;
+
+				if(ActivateAll)
+				{
+					if(!m_pClient->m_Ghost.FreeSlots())
+						break;
+
+					pGhost->m_Slot = m_pClient->m_Ghost.Load(pGhost->m_aFilename);
+					if(pGhost->m_Slot == -1)
+						pGhost->m_Failed = true;
+				}
+				else
+				{
+					m_pClient->m_Ghost.UnloadAll();
+					pGhost->m_Slot = -1;
+				}
+			}
+		}
+	}
+
+	if(s_SelectedIndex == -1 || s_SelectedIndex >= (int)m_vGhosts.size())
+		return;
+
+	CGhostItem *pGhost = &m_vGhosts[s_SelectedIndex];
+
+	CGhostItem *pOwnGhost = GetOwnGhost();
+	int ReservedSlots = !pGhost->m_Own && !(pOwnGhost && pOwnGhost->Active());
+	if(!pGhost->m_Failed && pGhost->HasFile() && (pGhost->Active() || m_pClient->m_Ghost.FreeSlots() > ReservedSlots))
+	{
+		Status.VSplitRight(120.0f, &Status, &Button);
+
+		static CButtonContainer s_GhostButton;
+		const char *pText = pGhost->Active() ? Localize("Deactivate") : Localize("Activate");
+		if(DoButton_Menu(&s_GhostButton, pText, 0, &Button) || s_ListBox.WasItemActivated())
+		{
+			if(pGhost->Active())
+			{
+				m_pClient->m_Ghost.Unload(pGhost->m_Slot);
+				pGhost->m_Slot = -1;
+			}
+			else
+			{
+				pGhost->m_Slot = m_pClient->m_Ghost.Load(pGhost->m_aFilename);
+				if(pGhost->m_Slot == -1)
+					pGhost->m_Failed = true;
+			}
+		}
+		Status.VSplitRight(5.0f, &Status, 0);
+	}
+
+	Status.VSplitRight(120.0f, &Status, &Button);
+
+	static CButtonContainer s_DeleteButton;
+	if(DoButton_Menu(&s_DeleteButton, Localize("Delete"), 0, &Button))
+	{
+		if(pGhost->Active())
+			m_pClient->m_Ghost.Unload(pGhost->m_Slot);
+		DeleteGhostItem(s_SelectedIndex);
+	}
+
+	Status.VSplitRight(5.0f, &Status, 0);
+
+	bool Recording = m_pClient->m_Ghost.GhostRecorder()->IsRecording();
+	if(!pGhost->HasFile() && !Recording && pGhost->Active())
+	{
+		static CButtonContainer s_SaveButton;
+		Status.VSplitRight(120.0f, &Status, &Button);
+		if(DoButton_Menu(&s_SaveButton, Localize("Save"), 0, &Button))
+			m_pClient->m_Ghost.SaveGhost(pGhost);
+	}
+}
+
+void CMenus::RenderIngameHint()
+{
+	float Width = 300 * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0, 0, Width, 300);
+	TextRender()->TextColor(1, 1, 1, 1);
+	TextRender()->Text(5, 280, 5, Localize("Menu opened. Press Esc key again to close menu."), -1.0f);
+	UI()->MapScreen();
+}
+
diff --git a/src/game/client/components/menus_ingame_sta.cpp b/src_bkp/game/client/components/menus_ingame_sta.cpp
similarity index 100%
rename from src/game/client/components/menus_ingame_sta.cpp
rename to src_bkp/game/client/components/menus_ingame_sta.cpp
diff --git a/src_bkp/game/client/components/menus_settings.cpp b/src_bkp/game/client/components/menus_settings.cpp
new file mode 100644
index 0000000000..4a8a52122d
--- /dev/null
+++ b/src_bkp/game/client/components/menus_settings.cpp
@@ -0,0 +1,4319 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <game/client/components/verify.h>
+//#include <engine/shared/linereader.h>
+#include <engine/shared/localization.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+//#include <engine/updater.h>
+//#include <game/generated/protocol.h>
+#include <engine/client/client.h>
+#include <game/client/animstate.h>
+#include <game/client/components/chat.h>
+#include <game/client/components/menu_background.h>
+#include <game/client/components/sounds.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+#include <game/client/skin.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/client/ui_scrollregion.h>
+#include <game/localization.h>
+
+#include "binds.h"
+#include "countryflags.h"
+#include "menus.h"
+#include "skins.h"
+
+#include <array>
+#include <chrono>
+//#include <memory>
+#include <numeric>
+#include <string>
+#include <vector>
+
+using namespace FontIcons;
+using namespace std::chrono_literals;
+
+CMenusKeyBinder CMenus::m_Binder;
+
+CMenusKeyBinder::CMenusKeyBinder()
+{
+	m_TakeKey = false;
+	m_GotKey = false;
+	m_ModifierCombination = 0;
+}
+
+bool CMenusKeyBinder::OnInput(const IInput::CEvent &Event)
+{
+	if(m_TakeKey)
+	{
+		int TriggeringEvent = (Event.m_Key == KEY_MOUSE_1) ? IInput::FLAG_PRESS : IInput::FLAG_RELEASE;
+		if(Event.m_Flags & TriggeringEvent)
+		{
+			m_Key = Event;
+			m_GotKey = true;
+			m_TakeKey = false;
+
+			m_ModifierCombination = CBinds::GetModifierMask(Input());
+			if(m_ModifierCombination == CBinds::GetModifierMaskOfKey(Event.m_Key))
+			{
+				m_ModifierCombination = 0;
+			}
+		}
+		return true;
+	}
+
+	return false;
+}
+
+void CMenus::RenderSettingsGeneral(CUIRect MainView)
+{
+	char aBuf[128 + IO_MAX_PATH_LENGTH];
+	CUIRect Label, Button, Left, Right, Game, Client;
+	MainView.HSplitTop(150.0f, &Game, &Client);
+
+	// game
+	{
+		// headline
+		Game.HSplitTop(20.0f, &Label, &Game);
+		UI()->DoLabel(&Label, Localize("Game"), 20.0f, TEXTALIGN_ML);
+		Game.Margin(5.0f, &Game);
+		Game.VSplitMid(&Left, &Right);
+		Left.VSplitRight(5.0f, &Left, 0);
+		Right.VMargin(5.0f, &Right);
+
+		// dynamic camera
+		Left.HSplitTop(20.0f, &Button, &Left);
+		bool IsDyncam = g_Config.m_ClDyncam || g_Config.m_ClMouseFollowfactor > 0;
+		if(DoButton_CheckBox(&g_Config.m_ClDyncam, Localize("Dynamic Camera"), IsDyncam, &Button))
+		{
+			if(IsDyncam)
+			{
+				g_Config.m_ClDyncam = 0;
+				g_Config.m_ClMouseFollowfactor = 0;
+			}
+			else
+			{
+				g_Config.m_ClDyncam = 1;
+			}
+		}
+
+		// smooth dynamic camera
+		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(g_Config.m_ClDyncam)
+		{
+			if(DoButton_CheckBox(&g_Config.m_ClDyncamSmoothness, Localize("Smooth Dynamic Camera"), g_Config.m_ClDyncamSmoothness, &Button))
+			{
+				if(g_Config.m_ClDyncamSmoothness)
+				{
+					g_Config.m_ClDyncamSmoothness = 0;
+				}
+				else
+				{
+					g_Config.m_ClDyncamSmoothness = 50;
+					g_Config.m_ClDyncamStabilizing = 50;
+				}
+			}
+		}
+
+		// weapon pickup
+		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeapons, Localize("Switch weapon on pickup"), g_Config.m_ClAutoswitchWeapons, &Button))
+			g_Config.m_ClAutoswitchWeapons ^= 1;
+
+		// weapon out of ammo autoswitch
+		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeaponsOutOfAmmo, Localize("Switch weapon when out of ammo"), g_Config.m_ClAutoswitchWeaponsOutOfAmmo, &Button))
+			g_Config.m_ClAutoswitchWeaponsOutOfAmmo ^= 1;
+	}
+
+	// client
+	{
+		// headline
+		Client.HSplitTop(20.0f, &Label, &Client);
+		UI()->DoLabel(&Label, Localize("Client"), 20.0f, TEXTALIGN_ML);
+		Client.Margin(5.0f, &Client);
+		Client.VSplitMid(&Left, &Right);
+		Left.VSplitRight(5.0f, &Left, 0);
+		Right.VMargin(5.0f, &Right);
+
+		// skip main menu
+		Left.HSplitTop(5.0f, 0, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClSkipStartMenu, Localize("Skip the main menu"), g_Config.m_ClSkipStartMenu, &Button))
+			g_Config.m_ClSkipStartMenu ^= 1;
+
+		float SliderGroupMargin = 10.0f;
+
+		// auto demo settings
+		{
+			Right.HSplitTop(40.0f, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoDemoRecord, Localize("Automatically record demos"), g_Config.m_ClAutoDemoRecord, &Button))
+				g_Config.m_ClAutoDemoRecord ^= 1;
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoDemoRecord)
+				UI()->DoScrollbarOption(&g_Config.m_ClAutoDemoMax, &g_Config.m_ClAutoDemoMax, &Button, Localize("Max demos"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+
+			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoScreenshot, Localize("Automatically take game over screenshot"), g_Config.m_ClAutoScreenshot, &Button))
+				g_Config.m_ClAutoScreenshot ^= 1;
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoScreenshot)
+				UI()->DoScrollbarOption(&g_Config.m_ClAutoScreenshotMax, &g_Config.m_ClAutoScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+		}
+
+		Left.HSplitTop(10.0f, nullptr, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		UI()->DoScrollbarOption(&g_Config.m_ClRefreshRate, &g_Config.m_ClRefreshRate, &Button, Localize("Refresh Rate"), 10, 10000, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE, " Hz");
+		Left.HSplitTop(5.0f, nullptr, &Left);
+		Left.HSplitTop(20.0f, &Button, &Left);
+		int s_LowerRefreshRate;
+		if(DoButton_CheckBox(&s_LowerRefreshRate, Localize("Save power by lowering refresh rate (higher input latency)"), g_Config.m_ClRefreshRate <= 480 && g_Config.m_ClRefreshRate != 0, &Button))
+			g_Config.m_ClRefreshRate = g_Config.m_ClRefreshRate > 480 || g_Config.m_ClRefreshRate == 0 ? 480 : 0;
+
+		CUIRect SettingsButton;
+		Left.HSplitBottom(25.0f, &Left, &SettingsButton);
+
+		SettingsButton.HSplitTop(5.0f, 0, &SettingsButton);
+		static CButtonContainer s_SettingsButtonID;
+		if(DoButton_Menu(&s_SettingsButtonID, Localize("Settings file"), 0, &SettingsButton))
+		{
+			Storage()->GetCompletePath(IStorage::TYPE_SAVE, CONFIG_FILE, aBuf, sizeof(aBuf));
+			if(!open_file(aBuf))
+			{
+				dbg_msg("menus", "couldn't open file '%s'", aBuf);
+			}
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_SettingsButtonID, &SettingsButton, Localize("Open the settings file"));
+
+		Left.HSplitTop(15.0f, 0, &Left);
+		CUIRect ConfigButton;
+		Left.HSplitBottom(25.0f, &Left, &ConfigButton);
+
+		ConfigButton.HSplitTop(5.0f, 0, &ConfigButton);
+		static CButtonContainer s_ConfigButtonID;
+		if(DoButton_Menu(&s_ConfigButtonID, Localize("Config directory"), 0, &ConfigButton))
+		{
+			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "", aBuf, sizeof(aBuf));
+			if(!open_file(aBuf))
+			{
+				dbg_msg("menus", "couldn't open file '%s'", aBuf);
+			}
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_ConfigButtonID, &ConfigButton, Localize("Open the directory that contains the configuration and user files"));
+
+		Left.HSplitTop(15.0f, 0, &Left);
+		CUIRect DirectoryButton;
+		Left.HSplitBottom(25.0f, &Left, &DirectoryButton);
+		RenderThemeSelection(Left);
+
+		DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
+		static CButtonContainer s_ThemesButtonID;
+		if(DoButton_Menu(&s_ThemesButtonID, Localize("Themes directory"), 0, &DirectoryButton))
+		{
+			Storage()->GetCompletePath(IStorage::TYPE_SAVE, "themes", aBuf, sizeof(aBuf));
+			Storage()->CreateFolder("themes", IStorage::TYPE_SAVE);
+			if(!open_file(aBuf))
+			{
+				dbg_msg("menus", "couldn't open file '%s'", aBuf);
+			}
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_ThemesButtonID, &DirectoryButton, Localize("Open the directory to add custom themes"));
+
+		// auto statboard screenshot
+		{
+			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoStatboardScreenshot, Localize("Automatically take statboard screenshot"), g_Config.m_ClAutoStatboardScreenshot, &Button))
+			{
+				g_Config.m_ClAutoStatboardScreenshot ^= 1;
+			}
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoStatboardScreenshot)
+				UI()->DoScrollbarOption(&g_Config.m_ClAutoStatboardScreenshotMax, &g_Config.m_ClAutoStatboardScreenshotMax, &Button, Localize("Max Screenshots"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+		}
+
+		// auto statboard csv
+		{
+			Right.HSplitTop(SliderGroupMargin, nullptr, &Right);
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClAutoCSV, Localize("Automatically create statboard csv"), g_Config.m_ClAutoCSV, &Button))
+			{
+				g_Config.m_ClAutoCSV ^= 1;
+			}
+
+			Right.HSplitTop(2 * 20.0f, &Button, &Right);
+			if(g_Config.m_ClAutoCSV)
+				UI()->DoScrollbarOption(&g_Config.m_ClAutoCSVMax, &g_Config.m_ClAutoCSVMax, &Button, Localize("Max CSVs"), 1, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_MULTILINE);
+		}
+	}
+}
+
+void CMenus::SetNeedSendInfo()
+{
+	if(m_Dummy)
+		m_NeedSendDummyinfo = true;
+	else
+		m_NeedSendinfo = true;
+}
+
+int CMenus::RenderSettingsPlayer(CUIRect MainView)
+{
+	CUIRect Button, Label, Dummy;
+	MainView.HSplitTop(10.0f, 0, &MainView);
+
+	char *pName = g_Config.m_PlayerName;
+	const char *pNameFallback = Client()->PlayerName();
+	char *pClan = g_Config.m_PlayerClan;
+	int *pCountry = &g_Config.m_PlayerCountry;
+
+	if(m_Dummy)
+	{
+		pName = g_Config.m_ClDummyName;
+		pNameFallback = Client()->DummyName();
+		pClan = g_Config.m_ClDummyClan;
+		pCountry = &g_Config.m_ClDummyCountry;
+	}
+
+	// player name
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	Button.VSplitLeft(80.0f, &Label, &Button);
+	Button.VSplitLeft(150.0f, &Button, 0);
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Name"));
+	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+	static CLineInput s_NameInput;
+
+	if(strcmp(Client()->PlayerName(), "-StormAx") == 0 || strcmp(Client()->PlayerName(), "meloƞ") == 0 || strcmp(Client()->PlayerName(), "我叫芙焦") == 0 || strcmp(Client()->PlayerName(), "Mʎɹ シ") == 0 || strcmp(Client()->PlayerName(), "Cheeru") == 0 || strcmp(Client()->PlayerName(), "Mónik") == 0)
+	{
+		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 30.f) % 255 / 255.f, 1.f, 1.f));
+		TextRender()->TextColor(col);
+	}
+
+	s_NameInput.SetBuffer(pName, sizeof(g_Config.m_PlayerName));
+	s_NameInput.SetEmptyText(pNameFallback);
+	if(UI()->DoEditBox(&s_NameInput, &Button, 14.0f))
+	{
+		SetNeedSendInfo();
+	}
+
+	//Kill game when start using m_PlayerName
+	if(!str_comp(g_Config.m_PlayerName, "nigger"))
+	{
+		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "YOU ARE FUCKING RACIST DON'T USE THIS CLIENT EVER AGAIN");
+	}
+	if(!str_comp(g_Config.m_PlayerName, "faggot"))
+	{
+		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "YOU ARE FUCKING RACIST DON'T USE THIS CLIENT EVER AGAIN");
+	}
+	if(!str_comp(g_Config.m_PlayerName, "pingvin?"))
+	{
+		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "Фу, умри русня");
+	}
+	if(!str_comp(g_Config.m_PlayerName, "Sedonya"))
+	{
+		dbg_assert_imp("UR NAME SUCK.js", -1, 0, "Кисао привет");
+	}
+	if(!str_comp(g_Config.m_PlayerName, "Cheeru"))
+	{
+		dbg_assert_imp("Hey!.js", -1, 0, "Привет Aйви, надеюсь хорошо поживаешь? Если все таки заинтересовалась клиент отпиши, пожалуйста, очень важно</3");
+	}
+
+	//TODO: Remove commits
+	/*
+	if(!str_comp(g_Config.m_PlayerName, "meloƞ"))
+	{
+		dbg_assert_imp("FakeNameList.txt", -1, 0, "YOU ARE NOT MELON SOB" );
+	}
+
+	if(!str_comp(g_Config.m_PlayerName, "-StormAx"))
+	{
+		dbg_assert_imp("FakeNameList.txt", -1, 0, "I see you tried to use developer name, :clueless:" );
+	}
+
+	if(!str_comp(g_Config.m_PlayerName, "Mʎɹ シ"))
+	{
+		dbg_assert_imp("FakeNameList.txt", -1, 0, "You was so clueless :Invalid:" );
+	}
+*/
+	// player clan
+	MainView.HSplitTop(5.0f, 0, &MainView);
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	Button.VSplitLeft(80.0f, &Label, &Button);
+	Button.VSplitLeft(200.0f, &Button, &Dummy);
+	Button.VSplitLeft(150.0f, &Button, 0);
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Clan"));
+	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+	static CLineInput s_ClanInput;
+	if(strcmp(g_Config.m_PlayerClan, "Inner peace") == 0 || strcmp(g_Config.m_PlayerClan, "Vegaming") == 0)
+	{
+		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 15.f) % 255 / 255.f, 1.f, 1.f));
+		TextRender()->TextColor(col);
+	}
+	s_ClanInput.SetBuffer(pClan, sizeof(g_Config.m_PlayerClan));
+	if(UI()->DoEditBox(&s_ClanInput, &Button, 14.0f))
+	{
+		SetNeedSendInfo();
+	}
+
+	if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &Dummy))
+	{
+		m_Dummy ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&m_Dummy, &Dummy, Localize("Toggle to edit your dummy settings"));
+
+	// country flag selector
+	MainView.HSplitTop(20.0f, 0, &MainView);
+	int OldSelected = -1;
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(50.0f, m_pClient->m_CountryFlags.Num(), 10, 3, OldSelected, &MainView);
+
+	for(size_t i = 0; i < m_pClient->m_CountryFlags.Num(); ++i)
+	{
+		const CCountryFlags::CCountryFlag *pEntry = m_pClient->m_CountryFlags.GetByIndex(i);
+		if(pEntry->m_CountryCode == *pCountry)
+			OldSelected = i;
+
+		const CListboxItem Item = s_ListBox.DoNextItem(&pEntry->m_CountryCode, OldSelected >= 0 && (size_t)OldSelected == i);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect FlagRect;
+		Item.m_Rect.Margin(5.0f, &FlagRect);
+		FlagRect.HSplitBottom(12.0f, &FlagRect, &Label);
+		Label.HSplitTop(2.0f, nullptr, &Label);
+		float OldWidth = FlagRect.w;
+		FlagRect.w = FlagRect.h * 2;
+		FlagRect.x += (OldWidth - FlagRect.w) / 2.0f;
+		m_pClient->m_CountryFlags.Render(pEntry->m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+		if(pEntry->m_Texture.IsValid())
+		{
+			UI()->DoLabel(&Label, pEntry->m_aCountryCodeString, 10.0f, TEXTALIGN_MC);
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(OldSelected != NewSelected)
+	{
+		*pCountry = m_pClient->m_CountryFlags.GetByIndex(NewSelected)->m_CountryCode;
+		SetNeedSendInfo();
+	}
+	return 0;
+}
+
+struct CUISkin
+{
+	const CSkin *m_pSkin;
+
+	CUISkin() :
+		m_pSkin(nullptr) {}
+	CUISkin(const CSkin *pSkin) :
+		m_pSkin(pSkin) {}
+
+	bool operator<(const CUISkin &Other) const { return str_comp_nocase(m_pSkin->GetName(), Other.m_pSkin->GetName()) < 0; }
+
+	bool operator<(const char *pOther) const { return str_comp_nocase(m_pSkin->GetName(), pOther) < 0; }
+	bool operator==(const char *pOther) const { return !str_comp_nocase(m_pSkin->GetName(), pOther); }
+};
+
+void CMenus::RefreshSkins()
+{
+	auto SkinStartLoadTime = time_get_nanoseconds();
+	m_pClient->m_Skins.Refresh([&](int) {
+		// if skin refreshing takes to long, swap to a loading screen
+		if(time_get_nanoseconds() - SkinStartLoadTime > 500ms)
+		{
+			RenderLoading(Localize("Loading skin files"), "", 0, false);
+		}
+	});
+	if(Client()->State() == IClient::STATE_ONLINE || Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		m_pClient->RefindSkins();
+	}
+}
+
+void CMenus::RandomSkin()
+{
+	static const float s_aSchemes[] = {1.0f / 2.0f, 1.0f / 3.0f, 1.0f / -3.0f, 1.0f / 12.0f, 1.0f / -12.0f}; // complementary, triadic, analogous
+
+	float GoalSat = random_float(0.3f, 1.0f);
+	float MaxBodyLht = 1.0f - GoalSat * GoalSat; // max allowed lightness before we start losing saturation
+
+	ColorHSLA Body;
+	Body.h = random_float();
+	Body.l = random_float(0.0f, MaxBodyLht);
+	Body.s = clamp(GoalSat * GoalSat / (1.0f - Body.l), 0.0f, 1.0f);
+
+	ColorHSLA Feet;
+	Feet.h = std::fmod(Body.h + s_aSchemes[rand() % std::size(s_aSchemes)], 1.0f);
+	Feet.l = random_float();
+	Feet.s = clamp(GoalSat * GoalSat / (1.0f - Feet.l), 0.0f, 1.0f);
+
+	const char *pRandomSkinName = CSkins::VANILLA_SKINS[rand() % (std::size(CSkins::VANILLA_SKINS) - 2)]; // last 2 skins are x_ninja and x_spec
+
+	char *pSkinName = !m_Dummy ? g_Config.m_ClPlayerSkin : g_Config.m_ClDummySkin;
+	unsigned *pColorBody = !m_Dummy ? &g_Config.m_ClPlayerColorBody : &g_Config.m_ClDummyColorBody;
+	unsigned *pColorFeet = !m_Dummy ? &g_Config.m_ClPlayerColorFeet : &g_Config.m_ClDummyColorFeet;
+
+	mem_copy(pSkinName, pRandomSkinName, sizeof(g_Config.m_ClPlayerSkin));
+	*pColorBody = Body.Pack(false);
+	*pColorFeet = Feet.Pack(false);
+
+	SetNeedSendInfo();
+}
+
+void CMenus::Con_AddFavoriteSkin(IConsole::IResult *pResult, void *pUserData)
+{
+	auto *pSelf = (CMenus *)pUserData;
+	if(pResult->NumArguments() >= 1)
+	{
+		pSelf->m_SkinFavorites.emplace(pResult->GetString(0));
+		pSelf->m_SkinFavoritesChanged = true;
+	}
+}
+
+void CMenus::Con_RemFavoriteSkin(IConsole::IResult *pResult, void *pUserData)
+{
+	auto *pSelf = (CMenus *)pUserData;
+	if(pResult->NumArguments() >= 1)
+	{
+		const auto it = pSelf->m_SkinFavorites.find(pResult->GetString(0));
+		if(it != pSelf->m_SkinFavorites.end())
+		{
+			pSelf->m_SkinFavorites.erase(it);
+			pSelf->m_SkinFavoritesChanged = true;
+		}
+	}
+}
+
+void CMenus::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
+{
+	auto *pSelf = (CMenus *)pUserData;
+	pSelf->OnConfigSave(pConfigManager);
+}
+
+void CMenus::OnConfigSave(IConfigManager *pConfigManager)
+{
+	for(const auto &Entry : m_SkinFavorites)
+	{
+		char aBuffer[256];
+		char aNameEscaped[256];
+		char *pDst = aNameEscaped;
+		str_escape(&pDst, Entry.c_str(), aNameEscaped + std::size(aNameEscaped));
+		str_format(aBuffer, std::size(aBuffer), "add_favorite_skin \"%s\"", Entry.c_str());
+		pConfigManager->WriteLine(aBuffer);
+	}
+}
+
+void CMenus::RenderSettingsTee(CUIRect MainView)
+{
+	CUIRect Button, Label, Dummy, DummyLabel, SkinList, QuickSearch, QuickSearchClearButton, SkinDB, SkinPrefix, SkinPrefixLabel, DirectoryButton, RefreshButton, Eyes, EyesLabel, EyesTee, EyesRight;
+
+	static bool s_InitSkinlist = true;
+	Eyes = MainView;
+
+	char *pSkinName = g_Config.m_ClPlayerSkin;
+	int *pUseCustomColor = &g_Config.m_ClPlayerUseCustomColor;
+	unsigned *pColorBody = &g_Config.m_ClPlayerColorBody;
+	unsigned *pColorFeet = &g_Config.m_ClPlayerColorFeet;
+
+	if(m_Dummy)
+	{
+		pSkinName = g_Config.m_ClDummySkin;
+		pUseCustomColor = &g_Config.m_ClDummyUseCustomColor;
+		pColorBody = &g_Config.m_ClDummyColorBody;
+		pColorFeet = &g_Config.m_ClDummyColorFeet;
+	}
+
+	MainView.HSplitTop(10.0f, &Label, &MainView);
+	Label.VSplitLeft(280.0f, &Label, &Dummy);
+	Label.VSplitLeft(230.0f, &Label, 0);
+	Dummy.VSplitLeft(170.0f, &Dummy, &SkinPrefix);
+	SkinPrefix.VSplitLeft(120.0f, &SkinPrefix, &EyesRight);
+	char aBuf[128 + IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Your skin"));
+	UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &DummyLabel))
+	{
+		m_Dummy ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&m_Dummy, &DummyLabel, Localize("Toggle to edit your dummy settings"));
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	if(DoButton_CheckBox(&g_Config.m_ClDownloadSkins, Localize("Download skins"), g_Config.m_ClDownloadSkins, &DummyLabel))
+	{
+		g_Config.m_ClDownloadSkins ^= 1;
+		RefreshSkins();
+		s_InitSkinlist = true;
+	}
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	if(DoButton_CheckBox(&g_Config.m_ClDownloadCommunitySkins, Localize("Download community skins"), g_Config.m_ClDownloadCommunitySkins, &DummyLabel))
+	{
+		g_Config.m_ClDownloadCommunitySkins ^= 1;
+		RefreshSkins();
+		s_InitSkinlist = true;
+	}
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	if(DoButton_CheckBox(&g_Config.m_ClVanillaSkinsOnly, Localize("Vanilla skins only"), g_Config.m_ClVanillaSkinsOnly, &DummyLabel))
+	{
+		g_Config.m_ClVanillaSkinsOnly ^= 1;
+		RefreshSkins();
+		s_InitSkinlist = true;
+	}
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	if(DoButton_CheckBox(&g_Config.m_ClFatSkins, Localize("Fat skins (DDFat)"), g_Config.m_ClFatSkins, &DummyLabel))
+	{
+		g_Config.m_ClFatSkins ^= 1;
+	}
+
+	SkinPrefix.HSplitTop(20.0f, &SkinPrefixLabel, &SkinPrefix);
+	UI()->DoLabel(&SkinPrefixLabel, Localize("Skin prefix"), 14.0f, TEXTALIGN_ML);
+
+	SkinPrefix.HSplitTop(20.0f, &SkinPrefixLabel, &SkinPrefix);
+	static CLineInput s_SkinPrefixInput(g_Config.m_ClSkinPrefix, sizeof(g_Config.m_ClSkinPrefix));
+	UI()->DoClearableEditBox(&s_SkinPrefixInput, &SkinPrefixLabel, 14.0f);
+
+	SkinPrefix.HSplitTop(2.0f, 0, &SkinPrefix);
+	{
+		static const char *s_apSkinPrefixes[] = {"kitty", "santa"};
+		static CButtonContainer s_aPrefixButtons[std::size(s_apSkinPrefixes)];
+		for(size_t i = 0; i < std::size(s_apSkinPrefixes); i++)
+		{
+			SkinPrefix.HSplitTop(20.0f, &Button, &SkinPrefix);
+			Button.HMargin(2.0f, &Button);
+			if(DoButton_Menu(&s_aPrefixButtons[i], s_apSkinPrefixes[i], 0, &Button))
+			{
+				str_copy(g_Config.m_ClSkinPrefix, s_apSkinPrefixes[i]);
+			}
+		}
+	}
+
+	Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+	// note: get the skin info after the settings buttons, because they can trigger a refresh
+	// which invalidates the skin
+	// skin info
+	CTeeRenderInfo OwnSkinInfo;
+	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
+	OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
+	OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
+	if(*pUseCustomColor)
+	{
+		OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting());
+		OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(*pColorFeet).UnclampLighting());
+	}
+	else
+	{
+		OwnSkinInfo.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
+		OwnSkinInfo.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
+	}
+	OwnSkinInfo.m_Size = 50.0f;
+
+	MainView.HSplitTop(50.0f, &Label, &MainView);
+	Label.VSplitLeft(260.0f, &Label, 0);
+	const CAnimState *pIdleState = CAnimState::GetIdle();
+	vec2 OffsetToMid;
+	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
+	vec2 TeeRenderPos(Label.x + 30.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
+	int Emote = m_Dummy ? g_Config.m_ClDummyDefaultEyes : g_Config.m_ClPlayerDefaultEyes;
+	RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, Emote, vec2(1, 0), TeeRenderPos);
+	Label.VSplitLeft(70.0f, 0, &Label);
+	Label.HMargin(15.0f, &Label);
+
+	// default eyes
+	bool RenderEyesBelow = MainView.w < 750.0f;
+	if(RenderEyesBelow)
+	{
+		Eyes.VSplitLeft(190.0f, 0, &Eyes);
+		Eyes.HSplitTop(105.0f, 0, &Eyes);
+	}
+	else
+	{
+		Eyes = EyesRight;
+		if(MainView.w < 810.0f)
+			Eyes.VSplitRight(205.0f, 0, &Eyes);
+		Eyes.HSplitTop(50.0f, &Eyes, 0);
+	}
+	Eyes.HSplitTop(120.0f, &EyesLabel, &Eyes);
+	EyesLabel.VSplitLeft(20.0f, 0, &EyesLabel);
+	EyesLabel.HSplitTop(50.0f, &EyesLabel, &Eyes);
+
+	static CButtonContainer s_aEyeButtons[6];
+	for(int CurrentEyeEmote = 0; CurrentEyeEmote < 6; CurrentEyeEmote++)
+	{
+		EyesLabel.VSplitLeft(10.0f, 0, &EyesLabel);
+		EyesLabel.VSplitLeft(50.0f, &EyesTee, &EyesLabel);
+
+		if(CurrentEyeEmote == 2 && !RenderEyesBelow)
+		{
+			Eyes.HSplitTop(60.0f, &EyesLabel, 0);
+			EyesLabel.HSplitTop(10.0f, 0, &EyesLabel);
+		}
+		float Highlight = (m_Dummy ? g_Config.m_ClDummyDefaultEyes == CurrentEyeEmote : g_Config.m_ClPlayerDefaultEyes == CurrentEyeEmote) ? 1.0f : 0.0f;
+		if(DoButton_Menu(&s_aEyeButtons[CurrentEyeEmote], "", 0, &EyesTee, 0, IGraphics::CORNER_ALL, 10.0f, 0.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f + Highlight * 0.25f)))
+		{
+			if(m_Dummy)
+			{
+				g_Config.m_ClDummyDefaultEyes = CurrentEyeEmote;
+				if(g_Config.m_ClDummy)
+					GameClient()->m_Emoticon.EyeEmote(CurrentEyeEmote);
+			}
+			else
+			{
+				g_Config.m_ClPlayerDefaultEyes = CurrentEyeEmote;
+				if(!g_Config.m_ClDummy)
+					GameClient()->m_Emoticon.EyeEmote(CurrentEyeEmote);
+			}
+		}
+		GameClient()->m_Tooltips.DoToolTip(&s_aEyeButtons[CurrentEyeEmote], &EyesTee, Localize("Choose default eyes when joining a server"));
+		RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, CurrentEyeEmote, vec2(1, 0), vec2(EyesTee.x + 25.0f, EyesTee.y + EyesTee.h / 2.0f + OffsetToMid.y));
+	}
+
+	Label.VSplitRight(34.0f, &Label, &Button);
+
+	static CLineInput s_SkinInput;
+	s_SkinInput.SetBuffer(pSkinName, sizeof(g_Config.m_ClPlayerSkin));
+	s_SkinInput.SetEmptyText("default");
+	if(UI()->DoClearableEditBox(&s_SkinInput, &Label, 14.0f))
+	{
+		SetNeedSendInfo();
+	}
+
+	// random skin button
+	Button.VSplitRight(30.0f, 0, &Button);
+	static CButtonContainer s_RandomSkinButtonID;
+	static const char *s_apDice[] = {FONT_ICON_DICE_ONE, FONT_ICON_DICE_TWO, FONT_ICON_DICE_THREE, FONT_ICON_DICE_FOUR, FONT_ICON_DICE_FIVE, FONT_ICON_DICE_SIX};
+	static int s_CurrentDie = rand() % std::size(s_apDice);
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	if(DoButton_Menu(&s_RandomSkinButtonID, s_apDice[s_CurrentDie], 1, &Button, nullptr, IGraphics::CORNER_ALL, 5.0f, -0.2f))
+	{
+		RandomSkin();
+		s_CurrentDie = rand() % std::size(s_apDice);
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	GameClient()->m_Tooltips.DoToolTip(&s_RandomSkinButtonID, &Button, Localize("Create a random skin"));
+
+	// custom color selector
+	MainView.HSplitTop(20.0f + RenderEyesBelow * 25.0f, 0, &MainView);
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	CUIRect RandomColorsButton;
+	Button.VSplitLeft(150.0f, &Button, &RandomColorsButton);
+	static int s_CustomColorID = 0;
+	if(DoButton_CheckBox(&s_CustomColorID, Localize("Custom colors"), *pUseCustomColor, &Button))
+	{
+		*pUseCustomColor = *pUseCustomColor ? 0 : 1;
+		SetNeedSendInfo();
+	}
+	CButtonContainer s_RandomizeColors;
+	if(*pUseCustomColor)
+	{
+		RandomColorsButton.VSplitLeft(120.0f, &RandomColorsButton, 0);
+		if(DoButton_Menu(&s_RandomizeColors, "Randomize Colors", 0, &RandomColorsButton, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0, 0, 0, 0.5f)))
+		{
+			if(m_Dummy)
+			{
+				g_Config.m_ClDummyColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				g_Config.m_ClDummyColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+			}
+			else
+			{
+				g_Config.m_ClPlayerColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				g_Config.m_ClPlayerColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+			}
+			SetNeedSendInfo();
+		}
+	}
+	MainView.HSplitTop(5.0f, 0, &MainView);
+	MainView.HSplitTop(82.5f, &Label, &MainView);
+	if(*pUseCustomColor)
+	{
+		CUIRect aRects[2];
+		Label.VSplitMid(&aRects[0], &aRects[1], 20.0f);
+
+		unsigned *apColors[2] = {pColorBody, pColorFeet};
+		const char *apParts[] = {Localize("Body"), Localize("Feet")};
+
+		for(int i = 0; i < 2; i++)
+		{
+			aRects[i].HSplitTop(20.0f, &Label, &aRects[i]);
+			UI()->DoLabel(&Label, apParts[i], 14.0f, TEXTALIGN_ML);
+			aRects[i].VSplitLeft(10.0f, 0, &aRects[i]);
+			aRects[i].HSplitTop(2.5f, 0, &aRects[i]);
+
+			unsigned PrevColor = *apColors[i];
+			RenderHSLScrollbars(&aRects[i], apColors[i], false, true);
+
+			if(PrevColor != *apColors[i])
+			{
+				SetNeedSendInfo();
+			}
+		}
+	}
+
+	// skin selector
+	MainView.HSplitTop(20.0f, 0, &MainView);
+	MainView.HSplitTop(230.0f - RenderEyesBelow * 25.0f, &SkinList, &MainView);
+	static std::vector<CUISkin> s_vSkinList;
+	static std::vector<CUISkin> s_vSkinListHelper;
+	static std::vector<CUISkin> s_vFavoriteSkinListHelper;
+	static int s_SkinCount = 0;
+	static CListBox s_ListBox;
+
+	// be nice to the CPU
+	static auto s_SkinLastRebuildTime = time_get_nanoseconds();
+	const auto CurTime = time_get_nanoseconds();
+	if(s_InitSkinlist || m_pClient->m_Skins.Num() != s_SkinCount || m_SkinFavoritesChanged || (m_pClient->m_Skins.IsDownloadingSkins() && (CurTime - s_SkinLastRebuildTime > 500ms)))
+	{
+		s_SkinLastRebuildTime = CurTime;
+		s_vSkinList.clear();
+		s_vSkinListHelper.clear();
+		s_vFavoriteSkinListHelper.clear();
+		// set skin count early, since Find of the skin class might load
+		// a downloading skin
+		s_SkinCount = m_pClient->m_Skins.Num();
+		m_SkinFavoritesChanged = false;
+
+		auto &&SkinNotFiltered = [&](const CSkin *pSkinToBeSelected) {
+			// filter quick search
+			if(g_Config.m_ClSkinFilterString[0] != '\0' && !str_utf8_find_nocase(pSkinToBeSelected->GetName(), g_Config.m_ClSkinFilterString))
+				return false;
+
+			// no special skins
+			if((pSkinToBeSelected->GetName()[0] == 'x' && pSkinToBeSelected->GetName()[1] == '_'))
+				return false;
+
+			return true;
+		};
+
+		for(const auto &it : m_SkinFavorites)
+		{
+			const CSkin *pSkinToBeSelected = m_pClient->m_Skins.FindOrNullptr(it.c_str(), true);
+
+			if(pSkinToBeSelected == nullptr || !SkinNotFiltered(pSkinToBeSelected))
+				continue;
+
+			s_vFavoriteSkinListHelper.emplace_back(pSkinToBeSelected);
+		}
+		for(const auto &SkinIt : m_pClient->m_Skins.GetSkinsUnsafe())
+		{
+			const auto &pSkinToBeSelected = SkinIt.second;
+			if(!SkinNotFiltered(pSkinToBeSelected.get()))
+				continue;
+
+			if(std::find(m_SkinFavorites.begin(), m_SkinFavorites.end(), pSkinToBeSelected->GetName()) == m_SkinFavorites.end())
+				s_vSkinListHelper.emplace_back(pSkinToBeSelected.get());
+		}
+		std::sort(s_vSkinListHelper.begin(), s_vSkinListHelper.end());
+		std::sort(s_vFavoriteSkinListHelper.begin(), s_vFavoriteSkinListHelper.end());
+		s_vSkinList = s_vFavoriteSkinListHelper;
+		s_vSkinList.insert(s_vSkinList.end(), s_vSkinListHelper.begin(), s_vSkinListHelper.end());
+		s_InitSkinlist = false;
+	}
+
+	auto &&RenderFavIcon = [&](const CUIRect &FavIcon, bool AsFav) {
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		if(AsFav)
+			TextRender()->TextColor({1, 1, 0, 1});
+		else
+			TextRender()->TextColor({0.5f, 0.5f, 0.5f, 1});
+		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+		SLabelProperties Props;
+		Props.m_MaxWidth = FavIcon.w;
+		UI()->DoLabel(&FavIcon, FONT_ICON_STAR, 12.0f, TEXTALIGN_MR, Props);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	};
+
+	int OldSelected = -1;
+	s_ListBox.DoStart(50.0f, s_vSkinList.size(), 4, 1, OldSelected, &SkinList);
+	for(size_t i = 0; i < s_vSkinList.size(); ++i)
+	{
+		const CSkin *pSkinToBeDraw = s_vSkinList[i].m_pSkin;
+
+		if(str_comp(pSkinToBeDraw->GetName(), pSkinName) == 0)
+			OldSelected = i;
+
+		const CListboxItem Item = s_ListBox.DoNextItem(pSkinToBeDraw, OldSelected >= 0 && (size_t)OldSelected == i);
+		if(!Item.m_Visible)
+			continue;
+
+		const CUIRect OriginalRect = Item.m_Rect;
+
+		CTeeRenderInfo Info = OwnSkinInfo;
+		Info.m_CustomColoredSkin = *pUseCustomColor;
+
+		Info.m_OriginalRenderSkin = pSkinToBeDraw->m_OriginalSkin;
+		Info.m_ColorableRenderSkin = pSkinToBeDraw->m_ColorableSkin;
+		Info.m_SkinMetrics = pSkinToBeDraw->m_Metrics;
+
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Info, OffsetToMid);
+		TeeRenderPos = vec2(OriginalRect.x + 30, OriginalRect.y + OriginalRect.h / 2 + OffsetToMid.y);
+		RenderTools()->RenderTee(pIdleState, &Info, Emote, vec2(1.0f, 0.0f), TeeRenderPos);
+
+		OriginalRect.VSplitLeft(60.0f, 0, &Label);
+		{
+			SLabelProperties Props;
+			Props.m_MaxWidth = Label.w - 5.0f;
+			UI()->DoLabel(&Label, pSkinToBeDraw->GetName(), 12.0f, TEXTALIGN_ML, Props);
+		}
+		if(g_Config.m_Debug)
+		{
+			ColorRGBA BloodColor = *pUseCustomColor ? color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting()) : pSkinToBeDraw->m_BloodColor;
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(BloodColor.r, BloodColor.g, BloodColor.b, 1.0f);
+			IGraphics::CQuadItem QuadItem(Label.x, Label.y, 12.0f, 12.0f);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// render skin favorite icon
+		{
+			const auto SkinItFav = m_SkinFavorites.find(pSkinToBeDraw->GetName());
+			const auto IsFav = SkinItFav != m_SkinFavorites.end();
+			CUIRect FavIcon;
+			OriginalRect.HSplitTop(20.0f, &FavIcon, nullptr);
+			FavIcon.VSplitRight(20.0f, nullptr, &FavIcon);
+			if(IsFav)
+			{
+				RenderFavIcon(FavIcon, IsFav);
+			}
+			else
+			{
+				if(UI()->MouseInside(&FavIcon))
+				{
+					RenderFavIcon(FavIcon, IsFav);
+				}
+			}
+			if(UI()->DoButtonLogic(&pSkinToBeDraw->m_Metrics.m_Body, 0, &FavIcon))
+			{
+				if(IsFav)
+				{
+					m_SkinFavorites.erase(SkinItFav);
+				}
+				else
+				{
+					m_SkinFavorites.emplace(pSkinToBeDraw->GetName());
+				}
+				s_InitSkinlist = true;
+			}
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(OldSelected != NewSelected)
+	{
+		mem_copy(pSkinName, s_vSkinList[NewSelected].m_pSkin->GetName(), sizeof(g_Config.m_ClPlayerSkin));
+		SetNeedSendInfo();
+	}
+
+	// render quick search
+	{
+		MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
+		QuickSearch.VSplitLeft(240.0f, &QuickSearch, &SkinDB);
+		QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
+		float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
+		QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
+		QuickSearch.VSplitLeft(QuickSearch.w - 15.0f, &QuickSearch, &QuickSearchClearButton);
+		static CLineInput s_SkinFilterInput(g_Config.m_ClSkinFilterString, sizeof(g_Config.m_ClSkinFilterString));
+		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
+		{
+			UI()->SetActiveItem(&s_SkinFilterInput);
+			s_SkinFilterInput.SelectAll();
+		}
+		s_SkinFilterInput.SetEmptyText(Localize("Search"));
+		if(UI()->DoClearableEditBox(&s_SkinFilterInput, &QuickSearch, 14.0f))
+			s_InitSkinlist = true;
+	}
+
+	SkinDB.VSplitLeft(150.0f, &SkinDB, &DirectoryButton);
+	SkinDB.HSplitTop(5.0f, 0, &SkinDB);
+	static CButtonContainer s_SkinDBDirID;
+	if(DoButton_Menu(&s_SkinDBDirID, Localize("Skin Database"), 0, &SkinDB))
+	{
+		const char *pLink = "https://ddnet.org/skins/";
+		if(!open_link(pLink))
+		{
+			dbg_msg("menus", "couldn't open link '%s'", pLink);
+		}
+	}
+
+	DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
+	DirectoryButton.VSplitRight(175.0f, 0, &DirectoryButton);
+	DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &RefreshButton);
+	DirectoryButton.VSplitRight(10.0f, &DirectoryButton, 0);
+	static CButtonContainer s_DirectoryButtonID;
+	if(DoButton_Menu(&s_DirectoryButtonID, Localize("Skins directory"), 0, &DirectoryButton))
+	{
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "skins", aBuf, sizeof(aBuf));
+		Storage()->CreateFolder("skins", IStorage::TYPE_SAVE);
+		if(!open_file(aBuf))
+		{
+			dbg_msg("menus", "couldn't open file '%s'", aBuf);
+		}
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_DirectoryButtonID, &DirectoryButton, Localize("Open the directory to add custom skins"));
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	static CButtonContainer s_SkinRefreshButtonID;
+	if(DoButton_Menu(&s_SkinRefreshButtonID, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+	{
+		// reset render flags for possible loading screen
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		RefreshSkins();
+		s_InitSkinlist = true;
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+}
+
+typedef struct
+{
+	const char *m_pName;
+	const char *m_pCommand;
+	int m_KeyId;
+	int m_ModifierCombination;
+} CKeyInfo;
+
+static CKeyInfo gs_aKeys[] =
+	{
+		{Localizable("Move left"), "+left", 0, 0},
+		{Localizable("Move right"), "+right", 0, 0},
+		{Localizable("Jump"), "+jump", 0, 0},
+		{Localizable("Fire"), "+fire", 0, 0},
+		{Localizable("Hook"), "+hook", 0, 0},
+		{Localizable("Hook collisions"), "+showhookcoll", 0, 0},
+		{Localizable("Pause"), "say /pause", 0, 0},
+		{Localizable("Kill"), "kill", 0, 0},
+		{Localizable("Zoom in"), "zoom+", 0, 0},
+		{Localizable("Zoom out"), "zoom-", 0, 0},
+		{Localizable("Default zoom"), "zoom", 0, 0},
+		{Localizable("Show others"), "say /showothers", 0, 0},
+		{Localizable("Show all"), "say /showall", 0, 0},
+		{Localizable("Toggle dyncam"), "toggle cl_dyncam 0 1", 0, 0},
+		{Localizable("Toggle ghost"), "toggle cl_race_show_ghost 0 1", 0, 0},
+
+		{Localizable("Hammer"), "+weapon1", 0, 0},
+		{Localizable("Pistol"), "+weapon2", 0, 0},
+		{Localizable("Shotgun"), "+weapon3", 0, 0},
+		{Localizable("Grenade"), "+weapon4", 0, 0},
+		{Localizable("Laser"), "+weapon5", 0, 0},
+		{Localizable("Next weapon"), "+nextweapon", 0, 0},
+		{Localizable("Prev. weapon"), "+prevweapon", 0, 0},
+
+		{Localizable("Vote yes"), "vote yes", 0, 0},
+		{Localizable("Vote no"), "vote no", 0, 0},
+
+		{Localizable("Chat"), "+show_chat; chat all", 0, 0},
+		{Localizable("Team chat"), "+show_chat; chat team", 0, 0},
+		{Localizable("Converse"), "+show_chat; chat all /c ", 0, 0},
+		{Localizable("Chat command"), "+show_chat; chat all /", 0, 0},
+		{Localizable("Show chat"), "+show_chat", 0, 0},
+
+		{Localizable("Toggle dummy"), "toggle cl_dummy 0 1", 0, 0},
+		{Localizable("Dummy copy"), "toggle cl_dummy_copy_moves 0 1", 0, 0},
+		{Localizable("Hammerfly dummy"), "toggle cl_dummy_hammer 0 1", 0, 0},
+
+		{Localizable("Emoticon"), "+emote", 0, 0},
+		{Localizable("Spectator mode"), "+spectate", 0, 0},
+		{Localizable("Spectate next"), "spectate_next", 0, 0},
+		{Localizable("Spectate previous"), "spectate_previous", 0, 0},
+		{Localizable("Console"), "toggle_local_console", 0, 0},
+		{Localizable("Remote console"), "toggle_remote_console", 0, 0},
+		{Localizable("Screenshot"), "screenshot", 0, 0},
+		{Localizable("Scoreboard"), "+scoreboard", 0, 0},
+		{Localizable("Statboard"), "+statboard", 0, 0},
+		{Localizable("Lock team"), "say /lock", 0, 0},
+		{Localizable("Show entities"), "toggle cl_overlay_entities 0 100", 0, 0},
+		{Localizable("Show HUD"), "toggle cl_showhud 0 1", 0, 0},
+		{Localizable("BindWheel"), "+bind_wheel", 0, 0},
+		{
+			Localizable("45° AIM"),
+			"+toggle cl_mouse_max_distance 2 400; +toggle inp_mousesens 1; +showhookcoll",
+			0,
+			0,
+		},
+		//TODO: Make it work
+		//{Localizable("Toggle dummy deep fly"), "bind mouse1 \"+fire; +toggle cl_dummy_hammer 1 0\" ;cl_message_client_color green; echo Deep Fly ON; bind x \"bind mouse1 +fire; cl_dummy_hammer 0; cl_message_client_color red; echo Deep Fly OFF;""" , 0, 0},
+};
+
+void CMenus::DoSettingsControlsButtons(int Start, int Stop, CUIRect View)
+{
+	for(int i = Start; i < Stop; i++)
+	{
+		const CKeyInfo &Key = gs_aKeys[i];
+
+		CUIRect Button, Label;
+		View.HSplitTop(20.0f, &Button, &View);
+		Button.VSplitLeft(135.0f, &Label, &Button);
+
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "%s:", Localize(Key.m_pName));
+
+		UI()->DoLabel(&Label, aBuf, 13.0f, TEXTALIGN_ML);
+		int OldId = Key.m_KeyId, OldModifierCombination = Key.m_ModifierCombination, NewModifierCombination;
+		int NewId = DoKeyReader(&Key.m_KeyId, &Button, OldId, OldModifierCombination, &NewModifierCombination);
+		if(NewId != OldId || NewModifierCombination != OldModifierCombination)
+		{
+			if(OldId != 0 || NewId == 0)
+				m_pClient->m_Binds.Bind(OldId, "", false, OldModifierCombination);
+			if(NewId != 0)
+				m_pClient->m_Binds.Bind(NewId, Key.m_pCommand, false, NewModifierCombination);
+		}
+
+		View.HSplitTop(2.0f, 0, &View);
+	}
+}
+
+float CMenus::RenderSettingsControlsJoystick(CUIRect View)
+{
+	bool JoystickEnabled = g_Config.m_InpControllerEnable;
+	int NumJoysticks = Input()->NumJoysticks();
+	int NumOptions = 1; // expandable header
+	if(JoystickEnabled)
+	{
+		if(NumJoysticks == 0)
+			NumOptions++; // message
+		else
+		{
+			if(NumJoysticks > 1)
+				NumOptions++; // joystick selection
+			NumOptions += 3; // mode, ui sens, tolerance
+			if(!g_Config.m_InpControllerAbsolute)
+				NumOptions++; // ingame sens
+			NumOptions += Input()->GetActiveJoystick()->GetNumAxes() + 1; // axis selection + header
+		}
+	}
+	const float ButtonHeight = 20.0f;
+	const float Spacing = 2.0f;
+	const float BackgroundHeight = NumOptions * (ButtonHeight + Spacing) + (NumOptions == 1 ? 0.0f : Spacing);
+	if(View.h < BackgroundHeight)
+		return BackgroundHeight;
+
+	View.HSplitTop(BackgroundHeight, &View, nullptr);
+
+	CUIRect Button;
+	View.HSplitTop(Spacing, nullptr, &View);
+	View.HSplitTop(ButtonHeight, &Button, &View);
+	if(DoButton_CheckBox(&g_Config.m_InpControllerEnable, Localize("Enable controller"), g_Config.m_InpControllerEnable, &Button))
+	{
+		g_Config.m_InpControllerEnable ^= 1;
+	}
+	if(JoystickEnabled)
+	{
+		if(NumJoysticks > 0)
+		{
+			// show joystick device selection if more than one available or just the joystick name if there is only one
+			{
+				CUIRect JoystickDropDown;
+				View.HSplitTop(Spacing, nullptr, &View);
+				View.HSplitTop(ButtonHeight, &JoystickDropDown, &View);
+				if(NumJoysticks > 1)
+				{
+					static std::vector<std::string> s_vJoystickNames;
+					static std::vector<const char *> s_vpJoystickNames;
+					s_vJoystickNames.resize(NumJoysticks);
+					s_vpJoystickNames.resize(NumJoysticks);
+
+					for(int i = 0; i < NumJoysticks; ++i)
+					{
+						char aBuf[256];
+						str_format(aBuf, sizeof(aBuf), "%s %d: %s", Localize("Controller"), i, Input()->GetJoystick(i)->GetName());
+						s_vJoystickNames[i] = aBuf;
+						s_vpJoystickNames[i] = s_vJoystickNames[i].c_str();
+					}
+
+					static CUI::SDropDownState s_JoystickDropDownState;
+					static CScrollRegion s_JoystickDropDownScrollRegion;
+					s_JoystickDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_JoystickDropDownScrollRegion;
+					const int CurrentJoystick = Input()->GetActiveJoystick()->GetIndex();
+					const int NewJoystick = UI()->DoDropDown(&JoystickDropDown, CurrentJoystick, s_vpJoystickNames.data(), s_vpJoystickNames.size(), s_JoystickDropDownState);
+					if(NewJoystick != CurrentJoystick)
+					{
+						Input()->SetActiveJoystick(NewJoystick);
+					}
+				}
+				else
+				{
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "%s 0: %s", Localize("Controller"), Input()->GetJoystick(0)->GetName());
+					UI()->DoLabel(&JoystickDropDown, aBuf, 13.0f, TEXTALIGN_ML);
+				}
+			}
+
+			{
+				View.HSplitTop(Spacing, nullptr, &View);
+				View.HSplitTop(ButtonHeight, &Button, &View);
+				CUIRect Label, ButtonRelative, ButtonAbsolute;
+				Button.VSplitMid(&Label, &Button, 10.0f);
+				Button.HMargin(2.0f, &Button);
+				Button.VSplitMid(&ButtonRelative, &ButtonAbsolute);
+				UI()->DoLabel(&Label, Localize("Ingame controller mode"), 13.0f, TEXTALIGN_ML);
+				CButtonContainer s_RelativeButton;
+				if(DoButton_Menu(&s_RelativeButton, Localize("Relative", "Ingame controller mode"), g_Config.m_InpControllerAbsolute == 0, &ButtonRelative, nullptr, IGraphics::CORNER_L))
+				{
+					g_Config.m_InpControllerAbsolute = 0;
+				}
+				CButtonContainer s_AbsoluteButton;
+				if(DoButton_Menu(&s_AbsoluteButton, Localize("Absolute", "Ingame controller mode"), g_Config.m_InpControllerAbsolute == 1, &ButtonAbsolute, nullptr, IGraphics::CORNER_R))
+				{
+					g_Config.m_InpControllerAbsolute = 1;
+				}
+			}
+
+			if(!g_Config.m_InpControllerAbsolute)
+			{
+				View.HSplitTop(Spacing, nullptr, &View);
+				View.HSplitTop(ButtonHeight, &Button, &View);
+				UI()->DoScrollbarOption(&g_Config.m_InpControllerSens, &g_Config.m_InpControllerSens, &Button, Localize("Ingame controller sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+			}
+
+			View.HSplitTop(Spacing, nullptr, &View);
+			View.HSplitTop(ButtonHeight, &Button, &View);
+			UI()->DoScrollbarOption(&g_Config.m_UiControllerSens, &g_Config.m_UiControllerSens, &Button, Localize("UI controller sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+			View.HSplitTop(Spacing, nullptr, &View);
+			View.HSplitTop(ButtonHeight, &Button, &View);
+			UI()->DoScrollbarOption(&g_Config.m_InpControllerTolerance, &g_Config.m_InpControllerTolerance, &Button, Localize("Controller jitter tolerance"), 0, 50);
+
+			View.HSplitTop(Spacing, nullptr, &View);
+			View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.125f), IGraphics::CORNER_ALL, 5.0f);
+			DoJoystickAxisPicker(View);
+		}
+		else
+		{
+			View.HSplitTop(View.h - ButtonHeight, nullptr, &View);
+			View.HSplitTop(ButtonHeight, &Button, &View);
+			UI()->DoLabel(&Button, Localize("No controller found. Plug in a controller."), 13.0f, TEXTALIGN_ML);
+		}
+	}
+
+	return BackgroundHeight;
+}
+
+void CMenus::DoJoystickAxisPicker(CUIRect View)
+{
+	const float FontSize = 13.0f;
+	const float RowHeight = 20.0f;
+	const float SpacingH = 2.0f;
+	const float AxisWidth = 0.2f * View.w;
+	const float StatusWidth = 0.4f * View.w;
+	const float AimBindWidth = 90.0f;
+	const float SpacingV = (View.w - AxisWidth - StatusWidth - AimBindWidth) / 2.0f;
+
+	CUIRect Row, Axis, Status, AimBind;
+	View.HSplitTop(SpacingH, nullptr, &View);
+	View.HSplitTop(RowHeight, &Row, &View);
+	Row.VSplitLeft(AxisWidth, &Axis, &Row);
+	Row.VSplitLeft(SpacingV, nullptr, &Row);
+	Row.VSplitLeft(StatusWidth, &Status, &Row);
+	Row.VSplitLeft(SpacingV, nullptr, &Row);
+	Row.VSplitLeft(AimBindWidth, &AimBind, &Row);
+
+	UI()->DoLabel(&Axis, Localize("Axis"), FontSize, TEXTALIGN_MC);
+	UI()->DoLabel(&Status, Localize("Status"), FontSize, TEXTALIGN_MC);
+	UI()->DoLabel(&AimBind, Localize("Aim bind"), FontSize, TEXTALIGN_MC);
+
+	IInput::IJoystick *pJoystick = Input()->GetActiveJoystick();
+	static int s_aActive[NUM_JOYSTICK_AXES][2];
+	for(int i = 0; i < minimum<int>(pJoystick->GetNumAxes(), NUM_JOYSTICK_AXES); i++)
+	{
+		const bool Active = g_Config.m_InpControllerX == i || g_Config.m_InpControllerY == i;
+
+		View.HSplitTop(SpacingH, nullptr, &View);
+		View.HSplitTop(RowHeight, &Row, &View);
+		Row.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.125f), IGraphics::CORNER_ALL, 5.0f);
+		Row.VSplitLeft(AxisWidth, &Axis, &Row);
+		Row.VSplitLeft(SpacingV, nullptr, &Row);
+		Row.VSplitLeft(StatusWidth, &Status, &Row);
+		Row.VSplitLeft(SpacingV, nullptr, &Row);
+		Row.VSplitLeft(AimBindWidth, &AimBind, &Row);
+
+		// Axis label
+		char aBuf[16];
+		str_from_int(i + 1, aBuf);
+		if(Active)
+			TextRender()->TextColor(TextRender()->DefaultTextColor());
+		else
+			TextRender()->TextColor(0.7f, 0.7f, 0.7f, 1.0f);
+		UI()->DoLabel(&Axis, aBuf, FontSize, TEXTALIGN_MC);
+
+		// Axis status
+		Status.HMargin(7.0f, &Status);
+		DoJoystickBar(&Status, (pJoystick->GetAxisValue(i) + 1.0f) / 2.0f, g_Config.m_InpControllerTolerance / 50.0f, Active);
+
+		// Bind to X/Y
+		CUIRect AimBindX, AimBindY;
+		AimBind.VSplitMid(&AimBindX, &AimBindY);
+		if(DoButton_CheckBox(&s_aActive[i][0], "X", g_Config.m_InpControllerX == i, &AimBindX))
+		{
+			if(g_Config.m_InpControllerY == i)
+				g_Config.m_InpControllerY = g_Config.m_InpControllerX;
+			g_Config.m_InpControllerX = i;
+		}
+		if(DoButton_CheckBox(&s_aActive[i][1], "Y", g_Config.m_InpControllerY == i, &AimBindY))
+		{
+			if(g_Config.m_InpControllerX == i)
+				g_Config.m_InpControllerX = g_Config.m_InpControllerY;
+			g_Config.m_InpControllerY = i;
+		}
+	}
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+}
+
+void CMenus::DoJoystickBar(const CUIRect *pRect, float Current, float Tolerance, bool Active)
+{
+	CUIRect Handle;
+	pRect->VSplitLeft(pRect->h, &Handle, nullptr); // Slider size
+	Handle.x += (pRect->w - Handle.w) * Current;
+
+	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, Active ? 0.25f : 0.125f), IGraphics::CORNER_ALL, pRect->h / 2.0f);
+
+	CUIRect ToleranceArea = *pRect;
+	ToleranceArea.w *= Tolerance;
+	ToleranceArea.x += (pRect->w - ToleranceArea.w) / 2.0f;
+	const ColorRGBA ToleranceColor = Active ? ColorRGBA(0.8f, 0.35f, 0.35f, 1.0f) : ColorRGBA(0.7f, 0.5f, 0.5f, 1.0f);
+	ToleranceArea.Draw(ToleranceColor, IGraphics::CORNER_ALL, ToleranceArea.h / 2.0f);
+
+	const ColorRGBA SliderColor = Active ? ColorRGBA(0.95f, 0.95f, 0.95f, 1.0f) : ColorRGBA(0.8f, 0.8f, 0.8f, 1.0f);
+	Handle.Draw(SliderColor, IGraphics::CORNER_ALL, Handle.h / 2.0f);
+}
+
+void CMenus::RenderSettingsControls(CUIRect MainView)
+{
+	// this is kinda slow, but whatever
+	for(auto &Key : gs_aKeys)
+		Key.m_KeyId = Key.m_ModifierCombination = 0;
+
+	for(int Mod = 0; Mod < CBinds::MODIFIER_COMBINATION_COUNT; Mod++)
+	{
+		for(int KeyId = 0; KeyId < KEY_LAST; KeyId++)
+		{
+			const char *pBind = m_pClient->m_Binds.Get(KeyId, Mod);
+			if(!pBind[0])
+				continue;
+
+			for(auto &Key : gs_aKeys)
+				if(str_comp(pBind, Key.m_pCommand) == 0)
+				{
+					Key.m_KeyId = KeyId;
+					Key.m_ModifierCombination = Mod;
+					break;
+				}
+		}
+	}
+
+	// scrollable controls
+	static float s_JoystickSettingsHeight = 0.0f; // we calculate this later and don't render until enough space is available
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollUnit = 120.0f;
+	s_ScrollRegion.Begin(&MainView, &ScrollOffset, &ScrollParams);
+	MainView.y += ScrollOffset.y;
+
+	const float FontSize = 14.0f;
+	const float Margin = 10.0f;
+	const float HeaderHeight = FontSize + 5.0f + Margin;
+
+	CUIRect MouseSettings, MovementSettings, WeaponSettings, VotingSettings, ChatSettings, DummySettings, MiscSettings, BindWheelSettings, JoystickSettings, ResetButton, Button;
+	MainView.VSplitMid(&MouseSettings, &VotingSettings);
+
+	// mouse settings
+	{
+		MouseSettings.VMargin(5.0f, &MouseSettings);
+		MouseSettings.HSplitTop(80.0f, &MouseSettings, &JoystickSettings);
+		if(s_ScrollRegion.AddRect(MouseSettings))
+		{
+			MouseSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			MouseSettings.VMargin(10.0f, &MouseSettings);
+
+			MouseSettings.HSplitTop(HeaderHeight, &Button, &MouseSettings);
+			UI()->DoLabel(&Button, Localize("Mouse"), FontSize, TEXTALIGN_ML);
+
+			MouseSettings.HSplitTop(20.0f, &Button, &MouseSettings);
+			UI()->DoScrollbarOption(&g_Config.m_InpMousesens, &g_Config.m_InpMousesens, &Button, Localize("Ingame mouse sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+			MouseSettings.HSplitTop(2.0f, nullptr, &MouseSettings);
+
+			MouseSettings.HSplitTop(20.0f, &Button, &MouseSettings);
+			UI()->DoScrollbarOption(&g_Config.m_UiMousesens, &g_Config.m_UiMousesens, &Button, Localize("UI mouse sens."), 1, 500, &CUI::ms_LogarithmicScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+		}
+	}
+
+	// joystick settings
+	{
+		JoystickSettings.HSplitTop(Margin, nullptr, &JoystickSettings);
+		JoystickSettings.HSplitTop(s_JoystickSettingsHeight + HeaderHeight + Margin, &JoystickSettings, &MovementSettings);
+		if(s_ScrollRegion.AddRect(JoystickSettings))
+		{
+			JoystickSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			JoystickSettings.VMargin(Margin, &JoystickSettings);
+
+			JoystickSettings.HSplitTop(HeaderHeight, &Button, &JoystickSettings);
+			UI()->DoLabel(&Button, Localize("Controller"), FontSize, TEXTALIGN_ML);
+
+			s_JoystickSettingsHeight = RenderSettingsControlsJoystick(JoystickSettings);
+		}
+	}
+
+	// movement settings
+	{
+		MovementSettings.HSplitTop(Margin, nullptr, &MovementSettings);
+		MovementSettings.HSplitTop(365.0f, &MovementSettings, &WeaponSettings);
+		if(s_ScrollRegion.AddRect(MovementSettings))
+		{
+			MovementSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			MovementSettings.VMargin(Margin, &MovementSettings);
+
+			MovementSettings.HSplitTop(HeaderHeight, &Button, &MovementSettings);
+			UI()->DoLabel(&Button, Localize("Movement"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(0, 15, MovementSettings);
+		}
+	}
+
+	// weapon settings
+	{
+		WeaponSettings.HSplitTop(Margin, nullptr, &WeaponSettings);
+		WeaponSettings.HSplitTop(190.0f, &WeaponSettings, &ResetButton);
+		if(s_ScrollRegion.AddRect(WeaponSettings))
+		{
+			WeaponSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			WeaponSettings.VMargin(Margin, &WeaponSettings);
+
+			WeaponSettings.HSplitTop(HeaderHeight, &Button, &WeaponSettings);
+			UI()->DoLabel(&Button, Localize("Weapon"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(15, 22, WeaponSettings);
+		}
+	}
+
+	// defaults
+	{
+		ResetButton.HSplitTop(Margin, nullptr, &ResetButton);
+		ResetButton.HSplitTop(40.0f, &ResetButton, nullptr);
+		if(s_ScrollRegion.AddRect(ResetButton))
+		{
+			ResetButton.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			ResetButton.Margin(10.0f, &ResetButton);
+			static CButtonContainer s_DefaultButton;
+			if(DoButton_Menu(&s_DefaultButton, Localize("Reset to defaults"), 0, &ResetButton))
+			{
+				PopupConfirm(Localize("Reset controls"), Localize("Are you sure that you want to reset the controls to their defaults?"),
+					Localize("Reset"), Localize("Cancel"), &CMenus::ResetSettingsControls);
+			}
+		}
+	}
+
+	// voting settings
+	{
+		VotingSettings.VMargin(5.0f, &VotingSettings);
+		VotingSettings.HSplitTop(80.0f, &VotingSettings, &ChatSettings);
+		if(s_ScrollRegion.AddRect(VotingSettings))
+		{
+			VotingSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			VotingSettings.VMargin(Margin, &VotingSettings);
+
+			VotingSettings.HSplitTop(HeaderHeight, &Button, &VotingSettings);
+			UI()->DoLabel(&Button, Localize("Voting"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(22, 24, VotingSettings);
+		}
+	}
+
+	// chat settings
+	{
+		ChatSettings.HSplitTop(Margin, nullptr, &ChatSettings);
+		ChatSettings.HSplitTop(145.0f, &ChatSettings, &DummySettings);
+		if(s_ScrollRegion.AddRect(ChatSettings))
+		{
+			ChatSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			ChatSettings.VMargin(Margin, &ChatSettings);
+
+			ChatSettings.HSplitTop(HeaderHeight, &Button, &ChatSettings);
+			UI()->DoLabel(&Button, Localize("Chat"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(24, 29, ChatSettings);
+		}
+	}
+
+	// dummy settings
+	{
+		DummySettings.HSplitTop(Margin, nullptr, &DummySettings);
+		DummySettings.HSplitTop(100.0f, &DummySettings, &MiscSettings);
+		if(s_ScrollRegion.AddRect(DummySettings))
+		{
+			DummySettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			DummySettings.VMargin(Margin, &DummySettings);
+
+			DummySettings.HSplitTop(HeaderHeight, &Button, &DummySettings);
+			UI()->DoLabel(&Button, Localize("Dummy"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(29, 32, DummySettings);
+		}
+	}
+
+	// misc settings
+	{
+		MiscSettings.HSplitTop(Margin, nullptr, &MiscSettings);
+		MiscSettings.HSplitTop(300.0f, &MiscSettings, &BindWheelSettings);
+		if(s_ScrollRegion.AddRect(MiscSettings))
+		{
+			MiscSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
+			MiscSettings.VMargin(Margin, &MiscSettings);
+
+			MiscSettings.HSplitTop(HeaderHeight, &Button, &MiscSettings);
+			UI()->DoLabel(&Button, Localize("Miscellaneous"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(32, 44, MiscSettings);
+		}
+	}
+	// sta
+	{
+		BindWheelSettings.HSplitTop(Margin, nullptr, &BindWheelSettings);
+		BindWheelSettings.HSplitTop(80.0f, &BindWheelSettings, 0);
+		if(s_ScrollRegion.AddRect(BindWheelSettings))
+		{
+			BindWheelSettings.Draw(vec4(1, 1, 1, 0.15f), IGraphics::CORNER_ALL, 10.0f);
+			BindWheelSettings.VMargin(Margin, &BindWheelSettings);
+
+			BindWheelSettings.HSplitTop(HeaderHeight, &Button, &BindWheelSettings);
+			UI()->DoLabel(&Button, Localize("StA"), FontSize, TEXTALIGN_ML);
+
+			DoSettingsControlsButtons(44, 46, BindWheelSettings);
+		}
+	}
+
+	s_ScrollRegion.End();
+}
+
+void CMenus::ResetSettingsControls()
+{
+	m_pClient->m_Binds.SetDefaults();
+
+	g_Config.m_InpMousesens = 200;
+	g_Config.m_UiMousesens = 200;
+
+	g_Config.m_InpControllerEnable = 0;
+	g_Config.m_InpControllerGUID[0] = '\0';
+	g_Config.m_InpControllerAbsolute = 0;
+	g_Config.m_InpControllerSens = 100;
+	g_Config.m_InpControllerX = 0;
+	g_Config.m_InpControllerY = 1;
+	g_Config.m_InpControllerTolerance = 5;
+	g_Config.m_UiControllerSens = 100;
+}
+
+void CMenus::RenderSettingsGraphics(CUIRect MainView)
+{
+	CUIRect Button;
+	char aBuf[128];
+	bool CheckSettings = false;
+
+	static const int MAX_RESOLUTIONS = 256;
+	static CVideoMode s_aModes[MAX_RESOLUTIONS];
+	static int s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
+	static int s_GfxFsaaSamples = g_Config.m_GfxFsaaSamples;
+	static bool s_GfxBackendChanged = false;
+	static bool s_GfxGPUChanged = false;
+	static int s_GfxHighdpi = g_Config.m_GfxHighdpi;
+
+	static int s_InitDisplayAllVideoModes = g_Config.m_GfxDisplayAllVideoModes;
+
+	static bool s_WasInit = false;
+	static bool s_ModesReload = false;
+	if(!s_WasInit)
+	{
+		s_WasInit = true;
+
+		Graphics()->AddWindowPropChangeListener([]() {
+			s_ModesReload = true;
+		});
+	}
+
+	if(s_ModesReload || g_Config.m_GfxDisplayAllVideoModes != s_InitDisplayAllVideoModes)
+	{
+		s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
+		s_ModesReload = false;
+		s_InitDisplayAllVideoModes = g_Config.m_GfxDisplayAllVideoModes;
+	}
+
+	CUIRect ModeList, ModeLabel;
+	MainView.VSplitLeft(350.0f, &MainView, &ModeList);
+	ModeList.HSplitTop(24.0f, &ModeLabel, &ModeList);
+	MainView.VSplitLeft(340.0f, &MainView, 0);
+
+	// display mode list
+	static CListBox s_ListBox;
+	static const float sc_RowHeightResList = 22.0f;
+	static const float sc_FontSizeResListHeader = 12.0f;
+	static const float sc_FontSizeResList = 10.0f;
+
+	{
+		int G = std::gcd(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight);
+		str_format(aBuf, sizeof(aBuf), "%s: %dx%d @%dhz %d bit (%d:%d)", Localize("Current"), (int)(g_Config.m_GfxScreenWidth * Graphics()->ScreenHiDPIScale()), (int)(g_Config.m_GfxScreenHeight * Graphics()->ScreenHiDPIScale()), g_Config.m_GfxScreenRefreshRate, g_Config.m_GfxColorDepth, g_Config.m_GfxScreenWidth / G, g_Config.m_GfxScreenHeight / G);
+		UI()->DoLabel(&ModeLabel, aBuf, sc_FontSizeResListHeader, TEXTALIGN_MC);
+	}
+
+	int OldSelected = -1;
+	s_ListBox.SetActive(!UI()->IsPopupOpen());
+	s_ListBox.DoStart(sc_RowHeightResList, s_NumNodes, 1, 3, OldSelected, &ModeList);
+
+	for(int i = 0; i < s_NumNodes; ++i)
+	{
+		const int Depth = s_aModes[i].m_Red + s_aModes[i].m_Green + s_aModes[i].m_Blue > 16 ? 24 : 16;
+		if(g_Config.m_GfxColorDepth == Depth &&
+			g_Config.m_GfxScreenWidth == s_aModes[i].m_WindowWidth &&
+			g_Config.m_GfxScreenHeight == s_aModes[i].m_WindowHeight &&
+			g_Config.m_GfxScreenRefreshRate == s_aModes[i].m_RefreshRate)
+		{
+			OldSelected = i;
+		}
+
+		const CListboxItem Item = s_ListBox.DoNextItem(&s_aModes[i], OldSelected == i);
+		if(!Item.m_Visible)
+			continue;
+
+		int G = std::gcd(s_aModes[i].m_CanvasWidth, s_aModes[i].m_CanvasHeight);
+		str_format(aBuf, sizeof(aBuf), " %dx%d @%dhz %d bit (%d:%d)", s_aModes[i].m_CanvasWidth, s_aModes[i].m_CanvasHeight, s_aModes[i].m_RefreshRate, Depth, s_aModes[i].m_CanvasWidth / G, s_aModes[i].m_CanvasHeight / G);
+		UI()->DoLabel(&Item.m_Rect, aBuf, sc_FontSizeResList, TEXTALIGN_ML);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(OldSelected != NewSelected)
+	{
+		const int Depth = s_aModes[NewSelected].m_Red + s_aModes[NewSelected].m_Green + s_aModes[NewSelected].m_Blue > 16 ? 24 : 16;
+		g_Config.m_GfxColorDepth = Depth;
+		g_Config.m_GfxScreenWidth = s_aModes[NewSelected].m_WindowWidth;
+		g_Config.m_GfxScreenHeight = s_aModes[NewSelected].m_WindowHeight;
+		g_Config.m_GfxScreenRefreshRate = s_aModes[NewSelected].m_RefreshRate;
+		Graphics()->Resize(g_Config.m_GfxScreenWidth, g_Config.m_GfxScreenHeight, g_Config.m_GfxScreenRefreshRate);
+	}
+
+	// switches
+	CUIRect WindowModeDropDown;
+	MainView.HSplitTop(20.0f, &WindowModeDropDown, &MainView);
+
+	const char *apWindowModes[] = {Localize("Windowed"), Localize("Windowed borderless"), Localize("Windowed fullscreen"), Localize("Desktop fullscreen"), Localize("Fullscreen")};
+	static const int s_NumWindowMode = std::size(apWindowModes);
+
+	const int OldWindowMode = (g_Config.m_GfxFullscreen ? (g_Config.m_GfxFullscreen == 1 ? 4 : (g_Config.m_GfxFullscreen == 2 ? 3 : 2)) : (g_Config.m_GfxBorderless ? 1 : 0));
+
+	static CUI::SDropDownState s_WindowModeDropDownState;
+	static CScrollRegion s_WindowModeDropDownScrollRegion;
+	s_WindowModeDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_WindowModeDropDownScrollRegion;
+	const int NewWindowMode = UI()->DoDropDown(&WindowModeDropDown, OldWindowMode, apWindowModes, s_NumWindowMode, s_WindowModeDropDownState);
+	if(OldWindowMode != NewWindowMode)
+	{
+		if(NewWindowMode == 0)
+			Client()->SetWindowParams(0, false, true);
+		else if(NewWindowMode == 1)
+			Client()->SetWindowParams(0, true, true);
+		else if(NewWindowMode == 2)
+			Client()->SetWindowParams(3, false, false);
+		else if(NewWindowMode == 3)
+			Client()->SetWindowParams(2, false, true);
+		else if(NewWindowMode == 4)
+			Client()->SetWindowParams(1, false, true);
+	}
+
+	if(Graphics()->GetNumScreens() > 1)
+	{
+		CUIRect ScreenDropDown;
+		MainView.HSplitTop(2.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &ScreenDropDown, &MainView);
+
+		const int NumScreens = Graphics()->GetNumScreens();
+		static std::vector<std::string> s_vScreenNames;
+		static std::vector<const char *> s_vpScreenNames;
+		s_vScreenNames.resize(NumScreens);
+		s_vpScreenNames.resize(NumScreens);
+
+		for(int i = 0; i < NumScreens; ++i)
+		{
+			str_format(aBuf, sizeof(aBuf), "%s %d: %s", Localize("Screen"), i, Graphics()->GetScreenName(i));
+			s_vScreenNames[i] = aBuf;
+			s_vpScreenNames[i] = s_vScreenNames[i].c_str();
+		}
+
+		static CUI::SDropDownState s_ScreenDropDownState;
+		static CScrollRegion s_ScreenDropDownScrollRegion;
+		s_ScreenDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_ScreenDropDownScrollRegion;
+		const int NewScreen = UI()->DoDropDown(&ScreenDropDown, g_Config.m_GfxScreen, s_vpScreenNames.data(), s_vpScreenNames.size(), s_ScreenDropDownState);
+		if(NewScreen != g_Config.m_GfxScreen)
+		{
+			Client()->SwitchWindowScreen(NewScreen);
+			s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
+		}
+	}
+
+	MainView.HSplitTop(2.0f, nullptr, &MainView);
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	str_format(aBuf, sizeof(aBuf), "%s (%s)", Localize("V-Sync"), Localize("may cause delay"));
+	if(DoButton_CheckBox(&g_Config.m_GfxVsync, aBuf, g_Config.m_GfxVsync, &Button))
+	{
+		Client()->ToggleWindowVSync();
+	}
+
+	bool MultiSamplingChanged = false;
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	str_format(aBuf, sizeof(aBuf), "%s (%s)", Localize("FSAA samples"), Localize("may cause delay"));
+	int GfxFsaaSamples_MouseButton = DoButton_CheckBox_Number(&g_Config.m_GfxFsaaSamples, aBuf, g_Config.m_GfxFsaaSamples, &Button);
+	int CurFSAA = g_Config.m_GfxFsaaSamples == 0 ? 1 : g_Config.m_GfxFsaaSamples;
+	if(GfxFsaaSamples_MouseButton == 1) // inc
+	{
+		g_Config.m_GfxFsaaSamples = std::pow(2, (int)std::log2(CurFSAA) + 1);
+		if(g_Config.m_GfxFsaaSamples > 64)
+			g_Config.m_GfxFsaaSamples = 0;
+		MultiSamplingChanged = true;
+	}
+	else if(GfxFsaaSamples_MouseButton == 2) // dec
+	{
+		if(CurFSAA == 1)
+			g_Config.m_GfxFsaaSamples = 64;
+		else if(CurFSAA == 2)
+			g_Config.m_GfxFsaaSamples = 0;
+		else
+			g_Config.m_GfxFsaaSamples = std::pow(2, (int)std::log2(CurFSAA) - 1);
+		MultiSamplingChanged = true;
+	}
+
+	uint32_t MultiSamplingCountBackend = 0;
+	if(MultiSamplingChanged)
+	{
+		if(Graphics()->SetMultiSampling(g_Config.m_GfxFsaaSamples, MultiSamplingCountBackend))
+		{
+			// try again with 0 if mouse click was increasing multi sampling
+			// else just accept the current value as is
+			if((uint32_t)g_Config.m_GfxFsaaSamples > MultiSamplingCountBackend && GfxFsaaSamples_MouseButton == 1)
+				Graphics()->SetMultiSampling(0, MultiSamplingCountBackend);
+			g_Config.m_GfxFsaaSamples = (int)MultiSamplingCountBackend;
+		}
+		else
+		{
+			CheckSettings = true;
+		}
+	}
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_GfxHighDetail, Localize("High Detail"), g_Config.m_GfxHighDetail, &Button))
+		g_Config.m_GfxHighDetail ^= 1;
+	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_GfxHighDetail, &Button, Localize("Allows maps to render with more detail"));
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_GfxHighdpi, Localize("Use high DPI"), g_Config.m_GfxHighdpi, &Button))
+	{
+		CheckSettings = true;
+		g_Config.m_GfxHighdpi ^= 1;
+	}
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	UI()->DoScrollbarOption(&g_Config.m_GfxRefreshRate, &g_Config.m_GfxRefreshRate, &Button, Localize("Refresh Rate"), 10, 1000, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_INFINITE | CUI::SCROLLBAR_OPTION_NOCLAMPVALUE, " Hz");
+
+	MainView.HSplitTop(2.0f, nullptr, &MainView);
+	static CButtonContainer s_UiColorResetId;
+	DoLine_ColorPicker(&s_UiColorResetId, 25.0f, 13.0f, 2.0f, &MainView, Localize("UI Color"), &g_Config.m_UiColor, color_cast<ColorRGBA>(ColorHSLA(0xE4A046AFU, true)), false, nullptr, true);
+
+	// Backend list
+	struct SMenuBackendInfo
+	{
+		int m_Major = 0;
+		int m_Minor = 0;
+		int m_Patch = 0;
+		const char *m_pBackendName = "";
+		bool m_Found = false;
+	};
+	std::array<std::array<SMenuBackendInfo, EGraphicsDriverAgeType::GRAPHICS_DRIVER_AGE_TYPE_COUNT>, EBackendType::BACKEND_TYPE_COUNT> aaSupportedBackends{};
+	uint32_t FoundBackendCount = 0;
+	for(uint32_t i = 0; i < BACKEND_TYPE_COUNT; ++i)
+	{
+		if(EBackendType(i) == BACKEND_TYPE_AUTO)
+			continue;
+		for(uint32_t n = 0; n < GRAPHICS_DRIVER_AGE_TYPE_COUNT; ++n)
+		{
+			auto &Info = aaSupportedBackends[i][n];
+			if(Graphics()->GetDriverVersion(EGraphicsDriverAgeType(n), Info.m_Major, Info.m_Minor, Info.m_Patch, Info.m_pBackendName, EBackendType(i)))
+			{
+				// don't count blocked opengl drivers
+				if(EBackendType(i) != BACKEND_TYPE_OPENGL || EGraphicsDriverAgeType(n) == GRAPHICS_DRIVER_AGE_TYPE_LEGACY || g_Config.m_GfxDriverIsBlocked == 0)
+				{
+					Info.m_Found = true;
+					++FoundBackendCount;
+				}
+			}
+		}
+	}
+
+	if(FoundBackendCount > 1)
+	{
+		CUIRect Text, BackendDropDown;
+		MainView.HSplitTop(10.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Text, &MainView);
+		MainView.HSplitTop(2.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &BackendDropDown, &MainView);
+		UI()->DoLabel(&Text, Localize("Renderer"), 16.0f, TEXTALIGN_MC);
+
+		static std::vector<std::string> s_vBackendIDNames;
+		static std::vector<const char *> s_vpBackendIDNamesCStr;
+		static std::vector<SMenuBackendInfo> s_vBackendInfos;
+
+		size_t BackendCount = FoundBackendCount + 1;
+		s_vBackendIDNames.resize(BackendCount);
+		s_vpBackendIDNamesCStr.resize(BackendCount);
+		s_vBackendInfos.resize(BackendCount);
+
+		char aTmpBackendName[256];
+
+		auto IsInfoDefault = [](const SMenuBackendInfo &CheckInfo) {
+			return str_comp_nocase(CheckInfo.m_pBackendName, CConfig::ms_pGfxBackend) == 0 && CheckInfo.m_Major == CConfig::ms_GfxGLMajor && CheckInfo.m_Minor == CConfig::ms_GfxGLMinor && CheckInfo.m_Patch == CConfig::ms_GfxGLPatch;
+		};
+
+		int OldSelectedBackend = -1;
+		uint32_t CurCounter = 0;
+		for(uint32_t i = 0; i < BACKEND_TYPE_COUNT; ++i)
+		{
+			for(uint32_t n = 0; n < GRAPHICS_DRIVER_AGE_TYPE_COUNT; ++n)
+			{
+				auto &Info = aaSupportedBackends[i][n];
+				if(Info.m_Found)
+				{
+					bool IsDefault = IsInfoDefault(Info);
+					str_format(aTmpBackendName, sizeof(aTmpBackendName), "%s (%d.%d.%d)%s%s", Info.m_pBackendName, Info.m_Major, Info.m_Minor, Info.m_Patch, IsDefault ? " - " : "", IsDefault ? Localize("default") : "");
+					s_vBackendIDNames[CurCounter] = aTmpBackendName;
+					s_vpBackendIDNamesCStr[CurCounter] = s_vBackendIDNames[CurCounter].c_str();
+					if(str_comp_nocase(Info.m_pBackendName, g_Config.m_GfxBackend) == 0 && g_Config.m_GfxGLMajor == Info.m_Major && g_Config.m_GfxGLMinor == Info.m_Minor && g_Config.m_GfxGLPatch == Info.m_Patch)
+					{
+						OldSelectedBackend = CurCounter;
+					}
+
+					s_vBackendInfos[CurCounter] = Info;
+					++CurCounter;
+				}
+			}
+		}
+
+		if(OldSelectedBackend != -1)
+		{
+			// no custom selected
+			BackendCount -= 1;
+		}
+		else
+		{
+			// custom selected one
+			str_format(aTmpBackendName, sizeof(aTmpBackendName), "%s (%s %d.%d.%d)", Localize("custom"), g_Config.m_GfxBackend, g_Config.m_GfxGLMajor, g_Config.m_GfxGLMinor, g_Config.m_GfxGLPatch);
+			s_vBackendIDNames[CurCounter] = aTmpBackendName;
+			s_vpBackendIDNamesCStr[CurCounter] = s_vBackendIDNames[CurCounter].c_str();
+			OldSelectedBackend = CurCounter;
+
+			s_vBackendInfos[CurCounter].m_pBackendName = "custom";
+			s_vBackendInfos[CurCounter].m_Major = g_Config.m_GfxGLMajor;
+			s_vBackendInfos[CurCounter].m_Minor = g_Config.m_GfxGLMinor;
+			s_vBackendInfos[CurCounter].m_Patch = g_Config.m_GfxGLPatch;
+		}
+
+		static int s_OldSelectedBackend = -1;
+		if(s_OldSelectedBackend == -1)
+			s_OldSelectedBackend = OldSelectedBackend;
+
+		static CUI::SDropDownState s_BackendDropDownState;
+		static CScrollRegion s_BackendDropDownScrollRegion;
+		s_BackendDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_BackendDropDownScrollRegion;
+		const int NewBackend = UI()->DoDropDown(&BackendDropDown, OldSelectedBackend, s_vpBackendIDNamesCStr.data(), BackendCount, s_BackendDropDownState);
+		if(OldSelectedBackend != NewBackend)
+		{
+			str_copy(g_Config.m_GfxBackend, s_vBackendInfos[NewBackend].m_pBackendName);
+			g_Config.m_GfxGLMajor = s_vBackendInfos[NewBackend].m_Major;
+			g_Config.m_GfxGLMinor = s_vBackendInfos[NewBackend].m_Minor;
+			g_Config.m_GfxGLPatch = s_vBackendInfos[NewBackend].m_Patch;
+
+			CheckSettings = true;
+			s_GfxBackendChanged = s_OldSelectedBackend != NewBackend;
+		}
+	}
+
+	// GPU list
+	const auto &GPUList = Graphics()->GetGPUs();
+	if(GPUList.m_vGPUs.size() > 1)
+	{
+		CUIRect Text, GpuDropDown;
+		MainView.HSplitTop(10.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Text, &MainView);
+		MainView.HSplitTop(2.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &GpuDropDown, &MainView);
+		UI()->DoLabel(&Text, Localize("Graphics card"), 16.0f, TEXTALIGN_MC);
+
+		static std::vector<const char *> s_vpGPUIDNames;
+
+		size_t GPUCount = GPUList.m_vGPUs.size() + 1;
+		s_vpGPUIDNames.resize(GPUCount);
+
+		char aCurDeviceName[256 + 4];
+
+		int OldSelectedGPU = -1;
+		for(size_t i = 0; i < GPUCount; ++i)
+		{
+			if(i == 0)
+			{
+				str_format(aCurDeviceName, sizeof(aCurDeviceName), "%s (%s)", Localize("auto"), GPUList.m_AutoGPU.m_aName);
+				s_vpGPUIDNames[i] = aCurDeviceName;
+				if(str_comp("auto", g_Config.m_GfxGPUName) == 0)
+				{
+					OldSelectedGPU = 0;
+				}
+			}
+			else
+			{
+				s_vpGPUIDNames[i] = GPUList.m_vGPUs[i - 1].m_aName;
+				if(str_comp(GPUList.m_vGPUs[i - 1].m_aName, g_Config.m_GfxGPUName) == 0)
+				{
+					OldSelectedGPU = i;
+				}
+			}
+		}
+
+		static int s_OldSelectedGPU = -1;
+		if(s_OldSelectedGPU == -1)
+			s_OldSelectedGPU = OldSelectedGPU;
+
+		static CUI::SDropDownState s_GpuDropDownState;
+		static CScrollRegion s_GpuDropDownScrollRegion;
+		s_GpuDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_GpuDropDownScrollRegion;
+		const int NewGPU = UI()->DoDropDown(&GpuDropDown, OldSelectedGPU, s_vpGPUIDNames.data(), GPUCount, s_GpuDropDownState);
+		if(OldSelectedGPU != NewGPU)
+		{
+			if(NewGPU == 0)
+				str_copy(g_Config.m_GfxGPUName, "auto");
+			else
+				str_copy(g_Config.m_GfxGPUName, GPUList.m_vGPUs[NewGPU - 1].m_aName);
+			CheckSettings = true;
+			s_GfxGPUChanged = NewGPU != s_OldSelectedGPU;
+		}
+	}
+
+	// check if the new settings require a restart
+	if(CheckSettings)
+	{
+		m_NeedRestartGraphics = !(s_GfxFsaaSamples == g_Config.m_GfxFsaaSamples &&
+					  !s_GfxBackendChanged &&
+					  !s_GfxGPUChanged &&
+					  s_GfxHighdpi == g_Config.m_GfxHighdpi);
+	}
+}
+
+void CMenus::RenderSettingsSound(CUIRect MainView)
+{
+	static int s_SndEnable = g_Config.m_SndEnable;
+
+	CUIRect Button;
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndEnable, Localize("Use sounds"), g_Config.m_SndEnable, &Button))
+	{
+		g_Config.m_SndEnable ^= 1;
+		UpdateMusicState();
+		m_NeedRestartSound = g_Config.m_SndEnable && !s_SndEnable;
+	}
+
+	if(!g_Config.m_SndEnable)
+		return;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndMusic, Localize("Play background music"), g_Config.m_SndMusic, &Button))
+	{
+		g_Config.m_SndMusic ^= 1;
+		UpdateMusicState();
+	}
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndNonactiveMute, Localize("Mute when not active"), g_Config.m_SndNonactiveMute, &Button))
+		g_Config.m_SndNonactiveMute ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndGame, Localize("Enable game sounds"), g_Config.m_SndGame, &Button))
+		g_Config.m_SndGame ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndGun, Localize("Enable gun sound"), g_Config.m_SndGun, &Button))
+		g_Config.m_SndGun ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndLongPain, Localize("Enable long pain sound (used when shooting in freeze)"), g_Config.m_SndLongPain, &Button))
+		g_Config.m_SndLongPain ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndServerMessage, Localize("Enable server message sound"), g_Config.m_SndServerMessage, &Button))
+		g_Config.m_SndServerMessage ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndChat, Localize("Enable regular chat sound"), g_Config.m_SndChat, &Button))
+		g_Config.m_SndChat ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndTeamChat, Localize("Enable team chat sound"), g_Config.m_SndTeamChat, &Button))
+		g_Config.m_SndTeamChat ^= 1;
+
+	MainView.HSplitTop(20.0f, &Button, &MainView);
+	if(DoButton_CheckBox(&g_Config.m_SndHighlight, Localize("Enable highlighted chat sound"), g_Config.m_SndHighlight, &Button))
+		g_Config.m_SndHighlight ^= 1;
+
+	// volume slider
+	{
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Button, &MainView);
+		UI()->DoScrollbarOption(&g_Config.m_SndVolume, &g_Config.m_SndVolume, &Button, Localize("Sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+	}
+
+	// volume slider game sounds
+	{
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Button, &MainView);
+		UI()->DoScrollbarOption(&g_Config.m_SndGameSoundVolume, &g_Config.m_SndGameSoundVolume, &Button, Localize("Game sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+	}
+
+	// volume slider gui sounds
+	{
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Button, &MainView);
+		UI()->DoScrollbarOption(&g_Config.m_SndChatSoundVolume, &g_Config.m_SndChatSoundVolume, &Button, Localize("Chat sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+	}
+
+	// volume slider map sounds
+	{
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Button, &MainView);
+		UI()->DoScrollbarOption(&g_Config.m_SndMapSoundVolume, &g_Config.m_SndMapSoundVolume, &Button, Localize("Map sound volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+	}
+
+	// volume slider background music
+	{
+		MainView.HSplitTop(5.0f, nullptr, &MainView);
+		MainView.HSplitTop(20.0f, &Button, &MainView);
+		UI()->DoScrollbarOption(&g_Config.m_SndBackgroundMusicVolume, &g_Config.m_SndBackgroundMusicVolume, &Button, Localize("Background music volume"), 0, 100, &CUI::ms_LogarithmicScrollbarScale, 0u, "%");
+	}
+}
+
+bool CMenus::RenderLanguageSelection(CUIRect MainView)
+{
+	static int s_SelectedLanguage = -2; // -2 = unloaded, -1 = unset
+	static CListBox s_ListBox;
+
+	if(s_SelectedLanguage == -2)
+	{
+		s_SelectedLanguage = -1;
+		for(size_t i = 0; i < g_Localization.Languages().size(); i++)
+		{
+			if(str_comp(g_Localization.Languages()[i].m_FileName.c_str(), g_Config.m_ClLanguagefile) == 0)
+			{
+				s_SelectedLanguage = i;
+				s_ListBox.ScrollToSelected();
+				break;
+			}
+		}
+	}
+
+	const int OldSelected = s_SelectedLanguage;
+
+	s_ListBox.DoStart(24.0f, g_Localization.Languages().size(), 1, 3, s_SelectedLanguage, &MainView);
+
+	for(const auto &Language : g_Localization.Languages())
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&Language.m_Name, s_SelectedLanguage != -1 && !str_comp(g_Localization.Languages()[s_SelectedLanguage].m_Name.c_str(), Language.m_Name.c_str()));
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect FlagRect, Label;
+		Item.m_Rect.VSplitLeft(Item.m_Rect.h * 2.0f, &FlagRect, &Label);
+		FlagRect.VMargin(6.0f, &FlagRect);
+		FlagRect.HMargin(3.0f, &FlagRect);
+		m_pClient->m_CountryFlags.Render(Language.m_CountryCode, ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f), FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+		UI()->DoLabel(&Label, Language.m_Name.c_str(), 16.0f, TEXTALIGN_ML);
+	}
+
+	s_SelectedLanguage = s_ListBox.DoEnd();
+
+	if(OldSelected != s_SelectedLanguage)
+	{
+		str_copy(g_Config.m_ClLanguagefile, g_Localization.Languages()[s_SelectedLanguage].m_FileName.c_str());
+		GameClient()->OnLanguageChange();
+	}
+
+	return s_ListBox.WasItemActivated();
+}
+
+void CMenus::RenderSettings(CUIRect MainView)
+{
+	// render background
+	CUIRect Button, TabBar, RestartWarning;
+	MainView.VSplitRight(120.0f, &MainView, &TabBar);
+	MainView.Draw(ms_ColorTabbarActive, IGraphics::CORNER_B, 10.0f);
+	MainView.Margin(10.0f, &MainView);
+	MainView.HSplitBottom(15.0f, &MainView, &RestartWarning);
+	TabBar.HSplitTop(50.0f, &Button, &TabBar);
+	Button.Draw(ms_ColorTabbarActive, IGraphics::CORNER_BR, 10.0f);
+
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+
+	const char *apTabs[SETTINGS_LENGTH] = {
+		Localize("Language"),
+		Localize("General"),
+		Localize("Player"),
+		"Tee",
+		Localize("Appearance"),
+		Localize("Controls"),
+		Localize("Graphics"),
+		Localize("Sound"),
+		Localize("DDNet"),
+		Localize("Assets"),
+		"StA",
+		"PlayerAssets"};
+
+	static CButtonContainer s_aTabButtons[SETTINGS_LENGTH];
+
+	for(int i = 0; i < SETTINGS_LENGTH; i++)
+	{
+		TabBar.HSplitTop(10.0f, nullptr, &TabBar);
+		TabBar.HSplitTop(26.0f, &Button, &TabBar);
+		if(DoButton_MenuTab(&s_aTabButtons[i], apTabs[i], g_Config.m_UiSettingsPage == i, &Button, IGraphics::CORNER_R, &m_aAnimatorsSettingsTab[i]))
+			g_Config.m_UiSettingsPage = i;
+	}
+
+	MainView.Margin(10.0f, &MainView);
+	RestartWarning.VMargin(10.0f, &RestartWarning);
+
+	if(g_Config.m_UiSettingsPage == SETTINGS_LANGUAGE)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_LANGUAGE);
+		RenderLanguageSelection(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_GENERAL)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GENERAL);
+		RenderSettingsGeneral(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_PLAYER)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_PLAYER);
+		RenderSettingsPlayer(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_TEE)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_TEE);
+		RenderSettingsTee(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_APPEARANCE)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_APPEARANCE);
+		RenderSettingsAppearance(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_CONTROLS)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_CONTROLS);
+		RenderSettingsControls(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_GRAPHICS)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_GRAPHICS);
+		RenderSettingsGraphics(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_SOUND)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_SOUND);
+		RenderSettingsSound(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_DDNET)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_DDNET);
+		RenderSettingsDDNet(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_ASSETS)
+	{
+		m_pBackground->ChangePosition(CMenuBackground::POS_SETTINGS_ASSETS);
+		RenderSettingsCustom(MainView);
+	}
+
+	else if(g_Config.m_UiSettingsPage == SETTINGS_STA)
+	{
+		m_pBackground->ChangePosition(10);
+		RenderSettingsStA(MainView);
+	}
+	else if(g_Config.m_UiSettingsPage == SETTINGS_PROFILES)
+	{
+		m_pBackground->ChangePosition(11);
+		RenderSettingsProfiles(MainView);
+	}
+	if(m_NeedRestartUpdate)
+	{
+		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+		UI()->DoLabel(&RestartWarning, Localize("DDNet Client needs to be restarted to complete update!"), 14.0f, TEXTALIGN_ML);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	else if(m_NeedRestartGeneral || m_NeedRestartSkins || m_NeedRestartGraphics || m_NeedRestartSound || m_NeedRestartDDNet)
+		UI()->DoLabel(&RestartWarning, Localize("You must restart the game for all settings to take effect."), 14.0f, TEXTALIGN_ML);
+}
+
+ColorHSLA CMenus::RenderHSLScrollbars(CUIRect *pRect, unsigned int *pColor, bool Alpha, bool ClampedLight)
+{
+	ColorHSLA Color(*pColor, Alpha);
+	CUIRect Preview, Button, Label;
+	char aBuf[32];
+	float *apComponent[] = {&Color.h, &Color.s, &Color.l, &Color.a};
+	const char *apLabels[] = {Localize("Hue"), Localize("Sat."), Localize("Lht."), Localize("Alpha")};
+
+	float SizePerEntry = 20.0f;
+	float MarginPerEntry = 5.0f;
+
+	float OffY = (SizePerEntry + MarginPerEntry) * (3 + (Alpha ? 1 : 0)) - 40.0f;
+	pRect->VSplitLeft(40.0f, &Preview, pRect);
+	Preview.HSplitTop(OffY / 2.0f, NULL, &Preview);
+	Preview.HSplitTop(40.0f, &Preview, NULL);
+
+	Graphics()->TextureClear();
+	{
+		const float SizeBorder = 5.0f;
+		Graphics()->SetColor(ColorRGBA(0.15f, 0.15f, 0.15f, 1));
+		int TmpCont = Graphics()->CreateRectQuadContainer(Preview.x - SizeBorder / 2.0f, Preview.y - SizeBorder / 2.0f, Preview.w + SizeBorder, Preview.h + SizeBorder, 4.0f + SizeBorder / 2.0f, IGraphics::CORNER_ALL);
+		Graphics()->RenderQuadContainer(TmpCont, -1);
+		Graphics()->DeleteQuadContainer(TmpCont);
+	}
+	ColorHSLA RenderColorHSLA(Color.r, Color.g, Color.b, Color.a);
+	if(ClampedLight)
+		RenderColorHSLA = RenderColorHSLA.UnclampLighting();
+	Graphics()->SetColor(color_cast<ColorRGBA>(RenderColorHSLA));
+	int TmpCont = Graphics()->CreateRectQuadContainer(Preview.x, Preview.y, Preview.w, Preview.h, 4.0f, IGraphics::CORNER_ALL);
+	Graphics()->RenderQuadContainer(TmpCont, -1);
+	Graphics()->DeleteQuadContainer(TmpCont);
+
+	auto &&RenderHSLColorsRect = [&](CUIRect *pColorRect) {
+		Graphics()->TextureClear();
+		Graphics()->TrianglesBegin();
+
+		float CurXOff = pColorRect->x;
+		float SizeColor = pColorRect->w / 6;
+
+		// red to yellow
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 1, 0, 0, 1),
+				IGraphics::CColorVertex(1, 1, 1, 0, 1),
+				IGraphics::CColorVertex(2, 1, 0, 0, 1),
+				IGraphics::CColorVertex(3, 1, 1, 0, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		// yellow to green
+		CurXOff += SizeColor;
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 1, 1, 0, 1),
+				IGraphics::CColorVertex(1, 0, 1, 0, 1),
+				IGraphics::CColorVertex(2, 1, 1, 0, 1),
+				IGraphics::CColorVertex(3, 0, 1, 0, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		CurXOff += SizeColor;
+		// green to turquoise
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 0, 1, 0, 1),
+				IGraphics::CColorVertex(1, 0, 1, 1, 1),
+				IGraphics::CColorVertex(2, 0, 1, 0, 1),
+				IGraphics::CColorVertex(3, 0, 1, 1, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		CurXOff += SizeColor;
+		// turquoise to blue
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 0, 1, 1, 1),
+				IGraphics::CColorVertex(1, 0, 0, 1, 1),
+				IGraphics::CColorVertex(2, 0, 1, 1, 1),
+				IGraphics::CColorVertex(3, 0, 0, 1, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		CurXOff += SizeColor;
+		// blue to purple
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 0, 0, 1, 1),
+				IGraphics::CColorVertex(1, 1, 0, 1, 1),
+				IGraphics::CColorVertex(2, 0, 0, 1, 1),
+				IGraphics::CColorVertex(3, 1, 0, 1, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		CurXOff += SizeColor;
+		// purple to red
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, 1, 0, 1, 1),
+				IGraphics::CColorVertex(1, 1, 0, 0, 1),
+				IGraphics::CColorVertex(2, 1, 0, 1, 1),
+				IGraphics::CColorVertex(3, 1, 0, 0, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		Graphics()->TrianglesEnd();
+	};
+
+	auto &&RenderHSLSatRect = [&](CUIRect *pColorRect, ColorRGBA &CurColor) {
+		Graphics()->TextureClear();
+		Graphics()->TrianglesBegin();
+
+		float CurXOff = pColorRect->x;
+		float SizeColor = pColorRect->w;
+
+		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColor);
+		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColor);
+
+		LeftColor.g = 0;
+		RightColor.g = 1;
+
+		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
+		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+
+		// saturation
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
+				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		Graphics()->TrianglesEnd();
+	};
+
+	auto &&RenderHSLLightRect = [&](CUIRect *pColorRect, ColorRGBA &CurColorSat) {
+		Graphics()->TextureClear();
+		Graphics()->TrianglesBegin();
+
+		float CurXOff = pColorRect->x;
+		float SizeColor = pColorRect->w / (ClampedLight ? 1.0f : 2.0f);
+
+		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColorSat);
+		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColorSat);
+
+		LeftColor.b = ColorHSLA::DARKEST_LGT;
+		RightColor.b = 1;
+
+		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
+		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+
+		if(!ClampedLight)
+			CurXOff += SizeColor;
+
+		// light
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
+				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		if(!ClampedLight)
+		{
+			CurXOff -= SizeColor;
+			LeftColor.b = 0;
+			RightColor.b = ColorHSLA::DARKEST_LGT;
+
+			RightColorRGBA = color_cast<ColorRGBA>(RightColor);
+			LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1),
+				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, 1),
+				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, 1)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		Graphics()->TrianglesEnd();
+	};
+
+	auto &&RenderHSLAlphaRect = [&](CUIRect *pColorRect, ColorRGBA &CurColorFull) {
+		Graphics()->TextureClear();
+		Graphics()->TrianglesBegin();
+
+		float CurXOff = pColorRect->x;
+		float SizeColor = pColorRect->w;
+
+		ColorHSLA RightColor = color_cast<ColorHSLA>(CurColorFull);
+		ColorHSLA LeftColor = color_cast<ColorHSLA>(CurColorFull);
+
+		LeftColor.a = 0;
+		RightColor.a = 1;
+
+		ColorRGBA RightColorRGBA = color_cast<ColorRGBA>(RightColor);
+		ColorRGBA LeftColorRGBA = color_cast<ColorRGBA>(LeftColor);
+
+		// alpha
+		{
+			IGraphics::CColorVertex Array[4] = {
+				IGraphics::CColorVertex(0, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, LeftColorRGBA.a),
+				IGraphics::CColorVertex(1, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, RightColorRGBA.a),
+				IGraphics::CColorVertex(2, LeftColorRGBA.r, LeftColorRGBA.g, LeftColorRGBA.b, LeftColorRGBA.a),
+				IGraphics::CColorVertex(3, RightColorRGBA.r, RightColorRGBA.g, RightColorRGBA.b, RightColorRGBA.a)};
+			Graphics()->SetColorVertex(Array, 4);
+
+			IGraphics::CFreeformItem Freeform(
+				CurXOff, pColorRect->y,
+				CurXOff + SizeColor, pColorRect->y,
+				CurXOff, pColorRect->y + pColorRect->h,
+				CurXOff + SizeColor, pColorRect->y + pColorRect->h);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+
+		Graphics()->TrianglesEnd();
+	};
+
+	for(int i = 0; i < 3 + Alpha; i++)
+	{
+		pRect->HSplitTop(SizePerEntry, &Button, pRect);
+		pRect->HSplitTop(MarginPerEntry, NULL, pRect);
+		Button.VSplitLeft(10.0f, 0, &Button);
+		Button.VSplitLeft(100.0f, &Label, &Button);
+
+		Button.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f), IGraphics::CORNER_ALL, 1.0f);
+
+		CUIRect Rail;
+		Button.Margin(2.0f, &Rail);
+
+		str_format(aBuf, sizeof(aBuf), "%s: %03d", apLabels[i], (int)(*apComponent[i] * 255));
+		UI()->DoLabel(&Label, aBuf, 14.0f, TEXTALIGN_ML);
+
+		ColorHSLA CurColorPureHSLA(RenderColorHSLA.r, 1, 0.5f, 1);
+		ColorRGBA CurColorPure = color_cast<ColorRGBA>(CurColorPureHSLA);
+		ColorRGBA ColorInner(1, 1, 1, 0.25f);
+
+		if(i == 0)
+		{
+			ColorInner = CurColorPure;
+			RenderHSLColorsRect(&Rail);
+		}
+		else if(i == 1)
+		{
+			RenderHSLSatRect(&Rail, CurColorPure);
+			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], CurColorPureHSLA.b, 1));
+		}
+		else if(i == 2)
+		{
+			ColorRGBA CurColorSat = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], 0.5f, 1));
+			RenderHSLLightRect(&Rail, CurColorSat);
+			float LightVal = *apComponent[2];
+			if(ClampedLight)
+				LightVal = ColorHSLA::DARKEST_LGT + LightVal * (1.0f - ColorHSLA::DARKEST_LGT);
+			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], LightVal, 1));
+		}
+		else if(i == 3)
+		{
+			ColorRGBA CurColorFull = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], *apComponent[2], 1));
+			RenderHSLAlphaRect(&Rail, CurColorFull);
+			float LightVal = *apComponent[2];
+			if(ClampedLight)
+				LightVal = ColorHSLA::DARKEST_LGT + LightVal * (1.0f - ColorHSLA::DARKEST_LGT);
+			ColorInner = color_cast<ColorRGBA>(ColorHSLA(CurColorPureHSLA.r, *apComponent[1], LightVal, *apComponent[3]));
+		}
+
+		*apComponent[i] = UI()->DoScrollbarH(&((char *)pColor)[i], &Button, *apComponent[i], &ColorInner);
+	}
+
+	*pColor = Color.Pack(Alpha);
+	return Color;
+}
+
+enum
+{
+	APPEARANCE_TAB_HUD = 0,
+	APPEARANCE_TAB_CHAT = 1,
+	APPEARANCE_TAB_NAME_PLATE = 2,
+	APPEARANCE_TAB_HOOK_COLLISION = 3,
+	APPEARANCE_TAB_INFO_MESSAGES = 4,
+	APPEARANCE_TAB_LASER = 5,
+	NUMBER_OF_APPEARANCE_TABS = 6,
+};
+
+void CMenus::RenderSettingsAppearance(CUIRect MainView)
+{
+	char aBuf[128];
+	static int s_CurTab = 0;
+
+	CUIRect TabBar, Page1Tab, Page2Tab, Page3Tab, Page4Tab, Page5Tab, Page6Tab, LeftView, RightView, Section, Button, Label;
+
+	MainView.HSplitTop(20, &TabBar, &MainView);
+	float TabsW = TabBar.w;
+	TabBar.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page1Tab, &Page2Tab);
+	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page2Tab, &Page3Tab);
+	Page3Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page3Tab, &Page4Tab);
+	Page4Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page4Tab, &Page5Tab);
+	Page5Tab.VSplitLeft(TabsW / NUMBER_OF_APPEARANCE_TABS, &Page5Tab, &Page6Tab);
+
+	static CButtonContainer s_aPageTabs[NUMBER_OF_APPEARANCE_TABS] = {};
+
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_HUD], Localize("HUD"), s_CurTab == APPEARANCE_TAB_HUD, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_HUD;
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_CHAT], Localize("Chat"), s_CurTab == APPEARANCE_TAB_CHAT, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_CHAT;
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_NAME_PLATE], Localize("Name Plate"), s_CurTab == APPEARANCE_TAB_NAME_PLATE, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_NAME_PLATE;
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_HOOK_COLLISION], Localize("Hook Collisions"), s_CurTab == APPEARANCE_TAB_HOOK_COLLISION, &Page4Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_HOOK_COLLISION;
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_INFO_MESSAGES], Localize("Info Messages"), s_CurTab == APPEARANCE_TAB_INFO_MESSAGES, &Page5Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_INFO_MESSAGES;
+	if(DoButton_MenuTab(&s_aPageTabs[APPEARANCE_TAB_LASER], Localize("Laser"), s_CurTab == APPEARANCE_TAB_LASER, &Page6Tab, IGraphics::CORNER_R, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = APPEARANCE_TAB_LASER;
+
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+
+	const float LineSize = 20.0f;
+	const float ColorPickerLineSize = 25.0f;
+	const float SectionMargin = 5.0f;
+	const float SectionTotalMargin = SectionMargin * 2;
+	const float HeadlineFontSize = 20.0f;
+	const float HeadlineAndVMargin = HeadlineFontSize + SectionTotalMargin;
+	const float MarginToNextSection = 5.0f;
+
+	const float ColorPickerLabelSize = 13.0f;
+	const float ColorPickerLineSpacing = 5.0f;
+
+	if(s_CurTab == APPEARANCE_TAB_HUD)
+	{
+		MainView.VSplitMid(&LeftView, &RightView);
+
+		// ***** HUD ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("HUD"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// Switch of the entire HUD
+		LeftView.HSplitTop(SectionTotalMargin + LineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhud, Localize("Show ingame HUD"), &g_Config.m_ClShowhud, &Section, LineSize);
+
+		// Switches of the various normal HUD elements
+		LeftView.HSplitTop(SectionTotalMargin + 6 * LineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudHealthAmmo, Localize("Show health, shields and ammo"), &g_Config.m_ClShowhudHealthAmmo, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChat, Localize("Show chat"), &g_Config.m_ClShowChat, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplates, Localize("Show name plates"), &g_Config.m_ClNameplates, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowKillMessages, Localize("Show kill messages"), &g_Config.m_ClShowKillMessages, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudScore, Localize("Show score"), &g_Config.m_ClShowhudScore, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowLocalTimeAlways, Localize("Show local time always"), &g_Config.m_ClShowLocalTimeAlways, &Section, LineSize);
+
+		// Settings of the HUD element for votes
+		LeftView.HSplitTop(SectionTotalMargin + LineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowVotesAfterVoting, Localize("Show votes window after voting"), &g_Config.m_ClShowVotesAfterVoting, &Section, LineSize);
+
+		// ***** DDRace HUD ***** //
+		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
+		UI()->DoLabel(&Label, Localize("DDRace HUD"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// Switches of various DDRace HUD elements
+		RightView.HSplitTop(SectionTotalMargin + 4 * LineSize, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClDDRaceScoreBoard, Localize("Use DDRace Scoreboard"), &g_Config.m_ClDDRaceScoreBoard, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowIDs, Localize("Show client IDs in scoreboard"), &g_Config.m_ClShowIDs, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDDRace, Localize("Show DDRace HUD"), &g_Config.m_ClShowhudDDRace, &Section, LineSize);
+		if(g_Config.m_ClShowhudDDRace)
+		{
+			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudJumpsIndicator, Localize("Show jumps indicator"), &g_Config.m_ClShowhudJumpsIndicator, &Section, LineSize);
+		}
+		else
+		{
+			Section.HSplitTop(LineSize, 0x0, &Section); // Create empty space for hidden option
+		}
+
+		// Switch for dummy actions display
+		RightView.HSplitTop(SectionTotalMargin + LineSize, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudDummyActions, Localize("Show dummy actions"), &g_Config.m_ClShowhudDummyActions, &Section, LineSize);
+
+		// Player movement information display settings
+		RightView.HSplitTop(SectionTotalMargin + 3 * LineSize, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerPosition, Localize("Show player position"), &g_Config.m_ClShowhudPlayerPosition, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerSpeed, Localize("Show player speed"), &g_Config.m_ClShowhudPlayerSpeed, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowhudPlayerAngle, Localize("Show player target angle"), &g_Config.m_ClShowhudPlayerAngle, &Section, LineSize);
+
+		// Freeze bar settings
+		RightView.HSplitTop(SectionTotalMargin + 3 * LineSize, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFreezeBars, Localize("Show freeze bars"), &g_Config.m_ClShowFreezeBars, &Section, LineSize);
+		{
+			Section.HSplitTop(2 * LineSize, &Button, &Section);
+			if(g_Config.m_ClShowFreezeBars)
+			{
+				UI()->DoScrollbarOption(&g_Config.m_ClFreezeBarsAlphaInsideFreeze, &g_Config.m_ClFreezeBarsAlphaInsideFreeze, &Button, Localize("Opacity of freeze bars inside freeze"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE, "%");
+			}
+		}
+	}
+	else if(s_CurTab == APPEARANCE_TAB_CHAT)
+	{
+		CChat &Chat = GameClient()->m_Chat;
+		CUIRect TopView, PreviewView;
+		MainView.h += 20.f; // Increase height a little
+		MainView.HSplitTop(MainView.h - 260, &TopView, &PreviewView);
+		TopView.VSplitMid(&LeftView, &RightView);
+
+		// ***** Chat ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Chat"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General chat settings
+		LeftView.HSplitTop(SectionTotalMargin + 7 * LineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatTeamColors, Localize("Show names in chat in team colors"), &g_Config.m_ClChatTeamColors, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowChatFriends, Localize("Show only chat messages from friends"), &g_Config.m_ClShowChatFriends, &Section, LineSize);
+
+		if(DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClChatOld, Localize("Use old chat style"), &g_Config.m_ClChatOld, &Section, LineSize))
+			GameClient()->m_Chat.RebuildChat();
+
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		int PrevFontSize = g_Config.m_ClChatFontSize;
+		UI()->DoScrollbarOption(&g_Config.m_ClChatFontSize, &g_Config.m_ClChatFontSize, &Button, Localize("Chat font size"), 10, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+		if(PrevFontSize != g_Config.m_ClChatFontSize)
+		{
+			Chat.EnsureCoherentWidth();
+			Chat.RebuildChat();
+		}
+
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		int PrevWidth = g_Config.m_ClChatWidth;
+		UI()->DoScrollbarOption(&g_Config.m_ClChatWidth, &g_Config.m_ClChatWidth, &Button, Localize("Chat width"), 120, 400, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+		if(PrevWidth != g_Config.m_ClChatWidth)
+		{
+			Chat.EnsureCoherentFontSize();
+			Chat.RebuildChat();
+		}
+
+		// ***** Messages ***** //
+		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
+		UI()->DoLabel(&Label, Localize("Messages"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// Message Colors and extra settings
+		RightView.HSplitTop(SectionTotalMargin + 6 * ColorPickerLineSize, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+
+		int i = 0;
+		static CButtonContainer s_aResetIDs[24];
+
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("System message"), &g_Config.m_ClMessageSystemColor, ColorRGBA(1.0f, 1.0f, 0.5f), true, &g_Config.m_ClShowChatSystem);
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Highlighted message"), &g_Config.m_ClMessageHighlightColor, ColorRGBA(1.0f, 0.5f, 0.5f));
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Team message"), &g_Config.m_ClMessageTeamColor, ColorRGBA(0.65f, 1.0f, 0.65f));
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Friend message"), &g_Config.m_ClMessageFriendColor, ColorRGBA(1.0f, 0.137f, 0.137f), true, &g_Config.m_ClMessageFriend);
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Normal message"), &g_Config.m_ClMessageColor, ColorRGBA(1.0f, 1.0f, 1.0f));
+
+		str_format(aBuf, sizeof(aBuf), "%s (echo)", Localize("Client message"));
+		DoLine_ColorPicker(&s_aResetIDs[i++], ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, aBuf, &g_Config.m_ClMessageClientColor, ColorRGBA(0.5f, 0.78f, 1.0f));
+
+		// ***** Chat Preview ***** //
+		PreviewView.HSplitTop(HeadlineAndVMargin, &Label, &PreviewView);
+		UI()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// Use the rest of the view for preview
+		Section = PreviewView;
+		Section.Margin(SectionMargin, &Section);
+
+		Section.Draw(ColorRGBA(1, 1, 1, 0.1f), IGraphics::CORNER_ALL, 8.0f);
+
+		Section.HSplitTop(10.0f, 0x0, &Section); // Margin
+
+		ColorRGBA SystemColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
+		ColorRGBA HighlightedColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
+		ColorRGBA TeamColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
+		ColorRGBA FriendColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
+		ColorRGBA NormalColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageColor));
+		ColorRGBA ClientColor = color_cast<ColorRGBA, ColorHSLA>(ColorHSLA(g_Config.m_ClMessageClientColor));
+		ColorRGBA DefaultNameColor(0.8f, 0.8f, 0.8f, 1.0f);
+
+		const float RealFontSize = Chat.FontSize() * 2;
+		const float RealMsgPaddingX = (!g_Config.m_ClChatOld ? Chat.MessagePaddingX() : 0) * 2;
+		const float RealMsgPaddingY = (!g_Config.m_ClChatOld ? Chat.MessagePaddingY() : 0) * 2;
+		const float RealMsgPaddingTee = (!g_Config.m_ClChatOld ? Chat.MessageTeeSize() + CChat::MESSAGE_TEE_PADDING_RIGHT : 0) * 2;
+		const float RealOffsetY = RealFontSize + RealMsgPaddingY;
+
+		const float X = 5.0f + RealMsgPaddingX / 2.0f + Section.x;
+		float Y = Section.y;
+		float LineWidth = g_Config.m_ClChatWidth * 2 - (RealMsgPaddingX * 1.5f) - RealMsgPaddingTee;
+
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, X, Y, RealFontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = LineWidth;
+
+		str_copy(aBuf, Client()->PlayerName());
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		const float RealTeeSize = Chat.MessageTeeSize() * 2;
+		const float RealTeeSizeHalved = Chat.MessageTeeSize();
+		constexpr float TWSkinUnreliableOffset = -0.25f;
+		const float OffsetTeeY = RealTeeSizeHalved;
+		const float FullHeightMinusTee = RealOffsetY - RealTeeSize;
+
+		struct SPreviewLine
+		{
+			int m_ClientID;
+			bool m_Team;
+			char m_aName[64];
+			char m_aText[256];
+			bool m_Friend;
+			bool m_Player;
+			bool m_Client;
+			bool m_Highlighted;
+			int m_TimesRepeated;
+
+			CTeeRenderInfo m_RenderInfo;
+		};
+
+		static std::vector<SPreviewLine> s_vLines;
+
+		const auto *pDefaultSkin = GameClient()->m_Skins.Find("default");
+		enum ELineFlag
+		{
+			FLAG_TEAM = 1 << 0,
+			FLAG_FRIEND = 1 << 1,
+			FLAG_HIGHLIGHT = 1 << 2,
+			FLAG_CLIENT = 1 << 3
+		};
+		enum
+		{
+			PREVIEW_SYS,
+			PREVIEW_HIGHLIGHT,
+			PREVIEW_TEAM,
+			PREVIEW_FRIEND,
+			PREVIEW_SPAMMER,
+			PREVIEW_CLIENT
+		};
+		auto &&AddPreviewLine = [](int Index, int ClientID, const char *pName, const char *pText, int Flag, int Repeats) {
+			s_vLines.emplace_back();
+			SPreviewLine *pLine = &s_vLines[s_vLines.size() - 1];
+			pLine->m_ClientID = ClientID;
+			pLine->m_Team = Flag & FLAG_TEAM;
+			pLine->m_Friend = Flag & FLAG_FRIEND;
+			pLine->m_Player = ClientID >= 0;
+			pLine->m_Highlighted = Flag & FLAG_HIGHLIGHT;
+			pLine->m_Client = Flag & FLAG_CLIENT;
+			pLine->m_TimesRepeated = Repeats;
+			str_copy(pLine->m_aName, pName);
+			str_copy(pLine->m_aText, pText);
+		};
+		auto &&SetLineSkin = [RealTeeSize, &pDefaultSkin](int Index, const CSkin *pSkin) {
+			if(Index >= (int)s_vLines.size())
+				return;
+			s_vLines[Index].m_RenderInfo.m_Size = RealTeeSize;
+			s_vLines[Index].m_RenderInfo.m_CustomColoredSkin = false;
+			if(pSkin != nullptr)
+				s_vLines[Index].m_RenderInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			else if(pDefaultSkin != nullptr)
+				s_vLines[Index].m_RenderInfo.m_OriginalRenderSkin = pDefaultSkin->m_OriginalSkin;
+		};
+
+		auto &&RenderPreview = [&](int LineIndex, int x, int y, bool Render = true) {
+			if(LineIndex >= (int)s_vLines.size())
+				return vec2(0, 0);
+			CTextCursor LocalCursor;
+			TextRender()->SetCursor(&LocalCursor, x, y, RealFontSize, Render ? TEXTFLAG_RENDER : 0);
+			LocalCursor.m_LineWidth = LineWidth;
+			const auto &Line = s_vLines[LineIndex];
+
+			char aName[64 + 12] = "";
+
+			if(g_Config.m_ClShowIDs && Line.m_ClientID >= 0 && Line.m_aName[0] != '\0')
+			{
+				if(Line.m_ClientID < 10)
+					str_format(aName, sizeof(aName), " %d: ", Line.m_ClientID);
+				else
+					str_format(aName, sizeof(aName), "%d: ", Line.m_ClientID);
+			}
+
+			str_append(aName, Line.m_aName);
+
+			char aCount[12];
+			if(Line.m_ClientID < 0)
+				str_format(aCount, sizeof(aCount), "[%d] ", Line.m_TimesRepeated + 1);
+			else
+				str_format(aCount, sizeof(aCount), " [%d]", Line.m_TimesRepeated + 1);
+
+			if(Line.m_Player)
+			{
+				LocalCursor.m_X += RealMsgPaddingTee;
+
+				if(Line.m_Friend && g_Config.m_ClMessageFriend)
+				{
+					if(Render)
+						TextRender()->TextColor(FriendColor);
+					TextRender()->TextEx(&LocalCursor, "♥ ", -1);
+				}
+			}
+
+			ColorRGBA NameColor;
+			if(Line.m_Team)
+				NameColor = CalculateNameColor(color_cast<ColorHSLA>(TeamColor));
+			else if(Line.m_Player)
+				NameColor = DefaultNameColor;
+			else if(Line.m_Client)
+				NameColor = ClientColor;
+			else
+				NameColor = SystemColor;
+
+			if(Render)
+				TextRender()->TextColor(NameColor);
+
+			TextRender()->TextEx(&LocalCursor, aName, -1);
+
+			if(Line.m_TimesRepeated > 0)
+			{
+				if(Render)
+					TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.3f);
+				TextRender()->TextEx(&LocalCursor, aCount, -1);
+			}
+
+			if(Line.m_ClientID >= 0 && Line.m_aName[0] != '\0')
+			{
+				if(Render)
+					TextRender()->TextColor(NameColor);
+				TextRender()->TextEx(&LocalCursor, ": ", -1);
+			}
+
+			CTextCursor AppendCursor = LocalCursor;
+			AppendCursor.m_LongestLineWidth = 0.0f;
+			if(!g_Config.m_ClChatOld)
+			{
+				AppendCursor.m_StartX = LocalCursor.m_X;
+				AppendCursor.m_LineWidth -= LocalCursor.m_LongestLineWidth;
+			}
+
+			if(Render)
+			{
+				if(Line.m_Highlighted)
+					TextRender()->TextColor(HighlightedColor);
+				else if(Line.m_Team)
+					TextRender()->TextColor(TeamColor);
+				else if(Line.m_Player)
+					TextRender()->TextColor(NormalColor);
+			}
+
+			TextRender()->TextEx(&AppendCursor, Line.m_aText, -1);
+			if(Render)
+				TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+			return vec2{LocalCursor.m_LongestLineWidth + AppendCursor.m_LongestLineWidth, AppendCursor.Height() + RealMsgPaddingY};
+		};
+
+		// Init lines
+		if(s_vLines.empty())
+		{
+			char aLineBuilder[128];
+
+			str_format(aLineBuilder, sizeof(aLineBuilder), "'%s' entered and joined the game", aBuf);
+			AddPreviewLine(PREVIEW_SYS, -1, "*** ", aLineBuilder, 0, 0);
+
+			str_format(aLineBuilder, sizeof(aLineBuilder), "Hey, how are you %s?", aBuf);
+			AddPreviewLine(PREVIEW_HIGHLIGHT, 7, "Random Tee", aLineBuilder, FLAG_HIGHLIGHT, 0);
+
+			AddPreviewLine(PREVIEW_TEAM, 11, "Your Teammate", "Let's speedrun this!", FLAG_TEAM, 0);
+			AddPreviewLine(PREVIEW_FRIEND, 8, "Friend", "Hello there", FLAG_FRIEND, 0);
+			AddPreviewLine(PREVIEW_SPAMMER, 9, "Spammer", "Hey fools, I'm spamming here!", 0, 5);
+			AddPreviewLine(PREVIEW_CLIENT, -1, "— ", "Echo command executed", FLAG_CLIENT, 0);
+		}
+
+		SetLineSkin(1, GameClient()->m_Skins.FindOrNullptr("pinky"));
+		SetLineSkin(2, pDefaultSkin);
+		SetLineSkin(3, GameClient()->m_Skins.FindOrNullptr("cammostripes"));
+		SetLineSkin(4, GameClient()->m_Skins.FindOrNullptr("beast"));
+
+		// Backgrounds first
+		if(!g_Config.m_ClChatOld)
+		{
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(0, 0, 0, 0.12f);
+
+			float TempY = Y;
+			const float RealBackgroundRounding = Chat.MessageRounding() * 2.0f;
+
+			auto &&RenderMessageBackground = [&](int LineIndex) {
+				auto Size = RenderPreview(LineIndex, 0, 0, false);
+				Graphics()->DrawRectExt(X - RealMsgPaddingX / 2.0f, TempY - RealMsgPaddingY / 2.0f, Size.x + RealMsgPaddingX * 1.5f, Size.y, RealBackgroundRounding, IGraphics::CORNER_ALL);
+				return Size.y;
+			};
+
+			if(g_Config.m_ClShowChatSystem)
+			{
+				TempY += RenderMessageBackground(PREVIEW_SYS);
+			}
+
+			if(!g_Config.m_ClShowChatFriends)
+			{
+				TempY += RenderMessageBackground(PREVIEW_HIGHLIGHT);
+				TempY += RenderMessageBackground(PREVIEW_TEAM);
+			}
+
+			TempY += RenderMessageBackground(PREVIEW_FRIEND);
+
+			if(!g_Config.m_ClShowChatFriends)
+			{
+				TempY += RenderMessageBackground(PREVIEW_SPAMMER);
+			}
+
+			TempY += RenderMessageBackground(PREVIEW_CLIENT);
+
+			Graphics()->QuadsEnd();
+		}
+
+		// System
+		if(g_Config.m_ClShowChatSystem)
+		{
+			Y += RenderPreview(PREVIEW_SYS, X, Y).y;
+		}
+
+		if(!g_Config.m_ClShowChatFriends)
+		{
+			// Highlighted
+			if(!g_Config.m_ClChatOld)
+				RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_HIGHLIGHT].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
+			Y += RenderPreview(PREVIEW_HIGHLIGHT, X, Y).y;
+
+			// Team
+			if(!g_Config.m_ClChatOld)
+				RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_TEAM].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
+			Y += RenderPreview(PREVIEW_TEAM, X, Y).y;
+		}
+
+		// Friend
+		if(!g_Config.m_ClChatOld)
+			RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_FRIEND].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
+		Y += RenderPreview(PREVIEW_FRIEND, X, Y).y;
+
+		// Normal
+		if(!g_Config.m_ClShowChatFriends)
+		{
+			if(!g_Config.m_ClChatOld)
+				RenderTools()->RenderTee(pIdleState, &s_vLines[PREVIEW_SPAMMER].m_RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), vec2(X + RealTeeSizeHalved, Y + OffsetTeeY + FullHeightMinusTee / 2.0f + TWSkinUnreliableOffset));
+			Y += RenderPreview(PREVIEW_SPAMMER, X, Y).y;
+		}
+		// Client
+		RenderPreview(PREVIEW_CLIENT, X, Y);
+		TextRender()->SetCursorPosition(&Cursor, X, Y);
+
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+	else if(s_CurTab == APPEARANCE_TAB_NAME_PLATE)
+	{
+		MainView.VSplitMid(&LeftView, &RightView);
+
+		// ***** Name Plate ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Name Plate"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General chat settings
+		LeftView.HSplitTop(SectionTotalMargin + 9 * LineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		UI()->DoScrollbarOption(&g_Config.m_ClNameplatesSize, &g_Config.m_ClNameplatesSize, &Button, Localize("Name plates size"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesClan, Localize("Show clan above name plates"), &g_Config.m_ClNameplatesClan, &Section, LineSize);
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		if(g_Config.m_ClNameplatesClan)
+		{
+			UI()->DoScrollbarOption(&g_Config.m_ClNameplatesClanSize, &g_Config.m_ClNameplatesClanSize, &Button, Localize("Clan plates size"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+		}
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesTeamcolors, Localize("Use team colors for name plates"), &g_Config.m_ClNameplatesTeamcolors, &Section, LineSize);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClNameplatesStrong, Localize("Show hook strength indicator"), &g_Config.m_ClNameplatesStrong, &Section, LineSize);
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		if(DoButton_CheckBox(&g_Config.m_ClShowDirection, Localize("Show other players' key presses"), g_Config.m_ClShowDirection >= 1 && g_Config.m_ClShowDirection != 3, &Button))
+		{
+			switch(g_Config.m_ClShowDirection)
+			{
+			case 0:
+				g_Config.m_ClShowDirection = 1;
+				break;
+			case 1:
+				g_Config.m_ClShowDirection = 0;
+				break;
+			case 2:
+				g_Config.m_ClShowDirection = 3;
+				break;
+			case 3:
+				g_Config.m_ClShowDirection = 2;
+				break;
+			}
+		}
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		static int s_ShowLocalPlayer = 0;
+		if(DoButton_CheckBox(&s_ShowLocalPlayer, Localize("Show local player's key presses"), g_Config.m_ClShowDirection >= 2, &Button))
+		{
+			switch(g_Config.m_ClShowDirection)
+			{
+			case 0:
+				g_Config.m_ClShowDirection = 3;
+				break;
+			case 1:
+				g_Config.m_ClShowDirection = 2;
+				break;
+			case 2:
+				g_Config.m_ClShowDirection = 1;
+				break;
+			case 3:
+				g_Config.m_ClShowDirection = 0;
+				break;
+			}
+		}
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		ColorRGBA GreenDefault(0.78f, 1.0f, 0.8f, 1.0f);
+		static CButtonContainer s_AuthedColor;
+		static CButtonContainer s_SameClanColor;
+		DoLine_ColorPicker(&s_AuthedColor, 25.0f, 13.0f, 5.0f, &Button, Localize("Authed name color in scoreboard"), &g_Config.m_ClAuthedPlayerColor, GreenDefault, false);
+		DoLine_ColorPicker(&s_SameClanColor, 25.0f, 13.0f, 5.0f, &Button, Localize("Same clan color in scoreboard"), &g_Config.m_ClSameClanColor, GreenDefault, false);
+	}
+	else if(s_CurTab == APPEARANCE_TAB_HOOK_COLLISION)
+	{
+		MainView.VSplitMid(&LeftView, &RightView);
+
+		// ***** Hookline ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Hook collision line"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General hookline settings
+		LeftView.HSplitTop(SectionTotalMargin + 6 * LineSize + 3 * ColorPickerLineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		if(DoButton_CheckBox(&g_Config.m_ClShowHookCollOther, Localize("Show other players' hook collision lines"), g_Config.m_ClShowHookCollOther, &Button))
+		{
+			g_Config.m_ClShowHookCollOther = g_Config.m_ClShowHookCollOther >= 1 ? 0 : 1;
+		}
+
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		UI()->DoScrollbarOption(&g_Config.m_ClHookCollSize, &g_Config.m_ClHookCollSize, &Button, Localize("Hook collision line width"), 0, 20, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE);
+
+		Section.HSplitTop(2 * LineSize, &Button, &Section);
+		UI()->DoScrollbarOption(&g_Config.m_ClHookCollAlpha, &g_Config.m_ClHookCollAlpha, &Button, Localize("Hook collision line opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_MULTILINE, "%");
+
+		static CButtonContainer s_HookCollNoCollResetID, s_HookCollHookableCollResetID, s_HookCollTeeCollResetID;
+		static int s_HookCollToolTip;
+
+		Section.HSplitTop(LineSize, &Label, &Section);
+		UI()->DoLabel(&Label, Localize("Colors of the hook collision line, in case of a possible collision with:"), 13.0f, TEXTALIGN_ML);
+		UI()->DoButtonLogic(&s_HookCollToolTip, 0, &Label); // Just for the tooltip, result ignored
+		GameClient()->m_Tooltips.DoToolTip(&s_HookCollToolTip, &Label, Localize("Your movements are not taken into account when calculating the line colors"));
+		DoLine_ColorPicker(&s_HookCollNoCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Nothing hookable"), &g_Config.m_ClHookCollColorNoColl, ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_HookCollHookableCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Something hookable"), &g_Config.m_ClHookCollColorHookableColl, ColorRGBA(130.0f / 255.0f, 232.0f / 255.0f, 160.0f / 255.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_HookCollTeeCollResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("A Tee"), &g_Config.m_ClHookCollColorTeeColl, ColorRGBA(1.0f, 1.0f, 0.0f, 1.0f), false);
+	}
+	else if(s_CurTab == APPEARANCE_TAB_INFO_MESSAGES)
+	{
+		MainView.VSplitMid(&LeftView, &RightView);
+
+		// ***** Info Messages ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Info Messages"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General info messages settings
+		LeftView.HSplitTop(SectionTotalMargin + 2 * LineSize + 2 * ColorPickerLineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		if(DoButton_CheckBox(&g_Config.m_ClShowKillMessages, Localize("Show kill messages"), g_Config.m_ClShowKillMessages, &Button))
+		{
+			g_Config.m_ClShowKillMessages ^= 1;
+		}
+
+		Section.HSplitTop(LineSize, &Button, &Section);
+		if(DoButton_CheckBox(&g_Config.m_ClShowFinishMessages, Localize("Show finish messages"), g_Config.m_ClShowFinishMessages, &Button))
+		{
+			g_Config.m_ClShowFinishMessages ^= 1;
+		}
+
+		static CButtonContainer s_KillMessageNormalColorID, s_KillMessageHighlightColorID;
+		DoLine_ColorPicker(&s_KillMessageNormalColorID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Normal Color"), &g_Config.m_ClKillMessageNormalColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
+		DoLine_ColorPicker(&s_KillMessageHighlightColorID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Highlight Color"), &g_Config.m_ClKillMessageHighlightColor, ColorRGBA(1.0f, 1.0f, 1.0f), false);
+	}
+	else if(s_CurTab == APPEARANCE_TAB_LASER)
+	{
+		MainView.VSplitMid(&LeftView, &RightView);
+
+		// ***** Weapons ***** //
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Weapons"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General weapon laser settings
+		LeftView.HSplitTop(SectionTotalMargin + 4 * ColorPickerLineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		static CButtonContainer s_LaserRifleOutResetID, s_LaserRifleInResetID, s_LaserShotgunOutResetID, s_LaserShotgunInResetID;
+
+		ColorHSLA LaserRifleOutlineColor = DoLine_ColorPicker(&s_LaserRifleOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Rifle Laser Outline Color"), &g_Config.m_ClLaserRifleOutlineColor, ColorRGBA(0.074402f, 0.074402f, 0.247166f, 1.0f), false);
+		ColorHSLA LaserRifleInnerColor = DoLine_ColorPicker(&s_LaserRifleInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Rifle Laser Inner Color"), &g_Config.m_ClLaserRifleInnerColor, ColorRGBA(0.498039f, 0.498039f, 1.0f, 1.0f), false);
+		ColorHSLA LaserShotgunOutlineColor = DoLine_ColorPicker(&s_LaserShotgunOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Shotgun Laser Outline Color"), &g_Config.m_ClLaserShotgunOutlineColor, ColorRGBA(0.125490f, 0.098039f, 0.043137f, 1.0f), false);
+		ColorHSLA LaserShotgunInnerColor = DoLine_ColorPicker(&s_LaserShotgunInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Shotgun Laser Inner Color"), &g_Config.m_ClLaserShotgunInnerColor, ColorRGBA(0.570588f, 0.417647f, 0.252941f, 1.0f), false);
+
+		// ***** Entities ***** //
+		LeftView.HSplitTop(MarginToNextSection * 2.0f, 0x0, &LeftView);
+		LeftView.HSplitTop(HeadlineAndVMargin, &Label, &LeftView);
+		UI()->DoLabel(&Label, Localize("Entities"), HeadlineFontSize, TEXTALIGN_ML);
+
+		// General entity laser settings
+		LeftView.HSplitTop(SectionTotalMargin + 4 * ColorPickerLineSize, &Section, &LeftView);
+		Section.Margin(SectionMargin, &Section);
+
+		static CButtonContainer s_LaserDoorOutResetID, s_LaserDoorInResetID, s_LaserFreezeOutResetID, s_LaserFreezeInResetID;
+
+		ColorHSLA LaserDoorOutlineColor = DoLine_ColorPicker(&s_LaserDoorOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Door Laser Outline Color"), &g_Config.m_ClLaserDoorOutlineColor, ColorRGBA(0.0f, 0.131372f, 0.096078f, 1.0f), false);
+		ColorHSLA LaserDoorInnerColor = DoLine_ColorPicker(&s_LaserDoorInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Door Laser Inner Color"), &g_Config.m_ClLaserDoorInnerColor, ColorRGBA(0.262745f, 0.760784f, 0.639215f, 1.0f), false);
+		ColorHSLA LaserFreezeOutlineColor = DoLine_ColorPicker(&s_LaserFreezeOutResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Freeze Laser Outline Color"), &g_Config.m_ClLaserFreezeOutlineColor, ColorRGBA(0.131372f, 0.123529f, 0.182352f, 1.0f), false);
+		ColorHSLA LaserFreezeInnerColor = DoLine_ColorPicker(&s_LaserFreezeInResetID, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &Section, Localize("Freeze Laser Inner Color"), &g_Config.m_ClLaserFreezeInnerColor, ColorRGBA(0.482352f, 0.443137f, 0.564705f, 1.0f), false);
+
+		static CButtonContainer s_AllToRifleResetID, s_AllToDefaultResetID;
+
+		LeftView.HSplitTop(20.0f, 0x0, &LeftView);
+		LeftView.HSplitTop(20.0f, &Button, &LeftView);
+		if(DoButton_Menu(&s_AllToRifleResetID, Localize("Set all to Rifle"), 0, &Button))
+		{
+			g_Config.m_ClLaserShotgunOutlineColor = g_Config.m_ClLaserRifleOutlineColor;
+			g_Config.m_ClLaserShotgunInnerColor = g_Config.m_ClLaserRifleInnerColor;
+			g_Config.m_ClLaserDoorOutlineColor = g_Config.m_ClLaserRifleOutlineColor;
+			g_Config.m_ClLaserDoorInnerColor = g_Config.m_ClLaserRifleInnerColor;
+			g_Config.m_ClLaserFreezeOutlineColor = g_Config.m_ClLaserRifleOutlineColor;
+			g_Config.m_ClLaserFreezeInnerColor = g_Config.m_ClLaserRifleInnerColor;
+		}
+
+		// values taken from the CL commands
+		LeftView.HSplitTop(10.0f, 0x0, &LeftView);
+		LeftView.HSplitTop(20.0f, &Button, &LeftView);
+		if(DoButton_Menu(&s_AllToDefaultResetID, Localize("Reset to defaults"), 0, &Button))
+		{
+			g_Config.m_ClLaserRifleOutlineColor = 11176233;
+			g_Config.m_ClLaserRifleInnerColor = 11206591;
+			g_Config.m_ClLaserShotgunOutlineColor = 1866773;
+			g_Config.m_ClLaserShotgunInnerColor = 1467241;
+			g_Config.m_ClLaserDoorOutlineColor = 7667473;
+			g_Config.m_ClLaserDoorInnerColor = 7701379;
+			g_Config.m_ClLaserFreezeOutlineColor = 11613223;
+			g_Config.m_ClLaserFreezeInnerColor = 12001153;
+		}
+
+		// ***** Laser Preview ***** //
+		RightView.HSplitTop(HeadlineAndVMargin, &Label, &RightView);
+		UI()->DoLabel(&Label, Localize("Preview"), HeadlineFontSize, TEXTALIGN_ML);
+
+		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+		DoLaserPreview(&Section, LaserRifleOutlineColor, LaserRifleInnerColor, LASERTYPE_RIFLE);
+
+		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+		DoLaserPreview(&Section, LaserShotgunOutlineColor, LaserShotgunInnerColor, LASERTYPE_SHOTGUN);
+
+		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+		DoLaserPreview(&Section, LaserDoorOutlineColor, LaserDoorInnerColor, LASERTYPE_DOOR);
+
+		RightView.HSplitTop(SectionTotalMargin + 50.0f, &Section, &RightView);
+		Section.Margin(SectionMargin, &Section);
+		DoLaserPreview(&Section, LaserFreezeOutlineColor, LaserFreezeInnerColor, LASERTYPE_DOOR);
+	}
+}
+
+enum
+{
+	STA_TAB_PAGE1 = 0,
+	STA_TAB_PAGE2 = 1,
+	STA_TAB_PAGE3 = 2,
+	NUMBER_OF_STA_TABS = 3,
+};
+
+void CMenus::RenderSettingsStA(CUIRect MainView)
+{//TODO: buttons before upd
+	static int s_CurTab = 0;
+
+	CUIRect TabBar, Page1Tab, Page2Tab, Page3Tab, Left, Right, Button, Label;
+
+	MainView.HSplitTop(20, &TabBar, &MainView);
+	float TabsW = TabBar.w;
+	TabBar.VSplitLeft(TabsW / NUMBER_OF_STA_TABS, &Page1Tab, &Page2Tab);
+	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_STA_TABS, &Page2Tab, &Page3Tab);
+
+	static CButtonContainer s_aPageTabs[NUMBER_OF_STA_TABS] = {};
+
+	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE1], Localize("Options"), s_CurTab == STA_TAB_PAGE1, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = STA_TAB_PAGE1;
+	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE2], Localize("Customization"), s_CurTab == STA_TAB_PAGE2, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = STA_TAB_PAGE2;
+	if(DoButton_MenuTab(&s_aPageTabs[STA_TAB_PAGE3], Localize("3rd PAGE"), s_CurTab == STA_TAB_PAGE3, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurTab = STA_TAB_PAGE3;
+
+	MainView.HSplitTop(10.0f, nullptr, &MainView);
+	MainView.VSplitMid(&Left, &Right, 10.f);
+
+	const float LineMargin = 20.0f;
+	const float ColorPickerLineSize = 25.0f;
+	const float SectionMargin = 5.0f;
+	const float ColorPickerLabelSize = 13.0f;
+	const float ColorPickerLineSpacing = 5.0f;
+
+	if(s_CurTab == STA_TAB_PAGE1)
+	{
+		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(2.0f) % 255 / 100.f, 0.4f, 1.f));
+		CUIRect LeftLeft, Demo, Outline;
+
+		Right.HSplitTop(25.f, &Label, &Outline);
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Tile Outlines(TYSM TClient)"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutline, ("Show any enabled outlines"), &g_Config.m_ClOutline, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineEntities, ("Only show outlines in entities"), &g_Config.m_ClOutlineEntities, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineFreeze, ("Outline freeze & deep"), &g_Config.m_ClOutlineFreeze, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineSolid, ("Outline walls"), &g_Config.m_ClOutlineSolid, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineTele, ("Outline teleporter"), &g_Config.m_ClOutlineTele, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClOutlineUnFreeze, ("Outline unfreeze & undeep"), &g_Config.m_ClOutlineUnFreeze, &Outline, LineMargin);
+
+		Outline.HSplitTop(20.f, &Button, &Outline);
+		UI()->DoScrollbarOption(&g_Config.m_ClOutlineWidth, &g_Config.m_ClOutlineWidth, &Button, Localize("Outline Width"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+		Outline.HSplitTop(20.f, &Button, &Outline);
+		UI()->DoScrollbarOption(&g_Config.m_ClOutlineAlphaSolid, &g_Config.m_ClOutlineAlphaSolid, &Button, Localize("Outline Opacity (walls)"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+		Outline.HSplitTop(20.f, &Button, &Outline);
+		UI()->DoScrollbarOption(&g_Config.m_ClOutlineAlpha, &g_Config.m_ClOutlineAlpha, &Button, Localize("Outline Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+		static CButtonContainer s_aResetIDs[24];
+		static CUI::SDropDownState s_BackendDropDownState;
+		static CScrollRegion s_BackendDropDownScrollRegion;
+		int i = 0;
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Outline, Localize("Freeze Outline Color"),
+			&g_Config.m_ClOutlineColorFreeze,
+			ColorRGBA(1),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Outline, Localize("Walls Outline Color"),
+			&g_Config.m_ClOutlineColorSolid,
+			ColorRGBA(1),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Outline, Localize("Teleporter Outline Color"),
+			&g_Config.m_ClOutlineColorTele,
+			ColorRGBA(1),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Outline, Localize("Unfreeze Outline Color"),
+			&g_Config.m_ClOutlineColorUnfreeze,
+			ColorRGBA(1),
+			false);
+
+		Outline.HSplitTop(25.f, &Label, &Outline);
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, ("Frozen Tee Display"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFrozenHud, ("Enable Frozen Tee Display"), &g_Config.m_ClShowFrozenHud, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClShowFrozenHudSkins, ("Use teeskin instead of ninja tee"), &g_Config.m_ClShowFrozenHudSkins, &Outline, LineMargin);
+		DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClFrozenHudTeamOnly, ("Enable only for Team"), &g_Config.m_ClFrozenHudTeamOnly, &Outline, LineMargin);
+
+		Outline.HSplitTop(20.f, &Button, &Outline);
+		UI()->DoScrollbarOption(&g_Config.m_ClFrozenMaxRows, &g_Config.m_ClFrozenMaxRows, &Button, Localize("Max rows"), 1, 6, &CUI::ms_LinearScrollbarScale, 0u, "");
+
+		Outline.HSplitTop(20.f, &Button, &Outline);
+		UI()->DoScrollbarOption(&g_Config.m_ClFrozenHudTeeSize, &g_Config.m_ClFrozenHudTeeSize, &Button, Localize("Tee Size"), 8, 20, &CUI::ms_LinearScrollbarScale, 0u, "");
+
+		// Preferences
+		Left.HSplitTop(20.0f, &Demo, &MainView);
+		Demo.HSplitTop(0.0f, &Label, &Demo);
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Preferences"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		Button.VSplitMid(&LeftLeft, &Button);
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClShowfps, Localize("Show FPS"), g_Config.m_ClShowfps, &Button))
+			g_Config.m_ClShowfps ^= 1;
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClShowpred, Localize("Show ping(predict)"), g_Config.m_ClShowpred, &Button))
+			g_Config.m_ClShowpred ^= 1;
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClAutoVerify, Localize("Server Auto Whitelist"), g_Config.m_ClAutoVerify, &Button))
+			g_Config.m_ClAutoVerify ^= 1;
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClShowSkinName, Localize("Display skin name in nameplates"), g_Config.m_ClShowSkinName, &Button))
+			g_Config.m_ClShowSkinName ^= 1;
+
+		Left.HSplitTop(20.0f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClOldFreezeMode, Localize("Old Freeze Mode"), g_Config.m_ClOldFreezeMode, &Button))
+			g_Config.m_ClOldFreezeMode ^= 1;
+
+		// Bind wheel config
+		Left.HSplitTop(30.f, &Label, &Right);
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Bind wheel"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		CUIRect BindWheelZone, BindWheelList, BindWheelOptions;
+		Right.HSplitTop(60.f, &BindWheelZone, &Right);
+		BindWheelZone.VSplitMid(&BindWheelList, &BindWheelOptions, 10.f);
+		BindWheelList.h = 20.f;
+
+		static int s_SelectedBind = -1;
+
+		auto &vBindsList = GameClient()->m_BindWheel.m_vBinds;
+		std::vector<const char *> vBindsName;
+
+		for(auto &Bind : vBindsList)
+			vBindsName.push_back(Bind.m_aName);
+
+		s_BackendDropDownState.m_SelectionPopupContext.m_pScrollRegion = &s_BackendDropDownScrollRegion;
+		s_SelectedBind = UI()->DoDropDown(&BindWheelList, s_SelectedBind, vBindsName.data(), vBindsName.size(), s_BackendDropDownState);
+
+		// Input fields
+		static char s_aBindName[BIND_WHEEL_MAX_NAME];
+		static char s_aBindBind[BIND_WHEEL_MAX_BIND];
+
+		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
+		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
+		static CLineInput s_NameInput;
+		s_NameInput.SetBuffer(s_aBindName, sizeof(s_aBindName));
+		s_NameInput.SetEmptyText("New Bind Description");
+		UI()->DoEditBox(&s_NameInput, &Button, 14.0f);
+
+		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
+		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
+		static CLineInput s_BindInput;
+		s_BindInput.SetBuffer(s_aBindBind, sizeof(s_aBindBind));
+		s_BindInput.SetEmptyText("New Bind Command");
+		UI()->DoEditBox(&s_BindInput, &Button, 14.0f);
+
+		BindWheelOptions.HSplitTop(20.f, &Button, &BindWheelOptions);
+		BindWheelOptions.HSplitTop(5.f, 0x0, &BindWheelOptions); // Offset
+		CUIRect LeftButton, RightButton;
+		Button.VSplitMid(&LeftButton, &RightButton, 5.f);
+
+		// New bind button
+		static CButtonContainer s_NewBindButton, s_RemBindButton;
+		if(DoButton_Menu(&s_NewBindButton, Localize("New bind"), 0, &RightButton) && str_length(s_aBindName) > 0 && str_length(s_aBindBind))
+		{
+			CBindWheel::SBind Bind;
+			str_copy(Bind.m_aName, s_aBindName);
+			str_copy(Bind.m_aBind, s_aBindBind);
+
+			vBindsList.push_back(Bind);
+		}
+
+		if(DoButton_Menu(&s_RemBindButton, Localize("Remove bind"), 0, &LeftButton) && s_SelectedBind >= 0)
+		{
+			vBindsList.erase(vBindsList.begin() + s_SelectedBind);
+			s_SelectedBind = -1;
+		}
+	}
+
+	if(s_CurTab == STA_TAB_PAGE2)
+	{
+		int i = 0;
+		static CButtonContainer s_aResetIDs[24];
+		ColorRGBA col = color_cast<ColorRGBA>(ColorHSVA(round_to_int(2.0f) % 255 / 100.f, 0.4f, 1.f));
+
+		// Tab
+		Left.HSplitTop(25.f, &Label, &Left);
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Tab"), 20.f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Blacklisted player color"),
+			&g_Config.m_ScBlacklistPColor,
+			ColorRGBA(1.0f, 0.39f, 0.39f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Friends color"),
+			&g_Config.m_ScFriendColor,
+			ColorRGBA(0.45f, 1.0f, 0.91f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Сlanmates color"),
+			&g_Config.m_ClSameClanColor,
+			ColorRGBA(0.2f, 0.7f, 1.0f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Staff player color(f2)"),
+			&g_Config.m_ClAuthedPlayerColor,
+			ColorRGBA(1.f, 0.25f, 0.6f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Own player color"),
+			&g_Config.m_ScPlayerOwnColor,
+			ColorRGBA(1.0f, 1.0f, 1.0f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Left, Localize("Frozen Tee Color"),
+			&g_Config.m_ScFrozenTeeColor,
+			ColorRGBA(1.0f, 1.0f, 1.0f),
+			false);
+
+		Left.HSplitTop(20.f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ScShowBlacklistNameplaterColor, Localize("Display Blacklisted Color in Nameplates"), g_Config.m_ScShowBlacklistNameplaterColor, &Button))
+			g_Config.m_ScShowBlacklistNameplaterColor ^= 1;
+
+		Left.HSplitTop(20.f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ScShowFriendsNameplatesColor, Localize("Display Friend Color in Nameplates"), g_Config.m_ScShowFriendsNameplatesColor, &Button))
+			g_Config.m_ScShowFriendsNameplatesColor ^= 1;
+
+		Left.HSplitTop(20.f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ScShowFrozenNameplaterColor, Localize("Display Frozen Tee's Color in Nameplates"), g_Config.m_ScShowFrozenNameplaterColor, &Button))
+			g_Config.m_ScShowFrozenNameplaterColor ^= 1;
+
+		Left.HSplitTop(25.f, &Label, &Left);
+
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Tee"), 20.f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		Left.HSplitTop(20.f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClRainbow, Localize("Rainbow Tee"), g_Config.m_ClRainbow, &Button))
+			g_Config.m_ClRainbow ^= 1;
+		Left.HSplitTop(20.f, &Button, &Left);
+		if(DoButton_CheckBox(&g_Config.m_ClRainbowHook, Localize("Rainbow Hook"), g_Config.m_ClRainbowHook, &Button))
+			g_Config.m_ClRainbowHook ^= 1;
+		if(g_Config.m_ClRainbow == 1 || g_Config.m_ClRainbowHook == 1)
+		{
+			Left.HSplitTop(20.f, &Button, &Left);
+			UI()->DoScrollbarOption(&g_Config.m_ClRainbowSpeed, &g_Config.m_ClRainbowSpeed, &Button, Localize("Rainbow Speed"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+		}
+
+		// Console color
+		Right.HSplitTop(25.f, &Label, &Right);
+
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Console Settings"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClConsoleSimple, Localize("Use simpled console"), g_Config.m_ClConsoleSimple, &Button))
+			g_Config.m_ClConsoleSimple ^= 1;
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClConsoleBarSimple, Localize("Use simpled console bar"), g_Config.m_ClConsoleBarSimple, &Button))
+			g_Config.m_ClConsoleBarSimple ^= 1;
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Right, Localize("Local console color"),
+			&g_Config.m_ScLocalConsoleColor,
+			ColorRGBA(0.2f, 0.2f, 0.2f),
+			false);
+
+		DoLine_ColorPicker(&s_aResetIDs[i++],
+			ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+			&Right, Localize("Remote console color"),
+			&g_Config.m_ScRemoteConsoleColor,
+			ColorRGBA(0.4f, 0.2f, 0.2f),
+			false);
+
+		if(g_Config.m_ClConsoleBarSimple == 1)
+		{
+			DoLine_ColorPicker(&s_aResetIDs[i++],
+				ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing,
+				&Right, Localize("Simpled console bar color"),
+				&g_Config.m_ScConsoleBarColor,
+				ColorRGBA(8883654),
+				false);
+		}
+
+		Right.HSplitTop(20.f, &Button, &Right);
+		UI()->DoScrollbarOption(&g_Config.m_ClLocalConsolaAlpha, &g_Config.m_ClLocalConsolaAlpha, &Button, Localize("Local Console Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+		Right.HSplitTop(20.f, &Button, &Right);
+		UI()->DoScrollbarOption(&g_Config.m_ClRemoteConsolaAlpha, &g_Config.m_ClRemoteConsolaAlpha, &Button, Localize("Remote Console Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+		Right.HSplitTop(30.f, &Label, &Right);
+
+		TextRender()->TextColor(col);
+		UI()->DoLabel(&Label, Localize("Better Animation"), 20.0f, TEXTALIGN_TC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		// feets
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAnimFeetSpeed, Localize("Enable Feet LERP"), g_Config.m_ClAnimFeetSpeed < 100, &Button))
+			g_Config.m_ClAnimFeetSpeed = g_Config.m_ClAnimFeetSpeed < 100 ? 100 : 1;
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(g_Config.m_ClAnimFeetSpeed > 0 && g_Config.m_ClAnimFeetSpeed < 100)
+			UI()->DoScrollbarOption(&g_Config.m_ClAnimFeetSpeed, &g_Config.m_ClAnimFeetSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+		// guns
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAnimGunsSpeed, Localize("Enable Guns LERP"), g_Config.m_ClAnimGunsSpeed < 100, &Button))
+			g_Config.m_ClAnimGunsSpeed = g_Config.m_ClAnimGunsSpeed < 100 ? 100 : 1;
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(g_Config.m_ClAnimGunsSpeed > 0 && g_Config.m_ClAnimGunsSpeed < 100)
+			UI()->DoScrollbarOption(&g_Config.m_ClAnimGunsSpeed, &g_Config.m_ClAnimGunsSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+		// hammer
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAnimHammerSpeed, Localize("Enable Hammer LERP"), g_Config.m_ClAnimHammerSpeed < 100, &Button))
+			g_Config.m_ClAnimHammerSpeed = g_Config.m_ClAnimHammerSpeed < 100 ? 100 : 1;
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(g_Config.m_ClAnimHammerSpeed > 0 && g_Config.m_ClAnimHammerSpeed < 100)
+			UI()->DoScrollbarOption(&g_Config.m_ClAnimHammerSpeed, &g_Config.m_ClAnimHammerSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+		// ninja
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAnimNinjaSpeed, Localize("Enable Ninja LERP"), g_Config.m_ClAnimNinjaSpeed < 100, &Button))
+			g_Config.m_ClAnimNinjaSpeed = g_Config.m_ClAnimNinjaSpeed < 100 ? 100 : 1;
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(g_Config.m_ClAnimNinjaSpeed > 0 && g_Config.m_ClAnimNinjaSpeed < 100)
+			UI()->DoScrollbarOption(&g_Config.m_ClAnimNinjaSpeed, &g_Config.m_ClAnimNinjaSpeed, &Button, Localize("LERP speed"), 1, 99, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+	}
+	if(s_CurTab == STA_TAB_PAGE3)
+	{
+		Left.HSplitTop(25.f, &Label, &Left);
+		UI()->DoLabel(&Label, Localize("Why are you looking right here?:o"), 20.f, TEXTALIGN_ML);
+	}
+}
+void CMenus::RenderSettingsProfiles(CUIRect MainView)
+{
+	CUIRect Label, LabelMid, Section, LabelRight;
+	static int SelectedProfile = -1;
+
+	const float LineMargin = 22.0f;
+	char *pSkinName = g_Config.m_ClPlayerSkin;
+	int *pUseCustomColor = &g_Config.m_ClPlayerUseCustomColor;
+	unsigned *pColorBody = &g_Config.m_ClPlayerColorBody;
+	unsigned *pColorFeet = &g_Config.m_ClPlayerColorFeet;
+	int CurrentFlag = m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry;
+
+	if(m_Dummy)
+	{
+		pSkinName = g_Config.m_ClDummySkin;
+		pUseCustomColor = &g_Config.m_ClDummyUseCustomColor;
+		pColorBody = &g_Config.m_ClDummyColorBody;
+		pColorFeet = &g_Config.m_ClDummyColorFeet;
+	}
+
+	// skin info
+	CTeeRenderInfo OwnSkinInfo;
+	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
+	OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
+	OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
+	if(*pUseCustomColor)
+	{
+		OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(*pColorBody).UnclampLighting());
+		OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(*pColorFeet).UnclampLighting());
+	}
+	else
+	{
+		OwnSkinInfo.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
+		OwnSkinInfo.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
+	}
+	OwnSkinInfo.m_Size = 50.0f;
+
+	//======YOUR PROFILE======
+	MainView.HSplitTop(10.0f, &Label, &MainView);
+	char aTempBuf[256];
+	str_format(aTempBuf, sizeof(aTempBuf), "%s:", Localize("PlayerAsset"));
+	UI()->DoLabel(&Label, aTempBuf, 14.0f, TEXTALIGN_LEFT);
+
+	MainView.HSplitTop(50.0f, &Label, &MainView);
+	Label.VSplitLeft(250.0f, &Label, &LabelMid);
+	const CAnimState *pIdleState = CAnimState::GetIdle();
+	vec2 OffsetToMid;
+	RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
+	vec2 TeeRenderPos(Label.x + 20.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
+	int Emote = m_Dummy ? g_Config.m_ClDummyDefaultEyes : g_Config.m_ClPlayerDefaultEyes;
+	RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, Emote, vec2(1, 0), TeeRenderPos);
+
+	char aName[64];
+	char aClan[64];
+	str_format(aName, sizeof(aName), ("%s"), m_Dummy ? g_Config.m_ClDummyName : g_Config.m_PlayerName);
+	str_format(aClan, sizeof(aClan), ("%s"), m_Dummy ? g_Config.m_ClDummyClan : g_Config.m_PlayerClan);
+
+	CUIRect FlagRect;
+	Label.VSplitLeft(90.0, &FlagRect, &Label);
+	Label.HMargin(-5.0f, &Label);
+	Label.HSplitTop(25.0f, &Section, &Label);
+
+	str_format(aTempBuf, sizeof(aTempBuf), ("Name: %s"), aName);
+	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+	Label.HSplitTop(20.0f, &Section, &Label);
+	str_format(aTempBuf, sizeof(aTempBuf), ("Clan: %s"), aClan);
+	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+	Label.HSplitTop(20.0f, &Section, &Label);
+	str_format(aTempBuf, sizeof(aTempBuf), ("Skin: %s"), pSkinName);
+	UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+	FlagRect.VSplitRight(50, 0, &FlagRect);
+	FlagRect.HSplitBottom(25, 0, &FlagRect);
+	FlagRect.y -= 10.0f;
+	ColorRGBA Color(1.0f, 1.0f, 1.0f, 1.0f);
+	m_pClient->m_CountryFlags.Render(m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+	bool doSkin = g_Config.m_ClApplyProfileSkin;
+	bool doColors = g_Config.m_ClApplyProfileColors;
+	bool doEmote = g_Config.m_ClApplyProfileEmote;
+	bool doName = g_Config.m_ClApplyProfileName;
+	bool doClan = g_Config.m_ClApplyProfileClan;
+	bool doFlag = g_Config.m_ClApplyProfileFlag;
+
+	//======AFTER LOAD======
+	if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
+	{
+		CProfile LoadProfile = GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile];
+		MainView.HSplitTop(20.0f, 0, &MainView);
+		MainView.HSplitTop(10.0f, &Label, &MainView);
+		str_format(aTempBuf, sizeof(aTempBuf), "%s:", ("After Load"));
+		UI()->DoLabel(&Label, aTempBuf, 14.0f, TEXTALIGN_LEFT);
+
+		MainView.HSplitTop(50.0f, &Label, &MainView);
+		Label.VSplitLeft(250.0f, &Label, 0);
+
+		if(doSkin && strlen(LoadProfile.SkinName) != 0)
+		{
+			const CSkin *pLoadSkin = m_pClient->m_Skins.Find(LoadProfile.SkinName);
+			OwnSkinInfo.m_OriginalRenderSkin = pLoadSkin->m_OriginalSkin;
+			OwnSkinInfo.m_ColorableRenderSkin = pLoadSkin->m_ColorableSkin;
+			OwnSkinInfo.m_SkinMetrics = pLoadSkin->m_Metrics;
+		}
+		if(*pUseCustomColor && doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
+		{
+			OwnSkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(LoadProfile.BodyColor).UnclampLighting());
+			OwnSkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(LoadProfile.FeetColor).UnclampLighting());
+		}
+
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &OwnSkinInfo, OffsetToMid);
+		TeeRenderPos = vec2(Label.x + 20.0f, Label.y + Label.h / 2.0f + OffsetToMid.y);
+		int LoadEmote = Emote;
+		if(doEmote && LoadProfile.Emote != -1)
+			LoadEmote = LoadProfile.Emote;
+		RenderTools()->RenderTee(pIdleState, &OwnSkinInfo, LoadEmote, vec2(1, 0), TeeRenderPos);
+
+		if(doName && strlen(LoadProfile.Name) != 0)
+			str_format(aName, sizeof(aName), ("%s"), LoadProfile.Name);
+		if(doClan && strlen(LoadProfile.Clan) != 0)
+			str_format(aClan, sizeof(aClan), ("%s"), LoadProfile.Clan);
+
+		Label.VSplitLeft(90.0, &FlagRect, &Label);
+		Label.HMargin(-5.0f, &Label);
+		Label.HSplitTop(25.0f, &Section, &Label);
+
+		str_format(aTempBuf, sizeof(aTempBuf), ("Name: %s"), aName);
+		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+		Label.HSplitTop(20.0f, &Section, &Label);
+		str_format(aTempBuf, sizeof(aTempBuf), ("Clan: %s"), aClan);
+		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+		Label.HSplitTop(20.0f, &Section, &Label);
+		str_format(aTempBuf, sizeof(aTempBuf), ("Skin: %s"), (doSkin && strlen(LoadProfile.SkinName) != 0) ? LoadProfile.SkinName : pSkinName);
+		UI()->DoLabel(&Section, aTempBuf, 15.0f, TEXTALIGN_LEFT);
+
+		FlagRect.VSplitRight(50, 0, &FlagRect);
+		FlagRect.HSplitBottom(25, 0, &FlagRect);
+		FlagRect.y -= 10.0f;
+		int RenderFlag = m_Dummy ? g_Config.m_ClDummyCountry : g_Config.m_PlayerCountry;
+		if(doFlag && LoadProfile.CountryFlag != -2)
+			RenderFlag = LoadProfile.CountryFlag;
+		m_pClient->m_CountryFlags.Render(RenderFlag, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+		str_format(aName, sizeof(aName), ("%s"), m_Dummy ? g_Config.m_ClDummyName : g_Config.m_PlayerName);
+		str_format(aClan, sizeof(aClan), ("%s"), m_Dummy ? g_Config.m_ClDummyClan : g_Config.m_PlayerClan);
+	}
+	else
+	{
+		MainView.HSplitTop(80.0f, 0, &MainView);
+	}
+
+	//===BUTTONS AND CHECK BOX===
+	CUIRect DummyCheck, CustomCheck;
+	MainView.HSplitTop(30, &DummyCheck, 0);
+	DummyCheck.HSplitTop(13, 0, &DummyCheck);
+
+	DummyCheck.VSplitLeft(100, &DummyCheck, &CustomCheck);
+	CustomCheck.VSplitLeft(150, &CustomCheck, 0);
+
+	DoButton_CheckBoxAutoVMarginAndSet(&m_Dummy, Localize("Dummy"), (int *)&m_Dummy, &DummyCheck, LineMargin);
+
+	static int s_CustomColorID = 0;
+	CustomCheck.HSplitTop(LineMargin, &CustomCheck, 0);
+
+	if(DoButton_CheckBox(&s_CustomColorID, Localize("Custom colors"), *pUseCustomColor, &CustomCheck))
+	{
+		*pUseCustomColor = *pUseCustomColor ? 0 : 1;
+		SetNeedSendInfo();
+	}
+
+	LabelMid.VSplitLeft(20.0f, 0, &LabelMid);
+	LabelMid.VSplitLeft(160.0f, &LabelMid, &LabelRight);
+
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileSkin, ("Save/Load Skin"), &g_Config.m_ClApplyProfileSkin, &LabelMid, LineMargin);
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileColors, ("Save/Load Colors"), &g_Config.m_ClApplyProfileColors, &LabelMid, LineMargin);
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileEmote, ("Save/Load Emote"), &g_Config.m_ClApplyProfileEmote, &LabelMid, LineMargin);
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileName, ("Save/Load Name"), &g_Config.m_ClApplyProfileName, &LabelMid, LineMargin);
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileClan, ("Save/Load Clan"), &g_Config.m_ClApplyProfileClan, &LabelMid, LineMargin);
+	DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClApplyProfileFlag, ("Save/Load Flag"), &g_Config.m_ClApplyProfileFlag, &LabelMid, LineMargin);
+
+	CUIRect Button;
+	LabelRight.VSplitLeft(150.0f, &LabelRight, 0);
+
+	LabelRight.HSplitTop(30.0f, &Button, &LabelRight);
+	static CButtonContainer s_LoadButton;
+
+	if(DoButton_Menu(&s_LoadButton, Localize("Load"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f))
+	{
+		if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
+		{
+			CProfile LoadProfile = GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile];
+			if(!m_Dummy)
+			{
+				if(doSkin && strlen(LoadProfile.SkinName) != 0)
+					str_copy(g_Config.m_ClPlayerSkin, LoadProfile.SkinName, sizeof(g_Config.m_ClPlayerSkin));
+				if(doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
+				{
+					g_Config.m_ClPlayerColorBody = LoadProfile.BodyColor;
+					g_Config.m_ClPlayerColorFeet = LoadProfile.FeetColor;
+				}
+				if(doEmote && LoadProfile.Emote != -1)
+					g_Config.m_ClPlayerDefaultEyes = LoadProfile.Emote;
+				if(doName && strlen(LoadProfile.Name) != 0)
+					str_copy(g_Config.m_PlayerName, LoadProfile.Name, sizeof(g_Config.m_PlayerName));
+				if(doClan && strlen(LoadProfile.Clan) != 0)
+					str_copy(g_Config.m_PlayerClan, LoadProfile.Clan, sizeof(g_Config.m_PlayerClan));
+				if(doFlag && LoadProfile.CountryFlag != -2)
+					g_Config.m_PlayerCountry = LoadProfile.CountryFlag;
+			}
+			else
+			{
+				if(doSkin && strlen(LoadProfile.SkinName) != 0)
+					str_copy(g_Config.m_ClDummySkin, LoadProfile.SkinName, sizeof(g_Config.m_ClDummySkin));
+				if(doColors && LoadProfile.BodyColor != -1 && LoadProfile.FeetColor != -1)
+				{
+					g_Config.m_ClDummyColorBody = LoadProfile.BodyColor;
+					g_Config.m_ClDummyColorFeet = LoadProfile.FeetColor;
+				}
+				if(doEmote && LoadProfile.Emote != -1)
+					g_Config.m_ClDummyDefaultEyes = LoadProfile.Emote;
+				if(doName && strlen(LoadProfile.Name) != 0)
+					str_copy(g_Config.m_ClDummyName, LoadProfile.Name, sizeof(g_Config.m_ClDummyName));
+				if(doClan && strlen(LoadProfile.Clan) != 0)
+					str_copy(g_Config.m_ClDummyClan, LoadProfile.Clan, sizeof(g_Config.m_ClDummyClan));
+				if(doFlag && LoadProfile.CountryFlag != -2)
+					g_Config.m_ClDummyCountry = LoadProfile.CountryFlag;
+			}
+		}
+		SetNeedSendInfo();
+	}
+	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
+
+	LabelRight.HSplitTop(30.0f, &Button, &LabelRight);
+	static CButtonContainer s_SaveButton;
+	if(DoButton_Menu(&s_SaveButton, Localize("Save"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
+	{
+		GameClient()->m_SkinProfiles.AddProfile(
+			doColors ? *pColorBody : -1,
+			doColors ? *pColorFeet : -1,
+			doFlag ? CurrentFlag : -2,
+			doEmote ? Emote : -1,
+			doSkin ? pSkinName : "",
+			doName ? aName : "",
+			doClan ? aClan : "");
+		GameClient()->m_SkinProfiles.SaveProfiles();
+	}
+	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
+
+	static int s_AllowDelete;
+	DoButton_CheckBoxAutoVMarginAndSet(&s_AllowDelete, ("Enable Deleting"), &s_AllowDelete, &LabelRight, LineMargin);
+	LabelRight.HSplitTop(5.0f, 0, &LabelRight);
+
+	if(s_AllowDelete)
+	{
+		LabelRight.HSplitTop(28.0f, &Button, &LabelRight);
+		static CButtonContainer s_DeleteButton;
+		if(DoButton_Menu(&s_DeleteButton, Localize("Delete"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
+		{
+			if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
+			{
+				GameClient()->m_SkinProfiles.m_Profiles.erase(GameClient()->m_SkinProfiles.m_Profiles.begin() + SelectedProfile);
+				GameClient()->m_SkinProfiles.SaveProfiles();
+			}
+		}
+		LabelRight.HSplitTop(5.0f, 0, &LabelRight);
+
+		LabelRight.HSplitTop(28.0f, &Button, &LabelRight);
+		static CButtonContainer s_OverrideButton;
+		if(DoButton_Menu(&s_OverrideButton, Localize("Override"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f)))
+		{
+			if(SelectedProfile != -1 && SelectedProfile < (int)GameClient()->m_SkinProfiles.m_Profiles.size())
+			{
+				GameClient()->m_SkinProfiles.m_Profiles[SelectedProfile] = CProfile(
+					doColors ? *pColorBody : -1,
+					doColors ? *pColorFeet : -1,
+					doFlag ? CurrentFlag : -2,
+					doEmote ? Emote : -1,
+					doSkin ? pSkinName : "",
+					doName ? aName : "",
+					doClan ? aClan : "");
+				GameClient()->m_SkinProfiles.SaveProfiles();
+			}
+		}
+	}
+
+	//---RENDER THE SELECTOR---
+	CUIRect SelectorRect;
+	MainView.HSplitTop(50, 0, &SelectorRect);
+	SelectorRect.HSplitBottom(15.0, &SelectorRect, 0);
+	std::vector<CProfile> *pProfileList = &GameClient()->m_SkinProfiles.m_Profiles;
+
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(50.0f, pProfileList->size(), 4, 3, SelectedProfile, &SelectorRect, true);
+
+	static bool s_Indexs[1024];
+
+	for(size_t i = 0; i < pProfileList->size(); ++i)
+	{
+		CProfile CurrentProfile = GameClient()->m_SkinProfiles.m_Profiles[i];
+
+		char RenderSkin[24];
+		if(strlen(CurrentProfile.SkinName) == 0)
+			str_copy(RenderSkin, pSkinName, sizeof(RenderSkin));
+		else
+			str_copy(RenderSkin, CurrentProfile.SkinName, sizeof(RenderSkin));
+
+		const CSkin *pSkinToBeDraw = m_pClient->m_Skins.Find(RenderSkin);
+
+		CListboxItem Item = s_ListBox.DoNextItem(&s_Indexs[i], SelectedProfile >= 0 && (size_t)SelectedProfile == i);
+
+		if(!Item.m_Visible)
+			continue;
+
+		if(Item.m_Visible)
+		{
+			CTeeRenderInfo Info;
+			Info.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.BodyColor).UnclampLighting());
+			Info.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.FeetColor).UnclampLighting());
+			Info.m_CustomColoredSkin = 1;
+			Info.m_OriginalRenderSkin = pSkinToBeDraw->m_OriginalSkin;
+			Info.m_ColorableRenderSkin = pSkinToBeDraw->m_ColorableSkin;
+			Info.m_SkinMetrics = pSkinToBeDraw->m_Metrics;
+			Info.m_Size = 50.0f;
+			if(CurrentProfile.BodyColor == -1 && CurrentProfile.FeetColor == -1)
+			{
+				Info.m_CustomColoredSkin = m_Dummy ? g_Config.m_ClDummyUseCustomColor : g_Config.m_ClPlayerUseCustomColor;
+				Info.m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f);
+				Info.m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f);
+			}
+
+			RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Info, OffsetToMid);
+
+			int RenderEmote = CurrentProfile.Emote == -1 ? Emote : CurrentProfile.Emote;
+			TeeRenderPos = vec2(Item.m_Rect.x + 30, Item.m_Rect.y + Item.m_Rect.h / 2 + OffsetToMid.y);
+
+			Item.m_Rect.VSplitLeft(60.0f, 0, &Item.m_Rect);
+			CUIRect PlayerRect, ClanRect, FeetColorSquare, BodyColorSquare;
+
+			Item.m_Rect.VSplitLeft(60.0f, 0, &BodyColorSquare); //Delete this maybe
+
+			Item.m_Rect.VSplitRight(60.0, &BodyColorSquare, &FlagRect);
+			BodyColorSquare.x -= 11.0;
+			BodyColorSquare.VSplitLeft(10, &BodyColorSquare, 0);
+			BodyColorSquare.HSplitMid(&BodyColorSquare, &FeetColorSquare);
+			BodyColorSquare.HSplitMid(0, &BodyColorSquare);
+			FeetColorSquare.HSplitMid(&FeetColorSquare, 0);
+			FlagRect.HSplitBottom(10.0, &FlagRect, 0);
+			FlagRect.HSplitTop(10.0, 0, &FlagRect);
+
+			Item.m_Rect.HSplitMid(&PlayerRect, &ClanRect);
+
+			SLabelProperties Props;
+			Props.m_MaxWidth = Item.m_Rect.w;
+			if(CurrentProfile.CountryFlag != -2)
+				m_pClient->m_CountryFlags.Render(CurrentProfile.CountryFlag, Color, FlagRect.x, FlagRect.y, FlagRect.w, FlagRect.h);
+
+			if(CurrentProfile.BodyColor != -1 && CurrentProfile.FeetColor != -1)
+			{
+				ColorRGBA BodyColor = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.BodyColor).UnclampLighting());
+				ColorRGBA FeetColor = color_cast<ColorRGBA>(ColorHSLA(CurrentProfile.FeetColor).UnclampLighting());
+
+				Graphics()->TextureClear();
+				Graphics()->QuadsBegin();
+				Graphics()->SetColor(BodyColor.r, BodyColor.g, BodyColor.b, 1.0f);
+				IGraphics::CQuadItem Quads[2];
+				Quads[0] = IGraphics::CQuadItem(BodyColorSquare.x, BodyColorSquare.y, BodyColorSquare.w, BodyColorSquare.h);
+				Graphics()->QuadsDrawTL(&Quads[0], 1);
+				Graphics()->SetColor(FeetColor.r, FeetColor.g, FeetColor.b, 1.0f);
+				Quads[1] = IGraphics::CQuadItem(FeetColorSquare.x, FeetColorSquare.y, FeetColorSquare.w, FeetColorSquare.h);
+				Graphics()->QuadsDrawTL(&Quads[1], 1);
+				Graphics()->QuadsEnd();
+			}
+			RenderTools()->RenderTee(pIdleState, &Info, RenderEmote, vec2(1.0f, 0.0f), TeeRenderPos);
+
+			if(strlen(CurrentProfile.Name) == 0 && strlen(CurrentProfile.Clan) == 0)
+			{
+				PlayerRect = Item.m_Rect;
+				UI()->DoLabel(&PlayerRect, CurrentProfile.SkinName, 12.0f, TEXTALIGN_LEFT, Props);
+			}
+			else
+			{
+				UI()->DoLabel(&PlayerRect, CurrentProfile.Name, 12.0f, TEXTALIGN_LEFT, Props);
+				Item.m_Rect.HSplitTop(20.0f, 0, &Item.m_Rect);
+				Props.m_MaxWidth = Item.m_Rect.w;
+				UI()->DoLabel(&ClanRect, CurrentProfile.Clan, 12.0f, TEXTALIGN_LEFT, Props);
+			}
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(SelectedProfile != NewSelected)
+	{
+		SelectedProfile = NewSelected;
+	}
+	static CButtonContainer s_ProfilesFile;
+	CUIRect FileButton;
+	MainView.HSplitBottom(25.0, 0, &FileButton);
+	FileButton.y += 15.0;
+	FileButton.VSplitLeft(130.0, &FileButton, 0);
+	if(DoButton_Menu(&s_ProfilesFile, Localize("Profiles file"), 0, &FileButton))
+	{
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, PROFILES_FILE, aTempBuf, sizeof(aTempBuf));
+		if(!open_file(aTempBuf))
+		{
+			dbg_msg("menus", "couldn't open file");
+		}
+	}
+}
+void CMenus::RenderSettingsDDNet(CUIRect MainView)
+{
+	CUIRect Button, Left, Right, LeftLeft, Label;
+
+#if defined(CONF_AUTOUPDATE)
+	CUIRect UpdaterRect;
+	MainView.HSplitBottom(20.0f, &MainView, &UpdaterRect);
+	MainView.HSplitBottom(5.0f, &MainView, nullptr);
+#endif
+
+	// demo
+	CUIRect Demo;
+	MainView.HSplitTop(110.0f, &Demo, &MainView);
+	Demo.HSplitTop(30.0f, &Label, &Demo);
+	UI()->DoLabel(&Label, Localize("Demo"), 20.0f, TEXTALIGN_ML);
+	Label.VSplitMid(nullptr, &Label, 20.0f);
+	UI()->DoLabel(&Label, Localize("Ghost"), 20.0f, TEXTALIGN_ML);
+
+	Demo.HSplitTop(5.0f, nullptr, &Demo);
+	Demo.VSplitMid(&Left, &Right, 20.0f);
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	if(DoButton_CheckBox(&g_Config.m_ClAutoRaceRecord, Localize("Save the best demo of each race"), g_Config.m_ClAutoRaceRecord, &Button))
+	{
+		g_Config.m_ClAutoRaceRecord ^= 1;
+	}
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	if(DoButton_CheckBox(&g_Config.m_ClReplays, Localize("Enable replays"), g_Config.m_ClReplays, &Button))
+	{
+		g_Config.m_ClReplays ^= 1;
+		if(!g_Config.m_ClReplays)
+		{
+			// stop recording and remove the tmp demo file
+			Client()->DemoRecorder_Stop(RECORDER_REPLAYS, true);
+		}
+		else
+		{
+			// start recording
+			Client()->DemoRecorder_HandleAutoStart();
+		}
+	}
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	if(g_Config.m_ClReplays)
+		UI()->DoScrollbarOption(&g_Config.m_ClReplayLength, &g_Config.m_ClReplayLength, &Button, Localize("Default length"), 10, 600, &CUI::ms_LinearScrollbarScale, CUI::SCROLLBAR_OPTION_NOCLAMPVALUE);
+
+	Right.HSplitTop(20.0f, &Button, &Right);
+	if(DoButton_CheckBox(&g_Config.m_ClRaceGhost, Localize("Enable ghost"), g_Config.m_ClRaceGhost, &Button))
+	{
+		g_Config.m_ClRaceGhost ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClRaceGhost, &Button, Localize("When you cross the start line, show a ghost tee replicating the movements of your best time"));
+
+	if(g_Config.m_ClRaceGhost)
+	{
+		Right.HSplitTop(20.0f, &Button, &Right);
+		Button.VSplitMid(&LeftLeft, &Button);
+		if(DoButton_CheckBox(&g_Config.m_ClRaceShowGhost, Localize("Show ghost"), g_Config.m_ClRaceShowGhost, &LeftLeft))
+		{
+			g_Config.m_ClRaceShowGhost ^= 1;
+		}
+		UI()->DoScrollbarOption(&g_Config.m_ClRaceGhostAlpha, &g_Config.m_ClRaceGhostAlpha, &Button, Localize("Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClRaceSaveGhost, Localize("Save ghost"), g_Config.m_ClRaceSaveGhost, &Button))
+		{
+			g_Config.m_ClRaceSaveGhost ^= 1;
+		}
+
+		if(g_Config.m_ClRaceSaveGhost)
+		{
+			Right.HSplitTop(20.0f, &Button, &Right);
+			if(DoButton_CheckBox(&g_Config.m_ClRaceGhostSaveBest, Localize("Only save improvements"), g_Config.m_ClRaceGhostSaveBest, &Button))
+			{
+				g_Config.m_ClRaceGhostSaveBest ^= 1;
+			}
+		}
+	}
+
+	// gameplay
+	CUIRect Gameplay;
+	MainView.HSplitTop(150.0f, &Gameplay, &MainView);
+	Gameplay.HSplitTop(30.0f, &Label, &Gameplay);
+	UI()->DoLabel(&Label, Localize("Gameplay"), 20.0f, TEXTALIGN_ML);
+	Gameplay.HSplitTop(5.0f, nullptr, &Gameplay);
+	Gameplay.VSplitMid(&Left, &Right, 20.0f);
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	UI()->DoScrollbarOption(&g_Config.m_ClOverlayEntities, &g_Config.m_ClOverlayEntities, &Button, Localize("Overlay entities"), 0, 100);
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	Button.VSplitMid(&LeftLeft, &Button);
+
+	if(DoButton_CheckBox(&g_Config.m_ClTextEntities, Localize("Show text entities"), g_Config.m_ClTextEntities, &LeftLeft))
+		g_Config.m_ClTextEntities ^= 1;
+
+	if(g_Config.m_ClTextEntities)
+	{
+		int PreviousSize = g_Config.m_ClTextEntitiesSize;
+		UI()->DoScrollbarOption(&g_Config.m_ClTextEntitiesSize, &g_Config.m_ClTextEntitiesSize, &Button, Localize("Size"), 0, 100);
+
+		if(PreviousSize != g_Config.m_ClTextEntitiesSize)
+			m_pClient->m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
+	}
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	Button.VSplitMid(&LeftLeft, &Button);
+
+	if(DoButton_CheckBox(&g_Config.m_ClShowOthers, Localize("Show others"), g_Config.m_ClShowOthers == SHOW_OTHERS_ON, &LeftLeft))
+		g_Config.m_ClShowOthers = g_Config.m_ClShowOthers != SHOW_OTHERS_ON ? SHOW_OTHERS_ON : SHOW_OTHERS_OFF;
+
+	UI()->DoScrollbarOption(&g_Config.m_ClShowOthersAlpha, &g_Config.m_ClShowOthersAlpha, &Button, Localize("Opacity"), 0, 100, &CUI::ms_LinearScrollbarScale, 0u, "%");
+
+	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClShowOthersAlpha, &Button, Localize("Adjust the opacity of entities belonging to other teams, such as tees and nameplates"));
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	static int s_ShowOwnTeamID = 0;
+	if(DoButton_CheckBox(&s_ShowOwnTeamID, Localize("Show others (own team only)"), g_Config.m_ClShowOthers == SHOW_OTHERS_ONLY_TEAM, &Button))
+	{
+		g_Config.m_ClShowOthers = g_Config.m_ClShowOthers != SHOW_OTHERS_ONLY_TEAM ? SHOW_OTHERS_ONLY_TEAM : SHOW_OTHERS_OFF;
+	}
+
+	Left.HSplitTop(20.0f, &Button, &Left);
+	if(DoButton_CheckBox(&g_Config.m_ClShowQuads, Localize("Show quads"), g_Config.m_ClShowQuads, &Button))
+	{
+		g_Config.m_ClShowQuads ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClShowQuads, &Button, Localize("Quads are used for background decoration"));
+
+	Right.HSplitTop(20.0f, &Button, &Right);
+	int PreviousZoom = g_Config.m_ClDefaultZoom;
+	UI()->DoScrollbarOption(&g_Config.m_ClDefaultZoom, &g_Config.m_ClDefaultZoom, &Button, Localize("Default zoom"), 0, 20);
+	if(PreviousZoom != g_Config.m_ClDefaultZoom)
+		m_pClient->m_Camera.SetZoom(std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10), g_Config.m_ClSmoothZoomTime);
+
+	Right.HSplitTop(20.0f, &Button, &Right);
+	if(DoButton_CheckBox(&g_Config.m_ClAntiPing, Localize("AntiPing"), g_Config.m_ClAntiPing, &Button))
+	{
+		g_Config.m_ClAntiPing ^= 1;
+	}
+	GameClient()->m_Tooltips.DoToolTip(&g_Config.m_ClAntiPing, &Button, Localize("Tries to predict other entities to give a feel of low latency"));
+
+	if(g_Config.m_ClAntiPing)
+	{
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAntiPingPlayers, Localize("AntiPing: predict other players"), g_Config.m_ClAntiPingPlayers, &Button))
+		{
+			g_Config.m_ClAntiPingPlayers ^= 1;
+		}
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAntiPingWeapons, Localize("AntiPing: predict weapons"), g_Config.m_ClAntiPingWeapons, &Button))
+		{
+			g_Config.m_ClAntiPingWeapons ^= 1;
+		}
+
+		Right.HSplitTop(20.0f, &Button, &Right);
+		if(DoButton_CheckBox(&g_Config.m_ClAntiPingGrenade, Localize("AntiPing: predict grenade paths"), g_Config.m_ClAntiPingGrenade, &Button))
+		{
+			g_Config.m_ClAntiPingGrenade ^= 1;
+		}
+	}
+
+	CUIRect Background, Miscellaneous;
+	MainView.VSplitMid(&Background, &Miscellaneous, 20.0f);
+
+	// background
+	Background.HSplitTop(30.0f, &Label, &Background);
+	Background.HSplitTop(5.0f, nullptr, &Background);
+	UI()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML);
+
+	ColorRGBA GreyDefault(0.5f, 0.5f, 0.5f, 1);
+
+	static CButtonContainer s_ResetID1;
+	DoLine_ColorPicker(&s_ResetID1, 25.0f, 13.0f, 5.0f, &Background, Localize("Regular background color"), &g_Config.m_ClBackgroundColor, GreyDefault, false);
+
+	static CButtonContainer s_ResetID2;
+	DoLine_ColorPicker(&s_ResetID2, 25.0f, 13.0f, 5.0f, &Background, Localize("Entities background color"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false);
+
+	CUIRect EditBox;
+	Background.HSplitTop(20.0f, &Label, &Background);
+	Background.HSplitTop(2.0f, nullptr, &Background);
+	Label.VSplitLeft(100.0f, &Label, &EditBox);
+	EditBox.VSplitRight(100.0f, &EditBox, &Button);
+	EditBox.VSplitRight(5.0f, &EditBox, nullptr);
+
+	UI()->DoLabel(&Label, Localize("Map"), 14.0f, TEXTALIGN_ML);
+
+	static CLineInput s_BackgroundEntitiesInput(g_Config.m_ClBackgroundEntities, sizeof(g_Config.m_ClBackgroundEntities));
+	UI()->DoEditBox(&s_BackgroundEntitiesInput, &EditBox, 14.0f);
+
+	static CButtonContainer s_BackgroundEntitiesReloadButton;
+	if(DoButton_Menu(&s_BackgroundEntitiesReloadButton, Localize("Reload"), 0, &Button))
+	{
+		if(str_comp(g_Config.m_ClBackgroundEntities, m_pClient->m_Background.MapName()) != 0)
+			m_pClient->m_Background.LoadBackground();
+	}
+
+	Background.HSplitTop(20.0f, &Button, &Background);
+	const bool UseCurrentMap = str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0;
+	static int s_UseCurrentMapID = 0;
+	if(DoButton_CheckBox(&s_UseCurrentMapID, Localize("Use current map as background"), UseCurrentMap, &Button))
+	{
+		if(UseCurrentMap)
+			g_Config.m_ClBackgroundEntities[0] = '\0';
+		else
+			str_copy(g_Config.m_ClBackgroundEntities, CURRENT_MAP);
+		m_pClient->m_Background.LoadBackground();
+	}
+
+	Background.HSplitTop(20.0f, &Button, &Background);
+	if(DoButton_CheckBox(&g_Config.m_ClBackgroundShowTilesLayers, Localize("Show tiles layers from BG map"), g_Config.m_ClBackgroundShowTilesLayers, &Button))
+		g_Config.m_ClBackgroundShowTilesLayers ^= 1;
+
+	// miscellaneous
+	Miscellaneous.HSplitTop(30.0f, &Label, &Miscellaneous);
+	Miscellaneous.HSplitTop(5.0f, nullptr, &Miscellaneous);
+
+	UI()->DoLabel(&Label, Localize("Miscellaneous"), 20.0f, TEXTALIGN_ML);
+
+	static CButtonContainer s_ButtonTimeout;
+	Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
+	if(DoButton_Menu(&s_ButtonTimeout, Localize("New random timeout code"), 0, &Button))
+	{
+		Client()->GenerateTimeoutSeed();
+	}
+
+	Miscellaneous.HSplitTop(5.0f, nullptr, &Miscellaneous);
+	Miscellaneous.HSplitTop(20.0f, &Label, &Miscellaneous);
+	Miscellaneous.HSplitTop(2.0f, nullptr, &Miscellaneous);
+	UI()->DoLabel(&Label, Localize("Run on join"), 14.0f, TEXTALIGN_ML);
+	Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
+	static CLineInput s_RunOnJoinInput(g_Config.m_ClRunOnJoin, sizeof(g_Config.m_ClRunOnJoin));
+	s_RunOnJoinInput.SetEmptyText(Localize("Chat command (e.g. showall 1)"));
+	UI()->DoEditBox(&s_RunOnJoinInput, &Button, 14.0f);
+
+#if defined(CONF_FAMILY_WINDOWS)
+	static CButtonContainer s_ButtonUnregisterShell;
+	Miscellaneous.HSplitTop(10.0f, nullptr, &Miscellaneous);
+	Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
+	if(DoButton_Menu(&s_ButtonUnregisterShell, Localize("Unregister protocol and file extensions"), 0, &Button))
+	{
+		Client()->ShellUnregister();
+	}
+#endif
+
+	// Updater
+#if defined(CONF_AUTOUPDATE)
+	{
+		bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
+		int State = Updater()->GetCurrentState();
+
+		// Update Button
+		char aBuf[256];
+		if(NeedUpdate && State <= IUpdater::CLEAN)
+		{
+			str_format(aBuf, sizeof(aBuf), Localize("DDNet %s is available:"), Client()->LatestVersion());
+			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
+			Button.VSplitLeft(100.0f, &Button, nullptr);
+			static CButtonContainer s_ButtonUpdate;
+			if(DoButton_Menu(&s_ButtonUpdate, Localize("Update now"), 0, &Button))
+			{
+				Updater()->InitiateUpdate();
+			}
+		}
+		else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
+			str_format(aBuf, sizeof(aBuf), Localize("Updating..."));
+		else if(State == IUpdater::NEED_RESTART)
+		{
+			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
+			m_NeedRestartUpdate = true;
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), Localize("No updates available"));
+			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
+			Button.VSplitLeft(100.0f, &Button, nullptr);
+			static CButtonContainer s_ButtonUpdate;
+			if(DoButton_Menu(&s_ButtonUpdate, Localize("Check now"), 0, &Button))
+			{
+				Client()->RequestDDNetInfo();
+			}
+		}
+		UI()->DoLabel(&UpdaterRect, aBuf, 14.0f, TEXTALIGN_ML);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+#endif
+}
diff --git a/src_bkp/game/client/components/menus_settings_assets.cpp b/src_bkp/game/client/components/menus_settings_assets.cpp
new file mode 100644
index 0000000000..e0ff5a4081
--- /dev/null
+++ b/src_bkp/game/client/components/menus_settings_assets.cpp
@@ -0,0 +1,758 @@
+#include <base/system.h>
+
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/ui_listbox.h>
+#include <game/localization.h>
+
+#include "menus.h"
+
+#include <chrono>
+
+using namespace FontIcons;
+using namespace std::chrono_literals;
+
+typedef std::function<void()> TMenuAssetScanLoadedFunc;
+
+struct SMenuAssetScanUser
+{
+	void *m_pUser;
+	TMenuAssetScanLoadedFunc m_LoadedFunc;
+};
+
+// IDs of the tabs in the Assets menu
+enum
+{
+	ASSETS_TAB_ENTITIES = 0,
+	ASSETS_TAB_GAME = 1,
+	ASSETS_TAB_EMOTICONS = 2,
+	ASSETS_TAB_PARTICLES = 3,
+	ASSETS_TAB_HUD = 4,
+	ASSETS_TAB_EXTRAS = 5,
+	NUMBER_OF_ASSETS_TABS = 6,
+};
+
+void CMenus::LoadEntities(SCustomEntities *pEntitiesItem, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	if(str_comp(pEntitiesItem->m_aName, "default") == 0)
+	{
+		for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT; ++i)
+		{
+			str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[i]);
+			pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTexture(aPath, IStorage::TYPE_ALL);
+			if(!pEntitiesItem->m_RenderTexture.IsValid() || pEntitiesItem->m_RenderTexture.IsNullTexture())
+				pEntitiesItem->m_RenderTexture = pEntitiesItem->m_aImages[i].m_Texture;
+		}
+	}
+	else
+	{
+		for(int i = 0; i < MAP_IMAGE_MOD_TYPE_COUNT; ++i)
+		{
+			str_format(aPath, sizeof(aPath), "assets/entities/%s/%s.png", pEntitiesItem->m_aName, gs_apModEntitiesNames[i]);
+			pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTexture(aPath, IStorage::TYPE_ALL);
+			if(pEntitiesItem->m_aImages[i].m_Texture.IsNullTexture())
+			{
+				str_format(aPath, sizeof(aPath), "assets/entities/%s.png", pEntitiesItem->m_aName);
+				pEntitiesItem->m_aImages[i].m_Texture = pThis->Graphics()->LoadTexture(aPath, IStorage::TYPE_ALL);
+			}
+			if(!pEntitiesItem->m_RenderTexture.IsValid() || pEntitiesItem->m_RenderTexture.IsNullTexture())
+				pEntitiesItem->m_RenderTexture = pEntitiesItem->m_aImages[i].m_Texture;
+		}
+	}
+}
+
+int CMenus::EntitiesScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	if(IsDir)
+	{
+		if(pName[0] == '.')
+			return 0;
+
+		// default is reserved
+		if(str_comp(pName, "default") == 0)
+			return 0;
+
+		SCustomEntities EntitiesItem;
+		str_copy(EntitiesItem.m_aName, pName);
+		CMenus::LoadEntities(&EntitiesItem, pUser);
+		pThis->m_vEntitiesList.push_back(EntitiesItem);
+	}
+	else
+	{
+		if(str_endswith(pName, ".png"))
+		{
+			char aName[IO_MAX_PATH_LENGTH];
+			str_truncate(aName, sizeof(aName), pName, str_length(pName) - 4);
+			// default is reserved
+			if(str_comp(aName, "default") == 0)
+				return 0;
+
+			SCustomEntities EntitiesItem;
+			str_copy(EntitiesItem.m_aName, aName);
+			CMenus::LoadEntities(&EntitiesItem, pUser);
+			pThis->m_vEntitiesList.push_back(EntitiesItem);
+		}
+	}
+
+	pRealUser->m_LoadedFunc();
+
+	return 0;
+}
+
+template<typename TName>
+static void LoadAsset(TName *pAssetItem, const char *pAssetName, IGraphics *pGraphics)
+{
+	char aPath[IO_MAX_PATH_LENGTH];
+	if(str_comp(pAssetItem->m_aName, "default") == 0)
+	{
+		str_format(aPath, sizeof(aPath), "%s.png", pAssetName);
+		pAssetItem->m_RenderTexture = pGraphics->LoadTexture(aPath, IStorage::TYPE_ALL);
+	}
+	else
+	{
+		str_format(aPath, sizeof(aPath), "assets/%s/%s.png", pAssetName, pAssetItem->m_aName);
+		pAssetItem->m_RenderTexture = pGraphics->LoadTexture(aPath, IStorage::TYPE_ALL);
+		if(pAssetItem->m_RenderTexture.IsNullTexture())
+		{
+			str_format(aPath, sizeof(aPath), "assets/%s/%s/%s.png", pAssetName, pAssetItem->m_aName, pAssetName);
+			pAssetItem->m_RenderTexture = pGraphics->LoadTexture(aPath, IStorage::TYPE_ALL);
+		}
+	}
+}
+
+template<typename TName>
+static int AssetScan(const char *pName, int IsDir, int DirType, std::vector<TName> &vAssetList, const char *pAssetName, IGraphics *pGraphics, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	if(IsDir)
+	{
+		if(pName[0] == '.')
+			return 0;
+
+		// default is reserved
+		if(str_comp(pName, "default") == 0)
+			return 0;
+
+		TName AssetItem;
+		str_copy(AssetItem.m_aName, pName);
+		LoadAsset(&AssetItem, pAssetName, pGraphics);
+		vAssetList.push_back(AssetItem);
+	}
+	else
+	{
+		if(str_endswith(pName, ".png"))
+		{
+			char aName[IO_MAX_PATH_LENGTH];
+			str_truncate(aName, sizeof(aName), pName, str_length(pName) - 4);
+			// default is reserved
+			if(str_comp(aName, "default") == 0)
+				return 0;
+
+			TName AssetItem;
+			str_copy(AssetItem.m_aName, aName);
+			LoadAsset(&AssetItem, pAssetName, pGraphics);
+			vAssetList.push_back(AssetItem);
+		}
+	}
+
+	pRealUser->m_LoadedFunc();
+
+	return 0;
+}
+
+int CMenus::GameScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	IGraphics *pGraphics = pThis->Graphics();
+	return AssetScan(pName, IsDir, DirType, pThis->m_vGameList, "game", pGraphics, pUser);
+}
+
+int CMenus::EmoticonsScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	IGraphics *pGraphics = pThis->Graphics();
+	return AssetScan(pName, IsDir, DirType, pThis->m_vEmoticonList, "emoticons", pGraphics, pUser);
+}
+
+int CMenus::ParticlesScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	IGraphics *pGraphics = pThis->Graphics();
+	return AssetScan(pName, IsDir, DirType, pThis->m_vParticlesList, "particles", pGraphics, pUser);
+}
+
+int CMenus::HudScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	IGraphics *pGraphics = pThis->Graphics();
+	return AssetScan(pName, IsDir, DirType, pThis->m_vHudList, "hud", pGraphics, pUser);
+}
+
+int CMenus::ExtrasScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pRealUser = (SMenuAssetScanUser *)pUser;
+	auto *pThis = (CMenus *)pRealUser->m_pUser;
+	IGraphics *pGraphics = pThis->Graphics();
+	return AssetScan(pName, IsDir, DirType, pThis->m_vExtrasList, "extras", pGraphics, pUser);
+}
+
+static std::vector<const CMenus::SCustomEntities *> gs_vpSearchEntitiesList;
+static std::vector<const CMenus::SCustomGame *> gs_vpSearchGamesList;
+static std::vector<const CMenus::SCustomEmoticon *> gs_vpSearchEmoticonsList;
+static std::vector<const CMenus::SCustomParticle *> gs_vpSearchParticlesList;
+static std::vector<const CMenus::SCustomHud *> gs_vpSearchHudList;
+static std::vector<const CMenus::SCustomExtras *> gs_vpSearchExtrasList;
+
+static bool gs_aInitCustomList[NUMBER_OF_ASSETS_TABS] = {
+	true,
+};
+
+static size_t gs_aCustomListSize[NUMBER_OF_ASSETS_TABS] = {
+	0,
+};
+
+static CLineInputBuffered<64> s_aFilterInputs[NUMBER_OF_ASSETS_TABS];
+
+static int s_CurCustomTab = ASSETS_TAB_ENTITIES;
+
+static const CMenus::SCustomItem *GetCustomItem(int CurTab, size_t Index)
+{
+	if(CurTab == ASSETS_TAB_ENTITIES)
+		return gs_vpSearchEntitiesList[Index];
+	else if(CurTab == ASSETS_TAB_GAME)
+		return gs_vpSearchGamesList[Index];
+	else if(CurTab == ASSETS_TAB_EMOTICONS)
+		return gs_vpSearchEmoticonsList[Index];
+	else if(CurTab == ASSETS_TAB_PARTICLES)
+		return gs_vpSearchParticlesList[Index];
+	else if(CurTab == ASSETS_TAB_HUD)
+		return gs_vpSearchHudList[Index];
+	else if(CurTab == ASSETS_TAB_EXTRAS)
+		return gs_vpSearchExtrasList[Index];
+
+	return NULL;
+}
+
+template<typename TName>
+void ClearAssetList(std::vector<TName> &vList, IGraphics *pGraphics)
+{
+	for(size_t i = 0; i < vList.size(); ++i)
+	{
+		if(vList[i].m_RenderTexture.IsValid())
+			pGraphics->UnloadTexture(&(vList[i].m_RenderTexture));
+		vList[i].m_RenderTexture = IGraphics::CTextureHandle();
+	}
+	vList.clear();
+}
+
+void CMenus::ClearCustomItems(int CurTab)
+{
+	if(CurTab == ASSETS_TAB_ENTITIES)
+	{
+		for(auto &Entity : m_vEntitiesList)
+		{
+			for(auto &Image : Entity.m_aImages)
+			{
+				if(Image.m_Texture.IsValid())
+					Graphics()->UnloadTexture(&Image.m_Texture);
+				Image.m_Texture = IGraphics::CTextureHandle();
+			}
+		}
+		m_vEntitiesList.clear();
+
+		// reload current entities
+		m_pClient->m_MapImages.ChangeEntitiesPath(g_Config.m_ClAssetsEntities);
+	}
+	else if(CurTab == ASSETS_TAB_GAME)
+	{
+		ClearAssetList(m_vGameList, Graphics());
+
+		// reload current game skin
+		GameClient()->LoadGameSkin(g_Config.m_ClAssetGame);
+	}
+	else if(CurTab == ASSETS_TAB_EMOTICONS)
+	{
+		ClearAssetList(m_vEmoticonList, Graphics());
+
+		// reload current emoticons skin
+		GameClient()->LoadEmoticonsSkin(g_Config.m_ClAssetEmoticons);
+	}
+	else if(CurTab == ASSETS_TAB_PARTICLES)
+	{
+		ClearAssetList(m_vParticlesList, Graphics());
+
+		// reload current particles skin
+		GameClient()->LoadParticlesSkin(g_Config.m_ClAssetParticles);
+	}
+	else if(CurTab == ASSETS_TAB_HUD)
+	{
+		ClearAssetList(m_vHudList, Graphics());
+
+		// reload current hud skin
+		GameClient()->LoadHudSkin(g_Config.m_ClAssetHud);
+	}
+	else if(CurTab == ASSETS_TAB_EXTRAS)
+	{
+		ClearAssetList(m_vExtrasList, Graphics());
+
+		// reload current DDNet particles skin
+		GameClient()->LoadExtrasSkin(g_Config.m_ClAssetExtras);
+	}
+	gs_aInitCustomList[CurTab] = true;
+}
+
+template<typename TName, typename TCaller>
+void InitAssetList(std::vector<TName> &vAssetList, const char *pAssetPath, const char *pAssetName, FS_LISTDIR_CALLBACK pfnCallback, IGraphics *pGraphics, IStorage *pStorage, TCaller Caller)
+{
+	if(vAssetList.empty())
+	{
+		TName AssetItem;
+		str_copy(AssetItem.m_aName, "default");
+		LoadAsset(&AssetItem, pAssetName, pGraphics);
+		vAssetList.push_back(AssetItem);
+
+		// load assets
+		pStorage->ListDirectory(IStorage::TYPE_ALL, pAssetPath, pfnCallback, Caller);
+		std::sort(vAssetList.begin(), vAssetList.end());
+	}
+	if(vAssetList.size() != gs_aCustomListSize[s_CurCustomTab])
+		gs_aInitCustomList[s_CurCustomTab] = true;
+}
+
+template<typename TName>
+int InitSearchList(std::vector<const TName *> &vpSearchList, std::vector<TName> &vAssetList)
+{
+	vpSearchList.clear();
+	int ListSize = vAssetList.size();
+	for(int i = 0; i < ListSize; ++i)
+	{
+		const TName *pAsset = &vAssetList[i];
+
+		// filter quick search
+		if(!s_aFilterInputs[s_CurCustomTab].IsEmpty() && !str_utf8_find_nocase(pAsset->m_aName, s_aFilterInputs[s_CurCustomTab].GetString()))
+			continue;
+
+		vpSearchList.push_back(pAsset);
+	}
+	return vAssetList.size();
+}
+
+void CMenus::RenderSettingsCustom(CUIRect MainView)
+{
+	CUIRect TabBar, CustomList, QuickSearch, QuickSearchClearButton, DirectoryButton, Page1Tab, Page2Tab, Page3Tab, Page4Tab, Page5Tab, Page6Tab, ReloadButton;
+
+	MainView.HSplitTop(20, &TabBar, &MainView);
+	float TabsW = TabBar.w;
+	TabBar.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page1Tab, &Page2Tab);
+	Page2Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page2Tab, &Page3Tab);
+	Page3Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page3Tab, &Page4Tab);
+	Page4Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page4Tab, &Page5Tab);
+	Page5Tab.VSplitLeft(TabsW / NUMBER_OF_ASSETS_TABS, &Page5Tab, &Page6Tab);
+
+	static CButtonContainer s_aPageTabs[NUMBER_OF_ASSETS_TABS] = {};
+
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_ENTITIES], Localize("Entities"), s_CurCustomTab == ASSETS_TAB_ENTITIES, &Page1Tab, IGraphics::CORNER_L, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_ENTITIES;
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_GAME], Localize("Game"), s_CurCustomTab == ASSETS_TAB_GAME, &Page2Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_GAME;
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EMOTICONS], Localize("Emoticons"), s_CurCustomTab == ASSETS_TAB_EMOTICONS, &Page3Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_EMOTICONS;
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_PARTICLES], Localize("Particles"), s_CurCustomTab == ASSETS_TAB_PARTICLES, &Page4Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_PARTICLES;
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_HUD], Localize("HUD"), s_CurCustomTab == ASSETS_TAB_HUD, &Page5Tab, 0, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_HUD;
+	if(DoButton_MenuTab((CButtonContainer *)&s_aPageTabs[ASSETS_TAB_EXTRAS], Localize("Extras"), s_CurCustomTab == ASSETS_TAB_EXTRAS, &Page6Tab, IGraphics::CORNER_R, NULL, NULL, NULL, NULL, 4))
+		s_CurCustomTab = ASSETS_TAB_EXTRAS;
+
+	auto LoadStartTime = time_get_nanoseconds();
+	SMenuAssetScanUser User;
+	User.m_pUser = this;
+	User.m_LoadedFunc = [&]() {
+		if(time_get_nanoseconds() - LoadStartTime > 500ms)
+			RenderLoading(Localize("Loading assets"), "", 0, false);
+	};
+	if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+	{
+		if(m_vEntitiesList.empty())
+		{
+			SCustomEntities EntitiesItem;
+			str_copy(EntitiesItem.m_aName, "default");
+			LoadEntities(&EntitiesItem, &User);
+			m_vEntitiesList.push_back(EntitiesItem);
+
+			// load entities
+			Storage()->ListDirectory(IStorage::TYPE_ALL, "assets/entities", EntitiesScan, &User);
+			std::sort(m_vEntitiesList.begin(), m_vEntitiesList.end());
+		}
+		if(m_vEntitiesList.size() != gs_aCustomListSize[s_CurCustomTab])
+			gs_aInitCustomList[s_CurCustomTab] = true;
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_GAME)
+	{
+		InitAssetList(m_vGameList, "assets/game", "game", GameScan, Graphics(), Storage(), &User);
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+	{
+		InitAssetList(m_vEmoticonList, "assets/emoticons", "emoticons", EmoticonsScan, Graphics(), Storage(), &User);
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+	{
+		InitAssetList(m_vParticlesList, "assets/particles", "particles", ParticlesScan, Graphics(), Storage(), &User);
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_HUD)
+	{
+		InitAssetList(m_vHudList, "assets/hud", "hud", HudScan, Graphics(), Storage(), &User);
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+	{
+		InitAssetList(m_vExtrasList, "assets/extras", "extras", ExtrasScan, Graphics(), Storage(), &User);
+	}
+
+	MainView.HSplitTop(10.0f, 0, &MainView);
+
+	// skin selector
+	MainView.HSplitTop(MainView.h - 10.0f - ms_ButtonHeight, &CustomList, &MainView);
+	if(gs_aInitCustomList[s_CurCustomTab])
+	{
+		int ListSize = 0;
+		if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+		{
+			gs_vpSearchEntitiesList.clear();
+			ListSize = m_vEntitiesList.size();
+			for(int i = 0; i < ListSize; ++i)
+			{
+				const SCustomEntities *pEntity = &m_vEntitiesList[i];
+
+				// filter quick search
+				if(!s_aFilterInputs[s_CurCustomTab].IsEmpty() && !str_utf8_find_nocase(pEntity->m_aName, s_aFilterInputs[s_CurCustomTab].GetString()))
+					continue;
+
+				gs_vpSearchEntitiesList.push_back(pEntity);
+			}
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_GAME)
+		{
+			ListSize = InitSearchList(gs_vpSearchGamesList, m_vGameList);
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+		{
+			ListSize = InitSearchList(gs_vpSearchEmoticonsList, m_vEmoticonList);
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+		{
+			ListSize = InitSearchList(gs_vpSearchParticlesList, m_vParticlesList);
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_HUD)
+		{
+			ListSize = InitSearchList(gs_vpSearchHudList, m_vHudList);
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+		{
+			ListSize = InitSearchList(gs_vpSearchExtrasList, m_vExtrasList);
+		}
+		gs_aInitCustomList[s_CurCustomTab] = false;
+		gs_aCustomListSize[s_CurCustomTab] = ListSize;
+	}
+
+	int OldSelected = -1;
+	float Margin = 10;
+	float TextureWidth = 150;
+	float TextureHeight = 150;
+
+	size_t SearchListSize = 0;
+
+	if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+	{
+		SearchListSize = gs_vpSearchEntitiesList.size();
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_GAME)
+	{
+		SearchListSize = gs_vpSearchGamesList.size();
+		TextureHeight = 75;
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+	{
+		SearchListSize = gs_vpSearchEmoticonsList.size();
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+	{
+		SearchListSize = gs_vpSearchParticlesList.size();
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_HUD)
+	{
+		SearchListSize = gs_vpSearchHudList.size();
+	}
+	else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+	{
+		SearchListSize = gs_vpSearchExtrasList.size();
+	}
+
+	static CListBox s_ListBox;
+	s_ListBox.DoStart(TextureHeight + 15.0f + 10.0f + Margin, SearchListSize, CustomList.w / (Margin + TextureWidth), 1, OldSelected, &CustomList, false);
+	for(size_t i = 0; i < SearchListSize; ++i)
+	{
+		const SCustomItem *pItem = GetCustomItem(s_CurCustomTab, i);
+		if(pItem == NULL)
+			continue;
+
+		if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetsEntities) == 0)
+				OldSelected = i;
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_GAME)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetGame) == 0)
+				OldSelected = i;
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetEmoticons) == 0)
+				OldSelected = i;
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetParticles) == 0)
+				OldSelected = i;
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_HUD)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetHud) == 0)
+				OldSelected = i;
+		}
+		else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+		{
+			if(str_comp(pItem->m_aName, g_Config.m_ClAssetExtras) == 0)
+				OldSelected = i;
+		}
+
+		const CListboxItem Item = s_ListBox.DoNextItem(pItem, OldSelected >= 0 && (size_t)OldSelected == i);
+		CUIRect ItemRect = Item.m_Rect;
+		ItemRect.Margin(Margin / 2, &ItemRect);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect TextureRect;
+		ItemRect.HSplitTop(15, &ItemRect, &TextureRect);
+		TextureRect.HSplitTop(10, NULL, &TextureRect);
+		UI()->DoLabel(&ItemRect, pItem->m_aName, ItemRect.h - 2, TEXTALIGN_MC);
+		if(pItem->m_RenderTexture.IsValid())
+		{
+			Graphics()->WrapClamp();
+			Graphics()->TextureSet(pItem->m_RenderTexture);
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(1, 1, 1, 1);
+			IGraphics::CQuadItem QuadItem(TextureRect.x + (TextureRect.w - TextureWidth) / 2, TextureRect.y + (TextureRect.h - TextureHeight) / 2, TextureWidth, TextureHeight);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+			Graphics()->WrapNormal();
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(OldSelected != NewSelected)
+	{
+		if(GetCustomItem(s_CurCustomTab, NewSelected)->m_aName[0] != '\0')
+		{
+			if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+			{
+				str_copy(g_Config.m_ClAssetsEntities, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				m_pClient->m_MapImages.ChangeEntitiesPath(GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+			}
+			else if(s_CurCustomTab == ASSETS_TAB_GAME)
+			{
+				str_copy(g_Config.m_ClAssetGame, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				GameClient()->LoadGameSkin(g_Config.m_ClAssetGame);
+			}
+			else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+			{
+				str_copy(g_Config.m_ClAssetEmoticons, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				GameClient()->LoadEmoticonsSkin(g_Config.m_ClAssetEmoticons);
+			}
+			else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+			{
+				str_copy(g_Config.m_ClAssetParticles, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				GameClient()->LoadParticlesSkin(g_Config.m_ClAssetParticles);
+			}
+			else if(s_CurCustomTab == ASSETS_TAB_HUD)
+			{
+				str_copy(g_Config.m_ClAssetHud, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				GameClient()->LoadHudSkin(g_Config.m_ClAssetHud);
+			}
+			else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+			{
+				str_copy(g_Config.m_ClAssetExtras, GetCustomItem(s_CurCustomTab, NewSelected)->m_aName);
+				GameClient()->LoadExtrasSkin(g_Config.m_ClAssetExtras);
+			}
+		}
+	}
+
+	// render quick search
+	{
+		MainView.HSplitBottom(ms_ButtonHeight, &MainView, &QuickSearch);
+		QuickSearch.VSplitLeft(240.0f, &QuickSearch, &DirectoryButton);
+		QuickSearch.HSplitTop(5.0f, 0, &QuickSearch);
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+
+		UI()->DoLabel(&QuickSearch, FONT_ICON_MAGNIFYING_GLASS, 14.0f, TEXTALIGN_ML);
+		float wSearch = TextRender()->TextWidth(14.0f, FONT_ICON_MAGNIFYING_GLASS, -1, -1.0f);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		QuickSearch.VSplitLeft(wSearch, 0, &QuickSearch);
+		QuickSearch.VSplitLeft(5.0f, 0, &QuickSearch);
+		QuickSearch.VSplitLeft(QuickSearch.w - 15.0f, &QuickSearch, &QuickSearchClearButton);
+		if(Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed())
+		{
+			UI()->SetActiveItem(&s_aFilterInputs[s_CurCustomTab]);
+			s_aFilterInputs[s_CurCustomTab].SelectAll();
+		}
+		s_aFilterInputs[s_CurCustomTab].SetEmptyText(Localize("Search"));
+		if(UI()->DoClearableEditBox(&s_aFilterInputs[s_CurCustomTab], &QuickSearch, 14.0f))
+			gs_aInitCustomList[s_CurCustomTab] = true;
+	}
+
+	DirectoryButton.HSplitTop(5.0f, 0, &DirectoryButton);
+	DirectoryButton.VSplitRight(175.0f, 0, &DirectoryButton);
+	DirectoryButton.VSplitRight(25.0f, &DirectoryButton, &ReloadButton);
+	DirectoryButton.VSplitRight(10.0f, &DirectoryButton, 0);
+	static CButtonContainer s_AssetsDirID;
+	if(DoButton_Menu(&s_AssetsDirID, Localize("Assets directory"), 0, &DirectoryButton))
+	{
+		char aBuf[IO_MAX_PATH_LENGTH];
+		char aBufFull[IO_MAX_PATH_LENGTH + 7];
+		if(s_CurCustomTab == ASSETS_TAB_ENTITIES)
+			str_copy(aBufFull, "assets/entities");
+		else if(s_CurCustomTab == ASSETS_TAB_GAME)
+			str_copy(aBufFull, "assets/game");
+		else if(s_CurCustomTab == ASSETS_TAB_EMOTICONS)
+			str_copy(aBufFull, "assets/emoticons");
+		else if(s_CurCustomTab == ASSETS_TAB_PARTICLES)
+			str_copy(aBufFull, "assets/particles");
+		else if(s_CurCustomTab == ASSETS_TAB_HUD)
+			str_copy(aBufFull, "assets/hud");
+		else if(s_CurCustomTab == ASSETS_TAB_EXTRAS)
+			str_copy(aBufFull, "assets/extras");
+		Storage()->GetCompletePath(IStorage::TYPE_SAVE, aBufFull, aBuf, sizeof(aBuf));
+		Storage()->CreateFolder("assets", IStorage::TYPE_SAVE);
+		Storage()->CreateFolder(aBufFull, IStorage::TYPE_SAVE);
+		if(!open_file(aBuf))
+		{
+			dbg_msg("menus", "couldn't open file '%s'", aBuf);
+		}
+	}
+	GameClient()->m_Tooltips.DoToolTip(&s_AssetsDirID, &DirectoryButton, Localize("Open the directory to add custom assets"));
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	static CButtonContainer s_AssetsReloadBtnID;
+	if(DoButton_Menu(&s_AssetsReloadBtnID, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton) || Input()->KeyPress(KEY_F5) || (Input()->KeyPress(KEY_R) && Input()->ModifierIsPressed()))
+	{
+		ClearCustomItems(s_CurCustomTab);
+	}
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+}
+
+void CMenus::ConchainAssetsEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetsEntities) != 0)
+		{
+			pThis->m_pClient->m_MapImages.ChangeEntitiesPath(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CMenus::ConchainAssetGame(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetGame) != 0)
+		{
+			pThis->GameClient()->LoadGameSkin(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CMenus::ConchainAssetParticles(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetParticles) != 0)
+		{
+			pThis->GameClient()->LoadParticlesSkin(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CMenus::ConchainAssetEmoticons(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetEmoticons) != 0)
+		{
+			pThis->GameClient()->LoadEmoticonsSkin(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CMenus::ConchainAssetHud(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetHud) != 0)
+		{
+			pThis->GameClient()->LoadHudSkin(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
+
+void CMenus::ConchainAssetExtras(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CMenus *pThis = (CMenus *)pUserData;
+	if(pResult->NumArguments() == 1)
+	{
+		const char *pArg = pResult->GetString(0);
+		if(str_comp(pArg, g_Config.m_ClAssetExtras) != 0)
+		{
+			pThis->GameClient()->LoadExtrasSkin(pArg);
+		}
+	}
+
+	pfnCallback(pResult, pCallbackUserData);
+}
diff --git a/src_bkp/game/client/components/menus_start.cpp b/src_bkp/game/client/components/menus_start.cpp
new file mode 100644
index 0000000000..c871c4229c
--- /dev/null
+++ b/src_bkp/game/client/components/menus_start.cpp
@@ -0,0 +1,494 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/serverbrowser.h>
+#include <engine/textrender.h>
+
+#include <engine/client/updater.h>
+#include <engine/shared/config.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/ui.h>
+
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+#include <game/version.h>
+
+#include "menus.h"
+#include <vector>
+#include <string>
+#include <cstdlib> // For rand() and srand()
+#include <ctime>   // For time()
+
+std::vector<std::string> quotes = {
+	"Client was made by -StormAx",
+	"don't use S-Client lol xD",
+	"Aslo try S-Client",
+	"Cook some maps today >:D",
+	"Hi!",
+	"Bye;c",
+	"You go gaming?",
+	"-StormAxD",
+	"Inner peace clan on top, isn't it?",
+	"The cake is lie :c",
+	"AH GG!!!!",
+	"YEPYEPYEPYEPYEP",
+	"My discord is 'stormaxd' go on!",
+	"Cheeru?",
+	"Cheeru!",
+	"Cheeru!?",
+	"Cheeru?!",
+	"The gamer is here!:D",
+	"OwO",
+	"UWU",
+	"QWQ",
+	"!ban 0.0.0.0-255.255.255.255",
+	"Me gamer :0, Me go hook random tees",
+	"PDGADHHAHDHAHAHADADAAAHAHAHAHAH",
+	"What is your best Grandma time? mine is 2:21:43",
+	"Со мной воюет сатана!!!!!!!",
+	"Never gonna give you.... forget it",
+	"AWwwwwww, you so cutie >.<",
+	"WhAt ThE...?",
+	"Kurw........Amach",
+	"Suka blyad'",
+	"Paxtell...",
+	"Number one roblox player",
+	"AYAYAAAAAA, ayakaaaaa",
+	"liga a camera ae!",
+	"Я рот ебал ваших ДДнетов",
+	"Я щас на атомы разорвусь",
+	"caos e regresso",
+	"Do HH right broh!",
+	"ПК это печь керамическая",
+	"melo melo melooon",
+	":gigachad:",
+	"-Dummygod was here",
+	"PL is not poland, is PlantKnight",
+	"Im so in love with ddnet code c:",
+	"Loving Ayako",
+	"deen>all!!!",
+	"Blocker<all",
+	"Block is nuts, don't play it",
+	"Also try KoG",
+	"Also try BlockWords",
+	"Also try FNG",
+	"Also try to touch some grass",
+	"chillin'",
+	"Our old party was Kao, Draggory, Ayako, Tokly, -StormAx",
+	"first -StormAx name is - NEDEX",
+	"Why tf you are staring at me? >:C",
+	"Bro i love this game so much",
+	"testtext",
+	"220km/h :wheelchair:",
+	"YEP CLAN on top;p",
+	"no sex ;c",
+	"still no sex ;c",
+	"and still no sex ;c",
+	"pepega xD",
+	"Go play Luxis",
+	"Go play Stronghold 4",
+	"AOE is not a YT guy, its splash DMG",
+	"VAMO VER QM DA MAIS O RABO, PRA VER SE EU NUM GANHO!",
+	"muhehehehe",
+	"10/10",
+	"10010101010ERROR11010101010101010101011011010110ERROR101010011",
+	"voulez-vous couchez avec moi?!?",
+	"BlueMeww, Bluee... BlueMewing!... F*CK",
+	"ronyan'",
+	"W's in the shhhhhaaata :screamin':",
+	"W's in the shhhhhaaat :screamin':",
+	"SpinbrosTV... you'r onto something, you'r onto something man",
+	"Also try M-Client v3 :D",
+	"Choo-Choo",
+	"Hi Atsuko!",
+	"pinuuuuuuuu!",
+	"n9",
+	"gamer",
+	"Inner Sillyness",
+	"Im am the storm that is approaching!",
+	"Dev love Lukov so much<3",
+	"DDnet moderator with most bans - IZA 12k bans",
+	"Mewing insead of Meowing",
+	"Prepare to suffer",
+	"Did you saw ddnet describtion in Steam?",
+	"allleeeeeee, hopa!",
+	"std::string GetRandomQuote()",
+	"there's 0.0001% to get special rainbow text, gl^^",
+	"https://open.spotify.com/track/1SQDvOrbSykg0lP5y7EQ8o?si=a002ae00a4eb4935",
+	"Don't use M-Client V3",
+
+};
+
+std::vector<std::string> rares = {
+	"no fucking way you read this..."
+};
+
+
+// Function to get a random quote
+std::string GetRandomQuote() {
+	// Seed the random number generator
+	std::srand(static_cast<unsigned>(std::time(nullptr)));
+
+	// Generate a random number between 0 and 9999
+	int randomNum = std::rand() % 10000;
+
+	// Check if the random number falls in the 0.01% range
+	if (randomNum < 1) {
+		return rares[0]; // Return the super rare quote
+	} else {
+		// Otherwise, return a regular quote
+		int index = std::rand() % quotes.size();
+		return quotes[index];
+	}
+}
+
+void CMenus::RenderStartMenu(CUIRect MainView)
+{
+	// Render logo
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_BANNER].m_Id);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1, 1, 1, 1);
+	IGraphics::CQuadItem QuadItem(MainView.w / 2 - 210, 50, 490, 103);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+
+	// Get a random quote when the game starts
+	static bool firstTime = true;
+	static std::string randomQuote;
+
+	if (firstTime) {
+		srand(::time(nullptr)); // Seed the random number generator only once
+		randomQuote = GetRandomQuote();
+		firstTime = false;
+	}
+
+
+
+
+	const float Rounding = 10.0f;
+	const float VMargin = MainView.w / 2 - 190.0f;
+
+	CUIRect Button;
+	int NewPage = -1;
+
+	CUIRect ExtMenu;
+	MainView.VSplitLeft(30.0f, 0, &ExtMenu);
+	ExtMenu.VSplitLeft(100.0f, &ExtMenu, 0);
+
+	ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
+	static CButtonContainer s_DiscordButton;
+	if(DoButton_Menu(&s_DiscordButton, Localize("Discord"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+	{
+		const char *pLink = Localize("https://ddnet.org/discord");
+		if(!open_link(pLink))
+		{
+			dbg_msg("menus", "couldn't open link '%s'", pLink);
+		}
+	}
+
+	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
+	ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
+	static CButtonContainer s_LearnButton;
+	if(DoButton_Menu(&s_LearnButton, Localize("Learn"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+	{
+		const char *pLink = Localize("https://wiki.ddnet.org/");
+		if(!open_link(pLink))
+		{
+			dbg_msg("menus", "couldn't open link '%s'", pLink);
+		}
+	}
+
+	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
+	ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
+	static CButtonContainer s_TutorialButton;
+	static float s_JoinTutorialTime = 0.0f;
+	if(DoButton_Menu(&s_TutorialButton, Localize("Tutorial"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) ||
+		(s_JoinTutorialTime != 0.0f && Client()->LocalTime() >= s_JoinTutorialTime))
+	{
+		const char *pAddr = ServerBrowser()->GetTutorialServer();
+		if(pAddr)
+		{
+			Client()->Connect(pAddr);
+			s_JoinTutorialTime = 0.0f;
+		}
+		else if(s_JoinTutorialTime == 0.0f)
+		{
+			dbg_msg("menus", "couldn't find tutorial server, retrying in 5 seconds");
+			s_JoinTutorialTime = Client()->LocalTime() + 5.0f;
+		}
+		else
+		{
+			Client()->AddWarning(SWarning(Localize("Can't find a Tutorial server")));
+			s_JoinTutorialTime = 0.0f;
+		}
+	}
+
+	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
+	ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
+	static CButtonContainer s_WebsiteButton;
+	if(DoButton_Menu(&s_WebsiteButton, Localize("Website"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+	{
+		const char *pLink = "https://ddnet.org/";
+		if(!open_link(pLink))
+		{
+			dbg_msg("menus", "couldn't open link '%s'", pLink);
+		}
+	}
+
+	ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space
+	ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
+	static CButtonContainer s_NewsButton;
+	if(DoButton_Menu(&s_NewsButton, Localize("News"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, g_Config.m_UiUnreadNews ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_N))
+		NewPage = PAGE_NEWS;
+
+	CUIRect Menu;
+
+	MainView.VMargin(VMargin, &Menu);
+	Menu.HSplitBottom(15.0f, &Menu, 0);
+
+	MainView.VSplitLeft(MainView.w / 2 + 115, &Menu, nullptr);
+	Menu.VSplitLeft(Menu.w / 1.45, nullptr, &Menu);
+	Menu.HSplitBottom(40.0f, &Menu, &Button);
+	static CButtonContainer s_QuitButton;
+	bool UsedEscape = false;
+	if(DoButton_Menu(&s_QuitButton, Localize("Quit"), 0, &Button, 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (UsedEscape = UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)) || CheckHotKey(KEY_Q))
+	{
+		if(UsedEscape || m_pClient->Editor()->HasUnsavedData() || (Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmQuitTime && g_Config.m_ClConfirmQuitTime >= 0))
+		{
+			m_Popup = POPUP_QUIT;
+		}
+		else
+		{
+			Client()->Quit();
+		}
+	}
+	//Main buttons
+
+	Menu.HSplitBottom(100.0f, &Menu, 0);
+	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	static CButtonContainer s_SettingsButton;
+	if(DoButton_Menu(&s_SettingsButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "settings" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_S))
+		NewPage = PAGE_SETTINGS;
+
+	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
+	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	static CButtonContainer s_LocalServerButton;
+
+
+	if(!is_process_alive(m_ServerProcess.m_Process))
+		KillServer();
+
+if(DoButton_Menu(&s_LocalServerButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_ServerProcess.m_Process? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
+	{
+		if(m_ServerProcess.m_Process)
+		{
+			KillServer();
+		}
+		else
+		{
+			char aBuf[IO_MAX_PATH_LENGTH];
+			Storage()->GetBinaryPath(PLAT_SERVER_EXEC, aBuf, sizeof(aBuf));
+			// No / in binary path means to search in $PATH, so it is expected that the file can't be opened. Just try executing anyway.
+			if(str_find(aBuf, "/") == 0)
+			{
+				m_ServerProcess.m_Process = shell_execute(aBuf);
+			}
+			else if(fs_is_file(aBuf))
+			{
+				m_ServerProcess.m_Process = shell_execute(aBuf);
+			}
+			else
+			{
+				Client()->AddWarning(SWarning(Localize("Server executable not found, can't run server")));
+			}
+		}
+	}
+
+	static bool EditorHotkeyWasPressed = true;
+	static float EditorHotKeyChecktime = 0.0f;
+	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
+	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	static CButtonContainer s_MapEditorButton;
+	if(DoButton_Menu(&s_MapEditorButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "editor" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, m_pClient->Editor()->HasUnsavedData() ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || (!EditorHotkeyWasPressed && Client()->LocalTime() - EditorHotKeyChecktime < 0.1f && CheckHotKey(KEY_E)))
+	{
+		g_Config.m_ClEditor = 1;
+		Input()->MouseModeRelative();
+		EditorHotkeyWasPressed = true;
+	}
+	if(!Input()->KeyIsPressed(KEY_E))
+	{
+		EditorHotkeyWasPressed = false;
+		EditorHotKeyChecktime = Client()->LocalTime();
+	}
+
+	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
+	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	static CButtonContainer s_DemoButton;
+	if(DoButton_Menu(&s_DemoButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "demos" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_D))
+	{
+		NewPage = PAGE_DEMOS;
+	}
+
+	Menu.HSplitBottom(5.0f, &Menu, 0); // little space
+	Menu.HSplitBottom(55.0f, &Menu, &Button);
+	static CButtonContainer s_PlayButton;
+	if(DoButton_Menu(&s_PlayButton, Localize("", "Start menu"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "play_game" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || CheckHotKey(KEY_P))
+	{
+		NewPage = g_Config.m_UiPage >= PAGE_INTERNET && g_Config.m_UiPage <= PAGE_FAVORITES ? g_Config.m_UiPage : PAGE_INTERNET;
+	}
+
+	// render version
+	CUIRect VersionUpdate, CurVersion;
+	MainView.HSplitBottom(30.0f, 0, 0);
+	MainView.HSplitBottom(55.0f, 0, &VersionUpdate);
+
+	VersionUpdate.VSplitRight(50.0f, &CurVersion, 0);
+	VersionUpdate.VMargin(VMargin, &VersionUpdate);
+
+	CUIRect RandomText;
+	RandomText.x = 605.0f;
+	RandomText.y = 130.0f;
+	RandomText.w = 330.0f;
+	RandomText.h = 60.0f;
+	static bool Quote = false;
+
+	if (!Quote)
+	{
+		Quote = true;
+		dbg_msg("Quotes", "%s", randomQuote.c_str());
+	}
+
+	if(!str_comp(randomQuote.c_str(), "no fucking way you read this..."))
+	{
+		ColorRGBA color = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 25) % 255 / 255.f, 1.f, 1.f));
+		color.a = 0.9f;
+		TextRender()->TextColor(color);
+
+		UI()->DoLabel(&RandomText, "no fucking way you read this...", 20.0f, TEXTALIGN_ML);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	else
+	{
+		TextRender()->TextColor(1.0f, 1.0f, 0.0f, 1.0f);
+
+
+		float animationFactor = sinf(LocalTime() * 10);
+
+		float animationFactorSmooth = animationFactor * animationFactor;
+
+		float baseSizeMin = 18.0f;
+		float baseSizeMax = 20.0f;
+
+		float scale = 0.5f;
+
+		float newSize = baseSizeMin + (baseSizeMax - baseSizeMin) * (0.5f + scale * animationFactorSmooth);
+
+		TextRender()->Text(605.0f, 130.0f, newSize, randomQuote.c_str());
+
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+	}
+
+#if defined(CONF_AUTOUPDATE)
+
+	char aBuf[64];
+	CUIRect Part;
+	int State = Updater()->GetCurrentState();
+	bool NeedUpdate = str_comp(Client()->LatestVersion(), "0");
+	if(State == IUpdater::CLEAN && NeedUpdate)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("DDNet %s is out!"), Client()->LatestVersion());
+		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+	}
+	else if(State == IUpdater::CLEAN)
+	{
+		aBuf[0] = '\0';
+	}
+	else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
+	{
+		char aCurrentFile[64];
+		Updater()->GetCurrentFile(aCurrentFile, sizeof(aCurrentFile));
+		str_format(aBuf, sizeof(aBuf), Localize("Downloading %s:"), aCurrentFile);
+	}
+	else if(State == IUpdater::FAIL)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log..."));
+		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+	}
+	else if(State == IUpdater::NEED_RESTART)
+	{
+		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
+		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+	}
+	UI()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+	VersionUpdate.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, 0, &Part);
+
+	if(State == IUpdater::CLEAN && NeedUpdate)
+	{
+		CUIRect Update;
+		Part.VSplitLeft(100.0f, &Update, NULL);
+
+		static CButtonContainer s_VersionUpdate;
+		if(DoButton_Menu(&s_VersionUpdate, Localize("Update now"), 0, &Update, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+		{
+			Updater()->InitiateUpdate();
+		}
+	}
+	else if(State == IUpdater::NEED_RESTART)
+	{
+		CUIRect Restart;
+		Part.VSplitLeft(50.0f, &Restart, &Part);
+
+		static CButtonContainer s_VersionUpdate;
+		if(DoButton_Menu(&s_VersionUpdate, Localize("Restart"), 0, &Restart, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
+		{
+			Client()->Restart();
+		}
+	}
+	else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
+	{
+		CUIRect ProgressBar, Percent;
+		Part.VSplitLeft(100.0f, &ProgressBar, &Percent);
+		ProgressBar.y += 2.0f;
+		ProgressBar.HMargin(1.0f, &ProgressBar);
+		ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
+		ProgressBar.w = clamp((float)Updater()->GetCurrentPercent(), 10.0f, 100.0f);
+		ProgressBar.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f), IGraphics::CORNER_ALL, 5.0f);
+	}
+	/*
+#elif defined(CONF_INFORM_UPDATE)
+	if(str_comp(Client()->LatestVersion(), "0") != 0)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), Localize("DDNet %s is out!"), Client()->LatestVersion());
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		UI()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_MC);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+*/
+#endif
+
+	UI()->DoLabel(&CurVersion, GAME_RELEASE_VERSION, 14.0f, TEXTALIGN_MR);
+
+	if(NewPage != -1)
+	{
+		m_MenuPage = NewPage;
+		m_ShowStart = false;
+	}
+
+}
+
+void CMenus::KillServer()
+{
+	if(m_ServerProcess.m_Process)
+	{
+		if(kill_process(m_ServerProcess.m_Process))
+		{
+			m_ServerProcess.m_Process = INVALID_PROCESS;
+		}
+	}
+}
diff --git a/src_bkp/game/client/components/motd.cpp b/src_bkp/game/client/components/motd.cpp
new file mode 100644
index 0000000000..3e7f9a9fe5
--- /dev/null
+++ b/src_bkp/game/client/components/motd.cpp
@@ -0,0 +1,142 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/client/gameclient.h>
+#include <game/generated/protocol.h>
+
+#include "motd.h"
+
+CMotd::CMotd()
+{
+	m_aServerMotd[0] = '\0';
+	m_ServerMotdTime = 0;
+	m_ServerMotdUpdateTime = 0;
+}
+
+void CMotd::Clear()
+{
+	m_ServerMotdTime = 0;
+	Graphics()->DeleteQuadContainer(m_RectQuadContainer);
+	TextRender()->DeleteTextContainer(m_TextContainerIndex);
+}
+
+bool CMotd::IsActive() const
+{
+	return time() < m_ServerMotdTime;
+}
+
+void CMotd::OnStateChange(int NewState, int OldState)
+{
+	if(OldState == IClient::STATE_ONLINE || OldState == IClient::STATE_OFFLINE)
+		Clear();
+}
+
+void CMotd::OnWindowResize()
+{
+	Graphics()->DeleteQuadContainer(m_RectQuadContainer);
+	TextRender()->DeleteTextContainer(m_TextContainerIndex);
+}
+
+void CMotd::OnRender()
+{
+	if(!IsActive())
+		return;
+
+	const float FontSize = 32.0f; // also the size of the margin and rect rounding
+	const float ScreenHeight = 40.0f * FontSize; // multiple of the font size to get perfect alignment
+	const float ScreenWidth = ScreenHeight * Graphics()->ScreenAspect();
+	Graphics()->MapScreen(0.0f, 0.0f, ScreenWidth, ScreenHeight);
+
+	const float RectHeight = 26.0f * FontSize;
+	const float RectWidth = 630.0f + 2.0f * FontSize;
+	const float RectX = ScreenWidth / 2.0f - RectWidth / 2.0f;
+	const float RectY = 160.0f;
+
+	if(m_RectQuadContainer == -1)
+	{
+		Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.5f);
+		m_RectQuadContainer = Graphics()->CreateRectQuadContainer(RectX, RectY, RectWidth, RectHeight, FontSize, IGraphics::CORNER_ALL);
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+
+	if(m_RectQuadContainer != -1)
+	{
+		Graphics()->TextureClear();
+		Graphics()->RenderQuadContainer(m_RectQuadContainer, -1);
+	}
+
+	const float TextWidth = RectWidth - 2.0f * FontSize;
+	const float TextX = RectX + FontSize;
+	const float TextY = RectY + FontSize;
+
+	if(!m_TextContainerIndex.Valid())
+	{
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, TextX, TextY, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = TextWidth;
+		TextRender()->CreateTextContainer(m_TextContainerIndex, &Cursor, ServerMotd());
+	}
+
+	if(m_TextContainerIndex.Valid())
+		TextRender()->RenderTextContainer(m_TextContainerIndex, TextRender()->DefaultTextColor(), TextRender()->DefaultTextOutlineColor());
+}
+
+void CMotd::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	if(MsgType == NETMSGTYPE_SV_MOTD)
+	{
+		const CNetMsg_Sv_Motd *pMsg = static_cast<CNetMsg_Sv_Motd *>(pRawMsg);
+
+		// copy it manually to process all \n
+		const char *pMsgStr = pMsg->m_pMessage;
+		const size_t MotdLen = str_length(pMsgStr) + 1;
+		const char *pLast = m_aServerMotd; // for console printing
+		for(size_t i = 0, k = 0; i < MotdLen && k < sizeof(m_aServerMotd); i++, k++)
+		{
+			// handle incoming "\\n"
+			if(pMsgStr[i] == '\\' && pMsgStr[i + 1] == 'n')
+			{
+				m_aServerMotd[k] = '\n';
+				i++; // skip the 'n'
+			}
+			else
+				m_aServerMotd[k] = pMsgStr[i];
+
+			// print the line to the console when receiving the newline character
+			if(g_Config.m_ClPrintMotd && m_aServerMotd[k] == '\n')
+			{
+				m_aServerMotd[k] = '\0';
+				m_pClient->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "motd", pLast, color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor)));
+				m_aServerMotd[k] = '\n';
+				pLast = m_aServerMotd + k + 1;
+			}
+		}
+		m_aServerMotd[sizeof(m_aServerMotd) - 1] = '\0';
+		if(g_Config.m_ClPrintMotd && *pLast != '\0')
+			m_pClient->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "motd", pLast, color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor)));
+
+		m_ServerMotdUpdateTime = time();
+		if(m_aServerMotd[0] && g_Config.m_ClMotdTime)
+			m_ServerMotdTime = m_ServerMotdUpdateTime + time_freq() * g_Config.m_ClMotdTime;
+		else
+			m_ServerMotdTime = 0;
+		TextRender()->DeleteTextContainer(m_TextContainerIndex);
+	}
+}
+
+bool CMotd::OnInput(const IInput::CEvent &Event)
+{
+	if(IsActive() && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_ESCAPE)
+	{
+		Clear();
+		return true;
+	}
+	return false;
+}
diff --git a/src_bkp/game/client/components/motd.h b/src_bkp/game/client/components/motd.h
new file mode 100644
index 0000000000..3971097c7c
--- /dev/null
+++ b/src_bkp/game/client/components/motd.h
@@ -0,0 +1,34 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_MOTD_H
+#define GAME_CLIENT_COMPONENTS_MOTD_H
+
+#include <engine/shared/config.h>
+
+#include <game/client/component.h>
+
+class CMotd : public CComponent
+{
+	char m_aServerMotd[std::size(g_Config.m_SvMotd)];
+	int64_t m_ServerMotdTime;
+	int64_t m_ServerMotdUpdateTime;
+	int m_RectQuadContainer = -1;
+	STextContainerIndex m_TextContainerIndex;
+
+public:
+	CMotd();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	const char *ServerMotd() const { return m_aServerMotd; }
+	int64_t ServerMotdUpdateTime() const { return m_ServerMotdUpdateTime; }
+	void Clear();
+	bool IsActive() const;
+
+	virtual void OnRender() override;
+	virtual void OnStateChange(int NewState, int OldState) override;
+	virtual void OnWindowResize() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/nameplates.cpp b/src_bkp/game/client/components/nameplates.cpp
new file mode 100644
index 0000000000..d6012e36bf
--- /dev/null
+++ b/src_bkp/game/client/components/nameplates.cpp
@@ -0,0 +1,412 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include <game/client/gameclient.h>
+#include <game/client/prediction/entities/character.h>
+
+#include "camera.h"
+#include "controls.h"
+#include "nameplates.h"
+
+void CNamePlates::RenderNameplate(
+	const CNetObj_Character *pPrevChar,
+	const CNetObj_Character *pPlayerChar,
+	const CNetObj_PlayerInfo *pPlayerInfo)
+{
+	int ClientID = pPlayerInfo->m_ClientID;
+
+	vec2 Position;
+	if(ClientID >= 0 && ClientID < MAX_CLIENTS)
+		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	else
+		Position = mix(vec2(pPrevChar->m_X, pPrevChar->m_Y), vec2(pPlayerChar->m_X, pPlayerChar->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
+
+	RenderNameplatePos(Position, pPlayerInfo, 1.0f);
+}
+
+void CNamePlates::RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha)
+{
+	int ClientID = pPlayerInfo->m_ClientID;
+
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
+
+	float FontSize = 18.0f + 20.0f * g_Config.m_ClNameplatesSize / 100.0f;
+	float FontSizeClan = 18.0f + 20.0f * g_Config.m_ClNameplatesClanSize / 100.0f;
+
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
+	float YOffset = Position.y - 38;
+	ColorRGBA rgb = ColorRGBA(1.0f, 1.0f, 1.0f);
+
+	// render players' key presses
+	int ShowDirection = g_Config.m_ClShowDirection;
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current())
+		ShowDirection = g_Config.m_ClVideoShowDirection;
+#endif
+	if((ShowDirection && ShowDirection != 3 && !pPlayerInfo->m_Local) || (ShowDirection >= 2 && pPlayerInfo->m_Local) || (ShowDirection == 3 && Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy]))
+	{
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		Graphics()->QuadsSetRotation(0);
+
+		const float ShowDirectionImgSize = 22.0f;
+		YOffset -= ShowDirectionImgSize;
+		vec2 ShowDirectionPos = vec2(Position.x - 11.0f, YOffset);
+
+		bool DirLeft = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Direction == -1;
+		bool DirRight = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Direction == 1;
+		bool Jump = m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_Cur.m_Jumped & 1;
+
+		if(pPlayerInfo->m_Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		{
+			DirLeft = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Direction == -1;
+			DirRight = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Direction == 1;
+			Jump = m_pClient->m_Controls.m_aInputData[g_Config.m_ClDummy].m_Jump == 1;
+		}
+		if(Client()->DummyConnected() && Client()->State() != IClient::STATE_DEMOPLAYBACK && pPlayerInfo->m_ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy])
+		{
+			DirLeft = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Direction == -1;
+			DirRight = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Direction == 1;
+			Jump = m_pClient->m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Jump == 1;
+		}
+		if(DirLeft)
+		{
+			Graphics()->TextureSet(g_pData->m_aImages[IMAGE_ARROW].m_Id);
+			Graphics()->QuadsSetRotation(pi);
+			Graphics()->RenderQuadContainerAsSprite(m_DirectionQuadContainerIndex, 0, ShowDirectionPos.x - 30.f, ShowDirectionPos.y);
+		}
+		else if(DirRight)
+		{
+			Graphics()->TextureSet(g_pData->m_aImages[IMAGE_ARROW].m_Id);
+			Graphics()->RenderQuadContainerAsSprite(m_DirectionQuadContainerIndex, 0, ShowDirectionPos.x + 30.f, ShowDirectionPos.y);
+		}
+		if(Jump)
+		{
+			Graphics()->TextureSet(g_pData->m_aImages[IMAGE_ARROW].m_Id);
+			Graphics()->QuadsSetRotation(pi * 3 / 2);
+			Graphics()->RenderQuadContainerAsSprite(m_DirectionQuadContainerIndex, 0, ShowDirectionPos.x, ShowDirectionPos.y);
+		}
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		Graphics()->QuadsSetRotation(0);
+	}
+
+	// render name plate
+	if((!pPlayerInfo->m_Local || g_Config.m_ClNameplatesOwn) && g_Config.m_ClNameplates)
+	{
+		float a = 1;
+		if(g_Config.m_ClNameplatesAlways == 0)
+			a = clamp(1 - std::pow(distance(m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy], Position) / 200.0f, 16.0f), 0.0f, 1.0f);
+
+		const char *pName = m_pClient->m_aClients[pPlayerInfo->m_ClientID].m_aName;
+		if(str_comp(pName, m_aNamePlates[ClientID].m_aName) != 0 || FontSize != m_aNamePlates[ClientID].m_NameTextFontSize)
+		{
+			mem_copy(m_aNamePlates[ClientID].m_aName, pName, sizeof(m_aNamePlates[ClientID].m_aName));
+			m_aNamePlates[ClientID].m_NameTextFontSize = FontSize;
+
+			CTextCursor Cursor;
+			TextRender()->SetCursor(&Cursor, 0, 0, FontSize, TEXTFLAG_RENDER);
+			Cursor.m_LineWidth = -1;
+
+			// create nameplates at standard zoom
+			float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+			Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+			RenderTools()->MapScreenToInterface(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
+
+			m_aNamePlates[ClientID].m_NameTextWidth = TextRender()->TextWidth(FontSize, pName, -1, -1.0f);
+
+			TextRender()->RecreateTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, &Cursor, pName);
+			Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+		}
+
+		if(g_Config.m_ClNameplatesClan)
+		{
+			const char *pClan = m_pClient->m_aClients[ClientID].m_aClan;
+			if(str_comp(pClan, m_aNamePlates[ClientID].m_aClanName) != 0 || FontSizeClan != m_aNamePlates[ClientID].m_ClanNameTextFontSize)
+			{
+				mem_copy(m_aNamePlates[ClientID].m_aClanName, pClan, sizeof(m_aNamePlates[ClientID].m_aClanName));
+				m_aNamePlates[ClientID].m_ClanNameTextFontSize = FontSizeClan;
+
+				CTextCursor Cursor;
+				TextRender()->SetCursor(&Cursor, 0, 0, FontSizeClan, TEXTFLAG_RENDER);
+				Cursor.m_LineWidth = -1;
+
+				// create nameplates at standard zoom
+				float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+				Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+				RenderTools()->MapScreenToInterface(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
+
+				m_aNamePlates[ClientID].m_ClanNameTextWidth = TextRender()->TextWidth(FontSizeClan, pClan, -1, -1.0f);
+
+				TextRender()->RecreateTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, &Cursor, pClan);
+				Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+			}
+		}
+		ColorRGBA TColor;
+		if(g_Config.m_ScShowFrozenNameplaterColor == 1)
+			if(GameClient()->m_aClients[ClientID].m_FreezeEnd)
+			{
+				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFrozenTeeColor));
+			}
+
+		float tw = m_aNamePlates[ClientID].m_NameTextWidth;
+		if(g_Config.m_ClNameplatesTeamcolors && m_pClient->m_Teams.Team(ClientID))
+			rgb = m_pClient->GetDDTeamColor(m_pClient->m_Teams.Team(ClientID), 0.75f);
+		ColorRGBA TOutlineColor;
+
+		if(OtherTeam && !ForceAlpha)
+		{
+			TOutlineColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.2f * g_Config.m_ClShowOthersAlpha / 100.0f);
+			TColor = ColorRGBA(rgb.r, rgb.g, rgb.b, g_Config.m_ClShowOthersAlpha / 100.0f);
+		}
+		else
+		{
+			TOutlineColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f * a);
+			TColor = ColorRGBA(rgb.r, rgb.g, rgb.b, a);
+		}
+
+		if(g_Config.m_ScShowFrozenNameplaterColor == 1)
+			if(GameClient()->m_aClients[ClientID].m_FreezeEnd)
+			{
+				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFrozenTeeColor));
+			}
+
+		if(g_Config.m_ClNameplatesTeamcolors && m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+		{
+			if(m_pClient->m_aClients[ClientID].m_Team == TEAM_RED)
+				TColor = ColorRGBA(1.0f, 0.5f, 0.5f, a);
+			else if(m_pClient->m_aClients[ClientID].m_Team == TEAM_BLUE)
+				TColor = ColorRGBA(0.7f, 0.7f, 1.0f, a);
+		}
+
+		if(g_Config.m_ScShowBlacklistNameplaterColor == 1)
+		{
+			if(GameClient()->m_aClients[ClientID].m_Foe)
+			{
+				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScBlacklistPColor));
+			}
+		}
+
+		if(g_Config.m_ScShowFriendsNameplatesColor == 1)
+		{
+			if(GameClient()->m_aClients[ClientID].m_Friend)
+			{
+				TColor = color_cast<ColorRGBA, ColorHSVA>(ColorHSVA(g_Config.m_ScFriendColor));
+			}
+		}
+
+		TOutlineColor.a *= Alpha;
+		TColor.a *= Alpha;
+
+		if(m_aNamePlates[ClientID].m_NameTextContainerIndex.Valid())
+		{
+			YOffset -= FontSize;
+			TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_NameTextContainerIndex, TColor, TOutlineColor, Position.x - tw / 2.0f, YOffset);
+		}
+
+		if(g_Config.m_ClNameplatesClan)
+		{
+			YOffset -= FontSizeClan;
+			if(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex.Valid())
+				TextRender()->RenderTextContainer(m_aNamePlates[ClientID].m_ClanNameTextContainerIndex, TColor, TOutlineColor, Position.x - m_aNamePlates[ClientID].m_ClanNameTextWidth / 2.0f, YOffset);
+		}
+		//tee skin name
+		if(g_Config.m_ClShowSkinName)
+		{
+			const CGameClient::CClientData &ClientData = m_pClient->m_aClients[pPlayerInfo->m_ClientID];
+			const char *pSkinName = ClientData.m_aSkinName;
+
+			YOffset -= FontSizeClan;
+			float XOffset = TextRender()->TextWidth(FontSize, pSkinName, -1, -1.0f) / 2.0f;
+			TextRender()->TextColor(rgb);
+			TextRender()->Text(Position.x - XOffset, YOffset, FontSize, pSkinName, -1.0f);
+		}
+
+		if(g_Config.m_ClNameplatesFriendMark && m_pClient->m_aClients[ClientID].m_Friend)
+		{
+			YOffset -= FontSize;
+			char aFriendMark[] = "♥";
+
+			ColorRGBA Color;
+
+			if(OtherTeam && !ForceAlpha)
+				Color = ColorRGBA(1.0f, 0.0f, 0.0f, g_Config.m_ClShowOthersAlpha / 100.0f);
+			else
+				Color = ColorRGBA(1.0f, 0.0f, 0.0f, a);
+
+			Color.a *= Alpha;
+
+			TextRender()->TextColor(Color);
+			float XOffSet = TextRender()->TextWidth(FontSize, aFriendMark, -1, -1.0f) / 2.0f;
+			TextRender()->Text(Position.x - XOffSet, YOffset, FontSize, aFriendMark, -1.0f);
+		}
+
+		if(g_Config.m_Debug || g_Config.m_ClNameplatesIDs) // render client id when in debug as well
+		{
+			YOffset -= FontSize;
+			char aBuf[128];
+			str_from_int(pPlayerInfo->m_ClientID, aBuf);
+			float XOffset = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f) / 2.0f;
+			TextRender()->TextColor(rgb);
+			TextRender()->Text(Position.x - XOffset, YOffset, FontSize, aBuf, -1.0f);
+		}
+	}
+
+	if((g_Config.m_Debug || g_Config.m_ClNameplatesStrong) && g_Config.m_ClNameplates)
+	{
+		if(m_pClient->m_Snap.m_LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[pPlayerInfo->m_ClientID].m_HasExtendedData && m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_LocalClientID].m_HasExtendedData)
+		{
+			CCharacter *pLocalChar = m_pClient->m_GameWorld.GetCharacterByID(m_pClient->m_Snap.m_LocalClientID);
+			CCharacter *pCharacter = m_pClient->m_GameWorld.GetCharacterByID(pPlayerInfo->m_ClientID);
+			if(pCharacter && pLocalChar)
+			{
+				if(pPlayerInfo->m_Local)
+					TextRender()->TextColor(rgb);
+				else
+				{
+					float ScaleX, ScaleY;
+					const float StrongWeakImgSize = 40.0f;
+					Graphics()->TextureClear();
+					Graphics()->TextureSet(g_pData->m_aImages[IMAGE_STRONGWEAK].m_Id);
+					Graphics()->QuadsBegin();
+					ColorRGBA StrongWeakStatusColor;
+					int StrongWeakSpriteID;
+					if(pLocalChar->GetStrongWeakID() > pCharacter->GetStrongWeakID())
+					{
+						StrongWeakStatusColor = color_cast<ColorRGBA>(ColorHSLA(6401973));
+						StrongWeakSpriteID = SPRITE_HOOK_STRONG;
+					}
+					else
+					{
+						StrongWeakStatusColor = color_cast<ColorRGBA>(ColorHSLA(41131));
+						StrongWeakSpriteID = SPRITE_HOOK_WEAK;
+					}
+
+					float ClampedAlpha = 1;
+					if(g_Config.m_ClNameplatesAlways == 0)
+						ClampedAlpha = clamp(1 - std::pow(distance(m_pClient->m_Controls.m_aTargetPos[g_Config.m_ClDummy], Position) / 200.0f, 16.0f), 0.0f, 1.0f);
+
+					if(OtherTeam && !ForceAlpha)
+						StrongWeakStatusColor.a = g_Config.m_ClShowOthersAlpha / 100.0f;
+					else
+						StrongWeakStatusColor.a = ClampedAlpha;
+
+					StrongWeakStatusColor.a *= Alpha;
+					Graphics()->SetColor(StrongWeakStatusColor);
+					RenderTools()->SelectSprite(StrongWeakSpriteID);
+					RenderTools()->GetSpriteScale(StrongWeakSpriteID, ScaleX, ScaleY);
+					TextRender()->TextColor(StrongWeakStatusColor);
+
+					YOffset -= StrongWeakImgSize * ScaleY;
+					RenderTools()->DrawSprite(Position.x, YOffset + (StrongWeakImgSize / 2.0f) * ScaleY, StrongWeakImgSize);
+					Graphics()->QuadsEnd();
+				}
+				if(g_Config.m_Debug || g_Config.m_ClNameplatesStrong == 2)
+				{
+					YOffset -= FontSize;
+					char aBuf[12];
+					str_from_int(pCharacter->GetStrongWeakID(), aBuf);
+					float XOffset = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f) / 2.0f;
+					TextRender()->Text(Position.x - XOffset, YOffset, FontSize, aBuf, -1.0f);
+				}
+			}
+		}
+	}
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+
+	TextRender()->SetRenderFlags(0);
+}
+
+void CNamePlates::OnRender()
+{
+	int ShowDirection = g_Config.m_ClShowDirection;
+#if defined(CONF_VIDEORECORDER)
+	if(IVideo::Current())
+		ShowDirection = g_Config.m_ClVideoShowDirection;
+#endif
+	if(!g_Config.m_ClNameplates && ShowDirection == 0)
+		return;
+
+	// get screen edges to avoid rendering offscreen
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	// expand the edges to prevent popping in/out onscreen
+	//
+	// it is assumed that the nameplate and all its components fit into a 800x800 box placed directly above the tee
+	// this may need to be changed or calculated differently in the future
+	ScreenX0 -= 400;
+	ScreenX1 += 400;
+	//ScreenY0 -= 0;
+	ScreenY1 += 800;
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apPlayerInfos[i];
+		if(!pInfo)
+		{
+			continue;
+		}
+
+		vec2 *pRenderPos;
+		if(m_pClient->m_aClients[i].m_SpecCharPresent)
+		{
+			// Each player can also have a spec char whose nameplate is displayed independently
+			pRenderPos = &m_pClient->m_aClients[i].m_SpecChar;
+			// don't render offscreen
+			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
+			{
+				RenderNameplatePos(m_pClient->m_aClients[i].m_SpecChar, pInfo, 0.4f, true);
+			}
+		}
+		if(m_pClient->m_Snap.m_aCharacters[i].m_Active)
+		{
+			// Only render nameplates for active characters
+			pRenderPos = &m_pClient->m_aClients[i].m_RenderPos;
+			// don't render offscreen
+			if(!(pRenderPos->x < ScreenX0) && !(pRenderPos->x > ScreenX1) && !(pRenderPos->y < ScreenY0) && !(pRenderPos->y > ScreenY1))
+			{
+				RenderNameplate(
+					&m_pClient->m_Snap.m_aCharacters[i].m_Prev,
+					&m_pClient->m_Snap.m_aCharacters[i].m_Cur,
+					pInfo);
+			}
+		}
+	}
+}
+
+void CNamePlates::SetPlayers(CPlayers *pPlayers)
+{
+	m_pPlayers = pPlayers;
+}
+
+void CNamePlates::ResetNamePlates()
+{
+	for(auto &NamePlate : m_aNamePlates)
+	{
+		TextRender()->DeleteTextContainer(NamePlate.m_NameTextContainerIndex);
+		TextRender()->DeleteTextContainer(NamePlate.m_ClanNameTextContainerIndex);
+
+		NamePlate.Reset();
+	}
+}
+
+void CNamePlates::OnWindowResize()
+{
+	ResetNamePlates();
+}
+
+void CNamePlates::OnInit()
+{
+	ResetNamePlates();
+
+	// Quad for the direction arrows above the player
+	m_DirectionQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+	RenderTools()->QuadContainerAddSprite(m_DirectionQuadContainerIndex, 0.f, 0.f, 22.f);
+	Graphics()->QuadContainerUpload(m_DirectionQuadContainerIndex);
+}
diff --git a/src_bkp/game/client/components/nameplates.h b/src_bkp/game/client/components/nameplates.h
new file mode 100644
index 0000000000..24042f8fde
--- /dev/null
+++ b/src_bkp/game/client/components/nameplates.h
@@ -0,0 +1,66 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_NAMEPLATES_H
+#define GAME_CLIENT_COMPONENTS_NAMEPLATES_H
+#include <base/vmath.h>
+
+#include <engine/shared/protocol.h>
+
+#include <game/client/component.h>
+
+struct CNetObj_Character;
+struct CNetObj_PlayerInfo;
+
+struct SPlayerNamePlate
+{
+	SPlayerNamePlate()
+	{
+		Reset();
+	}
+
+	void Reset()
+	{
+		m_NameTextContainerIndex.Reset();
+		m_ClanNameTextContainerIndex.Reset();
+		m_aName[0] = 0;
+		m_aClanName[0] = 0;
+		m_NameTextWidth = m_ClanNameTextWidth = 0.f;
+		m_NameTextFontSize = m_ClanNameTextFontSize = 0;
+	}
+
+	char m_aName[MAX_NAME_LENGTH];
+	float m_NameTextWidth;
+	STextContainerIndex m_NameTextContainerIndex;
+	float m_NameTextFontSize;
+
+	char m_aClanName[MAX_CLAN_LENGTH];
+	float m_ClanNameTextWidth;
+	STextContainerIndex m_ClanNameTextContainerIndex;
+	float m_ClanNameTextFontSize;
+};
+
+class CNamePlates : public CComponent
+{
+	void RenderNameplate(
+		const CNetObj_Character *pPrevChar,
+		const CNetObj_Character *pPlayerChar,
+		const CNetObj_PlayerInfo *pPlayerInfo);
+	void RenderNameplatePos(vec2 Position, const CNetObj_PlayerInfo *pPlayerInfo, float Alpha, bool ForceAlpha = false);
+
+	SPlayerNamePlate m_aNamePlates[MAX_CLIENTS];
+	class CPlayers *m_pPlayers;
+
+	void ResetNamePlates();
+
+	int m_DirectionQuadContainerIndex;
+
+public:
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnWindowResize() override;
+	virtual void OnInit() override;
+	virtual void OnRender() override;
+
+	void SetPlayers(class CPlayers *pPlayers);
+};
+
+#endif
diff --git a/src/game/client/components/outlines.cpp b/src_bkp/game/client/components/outlines.cpp
similarity index 100%
rename from src/game/client/components/outlines.cpp
rename to src_bkp/game/client/components/outlines.cpp
diff --git a/src/game/client/components/outlines.h b/src_bkp/game/client/components/outlines.h
similarity index 100%
rename from src/game/client/components/outlines.h
rename to src_bkp/game/client/components/outlines.h
diff --git a/src/game/client/components/parser.cpp b/src_bkp/game/client/components/parser.cpp
similarity index 100%
rename from src/game/client/components/parser.cpp
rename to src_bkp/game/client/components/parser.cpp
diff --git a/src/game/client/components/parser.h b/src_bkp/game/client/components/parser.h
similarity index 100%
rename from src/game/client/components/parser.h
rename to src_bkp/game/client/components/parser.h
diff --git a/src_bkp/game/client/components/particles.cpp b/src_bkp/game/client/components/particles.cpp
new file mode 100644
index 0000000000..d076939de6
--- /dev/null
+++ b/src_bkp/game/client/components/particles.cpp
@@ -0,0 +1,344 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <engine/demo.h>
+#include <engine/graphics.h>
+
+#include "particles.h"
+#include <game/client/render.h>
+#include <game/generated/client_data.h>
+
+#include <game/client/gameclient.h>
+
+CParticles::CParticles()
+{
+	OnReset();
+	m_RenderTrail.m_pParts = this;
+	m_RenderExplosions.m_pParts = this;
+	m_RenderExtra.m_pParts = this;
+	m_RenderGeneral.m_pParts = this;
+}
+
+void CParticles::OnReset()
+{
+	// reset particles
+	for(int i = 0; i < MAX_PARTICLES; i++)
+	{
+		m_aParticles[i].m_PrevPart = i - 1;
+		m_aParticles[i].m_NextPart = i + 1;
+	}
+
+	m_aParticles[0].m_PrevPart = 0;
+	m_aParticles[MAX_PARTICLES - 1].m_NextPart = -1;
+	m_FirstFree = 0;
+
+	for(int &FirstPart : m_aFirstPart)
+		FirstPart = -1;
+}
+
+void CParticles::Add(int Group, CParticle *pPart, float TimePassed)
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		if(pInfo->m_Paused)
+			return;
+	}
+	else
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+			return;
+	}
+
+	if(m_FirstFree == -1)
+		return;
+
+	// remove from the free list
+	int Id = m_FirstFree;
+	m_FirstFree = m_aParticles[Id].m_NextPart;
+	if(m_FirstFree != -1)
+		m_aParticles[m_FirstFree].m_PrevPart = -1;
+
+	// copy data
+	m_aParticles[Id] = *pPart;
+
+	// insert to the group list
+	m_aParticles[Id].m_PrevPart = -1;
+	m_aParticles[Id].m_NextPart = m_aFirstPart[Group];
+	if(m_aFirstPart[Group] != -1)
+		m_aParticles[m_aFirstPart[Group]].m_PrevPart = Id;
+	m_aFirstPart[Group] = Id;
+
+	// set some parameters
+	m_aParticles[Id].m_Life = TimePassed;
+}
+
+void CParticles::Update(float TimePassed)
+{
+	if(TimePassed <= 0.0f)
+		return;
+
+	static float FrictionFraction = 0;
+	FrictionFraction += TimePassed;
+
+	if(FrictionFraction > 2.0f) // safety measure
+		FrictionFraction = 0;
+
+	int FrictionCount = 0;
+	while(FrictionFraction > 0.05f)
+	{
+		FrictionCount++;
+		FrictionFraction -= 0.05f;
+	}
+
+	for(int &FirstPart : m_aFirstPart)
+	{
+		int i = FirstPart;
+		while(i != -1)
+		{
+			int Next = m_aParticles[i].m_NextPart;
+			//m_aParticles[i].vel += flow_get(m_aParticles[i].pos)*time_passed * m_aParticles[i].flow_affected;
+			m_aParticles[i].m_Vel.y += m_aParticles[i].m_Gravity * TimePassed;
+
+			for(int f = 0; f < FrictionCount; f++) // apply friction
+				m_aParticles[i].m_Vel *= m_aParticles[i].m_Friction;
+
+			// move the point
+			vec2 Vel = m_aParticles[i].m_Vel * TimePassed;
+			if(m_aParticles[i].m_Collides)
+			{
+				Collision()->MovePoint(&m_aParticles[i].m_Pos, &Vel, random_float(0.1f, 1.0f), NULL);
+			}
+			else
+			{
+				m_aParticles[i].m_Pos += Vel;
+			}
+			m_aParticles[i].m_Vel = Vel * (1.0f / TimePassed);
+
+			m_aParticles[i].m_Life += TimePassed;
+			m_aParticles[i].m_Rot += TimePassed * m_aParticles[i].m_Rotspeed;
+
+			// check particle death
+			if(m_aParticles[i].m_Life > m_aParticles[i].m_LifeSpan)
+			{
+				// remove it from the group list
+				if(m_aParticles[i].m_PrevPart != -1)
+					m_aParticles[m_aParticles[i].m_PrevPart].m_NextPart = m_aParticles[i].m_NextPart;
+				else
+					FirstPart = m_aParticles[i].m_NextPart;
+
+				if(m_aParticles[i].m_NextPart != -1)
+					m_aParticles[m_aParticles[i].m_NextPart].m_PrevPart = m_aParticles[i].m_PrevPart;
+
+				// insert to the free list
+				if(m_FirstFree != -1)
+					m_aParticles[m_FirstFree].m_PrevPart = i;
+				m_aParticles[i].m_PrevPart = -1;
+				m_aParticles[i].m_NextPart = m_FirstFree;
+				m_FirstFree = i;
+			}
+
+			i = Next;
+		}
+	}
+}
+
+void CParticles::OnRender()
+{
+	if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		return;
+
+	set_new_tick();
+	static int64_t LastTime = 0;
+	int64_t t = time();
+
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		if(!pInfo->m_Paused)
+			Update((float)((t - LastTime) / (double)time_freq()) * pInfo->m_Speed);
+	}
+	else
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+			Update((float)((t - LastTime) / (double)time_freq()));
+	}
+
+	LastTime = t;
+}
+
+void CParticles::OnInit()
+{
+	Graphics()->QuadsSetRotation(0);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	m_ParticleQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+
+	for(int i = 0; i <= (SPRITE_PART9 - SPRITE_PART_SLICE); ++i)
+	{
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->QuadContainerAddSprite(m_ParticleQuadContainerIndex, 1.f);
+	}
+	Graphics()->QuadContainerUpload(m_ParticleQuadContainerIndex);
+
+	m_ExtraParticleQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+
+	// TODO: Use a loop similar to the one for m_ParticleQuadContainerIndex if you add more additional particles
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_ExtraParticleQuadContainerIndex, 1.f);
+	Graphics()->QuadContainerUpload(m_ExtraParticleQuadContainerIndex);
+}
+
+bool CParticles::ParticleIsVisibleOnScreen(const vec2 &CurPos, float CurSize)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	// for simplicity assume the worst case rotation, that increases the bounding box around the particle by its diagonal
+	const float SqrtOf2 = std::sqrt(2);
+	CurSize = SqrtOf2 * CurSize;
+
+	// always uses the mid of the particle
+	float SizeHalf = CurSize / 2;
+
+	return CurPos.x + SizeHalf >= ScreenX0 && CurPos.x - SizeHalf <= ScreenX1 && CurPos.y + SizeHalf >= ScreenY0 && CurPos.y - SizeHalf <= ScreenY1;
+}
+
+void CParticles::RenderGroup(int Group)
+{
+	IGraphics::CTextureHandle *aParticles = GameClient()->m_ParticlesSkin.m_aSpriteParticles;
+	int FirstParticleOffset = SPRITE_PART_SLICE;
+	int ParticleQuadContainerIndex = m_ParticleQuadContainerIndex;
+	if(Group == GROUP_EXTRA)
+	{
+		aParticles = GameClient()->m_ExtrasSkin.m_aSpriteParticles;
+		FirstParticleOffset = SPRITE_PART_SNOWFLAKE;
+		ParticleQuadContainerIndex = m_ExtraParticleQuadContainerIndex;
+	}
+
+	// don't use the buffer methods here, else the old renderer gets many draw calls
+	if(Graphics()->IsQuadContainerBufferingEnabled())
+	{
+		int i = m_aFirstPart[Group];
+
+		static IGraphics::SRenderSpriteInfo s_aParticleRenderInfo[MAX_PARTICLES];
+
+		int CurParticleRenderCount = 0;
+
+		// batching makes sense for stuff like ninja particles
+		ColorRGBA LastColor;
+		int LastQuadOffset = 0;
+
+		if(i != -1)
+		{
+			float Alpha = m_aParticles[i].m_Color.a;
+			if(m_aParticles[i].m_UseAlphaFading)
+			{
+				float a = m_aParticles[i].m_Life / m_aParticles[i].m_LifeSpan;
+				Alpha = mix(m_aParticles[i].m_StartAlpha, m_aParticles[i].m_EndAlpha, a);
+			}
+			LastColor.r = m_aParticles[i].m_Color.r;
+			LastColor.g = m_aParticles[i].m_Color.g;
+			LastColor.b = m_aParticles[i].m_Color.b;
+			LastColor.a = Alpha;
+
+			Graphics()->SetColor(
+				m_aParticles[i].m_Color.r,
+				m_aParticles[i].m_Color.g,
+				m_aParticles[i].m_Color.b,
+				Alpha);
+
+			LastQuadOffset = m_aParticles[i].m_Spr;
+		}
+
+		while(i != -1)
+		{
+			int QuadOffset = m_aParticles[i].m_Spr;
+			float a = m_aParticles[i].m_Life / m_aParticles[i].m_LifeSpan;
+			vec2 p = m_aParticles[i].m_Pos;
+			float Size = mix(m_aParticles[i].m_StartSize, m_aParticles[i].m_EndSize, a);
+			float Alpha = m_aParticles[i].m_Color.a;
+			if(m_aParticles[i].m_UseAlphaFading)
+			{
+				Alpha = mix(m_aParticles[i].m_StartAlpha, m_aParticles[i].m_EndAlpha, a);
+			}
+
+			// the current position, respecting the size, is inside the viewport, render it, else ignore
+			if(ParticleIsVisibleOnScreen(p, Size))
+			{
+				if((size_t)CurParticleRenderCount == gs_GraphicsMaxParticlesRenderCount || LastColor.r != m_aParticles[i].m_Color.r || LastColor.g != m_aParticles[i].m_Color.g || LastColor.b != m_aParticles[i].m_Color.b || LastColor.a != Alpha || LastQuadOffset != QuadOffset)
+				{
+					Graphics()->TextureSet(aParticles[LastQuadOffset - FirstParticleOffset]);
+					Graphics()->RenderQuadContainerAsSpriteMultiple(ParticleQuadContainerIndex, LastQuadOffset - FirstParticleOffset, CurParticleRenderCount, s_aParticleRenderInfo);
+					CurParticleRenderCount = 0;
+					LastQuadOffset = QuadOffset;
+
+					Graphics()->SetColor(
+						m_aParticles[i].m_Color.r,
+						m_aParticles[i].m_Color.g,
+						m_aParticles[i].m_Color.b,
+						Alpha);
+
+					LastColor.r = m_aParticles[i].m_Color.r;
+					LastColor.g = m_aParticles[i].m_Color.g;
+					LastColor.b = m_aParticles[i].m_Color.b;
+					LastColor.a = Alpha;
+				}
+
+				s_aParticleRenderInfo[CurParticleRenderCount].m_Pos[0] = p.x;
+				s_aParticleRenderInfo[CurParticleRenderCount].m_Pos[1] = p.y;
+				s_aParticleRenderInfo[CurParticleRenderCount].m_Scale = Size;
+				s_aParticleRenderInfo[CurParticleRenderCount].m_Rotation = m_aParticles[i].m_Rot;
+
+				++CurParticleRenderCount;
+			}
+
+			i = m_aParticles[i].m_NextPart;
+		}
+
+		Graphics()->TextureSet(aParticles[LastQuadOffset - FirstParticleOffset]);
+		Graphics()->RenderQuadContainerAsSpriteMultiple(ParticleQuadContainerIndex, LastQuadOffset - FirstParticleOffset, CurParticleRenderCount, s_aParticleRenderInfo);
+	}
+	else
+	{
+		int i = m_aFirstPart[Group];
+
+		Graphics()->BlendNormal();
+		Graphics()->WrapClamp();
+
+		while(i != -1)
+		{
+			float a = m_aParticles[i].m_Life / m_aParticles[i].m_LifeSpan;
+			vec2 p = m_aParticles[i].m_Pos;
+			float Size = mix(m_aParticles[i].m_StartSize, m_aParticles[i].m_EndSize, a);
+			float Alpha = m_aParticles[i].m_Color.a;
+			if(m_aParticles[i].m_UseAlphaFading)
+			{
+				Alpha = mix(m_aParticles[i].m_StartAlpha, m_aParticles[i].m_EndAlpha, a);
+			}
+
+			// the current position, respecting the size, is inside the viewport, render it, else ignore
+			if(ParticleIsVisibleOnScreen(p, Size))
+			{
+				Graphics()->TextureSet(aParticles[m_aParticles[i].m_Spr - FirstParticleOffset]);
+				Graphics()->QuadsBegin();
+
+				Graphics()->QuadsSetRotation(m_aParticles[i].m_Rot);
+
+				Graphics()->SetColor(
+					m_aParticles[i].m_Color.r,
+					m_aParticles[i].m_Color.g,
+					m_aParticles[i].m_Color.b,
+					Alpha);
+
+				IGraphics::CQuadItem QuadItem(p.x, p.y, Size, Size);
+				Graphics()->QuadsDraw(&QuadItem, 1);
+				Graphics()->QuadsEnd();
+			}
+
+			i = m_aParticles[i].m_NextPart;
+		}
+		Graphics()->WrapNormal();
+		Graphics()->BlendNormal();
+	}
+}
diff --git a/src_bkp/game/client/components/particles.h b/src_bkp/game/client/components/particles.h
new file mode 100644
index 0000000000..eb32993ceb
--- /dev/null
+++ b/src_bkp/game/client/components/particles.h
@@ -0,0 +1,117 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_PARTICLES_H
+#define GAME_CLIENT_COMPONENTS_PARTICLES_H
+#include <base/vmath.h>
+#include <game/client/component.h>
+
+// particles
+struct CParticle
+{
+	void SetDefault()
+	{
+		m_Pos = vec2(0, 0);
+		m_Vel = vec2(0, 0);
+		m_LifeSpan = 0;
+		m_StartSize = 32;
+		m_EndSize = 32;
+		m_UseAlphaFading = false;
+		m_StartAlpha = 1;
+		m_EndAlpha = 1;
+		m_Rot = 0;
+		m_Rotspeed = 0;
+		m_Gravity = 0;
+		m_Friction = 0;
+		m_FlowAffected = 1.0f;
+		m_Color = ColorRGBA(1, 1, 1, 1);
+		m_Collides = true;
+	}
+
+	vec2 m_Pos;
+	vec2 m_Vel;
+
+	int m_Spr;
+
+	float m_FlowAffected;
+
+	float m_LifeSpan;
+
+	float m_StartSize;
+	float m_EndSize;
+
+	bool m_UseAlphaFading;
+	float m_StartAlpha;
+	float m_EndAlpha;
+
+	float m_Rot;
+	float m_Rotspeed;
+
+	float m_Gravity;
+	float m_Friction;
+
+	ColorRGBA m_Color;
+
+	bool m_Collides;
+
+	// set by the particle system
+	float m_Life;
+	int m_PrevPart;
+	int m_NextPart;
+};
+
+class CParticles : public CComponent
+{
+	friend class CGameClient;
+
+public:
+	enum
+	{
+		GROUP_PROJECTILE_TRAIL = 0,
+		GROUP_EXPLOSIONS,
+		GROUP_EXTRA,
+		GROUP_GENERAL,
+		NUM_GROUPS
+	};
+
+	CParticles();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	void Add(int Group, CParticle *pPart, float TimePassed = 0.f);
+
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+	virtual void OnInit() override;
+
+private:
+	int m_ParticleQuadContainerIndex;
+	int m_ExtraParticleQuadContainerIndex;
+
+	enum
+	{
+		MAX_PARTICLES = 1024 * 8,
+	};
+
+	CParticle m_aParticles[MAX_PARTICLES];
+	int m_FirstFree;
+	int m_aFirstPart[NUM_GROUPS];
+
+	void RenderGroup(int Group);
+	void Update(float TimePassed);
+
+	template<int TGROUP>
+	class CRenderGroup : public CComponent
+	{
+	public:
+		CParticles *m_pParts;
+		virtual int Sizeof() const override { return sizeof(*this); }
+		virtual void OnRender() override { m_pParts->RenderGroup(TGROUP); }
+	};
+
+	CRenderGroup<GROUP_PROJECTILE_TRAIL> m_RenderTrail;
+	CRenderGroup<GROUP_EXPLOSIONS> m_RenderExplosions;
+	CRenderGroup<GROUP_EXTRA> m_RenderExtra;
+	CRenderGroup<GROUP_GENERAL> m_RenderGeneral;
+
+	bool ParticleIsVisibleOnScreen(const vec2 &CurPos, float CurSize);
+};
+#endif
diff --git a/src_bkp/game/client/components/players.cpp b/src_bkp/game/client/components/players.cpp
new file mode 100644
index 0000000000..cc425e206e
--- /dev/null
+++ b/src_bkp/game/client/components/players.cpp
@@ -0,0 +1,1015 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <game/gamecore.h>
+#include <game/generated/client_data.h>
+#include <game/generated/protocol.h>
+
+#include <game/mapitems.h>
+
+#include <game/client/animstate.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+
+#include <game/client/components/controls.h>
+#include <game/client/components/effects.h>
+#include <game/client/components/flow.h>
+#include <game/client/components/skins.h>
+#include <game/client/components/sounds.h>
+
+#include "players.h"
+#include <base/color.h>
+#include <base/math.h>
+
+void CPlayers::RenderHand(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha)
+{
+	vec2 HandPos = CenterPos + Dir;
+	float Angle = angle(Dir);
+	if(Dir.x < 0)
+		Angle -= AngleOffset;
+	else
+		Angle += AngleOffset;
+
+	vec2 DirX = Dir;
+	vec2 DirY(-Dir.y, Dir.x);
+
+	if(Dir.x < 0)
+		DirY = -DirY;
+
+	HandPos += DirX * PostRotOffset.x;
+	HandPos += DirY * PostRotOffset.y;
+
+	const CSkin::SSkinTextures *pSkinTextures = pInfo->m_CustomColoredSkin ? &pInfo->m_ColorableRenderSkin : &pInfo->m_OriginalRenderSkin;
+
+	Graphics()->SetColor(pInfo->m_ColorBody.r, pInfo->m_ColorBody.g, pInfo->m_ColorBody.b, Alpha);
+
+	// two passes
+	for(int i = 0; i < 2; i++)
+	{
+		int QuadOffset = NUM_WEAPONS * 2 + i;
+		Graphics()->QuadsSetRotation(Angle);
+		Graphics()->TextureSet(i == 0 ? pSkinTextures->m_HandsOutline : pSkinTextures->m_Hands);
+		Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, HandPos.x, HandPos.y);
+	}
+}
+
+inline float AngularMixDirection(float Src, float Dst) { return std::sin(Dst - Src) > 0 ? 1 : -1; }
+
+inline float AngularApproach(float Src, float Dst, float Amount)
+{
+	float d = AngularMixDirection(Src, Dst);
+	float n = Src + Amount * d;
+	if(AngularMixDirection(n, Dst) != d)
+		return Dst;
+	return n;
+}
+
+float CPlayers::GetPlayerTargetAngle(
+	const CNetObj_Character *pPrevChar,
+	const CNetObj_Character *pPlayerChar,
+	int ClientID,
+	float Intra)
+{
+	float AngleIntraTick = Intra;
+	// using unpredicted angle when rendering other players in-game
+	if(ClientID >= 0)
+		AngleIntraTick = Client()->IntraGameTick(g_Config.m_ClDummy);
+	if(ClientID >= 0 && m_pClient->m_Snap.m_aCharacters[ClientID].m_HasExtendedDisplayInfo)
+	{
+		CNetObj_DDNetCharacter *pExtendedData = &m_pClient->m_Snap.m_aCharacters[ClientID].m_ExtendedData;
+		if(m_pClient->m_Snap.m_aCharacters[ClientID].m_PrevExtendedData)
+		{
+			const CNetObj_DDNetCharacter *PrevExtendedData = m_pClient->m_Snap.m_aCharacters[ClientID].m_PrevExtendedData;
+
+			float MixX = mix((float)PrevExtendedData->m_TargetX, (float)pExtendedData->m_TargetX, AngleIntraTick);
+			float MixY = mix((float)PrevExtendedData->m_TargetY, (float)pExtendedData->m_TargetY, AngleIntraTick);
+
+			return angle(vec2(MixX, MixY));
+		}
+		else
+		{
+			return angle(vec2(pExtendedData->m_TargetX, pExtendedData->m_TargetY));
+		}
+	}
+	else
+	{
+		// If the player moves their weapon through top, then change
+		// the end angle by 2*Pi, so that the mix function will use the
+		// short path and not the long one.
+		if(pPlayerChar->m_Angle > (256.0f * pi) && pPrevChar->m_Angle < 0)
+		{
+			return mix((float)pPrevChar->m_Angle, (float)(pPlayerChar->m_Angle - 256.0f * 2 * pi), AngleIntraTick) / 256.0f;
+		}
+		else if(pPlayerChar->m_Angle < 0 && pPrevChar->m_Angle > (256.0f * pi))
+		{
+			return mix((float)pPrevChar->m_Angle, (float)(pPlayerChar->m_Angle + 256.0f * 2 * pi), AngleIntraTick) / 256.0f;
+		}
+		else
+		{
+			return mix((float)pPrevChar->m_Angle, (float)pPlayerChar->m_Angle, AngleIntraTick) / 256.0f;
+		}
+	}
+}
+
+void CPlayers::RenderHookCollLine(
+	const CNetObj_Character *pPrevChar,
+	const CNetObj_Character *pPlayerChar,
+	int ClientID,
+	float Intra)
+{
+	CNetObj_Character Prev;
+	CNetObj_Character Player;
+	Prev = *pPrevChar;
+	Player = *pPlayerChar;
+
+	bool Local = m_pClient->m_Snap.m_LocalClientID == ClientID;
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
+	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	Alpha *= (float)g_Config.m_ClHookCollAlpha / 100;
+
+	float IntraTick = Intra;
+	if(ClientID >= 0)
+		IntraTick = m_pClient->m_aClients[ClientID].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+
+	float Angle;
+	if(Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		// just use the direct input if it's the local player we are rendering
+		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy]);
+	}
+	else
+	{
+		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientID, IntraTick);
+	}
+
+	vec2 Direction = direction(Angle);
+	vec2 Position;
+	if(in_range(ClientID, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	else
+		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
+	// draw hook collision line
+	{
+		bool AlwaysRenderHookColl = GameClient()->m_GameInfo.m_AllowHookColl && (Local ? g_Config.m_ClShowHookCollOwn : g_Config.m_ClShowHookCollOther) == 2;
+		bool RenderHookCollPlayer = ClientID >= 0 && Player.m_PlayerFlags & PLAYERFLAG_AIM && (Local ? g_Config.m_ClShowHookCollOwn : g_Config.m_ClShowHookCollOther) > 0;
+		if(Local && GameClient()->m_GameInfo.m_AllowHookColl && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+			RenderHookCollPlayer = GameClient()->m_Controls.m_aShowHookColl[g_Config.m_ClDummy] && g_Config.m_ClShowHookCollOwn > 0;
+
+		bool RenderHookCollVideo = true;
+#if defined(CONF_VIDEORECORDER)
+		RenderHookCollVideo = !IVideo::Current() || g_Config.m_ClVideoShowHookCollOther || Local;
+#endif
+		if((AlwaysRenderHookColl || RenderHookCollPlayer) && RenderHookCollVideo)
+		{
+			vec2 ExDirection = Direction;
+
+			if(Local && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+			{
+				ExDirection = normalize(vec2((int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].x, (int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].y));
+
+				// fix direction if mouse is exactly in the center
+				if(!(int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].x && !(int)m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy].y)
+					ExDirection = vec2(1, 0);
+			}
+			Graphics()->TextureClear();
+			vec2 InitPos = Position;
+			vec2 FinishPos = InitPos + ExDirection * (m_pClient->m_aTuning[g_Config.m_ClDummy].m_HookLength - 42.0f);
+
+			if(g_Config.m_ClHookCollSize > 0)
+				Graphics()->QuadsBegin();
+			else
+				Graphics()->LinesBegin();
+
+			ColorRGBA HookCollColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClHookCollColorNoColl));
+
+			vec2 OldPos = InitPos + ExDirection * CCharacterCore::PhysicalSize() * 1.5f;
+			vec2 NewPos = OldPos;
+
+			bool DoBreak = false;
+
+			do
+			{
+				OldPos = NewPos;
+				NewPos = OldPos + ExDirection * m_pClient->m_aTuning[g_Config.m_ClDummy].m_HookFireSpeed;
+
+				if(distance(InitPos, NewPos) > m_pClient->m_aTuning[g_Config.m_ClDummy].m_HookLength)
+				{
+					NewPos = InitPos + normalize(NewPos - InitPos) * m_pClient->m_aTuning[g_Config.m_ClDummy].m_HookLength;
+					DoBreak = true;
+				}
+
+				int Hit = Collision()->IntersectLineTeleHook(OldPos, NewPos, &FinishPos, 0x0);
+
+				if(!DoBreak && Hit)
+				{
+					if(Hit != TILE_NOHOOK)
+					{
+						HookCollColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClHookCollColorHookableColl));
+					}
+				}
+
+				if(m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientID) != -1)
+				{
+					HookCollColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClHookCollColorTeeColl));
+					break;
+				}
+
+				if(Hit)
+					break;
+
+				NewPos.x = round_to_int(NewPos.x);
+				NewPos.y = round_to_int(NewPos.y);
+
+				if(OldPos == NewPos)
+					break;
+
+				ExDirection.x = round_to_int(ExDirection.x * 256.0f) / 256.0f;
+				ExDirection.y = round_to_int(ExDirection.y * 256.0f) / 256.0f;
+			} while(!DoBreak);
+
+			if(AlwaysRenderHookColl && RenderHookCollPlayer)
+			{
+				// invert the hook coll colors when using cl_show_hook_coll_always and +showhookcoll is pressed
+				HookCollColor = color_invert(HookCollColor);
+			}
+			Graphics()->SetColor(HookCollColor.WithAlpha(Alpha));
+			if(g_Config.m_ClHookCollSize > 0)
+			{
+				float LineWidth = 0.5f + (float)(g_Config.m_ClHookCollSize - 1) * 0.25f;
+				vec2 PerpToAngle = normalize(vec2(ExDirection.y, -ExDirection.x)) * GameClient()->m_Camera.m_Zoom;
+				vec2 Pos0 = FinishPos + PerpToAngle * -LineWidth;
+				vec2 Pos1 = FinishPos + PerpToAngle * LineWidth;
+				vec2 Pos2 = InitPos + PerpToAngle * -LineWidth;
+				vec2 Pos3 = InitPos + PerpToAngle * LineWidth;
+				IGraphics::CFreeformItem FreeformItem(Pos0.x, Pos0.y, Pos1.x, Pos1.y, Pos2.x, Pos2.y, Pos3.x, Pos3.y);
+				Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
+				Graphics()->QuadsEnd();
+			}
+			else
+			{
+				IGraphics::CLineItem LineItem(InitPos.x, InitPos.y, FinishPos.x, FinishPos.y);
+				Graphics()->LinesDraw(&LineItem, 1);
+				Graphics()->LinesEnd();
+			}
+		}
+	}
+}
+void CPlayers::RenderHook(
+	const CNetObj_Character *pPrevChar,
+	const CNetObj_Character *pPlayerChar,
+	const CTeeRenderInfo *pRenderInfo,
+	int ClientID,
+	float Intra)
+{
+	CNetObj_Character Prev;
+	CNetObj_Character Player;
+	Prev = *pPrevChar;
+	Player = *pPlayerChar;
+
+	CTeeRenderInfo RenderInfo = *pRenderInfo;
+
+	// don't render hooks to not active character cores
+	if(pPlayerChar->m_HookedPlayer != -1 && !m_pClient->m_Snap.m_aCharacters[pPlayerChar->m_HookedPlayer].m_Active)
+		return;
+
+	float IntraTick = Intra;
+	if(ClientID >= 0)
+		IntraTick = (m_pClient->m_aClients[ClientID].m_IsPredicted) ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
+	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	if(ClientID == -2) // ghost
+		Alpha = g_Config.m_ClRaceGhostAlpha / 100.0f;
+
+	RenderInfo.m_Size = 64.0f;
+
+	vec2 Position;
+	if(in_range(ClientID, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	else
+		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
+
+	// draw hook
+	if(Prev.m_HookState > 0 && Player.m_HookState > 0)
+	{
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		if(ClientID < 0)
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
+
+		vec2 Pos = Position;
+		vec2 HookPos;
+
+		if(in_range(pPlayerChar->m_HookedPlayer, MAX_CLIENTS - 1))
+			HookPos = m_pClient->m_aClients[pPlayerChar->m_HookedPlayer].m_RenderPos;
+		else
+			HookPos = mix(vec2(Prev.m_HookX, Prev.m_HookY), vec2(Player.m_HookX, Player.m_HookY), IntraTick);
+
+		float d = distance(Pos, HookPos);
+		vec2 Dir = normalize(Pos - HookPos);
+
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteHookHead);
+		Graphics()->QuadsSetRotation(angle(Dir) + pi);
+		// render head
+		int QuadOffset = NUM_WEAPONS * 2 + 2;
+		if(g_Config.m_ClRainbowHook == 0){
+
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+		}
+		else
+		{
+			ColorHSVA ColorHSV(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f);
+			ColorRGBA ColorWithAlpha = color_cast<ColorRGBA>(ColorHSV);
+			ColorWithAlpha.a = Alpha;
+
+			Graphics()->SetColor(ColorWithAlpha);
+
+		}
+		Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, HookPos.x, HookPos.y);
+
+		// render chain
+		++QuadOffset;
+		static IGraphics::SRenderSpriteInfo s_aHookChainRenderInfo[1024];
+		int HookChainCount = 0;
+		for(float f = 24; f < d && HookChainCount < 1024; f += 24, ++HookChainCount)
+		{
+			vec2 p = HookPos + Dir * f;
+			s_aHookChainRenderInfo[HookChainCount].m_Pos[0] = p.x;
+			s_aHookChainRenderInfo[HookChainCount].m_Pos[1] = p.y;
+			s_aHookChainRenderInfo[HookChainCount].m_Scale = 1;
+			s_aHookChainRenderInfo[HookChainCount].m_Rotation = angle(Dir) + pi;
+		}
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteHookChain);
+		Graphics()->RenderQuadContainerAsSpriteMultiple(m_WeaponEmoteQuadContainerIndex, QuadOffset, HookChainCount, s_aHookChainRenderInfo);
+
+		Graphics()->QuadsSetRotation(0);
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		RenderHand(&RenderInfo, Position, normalize(HookPos - Pos), -pi / 2, vec2(20, 0), Alpha);
+	}
+}
+
+void CPlayers::RenderPlayer(
+	const CNetObj_Character *pPrevChar,
+	const CNetObj_Character *pPlayerChar,
+	const CTeeRenderInfo *pRenderInfo,
+	int ClientID,
+	float Intra)
+{
+	CNetObj_Character Prev;
+	CNetObj_Character Player;
+	Prev = *pPrevChar;
+	Player = *pPlayerChar;
+
+	CTeeRenderInfo RenderInfo = *pRenderInfo;
+
+	bool Local = m_pClient->m_Snap.m_LocalClientID == ClientID;
+	bool OtherTeam = m_pClient->IsOtherTeam(ClientID);
+	float Alpha = (OtherTeam || ClientID < 0) ? g_Config.m_ClShowOthersAlpha / 100.0f : 1.0f;
+	if(ClientID == -2) // ghost
+		Alpha = g_Config.m_ClRaceGhostAlpha / 100.0f;
+
+	// set size
+	RenderInfo.m_Size = 64.0f;
+
+	float IntraTick = Intra;
+	if(ClientID >= 0)
+		IntraTick = m_pClient->m_aClients[ClientID].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy);
+
+	static float s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
+	static float s_LastPredIntraTick = Client()->PredIntraGameTick(g_Config.m_ClDummy);
+	if(m_pClient->m_Snap.m_pGameInfoObj && !(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED))
+	{
+		s_LastGameTickTime = Client()->GameTickTime(g_Config.m_ClDummy);
+		s_LastPredIntraTick = Client()->PredIntraGameTick(g_Config.m_ClDummy);
+	}
+
+	bool PredictLocalWeapons = false;
+	float AttackTime = (Client()->PrevGameTick(g_Config.m_ClDummy) - Player.m_AttackTick) / (float)Client()->GameTickSpeed() + Client()->GameTickTime(g_Config.m_ClDummy);
+	float LastAttackTime = (Client()->PrevGameTick(g_Config.m_ClDummy) - Player.m_AttackTick) / (float)Client()->GameTickSpeed() + s_LastGameTickTime;
+	if(ClientID >= 0 && m_pClient->m_aClients[ClientID].m_IsPredictedLocal && m_pClient->AntiPingGunfire())
+	{
+		PredictLocalWeapons = true;
+		AttackTime = (Client()->PredIntraGameTick(g_Config.m_ClDummy) + (Client()->PredGameTick(g_Config.m_ClDummy) - 1 - Player.m_AttackTick)) / (float)Client()->GameTickSpeed();
+		LastAttackTime = (s_LastPredIntraTick + (Client()->PredGameTick(g_Config.m_ClDummy) - 1 - Player.m_AttackTick)) / (float)Client()->GameTickSpeed();
+	}
+	float AttackTicksPassed = AttackTime * (float)Client()->GameTickSpeed();
+
+	float Angle;
+	if(Local && (!m_pClient->m_Snap.m_SpecInfo.m_Active || m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		// just use the direct input if it's the local player we are rendering
+		Angle = angle(m_pClient->m_Controls.m_aMousePos[g_Config.m_ClDummy]);
+	}
+	else
+	{
+		Angle = GetPlayerTargetAngle(&Prev, &Player, ClientID, IntraTick);
+	}
+
+	vec2 Direction = direction(Angle);
+	vec2 Position;
+	if(in_range(ClientID, MAX_CLIENTS - 1))
+		Position = m_pClient->m_aClients[ClientID].m_RenderPos;
+	else
+		Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), IntraTick);
+	vec2 Vel = mix(vec2(Prev.m_VelX / 256.0f, Prev.m_VelY / 256.0f), vec2(Player.m_VelX / 256.0f, Player.m_VelY / 256.0f), IntraTick);
+
+	m_pClient->m_Flow.Add(Position, Vel * 100.0f, 10.0f);
+
+	RenderInfo.m_GotAirJump = (Player.m_Jumped & 2) == 0;
+
+	RenderInfo.m_FeetFlipped = false;
+
+	bool Stationary = Player.m_VelX <= 1 && Player.m_VelX >= -1;
+	bool InAir = !Collision()->CheckPoint(Player.m_X, Player.m_Y + 16);
+	bool Running = Player.m_VelX >= 5000 || Player.m_VelX <= -5000;
+	bool WantOtherDir = (Player.m_Direction == -1 && Vel.x > 0) || (Player.m_Direction == 1 && Vel.x < 0);
+	bool Inactive = m_pClient->m_aClients[ClientID].m_Afk || m_pClient->m_aClients[ClientID].m_Paused;
+
+	// evaluate animation
+	float WalkTime = std::fmod(Position.x, 100.0f) / 100.0f;
+	float RunTime = std::fmod(Position.x, 200.0f) / 200.0f;
+
+	// Don't do a moon walk outside the left border
+	if(WalkTime < 0)
+		WalkTime += 1;
+	if(RunTime < 0)
+		RunTime += 1;
+
+	CAnimState State;
+	State.Set(&g_pData->m_aAnimations[ANIM_BASE], 0);
+
+	if(InAir)
+		State.Add(&g_pData->m_aAnimations[ANIM_INAIR], 0, 1.0f); // TODO: some sort of time here
+	else if(Stationary)
+	{
+		if(Inactive)
+		{
+			State.Add(Direction.x < 0 ? &g_pData->m_aAnimations[ANIM_SIT_LEFT] : &g_pData->m_aAnimations[ANIM_SIT_RIGHT], 0, 1.0f); // TODO: some sort of time here
+			RenderInfo.m_FeetFlipped = true;
+		}
+		else
+			State.Add(&g_pData->m_aAnimations[ANIM_IDLE], 0, 1.0f); // TODO: some sort of time here
+	}
+	else if(!WantOtherDir)
+	{
+		if(Running)
+			State.Add(Player.m_VelX < 0 ? &g_pData->m_aAnimations[ANIM_RUN_LEFT] : &g_pData->m_aAnimations[ANIM_RUN_RIGHT], RunTime, 1.0f);
+		else
+			State.Add(&g_pData->m_aAnimations[ANIM_WALK], WalkTime, 1.0f);
+	}
+
+	int CurrentWeapon = clamp(Player.m_Weapon, 0, NUM_WEAPONS - 1);
+	if(m_pClient->m_aClients[ClientID].m_FreezeEnd)
+	{
+		CurrentWeapon = WEAPON_NINJA;
+	}
+
+	if(CurrentWeapon == WEAPON_HAMMER)
+		State.Add(&g_pData->m_aAnimations[ANIM_HAMMER_SWING], clamp(LastAttackTime * 5.0f, 0.0f, 1.0f), 1.0f);
+	if(CurrentWeapon == WEAPON_NINJA)
+		State.Add(&g_pData->m_aAnimations[ANIM_NINJA_SWING], clamp(LastAttackTime * 2.0f, 0.0f, 1.0f), 1.0f);
+
+	// do skidding
+	if(!InAir && WantOtherDir && length(Vel * 50) > 500.0f)
+	{
+		static int64_t SkidSoundTime = 0;
+		if(time() - SkidSoundTime > time_freq() / 10)
+		{
+			if(g_Config.m_SndGame)
+				m_pClient->m_Sounds.PlayAt(CSounds::CHN_WORLD, SOUND_PLAYER_SKID, 0.25f, Position);
+			SkidSoundTime = time();
+		}
+
+		m_pClient->m_Effects.SkidTrail(
+			Position + vec2(-Player.m_Direction * 6, 12),
+			vec2(-Player.m_Direction * 100 * length(Vel), -50),
+			Alpha);
+	}
+
+	// rainbow
+
+	bool IsRainbowBody = g_Config.m_ClRainbow,
+	     IsRainbowFeet = g_Config.m_ClRainbow;
+
+	if(g_Config.m_ClRainbow == 1 && (m_pClient->m_Snap.m_LocalClientID == ClientID) == 1)
+	{
+		IsRainbowBody = true;
+		IsRainbowFeet = true;
+	}
+	else
+	{
+		IsRainbowBody = false;
+		IsRainbowFeet = false;
+	}
+
+	// draw gun
+	{
+		static vec2 s_aGunPositions[MAX_CLIENTS];
+
+		if(!(RenderInfo.m_TeeRenderFlags & TEE_NO_WEAPON))
+		{
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			Graphics()->QuadsSetRotation(State.GetAttach()->m_Angle * pi * 2 + Angle);
+
+			if(ClientID < 0)
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
+
+			// normal weapons
+
+			Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[CurrentWeapon]);
+			int QuadOffset = CurrentWeapon * 2 + (Direction.x < 0 ? 1 : 0);
+
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+
+			vec2 Dir = Direction;
+			float Recoil = 0.0f;
+			vec2 WeaponPosition;
+			bool IsSit = Inactive && !InAir && Stationary;
+
+			if(CurrentWeapon == WEAPON_HAMMER)
+			{
+				// static position for hammer
+				WeaponPosition = Position + vec2(State.GetAttach()->m_X, State.GetAttach()->m_Y);
+				WeaponPosition.y += g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsety;
+				if(Direction.x < 0)
+					WeaponPosition.x -= g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsetx;
+				if(IsSit)
+					WeaponPosition.y += 3.0f;
+
+				if(s_aGunPositions[ClientID] != vec2())
+					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimHammerSpeed);
+				s_aGunPositions[ClientID] = WeaponPosition;
+
+				// if active and attack is under way, bash stuffs
+				if(!Inactive || LastAttackTime < m_pClient->m_aTuning[g_Config.m_ClDummy].GetWeaponFireDelay(Player.m_Weapon))
+				{
+					if(Direction.x < 0)
+						Graphics()->QuadsSetRotation(-pi / 2 - State.GetAttach()->m_Angle * pi * 2);
+					else
+						Graphics()->QuadsSetRotation(-pi / 2 + State.GetAttach()->m_Angle * pi * 2);
+				}
+				else
+					Graphics()->QuadsSetRotation(Direction.x < 0 ? 100.0f : 500.0f);
+
+				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
+			}
+			else if(CurrentWeapon == WEAPON_NINJA)
+			{
+				WeaponPosition = Position;
+				WeaponPosition.y += g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsety;
+				if(IsSit)
+					WeaponPosition.y += 3.0f;
+
+				if(Direction.x < 0)
+				{
+					Graphics()->QuadsSetRotation(-pi / 2 - State.GetAttach()->m_Angle * pi * 2);
+					WeaponPosition.x -= g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsetx;
+					m_pClient->m_Effects.PowerupShine(WeaponPosition + vec2(32, 0), vec2(32, 12), Alpha);
+				}
+				else
+				{
+					Graphics()->QuadsSetRotation(-pi / 2 + State.GetAttach()->m_Angle * pi * 2);
+					m_pClient->m_Effects.PowerupShine(WeaponPosition - vec2(32, 0), vec2(32, 12), Alpha);
+				}
+
+				if(s_aGunPositions[ClientID] != vec2())
+					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimNinjaSpeed);
+				s_aGunPositions[ClientID] = WeaponPosition;
+
+				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
+
+				// NO HADOKEN ;(
+				if(AttackTime <= 1 / 6.f && g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles)
+				{
+					int IteX = rand() % g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles;
+					static int s_LastIteX = IteX;
+					if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+					{
+						const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+						if(pInfo->m_Paused)
+							IteX = s_LastIteX;
+						else
+							s_LastIteX = IteX;
+					}
+					else
+					{
+						if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+							IteX = s_LastIteX;
+						else
+							s_LastIteX = IteX;
+					}
+					if(g_pData->m_Weapons.m_aId[CurrentWeapon].m_aSpriteMuzzles[IteX])
+					{
+						if(PredictLocalWeapons)
+							Dir = vec2(pPlayerChar->m_X, pPlayerChar->m_Y) - vec2(pPrevChar->m_X, pPrevChar->m_Y);
+						else
+							Dir = vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_Y) - vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_Y);
+						float HadOkenAngle = 0;
+						if(absolute(Dir.x) > 0.0001f || absolute(Dir.y) > 0.0001f)
+						{
+							Dir = normalize(Dir);
+							HadOkenAngle = angle(Dir);
+						}
+						else
+						{
+							Dir = vec2(1, 0);
+						}
+						Graphics()->QuadsSetRotation(HadOkenAngle);
+						QuadOffset = IteX * 2;
+						vec2 DirY(-Dir.y, Dir.x);
+						WeaponPosition = Position;
+						float OffsetX = g_pData->m_Weapons.m_aId[CurrentWeapon].m_Muzzleoffsetx;
+						WeaponPosition -= Dir * OffsetX;
+						Graphics()->TextureSet(GameClient()->m_GameSkin.m_aaSpriteWeaponsMuzzles[CurrentWeapon][IteX]);
+						Graphics()->RenderQuadContainerAsSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[CurrentWeapon], QuadOffset, WeaponPosition.x, WeaponPosition.y);
+					}
+				}
+			}
+			else
+			{
+				// TODO: should be an animation
+				Recoil = 0;
+				float a = AttackTicksPassed / 5.0f;
+				if(a < 1)
+					Recoil = std::sin(a * pi);
+				WeaponPosition = Position + Dir * g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsetx - Dir * Recoil * 10.0f;
+				WeaponPosition.y += g_pData->m_Weapons.m_aId[CurrentWeapon].m_Offsety;
+				if(IsSit)
+					WeaponPosition.y += 3.0f;
+				if(Player.m_Weapon == WEAPON_GUN && g_Config.m_ClOldGunPosition)
+					WeaponPosition.y -= 8;
+
+				if(s_aGunPositions[ClientID] != vec2())
+					WeaponPosition = mix(s_aGunPositions[ClientID], WeaponPosition, 1.f / 100.f * g_Config.m_ClAnimGunsSpeed);
+				s_aGunPositions[ClientID] = WeaponPosition;
+
+				Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, WeaponPosition.x, WeaponPosition.y);
+			}
+
+			if(CurrentWeapon == WEAPON_GUN || Player.m_Weapon == WEAPON_SHOTGUN)
+			{
+				// check if we're firing stuff
+				if(g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles) // prev.attackticks)
+				{
+					float AlphaMuzzle = 0.0f;
+					if(AttackTicksPassed < g_pData->m_Weapons.m_aId[CurrentWeapon].m_Muzzleduration + 3)
+					{
+						float t = AttackTicksPassed / g_pData->m_Weapons.m_aId[CurrentWeapon].m_Muzzleduration;
+						AlphaMuzzle = mix(2.0f, 0.0f, minimum(1.0f, maximum(0.0f, t)));
+					}
+
+					int IteX = rand() % g_pData->m_Weapons.m_aId[CurrentWeapon].m_NumSpriteMuzzles;
+					static int s_LastIteX = IteX;
+					if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+					{
+						const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+						if(pInfo->m_Paused)
+							IteX = s_LastIteX;
+						else
+							s_LastIteX = IteX;
+					}
+					else
+					{
+						if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+							IteX = s_LastIteX;
+						else
+							s_LastIteX = IteX;
+					}
+					if(AlphaMuzzle > 0.0f && g_pData->m_Weapons.m_aId[CurrentWeapon].m_aSpriteMuzzles[IteX])
+					{
+						float OffsetY = -g_pData->m_Weapons.m_aId[CurrentWeapon].m_Muzzleoffsety;
+						QuadOffset = IteX * 2 + (Direction.x < 0 ? 1 : 0);
+						if(Direction.x < 0)
+							OffsetY = -OffsetY;
+
+						vec2 DirY(-Dir.y, Dir.x);
+						vec2 MuzzlePos = WeaponPosition + Dir * g_pData->m_Weapons.m_aId[CurrentWeapon].m_Muzzleoffsetx + DirY * OffsetY;
+						Graphics()->TextureSet(GameClient()->m_GameSkin.m_aaSpriteWeaponsMuzzles[CurrentWeapon][IteX]);
+						Graphics()->RenderQuadContainerAsSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[CurrentWeapon], QuadOffset, MuzzlePos.x, MuzzlePos.y);
+					}
+				}
+			}
+
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			Graphics()->QuadsSetRotation(0);
+
+			if(IsRainbowBody)
+				RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 20.f) % 255 / 255.f, 1.f, 1.f));
+
+			switch(Player.m_Weapon)
+			{
+			case WEAPON_GUN: RenderHand(&RenderInfo, WeaponPosition, Direction, -3 * pi / 4, vec2(-15, 4), Alpha); break;
+			case WEAPON_SHOTGUN: RenderHand(&RenderInfo, WeaponPosition, Direction, -pi / 2, vec2(-5, 4), Alpha); break;
+			case WEAPON_GRENADE: RenderHand(&RenderInfo, WeaponPosition, Direction, -pi / 2, vec2(-4, 7), Alpha); break;
+			}
+		}
+	}
+
+	// render the "shadow" tee
+	if(Local && ((g_Config.m_Debug && g_Config.m_ClUnpredictedShadow >= 0) || g_Config.m_ClUnpredictedShadow == 1))
+	{
+		vec2 ShadowPosition = Position;
+		if(ClientID >= 0)
+			ShadowPosition = mix(
+				vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Prev.m_Y),
+				vec2(m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_X, m_pClient->m_Snap.m_aCharacters[ClientID].m_Cur.m_Y),
+				Client()->IntraGameTick(g_Config.m_ClDummy));
+
+		CTeeRenderInfo Shadow = RenderInfo;
+		RenderTools()->RenderTee(&State, &Shadow, Player.m_Emote, Direction, ShadowPosition, 0.5f); // render ghost
+	}
+
+	if(IsRainbowBody)
+		RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f));
+	if(IsRainbowFeet)
+		RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * g_Config.m_ClRainbowSpeed) % 255 / 255.f, 1.f, 1.f));
+
+	RenderTools()->RenderTee(&State, &RenderInfo, Player.m_Emote, Direction, Position, Alpha, true, ClientID, InAir);
+
+	float TeeAnimScale, TeeBaseSize;
+	RenderTools()->GetRenderTeeAnimScaleAndBaseSize(&RenderInfo, TeeAnimScale, TeeBaseSize);
+	vec2 BodyPos = Position + vec2(State.GetBody()->m_X, State.GetBody()->m_Y) * TeeAnimScale;
+	if(RenderInfo.m_TeeRenderFlags & TEE_EFFECT_FROZEN)
+	{
+		GameClient()->m_Effects.FreezingFlakes(BodyPos, vec2(32, 32), Alpha);
+	}
+
+	int QuadOffsetToEmoticon = NUM_WEAPONS * 2 + 2 + 2;
+	if((Player.m_PlayerFlags & PLAYERFLAG_CHATTING) && !m_pClient->m_aClients[ClientID].m_Afk)
+	{
+		int CurEmoticon = (SPRITE_DOTDOT - SPRITE_OOP);
+		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[CurEmoticon]);
+		int QuadOffset = QuadOffsetToEmoticon + CurEmoticon;
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+		Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, Position.x + 24.f, Position.y - 40.f);
+
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		Graphics()->QuadsSetRotation(0);
+	}
+
+	if(ClientID < 0)
+		return;
+
+	if(g_Config.m_ClAfkEmote && m_pClient->m_aClients[ClientID].m_Afk && !(Client()->DummyConnected() && ClientID == m_pClient->m_aLocalIDs[!g_Config.m_ClDummy]))
+	{
+		int CurEmoticon = (SPRITE_ZZZ - SPRITE_OOP);
+		Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[CurEmoticon]);
+		int QuadOffset = QuadOffsetToEmoticon + CurEmoticon;
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, Alpha);
+		Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, Position.x + 24.f, Position.y - 40.f);
+
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		Graphics()->QuadsSetRotation(0);
+	}
+
+	if(g_Config.m_ClShowEmotes && !m_pClient->m_aClients[ClientID].m_EmoticonIgnore && m_pClient->m_aClients[ClientID].m_EmoticonStartTick != -1)
+	{
+		float SinceStart = (Client()->GameTick(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientID].m_EmoticonStartTick) + (Client()->IntraGameTickSincePrev(g_Config.m_ClDummy) - m_pClient->m_aClients[ClientID].m_EmoticonStartFraction);
+		float FromEnd = (2 * Client()->GameTickSpeed()) - SinceStart;
+
+		if(0 <= SinceStart && FromEnd > 0)
+		{
+			float a = 1;
+
+			if(FromEnd < Client()->GameTickSpeed() / 5)
+				a = FromEnd / (Client()->GameTickSpeed() / 5.0f);
+
+			float h = 1;
+			if(SinceStart < Client()->GameTickSpeed() / 10)
+				h = SinceStart / (Client()->GameTickSpeed() / 10.0f);
+
+			float Wiggle = 0;
+			if(SinceStart < Client()->GameTickSpeed() / 5)
+				Wiggle = SinceStart / (Client()->GameTickSpeed() / 5.0f);
+
+			float WiggleAngle = std::sin(5 * Wiggle);
+
+			Graphics()->QuadsSetRotation(pi / 6 * WiggleAngle);
+
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, a * Alpha);
+			// client_datas::emoticon is an offset from the first emoticon
+			int QuadOffset = QuadOffsetToEmoticon + m_pClient->m_aClients[ClientID].m_Emoticon;
+			Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[m_pClient->m_aClients[ClientID].m_Emoticon]);
+			Graphics()->RenderQuadContainerAsSprite(m_WeaponEmoteQuadContainerIndex, QuadOffset, Position.x, Position.y - 23.f - 32.f * h, 1.f, (64.f * h) / 64.f);
+
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+			Graphics()->QuadsSetRotation(0);
+		}
+	}
+}
+
+inline bool CPlayers::IsPlayerInfoAvailable(int ClientID) const
+{
+	const void *pPrevInfo = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_PLAYERINFO, ClientID);
+	const void *pInfo = Client()->SnapFindItem(IClient::SNAP_CURRENT, NETOBJTYPE_PLAYERINFO, ClientID);
+	return pPrevInfo && pInfo;
+}
+
+void CPlayers::OnRender()
+{
+	CTeeRenderInfo aRenderInfo[MAX_CLIENTS];
+
+	// update RenderInfo for ninja
+	bool IsTeamplay = false;
+	if(m_pClient->m_Snap.m_pGameInfoObj)
+		IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		aRenderInfo[i] = m_pClient->m_aClients[i].m_RenderInfo;
+		//aRenderInfo[i].m_ShineDecoration = m_pClient->m_aClients[i].m_LiveFrozen;
+
+		aRenderInfo[i].m_TeeRenderFlags = 0;
+
+		CGameClient::CSnapState::CCharacterInfo &CharacterInfo = m_pClient->m_Snap.m_aCharacters[i];
+		const bool Frozen = CharacterInfo.m_HasExtendedData && CharacterInfo.m_ExtendedData.m_FreezeEnd != 0;
+		if(g_Config.m_ClOldFreezeMode == 1)
+		{
+			if(m_pClient->m_aClients[i].m_FreezeEnd != 0)
+			{
+				aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN;
+			}
+		}
+		else
+		{
+			if(m_pClient->m_aClients[i].m_FreezeEnd != 0)
+			{
+				aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN | TEE_NO_WEAPON;
+			}
+		}
+		if(m_pClient->m_aClients[i].m_LiveFrozen)
+		{
+			aRenderInfo[i].m_TeeRenderFlags |= TEE_EFFECT_FROZEN;
+		}
+
+		if((CharacterInfo.m_Cur.m_Weapon == WEAPON_NINJA || (Frozen && !m_pClient->m_GameInfo.m_NoSkinChangeForFrozen)) && g_Config.m_ClShowNinja)
+		{
+			// change the skin for the player to the ninja
+			const auto *pSkin = m_pClient->m_Skins.FindOrNullptr("x_ninja");
+			if(pSkin != nullptr)
+			{
+				aRenderInfo[i].m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+				aRenderInfo[i].m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+				aRenderInfo[i].m_BloodColor = pSkin->m_BloodColor;
+				aRenderInfo[i].m_SkinMetrics = pSkin->m_Metrics;
+				aRenderInfo[i].m_CustomColoredSkin = IsTeamplay;
+				if(!IsTeamplay)
+				{
+					aRenderInfo[i].m_ColorBody = ColorRGBA(1, 1, 1);
+					aRenderInfo[i].m_ColorFeet = ColorRGBA(1, 1, 1);
+				}
+			}
+		}
+	}
+
+	const CSkin *pSkin = m_pClient->m_Skins.Find("x_spec");
+	CTeeRenderInfo RenderInfoSpec;
+	RenderInfoSpec.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	RenderInfoSpec.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	RenderInfoSpec.m_BloodColor = pSkin->m_BloodColor;
+	RenderInfoSpec.m_SkinMetrics = pSkin->m_Metrics;
+	RenderInfoSpec.m_CustomColoredSkin = false;
+	RenderInfoSpec.m_Size = 64.0f;
+	const int LocalClientID = m_pClient->m_Snap.m_LocalClientID;
+
+	// get screen edges to avoid rendering offscreen
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	// expand the edges to prevent popping in/out onscreen
+	//
+	// it is assumed that the tee, all its weapons, and emotes fit into a 200x200 box centered on the tee
+	// this may need to be changed or calculated differently in the future
+	float BorderBuffer = 100;
+	ScreenX0 -= BorderBuffer;
+	ScreenX1 += BorderBuffer;
+	ScreenY0 -= BorderBuffer;
+	ScreenY1 += BorderBuffer;
+
+	// render everyone else's hook, then our own
+	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	{
+		if(ClientID == LocalClientID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		{
+			continue;
+		}
+
+		RenderHook(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, &aRenderInfo[ClientID], ClientID);
+	}
+	if(LocalClientID != -1 && m_pClient->m_Snap.m_aCharacters[LocalClientID].m_Active && IsPlayerInfoAvailable(LocalClientID))
+	{
+		const CGameClient::CClientData *pLocalClientData = &m_pClient->m_aClients[LocalClientID];
+		RenderHook(&pLocalClientData->m_RenderPrev, &pLocalClientData->m_RenderCur, &aRenderInfo[LocalClientID], LocalClientID);
+	}
+
+	// render spectating players
+	for(auto &m_aClient : m_pClient->m_aClients)
+	{
+		if(!m_aClient.m_SpecCharPresent)
+		{
+			continue;
+		}
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &RenderInfoSpec, EMOTE_BLINK, vec2(1, 0), m_aClient.m_SpecChar);
+	}
+
+	// render everyone else's tee, then either our own or the tee we are spectating.
+	const int RenderLastID = (m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW && m_pClient->m_Snap.m_SpecInfo.m_Active) ? m_pClient->m_Snap.m_SpecInfo.m_SpectatorID : LocalClientID;
+
+	for(int ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+	{
+		if(ClientID == RenderLastID || !m_pClient->m_Snap.m_aCharacters[ClientID].m_Active || !IsPlayerInfoAvailable(ClientID))
+		{
+			continue;
+		}
+
+		RenderHookCollLine(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, ClientID);
+
+		// don't render offscreen
+		vec2 *pRenderPos = &m_pClient->m_aClients[ClientID].m_RenderPos;
+		if(pRenderPos->x < ScreenX0 || pRenderPos->x > ScreenX1 || pRenderPos->y < ScreenY0 || pRenderPos->y > ScreenY1)
+		{
+			continue;
+		}
+		RenderPlayer(&m_pClient->m_aClients[ClientID].m_RenderPrev, &m_pClient->m_aClients[ClientID].m_RenderCur, &aRenderInfo[ClientID], ClientID);
+	}
+	if(RenderLastID != -1 && m_pClient->m_Snap.m_aCharacters[RenderLastID].m_Active && IsPlayerInfoAvailable(RenderLastID))
+	{
+		const CGameClient::CClientData *pClientData = &m_pClient->m_aClients[RenderLastID];
+		RenderHookCollLine(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, RenderLastID);
+		RenderPlayer(&pClientData->m_RenderPrev, &pClientData->m_RenderCur, &aRenderInfo[RenderLastID], RenderLastID);
+	}
+}
+
+void CPlayers::OnInit()
+{
+	m_WeaponEmoteQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		float ScaleX, ScaleY;
+		RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_pSpriteBody, ScaleX, ScaleY);
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleX, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleY);
+		Graphics()->QuadsSetSubset(0, 1, 1, 0);
+		RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleX, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleY);
+	}
+	float ScaleX, ScaleY;
+
+	// at the end the hand
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, 20.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, 20.f);
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, -12.f, -8.f, 24.f, 16.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, -12.f, -8.f, 24.f, 16.f);
+
+	for(int i = 0; i < NUM_EMOTICONS; ++i)
+	{
+		Graphics()->QuadsSetSubset(0, 0, 1, 1);
+		RenderTools()->QuadContainerAddSprite(m_WeaponEmoteQuadContainerIndex, 64.f);
+	}
+	Graphics()->QuadContainerUpload(m_WeaponEmoteQuadContainerIndex);
+
+	for(int i = 0; i < NUM_WEAPONS; ++i)
+	{
+		m_aWeaponSpriteMuzzleQuadContainerIndex[i] = Graphics()->CreateQuadContainer(false);
+		for(int n = 0; n < g_pData->m_Weapons.m_aId[i].m_NumSpriteMuzzles; ++n)
+		{
+			if(g_pData->m_Weapons.m_aId[i].m_aSpriteMuzzles[n])
+			{
+				if(i == WEAPON_GUN || i == WEAPON_SHOTGUN)
+				{
+					// TODO: hardcoded for now to get the same particle size as before
+					RenderTools()->GetSpriteScaleImpl(96, 64, ScaleX, ScaleY);
+				}
+				else
+					RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_aSpriteMuzzles[n], ScaleX, ScaleY);
+			}
+
+			float SWidth = (g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleX) * (4.0f / 3.0f);
+			float SHeight = g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleY;
+
+			Graphics()->QuadsSetSubset(0, 0, 1, 1);
+			if(WEAPON_NINJA == i)
+				RenderTools()->QuadContainerAddSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[i], 160.f * ScaleX, 160.f * ScaleY);
+			else
+				RenderTools()->QuadContainerAddSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[i], SWidth, SHeight);
+
+			Graphics()->QuadsSetSubset(0, 1, 1, 0);
+			if(WEAPON_NINJA == i)
+				RenderTools()->QuadContainerAddSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[i], 160.f * ScaleX, 160.f * ScaleY);
+			else
+				RenderTools()->QuadContainerAddSprite(m_aWeaponSpriteMuzzleQuadContainerIndex[i], SWidth, SHeight);
+		}
+		Graphics()->QuadContainerUpload(m_aWeaponSpriteMuzzleQuadContainerIndex[i]);
+	}
+
+	Graphics()->QuadsSetSubset(0.f, 0.f, 1.f, 1.f);
+	Graphics()->QuadsSetRotation(0.f);
+}
\ No newline at end of file
diff --git a/src_bkp/game/client/components/players.h b/src_bkp/game/client/components/players.h
new file mode 100644
index 0000000000..00c66d6ae3
--- /dev/null
+++ b/src_bkp/game/client/components/players.h
@@ -0,0 +1,49 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_PLAYERS_H
+#define GAME_CLIENT_COMPONENTS_PLAYERS_H
+#include <game/client/component.h>
+
+#include <game/client/render.h>
+#include <game/generated/protocol.h>
+
+class CPlayers : public CComponent
+{
+	friend class CGhost;
+
+	void RenderHand(const CTeeRenderInfo *pInfo, vec2 CenterPos, vec2 Dir, float AngleOffset, vec2 PostRotOffset, float Alpha = 1.0f);
+	void RenderPlayer(
+		const CNetObj_Character *pPrevChar,
+		const CNetObj_Character *pPlayerChar,
+		const CTeeRenderInfo *pRenderInfo,
+		int ClientID,
+		float Intra = 0.f);
+	void RenderHook(
+		const CNetObj_Character *pPrevChar,
+		const CNetObj_Character *pPlayerChar,
+		const CTeeRenderInfo *pRenderInfo,
+		int ClientID,
+		float Intra = 0.f);
+	void RenderHookCollLine(
+		const CNetObj_Character *pPrevChar,
+		const CNetObj_Character *pPlayerChar,
+		int ClientID,
+		float Intra = 0.f);
+	bool IsPlayerInfoAvailable(int ClientID) const;
+
+	int m_WeaponEmoteQuadContainerIndex;
+	int m_aWeaponSpriteMuzzleQuadContainerIndex[NUM_WEAPONS];
+
+public:
+	float GetPlayerTargetAngle(
+		const CNetObj_Character *pPrevChar,
+		const CNetObj_Character *pPlayerChar,
+		int ClientID,
+		float Intra = 0.f);
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnInit() override;
+	virtual void OnRender() override;
+};
+
+#endif
diff --git a/src_bkp/game/client/components/race_demo.cpp b/src_bkp/game/client/components/race_demo.cpp
new file mode 100644
index 0000000000..4f57bc5b45
--- /dev/null
+++ b/src_bkp/game/client/components/race_demo.cpp
@@ -0,0 +1,265 @@
+/* (c) Redix and Sushi */
+
+#include <cctype>
+
+#include <base/system.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include <game/client/race.h>
+#include <game/localization.h>
+
+#include "race_demo.h"
+
+#include <game/client/gameclient.h>
+
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+const char *CRaceDemo::ms_pRaceDemoDir = "demos/auto/race";
+
+struct CDemoItem
+{
+	char m_aName[128];
+	int m_Time;
+};
+
+struct CDemoListParam
+{
+	const CRaceDemo *m_pThis;
+	std::vector<CDemoItem> *m_pvDemos;
+	const char *pMap;
+};
+
+CRaceDemo::CRaceDemo() :
+	m_RaceState(RACE_NONE), m_RaceStartTick(-1), m_RecordStopTick(-1), m_Time(0) {}
+
+void CRaceDemo::GetPath(char *pBuf, int Size, int Time) const
+{
+	const char *pMap = Client()->GetCurrentMap();
+
+	char aPlayerName[MAX_NAME_LENGTH];
+	str_copy(aPlayerName, Client()->PlayerName());
+	str_sanitize_filename(aPlayerName);
+
+	if(Time < 0)
+		str_format(pBuf, Size, "%s/%s_tmp_%d.demo", ms_pRaceDemoDir, pMap, pid());
+	else if(g_Config.m_ClDemoName)
+		str_format(pBuf, Size, "%s/%s_%d.%03d_%s.demo", ms_pRaceDemoDir, pMap, Time / 1000, Time % 1000, aPlayerName);
+	else
+		str_format(pBuf, Size, "%s/%s_%d.%03d.demo", ms_pRaceDemoDir, pMap, Time / 1000, Time % 1000);
+}
+
+void CRaceDemo::OnStateChange(int NewState, int OldState)
+{
+	if(OldState == IClient::STATE_ONLINE)
+		StopRecord();
+}
+
+void CRaceDemo::OnNewSnapshot()
+{
+	if(!GameClient()->m_GameInfo.m_Race || !g_Config.m_ClAutoRaceRecord || Client()->State() != IClient::STATE_ONLINE)
+		return;
+
+	if(!m_pClient->m_Snap.m_pGameInfoObj || m_pClient->m_Snap.m_SpecInfo.m_Active || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
+		return;
+
+	static int s_LastRaceTick = -1;
+
+	bool RaceFlag = m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_RACETIME;
+	bool ServerControl = RaceFlag && g_Config.m_ClRaceRecordServerControl;
+	int RaceTick = -m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer;
+
+	// start the demo
+	bool ForceStart = ServerControl && s_LastRaceTick != RaceTick && Client()->GameTick(g_Config.m_ClDummy) - RaceTick < Client()->GameTickSpeed();
+	bool AllowRestart = (m_AllowRestart || ForceStart) && m_RaceStartTick + 10 * Client()->GameTickSpeed() < Client()->GameTick(g_Config.m_ClDummy);
+	if(m_RaceState == RACE_IDLE || m_RaceState == RACE_PREPARE || (m_RaceState == RACE_STARTED && AllowRestart))
+	{
+		vec2 PrevPos = vec2(m_pClient->m_Snap.m_pLocalPrevCharacter->m_X, m_pClient->m_Snap.m_pLocalPrevCharacter->m_Y);
+		vec2 Pos = vec2(m_pClient->m_Snap.m_pLocalCharacter->m_X, m_pClient->m_Snap.m_pLocalCharacter->m_Y);
+
+		if(ForceStart || (!ServerControl && CRaceHelper::IsStart(m_pClient, PrevPos, Pos)))
+		{
+			if(m_RaceState == RACE_STARTED)
+				Client()->RaceRecord_Stop();
+			if(m_RaceState != RACE_PREPARE) // start recording again
+			{
+				GetPath(m_aTmpFilename, sizeof(m_aTmpFilename));
+				Client()->RaceRecord_Start(m_aTmpFilename);
+			}
+			m_RaceStartTick = Client()->GameTick(g_Config.m_ClDummy);
+			m_RaceState = RACE_STARTED;
+		}
+	}
+
+	// start recording before the player passes the start line, so we can see some preparation steps
+	if(m_RaceState == RACE_NONE)
+	{
+		GetPath(m_aTmpFilename, sizeof(m_aTmpFilename));
+		Client()->RaceRecord_Start(m_aTmpFilename);
+		m_RaceStartTick = Client()->GameTick(g_Config.m_ClDummy);
+		m_RaceState = RACE_PREPARE;
+	}
+
+	// stop recording if the player did not pass the start line after 20 seconds
+	if(m_RaceState == RACE_PREPARE && Client()->GameTick(g_Config.m_ClDummy) - m_RaceStartTick >= Client()->GameTickSpeed() * 20)
+	{
+		StopRecord();
+		m_RaceState = RACE_IDLE;
+	}
+
+	// stop the demo
+	if(m_RaceState == RACE_FINISHED && m_RecordStopTick <= Client()->GameTick(g_Config.m_ClDummy))
+		StopRecord(m_Time);
+
+	s_LastRaceTick = RaceFlag ? RaceTick : -1;
+}
+
+void CRaceDemo::OnReset()
+{
+	StopRecord();
+}
+
+void CRaceDemo::OnShutdown()
+{
+	StopRecord();
+}
+
+void CRaceDemo::OnMessage(int MsgType, void *pRawMsg)
+{
+	// check for messages from server
+	if(MsgType == NETMSGTYPE_SV_KILLMSG)
+	{
+		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
+		if(pMsg->m_Victim == m_pClient->m_Snap.m_LocalClientID && Client()->RaceRecord_IsRecording())
+			StopRecord(m_Time);
+	}
+	else if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM)
+	{
+		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team && i == m_pClient->m_Snap.m_LocalClientID && Client()->RaceRecord_IsRecording())
+				StopRecord(m_Time);
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_CHAT)
+	{
+		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+		if(pMsg->m_ClientID == -1 && m_RaceState == RACE_STARTED)
+		{
+			char aName[MAX_NAME_LENGTH];
+			int Time = CRaceHelper::TimeFromFinishMessage(pMsg->m_pMessage, aName, sizeof(aName));
+			if(Time > 0 && m_pClient->m_Snap.m_LocalClientID >= 0 && str_comp(aName, m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_aName) == 0)
+			{
+				m_RaceState = RACE_FINISHED;
+				m_RecordStopTick = Client()->GameTick(g_Config.m_ClDummy) + Client()->GameTickSpeed();
+				m_Time = Time;
+			}
+		}
+	}
+}
+
+void CRaceDemo::OnMapLoad()
+{
+	m_AllowRestart = false;
+}
+
+void CRaceDemo::StopRecord(int Time)
+{
+	if(Client()->RaceRecord_IsRecording())
+		Client()->RaceRecord_Stop();
+
+	if(m_aTmpFilename[0] != '\0')
+	{
+		if(Time > 0 && CheckDemo(Time))
+		{
+			// save file
+			char aNewFilename[512];
+			GetPath(aNewFilename, sizeof(aNewFilename), m_Time);
+
+			Storage()->RenameFile(m_aTmpFilename, aNewFilename, IStorage::TYPE_SAVE);
+		}
+		else // no new record
+			Storage()->RemoveFile(m_aTmpFilename, IStorage::TYPE_SAVE);
+
+		m_aTmpFilename[0] = '\0';
+	}
+
+	m_Time = 0;
+	m_RaceState = RACE_NONE;
+	m_RaceStartTick = -1;
+	m_RecordStopTick = -1;
+}
+
+struct SRaceDemoFetchUser
+{
+	CRaceDemo *m_pThis;
+	CDemoListParam *m_pParam;
+};
+
+int CRaceDemo::RaceDemolistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser)
+{
+	auto *pRealUser = (SRaceDemoFetchUser *)pUser;
+	auto *pParam = pRealUser->m_pParam;
+	int MapLen = str_length(pParam->pMap);
+	if(IsDir || !str_endswith(pInfo->m_pName, ".demo") || !str_startswith(pInfo->m_pName, pParam->pMap) || pInfo->m_pName[MapLen] != '_')
+		return 0;
+
+	CDemoItem Item;
+	str_truncate(Item.m_aName, sizeof(Item.m_aName), pInfo->m_pName, str_length(pInfo->m_pName) - 5);
+
+	const char *pTime = Item.m_aName + MapLen + 1;
+	const char *pTEnd = pTime;
+	while(isdigit(*pTEnd) || *pTEnd == ' ' || *pTEnd == '.' || *pTEnd == ',')
+		pTEnd++;
+
+	if(g_Config.m_ClDemoName)
+	{
+		char aPlayerName[MAX_NAME_LENGTH];
+		str_copy(aPlayerName, pParam->m_pThis->Client()->PlayerName());
+		str_sanitize_filename(aPlayerName);
+
+		if(pTEnd[0] != '_' || str_comp(pTEnd + 1, aPlayerName) != 0)
+			return 0;
+	}
+	else if(pTEnd[0])
+		return 0;
+
+	Item.m_Time = CRaceHelper::TimeFromSecondsStr(pTime);
+	if(Item.m_Time > 0)
+		pParam->m_pvDemos->push_back(Item);
+
+	if(time_get_nanoseconds() - pRealUser->m_pThis->m_RaceDemosLoadStartTime > 500ms)
+	{
+		pRealUser->m_pThis->GameClient()->m_Menus.RenderLoading(Localize("Loading race demo files"), "", 0, false);
+	}
+
+	return 0;
+}
+
+bool CRaceDemo::CheckDemo(int Time)
+{
+	std::vector<CDemoItem> vDemos;
+	CDemoListParam Param = {this, &vDemos, Client()->GetCurrentMap()};
+	m_RaceDemosLoadStartTime = time_get_nanoseconds();
+	SRaceDemoFetchUser User;
+	User.m_pParam = &Param;
+	User.m_pThis = this;
+	Storage()->ListDirectoryInfo(IStorage::TYPE_SAVE, ms_pRaceDemoDir, RaceDemolistFetchCallback, &User);
+
+	// loop through demo files
+	for(auto &Demo : vDemos)
+	{
+		if(Time >= Demo.m_Time) // found a better demo
+			return false;
+
+		// delete old demo
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "%s/%s.demo", ms_pRaceDemoDir, Demo.m_aName);
+		Storage()->RemoveFile(aFilename, IStorage::TYPE_SAVE);
+	}
+
+	return true;
+}
diff --git a/src_bkp/game/client/components/race_demo.h b/src_bkp/game/client/components/race_demo.h
new file mode 100644
index 0000000000..018c5ca8a9
--- /dev/null
+++ b/src_bkp/game/client/components/race_demo.h
@@ -0,0 +1,51 @@
+/* (c) Redix and Sushi */
+
+#ifndef GAME_CLIENT_COMPONENTS_RACE_DEMO_H
+#define GAME_CLIENT_COMPONENTS_RACE_DEMO_H
+
+#include <chrono>
+#include <game/client/component.h>
+
+class CRaceDemo : public CComponent
+{
+	enum
+	{
+		RACE_NONE = 0,
+		RACE_IDLE,
+		RACE_PREPARE,
+		RACE_STARTED,
+		RACE_FINISHED,
+	};
+
+	static const char *ms_pRaceDemoDir;
+
+	char m_aTmpFilename[128];
+
+	int m_RaceState;
+	int m_RaceStartTick;
+	int m_RecordStopTick;
+	int m_Time;
+
+	std::chrono::nanoseconds m_RaceDemosLoadStartTime{0};
+
+	static int RaceDemolistFetchCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser);
+
+	void GetPath(char *pBuf, int Size, int Time = -1) const;
+
+	void StopRecord(int Time = -1);
+	bool CheckDemo(int Time);
+
+public:
+	bool m_AllowRestart;
+
+	CRaceDemo();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnReset() override;
+	virtual void OnStateChange(int NewState, int OldState) override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	virtual void OnMapLoad() override;
+	virtual void OnShutdown() override;
+	virtual void OnNewSnapshot() override;
+};
+#endif
diff --git a/src_bkp/game/client/components/scoreboard.cpp b/src_bkp/game/client/components/scoreboard.cpp
new file mode 100644
index 0000000000..6be6adadbb
--- /dev/null
+++ b/src_bkp/game/client/components/scoreboard.cpp
@@ -0,0 +1,755 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/demo.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+#include <game/generated/protocol.h>
+
+#include <game/client/animstate.h>
+#include <game/client/components/countryflags.h>
+#include <game/client/components/motd.h>
+#include <game/client/components/statboard.h>
+#include <game/client/gameclient.h>
+#include <game/client/render.h>
+
+#include <game/localization.h>
+
+#include "scoreboard.h"
+
+CScoreboard::CScoreboard()
+{
+	OnReset();
+}
+
+void CScoreboard::ConKeyScoreboard(IConsole::IResult *pResult, void *pUserData)
+{
+	CScoreboard *pSelf = (CScoreboard *)pUserData;
+	pSelf->m_Active = pResult->GetInteger(0) != 0;
+}
+
+void CScoreboard::OnReset()
+{
+	m_Active = false;
+	m_ServerRecord = -1.0f;
+}
+
+void CScoreboard::OnRelease()
+{
+	m_Active = false;
+}
+
+void CScoreboard::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(MsgType == NETMSGTYPE_SV_RECORD || MsgType == NETMSGTYPE_SV_RECORDLEGACY)
+	{
+		CNetMsg_Sv_Record *pMsg = (CNetMsg_Sv_Record *)pRawMsg;
+		m_ServerRecord = (float)pMsg->m_ServerTimeBest / 100;
+	}
+}
+
+void CScoreboard::OnConsoleInit()
+{
+	Console()->Register("+scoreboard", "", CFGFLAG_CLIENT, ConKeyScoreboard, this, "Show scoreboard");
+}
+
+void CScoreboard::RenderGoals(float x, float y, float w)
+{
+	float h = 50.0f;
+
+	Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 10.0f);
+
+	// render goals
+	if(m_pClient->m_Snap.m_pGameInfoObj)
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "%s: %d", Localize("Score limit"), m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit);
+			TextRender()->Text(x + 10.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+		}
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), Localize("Time limit: %d min"), m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit);
+			TextRender()->Text(x + 230.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+		}
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum && m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "%s %d/%d", Localize("Round"), m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent, m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum);
+			float tw = TextRender()->TextWidth(20.0f, aBuf, -1, -1.0f);
+			TextRender()->Text(x + w - tw - 10.0f, y + (h - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+		}
+	}
+}
+
+void CScoreboard::RenderSpectators(float x, float y, float w, float h)
+{
+	// background
+	Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 10.0f);
+
+	// Headline
+	y += 10.0f;
+	TextRender()->Text(x + 10.0f, y + (30.f - 28.f) / 2.f, 28.0f, Localize("Spectators"), w - 20.0f);
+
+	// spectator names
+	y += 30.0f;
+	bool Multiple = false;
+
+	CTextCursor Cursor;
+	TextRender()->SetCursor(&Cursor, x + 10.0f, y, 22.0f, TEXTFLAG_RENDER);
+	Cursor.m_LineWidth = w - 20.0f;
+	Cursor.m_MaxLines = 4;
+
+	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByName)
+	{
+		if(!pInfo || pInfo->m_Team != TEAM_SPECTATORS)
+			continue;
+
+		if(Multiple)
+			TextRender()->TextEx(&Cursor, ", ", 2);
+
+		if(m_pClient->m_aClients[pInfo->m_ClientID].m_AuthLevel)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor));
+			TextRender()->TextColor(Color);
+		}
+
+		if(g_Config.m_ClShowIDs)
+		{
+			char aBuffer[5];
+			int size = str_format(aBuffer, sizeof(aBuffer), "%d: ", pInfo->m_ClientID);
+			TextRender()->TextEx(&Cursor, aBuffer, size);
+		}
+		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		Multiple = true;
+	}
+}
+
+void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const char *pTitle, int NumPlayers)
+{
+	if(Team == TEAM_SPECTATORS)
+		return;
+
+	bool lower16 = false;
+	bool upper16 = false;
+	bool lower24 = false;
+	bool upper24 = false;
+	bool lower32 = false;
+	bool upper32 = false;
+
+	if(Team == -3)
+		upper16 = true;
+	else if(Team == -4)
+		lower32 = true;
+	else if(Team == -5)
+		upper32 = true;
+	else if(Team == -6)
+		lower16 = true;
+	else if(Team == -7)
+		lower24 = true;
+	else if(Team == -8)
+		upper24 = true;
+
+	bool IsTeamplayTeam = Team > TEAM_SPECTATORS;
+
+	if(Team < -1)
+		Team = 0;
+
+	if(NumPlayers < 0)
+		NumPlayers = m_pClient->m_Snap.m_aTeamSize[Team];
+
+	float h = 760.0f;
+
+	// background
+	{
+		int Corners;
+		if(upper16 || upper32 || upper24)
+			Corners = IGraphics::CORNER_R;
+		else if(lower16 || lower32 || lower24)
+			Corners = IGraphics::CORNER_L;
+		else
+			Corners = IGraphics::CORNER_ALL;
+		Graphics()->DrawRect(x, y, w, h, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), Corners, 17.0f);
+	}
+
+	char aBuf[128] = {0};
+
+	// render title
+	float TitleFontsize = 40.0f;
+	int TitleWidth = (lower32 || lower24 || lower16) ? 1140 : 440;
+	if(!pTitle)
+	{
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
+			pTitle = Localize("Game over");
+		else
+		{
+			str_copy(aBuf, Client()->GetCurrentMap());
+			while(TextRender()->TextWidth(TitleFontsize, aBuf, -1, -1.0f) > TitleWidth)
+				aBuf[str_length(aBuf) - 1] = '\0';
+			if(str_comp(aBuf, Client()->GetCurrentMap()))
+				str_append(aBuf, "…");
+			pTitle = aBuf;
+		}
+	}
+	TextRender()->Text(x + 20.0f, y + (50.f - TitleFontsize) / 2.f, TitleFontsize, pTitle, -1.0f);
+
+	if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+	{
+		if(m_pClient->m_Snap.m_pGameDataObj)
+		{
+			int Score = Team == TEAM_RED ? m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed : m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue;
+			str_from_int(Score, aBuf);
+		}
+	}
+	else
+	{
+		if(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW &&
+			m_pClient->m_Snap.m_apPlayerInfos[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID])
+		{
+			int Score = m_pClient->m_Snap.m_apPlayerInfos[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID]->m_Score;
+			str_from_int(Score, aBuf);
+		}
+		else if(m_pClient->m_Snap.m_pLocalInfo)
+		{
+			int Score = m_pClient->m_Snap.m_pLocalInfo->m_Score;
+			str_from_int(Score, aBuf);
+		}
+	}
+
+	if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
+	{
+		if(m_ServerRecord > 0)
+			str_time_float(m_ServerRecord, TIME_HOURS, aBuf, sizeof(aBuf));
+		else
+			aBuf[0] = 0;
+	}
+
+	float tw;
+
+	if(!lower16 && !lower32 && !lower24)
+	{
+		tw = TextRender()->TextWidth(TitleFontsize, aBuf, -1, -1.0f);
+		TextRender()->Text(x + w - tw - 20.0f, y + (50.f - TitleFontsize) / 2.f, TitleFontsize, aBuf, -1.0f);
+	}
+
+	// calculate measurements
+	float LineHeight = 60.0f;
+	float TeeSizeMod = 1.0f;
+	float Spacing = 16.0f;
+	float RoundRadius = 15.0f;
+	float FontSize = 24.0f;
+	if(NumPlayers > 48)
+	{
+		LineHeight = 20.0f;
+		TeeSizeMod = 0.4f;
+		Spacing = 0.0f;
+		RoundRadius = 5.0f;
+		FontSize = 16.0f;
+	}
+	else if(NumPlayers > 32)
+	{
+		LineHeight = 27.0f;
+		TeeSizeMod = 0.6f;
+		Spacing = 0.0f;
+		RoundRadius = 5.0f;
+		FontSize = 20.0f;
+	}
+	else if(NumPlayers > 12)
+	{
+		LineHeight = 40.0f;
+		TeeSizeMod = 0.8f;
+		Spacing = 0.0f;
+		RoundRadius = 15.0f;
+	}
+	else if(NumPlayers > 8)
+	{
+		LineHeight = 50.0f;
+		TeeSizeMod = 0.9f;
+		Spacing = 5.0f;
+		RoundRadius = 15.0f;
+	}
+
+	float ScoreOffset = x + 10.0f + 10.0f, ScoreLength = TextRender()->TextWidth(FontSize, "00:00:00", -1, -1.0f);
+	if(IsTeamplayTeam)
+		ScoreLength = TextRender()->TextWidth(FontSize, "99999", -1, -1.0f);
+	float TeeOffset = ScoreOffset + ScoreLength + 15.0f, TeeLength = 60 * TeeSizeMod;
+	float NameOffset = TeeOffset + TeeLength, NameLength = 300.0f - TeeLength;
+	float CountryLength = (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f;
+	float PingLength = 65.0f;
+	float PingOffset = x + w - PingLength - 10.0f - 10.0f;
+	float CountryOffset = PingOffset - CountryLength;
+	float ClanLength = w - ((NameOffset - x) + NameLength) - (w - (CountryOffset - x));
+	float ClanOffset = CountryOffset - ClanLength;
+
+	// render headlines
+	x += 10.0f;
+	y += 50.0f;
+	float HeadlineFontsize = 22.0f;
+	const char *pScore = (m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard) ? Localize("Time") : Localize("Score");
+	tw = TextRender()->TextWidth(HeadlineFontsize, pScore, -1, -1.0f);
+	TextRender()->Text(ScoreOffset + ScoreLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, pScore, -1.0f);
+
+	TextRender()->Text(NameOffset, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Name"), -1.0f);
+
+	tw = TextRender()->TextWidth(HeadlineFontsize, Localize("Clan"), -1, -1.0f);
+	TextRender()->Text(ClanOffset + (ClanLength - tw) / 2, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Clan"), -1.0f);
+
+	tw = TextRender()->TextWidth(HeadlineFontsize, Localize("Ping"), -1, -1.0f);
+	TextRender()->Text(PingOffset + PingLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Ping"), -1.0f);
+
+	// render player entries
+	y += HeadlineFontsize * 2.0f;
+	CTextCursor Cursor;
+
+	int rendered = 0;
+	if(upper16)
+		rendered = -16;
+	if(upper32)
+		rendered = -32;
+	if(upper24)
+		rendered = -24;
+
+	int OldDDTeam = -1;
+
+	int m_aTeamsCount[64];
+	mem_zero(m_aTeamsCount, sizeof(int) * 64);
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamScore[i];
+		if(!pInfo)
+			continue;
+
+		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
+		if(DDTeam != -1 && DDTeam < TEAM_SUPER)
+			m_aTeamsCount[DDTeam]++;
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		// make sure that we render the correct team
+		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamScore[i];
+		if(!pInfo || pInfo->m_Team != Team)
+			continue;
+
+		if(rendered++ < 0)
+			continue;
+
+		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
+		int NextDDTeam = 0;
+
+		for(int j = i + 1; j < MAX_CLIENTS; j++)
+		{
+			const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamScore[j];
+
+			if(!pInfo2 || pInfo2->m_Team != Team)
+				continue;
+
+			NextDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+			break;
+		}
+
+		if(OldDDTeam == -1)
+		{
+			for(int j = i - 1; j >= 0; j--)
+			{
+				const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamScore[j];
+
+				if(!pInfo2 || pInfo2->m_Team != Team)
+					continue;
+
+				OldDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+				break;
+			}
+		}
+
+		if(DDTeam != TEAM_FLOCK)
+		{
+			const ColorRGBA Color = m_pClient->GetDDTeamColor(DDTeam).WithAlpha(0.5f);
+			int Corners = 0;
+			if(OldDDTeam != DDTeam)
+				Corners |= IGraphics::CORNER_TL | IGraphics::CORNER_TR;
+			if(NextDDTeam != DDTeam)
+				Corners |= IGraphics::CORNER_BL | IGraphics::CORNER_BR;
+			Graphics()->DrawRect(x - 10.0f, y, w, LineHeight + Spacing, Color, Corners, RoundRadius);
+
+			if(NextDDTeam != DDTeam)
+			{
+				if(m_pClient->m_Snap.m_aTeamSize[0] > 8)
+				{
+					if(DDTeam == TEAM_SUPER)
+						str_copy(aBuf, Localize("Super"));
+					else
+						str_format(aBuf, sizeof(aBuf), "%d | %d", DDTeam, m_aTeamsCount[DDTeam]);
+					TextRender()->SetCursor(&Cursor, x - 10.0f, y + Spacing + FontSize - (FontSize / 1.5f), FontSize / 1.5f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+					Cursor.m_LineWidth = NameLength + 3;
+				}
+				else
+				{
+					if(DDTeam == TEAM_SUPER)
+						str_copy(aBuf, Localize("Super"));
+					else
+						str_format(aBuf, sizeof(aBuf), Localize("Team %d | Players: %d"), DDTeam, m_aTeamsCount[DDTeam]);
+					tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+					TextRender()->SetCursor(&Cursor, ScoreOffset + w / 2.0f - tw / 2.0f, y + LineHeight, FontSize / 1.5f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+					Cursor.m_LineWidth = NameLength + 3;
+				}
+				TextRender()->TextEx(&Cursor, aBuf, -1);
+			}
+		}
+		OldDDTeam = DDTeam;
+
+		// background so it's easy to find the local player or the followed one in spectator mode
+		if((!m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_Local) || (m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW && pInfo->m_Local) || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID))
+		{
+			Graphics()->DrawRect(x, y, w - 20.0f, LineHeight, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, RoundRadius);
+		}
+
+		// score
+		if(m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard)
+		{
+			if(pInfo->m_Score == -9999)
+				aBuf[0] = 0;
+			else
+				str_time((int64_t)absolute(pInfo->m_Score) * 100, TIME_HOURS, aBuf, sizeof(aBuf));
+		}
+		else
+			str_from_int(clamp(pInfo->m_Score, -999, 99999), aBuf);
+		tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+		TextRender()->SetCursor(&Cursor, ScoreOffset + ScoreLength - tw, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER);
+		TextRender()->TextEx(&Cursor, aBuf, -1);
+
+		// flag
+		if(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS &&
+			m_pClient->m_Snap.m_pGameDataObj && (m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed == pInfo->m_ClientID || m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientID))
+		{
+			Graphics()->BlendNormal();
+			if(m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == pInfo->m_ClientID)
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+			else
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+
+			Graphics()->QuadsBegin();
+			Graphics()->QuadsSetSubset(1, 0, 0, 1);
+
+			float Size = LineHeight;
+			IGraphics::CQuadItem QuadItem(TeeOffset + 0.0f, y - 5.0f - Spacing / 2.0f, Size / 2.0f, Size);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		// avatar
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[pInfo->m_ClientID].m_RenderInfo;
+		TeeInfo.m_Size *= TeeSizeMod;
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		vec2 TeeRenderPos(TeeOffset + TeeLength / 2, y + LineHeight / 2.0f + OffsetToMid.y);
+
+		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
+		// Own color
+		if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aName,
+			   m_pClient->m_aClients[GameClient()->m_aLocalIDs[g_Config.m_ClDummy]].m_aName) == 0)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScPlayerOwnColor));
+			TextRender()->TextColor(Color);
+		}
+		else
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+
+		// Set the cursor for the name rendering
+		TextRender()->SetCursor(&Cursor, NameOffset, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+
+
+		if(m_pClient->m_aClients[pInfo->m_ClientID].m_AuthLevel)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor));
+			TextRender()->TextColor(Color);
+		}
+		else if(m_pClient->m_aClients[pInfo->m_ClientID].m_Friend)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScFriendColor));
+			TextRender()->TextColor(Color);
+		}
+
+		TextRender()->SetCursor(&Cursor, NameOffset, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+		if(m_pClient->m_aClients[pInfo->m_ClientID].m_Foe)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ScBlacklistPColor));
+			TextRender()->TextColor(Color);
+		}
+
+		if(g_Config.m_ClShowIDs)
+		{
+			char aId[64] = "";
+			if(pInfo->m_ClientID < 10)
+				str_format(aId, sizeof(aId), " %d: %s", pInfo->m_ClientID, m_pClient->m_aClients[pInfo->m_ClientID].m_aName);
+			else
+				str_format(aId, sizeof(aId), "%d: %s", pInfo->m_ClientID, m_pClient->m_aClients[pInfo->m_ClientID].m_aName);
+
+			Cursor.m_LineWidth = NameLength;
+			TextRender()->TextEx(&Cursor, aId, -1);
+		}
+		else
+		{
+			Cursor.m_LineWidth = NameLength;
+			TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
+		}
+
+		// clan
+
+		if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan,
+			   m_pClient->m_aClients[GameClient()->m_aLocalIDs[g_Config.m_ClDummy]].m_aClan) == 0)
+		{
+			ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor));
+			TextRender()->TextColor(Color);
+			ColorRGBA special = color_cast<ColorRGBA>(ColorHSVA(round_to_int(LocalTime() * 20) % 255 / 255.f, 1.f, 1.f));
+			
+			std::string innerpeace = "Inner peace";
+			if(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan == innerpeace)
+			{
+				TextRender()->TextColor(special);
+			}
+		}
+		else
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+
+
+		tw = minimum(TextRender()->TextWidth(FontSize, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1, -1.0f), ClanLength);
+		TextRender()->SetCursor(&Cursor, ClanOffset + (ClanLength - tw) / 2, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+		Cursor.m_LineWidth = ClanLength;
+		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1);
+
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		// country flag
+		m_pClient->m_CountryFlags.Render(m_pClient->m_aClients[pInfo->m_ClientID].m_Country, ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f),
+			CountryOffset, y + (Spacing + TeeSizeMod * 5.0f) / 2.0f, CountryLength, LineHeight - Spacing - TeeSizeMod * 5.0f);
+
+		// ping
+		if(g_Config.m_ClEnablePingColor)
+		{
+			ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA((300.0f - clamp(pInfo->m_Latency, 0, 300)) / 1000.0f, 1.0f, 0.5f));
+			TextRender()->TextColor(rgb);
+		}
+		str_from_int(clamp(pInfo->m_Latency, 0, 6000), aBuf);
+		tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+		TextRender()->SetCursor(&Cursor, PingOffset + PingLength - tw, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+		Cursor.m_LineWidth = PingLength;
+		TextRender()->TextEx(&Cursor, aBuf, -1);
+
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		y += LineHeight + Spacing;
+		if(lower32 || upper32)
+		{
+			if(rendered == 32)
+				break;
+		}
+		else if(lower24 || upper24)
+		{
+			if(rendered == 24)
+				break;
+		}
+		else
+		{
+			if(rendered == 16)
+				break;
+		}
+	}
+}
+
+void CScoreboard::RenderRecordingNotification(float x)
+{
+	char aBuf[64] = "\0";
+	char aBuf2[64];
+	char aTime[32];
+
+	if(m_pClient->DemoRecorder(RECORDER_MANUAL)->IsRecording())
+	{
+		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_MANUAL)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
+		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Manual"), aTime);
+		str_append(aBuf, aBuf2);
+	}
+	if(m_pClient->DemoRecorder(RECORDER_RACE)->IsRecording())
+	{
+		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_RACE)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
+		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Race"), aTime);
+		str_append(aBuf, aBuf2);
+	}
+	if(m_pClient->DemoRecorder(RECORDER_AUTO)->IsRecording())
+	{
+		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_AUTO)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
+		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Auto"), aTime);
+		str_append(aBuf, aBuf2);
+	}
+	if(m_pClient->DemoRecorder(RECORDER_REPLAYS)->IsRecording())
+	{
+		str_time((int64_t)m_pClient->DemoRecorder(RECORDER_REPLAYS)->Length() * 100, TIME_HOURS, aTime, sizeof(aTime));
+		str_format(aBuf2, sizeof(aBuf2), "%s %s  ", Localize("Replay"), aTime);
+		str_append(aBuf, aBuf2);
+	}
+
+	if(!aBuf[0])
+		return;
+
+	float w = TextRender()->TextWidth(20.0f, aBuf, -1, -1.0f);
+
+	// draw the box
+	Graphics()->DrawRect(x, 0.0f, w + 60.0f, 50.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_B, 15.0f);
+
+	// draw the red dot
+	Graphics()->DrawRect(x + 20, 15.0f, 20.0f, 20.0f, ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f), IGraphics::CORNER_ALL, 10.0f);
+
+	TextRender()->Text(x + 50.0f, (50.f - 20.f) / 2.f, 20.0f, aBuf, -1.0f);
+}
+
+void CScoreboard::OnRender()
+{
+	if(!Active())
+		return;
+
+	// if the score board is active, then we should clear the motd message as well
+	if(m_pClient->m_Motd.IsActive())
+		m_pClient->m_Motd.Clear();
+
+	float Width = 400 * 3.0f * Graphics()->ScreenAspect();
+	float Height = 400 * 3.0f;
+
+	Graphics()->MapScreen(0, 0, Width, Height);
+
+	float w = 750.0f;
+	float ExtraWidthSingle = 20.0f;
+
+	if(m_pClient->m_Snap.m_pGameInfoObj)
+	{
+		if(!(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS))
+		{
+			if(m_pClient->m_Snap.m_aTeamSize[0] > 48)
+			{
+				RenderScoreboard(Width / 2, 150.0f, w, -5, "");
+				RenderScoreboard(Width / 2 - w, 150.0f, w, -4, 0);
+			}
+			else if(m_pClient->m_Snap.m_aTeamSize[0] > 32)
+			{
+				RenderScoreboard(Width / 2, 150.0f, w, -8, "");
+				RenderScoreboard(Width / 2 - w, 150.0f, w, -7, 0);
+			}
+			else if(m_pClient->m_Snap.m_aTeamSize[0] > 16)
+			{
+				RenderScoreboard(Width / 2, 150.0f, w, -3, "");
+				RenderScoreboard(Width / 2 - w, 150.0f, w, -6, 0);
+			}
+			else
+			{
+				w += ExtraWidthSingle;
+				RenderScoreboard(Width / 2 - w / 2, 150.0f, w, -2, 0);
+			}
+		}
+		else
+		{
+			const char *pRedClanName = GetClanName(TEAM_RED);
+			const char *pBlueClanName = GetClanName(TEAM_BLUE);
+
+			if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER && m_pClient->m_Snap.m_pGameDataObj)
+			{
+				char aText[256];
+				str_copy(aText, Localize("Draw!"));
+
+				if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue)
+				{
+					if(pRedClanName)
+						str_format(aText, sizeof(aText), Localize("%s wins!"), pRedClanName);
+					else
+						str_copy(aText, Localize("Red team wins!"));
+				}
+				else if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed)
+				{
+					if(pBlueClanName)
+						str_format(aText, sizeof(aText), Localize("%s wins!"), pBlueClanName);
+					else
+						str_copy(aText, Localize("Blue team wins!"));
+				}
+
+				float TextWidth = TextRender()->TextWidth(86.0f, aText, -1, -1.0f);
+				TextRender()->Text(Width / 2 - TextWidth / 2, 39, 86.0f, aText, -1.0f);
+			}
+
+			//decrease width, because team games use additional offsets
+			w -= 10.0f;
+
+			int NumPlayers = maximum(m_pClient->m_Snap.m_aTeamSize[TEAM_RED], m_pClient->m_Snap.m_aTeamSize[TEAM_BLUE]);
+			RenderScoreboard(Width / 2 - w - 5.0f, 150.0f, w, TEAM_RED, pRedClanName ? pRedClanName : Localize("Red team"), NumPlayers);
+			RenderScoreboard(Width / 2 + 5.0f, 150.0f, w, TEAM_BLUE, pBlueClanName ? pBlueClanName : Localize("Blue team"), NumPlayers);
+		}
+	}
+	if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_ScoreLimit || m_pClient->m_Snap.m_pGameInfoObj->m_TimeLimit || (m_pClient->m_Snap.m_pGameInfoObj->m_RoundNum && m_pClient->m_Snap.m_pGameInfoObj->m_RoundCurrent)))
+	{
+		RenderGoals(Width / 2 - w / 2, 150 + 760 + 10, w);
+		RenderSpectators(Width / 2 - w / 2, 150 + 760 + 10 + 50 + 10, w, 160.0f);
+	}
+	else
+	{
+		RenderSpectators(Width / 2 - w / 2, 150 + 760 + 10, w, 200.0f);
+	}
+
+	RenderRecordingNotification((Width / 7) * 4 + 20);
+}
+
+bool CScoreboard::Active()
+{
+	// if statboard is active don't show scoreboard
+	if(m_pClient->m_Statboard.IsActive())
+		return false;
+
+	if(m_Active)
+		return true;
+
+	if(m_pClient->m_Snap.m_pLocalInfo && !m_pClient->m_Snap.m_SpecInfo.m_Active)
+	{
+		// we are not a spectator, check if we are dead
+		if(!m_pClient->m_Snap.m_pLocalCharacter && g_Config.m_ClScoreboardOnDeath)
+			return true;
+	}
+
+	// if the game is over
+	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
+		return true;
+
+	return false;
+}
+
+const char *CScoreboard::GetClanName(int Team)
+{
+	int ClanPlayers = 0;
+	const char *pClanName = 0;
+	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+	{
+		if(!pInfo || pInfo->m_Team != Team)
+			continue;
+
+		if(!pClanName)
+		{
+			pClanName = m_pClient->m_aClients[pInfo->m_ClientID].m_aClan;
+			ClanPlayers++;
+		}
+		else
+		{
+			if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, pClanName) == 0)
+				ClanPlayers++;
+			else
+				return 0;
+		}
+	}
+
+	if(ClanPlayers > 1 && pClanName[0])
+		return pClanName;
+	else
+		return 0;
+}
diff --git a/src_bkp/game/client/components/scoreboard.h b/src_bkp/game/client/components/scoreboard.h
new file mode 100644
index 0000000000..e45b781cfd
--- /dev/null
+++ b/src_bkp/game/client/components/scoreboard.h
@@ -0,0 +1,41 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_SCOREBOARD_H
+#define GAME_CLIENT_COMPONENTS_SCOREBOARD_H
+
+#include <engine/console.h>
+
+#include <game/client/component.h>
+
+class CScoreboard : public CComponent
+{
+	void RenderGoals(float x, float y, float w);
+	void RenderSpectators(float x, float y, float w, float h);
+	void RenderScoreboard(float x, float y, float w, int Team, const char *pTitle, int NumPlayers = -1);
+	void RenderRecordingNotification(float x);
+
+	static void ConKeyScoreboard(IConsole::IResult *pResult, void *pUserData);
+
+	const char *GetClanName(int Team);
+
+	bool m_Active;
+
+public:
+	CScoreboard();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnReset() override;
+	virtual void OnConsoleInit() override;
+	virtual void OnRender() override;
+	virtual void OnRelease() override;
+
+	bool Active();
+
+	// DDRace
+
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+
+private:
+	float m_ServerRecord;
+};
+
+#endif
diff --git a/src/game/client/components/skinprofiles.cpp b/src_bkp/game/client/components/skinprofiles.cpp
similarity index 100%
rename from src/game/client/components/skinprofiles.cpp
rename to src_bkp/game/client/components/skinprofiles.cpp
diff --git a/src/game/client/components/skinprofiles.h b/src_bkp/game/client/components/skinprofiles.h
similarity index 100%
rename from src/game/client/components/skinprofiles.h
rename to src_bkp/game/client/components/skinprofiles.h
diff --git a/src_bkp/game/client/components/skins.cpp b/src_bkp/game/client/components/skins.cpp
new file mode 100644
index 0000000000..90296fc439
--- /dev/null
+++ b/src_bkp/game/client/components/skins.cpp
@@ -0,0 +1,447 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/engine.h>
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+
+#include <game/generated/client_data.h>
+
+#include <game/client/gameclient.h>
+#include <game/localization.h>
+
+#include "skins.h"
+
+bool CSkins::IsVanillaSkin(const char *pName)
+{
+	return std::any_of(std::begin(VANILLA_SKINS), std::end(VANILLA_SKINS), [pName](const char *pVanillaSkin) { return str_comp(pName, pVanillaSkin) == 0; });
+}
+
+int CSkins::CGetPngFile::OnCompletion(int State)
+{
+	State = CHttpRequest::OnCompletion(State);
+
+	if(State != HTTP_ERROR && State != HTTP_ABORTED && !m_pSkins->LoadSkinPNG(m_Info, Dest(), Dest(), IStorage::TYPE_SAVE))
+	{
+		State = HTTP_ERROR;
+	}
+	return State;
+}
+
+CSkins::CGetPngFile::CGetPngFile(CSkins *pSkins, const char *pUrl, IStorage *pStorage, const char *pDest) :
+	CHttpRequest(pUrl),
+	m_pSkins(pSkins)
+{
+	WriteToFile(pStorage, pDest, IStorage::TYPE_SAVE);
+	Timeout(CTimeout{0, 0, 0, 0});
+	LogProgress(HTTPLOG::NONE);
+}
+
+struct SSkinScanUser
+{
+	CSkins *m_pThis;
+	CSkins::TSkinLoadedCBFunc m_SkinLoadedFunc;
+};
+
+int CSkins::SkinScan(const char *pName, int IsDir, int DirType, void *pUser)
+{
+	auto *pUserReal = (SSkinScanUser *)pUser;
+	CSkins *pSelf = pUserReal->m_pThis;
+
+	if(IsDir || !str_endswith(pName, ".png"))
+		return 0;
+
+	char aNameWithoutPng[128];
+	str_copy(aNameWithoutPng, pName);
+	aNameWithoutPng[str_length(aNameWithoutPng) - 4] = 0;
+
+	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(aNameWithoutPng))
+		return 0;
+
+	// Don't add duplicate skins (one from user's config directory, other from
+	// client itself)
+	if(pSelf->m_Skins.find(aNameWithoutPng) != pSelf->m_Skins.end())
+		return 0;
+
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "skins/%s", pName);
+	pSelf->LoadSkin(aNameWithoutPng, aBuf, DirType);
+	pUserReal->m_SkinLoadedFunc((int)pSelf->m_Skins.size());
+	return 0;
+}
+
+static void CheckMetrics(CSkin::SSkinMetricVariable &Metrics, const uint8_t *pImg, int ImgWidth, int ImgX, int ImgY, int CheckWidth, int CheckHeight)
+{
+	int MaxY = -1;
+	int MinY = CheckHeight + 1;
+	int MaxX = -1;
+	int MinX = CheckWidth + 1;
+
+	for(int y = 0; y < CheckHeight; y++)
+	{
+		for(int x = 0; x < CheckWidth; x++)
+		{
+			int OffsetAlpha = (y + ImgY) * ImgWidth + (x + ImgX) * 4 + 3;
+			uint8_t AlphaValue = pImg[OffsetAlpha];
+			if(AlphaValue > 0)
+			{
+				if(MaxY < y)
+					MaxY = y;
+				if(MinY > y)
+					MinY = y;
+				if(MaxX < x)
+					MaxX = x;
+				if(MinX > x)
+					MinX = x;
+			}
+		}
+	}
+
+	Metrics.m_Width = clamp((MaxX - MinX) + 1, 1, CheckWidth);
+	Metrics.m_Height = clamp((MaxY - MinY) + 1, 1, CheckHeight);
+	Metrics.m_OffsetX = clamp(MinX, 0, CheckWidth - 1);
+	Metrics.m_OffsetY = clamp(MinY, 0, CheckHeight - 1);
+	Metrics.m_MaxWidth = CheckWidth;
+	Metrics.m_MaxHeight = CheckHeight;
+}
+
+const CSkin *CSkins::LoadSkin(const char *pName, const char *pPath, int DirType)
+{
+	CImageInfo Info;
+	if(!LoadSkinPNG(Info, pName, pPath, DirType))
+		return 0;
+	return LoadSkin(pName, Info);
+}
+
+bool CSkins::LoadSkinPNG(CImageInfo &Info, const char *pName, const char *pPath, int DirType)
+{
+	char aBuf[512];
+	if(!Graphics()->LoadPNG(&Info, pPath, DirType))
+	{
+		str_format(aBuf, sizeof(aBuf), "failed to load skin from %s", pName);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		return false;
+	}
+	return true;
+}
+
+const CSkin *CSkins::LoadSkin(const char *pName, CImageInfo &Info)
+{
+	char aBuf[512];
+
+	if(!Graphics()->CheckImageDivisibility(pName, Info, g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridy, true))
+	{
+		str_format(aBuf, sizeof(aBuf), "skin failed image divisibility: %s", pName);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		return nullptr;
+	}
+	if(!Graphics()->IsImageFormatRGBA(pName, Info))
+	{
+		str_format(aBuf, sizeof(aBuf), "skin format is not RGBA: %s", pName);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+		return nullptr;
+	}
+
+	CSkin Skin{pName};
+	Skin.m_OriginalSkin.m_Body = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY]);
+	Skin.m_OriginalSkin.m_BodyOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE]);
+	Skin.m_OriginalSkin.m_Feet = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_FOOT]);
+	Skin.m_OriginalSkin.m_FeetOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE]);
+	Skin.m_OriginalSkin.m_Hands = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_HAND]);
+	Skin.m_OriginalSkin.m_HandsOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_HAND_OUTLINE]);
+
+	for(int i = 0; i < 6; ++i)
+		Skin.m_OriginalSkin.m_aEyes[i] = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_EYE_NORMAL + i]);
+
+	int FeetGridPixelsWidth = (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_FOOT].m_pSet->m_Gridx);
+	int FeetGridPixelsHeight = (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_FOOT].m_pSet->m_Gridy);
+	int FeetWidth = g_pData->m_aSprites[SPRITE_TEE_FOOT].m_W * FeetGridPixelsWidth;
+	int FeetHeight = g_pData->m_aSprites[SPRITE_TEE_FOOT].m_H * FeetGridPixelsHeight;
+
+	int FeetOffsetX = g_pData->m_aSprites[SPRITE_TEE_FOOT].m_X * FeetGridPixelsWidth;
+	int FeetOffsetY = g_pData->m_aSprites[SPRITE_TEE_FOOT].m_Y * FeetGridPixelsHeight;
+
+	int FeetOutlineGridPixelsWidth = (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_pSet->m_Gridx);
+	int FeetOutlineGridPixelsHeight = (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_pSet->m_Gridy);
+	int FeetOutlineWidth = g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_W * FeetOutlineGridPixelsWidth;
+	int FeetOutlineHeight = g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_H * FeetOutlineGridPixelsHeight;
+
+	int FeetOutlineOffsetX = g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_X * FeetOutlineGridPixelsWidth;
+	int FeetOutlineOffsetY = g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE].m_Y * FeetOutlineGridPixelsHeight;
+
+	int BodyOutlineGridPixelsWidth = (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_pSet->m_Gridx);
+	int BodyOutlineGridPixelsHeight = (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_pSet->m_Gridy);
+	int BodyOutlineWidth = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_W * BodyOutlineGridPixelsWidth;
+	int BodyOutlineHeight = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_H * BodyOutlineGridPixelsHeight;
+
+	int BodyOutlineOffsetX = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_X * BodyOutlineGridPixelsWidth;
+	int BodyOutlineOffsetY = g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE].m_Y * BodyOutlineGridPixelsHeight;
+
+	int BodyWidth = g_pData->m_aSprites[SPRITE_TEE_BODY].m_W * (Info.m_Width / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridx); // body width
+	int BodyHeight = g_pData->m_aSprites[SPRITE_TEE_BODY].m_H * (Info.m_Height / g_pData->m_aSprites[SPRITE_TEE_BODY].m_pSet->m_Gridy); // body height
+	if(BodyWidth > Info.m_Width || BodyHeight > Info.m_Height)
+		return nullptr;
+	unsigned char *pData = (unsigned char *)Info.m_pData;
+	const int PixelStep = 4;
+	int Pitch = Info.m_Width * PixelStep;
+
+	// dig out blood color
+	{
+		int aColors[3] = {0};
+		for(int y = 0; y < BodyHeight; y++)
+			for(int x = 0; x < BodyWidth; x++)
+			{
+				uint8_t AlphaValue = pData[y * Pitch + x * PixelStep + 3];
+				if(AlphaValue > 128)
+				{
+					aColors[0] += pData[y * Pitch + x * PixelStep + 0];
+					aColors[1] += pData[y * Pitch + x * PixelStep + 1];
+					aColors[2] += pData[y * Pitch + x * PixelStep + 2];
+				}
+			}
+		if(aColors[0] != 0 && aColors[1] != 0 && aColors[2] != 0)
+			Skin.m_BloodColor = ColorRGBA(normalize(vec3(aColors[0], aColors[1], aColors[2])));
+		else
+			Skin.m_BloodColor = ColorRGBA(0, 0, 0, 1);
+	}
+
+	CheckMetrics(Skin.m_Metrics.m_Body, pData, Pitch, 0, 0, BodyWidth, BodyHeight);
+
+	// body outline metrics
+	CheckMetrics(Skin.m_Metrics.m_Body, pData, Pitch, BodyOutlineOffsetX, BodyOutlineOffsetY, BodyOutlineWidth, BodyOutlineHeight);
+
+	// get feet size
+	CheckMetrics(Skin.m_Metrics.m_Feet, pData, Pitch, FeetOffsetX, FeetOffsetY, FeetWidth, FeetHeight);
+
+	// get feet outline size
+	CheckMetrics(Skin.m_Metrics.m_Feet, pData, Pitch, FeetOutlineOffsetX, FeetOutlineOffsetY, FeetOutlineWidth, FeetOutlineHeight);
+
+	// make the texture gray scale
+	for(int i = 0; i < Info.m_Width * Info.m_Height; i++)
+	{
+		int v = (pData[i * PixelStep] + pData[i * PixelStep + 1] + pData[i * PixelStep + 2]) / 3;
+		pData[i * PixelStep] = v;
+		pData[i * PixelStep + 1] = v;
+		pData[i * PixelStep + 2] = v;
+	}
+
+	int aFreq[256] = {0};
+	int OrgWeight = 0;
+	int NewWeight = 192;
+
+	// find most common frequency
+	for(int y = 0; y < BodyHeight; y++)
+		for(int x = 0; x < BodyWidth; x++)
+		{
+			if(pData[y * Pitch + x * PixelStep + 3] > 128)
+				aFreq[pData[y * Pitch + x * PixelStep]]++;
+		}
+
+	for(int i = 1; i < 256; i++)
+	{
+		if(aFreq[OrgWeight] < aFreq[i])
+			OrgWeight = i;
+	}
+
+	// reorder
+	int InvOrgWeight = 255 - OrgWeight;
+	int InvNewWeight = 255 - NewWeight;
+	for(int y = 0; y < BodyHeight; y++)
+		for(int x = 0; x < BodyWidth; x++)
+		{
+			int v = pData[y * Pitch + x * PixelStep];
+			if(v <= OrgWeight && OrgWeight == 0)
+				v = 0;
+			else if(v <= OrgWeight)
+				v = (int)(((v / (float)OrgWeight) * NewWeight));
+			else if(InvOrgWeight == 0)
+				v = NewWeight;
+			else
+				v = (int)(((v - OrgWeight) / (float)InvOrgWeight) * InvNewWeight + NewWeight);
+			pData[y * Pitch + x * PixelStep] = v;
+			pData[y * Pitch + x * PixelStep + 1] = v;
+			pData[y * Pitch + x * PixelStep + 2] = v;
+		}
+
+	Skin.m_ColorableSkin.m_Body = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY]);
+	Skin.m_ColorableSkin.m_BodyOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE]);
+	Skin.m_ColorableSkin.m_Feet = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_FOOT]);
+	Skin.m_ColorableSkin.m_FeetOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_FOOT_OUTLINE]);
+	Skin.m_ColorableSkin.m_Hands = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_HAND]);
+	Skin.m_ColorableSkin.m_HandsOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_HAND_OUTLINE]);
+
+	for(int i = 0; i < 6; ++i)
+		Skin.m_ColorableSkin.m_aEyes[i] = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_EYE_NORMAL + i]);
+
+	Graphics()->FreePNG(&Info);
+
+	// set skin data
+	if(g_Config.m_Debug)
+	{
+		str_format(aBuf, sizeof(aBuf), "load skin %s", Skin.GetName());
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
+	}
+
+	auto &&pSkin = std::make_unique<CSkin>(std::move(Skin));
+	const auto SkinInsertIt = m_Skins.insert({pSkin->GetName(), std::move(pSkin)});
+
+	return SkinInsertIt.first->second.get();
+}
+
+void CSkins::OnInit()
+{
+	m_aEventSkinPrefix[0] = '\0';
+
+	if(g_Config.m_Events)
+	{
+		if(time_season() == SEASON_XMAS)
+		{
+			str_copy(m_aEventSkinPrefix, "santa");
+		}
+	}
+
+	// load skins;
+	Refresh([this](int SkinCounter) {
+		GameClient()->m_Menus.RenderLoading(Localize("Rendering u'r skins..."), Localize("Loading skin files"), 0);
+	});
+}
+
+void CSkins::Refresh(TSkinLoadedCBFunc &&SkinLoadedFunc)
+{
+	for(const auto &SkinIt : m_Skins)
+	{
+		const auto &pSkin = SkinIt.second;
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Body);
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_BodyOutline);
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Feet);
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_FeetOutline);
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_Hands);
+		Graphics()->UnloadTexture(&pSkin->m_OriginalSkin.m_HandsOutline);
+		for(auto &Eye : pSkin->m_OriginalSkin.m_aEyes)
+			Graphics()->UnloadTexture(&Eye);
+
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Body);
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_BodyOutline);
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Feet);
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_FeetOutline);
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_Hands);
+		Graphics()->UnloadTexture(&pSkin->m_ColorableSkin.m_HandsOutline);
+		for(auto &Eye : pSkin->m_ColorableSkin.m_aEyes)
+			Graphics()->UnloadTexture(&Eye);
+	}
+
+	m_Skins.clear();
+	m_DownloadSkins.clear();
+	m_DownloadingSkins = 0;
+	SSkinScanUser SkinScanUser;
+	SkinScanUser.m_pThis = this;
+	SkinScanUser.m_SkinLoadedFunc = SkinLoadedFunc;
+	Storage()->ListDirectory(IStorage::TYPE_ALL, "skins", SkinScan, &SkinScanUser);
+	if(m_Skins.empty())
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load skins. folder='skins/'");
+		CSkin DummySkin{"dummy"};
+		DummySkin.m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f);
+		auto &&pDummySkin = std::make_unique<CSkin>(std::move(DummySkin));
+		m_Skins.insert({pDummySkin->GetName(), std::move(pDummySkin)});
+	}
+}
+
+int CSkins::Num()
+{
+	return m_Skins.size();
+}
+
+const CSkin *CSkins::Find(const char *pName)
+{
+	const auto *pSkin = FindOrNullptr(pName);
+	if(pSkin == nullptr)
+	{
+		pSkin = FindOrNullptr("default");
+		if(pSkin == nullptr)
+			return m_Skins.begin()->second.get();
+		else
+			return pSkin;
+	}
+	else
+	{
+		return pSkin;
+	}
+}
+
+const CSkin *CSkins::FindOrNullptr(const char *pName, bool IgnorePrefix)
+{
+	const char *pSkinPrefix = m_aEventSkinPrefix[0] ? m_aEventSkinPrefix : g_Config.m_ClSkinPrefix;
+	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(pName))
+	{
+		return nullptr;
+	}
+	else if(pSkinPrefix && pSkinPrefix[0] && !IgnorePrefix)
+	{
+		char aBuf[24];
+		str_format(aBuf, sizeof(aBuf), "%s_%s", pSkinPrefix, pName);
+		// If we find something, use it, otherwise fall back to normal skins.
+		const auto *pResult = FindImpl(aBuf);
+		if(pResult != nullptr)
+		{
+			return pResult;
+		}
+	}
+	return FindImpl(pName);
+}
+
+const CSkin *CSkins::FindImpl(const char *pName)
+{
+	auto SkinIt = m_Skins.find(pName);
+	if(SkinIt != m_Skins.end())
+		return SkinIt->second.get();
+
+	if(str_comp(pName, "default") == 0)
+		return nullptr;
+
+	if(!g_Config.m_ClDownloadSkins)
+		return nullptr;
+
+	if(str_find(pName, "/") != 0)
+		return nullptr;
+
+	const auto SkinDownloadIt = m_DownloadSkins.find(pName);
+	if(SkinDownloadIt != m_DownloadSkins.end())
+	{
+		if(SkinDownloadIt->second->m_pTask && SkinDownloadIt->second->m_pTask->State() == HTTP_DONE)
+		{
+			char aPath[IO_MAX_PATH_LENGTH];
+			str_format(aPath, sizeof(aPath), "downloadedskins/%s.png", SkinDownloadIt->second->GetName());
+			Storage()->RenameFile(SkinDownloadIt->second->m_aPath, aPath, IStorage::TYPE_SAVE);
+			const auto *pSkin = LoadSkin(SkinDownloadIt->second->GetName(), SkinDownloadIt->second->m_pTask->m_Info);
+			SkinDownloadIt->second->m_pTask = nullptr;
+			--m_DownloadingSkins;
+			return pSkin;
+		}
+		if(SkinDownloadIt->second->m_pTask && (SkinDownloadIt->second->m_pTask->State() == HTTP_ERROR || SkinDownloadIt->second->m_pTask->State() == HTTP_ABORTED))
+		{
+			SkinDownloadIt->second->m_pTask = nullptr;
+			--m_DownloadingSkins;
+		}
+		return nullptr;
+	}
+
+	CDownloadSkin Skin{pName};
+
+	char aUrl[IO_MAX_PATH_LENGTH];
+	char aEscapedName[256];
+	EscapeUrl(aEscapedName, sizeof(aEscapedName), pName);
+	str_format(aUrl, sizeof(aUrl), "%s%s.png", g_Config.m_ClDownloadCommunitySkins != 0 ? g_Config.m_ClSkinCommunityDownloadUrl : g_Config.m_ClSkinDownloadUrl, aEscapedName);
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(Skin.m_aPath, sizeof(Skin.m_aPath), "downloadedskins/%s", IStorage::FormatTmpPath(aBuf, sizeof(aBuf), pName));
+	Skin.m_pTask = std::make_shared<CGetPngFile>(this, aUrl, Storage(), Skin.m_aPath);
+	m_pClient->Engine()->AddJob(Skin.m_pTask);
+	auto &&pDownloadSkin = std::make_unique<CDownloadSkin>(std::move(Skin));
+	m_DownloadSkins.insert({pDownloadSkin->GetName(), std::move(pDownloadSkin)});
+	++m_DownloadingSkins;
+	return nullptr;
+}
diff --git a/src_bkp/game/client/components/skins.h b/src_bkp/game/client/components/skins.h
new file mode 100644
index 0000000000..677350fca4
--- /dev/null
+++ b/src_bkp/game/client/components/skins.h
@@ -0,0 +1,91 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_SKINS_H
+#define GAME_CLIENT_COMPONENTS_SKINS_H
+
+#include <base/system.h>
+#include <engine/shared/http.h>
+#include <game/client/component.h>
+#include <game/client/skin.h>
+#include <string_view>
+#include <unordered_map>
+
+class CSkins : public CComponent
+{
+public:
+	CSkins() = default;
+
+	class CGetPngFile : public CHttpRequest
+	{
+		CSkins *m_pSkins;
+
+	protected:
+		virtual int OnCompletion(int State) override;
+
+	public:
+		CGetPngFile(CSkins *pSkins, const char *pUrl, IStorage *pStorage, const char *pDest);
+		CImageInfo m_Info;
+	};
+
+	struct CDownloadSkin
+	{
+	private:
+		char m_aName[24];
+
+	public:
+		std::shared_ptr<CSkins::CGetPngFile> m_pTask;
+		char m_aPath[IO_MAX_PATH_LENGTH];
+
+		CDownloadSkin(CDownloadSkin &&Other) = default;
+		CDownloadSkin(const char *pName)
+		{
+			str_copy(m_aName, pName);
+		}
+
+		~CDownloadSkin()
+		{
+			if(m_pTask)
+				m_pTask->Abort();
+		}
+		bool operator<(const CDownloadSkin &Other) const { return str_comp(m_aName, Other.m_aName) < 0; }
+		bool operator<(const char *pOther) const { return str_comp(m_aName, pOther) < 0; }
+		bool operator==(const char *pOther) const { return !str_comp(m_aName, pOther); }
+
+		CDownloadSkin &operator=(CDownloadSkin &&Other) = default;
+
+		const char *GetName() const { return m_aName; }
+	};
+
+	typedef std::function<void(int)> TSkinLoadedCBFunc;
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+	void OnInit() override;
+
+	void Refresh(TSkinLoadedCBFunc &&SkinLoadedFunc);
+	int Num();
+	std::unordered_map<std::string_view, std::unique_ptr<CSkin>> &GetSkinsUnsafe() { return m_Skins; }
+	const CSkin *FindOrNullptr(const char *pName, bool IgnorePrefix = false);
+	const CSkin *Find(const char *pName);
+
+	bool IsDownloadingSkins() { return m_DownloadingSkins; }
+
+	static bool IsVanillaSkin(const char *pName);
+
+	constexpr static const char *VANILLA_SKINS[] = {"bluekitty", "bluestripe", "brownbear",
+		"cammo", "cammostripes", "coala", "default", "limekitty",
+		"pinky", "redbopp", "redstripe", "saddo", "toptri",
+		"twinbop", "twintri", "warpaint", "x_ninja", "x_spec"};
+
+private:
+	std::unordered_map<std::string_view, std::unique_ptr<CSkin>> m_Skins;
+	std::unordered_map<std::string_view, std::unique_ptr<CDownloadSkin>> m_DownloadSkins;
+	size_t m_DownloadingSkins = 0;
+	char m_aEventSkinPrefix[24];
+
+	bool LoadSkinPNG(CImageInfo &Info, const char *pName, const char *pPath, int DirType);
+	const CSkin *LoadSkin(const char *pName, const char *pPath, int DirType);
+	const CSkin *LoadSkin(const char *pName, CImageInfo &Info);
+	const CSkin *FindImpl(const char *pName);
+	static int SkinScan(const char *pName, int IsDir, int DirType, void *pUser);
+};
+#endif
diff --git a/src_bkp/game/client/components/sounds.cpp b/src_bkp/game/client/components/sounds.cpp
new file mode 100644
index 0000000000..d1af20ccb5
--- /dev/null
+++ b/src_bkp/game/client/components/sounds.cpp
@@ -0,0 +1,278 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "sounds.h"
+
+#include <engine/engine.h>
+#include <engine/shared/config.h>
+#include <engine/sound.h>
+#include <game/client/components/camera.h>
+#include <game/client/components/menus.h>
+#include <game/client/gameclient.h>
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+
+CSoundLoading::CSoundLoading(CGameClient *pGameClient, bool Render) :
+	m_pGameClient(pGameClient),
+	m_Render(Render)
+{
+}
+
+void CSoundLoading::Run()
+{
+	for(int s = 0; s < g_pData->m_NumSounds; s++)
+	{
+		const char *pLoadingCaption = Localize("Loading StormA Client");
+		const char *pLoadingContent = Localize("Loading sound files");
+
+		for(int i = 0; i < g_pData->m_aSounds[s].m_NumSounds; i++)
+		{
+			int Id = m_pGameClient->Sound()->LoadWV(g_pData->m_aSounds[s].m_aSounds[i].m_pFilename);
+			g_pData->m_aSounds[s].m_aSounds[i].m_Id = Id;
+			// try to render a frame
+			if(m_Render)
+				m_pGameClient->m_Menus.RenderLoading(pLoadingCaption, pLoadingContent, 0);
+		}
+
+		if(m_Render)
+			m_pGameClient->m_Menus.RenderLoading(pLoadingCaption, pLoadingContent, 1);
+	}
+}
+
+int CSounds::GetSampleId(int SetId)
+{
+	if(!g_Config.m_SndEnable || !Sound()->IsSoundEnabled() || m_WaitForSoundJob || SetId < 0 || SetId >= g_pData->m_NumSounds)
+		return -1;
+
+	CDataSoundset *pSet = &g_pData->m_aSounds[SetId];
+	if(!pSet->m_NumSounds)
+		return -1;
+
+	if(pSet->m_NumSounds == 1)
+		return pSet->m_aSounds[0].m_Id;
+
+	// return random one
+	int Id;
+	do
+	{
+		Id = rand() % pSet->m_NumSounds;
+	} while(Id == pSet->m_Last);
+	pSet->m_Last = Id;
+	return pSet->m_aSounds[Id].m_Id;
+}
+
+void CSounds::OnInit()
+{
+	// setup sound channels
+	m_GuiSoundVolume = g_Config.m_SndChatSoundVolume / 100.0f;
+	m_GameSoundVolume = g_Config.m_SndGameSoundVolume / 100.0f;
+	m_MapSoundVolume = g_Config.m_SndMapSoundVolume / 100.0f;
+	m_BackgroundMusicVolume = g_Config.m_SndBackgroundMusicVolume / 100.0f;
+
+	Sound()->SetChannel(CSounds::CHN_GUI, m_GuiSoundVolume, 0.0f);
+	Sound()->SetChannel(CSounds::CHN_MUSIC, m_BackgroundMusicVolume, 1.0f);
+	Sound()->SetChannel(CSounds::CHN_WORLD, 0.9f * m_GameSoundVolume, 1.0f);
+	Sound()->SetChannel(CSounds::CHN_GLOBAL, m_GameSoundVolume, 0.0f);
+	Sound()->SetChannel(CSounds::CHN_MAPSOUND, m_MapSoundVolume, 1.0f);
+
+	Sound()->SetListenerPos(0.0f, 0.0f);
+
+	ClearQueue();
+
+	// load sounds
+	if(g_Config.m_ClThreadsoundloading)
+	{
+		m_pSoundJob = std::make_shared<CSoundLoading>(m_pClient, false);
+		m_pClient->Engine()->AddJob(m_pSoundJob);
+		m_WaitForSoundJob = true;
+		m_pClient->m_Menus.RenderLoading(Localize("Loading DDNet Client"), Localize("Loading sound files"), 0);
+	}
+	else
+	{
+		CSoundLoading(m_pClient, true).Run();
+		m_WaitForSoundJob = false;
+	}
+}
+
+void CSounds::OnReset()
+{
+	if(Client()->State() >= IClient::STATE_ONLINE)
+	{
+		Sound()->StopAll();
+		ClearQueue();
+	}
+}
+
+void CSounds::OnStateChange(int NewState, int OldState)
+{
+	if(NewState == IClient::STATE_ONLINE || NewState == IClient::STATE_DEMOPLAYBACK)
+		OnReset();
+}
+
+void CSounds::OnRender()
+{
+	// check for sound initialisation
+	if(m_WaitForSoundJob)
+	{
+		if(m_pSoundJob->Status() == IJob::STATE_DONE)
+			m_WaitForSoundJob = false;
+		else
+			return;
+	}
+
+	// set listener pos
+	Sound()->SetListenerPos(m_pClient->m_Camera.m_Center.x, m_pClient->m_Camera.m_Center.y);
+
+	// update volume
+	float NewGuiSoundVol = g_Config.m_SndChatSoundVolume / 100.0f;
+	if(NewGuiSoundVol != m_GuiSoundVolume)
+	{
+		m_GuiSoundVolume = NewGuiSoundVol;
+		Sound()->SetChannel(CSounds::CHN_GUI, m_GuiSoundVolume, 1.0f);
+	}
+
+	float NewGameSoundVol = g_Config.m_SndGameSoundVolume / 100.0f;
+	if(NewGameSoundVol != m_GameSoundVolume)
+	{
+		m_GameSoundVolume = NewGameSoundVol;
+		Sound()->SetChannel(CSounds::CHN_WORLD, 0.9f * m_GameSoundVolume, 1.0f);
+		Sound()->SetChannel(CSounds::CHN_GLOBAL, m_GameSoundVolume, 1.0f);
+	}
+
+	float NewMapSoundVol = g_Config.m_SndMapSoundVolume / 100.0f;
+	if(NewMapSoundVol != m_MapSoundVolume)
+	{
+		m_MapSoundVolume = NewMapSoundVol;
+		Sound()->SetChannel(CSounds::CHN_MAPSOUND, m_MapSoundVolume, 1.0f);
+	}
+
+	float NewBackgroundMusicVol = g_Config.m_SndBackgroundMusicVolume / 100.0f;
+	if(NewBackgroundMusicVol != m_BackgroundMusicVolume)
+	{
+		m_BackgroundMusicVolume = NewBackgroundMusicVol;
+		Sound()->SetChannel(CSounds::CHN_MUSIC, m_BackgroundMusicVolume, 1.0f);
+	}
+
+	// play sound from queue
+	if(m_QueuePos > 0)
+	{
+		int64_t Now = time();
+		if(m_QueueWaitTime <= Now)
+		{
+			Play(m_aQueue[0].m_Channel, m_aQueue[0].m_SetId, 1.0f);
+			m_QueueWaitTime = Now + time_freq() * 3 / 10; // wait 300ms before playing the next one
+			if(--m_QueuePos > 0)
+				mem_move(m_aQueue, m_aQueue + 1, m_QueuePos * sizeof(QueueEntry));
+		}
+	}
+}
+
+void CSounds::ClearQueue()
+{
+	mem_zero(m_aQueue, sizeof(m_aQueue));
+	m_QueuePos = 0;
+	m_QueueWaitTime = time();
+}
+
+void CSounds::Enqueue(int Channel, int SetId)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+	if(m_QueuePos >= QUEUE_SIZE)
+		return;
+	if(Channel != CHN_MUSIC && g_Config.m_ClEditor)
+		return;
+
+	m_aQueue[m_QueuePos].m_Channel = Channel;
+	m_aQueue[m_QueuePos++].m_SetId = SetId;
+}
+
+void CSounds::PlayAndRecord(int Channel, int SetId, float Vol, vec2 Pos)
+{
+	CNetMsg_Sv_SoundGlobal Msg;
+	Msg.m_SoundID = SetId;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_NOSEND | MSGFLAG_RECORD);
+
+	Play(Channel, SetId, Vol);
+}
+
+void CSounds::Play(int Channel, int SetId, float Vol)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+	if(Channel == CHN_MUSIC && !g_Config.m_SndMusic)
+		return;
+
+	int SampleId = GetSampleId(SetId);
+	if(SampleId == -1)
+		return;
+
+	int Flags = 0;
+	if(Channel == CHN_MUSIC)
+		Flags = ISound::FLAG_LOOP;
+
+	Sound()->Play(Channel, SampleId, Flags);
+}
+
+void CSounds::PlayAt(int Channel, int SetId, float Vol, vec2 Pos)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+	if(Channel == CHN_MUSIC && !g_Config.m_SndMusic)
+		return;
+
+	int SampleId = GetSampleId(SetId);
+	if(SampleId == -1)
+		return;
+
+	int Flags = 0;
+	if(Channel == CHN_MUSIC)
+		Flags = ISound::FLAG_LOOP;
+
+	Sound()->PlayAt(Channel, SampleId, Flags, Pos.x, Pos.y);
+}
+
+void CSounds::Stop(int SetId)
+{
+	if(m_WaitForSoundJob || SetId < 0 || SetId >= g_pData->m_NumSounds)
+		return;
+
+	const CDataSoundset *pSet = &g_pData->m_aSounds[SetId];
+	for(int i = 0; i < pSet->m_NumSounds; i++)
+		if(pSet->m_aSounds[i].m_Id != -1)
+			Sound()->Stop(pSet->m_aSounds[i].m_Id);
+}
+
+bool CSounds::IsPlaying(int SetId)
+{
+	if(m_WaitForSoundJob || SetId < 0 || SetId >= g_pData->m_NumSounds)
+		return false;
+
+	const CDataSoundset *pSet = &g_pData->m_aSounds[SetId];
+	for(int i = 0; i < pSet->m_NumSounds; i++)
+		if(pSet->m_aSounds[i].m_Id != -1 && Sound()->IsPlaying(pSet->m_aSounds[i].m_Id))
+			return true;
+	return false;
+}
+
+ISound::CVoiceHandle CSounds::PlaySample(int Channel, int SampleId, float Vol, int Flags)
+{
+	if((Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
+		return ISound::CVoiceHandle();
+
+	if(Channel == CHN_MUSIC)
+		Flags |= ISound::FLAG_LOOP;
+
+	return Sound()->Play(Channel, SampleId, Flags);
+}
+
+ISound::CVoiceHandle CSounds::PlaySampleAt(int Channel, int SampleId, float Vol, vec2 Pos, int Flags)
+{
+	if((Channel == CHN_MUSIC && !g_Config.m_SndMusic) || SampleId == -1)
+		return ISound::CVoiceHandle();
+
+	if(Channel == CHN_MUSIC)
+		Flags |= ISound::FLAG_LOOP;
+
+	return Sound()->PlayAt(Channel, SampleId, Flags, Pos.x, Pos.y);
+}
diff --git a/src_bkp/game/client/components/sounds.h b/src_bkp/game/client/components/sounds.h
new file mode 100644
index 0000000000..4ee5df561a
--- /dev/null
+++ b/src_bkp/game/client/components/sounds.h
@@ -0,0 +1,73 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_SOUNDS_H
+#define GAME_CLIENT_COMPONENTS_SOUNDS_H
+
+#include <base/vmath.h>
+#include <engine/shared/jobs.h>
+#include <engine/sound.h>
+#include <game/client/component.h>
+
+class CSoundLoading : public IJob
+{
+	CGameClient *m_pGameClient;
+	bool m_Render;
+
+public:
+	CSoundLoading(CGameClient *pGameClient, bool Render);
+	void Run() override;
+};
+
+class CSounds : public CComponent
+{
+	enum
+	{
+		QUEUE_SIZE = 32,
+	};
+	struct QueueEntry
+	{
+		int m_Channel;
+		int m_SetId;
+	} m_aQueue[QUEUE_SIZE];
+	int m_QueuePos;
+	int64_t m_QueueWaitTime;
+	std::shared_ptr<CSoundLoading> m_pSoundJob;
+	bool m_WaitForSoundJob;
+
+	int GetSampleId(int SetId);
+
+	float m_GuiSoundVolume;
+	float m_GameSoundVolume;
+	float m_MapSoundVolume;
+	float m_BackgroundMusicVolume;
+
+public:
+	// sound channels
+	enum
+	{
+		CHN_GUI = 0,
+		CHN_MUSIC,
+		CHN_WORLD,
+		CHN_GLOBAL,
+		CHN_MAPSOUND,
+	};
+
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnInit() override;
+	virtual void OnReset() override;
+	virtual void OnStateChange(int NewState, int OldState) override;
+	virtual void OnRender() override;
+
+	void ClearQueue();
+	void Enqueue(int Channel, int SetId);
+	void Play(int Channel, int SetId, float Vol);
+	void PlayAt(int Channel, int SetId, float Vol, vec2 Pos);
+	void PlayAndRecord(int Channel, int SetId, float Vol, vec2 Pos);
+	void Stop(int SetId);
+	bool IsPlaying(int SetId);
+
+	ISound::CVoiceHandle PlaySample(int Channel, int SampleId, float Vol, int Flags = 0);
+	ISound::CVoiceHandle PlaySampleAt(int Channel, int SampleId, float Vol, vec2 Pos, int Flags = 0);
+};
+
+#endif
diff --git a/src_bkp/game/client/components/spectator.cpp b/src_bkp/game/client/components/spectator.cpp
new file mode 100644
index 0000000000..b6c981599f
--- /dev/null
+++ b/src_bkp/game/client/components/spectator.cpp
@@ -0,0 +1,568 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <climits>
+
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+#include <engine/textrender.h>
+
+#include <game/generated/protocol.h>
+
+#include <game/client/animstate.h>
+#include <game/client/render.h>
+#include <game/localization.h>
+
+#include "camera.h"
+#include "spectator.h"
+
+#include <game/client/gameclient.h>
+
+bool CSpectator::CanChangeSpectator()
+{
+	// Don't change SpectatorID when not spectating
+	return m_pClient->m_Snap.m_SpecInfo.m_Active;
+}
+
+void CSpectator::SpectateNext(bool Reverse)
+{
+	int CurIndex = -1;
+	const CNetObj_PlayerInfo **paPlayerInfos = m_pClient->m_Snap.m_apInfoByDDTeamName;
+
+	// m_SpectatorID may be uninitialized if m_Active is false
+	if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(paPlayerInfos[i] && paPlayerInfos[i]->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID)
+			{
+				CurIndex = i;
+				break;
+			}
+		}
+	}
+
+	int Start;
+	if(CurIndex != -1)
+	{
+		if(Reverse)
+			Start = CurIndex - 1;
+		else
+			Start = CurIndex + 1;
+	}
+	else
+	{
+		if(Reverse)
+			Start = -1;
+		else
+			Start = 0;
+	}
+
+	int Increment = Reverse ? -1 : 1;
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		int PlayerIndex = (Start + i * Increment) % MAX_CLIENTS;
+		// % in C++ takes the sign of the dividend, not divisor
+		if(PlayerIndex < 0)
+			PlayerIndex += MAX_CLIENTS;
+
+		const CNetObj_PlayerInfo *pPlayerInfo = paPlayerInfos[PlayerIndex];
+		if(pPlayerInfo && pPlayerInfo->m_Team != TEAM_SPECTATORS)
+		{
+			Spectate(pPlayerInfo->m_ClientID);
+			break;
+		}
+	}
+}
+
+void CSpectator::ConKeySpectator(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+
+	if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		pSelf->m_Active = pResult->GetInteger(0) != 0;
+	else
+		pSelf->m_Active = false;
+}
+
+void CSpectator::ConSpectate(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+	if(!pSelf->CanChangeSpectator())
+		return;
+
+	pSelf->Spectate(pResult->GetInteger(0));
+}
+
+void CSpectator::ConSpectateNext(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+	if(!pSelf->CanChangeSpectator())
+		return;
+
+	pSelf->SpectateNext(false);
+}
+
+void CSpectator::ConSpectatePrevious(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+	if(!pSelf->CanChangeSpectator())
+		return;
+
+	pSelf->SpectateNext(true);
+}
+
+void CSpectator::ConSpectateClosest(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+	if(!pSelf->CanChangeSpectator())
+		return;
+
+	const CGameClient::CSnapState &Snap = pSelf->m_pClient->m_Snap;
+	int SpectatorID = Snap.m_SpecInfo.m_SpectatorID;
+
+	int NewSpectatorID = -1;
+
+	vec2 CurPosition(pSelf->m_pClient->m_Camera.m_Center);
+	if(SpectatorID != SPEC_FREEVIEW)
+	{
+		const CNetObj_Character &CurCharacter = Snap.m_aCharacters[SpectatorID].m_Cur;
+		CurPosition.x = CurCharacter.m_X;
+		CurPosition.y = CurCharacter.m_Y;
+	}
+
+	int ClosestDistance = INT_MAX;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(i == SpectatorID || !Snap.m_apPlayerInfos[i] || Snap.m_apPlayerInfos[i]->m_Team == TEAM_SPECTATORS || (SpectatorID == SPEC_FREEVIEW && i == Snap.m_LocalClientID))
+			continue;
+		const CNetObj_Character &MaybeClosestCharacter = Snap.m_aCharacters[i].m_Cur;
+		int Distance = distance(CurPosition, vec2(MaybeClosestCharacter.m_X, MaybeClosestCharacter.m_Y));
+		if(NewSpectatorID == -1 || Distance < ClosestDistance)
+		{
+			NewSpectatorID = i;
+			ClosestDistance = Distance;
+		}
+	}
+	if(NewSpectatorID > -1)
+		pSelf->Spectate(NewSpectatorID);
+}
+
+void CSpectator::ConMultiView(IConsole::IResult *pResult, void *pUserData)
+{
+	CSpectator *pSelf = (CSpectator *)pUserData;
+	int Input = pResult->GetInteger(0);
+
+	if(Input == -1)
+		std::fill(std::begin(pSelf->GameClient()->m_aMultiViewId), std::end(pSelf->GameClient()->m_aMultiViewId), false); // remove everyone from multiview
+	else if(Input < MAX_CLIENTS && Input >= 0)
+		pSelf->GameClient()->m_aMultiViewId[Input] = !pSelf->GameClient()->m_aMultiViewId[Input]; // activate or deactivate one player from multiview
+}
+
+CSpectator::CSpectator()
+{
+	m_SelectorMouse = vec2(0.0f, 0.0f);
+	OnReset();
+	m_OldMouseX = m_OldMouseY = 0.0f;
+}
+
+void CSpectator::OnConsoleInit()
+{
+	Console()->Register("+spectate", "", CFGFLAG_CLIENT, ConKeySpectator, this, "Open spectator mode selector");
+	Console()->Register("spectate", "i[spectator-id]", CFGFLAG_CLIENT, ConSpectate, this, "Switch spectator mode");
+	Console()->Register("spectate_next", "", CFGFLAG_CLIENT, ConSpectateNext, this, "Spectate the next player");
+	Console()->Register("spectate_previous", "", CFGFLAG_CLIENT, ConSpectatePrevious, this, "Spectate the previous player");
+	Console()->Register("spectate_closest", "", CFGFLAG_CLIENT, ConSpectateClosest, this, "Spectate the closest player");
+	Console()->Register("spectate_multiview", "i[id]", CFGFLAG_CLIENT, ConMultiView, this, "Add/remove Client-IDs to spectate them exclusively (-1 to reset)");
+}
+
+bool CSpectator::OnCursorMove(float x, float y, IInput::ECursorType CursorType)
+{
+	if(!m_Active)
+		return false;
+
+	UI()->ConvertMouseMove(&x, &y, CursorType);
+	m_SelectorMouse += vec2(x, y);
+	return true;
+}
+
+void CSpectator::OnRelease()
+{
+	OnReset();
+}
+
+void CSpectator::OnRender()
+{
+	if(!GameClient()->m_MultiViewActivated && m_MultiViewActivateDelay != 0.0f)
+	{
+		if(m_MultiViewActivateDelay <= Client()->LocalTime())
+		{
+			m_MultiViewActivateDelay = 0.0f;
+			GameClient()->m_MultiViewActivated = true;
+		}
+	}
+
+	if(!m_Active)
+	{
+		// closing the spectator menu
+		if(m_WasActive)
+		{
+			if(m_SelectedSpectatorID != NO_SELECTION)
+			{
+				if(m_SelectedSpectatorID == MULTI_VIEW)
+					GameClient()->m_MultiViewActivated = true;
+				else if(m_SelectedSpectatorID == SPEC_FREEVIEW || m_SelectedSpectatorID == SPEC_FOLLOW)
+					GameClient()->m_MultiViewActivated = false;
+
+				if(!GameClient()->m_MultiViewActivated)
+					Spectate(m_SelectedSpectatorID);
+
+				if(GameClient()->m_MultiViewActivated && m_SelectedSpectatorID != MULTI_VIEW && m_pClient->m_Teams.Team(m_SelectedSpectatorID) != GameClient()->m_MultiViewTeam)
+				{
+					GameClient()->ResetMultiView();
+					Spectate(m_SelectedSpectatorID);
+					m_MultiViewActivateDelay = Client()->LocalTime() + 0.3f;
+				}
+			}
+			m_WasActive = false;
+		}
+		return;
+	}
+
+	if(m_SelectedSpectatorID != NO_SELECTION)
+	{
+		// clicking a component
+		if(m_Clicked)
+		{
+			if(!GameClient()->m_MultiViewActivated)
+				Spectate(m_SelectedSpectatorID);
+
+			if(m_SelectedSpectatorID == MULTI_VIEW)
+				GameClient()->m_MultiViewActivated = true;
+			else if(m_SelectedSpectatorID == SPEC_FREEVIEW || m_SelectedSpectatorID == SPEC_FOLLOW)
+				GameClient()->m_MultiViewActivated = false;
+
+			if(!GameClient()->m_MultiViewActivated && m_SelectedSpectatorID >= 0 && m_SelectedSpectatorID < MAX_CLIENTS)
+				m_Clicked = false;
+		}
+	}
+
+	if(!m_pClient->m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		m_Active = false;
+		m_WasActive = false;
+		return;
+	}
+
+	m_WasActive = true;
+	m_SelectedSpectatorID = NO_SELECTION;
+
+	// draw background
+	float Width = 400 * 3.0f * Graphics()->ScreenAspect();
+	float Height = 400 * 3.0f;
+	float ObjWidth = 300.0f;
+	float FontSize = 20.0f;
+	float BigFontSize = 20.0f;
+	float StartY = -190.0f;
+	float LineHeight = 60.0f;
+	float TeeSizeMod = 1.0f;
+	float RoundRadius = 30.0f;
+	bool Selected = false;
+	bool MultiViewSelected = false;
+	int TotalPlayers = 0;
+	int PerLine = 8;
+	float BoxMove = -10.0f;
+	float BoxOffset = 0.0f;
+
+	for(const auto &pInfo : m_pClient->m_Snap.m_apInfoByDDTeamName)
+	{
+		if(!pInfo || pInfo->m_Team == TEAM_SPECTATORS)
+			continue;
+
+		++TotalPlayers;
+	}
+
+	if(TotalPlayers > 32)
+	{
+		FontSize = 18.0f;
+		LineHeight = 30.0f;
+		TeeSizeMod = 0.7f;
+		PerLine = 16;
+		RoundRadius = 10.0f;
+		BoxMove = 3.0f;
+		BoxOffset = 6.0f;
+	}
+	if(TotalPlayers > 16)
+	{
+		ObjWidth = 600.0f;
+	}
+
+	Graphics()->MapScreen(0, 0, Width, Height);
+
+	Graphics()->DrawRect(Width / 2.0f - ObjWidth, Height / 2.0f - 300.0f, ObjWidth * 2, 600.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.3f), IGraphics::CORNER_ALL, 20.0f);
+
+	// clamp mouse position to selector area
+	m_SelectorMouse.x = clamp(m_SelectorMouse.x, -(ObjWidth - 20.0f), ObjWidth - 20.0f);
+	m_SelectorMouse.y = clamp(m_SelectorMouse.y, -280.0f, 280.0f);
+
+	// draw selections
+	if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecID == SPEC_FREEVIEW) ||
+		(Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW))
+	{
+		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
+	}
+
+	if(GameClient()->m_MultiViewActivated)
+	{
+		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
+	}
+
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientID >= 0 && m_pClient->m_DemoSpecID == SPEC_FOLLOW)
+	{
+		Graphics()->DrawRect(Width / 2.0f - (ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f), Height / 2.0f - 280.0f, ((ObjWidth * 2.0f) / 3.0f) - 40.0f, 60.0f, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 20.0f);
+	}
+
+	if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
+		m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
+	{
+		m_SelectedSpectatorID = SPEC_FREEVIEW;
+		Selected = true;
+	}
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+	TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f), Height / 2.0f - 280.f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Free-View"), -1.0f);
+
+	if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f / 3.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
+		m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
+	{
+		m_SelectedSpectatorID = MULTI_VIEW;
+		MultiViewSelected = true;
+	}
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, MultiViewSelected ? 1.0f : 0.5f);
+	TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f) + (ObjWidth * 2.0f / 3.0f), Height / 2.0f - 280.f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Multi-View"), -1.0f);
+
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_LocalClientID >= 0)
+	{
+		Selected = false;
+		if(m_SelectorMouse.x >= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f) && m_SelectorMouse.x <= -(ObjWidth - 20.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f) + ((ObjWidth * 2.0f) / 3.0f) - 40.0f &&
+			m_SelectorMouse.y >= -280.0f && m_SelectorMouse.y <= -220.0f)
+		{
+			m_SelectedSpectatorID = SPEC_FOLLOW;
+			Selected = true;
+		}
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+		TextRender()->Text(Width / 2.0f - (ObjWidth - 40.0f) + (ObjWidth * 2.0f * 2.0f / 3.0f), Height / 2.0f - 280.0f + (60.f - BigFontSize) / 2.f, BigFontSize, Localize("Follow"), -1.0f);
+	}
+
+	float x = -(ObjWidth - 35.0f), y = StartY;
+
+	int OldDDTeam = -1;
+
+	for(int i = 0, Count = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(!m_pClient->m_Snap.m_apInfoByDDTeamName[i] || m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_Team == TEAM_SPECTATORS)
+			continue;
+
+		++Count;
+
+		if(Count == PerLine + 1 || (Count > PerLine + 1 && (Count - 1) % PerLine == 0))
+		{
+			x += 290.0f;
+			y = StartY;
+		}
+
+		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_apInfoByDDTeamName[i];
+		int DDTeam = m_pClient->m_Teams.Team(pInfo->m_ClientID);
+		int NextDDTeam = 0;
+
+		for(int j = i + 1; j < MAX_CLIENTS; j++)
+		{
+			const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamName[j];
+
+			if(!pInfo2 || pInfo2->m_Team == TEAM_SPECTATORS)
+				continue;
+
+			NextDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+			break;
+		}
+
+		if(OldDDTeam == -1)
+		{
+			for(int j = i - 1; j >= 0; j--)
+			{
+				const CNetObj_PlayerInfo *pInfo2 = m_pClient->m_Snap.m_apInfoByDDTeamName[j];
+
+				if(!pInfo2 || pInfo2->m_Team == TEAM_SPECTATORS)
+					continue;
+
+				OldDDTeam = m_pClient->m_Teams.Team(pInfo2->m_ClientID);
+				break;
+			}
+		}
+
+		if(DDTeam != TEAM_FLOCK)
+		{
+			const ColorRGBA Color = m_pClient->GetDDTeamColor(DDTeam).WithAlpha(0.5f);
+			int Corners = 0;
+			if(OldDDTeam != DDTeam)
+				Corners |= IGraphics::CORNER_TL | IGraphics::CORNER_TR;
+			if(NextDDTeam != DDTeam)
+				Corners |= IGraphics::CORNER_BL | IGraphics::CORNER_BR;
+			Graphics()->DrawRect(Width / 2.0f + x - 10.0f + BoxOffset, Height / 2.0f + y + BoxMove, 270.0f - BoxOffset, LineHeight, Color, Corners, RoundRadius);
+		}
+
+		OldDDTeam = DDTeam;
+
+		if((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_pClient->m_DemoSpecID == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID))
+		{
+			Graphics()->DrawRect(Width / 2.0f + x - 10.0f + BoxOffset, Height / 2.0f + y + BoxMove, 270.0f - BoxOffset, LineHeight, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, RoundRadius);
+		}
+
+		Selected = false;
+		if(m_SelectorMouse.x >= x - 10.0f && m_SelectorMouse.x < x + 260.0f &&
+			m_SelectorMouse.y >= y - (LineHeight / 6.0f) && m_SelectorMouse.y < y + (LineHeight * 5.0f / 6.0f))
+		{
+			m_SelectedSpectatorID = m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID;
+			Selected = true;
+			if(GameClient()->m_MultiViewActivated && m_Clicked)
+			{
+				if(GameClient()->m_MultiViewTeam == DDTeam)
+				{
+					GameClient()->m_aMultiViewId[m_SelectedSpectatorID] = !GameClient()->m_aMultiViewId[m_SelectedSpectatorID];
+					if(!GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_SpecInfo.m_SpectatorID])
+					{
+						int NewClientID = GameClient()->FindFirstMultiViewId();
+						if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
+						{
+							GameClient()->CleanMultiViewId(NewClientID);
+							GameClient()->m_aMultiViewId[NewClientID] = true;
+							Spectate(NewClientID);
+						}
+					}
+				}
+				else
+				{
+					GameClient()->ResetMultiView();
+					Spectate(m_SelectedSpectatorID);
+					m_MultiViewActivateDelay = Client()->LocalTime() + 0.3f;
+				}
+				m_Clicked = false;
+			}
+		}
+		float TeeAlpha;
+		if(Client()->State() == IClient::STATE_DEMOPLAYBACK &&
+			!m_pClient->m_Snap.m_aCharacters[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_Active)
+		{
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.25f);
+			TeeAlpha = 0.5f;
+		}
+		else
+		{
+			TextRender()->TextColor(1.0f, 1.0f, 1.0f, Selected ? 1.0f : 0.5f);
+			TeeAlpha = 1.0f;
+		}
+		TextRender()->Text(Width / 2.0f + x + 50.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize, m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_aName, 220.0f);
+
+		if(GameClient()->m_MultiViewActivated)
+		{
+			if(GameClient()->m_aMultiViewId[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID])
+			{
+				TextRender()->TextColor(0.1f, 1.0f, 0.1f, Selected ? 1.0f : 0.5f);
+				TextRender()->Text(Width / 2.0f + x + 50.0f + 180.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize - 3, "⬤", 220.0f);
+			}
+			else if(GameClient()->m_MultiViewTeam == DDTeam)
+			{
+				TextRender()->TextColor(1.0f, 0.1f, 0.1f, Selected ? 1.0f : 0.5f);
+				TextRender()->Text(Width / 2.0f + x + 50.0f + 180.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize - 3, "◯", 220.0f);
+			}
+		}
+
+		// flag
+		if(m_pClient->m_Snap.m_pGameInfoObj && (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS) &&
+			m_pClient->m_Snap.m_pGameDataObj && (m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierRed == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID || m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID))
+		{
+			Graphics()->BlendNormal();
+			if(m_pClient->m_Snap.m_pGameDataObj->m_FlagCarrierBlue == m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID)
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagBlue);
+			else
+				Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+
+			Graphics()->QuadsBegin();
+			Graphics()->QuadsSetSubset(1, 0, 0, 1);
+
+			float Size = LineHeight;
+			IGraphics::CQuadItem QuadItem(Width / 2.0f + x - LineHeight / 5.0f, Height / 2.0f + y - LineHeight / 3.0f, Size / 2.0f, Size);
+			Graphics()->QuadsDrawTL(&QuadItem, 1);
+			Graphics()->QuadsEnd();
+		}
+
+		CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_RenderInfo;
+		TeeInfo.m_Size *= TeeSizeMod;
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
+		vec2 TeeRenderPos(Width / 2.0f + x + 20.0f, Height / 2.0f + y + BoxMove + LineHeight / 2.0f + OffsetToMid.y);
+
+		RenderTools()->RenderTee(pIdleState, &TeeInfo, EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos, TeeAlpha);
+
+		if(m_pClient->m_aClients[m_pClient->m_Snap.m_apInfoByDDTeamName[i]->m_ClientID].m_Friend)
+		{
+			ColorRGBA rgb = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageFriendColor));
+			TextRender()->TextColor(rgb.WithAlpha(1.f));
+			TextRender()->Text(Width / 2.0f + x - TeeInfo.m_Size / 2.0f, Height / 2.0f + y + BoxMove + (LineHeight - FontSize) / 2.f, FontSize, "♥", 220.0f);
+			TextRender()->TextColor(g_Config.m_ScFriendColor);
+		}
+
+		y += LineHeight;
+	}
+	TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+	RenderTools()->RenderCursor(m_SelectorMouse + vec2(Width, Height) / 2, 48.0f);
+}
+
+void CSpectator::OnReset()
+{
+	m_WasActive = false;
+	m_Active = false;
+	m_SelectedSpectatorID = NO_SELECTION;
+}
+
+void CSpectator::Spectate(int SpectatorID)
+{
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		m_pClient->m_DemoSpecID = clamp(SpectatorID, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
+		// The tick must be rendered for the spectator mode to be updated, so we do it manually when demo playback is paused
+		if(DemoPlayer()->BaseInfo()->m_Paused)
+			GameClient()->m_Menus.DemoSeekTick(IDemoPlayer::TICK_CURRENT);
+		return;
+	}
+
+	if(m_pClient->m_Snap.m_SpecInfo.m_SpectatorID == SpectatorID)
+		return;
+
+	CNetMsg_Cl_SetSpectatorMode Msg;
+	Msg.m_SpectatorID = SpectatorID;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+void CSpectator::SpectateClosest()
+{
+	ConSpectateClosest(NULL, this);
+}
+
+bool CSpectator::OnInput(const IInput::CEvent &Event)
+{
+	if(m_Active && Event.m_Flags & IInput::FLAG_PRESS && Event.m_Key == KEY_MOUSE_1)
+	{
+		m_Clicked = true;
+		return true;
+	}
+	else if(Event.m_Flags & IInput::FLAG_RELEASE && Event.m_Key == KEY_MOUSE_1)
+	{
+		m_Clicked = false;
+		return false;
+	}
+	return false;
+}
diff --git a/src_bkp/game/client/components/spectator.h b/src_bkp/game/client/components/spectator.h
new file mode 100644
index 0000000000..11b9e585b9
--- /dev/null
+++ b/src_bkp/game/client/components/spectator.h
@@ -0,0 +1,54 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_SPECTATOR_H
+#define GAME_CLIENT_COMPONENTS_SPECTATOR_H
+#include <base/vmath.h>
+
+#include <game/client/component.h>
+
+class CSpectator : public CComponent
+{
+	enum
+	{
+		MULTI_VIEW = -4,
+		NO_SELECTION = -3,
+	};
+
+	bool m_Active;
+	bool m_WasActive;
+	bool m_Clicked;
+
+	int m_SelectedSpectatorID;
+	vec2 m_SelectorMouse;
+
+	float m_OldMouseX;
+	float m_OldMouseY;
+
+	float m_MultiViewActivateDelay;
+
+	bool CanChangeSpectator();
+	void SpectateNext(bool Reverse);
+
+	static void ConKeySpectator(IConsole::IResult *pResult, void *pUserData);
+	static void ConSpectate(IConsole::IResult *pResult, void *pUserData);
+	static void ConSpectateNext(IConsole::IResult *pResult, void *pUserData);
+	static void ConSpectatePrevious(IConsole::IResult *pResult, void *pUserData);
+	static void ConSpectateClosest(IConsole::IResult *pResult, void *pUserData);
+	static void ConMultiView(IConsole::IResult *pResult, void *pUserData);
+
+public:
+	CSpectator();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	virtual void OnConsoleInit() override;
+	virtual bool OnCursorMove(float x, float y, IInput::ECursorType CursorType) override;
+	virtual void OnRender() override;
+	virtual void OnRelease() override;
+	virtual void OnReset() override;
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+
+	void Spectate(int SpectatorID);
+	void SpectateClosest();
+};
+
+#endif
diff --git a/src_bkp/game/client/components/statboard.cpp b/src_bkp/game/client/components/statboard.cpp
new file mode 100644
index 0000000000..be9bed2195
--- /dev/null
+++ b/src_bkp/game/client/components/statboard.cpp
@@ -0,0 +1,539 @@
+#include <engine/graphics.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+#include <game/client/animstate.h>
+#include <game/client/components/motd.h>
+#include <game/client/components/statboard.h>
+#include <game/client/gameclient.h>
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+
+CStatboard::CStatboard()
+{
+	m_Active = false;
+	m_ScreenshotTaken = false;
+	m_ScreenshotTime = -1;
+}
+
+void CStatboard::OnReset()
+{
+	for(auto &Stat : m_pClient->m_aStats)
+		Stat.Reset();
+	m_Active = false;
+	m_ScreenshotTaken = false;
+	m_ScreenshotTime = -1;
+}
+
+void CStatboard::OnRelease()
+{
+	m_Active = false;
+}
+
+void CStatboard::ConKeyStats(IConsole::IResult *pResult, void *pUserData)
+{
+	((CStatboard *)pUserData)->m_Active = pResult->GetInteger(0) != 0;
+}
+
+void CStatboard::OnConsoleInit()
+{
+	Console()->Register("+statboard", "", CFGFLAG_CLIENT, ConKeyStats, this, "Show stats");
+}
+
+bool CStatboard::IsActive() const
+{
+	return m_Active;
+}
+
+void CStatboard::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(m_pClient->m_SuppressEvents)
+		return;
+
+	if(MsgType == NETMSGTYPE_SV_KILLMSG)
+	{
+		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
+		CGameClient::CClientStats *pStats = m_pClient->m_aStats;
+
+		pStats[pMsg->m_Victim].m_Deaths++;
+		pStats[pMsg->m_Victim].m_CurrentSpree = 0;
+		if(pMsg->m_Weapon >= 0)
+			pStats[pMsg->m_Victim].m_aDeathsFrom[pMsg->m_Weapon]++;
+		if(pMsg->m_Victim != pMsg->m_Killer)
+		{
+			pStats[pMsg->m_Killer].m_Frags++;
+			pStats[pMsg->m_Killer].m_CurrentSpree++;
+
+			if(pStats[pMsg->m_Killer].m_CurrentSpree > pStats[pMsg->m_Killer].m_BestSpree)
+				pStats[pMsg->m_Killer].m_BestSpree = pStats[pMsg->m_Killer].m_CurrentSpree;
+			if(pMsg->m_Weapon >= 0)
+				pStats[pMsg->m_Killer].m_aFragsWith[pMsg->m_Weapon]++;
+		}
+		else
+			pStats[pMsg->m_Victim].m_Suicides++;
+	}
+	else if(MsgType == NETMSGTYPE_SV_KILLMSGTEAM)
+	{
+		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
+		CGameClient::CClientStats *pStats = m_pClient->m_aStats;
+
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_pClient->m_Teams.Team(i) == pMsg->m_Team)
+			{
+				pStats[i].m_Deaths++;
+				pStats[i].m_Suicides++;
+			}
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_CHAT)
+	{
+		CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+		if(pMsg->m_ClientID < 0)
+		{
+			const char *p, *t;
+			const char *pLookFor = "flag was captured by '";
+			if((p = str_find(pMsg->m_pMessage, pLookFor)))
+			{
+				char aName[MAX_NAME_LENGTH];
+				p += str_length(pLookFor);
+				t = str_rchr(p, '\'');
+
+				if(t <= p)
+					return;
+				str_utf8_truncate(aName, sizeof(aName), p, t - p);
+
+				for(int i = 0; i < MAX_CLIENTS; i++)
+				{
+					if(!m_pClient->m_aStats[i].IsActive())
+						continue;
+
+					if(str_comp(m_pClient->m_aClients[i].m_aName, aName) == 0)
+					{
+						m_pClient->m_aStats[i].m_FlagCaptures++;
+						break;
+					}
+				}
+			}
+		}
+	}
+}
+
+void CStatboard::OnRender()
+{
+	if((g_Config.m_ClAutoStatboardScreenshot || g_Config.m_ClAutoCSV) && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		if(m_ScreenshotTime < 0 && m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
+			m_ScreenshotTime = time_get() + time_freq() * 3;
+		if(m_ScreenshotTime > -1 && m_ScreenshotTime < time_get())
+			m_Active = true;
+		if(!m_ScreenshotTaken && m_ScreenshotTime > -1 && m_ScreenshotTime + time_freq() / 5 < time_get())
+		{
+			if(g_Config.m_ClAutoStatboardScreenshot)
+				AutoStatScreenshot();
+			if(g_Config.m_ClAutoCSV)
+				AutoStatCSV();
+			m_ScreenshotTaken = true;
+		}
+	}
+
+	if(IsActive())
+		RenderGlobalStats();
+}
+
+void CStatboard::RenderGlobalStats()
+{
+	const float StatboardWidth = 400 * 3.0f * Graphics()->ScreenAspect();
+	const float StatboardHeight = 400 * 3.0f;
+	float StatboardContentWidth = 260.0f;
+	float StatboardContentHeight = 750.0f;
+
+	const CNetObj_PlayerInfo *apPlayers[MAX_CLIENTS] = {0};
+	int NumPlayers = 0;
+
+	// sort red or dm players by score
+	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+	{
+		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_RED)
+			continue;
+		apPlayers[NumPlayers] = pInfo;
+		NumPlayers++;
+	}
+
+	// sort blue players by score after
+	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+	{
+		for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+		{
+			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_BLUE)
+				continue;
+			apPlayers[NumPlayers] = pInfo;
+			NumPlayers++;
+		}
+	}
+
+	// Dirty hack. Do not show scoreboard if there are more than 32 players
+	// remove as soon as support of more than 32 players is required
+	if(NumPlayers > 32)
+		return;
+
+	//clear motd if it is active
+	if(m_pClient->m_Motd.IsActive())
+		m_pClient->m_Motd.Clear();
+
+	bool GameWithFlags = m_pClient->m_Snap.m_pGameInfoObj &&
+			     m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS;
+
+	StatboardContentWidth += 7 * 85 + 95; // Suicides 95; other labels 85
+
+	if(GameWithFlags)
+		StatboardContentWidth += 150; // Grabs & Flags
+
+	bool aDisplayWeapon[NUM_WEAPONS] = {false};
+	for(int i = 0; i < NumPlayers; i++)
+	{
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[apPlayers[i]->m_ClientID];
+		for(int j = 0; j < NUM_WEAPONS; j++)
+			aDisplayWeapon[j] = aDisplayWeapon[j] || pStats->m_aFragsWith[j] || pStats->m_aDeathsFrom[j];
+	}
+	for(bool DisplayWeapon : aDisplayWeapon)
+		if(DisplayWeapon)
+			StatboardContentWidth += 80;
+
+	float x = StatboardWidth / 2 - StatboardContentWidth / 2;
+	float y = 200.0f;
+
+	Graphics()->MapScreen(0, 0, StatboardWidth, StatboardHeight);
+
+	Graphics()->DrawRect(x - 10.f, y - 10.f, StatboardContentWidth, StatboardContentHeight, ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_ALL, 17.0f);
+
+	float tw;
+	int px = 325;
+
+	TextRender()->Text(x + 10, y - 5, 22.0f, Localize("Name"), -1.0f);
+	const char *apHeaders[] = {
+		Localize("Frags"), Localize("Deaths"), Localize("Suicides"),
+		Localize("Ratio"), Localize("Net"), Localize("FPM"),
+		Localize("Spree"), Localize("Best"), Localize("Grabs")};
+	for(int i = 0; i < 9; i++)
+	{
+		if(i == 2)
+			px += 10.0f; // Suicides
+		if(i == 8 && !GameWithFlags) // Don't draw "Grabs" in game with no flag
+			continue;
+		tw = TextRender()->TextWidth(22.0f, apHeaders[i], -1, -1.0f);
+		TextRender()->Text(x + px - tw, y - 5, 22.0f, apHeaders[i], -1.0f);
+		px += 85;
+	}
+
+	px -= 40;
+	for(int i = 0; i < NUM_WEAPONS; i++)
+	{
+		if(!aDisplayWeapon[i])
+			continue;
+		float ScaleX, ScaleY;
+		RenderTools()->GetSpriteScale(g_pData->m_Weapons.m_aId[i].m_pSpriteBody, ScaleX, ScaleY);
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[i]);
+		Graphics()->QuadsBegin();
+		if(i == 0)
+			RenderTools()->DrawSprite(x + px, y + 10, g_pData->m_Weapons.m_aId[i].m_VisualSize * 0.8f * ScaleX, g_pData->m_Weapons.m_aId[i].m_VisualSize * 0.8f * ScaleY);
+		else
+			RenderTools()->DrawSprite(x + px, y + 10, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleX, g_pData->m_Weapons.m_aId[i].m_VisualSize * ScaleY);
+		px += 80;
+		Graphics()->QuadsEnd();
+	}
+
+	if(GameWithFlags)
+	{
+		Graphics()->TextureSet(GameClient()->m_GameSkin.m_SpriteFlagRed);
+		float ScaleX, ScaleY;
+		RenderTools()->GetSpriteScale(SPRITE_FLAG_RED, ScaleX, ScaleY);
+		Graphics()->QuadsBegin();
+		Graphics()->QuadsSetRotation(0.78f);
+		RenderTools()->DrawSprite(x + px, y + 15, 48 * ScaleX, 48 * ScaleY);
+		Graphics()->QuadsEnd();
+	}
+
+	y += 29.0f;
+
+	float FontSize = 24.0f;
+	float LineHeight = 50.0f;
+	float TeeSizemod = 0.8f;
+	float ContentLineOffset = LineHeight * 0.05f;
+
+	if(NumPlayers > 16)
+	{
+		FontSize = 20.0f;
+		LineHeight = 22.0f;
+		TeeSizemod = 0.34f;
+		ContentLineOffset = 0;
+	}
+	else if(NumPlayers > 14)
+	{
+		FontSize = 24.0f;
+		LineHeight = 40.0f;
+		TeeSizemod = 0.7f;
+	}
+
+	for(int j = 0; j < NumPlayers; j++)
+	{
+		const CNetObj_PlayerInfo *pInfo = apPlayers[j];
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientID];
+
+		if(m_pClient->m_Snap.m_LocalClientID == pInfo->m_ClientID || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID))
+		{
+			// background so it's easy to find the local player
+			Graphics()->DrawRect(x - 10, y + ContentLineOffset / 2, StatboardContentWidth, LineHeight - ContentLineOffset, ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_NONE, 0.0f);
+		}
+
+		CTeeRenderInfo Teeinfo = m_pClient->m_aClients[pInfo->m_ClientID].m_RenderInfo;
+		Teeinfo.m_Size *= TeeSizemod;
+
+		const CAnimState *pIdleState = CAnimState::GetIdle();
+		vec2 OffsetToMid;
+		RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Teeinfo, OffsetToMid);
+		vec2 TeeRenderPos(x + Teeinfo.m_Size / 2, y + LineHeight / 2.0f + OffsetToMid.y);
+
+		RenderTools()->RenderTee(pIdleState, &Teeinfo, EMOTE_NORMAL, vec2(1, 0), TeeRenderPos);
+
+		char aBuf[128];
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, x + 64, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
+		Cursor.m_LineWidth = 220;
+		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
+
+		px = 325;
+
+		// FRAGS
+		{
+			str_from_int(pStats->m_Frags, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// DEATHS
+		{
+			str_from_int(pStats->m_Deaths, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// SUICIDES
+		{
+			px += 10;
+			str_from_int(pStats->m_Suicides, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// RATIO
+		{
+			if(pStats->m_Deaths == 0)
+				str_copy(aBuf, "--");
+			else
+				str_format(aBuf, sizeof(aBuf), "%.2f", (float)(pStats->m_Frags) / pStats->m_Deaths);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// NET
+		{
+			str_format(aBuf, sizeof(aBuf), "%+d", pStats->m_Frags - pStats->m_Deaths);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// FPM
+		{
+			float Fpm = pStats->GetFPM(Client()->GameTick(g_Config.m_ClDummy), Client()->GameTickSpeed());
+			str_format(aBuf, sizeof(aBuf), "%.1f", Fpm);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// SPREE
+		{
+			str_from_int(pStats->m_CurrentSpree, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// BEST SPREE
+		{
+			str_from_int(pStats->m_BestSpree, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// GRABS
+		if(GameWithFlags)
+		{
+			str_from_int(pStats->m_FlagGrabs, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 85;
+		}
+		// WEAPONS
+		px -= 40;
+		for(int i = 0; i < NUM_WEAPONS; i++)
+		{
+			if(!aDisplayWeapon[i])
+				continue;
+
+			str_format(aBuf, sizeof(aBuf), "%d/%d", pStats->m_aFragsWith[i], pStats->m_aDeathsFrom[i]);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x + px - tw / 2, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+			px += 80;
+		}
+		// FLAGS
+		if(GameWithFlags)
+		{
+			str_from_int(pStats->m_FlagCaptures, aBuf);
+			tw = TextRender()->TextWidth(FontSize, aBuf, -1, -1.0f);
+			TextRender()->Text(x - tw + px, y + (LineHeight * 0.95f - FontSize) / 2.f, FontSize, aBuf, -1.0f);
+		}
+		y += LineHeight;
+	}
+}
+
+void CStatboard::AutoStatScreenshot()
+{
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		Client()->AutoStatScreenshot_Start();
+}
+
+void CStatboard::AutoStatCSV()
+{
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		char aDate[20], aFilename[IO_MAX_PATH_LENGTH];
+		str_timestamp(aDate, sizeof(aDate));
+		str_format(aFilename, sizeof(aFilename), "screenshots/auto/stats_%s.csv", aDate);
+		IOHANDLE File = Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_ALL);
+
+		if(File)
+		{
+			char aStats[1024 * (VANILLA_MAX_CLIENTS + 1)];
+			FormatStats(aStats, sizeof(aStats));
+			io_write(File, aStats, str_length(aStats));
+			io_close(File);
+		}
+
+		Client()->AutoCSV_Start();
+	}
+}
+
+std::string CStatboard::ReplaceCommata(char *pStr)
+{
+	if(!str_find(pStr, ","))
+		return pStr;
+
+	char aOutbuf[256];
+	mem_zero(aOutbuf, sizeof(aOutbuf));
+
+	for(int i = 0, skip = 0; i < 64; i++)
+	{
+		if(pStr[i] == ',')
+		{
+			aOutbuf[i + skip++] = '%';
+			aOutbuf[i + skip++] = '2';
+			aOutbuf[i + skip] = 'C';
+		}
+		else
+			aOutbuf[i + skip] = pStr[i];
+	}
+
+	return aOutbuf;
+}
+
+void CStatboard::FormatStats(char *pDest, size_t DestSize)
+{
+	// server stats
+	CServerInfo CurrentServerInfo;
+	Client()->GetServerInfo(&CurrentServerInfo);
+	char aServerStats[1024];
+	str_format(aServerStats, sizeof(aServerStats), "Servername,Game-type,Map\n%s,%s,%s", ReplaceCommata(CurrentServerInfo.m_aName).c_str(), ReplaceCommata(CurrentServerInfo.m_aGameType).c_str(), ReplaceCommata(CurrentServerInfo.m_aMap).c_str());
+
+	// player stats
+
+	// sort players
+	const CNetObj_PlayerInfo *apPlayers[MAX_CLIENTS] = {0};
+	int NumPlayers = 0;
+
+	// sort red or dm players by score
+	for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+	{
+		if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_RED)
+			continue;
+		apPlayers[NumPlayers] = pInfo;
+		NumPlayers++;
+	}
+
+	// sort blue players by score after
+	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)
+	{
+		for(const auto *pInfo : m_pClient->m_Snap.m_apInfoByScore)
+		{
+			if(!pInfo || !m_pClient->m_aStats[pInfo->m_ClientID].IsActive() || m_pClient->m_aClients[pInfo->m_ClientID].m_Team != TEAM_BLUE)
+				continue;
+			apPlayers[NumPlayers] = pInfo;
+			NumPlayers++;
+		}
+	}
+
+	char aPlayerStats[1024 * VANILLA_MAX_CLIENTS];
+	str_copy(aPlayerStats, "Local-player,Team,Name,Clan,Score,Frags,Deaths,Suicides,F/D-ratio,Net,FPM,Spree,Best,Hammer-F/D,Gun-F/D,Shotgun-F/D,Grenade-F/D,Laser-F/D,Ninja-F/D,GameWithFlags,Flag-grabs,Flag-captures\n");
+	for(int i = 0; i < NumPlayers; i++)
+	{
+		const CNetObj_PlayerInfo *pInfo = apPlayers[i];
+		const CGameClient::CClientStats *pStats = &m_pClient->m_aStats[pInfo->m_ClientID];
+
+		// Pre-formatting
+
+		// Weapons frags/deaths
+		char aWeaponFD[64 * NUM_WEAPONS];
+		for(int j = 0; j < NUM_WEAPONS; j++)
+		{
+			if(j == 0)
+				str_format(aWeaponFD, sizeof(aWeaponFD), "%d/%d", pStats->m_aFragsWith[j], pStats->m_aDeathsFrom[j]);
+			else
+				str_format(aWeaponFD, sizeof(aWeaponFD), "%s,%d/%d", aWeaponFD, pStats->m_aFragsWith[j], pStats->m_aDeathsFrom[j]);
+		}
+
+		// Frag/Death ratio
+		float fdratio = 0.0f;
+		if(pStats->m_Deaths != 0)
+			fdratio = (float)(pStats->m_Frags) / pStats->m_Deaths;
+
+		// Local player
+		bool localPlayer = (m_pClient->m_Snap.m_LocalClientID == pInfo->m_ClientID || (m_pClient->m_Snap.m_SpecInfo.m_Active && pInfo->m_ClientID == m_pClient->m_Snap.m_SpecInfo.m_SpectatorID));
+
+		// Game with flags
+		bool GameWithFlags = (m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_FLAGS);
+
+		char aBuf[1024];
+		str_format(aBuf, sizeof(aBuf), "%d,%d,%s,%s,%d,%d,%d,%d,%.2f,%i,%.1f,%d,%d,%s,%d,%d,%d\n",
+			localPlayer ? 1 : 0, // Local player
+			m_pClient->m_aClients[pInfo->m_ClientID].m_Team, // Team
+			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientID].m_aName).c_str(), // Name
+			ReplaceCommata(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan).c_str(), // Clan
+			clamp(pInfo->m_Score, -999, 999), // Score
+			pStats->m_Frags, // Frags
+			pStats->m_Deaths, // Deaths
+			pStats->m_Suicides, // Suicides
+			fdratio, // fdratio
+			pStats->m_Frags - pStats->m_Deaths, // Net
+			pStats->GetFPM(Client()->GameTick(g_Config.m_ClDummy), Client()->GameTickSpeed()), // FPM
+			pStats->m_CurrentSpree, // CurSpree
+			pStats->m_BestSpree, // BestSpree
+			aWeaponFD, // WeaponFD
+			GameWithFlags ? 1 : 0, // GameWithFlags
+			pStats->m_FlagGrabs, // Flag grabs
+			pStats->m_FlagCaptures); // Flag captures
+
+		str_append(aPlayerStats, aBuf);
+	}
+
+	str_format(pDest, DestSize, "%s\n\n%s", aServerStats, aPlayerStats);
+}
diff --git a/src_bkp/game/client/components/statboard.h b/src_bkp/game/client/components/statboard.h
new file mode 100644
index 0000000000..e5d2a88067
--- /dev/null
+++ b/src_bkp/game/client/components/statboard.h
@@ -0,0 +1,34 @@
+#ifndef GAME_CLIENT_COMPONENTS_STATBOARD_H
+#define GAME_CLIENT_COMPONENTS_STATBOARD_H
+
+#include <engine/console.h>
+
+#include <game/client/component.h>
+#include <string>
+
+class CStatboard : public CComponent
+{
+private:
+	bool m_Active;
+	bool m_ScreenshotTaken;
+	int64_t m_ScreenshotTime;
+	static void ConKeyStats(IConsole::IResult *pResult, void *pUserData);
+	void RenderGlobalStats();
+	void AutoStatScreenshot();
+	void AutoStatCSV();
+
+	std::string ReplaceCommata(char *pStr);
+	void FormatStats(char *pDest, size_t DestSize);
+
+public:
+	CStatboard();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnReset() override;
+	virtual void OnConsoleInit() override;
+	virtual void OnRender() override;
+	virtual void OnRelease() override;
+	virtual void OnMessage(int MsgType, void *pRawMsg) override;
+	bool IsActive() const;
+};
+
+#endif // GAME_CLIENT_COMPONENTS_STATBOARD_H
diff --git a/src_bkp/game/client/components/tooltips.cpp b/src_bkp/game/client/components/tooltips.cpp
new file mode 100644
index 0000000000..4d7dd79701
--- /dev/null
+++ b/src_bkp/game/client/components/tooltips.cpp
@@ -0,0 +1,149 @@
+#include "tooltips.h"
+
+#include <game/client/render.h>
+#include <game/client/ui.h>
+
+CTooltips::CTooltips()
+{
+	OnReset();
+}
+
+void CTooltips::OnReset()
+{
+	m_HoverTime = -1;
+	m_Tooltips.clear();
+	ClearActiveTooltip();
+}
+
+void CTooltips::SetActiveTooltip(CTooltip &Tooltip)
+{
+	m_ActiveTooltip.emplace(Tooltip);
+}
+
+inline void CTooltips::ClearActiveTooltip()
+{
+	m_ActiveTooltip.reset();
+	m_PreviousTooltip.reset();
+}
+
+void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint)
+{
+	uintptr_t ID = reinterpret_cast<uintptr_t>(pID);
+	const auto result = m_Tooltips.emplace(ID, CTooltip{
+							   pID,
+							   *pNearRect,
+							   pText,
+							   WidthHint,
+							   false});
+	CTooltip &Tooltip = result.first->second;
+
+	if(!result.second)
+	{
+		Tooltip.m_Rect = *pNearRect; // update in case of window resize
+		Tooltip.m_pText = pText; // update in case of language change
+	}
+
+	Tooltip.m_OnScreen = true;
+
+	if(UI()->HotItem() == Tooltip.m_pID)
+	{
+		SetActiveTooltip(Tooltip);
+	}
+}
+
+void CTooltips::OnRender()
+{
+	if(m_ActiveTooltip.has_value())
+	{
+		CTooltip &Tooltip = m_ActiveTooltip.value();
+
+		if(UI()->HotItem() != Tooltip.m_pID)
+		{
+			Tooltip.m_OnScreen = false;
+			ClearActiveTooltip();
+			return;
+		}
+
+		if(!Tooltip.m_OnScreen)
+			return;
+
+		// Reset hover time if a different tooltip is active.
+		// Only reset hover time when rendering, because multiple tooltips can be
+		// activated in the same frame, but only the last one should be rendered.
+		if(!m_PreviousTooltip.has_value() || m_PreviousTooltip.value().get().m_pText != Tooltip.m_pText)
+			m_HoverTime = time_get();
+		m_PreviousTooltip.emplace(Tooltip);
+
+		// Delay tooltip until 1 second passed. Start fade-in in the last 0.25 seconds.
+		constexpr float SecondsBeforeFadeIn = 0.75f;
+		const float SecondsSinceActivation = (time_get() - m_HoverTime) / (float)time_freq();
+		if(SecondsSinceActivation < SecondsBeforeFadeIn)
+			return;
+		constexpr float SecondsFadeIn = 0.25f;
+		const float AlphaFactor = SecondsSinceActivation < SecondsBeforeFadeIn + SecondsFadeIn ? (SecondsSinceActivation - SecondsBeforeFadeIn) / SecondsFadeIn : 1.0f;
+
+		constexpr float FontSize = 14.0f;
+		constexpr float Margin = 5.0f;
+		constexpr float Padding = 5.0f;
+
+		const STextBoundingBox BoundingBox = TextRender()->TextBoundingBox(FontSize, Tooltip.m_pText, -1, Tooltip.m_WidthHint);
+		CUIRect Rect;
+		Rect.w = BoundingBox.m_W + 2 * Padding;
+		Rect.h = BoundingBox.m_H + 2 * Padding;
+
+		const CUIRect *pScreen = UI()->Screen();
+		Rect.w = minimum(Rect.w, pScreen->w - 2 * Margin);
+		Rect.h = minimum(Rect.h, pScreen->h - 2 * Margin);
+
+		// Try the top side.
+		if(Tooltip.m_Rect.y - Rect.h - Margin > pScreen->y)
+		{
+			Rect.x = clamp(UI()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
+			Rect.y = Tooltip.m_Rect.y - Rect.h - Margin;
+		}
+		// Try the bottom side.
+		else if(Tooltip.m_Rect.y + Tooltip.m_Rect.h + Margin < pScreen->h)
+		{
+			Rect.x = clamp(UI()->MouseX() - Rect.w / 2.0f, Margin, pScreen->w - Rect.w - Margin);
+			Rect.y = Tooltip.m_Rect.y + Tooltip.m_Rect.h + Margin;
+		}
+		// Try the right side.
+		else if(Tooltip.m_Rect.x + Tooltip.m_Rect.w + Margin + Rect.w < pScreen->w)
+		{
+			Rect.x = Tooltip.m_Rect.x + Tooltip.m_Rect.w + Margin;
+			Rect.y = clamp(UI()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
+		}
+		// Try the left side.
+		else if(Tooltip.m_Rect.x - Rect.w - Margin > pScreen->x)
+		{
+			Rect.x = Tooltip.m_Rect.x - Rect.w - Margin;
+			Rect.y = clamp(UI()->MouseY() - Rect.h / 2.0f, Margin, pScreen->h - Rect.h - Margin);
+		}
+
+		Rect.Draw(ColorRGBA(0.2f, 0.2f, 0.2f, 0.8f * AlphaFactor), IGraphics::CORNER_ALL, Padding);
+		Rect.Margin(Padding, &Rect);
+
+		CTextCursor Cursor;
+		TextRender()->SetCursor(&Cursor, Rect.x, Rect.y, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = Tooltip.m_WidthHint;
+
+		STextContainerIndex TextContainerIndex;
+		const unsigned OldRenderFlags = TextRender()->GetRenderFlags();
+		TextRender()->SetRenderFlags(OldRenderFlags | TEXT_RENDER_FLAG_ONE_TIME_USE);
+		TextRender()->CreateTextContainer(TextContainerIndex, &Cursor, Tooltip.m_pText);
+		TextRender()->SetRenderFlags(OldRenderFlags);
+
+		if(TextContainerIndex.Valid())
+		{
+			ColorRGBA TextColor = TextRender()->DefaultTextColor();
+			TextColor.a *= AlphaFactor;
+			ColorRGBA OutlineColor = TextRender()->DefaultTextOutlineColor();
+			OutlineColor.a *= AlphaFactor;
+			TextRender()->RenderTextContainer(TextContainerIndex, TextColor, OutlineColor);
+		}
+
+		TextRender()->DeleteTextContainer(TextContainerIndex);
+
+		Tooltip.m_OnScreen = false;
+	}
+}
diff --git a/src_bkp/game/client/components/tooltips.h b/src_bkp/game/client/components/tooltips.h
new file mode 100644
index 0000000000..aaac1afec1
--- /dev/null
+++ b/src_bkp/game/client/components/tooltips.h
@@ -0,0 +1,61 @@
+#ifndef GAME_CLIENT_COMPONENTS_TOOLTIPS_H
+#define GAME_CLIENT_COMPONENTS_TOOLTIPS_H
+
+#include <game/client/component.h>
+#include <game/client/ui_rect.h>
+
+#include <cstdint>
+#include <functional>
+#include <optional>
+#include <unordered_map>
+
+struct CTooltip
+{
+	const void *m_pID;
+	CUIRect m_Rect;
+	const char *m_pText;
+	float m_WidthHint;
+	bool m_OnScreen; // used to know if the tooltip should be rendered.
+};
+
+/**
+ * A component that manages and renders UI tooltips.
+ *
+ * Should be among the last components to render.
+ */
+class CTooltips : public CComponent
+{
+	std::unordered_map<uintptr_t, CTooltip> m_Tooltips;
+	std::optional<std::reference_wrapper<CTooltip>> m_ActiveTooltip;
+	std::optional<std::reference_wrapper<CTooltip>> m_PreviousTooltip;
+	int64_t m_HoverTime;
+
+	/**
+	 * @param Tooltip A reference to the tooltip that should be active.
+	 */
+	void SetActiveTooltip(CTooltip &Tooltip);
+
+	inline void ClearActiveTooltip();
+
+public:
+	CTooltips();
+	virtual int Sizeof() const override { return sizeof(*this); }
+
+	/**
+	 * Adds the tooltip to a cache and renders it when active.
+	 *
+	 * On the first call to this function, the data passed is cached, afterwards the calls are used to detect if the tooltip should be activated.
+	 * If multiple tooltips cover the same rect or the rects intersect, then the tooltip that is added later has priority.
+	 *
+	 * @param pID The ID of the tooltip. Usually a reference to some g_Config value.
+	 * @param pNearRect Place the tooltip near this rect.
+	 * @param pText The text to display in the tooltip.
+	 * @param WidthHint The maximum width of the tooltip, or -1.0f for unlimited.
+	 */
+	void DoToolTip(const void *pID, const CUIRect *pNearRect, const char *pText, float WidthHint = -1.0f);
+
+	virtual void OnReset() override;
+	virtual void OnRender() override;
+};
+
+#endif
diff --git a/src/game/client/components/verify.cpp b/src_bkp/game/client/components/verify.cpp
similarity index 100%
rename from src/game/client/components/verify.cpp
rename to src_bkp/game/client/components/verify.cpp
diff --git a/src/game/client/components/verify.h b/src_bkp/game/client/components/verify.h
similarity index 100%
rename from src/game/client/components/verify.h
rename to src_bkp/game/client/components/verify.h
diff --git a/src_bkp/game/client/components/voting.cpp b/src_bkp/game/client/components/voting.cpp
new file mode 100644
index 0000000000..aaab39dedd
--- /dev/null
+++ b/src_bkp/game/client/components/voting.cpp
@@ -0,0 +1,368 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/shared/config.h>
+
+#include "voting.h"
+#include <game/client/components/sounds.h>
+#include <game/client/render.h>
+#include <game/generated/protocol.h>
+
+#include <game/client/gameclient.h>
+
+void CVoting::ConCallvote(IConsole::IResult *pResult, void *pUserData)
+{
+	CVoting *pSelf = (CVoting *)pUserData;
+	pSelf->Callvote(pResult->GetString(0), pResult->GetString(1), pResult->NumArguments() > 2 ? pResult->GetString(2) : "");
+}
+
+void CVoting::ConVote(IConsole::IResult *pResult, void *pUserData)
+{
+	CVoting *pSelf = (CVoting *)pUserData;
+	if(str_comp_nocase(pResult->GetString(0), "yes") == 0)
+		pSelf->Vote(1);
+	else if(str_comp_nocase(pResult->GetString(0), "no") == 0)
+		pSelf->Vote(-1);
+}
+
+void CVoting::Callvote(const char *pType, const char *pValue, const char *pReason)
+{
+	CNetMsg_Cl_CallVote Msg = {0};
+	Msg.m_pType = pType;
+	Msg.m_pValue = pValue;
+	Msg.m_pReason = pReason;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+void CVoting::CallvoteSpectate(int ClientID, const char *pReason, bool ForceVote)
+{
+	if(ForceVote)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "set_team %d -1", ClientID);
+		Client()->Rcon(aBuf);
+	}
+	else
+	{
+		char aBuf[32];
+		str_from_int(ClientID, aBuf);
+		Callvote("spectate", aBuf, pReason);
+	}
+}
+
+void CVoting::CallvoteKick(int ClientID, const char *pReason, bool ForceVote)
+{
+	if(ForceVote)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "force_vote kick %d %s", ClientID, pReason);
+		Client()->Rcon(aBuf);
+	}
+	else
+	{
+		char aBuf[32];
+		str_from_int(ClientID, aBuf);
+		Callvote("kick", aBuf, pReason);
+	}
+}
+
+void CVoting::CallvoteOption(int OptionID, const char *pReason, bool ForceVote)
+{
+	CVoteOptionClient *pOption = m_pFirst;
+	while(pOption && OptionID >= 0)
+	{
+		if(OptionID == 0)
+		{
+			if(ForceVote)
+			{
+				char aBuf[128];
+				str_copy(aBuf, "force_vote option \"");
+				char *pDst = aBuf + str_length(aBuf);
+				str_escape(&pDst, pOption->m_aDescription, aBuf + sizeof(aBuf));
+				str_append(aBuf, "\" \"");
+				pDst = aBuf + str_length(aBuf);
+				str_escape(&pDst, pReason, aBuf + sizeof(aBuf));
+				str_append(aBuf, "\"");
+				Client()->Rcon(aBuf);
+			}
+			else
+				Callvote("option", pOption->m_aDescription, pReason);
+			break;
+		}
+
+		OptionID--;
+		pOption = pOption->m_pNext;
+	}
+}
+
+void CVoting::RemovevoteOption(int OptionID)
+{
+	CVoteOptionClient *pOption = m_pFirst;
+	while(pOption && OptionID >= 0)
+	{
+		if(OptionID == 0)
+		{
+			char aBuf[128];
+			str_copy(aBuf, "remove_vote \"");
+			char *pDst = aBuf + str_length(aBuf);
+			str_escape(&pDst, pOption->m_aDescription, aBuf + sizeof(aBuf));
+			str_append(aBuf, "\"");
+			Client()->Rcon(aBuf);
+			break;
+		}
+
+		OptionID--;
+		pOption = pOption->m_pNext;
+	}
+}
+
+void CVoting::AddvoteOption(const char *pDescription, const char *pCommand)
+{
+	char aBuf[128];
+	str_copy(aBuf, "add_vote \"");
+	char *pDst = aBuf + str_length(aBuf);
+	str_escape(&pDst, pDescription, aBuf + sizeof(aBuf));
+	str_append(aBuf, "\" \"");
+	pDst = aBuf + str_length(aBuf);
+	str_escape(&pDst, pCommand, aBuf + sizeof(aBuf));
+	str_append(aBuf, "\"");
+	Client()->Rcon(aBuf);
+}
+
+void CVoting::Vote(int v)
+{
+	if(m_Voted == 0)
+		m_Voted = v;
+	CNetMsg_Cl_Vote Msg = {v};
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+}
+
+CVoting::CVoting()
+{
+	ClearOptions();
+
+	m_Closetime = 0;
+	m_aDescription[0] = 0;
+	m_aReason[0] = 0;
+	m_Yes = m_No = m_Pass = m_Total = 0;
+	m_Voted = 0;
+}
+
+void CVoting::AddOption(const char *pDescription)
+{
+	if(m_NumVoteOptions == MAX_VOTE_OPTIONS)
+		return;
+
+	CVoteOptionClient *pOption;
+	if(m_pRecycleFirst)
+	{
+		pOption = m_pRecycleFirst;
+		m_pRecycleFirst = m_pRecycleFirst->m_pNext;
+		if(m_pRecycleFirst)
+			m_pRecycleFirst->m_pPrev = 0;
+		else
+			m_pRecycleLast = 0;
+	}
+	else
+		pOption = m_Heap.Allocate<CVoteOptionClient>();
+
+	pOption->m_pNext = 0;
+	pOption->m_pPrev = m_pLast;
+	if(pOption->m_pPrev)
+		pOption->m_pPrev->m_pNext = pOption;
+	m_pLast = pOption;
+	if(!m_pFirst)
+		m_pFirst = pOption;
+
+	str_copy(pOption->m_aDescription, pDescription);
+	++m_NumVoteOptions;
+}
+
+void CVoting::ClearOptions()
+{
+	m_Heap.Reset();
+
+	m_NumVoteOptions = 0;
+	m_pFirst = 0;
+	m_pLast = 0;
+
+	m_pRecycleFirst = 0;
+	m_pRecycleLast = 0;
+}
+
+void CVoting::OnReset()
+{
+	m_Closetime = 0;
+	m_aDescription[0] = 0;
+	m_aReason[0] = 0;
+	m_Yes = m_No = m_Pass = m_Total = 0;
+	m_Voted = 0;
+}
+
+void CVoting::OnConsoleInit()
+{
+	Console()->Register("callvote", "s['kick'|'spectate'|'option'] s[id|option text] ?r[reason]", CFGFLAG_CLIENT, ConCallvote, this, "Call vote");
+	Console()->Register("vote", "r['yes'|'no']", CFGFLAG_CLIENT, ConVote, this, "Vote yes/no");
+}
+
+void CVoting::OnMessage(int MsgType, void *pRawMsg)
+{
+	if(MsgType == NETMSGTYPE_SV_VOTESET)
+	{
+		CNetMsg_Sv_VoteSet *pMsg = (CNetMsg_Sv_VoteSet *)pRawMsg;
+		OnReset();
+		if(pMsg->m_Timeout)
+		{
+			str_copy(m_aDescription, pMsg->m_pDescription);
+			str_copy(m_aReason, pMsg->m_pReason);
+			m_Closetime = time() + time_freq() * pMsg->m_Timeout;
+
+			if(Client()->RconAuthed())
+			{
+				char aBuf[512];
+				str_format(aBuf, sizeof(aBuf), "%s (%s)", m_aDescription, m_aReason);
+				Client()->Notify("DDNet Vote", aBuf);
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0);
+			}
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTESTATUS)
+	{
+		CNetMsg_Sv_VoteStatus *pMsg = (CNetMsg_Sv_VoteStatus *)pRawMsg;
+		m_Yes = pMsg->m_Yes;
+		m_No = pMsg->m_No;
+		m_Pass = pMsg->m_Pass;
+		m_Total = pMsg->m_Total;
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTECLEAROPTIONS)
+	{
+		ClearOptions();
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONLISTADD)
+	{
+		CNetMsg_Sv_VoteOptionListAdd *pMsg = (CNetMsg_Sv_VoteOptionListAdd *)pRawMsg;
+		int NumOptions = pMsg->m_NumOptions;
+		for(int i = 0; i < NumOptions; ++i)
+		{
+			switch(i)
+			{
+			case 0: AddOption(pMsg->m_pDescription0); break;
+			case 1: AddOption(pMsg->m_pDescription1); break;
+			case 2: AddOption(pMsg->m_pDescription2); break;
+			case 3: AddOption(pMsg->m_pDescription3); break;
+			case 4: AddOption(pMsg->m_pDescription4); break;
+			case 5: AddOption(pMsg->m_pDescription5); break;
+			case 6: AddOption(pMsg->m_pDescription6); break;
+			case 7: AddOption(pMsg->m_pDescription7); break;
+			case 8: AddOption(pMsg->m_pDescription8); break;
+			case 9: AddOption(pMsg->m_pDescription9); break;
+			case 10: AddOption(pMsg->m_pDescription10); break;
+			case 11: AddOption(pMsg->m_pDescription11); break;
+			case 12: AddOption(pMsg->m_pDescription12); break;
+			case 13: AddOption(pMsg->m_pDescription13); break;
+			case 14: AddOption(pMsg->m_pDescription14);
+			}
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONADD)
+	{
+		CNetMsg_Sv_VoteOptionAdd *pMsg = (CNetMsg_Sv_VoteOptionAdd *)pRawMsg;
+		AddOption(pMsg->m_pDescription);
+	}
+	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONREMOVE)
+	{
+		CNetMsg_Sv_VoteOptionRemove *pMsg = (CNetMsg_Sv_VoteOptionRemove *)pRawMsg;
+
+		for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
+		{
+			if(str_comp(pOption->m_aDescription, pMsg->m_pDescription) == 0)
+			{
+				// remove it from the list
+				if(m_pFirst == pOption)
+					m_pFirst = m_pFirst->m_pNext;
+				if(m_pLast == pOption)
+					m_pLast = m_pLast->m_pPrev;
+				if(pOption->m_pPrev)
+					pOption->m_pPrev->m_pNext = pOption->m_pNext;
+				if(pOption->m_pNext)
+					pOption->m_pNext->m_pPrev = pOption->m_pPrev;
+				--m_NumVoteOptions;
+
+				// add it to recycle list
+				pOption->m_pNext = 0;
+				pOption->m_pPrev = m_pRecycleLast;
+				if(pOption->m_pPrev)
+					pOption->m_pPrev->m_pNext = pOption;
+				m_pRecycleLast = pOption;
+				if(!m_pRecycleFirst)
+					m_pRecycleLast = pOption;
+
+				break;
+			}
+		}
+	}
+	else if(MsgType == NETMSGTYPE_SV_YOURVOTE)
+	{
+		CNetMsg_Sv_YourVote *pMsg = (CNetMsg_Sv_YourVote *)pRawMsg;
+		m_Voted = pMsg->m_Voted;
+	}
+}
+
+void CVoting::OnRender()
+{
+}
+
+void CVoting::RenderBars(CUIRect Bars, bool Text)
+{
+	Bars.Draw(ColorRGBA(0.8f, 0.8f, 0.8f, 0.5f), IGraphics::CORNER_ALL, Bars.h / 3);
+
+	CUIRect Splitter = Bars;
+	Splitter.x = Splitter.x + Splitter.w / 2;
+	Splitter.w = Splitter.h / 2.0f;
+	Splitter.x -= Splitter.w / 2;
+	Splitter.Draw(ColorRGBA(0.4f, 0.4f, 0.4f, 0.5f), IGraphics::CORNER_ALL, Splitter.h / 4);
+
+	if(m_Total)
+	{
+		CUIRect PassArea = Bars;
+		if(m_Yes)
+		{
+			CUIRect YesArea = Bars;
+			YesArea.w *= m_Yes / (float)m_Total;
+			YesArea.Draw(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
+
+			if(Text)
+			{
+				char aBuf[256];
+				str_from_int(m_Yes, aBuf);
+				UI()->DoLabel(&YesArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
+			}
+
+			PassArea.x += YesArea.w;
+			PassArea.w -= YesArea.w;
+		}
+
+		if(m_No)
+		{
+			CUIRect NoArea = Bars;
+			NoArea.w *= m_No / (float)m_Total;
+			NoArea.x = (Bars.x + Bars.w) - NoArea.w;
+			NoArea.Draw(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
+
+			if(Text)
+			{
+				char aBuf[256];
+				str_from_int(m_No, aBuf);
+				UI()->DoLabel(&NoArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
+			}
+
+			PassArea.w -= NoArea.w;
+		}
+
+		if(Text && m_Pass)
+		{
+			char aBuf[256];
+			str_from_int(m_Pass, aBuf);
+			UI()->DoLabel(&PassArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
+		}
+	}
+}
diff --git a/src_bkp/game/client/components/voting.h b/src_bkp/game/client/components/voting.h
new file mode 100644
index 0000000000..f81959a68e
--- /dev/null
+++ b/src_bkp/game/client/components/voting.h
@@ -0,0 +1,63 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_COMPONENTS_VOTING_H
+#define GAME_CLIENT_COMPONENTS_VOTING_H
+
+#include <engine/console.h>
+#include <engine/shared/memheap.h>
+
+#include <game/client/component.h>
+#include <game/voting.h>
+
+class CUIRect;
+
+class CVoting : public CComponent
+{
+	CHeap m_Heap;
+
+	static void ConCallvote(IConsole::IResult *pResult, void *pUserData);
+	static void ConVote(IConsole::IResult *pResult, void *pUserData);
+
+	int64_t m_Closetime;
+	char m_aDescription[VOTE_DESC_LENGTH];
+	char m_aReason[VOTE_REASON_LENGTH];
+	int m_Voted;
+	int m_Yes, m_No, m_Pass, m_Total;
+
+	void AddOption(const char *pDescription);
+	void ClearOptions();
+	void Callvote(const char *pType, const char *pValue, const char *pReason);
+
+public:
+	int m_NumVoteOptions;
+	CVoteOptionClient *m_pFirst;
+	CVoteOptionClient *m_pLast;
+
+	CVoteOptionClient *m_pRecycleFirst;
+	CVoteOptionClient *m_pRecycleLast;
+
+	CVoting();
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnReset() override;
+	virtual void OnConsoleInit() override;
+	virtual void OnMessage(int Msgtype, void *pRawMsg) override;
+	virtual void OnRender() override;
+
+	void RenderBars(CUIRect Bars, bool Text);
+
+	void CallvoteSpectate(int ClientID, const char *pReason, bool ForceVote = false);
+	void CallvoteKick(int ClientID, const char *pReason, bool ForceVote = false);
+	void CallvoteOption(int OptionID, const char *pReason, bool ForceVote = false);
+	void RemovevoteOption(int OptionID);
+	void AddvoteOption(const char *pDescription, const char *pCommand);
+
+	void Vote(int v); // -1 = no, 1 = yes
+
+	int SecondsLeft() { return (m_Closetime - time()) / time_freq(); }
+	bool IsVoting() { return m_Closetime != 0; }
+	int TakenChoice() const { return m_Voted; }
+	const char *VoteDescription() const { return m_aDescription; }
+	const char *VoteReason() const { return m_aReason; }
+};
+
+#endif
diff --git a/src_bkp/game/client/gameclient.cpp b/src_bkp/game/client/gameclient.cpp
new file mode 100644
index 0000000000..ca0ae8c00e
--- /dev/null
+++ b/src_bkp/game/client/gameclient.cpp
@@ -0,0 +1,3936 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <chrono>
+#include <cstdlib> // for rand()
+#include <limits>
+
+#include "engine/discord.h"
+#include <engine/client/checksum.h>
+#include <engine/demo.h>
+#include <engine/editor.h>
+#include <engine/engine.h>
+#include <engine/favorites.h>
+#include <engine/friends.h>
+#include <engine/graphics.h>
+#include <engine/map.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/config.h>
+#include <engine/sound.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+#include <engine/updater.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/client_data7.h>
+#include <game/generated/protocol.h>
+
+#include <base/math.h>
+#include <base/system.h>
+#include <base/vmath.h>
+
+#include "gameclient.h"
+#include "lineinput.h"
+#include "race.h"
+#include "render.h"
+
+#include <game/localization.h>
+#include <game/mapitems.h>
+#include <game/version.h>
+
+#include "components/background.h"
+#include "components/binds.h"
+#include "components/broadcast.h"
+#include "components/camera.h"
+#include "components/chat.h"
+#include "components/console.h"
+#include "components/controls.h"
+#include "components/countryflags.h"
+#include "components/damageind.h"
+#include "components/debughud.h"
+#include "components/effects.h"
+#include "components/emoticon.h"
+#include "components/freezebars.h"
+#include "components/ghost.h"
+#include "components/hud.h"
+#include "components/infomessages.h"
+#include "components/items.h"
+#include "components/mapimages.h"
+#include "components/maplayers.h"
+#include "components/mapsounds.h"
+#include "components/menu_background.h"
+#include "components/menus.h"
+#include "components/motd.h"
+#include "components/nameplates.h"
+#include "components/parser.h"
+#include "components/particles.h"
+#include "components/players.h"
+#include "components/race_demo.h"
+#include "components/scoreboard.h"
+#include "components/skins.h"
+#include "components/sounds.h"
+#include "components/spectator.h"
+#include "components/statboard.h"
+#include "components/voting.h"
+#include "prediction/entities/character.h"
+#include "prediction/entities/projectile.h"
+
+using namespace std::chrono_literals;
+
+const char *CGameClient::Version() const { return GAME_VERSION; }
+const char *CGameClient::NetVersion() const { return GAME_NETVERSION; }
+int CGameClient::DDNetVersion() const { return DDNET_VERSION_NUMBER; }
+const char *CGameClient::DDNetVersionStr() const { return m_aDDNetVersionStr; }
+const char *CGameClient::GetItemName(int Type) const { return m_NetObjHandler.GetObjName(Type); }
+
+void CGameClient::OnConsoleInit()
+{
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pClient = Kernel()->RequestInterface<IClient>();
+	m_pTextRender = Kernel()->RequestInterface<ITextRender>();
+	m_pSound = Kernel()->RequestInterface<ISound>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pConfig = m_pConfigManager->Values();
+	m_pInput = Kernel()->RequestInterface<IInput>();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pDemoPlayer = Kernel()->RequestInterface<IDemoPlayer>();
+	m_pServerBrowser = Kernel()->RequestInterface<IServerBrowser>();
+	m_pEditor = Kernel()->RequestInterface<IEditor>();
+	m_pFavorites = Kernel()->RequestInterface<IFavorites>();
+	m_pFriends = Kernel()->RequestInterface<IFriends>();
+	m_pFoes = Client()->Foes();
+#if defined(CONF_AUTOUPDATE)
+	m_pUpdater = Kernel()->RequestInterface<IUpdater>();
+#endif
+
+	m_Menus.SetMenuBackground(&m_MenuBackground);
+
+	m_NamePlates.SetPlayers(&m_Players);
+
+	// make a list of all the systems, make sure to add them in the correct render order
+	m_vpAll.insert(m_vpAll.end(), {&m_Skins,
+					      &m_CountryFlags,
+					      &m_MapImages,
+					      &m_Effects, // doesn't render anything, just updates effects
+					      &m_SkinProfiles,
+					      &m_Binds,
+					      &m_Binds.m_SpecialBinds,
+					      &m_Controls,
+					      &m_Camera,
+					      &m_Sounds,
+					      &m_Voting,
+					      &m_Particles, // doesn't render anything, just updates all the particles
+					      &m_RaceDemo,
+					      &m_MapSounds,
+					      &m_Background, // render instead of m_MapLayersBackground when g_Config.m_ClOverlayEntities == 100
+					      &m_MapLayersBackground, // first to render
+					      &m_Particles.m_RenderTrail,
+					      &m_Items,
+					      &m_Ghost,
+					      &m_Players,
+					      &m_MapLayersForeground,
+					      &m_Particles.m_RenderExplosions,
+					      &m_NamePlates,
+					      //bindwheel
+					      &m_BindWheel,
+					      &m_Outlines,
+					      &m_Particles.m_RenderExtra,
+					      &m_Particles.m_RenderGeneral,
+					      &m_FreezeBars,
+					      &m_DamageInd,
+					      &m_Hud,
+					      &m_Spectator,
+					      &m_Emoticon,
+					      &m_InfoMessages,
+					      &m_Chat,
+					      &m_Broadcast,
+					      &m_DebugHud,
+					      &m_Scoreboard,
+					      &m_Statboard,
+					      &m_Stats,
+					      &m_Motd,
+					      &m_Menus,
+					      &m_Tooltips,
+					      &CMenus::m_Binder,
+					      &m_GameConsole,
+					      &m_MenuBackground});
+
+	// build the input stack
+	m_vpInput.insert(m_vpInput.end(), {&CMenus::m_Binder, // this will take over all input when we want to bind a key
+						  &m_Binds.m_SpecialBinds,
+						  &m_GameConsole,
+						  &m_Chat, // chat has higher prio, due to that you can quit it by pressing esc
+						  &m_Motd, // for pressing esc to remove it
+						  &m_Menus,
+						  //bindwheel
+						  &m_BindWheel,
+						  &m_Spectator,
+						  &m_Emoticon,
+						  &m_Controls,
+						  &m_Binds});
+
+	// add the some console commands
+	Console()->Register("team", "i[team-id]", CFGFLAG_CLIENT, ConTeam, this, "Switch team");
+	Console()->Register("kill", "", CFGFLAG_CLIENT, ConKill, this, "Kill yourself to restart");
+
+	// register server dummy commands for tab completion
+	Console()->Register("tune", "s[tuning] ?i[value]", CFGFLAG_SERVER, 0, 0, "Tune variable to value or show current value");
+	Console()->Register("tune_reset", "?s[tuning]", CFGFLAG_SERVER, 0, 0, "Reset all or one tuning variable to default");
+	Console()->Register("tunes", "", CFGFLAG_SERVER, 0, 0, "List all tuning variables and their values");
+	Console()->Register("change_map", "?r[map]", CFGFLAG_SERVER, 0, 0, "Change map");
+	Console()->Register("restart", "?i[seconds]", CFGFLAG_SERVER, 0, 0, "Restart in x seconds");
+	Console()->Register("broadcast", "r[message]", CFGFLAG_SERVER, 0, 0, "Broadcast message");
+	Console()->Register("say", "r[message]", CFGFLAG_SERVER, 0, 0, "Say in chat");
+	Console()->Register("set_team", "i[id] i[team-id] ?i[delay in minutes]", CFGFLAG_SERVER, 0, 0, "Set team of player to team");
+	Console()->Register("set_team_all", "i[team-id]", CFGFLAG_SERVER, 0, 0, "Set team of all players to team");
+	Console()->Register("add_vote", "s[name] r[command]", CFGFLAG_SERVER, 0, 0, "Add a voting option");
+	Console()->Register("remove_vote", "s[name]", CFGFLAG_SERVER, 0, 0, "remove a voting option");
+	Console()->Register("force_vote", "s[name] s[command] ?r[reason]", CFGFLAG_SERVER, 0, 0, "Force a voting option");
+	Console()->Register("clear_votes", "", CFGFLAG_SERVER, 0, 0, "Clears the voting options");
+	Console()->Register("add_map_votes", "", CFGFLAG_SERVER, 0, 0, "Automatically adds voting options for all maps");
+	Console()->Register("vote", "r['yes'|'no']", CFGFLAG_SERVER, 0, 0, "Force a vote to yes/no");
+	Console()->Register("swap_teams", "", CFGFLAG_SERVER, 0, 0, "Swap the current teams");
+	Console()->Register("shuffle_teams", "", CFGFLAG_SERVER, 0, 0, "Shuffle the current teams");
+
+	// register tune zone command to allow the client prediction to load tunezones from the map
+	Console()->Register("tune_zone", "i[zone] s[tuning] i[value]", CFGFLAG_CLIENT | CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->m_pClient = this;
+
+	// let all the other components register their console commands
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnConsoleInit();
+
+	Console()->Chain("cl_languagefile", ConchainLanguageUpdate, this);
+
+	Console()->Chain("player_name", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_clan", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_country", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_use_custom_color", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_color_body", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_color_feet", ConchainSpecialInfoupdate, this);
+	Console()->Chain("player_skin", ConchainSpecialInfoupdate, this);
+
+	Console()->Chain("dummy_name", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_clan", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_country", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_use_custom_color", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_color_body", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_color_feet", ConchainSpecialDummyInfoupdate, this);
+	Console()->Chain("dummy_skin", ConchainSpecialDummyInfoupdate, this);
+
+	Console()->Chain("cl_dummy", ConchainSpecialDummy, this);
+	Console()->Chain("cl_text_entities_size", ConchainClTextEntitiesSize, this);
+
+	Console()->Chain("cl_menu_map", ConchainMenuMap, this);
+
+	//
+	m_SuppressEvents = false;
+}
+
+void CGameClient::OnInit()
+{
+	Client()->SetMapLoadingCBFunc([this]() {
+		m_Menus.RenderLoading(DemoPlayer()->IsPlaying() ? Localize("Preparing demo playback") : Localize("Connected"), Localize("Loading map file from storage"), 0, false);
+	});
+
+	m_pGraphics = Kernel()->RequestInterface<IGraphics>();
+
+	// propagate pointers
+	m_UI.Init(Kernel());
+	m_RenderTools.Init(Graphics(), TextRender());
+
+	int64_t Start = time_get();
+
+	if(GIT_SHORTREV_HASH)
+	{
+		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s (%s)", GAME_NAME, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH);
+	}
+	else
+	{
+		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s", GAME_NAME, GAME_RELEASE_VERSION);
+	}
+
+	// set the language
+	g_Localization.LoadIndexfile(Storage(), Console());
+	if(g_Config.m_ClShowWelcome)
+		g_Localization.SelectDefaultLanguage(Console(), g_Config.m_ClLanguagefile, sizeof(g_Config.m_ClLanguagefile));
+	g_Localization.Load(g_Config.m_ClLanguagefile, Storage(), Console());
+
+	// TODO: this should be different
+	// setup item sizes
+	for(int i = 0; i < NUM_NETOBJTYPES; i++)
+		Client()->SnapSetStaticsize(i, m_NetObjHandler.GetObjSize(i));
+
+	TextRender()->LoadFonts();
+	TextRender()->SetFontLanguageVariant(g_Config.m_ClLanguagefile);
+
+	// update and swap after font loading, they are quite huge
+	Client()->UpdateAndSwap();
+
+	const char *pLoadingDDNetCaption = Localize("StA Client Loading");
+
+	// init all components
+	int SkippedComps = 0;
+	int CompCounter = 0;
+	for(int i = m_vpAll.size() - 1; i >= 0; --i)
+	{
+		m_vpAll[i]->OnInit();
+		// try to render a frame after each component, also flushes GPU uploads
+		if(m_Menus.IsInit())
+		{
+			char aBuff[256];
+			str_format(aBuff, std::size(aBuff), "%s [%d/%d]", CompCounter == 40 ? Localize("Why are you slowmo replaying to read this?") : Localize("Initializing components"), (CompCounter + 1), (int)ComponentCount());
+			m_Menus.RenderLoading(pLoadingDDNetCaption, aBuff, 1 + SkippedComps);
+			SkippedComps = 0;
+		}
+		else
+		{
+			++SkippedComps;
+		}
+		++CompCounter;
+	}
+
+	char aBuf[256];
+
+	m_GameSkinLoaded = false;
+	m_ParticlesSkinLoaded = false;
+	m_EmoticonsSkinLoaded = false;
+	m_HudSkinLoaded = false;
+
+	// setup load amount, load textures
+	for(int i = 0; i < g_pData->m_NumImages; i++)
+	{
+		if(i == IMAGE_GAME)
+			LoadGameSkin(g_Config.m_ClAssetGame);
+		else if(i == IMAGE_EMOTICONS)
+			LoadEmoticonsSkin(g_Config.m_ClAssetEmoticons);
+		else if(i == IMAGE_PARTICLES)
+			LoadParticlesSkin(g_Config.m_ClAssetParticles);
+		else if(i == IMAGE_HUD)
+			LoadHudSkin(g_Config.m_ClAssetHud);
+		else if(i == IMAGE_EXTRAS)
+			LoadExtrasSkin(g_Config.m_ClAssetExtras);
+		else if(g_pData->m_aImages[i].m_pFilename[0] == '\0') // handle special null image without filename
+			g_pData->m_aImages[i].m_Id = IGraphics::CTextureHandle();
+		else
+			g_pData->m_aImages[i].m_Id = Graphics()->LoadTexture(g_pData->m_aImages[i].m_pFilename, IStorage::TYPE_ALL);
+		m_Menus.RenderLoading(pLoadingDDNetCaption, Localize("Initializing assets"), 1);
+	}
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnReset();
+
+	m_ServerMode = SERVERMODE_PURE;
+
+	m_aDDRaceMsgSent[0] = false;
+	m_aDDRaceMsgSent[1] = false;
+	m_aShowOthers[0] = SHOW_OTHERS_NOT_SET;
+	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
+	m_aSwitchStateTeam[0] = -1;
+	m_aSwitchStateTeam[1] = -1;
+
+	m_LastZoom = .0;
+	m_LastScreenAspect = .0;
+	m_LastDummyConnected = false;
+
+	// Set free binds to DDRace binds if it's active
+	m_Binds.SetDDRaceBinds(true);
+
+	if(g_Config.m_ClTimeoutCode[0] == '\0' || str_comp(g_Config.m_ClTimeoutCode, "hGuEYnfxicsXGwFq") == 0)
+	{
+		for(unsigned int i = 0; i < 16; i++)
+		{
+			if(rand() % 2)
+				g_Config.m_ClTimeoutCode[i] = (char)((rand() % 26) + 97);
+			else
+				g_Config.m_ClTimeoutCode[i] = (char)((rand() % 26) + 65);
+		}
+	}
+
+	if(g_Config.m_ClDummyTimeoutCode[0] == '\0' || str_comp(g_Config.m_ClDummyTimeoutCode, "hGuEYnfxicsXGwFq") == 0)
+	{
+		for(unsigned int i = 0; i < 16; i++)
+		{
+			if(rand() % 2)
+				g_Config.m_ClDummyTimeoutCode[i] = (char)((rand() % 26) + 97);
+			else
+				g_Config.m_ClDummyTimeoutCode[i] = (char)((rand() % 26) + 65);
+		}
+	}
+
+	int64_t End = time_get();
+	str_format(aBuf, sizeof(aBuf), "initialisation finished after %.2fms", ((End - Start) * 1000) / (float)time_freq());
+	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "gameclient", aBuf);
+
+	m_GameWorld.m_pCollision = Collision();
+	m_GameWorld.m_pTuningList = m_aTuningList;
+
+	m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
+
+	// Aggressively try to grab window again since some Windows users report
+	// window not being focused after starting client.
+	Graphics()->SetWindowGrab(true);
+
+	CChecksumData *pChecksum = Client()->ChecksumData();
+	pChecksum->m_SizeofGameClient = sizeof(*this);
+	pChecksum->m_NumComponents = m_vpAll.size();
+	for(size_t i = 0; i < m_vpAll.size(); i++)
+	{
+		if(i >= std::size(pChecksum->m_aComponentsChecksum))
+		{
+			break;
+		}
+		int Size = m_vpAll[i]->Sizeof();
+		pChecksum->m_aComponentsChecksum[i] = Size;
+	}
+}
+
+void CGameClient::OnUpdate()
+{
+	HandleLanguageChanged();
+
+	CUIElementBase::Init(UI()); // update static pointer because game and editor use separate UI
+
+	// handle mouse movement
+	float x = 0.0f, y = 0.0f;
+	IInput::ECursorType CursorType = Input()->CursorRelative(&x, &y);
+	if(CursorType != IInput::CURSOR_NONE)
+	{
+		for(auto &pComponent : m_vpInput)
+		{
+			if(pComponent->OnCursorMove(x, y, CursorType))
+				break;
+		}
+	}
+
+	// handle key presses
+	for(size_t i = 0; i < Input()->NumEvents(); i++)
+	{
+		const IInput::CEvent &Event = Input()->GetEvent(i);
+		if(!Input()->IsEventValid(Event))
+			continue;
+
+		for(auto &pComponent : m_vpInput)
+		{
+			if(pComponent->OnInput(Event))
+				break;
+		}
+	}
+
+	if(g_Config.m_ClSubTickAiming && m_Binds.m_MouseOnAction)
+	{
+		m_Controls.m_aMousePosOnAction[g_Config.m_ClDummy] = m_Controls.m_aMousePos[g_Config.m_ClDummy];
+		m_Binds.m_MouseOnAction = false;
+	}
+	static float OldUpdateTime = Client()->LocalTime();
+	if(OldUpdateTime + 1 < Client()->LocalTime())
+	{
+		OldUpdateTime = Client()->LocalTime();
+		IDiscord *discord = Kernel()->RequestInterface<IDiscord>();
+		int LocalID = m_aLocalIDs[g_Config.m_ClDummy];
+		bool Afk = m_aClients[LocalID].m_Afk;
+		if(!discord)
+			return;
+
+		const char *pText;
+		const char *pImage;
+
+		if(Afk)
+		{
+			pText = "Idleing...";
+			pImage = "idle";
+		}
+		else if(Client()->State() != IClient::STATE_ONLINE)
+		{
+			pText = "Chilling in menus";
+			pImage = "menu1";
+		}
+		else
+		{
+			pText = "Playing";
+			pImage = "greenline";
+		}
+
+		discord->SetGameInfo(Client()->ServerAddress(), (Client()->State() != IClient::STATE_ONLINE) ? "" : Client()->GetCurrentMap(), false, pText, pImage, Client()->PlayerName());
+	}
+}
+
+void CGameClient::OnDummySwap()
+{
+	if(g_Config.m_ClDummyResetOnSwitch)
+	{
+		int PlayerOrDummy = (g_Config.m_ClDummyResetOnSwitch == 2) ? g_Config.m_ClDummy : (!g_Config.m_ClDummy);
+		m_Controls.ResetInput(PlayerOrDummy);
+		m_Controls.m_aInputData[PlayerOrDummy].m_Hook = 0;
+	}
+	int tmp = m_DummyInput.m_Fire;
+	m_DummyInput = m_Controls.m_aInputData[!g_Config.m_ClDummy];
+	m_Controls.m_aInputData[g_Config.m_ClDummy].m_Fire = tmp;
+	m_IsDummySwapping = 1;
+}
+
+int CGameClient::OnSnapInput(int *pData, bool Dummy, bool Force)
+{
+	if(!Dummy)
+	{
+		return m_Controls.SnapInput(pData);
+	}
+
+	if(!g_Config.m_ClDummyHammer)
+	{
+		if(m_DummyFire != 0)
+		{
+			m_DummyInput.m_Fire = (m_HammerInput.m_Fire + 1) & ~1;
+			m_DummyFire = 0;
+		}
+
+		if(!Force && (!m_DummyInput.m_Direction && !m_DummyInput.m_Jump && !m_DummyInput.m_Hook))
+		{
+			return 0;
+		}
+
+		mem_copy(pData, &m_DummyInput, sizeof(m_DummyInput));
+		return sizeof(m_DummyInput);
+	}
+	else
+	{
+		if(m_DummyFire % 25 != 0)
+		{
+			m_DummyFire++;
+			return 0;
+		}
+		m_DummyFire++;
+
+		m_HammerInput.m_Fire = (m_HammerInput.m_Fire + 1) | 1;
+		m_HammerInput.m_WantedWeapon = WEAPON_HAMMER + 1;
+		if(!g_Config.m_ClDummyRestoreWeapon)
+		{
+			m_DummyInput.m_WantedWeapon = WEAPON_HAMMER + 1;
+		}
+
+		vec2 MainPos = m_LocalCharacterPos;
+		vec2 DummyPos = m_aClients[m_aLocalIDs[!g_Config.m_ClDummy]].m_Predicted.m_Pos;
+		vec2 Dir = MainPos - DummyPos;
+		m_HammerInput.m_TargetX = (int)(Dir.x);
+		m_HammerInput.m_TargetY = (int)(Dir.y);
+
+		mem_copy(pData, &m_HammerInput, sizeof(m_HammerInput));
+		return sizeof(m_HammerInput);
+	}
+}
+
+void CGameClient::OnConnected()
+{
+	const char *pConnectCaption = DemoPlayer()->IsPlaying() ? Localize("Preparing demo playback") : Localize("Connected");
+	const char *pLoadMapContent = Localize("Initializing map logic");
+	// render loading before skip is calculated
+	m_Menus.RenderLoading(pConnectCaption, pLoadMapContent, 0, false);
+	m_Layers.Init(Kernel());
+	m_Collision.Init(Layers());
+	m_GameWorld.m_Core.InitSwitchers(m_Collision.m_HighestSwitchNumber);
+
+	CRaceHelper::ms_aFlagIndex[0] = -1;
+	CRaceHelper::ms_aFlagIndex[1] = -1;
+
+	CTile *pGameTiles = static_cast<CTile *>(Layers()->Map()->GetData(Layers()->GameLayer()->m_Data));
+
+	// get flag positions
+	for(int i = 0; i < m_Collision.GetWidth() * m_Collision.GetHeight(); i++)
+	{
+		if(pGameTiles[i].m_Index - ENTITY_OFFSET == ENTITY_FLAGSTAND_RED)
+			CRaceHelper::ms_aFlagIndex[TEAM_RED] = i;
+		else if(pGameTiles[i].m_Index - ENTITY_OFFSET == ENTITY_FLAGSTAND_BLUE)
+			CRaceHelper::ms_aFlagIndex[TEAM_BLUE] = i;
+		i += pGameTiles[i].m_Skip;
+	}
+
+	// render loading before going through all components
+	m_Menus.RenderLoading(pConnectCaption, pLoadMapContent, 0, false);
+	for(auto &pComponent : m_vpAll)
+	{
+		pComponent->OnMapLoad();
+		pComponent->OnReset();
+	}
+
+	Client()->SetLoadingStateDetail(IClient::LOADING_STATE_DETAIL_GETTING_READY);
+	m_Menus.RenderLoading(pConnectCaption, Localize("Sending initial client info"), 0, false);
+
+	m_ServerMode = SERVERMODE_PURE;
+
+	// send the initial info
+	SendInfo(true);
+	// we should keep this in for now, because otherwise you can't spectate
+	// people at start as the other info 64 packet is only sent after the first
+	// snap
+	Client()->Rcon("crashmeplx");
+
+	m_GameWorld.Clear();
+	m_GameWorld.m_WorldConfig.m_InfiniteAmmo = true;
+	mem_zero(&m_GameInfo, sizeof(m_GameInfo));
+	m_PredictedDummyID = -1;
+	ConfigManager()->ResetGameSettings();
+	LoadMapSettings();
+
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK && g_Config.m_ClAutoDemoOnConnect)
+		Client()->DemoRecorder_HandleAutoStart();
+}
+
+void CGameClient::OnReset()
+{
+	m_aLastNewPredictedTick[0] = -1;
+	m_aLastNewPredictedTick[1] = -1;
+
+	m_aLocalTuneZone[0] = 0;
+	m_aLocalTuneZone[1] = 0;
+
+	m_aExpectingTuningForZone[0] = -1;
+	m_aExpectingTuningForZone[1] = -1;
+
+	m_aReceivedTuning[0] = false;
+	m_aReceivedTuning[1] = false;
+
+	InvalidateSnapshot();
+
+	for(auto &Client : m_aClients)
+		Client.Reset();
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnReset();
+
+	m_DemoSpecID = SPEC_FOLLOW;
+	m_aFlagDropTick[TEAM_RED] = 0;
+	m_aFlagDropTick[TEAM_BLUE] = 0;
+	m_LastRoundStartTick = -1;
+	m_LastFlagCarrierRed = -4;
+	m_LastFlagCarrierBlue = -4;
+	m_aTuning[g_Config.m_ClDummy] = CTuningParams();
+
+	m_Teams.Reset();
+	m_aDDRaceMsgSent[0] = false;
+	m_aDDRaceMsgSent[1] = false;
+	m_aShowOthers[0] = SHOW_OTHERS_NOT_SET;
+	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
+
+	m_LastZoom = .0;
+	m_LastScreenAspect = .0;
+	m_LastDummyConnected = false;
+
+	m_ReceivedDDNetPlayer = false;
+
+	Editor()->ResetMentions();
+	Editor()->ResetIngameMoved();
+}
+
+void CGameClient::UpdatePositions()
+{
+	// local character position
+	if(g_Config.m_ClPredict && Client()->State() != IClient::STATE_DEMOPLAYBACK)
+	{
+		if(!AntiPingPlayers())
+		{
+			if(!m_Snap.m_pLocalCharacter || (m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+			{
+				// don't use predicted
+			}
+			else
+				m_LocalCharacterPos = mix(m_PredictedPrevChar.m_Pos, m_PredictedChar.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+		}
+		else
+		{
+			if(!(m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER))
+			{
+				if(m_Snap.m_pLocalCharacter)
+					m_LocalCharacterPos = mix(m_PredictedPrevChar.m_Pos, m_PredictedChar.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+			}
+			//		else
+			//			m_LocalCharacterPos = mix(m_PredictedPrevChar.m_Pos, m_PredictedChar.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+		}
+	}
+	else if(m_Snap.m_pLocalCharacter && m_Snap.m_pLocalPrevCharacter)
+	{
+		m_LocalCharacterPos = mix(
+			vec2(m_Snap.m_pLocalPrevCharacter->m_X, m_Snap.m_pLocalPrevCharacter->m_Y),
+			vec2(m_Snap.m_pLocalCharacter->m_X, m_Snap.m_pLocalCharacter->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
+	}
+
+	// spectator position
+	if(m_Snap.m_SpecInfo.m_Active)
+	{
+		if(m_MultiViewActivated)
+		{
+			HandleMultiView();
+		}
+		else if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecID != SPEC_FOLLOW && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
+		{
+			m_Snap.m_SpecInfo.m_Position = mix(
+				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Prev.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Prev.m_Y),
+				vec2(m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Cur.m_X, m_Snap.m_aCharacters[m_Snap.m_SpecInfo.m_SpectatorID].m_Cur.m_Y),
+				Client()->IntraGameTick(g_Config.m_ClDummy));
+			m_Snap.m_SpecInfo.m_UsePosition = true;
+		}
+		else if(m_Snap.m_pSpectatorInfo && ((Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecID == SPEC_FOLLOW) || (Client()->State() != IClient::STATE_DEMOPLAYBACK && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)))
+		{
+			if(m_Snap.m_pPrevSpectatorInfo && m_Snap.m_pPrevSpectatorInfo->m_SpectatorID == m_Snap.m_pSpectatorInfo->m_SpectatorID)
+				m_Snap.m_SpecInfo.m_Position = mix(vec2(m_Snap.m_pPrevSpectatorInfo->m_X, m_Snap.m_pPrevSpectatorInfo->m_Y),
+					vec2(m_Snap.m_pSpectatorInfo->m_X, m_Snap.m_pSpectatorInfo->m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
+			else
+				m_Snap.m_SpecInfo.m_Position = vec2(m_Snap.m_pSpectatorInfo->m_X, m_Snap.m_pSpectatorInfo->m_Y);
+			m_Snap.m_SpecInfo.m_UsePosition = true;
+		}
+	}
+
+	if(!m_MultiViewActivated && m_MultiView.m_IsInit)
+		ResetMultiView();
+
+	UpdateRenderedCharacters();
+}
+
+void CGameClient::OnRender()
+{
+	if(g_Config.m_ClAutoVerify)
+	{
+		m_Verify.OnRender();
+	}
+
+	// check if multi view got activated
+	if(!m_MultiView.m_IsInit && m_MultiViewActivated)
+	{
+		int TeamId = 0;
+		if(m_Snap.m_SpecInfo.m_SpectatorID >= 0)
+			TeamId = m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
+
+		if(TeamId > MAX_CLIENTS || TeamId < 0)
+			TeamId = 0;
+
+		if(!InitMultiView(TeamId))
+		{
+			dbg_msg("MultiView", "No players found to spectate");
+			ResetMultiView();
+		}
+	}
+
+	// update the local character and spectate position
+	UpdatePositions();
+
+	// display gfx & client warnings
+	for(SWarning *pWarning : {Graphics()->GetCurWarning(), Client()->GetCurWarning()})
+	{
+		if(pWarning != nullptr && m_Menus.CanDisplayWarning())
+		{
+			m_Menus.PopupWarning(pWarning->m_aWarningTitle[0] == '\0' ? Localize("Warning") : pWarning->m_aWarningTitle, pWarning->m_aWarningMsg, "Ok", pWarning->m_AutoHide ? 10s : 0s);
+			pWarning->m_WasShown = true;
+		}
+	}
+
+	// render all systems
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnRender();
+
+	// clear all events/input for this frame
+	Input()->Clear();
+
+	CLineInput::RenderCandidates();
+
+	// clear new tick flags
+	m_NewTick = false;
+	m_NewPredictedTick = false;
+
+	if(g_Config.m_ClDummy && !Client()->DummyConnected())
+		g_Config.m_ClDummy = 0;
+
+	// resend player and dummy info if it was filtered by server
+	if(Client()->State() == IClient::STATE_ONLINE && !m_Menus.IsActive())
+	{
+		if(m_aCheckInfo[0] == 0)
+		{
+			if(
+				str_comp(m_aClients[m_aLocalIDs[0]].m_aName, Client()->PlayerName()) ||
+				str_comp(m_aClients[m_aLocalIDs[0]].m_aClan, g_Config.m_PlayerClan) ||
+				m_aClients[m_aLocalIDs[0]].m_Country != g_Config.m_PlayerCountry ||
+				str_comp(m_aClients[m_aLocalIDs[0]].m_aSkinName, g_Config.m_ClPlayerSkin) ||
+				m_aClients[m_aLocalIDs[0]].m_UseCustomColor != g_Config.m_ClPlayerUseCustomColor ||
+				m_aClients[m_aLocalIDs[0]].m_ColorBody != (int)g_Config.m_ClPlayerColorBody ||
+				m_aClients[m_aLocalIDs[0]].m_ColorFeet != (int)g_Config.m_ClPlayerColorFeet)
+				SendInfo(false);
+			else
+				m_aCheckInfo[0] = -1;
+		}
+
+		if(m_aCheckInfo[0] > 0)
+			m_aCheckInfo[0]--;
+
+		if(Client()->DummyConnected())
+		{
+			if(m_aCheckInfo[1] == 0)
+			{
+				if(
+					str_comp(m_aClients[m_aLocalIDs[1]].m_aName, Client()->DummyName()) ||
+					str_comp(m_aClients[m_aLocalIDs[1]].m_aClan, g_Config.m_ClDummyClan) ||
+					m_aClients[m_aLocalIDs[1]].m_Country != g_Config.m_ClDummyCountry ||
+					str_comp(m_aClients[m_aLocalIDs[1]].m_aSkinName, g_Config.m_ClDummySkin) ||
+					m_aClients[m_aLocalIDs[1]].m_UseCustomColor != g_Config.m_ClDummyUseCustomColor ||
+					m_aClients[m_aLocalIDs[1]].m_ColorBody != (int)g_Config.m_ClDummyColorBody ||
+					m_aClients[m_aLocalIDs[1]].m_ColorFeet != (int)g_Config.m_ClDummyColorFeet)
+					SendDummyInfo(false);
+				else
+					m_aCheckInfo[1] = -1;
+			}
+
+			if(m_aCheckInfo[1] > 0)
+				m_aCheckInfo[1]--;
+		}
+	}
+}
+
+void CGameClient::OnDummyDisconnect()
+{
+	m_aDDRaceMsgSent[1] = false;
+	m_aShowOthers[1] = SHOW_OTHERS_NOT_SET;
+	m_aLastNewPredictedTick[1] = -1;
+	m_PredictedDummyID = -1;
+}
+
+int CGameClient::GetLastRaceTick() const
+{
+	return m_Ghost.GetLastRaceTick();
+}
+
+bool CGameClient::Predict() const
+{
+	if(!g_Config.m_ClPredict)
+		return false;
+
+	if(m_Snap.m_pGameInfoObj)
+	{
+		if(m_Snap.m_pGameInfoObj->m_GameStateFlags & (GAMESTATEFLAG_GAMEOVER | GAMESTATEFLAG_PAUSED))
+		{
+			return false;
+		}
+	}
+
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return false;
+
+	return !m_Snap.m_SpecInfo.m_Active && m_Snap.m_pLocalCharacter;
+}
+
+ColorRGBA CGameClient::GetDDTeamColor(int DDTeam, float Lightness) const
+{
+	// Use golden angle to generate unique colors with distinct adjacent colors.
+	// The first DDTeam (team 1) gets angle 0°, i.e. red hue.
+	const float Hue = std::fmod((DDTeam - 1) * (137.50776f / 360.0f), 1.0f);
+	return color_cast<ColorRGBA>(ColorHSLA(Hue, 1.0f, Lightness));
+}
+
+void CGameClient::OnRelease()
+{
+	// release all systems
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnRelease();
+}
+
+void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dummy)
+{
+	// special messages
+	if(MsgId == NETMSGTYPE_SV_TUNEPARAMS)
+	{
+		// unpack the new tuning
+		CTuningParams NewTuning;
+		int *pParams = (int *)&NewTuning;
+		// No jetpack on DDNet incompatible servers:
+		NewTuning.m_JetpackStrength = 0;
+		for(unsigned i = 0; i < sizeof(CTuningParams) / sizeof(int); i++)
+		{
+			int value = pUnpacker->GetInt();
+
+			// check for unpacking errors
+			if(pUnpacker->Error())
+				break;
+
+			pParams[i] = value;
+		}
+
+		m_ServerMode = SERVERMODE_PURE;
+
+		m_aReceivedTuning[Conn] = true;
+		// apply new tuning
+		m_aTuning[Conn] = NewTuning;
+		return;
+	}
+
+	void *pRawMsg = m_NetObjHandler.SecureUnpackMsg(MsgId, pUnpacker);
+	if(!pRawMsg)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "dropped weird message '%s' (%d), failed on '%s'", m_NetObjHandler.GetMsgName(MsgId), MsgId, m_NetObjHandler.FailedMsgOn());
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client", aBuf);
+		return;
+	}
+
+	if(Dummy)
+	{
+		if(MsgId == NETMSGTYPE_SV_CHAT && m_aLocalIDs[0] >= 0 && m_aLocalIDs[1] >= 0)
+		{
+			CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+
+			if((pMsg->m_Team == 1 && (m_aClients[m_aLocalIDs[0]].m_Team != m_aClients[m_aLocalIDs[1]].m_Team || m_Teams.Team(m_aLocalIDs[0]) != m_Teams.Team(m_aLocalIDs[1]))) || pMsg->m_Team > 1)
+			{
+				m_Chat.OnMessage(MsgId, pRawMsg);
+			}
+		}
+		return; // no need of all that stuff for the dummy
+	}
+
+	// TODO: this should be done smarter
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnMessage(MsgId, pRawMsg);
+
+	if(MsgId == NETMSGTYPE_SV_READYTOENTER)
+	{
+		Client()->EnterGame(Conn);
+	}
+	else if(MsgId == NETMSGTYPE_SV_EMOTICON)
+	{
+		CNetMsg_Sv_Emoticon *pMsg = (CNetMsg_Sv_Emoticon *)pRawMsg;
+
+		// apply
+		m_aClients[pMsg->m_ClientID].m_Emoticon = pMsg->m_Emoticon;
+		m_aClients[pMsg->m_ClientID].m_EmoticonStartTick = Client()->GameTick(Conn);
+		m_aClients[pMsg->m_ClientID].m_EmoticonStartFraction = Client()->IntraGameTickSincePrev(Conn);
+	}
+	else if(MsgId == NETMSGTYPE_SV_SOUNDGLOBAL)
+	{
+		if(m_SuppressEvents)
+			return;
+
+		// don't enqueue pseudo-global sounds from demos (created by PlayAndRecord)
+		CNetMsg_Sv_SoundGlobal *pMsg = (CNetMsg_Sv_SoundGlobal *)pRawMsg;
+		if(pMsg->m_SoundID == SOUND_CTF_DROP || pMsg->m_SoundID == SOUND_CTF_RETURN ||
+			pMsg->m_SoundID == SOUND_CTF_CAPTURE || pMsg->m_SoundID == SOUND_CTF_GRAB_EN ||
+			pMsg->m_SoundID == SOUND_CTF_GRAB_PL)
+		{
+			if(g_Config.m_SndGame)
+				m_Sounds.Enqueue(CSounds::CHN_GLOBAL, pMsg->m_SoundID);
+		}
+		else
+		{
+			if(g_Config.m_SndGame)
+				m_Sounds.Play(CSounds::CHN_GLOBAL, pMsg->m_SoundID, 1.0f);
+		}
+	}
+	else if(MsgId == NETMSGTYPE_SV_TEAMSSTATE || MsgId == NETMSGTYPE_SV_TEAMSSTATELEGACY)
+	{
+		unsigned int i;
+
+		for(i = 0; i < MAX_CLIENTS; i++)
+		{
+			const int Team = pUnpacker->GetInt();
+			if(!pUnpacker->Error() && Team >= TEAM_FLOCK && Team <= TEAM_SUPER)
+				m_Teams.Team(i, Team);
+			else
+			{
+				m_Teams.Team(i, 0);
+				break;
+			}
+		}
+
+		if(i <= 16)
+			m_Teams.m_IsDDRace16 = true;
+
+		m_Ghost.m_AllowRestart = true;
+		m_RaceDemo.m_AllowRestart = true;
+	}
+	else if(MsgId == NETMSGTYPE_SV_KILLMSG)
+	{
+		CNetMsg_Sv_KillMsg *pMsg = (CNetMsg_Sv_KillMsg *)pRawMsg;
+		// reset character prediction
+		if(!(m_GameWorld.m_WorldConfig.m_IsFNG && pMsg->m_Weapon == WEAPON_LASER))
+		{
+			m_CharOrder.GiveWeak(pMsg->m_Victim);
+			if(CCharacter *pChar = m_GameWorld.GetCharacterByID(pMsg->m_Victim))
+				pChar->ResetPrediction();
+			m_GameWorld.ReleaseHooked(pMsg->m_Victim);
+		}
+
+		// if we are spectating a static id set (team 0) and somebody killed, and its not a guy in solo, we remove him from the list
+		if(IsMultiViewIdSet() && m_MultiViewTeam == 0 && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec && !m_MultiView.m_Solo)
+		{
+			m_aMultiViewId[pMsg->m_Victim] = false;
+
+			// if everyone of a team killed, we have no ids to spectate anymore, so we disable multi view
+			if(!IsMultiViewIdSet())
+				ResetMultiView();
+			else
+			{
+				// the "main" tee killed, search a new one
+				if(m_Snap.m_SpecInfo.m_SpectatorID == pMsg->m_Victim)
+				{
+					int NewClientID = FindFirstMultiViewId();
+					if(NewClientID < MAX_CLIENTS && NewClientID >= 0)
+					{
+						CleanMultiViewId(NewClientID);
+						m_aMultiViewId[NewClientID] = true;
+						m_Spectator.Spectate(NewClientID);
+					}
+				}
+			}
+		}
+	}
+	else if(MsgId == NETMSGTYPE_SV_KILLMSGTEAM)
+	{
+		CNetMsg_Sv_KillMsgTeam *pMsg = (CNetMsg_Sv_KillMsgTeam *)pRawMsg;
+
+		// reset prediction
+		std::vector<std::pair<int, int>> vStrongWeakSorted;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_Teams.Team(i) == pMsg->m_Team)
+			{
+				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+				{
+					pChar->ResetPrediction();
+					vStrongWeakSorted.emplace_back(i, pMsg->m_First == i ? MAX_CLIENTS : pChar ? pChar->GetStrongWeakID() : 0);
+				}
+				m_GameWorld.ReleaseHooked(i);
+			}
+		}
+		std::stable_sort(vStrongWeakSorted.begin(), vStrongWeakSorted.end(), [](auto &Left, auto &Right) { return Left.second > Right.second; });
+		for(auto ID : vStrongWeakSorted)
+		{
+			m_CharOrder.GiveWeak(ID.first);
+		}
+	}
+}
+
+void CGameClient::OnStateChange(int NewState, int OldState)
+{
+	// reset everything when not already connected (to keep gathered stuff)
+	if(NewState < IClient::STATE_ONLINE)
+		OnReset();
+
+	// then change the state
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnStateChange(NewState, OldState);
+}
+
+void CGameClient::OnShutdown()
+{
+	RenderShutdownMessage();
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnShutdown();
+}
+
+void CGameClient::OnEnterGame()
+{
+	m_Effects.ResetDamageIndicator();
+}
+
+void CGameClient::OnGameOver()
+{
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK && g_Config.m_ClEditor == 0)
+		Client()->AutoScreenshot_Start();
+}
+
+void CGameClient::OnStartGame()
+{
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK && !g_Config.m_ClAutoDemoOnConnect)
+		Client()->DemoRecorder_HandleAutoStart();
+	m_Statboard.OnReset();
+}
+
+void CGameClient::OnStartRound()
+{
+	// In GamePaused or GameOver state RoundStartTick is updated on each tick
+	// hence no need to reset stats until player leaves GameOver
+	// and it would be a mistake to reset stats after or during the pause
+	m_Statboard.OnReset();
+
+	// Restart automatic race demo recording
+	m_RaceDemo.OnReset();
+}
+
+void CGameClient::OnFlagGrab(int TeamID)
+{
+	if(TeamID == TEAM_RED)
+		m_aStats[m_Snap.m_pGameDataObj->m_FlagCarrierRed].m_FlagGrabs++;
+	else
+		m_aStats[m_Snap.m_pGameDataObj->m_FlagCarrierBlue].m_FlagGrabs++;
+}
+
+void CGameClient::OnWindowResize()
+{
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnWindowResize();
+
+	UI()->OnWindowResize();
+}
+
+void CGameClient::OnLanguageChange()
+{
+	// The actual language change is delayed because it
+	// might require clearing the text render font atlas,
+	// which would invalidate text that is currently drawn.
+	m_LanguageChanged = true;
+}
+
+void CGameClient::HandleLanguageChanged()
+{
+	if(!m_LanguageChanged)
+		return;
+	m_LanguageChanged = false;
+
+	g_Localization.Load(g_Config.m_ClLanguagefile, Storage(), Console());
+	TextRender()->SetFontLanguageVariant(g_Config.m_ClLanguagefile);
+
+	// Clear all text containers
+	Client()->OnWindowResize();
+}
+
+void CGameClient::RenderShutdownMessage()
+{
+	const char *pMessage = nullptr;
+
+	if(Client()->State() == IClient::STATE_QUITTING)
+	{
+		// Randomly decide whether to display "Goodbye..." (10% chance)
+		if(rand() % 20 == 0)
+		{
+			pMessage = "Hope -StormAx gonna kill himself soon…";
+		}
+		else
+		{
+			pMessage = Localize("Quitting. Please wait…");
+		}
+	}
+
+	else if(Client()->State() == IClient::STATE_RESTARTING)
+		pMessage = Localize("Restarting. Please wait…");
+	else
+		dbg_assert(false, "Invalid client state for quitting message");
+
+	// This function only gets called after the render loop has already terminated, so we have to call Swap manually.
+	Graphics()->Clear(0.0f, 0.0f, 0.0f);
+	UI()->MapScreen();
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	UI()->DoLabel(UI()->Screen(), pMessage, 16.0f, TEXTALIGN_MC);
+	Graphics()->Swap();
+	Graphics()->Clear(0.0f, 0.0f, 0.0f);
+}
+
+void CGameClient::OnRconType(bool UsernameReq)
+{
+	m_GameConsole.RequireUsername(UsernameReq);
+}
+
+void CGameClient::OnRconLine(const char *pLine)
+{
+	m_GameConsole.PrintLine(CGameConsole::CONSOLETYPE_REMOTE, pLine);
+}
+
+void CGameClient::ProcessEvents()
+{
+	if(m_SuppressEvents)
+		return;
+
+	int SnapType = IClient::SNAP_CURRENT;
+	int Num = Client()->SnapNumItems(SnapType);
+	for(int Index = 0; Index < Num; Index++)
+	{
+		IClient::CSnapItem Item;
+		const void *pData = Client()->SnapGetItem(SnapType, Index, &Item);
+
+		// We don't have enough info about us, others, to know a correct alpha value.
+		float Alpha = 1.0f;
+
+		if(Item.m_Type == NETEVENTTYPE_DAMAGEIND)
+		{
+			CNetEvent_DamageInd *pEvent = (CNetEvent_DamageInd *)pData;
+			m_Effects.DamageIndicator(vec2(pEvent->m_X, pEvent->m_Y), direction(pEvent->m_Angle / 256.0f), Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_EXPLOSION)
+		{
+			CNetEvent_Explosion *pEvent = (CNetEvent_Explosion *)pData;
+			m_Effects.Explosion(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_HAMMERHIT)
+		{
+			CNetEvent_HammerHit *pEvent = (CNetEvent_HammerHit *)pData;
+			m_Effects.HammerHit(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_SPAWN)
+		{
+			CNetEvent_Spawn *pEvent = (CNetEvent_Spawn *)pData;
+			m_Effects.PlayerSpawn(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_DEATH)
+		{
+			CNetEvent_Death *pEvent = (CNetEvent_Death *)pData;
+			m_Effects.PlayerDeath(vec2(pEvent->m_X, pEvent->m_Y), pEvent->m_ClientID, Alpha);
+		}
+		else if(Item.m_Type == NETEVENTTYPE_SOUNDWORLD)
+		{
+			CNetEvent_SoundWorld *pEvent = (CNetEvent_SoundWorld *)pData;
+			if(!Config()->m_SndGame)
+				continue;
+
+			if(m_GameInfo.m_RaceSounds && ((pEvent->m_SoundID == SOUND_GUN_FIRE && !g_Config.m_SndGun) || (pEvent->m_SoundID == SOUND_PLAYER_PAIN_LONG && !g_Config.m_SndLongPain)))
+				continue;
+
+			m_Sounds.PlayAt(CSounds::CHN_WORLD, pEvent->m_SoundID, 1.0f, vec2(pEvent->m_X, pEvent->m_Y));
+		}
+	}
+}
+
+static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize, CServerInfo *pFallbackServerInfo)
+{
+	int Version = -1;
+	if(InfoExSize >= 12)
+	{
+		Version = pInfoEx->m_Version;
+	}
+	else if(InfoExSize >= 8)
+	{
+		Version = minimum(pInfoEx->m_Version, 4);
+	}
+	else if(InfoExSize >= 4)
+	{
+		Version = 0;
+	}
+	int Flags = 0;
+	if(Version >= 0)
+	{
+		Flags = pInfoEx->m_Flags;
+	}
+	int Flags2 = 0;
+	if(Version >= 5)
+	{
+		Flags2 = pInfoEx->m_Flags2;
+	}
+	bool Race;
+	bool FastCap;
+	bool FNG;
+	bool DDRace;
+	bool DDNet;
+	bool BlockWorlds;
+	bool City;
+	bool Vanilla;
+	bool Plus;
+	bool FDDrace;
+	if(Version < 1)
+	{
+		const char *pGameType = pFallbackServerInfo->m_aGameType;
+		Race = str_find_nocase(pGameType, "race") || str_find_nocase(pGameType, "fastcap");
+		FastCap = str_find_nocase(pGameType, "fastcap");
+		FNG = str_find_nocase(pGameType, "fng");
+		DDRace = str_find_nocase(pGameType, "ddrace") || str_find_nocase(pGameType, "mkrace");
+		DDNet = str_find_nocase(pGameType, "ddracenet") || str_find_nocase(pGameType, "ddnet");
+		BlockWorlds = str_startswith(pGameType, "bw  ") || str_comp_nocase(pGameType, "bw") == 0;
+		City = str_find_nocase(pGameType, "city");
+		Vanilla = str_comp(pGameType, "DM") == 0 || str_comp(pGameType, "TDM") == 0 || str_comp(pGameType, "CTF") == 0;
+		Plus = str_find(pGameType, "+");
+		FDDrace = false;
+	}
+	else
+	{
+		Race = Flags & GAMEINFOFLAG_GAMETYPE_RACE;
+		FastCap = Flags & GAMEINFOFLAG_GAMETYPE_FASTCAP;
+		FNG = Flags & GAMEINFOFLAG_GAMETYPE_FNG;
+		DDRace = Flags & GAMEINFOFLAG_GAMETYPE_DDRACE;
+		DDNet = Flags & GAMEINFOFLAG_GAMETYPE_DDNET;
+		BlockWorlds = Flags & GAMEINFOFLAG_GAMETYPE_BLOCK_WORLDS;
+		Vanilla = Flags & GAMEINFOFLAG_GAMETYPE_VANILLA;
+		Plus = Flags & GAMEINFOFLAG_GAMETYPE_PLUS;
+		City = Version >= 5 && Flags2 & GAMEINFOFLAG2_GAMETYPE_CITY;
+		FDDrace = Version >= 6 && Flags2 & GAMEINFOFLAG2_GAMETYPE_FDDRACE;
+
+		// Ensure invariants upheld by the server info parsing business.
+		DDRace = DDRace || DDNet || FDDrace;
+		Race = Race || FastCap || DDRace;
+	}
+
+	CGameInfo Info;
+	Info.m_FlagStartsRace = FastCap;
+	Info.m_TimeScore = Race;
+	Info.m_UnlimitedAmmo = Race;
+	Info.m_DDRaceRecordMessage = DDRace && !DDNet;
+	Info.m_RaceRecordMessage = DDNet || (Race && !DDRace);
+	Info.m_RaceSounds = DDRace || FNG || BlockWorlds;
+	Info.m_AllowEyeWheel = DDRace || BlockWorlds || City || Plus;
+	Info.m_AllowHookColl = DDRace;
+	Info.m_AllowZoom = Race || BlockWorlds || City;
+	Info.m_BugDDRaceGhost = DDRace;
+	Info.m_BugDDRaceInput = DDRace;
+	Info.m_BugFNGLaserRange = FNG;
+	Info.m_BugVanillaBounce = Vanilla;
+	Info.m_PredictFNG = FNG;
+	Info.m_PredictDDRace = DDRace;
+	Info.m_PredictDDRaceTiles = DDRace && !BlockWorlds;
+	Info.m_PredictVanilla = Vanilla || FastCap;
+	Info.m_EntitiesDDNet = DDNet;
+	Info.m_EntitiesDDRace = DDRace;
+	Info.m_EntitiesRace = Race;
+	Info.m_EntitiesFNG = FNG;
+	Info.m_EntitiesVanilla = Vanilla;
+	Info.m_EntitiesBW = BlockWorlds;
+	Info.m_Race = Race;
+	Info.m_DontMaskEntities = !DDNet;
+	Info.m_AllowXSkins = false;
+	Info.m_EntitiesFDDrace = FDDrace;
+	Info.m_HudHealthArmor = true;
+	Info.m_HudAmmo = true;
+	Info.m_HudDDRace = false;
+	Info.m_NoWeakHookAndBounce = false;
+	Info.m_NoSkinChangeForFrozen = false;
+
+	if(Version >= 0)
+	{
+		Info.m_TimeScore = Flags & GAMEINFOFLAG_TIMESCORE;
+	}
+	if(Version >= 2)
+	{
+		Info.m_FlagStartsRace = Flags & GAMEINFOFLAG_FLAG_STARTS_RACE;
+		Info.m_UnlimitedAmmo = Flags & GAMEINFOFLAG_UNLIMITED_AMMO;
+		Info.m_DDRaceRecordMessage = Flags & GAMEINFOFLAG_DDRACE_RECORD_MESSAGE;
+		Info.m_RaceRecordMessage = Flags & GAMEINFOFLAG_RACE_RECORD_MESSAGE;
+		Info.m_AllowEyeWheel = Flags & GAMEINFOFLAG_ALLOW_EYE_WHEEL;
+		Info.m_AllowHookColl = Flags & GAMEINFOFLAG_ALLOW_HOOK_COLL;
+		Info.m_AllowZoom = Flags & GAMEINFOFLAG_ALLOW_ZOOM;
+		Info.m_BugDDRaceGhost = Flags & GAMEINFOFLAG_BUG_DDRACE_GHOST;
+		Info.m_BugDDRaceInput = Flags & GAMEINFOFLAG_BUG_DDRACE_INPUT;
+		Info.m_BugFNGLaserRange = Flags & GAMEINFOFLAG_BUG_FNG_LASER_RANGE;
+		Info.m_BugVanillaBounce = Flags & GAMEINFOFLAG_BUG_VANILLA_BOUNCE;
+		Info.m_PredictFNG = Flags & GAMEINFOFLAG_PREDICT_FNG;
+		Info.m_PredictDDRace = Flags & GAMEINFOFLAG_PREDICT_DDRACE;
+		Info.m_PredictDDRaceTiles = Flags & GAMEINFOFLAG_PREDICT_DDRACE_TILES;
+		Info.m_PredictVanilla = Flags & GAMEINFOFLAG_PREDICT_VANILLA;
+		Info.m_EntitiesDDNet = Flags & GAMEINFOFLAG_ENTITIES_DDNET;
+		Info.m_EntitiesDDRace = Flags & GAMEINFOFLAG_ENTITIES_DDRACE;
+		Info.m_EntitiesRace = Flags & GAMEINFOFLAG_ENTITIES_RACE;
+		Info.m_EntitiesFNG = Flags & GAMEINFOFLAG_ENTITIES_FNG;
+		Info.m_EntitiesVanilla = Flags & GAMEINFOFLAG_ENTITIES_VANILLA;
+	}
+	if(Version >= 3)
+	{
+		Info.m_Race = Flags & GAMEINFOFLAG_RACE;
+		Info.m_DontMaskEntities = Flags & GAMEINFOFLAG_DONT_MASK_ENTITIES;
+	}
+	if(Version >= 4)
+	{
+		Info.m_EntitiesBW = Flags & GAMEINFOFLAG_ENTITIES_BW;
+	}
+	if(Version >= 5)
+	{
+		Info.m_AllowXSkins = Flags2 & GAMEINFOFLAG2_ALLOW_X_SKINS;
+	}
+	if(Version >= 6)
+	{
+		Info.m_EntitiesFDDrace = Flags2 & GAMEINFOFLAG2_ENTITIES_FDDRACE;
+	}
+	if(Version >= 7)
+	{
+		Info.m_HudHealthArmor = Flags2 & GAMEINFOFLAG2_HUD_HEALTH_ARMOR;
+		Info.m_HudAmmo = Flags2 & GAMEINFOFLAG2_HUD_AMMO;
+		Info.m_HudDDRace = Flags2 & GAMEINFOFLAG2_HUD_DDRACE;
+	}
+	if(Version >= 8)
+	{
+		Info.m_NoWeakHookAndBounce = Flags2 & GAMEINFOFLAG2_NO_WEAK_HOOK;
+	}
+	if(Version >= 9)
+	{
+		Info.m_NoSkinChangeForFrozen = Flags2 & GAMEINFOFLAG2_NO_SKIN_CHANGE_FOR_FROZEN;
+	}
+
+	return Info;
+}
+
+void CGameClient::InvalidateSnapshot()
+{
+	// clear all pointers
+	mem_zero(&m_Snap, sizeof(m_Snap));
+	m_Snap.m_LocalClientID = -1;
+	SnapCollectEntities();
+}
+
+void CGameClient::OnNewSnapshot()
+{
+	auto &&Evolve = [this](CNetObj_Character *pCharacter, int Tick) {
+		CWorldCore TempWorld;
+		CCharacterCore TempCore = CCharacterCore();
+		CTeamsCore TempTeams = CTeamsCore();
+		TempCore.Init(&TempWorld, Collision(), &TempTeams);
+		TempCore.Read(pCharacter);
+		TempCore.m_ActiveWeapon = pCharacter->m_Weapon;
+
+		while(pCharacter->m_Tick < Tick)
+		{
+			pCharacter->m_Tick++;
+			TempCore.Tick(false);
+			TempCore.Move();
+			TempCore.Quantize();
+		}
+
+		TempCore.Write(pCharacter);
+	};
+
+	InvalidateSnapshot();
+
+	m_NewTick = true;
+
+	ProcessEvents();
+
+#ifdef CONF_DEBUG
+	if(g_Config.m_DbgStress)
+	{
+		if((Client()->GameTick(g_Config.m_ClDummy) % 100) == 0)
+		{
+			char aMessage[64];
+			int MsgLen = rand() % (sizeof(aMessage) - 1);
+			for(int i = 0; i < MsgLen; i++)
+				aMessage[i] = (char)('a' + (rand() % ('z' - 'a')));
+			aMessage[MsgLen] = 0;
+
+			CNetMsg_Cl_Say Msg;
+			Msg.m_Team = rand() & 1;
+			Msg.m_pMessage = aMessage;
+			Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+		}
+	}
+#endif
+
+	bool FoundGameInfoEx = false;
+	bool GotSwitchStateTeam = false;
+	m_aSwitchStateTeam[g_Config.m_ClDummy] = -1;
+
+	for(auto &Client : m_aClients)
+	{
+		Client.m_SpecCharPresent = false;
+	}
+
+	// go through all the items in the snapshot and gather the info we want
+	{
+		m_Snap.m_aTeamSize[TEAM_RED] = m_Snap.m_aTeamSize[TEAM_BLUE] = 0;
+
+		int Num = Client()->SnapNumItems(IClient::SNAP_CURRENT);
+		for(int i = 0; i < Num; i++)
+		{
+			IClient::CSnapItem Item;
+			const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+
+			if(Item.m_Type == NETOBJTYPE_CLIENTINFO)
+			{
+				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)pData;
+				int ClientID = Item.m_ID;
+				if(ClientID < MAX_CLIENTS)
+				{
+					CClientData *pClient = &m_aClients[ClientID];
+
+					IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName);
+					IntsToStr(&pInfo->m_Clan0, 3, pClient->m_aClan);
+					pClient->m_Country = pInfo->m_Country;
+					IntsToStr(&pInfo->m_Skin0, 6, pClient->m_aSkinName);
+
+					pClient->m_UseCustomColor = pInfo->m_UseCustomColor;
+					pClient->m_ColorBody = pInfo->m_ColorBody;
+					pClient->m_ColorFeet = pInfo->m_ColorFeet;
+
+					// prepare the info
+					if(!m_GameInfo.m_AllowXSkins && (pClient->m_aSkinName[0] == 'x' && pClient->m_aSkinName[1] == '_'))
+						str_copy(pClient->m_aSkinName, "default");
+
+					pClient->m_SkinInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorBody).UnclampLighting());
+					pClient->m_SkinInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(pClient->m_ColorFeet).UnclampLighting());
+					pClient->m_SkinInfo.m_Size = 64;
+
+					// find new skin
+					const CSkin *pSkin = m_Skins.Find(pClient->m_aSkinName);
+					pClient->m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+					pClient->m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+					pClient->m_SkinInfo.m_SkinMetrics = pSkin->m_Metrics;
+					pClient->m_SkinInfo.m_BloodColor = pSkin->m_BloodColor;
+					pClient->m_SkinInfo.m_CustomColoredSkin = pClient->m_UseCustomColor;
+
+					if(!pClient->m_UseCustomColor)
+					{
+						pClient->m_SkinInfo.m_ColorBody = ColorRGBA(1, 1, 1);
+						pClient->m_SkinInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
+					}
+
+					pClient->UpdateRenderInfo(IsTeamPlay());
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_PLAYERINFO)
+			{
+				const CNetObj_PlayerInfo *pInfo = (const CNetObj_PlayerInfo *)pData;
+
+				if(pInfo->m_ClientID < MAX_CLIENTS && pInfo->m_ClientID == Item.m_ID)
+				{
+					m_aClients[pInfo->m_ClientID].m_Team = pInfo->m_Team;
+					m_aClients[pInfo->m_ClientID].m_Active = true;
+					m_Snap.m_apPlayerInfos[pInfo->m_ClientID] = pInfo;
+					m_Snap.m_NumPlayers++;
+
+					if(pInfo->m_Local)
+					{
+						m_Snap.m_LocalClientID = pInfo->m_ClientID;
+						m_Snap.m_pLocalInfo = pInfo;
+
+						if(pInfo->m_Team == TEAM_SPECTATORS)
+						{
+							m_Snap.m_SpecInfo.m_Active = true;
+						}
+					}
+
+					// calculate team-balance
+					if(pInfo->m_Team != TEAM_SPECTATORS)
+					{
+						m_Snap.m_aTeamSize[pInfo->m_Team]++;
+						if(!m_aStats[pInfo->m_ClientID].IsActive())
+							m_aStats[pInfo->m_ClientID].JoinGame(Client()->GameTick(g_Config.m_ClDummy));
+					}
+					else if(m_aStats[pInfo->m_ClientID].IsActive())
+						m_aStats[pInfo->m_ClientID].JoinSpec(Client()->GameTick(g_Config.m_ClDummy));
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_DDNETPLAYER)
+			{
+				m_ReceivedDDNetPlayer = true;
+				const CNetObj_DDNetPlayer *pInfo = (const CNetObj_DDNetPlayer *)pData;
+				if(Item.m_ID < MAX_CLIENTS)
+				{
+					m_aClients[Item.m_ID].m_AuthLevel = pInfo->m_AuthLevel;
+					m_aClients[Item.m_ID].m_Afk = pInfo->m_Flags & EXPLAYERFLAG_AFK;
+					m_aClients[Item.m_ID].m_Paused = pInfo->m_Flags & EXPLAYERFLAG_PAUSED;
+					m_aClients[Item.m_ID].m_Spec = pInfo->m_Flags & EXPLAYERFLAG_SPEC;
+
+					if(Item.m_ID == m_Snap.m_LocalClientID && (m_aClients[Item.m_ID].m_Paused || m_aClients[Item.m_ID].m_Spec))
+					{
+						m_Snap.m_SpecInfo.m_Active = true;
+					}
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_CHARACTER)
+			{
+				if(Item.m_ID < MAX_CLIENTS)
+				{
+					const void *pOld = Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, Item.m_ID);
+					m_Snap.m_aCharacters[Item.m_ID].m_Cur = *((const CNetObj_Character *)pData);
+					if(pOld)
+					{
+						m_Snap.m_aCharacters[Item.m_ID].m_Active = true;
+						m_Snap.m_aCharacters[Item.m_ID].m_Prev = *((const CNetObj_Character *)pOld);
+
+						// limit evolving to 3 seconds
+						bool EvolvePrev = Client()->PrevGameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_ID].m_Prev.m_Tick <= 3 * Client()->GameTickSpeed();
+						bool EvolveCur = Client()->GameTick(g_Config.m_ClDummy) - m_Snap.m_aCharacters[Item.m_ID].m_Cur.m_Tick <= 3 * Client()->GameTickSpeed();
+
+						// reuse the result from the previous evolve if the snapped character didn't change since the previous snapshot
+						if(EvolveCur && m_aClients[Item.m_ID].m_Evolved.m_Tick == Client()->PrevGameTick(g_Config.m_ClDummy))
+						{
+							if(mem_comp(&m_Snap.m_aCharacters[Item.m_ID].m_Prev, &m_aClients[Item.m_ID].m_Snapped, sizeof(CNetObj_Character)) == 0)
+								m_Snap.m_aCharacters[Item.m_ID].m_Prev = m_aClients[Item.m_ID].m_Evolved;
+							if(mem_comp(&m_Snap.m_aCharacters[Item.m_ID].m_Cur, &m_aClients[Item.m_ID].m_Snapped, sizeof(CNetObj_Character)) == 0)
+								m_Snap.m_aCharacters[Item.m_ID].m_Cur = m_aClients[Item.m_ID].m_Evolved;
+						}
+
+						if(EvolvePrev && m_Snap.m_aCharacters[Item.m_ID].m_Prev.m_Tick)
+							Evolve(&m_Snap.m_aCharacters[Item.m_ID].m_Prev, Client()->PrevGameTick(g_Config.m_ClDummy));
+						if(EvolveCur && m_Snap.m_aCharacters[Item.m_ID].m_Cur.m_Tick)
+							Evolve(&m_Snap.m_aCharacters[Item.m_ID].m_Cur, Client()->GameTick(g_Config.m_ClDummy));
+
+						m_aClients[Item.m_ID].m_Snapped = *((const CNetObj_Character *)pData);
+						m_aClients[Item.m_ID].m_Evolved = m_Snap.m_aCharacters[Item.m_ID].m_Cur;
+					}
+					else
+					{
+						m_aClients[Item.m_ID].m_Evolved.m_Tick = -1;
+					}
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_DDNETCHARACTER)
+			{
+				const CNetObj_DDNetCharacter *pCharacterData = (const CNetObj_DDNetCharacter *)pData;
+
+				if(Item.m_ID < MAX_CLIENTS)
+				{
+					m_Snap.m_aCharacters[Item.m_ID].m_ExtendedData = *pCharacterData;
+					m_Snap.m_aCharacters[Item.m_ID].m_PrevExtendedData = (const CNetObj_DDNetCharacter *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_DDNETCHARACTER, Item.m_ID);
+					m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedData = true;
+					m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedDisplayInfo = false;
+					if(pCharacterData->m_JumpedTotal != -1)
+					{
+						m_Snap.m_aCharacters[Item.m_ID].m_HasExtendedDisplayInfo = true;
+					}
+					CClientData *pClient = &m_aClients[Item.m_ID];
+					// Collision
+					pClient->m_Solo = pCharacterData->m_Flags & CHARACTERFLAG_SOLO;
+					pClient->m_Jetpack = pCharacterData->m_Flags & CHARACTERFLAG_JETPACK;
+					pClient->m_CollisionDisabled = pCharacterData->m_Flags & CHARACTERFLAG_COLLISION_DISABLED;
+					pClient->m_HammerHitDisabled = pCharacterData->m_Flags & CHARACTERFLAG_HAMMER_HIT_DISABLED;
+					pClient->m_GrenadeHitDisabled = pCharacterData->m_Flags & CHARACTERFLAG_GRENADE_HIT_DISABLED;
+					pClient->m_LaserHitDisabled = pCharacterData->m_Flags & CHARACTERFLAG_LASER_HIT_DISABLED;
+					pClient->m_ShotgunHitDisabled = pCharacterData->m_Flags & CHARACTERFLAG_SHOTGUN_HIT_DISABLED;
+					pClient->m_HookHitDisabled = pCharacterData->m_Flags & CHARACTERFLAG_HOOK_HIT_DISABLED;
+					pClient->m_Super = pCharacterData->m_Flags & CHARACTERFLAG_SUPER;
+
+					// Endless
+					pClient->m_EndlessHook = pCharacterData->m_Flags & CHARACTERFLAG_ENDLESS_HOOK;
+					pClient->m_EndlessJump = pCharacterData->m_Flags & CHARACTERFLAG_ENDLESS_JUMP;
+
+					// Freeze
+					pClient->m_FreezeEnd = pCharacterData->m_FreezeEnd;
+					pClient->m_DeepFrozen = pCharacterData->m_FreezeEnd == -1;
+					pClient->m_LiveFrozen = (pCharacterData->m_Flags & CHARACTERFLAG_MOVEMENTS_DISABLED) != 0;
+
+					// Telegun
+					pClient->m_HasTelegunGrenade = pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_GRENADE;
+					pClient->m_HasTelegunGun = pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_GUN;
+					pClient->m_HasTelegunLaser = pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_LASER;
+
+					pClient->m_Predicted.ReadDDNet(pCharacterData);
+
+					m_Teams.SetSolo(Item.m_ID, pClient->m_Solo);
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_SPECCHAR)
+			{
+				const CNetObj_SpecChar *pSpecCharData = (const CNetObj_SpecChar *)pData;
+
+				if(Item.m_ID < MAX_CLIENTS)
+				{
+					CClientData *pClient = &m_aClients[Item.m_ID];
+					pClient->m_SpecCharPresent = true;
+					pClient->m_SpecChar.x = pSpecCharData->m_X;
+					pClient->m_SpecChar.y = pSpecCharData->m_Y;
+				}
+			}
+			else if(Item.m_Type == NETOBJTYPE_SPECTATORINFO)
+			{
+				m_Snap.m_pSpectatorInfo = (const CNetObj_SpectatorInfo *)pData;
+				m_Snap.m_pPrevSpectatorInfo = (const CNetObj_SpectatorInfo *)Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_SPECTATORINFO, Item.m_ID);
+
+				m_Snap.m_SpecInfo.m_SpectatorID = m_Snap.m_pSpectatorInfo->m_SpectatorID;
+			}
+			else if(Item.m_Type == NETOBJTYPE_GAMEINFO)
+			{
+				m_Snap.m_pGameInfoObj = (const CNetObj_GameInfo *)pData;
+				bool CurrentTickGameOver = (bool)(m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER);
+				if(!m_GameOver && CurrentTickGameOver)
+					OnGameOver();
+				else if(m_GameOver && !CurrentTickGameOver)
+					OnStartGame();
+				// Handle case that a new round is started (RoundStartTick changed)
+				// New round is usually started after `restart` on server
+				if(m_Snap.m_pGameInfoObj->m_RoundStartTick != m_LastRoundStartTick && !(CurrentTickGameOver || m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED || m_GamePaused))
+					OnStartRound();
+				m_LastRoundStartTick = m_Snap.m_pGameInfoObj->m_RoundStartTick;
+				m_GameOver = CurrentTickGameOver;
+				m_GamePaused = (bool)(m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED);
+			}
+			else if(Item.m_Type == NETOBJTYPE_GAMEINFOEX)
+			{
+				if(FoundGameInfoEx)
+				{
+					continue;
+				}
+				FoundGameInfoEx = true;
+				CServerInfo ServerInfo;
+				Client()->GetServerInfo(&ServerInfo);
+				m_GameInfo = GetGameInfo((const CNetObj_GameInfoEx *)pData, Client()->SnapItemSize(IClient::SNAP_CURRENT, i), &ServerInfo);
+			}
+			else if(Item.m_Type == NETOBJTYPE_GAMEDATA)
+			{
+				m_Snap.m_pGameDataObj = (const CNetObj_GameData *)pData;
+				m_Snap.m_GameDataSnapID = Item.m_ID;
+				if(m_Snap.m_pGameDataObj->m_FlagCarrierRed == FLAG_TAKEN)
+				{
+					if(m_aFlagDropTick[TEAM_RED] == 0)
+						m_aFlagDropTick[TEAM_RED] = Client()->GameTick(g_Config.m_ClDummy);
+				}
+				else
+					m_aFlagDropTick[TEAM_RED] = 0;
+				if(m_Snap.m_pGameDataObj->m_FlagCarrierBlue == FLAG_TAKEN)
+				{
+					if(m_aFlagDropTick[TEAM_BLUE] == 0)
+						m_aFlagDropTick[TEAM_BLUE] = Client()->GameTick(g_Config.m_ClDummy);
+				}
+				else
+					m_aFlagDropTick[TEAM_BLUE] = 0;
+				if(m_LastFlagCarrierRed == FLAG_ATSTAND && m_Snap.m_pGameDataObj->m_FlagCarrierRed >= 0)
+					OnFlagGrab(TEAM_RED);
+				else if(m_LastFlagCarrierBlue == FLAG_ATSTAND && m_Snap.m_pGameDataObj->m_FlagCarrierBlue >= 0)
+					OnFlagGrab(TEAM_BLUE);
+
+				m_LastFlagCarrierRed = m_Snap.m_pGameDataObj->m_FlagCarrierRed;
+				m_LastFlagCarrierBlue = m_Snap.m_pGameDataObj->m_FlagCarrierBlue;
+			}
+			else if(Item.m_Type == NETOBJTYPE_FLAG)
+				m_Snap.m_apFlags[Item.m_ID % 2] = (const CNetObj_Flag *)pData;
+			else if(Item.m_Type == NETOBJTYPE_SWITCHSTATE)
+			{
+				if(Item.m_DataSize < 36)
+				{
+					continue;
+				}
+				const CNetObj_SwitchState *pSwitchStateData = (const CNetObj_SwitchState *)pData;
+				int Team = clamp(Item.m_ID, (int)TEAM_FLOCK, (int)TEAM_SUPER - 1);
+
+				int HighestSwitchNumber = clamp(pSwitchStateData->m_HighestSwitchNumber, 0, 255);
+				if(HighestSwitchNumber != maximum(0, (int)Switchers().size() - 1))
+				{
+					m_GameWorld.m_Core.InitSwitchers(HighestSwitchNumber);
+					Collision()->m_HighestSwitchNumber = HighestSwitchNumber;
+				}
+
+				for(int j = 0; j < (int)Switchers().size(); j++)
+				{
+					Switchers()[j].m_aStatus[Team] = (pSwitchStateData->m_aStatus[j / 32] >> (j % 32)) & 1;
+				}
+
+				if(Item.m_DataSize >= 68)
+				{
+					// update the endtick of up to four timed switchers
+					for(int j = 0; j < (int)std::size(pSwitchStateData->m_aEndTicks); j++)
+					{
+						int SwitchNumber = pSwitchStateData->m_aSwitchNumbers[j];
+						int EndTick = pSwitchStateData->m_aEndTicks[j];
+						if(EndTick > 0 && in_range(SwitchNumber, 0, (int)Switchers().size()))
+						{
+							Switchers()[SwitchNumber].m_aEndTick[Team] = EndTick;
+						}
+					}
+				}
+
+				// update switch types
+				for(auto &Switcher : Switchers())
+				{
+					if(Switcher.m_aStatus[Team])
+						Switcher.m_aType[Team] = Switcher.m_aEndTick[Team] ? TILE_SWITCHTIMEDOPEN : TILE_SWITCHOPEN;
+					else
+						Switcher.m_aType[Team] = Switcher.m_aEndTick[Team] ? TILE_SWITCHTIMEDCLOSE : TILE_SWITCHCLOSE;
+				}
+
+				if(!GotSwitchStateTeam)
+					m_aSwitchStateTeam[g_Config.m_ClDummy] = Team;
+				else
+					m_aSwitchStateTeam[g_Config.m_ClDummy] = -1;
+				GotSwitchStateTeam = true;
+			}
+		}
+	}
+
+	if(!FoundGameInfoEx)
+	{
+		CServerInfo ServerInfo;
+		Client()->GetServerInfo(&ServerInfo);
+		m_GameInfo = GetGameInfo(0, 0, &ServerInfo);
+	}
+
+	// setup local pointers
+	if(m_Snap.m_LocalClientID >= 0)
+	{
+		m_aLocalIDs[g_Config.m_ClDummy] = m_Snap.m_LocalClientID;
+
+		CSnapState::CCharacterInfo *pChr = &m_Snap.m_aCharacters[m_Snap.m_LocalClientID];
+		if(pChr->m_Active)
+		{
+			if(!m_Snap.m_SpecInfo.m_Active)
+			{
+				m_Snap.m_pLocalCharacter = &pChr->m_Cur;
+				m_Snap.m_pLocalPrevCharacter = &pChr->m_Prev;
+				m_LocalCharacterPos = vec2(m_Snap.m_pLocalCharacter->m_X, m_Snap.m_pLocalCharacter->m_Y);
+			}
+		}
+		else if(Client()->SnapFindItem(IClient::SNAP_PREV, NETOBJTYPE_CHARACTER, m_Snap.m_LocalClientID))
+		{
+			// player died
+			m_Controls.OnPlayerDeath();
+		}
+	}
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		if(m_Snap.m_LocalClientID == -1 && m_DemoSpecID == SPEC_FOLLOW)
+			m_DemoSpecID = SPEC_FREEVIEW;
+		if(m_DemoSpecID != SPEC_FOLLOW)
+		{
+			m_Snap.m_SpecInfo.m_Active = true;
+			if(m_DemoSpecID > SPEC_FREEVIEW && m_Snap.m_aCharacters[m_DemoSpecID].m_Active)
+				m_Snap.m_SpecInfo.m_SpectatorID = m_DemoSpecID;
+			else
+				m_Snap.m_SpecInfo.m_SpectatorID = SPEC_FREEVIEW;
+		}
+	}
+
+	// clear out unneeded client data
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(!m_Snap.m_apPlayerInfos[i] && m_aClients[i].m_Active)
+		{
+			m_aClients[i].Reset();
+			m_aStats[i].Reset();
+		}
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		// update friend state
+		m_aClients[i].m_Friend = !(i == m_Snap.m_LocalClientID || !m_Snap.m_apPlayerInfos[i] || !Friends()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
+
+		// update foe state
+		m_aClients[i].m_Foe = !(i == m_Snap.m_LocalClientID || !m_Snap.m_apPlayerInfos[i] || !Foes()->IsFriend(m_aClients[i].m_aName, m_aClients[i].m_aClan, true));
+	}
+
+	// sort player infos by name
+	mem_copy(m_Snap.m_apInfoByName, m_Snap.m_apPlayerInfos, sizeof(m_Snap.m_apInfoByName));
+	std::stable_sort(m_Snap.m_apInfoByName, m_Snap.m_apInfoByName + MAX_CLIENTS,
+		[this](const CNetObj_PlayerInfo *p1, const CNetObj_PlayerInfo *p2) -> bool {
+			if(!p2)
+				return static_cast<bool>(p1);
+			if(!p1)
+				return false;
+			return str_comp_nocase(m_aClients[p1->m_ClientID].m_aName, m_aClients[p2->m_ClientID].m_aName) < 0;
+		});
+
+	bool TimeScore = m_GameInfo.m_TimeScore;
+
+	// sort player infos by score
+	mem_copy(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByName, sizeof(m_Snap.m_apInfoByScore));
+	std::stable_sort(m_Snap.m_apInfoByScore, m_Snap.m_apInfoByScore + MAX_CLIENTS,
+		[TimeScore](const CNetObj_PlayerInfo *p1, const CNetObj_PlayerInfo *p2) -> bool {
+			if(!p2)
+				return static_cast<bool>(p1);
+			if(!p1)
+				return false;
+			return (((TimeScore && p1->m_Score == -9999) ? std::numeric_limits<int>::min() : p1->m_Score) >
+				((TimeScore && p2->m_Score == -9999) ? std::numeric_limits<int>::min() : p2->m_Score));
+		});
+
+	// sort player infos by DDRace Team (and score between)
+	int Index = 0;
+	for(int Team = TEAM_FLOCK; Team <= TEAM_SUPER; ++Team)
+	{
+		for(int i = 0; i < MAX_CLIENTS && Index < MAX_CLIENTS; ++i)
+		{
+			if(m_Snap.m_apInfoByScore[i] && m_Teams.Team(m_Snap.m_apInfoByScore[i]->m_ClientID) == Team)
+				m_Snap.m_apInfoByDDTeamScore[Index++] = m_Snap.m_apInfoByScore[i];
+		}
+	}
+
+	// sort player infos by DDRace Team (and name between)
+	Index = 0;
+	for(int Team = TEAM_FLOCK; Team <= TEAM_SUPER; ++Team)
+	{
+		for(int i = 0; i < MAX_CLIENTS && Index < MAX_CLIENTS; ++i)
+		{
+			if(m_Snap.m_apInfoByName[i] && m_Teams.Team(m_Snap.m_apInfoByName[i]->m_ClientID) == Team)
+				m_Snap.m_apInfoByDDTeamName[Index++] = m_Snap.m_apInfoByName[i];
+		}
+	}
+
+	CServerInfo CurrentServerInfo;
+	Client()->GetServerInfo(&CurrentServerInfo);
+	CTuningParams StandardTuning;
+	if(CurrentServerInfo.m_aGameType[0] != '0')
+	{
+		if(str_comp(CurrentServerInfo.m_aGameType, "DM") != 0 && str_comp(CurrentServerInfo.m_aGameType, "TDM") != 0 && str_comp(CurrentServerInfo.m_aGameType, "CTF") != 0)
+			m_ServerMode = SERVERMODE_MOD;
+		else if(mem_comp(&StandardTuning, &m_aTuning[g_Config.m_ClDummy], 33) == 0)
+			m_ServerMode = SERVERMODE_PURE;
+		else
+			m_ServerMode = SERVERMODE_PUREMOD;
+	}
+
+	// add tuning to demo
+	bool AnyRecording = false;
+	for(int i = 0; i < RECORDER_MAX; i++)
+		if(DemoRecorder(i)->IsRecording())
+		{
+			AnyRecording = true;
+			break;
+		}
+	if(AnyRecording && mem_comp(&StandardTuning, &m_aTuning[g_Config.m_ClDummy], sizeof(CTuningParams)) != 0)
+	{
+		CMsgPacker Msg(NETMSGTYPE_SV_TUNEPARAMS);
+		int *pParams = (int *)&m_aTuning[g_Config.m_ClDummy];
+		for(unsigned i = 0; i < sizeof(m_aTuning[0]) / sizeof(int); i++)
+			Msg.AddInt(pParams[i]);
+		Client()->SendMsgActive(&Msg, MSGFLAG_RECORD | MSGFLAG_NOSEND);
+	}
+
+	for(int i = 0; i < 2; i++)
+	{
+		if(m_aDDRaceMsgSent[i] || !m_Snap.m_pLocalInfo)
+		{
+			continue;
+		}
+		if(i == IClient::CONN_DUMMY && !Client()->DummyConnected())
+		{
+			continue;
+		}
+		CMsgPacker Msg(NETMSGTYPE_CL_ISDDNETLEGACY, false);
+		Msg.AddInt(DDNetVersion());
+		Client()->SendMsg(i, &Msg, MSGFLAG_VITAL);
+		m_aDDRaceMsgSent[i] = true;
+	}
+
+	if(m_Snap.m_SpecInfo.m_Active && m_MultiViewActivated)
+	{
+		// dont show other teams while spectating in multi view
+		CNetMsg_Cl_ShowOthers Msg;
+		Msg.m_Show = SHOW_OTHERS_ONLY_TEAM;
+		Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+
+		// update state
+		m_aShowOthers[g_Config.m_ClDummy] = SHOW_OTHERS_ONLY_TEAM;
+	}
+	else if(m_aShowOthers[g_Config.m_ClDummy] == SHOW_OTHERS_NOT_SET || m_aShowOthers[g_Config.m_ClDummy] != g_Config.m_ClShowOthers)
+	{
+		{
+			CNetMsg_Cl_ShowOthers Msg;
+			Msg.m_Show = g_Config.m_ClShowOthers;
+			Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+		}
+
+		// update state
+		m_aShowOthers[g_Config.m_ClDummy] = g_Config.m_ClShowOthers;
+	}
+
+	float ZoomToSend = m_Camera.m_Zoom;
+	if(m_Camera.m_Zooming)
+	{
+		if(m_Camera.m_ZoomSmoothingTarget > m_Camera.m_Zoom) // Zooming out
+			ZoomToSend = m_Camera.m_ZoomSmoothingTarget;
+		else if(m_Camera.m_ZoomSmoothingTarget < m_Camera.m_Zoom && m_LastZoom > 0) // Zooming in
+			ZoomToSend = m_LastZoom;
+	}
+
+	if(ZoomToSend != m_LastZoom || Graphics()->ScreenAspect() != m_LastScreenAspect || (Client()->DummyConnected() && !m_LastDummyConnected))
+	{
+		CNetMsg_Cl_ShowDistance Msg;
+		float x, y;
+		RenderTools()->CalcScreenParams(Graphics()->ScreenAspect(), ZoomToSend, &x, &y);
+		Msg.m_X = x;
+		Msg.m_Y = y;
+		Client()->ChecksumData()->m_Zoom = ZoomToSend;
+		CMsgPacker Packer(&Msg);
+		Msg.Pack(&Packer);
+		if(ZoomToSend != m_LastZoom)
+			Client()->SendMsg(IClient::CONN_MAIN, &Packer, MSGFLAG_VITAL);
+		if(Client()->DummyConnected())
+			Client()->SendMsg(IClient::CONN_DUMMY, &Packer, MSGFLAG_VITAL);
+		m_LastZoom = ZoomToSend;
+		m_LastScreenAspect = Graphics()->ScreenAspect();
+	}
+	m_LastDummyConnected = Client()->DummyConnected();
+
+	for(auto &pComponent : m_vpAll)
+		pComponent->OnNewSnapshot();
+
+	// notify editor when local character moved
+	UpdateEditorIngameMoved();
+
+	// detect air jump for other players
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(m_Snap.m_aCharacters[i].m_Active && (m_Snap.m_aCharacters[i].m_Cur.m_Jumped & 2) && !(m_Snap.m_aCharacters[i].m_Prev.m_Jumped & 2))
+			if(!Predict() || (i != m_Snap.m_LocalClientID && (!AntiPingPlayers() || i != m_PredictedDummyID)))
+			{
+				vec2 Pos = mix(vec2(m_Snap.m_aCharacters[i].m_Prev.m_X, m_Snap.m_aCharacters[i].m_Prev.m_Y),
+					vec2(m_Snap.m_aCharacters[i].m_Cur.m_X, m_Snap.m_aCharacters[i].m_Cur.m_Y),
+					Client()->IntraGameTick(g_Config.m_ClDummy));
+				float Alpha = 1.0f;
+				bool SameTeam = m_Teams.SameTeam(m_Snap.m_LocalClientID, i);
+				if(!SameTeam || m_aClients[i].m_Solo || m_aClients[m_Snap.m_LocalClientID].m_Solo)
+					Alpha = g_Config.m_ClShowOthersAlpha / 100.0f;
+				m_Effects.AirJump(Pos, Alpha);
+			}
+
+	if(m_Snap.m_LocalClientID != m_PrevLocalID)
+		m_PredictedDummyID = m_PrevLocalID;
+	m_PrevLocalID = m_Snap.m_LocalClientID;
+	m_IsDummySwapping = 0;
+
+	SnapCollectEntities(); // creates a collection that associates EntityEx snap items with the entities they belong to
+
+	// update prediction data
+	if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		UpdatePrediction();
+}
+
+void CGameClient::UpdateEditorIngameMoved()
+{
+	const bool LocalCharacterMoved = m_Snap.m_pLocalCharacter && m_Snap.m_pLocalPrevCharacter && (m_Snap.m_pLocalCharacter->m_X != m_Snap.m_pLocalPrevCharacter->m_X || m_Snap.m_pLocalCharacter->m_Y != m_Snap.m_pLocalPrevCharacter->m_Y);
+	if(!g_Config.m_ClEditor)
+	{
+		m_EditorMovementDelay = 5;
+	}
+	else if(m_EditorMovementDelay > 0 && !LocalCharacterMoved)
+	{
+		--m_EditorMovementDelay;
+	}
+	if(m_EditorMovementDelay == 0 && LocalCharacterMoved)
+	{
+		Editor()->OnIngameMoved();
+	}
+}
+
+void CGameClient::OnPredict()
+{
+	// store the previous values so we can detect prediction errors
+	CCharacterCore BeforePrevChar = m_PredictedPrevChar;
+	CCharacterCore BeforeChar = m_PredictedChar;
+
+	// we can't predict without our own id or own character
+	if(m_Snap.m_LocalClientID == -1 || !m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_Active)
+		return;
+
+	// don't predict anything if we are paused
+	if(m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_PAUSED)
+	{
+		if(m_Snap.m_pLocalCharacter)
+		{
+			m_PredictedChar.Read(m_Snap.m_pLocalCharacter);
+			m_PredictedChar.m_ActiveWeapon = m_Snap.m_pLocalCharacter->m_Weapon;
+		}
+		if(m_Snap.m_pLocalPrevCharacter)
+		{
+			m_PredictedPrevChar.Read(m_Snap.m_pLocalPrevCharacter);
+			m_PredictedPrevChar.m_ActiveWeapon = m_Snap.m_pLocalPrevCharacter->m_Weapon;
+		}
+		return;
+	}
+
+	vec2 aBeforeRender[MAX_CLIENTS];
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		aBeforeRender[i] = GetSmoothPos(i);
+
+	// init
+	bool Dummy = g_Config.m_ClDummy ^ m_IsDummySwapping;
+	m_PredictedWorld.CopyWorld(&m_GameWorld);
+
+	// don't predict inactive players, or entities from other teams
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+			if((!m_Snap.m_aCharacters[i].m_Active && pChar->m_SnapTicks > 10) || IsOtherTeam(i))
+				pChar->Destroy();
+
+	CProjectile *pProjNext = 0;
+	for(CProjectile *pProj = (CProjectile *)m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_PROJECTILE); pProj; pProj = pProjNext)
+	{
+		pProjNext = (CProjectile *)pProj->TypeNext();
+		if(IsOtherTeam(pProj->GetOwner()))
+		{
+			pProj->Destroy();
+		}
+	}
+
+	CCharacter *pLocalChar = m_PredictedWorld.GetCharacterByID(m_Snap.m_LocalClientID);
+	if(!pLocalChar)
+		return;
+	CCharacter *pDummyChar = 0;
+	if(PredictDummy())
+		pDummyChar = m_PredictedWorld.GetCharacterByID(m_PredictedDummyID);
+
+	// predict
+	for(int Tick = Client()->GameTick(g_Config.m_ClDummy) + 1; Tick <= Client()->PredGameTick(g_Config.m_ClDummy); Tick++)
+	{
+		// fetch the previous characters
+		if(Tick == Client()->PredGameTick(g_Config.m_ClDummy))
+		{
+			m_PrevPredictedWorld.CopyWorld(&m_PredictedWorld);
+			m_PredictedPrevChar = pLocalChar->GetCore();
+			for(int i = 0; i < MAX_CLIENTS; i++)
+				if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+					m_aClients[i].m_PrevPredicted = pChar->GetCore();
+		}
+
+		// optionally allow some movement in freeze by not predicting freeze the last one to two ticks
+		if(g_Config.m_ClPredictFreeze == 2 && Client()->PredGameTick(g_Config.m_ClDummy) - 1 - Client()->PredGameTick(g_Config.m_ClDummy) % 2 <= Tick)
+			pLocalChar->m_CanMoveInFreeze = true;
+
+		// apply inputs and tick
+		CNetObj_PlayerInput *pInputData = (CNetObj_PlayerInput *)Client()->GetInput(Tick, m_IsDummySwapping);
+		CNetObj_PlayerInput *pDummyInputData = !pDummyChar ? 0 : (CNetObj_PlayerInput *)Client()->GetInput(Tick, m_IsDummySwapping ^ 1);
+		bool DummyFirst = pInputData && pDummyInputData && pDummyChar->GetCID() < pLocalChar->GetCID();
+
+		if(DummyFirst)
+			pDummyChar->OnDirectInput(pDummyInputData);
+		if(pInputData)
+			pLocalChar->OnDirectInput(pInputData);
+		if(pDummyInputData && !DummyFirst)
+			pDummyChar->OnDirectInput(pDummyInputData);
+		m_PredictedWorld.m_GameTick = Tick;
+		if(pInputData)
+			pLocalChar->OnPredictedInput(pInputData);
+		if(pDummyInputData)
+			pDummyChar->OnPredictedInput(pDummyInputData);
+		m_PredictedWorld.Tick();
+
+		// fetch the current characters
+		if(Tick == Client()->PredGameTick(g_Config.m_ClDummy))
+		{
+			m_PredictedChar = pLocalChar->GetCore();
+			for(int i = 0; i < MAX_CLIENTS; i++)
+				if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+					m_aClients[i].m_Predicted = pChar->GetCore();
+		}
+
+		for(int i = 0; i < MAX_CLIENTS; i++)
+			if(CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i))
+			{
+				m_aClients[i].m_aPredPos[Tick % 200] = pChar->Core()->m_Pos;
+				m_aClients[i].m_aPredTick[Tick % 200] = Tick;
+			}
+
+		// check if we want to trigger effects
+		if(Tick > m_aLastNewPredictedTick[Dummy])
+		{
+			m_aLastNewPredictedTick[Dummy] = Tick;
+			m_NewPredictedTick = true;
+			vec2 Pos = pLocalChar->Core()->m_Pos;
+			int Events = pLocalChar->Core()->m_TriggeredEvents;
+			if(g_Config.m_ClPredict && !m_SuppressEvents)
+				if(Events & COREEVENT_AIR_JUMP)
+					m_Effects.AirJump(Pos, 1.0f);
+			if(g_Config.m_SndGame && !m_SuppressEvents)
+			{
+				if(Events & COREEVENT_GROUND_JUMP)
+					m_Sounds.PlayAndRecord(CSounds::CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, Pos);
+				if(Events & COREEVENT_HOOK_ATTACH_GROUND)
+					m_Sounds.PlayAndRecord(CSounds::CHN_WORLD, SOUND_HOOK_ATTACH_GROUND, 1.0f, Pos);
+				if(Events & COREEVENT_HOOK_HIT_NOHOOK)
+					m_Sounds.PlayAndRecord(CSounds::CHN_WORLD, SOUND_HOOK_NOATTACH, 1.0f, Pos);
+			}
+		}
+
+		// check if we want to trigger predicted airjump for dummy
+		if(AntiPingPlayers() && pDummyChar && Tick > m_aLastNewPredictedTick[!Dummy])
+		{
+			m_aLastNewPredictedTick[!Dummy] = Tick;
+			vec2 Pos = pDummyChar->Core()->m_Pos;
+			int Events = pDummyChar->Core()->m_TriggeredEvents;
+			if(g_Config.m_ClPredict && !m_SuppressEvents)
+				if(Events & COREEVENT_AIR_JUMP)
+					m_Effects.AirJump(Pos, 1.0f);
+		}
+	}
+
+	// detect mispredictions of other players and make corrections smoother when possible
+	if(g_Config.m_ClAntiPingSmooth && Predict() && AntiPingPlayers() && m_NewTick && absolute(m_PredictedTick - Client()->PredGameTick(g_Config.m_ClDummy)) <= 1 && absolute(Client()->GameTick(g_Config.m_ClDummy) - Client()->PrevGameTick(g_Config.m_ClDummy)) <= 2)
+	{
+		int PredTime = clamp(Client()->GetPredictionTime(), 0, 800);
+		float SmoothPace = 4 - 1.5f * PredTime / 800.f; // smoothing pace (a lower value will make the smoothing quicker)
+		int64_t Len = 1000 * PredTime * SmoothPace;
+
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(!m_Snap.m_aCharacters[i].m_Active || i == m_Snap.m_LocalClientID || !m_aLastActive[i])
+				continue;
+			vec2 NewPos = (m_PredictedTick == Client()->PredGameTick(g_Config.m_ClDummy)) ? m_aClients[i].m_Predicted.m_Pos : m_aClients[i].m_PrevPredicted.m_Pos;
+			vec2 PredErr = (m_aLastPos[i] - NewPos) / (float)minimum(Client()->GetPredictionTime(), 200);
+			if(in_range(length(PredErr), 0.05f, 5.f))
+			{
+				vec2 PredPos = mix(m_aClients[i].m_PrevPredicted.m_Pos, m_aClients[i].m_Predicted.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+				vec2 CurPos = mix(
+					vec2(m_Snap.m_aCharacters[i].m_Prev.m_X, m_Snap.m_aCharacters[i].m_Prev.m_Y),
+					vec2(m_Snap.m_aCharacters[i].m_Cur.m_X, m_Snap.m_aCharacters[i].m_Cur.m_Y),
+					Client()->IntraGameTick(g_Config.m_ClDummy));
+				vec2 RenderDiff = PredPos - aBeforeRender[i];
+				vec2 PredDiff = PredPos - CurPos;
+
+				float aMixAmount[2];
+				for(int j = 0; j < 2; j++)
+				{
+					aMixAmount[j] = 1.0f;
+					if(absolute(PredErr[j]) > 0.05f)
+					{
+						aMixAmount[j] = 0.0f;
+						if(absolute(RenderDiff[j]) > 0.01f)
+						{
+							aMixAmount[j] = 1.f - clamp(RenderDiff[j] / PredDiff[j], 0.f, 1.f);
+							aMixAmount[j] = 1.f - std::pow(1.f - aMixAmount[j], 1 / 1.2f);
+						}
+					}
+					int64_t TimePassed = time_get() - m_aClients[i].m_aSmoothStart[j];
+					if(in_range(TimePassed, (int64_t)0, Len - 1))
+						aMixAmount[j] = minimum(aMixAmount[j], (float)(TimePassed / (double)Len));
+				}
+				for(int j = 0; j < 2; j++)
+					if(absolute(RenderDiff[j]) < 0.01f && absolute(PredDiff[j]) < 0.01f && absolute(m_aClients[i].m_PrevPredicted.m_Pos[j] - m_aClients[i].m_Predicted.m_Pos[j]) < 0.01f && aMixAmount[j] > aMixAmount[j ^ 1])
+						aMixAmount[j] = aMixAmount[j ^ 1];
+				for(int j = 0; j < 2; j++)
+				{
+					int64_t Remaining = minimum((1.f - aMixAmount[j]) * Len, minimum(time_freq() * 0.700f, (1.f - aMixAmount[j ^ 1]) * Len + time_freq() * 0.300f)); // don't smooth for longer than 700ms, or more than 300ms longer along one axis than the other axis
+					int64_t Start = time_get() - (Len - Remaining);
+					if(!in_range(Start + Len, m_aClients[i].m_aSmoothStart[j], m_aClients[i].m_aSmoothStart[j] + Len))
+					{
+						m_aClients[i].m_aSmoothStart[j] = Start;
+						m_aClients[i].m_aSmoothLen[j] = Len;
+					}
+				}
+			}
+		}
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_Snap.m_aCharacters[i].m_Active)
+		{
+			m_aLastPos[i] = m_aClients[i].m_Predicted.m_Pos;
+			m_aLastActive[i] = true;
+		}
+		else
+			m_aLastActive[i] = false;
+	}
+
+	if(g_Config.m_Debug && g_Config.m_ClPredict && m_PredictedTick == Client()->PredGameTick(g_Config.m_ClDummy))
+	{
+		CNetObj_CharacterCore Before = {0}, Now = {0}, BeforePrev = {0}, NowPrev = {0};
+		BeforeChar.Write(&Before);
+		BeforePrevChar.Write(&BeforePrev);
+		m_PredictedChar.Write(&Now);
+		m_PredictedPrevChar.Write(&NowPrev);
+
+		if(mem_comp(&Before, &Now, sizeof(CNetObj_CharacterCore)) != 0)
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "prediction error");
+			for(unsigned i = 0; i < sizeof(CNetObj_CharacterCore) / sizeof(int); i++)
+				if(((int *)&Before)[i] != ((int *)&Now)[i])
+				{
+					char aBuf[256];
+					str_format(aBuf, sizeof(aBuf), "	%d %d %d (%d %d)", i, ((int *)&Before)[i], ((int *)&Now)[i], ((int *)&BeforePrev)[i], ((int *)&NowPrev)[i]);
+					Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", aBuf);
+				}
+		}
+	}
+
+	m_PredictedTick = Client()->PredGameTick(g_Config.m_ClDummy);
+
+	if(m_NewPredictedTick)
+		m_Ghost.OnNewPredictedSnapshot();
+}
+
+void CGameClient::OnActivateEditor()
+{
+	OnRelease();
+}
+
+CGameClient::CClientStats::CClientStats()
+{
+	Reset();
+}
+
+void CGameClient::CClientStats::Reset()
+{
+	m_JoinTick = 0;
+	m_IngameTicks = 0;
+	m_Active = false;
+	m_Frags = 0;
+	m_Deaths = 0;
+	m_Suicides = 0;
+	m_BestSpree = 0;
+	m_CurrentSpree = 0;
+	for(int j = 0; j < NUM_WEAPONS; j++)
+	{
+		m_aFragsWith[j] = 0;
+		m_aDeathsFrom[j] = 0;
+	}
+	m_FlagGrabs = 0;
+	m_FlagCaptures = 0;
+}
+
+void CGameClient::CClientData::UpdateRenderInfo(bool IsTeamPlay)
+{
+	m_RenderInfo = m_SkinInfo;
+
+	// force team colors
+	if(IsTeamPlay)
+	{
+		m_RenderInfo.m_CustomColoredSkin = true;
+		const int aTeamColors[2] = {65461, 10223541};
+		if(m_Team >= TEAM_RED && m_Team <= TEAM_BLUE)
+		{
+			m_RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(aTeamColors[m_Team]));
+			m_RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(aTeamColors[m_Team]));
+		}
+		else
+		{
+			m_RenderInfo.m_ColorBody = color_cast<ColorRGBA>(ColorHSLA(12829350));
+			m_RenderInfo.m_ColorFeet = color_cast<ColorRGBA>(ColorHSLA(12829350));
+		}
+	}
+}
+
+void CGameClient::CClientData::Reset()
+{
+	m_aName[0] = 0;
+	m_aClan[0] = 0;
+	m_Country = -1;
+	m_Team = 0;
+	m_Angle = 0;
+	m_Emoticon = 0;
+	m_EmoticonStartTick = -1;
+	m_EmoticonStartFraction = 0;
+	m_Active = false;
+	m_ChatIgnore = false;
+	m_EmoticonIgnore = false;
+	m_Friend = false;
+	m_Foe = false;
+	m_AuthLevel = AUTHED_NO;
+	m_Afk = false;
+	m_Paused = false;
+	m_Spec = false;
+	m_SkinInfo.m_BloodColor = ColorRGBA(1, 1, 1);
+	m_SkinInfo.m_ColorableRenderSkin.Reset();
+	m_SkinInfo.m_OriginalRenderSkin.Reset();
+	m_SkinInfo.m_CustomColoredSkin = false;
+	m_SkinInfo.m_ColorBody = ColorRGBA(1, 1, 1);
+	m_SkinInfo.m_ColorFeet = ColorRGBA(1, 1, 1);
+	m_SkinInfo.m_SkinMetrics.Reset();
+
+	m_Solo = false;
+	m_Jetpack = false;
+	m_CollisionDisabled = false;
+	m_EndlessHook = false;
+	m_EndlessJump = false;
+	m_HammerHitDisabled = false;
+	m_GrenadeHitDisabled = false;
+	m_LaserHitDisabled = false;
+	m_ShotgunHitDisabled = false;
+	m_HookHitDisabled = false;
+	m_Super = false;
+	m_HasTelegunGun = false;
+	m_HasTelegunGrenade = false;
+	m_HasTelegunLaser = false;
+	m_FreezeEnd = 0;
+	m_DeepFrozen = false;
+	m_LiveFrozen = false;
+
+	m_Evolved.m_Tick = -1;
+
+	m_SpecChar = vec2(0, 0);
+	m_SpecCharPresent = false;
+
+	mem_zero(m_aSwitchStates, sizeof(m_aSwitchStates));
+
+	UpdateRenderInfo(false);
+}
+
+void CGameClient::SendSwitchTeam(int Team)
+{
+	CNetMsg_Cl_SetTeam Msg;
+	Msg.m_Team = Team;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+
+	if(Team != TEAM_SPECTATORS)
+		m_Camera.OnReset();
+}
+
+void CGameClient::SendInfo(bool Start)
+{
+	if(Start)
+	{
+		CNetMsg_Cl_StartInfo Msg;
+		Msg.m_pName = Client()->PlayerName();
+		Msg.m_pClan = g_Config.m_PlayerClan;
+		Msg.m_Country = g_Config.m_PlayerCountry;
+		Msg.m_pSkin = g_Config.m_ClPlayerSkin;
+		Msg.m_UseCustomColor = g_Config.m_ClPlayerUseCustomColor;
+		Msg.m_ColorBody = g_Config.m_ClPlayerColorBody;
+		Msg.m_ColorFeet = g_Config.m_ClPlayerColorFeet;
+		CMsgPacker Packer(&Msg);
+		Msg.Pack(&Packer);
+		Client()->SendMsg(IClient::CONN_MAIN, &Packer, MSGFLAG_VITAL | MSGFLAG_FLUSH);
+		m_aCheckInfo[0] = -1;
+	}
+	else
+	{
+		CNetMsg_Cl_ChangeInfo Msg;
+		Msg.m_pName = Client()->PlayerName();
+		Msg.m_pClan = g_Config.m_PlayerClan;
+		Msg.m_Country = g_Config.m_PlayerCountry;
+		Msg.m_pSkin = g_Config.m_ClPlayerSkin;
+		Msg.m_UseCustomColor = g_Config.m_ClPlayerUseCustomColor;
+		Msg.m_ColorBody = g_Config.m_ClPlayerColorBody;
+		Msg.m_ColorFeet = g_Config.m_ClPlayerColorFeet;
+		CMsgPacker Packer(&Msg);
+		Msg.Pack(&Packer);
+		Client()->SendMsg(IClient::CONN_MAIN, &Packer, MSGFLAG_VITAL);
+		m_aCheckInfo[0] = Client()->GameTickSpeed();
+	}
+}
+
+void CGameClient::SendDummyInfo(bool Start)
+{
+	if(Start)
+	{
+		CNetMsg_Cl_StartInfo Msg;
+		Msg.m_pName = Client()->DummyName();
+		Msg.m_pClan = g_Config.m_ClDummyClan;
+		Msg.m_Country = g_Config.m_ClDummyCountry;
+		Msg.m_pSkin = g_Config.m_ClDummySkin;
+		Msg.m_UseCustomColor = g_Config.m_ClDummyUseCustomColor;
+		Msg.m_ColorBody = g_Config.m_ClDummyColorBody;
+		Msg.m_ColorFeet = g_Config.m_ClDummyColorFeet;
+		CMsgPacker Packer(&Msg);
+		Msg.Pack(&Packer);
+		Client()->SendMsg(IClient::CONN_DUMMY, &Packer, MSGFLAG_VITAL);
+		m_aCheckInfo[1] = -1;
+	}
+	else
+	{
+		CNetMsg_Cl_ChangeInfo Msg;
+		Msg.m_pName = Client()->DummyName();
+		Msg.m_pClan = g_Config.m_ClDummyClan;
+		Msg.m_Country = g_Config.m_ClDummyCountry;
+		Msg.m_pSkin = g_Config.m_ClDummySkin;
+		Msg.m_UseCustomColor = g_Config.m_ClDummyUseCustomColor;
+		Msg.m_ColorBody = g_Config.m_ClDummyColorBody;
+		Msg.m_ColorFeet = g_Config.m_ClDummyColorFeet;
+		CMsgPacker Packer(&Msg);
+		Msg.Pack(&Packer);
+		Client()->SendMsg(IClient::CONN_DUMMY, &Packer, MSGFLAG_VITAL);
+		m_aCheckInfo[1] = Client()->GameTickSpeed();
+	}
+}
+
+void CGameClient::SendKill(int ClientID) const
+{
+	CNetMsg_Cl_Kill Msg;
+	Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
+
+	if(g_Config.m_ClDummyCopyMoves)
+	{
+		CMsgPacker MsgP(NETMSGTYPE_CL_KILL, false);
+		Client()->SendMsg(!g_Config.m_ClDummy, &MsgP, MSGFLAG_VITAL);
+	}
+}
+
+void CGameClient::ConTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameClient *)pUserData)->SendSwitchTeam(pResult->GetInteger(0));
+}
+
+void CGameClient::ConKill(IConsole::IResult *pResult, void *pUserData)
+{
+	((CGameClient *)pUserData)->SendKill(-1);
+}
+
+void CGameClient::ConchainLanguageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		((CGameClient *)pUserData)->OnLanguageChange();
+}
+
+void CGameClient::ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		((CGameClient *)pUserData)->SendInfo(false);
+}
+
+void CGameClient::ConchainSpecialDummyInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		((CGameClient *)pUserData)->SendDummyInfo(false);
+}
+
+void CGameClient::ConchainSpecialDummy(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+		if(g_Config.m_ClDummy && !((CGameClient *)pUserData)->Client()->DummyConnected())
+			g_Config.m_ClDummy = 0;
+}
+
+void CGameClient::ConchainClTextEntitiesSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+
+	if(pResult->NumArguments())
+	{
+		CGameClient *pGameClient = (CGameClient *)pUserData;
+		pGameClient->m_MapImages.SetTextureScale(g_Config.m_ClTextEntitiesSize);
+	}
+}
+
+IGameClient *CreateGameClient()
+{
+	return new CGameClient();
+}
+
+int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int ownID)
+{
+	float Distance = 0.0f;
+	int ClosestID = -1;
+
+	const CClientData &OwnClientData = m_aClients[ownID];
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(i == ownID)
+			continue;
+
+		const CClientData &cData = m_aClients[i];
+
+		if(!cData.m_Active)
+			continue;
+
+		CNetObj_Character Prev = m_Snap.m_aCharacters[i].m_Prev;
+		CNetObj_Character Player = m_Snap.m_aCharacters[i].m_Cur;
+
+		vec2 Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), Client()->IntraGameTick(g_Config.m_ClDummy));
+
+		bool IsOneSuper = cData.m_Super || OwnClientData.m_Super;
+		bool IsOneSolo = cData.m_Solo || OwnClientData.m_Solo;
+
+		if(!IsOneSuper && (!m_Teams.SameTeam(i, ownID) || IsOneSolo || OwnClientData.m_HookHitDisabled))
+			continue;
+
+		vec2 ClosestPoint;
+		if(closest_point_on_line(HookPos, NewPos, Position, ClosestPoint))
+		{
+			if(distance(Position, ClosestPoint) < CCharacterCore::PhysicalSize() + 2.0f)
+			{
+				if(ClosestID == -1 || distance(HookPos, Position) < Distance)
+				{
+					NewPos2 = ClosestPoint;
+					ClosestID = i;
+					Distance = distance(HookPos, Position);
+				}
+			}
+		}
+	}
+
+	return ClosestID;
+}
+
+ColorRGBA CalculateNameColor(ColorHSLA TextColorHSL)
+{
+	return color_cast<ColorRGBA>(ColorHSLA(TextColorHSL.h, TextColorHSL.s * 0.68f, TextColorHSL.l * 0.81f));
+}
+
+void CGameClient::UpdatePrediction()
+{
+	m_GameWorld.m_WorldConfig.m_IsVanilla = m_GameInfo.m_PredictVanilla;
+	m_GameWorld.m_WorldConfig.m_IsDDRace = m_GameInfo.m_PredictDDRace;
+	m_GameWorld.m_WorldConfig.m_IsFNG = m_GameInfo.m_PredictFNG;
+	m_GameWorld.m_WorldConfig.m_PredictDDRace = m_GameInfo.m_PredictDDRace;
+	m_GameWorld.m_WorldConfig.m_PredictTiles = m_GameInfo.m_PredictDDRace && m_GameInfo.m_PredictDDRaceTiles;
+	m_GameWorld.m_WorldConfig.m_UseTuneZones = m_GameInfo.m_PredictDDRaceTiles;
+	m_GameWorld.m_WorldConfig.m_PredictFreeze = g_Config.m_ClPredictFreeze;
+	m_GameWorld.m_WorldConfig.m_PredictWeapons = AntiPingWeapons();
+	m_GameWorld.m_WorldConfig.m_BugDDRaceInput = m_GameInfo.m_BugDDRaceInput;
+	m_GameWorld.m_WorldConfig.m_NoWeakHookAndBounce = m_GameInfo.m_NoWeakHookAndBounce;
+
+	// always update default tune zone, even without character
+	if(!m_GameWorld.m_WorldConfig.m_UseTuneZones)
+		m_GameWorld.TuningList()[0] = m_aTuning[g_Config.m_ClDummy];
+
+	if(!m_Snap.m_pLocalCharacter)
+	{
+		if(CCharacter *pLocalChar = m_GameWorld.GetCharacterByID(m_Snap.m_LocalClientID))
+			pLocalChar->Destroy();
+		return;
+	}
+
+	if(m_Snap.m_pLocalCharacter->m_AmmoCount > 0 && m_Snap.m_pLocalCharacter->m_Weapon != WEAPON_NINJA)
+		m_GameWorld.m_WorldConfig.m_InfiniteAmmo = false;
+	m_GameWorld.m_WorldConfig.m_IsSolo = !m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData && !m_aTuning[g_Config.m_ClDummy].m_PlayerCollision && !m_aTuning[g_Config.m_ClDummy].m_PlayerHooking;
+
+	// update the tuning/tunezone at the local character position with the latest tunings received before the new snapshot
+	vec2 LocalCharPos = vec2(m_Snap.m_pLocalCharacter->m_X, m_Snap.m_pLocalCharacter->m_Y);
+	m_GameWorld.m_Core.m_aTuning[g_Config.m_ClDummy] = m_aTuning[g_Config.m_ClDummy];
+
+	if(m_GameWorld.m_WorldConfig.m_UseTuneZones)
+	{
+		int TuneZone = Collision()->IsTune(Collision()->GetMapIndex(LocalCharPos));
+
+		if(TuneZone != m_aLocalTuneZone[g_Config.m_ClDummy])
+		{
+			// our tunezone changed, expecting tuning message
+			m_aLocalTuneZone[g_Config.m_ClDummy] = m_aExpectingTuningForZone[g_Config.m_ClDummy] = TuneZone;
+			m_aExpectingTuningSince[g_Config.m_ClDummy] = 0;
+		}
+
+		if(m_aExpectingTuningForZone[g_Config.m_ClDummy] >= 0)
+		{
+			if(m_aReceivedTuning[g_Config.m_ClDummy])
+			{
+				m_GameWorld.TuningList()[m_aExpectingTuningForZone[g_Config.m_ClDummy]] = m_aTuning[g_Config.m_ClDummy];
+				m_aReceivedTuning[g_Config.m_ClDummy] = false;
+				m_aExpectingTuningForZone[g_Config.m_ClDummy] = -1;
+			}
+			else if(m_aExpectingTuningSince[g_Config.m_ClDummy] >= 5)
+			{
+				// if we are expecting tuning for more than 10 snaps (less than a quarter of a second)
+				// it is probably dropped or it was received out of order
+				// or applied to another tunezone.
+				// we need to fallback to current tuning to fix ourselves.
+				m_aExpectingTuningForZone[g_Config.m_ClDummy] = -1;
+				m_aExpectingTuningSince[g_Config.m_ClDummy] = 0;
+				m_aReceivedTuning[g_Config.m_ClDummy] = false;
+				dbg_msg("tunezone", "the tuning was missed");
+			}
+			else
+			{
+				// if we are expecting tuning and have not received one yet.
+				// do not update any tuning, so we don't apply it to the wrong tunezone.
+				dbg_msg("tunezone", "waiting for tuning for zone %d", m_aExpectingTuningForZone[g_Config.m_ClDummy]);
+				m_aExpectingTuningSince[g_Config.m_ClDummy]++;
+			}
+		}
+		else
+		{
+			// if we have processed what we need, and the tuning is still wrong due to out of order messege
+			// fix our tuning by using the current one
+			m_GameWorld.TuningList()[TuneZone] = m_aTuning[g_Config.m_ClDummy];
+			m_aExpectingTuningSince[g_Config.m_ClDummy] = 0;
+			m_aReceivedTuning[g_Config.m_ClDummy] = false;
+		}
+	}
+
+	// if ddnetcharacter is available, ignore server-wide tunings for hook and collision
+	if(m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData)
+	{
+		m_GameWorld.m_Core.m_aTuning[g_Config.m_ClDummy].m_PlayerCollision = 1;
+		m_GameWorld.m_Core.m_aTuning[g_Config.m_ClDummy].m_PlayerHooking = 1;
+	}
+
+	CCharacter *pLocalChar = m_GameWorld.GetCharacterByID(m_Snap.m_LocalClientID);
+	CCharacter *pDummyChar = 0;
+	if(PredictDummy())
+		pDummyChar = m_GameWorld.GetCharacterByID(m_PredictedDummyID);
+
+	// update strong and weak hook
+	if(pLocalChar && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && (m_aTuning[g_Config.m_ClDummy].m_PlayerCollision || m_aTuning[g_Config.m_ClDummy].m_PlayerHooking))
+	{
+		if(m_Snap.m_aCharacters[m_Snap.m_LocalClientID].m_HasExtendedData)
+		{
+			int aIDs[MAX_CLIENTS];
+			for(int &ID : aIDs)
+				ID = -1;
+			for(int i = 0; i < MAX_CLIENTS; i++)
+				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+					aIDs[pChar->GetStrongWeakID()] = i;
+			for(int ID : aIDs)
+				if(ID >= 0)
+					m_CharOrder.GiveStrong(ID);
+		}
+		else
+		{
+			// manual detection
+			DetectStrongHook();
+		}
+		for(int i : m_CharOrder.m_IDs)
+		{
+			if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+			{
+				m_GameWorld.RemoveEntity(pChar);
+				m_GameWorld.InsertEntity(pChar);
+			}
+		}
+	}
+
+	// advance the gameworld to the current gametick
+	if(pLocalChar && absolute(m_GameWorld.GameTick() - Client()->GameTick(g_Config.m_ClDummy)) < Client()->GameTickSpeed())
+	{
+		for(int Tick = m_GameWorld.GameTick() + 1; Tick <= Client()->GameTick(g_Config.m_ClDummy); Tick++)
+		{
+			CNetObj_PlayerInput *pInput = (CNetObj_PlayerInput *)Client()->GetInput(Tick);
+			CNetObj_PlayerInput *pDummyInput = 0;
+			if(pDummyChar)
+				pDummyInput = (CNetObj_PlayerInput *)Client()->GetInput(Tick, 1);
+			if(pInput)
+				pLocalChar->OnDirectInput(pInput);
+			if(pDummyInput)
+				pDummyChar->OnDirectInput(pDummyInput);
+			m_GameWorld.m_GameTick = Tick;
+			if(pInput)
+				pLocalChar->OnPredictedInput(pInput);
+			if(pDummyInput)
+				pDummyChar->OnPredictedInput(pDummyInput);
+			m_GameWorld.Tick();
+
+			for(int i = 0; i < MAX_CLIENTS; i++)
+				if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+				{
+					m_aClients[i].m_aPredPos[Tick % 200] = pChar->Core()->m_Pos;
+					m_aClients[i].m_aPredTick[Tick % 200] = Tick;
+				}
+		}
+	}
+	else
+	{
+		// skip to current gametick
+		m_GameWorld.m_GameTick = Client()->GameTick(g_Config.m_ClDummy);
+		if(pLocalChar)
+			if(CNetObj_PlayerInput *pInput = (CNetObj_PlayerInput *)Client()->GetInput(Client()->GameTick(g_Config.m_ClDummy)))
+				pLocalChar->SetInput(pInput);
+		if(pDummyChar)
+			if(CNetObj_PlayerInput *pInput = (CNetObj_PlayerInput *)Client()->GetInput(Client()->GameTick(g_Config.m_ClDummy), 1))
+				pDummyChar->SetInput(pInput);
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(CCharacter *pChar = m_GameWorld.GetCharacterByID(i))
+		{
+			m_aClients[i].m_aPredPos[Client()->GameTick(g_Config.m_ClDummy) % 200] = pChar->Core()->m_Pos;
+			m_aClients[i].m_aPredTick[Client()->GameTick(g_Config.m_ClDummy) % 200] = Client()->GameTick(g_Config.m_ClDummy);
+		}
+
+	// update the local gameworld with the new snapshot
+	m_GameWorld.NetObjBegin(m_Teams, m_Snap.m_LocalClientID);
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(m_Snap.m_aCharacters[i].m_Active)
+		{
+			bool IsLocal = (i == m_Snap.m_LocalClientID || (PredictDummy() && i == m_PredictedDummyID));
+			int GameTeam = (m_Snap.m_pGameInfoObj && (m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)) ? m_aClients[i].m_Team : i;
+			m_GameWorld.NetCharAdd(i, &m_Snap.m_aCharacters[i].m_Cur,
+				m_Snap.m_aCharacters[i].m_HasExtendedData ? &m_Snap.m_aCharacters[i].m_ExtendedData : 0,
+				GameTeam, IsLocal);
+		}
+
+	for(const CSnapEntities &EntData : SnapEntities())
+		m_GameWorld.NetObjAdd(EntData.m_Item.m_ID, EntData.m_Item.m_Type, EntData.m_pData, EntData.m_pDataEx);
+
+	m_GameWorld.NetObjEnd();
+}
+
+void CGameClient::UpdateRenderedCharacters()
+{
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(!m_Snap.m_aCharacters[i].m_Active)
+			continue;
+		m_aClients[i].m_RenderCur = m_Snap.m_aCharacters[i].m_Cur;
+		m_aClients[i].m_RenderPrev = m_Snap.m_aCharacters[i].m_Prev;
+		m_aClients[i].m_IsPredicted = false;
+		m_aClients[i].m_IsPredictedLocal = false;
+		vec2 UnpredPos = mix(
+			vec2(m_Snap.m_aCharacters[i].m_Prev.m_X, m_Snap.m_aCharacters[i].m_Prev.m_Y),
+			vec2(m_Snap.m_aCharacters[i].m_Cur.m_X, m_Snap.m_aCharacters[i].m_Cur.m_Y),
+			Client()->IntraGameTick(g_Config.m_ClDummy));
+		vec2 Pos = UnpredPos;
+
+		CCharacter *pChar = m_PredictedWorld.GetCharacterByID(i);
+		if(Predict() && (i == m_Snap.m_LocalClientID || (AntiPingPlayers() && !IsOtherTeam(i))) && pChar)
+		{
+			m_aClients[i].m_Predicted.Write(&m_aClients[i].m_RenderCur);
+			m_aClients[i].m_PrevPredicted.Write(&m_aClients[i].m_RenderPrev);
+
+			m_aClients[i].m_IsPredicted = true;
+
+			Pos = mix(
+				vec2(m_aClients[i].m_RenderPrev.m_X, m_aClients[i].m_RenderPrev.m_Y),
+				vec2(m_aClients[i].m_RenderCur.m_X, m_aClients[i].m_RenderCur.m_Y),
+				m_aClients[i].m_IsPredicted ? Client()->PredIntraGameTick(g_Config.m_ClDummy) : Client()->IntraGameTick(g_Config.m_ClDummy));
+
+			if(i == m_Snap.m_LocalClientID)
+			{
+				m_aClients[i].m_IsPredictedLocal = true;
+				if(AntiPingGunfire() && ((pChar->m_NinjaJetpack && pChar->m_FreezeTime == 0) || m_Snap.m_aCharacters[i].m_Cur.m_Weapon != WEAPON_NINJA || m_Snap.m_aCharacters[i].m_Cur.m_Weapon == m_aClients[i].m_Predicted.m_ActiveWeapon))
+				{
+					m_aClients[i].m_RenderCur.m_AttackTick = pChar->GetAttackTick();
+					if(m_Snap.m_aCharacters[i].m_Cur.m_Weapon != WEAPON_NINJA && !(pChar->m_NinjaJetpack && pChar->Core()->m_ActiveWeapon == WEAPON_GUN))
+						m_aClients[i].m_RenderCur.m_Weapon = m_aClients[i].m_Predicted.m_ActiveWeapon;
+				}
+			}
+			else
+			{
+				// use unpredicted values for other players
+				m_aClients[i].m_RenderPrev.m_Angle = m_Snap.m_aCharacters[i].m_Prev.m_Angle;
+				m_aClients[i].m_RenderCur.m_Angle = m_Snap.m_aCharacters[i].m_Cur.m_Angle;
+
+				if(g_Config.m_ClAntiPingSmooth)
+					Pos = GetSmoothPos(i);
+			}
+		}
+		m_Snap.m_aCharacters[i].m_Position = Pos;
+		m_aClients[i].m_RenderPos = Pos;
+		if(Predict() && i == m_Snap.m_LocalClientID)
+			m_LocalCharacterPos = Pos;
+	}
+}
+
+void CGameClient::DetectStrongHook()
+{
+	// attempt to detect strong/weak between players
+	for(int FromPlayer = 0; FromPlayer < MAX_CLIENTS; FromPlayer++)
+	{
+		if(!m_Snap.m_aCharacters[FromPlayer].m_Active)
+			continue;
+		int ToPlayer = m_Snap.m_aCharacters[FromPlayer].m_Prev.m_HookedPlayer;
+		if(ToPlayer < 0 || ToPlayer >= MAX_CLIENTS || !m_Snap.m_aCharacters[ToPlayer].m_Active || ToPlayer != m_Snap.m_aCharacters[FromPlayer].m_Cur.m_HookedPlayer)
+			continue;
+		if(absolute(minimum(m_aLastUpdateTick[ToPlayer], m_aLastUpdateTick[FromPlayer]) - Client()->GameTick(g_Config.m_ClDummy)) < Client()->GameTickSpeed() / 4)
+			continue;
+		if(m_Snap.m_aCharacters[FromPlayer].m_Prev.m_Direction != m_Snap.m_aCharacters[FromPlayer].m_Cur.m_Direction || m_Snap.m_aCharacters[ToPlayer].m_Prev.m_Direction != m_Snap.m_aCharacters[ToPlayer].m_Cur.m_Direction)
+			continue;
+
+		CCharacter *pFromCharWorld = m_GameWorld.GetCharacterByID(FromPlayer);
+		CCharacter *pToCharWorld = m_GameWorld.GetCharacterByID(ToPlayer);
+		if(!pFromCharWorld || !pToCharWorld)
+			continue;
+
+		m_aLastUpdateTick[ToPlayer] = m_aLastUpdateTick[FromPlayer] = Client()->GameTick(g_Config.m_ClDummy);
+
+		float aPredictErr[2];
+		CCharacterCore ToCharCur;
+		ToCharCur.Read(&m_Snap.m_aCharacters[ToPlayer].m_Cur);
+
+		CWorldCore World;
+		World.m_aTuning[g_Config.m_ClDummy] = m_aTuning[g_Config.m_ClDummy];
+
+		for(int dir = 0; dir < 2; dir++)
+		{
+			CCharacterCore ToChar = pFromCharWorld->GetCore();
+			ToChar.Init(&World, Collision(), &m_Teams);
+			World.m_apCharacters[ToPlayer] = &ToChar;
+			ToChar.Read(&m_Snap.m_aCharacters[ToPlayer].m_Prev);
+
+			CCharacterCore FromChar = pFromCharWorld->GetCore();
+			FromChar.Init(&World, Collision(), &m_Teams);
+			World.m_apCharacters[FromPlayer] = &FromChar;
+			FromChar.Read(&m_Snap.m_aCharacters[FromPlayer].m_Prev);
+
+			for(int Tick = Client()->PrevGameTick(g_Config.m_ClDummy); Tick < Client()->GameTick(g_Config.m_ClDummy); Tick++)
+			{
+				if(dir == 0)
+				{
+					FromChar.Tick(false);
+					ToChar.Tick(false);
+				}
+				else
+				{
+					ToChar.Tick(false);
+					FromChar.Tick(false);
+				}
+				FromChar.Move();
+				FromChar.Quantize();
+				ToChar.Move();
+				ToChar.Quantize();
+			}
+			aPredictErr[dir] = distance(ToChar.m_Vel, ToCharCur.m_Vel);
+		}
+		const float LOW = 0.0001f;
+		const float HIGH = 0.07f;
+		if(aPredictErr[1] < LOW && aPredictErr[0] > HIGH)
+		{
+			if(m_CharOrder.HasStrongAgainst(ToPlayer, FromPlayer))
+			{
+				if(ToPlayer != m_Snap.m_LocalClientID)
+					m_CharOrder.GiveWeak(ToPlayer);
+				else
+					m_CharOrder.GiveStrong(FromPlayer);
+			}
+		}
+		else if(aPredictErr[0] < LOW && aPredictErr[1] > HIGH)
+		{
+			if(m_CharOrder.HasStrongAgainst(FromPlayer, ToPlayer))
+			{
+				if(ToPlayer != m_Snap.m_LocalClientID)
+					m_CharOrder.GiveStrong(ToPlayer);
+				else
+					m_CharOrder.GiveWeak(FromPlayer);
+			}
+		}
+	}
+}
+
+vec2 CGameClient::GetSmoothPos(int ClientID)
+{
+	vec2 Pos = mix(m_aClients[ClientID].m_PrevPredicted.m_Pos, m_aClients[ClientID].m_Predicted.m_Pos, Client()->PredIntraGameTick(g_Config.m_ClDummy));
+	int64_t Now = time_get();
+	for(int i = 0; i < 2; i++)
+	{
+		int64_t Len = clamp(m_aClients[ClientID].m_aSmoothLen[i], (int64_t)1, time_freq());
+		int64_t TimePassed = Now - m_aClients[ClientID].m_aSmoothStart[i];
+		if(in_range(TimePassed, (int64_t)0, Len - 1))
+		{
+			float MixAmount = 1.f - std::pow(1.f - TimePassed / (float)Len, 1.2f);
+			int SmoothTick;
+			float SmoothIntra;
+			Client()->GetSmoothTick(&SmoothTick, &SmoothIntra, MixAmount);
+			if(SmoothTick > 0 && m_aClients[ClientID].m_aPredTick[(SmoothTick - 1) % 200] >= Client()->PrevGameTick(g_Config.m_ClDummy) && m_aClients[ClientID].m_aPredTick[SmoothTick % 200] <= Client()->PredGameTick(g_Config.m_ClDummy))
+				Pos[i] = mix(m_aClients[ClientID].m_aPredPos[(SmoothTick - 1) % 200][i], m_aClients[ClientID].m_aPredPos[SmoothTick % 200][i], SmoothIntra);
+		}
+	}
+	return Pos;
+}
+
+void CGameClient::Echo(const char *pString)
+{
+	m_Chat.Echo(pString);
+}
+
+bool CGameClient::IsOtherTeam(int ClientID) const
+{
+	bool Local = m_Snap.m_LocalClientID == ClientID;
+
+	if(m_Snap.m_LocalClientID < 0)
+		return false;
+	else if((m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID == SPEC_FREEVIEW) || ClientID < 0)
+		return false;
+	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
+	{
+		if(m_Teams.Team(ClientID) == TEAM_SUPER || m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID) == TEAM_SUPER)
+			return false;
+		return m_Teams.Team(ClientID) != m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
+	}
+	else if((m_aClients[m_Snap.m_LocalClientID].m_Solo || m_aClients[ClientID].m_Solo) && !Local)
+		return true;
+
+	if(m_Teams.Team(ClientID) == TEAM_SUPER || m_Teams.Team(m_Snap.m_LocalClientID) == TEAM_SUPER)
+		return false;
+
+	return m_Teams.Team(ClientID) != m_Teams.Team(m_Snap.m_LocalClientID);
+}
+
+int CGameClient::SwitchStateTeam() const
+{
+	if(m_aSwitchStateTeam[g_Config.m_ClDummy] >= 0)
+		return m_aSwitchStateTeam[g_Config.m_ClDummy];
+	else if(m_Snap.m_LocalClientID < 0)
+		return 0;
+	else if(m_Snap.m_SpecInfo.m_Active && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
+		return m_Teams.Team(m_Snap.m_SpecInfo.m_SpectatorID);
+	return m_Teams.Team(m_Snap.m_LocalClientID);
+}
+
+bool CGameClient::IsLocalCharSuper() const
+{
+	if(m_Snap.m_LocalClientID < 0)
+		return false;
+	return m_aClients[m_Snap.m_LocalClientID].m_Super;
+}
+
+void CGameClient::LoadGameSkin(const char *pPath, bool AsDir)
+{
+	if(m_GameSkinLoaded)
+	{
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteHealthFull);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteHealthEmpty);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteArmorFull);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteArmorEmpty);
+
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponHammerCursor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGunCursor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponShotgunCursor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGrenadeCursor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponNinjaCursor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponLaserCursor);
+
+		for(auto &SpriteWeaponCursor : m_GameSkin.m_aSpriteWeaponCursors)
+		{
+			SpriteWeaponCursor = IGraphics::CTextureHandle();
+		}
+
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteHookChain);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteHookHead);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponHammer);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGun);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponShotgun);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGrenade);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponNinja);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponLaser);
+
+		for(auto &SpriteWeapon : m_GameSkin.m_aSpriteWeapons)
+		{
+			SpriteWeapon = IGraphics::CTextureHandle();
+		}
+
+		for(auto &SpriteParticle : m_GameSkin.m_aSpriteParticles)
+		{
+			Graphics()->UnloadTexture(&SpriteParticle);
+		}
+
+		for(auto &SpriteStar : m_GameSkin.m_aSpriteStars)
+		{
+			Graphics()->UnloadTexture(&SpriteStar);
+		}
+
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGunProjectile);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponShotgunProjectile);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponGrenadeProjectile);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponHammerProjectile);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponNinjaProjectile);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteWeaponLaserProjectile);
+
+		for(auto &SpriteWeaponProjectile : m_GameSkin.m_aSpriteWeaponProjectiles)
+		{
+			SpriteWeaponProjectile = IGraphics::CTextureHandle();
+		}
+
+		for(int i = 0; i < 3; ++i)
+		{
+			Graphics()->UnloadTexture(&m_GameSkin.m_aSpriteWeaponGunMuzzles[i]);
+			Graphics()->UnloadTexture(&m_GameSkin.m_aSpriteWeaponShotgunMuzzles[i]);
+			Graphics()->UnloadTexture(&m_GameSkin.m_aaSpriteWeaponNinjaMuzzles[i]);
+
+			for(auto &SpriteWeaponsMuzzle : m_GameSkin.m_aaSpriteWeaponsMuzzles)
+			{
+				SpriteWeaponsMuzzle[i] = IGraphics::CTextureHandle();
+			}
+		}
+
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupHealth);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupArmor);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupArmorShotgun);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupArmorGrenade);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupArmorLaser);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupArmorNinja);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupGrenade);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupShotgun);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupLaser);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupNinja);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupGun);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpritePickupHammer);
+
+		for(auto &SpritePickupWeapon : m_GameSkin.m_aSpritePickupWeapons)
+		{
+			SpritePickupWeapon = IGraphics::CTextureHandle();
+		}
+
+		for(auto &SpritePickupWeaponArmor : m_GameSkin.m_aSpritePickupWeaponArmor)
+		{
+			SpritePickupWeaponArmor = IGraphics::CTextureHandle();
+		}
+
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteFlagBlue);
+		Graphics()->UnloadTexture(&m_GameSkin.m_SpriteFlagRed);
+
+		if(m_GameSkin.IsSixup())
+		{
+			Graphics()->UnloadTexture(&m_GameSkin.m_SpriteNinjaBarFullLeft);
+			Graphics()->UnloadTexture(&m_GameSkin.m_SpriteNinjaBarFull);
+			Graphics()->UnloadTexture(&m_GameSkin.m_SpriteNinjaBarEmpty);
+			Graphics()->UnloadTexture(&m_GameSkin.m_SpriteNinjaBarEmptyRight);
+		}
+
+		m_GameSkinLoaded = false;
+	}
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	bool IsDefault = false;
+	if(str_comp(pPath, "default") == 0)
+	{
+		str_copy(aPath, g_pData->m_aImages[IMAGE_GAME].m_pFilename);
+		IsDefault = true;
+	}
+	else
+	{
+		if(AsDir)
+			str_format(aPath, sizeof(aPath), "assets/game/%s/%s", pPath, g_pData->m_aImages[IMAGE_GAME].m_pFilename);
+		else
+			str_format(aPath, sizeof(aPath), "assets/game/%s.png", pPath);
+	}
+
+	CImageInfo ImgInfo;
+	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	if(!PngLoaded && !IsDefault)
+	{
+		if(AsDir)
+			LoadGameSkin("default");
+		else
+			LoadGameSkin(pPath, true);
+	}
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HEALTH_FULL].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	{
+		m_GameSkin.m_SpriteHealthFull = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HEALTH_FULL]);
+		m_GameSkin.m_SpriteHealthEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HEALTH_EMPTY]);
+		m_GameSkin.m_SpriteArmorFull = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_ARMOR_FULL]);
+		m_GameSkin.m_SpriteArmorEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_ARMOR_EMPTY]);
+
+		m_GameSkin.m_SpriteWeaponHammerCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_HAMMER_CURSOR]);
+		m_GameSkin.m_SpriteWeaponGunCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GUN_CURSOR]);
+		m_GameSkin.m_SpriteWeaponShotgunCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_SHOTGUN_CURSOR]);
+		m_GameSkin.m_SpriteWeaponGrenadeCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GRENADE_CURSOR]);
+		m_GameSkin.m_SpriteWeaponNinjaCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_NINJA_CURSOR]);
+		m_GameSkin.m_SpriteWeaponLaserCursor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_LASER_CURSOR]);
+
+		m_GameSkin.m_aSpriteWeaponCursors[0] = m_GameSkin.m_SpriteWeaponHammerCursor;
+		m_GameSkin.m_aSpriteWeaponCursors[1] = m_GameSkin.m_SpriteWeaponGunCursor;
+		m_GameSkin.m_aSpriteWeaponCursors[2] = m_GameSkin.m_SpriteWeaponShotgunCursor;
+		m_GameSkin.m_aSpriteWeaponCursors[3] = m_GameSkin.m_SpriteWeaponGrenadeCursor;
+		m_GameSkin.m_aSpriteWeaponCursors[4] = m_GameSkin.m_SpriteWeaponLaserCursor;
+		m_GameSkin.m_aSpriteWeaponCursors[5] = m_GameSkin.m_SpriteWeaponNinjaCursor;
+
+		// weapons and hook
+		m_GameSkin.m_SpriteHookChain = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HOOK_CHAIN]);
+		m_GameSkin.m_SpriteHookHead = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HOOK_HEAD]);
+		m_GameSkin.m_SpriteWeaponHammer = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_HAMMER_BODY]);
+		m_GameSkin.m_SpriteWeaponGun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GUN_BODY]);
+		m_GameSkin.m_SpriteWeaponShotgun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_SHOTGUN_BODY]);
+		m_GameSkin.m_SpriteWeaponGrenade = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GRENADE_BODY]);
+		m_GameSkin.m_SpriteWeaponNinja = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_NINJA_BODY]);
+		m_GameSkin.m_SpriteWeaponLaser = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_LASER_BODY]);
+
+		m_GameSkin.m_aSpriteWeapons[0] = m_GameSkin.m_SpriteWeaponHammer;
+		m_GameSkin.m_aSpriteWeapons[1] = m_GameSkin.m_SpriteWeaponGun;
+		m_GameSkin.m_aSpriteWeapons[2] = m_GameSkin.m_SpriteWeaponShotgun;
+		m_GameSkin.m_aSpriteWeapons[3] = m_GameSkin.m_SpriteWeaponGrenade;
+		m_GameSkin.m_aSpriteWeapons[4] = m_GameSkin.m_SpriteWeaponLaser;
+		m_GameSkin.m_aSpriteWeapons[5] = m_GameSkin.m_SpriteWeaponNinja;
+
+		// particles
+		for(int i = 0; i < 9; ++i)
+		{
+			m_GameSkin.m_aSpriteParticles[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART1 + i]);
+		}
+
+		// stars
+		for(int i = 0; i < 3; ++i)
+		{
+			m_GameSkin.m_aSpriteStars[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_STAR1 + i]);
+		}
+
+		// projectiles
+		m_GameSkin.m_SpriteWeaponGunProjectile = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GUN_PROJ]);
+		m_GameSkin.m_SpriteWeaponShotgunProjectile = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_SHOTGUN_PROJ]);
+		m_GameSkin.m_SpriteWeaponGrenadeProjectile = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GRENADE_PROJ]);
+
+		// these weapons have no projectiles
+		m_GameSkin.m_SpriteWeaponHammerProjectile = IGraphics::CTextureHandle();
+		m_GameSkin.m_SpriteWeaponNinjaProjectile = IGraphics::CTextureHandle();
+
+		m_GameSkin.m_SpriteWeaponLaserProjectile = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_LASER_PROJ]);
+
+		m_GameSkin.m_aSpriteWeaponProjectiles[0] = m_GameSkin.m_SpriteWeaponHammerProjectile;
+		m_GameSkin.m_aSpriteWeaponProjectiles[1] = m_GameSkin.m_SpriteWeaponGunProjectile;
+		m_GameSkin.m_aSpriteWeaponProjectiles[2] = m_GameSkin.m_SpriteWeaponShotgunProjectile;
+		m_GameSkin.m_aSpriteWeaponProjectiles[3] = m_GameSkin.m_SpriteWeaponGrenadeProjectile;
+		m_GameSkin.m_aSpriteWeaponProjectiles[4] = m_GameSkin.m_SpriteWeaponLaserProjectile;
+		m_GameSkin.m_aSpriteWeaponProjectiles[5] = m_GameSkin.m_SpriteWeaponNinjaProjectile;
+
+		// muzzles
+		for(int i = 0; i < 3; ++i)
+		{
+			m_GameSkin.m_aSpriteWeaponGunMuzzles[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_GUN_MUZZLE1 + i]);
+			m_GameSkin.m_aSpriteWeaponShotgunMuzzles[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_SHOTGUN_MUZZLE1 + i]);
+			m_GameSkin.m_aaSpriteWeaponNinjaMuzzles[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_WEAPON_NINJA_MUZZLE1 + i]);
+
+			m_GameSkin.m_aaSpriteWeaponsMuzzles[1][i] = m_GameSkin.m_aSpriteWeaponGunMuzzles[i];
+			m_GameSkin.m_aaSpriteWeaponsMuzzles[2][i] = m_GameSkin.m_aSpriteWeaponShotgunMuzzles[i];
+			m_GameSkin.m_aaSpriteWeaponsMuzzles[5][i] = m_GameSkin.m_aaSpriteWeaponNinjaMuzzles[i];
+		}
+
+		// pickups
+		m_GameSkin.m_SpritePickupHealth = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_HEALTH]);
+		m_GameSkin.m_SpritePickupArmor = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_ARMOR]);
+		m_GameSkin.m_SpritePickupHammer = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_HAMMER]);
+		m_GameSkin.m_SpritePickupGun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_GUN]);
+		m_GameSkin.m_SpritePickupShotgun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_SHOTGUN]);
+		m_GameSkin.m_SpritePickupGrenade = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_GRENADE]);
+		m_GameSkin.m_SpritePickupLaser = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_LASER]);
+		m_GameSkin.m_SpritePickupNinja = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_NINJA]);
+		m_GameSkin.m_SpritePickupArmorShotgun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_ARMOR_SHOTGUN]);
+		m_GameSkin.m_SpritePickupArmorGrenade = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_ARMOR_GRENADE]);
+		m_GameSkin.m_SpritePickupArmorNinja = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_ARMOR_NINJA]);
+		m_GameSkin.m_SpritePickupArmorLaser = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PICKUP_ARMOR_LASER]);
+
+		m_GameSkin.m_aSpritePickupWeapons[0] = m_GameSkin.m_SpritePickupHammer;
+		m_GameSkin.m_aSpritePickupWeapons[1] = m_GameSkin.m_SpritePickupGun;
+		m_GameSkin.m_aSpritePickupWeapons[2] = m_GameSkin.m_SpritePickupShotgun;
+		m_GameSkin.m_aSpritePickupWeapons[3] = m_GameSkin.m_SpritePickupGrenade;
+		m_GameSkin.m_aSpritePickupWeapons[4] = m_GameSkin.m_SpritePickupLaser;
+		m_GameSkin.m_aSpritePickupWeapons[5] = m_GameSkin.m_SpritePickupNinja;
+
+		m_GameSkin.m_aSpritePickupWeaponArmor[0] = m_GameSkin.m_SpritePickupArmorShotgun;
+		m_GameSkin.m_aSpritePickupWeaponArmor[1] = m_GameSkin.m_SpritePickupArmorGrenade;
+		m_GameSkin.m_aSpritePickupWeaponArmor[2] = m_GameSkin.m_SpritePickupArmorNinja;
+		m_GameSkin.m_aSpritePickupWeaponArmor[3] = m_GameSkin.m_SpritePickupArmorLaser;
+
+		// flags
+		m_GameSkin.m_SpriteFlagBlue = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_FLAG_BLUE]);
+		m_GameSkin.m_SpriteFlagRed = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_FLAG_RED]);
+
+		// ninja bar (0.7)
+		if(!Graphics()->IsSpriteTextureFullyTransparent(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_FULL_LEFT]) ||
+			!Graphics()->IsSpriteTextureFullyTransparent(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_FULL]) ||
+			!Graphics()->IsSpriteTextureFullyTransparent(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_EMPTY]) ||
+			!Graphics()->IsSpriteTextureFullyTransparent(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_EMPTY_RIGHT]))
+		{
+			m_GameSkin.m_SpriteNinjaBarFullLeft = Graphics()->LoadSpriteTexture(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_FULL_LEFT]);
+			m_GameSkin.m_SpriteNinjaBarFull = Graphics()->LoadSpriteTexture(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_FULL]);
+			m_GameSkin.m_SpriteNinjaBarEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_EMPTY]);
+			m_GameSkin.m_SpriteNinjaBarEmptyRight = Graphics()->LoadSpriteTexture(ImgInfo, &client_data7::g_pData->m_aSprites[client_data7::SPRITE_NINJA_BAR_EMPTY_RIGHT]);
+		}
+
+		m_GameSkinLoaded = true;
+
+		Graphics()->FreePNG(&ImgInfo);
+	}
+}
+
+void CGameClient::LoadEmoticonsSkin(const char *pPath, bool AsDir)
+{
+	if(m_EmoticonsSkinLoaded)
+	{
+		for(auto &SpriteEmoticon : m_EmoticonsSkin.m_aSpriteEmoticons)
+			Graphics()->UnloadTexture(&SpriteEmoticon);
+
+		m_EmoticonsSkinLoaded = false;
+	}
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	bool IsDefault = false;
+	if(str_comp(pPath, "default") == 0)
+	{
+		str_copy(aPath, g_pData->m_aImages[IMAGE_EMOTICONS].m_pFilename);
+		IsDefault = true;
+	}
+	else
+	{
+		if(AsDir)
+			str_format(aPath, sizeof(aPath), "assets/emoticons/%s/%s", pPath, g_pData->m_aImages[IMAGE_EMOTICONS].m_pFilename);
+		else
+			str_format(aPath, sizeof(aPath), "assets/emoticons/%s.png", pPath);
+	}
+
+	CImageInfo ImgInfo;
+	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	if(!PngLoaded && !IsDefault)
+	{
+		if(AsDir)
+			LoadEmoticonsSkin("default");
+		else
+			LoadEmoticonsSkin(pPath, true);
+	}
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_OOP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	{
+		for(int i = 0; i < 16; ++i)
+			m_EmoticonsSkin.m_aSpriteEmoticons[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_OOP + i]);
+
+		m_EmoticonsSkinLoaded = true;
+		Graphics()->FreePNG(&ImgInfo);
+	}
+}
+
+void CGameClient::LoadParticlesSkin(const char *pPath, bool AsDir)
+{
+	if(m_ParticlesSkinLoaded)
+	{
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleSlice);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleBall);
+		for(auto &SpriteParticleSplat : m_ParticlesSkin.m_aSpriteParticleSplat)
+			Graphics()->UnloadTexture(&SpriteParticleSplat);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleSmoke);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleShell);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleExpl);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleAirJump);
+		Graphics()->UnloadTexture(&m_ParticlesSkin.m_SpriteParticleHit);
+
+		for(auto &SpriteParticle : m_ParticlesSkin.m_aSpriteParticles)
+			SpriteParticle = IGraphics::CTextureHandle();
+
+		m_ParticlesSkinLoaded = false;
+	}
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	bool IsDefault = false;
+	if(str_comp(pPath, "default") == 0)
+	{
+		str_copy(aPath, g_pData->m_aImages[IMAGE_PARTICLES].m_pFilename);
+		IsDefault = true;
+	}
+	else
+	{
+		if(AsDir)
+			str_format(aPath, sizeof(aPath), "assets/particles/%s/%s", pPath, g_pData->m_aImages[IMAGE_PARTICLES].m_pFilename);
+		else
+			str_format(aPath, sizeof(aPath), "assets/particles/%s.png", pPath);
+	}
+
+	CImageInfo ImgInfo;
+	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	if(!PngLoaded && !IsDefault)
+	{
+		if(AsDir)
+			LoadParticlesSkin("default");
+		else
+			LoadParticlesSkin(pPath, true);
+	}
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SLICE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	{
+		m_ParticlesSkin.m_SpriteParticleSlice = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SLICE]);
+		m_ParticlesSkin.m_SpriteParticleBall = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_BALL]);
+		for(int i = 0; i < 3; ++i)
+			m_ParticlesSkin.m_aSpriteParticleSplat[i] = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SPLAT01 + i]);
+		m_ParticlesSkin.m_SpriteParticleSmoke = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SMOKE]);
+		m_ParticlesSkin.m_SpriteParticleShell = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SHELL]);
+		m_ParticlesSkin.m_SpriteParticleExpl = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_EXPL01]);
+		m_ParticlesSkin.m_SpriteParticleAirJump = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_AIRJUMP]);
+		m_ParticlesSkin.m_SpriteParticleHit = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_HIT01]);
+
+		m_ParticlesSkin.m_aSpriteParticles[0] = m_ParticlesSkin.m_SpriteParticleSlice;
+		m_ParticlesSkin.m_aSpriteParticles[1] = m_ParticlesSkin.m_SpriteParticleBall;
+		for(int i = 0; i < 3; ++i)
+			m_ParticlesSkin.m_aSpriteParticles[2 + i] = m_ParticlesSkin.m_aSpriteParticleSplat[i];
+		m_ParticlesSkin.m_aSpriteParticles[5] = m_ParticlesSkin.m_SpriteParticleSmoke;
+		m_ParticlesSkin.m_aSpriteParticles[6] = m_ParticlesSkin.m_SpriteParticleShell;
+		m_ParticlesSkin.m_aSpriteParticles[7] = m_ParticlesSkin.m_SpriteParticleExpl;
+		m_ParticlesSkin.m_aSpriteParticles[8] = m_ParticlesSkin.m_SpriteParticleAirJump;
+		m_ParticlesSkin.m_aSpriteParticles[9] = m_ParticlesSkin.m_SpriteParticleHit;
+
+		m_ParticlesSkinLoaded = true;
+		free(ImgInfo.m_pData);
+	}
+}
+
+void CGameClient::LoadHudSkin(const char *pPath, bool AsDir)
+{
+	if(m_HudSkinLoaded)
+	{
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudAirjump);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudAirjumpEmpty);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudSolo);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudCollisionDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudEndlessJump);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudEndlessHook);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudJetpack);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudFreezeBarFullLeft);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudFreezeBarFull);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudFreezeBarEmpty);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudFreezeBarEmptyRight);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudNinjaBarFullLeft);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudNinjaBarFull);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudNinjaBarEmpty);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudNinjaBarEmptyRight);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudHookHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudHammerHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudShotgunHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudGrenadeHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudLaserHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudGunHitDisabled);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudDeepFrozen);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudLiveFrozen);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeleportGrenade);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeleportGun);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudTeleportLaser);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudPracticeMode);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudDummyHammer);
+		Graphics()->UnloadTexture(&m_HudSkin.m_SpriteHudDummyCopy);
+		m_HudSkinLoaded = false;
+	}
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	bool IsDefault = false;
+	if(str_comp(pPath, "default") == 0)
+	{
+		str_copy(aPath, g_pData->m_aImages[IMAGE_HUD].m_pFilename);
+		IsDefault = true;
+	}
+	else
+	{
+		if(AsDir)
+			str_format(aPath, sizeof(aPath), "assets/hud/%s/%s", pPath, g_pData->m_aImages[IMAGE_HUD].m_pFilename);
+		else
+			str_format(aPath, sizeof(aPath), "assets/hud/%s.png", pPath);
+	}
+
+	CImageInfo ImgInfo;
+	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	if(!PngLoaded && !IsDefault)
+	{
+		if(AsDir)
+			LoadHudSkin("default");
+		else
+			LoadHudSkin(pPath, true);
+	}
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_HUD_AIRJUMP].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	{
+		m_HudSkin.m_SpriteHudAirjump = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_AIRJUMP]);
+		m_HudSkin.m_SpriteHudAirjumpEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_AIRJUMP_EMPTY]);
+		m_HudSkin.m_SpriteHudSolo = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_SOLO]);
+		m_HudSkin.m_SpriteHudCollisionDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_COLLISION_DISABLED]);
+		m_HudSkin.m_SpriteHudEndlessJump = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_ENDLESS_JUMP]);
+		m_HudSkin.m_SpriteHudEndlessHook = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_ENDLESS_HOOK]);
+		m_HudSkin.m_SpriteHudJetpack = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_JETPACK]);
+		m_HudSkin.m_SpriteHudFreezeBarFullLeft = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_FREEZE_BAR_FULL_LEFT]);
+		m_HudSkin.m_SpriteHudFreezeBarFull = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_FREEZE_BAR_FULL]);
+		m_HudSkin.m_SpriteHudFreezeBarEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_FREEZE_BAR_EMPTY]);
+		m_HudSkin.m_SpriteHudFreezeBarEmptyRight = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_FREEZE_BAR_EMPTY_RIGHT]);
+		m_HudSkin.m_SpriteHudNinjaBarFullLeft = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_NINJA_BAR_FULL_LEFT]);
+		m_HudSkin.m_SpriteHudNinjaBarFull = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_NINJA_BAR_FULL]);
+		m_HudSkin.m_SpriteHudNinjaBarEmpty = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_NINJA_BAR_EMPTY]);
+		m_HudSkin.m_SpriteHudNinjaBarEmptyRight = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_NINJA_BAR_EMPTY_RIGHT]);
+		m_HudSkin.m_SpriteHudHookHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_HOOK_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudHammerHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_HAMMER_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudShotgunHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_SHOTGUN_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudGrenadeHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_GRENADE_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudLaserHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_LASER_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudGunHitDisabled = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_GUN_HIT_DISABLED]);
+		m_HudSkin.m_SpriteHudDeepFrozen = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_DEEP_FROZEN]);
+		m_HudSkin.m_SpriteHudLiveFrozen = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_LIVE_FROZEN]);
+		m_HudSkin.m_SpriteHudTeleportGrenade = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TELEPORT_GRENADE]);
+		m_HudSkin.m_SpriteHudTeleportGun = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TELEPORT_GUN]);
+		m_HudSkin.m_SpriteHudTeleportLaser = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_TELEPORT_LASER]);
+		m_HudSkin.m_SpriteHudPracticeMode = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_PRACTICE_MODE]);
+		m_HudSkin.m_SpriteHudDummyHammer = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_DUMMY_HAMMER]);
+		m_HudSkin.m_SpriteHudDummyCopy = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_HUD_DUMMY_COPY]);
+
+		m_HudSkinLoaded = true;
+		free(ImgInfo.m_pData);
+	}
+}
+
+void CGameClient::LoadExtrasSkin(const char *pPath, bool AsDir)
+{
+	if(m_ExtrasSkinLoaded)
+	{
+		Graphics()->UnloadTexture(&m_ExtrasSkin.m_SpriteParticleSnowflake);
+
+		for(auto &SpriteParticle : m_ExtrasSkin.m_aSpriteParticles)
+			SpriteParticle = IGraphics::CTextureHandle();
+
+		m_ExtrasSkinLoaded = false;
+	}
+
+	char aPath[IO_MAX_PATH_LENGTH];
+	bool IsDefault = false;
+	if(str_comp(pPath, "default") == 0)
+	{
+		str_copy(aPath, g_pData->m_aImages[IMAGE_EXTRAS].m_pFilename);
+		IsDefault = true;
+	}
+	else
+	{
+		if(AsDir)
+			str_format(aPath, sizeof(aPath), "assets/extras/%s/%s", pPath, g_pData->m_aImages[IMAGE_EXTRAS].m_pFilename);
+		else
+			str_format(aPath, sizeof(aPath), "assets/extras/%s.png", pPath);
+	}
+
+	CImageInfo ImgInfo;
+	bool PngLoaded = Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
+	if(!PngLoaded && !IsDefault)
+	{
+		if(AsDir)
+			LoadExtrasSkin("default");
+		else
+			LoadExtrasSkin(pPath, true);
+	}
+	else if(PngLoaded && Graphics()->CheckImageDivisibility(aPath, ImgInfo, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridx, g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE].m_pSet->m_Gridy, true) && Graphics()->IsImageFormatRGBA(aPath, ImgInfo))
+	{
+		m_ExtrasSkin.m_SpriteParticleSnowflake = Graphics()->LoadSpriteTexture(ImgInfo, &g_pData->m_aSprites[SPRITE_PART_SNOWFLAKE]);
+		m_ExtrasSkin.m_aSpriteParticles[0] = m_ExtrasSkin.m_SpriteParticleSnowflake;
+		m_ExtrasSkinLoaded = true;
+		free(ImgInfo.m_pData);
+	}
+}
+
+void CGameClient::RefindSkins()
+{
+	for(auto &Client : m_aClients)
+	{
+		Client.m_SkinInfo.m_OriginalRenderSkin.Reset();
+		Client.m_SkinInfo.m_ColorableRenderSkin.Reset();
+		if(Client.m_aSkinName[0] != '\0')
+		{
+			const CSkin *pSkin = m_Skins.Find(Client.m_aSkinName);
+			Client.m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			Client.m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+		}
+		else
+		{
+			Client.m_SkinInfo.m_OriginalRenderSkin.Reset();
+			Client.m_SkinInfo.m_ColorableRenderSkin.Reset();
+		}
+		Client.UpdateRenderInfo(IsTeamPlay());
+	}
+	m_Ghost.RefindSkins();
+	m_Chat.RefindSkins();
+	m_InfoMessages.RefindSkins();
+}
+
+static bool UnknownMapSettingCallback(const char *pCommand, void *pUser)
+{
+	return true;
+}
+
+void CGameClient::LoadMapSettings()
+{
+	// Reset Tunezones
+	CTuningParams TuningParams;
+	for(int i = 0; i < NUM_TUNEZONES; i++)
+	{
+		TuningList()[i] = TuningParams;
+		TuningList()[i].Set("gun_curvature", 0);
+		TuningList()[i].Set("gun_speed", 1400);
+		TuningList()[i].Set("shotgun_curvature", 0);
+		TuningList()[i].Set("shotgun_speed", 500);
+		TuningList()[i].Set("shotgun_speeddiff", 0);
+	}
+
+	// Load map tunings
+	IMap *pMap = Kernel()->RequestInterface<IMap>();
+	int Start, Num;
+	pMap->GetType(MAPITEMTYPE_INFO, &Start, &Num);
+	for(int i = Start; i < Start + Num; i++)
+	{
+		int ItemID;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemID);
+		int ItemSize = pMap->GetItemSize(i);
+		if(!pItem || ItemID != 0)
+			continue;
+
+		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
+			break;
+		if(!(pItem->m_Settings > -1))
+			break;
+
+		int Size = pMap->GetDataSize(pItem->m_Settings);
+		char *pSettings = (char *)pMap->GetData(pItem->m_Settings);
+		char *pNext = pSettings;
+		Console()->SetUnknownCommandCallback(UnknownMapSettingCallback, nullptr);
+		while(pNext < pSettings + Size)
+		{
+			int StrSize = str_length(pNext) + 1;
+			Console()->ExecuteLine(pNext, IConsole::CLIENT_ID_GAME);
+			pNext += StrSize;
+		}
+		Console()->SetUnknownCommandCallback(IConsole::EmptyUnknownCommandCallback, nullptr);
+		pMap->UnloadData(pItem->m_Settings);
+		break;
+	}
+}
+
+void CGameClient::ConTuneZone(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameClient *pSelf = (CGameClient *)pUserData;
+	int List = pResult->GetInteger(0);
+	const char *pParamName = pResult->GetString(1);
+	float NewValue = pResult->GetFloat(2);
+
+	if(List >= 0 && List < NUM_TUNEZONES)
+		pSelf->TuningList()[List].Set(pParamName, NewValue);
+}
+
+void CGameClient::ConchainMenuMap(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	CGameClient *pSelf = (CGameClient *)pUserData;
+	if(pResult->NumArguments())
+	{
+		if(str_comp(g_Config.m_ClMenuMap, pResult->GetString(0)) != 0)
+		{
+			str_copy(g_Config.m_ClMenuMap, pResult->GetString(0));
+			pSelf->m_MenuBackground.LoadMenuBackground();
+		}
+	}
+	else
+		pfnCallback(pResult, pCallbackUserData);
+}
+
+void CGameClient::DummyResetInput()
+{
+	if(!Client()->DummyConnected())
+		return;
+
+	if((m_DummyInput.m_Fire & 1) != 0)
+		m_DummyInput.m_Fire++;
+
+	m_Controls.ResetInput(!g_Config.m_ClDummy);
+	m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Hook = 0;
+	m_Controls.m_aInputData[!g_Config.m_ClDummy].m_Fire = m_DummyInput.m_Fire;
+
+	m_DummyInput = m_Controls.m_aInputData[!g_Config.m_ClDummy];
+}
+
+bool CGameClient::CanDisplayWarning() const
+{
+	return m_Menus.CanDisplayWarning();
+}
+
+bool CGameClient::IsDisplayingWarning() const
+{
+	return m_Menus.GetCurPopup() == CMenus::POPUP_WARNING;
+}
+
+CNetObjHandler *CGameClient::GetNetObjHandler()
+{
+	return &m_NetObjHandler;
+}
+
+void CGameClient::SnapCollectEntities()
+{
+	int NumSnapItems = Client()->SnapNumItems(IClient::SNAP_CURRENT);
+
+	std::vector<CSnapEntities> vItemData;
+	std::vector<CSnapEntities> vItemEx;
+
+	for(int Index = 0; Index < NumSnapItems; Index++)
+	{
+		IClient::CSnapItem Item;
+		const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index, &Item);
+		if(Item.m_Type == NETOBJTYPE_ENTITYEX)
+			vItemEx.push_back({Item, pData, 0});
+		else if(Item.m_Type == NETOBJTYPE_PICKUP || Item.m_Type == NETOBJTYPE_DDNETPICKUP || Item.m_Type == NETOBJTYPE_LASER || Item.m_Type == NETOBJTYPE_DDNETLASER || Item.m_Type == NETOBJTYPE_PROJECTILE || Item.m_Type == NETOBJTYPE_DDRACEPROJECTILE || Item.m_Type == NETOBJTYPE_DDNETPROJECTILE)
+			vItemData.push_back({Item, pData, 0});
+	}
+
+	// sort by id
+	class CEntComparer
+	{
+	public:
+		bool operator()(const CSnapEntities &lhs, const CSnapEntities &rhs) const
+		{
+			return lhs.m_Item.m_ID < rhs.m_Item.m_ID;
+		}
+	};
+
+	std::sort(vItemData.begin(), vItemData.end(), CEntComparer());
+	std::sort(vItemEx.begin(), vItemEx.end(), CEntComparer());
+
+	// merge extended items with items they belong to
+	m_vSnapEntities.clear();
+
+	size_t IndexEx = 0;
+	for(const CSnapEntities &Ent : vItemData)
+	{
+		const CNetObj_EntityEx *pDataEx = 0;
+		while(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_ID < Ent.m_Item.m_ID)
+			IndexEx++;
+		if(IndexEx < vItemEx.size() && vItemEx[IndexEx].m_Item.m_ID == Ent.m_Item.m_ID)
+			pDataEx = (const CNetObj_EntityEx *)vItemEx[IndexEx].m_pData;
+
+		m_vSnapEntities.push_back({Ent.m_Item, Ent.m_pData, pDataEx});
+	}
+}
+
+void CGameClient::HandleMultiView()
+{
+	bool IsTeamZero = IsMultiViewIdSet();
+	bool Init = false;
+	int AmountPlayers = 0;
+	vec2 Minpos, Maxpos;
+	float TmpVel = 0.0f;
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		// look at players who are vanished
+		if(m_MultiView.m_aVanish[i])
+		{
+			// not in freeze anymore and the delay is over
+			if(m_MultiView.m_aLastFreeze[i] + 6.0f <= Client()->LocalTime() && m_aClients[i].m_FreezeEnd == 0)
+			{
+				m_MultiView.m_aVanish[i] = false;
+				m_MultiView.m_aLastFreeze[i] = 0.0f;
+			}
+		}
+
+		// we look at team 0 and the player is not in the spec list
+		if(IsTeamZero && !m_aMultiViewId[i])
+			continue;
+
+		// player is vanished
+		if(m_MultiView.m_aVanish[i])
+			continue;
+
+		// the player is not in the team we are spectating
+		if(m_Teams.Team(i) != m_MultiViewTeam)
+			continue;
+
+		vec2 PlayerPos;
+		if(m_Snap.m_aCharacters[i].m_Active)
+			PlayerPos = vec2(m_aClients[i].m_RenderPos.x, m_aClients[i].m_RenderPos.y);
+		else if(m_aClients[i].m_Spec) // tee is in spec
+			PlayerPos = m_aClients[i].m_SpecChar;
+		else
+			continue;
+
+		// player is far away and frozen
+		if(distance(m_MultiView.m_OldPos, PlayerPos) > 1100 && m_aClients[i].m_FreezeEnd != 0)
+		{
+			// check if the player is frozen for more than 3 seconds, if so vanish him
+			if(m_MultiView.m_aLastFreeze[i] == 0.0f)
+				m_MultiView.m_aLastFreeze[i] = Client()->LocalTime();
+			else if(m_MultiView.m_aLastFreeze[i] + 3.0f <= Client()->LocalTime())
+			{
+				m_MultiView.m_aVanish[i] = true;
+				// player we want to be vanished is our "main" tee, so lets switch the tee
+				if(i == m_Snap.m_SpecInfo.m_SpectatorID)
+					m_Spectator.Spectate(FindFirstMultiViewId());
+			}
+		}
+		else if(m_MultiView.m_aLastFreeze[i] != 0)
+			m_MultiView.m_aLastFreeze[i] = 0;
+
+		// set the minimum and maximum position
+		if(!Init)
+		{
+			Minpos = PlayerPos;
+			Maxpos = PlayerPos;
+			Init = true;
+		}
+		else
+		{
+			Minpos.x = std::min(Minpos.x, PlayerPos.x);
+			Maxpos.x = std::max(Maxpos.x, PlayerPos.x);
+			Minpos.y = std::min(Minpos.y, PlayerPos.y);
+			Maxpos.y = std::max(Maxpos.y, PlayerPos.y);
+		}
+
+		// sum up the velocity of all players we are spectating
+		const CNetObj_Character &CurrentCharacter = m_Snap.m_aCharacters[i].m_Cur;
+		TmpVel += (length(vec2(CurrentCharacter.m_VelX / 256.0f, CurrentCharacter.m_VelY / 256.0f)) * 50) / 32.0f;
+		AmountPlayers++;
+	}
+
+	// if we have found no players, we disable multi view
+	if(AmountPlayers == 0)
+	{
+		if(m_MultiView.m_SecondChance == 0.0f)
+			m_MultiView.m_SecondChance = Client()->LocalTime() + 0.3f;
+		else if(m_MultiView.m_SecondChance < Client()->LocalTime())
+		{
+			ResetMultiView();
+			return;
+		}
+		return;
+	}
+	else if(m_MultiView.m_SecondChance != 0.0f)
+		m_MultiView.m_SecondChance = 0.0f;
+
+	// if we only have one tee that's in the list, we activate solo-mode
+	m_MultiView.m_Solo = std::count(std::begin(m_aMultiViewId), std::end(m_aMultiViewId), true) == 1;
+
+	vec2 TargetPos = vec2((Minpos.x + Maxpos.x) / 2.0f, (Minpos.y + Maxpos.y) / 2.0f);
+	// dont hide the position hud if its only one player
+	m_MultiViewShowHud = AmountPlayers == 1;
+	// get the average velocity
+	float AvgVel = clamp(TmpVel / AmountPlayers ? TmpVel / (float)AmountPlayers : 0.0f, 0.0f, 1000.0f);
+
+	if(m_MultiView.m_OldPersonalZoom == m_MultiViewPersonalZoom)
+		m_Camera.SetZoom(CalculateMultiViewZoom(Minpos, Maxpos, AvgVel), g_Config.m_ClMultiViewZoomSmoothness);
+	else
+		m_Camera.SetZoom(CalculateMultiViewZoom(Minpos, Maxpos, AvgVel), 50);
+
+	m_Snap.m_SpecInfo.m_Position = m_MultiView.m_OldPos + ((TargetPos - m_MultiView.m_OldPos) * CalculateMultiViewMultiplier(TargetPos));
+	m_MultiView.m_OldPos = m_Snap.m_SpecInfo.m_Position;
+	m_Snap.m_SpecInfo.m_UsePosition = true;
+}
+
+bool CGameClient::InitMultiView(int Team)
+{
+	float Width, Height;
+	CleanMultiViewIds();
+	m_MultiView.m_IsInit = true;
+
+	// get the current view coordinates
+	RenderTools()->CalcScreenParams(Graphics()->ScreenAspect(), m_Camera.m_Zoom, &Width, &Height);
+	vec2 AxisX = vec2(m_Camera.m_Center.x - (Width / 2), m_Camera.m_Center.x + (Width / 2));
+	vec2 AxisY = vec2(m_Camera.m_Center.y - (Height / 2), m_Camera.m_Center.y + (Height / 2));
+
+	if(Team > 0)
+	{
+		m_MultiViewTeam = Team;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+			m_aMultiViewId[i] = m_Teams.Team(i) == Team;
+	}
+	else
+	{
+		// we want to allow spectating players in teams directly if there is no other team on screen
+		// to do that, -1 is used temporarily for "we don't know which team to spectate yet"
+		m_MultiViewTeam = -1;
+
+		int Count = 0;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			vec2 PlayerPos;
+
+			// get the position of the player
+			if(m_Snap.m_aCharacters[i].m_Active)
+				PlayerPos = vec2(m_Snap.m_aCharacters[i].m_Cur.m_X, m_Snap.m_aCharacters[i].m_Cur.m_Y);
+			else if(m_aClients[i].m_Spec)
+				PlayerPos = m_aClients[i].m_SpecChar;
+			else
+				continue;
+
+			if(PlayerPos.x == 0 || PlayerPos.y == 0)
+				continue;
+
+			// skip players that aren't in view
+			if(PlayerPos.x <= AxisX.x || PlayerPos.x >= AxisX.y || PlayerPos.y <= AxisY.x || PlayerPos.y >= AxisY.y)
+				continue;
+
+			if(m_MultiViewTeam == -1)
+			{
+				// use the current player's team for now, but it might switch to team 0 if any other team is found
+				m_MultiViewTeam = m_Teams.Team(i);
+			}
+			else if(m_MultiViewTeam != 0 && m_Teams.Team(i) != m_MultiViewTeam)
+			{
+				// mismatched teams; remove all previously added players again and switch to team 0 instead
+				std::fill_n(m_aMultiViewId, i, false);
+				m_MultiViewTeam = 0;
+			}
+
+			m_aMultiViewId[i] = true;
+			Count++;
+		}
+
+		// might still be -1 if not a single player was in view; fallback to team 0 in that case
+		if(m_MultiViewTeam == -1)
+			m_MultiViewTeam = 0;
+
+		// we are spectating only one player
+		m_MultiView.m_Solo = Count == 1;
+	}
+
+	if(IsMultiViewIdSet())
+	{
+		int SpectatorID = m_Snap.m_SpecInfo.m_SpectatorID;
+		int NewSpectatorID = -1;
+
+		vec2 CurPosition(m_Camera.m_Center);
+		if(SpectatorID != SPEC_FREEVIEW)
+		{
+			const CNetObj_Character &CurCharacter = m_Snap.m_aCharacters[SpectatorID].m_Cur;
+			CurPosition.x = CurCharacter.m_X;
+			CurPosition.y = CurCharacter.m_Y;
+		}
+
+		int ClosestDistance = INT_MAX;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(!m_Snap.m_apPlayerInfos[i] || m_Snap.m_apPlayerInfos[i]->m_Team == TEAM_SPECTATORS || m_Teams.Team(i) != m_MultiViewTeam)
+				continue;
+
+			vec2 PlayerPos;
+			if(m_Snap.m_aCharacters[i].m_Active)
+				PlayerPos = vec2(m_aClients[i].m_RenderPos.x, m_aClients[i].m_RenderPos.y);
+			else if(m_aClients[i].m_Spec) // tee is in spec
+				PlayerPos = m_aClients[i].m_SpecChar;
+			else
+				continue;
+
+			int Distance = distance(CurPosition, PlayerPos);
+			if(NewSpectatorID == -1 || Distance < ClosestDistance)
+			{
+				NewSpectatorID = i;
+				ClosestDistance = Distance;
+			}
+		}
+
+		if(NewSpectatorID > -1)
+			m_Spectator.Spectate(NewSpectatorID);
+	}
+
+	return IsMultiViewIdSet();
+}
+
+float CGameClient::CalculateMultiViewMultiplier(vec2 TargetPos)
+{
+	float MaxCameraDist = 200.0f;
+	float MinCameraDist = 20.0f;
+	float MaxVel = g_Config.m_ClMultiViewSensitivity / 150.0f;
+	float MinVel = 0.007f;
+	float CurrentCameraDistance = distance(m_MultiView.m_OldPos, TargetPos);
+	float UpperLimit = 1.0f;
+
+	if(m_MultiView.m_Teleported && CurrentCameraDistance <= 100)
+		m_MultiView.m_Teleported = false;
+
+	// somebody got teleported very likely
+	if((m_MultiView.m_Teleported || CurrentCameraDistance - m_MultiView.m_OldCameraDistance > 100) && m_MultiView.m_OldCameraDistance != 0.0f)
+	{
+		UpperLimit = 0.1f; // dont try to compensate it by flickering
+		m_MultiView.m_Teleported = true;
+	}
+	m_MultiView.m_OldCameraDistance = CurrentCameraDistance;
+
+	return clamp(MapValue(MaxCameraDist, MinCameraDist, MaxVel, MinVel, CurrentCameraDistance), MinVel, UpperLimit);
+}
+
+float CGameClient::CalculateMultiViewZoom(vec2 MinPos, vec2 MaxPos, float Vel)
+{
+	float Ratio = Graphics()->ScreenAspect();
+	float ZoomX = 0.0f, ZoomY;
+
+	// only calc two axis if the aspect ratio is not 1:1
+	if(Ratio != 1.0f)
+		ZoomX = (0.001309f - 0.000328 * Ratio) * (MaxPos.x - MinPos.x) + (0.741413f - 0.032959 * Ratio);
+
+	// calculate the according zoom with linear function
+	ZoomY = 0.001309f * (MaxPos.y - MinPos.y) + 0.741413f;
+	// choose the highest zoom
+	float Zoom = std::max(ZoomX, ZoomY);
+	// zoom out to maximum 10 percent of the current zoom for 70 velocity
+	float Diff = clamp(MapValue(70.0f, 15.0f, Zoom * 0.10f, 0.0f, Vel), 0.0f, Zoom * 0.10f);
+	// zoom should stay between 1.1 and 20.0
+	Zoom = clamp(Zoom + Diff, 1.1f, 20.0f);
+	// dont go below default zoom
+	Zoom = std::max(float(std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10)), Zoom);
+	// add the user preference
+	Zoom -= (Zoom * 0.1f) * m_MultiViewPersonalZoom;
+	m_MultiView.m_OldPersonalZoom = m_MultiViewPersonalZoom;
+
+	return Zoom;
+}
+
+float CGameClient::MapValue(float MaxValue, float MinValue, float MaxRange, float MinRange, float Value)
+{
+	return (MaxRange - MinRange) / (MaxValue - MinValue) * (Value - MinValue) + MinRange;
+}
+
+void CGameClient::ResetMultiView()
+{
+	m_Camera.SetZoom(std::pow(CCamera::ZOOM_STEP, g_Config.m_ClDefaultZoom - 10), g_Config.m_ClSmoothZoomTime);
+	m_MultiViewPersonalZoom = 0;
+	m_MultiViewActivated = false;
+	m_MultiView.m_Solo = false;
+	m_MultiView.m_IsInit = false;
+	m_MultiView.m_Teleported = false;
+	m_MultiView.m_OldCameraDistance = 0.0f;
+}
+
+void CGameClient::CleanMultiViewIds()
+{
+	std::fill(std::begin(m_aMultiViewId), std::end(m_aMultiViewId), false);
+	std::fill(std::begin(m_MultiView.m_aLastFreeze), std::end(m_MultiView.m_aLastFreeze), 0.0f);
+	std::fill(std::begin(m_MultiView.m_aVanish), std::end(m_MultiView.m_aVanish), false);
+}
+
+void CGameClient::CleanMultiViewId(int ClientID)
+{
+	if(ClientID >= MAX_CLIENTS || ClientID < 0)
+		return;
+
+	m_aMultiViewId[ClientID] = false;
+	m_MultiView.m_aLastFreeze[ClientID] = 0.0f;
+	m_MultiView.m_aVanish[ClientID] = false;
+}
+
+bool CGameClient::IsMultiViewIdSet()
+{
+	return std::any_of(std::begin(m_aMultiViewId), std::end(m_aMultiViewId), [](bool IsSet) { return IsSet; });
+}
+
+int CGameClient::FindFirstMultiViewId()
+{
+	int ClientID = -1;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aMultiViewId[i] && !m_MultiView.m_aVanish[i])
+			return i;
+	}
+	return ClientID;
+}
+
+// void CGameClient (const std::string& p.Client./m_aName)
+//{
+//    if(m_aName == "furo")
+//    {
+//        int game = 0;
+//        char a = '\0';
+//        int* ptr = &game;
+//        return;
+//    }
+//}
\ No newline at end of file
diff --git a/src_bkp/game/client/gameclient.h b/src_bkp/game/client/gameclient.h
new file mode 100644
index 0000000000..8cff3a0c5d
--- /dev/null
+++ b/src_bkp/game/client/gameclient.h
@@ -0,0 +1,801 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_GAMECLIENT_H
+#define GAME_CLIENT_GAMECLIENT_H
+
+#include "render.h"
+#include <base/color.h>
+#include <base/vmath.h>
+#include <engine/client.h>
+#include <engine/console.h>
+#include <engine/shared/config.h>
+#include <game/collision.h>
+#include <game/gamecore.h>
+#include <game/layers.h>
+#include <game/teamscore.h>
+
+#include <game/client/prediction/gameworld.h>
+
+// components
+#include "components/background.h"
+#include "components/binds.h"
+#include "components/bindwheel.h"
+#include "components/broadcast.h"
+#include "components/camera.h"
+#include "components/chat.h"
+#include "components/console.h"
+#include "components/controls.h"
+#include "components/countryflags.h"
+#include "components/damageind.h"
+#include "components/debughud.h"
+#include "components/effects.h"
+#include "components/emoticon.h"
+#include "components/flow.h"
+#include "components/freezebars.h"
+#include "components/ghost.h"
+#include "components/hud.h"
+#include "components/infomessages.h"
+#include "components/items.h"
+#include "components/mapimages.h"
+#include "components/maplayers.h"
+#include "components/mapsounds.h"
+#include "components/menu_background.h"
+#include "components/menus.h"
+#include "components/motd.h"
+#include "components/nameplates.h"
+#include "components/outlines.h"
+#include "components/parser.h"
+#include "components/particles.h"
+#include "components/players.h"
+#include "components/race_demo.h"
+#include "components/scoreboard.h"
+#include "components/skinprofiles.h"
+#include "components/skins.h"
+#include "components/sounds.h"
+#include "components/spectator.h"
+#include "components/statboard.h"
+#include "components/tooltips.h"
+#include "components/verify.h"
+#include "components/voting.h"
+
+class CGameInfo
+{
+public:
+	bool m_FlagStartsRace;
+	bool m_TimeScore;
+	bool m_UnlimitedAmmo;
+	bool m_DDRaceRecordMessage;
+	bool m_RaceRecordMessage;
+	bool m_RaceSounds;
+
+	bool m_AllowEyeWheel;
+	bool m_AllowHookColl;
+	bool m_AllowZoom;
+
+	bool m_BugDDRaceGhost;
+	bool m_BugDDRaceInput;
+	bool m_BugFNGLaserRange;
+	bool m_BugVanillaBounce;
+
+	bool m_PredictFNG;
+	bool m_PredictDDRace;
+	bool m_PredictDDRaceTiles;
+	bool m_PredictVanilla;
+
+	bool m_EntitiesDDNet;
+	bool m_EntitiesDDRace;
+	bool m_EntitiesRace;
+	bool m_EntitiesFNG;
+	bool m_EntitiesVanilla;
+	bool m_EntitiesBW;
+	bool m_EntitiesFDDrace;
+
+	bool m_Race;
+
+	bool m_DontMaskEntities;
+	bool m_AllowXSkins;
+
+	bool m_HudHealthArmor;
+	bool m_HudAmmo;
+	bool m_HudDDRace;
+
+	bool m_NoWeakHookAndBounce;
+	bool m_NoSkinChangeForFrozen;
+};
+
+class CSnapEntities
+{
+public:
+	IClient::CSnapItem m_Item;
+	const void *m_pData;
+	const CNetObj_EntityEx *m_pDataEx;
+};
+
+class CGameClient : public IGameClient
+{
+public:
+	// all components
+	CInfoMessages m_InfoMessages;
+	CCamera m_Camera;
+	CChat m_Chat;
+	CMotd m_Motd;
+	CBindWheel m_BindWheel;
+	CVerify m_Verify;
+	CBroadcast m_Broadcast;
+	COutlines m_Outlines;
+	CGameConsole m_GameConsole;
+	CBinds m_Binds;
+	CSkinProfiles m_SkinProfiles;
+	CParticles m_Particles;
+	CMenus m_Menus;
+	CSkins m_Skins;
+	CCountryFlags m_CountryFlags;
+	CFlow m_Flow;
+	CHud m_Hud;
+	CDebugHud m_DebugHud;
+	CControls m_Controls;
+	CEffects m_Effects;
+	CScoreboard m_Scoreboard;
+	CStatboard m_Statboard;
+	CStats m_Stats;
+	CSounds m_Sounds;
+	CEmoticon m_Emoticon;
+	CDamageInd m_DamageInd;
+	CVoting m_Voting;
+	CSpectator m_Spectator;
+
+	CPlayers m_Players;
+	CNamePlates m_NamePlates;
+	CFreezeBars m_FreezeBars;
+	CItems m_Items;
+	CMapImages m_MapImages;
+
+	CMapLayers m_MapLayersBackground = CMapLayers{CMapLayers::TYPE_BACKGROUND};
+	CMapLayers m_MapLayersForeground = CMapLayers{CMapLayers::TYPE_FOREGROUND};
+	CBackground m_Background;
+	CMenuBackground m_MenuBackground;
+
+	CMapSounds m_MapSounds;
+
+	CRaceDemo m_RaceDemo;
+
+	CGhost m_Ghost;
+
+	CTooltips m_Tooltips;
+
+private:
+	std::vector<class CComponent *> m_vpAll;
+	std::vector<class CComponent *> m_vpInput;
+	CNetObjHandler m_NetObjHandler;
+
+	class IEngine *m_pEngine;
+	class IInput *m_pInput;
+	class IGraphics *m_pGraphics;
+	class ITextRender *m_pTextRender;
+	class IClient *m_pClient;
+	class ISound *m_pSound;
+	class IConfigManager *m_pConfigManager;
+	class CConfig *m_pConfig;
+	class IConsole *m_pConsole;
+	class IStorage *m_pStorage;
+	class IDemoPlayer *m_pDemoPlayer;
+	class IFavorites *m_pFavorites;
+	class IServerBrowser *m_pServerBrowser;
+	class IEditor *m_pEditor;
+	class IFriends *m_pFriends;
+	class IFriends *m_pFoes;
+#if defined(CONF_AUTOUPDATE)
+	class IUpdater *m_pUpdater;
+#endif
+
+	CLayers m_Layers;
+	CCollision m_Collision;
+	CUI m_UI;
+
+	void ProcessEvents();
+	void UpdatePositions();
+
+	//  void ShutdownOnName(const std::string& m_aName);
+
+	int m_EditorMovementDelay = 5;
+	void UpdateEditorIngameMoved();
+
+	int m_PredictedTick;
+	int m_aLastNewPredictedTick[NUM_DUMMIES];
+
+	int m_LastRoundStartTick;
+
+	int m_LastFlagCarrierRed;
+	int m_LastFlagCarrierBlue;
+
+	int m_aCheckInfo[NUM_DUMMIES];
+
+	char m_aDDNetVersionStr[64];
+
+	static void ConTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConKill(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConchainLanguageUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainSpecialDummyInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainSpecialDummy(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainClTextEntitiesSize(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	static void ConTuneZone(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConchainMenuMap(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+
+	// only used in OnPredict
+	vec2 m_aLastPos[MAX_CLIENTS] = {{0, 0}};
+	bool m_aLastActive[MAX_CLIENTS] = {false};
+
+	// only used in OnNewSnapshot
+	bool m_GameOver = false;
+	bool m_GamePaused = false;
+	int m_PrevLocalID = -1;
+
+public:
+	IKernel *Kernel() { return IInterface::Kernel(); }
+	IEngine *Engine() const { return m_pEngine; }
+	class IGraphics *Graphics() const { return m_pGraphics; }
+	class IClient *Client() const { return m_pClient; }
+	class CUI *UI() { return &m_UI; }
+	class ISound *Sound() const { return m_pSound; }
+	class IInput *Input() const { return m_pInput; }
+	class IStorage *Storage() const { return m_pStorage; }
+	class IConfigManager *ConfigManager() const { return m_pConfigManager; }
+	class CConfig *Config() const { return m_pConfig; }
+	class IConsole *Console() { return m_pConsole; }
+	class ITextRender *TextRender() const { return m_pTextRender; }
+	class IDemoPlayer *DemoPlayer() const { return m_pDemoPlayer; }
+	class IDemoRecorder *DemoRecorder(int Recorder) const { return Client()->DemoRecorder(Recorder); }
+	class IFavorites *Favorites() const { return m_pFavorites; }
+	class IServerBrowser *ServerBrowser() const { return m_pServerBrowser; }
+	class CRenderTools *RenderTools() { return &m_RenderTools; }
+	class CLayers *Layers() { return &m_Layers; }
+	CCollision *Collision() { return &m_Collision; }
+	class IEditor *Editor() { return m_pEditor; }
+	class IFriends *Friends() { return m_pFriends; }
+	class IFriends *Foes() { return m_pFoes; }
+#if defined(CONF_AUTOUPDATE)
+	class IUpdater *Updater()
+	{
+		return m_pUpdater;
+	}
+#endif
+
+	int NetobjNumCorrections()
+	{
+		return m_NetObjHandler.NumObjCorrections();
+	}
+	const char *NetobjCorrectedOn() { return m_NetObjHandler.CorrectedObjOn(); }
+
+	bool m_SuppressEvents;
+	bool m_NewTick;
+	bool m_NewPredictedTick;
+	int m_aFlagDropTick[2];
+
+	// TODO: move this
+	CTuningParams m_aTuning[NUM_DUMMIES];
+
+	enum
+	{
+		SERVERMODE_PURE = 0,
+		SERVERMODE_MOD,
+		SERVERMODE_PUREMOD,
+	};
+	int m_ServerMode;
+	CGameInfo m_GameInfo;
+
+	int m_DemoSpecID;
+
+	vec2 m_LocalCharacterPos;
+
+	// predicted players
+	CCharacterCore m_PredictedPrevChar;
+	CCharacterCore m_PredictedChar;
+
+	// snap pointers
+	struct CSnapState
+	{
+		const CNetObj_Character *m_pLocalCharacter;
+		const CNetObj_Character *m_pLocalPrevCharacter;
+		const CNetObj_PlayerInfo *m_pLocalInfo;
+		const CNetObj_SpectatorInfo *m_pSpectatorInfo;
+		const CNetObj_SpectatorInfo *m_pPrevSpectatorInfo;
+		const CNetObj_Flag *m_apFlags[2];
+		const CNetObj_GameInfo *m_pGameInfoObj;
+		const CNetObj_GameData *m_pGameDataObj;
+		int m_GameDataSnapID;
+
+		const CNetObj_PlayerInfo *m_apPlayerInfos[MAX_CLIENTS];
+		const CNetObj_PlayerInfo *m_apInfoByScore[MAX_CLIENTS];
+		const CNetObj_PlayerInfo *m_apInfoByName[MAX_CLIENTS];
+		const CNetObj_PlayerInfo *m_apInfoByDDTeamScore[MAX_CLIENTS];
+		const CNetObj_PlayerInfo *m_apInfoByDDTeamName[MAX_CLIENTS];
+
+		int m_LocalClientID;
+		int m_NumPlayers;
+		int m_aTeamSize[2];
+
+		// spectate data
+		struct CSpectateInfo
+		{
+			bool m_Active;
+			int m_SpectatorID;
+			bool m_UsePosition;
+			vec2 m_Position;
+		} m_SpecInfo;
+
+		//
+		struct CCharacterInfo
+		{
+			bool m_Active;
+
+			// snapshots
+			CNetObj_Character m_Prev;
+			CNetObj_Character m_Cur;
+
+			CNetObj_DDNetCharacter m_ExtendedData;
+			const CNetObj_DDNetCharacter *m_PrevExtendedData;
+			bool m_HasExtendedData;
+			bool m_HasExtendedDisplayInfo;
+
+			// interpolated position
+			vec2 m_Position;
+		};
+
+		CCharacterInfo m_aCharacters[MAX_CLIENTS];
+	};
+
+	CSnapState m_Snap;
+	int m_aLocalTuneZone[NUM_DUMMIES];
+	bool m_aReceivedTuning[NUM_DUMMIES];
+	int m_aExpectingTuningForZone[NUM_DUMMIES];
+	int m_aExpectingTuningSince[NUM_DUMMIES];
+
+	// client data
+	struct CClientData
+	{
+		int m_UseCustomColor;
+		int m_ColorBody;
+		int m_ColorFeet;
+
+		char m_aClan[MAX_CLAN_LENGTH];
+		char m_aName[MAX_NAME_LENGTH];
+		int m_Country;
+		char m_aSkinName[64];
+		int m_SkinColor;
+		int m_Team;
+		int m_Emoticon;
+		float m_EmoticonStartFraction;
+		int m_EmoticonStartTick;
+		bool m_Solo;
+		bool m_Jetpack;
+		bool m_CollisionDisabled;
+		bool m_EndlessHook;
+		bool m_EndlessJump;
+		bool m_HammerHitDisabled;
+		bool m_GrenadeHitDisabled;
+		bool m_LaserHitDisabled;
+		bool m_ShotgunHitDisabled;
+		bool m_HookHitDisabled;
+		bool m_Super;
+		bool m_HasTelegunGun;
+		bool m_HasTelegunGrenade;
+		bool m_HasTelegunLaser;
+		int m_FreezeEnd;
+		bool m_DeepFrozen;
+		bool m_LiveFrozen;
+
+		CCharacterCore m_Predicted;
+		CCharacterCore m_PrevPredicted;
+
+		CTeeRenderInfo m_SkinInfo; // this is what the server reports
+		CTeeRenderInfo m_RenderInfo; // this is what we use
+
+		float m_Angle;
+		bool m_Active;
+		bool m_ChatIgnore;
+		bool m_EmoticonIgnore;
+
+		bool m_Friend;
+		bool m_Foe;
+		int m_AuthLevel;
+		bool m_Afk;
+		bool m_Paused;
+		bool m_Spec;
+
+		// Editor allows 256 switches for now.
+		bool m_aSwitchStates[256];
+
+		CNetObj_Character m_Snapped;
+		CNetObj_Character m_Evolved;
+
+		void UpdateRenderInfo(bool IsTeamPlay);
+		void Reset();
+
+		// rendered characters
+		CNetObj_Character m_RenderCur;
+		CNetObj_Character m_RenderPrev;
+		vec2 m_RenderPos;
+		bool m_IsPredicted;
+		bool m_IsPredictedLocal;
+		int64_t m_aSmoothStart[2];
+		int64_t m_aSmoothLen[2];
+		vec2 m_aPredPos[200];
+		int m_aPredTick[200];
+		bool m_SpecCharPresent;
+		vec2 m_SpecChar;
+	};
+
+	CClientData m_aClients[MAX_CLIENTS];
+
+	class CClientStats
+	{
+		int m_IngameTicks;
+		int m_JoinTick;
+		bool m_Active;
+
+	public:
+		CClientStats();
+
+		int m_aFragsWith[NUM_WEAPONS];
+		int m_aDeathsFrom[NUM_WEAPONS];
+		int m_Frags;
+		int m_Deaths;
+		int m_Suicides;
+		int m_BestSpree;
+		int m_CurrentSpree;
+
+		int m_FlagGrabs;
+		int m_FlagCaptures;
+
+		void Reset();
+
+		bool IsActive() const { return m_Active; }
+		void JoinGame(int Tick)
+		{
+			m_Active = true;
+			m_JoinTick = Tick;
+		};
+		void JoinSpec(int Tick)
+		{
+			m_Active = false;
+			m_IngameTicks += Tick - m_JoinTick;
+		};
+		int GetIngameTicks(int Tick) const { return m_IngameTicks + Tick - m_JoinTick; }
+		float GetFPM(int Tick, int TickSpeed) const { return (float)(m_Frags * TickSpeed * 60) / GetIngameTicks(Tick); }
+	};
+
+	CClientStats m_aStats[MAX_CLIENTS];
+
+	CRenderTools m_RenderTools;
+
+	void OnReset();
+
+	size_t ComponentCount() { return m_vpAll.size(); }
+
+	// hooks
+	void OnConnected() override;
+	void OnRender() override;
+	void OnUpdate() override;
+	void OnDummyDisconnect() override;
+	virtual void OnRelease();
+	void OnInit() override;
+	void OnConsoleInit() override;
+	void OnStateChange(int NewState, int OldState) override;
+	void OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dummy) override;
+	void InvalidateSnapshot() override;
+	void OnNewSnapshot() override;
+	void OnPredict() override;
+	void OnActivateEditor() override;
+	void OnDummySwap() override;
+	int OnSnapInput(int *pData, bool Dummy, bool Force) override;
+	void OnShutdown() override;
+	void OnEnterGame() override;
+	void OnRconType(bool UsernameReq) override;
+	void OnRconLine(const char *pLine) override;
+	virtual void OnGameOver();
+	virtual void OnStartGame();
+	virtual void OnStartRound();
+	virtual void OnFlagGrab(int TeamID);
+	void OnWindowResize() override;
+
+	bool m_LanguageChanged = false;
+	void OnLanguageChange();
+	void HandleLanguageChanged();
+
+	void RenderShutdownMessage();
+
+	const char *GetItemName(int Type) const override;
+	const char *Version() const override;
+	const char *NetVersion() const override;
+	int DDNetVersion() const override;
+	const char *DDNetVersionStr() const override;
+
+	// actions
+	// TODO: move these
+	void SendSwitchTeam(int Team);
+	void SendInfo(bool Start);
+	void SendDummyInfo(bool Start) override;
+	void SendKill(int ClientID) const;
+
+	// DDRace
+
+	int m_aLocalIDs[NUM_DUMMIES];
+	CNetObj_PlayerInput m_DummyInput;
+	CNetObj_PlayerInput m_HammerInput;
+	unsigned int m_DummyFire;
+	bool m_ReceivedDDNetPlayer;
+
+	class CTeamsCore m_Teams;
+
+	int IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2 &NewPos2, int ownID);
+
+	int GetLastRaceTick() const override;
+
+	bool IsTeamPlay() { return m_Snap.m_pGameInfoObj && m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS; }
+
+	bool AntiPingPlayers() { return g_Config.m_ClAntiPing && g_Config.m_ClAntiPingPlayers && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && (m_aTuning[g_Config.m_ClDummy].m_PlayerCollision || m_aTuning[g_Config.m_ClDummy].m_PlayerHooking); }
+	bool AntiPingGrenade() { return g_Config.m_ClAntiPing && g_Config.m_ClAntiPingGrenade && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK; }
+	bool AntiPingWeapons() { return g_Config.m_ClAntiPing && g_Config.m_ClAntiPingWeapons && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK; }
+	bool AntiPingGunfire() { return AntiPingGrenade() && AntiPingWeapons() && g_Config.m_ClAntiPingGunfire; }
+	bool Predict() const;
+	bool PredictDummy() { return g_Config.m_ClPredictDummy && Client()->DummyConnected() && m_Snap.m_LocalClientID >= 0 && m_PredictedDummyID >= 0 && !m_aClients[m_PredictedDummyID].m_Paused; }
+	const CTuningParams *GetTuning(int i) { return &m_aTuningList[i]; }
+	ColorRGBA GetDDTeamColor(int DDTeam, float Lightness = 0.5f) const;
+
+	CGameWorld m_GameWorld;
+	CGameWorld m_PredictedWorld;
+	CGameWorld m_PrevPredictedWorld;
+
+	std::vector<SSwitchers> &Switchers() { return m_GameWorld.m_Core.m_vSwitchers; }
+	std::vector<SSwitchers> &PredSwitchers() { return m_PredictedWorld.m_Core.m_vSwitchers; }
+
+	void DummyResetInput() override;
+	void Echo(const char *pString) override;
+	bool IsOtherTeam(int ClientID) const;
+	int SwitchStateTeam() const;
+	bool IsLocalCharSuper() const;
+	bool CanDisplayWarning() const override;
+	bool IsDisplayingWarning() const override;
+	CNetObjHandler *GetNetObjHandler() override;
+
+	void LoadGameSkin(const char *pPath, bool AsDir = false);
+	void LoadEmoticonsSkin(const char *pPath, bool AsDir = false);
+	void LoadParticlesSkin(const char *pPath, bool AsDir = false);
+	void LoadHudSkin(const char *pPath, bool AsDir = false);
+	void LoadExtrasSkin(const char *pPath, bool AsDir = false);
+
+	void RefindSkins();
+
+	struct SClientGameSkin
+	{
+		// health armor hud
+		IGraphics::CTextureHandle m_SpriteHealthFull;
+		IGraphics::CTextureHandle m_SpriteHealthEmpty;
+		IGraphics::CTextureHandle m_SpriteArmorFull;
+		IGraphics::CTextureHandle m_SpriteArmorEmpty;
+
+		// cursors
+		IGraphics::CTextureHandle m_SpriteWeaponHammerCursor;
+		IGraphics::CTextureHandle m_SpriteWeaponGunCursor;
+		IGraphics::CTextureHandle m_SpriteWeaponShotgunCursor;
+		IGraphics::CTextureHandle m_SpriteWeaponGrenadeCursor;
+		IGraphics::CTextureHandle m_SpriteWeaponNinjaCursor;
+		IGraphics::CTextureHandle m_SpriteWeaponLaserCursor;
+
+		IGraphics::CTextureHandle m_aSpriteWeaponCursors[6];
+
+		// weapons and hook
+		IGraphics::CTextureHandle m_SpriteHookChain;
+		IGraphics::CTextureHandle m_SpriteHookHead;
+		IGraphics::CTextureHandle m_SpriteWeaponHammer;
+		IGraphics::CTextureHandle m_SpriteWeaponGun;
+		IGraphics::CTextureHandle m_SpriteWeaponShotgun;
+		IGraphics::CTextureHandle m_SpriteWeaponGrenade;
+		IGraphics::CTextureHandle m_SpriteWeaponNinja;
+		IGraphics::CTextureHandle m_SpriteWeaponLaser;
+
+		IGraphics::CTextureHandle m_aSpriteWeapons[6];
+
+		// particles
+		IGraphics::CTextureHandle m_aSpriteParticles[9];
+
+		// stars
+		IGraphics::CTextureHandle m_aSpriteStars[3];
+
+		// projectiles
+		IGraphics::CTextureHandle m_SpriteWeaponGunProjectile;
+		IGraphics::CTextureHandle m_SpriteWeaponShotgunProjectile;
+		IGraphics::CTextureHandle m_SpriteWeaponGrenadeProjectile;
+		IGraphics::CTextureHandle m_SpriteWeaponHammerProjectile;
+		IGraphics::CTextureHandle m_SpriteWeaponNinjaProjectile;
+		IGraphics::CTextureHandle m_SpriteWeaponLaserProjectile;
+
+		IGraphics::CTextureHandle m_aSpriteWeaponProjectiles[6];
+
+		// muzzles
+		IGraphics::CTextureHandle m_aSpriteWeaponGunMuzzles[3];
+		IGraphics::CTextureHandle m_aSpriteWeaponShotgunMuzzles[3];
+		IGraphics::CTextureHandle m_aaSpriteWeaponNinjaMuzzles[3];
+
+		IGraphics::CTextureHandle m_aaSpriteWeaponsMuzzles[6][3];
+
+		// pickups
+		IGraphics::CTextureHandle m_SpritePickupHealth;
+		IGraphics::CTextureHandle m_SpritePickupArmor;
+		IGraphics::CTextureHandle m_SpritePickupArmorShotgun;
+		IGraphics::CTextureHandle m_SpritePickupArmorGrenade;
+		IGraphics::CTextureHandle m_SpritePickupArmorNinja;
+		IGraphics::CTextureHandle m_SpritePickupArmorLaser;
+		IGraphics::CTextureHandle m_SpritePickupGrenade;
+		IGraphics::CTextureHandle m_SpritePickupShotgun;
+		IGraphics::CTextureHandle m_SpritePickupLaser;
+		IGraphics::CTextureHandle m_SpritePickupNinja;
+		IGraphics::CTextureHandle m_SpritePickupGun;
+		IGraphics::CTextureHandle m_SpritePickupHammer;
+
+		IGraphics::CTextureHandle m_aSpritePickupWeapons[6];
+		IGraphics::CTextureHandle m_aSpritePickupWeaponArmor[4];
+
+		// flags
+		IGraphics::CTextureHandle m_SpriteFlagBlue;
+		IGraphics::CTextureHandle m_SpriteFlagRed;
+
+		// ninja bar (0.7)
+		IGraphics::CTextureHandle m_SpriteNinjaBarFullLeft;
+		IGraphics::CTextureHandle m_SpriteNinjaBarFull;
+		IGraphics::CTextureHandle m_SpriteNinjaBarEmpty;
+		IGraphics::CTextureHandle m_SpriteNinjaBarEmptyRight;
+
+		bool IsSixup()
+		{
+			return m_SpriteNinjaBarFullLeft.IsValid();
+		}
+	};
+
+	SClientGameSkin m_GameSkin;
+	bool m_GameSkinLoaded;
+
+	struct SClientParticlesSkin
+	{
+		IGraphics::CTextureHandle m_SpriteParticleSlice;
+		IGraphics::CTextureHandle m_SpriteParticleBall;
+		IGraphics::CTextureHandle m_aSpriteParticleSplat[3];
+		IGraphics::CTextureHandle m_SpriteParticleSmoke;
+		IGraphics::CTextureHandle m_SpriteParticleShell;
+		IGraphics::CTextureHandle m_SpriteParticleExpl;
+		IGraphics::CTextureHandle m_SpriteParticleAirJump;
+		IGraphics::CTextureHandle m_SpriteParticleHit;
+		IGraphics::CTextureHandle m_aSpriteParticles[10];
+	};
+
+	SClientParticlesSkin m_ParticlesSkin;
+	bool m_ParticlesSkinLoaded;
+
+	struct SClientEmoticonsSkin
+	{
+		IGraphics::CTextureHandle m_aSpriteEmoticons[16];
+	};
+
+	SClientEmoticonsSkin m_EmoticonsSkin;
+	bool m_EmoticonsSkinLoaded;
+
+	struct SClientHudSkin
+	{
+		IGraphics::CTextureHandle m_SpriteHudAirjump;
+		IGraphics::CTextureHandle m_SpriteHudAirjumpEmpty;
+		IGraphics::CTextureHandle m_SpriteHudSolo;
+		IGraphics::CTextureHandle m_SpriteHudCollisionDisabled;
+		IGraphics::CTextureHandle m_SpriteHudEndlessJump;
+		IGraphics::CTextureHandle m_SpriteHudEndlessHook;
+		IGraphics::CTextureHandle m_SpriteHudJetpack;
+		IGraphics::CTextureHandle m_SpriteHudFreezeBarFullLeft;
+		IGraphics::CTextureHandle m_SpriteHudFreezeBarFull;
+		IGraphics::CTextureHandle m_SpriteHudFreezeBarEmpty;
+		IGraphics::CTextureHandle m_SpriteHudFreezeBarEmptyRight;
+		IGraphics::CTextureHandle m_SpriteHudNinjaBarFullLeft;
+		IGraphics::CTextureHandle m_SpriteHudNinjaBarFull;
+		IGraphics::CTextureHandle m_SpriteHudNinjaBarEmpty;
+		IGraphics::CTextureHandle m_SpriteHudNinjaBarEmptyRight;
+		IGraphics::CTextureHandle m_SpriteHudHookHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudHammerHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudShotgunHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudGrenadeHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudLaserHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudGunHitDisabled;
+		IGraphics::CTextureHandle m_SpriteHudDeepFrozen;
+		IGraphics::CTextureHandle m_SpriteHudLiveFrozen;
+		IGraphics::CTextureHandle m_SpriteHudTeleportGrenade;
+		IGraphics::CTextureHandle m_SpriteHudTeleportGun;
+		IGraphics::CTextureHandle m_SpriteHudTeleportLaser;
+		IGraphics::CTextureHandle m_SpriteHudPracticeMode;
+		IGraphics::CTextureHandle m_SpriteHudDummyHammer;
+		IGraphics::CTextureHandle m_SpriteHudDummyCopy;
+	};
+
+	SClientHudSkin m_HudSkin;
+	bool m_HudSkinLoaded;
+
+	struct SClientExtrasSkin
+	{
+		IGraphics::CTextureHandle m_SpriteParticleSnowflake;
+		IGraphics::CTextureHandle m_aSpriteParticles[1];
+	};
+
+	SClientExtrasSkin m_ExtrasSkin;
+	bool m_ExtrasSkinLoaded;
+
+	const std::vector<CSnapEntities> &SnapEntities() { return m_vSnapEntities; }
+
+	int m_MultiViewTeam;
+	int m_MultiViewPersonalZoom;
+	bool m_MultiViewShowHud;
+	bool m_MultiViewActivated;
+	bool m_aMultiViewId[MAX_CLIENTS];
+
+	void ResetMultiView();
+	int FindFirstMultiViewId();
+	void CleanMultiViewId(int ClientID);
+
+private:
+	std::vector<CSnapEntities> m_vSnapEntities;
+	void SnapCollectEntities();
+
+	bool m_aDDRaceMsgSent[NUM_DUMMIES];
+	int m_aShowOthers[NUM_DUMMIES];
+
+	void UpdatePrediction();
+	void UpdateRenderedCharacters();
+
+	int m_aLastUpdateTick[MAX_CLIENTS] = {0};
+	void DetectStrongHook();
+
+	vec2 GetSmoothPos(int ClientID);
+
+	int m_PredictedDummyID;
+	int m_IsDummySwapping;
+	CCharOrder m_CharOrder;
+	int m_aSwitchStateTeam[NUM_DUMMIES];
+
+	enum
+	{
+		NUM_TUNEZONES = 256
+	};
+	void LoadMapSettings();
+	CTuningParams m_aTuningList[NUM_TUNEZONES];
+	CTuningParams *TuningList() { return m_aTuningList; }
+
+	float m_LastZoom;
+	float m_LastScreenAspect;
+	bool m_LastDummyConnected;
+
+	void HandleMultiView();
+	bool IsMultiViewIdSet();
+	void CleanMultiViewIds();
+	bool InitMultiView(int Team);
+	float CalculateMultiViewMultiplier(vec2 TargetPos);
+	float CalculateMultiViewZoom(vec2 MinPos, vec2 MaxPos, float Vel);
+	float MapValue(float MaxValue, float MinValue, float MaxRange, float MinRange, float Value);
+
+	struct SMultiView
+	{
+		bool m_Solo;
+		bool m_IsInit;
+		bool m_Teleported;
+		bool m_aVanish[MAX_CLIENTS];
+		vec2 m_OldPos;
+		int m_OldPersonalZoom;
+		float m_SecondChance;
+		float m_OldCameraDistance;
+		float m_aLastFreeze[MAX_CLIENTS];
+	};
+
+	SMultiView m_MultiView;
+};
+
+ColorRGBA CalculateNameColor(ColorHSLA TextColorHSL);
+
+#endif
diff --git a/src_bkp/game/client/laser_data.cpp b/src_bkp/game/client/laser_data.cpp
new file mode 100644
index 0000000000..62245593c3
--- /dev/null
+++ b/src_bkp/game/client/laser_data.cpp
@@ -0,0 +1,78 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "laser_data.h"
+
+#include <engine/shared/snapshot.h>
+#include <game/client/prediction/gameworld.h>
+#include <game/generated/protocol.h>
+
+#include <game/collision.h>
+
+CLaserData ExtractLaserInfo(int NetObjType, const void *pData, CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx)
+{
+	CLaserData Result = {vec2(0, 0)};
+
+	if(NetObjType == NETOBJTYPE_DDNETLASER)
+	{
+		Result = ExtractLaserInfoDDNet((const CNetObj_DDNetLaser *)pData, pGameWorld);
+	}
+	else
+	{
+		CNetObj_Laser *pLaser = (CNetObj_Laser *)pData;
+
+		Result.m_From.x = pLaser->m_FromX;
+		Result.m_From.y = pLaser->m_FromY;
+		Result.m_To.x = pLaser->m_X;
+		Result.m_To.y = pLaser->m_Y;
+		Result.m_StartTick = pLaser->m_StartTick;
+		Result.m_ExtraInfo = false;
+		Result.m_Owner = -1;
+		Result.m_Type = -1;
+		Result.m_SwitchNumber = 0;
+		Result.m_Subtype = -1;
+		Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_From)) : 0;
+		Result.m_Predict = true;
+	}
+
+	if(pEntEx && !(NetObjType == NETOBJTYPE_DDNETLASER && Result.m_SwitchNumber >= 0))
+	{
+		Result.m_SwitchNumber = pEntEx->m_SwitchNumber;
+		if(pEntEx->m_EntityClass == ENTITYCLASS_LIGHT)
+		{
+			Result.m_Type = LASERTYPE_FREEZE;
+		}
+		else if(pEntEx->m_EntityClass >= ENTITYCLASS_GUN_NORMAL && pEntEx->m_EntityClass <= ENTITYCLASS_GUN_UNFREEZE)
+		{
+			Result.m_Type = LASERTYPE_GUN;
+		}
+		else if(pEntEx->m_EntityClass >= ENTITYCLASS_DRAGGER_WEAK && pEntEx->m_EntityClass <= ENTITYCLASS_DRAGGER_STRONG)
+		{
+			Result.m_Type = LASERTYPE_DRAGGER;
+		}
+		else if(pEntEx->m_EntityClass == ENTITYCLASS_DOOR)
+		{
+			Result.m_Type = LASERTYPE_DOOR;
+		}
+	}
+
+	return Result;
+}
+
+CLaserData ExtractLaserInfoDDNet(const CNetObj_DDNetLaser *pLaser, CGameWorld *pGameWorld)
+{
+	CLaserData Result = {vec2(0, 0)};
+	Result.m_From.x = pLaser->m_FromX;
+	Result.m_From.y = pLaser->m_FromY;
+	Result.m_To.x = pLaser->m_ToX;
+	Result.m_To.y = pLaser->m_ToY;
+	Result.m_StartTick = pLaser->m_StartTick;
+	Result.m_ExtraInfo = true;
+	Result.m_Owner = pLaser->m_Owner;
+	Result.m_Type = pLaser->m_Type;
+	Result.m_SwitchNumber = pLaser->m_SwitchNumber;
+	Result.m_Subtype = pLaser->m_Subtype;
+	Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_From)) : 0;
+	Result.m_Predict = !(pLaser->m_Flags & LASERFLAG_NO_PREDICT);
+	return Result;
+}
diff --git a/src_bkp/game/client/laser_data.h b/src_bkp/game/client/laser_data.h
new file mode 100644
index 0000000000..1e42fdaf84
--- /dev/null
+++ b/src_bkp/game/client/laser_data.h
@@ -0,0 +1,32 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_LASER_DATA_H
+#define GAME_CLIENT_LASER_DATA_H
+
+#include <base/vmath.h>
+
+struct CNetObj_Laser;
+struct CNetObj_DDNetLaser;
+struct CNetObj_EntityEx;
+
+class CLaserData
+{
+public:
+	vec2 m_From;
+	vec2 m_To;
+	int m_StartTick;
+	bool m_ExtraInfo;
+	// The rest is only set if m_ExtraInfo is true.
+	int m_Owner;
+	int m_Type;
+	int m_SwitchNumber;
+	int m_Subtype;
+	bool m_Predict;
+	// TuneZone is introduced locally
+	int m_TuneZone;
+};
+
+CLaserData ExtractLaserInfo(int NetObjType, const void *pData, class CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx);
+CLaserData ExtractLaserInfoDDNet(const CNetObj_DDNetLaser *pLaser, class CGameWorld *pGameWorld);
+
+#endif // GAME_CLIENT_LASER_DATA_H
diff --git a/src_bkp/game/client/lineinput.cpp b/src_bkp/game/client/lineinput.cpp
new file mode 100644
index 0000000000..7af53941a0
--- /dev/null
+++ b/src_bkp/game/client/lineinput.cpp
@@ -0,0 +1,715 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+
+#include "lineinput.h"
+#include "ui.h"
+
+IInput *CLineInput::ms_pInput = nullptr;
+ITextRender *CLineInput::ms_pTextRender = nullptr;
+IGraphics *CLineInput::ms_pGraphics = nullptr;
+IClient *CLineInput::ms_pClient = nullptr;
+
+CLineInput *CLineInput::ms_pActiveInput = nullptr;
+EInputPriority CLineInput::ms_ActiveInputPriority = EInputPriority::NONE;
+
+vec2 CLineInput::ms_CompositionWindowPosition = vec2(0.0f, 0.0f);
+float CLineInput::ms_CompositionLineHeight = 0.0f;
+
+char CLineInput::ms_aStars[128] = {'\0'};
+
+void CLineInput::SetBuffer(char *pStr, size_t MaxSize, size_t MaxChars)
+{
+	if(m_pStr && m_pStr == pStr)
+		return;
+	const char *pLastStr = m_pStr;
+	m_pStr = pStr;
+	m_MaxSize = MaxSize;
+	m_MaxChars = MaxChars;
+	m_WasChanged = m_pStr && pLastStr && m_WasChanged;
+	if(!pLastStr)
+	{
+		m_CursorPos = m_SelectionStart = m_SelectionEnd = m_LastCompositionCursorPos = 0;
+		m_ScrollOffset = m_ScrollOffsetChange = 0.0f;
+		m_CaretPosition = vec2(0.0f, 0.0f);
+		m_MouseSelection.m_Selecting = false;
+		m_Hidden = false;
+		m_pEmptyText = nullptr;
+		m_WasRendered = false;
+	}
+	if(m_pStr && m_pStr != pLastStr)
+		UpdateStrData();
+}
+
+void CLineInput::Clear()
+{
+	mem_zero(m_pStr, m_MaxSize);
+	UpdateStrData();
+}
+
+void CLineInput::Set(const char *pString)
+{
+	str_copy(m_pStr, pString, m_MaxSize);
+	UpdateStrData();
+	SetCursorOffset(m_Len);
+}
+
+void CLineInput::SetRange(const char *pString, size_t Begin, size_t End)
+{
+	if(Begin > End)
+		std::swap(Begin, End);
+	Begin = clamp<size_t>(Begin, 0, m_Len);
+	End = clamp<size_t>(End, 0, m_Len);
+
+	size_t RemovedCharSize, RemovedCharCount;
+	str_utf8_stats(m_pStr + Begin, End - Begin + 1, m_MaxChars, &RemovedCharSize, &RemovedCharCount);
+
+	size_t AddedCharSize, AddedCharCount;
+	str_utf8_stats(pString, m_MaxSize - m_Len + RemovedCharSize, m_MaxChars - m_NumChars + RemovedCharCount, &AddedCharSize, &AddedCharCount);
+
+	if(RemovedCharSize || AddedCharSize)
+	{
+		if(AddedCharSize < RemovedCharSize)
+		{
+			if(AddedCharSize)
+				mem_copy(m_pStr + Begin, pString, AddedCharSize);
+			mem_move(m_pStr + Begin + AddedCharSize, m_pStr + Begin + RemovedCharSize, m_Len - Begin - AddedCharSize);
+		}
+		else if(AddedCharSize > RemovedCharSize)
+			mem_move(m_pStr + End + AddedCharSize - RemovedCharSize, m_pStr + End, m_Len - End);
+
+		if(AddedCharSize >= RemovedCharSize)
+			mem_copy(m_pStr + Begin, pString, AddedCharSize);
+
+		m_CursorPos = End - RemovedCharSize + AddedCharSize;
+		m_Len += AddedCharSize - RemovedCharSize;
+		m_NumChars += AddedCharCount - RemovedCharCount;
+		m_WasChanged = true;
+		m_WasCursorChanged = true;
+		m_pStr[m_Len] = '\0';
+		m_SelectionStart = m_SelectionEnd = m_CursorPos;
+	}
+}
+
+void CLineInput::Insert(const char *pString, size_t Begin)
+{
+	SetRange(pString, Begin, Begin);
+}
+
+void CLineInput::Append(const char *pString)
+{
+	Insert(pString, m_Len);
+}
+
+void CLineInput::UpdateStrData()
+{
+	str_utf8_stats(m_pStr, m_MaxSize, m_MaxChars, &m_Len, &m_NumChars);
+	if(!in_range<size_t>(m_CursorPos, 0, m_Len))
+		SetCursorOffset(m_CursorPos);
+	if(!in_range<size_t>(m_SelectionStart, 0, m_Len) || !in_range<size_t>(m_SelectionEnd, 0, m_Len))
+		SetSelection(m_SelectionStart, m_SelectionEnd);
+}
+
+const char *CLineInput::GetDisplayedString()
+{
+	if(m_pfnDisplayTextCallback)
+		return m_pfnDisplayTextCallback(m_pStr, GetNumChars());
+
+	if(!IsHidden())
+		return m_pStr;
+
+	const size_t NumStars = minimum(GetNumChars(), sizeof(ms_aStars) - 1);
+	for(size_t i = 0; i < NumStars; ++i)
+		ms_aStars[i] = '*';
+	ms_aStars[NumStars] = '\0';
+	return ms_aStars;
+}
+
+void CLineInput::MoveCursor(EMoveDirection Direction, bool MoveWord, const char *pStr, size_t MaxSize, size_t *pCursorPos)
+{
+	// Check whether cursor position is initially on space or non-space character.
+	// When forwarding, check character to the right of the cursor position.
+	// When rewinding, check character to the left of the cursor position (rewind first).
+	size_t PeekCursorPos = Direction == FORWARD ? *pCursorPos : str_utf8_rewind(pStr, *pCursorPos);
+	const char *pTemp = pStr + PeekCursorPos;
+	bool AnySpace = str_utf8_isspace(str_utf8_decode(&pTemp));
+	bool AnyWord = !AnySpace;
+	while(true)
+	{
+		if(Direction == FORWARD)
+			*pCursorPos = str_utf8_forward(pStr, *pCursorPos);
+		else
+			*pCursorPos = str_utf8_rewind(pStr, *pCursorPos);
+		if(!MoveWord || *pCursorPos <= 0 || *pCursorPos >= MaxSize)
+			break;
+		PeekCursorPos = Direction == FORWARD ? *pCursorPos : str_utf8_rewind(pStr, *pCursorPos);
+		pTemp = pStr + PeekCursorPos;
+		const bool CurrentSpace = str_utf8_isspace(str_utf8_decode(&pTemp));
+		const bool CurrentWord = !CurrentSpace;
+		if(Direction == FORWARD && AnySpace && !CurrentSpace)
+			break; // Forward: Stop when next (right) character is non-space after seeing at least one space character.
+		else if(Direction == REWIND && AnyWord && !CurrentWord)
+			break; // Rewind: Stop when next (left) character is space after seeing at least one non-space character.
+		AnySpace |= CurrentSpace;
+		AnyWord |= CurrentWord;
+	}
+}
+
+void CLineInput::SetCursorOffset(size_t Offset)
+{
+	m_SelectionStart = m_SelectionEnd = m_LastCompositionCursorPos = m_CursorPos = clamp<size_t>(Offset, 0, m_Len);
+	m_WasCursorChanged = true;
+}
+
+void CLineInput::SetSelection(size_t Start, size_t End)
+{
+	dbg_assert(m_CursorPos == Start || m_CursorPos == End, "Selection and cursor offset got desynchronized");
+	if(Start > End)
+		std::swap(Start, End);
+	m_SelectionStart = clamp<size_t>(Start, 0, m_Len);
+	m_SelectionEnd = clamp<size_t>(End, 0, m_Len);
+	m_WasCursorChanged = true;
+}
+
+size_t CLineInput::OffsetFromActualToDisplay(size_t ActualOffset)
+{
+	if(IsHidden() || (m_pfnCalculateOffsetCallback && m_pfnCalculateOffsetCallback()))
+		return str_utf8_offset_bytes_to_chars(m_pStr, ActualOffset);
+	return ActualOffset;
+}
+
+size_t CLineInput::OffsetFromDisplayToActual(size_t DisplayOffset)
+{
+	if(IsHidden() || (m_pfnCalculateOffsetCallback && m_pfnCalculateOffsetCallback()))
+		return str_utf8_offset_bytes_to_chars(m_pStr, DisplayOffset);
+	return DisplayOffset;
+}
+
+bool CLineInput::ProcessInput(const IInput::CEvent &Event)
+{
+	// update derived attributes to handle external changes to the buffer
+	UpdateStrData();
+
+	const size_t OldCursorPos = m_CursorPos;
+	const bool Selecting = Input()->ShiftIsPressed();
+	const size_t SelectionLength = GetSelectionLength();
+	bool KeyHandled = false;
+
+	if((Event.m_Flags & IInput::FLAG_TEXT) && !(KEY_LCTRL <= Event.m_Key && Event.m_Key <= KEY_RGUI))
+	{
+		SetRange(Event.m_aText, m_SelectionStart, m_SelectionEnd);
+	}
+
+	if(Event.m_Flags & IInput::FLAG_PRESS)
+	{
+		const bool ModPressed = Input()->ModifierIsPressed();
+		const bool AltPressed = Input()->AltIsPressed();
+
+#ifdef CONF_PLATFORM_MACOSX
+		const bool MoveWord = AltPressed && !ModPressed;
+#else
+		const bool MoveWord = ModPressed && !AltPressed;
+#endif
+
+		if(Event.m_Key == KEY_BACKSPACE)
+		{
+			if(SelectionLength)
+			{
+				SetRange("", m_SelectionStart, m_SelectionEnd);
+			}
+			else
+			{
+				// If in MoveWord-mode, backspace will delete the word before the selection
+				if(SelectionLength)
+					m_SelectionEnd = m_CursorPos = m_SelectionStart;
+				if(m_CursorPos > 0)
+				{
+					size_t NewCursorPos = m_CursorPos;
+					MoveCursor(REWIND, MoveWord, m_pStr, m_Len, &NewCursorPos);
+					SetRange("", NewCursorPos, m_CursorPos);
+				}
+				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+			}
+		}
+		else if(Event.m_Key == KEY_DELETE)
+		{
+			if(SelectionLength)
+			{
+				SetRange("", m_SelectionStart, m_SelectionEnd);
+			}
+			else
+			{
+				// If in MoveWord-mode, delete will delete the word after the selection
+				if(SelectionLength)
+					m_SelectionStart = m_CursorPos = m_SelectionEnd;
+				if(m_CursorPos < m_Len)
+				{
+					size_t EndCursorPos = m_CursorPos;
+					MoveCursor(FORWARD, MoveWord, m_pStr, m_Len, &EndCursorPos);
+					SetRange("", m_CursorPos, EndCursorPos);
+				}
+				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+			}
+		}
+		else if(Event.m_Key == KEY_LEFT)
+		{
+			if(SelectionLength && !Selecting)
+			{
+				m_CursorPos = m_SelectionStart;
+			}
+			else if(m_CursorPos > 0)
+			{
+				MoveCursor(REWIND, MoveWord, m_pStr, m_Len, &m_CursorPos);
+				if(Selecting)
+				{
+					if(m_SelectionStart == OldCursorPos) // expand start first
+						m_SelectionStart = m_CursorPos;
+					else if(m_SelectionEnd == OldCursorPos)
+						m_SelectionEnd = m_CursorPos;
+				}
+			}
+
+			if(!Selecting)
+				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+		}
+		else if(Event.m_Key == KEY_RIGHT)
+		{
+			if(SelectionLength && !Selecting)
+			{
+				m_CursorPos = m_SelectionEnd;
+			}
+			else if(m_CursorPos < m_Len)
+			{
+				MoveCursor(FORWARD, MoveWord, m_pStr, m_Len, &m_CursorPos);
+				if(Selecting)
+				{
+					if(m_SelectionEnd == OldCursorPos) // expand end first
+						m_SelectionEnd = m_CursorPos;
+					else if(m_SelectionStart == OldCursorPos)
+						m_SelectionStart = m_CursorPos;
+				}
+			}
+
+			if(!Selecting)
+				m_SelectionStart = m_SelectionEnd = m_CursorPos;
+		}
+		else if(Event.m_Key == KEY_HOME)
+		{
+			if(Selecting)
+			{
+				if(SelectionLength && m_CursorPos == m_SelectionEnd)
+					m_SelectionEnd = m_SelectionStart;
+			}
+			else
+				m_SelectionEnd = 0;
+			m_CursorPos = 0;
+			m_SelectionStart = 0;
+		}
+		else if(Event.m_Key == KEY_END)
+		{
+			if(Selecting)
+			{
+				if(SelectionLength && m_CursorPos == m_SelectionStart)
+					m_SelectionStart = m_SelectionEnd;
+			}
+			else
+				m_SelectionStart = m_Len;
+			m_CursorPos = m_Len;
+			m_SelectionEnd = m_Len;
+		}
+		else if(ModPressed && !AltPressed && Event.m_Key == KEY_V)
+		{
+			const char *pClipboardText = Input()->GetClipboardText();
+			if(pClipboardText)
+			{
+				std::string ClipboardText = Input()->GetClipboardText();
+				if(m_pfnClipboardLineCallback)
+				{
+					// Split clipboard text into multiple lines. Send all complete lines to callback.
+					// The lineinput is set to the last clipboard line.
+					bool FirstLine = true;
+					size_t i, Begin = 0;
+					for(i = 0; i < ClipboardText.length(); i++)
+					{
+						if(ClipboardText[i] == '\n')
+						{
+							if(i == Begin)
+							{
+								Begin++;
+								continue;
+							}
+							std::string Line = ClipboardText.substr(Begin, i - Begin + 1);
+							if(FirstLine)
+							{
+								str_sanitize_cc(Line.data());
+								SetRange(Line.c_str(), m_SelectionStart, m_SelectionEnd);
+								FirstLine = false;
+								Line = GetString();
+							}
+							Begin = i + 1;
+							m_pfnClipboardLineCallback(Line.c_str());
+						}
+					}
+					std::string Line = ClipboardText.substr(Begin, i - Begin + 1);
+					str_sanitize_cc(Line.data());
+					if(FirstLine)
+						SetRange(Line.c_str(), m_SelectionStart, m_SelectionEnd);
+					else
+						Set(Line.c_str());
+				}
+				else
+				{
+					str_sanitize_cc(ClipboardText.data());
+					SetRange(ClipboardText.c_str(), m_SelectionStart, m_SelectionEnd);
+				}
+			}
+			KeyHandled = true;
+		}
+		else if(ModPressed && !AltPressed && (Event.m_Key == KEY_C || Event.m_Key == KEY_X) && SelectionLength)
+		{
+			char *pSelection = m_pStr + m_SelectionStart;
+			const char TempChar = pSelection[SelectionLength];
+			pSelection[SelectionLength] = '\0';
+			Input()->SetClipboardText(pSelection);
+			pSelection[SelectionLength] = TempChar;
+			if(Event.m_Key == KEY_X)
+				SetRange("", m_SelectionStart, m_SelectionEnd);
+			KeyHandled = true;
+		}
+		else if(ModPressed && !AltPressed && Event.m_Key == KEY_A)
+		{
+			m_SelectionStart = 0;
+			m_SelectionEnd = m_CursorPos = m_Len;
+		}
+	}
+
+	m_WasCursorChanged |= OldCursorPos != m_CursorPos;
+	m_WasCursorChanged |= SelectionLength != GetSelectionLength();
+	return m_WasChanged || m_WasCursorChanged || KeyHandled;
+}
+
+STextBoundingBox CLineInput::Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing)
+{
+	// update derived attributes to handle external changes to the buffer
+	UpdateStrData();
+
+	m_WasRendered = true;
+
+	const char *pDisplayStr = GetDisplayedString();
+	const bool HasComposition = Input()->HasComposition();
+
+	if(pDisplayStr[0] == '\0' && !HasComposition && m_pEmptyText != nullptr)
+	{
+		pDisplayStr = m_pEmptyText;
+		m_MouseSelection.m_Selecting = false;
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.75f);
+	}
+
+	CTextCursor Cursor;
+	if(IsActive())
+	{
+		const size_t CursorOffset = GetCursorOffset();
+		const size_t DisplayCursorOffset = OffsetFromActualToDisplay(CursorOffset);
+		const size_t CompositionStart = CursorOffset + Input()->GetCompositionCursor();
+		const size_t DisplayCompositionStart = OffsetFromActualToDisplay(CompositionStart);
+		const size_t CaretOffset = HasComposition ? DisplayCompositionStart : DisplayCursorOffset;
+
+		std::string DisplayStrBuffer;
+		if(HasComposition)
+		{
+			const std::string DisplayStr = std::string(pDisplayStr);
+			DisplayStrBuffer = DisplayStr.substr(0, DisplayCursorOffset) + Input()->GetComposition() + DisplayStr.substr(DisplayCursorOffset);
+			pDisplayStr = DisplayStrBuffer.c_str();
+		}
+
+		const STextBoundingBox BoundingBox = TextRender()->TextBoundingBox(FontSize, pDisplayStr, -1, LineWidth, LineSpacing);
+		const vec2 CursorPos = CUI::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
+
+		TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = LineWidth;
+		Cursor.m_ForceCursorRendering = Changed;
+		Cursor.m_LineSpacing = LineSpacing;
+		Cursor.m_PressMouse.x = m_MouseSelection.m_PressMouse.x;
+		Cursor.m_ReleaseMouse.x = m_MouseSelection.m_ReleaseMouse.x;
+		if(LineWidth < 0.0f)
+		{
+			// Using a Y position that's always inside the line input makes it so the selection does not reset when
+			// the mouse is moved outside the line input while selecting, which would otherwise be very inconvenient.
+			// This is a single line cursor, so we don't need the Y position to support selection over multiple lines.
+			Cursor.m_PressMouse.y = CursorPos.y + BoundingBox.m_H / 2.0f;
+			Cursor.m_ReleaseMouse.y = CursorPos.y + BoundingBox.m_H / 2.0f;
+		}
+		else
+		{
+			Cursor.m_PressMouse.y = m_MouseSelection.m_PressMouse.y;
+			Cursor.m_ReleaseMouse.y = m_MouseSelection.m_ReleaseMouse.y;
+		}
+
+		if(HasComposition)
+		{
+			// We need to track the last composition cursor position separately, because the composition
+			// cursor movement does not cause an input event that would set the Changed variable.
+			Cursor.m_ForceCursorRendering |= m_LastCompositionCursorPos != CaretOffset;
+			m_LastCompositionCursorPos = CaretOffset;
+			const size_t DisplayCompositionEnd = DisplayCursorOffset + Input()->GetCompositionLength();
+			Cursor.m_CursorMode = TEXT_CURSOR_CURSOR_MODE_SET;
+			Cursor.m_CursorCharacter = str_utf8_offset_bytes_to_chars(pDisplayStr, CaretOffset);
+			Cursor.m_CalculateSelectionMode = TEXT_CURSOR_SELECTION_MODE_SET;
+			Cursor.m_SelectionHeightFactor = 0.1f;
+			Cursor.m_SelectionStart = str_utf8_offset_bytes_to_chars(pDisplayStr, DisplayCursorOffset);
+			Cursor.m_SelectionEnd = str_utf8_offset_bytes_to_chars(pDisplayStr, DisplayCompositionEnd);
+			TextRender()->TextSelectionColor(1.0f, 1.0f, 1.0f, 0.8f);
+			TextRender()->TextEx(&Cursor, pDisplayStr);
+			TextRender()->TextSelectionColor(TextRender()->DefaultTextSelectionColor());
+		}
+		else if(GetSelectionLength())
+		{
+			const size_t Start = OffsetFromActualToDisplay(GetSelectionStart());
+			const size_t End = OffsetFromActualToDisplay(GetSelectionEnd());
+			Cursor.m_CursorMode = m_MouseSelection.m_Selecting ? TEXT_CURSOR_CURSOR_MODE_CALCULATE : TEXT_CURSOR_CURSOR_MODE_SET;
+			Cursor.m_CursorCharacter = str_utf8_offset_bytes_to_chars(pDisplayStr, CaretOffset);
+			Cursor.m_CalculateSelectionMode = m_MouseSelection.m_Selecting ? TEXT_CURSOR_SELECTION_MODE_CALCULATE : TEXT_CURSOR_SELECTION_MODE_SET;
+			Cursor.m_SelectionStart = str_utf8_offset_bytes_to_chars(pDisplayStr, Start);
+			Cursor.m_SelectionEnd = str_utf8_offset_bytes_to_chars(pDisplayStr, End);
+			TextRender()->TextEx(&Cursor, pDisplayStr);
+		}
+		else
+		{
+			Cursor.m_CursorMode = m_MouseSelection.m_Selecting ? TEXT_CURSOR_CURSOR_MODE_CALCULATE : TEXT_CURSOR_CURSOR_MODE_SET;
+			Cursor.m_CursorCharacter = str_utf8_offset_bytes_to_chars(pDisplayStr, CaretOffset);
+			Cursor.m_CalculateSelectionMode = m_MouseSelection.m_Selecting ? TEXT_CURSOR_SELECTION_MODE_CALCULATE : TEXT_CURSOR_SELECTION_MODE_NONE;
+			TextRender()->TextEx(&Cursor, pDisplayStr);
+		}
+
+		if(Cursor.m_CursorMode == TEXT_CURSOR_CURSOR_MODE_CALCULATE && Cursor.m_CursorCharacter >= 0)
+		{
+			const size_t NewCursorOffset = str_utf8_offset_chars_to_bytes(pDisplayStr, Cursor.m_CursorCharacter);
+			SetCursorOffset(OffsetFromDisplayToActual(NewCursorOffset));
+		}
+		if(Cursor.m_CalculateSelectionMode == TEXT_CURSOR_SELECTION_MODE_CALCULATE && Cursor.m_SelectionStart >= 0 && Cursor.m_SelectionEnd >= 0)
+		{
+			const size_t NewSelectionStart = str_utf8_offset_chars_to_bytes(pDisplayStr, Cursor.m_SelectionStart);
+			const size_t NewSelectionEnd = str_utf8_offset_chars_to_bytes(pDisplayStr, Cursor.m_SelectionEnd);
+			SetSelection(OffsetFromDisplayToActual(NewSelectionStart), OffsetFromDisplayToActual(NewSelectionEnd));
+		}
+
+		m_CaretPosition = Cursor.m_CursorRenderedPosition;
+
+		CTextCursor CaretCursor;
+		TextRender()->SetCursor(&CaretCursor, CursorPos.x, CursorPos.y, FontSize, 0);
+		CaretCursor.m_LineWidth = LineWidth;
+		CaretCursor.m_LineSpacing = LineSpacing;
+		CaretCursor.m_CursorMode = TEXT_CURSOR_CURSOR_MODE_SET;
+		CaretCursor.m_CursorCharacter = str_utf8_offset_bytes_to_chars(pDisplayStr, DisplayCursorOffset);
+		TextRender()->TextEx(&CaretCursor, pDisplayStr);
+		SetCompositionWindowPosition(CaretCursor.m_CursorRenderedPosition + vec2(0.0f, CaretCursor.m_AlignedFontSize / 2.0f), CaretCursor.m_AlignedFontSize);
+	}
+	else
+	{
+		const STextBoundingBox BoundingBox = TextRender()->TextBoundingBox(FontSize, pDisplayStr, -1, LineWidth, LineSpacing);
+		const vec2 CursorPos = CUI::CalcAlignedCursorPos(pRect, BoundingBox.Size(), Align);
+		TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, FontSize, TEXTFLAG_RENDER);
+		Cursor.m_LineWidth = LineWidth;
+		Cursor.m_LineSpacing = LineSpacing;
+		TextRender()->TextEx(&Cursor, pDisplayStr);
+	}
+
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+
+	return Cursor.BoundingBox();
+}
+
+void CLineInput::RenderCandidates()
+{
+	// Check if the active line input was not rendered and deactivate it in that case.
+	// This can happen e.g. when an input in the ingame menu is active and the menu is
+	// closed or when switching between menu and editor with an active input.
+	CLineInput *pActiveInput = GetActiveInput();
+	if(pActiveInput != nullptr)
+	{
+		if(pActiveInput->m_WasRendered)
+		{
+			pActiveInput->m_WasRendered = false;
+		}
+		else
+		{
+			pActiveInput->Deactivate();
+			return;
+		}
+	}
+
+	if(!Input()->HasComposition() || !Input()->GetCandidateCount())
+		return;
+
+	const float FontSize = 7.0f;
+	const float Padding = 1.0f;
+	const float Margin = 4.0f;
+	const float Height = 300.0f;
+	const float Width = Height * Graphics()->ScreenAspect();
+	const int ScreenWidth = Graphics()->ScreenWidth();
+	const int ScreenHeight = Graphics()->ScreenHeight();
+
+	Graphics()->MapScreen(0.0f, 0.0f, Width, Height);
+
+	// Determine longest candidate width
+	float LongestCandidateWidth = 0.0f;
+	for(int i = 0; i < Input()->GetCandidateCount(); ++i)
+		LongestCandidateWidth = maximum(LongestCandidateWidth, TextRender()->TextWidth(FontSize, Input()->GetCandidate(i)));
+
+	const float NumOffset = 8.0f;
+	const float RectWidth = LongestCandidateWidth + Margin + NumOffset + 2.0f * Padding;
+	const float RectHeight = Input()->GetCandidateCount() * (FontSize + 2.0f * Padding) + Margin;
+
+	vec2 Position = ms_CompositionWindowPosition / vec2(ScreenWidth, ScreenHeight) * vec2(Width, Height);
+	Position.y += Margin;
+
+	// Move candidate window left if needed
+	if(Position.x + RectWidth + Margin > Width)
+		Position.x -= Position.x + RectWidth + Margin - Width;
+
+	// Move candidate window up if needed
+	if(Position.y + RectHeight + Margin > Height)
+		Position.y -= RectHeight + ms_CompositionLineHeight / ScreenHeight * Height + 2.0f * Margin;
+
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	Graphics()->BlendNormal();
+
+	// Draw window shadow
+	Graphics()->SetColor(0.0f, 0.0f, 0.0f, 0.8f);
+	IGraphics::CQuadItem Quad = IGraphics::CQuadItem(Position.x + 0.75f, Position.y + 0.75f, RectWidth, RectHeight);
+	Graphics()->QuadsDrawTL(&Quad, 1);
+
+	// Draw window background
+	Graphics()->SetColor(0.15f, 0.15f, 0.15f, 1.0f);
+	Quad = IGraphics::CQuadItem(Position.x, Position.y, RectWidth, RectHeight);
+	Graphics()->QuadsDrawTL(&Quad, 1);
+
+	// Draw selected entry highlight
+	Graphics()->SetColor(0.1f, 0.4f, 0.8f, 1.0f);
+	Quad = IGraphics::CQuadItem(Position.x + Margin / 4.0f, Position.y + Margin / 2.0f + Input()->GetCandidateSelectedIndex() * (FontSize + 2.0f * Padding), RectWidth - Margin / 2.0f, FontSize + 2.0f * Padding);
+	Graphics()->QuadsDrawTL(&Quad, 1);
+	Graphics()->QuadsEnd();
+
+	// Draw candidates
+	for(int i = 0; i < Input()->GetCandidateCount(); ++i)
+	{
+		char aBuf[3];
+		str_format(aBuf, sizeof(aBuf), "%d.", (i + 1) % 10);
+
+		const float PosX = Position.x + Margin / 2.0f + Padding;
+		const float PosY = Position.y + Margin / 2.0f + i * (FontSize + 2.0f * Padding) + Padding;
+		TextRender()->TextColor(0.6f, 0.6f, 0.6f, 1.0f);
+		TextRender()->Text(PosX, PosY, FontSize, aBuf);
+		TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+		TextRender()->Text(PosX + NumOffset, PosY, FontSize, Input()->GetCandidate(i));
+	}
+}
+
+void CLineInput::SetCompositionWindowPosition(vec2 Anchor, float LineHeight)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	const int ScreenWidth = Graphics()->ScreenWidth();
+	const int ScreenHeight = Graphics()->ScreenHeight();
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	const vec2 ScreenScale = vec2(ScreenWidth / (ScreenX1 - ScreenX0), ScreenHeight / (ScreenY1 - ScreenY0));
+	ms_CompositionWindowPosition = Anchor * ScreenScale;
+	ms_CompositionLineHeight = LineHeight * ScreenScale.y;
+	Input()->SetCompositionWindowPosition(ms_CompositionWindowPosition.x, ms_CompositionWindowPosition.y, ms_CompositionLineHeight);
+}
+
+void CLineInput::Activate(EInputPriority Priority)
+{
+	if(IsActive())
+		return;
+	if(ms_ActiveInputPriority != EInputPriority::NONE && Priority < ms_ActiveInputPriority)
+		return; // do not replace a higher priority input
+	if(ms_pActiveInput)
+		ms_pActiveInput->OnDeactivate();
+	ms_pActiveInput = this;
+	ms_pActiveInput->OnActivate();
+	ms_ActiveInputPriority = Priority;
+}
+
+void CLineInput::Deactivate() const
+{
+	if(!IsActive())
+		return;
+	ms_pActiveInput->OnDeactivate();
+	ms_pActiveInput = nullptr;
+	ms_ActiveInputPriority = EInputPriority::NONE;
+}
+
+void CLineInput::OnActivate()
+{
+	Input()->StartTextInput();
+}
+
+void CLineInput::OnDeactivate()
+{
+	Input()->StopTextInput();
+	m_MouseSelection.m_Selecting = false;
+}
+
+void CLineInputNumber::SetInteger(int Number, int Base, int HexPrefix)
+{
+	char aBuf[32];
+	switch(Base)
+	{
+	case 10:
+		str_from_int(Number, aBuf);
+		break;
+	case 16:
+		str_format(aBuf, sizeof(aBuf), "%0*X", HexPrefix, Number);
+		break;
+	default:
+		dbg_assert(false, "Base unsupported");
+		return;
+	}
+	if(str_comp(aBuf, GetString()) != 0)
+		Set(aBuf);
+}
+
+int CLineInputNumber::GetInteger(int Base) const
+{
+	return str_toint_base(GetString(), Base);
+}
+
+void CLineInputNumber::SetInteger64(int64_t Number, int Base, int HexPrefix)
+{
+	char aBuf[64];
+	switch(Base)
+	{
+	case 10:
+		str_format(aBuf, sizeof(aBuf), "%" PRId64, Number);
+		break;
+	case 16:
+		str_format(aBuf, sizeof(aBuf), "%0*" PRIX64, HexPrefix, Number);
+		break;
+	default:
+		dbg_assert(false, "Base unsupported");
+		return;
+	}
+	if(str_comp(aBuf, GetString()) != 0)
+		Set(aBuf);
+}
+
+int64_t CLineInputNumber::GetInteger64(int Base) const
+{
+	return str_toint64_base(GetString(), Base);
+}
+
+void CLineInputNumber::SetFloat(float Number)
+{
+	char aBuf[32];
+	str_format(aBuf, sizeof(aBuf), "%.3f", Number);
+	if(str_comp(aBuf, GetString()) != 0)
+		Set(aBuf);
+}
+
+float CLineInputNumber::GetFloat() const
+{
+	return str_tofloat(GetString());
+}
diff --git a/src_bkp/game/client/lineinput.h b/src_bkp/game/client/lineinput.h
new file mode 100644
index 0000000000..0bd405a041
--- /dev/null
+++ b/src_bkp/game/client/lineinput.h
@@ -0,0 +1,244 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_LINEINPUT_H
+#define GAME_CLIENT_LINEINPUT_H
+
+#include <base/vmath.h>
+
+#include <engine/client.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/textrender.h>
+
+#include <game/client/ui_rect.h>
+
+enum class EInputPriority
+{
+	NONE = 0,
+	UI,
+	CHAT,
+	CONSOLE,
+};
+
+// line input helper
+class CLineInput
+{
+public:
+	struct SMouseSelection
+	{
+		bool m_Selecting = false;
+		vec2 m_PressMouse = vec2(0.0f, 0.0f);
+		vec2 m_ReleaseMouse = vec2(0.0f, 0.0f);
+		vec2 m_Offset = vec2(0.0f, 0.0f);
+	};
+
+	typedef std::function<void(const char *pLine)> FClipboardLineCallback;
+	typedef std::function<const char *(char *pCurrentText, size_t NumChars)> FDisplayTextCallback;
+	typedef std::function<bool()> FCalculateOffsetCallback;
+
+private:
+	static IClient *ms_pClient;
+	static IGraphics *ms_pGraphics;
+	static IInput *ms_pInput;
+	static ITextRender *ms_pTextRender;
+
+	static IClient *Client() { return ms_pClient; }
+	static IGraphics *Graphics() { return ms_pGraphics; }
+	static IInput *Input() { return ms_pInput; }
+	static ITextRender *TextRender() { return ms_pTextRender; }
+
+	static CLineInput *ms_pActiveInput;
+	static EInputPriority ms_ActiveInputPriority;
+
+	static vec2 ms_CompositionWindowPosition;
+	static float ms_CompositionLineHeight;
+
+	static char ms_aStars[128];
+
+	char *m_pStr = nullptr; // explicitly set to nullptr outside of constructor, so SetBuffer works in this case
+	size_t m_MaxSize;
+	size_t m_MaxChars;
+	size_t m_Len;
+	size_t m_NumChars;
+
+	size_t m_CursorPos;
+	size_t m_SelectionStart;
+	size_t m_SelectionEnd;
+
+	float m_ScrollOffset;
+	float m_ScrollOffsetChange;
+	vec2 m_CaretPosition;
+	SMouseSelection m_MouseSelection;
+	size_t m_LastCompositionCursorPos;
+
+	bool m_Hidden;
+	const char *m_pEmptyText;
+	FClipboardLineCallback m_pfnClipboardLineCallback;
+	FDisplayTextCallback m_pfnDisplayTextCallback;
+	FCalculateOffsetCallback m_pfnCalculateOffsetCallback;
+	bool m_WasChanged;
+	bool m_WasCursorChanged;
+	bool m_WasRendered;
+
+	char m_ClearButtonId;
+
+	void UpdateStrData();
+	enum EMoveDirection
+	{
+		FORWARD,
+		REWIND
+	};
+	static void MoveCursor(EMoveDirection Direction, bool MoveWord, const char *pStr, size_t MaxSize, size_t *pCursorPos);
+	static void SetCompositionWindowPosition(vec2 Anchor, float LineHeight);
+
+	void OnActivate();
+	void OnDeactivate();
+
+public:
+	static void Init(IClient *pClient, IGraphics *pGraphics, IInput *pInput, ITextRender *pTextRender)
+	{
+		ms_pClient = pClient;
+		ms_pGraphics = pGraphics;
+		ms_pInput = pInput;
+		ms_pTextRender = pTextRender;
+	}
+	static void RenderCandidates();
+
+	static CLineInput *GetActiveInput() { return ms_pActiveInput; }
+
+	CLineInput()
+	{
+		SetBuffer(nullptr, 0, 0);
+	}
+
+	CLineInput(char *pStr, size_t MaxSize)
+	{
+		SetBuffer(pStr, MaxSize);
+	}
+
+	CLineInput(char *pStr, size_t MaxSize, size_t MaxChars)
+	{
+		SetBuffer(pStr, MaxSize, MaxChars);
+	}
+
+	void SetBuffer(char *pStr, size_t MaxSize) { SetBuffer(pStr, MaxSize, MaxSize); }
+	void SetBuffer(char *pStr, size_t MaxSize, size_t MaxChars);
+
+	void Clear();
+	void Set(const char *pString);
+	void SetRange(const char *pString, size_t Begin, size_t End);
+	void Insert(const char *pString, size_t Begin);
+	void Append(const char *pString);
+
+	const char *GetString() const { return m_pStr; }
+	const char *GetDisplayedString();
+	size_t GetMaxSize() const { return m_MaxSize; }
+	size_t GetMaxChars() const { return m_MaxChars; }
+	size_t GetLength() const { return m_Len; }
+	size_t GetNumChars() const { return m_NumChars; }
+	bool IsEmpty() const { return GetLength() == 0; }
+
+	size_t GetCursorOffset() const { return m_CursorPos; }
+	void SetCursorOffset(size_t Offset);
+	size_t GetSelectionStart() const { return m_SelectionStart; }
+	size_t GetSelectionEnd() const { return m_SelectionEnd; }
+	size_t GetSelectionLength() const { return m_SelectionEnd - m_SelectionStart; }
+	bool HasSelection() const { return GetSelectionLength() > 0; }
+	void SetSelection(size_t Start, size_t End);
+	void SelectNothing() { SetSelection(GetCursorOffset(), GetCursorOffset()); }
+	void SelectAll()
+	{
+		SetCursorOffset(GetLength());
+		SetSelection(0, GetLength());
+	}
+
+	size_t OffsetFromActualToDisplay(size_t ActualOffset);
+	size_t OffsetFromDisplayToActual(size_t DisplayOffset);
+
+	// used either for vertical or horizontal scrolling
+	float GetScrollOffset() const { return m_ScrollOffset; }
+	void SetScrollOffset(float ScrollOffset) { m_ScrollOffset = ScrollOffset; }
+	float GetScrollOffsetChange() const { return m_ScrollOffsetChange; }
+	void SetScrollOffsetChange(float ScrollOffsetChange) { m_ScrollOffsetChange = ScrollOffsetChange; }
+
+	vec2 GetCaretPosition() const { return m_CaretPosition; } // only updated while the input is active
+
+	bool IsHidden() const { return m_Hidden; }
+	void SetHidden(bool Hidden) { m_Hidden = Hidden; }
+
+	const char *GetEmptyText() const { return m_pEmptyText; }
+	void SetEmptyText(const char *pText) { m_pEmptyText = pText; }
+
+	void SetClipboardLineCallback(FClipboardLineCallback pfnClipboardLineCallback) { m_pfnClipboardLineCallback = pfnClipboardLineCallback; }
+	void SetDisplayTextCallback(FDisplayTextCallback pfnDisplayTextCallback) { m_pfnDisplayTextCallback = pfnDisplayTextCallback; }
+	void SetCalculateOffsetCallback(FCalculateOffsetCallback pfnCalculateOffsetCallback) { m_pfnCalculateOffsetCallback = pfnCalculateOffsetCallback; }
+
+	bool ProcessInput(const IInput::CEvent &Event);
+	bool WasChanged()
+	{
+		const bool Changed = m_WasChanged;
+		m_WasChanged = false;
+		return Changed;
+	}
+	bool WasCursorChanged()
+	{
+		const bool Changed = m_WasCursorChanged;
+		m_WasCursorChanged = false;
+		return Changed;
+	}
+
+	STextBoundingBox Render(const CUIRect *pRect, float FontSize, int Align, bool Changed, float LineWidth, float LineSpacing);
+	SMouseSelection *GetMouseSelection() { return &m_MouseSelection; }
+
+	const void *GetClearButtonId() const { return &m_ClearButtonId; }
+
+	bool IsActive() const { return GetActiveInput() == this; }
+	void Activate(EInputPriority Priority);
+	void Deactivate() const;
+};
+
+template<size_t MaxSize, size_t MaxChars = MaxSize>
+class CLineInputBuffered : public CLineInput
+{
+	char m_aBuffer[MaxSize];
+
+public:
+	CLineInputBuffered() :
+		CLineInput()
+	{
+		m_aBuffer[0] = '\0';
+		SetBuffer(m_aBuffer, MaxSize, MaxChars);
+	}
+};
+
+class CLineInputNumber : public CLineInputBuffered<32>
+{
+public:
+	CLineInputNumber() :
+		CLineInputBuffered()
+	{
+	}
+
+	CLineInputNumber(int Number) :
+		CLineInputBuffered()
+	{
+		SetInteger(Number);
+	}
+
+	CLineInputNumber(float Number) :
+		CLineInputBuffered()
+	{
+		SetFloat(Number);
+	}
+
+	void SetInteger(int Number, int Base = 10, int HexPrefix = 6);
+	int GetInteger(int Base = 10) const;
+
+	void SetInteger64(int64_t Number, int Base = 10, int HexPrefix = 6);
+	int64_t GetInteger64(int Base = 10) const;
+
+	void SetFloat(float Number);
+	float GetFloat() const;
+};
+
+#endif
diff --git a/src_bkp/game/client/pickup_data.cpp b/src_bkp/game/client/pickup_data.cpp
new file mode 100644
index 0000000000..8e60c96375
--- /dev/null
+++ b/src_bkp/game/client/pickup_data.cpp
@@ -0,0 +1,41 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "pickup_data.h"
+
+#include <engine/shared/snapshot.h>
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+
+CPickupData ExtractPickupInfo(int NetObjType, const void *pData, const CNetObj_EntityEx *pEntEx)
+{
+	if(NetObjType == NETOBJTYPE_DDNETPICKUP)
+	{
+		return ExtractPickupInfoDDNet((CNetObj_DDNetPickup *)pData);
+	}
+
+	CNetObj_Pickup *pPickup = (CNetObj_Pickup *)pData;
+
+	CPickupData Result = {vec2(0, 0)};
+
+	Result.m_Pos.x = pPickup->m_X;
+	Result.m_Pos.y = pPickup->m_Y;
+	Result.m_Type = pPickup->m_Type;
+	Result.m_Subtype = pPickup->m_Subtype;
+	Result.m_SwitchNumber = pEntEx ? pEntEx->m_SwitchNumber : 0;
+
+	return Result;
+}
+
+CPickupData ExtractPickupInfoDDNet(const CNetObj_DDNetPickup *pPickup)
+{
+	CPickupData Result = {vec2(0, 0)};
+
+	Result.m_Pos.x = pPickup->m_X;
+	Result.m_Pos.y = pPickup->m_Y;
+	Result.m_Type = pPickup->m_Type;
+	Result.m_Subtype = pPickup->m_Subtype;
+	Result.m_SwitchNumber = pPickup->m_SwitchNumber;
+
+	return Result;
+}
diff --git a/src_bkp/game/client/pickup_data.h b/src_bkp/game/client/pickup_data.h
new file mode 100644
index 0000000000..2e8f94c40b
--- /dev/null
+++ b/src_bkp/game/client/pickup_data.h
@@ -0,0 +1,24 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PICKUP_DATA_H
+#define GAME_CLIENT_PICKUP_DATA_H
+
+#include <base/vmath.h>
+
+struct CNetObj_Pickup;
+struct CNetObj_DDNetPickup;
+struct CNetObj_EntityEx;
+
+class CPickupData
+{
+public:
+	vec2 m_Pos;
+	int m_Type;
+	int m_Subtype;
+	int m_SwitchNumber;
+};
+
+CPickupData ExtractPickupInfo(int NetObjType, const void *pData, const CNetObj_EntityEx *pEntEx);
+CPickupData ExtractPickupInfoDDNet(const CNetObj_DDNetPickup *pPickup);
+
+#endif // GAME_CLIENT_PICKUP_DATA_H
diff --git a/src_bkp/game/client/prediction/entities/character.cpp b/src_bkp/game/client/prediction/entities/character.cpp
new file mode 100644
index 0000000000..d1c1570f13
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/character.cpp
@@ -0,0 +1,1384 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/shared/config.h>
+#include <game/collision.h>
+#include <game/generated/client_data.h>
+#include <game/mapitems.h>
+
+#include "character.h"
+#include "laser.h"
+#include "projectile.h"
+
+// Character, "physical" player's part
+
+void CCharacter::SetWeapon(int W)
+{
+	if(W == m_Core.m_ActiveWeapon)
+		return;
+
+	m_LastWeapon = m_Core.m_ActiveWeapon;
+	m_QueuedWeapon = -1;
+	SetActiveWeapon(W);
+
+	if(m_Core.m_ActiveWeapon < 0 || m_Core.m_ActiveWeapon >= NUM_WEAPONS)
+		SetActiveWeapon(0);
+}
+
+void CCharacter::SetSolo(bool Solo)
+{
+	m_Core.m_Solo = Solo;
+	TeamsCore()->SetSolo(GetCID(), Solo);
+}
+
+void CCharacter::SetSuper(bool Super)
+{
+	m_Core.m_Super = Super;
+	if(m_Core.m_Super)
+		TeamsCore()->Team(GetCID(), TeamsCore()->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER);
+}
+
+bool CCharacter::IsGrounded()
+{
+	if(Collision()->CheckPoint(m_Pos.x + GetProximityRadius() / 2, m_Pos.y + GetProximityRadius() / 2 + 5))
+		return true;
+	if(Collision()->CheckPoint(m_Pos.x - GetProximityRadius() / 2, m_Pos.y + GetProximityRadius() / 2 + 5))
+		return true;
+
+	int MoveRestrictionsBelow = Collision()->GetMoveRestrictions(m_Pos + vec2(0, GetProximityRadius() / 2 + 4), 0.0f);
+	return (MoveRestrictionsBelow & CANTMOVE_DOWN) != 0;
+}
+
+void CCharacter::HandleJetpack()
+{
+	if(m_NumInputs < 2)
+		return;
+
+	vec2 Direction = normalize(vec2(m_LatestInput.m_TargetX, m_LatestInput.m_TargetY));
+
+	bool FullAuto = false;
+	if(m_Core.m_ActiveWeapon == WEAPON_GRENADE || m_Core.m_ActiveWeapon == WEAPON_SHOTGUN || m_Core.m_ActiveWeapon == WEAPON_LASER)
+		FullAuto = true;
+	if(m_Core.m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
+		FullAuto = true;
+
+	// check if we gonna fire
+	bool WillFire = false;
+	if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
+		WillFire = true;
+
+	if(FullAuto && (m_LatestInput.m_Fire & 1) && m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
+		WillFire = true;
+
+	if(!WillFire)
+		return;
+
+	// check for ammo
+	if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo || m_FreezeTime)
+	{
+		return;
+	}
+
+	switch(m_Core.m_ActiveWeapon)
+	{
+	case WEAPON_GUN:
+	{
+		if(m_Core.m_Jetpack)
+		{
+			float Strength = GetTuning(m_TuneZone)->m_JetpackStrength;
+			if(!m_TuneZone)
+				Strength = m_LastJetpackStrength;
+			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, GetCID(), m_Core.m_ActiveWeapon);
+		}
+	}
+	}
+}
+
+void CCharacter::RemoveNinja()
+{
+	m_Core.m_Ninja.m_CurrentMoveTime = 0;
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Got = false;
+	m_Core.m_ActiveWeapon = m_LastWeapon;
+
+	SetWeapon(m_Core.m_ActiveWeapon);
+}
+
+void CCharacter::HandleNinja()
+{
+	if(m_Core.m_ActiveWeapon != WEAPON_NINJA)
+		return;
+
+	if((GameWorld()->GameTick() - m_Core.m_Ninja.m_ActivationTick) > (g_pData->m_Weapons.m_Ninja.m_Duration * GameWorld()->GameTickSpeed() / 1000))
+	{
+		// time's up, return
+		RemoveNinja();
+		return;
+	}
+
+	// force ninja Weapon
+	SetWeapon(WEAPON_NINJA);
+
+	m_Core.m_Ninja.m_CurrentMoveTime--;
+
+	if(m_Core.m_Ninja.m_CurrentMoveTime == 0)
+	{
+		// reset velocity
+		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * m_Core.m_Ninja.m_OldVelAmount;
+	}
+
+	if(m_Core.m_Ninja.m_CurrentMoveTime > 0)
+	{
+		// Set velocity
+		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * g_pData->m_Weapons.m_Ninja.m_Velocity;
+		vec2 OldPos = m_Pos;
+		Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(m_ProximityRadius, m_ProximityRadius), vec2(GetTuning(m_TuneZone)->m_GroundElasticityX, GetTuning(m_TuneZone)->m_GroundElasticityY));
+
+		// reset velocity so the client doesn't predict stuff
+		m_Core.m_Vel = vec2(0.f, 0.f);
+
+		// check if we Hit anything along the way
+		{
+			CEntity *apEnts[MAX_CLIENTS];
+			float Radius = m_ProximityRadius * 2.0f;
+			int Num = GameWorld()->FindEntities(OldPos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+			// check that we're not in solo part
+			if(TeamsCore()->GetSolo(GetCID()))
+				return;
+
+			for(int i = 0; i < Num; ++i)
+			{
+				auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+				if(pChr == this)
+					continue;
+
+				// Don't hit players in other teams
+				if(Team() != pChr->Team())
+					continue;
+
+				// Don't hit players in solo parts
+				if(TeamsCore()->GetSolo(pChr->GetCID()))
+					return;
+
+				// make sure we haven't Hit this object before
+				bool bAlreadyHit = false;
+				for(int j = 0; j < m_NumObjectsHit; j++)
+				{
+					if(m_aHitObjects[j] == pChr->GetCID())
+						bAlreadyHit = true;
+				}
+				if(bAlreadyHit)
+					continue;
+
+				// check so we are sufficiently close
+				if(distance(pChr->m_Pos, m_Pos) > (m_ProximityRadius * 2.0f))
+					continue;
+
+				// Hit a player, give them damage and stuffs...
+				// set his velocity to fast upward (for now)
+				if(m_NumObjectsHit < 10)
+					m_aHitObjects[m_NumObjectsHit++] = pChr->GetCID();
+
+				CCharacter *pChar = GameWorld()->GetCharacterByID(pChr->GetCID());
+				if(pChar)
+					pChar->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, GetCID(), WEAPON_NINJA);
+			}
+		}
+
+		return;
+	}
+}
+
+void CCharacter::DoWeaponSwitch()
+{
+	// make sure we can switch
+	if(m_ReloadTimer != 0 || m_QueuedWeapon == -1 || m_Core.m_aWeapons[WEAPON_NINJA].m_Got || !m_Core.m_aWeapons[m_QueuedWeapon].m_Got)
+		return;
+
+	// switch Weapon
+	SetWeapon(m_QueuedWeapon);
+}
+
+void CCharacter::HandleWeaponSwitch()
+{
+	if(m_NumInputs < 2)
+		return;
+
+	int WantedWeapon = m_Core.m_ActiveWeapon;
+	if(m_QueuedWeapon != -1)
+		WantedWeapon = m_QueuedWeapon;
+
+	bool Anything = false;
+	for(int i = 0; i < NUM_WEAPONS - 1; ++i)
+		if(m_Core.m_aWeapons[i].m_Got)
+			Anything = true;
+	if(!Anything)
+		return;
+	// select Weapon
+	int Next = CountInput(m_LatestPrevInput.m_NextWeapon, m_LatestInput.m_NextWeapon).m_Presses;
+	int Prev = CountInput(m_LatestPrevInput.m_PrevWeapon, m_LatestInput.m_PrevWeapon).m_Presses;
+
+	if(Next < 128) // make sure we only try sane stuff
+	{
+		while(Next) // Next Weapon selection
+		{
+			WantedWeapon = (WantedWeapon + 1) % NUM_WEAPONS;
+			if(m_Core.m_aWeapons[WantedWeapon].m_Got)
+				Next--;
+		}
+	}
+
+	if(Prev < 128) // make sure we only try sane stuff
+	{
+		while(Prev) // Prev Weapon selection
+		{
+			WantedWeapon = (WantedWeapon - 1) < 0 ? NUM_WEAPONS - 1 : WantedWeapon - 1;
+			if(m_Core.m_aWeapons[WantedWeapon].m_Got)
+				Prev--;
+		}
+	}
+
+	// Direct Weapon selection
+	if(m_LatestInput.m_WantedWeapon)
+		WantedWeapon = m_Input.m_WantedWeapon - 1;
+
+	// check for insane values
+	if(WantedWeapon >= 0 && WantedWeapon < NUM_WEAPONS && WantedWeapon != m_Core.m_ActiveWeapon && m_Core.m_aWeapons[WantedWeapon].m_Got)
+		m_QueuedWeapon = WantedWeapon;
+
+	DoWeaponSwitch();
+}
+
+void CCharacter::FireWeapon()
+{
+	if(m_NumInputs < 2)
+		return;
+
+	if(!GameWorld()->m_WorldConfig.m_PredictWeapons)
+		return;
+
+	if(m_ReloadTimer != 0)
+		return;
+
+	DoWeaponSwitch();
+	vec2 Direction = normalize(vec2(m_LatestInput.m_TargetX, m_LatestInput.m_TargetY));
+
+	bool FullAuto = false;
+	if(m_Core.m_ActiveWeapon == WEAPON_GRENADE || m_Core.m_ActiveWeapon == WEAPON_SHOTGUN || m_Core.m_ActiveWeapon == WEAPON_LASER)
+		FullAuto = true;
+	if(m_Core.m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
+		FullAuto = true;
+	if(m_FrozenLastTick)
+		FullAuto = true;
+
+	// don't fire hammer when player is deep and sv_deepfly is disabled
+	if(!g_Config.m_SvDeepfly && m_Core.m_ActiveWeapon == WEAPON_HAMMER && m_Core.m_DeepFrozen)
+		return;
+
+	// check if we gonna fire
+	bool WillFire = false;
+	if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
+		WillFire = true;
+
+	if(FullAuto && (m_LatestInput.m_Fire & 1) && m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
+		WillFire = true;
+
+	if(!WillFire)
+		return;
+
+	// check for ammo
+	if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo || m_FreezeTime)
+	{
+		return;
+	}
+
+	vec2 ProjStartPos = m_Pos + Direction * m_ProximityRadius * 0.75f;
+
+	switch(m_Core.m_ActiveWeapon)
+	{
+	case WEAPON_HAMMER:
+	{
+		// reset objects Hit
+		m_NumObjectsHit = 0;
+
+		if(m_Core.m_HammerHitDisabled)
+			break;
+
+		CEntity *apEnts[MAX_CLIENTS];
+		int Hits = 0;
+		int Num = GameWorld()->FindEntities(ProjStartPos, m_ProximityRadius * 0.5f, apEnts,
+			MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+		for(int i = 0; i < Num; ++i)
+		{
+			auto *pTarget = static_cast<CCharacter *>(apEnts[i]);
+
+			if((pTarget == this || !CanCollide(pTarget->GetCID())))
+				continue;
+
+			// set his velocity to fast upward (for now)
+
+			vec2 Dir;
+			if(length(pTarget->m_Pos - m_Pos) > 0.0f)
+				Dir = normalize(pTarget->m_Pos - m_Pos);
+			else
+				Dir = vec2(0.f, -1.f);
+
+			float Strength = GetTuning(m_TuneZone)->m_HammerStrength;
+
+			vec2 Temp = pTarget->m_Core.m_Vel + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;
+			Temp = ClampVel(pTarget->m_MoveRestrictions, Temp);
+			Temp -= pTarget->m_Core.m_Vel;
+
+			vec2 Force = vec2(0.f, -1.0f) + Temp;
+
+			if(GameWorld()->m_WorldConfig.m_IsFNG)
+			{
+				if(m_GameTeam == pTarget->m_GameTeam && pTarget->m_LastSnapWeapon == WEAPON_NINJA) // melt hammer
+				{
+					Force.x *= 50 * 0.01f;
+					Force.y *= 50 * 0.01f;
+				}
+				else
+				{
+					Force.x *= 320 * 0.01f;
+					Force.y *= 120 * 0.01f;
+				}
+			}
+			else
+				Force *= Strength;
+
+			pTarget->TakeDamage(Force, g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage,
+				GetCID(), m_Core.m_ActiveWeapon);
+			pTarget->UnFreeze();
+
+			Hits++;
+		}
+
+		// if we Hit anything, we have to wait for the reload
+		if(Hits)
+		{
+			float FireDelay = GetTuning(m_TuneZone)->m_HammerHitFireDelay;
+			m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;
+		}
+	}
+	break;
+
+	case WEAPON_GUN:
+	{
+		if(!m_Core.m_Jetpack)
+		{
+			int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GunLifetime);
+
+			new CProjectile(
+				GameWorld(),
+				WEAPON_GUN, //Type
+				GetCID(), //Owner
+				ProjStartPos, //Pos
+				Direction, //Dir
+				Lifetime, //Span
+				false, //Freeze
+				false, //Explosive
+				0, //Force
+				-1 //SoundImpact
+			);
+		}
+	}
+	break;
+
+	case WEAPON_SHOTGUN:
+	{
+		if(GameWorld()->m_WorldConfig.m_IsVanilla)
+		{
+			int ShotSpread = 2;
+			for(int i = -ShotSpread; i <= ShotSpread; ++i)
+			{
+				const float aSpreading[] = {-0.185f, -0.070f, 0, 0.070f, 0.185f};
+				float a = angle(Direction);
+				a += aSpreading[i + 2];
+				float v = 1 - (absolute(i) / (float)ShotSpread);
+				float Speed = mix((float)Tuning()->m_ShotgunSpeeddiff, 1.0f, v);
+				new CProjectile(
+					GameWorld(),
+					WEAPON_SHOTGUN, //Type
+					GetCID(), //Owner
+					ProjStartPos, //Pos
+					direction(a) * Speed, //Dir
+					(int)(GameWorld()->GameTickSpeed() * Tuning()->m_ShotgunLifetime), //Span
+					false, //Freeze
+					false, //Explosive
+					-1 //SoundImpact
+				);
+			}
+		}
+		else if(GameWorld()->m_WorldConfig.m_IsDDRace)
+		{
+			float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
+
+			new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCID(), WEAPON_SHOTGUN);
+		}
+	}
+	break;
+
+	case WEAPON_GRENADE:
+	{
+		int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GrenadeLifetime);
+
+		new CProjectile(
+			GameWorld(),
+			WEAPON_GRENADE, //Type
+			GetCID(), //Owner
+			ProjStartPos, //Pos
+			Direction, //Dir
+			Lifetime, //Span
+			false, //Freeze
+			true, //Explosive
+			SOUND_GRENADE_EXPLODE //SoundImpact
+		); //SoundImpact
+	}
+	break;
+
+	case WEAPON_LASER:
+	{
+		float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
+
+		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCID(), WEAPON_LASER);
+	}
+	break;
+
+	case WEAPON_NINJA:
+	{
+		// reset Hit objects
+		m_NumObjectsHit = 0;
+
+		m_Core.m_Ninja.m_ActivationDir = Direction;
+		m_Core.m_Ninja.m_CurrentMoveTime = g_pData->m_Weapons.m_Ninja.m_Movetime * GameWorld()->GameTickSpeed() / 1000;
+		m_Core.m_Ninja.m_OldVelAmount = length(m_Core.m_Vel);
+	}
+	break;
+	}
+
+	m_AttackTick = GameWorld()->GameTick(); // NOLINT(clang-analyzer-unix.Malloc)
+
+	if(!m_ReloadTimer)
+	{
+		float FireDelay;
+		GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+
+		m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;
+	}
+}
+
+void CCharacter::HandleWeapons()
+{
+	//ninja
+	HandleNinja();
+	HandleJetpack();
+
+	// check reload timer
+	if(m_ReloadTimer)
+	{
+		m_ReloadTimer--;
+		return;
+	}
+
+	// fire Weapon, if wanted
+	FireWeapon();
+}
+
+void CCharacter::GiveNinja()
+{
+	m_Core.m_Ninja.m_ActivationTick = GameWorld()->GameTick();
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Got = true;
+	if(m_FreezeTime == 0)
+		m_Core.m_aWeapons[WEAPON_NINJA].m_Ammo = -1;
+	if(m_Core.m_ActiveWeapon != WEAPON_NINJA)
+		m_LastWeapon = m_Core.m_ActiveWeapon;
+	SetActiveWeapon(WEAPON_NINJA);
+}
+
+void CCharacter::OnPredictedInput(CNetObj_PlayerInput *pNewInput)
+{
+	// skip the input if chat is active
+	if(!GameWorld()->m_WorldConfig.m_BugDDRaceInput && pNewInput->m_PlayerFlags & PLAYERFLAG_CHATTING)
+	{
+		// save the reset input
+		mem_copy(&m_SavedInput, &m_Input, sizeof(m_SavedInput));
+		return;
+	}
+
+	// copy new input
+	mem_copy(&m_Input, pNewInput, sizeof(m_Input));
+	//m_NumInputs++;
+
+	// it is not allowed to aim in the center
+	if(m_Input.m_TargetX == 0 && m_Input.m_TargetY == 0)
+		m_Input.m_TargetY = -1;
+
+	mem_copy(&m_SavedInput, &m_Input, sizeof(m_SavedInput));
+}
+
+void CCharacter::OnDirectInput(CNetObj_PlayerInput *pNewInput)
+{
+	// skip the input if chat is active
+	if(!GameWorld()->m_WorldConfig.m_BugDDRaceInput && pNewInput->m_PlayerFlags & PLAYERFLAG_CHATTING)
+	{
+		// reset input
+		ResetInput();
+		// mods that do not allow inputs to be held while chatting also do not allow to hold hook
+		m_Input.m_Hook = 0;
+		return;
+	}
+
+	m_NumInputs++;
+	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
+	mem_copy(&m_LatestInput, pNewInput, sizeof(m_LatestInput));
+
+	// it is not allowed to aim in the center
+	if(m_LatestInput.m_TargetX == 0 && m_LatestInput.m_TargetY == 0)
+		m_LatestInput.m_TargetY = -1;
+
+	if(m_NumInputs > 1 && Team() != TEAM_SPECTATORS)
+	{
+		HandleWeaponSwitch();
+		FireWeapon();
+	}
+
+	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
+}
+
+void CCharacter::ResetInput()
+{
+	m_Input.m_Direction = 0;
+	// m_Input.m_Hook = 0;
+	// simulate releasing the fire button
+	if((m_Input.m_Fire & 1) != 0)
+		m_Input.m_Fire++;
+	m_Input.m_Fire &= INPUT_STATE_MASK;
+	m_Input.m_Jump = 0;
+	m_LatestPrevInput = m_LatestInput = m_Input;
+}
+
+void CCharacter::PreTick()
+{
+	DDRaceTick();
+
+	m_Core.m_Input = m_Input;
+	m_Core.Tick(true, !m_pGameWorld->m_WorldConfig.m_NoWeakHookAndBounce);
+}
+
+void CCharacter::Tick()
+{
+	if(m_pGameWorld->m_WorldConfig.m_NoWeakHookAndBounce)
+	{
+		m_Core.TickDeferred();
+	}
+	else
+	{
+		PreTick();
+	}
+
+	// handle Weapons
+	HandleWeapons();
+
+	DDRacePostCoreTick();
+
+	// Previnput
+	m_PrevInput = m_Input;
+
+	m_PrevPrevPos = m_PrevPos;
+	m_PrevPos = m_Core.m_Pos;
+}
+
+void CCharacter::TickDeferred()
+{
+	m_Core.Move();
+	m_Core.Quantize();
+	m_Pos = m_Core.m_Pos;
+}
+
+bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
+{
+	vec2 Temp = m_Core.m_Vel + Force;
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, Temp);
+	return true;
+}
+
+// DDRace
+
+bool CCharacter::CanCollide(int ClientID)
+{
+	return TeamsCore()->CanCollide(GetCID(), ClientID);
+}
+
+bool CCharacter::SameTeam(int ClientID)
+{
+	return TeamsCore()->SameTeam(GetCID(), ClientID);
+}
+
+int CCharacter::Team()
+{
+	return TeamsCore()->Team(GetCID());
+}
+
+void CCharacter::HandleSkippableTiles(int Index)
+{
+	if(Index < 0)
+		return;
+
+	// handle speedup tiles
+	if(Collision()->IsSpeedup(Index))
+	{
+		vec2 Direction, TempVel = m_Core.m_Vel;
+		int Force, MaxSpeed = 0;
+		float TeeAngle, SpeederAngle, DiffAngle, SpeedLeft, TeeSpeed;
+		Collision()->GetSpeedup(Index, &Direction, &Force, &MaxSpeed);
+		if(Force == 255 && MaxSpeed)
+		{
+			m_Core.m_Vel = Direction * (MaxSpeed / 5);
+		}
+		else
+		{
+			if(MaxSpeed > 0 && MaxSpeed < 5)
+				MaxSpeed = 5;
+			if(MaxSpeed > 0)
+			{
+				if(Direction.x > 0.0000001f)
+					SpeederAngle = -std::atan(Direction.y / Direction.x);
+				else if(Direction.x < 0.0000001f)
+					SpeederAngle = std::atan(Direction.y / Direction.x) + 2.0f * std::asin(1.0f);
+				else if(Direction.y > 0.0000001f)
+					SpeederAngle = std::asin(1.0f);
+				else
+					SpeederAngle = std::asin(-1.0f);
+
+				if(SpeederAngle < 0)
+					SpeederAngle = 4.0f * std::asin(1.0f) + SpeederAngle;
+
+				if(TempVel.x > 0.0000001f)
+					TeeAngle = -std::atan(TempVel.y / TempVel.x);
+				else if(TempVel.x < 0.0000001f)
+					TeeAngle = std::atan(TempVel.y / TempVel.x) + 2.0f * std::asin(1.0f);
+				else if(TempVel.y > 0.0000001f)
+					TeeAngle = std::asin(1.0f);
+				else
+					TeeAngle = std::asin(-1.0f);
+
+				if(TeeAngle < 0)
+					TeeAngle = 4.0f * std::asin(1.0f) + TeeAngle;
+
+				TeeSpeed = std::sqrt(std::pow(TempVel.x, 2) + std::pow(TempVel.y, 2));
+
+				DiffAngle = SpeederAngle - TeeAngle;
+				SpeedLeft = MaxSpeed / 5.0f - std::cos(DiffAngle) * TeeSpeed;
+				if(absolute((int)SpeedLeft) > Force && SpeedLeft > 0.0000001f)
+					TempVel += Direction * Force;
+				else if(absolute((int)SpeedLeft) > Force)
+					TempVel += Direction * -Force;
+				else
+					TempVel += Direction * SpeedLeft;
+			}
+			else
+				TempVel += Direction * Force;
+			m_Core.m_Vel = ClampVel(m_MoveRestrictions, TempVel);
+		}
+	}
+}
+
+bool CCharacter::IsSwitchActiveCb(int Number, void *pUser)
+{
+	CCharacter *pThis = (CCharacter *)pUser;
+	auto &aSwitchers = pThis->Switchers();
+	return !aSwitchers.empty() && pThis->Team() != TEAM_SUPER && aSwitchers[Number].m_aStatus[pThis->Team()];
+}
+
+void CCharacter::HandleTiles(int Index)
+{
+	int MapIndex = Index;
+	m_TileIndex = Collision()->GetTileIndex(MapIndex);
+	m_TileFIndex = Collision()->GetFTileIndex(MapIndex);
+	m_MoveRestrictions = Collision()->GetMoveRestrictions(IsSwitchActiveCb, this, m_Pos);
+
+	// stopper
+	if(m_Core.m_Vel.y > 0 && (m_MoveRestrictions & CANTMOVE_DOWN))
+	{
+		m_Core.m_Jumped = 0;
+		m_Core.m_JumpedTotal = 0;
+	}
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, m_Core.m_Vel);
+
+	if(!GameWorld()->m_WorldConfig.m_PredictTiles)
+		return;
+
+	if(Index < 0)
+	{
+		m_LastRefillJumps = false;
+		return;
+	}
+
+	// handle switch tiles
+	if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHOPEN && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = true;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = 0;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHOPEN;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = GameWorld()->GameTick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHTIMEDOPEN && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = true;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = GameWorld()->GameTick() + 1 + Collision()->GetSwitchDelay(MapIndex) * GameWorld()->GameTickSpeed();
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHTIMEDOPEN;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = GameWorld()->GameTick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHTIMEDCLOSE && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = false;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = GameWorld()->GameTick() + 1 + Collision()->GetSwitchDelay(MapIndex) * GameWorld()->GameTickSpeed();
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHTIMEDCLOSE;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = GameWorld()->GameTick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHCLOSE && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = false;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = 0;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHCLOSE;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = GameWorld()->GameTick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_FREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			Freeze(Collision()->GetSwitchDelay(MapIndex));
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_DFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+			m_Core.m_DeepFrozen = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_DUNFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+			m_Core.m_DeepFrozen = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_HammerHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
+	{
+		m_Core.m_HammerHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !m_Core.m_HammerHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
+	{
+		m_Core.m_HammerHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_ShotgunHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
+	{
+		m_Core.m_ShotgunHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !m_Core.m_ShotgunHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
+	{
+		m_Core.m_ShotgunHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_GrenadeHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
+	{
+		m_Core.m_GrenadeHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !m_Core.m_GrenadeHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
+	{
+		m_Core.m_GrenadeHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_LaserHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
+	{
+		m_Core.m_LaserHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !m_Core.m_LaserHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
+	{
+		m_Core.m_LaserHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_JUMP)
+	{
+		int NewJumps = Collision()->GetSwitchDelay(MapIndex);
+		if(NewJumps == 255)
+		{
+			NewJumps = -1;
+		}
+
+		if(NewJumps != m_Core.m_Jumps)
+			m_Core.m_Jumps = NewJumps;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_LFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			m_Core.m_LiveFrozen = true;
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_LUNFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			m_Core.m_LiveFrozen = false;
+		}
+	}
+
+	// freeze
+	if(((m_TileIndex == TILE_FREEZE) || (m_TileFIndex == TILE_FREEZE)) && !m_Core.m_Super && !m_Core.m_DeepFrozen)
+	{
+		Freeze();
+	}
+	else if(((m_TileIndex == TILE_UNFREEZE) || (m_TileFIndex == TILE_UNFREEZE)) && !m_Core.m_DeepFrozen)
+	{
+		UnFreeze();
+	}
+
+	// deep freeze
+	if(((m_TileIndex == TILE_DFREEZE) || (m_TileFIndex == TILE_DFREEZE)) && !m_Core.m_Super && !m_Core.m_DeepFrozen)
+	{
+		m_Core.m_DeepFrozen = true;
+	}
+	else if(((m_TileIndex == TILE_DUNFREEZE) || (m_TileFIndex == TILE_DUNFREEZE)) && !m_Core.m_Super && m_Core.m_DeepFrozen)
+	{
+		m_Core.m_DeepFrozen = false;
+	}
+
+	// live freeze
+	if(((m_TileIndex == TILE_LFREEZE) || (m_TileFIndex == TILE_LFREEZE)) && !m_Core.m_Super)
+	{
+		m_Core.m_LiveFrozen = true;
+	}
+	else if(((m_TileIndex == TILE_LUNFREEZE) || (m_TileFIndex == TILE_LUNFREEZE)) && !m_Core.m_Super)
+	{
+		m_Core.m_LiveFrozen = false;
+	}
+
+	// endless hook
+	if(((m_TileIndex == TILE_EHOOK_ENABLE) || (m_TileFIndex == TILE_EHOOK_ENABLE)) && !m_Core.m_EndlessHook)
+	{
+		m_Core.m_EndlessHook = true;
+	}
+	else if(((m_TileIndex == TILE_EHOOK_DISABLE) || (m_TileFIndex == TILE_EHOOK_DISABLE)) && m_Core.m_EndlessHook)
+	{
+		m_Core.m_EndlessHook = false;
+	}
+
+	// collide with others
+	if(((m_TileIndex == TILE_NPC_DISABLE) || (m_TileFIndex == TILE_NPC_DISABLE)) && !m_Core.m_CollisionDisabled)
+	{
+		m_Core.m_CollisionDisabled = true;
+	}
+	else if(((m_TileIndex == TILE_NPC_ENABLE) || (m_TileFIndex == TILE_NPC_ENABLE)) && m_Core.m_CollisionDisabled)
+	{
+		m_Core.m_CollisionDisabled = false;
+	}
+
+	// hook others
+	if(((m_TileIndex == TILE_NPH_DISABLE) || (m_TileFIndex == TILE_NPH_DISABLE)) && !m_Core.m_HookHitDisabled)
+	{
+		m_Core.m_HookHitDisabled = true;
+	}
+	else if(((m_TileIndex == TILE_NPH_ENABLE) || (m_TileFIndex == TILE_NPH_ENABLE)) && m_Core.m_HookHitDisabled)
+	{
+		m_Core.m_HookHitDisabled = false;
+	}
+
+	// unlimited air jumps
+	if(((m_TileIndex == TILE_UNLIMITED_JUMPS_ENABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_ENABLE)) && !m_Core.m_EndlessJump)
+	{
+		m_Core.m_EndlessJump = true;
+	}
+	else if(((m_TileIndex == TILE_UNLIMITED_JUMPS_DISABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_DISABLE)) && m_Core.m_EndlessJump)
+	{
+		m_Core.m_EndlessJump = false;
+	}
+
+	// walljump
+	if((m_TileIndex == TILE_WALLJUMP) || (m_TileFIndex == TILE_WALLJUMP))
+	{
+		if(m_Core.m_Vel.y > 0 && m_Core.m_Colliding && m_Core.m_LeftWall)
+		{
+			m_Core.m_LeftWall = false;
+			m_Core.m_JumpedTotal = m_Core.m_Jumps >= 2 ? m_Core.m_Jumps - 2 : 0;
+			m_Core.m_Jumped = 1;
+		}
+	}
+
+	// jetpack gun
+	if(((m_TileIndex == TILE_JETPACK_ENABLE) || (m_TileFIndex == TILE_JETPACK_ENABLE)) && !m_Core.m_Jetpack)
+	{
+		m_Core.m_Jetpack = true;
+	}
+	else if(((m_TileIndex == TILE_JETPACK_DISABLE) || (m_TileFIndex == TILE_JETPACK_DISABLE)) && m_Core.m_Jetpack)
+	{
+		m_Core.m_Jetpack = false;
+	}
+
+	// solo part
+	if(((m_TileIndex == TILE_SOLO_ENABLE) || (m_TileFIndex == TILE_SOLO_ENABLE)) && !TeamsCore()->GetSolo(GetCID()))
+	{
+		SetSolo(true);
+	}
+	else if(((m_TileIndex == TILE_SOLO_DISABLE) || (m_TileFIndex == TILE_SOLO_DISABLE)) && TeamsCore()->GetSolo(GetCID()))
+	{
+		SetSolo(false);
+	}
+
+	// refill jumps
+	if(((m_TileIndex == TILE_REFILL_JUMPS) || (m_TileFIndex == TILE_REFILL_JUMPS)) && !m_LastRefillJumps)
+	{
+		m_Core.m_JumpedTotal = 0;
+		m_Core.m_Jumped = 0;
+		m_LastRefillJumps = true;
+	}
+	if((m_TileIndex != TILE_REFILL_JUMPS) && (m_TileFIndex != TILE_REFILL_JUMPS))
+	{
+		m_LastRefillJumps = false;
+	}
+}
+
+void CCharacter::HandleTuneLayer()
+{
+	int CurrentIndex = Collision()->GetMapIndex(m_Pos);
+	SetTuneZone(GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(CurrentIndex) : 0);
+
+	if(m_IsLocal)
+		GameWorld()->m_Core.m_aTuning[g_Config.m_ClDummy] = *GetTuning(m_TuneZone); // throw tunings (from specific zone if in a tunezone) into gamecore if the character is local
+	m_Core.m_Tuning = *GetTuning(m_TuneZone);
+}
+
+void CCharacter::DDRaceTick()
+{
+	mem_copy(&m_Input, &m_SavedInput, sizeof(m_Input));
+	if(m_Core.m_LiveFrozen && !m_CanMoveInFreeze && !m_Core.m_Super)
+	{
+		m_Input.m_Direction = 0;
+		m_Input.m_Jump = 0;
+		//Hook and weapons are possible in live freeze
+	}
+	if(m_FreezeTime > 0)
+	{
+		m_FreezeTime--;
+		if(!m_CanMoveInFreeze)
+		{
+			m_Input.m_Direction = 0;
+			m_Input.m_Jump = 0;
+			m_Input.m_Hook = 0;
+		}
+		if(m_FreezeTime == 1)
+			UnFreeze();
+	}
+
+	HandleTuneLayer();
+
+	// check if the tee is in any type of freeze
+	int Index = Collision()->GetPureMapIndex(m_Pos);
+	const int aTiles[] = {
+		Collision()->GetTileIndex(Index),
+		Collision()->GetFTileIndex(Index),
+		Collision()->GetSwitchType(Index)};
+	m_Core.m_IsInFreeze = false;
+	for(const int Tile : aTiles)
+	{
+		if(Tile == TILE_FREEZE || Tile == TILE_DFREEZE || Tile == TILE_LFREEZE)
+		{
+			m_Core.m_IsInFreeze = true;
+			break;
+		}
+	}
+}
+
+void CCharacter::DDRacePostCoreTick()
+{
+	if(!GameWorld()->m_WorldConfig.m_PredictDDRace)
+		return;
+
+	if(m_Core.m_EndlessHook)
+		m_Core.m_HookTick = 0;
+
+	m_FrozenLastTick = false;
+
+	if(m_Core.m_DeepFrozen && !m_Core.m_Super)
+		Freeze();
+
+	// following jump rules can be overridden by tiles, like Refill Jumps, Stopper and Wall Jump
+	if(m_Core.m_Jumps == -1)
+	{
+		// The player has only one ground jump, so his feet are always dark
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_Jumps == 0)
+	{
+		// The player has no jumps at all, so his feet are always dark
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_Jumps == 1 && m_Core.m_Jumped > 0)
+	{
+		// If the player has only one jump, each jump is the last one
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_JumpedTotal < m_Core.m_Jumps - 1 && m_Core.m_Jumped > 1)
+	{
+		// The player has not yet used up all his jumps, so his feet remain light
+		m_Core.m_Jumped = 1;
+	}
+
+	if((m_Core.m_Super || m_Core.m_EndlessJump) && m_Core.m_Jumped > 1)
+	{
+		// Super players and players with infinite jumps always have light feet
+		m_Core.m_Jumped = 1;
+	}
+
+	int CurrentIndex = Collision()->GetMapIndex(m_Pos);
+	HandleSkippableTiles(CurrentIndex);
+
+	// handle Anti-Skip tiles
+	std::vector<int> vIndices = Collision()->GetMapIndices(m_PrevPos, m_Pos);
+	if(!vIndices.empty())
+		for(int Index : vIndices)
+			HandleTiles(Index);
+	else
+	{
+		HandleTiles(CurrentIndex);
+	}
+}
+
+bool CCharacter::Freeze(int Seconds)
+{
+	if(!GameWorld()->m_WorldConfig.m_PredictFreeze)
+		return false;
+	if(Seconds <= 0 || m_Core.m_Super || m_FreezeTime > Seconds * GameWorld()->GameTickSpeed())
+		return false;
+	if(m_Core.m_FreezeStart < GameWorld()->GameTick() - GameWorld()->GameTickSpeed())
+	{
+		m_FreezeTime = Seconds * GameWorld()->GameTickSpeed();
+		m_Core.m_FreezeStart = GameWorld()->GameTick();
+		return true;
+	}
+	return false;
+}
+
+bool CCharacter::Freeze()
+{
+	return Freeze(g_Config.m_SvFreezeDelay);
+}
+
+bool CCharacter::UnFreeze()
+{
+	if(m_FreezeTime > 0)
+	{
+		if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Got)
+			m_Core.m_ActiveWeapon = WEAPON_GUN;
+		m_FreezeTime = 0;
+		m_Core.m_FreezeStart = 0;
+		m_FrozenLastTick = true;
+		return true;
+	}
+	return false;
+}
+
+void CCharacter::GiveWeapon(int Weapon, bool Remove)
+{
+	if(Weapon == WEAPON_NINJA)
+	{
+		if(Remove)
+			RemoveNinja();
+		else
+			GiveNinja();
+		return;
+	}
+
+	if(Remove)
+	{
+		if(GetActiveWeapon() == Weapon)
+			SetActiveWeapon(WEAPON_GUN);
+	}
+	else
+	{
+		m_Core.m_aWeapons[Weapon].m_Ammo = -1;
+	}
+
+	m_Core.m_aWeapons[Weapon].m_Got = !Remove;
+}
+
+void CCharacter::GiveAllWeapons()
+{
+	for(int i = WEAPON_GUN; i < NUM_WEAPONS - 1; i++)
+	{
+		GiveWeapon(i);
+	}
+}
+
+CTeamsCore *CCharacter::TeamsCore()
+{
+	return GameWorld()->Teams();
+}
+
+CCharacter::CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_CHARACTER, vec2(0, 0), CCharacterCore::PhysicalSize())
+{
+	m_ID = ID;
+	m_IsLocal = false;
+
+	m_LastWeapon = WEAPON_HAMMER;
+	m_QueuedWeapon = -1;
+	m_LastRefillJumps = false;
+	m_PrevPrevPos = m_PrevPos = m_Pos = vec2(pChar->m_X, pChar->m_Y);
+	m_Core.Reset();
+	m_Core.Init(&GameWorld()->m_Core, GameWorld()->Collision(), GameWorld()->Teams());
+	m_Core.m_Id = ID;
+	mem_zero(&m_Core.m_Ninja, sizeof(m_Core.m_Ninja));
+	m_Core.m_LeftWall = true;
+	m_ReloadTimer = 0;
+	m_NumObjectsHit = 0;
+	m_LastRefillJumps = false;
+	m_LastJetpackStrength = 400.0f;
+	m_CanMoveInFreeze = false;
+	m_TeleCheckpoint = 0;
+	m_StrongWeakID = 0;
+
+	mem_zero(&m_Input, sizeof(m_Input));
+	// never initialize both to zero
+	m_Input.m_TargetX = 0;
+	m_Input.m_TargetY = -1;
+
+	m_LatestPrevInput = m_LatestInput = m_PrevInput = m_SavedInput = m_Input;
+
+	ResetPrediction();
+	Read(pChar, pExtended, false);
+}
+
+void CCharacter::ResetPrediction()
+{
+	SetSolo(false);
+	SetSuper(false);
+	m_Core.m_EndlessHook = false;
+	m_Core.m_HammerHitDisabled = false;
+	m_Core.m_ShotgunHitDisabled = false;
+	m_Core.m_GrenadeHitDisabled = false;
+	m_Core.m_LaserHitDisabled = false;
+	m_Core.m_EndlessJump = false;
+	m_Core.m_Jetpack = false;
+	m_NinjaJetpack = false;
+	m_Core.m_Jumps = 2;
+	m_Core.m_HookHitDisabled = false;
+	m_Core.m_CollisionDisabled = false;
+	m_NumInputs = 0;
+	m_FreezeTime = 0;
+	m_Core.m_FreezeStart = 0;
+	m_Core.m_IsInFreeze = false;
+	m_Core.m_DeepFrozen = false;
+	m_Core.m_LiveFrozen = false;
+	m_FrozenLastTick = false;
+	for(int w = 0; w < NUM_WEAPONS; w++)
+	{
+		SetWeaponGot(w, false);
+		SetWeaponAmmo(w, -1);
+	}
+	if(m_Core.HookedPlayer() >= 0)
+	{
+		m_Core.SetHookedPlayer(-1);
+		m_Core.m_HookState = HOOK_IDLE;
+	}
+	m_LastWeaponSwitchTick = 0;
+	m_LastTuneZoneTick = 0;
+}
+
+void CCharacter::Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, bool IsLocal)
+{
+	m_Core.Read((const CNetObj_CharacterCore *)pChar);
+	m_IsLocal = IsLocal;
+
+	if(pExtended)
+	{
+		SetSolo(pExtended->m_Flags & CHARACTERFLAG_SOLO);
+		SetSuper(pExtended->m_Flags & CHARACTERFLAG_SUPER);
+
+		m_TeleCheckpoint = pExtended->m_TeleCheckpoint;
+		m_StrongWeakID = pExtended->m_StrongWeakID;
+
+		const bool Ninja = (pExtended->m_Flags & CHARACTERFLAG_WEAPON_NINJA) != 0;
+		if(Ninja && m_Core.m_ActiveWeapon != WEAPON_NINJA)
+			GiveNinja();
+		else if(!Ninja && m_Core.m_ActiveWeapon == WEAPON_NINJA)
+			RemoveNinja();
+
+		if(GameWorld()->m_WorldConfig.m_PredictFreeze && pExtended->m_FreezeEnd != 0)
+		{
+			if(pExtended->m_FreezeEnd > 0)
+			{
+				if(m_FreezeTime == 0)
+					Freeze();
+				m_FreezeTime = maximum(1, pExtended->m_FreezeEnd - GameWorld()->GameTick());
+			}
+			else if(pExtended->m_FreezeEnd == -1)
+				m_Core.m_DeepFrozen = true;
+		}
+		else
+			UnFreeze();
+
+		m_Core.ReadDDNet(pExtended);
+
+		if(!GameWorld()->m_WorldConfig.m_PredictFreeze)
+		{
+			UnFreeze();
+		}
+	}
+	else
+	{
+		// ddnetcharacter is not available, try to get some info from the tunings and the character netobject instead.
+
+		// remove weapons that are unavailable. if the current weapon is ninja just set ammo to zero in case the player is frozen
+		if(pChar->m_Weapon != m_Core.m_ActiveWeapon)
+		{
+			if(pChar->m_Weapon == WEAPON_NINJA)
+				m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo = 0;
+			else
+			{
+				if(m_Core.m_ActiveWeapon == WEAPON_NINJA)
+				{
+					SetNinjaActivationDir(vec2(0, 0));
+					SetNinjaActivationTick(-500);
+					SetNinjaCurrentMoveTime(0);
+				}
+				if(pChar->m_Weapon == m_LastSnapWeapon)
+					m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Got = false;
+			}
+		}
+		// add weapon
+		if(pChar->m_Weapon != WEAPON_NINJA)
+			m_Core.m_aWeapons[pChar->m_Weapon].m_Got = true;
+
+		// jetpack
+		if(GameWorld()->m_WorldConfig.m_PredictWeapons && Tuning()->m_JetpackStrength > 0)
+		{
+			m_LastJetpackStrength = Tuning()->m_JetpackStrength;
+			m_Core.m_Jetpack = true;
+			m_Core.m_aWeapons[WEAPON_GUN].m_Got = true;
+			m_Core.m_aWeapons[WEAPON_GUN].m_Ammo = -1;
+			m_NinjaJetpack = pChar->m_Weapon == WEAPON_NINJA;
+		}
+		else if(pChar->m_Weapon != WEAPON_NINJA)
+		{
+			m_Core.m_Jetpack = false;
+		}
+
+		// number of jumps
+		if(GameWorld()->m_WorldConfig.m_PredictTiles)
+		{
+			if(pChar->m_Jumped & 2)
+			{
+				m_Core.m_EndlessJump = false;
+				if(m_Core.m_Jumps > m_Core.m_JumpedTotal && m_Core.m_JumpedTotal > 0 && m_Core.m_Jumps > 2)
+					m_Core.m_Jumps = m_Core.m_JumpedTotal + 1;
+			}
+			else if(m_Core.m_Jumps < 2)
+				m_Core.m_Jumps = m_Core.m_JumpedTotal + 2;
+			if(Tuning()->m_AirJumpImpulse == 0)
+			{
+				m_Core.m_Jumps = 0;
+				m_Core.m_Jumped = 3;
+			}
+		}
+
+		// set player collision
+		SetSolo(!Tuning()->m_PlayerCollision && !Tuning()->m_PlayerHooking);
+		m_Core.m_CollisionDisabled = !Tuning()->m_PlayerCollision;
+		m_Core.m_HookHitDisabled = !Tuning()->m_PlayerHooking;
+
+		if(m_Core.m_HookTick != 0)
+			m_Core.m_EndlessHook = false;
+
+		// detect unfreeze (in case the player was frozen in the tile prediction and not correctly unfrozen)
+		if(pChar->m_Emote != EMOTE_PAIN && pChar->m_Emote != EMOTE_NORMAL)
+			m_Core.m_DeepFrozen = false;
+		if(pChar->m_Weapon != WEAPON_NINJA || pChar->m_AttackTick > m_Core.m_FreezeStart || absolute(pChar->m_VelX) == 256 * 10 || !GameWorld()->m_WorldConfig.m_PredictFreeze)
+		{
+			m_Core.m_DeepFrozen = false;
+			UnFreeze();
+		}
+	}
+
+	vec2 PosBefore = m_Pos;
+	m_Pos = m_Core.m_Pos;
+
+	if(distance(PosBefore, m_Pos) > 2.f) // misprediction, don't use prevpos
+		m_PrevPos = m_Pos;
+
+	if(distance(m_PrevPos, m_Pos) > 10.f * 32.f) // reset prevpos if the distance is high
+		m_PrevPos = m_Pos;
+
+	if(pChar->m_Jumped & 2)
+		m_Core.m_JumpedTotal = m_Core.m_Jumps;
+	m_AttackTick = pChar->m_AttackTick;
+	m_LastSnapWeapon = pChar->m_Weapon;
+
+	SetTuneZone(GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(Collision()->GetMapIndex(m_Pos)) : 0);
+
+	// set the current weapon
+	if(pChar->m_Weapon != WEAPON_NINJA)
+	{
+		m_Core.m_aWeapons[pChar->m_Weapon].m_Ammo = (GameWorld()->m_WorldConfig.m_InfiniteAmmo || GameWorld()->m_WorldConfig.m_IsDDRace || pChar->m_Weapon == WEAPON_HAMMER) ? -1 : pChar->m_AmmoCount;
+		if(pChar->m_Weapon != m_Core.m_ActiveWeapon)
+			SetActiveWeapon(pChar->m_Weapon);
+	}
+
+	// reset all input except direction and hook for non-local players (as in vanilla prediction)
+	if(!IsLocal)
+	{
+		mem_zero(&m_Input, sizeof(m_Input));
+		mem_zero(&m_SavedInput, sizeof(m_SavedInput));
+		m_Input.m_Direction = m_SavedInput.m_Direction = m_Core.m_Direction;
+		m_Input.m_Hook = m_SavedInput.m_Hook = (m_Core.m_HookState != HOOK_IDLE);
+
+		if(pExtended && pExtended->m_TargetX != 0 && pExtended->m_TargetY != 0)
+		{
+			m_Input.m_TargetX = m_SavedInput.m_TargetX = pExtended->m_TargetX;
+			m_Input.m_TargetY = m_SavedInput.m_TargetY = pExtended->m_TargetY;
+		}
+		else
+		{
+			m_Input.m_TargetX = m_SavedInput.m_TargetX = std::cos(pChar->m_Angle / 256.0f) * 256.0f;
+			m_Input.m_TargetY = m_SavedInput.m_TargetY = std::sin(pChar->m_Angle / 256.0f) * 256.0f;
+		}
+	}
+
+	// in most cases the reload timer can be determined from the last attack tick
+	// (this is only needed for autofire weapons to prevent the predicted reload timer from desyncing)
+	if(IsLocal && m_Core.m_ActiveWeapon != WEAPON_HAMMER && !m_Core.m_aWeapons[WEAPON_NINJA].m_Got)
+	{
+		if(maximum(m_LastTuneZoneTick, m_LastWeaponSwitchTick) + GameWorld()->GameTickSpeed() < GameWorld()->GameTick())
+		{
+			float FireDelay;
+			GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+			const int FireDelayTicks = FireDelay * GameWorld()->GameTickSpeed() / 1000;
+			m_ReloadTimer = maximum(0, m_AttackTick + FireDelayTicks - GameWorld()->GameTick());
+		}
+	}
+}
+
+void CCharacter::SetCoreWorld(CGameWorld *pGameWorld)
+{
+	m_Core.SetCoreWorld(&pGameWorld->m_Core, pGameWorld->Collision(), pGameWorld->Teams());
+}
+
+bool CCharacter::Match(CCharacter *pChar) const
+{
+	return distance(pChar->m_Core.m_Pos, m_Core.m_Pos) <= 32.f;
+}
+
+void CCharacter::SetActiveWeapon(int ActiveWeap)
+{
+	m_Core.m_ActiveWeapon = ActiveWeap;
+	m_LastWeaponSwitchTick = GameWorld()->GameTick();
+}
+
+void CCharacter::SetTuneZone(int Zone)
+{
+	if(Zone == m_TuneZone)
+		return;
+	m_TuneZone = Zone;
+	m_LastTuneZoneTick = GameWorld()->GameTick();
+}
+
+CCharacter::~CCharacter()
+{
+	if(GameWorld())
+		GameWorld()->RemoveCharacter(this);
+}
diff --git a/src_bkp/game/client/prediction/entities/character.h b/src_bkp/game/client/prediction/entities/character.h
new file mode 100644
index 0000000000..b424a8c9b7
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/character.h
@@ -0,0 +1,187 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_ENTITIES_CHARACTER_H
+#define GAME_CLIENT_PREDICTION_ENTITIES_CHARACTER_H
+
+#include <game/client/prediction/entity.h>
+
+#include <game/gamecore.h>
+
+enum
+{
+	WEAPON_GAME = -3, // team switching etc
+	WEAPON_SELF = -2, // console kill command
+	WEAPON_WORLD = -1, // death tiles etc
+};
+
+enum
+{
+	FAKETUNE_FREEZE = 1,
+	FAKETUNE_SOLO = 2,
+	FAKETUNE_NOJUMP = 4,
+	FAKETUNE_NOCOLL = 8,
+	FAKETUNE_NOHOOK = 16,
+	FAKETUNE_JETPACK = 32,
+	FAKETUNE_NOHAMMER = 64,
+
+};
+
+class CCharacter : public CEntity
+{
+	friend class CGameWorld;
+
+public:
+	~CCharacter();
+
+	void PreTick() override;
+	void Tick() override;
+	void TickDeferred() override;
+
+	bool IsGrounded();
+
+	void SetWeapon(int W);
+	void SetSolo(bool Solo);
+	void SetSuper(bool Super);
+	void HandleWeaponSwitch();
+	void DoWeaponSwitch();
+
+	void HandleWeapons();
+	void HandleNinja();
+	void HandleJetpack();
+
+	void OnPredictedInput(CNetObj_PlayerInput *pNewInput);
+	void OnDirectInput(CNetObj_PlayerInput *pNewInput);
+	void ResetInput();
+	void FireWeapon();
+
+	bool TakeDamage(vec2 Force, int Dmg, int From, int Weapon);
+
+	void GiveWeapon(int Weapon, bool Remove = false);
+	void GiveNinja();
+	void RemoveNinja();
+
+	bool m_IsLocal;
+
+	CTeamsCore *TeamsCore();
+	bool Freeze(int Seconds);
+	bool Freeze();
+	bool UnFreeze();
+	void GiveAllWeapons();
+	int Team();
+	bool CanCollide(int ClientID);
+	bool SameTeam(int ClientID);
+	bool m_NinjaJetpack;
+	int m_FreezeTime;
+	bool m_FrozenLastTick;
+	int m_TuneZone;
+	vec2 m_PrevPos;
+	vec2 m_PrevPrevPos;
+	int m_TeleCheckpoint;
+
+	int m_TileIndex;
+	int m_TileFIndex;
+
+	int m_MoveRestrictions;
+	bool m_LastRefillJumps;
+
+	// Setters/Getters because i don't want to modify vanilla vars access modifiers
+	int GetLastWeapon() { return m_LastWeapon; }
+	void SetLastWeapon(int LastWeap) { m_LastWeapon = LastWeap; }
+	int GetActiveWeapon() { return m_Core.m_ActiveWeapon; }
+	void SetActiveWeapon(int ActiveWeap);
+	CCharacterCore GetCore() { return m_Core; }
+	void SetCore(CCharacterCore Core) { m_Core = Core; }
+	CCharacterCore *Core() { return &m_Core; }
+	bool GetWeaponGot(int Type) { return m_Core.m_aWeapons[Type].m_Got; }
+	void SetWeaponGot(int Type, bool Value) { m_Core.m_aWeapons[Type].m_Got = Value; }
+	int GetWeaponAmmo(int Type) { return m_Core.m_aWeapons[Type].m_Ammo; }
+	void SetWeaponAmmo(int Type, int Value) { m_Core.m_aWeapons[Type].m_Ammo = Value; }
+	void SetNinjaActivationDir(vec2 ActivationDir) { m_Core.m_Ninja.m_ActivationDir = ActivationDir; }
+	void SetNinjaActivationTick(int ActivationTick) { m_Core.m_Ninja.m_ActivationTick = ActivationTick; }
+	void SetNinjaCurrentMoveTime(int CurrentMoveTime) { m_Core.m_Ninja.m_CurrentMoveTime = CurrentMoveTime; }
+	int GetCID() { return m_ID; }
+	void SetInput(const CNetObj_PlayerInput *pNewInput)
+	{
+		m_LatestInput = m_Input = *pNewInput;
+		// it is not allowed to aim in the center
+		if(m_Input.m_TargetX == 0 && m_Input.m_TargetY == 0)
+		{
+			m_Input.m_TargetY = m_LatestInput.m_TargetY = -1;
+		}
+	};
+	int GetJumped() { return m_Core.m_Jumped; }
+	int GetAttackTick() { return m_AttackTick; }
+	int GetStrongWeakID() { return m_StrongWeakID; }
+
+	CCharacter(CGameWorld *pGameWorld, int ID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended = 0);
+	void Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, bool IsLocal);
+	void SetCoreWorld(CGameWorld *pGameWorld);
+
+	int m_LastSnapWeapon;
+	int m_LastJetpackStrength;
+	bool m_KeepHooked;
+	int m_GameTeam;
+	bool m_CanMoveInFreeze;
+
+	bool Match(CCharacter *pChar) const;
+	void ResetPrediction();
+	void SetTuneZone(int Zone);
+
+	bool HammerHitDisabled() { return m_Core.m_HammerHitDisabled; }
+	bool ShotgunHitDisabled() { return m_Core.m_ShotgunHitDisabled; }
+	bool LaserHitDisabled() { return m_Core.m_LaserHitDisabled; }
+	bool GrenadeHitDisabled() { return m_Core.m_GrenadeHitDisabled; }
+
+	bool IsSuper() { return m_Core.m_Super; }
+
+private:
+	// weapon info
+	int m_aHitObjects[10];
+	int m_NumObjectsHit;
+
+	int m_LastWeapon;
+	int m_QueuedWeapon;
+
+	int m_ReloadTimer;
+	int m_AttackTick;
+
+	// these are non-heldback inputs
+	CNetObj_PlayerInput m_LatestPrevInput;
+	CNetObj_PlayerInput m_LatestInput;
+
+	// input
+	CNetObj_PlayerInput m_PrevInput;
+	CNetObj_PlayerInput m_Input;
+	CNetObj_PlayerInput m_SavedInput;
+
+	int m_NumInputs;
+
+	// the player core for the physics
+	CCharacterCore m_Core;
+
+	// DDRace
+
+	static bool IsSwitchActiveCb(int Number, void *pUser);
+	void HandleTiles(int Index);
+	void HandleSkippableTiles(int Index);
+	void DDRaceTick();
+	void DDRacePostCoreTick();
+	void HandleTuneLayer();
+
+	CTuningParams *CharacterTuning();
+
+	int m_StrongWeakID;
+
+	int m_LastWeaponSwitchTick;
+	int m_LastTuneZoneTick;
+};
+
+enum
+{
+	DDRACE_NONE = 0,
+	DDRACE_STARTED,
+	DDRACE_CHEAT, // no time and won't start again unless ordered by a mod or death
+	DDRACE_FINISHED
+};
+
+#endif
diff --git a/src_bkp/game/client/prediction/entities/dragger.cpp b/src_bkp/game/client/prediction/entities/dragger.cpp
new file mode 100644
index 0000000000..07aec45afc
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/dragger.cpp
@@ -0,0 +1,161 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "dragger.h"
+#include "character.h"
+
+#include <engine/shared/config.h>
+
+#include <game/client/laser_data.h>
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+void CDragger::Tick()
+{
+	if(GameWorld()->GameTick() % (int)(GameWorld()->GameTickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		int index = Collision()->IsMover(m_Pos.x, m_Pos.y, &Flags);
+		if(index)
+		{
+			m_Core = Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+
+		LookForPlayersToDrag();
+	}
+
+	DraggerBeamTick();
+}
+
+void CDragger::LookForPlayersToDrag()
+{
+	// Create a list of players who are in the range of the dragger
+	CEntity *apPlayersInRange[MAX_CLIENTS];
+	mem_zero(apPlayersInRange, sizeof(apPlayersInRange));
+
+	int NumPlayersInRange = GameWorld()->FindEntities(m_Pos,
+		g_Config.m_SvDraggerRange - CCharacterCore::PhysicalSize(),
+		apPlayersInRange, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+	// The closest player (within range) in a team is selected as the target
+	int ClosestTargetId = -1;
+	bool CanStillBeTeamTarget = false;
+	int MinDistInTeam = 0;
+
+	for(int i = 0; i < NumPlayersInRange; i++)
+	{
+		CCharacter *pTarget = static_cast<CCharacter *>(apPlayersInRange[i]);
+		const int &TargetTeam = pTarget->Team();
+
+		// Do not create a dragger beam for super player
+		if(TargetTeam == TEAM_SUPER)
+		{
+			continue;
+		}
+		// If the dragger is disabled for the target's team, no dragger beam will be generated
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[TargetTeam])
+		{
+			continue;
+		}
+
+		// Dragger beams can be created only for reachable, alive players
+		int IsReachable =
+			m_IgnoreWalls ?
+				!Collision()->IntersectNoLaserNW(m_Pos, pTarget->m_Pos, 0, 0) :
+				!Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
+		if(IsReachable)
+		{
+			const int &TargetClientId = pTarget->GetCID();
+			int Distance = distance(pTarget->m_Pos, m_Pos);
+			if(MinDistInTeam == 0 || MinDistInTeam > Distance)
+			{
+				MinDistInTeam = Distance;
+				ClosestTargetId = TargetClientId;
+			}
+			if(TargetClientId == m_TargetId)
+			{
+				CanStillBeTeamTarget = true;
+			}
+		}
+	}
+
+	// Set the closest player for each team as a target if the team does not have a target player yet
+	if((m_TargetId != -1 && !CanStillBeTeamTarget) || m_TargetId == -1)
+	{
+		m_TargetId = ClosestTargetId;
+	}
+}
+
+void CDragger::DraggerBeamReset()
+{
+	m_TargetId = -1;
+}
+
+void CDragger::DraggerBeamTick()
+{
+	CCharacter *pTarget = GameWorld()->GetCharacterByID(m_TargetId);
+	if(!pTarget)
+	{
+		DraggerBeamReset();
+		return;
+	}
+
+	if(GameWorld()->GameTick() % (int)(GameWorld()->GameTickSpeed() * 0.15f) == 0)
+	{
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[pTarget->Team()])
+		{
+			DraggerBeamReset();
+			return;
+		}
+	}
+
+	// When the dragger can no longer reach the target player, the dragger beam dissolves
+	int IsReachable =
+		m_IgnoreWalls ?
+			!Collision()->IntersectNoLaserNW(m_Pos, pTarget->m_Pos, 0, 0) :
+			!Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
+	if(!IsReachable || distance(pTarget->m_Pos, m_Pos) >= g_Config.m_SvDraggerRange)
+	{
+		DraggerBeamReset();
+		return;
+	}
+	// In the center of the dragger a tee does not experience speed-up
+	else if(distance(pTarget->m_Pos, m_Pos) > 28)
+	{
+		vec2 Temp = pTarget->Core()->m_Vel + (normalize(m_Pos - pTarget->m_Pos) * m_Strength);
+		pTarget->Core()->m_Vel = ClampVel(pTarget->m_MoveRestrictions, Temp);
+	}
+}
+
+CDragger::CDragger(CGameWorld *pGameWorld, int ID, const CLaserData *pData) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_DRAGGER)
+{
+	m_Core = vec2(0.f, 0.f);
+	m_ID = ID;
+	m_TargetId = -1;
+
+	m_Strength = 0;
+	m_IgnoreWalls = false;
+	if(0 <= pData->m_Subtype && pData->m_Subtype < NUM_LASERDRAGGERTYPES)
+	{
+		m_IgnoreWalls = (pData->m_Subtype & 1);
+		m_Strength = (pData->m_Subtype >> 1) + 1;
+	}
+	m_Number = pData->m_SwitchNumber;
+	m_Layer = m_Number > 0 ? LAYER_SWITCH : LAYER_GAME;
+
+	Read(pData);
+}
+
+void CDragger::Read(const CLaserData *pData)
+{
+	m_Pos = pData->m_From;
+	m_TargetId = pData->m_Owner;
+}
+
+bool CDragger::Match(CDragger *pDragger)
+{
+	return pDragger->m_Strength == m_Strength && pDragger->m_Number == m_Number && pDragger->m_IgnoreWalls == m_IgnoreWalls;
+}
diff --git a/src_bkp/game/client/prediction/entities/dragger.h b/src_bkp/game/client/prediction/entities/dragger.h
new file mode 100644
index 0000000000..3ee35346a0
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/dragger.h
@@ -0,0 +1,29 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_CLIENT_PREDICTION_ENTITIES_DRAGGER_H
+#define GAME_CLIENT_PREDICTION_ENTITIES_DRAGGER_H
+
+#include <game/client/prediction/entity.h>
+
+class CLaserData;
+
+class CDragger : public CEntity
+{
+	vec2 m_Core;
+	float m_Strength;
+	bool m_IgnoreWalls;
+	int m_TargetId;
+
+	void LookForPlayersToDrag();
+	void DraggerBeamTick();
+	void DraggerBeamReset();
+
+public:
+	CDragger(CGameWorld *pGameWorld, int ID, const CLaserData *pData);
+	bool Match(CDragger *pDragger);
+	void Read(const CLaserData *pData);
+	float GetStrength() { return m_Strength; }
+
+	void Tick() override;
+};
+
+#endif // GAME_CLIENT_PREDICTION_ENTITIES_DRAGGER_H
diff --git a/src_bkp/game/client/prediction/entities/laser.cpp b/src_bkp/game/client/prediction/entities/laser.cpp
new file mode 100644
index 0000000000..6b0fb9247d
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/laser.cpp
@@ -0,0 +1,227 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "laser.h"
+#include "character.h"
+#include <game/client/laser_data.h>
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <engine/shared/config.h>
+
+CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner, int Type) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Pos = Pos;
+	m_Owner = Owner;
+	m_Energy = StartEnergy;
+	if(pGameWorld->m_WorldConfig.m_IsFNG && m_Energy < 10.f)
+		m_Energy = 800.0f;
+	m_Dir = Direction;
+	m_Bounces = 0;
+	m_EvalTick = 0;
+	m_Type = Type;
+	m_ZeroEnergyBounceInLastTick = false;
+	m_TuneZone = GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(Collision()->GetMapIndex(m_Pos)) : 0;
+	GameWorld()->InsertEntity(this);
+	DoBounce();
+}
+
+bool CLaser::HitCharacter(vec2 From, vec2 To)
+{
+	static const vec2 StackedLaserShotgunBugSpeed = vec2(-2147483648.0f, -2147483648.0f);
+	vec2 At;
+	CCharacter *pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+	CCharacter *pHit;
+	bool DontHitSelf = (g_Config.m_SvOldLaser || !GameWorld()->m_WorldConfig.m_IsDDRace) || (m_Bounces == 0);
+
+	if(pOwnerChar ? (!pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (!pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : g_Config.m_SvHit)
+		pHit = GameWorld()->IntersectCharacter(m_Pos, To, 0.f, At, DontHitSelf ? pOwnerChar : 0, m_Owner);
+	else
+		pHit = GameWorld()->IntersectCharacter(m_Pos, To, 0.f, At, DontHitSelf ? pOwnerChar : 0, m_Owner, pOwnerChar);
+
+	if(!pHit || (pHit == pOwnerChar && g_Config.m_SvOldLaser) || (pHit != pOwnerChar && pOwnerChar ? (pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : !g_Config.m_SvHit))
+		return false;
+	m_From = From;
+	m_Pos = At;
+	m_Energy = -1;
+	if(m_Type == WEAPON_SHOTGUN)
+	{
+		vec2 Temp;
+		float Strength = GetTuning(m_TuneZone)->m_ShotgunStrength;
+		const vec2 &HitPos = pHit->Core()->m_Pos;
+		if(!g_Config.m_SvOldLaser)
+		{
+			if(m_PrevPos != HitPos)
+			{
+				Temp = pHit->Core()->m_Vel + normalize(m_PrevPos - HitPos) * Strength;
+				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+			}
+			else
+			{
+				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+			}
+		}
+		else if(g_Config.m_SvOldLaser && pOwnerChar)
+		{
+			if(pOwnerChar->Core()->m_Pos != HitPos)
+			{
+				Temp = pHit->Core()->m_Vel + normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength;
+				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+			}
+			else
+			{
+				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+			}
+		}
+		else
+		{
+			pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, pHit->Core()->m_Vel);
+		}
+	}
+	else if(m_Type == WEAPON_LASER)
+	{
+		pHit->UnFreeze();
+	}
+	return true;
+}
+
+void CLaser::DoBounce()
+{
+	m_EvalTick = GameWorld()->GameTick();
+
+	if(m_Energy < 0)
+	{
+		m_MarkedForDestroy = true;
+		return;
+	}
+	m_PrevPos = m_Pos;
+	vec2 Coltile;
+
+	int Res;
+	vec2 To = m_Pos + m_Dir * m_Energy;
+
+	Res = Collision()->IntersectLineTeleWeapon(m_Pos, To, &Coltile, &To);
+
+	if(Res)
+	{
+		if(!HitCharacter(m_Pos, To))
+		{
+			// intersected
+			m_From = m_Pos;
+			m_Pos = To;
+
+			vec2 TempPos = m_Pos;
+			vec2 TempDir = m_Dir * 4.0f;
+
+			int f = 0;
+			if(Res == -1)
+			{
+				f = Collision()->GetTile(round_to_int(Coltile.x), round_to_int(Coltile.y));
+				Collision()->SetCollisionAt(round_to_int(Coltile.x), round_to_int(Coltile.y), TILE_SOLID);
+			}
+			Collision()->MovePoint(&TempPos, &TempDir, 1.0f, 0);
+			if(Res == -1)
+			{
+				Collision()->SetCollisionAt(round_to_int(Coltile.x), round_to_int(Coltile.y), f);
+			}
+			m_Pos = TempPos;
+			m_Dir = normalize(TempDir);
+
+			const float Distance = distance(m_From, m_Pos);
+			// Prevent infinite bounces
+			if(Distance == 0.0f && m_ZeroEnergyBounceInLastTick)
+			{
+				m_Energy = -1;
+			}
+			else
+			{
+				m_Energy -= Distance + GetTuning(m_TuneZone)->m_LaserBounceCost;
+			}
+			m_ZeroEnergyBounceInLastTick = Distance == 0.0f;
+
+			m_Bounces++;
+
+			int BounceNum = GetTuning(m_TuneZone)->m_LaserBounceNum;
+
+			if(m_Bounces > BounceNum)
+				m_Energy = -1;
+		}
+	}
+	else
+	{
+		if(!HitCharacter(m_Pos, To))
+		{
+			m_From = m_Pos;
+			m_Pos = To;
+			m_Energy = -1;
+		}
+	}
+}
+
+void CLaser::Tick()
+{
+	float Delay = GetTuning(m_TuneZone)->m_LaserBounceDelay;
+
+	if(GameWorld()->m_WorldConfig.m_IsVanilla) // predict old physics on vanilla 0.6 servers
+	{
+		if(GameWorld()->GameTick() > m_EvalTick + (GameWorld()->GameTickSpeed() * Delay / 1000.0f))
+			DoBounce();
+	}
+	else
+	{
+		if((GameWorld()->GameTick() - m_EvalTick) > (GameWorld()->GameTickSpeed() * Delay / 1000.0f))
+			DoBounce();
+	}
+}
+
+CLaser::CLaser(CGameWorld *pGameWorld, int ID, CLaserData *pLaser) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Pos = pLaser->m_To;
+	m_From = pLaser->m_From;
+	m_EvalTick = pLaser->m_StartTick;
+	m_TuneZone = GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(Collision()->GetMapIndex(m_Pos)) : 0;
+	m_Owner = -2;
+	m_Energy = GetTuning(m_TuneZone)->m_LaserReach;
+	if(pGameWorld->m_WorldConfig.m_IsFNG && m_Energy < 10.f)
+		m_Energy = 800.0f;
+
+	m_Dir = m_Pos - m_From;
+	if(length(m_Pos - m_From) > 0.001f)
+		m_Dir = normalize(m_Dir);
+	else
+		m_Energy = 0;
+	m_Type = pLaser->m_Type == LASERTYPE_SHOTGUN ? WEAPON_SHOTGUN : WEAPON_LASER;
+	m_PrevPos = m_From;
+	m_ID = ID;
+}
+
+bool CLaser::Match(CLaser *pLaser)
+{
+	if(pLaser->m_EvalTick != m_EvalTick)
+		return false;
+	if(distance(pLaser->m_From, m_From) > 2.f)
+		return false;
+	const vec2 ThisDiff = m_Pos - m_From;
+	const vec2 OtherDiff = pLaser->m_Pos - pLaser->m_From;
+	const float DirError = distance(normalize(OtherDiff) * length(ThisDiff), ThisDiff);
+	return DirError <= 2.f;
+}
+
+CLaserData CLaser::GetData() const
+{
+	CLaserData Result;
+	Result.m_From.x = m_From.x;
+	Result.m_From.y = m_From.y;
+	Result.m_To.x = m_Pos.x;
+	Result.m_To.y = m_Pos.y;
+	Result.m_StartTick = m_EvalTick;
+	Result.m_ExtraInfo = true;
+	Result.m_Owner = m_Owner;
+	Result.m_Type = m_Type == WEAPON_SHOTGUN ? LASERTYPE_SHOTGUN : LASERTYPE_RIFLE;
+	Result.m_Subtype = -1;
+	Result.m_TuneZone = m_TuneZone;
+	Result.m_SwitchNumber = m_Number;
+	return Result;
+}
diff --git a/src_bkp/game/client/prediction/entities/laser.h b/src_bkp/game/client/prediction/entities/laser.h
new file mode 100644
index 0000000000..3bf8e27373
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/laser.h
@@ -0,0 +1,46 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_ENTITIES_LASER_H
+#define GAME_CLIENT_PREDICTION_ENTITIES_LASER_H
+
+#include <game/client/prediction/entity.h>
+
+class CLaserData;
+
+class CLaser : public CEntity
+{
+	friend class CGameWorld;
+
+public:
+	CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner, int Type);
+
+	void Tick() override;
+
+	const vec2 &GetFrom() { return m_From; }
+	const int &GetOwner() { return m_Owner; }
+	const int &GetEvalTick() { return m_EvalTick; }
+	CLaser(CGameWorld *pGameWorld, int ID, CLaserData *pLaser);
+	bool Match(CLaser *pLaser);
+	CLaserData GetData() const;
+
+protected:
+	bool HitCharacter(vec2 From, vec2 To);
+	void DoBounce();
+
+private:
+	vec2 m_From;
+	vec2 m_Dir;
+	float m_Energy;
+	int m_Bounces;
+	int m_EvalTick;
+	int m_Owner;
+	bool m_ZeroEnergyBounceInLastTick;
+
+	// DDRace
+
+	vec2 m_PrevPos;
+	int m_Type;
+	int m_TuneZone;
+};
+
+#endif
diff --git a/src_bkp/game/client/prediction/entities/pickup.cpp b/src_bkp/game/client/prediction/entities/pickup.cpp
new file mode 100644
index 0000000000..86f66e55cb
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/pickup.cpp
@@ -0,0 +1,175 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "pickup.h"
+#include "character.h"
+#include <game/client/pickup_data.h>
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+static constexpr int gs_PickupPhysSize = 14;
+
+void CPickup::Tick()
+{
+	Move();
+	// Check if a player intersected us
+	CEntity *apEnts[MAX_CLIENTS];
+	int Num = GameWorld()->FindEntities(m_Pos, GetProximityRadius() + ms_CollisionExtraSize, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+	for(int i = 0; i < Num; ++i)
+	{
+		auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+		if(pChr)
+		{
+			if(GameWorld()->m_WorldConfig.m_IsVanilla && distance(m_Pos, pChr->m_Pos) >= (GetProximityRadius() + ms_CollisionExtraSize) * 2) // pickup distance is shorter on vanilla due to using ClosestEntity
+				continue;
+			if(m_Layer == LAYER_SWITCH && m_Number > 0 && m_Number < (int)Switchers().size() && !Switchers()[m_Number].m_aStatus[pChr->Team()])
+				continue;
+			bool sound = false;
+			// player picked us up, is someone was hooking us, let them go
+			switch(m_Type)
+			{
+			case POWERUP_HEALTH:
+				//pChr->Freeze();
+				break;
+
+			case POWERUP_ARMOR:
+				if(!GameWorld()->m_WorldConfig.m_IsDDRace || !GameWorld()->m_WorldConfig.m_PredictDDRace)
+					continue;
+				if(pChr->IsSuper())
+					continue;
+				for(int j = WEAPON_SHOTGUN; j < NUM_WEAPONS; j++)
+				{
+					if(pChr->GetWeaponGot(j))
+					{
+						pChr->SetWeaponGot(j, false);
+						pChr->SetWeaponAmmo(j, 0);
+						sound = true;
+					}
+				}
+				pChr->SetNinjaActivationDir(vec2(0, 0));
+				pChr->SetNinjaActivationTick(-500);
+				pChr->SetNinjaCurrentMoveTime(0);
+				if(sound)
+					pChr->SetLastWeapon(WEAPON_GUN);
+				if(pChr->GetActiveWeapon() >= WEAPON_SHOTGUN)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_SHOTGUN:
+				if(!GameWorld()->m_WorldConfig.m_IsDDRace || !GameWorld()->m_WorldConfig.m_PredictDDRace)
+					continue;
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_SHOTGUN))
+				{
+					pChr->SetWeaponGot(WEAPON_SHOTGUN, false);
+					pChr->SetWeaponAmmo(WEAPON_SHOTGUN, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_SHOTGUN)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_GRENADE:
+				if(!GameWorld()->m_WorldConfig.m_IsDDRace || !GameWorld()->m_WorldConfig.m_PredictDDRace)
+					continue;
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_GRENADE))
+				{
+					pChr->SetWeaponGot(WEAPON_GRENADE, false);
+					pChr->SetWeaponAmmo(WEAPON_GRENADE, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_GRENADE)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_NINJA:
+				if(!GameWorld()->m_WorldConfig.m_IsDDRace || !GameWorld()->m_WorldConfig.m_PredictDDRace)
+					continue;
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				pChr->SetNinjaActivationDir(vec2(0, 0));
+				pChr->SetNinjaActivationTick(-500);
+				pChr->SetNinjaCurrentMoveTime(0);
+				break;
+
+			case POWERUP_ARMOR_LASER:
+				if(!GameWorld()->m_WorldConfig.m_IsDDRace || !GameWorld()->m_WorldConfig.m_PredictDDRace)
+					continue;
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_LASER))
+				{
+					pChr->SetWeaponGot(WEAPON_LASER, false);
+					pChr->SetWeaponAmmo(WEAPON_LASER, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_LASER)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_WEAPON:
+				if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS && (!pChr->GetWeaponGot(m_Subtype) || pChr->GetWeaponAmmo(m_Subtype) != -1))
+					pChr->GiveWeapon(m_Subtype);
+				break;
+
+			case POWERUP_NINJA:
+			{
+				// activate ninja on target player
+				pChr->GiveNinja();
+				break;
+			}
+
+			default:
+				break;
+			};
+		}
+	}
+}
+
+void CPickup::Move()
+{
+	if(GameWorld()->GameTick() % (int)(GameWorld()->GameTickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		int index = Collision()->IsMover(m_Pos.x, m_Pos.y, &Flags);
+		if(index)
+		{
+			m_IsCoreActive = true;
+			m_Core = Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+	}
+}
+
+CPickup::CPickup(CGameWorld *pGameWorld, int ID, const CPickupData *pPickup) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_PICKUP, vec2(0, 0), gs_PickupPhysSize)
+{
+	m_Pos = pPickup->m_Pos;
+	m_Type = pPickup->m_Type;
+	m_Subtype = pPickup->m_Subtype;
+	m_Core = vec2(0.f, 0.f);
+	m_IsCoreActive = false;
+	m_ID = ID;
+	m_Number = pPickup->m_SwitchNumber;
+	m_Layer = m_Number > 0 ? LAYER_SWITCH : LAYER_GAME;
+}
+
+void CPickup::FillInfo(CNetObj_Pickup *pPickup)
+{
+	pPickup->m_X = (int)m_Pos.x;
+	pPickup->m_Y = (int)m_Pos.y;
+	pPickup->m_Type = m_Type;
+	pPickup->m_Subtype = m_Subtype;
+}
+
+bool CPickup::Match(CPickup *pPickup)
+{
+	if(pPickup->m_Type != m_Type || pPickup->m_Subtype != m_Subtype)
+		return false;
+	if(distance(pPickup->m_Pos, m_Pos) > 2.0f)
+		return false;
+	return true;
+}
diff --git a/src_bkp/game/client/prediction/entities/pickup.h b/src_bkp/game/client/prediction/entities/pickup.h
new file mode 100644
index 0000000000..1fd4395da7
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/pickup.h
@@ -0,0 +1,36 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_ENTITIES_PICKUP_H
+#define GAME_CLIENT_PREDICTION_ENTITIES_PICKUP_H
+
+#include <game/client/prediction/entity.h>
+
+class CPickupData;
+
+class CPickup : public CEntity
+{
+public:
+	static const int ms_CollisionExtraSize = 6;
+
+	void Tick() override;
+
+	CPickup(CGameWorld *pGameWorld, int ID, const CPickupData *pPickup);
+	void FillInfo(CNetObj_Pickup *pPickup);
+	bool Match(CPickup *pPickup);
+	bool InDDNetTile() { return m_IsCoreActive; }
+
+	int Type() const { return m_Type; }
+	int Subtype() const { return m_Subtype; }
+
+private:
+	int m_Type;
+	int m_Subtype;
+
+	// DDRace
+
+	void Move();
+	vec2 m_Core;
+	bool m_IsCoreActive;
+};
+
+#endif
diff --git a/src_bkp/game/client/prediction/entities/projectile.cpp b/src_bkp/game/client/prediction/entities/projectile.cpp
new file mode 100644
index 0000000000..832717b8be
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/projectile.cpp
@@ -0,0 +1,226 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/shared/config.h>
+
+#include <game/client/projectile_data.h>
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include "character.h"
+#include "projectile.h"
+
+CProjectile::CProjectile(
+	CGameWorld *pGameWorld,
+	int Type,
+	int Owner,
+	vec2 Pos,
+	vec2 Dir,
+	int Span,
+	bool Freeze,
+	bool Explosive,
+	int SoundImpact,
+	int Layer,
+	int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_PROJECTILE)
+{
+	m_Type = Type;
+	m_Pos = Pos;
+	m_Direction = Dir;
+	m_LifeSpan = Span;
+	m_Owner = Owner;
+	m_SoundImpact = SoundImpact;
+	m_StartTick = GameWorld()->GameTick();
+	m_Explosive = Explosive;
+
+	m_Layer = Layer;
+	m_Number = Number;
+	m_Freeze = Freeze;
+
+	m_TuneZone = GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(Collision()->GetMapIndex(m_Pos)) : 0;
+
+	GameWorld()->InsertEntity(this);
+}
+
+vec2 CProjectile::GetPos(float Time)
+{
+	float Curvature = 0;
+	float Speed = 0;
+	CTuningParams *pTuning = GetTuning(m_TuneZone);
+
+	switch(m_Type)
+	{
+	case WEAPON_GRENADE:
+		Curvature = pTuning->m_GrenadeCurvature;
+		Speed = pTuning->m_GrenadeSpeed;
+		break;
+
+	case WEAPON_SHOTGUN:
+		Curvature = pTuning->m_ShotgunCurvature;
+		Speed = pTuning->m_ShotgunSpeed;
+		break;
+
+	case WEAPON_GUN:
+		Curvature = pTuning->m_GunCurvature;
+		Speed = pTuning->m_GunSpeed;
+		break;
+	}
+
+	return CalcPos(m_Pos, m_Direction, Curvature, Speed, Time);
+}
+
+void CProjectile::Tick()
+{
+	float Pt = (GameWorld()->GameTick() - m_StartTick - 1) / (float)GameWorld()->GameTickSpeed();
+	float Ct = (GameWorld()->GameTick() - m_StartTick) / (float)GameWorld()->GameTickSpeed();
+	vec2 PrevPos = GetPos(Pt);
+	vec2 CurPos = GetPos(Ct);
+	vec2 ColPos;
+	vec2 NewPos;
+	int Collide = Collision()->IntersectLine(PrevPos, CurPos, &ColPos, &NewPos);
+	CCharacter *pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+
+	CCharacter *pTargetChr = GameWorld()->IntersectCharacter(PrevPos, ColPos, m_Freeze ? 1.0f : 6.0f, ColPos, pOwnerChar, m_Owner);
+
+	if(GameWorld()->m_WorldConfig.m_IsSolo && !(m_Type == WEAPON_SHOTGUN && GameWorld()->m_WorldConfig.m_IsDDRace))
+		pTargetChr = 0;
+
+	if(m_LifeSpan > -1)
+		m_LifeSpan--;
+
+	bool isWeaponCollide = false;
+	if(
+		pOwnerChar &&
+		pTargetChr &&
+		!pTargetChr->CanCollide(m_Owner))
+	{
+		isWeaponCollide = true;
+	}
+
+	if(((pTargetChr && (pOwnerChar ? !pOwnerChar->GrenadeHitDisabled() : g_Config.m_SvHit || m_Owner == -1 || pTargetChr == pOwnerChar)) || Collide || GameLayerClipped(CurPos)) && !isWeaponCollide)
+	{
+		if(m_Explosive && (!pTargetChr || (!m_Freeze || (m_Type == WEAPON_SHOTGUN && Collide))))
+		{
+			GameWorld()->CreateExplosion(ColPos, m_Owner, m_Type, m_Owner == -1, (!pTargetChr ? -1 : pTargetChr->Team()), CClientMask().set());
+		}
+		else if(m_Freeze)
+		{
+			CEntity *apEnts[MAX_CLIENTS];
+			int Num = GameWorld()->FindEntities(CurPos, 1.0f, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+			for(int i = 0; i < Num; ++i)
+			{
+				auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+				if(pChr && (m_Layer != LAYER_SWITCH || (m_Layer == LAYER_SWITCH && m_Number > 0 && m_Number < (int)Switchers().size() && Switchers()[m_Number].m_aStatus[pChr->Team()])))
+					pChr->Freeze();
+			}
+		}
+		if(Collide && m_Bouncing != 0)
+		{
+			m_StartTick = GameWorld()->GameTick();
+			m_Pos = NewPos + (-(m_Direction * 4));
+			if(m_Bouncing == 1)
+				m_Direction.x = -m_Direction.x;
+			else if(m_Bouncing == 2)
+				m_Direction.y = -m_Direction.y;
+			if(absolute(m_Direction.x) < 1e-6f)
+				m_Direction.x = 0;
+			if(absolute(m_Direction.y) < 1e-6f)
+				m_Direction.y = 0;
+			m_Pos += m_Direction;
+		}
+		else if(m_Type == WEAPON_GUN)
+		{
+			m_MarkedForDestroy = true;
+		}
+		else if(!m_Freeze)
+			m_MarkedForDestroy = true;
+	}
+	if(m_LifeSpan == -1)
+	{
+		if(m_Explosive)
+		{
+			if(m_Owner >= 0)
+				pOwnerChar = GameWorld()->GetCharacterByID(m_Owner);
+
+			GameWorld()->CreateExplosion(ColPos, m_Owner, m_Type, m_Owner == -1, (!pOwnerChar ? -1 : pOwnerChar->Team()), CClientMask().set());
+		}
+		m_MarkedForDestroy = true;
+	}
+}
+
+// DDRace
+
+void CProjectile::SetBouncing(int Value)
+{
+	m_Bouncing = Value;
+}
+
+CProjectile::CProjectile(CGameWorld *pGameWorld, int ID, const CProjectileData *pProj) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_PROJECTILE)
+{
+	m_Pos = pProj->m_StartPos;
+	m_Direction = pProj->m_StartVel;
+	if(pProj->m_ExtraInfo)
+	{
+		m_Owner = pProj->m_Owner;
+		m_Explosive = pProj->m_Explosive;
+		m_Bouncing = pProj->m_Bouncing;
+		m_Freeze = pProj->m_Freeze;
+	}
+	else
+	{
+		m_Owner = -1;
+		m_Bouncing = 0;
+		m_Freeze = false;
+		m_Explosive = (pProj->m_Type == WEAPON_GRENADE) && (absolute(1.0f - length(m_Direction)) < 0.015f);
+	}
+	m_Type = pProj->m_Type;
+	m_StartTick = pProj->m_StartTick;
+	m_TuneZone = pProj->m_TuneZone;
+
+	int Lifetime = 20 * GameWorld()->GameTickSpeed();
+	m_SoundImpact = -1;
+	if(m_Type == WEAPON_GRENADE)
+	{
+		Lifetime = GetTuning(m_TuneZone)->m_GrenadeLifetime * GameWorld()->GameTickSpeed();
+		m_SoundImpact = SOUND_GRENADE_EXPLODE;
+	}
+	else if(m_Type == WEAPON_GUN)
+		Lifetime = GetTuning(m_TuneZone)->m_GunLifetime * GameWorld()->GameTickSpeed();
+	else if(m_Type == WEAPON_SHOTGUN && !GameWorld()->m_WorldConfig.m_IsDDRace)
+		Lifetime = GetTuning(m_TuneZone)->m_ShotgunLifetime * GameWorld()->GameTickSpeed();
+	m_LifeSpan = Lifetime - (pGameWorld->GameTick() - m_StartTick);
+	m_ID = ID;
+	m_Number = pProj->m_SwitchNumber;
+	m_Layer = m_Number > 0 ? LAYER_SWITCH : LAYER_GAME;
+}
+
+CProjectileData CProjectile::GetData() const
+{
+	CProjectileData Result;
+	Result.m_StartPos = m_Pos;
+	Result.m_StartVel = m_Direction;
+	Result.m_Type = m_Type;
+	Result.m_StartTick = m_StartTick;
+	Result.m_ExtraInfo = true;
+	Result.m_Owner = m_Owner;
+	Result.m_Explosive = m_Explosive;
+	Result.m_Bouncing = m_Bouncing;
+	Result.m_Freeze = m_Freeze;
+	Result.m_TuneZone = m_TuneZone;
+	Result.m_SwitchNumber = m_Number;
+	return Result;
+}
+
+bool CProjectile::Match(CProjectile *pProj)
+{
+	if(pProj->m_Type != m_Type)
+		return false;
+	if(pProj->m_StartTick != m_StartTick)
+		return false;
+	if(distance(pProj->m_Pos, m_Pos) > 2.f)
+		return false;
+	if(distance(pProj->m_Direction, m_Direction) > 2.f)
+		return false;
+	return true;
+}
diff --git a/src_bkp/game/client/prediction/entities/projectile.h b/src_bkp/game/client/prediction/entities/projectile.h
new file mode 100644
index 0000000000..c296fe1665
--- /dev/null
+++ b/src_bkp/game/client/prediction/entities/projectile.h
@@ -0,0 +1,59 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_ENTITIES_PROJECTILE_H
+#define GAME_CLIENT_PREDICTION_ENTITIES_PROJECTILE_H
+
+#include <game/client/prediction/entity.h>
+
+class CProjectileData;
+
+class CProjectile : public CEntity
+{
+	friend class CGameWorld;
+	friend class CItems;
+
+public:
+	CProjectile(
+		CGameWorld *pGameWorld,
+		int Type,
+		int Owner,
+		vec2 Pos,
+		vec2 Dir,
+		int Span,
+		bool Freeze,
+		bool Explosive,
+		int SoundImpact,
+		int Layer = 0,
+		int Number = 0);
+
+	vec2 GetPos(float Time);
+	CProjectileData GetData() const;
+
+	void Tick() override;
+
+	bool Match(CProjectile *pProj);
+	void SetBouncing(int Value);
+
+	const vec2 &GetDirection() { return m_Direction; }
+	const int &GetOwner() { return m_Owner; }
+	const int &GetStartTick() { return m_StartTick; }
+	CProjectile(CGameWorld *pGameWorld, int ID, const CProjectileData *pProj);
+
+private:
+	vec2 m_Direction;
+	int m_LifeSpan;
+	int m_Owner;
+	int m_Type;
+	int m_SoundImpact;
+	float m_Force;
+	int m_StartTick;
+	bool m_Explosive;
+
+	// DDRace
+
+	int m_Bouncing;
+	bool m_Freeze;
+	int m_TuneZone;
+};
+
+#endif
diff --git a/src_bkp/game/client/prediction/entity.cpp b/src_bkp/game/client/prediction/entity.cpp
new file mode 100644
index 0000000000..e90bc7b768
--- /dev/null
+++ b/src_bkp/game/client/prediction/entity.cpp
@@ -0,0 +1,43 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "entity.h"
+
+#include <game/collision.h>
+
+//////////////////////////////////////////////////
+// Entity
+//////////////////////////////////////////////////
+CEntity::CEntity(CGameWorld *pGameWorld, int ObjType, vec2 Pos, int ProximityRadius)
+{
+	m_pGameWorld = pGameWorld;
+
+	m_ObjType = ObjType;
+	m_Pos = Pos;
+	m_ProximityRadius = ProximityRadius;
+
+	m_MarkedForDestroy = false;
+	m_ID = -1;
+
+	m_pPrevTypeEntity = 0;
+	m_pNextTypeEntity = 0;
+	m_SnapTicks = -1;
+
+	// DDRace
+	m_pParent = nullptr;
+	m_pChild = nullptr;
+	m_DestroyTick = -1;
+	m_LastRenderTick = -1;
+}
+
+CEntity::~CEntity()
+{
+	if(GameWorld())
+		GameWorld()->RemoveEntity(this);
+}
+
+bool CEntity::GameLayerClipped(vec2 CheckPos)
+{
+	return round_to_int(CheckPos.x) / 32 < -200 || round_to_int(CheckPos.x) / 32 > Collision()->GetWidth() + 200 ||
+	       round_to_int(CheckPos.y) / 32 < -200 || round_to_int(CheckPos.y) / 32 > Collision()->GetHeight() + 200;
+}
diff --git a/src_bkp/game/client/prediction/entity.h b/src_bkp/game/client/prediction/entity.h
new file mode 100644
index 0000000000..364d0141b8
--- /dev/null
+++ b/src_bkp/game/client/prediction/entity.h
@@ -0,0 +1,74 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_ENTITY_H
+#define GAME_CLIENT_PREDICTION_ENTITY_H
+
+#include <base/vmath.h>
+
+#include <game/alloc.h>
+
+#include "gameworld.h"
+
+class CEntity
+{
+	MACRO_ALLOC_HEAP()
+
+private:
+	friend CGameWorld; // entity list handling
+	CEntity *m_pPrevTypeEntity;
+	CEntity *m_pNextTypeEntity;
+
+protected:
+	CGameWorld *m_pGameWorld;
+	bool m_MarkedForDestroy;
+	int m_ID;
+	int m_ObjType;
+
+public:
+	int GetID() const { return m_ID; }
+
+	CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0);
+	virtual ~CEntity();
+
+	std::vector<SSwitchers> &Switchers() { return m_pGameWorld->Switchers(); }
+	CGameWorld *GameWorld() { return m_pGameWorld; }
+	CTuningParams *Tuning() { return GameWorld()->Tuning(); }
+	CTuningParams *TuningList() { return GameWorld()->TuningList(); }
+	CTuningParams *GetTuning(int i) { return GameWorld()->GetTuning(i); }
+	class CCollision *Collision() { return GameWorld()->Collision(); }
+	CEntity *TypeNext() { return m_pNextTypeEntity; }
+	CEntity *TypePrev() { return m_pPrevTypeEntity; }
+	const vec2 &GetPos() const { return m_Pos; }
+	float GetProximityRadius() const { return m_ProximityRadius; }
+
+	void Destroy() { delete this; }
+	virtual void PreTick() {}
+	virtual void Tick() {}
+	virtual void TickDeferred() {}
+
+	bool GameLayerClipped(vec2 CheckPos);
+	float m_ProximityRadius;
+	vec2 m_Pos;
+	int m_Number;
+	int m_Layer;
+
+	int m_SnapTicks;
+	int m_DestroyTick;
+	int m_LastRenderTick;
+	CEntity *m_pParent;
+	CEntity *m_pChild;
+	CEntity *NextEntity() { return m_pNextTypeEntity; }
+	void Keep()
+	{
+		m_SnapTicks = 0;
+		m_MarkedForDestroy = false;
+	}
+
+	CEntity()
+	{
+		m_ID = -1;
+		m_pGameWorld = 0;
+	}
+};
+
+#endif
diff --git a/src_bkp/game/client/prediction/gameworld.cpp b/src_bkp/game/client/prediction/gameworld.cpp
new file mode 100644
index 0000000000..a2fb701236
--- /dev/null
+++ b/src_bkp/game/client/prediction/gameworld.cpp
@@ -0,0 +1,713 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "gameworld.h"
+#include "entities/character.h"
+#include "entities/dragger.h"
+#include "entities/laser.h"
+#include "entities/pickup.h"
+#include "entities/projectile.h"
+#include "entity.h"
+#include <algorithm>
+#include <engine/shared/config.h>
+#include <game/client/laser_data.h>
+#include <game/client/pickup_data.h>
+#include <game/client/projectile_data.h>
+#include <game/mapitems.h>
+#include <utility>
+
+//////////////////////////////////////////////////
+// game world
+//////////////////////////////////////////////////
+CGameWorld::CGameWorld()
+{
+	for(auto &pFirstEntityType : m_apFirstEntityTypes)
+		pFirstEntityType = 0;
+	for(auto &pCharacter : m_apCharacters)
+		pCharacter = 0;
+	m_pCollision = 0;
+	m_GameTick = 0;
+	m_pParent = 0;
+	m_pChild = 0;
+}
+
+CGameWorld::~CGameWorld()
+{
+	Clear();
+	if(m_pChild && m_pChild->m_pParent == this)
+	{
+		OnModified();
+		m_pChild->m_pParent = 0;
+	}
+	if(m_pParent && m_pParent->m_pChild == this)
+		m_pParent->m_pChild = 0;
+}
+
+CEntity *CGameWorld::FindFirst(int Type)
+{
+	return Type < 0 || Type >= NUM_ENTTYPES ? 0 : m_apFirstEntityTypes[Type];
+}
+
+CEntity *CGameWorld::FindLast(int Type)
+{
+	CEntity *pLast = FindFirst(Type);
+	if(pLast)
+		while(pLast->TypeNext())
+			pLast = pLast->TypeNext();
+	return pLast;
+}
+
+int CGameWorld::FindEntities(vec2 Pos, float Radius, CEntity **ppEnts, int Max, int Type)
+{
+	if(Type < 0 || Type >= NUM_ENTTYPES)
+		return 0;
+
+	int Num = 0;
+	for(CEntity *pEnt = m_apFirstEntityTypes[Type]; pEnt; pEnt = pEnt->m_pNextTypeEntity)
+	{
+		if(distance(pEnt->m_Pos, Pos) < Radius + pEnt->m_ProximityRadius)
+		{
+			if(ppEnts)
+				ppEnts[Num] = pEnt;
+			Num++;
+			if(Num == Max)
+				break;
+		}
+	}
+
+	return Num;
+}
+
+void CGameWorld::InsertEntity(CEntity *pEnt, bool Last)
+{
+	pEnt->m_pGameWorld = this;
+	pEnt->m_pNextTypeEntity = 0x0;
+	pEnt->m_pPrevTypeEntity = 0x0;
+
+	// insert it
+	if(!Last)
+	{
+		if(m_apFirstEntityTypes[pEnt->m_ObjType])
+			m_apFirstEntityTypes[pEnt->m_ObjType]->m_pPrevTypeEntity = pEnt;
+		pEnt->m_pNextTypeEntity = m_apFirstEntityTypes[pEnt->m_ObjType];
+		pEnt->m_pPrevTypeEntity = 0x0;
+		m_apFirstEntityTypes[pEnt->m_ObjType] = pEnt;
+	}
+	else
+	{
+		// insert it at the end of the list
+		CEntity *pLast = m_apFirstEntityTypes[pEnt->m_ObjType];
+		if(pLast)
+		{
+			while(pLast->m_pNextTypeEntity)
+				pLast = pLast->m_pNextTypeEntity;
+			pLast->m_pNextTypeEntity = pEnt;
+		}
+		else
+			m_apFirstEntityTypes[pEnt->m_ObjType] = pEnt;
+		pEnt->m_pPrevTypeEntity = pLast;
+		pEnt->m_pNextTypeEntity = 0x0;
+	}
+
+	if(pEnt->m_ObjType == ENTTYPE_CHARACTER)
+	{
+		auto *pChar = (CCharacter *)pEnt;
+		int ID = pChar->GetCID();
+		if(ID >= 0 && ID < MAX_CLIENTS)
+		{
+			m_apCharacters[ID] = pChar;
+			m_Core.m_apCharacters[ID] = pChar->Core();
+		}
+		pChar->SetCoreWorld(this);
+	}
+}
+
+void CGameWorld::RemoveEntity(CEntity *pEnt)
+{
+	// not in the list
+	if(!pEnt->m_pNextTypeEntity && !pEnt->m_pPrevTypeEntity && m_apFirstEntityTypes[pEnt->m_ObjType] != pEnt)
+		return;
+
+	// remove
+	if(pEnt->m_pPrevTypeEntity)
+		pEnt->m_pPrevTypeEntity->m_pNextTypeEntity = pEnt->m_pNextTypeEntity;
+	else
+		m_apFirstEntityTypes[pEnt->m_ObjType] = pEnt->m_pNextTypeEntity;
+	if(pEnt->m_pNextTypeEntity)
+		pEnt->m_pNextTypeEntity->m_pPrevTypeEntity = pEnt->m_pPrevTypeEntity;
+
+	// keep list traversing valid
+	if(m_pNextTraverseEntity == pEnt)
+		m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+
+	pEnt->m_pNextTypeEntity = 0;
+	pEnt->m_pPrevTypeEntity = 0;
+
+	if(pEnt->m_pParent)
+	{
+		if(m_IsValidCopy && m_pParent && m_pParent->m_pChild == this)
+			pEnt->m_pParent->m_DestroyTick = GameTick();
+		pEnt->m_pParent->m_pChild = nullptr;
+		pEnt->m_pParent = nullptr;
+	}
+	if(pEnt->m_pChild)
+	{
+		pEnt->m_pChild->m_pParent = nullptr;
+		pEnt->m_pChild = nullptr;
+	}
+}
+
+void CGameWorld::RemoveCharacter(CCharacter *pChar)
+{
+	int ID = pChar->GetCID();
+	if(ID >= 0 && ID < MAX_CLIENTS)
+	{
+		m_apCharacters[ID] = 0;
+		m_Core.m_apCharacters[ID] = 0;
+	}
+}
+
+void CGameWorld::RemoveEntities()
+{
+	// destroy objects marked for destruction
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			if(pEnt->m_MarkedForDestroy)
+			{
+				pEnt->Destroy();
+			}
+			pEnt = m_pNextTraverseEntity;
+		}
+}
+
+void CGameWorld::Tick()
+{
+	// update all objects
+	for(int i = 0; i < NUM_ENTTYPES; i++)
+	{
+		// It's important to call PreTick() and Tick() after each other.
+		// If we call PreTick() before, and Tick() after other entities have been processed, it causes physics changes such as a stronger shotgun or grenade.
+		if(m_WorldConfig.m_NoWeakHookAndBounce && i == ENTTYPE_CHARACTER)
+		{
+			auto *pEnt = m_apFirstEntityTypes[i];
+			for(; pEnt;)
+			{
+				m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+				((CCharacter *)pEnt)->PreTick();
+				pEnt = m_pNextTraverseEntity;
+			}
+		}
+
+		auto *pEnt = m_apFirstEntityTypes[i];
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->Tick();
+			pEnt = m_pNextTraverseEntity;
+		}
+	}
+
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->TickDeferred();
+			pEnt->m_SnapTicks++;
+			pEnt = m_pNextTraverseEntity;
+		}
+
+	RemoveEntities();
+
+	// update switch state
+	for(auto &Switcher : Switchers())
+	{
+		for(int j = 0; j < MAX_CLIENTS; ++j)
+		{
+			if(Switcher.m_aEndTick[j] <= GameTick() && Switcher.m_aType[j] == TILE_SWITCHTIMEDOPEN)
+			{
+				Switcher.m_aStatus[j] = false;
+				Switcher.m_aEndTick[j] = 0;
+				Switcher.m_aType[j] = TILE_SWITCHCLOSE;
+			}
+			else if(Switcher.m_aEndTick[j] <= GameTick() && Switcher.m_aType[j] == TILE_SWITCHTIMEDCLOSE)
+			{
+				Switcher.m_aStatus[j] = true;
+				Switcher.m_aEndTick[j] = 0;
+				Switcher.m_aType[j] = TILE_SWITCHOPEN;
+			}
+		}
+	}
+
+	OnModified();
+}
+
+// TODO: should be more general
+CCharacter *CGameWorld::IntersectCharacter(vec2 Pos0, vec2 Pos1, float Radius, vec2 &NewPos, const CCharacter *pNotThis, int CollideWith, const CCharacter *pThisOnly)
+{
+	// Find other players
+	float ClosestLen = distance(Pos0, Pos1) * 100.0f;
+	CCharacter *pClosest = 0;
+
+	CCharacter *p = (CCharacter *)FindFirst(ENTTYPE_CHARACTER);
+	for(; p; p = (CCharacter *)p->TypeNext())
+	{
+		if(p == pNotThis)
+			continue;
+
+		if(pThisOnly && p != pThisOnly)
+			continue;
+
+		if(CollideWith != -1 && !p->CanCollide(CollideWith))
+			continue;
+
+		vec2 IntersectPos;
+		if(closest_point_on_line(Pos0, Pos1, p->m_Pos, IntersectPos))
+		{
+			float Len = distance(p->m_Pos, IntersectPos);
+			if(Len < p->m_ProximityRadius + Radius)
+			{
+				Len = distance(Pos0, IntersectPos);
+				if(Len < ClosestLen)
+				{
+					NewPos = IntersectPos;
+					ClosestLen = Len;
+					pClosest = p;
+				}
+			}
+		}
+	}
+
+	return pClosest;
+}
+
+std::vector<CCharacter *> CGameWorld::IntersectedCharacters(vec2 Pos0, vec2 Pos1, float Radius, const CEntity *pNotThis)
+{
+	std::vector<CCharacter *> vpCharacters;
+	CCharacter *pChr = (CCharacter *)FindFirst(CGameWorld::ENTTYPE_CHARACTER);
+	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
+	{
+		if(pChr == pNotThis)
+			continue;
+
+		vec2 IntersectPos;
+		if(closest_point_on_line(Pos0, Pos1, pChr->m_Pos, IntersectPos))
+		{
+			float Len = distance(pChr->m_Pos, IntersectPos);
+			if(Len < pChr->m_ProximityRadius + Radius)
+			{
+				vpCharacters.push_back(pChr);
+			}
+		}
+	}
+	return vpCharacters;
+}
+
+void CGameWorld::ReleaseHooked(int ClientID)
+{
+	CCharacter *pChr = (CCharacter *)CGameWorld::FindFirst(CGameWorld::ENTTYPE_CHARACTER);
+	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
+	{
+		CCharacterCore *pCore = pChr->Core();
+		if(pCore->HookedPlayer() == ClientID)
+		{
+			pCore->SetHookedPlayer(-1);
+			pCore->m_HookState = HOOK_RETRACTED;
+			pCore->m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+		}
+	}
+}
+
+CTuningParams *CGameWorld::Tuning()
+{
+	return &m_Core.m_aTuning[g_Config.m_ClDummy];
+}
+
+CEntity *CGameWorld::GetEntity(int ID, int EntityType)
+{
+	for(CEntity *pEnt = m_apFirstEntityTypes[EntityType]; pEnt; pEnt = pEnt->m_pNextTypeEntity)
+		if(pEnt->m_ID == ID)
+			return pEnt;
+	return 0;
+}
+
+void CGameWorld::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask)
+{
+	if(Owner < 0 && m_WorldConfig.m_IsSolo && !(Weapon == WEAPON_SHOTGUN && m_WorldConfig.m_IsDDRace))
+		return;
+
+	// deal damage
+	CEntity *apEnts[MAX_CLIENTS];
+	float Radius = 135.0f;
+	float InnerRadius = 48.0f;
+	int Num = FindEntities(Pos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+	for(int i = 0; i < Num; i++)
+	{
+		auto *pChar = static_cast<CCharacter *>(apEnts[i]);
+		vec2 Diff = pChar->m_Pos - Pos;
+		vec2 ForceDir(0, 1);
+		float l = length(Diff);
+		if(l)
+			ForceDir = normalize(Diff);
+		l = 1 - clamp((l - InnerRadius) / (Radius - InnerRadius), 0.0f, 1.0f);
+		float Strength;
+		if(Owner == -1 || !GetCharacterByID(Owner))
+			Strength = Tuning()->m_ExplosionStrength;
+		else
+			Strength = GetCharacterByID(Owner)->Tuning()->m_ExplosionStrength;
+
+		float Dmg = Strength * l;
+		if((int)Dmg)
+			if((GetCharacterByID(Owner) ? !GetCharacterByID(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit || NoDamage) || Owner == pChar->GetCID())
+			{
+				if(Owner != -1 && !pChar->CanCollide(Owner))
+					continue;
+				if(Owner == -1 && ActivatedTeam != -1 && pChar->Team() != ActivatedTeam)
+					continue;
+				pChar->TakeDamage(ForceDir * Dmg * 2, (int)Dmg, Owner, Weapon);
+				if(GetCharacterByID(Owner) ? GetCharacterByID(Owner)->GrenadeHitDisabled() : !g_Config.m_SvHit || NoDamage)
+					break;
+			}
+	}
+}
+
+bool CGameWorld::IsLocalTeam(int OwnerID) const
+{
+	return OwnerID < 0 || m_Teams.CanCollide(m_LocalClientID, OwnerID);
+}
+
+void CGameWorld::NetObjBegin(CTeamsCore Teams, int LocalClientID)
+{
+	m_Teams = Teams;
+	m_LocalClientID = LocalClientID;
+
+	for(int i = 0; i < NUM_ENTTYPES; i++)
+		for(CEntity *pEnt = FindFirst(i); pEnt; pEnt = pEnt->TypeNext())
+		{
+			pEnt->m_MarkedForDestroy = true;
+			if(i == ENTTYPE_CHARACTER)
+				((CCharacter *)pEnt)->m_KeepHooked = false;
+		}
+	OnModified();
+}
+
+void CGameWorld::NetCharAdd(int ObjID, CNetObj_Character *pCharObj, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal)
+{
+	if(IsLocalTeam(ObjID))
+	{
+		CCharacter *pChar;
+		if((pChar = (CCharacter *)GetEntity(ObjID, ENTTYPE_CHARACTER)))
+		{
+			pChar->Read(pCharObj, pExtended, IsLocal);
+			pChar->Keep();
+		}
+		else
+		{
+			pChar = new CCharacter(this, ObjID, pCharObj, pExtended);
+			InsertEntity(pChar);
+		}
+
+		if(pChar)
+			pChar->m_GameTeam = GameTeam;
+	}
+}
+
+void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx)
+{
+	if((ObjType == NETOBJTYPE_PROJECTILE || ObjType == NETOBJTYPE_DDRACEPROJECTILE || ObjType == NETOBJTYPE_DDNETPROJECTILE) && m_WorldConfig.m_PredictWeapons)
+	{
+		CProjectileData Data = ExtractProjectileInfo(ObjType, pObjData, this, pDataEx);
+		if(!IsLocalTeam(Data.m_Owner))
+			return;
+
+		CProjectile NetProj = CProjectile(this, ObjID, &Data);
+
+		if(NetProj.m_Type != WEAPON_SHOTGUN && absolute(length(NetProj.m_Direction) - 1.f) > 0.02f) // workaround to skip grenades on ball mod
+			return;
+
+		if(CProjectile *pProj = (CProjectile *)GetEntity(ObjID, ENTTYPE_PROJECTILE))
+		{
+			if(NetProj.Match(pProj))
+			{
+				pProj->Keep();
+				if(pProj->m_Type == WEAPON_SHOTGUN && m_WorldConfig.m_IsDDRace)
+					pProj->m_LifeSpan = 20 * GameTickSpeed() - (GameTick() - pProj->m_StartTick);
+				return;
+			}
+		}
+		if(!Data.m_ExtraInfo)
+		{
+			// try to match the newly received (unrecognized) projectile with a locally fired one
+			for(CProjectile *pProj = (CProjectile *)FindFirst(CGameWorld::ENTTYPE_PROJECTILE); pProj; pProj = (CProjectile *)pProj->TypeNext())
+			{
+				if(pProj->m_ID == -1 && NetProj.Match(pProj))
+				{
+					pProj->m_ID = ObjID;
+					pProj->Keep();
+					return;
+				}
+			}
+			// otherwise try to determine its owner by checking if there is only one player nearby
+			if(NetProj.m_StartTick >= GameTick() - 4)
+			{
+				const vec2 NetPos = NetProj.m_Pos - normalize(NetProj.m_Direction) * CCharacterCore::PhysicalSize() * 0.75;
+				const bool Prev = (GameTick() - NetProj.m_StartTick) > 1;
+				float First = 200.0f, Second = 200.0f;
+				CCharacter *pClosest = 0;
+				for(CCharacter *pChar = (CCharacter *)FindFirst(ENTTYPE_CHARACTER); pChar; pChar = (CCharacter *)pChar->TypeNext())
+				{
+					float Dist = distance(Prev ? pChar->m_PrevPrevPos : pChar->m_PrevPos, NetPos);
+					if(Dist < First)
+					{
+						pClosest = pChar;
+						First = Dist;
+					}
+					else if(Dist < Second)
+						Second = Dist;
+				}
+				if(pClosest && maximum(First, 2.f) * 1.2f < Second)
+					NetProj.m_Owner = pClosest->m_ID;
+			}
+		}
+		CProjectile *pProj = new CProjectile(NetProj);
+		InsertEntity(pProj);
+	}
+	else if((ObjType == NETOBJTYPE_PICKUP || ObjType == NETOBJTYPE_DDNETPICKUP) && m_WorldConfig.m_PredictWeapons)
+	{
+		CPickupData Data = ExtractPickupInfo(ObjType, pObjData, pDataEx);
+		CPickup NetPickup = CPickup(this, ObjID, &Data);
+		if(CPickup *pPickup = (CPickup *)GetEntity(ObjID, ENTTYPE_PICKUP))
+		{
+			if(NetPickup.Match(pPickup))
+			{
+				pPickup->m_Pos = NetPickup.m_Pos;
+				pPickup->Keep();
+				return;
+			}
+		}
+		CEntity *pEnt = new CPickup(NetPickup);
+		InsertEntity(pEnt, true);
+	}
+	else if((ObjType == NETOBJTYPE_LASER || ObjType == NETOBJTYPE_DDNETLASER) && m_WorldConfig.m_PredictWeapons)
+	{
+		CLaserData Data = ExtractLaserInfo(ObjType, pObjData, this, pDataEx);
+		if(!IsLocalTeam(Data.m_Owner) || !Data.m_Predict)
+		{
+			return;
+		}
+
+		if(Data.m_Type == LASERTYPE_RIFLE || Data.m_Type == LASERTYPE_SHOTGUN || Data.m_Type < 0)
+		{
+			CLaser NetLaser = CLaser(this, ObjID, &Data);
+			CLaser *pMatching = 0;
+			if(CLaser *pLaser = dynamic_cast<CLaser *>(GetEntity(ObjID, ENTTYPE_LASER)))
+				if(NetLaser.Match(pLaser))
+					pMatching = pLaser;
+			if(!pMatching)
+			{
+				for(CEntity *pEnt = FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->TypeNext())
+				{
+					auto *const pLaser = dynamic_cast<CLaser *>(pEnt);
+					if(pLaser && pLaser->m_ID == -1 && NetLaser.Match(pLaser))
+					{
+						pMatching = pLaser;
+						pMatching->m_ID = ObjID;
+						break;
+					}
+				}
+			}
+			if(pMatching)
+			{
+				pMatching->Keep();
+				if(distance(NetLaser.m_From, NetLaser.m_Pos) < distance(pMatching->m_From, pMatching->m_Pos) - 2.f)
+				{
+					// if the laser stopped earlier than predicted, set the energy to 0
+					pMatching->m_Energy = 0.f;
+					pMatching->m_Pos = NetLaser.m_Pos;
+				}
+			}
+		}
+		else if(Data.m_Type == LASERTYPE_DRAGGER)
+		{
+			CDragger NetDragger = CDragger(this, ObjID, &Data);
+			if(NetDragger.GetStrength() > 0)
+			{
+				auto *pDragger = dynamic_cast<CDragger *>(GetEntity(ObjID, ENTTYPE_DRAGGER));
+				if(pDragger && NetDragger.Match(pDragger))
+				{
+					pDragger->Keep();
+					pDragger->Read(&Data);
+					return;
+				}
+				CEntity *pEnt = new CDragger(NetDragger);
+				InsertEntity(pEnt);
+			}
+		}
+	}
+}
+
+void CGameWorld::NetObjEnd()
+{
+	// keep predicting hooked characters, based on hook position
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(CCharacter *pChar = GetCharacterByID(i))
+			if(!pChar->m_MarkedForDestroy)
+				if(CCharacter *pHookedChar = GetCharacterByID(pChar->m_Core.HookedPlayer()))
+					if(pHookedChar->m_MarkedForDestroy)
+					{
+						pHookedChar->m_Pos = pHookedChar->m_Core.m_Pos = pChar->m_Core.m_HookPos;
+						pHookedChar->m_Core.m_Vel = vec2(0, 0);
+						mem_zero(&pHookedChar->m_SavedInput, sizeof(pHookedChar->m_SavedInput));
+						pHookedChar->m_SavedInput.m_TargetY = -1;
+						pHookedChar->m_KeepHooked = true;
+						pHookedChar->m_MarkedForDestroy = false;
+					}
+	RemoveEntities();
+
+	// Update character IDs and pointers
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		m_apCharacters[i] = 0;
+		m_Core.m_apCharacters[i] = 0;
+	}
+	for(CCharacter *pChar = (CCharacter *)FindFirst(ENTTYPE_CHARACTER); pChar; pChar = (CCharacter *)pChar->TypeNext())
+	{
+		int ID = pChar->GetCID();
+		if(ID >= 0 && ID < MAX_CLIENTS)
+		{
+			m_apCharacters[ID] = pChar;
+			m_Core.m_apCharacters[ID] = pChar->Core();
+		}
+	}
+}
+
+void CGameWorld::CopyWorld(CGameWorld *pFrom)
+{
+	if(pFrom == this || !pFrom)
+		return;
+	m_IsValidCopy = false;
+	m_pParent = pFrom;
+	if(m_pParent->m_pChild && m_pParent->m_pChild != this)
+		m_pParent->m_pChild->m_IsValidCopy = false;
+	pFrom->m_pChild = this;
+
+	m_GameTick = pFrom->m_GameTick;
+	m_pCollision = pFrom->m_pCollision;
+	m_WorldConfig = pFrom->m_WorldConfig;
+	for(int i = 0; i < 2; i++)
+	{
+		m_Core.m_aTuning[i] = pFrom->m_Core.m_aTuning[i];
+	}
+	m_pTuningList = pFrom->m_pTuningList;
+	m_Teams = pFrom->m_Teams;
+	m_Core.m_vSwitchers = pFrom->m_Core.m_vSwitchers;
+	// delete the previous entities
+	Clear();
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		m_apCharacters[i] = 0;
+		m_Core.m_apCharacters[i] = 0;
+	}
+	// copy and add the new entities
+	for(int Type = 0; Type < NUM_ENTTYPES; Type++)
+	{
+		for(CEntity *pEnt = pFrom->FindLast(Type); pEnt; pEnt = pEnt->TypePrev())
+		{
+			CEntity *pCopy = 0;
+			if(Type == ENTTYPE_PROJECTILE)
+				pCopy = new CProjectile(*((CProjectile *)pEnt));
+			else if(Type == ENTTYPE_LASER)
+				pCopy = new CLaser(*((CLaser *)pEnt));
+			else if(Type == ENTTYPE_DRAGGER)
+				pCopy = new CDragger(*((CDragger *)pEnt));
+			else if(Type == ENTTYPE_CHARACTER)
+				pCopy = new CCharacter(*((CCharacter *)pEnt));
+			else if(Type == ENTTYPE_PICKUP)
+				pCopy = new CPickup(*((CPickup *)pEnt));
+			if(pCopy)
+			{
+				pCopy->m_pParent = pEnt;
+				pEnt->m_pChild = pCopy;
+				this->InsertEntity(pCopy);
+			}
+		}
+	}
+	m_IsValidCopy = true;
+}
+
+CEntity *CGameWorld::FindMatch(int ObjID, int ObjType, const void *pObjData)
+{
+	switch(ObjType)
+	{
+	case NETOBJTYPE_CHARACTER:
+	{
+		CCharacter *pEnt = (CCharacter *)GetEntity(ObjID, ENTTYPE_CHARACTER);
+		if(pEnt && CCharacter(this, ObjID, (CNetObj_Character *)pObjData).Match((CCharacter *)pEnt))
+		{
+			return pEnt;
+		}
+		return 0;
+	}
+	case NETOBJTYPE_PROJECTILE:
+	case NETOBJTYPE_DDRACEPROJECTILE:
+	case NETOBJTYPE_DDNETPROJECTILE:
+	{
+		CProjectileData Data = ExtractProjectileInfo(ObjType, pObjData, this, nullptr);
+		CProjectile *pEnt = (CProjectile *)GetEntity(ObjID, ENTTYPE_PROJECTILE);
+		if(pEnt && CProjectile(this, ObjID, &Data).Match(pEnt))
+		{
+			return pEnt;
+		}
+		return 0;
+	}
+	case NETOBJTYPE_LASER:
+	case NETOBJTYPE_DDNETLASER:
+	{
+		CLaserData Data = ExtractLaserInfo(ObjType, pObjData, this, nullptr);
+		if(Data.m_Type == LASERTYPE_RIFLE || Data.m_Type == LASERTYPE_SHOTGUN)
+		{
+			CLaser *pEnt = (CLaser *)GetEntity(ObjID, ENTTYPE_LASER);
+			if(pEnt && CLaser(this, ObjID, &Data).Match(pEnt))
+			{
+				return pEnt;
+			}
+		}
+		else if(Data.m_Type == LASERTYPE_DRAGGER)
+		{
+			CDragger *pEnt = (CDragger *)GetEntity(ObjID, ENTTYPE_DRAGGER);
+			if(pEnt && CDragger(this, ObjID, &Data).Match(pEnt))
+			{
+				return pEnt;
+			}
+		}
+		return 0;
+	}
+	case NETOBJTYPE_PICKUP:
+	case NETOBJTYPE_DDNETPICKUP:
+	{
+		CPickupData Data = ExtractPickupInfo(ObjType, pObjData, nullptr);
+		CPickup *pEnt = (CPickup *)GetEntity(ObjID, ENTTYPE_PICKUP);
+		if(pEnt && CPickup(this, ObjID, &Data).Match(pEnt))
+		{
+			return pEnt;
+		}
+		return 0;
+	}
+	}
+	return 0;
+}
+
+void CGameWorld::OnModified() const
+{
+	if(m_pChild)
+		m_pChild->m_IsValidCopy = false;
+}
+
+void CGameWorld::Clear()
+{
+	// delete all entities
+	for(auto &pFirstEntityType : m_apFirstEntityTypes)
+		while(pFirstEntityType)
+			delete pFirstEntityType; // NOLINT(clang-analyzer-cplusplus.NewDelete)
+}
diff --git a/src_bkp/game/client/prediction/gameworld.h b/src_bkp/game/client/prediction/gameworld.h
new file mode 100644
index 0000000000..18be1fc258
--- /dev/null
+++ b/src_bkp/game/client/prediction/gameworld.h
@@ -0,0 +1,153 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PREDICTION_GAMEWORLD_H
+#define GAME_CLIENT_PREDICTION_GAMEWORLD_H
+
+#include <game/gamecore.h>
+#include <game/teamscore.h>
+
+#include <list>
+#include <vector>
+
+class CCollision;
+class CCharacter;
+class CEntity;
+
+class CGameWorld
+{
+public:
+	enum
+	{
+		ENTTYPE_PROJECTILE = 0,
+		ENTTYPE_LASER,
+		ENTTYPE_DOOR,
+		ENTTYPE_DRAGGER,
+		ENTTYPE_LIGHT,
+		ENTTYPE_GUN,
+		ENTTYPE_PLASMA,
+		ENTTYPE_PICKUP,
+		ENTTYPE_FLAG,
+		ENTTYPE_CHARACTER,
+		NUM_ENTTYPES
+	};
+
+	CWorldCore m_Core;
+	CTeamsCore m_Teams;
+
+	CGameWorld();
+	~CGameWorld();
+
+	CEntity *FindFirst(int Type);
+	CEntity *FindLast(int Type);
+	int FindEntities(vec2 Pos, float Radius, CEntity **ppEnts, int Max, int Type);
+	CCharacter *IntersectCharacter(vec2 Pos0, vec2 Pos1, float Radius, vec2 &NewPos, const CCharacter *pNotThis = nullptr, int CollideWith = -1, const CCharacter *pThisOnly = nullptr);
+	void InsertEntity(CEntity *pEntity, bool Last = false);
+	void RemoveEntity(CEntity *pEntity);
+	void RemoveCharacter(CCharacter *pChar);
+	void Tick();
+
+	// DDRace
+	void ReleaseHooked(int ClientID);
+	std::vector<CCharacter *> IntersectedCharacters(vec2 Pos0, vec2 Pos1, float Radius, const CEntity *pNotThis = nullptr);
+
+	int m_GameTick;
+	CCollision *m_pCollision;
+
+	// getter for server variables
+	int GameTick() { return m_GameTick; }
+	int GameTickSpeed() { return SERVER_TICK_SPEED; }
+	CCollision *Collision() { return m_pCollision; }
+	CTeamsCore *Teams() { return &m_Teams; }
+	std::vector<SSwitchers> &Switchers() { return m_Core.m_vSwitchers; }
+	CTuningParams *Tuning();
+	CEntity *GetEntity(int ID, int EntityType);
+	CCharacter *GetCharacterByID(int ID) { return (ID >= 0 && ID < MAX_CLIENTS) ? m_apCharacters[ID] : nullptr; }
+
+	// from gamecontext
+	void CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask);
+
+	// for client side prediction
+	struct
+	{
+		bool m_IsDDRace;
+		bool m_IsVanilla;
+		bool m_IsFNG;
+		bool m_InfiniteAmmo;
+		bool m_PredictTiles;
+		int m_PredictFreeze;
+		bool m_PredictWeapons;
+		bool m_PredictDDRace;
+		bool m_IsSolo;
+		bool m_UseTuneZones;
+		bool m_BugDDRaceInput;
+		bool m_NoWeakHookAndBounce;
+	} m_WorldConfig;
+
+	bool m_IsValidCopy;
+	CGameWorld *m_pParent;
+	CGameWorld *m_pChild;
+
+	int m_LocalClientID;
+
+	bool IsLocalTeam(int OwnerID) const;
+	void OnModified() const;
+	void NetObjBegin(CTeamsCore Teams, int LocalClientID);
+	void NetCharAdd(int ObjID, CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtended, int GameTeam, bool IsLocal);
+	void NetObjAdd(int ObjID, int ObjType, const void *pObjData, const CNetObj_EntityEx *pDataEx);
+	void NetObjEnd();
+	void CopyWorld(CGameWorld *pFrom);
+	CEntity *FindMatch(int ObjID, int ObjType, const void *pObjData);
+	void Clear();
+
+	CTuningParams *m_pTuningList;
+	CTuningParams *TuningList() { return m_pTuningList; }
+	CTuningParams *GetTuning(int i) { return &TuningList()[i]; }
+
+private:
+	void RemoveEntities();
+
+	CEntity *m_pNextTraverseEntity = nullptr;
+	CEntity *m_apFirstEntityTypes[NUM_ENTTYPES];
+
+	CCharacter *m_apCharacters[MAX_CLIENTS];
+};
+
+class CCharOrder
+{
+public:
+	std::list<int> m_IDs; // reverse of the order in the gameworld, since entities will be inserted in reverse
+	CCharOrder()
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+			m_IDs.push_back(i);
+	}
+	void GiveStrong(int c)
+	{
+		if(0 <= c && c < MAX_CLIENTS)
+		{
+			m_IDs.remove(c);
+			m_IDs.push_front(c);
+		}
+	}
+	void GiveWeak(int c)
+	{
+		if(0 <= c && c < MAX_CLIENTS)
+		{
+			m_IDs.remove(c);
+			m_IDs.push_back(c);
+		}
+	}
+	bool HasStrongAgainst(int From, int To)
+	{
+		for(int i : m_IDs)
+		{
+			if(i == To)
+				return false;
+			else if(i == From)
+				return true;
+		}
+		return false;
+	}
+};
+
+#endif
diff --git a/src_bkp/game/client/projectile_data.cpp b/src_bkp/game/client/projectile_data.cpp
new file mode 100644
index 0000000000..45387a4526
--- /dev/null
+++ b/src_bkp/game/client/projectile_data.cpp
@@ -0,0 +1,126 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "projectile_data.h"
+
+#include <engine/shared/snapshot.h>
+#include <game/client/prediction/gameworld.h>
+#include <game/generated/protocol.h>
+
+#include <game/collision.h>
+
+bool UseProjectileExtraInfo(const CNetObj_Projectile *pProj)
+{
+	return pProj->m_VelY >= 0 && (pProj->m_VelY & LEGACYPROJECTILEFLAG_IS_DDNET) != 0;
+}
+
+CProjectileData ExtractProjectileInfo(int NetObjType, const void *pData, CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx)
+{
+	CNetObj_Projectile *pProj = (CNetObj_Projectile *)pData;
+
+	if(NetObjType == NETOBJTYPE_DDNETPROJECTILE)
+	{
+		return ExtractProjectileInfoDDNet((CNetObj_DDNetProjectile *)pData);
+	}
+	else if(NetObjType == NETOBJTYPE_DDRACEPROJECTILE || (NetObjType == NETOBJTYPE_PROJECTILE && UseProjectileExtraInfo(pProj)))
+	{
+		return ExtractProjectileInfoDDRace((CNetObj_DDRaceProjectile *)pData, pGameWorld, pEntEx);
+	}
+
+	CProjectileData Result = {vec2(0, 0)};
+	Result.m_StartPos.x = pProj->m_X;
+	Result.m_StartPos.y = pProj->m_Y;
+	Result.m_StartVel.x = pProj->m_VelX / 100.0f;
+	Result.m_StartVel.y = pProj->m_VelY / 100.0f;
+	Result.m_Type = pProj->m_Type;
+	Result.m_StartTick = pProj->m_StartTick;
+	Result.m_ExtraInfo = false;
+	Result.m_Owner = -1;
+	Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_StartPos)) : 0;
+	Result.m_SwitchNumber = pEntEx ? pEntEx->m_SwitchNumber : 0;
+	return Result;
+}
+
+CProjectileData ExtractProjectileInfoDDRace(const CNetObj_DDRaceProjectile *pProj, CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx)
+{
+	CProjectileData Result = {vec2(0, 0)};
+
+	Result.m_StartPos.x = pProj->m_X / 100.0f;
+	Result.m_StartPos.y = pProj->m_Y / 100.0f;
+	float Angle = pProj->m_Angle / 1000000.0f;
+	Result.m_StartVel.x = std::sin(-Angle);
+	Result.m_StartVel.y = std::cos(-Angle);
+	Result.m_Type = pProj->m_Type;
+	Result.m_StartTick = pProj->m_StartTick;
+
+	Result.m_ExtraInfo = true;
+	Result.m_Owner = pProj->m_Data & 255;
+	if(pProj->m_Data & LEGACYPROJECTILEFLAG_NO_OWNER || Result.m_Owner < 0 || Result.m_Owner >= MAX_CLIENTS)
+	{
+		Result.m_Owner = -1;
+	}
+	// LEGACYPROJECTILEFLAG_BOUNCE_HORIZONTAL, LEGACYPROJECTILEFLAG_BOUNCE_VERTICAL
+	Result.m_Bouncing = (pProj->m_Data >> 10) & 3;
+	Result.m_Explosive = pProj->m_Data & LEGACYPROJECTILEFLAG_EXPLOSIVE;
+	Result.m_Freeze = pProj->m_Data & LEGACYPROJECTILEFLAG_FREEZE;
+	Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_StartPos)) : 0;
+	Result.m_SwitchNumber = pEntEx ? pEntEx->m_SwitchNumber : 0;
+	return Result;
+}
+
+CProjectileData ExtractProjectileInfoDDNet(const CNetObj_DDNetProjectile *pProj)
+{
+	CProjectileData Result = {vec2(0, 0)};
+
+	Result.m_StartPos = vec2(pProj->m_X / 100.0f, pProj->m_Y / 100.0f);
+	Result.m_StartVel = vec2(pProj->m_VelX / 1e6f, pProj->m_VelY / 1e6f);
+
+	if(pProj->m_Flags & PROJECTILEFLAG_NORMALIZE_VEL)
+	{
+		Result.m_StartVel = normalize(Result.m_StartVel);
+	}
+
+	Result.m_Type = pProj->m_Type;
+	Result.m_StartTick = pProj->m_StartTick;
+
+	Result.m_ExtraInfo = true;
+	Result.m_Owner = pProj->m_Owner;
+	Result.m_SwitchNumber = pProj->m_SwitchNumber;
+	Result.m_TuneZone = pProj->m_TuneZone;
+
+	Result.m_Bouncing = 0;
+	if(pProj->m_Flags & PROJECTILEFLAG_BOUNCE_HORIZONTAL)
+	{
+		Result.m_Bouncing |= 1;
+	}
+	if(pProj->m_Flags & PROJECTILEFLAG_BOUNCE_VERTICAL)
+	{
+		Result.m_Bouncing |= 2;
+	}
+
+	Result.m_Explosive = pProj->m_Flags & PROJECTILEFLAG_EXPLOSIVE;
+	Result.m_Freeze = pProj->m_Flags & PROJECTILEFLAG_FREEZE;
+
+	return Result;
+}
+
+void SnapshotRemoveExtraProjectileInfo(unsigned char *pData)
+{
+	CSnapshot *pSnap = (CSnapshot *)pData;
+	for(int Index = 0; Index < pSnap->NumItems(); Index++)
+	{
+		const CSnapshotItem *pItem = pSnap->GetItem(Index);
+		if(pItem->Type() == NETOBJTYPE_PROJECTILE)
+		{
+			CNetObj_Projectile *pProj = (CNetObj_Projectile *)((void *)pItem->Data());
+			if(UseProjectileExtraInfo(pProj))
+			{
+				CProjectileData Data = ExtractProjectileInfo(NETOBJTYPE_PROJECTILE, pProj, nullptr, nullptr);
+				pProj->m_X = Data.m_StartPos.x;
+				pProj->m_Y = Data.m_StartPos.y;
+				pProj->m_VelX = (int)(Data.m_StartVel.x * 100.0f);
+				pProj->m_VelY = (int)(Data.m_StartVel.y * 100.0f);
+			}
+		}
+	}
+}
diff --git a/src_bkp/game/client/projectile_data.h b/src_bkp/game/client/projectile_data.h
new file mode 100644
index 0000000000..f66878dc52
--- /dev/null
+++ b/src_bkp/game/client/projectile_data.h
@@ -0,0 +1,35 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_PROJECTILE_DATA_H
+#define GAME_CLIENT_PROJECTILE_DATA_H
+
+#include <base/vmath.h>
+
+struct CNetObj_Projectile;
+struct CNetObj_DDRaceProjectile;
+struct CNetObj_DDNetProjectile;
+struct CNetObj_EntityEx;
+
+class CProjectileData
+{
+public:
+	vec2 m_StartPos;
+	vec2 m_StartVel;
+	int m_Type;
+	int m_StartTick;
+	bool m_ExtraInfo;
+	// The rest is only set if m_ExtraInfo is true.
+	int m_Owner;
+	bool m_Explosive;
+	int m_Bouncing;
+	bool m_Freeze;
+	int m_SwitchNumber;
+	// TuneZone is introduced locally
+	int m_TuneZone;
+};
+
+CProjectileData ExtractProjectileInfo(int NetObjType, const void *pData, class CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx);
+CProjectileData ExtractProjectileInfoDDRace(const CNetObj_DDRaceProjectile *pProj, class CGameWorld *pGameWorld, const CNetObj_EntityEx *pEntEx);
+CProjectileData ExtractProjectileInfoDDNet(const CNetObj_DDNetProjectile *pProj);
+
+#endif // GAME_CLIENT_PROJECTILE_DATA_H
diff --git a/src_bkp/game/client/race.cpp b/src_bkp/game/client/race.cpp
new file mode 100644
index 0000000000..d71c4a3ab2
--- /dev/null
+++ b/src_bkp/game/client/race.cpp
@@ -0,0 +1,97 @@
+#include <cctype>
+#include <list>
+
+#include <game/client/gameclient.h>
+#include <game/mapitems.h>
+
+#include "race.h"
+
+int CRaceHelper::ms_aFlagIndex[2] = {-1, -1};
+
+int CRaceHelper::TimeFromSecondsStr(const char *pStr)
+{
+	while(*pStr == ' ') // skip leading spaces
+		pStr++;
+	if(!isdigit(*pStr))
+		return -1;
+	int Time = str_toint(pStr) * 1000;
+	while(isdigit(*pStr))
+		pStr++;
+	if(*pStr == '.' || *pStr == ',')
+	{
+		pStr++;
+		static const int s_aMult[3] = {100, 10, 1};
+		for(size_t i = 0; i < std::size(s_aMult) && isdigit(pStr[i]); i++)
+			Time += (pStr[i] - '0') * s_aMult[i];
+	}
+	return Time;
+}
+
+int CRaceHelper::TimeFromStr(const char *pStr)
+{
+	static const char *const s_pMinutesStr = " minute(s) ";
+	static const char *const s_pSecondsStr = " second(s)";
+
+	const char *pSeconds = str_find(pStr, s_pSecondsStr);
+	if(!pSeconds)
+		return -1;
+
+	const char *pMinutes = str_find(pStr, s_pMinutesStr);
+	if(pMinutes)
+	{
+		while(*pStr == ' ') // skip leading spaces
+			pStr++;
+		int SecondsTime = TimeFromSecondsStr(pMinutes + str_length(s_pMinutesStr));
+		if(SecondsTime == -1 || !isdigit(*pStr))
+			return -1;
+		return str_toint(pStr) * 60 * 1000 + SecondsTime;
+	}
+	else
+		return TimeFromSecondsStr(pStr);
+}
+
+int CRaceHelper::TimeFromFinishMessage(const char *pStr, char *pNameBuf, int NameBufSize)
+{
+	static const char *const s_pFinishedStr = " finished in: ";
+	const char *pFinished = str_find(pStr, s_pFinishedStr);
+	if(!pFinished)
+		return -1;
+
+	int FinishedPos = pFinished - pStr;
+	if(FinishedPos == 0 || FinishedPos >= NameBufSize)
+		return -1;
+
+	str_copy(pNameBuf, pStr, FinishedPos + 1);
+
+	return TimeFromStr(pFinished + str_length(s_pFinishedStr));
+}
+
+bool CRaceHelper::IsStart(CGameClient *pClient, vec2 Prev, vec2 Pos)
+{
+	CCollision *pCollision = pClient->Collision();
+	if(pClient->m_GameInfo.m_FlagStartsRace)
+	{
+		int EnemyTeam = pClient->m_aClients[pClient->m_Snap.m_LocalClientID].m_Team ^ 1;
+		return ms_aFlagIndex[EnemyTeam] != -1 && distance(Pos, pCollision->GetPos(ms_aFlagIndex[EnemyTeam])) < 32;
+	}
+	else
+	{
+		std::vector<int> vIndices = pCollision->GetMapIndices(Prev, Pos);
+		if(!vIndices.empty())
+			for(int &Indice : vIndices)
+			{
+				if(pCollision->GetTileIndex(Indice) == TILE_START)
+					return true;
+				if(pCollision->GetFTileIndex(Indice) == TILE_START)
+					return true;
+			}
+		else
+		{
+			if(pCollision->GetTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START)
+				return true;
+			if(pCollision->GetFTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START)
+				return true;
+		}
+	}
+	return false;
+}
diff --git a/src_bkp/game/client/race.h b/src_bkp/game/client/race.h
new file mode 100644
index 0000000000..ae82461b46
--- /dev/null
+++ b/src_bkp/game/client/race.h
@@ -0,0 +1,19 @@
+#ifndef GAME_CLIENT_RACE_H
+#define GAME_CLIENT_RACE_H
+
+#include <base/vmath.h>
+
+class CRaceHelper
+{
+public:
+	static int ms_aFlagIndex[2];
+
+	// these functions return the time in milliseconds, time -1 is invalid
+	static int TimeFromSecondsStr(const char *pStr); // x.xxx
+	static int TimeFromStr(const char *pStr); // x minute(s) x.xxx second(s)
+	static int TimeFromFinishMessage(const char *pStr, char *pNameBuf, int NameBufSize); // xxx finished in: x minute(s) x.xxx second(s)
+
+	static bool IsStart(class CGameClient *pClient, vec2 Prev, vec2 Pos);
+};
+
+#endif // GAME_CLIENT_RACE_H
diff --git a/src_bkp/game/client/render.cpp b/src_bkp/game/client/render.cpp
new file mode 100644
index 0000000000..de198c3d95
--- /dev/null
+++ b/src_bkp/game/client/render.cpp
@@ -0,0 +1,439 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <cmath>
+
+#include <base/math.h>
+
+#include "animstate.h"
+#include "render.h"
+
+#include <engine/graphics.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/client_data.h>
+#include <game/generated/client_data7.h>
+#include <game/generated/protocol.h>
+
+#include <game/mapitems.h>
+
+static float gs_SpriteWScale;
+static float gs_SpriteHScale;
+
+void CRenderTools::Init(IGraphics *pGraphics, ITextRender *pTextRender)
+{
+	m_pGraphics = pGraphics;
+	m_pTextRender = pTextRender;
+	m_TeeQuadContainerIndex = Graphics()->CreateQuadContainer(false);
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f);
+
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f * 0.4f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f * 0.4f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f * 0.4f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f * 0.4f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, 64.f * 0.4f);
+
+	// Feet
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, -32.f, -16.f, 64.f, 32.f);
+	Graphics()->QuadsSetSubset(0, 0, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, -32.f, -16.f, 64.f, 32.f);
+
+	// Mirrored Feet
+	Graphics()->QuadsSetSubsetFree(1, 0, 0, 0, 0, 1, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, -32.f, -16.f, 64.f, 32.f);
+	Graphics()->QuadsSetSubsetFree(1, 0, 0, 0, 0, 1, 1, 1);
+	QuadContainerAddSprite(m_TeeQuadContainerIndex, -32.f, -16.f, 64.f, 32.f);
+
+	Graphics()->QuadContainerUpload(m_TeeQuadContainerIndex);
+}
+
+void CRenderTools::SelectSprite(CDataSprite *pSpr, int Flags, int sx, int sy) const
+{
+	int x = pSpr->m_X + sx;
+	int y = pSpr->m_Y + sy;
+	int w = pSpr->m_W;
+	int h = pSpr->m_H;
+	int cx = pSpr->m_pSet->m_Gridx;
+	int cy = pSpr->m_pSet->m_Gridy;
+
+	GetSpriteScaleImpl(w, h, gs_SpriteWScale, gs_SpriteHScale);
+
+	float x1 = x / (float)cx + 0.5f / (float)(cx * 32);
+	float x2 = (x + w) / (float)cx - 0.5f / (float)(cx * 32);
+	float y1 = y / (float)cy + 0.5f / (float)(cy * 32);
+	float y2 = (y + h) / (float)cy - 0.5f / (float)(cy * 32);
+
+	if(Flags & SPRITE_FLAG_FLIP_Y)
+		std::swap(y1, y2);
+
+	if(Flags & SPRITE_FLAG_FLIP_X)
+		std::swap(x1, x2);
+
+	Graphics()->QuadsSetSubset(x1, y1, x2, y2);
+}
+
+void CRenderTools::SelectSprite(int Id, int Flags, int sx, int sy) const
+{
+	if(Id < 0 || Id >= g_pData->m_NumSprites)
+		return;
+	SelectSprite(&g_pData->m_aSprites[Id], Flags, sx, sy);
+}
+
+void CRenderTools::GetSpriteScale(const CDataSprite *pSprite, float &ScaleX, float &ScaleY) const
+{
+	int w = pSprite->m_W;
+	int h = pSprite->m_H;
+	GetSpriteScaleImpl(w, h, ScaleX, ScaleY);
+}
+
+void CRenderTools::GetSpriteScale(int Id, float &ScaleX, float &ScaleY) const
+{
+	GetSpriteScale(&g_pData->m_aSprites[Id], ScaleX, ScaleY);
+}
+
+void CRenderTools::GetSpriteScaleImpl(int Width, int Height, float &ScaleX, float &ScaleY) const
+{
+	const float f = length(vec2(Width, Height));
+	ScaleX = Width / f;
+	ScaleY = Height / f;
+}
+
+void CRenderTools::DrawSprite(float x, float y, float Size) const
+{
+	IGraphics::CQuadItem QuadItem(x, y, Size * gs_SpriteWScale, Size * gs_SpriteHScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CRenderTools::DrawSprite(float x, float y, float ScaledWidth, float ScaledHeight) const
+{
+	IGraphics::CQuadItem QuadItem(x, y, ScaledWidth, ScaledHeight);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CRenderTools::RenderCursor(vec2 Center, float Size) const
+{
+	Graphics()->WrapClamp();
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CURSOR].m_Id);
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	IGraphics::CQuadItem QuadItem(Center.x, Center.y, Size, Size);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
+}
+
+void CRenderTools::RenderIcon(int ImageId, int SpriteId, const CUIRect *pRect, const ColorRGBA *pColor) const
+{
+	Graphics()->TextureSet(g_pData->m_aImages[ImageId].m_Id);
+	Graphics()->QuadsBegin();
+	SelectSprite(SpriteId);
+	if(pColor)
+		Graphics()->SetColor(pColor->r * pColor->a, pColor->g * pColor->a, pColor->b * pColor->a, pColor->a);
+	IGraphics::CQuadItem QuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+}
+
+int CRenderTools::QuadContainerAddSprite(int QuadContainerIndex, float x, float y, float Size) const
+{
+	IGraphics::CQuadItem QuadItem(x, y, Size, Size);
+	return Graphics()->QuadContainerAddQuads(QuadContainerIndex, &QuadItem, 1);
+}
+
+int CRenderTools::QuadContainerAddSprite(int QuadContainerIndex, float Size) const
+{
+	IGraphics::CQuadItem QuadItem(-(Size) / 2.f, -(Size) / 2.f, (Size), (Size));
+	return Graphics()->QuadContainerAddQuads(QuadContainerIndex, &QuadItem, 1);
+}
+
+int CRenderTools::QuadContainerAddSprite(int QuadContainerIndex, float Width, float Height) const
+{
+	IGraphics::CQuadItem QuadItem(-(Width) / 2.f, -(Height) / 2.f, (Width), (Height));
+	return Graphics()->QuadContainerAddQuads(QuadContainerIndex, &QuadItem, 1);
+}
+
+int CRenderTools::QuadContainerAddSprite(int QuadContainerIndex, float X, float Y, float Width, float Height) const
+{
+	IGraphics::CQuadItem QuadItem(X, Y, Width, Height);
+	return Graphics()->QuadContainerAddQuads(QuadContainerIndex, &QuadItem, 1);
+}
+
+void CRenderTools::GetRenderTeeAnimScaleAndBaseSize(const CTeeRenderInfo *pInfo, float &AnimScale, float &BaseSize)
+{
+	AnimScale = pInfo->m_Size * 1.0f / 64.0f;
+	BaseSize = pInfo->m_Size;
+}
+
+void CRenderTools::GetRenderTeeBodyScale(float BaseSize, float &BodyScale)
+{
+	BodyScale = g_Config.m_ClFatSkins ? BaseSize * 1.3f : BaseSize;
+	BodyScale /= 64.0f;
+}
+
+void CRenderTools::GetRenderTeeFeetScale(float BaseSize, float &FeetScaleWidth, float &FeetScaleHeight)
+{
+	FeetScaleWidth = BaseSize / 64.0f;
+	FeetScaleHeight = (BaseSize / 2) / 32.0f;
+}
+
+void CRenderTools::GetRenderTeeBodySize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &BodyOffset, float &Width, float &Height)
+{
+	float AnimScale, BaseSize;
+	GetRenderTeeAnimScaleAndBaseSize(pInfo, AnimScale, BaseSize);
+
+	float BodyScale;
+	GetRenderTeeBodyScale(BaseSize, BodyScale);
+
+	Width = pInfo->m_SkinMetrics.m_Body.WidthNormalized() * 64.0f * BodyScale;
+	Height = pInfo->m_SkinMetrics.m_Body.HeightNormalized() * 64.0f * BodyScale;
+	BodyOffset.x = pInfo->m_SkinMetrics.m_Body.OffsetXNormalized() * 64.0f * BodyScale;
+	BodyOffset.y = pInfo->m_SkinMetrics.m_Body.OffsetYNormalized() * 64.0f * BodyScale;
+}
+
+void CRenderTools::GetRenderTeeFeetSize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &FeetOffset, float &Width, float &Height)
+{
+	float AnimScale, BaseSize;
+	GetRenderTeeAnimScaleAndBaseSize(pInfo, AnimScale, BaseSize);
+
+	float FeetScaleWidth, FeetScaleHeight;
+	GetRenderTeeFeetScale(BaseSize, FeetScaleWidth, FeetScaleHeight);
+
+	Width = pInfo->m_SkinMetrics.m_Feet.WidthNormalized() * 64.0f * FeetScaleWidth;
+	Height = pInfo->m_SkinMetrics.m_Feet.HeightNormalized() * 32.0f * FeetScaleHeight;
+	FeetOffset.x = pInfo->m_SkinMetrics.m_Feet.OffsetXNormalized() * 64.0f * FeetScaleWidth;
+	FeetOffset.y = pInfo->m_SkinMetrics.m_Feet.OffsetYNormalized() * 32.0f * FeetScaleHeight;
+}
+
+void CRenderTools::GetRenderTeeOffsetToRenderedTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &TeeOffsetToMid)
+{
+	float AnimScale, BaseSize;
+	GetRenderTeeAnimScaleAndBaseSize(pInfo, AnimScale, BaseSize);
+	vec2 BodyPos = vec2(pAnim->GetBody()->m_X, pAnim->GetBody()->m_Y) * AnimScale;
+
+	float AssumedScale = BaseSize / 64.0f;
+
+	// just use the lowest feet
+	vec2 FeetPos;
+	const CAnimKeyframe *pFoot = pAnim->GetFrontFoot();
+	FeetPos = vec2(pFoot->m_X * AnimScale, pFoot->m_Y * AnimScale);
+	pFoot = pAnim->GetBackFoot();
+	FeetPos = vec2(FeetPos.x, maximum(FeetPos.y, pFoot->m_Y * AnimScale));
+
+	vec2 BodyOffset;
+	float BodyWidth, BodyHeight;
+	GetRenderTeeBodySize(pAnim, pInfo, BodyOffset, BodyWidth, BodyHeight);
+
+	// -32 is the assumed min relative position for the quad
+	float MinY = -32.0f * AssumedScale;
+	// the body pos shifts the body away from center
+	MinY += BodyPos.y;
+	// the actual body is smaller though, because it doesn't use the full skin image in most cases
+	MinY += BodyOffset.y;
+
+	vec2 FeetOffset;
+	float FeetWidth, FeetHeight;
+	GetRenderTeeFeetSize(pAnim, pInfo, FeetOffset, FeetWidth, FeetHeight);
+
+	// MaxY builds up from the MinY
+	float MaxY = MinY + BodyHeight;
+	// if the body is smaller than the total feet offset, use feet
+	// since feet are smaller in height, respect the assumed relative position
+	MaxY = maximum(MaxY, (-16.0f * AssumedScale + FeetPos.y) + FeetOffset.y + FeetHeight);
+
+	// now we got the full rendered size
+	float FullHeight = (MaxY - MinY);
+
+	// next step is to calculate the offset that was created compared to the assumed relative position
+	float MidOfRendered = MinY + FullHeight / 2.0f;
+
+	// TODO: x coordinate is ignored for now, bcs it's not really used yet anyway
+	TeeOffsetToMid.x = 0;
+	// negative value, because the calculation that uses this offset should work with addition.
+	TeeOffsetToMid.y = -MidOfRendered;
+}
+
+void CRenderTools::RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha, bool Ext, int ClientID, bool InAir)
+{
+	vec2 Direction = Dir;
+	vec2 Position = Pos;
+
+	const CSkin::SSkinTextures *pSkinTextures = pInfo->m_CustomColoredSkin ? &pInfo->m_ColorableRenderSkin : &pInfo->m_OriginalRenderSkin;
+
+	static vec2 s_aFootPositions[MAX_CLIENTS][2];
+
+	// first pass we draw the outline
+	// second pass we draw the filling
+	for(int p = 0; p < 2; p++)
+	{
+		int OutLine = p == 0 ? 1 : 0;
+
+		for(int f = 0; f < 2; f++)
+		{
+			float AnimScale, BaseSize;
+			GetRenderTeeAnimScaleAndBaseSize(pInfo, AnimScale, BaseSize);
+			if(f == 1)
+			{
+				Graphics()->QuadsSetRotation(pAnim->GetBody()->m_Angle * pi * 2);
+
+				// draw body
+				Graphics()->SetColor(pInfo->m_ColorBody.r, pInfo->m_ColorBody.g, pInfo->m_ColorBody.b, Alpha);
+				vec2 BodyPos = Position + vec2(pAnim->GetBody()->m_X, pAnim->GetBody()->m_Y) * AnimScale;
+				float BodyScale;
+				GetRenderTeeBodyScale(BaseSize, BodyScale);
+				Graphics()->TextureSet(OutLine == 1 ? pSkinTextures->m_BodyOutline : pSkinTextures->m_Body);
+				Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, OutLine, BodyPos.x, BodyPos.y, BodyScale, BodyScale);
+
+				// draw eyes
+				if(p == 1)
+				{
+					int QuadOffset = 2;
+					int EyeQuadOffset = 0;
+					int TeeEye = 0;
+
+					switch(Emote)
+					{
+					case EMOTE_PAIN:
+						EyeQuadOffset = 0;
+						TeeEye = SPRITE_TEE_EYE_PAIN - SPRITE_TEE_EYE_NORMAL;
+						break;
+					case EMOTE_HAPPY:
+						EyeQuadOffset = 1;
+						TeeEye = SPRITE_TEE_EYE_HAPPY - SPRITE_TEE_EYE_NORMAL;
+						break;
+					case EMOTE_SURPRISE:
+						EyeQuadOffset = 2;
+						TeeEye = SPRITE_TEE_EYE_SURPRISE - SPRITE_TEE_EYE_NORMAL;
+						break;
+					case EMOTE_ANGRY:
+						EyeQuadOffset = 3;
+						TeeEye = SPRITE_TEE_EYE_ANGRY - SPRITE_TEE_EYE_NORMAL;
+						break;
+					default:
+						EyeQuadOffset = 4;
+						break;
+					}
+
+					float EyeScale = BaseSize * 0.40f;
+					float h = Emote == EMOTE_BLINK ? BaseSize * 0.15f : EyeScale;
+					float EyeSeparation = (0.075f - 0.010f * absolute(Direction.x)) * BaseSize;
+					vec2 Offset = vec2(Direction.x * 0.125f, -0.05f + Direction.y * 0.10f) * BaseSize;
+
+					Graphics()->TextureSet(pSkinTextures->m_aEyes[TeeEye]);
+					Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, QuadOffset + EyeQuadOffset, BodyPos.x - EyeSeparation + Offset.x, BodyPos.y + Offset.y, EyeScale / (64.f * 0.4f), h / (64.f * 0.4f));
+					Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, QuadOffset + EyeQuadOffset, BodyPos.x + EyeSeparation + Offset.x, BodyPos.y + Offset.y, -EyeScale / (64.f * 0.4f), h / (64.f * 0.4f));
+				}
+			}
+
+			// draw feet
+			const CAnimKeyframe *pFoot = f ? pAnim->GetFrontFoot() : pAnim->GetBackFoot();
+
+			float w = BaseSize;
+			float h = BaseSize / 2;
+
+			int QuadOffset = 7;
+			if(Dir.x < 0 && pInfo->m_FeetFlipped)
+			{
+				QuadOffset += 2;
+			}
+
+			Graphics()->QuadsSetRotation(pFoot->m_Angle * pi * 2);
+
+			bool Indicate = !pInfo->m_GotAirJump && g_Config.m_ClAirjumpindicator;
+			float ColorScale = 1.0f;
+
+			if(!OutLine)
+			{
+				++QuadOffset;
+				if(Indicate)
+					ColorScale = 0.5f;
+			}
+
+			Graphics()->SetColor(pInfo->m_ColorFeet.r * ColorScale, pInfo->m_ColorFeet.g * ColorScale, pInfo->m_ColorFeet.b * ColorScale, Alpha);
+
+			vec2 FootPos = vec2(Position.x + pFoot->m_X * AnimScale, Position.y + pFoot->m_Y * AnimScale);
+			if(Ext)
+			{
+				if(s_aFootPositions[ClientID][f] != vec2())
+					FootPos = mix(s_aFootPositions[ClientID][f], FootPos, 1.f / 100.f * g_Config.m_ClAnimFeetSpeed);
+				s_aFootPositions[ClientID][f] = FootPos;
+			}
+
+			Graphics()->TextureSet(OutLine == 1 ? pSkinTextures->m_FeetOutline : pSkinTextures->m_Feet);
+			Graphics()->RenderQuadContainerAsSprite(m_TeeQuadContainerIndex, QuadOffset, FootPos.x, FootPos.y, w / 64.f, h / 32.f);
+		}
+	}
+
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->QuadsSetRotation(0);
+}
+void CRenderTools::CalcScreenParams(float Aspect, float Zoom, float *pWidth, float *pHeight)
+{
+	const float Amount = 1150 * 1000;
+	const float WMax = 1500;
+	const float HMax = 1050;
+
+	const float f = std::sqrt(Amount) / std::sqrt(Aspect);
+	*pWidth = f * Aspect;
+	*pHeight = f;
+
+	// limit the view
+	if(*pWidth > WMax)
+	{
+		*pWidth = WMax;
+		*pHeight = *pWidth / Aspect;
+	}
+
+	if(*pHeight > HMax)
+	{
+		*pHeight = HMax;
+		*pWidth = *pHeight * Aspect;
+	}
+
+	*pWidth *= Zoom;
+	*pHeight *= Zoom;
+}
+
+void CRenderTools::MapScreenToWorld(float CenterX, float CenterY, float ParallaxX, float ParallaxY,
+	float ParallaxZoom, float OffsetX, float OffsetY, float Aspect, float Zoom, float *pPoints)
+{
+	float Width, Height;
+	CalcScreenParams(Aspect, Zoom, &Width, &Height);
+
+	float Scale = (ParallaxZoom * (Zoom - 1.0f) + 100.0f) / 100.0f / Zoom;
+	Width *= Scale;
+	Height *= Scale;
+
+	CenterX *= ParallaxX / 100.0f;
+	CenterY *= ParallaxY / 100.0f;
+	pPoints[0] = OffsetX + CenterX - Width / 2;
+	pPoints[1] = OffsetY + CenterY - Height / 2;
+	pPoints[2] = pPoints[0] + Width;
+	pPoints[3] = pPoints[1] + Height;
+}
+
+void CRenderTools::MapScreenToGroup(float CenterX, float CenterY, CMapItemGroup *pGroup, float Zoom)
+{
+	float ParallaxZoom = clamp((double)(maximum(pGroup->m_ParallaxX, pGroup->m_ParallaxY)), 0., 100.);
+	float aPoints[4];
+	MapScreenToWorld(CenterX, CenterY, pGroup->m_ParallaxX, pGroup->m_ParallaxY, ParallaxZoom,
+		pGroup->m_OffsetX, pGroup->m_OffsetY, Graphics()->ScreenAspect(), Zoom, aPoints);
+	Graphics()->MapScreen(aPoints[0], aPoints[1], aPoints[2], aPoints[3]);
+}
+
+void CRenderTools::MapScreenToInterface(float CenterX, float CenterY)
+{
+	float aPoints[4];
+	MapScreenToWorld(CenterX, CenterY, 100.0f, 100.0f, 100.0f,
+		0, 0, Graphics()->ScreenAspect(), 1.0f, aPoints);
+	Graphics()->MapScreen(aPoints[0], aPoints[1], aPoints[2], aPoints[3]);
+}
diff --git a/src_bkp/game/client/render.h b/src_bkp/game/client/render.h
new file mode 100644
index 0000000000..1d4242932f
--- /dev/null
+++ b/src_bkp/game/client/render.h
@@ -0,0 +1,190 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_RENDER_H
+#define GAME_CLIENT_RENDER_H
+
+#include <base/color.h>
+#include <base/vmath.h>
+
+#include <game/client/skin.h>
+#include <game/client/ui_rect.h>
+
+class CAnimState;
+class CSpeedupTile;
+class CSwitchTile;
+class CTeleTile;
+class CTile;
+class CTuneTile;
+namespace client_data7 {
+struct CDataSprite;
+}
+struct CDataSprite;
+struct CEnvPoint;
+struct CEnvPointBezier;
+struct CEnvPointBezier_upstream;
+struct CMapItemGroup;
+struct CQuad;
+
+class CTeeRenderInfo
+{
+public:
+	CTeeRenderInfo()
+	{
+		Reset();
+	}
+
+	void Reset()
+	{
+		m_OriginalRenderSkin.Reset();
+		m_ColorableRenderSkin.Reset();
+		m_SkinMetrics.Reset();
+		m_CustomColoredSkin = false;
+		m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		m_ColorBody = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		m_ColorFeet = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		m_Size = 1.0f;
+		m_GotAirJump = true;
+		m_TeeRenderFlags = 0;
+		m_FeetFlipped = false;
+	}
+
+	CSkin::SSkinTextures m_OriginalRenderSkin;
+	CSkin::SSkinTextures m_ColorableRenderSkin;
+
+	CSkin::SSkinMetrics m_SkinMetrics;
+
+	bool m_CustomColoredSkin;
+	ColorRGBA m_BloodColor;
+
+	ColorRGBA m_ColorBody;
+	ColorRGBA m_ColorFeet;
+	float m_Size;
+	bool m_GotAirJump;
+	int m_TeeRenderFlags;
+	bool m_FeetFlipped;
+};
+
+// Tee Render Flags
+enum
+{
+	TEE_EFFECT_FROZEN = 1,
+	TEE_NO_WEAPON = 2,
+};
+
+// sprite renderings
+enum
+{
+	SPRITE_FLAG_FLIP_Y = 1,
+	SPRITE_FLAG_FLIP_X = 2,
+
+	LAYERRENDERFLAG_OPAQUE = 1,
+	LAYERRENDERFLAG_TRANSPARENT = 2,
+
+	TILERENDERFLAG_EXTEND = 4,
+};
+
+class IEnvelopePointAccess
+{
+public:
+	virtual ~IEnvelopePointAccess() = default;
+	virtual int NumPoints() const = 0;
+	virtual const CEnvPoint *GetPoint(int Index) const = 0;
+	virtual const CEnvPointBezier *GetBezier(int Index) const = 0;
+};
+
+class CMapBasedEnvelopePointAccess : public IEnvelopePointAccess
+{
+	int m_StartPoint;
+	int m_NumPoints;
+	int m_NumPointsMax;
+	CEnvPoint *m_pPoints;
+	CEnvPointBezier *m_pPointsBezier;
+	CEnvPointBezier_upstream *m_pPointsBezierUpstream;
+
+public:
+	CMapBasedEnvelopePointAccess(class CDataFileReader *pReader);
+	CMapBasedEnvelopePointAccess(class IMap *pMap);
+	void SetPointsRange(int StartPoint, int NumPoints);
+	int StartPoint() const;
+	int NumPoints() const override;
+	int NumPointsMax() const;
+	const CEnvPoint *GetPoint(int Index) const override;
+	const CEnvPointBezier *GetBezier(int Index) const override;
+};
+
+typedef void (*ENVELOPE_EVAL)(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
+
+class CRenderTools
+{
+	class IGraphics *m_pGraphics;
+	class ITextRender *m_pTextRender;
+
+	int m_TeeQuadContainerIndex;
+
+	void GetRenderTeeBodyScale(float BaseSize, float &BodyScale);
+	void GetRenderTeeFeetScale(float BaseSize, float &FeetScaleWidth, float &FeetScaleHeight);
+
+public:
+	class IGraphics *Graphics() const { return m_pGraphics; }
+	class ITextRender *TextRender() const { return m_pTextRender; }
+
+	void Init(class IGraphics *pGraphics, class ITextRender *pTextRender);
+
+	void SelectSprite(CDataSprite *pSprite, int Flags = 0, int sx = 0, int sy = 0) const;
+	void SelectSprite(int Id, int Flags = 0, int sx = 0, int sy = 0) const;
+
+	void GetSpriteScale(const CDataSprite *pSprite, float &ScaleX, float &ScaleY) const;
+	void GetSpriteScale(int Id, float &ScaleX, float &ScaleY) const;
+	void GetSpriteScaleImpl(int Width, int Height, float &ScaleX, float &ScaleY) const;
+
+	void DrawSprite(float x, float y, float Size) const;
+	void DrawSprite(float x, float y, float ScaledWidth, float ScaledHeight) const;
+	void RenderCursor(vec2 Center, float Size) const;
+	void RenderIcon(int ImageId, int SpriteId, const CUIRect *pRect, const ColorRGBA *pColor = nullptr) const;
+	int QuadContainerAddSprite(int QuadContainerIndex, float x, float y, float Size) const;
+	int QuadContainerAddSprite(int QuadContainerIndex, float Size) const;
+	int QuadContainerAddSprite(int QuadContainerIndex, float Width, float Height) const;
+	int QuadContainerAddSprite(int QuadContainerIndex, float X, float Y, float Width, float Height) const;
+
+	// larger rendering methods
+	void GetRenderTeeBodySize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &BodyOffset, float &Width, float &Height);
+	void GetRenderTeeFeetSize(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &FeetOffset, float &Width, float &Height);
+	void GetRenderTeeAnimScaleAndBaseSize(const CTeeRenderInfo *pInfo, float &AnimScale, float &BaseSize);
+
+	// returns the offset to use, to render the tee with @see RenderTee exactly in the mid
+	void GetRenderTeeOffsetToRenderedTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, vec2 &TeeOffsetToMid);
+	// object render methods
+	void RenderTee(const CAnimState *pAnim, const CTeeRenderInfo *pInfo, int Emote, vec2 Dir, vec2 Pos, float Alpha = 1.0f, bool Ext = false, int ClientID = -1, bool InAir = false);
+
+	// map render methods (render_map.cpp)
+	static void RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int Channels, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result);
+	void RenderQuads(CQuad *pQuads, int NumQuads, int Flags, ENVELOPE_EVAL pfnEval, void *pUser) const;
+	void ForceRenderQuads(CQuad *pQuads, int NumQuads, int Flags, ENVELOPE_EVAL pfnEval, void *pUser, float Alpha = 1.0f) const;
+	void RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const;
+
+	// render a rectangle made of IndexIn tiles, over a background made of IndexOut tiles
+	// the rectangle include all tiles in [RectX, RectX+RectW-1] x [RectY, RectY+RectH-1]
+	void RenderTileRectangle(int RectX, int RectY, int RectW, int RectH, unsigned char IndexIn, unsigned char IndexOut, float Scale, ColorRGBA Color, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const;
+
+	// helpers
+	void CalcScreenParams(float Aspect, float Zoom, float *pWidth, float *pHeight);
+	void MapScreenToWorld(float CenterX, float CenterY, float ParallaxX, float ParallaxY,
+		float ParallaxZoom, float OffsetX, float OffsetY, float Aspect, float Zoom, float *pPoints);
+	void MapScreenToGroup(float CenterX, float CenterY, CMapItemGroup *pGroup, float Zoom);
+	void MapScreenToInterface(float CenterX, float CenterY);
+
+	// DDRace
+
+	void RenderGameTileOutlines(CTile *pTiles, int w, int h, float Scale, int TileType, float Alpha = 1.0f);
+	void RenderTeleOutlines(CTile *pTiles, CTeleTile *pTele, int w, int h, float Scale, float Alpha = 1.0f);
+	void RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha = 1.0f);
+	void RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha = 1.0f);
+	void RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha = 1.0f);
+	void RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha = 1.0f);
+	void RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
+	void RenderSpeedupmap(CSpeedupTile *pSpeedup, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
+	void RenderSwitchmap(CSwitchTile *pSwitch, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
+	void RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags);
+};
+
+#endif
diff --git a/src_bkp/game/client/render_map.cpp b/src_bkp/game/client/render_map.cpp
new file mode 100644
index 0000000000..d684fc62c3
--- /dev/null
+++ b/src_bkp/game/client/render_map.cpp
@@ -0,0 +1,1777 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+
+#include <engine/graphics.h>
+#include <engine/map.h>
+#include <engine/textrender.h>
+
+#include <engine/shared/config.h>
+#include <engine/shared/datafile.h>
+#include <engine/shared/map.h>
+
+#include "render.h"
+
+#include <game/generated/client_data.h>
+
+#include <game/mapitems.h>
+#include <game/mapitems_ex.h>
+
+#include <chrono>
+#include <cmath>
+
+using namespace std::chrono_literals;
+
+CMapBasedEnvelopePointAccess::CMapBasedEnvelopePointAccess(CDataFileReader *pReader)
+{
+	bool FoundBezierEnvelope = false;
+	int EnvStart, EnvNum;
+	pReader->GetType(MAPITEMTYPE_ENVELOPE, &EnvStart, &EnvNum);
+	for(int EnvIndex = 0; EnvIndex < EnvNum; EnvIndex++)
+	{
+		CMapItemEnvelope *pEnvelope = static_cast<CMapItemEnvelope *>(pReader->GetItem(EnvStart + EnvIndex));
+		if(pEnvelope->m_Version >= CMapItemEnvelope_v3::CURRENT_VERSION)
+		{
+			FoundBezierEnvelope = true;
+			break;
+		}
+	}
+
+	if(FoundBezierEnvelope)
+	{
+		m_pPoints = nullptr;
+		m_pPointsBezier = nullptr;
+
+		int EnvPointStart, FakeEnvPointNum;
+		pReader->GetType(MAPITEMTYPE_ENVPOINTS, &EnvPointStart, &FakeEnvPointNum);
+		if(FakeEnvPointNum > 0)
+			m_pPointsBezierUpstream = static_cast<CEnvPointBezier_upstream *>(pReader->GetItem(EnvPointStart));
+		else
+			m_pPointsBezierUpstream = nullptr;
+
+		m_NumPointsMax = pReader->GetItemSize(EnvPointStart) / sizeof(CEnvPointBezier_upstream);
+	}
+	else
+	{
+		int EnvPointStart, FakeEnvPointNum;
+		pReader->GetType(MAPITEMTYPE_ENVPOINTS, &EnvPointStart, &FakeEnvPointNum);
+		if(FakeEnvPointNum > 0)
+			m_pPoints = static_cast<CEnvPoint *>(pReader->GetItem(EnvPointStart));
+		else
+			m_pPoints = nullptr;
+
+		m_NumPointsMax = pReader->GetItemSize(EnvPointStart) / sizeof(CEnvPoint);
+
+		int EnvPointBezierStart, FakeEnvPointBezierNum;
+		pReader->GetType(MAPITEMTYPE_ENVPOINTS_BEZIER, &EnvPointBezierStart, &FakeEnvPointBezierNum);
+		const int NumPointsBezier = pReader->GetItemSize(EnvPointBezierStart) / sizeof(CEnvPointBezier);
+		if(FakeEnvPointBezierNum > 0 && m_NumPointsMax == NumPointsBezier)
+			m_pPointsBezier = static_cast<CEnvPointBezier *>(pReader->GetItem(EnvPointBezierStart));
+		else
+			m_pPointsBezier = nullptr;
+
+		m_pPointsBezierUpstream = nullptr;
+	}
+
+	SetPointsRange(0, m_NumPointsMax);
+}
+
+CMapBasedEnvelopePointAccess::CMapBasedEnvelopePointAccess(IMap *pMap) :
+	CMapBasedEnvelopePointAccess(static_cast<CMap *>(pMap)->GetReader())
+{
+}
+
+void CMapBasedEnvelopePointAccess::SetPointsRange(int StartPoint, int NumPoints)
+{
+	m_StartPoint = clamp(StartPoint, 0, m_NumPointsMax);
+	m_NumPoints = clamp(NumPoints, 0, maximum(m_NumPointsMax - StartPoint, 0));
+}
+
+int CMapBasedEnvelopePointAccess::StartPoint() const
+{
+	return m_StartPoint;
+}
+
+int CMapBasedEnvelopePointAccess::NumPoints() const
+{
+	return m_NumPoints;
+}
+
+int CMapBasedEnvelopePointAccess::NumPointsMax() const
+{
+	return m_NumPointsMax;
+}
+
+const CEnvPoint *CMapBasedEnvelopePointAccess::GetPoint(int Index) const
+{
+	if(Index < 0 || Index >= m_NumPoints)
+		return nullptr;
+	if(m_pPoints != nullptr)
+		return &m_pPoints[Index + m_StartPoint];
+	if(m_pPointsBezierUpstream != nullptr)
+		return &m_pPointsBezierUpstream[Index + m_StartPoint];
+	return nullptr;
+}
+
+const CEnvPointBezier *CMapBasedEnvelopePointAccess::GetBezier(int Index) const
+{
+	if(Index < 0 || Index >= m_NumPoints)
+		return nullptr;
+	if(m_pPointsBezier != nullptr)
+		return &m_pPointsBezier[Index + m_StartPoint];
+	if(m_pPointsBezierUpstream != nullptr)
+		return &m_pPointsBezierUpstream[Index + m_StartPoint].m_Bezier;
+	return nullptr;
+}
+
+static void ValidateFCurve(const vec2 &p0, vec2 &p1, vec2 &p2, const vec2 &p3)
+{
+	// validate the bezier curve
+	p1.x = clamp(p1.x, p0.x, p3.x);
+	p2.x = clamp(p2.x, p0.x, p3.x);
+}
+
+static double CubicRoot(double x)
+{
+	if(x == 0.0)
+		return 0.0;
+	else if(x < 0.0)
+		return -std::exp(std::log(-x) / 3.0);
+	else
+		return std::exp(std::log(x) / 3.0);
+}
+
+static float SolveBezier(float x, float p0, float p1, float p2, float p3)
+{
+	// check for valid f-curve
+	// we only take care of monotonic bezier curves, so there has to be exactly 1 real solution
+	if(!(p0 <= x && x <= p3) || !(p0 <= p1 && p1 <= p3) || !(p0 <= p2 && p2 <= p3))
+		return 0.0f;
+
+	const double x3 = -p0 + 3.0 * p1 - 3.0 * p2 + p3;
+	const double x2 = 3.0 * p0 - 6.0 * p1 + 3.0 * p2;
+	const double x1 = -3.0 * p0 + 3.0 * p1;
+	const double x0 = p0 - x;
+
+	if(x3 == 0.0 && x2 == 0.0)
+	{
+		// linear
+		// a * t + b = 0
+		const double a = x1;
+		const double b = x0;
+
+		if(a == 0.0)
+			return 0.0f;
+		return -b / a;
+	}
+	else if(x3 == 0.0)
+	{
+		// quadratic
+		// t * t + b * t +c = 0
+		const double b = x1 / x2;
+		const double c = x0 / x2;
+
+		if(c == 0.0)
+			return 0.0f;
+
+		const double D = b * b - 4.0 * c;
+		const double SqrtD = std::sqrt(D);
+
+		const double t = (-b + SqrtD) / 2.0;
+
+		if(0.0 <= t && t <= 1.0001f)
+			return t;
+		return (-b - SqrtD) / 2.0;
+	}
+	else
+	{
+		// cubic
+		// t * t * t + a * t * t + b * t * t + c = 0
+		const double a = x2 / x3;
+		const double b = x1 / x3;
+		const double c = x0 / x3;
+
+		// substitute t = y - a / 3
+		const double sub = a / 3.0;
+
+		// depressed form x^3 + px + q = 0
+		// cardano's method
+		const double p = b / 3.0 - a * a / 9.0;
+		const double q = (2.0 * a * a * a / 27.0 - a * b / 3.0 + c) / 2.0;
+
+		const double D = q * q + p * p * p;
+
+		if(D > 0.0)
+		{
+			// only one 'real' solution
+			const double s = std::sqrt(D);
+			return CubicRoot(s - q) - CubicRoot(s + q) - sub;
+		}
+		else if(D == 0.0)
+		{
+			// one single, one double solution or triple solution
+			const double s = CubicRoot(-q);
+			const double t = 2.0 * s - sub;
+
+			if(0.0 <= t && t <= 1.0001f)
+				return t;
+			return (-s - sub);
+		}
+		else
+		{
+			// Casus irreductibilis ... ,_,
+			const double phi = std::acos(-q / std::sqrt(-(p * p * p))) / 3.0;
+			const double s = 2.0 * std::sqrt(-p);
+
+			const double t1 = s * std::cos(phi) - sub;
+
+			if(0.0 <= t1 && t1 <= 1.0001f)
+				return t1;
+
+			const double t2 = -s * std::cos(phi + pi / 3.0) - sub;
+
+			if(0.0 <= t2 && t2 <= 1.0001f)
+				return t2;
+			return -s * std::cos(phi - pi / 3.0) - sub;
+		}
+	}
+}
+
+void CRenderTools::RenderEvalEnvelope(const IEnvelopePointAccess *pPoints, int Channels, std::chrono::nanoseconds TimeNanos, ColorRGBA &Result)
+{
+	const int NumPoints = pPoints->NumPoints();
+	if(NumPoints == 0)
+	{
+		Result = ColorRGBA();
+		return;
+	}
+
+	if(NumPoints == 1)
+	{
+		const CEnvPoint *pFirstPoint = pPoints->GetPoint(0);
+		Result.r = fx2f(pFirstPoint->m_aValues[0]);
+		Result.g = fx2f(pFirstPoint->m_aValues[1]);
+		Result.b = fx2f(pFirstPoint->m_aValues[2]);
+		Result.a = fx2f(pFirstPoint->m_aValues[3]);
+		return;
+	}
+
+	const CEnvPoint *pLastPoint = pPoints->GetPoint(NumPoints - 1);
+	const int64_t MaxPointTime = (int64_t)pLastPoint->m_Time * std::chrono::nanoseconds(1ms).count();
+	if(MaxPointTime > 0) // TODO: remove this check when implementing a IO check for maps(in this case broken envelopes)
+		TimeNanos = std::chrono::nanoseconds(TimeNanos.count() % MaxPointTime);
+	else
+		TimeNanos = decltype(TimeNanos)::zero();
+
+	const double TimeMillis = TimeNanos.count() / (double)std::chrono::nanoseconds(1ms).count();
+	for(int i = 0; i < NumPoints - 1; i++)
+	{
+		const CEnvPoint *pCurrentPoint = pPoints->GetPoint(i);
+		const CEnvPoint *pNextPoint = pPoints->GetPoint(i + 1);
+		if(TimeMillis >= pCurrentPoint->m_Time && TimeMillis <= pNextPoint->m_Time)
+		{
+			const float Delta = pNextPoint->m_Time - pCurrentPoint->m_Time;
+			float a = (float)(TimeMillis - pCurrentPoint->m_Time) / Delta;
+
+			switch(pCurrentPoint->m_Curvetype)
+			{
+			case CURVETYPE_STEP:
+				a = 0.0f;
+				break;
+
+			case CURVETYPE_SLOW:
+				a = a * a * a;
+				break;
+
+			case CURVETYPE_FAST:
+				a = 1.0f - a;
+				a = 1.0f - a * a * a;
+				break;
+
+			case CURVETYPE_SMOOTH:
+				a = -2.0f * a * a * a + 3.0f * a * a; // second hermite basis
+				break;
+
+			case CURVETYPE_BEZIER:
+			{
+				const CEnvPointBezier *pCurrentPointBezier = pPoints->GetBezier(i);
+				const CEnvPointBezier *pNextPointBezier = pPoints->GetBezier(i + 1);
+				if(pCurrentPointBezier == nullptr || pNextPointBezier == nullptr)
+					break; // fallback to linear
+				for(int c = 0; c < Channels; c++)
+				{
+					// monotonic 2d cubic bezier curve
+					const vec2 p0 = vec2(pCurrentPoint->m_Time / 1000.0f, fx2f(pCurrentPoint->m_aValues[c]));
+					const vec2 p3 = vec2(pNextPoint->m_Time / 1000.0f, fx2f(pNextPoint->m_aValues[c]));
+
+					const vec2 OutTang = vec2(pCurrentPointBezier->m_aOutTangentDeltaX[c] / 1000.0f, fx2f(pCurrentPointBezier->m_aOutTangentDeltaY[c]));
+					const vec2 InTang = -vec2(pNextPointBezier->m_aInTangentDeltaX[c] / 1000.0f, fx2f(pNextPointBezier->m_aInTangentDeltaY[c]));
+					vec2 p1 = p0 + OutTang;
+					vec2 p2 = p3 - InTang;
+
+					// validate bezier curve
+					ValidateFCurve(p0, p1, p2, p3);
+
+					// solve x(a) = time for a
+					a = clamp(SolveBezier(TimeMillis / 1000.0f, p0.x, p1.x, p2.x, p3.x), 0.0f, 1.0f);
+
+					// value = y(t)
+					Result[c] = bezier(p0.y, p1.y, p2.y, p3.y, a);
+				}
+				return;
+			}
+
+			case CURVETYPE_LINEAR: [[fallthrough]];
+			default:
+				break;
+			}
+
+			for(int c = 0; c < Channels; c++)
+			{
+				const float v0 = fx2f(pCurrentPoint->m_aValues[c]);
+				const float v1 = fx2f(pNextPoint->m_aValues[c]);
+				Result[c] = v0 + (v1 - v0) * a;
+			}
+
+			return;
+		}
+	}
+
+	Result.r = fx2f(pLastPoint->m_aValues[0]);
+	Result.g = fx2f(pLastPoint->m_aValues[1]);
+	Result.b = fx2f(pLastPoint->m_aValues[2]);
+	Result.a = fx2f(pLastPoint->m_aValues[3]);
+}
+
+static void Rotate(CPoint *pCenter, CPoint *pPoint, float Rotation)
+{
+	int x = pPoint->x - pCenter->x;
+	int y = pPoint->y - pCenter->y;
+	pPoint->x = (int)(x * std::cos(Rotation) - y * std::sin(Rotation) + pCenter->x);
+	pPoint->y = (int)(x * std::sin(Rotation) + y * std::cos(Rotation) + pCenter->y);
+}
+
+void CRenderTools::RenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser) const
+{
+	if(!g_Config.m_ClShowQuads || g_Config.m_ClOverlayEntities == 100)
+		return;
+
+	ForceRenderQuads(pQuads, NumQuads, RenderFlags, pfnEval, pUser, (100 - g_Config.m_ClOverlayEntities) / 100.0f);
+}
+
+void CRenderTools::ForceRenderQuads(CQuad *pQuads, int NumQuads, int RenderFlags, ENVELOPE_EVAL pfnEval, void *pUser, float Alpha) const
+{
+	Graphics()->TrianglesBegin();
+	float Conv = 1 / 255.0f;
+	for(int i = 0; i < NumQuads; i++)
+	{
+		CQuad *pQuad = &pQuads[i];
+
+		ColorRGBA Color(1.f, 1.f, 1.f, 1.f);
+		if(pQuad->m_ColorEnv >= 0)
+		{
+			pfnEval(pQuad->m_ColorEnvOffset, pQuad->m_ColorEnv, Color, pUser);
+		}
+
+		if(Color.a <= 0)
+			continue;
+
+		bool Opaque = false;
+		/* TODO: Analyze quadtexture
+		if(a < 0.01f || (q->m_aColors[0].a < 0.01f && q->m_aColors[1].a < 0.01f && q->m_aColors[2].a < 0.01f && q->m_aColors[3].a < 0.01f))
+			Opaque = true;
+		*/
+		if(Opaque && !(RenderFlags & LAYERRENDERFLAG_OPAQUE))
+			continue;
+		if(!Opaque && !(RenderFlags & LAYERRENDERFLAG_TRANSPARENT))
+			continue;
+
+		Graphics()->QuadsSetSubsetFree(
+			fx2f(pQuad->m_aTexcoords[0].x), fx2f(pQuad->m_aTexcoords[0].y),
+			fx2f(pQuad->m_aTexcoords[1].x), fx2f(pQuad->m_aTexcoords[1].y),
+			fx2f(pQuad->m_aTexcoords[2].x), fx2f(pQuad->m_aTexcoords[2].y),
+			fx2f(pQuad->m_aTexcoords[3].x), fx2f(pQuad->m_aTexcoords[3].y));
+
+		float OffsetX = 0;
+		float OffsetY = 0;
+		float Rot = 0;
+
+		// TODO: fix this
+		if(pQuad->m_PosEnv >= 0)
+		{
+			ColorRGBA Channels;
+			pfnEval(pQuad->m_PosEnvOffset, pQuad->m_PosEnv, Channels, pUser);
+			OffsetX = Channels.r;
+			OffsetY = Channels.g;
+			Rot = Channels.b / 360.0f * pi * 2;
+		}
+
+		IGraphics::CColorVertex Array[4] = {
+			IGraphics::CColorVertex(0, pQuad->m_aColors[0].r * Conv * Color.r, pQuad->m_aColors[0].g * Conv * Color.g, pQuad->m_aColors[0].b * Conv * Color.b, pQuad->m_aColors[0].a * Conv * Color.a * Alpha),
+			IGraphics::CColorVertex(1, pQuad->m_aColors[1].r * Conv * Color.r, pQuad->m_aColors[1].g * Conv * Color.g, pQuad->m_aColors[1].b * Conv * Color.b, pQuad->m_aColors[1].a * Conv * Color.a * Alpha),
+			IGraphics::CColorVertex(2, pQuad->m_aColors[2].r * Conv * Color.r, pQuad->m_aColors[2].g * Conv * Color.g, pQuad->m_aColors[2].b * Conv * Color.b, pQuad->m_aColors[2].a * Conv * Color.a * Alpha),
+			IGraphics::CColorVertex(3, pQuad->m_aColors[3].r * Conv * Color.r, pQuad->m_aColors[3].g * Conv * Color.g, pQuad->m_aColors[3].b * Conv * Color.b, pQuad->m_aColors[3].a * Conv * Color.a * Alpha)};
+		Graphics()->SetColorVertex(Array, 4);
+
+		CPoint *pPoints = pQuad->m_aPoints;
+
+		if(Rot != 0)
+		{
+			static CPoint aRotated[4];
+			aRotated[0] = pQuad->m_aPoints[0];
+			aRotated[1] = pQuad->m_aPoints[1];
+			aRotated[2] = pQuad->m_aPoints[2];
+			aRotated[3] = pQuad->m_aPoints[3];
+			pPoints = aRotated;
+
+			Rotate(&pQuad->m_aPoints[4], &aRotated[0], Rot);
+			Rotate(&pQuad->m_aPoints[4], &aRotated[1], Rot);
+			Rotate(&pQuad->m_aPoints[4], &aRotated[2], Rot);
+			Rotate(&pQuad->m_aPoints[4], &aRotated[3], Rot);
+		}
+
+		IGraphics::CFreeformItem Freeform(
+			fx2f(pPoints[0].x) + OffsetX, fx2f(pPoints[0].y) + OffsetY,
+			fx2f(pPoints[1].x) + OffsetX, fx2f(pPoints[1].y) + OffsetY,
+			fx2f(pPoints[2].x) + OffsetX, fx2f(pPoints[2].y) + OffsetY,
+			fx2f(pPoints[3].x) + OffsetX, fx2f(pPoints[3].y) + OffsetY);
+		Graphics()->QuadsDrawFreeform(&Freeform, 1);
+	}
+	Graphics()->TrianglesEnd();
+}
+
+void CRenderTools::RenderTileRectangle(int RectX, int RectY, int RectW, int RectH,
+	unsigned char IndexIn, unsigned char IndexOut,
+	float Scale, ColorRGBA Color, int RenderFlags,
+	ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
+	if(ColorEnv >= 0)
+	{
+		pfnEval(ColorEnvOffset, ColorEnv, Channels, pUser);
+	}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color.r * Channels.r, Color.g * Channels.g, Color.b * Channels.b, Color.a * Channels.a);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+	{
+		for(int x = StartX; x < EndX; x++)
+		{
+			unsigned char Index = (x >= RectX && x < RectX + RectW && y >= RectY && y < RectY + RectH) ? IndexIn : IndexOut;
+			if(Index)
+			{
+				bool Render = false;
+				if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+					Render = true;
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+		}
+	}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderTilemap(CTile *pTiles, int w, int h, float Scale, ColorRGBA Color, int RenderFlags,
+	ENVELOPE_EVAL pfnEval, void *pUser, int ColorEnv, int ColorEnvOffset) const
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	ColorRGBA Channels(1.f, 1.f, 1.f, 1.f);
+	if(ColorEnv >= 0)
+	{
+		pfnEval(ColorEnvOffset, ColorEnv, Channels, pUser);
+	}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color.r * Channels.r, Color.g * Channels.g, Color.b * Channels.b, Color.a * Channels.a);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+	{
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(RenderFlags & TILERENDERFLAG_EXTEND)
+			{
+				if(mx < 0)
+					mx = 0;
+				if(mx >= w)
+					mx = w - 1;
+				if(my < 0)
+					my = 0;
+				if(my >= h)
+					my = h - 1;
+			}
+			else
+			{
+				if(mx < 0)
+					continue; // mx = 0;
+				if(mx >= w)
+					continue; // mx = w-1;
+				if(my < 0)
+					continue; // my = 0;
+				if(my >= h)
+					continue; // my = h-1;
+			}
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTiles[c].m_Index;
+			if(Index)
+			{
+				unsigned char Flags = pTiles[c].m_Flags;
+
+				bool Render = false;
+				if(Flags & TILEFLAG_OPAQUE && Color.a * Channels.a > 254.0f / 255.0f)
+				{
+					if(RenderFlags & LAYERRENDERFLAG_OPAQUE)
+						Render = true;
+				}
+				else
+				{
+					if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+						Render = true;
+				}
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Flags & TILEFLAG_XFLIP)
+					{
+						x0 = x2;
+						x1 = x3;
+						x2 = x3;
+						x3 = x0;
+					}
+
+					if(Flags & TILEFLAG_YFLIP)
+					{
+						y0 = y3;
+						y2 = y1;
+						y3 = y1;
+						y1 = y0;
+					}
+
+					if(Flags & TILEFLAG_ROTATE)
+					{
+						float Tmp = x0;
+						x0 = x3;
+						x3 = x2;
+						x2 = x1;
+						x1 = Tmp;
+						Tmp = y0;
+						y0 = y3;
+						y3 = y2;
+						y2 = y1;
+						y1 = Tmp;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+			x += pTiles[c].m_Skip;
+		}
+	}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderGameTileOutlines(CTile *pTiles, int w, int h, float Scale, int TileType, float Alpha)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+	int MaxScale = 12;
+	if(EndX - StartX > Graphics()->ScreenWidth() / MaxScale || EndY - StartY > Graphics()->ScreenHeight() / MaxScale)
+	{
+		int EdgeX = (EndX - StartX) - (Graphics()->ScreenWidth() / MaxScale);
+		StartX += EdgeX / 2;
+		EndX -= EdgeX / 2;
+		int EdgeY = (EndY - StartY) - (Graphics()->ScreenHeight() / MaxScale);
+		StartY += EdgeY / 2;
+		EndY -= EdgeY / 2;
+	}
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	ColorRGBA col = ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f);
+	if(TileType == TILE_FREEZE)
+	{
+		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorFreeze));
+	}
+	else if(TileType == TILE_SOLID)
+	{
+		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorSolid));
+	}
+	else if(TileType == TILE_UNFREEZE)
+	{
+		col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorUnfreeze));
+	}
+	Graphics()->SetColor(col.r, col.g, col.b, Alpha);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 1)
+				continue; // mx = 0;
+			if(mx >= w - 1)
+				continue; // mx = w-1;
+			if(my < 1)
+				continue; // my = 0;
+			if(my >= h - 1)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTiles[c].m_Index;
+			bool IsFreeze = Index == TILE_FREEZE || Index == TILE_DFREEZE;
+			bool IsUnFreeze = Index == TILE_UNFREEZE || Index == TILE_DUNFREEZE;
+			bool IsSolid = Index == TILE_SOLID || Index == TILE_NOHOOK;
+
+			if(!(IsSolid || IsFreeze || IsUnFreeze)) //Not an tile we care about
+				continue;
+			if(IsSolid && !(TileType == TILE_SOLID))
+				continue;
+			if(IsFreeze && !(TileType == TILE_FREEZE))
+				continue;
+			if(IsUnFreeze && !(TileType == TILE_UNFREEZE))
+				continue;
+
+			IGraphics::CQuadItem Array[8];
+			bool Neighbors[8];
+			if(IsFreeze && TileType == TILE_FREEZE)
+			{
+				int IndexN;
+				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
+				Neighbors[0] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
+				Neighbors[1] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
+				Neighbors[2] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
+				Neighbors[3] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
+				Neighbors[4] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
+				Neighbors[5] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
+				Neighbors[6] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
+				Neighbors[7] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
+			}
+			else if(IsSolid && TileType == TILE_SOLID)
+			{
+				int IndexN;
+				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
+				Neighbors[0] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
+				Neighbors[1] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
+				Neighbors[2] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
+				Neighbors[3] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
+				Neighbors[4] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
+				Neighbors[5] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
+				Neighbors[6] = IndexN != TILE_NOHOOK && IndexN != Index;
+				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
+				Neighbors[7] = IndexN != TILE_NOHOOK && IndexN != Index;
+			}
+			else
+			{
+				int IndexN;
+				IndexN = pTiles[(mx - 1) + (my - 1) * w].m_Index;
+				Neighbors[0] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 0) + (my - 1) * w].m_Index;
+				Neighbors[1] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my - 1) * w].m_Index;
+				Neighbors[2] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx - 1) + (my + 0) * w].m_Index;
+				Neighbors[3] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my + 0) * w].m_Index;
+				Neighbors[4] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx - 1) + (my + 1) * w].m_Index;
+				Neighbors[5] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 0) + (my + 1) * w].m_Index;
+				Neighbors[6] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+				IndexN = pTiles[(mx + 1) + (my + 1) * w].m_Index;
+				Neighbors[7] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
+			}
+
+			float Size = (float)g_Config.m_ClOutlineWidth;
+			int NumQuads = 0;
+
+			//Do lonely corners first
+			if(Neighbors[0] && !Neighbors[1] && !Neighbors[3])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[2] && !Neighbors[1] && !Neighbors[4])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[5] && !Neighbors[3] && !Neighbors[6])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[7] && !Neighbors[6] && !Neighbors[4])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Scale - Size, Size, Size);
+				NumQuads++;
+			}
+			//Top
+			if(Neighbors[1])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Scale, Size);
+				NumQuads++;
+			}
+			//Bottom
+			if(Neighbors[6])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Scale, Size);
+				NumQuads++;
+			}
+			//Left
+			if(Neighbors[3])
+			{
+				if(!Neighbors[1] && !Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale);
+				else if(!Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size);
+				else if(!Neighbors[1])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale - Size);
+				else
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size * 2.0f);
+				NumQuads++;
+			}
+			//Right
+			if(Neighbors[4])
+			{
+				if(!Neighbors[1] && !Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale);
+				else if(!Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size);
+				else if(!Neighbors[1])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale - Size);
+				else
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size * 2.0f);
+				NumQuads++;
+			}
+
+			Graphics()->QuadsDrawTL(Array, NumQuads);
+		}
+	Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+void CRenderTools::RenderTeleOutlines(CTile *pTiles, CTeleTile *pTele, int w, int h, float Scale, float Alpha)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	int MaxScale = 12;
+	if(EndX - StartX > Graphics()->ScreenWidth() / MaxScale || EndY - StartY > Graphics()->ScreenHeight() / MaxScale)
+	{
+		int EdgeX = (EndX - StartX) - (Graphics()->ScreenWidth() / MaxScale);
+		StartX += EdgeX / 2;
+		EndX -= EdgeX / 2;
+		int EdgeY = (EndY - StartY) - (Graphics()->ScreenHeight() / MaxScale);
+		StartY += EdgeY / 2;
+		EndY -= EdgeY / 2;
+	}
+
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+	ColorRGBA col = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClOutlineColorTele));
+	Graphics()->SetColor(col.r, col.g, col.b, Alpha);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 1)
+				continue; // mx = 0;
+			if(mx >= w - 1)
+				continue; // mx = w-1;
+			if(my < 1)
+				continue; // my = 0;
+			if(my >= h - 1)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTele[c].m_Type;
+			if(!Index)
+				continue;
+			if(!(Index == TILE_TELECHECKINEVIL || Index == TILE_TELEIN || Index == TILE_TELEINEVIL))
+				continue;
+
+			IGraphics::CQuadItem Array[8];
+			bool Neighbors[8];
+			Neighbors[0] = pTiles[(mx - 1) + (my - 1) * w].m_Index == 0 && !pTele[(mx - 1) + (my - 1) * w].m_Number;
+			Neighbors[1] = pTiles[(mx + 0) + (my - 1) * w].m_Index == 0 && !pTele[(mx + 0) + (my - 1) * w].m_Number;
+			Neighbors[2] = pTiles[(mx + 1) + (my - 1) * w].m_Index == 0 && !pTele[(mx + 1) + (my - 1) * w].m_Number;
+			Neighbors[3] = pTiles[(mx - 1) + (my + 0) * w].m_Index == 0 && !pTele[(mx - 1) + (my + 0) * w].m_Number;
+			Neighbors[4] = pTiles[(mx + 1) + (my + 0) * w].m_Index == 0 && !pTele[(mx + 1) + (my + 0) * w].m_Number;
+			Neighbors[5] = pTiles[(mx - 1) + (my + 1) * w].m_Index == 0 && !pTele[(mx - 1) + (my + 1) * w].m_Number;
+			Neighbors[6] = pTiles[(mx + 0) + (my + 1) * w].m_Index == 0 && !pTele[(mx + 0) + (my + 1) * w].m_Number;
+			Neighbors[7] = pTiles[(mx + 1) + (my + 1) * w].m_Index == 0 && !pTele[(mx + 1) + (my + 1) * w].m_Number;
+
+			float Size = (float)g_Config.m_ClOutlineWidth;
+			int NumQuads = 0;
+
+			//Do lonely corners first
+			if(Neighbors[0] && !Neighbors[1] && !Neighbors[3])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[2] && !Neighbors[1] && !Neighbors[4])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[5] && !Neighbors[3] && !Neighbors[6])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Size, Size);
+				NumQuads++;
+			}
+			if(Neighbors[7] && !Neighbors[6] && !Neighbors[4])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Scale - Size, Size, Size);
+				NumQuads++;
+			}
+			//Top
+			if(Neighbors[1])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Scale, Size);
+				NumQuads++;
+			}
+			//Bottom
+			if(Neighbors[6])
+			{
+				Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Scale - Size, Scale, Size);
+				NumQuads++;
+			}
+			//Left
+			if(Neighbors[3])
+			{
+				if(!Neighbors[1] && !Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale);
+				else if(!Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size);
+				else if(!Neighbors[1])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale, Size, Scale - Size);
+				else
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale, my * Scale + Size, Size, Scale - Size * 2.0f);
+				NumQuads++;
+			}
+			//Right
+			if(Neighbors[4])
+			{
+				if(!Neighbors[1] && !Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale);
+				else if(!Neighbors[6])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size);
+				else if(!Neighbors[1])
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale, Size, Scale - Size);
+				else
+					Array[NumQuads] = IGraphics::CQuadItem(mx * Scale + Scale - Size, my * Scale + Size, Size, Scale - Size * 2.0f);
+				NumQuads++;
+			}
+
+			Graphics()->QuadsDrawTL(Array, NumQuads);
+		}
+	Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+void CRenderTools::RenderTeleOverlay(CTeleTile *pTele, int w, int h, float Scale, float Alpha)
+{
+	if(!g_Config.m_ClTextEntities)
+		return;
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	if(EndX - StartX > Graphics()->ScreenWidth() / g_Config.m_GfxTextOverlay || EndY - StartY > Graphics()->ScreenHeight() / g_Config.m_GfxTextOverlay)
+		return; // its useless to render text at this distance
+
+	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
+	float ToCenterOffset = (1 - Size) / 2.f;
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 0)
+				continue; // mx = 0;
+			if(mx >= w)
+				continue; // mx = w-1;
+			if(my < 0)
+				continue; // my = 0;
+			if(my >= h)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTele[c].m_Number;
+			if(Index && IsTeleTileNumberUsed(pTele[c].m_Type))
+			{
+				char aBuf[16];
+				str_from_int(Index, aBuf);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+				TextRender()->Text(mx * Scale - 3.f, (my + ToCenterOffset) * Scale, Size * Scale, aBuf, -1.0f);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderSpeedupOverlay(CSpeedupTile *pSpeedup, int w, int h, float Scale, float Alpha)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	if(EndX - StartX > Graphics()->ScreenWidth() / g_Config.m_GfxTextOverlay || EndY - StartY > Graphics()->ScreenHeight() / g_Config.m_GfxTextOverlay)
+		return; // its useless to render text at this distance
+
+	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
+	float ToCenterOffset = (1 - Size) / 2.f;
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 0)
+				continue; // mx = 0;
+			if(mx >= w)
+				continue; // mx = w-1;
+			if(my < 0)
+				continue; // my = 0;
+			if(my >= h)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			int Force = (int)pSpeedup[c].m_Force;
+			int MaxSpeed = (int)pSpeedup[c].m_MaxSpeed;
+			if(Force)
+			{
+				// draw arrow
+				Graphics()->TextureSet(g_pData->m_aImages[IMAGE_SPEEDUP_ARROW].m_Id);
+				Graphics()->QuadsBegin();
+				Graphics()->SetColor(255.0f, 255.0f, 255.0f, Alpha);
+
+				SelectSprite(SPRITE_SPEEDUP_ARROW);
+				Graphics()->QuadsSetRotation(pSpeedup[c].m_Angle * (pi / 180.0f));
+				DrawSprite(mx * Scale + 16, my * Scale + 16, 35.0f);
+
+				Graphics()->QuadsEnd();
+
+				if(g_Config.m_ClTextEntities)
+				{
+					// draw force
+					char aBuf[16];
+					str_from_int(Force, aBuf);
+					TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+					TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
+					TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+					if(MaxSpeed)
+					{
+						str_from_int(MaxSpeed, aBuf);
+						TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+						TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
+						TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+					}
+				}
+			}
+		}
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderSwitchOverlay(CSwitchTile *pSwitch, int w, int h, float Scale, float Alpha)
+{
+	if(!g_Config.m_ClTextEntities)
+		return;
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	if(EndX - StartX > Graphics()->ScreenWidth() / g_Config.m_GfxTextOverlay || EndY - StartY > Graphics()->ScreenHeight() / g_Config.m_GfxTextOverlay)
+		return; // its useless to render text at this distance
+
+	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
+	float ToCenterOffset = (1 - Size) / 2.f;
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 0)
+				continue; // mx = 0;
+			if(mx >= w)
+				continue; // mx = w-1;
+			if(my < 0)
+				continue; // my = 0;
+			if(my >= h)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			unsigned char Index = pSwitch[c].m_Number;
+			if(Index && IsSwitchTileNumberUsed(pSwitch[c].m_Type))
+			{
+				char aBuf[16];
+				str_from_int(Index, aBuf);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+				TextRender()->Text(mx * Scale, (my + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+
+			unsigned char Delay = pSwitch[c].m_Delay;
+			if(Delay && IsSwitchTileDelayUsed(pSwitch[c].m_Type))
+			{
+				char aBuf[16];
+				str_from_int(Delay, aBuf);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+				TextRender()->Text(mx * Scale, (my + 0.5f + ToCenterOffset / 2) * Scale, Size * Scale / 2.f, aBuf, -1.0f);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderTuneOverlay(CTuneTile *pTune, int w, int h, float Scale, float Alpha)
+{
+	if(!g_Config.m_ClTextEntities)
+		return;
+
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	if(EndX - StartX > Graphics()->ScreenWidth() / g_Config.m_GfxTextOverlay || EndY - StartY > Graphics()->ScreenHeight() / g_Config.m_GfxTextOverlay)
+		return; // its useless to render text at this distance
+
+	float Size = g_Config.m_ClTextEntitiesSize / 100.f;
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(mx < 0)
+				continue; // mx = 0;
+			if(mx >= w)
+				continue; // mx = w-1;
+			if(my < 0)
+				continue; // my = 0;
+			if(my >= h)
+				continue; // my = h-1;
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTune[c].m_Number;
+			if(Index)
+			{
+				char aBuf[16];
+				str_from_int(Index, aBuf);
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, Alpha);
+				TextRender()->Text(mx * Scale + 11.f, my * Scale + 6.f, Size * Scale / 1.5f - 5.f, aBuf, -1.0f); // numbers shouldn't be too big and in the center of the tile
+				TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderTelemap(CTeleTile *pTele, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(RenderFlags & TILERENDERFLAG_EXTEND)
+			{
+				if(mx < 0)
+					mx = 0;
+				if(mx >= w)
+					mx = w - 1;
+				if(my < 0)
+					my = 0;
+				if(my >= h)
+					my = h - 1;
+			}
+			else
+			{
+				if(mx < 0)
+					continue; // mx = 0;
+				if(mx >= w)
+					continue; // mx = w-1;
+				if(my < 0)
+					continue; // my = 0;
+				if(my >= h)
+					continue; // my = h-1;
+			}
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTele[c].m_Type;
+			if(Index)
+			{
+				bool Render = false;
+				if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+					Render = true;
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+		}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderSpeedupmap(CSpeedupTile *pSpeedupTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+{
+	//Graphics()->TextureSet(img_get(tmap->image));
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	//Graphics()->MapScreen(screen_x0-50, screen_y0-50, screen_x1+50, screen_y1+50);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(RenderFlags & TILERENDERFLAG_EXTEND)
+			{
+				if(mx < 0)
+					mx = 0;
+				if(mx >= w)
+					mx = w - 1;
+				if(my < 0)
+					my = 0;
+				if(my >= h)
+					my = h - 1;
+			}
+			else
+			{
+				if(mx < 0)
+					continue; // mx = 0;
+				if(mx >= w)
+					continue; // mx = w-1;
+				if(my < 0)
+					continue; // my = 0;
+				if(my >= h)
+					continue; // my = h-1;
+			}
+
+			int c = mx + my * w;
+
+			unsigned char Index = pSpeedupTile[c].m_Type;
+			if(Index)
+			{
+				bool Render = false;
+				if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+					Render = true;
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+		}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderSwitchmap(CSwitchTile *pSwitchTile, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+{
+	//Graphics()->TextureSet(img_get(tmap->image));
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	//Graphics()->MapScreen(screen_x0-50, screen_y0-50, screen_x1+50, screen_y1+50);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(RenderFlags & TILERENDERFLAG_EXTEND)
+			{
+				if(mx < 0)
+					mx = 0;
+				if(mx >= w)
+					mx = w - 1;
+				if(my < 0)
+					my = 0;
+				if(my >= h)
+					my = h - 1;
+			}
+			else
+			{
+				if(mx < 0)
+					continue; // mx = 0;
+				if(mx >= w)
+					continue; // mx = w-1;
+				if(my < 0)
+					continue; // my = 0;
+				if(my >= h)
+					continue; // my = h-1;
+			}
+
+			int c = mx + my * w;
+
+			unsigned char Index = pSwitchTile[c].m_Type;
+			if(Index)
+			{
+				if(Index == TILE_SWITCHTIMEDOPEN)
+					Index = 8;
+
+				unsigned char Flags = pSwitchTile[c].m_Flags;
+
+				bool Render = false;
+				if(Flags & TILEFLAG_OPAQUE)
+				{
+					if(RenderFlags & LAYERRENDERFLAG_OPAQUE)
+						Render = true;
+				}
+				else
+				{
+					if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+						Render = true;
+				}
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Flags & TILEFLAG_XFLIP)
+					{
+						x0 = x2;
+						x1 = x3;
+						x2 = x3;
+						x3 = x0;
+					}
+
+					if(Flags & TILEFLAG_YFLIP)
+					{
+						y0 = y3;
+						y2 = y1;
+						y3 = y1;
+						y1 = y0;
+					}
+
+					if(Flags & TILEFLAG_ROTATE)
+					{
+						float Tmp = x0;
+						x0 = x3;
+						x3 = x2;
+						x2 = x1;
+						x1 = Tmp;
+						Tmp = y0;
+						y0 = y3;
+						y3 = y2;
+						y2 = y1;
+						y1 = Tmp;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+		}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+void CRenderTools::RenderTunemap(CTuneTile *pTune, int w, int h, float Scale, ColorRGBA Color, int RenderFlags)
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+
+	// calculate the final pixelsize for the tiles
+	float TilePixelSize = 1024 / 32.0f;
+	float FinalTileSize = Scale / (ScreenX1 - ScreenX0) * Graphics()->ScreenWidth();
+	float FinalTilesetScale = FinalTileSize / TilePixelSize;
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DBegin();
+	else
+		Graphics()->QuadsBegin();
+	Graphics()->SetColor(Color);
+
+	int StartY = (int)(ScreenY0 / Scale) - 1;
+	int StartX = (int)(ScreenX0 / Scale) - 1;
+	int EndY = (int)(ScreenY1 / Scale) + 1;
+	int EndX = (int)(ScreenX1 / Scale) + 1;
+
+	// adjust the texture shift according to mipmap level
+	float TexSize = 1024.0f;
+	float Frac = (1.25f / TexSize) * (1 / FinalTilesetScale);
+	float Nudge = (0.5f / TexSize) * (1 / FinalTilesetScale);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int mx = x;
+			int my = y;
+
+			if(RenderFlags & TILERENDERFLAG_EXTEND)
+			{
+				if(mx < 0)
+					mx = 0;
+				if(mx >= w)
+					mx = w - 1;
+				if(my < 0)
+					my = 0;
+				if(my >= h)
+					my = h - 1;
+			}
+			else
+			{
+				if(mx < 0)
+					continue; // mx = 0;
+				if(mx >= w)
+					continue; // mx = w-1;
+				if(my < 0)
+					continue; // my = 0;
+				if(my >= h)
+					continue; // my = h-1;
+			}
+
+			int c = mx + my * w;
+
+			unsigned char Index = pTune[c].m_Type;
+			if(Index)
+			{
+				bool Render = false;
+				if(RenderFlags & LAYERRENDERFLAG_TRANSPARENT)
+					Render = true;
+
+				if(Render)
+				{
+					int tx = Index % 16;
+					int ty = Index / 16;
+					int Px0 = tx * (1024 / 16);
+					int Py0 = ty * (1024 / 16);
+					int Px1 = Px0 + (1024 / 16) - 1;
+					int Py1 = Py0 + (1024 / 16) - 1;
+
+					float x0 = Nudge + Px0 / TexSize + Frac;
+					float y0 = Nudge + Py0 / TexSize + Frac;
+					float x1 = Nudge + Px1 / TexSize - Frac;
+					float y1 = Nudge + Py0 / TexSize + Frac;
+					float x2 = Nudge + Px1 / TexSize - Frac;
+					float y2 = Nudge + Py1 / TexSize - Frac;
+					float x3 = Nudge + Px0 / TexSize + Frac;
+					float y3 = Nudge + Py1 / TexSize - Frac;
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						x0 = 0;
+						y0 = 0;
+						x1 = x0 + 1;
+						y1 = y0;
+						x2 = x0 + 1;
+						y2 = y0 + 1;
+						x3 = x0;
+						y3 = y0 + 1;
+					}
+
+					if(Graphics()->HasTextureArraysSupport())
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3, Index);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsTex3DDrawTL(&QuadItem, 1);
+					}
+					else
+					{
+						Graphics()->QuadsSetSubsetFree(x0, y0, x1, y1, x2, y2, x3, y3);
+						IGraphics::CQuadItem QuadItem(x * Scale, y * Scale, Scale, Scale);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+				}
+			}
+		}
+
+	if(Graphics()->HasTextureArraysSupport())
+		Graphics()->QuadsTex3DEnd();
+	else
+		Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
diff --git a/src_bkp/game/client/skin.h b/src_bkp/game/client/skin.h
new file mode 100644
index 0000000000..aed057e3c1
--- /dev/null
+++ b/src_bkp/game/client/skin.h
@@ -0,0 +1,147 @@
+#ifndef GAME_CLIENT_SKIN_H
+#define GAME_CLIENT_SKIN_H
+#include <base/color.h>
+#include <base/system.h>
+#include <base/vmath.h>
+#include <engine/graphics.h>
+#include <limits>
+
+// do this better and nicer
+struct CSkin
+{
+private:
+	char m_aName[24];
+
+public:
+	struct SSkinTextures
+	{
+		IGraphics::CTextureHandle m_Body;
+		IGraphics::CTextureHandle m_BodyOutline;
+
+		IGraphics::CTextureHandle m_Feet;
+		IGraphics::CTextureHandle m_FeetOutline;
+
+		IGraphics::CTextureHandle m_Hands;
+		IGraphics::CTextureHandle m_HandsOutline;
+
+		IGraphics::CTextureHandle m_aEyes[6];
+
+		void Reset()
+		{
+			m_Body = IGraphics::CTextureHandle();
+			m_BodyOutline = IGraphics::CTextureHandle();
+			m_Feet = IGraphics::CTextureHandle();
+			m_FeetOutline = IGraphics::CTextureHandle();
+			m_Hands = IGraphics::CTextureHandle();
+			m_HandsOutline = IGraphics::CTextureHandle();
+			for(auto &Eye : m_aEyes)
+				Eye = IGraphics::CTextureHandle();
+		}
+	};
+
+	SSkinTextures m_OriginalSkin;
+	SSkinTextures m_ColorableSkin;
+	ColorRGBA m_BloodColor;
+
+	template<bool IsSizeType>
+	struct SSkinMetricVariableInt
+	{
+		int m_Value;
+		operator int() const { return m_Value; }
+		SSkinMetricVariableInt &operator=(int NewVal)
+		{
+			if(IsSizeType)
+				m_Value = maximum(m_Value, NewVal);
+			else
+				m_Value = minimum(m_Value, NewVal);
+			return *this;
+		}
+
+		SSkinMetricVariableInt()
+		{
+			Reset();
+		}
+
+		void Reset()
+		{
+			if(IsSizeType)
+				m_Value = std::numeric_limits<int>::lowest();
+			else
+				m_Value = std::numeric_limits<int>::max();
+		}
+	};
+
+	struct SSkinMetricVariable
+	{
+		SSkinMetricVariableInt<true> m_Width;
+		SSkinMetricVariableInt<true> m_Height;
+		SSkinMetricVariableInt<false> m_OffsetX;
+		SSkinMetricVariableInt<false> m_OffsetY;
+
+		// these can be used to normalize the metrics
+		SSkinMetricVariableInt<true> m_MaxWidth;
+		SSkinMetricVariableInt<true> m_MaxHeight;
+
+		float WidthNormalized() const
+		{
+			return (float)m_Width / (float)m_MaxWidth;
+		}
+
+		float HeightNormalized() const
+		{
+			return (float)m_Height / (float)m_MaxHeight;
+		}
+
+		float OffsetXNormalized() const
+		{
+			return (float)m_OffsetX / (float)m_MaxWidth;
+		}
+
+		float OffsetYNormalized() const
+		{
+			return (float)m_OffsetY / (float)m_MaxHeight;
+		}
+
+		void Reset()
+		{
+			m_Width.Reset();
+			m_Height.Reset();
+			m_OffsetX.Reset();
+			m_OffsetY.Reset();
+			m_MaxWidth.Reset();
+			m_MaxHeight.Reset();
+		}
+	};
+
+	struct SSkinMetrics
+	{
+		SSkinMetricVariable m_Body;
+		SSkinMetricVariable m_Feet;
+
+		void Reset()
+		{
+			m_Body.Reset();
+			m_Feet.Reset();
+		}
+
+		SSkinMetrics()
+		{
+			Reset();
+		}
+	};
+	SSkinMetrics m_Metrics;
+
+	bool operator<(const CSkin &Other) const { return str_comp(m_aName, Other.m_aName) < 0; }
+	bool operator==(const CSkin &Other) const { return !str_comp(m_aName, Other.m_aName); }
+
+	CSkin(const char *pName)
+	{
+		str_copy(m_aName, pName);
+	}
+	CSkin(CSkin &&) = default;
+	CSkin &operator=(CSkin &&) = default;
+
+	const char *GetName() const { return m_aName; }
+};
+
+#endif
diff --git a/src_bkp/game/client/ui.cpp b/src_bkp/game/client/ui.cpp
new file mode 100644
index 0000000000..d1ee0242b6
--- /dev/null
+++ b/src_bkp/game/client/ui.cpp
@@ -0,0 +1,2008 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "ui.h"
+#include "ui_scrollregion.h"
+
+#include <base/math.h>
+#include <base/system.h>
+
+#include <engine/client.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+
+#include <game/localization.h>
+
+#include <limits>
+
+using namespace FontIcons;
+
+void CUIElement::Init(CUI *pUI, int RequestedRectCount)
+{
+	m_pUI = pUI;
+	pUI->AddUIElement(this);
+	if(RequestedRectCount > 0)
+		InitRects(RequestedRectCount);
+}
+
+void CUIElement::InitRects(int RequestedRectCount)
+{
+	dbg_assert(m_vUIRects.empty(), "UI rects can only be initialized once, create another ui element instead.");
+	m_vUIRects.resize(RequestedRectCount);
+	for(auto &Rect : m_vUIRects)
+		Rect.m_pParent = this;
+}
+
+CUIElement::SUIElementRect::SUIElementRect() { Reset(); }
+
+void CUIElement::SUIElementRect::Reset()
+{
+	m_UIRectQuadContainer = -1;
+	m_UITextContainer.Reset();
+	m_X = -1;
+	m_Y = -1;
+	m_Width = -1;
+	m_Height = -1;
+	m_Rounding = -1.0f;
+	m_Corners = -1;
+	m_Text.clear();
+	m_Cursor.Reset();
+	m_TextColor = ColorRGBA(-1, -1, -1, -1);
+	m_TextOutlineColor = ColorRGBA(-1, -1, -1, -1);
+	m_QuadColor = ColorRGBA(-1, -1, -1, -1);
+	m_ReadCursorGlyphCount = -1;
+}
+
+void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int Corners, float Rounding)
+{
+	bool NeedsRecreate = false;
+	if(m_UIRectQuadContainer == -1 || m_Width != pRect->w || m_Height != pRect->h || mem_comp(&m_QuadColor, &Color, sizeof(Color)) != 0)
+	{
+		m_pParent->UI()->Graphics()->DeleteQuadContainer(m_UIRectQuadContainer);
+		NeedsRecreate = true;
+	}
+	m_X = pRect->x;
+	m_Y = pRect->y;
+	if(NeedsRecreate)
+	{
+		m_Width = pRect->w;
+		m_Height = pRect->h;
+		m_QuadColor = Color;
+
+		m_pParent->UI()->Graphics()->SetColor(Color);
+		m_UIRectQuadContainer = m_pParent->UI()->Graphics()->CreateRectQuadContainer(0, 0, pRect->w, pRect->h, Rounding, Corners);
+		m_pParent->UI()->Graphics()->SetColor(1, 1, 1, 1);
+	}
+
+	m_pParent->UI()->Graphics()->TextureClear();
+	m_pParent->UI()->Graphics()->RenderQuadContainerEx(m_UIRectQuadContainer,
+		0, -1, m_X, m_Y, 1, 1);
+}
+
+/********************************************************
+ UI
+*********************************************************/
+
+const CLinearScrollbarScale CUI::ms_LinearScrollbarScale;
+const CLogarithmicScrollbarScale CUI::ms_LogarithmicScrollbarScale(25);
+const CDarkButtonColorFunction CUI::ms_DarkButtonColorFunction;
+const CLightButtonColorFunction CUI::ms_LightButtonColorFunction;
+const CScrollBarColorFunction CUI::ms_ScrollBarColorFunction;
+const float CUI::ms_FontmodHeight = 0.8f;
+
+CUI *CUIElementBase::s_pUI = nullptr;
+
+IClient *CUIElementBase::Client() const { return s_pUI->Client(); }
+IGraphics *CUIElementBase::Graphics() const { return s_pUI->Graphics(); }
+IInput *CUIElementBase::Input() const { return s_pUI->Input(); }
+ITextRender *CUIElementBase::TextRender() const { return s_pUI->TextRender(); }
+
+void CUI::Init(IKernel *pKernel)
+{
+	m_pClient = pKernel->RequestInterface<IClient>();
+	m_pGraphics = pKernel->RequestInterface<IGraphics>();
+	m_pInput = pKernel->RequestInterface<IInput>();
+	m_pTextRender = pKernel->RequestInterface<ITextRender>();
+	CUIRect::Init(m_pGraphics);
+	CLineInput::Init(m_pClient, m_pGraphics, m_pInput, m_pTextRender);
+	CUIElementBase::Init(this);
+}
+
+CUI::CUI()
+{
+	m_Enabled = true;
+
+	m_pHotItem = nullptr;
+	m_pActiveItem = nullptr;
+	m_pLastActiveItem = nullptr;
+	m_pBecomingHotItem = nullptr;
+
+	m_MouseX = 0;
+	m_MouseY = 0;
+	m_MouseWorldX = 0;
+	m_MouseWorldY = 0;
+	m_MouseButtons = 0;
+	m_LastMouseButtons = 0;
+
+	m_Screen.x = 0.0f;
+	m_Screen.y = 0.0f;
+}
+
+CUI::~CUI()
+{
+	for(CUIElement *&pEl : m_vpOwnUIElements)
+	{
+		delete pEl;
+	}
+	m_vpOwnUIElements.clear();
+}
+
+CUIElement *CUI::GetNewUIElement(int RequestedRectCount)
+{
+	CUIElement *pNewEl = new CUIElement(this, RequestedRectCount);
+
+	m_vpOwnUIElements.push_back(pNewEl);
+
+	return pNewEl;
+}
+
+void CUI::AddUIElement(CUIElement *pElement)
+{
+	m_vpUIElements.push_back(pElement);
+}
+
+void CUI::ResetUIElement(CUIElement &UIElement) const
+{
+	for(CUIElement::SUIElementRect &Rect : UIElement.m_vUIRects)
+	{
+		Graphics()->DeleteQuadContainer(Rect.m_UIRectQuadContainer);
+		TextRender()->DeleteTextContainer(Rect.m_UITextContainer);
+		Rect.Reset();
+	}
+}
+
+void CUI::OnElementsReset()
+{
+	for(CUIElement *pEl : m_vpUIElements)
+	{
+		ResetUIElement(*pEl);
+	}
+}
+
+void CUI::OnWindowResize()
+{
+	OnElementsReset();
+}
+
+void CUI::OnCursorMove(float X, float Y)
+{
+	if(!CheckMouseLock())
+	{
+		m_UpdatedMousePos.x = clamp(m_UpdatedMousePos.x + X, 0.0f, (float)Graphics()->WindowWidth());
+		m_UpdatedMousePos.y = clamp(m_UpdatedMousePos.y + Y, 0.0f, (float)Graphics()->WindowHeight());
+	}
+
+	m_UpdatedMouseDelta += vec2(X, Y);
+}
+
+void CUI::Update()
+{
+	const CUIRect *pScreen = Screen();
+	const float MouseX = (m_UpdatedMousePos.x / (float)Graphics()->WindowWidth()) * pScreen->w;
+	const float MouseY = (m_UpdatedMousePos.y / (float)Graphics()->WindowHeight()) * pScreen->h;
+	Update(MouseX, MouseY, m_UpdatedMouseDelta.x, m_UpdatedMouseDelta.y, MouseX * 3.0f, MouseY * 3.0f);
+	m_UpdatedMouseDelta = vec2(0.0f, 0.0f);
+}
+
+void CUI::Update(float MouseX, float MouseY, float MouseDeltaX, float MouseDeltaY, float MouseWorldX, float MouseWorldY)
+{
+	unsigned MouseButtons = 0;
+	if(Enabled())
+	{
+		if(Input()->KeyIsPressed(KEY_MOUSE_1))
+			MouseButtons |= 1;
+		if(Input()->KeyIsPressed(KEY_MOUSE_2))
+			MouseButtons |= 2;
+		if(Input()->KeyIsPressed(KEY_MOUSE_3))
+			MouseButtons |= 4;
+	}
+
+	m_MouseDeltaX = MouseDeltaX;
+	m_MouseDeltaY = MouseDeltaY;
+	m_MouseX = MouseX;
+	m_MouseY = MouseY;
+	m_MouseWorldX = MouseWorldX;
+	m_MouseWorldY = MouseWorldY;
+	m_LastMouseButtons = m_MouseButtons;
+	m_MouseButtons = MouseButtons;
+	m_pHotItem = m_pBecomingHotItem;
+	if(m_pActiveItem)
+		m_pHotItem = m_pActiveItem;
+	m_pBecomingHotItem = nullptr;
+
+	if(Enabled())
+	{
+		CLineInput *pActiveInput = CLineInput::GetActiveInput();
+		if(pActiveInput && m_pLastActiveItem && pActiveInput != m_pLastActiveItem)
+			pActiveInput->Deactivate();
+	}
+	else
+	{
+		m_pHotItem = nullptr;
+		m_pActiveItem = nullptr;
+	}
+}
+
+void CUI::DebugRender()
+{
+	MapScreen();
+
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "hot=%p nexthot=%p active=%p lastactive=%p", HotItem(), NextHotItem(), ActiveItem(), m_pLastActiveItem);
+	TextRender()->Text(2.0f, Screen()->h - 12.0f, 10.0f, aBuf);
+}
+
+bool CUI::MouseInside(const CUIRect *pRect) const
+{
+	return pRect->Inside(m_MouseX, m_MouseY);
+}
+
+void CUI::ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType) const
+{
+	float Factor = 1.0f;
+	switch(CursorType)
+	{
+	case IInput::CURSOR_MOUSE:
+		Factor = g_Config.m_UiMousesens / 100.0f;
+		break;
+	case IInput::CURSOR_JOYSTICK:
+		Factor = g_Config.m_UiControllerSens / 100.0f;
+		break;
+	default:
+		dbg_msg("assert", "CUI::ConvertMouseMove CursorType %d", (int)CursorType);
+		dbg_break();
+		break;
+	}
+
+	if(m_MouseSlow)
+		Factor *= 0.05f;
+
+	*pX *= Factor;
+	*pY *= Factor;
+}
+
+bool CUI::ConsumeHotkey(EHotkey Hotkey)
+{
+	const bool Pressed = m_HotkeysPressed & Hotkey;
+	m_HotkeysPressed &= ~Hotkey;
+	return Pressed;
+}
+
+bool CUI::OnInput(const IInput::CEvent &Event)
+{
+	if(!Enabled())
+		return false;
+
+	CLineInput *pActiveInput = CLineInput::GetActiveInput();
+	if(pActiveInput && pActiveInput->ProcessInput(Event))
+		return true;
+
+	if(Event.m_Flags & IInput::FLAG_PRESS)
+	{
+		unsigned LastHotkeysPressed = m_HotkeysPressed;
+		if(Event.m_Key == KEY_RETURN || Event.m_Key == KEY_KP_ENTER)
+			m_HotkeysPressed |= HOTKEY_ENTER;
+		else if(Event.m_Key == KEY_ESCAPE)
+			m_HotkeysPressed |= HOTKEY_ESCAPE;
+		else if(Event.m_Key == KEY_TAB && !Input()->AltIsPressed())
+			m_HotkeysPressed |= HOTKEY_TAB;
+		else if(Event.m_Key == KEY_DELETE)
+			m_HotkeysPressed |= HOTKEY_DELETE;
+		else if(Event.m_Key == KEY_UP)
+			m_HotkeysPressed |= HOTKEY_UP;
+		else if(Event.m_Key == KEY_DOWN)
+			m_HotkeysPressed |= HOTKEY_DOWN;
+		else if(Event.m_Key == KEY_MOUSE_WHEEL_UP)
+			m_HotkeysPressed |= HOTKEY_SCROLL_UP;
+		else if(Event.m_Key == KEY_MOUSE_WHEEL_DOWN)
+			m_HotkeysPressed |= HOTKEY_SCROLL_DOWN;
+		else if(Event.m_Key == KEY_PAGEUP)
+			m_HotkeysPressed |= HOTKEY_PAGE_UP;
+		else if(Event.m_Key == KEY_PAGEDOWN)
+			m_HotkeysPressed |= HOTKEY_PAGE_DOWN;
+		else if(Event.m_Key == KEY_HOME)
+			m_HotkeysPressed |= HOTKEY_HOME;
+		else if(Event.m_Key == KEY_END)
+			m_HotkeysPressed |= HOTKEY_END;
+		return LastHotkeysPressed != m_HotkeysPressed;
+	}
+	return false;
+}
+
+float CUI::ButtonColorMul(const void *pID)
+{
+	if(CheckActiveItem(pID))
+		return ButtonColorMulActive();
+	else if(HotItem() == pID)
+		return ButtonColorMulHot();
+	return ButtonColorMulDefault();
+}
+
+const CUIRect *CUI::Screen()
+{
+	m_Screen.h = 600.0f;
+	m_Screen.w = Graphics()->ScreenAspect() * m_Screen.h;
+	return &m_Screen;
+}
+
+void CUI::MapScreen()
+{
+	const CUIRect *pScreen = Screen();
+	Graphics()->MapScreen(pScreen->x, pScreen->y, pScreen->w, pScreen->h);
+}
+
+float CUI::PixelSize()
+{
+	return Screen()->w / Graphics()->ScreenWidth();
+}
+
+void CUI::ClipEnable(const CUIRect *pRect)
+{
+	if(IsClipped())
+	{
+		const CUIRect *pOldRect = ClipArea();
+		CUIRect Intersection;
+		Intersection.x = std::max(pRect->x, pOldRect->x);
+		Intersection.y = std::max(pRect->y, pOldRect->y);
+		Intersection.w = std::min(pRect->x + pRect->w, pOldRect->x + pOldRect->w) - pRect->x;
+		Intersection.h = std::min(pRect->y + pRect->h, pOldRect->y + pOldRect->h) - pRect->y;
+		m_vClips.push_back(Intersection);
+	}
+	else
+	{
+		m_vClips.push_back(*pRect);
+	}
+	UpdateClipping();
+}
+
+void CUI::ClipDisable()
+{
+	dbg_assert(IsClipped(), "no clip region");
+	m_vClips.pop_back();
+	UpdateClipping();
+}
+
+const CUIRect *CUI::ClipArea() const
+{
+	dbg_assert(IsClipped(), "no clip region");
+	return &m_vClips.back();
+}
+
+void CUI::UpdateClipping()
+{
+	if(IsClipped())
+	{
+		const CUIRect *pRect = ClipArea();
+		const float XScale = Graphics()->ScreenWidth() / Screen()->w;
+		const float YScale = Graphics()->ScreenHeight() / Screen()->h;
+		Graphics()->ClipEnable((int)(pRect->x * XScale), (int)(pRect->y * YScale), (int)(pRect->w * XScale), (int)(pRect->h * YScale));
+	}
+	else
+	{
+		Graphics()->ClipDisable();
+	}
+}
+
+int CUI::DoButtonLogic(const void *pID, int Checked, const CUIRect *pRect)
+{
+	// logic
+	int ReturnValue = 0;
+	const bool Inside = MouseHovered(pRect);
+	static int s_ButtonUsed = -1;
+
+	if(CheckActiveItem(pID))
+	{
+		if(s_ButtonUsed >= 0 && !MouseButton(s_ButtonUsed))
+		{
+			if(Inside && Checked >= 0)
+				ReturnValue = 1 + s_ButtonUsed;
+			SetActiveItem(nullptr);
+			s_ButtonUsed = -1;
+		}
+	}
+	else if(HotItem() == pID)
+	{
+		for(int i = 0; i < 3; ++i)
+		{
+			if(MouseButton(i))
+			{
+				SetActiveItem(pID);
+				s_ButtonUsed = i;
+			}
+		}
+	}
+
+	if(Inside && !MouseButton(0) && !MouseButton(1) && !MouseButton(2))
+		SetHotItem(pID);
+
+	return ReturnValue;
+}
+
+int CUI::DoDraggableButtonLogic(const void *pID, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted)
+{
+	// logic
+	int ReturnValue = 0;
+	const bool Inside = MouseHovered(pRect);
+	static int s_ButtonUsed = -1;
+
+	if(pClicked != nullptr)
+		*pClicked = false;
+	if(pAbrupted != nullptr)
+		*pAbrupted = false;
+
+	if(CheckActiveItem(pID))
+	{
+		if(s_ButtonUsed == 0)
+		{
+			if(Checked >= 0)
+				ReturnValue = 1 + s_ButtonUsed;
+			if(!MouseButton(s_ButtonUsed))
+			{
+				if(pClicked != nullptr)
+					*pClicked = true;
+				SetActiveItem(nullptr);
+				s_ButtonUsed = -1;
+			}
+			if(MouseButton(1))
+			{
+				if(pAbrupted != nullptr)
+					*pAbrupted = true;
+				SetActiveItem(nullptr);
+				s_ButtonUsed = -1;
+			}
+		}
+		else if(s_ButtonUsed > 0 && !MouseButton(s_ButtonUsed))
+		{
+			if(Inside && Checked >= 0)
+				ReturnValue = 1 + s_ButtonUsed;
+			if(pClicked != nullptr)
+				*pClicked = true;
+			SetActiveItem(nullptr);
+			s_ButtonUsed = -1;
+		}
+	}
+	else if(HotItem() == pID)
+	{
+		for(int i = 0; i < 3; ++i)
+		{
+			if(MouseButton(i))
+			{
+				SetActiveItem(pID);
+				s_ButtonUsed = i;
+			}
+		}
+	}
+
+	if(Inside && !MouseButton(0) && !MouseButton(1) && !MouseButton(2))
+		SetHotItem(pID);
+
+	return ReturnValue;
+}
+
+EEditState CUI::DoPickerLogic(const void *pID, const CUIRect *pRect, float *pX, float *pY)
+{
+	static const void *s_pEditing = nullptr;
+
+	if(MouseHovered(pRect))
+		SetHotItem(pID);
+
+	EEditState Res = EEditState::EDITING;
+
+	if(HotItem() == pID && MouseButtonClicked(0))
+	{
+		SetActiveItem(pID);
+		if(!s_pEditing)
+		{
+			s_pEditing = pID;
+			Res = EEditState::START;
+		}
+	}
+
+	if(CheckActiveItem(pID) && !MouseButton(0))
+	{
+		SetActiveItem(nullptr);
+		if(s_pEditing == pID)
+		{
+			s_pEditing = nullptr;
+			Res = EEditState::END;
+		}
+	}
+
+	if(!CheckActiveItem(pID) && Res == EEditState::EDITING)
+		return EEditState::NONE;
+
+	if(Input()->ShiftIsPressed())
+		m_MouseSlow = true;
+
+	if(pX)
+		*pX = clamp(m_MouseX - pRect->x, 0.0f, pRect->w);
+	if(pY)
+		*pY = clamp(m_MouseY - pRect->y, 0.0f, pRect->h);
+
+	return Res;
+}
+
+void CUI::DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp, float ScrollSpeed) const
+{
+	// reset scrolling if it's not necessary anymore
+	if(TotalSize < ViewPortSize)
+	{
+		*pScrollOffsetChange = -*pScrollOffset;
+	}
+
+	// instant scrolling if distance too long
+	if(absolute(*pScrollOffsetChange) > 2.0f * ViewPortSize)
+	{
+		*pScrollOffset += *pScrollOffsetChange;
+		*pScrollOffsetChange = 0.0f;
+	}
+
+	// smooth scrolling
+	if(*pScrollOffsetChange)
+	{
+		const float Delta = *pScrollOffsetChange * clamp(Client()->RenderFrameTime() * ScrollSpeed, 0.0f, 1.0f);
+		*pScrollOffset += Delta;
+		*pScrollOffsetChange -= Delta;
+	}
+
+	// clamp to first item
+	if(*pScrollOffset < 0.0f)
+	{
+		if(SmoothClamp && *pScrollOffset < -0.1f)
+		{
+			*pScrollOffsetChange = -*pScrollOffset;
+		}
+		else
+		{
+			*pScrollOffset = 0.0f;
+			*pScrollOffsetChange = 0.0f;
+		}
+	}
+
+	// clamp to last item
+	if(TotalSize > ViewPortSize && *pScrollOffset > TotalSize - ViewPortSize)
+	{
+		if(SmoothClamp && *pScrollOffset - (TotalSize - ViewPortSize) > 0.1f)
+		{
+			*pScrollOffsetChange = (TotalSize - ViewPortSize) - *pScrollOffset;
+		}
+		else
+		{
+			*pScrollOffset = TotalSize - ViewPortSize;
+			*pScrollOffsetChange = 0.0f;
+		}
+	}
+}
+
+struct SCursorAndBoundingBox
+{
+	vec2 m_TextSize;
+	float m_BiggestCharacterHeight;
+	int m_LineCount;
+};
+
+static SCursorAndBoundingBox CalcFontSizeCursorHeightAndBoundingBox(ITextRender *pTextRender, const char *pText, int Flags, float &Size, float MaxWidth, const SLabelProperties &LabelProps)
+{
+	const float MinFontSize = 5.0f;
+	const float MaxTextWidth = LabelProps.m_MaxWidth != -1.0f ? LabelProps.m_MaxWidth : MaxWidth;
+	const int FlagsWithoutStop = Flags & ~(TEXTFLAG_STOP_AT_END | TEXTFLAG_ELLIPSIS_AT_END);
+	const float MaxTextWidthWithoutStop = Flags == FlagsWithoutStop ? LabelProps.m_MaxWidth : -1.0f;
+
+	float TextBoundingHeight = 0.0f;
+	float TextHeight = 0.0f;
+	int LineCount = 0;
+	STextSizeProperties TextSizeProps{};
+	TextSizeProps.m_pHeight = &TextHeight;
+	TextSizeProps.m_pMaxCharacterHeightInLine = &TextBoundingHeight;
+	TextSizeProps.m_pLineCount = &LineCount;
+
+	float TextWidth;
+	do
+	{
+		Size = maximum(Size, MinFontSize);
+		// Only consider stop-at-end and ellipsis-at-end when minimum font size reached or font scaling disabled
+		if((Size == MinFontSize || !LabelProps.m_EnableWidthCheck) && Flags != FlagsWithoutStop)
+			TextWidth = pTextRender->TextWidth(Size, pText, -1, LabelProps.m_MaxWidth, Flags, TextSizeProps);
+		else
+			TextWidth = pTextRender->TextWidth(Size, pText, -1, MaxTextWidthWithoutStop, FlagsWithoutStop, TextSizeProps);
+		if(TextWidth <= MaxTextWidth + 0.001f || !LabelProps.m_EnableWidthCheck || Size == MinFontSize)
+			break;
+		Size--;
+	} while(true);
+
+	SCursorAndBoundingBox Res{};
+	Res.m_TextSize = vec2(TextWidth, TextHeight);
+	Res.m_BiggestCharacterHeight = TextBoundingHeight;
+	Res.m_LineCount = LineCount;
+	return Res;
+}
+
+static int GetFlagsForLabelProperties(const SLabelProperties &LabelProps, const CTextCursor *pReadCursor)
+{
+	if(pReadCursor != nullptr)
+		return pReadCursor->m_Flags & ~TEXTFLAG_RENDER;
+
+	int Flags = 0;
+	Flags |= LabelProps.m_StopAtEnd ? TEXTFLAG_STOP_AT_END : 0;
+	Flags |= LabelProps.m_EllipsisAtEnd ? TEXTFLAG_ELLIPSIS_AT_END : 0;
+	return Flags;
+}
+
+vec2 CUI::CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight)
+{
+	vec2 Cursor(pRect->x, pRect->y);
+
+	const int HorizontalAlign = Align & TEXTALIGN_MASK_HORIZONTAL;
+	if(HorizontalAlign == TEXTALIGN_CENTER)
+	{
+		Cursor.x += (pRect->w - TextSize.x) / 2.0f;
+	}
+	else if(HorizontalAlign == TEXTALIGN_RIGHT)
+	{
+		Cursor.x += pRect->w - TextSize.x;
+	}
+
+	const int VerticalAlign = Align & TEXTALIGN_MASK_VERTICAL;
+	if(VerticalAlign == TEXTALIGN_MIDDLE)
+	{
+		Cursor.y += pBiggestCharHeight != nullptr ? ((pRect->h - *pBiggestCharHeight) / 2.0f - (TextSize.y - *pBiggestCharHeight)) : (pRect->h - TextSize.y) / 2.0f;
+	}
+	else if(VerticalAlign == TEXTALIGN_BOTTOM)
+	{
+		Cursor.y += pRect->h - TextSize.y;
+	}
+
+	return Cursor;
+}
+
+void CUI::DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps) const
+{
+	const int Flags = GetFlagsForLabelProperties(LabelProps, nullptr);
+	const SCursorAndBoundingBox TextBounds = CalcFontSizeCursorHeightAndBoundingBox(TextRender(), pText, Flags, Size, pRect->w, LabelProps);
+	const vec2 CursorPos = CalcAlignedCursorPos(pRect, TextBounds.m_TextSize, Align, TextBounds.m_LineCount == 1 ? &TextBounds.m_BiggestCharacterHeight : nullptr);
+
+	CTextCursor Cursor;
+	TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, Size, TEXTFLAG_RENDER | Flags);
+	Cursor.m_LineWidth = (float)LabelProps.m_MaxWidth;
+	TextRender()->TextEx(&Cursor, pText, -1);
+}
+
+
+void CUI::DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
+{
+	const int Flags = GetFlagsForLabelProperties(LabelProps, pReadCursor);
+	const SCursorAndBoundingBox TextBounds = CalcFontSizeCursorHeightAndBoundingBox(TextRender(), pText, Flags, Size, pRect->w, LabelProps);
+
+	CTextCursor Cursor;
+	if(pReadCursor)
+	{
+		Cursor = *pReadCursor;
+	}
+	else
+	{
+		const vec2 CursorPos = CalcAlignedCursorPos(pRect, TextBounds.m_TextSize, Align);
+		TextRender()->SetCursor(&Cursor, CursorPos.x, CursorPos.y, Size, TEXTFLAG_RENDER | Flags);
+	}
+	Cursor.m_LineWidth = LabelProps.m_MaxWidth;
+
+	RectEl.m_TextColor = TextRender()->GetTextColor();
+	RectEl.m_TextOutlineColor = TextRender()->GetTextOutlineColor();
+	TextRender()->TextColor(TextRender()->DefaultTextColor());
+	TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+	TextRender()->CreateTextContainer(RectEl.m_UITextContainer, &Cursor, pText, StrLen);
+	TextRender()->TextColor(RectEl.m_TextColor);
+	TextRender()->TextOutlineColor(RectEl.m_TextOutlineColor);
+	RectEl.m_Cursor = Cursor;
+}
+
+void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps, int StrLen, const CTextCursor *pReadCursor) const
+{
+	const int ReadCursorGlyphCount = pReadCursor == nullptr ? -1 : pReadCursor->m_GlyphCount;
+	bool NeedsRecreate = false;
+	bool ColorChanged = RectEl.m_TextColor != TextRender()->GetTextColor() || RectEl.m_TextOutlineColor != TextRender()->GetTextOutlineColor();
+	if((!RectEl.m_UITextContainer.Valid() && pText[0] != '\0' && StrLen != 0) || RectEl.m_Width != pRect->w || RectEl.m_Height != pRect->h || ColorChanged || RectEl.m_ReadCursorGlyphCount != ReadCursorGlyphCount)
+	{
+		NeedsRecreate = true;
+	}
+	else
+	{
+		if(StrLen <= -1)
+		{
+			if(str_comp(RectEl.m_Text.c_str(), pText) != 0)
+				NeedsRecreate = true;
+		}
+		else
+		{
+			if(StrLen != (int)RectEl.m_Text.size() || str_comp_num(RectEl.m_Text.c_str(), pText, StrLen) != 0)
+				NeedsRecreate = true;
+		}
+	}
+	RectEl.m_X = pRect->x;
+	RectEl.m_Y = pRect->y;
+	if(NeedsRecreate)
+	{
+		TextRender()->DeleteTextContainer(RectEl.m_UITextContainer);
+
+		RectEl.m_Width = pRect->w;
+		RectEl.m_Height = pRect->h;
+
+		if(StrLen > 0)
+			RectEl.m_Text = std::string(pText, StrLen);
+		else if(StrLen < 0)
+			RectEl.m_Text = pText;
+		else
+			RectEl.m_Text.clear();
+
+		RectEl.m_ReadCursorGlyphCount = ReadCursorGlyphCount;
+
+		CUIRect TmpRect;
+		TmpRect.x = 0;
+		TmpRect.y = 0;
+		TmpRect.w = pRect->w;
+		TmpRect.h = pRect->h;
+
+		DoLabel(RectEl, &TmpRect, pText, Size, TEXTALIGN_TL, LabelProps, StrLen, pReadCursor);
+	}
+
+	if(RectEl.m_UITextContainer.Valid())
+	{
+		const vec2 CursorPos = CalcAlignedCursorPos(pRect, vec2(RectEl.m_Cursor.m_LongestLineWidth, RectEl.m_Cursor.Height()), Align);
+		TextRender()->RenderTextContainer(RectEl.m_UITextContainer, RectEl.m_TextColor, RectEl.m_TextOutlineColor, CursorPos.x, CursorPos.y);
+	}
+}
+
+bool CUI::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners)
+{
+	const bool Inside = MouseHovered(pRect);
+	const bool Active = m_pLastActiveItem == pLineInput;
+	const bool Changed = pLineInput->WasChanged();
+	const bool CursorChanged = pLineInput->WasCursorChanged();
+
+	const float VSpacing = 2.0f;
+	CUIRect Textbox;
+	pRect->VMargin(VSpacing, &Textbox);
+
+	bool JustGotActive = false;
+	if(CheckActiveItem(pLineInput))
+	{
+		if(MouseButton(0))
+		{
+			if(pLineInput->IsActive() && (Input()->HasComposition() || Input()->GetCandidateCount()))
+			{
+				// Clear IME composition/candidates on mouse press
+				Input()->StopTextInput();
+				Input()->StartTextInput();
+			}
+		}
+		else
+		{
+			SetActiveItem(nullptr);
+		}
+	}
+	else if(HotItem() == pLineInput)
+	{
+		if(MouseButton(0))
+		{
+			if(!Active)
+				JustGotActive = true;
+			SetActiveItem(pLineInput);
+		}
+	}
+
+	if(Inside)
+		SetHotItem(pLineInput);
+
+	if(Enabled() && Active && !JustGotActive)
+		pLineInput->Activate(EInputPriority::UI);
+	else
+		pLineInput->Deactivate();
+
+	float ScrollOffset = pLineInput->GetScrollOffset();
+	float ScrollOffsetChange = pLineInput->GetScrollOffsetChange();
+
+	// Update mouse selection information
+	CLineInput::SMouseSelection *pMouseSelection = pLineInput->GetMouseSelection();
+	if(Inside)
+	{
+		if(!pMouseSelection->m_Selecting && MouseButtonClicked(0))
+		{
+			pMouseSelection->m_Selecting = true;
+			pMouseSelection->m_PressMouse = MousePos();
+			pMouseSelection->m_Offset.x = ScrollOffset;
+		}
+	}
+	if(pMouseSelection->m_Selecting)
+	{
+		pMouseSelection->m_ReleaseMouse = MousePos();
+		if(MouseButtonReleased(0))
+		{
+			pMouseSelection->m_Selecting = false;
+		}
+	}
+	if(ScrollOffset != pMouseSelection->m_Offset.x)
+	{
+		// When the scroll offset is changed, update the position that the mouse was pressed at,
+		// so the existing text selection still stays mostly the same.
+		// TODO: The selection may change by one character temporarily, due to different character widths.
+		//       Needs text render adjustment: keep selection start based on character.
+		pMouseSelection->m_PressMouse.x -= ScrollOffset - pMouseSelection->m_Offset.x;
+		pMouseSelection->m_Offset.x = ScrollOffset;
+	}
+
+	// Render
+	pRect->Draw(ms_LightButtonColorFunction.GetColor(Active, HotItem() == pLineInput), Corners, 3.0f);
+	ClipEnable(pRect);
+	Textbox.x -= ScrollOffset;
+	const STextBoundingBox BoundingBox = pLineInput->Render(&Textbox, FontSize, TEXTALIGN_ML, Changed || CursorChanged, -1.0f, 0.0f);
+	ClipDisable();
+
+	// Scroll left or right if necessary
+	if(Active && !JustGotActive && (Changed || CursorChanged || Input()->HasComposition()))
+	{
+		const float CaretPositionX = pLineInput->GetCaretPosition().x - Textbox.x - ScrollOffset - ScrollOffsetChange;
+		if(CaretPositionX > Textbox.w)
+			ScrollOffsetChange += CaretPositionX - Textbox.w;
+		else if(CaretPositionX < 0.0f)
+			ScrollOffsetChange += CaretPositionX;
+	}
+
+	DoSmoothScrollLogic(&ScrollOffset, &ScrollOffsetChange, Textbox.w, BoundingBox.m_W, true);
+
+	pLineInput->SetScrollOffset(ScrollOffset);
+	pLineInput->SetScrollOffsetChange(ScrollOffsetChange);
+
+	return Changed;
+}
+
+bool CUI::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners)
+{
+	CUIRect EditBox, ClearButton;
+	pRect->VSplitRight(pRect->h, &EditBox, &ClearButton);
+
+	bool ReturnValue = DoEditBox(pLineInput, &EditBox, FontSize, Corners & ~IGraphics::CORNER_R);
+
+	ClearButton.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f * ButtonColorMul(pLineInput->GetClearButtonId())), Corners & ~IGraphics::CORNER_L, 3.0f);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+	DoLabel(&ClearButton, "×", ClearButton.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+	TextRender()->SetRenderFlags(0);
+	if(DoButtonLogic(pLineInput->GetClearButtonId(), 0, &ClearButton))
+	{
+		pLineInput->Clear();
+		SetActiveItem(pLineInput);
+		ReturnValue = true;
+	}
+
+	return ReturnValue;
+}
+
+int CUI::DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props)
+{
+	CUIRect Text = *pRect, DropDownIcon;
+	Text.HMargin(pRect->h >= 20.0f ? 2.0f : 1.0f, &Text);
+	Text.HMargin((Text.h * Props.m_FontFactor) / 2.0f, &Text);
+	if(Props.m_ShowDropDownIcon)
+	{
+		Text.VSplitRight(pRect->h * 0.25f, &Text, nullptr);
+		Text.VSplitRight(pRect->h * 0.75f, &Text, &DropDownIcon);
+	}
+
+	if(!UIElement.AreRectsInit() || Props.m_HintRequiresStringCheck || Props.m_HintCanChangePositionOrSize || !UIElement.Rect(0)->m_UITextContainer.Valid())
+	{
+		bool NeedsRecalc = !UIElement.AreRectsInit() || !UIElement.Rect(0)->m_UITextContainer.Valid();
+		if(Props.m_HintCanChangePositionOrSize)
+		{
+			if(UIElement.AreRectsInit())
+			{
+				if(UIElement.Rect(0)->m_X != pRect->x || UIElement.Rect(0)->m_Y != pRect->y || UIElement.Rect(0)->m_Width != pRect->w || UIElement.Rect(0)->m_Height != pRect->h || UIElement.Rect(0)->m_Rounding != Props.m_Rounding || UIElement.Rect(0)->m_Corners != Props.m_Corners)
+				{
+					NeedsRecalc = true;
+				}
+			}
+		}
+		const char *pText = nullptr;
+		if(Props.m_HintRequiresStringCheck)
+		{
+			if(UIElement.AreRectsInit())
+			{
+				pText = GetTextLambda();
+				if(str_comp(UIElement.Rect(0)->m_Text.c_str(), pText) != 0)
+				{
+					NeedsRecalc = true;
+				}
+			}
+		}
+		if(NeedsRecalc)
+		{
+			if(!UIElement.AreRectsInit())
+			{
+				UIElement.InitRects(3);
+			}
+			ResetUIElement(UIElement);
+
+			for(int i = 0; i < 3; ++i)
+			{
+				ColorRGBA Color = Props.m_Color;
+				if(i == 0)
+					Color.a *= ButtonColorMulActive();
+				else if(i == 1)
+					Color.a *= ButtonColorMulHot();
+				else if(i == 2)
+					Color.a *= ButtonColorMulDefault();
+				Graphics()->SetColor(Color);
+
+				CUIElement::SUIElementRect &NewRect = *UIElement.Rect(i);
+				NewRect.m_UIRectQuadContainer = Graphics()->CreateRectQuadContainer(pRect->x, pRect->y, pRect->w, pRect->h, Props.m_Rounding, Props.m_Corners);
+
+				NewRect.m_X = pRect->x;
+				NewRect.m_Y = pRect->y;
+				NewRect.m_Width = pRect->w;
+				NewRect.m_Height = pRect->h;
+				NewRect.m_Rounding = Props.m_Rounding;
+				NewRect.m_Corners = Props.m_Corners;
+				if(i == 0)
+				{
+					if(pText == nullptr)
+						pText = GetTextLambda();
+					NewRect.m_Text = pText;
+					if(Props.m_UseIconFont)
+						TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+					DoLabel(NewRect, &Text, pText, Text.h * CUI::ms_FontmodHeight, TEXTALIGN_MC);
+					if(Props.m_UseIconFont)
+						TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+				}
+			}
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		}
+	}
+	// render
+	size_t Index = 2;
+	if(CheckActiveItem(pID))
+		Index = 0;
+	else if(HotItem() == pID)
+		Index = 1;
+	Graphics()->TextureClear();
+	Graphics()->RenderQuadContainer(UIElement.Rect(Index)->m_UIRectQuadContainer, -1);
+	if(Props.m_ShowDropDownIcon)
+	{
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		DoLabel(&DropDownIcon, FONT_ICON_CIRCLE_CHEVRON_DOWN, DropDownIcon.h * CUI::ms_FontmodHeight, TEXTALIGN_MR);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+	}
+	ColorRGBA ColorText(TextRender()->DefaultTextColor());
+	ColorRGBA ColorTextOutline(TextRender()->DefaultTextOutlineColor());
+	if(UIElement.Rect(0)->m_UITextContainer.Valid())
+		TextRender()->RenderTextContainer(UIElement.Rect(0)->m_UITextContainer, ColorText, ColorTextOutline);
+	return DoButtonLogic(pID, Props.m_Checked, pRect);
+}
+
+int CUI::DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pText, const CUIRect *pRect, float Size, int Align, float Padding, bool TransparentInactive, bool Enabled)
+{
+	if(!TransparentInactive || CheckActiveItem(pButtonContainer) || HotItem() == pButtonContainer)
+		pRect->Draw(Enabled ? ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * ButtonColorMul(pButtonContainer)) : ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 3.0f);
+
+	CUIRect Label;
+	pRect->Margin(Padding, &Label);
+	DoLabel(&Label, pText, Size, Align);
+
+	return Enabled ? DoButtonLogic(pButtonContainer, 0, pRect) : 0;
+}
+
+int64_t CUI::DoValueSelector(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
+{
+	return DoValueSelectorWithState(pID, pRect, pLabel, Current, Min, Max, Props).m_Value;
+}
+
+SEditResult<int64_t> CUI::DoValueSelectorWithState(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props)
+{
+	// logic
+	static float s_Value;
+	static CLineInputNumber s_NumberInput;
+	static const void *s_pLastTextID = pID;
+	const bool Inside = MouseInside(pRect);
+	static const void *s_pEditing = nullptr;
+	EEditState State = EEditState::NONE;
+
+	if(Inside)
+		SetHotItem(pID);
+
+	const int Base = Props.m_IsHex ? 16 : 10;
+
+	if(MouseButtonReleased(1) && HotItem() == pID)
+	{
+		s_pLastTextID = pID;
+		m_ValueSelectorTextMode = true;
+		s_NumberInput.SetInteger64(Current, Base, Props.m_HexPrefix);
+		s_NumberInput.SelectAll();
+	}
+
+	if(CheckActiveItem(pID))
+	{
+		if(!MouseButton(0))
+		{
+			DisableMouseLock();
+			SetActiveItem(nullptr);
+			m_ValueSelectorTextMode = false;
+		}
+	}
+
+	if(m_ValueSelectorTextMode && s_pLastTextID == pID)
+	{
+		DoEditBox(&s_NumberInput, pRect, 10.0f);
+		SetActiveItem(&s_NumberInput);
+
+		if(ConsumeHotkey(HOTKEY_ENTER) || ((MouseButtonClicked(1) || MouseButtonClicked(0)) && !Inside))
+		{
+			Current = clamp(s_NumberInput.GetInteger64(Base), Min, Max);
+			DisableMouseLock();
+			SetActiveItem(nullptr);
+			m_ValueSelectorTextMode = false;
+		}
+
+		if(ConsumeHotkey(HOTKEY_ESCAPE))
+		{
+			DisableMouseLock();
+			SetActiveItem(nullptr);
+			m_ValueSelectorTextMode = false;
+		}
+	}
+	else
+	{
+		if(CheckActiveItem(pID))
+		{
+			if(Props.m_UseScroll)
+			{
+				if(MouseButton(0))
+				{
+					s_Value += MouseDeltaX() * (Input()->ShiftIsPressed() ? 0.05f : 1.0f);
+
+					if(absolute(s_Value) > Props.m_Scale)
+					{
+						const int64_t Count = (int64_t)(s_Value / Props.m_Scale);
+						s_Value = std::fmod(s_Value, Props.m_Scale);
+						Current += Props.m_Step * Count;
+						Current = clamp(Current, Min, Max);
+
+						// Constrain to discrete steps
+						if(Count > 0)
+							Current = Current / Props.m_Step * Props.m_Step;
+						else
+							Current = std::ceil(Current / (float)Props.m_Step) * Props.m_Step;
+					}
+				}
+			}
+		}
+		else if(HotItem() == pID)
+		{
+			if(MouseButtonClicked(0))
+			{
+				s_Value = 0;
+				SetActiveItem(pID);
+				if(Props.m_UseScroll)
+					EnableMouseLock(pID);
+			}
+		}
+
+		// render
+		char aBuf[128];
+		if(pLabel[0] != '\0')
+		{
+			if(Props.m_IsHex)
+				str_format(aBuf, sizeof(aBuf), "%s #%0*" PRIX64, pLabel, Props.m_HexPrefix, Current);
+			else
+				str_format(aBuf, sizeof(aBuf), "%s %" PRId64, pLabel, Current);
+		}
+		else
+		{
+			if(Props.m_IsHex)
+				str_format(aBuf, sizeof(aBuf), "#%0*" PRIX64, Props.m_HexPrefix, Current);
+			else
+				str_format(aBuf, sizeof(aBuf), "%" PRId64, Current);
+		}
+		pRect->Draw(Props.m_Color, IGraphics::CORNER_ALL, 3.0f);
+		DoLabel(pRect, aBuf, 10.0f, TEXTALIGN_MC);
+	}
+
+	if(!m_ValueSelectorTextMode)
+		s_NumberInput.Clear();
+
+	if(s_pEditing == pID)
+		State = EEditState::EDITING;
+
+	bool MouseLocked = CheckMouseLock();
+	if((MouseLocked || m_ValueSelectorTextMode) && !s_pEditing)
+	{
+		State = EEditState::START;
+		s_pEditing = pID;
+	}
+
+	if(!CheckMouseLock() && !m_ValueSelectorTextMode && s_pEditing == pID)
+	{
+		State = EEditState::END;
+		s_pEditing = nullptr;
+	}
+
+	return SEditResult<int64_t>{State, Current};
+}
+
+float CUI::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current)
+{
+	Current = clamp(Current, 0.0f, 1.0f);
+
+	// layout
+	CUIRect Rail;
+	pRect->Margin(5.0f, &Rail);
+
+	CUIRect Handle;
+	Rail.HSplitTop(clamp(33.0f, Rail.w, Rail.h / 3.0f), &Handle, 0);
+	Handle.y = Rail.y + (Rail.h - Handle.h) * Current;
+
+	// logic
+	static float s_OffsetY;
+	const bool InsideRail = MouseHovered(&Rail);
+	const bool InsideHandle = MouseHovered(&Handle);
+	bool Grabbed = false; // whether to apply the offset
+
+	if(CheckActiveItem(pID))
+	{
+		if(MouseButton(0))
+		{
+			Grabbed = true;
+			if(Input()->ShiftIsPressed())
+				m_MouseSlow = true;
+		}
+		else
+		{
+			SetActiveItem(nullptr);
+		}
+	}
+	else if(HotItem() == pID)
+	{
+		if(MouseButton(0))
+		{
+			SetActiveItem(pID);
+			s_OffsetY = MouseY() - Handle.y;
+			Grabbed = true;
+		}
+	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pID);
+		s_OffsetY = Handle.h / 2.0f;
+		Grabbed = true;
+	}
+
+	if(InsideHandle)
+	{
+		SetHotItem(pID);
+	}
+
+	float ReturnValue = Current;
+	if(Grabbed)
+	{
+		const float Min = Rail.y;
+		const float Max = Rail.h - Handle.h;
+		const float Cur = MouseY() - s_OffsetY;
+		ReturnValue = clamp((Cur - Min) / Max, 0.0f, 1.0f);
+	}
+
+	// render
+	Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.w / 2.0f);
+	Handle.Draw(ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pID), HotItem() == pID), IGraphics::CORNER_ALL, Handle.w / 2.0f);
+
+	return ReturnValue;
+}
+
+float CUI::DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner)
+{
+	Current = clamp(Current, 0.0f, 1.0f);
+
+	// layout
+	CUIRect Rail;
+	if(pColorInner)
+		Rail = *pRect;
+	else
+		pRect->HMargin(5.0f, &Rail);
+
+	CUIRect Handle;
+	Rail.VSplitLeft(pColorInner ? 8.0f : clamp(33.0f, Rail.h, Rail.w / 3.0f), &Handle, 0);
+	Handle.x += (Rail.w - Handle.w) * Current;
+
+	// logic
+	static float s_OffsetX;
+	const bool InsideRail = MouseHovered(&Rail);
+	const bool InsideHandle = MouseHovered(&Handle);
+	bool Grabbed = false; // whether to apply the offset
+
+	if(CheckActiveItem(pID))
+	{
+		if(MouseButton(0))
+		{
+			Grabbed = true;
+			if(Input()->ShiftIsPressed())
+				m_MouseSlow = true;
+		}
+		else
+		{
+			SetActiveItem(nullptr);
+		}
+	}
+	else if(HotItem() == pID)
+	{
+		if(MouseButton(0))
+		{
+			SetActiveItem(pID);
+			s_OffsetX = MouseX() - Handle.x;
+			Grabbed = true;
+		}
+	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pID);
+		s_OffsetX = Handle.w / 2.0f;
+		Grabbed = true;
+	}
+
+	if(InsideHandle)
+	{
+		SetHotItem(pID);
+	}
+
+	float ReturnValue = Current;
+	if(Grabbed)
+	{
+		const float Min = Rail.x;
+		const float Max = Rail.w - Handle.w;
+		const float Cur = MouseX() - s_OffsetX;
+		ReturnValue = clamp((Cur - Min) / Max, 0.0f, 1.0f);
+	}
+
+	// render
+	if(pColorInner)
+	{
+		CUIRect Slider;
+		Handle.VMargin(-2.0f, &Slider);
+		Slider.HMargin(-3.0f, &Slider);
+		Slider.Draw(ColorRGBA(0.15f, 0.15f, 0.15f, 1.0f), IGraphics::CORNER_ALL, 5.0f);
+		Slider.Margin(2.0f, &Slider);
+		Slider.Draw(*pColorInner, IGraphics::CORNER_ALL, 3.0f);
+	}
+	else
+	{
+		Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.h / 2.0f);
+		Handle.Draw(ms_ScrollBarColorFunction.GetColor(CheckActiveItem(pID), HotItem() == pID), IGraphics::CORNER_ALL, Handle.h / 2.0f);
+	}
+
+	return ReturnValue;
+}
+
+void CUI::DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale, unsigned Flags, const char *pSuffix)
+{
+	const bool Infinite = Flags & CUI::SCROLLBAR_OPTION_INFINITE;
+	const bool NoClampValue = Flags & CUI::SCROLLBAR_OPTION_NOCLAMPVALUE;
+	const bool MultiLine = Flags & CUI::SCROLLBAR_OPTION_MULTILINE;
+
+	int Value = *pOption;
+	if(Infinite)
+	{
+		Max += 1;
+		if(Value == 0)
+			Value = Max;
+	}
+
+	char aBuf[256];
+	if(!Infinite || Value != Max)
+		str_format(aBuf, sizeof(aBuf), "%s: %i%s", pStr, Value, pSuffix);
+	else
+		str_format(aBuf, sizeof(aBuf), "%s: ∞", pStr);
+
+	if(NoClampValue)
+	{
+		// clamp the value internally for the scrollbar
+		Value = clamp(Value, Min, Max);
+	}
+
+	CUIRect Label, ScrollBar;
+	if(MultiLine)
+		pRect->HSplitMid(&Label, &ScrollBar);
+	else
+		pRect->VSplitMid(&Label, &ScrollBar, minimum(10.0f, pRect->w * 0.05f));
+
+	const float FontSize = Label.h * CUI::ms_FontmodHeight * 0.8f;
+	DoLabel(&Label, aBuf, FontSize, TEXTALIGN_ML);
+
+	Value = pScale->ToAbsolute(DoScrollbarH(pID, &ScrollBar, pScale->ToRelative(Value, Min, Max)), Min, Max);
+	if(NoClampValue && ((Value == Min && *pOption < Min) || (Value == Max && *pOption > Max)))
+	{
+		Value = *pOption; // use previous out of range value instead if the scrollbar is at the edge
+	}
+	else if(Infinite)
+	{
+		if(Value == Max)
+			Value = 0;
+	}
+
+	*pOption = Value;
+}
+
+void CUI::RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressSpinnerProperties &Props) const
+{
+	static float s_SpinnerOffset = 0.0f;
+	static float s_LastRender = Client()->LocalTime();
+	s_SpinnerOffset += (Client()->LocalTime() - s_LastRender) * 1.5f;
+	s_SpinnerOffset = std::fmod(s_SpinnerOffset, 1.0f);
+
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+
+	// The filled and unfilled segments need to begin at the same angle offset
+	// or the differences in pixel alignment will make the filled segments flicker.
+	const float SegmentsAngle = 2.0f * pi / Props.m_Segments;
+	const float InnerRadius = OuterRadius * 0.75f;
+	const float AngleOffset = -0.5f * pi;
+	Graphics()->SetColor(Props.m_Color.WithMultipliedAlpha(0.5f));
+	for(int i = 0; i < Props.m_Segments; ++i)
+	{
+		const float Angle1 = AngleOffset + i * SegmentsAngle;
+		const float Angle2 = AngleOffset + (i + 1) * SegmentsAngle;
+		IGraphics::CFreeformItem Item = IGraphics::CFreeformItem(
+			Center.x + std::cos(Angle1) * InnerRadius, Center.y + std::sin(Angle1) * InnerRadius,
+			Center.x + std::cos(Angle2) * InnerRadius, Center.y + std::sin(Angle2) * InnerRadius,
+			Center.x + std::cos(Angle1) * OuterRadius, Center.y + std::sin(Angle1) * OuterRadius,
+			Center.x + std::cos(Angle2) * OuterRadius, Center.y + std::sin(Angle2) * OuterRadius);
+		Graphics()->QuadsDrawFreeform(&Item, 1);
+	}
+
+	const float FilledRatio = Props.m_Progress < 0.0f ? 0.333f : Props.m_Progress;
+	const int FilledSegmentOffset = Props.m_Progress < 0.0f ? round_to_int(s_SpinnerOffset * Props.m_Segments) : 0;
+	const int FilledNumSegments = minimum<int>(Props.m_Segments * FilledRatio + (Props.m_Progress < 0.0f ? 0 : 1), Props.m_Segments);
+	Graphics()->SetColor(Props.m_Color);
+	for(int i = 0; i < FilledNumSegments; ++i)
+	{
+		const float Angle1 = AngleOffset + (i + FilledSegmentOffset) * SegmentsAngle;
+		const float Angle2 = AngleOffset + ((i + 1 == FilledNumSegments && Props.m_Progress >= 0.0f) ? (2.0f * pi * Props.m_Progress) : ((i + FilledSegmentOffset + 1) * SegmentsAngle));
+		IGraphics::CFreeformItem Item = IGraphics::CFreeformItem(
+			Center.x + std::cos(Angle1) * InnerRadius, Center.y + std::sin(Angle1) * InnerRadius,
+			Center.x + std::cos(Angle2) * InnerRadius, Center.y + std::sin(Angle2) * InnerRadius,
+			Center.x + std::cos(Angle1) * OuterRadius, Center.y + std::sin(Angle1) * OuterRadius,
+			Center.x + std::cos(Angle2) * OuterRadius, Center.y + std::sin(Angle2) * OuterRadius);
+		Graphics()->QuadsDrawFreeform(&Item, 1);
+	}
+
+	Graphics()->QuadsEnd();
+
+	s_LastRender = Client()->LocalTime();
+}
+
+void CUI::DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props)
+{
+	constexpr float Margin = SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN;
+	if(X + Width > Screen()->w - Margin)
+		X = maximum<float>(X - Width, Margin);
+	if(Y + Height > Screen()->h - Margin)
+		Y = maximum<float>(Y - Height, Margin);
+
+	m_vPopupMenus.emplace_back();
+	SPopupMenu *pNewMenu = &m_vPopupMenus.back();
+	pNewMenu->m_pID = pID;
+	pNewMenu->m_Props = Props;
+	pNewMenu->m_Rect.x = X;
+	pNewMenu->m_Rect.y = Y;
+	pNewMenu->m_Rect.w = Width;
+	pNewMenu->m_Rect.h = Height;
+	pNewMenu->m_pContext = pContext;
+	pNewMenu->m_pfnFunc = pfnFunc;
+}
+
+void CUI::RenderPopupMenus()
+{
+	for(size_t i = 0; i < m_vPopupMenus.size(); ++i)
+	{
+		const SPopupMenu &PopupMenu = m_vPopupMenus[i];
+		const bool Inside = MouseInside(&PopupMenu.m_Rect);
+		const bool Active = i == m_vPopupMenus.size() - 1;
+
+		if(Active)
+			SetHotItem(PopupMenu.m_pID);
+
+		if(CheckActiveItem(PopupMenu.m_pID))
+		{
+			if(!MouseButton(0))
+			{
+				if(!Inside)
+				{
+					ClosePopupMenu(PopupMenu.m_pID);
+				}
+				SetActiveItem(nullptr);
+			}
+		}
+		else if(HotItem() == PopupMenu.m_pID)
+		{
+			if(MouseButton(0))
+				SetActiveItem(PopupMenu.m_pID);
+		}
+
+		CUIRect PopupRect = PopupMenu.m_Rect;
+		PopupRect.Draw(PopupMenu.m_Props.m_BorderColor, PopupMenu.m_Props.m_Corners, 3.0f);
+		PopupRect.Margin(SPopupMenu::POPUP_BORDER, &PopupRect);
+		PopupRect.Draw(PopupMenu.m_Props.m_BackgroundColor, PopupMenu.m_Props.m_Corners, 3.0f);
+		PopupRect.Margin(SPopupMenu::POPUP_MARGIN, &PopupRect);
+
+		EPopupMenuFunctionResult Result = PopupMenu.m_pfnFunc(PopupMenu.m_pContext, PopupRect, Active);
+		if(Result != POPUP_KEEP_OPEN || (Active && ConsumeHotkey(HOTKEY_ESCAPE)))
+			ClosePopupMenu(PopupMenu.m_pID, Result == POPUP_CLOSE_CURRENT_AND_DESCENDANTS);
+	}
+}
+
+void CUI::ClosePopupMenu(const SPopupMenuId *pID, bool IncludeDescendants)
+{
+	auto PopupMenuToClose = std::find_if(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pID](const SPopupMenu PopupMenu) { return PopupMenu.m_pID == pID; });
+	if(PopupMenuToClose != m_vPopupMenus.end())
+	{
+		if(IncludeDescendants)
+			m_vPopupMenus.erase(PopupMenuToClose, m_vPopupMenus.end());
+		else
+			m_vPopupMenus.erase(PopupMenuToClose);
+		SetActiveItem(nullptr);
+		if(m_pfnPopupMenuClosedCallback)
+			m_pfnPopupMenuClosedCallback();
+	}
+}
+
+void CUI::ClosePopupMenus()
+{
+	if(m_vPopupMenus.empty())
+		return;
+
+	m_vPopupMenus.clear();
+	SetActiveItem(nullptr);
+	if(m_pfnPopupMenuClosedCallback)
+		m_pfnPopupMenuClosedCallback();
+}
+
+bool CUI::IsPopupOpen() const
+{
+	return !m_vPopupMenus.empty();
+}
+
+bool CUI::IsPopupOpen(const SPopupMenuId *pID) const
+{
+	return std::any_of(m_vPopupMenus.begin(), m_vPopupMenus.end(), [pID](const SPopupMenu PopupMenu) { return PopupMenu.m_pID == pID; });
+}
+
+bool CUI::IsPopupHovered() const
+{
+	return std::any_of(m_vPopupMenus.begin(), m_vPopupMenus.end(), [this](const SPopupMenu PopupMenu) { return MouseHovered(&PopupMenu.m_Rect); });
+}
+
+void CUI::SetPopupMenuClosedCallback(FPopupMenuClosedCallback pfnCallback)
+{
+	m_pfnPopupMenuClosedCallback = std::move(pfnCallback);
+}
+
+void CUI::SMessagePopupContext::DefaultColor(ITextRender *pTextRender)
+{
+	m_TextColor = pTextRender->DefaultTextColor();
+}
+
+void CUI::SMessagePopupContext::ErrorColor()
+{
+	m_TextColor = ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f);
+}
+
+CUI::EPopupMenuFunctionResult CUI::PopupMessage(void *pContext, CUIRect View, bool Active)
+{
+	SMessagePopupContext *pMessagePopup = static_cast<SMessagePopupContext *>(pContext);
+	CUI *pUI = pMessagePopup->m_pUI;
+
+	pUI->TextRender()->TextColor(pMessagePopup->m_TextColor);
+	pUI->TextRender()->Text(View.x, View.y, SMessagePopupContext::POPUP_FONT_SIZE, pMessagePopup->m_aMessage, View.w);
+	pUI->TextRender()->TextColor(pUI->TextRender()->DefaultTextColor());
+
+	return (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)) ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+}
+
+void CUI::ShowPopupMessage(float X, float Y, SMessagePopupContext *pContext)
+{
+	const float TextWidth = minimum(std::ceil(TextRender()->TextWidth(SMessagePopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, -1.0f) + 0.5f), SMessagePopupContext::POPUP_MAX_WIDTH);
+	float TextHeight = 0.0f;
+	STextSizeProperties TextSizeProps{};
+	TextSizeProps.m_pHeight = &TextHeight;
+	TextRender()->TextWidth(SMessagePopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, TextWidth, 0, TextSizeProps);
+	pContext->m_pUI = this;
+	DoPopupMenu(pContext, X, Y, TextWidth + 10.0f, TextHeight + 10.0f, pContext, PopupMessage);
+}
+
+CUI::SConfirmPopupContext::SConfirmPopupContext()
+{
+	Reset();
+}
+
+void CUI::SConfirmPopupContext::Reset()
+{
+	m_Result = SConfirmPopupContext::UNSET;
+}
+
+void CUI::SConfirmPopupContext::YesNoButtons()
+{
+	str_copy(m_aPositiveButtonLabel, Localize("Yes"));
+	str_copy(m_aNegativeButtonLabel, Localize("No"));
+}
+
+void CUI::ShowPopupConfirm(float X, float Y, SConfirmPopupContext *pContext)
+{
+	const float TextWidth = minimum(std::ceil(TextRender()->TextWidth(SConfirmPopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, -1.0f) + 0.5f), SConfirmPopupContext::POPUP_MAX_WIDTH);
+	float TextHeight = 0.0f;
+	STextSizeProperties TextSizeProps{};
+	TextSizeProps.m_pHeight = &TextHeight;
+	TextRender()->TextWidth(SConfirmPopupContext::POPUP_FONT_SIZE, pContext->m_aMessage, -1, TextWidth, 0, TextSizeProps);
+	const float PopupHeight = TextHeight + SConfirmPopupContext::POPUP_BUTTON_HEIGHT + SConfirmPopupContext::POPUP_BUTTON_SPACING + 10.0f;
+	pContext->m_pUI = this;
+	pContext->m_Result = SConfirmPopupContext::UNSET;
+	DoPopupMenu(pContext, X, Y, TextWidth + 10.0f, PopupHeight, pContext, PopupConfirm);
+}
+
+CUI::EPopupMenuFunctionResult CUI::PopupConfirm(void *pContext, CUIRect View, bool Active)
+{
+	SConfirmPopupContext *pConfirmPopup = static_cast<SConfirmPopupContext *>(pContext);
+	CUI *pUI = pConfirmPopup->m_pUI;
+
+	CUIRect Label, ButtonBar, CancelButton, ConfirmButton;
+	View.HSplitBottom(SConfirmPopupContext::POPUP_BUTTON_HEIGHT, &Label, &ButtonBar);
+	ButtonBar.VSplitMid(&CancelButton, &ConfirmButton, SConfirmPopupContext::POPUP_BUTTON_SPACING);
+
+	pUI->TextRender()->Text(Label.x, Label.y, SConfirmPopupContext::POPUP_FONT_SIZE, pConfirmPopup->m_aMessage, Label.w);
+
+	if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_CancelButton, pConfirmPopup->m_aNegativeButtonLabel, &CancelButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC))
+	{
+		pConfirmPopup->m_Result = SConfirmPopupContext::CANCELED;
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_ConfirmButton, pConfirmPopup->m_aPositiveButtonLabel, &ConfirmButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC) || (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)))
+	{
+		pConfirmPopup->m_Result = SConfirmPopupContext::CONFIRMED;
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::SSelectionPopupContext::SSelectionPopupContext()
+{
+	Reset();
+}
+
+void CUI::SSelectionPopupContext::Reset()
+{
+	m_Props = SPopupMenuProperties();
+	m_aMessage[0] = '\0';
+	m_pSelection = nullptr;
+	m_SelectionIndex = -1;
+	m_vEntries.clear();
+	m_vButtonContainers.clear();
+	m_EntryHeight = 12.0f;
+	m_EntryPadding = 0.0f;
+	m_EntrySpacing = 5.0f;
+	m_FontSize = 10.0f;
+	m_Width = 300.0f + (SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN) * 2;
+	m_AlignmentHeight = -1.0f;
+	m_TransparentButtons = false;
+}
+
+CUI::EPopupMenuFunctionResult CUI::PopupSelection(void *pContext, CUIRect View, bool Active)
+{
+	SSelectionPopupContext *pSelectionPopup = static_cast<SSelectionPopupContext *>(pContext);
+	CUI *pUI = pSelectionPopup->m_pUI;
+	CScrollRegion *pScrollRegion = pSelectionPopup->m_pScrollRegion;
+
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = SPopupMenu::POPUP_MARGIN;
+	ScrollParams.m_ScrollbarNoMarginRight = true;
+	ScrollParams.m_ScrollUnit = 3 * (pSelectionPopup->m_EntryHeight + pSelectionPopup->m_EntrySpacing);
+	pScrollRegion->Begin(&View, &ScrollOffset, &ScrollParams);
+	View.y += ScrollOffset.y;
+
+	CUIRect Slot;
+	if(pSelectionPopup->m_aMessage[0] != '\0')
+	{
+		const STextBoundingBox TextBoundingBox = pUI->TextRender()->TextBoundingBox(pSelectionPopup->m_FontSize, pSelectionPopup->m_aMessage, -1, pSelectionPopup->m_Width);
+		View.HSplitTop(TextBoundingBox.m_H, &Slot, &View);
+		if(pScrollRegion->AddRect(Slot))
+		{
+			pUI->TextRender()->Text(Slot.x, Slot.y, pSelectionPopup->m_FontSize, pSelectionPopup->m_aMessage, Slot.w);
+		}
+	}
+
+	pSelectionPopup->m_vButtonContainers.resize(pSelectionPopup->m_vEntries.size());
+
+	size_t Index = 0;
+	for(const auto &Entry : pSelectionPopup->m_vEntries)
+	{
+		if(pSelectionPopup->m_aMessage[0] != '\0' || Index != 0)
+			View.HSplitTop(pSelectionPopup->m_EntrySpacing, nullptr, &View);
+		View.HSplitTop(pSelectionPopup->m_EntryHeight, &Slot, &View);
+		if(pScrollRegion->AddRect(Slot))
+		{
+			if(pUI->DoButton_PopupMenu(&pSelectionPopup->m_vButtonContainers[Index], Entry.c_str(), &Slot, pSelectionPopup->m_FontSize, TEXTALIGN_ML, pSelectionPopup->m_EntryPadding, pSelectionPopup->m_TransparentButtons))
+			{
+				pSelectionPopup->m_pSelection = &Entry;
+				pSelectionPopup->m_SelectionIndex = Index;
+			}
+		}
+		++Index;
+	}
+
+	pScrollRegion->End();
+
+	return pSelectionPopup->m_pSelection == nullptr ? CUI::POPUP_KEEP_OPEN : CUI::POPUP_CLOSE_CURRENT;
+}
+
+void CUI::ShowPopupSelection(float X, float Y, SSelectionPopupContext *pContext)
+{
+	const STextBoundingBox TextBoundingBox = TextRender()->TextBoundingBox(pContext->m_FontSize, pContext->m_aMessage, -1, pContext->m_Width);
+	const float PopupHeight = minimum((pContext->m_aMessage[0] == '\0' ? -pContext->m_EntrySpacing : TextBoundingBox.m_H) + pContext->m_vEntries.size() * (pContext->m_EntryHeight + pContext->m_EntrySpacing) + (SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN) * 2 + CScrollRegion::HEIGHT_MAGIC_FIX, Screen()->h * 0.4f);
+	pContext->m_pUI = this;
+	pContext->m_pSelection = nullptr;
+	pContext->m_SelectionIndex = -1;
+	pContext->m_Props.m_Corners = IGraphics::CORNER_ALL;
+	if(pContext->m_AlignmentHeight >= 0.0f)
+	{
+		constexpr float Margin = SPopupMenu::POPUP_BORDER + SPopupMenu::POPUP_MARGIN;
+		if(X + pContext->m_Width > Screen()->w - Margin)
+		{
+			X = maximum<float>(X - pContext->m_Width, Margin);
+		}
+		if(Y + pContext->m_AlignmentHeight + PopupHeight > Screen()->h - Margin)
+		{
+			Y -= PopupHeight;
+			pContext->m_Props.m_Corners = IGraphics::CORNER_T;
+		}
+		else
+		{
+			Y += pContext->m_AlignmentHeight;
+			pContext->m_Props.m_Corners = IGraphics::CORNER_B;
+		}
+	}
+	DoPopupMenu(pContext, X, Y, pContext->m_Width, PopupHeight, pContext, PopupSelection, pContext->m_Props);
+}
+
+int CUI::DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Num, SDropDownState &State)
+{
+	if(!State.m_Init)
+	{
+		State.m_UiElement.Init(this, -1);
+		State.m_Init = true;
+	}
+
+	const auto LabelFunc = [CurSelection, pStrs]() {
+		return CurSelection > -1 ? pStrs[CurSelection] : "";
+	};
+
+	SMenuButtonProperties Props;
+	Props.m_HintRequiresStringCheck = true;
+	Props.m_HintCanChangePositionOrSize = true;
+	Props.m_ShowDropDownIcon = true;
+	if(IsPopupOpen(&State.m_SelectionPopupContext))
+		Props.m_Corners = IGraphics::CORNER_ALL & (~State.m_SelectionPopupContext.m_Props.m_Corners);
+	if(DoButton_Menu(State.m_UiElement, &State.m_ButtonContainer, LabelFunc, pRect, Props))
+	{
+		State.m_SelectionPopupContext.Reset();
+		State.m_SelectionPopupContext.m_Props.m_BorderColor = ColorRGBA(0.7f, 0.7f, 0.7f, 0.9f);
+		State.m_SelectionPopupContext.m_Props.m_BackgroundColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f);
+		for(int i = 0; i < Num; ++i)
+			State.m_SelectionPopupContext.m_vEntries.emplace_back(pStrs[i]);
+		State.m_SelectionPopupContext.m_EntryHeight = pRect->h;
+		State.m_SelectionPopupContext.m_EntryPadding = pRect->h >= 20.0f ? 2.0f : 1.0f;
+		State.m_SelectionPopupContext.m_FontSize = (State.m_SelectionPopupContext.m_EntryHeight - 2 * State.m_SelectionPopupContext.m_EntryPadding) * CUI::ms_FontmodHeight;
+		State.m_SelectionPopupContext.m_Width = pRect->w;
+		State.m_SelectionPopupContext.m_AlignmentHeight = pRect->h;
+		State.m_SelectionPopupContext.m_TransparentButtons = true;
+		ShowPopupSelection(pRect->x, pRect->y, &State.m_SelectionPopupContext);
+	}
+
+	if(State.m_SelectionPopupContext.m_SelectionIndex >= 0)
+	{
+		const int NewSelection = State.m_SelectionPopupContext.m_SelectionIndex;
+		State.m_SelectionPopupContext.Reset();
+		return NewSelection;
+	}
+
+	return CurSelection;
+}
+
+CUI::EPopupMenuFunctionResult CUI::PopupColorPicker(void *pContext, CUIRect View, bool Active)
+{
+	SColorPickerPopupContext *pColorPicker = static_cast<SColorPickerPopupContext *>(pContext);
+	CUI *pUI = pColorPicker->m_pUI;
+	pColorPicker->m_State = EEditState::NONE;
+
+	CUIRect ColorsArea, HueArea, BottomArea, ModeButtonArea, HueRect, SatRect, ValueRect, HexRect, AlphaRect;
+
+	View.HSplitTop(140.0f, &ColorsArea, &BottomArea);
+	ColorsArea.VSplitRight(20.0f, &ColorsArea, &HueArea);
+
+	BottomArea.HSplitTop(3.0f, nullptr, &BottomArea);
+	HueArea.VSplitLeft(3.0f, nullptr, &HueArea);
+
+	BottomArea.HSplitTop(20.0f, &HueRect, &BottomArea);
+	BottomArea.HSplitTop(3.0f, nullptr, &BottomArea);
+
+	constexpr float ValuePadding = 5.0f;
+	const float HsvValueWidth = (HueRect.w - ValuePadding * 2) / 3.0f;
+	const float HexValueWidth = HsvValueWidth * 2 + ValuePadding;
+
+	HueRect.VSplitLeft(HsvValueWidth, &HueRect, &SatRect);
+	SatRect.VSplitLeft(ValuePadding, nullptr, &SatRect);
+	SatRect.VSplitLeft(HsvValueWidth, &SatRect, &ValueRect);
+	ValueRect.VSplitLeft(ValuePadding, nullptr, &ValueRect);
+
+	BottomArea.HSplitTop(20.0f, &HexRect, &BottomArea);
+	BottomArea.HSplitTop(3.0f, nullptr, &BottomArea);
+	HexRect.VSplitLeft(HexValueWidth, &HexRect, &AlphaRect);
+	AlphaRect.VSplitLeft(ValuePadding, nullptr, &AlphaRect);
+	BottomArea.HSplitTop(20.0f, &ModeButtonArea, &BottomArea);
+
+	const ColorRGBA BlackColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f);
+
+	HueArea.Draw(BlackColor, IGraphics::CORNER_NONE, 0.0f);
+	HueArea.Margin(1.0f, &HueArea);
+
+	ColorsArea.Draw(BlackColor, IGraphics::CORNER_NONE, 0.0f);
+	ColorsArea.Margin(1.0f, &ColorsArea);
+
+	ColorHSVA PickerColorHSV = pColorPicker->m_HsvaColor;
+	ColorRGBA PickerColorRGB = pColorPicker->m_RgbaColor;
+	ColorHSLA PickerColorHSL = pColorPicker->m_HslaColor;
+
+	// Color Area
+	ColorRGBA TL, TR, BL, BR;
+	TL = BL = color_cast<ColorRGBA>(ColorHSVA(PickerColorHSV.x, 0.0f, 1.0f));
+	TR = BR = color_cast<ColorRGBA>(ColorHSVA(PickerColorHSV.x, 1.0f, 1.0f));
+	ColorsArea.Draw4(TL, TR, BL, BR, IGraphics::CORNER_NONE, 0.0f);
+
+	TL = TR = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+	BL = BR = ColorRGBA(0.0f, 0.0f, 0.0f, 1.0f);
+	ColorsArea.Draw4(TL, TR, BL, BR, IGraphics::CORNER_NONE, 0.0f);
+
+	// Hue Area
+	static const float s_aaColorIndices[7][3] = {
+		{1.0f, 0.0f, 0.0f}, // red
+		{1.0f, 0.0f, 1.0f}, // magenta
+		{0.0f, 0.0f, 1.0f}, // blue
+		{0.0f, 1.0f, 1.0f}, // cyan
+		{0.0f, 1.0f, 0.0f}, // green
+		{1.0f, 1.0f, 0.0f}, // yellow
+		{1.0f, 0.0f, 0.0f}, // red
+	};
+
+	const float HuePickerOffset = HueArea.h / 6.0f;
+	CUIRect HuePartialArea = HueArea;
+	HuePartialArea.h = HuePickerOffset;
+
+	for(size_t j = 0; j < std::size(s_aaColorIndices) - 1; j++)
+	{
+		TL = ColorRGBA(s_aaColorIndices[j][0], s_aaColorIndices[j][1], s_aaColorIndices[j][2], 1.0f);
+		BL = ColorRGBA(s_aaColorIndices[j + 1][0], s_aaColorIndices[j + 1][1], s_aaColorIndices[j + 1][2], 1.0f);
+
+		HuePartialArea.y = HueArea.y + HuePickerOffset * j;
+		HuePartialArea.Draw4(TL, TL, BL, BL, IGraphics::CORNER_NONE, 0.0f);
+	}
+
+	const auto &&RenderAlphaSelector = [&](unsigned OldA) -> SEditResult<int64_t> {
+		if(pColorPicker->m_Alpha)
+		{
+			return pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[3], &AlphaRect, "A:", OldA, 0, 255);
+		}
+		else
+		{
+			char aBuf[8];
+			str_format(aBuf, sizeof(aBuf), "A: %d", OldA);
+			pUI->DoLabel(&AlphaRect, aBuf, 10.0f, TEXTALIGN_MC);
+			AlphaRect.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.65f), IGraphics::CORNER_ALL, 3.0f);
+			return {EEditState::NONE, OldA};
+		}
+	};
+
+	// Editboxes Area
+	if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_HSVA)
+	{
+		const unsigned OldH = (unsigned)(PickerColorHSV.h * 255.0f);
+		const unsigned OldS = (unsigned)(PickerColorHSV.s * 255.0f);
+		const unsigned OldV = (unsigned)(PickerColorHSV.v * 255.0f);
+		const unsigned OldA = (unsigned)(PickerColorHSV.a * 255.0f);
+
+		const auto [StateH, H] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "H:", OldH, 0, 255);
+		const auto [StateS, S] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "S:", OldS, 0, 255);
+		const auto [StateV, V] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[2], &ValueRect, "V:", OldV, 0, 255);
+		const auto [StateA, A] = RenderAlphaSelector(OldA);
+
+		if(OldH != H || OldS != S || OldV != V || OldA != A)
+		{
+			PickerColorHSV = ColorHSVA(H / 255.0f, S / 255.0f, V / 255.0f, A / 255.0f);
+			PickerColorHSL = color_cast<ColorHSLA>(PickerColorHSV);
+			PickerColorRGB = color_cast<ColorRGBA>(PickerColorHSL);
+		}
+
+		for(auto State : {StateH, StateS, StateV, StateA})
+		{
+			if(State != EEditState::NONE)
+			{
+				pColorPicker->m_State = State;
+				break;
+			}
+		}
+	}
+	else if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_RGBA)
+	{
+		const unsigned OldR = (unsigned)(PickerColorRGB.r * 255.0f);
+		const unsigned OldG = (unsigned)(PickerColorRGB.g * 255.0f);
+		const unsigned OldB = (unsigned)(PickerColorRGB.b * 255.0f);
+		const unsigned OldA = (unsigned)(PickerColorRGB.a * 255.0f);
+
+		const auto [StateR, R] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "R:", OldR, 0, 255);
+		const auto [StateG, G] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "G:", OldG, 0, 255);
+		const auto [StateB, B] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[2], &ValueRect, "B:", OldB, 0, 255);
+		const auto [StateA, A] = RenderAlphaSelector(OldA);
+
+		if(OldR != R || OldG != G || OldB != B || OldA != A)
+		{
+			PickerColorRGB = ColorRGBA(R / 255.0f, G / 255.0f, B / 255.0f, A / 255.0f);
+			PickerColorHSL = color_cast<ColorHSLA>(PickerColorRGB);
+			PickerColorHSV = color_cast<ColorHSVA>(PickerColorHSL);
+		}
+
+		for(auto State : {StateR, StateG, StateB, StateA})
+		{
+			if(State != EEditState::NONE)
+			{
+				pColorPicker->m_State = State;
+				break;
+			}
+		}
+	}
+	else if(pColorPicker->m_ColorMode == SColorPickerPopupContext::MODE_HSLA)
+	{
+		const unsigned OldH = (unsigned)(PickerColorHSL.h * 255.0f);
+		const unsigned OldS = (unsigned)(PickerColorHSL.s * 255.0f);
+		const unsigned OldL = (unsigned)(PickerColorHSL.l * 255.0f);
+		const unsigned OldA = (unsigned)(PickerColorHSL.a * 255.0f);
+
+		const auto [StateH, H] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[0], &HueRect, "H:", OldH, 0, 255);
+		const auto [StateS, S] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[1], &SatRect, "S:", OldS, 0, 255);
+		const auto [StateL, L] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[2], &ValueRect, "L:", OldL, 0, 255);
+		const auto [StateA, A] = RenderAlphaSelector(OldA);
+
+		if(OldH != H || OldS != S || OldL != L || OldA != A)
+		{
+			PickerColorHSL = ColorHSLA(H / 255.0f, S / 255.0f, L / 255.0f, A / 255.0f);
+			PickerColorHSV = color_cast<ColorHSVA>(PickerColorHSL);
+			PickerColorRGB = color_cast<ColorRGBA>(PickerColorHSL);
+		}
+
+		for(auto State : {StateH, StateS, StateL, StateA})
+		{
+			if(State != EEditState::NONE)
+			{
+				pColorPicker->m_State = State;
+				break;
+			}
+		}
+	}
+	else
+	{
+		dbg_assert(false, "Color picker mode invalid");
+	}
+
+	SValueSelectorProperties Props;
+	Props.m_UseScroll = false;
+	Props.m_IsHex = true;
+	Props.m_HexPrefix = pColorPicker->m_Alpha ? 8 : 6;
+	const unsigned OldHex = PickerColorRGB.PackAlphaLast(pColorPicker->m_Alpha);
+	auto [HexState, Hex] = pUI->DoValueSelectorWithState(&pColorPicker->m_aValueSelectorIds[4], &HexRect, "Hex:", OldHex, 0, pColorPicker->m_Alpha ? 0xFFFFFFFFll : 0xFFFFFFll, Props);
+	if(OldHex != Hex)
+	{
+		const float OldAlpha = PickerColorRGB.a;
+		PickerColorRGB = ColorRGBA::UnpackAlphaLast<ColorRGBA>(Hex, pColorPicker->m_Alpha);
+		if(!pColorPicker->m_Alpha)
+			PickerColorRGB.a = OldAlpha;
+		PickerColorHSL = color_cast<ColorHSLA>(PickerColorRGB);
+		PickerColorHSV = color_cast<ColorHSVA>(PickerColorHSL);
+	}
+
+	if(HexState != EEditState::NONE)
+		pColorPicker->m_State = HexState;
+
+	// Logic
+	float PickerX, PickerY;
+	EEditState ColorPickerRes = pUI->DoPickerLogic(&pColorPicker->m_ColorPickerId, &ColorsArea, &PickerX, &PickerY);
+	if(ColorPickerRes != EEditState::NONE)
+	{
+		PickerColorHSV.y = PickerX / ColorsArea.w;
+		PickerColorHSV.z = 1.0f - PickerY / ColorsArea.h;
+		PickerColorHSL = color_cast<ColorHSLA>(PickerColorHSV);
+		PickerColorRGB = color_cast<ColorRGBA>(PickerColorHSL);
+		pColorPicker->m_State = ColorPickerRes;
+	}
+
+	EEditState HuePickerRes = pUI->DoPickerLogic(&pColorPicker->m_HuePickerId, &HueArea, &PickerX, &PickerY);
+	if(HuePickerRes != EEditState::NONE)
+	{
+		PickerColorHSV.x = 1.0f - PickerY / HueArea.h;
+		PickerColorHSL = color_cast<ColorHSLA>(PickerColorHSV);
+		PickerColorRGB = color_cast<ColorRGBA>(PickerColorHSL);
+		pColorPicker->m_State = HuePickerRes;
+	}
+
+	// Marker Color Area
+	const float MarkerX = ColorsArea.x + ColorsArea.w * PickerColorHSV.y;
+	const float MarkerY = ColorsArea.y + ColorsArea.h * (1.0f - PickerColorHSV.z);
+
+	const float MarkerOutlineInd = PickerColorHSV.z > 0.5f ? 0.0f : 1.0f;
+	const ColorRGBA MarkerOutline = ColorRGBA(MarkerOutlineInd, MarkerOutlineInd, MarkerOutlineInd, 1.0f);
+
+	pUI->Graphics()->TextureClear();
+	pUI->Graphics()->QuadsBegin();
+	pUI->Graphics()->SetColor(MarkerOutline);
+	pUI->Graphics()->DrawCircle(MarkerX, MarkerY, 4.5f, 32);
+	pUI->Graphics()->SetColor(PickerColorRGB);
+	pUI->Graphics()->DrawCircle(MarkerX, MarkerY, 3.5f, 32);
+	pUI->Graphics()->QuadsEnd();
+
+	// Marker Hue Area
+	CUIRect HueMarker;
+	HueArea.Margin(-2.5f, &HueMarker);
+	HueMarker.h = 6.5f;
+	HueMarker.y = (HueArea.y + HueArea.h * (1.0f - PickerColorHSV.x)) - HueMarker.h / 2.0f;
+
+	const ColorRGBA HueMarkerColor = color_cast<ColorRGBA>(ColorHSVA(PickerColorHSV.x, 1.0f, 1.0f, 1.0f));
+	const float HueMarkerOutlineColor = PickerColorHSV.x > 0.75f ? 1.0f : 0.0f;
+	const ColorRGBA HueMarkerOutline = ColorRGBA(HueMarkerOutlineColor, HueMarkerOutlineColor, HueMarkerOutlineColor, 1.0f);
+
+	HueMarker.Draw(HueMarkerOutline, IGraphics::CORNER_ALL, 1.2f);
+	HueMarker.Margin(1.2f, &HueMarker);
+	HueMarker.Draw(HueMarkerColor, IGraphics::CORNER_ALL, 1.2f);
+
+	pColorPicker->m_HsvaColor = PickerColorHSV;
+	pColorPicker->m_RgbaColor = PickerColorRGB;
+	pColorPicker->m_HslaColor = PickerColorHSL;
+	if(pColorPicker->m_pHslaColor != nullptr)
+		*pColorPicker->m_pHslaColor = PickerColorHSL.Pack(pColorPicker->m_Alpha);
+
+	static const SColorPickerPopupContext::EColorPickerMode s_aModes[] = {SColorPickerPopupContext::MODE_HSVA, SColorPickerPopupContext::MODE_RGBA, SColorPickerPopupContext::MODE_HSLA};
+	static const char *s_apModeLabels[std::size(s_aModes)] = {"HSVA", "RGBA", "HSLA"};
+	for(SColorPickerPopupContext::EColorPickerMode Mode : s_aModes)
+	{
+		CUIRect ModeButton;
+		ModeButtonArea.VSplitLeft(HsvValueWidth, &ModeButton, &ModeButtonArea);
+		ModeButtonArea.VSplitLeft(ValuePadding, nullptr, &ModeButtonArea);
+		if(pUI->DoButton_PopupMenu(&pColorPicker->m_aModeButtons[(int)Mode], s_apModeLabels[Mode], &ModeButton, 10.0f, TEXTALIGN_MC, 2.0f, false, pColorPicker->m_ColorMode != Mode))
+		{
+			pColorPicker->m_ColorMode = Mode;
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CUI::ShowPopupColorPicker(float X, float Y, SColorPickerPopupContext *pContext)
+{
+	pContext->m_pUI = this;
+	if(pContext->m_ColorMode == SColorPickerPopupContext::MODE_UNSET)
+		pContext->m_ColorMode = SColorPickerPopupContext::MODE_HSVA;
+	DoPopupMenu(pContext, X, Y, 160.0f + 10.0f, 209.0f + 10.0f, pContext, PopupColorPicker);
+}
diff --git a/src_bkp/game/client/ui.h b/src_bkp/game/client/ui.h
new file mode 100644
index 0000000000..60b336d215
--- /dev/null
+++ b/src_bkp/game/client/ui.h
@@ -0,0 +1,656 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_UI_H
+#define GAME_CLIENT_UI_H
+
+#include "lineinput.h"
+#include "ui_rect.h"
+
+#include <engine/input.h>
+#include <engine/textrender.h>
+
+#include <chrono>
+#include <set>
+#include <string>
+#include <vector>
+
+class IClient;
+class IGraphics;
+class IKernel;
+
+enum class EEditState
+{
+	NONE,
+	START,
+	EDITING,
+	END,
+	ONE_GO
+};
+
+template<typename T>
+struct SEditResult
+{
+	EEditState m_State;
+	T m_Value;
+};
+
+struct SUIAnimator
+{
+	bool m_Active;
+	bool m_ScaleLabel;
+	bool m_RepositionLabel;
+
+	std::chrono::nanoseconds m_Time;
+	float m_Value;
+
+	float m_XOffset;
+	float m_YOffset;
+	float m_WOffset;
+	float m_HOffset;
+};
+
+class IScrollbarScale
+{
+public:
+	virtual float ToRelative(int AbsoluteValue, int Min, int Max) const = 0;
+	virtual int ToAbsolute(float RelativeValue, int Min, int Max) const = 0;
+};
+class CLinearScrollbarScale : public IScrollbarScale
+{
+public:
+	float ToRelative(int AbsoluteValue, int Min, int Max) const override
+	{
+		return (AbsoluteValue - Min) / (float)(Max - Min);
+	}
+	int ToAbsolute(float RelativeValue, int Min, int Max) const override
+	{
+		return round_to_int(RelativeValue * (Max - Min) + Min + 0.1f);
+	}
+};
+class CLogarithmicScrollbarScale : public IScrollbarScale
+{
+private:
+	int m_MinAdjustment;
+
+public:
+	CLogarithmicScrollbarScale(int MinAdjustment)
+	{
+		m_MinAdjustment = maximum(MinAdjustment, 1); // must be at least 1 to support Min == 0 with logarithm
+	}
+	float ToRelative(int AbsoluteValue, int Min, int Max) const override
+	{
+		if(Min < m_MinAdjustment)
+		{
+			AbsoluteValue += m_MinAdjustment;
+			Min += m_MinAdjustment;
+			Max += m_MinAdjustment;
+		}
+		return (std::log(AbsoluteValue) - std::log(Min)) / (float)(std::log(Max) - std::log(Min));
+	}
+	int ToAbsolute(float RelativeValue, int Min, int Max) const override
+	{
+		int ResultAdjustment = 0;
+		if(Min < m_MinAdjustment)
+		{
+			Min += m_MinAdjustment;
+			Max += m_MinAdjustment;
+			ResultAdjustment = -m_MinAdjustment;
+		}
+		return round_to_int(std::exp(RelativeValue * (std::log(Max) - std::log(Min)) + std::log(Min))) + ResultAdjustment;
+	}
+};
+
+class IButtonColorFunction
+{
+public:
+	virtual ColorRGBA GetColor(bool Active, bool Hovered) const = 0;
+};
+class CDarkButtonColorFunction : public IButtonColorFunction
+{
+public:
+	ColorRGBA GetColor(bool Active, bool Hovered) const override
+	{
+		if(Active)
+			return ColorRGBA(0.15f, 0.15f, 0.15f, 0.25f);
+		else if(Hovered)
+			return ColorRGBA(0.5f, 0.5f, 0.5f, 0.25f);
+		return ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f);
+	}
+};
+class CLightButtonColorFunction : public IButtonColorFunction
+{
+public:
+	ColorRGBA GetColor(bool Active, bool Hovered) const override
+	{
+		if(Active)
+			return ColorRGBA(1.0f, 1.0f, 1.0f, 0.4f);
+		else if(Hovered)
+			return ColorRGBA(1.0f, 1.0f, 1.0f, 0.6f);
+		return ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f);
+	}
+};
+class CScrollBarColorFunction : public IButtonColorFunction
+{
+public:
+	ColorRGBA GetColor(bool Active, bool Hovered) const override
+	{
+		if(Active)
+			return ColorRGBA(0.9f, 0.9f, 0.9f, 1.0f);
+		else if(Hovered)
+			return ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		return ColorRGBA(0.8f, 0.8f, 0.8f, 1.0f);
+	}
+};
+
+class CUI;
+
+class CUIElement
+{
+	friend class CUI;
+
+	CUI *m_pUI;
+
+	CUIElement(CUI *pUI, int RequestedRectCount) { Init(pUI, RequestedRectCount); }
+
+public:
+	struct SUIElementRect
+	{
+		CUIElement *m_pParent;
+
+	public:
+		int m_UIRectQuadContainer;
+		STextContainerIndex m_UITextContainer;
+
+		float m_X;
+		float m_Y;
+		float m_Width;
+		float m_Height;
+		float m_Rounding;
+		int m_Corners;
+
+		std::string m_Text;
+		int m_ReadCursorGlyphCount;
+
+		CTextCursor m_Cursor;
+
+		ColorRGBA m_TextColor;
+		ColorRGBA m_TextOutlineColor;
+
+		SUIElementRect();
+
+		ColorRGBA m_QuadColor;
+
+		void Reset();
+		void Draw(const CUIRect *pRect, ColorRGBA Color, int Corners, float Rounding);
+	};
+
+protected:
+	CUI *UI() const { return m_pUI; }
+	std::vector<SUIElementRect> m_vUIRects;
+
+public:
+	CUIElement() = default;
+
+	void Init(CUI *pUI, int RequestedRectCount);
+
+	SUIElementRect *Rect(size_t Index)
+	{
+		return &m_vUIRects[Index];
+	}
+
+	bool AreRectsInit()
+	{
+		return !m_vUIRects.empty();
+	}
+
+	void InitRects(int RequestedRectCount);
+};
+
+struct SLabelProperties
+{
+	float m_MaxWidth = -1;
+	bool m_StopAtEnd = false;
+	bool m_EllipsisAtEnd = false;
+	bool m_EnableWidthCheck = true;
+};
+
+struct SMenuButtonProperties
+{
+	int m_Checked = 0;
+	bool m_HintRequiresStringCheck = false;
+	bool m_HintCanChangePositionOrSize = false;
+	bool m_UseIconFont = false;
+	bool m_ShowDropDownIcon = false;
+	int m_Corners = IGraphics::CORNER_ALL;
+	float m_Rounding = 5.0f;
+	float m_FontFactor = 0.0f;
+	ColorRGBA m_Color = ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f);
+};
+
+class CUIElementBase
+{
+private:
+	static CUI *s_pUI;
+
+public:
+	static void Init(CUI *pUI) { s_pUI = pUI; }
+
+	IClient *Client() const;
+	IGraphics *Graphics() const;
+	IInput *Input() const;
+	ITextRender *TextRender() const;
+	CUI *UI() const { return s_pUI; }
+};
+
+class CButtonContainer
+{
+};
+
+struct SValueSelectorProperties
+{
+	bool m_UseScroll = true;
+	int64_t m_Step = 1;
+	float m_Scale = 1.0f;
+	bool m_IsHex = false;
+	int m_HexPrefix = 6;
+	ColorRGBA m_Color = ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f);
+};
+
+struct SProgressSpinnerProperties
+{
+	float m_Progress = -1.0f; // between 0.0f and 1.0f, or negative for indeterminate progress
+	ColorRGBA m_Color = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+	int m_Segments = 64;
+};
+
+/**
+ * Type safe UI ID for popup menus.
+ */
+struct SPopupMenuId
+{
+};
+
+struct SPopupMenuProperties
+{
+	int m_Corners = IGraphics::CORNER_ALL;
+	ColorRGBA m_BorderColor = ColorRGBA(0.5f, 0.5f, 0.5f, 0.75f);
+	ColorRGBA m_BackgroundColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.75f);
+};
+
+class CUI
+{
+public:
+	/**
+	 * These enum values are returned by popup menu functions to specify the behavior.
+	 */
+	enum EPopupMenuFunctionResult
+	{
+		/**
+		 * The current popup menu will be kept open.
+		 */
+		POPUP_KEEP_OPEN = 0,
+
+		/**
+		 * The current popup menu will be closed.
+		 */
+		POPUP_CLOSE_CURRENT = 1,
+
+		/**
+		 * The current popup menu and all popup menus above it will be closed.
+		 */
+		POPUP_CLOSE_CURRENT_AND_DESCENDANTS = 2,
+	};
+
+	/**
+	 * Callback that draws a popup menu.
+	 *
+	 * @param pContext The context object of the popup menu.
+	 * @param View The UI rect where the popup menu's contents should be drawn.
+	 * @param Active Whether this popup is active (the top-most popup).
+	 * Only the active popup should handle key and mouse events.
+	 *
+	 * @return Value from the @link EPopupMenuFunctionResult @endlink enum.
+	 */
+	typedef EPopupMenuFunctionResult (*FPopupMenuFunction)(void *pContext, CUIRect View, bool Active);
+
+	/**
+	 * Callback that is called when one or more popups are closed.
+	 */
+	typedef std::function<void()> FPopupMenuClosedCallback;
+
+private:
+	bool m_Enabled;
+
+	const void *m_pHotItem;
+	const void *m_pActiveItem;
+	const void *m_pLastActiveItem; // only used internally to track active CLineInput
+	const void *m_pBecomingHotItem;
+	bool m_ActiveItemValid = false;
+
+	vec2 m_UpdatedMousePos = vec2(0.0f, 0.0f);
+	vec2 m_UpdatedMouseDelta = vec2(0.0f, 0.0f);
+	float m_MouseX, m_MouseY; // in gui space
+	float m_MouseDeltaX, m_MouseDeltaY; // in gui space
+	float m_MouseWorldX, m_MouseWorldY; // in world space
+	unsigned m_MouseButtons;
+	unsigned m_LastMouseButtons;
+	bool m_MouseSlow = false;
+	bool m_MouseLock = false;
+	const void *m_pMouseLockID = nullptr;
+
+	unsigned m_HotkeysPressed = 0;
+
+	CUIRect m_Screen;
+
+	std::vector<CUIRect> m_vClips;
+	void UpdateClipping();
+
+	bool m_ValueSelectorTextMode = false;
+
+	struct SPopupMenu
+	{
+		static constexpr float POPUP_BORDER = 1.0f;
+		static constexpr float POPUP_MARGIN = 4.0f;
+
+		const SPopupMenuId *m_pID;
+		SPopupMenuProperties m_Props;
+		CUIRect m_Rect;
+		void *m_pContext;
+		FPopupMenuFunction m_pfnFunc;
+	};
+	std::vector<SPopupMenu> m_vPopupMenus;
+	FPopupMenuClosedCallback m_pfnPopupMenuClosedCallback = nullptr;
+
+	static CUI::EPopupMenuFunctionResult PopupMessage(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupConfirm(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSelection(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupColorPicker(void *pContext, CUIRect View, bool Active);
+
+	IClient *m_pClient;
+	IGraphics *m_pGraphics;
+	IInput *m_pInput;
+	ITextRender *m_pTextRender;
+
+	std::vector<CUIElement *> m_vpOwnUIElements; // ui elements maintained by CUI class
+	std::vector<CUIElement *> m_vpUIElements;
+
+public:
+	static const CLinearScrollbarScale ms_LinearScrollbarScale;
+	static const CLogarithmicScrollbarScale ms_LogarithmicScrollbarScale;
+	static const CDarkButtonColorFunction ms_DarkButtonColorFunction;
+	static const CLightButtonColorFunction ms_LightButtonColorFunction;
+	static const CScrollBarColorFunction ms_ScrollBarColorFunction;
+
+	static const float ms_FontmodHeight;
+
+	void Init(IKernel *pKernel);
+	IClient *Client() const { return m_pClient; }
+	IGraphics *Graphics() const { return m_pGraphics; }
+	IInput *Input() const { return m_pInput; }
+	ITextRender *TextRender() const { return m_pTextRender; }
+
+	CUI();
+	~CUI();
+
+	enum EHotkey : unsigned
+	{
+		HOTKEY_ENTER = 1 << 0,
+		HOTKEY_ESCAPE = 1 << 1,
+		HOTKEY_UP = 1 << 2,
+		HOTKEY_DOWN = 1 << 3,
+		HOTKEY_DELETE = 1 << 4,
+		HOTKEY_TAB = 1 << 5,
+		HOTKEY_SCROLL_UP = 1 << 6,
+		HOTKEY_SCROLL_DOWN = 1 << 7,
+		HOTKEY_PAGE_UP = 1 << 8,
+		HOTKEY_PAGE_DOWN = 1 << 9,
+		HOTKEY_HOME = 1 << 10,
+		HOTKEY_END = 1 << 11,
+	};
+
+	void ResetUIElement(CUIElement &UIElement) const;
+
+	CUIElement *GetNewUIElement(int RequestedRectCount);
+
+	void AddUIElement(CUIElement *pElement);
+	void OnElementsReset();
+	void OnWindowResize();
+	void OnCursorMove(float X, float Y);
+
+	void SetEnabled(bool Enabled) { m_Enabled = Enabled; }
+	bool Enabled() const { return m_Enabled; }
+	void Update();
+	void Update(float MouseX, float MouseY, float MouseDeltaX, float MouseDeltaY, float MouseWorldX, float MouseWorldY);
+	void DebugRender();
+
+	float MouseDeltaX() const { return m_MouseDeltaX; }
+	float MouseDeltaY() const { return m_MouseDeltaY; }
+	float MouseX() const { return m_MouseX; }
+	float MouseY() const { return m_MouseY; }
+	vec2 MousePos() const { return vec2(m_MouseX, m_MouseY); }
+	float MouseWorldX() const { return m_MouseWorldX; }
+	float MouseWorldY() const { return m_MouseWorldY; }
+	int MouseButton(int Index) const { return (m_MouseButtons >> Index) & 1; }
+	int MouseButtonClicked(int Index) const { return MouseButton(Index) && !((m_LastMouseButtons >> Index) & 1); }
+	int MouseButtonReleased(int Index) const { return ((m_LastMouseButtons >> Index) & 1) && !MouseButton(Index); }
+	bool CheckMouseLock()
+	{
+		if(m_MouseLock && ActiveItem() != m_pMouseLockID)
+			DisableMouseLock();
+		return m_MouseLock;
+	}
+	void EnableMouseLock(const void *pID)
+	{
+		m_MouseLock = true;
+		m_pMouseLockID = pID;
+	}
+	void DisableMouseLock() { m_MouseLock = false; }
+
+	void SetHotItem(const void *pID) { m_pBecomingHotItem = pID; }
+	void SetActiveItem(const void *pID)
+	{
+		m_ActiveItemValid = true;
+		m_pActiveItem = pID;
+		if(pID)
+			m_pLastActiveItem = pID;
+	}
+	bool CheckActiveItem(const void *pID)
+	{
+		if(m_pActiveItem == pID)
+		{
+			m_ActiveItemValid = true;
+			return true;
+		}
+		return false;
+	}
+	const void *HotItem() const { return m_pHotItem; }
+	const void *NextHotItem() const { return m_pBecomingHotItem; }
+	const void *ActiveItem() const { return m_pActiveItem; }
+
+	void StartCheck() { m_ActiveItemValid = false; }
+	void FinishCheck()
+	{
+		if(!m_ActiveItemValid && m_pActiveItem != nullptr)
+		{
+			SetActiveItem(nullptr);
+			m_pHotItem = nullptr;
+			m_pBecomingHotItem = nullptr;
+		}
+	}
+
+	bool MouseInside(const CUIRect *pRect) const;
+	bool MouseInsideClip() const { return !IsClipped() || MouseInside(ClipArea()); }
+	bool MouseHovered(const CUIRect *pRect) const { return MouseInside(pRect) && MouseInsideClip(); }
+	void ConvertMouseMove(float *pX, float *pY, IInput::ECursorType CursorType) const;
+	void ResetMouseSlow() { m_MouseSlow = false; }
+
+	bool ConsumeHotkey(EHotkey Hotkey);
+	void ClearHotkeys() { m_HotkeysPressed = 0; }
+	bool OnInput(const IInput::CEvent &Event);
+
+	constexpr float ButtonColorMulActive() const { return 0.5f; }
+	constexpr float ButtonColorMulHot() const { return 1.5f; }
+	constexpr float ButtonColorMulDefault() const { return 1.0f; }
+	float ButtonColorMul(const void *pID);
+
+	const CUIRect *Screen();
+	void MapScreen();
+	float PixelSize();
+
+	void ClipEnable(const CUIRect *pRect);
+	void ClipDisable();
+	const CUIRect *ClipArea() const;
+	inline bool IsClipped() const { return !m_vClips.empty(); }
+
+	int DoButtonLogic(const void *pID, int Checked, const CUIRect *pRect);
+	int DoDraggableButtonLogic(const void *pID, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted);
+	EEditState DoPickerLogic(const void *pID, const CUIRect *pRect, float *pX, float *pY);
+	void DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp = false, float ScrollSpeed = 10.0f) const;
+	static vec2 CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight = nullptr);
+
+
+	void DoLabel(const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}) const;
+
+	void DoLabel(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}, int StrLen = -1, const CTextCursor *pReadCursor = nullptr) const;
+	void DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, const SLabelProperties &LabelProps = {}, int StrLen = -1, const CTextCursor *pReadCursor = nullptr) const;
+
+	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL);
+	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL);
+
+	int DoButton_Menu(CUIElement &UIElement, const CButtonContainer *pID, const std::function<const char *()> &GetTextLambda, const CUIRect *pRect, const SMenuButtonProperties &Props = {});
+	// only used for popup menus
+	int DoButton_PopupMenu(CButtonContainer *pButtonContainer, const char *pText, const CUIRect *pRect, float Size, int Align, float Padding = 0.0f, bool TransparentInactive = false, bool Enabled = true);
+
+	// value selector
+	SEditResult<int64_t> DoValueSelectorWithState(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
+	int64_t DoValueSelector(const void *pID, const CUIRect *pRect, const char *pLabel, int64_t Current, int64_t Min, int64_t Max, const SValueSelectorProperties &Props = {});
+	bool IsValueSelectorTextMode() const { return m_ValueSelectorTextMode; }
+	void SetValueSelectorTextMode(bool TextMode) { m_ValueSelectorTextMode = TextMode; }
+
+	// scrollbars
+	enum
+	{
+		SCROLLBAR_OPTION_INFINITE = 1 << 0,
+		SCROLLBAR_OPTION_NOCLAMPVALUE = 1 << 1,
+		SCROLLBAR_OPTION_MULTILINE = 1 << 2,
+	};
+	float DoScrollbarV(const void *pID, const CUIRect *pRect, float Current);
+	float DoScrollbarH(const void *pID, const CUIRect *pRect, float Current, const ColorRGBA *pColorInner = nullptr);
+	void DoScrollbarOption(const void *pID, int *pOption, const CUIRect *pRect, const char *pStr, int Min, int Max, const IScrollbarScale *pScale = &ms_LinearScrollbarScale, unsigned Flags = 0u, const char *pSuffix = "");
+
+	// progress spinner
+	void RenderProgressSpinner(vec2 Center, float OuterRadius, const SProgressSpinnerProperties &Props = {}) const;
+
+	// popup menu
+	void DoPopupMenu(const SPopupMenuId *pID, int X, int Y, int Width, int Height, void *pContext, FPopupMenuFunction pfnFunc, const SPopupMenuProperties &Props = {});
+	void RenderPopupMenus();
+	void ClosePopupMenu(const SPopupMenuId *pID, bool IncludeDescendants = false);
+	void ClosePopupMenus();
+	bool IsPopupOpen() const;
+	bool IsPopupOpen(const SPopupMenuId *pID) const;
+	bool IsPopupHovered() const;
+	void SetPopupMenuClosedCallback(FPopupMenuClosedCallback pfnCallback);
+
+	struct SMessagePopupContext : public SPopupMenuId
+	{
+		static constexpr float POPUP_MAX_WIDTH = 200.0f;
+		static constexpr float POPUP_FONT_SIZE = 10.0f;
+
+		CUI *m_pUI; // set by CUI when popup is shown
+		char m_aMessage[1024];
+		ColorRGBA m_TextColor;
+
+		void DefaultColor(class ITextRender *pTextRender);
+		void ErrorColor();
+	};
+	void ShowPopupMessage(float X, float Y, SMessagePopupContext *pContext);
+
+	struct SConfirmPopupContext : public SPopupMenuId
+	{
+		enum EConfirmationResult
+		{
+			UNSET = 0,
+			CONFIRMED,
+			CANCELED,
+		};
+		static constexpr float POPUP_MAX_WIDTH = 200.0f;
+		static constexpr float POPUP_FONT_SIZE = 10.0f;
+		static constexpr float POPUP_BUTTON_HEIGHT = 12.0f;
+		static constexpr float POPUP_BUTTON_SPACING = 5.0f;
+
+		CUI *m_pUI; // set by CUI when popup is shown
+		char m_aPositiveButtonLabel[128];
+		char m_aNegativeButtonLabel[128];
+		char m_aMessage[1024];
+		EConfirmationResult m_Result;
+
+		CButtonContainer m_CancelButton;
+		CButtonContainer m_ConfirmButton;
+
+		SConfirmPopupContext();
+		void Reset();
+		void YesNoButtons();
+	};
+	void ShowPopupConfirm(float X, float Y, SConfirmPopupContext *pContext);
+
+	struct SSelectionPopupContext : public SPopupMenuId
+	{
+		CUI *m_pUI; // set by CUI when popup is shown
+		class CScrollRegion *m_pScrollRegion;
+		SPopupMenuProperties m_Props;
+		char m_aMessage[256];
+		std::vector<std::string> m_vEntries;
+		std::vector<CButtonContainer> m_vButtonContainers;
+		const std::string *m_pSelection;
+		int m_SelectionIndex;
+		float m_EntryHeight;
+		float m_EntryPadding;
+		float m_EntrySpacing;
+		float m_FontSize;
+		float m_Width;
+		float m_AlignmentHeight;
+		bool m_TransparentButtons;
+
+		SSelectionPopupContext();
+		void Reset();
+	};
+	void ShowPopupSelection(float X, float Y, SSelectionPopupContext *pContext);
+
+	struct SColorPickerPopupContext : public SPopupMenuId
+	{
+		enum EColorPickerMode
+		{
+			MODE_UNSET = -1,
+			MODE_HSVA,
+			MODE_RGBA,
+			MODE_HSLA,
+		};
+
+		CUI *m_pUI; // set by CUI when popup is shown
+		EColorPickerMode m_ColorMode = MODE_UNSET;
+		bool m_Alpha = false;
+		unsigned int *m_pHslaColor = nullptr; // may be nullptr
+		ColorHSVA m_HsvaColor;
+		ColorRGBA m_RgbaColor;
+		ColorHSLA m_HslaColor;
+		// UI element IDs
+		const char m_HuePickerId = 0;
+		const char m_ColorPickerId = 0;
+		const char m_aValueSelectorIds[5] = {0};
+		CButtonContainer m_aModeButtons[(int)MODE_HSLA + 1];
+		EEditState m_State;
+	};
+	void ShowPopupColorPicker(float X, float Y, SColorPickerPopupContext *pContext);
+
+	// dropdown menu
+	struct SDropDownState
+	{
+		SSelectionPopupContext m_SelectionPopupContext;
+		CUIElement m_UiElement;
+		CButtonContainer m_ButtonContainer;
+		bool m_Init = false;
+	};
+	int DoDropDown(CUIRect *pRect, int CurSelection, const char **pStrs, int Num, SDropDownState &State);
+};
+
+#endif
diff --git a/src_bkp/game/client/ui_listbox.cpp b/src_bkp/game/client/ui_listbox.cpp
new file mode 100644
index 0000000000..14cd6e65e6
--- /dev/null
+++ b/src_bkp/game/client/ui_listbox.cpp
@@ -0,0 +1,220 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+#include <base/vmath.h>
+
+#include <engine/config.h>
+#include <engine/shared/config.h>
+
+#include <game/localization.h>
+
+#include "ui_listbox.h"
+
+CListBox::CListBox()
+{
+	m_ScrollOffset = vec2(0.0f, 0.0f);
+	m_ListBoxUpdateScroll = false;
+	m_ScrollbarWidth = 20.0f;
+	m_ScrollbarMargin = 5.0f;
+	m_HasHeader = false;
+	m_AutoSpacing = 0.0f;
+	m_ScrollbarShown = false;
+	m_Active = true;
+}
+
+void CListBox::DoBegin(const CUIRect *pRect)
+{
+	// setup the variables
+	m_ListBoxView = *pRect;
+}
+
+void CListBox::DoHeader(const CUIRect *pRect, const char *pTitle, float HeaderHeight, float Spacing)
+{
+	CUIRect View = *pRect;
+	CUIRect Header;
+
+	// background
+	View.HSplitTop(HeaderHeight + Spacing, &Header, 0);
+	Header.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), m_BackgroundCorners & IGraphics::CORNER_T, 5.0f);
+
+	// draw header
+	View.HSplitTop(HeaderHeight, &Header, &View);
+	UI()->DoLabel(&Header, pTitle, Header.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+
+	View.HSplitTop(Spacing, &Header, &View);
+
+	// setup the variables
+	m_ListBoxView = View;
+	m_HasHeader = true;
+}
+
+void CListBox::DoSpacing(float Spacing)
+{
+	CUIRect View = m_ListBoxView;
+	View.HSplitTop(Spacing, 0, &View);
+	m_ListBoxView = View;
+}
+
+void CListBox::DoFooter(const char *pBottomText, float FooterHeight)
+{
+	m_pBottomText = pBottomText;
+	m_FooterHeight = FooterHeight;
+}
+
+void CListBox::DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsPerScroll, int SelectedIndex, const CUIRect *pRect, bool Background, int BackgroundCorners, bool ForceShowScrollbar)
+{
+	CUIRect View;
+	if(pRect)
+		View = *pRect;
+	else
+		View = m_ListBoxView;
+
+	// background
+	m_BackgroundCorners = BackgroundCorners;
+	if(Background)
+		View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.15f), m_BackgroundCorners & (m_HasHeader ? IGraphics::CORNER_B : IGraphics::CORNER_ALL), 5.0f);
+
+	// draw footers
+	if(m_pBottomText)
+	{
+		CUIRect Footer;
+		View.HSplitBottom(m_FooterHeight, &View, &Footer);
+		Footer.VSplitLeft(10.0f, 0, &Footer);
+		UI()->DoLabel(&Footer, m_pBottomText, Footer.h * CUI::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+	}
+
+	// setup the variables
+	m_ListBoxView = View;
+	m_RowView = {};
+	m_ListBoxSelectedIndex = SelectedIndex;
+	m_ListBoxNewSelected = SelectedIndex;
+	m_ListBoxNewSelOffset = 0;
+	m_ListBoxItemIndex = 0;
+	m_ListBoxRowHeight = RowHeight;
+	m_ListBoxNumItems = NumItems;
+	m_ListBoxItemsPerRow = ItemsPerRow;
+	m_ListBoxDoneEvents = false;
+	m_ListBoxItemActivated = false;
+	m_ListBoxItemSelected = false;
+
+	// handle input
+	if(m_Active && !Input()->ModifierIsPressed() && !Input()->ShiftIsPressed() && !Input()->AltIsPressed())
+	{
+		if(UI()->ConsumeHotkey(CUI::HOTKEY_DOWN))
+			m_ListBoxNewSelOffset += 1;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_UP))
+			m_ListBoxNewSelOffset -= 1;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_PAGE_UP))
+			m_ListBoxNewSelOffset = -ItemsPerRow * RowsPerScroll * 4;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_PAGE_DOWN))
+			m_ListBoxNewSelOffset = ItemsPerRow * RowsPerScroll * 4;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_HOME))
+			m_ListBoxNewSelOffset = 1 - m_ListBoxNumItems;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_END))
+			m_ListBoxNewSelOffset = m_ListBoxNumItems - 1;
+	}
+
+	// setup the scrollbar
+	m_ScrollOffset = vec2(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_Active = m_Active;
+	ScrollParams.m_ScrollbarWidth = ScrollbarWidthMax();
+	ScrollParams.m_ScrollbarMargin = ScrollbarMargin();
+	ScrollParams.m_ScrollUnit = (m_ListBoxRowHeight + m_AutoSpacing) * RowsPerScroll;
+	ScrollParams.m_Flags = ForceShowScrollbar ? CScrollRegionParams::FLAG_CONTENT_STATIC_WIDTH : 0;
+	m_ScrollRegion.Begin(&m_ListBoxView, &m_ScrollOffset, &ScrollParams);
+	m_ListBoxView.y += m_ScrollOffset.y;
+}
+
+CListboxItem CListBox::DoNextRow()
+{
+	CListboxItem Item = {};
+
+	if(m_ListBoxItemIndex % m_ListBoxItemsPerRow == 0)
+		m_ListBoxView.HSplitTop(m_ListBoxRowHeight, &m_RowView, &m_ListBoxView);
+	m_ScrollRegion.AddRect(m_RowView);
+	if(m_ListBoxUpdateScroll && m_ListBoxSelectedIndex == m_ListBoxItemIndex)
+	{
+		m_ScrollRegion.ScrollHere(CScrollRegion::SCROLLHERE_KEEP_IN_VIEW);
+		m_ListBoxUpdateScroll = false;
+	}
+
+	m_RowView.VSplitLeft(m_RowView.w / (m_ListBoxItemsPerRow - m_ListBoxItemIndex % m_ListBoxItemsPerRow), &Item.m_Rect, &m_RowView);
+
+	Item.m_Selected = m_ListBoxSelectedIndex == m_ListBoxItemIndex;
+	Item.m_Visible = !m_ScrollRegion.RectClipped(Item.m_Rect);
+
+	m_ListBoxItemIndex++;
+	return Item;
+}
+
+CListboxItem CListBox::DoNextItem(const void *pId, bool Selected)
+{
+	if(m_AutoSpacing > 0.0f && m_ListBoxItemIndex > 0)
+		DoSpacing(m_AutoSpacing);
+
+	const int ThisItemIndex = m_ListBoxItemIndex;
+	if(Selected)
+	{
+		if(m_ListBoxSelectedIndex == m_ListBoxNewSelected)
+			m_ListBoxNewSelected = ThisItemIndex;
+		m_ListBoxSelectedIndex = ThisItemIndex;
+	}
+
+	CListboxItem Item = DoNextRow();
+	bool ItemClicked = false;
+
+	if(Item.m_Visible && UI()->DoButtonLogic(pId, 0, &Item.m_Rect))
+	{
+		ItemClicked = true;
+		m_ListBoxNewSelected = ThisItemIndex;
+		m_ListBoxItemSelected = true;
+		m_Active = true;
+	}
+	else
+		ItemClicked = false;
+
+	// process input, regard selected index
+	if(m_ListBoxSelectedIndex == ThisItemIndex)
+	{
+		if(m_Active && !m_ListBoxDoneEvents)
+		{
+			m_ListBoxDoneEvents = true;
+
+			if(UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || (ItemClicked && Input()->MouseDoubleClick()))
+			{
+				m_ListBoxItemActivated = true;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+
+		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, m_Active ? 0.5f : 0.33f), IGraphics::CORNER_ALL, 5.0f);
+	}
+	if(UI()->HotItem() == pId && !m_ScrollRegion.Animating())
+	{
+		Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.33f), IGraphics::CORNER_ALL, 5.0f);
+	}
+
+	return Item;
+}
+
+CListboxItem CListBox::DoSubheader()
+{
+	CListboxItem Item = DoNextRow();
+	Item.m_Rect.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.2f), IGraphics::CORNER_NONE, 0.0f);
+	return Item;
+}
+
+int CListBox::DoEnd()
+{
+	m_ScrollRegion.End();
+	m_Active |= m_ScrollRegion.Params().m_Active;
+
+	m_ScrollbarShown = m_ScrollRegion.ScrollbarShown();
+	if(m_ListBoxNewSelOffset != 0 && m_ListBoxNumItems > 0 && m_ListBoxSelectedIndex == m_ListBoxNewSelected)
+	{
+		m_ListBoxNewSelected = clamp((m_ListBoxNewSelected == -1 ? 0 : m_ListBoxNewSelected) + m_ListBoxNewSelOffset, 0, m_ListBoxNumItems - 1);
+		ScrollToSelected();
+	}
+	return m_ListBoxNewSelected;
+}
diff --git a/src_bkp/game/client/ui_listbox.h b/src_bkp/game/client/ui_listbox.h
new file mode 100644
index 0000000000..1e2b9af379
--- /dev/null
+++ b/src_bkp/game/client/ui_listbox.h
@@ -0,0 +1,76 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_UI_LISTBOX_H
+#define GAME_CLIENT_UI_LISTBOX_H
+
+#include "ui_scrollregion.h"
+
+struct CListboxItem
+{
+	bool m_Visible;
+	bool m_Selected;
+	CUIRect m_Rect;
+};
+
+// Instances of CListBox must be static, as member addresses are used as UI item IDs
+class CListBox : private CUIElementBase
+{
+private:
+	CUIRect m_ListBoxView;
+	CUIRect m_RowView;
+	float m_ListBoxRowHeight;
+	int m_ListBoxItemIndex;
+	int m_ListBoxSelectedIndex;
+	int m_ListBoxNewSelected;
+	int m_ListBoxNewSelOffset;
+	bool m_ListBoxUpdateScroll;
+	bool m_ListBoxDoneEvents;
+	int m_ListBoxNumItems;
+	int m_ListBoxItemsPerRow;
+	bool m_ListBoxItemSelected;
+	bool m_ListBoxItemActivated;
+	bool m_ScrollbarShown;
+	const char *m_pBottomText;
+	float m_FooterHeight;
+	float m_AutoSpacing;
+	CScrollRegion m_ScrollRegion;
+	vec2 m_ScrollOffset;
+	int m_BackgroundCorners;
+	float m_ScrollbarWidth;
+	float m_ScrollbarMargin;
+	bool m_HasHeader;
+	bool m_Active;
+
+protected:
+	CListboxItem DoNextRow();
+
+public:
+	CListBox();
+
+	void DoBegin(const CUIRect *pRect);
+	void DoHeader(const CUIRect *pRect, const char *pTitle, float HeaderHeight = 20.0f, float Spacing = 2.0f);
+	void DoAutoSpacing(float Spacing = 20.0f) { m_AutoSpacing = Spacing; }
+	void DoSpacing(float Spacing = 20.0f);
+	void DoFooter(const char *pBottomText, float FooterHeight = 20.0f); // call before DoStart to create a footer
+	void DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsPerScroll, int SelectedIndex, const CUIRect *pRect = nullptr, bool Background = true, int BackgroundCorners = IGraphics::CORNER_ALL, bool ForceShowScrollbar = false);
+	void ScrollToSelected() { m_ListBoxUpdateScroll = true; }
+	CListboxItem DoNextItem(const void *pID, bool Selected = false);
+	CListboxItem DoSubheader();
+	int DoEnd();
+
+	// Active state must be set before calling DoStart.
+	bool Active() const { return m_Active; }
+	void SetActive(bool Active) { m_Active = Active; }
+
+	bool WasItemSelected() const { return m_ListBoxItemSelected; }
+	bool WasItemActivated() const { return m_ListBoxItemActivated; }
+
+	bool ScrollbarShown() const { return m_ScrollbarShown; }
+	float ScrollbarWidth() const { return ScrollbarShown() ? ScrollbarWidthMax() : 0.0f; }
+	float ScrollbarWidthMax() const { return m_ScrollbarWidth; }
+	void SetScrollbarWidth(float Width) { m_ScrollbarWidth = Width; }
+	float ScrollbarMargin() const { return m_ScrollbarMargin; }
+	void SetScrollbarMargin(float Margin) { m_ScrollbarMargin = Margin; }
+};
+
+#endif
diff --git a/src_bkp/game/client/ui_rect.cpp b/src_bkp/game/client/ui_rect.cpp
new file mode 100644
index 0000000000..9f44a89f2a
--- /dev/null
+++ b/src_bkp/game/client/ui_rect.cpp
@@ -0,0 +1,177 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "ui_rect.h"
+
+#include <engine/graphics.h>
+
+IGraphics *CUIRect::s_pGraphics = nullptr;
+
+void CUIRect::HSplitMid(CUIRect *pTop, CUIRect *pBottom, float Spacing) const
+{
+	CUIRect r = *this;
+	const float Cut = r.h / 2;
+	const float HalfSpacing = Spacing / 2;
+
+	if(pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = Cut - HalfSpacing;
+	}
+
+	if(pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + Cut + HalfSpacing;
+		pBottom->w = r.w;
+		pBottom->h = r.h - Cut - HalfSpacing;
+	}
+}
+
+void CUIRect::HSplitTop(float Cut, CUIRect *pTop, CUIRect *pBottom) const
+{
+	CUIRect r = *this;
+
+	if(pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = Cut;
+	}
+
+	if(pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + Cut;
+		pBottom->w = r.w;
+		pBottom->h = r.h - Cut;
+	}
+}
+
+void CUIRect::HSplitBottom(float Cut, CUIRect *pTop, CUIRect *pBottom) const
+{
+	CUIRect r = *this;
+
+	if(pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = r.h - Cut;
+	}
+
+	if(pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + r.h - Cut;
+		pBottom->w = r.w;
+		pBottom->h = Cut;
+	}
+}
+
+void CUIRect::VSplitMid(CUIRect *pLeft, CUIRect *pRight, float Spacing) const
+{
+	CUIRect r = *this;
+	const float Cut = r.w / 2;
+	const float HalfSpacing = Spacing / 2;
+
+	if(pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = Cut - HalfSpacing;
+		pLeft->h = r.h;
+	}
+
+	if(pRight)
+	{
+		pRight->x = r.x + Cut + HalfSpacing;
+		pRight->y = r.y;
+		pRight->w = r.w - Cut - HalfSpacing;
+		pRight->h = r.h;
+	}
+}
+
+void CUIRect::VSplitLeft(float Cut, CUIRect *pLeft, CUIRect *pRight) const
+{
+	CUIRect r = *this;
+
+	if(pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = Cut;
+		pLeft->h = r.h;
+	}
+
+	if(pRight)
+	{
+		pRight->x = r.x + Cut;
+		pRight->y = r.y;
+		pRight->w = r.w - Cut;
+		pRight->h = r.h;
+	}
+}
+
+void CUIRect::VSplitRight(float Cut, CUIRect *pLeft, CUIRect *pRight) const
+{
+	CUIRect r = *this;
+
+	if(pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = r.w - Cut;
+		pLeft->h = r.h;
+	}
+
+	if(pRight)
+	{
+		pRight->x = r.x + r.w - Cut;
+		pRight->y = r.y;
+		pRight->w = Cut;
+		pRight->h = r.h;
+	}
+}
+
+void CUIRect::Margin(vec2 Cut, CUIRect *pOtherRect) const
+{
+	CUIRect r = *this;
+
+	pOtherRect->x = r.x + Cut.x;
+	pOtherRect->y = r.y + Cut.y;
+	pOtherRect->w = r.w - 2 * Cut.x;
+	pOtherRect->h = r.h - 2 * Cut.y;
+}
+
+void CUIRect::Margin(float Cut, CUIRect *pOtherRect) const
+{
+	Margin(vec2(Cut, Cut), pOtherRect);
+}
+
+void CUIRect::VMargin(float Cut, CUIRect *pOtherRect) const
+{
+	Margin(vec2(Cut, 0.0f), pOtherRect);
+}
+
+void CUIRect::HMargin(float Cut, CUIRect *pOtherRect) const
+{
+	Margin(vec2(0.0f, Cut), pOtherRect);
+}
+
+bool CUIRect::Inside(float PointX, float PointY) const
+{
+	return PointX >= x && PointX < x + w && PointY >= y && PointY < y + h;
+}
+
+void CUIRect::Draw(ColorRGBA Color, int Corners, float Rounding) const
+{
+	s_pGraphics->DrawRect(x, y, w, h, Color, Corners, Rounding);
+}
+
+void CUIRect::Draw4(ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding) const
+{
+	s_pGraphics->DrawRect4(x, y, w, h, ColorTopLeft, ColorTopRight, ColorBottomLeft, ColorBottomRight, Corners, Rounding);
+}
diff --git a/src_bkp/game/client/ui_rect.h b/src_bkp/game/client/ui_rect.h
new file mode 100644
index 0000000000..c95067b521
--- /dev/null
+++ b/src_bkp/game/client/ui_rect.h
@@ -0,0 +1,129 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_UI_RECT_H
+#define GAME_CLIENT_UI_RECT_H
+
+#include <base/color.h>
+
+class IGraphics;
+
+class CUIRect
+{
+	static IGraphics *s_pGraphics;
+
+public:
+	static void Init(IGraphics *pGraphics) { s_pGraphics = pGraphics; }
+
+	float x, y, w, h;
+
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect horizontally. You can pass null pointers.
+	 *
+	 * @param pTop This rect will end up taking the top half of this CUIRect.
+	 * @param pBottom This rect will end up taking the bottom half of this CUIRect.
+	 * @param Spacing Total size of margin between split rects.
+	 */
+	void HSplitMid(CUIRect *pTop, CUIRect *pBottom, float Spacing = 0.0f) const;
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect.
+	 *
+	 * The cut parameter determines the height of the top rect, so it allows more customization than HSplitMid.
+	 *
+	 * This method doesn't check if Cut is bigger than *this* rect height.
+	 *
+	 * @param Cut The height of the pTop rect.
+	 * @param pTop The rect that ends up at the top with a height equal to Cut.
+	 * @param pBottom The rect that ends up at the bottom with a height equal to *this* rect minus the Cut.
+	 */
+	void HSplitTop(float Cut, CUIRect *pTop, CUIRect *pBottom) const;
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect.
+	 *
+	 * The cut parameter determines the height of the bottom rect, so it allows more customization than HSplitMid.
+	 *
+	 * This method doesn't check if Cut is bigger than *this* rect height.
+	 *
+	 * @param Cut The height of the pBottom rect.
+	 * @param pTop The rect that ends up at the top with a height equal to *this* CUIRect height minus Cut.
+	 * @param pBottom The rect that ends up at the bottom with a height equal to Cut.
+	 */
+	void HSplitBottom(float Cut, CUIRect *pTop, CUIRect *pBottom) const;
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect vertically. You can pass null pointers.
+	 *
+	 * @param pLeft This rect will take up the left half of *this* CUIRect.
+	 * @param pRight This rect will take up the right half of *this* CUIRect.
+	 * @param Spacing Total size of margin between split rects.
+	 */
+	void VSplitMid(CUIRect *pLeft, CUIRect *pRight, float Spacing = 0.0f) const;
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect.
+	 *
+	 * The cut parameter determines the width of the left rect, so it allows more customization than VSplitMid.
+	 *
+	 * This method doesn't check if Cut is bigger than *this* rect width.
+	 *
+	 * @param Cut The width of the pLeft rect.
+	 * @param pLeft The rect that ends up at the left with a width equal to Cut.
+	 * @param pRight The rect that ends up at the right with a width equal to *this* rect minus the Cut.
+	 */
+	void VSplitLeft(float Cut, CUIRect *pLeft, CUIRect *pRight) const;
+	/**
+	 * Splits 2 CUIRect inside *this* CUIRect.
+	 *
+	 * The cut parameter determines the width of the right rect, so it allows more customization than VSplitMid.
+	 *
+	 * This method doesn't check if Cut is bigger than *this* rect width.
+	 *
+	 * @param Cut The width of the pRight rect.
+	 * @param pLeft The rect that ends up at the left with a width equal to *this* CUIRect width minus Cut.
+	 * @param pRight The rect that ends up at the right with a width equal to Cut.
+	 */
+	void VSplitRight(float Cut, CUIRect *pLeft, CUIRect *pRight) const;
+
+	/**
+	 * Places pOtherRect inside *this* CUIRect with Cut as the margin.
+	 *
+	 * @param Cut The margin as a vec2.
+	 * The x component applies to the vertical axis.
+	 * The y component applies to the horizontal axis.
+	 * @param pOtherRect The CUIRect to place inside *this* CUIRect.
+	 */
+	void Margin(vec2 Cut, CUIRect *pOtherRect) const;
+	/**
+	 * Places pOtherRect inside *this* CUIRect with Cut as the margin.
+	 *
+	 * @param Cut The margin.
+	 * @param pOtherRect The CUIRect to place inside *this* CUIRect.
+	 */
+	void Margin(float Cut, CUIRect *pOtherRect) const;
+	/**
+	 * Places pOtherRect inside *this* CUIRect applying Cut as the margin only on the vertical axis.
+	 *
+	 * @param Cut The margin.
+	 * @param pOtherRect The CUIRect to place inside *this* CUIRect
+	 */
+	void VMargin(float Cut, CUIRect *pOtherRect) const;
+	/**
+	 * Places pOtherRect inside *this* CUIRect applying Cut as the margin only on the horizontal axis.
+	 *
+	 * @param Cut The margin.
+	 * @param pOtherRect The CUIRect to place inside *this* CUIRect
+	 */
+	void HMargin(float Cut, CUIRect *pOtherRect) const;
+	/**
+	 * Checks whether a point is inside *this* CUIRect.
+	 *
+	 * @param PointX The point's X position.
+	 * @param PointY The point's Y position.
+	 * @return true iff the given point is inside *this* CUIRect.
+	 */
+	bool Inside(float PointX, float PointY) const;
+
+	void Draw(ColorRGBA Color, int Corners, float Rounding) const;
+	void Draw4(ColorRGBA ColorTopLeft, ColorRGBA ColorTopRight, ColorRGBA ColorBottomLeft, ColorRGBA ColorBottomRight, int Corners, float Rounding) const;
+
+	vec2 Center() const { return vec2(x + w / 2.0f, y + h / 2.0f); }
+};
+
+#endif
diff --git a/src_bkp/game/client/ui_scrollregion.cpp b/src_bkp/game/client/ui_scrollregion.cpp
new file mode 100644
index 0000000000..2d3303d4f0
--- /dev/null
+++ b/src_bkp/game/client/ui_scrollregion.cpp
@@ -0,0 +1,261 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+#include <base/vmath.h>
+
+#include <engine/client.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+
+#include "ui_scrollregion.h"
+
+CScrollRegion::CScrollRegion()
+{
+	m_ScrollY = 0.0f;
+	m_ContentH = 0.0f;
+	m_RequestScrollY = -1.0f;
+	m_ScrollDirection = SCROLLRELATIVE_NONE;
+	m_ScrollSpeedMultiplier = 1.0f;
+
+	m_AnimTimeMax = 0.0f;
+	m_AnimTime = 0.0f;
+	m_AnimInitScrollY = 0.0f;
+	m_AnimTargetScrollY = 0.0f;
+
+	m_SliderGrabPos = 0.0f;
+	m_ContentScrollOff = vec2(0.0f, 0.0f);
+	m_Params = CScrollRegionParams();
+}
+
+void CScrollRegion::Begin(CUIRect *pClipRect, vec2 *pOutOffset, const CScrollRegionParams *pParams)
+{
+	if(pParams)
+		m_Params = *pParams;
+
+	const bool ContentOverflows = m_ContentH > pClipRect->h;
+	const bool ForceShowScrollbar = m_Params.m_Flags & CScrollRegionParams::FLAG_CONTENT_STATIC_WIDTH;
+
+	const bool HasScrollBar = ContentOverflows || ForceShowScrollbar;
+	CUIRect ScrollBarBg;
+	pClipRect->VSplitRight(m_Params.m_ScrollbarWidth, HasScrollBar ? pClipRect : nullptr, &ScrollBarBg);
+	if(m_Params.m_ScrollbarNoMarginRight)
+	{
+		ScrollBarBg.HMargin(m_Params.m_ScrollbarMargin, &m_RailRect);
+		m_RailRect.VSplitLeft(m_Params.m_ScrollbarMargin, nullptr, &m_RailRect);
+	}
+	else
+		ScrollBarBg.Margin(m_Params.m_ScrollbarMargin, &m_RailRect);
+
+	// only show scrollbar if required
+	if(HasScrollBar)
+	{
+		if(m_Params.m_ScrollbarBgColor.a > 0.0f)
+			ScrollBarBg.Draw(m_Params.m_ScrollbarBgColor, IGraphics::CORNER_R, 4.0f);
+		if(m_Params.m_RailBgColor.a > 0.0f)
+			m_RailRect.Draw(m_Params.m_RailBgColor, IGraphics::CORNER_ALL, m_RailRect.w / 2.0f);
+	}
+	if(!ContentOverflows)
+		m_ContentScrollOff.y = 0.0f;
+
+	if(m_Params.m_ClipBgColor.a > 0.0f)
+		pClipRect->Draw(m_Params.m_ClipBgColor, HasScrollBar ? IGraphics::CORNER_L : IGraphics::CORNER_ALL, 4.0f);
+
+	UI()->ClipEnable(pClipRect);
+
+	m_ClipRect = *pClipRect;
+	m_ContentH = 0.0f;
+	*pOutOffset = m_ContentScrollOff;
+}
+
+void CScrollRegion::End()
+{
+	UI()->ClipDisable();
+
+	// only show scrollbar if content overflows
+	if(m_ContentH <= m_ClipRect.h)
+		return;
+
+	// scroll wheel
+	CUIRect RegionRect = m_ClipRect;
+	RegionRect.w += m_Params.m_ScrollbarWidth;
+
+	if(m_ScrollDirection != SCROLLRELATIVE_NONE || (UI()->Enabled() && m_Params.m_Active && UI()->MouseHovered(&RegionRect)))
+	{
+		bool ProgrammaticScroll = false;
+		if(UI()->ConsumeHotkey(CUI::HOTKEY_SCROLL_UP))
+			m_ScrollDirection = SCROLLRELATIVE_UP;
+		else if(UI()->ConsumeHotkey(CUI::HOTKEY_SCROLL_DOWN))
+			m_ScrollDirection = SCROLLRELATIVE_DOWN;
+		else
+			ProgrammaticScroll = true;
+
+		if(!ProgrammaticScroll)
+			m_ScrollSpeedMultiplier = 1.0f;
+
+		if(m_ScrollDirection != SCROLLRELATIVE_NONE)
+		{
+			const bool IsPageScroll = Input()->AltIsPressed();
+			const float ScrollUnit = IsPageScroll && !ProgrammaticScroll ? m_ClipRect.h : m_Params.m_ScrollUnit;
+
+			m_AnimTimeMax = g_Config.m_UiSmoothScrollTime / 1000.0f;
+			m_AnimTime = m_AnimTimeMax;
+			m_AnimInitScrollY = m_ScrollY;
+			m_AnimTargetScrollY = (ProgrammaticScroll ? m_ScrollY : m_AnimTargetScrollY) + (int)m_ScrollDirection * ScrollUnit * m_ScrollSpeedMultiplier;
+			m_ScrollDirection = SCROLLRELATIVE_NONE;
+			m_ScrollSpeedMultiplier = 1.0f;
+		}
+	}
+
+	const float SliderHeight = maximum(m_Params.m_SliderMinHeight, m_ClipRect.h / m_ContentH * m_RailRect.h);
+
+	CUIRect Slider = m_RailRect;
+	Slider.h = SliderHeight;
+
+	const float MaxSlider = m_RailRect.h - SliderHeight;
+	const float MaxScroll = m_ContentH - m_ClipRect.h;
+
+	if(m_RequestScrollY >= 0.0f)
+	{
+		m_AnimTargetScrollY = m_RequestScrollY;
+		m_AnimTime = 0.0f;
+		m_RequestScrollY = -1.0f;
+	}
+
+	m_AnimTargetScrollY = clamp(m_AnimTargetScrollY, 0.0f, MaxScroll);
+
+	if(absolute(m_AnimInitScrollY - m_AnimTargetScrollY) < 0.5f)
+		m_AnimTime = 0.0f;
+
+	if(m_AnimTime > 0.0f)
+	{
+		m_AnimTime -= Client()->RenderFrameTime();
+		float AnimProgress = (1.0f - std::pow(m_AnimTime / m_AnimTimeMax, 3.0f)); // cubic ease out
+		m_ScrollY = m_AnimInitScrollY + (m_AnimTargetScrollY - m_AnimInitScrollY) * AnimProgress;
+	}
+	else
+	{
+		m_ScrollY = m_AnimTargetScrollY;
+	}
+
+	Slider.y += m_ScrollY / MaxScroll * MaxSlider;
+
+	bool Grabbed = false;
+	const void *pID = &m_ScrollY;
+	const bool InsideSlider = UI()->MouseHovered(&Slider);
+	const bool InsideRail = UI()->MouseHovered(&m_RailRect);
+
+	if(UI()->CheckActiveItem(pID) && UI()->MouseButton(0))
+	{
+		float MouseY = UI()->MouseY();
+		m_ScrollY += (MouseY - (Slider.y + m_SliderGrabPos)) / MaxSlider * MaxScroll;
+		m_SliderGrabPos = clamp(m_SliderGrabPos, 0.0f, SliderHeight);
+		m_AnimTargetScrollY = m_ScrollY;
+		m_AnimTime = 0.0f;
+		Grabbed = true;
+	}
+	else if(InsideSlider)
+	{
+		UI()->SetHotItem(pID);
+
+		if(!UI()->CheckActiveItem(pID) && UI()->MouseButtonClicked(0))
+		{
+			UI()->SetActiveItem(pID);
+			m_SliderGrabPos = UI()->MouseY() - Slider.y;
+			m_AnimTargetScrollY = m_ScrollY;
+			m_AnimTime = 0.0f;
+			m_Params.m_Active = true;
+		}
+	}
+	else if(InsideRail && UI()->MouseButtonClicked(0))
+	{
+		m_ScrollY += (UI()->MouseY() - (Slider.y + Slider.h / 2.0f)) / MaxSlider * MaxScroll;
+		UI()->SetHotItem(pID);
+		UI()->SetActiveItem(pID);
+		m_SliderGrabPos = Slider.h / 2.0f;
+		m_AnimTargetScrollY = m_ScrollY;
+		m_AnimTime = 0.0f;
+		m_Params.m_Active = true;
+	}
+	else if(UI()->CheckActiveItem(pID) && !UI()->MouseButton(0))
+	{
+		UI()->SetActiveItem(nullptr);
+	}
+
+	m_ScrollY = clamp(m_ScrollY, 0.0f, MaxScroll);
+	m_ContentScrollOff.y = -m_ScrollY;
+
+	Slider.Draw(m_Params.SliderColor(Grabbed, UI()->HotItem() == pID), IGraphics::CORNER_ALL, Slider.w / 2.0f);
+}
+
+bool CScrollRegion::AddRect(const CUIRect &Rect, bool ShouldScrollHere)
+{
+	m_LastAddedRect = Rect;
+	// Round up and add magic to fix pixel clipping at the end of the scrolling area
+	m_ContentH = maximum(std::ceil(Rect.y + Rect.h - (m_ClipRect.y + m_ContentScrollOff.y)) + HEIGHT_MAGIC_FIX, m_ContentH);
+	if(ShouldScrollHere)
+		ScrollHere();
+	return !RectClipped(Rect);
+}
+
+void CScrollRegion::ScrollHere(EScrollOption Option)
+{
+	const float MinHeight = minimum(m_ClipRect.h, m_LastAddedRect.h);
+	const float TopScroll = m_LastAddedRect.y - (m_ClipRect.y + m_ContentScrollOff.y);
+
+	switch(Option)
+	{
+	case SCROLLHERE_TOP:
+		m_RequestScrollY = TopScroll;
+		break;
+
+	case SCROLLHERE_BOTTOM:
+		m_RequestScrollY = TopScroll - (m_ClipRect.h - MinHeight);
+		break;
+
+	case SCROLLHERE_KEEP_IN_VIEW:
+	default:
+		const float DeltaY = m_LastAddedRect.y - m_ClipRect.y;
+		if(DeltaY < 0)
+			m_RequestScrollY = TopScroll;
+		else if(DeltaY > (m_ClipRect.h - MinHeight))
+			m_RequestScrollY = TopScroll - (m_ClipRect.h - MinHeight);
+		break;
+	}
+}
+
+void CScrollRegion::ScrollRelative(EScrollRelative Direction, float SpeedMultiplier)
+{
+	m_ScrollDirection = Direction;
+	m_ScrollSpeedMultiplier = SpeedMultiplier;
+}
+
+void CScrollRegion::DoEdgeScrolling()
+{
+	if(!ScrollbarShown())
+		return;
+
+	const float ScrollBorderSize = 20.0f;
+	const float MaxScrollMultiplier = 2.0f;
+	const float ScrollSpeedFactor = MaxScrollMultiplier / ScrollBorderSize;
+	const float TopScrollPosition = m_ClipRect.y + ScrollBorderSize;
+	const float BottomScrollPosition = m_ClipRect.y + m_ClipRect.h - ScrollBorderSize;
+	if(UI()->MouseY() < TopScrollPosition)
+		ScrollRelative(SCROLLRELATIVE_UP, minimum(MaxScrollMultiplier, (TopScrollPosition - UI()->MouseY()) * ScrollSpeedFactor));
+	else if(UI()->MouseY() > BottomScrollPosition)
+		ScrollRelative(SCROLLRELATIVE_DOWN, minimum(MaxScrollMultiplier, (UI()->MouseY() - BottomScrollPosition) * ScrollSpeedFactor));
+}
+
+bool CScrollRegion::RectClipped(const CUIRect &Rect) const
+{
+	return (m_ClipRect.x > (Rect.x + Rect.w) || (m_ClipRect.x + m_ClipRect.w) < Rect.x || m_ClipRect.y > (Rect.y + Rect.h) || (m_ClipRect.y + m_ClipRect.h) < Rect.y);
+}
+
+bool CScrollRegion::ScrollbarShown() const
+{
+	return m_ContentH > m_ClipRect.h;
+}
+
+bool CScrollRegion::Animating() const
+{
+	return m_AnimTime > 0.0f;
+}
diff --git a/src_bkp/game/client/ui_scrollregion.h b/src_bkp/game/client/ui_scrollregion.h
new file mode 100644
index 0000000000..2a601be534
--- /dev/null
+++ b/src_bkp/game/client/ui_scrollregion.h
@@ -0,0 +1,146 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_CLIENT_UI_SCROLLREGION_H
+#define GAME_CLIENT_UI_SCROLLREGION_H
+
+#include "ui.h"
+
+struct CScrollRegionParams
+{
+	bool m_Active;
+	float m_ScrollbarWidth;
+	float m_ScrollbarMargin;
+	bool m_ScrollbarNoMarginRight;
+	float m_SliderMinHeight;
+	float m_ScrollUnit;
+	ColorRGBA m_ClipBgColor;
+	ColorRGBA m_ScrollbarBgColor;
+	ColorRGBA m_RailBgColor;
+	ColorRGBA m_SliderColor;
+	ColorRGBA m_SliderColorHover;
+	ColorRGBA m_SliderColorGrabbed;
+	unsigned m_Flags;
+
+	enum
+	{
+		FLAG_CONTENT_STATIC_WIDTH = 1 << 0,
+	};
+
+	CScrollRegionParams()
+	{
+		m_Active = true;
+		m_ScrollbarWidth = 20.0f;
+		m_ScrollbarMargin = 5.0f;
+		m_ScrollbarNoMarginRight = false;
+		m_SliderMinHeight = 25.0f;
+		m_ScrollUnit = 10.0f;
+		m_ClipBgColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+		m_ScrollbarBgColor = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
+		m_RailBgColor = ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f);
+		m_SliderColor = ColorRGBA(0.8f, 0.8f, 0.8f, 1.0f);
+		m_SliderColorHover = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+		m_SliderColorGrabbed = ColorRGBA(0.9f, 0.9f, 0.9f, 1.0f);
+		m_Flags = 0;
+	}
+
+	ColorRGBA SliderColor(bool Active, bool Hovered) const
+	{
+		if(Active)
+			return m_SliderColorGrabbed;
+		else if(Hovered)
+			return m_SliderColorHover;
+		return m_SliderColor;
+	}
+};
+
+/*
+Usage:
+	-- Initialization --
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0, 0);
+	s_ScrollRegion.Begin(&ScrollRegionRect, &ScrollOffset);
+	Content = ScrollRegionRect;
+	Content.y += ScrollOffset.y;
+
+	-- "Register" your content rects --
+	CUIRect Rect;
+	Content.HSplitTop(SomeValue, &Rect, &Content);
+	s_ScrollRegion.AddRect(Rect);
+
+	-- [Optional] Knowing if a rect is clipped --
+	s_ScrollRegion.RectClipped(Rect);
+
+	-- [Optional] Scroll to a rect (to the last added rect)--
+	...
+	s_ScrollRegion.AddRect(Rect);
+	s_ScrollRegion.ScrollHere(Option);
+
+	-- [Convenience] Add rect and check for visibility at the same time
+	if(s_ScrollRegion.AddRect(Rect))
+		// The rect is visible (not clipped)
+
+	-- [Convenience] Add rect and scroll to it if it's selected
+	if(s_ScrollRegion.AddRect(Rect, ScrollToSelection && IsSelected))
+		// The rect is visible (not clipped)
+
+	-- End --
+	s_ScrollRegion.End();
+*/
+
+// Instances of CScrollRegion must be static, as member addresses are used as UI item IDs
+class CScrollRegion : private CUIElementBase
+{
+public:
+	// TODO: Properly fix whatever is causing the 1-pixel discrepancy in scrolling rect height and remove this magic value.
+	// Currently this must be added when calculating the required height of a UI rect for a scroll region to get a perfect fit.
+	static constexpr float HEIGHT_MAGIC_FIX = 1.0f;
+
+	enum EScrollRelative
+	{
+		SCROLLRELATIVE_UP = -1,
+		SCROLLRELATIVE_NONE = 0,
+		SCROLLRELATIVE_DOWN = 1,
+	};
+
+private:
+	float m_ScrollY;
+	float m_ContentH;
+	float m_RequestScrollY; // [0, ContentHeight]
+	EScrollRelative m_ScrollDirection;
+	float m_ScrollSpeedMultiplier;
+
+	float m_AnimTimeMax;
+	float m_AnimTime;
+	float m_AnimInitScrollY;
+	float m_AnimTargetScrollY;
+
+	CUIRect m_ClipRect;
+	CUIRect m_RailRect;
+	CUIRect m_LastAddedRect; // saved for ScrollHere()
+	float m_SliderGrabPos; // where did user grab the slider
+	vec2 m_ContentScrollOff;
+	CScrollRegionParams m_Params;
+
+public:
+	enum EScrollOption
+	{
+		SCROLLHERE_KEEP_IN_VIEW = 0,
+		SCROLLHERE_TOP,
+		SCROLLHERE_BOTTOM,
+	};
+
+	CScrollRegion();
+	void Begin(CUIRect *pClipRect, vec2 *pOutOffset, const CScrollRegionParams *pParams = nullptr);
+	void End();
+	bool AddRect(const CUIRect &Rect, bool ShouldScrollHere = false); // returns true if the added rect is visible (not clipped)
+	void ScrollHere(EScrollOption Option = SCROLLHERE_KEEP_IN_VIEW);
+	void ScrollRelative(EScrollRelative Direction, float SpeedMultiplier = 1.0f);
+	const CUIRect *ClipRect() const { return &m_ClipRect; }
+	void DoEdgeScrolling();
+	bool RectClipped(const CUIRect &Rect) const;
+	bool ScrollbarShown() const;
+	bool Animating() const;
+	const CScrollRegionParams &Params() const { return m_Params; }
+};
+
+#endif
diff --git a/src_bkp/game/collision.cpp b/src_bkp/game/collision.cpp
new file mode 100644
index 0000000000..8612ad7dc2
--- /dev/null
+++ b/src_bkp/game/collision.cpp
@@ -0,0 +1,1269 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/math.h>
+#include <base/system.h>
+#include <base/vmath.h>
+
+#include <antibot/antibot_data.h>
+
+#include <cmath>
+#include <engine/map.h>
+
+#include <game/collision.h>
+#include <game/layers.h>
+#include <game/mapitems.h>
+
+#include <engine/shared/config.h>
+
+vec2 ClampVel(int MoveRestriction, vec2 Vel)
+{
+	if(Vel.x > 0 && (MoveRestriction & CANTMOVE_RIGHT))
+	{
+		Vel.x = 0;
+	}
+	if(Vel.x < 0 && (MoveRestriction & CANTMOVE_LEFT))
+	{
+		Vel.x = 0;
+	}
+	if(Vel.y > 0 && (MoveRestriction & CANTMOVE_DOWN))
+	{
+		Vel.y = 0;
+	}
+	if(Vel.y < 0 && (MoveRestriction & CANTMOVE_UP))
+	{
+		Vel.y = 0;
+	}
+	return Vel;
+}
+
+CCollision::CCollision()
+{
+	m_pTiles = 0;
+	m_Width = 0;
+	m_Height = 0;
+	m_pLayers = 0;
+
+	m_pTele = 0;
+	m_pSpeedup = 0;
+	m_pFront = 0;
+	m_pSwitch = 0;
+	m_pDoor = 0;
+	m_pTune = 0;
+}
+
+CCollision::~CCollision()
+{
+	Dest();
+}
+
+void CCollision::Init(class CLayers *pLayers)
+{
+	Dest();
+	m_HighestSwitchNumber = 0;
+	m_pLayers = pLayers;
+	m_Width = m_pLayers->GameLayer()->m_Width;
+	m_Height = m_pLayers->GameLayer()->m_Height;
+	m_pTiles = static_cast<CTile *>(m_pLayers->Map()->GetData(m_pLayers->GameLayer()->m_Data));
+
+	if(m_pLayers->TeleLayer())
+	{
+		unsigned int Size = m_pLayers->Map()->GetDataSize(m_pLayers->TeleLayer()->m_Tele);
+		if(Size >= (size_t)m_Width * m_Height * sizeof(CTeleTile))
+			m_pTele = static_cast<CTeleTile *>(m_pLayers->Map()->GetData(m_pLayers->TeleLayer()->m_Tele));
+	}
+
+	if(m_pLayers->SpeedupLayer())
+	{
+		unsigned int Size = m_pLayers->Map()->GetDataSize(m_pLayers->SpeedupLayer()->m_Speedup);
+		if(Size >= (size_t)m_Width * m_Height * sizeof(CSpeedupTile))
+			m_pSpeedup = static_cast<CSpeedupTile *>(m_pLayers->Map()->GetData(m_pLayers->SpeedupLayer()->m_Speedup));
+	}
+
+	if(m_pLayers->SwitchLayer())
+	{
+		unsigned int Size = m_pLayers->Map()->GetDataSize(m_pLayers->SwitchLayer()->m_Switch);
+		if(Size >= (size_t)m_Width * m_Height * sizeof(CSwitchTile))
+			m_pSwitch = static_cast<CSwitchTile *>(m_pLayers->Map()->GetData(m_pLayers->SwitchLayer()->m_Switch));
+
+		m_pDoor = new CDoorTile[m_Width * m_Height];
+		mem_zero(m_pDoor, (size_t)m_Width * m_Height * sizeof(CDoorTile));
+	}
+	else
+	{
+		m_pDoor = 0;
+	}
+
+	if(m_pLayers->TuneLayer())
+	{
+		unsigned int Size = m_pLayers->Map()->GetDataSize(m_pLayers->TuneLayer()->m_Tune);
+		if(Size >= (size_t)m_Width * m_Height * sizeof(CTuneTile))
+			m_pTune = static_cast<CTuneTile *>(m_pLayers->Map()->GetData(m_pLayers->TuneLayer()->m_Tune));
+	}
+
+	if(m_pLayers->FrontLayer())
+	{
+		unsigned int Size = m_pLayers->Map()->GetDataSize(m_pLayers->FrontLayer()->m_Front);
+		if(Size >= (size_t)m_Width * m_Height * sizeof(CTile))
+			m_pFront = static_cast<CTile *>(m_pLayers->Map()->GetData(m_pLayers->FrontLayer()->m_Front));
+	}
+
+	for(int i = 0; i < m_Width * m_Height; i++)
+	{
+		int Index;
+		if(m_pSwitch)
+		{
+			if(m_pSwitch[i].m_Number > m_HighestSwitchNumber)
+				m_HighestSwitchNumber = m_pSwitch[i].m_Number;
+
+			if(m_pSwitch[i].m_Number)
+				m_pDoor[i].m_Number = m_pSwitch[i].m_Number;
+			else
+				m_pDoor[i].m_Number = 0;
+
+			Index = m_pSwitch[i].m_Type;
+
+			if(Index <= TILE_NPH_ENABLE)
+			{
+				if((Index >= TILE_JUMP && Index <= TILE_SUBTRACT_TIME) || Index == TILE_ALLOW_TELE_GUN || Index == TILE_ALLOW_BLUE_TELE_GUN)
+					m_pSwitch[i].m_Type = Index;
+				else
+					m_pSwitch[i].m_Type = 0;
+			}
+		}
+	}
+}
+
+void CCollision::FillAntibot(CAntibotMapData *pMapData)
+{
+	pMapData->m_Width = m_Width;
+	pMapData->m_Height = m_Height;
+	pMapData->m_pTiles = (unsigned char *)malloc((size_t)m_Width * m_Height);
+	for(int i = 0; i < m_Width * m_Height; i++)
+	{
+		pMapData->m_pTiles[i] = 0;
+		if(m_pTiles[i].m_Index >= TILE_SOLID && m_pTiles[i].m_Index <= TILE_NOLASER)
+		{
+			pMapData->m_pTiles[i] = m_pTiles[i].m_Index;
+		}
+	}
+}
+
+enum
+{
+	MR_DIR_HERE = 0,
+	MR_DIR_RIGHT,
+	MR_DIR_DOWN,
+	MR_DIR_LEFT,
+	MR_DIR_UP,
+	NUM_MR_DIRS
+};
+
+static int GetMoveRestrictionsRaw(int Direction, int Tile, int Flags)
+{
+	Flags = Flags & (TILEFLAG_XFLIP | TILEFLAG_YFLIP | TILEFLAG_ROTATE);
+	switch(Tile)
+	{
+	case TILE_STOP:
+		switch(Flags)
+		{
+		case ROTATION_0: return CANTMOVE_DOWN;
+		case ROTATION_90: return CANTMOVE_LEFT;
+		case ROTATION_180: return CANTMOVE_UP;
+		case ROTATION_270: return CANTMOVE_RIGHT;
+
+		case TILEFLAG_YFLIP ^ ROTATION_0: return CANTMOVE_UP;
+		case TILEFLAG_YFLIP ^ ROTATION_90: return CANTMOVE_RIGHT;
+		case TILEFLAG_YFLIP ^ ROTATION_180: return CANTMOVE_DOWN;
+		case TILEFLAG_YFLIP ^ ROTATION_270: return CANTMOVE_LEFT;
+		}
+		break;
+	case TILE_STOPS:
+		switch(Flags)
+		{
+		case ROTATION_0:
+		case ROTATION_180:
+		case TILEFLAG_YFLIP ^ ROTATION_0:
+		case TILEFLAG_YFLIP ^ ROTATION_180:
+			return CANTMOVE_DOWN | CANTMOVE_UP;
+		case ROTATION_90:
+		case ROTATION_270:
+		case TILEFLAG_YFLIP ^ ROTATION_90:
+		case TILEFLAG_YFLIP ^ ROTATION_270:
+			return CANTMOVE_LEFT | CANTMOVE_RIGHT;
+		}
+		break;
+	case TILE_STOPA:
+		return CANTMOVE_LEFT | CANTMOVE_RIGHT | CANTMOVE_UP | CANTMOVE_DOWN;
+	}
+	return 0;
+}
+
+static int GetMoveRestrictionsMask(int Direction)
+{
+	switch(Direction)
+	{
+	case MR_DIR_HERE: return 0;
+	case MR_DIR_RIGHT: return CANTMOVE_RIGHT;
+	case MR_DIR_DOWN: return CANTMOVE_DOWN;
+	case MR_DIR_LEFT: return CANTMOVE_LEFT;
+	case MR_DIR_UP: return CANTMOVE_UP;
+	default: dbg_assert(false, "invalid dir");
+	}
+	return 0;
+}
+
+static int GetMoveRestrictions(int Direction, int Tile, int Flags)
+{
+	int Result = GetMoveRestrictionsRaw(Direction, Tile, Flags);
+	// Generally, stoppers only have an effect if they block us from moving
+	// *onto* them. The one exception is one-way blockers, they can also
+	// block us from moving if we're on top of them.
+	if(Direction == MR_DIR_HERE && Tile == TILE_STOP)
+	{
+		return Result;
+	}
+	return Result & GetMoveRestrictionsMask(Direction);
+}
+
+int CCollision::GetMoveRestrictions(CALLBACK_SWITCHACTIVE pfnSwitchActive, void *pUser, vec2 Pos, float Distance, int OverrideCenterTileIndex) const
+{
+	static const vec2 DIRECTIONS[NUM_MR_DIRS] =
+		{
+			vec2(0, 0),
+			vec2(1, 0),
+			vec2(0, 1),
+			vec2(-1, 0),
+			vec2(0, -1)};
+	dbg_assert(0.0f <= Distance && Distance <= 32.0f, "invalid distance");
+	int Restrictions = 0;
+	for(int d = 0; d < NUM_MR_DIRS; d++)
+	{
+		vec2 ModPos = Pos + DIRECTIONS[d] * Distance;
+		int ModMapIndex = GetPureMapIndex(ModPos);
+		if(d == MR_DIR_HERE && OverrideCenterTileIndex >= 0)
+		{
+			ModMapIndex = OverrideCenterTileIndex;
+		}
+		for(int Front = 0; Front < 2; Front++)
+		{
+			int Tile;
+			int Flags;
+			if(!Front)
+			{
+				Tile = GetTileIndex(ModMapIndex);
+				Flags = GetTileFlags(ModMapIndex);
+			}
+			else
+			{
+				Tile = GetFTileIndex(ModMapIndex);
+				Flags = GetFTileFlags(ModMapIndex);
+			}
+			Restrictions |= ::GetMoveRestrictions(d, Tile, Flags);
+		}
+		if(pfnSwitchActive)
+		{
+			int TeleNumber = GetDTileNumber(ModMapIndex);
+			if(pfnSwitchActive(TeleNumber, pUser))
+			{
+				int Tile = GetDTileIndex(ModMapIndex);
+				int Flags = GetDTileFlags(ModMapIndex);
+				Restrictions |= ::GetMoveRestrictions(d, Tile, Flags);
+			}
+		}
+	}
+	return Restrictions;
+}
+
+int CCollision::GetTile(int x, int y) const
+{
+	if(!m_pTiles)
+		return 0;
+
+	int Nx = clamp(x / 32, 0, m_Width - 1);
+	int Ny = clamp(y / 32, 0, m_Height - 1);
+	int pos = Ny * m_Width + Nx;
+
+	if(m_pTiles[pos].m_Index >= TILE_SOLID && m_pTiles[pos].m_Index <= TILE_NOLASER)
+		return m_pTiles[pos].m_Index;
+	return 0;
+}
+
+// TODO: rewrite this smarter!
+int CCollision::IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const
+{
+	float Distance = distance(Pos0, Pos1);
+	int End(Distance + 1);
+	vec2 Last = Pos0;
+	for(int i = 0; i <= End; i++)
+	{
+		float a = i / (float)End;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		// Temporary position for checking collision
+		int ix = round_to_int(Pos.x);
+		int iy = round_to_int(Pos.y);
+
+		if(CheckPoint(ix, iy))
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			return GetCollisionAt(ix, iy);
+		}
+
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+int CCollision::IntersectLineTeleHook(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision, int *pTeleNr) const
+{
+	float Distance = distance(Pos0, Pos1);
+	int End(Distance + 1);
+	vec2 Last = Pos0;
+	int dx = 0, dy = 0; // Offset for checking the "through" tile
+	ThroughOffset(Pos0, Pos1, &dx, &dy);
+	for(int i = 0; i <= End; i++)
+	{
+		float a = i / (float)End;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		// Temporary position for checking collision
+		int ix = round_to_int(Pos.x);
+		int iy = round_to_int(Pos.y);
+
+		int Index = GetPureMapIndex(Pos);
+		if(pTeleNr)
+		{
+			if(g_Config.m_SvOldTeleportHook)
+				*pTeleNr = IsTeleport(Index);
+			else
+				*pTeleNr = IsTeleportHook(Index);
+		}
+		if(pTeleNr && *pTeleNr)
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			return TILE_TELEINHOOK;
+		}
+
+		int hit = 0;
+		if(CheckPoint(ix, iy))
+		{
+			if(!IsThrough(ix, iy, dx, dy, Pos0, Pos1))
+				hit = GetCollisionAt(ix, iy);
+		}
+		else if(IsHookBlocker(ix, iy, Pos0, Pos1))
+		{
+			hit = TILE_NOHOOK;
+		}
+		if(hit)
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			return hit;
+		}
+
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+int CCollision::IntersectLineTeleWeapon(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision, int *pTeleNr) const
+{
+	float Distance = distance(Pos0, Pos1);
+	int End(Distance + 1);
+	vec2 Last = Pos0;
+	for(int i = 0; i <= End; i++)
+	{
+		float a = i / (float)End;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		// Temporary position for checking collision
+		int ix = round_to_int(Pos.x);
+		int iy = round_to_int(Pos.y);
+
+		int Index = GetPureMapIndex(Pos);
+		if(pTeleNr)
+		{
+			if(g_Config.m_SvOldTeleportWeapons)
+				*pTeleNr = IsTeleport(Index);
+			else
+				*pTeleNr = IsTeleportWeapon(Index);
+		}
+		if(pTeleNr && *pTeleNr)
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			return TILE_TELEINWEAPON;
+		}
+
+		if(CheckPoint(ix, iy))
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			return GetCollisionAt(ix, iy);
+		}
+
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+// TODO: OPT: rewrite this smarter!
+void CCollision::MovePoint(vec2 *pInoutPos, vec2 *pInoutVel, float Elasticity, int *pBounces) const
+{
+	if(pBounces)
+		*pBounces = 0;
+
+	vec2 Pos = *pInoutPos;
+	vec2 Vel = *pInoutVel;
+	if(CheckPoint(Pos + Vel))
+	{
+		int Affected = 0;
+		if(CheckPoint(Pos.x + Vel.x, Pos.y))
+		{
+			pInoutVel->x *= -Elasticity;
+			if(pBounces)
+				(*pBounces)++;
+			Affected++;
+		}
+
+		if(CheckPoint(Pos.x, Pos.y + Vel.y))
+		{
+			pInoutVel->y *= -Elasticity;
+			if(pBounces)
+				(*pBounces)++;
+			Affected++;
+		}
+
+		if(Affected == 0)
+		{
+			pInoutVel->x *= -Elasticity;
+			pInoutVel->y *= -Elasticity;
+		}
+	}
+	else
+	{
+		*pInoutPos = Pos + Vel;
+	}
+}
+
+bool CCollision::TestBox(vec2 Pos, vec2 Size) const
+{
+	Size *= 0.5f;
+	if(CheckPoint(Pos.x - Size.x, Pos.y - Size.y))
+		return true;
+	if(CheckPoint(Pos.x + Size.x, Pos.y - Size.y))
+		return true;
+	if(CheckPoint(Pos.x - Size.x, Pos.y + Size.y))
+		return true;
+	if(CheckPoint(Pos.x + Size.x, Pos.y + Size.y))
+		return true;
+	return false;
+}
+
+void CCollision::MoveBox(vec2 *pInoutPos, vec2 *pInoutVel, vec2 Size, vec2 Elasticity, bool *pGrounded) const
+{
+	// do the move
+	vec2 Pos = *pInoutPos;
+	vec2 Vel = *pInoutVel;
+
+	float Distance = length(Vel);
+	int Max = (int)Distance;
+
+	if(Distance > 0.00001f)
+	{
+		float Fraction = 1.0f / (float)(Max + 1);
+		float ElasticityX = clamp(Elasticity.x, -1.0f, 1.0f);
+		float ElasticityY = clamp(Elasticity.y, -1.0f, 1.0f);
+
+		for(int i = 0; i <= Max; i++)
+		{
+			// Early break as optimization to stop checking for collisions for
+			// large distances after the obstacles we have already hit reduced
+			// our speed to exactly 0.
+			if(Vel == vec2(0, 0))
+			{
+				break;
+			}
+
+			vec2 NewPos = Pos + Vel * Fraction; // TODO: this row is not nice
+
+			// Fraction can be very small and thus the calculation has no effect, no
+			// reason to continue calculating.
+			if(NewPos == Pos)
+			{
+				break;
+			}
+
+			if(TestBox(vec2(NewPos.x, NewPos.y), Size))
+			{
+				int Hits = 0;
+
+				if(TestBox(vec2(Pos.x, NewPos.y), Size))
+				{
+					if(pGrounded && ElasticityY > 0 && Vel.y > 0)
+						*pGrounded = true;
+					NewPos.y = Pos.y;
+					Vel.y *= -ElasticityY;
+					Hits++;
+				}
+
+				if(TestBox(vec2(NewPos.x, Pos.y), Size))
+				{
+					NewPos.x = Pos.x;
+					Vel.x *= -ElasticityX;
+					Hits++;
+				}
+
+				// neither of the tests got a collision.
+				// this is a real _corner case_!
+				if(Hits == 0)
+				{
+					if(pGrounded && ElasticityY > 0 && Vel.y > 0)
+						*pGrounded = true;
+					NewPos.y = Pos.y;
+					Vel.y *= -ElasticityY;
+					NewPos.x = Pos.x;
+					Vel.x *= -ElasticityX;
+				}
+			}
+
+			Pos = NewPos;
+		}
+	}
+
+	*pInoutPos = Pos;
+	*pInoutVel = Vel;
+}
+
+// DDRace
+
+void CCollision::Dest()
+{
+	delete[] m_pDoor;
+	m_pTiles = 0;
+	m_Width = 0;
+	m_Height = 0;
+	m_pLayers = 0;
+	m_pTele = 0;
+	m_pSpeedup = 0;
+	m_pFront = 0;
+	m_pSwitch = 0;
+	m_pTune = 0;
+	m_pDoor = 0;
+}
+
+int CCollision::IsSolid(int x, int y) const
+{
+	int index = GetTile(x, y);
+	return index == TILE_SOLID || index == TILE_NOHOOK;
+}
+
+bool CCollision::IsThrough(int x, int y, int xoff, int yoff, vec2 pos0, vec2 pos1) const
+{
+	int pos = GetPureMapIndex(x, y);
+	if(m_pFront && (m_pFront[pos].m_Index == TILE_THROUGH_ALL || m_pFront[pos].m_Index == TILE_THROUGH_CUT))
+		return true;
+	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && pos0.y > pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && pos0.x < pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && pos0.y < pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && pos0.x > pos1.x)))
+		return true;
+	int offpos = GetPureMapIndex(x + xoff, y + yoff);
+	return m_pTiles[offpos].m_Index == TILE_THROUGH || (m_pFront && m_pFront[offpos].m_Index == TILE_THROUGH);
+}
+
+bool CCollision::IsHookBlocker(int x, int y, vec2 pos0, vec2 pos1) const
+{
+	int pos = GetPureMapIndex(x, y);
+	if(m_pTiles[pos].m_Index == TILE_THROUGH_ALL || (m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_ALL))
+		return true;
+	if(m_pTiles[pos].m_Index == TILE_THROUGH_DIR && ((m_pTiles[pos].m_Flags == ROTATION_0 && pos0.y < pos1.y) ||
+								(m_pTiles[pos].m_Flags == ROTATION_90 && pos0.x > pos1.x) ||
+								(m_pTiles[pos].m_Flags == ROTATION_180 && pos0.y > pos1.y) ||
+								(m_pTiles[pos].m_Flags == ROTATION_270 && pos0.x < pos1.x)))
+		return true;
+	if(m_pFront && m_pFront[pos].m_Index == TILE_THROUGH_DIR && ((m_pFront[pos].m_Flags == ROTATION_0 && pos0.y < pos1.y) || (m_pFront[pos].m_Flags == ROTATION_90 && pos0.x > pos1.x) || (m_pFront[pos].m_Flags == ROTATION_180 && pos0.y > pos1.y) || (m_pFront[pos].m_Flags == ROTATION_270 && pos0.x < pos1.x)))
+		return true;
+	return false;
+}
+
+int CCollision::IsWallJump(int Index) const
+{
+	if(Index < 0)
+		return 0;
+
+	return m_pTiles[Index].m_Index == TILE_WALLJUMP;
+}
+
+int CCollision::IsNoLaser(int x, int y) const
+{
+	return (CCollision::GetTile(x, y) == TILE_NOLASER);
+}
+
+int CCollision::IsFNoLaser(int x, int y) const
+{
+	return (CCollision::GetFTile(x, y) == TILE_NOLASER);
+}
+
+int CCollision::IsTeleport(int Index) const
+{
+	if(Index < 0 || !m_pTele)
+		return 0;
+
+	if(m_pTele[Index].m_Type == TILE_TELEIN)
+		return m_pTele[Index].m_Number;
+
+	return 0;
+}
+
+int CCollision::IsEvilTeleport(int Index) const
+{
+	if(Index < 0)
+		return 0;
+	if(!m_pTele)
+		return 0;
+
+	if(m_pTele[Index].m_Type == TILE_TELEINEVIL)
+		return m_pTele[Index].m_Number;
+
+	return 0;
+}
+
+bool CCollision::IsCheckTeleport(int Index) const
+{
+	if(Index < 0 || !m_pTele)
+		return false;
+	return m_pTele[Index].m_Type == TILE_TELECHECKIN;
+}
+
+bool CCollision::IsCheckEvilTeleport(int Index) const
+{
+	if(Index < 0 || !m_pTele)
+		return false;
+	return m_pTele[Index].m_Type == TILE_TELECHECKINEVIL;
+}
+
+int CCollision::IsTeleCheckpoint(int Index) const
+{
+	if(Index < 0)
+		return 0;
+
+	if(!m_pTele)
+		return 0;
+
+	if(m_pTele[Index].m_Type == TILE_TELECHECK)
+		return m_pTele[Index].m_Number;
+
+	return 0;
+}
+
+int CCollision::IsTeleportWeapon(int Index) const
+{
+	if(Index < 0 || !m_pTele)
+		return 0;
+
+	if(m_pTele[Index].m_Type == TILE_TELEINWEAPON)
+		return m_pTele[Index].m_Number;
+
+	return 0;
+}
+
+int CCollision::IsTeleportHook(int Index) const
+{
+	if(Index < 0 || !m_pTele)
+		return 0;
+
+	if(m_pTele[Index].m_Type == TILE_TELEINHOOK)
+		return m_pTele[Index].m_Number;
+
+	return 0;
+}
+
+int CCollision::IsSpeedup(int Index) const
+{
+	if(Index < 0 || !m_pSpeedup)
+		return 0;
+
+	if(m_pSpeedup[Index].m_Force > 0)
+		return Index;
+
+	return 0;
+}
+
+int CCollision::IsTune(int Index) const
+{
+	if(Index < 0 || !m_pTune)
+		return 0;
+
+	if(m_pTune[Index].m_Type)
+		return m_pTune[Index].m_Number;
+
+	return 0;
+}
+
+void CCollision::GetSpeedup(int Index, vec2 *pDir, int *pForce, int *pMaxSpeed) const
+{
+	if(Index < 0 || !m_pSpeedup)
+		return;
+	float Angle = m_pSpeedup[Index].m_Angle * (pi / 180.0f);
+	*pForce = m_pSpeedup[Index].m_Force;
+	*pDir = direction(Angle);
+	if(pMaxSpeed)
+		*pMaxSpeed = m_pSpeedup[Index].m_MaxSpeed;
+}
+
+int CCollision::GetSwitchType(int Index) const
+{
+	if(Index < 0 || !m_pSwitch)
+		return 0;
+
+	if(m_pSwitch[Index].m_Type > 0)
+		return m_pSwitch[Index].m_Type;
+
+	return 0;
+}
+
+int CCollision::GetSwitchNumber(int Index) const
+{
+	if(Index < 0 || !m_pSwitch)
+		return 0;
+
+	if(m_pSwitch[Index].m_Type > 0 && m_pSwitch[Index].m_Number > 0)
+		return m_pSwitch[Index].m_Number;
+
+	return 0;
+}
+
+int CCollision::GetSwitchDelay(int Index) const
+{
+	if(Index < 0 || !m_pSwitch)
+		return 0;
+
+	if(m_pSwitch[Index].m_Type > 0)
+		return m_pSwitch[Index].m_Delay;
+
+	return 0;
+}
+
+int CCollision::IsMover(int x, int y, int *pFlags) const
+{
+	int Nx = clamp(x / 32, 0, m_Width - 1);
+	int Ny = clamp(y / 32, 0, m_Height - 1);
+	int Index = m_pTiles[Ny * m_Width + Nx].m_Index;
+	*pFlags = m_pTiles[Ny * m_Width + Nx].m_Flags;
+	if(Index < 0)
+		return 0;
+	if(Index == TILE_CP || Index == TILE_CP_F)
+		return Index;
+	else
+		return 0;
+}
+
+vec2 CCollision::CpSpeed(int Index, int Flags) const
+{
+	if(Index < 0)
+		return vec2(0, 0);
+	vec2 target;
+	if(Index == TILE_CP || Index == TILE_CP_F)
+		switch(Flags)
+		{
+		case ROTATION_0:
+			target.x = 0;
+			target.y = -4;
+			break;
+		case ROTATION_90:
+			target.x = 4;
+			target.y = 0;
+			break;
+		case ROTATION_180:
+			target.x = 0;
+			target.y = 4;
+			break;
+		case ROTATION_270:
+			target.x = -4;
+			target.y = 0;
+			break;
+		default:
+			target = vec2(0, 0);
+			break;
+		}
+	if(Index == TILE_CP_F)
+		target *= 4;
+	return target;
+}
+
+int CCollision::GetPureMapIndex(float x, float y) const
+{
+	int Nx = clamp(round_to_int(x) / 32, 0, m_Width - 1);
+	int Ny = clamp(round_to_int(y) / 32, 0, m_Height - 1);
+	return Ny * m_Width + Nx;
+}
+
+bool CCollision::TileExists(int Index) const
+{
+	if(Index < 0)
+		return false;
+
+	if((m_pTiles[Index].m_Index >= TILE_FREEZE && m_pTiles[Index].m_Index <= TILE_TELE_LASER_DISABLE) || (m_pTiles[Index].m_Index >= TILE_LFREEZE && m_pTiles[Index].m_Index <= TILE_LUNFREEZE))
+		return true;
+	if(m_pFront && ((m_pFront[Index].m_Index >= TILE_FREEZE && m_pFront[Index].m_Index <= TILE_TELE_LASER_DISABLE) || (m_pFront[Index].m_Index >= TILE_LFREEZE && m_pFront[Index].m_Index <= TILE_LUNFREEZE)))
+		return true;
+	if(m_pTele && (m_pTele[Index].m_Type == TILE_TELEIN || m_pTele[Index].m_Type == TILE_TELEINEVIL || m_pTele[Index].m_Type == TILE_TELECHECKINEVIL || m_pTele[Index].m_Type == TILE_TELECHECK || m_pTele[Index].m_Type == TILE_TELECHECKIN))
+		return true;
+	if(m_pSpeedup && m_pSpeedup[Index].m_Force > 0)
+		return true;
+	if(m_pDoor && m_pDoor[Index].m_Index)
+		return true;
+	if(m_pSwitch && m_pSwitch[Index].m_Type)
+		return true;
+	if(m_pTune && m_pTune[Index].m_Type)
+		return true;
+	return TileExistsNext(Index);
+}
+
+bool CCollision::TileExistsNext(int Index) const
+{
+	if(Index < 0)
+		return false;
+	int TileOnTheLeft = (Index - 1 > 0) ? Index - 1 : Index;
+	int TileOnTheRight = (Index + 1 < m_Width * m_Height) ? Index + 1 : Index;
+	int TileBelow = (Index + m_Width < m_Width * m_Height) ? Index + m_Width : Index;
+	int TileAbove = (Index - m_Width > 0) ? Index - m_Width : Index;
+
+	if((m_pTiles[TileOnTheRight].m_Index == TILE_STOP && m_pTiles[TileOnTheRight].m_Flags == ROTATION_270) || (m_pTiles[TileOnTheLeft].m_Index == TILE_STOP && m_pTiles[TileOnTheLeft].m_Flags == ROTATION_90))
+		return true;
+	if((m_pTiles[TileBelow].m_Index == TILE_STOP && m_pTiles[TileBelow].m_Flags == ROTATION_0) || (m_pTiles[TileAbove].m_Index == TILE_STOP && m_pTiles[TileAbove].m_Flags == ROTATION_180))
+		return true;
+	if(m_pTiles[TileOnTheRight].m_Index == TILE_STOPA || m_pTiles[TileOnTheLeft].m_Index == TILE_STOPA || ((m_pTiles[TileOnTheRight].m_Index == TILE_STOPS || m_pTiles[TileOnTheLeft].m_Index == TILE_STOPS)))
+		return true;
+	if(m_pTiles[TileBelow].m_Index == TILE_STOPA || m_pTiles[TileAbove].m_Index == TILE_STOPA || ((m_pTiles[TileBelow].m_Index == TILE_STOPS || m_pTiles[TileAbove].m_Index == TILE_STOPS) && m_pTiles[TileBelow].m_Flags | ROTATION_180 | ROTATION_0))
+		return true;
+	if(m_pFront)
+	{
+		if(m_pFront[TileOnTheRight].m_Index == TILE_STOPA || m_pFront[TileOnTheLeft].m_Index == TILE_STOPA || ((m_pFront[TileOnTheRight].m_Index == TILE_STOPS || m_pFront[TileOnTheLeft].m_Index == TILE_STOPS)))
+			return true;
+		if(m_pFront[TileBelow].m_Index == TILE_STOPA || m_pFront[TileAbove].m_Index == TILE_STOPA || ((m_pFront[TileBelow].m_Index == TILE_STOPS || m_pFront[TileAbove].m_Index == TILE_STOPS) && m_pFront[TileBelow].m_Flags | ROTATION_180 | ROTATION_0))
+			return true;
+		if((m_pFront[TileOnTheRight].m_Index == TILE_STOP && m_pFront[TileOnTheRight].m_Flags == ROTATION_270) || (m_pFront[TileOnTheLeft].m_Index == TILE_STOP && m_pFront[TileOnTheLeft].m_Flags == ROTATION_90))
+			return true;
+		if((m_pFront[TileBelow].m_Index == TILE_STOP && m_pFront[TileBelow].m_Flags == ROTATION_0) || (m_pFront[TileAbove].m_Index == TILE_STOP && m_pFront[TileAbove].m_Flags == ROTATION_180))
+			return true;
+	}
+	if(m_pDoor)
+	{
+		if(m_pDoor[TileOnTheRight].m_Index == TILE_STOPA || m_pDoor[TileOnTheLeft].m_Index == TILE_STOPA || ((m_pDoor[TileOnTheRight].m_Index == TILE_STOPS || m_pDoor[TileOnTheLeft].m_Index == TILE_STOPS)))
+			return true;
+		if(m_pDoor[TileBelow].m_Index == TILE_STOPA || m_pDoor[TileAbove].m_Index == TILE_STOPA || ((m_pDoor[TileBelow].m_Index == TILE_STOPS || m_pDoor[TileAbove].m_Index == TILE_STOPS) && m_pDoor[TileBelow].m_Flags | ROTATION_180 | ROTATION_0))
+			return true;
+		if((m_pDoor[TileOnTheRight].m_Index == TILE_STOP && m_pDoor[TileOnTheRight].m_Flags == ROTATION_270) || (m_pDoor[TileOnTheLeft].m_Index == TILE_STOP && m_pDoor[TileOnTheLeft].m_Flags == ROTATION_90))
+			return true;
+		if((m_pDoor[TileBelow].m_Index == TILE_STOP && m_pDoor[TileBelow].m_Flags == ROTATION_0) || (m_pDoor[TileAbove].m_Index == TILE_STOP && m_pDoor[TileAbove].m_Flags == ROTATION_180))
+			return true;
+	}
+	return false;
+}
+
+int CCollision::GetMapIndex(vec2 Pos) const
+{
+	int Nx = clamp((int)Pos.x / 32, 0, m_Width - 1);
+	int Ny = clamp((int)Pos.y / 32, 0, m_Height - 1);
+	int Index = Ny * m_Width + Nx;
+
+	if(TileExists(Index))
+		return Index;
+	else
+		return -1;
+}
+
+std::vector<int> CCollision::GetMapIndices(vec2 PrevPos, vec2 Pos, unsigned MaxIndices) const
+{
+	std::vector<int> vIndices;
+	float d = distance(PrevPos, Pos);
+	int End(d + 1);
+	if(!d)
+	{
+		int Nx = clamp((int)Pos.x / 32, 0, m_Width - 1);
+		int Ny = clamp((int)Pos.y / 32, 0, m_Height - 1);
+		int Index = Ny * m_Width + Nx;
+
+		if(TileExists(Index))
+		{
+			vIndices.push_back(Index);
+			return vIndices;
+		}
+		else
+			return vIndices;
+	}
+	else
+	{
+		int LastIndex = 0;
+		for(int i = 0; i < End; i++)
+		{
+			float a = i / d;
+			vec2 Tmp = mix(PrevPos, Pos, a);
+			int Nx = clamp((int)Tmp.x / 32, 0, m_Width - 1);
+			int Ny = clamp((int)Tmp.y / 32, 0, m_Height - 1);
+			int Index = Ny * m_Width + Nx;
+			if(TileExists(Index) && LastIndex != Index)
+			{
+				if(MaxIndices && vIndices.size() > MaxIndices)
+					return vIndices;
+				vIndices.push_back(Index);
+				LastIndex = Index;
+			}
+		}
+
+		return vIndices;
+	}
+}
+
+vec2 CCollision::GetPos(int Index) const
+{
+	if(Index < 0)
+		return vec2(0, 0);
+
+	int x = Index % m_Width;
+	int y = Index / m_Width;
+	return vec2(x * 32 + 16, y * 32 + 16);
+}
+
+int CCollision::GetTileIndex(int Index) const
+{
+	if(Index < 0)
+		return 0;
+	return m_pTiles[Index].m_Index;
+}
+
+int CCollision::GetFTileIndex(int Index) const
+{
+	if(Index < 0 || !m_pFront)
+		return 0;
+	return m_pFront[Index].m_Index;
+}
+
+int CCollision::GetTileFlags(int Index) const
+{
+	if(Index < 0)
+		return 0;
+	return m_pTiles[Index].m_Flags;
+}
+
+int CCollision::GetFTileFlags(int Index) const
+{
+	if(Index < 0 || !m_pFront)
+		return 0;
+	return m_pFront[Index].m_Flags;
+}
+
+int CCollision::GetIndex(int Nx, int Ny) const
+{
+	return m_pTiles[Ny * m_Width + Nx].m_Index;
+}
+
+int CCollision::GetIndex(vec2 PrevPos, vec2 Pos) const
+{
+	float Distance = distance(PrevPos, Pos);
+
+	if(!Distance)
+	{
+		int Nx = clamp((int)Pos.x / 32, 0, m_Width - 1);
+		int Ny = clamp((int)Pos.y / 32, 0, m_Height - 1);
+
+		if((m_pTele) ||
+			(m_pSpeedup && m_pSpeedup[Ny * m_Width + Nx].m_Force > 0))
+		{
+			return Ny * m_Width + Nx;
+		}
+	}
+
+	for(int i = 0, id = std::ceil(Distance); i < id; i++)
+	{
+		float a = (float)i / Distance;
+		vec2 Tmp = mix(PrevPos, Pos, a);
+		int Nx = clamp((int)Tmp.x / 32, 0, m_Width - 1);
+		int Ny = clamp((int)Tmp.y / 32, 0, m_Height - 1);
+		if((m_pTele) ||
+			(m_pSpeedup && m_pSpeedup[Ny * m_Width + Nx].m_Force > 0))
+		{
+			return Ny * m_Width + Nx;
+		}
+	}
+
+	return -1;
+}
+
+int CCollision::GetFIndex(int Nx, int Ny) const
+{
+	if(!m_pFront)
+		return 0;
+	return m_pFront[Ny * m_Width + Nx].m_Index;
+}
+
+int CCollision::GetFTile(int x, int y) const
+{
+	if(!m_pFront)
+		return 0;
+	int Nx = clamp(x / 32, 0, m_Width - 1);
+	int Ny = clamp(y / 32, 0, m_Height - 1);
+	if(m_pFront[Ny * m_Width + Nx].m_Index == TILE_DEATH || m_pFront[Ny * m_Width + Nx].m_Index == TILE_NOLASER)
+		return m_pFront[Ny * m_Width + Nx].m_Index;
+	else
+		return 0;
+}
+
+int CCollision::Entity(int x, int y, int Layer) const
+{
+	if(x < 0 || x >= m_Width || y < 0 || y >= m_Height)
+	{
+		const char *pName;
+		switch(Layer)
+		{
+		case LAYER_GAME:
+			pName = "Game";
+			break;
+		case LAYER_FRONT:
+			pName = "Front";
+			break;
+		case LAYER_SWITCH:
+			pName = "Switch";
+			break;
+		case LAYER_TELE:
+			pName = "Tele";
+			break;
+		case LAYER_SPEEDUP:
+			pName = "Speedup";
+			break;
+		case LAYER_TUNE:
+			pName = "Tune";
+			break;
+		default:
+			pName = "Unknown";
+		}
+		dbg_msg("collision", "Something is VERY wrong with the %s layer near (%d, %d). Please report this at https://github.com/ddnet/ddnet/issues, you will need to post the map as well and any steps that you think may have led to this.", pName, x, y);
+		return 0;
+	}
+	switch(Layer)
+	{
+	case LAYER_GAME:
+		return m_pTiles[y * m_Width + x].m_Index - ENTITY_OFFSET;
+	case LAYER_FRONT:
+		return m_pFront[y * m_Width + x].m_Index - ENTITY_OFFSET;
+	case LAYER_SWITCH:
+		return m_pSwitch[y * m_Width + x].m_Type - ENTITY_OFFSET;
+	case LAYER_TELE:
+		return m_pTele[y * m_Width + x].m_Type - ENTITY_OFFSET;
+	case LAYER_SPEEDUP:
+		return m_pSpeedup[y * m_Width + x].m_Type - ENTITY_OFFSET;
+	case LAYER_TUNE:
+		return m_pTune[y * m_Width + x].m_Type - ENTITY_OFFSET;
+	default:
+		return 0;
+		break;
+	}
+}
+
+void CCollision::SetCollisionAt(float x, float y, int id)
+{
+	int Nx = clamp(round_to_int(x) / 32, 0, m_Width - 1);
+	int Ny = clamp(round_to_int(y) / 32, 0, m_Height - 1);
+
+	m_pTiles[Ny * m_Width + Nx].m_Index = id;
+}
+
+void CCollision::SetDCollisionAt(float x, float y, int Type, int Flags, int Number)
+{
+	if(!m_pDoor)
+		return;
+	int Nx = clamp(round_to_int(x) / 32, 0, m_Width - 1);
+	int Ny = clamp(round_to_int(y) / 32, 0, m_Height - 1);
+
+	m_pDoor[Ny * m_Width + Nx].m_Index = Type;
+	m_pDoor[Ny * m_Width + Nx].m_Flags = Flags;
+	m_pDoor[Ny * m_Width + Nx].m_Number = Number;
+}
+
+int CCollision::GetDTileIndex(int Index) const
+{
+	if(!m_pDoor || Index < 0 || !m_pDoor[Index].m_Index)
+		return 0;
+	return m_pDoor[Index].m_Index;
+}
+
+int CCollision::GetDTileNumber(int Index) const
+{
+	if(!m_pDoor || Index < 0 || !m_pDoor[Index].m_Index)
+		return 0;
+	if(m_pDoor[Index].m_Number)
+		return m_pDoor[Index].m_Number;
+	return 0;
+}
+
+int CCollision::GetDTileFlags(int Index) const
+{
+	if(!m_pDoor || Index < 0 || !m_pDoor[Index].m_Index)
+		return 0;
+	return m_pDoor[Index].m_Flags;
+}
+
+void ThroughOffset(vec2 Pos0, vec2 Pos1, int *pOffsetX, int *pOffsetY)
+{
+	float x = Pos0.x - Pos1.x;
+	float y = Pos0.y - Pos1.y;
+	if(absolute(x) > absolute(y))
+	{
+		if(x < 0)
+		{
+			*pOffsetX = -32;
+			*pOffsetY = 0;
+		}
+		else
+		{
+			*pOffsetX = 32;
+			*pOffsetY = 0;
+		}
+	}
+	else
+	{
+		if(y < 0)
+		{
+			*pOffsetX = 0;
+			*pOffsetY = -32;
+		}
+		else
+		{
+			*pOffsetX = 0;
+			*pOffsetY = 32;
+		}
+	}
+}
+
+int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const
+{
+	float d = distance(Pos0, Pos1);
+	vec2 Last = Pos0;
+
+	for(int i = 0, id = std::ceil(d); i < id; i++)
+	{
+		float a = (int)i / d;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		int Nx = clamp(round_to_int(Pos.x) / 32, 0, m_Width - 1);
+		int Ny = clamp(round_to_int(Pos.y) / 32, 0, m_Height - 1);
+		if(GetIndex(Nx, Ny) == TILE_SOLID || GetIndex(Nx, Ny) == TILE_NOHOOK || GetIndex(Nx, Ny) == TILE_NOLASER || GetFIndex(Nx, Ny) == TILE_NOLASER)
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			if(GetFIndex(Nx, Ny) == TILE_NOLASER)
+				return GetFCollisionAt(Pos.x, Pos.y);
+			else
+				return GetCollisionAt(Pos.x, Pos.y);
+		}
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+int CCollision::IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const
+{
+	float d = distance(Pos0, Pos1);
+	vec2 Last = Pos0;
+
+	for(int i = 0, id = std::ceil(d); i < id; i++)
+	{
+		float a = (float)i / d;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		if(IsNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)) || IsFNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)))
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			if(IsNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)))
+				return GetCollisionAt(Pos.x, Pos.y);
+			else
+				return GetFCollisionAt(Pos.x, Pos.y);
+		}
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+int CCollision::IntersectAir(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const
+{
+	float d = distance(Pos0, Pos1);
+	vec2 Last = Pos0;
+
+	for(int i = 0, id = std::ceil(d); i < id; i++)
+	{
+		float a = (float)i / d;
+		vec2 Pos = mix(Pos0, Pos1, a);
+		if(IsSolid(round_to_int(Pos.x), round_to_int(Pos.y)) || (!GetTile(round_to_int(Pos.x), round_to_int(Pos.y)) && !GetFTile(round_to_int(Pos.x), round_to_int(Pos.y))))
+		{
+			if(pOutCollision)
+				*pOutCollision = Pos;
+			if(pOutBeforeCollision)
+				*pOutBeforeCollision = Last;
+			if(!GetTile(round_to_int(Pos.x), round_to_int(Pos.y)) && !GetFTile(round_to_int(Pos.x), round_to_int(Pos.y)))
+				return -1;
+			else if(!GetTile(round_to_int(Pos.x), round_to_int(Pos.y)))
+				return GetTile(round_to_int(Pos.x), round_to_int(Pos.y));
+			else
+				return GetFTile(round_to_int(Pos.x), round_to_int(Pos.y));
+		}
+		Last = Pos;
+	}
+	if(pOutCollision)
+		*pOutCollision = Pos1;
+	if(pOutBeforeCollision)
+		*pOutBeforeCollision = Pos1;
+	return 0;
+}
+
+int CCollision::IsTimeCheckpoint(int Index) const
+{
+	if(Index < 0)
+		return -1;
+
+	int z = m_pTiles[Index].m_Index;
+	if(z >= TILE_TIME_CHECKPOINT_FIRST && z <= TILE_TIME_CHECKPOINT_LAST)
+		return z - TILE_TIME_CHECKPOINT_FIRST;
+	return -1;
+}
+
+int CCollision::IsFTimeCheckpoint(int Index) const
+{
+	if(Index < 0 || !m_pFront)
+		return -1;
+
+	int z = m_pFront[Index].m_Index;
+	if(z >= TILE_TIME_CHECKPOINT_FIRST && z <= TILE_TIME_CHECKPOINT_LAST)
+		return z - TILE_TIME_CHECKPOINT_FIRST;
+	return -1;
+}
diff --git a/src_bkp/game/collision.h b/src_bkp/game/collision.h
new file mode 100644
index 0000000000..351ac05dd2
--- /dev/null
+++ b/src_bkp/game/collision.h
@@ -0,0 +1,129 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_COLLISION_H
+#define GAME_COLLISION_H
+
+#include <base/vmath.h>
+#include <engine/shared/protocol.h>
+
+#include <vector>
+
+enum
+{
+	CANTMOVE_LEFT = 1 << 0,
+	CANTMOVE_RIGHT = 1 << 1,
+	CANTMOVE_UP = 1 << 2,
+	CANTMOVE_DOWN = 1 << 3,
+};
+
+vec2 ClampVel(int MoveRestriction, vec2 Vel);
+
+typedef bool (*CALLBACK_SWITCHACTIVE)(int Number, void *pUser);
+struct CAntibotMapData;
+
+class CCollision
+{
+	class CTile *m_pTiles;
+	int m_Width;
+	int m_Height;
+	class CLayers *m_pLayers;
+
+public:
+	CCollision();
+	~CCollision();
+	void Init(class CLayers *pLayers);
+	void FillAntibot(CAntibotMapData *pMapData);
+	bool CheckPoint(float x, float y) const { return IsSolid(round_to_int(x), round_to_int(y)); }
+	bool CheckPoint(vec2 Pos) const { return CheckPoint(Pos.x, Pos.y); }
+	int GetCollisionAt(float x, float y) const { return GetTile(round_to_int(x), round_to_int(y)); }
+	int GetWidth() const { return m_Width; }
+	int GetHeight() const { return m_Height; }
+	int IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const;
+	int IntersectLineTeleWeapon(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision, int *pTeleNr = nullptr) const;
+	int IntersectLineTeleHook(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision, int *pTeleNr = nullptr) const;
+	void MovePoint(vec2 *pInoutPos, vec2 *pInoutVel, float Elasticity, int *pBounces) const;
+	void MoveBox(vec2 *pInoutPos, vec2 *pInoutVel, vec2 Size, vec2 Elasticity, bool *pGrounded = nullptr) const;
+	bool TestBox(vec2 Pos, vec2 Size) const;
+
+	// DDRace
+
+	void Dest();
+	void SetCollisionAt(float x, float y, int id);
+	void SetDTile(float x, float y, bool State);
+	void SetDCollisionAt(float x, float y, int Type, int Flags, int Number);
+	int GetDTileIndex(int Index) const;
+	int GetDTileFlags(int Index) const;
+	int GetDTileNumber(int Index) const;
+	int GetFCollisionAt(float x, float y) const { return GetFTile(round_to_int(x), round_to_int(y)); }
+	int IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const;
+	int IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const;
+	int IntersectAir(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision) const;
+	int GetIndex(int x, int y) const;
+	int GetIndex(vec2 PrevPos, vec2 Pos) const;
+	int GetFIndex(int x, int y) const;
+
+	int GetMoveRestrictions(CALLBACK_SWITCHACTIVE pfnSwitchActive, void *pUser, vec2 Pos, float Distance = 18.0f, int OverrideCenterTileIndex = -1) const;
+	int GetMoveRestrictions(vec2 Pos, float Distance = 18.0f)
+	{
+		return GetMoveRestrictions(nullptr, nullptr, Pos, Distance);
+	}
+
+	int GetTile(int x, int y) const;
+	int GetFTile(int x, int y) const;
+	int Entity(int x, int y, int Layer) const;
+	int GetPureMapIndex(float x, float y) const;
+	int GetPureMapIndex(vec2 Pos) const { return GetPureMapIndex(Pos.x, Pos.y); }
+	std::vector<int> GetMapIndices(vec2 PrevPos, vec2 Pos, unsigned MaxIndices = 0) const;
+	int GetMapIndex(vec2 Pos) const;
+	bool TileExists(int Index) const;
+	bool TileExistsNext(int Index) const;
+	vec2 GetPos(int Index) const;
+	int GetTileIndex(int Index) const;
+	int GetFTileIndex(int Index) const;
+	int GetTileFlags(int Index) const;
+	int GetFTileFlags(int Index) const;
+	int IsTeleport(int Index) const;
+	int IsEvilTeleport(int Index) const;
+	bool IsCheckTeleport(int Index) const;
+	bool IsCheckEvilTeleport(int Index) const;
+	int IsTeleportWeapon(int Index) const;
+	int IsTeleportHook(int Index) const;
+	int IsTeleCheckpoint(int Index) const;
+	int IsSpeedup(int Index) const;
+	int IsTune(int Index) const;
+	void GetSpeedup(int Index, vec2 *pDir, int *pForce, int *pMaxSpeed) const;
+	int GetSwitchType(int Index) const;
+	int GetSwitchNumber(int Index) const;
+	int GetSwitchDelay(int Index) const;
+
+	int IsSolid(int x, int y) const;
+	bool IsThrough(int x, int y, int xoff, int yoff, vec2 pos0, vec2 pos1) const;
+	bool IsHookBlocker(int x, int y, vec2 pos0, vec2 pos1) const;
+	int IsWallJump(int Index) const;
+	int IsNoLaser(int x, int y) const;
+	int IsFNoLaser(int x, int y) const;
+
+	int IsTimeCheckpoint(int Index) const;
+	int IsFTimeCheckpoint(int Index) const;
+
+	int IsMover(int x, int y, int *pFlags) const;
+
+	vec2 CpSpeed(int index, int Flags = 0) const;
+
+	class CTeleTile *TeleLayer() { return m_pTele; }
+	class CSwitchTile *SwitchLayer() { return m_pSwitch; }
+	class CTuneTile *TuneLayer() { return m_pTune; }
+	class CLayers *Layers() { return m_pLayers; }
+	int m_HighestSwitchNumber;
+
+private:
+	class CTeleTile *m_pTele;
+	class CSpeedupTile *m_pSpeedup;
+	class CTile *m_pFront;
+	class CSwitchTile *m_pSwitch;
+	class CTuneTile *m_pTune;
+	class CDoorTile *m_pDoor;
+};
+
+void ThroughOffset(vec2 Pos0, vec2 Pos1, int *pOffsetX, int *pOffsetY);
+#endif
diff --git a/src/game/ddracechat.h b/src_bkp/game/ddracechat.h
similarity index 100%
rename from src/game/ddracechat.h
rename to src_bkp/game/ddracechat.h
diff --git a/src/game/ddracecommands.h b/src_bkp/game/ddracecommands.h
similarity index 100%
rename from src/game/ddracecommands.h
rename to src_bkp/game/ddracecommands.h
diff --git a/src_bkp/game/editor/auto_map.cpp b/src_bkp/game/editor/auto_map.cpp
new file mode 100644
index 0000000000..4f58f8e0fd
--- /dev/null
+++ b/src_bkp/game/editor/auto_map.cpp
@@ -0,0 +1,554 @@
+#include <cinttypes>
+#include <cstdio> // sscanf
+
+#include <engine/console.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+
+#include <game/mapitems.h>
+
+#include "auto_map.h"
+#include "editor.h" // TODO: only needs CLayerTiles
+#include "editor_actions.h"
+
+// Based on triple32inc from https://github.com/skeeto/hash-prospector/tree/79a6074062a84907df6e45b756134b74e2956760
+static uint32_t HashUInt32(uint32_t Num)
+{
+	Num++;
+	Num ^= Num >> 17;
+	Num *= 0xed5ad4bbu;
+	Num ^= Num >> 11;
+	Num *= 0xac4c1b51u;
+	Num ^= Num >> 15;
+	Num *= 0x31848babu;
+	Num ^= Num >> 14;
+	return Num;
+}
+
+#define HASH_MAX 65536
+
+static int HashLocation(uint32_t Seed, uint32_t Run, uint32_t Rule, uint32_t X, uint32_t Y)
+{
+	const uint32_t Prime = 31;
+	uint32_t Hash = 1;
+	Hash = Hash * Prime + HashUInt32(Seed);
+	Hash = Hash * Prime + HashUInt32(Run);
+	Hash = Hash * Prime + HashUInt32(Rule);
+	Hash = Hash * Prime + HashUInt32(X);
+	Hash = Hash * Prime + HashUInt32(Y);
+	Hash = HashUInt32(Hash * Prime); // Just to double-check that values are well-distributed
+	return Hash % HASH_MAX;
+}
+
+CAutoMapper::CAutoMapper(CEditor *pEditor)
+{
+	Init(pEditor);
+}
+
+void CAutoMapper::Load(const char *pTileName)
+{
+	char aPath[IO_MAX_PATH_LENGTH];
+	str_format(aPath, sizeof(aPath), "editor/automap/%s.rules", pTileName);
+	IOHANDLE RulesFile = Storage()->OpenFile(aPath, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!RulesFile)
+	{
+		char aBuf[IO_MAX_PATH_LENGTH + 32];
+		str_format(aBuf, sizeof(aBuf), "failed to load %s", aPath);
+		Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
+		return;
+	}
+
+	CLineReader LineReader;
+	LineReader.Init(RulesFile);
+
+	CConfiguration *pCurrentConf = nullptr;
+	CRun *pCurrentRun = nullptr;
+	CIndexRule *pCurrentIndex = nullptr;
+
+	// read each line
+	while(char *pLine = LineReader.Get())
+	{
+		// skip blank/empty lines as well as comments
+		if(str_length(pLine) > 0 && pLine[0] != '#' && pLine[0] != '\n' && pLine[0] != '\r' && pLine[0] != '\t' && pLine[0] != '\v' && pLine[0] != ' ')
+		{
+			if(pLine[0] == '[')
+			{
+				// new configuration, get the name
+				pLine++;
+				CConfiguration NewConf;
+				NewConf.m_aName[0] = '\0';
+				NewConf.m_StartX = 0;
+				NewConf.m_StartY = 0;
+				NewConf.m_EndX = 0;
+				NewConf.m_EndY = 0;
+				m_vConfigs.push_back(NewConf);
+				int ConfigurationID = m_vConfigs.size() - 1;
+				pCurrentConf = &m_vConfigs[ConfigurationID];
+				str_copy(pCurrentConf->m_aName, pLine, minimum<int>(sizeof(pCurrentConf->m_aName), str_length(pLine)));
+
+				// add start run
+				CRun NewRun;
+				NewRun.m_AutomapCopy = true;
+				pCurrentConf->m_vRuns.push_back(NewRun);
+				int RunID = pCurrentConf->m_vRuns.size() - 1;
+				pCurrentRun = &pCurrentConf->m_vRuns[RunID];
+			}
+			else if(str_startswith(pLine, "NewRun") && pCurrentConf)
+			{
+				// add new run
+				CRun NewRun;
+				NewRun.m_AutomapCopy = true;
+				pCurrentConf->m_vRuns.push_back(NewRun);
+				int RunID = pCurrentConf->m_vRuns.size() - 1;
+				pCurrentRun = &pCurrentConf->m_vRuns[RunID];
+			}
+			else if(str_startswith(pLine, "Index") && pCurrentRun)
+			{
+				// new index
+				int ID = 0;
+				char aOrientation1[128] = "";
+				char aOrientation2[128] = "";
+				char aOrientation3[128] = "";
+
+				sscanf(pLine, "Index %d %127s %127s %127s", &ID, aOrientation1, aOrientation2, aOrientation3);
+
+				CIndexRule NewIndexRule;
+				NewIndexRule.m_ID = ID;
+				NewIndexRule.m_Flag = 0;
+				NewIndexRule.m_RandomProbability = 1.0f;
+				NewIndexRule.m_DefaultRule = true;
+				NewIndexRule.m_SkipEmpty = false;
+				NewIndexRule.m_SkipFull = false;
+
+				if(str_length(aOrientation1) > 0)
+				{
+					if(!str_comp(aOrientation1, "XFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_XFLIP;
+					else if(!str_comp(aOrientation1, "YFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_YFLIP;
+					else if(!str_comp(aOrientation1, "ROTATE"))
+						NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
+				}
+
+				if(str_length(aOrientation2) > 0)
+				{
+					if(!str_comp(aOrientation2, "XFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_XFLIP;
+					else if(!str_comp(aOrientation2, "YFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_YFLIP;
+					else if(!str_comp(aOrientation2, "ROTATE"))
+						NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
+				}
+
+				if(str_length(aOrientation3) > 0)
+				{
+					if(!str_comp(aOrientation3, "XFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_XFLIP;
+					else if(!str_comp(aOrientation3, "YFLIP"))
+						NewIndexRule.m_Flag |= TILEFLAG_YFLIP;
+					else if(!str_comp(aOrientation3, "ROTATE"))
+						NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
+				}
+
+				// add the index rule object and make it current
+				pCurrentRun->m_vIndexRules.push_back(NewIndexRule);
+				int IndexRuleID = pCurrentRun->m_vIndexRules.size() - 1;
+				pCurrentIndex = &pCurrentRun->m_vIndexRules[IndexRuleID];
+			}
+			else if(str_startswith(pLine, "Pos") && pCurrentIndex)
+			{
+				int x = 0, y = 0;
+				char aValue[128];
+				int Value = CPosRule::NORULE;
+				std::vector<CIndexInfo> vNewIndexList;
+
+				sscanf(pLine, "Pos %d %d %127s", &x, &y, aValue);
+
+				if(!str_comp(aValue, "EMPTY"))
+				{
+					Value = CPosRule::INDEX;
+					CIndexInfo NewIndexInfo = {0, 0, false};
+					vNewIndexList.push_back(NewIndexInfo);
+				}
+				else if(!str_comp(aValue, "FULL"))
+				{
+					Value = CPosRule::NOTINDEX;
+					CIndexInfo NewIndexInfo1 = {0, 0, false};
+					// CIndexInfo NewIndexInfo2 = {-1, 0};
+					vNewIndexList.push_back(NewIndexInfo1);
+					// vNewIndexList.push_back(NewIndexInfo2);
+				}
+				else if(!str_comp(aValue, "INDEX") || !str_comp(aValue, "NOTINDEX"))
+				{
+					if(!str_comp(aValue, "INDEX"))
+						Value = CPosRule::INDEX;
+					else
+						Value = CPosRule::NOTINDEX;
+
+					int pWord = 4;
+					while(true)
+					{
+						int ID = 0;
+						char aOrientation1[128] = "";
+						char aOrientation2[128] = "";
+						char aOrientation3[128] = "";
+						char aOrientation4[128] = "";
+						sscanf(str_trim_words(pLine, pWord), "%d %127s %127s %127s %127s", &ID, aOrientation1, aOrientation2, aOrientation3, aOrientation4);
+
+						CIndexInfo NewIndexInfo;
+						NewIndexInfo.m_ID = ID;
+						NewIndexInfo.m_Flag = 0;
+						NewIndexInfo.m_TestFlag = false;
+
+						if(!str_comp(aOrientation1, "OR"))
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							pWord += 2;
+							continue;
+						}
+						else if(str_length(aOrientation1) > 0)
+						{
+							NewIndexInfo.m_TestFlag = true;
+							if(!str_comp(aOrientation1, "XFLIP"))
+								NewIndexInfo.m_Flag = TILEFLAG_XFLIP;
+							else if(!str_comp(aOrientation1, "YFLIP"))
+								NewIndexInfo.m_Flag = TILEFLAG_YFLIP;
+							else if(!str_comp(aOrientation1, "ROTATE"))
+								NewIndexInfo.m_Flag = TILEFLAG_ROTATE;
+							else if(!str_comp(aOrientation1, "NONE"))
+								NewIndexInfo.m_Flag = 0;
+							else
+								NewIndexInfo.m_TestFlag = false;
+						}
+						else
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							break;
+						}
+
+						if(!str_comp(aOrientation2, "OR"))
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							pWord += 3;
+							continue;
+						}
+						else if(str_length(aOrientation2) > 0 && NewIndexInfo.m_Flag != 0)
+						{
+							if(!str_comp(aOrientation2, "XFLIP"))
+								NewIndexInfo.m_Flag |= TILEFLAG_XFLIP;
+							else if(!str_comp(aOrientation2, "YFLIP"))
+								NewIndexInfo.m_Flag |= TILEFLAG_YFLIP;
+							else if(!str_comp(aOrientation2, "ROTATE"))
+								NewIndexInfo.m_Flag |= TILEFLAG_ROTATE;
+						}
+						else
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							break;
+						}
+
+						if(!str_comp(aOrientation3, "OR"))
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							pWord += 4;
+							continue;
+						}
+						else if(str_length(aOrientation3) > 0 && NewIndexInfo.m_Flag != 0)
+						{
+							if(!str_comp(aOrientation3, "XFLIP"))
+								NewIndexInfo.m_Flag |= TILEFLAG_XFLIP;
+							else if(!str_comp(aOrientation3, "YFLIP"))
+								NewIndexInfo.m_Flag |= TILEFLAG_YFLIP;
+							else if(!str_comp(aOrientation3, "ROTATE"))
+								NewIndexInfo.m_Flag |= TILEFLAG_ROTATE;
+						}
+						else
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							break;
+						}
+
+						if(!str_comp(aOrientation4, "OR"))
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							pWord += 5;
+							continue;
+						}
+						else
+						{
+							vNewIndexList.push_back(NewIndexInfo);
+							break;
+						}
+					}
+				}
+
+				if(Value != CPosRule::NORULE)
+				{
+					CPosRule NewPosRule = {x, y, Value, vNewIndexList};
+					pCurrentIndex->m_vRules.push_back(NewPosRule);
+
+					pCurrentConf->m_StartX = minimum(pCurrentConf->m_StartX, NewPosRule.m_X);
+					pCurrentConf->m_StartY = minimum(pCurrentConf->m_StartY, NewPosRule.m_Y);
+					pCurrentConf->m_EndX = maximum(pCurrentConf->m_EndX, NewPosRule.m_X);
+					pCurrentConf->m_EndY = maximum(pCurrentConf->m_EndY, NewPosRule.m_Y);
+
+					if(x == 0 && y == 0)
+					{
+						for(const auto &Index : vNewIndexList)
+						{
+							if(Value == CPosRule::INDEX && Index.m_ID == 0)
+								pCurrentIndex->m_SkipFull = true;
+							else
+								pCurrentIndex->m_SkipEmpty = true;
+						}
+					}
+				}
+			}
+			else if(str_startswith(pLine, "Random") && pCurrentIndex)
+			{
+				float Value;
+				char Specifier = ' ';
+				sscanf(pLine, "Random %f%c", &Value, &Specifier);
+				if(Specifier == '%')
+				{
+					pCurrentIndex->m_RandomProbability = Value / 100.0f;
+				}
+				else
+				{
+					pCurrentIndex->m_RandomProbability = 1.0f / Value;
+				}
+			}
+			else if(str_startswith(pLine, "NoDefaultRule") && pCurrentIndex)
+			{
+				pCurrentIndex->m_DefaultRule = false;
+			}
+			else if(str_startswith(pLine, "NoLayerCopy") && pCurrentRun)
+			{
+				pCurrentRun->m_AutomapCopy = false;
+			}
+		}
+	}
+
+	// add default rule for Pos 0 0 if there is none
+	for(auto &Config : m_vConfigs)
+	{
+		for(auto &Run : Config.m_vRuns)
+		{
+			for(auto &IndexRule : Run.m_vIndexRules)
+			{
+				bool Found = false;
+				for(const auto &Rule : IndexRule.m_vRules)
+				{
+					if(Rule.m_X == 0 && Rule.m_Y == 0)
+					{
+						Found = true;
+						break;
+					}
+				}
+				if(!Found && IndexRule.m_DefaultRule)
+				{
+					std::vector<CIndexInfo> vNewIndexList;
+					CIndexInfo NewIndexInfo = {0, 0, false};
+					vNewIndexList.push_back(NewIndexInfo);
+					CPosRule NewPosRule = {0, 0, CPosRule::NOTINDEX, vNewIndexList};
+					IndexRule.m_vRules.push_back(NewPosRule);
+
+					IndexRule.m_SkipEmpty = true;
+					IndexRule.m_SkipFull = false;
+				}
+				if(IndexRule.m_SkipEmpty && IndexRule.m_SkipFull)
+				{
+					IndexRule.m_SkipEmpty = false;
+					IndexRule.m_SkipFull = false;
+				}
+			}
+		}
+	}
+
+	io_close(RulesFile);
+
+	char aBuf[IO_MAX_PATH_LENGTH + 16];
+	str_format(aBuf, sizeof(aBuf), "loaded %s", aPath);
+	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor/automap", aBuf);
+
+	m_FileLoaded = true;
+}
+
+const char *CAutoMapper::GetConfigName(int Index)
+{
+	if(Index < 0 || Index >= (int)m_vConfigs.size())
+		return "";
+
+	return m_vConfigs[Index].m_aName;
+}
+
+void CAutoMapper::ProceedLocalized(CLayerTiles *pLayer, int ConfigID, int Seed, int X, int Y, int Width, int Height)
+{
+	if(!m_FileLoaded || pLayer->m_Readonly || ConfigID < 0 || ConfigID >= (int)m_vConfigs.size())
+		return;
+
+	if(Width < 0)
+		Width = pLayer->m_Width;
+
+	if(Height < 0)
+		Height = pLayer->m_Height;
+
+	CConfiguration *pConf = &m_vConfigs[ConfigID];
+
+	int CommitFromX = clamp(X + pConf->m_StartX, 0, pLayer->m_Width);
+	int CommitFromY = clamp(Y + pConf->m_StartY, 0, pLayer->m_Height);
+	int CommitToX = clamp(X + Width + pConf->m_EndX, 0, pLayer->m_Width);
+	int CommitToY = clamp(Y + Height + pConf->m_EndY, 0, pLayer->m_Height);
+
+	int UpdateFromX = clamp(X + 3 * pConf->m_StartX, 0, pLayer->m_Width);
+	int UpdateFromY = clamp(Y + 3 * pConf->m_StartY, 0, pLayer->m_Height);
+	int UpdateToX = clamp(X + Width + 3 * pConf->m_EndX, 0, pLayer->m_Width);
+	int UpdateToY = clamp(Y + Height + 3 * pConf->m_EndY, 0, pLayer->m_Height);
+
+	CLayerTiles *pUpdateLayer = new CLayerTiles(Editor(), UpdateToX - UpdateFromX, UpdateToY - UpdateFromY);
+
+	for(int y = UpdateFromY; y < UpdateToY; y++)
+	{
+		for(int x = UpdateFromX; x < UpdateToX; x++)
+		{
+			CTile *pIn = &pLayer->m_pTiles[y * pLayer->m_Width + x];
+			CTile *pOut = &pUpdateLayer->m_pTiles[(y - UpdateFromY) * pUpdateLayer->m_Width + x - UpdateFromX];
+			pOut->m_Index = pIn->m_Index;
+			pOut->m_Flags = pIn->m_Flags;
+		}
+	}
+
+	Proceed(pUpdateLayer, ConfigID, Seed, UpdateFromX, UpdateFromY);
+
+	for(int y = CommitFromY; y < CommitToY; y++)
+	{
+		for(int x = CommitFromX; x < CommitToX; x++)
+		{
+			CTile *pIn = &pUpdateLayer->m_pTiles[(y - UpdateFromY) * pUpdateLayer->m_Width + x - UpdateFromX];
+			CTile *pOut = &pLayer->m_pTiles[y * pLayer->m_Width + x];
+			CTile Previous = *pOut;
+			pOut->m_Index = pIn->m_Index;
+			pOut->m_Flags = pIn->m_Flags;
+			pLayer->RecordStateChange(x, y, Previous, *pOut);
+		}
+	}
+
+	delete pUpdateLayer;
+}
+
+void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID, int Seed, int SeedOffsetX, int SeedOffsetY)
+{
+	if(!m_FileLoaded || pLayer->m_Readonly || ConfigID < 0 || ConfigID >= (int)m_vConfigs.size())
+		return;
+
+	if(Seed == 0)
+		Seed = rand();
+
+	CConfiguration *pConf = &m_vConfigs[ConfigID];
+	pLayer->ClearHistory();
+
+	// for every run: copy tiles, automap, overwrite tiles
+	for(size_t h = 0; h < pConf->m_vRuns.size(); ++h)
+	{
+		CRun *pRun = &pConf->m_vRuns[h];
+
+		// don't make copy if it's requested
+		CLayerTiles *pReadLayer;
+		if(pRun->m_AutomapCopy)
+		{
+			pReadLayer = new CLayerTiles(Editor(), pLayer->m_Width, pLayer->m_Height);
+
+			for(int y = 0; y < pLayer->m_Height; y++)
+			{
+				for(int x = 0; x < pLayer->m_Width; x++)
+				{
+					CTile *pIn = &pLayer->m_pTiles[y * pLayer->m_Width + x];
+					CTile *pOut = &pReadLayer->m_pTiles[y * pLayer->m_Width + x];
+					pOut->m_Index = pIn->m_Index;
+					pOut->m_Flags = pIn->m_Flags;
+				}
+			}
+		}
+		else
+		{
+			pReadLayer = pLayer;
+		}
+
+		// auto map
+		for(int y = 0; y < pLayer->m_Height; y++)
+		{
+			for(int x = 0; x < pLayer->m_Width; x++)
+			{
+				CTile *pTile = &(pLayer->m_pTiles[y * pLayer->m_Width + x]);
+				Editor()->m_Map.OnModify();
+
+				for(size_t i = 0; i < pRun->m_vIndexRules.size(); ++i)
+				{
+					CIndexRule *pIndexRule = &pRun->m_vIndexRules[i];
+					if(pIndexRule->m_SkipEmpty && pTile->m_Index == 0) // skip empty tiles
+						continue;
+					if(pIndexRule->m_SkipFull && pTile->m_Index != 0) // skip full tiles
+						continue;
+
+					bool RespectRules = true;
+					for(size_t j = 0; j < pIndexRule->m_vRules.size() && RespectRules; ++j)
+					{
+						CPosRule *pRule = &pIndexRule->m_vRules[j];
+
+						int CheckIndex, CheckFlags;
+						int CheckX = x + pRule->m_X;
+						int CheckY = y + pRule->m_Y;
+						if(CheckX >= 0 && CheckX < pLayer->m_Width && CheckY >= 0 && CheckY < pLayer->m_Height)
+						{
+							int CheckTile = CheckY * pLayer->m_Width + CheckX;
+							CheckIndex = pReadLayer->m_pTiles[CheckTile].m_Index;
+							CheckFlags = pReadLayer->m_pTiles[CheckTile].m_Flags & (TILEFLAG_ROTATE | TILEFLAG_XFLIP | TILEFLAG_YFLIP);
+						}
+						else
+						{
+							CheckIndex = -1;
+							CheckFlags = 0;
+						}
+
+						if(pRule->m_Value == CPosRule::INDEX)
+						{
+							RespectRules = false;
+							for(const auto &Index : pRule->m_vIndexList)
+							{
+								if(CheckIndex == Index.m_ID && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
+								{
+									RespectRules = true;
+									break;
+								}
+							}
+						}
+						else if(pRule->m_Value == CPosRule::NOTINDEX)
+						{
+							for(const auto &Index : pRule->m_vIndexList)
+							{
+								if(CheckIndex == Index.m_ID && (!Index.m_TestFlag || CheckFlags == Index.m_Flag))
+								{
+									RespectRules = false;
+									break;
+								}
+							}
+						}
+					}
+
+					if(RespectRules &&
+						(pIndexRule->m_RandomProbability >= 1.0f || HashLocation(Seed, h, i, x + SeedOffsetX, y + SeedOffsetY) < HASH_MAX * pIndexRule->m_RandomProbability))
+					{
+						CTile Previous = *pTile;
+						pTile->m_Index = pIndexRule->m_ID;
+						pTile->m_Flags = pIndexRule->m_Flag;
+						pLayer->RecordStateChange(x, y, Previous, *pTile);
+					}
+				}
+			}
+		}
+
+		// clean-up
+		if(pRun->m_AutomapCopy && pReadLayer != pLayer)
+			delete pReadLayer;
+	}
+}
diff --git a/src_bkp/game/editor/auto_map.h b/src_bkp/game/editor/auto_map.h
new file mode 100644
index 0000000000..4e998af724
--- /dev/null
+++ b/src_bkp/game/editor/auto_map.h
@@ -0,0 +1,76 @@
+#ifndef GAME_EDITOR_AUTO_MAP_H
+#define GAME_EDITOR_AUTO_MAP_H
+
+#include <vector>
+
+#include "component.h"
+
+class CAutoMapper : public CEditorComponent
+{
+	struct CIndexInfo
+	{
+		int m_ID;
+		int m_Flag;
+		bool m_TestFlag;
+	};
+
+	struct CPosRule
+	{
+		int m_X;
+		int m_Y;
+		int m_Value;
+		std::vector<CIndexInfo> m_vIndexList;
+
+		enum
+		{
+			NORULE = 0,
+			INDEX,
+			NOTINDEX
+		};
+	};
+
+	struct CIndexRule
+	{
+		int m_ID;
+		std::vector<CPosRule> m_vRules;
+		int m_Flag;
+		float m_RandomProbability;
+		bool m_DefaultRule;
+		bool m_SkipEmpty;
+		bool m_SkipFull;
+	};
+
+	struct CRun
+	{
+		std::vector<CIndexRule> m_vIndexRules;
+		bool m_AutomapCopy;
+	};
+
+	struct CConfiguration
+	{
+		std::vector<CRun> m_vRuns;
+		char m_aName[128];
+		int m_StartX;
+		int m_StartY;
+		int m_EndX;
+		int m_EndY;
+	};
+
+public:
+	explicit CAutoMapper(CEditor *pEditor);
+
+	void Load(const char *pTileName);
+	void ProceedLocalized(class CLayerTiles *pLayer, int ConfigID, int Seed = 0, int X = 0, int Y = 0, int Width = -1, int Height = -1);
+	void Proceed(class CLayerTiles *pLayer, int ConfigID, int Seed = 0, int SeedOffsetX = 0, int SeedOffsetY = 0);
+
+	int ConfigNamesNum() const { return m_vConfigs.size(); }
+	const char *GetConfigName(int Index);
+
+	bool IsLoaded() const { return m_FileLoaded; }
+
+private:
+	std::vector<CConfiguration> m_vConfigs = {};
+	bool m_FileLoaded = false;
+};
+
+#endif
diff --git a/src_bkp/game/editor/component.cpp b/src_bkp/game/editor/component.cpp
new file mode 100644
index 0000000000..05e49ad29c
--- /dev/null
+++ b/src_bkp/game/editor/component.cpp
@@ -0,0 +1,24 @@
+#include "component.h"
+
+bool CEditorComponent::OnInput(const IInput::CEvent &Event)
+{
+	for(CEditorComponent &Component : m_vSubComponents)
+	{
+		if(Component.OnInput(Event))
+			return true;
+	}
+	return false;
+}
+
+void CEditorComponent::InitSubComponents()
+{
+	for(CEditorComponent &Component : m_vSubComponents)
+	{
+		Component.Init(Editor());
+	}
+}
+
+void CEditorComponent::RegisterSubComponent(CEditorComponent &Component)
+{
+	m_vSubComponents.emplace_back(Component);
+}
diff --git a/src_bkp/game/editor/component.h b/src_bkp/game/editor/component.h
new file mode 100644
index 0000000000..c5bb24697a
--- /dev/null
+++ b/src_bkp/game/editor/component.h
@@ -0,0 +1,31 @@
+#ifndef GAME_EDITOR_COMPONENT_H
+#define GAME_EDITOR_COMPONENT_H
+
+#include "editor_object.h"
+
+#include <vector>
+
+class CEditorComponent : public CEditorObject
+{
+public:
+	/**
+	 * Gets called before `OnRender`. Should return true
+	 * if the event was consumed. By default the events
+	 * are forwarded to the subcomponents.
+	 */
+	virtual bool OnInput(const IInput::CEvent &Event) override;
+
+	/**
+	 * Initialise all registered subcomponents.
+	 * Needs to be called after the interfaces have been initialised.
+	 */
+	void InitSubComponents();
+
+	// Register a new subcomponent.
+	void RegisterSubComponent(CEditorComponent &Component);
+
+private:
+	std::vector<std::reference_wrapper<CEditorComponent>> m_vSubComponents = {};
+};
+
+#endif
diff --git a/src_bkp/game/editor/editor.cpp b/src_bkp/game/editor/editor.cpp
new file mode 100644
index 0000000000..2caf68a624
--- /dev/null
+++ b/src_bkp/game/editor/editor.cpp
@@ -0,0 +1,8885 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <algorithm>
+
+#include <base/color.h>
+#include <base/system.h>
+
+#if defined(CONF_FAMILY_UNIX)
+#include <pthread.h>
+#endif
+
+#include <engine/client.h>
+#include <engine/console.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/shared/filecollection.h>
+#include <engine/storage.h>
+#include <engine/textrender.h>
+
+#include <game/client/components/camera.h>
+#include <game/client/gameclient.h>
+#include <game/client/lineinput.h>
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/client/ui_listbox.h>
+#include <game/client/ui_scrollregion.h>
+#include <game/generated/client_data.h>
+#include <game/localization.h>
+
+#include <game/editor/editor_history.h>
+#include <game/editor/mapitems/image.h>
+#include <game/editor/mapitems/sound.h>
+
+#include "auto_map.h"
+#include "editor.h"
+#include "editor_actions.h"
+
+#include <chrono>
+#include <limits>
+#include <type_traits>
+
+using namespace FontIcons;
+
+static const char *VANILLA_IMAGES[] = {
+	"bg_cloud1",
+	"bg_cloud2",
+	"bg_cloud3",
+	"desert_doodads",
+	"desert_main",
+	"desert_mountains",
+	"desert_mountains2",
+	"desert_sun",
+	"generic_deathtiles",
+	"generic_unhookable",
+	"grass_doodads",
+	"grass_main",
+	"jungle_background",
+	"jungle_deathtiles",
+	"jungle_doodads",
+	"jungle_main",
+	"jungle_midground",
+	"jungle_unhookables",
+	"moon",
+	"mountains",
+	"snow",
+	"stars",
+	"sun",
+	"winter_doodads",
+	"winter_main",
+	"winter_mountains",
+	"winter_mountains2",
+	"winter_mountains3"};
+
+bool CEditor::IsVanillaImage(const char *pImage)
+{
+	return std::any_of(std::begin(VANILLA_IMAGES), std::end(VANILLA_IMAGES), [pImage](const char *pVanillaImage) { return str_comp(pImage, pVanillaImage) == 0; });
+}
+
+static const char *FILETYPE_EXTENSIONS[CEditor::NUM_FILETYPES] = {
+	".map",
+	".png",
+	".opus"};
+
+const void *CEditor::ms_pUiGotContext;
+
+enum
+{
+	BUTTON_CONTEXT = 1,
+};
+
+void CEditor::EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser)
+{
+	CEditor *pThis = (CEditor *)pUser;
+	if(Env < 0 || Env >= (int)pThis->m_Map.m_vpEnvelopes.size())
+	{
+		Channels = ColorRGBA();
+		return;
+	}
+
+	std::shared_ptr<CEnvelope> pEnv = pThis->m_Map.m_vpEnvelopes[Env];
+	float t = pThis->m_AnimateTime;
+	t *= pThis->m_AnimateSpeed;
+	t += (TimeOffsetMillis / 1000.0f);
+	pEnv->Eval(t, Channels);
+}
+
+/********************************************************
+ OTHER
+*********************************************************/
+
+bool CEditor::DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip)
+{
+	UpdateTooltip(pLineInput, pRect, pToolTip);
+	return UI()->DoEditBox(pLineInput, pRect, FontSize, Corners);
+}
+
+bool CEditor::DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners, const char *pToolTip)
+{
+	UpdateTooltip(pLineInput, pRect, pToolTip);
+	return UI()->DoClearableEditBox(pLineInput, pRect, FontSize, Corners);
+}
+
+ColorRGBA CEditor::GetButtonColor(const void *pID, int Checked)
+{
+	if(Checked < 0)
+		return ColorRGBA(0, 0, 0, 0.5f);
+
+	switch(Checked)
+	{
+	case 8: // invisible
+		return ColorRGBA(0, 0, 0, 0);
+	case 7: // selected + game layers
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 0, 0, 0.4f);
+		return ColorRGBA(1, 0, 0, 0.2f);
+
+	case 6: // game layers
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 1, 1, 0.4f);
+		return ColorRGBA(1, 1, 1, 0.2f);
+
+	case 5: // selected + image/sound should be embedded
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 0, 0, 0.75f);
+		return ColorRGBA(1, 0, 0, 0.5f);
+
+	case 4: // image/sound should be embedded
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 0, 0, 1.0f);
+		return ColorRGBA(1, 0, 0, 0.875f);
+
+	case 3: // selected + unused image/sound
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 0, 1, 0.75f);
+		return ColorRGBA(1, 0, 1, 0.5f);
+
+	case 2: // unused image/sound
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(0, 0, 1, 0.75f);
+		return ColorRGBA(0, 0, 1, 0.5f);
+
+	case 1: // selected
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 0, 0, 0.75f);
+		return ColorRGBA(1, 0, 0, 0.5f);
+
+	default: // regular
+		if(UI()->HotItem() == pID)
+			return ColorRGBA(1, 1, 1, 0.75f);
+		return ColorRGBA(1, 1, 1, 0.5f);
+	}
+}
+
+void CEditor::UpdateTooltip(const void *pID, const CUIRect *pRect, const char *pToolTip)
+{
+	if(UI()->MouseInside(pRect) && !pToolTip)
+		str_copy(m_aTooltip, "");
+	else if(UI()->HotItem() == pID && pToolTip)
+		str_copy(m_aTooltip, pToolTip);
+}
+
+int CEditor::DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	if(UI()->MouseInside(pRect))
+	{
+		if(Flags & BUTTON_CONTEXT)
+			ms_pUiGotContext = pID;
+	}
+
+	UpdateTooltip(pID, pRect, pToolTip);
+	return UI()->DoButtonLogic(pID, Checked, pRect);
+}
+
+int CEditor::DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
+	CUIRect NewRect = *pRect;
+	UI()->DoLabel(&NewRect, pText, 10.0f, TEXTALIGN_MC);
+	Checked %= 2;
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA BaseColor, int Corners)
+{
+	float Bright = Checked ? 1.0f : 0.5f;
+	float Alpha = UI()->HotItem() == pID ? 1.0f : 0.75f;
+	ColorRGBA Color = ColorRGBA(BaseColor.r * Bright, BaseColor.g * Bright, BaseColor.b * Bright, Alpha);
+
+	pRect->Draw(Color, Corners, 3.0f);
+	UI()->DoLabel(pRect, pText, 10.0f, TEXTALIGN_MC);
+	Checked %= 2;
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, 0, pToolTip);
+}
+
+int CEditor::DoButton_File(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	if(Checked)
+		pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
+
+	CUIRect Rect;
+	pRect->VMargin(5.0f, &Rect);
+	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML);
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	pRect->Draw(ColorRGBA(0.5f, 0.5f, 0.5f, 1.0f), IGraphics::CORNER_T, 3.0f);
+
+	CUIRect Rect;
+	pRect->VMargin(5.0f, &Rect);
+	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML);
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_MenuItem(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	if(UI()->HotItem() == pID || Checked)
+		pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_ALL, 3.0f);
+
+	CUIRect Rect;
+	pRect->VMargin(5.0f, &Rect);
+
+	SLabelProperties Props;
+	Props.m_MaxWidth = Rect.w;
+	Props.m_EllipsisAtEnd = true;
+	UI()->DoLabel(&Rect, pText, 10.0f, TEXTALIGN_ML, Props);
+
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_Ex(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+
+	CUIRect Rect;
+	pRect->VMargin(pRect->w > 20.0f ? 5.0f : 0.0f, &Rect);
+
+	SLabelProperties Props;
+	Props.m_MaxWidth = Rect.w;
+	Props.m_EllipsisAtEnd = true;
+	UI()->DoLabel(&Rect, pText, FontSize, TEXTALIGN_MC, Props);
+
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_FontIcon(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+
+	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+	UI()->DoLabel(pRect, pText, FontSize, TEXTALIGN_MC);
+	TextRender()->SetRenderFlags(0);
+	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_ButtonInc(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_R, 3.0f);
+	UI()->DoLabel(pRect, pText ? pText : "+", 10.0f, TEXTALIGN_MC);
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_ButtonDec(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), IGraphics::CORNER_L, 3.0f);
+	UI()->DoLabel(pRect, pText ? pText : "-", 10.0f, TEXTALIGN_MC);
+	return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip);
+}
+
+int CEditor::DoButton_DraggableEx(const void *pID, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip, int Corners, float FontSize)
+{
+	pRect->Draw(GetButtonColor(pID, Checked), Corners, 3.0f);
+
+	CUIRect Rect;
+	pRect->VMargin(pRect->w > 20.0f ? 5.0f : 0.0f, &Rect);
+
+	SLabelProperties Props;
+	Props.m_MaxWidth = Rect.w;
+	Props.m_EllipsisAtEnd = true;
+	UI()->DoLabel(&Rect, pText, FontSize, TEXTALIGN_MC, Props);
+
+	if(UI()->MouseInside(pRect))
+	{
+		if(Flags & BUTTON_CONTEXT)
+			ms_pUiGotContext = pID;
+	}
+
+	UpdateTooltip(pID, pRect, pToolTip);
+	return UI()->DoDraggableButtonLogic(pID, Checked, pRect, pClicked, pAbrupted);
+}
+
+void CEditor::RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness)
+{
+	Graphics()->TextureSet(Texture);
+	Graphics()->BlendNormal();
+	Graphics()->QuadsBegin();
+	Graphics()->SetColor(Brightness, Brightness, Brightness, 1.0f);
+	Graphics()->QuadsSetSubset(0, 0, View.w / Size, View.h / Size);
+	IGraphics::CQuadItem QuadItem(View.x, View.y, View.w, View.h);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+}
+
+SEditResult<int> CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree, bool IsHex, int Corners, ColorRGBA *pColor, bool ShowValue)
+{
+	// logic
+	static float s_Value;
+	static CLineInputNumber s_NumberInput;
+	static bool s_TextMode = false;
+	static void *s_pLastTextID = pID;
+	const bool Inside = UI()->MouseInside(pRect);
+	const int Base = IsHex ? 16 : 10;
+	static bool s_Editing = false;
+	EEditState State = EEditState::EDITING;
+
+	if(UI()->MouseButton(1) && UI()->HotItem() == pID)
+	{
+		s_pLastTextID = pID;
+		s_TextMode = true;
+		UI()->DisableMouseLock();
+		s_NumberInput.SetInteger(Current, Base);
+	}
+
+	if(UI()->CheckActiveItem(pID))
+	{
+		if(!UI()->MouseButton(0))
+		{
+			UI()->DisableMouseLock();
+			UI()->SetActiveItem(nullptr);
+			s_TextMode = false;
+		}
+	}
+
+	if(s_TextMode && s_pLastTextID == pID)
+	{
+		str_copy(m_aTooltip, "Type your number");
+
+		DoEditBox(&s_NumberInput, pRect, 10.0f);
+
+		UI()->SetActiveItem(&s_NumberInput);
+
+		if(Input()->KeyIsPressed(KEY_RETURN) || Input()->KeyIsPressed(KEY_KP_ENTER) ||
+			((UI()->MouseButton(1) || UI()->MouseButton(0)) && !Inside))
+		{
+			Current = clamp(s_NumberInput.GetInteger(Base), Min, Max);
+			UI()->DisableMouseLock();
+			UI()->SetActiveItem(nullptr);
+			s_TextMode = false;
+		}
+
+		if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+		{
+			UI()->DisableMouseLock();
+			UI()->SetActiveItem(nullptr);
+			s_TextMode = false;
+		}
+	}
+	else
+	{
+		if(UI()->CheckActiveItem(pID))
+		{
+			if(UI()->MouseButton(0))
+			{
+				if(Input()->ShiftIsPressed())
+					s_Value += m_MouseDeltaX * 0.05f;
+				else
+					s_Value += m_MouseDeltaX;
+
+				if(absolute(s_Value) >= Scale)
+				{
+					int Count = (int)(s_Value / Scale);
+					s_Value = std::fmod(s_Value, Scale);
+					Current += Step * Count;
+					Current = clamp(Current, Min, Max);
+
+					// Constrain to discrete steps
+					if(Count > 0)
+						Current = Current / Step * Step;
+					else
+						Current = std::ceil(Current / (float)Step) * Step;
+				}
+			}
+			if(pToolTip && !s_TextMode)
+				str_copy(m_aTooltip, pToolTip);
+		}
+		else if(UI()->HotItem() == pID)
+		{
+			if(UI()->MouseButton(0))
+			{
+				UI()->SetActiveItem(pID);
+				UI()->EnableMouseLock(pID);
+				s_Value = 0;
+			}
+			if(pToolTip && !s_TextMode)
+				str_copy(m_aTooltip, pToolTip);
+		}
+
+		if(Inside)
+			UI()->SetHotItem(pID);
+
+		// render
+		char aBuf[128];
+		if(pLabel[0] != '\0')
+		{
+			if(ShowValue)
+				str_format(aBuf, sizeof(aBuf), "%s %d", pLabel, Current);
+			else
+				str_copy(aBuf, pLabel);
+		}
+		else if(IsDegree)
+			str_format(aBuf, sizeof(aBuf), "%d°", Current);
+		else if(IsHex)
+			str_format(aBuf, sizeof(aBuf), "#%06X", Current);
+		else
+			str_from_int(Current, aBuf);
+		pRect->Draw(pColor ? *pColor : GetButtonColor(pID, 0), Corners, 3.0f);
+		UI()->DoLabel(pRect, aBuf, 10, TEXTALIGN_MC);
+	}
+
+	if(!s_TextMode)
+		s_NumberInput.Clear();
+
+	bool MouseLocked = UI()->CheckMouseLock();
+	if((MouseLocked || s_TextMode) && !s_Editing)
+	{
+		State = EEditState::START;
+		s_Editing = true;
+	}
+
+	if(!MouseLocked && !s_TextMode && s_Editing)
+	{
+		State = EEditState::END;
+		s_Editing = false;
+	}
+
+	return SEditResult<int>{State, Current};
+}
+
+std::shared_ptr<CLayerGroup> CEditor::GetSelectedGroup() const
+{
+	if(m_SelectedGroup >= 0 && m_SelectedGroup < (int)m_Map.m_vpGroups.size())
+		return m_Map.m_vpGroups[m_SelectedGroup];
+	return nullptr;
+}
+
+std::shared_ptr<CLayer> CEditor::GetSelectedLayer(int Index) const
+{
+	std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+	if(!pGroup)
+		return nullptr;
+
+	if(Index < 0 || Index >= (int)m_vSelectedLayers.size())
+		return nullptr;
+
+	int LayerIndex = m_vSelectedLayers[Index];
+
+	if(LayerIndex >= 0 && LayerIndex < (int)m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size())
+		return pGroup->m_vpLayers[LayerIndex];
+	return nullptr;
+}
+
+std::shared_ptr<CLayer> CEditor::GetSelectedLayerType(int Index, int Type) const
+{
+	std::shared_ptr<CLayer> pLayer = GetSelectedLayer(Index);
+	if(pLayer && pLayer->m_Type == Type)
+		return pLayer;
+	return nullptr;
+}
+
+std::vector<CQuad *> CEditor::GetSelectedQuads()
+{
+	std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
+	std::vector<CQuad *> vpQuads;
+	if(!pQuadLayer)
+		return vpQuads;
+	vpQuads.resize(m_vSelectedQuads.size());
+	for(int i = 0; i < (int)m_vSelectedQuads.size(); ++i)
+		vpQuads[i] = &pQuadLayer->m_vQuads[m_vSelectedQuads[i]];
+	return vpQuads;
+}
+
+CSoundSource *CEditor::GetSelectedSource() const
+{
+	std::shared_ptr<CLayerSounds> pSounds = std::static_pointer_cast<CLayerSounds>(GetSelectedLayerType(0, LAYERTYPE_SOUNDS));
+	if(!pSounds)
+		return nullptr;
+	if(m_SelectedSource >= 0 && m_SelectedSource < (int)pSounds->m_vSources.size())
+		return &pSounds->m_vSources[m_SelectedSource];
+	return nullptr;
+}
+
+void CEditor::SelectLayer(int LayerIndex, int GroupIndex)
+{
+	if(GroupIndex != -1)
+		m_SelectedGroup = GroupIndex;
+
+	m_vSelectedLayers.clear();
+	DeselectQuads();
+	DeselectQuadPoints();
+	AddSelectedLayer(LayerIndex);
+}
+
+void CEditor::AddSelectedLayer(int LayerIndex)
+{
+	m_vSelectedLayers.push_back(LayerIndex);
+
+	m_QuadKnifeActive = false;
+}
+
+void CEditor::SelectQuad(int Index)
+{
+	m_vSelectedQuads.clear();
+	m_vSelectedQuads.push_back(Index);
+}
+
+void CEditor::ToggleSelectQuad(int Index)
+{
+	int ListIndex = FindSelectedQuadIndex(Index);
+	if(ListIndex < 0)
+		m_vSelectedQuads.push_back(Index);
+	else
+		m_vSelectedQuads.erase(m_vSelectedQuads.begin() + ListIndex);
+}
+
+void CEditor::DeselectQuads()
+{
+	m_vSelectedQuads.clear();
+}
+
+void CEditor::DeselectQuadPoints()
+{
+	m_SelectedQuadPoints = 0;
+}
+
+void CEditor::SelectQuadPoint(int QuadIndex, int Index)
+{
+	SelectQuad(QuadIndex);
+	m_SelectedQuadPoints = 1 << Index;
+}
+
+void CEditor::ToggleSelectQuadPoint(int QuadIndex, int Index)
+{
+	if(IsQuadPointSelected(QuadIndex, Index))
+	{
+		m_SelectedQuadPoints ^= 1 << Index;
+	}
+	else
+	{
+		if(!IsQuadSelected(QuadIndex))
+		{
+			ToggleSelectQuad(QuadIndex);
+		}
+
+		if(!(m_SelectedQuadPoints & 1 << Index))
+		{
+			m_SelectedQuadPoints ^= 1 << Index;
+		}
+	}
+}
+
+void CEditor::DeleteSelectedQuads()
+{
+	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
+	if(!pLayer)
+		return;
+
+	std::vector<int> vSelectedQuads(m_vSelectedQuads);
+	std::vector<CQuad> vDeletedQuads;
+
+	for(int i = 0; i < (int)m_vSelectedQuads.size(); ++i)
+	{
+		auto const &Quad = pLayer->m_vQuads[m_vSelectedQuads[i]];
+		vDeletedQuads.push_back(Quad);
+
+		pLayer->m_vQuads.erase(pLayer->m_vQuads.begin() + m_vSelectedQuads[i]);
+		for(int j = i + 1; j < (int)m_vSelectedQuads.size(); ++j)
+			if(m_vSelectedQuads[j] > m_vSelectedQuads[i])
+				m_vSelectedQuads[j]--;
+
+		m_vSelectedQuads.erase(m_vSelectedQuads.begin() + i);
+		i--;
+	}
+
+	m_EditorHistory.RecordAction(std::make_shared<CEditorActionDeleteQuad>(this, m_SelectedGroup, m_vSelectedLayers[0], vSelectedQuads, vDeletedQuads));
+}
+
+bool CEditor::IsQuadSelected(int Index) const
+{
+	return FindSelectedQuadIndex(Index) >= 0;
+}
+
+bool CEditor::IsQuadCornerSelected(int Index) const
+{
+	return m_SelectedQuadPoints & (1 << Index);
+}
+
+bool CEditor::IsQuadPointSelected(int QuadIndex, int Index) const
+{
+	return IsQuadSelected(QuadIndex) && IsQuadCornerSelected(Index);
+}
+
+int CEditor::FindSelectedQuadIndex(int Index) const
+{
+	for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
+		if(m_vSelectedQuads[i] == Index)
+			return i;
+	return -1;
+}
+
+int CEditor::FindEnvPointIndex(int Index, int Channel) const
+{
+	auto Iter = std::find(
+		m_vSelectedEnvelopePoints.begin(),
+		m_vSelectedEnvelopePoints.end(),
+		std::pair(Index, Channel));
+
+	if(Iter != m_vSelectedEnvelopePoints.end())
+		return Iter - m_vSelectedEnvelopePoints.begin();
+	else
+		return -1;
+}
+
+void CEditor::SelectEnvPoint(int Index)
+{
+	m_vSelectedEnvelopePoints.clear();
+
+	for(int c = 0; c < CEnvPoint::MAX_CHANNELS; c++)
+		m_vSelectedEnvelopePoints.emplace_back(Index, c);
+}
+
+void CEditor::SelectEnvPoint(int Index, int Channel)
+{
+	DeselectEnvPoints();
+	m_vSelectedEnvelopePoints.emplace_back(Index, Channel);
+}
+
+void CEditor::ToggleEnvPoint(int Index, int Channel)
+{
+	if(IsTangentSelected())
+		DeselectEnvPoints();
+
+	int ListIndex = FindEnvPointIndex(Index, Channel);
+
+	if(ListIndex >= 0)
+	{
+		m_vSelectedEnvelopePoints.erase(m_vSelectedEnvelopePoints.begin() + ListIndex);
+	}
+	else
+		m_vSelectedEnvelopePoints.emplace_back(Index, Channel);
+}
+
+bool CEditor::IsEnvPointSelected(int Index, int Channel) const
+{
+	int ListIndex = FindEnvPointIndex(Index, Channel);
+
+	return ListIndex >= 0;
+}
+
+bool CEditor::IsEnvPointSelected(int Index) const
+{
+	auto Iter = std::find_if(
+		m_vSelectedEnvelopePoints.begin(),
+		m_vSelectedEnvelopePoints.end(),
+		[&](auto pair) { return pair.first == Index; });
+
+	return Iter != m_vSelectedEnvelopePoints.end();
+}
+
+void CEditor::DeselectEnvPoints()
+{
+	m_vSelectedEnvelopePoints.clear();
+	m_SelectedTangentInPoint = std::pair(-1, -1);
+	m_SelectedTangentOutPoint = std::pair(-1, -1);
+}
+
+void CEditor::SelectTangentOutPoint(int Index, int Channel)
+{
+	DeselectEnvPoints();
+	m_SelectedTangentOutPoint = std::pair(Index, Channel);
+}
+
+bool CEditor::IsTangentOutPointSelected(int Index, int Channel) const
+{
+	return m_SelectedTangentOutPoint == std::pair(Index, Channel);
+}
+
+void CEditor::SelectTangentInPoint(int Index, int Channel)
+{
+	DeselectEnvPoints();
+	m_SelectedTangentInPoint = std::pair(Index, Channel);
+}
+
+bool CEditor::IsTangentInPointSelected(int Index, int Channel) const
+{
+	return m_SelectedTangentInPoint == std::pair(Index, Channel);
+}
+
+bool CEditor::IsTangentInSelected() const
+{
+	return m_SelectedTangentInPoint != std::pair(-1, -1);
+}
+
+bool CEditor::IsTangentOutSelected() const
+{
+	return m_SelectedTangentOutPoint != std::pair(-1, -1);
+}
+
+bool CEditor::IsTangentSelected() const
+{
+	return IsTangentInSelected() || IsTangentOutSelected();
+}
+
+std::pair<int, int> CEditor::EnvGetSelectedTimeAndValue() const
+{
+	if(m_SelectedEnvelope < 0 || m_SelectedEnvelope >= (int)m_Map.m_vpEnvelopes.size())
+		return {};
+
+	std::shared_ptr<CEnvelope> pEnvelope = m_Map.m_vpEnvelopes[m_SelectedEnvelope];
+	int CurrentTime;
+	int CurrentValue;
+	if(IsTangentInSelected())
+	{
+		auto [SelectedIndex, SelectedChannel] = m_SelectedTangentInPoint;
+
+		CurrentTime = pEnvelope->m_vPoints[SelectedIndex].m_Time + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aInTangentDeltaX[SelectedChannel];
+		CurrentValue = pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aInTangentDeltaY[SelectedChannel];
+	}
+	else if(IsTangentOutSelected())
+	{
+		auto [SelectedIndex, SelectedChannel] = m_SelectedTangentOutPoint;
+
+		CurrentTime = pEnvelope->m_vPoints[SelectedIndex].m_Time + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aOutTangentDeltaX[SelectedChannel];
+		CurrentValue = pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aOutTangentDeltaY[SelectedChannel];
+	}
+	else
+	{
+		auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints.front();
+
+		CurrentTime = pEnvelope->m_vPoints[SelectedIndex].m_Time;
+		CurrentValue = pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel];
+	}
+
+	return std::pair<int, int>{CurrentTime, CurrentValue};
+}
+
+bool CEditor::CallbackOpenMap(const char *pFileName, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+	if(pEditor->Load(pFileName, StorageType))
+	{
+		pEditor->m_ValidSaveFilename = StorageType == IStorage::TYPE_SAVE && (pEditor->m_pFileDialogPath == pEditor->m_aFileDialogCurrentFolder || (pEditor->m_pFileDialogPath == pEditor->m_aFileDialogCurrentLink && str_comp(pEditor->m_aFileDialogCurrentLink, "themes") == 0));
+		pEditor->m_Dialog = DIALOG_NONE;
+		return true;
+	}
+	else
+	{
+		pEditor->ShowFileDialogError("Failed to load map from file '%s'.", pFileName);
+		return false;
+	}
+}
+
+bool CEditor::CallbackAppendMap(const char *pFileName, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+	if(pEditor->Append(pFileName, StorageType))
+	{
+		pEditor->m_Dialog = DIALOG_NONE;
+		return true;
+	}
+	else
+	{
+		pEditor->m_aFileName[0] = 0;
+		pEditor->ShowFileDialogError("Failed to load map from file '%s'.", pFileName);
+		return false;
+	}
+}
+
+bool CEditor::CallbackSaveMap(const char *pFileName, int StorageType, void *pUser)
+{
+	dbg_assert(StorageType == IStorage::TYPE_SAVE, "Saving only allowed for IStorage::TYPE_SAVE");
+
+	CEditor *pEditor = static_cast<CEditor *>(pUser);
+	char aBuf[IO_MAX_PATH_LENGTH];
+	// add map extension
+	if(!str_endswith(pFileName, ".map"))
+	{
+		str_format(aBuf, sizeof(aBuf), "%s.map", pFileName);
+		pFileName = aBuf;
+	}
+
+	// Save map to specified file
+	if(pEditor->Save(pFileName))
+	{
+		str_copy(pEditor->m_aFileName, pFileName);
+		pEditor->m_ValidSaveFilename = true;
+		pEditor->m_Map.m_Modified = false;
+	}
+	else
+	{
+		pEditor->ShowFileDialogError("Failed to save map to file '%s'.", pFileName);
+		return false;
+	}
+
+	// Also update autosave if it's older than half the configured autosave interval, so we also have periodic backups.
+	const float Time = pEditor->Client()->GlobalTime();
+	if(g_Config.m_EdAutosaveInterval > 0 && pEditor->m_Map.m_LastSaveTime < Time && Time - pEditor->m_Map.m_LastSaveTime > 30 * g_Config.m_EdAutosaveInterval)
+	{
+		if(!pEditor->PerformAutosave())
+			return false;
+	}
+
+	pEditor->m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+bool CEditor::CallbackSaveCopyMap(const char *pFileName, int StorageType, void *pUser)
+{
+	dbg_assert(StorageType == IStorage::TYPE_SAVE, "Saving only allowed for IStorage::TYPE_SAVE");
+
+	CEditor *pEditor = static_cast<CEditor *>(pUser);
+	char aBuf[IO_MAX_PATH_LENGTH];
+	// add map extension
+	if(!str_endswith(pFileName, ".map"))
+	{
+		str_format(aBuf, sizeof(aBuf), "%s.map", pFileName);
+		pFileName = aBuf;
+	}
+
+	if(pEditor->Save(pFileName))
+	{
+		pEditor->m_Dialog = DIALOG_NONE;
+		return true;
+	}
+	else
+	{
+		pEditor->ShowFileDialogError("Failed to save map to file '%s'.", pFileName);
+		return false;
+	}
+}
+
+bool CEditor::CallbackSaveImage(const char *pFileName, int StorageType, void *pUser)
+{
+	dbg_assert(StorageType == IStorage::TYPE_SAVE, "Saving only allowed for IStorage::TYPE_SAVE");
+
+	CEditor *pEditor = static_cast<CEditor *>(pUser);
+	char aBuf[IO_MAX_PATH_LENGTH];
+
+	// add file extension
+	if(!str_endswith(pFileName, ".png"))
+	{
+		str_format(aBuf, sizeof(aBuf), "%s.png", pFileName);
+		pFileName = aBuf;
+	}
+
+	std::shared_ptr<CEditorImage> pImg = pEditor->m_Map.m_vpImages[pEditor->m_SelectedImage];
+
+	EImageFormat OutputFormat;
+	switch(pImg->m_Format)
+	{
+	case CImageInfo::FORMAT_RGB:
+		OutputFormat = IMAGE_FORMAT_RGB;
+		break;
+	case CImageInfo::FORMAT_RGBA:
+		OutputFormat = IMAGE_FORMAT_RGBA;
+		break;
+	case CImageInfo::FORMAT_SINGLE_COMPONENT:
+		OutputFormat = IMAGE_FORMAT_R;
+		break;
+	default:
+		dbg_assert(false, "Image has invalid format.");
+		return false;
+	};
+
+	TImageByteBuffer ByteBuffer;
+	SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+	if(SavePNG(OutputFormat, static_cast<const uint8_t *>(pImg->m_pData), ImageByteBuffer, pImg->m_Width, pImg->m_Height))
+	{
+		IOHANDLE File = pEditor->Storage()->OpenFile(pFileName, IOFLAG_WRITE, StorageType);
+		if(File)
+		{
+			io_write(File, &ByteBuffer.front(), ByteBuffer.size());
+			io_close(File);
+			pEditor->m_Dialog = DIALOG_NONE;
+			return true;
+		}
+		pEditor->ShowFileDialogError("Failed to open file '%s'.", pFileName);
+		return false;
+	}
+	else
+	{
+		pEditor->ShowFileDialogError("Failed to write image to file.");
+		return false;
+	}
+}
+
+bool CEditor::CallbackSaveSound(const char *pFileName, int StorageType, void *pUser)
+{
+	dbg_assert(StorageType == IStorage::TYPE_SAVE, "Saving only allowed for IStorage::TYPE_SAVE");
+
+	CEditor *pEditor = static_cast<CEditor *>(pUser);
+	char aBuf[IO_MAX_PATH_LENGTH];
+
+	// add file extension
+	if(!str_endswith(pFileName, ".opus"))
+	{
+		str_format(aBuf, sizeof(aBuf), "%s.opus", pFileName);
+		pFileName = aBuf;
+	}
+	std::shared_ptr<CEditorSound> pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
+	IOHANDLE File = pEditor->Storage()->OpenFile(pFileName, IOFLAG_WRITE, StorageType);
+
+	if(File)
+	{
+		io_write(File, pSound->m_pData, pSound->m_DataSize);
+		io_close(File);
+		pEditor->OnDialogClose();
+		pEditor->m_Dialog = DIALOG_NONE;
+		return true;
+	}
+	pEditor->ShowFileDialogError("Failed to open file '%s'.", pFileName);
+	return false;
+}
+
+void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const void *pStopButtonID, const void *pSeekBarID, const int SampleID)
+{
+	CUIRect Button, SeekBar;
+	// play/pause button
+	{
+		View.VSplitLeft(View.h, &Button, &View);
+		if(DoButton_FontIcon(pPlayPauseButtonID, Sound()->IsPlaying(SampleID) ? FONT_ICON_PAUSE : FONT_ICON_PLAY, 0, &Button, 0, "Play/pause audio preview", IGraphics::CORNER_ALL) ||
+			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_SPACE)))
+		{
+			if(Sound()->IsPlaying(SampleID))
+			{
+				Sound()->Pause(SampleID);
+			}
+			else
+			{
+				if(SampleID != m_ToolbarPreviewSound && m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+					Sound()->Pause(m_ToolbarPreviewSound);
+
+				Sound()->Play(CSounds::CHN_GUI, SampleID, ISound::FLAG_PREVIEW);
+			}
+		}
+	}
+	// stop button
+	{
+		View.VSplitLeft(2.0f, nullptr, &View);
+		View.VSplitLeft(View.h, &Button, &View);
+		if(DoButton_FontIcon(pStopButtonID, FONT_ICON_STOP, 0, &Button, 0, "Stop audio preview", IGraphics::CORNER_ALL))
+		{
+			Sound()->Stop(SampleID);
+		}
+	}
+	// do seekbar
+	{
+		View.VSplitLeft(5.0f, nullptr, &View);
+		const float Cut = std::min(View.w, 200.0f);
+		View.VSplitLeft(Cut, &SeekBar, &View);
+		SeekBar.HMargin(2.5f, &SeekBar);
+
+		const float Rounding = 5.0f;
+
+		char aBuffer[64];
+		const float CurrentTime = Sound()->GetSampleCurrentTime(SampleID);
+		const float TotalTime = Sound()->GetSampleTotalTime(SampleID);
+
+		// draw seek bar
+		SeekBar.Draw(ColorRGBA(0, 0, 0, 0.5f), IGraphics::CORNER_ALL, Rounding);
+
+		// draw filled bar
+		const float Amount = CurrentTime / TotalTime;
+		CUIRect FilledBar = SeekBar;
+		FilledBar.w = 2 * Rounding + (FilledBar.w - 2 * Rounding) * Amount;
+		FilledBar.Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_ALL, Rounding);
+
+		// draw time
+		char aCurrentTime[32];
+		str_time_float(CurrentTime, TIME_HOURS, aCurrentTime, sizeof(aCurrentTime));
+		char aTotalTime[32];
+		str_time_float(TotalTime, TIME_HOURS, aTotalTime, sizeof(aTotalTime));
+		str_format(aBuffer, sizeof(aBuffer), "%s / %s", aCurrentTime, aTotalTime);
+		UI()->DoLabel(&SeekBar, aBuffer, SeekBar.h * 0.70f, TEXTALIGN_MC);
+
+		// do the logic
+		const bool Inside = UI()->MouseInside(&SeekBar);
+
+		if(UI()->CheckActiveItem(pSeekBarID))
+		{
+			if(!UI()->MouseButton(0))
+			{
+				UI()->SetActiveItem(nullptr);
+			}
+			else
+			{
+				const float AmountSeek = clamp((UI()->MouseX() - SeekBar.x - Rounding) / (float)(SeekBar.w - 2 * Rounding), 0.0f, 1.0f);
+				Sound()->SetSampleCurrentTime(SampleID, AmountSeek);
+			}
+		}
+		else if(UI()->HotItem() == pSeekBarID)
+		{
+			if(UI()->MouseButton(0))
+				UI()->SetActiveItem(pSeekBarID);
+		}
+
+		if(Inside)
+			UI()->SetHotItem(pSeekBarID);
+	}
+}
+
+void CEditor::DoToolbarLayers(CUIRect ToolBar)
+{
+	const bool ModPressed = Input()->ModifierIsPressed();
+	const bool ShiftPressed = Input()->ShiftIsPressed();
+
+	// handle shortcut for info button
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_I) && ModPressed && !ShiftPressed)
+	{
+		if(m_ShowTileInfo == SHOW_TILE_HEXADECIMAL)
+			m_ShowTileInfo = SHOW_TILE_DECIMAL;
+		else if(m_ShowTileInfo != SHOW_TILE_OFF)
+			m_ShowTileInfo = SHOW_TILE_OFF;
+		else
+			m_ShowTileInfo = SHOW_TILE_DECIMAL;
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	}
+
+	// handle shortcut for hex button
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_I) && ModPressed && ShiftPressed)
+	{
+		m_ShowTileInfo = m_ShowTileInfo == SHOW_TILE_HEXADECIMAL ? SHOW_TILE_OFF : SHOW_TILE_HEXADECIMAL;
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	}
+
+	// handle shortcut for unused button
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_U) && ModPressed)
+		m_AllowPlaceUnusedTiles = !m_AllowPlaceUnusedTiles;
+
+	CUIRect TB_Top, TB_Bottom;
+	CUIRect Button;
+
+	ToolBar.HSplitMid(&TB_Top, &TB_Bottom, 5.0f);
+
+	// top line buttons
+	{
+		// detail button
+		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		static int s_HqButton = 0;
+		if(DoButton_Editor(&s_HqButton, "HD", m_ShowDetail, &Button, 0, "[ctrl+h] Toggle High Detail") ||
+			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_H) && ModPressed))
+		{
+			m_ShowDetail = !m_ShowDetail;
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// animation button
+		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		static int s_AnimateButton = 0;
+		if(DoButton_Editor(&s_AnimateButton, "Anim", m_Animate, &Button, 0, "[ctrl+m] Toggle animation") ||
+			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_M) && ModPressed))
+		{
+			m_AnimateStart = time_get();
+			m_Animate = !m_Animate;
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// proof button
+		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		static int s_ProofButton = 0;
+		if(DoButton_Ex(&s_ProofButton, "Proof", MapView()->ProofMode()->IsEnabled(), &Button, 0, "[ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.", IGraphics::CORNER_L) ||
+			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_P) && ModPressed))
+		{
+			MapView()->ProofMode()->Toggle();
+		}
+
+		TB_Top.VSplitLeft(14.0f, &Button, &TB_Top);
+		static int s_ProofModeButton = 0;
+		if(DoButton_FontIcon(&s_ProofModeButton, FONT_ICON_CIRCLE_CHEVRON_DOWN, 0, &Button, 0, "Select proof mode.", IGraphics::CORNER_R, 8.0f))
+		{
+			static SPopupMenuId s_PopupProofModeId;
+			UI()->DoPopupMenu(&s_PopupProofModeId, Button.x, Button.y + Button.h, 60.0f, 36.0f, this, PopupProofMode);
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// zoom button
+		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		static int s_ZoomButton = 0;
+		if(DoButton_Editor(&s_ZoomButton, "Zoom", m_PreviewZoom, &Button, 0, "Toggles preview of how layers will be zoomed in-game"))
+		{
+			m_PreviewZoom = !m_PreviewZoom;
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// grid button
+		TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
+		static int s_GridButton = 0;
+		if(DoButton_Editor(&s_GridButton, "Grid", MapView()->MapGrid()->IsEnabled(), &Button, 0, "[ctrl+g] Toggle Grid") ||
+			(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_G) && ModPressed && !ShiftPressed))
+		{
+			MapView()->MapGrid()->Toggle();
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// zoom group
+		TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+		static int s_ZoomOutButton = 0;
+		if(DoButton_FontIcon(&s_ZoomOutButton, "-", 0, &Button, 0, "[NumPad-] Zoom out", IGraphics::CORNER_L))
+		{
+			MapView()->Zoom()->ChangeValue(50.0f);
+		}
+
+		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+		static int s_ZoomNormalButton = 0;
+		if(DoButton_FontIcon(&s_ZoomNormalButton, FONT_ICON_MAGNIFYING_GLASS, 0, &Button, 0, "[NumPad*] Zoom to normal and remove editor offset", IGraphics::CORNER_NONE))
+		{
+			MapView()->ResetZoom();
+		}
+
+		TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+		static int s_ZoomInButton = 0;
+		if(DoButton_FontIcon(&s_ZoomInButton, "+", 0, &Button, 0, "[NumPad+] Zoom in", IGraphics::CORNER_R))
+		{
+			MapView()->Zoom()->ChangeValue(-50.0f);
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// undo/redo group
+		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+		static int s_UndoButton = 0;
+		if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_EditorHistory.CanUndo() - 1, &Button, 0, "[ctrl+z] Undo last action", IGraphics::CORNER_L))
+		{
+			m_EditorHistory.Undo();
+		}
+
+		TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+		static int s_RedoButton = 0;
+		if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_EditorHistory.CanRedo() - 1, &Button, 0, "[ctrl+y] Redo last action", IGraphics::CORNER_R))
+		{
+			m_EditorHistory.Redo();
+		}
+
+		TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+		// brush manipulation
+		{
+			int Enabled = m_pBrush->IsEmpty() ? -1 : 0;
+
+			// flip buttons
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_FlipXButton = 0;
+			if(DoButton_FontIcon(&s_FlipXButton, FONT_ICON_ARROWS_LEFT_RIGHT, Enabled, &Button, 0, "[N] Flip brush horizontal", IGraphics::CORNER_L) || (Input()->KeyPress(KEY_N) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr))
+			{
+				for(auto &pLayer : m_pBrush->m_vpLayers)
+					pLayer->BrushFlipX();
+			}
+
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_FlipyButton = 0;
+			if(DoButton_FontIcon(&s_FlipyButton, FONT_ICON_ARROWS_UP_DOWN, Enabled, &Button, 0, "[M] Flip brush vertical", IGraphics::CORNER_R) || (Input()->KeyPress(KEY_M) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr))
+			{
+				for(auto &pLayer : m_pBrush->m_vpLayers)
+					pLayer->BrushFlipY();
+			}
+			TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
+
+			// rotate buttons
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_RotationAmount = 90;
+			bool TileLayer = false;
+			// check for tile layers in brush selection
+			for(auto &pLayer : m_pBrush->m_vpLayers)
+				if(pLayer->m_Type == LAYERTYPE_TILES)
+				{
+					TileLayer = true;
+					s_RotationAmount = maximum(90, (s_RotationAmount / 90) * 90);
+					break;
+				}
+
+			static int s_CcwButton = 0;
+			if(DoButton_FontIcon(&s_CcwButton, FONT_ICON_ARROW_ROTATE_LEFT, Enabled, &Button, 0, "[R] Rotates the brush counter clockwise", IGraphics::CORNER_L) || (Input()->KeyPress(KEY_R) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr))
+			{
+				for(auto &pLayer : m_pBrush->m_vpLayers)
+					pLayer->BrushRotate(-s_RotationAmount / 360.0f * pi * 2);
+			}
+
+			TB_Top.VSplitLeft(30.0f, &Button, &TB_Top);
+			auto RotationAmountRes = UiDoValueSelector(&s_RotationAmount, &Button, "", s_RotationAmount, TileLayer ? 90 : 1, 359, TileLayer ? 90 : 1, TileLayer ? 10.0f : 2.0f, "Rotation of the brush in degrees. Use left mouse button to drag and change the value. Hold shift to be more precise.", true, false, IGraphics::CORNER_NONE);
+			s_RotationAmount = RotationAmountRes.m_Value;
+
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_CwButton = 0;
+			if(DoButton_FontIcon(&s_CwButton, FONT_ICON_ARROW_ROTATE_RIGHT, Enabled, &Button, 0, "[T] Rotates the brush clockwise", IGraphics::CORNER_R) || (Input()->KeyPress(KEY_T) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr))
+			{
+				for(auto &pLayer : m_pBrush->m_vpLayers)
+					pLayer->BrushRotate(s_RotationAmount / 360.0f * pi * 2);
+			}
+
+			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
+		}
+
+		// animation speed
+		if(m_Animate)
+		{
+			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+			static int s_AnimSlowerButton = 0;
+			if(DoButton_FontIcon(&s_AnimSlowerButton, "-", 0, &Button, 0, "Decrease animation speed", IGraphics::CORNER_L))
+			{
+				if(m_AnimateSpeed > 0.5f)
+					m_AnimateSpeed -= 0.5f;
+			}
+
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_AnimNormalButton = 0;
+			if(DoButton_FontIcon(&s_AnimNormalButton, FONT_ICON_CIRCLE_PLAY, 0, &Button, 0, "Normal animation speed", 0))
+				m_AnimateSpeed = 1.0f;
+
+			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+			static int s_AnimFasterButton = 0;
+			if(DoButton_FontIcon(&s_AnimFasterButton, "+", 0, &Button, 0, "Increase animation speed", IGraphics::CORNER_R))
+				m_AnimateSpeed += 0.5f;
+
+			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
+		}
+
+		// grid zoom
+		if(MapView()->MapGrid()->IsEnabled())
+		{
+			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+			static int s_GridIncreaseButton = 0;
+			if(DoButton_FontIcon(&s_GridIncreaseButton, "-", 0, &Button, 0, "Decrease grid", IGraphics::CORNER_L))
+			{
+				MapView()->MapGrid()->DecreaseFactor();
+			}
+
+			TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
+			static int s_GridNormalButton = 0;
+			if(DoButton_FontIcon(&s_GridNormalButton, FONT_ICON_BORDER_ALL, 0, &Button, 0, "Normal grid", IGraphics::CORNER_NONE))
+				MapView()->MapGrid()->ResetFactor();
+
+			TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
+			static int s_GridDecreaseButton = 0;
+			if(DoButton_FontIcon(&s_GridDecreaseButton, "+", 0, &Button, 0, "Increase grid", IGraphics::CORNER_R))
+			{
+				MapView()->MapGrid()->IncreaseFactor();
+			}
+			TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
+		}
+	}
+
+	// Bottom line buttons
+	{
+		// refocus button
+		{
+			TB_Bottom.VSplitLeft(45.0f, &Button, &TB_Bottom);
+			static int s_RefocusButton = 0;
+			int FocusButtonChecked = MapView()->IsFocused() ? -1 : 1;
+			if(DoButton_Editor(&s_RefocusButton, "Refocus", FocusButtonChecked, &Button, 0, "[HOME] Restore map focus") || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_HOME)))
+				MapView()->Focus();
+			TB_Bottom.VSplitLeft(5.0f, nullptr, &TB_Bottom);
+		}
+
+		// tile manipulation
+		{
+			// do tele/tune/switch/speedup button
+			{
+				std::shared_ptr<CLayerTiles> pS = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+				if(pS)
+				{
+					const char *pButtonName = nullptr;
+					CUI::FPopupMenuFunction pfnPopupFunc = nullptr;
+					int Rows = 0;
+					if(pS == m_Map.m_pSwitchLayer)
+					{
+						pButtonName = "Switch";
+						pfnPopupFunc = PopupSwitch;
+						Rows = 2;
+					}
+					else if(pS == m_Map.m_pSpeedupLayer)
+					{
+						pButtonName = "Speedup";
+						pfnPopupFunc = PopupSpeedup;
+						Rows = 3;
+					}
+					else if(pS == m_Map.m_pTuneLayer)
+					{
+						pButtonName = "Tune";
+						pfnPopupFunc = PopupTune;
+						Rows = 1;
+					}
+					else if(pS == m_Map.m_pTeleLayer)
+					{
+						pButtonName = "Tele";
+						pfnPopupFunc = PopupTele;
+						Rows = 1;
+					}
+
+					if(pButtonName != nullptr)
+					{
+						static char s_aButtonTooltip[64];
+						str_format(s_aButtonTooltip, sizeof(s_aButtonTooltip), "[ctrl+t] %s", pButtonName);
+
+						TB_Bottom.VSplitLeft(60.0f, &Button, &TB_Bottom);
+						static int s_ModifierButton = 0;
+						if(DoButton_Ex(&s_ModifierButton, pButtonName, 0, &Button, 0, s_aButtonTooltip, IGraphics::CORNER_ALL) || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && ModPressed && Input()->KeyPress(KEY_T)))
+						{
+							static SPopupMenuId s_PopupModifierId;
+							if(!UI()->IsPopupOpen(&s_PopupModifierId))
+							{
+								UI()->DoPopupMenu(&s_PopupModifierId, Button.x, Button.y + Button.h, 120, 10.0f + Rows * 13.0f, this, pfnPopupFunc);
+							}
+						}
+						TB_Bottom.VSplitLeft(5.0f, nullptr, &TB_Bottom);
+					}
+				}
+			}
+		}
+
+		// do add quad/sound button
+		std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+		if(pLayer && (pLayer->m_Type == LAYERTYPE_QUADS || pLayer->m_Type == LAYERTYPE_SOUNDS))
+		{
+			TB_Bottom.VSplitLeft(60.0f, &Button, &TB_Bottom);
+
+			bool Invoked = false;
+			static int s_AddItemButton = 0;
+
+			if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				Invoked = DoButton_Editor(&s_AddItemButton, "Add Quad", 0, &Button, 0, "[ctrl+q] Add a new quad") ||
+					  (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed);
+			}
+			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				Invoked = DoButton_Editor(&s_AddItemButton, "Add Sound", 0, &Button, 0, "[ctrl+q] Add a new sound source") ||
+					  (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed);
+			}
+
+			if(Invoked)
+			{
+				std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+
+				float aMapping[4];
+				pGroup->Mapping(aMapping);
+				int x = aMapping[0] + (aMapping[2] - aMapping[0]) / 2;
+				int y = aMapping[1] + (aMapping[3] - aMapping[1]) / 2;
+				if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed)
+				{
+					x += UI()->MouseWorldX() - (MapView()->GetWorldOffset().x * pGroup->m_ParallaxX / 100) - pGroup->m_OffsetX;
+					y += UI()->MouseWorldY() - (MapView()->GetWorldOffset().y * pGroup->m_ParallaxY / 100) - pGroup->m_OffsetY;
+				}
+
+				if(pLayer->m_Type == LAYERTYPE_QUADS)
+					m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptyQuad>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
+				else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+					m_EditorHistory.Execute(std::make_shared<CEditorActionNewEmptySound>(this, m_SelectedGroup, m_vSelectedLayers[0], x, y));
+			}
+			TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
+		}
+
+		// Brush draw mode button
+		{
+			TB_Bottom.VSplitLeft(65.0f, &Button, &TB_Bottom);
+			static int s_BrushDrawModeButton = 0;
+			if(DoButton_Editor(&s_BrushDrawModeButton, "Destructive", m_BrushDrawDestructive, &Button, 0, "[ctrl+d] Toggle brush draw mode") ||
+				(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_D) && ModPressed && !ShiftPressed))
+				m_BrushDrawDestructive = !m_BrushDrawDestructive;
+			TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
+		}
+	}
+}
+
+void CEditor::DoToolbarSounds(CUIRect ToolBar)
+{
+	CUIRect ToolBarTop, ToolBarBottom;
+	ToolBar.HSplitMid(&ToolBarTop, &ToolBarBottom, 5.0f);
+
+	if(m_SelectedSound >= 0 && (size_t)m_SelectedSound < m_Map.m_vpSounds.size())
+	{
+		const std::shared_ptr<CEditorSound> pSelectedSound = m_Map.m_vpSounds[m_SelectedSound];
+		if(pSelectedSound->m_SoundID != m_ToolbarPreviewSound && m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+			Sound()->Stop(m_ToolbarPreviewSound);
+		m_ToolbarPreviewSound = pSelectedSound->m_SoundID;
+
+		static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0;
+		DoAudioPreview(ToolBarBottom, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_ToolbarPreviewSound);
+	}
+	else
+		m_ToolbarPreviewSound = -1;
+}
+
+static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)
+{
+	int x = pPoint->x - pCenter->x;
+	int y = pPoint->y - pCenter->y;
+	pPoint->x = (int)(x * std::cos(Rotation) - y * std::sin(Rotation) + pCenter->x);
+	pPoint->y = (int)(x * std::sin(Rotation) + y * std::cos(Rotation) + pCenter->y);
+}
+
+void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
+{
+	enum
+	{
+		OP_NONE = 0,
+		OP_MOVE,
+		OP_CONTEXT_MENU,
+	};
+
+	void *pID = &pSource->m_Position;
+
+	static int s_Operation = OP_NONE;
+
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+
+	float CenterX = fx2f(pSource->m_Position.x);
+	float CenterY = fx2f(pSource->m_Position.y);
+
+	float dx = (CenterX - wx) / m_MouseWScale;
+	float dy = (CenterY - wy) / m_MouseWScale;
+	if(dx * dx + dy * dy < 50)
+		UI()->SetHotItem(pID);
+
+	const bool IgnoreGrid = Input()->AltIsPressed();
+
+	if(UI()->CheckActiveItem(pID))
+	{
+		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		{
+			if(s_Operation == OP_MOVE)
+			{
+				float x = wx;
+				float y = wy;
+				if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
+					MapView()->MapGrid()->SnapToGrid(x, y);
+				pSource->m_Position.x = f2fx(x);
+				pSource->m_Position.y = f2fx(y);
+			}
+		}
+
+		if(s_Operation == OP_CONTEXT_MENU)
+		{
+			if(!UI()->MouseButton(1))
+			{
+				if(m_vSelectedLayers.size() == 1)
+				{
+					static SPopupMenuId s_PopupSourceId;
+					UI()->DoPopupMenu(&s_PopupSourceId, UI()->MouseX(), UI()->MouseY(), 120, 200, this, PopupSource);
+					UI()->DisableMouseLock();
+				}
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+		else
+		{
+			if(!UI()->MouseButton(0))
+			{
+				UI()->DisableMouseLock();
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+
+		Graphics()->SetColor(1, 1, 1, 1);
+	}
+	else if(UI()->HotItem() == pID)
+	{
+		ms_pUiGotContext = pID;
+
+		Graphics()->SetColor(1, 1, 1, 1);
+		str_copy(m_aTooltip, "Left mouse button to move. Hold alt to ignore grid.");
+
+		if(UI()->MouseButton(0))
+		{
+			s_Operation = OP_MOVE;
+
+			UI()->SetActiveItem(pID);
+			m_SelectedSource = Index;
+		}
+
+		if(UI()->MouseButton(1))
+		{
+			m_SelectedSource = Index;
+			s_Operation = OP_CONTEXT_MENU;
+			UI()->SetActiveItem(pID);
+		}
+	}
+	else
+	{
+		Graphics()->SetColor(0, 1, 0, 1);
+	}
+
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CEditor::PreparePointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex)
+{
+	m_QuadDragOriginalPoints[QuadIndex][PointIndex] = pQuad->m_aPoints[PointIndex];
+}
+
+void CEditor::DoPointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY)
+{
+	pQuad->m_aPoints[PointIndex].x = m_QuadDragOriginalPoints[QuadIndex][PointIndex].x + OffsetX;
+	pQuad->m_aPoints[PointIndex].y = m_QuadDragOriginalPoints[QuadIndex][PointIndex].y + OffsetY;
+}
+
+CEditor::EAxis CEditor::GetDragAxis(int OffsetX, int OffsetY)
+{
+	if(Input()->ShiftIsPressed())
+		if(absolute(OffsetX) < absolute(OffsetY))
+			return EAxis::AXIS_Y;
+		else
+			return EAxis::AXIS_X;
+	else
+		return EAxis::AXIS_NONE;
+}
+
+void CEditor::DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point)
+{
+	if(Axis == EAxis::AXIS_NONE)
+		return;
+
+	Graphics()->SetColor(1, 0, 0.1f, 1);
+	if(Axis == EAxis::AXIS_X)
+	{
+		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x + Point.x) / 2.0f, fx2f(OriginalPoint.y), fx2f(Point.x - OriginalPoint.x), 1.0f * m_MouseWScale);
+		Graphics()->QuadsDraw(&Line, 1);
+	}
+	else if(Axis == EAxis::AXIS_Y)
+	{
+		IGraphics::CQuadItem Line(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y + Point.y) / 2.0f, 1.0f * m_MouseWScale, fx2f(Point.y - OriginalPoint.y));
+		Graphics()->QuadsDraw(&Line, 1);
+	}
+
+	// Draw ghost of original point
+	IGraphics::CQuadItem QuadItem(fx2f(OriginalPoint.x), fx2f(OriginalPoint.y), 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CEditor::ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments, bool Append) const
+{
+	if(!Append)
+		vAlignments.clear();
+	if(!g_Config.m_EdAlignQuads)
+		return;
+
+	// Perform computation from the original position of this point
+	int Threshold = f2fx(maximum(10.0f, 10.0f * m_MouseWScale));
+	CPoint OrigPoint = m_QuadDragOriginalPoints.at(QuadIndex)[PointIndex];
+	// Get the "current" point by applying the offset
+	CPoint Point = OrigPoint + ivec2(OffsetX, OffsetY);
+
+	// Save smallest diff on both axis to only keep closest alignments
+	int SmallestDiffX = Threshold + 1, SmallestDiffY = Threshold + 1;
+	// Store both axis alignments in separate vectors
+	std::vector<SAlignmentInfo> vAlignmentsX, vAlignmentsY;
+
+	// Check if we can align/snap to a specific point
+	auto &&CheckAlignment = [&](CPoint *pQuadPoint) {
+		int DX = pQuadPoint->x - Point.x;
+		int DY = pQuadPoint->y - Point.y;
+		int DiffX = absolute(DX);
+		int DiffY = absolute(DY);
+
+		// Check the X axis
+		if(DiffX <= Threshold)
+		{
+			// Only store alignments that have the smallest difference
+			if(DiffX < SmallestDiffX)
+			{
+				vAlignmentsX.clear();
+				SmallestDiffX = DiffX;
+			}
+
+			// We can have multiple alignments having the same difference/distance
+			if(DiffX == SmallestDiffX)
+			{
+				vAlignmentsX.push_back(SAlignmentInfo{
+					*pQuadPoint, // Aligned point
+					{OrigPoint.y}, // Value that can change (which is not snapped), original position
+					EAxis::AXIS_Y, // The alignment axis
+					PointIndex, // The index of the point
+					DX,
+				});
+			}
+		}
+		if(DiffY <= Threshold)
+		{
+			// Only store alignments that have the smallest difference
+			if(DiffY < SmallestDiffY)
+			{
+				vAlignmentsY.clear();
+				SmallestDiffY = DiffY;
+			}
+
+			if(DiffY == SmallestDiffY)
+			{
+				vAlignmentsY.push_back(SAlignmentInfo{
+					*pQuadPoint,
+					{OrigPoint.x},
+					EAxis::AXIS_X,
+					PointIndex,
+					DY,
+				});
+			}
+		}
+	};
+
+	// Iterate through all the quads of the current layer
+	// Check alignment with each point of the quad (corners & pivot)
+	// Compute an AABB (Axis Aligned Bounding Box) to get the center of the quad
+	// Check alignment with the center of the quad
+	for(size_t i = 0; i < pLayer->m_vQuads.size(); i++)
+	{
+		auto *pCurrentQuad = &pLayer->m_vQuads[i];
+		CPoint Min = pCurrentQuad->m_aPoints[0];
+		CPoint Max = pCurrentQuad->m_aPoints[0];
+
+		for(int v = 0; v < 5; v++)
+		{
+			CPoint *pQuadPoint = &pCurrentQuad->m_aPoints[v];
+
+			if(v != 4)
+			{ // Don't use pivot to compute AABB
+				if(pQuadPoint->x < Min.x)
+					Min.x = pQuadPoint->x;
+				if(pQuadPoint->y < Min.y)
+					Min.y = pQuadPoint->y;
+				if(pQuadPoint->x > Max.x)
+					Max.x = pQuadPoint->x;
+				if(pQuadPoint->y > Max.y)
+					Max.y = pQuadPoint->y;
+			}
+
+			// Don't check alignment with current point
+			if(pQuadPoint == &pQuad->m_aPoints[PointIndex])
+				continue;
+
+			// Don't check alignment with other selected points
+			bool IsCurrentPointSelected = IsQuadSelected(i) && (IsQuadCornerSelected(v) || (v == PointIndex && PointIndex == 4));
+			if(IsCurrentPointSelected)
+				continue;
+
+			CheckAlignment(pQuadPoint);
+		}
+
+		CPoint Center = (Min + Max) / 2.0f;
+		CheckAlignment(&Center);
+	}
+
+	// Finally concatenate both alignment vectors into the output
+	vAlignments.reserve(vAlignmentsX.size() + vAlignmentsY.size());
+	vAlignments.insert(vAlignments.end(), vAlignmentsX.begin(), vAlignmentsX.end());
+	vAlignments.insert(vAlignments.end(), vAlignmentsY.begin(), vAlignmentsY.end());
+}
+
+void CEditor::ComputePointsAlignments(const std::shared_ptr<CLayerQuads> &pLayer, bool Pivot, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const
+{
+	// This method is used to compute alignments from selected points
+	// and only apply the closest alignment on X and Y to the offset.
+
+	vAlignments.clear();
+	std::vector<SAlignmentInfo> vAllAlignments;
+
+	for(int Selected : m_vSelectedQuads)
+	{
+		CQuad *pQuad = &pLayer->m_vQuads[Selected];
+
+		if(!Pivot)
+		{
+			for(int m = 0; m < 4; m++)
+			{
+				if(IsQuadPointSelected(Selected, m))
+				{
+					ComputePointAlignments(pLayer, pQuad, Selected, m, OffsetX, OffsetY, vAllAlignments, true);
+				}
+			}
+		}
+		else
+		{
+			ComputePointAlignments(pLayer, pQuad, Selected, 4, OffsetX, OffsetY, vAllAlignments, true);
+		}
+	}
+
+	int SmallestDiffX, SmallestDiffY;
+	SmallestDiffX = SmallestDiffY = std::numeric_limits<int>::max();
+
+	std::vector<SAlignmentInfo> vAlignmentsX, vAlignmentsY;
+
+	for(const auto &Alignment : vAllAlignments)
+	{
+		int AbsDiff = absolute(Alignment.m_Diff);
+		if(Alignment.m_Axis == EAxis::AXIS_X)
+		{
+			if(AbsDiff < SmallestDiffY)
+			{
+				SmallestDiffY = AbsDiff;
+				vAlignmentsY.clear();
+			}
+			if(AbsDiff == SmallestDiffY)
+				vAlignmentsY.emplace_back(Alignment);
+		}
+		else if(Alignment.m_Axis == EAxis::AXIS_Y)
+		{
+			if(AbsDiff < SmallestDiffX)
+			{
+				SmallestDiffX = AbsDiff;
+				vAlignmentsX.clear();
+			}
+			if(AbsDiff == SmallestDiffX)
+				vAlignmentsX.emplace_back(Alignment);
+		}
+	}
+
+	vAlignments.reserve(vAlignmentsX.size() + vAlignmentsY.size());
+	vAlignments.insert(vAlignments.end(), vAlignmentsX.begin(), vAlignmentsX.end());
+	vAlignments.insert(vAlignments.end(), vAlignmentsY.begin(), vAlignmentsY.end());
+}
+
+void CEditor::ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer, const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const
+{
+	vAlignments.clear();
+	if(!g_Config.m_EdAlignQuads)
+		return;
+
+	// This method is a bit different than the point alignment in the way where instead of trying to aling 1 point to all quads,
+	// we try to align 5 points to all quads, these 5 points being 5 points of an AABB.
+	// Otherwise, the concept is the same, we use the original position of the AABB to make the computations.
+	int Threshold = f2fx(maximum(10.0f, 10.0f * m_MouseWScale));
+	int SmallestDiffX = Threshold + 1, SmallestDiffY = Threshold + 1;
+	std::vector<SAlignmentInfo> vAlignmentsX, vAlignmentsY;
+
+	auto &&CheckAlignment = [&](CPoint &Aligned, int Point) {
+		CPoint ToCheck = AABB.m_aPoints[Point] + ivec2(OffsetX, OffsetY);
+		int DX = Aligned.x - ToCheck.x;
+		int DY = Aligned.y - ToCheck.y;
+		int DiffX = absolute(DX);
+		int DiffY = absolute(DY);
+
+		if(DiffX <= Threshold)
+		{
+			if(DiffX < SmallestDiffX)
+			{
+				SmallestDiffX = DiffX;
+				vAlignmentsX.clear();
+			}
+
+			if(DiffX == SmallestDiffX)
+			{
+				vAlignmentsX.push_back(SAlignmentInfo{
+					Aligned,
+					{AABB.m_aPoints[Point].y},
+					EAxis::AXIS_Y,
+					Point,
+					DX,
+				});
+			}
+		}
+		if(DiffY <= Threshold)
+		{
+			if(DiffY < SmallestDiffY)
+			{
+				SmallestDiffY = DiffY;
+				vAlignmentsY.clear();
+			}
+
+			if(DiffY == SmallestDiffY)
+			{
+				vAlignmentsY.push_back(SAlignmentInfo{
+					Aligned,
+					{AABB.m_aPoints[Point].x},
+					EAxis::AXIS_X,
+					Point,
+					DY,
+				});
+			}
+		}
+	};
+
+	auto &&CheckAABBAlignment = [&](CPoint &QuadMin, CPoint &QuadMax) {
+		CPoint QuadCenter = (QuadMin + QuadMax) / 2.0f;
+		CPoint aQuadPoints[5] = {
+			QuadMin, // Top left
+			{QuadMax.x, QuadMin.y}, // Top right
+			{QuadMin.x, QuadMax.y}, // Bottom left
+			QuadMax, // Bottom right
+			QuadCenter,
+		};
+
+		// Check all points with all the other points
+		for(auto &QuadPoint : aQuadPoints)
+		{
+			// i is the quad point which is "aligned" and that we want to compare with
+			for(int j = 0; j < 5; j++)
+			{
+				// j is the point we try to align
+				CheckAlignment(QuadPoint, j);
+			}
+		}
+	};
+
+	// Iterate through all quads of the current layer
+	// Compute AABB of all quads and check if the dragged AABB can be aligned to this AABB.
+	for(size_t i = 0; i < pLayer->m_vQuads.size(); i++)
+	{
+		auto *pCurrentQuad = &pLayer->m_vQuads[i];
+		if(IsQuadSelected(i)) // Don't check with other selected quads
+			continue;
+
+		// Get AABB of this quad
+		CPoint QuadMin = pCurrentQuad->m_aPoints[0], QuadMax = pCurrentQuad->m_aPoints[0];
+		for(int v = 1; v < 4; v++)
+		{
+			QuadMin.x = minimum(QuadMin.x, pCurrentQuad->m_aPoints[v].x);
+			QuadMin.y = minimum(QuadMin.y, pCurrentQuad->m_aPoints[v].y);
+			QuadMax.x = maximum(QuadMax.x, pCurrentQuad->m_aPoints[v].x);
+			QuadMax.y = maximum(QuadMax.y, pCurrentQuad->m_aPoints[v].y);
+		}
+
+		CheckAABBAlignment(QuadMin, QuadMax);
+	}
+
+	// Finally, concatenate both alignment vectors into the output
+	vAlignments.reserve(vAlignmentsX.size() + vAlignmentsY.size());
+	vAlignments.insert(vAlignments.end(), vAlignmentsX.begin(), vAlignmentsX.end());
+	vAlignments.insert(vAlignments.end(), vAlignmentsY.begin(), vAlignmentsY.end());
+}
+
+void CEditor::DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY)
+{
+	if(!g_Config.m_EdAlignQuads)
+		return;
+
+	// Drawing an alignment is easy, we convert fixed to float for the aligned point coords
+	// and we also convert the "changing" value after applying the offset (which might be edited to actually align the value with the alignment).
+	Graphics()->SetColor(1, 0, 0.1f, 1);
+	for(const SAlignmentInfo &Alignment : vAlignments)
+	{
+		// We don't use IGraphics::CLineItem to draw because we don't want to stop QuadsBegin(), quads work just fine.
+		if(Alignment.m_Axis == EAxis::AXIS_X)
+		{ // Alignment on X axis is same Y values but different X values
+			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), fx2f(Alignment.m_X + OffsetX - Alignment.m_AlignedPoint.x), 1.0f * m_MouseWScale);
+			Graphics()->QuadsDrawTL(&Line, 1);
+		}
+		else if(Alignment.m_Axis == EAxis::AXIS_Y)
+		{ // Alignment on Y axis is same X values but different Y values
+			IGraphics::CQuadItem Line(fx2f(Alignment.m_AlignedPoint.x), fx2f(Alignment.m_AlignedPoint.y), 1.0f * m_MouseWScale, fx2f(Alignment.m_Y + OffsetY - Alignment.m_AlignedPoint.y));
+			Graphics()->QuadsDrawTL(&Line, 1);
+		}
+	}
+}
+
+void CEditor::DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY)
+{
+	// Drawing an AABB is simply converting the points from fixed to float
+	// Then making lines out of quads and drawing them
+	vec2 TL = {fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_TL].x + OffsetX), fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_TL].y + OffsetY)};
+	vec2 TR = {fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_TR].x + OffsetX), fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_TR].y + OffsetY)};
+	vec2 BL = {fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_BL].x + OffsetX), fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_BL].y + OffsetY)};
+	vec2 BR = {fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_BR].x + OffsetX), fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_BR].y + OffsetY)};
+	vec2 Center = {fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_CENTER].x + OffsetX), fx2f(AABB.m_aPoints[SAxisAlignedBoundingBox::POINT_CENTER].y + OffsetY)};
+
+	// We don't use IGraphics::CLineItem to draw because we don't want to stop QuadsBegin(), quads work just fine.
+	IGraphics::CQuadItem Lines[4] = {
+		{TL.x, TL.y, TR.x - TL.x, 1.0f * m_MouseWScale},
+		{TL.x, TL.y, 1.0f * m_MouseWScale, BL.y - TL.y},
+		{TR.x, TR.y, 1.0f * m_MouseWScale, BR.y - TR.y},
+		{BL.x, BL.y, BR.x - BL.x, 1.0f * m_MouseWScale},
+	};
+	Graphics()->SetColor(1, 0, 1, 1);
+	Graphics()->QuadsDrawTL(Lines, 4);
+
+	IGraphics::CQuadItem CenterQuad(Center.x, Center.y, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&CenterQuad, 1);
+}
+
+void CEditor::QuadSelectionAABB(const std::shared_ptr<CLayerQuads> &pLayer, SAxisAlignedBoundingBox &OutAABB)
+{
+	// Compute an englobing AABB of the current selection of quads
+	CPoint Min{
+		std::numeric_limits<int>::max(),
+		std::numeric_limits<int>::max(),
+	};
+	CPoint Max{
+		std::numeric_limits<int>::min(),
+		std::numeric_limits<int>::min(),
+	};
+	for(int Selected : m_vSelectedQuads)
+	{
+		CQuad *pQuad = &pLayer->m_vQuads[Selected];
+		for(auto &Point : pQuad->m_aPoints)
+		{
+			Min.x = minimum(Min.x, Point.x);
+			Min.y = minimum(Min.y, Point.y);
+			Max.x = maximum(Max.x, Point.x);
+			Max.y = maximum(Max.y, Point.y);
+		}
+	}
+	CPoint Center = (Min + Max) / 2.0f;
+	CPoint aPoints[SAxisAlignedBoundingBox::NUM_POINTS] = {
+		Min, // Top left
+		{Max.x, Min.y}, // Top right
+		{Min.x, Max.y}, // Bottom left
+		Max, // Bottom right
+		Center,
+	};
+	mem_copy(OutAABB.m_aPoints, aPoints, sizeof(CPoint) * SAxisAlignedBoundingBox::NUM_POINTS);
+}
+
+void CEditor::ApplyAlignments(const std::vector<SAlignmentInfo> &vAlignments, int &OffsetX, int &OffsetY)
+{
+	if(vAlignments.empty())
+		return;
+
+	// Find X and Y aligment
+	const int *pAlignedX = nullptr;
+	const int *pAlignedY = nullptr;
+
+	// To Find the alignments we simply iterate through the vector of alignments and find the first
+	// X and Y alignments.
+	// Then, we use the saved m_Diff to adjust the offset
+	int AdjustX = 0, AdjustY = 0;
+	for(const SAlignmentInfo &Alignment : vAlignments)
+	{
+		if(Alignment.m_Axis == EAxis::AXIS_X && !pAlignedY)
+		{
+			pAlignedY = &Alignment.m_AlignedPoint.y;
+			AdjustY = Alignment.m_Diff;
+		}
+		else if(Alignment.m_Axis == EAxis::AXIS_Y && !pAlignedX)
+		{
+			pAlignedX = &Alignment.m_AlignedPoint.x;
+			AdjustX = Alignment.m_Diff;
+		}
+	}
+
+	// Adjust offset
+	OffsetX += AdjustX;
+	OffsetY += AdjustY;
+}
+
+void CEditor::ApplyAxisAlignment(int &OffsetX, int &OffsetY)
+{
+	// This is used to preserve axis alignment when pressing `Shift`
+	// Should be called before any other computation
+	EAxis Axis = GetDragAxis(OffsetX, OffsetY);
+	OffsetX = ((Axis == EAxis::AXIS_NONE || Axis == EAxis::AXIS_X) ? OffsetX : 0);
+	OffsetY = ((Axis == EAxis::AXIS_NONE || Axis == EAxis::AXIS_Y) ? OffsetY : 0);
+}
+
+void CEditor::DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index)
+{
+	enum
+	{
+		OP_NONE = 0,
+		OP_SELECT,
+		OP_MOVE_ALL,
+		OP_MOVE_PIVOT,
+		OP_ROTATE,
+		OP_CONTEXT_MENU,
+		OP_DELETE,
+	};
+
+	// some basic values
+	void *pID = &pQuad->m_aPoints[4]; // use pivot addr as id
+	static std::vector<std::vector<CPoint>> s_vvRotatePoints;
+	static int s_Operation = OP_NONE;
+	static float s_MouseXStart = 0.0f;
+	static float s_MouseYStart = 0.0f;
+	static float s_RotateAngle = 0;
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+	static CPoint s_OriginalPosition;
+	static std::vector<SAlignmentInfo> s_PivotAlignments; // Alignments per pivot per quad
+	static std::vector<SAlignmentInfo> s_vAABBAlignments; // Alignments for one AABB (single quad or selection of multiple quads)
+	static SAxisAlignedBoundingBox s_SelectionAABB; // Selection AABB
+	static ivec2 s_LastOffset; // Last offset, stored as static so we can use it to draw every frame
+
+	// get pivot
+	float CenterX = fx2f(pQuad->m_aPoints[4].x);
+	float CenterY = fx2f(pQuad->m_aPoints[4].y);
+
+	const bool IgnoreGrid = Input()->AltIsPressed();
+
+	auto &&GetDragOffset = [&]() -> ivec2 {
+		float x = wx;
+		float y = wy;
+		if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
+			MapView()->MapGrid()->SnapToGrid(x, y);
+
+		int OffsetX = f2fx(x) - s_OriginalPosition.x;
+		int OffsetY = f2fx(y) - s_OriginalPosition.y;
+
+		return {OffsetX, OffsetY};
+	};
+
+	// draw selection background
+	if(IsQuadSelected(Index))
+	{
+		Graphics()->SetColor(0, 0, 0, 1);
+		IGraphics::CQuadItem QuadItem(CenterX, CenterY, 7.0f * m_MouseWScale, 7.0f * m_MouseWScale);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+	}
+
+	if(UI()->CheckActiveItem(pID))
+	{
+		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		{
+			if(s_Operation == OP_SELECT)
+			{
+				float x = s_MouseXStart - UI()->MouseX();
+				float y = s_MouseYStart - UI()->MouseY();
+
+				if(x * x + y * y > 20.0f)
+				{
+					if(!IsQuadSelected(Index))
+						SelectQuad(Index);
+
+					s_OriginalPosition = pQuad->m_aPoints[4];
+
+					if(Input()->ShiftIsPressed())
+					{
+						s_Operation = OP_MOVE_PIVOT;
+						// When moving, we need to save the original position of all selected pivots
+						for(int Selected : m_vSelectedQuads)
+						{
+							CQuad *pCurrentQuad = &pLayer->m_vQuads[Selected];
+							PreparePointDrag(pLayer, pCurrentQuad, Selected, 4);
+						}
+					}
+					else
+					{
+						s_Operation = OP_MOVE_ALL;
+						// When moving, we need to save the original position of all selected quads points
+						for(int Selected : m_vSelectedQuads)
+						{
+							CQuad *pCurrentQuad = &pLayer->m_vQuads[Selected];
+							for(size_t v = 0; v < 5; v++)
+								PreparePointDrag(pLayer, pCurrentQuad, Selected, v);
+						}
+						// And precompute AABB of selection since it will not change during drag
+						if(g_Config.m_EdAlignQuads)
+							QuadSelectionAABB(pLayer, s_SelectionAABB);
+					}
+				}
+			}
+
+			// check if we only should move pivot
+			if(s_Operation == OP_MOVE_PIVOT)
+			{
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+
+				s_LastOffset = GetDragOffset(); // Update offset
+				ApplyAxisAlignment(s_LastOffset.x, s_LastOffset.y); // Apply axis alignment to the offset
+
+				ComputePointsAlignments(pLayer, true, s_LastOffset.x, s_LastOffset.y, s_PivotAlignments);
+				ApplyAlignments(s_PivotAlignments, s_LastOffset.x, s_LastOffset.y);
+
+				for(auto &Selected : m_vSelectedQuads)
+				{
+					CQuad *pCurrentQuad = &pLayer->m_vQuads[Selected];
+					DoPointDrag(pLayer, pCurrentQuad, Selected, 4, s_LastOffset.x, s_LastOffset.y);
+				}
+			}
+			else if(s_Operation == OP_MOVE_ALL)
+			{
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+
+				// Compute drag offset
+				s_LastOffset = GetDragOffset();
+				ApplyAxisAlignment(s_LastOffset.x, s_LastOffset.y);
+
+				// Then compute possible alignments with the selection AABB
+				ComputeAABBAlignments(pLayer, s_SelectionAABB, s_LastOffset.x, s_LastOffset.y, s_vAABBAlignments);
+				// Apply alignments before drag
+				ApplyAlignments(s_vAABBAlignments, s_LastOffset.x, s_LastOffset.y);
+				// Then do the drag
+				for(int Selected : m_vSelectedQuads)
+				{
+					CQuad *pCurrentQuad = &pLayer->m_vQuads[Selected];
+					for(int v = 0; v < 5; v++)
+						DoPointDrag(pLayer, pCurrentQuad, Selected, v, s_LastOffset.x, s_LastOffset.y);
+				}
+			}
+			else if(s_Operation == OP_ROTATE)
+			{
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+
+				for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
+				{
+					CQuad *pCurrentQuad = &pLayer->m_vQuads[m_vSelectedQuads[i]];
+					for(int v = 0; v < 4; v++)
+					{
+						pCurrentQuad->m_aPoints[v] = s_vvRotatePoints[i][v];
+						Rotate(&pCurrentQuad->m_aPoints[4], &pCurrentQuad->m_aPoints[v], s_RotateAngle);
+					}
+				}
+
+				if(Input()->ShiftIsPressed())
+					s_RotateAngle += (m_MouseDeltaX)*0.0001f;
+				else
+					s_RotateAngle += (m_MouseDeltaX)*0.002f;
+			}
+		}
+
+		// Draw axis and aligments when moving
+		if(s_Operation == OP_MOVE_PIVOT || s_Operation == OP_MOVE_ALL)
+		{
+			EAxis Axis = GetDragAxis(s_LastOffset.x, s_LastOffset.y);
+			DrawAxis(Axis, s_OriginalPosition, pQuad->m_aPoints[4]);
+		}
+
+		if(s_Operation == OP_MOVE_PIVOT)
+			DrawPointAlignments(s_PivotAlignments, s_LastOffset.x, s_LastOffset.y);
+
+		if(s_Operation == OP_MOVE_ALL)
+		{
+			DrawPointAlignments(s_vAABBAlignments, s_LastOffset.x, s_LastOffset.y);
+
+			if(g_Config.m_EdShowQuadsRect)
+				DrawAABB(s_SelectionAABB, s_LastOffset.x, s_LastOffset.y);
+		}
+
+		if(s_Operation == OP_CONTEXT_MENU)
+		{
+			if(!UI()->MouseButton(1))
+			{
+				if(m_vSelectedLayers.size() == 1)
+				{
+					m_SelectedQuadIndex = FindSelectedQuadIndex(Index);
+
+					static SPopupMenuId s_PopupQuadId;
+					UI()->DoPopupMenu(&s_PopupQuadId, UI()->MouseX(), UI()->MouseY(), 120, 198, this, PopupQuad);
+					UI()->DisableMouseLock();
+				}
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+		else if(s_Operation == OP_DELETE)
+		{
+			if(!UI()->MouseButton(1))
+			{
+				if(m_vSelectedLayers.size() == 1)
+				{
+					UI()->DisableMouseLock();
+					m_Map.OnModify();
+					DeleteSelectedQuads();
+				}
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+		else if(s_Operation == OP_ROTATE)
+		{
+			if(UI()->MouseButton(0))
+			{
+				UI()->DisableMouseLock();
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+				m_QuadTracker.EndQuadTrack();
+			}
+			else if(UI()->MouseButton(1))
+			{
+				UI()->DisableMouseLock();
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+
+				// Reset points to old position
+				for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
+				{
+					CQuad *pCurrentQuad = &pLayer->m_vQuads[m_vSelectedQuads[i]];
+					for(int v = 0; v < 4; v++)
+						pCurrentQuad->m_aPoints[v] = s_vvRotatePoints[i][v];
+				}
+			}
+		}
+		else
+		{
+			if(!UI()->MouseButton(0))
+			{
+				if(s_Operation == OP_SELECT)
+				{
+					if(Input()->ShiftIsPressed())
+						ToggleSelectQuad(Index);
+					else
+						SelectQuad(Index);
+				}
+				else if(s_Operation == OP_MOVE_PIVOT || s_Operation == OP_MOVE_ALL)
+				{
+					m_QuadTracker.EndQuadTrack();
+				}
+
+				UI()->DisableMouseLock();
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+
+				s_LastOffset = ivec2();
+				s_OriginalPosition = ivec2();
+				s_vAABBAlignments.clear();
+				s_PivotAlignments.clear();
+			}
+		}
+
+		Graphics()->SetColor(1, 1, 1, 1);
+	}
+	else if(Input()->KeyPress(KEY_R) && !m_vSelectedQuads.empty() && m_Dialog == DIALOG_NONE)
+	{
+		UI()->EnableMouseLock(pID);
+		UI()->SetActiveItem(pID);
+		s_Operation = OP_ROTATE;
+		s_RotateAngle = 0;
+
+		s_vvRotatePoints.clear();
+		s_vvRotatePoints.resize(m_vSelectedQuads.size());
+		for(size_t i = 0; i < m_vSelectedQuads.size(); ++i)
+		{
+			CQuad *pCurrentQuad = &pLayer->m_vQuads[m_vSelectedQuads[i]];
+
+			s_vvRotatePoints[i].resize(4);
+			s_vvRotatePoints[i][0] = pCurrentQuad->m_aPoints[0];
+			s_vvRotatePoints[i][1] = pCurrentQuad->m_aPoints[1];
+			s_vvRotatePoints[i][2] = pCurrentQuad->m_aPoints[2];
+			s_vvRotatePoints[i][3] = pCurrentQuad->m_aPoints[3];
+		}
+	}
+	else if(UI()->HotItem() == pID)
+	{
+		ms_pUiGotContext = pID;
+
+		Graphics()->SetColor(1, 1, 1, 1);
+		str_copy(m_aTooltip, "Left mouse button to move. Hold shift to move pivot. Hold alt to ignore grid. Hold shift and right click to delete.");
+
+		if(UI()->MouseButton(0))
+		{
+			UI()->SetActiveItem(pID);
+
+			s_MouseXStart = UI()->MouseX();
+			s_MouseYStart = UI()->MouseY();
+
+			s_Operation = OP_SELECT;
+		}
+		else if(UI()->MouseButton(1))
+		{
+			if(Input()->ShiftIsPressed())
+			{
+				s_Operation = OP_DELETE;
+
+				if(!IsQuadSelected(Index))
+					SelectQuad(Index);
+
+				UI()->SetActiveItem(pID);
+			}
+			else
+			{
+				s_Operation = OP_CONTEXT_MENU;
+
+				if(!IsQuadSelected(Index))
+					SelectQuad(Index);
+
+				UI()->SetActiveItem(pID);
+			}
+		}
+	}
+	else
+		Graphics()->SetColor(0, 1, 0, 1);
+
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CEditor::DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int V)
+{
+	void *pID = &pQuad->m_aPoints[V];
+
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+
+	float px = fx2f(pQuad->m_aPoints[V].x);
+	float py = fx2f(pQuad->m_aPoints[V].y);
+
+	// draw selection background
+	if(IsQuadPointSelected(QuadIndex, V))
+	{
+		Graphics()->SetColor(0, 0, 0, 1);
+		IGraphics::CQuadItem QuadItem(px, py, 7.0f * m_MouseWScale, 7.0f * m_MouseWScale);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+	}
+
+	enum
+	{
+		OP_NONE = 0,
+		OP_SELECT,
+		OP_MOVEPOINT,
+		OP_MOVEUV,
+		OP_CONTEXT_MENU
+	};
+
+	static int s_Operation = OP_NONE;
+	static float s_MouseXStart = 0.0f;
+	static float s_MouseYStart = 0.0f;
+	static CPoint s_OriginalPoint;
+	static std::vector<SAlignmentInfo> s_Alignments; // Alignments
+	static ivec2 s_LastOffset;
+
+	const bool IgnoreGrid = Input()->AltIsPressed();
+
+	auto &&GetDragOffset = [&]() -> ivec2 {
+		float x = wx;
+		float y = wy;
+		if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
+			MapView()->MapGrid()->SnapToGrid(x, y);
+
+		int OffsetX = f2fx(x) - s_OriginalPoint.x;
+		int OffsetY = f2fx(y) - s_OriginalPoint.y;
+
+		return {OffsetX, OffsetY};
+	};
+
+	if(UI()->CheckActiveItem(pID))
+	{
+		if(m_MouseDeltaWx * m_MouseDeltaWx + m_MouseDeltaWy * m_MouseDeltaWy > 0.0f)
+		{
+			if(s_Operation == OP_SELECT)
+			{
+				float x = s_MouseXStart - UI()->MouseX();
+				float y = s_MouseYStart - UI()->MouseY();
+
+				if(x * x + y * y > 20.0f)
+				{
+					if(!IsQuadPointSelected(QuadIndex, V))
+						SelectQuadPoint(QuadIndex, V);
+
+					if(Input()->ShiftIsPressed())
+					{
+						s_Operation = OP_MOVEUV;
+						UI()->EnableMouseLock(pID);
+					}
+					else
+					{
+						s_Operation = OP_MOVEPOINT;
+						// Save original positions before moving
+						s_OriginalPoint = pQuad->m_aPoints[V];
+						for(int m = 0; m < 4; m++)
+							if(IsQuadPointSelected(QuadIndex, m))
+								PreparePointDrag(pLayer, pQuad, QuadIndex, m);
+					}
+				}
+			}
+
+			if(s_Operation == OP_MOVEPOINT)
+			{
+				m_QuadTracker.BeginQuadTrack(pLayer, m_vSelectedQuads);
+
+				s_LastOffset = GetDragOffset(); // Update offset
+				ApplyAxisAlignment(s_LastOffset.x, s_LastOffset.y); // Apply axis alignment to offset
+
+				ComputePointsAlignments(pLayer, false, s_LastOffset.x, s_LastOffset.y, s_Alignments);
+				ApplyAlignments(s_Alignments, s_LastOffset.x, s_LastOffset.y);
+
+				for(int m = 0; m < 4; m++)
+				{
+					if(IsQuadPointSelected(QuadIndex, m))
+					{
+						DoPointDrag(pLayer, pQuad, QuadIndex, m, s_LastOffset.x, s_LastOffset.y);
+					}
+				}
+			}
+			else if(s_Operation == OP_MOVEUV)
+			{
+				int SelectedPoints = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
+
+				m_QuadTracker.BeginQuadPointPropTrack(pLayer, m_vSelectedQuads, SelectedPoints);
+				m_QuadTracker.AddQuadPointPropTrack(EQuadPointProp::PROP_TEX_U);
+				m_QuadTracker.AddQuadPointPropTrack(EQuadPointProp::PROP_TEX_V);
+
+				for(int m = 0; m < 4; m++)
+				{
+					if(IsQuadPointSelected(QuadIndex, m))
+					{
+						// 0,2;1,3 - line x
+						// 0,1;2,3 - line y
+
+						pQuad->m_aTexcoords[m].x += f2fx(m_MouseDeltaWx * 0.001f);
+						pQuad->m_aTexcoords[(m + 2) % 4].x += f2fx(m_MouseDeltaWx * 0.001f);
+
+						pQuad->m_aTexcoords[m].y += f2fx(m_MouseDeltaWy * 0.001f);
+						pQuad->m_aTexcoords[m ^ 1].y += f2fx(m_MouseDeltaWy * 0.001f);
+					}
+				}
+			}
+		}
+
+		// Draw axis and alignments when dragging
+		if(s_Operation == OP_MOVEPOINT)
+		{
+			Graphics()->SetColor(1, 0, 0.1f, 1);
+
+			// Axis
+			EAxis Axis = GetDragAxis(s_LastOffset.x, s_LastOffset.y);
+			DrawAxis(Axis, s_OriginalPoint, pQuad->m_aPoints[V]);
+
+			// Alignments
+			DrawPointAlignments(s_Alignments, s_LastOffset.x, s_LastOffset.y);
+		}
+
+		if(s_Operation == OP_CONTEXT_MENU)
+		{
+			if(!UI()->MouseButton(1))
+			{
+				if(m_vSelectedLayers.size() == 1)
+				{
+					if(!IsQuadSelected(QuadIndex))
+						SelectQuad(QuadIndex);
+
+					m_SelectedQuadPoint = V;
+					m_SelectedQuadIndex = FindSelectedQuadIndex(QuadIndex);
+
+					static SPopupMenuId s_PopupPointId;
+					UI()->DoPopupMenu(&s_PopupPointId, UI()->MouseX(), UI()->MouseY(), 120, 75, this, PopupPoint);
+				}
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+		else
+		{
+			if(!UI()->MouseButton(0))
+			{
+				if(s_Operation == OP_SELECT)
+				{
+					if(Input()->ShiftIsPressed())
+						ToggleSelectQuadPoint(QuadIndex, V);
+					else
+						SelectQuadPoint(QuadIndex, V);
+				}
+
+				if(s_Operation == OP_MOVEPOINT)
+				{
+					m_QuadTracker.EndQuadTrack();
+				}
+				else if(s_Operation == OP_MOVEUV)
+				{
+					m_QuadTracker.EndQuadPointPropTrackAll();
+				}
+
+				UI()->DisableMouseLock();
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+
+		Graphics()->SetColor(1, 1, 1, 1);
+	}
+	else if(UI()->HotItem() == pID)
+	{
+		ms_pUiGotContext = pID;
+
+		Graphics()->SetColor(1, 1, 1, 1);
+		str_copy(m_aTooltip, "Left mouse button to move. Hold shift to move the texture. Hold alt to ignore grid.");
+
+		if(UI()->MouseButton(0))
+		{
+			UI()->SetActiveItem(pID);
+
+			s_MouseXStart = UI()->MouseX();
+			s_MouseYStart = UI()->MouseY();
+
+			s_Operation = OP_SELECT;
+		}
+		else if(UI()->MouseButton(1))
+		{
+			s_Operation = OP_CONTEXT_MENU;
+
+			UI()->SetActiveItem(pID);
+
+			if(!IsQuadPointSelected(QuadIndex, V))
+				SelectQuadPoint(QuadIndex, V);
+		}
+	}
+	else
+		Graphics()->SetColor(1, 0, 0, 1);
+
+	IGraphics::CQuadItem QuadItem(px, py, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+float CEditor::TriangleArea(vec2 A, vec2 B, vec2 C)
+{
+	return absolute(((B.x - A.x) * (C.y - A.y) - (C.x - A.x) * (B.y - A.y)) * 0.5f);
+}
+
+bool CEditor::IsInTriangle(vec2 Point, vec2 A, vec2 B, vec2 C)
+{
+	// Normalize to increase precision
+	vec2 Min(minimum(A.x, B.x, C.x), minimum(A.y, B.y, C.y));
+	vec2 Max(maximum(A.x, B.x, C.x), maximum(A.y, B.y, C.y));
+	vec2 Size(Max.x - Min.x, Max.y - Min.y);
+
+	if(Size.x < 0.0000001f || Size.y < 0.0000001f)
+		return false;
+
+	vec2 Normal(1.f / Size.x, 1.f / Size.y);
+
+	A = (A - Min) * Normal;
+	B = (B - Min) * Normal;
+	C = (C - Min) * Normal;
+	Point = (Point - Min) * Normal;
+
+	float Area = TriangleArea(A, B, C);
+	return Area > 0.f && absolute(TriangleArea(Point, A, B) + TriangleArea(Point, B, C) + TriangleArea(Point, C, A) - Area) < 0.000001f;
+}
+
+void CEditor::DoQuadKnife(int QuadIndex)
+{
+	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
+	CQuad *pQuad = &pLayer->m_vQuads[QuadIndex];
+
+	const bool IgnoreGrid = Input()->AltIsPressed();
+	float SnapRadius = 4.f * m_MouseWScale;
+
+	vec2 Mouse = vec2(UI()->MouseWorldX(), UI()->MouseWorldY());
+	vec2 Point = Mouse;
+
+	vec2 v[4] = {
+		vec2(fx2f(pQuad->m_aPoints[0].x), fx2f(pQuad->m_aPoints[0].y)),
+		vec2(fx2f(pQuad->m_aPoints[1].x), fx2f(pQuad->m_aPoints[1].y)),
+		vec2(fx2f(pQuad->m_aPoints[3].x), fx2f(pQuad->m_aPoints[3].y)),
+		vec2(fx2f(pQuad->m_aPoints[2].x), fx2f(pQuad->m_aPoints[2].y))};
+
+	str_copy(m_aTooltip, "Left click inside the quad to select an area to slice. Hold alt to ignore grid. Right click to leave knife mode");
+
+	if(UI()->MouseButtonClicked(1))
+	{
+		m_QuadKnifeActive = false;
+		return;
+	}
+
+	// Handle snapping
+	if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
+	{
+		float CellSize = MapView()->MapGrid()->GridLineDistance();
+		vec2 OnGrid(Mouse.x, Mouse.y);
+		MapView()->MapGrid()->SnapToGrid(OnGrid.x, OnGrid.y);
+
+		if(IsInTriangle(OnGrid, v[0], v[1], v[2]) || IsInTriangle(OnGrid, v[0], v[3], v[2]))
+			Point = OnGrid;
+		else
+		{
+			float MinDistance = -1.f;
+
+			for(int i = 0; i < 4; i++)
+			{
+				int j = (i + 1) % 4;
+				vec2 Min(minimum(v[i].x, v[j].x), minimum(v[i].y, v[j].y));
+				vec2 Max(maximum(v[i].x, v[j].x), maximum(v[i].y, v[j].y));
+
+				if(in_range(OnGrid.y, Min.y, Max.y) && Max.y - Min.y > 0.0000001f)
+				{
+					vec2 OnEdge(v[i].x + (OnGrid.y - v[i].y) / (v[j].y - v[i].y) * (v[j].x - v[i].x), OnGrid.y);
+					float Distance = absolute(OnGrid.x - OnEdge.x);
+
+					if(Distance < CellSize && (Distance < MinDistance || MinDistance < 0.f))
+					{
+						MinDistance = Distance;
+						Point = OnEdge;
+					}
+				}
+
+				if(in_range(OnGrid.x, Min.x, Max.x) && Max.x - Min.x > 0.0000001f)
+				{
+					vec2 OnEdge(OnGrid.x, v[i].y + (OnGrid.x - v[i].x) / (v[j].x - v[i].x) * (v[j].y - v[i].y));
+					float Distance = absolute(OnGrid.y - OnEdge.y);
+
+					if(Distance < CellSize && (Distance < MinDistance || MinDistance < 0.f))
+					{
+						MinDistance = Distance;
+						Point = OnEdge;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		float MinDistance = -1.f;
+
+		// Try snapping to corners
+		for(const auto &x : v)
+		{
+			float Distance = distance(Mouse, x);
+
+			if(Distance <= SnapRadius && (Distance < MinDistance || MinDistance < 0.f))
+			{
+				MinDistance = Distance;
+				Point = x;
+			}
+		}
+
+		if(MinDistance < 0.f)
+		{
+			// Try snapping to edges
+			for(int i = 0; i < 4; i++)
+			{
+				int j = (i + 1) % 4;
+				vec2 s(v[j] - v[i]);
+
+				float t = ((Mouse.x - v[i].x) * s.x + (Mouse.y - v[i].y) * s.y) / (s.x * s.x + s.y * s.y);
+
+				if(in_range(t, 0.f, 1.f))
+				{
+					vec2 OnEdge = vec2((v[i].x + t * s.x), (v[i].y + t * s.y));
+					float Distance = distance(Mouse, OnEdge);
+
+					if(Distance <= SnapRadius && (Distance < MinDistance || MinDistance < 0.f))
+					{
+						MinDistance = Distance;
+						Point = OnEdge;
+					}
+				}
+			}
+		}
+	}
+
+	bool ValidPosition = IsInTriangle(Point, v[0], v[1], v[2]) || IsInTriangle(Point, v[0], v[3], v[2]);
+
+	if(UI()->MouseButtonClicked(0) && ValidPosition)
+	{
+		m_aQuadKnifePoints[m_QuadKnifeCount] = Point;
+		m_QuadKnifeCount++;
+	}
+
+	if(m_QuadKnifeCount == 4)
+	{
+		if(IsInTriangle(m_aQuadKnifePoints[3], m_aQuadKnifePoints[0], m_aQuadKnifePoints[1], m_aQuadKnifePoints[2]) ||
+			IsInTriangle(m_aQuadKnifePoints[1], m_aQuadKnifePoints[0], m_aQuadKnifePoints[2], m_aQuadKnifePoints[3]))
+		{
+			// Fix concave order
+			std::swap(m_aQuadKnifePoints[0], m_aQuadKnifePoints[3]);
+			std::swap(m_aQuadKnifePoints[1], m_aQuadKnifePoints[2]);
+		}
+
+		std::swap(m_aQuadKnifePoints[2], m_aQuadKnifePoints[3]);
+
+		CQuad *pResult = pLayer->NewQuad(64, 64, 64, 64);
+		pQuad = &pLayer->m_vQuads[QuadIndex];
+
+		for(int i = 0; i < 4; i++)
+		{
+			int t = IsInTriangle(m_aQuadKnifePoints[i], v[0], v[3], v[2]) ? 2 : 1;
+
+			vec2 A = vec2(fx2f(pQuad->m_aPoints[0].x), fx2f(pQuad->m_aPoints[0].y));
+			vec2 B = vec2(fx2f(pQuad->m_aPoints[3].x), fx2f(pQuad->m_aPoints[3].y));
+			vec2 C = vec2(fx2f(pQuad->m_aPoints[t].x), fx2f(pQuad->m_aPoints[t].y));
+
+			float TriArea = TriangleArea(A, B, C);
+			float WeightA = TriangleArea(m_aQuadKnifePoints[i], B, C) / TriArea;
+			float WeightB = TriangleArea(m_aQuadKnifePoints[i], C, A) / TriArea;
+			float WeightC = TriangleArea(m_aQuadKnifePoints[i], A, B) / TriArea;
+
+			pResult->m_aColors[i].r = (int)std::round(pQuad->m_aColors[0].r * WeightA + pQuad->m_aColors[3].r * WeightB + pQuad->m_aColors[t].r * WeightC);
+			pResult->m_aColors[i].g = (int)std::round(pQuad->m_aColors[0].g * WeightA + pQuad->m_aColors[3].g * WeightB + pQuad->m_aColors[t].g * WeightC);
+			pResult->m_aColors[i].b = (int)std::round(pQuad->m_aColors[0].b * WeightA + pQuad->m_aColors[3].b * WeightB + pQuad->m_aColors[t].b * WeightC);
+			pResult->m_aColors[i].a = (int)std::round(pQuad->m_aColors[0].a * WeightA + pQuad->m_aColors[3].a * WeightB + pQuad->m_aColors[t].a * WeightC);
+
+			pResult->m_aTexcoords[i].x = (int)std::round(pQuad->m_aTexcoords[0].x * WeightA + pQuad->m_aTexcoords[3].x * WeightB + pQuad->m_aTexcoords[t].x * WeightC);
+			pResult->m_aTexcoords[i].y = (int)std::round(pQuad->m_aTexcoords[0].y * WeightA + pQuad->m_aTexcoords[3].y * WeightB + pQuad->m_aTexcoords[t].y * WeightC);
+
+			pResult->m_aPoints[i].x = f2fx(m_aQuadKnifePoints[i].x);
+			pResult->m_aPoints[i].y = f2fx(m_aQuadKnifePoints[i].y);
+		}
+
+		pResult->m_aPoints[4].x = ((pResult->m_aPoints[0].x + pResult->m_aPoints[3].x) / 2 + (pResult->m_aPoints[1].x + pResult->m_aPoints[2].x) / 2) / 2;
+		pResult->m_aPoints[4].y = ((pResult->m_aPoints[0].y + pResult->m_aPoints[3].y) / 2 + (pResult->m_aPoints[1].y + pResult->m_aPoints[2].y) / 2) / 2;
+
+		m_QuadKnifeCount = 0;
+		m_EditorHistory.RecordAction(std::make_shared<CEditorActionNewQuad>(this, m_SelectedGroup, m_vSelectedLayers[0]));
+	}
+
+	// Render
+	Graphics()->TextureClear();
+	Graphics()->LinesBegin();
+
+	IGraphics::CLineItem aEdges[4] = {
+		IGraphics::CLineItem(v[0].x, v[0].y, v[1].x, v[1].y),
+		IGraphics::CLineItem(v[1].x, v[1].y, v[2].x, v[2].y),
+		IGraphics::CLineItem(v[2].x, v[2].y, v[3].x, v[3].y),
+		IGraphics::CLineItem(v[3].x, v[3].y, v[0].x, v[0].y)};
+
+	Graphics()->SetColor(1.f, 0.5f, 0.f, 1.f);
+	Graphics()->LinesDraw(aEdges, 4);
+
+	IGraphics::CLineItem aLines[4];
+	int LineCount = maximum(m_QuadKnifeCount - 1, 0);
+
+	for(int i = 0; i < LineCount; i++)
+		aLines[i] = IGraphics::CLineItem(m_aQuadKnifePoints[i].x, m_aQuadKnifePoints[i].y, m_aQuadKnifePoints[i + 1].x, m_aQuadKnifePoints[i + 1].y);
+
+	Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
+	Graphics()->LinesDraw(aLines, LineCount);
+
+	if(ValidPosition)
+	{
+		if(m_QuadKnifeCount > 0)
+		{
+			IGraphics::CLineItem LineCurrent(Point.x, Point.y, m_aQuadKnifePoints[m_QuadKnifeCount - 1].x, m_aQuadKnifePoints[m_QuadKnifeCount - 1].y);
+			Graphics()->LinesDraw(&LineCurrent, 1);
+		}
+
+		if(m_QuadKnifeCount == 3)
+		{
+			IGraphics::CLineItem LineClose(Point.x, Point.y, m_aQuadKnifePoints[0].x, m_aQuadKnifePoints[0].y);
+			Graphics()->LinesDraw(&LineClose, 1);
+		}
+	}
+
+	Graphics()->LinesEnd();
+	Graphics()->QuadsBegin();
+
+	IGraphics::CQuadItem aMarkers[4];
+
+	for(int i = 0; i < m_QuadKnifeCount; i++)
+		aMarkers[i] = IGraphics::CQuadItem(m_aQuadKnifePoints[i].x, m_aQuadKnifePoints[i].y, 5.f * m_MouseWScale, 5.f * m_MouseWScale);
+
+	Graphics()->SetColor(0.f, 0.f, 1.f, 1.f);
+	Graphics()->QuadsDraw(aMarkers, m_QuadKnifeCount);
+
+	if(ValidPosition)
+	{
+		IGraphics::CQuadItem MarkerCurrent(Point.x, Point.y, 5.f * m_MouseWScale, 5.f * m_MouseWScale);
+		Graphics()->QuadsDraw(&MarkerCurrent, 1);
+	}
+
+	Graphics()->QuadsEnd();
+}
+
+void CEditor::DoQuadEnvelopes(const std::vector<CQuad> &vQuads, IGraphics::CTextureHandle Texture)
+{
+	size_t Num = vQuads.size();
+	std::shared_ptr<CEnvelope> *apEnvelope = new std::shared_ptr<CEnvelope>[Num];
+	for(size_t i = 0; i < Num; i++)
+		apEnvelope[i] = nullptr;
+
+	for(size_t i = 0; i < Num; i++)
+	{
+		if((m_ShowEnvelopePreview == SHOWENV_SELECTED && vQuads[i].m_PosEnv == m_SelectedEnvelope) || m_ShowEnvelopePreview == SHOWENV_ALL)
+			if(vQuads[i].m_PosEnv >= 0 && vQuads[i].m_PosEnv < (int)m_Map.m_vpEnvelopes.size())
+				apEnvelope[i] = m_Map.m_vpEnvelopes[vQuads[i].m_PosEnv];
+	}
+
+	// Draw Lines
+	Graphics()->TextureClear();
+	Graphics()->LinesBegin();
+	Graphics()->SetColor(80.0f / 255, 150.0f / 255, 230.f / 255, 0.5f);
+	for(size_t j = 0; j < Num; j++)
+	{
+		if(!apEnvelope[j])
+			continue;
+
+		// QuadParams
+		const CPoint *pPivotPoint = &vQuads[j].m_aPoints[4];
+		for(size_t i = 0; i < apEnvelope[j]->m_vPoints.size() - 1; i++)
+		{
+			ColorRGBA Result;
+			apEnvelope[j]->Eval(apEnvelope[j]->m_vPoints[i].m_Time / 1000.0f + 0.000001f, Result);
+			vec2 Pos0 = vec2(fx2f(pPivotPoint->x) + Result.r, fx2f(pPivotPoint->y) + Result.g);
+
+			const int Steps = 15;
+			for(int n = 1; n <= Steps; n++)
+			{
+				const float Time = mix(apEnvelope[j]->m_vPoints[i].m_Time, apEnvelope[j]->m_vPoints[i + 1].m_Time, (float)n / Steps);
+				apEnvelope[j]->Eval(Time / 1000.0f - 0.000001f, Result);
+
+				vec2 Pos1 = vec2(fx2f(pPivotPoint->x) + Result.r, fx2f(pPivotPoint->y) + Result.g);
+
+				IGraphics::CLineItem Line = IGraphics::CLineItem(Pos0.x, Pos0.y, Pos1.x, Pos1.y);
+				Graphics()->LinesDraw(&Line, 1);
+
+				Pos0 = Pos1;
+			}
+		}
+	}
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	Graphics()->LinesEnd();
+
+	// Draw Quads
+	Graphics()->TextureSet(Texture);
+	Graphics()->QuadsBegin();
+
+	for(size_t j = 0; j < Num; j++)
+	{
+		if(!apEnvelope[j])
+			continue;
+
+		// QuadParams
+		const CPoint *pPoints = vQuads[j].m_aPoints;
+
+		for(size_t i = 0; i < apEnvelope[j]->m_vPoints.size(); i++)
+		{
+			// Calc Env Position
+			float OffsetX = fx2f(apEnvelope[j]->m_vPoints[i].m_aValues[0]);
+			float OffsetY = fx2f(apEnvelope[j]->m_vPoints[i].m_aValues[1]);
+			float Rot = fx2f(apEnvelope[j]->m_vPoints[i].m_aValues[2]) / 360.0f * pi * 2;
+
+			// Set Colours
+			float Alpha = (m_SelectedQuadEnvelope == vQuads[j].m_PosEnv && IsEnvPointSelected(i)) ? 0.65f : 0.35f;
+			IGraphics::CColorVertex aArray[4] = {
+				IGraphics::CColorVertex(0, vQuads[j].m_aColors[0].r, vQuads[j].m_aColors[0].g, vQuads[j].m_aColors[0].b, Alpha),
+				IGraphics::CColorVertex(1, vQuads[j].m_aColors[1].r, vQuads[j].m_aColors[1].g, vQuads[j].m_aColors[1].b, Alpha),
+				IGraphics::CColorVertex(2, vQuads[j].m_aColors[2].r, vQuads[j].m_aColors[2].g, vQuads[j].m_aColors[2].b, Alpha),
+				IGraphics::CColorVertex(3, vQuads[j].m_aColors[3].r, vQuads[j].m_aColors[3].g, vQuads[j].m_aColors[3].b, Alpha)};
+			Graphics()->SetColorVertex(aArray, 4);
+
+			// Rotation
+			if(Rot != 0)
+			{
+				static CPoint aRotated[4];
+				aRotated[0] = vQuads[j].m_aPoints[0];
+				aRotated[1] = vQuads[j].m_aPoints[1];
+				aRotated[2] = vQuads[j].m_aPoints[2];
+				aRotated[3] = vQuads[j].m_aPoints[3];
+				pPoints = aRotated;
+
+				Rotate(&vQuads[j].m_aPoints[4], &aRotated[0], Rot);
+				Rotate(&vQuads[j].m_aPoints[4], &aRotated[1], Rot);
+				Rotate(&vQuads[j].m_aPoints[4], &aRotated[2], Rot);
+				Rotate(&vQuads[j].m_aPoints[4], &aRotated[3], Rot);
+			}
+
+			// Set Texture Coords
+			Graphics()->QuadsSetSubsetFree(
+				fx2f(vQuads[j].m_aTexcoords[0].x), fx2f(vQuads[j].m_aTexcoords[0].y),
+				fx2f(vQuads[j].m_aTexcoords[1].x), fx2f(vQuads[j].m_aTexcoords[1].y),
+				fx2f(vQuads[j].m_aTexcoords[2].x), fx2f(vQuads[j].m_aTexcoords[2].y),
+				fx2f(vQuads[j].m_aTexcoords[3].x), fx2f(vQuads[j].m_aTexcoords[3].y));
+
+			// Set Quad Coords & Draw
+			IGraphics::CFreeformItem Freeform(
+				fx2f(pPoints[0].x) + OffsetX, fx2f(pPoints[0].y) + OffsetY,
+				fx2f(pPoints[1].x) + OffsetX, fx2f(pPoints[1].y) + OffsetY,
+				fx2f(pPoints[2].x) + OffsetX, fx2f(pPoints[2].y) + OffsetY,
+				fx2f(pPoints[3].x) + OffsetX, fx2f(pPoints[3].y) + OffsetY);
+			Graphics()->QuadsDrawFreeform(&Freeform, 1);
+		}
+	}
+	Graphics()->QuadsEnd();
+	Graphics()->TextureClear();
+	Graphics()->QuadsBegin();
+
+	// Draw QuadPoints
+	for(size_t j = 0; j < Num; j++)
+	{
+		if(!apEnvelope[j])
+			continue;
+
+		for(size_t i = 0; i < apEnvelope[j]->m_vPoints.size(); i++)
+			DoQuadEnvPoint(&vQuads[j], j, i);
+	}
+	Graphics()->QuadsEnd();
+	delete[] apEnvelope;
+}
+
+void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
+{
+	enum
+	{
+		OP_NONE = 0,
+		OP_MOVE,
+		OP_ROTATE,
+	};
+
+	// some basic values
+	static float s_LastWx = 0;
+	static float s_LastWy = 0;
+	static int s_Operation = OP_NONE;
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+	std::shared_ptr<CEnvelope> pEnvelope = m_Map.m_vpEnvelopes[pQuad->m_PosEnv];
+	void *pID = &pEnvelope->m_vPoints[PIndex];
+
+	// get pivot
+	float CenterX = fx2f(pQuad->m_aPoints[4].x) + fx2f(pEnvelope->m_vPoints[PIndex].m_aValues[0]);
+	float CenterY = fx2f(pQuad->m_aPoints[4].y) + fx2f(pEnvelope->m_vPoints[PIndex].m_aValues[1]);
+
+	const bool IgnoreGrid = Input()->AltIsPressed();
+
+	if(UI()->CheckActiveItem(pID) && m_CurrentQuadIndex == QIndex)
+	{
+		if(s_Operation == OP_MOVE)
+		{
+			if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
+			{
+				float x = wx;
+				float y = wy;
+				MapView()->MapGrid()->SnapToGrid(x, y);
+				pEnvelope->m_vPoints[PIndex].m_aValues[0] = f2fx(x) - pQuad->m_aPoints[4].x;
+				pEnvelope->m_vPoints[PIndex].m_aValues[1] = f2fx(y) - pQuad->m_aPoints[4].y;
+			}
+			else
+			{
+				pEnvelope->m_vPoints[PIndex].m_aValues[0] += f2fx(wx - s_LastWx);
+				pEnvelope->m_vPoints[PIndex].m_aValues[1] += f2fx(wy - s_LastWy);
+			}
+		}
+		else if(s_Operation == OP_ROTATE)
+			pEnvelope->m_vPoints[PIndex].m_aValues[2] += 10 * m_MouseDeltaX;
+
+		s_LastWx = wx;
+		s_LastWy = wy;
+
+		if(!UI()->MouseButton(0))
+		{
+			UI()->DisableMouseLock();
+			s_Operation = OP_NONE;
+			UI()->SetActiveItem(nullptr);
+		}
+
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	else if(UI()->HotItem() == pID && m_CurrentQuadIndex == QIndex)
+	{
+		ms_pUiGotContext = pID;
+
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		str_copy(m_aTooltip, "Left mouse button to move. Hold ctrl to rotate. Hold alt to ignore grid.");
+
+		if(UI()->MouseButton(0))
+		{
+			if(Input()->ModifierIsPressed())
+			{
+				UI()->EnableMouseLock(pID);
+				s_Operation = OP_ROTATE;
+
+				SelectQuad(QIndex);
+			}
+			else
+			{
+				s_Operation = OP_MOVE;
+
+				SelectQuad(QIndex);
+			}
+
+			SelectEnvPoint(PIndex);
+			m_SelectedQuadEnvelope = pQuad->m_PosEnv;
+
+			UI()->SetActiveItem(pID);
+
+			s_LastWx = wx;
+			s_LastWy = wy;
+		}
+		else
+		{
+			DeselectEnvPoints();
+			m_SelectedQuadEnvelope = -1;
+		}
+	}
+	else
+		Graphics()->SetColor(0.0f, 1.0f, 0.0f, 1.0f);
+
+	IGraphics::CQuadItem QuadItem(CenterX, CenterY, 5.0f * m_MouseWScale, 5.0f * m_MouseWScale);
+	Graphics()->QuadsDraw(&QuadItem, 1);
+}
+
+void CEditor::DoMapEditor(CUIRect View)
+{
+	// render all good stuff
+	if(!m_ShowPicker)
+	{
+		MapView()->RenderMap();
+	}
+	else
+	{
+		// fix aspect ratio of the image in the picker
+		float Max = minimum(View.w, View.h);
+		View.w = View.h = Max;
+	}
+
+	static void *s_pEditorID = (void *)&s_pEditorID;
+	const bool Inside = !m_GuiActive || UI()->MouseInside(&View);
+
+	// fetch mouse position
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+	float mx = UI()->MouseX();
+	float my = UI()->MouseY();
+
+	static float s_StartWx = 0;
+	static float s_StartWy = 0;
+
+	enum
+	{
+		OP_NONE = 0,
+		OP_BRUSH_GRAB,
+		OP_BRUSH_DRAW,
+		OP_BRUSH_PAINT,
+		OP_PAN_WORLD,
+		OP_PAN_EDITOR,
+	};
+
+	// remap the screen so it can display the whole tileset
+	if(m_ShowPicker)
+	{
+		CUIRect Screen = *UI()->Screen();
+		float Size = 32.0f * 16.0f;
+		float w = Size * (Screen.w / View.w);
+		float h = Size * (Screen.h / View.h);
+		float x = -(View.x / Screen.w) * w;
+		float y = -(View.y / Screen.h) * h;
+		wx = x + w * mx / Screen.w;
+		wy = y + h * my / Screen.h;
+		std::shared_ptr<CLayerTiles> pTileLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+		if(pTileLayer)
+		{
+			Graphics()->MapScreen(x, y, x + w, y + h);
+			m_pTilesetPicker->m_Image = pTileLayer->m_Image;
+			if(m_BrushColorEnabled)
+			{
+				m_pTilesetPicker->m_Color = pTileLayer->m_Color;
+				m_pTilesetPicker->m_Color.a = 255;
+			}
+			else
+			{
+				m_pTilesetPicker->m_Color = {255, 255, 255, 255};
+			}
+
+			m_pTilesetPicker->m_Game = pTileLayer->m_Game;
+			m_pTilesetPicker->m_Tele = pTileLayer->m_Tele;
+			m_pTilesetPicker->m_Speedup = pTileLayer->m_Speedup;
+			m_pTilesetPicker->m_Front = pTileLayer->m_Front;
+			m_pTilesetPicker->m_Switch = pTileLayer->m_Switch;
+			m_pTilesetPicker->m_Tune = pTileLayer->m_Tune;
+
+			m_pTilesetPicker->Render(true);
+
+			if(m_ShowTileInfo != SHOW_TILE_OFF)
+				m_pTilesetPicker->ShowInfo();
+		}
+		else
+		{
+			std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
+			if(pQuadLayer)
+			{
+				m_pQuadsetPicker->m_Image = pQuadLayer->m_Image;
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[0].x = f2fx(View.x);
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[0].y = f2fx(View.y);
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[1].x = f2fx((View.x + View.w));
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[1].y = f2fx(View.y);
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[2].x = f2fx(View.x);
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[2].y = f2fx((View.y + View.h));
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[3].x = f2fx((View.x + View.w));
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[3].y = f2fx((View.y + View.h));
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[4].x = f2fx((View.x + View.w / 2));
+				m_pQuadsetPicker->m_vQuads[0].m_aPoints[4].y = f2fx((View.y + View.h / 2));
+				m_pQuadsetPicker->Render();
+			}
+		}
+	}
+
+	static int s_Operation = OP_NONE;
+
+	// draw layer borders
+	std::shared_ptr<CLayer> apEditLayers[128];
+	size_t NumEditLayers = 0;
+
+	if(m_ShowPicker && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_TILES)
+	{
+		apEditLayers[0] = m_pTilesetPicker;
+		NumEditLayers++;
+	}
+	else if(m_ShowPicker)
+	{
+		apEditLayers[0] = m_pQuadsetPicker;
+		NumEditLayers++;
+	}
+	else
+	{
+		// pick a type of layers to edit, preferring Tiles layers.
+		int EditingType = -1;
+		for(size_t i = 0; i < m_vSelectedLayers.size(); i++)
+		{
+			std::shared_ptr<CLayer> pLayer = GetSelectedLayer(i);
+			if(pLayer && (EditingType == -1 || pLayer->m_Type == LAYERTYPE_TILES))
+			{
+				EditingType = pLayer->m_Type;
+				if(EditingType == LAYERTYPE_TILES)
+					break;
+			}
+		}
+		for(size_t i = 0; i < m_vSelectedLayers.size() && NumEditLayers < 128; i++)
+		{
+			apEditLayers[NumEditLayers] = GetSelectedLayerType(i, EditingType);
+			if(apEditLayers[NumEditLayers])
+			{
+				NumEditLayers++;
+			}
+		}
+
+		MapView()->RenderGroupBorder();
+		MapView()->MapGrid()->OnRender(View);
+	}
+
+	if(Inside)
+	{
+		UI()->SetHotItem(s_pEditorID);
+
+		// do global operations like pan and zoom
+		if(UI()->CheckActiveItem(nullptr) && (UI()->MouseButton(0) || UI()->MouseButton(2)))
+		{
+			s_StartWx = wx;
+			s_StartWy = wy;
+
+			if(Input()->ModifierIsPressed() || UI()->MouseButton(2))
+			{
+				if(Input()->ShiftIsPressed())
+					s_Operation = OP_PAN_EDITOR;
+				else
+					s_Operation = OP_PAN_WORLD;
+				UI()->SetActiveItem(s_pEditorID);
+			}
+			else
+				s_Operation = OP_NONE;
+		}
+
+		// brush editing
+		if(UI()->HotItem() == s_pEditorID)
+		{
+			if(m_ShowPicker)
+			{
+				std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
+				int Layer;
+				if(pLayer == m_Map.m_pGameLayer)
+					Layer = LAYER_GAME;
+				else if(pLayer == m_Map.m_pFrontLayer)
+					Layer = LAYER_FRONT;
+				else if(pLayer == m_Map.m_pSwitchLayer)
+					Layer = LAYER_SWITCH;
+				else if(pLayer == m_Map.m_pTeleLayer)
+					Layer = LAYER_TELE;
+				else if(pLayer == m_Map.m_pSpeedupLayer)
+					Layer = LAYER_SPEEDUP;
+				else if(pLayer == m_Map.m_pTuneLayer)
+					Layer = LAYER_TUNE;
+				else
+					Layer = NUM_LAYERS;
+
+				EExplanation Explanation;
+				if(m_SelectEntitiesImage == "DDNet")
+					Explanation = EExplanation::DDNET;
+				else if(m_SelectEntitiesImage == "FNG")
+					Explanation = EExplanation::FNG;
+				else if(m_SelectEntitiesImage == "Race")
+					Explanation = EExplanation::RACE;
+				else if(m_SelectEntitiesImage == "Vanilla")
+					Explanation = EExplanation::VANILLA;
+				else if(m_SelectEntitiesImage == "blockworlds")
+					Explanation = EExplanation::BLOCKWORLDS;
+				else
+					Explanation = EExplanation::NONE;
+
+				if(Layer != NUM_LAYERS)
+				{
+					const char *pExplanation = Explain(Explanation, (int)wx / 32 + (int)wy / 32 * 16, Layer);
+					if(pExplanation)
+						str_copy(m_aTooltip, pExplanation);
+				}
+			}
+			else if(m_pBrush->IsEmpty() && GetSelectedLayerType(0, LAYERTYPE_QUADS) != nullptr)
+				str_copy(m_aTooltip, "Use left mouse button to drag and create a brush. Hold shift to select multiple quads. Press R to rotate selected quads. Use ctrl+right mouse to select layer.");
+			else if(m_pBrush->IsEmpty())
+				str_copy(m_aTooltip, "Use left mouse button to drag and create a brush. Use ctrl+right mouse to select layer.");
+			else
+				str_copy(m_aTooltip, "Use left mouse button to paint with the brush. Right button clears the brush.");
+
+			if(UI()->CheckActiveItem(s_pEditorID))
+			{
+				CUIRect r;
+				r.x = s_StartWx;
+				r.y = s_StartWy;
+				r.w = wx - s_StartWx;
+				r.h = wy - s_StartWy;
+				if(r.w < 0)
+				{
+					r.x += r.w;
+					r.w = -r.w;
+				}
+
+				if(r.h < 0)
+				{
+					r.y += r.h;
+					r.h = -r.h;
+				}
+
+				if(s_Operation == OP_BRUSH_DRAW)
+				{
+					if(!m_pBrush->IsEmpty())
+					{
+						// draw with brush
+						for(size_t k = 0; k < NumEditLayers; k++)
+						{
+							size_t BrushIndex = k % m_pBrush->m_vpLayers.size();
+							if(apEditLayers[k]->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
+							{
+								if(apEditLayers[k]->m_Type == LAYERTYPE_TILES)
+								{
+									std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(apEditLayers[k]);
+									std::shared_ptr<CLayerTiles> pBrushLayer = std::static_pointer_cast<CLayerTiles>(m_pBrush->m_vpLayers[BrushIndex]);
+
+									if(pLayer->m_Tele <= pBrushLayer->m_Tele && pLayer->m_Speedup <= pBrushLayer->m_Speedup && pLayer->m_Front <= pBrushLayer->m_Front && pLayer->m_Game <= pBrushLayer->m_Game && pLayer->m_Switch <= pBrushLayer->m_Switch && pLayer->m_Tune <= pBrushLayer->m_Tune)
+										pLayer->BrushDraw(pBrushLayer, wx, wy);
+								}
+								else
+								{
+									apEditLayers[k]->BrushDraw(m_pBrush->m_vpLayers[BrushIndex], wx, wy);
+								}
+							}
+						}
+					}
+				}
+				else if(s_Operation == OP_BRUSH_GRAB)
+				{
+					if(!UI()->MouseButton(0))
+					{
+						std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayerType(0, LAYERTYPE_QUADS));
+						if(Input()->ShiftIsPressed() && pQuadLayer)
+						{
+							DeselectQuads();
+							for(size_t i = 0; i < pQuadLayer->m_vQuads.size(); i++)
+							{
+								const CQuad &Quad = pQuadLayer->m_vQuads[i];
+								float px = fx2f(Quad.m_aPoints[4].x);
+								float py = fx2f(Quad.m_aPoints[4].y);
+
+								if(r.Inside(px, py) && !IsQuadSelected(i))
+									ToggleSelectQuad(i);
+							}
+						}
+						else
+						{
+							// grab brush
+							char aBuf[256];
+							str_format(aBuf, sizeof(aBuf), "grabbing %f %f %f %f", r.x, r.y, r.w, r.h);
+							Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor", aBuf);
+
+							// TODO: do all layers
+							int Grabs = 0;
+							for(size_t k = 0; k < NumEditLayers; k++)
+								Grabs += apEditLayers[k]->BrushGrab(m_pBrush, r);
+							if(Grabs == 0)
+								m_pBrush->Clear();
+
+							DeselectQuads();
+							DeselectQuadPoints();
+						}
+					}
+					else
+					{
+						for(size_t k = 0; k < NumEditLayers; k++)
+							apEditLayers[k]->BrushSelecting(r);
+						UI()->MapScreen();
+					}
+				}
+				else if(s_Operation == OP_BRUSH_PAINT)
+				{
+					if(!UI()->MouseButton(0))
+					{
+						for(size_t k = 0; k < NumEditLayers; k++)
+						{
+							size_t BrushIndex = k;
+							if(m_pBrush->m_vpLayers.size() != NumEditLayers)
+								BrushIndex = 0;
+							std::shared_ptr<CLayer> pBrush = m_pBrush->IsEmpty() ? nullptr : m_pBrush->m_vpLayers[BrushIndex];
+							apEditLayers[k]->FillSelection(m_pBrush->IsEmpty(), pBrush, r);
+						}
+						std::shared_ptr<IEditorAction> Action = std::make_shared<CEditorBrushDrawAction>(this, m_SelectedGroup);
+						m_EditorHistory.RecordAction(Action);
+					}
+					else
+					{
+						for(size_t k = 0; k < NumEditLayers; k++)
+							apEditLayers[k]->BrushSelecting(r);
+						UI()->MapScreen();
+					}
+				}
+			}
+			else
+			{
+				if(UI()->MouseButton(1))
+				{
+					m_pBrush->Clear();
+				}
+
+				if(UI()->MouseButton(0) && s_Operation == OP_NONE && !m_QuadKnifeActive)
+				{
+					UI()->SetActiveItem(s_pEditorID);
+
+					if(m_pBrush->IsEmpty())
+						s_Operation = OP_BRUSH_GRAB;
+					else
+					{
+						s_Operation = OP_BRUSH_DRAW;
+						for(size_t k = 0; k < NumEditLayers; k++)
+						{
+							size_t BrushIndex = k;
+							if(m_pBrush->m_vpLayers.size() != NumEditLayers)
+								BrushIndex = 0;
+
+							if(apEditLayers[k]->m_Type == m_pBrush->m_vpLayers[BrushIndex]->m_Type)
+								apEditLayers[k]->BrushPlace(m_pBrush->m_vpLayers[BrushIndex], wx, wy);
+						}
+					}
+
+					std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+					if(Input()->ShiftIsPressed() && pLayer)
+						s_Operation = OP_BRUSH_PAINT;
+				}
+
+				if(!m_pBrush->IsEmpty())
+				{
+					m_pBrush->m_OffsetX = -(int)wx;
+					m_pBrush->m_OffsetY = -(int)wy;
+					for(const auto &pLayer : m_pBrush->m_vpLayers)
+					{
+						if(pLayer->m_Type == LAYERTYPE_TILES)
+						{
+							m_pBrush->m_OffsetX = -(int)(wx / 32.0f) * 32;
+							m_pBrush->m_OffsetY = -(int)(wy / 32.0f) * 32;
+							break;
+						}
+					}
+
+					std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+					if(!m_ShowPicker && pGroup)
+					{
+						m_pBrush->m_OffsetX += pGroup->m_OffsetX;
+						m_pBrush->m_OffsetY += pGroup->m_OffsetY;
+						m_pBrush->m_ParallaxX = pGroup->m_ParallaxX;
+						m_pBrush->m_ParallaxY = pGroup->m_ParallaxY;
+						m_pBrush->Render();
+						float w, h;
+						m_pBrush->GetSize(&w, &h);
+
+						IGraphics::CLineItem Array[4] = {
+							IGraphics::CLineItem(0, 0, w, 0),
+							IGraphics::CLineItem(w, 0, w, h),
+							IGraphics::CLineItem(w, h, 0, h),
+							IGraphics::CLineItem(0, h, 0, 0)};
+						Graphics()->TextureClear();
+						Graphics()->LinesBegin();
+						Graphics()->LinesDraw(Array, 4);
+						Graphics()->LinesEnd();
+					}
+				}
+			}
+		}
+
+		// quad & sound editing
+		{
+			if(!m_ShowPicker && m_pBrush->IsEmpty())
+			{
+				// fetch layers
+				std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+				if(pGroup)
+					pGroup->MapScreen();
+
+				for(size_t k = 0; k < NumEditLayers; k++)
+				{
+					if(apEditLayers[k]->m_Type == LAYERTYPE_QUADS)
+					{
+						std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(apEditLayers[k]);
+
+						if(m_ShowEnvelopePreview == SHOWENV_NONE)
+							m_ShowEnvelopePreview = SHOWENV_ALL;
+
+						if(m_QuadKnifeActive)
+							DoQuadKnife(m_vSelectedQuads[m_SelectedQuadIndex]);
+						else
+						{
+							SetHotQuadPoint(pLayer);
+
+							Graphics()->TextureClear();
+							Graphics()->QuadsBegin();
+							for(size_t i = 0; i < pLayer->m_vQuads.size(); i++)
+							{
+								for(int v = 0; v < 4; v++)
+									DoQuadPoint(pLayer, &pLayer->m_vQuads[i], i, v);
+
+								DoQuad(pLayer, &pLayer->m_vQuads[i], i);
+							}
+							Graphics()->QuadsEnd();
+						}
+					}
+
+					if(apEditLayers[k]->m_Type == LAYERTYPE_SOUNDS)
+					{
+						std::shared_ptr<CLayerSounds> pLayer = std::static_pointer_cast<CLayerSounds>(apEditLayers[k]);
+
+						Graphics()->TextureClear();
+						Graphics()->QuadsBegin();
+						for(size_t i = 0; i < pLayer->m_vSources.size(); i++)
+						{
+							DoSoundSource(&pLayer->m_vSources[i], i);
+						}
+						Graphics()->QuadsEnd();
+					}
+				}
+
+				UI()->MapScreen();
+			}
+		}
+
+		// menu proof selection
+		if(MapView()->ProofMode()->IsModeMenu() && !m_ShowPicker)
+		{
+			MapView()->ProofMode()->ResetMenuBackgroundPositions();
+			for(int i = 0; i < (int)MapView()->ProofMode()->m_vMenuBackgroundPositions.size(); i++)
+			{
+				vec2 Pos = MapView()->ProofMode()->m_vMenuBackgroundPositions[i];
+				Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
+				Pos.y -= 3.0f;
+
+				vec2 MousePos(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
+				if(distance(Pos, MousePos) <= 20.0f)
+				{
+					UI()->SetHotItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
+
+					if(i != MapView()->ProofMode()->m_CurrentMenuProofIndex && UI()->CheckActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]))
+					{
+						if(!UI()->MouseButton(0))
+						{
+							MapView()->ProofMode()->m_CurrentMenuProofIndex = i;
+							MapView()->SetWorldOffset(MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
+							UI()->SetActiveItem(nullptr);
+						}
+					}
+					else if(UI()->HotItem() == &MapView()->ProofMode()->m_vMenuBackgroundPositions[i])
+					{
+						char aTooltipPrefix[32] = "Switch proof position to";
+						if(i == MapView()->ProofMode()->m_CurrentMenuProofIndex)
+							str_copy(aTooltipPrefix, "Current proof position at");
+
+						char aNumBuf[8];
+						if(i < (TILE_TIME_CHECKPOINT_LAST - TILE_TIME_CHECKPOINT_FIRST))
+							str_format(aNumBuf, sizeof(aNumBuf), "#%d", i + 1);
+						else
+							aNumBuf[0] = '\0';
+
+						char aTooltipPositions[128];
+						str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s %s", MapView()->ProofMode()->m_vpMenuBackgroundPositionNames[i], aNumBuf);
+
+						for(int k : MapView()->ProofMode()->m_vMenuBackgroundCollisions.at(i))
+						{
+							if(k == MapView()->ProofMode()->m_CurrentMenuProofIndex)
+								str_copy(aTooltipPrefix, "Current proof position at");
+
+							Pos = MapView()->ProofMode()->m_vMenuBackgroundPositions[k];
+							Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
+							Pos.y -= 3.0f;
+
+							MousePos = vec2(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
+							if(distance(Pos, MousePos) > 20.0f)
+								continue;
+
+							if(i < (TILE_TIME_CHECKPOINT_LAST - TILE_TIME_CHECKPOINT_FIRST))
+								str_format(aNumBuf, sizeof(aNumBuf), "#%d", k + 1);
+							else
+								aNumBuf[0] = '\0';
+
+							char aTooltipPositionsCopy[128];
+							str_copy(aTooltipPositionsCopy, aTooltipPositions);
+							str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s, %s %s", aTooltipPositionsCopy, MapView()->ProofMode()->m_vpMenuBackgroundPositionNames[k], aNumBuf);
+						}
+						str_format(m_aMenuBackgroundTooltip, sizeof(m_aMenuBackgroundTooltip), "%s %s", aTooltipPrefix, aTooltipPositions);
+
+						str_copy(m_aTooltip, m_aMenuBackgroundTooltip);
+						if(UI()->MouseButton(0))
+							UI()->SetActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
+					}
+					break;
+				}
+			}
+		}
+
+		if(UI()->CheckActiveItem(s_pEditorID))
+		{
+			// do panning
+			if(s_Operation == OP_PAN_WORLD)
+				MapView()->OffsetWorld(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
+			else if(s_Operation == OP_PAN_EDITOR)
+				MapView()->OffsetEditor(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
+
+			// release mouse
+			if(!UI()->MouseButton(0))
+			{
+				if(s_Operation == OP_BRUSH_DRAW)
+				{
+					std::shared_ptr<IEditorAction> Action = std::make_shared<CEditorBrushDrawAction>(this, m_SelectedGroup);
+
+					if(!Action->IsEmpty()) // Avoid recording tile draw action when placing quads only
+						m_EditorHistory.RecordAction(Action);
+				}
+
+				s_Operation = OP_NONE;
+				UI()->SetActiveItem(nullptr);
+			}
+		}
+		if(!Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+		{
+			float PanSpeed = 64.0f;
+			if(Input()->KeyPress(KEY_A))
+				MapView()->OffsetWorld({-PanSpeed * m_MouseWScale, 0});
+			else if(Input()->KeyPress(KEY_D))
+				MapView()->OffsetWorld({PanSpeed * m_MouseWScale, 0});
+			if(Input()->KeyPress(KEY_W))
+				MapView()->OffsetWorld({0, -PanSpeed * m_MouseWScale});
+			else if(Input()->KeyPress(KEY_S))
+				MapView()->OffsetWorld({0, PanSpeed * m_MouseWScale});
+		}
+	}
+	else if(UI()->CheckActiveItem(s_pEditorID))
+	{
+		// release mouse
+		if(!UI()->MouseButton(0))
+		{
+			s_Operation = OP_NONE;
+			UI()->SetActiveItem(nullptr);
+		}
+	}
+
+	if(!m_ShowPicker && GetSelectedGroup() && GetSelectedGroup()->m_UseClipping)
+	{
+		std::shared_ptr<CLayerGroup> pGameGroup = m_Map.m_pGameGroup;
+		pGameGroup->MapScreen();
+
+		Graphics()->TextureClear();
+		Graphics()->LinesBegin();
+
+		CUIRect r;
+		r.x = GetSelectedGroup()->m_ClipX;
+		r.y = GetSelectedGroup()->m_ClipY;
+		r.w = GetSelectedGroup()->m_ClipW;
+		r.h = GetSelectedGroup()->m_ClipH;
+
+		IGraphics::CLineItem Array[4] = {
+			IGraphics::CLineItem(r.x, r.y, r.x + r.w, r.y),
+			IGraphics::CLineItem(r.x + r.w, r.y, r.x + r.w, r.y + r.h),
+			IGraphics::CLineItem(r.x + r.w, r.y + r.h, r.x, r.y + r.h),
+			IGraphics::CLineItem(r.x, r.y + r.h, r.x, r.y)};
+		Graphics()->SetColor(1, 0, 0, 1);
+		Graphics()->LinesDraw(Array, 4);
+
+		Graphics()->LinesEnd();
+	}
+
+	MapView()->ProofMode()->RenderScreenSizes();
+
+	if(!m_ShowPicker && m_ShowTileInfo != SHOW_TILE_OFF && m_ShowEnvelopePreview != SHOWENV_NONE && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_QUADS)
+	{
+		GetSelectedGroup()->MapScreen();
+
+		std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(GetSelectedLayer(0));
+		IGraphics::CTextureHandle Texture;
+		if(pLayer->m_Image >= 0 && pLayer->m_Image < (int)m_Map.m_vpImages.size())
+			Texture = m_Map.m_vpImages[pLayer->m_Image]->m_Texture;
+
+		DoQuadEnvelopes(pLayer->m_vQuads, Texture);
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+	}
+
+	UI()->MapScreen();
+}
+
+void CEditor::SetHotQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer)
+{
+	float wx = UI()->MouseWorldX();
+	float wy = UI()->MouseWorldY();
+
+	float MinDist = 500.0f;
+	void *pMinPoint = nullptr;
+
+	auto UpdateMinimum = [&](float px, float py, void *pID) {
+		float dx = (px - wx) / m_MouseWScale;
+		float dy = (py - wy) / m_MouseWScale;
+
+		float CurrDist = dx * dx + dy * dy;
+		if(CurrDist < MinDist)
+		{
+			MinDist = CurrDist;
+			pMinPoint = pID;
+			return true;
+		}
+		return false;
+	};
+
+	for(size_t i = 0; i < pLayer->m_vQuads.size(); i++)
+	{
+		CQuad &Quad = pLayer->m_vQuads.at(i);
+
+		if(m_ShowTileInfo != SHOW_TILE_OFF && m_ShowEnvelopePreview != SHOWENV_NONE && Quad.m_PosEnv >= 0)
+		{
+			for(auto &EnvPoint : m_Map.m_vpEnvelopes[Quad.m_PosEnv]->m_vPoints)
+			{
+				float px = fx2f(Quad.m_aPoints[4].x) + fx2f(EnvPoint.m_aValues[0]);
+				float py = fx2f(Quad.m_aPoints[4].y) + fx2f(EnvPoint.m_aValues[1]);
+				if(UpdateMinimum(px, py, &EnvPoint))
+					m_CurrentQuadIndex = i;
+			}
+		}
+
+		for(auto &Point : Quad.m_aPoints)
+			UpdateMinimum(fx2f(Point.x), fx2f(Point.y), &Point);
+	}
+
+	if(pMinPoint != nullptr)
+		UI()->SetHotItem(pMinPoint);
+}
+
+void CEditor::DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor)
+{
+	CUIRect ColorRect;
+	pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(pID)), IGraphics::CORNER_ALL, 3.0f);
+	pRect->Margin(1.0f, &ColorRect);
+	ColorRect.Draw(Color, IGraphics::CORNER_ALL, 3.0f);
+
+	const int ButtonResult = DoButton_Editor_Common(pID, nullptr, 0, pRect, 0, "Click to show the color picker. Shift+rightclick to copy color to clipboard. Shift+leftclick to paste color from clipboard.");
+	if(Input()->ShiftIsPressed())
+	{
+		if(ButtonResult == 1)
+		{
+			const char *pClipboard = Input()->GetClipboardText();
+			if(*pClipboard == '#' || *pClipboard == '$') // ignore leading # (web color format) and $ (console color format)
+				++pClipboard;
+			if(str_isallnum_hex(pClipboard))
+			{
+				std::optional<ColorRGBA> ParsedColor = color_parse<ColorRGBA>(pClipboard);
+				if(ParsedColor)
+				{
+					m_ColorPickerPopupContext.m_State = EEditState::ONE_GO;
+					SetColor(ParsedColor.value());
+				}
+			}
+		}
+		else if(ButtonResult == 2)
+		{
+			char aClipboard[9];
+			str_format(aClipboard, sizeof(aClipboard), "%08X", Color.PackAlphaLast());
+			Input()->SetClipboardText(aClipboard);
+		}
+	}
+	else if(ButtonResult > 0)
+	{
+		if(m_ColorPickerPopupContext.m_ColorMode == CUI::SColorPickerPopupContext::MODE_UNSET)
+			m_ColorPickerPopupContext.m_ColorMode = CUI::SColorPickerPopupContext::MODE_RGBA;
+		m_ColorPickerPopupContext.m_RgbaColor = Color;
+		m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(Color);
+		m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_ColorPickerPopupContext.m_HslaColor);
+		m_ColorPickerPopupContext.m_Alpha = true;
+		m_pColorPickerPopupActiveID = pID;
+		UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &m_ColorPickerPopupContext);
+	}
+
+	if(UI()->IsPopupOpen(&m_ColorPickerPopupContext))
+	{
+		if(m_pColorPickerPopupActiveID == pID)
+			SetColor(m_ColorPickerPopupContext.m_RgbaColor);
+	}
+	else
+	{
+		m_pColorPickerPopupActiveID = nullptr;
+		if(m_ColorPickerPopupContext.m_State == EEditState::EDITING)
+		{
+			ColorRGBA c = color_cast<ColorRGBA>(m_ColorPickerPopupContext.m_HsvaColor);
+			m_ColorPickerPopupContext.m_State = EEditState::END;
+			SetColor(c);
+			m_ColorPickerPopupContext.m_State = EEditState::NONE;
+		}
+	}
+}
+
+void CEditor::RenderLayers(CUIRect LayersBox)
+{
+	const float RowHeight = 12.0f;
+	char aBuf[64];
+
+	CUIRect UnscrolledLayersBox = LayersBox;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = RowHeight * 5.0f;
+	s_ScrollRegion.Begin(&LayersBox, &ScrollOffset, &ScrollParams);
+	LayersBox.y += ScrollOffset.y;
+
+	enum
+	{
+		OP_NONE = 0,
+		OP_CLICK,
+		OP_LAYER_DRAG,
+		OP_GROUP_DRAG
+	};
+	static int s_Operation = OP_NONE;
+	static int s_PreviousOperation = OP_NONE;
+	static const void *s_pDraggedButton = 0;
+	static float s_InitialMouseY = 0;
+	static float s_InitialCutHeight = 0;
+	int GroupAfterDraggedLayer = -1;
+	int LayerAfterDraggedLayer = -1;
+	bool DraggedPositionFound = false;
+	bool MoveLayers = false;
+	bool MoveGroup = false;
+	bool StartDragLayer = false;
+	bool StartDragGroup = false;
+	bool AnyButtonActive = false;
+	std::vector<int> vButtonsPerGroup;
+
+	auto SetOperation = [](int Operation) {
+		if(Operation != s_Operation)
+		{
+			s_PreviousOperation = s_Operation;
+			s_Operation = Operation;
+		}
+	};
+
+	vButtonsPerGroup.reserve(m_Map.m_vpGroups.size());
+	for(const std::shared_ptr<CLayerGroup> &pGroup : m_Map.m_vpGroups)
+	{
+		vButtonsPerGroup.push_back(pGroup->m_vpLayers.size() + 1);
+	}
+
+	if(!UI()->CheckActiveItem(s_pDraggedButton))
+		SetOperation(OP_NONE);
+
+	if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
+	{
+		float MinDraggableValue = UnscrolledLayersBox.y;
+		float MaxDraggableValue = MinDraggableValue;
+		for(int NumButtons : vButtonsPerGroup)
+		{
+			MaxDraggableValue += NumButtons * (RowHeight + 2.0f) + 5.0f;
+		}
+		MaxDraggableValue += ScrollOffset.y;
+
+		if(s_Operation == OP_GROUP_DRAG)
+		{
+			MaxDraggableValue -= vButtonsPerGroup[m_SelectedGroup] * (RowHeight + 2.0f) + 5.0f;
+		}
+		else if(s_Operation == OP_LAYER_DRAG)
+		{
+			MinDraggableValue += RowHeight + 2.0f;
+			MaxDraggableValue -= m_vSelectedLayers.size() * (RowHeight + 2.0f) + 5.0f;
+		}
+
+		UnscrolledLayersBox.HSplitTop(s_InitialCutHeight, nullptr, &UnscrolledLayersBox);
+		UnscrolledLayersBox.y -= s_InitialMouseY - UI()->MouseY();
+
+		UnscrolledLayersBox.y = clamp(UnscrolledLayersBox.y, MinDraggableValue, MaxDraggableValue);
+
+		UnscrolledLayersBox.w = LayersBox.w;
+	}
+
+	static bool s_ScrollToSelectionNext = false;
+	const bool ScrollToSelection = SelectLayerByTile() || s_ScrollToSelectionNext;
+	s_ScrollToSelectionNext = false;
+
+	// render layers
+	for(int g = 0; g < (int)m_Map.m_vpGroups.size(); g++)
+	{
+		if(s_Operation == OP_LAYER_DRAG && g > 0 && !DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight / 2)
+		{
+			DraggedPositionFound = true;
+			GroupAfterDraggedLayer = g;
+
+			LayerAfterDraggedLayer = m_Map.m_vpGroups[g - 1]->m_vpLayers.size();
+
+			CUIRect Slot;
+			LayersBox.HSplitTop(m_vSelectedLayers.size() * (RowHeight + 2.0f), &Slot, &LayersBox);
+			s_ScrollRegion.AddRect(Slot);
+		}
+
+		CUIRect Slot, VisibleToggle;
+		if(s_Operation == OP_GROUP_DRAG)
+		{
+			if(g == m_SelectedGroup)
+			{
+				UnscrolledLayersBox.HSplitTop(RowHeight, &Slot, &UnscrolledLayersBox);
+				UnscrolledLayersBox.HSplitTop(2.0f, nullptr, &UnscrolledLayersBox);
+			}
+			else if(!DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight * vButtonsPerGroup[g] / 2 + 3.0f)
+			{
+				DraggedPositionFound = true;
+				GroupAfterDraggedLayer = g;
+
+				CUIRect TmpSlot;
+				if(m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse)
+					LayersBox.HSplitTop(RowHeight + 7.0f, &TmpSlot, &LayersBox);
+				else
+					LayersBox.HSplitTop(vButtonsPerGroup[m_SelectedGroup] * (RowHeight + 2.0f) + 5.0f, &TmpSlot, &LayersBox);
+				s_ScrollRegion.AddRect(TmpSlot, false);
+			}
+		}
+		if(s_Operation != OP_GROUP_DRAG || g != m_SelectedGroup)
+		{
+			LayersBox.HSplitTop(RowHeight, &Slot, &LayersBox);
+
+			CUIRect TmpRect;
+			LayersBox.HSplitTop(2.0f, &TmpRect, &LayersBox);
+			s_ScrollRegion.AddRect(TmpRect);
+		}
+
+		if(s_ScrollRegion.AddRect(Slot))
+		{
+			Slot.VSplitLeft(15.0f, &VisibleToggle, &Slot);
+			if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_Visible, m_Map.m_vpGroups[g]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, m_Map.m_vpGroups[g]->m_Collapse ? 1 : 0, &VisibleToggle, 0, "Toggle group visibility", IGraphics::CORNER_L, 8.0f))
+				m_Map.m_vpGroups[g]->m_Visible = !m_Map.m_vpGroups[g]->m_Visible;
+
+			str_format(aBuf, sizeof(aBuf), "#%d %s", g, m_Map.m_vpGroups[g]->m_aName);
+
+			bool Clicked;
+			bool Abrupted;
+			if(int Result = DoButton_DraggableEx(&m_Map.m_vpGroups[g], aBuf, g == m_SelectedGroup, &Slot, &Clicked, &Abrupted,
+				   BUTTON_CONTEXT, m_Map.m_vpGroups[g]->m_Collapse ? "Select group. Shift click to select all layers. Double click to expand." : "Select group. Shift click to select all layers. Double click to collapse.", IGraphics::CORNER_R))
+			{
+				AnyButtonActive = true;
+
+				if(s_Operation == OP_NONE)
+				{
+					s_InitialMouseY = UI()->MouseY();
+					s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y;
+					SetOperation(OP_CLICK);
+
+					if(g != m_SelectedGroup)
+						SelectLayer(0, g);
+				}
+
+				if(Abrupted)
+					SetOperation(OP_NONE);
+
+				if(s_Operation == OP_CLICK)
+				{
+					if(absolute(UI()->MouseY() - s_InitialMouseY) > 5)
+						StartDragGroup = true;
+
+					s_pDraggedButton = &m_Map.m_vpGroups[g];
+				}
+
+				if(s_Operation == OP_CLICK && Clicked)
+				{
+					if(g != m_SelectedGroup)
+						SelectLayer(0, g);
+
+					if(Input()->ShiftIsPressed() && m_SelectedGroup == g)
+					{
+						m_vSelectedLayers.clear();
+						for(size_t i = 0; i < m_Map.m_vpGroups[g]->m_vpLayers.size(); i++)
+						{
+							AddSelectedLayer(i);
+						}
+					}
+
+					if(Result == 2)
+					{
+						static SPopupMenuId s_PopupGroupId;
+						UI()->DoPopupMenu(&s_PopupGroupId, UI()->MouseX(), UI()->MouseY(), 145, 256, this, PopupGroup);
+					}
+
+					if(!m_Map.m_vpGroups[g]->m_vpLayers.empty() && Input()->MouseDoubleClick())
+						m_Map.m_vpGroups[g]->m_Collapse ^= 1;
+
+					SetOperation(OP_NONE);
+				}
+
+				if(s_Operation == OP_GROUP_DRAG && Clicked)
+					MoveGroup = true;
+			}
+			else if(s_pDraggedButton == &m_Map.m_vpGroups[g])
+			{
+				SetOperation(OP_NONE);
+			}
+		}
+
+		for(int i = 0; i < (int)m_Map.m_vpGroups[g]->m_vpLayers.size(); i++)
+		{
+			if(m_Map.m_vpGroups[g]->m_Collapse)
+				continue;
+
+			bool IsLayerSelected = false;
+			if(m_SelectedGroup == g)
+			{
+				for(const auto &Selected : m_vSelectedLayers)
+				{
+					if(Selected == i)
+					{
+						IsLayerSelected = true;
+						break;
+					}
+				}
+			}
+
+			if(s_Operation == OP_GROUP_DRAG && g == m_SelectedGroup)
+			{
+				UnscrolledLayersBox.HSplitTop(RowHeight + 2.0f, &Slot, &UnscrolledLayersBox);
+			}
+			else if(s_Operation == OP_LAYER_DRAG)
+			{
+				if(IsLayerSelected)
+				{
+					UnscrolledLayersBox.HSplitTop(RowHeight + 2.0f, &Slot, &UnscrolledLayersBox);
+				}
+				else
+				{
+					if(!DraggedPositionFound && UI()->MouseY() < LayersBox.y + RowHeight / 2)
+					{
+						DraggedPositionFound = true;
+						GroupAfterDraggedLayer = g + 1;
+						LayerAfterDraggedLayer = i;
+						for(size_t j = 0; j < m_vSelectedLayers.size(); j++)
+						{
+							LayersBox.HSplitTop(RowHeight + 2.0f, nullptr, &LayersBox);
+							s_ScrollRegion.AddRect(Slot);
+						}
+					}
+					LayersBox.HSplitTop(RowHeight + 2.0f, &Slot, &LayersBox);
+					if(!s_ScrollRegion.AddRect(Slot, ScrollToSelection && IsLayerSelected))
+						continue;
+				}
+			}
+			else
+			{
+				LayersBox.HSplitTop(RowHeight + 2.0f, &Slot, &LayersBox);
+				if(!s_ScrollRegion.AddRect(Slot, ScrollToSelection && IsLayerSelected))
+					continue;
+			}
+
+			Slot.HSplitTop(RowHeight, &Slot, nullptr);
+
+			CUIRect Button;
+			Slot.VSplitLeft(12.0f, nullptr, &Slot);
+			Slot.VSplitLeft(15.0f, &VisibleToggle, &Button);
+
+			if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, 0, &VisibleToggle, 0, "Toggle layer visibility", IGraphics::CORNER_L, 8.0f))
+				m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible = !m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible;
+
+			if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName[0])
+				str_copy(aBuf, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName);
+			else
+			{
+				if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_TILES)
+				{
+					std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
+					str_copy(aBuf, pTiles->m_Image >= 0 ? m_Map.m_vpImages[pTiles->m_Image]->m_aName : "Tiles");
+				}
+				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_QUADS)
+				{
+					std::shared_ptr<CLayerQuads> pQuads = std::static_pointer_cast<CLayerQuads>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
+					str_copy(aBuf, pQuads->m_Image >= 0 ? m_Map.m_vpImages[pQuads->m_Image]->m_aName : "Quads");
+				}
+				else if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Type == LAYERTYPE_SOUNDS)
+				{
+					std::shared_ptr<CLayerSounds> pSounds = std::static_pointer_cast<CLayerSounds>(m_Map.m_vpGroups[g]->m_vpLayers[i]);
+					str_copy(aBuf, pSounds->m_Sound >= 0 ? m_Map.m_vpSounds[pSounds->m_Sound]->m_aName : "Sounds");
+				}
+			}
+
+			int Checked = IsLayerSelected ? 1 : 0;
+			if(m_Map.m_vpGroups[g]->m_vpLayers[i]->IsEntitiesLayer())
+			{
+				Checked += 6;
+			}
+
+			bool Clicked;
+			bool Abrupted;
+			if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g]->m_vpLayers[i].get(), aBuf, Checked, &Button, &Clicked, &Abrupted,
+				   BUTTON_CONTEXT, "Select layer. Shift click to select multiple.", IGraphics::CORNER_R))
+			{
+				AnyButtonActive = true;
+
+				if(s_Operation == OP_NONE)
+				{
+					s_InitialMouseY = UI()->MouseY();
+					s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y;
+					SetOperation(OP_CLICK);
+
+					if(!Input()->ShiftIsPressed() && !IsLayerSelected)
+					{
+						SelectLayer(i, g);
+					}
+				}
+
+				if(Abrupted)
+					SetOperation(OP_NONE);
+
+				if(s_Operation == OP_CLICK)
+				{
+					if(absolute(UI()->MouseY() - s_InitialMouseY) > 5)
+					{
+						bool EntitiesLayerSelected = false;
+						for(int k : m_vSelectedLayers)
+						{
+							if(m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers[k]->IsEntitiesLayer())
+								EntitiesLayerSelected = true;
+						}
+
+						if(!EntitiesLayerSelected)
+							StartDragLayer = true;
+					}
+
+					s_pDraggedButton = m_Map.m_vpGroups[g]->m_vpLayers[i].get();
+				}
+
+				if(s_Operation == OP_CLICK && Clicked)
+				{
+					static SLayerPopupContext s_LayerPopupContext = {};
+					s_LayerPopupContext.m_pEditor = this;
+					if(Result == 1)
+					{
+						if(Input()->ShiftIsPressed() && m_SelectedGroup == g)
+						{
+							auto Position = std::find(m_vSelectedLayers.begin(), m_vSelectedLayers.end(), i);
+							if(Position != m_vSelectedLayers.end())
+								m_vSelectedLayers.erase(Position);
+							else
+								AddSelectedLayer(i);
+						}
+						else if(!Input()->ShiftIsPressed())
+						{
+							SelectLayer(i, g);
+						}
+					}
+					else if(Result == 2)
+					{
+						if(!IsLayerSelected)
+						{
+							SelectLayer(i, g);
+						}
+
+						if(m_vSelectedLayers.size() > 1)
+						{
+							bool AllTile = true;
+							for(size_t j = 0; AllTile && j < m_vSelectedLayers.size(); j++)
+							{
+								int LayerIndex = m_vSelectedLayers[j];
+								if(m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers[LayerIndex]->m_Type == LAYERTYPE_TILES)
+								{
+									s_LayerPopupContext.m_vpLayers.push_back(std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers[m_vSelectedLayers[j]]));
+									s_LayerPopupContext.m_vLayerIndices.push_back(LayerIndex);
+								}
+								else
+									AllTile = false;
+							}
+
+							// Don't allow editing if all selected layers are not tile layers
+							if(!AllTile)
+							{
+								s_LayerPopupContext.m_vpLayers.clear();
+								s_LayerPopupContext.m_vLayerIndices.clear();
+							}
+						}
+						else
+						{
+							s_LayerPopupContext.m_vpLayers.clear();
+							s_LayerPopupContext.m_vLayerIndices.clear();
+						}
+
+						UI()->DoPopupMenu(&s_LayerPopupContext, UI()->MouseX(), UI()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer);
+					}
+
+					SetOperation(OP_NONE);
+				}
+
+				if(s_Operation == OP_LAYER_DRAG && Clicked)
+				{
+					MoveLayers = true;
+				}
+			}
+			else if(s_pDraggedButton == m_Map.m_vpGroups[g]->m_vpLayers[i].get())
+			{
+				SetOperation(OP_NONE);
+			}
+		}
+
+		if(s_Operation != OP_GROUP_DRAG || g != m_SelectedGroup)
+		{
+			LayersBox.HSplitTop(5.0f, &Slot, &LayersBox);
+			s_ScrollRegion.AddRect(Slot);
+		}
+	}
+
+	if(!DraggedPositionFound && s_Operation == OP_LAYER_DRAG)
+	{
+		GroupAfterDraggedLayer = m_Map.m_vpGroups.size();
+		LayerAfterDraggedLayer = m_Map.m_vpGroups[GroupAfterDraggedLayer - 1]->m_vpLayers.size();
+
+		CUIRect TmpSlot;
+		LayersBox.HSplitTop(m_vSelectedLayers.size() * (RowHeight + 2.0f), &TmpSlot, &LayersBox);
+		s_ScrollRegion.AddRect(TmpSlot);
+	}
+
+	if(!DraggedPositionFound && s_Operation == OP_GROUP_DRAG)
+	{
+		GroupAfterDraggedLayer = m_Map.m_vpGroups.size();
+
+		CUIRect TmpSlot;
+		if(m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse)
+			LayersBox.HSplitTop(RowHeight + 7.0f, &TmpSlot, &LayersBox);
+		else
+			LayersBox.HSplitTop(vButtonsPerGroup[m_SelectedGroup] * (RowHeight + 2.0f) + 5.0f, &TmpSlot, &LayersBox);
+		s_ScrollRegion.AddRect(TmpSlot, false);
+	}
+
+	if(MoveLayers && 1 <= GroupAfterDraggedLayer && GroupAfterDraggedLayer <= (int)m_Map.m_vpGroups.size())
+	{
+		std::vector<std::shared_ptr<CLayer>> &vpNewGroupLayers = m_Map.m_vpGroups[GroupAfterDraggedLayer - 1]->m_vpLayers;
+		if(0 <= LayerAfterDraggedLayer && LayerAfterDraggedLayer <= (int)vpNewGroupLayers.size())
+		{
+			std::vector<std::shared_ptr<CLayer>> vpSelectedLayers;
+			std::vector<std::shared_ptr<CLayer>> &vpSelectedGroupLayers = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers;
+			std::shared_ptr<CLayer> pNextLayer = nullptr;
+			if(LayerAfterDraggedLayer < (int)vpNewGroupLayers.size())
+				pNextLayer = vpNewGroupLayers[LayerAfterDraggedLayer];
+
+			std::sort(m_vSelectedLayers.begin(), m_vSelectedLayers.end(), std::greater<>());
+			for(int k : m_vSelectedLayers)
+			{
+				vpSelectedLayers.insert(vpSelectedLayers.begin(), vpSelectedGroupLayers[k]);
+			}
+			for(int k : m_vSelectedLayers)
+			{
+				vpSelectedGroupLayers.erase(vpSelectedGroupLayers.begin() + k);
+			}
+
+			auto InsertPosition = std::find(vpNewGroupLayers.begin(), vpNewGroupLayers.end(), pNextLayer);
+			int InsertPositionIndex = InsertPosition - vpNewGroupLayers.begin();
+			vpNewGroupLayers.insert(InsertPosition, vpSelectedLayers.begin(), vpSelectedLayers.end());
+
+			int NumSelectedLayers = m_vSelectedLayers.size();
+			m_vSelectedLayers.clear();
+			for(int i = 0; i < NumSelectedLayers; i++)
+				m_vSelectedLayers.push_back(InsertPositionIndex + i);
+
+			m_SelectedGroup = GroupAfterDraggedLayer - 1;
+			m_Map.OnModify();
+		}
+	}
+
+	if(MoveGroup && 0 <= GroupAfterDraggedLayer && GroupAfterDraggedLayer <= (int)m_Map.m_vpGroups.size())
+	{
+		std::shared_ptr<CLayerGroup> pSelectedGroup = m_Map.m_vpGroups[m_SelectedGroup];
+		std::shared_ptr<CLayerGroup> pNextGroup = nullptr;
+		if(GroupAfterDraggedLayer < (int)m_Map.m_vpGroups.size())
+			pNextGroup = m_Map.m_vpGroups[GroupAfterDraggedLayer];
+
+		m_Map.m_vpGroups.erase(m_Map.m_vpGroups.begin() + m_SelectedGroup);
+
+		auto InsertPosition = std::find(m_Map.m_vpGroups.begin(), m_Map.m_vpGroups.end(), pNextGroup);
+		m_Map.m_vpGroups.insert(InsertPosition, pSelectedGroup);
+
+		auto Pos = std::find(m_Map.m_vpGroups.begin(), m_Map.m_vpGroups.end(), pSelectedGroup);
+		m_SelectedGroup = Pos - m_Map.m_vpGroups.begin();
+
+		m_Map.OnModify();
+	}
+
+	static int s_InitialGroupIndex;
+	static std::vector<int> s_vInitialLayerIndices;
+
+	if(MoveLayers || MoveGroup)
+		SetOperation(OP_NONE);
+	if(StartDragLayer)
+	{
+		SetOperation(OP_LAYER_DRAG);
+		s_InitialGroupIndex = m_SelectedGroup;
+		s_vInitialLayerIndices = std::vector(m_vSelectedLayers);
+	}
+	if(StartDragGroup)
+	{
+		s_InitialGroupIndex = m_SelectedGroup;
+		SetOperation(OP_GROUP_DRAG);
+	}
+
+	if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
+	{
+		s_ScrollRegion.DoEdgeScrolling();
+		UI()->SetActiveItem(s_pDraggedButton);
+	}
+
+	if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
+	{
+		if(Input()->ShiftIsPressed())
+		{
+			if(m_vSelectedLayers[m_vSelectedLayers.size() - 1] < (int)m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1)
+				AddSelectedLayer(m_vSelectedLayers[m_vSelectedLayers.size() - 1] + 1);
+		}
+		else
+		{
+			int CurrentLayer = 0;
+			for(const auto &Selected : m_vSelectedLayers)
+				CurrentLayer = maximum(Selected, CurrentLayer);
+			SelectLayer(CurrentLayer);
+
+			if(m_vSelectedLayers[0] < (int)m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1)
+			{
+				SelectLayer(m_vSelectedLayers[0] + 1);
+			}
+			else
+			{
+				for(size_t Group = m_SelectedGroup + 1; Group < m_Map.m_vpGroups.size(); Group++)
+				{
+					if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
+					{
+						SelectLayer(0, Group);
+						break;
+					}
+				}
+			}
+		}
+		s_ScrollToSelectionNext = true;
+	}
+	if(Input()->KeyPress(KEY_UP) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
+	{
+		if(Input()->ShiftIsPressed())
+		{
+			if(m_vSelectedLayers[m_vSelectedLayers.size() - 1] > 0)
+				AddSelectedLayer(m_vSelectedLayers[m_vSelectedLayers.size() - 1] - 1);
+		}
+		else
+		{
+			int CurrentLayer = std::numeric_limits<int>::max();
+			for(const auto &Selected : m_vSelectedLayers)
+				CurrentLayer = minimum(Selected, CurrentLayer);
+			SelectLayer(CurrentLayer);
+
+			if(m_vSelectedLayers[0] > 0)
+			{
+				SelectLayer(m_vSelectedLayers[0] - 1);
+			}
+			else
+			{
+				for(int Group = m_SelectedGroup - 1; Group >= 0; Group--)
+				{
+					if(!m_Map.m_vpGroups[Group]->m_vpLayers.empty())
+					{
+						SelectLayer(m_Map.m_vpGroups[Group]->m_vpLayers.size() - 1, Group);
+						break;
+					}
+				}
+			}
+		}
+		s_ScrollToSelectionNext = true;
+	}
+
+	CUIRect AddGroupButton;
+	LayersBox.HSplitTop(RowHeight + 1.0f, &AddGroupButton, &LayersBox);
+	if(s_ScrollRegion.AddRect(AddGroupButton))
+	{
+		AddGroupButton.HSplitTop(RowHeight, &AddGroupButton, 0);
+		static int s_AddGroupButton = 0;
+		if(DoButton_Editor(&s_AddGroupButton, "Add group", 0, &AddGroupButton, IGraphics::CORNER_R, "Adds a new group"))
+		{
+			m_Map.NewGroup();
+			m_SelectedGroup = m_Map.m_vpGroups.size() - 1;
+			m_EditorHistory.RecordAction(std::make_shared<CEditorActionGroup>(this, m_SelectedGroup, false));
+		}
+	}
+
+	s_ScrollRegion.End();
+
+	if(!AnyButtonActive)
+		SetOperation(OP_NONE);
+
+	if(s_Operation == OP_NONE)
+	{
+		if(s_PreviousOperation == OP_GROUP_DRAG)
+		{
+			s_PreviousOperation = OP_NONE;
+			m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditGroupProp>(this, m_SelectedGroup, EGroupProp::PROP_ORDER, s_InitialGroupIndex, m_SelectedGroup));
+		}
+		else if(s_PreviousOperation == OP_LAYER_DRAG)
+		{
+			if(s_InitialGroupIndex != m_SelectedGroup)
+			{
+				m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditLayersGroupAndOrder>(this, s_InitialGroupIndex, s_vInitialLayerIndices, m_SelectedGroup, m_vSelectedLayers));
+			}
+			else
+			{
+				std::vector<std::shared_ptr<IEditorAction>> vpActions;
+				for(int k = 0; k < (int)m_vSelectedLayers.size(); k++)
+				{
+					int LayerIndex = m_vSelectedLayers[k];
+					vpActions.push_back(std::make_shared<CEditorActionEditLayerProp>(this, m_SelectedGroup, LayerIndex, ELayerProp::PROP_ORDER, s_vInitialLayerIndices[k], LayerIndex));
+				}
+				m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(CEditorActionBulk(this, vpActions)));
+			}
+			s_PreviousOperation = OP_NONE;
+		}
+	}
+}
+
+bool CEditor::SelectLayerByTile()
+{
+	// ctrl+rightclick a map index to select the layer that has a tile there
+	static bool s_CtrlClick = false;
+	static int s_Selected = 0;
+	int MatchedGroup = -1;
+	int MatchedLayer = -1;
+	int Matches = 0;
+	bool IsFound = false;
+	if(UI()->MouseButton(1) && Input()->ModifierIsPressed())
+	{
+		if(s_CtrlClick)
+			return false;
+		s_CtrlClick = true;
+		for(size_t g = 0; g < m_Map.m_vpGroups.size(); g++)
+		{
+			for(size_t l = 0; l < m_Map.m_vpGroups[g]->m_vpLayers.size(); l++)
+			{
+				if(IsFound)
+					continue;
+				if(m_Map.m_vpGroups[g]->m_vpLayers[l]->m_Type != LAYERTYPE_TILES)
+					continue;
+
+				std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_Map.m_vpGroups[g]->m_vpLayers[l]);
+				int x = (int)UI()->MouseWorldX() / 32 + m_Map.m_vpGroups[g]->m_OffsetX;
+				int y = (int)UI()->MouseWorldY() / 32 + m_Map.m_vpGroups[g]->m_OffsetY;
+				if(x < 0 || x >= pTiles->m_Width)
+					continue;
+				if(y < 0 || y >= pTiles->m_Height)
+					continue;
+				CTile Tile = pTiles->GetTile(x, y);
+				if(Tile.m_Index)
+				{
+					if(MatchedGroup == -1)
+					{
+						MatchedGroup = g;
+						MatchedLayer = l;
+					}
+					if(++Matches > s_Selected)
+					{
+						s_Selected++;
+						MatchedGroup = g;
+						MatchedLayer = l;
+						IsFound = true;
+					}
+				}
+			}
+		}
+		if(MatchedGroup != -1 && MatchedLayer != -1)
+		{
+			if(!IsFound)
+				s_Selected = 1;
+			SelectLayer(MatchedLayer, MatchedGroup);
+			return true;
+		}
+	}
+	else
+		s_CtrlClick = false;
+	return false;
+}
+
+bool CEditor::ReplaceImage(const char *pFileName, int StorageType, bool CheckDuplicate)
+{
+	// check if we have that image already
+	char aBuf[128];
+	IStorage::StripPathAndExtension(pFileName, aBuf, sizeof(aBuf));
+	if(CheckDuplicate)
+	{
+		for(const auto &pImage : m_Map.m_vpImages)
+		{
+			if(!str_comp(pImage->m_aName, aBuf))
+			{
+				ShowFileDialogError("Image named '%s' was already added.", pImage->m_aName);
+				return false;
+			}
+		}
+	}
+
+	CEditorImage ImgInfo(this);
+	if(!Graphics()->LoadPNG(&ImgInfo, pFileName, StorageType))
+	{
+		ShowFileDialogError("Failed to load image from file '%s'.", pFileName);
+		return false;
+	}
+
+	std::shared_ptr<CEditorImage> pImg = m_Map.m_vpImages[m_SelectedImage];
+	Graphics()->UnloadTexture(&(pImg->m_Texture));
+	free(pImg->m_pData);
+	pImg->m_pData = nullptr;
+	*pImg = ImgInfo;
+	str_copy(pImg->m_aName, aBuf);
+	pImg->m_External = IsVanillaImage(pImg->m_aName);
+
+	if(!pImg->m_External && g_Config.m_ClEditorDilate == 1 && pImg->m_Format == CImageInfo::FORMAT_RGBA)
+	{
+		DilateImage((unsigned char *)ImgInfo.m_pData, ImgInfo.m_Width, ImgInfo.m_Height);
+	}
+
+	pImg->m_AutoMapper.Load(pImg->m_aName);
+	int TextureLoadFlag = Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+	if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+		TextureLoadFlag = 0;
+	pImg->m_Texture = Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, pFileName);
+	ImgInfo.m_pData = nullptr;
+	SortImages();
+	for(size_t i = 0; i < m_Map.m_vpImages.size(); ++i)
+	{
+		if(!str_comp(m_Map.m_vpImages[i]->m_aName, pImg->m_aName))
+			m_SelectedImage = i;
+	}
+	m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+bool CEditor::ReplaceImageCallback(const char *pFileName, int StorageType, void *pUser)
+{
+	return static_cast<CEditor *>(pUser)->ReplaceImage(pFileName, StorageType, true);
+}
+
+bool CEditor::AddImage(const char *pFileName, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+
+	// check if we have that image already
+	char aBuf[128];
+	IStorage::StripPathAndExtension(pFileName, aBuf, sizeof(aBuf));
+	for(const auto &pImage : pEditor->m_Map.m_vpImages)
+	{
+		if(!str_comp(pImage->m_aName, aBuf))
+		{
+			pEditor->ShowFileDialogError("Image named '%s' was already added.", pImage->m_aName);
+			return false;
+		}
+	}
+
+	if(pEditor->m_Map.m_vpImages.size() >= MAX_MAPIMAGES)
+	{
+		pEditor->m_PopupEventType = POPEVENT_IMAGE_MAX;
+		pEditor->m_PopupEventActivated = true;
+		return false;
+	}
+
+	CEditorImage ImgInfo(pEditor);
+	if(!pEditor->Graphics()->LoadPNG(&ImgInfo, pFileName, StorageType))
+	{
+		pEditor->ShowFileDialogError("Failed to load image from file '%s'.", pFileName);
+		return false;
+	}
+
+	std::shared_ptr<CEditorImage> pImg = std::make_shared<CEditorImage>(pEditor);
+	*pImg = ImgInfo;
+	pImg->m_External = IsVanillaImage(aBuf);
+
+	if(!pImg->m_External && g_Config.m_ClEditorDilate == 1 && pImg->m_Format == CImageInfo::FORMAT_RGBA)
+	{
+		DilateImage((unsigned char *)ImgInfo.m_pData, ImgInfo.m_Width, ImgInfo.m_Height);
+	}
+
+	int TextureLoadFlag = pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+	if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+		TextureLoadFlag = 0;
+	pImg->m_Texture = pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, pFileName);
+	ImgInfo.m_pData = nullptr;
+	str_copy(pImg->m_aName, aBuf);
+	pImg->m_AutoMapper.Load(pImg->m_aName);
+	pEditor->m_Map.m_vpImages.push_back(pImg);
+	pEditor->SortImages();
+	if(pEditor->m_SelectedImage >= 0 && (size_t)pEditor->m_SelectedImage < pEditor->m_Map.m_vpImages.size())
+	{
+		for(int i = 0; i <= pEditor->m_SelectedImage; ++i)
+			if(!str_comp(pEditor->m_Map.m_vpImages[i]->m_aName, aBuf))
+			{
+				pEditor->m_SelectedImage++;
+				break;
+			}
+	}
+	pEditor->m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+bool CEditor::AddSound(const char *pFileName, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+
+	// check if we have that sound already
+	char aBuf[128];
+	IStorage::StripPathAndExtension(pFileName, aBuf, sizeof(aBuf));
+	for(const auto &pSound : pEditor->m_Map.m_vpSounds)
+	{
+		if(!str_comp(pSound->m_aName, aBuf))
+		{
+			pEditor->ShowFileDialogError("Sound named '%s' was already added.", pSound->m_aName);
+			return false;
+		}
+	}
+
+	if(pEditor->m_Map.m_vpSounds.size() >= MAX_MAPSOUNDS)
+	{
+		pEditor->m_PopupEventType = POPEVENT_SOUND_MAX;
+		pEditor->m_PopupEventActivated = true;
+		return false;
+	}
+
+	// load external
+	void *pData;
+	unsigned DataSize;
+	if(!pEditor->Storage()->ReadFile(pFileName, StorageType, &pData, &DataSize))
+	{
+		pEditor->ShowFileDialogError("Failed to open sound file '%s'.", pFileName);
+		return false;
+	}
+
+	// load sound
+	const int SoundId = pEditor->Sound()->LoadOpusFromMem(pData, DataSize, true);
+	if(SoundId == -1)
+	{
+		free(pData);
+		pEditor->ShowFileDialogError("Failed to load sound from file '%s'.", pFileName);
+		return false;
+	}
+
+	// add sound
+	std::shared_ptr<CEditorSound> pSound = std::make_shared<CEditorSound>(pEditor);
+	pSound->m_SoundID = SoundId;
+	pSound->m_DataSize = DataSize;
+	pSound->m_pData = pData;
+	str_copy(pSound->m_aName, aBuf);
+	pEditor->m_Map.m_vpSounds.push_back(pSound);
+
+	if(pEditor->m_SelectedSound >= 0 && (size_t)pEditor->m_SelectedSound < pEditor->m_Map.m_vpSounds.size())
+	{
+		for(int i = 0; i <= pEditor->m_SelectedSound; ++i)
+			if(!str_comp(pEditor->m_Map.m_vpSounds[i]->m_aName, aBuf))
+			{
+				pEditor->m_SelectedSound++;
+				break;
+			}
+	}
+
+	pEditor->OnDialogClose();
+	pEditor->m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+bool CEditor::ReplaceSound(const char *pFileName, int StorageType, bool CheckDuplicate)
+{
+	// check if we have that sound already
+	char aBuf[128];
+	IStorage::StripPathAndExtension(pFileName, aBuf, sizeof(aBuf));
+	if(CheckDuplicate)
+	{
+		for(const auto &pSound : m_Map.m_vpSounds)
+		{
+			if(!str_comp(pSound->m_aName, aBuf))
+			{
+				ShowFileDialogError("Sound named '%s' was already added.", pSound->m_aName);
+				return false;
+			}
+		}
+	}
+
+	// load external
+	void *pData;
+	unsigned DataSize;
+	if(!Storage()->ReadFile(pFileName, StorageType, &pData, &DataSize))
+	{
+		ShowFileDialogError("Failed to open sound file '%s'.", pFileName);
+		return false;
+	}
+
+	// load sound
+	const int SoundId = Sound()->LoadOpusFromMem(pData, DataSize, true);
+	if(SoundId == -1)
+	{
+		free(pData);
+		ShowFileDialogError("Failed to load sound from file '%s'.", pFileName);
+		return false;
+	}
+
+	std::shared_ptr<CEditorSound> pSound = m_Map.m_vpSounds[m_SelectedSound];
+
+	// unload sample
+	Sound()->UnloadSample(pSound->m_SoundID);
+	free(pSound->m_pData);
+
+	// replace sound
+	str_copy(pSound->m_aName, aBuf);
+	pSound->m_SoundID = SoundId;
+	pSound->m_pData = pData;
+	pSound->m_DataSize = DataSize;
+
+	OnDialogClose();
+	m_Dialog = DIALOG_NONE;
+	return true;
+}
+
+bool CEditor::ReplaceSoundCallback(const char *pFileName, int StorageType, void *pUser)
+{
+	return static_cast<CEditor *>(pUser)->ReplaceSound(pFileName, StorageType, true);
+}
+
+void CEditor::SelectGameLayer()
+{
+	for(size_t g = 0; g < m_Map.m_vpGroups.size(); g++)
+	{
+		for(size_t i = 0; i < m_Map.m_vpGroups[g]->m_vpLayers.size(); i++)
+		{
+			if(m_Map.m_vpGroups[g]->m_vpLayers[i] == m_Map.m_pGameLayer)
+			{
+				SelectLayer(i, g);
+				return;
+			}
+		}
+	}
+}
+
+std::vector<int> CEditor::SortImages()
+{
+	static const auto &&s_ImageNameComparator = [](const std::shared_ptr<CEditorImage> &pLhs, const std::shared_ptr<CEditorImage> &pRhs) {
+		return str_comp(pLhs->m_aName, pRhs->m_aName) < 0;
+	};
+	if(!std::is_sorted(m_Map.m_vpImages.begin(), m_Map.m_vpImages.end(), s_ImageNameComparator))
+	{
+		const std::vector<std::shared_ptr<CEditorImage>> vpTemp = m_Map.m_vpImages;
+		std::vector<int> vSortedIndex;
+		vSortedIndex.resize(vpTemp.size());
+
+		std::sort(m_Map.m_vpImages.begin(), m_Map.m_vpImages.end(), s_ImageNameComparator);
+		for(size_t OldIndex = 0; OldIndex < vpTemp.size(); OldIndex++)
+		{
+			for(size_t NewIndex = 0; NewIndex < m_Map.m_vpImages.size(); NewIndex++)
+			{
+				if(vpTemp[OldIndex] == m_Map.m_vpImages[NewIndex])
+				{
+					vSortedIndex[OldIndex] = NewIndex;
+					break;
+				}
+			}
+		}
+		m_Map.ModifyImageIndex([vSortedIndex](int *pIndex) {
+			if(*pIndex >= 0)
+				*pIndex = vSortedIndex[*pIndex];
+		});
+
+		return vSortedIndex;
+	}
+
+	return std::vector<int>();
+}
+
+void CEditor::RenderImagesList(CUIRect ToolBox)
+{
+	const float RowHeight = 12.0f;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = RowHeight * 5;
+	s_ScrollRegion.Begin(&ToolBox, &ScrollOffset, &ScrollParams);
+	ToolBox.y += ScrollOffset.y;
+
+	bool ScrollToSelection = false;
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && !m_Map.m_vpImages.empty())
+	{
+		if(Input()->KeyPress(KEY_DOWN))
+		{
+			int OldImage = m_SelectedImage;
+			m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
+			for(size_t i = m_SelectedImage + 1; i < m_Map.m_vpImages.size(); i++)
+			{
+				if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External)
+				{
+					m_SelectedImage = i;
+					break;
+				}
+			}
+			if(m_SelectedImage == OldImage && !m_Map.m_vpImages[m_SelectedImage]->m_External)
+			{
+				for(size_t i = 0; i < m_Map.m_vpImages.size(); i++)
+				{
+					if(m_Map.m_vpImages[i]->m_External)
+					{
+						m_SelectedImage = i;
+						break;
+					}
+				}
+			}
+			ScrollToSelection = OldImage != m_SelectedImage;
+		}
+		else if(Input()->KeyPress(KEY_UP))
+		{
+			int OldImage = m_SelectedImage;
+			m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
+			for(int i = m_SelectedImage - 1; i >= 0; i--)
+			{
+				if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External)
+				{
+					m_SelectedImage = i;
+					break;
+				}
+			}
+			if(m_SelectedImage == OldImage && m_Map.m_vpImages[m_SelectedImage]->m_External)
+			{
+				for(int i = (int)m_Map.m_vpImages.size() - 1; i >= 0; i--)
+				{
+					if(!m_Map.m_vpImages[i]->m_External)
+					{
+						m_SelectedImage = i;
+						break;
+					}
+				}
+			}
+			ScrollToSelection = OldImage != m_SelectedImage;
+		}
+	}
+
+	for(int e = 0; e < 2; e++) // two passes, first embedded, then external
+	{
+		CUIRect Slot;
+		ToolBox.HSplitTop(RowHeight + 3.0f, &Slot, &ToolBox);
+		if(s_ScrollRegion.AddRect(Slot))
+			UI()->DoLabel(&Slot, e == 0 ? "Embedded" : "External", 12.0f, TEXTALIGN_MC);
+
+		for(int i = 0; i < (int)m_Map.m_vpImages.size(); i++)
+		{
+			if((e && !m_Map.m_vpImages[i]->m_External) ||
+				(!e && m_Map.m_vpImages[i]->m_External))
+			{
+				continue;
+			}
+
+			ToolBox.HSplitTop(RowHeight + 2.0f, &Slot, &ToolBox);
+			int Selected = m_SelectedImage == i;
+			if(!s_ScrollRegion.AddRect(Slot, Selected && ScrollToSelection))
+				continue;
+			Slot.HSplitTop(RowHeight, &Slot, nullptr);
+
+			const bool ImageUsed = std::any_of(m_Map.m_vpGroups.cbegin(), m_Map.m_vpGroups.cend(), [i](const auto &pGroup) {
+				return std::any_of(pGroup->m_vpLayers.cbegin(), pGroup->m_vpLayers.cend(), [i](const auto &pLayer) {
+					if(pLayer->m_Type == LAYERTYPE_QUADS)
+						return std::static_pointer_cast<CLayerQuads>(pLayer)->m_Image == i;
+					else if(pLayer->m_Type == LAYERTYPE_TILES)
+						return std::static_pointer_cast<CLayerTiles>(pLayer)->m_Image == i;
+					return false;
+				});
+			});
+
+			if(!ImageUsed)
+				Selected += 2; // Image is unused
+
+			if(Selected < 2 && e == 1)
+			{
+				if(!IsVanillaImage(m_Map.m_vpImages[i]->m_aName))
+				{
+					Selected += 4; // Image should be embedded
+				}
+			}
+
+			if(int Result = DoButton_Ex(&m_Map.m_vpImages[i], m_Map.m_vpImages[i]->m_aName, Selected, &Slot,
+				   BUTTON_CONTEXT, "Select image.", IGraphics::CORNER_ALL))
+			{
+				m_SelectedImage = i;
+
+				if(Result == 2)
+				{
+					const std::shared_ptr<CEditorImage> pImg = m_Map.m_vpImages[m_SelectedImage];
+					const int Height = !pImg->m_External && IsVanillaImage(pImg->m_aName) ? 107 : (pImg->m_External ? 73 : 90);
+					static SPopupMenuId s_PopupImageId;
+					UI()->DoPopupMenu(&s_PopupImageId, UI()->MouseX(), UI()->MouseY(), 140, Height, this, PopupImage);
+				}
+			}
+		}
+
+		// separator
+		ToolBox.HSplitTop(5.0f, &Slot, &ToolBox);
+		if(s_ScrollRegion.AddRect(Slot))
+		{
+			IGraphics::CLineItem LineItem(Slot.x, Slot.y + Slot.h / 2, Slot.x + Slot.w, Slot.y + Slot.h / 2);
+			Graphics()->TextureClear();
+			Graphics()->LinesBegin();
+			Graphics()->LinesDraw(&LineItem, 1);
+			Graphics()->LinesEnd();
+		}
+	}
+
+	// new image
+	static int s_AddImageButton = 0;
+	CUIRect AddImageButton;
+	ToolBox.HSplitTop(5.0f + RowHeight + 1.0f, &AddImageButton, &ToolBox);
+	if(s_ScrollRegion.AddRect(AddImageButton))
+	{
+		AddImageButton.HSplitTop(5.0f, nullptr, &AddImageButton);
+		AddImageButton.HSplitTop(RowHeight, &AddImageButton, nullptr);
+		if(DoButton_Editor(&s_AddImageButton, "Add", 0, &AddImageButton, 0, "Load a new image to use in the map"))
+			InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Add Image", "Add", "mapres", false, AddImage, this);
+	}
+	s_ScrollRegion.End();
+}
+
+void CEditor::RenderSelectedImage(CUIRect View)
+{
+	if(m_SelectedImage < 0 || (size_t)m_SelectedImage >= m_Map.m_vpImages.size())
+		return;
+
+	View.Margin(10.0f, &View);
+	if(View.h < View.w)
+		View.w = View.h;
+	else
+		View.h = View.w;
+	float Max = maximum<float>(m_Map.m_vpImages[m_SelectedImage]->m_Width, m_Map.m_vpImages[m_SelectedImage]->m_Height);
+	View.w *= m_Map.m_vpImages[m_SelectedImage]->m_Width / Max;
+	View.h *= m_Map.m_vpImages[m_SelectedImage]->m_Height / Max;
+	Graphics()->TextureSet(m_Map.m_vpImages[m_SelectedImage]->m_Texture);
+	Graphics()->BlendNormal();
+	Graphics()->WrapClamp();
+	Graphics()->QuadsBegin();
+	IGraphics::CQuadItem QuadItem(View.x, View.y, View.w, View.h);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
+}
+
+void CEditor::RenderSounds(CUIRect ToolBox)
+{
+	const float RowHeight = 12.0f;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = RowHeight * 5;
+	s_ScrollRegion.Begin(&ToolBox, &ScrollOffset, &ScrollParams);
+	ToolBox.y += ScrollOffset.y;
+
+	bool ScrollToSelection = false;
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && !m_Map.m_vpSounds.empty())
+	{
+		if(Input()->KeyPress(KEY_DOWN))
+		{
+			m_SelectedSound = (m_SelectedSound + 1) % m_Map.m_vpSounds.size();
+			ScrollToSelection = true;
+		}
+		else if(Input()->KeyPress(KEY_UP))
+		{
+			m_SelectedSound = (m_SelectedSound + m_Map.m_vpSounds.size() - 1) % m_Map.m_vpSounds.size();
+			ScrollToSelection = true;
+		}
+	}
+
+	CUIRect Slot;
+	ToolBox.HSplitTop(RowHeight + 3.0f, &Slot, &ToolBox);
+	if(s_ScrollRegion.AddRect(Slot))
+		UI()->DoLabel(&Slot, "Embedded", 12.0f, TEXTALIGN_MC);
+
+	for(int i = 0; i < (int)m_Map.m_vpSounds.size(); i++)
+	{
+		ToolBox.HSplitTop(RowHeight + 2.0f, &Slot, &ToolBox);
+		int Selected = m_SelectedSound == i;
+		if(!s_ScrollRegion.AddRect(Slot, Selected && ScrollToSelection))
+			continue;
+		Slot.HSplitTop(RowHeight, &Slot, nullptr);
+
+		const bool SoundUsed = std::any_of(m_Map.m_vpGroups.cbegin(), m_Map.m_vpGroups.cend(), [i](const auto &pGroup) {
+			return std::any_of(pGroup->m_vpLayers.cbegin(), pGroup->m_vpLayers.cend(), [i](const auto &pLayer) {
+				if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+					return std::static_pointer_cast<CLayerSounds>(pLayer)->m_Sound == i;
+				return false;
+			});
+		});
+
+		if(!SoundUsed)
+			Selected += 2; // Sound is unused
+
+		if(int Result = DoButton_Ex(&m_Map.m_vpSounds[i], m_Map.m_vpSounds[i]->m_aName, Selected, &Slot,
+			   BUTTON_CONTEXT, "Select sound.", IGraphics::CORNER_ALL))
+		{
+			m_SelectedSound = i;
+
+			if(Result == 2)
+			{
+				static SPopupMenuId s_PopupSoundId;
+				UI()->DoPopupMenu(&s_PopupSoundId, UI()->MouseX(), UI()->MouseY(), 140, 90, this, PopupSound);
+			}
+		}
+	}
+
+	// separator
+	ToolBox.HSplitTop(5.0f, &Slot, &ToolBox);
+	if(s_ScrollRegion.AddRect(Slot))
+	{
+		IGraphics::CLineItem LineItem(Slot.x, Slot.y + Slot.h / 2, Slot.x + Slot.w, Slot.y + Slot.h / 2);
+		Graphics()->TextureClear();
+		Graphics()->LinesBegin();
+		Graphics()->LinesDraw(&LineItem, 1);
+		Graphics()->LinesEnd();
+	}
+
+	// new sound
+	static int s_AddSoundButton = 0;
+	CUIRect AddSoundButton;
+	ToolBox.HSplitTop(5.0f + RowHeight + 1.0f, &AddSoundButton, &ToolBox);
+	if(s_ScrollRegion.AddRect(AddSoundButton))
+	{
+		AddSoundButton.HSplitTop(5.0f, nullptr, &AddSoundButton);
+		AddSoundButton.HSplitTop(RowHeight, &AddSoundButton, nullptr);
+		if(DoButton_Editor(&s_AddSoundButton, "Add", 0, &AddSoundButton, 0, "Load a new sound to use in the map"))
+			InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Add Sound", "Add", "mapres", false, AddSound, this);
+	}
+	s_ScrollRegion.End();
+}
+
+static int EditorListdirCallback(const CFsFileInfo *pInfo, int IsDir, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+	if((pInfo->m_pName[0] == '.' && (pInfo->m_pName[1] == 0 ||
+						(pInfo->m_pName[1] == '.' && pInfo->m_pName[2] == 0 && (pEditor->m_FileDialogShowingRoot || (!pEditor->m_FileDialogMultipleStorages && (!str_comp(pEditor->m_pFileDialogPath, "maps") || !str_comp(pEditor->m_pFileDialogPath, "mapres"))))))) ||
+		(!IsDir && ((pEditor->m_FileDialogFileType == CEditor::FILETYPE_MAP && !str_endswith(pInfo->m_pName, ".map")) ||
+				   (pEditor->m_FileDialogFileType == CEditor::FILETYPE_IMG && !str_endswith(pInfo->m_pName, ".png")) ||
+				   (pEditor->m_FileDialogFileType == CEditor::FILETYPE_SOUND && !str_endswith(pInfo->m_pName, ".opus")))))
+		return 0;
+
+	CEditor::CFilelistItem Item;
+	str_copy(Item.m_aFilename, pInfo->m_pName);
+	if(IsDir)
+		str_format(Item.m_aName, sizeof(Item.m_aName), "%s/", pInfo->m_pName);
+	else
+	{
+		int LenEnding = pEditor->m_FileDialogFileType == CEditor::FILETYPE_SOUND ? 5 : 4;
+		str_truncate(Item.m_aName, sizeof(Item.m_aName), pInfo->m_pName, str_length(pInfo->m_pName) - LenEnding);
+	}
+	Item.m_IsDir = IsDir != 0;
+	Item.m_IsLink = false;
+	Item.m_StorageType = StorageType;
+	Item.m_TimeModified = pInfo->m_TimeModified;
+	pEditor->m_vCompleteFileList.push_back(Item);
+
+	return 0;
+}
+
+void CEditor::SortFilteredFileList()
+{
+	if(m_SortByFilename == 1)
+	{
+		std::sort(m_vpFilteredFileList.begin(), m_vpFilteredFileList.end(), CEditor::CompareFilenameAscending);
+	}
+	else
+	{
+		std::sort(m_vpFilteredFileList.begin(), m_vpFilteredFileList.end(), CEditor::CompareFilenameDescending);
+	}
+
+	if(m_SortByTimeModified == 1)
+	{
+		std::stable_sort(m_vpFilteredFileList.begin(), m_vpFilteredFileList.end(), CEditor::CompareTimeModifiedAscending);
+	}
+	else if(m_SortByTimeModified == -1)
+	{
+		std::stable_sort(m_vpFilteredFileList.begin(), m_vpFilteredFileList.end(), CEditor::CompareTimeModifiedDescending);
+	}
+}
+
+void CEditor::RenderFileDialog()
+{
+	// GUI coordsys
+	UI()->MapScreen();
+	CUIRect View = *UI()->Screen();
+	CUIRect Preview = {0.0f, 0.0f, 0.0f, 0.0f};
+	float Width = View.w, Height = View.h;
+
+	View.Draw(ColorRGBA(0, 0, 0, 0.25f), 0, 0);
+	View.VMargin(150.0f, &View);
+	View.HMargin(50.0f, &View);
+	View.Draw(ColorRGBA(0, 0, 0, 0.75f), IGraphics::CORNER_ALL, 5.0f);
+	View.Margin(10.0f, &View);
+
+	CUIRect Title, FileBox, FileBoxLabel, ButtonBar, PathBox;
+	View.HSplitTop(18.0f, &Title, &View);
+	View.HSplitTop(5.0f, nullptr, &View); // some spacing
+	View.HSplitBottom(14.0f, &View, &ButtonBar);
+	View.HSplitBottom(10.0f, &View, nullptr); // some spacing
+	View.HSplitBottom(14.0f, &View, &PathBox);
+	View.HSplitBottom(5.0f, &View, nullptr); // some spacing
+	View.HSplitBottom(14.0f, &View, &FileBox);
+	FileBox.VSplitLeft(55.0f, &FileBoxLabel, &FileBox);
+	View.HSplitBottom(10.0f, &View, nullptr); // some spacing
+	if(m_FileDialogFileType == CEditor::FILETYPE_IMG || m_FileDialogFileType == CEditor::FILETYPE_SOUND)
+		View.VSplitMid(&View, &Preview);
+
+	// title bar
+	if(!m_FileDialogShowingRoot)
+	{
+		CUIRect ButtonTimeModified, ButtonFileName;
+		Title.VSplitRight(10.0f, &Title, nullptr);
+		Title.VSplitRight(90.0f, &Title, &ButtonTimeModified);
+		Title.VSplitRight(10.0f, &Title, nullptr);
+		Title.VSplitRight(90.0f, &Title, &ButtonFileName);
+		Title.VSplitRight(10.0f, &Title, nullptr);
+
+		const char *aSortIndicator[3] = {"▼", "", "▲"};
+
+		static int s_ButtonTimeModified = 0;
+		char aBufLabelButtonTimeModified[64];
+		str_format(aBufLabelButtonTimeModified, sizeof(aBufLabelButtonTimeModified), "Time modified %s", aSortIndicator[m_SortByTimeModified + 1]);
+		if(DoButton_Editor(&s_ButtonTimeModified, aBufLabelButtonTimeModified, 0, &ButtonTimeModified, 0, "Sort by time modified"))
+		{
+			if(m_SortByTimeModified == 1)
+			{
+				m_SortByTimeModified = -1;
+			}
+			else if(m_SortByTimeModified == -1)
+			{
+				m_SortByTimeModified = 0;
+			}
+			else
+			{
+				m_SortByTimeModified = 1;
+			}
+
+			RefreshFilteredFileList();
+		}
+
+		static int s_ButtonFileName = 0;
+		char aBufLabelButtonFilename[64];
+		str_format(aBufLabelButtonFilename, sizeof(aBufLabelButtonFilename), "Filename %s", aSortIndicator[m_SortByFilename + 1]);
+		if(DoButton_Editor(&s_ButtonFileName, aBufLabelButtonFilename, 0, &ButtonFileName, 0, "Sort by file name"))
+		{
+			if(m_SortByFilename == 1)
+			{
+				m_SortByFilename = -1;
+				m_SortByTimeModified = 0;
+			}
+			else
+			{
+				m_SortByFilename = 1;
+				m_SortByTimeModified = 0;
+			}
+
+			RefreshFilteredFileList();
+		}
+	}
+
+	Title.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 4.0f);
+	Title.VMargin(10.0f, &Title);
+	UI()->DoLabel(&Title, m_pFileDialogTitle, 12.0f, TEXTALIGN_ML);
+
+	// pathbox
+	if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType >= IStorage::TYPE_SAVE)
+	{
+		char aPath[IO_MAX_PATH_LENGTH], aBuf[128 + IO_MAX_PATH_LENGTH];
+		Storage()->GetCompletePath(m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType, m_pFileDialogPath, aPath, sizeof(aPath));
+		str_format(aBuf, sizeof(aBuf), "Current path: %s", aPath);
+		UI()->DoLabel(&PathBox, aBuf, 10.0f, TEXTALIGN_ML);
+	}
+
+	const auto &&UpdateFileNameInput = [this]() {
+		if(m_FilesSelectedIndex >= 0 && !m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsDir)
+		{
+			char aNameWithoutExt[IO_MAX_PATH_LENGTH];
+			fs_split_file_extension(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, aNameWithoutExt, sizeof(aNameWithoutExt));
+			m_FileDialogFileNameInput.Set(aNameWithoutExt);
+		}
+		else
+			m_FileDialogFileNameInput.Clear();
+	};
+
+	// filebox
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(!UI()->IsPopupOpen());
+
+	if(m_FileDialogStorageType == IStorage::TYPE_SAVE)
+	{
+		UI()->DoLabel(&FileBoxLabel, "Filename:", 10.0f, TEXTALIGN_ML);
+		if(DoEditBox(&m_FileDialogFileNameInput, &FileBox, 10.0f))
+		{
+			// remove '/' and '\'
+			for(int i = 0; m_FileDialogFileNameInput.GetString()[i]; ++i)
+			{
+				if(m_FileDialogFileNameInput.GetString()[i] == '/' || m_FileDialogFileNameInput.GetString()[i] == '\\')
+				{
+					m_FileDialogFileNameInput.SetRange(m_FileDialogFileNameInput.GetString() + i + 1, i, m_FileDialogFileNameInput.GetLength());
+					--i;
+				}
+			}
+			m_FilesSelectedIndex = -1;
+			m_aFilesSelectedName[0] = '\0';
+			// find first valid entry, if it exists
+			for(size_t i = 0; i < m_vpFilteredFileList.size(); i++)
+			{
+				if(str_comp_nocase(m_vpFilteredFileList[i]->m_aName, m_FileDialogFileNameInput.GetString()) == 0)
+				{
+					m_FilesSelectedIndex = i;
+					str_copy(m_aFilesSelectedName, m_vpFilteredFileList[i]->m_aName);
+					break;
+				}
+			}
+			if(m_FilesSelectedIndex >= 0)
+				s_ListBox.ScrollToSelected();
+		}
+
+		if(m_FileDialogOpening)
+			UI()->SetActiveItem(&m_FileDialogFileNameInput);
+	}
+	else
+	{
+		// render search bar
+		UI()->DoLabel(&FileBoxLabel, "Search:", 10.0f, TEXTALIGN_ML);
+		if(m_FileDialogOpening || (Input()->KeyPress(KEY_F) && Input()->ModifierIsPressed()))
+		{
+			UI()->SetActiveItem(&m_FileDialogFilterInput);
+			m_FileDialogFilterInput.SelectAll();
+		}
+		if(UI()->DoClearableEditBox(&m_FileDialogFilterInput, &FileBox, 10.0f))
+		{
+			RefreshFilteredFileList();
+			if(m_vpFilteredFileList.empty())
+			{
+				m_FilesSelectedIndex = -1;
+			}
+			else if(m_FilesSelectedIndex == -1 || (!m_FileDialogFilterInput.IsEmpty() && !str_find_nocase(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aName, m_FileDialogFilterInput.GetString())))
+			{
+				// we need to refresh selection
+				m_FilesSelectedIndex = -1;
+				for(size_t i = 0; i < m_vpFilteredFileList.size(); i++)
+				{
+					if(str_find_nocase(m_vpFilteredFileList[i]->m_aName, m_FileDialogFilterInput.GetString()))
+					{
+						m_FilesSelectedIndex = i;
+						break;
+					}
+				}
+				if(m_FilesSelectedIndex == -1)
+				{
+					// select first item
+					m_FilesSelectedIndex = 0;
+				}
+			}
+			if(m_FilesSelectedIndex >= 0)
+				str_copy(m_aFilesSelectedName, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aName);
+			else
+				m_aFilesSelectedName[0] = '\0';
+			UpdateFileNameInput();
+			s_ListBox.ScrollToSelected();
+			m_FilePreviewState = PREVIEW_UNLOADED;
+		}
+	}
+
+	m_FileDialogOpening = false;
+
+	if(m_FilesSelectedIndex > -1)
+	{
+		if(m_FilePreviewState == PREVIEW_UNLOADED)
+		{
+			if(m_FileDialogFileType == CEditor::FILETYPE_IMG && str_endswith(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, ".png"))
+			{
+				char aBuffer[IO_MAX_PATH_LENGTH];
+				str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+				if(Graphics()->LoadPNG(&m_FilePreviewImageInfo, aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType))
+				{
+					Graphics()->UnloadTexture(&m_FilePreviewImage);
+					m_FilePreviewImage = Graphics()->LoadTextureRaw(m_FilePreviewImageInfo.m_Width, m_FilePreviewImageInfo.m_Height, m_FilePreviewImageInfo.m_Format, m_FilePreviewImageInfo.m_pData, 0);
+					Graphics()->FreePNG(&m_FilePreviewImageInfo);
+					m_FilePreviewState = PREVIEW_LOADED;
+				}
+				else
+				{
+					m_FilePreviewState = PREVIEW_ERROR;
+				}
+			}
+			else if(m_FileDialogFileType == CEditor::FILETYPE_SOUND && str_endswith(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, ".opus"))
+			{
+				char aBuffer[IO_MAX_PATH_LENGTH];
+				str_format(aBuffer, sizeof(aBuffer), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+				Sound()->UnloadSample(m_FilePreviewSound);
+				m_FilePreviewSound = Sound()->LoadOpus(aBuffer, m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType);
+				m_FilePreviewState = m_FilePreviewSound == -1 ? PREVIEW_ERROR : PREVIEW_LOADED;
+			}
+		}
+
+		if(m_FileDialogFileType == CEditor::FILETYPE_IMG)
+		{
+			Preview.Margin(10.0f, &Preview);
+			if(m_FilePreviewState == PREVIEW_LOADED)
+			{
+				int w = m_FilePreviewImageInfo.m_Width;
+				int h = m_FilePreviewImageInfo.m_Height;
+				if(m_FilePreviewImageInfo.m_Width > Preview.w)
+				{
+					h = m_FilePreviewImageInfo.m_Height * Preview.w / m_FilePreviewImageInfo.m_Width;
+					w = Preview.w;
+				}
+				if(h > Preview.h)
+				{
+					w = w * Preview.h / h;
+					h = Preview.h;
+				}
+
+				Graphics()->TextureSet(m_FilePreviewImage);
+				Graphics()->BlendNormal();
+				Graphics()->QuadsBegin();
+				IGraphics::CQuadItem QuadItem(Preview.x, Preview.y, w, h);
+				Graphics()->QuadsDrawTL(&QuadItem, 1);
+				Graphics()->QuadsEnd();
+			}
+			else if(m_FilePreviewState == PREVIEW_ERROR)
+			{
+				SLabelProperties Props;
+				Props.m_MaxWidth = Preview.w;
+				UI()->DoLabel(&Preview, "Failed to load the image (check the local console for details).", 12.0f, TEXTALIGN_TL, Props);
+			}
+		}
+		else if(m_FileDialogFileType == CEditor::FILETYPE_SOUND)
+		{
+			Preview.Margin(10.0f, &Preview);
+			if(m_FilePreviewState == PREVIEW_LOADED)
+			{
+				Preview.HSplitTop(20.0f, &Preview, nullptr);
+				Preview.VSplitLeft(Preview.h / 4.0f, nullptr, &Preview);
+
+				static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0;
+				DoAudioPreview(Preview, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_FilePreviewSound);
+			}
+			else if(m_FilePreviewState == PREVIEW_ERROR)
+			{
+				SLabelProperties Props;
+				Props.m_MaxWidth = Preview.w;
+				UI()->DoLabel(&Preview, "Failed to load the sound (check the local console for details). Make sure you enabled sounds in the settings.", 12.0f, TEXTALIGN_TL, Props);
+			}
+		}
+	}
+
+	s_ListBox.DoStart(15.0f, m_vpFilteredFileList.size(), 1, 5, m_FilesSelectedIndex, &View, false);
+
+	for(size_t i = 0; i < m_vpFilteredFileList.size(); i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(m_vpFilteredFileList[i], m_FilesSelectedIndex >= 0 && (size_t)m_FilesSelectedIndex == i);
+		if(!Item.m_Visible)
+			continue;
+
+		CUIRect Button, FileIcon, TimeModified;
+		Item.m_Rect.VSplitLeft(Item.m_Rect.h, &FileIcon, &Button);
+		Button.VSplitLeft(5.0f, nullptr, &Button);
+		Button.VSplitRight(100.0f, &Button, &TimeModified);
+		Button.VSplitRight(5.0f, &Button, nullptr);
+
+		const char *pIconType;
+		if(!m_vpFilteredFileList[i]->m_IsDir)
+		{
+			switch(m_FileDialogFileType)
+			{
+			case FILETYPE_MAP:
+				pIconType = FONT_ICON_MAP;
+				break;
+			case FILETYPE_IMG:
+				pIconType = FONT_ICON_IMAGE;
+				break;
+			case FILETYPE_SOUND:
+				pIconType = FONT_ICON_MUSIC;
+				break;
+			default:
+				pIconType = FONT_ICON_FILE;
+			}
+		}
+		else
+		{
+			if(m_vpFilteredFileList[i]->m_IsLink || str_comp(m_vpFilteredFileList[i]->m_aFilename, "..") == 0)
+				pIconType = FONT_ICON_FOLDER_TREE;
+			else
+				pIconType = FONT_ICON_FOLDER;
+		}
+
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING);
+		UI()->DoLabel(&FileIcon, pIconType, 12.0f, TEXTALIGN_ML);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Button.w;
+		Props.m_EllipsisAtEnd = true;
+		UI()->DoLabel(&Button, m_vpFilteredFileList[i]->m_aName, 10.0f, TEXTALIGN_ML, Props);
+
+		if(!m_vpFilteredFileList[i]->m_IsLink && str_comp(m_vpFilteredFileList[i]->m_aFilename, "..") != 0)
+		{
+			char aBufTimeModified[64];
+			str_timestamp_ex(m_vpFilteredFileList[i]->m_TimeModified, aBufTimeModified, sizeof(aBufTimeModified), "%d.%m.%Y %H:%M");
+			UI()->DoLabel(&TimeModified, aBufTimeModified, 10.0f, TEXTALIGN_MR);
+		}
+	}
+
+	const int NewSelection = s_ListBox.DoEnd();
+	if(NewSelection != m_FilesSelectedIndex)
+	{
+		m_FilesSelectedIndex = NewSelection;
+		str_copy(m_aFilesSelectedName, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aName);
+		const bool WasChanged = m_FileDialogFileNameInput.WasChanged();
+		UpdateFileNameInput();
+		if(!WasChanged) // ensure that changed flag is not set if it wasn't previously set, as this would reset the selection after DoEditBox is called
+			m_FileDialogFileNameInput.WasChanged(); // this clears the changed flag
+		m_FilePreviewState = PREVIEW_UNLOADED;
+	}
+
+	const float ButtonSpacing = ButtonBar.w > 600.0f ? 40.0f : 10.0f;
+
+	// the buttons
+	static int s_OkButton = 0;
+	static int s_CancelButton = 0;
+	static int s_RefreshButton = 0;
+	static int s_ShowDirectoryButton = 0;
+	static int s_DeleteButton = 0;
+	static int s_NewFolderButton = 0;
+
+	CUIRect Button;
+	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
+	const bool IsDir = m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsDir;
+	if(DoButton_Editor(&s_OkButton, IsDir ? "Open" : m_pFileDialogButtonText, 0, &Button, 0, nullptr) || s_ListBox.WasItemActivated() || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		if(IsDir) // folder
+		{
+			m_FileDialogFilterInput.Clear();
+			UI()->SetActiveItem(&m_FileDialogFilterInput);
+			const bool ParentFolder = str_comp(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, "..") == 0;
+			if(ParentFolder) // parent folder
+			{
+				str_copy(m_aFilesSelectedName, fs_filename(m_pFileDialogPath));
+				str_append(m_aFilesSelectedName, "/");
+				if(fs_parent_dir(m_pFileDialogPath))
+				{
+					if(str_comp(m_pFileDialogPath, m_aFileDialogCurrentFolder) == 0)
+					{
+						m_FileDialogShowingRoot = true;
+						if(m_FileDialogStorageType == IStorage::TYPE_ALL)
+						{
+							m_aFilesSelectedName[0] = '\0'; // will select first list item
+						}
+						else
+						{
+							Storage()->GetCompletePath(m_FileDialogStorageType, m_pFileDialogPath, m_aFilesSelectedName, sizeof(m_aFilesSelectedName));
+							str_append(m_aFilesSelectedName, "/");
+						}
+					}
+					else
+					{
+						m_pFileDialogPath = m_aFileDialogCurrentFolder; // leave the link
+						str_copy(m_aFilesSelectedName, m_aFileDialogCurrentLink);
+						str_append(m_aFilesSelectedName, "/");
+					}
+				}
+			}
+			else // sub folder
+			{
+				if(m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsLink)
+				{
+					m_pFileDialogPath = m_aFileDialogCurrentLink; // follow the link
+					str_copy(m_aFileDialogCurrentLink, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+				}
+				else
+				{
+					char aTemp[IO_MAX_PATH_LENGTH];
+					str_copy(aTemp, m_pFileDialogPath);
+					str_format(m_pFileDialogPath, IO_MAX_PATH_LENGTH, "%s/%s", aTemp, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+				}
+				if(m_FileDialogShowingRoot)
+					m_FileDialogStorageType = m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType;
+				m_FileDialogShowingRoot = false;
+			}
+			FilelistPopulate(m_FileDialogStorageType, ParentFolder);
+			UpdateFileNameInput();
+		}
+		else // file
+		{
+			const int StorageType = m_FilesSelectedIndex >= 0 ? m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType : m_FileDialogStorageType;
+			str_format(m_aFileSaveName, sizeof(m_aFileSaveName), "%s/%s", m_pFileDialogPath, m_FileDialogFileNameInput.GetString());
+			if(!str_endswith(m_aFileSaveName, FILETYPE_EXTENSIONS[m_FileDialogFileType]))
+				str_append(m_aFileSaveName, FILETYPE_EXTENSIONS[m_FileDialogFileType]);
+			if(!str_comp(m_pFileDialogButtonText, "Save") && Storage()->FileExists(m_aFileSaveName, StorageType))
+			{
+				if(m_pfnFileDialogFunc == &CallbackSaveMap)
+					m_PopupEventType = POPEVENT_SAVE;
+				else if(m_pfnFileDialogFunc == &CallbackSaveCopyMap)
+					m_PopupEventType = POPEVENT_SAVE_COPY;
+				else if(m_pfnFileDialogFunc == &CallbackSaveImage)
+					m_PopupEventType = POPEVENT_SAVE_IMG;
+				else
+					m_PopupEventType = POPEVENT_SAVE_SOUND;
+				m_PopupEventActivated = true;
+			}
+			else if(m_pfnFileDialogFunc)
+				m_pfnFileDialogFunc(m_aFileSaveName, StorageType, m_pFileDialogUser);
+		}
+	}
+
+	ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
+	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
+	if(DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr) || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)))
+	{
+		OnDialogClose();
+		m_Dialog = DIALOG_NONE;
+	}
+
+	ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
+	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
+	if(DoButton_Editor(&s_RefreshButton, "Refresh", 0, &Button, 0, nullptr) || (s_ListBox.Active() && (Input()->KeyIsPressed(KEY_F5) || (Input()->ModifierIsPressed() && Input()->KeyIsPressed(KEY_R)))))
+		FilelistPopulate(m_FileDialogLastPopulatedStorageType, true);
+
+	if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType != IStorage::TYPE_ALL)
+	{
+		ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
+		ButtonBar.VSplitRight(90.0f, &ButtonBar, &Button);
+		if(DoButton_Editor(&s_ShowDirectoryButton, "Show directory", 0, &Button, 0, "Open the current directory in the file browser"))
+		{
+			char aOpenPath[IO_MAX_PATH_LENGTH];
+			Storage()->GetCompletePath(m_FilesSelectedIndex >= 0 ? m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType : IStorage::TYPE_SAVE, m_pFileDialogPath, aOpenPath, sizeof(aOpenPath));
+			if(!open_file(aOpenPath))
+			{
+				ShowFileDialogError("Failed to open the directory '%s'.", aOpenPath);
+			}
+		}
+	}
+
+	ButtonBar.VSplitRight(ButtonSpacing, &ButtonBar, nullptr);
+	ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
+	static CUI::SConfirmPopupContext s_ConfirmDeletePopupContext;
+	if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType == IStorage::TYPE_SAVE && !m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsLink && str_comp(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, "..") != 0)
+	{
+		if(DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, nullptr) || (s_ListBox.Active() && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
+		{
+			s_ConfirmDeletePopupContext.Reset();
+			s_ConfirmDeletePopupContext.YesNoButtons();
+			str_format(s_ConfirmDeletePopupContext.m_aMessage, sizeof(s_ConfirmDeletePopupContext.m_aMessage), "Are you sure that you want to delete the %s '%s/%s'?", IsDir ? "folder" : "file", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+			UI()->ShowPopupConfirm(UI()->MouseX(), UI()->MouseY(), &s_ConfirmDeletePopupContext);
+		}
+		if(s_ConfirmDeletePopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+		{
+			char aDeleteFilePath[IO_MAX_PATH_LENGTH];
+			str_format(aDeleteFilePath, sizeof(aDeleteFilePath), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
+			if(IsDir)
+			{
+				if(Storage()->RemoveFolder(aDeleteFilePath, IStorage::TYPE_SAVE))
+					FilelistPopulate(m_FileDialogLastPopulatedStorageType, true);
+				else
+					ShowFileDialogError("Failed to delete folder '%s'. Make sure it's empty first.", aDeleteFilePath);
+			}
+			else
+			{
+				if(Storage()->RemoveFile(aDeleteFilePath, IStorage::TYPE_SAVE))
+					FilelistPopulate(m_FileDialogLastPopulatedStorageType, true);
+				else
+					ShowFileDialogError("Failed to delete file '%s'.", aDeleteFilePath);
+			}
+			UpdateFileNameInput();
+		}
+		if(s_ConfirmDeletePopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+			s_ConfirmDeletePopupContext.Reset();
+	}
+	else
+		s_ConfirmDeletePopupContext.Reset();
+
+	if(!m_FileDialogShowingRoot && m_FileDialogStorageType == IStorage::TYPE_SAVE)
+	{
+		ButtonBar.VSplitLeft(70.0f, &Button, &ButtonBar);
+		if(DoButton_Editor(&s_NewFolderButton, "New folder", 0, &Button, 0, nullptr))
+		{
+			m_FileDialogNewFolderNameInput.Clear();
+			static SPopupMenuId s_PopupNewFolderId;
+			constexpr float PopupWidth = 400.0f;
+			constexpr float PopupHeight = 110.0f;
+			UI()->DoPopupMenu(&s_PopupNewFolderId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupNewFolder);
+			UI()->SetActiveItem(&m_FileDialogNewFolderNameInput);
+		}
+	}
+}
+
+void CEditor::RefreshFilteredFileList()
+{
+	m_vpFilteredFileList.clear();
+	for(const CFilelistItem &Item : m_vCompleteFileList)
+	{
+		if(m_FileDialogFilterInput.IsEmpty() || str_find_nocase(Item.m_aName, m_FileDialogFilterInput.GetString()))
+		{
+			m_vpFilteredFileList.push_back(&Item);
+		}
+	}
+	if(!m_FileDialogShowingRoot)
+		SortFilteredFileList();
+	if(!m_vpFilteredFileList.empty())
+	{
+		if(m_aFilesSelectedName[0])
+		{
+			for(size_t i = 0; i < m_vpFilteredFileList.size(); i++)
+			{
+				if(m_aFilesSelectedName[0] && str_comp(m_vpFilteredFileList[i]->m_aName, m_aFilesSelectedName) == 0)
+				{
+					m_FilesSelectedIndex = i;
+					break;
+				}
+			}
+		}
+		m_FilesSelectedIndex = clamp<int>(m_FilesSelectedIndex, 0, m_vpFilteredFileList.size() - 1);
+		str_copy(m_aFilesSelectedName, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aName);
+	}
+	else
+	{
+		m_FilesSelectedIndex = -1;
+		m_aFilesSelectedName[0] = '\0';
+	}
+}
+
+void CEditor::FilelistPopulate(int StorageType, bool KeepSelection)
+{
+	m_FileDialogLastPopulatedStorageType = StorageType;
+	m_vCompleteFileList.clear();
+	if(m_FileDialogShowingRoot)
+	{
+		{
+			CFilelistItem Item;
+			str_copy(Item.m_aFilename, m_pFileDialogPath);
+			str_copy(Item.m_aName, "All combined");
+			Item.m_IsDir = true;
+			Item.m_IsLink = true;
+			Item.m_StorageType = IStorage::TYPE_ALL;
+			Item.m_TimeModified = 0;
+			m_vCompleteFileList.push_back(Item);
+		}
+
+		for(int CheckStorageType = IStorage::TYPE_SAVE; CheckStorageType < Storage()->NumPaths(); ++CheckStorageType)
+		{
+			if(Storage()->FolderExists(m_pFileDialogPath, CheckStorageType))
+			{
+				CFilelistItem Item;
+				str_copy(Item.m_aFilename, m_pFileDialogPath);
+				Storage()->GetCompletePath(CheckStorageType, m_pFileDialogPath, Item.m_aName, sizeof(Item.m_aName));
+				str_append(Item.m_aName, "/", sizeof(Item.m_aName));
+				Item.m_IsDir = true;
+				Item.m_IsLink = true;
+				Item.m_StorageType = CheckStorageType;
+				Item.m_TimeModified = 0;
+				m_vCompleteFileList.push_back(Item);
+			}
+		}
+	}
+	else
+	{
+		// Add links for downloadedmaps and themes
+		if(!str_comp(m_pFileDialogPath, "maps"))
+		{
+			if(str_comp(m_pFileDialogButtonText, "Save") != 0 && Storage()->FolderExists("downloadedmaps", StorageType))
+			{
+				CFilelistItem Item;
+				str_copy(Item.m_aFilename, "downloadedmaps");
+				str_copy(Item.m_aName, "downloadedmaps/");
+				Item.m_IsDir = true;
+				Item.m_IsLink = true;
+				Item.m_StorageType = StorageType;
+				Item.m_TimeModified = 0;
+				m_vCompleteFileList.push_back(Item);
+			}
+
+			if(Storage()->FolderExists("themes", StorageType))
+			{
+				CFilelistItem Item;
+				str_copy(Item.m_aFilename, "themes");
+				str_copy(Item.m_aName, "themes/");
+				Item.m_IsDir = true;
+				Item.m_IsLink = true;
+				Item.m_StorageType = StorageType;
+				Item.m_TimeModified = 0;
+				m_vCompleteFileList.push_back(Item);
+			}
+		}
+		Storage()->ListDirectoryInfo(StorageType, m_pFileDialogPath, EditorListdirCallback, this);
+	}
+	RefreshFilteredFileList();
+	if(!KeepSelection)
+	{
+		m_FilesSelectedIndex = m_vpFilteredFileList.empty() ? -1 : 0;
+		if(m_FilesSelectedIndex >= 0)
+			str_copy(m_aFilesSelectedName, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aName);
+		else
+			m_aFilesSelectedName[0] = '\0';
+	}
+	m_FilePreviewState = PREVIEW_UNLOADED;
+}
+
+void CEditor::InvokeFileDialog(int StorageType, int FileType, const char *pTitle, const char *pButtonText,
+	const char *pBasePath, bool FilenameAsDefault,
+	bool (*pfnFunc)(const char *pFileName, int StorageType, void *pUser), void *pUser)
+{
+	m_FileDialogStorageType = StorageType;
+	if(m_FileDialogStorageType == IStorage::TYPE_ALL)
+	{
+		int NumStoragesWithFolder = 0;
+		for(int CheckStorageType = IStorage::TYPE_SAVE; CheckStorageType < Storage()->NumPaths(); ++CheckStorageType)
+		{
+			if(Storage()->FolderExists(pBasePath, CheckStorageType))
+			{
+				NumStoragesWithFolder++;
+			}
+		}
+		m_FileDialogMultipleStorages = NumStoragesWithFolder > 1;
+	}
+	else
+	{
+		m_FileDialogMultipleStorages = false;
+	}
+
+	UI()->ClosePopupMenus();
+	m_pFileDialogTitle = pTitle;
+	m_pFileDialogButtonText = pButtonText;
+	m_pfnFileDialogFunc = pfnFunc;
+	m_pFileDialogUser = pUser;
+	m_FileDialogFileNameInput.Clear();
+	m_FileDialogFilterInput.Clear();
+	m_aFileDialogCurrentFolder[0] = 0;
+	m_aFileDialogCurrentLink[0] = 0;
+	m_pFileDialogPath = m_aFileDialogCurrentFolder;
+	m_FileDialogFileType = FileType;
+	m_FilePreviewState = PREVIEW_UNLOADED;
+	m_FileDialogOpening = true;
+	m_FileDialogShowingRoot = false;
+
+	if(FilenameAsDefault)
+	{
+		char aDefaultName[IO_MAX_PATH_LENGTH];
+		fs_split_file_extension(fs_filename(m_aFileName), aDefaultName, sizeof(aDefaultName));
+		m_FileDialogFileNameInput.Set(aDefaultName);
+	}
+	if(pBasePath)
+		str_copy(m_aFileDialogCurrentFolder, pBasePath);
+
+	FilelistPopulate(m_FileDialogStorageType);
+
+	m_FileDialogOpening = true;
+	m_Dialog = DIALOG_FILE;
+}
+
+void CEditor::ShowFileDialogError(const char *pFormat, ...)
+{
+	char aMessage[1024];
+	va_list VarArgs;
+	va_start(VarArgs, pFormat);
+	str_format_v(aMessage, sizeof(aMessage), pFormat, VarArgs);
+	va_end(VarArgs);
+
+	auto ContextIterator = m_PopupMessageContexts.find(aMessage);
+	CUI::SMessagePopupContext *pContext;
+	if(ContextIterator != m_PopupMessageContexts.end())
+	{
+		pContext = ContextIterator->second;
+		UI()->ClosePopupMenu(pContext);
+	}
+	else
+	{
+		pContext = new CUI::SMessagePopupContext();
+		pContext->ErrorColor();
+		str_copy(pContext->m_aMessage, aMessage);
+		m_PopupMessageContexts[pContext->m_aMessage] = pContext;
+	}
+	UI()->ShowPopupMessage(UI()->MouseX(), UI()->MouseY(), pContext);
+}
+
+void CEditor::RenderModebar(CUIRect View)
+{
+	CUIRect Mentions, IngameMoved, ModeButtons, ModeButton;
+	View.HSplitTop(12.0f, &Mentions, &View);
+	View.HSplitTop(12.0f, &IngameMoved, &View);
+	View.HSplitTop(8.0f, nullptr, &ModeButtons);
+	ModeButtons.VSplitLeft(96.0f, &ModeButtons, nullptr);
+
+	// mentions
+	if(m_Mentions)
+	{
+		char aBuf[64];
+		if(m_Mentions == 1)
+			str_copy(aBuf, Localize("1 new mention"));
+		else if(m_Mentions <= 9)
+			str_format(aBuf, sizeof(aBuf), Localize("%d new mentions"), m_Mentions);
+		else
+			str_copy(aBuf, Localize("9+ new mentions"));
+
+		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
+		UI()->DoLabel(&Mentions, aBuf, 10.0f, TEXTALIGN_MC);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+
+	// ingame moved warning
+	if(m_IngameMoved)
+	{
+		TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
+		UI()->DoLabel(&IngameMoved, Localize("Moved ingame"), 10.0f, TEXTALIGN_MC);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+
+	// mode buttons
+	{
+		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		static int s_LayersButton = 0;
+		if(DoButton_FontIcon(&s_LayersButton, FONT_ICON_LAYER_GROUP, m_Mode == MODE_LAYERS, &ModeButton, 0, "Go to layers management.", IGraphics::CORNER_L))
+		{
+			m_Mode = MODE_LAYERS;
+		}
+
+		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		static int s_ImagesButton = 0;
+		if(DoButton_FontIcon(&s_ImagesButton, FONT_ICON_IMAGE, m_Mode == MODE_IMAGES, &ModeButton, 0, "Go to images management.", IGraphics::CORNER_NONE))
+		{
+			m_Mode = MODE_IMAGES;
+		}
+
+		ModeButtons.VSplitLeft(32.0f, &ModeButton, &ModeButtons);
+		static int s_SoundsButton = 0;
+		if(DoButton_FontIcon(&s_SoundsButton, FONT_ICON_MUSIC, m_Mode == MODE_SOUNDS, &ModeButton, 0, "Go to sounds management.", IGraphics::CORNER_R))
+		{
+			m_Mode = MODE_SOUNDS;
+		}
+
+		if(Input()->KeyPress(KEY_LEFT) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+		{
+			m_Mode = (m_Mode + NUM_MODES - 1) % NUM_MODES;
+		}
+		else if(Input()->KeyPress(KEY_RIGHT) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+		{
+			m_Mode = (m_Mode + 1) % NUM_MODES;
+		}
+	}
+}
+
+void CEditor::RenderStatusbar(CUIRect View, CUIRect *pTooltipRect)
+{
+	const bool ButtonsDisabled = m_ShowPicker;
+
+	CUIRect Button;
+	View.VSplitRight(100.0f, &View, &Button);
+	static int s_EnvelopeButton = 0;
+	if(DoButton_Editor(&s_EnvelopeButton, "Envelopes", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES, &Button, 0, "Toggles the envelope editor.") == 1)
+	{
+		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES ? EXTRAEDITOR_NONE : EXTRAEDITOR_ENVELOPES;
+	}
+
+	View.VSplitRight(10.0f, &View, nullptr);
+	View.VSplitRight(100.0f, &View, &Button);
+	static int s_SettingsButton = 0;
+	if(DoButton_Editor(&s_SettingsButton, "Server settings", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS, &Button, 0, "Toggles the server settings editor.") == 1)
+	{
+		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS ? EXTRAEDITOR_NONE : EXTRAEDITOR_SERVER_SETTINGS;
+	}
+
+	View.VSplitRight(10.0f, &View, nullptr);
+	View.VSplitRight(100.0f, &View, &Button);
+	static int s_HistoryButton = 0;
+	if(DoButton_Editor(&s_HistoryButton, "History", ButtonsDisabled ? -1 : m_ActiveExtraEditor == EXTRAEDITOR_HISTORY, &Button, 0, "Toggles the editor history view.") == 1)
+	{
+		m_ActiveExtraEditor = m_ActiveExtraEditor == EXTRAEDITOR_HISTORY ? EXTRAEDITOR_NONE : EXTRAEDITOR_HISTORY;
+	}
+
+	View.VSplitRight(10.0f, pTooltipRect, nullptr);
+}
+
+void CEditor::RenderTooltip(CUIRect TooltipRect)
+{
+	if(str_comp(m_aTooltip, "") == 0)
+		return;
+
+	char aBuf[256];
+	if(ms_pUiGotContext && ms_pUiGotContext == UI()->HotItem())
+		str_format(aBuf, sizeof(aBuf), "%s Right click for context menu.", m_aTooltip);
+	else
+		str_copy(aBuf, m_aTooltip);
+
+	SLabelProperties Props;
+	Props.m_MaxWidth = TooltipRect.w;
+	Props.m_EllipsisAtEnd = true;
+	UI()->DoLabel(&TooltipRect, aBuf, 10.0f, TEXTALIGN_ML, Props);
+}
+
+bool CEditor::IsEnvelopeUsed(int EnvelopeIndex) const
+{
+	for(const auto &pGroup : m_Map.m_vpGroups)
+	{
+		for(const auto &pLayer : pGroup->m_vpLayers)
+		{
+			if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(pLayer);
+				for(const auto &Quad : pLayerQuads->m_vQuads)
+				{
+					if(Quad.m_PosEnv == EnvelopeIndex || Quad.m_ColorEnv == EnvelopeIndex)
+					{
+						return true;
+					}
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(pLayer);
+				for(const auto &Source : pLayerSounds->m_vSources)
+				{
+					if(Source.m_PosEnv == EnvelopeIndex || Source.m_SoundEnv == EnvelopeIndex)
+					{
+						return true;
+					}
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+				if(pLayerTiles->m_ColorEnv == EnvelopeIndex)
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+void CEditor::RemoveUnusedEnvelopes()
+{
+	for(size_t Envelope = 0; Envelope < m_Map.m_vpEnvelopes.size();)
+	{
+		if(IsEnvelopeUsed(Envelope))
+		{
+			++Envelope;
+		}
+		else
+		{
+			m_Map.DeleteEnvelope(Envelope);
+		}
+	}
+}
+
+void CEditor::ZoomAdaptOffsetX(float ZoomFactor, const CUIRect &View)
+{
+	float PosX = g_Config.m_EdZoomTarget ? (UI()->MouseX() - View.x) / View.w : 0.5f;
+	m_OffsetEnvelopeX = PosX - (PosX - m_OffsetEnvelopeX) * ZoomFactor;
+}
+
+void CEditor::UpdateZoomEnvelopeX(const CUIRect &View)
+{
+	float OldZoom = m_ZoomEnvelopeX.GetValue();
+	if(m_ZoomEnvelopeX.UpdateValue())
+		ZoomAdaptOffsetX(OldZoom / m_ZoomEnvelopeX.GetValue(), View);
+}
+
+void CEditor::ZoomAdaptOffsetY(float ZoomFactor, const CUIRect &View)
+{
+	float PosY = g_Config.m_EdZoomTarget ? 1.0f - (UI()->MouseY() - View.y) / View.h : 0.5f;
+	m_OffsetEnvelopeY = PosY - (PosY - m_OffsetEnvelopeY) * ZoomFactor;
+}
+
+void CEditor::UpdateZoomEnvelopeY(const CUIRect &View)
+{
+	float OldZoom = m_ZoomEnvelopeY.GetValue();
+	if(m_ZoomEnvelopeY.UpdateValue())
+		ZoomAdaptOffsetY(OldZoom / m_ZoomEnvelopeY.GetValue(), View);
+}
+
+void CEditor::ResetZoomEnvelope(const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels)
+{
+	auto [Bottom, Top] = pEnvelope->GetValueRange(ActiveChannels);
+	float EndTime = pEnvelope->EndTime();
+	float ValueRange = absolute(Top - Bottom);
+
+	if(ValueRange < m_ZoomEnvelopeY.GetMinValue())
+	{
+		// Set view to some sane default if range is too small
+		m_OffsetEnvelopeY = 0.5f - ValueRange / m_ZoomEnvelopeY.GetMinValue() / 2.0f - Bottom / m_ZoomEnvelopeY.GetMinValue();
+		m_ZoomEnvelopeY.SetValueInstant(m_ZoomEnvelopeY.GetMinValue());
+	}
+	else if(ValueRange > m_ZoomEnvelopeY.GetMaxValue())
+	{
+		m_OffsetEnvelopeY = -Bottom / m_ZoomEnvelopeY.GetMaxValue();
+		m_ZoomEnvelopeY.SetValueInstant(m_ZoomEnvelopeY.GetMaxValue());
+	}
+	else
+	{
+		// calculate biggest possible spacing
+		float SpacingFactor = minimum(1.25f, m_ZoomEnvelopeY.GetMaxValue() / ValueRange);
+		m_ZoomEnvelopeY.SetValueInstant(SpacingFactor * ValueRange);
+		float Space = 1.0f / SpacingFactor;
+		float Spacing = (1.0f - Space) / 2.0f;
+
+		if(Top >= 0 && Bottom >= 0)
+			m_OffsetEnvelopeY = Spacing - Bottom / m_ZoomEnvelopeY.GetValue();
+		else if(Top <= 0 && Bottom <= 0)
+			m_OffsetEnvelopeY = Spacing - Bottom / m_ZoomEnvelopeY.GetValue();
+		else
+			m_OffsetEnvelopeY = Spacing + Space * absolute(Bottom) / ValueRange;
+	}
+
+	if(EndTime < m_ZoomEnvelopeX.GetMinValue())
+	{
+		m_OffsetEnvelopeX = 0.5f - EndTime / m_ZoomEnvelopeX.GetMinValue();
+		m_ZoomEnvelopeX.SetValueInstant(m_ZoomEnvelopeX.GetMinValue());
+	}
+	else if(EndTime > m_ZoomEnvelopeX.GetMaxValue())
+	{
+		m_OffsetEnvelopeX = 0.0f;
+		m_ZoomEnvelopeX.SetValueInstant(m_ZoomEnvelopeX.GetMaxValue());
+	}
+	else
+	{
+		float SpacingFactor = minimum(1.25f, m_ZoomEnvelopeX.GetMaxValue() / EndTime);
+		m_ZoomEnvelopeX.SetValueInstant(SpacingFactor * EndTime);
+		float Space = 1.0f / SpacingFactor;
+		float Spacing = (1.0f - Space) / 2.0f;
+
+		m_OffsetEnvelopeX = Spacing;
+	}
+}
+
+float fxt2f(int t)
+{
+	return t / 1000.0f;
+}
+
+int f2fxt(float t)
+{
+	return static_cast<int>(t * 1000.0f);
+}
+
+float CEditor::ScreenToEnvelopeX(const CUIRect &View, float x) const
+{
+	return (x - View.x - View.w * m_OffsetEnvelopeX) / View.w * m_ZoomEnvelopeX.GetValue();
+}
+
+float CEditor::EnvelopeToScreenX(const CUIRect &View, float x) const
+{
+	return View.x + View.w * m_OffsetEnvelopeX + x / m_ZoomEnvelopeX.GetValue() * View.w;
+}
+
+float CEditor::ScreenToEnvelopeY(const CUIRect &View, float y) const
+{
+	return (View.h - y + View.y) / View.h * m_ZoomEnvelopeY.GetValue() - m_OffsetEnvelopeY * m_ZoomEnvelopeY.GetValue();
+}
+
+float CEditor::EnvelopeToScreenY(const CUIRect &View, float y) const
+{
+	return View.y + View.h - y / m_ZoomEnvelopeY.GetValue() * View.h - m_OffsetEnvelopeY * View.h;
+}
+
+float CEditor::ScreenToEnvelopeDX(const CUIRect &View, float dx)
+{
+	return dx / Graphics()->ScreenWidth() * UI()->Screen()->w / View.w * m_ZoomEnvelopeX.GetValue();
+}
+
+float CEditor::ScreenToEnvelopeDY(const CUIRect &View, float dy)
+{
+	return dy / Graphics()->ScreenHeight() * UI()->Screen()->h / View.h * m_ZoomEnvelopeY.GetValue();
+}
+
+void CEditor::RemoveTimeOffsetEnvelope(const std::shared_ptr<CEnvelope> &pEnvelope)
+{
+	int TimeOffset = pEnvelope->m_vPoints[0].m_Time;
+	for(auto &Point : pEnvelope->m_vPoints)
+		Point.m_Time -= TimeOffset;
+
+	m_OffsetEnvelopeX += fxt2f(TimeOffset) / m_ZoomEnvelopeX.GetValue();
+};
+
+static float ClampDelta(float Val, float Delta, float Min, float Max)
+{
+	if(Val + Delta <= Min)
+		return Min - Val;
+	if(Val + Delta >= Max)
+		return Max - Val;
+	return Delta;
+}
+
+class CTimeStep
+{
+public:
+	template<class T>
+	CTimeStep(T t)
+	{
+		if constexpr(std::is_same_v<T, std::chrono::milliseconds>)
+			m_Unit = ETimeUnit::MILLISECONDS;
+		else if constexpr(std::is_same_v<T, std::chrono::seconds>)
+			m_Unit = ETimeUnit::SECONDS;
+		else
+			m_Unit = ETimeUnit::MINUTES;
+
+		m_Value = t;
+	}
+
+	CTimeStep operator*(int k) const
+	{
+		return CTimeStep(m_Value * k, m_Unit);
+	}
+
+	CTimeStep operator-(const CTimeStep &Other)
+	{
+		return CTimeStep(m_Value - Other.m_Value, m_Unit);
+	}
+
+	void Format(char *pBuffer, size_t BufferSize)
+	{
+		int Milliseconds = m_Value.count() % 1000;
+		int Seconds = std::chrono::duration_cast<std::chrono::seconds>(m_Value).count() % 60;
+		int Minutes = std::chrono::duration_cast<std::chrono::minutes>(m_Value).count();
+
+		switch(m_Unit)
+		{
+		case ETimeUnit::MILLISECONDS:
+			if(Minutes != 0)
+				str_format(pBuffer, BufferSize, "%d:%02d.%03dmin", Minutes, Seconds, Milliseconds);
+			else if(Seconds != 0)
+				str_format(pBuffer, BufferSize, "%d.%03ds", Seconds, Milliseconds);
+			else
+				str_format(pBuffer, BufferSize, "%dms", Milliseconds);
+			break;
+		case ETimeUnit::SECONDS:
+			if(Minutes != 0)
+				str_format(pBuffer, BufferSize, "%d:%02dmin", Minutes, Seconds);
+			else
+				str_format(pBuffer, BufferSize, "%ds", Seconds);
+			break;
+		case ETimeUnit::MINUTES:
+			str_format(pBuffer, BufferSize, "%dmin", Minutes);
+			break;
+		}
+	}
+
+	float AsSeconds() const
+	{
+		return std::chrono::duration_cast<std::chrono::duration<float>>(m_Value).count();
+	}
+
+private:
+	enum class ETimeUnit
+	{
+		MILLISECONDS,
+		SECONDS,
+		MINUTES
+	} m_Unit;
+	std::chrono::milliseconds m_Value;
+
+	CTimeStep(std::chrono::milliseconds Value, ETimeUnit Unit)
+	{
+		m_Value = Value;
+		m_Unit = Unit;
+	}
+};
+
+void CEditor::SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels)
+{
+	if(!UI()->MouseInside(&View))
+		return;
+
+	float mx = UI()->MouseX();
+	float my = UI()->MouseY();
+
+	float MinDist = 200.0f;
+	int *pMinPoint = nullptr;
+
+	auto UpdateMinimum = [&](float px, float py, int *pID) {
+		float dx = px - mx;
+		float dy = py - my;
+
+		float CurrDist = dx * dx + dy * dy;
+		if(CurrDist < MinDist)
+		{
+			MinDist = CurrDist;
+			pMinPoint = pID;
+		}
+	};
+
+	for(size_t i = 0; i < pEnvelope->m_vPoints.size(); i++)
+	{
+		for(int c = pEnvelope->GetChannels() - 1; c >= 0; c--)
+		{
+			if(!(ActiveChannels & (1 << c)))
+				continue;
+
+			if(i > 0 && pEnvelope->m_vPoints[i - 1].m_Curvetype == CURVETYPE_BEZIER)
+			{
+				float px = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c]));
+				float py = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c]));
+				UpdateMinimum(px, py, &pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c]);
+			}
+
+			if(pEnvelope->m_vPoints[i].m_Curvetype == CURVETYPE_BEZIER)
+			{
+				float px = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c]));
+				float py = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c]));
+				UpdateMinimum(px, py, &pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c]);
+			}
+
+			float px = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time));
+			float py = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c]));
+			UpdateMinimum(px, py, &pEnvelope->m_vPoints[i].m_aValues[c]);
+		}
+	}
+
+	if(pMinPoint != nullptr)
+		UI()->SetHotItem(pMinPoint);
+}
+
+void CEditor::RenderEnvelopeEditor(CUIRect View)
+{
+	if(m_SelectedEnvelope < 0)
+		m_SelectedEnvelope = 0;
+	if(m_SelectedEnvelope >= (int)m_Map.m_vpEnvelopes.size())
+		m_SelectedEnvelope = m_Map.m_vpEnvelopes.size() - 1;
+
+	std::shared_ptr<CEnvelope> pEnvelope = nullptr;
+	if(m_SelectedEnvelope >= 0 && m_SelectedEnvelope < (int)m_Map.m_vpEnvelopes.size())
+		pEnvelope = m_Map.m_vpEnvelopes[m_SelectedEnvelope];
+
+	static EEnvelopeEditorOp s_Operation = EEnvelopeEditorOp::OP_NONE;
+	static std::vector<float> s_vAccurateDragValuesX = {};
+	static std::vector<float> s_vAccurateDragValuesY = {};
+	static float s_MouseXStart = 0.0f;
+	static float s_MouseYStart = 0.0f;
+
+	static CLineInput s_NameInput;
+
+	CUIRect ToolBar, CurveBar, ColorBar, DragBar;
+	View.HSplitTop(30.0f, &DragBar, nullptr);
+	DragBar.y -= 2.0f;
+	DragBar.w += 2.0f;
+	DragBar.h += 4.0f;
+	RenderExtraEditorDragBar(View, DragBar);
+	View.HSplitTop(15.0f, &ToolBar, &View);
+	View.HSplitTop(15.0f, &CurveBar, &View);
+	ToolBar.Margin(2.0f, &ToolBar);
+	CurveBar.Margin(2.0f, &CurveBar);
+
+	bool CurrentEnvelopeSwitched = false;
+
+	// do the toolbar
+	static int s_ActiveChannels = 0xf;
+	{
+		CUIRect Button;
+		std::shared_ptr<CEnvelope> pNewEnv = nullptr;
+
+		// redo button
+		ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+		static int s_RedoButton = 0;
+		if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_EnvelopeEditorHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo last action", IGraphics::CORNER_R, 11.0f) == 1)
+		{
+			m_EnvelopeEditorHistory.Redo();
+		}
+
+		// undo button
+		ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+		ToolBar.VSplitRight(10.0f, &ToolBar, nullptr);
+		static int s_UndoButton = 0;
+		if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_EnvelopeEditorHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo last action", IGraphics::CORNER_L, 11.0f) == 1)
+		{
+			m_EnvelopeEditorHistory.Undo();
+		}
+
+		ToolBar.VSplitRight(50.0f, &ToolBar, &Button);
+		static int s_NewSoundButton = 0;
+		if(DoButton_Editor(&s_NewSoundButton, "Sound+", 0, &Button, 0, "Creates a new sound envelope"))
+		{
+			m_Map.OnModify();
+			pNewEnv = m_Map.NewEnvelope(CEnvelope::EType::SOUND);
+		}
+
+		ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+		ToolBar.VSplitRight(50.0f, &ToolBar, &Button);
+		static int s_New4dButton = 0;
+		if(DoButton_Editor(&s_New4dButton, "Color+", 0, &Button, 0, "Creates a new color envelope"))
+		{
+			m_Map.OnModify();
+			pNewEnv = m_Map.NewEnvelope(CEnvelope::EType::COLOR);
+		}
+
+		ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+		ToolBar.VSplitRight(50.0f, &ToolBar, &Button);
+		static int s_New2dButton = 0;
+		if(DoButton_Editor(&s_New2dButton, "Pos.+", 0, &Button, 0, "Creates a new position envelope"))
+		{
+			m_Map.OnModify();
+			pNewEnv = m_Map.NewEnvelope(CEnvelope::EType::POSITION);
+		}
+
+		if(m_SelectedEnvelope >= 0)
+		{
+			// Delete button
+			ToolBar.VSplitRight(10.0f, &ToolBar, nullptr);
+			ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+			static int s_DeleteButton = 0;
+			if(DoButton_Editor(&s_DeleteButton, "✗", 0, &Button, 0, "Delete this envelope"))
+			{
+				m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEveloppeDelete>(this, m_SelectedEnvelope));
+				m_Map.DeleteEnvelope(m_SelectedEnvelope);
+				if(m_SelectedEnvelope >= (int)m_Map.m_vpEnvelopes.size())
+					m_SelectedEnvelope = m_Map.m_vpEnvelopes.size() - 1;
+				pEnvelope = m_SelectedEnvelope >= 0 ? m_Map.m_vpEnvelopes[m_SelectedEnvelope] : nullptr;
+				m_Map.OnModify();
+			}
+
+			// Move right button
+			ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+			ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+			static int s_MoveRightButton = 0;
+			if(DoButton_Ex(&s_MoveRightButton, "→", 0, &Button, 0, "Move this envelope to the right", IGraphics::CORNER_R))
+			{
+				m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeEdit>(this, m_SelectedEnvelope, CEditorActionEnvelopeEdit::EEditType::ORDER, m_SelectedEnvelope, m_SelectedEnvelope + 1));
+				m_Map.SwapEnvelopes(m_SelectedEnvelope, m_SelectedEnvelope + 1);
+				m_SelectedEnvelope = clamp<int>(m_SelectedEnvelope + 1, 0, m_Map.m_vpEnvelopes.size() - 1);
+				pEnvelope = m_Map.m_vpEnvelopes[m_SelectedEnvelope];
+				m_Map.OnModify();
+			}
+
+			// Move left button
+			ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+			static int s_MoveLeftButton = 0;
+			if(DoButton_Ex(&s_MoveLeftButton, "←", 0, &Button, 0, "Move this envelope to the left", IGraphics::CORNER_L))
+			{
+				m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeEdit>(this, m_SelectedEnvelope, CEditorActionEnvelopeEdit::EEditType::ORDER, m_SelectedEnvelope, m_SelectedEnvelope - 1));
+				m_Map.SwapEnvelopes(m_SelectedEnvelope - 1, m_SelectedEnvelope);
+				m_SelectedEnvelope = clamp<int>(m_SelectedEnvelope - 1, 0, m_Map.m_vpEnvelopes.size() - 1);
+				pEnvelope = m_Map.m_vpEnvelopes[m_SelectedEnvelope];
+				m_Map.OnModify();
+			}
+
+			if(pEnvelope)
+			{
+				ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+				ToolBar.VSplitRight(20.0f, &ToolBar, &Button);
+				static int s_ZoomOutButton = 0;
+				if(DoButton_FontIcon(&s_ZoomOutButton, "-", 0, &Button, 0, "[NumPad-] Zoom out horizontally, hold shift to zoom vertically", IGraphics::CORNER_R, 9.0f))
+				{
+					if(Input()->ShiftIsPressed())
+						m_ZoomEnvelopeY.ChangeValue(0.1f * m_ZoomEnvelopeY.GetValue());
+					else
+						m_ZoomEnvelopeX.ChangeValue(0.1f * m_ZoomEnvelopeX.GetValue());
+				}
+
+				ToolBar.VSplitRight(20.0f, &ToolBar, &Button);
+				static int s_ResetZoomButton = 0;
+				if(DoButton_FontIcon(&s_ResetZoomButton, FONT_ICON_MAGNIFYING_GLASS, 0, &Button, 0, "[NumPad*] Reset zoom to default value", IGraphics::CORNER_NONE, 9.0f))
+					ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
+
+				ToolBar.VSplitRight(20.0f, &ToolBar, &Button);
+				static int s_ZoomInButton = 0;
+				if(DoButton_FontIcon(&s_ZoomInButton, "+", 0, &Button, 0, "[NumPad+] Zoom in horizontally, hold shift to zoom vertically", IGraphics::CORNER_L, 9.0f))
+				{
+					if(Input()->ShiftIsPressed())
+						m_ZoomEnvelopeY.ChangeValue(-0.1f * m_ZoomEnvelopeY.GetValue());
+					else
+						m_ZoomEnvelopeX.ChangeValue(-0.1f * m_ZoomEnvelopeX.GetValue());
+				}
+			}
+
+			// Margin on the right side
+			ToolBar.VSplitRight(7.0f, &ToolBar, nullptr);
+		}
+
+		if(pNewEnv) // add the default points
+		{
+			if(pNewEnv->GetChannels() == 4)
+			{
+				pNewEnv->AddPoint(0, f2fx(1.0f), f2fx(1.0f), f2fx(1.0f), f2fx(1.0f));
+				pNewEnv->AddPoint(1000, f2fx(1.0f), f2fx(1.0f), f2fx(1.0f), f2fx(1.0f));
+			}
+			else
+			{
+				pNewEnv->AddPoint(0, 0);
+				pNewEnv->AddPoint(1000, 0);
+			}
+
+			m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeAdd>(this, pNewEnv));
+		}
+
+		CUIRect Shifter, Inc, Dec;
+		ToolBar.VSplitLeft(60.0f, &Shifter, &ToolBar);
+		Shifter.VSplitRight(15.0f, &Shifter, &Inc);
+		Shifter.VSplitLeft(15.0f, &Dec, &Shifter);
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "%d/%d", m_SelectedEnvelope + 1, (int)m_Map.m_vpEnvelopes.size());
+
+		ColorRGBA EnvColor = ColorRGBA(1, 1, 1, 0.5f);
+		if(!m_Map.m_vpEnvelopes.empty())
+		{
+			EnvColor = IsEnvelopeUsed(m_SelectedEnvelope) ? ColorRGBA(1, 0.7f, 0.7f, 0.5f) : ColorRGBA(0.7f, 1, 0.7f, 0.5f);
+		}
+
+		static int s_EnvelopeSelector = 0;
+		auto NewValueRes = UiDoValueSelector(&s_EnvelopeSelector, &Shifter, aBuf, m_SelectedEnvelope + 1, 1, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Select Envelope", false, false, IGraphics::CORNER_NONE, &EnvColor, false);
+		int NewValue = NewValueRes.m_Value;
+		if(NewValue - 1 != m_SelectedEnvelope)
+		{
+			m_SelectedEnvelope = NewValue - 1;
+			CurrentEnvelopeSwitched = true;
+		}
+
+		static int s_PrevButton = 0;
+		if(DoButton_ButtonDec(&s_PrevButton, nullptr, 0, &Dec, 0, "Previous Envelope"))
+		{
+			m_SelectedEnvelope--;
+			if(m_SelectedEnvelope < 0)
+				m_SelectedEnvelope = m_Map.m_vpEnvelopes.size() - 1;
+			CurrentEnvelopeSwitched = true;
+		}
+
+		static int s_NextButton = 0;
+		if(DoButton_ButtonInc(&s_NextButton, nullptr, 0, &Inc, 0, "Next Envelope"))
+		{
+			m_SelectedEnvelope++;
+			if(m_SelectedEnvelope >= (int)m_Map.m_vpEnvelopes.size())
+				m_SelectedEnvelope = 0;
+			CurrentEnvelopeSwitched = true;
+		}
+
+		if(pEnvelope)
+		{
+			ToolBar.VSplitLeft(15.0f, nullptr, &ToolBar);
+			ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
+			UI()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_MR);
+
+			ToolBar.VSplitLeft(3.0f, nullptr, &ToolBar);
+			ToolBar.VSplitLeft(ToolBar.w > ToolBar.h * 40 ? 80.0f : 60.0f, &Button, &ToolBar);
+
+			s_NameInput.SetBuffer(pEnvelope->m_aName, sizeof(pEnvelope->m_aName));
+			if(DoEditBox(&s_NameInput, &Button, 10.0f, IGraphics::CORNER_ALL, "The name of the selected envelope"))
+			{
+				m_Map.OnModify();
+			}
+		}
+	}
+
+	bool ShowColorBar = false;
+	if(pEnvelope && pEnvelope->GetChannels() == 4)
+	{
+		ShowColorBar = true;
+		View.HSplitTop(20.0f, &ColorBar, &View);
+		ColorBar.Margin(2.0f, &ColorBar);
+	}
+
+	RenderBackground(View, m_CheckerTexture, 32.0f, 0.1f);
+
+	if(pEnvelope)
+	{
+		if(m_ResetZoomEnvelope)
+		{
+			m_ResetZoomEnvelope = false;
+			ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
+		}
+
+		static int s_EnvelopeEditorID = 0;
+
+		ColorRGBA aColors[] = {ColorRGBA(1, 0.2f, 0.2f), ColorRGBA(0.2f, 1, 0.2f), ColorRGBA(0.2f, 0.2f, 1), ColorRGBA(1, 1, 0.2f)};
+
+		CUIRect Button;
+
+		ToolBar.VSplitLeft(15.0f, &Button, &ToolBar);
+
+		static const char *s_aapNames[4][CEnvPoint::MAX_CHANNELS] = {
+			{"V", "", "", ""},
+			{"", "", "", ""},
+			{"X", "Y", "R", ""},
+			{"R", "G", "B", "A"},
+		};
+
+		static const char *s_aapDescriptions[4][CEnvPoint::MAX_CHANNELS] = {
+			{"Volume of the envelope", "", "", ""},
+			{"", "", "", ""},
+			{"X-axis of the envelope", "Y-axis of the envelope", "Rotation of the envelope", ""},
+			{"Red value of the envelope", "Green value of the envelope", "Blue value of the envelope", "Alpha value of the envelope"},
+		};
+
+		static int s_aChannelButtons[CEnvPoint::MAX_CHANNELS] = {0};
+		int Bit = 1;
+
+		for(int i = 0; i < CEnvPoint::MAX_CHANNELS; i++, Bit <<= 1)
+		{
+			ToolBar.VSplitLeft(15.0f, &Button, &ToolBar);
+			if(i < pEnvelope->GetChannels())
+			{
+				int Corners = IGraphics::CORNER_NONE;
+				if(pEnvelope->GetChannels() == 1)
+					Corners = IGraphics::CORNER_ALL;
+				else if(i == 0)
+					Corners = IGraphics::CORNER_L;
+				else if(i == pEnvelope->GetChannels() - 1)
+					Corners = IGraphics::CORNER_R;
+
+				if(DoButton_Env(&s_aChannelButtons[i], s_aapNames[pEnvelope->GetChannels() - 1][i], s_ActiveChannels & Bit, &Button, s_aapDescriptions[pEnvelope->GetChannels() - 1][i], aColors[i], Corners))
+					s_ActiveChannels ^= Bit;
+			}
+		}
+
+		// sync checkbox
+		ToolBar.VSplitLeft(15.0f, nullptr, &ToolBar);
+		ToolBar.VSplitLeft(12.0f, &Button, &ToolBar);
+		static int s_SyncButton;
+		if(DoButton_Editor(&s_SyncButton, pEnvelope->m_Synchronized ? "X" : "", 0, &Button, 0, "Synchronize envelope animation to game time (restarts when you touch the start line)"))
+		{
+			m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeEdit>(this, m_SelectedEnvelope, CEditorActionEnvelopeEdit::EEditType::SYNC, pEnvelope->m_Synchronized, !pEnvelope->m_Synchronized));
+			pEnvelope->m_Synchronized = !pEnvelope->m_Synchronized;
+			m_Map.OnModify();
+		}
+
+		ToolBar.VSplitLeft(4.0f, nullptr, &ToolBar);
+		ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
+		UI()->DoLabel(&Button, "Sync.", 10.0f, TEXTALIGN_ML);
+
+		if(UI()->MouseInside(&View) && m_Dialog == DIALOG_NONE)
+		{
+			UI()->SetHotItem(&s_EnvelopeEditorID);
+
+			if(s_Operation == EEnvelopeEditorOp::OP_NONE && (UI()->MouseButton(2) || (UI()->MouseButton(0) && Input()->ModifierIsPressed())))
+			{
+				m_OffsetEnvelopeX += UI()->MouseDeltaX() / Graphics()->ScreenWidth() * UI()->Screen()->w / View.w;
+				m_OffsetEnvelopeY -= UI()->MouseDeltaY() / Graphics()->ScreenHeight() * UI()->Screen()->h / View.h;
+			}
+			if(Input()->KeyPress(KEY_KP_MULTIPLY))
+				ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
+			if(Input()->ShiftIsPressed())
+			{
+				if(Input()->KeyPress(KEY_KP_MINUS))
+					m_ZoomEnvelopeY.ChangeValue(0.1f * m_ZoomEnvelopeY.GetValue());
+				if(Input()->KeyPress(KEY_KP_PLUS))
+					m_ZoomEnvelopeY.ChangeValue(-0.1f * m_ZoomEnvelopeY.GetValue());
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
+					m_ZoomEnvelopeY.ChangeValue(0.1f * m_ZoomEnvelopeY.GetValue());
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
+					m_ZoomEnvelopeY.ChangeValue(-0.1f * m_ZoomEnvelopeY.GetValue());
+			}
+			else
+			{
+				if(Input()->KeyPress(KEY_KP_MINUS))
+					m_ZoomEnvelopeX.ChangeValue(0.1f * m_ZoomEnvelopeX.GetValue());
+				if(Input()->KeyPress(KEY_KP_PLUS))
+					m_ZoomEnvelopeX.ChangeValue(-0.1f * m_ZoomEnvelopeX.GetValue());
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
+					m_ZoomEnvelopeX.ChangeValue(0.1f * m_ZoomEnvelopeX.GetValue());
+				if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
+					m_ZoomEnvelopeX.ChangeValue(-0.1f * m_ZoomEnvelopeX.GetValue());
+			}
+		}
+
+		if(UI()->HotItem() == &s_EnvelopeEditorID)
+		{
+			// do stuff
+			if(UI()->MouseButton(0))
+			{
+				if(Input()->MouseDoubleClick())
+				{
+					// add point
+					float Time = ScreenToEnvelopeX(View, UI()->MouseX());
+					ColorRGBA Channels;
+					if(in_range(Time, 0.0f, pEnvelope->EndTime()))
+						pEnvelope->Eval(Time, Channels);
+					else
+						Channels = {0, 0, 0, 0};
+
+					int FixedTime = std::round(Time * 1000.0f);
+					bool TimeFound = false;
+					for(CEnvPoint &Point : pEnvelope->m_vPoints)
+					{
+						if(Point.m_Time == FixedTime)
+							TimeFound = true;
+					}
+
+					if(!TimeFound)
+						m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionAddEnvelopePoint>(this, m_SelectedEnvelope, FixedTime, Channels));
+
+					if(FixedTime < 0)
+						RemoveTimeOffsetEnvelope(pEnvelope);
+					m_Map.OnModify();
+				}
+				else if(s_Operation != EEnvelopeEditorOp::OP_BOX_SELECT && !Input()->ModifierIsPressed())
+				{
+					static int s_BoxSelectID = 0;
+					UI()->SetActiveItem(&s_BoxSelectID);
+					s_Operation = EEnvelopeEditorOp::OP_BOX_SELECT;
+					s_MouseXStart = UI()->MouseX();
+					s_MouseYStart = UI()->MouseY();
+				}
+			}
+
+			m_ShowEnvelopePreview = SHOWENV_SELECTED;
+			str_copy(m_aTooltip, "Double-click to create a new point. Use shift to change the zoom axis. Press S to scale selected envelope points.");
+		}
+
+		UpdateZoomEnvelopeX(View);
+		UpdateZoomEnvelopeY(View);
+
+		{
+			float UnitsPerLineY = 0.001f;
+			static const float s_aUnitPerLineOptionsY[] = {0.005f, 0.01f, 0.025f, 0.05f, 0.1f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f, 16.0f, 32.0f, 2 * 32.0f, 5 * 32.0f, 10 * 32.0f, 20 * 32.0f, 50 * 32.0f, 100 * 32.0f};
+			for(float Value : s_aUnitPerLineOptionsY)
+			{
+				if(Value / m_ZoomEnvelopeY.GetValue() * View.h < 40.0f)
+					UnitsPerLineY = Value;
+			}
+			int NumLinesY = m_ZoomEnvelopeY.GetValue() / static_cast<float>(UnitsPerLineY) + 1;
+
+			UI()->ClipEnable(&View);
+			Graphics()->TextureClear();
+			Graphics()->LinesBegin();
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.2f);
+
+			float BaseValue = static_cast<int>(m_OffsetEnvelopeY * m_ZoomEnvelopeY.GetValue() / UnitsPerLineY) * UnitsPerLineY;
+			for(int i = 0; i <= NumLinesY; i++)
+			{
+				float Value = UnitsPerLineY * i - BaseValue;
+				IGraphics::CLineItem LineItem(View.x, EnvelopeToScreenY(View, Value), View.x + View.w, EnvelopeToScreenY(View, Value));
+				Graphics()->LinesDraw(&LineItem, 1);
+			}
+
+			Graphics()->LinesEnd();
+
+			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
+			for(int i = 0; i <= NumLinesY; i++)
+			{
+				float Value = UnitsPerLineY * i - BaseValue;
+				char aValueBuffer[16];
+				if(UnitsPerLineY >= 1.0f)
+				{
+					str_from_int(static_cast<int>(Value), aValueBuffer);
+				}
+				else
+				{
+					str_format(aValueBuffer, sizeof(aValueBuffer), "%.3f", Value);
+				}
+				UI()->TextRender()->Text(View.x, EnvelopeToScreenY(View, Value) + 4.0f, 8.0f, aValueBuffer);
+			}
+			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			UI()->ClipDisable();
+		}
+
+		{
+			using namespace std::chrono_literals;
+			CTimeStep UnitsPerLineX = 1ms;
+			static const CTimeStep s_aUnitPerLineOptionsX[] = {5ms, 10ms, 25ms, 50ms, 100ms, 250ms, 500ms, 1s, 2s, 5s, 10s, 15s, 30s, 1min};
+			for(CTimeStep Value : s_aUnitPerLineOptionsX)
+			{
+				if(Value.AsSeconds() / m_ZoomEnvelopeX.GetValue() * View.w < 160.0f)
+					UnitsPerLineX = Value;
+			}
+			int NumLinesX = m_ZoomEnvelopeX.GetValue() / static_cast<float>(UnitsPerLineX.AsSeconds()) + 1;
+
+			UI()->ClipEnable(&View);
+			Graphics()->TextureClear();
+			Graphics()->LinesBegin();
+			Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.2f);
+
+			CTimeStep BaseValue = UnitsPerLineX * static_cast<int>(m_OffsetEnvelopeX * m_ZoomEnvelopeX.GetValue() / UnitsPerLineX.AsSeconds());
+			for(int i = 0; i <= NumLinesX; i++)
+			{
+				float Value = UnitsPerLineX.AsSeconds() * i - BaseValue.AsSeconds();
+				IGraphics::CLineItem LineItem(EnvelopeToScreenX(View, Value), View.y, EnvelopeToScreenX(View, Value), View.y + View.h);
+				Graphics()->LinesDraw(&LineItem, 1);
+			}
+
+			Graphics()->LinesEnd();
+
+			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.4f);
+			for(int i = 0; i <= NumLinesX; i++)
+			{
+				CTimeStep Value = UnitsPerLineX * i - BaseValue;
+				if(Value.AsSeconds() >= 0)
+				{
+					char aValueBuffer[16];
+					Value.Format(aValueBuffer, sizeof(aValueBuffer));
+
+					UI()->TextRender()->Text(EnvelopeToScreenX(View, Value.AsSeconds()) + 1.0f, View.y + View.h - 8.0f, 8.0f, aValueBuffer);
+				}
+			}
+			UI()->TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+			UI()->ClipDisable();
+		}
+
+		// render tangents for bezier curves
+		{
+			UI()->ClipEnable(&View);
+			Graphics()->TextureClear();
+			Graphics()->LinesBegin();
+			for(int c = 0; c < pEnvelope->GetChannels(); c++)
+			{
+				if(!(s_ActiveChannels & (1 << c)))
+					continue;
+
+				for(int i = 0; i < (int)pEnvelope->m_vPoints.size(); i++)
+				{
+					float PosX = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time));
+					float PosY = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c]));
+
+					// Out-Tangent
+					if(pEnvelope->m_vPoints[i].m_Curvetype == CURVETYPE_BEZIER)
+					{
+						float TangentX = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c]));
+						float TangentY = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c]));
+
+						if(IsTangentOutPointSelected(i, c))
+							Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+						else
+							Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 0.4f);
+
+						IGraphics::CLineItem LineItem(TangentX, TangentY, PosX, PosY);
+						Graphics()->LinesDraw(&LineItem, 1);
+					}
+
+					// In-Tangent
+					if(i > 0 && pEnvelope->m_vPoints[i - 1].m_Curvetype == CURVETYPE_BEZIER)
+					{
+						float TangentX = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c]));
+						float TangentY = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c]));
+
+						if(IsTangentInPointSelected(i, c))
+							Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+						else
+							Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 0.4f);
+
+						IGraphics::CLineItem LineItem(TangentX, TangentY, PosX, PosY);
+						Graphics()->LinesDraw(&LineItem, 1);
+					}
+				}
+			}
+			Graphics()->LinesEnd();
+			UI()->ClipDisable();
+		}
+
+		// render lines
+		{
+			float EndTimeTotal = maximum(0.000001f, pEnvelope->EndTime());
+			float EndX = clamp(EnvelopeToScreenX(View, EndTimeTotal), View.x, View.x + View.w);
+			float StartX = clamp(View.x + View.w * m_OffsetEnvelopeX, View.x, View.x + View.w);
+
+			float EndTime = ScreenToEnvelopeX(View, EndX);
+			float StartTime = ScreenToEnvelopeX(View, StartX);
+
+			UI()->ClipEnable(&View);
+			Graphics()->TextureClear();
+			Graphics()->LinesBegin();
+			for(int c = 0; c < pEnvelope->GetChannels(); c++)
+			{
+				if(s_ActiveChannels & (1 << c))
+					Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1);
+				else
+					Graphics()->SetColor(aColors[c].r * 0.5f, aColors[c].g * 0.5f, aColors[c].b * 0.5f, 1);
+
+				int Steps = static_cast<int>(((EndX - StartX) / UI()->Screen()->w) * Graphics()->ScreenWidth());
+				float StepTime = (EndTime - StartTime) / static_cast<float>(Steps);
+				float StepSize = (EndX - StartX) / static_cast<float>(Steps);
+
+				ColorRGBA Channels;
+				pEnvelope->Eval(StartTime + StepTime, Channels);
+				float PrevY = EnvelopeToScreenY(View, Channels[c]);
+				for(int i = 2; i < Steps; i++)
+				{
+					pEnvelope->Eval(StartTime + i * StepTime, Channels);
+					float CurrentY = EnvelopeToScreenY(View, Channels[c]);
+
+					IGraphics::CLineItem LineItem(
+						StartX + (i - 1) * StepSize,
+						PrevY,
+						StartX + i * StepSize,
+						CurrentY);
+					Graphics()->LinesDraw(&LineItem, 1);
+
+					PrevY = CurrentY;
+				}
+			}
+			Graphics()->LinesEnd();
+			UI()->ClipDisable();
+		}
+
+		// render curve options
+		{
+			for(int i = 0; i < (int)pEnvelope->m_vPoints.size() - 1; i++)
+			{
+				float t0 = fxt2f(pEnvelope->m_vPoints[i].m_Time);
+				float t1 = fxt2f(pEnvelope->m_vPoints[i + 1].m_Time);
+
+				CUIRect CurveButton;
+				CurveButton.x = EnvelopeToScreenX(View, t0 + (t1 - t0) * 0.5f);
+				CurveButton.y = CurveBar.y;
+				CurveButton.h = CurveBar.h;
+				CurveButton.w = CurveBar.h;
+				CurveButton.x -= CurveButton.w / 2.0f;
+				const void *pID = &pEnvelope->m_vPoints[i].m_Curvetype;
+				const char *apTypeName[] = {"N", "L", "S", "F", "M", "B"};
+				const char *pTypeName = "!?";
+				if(0 <= pEnvelope->m_vPoints[i].m_Curvetype && pEnvelope->m_vPoints[i].m_Curvetype < (int)std::size(apTypeName))
+					pTypeName = apTypeName[pEnvelope->m_vPoints[i].m_Curvetype];
+
+				if(CurveButton.x >= View.x)
+				{
+					if(DoButton_Editor(pID, pTypeName, 0, &CurveButton, 0, "Switch curve type (N = step, L = linear, S = slow, F = fast, M = smooth, B = bezier)"))
+					{
+						int PrevCurve = pEnvelope->m_vPoints[i].m_Curvetype;
+						pEnvelope->m_vPoints[i].m_Curvetype = (pEnvelope->m_vPoints[i].m_Curvetype + 1) % NUM_CURVETYPES;
+
+						m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionEnvelopeEditPoint>(this,
+							m_SelectedEnvelope, i, 0, CEditorActionEnvelopeEditPoint::EEditType::CURVE_TYPE, PrevCurve, pEnvelope->m_vPoints[i].m_Curvetype));
+						m_Map.OnModify();
+					}
+				}
+			}
+		}
+
+		// render colorbar
+		if(ShowColorBar)
+		{
+			UI()->ClipEnable(&ColorBar);
+
+			float StartX = maximum(EnvelopeToScreenX(View, 0), ColorBar.x);
+			float EndX = EnvelopeToScreenX(View, pEnvelope->EndTime());
+			CUIRect BackgroundView{
+				StartX,
+				ColorBar.y,
+				minimum(EndX - StartX, ColorBar.x + ColorBar.w - StartX),
+				ColorBar.h};
+			RenderBackground(BackgroundView, m_CheckerTexture, 16.0f, 1.0f);
+
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			for(int i = 0; i < (int)pEnvelope->m_vPoints.size() - 1; i++)
+			{
+				float r0 = fx2f(pEnvelope->m_vPoints[i].m_aValues[0]);
+				float g0 = fx2f(pEnvelope->m_vPoints[i].m_aValues[1]);
+				float b0 = fx2f(pEnvelope->m_vPoints[i].m_aValues[2]);
+				float a0 = fx2f(pEnvelope->m_vPoints[i].m_aValues[3]);
+				float r1 = fx2f(pEnvelope->m_vPoints[i + 1].m_aValues[0]);
+				float g1 = fx2f(pEnvelope->m_vPoints[i + 1].m_aValues[1]);
+				float b1 = fx2f(pEnvelope->m_vPoints[i + 1].m_aValues[2]);
+				float a1 = fx2f(pEnvelope->m_vPoints[i + 1].m_aValues[3]);
+
+				IGraphics::CColorVertex Array[4] = {IGraphics::CColorVertex(0, r0, g0, b0, a0),
+					IGraphics::CColorVertex(1, r1, g1, b1, a1),
+					IGraphics::CColorVertex(2, r1, g1, b1, a1),
+					IGraphics::CColorVertex(3, r0, g0, b0, a0)};
+				Graphics()->SetColorVertex(Array, 4);
+
+				float x0 = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time));
+				float x1 = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i + 1].m_Time));
+
+				IGraphics::CQuadItem QuadItem(x0, ColorBar.y, x1 - x0, ColorBar.h);
+				Graphics()->QuadsDrawTL(&QuadItem, 1);
+			}
+			Graphics()->QuadsEnd();
+			UI()->ClipDisable();
+		}
+
+		// render handles
+		if(CurrentEnvelopeSwitched)
+		{
+			DeselectEnvPoints();
+			m_ResetZoomEnvelope = true;
+		}
+
+		{
+			static SPopupMenuId s_PopupEnvPointId;
+			const auto &&ShowPopupEnvPoint = [&]() {
+				UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56 + (pEnvelope->GetChannels() == 4 ? 16.0f : 0.0f), this, PopupEnvPoint);
+			};
+
+			if(s_Operation == EEnvelopeEditorOp::OP_NONE)
+			{
+				SetHotEnvelopePoint(View, pEnvelope, s_ActiveChannels);
+				if(!UI()->MouseButton(0))
+					m_EnvOpTracker.Stop(false);
+			}
+			else
+			{
+				m_EnvOpTracker.Begin(s_Operation);
+			}
+
+			UI()->ClipEnable(&View);
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			for(int c = 0; c < pEnvelope->GetChannels(); c++)
+			{
+				if(!(s_ActiveChannels & (1 << c)))
+					continue;
+
+				for(int i = 0; i < (int)pEnvelope->m_vPoints.size(); i++)
+				{
+					// point handle
+					{
+						CUIRect Final;
+						Final.x = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time));
+						Final.y = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c]));
+						Final.x -= 2.0f;
+						Final.y -= 2.0f;
+						Final.w = 4.0f;
+						Final.h = 4.0f;
+
+						const void *pID = &pEnvelope->m_vPoints[i].m_aValues[c];
+
+						if(IsEnvPointSelected(i, c))
+						{
+							Graphics()->SetColor(1, 1, 1, 1);
+							CUIRect Background = {
+								Final.x - 0.2f * Final.w,
+								Final.y - 0.2f * Final.h,
+								Final.w * 1.4f,
+								Final.h * 1.4f};
+							IGraphics::CQuadItem QuadItem(Background.x, Background.y, Background.w, Background.h);
+							Graphics()->QuadsDrawTL(&QuadItem, 1);
+						}
+
+						if(UI()->CheckActiveItem(pID))
+						{
+							m_ShowEnvelopePreview = SHOWENV_SELECTED;
+
+							if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+							{
+								float dx = s_MouseXStart - UI()->MouseX();
+								float dy = s_MouseYStart - UI()->MouseY();
+
+								if(dx * dx + dy * dy > 20.0f)
+								{
+									s_Operation = EEnvelopeEditorOp::OP_DRAG_POINT;
+
+									if(!IsEnvPointSelected(i, c))
+										SelectEnvPoint(i, c);
+								}
+							}
+
+							if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT || s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT_X || s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT_Y)
+							{
+								if(Input()->ShiftIsPressed())
+								{
+									if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT || s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT_Y)
+									{
+										s_Operation = EEnvelopeEditorOp::OP_DRAG_POINT_X;
+										s_vAccurateDragValuesX.clear();
+										for(auto [SelectedIndex, _] : m_vSelectedEnvelopePoints)
+											s_vAccurateDragValuesX.push_back(pEnvelope->m_vPoints[SelectedIndex].m_Time);
+									}
+									else
+									{
+										float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+
+										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+										{
+											int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+											int BoundLow = f2fxt(ScreenToEnvelopeX(View, View.x));
+											int BoundHigh = f2fxt(ScreenToEnvelopeX(View, View.x + View.w));
+											for(int j = 0; j < SelectedIndex; j++)
+											{
+												if(!IsEnvPointSelected(j))
+													BoundLow = maximum(pEnvelope->m_vPoints[j].m_Time + 1, BoundLow);
+											}
+											for(int j = SelectedIndex + 1; j < (int)pEnvelope->m_vPoints.size(); j++)
+											{
+												if(!IsEnvPointSelected(j))
+													BoundHigh = minimum(pEnvelope->m_vPoints[j].m_Time - 1, BoundHigh);
+											}
+
+											DeltaX = ClampDelta(s_vAccurateDragValuesX[k], DeltaX, BoundLow, BoundHigh);
+										}
+										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+										{
+											int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+											s_vAccurateDragValuesX[k] += DeltaX;
+											pEnvelope->m_vPoints[SelectedIndex].m_Time = std::round(s_vAccurateDragValuesX[k]);
+										}
+										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+										{
+											int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+											if(SelectedIndex == 0 && pEnvelope->m_vPoints[SelectedIndex].m_Time != 0)
+											{
+												RemoveTimeOffsetEnvelope(pEnvelope);
+												float Offset = s_vAccurateDragValuesX[k];
+												for(auto &Value : s_vAccurateDragValuesX)
+													Value -= Offset;
+												break;
+											}
+										}
+									}
+								}
+								else
+								{
+									if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT || s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT_X)
+									{
+										s_Operation = EEnvelopeEditorOp::OP_DRAG_POINT_Y;
+										s_vAccurateDragValuesY.clear();
+										for(auto [SelectedIndex, SelectedChannel] : m_vSelectedEnvelopePoints)
+											s_vAccurateDragValuesY.push_back(pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel]);
+									}
+									else
+									{
+										float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+										for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+										{
+											auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints[k];
+											s_vAccurateDragValuesY[k] -= DeltaY;
+											pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] = std::round(s_vAccurateDragValuesY[k]);
+
+											if(pEnvelope->GetChannels() == 1 || pEnvelope->GetChannels() == 4)
+											{
+												pEnvelope->m_vPoints[i].m_aValues[c] = clamp(pEnvelope->m_vPoints[i].m_aValues[c], 0, 1024);
+												s_vAccurateDragValuesY[k] = clamp<float>(s_vAccurateDragValuesY[k], 0, 1024);
+											}
+										}
+									}
+								}
+							}
+
+							if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
+							{
+								if(!UI()->MouseButton(1))
+								{
+									if(m_vSelectedEnvelopePoints.size() == 1)
+									{
+										m_UpdateEnvPointInfo = true;
+										ShowPopupEnvPoint();
+									}
+									else if(m_vSelectedEnvelopePoints.size() > 1)
+									{
+										static SPopupMenuId s_PopupEnvPointMultiId;
+										UI()->DoPopupMenu(&s_PopupEnvPointMultiId, UI()->MouseX(), UI()->MouseY(), 80, 22, this, PopupEnvPointMulti);
+									}
+									UI()->SetActiveItem(nullptr);
+									s_Operation = EEnvelopeEditorOp::OP_NONE;
+								}
+							}
+							else if(!UI()->MouseButton(0))
+							{
+								UI()->SetActiveItem(nullptr);
+								m_SelectedQuadEnvelope = -1;
+
+								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+								{
+									if(Input()->ShiftIsPressed())
+										ToggleEnvPoint(i, c);
+									else
+										SelectEnvPoint(i, c);
+								}
+
+								s_Operation = EEnvelopeEditorOp::OP_NONE;
+								m_Map.OnModify();
+							}
+
+							Graphics()->SetColor(1, 1, 1, 1);
+						}
+						else if(UI()->HotItem() == pID)
+						{
+							if(UI()->MouseButton(0))
+							{
+								UI()->SetActiveItem(pID);
+								s_Operation = EEnvelopeEditorOp::OP_SELECT;
+								m_SelectedQuadEnvelope = m_SelectedEnvelope;
+
+								s_MouseXStart = UI()->MouseX();
+								s_MouseYStart = UI()->MouseY();
+							}
+							else if(UI()->MouseButtonClicked(1))
+							{
+								if(Input()->ShiftIsPressed())
+								{
+									m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionDeleteEnvelopePoint>(this, m_SelectedEnvelope, i));
+								}
+								else
+								{
+									s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
+									if(!IsEnvPointSelected(i, c))
+										SelectEnvPoint(i, c);
+									UI()->SetActiveItem(pID);
+								}
+							}
+
+							m_ShowEnvelopePreview = SHOWENV_SELECTED;
+							Graphics()->SetColor(1, 1, 1, 1);
+							str_copy(m_aTooltip, "Envelope point. Left mouse to drag. Hold ctrl to be more precise. Hold shift to alter time. Shift + right-click to delete.");
+							ms_pUiGotContext = pID;
+						}
+						else
+							Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
+
+						IGraphics::CQuadItem QuadItem(Final.x, Final.y, Final.w, Final.h);
+						Graphics()->QuadsDrawTL(&QuadItem, 1);
+					}
+
+					// tangent handles for bezier curves
+					if(i >= 0 && i < (int)pEnvelope->m_vPoints.size())
+					{
+						// Out-Tangent handle
+						if(pEnvelope->m_vPoints[i].m_Curvetype == CURVETYPE_BEZIER)
+						{
+							CUIRect Final;
+							Final.x = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c]));
+							Final.y = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c]));
+							Final.x -= 2.0f;
+							Final.y -= 2.0f;
+							Final.w = 4.0f;
+							Final.h = 4.0f;
+
+							// handle logic
+							const void *pID = &pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c];
+
+							if(IsTangentOutPointSelected(i, c))
+							{
+								Graphics()->SetColor(1, 1, 1, 1);
+								IGraphics::CFreeformItem FreeformItem(
+									Final.x + Final.w / 2.0f,
+									Final.y - 1,
+									Final.x + Final.w / 2.0f,
+									Final.y - 1,
+									Final.x + Final.w + 1,
+									Final.y + Final.h + 1,
+									Final.x - 1,
+									Final.y + Final.h + 1);
+								Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
+							}
+
+							if(UI()->CheckActiveItem(pID))
+							{
+								m_ShowEnvelopePreview = SHOWENV_SELECTED;
+
+								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+								{
+									float dx = s_MouseXStart - UI()->MouseX();
+									float dy = s_MouseYStart - UI()->MouseY();
+
+									if(dx * dx + dy * dy > 20.0f)
+									{
+										s_Operation = EEnvelopeEditorOp::OP_DRAG_POINT;
+
+										s_vAccurateDragValuesX = {static_cast<float>(pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c])};
+										s_vAccurateDragValuesY = {static_cast<float>(pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c])};
+
+										if(!IsTangentOutPointSelected(i, c))
+											SelectTangentOutPoint(i, c);
+									}
+								}
+
+								if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT)
+								{
+									float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+									float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+									s_vAccurateDragValuesX[0] += DeltaX;
+									s_vAccurateDragValuesY[0] -= DeltaY;
+
+									pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c] = std::round(s_vAccurateDragValuesX[0]);
+									pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c] = std::round(s_vAccurateDragValuesY[0]);
+
+									// clamp time value
+									pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c] = clamp<int>(pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c], 0, f2fxt(ScreenToEnvelopeX(View, View.x + View.w)) - pEnvelope->m_vPoints[i].m_Time);
+									s_vAccurateDragValuesX[0] = clamp<float>(s_vAccurateDragValuesX[0], 0, f2fxt(ScreenToEnvelopeX(View, View.x + View.w)) - pEnvelope->m_vPoints[i].m_Time);
+								}
+
+								if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
+								{
+									if(!UI()->MouseButton(1))
+									{
+										if(IsTangentOutPointSelected(i, c))
+										{
+											m_UpdateEnvPointInfo = true;
+											ShowPopupEnvPoint();
+										}
+										UI()->SetActiveItem(nullptr);
+									}
+								}
+								else if(!UI()->MouseButton(0))
+								{
+									UI()->SetActiveItem(nullptr);
+									m_SelectedQuadEnvelope = -1;
+
+									if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+										SelectTangentOutPoint(i, c);
+
+									s_Operation = EEnvelopeEditorOp::OP_NONE;
+									m_Map.OnModify();
+								}
+
+								Graphics()->SetColor(1, 1, 1, 1);
+							}
+							else if(UI()->HotItem() == pID)
+							{
+								if(UI()->MouseButton(0))
+								{
+									UI()->SetActiveItem(pID);
+									s_Operation = EEnvelopeEditorOp::OP_SELECT;
+									m_SelectedQuadEnvelope = m_SelectedEnvelope;
+
+									s_MouseXStart = UI()->MouseX();
+									s_MouseYStart = UI()->MouseY();
+								}
+								else if(UI()->MouseButtonClicked(1))
+								{
+									if(Input()->ShiftIsPressed())
+									{
+										SelectTangentOutPoint(i, c);
+										pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaX[c] = 0.0f;
+										pEnvelope->m_vPoints[i].m_Bezier.m_aOutTangentDeltaY[c] = 0.0f;
+										m_Map.OnModify();
+									}
+									else
+									{
+										s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
+										SelectTangentOutPoint(i, c);
+										UI()->SetActiveItem(pID);
+									}
+								}
+
+								m_ShowEnvelopePreview = SHOWENV_SELECTED;
+								Graphics()->SetColor(1, 1, 1, 1);
+								str_copy(m_aTooltip, "Bezier out-tangent. Left mouse to drag. Hold ctrl to be more precise. Shift + right-click to reset.");
+								ms_pUiGotContext = pID;
+							}
+							else
+								Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
+
+							// draw triangle
+							IGraphics::CFreeformItem FreeformItem(Final.x + Final.w / 2.0f, Final.y, Final.x + Final.w / 2.0f, Final.y, Final.x + Final.w, Final.y + Final.h, Final.x, Final.y + Final.h);
+							Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
+						}
+
+						// In-Tangent handle
+						if(i > 0 && pEnvelope->m_vPoints[i - 1].m_Curvetype == CURVETYPE_BEZIER)
+						{
+							CUIRect Final;
+							Final.x = EnvelopeToScreenX(View, fxt2f(pEnvelope->m_vPoints[i].m_Time + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c]));
+							Final.y = EnvelopeToScreenY(View, fx2f(pEnvelope->m_vPoints[i].m_aValues[c] + pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c]));
+							Final.x -= 2.0f;
+							Final.y -= 2.0f;
+							Final.w = 4.0f;
+							Final.h = 4.0f;
+
+							// handle logic
+							const void *pID = &pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c];
+
+							if(IsTangentInPointSelected(i, c))
+							{
+								Graphics()->SetColor(1, 1, 1, 1);
+								IGraphics::CFreeformItem FreeformItem(
+									Final.x + Final.w / 2.0f,
+									Final.y - 1,
+									Final.x + Final.w / 2.0f,
+									Final.y - 1,
+									Final.x + Final.w + 1,
+									Final.y + Final.h + 1,
+									Final.x - 1,
+									Final.y + Final.h + 1);
+								Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
+							}
+
+							if(UI()->CheckActiveItem(pID))
+							{
+								m_ShowEnvelopePreview = SHOWENV_SELECTED;
+
+								if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+								{
+									float dx = s_MouseXStart - UI()->MouseX();
+									float dy = s_MouseYStart - UI()->MouseY();
+
+									if(dx * dx + dy * dy > 20.0f)
+									{
+										s_Operation = EEnvelopeEditorOp::OP_DRAG_POINT;
+
+										s_vAccurateDragValuesX = {static_cast<float>(pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c])};
+										s_vAccurateDragValuesY = {static_cast<float>(pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c])};
+
+										if(!IsTangentInPointSelected(i, c))
+											SelectTangentInPoint(i, c);
+									}
+								}
+
+								if(s_Operation == EEnvelopeEditorOp::OP_DRAG_POINT)
+								{
+									float DeltaX = ScreenToEnvelopeDX(View, UI()->MouseDeltaX()) * (Input()->ModifierIsPressed() ? 50.0f : 1000.0f);
+									float DeltaY = ScreenToEnvelopeDY(View, UI()->MouseDeltaY()) * (Input()->ModifierIsPressed() ? 51.2f : 1024.0f);
+									s_vAccurateDragValuesX[0] += DeltaX;
+									s_vAccurateDragValuesY[0] -= DeltaY;
+
+									pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c] = std::round(s_vAccurateDragValuesX[0]);
+									pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c] = std::round(s_vAccurateDragValuesY[0]);
+
+									// clamp time value
+									pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c] = clamp(pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c], f2fxt(ScreenToEnvelopeX(View, View.x)) - pEnvelope->m_vPoints[i].m_Time, 0);
+									s_vAccurateDragValuesX[0] = clamp<float>(s_vAccurateDragValuesX[0], f2fxt(ScreenToEnvelopeX(View, View.x)) - pEnvelope->m_vPoints[i].m_Time, 0);
+								}
+
+								if(s_Operation == EEnvelopeEditorOp::OP_CONTEXT_MENU)
+								{
+									if(!UI()->MouseButton(1))
+									{
+										if(IsTangentInPointSelected(i, c))
+										{
+											m_UpdateEnvPointInfo = true;
+											ShowPopupEnvPoint();
+										}
+										UI()->SetActiveItem(nullptr);
+									}
+								}
+								else if(!UI()->MouseButton(0))
+								{
+									UI()->SetActiveItem(nullptr);
+									m_SelectedQuadEnvelope = -1;
+
+									if(s_Operation == EEnvelopeEditorOp::OP_SELECT)
+										SelectTangentInPoint(i, c);
+
+									s_Operation = EEnvelopeEditorOp::OP_NONE;
+									m_Map.OnModify();
+								}
+
+								Graphics()->SetColor(1, 1, 1, 1);
+							}
+							else if(UI()->HotItem() == pID)
+							{
+								if(UI()->MouseButton(0))
+								{
+									UI()->SetActiveItem(pID);
+									s_Operation = EEnvelopeEditorOp::OP_SELECT;
+									m_SelectedQuadEnvelope = m_SelectedEnvelope;
+
+									s_MouseXStart = UI()->MouseX();
+									s_MouseYStart = UI()->MouseY();
+								}
+								else if(UI()->MouseButtonClicked(1))
+								{
+									if(Input()->ShiftIsPressed())
+									{
+										SelectTangentInPoint(i, c);
+										pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaX[c] = 0.0f;
+										pEnvelope->m_vPoints[i].m_Bezier.m_aInTangentDeltaY[c] = 0.0f;
+										m_Map.OnModify();
+									}
+									else
+									{
+										s_Operation = EEnvelopeEditorOp::OP_CONTEXT_MENU;
+										SelectTangentInPoint(i, c);
+										UI()->SetActiveItem(pID);
+									}
+								}
+
+								m_ShowEnvelopePreview = SHOWENV_SELECTED;
+								Graphics()->SetColor(1, 1, 1, 1);
+								str_copy(m_aTooltip, "Bezier in-tangent. Left mouse to drag. Hold ctrl to be more precise. Shift + right-click to reset.");
+								ms_pUiGotContext = pID;
+							}
+							else
+								Graphics()->SetColor(aColors[c].r, aColors[c].g, aColors[c].b, 1.0f);
+
+							// draw triangle
+							IGraphics::CFreeformItem FreeformItem(Final.x + Final.w / 2.0f, Final.y, Final.x + Final.w / 2.0f, Final.y, Final.x + Final.w, Final.y + Final.h, Final.x, Final.y + Final.h);
+							Graphics()->QuadsDrawFreeform(&FreeformItem, 1);
+						}
+					}
+				}
+			}
+			Graphics()->QuadsEnd();
+			UI()->ClipDisable();
+		}
+
+		// handle scaling
+		static float s_ScaleFactorX = 1.0f;
+		static float s_ScaleFactorY = 1.0f;
+		static float s_MidpointX = 0.0f;
+		static float s_MidpointY = 0.0f;
+		static std::vector<float> s_vInitialPositionsX;
+		static std::vector<float> s_vInitialPositionsY;
+		if(s_Operation == EEnvelopeEditorOp::OP_NONE && !s_NameInput.IsActive() && Input()->KeyIsPressed(KEY_S) && !Input()->ModifierIsPressed() && !m_vSelectedEnvelopePoints.empty())
+		{
+			s_Operation = EEnvelopeEditorOp::OP_SCALE;
+			s_ScaleFactorX = 1.0f;
+			s_ScaleFactorY = 1.0f;
+			auto [FirstPointIndex, FirstPointChannel] = m_vSelectedEnvelopePoints.front();
+
+			float MaximumX = pEnvelope->m_vPoints[FirstPointIndex].m_Time;
+			float MinimumX = MaximumX;
+			s_vInitialPositionsX.clear();
+			for(auto [SelectedIndex, _] : m_vSelectedEnvelopePoints)
+			{
+				float Value = pEnvelope->m_vPoints[SelectedIndex].m_Time;
+				s_vInitialPositionsX.push_back(Value);
+				MaximumX = maximum(MaximumX, Value);
+				MinimumX = minimum(MinimumX, Value);
+			}
+			s_MidpointX = (MaximumX - MinimumX) / 2.0f + MinimumX;
+
+			float MaximumY = pEnvelope->m_vPoints[FirstPointIndex].m_aValues[FirstPointChannel];
+			float MinimumY = MaximumY;
+			s_vInitialPositionsY.clear();
+			for(auto [SelectedIndex, SelectedChannel] : m_vSelectedEnvelopePoints)
+			{
+				float Value = pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel];
+				s_vInitialPositionsY.push_back(Value);
+				MaximumY = maximum(MaximumY, Value);
+				MinimumY = minimum(MinimumY, Value);
+			}
+			s_MidpointY = (MaximumY - MinimumY) / 2.0f + MinimumY;
+		}
+
+		if(s_Operation == EEnvelopeEditorOp::OP_SCALE)
+		{
+			str_copy(m_aTooltip, "Press shift to scale the time. Press alt to scale along midpoint. Press ctrl to be more precise.");
+
+			if(Input()->ShiftIsPressed())
+			{
+				s_ScaleFactorX += UI()->MouseDeltaX() / Graphics()->ScreenWidth() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
+				float Midpoint = Input()->AltIsPressed() ? s_MidpointX : 0.0f;
+				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+				{
+					int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+					int BoundLow = f2fxt(ScreenToEnvelopeX(View, View.x));
+					int BoundHigh = f2fxt(ScreenToEnvelopeX(View, View.x + View.w));
+					for(int j = 0; j < SelectedIndex; j++)
+					{
+						if(!IsEnvPointSelected(j))
+							BoundLow = maximum(pEnvelope->m_vPoints[j].m_Time + 1, BoundLow);
+					}
+					for(int j = SelectedIndex + 1; j < (int)pEnvelope->m_vPoints.size(); j++)
+					{
+						if(!IsEnvPointSelected(j))
+							BoundHigh = minimum(pEnvelope->m_vPoints[j].m_Time - 1, BoundHigh);
+					}
+
+					float Value = s_vInitialPositionsX[k];
+					float ScaleBoundLow = (BoundLow - Midpoint) / (Value - Midpoint);
+					float ScaleBoundHigh = (BoundHigh - Midpoint) / (Value - Midpoint);
+					float ScaleBoundMin = minimum(ScaleBoundLow, ScaleBoundHigh);
+					float ScaleBoundMax = maximum(ScaleBoundLow, ScaleBoundHigh);
+					s_ScaleFactorX = clamp(s_ScaleFactorX, ScaleBoundMin, ScaleBoundMax);
+				}
+
+				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+				{
+					int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+					float ScaleMinimum = s_vInitialPositionsX[k] - Midpoint > fxt2f(1) ? fxt2f(1) / (s_vInitialPositionsX[k] - Midpoint) : 0.0f;
+					float ScaleFactor = maximum(ScaleMinimum, s_ScaleFactorX);
+					pEnvelope->m_vPoints[SelectedIndex].m_Time = std::round((s_vInitialPositionsX[k] - Midpoint) * ScaleFactor + Midpoint);
+				}
+				for(size_t k = 1; k < pEnvelope->m_vPoints.size(); k++)
+				{
+					if(pEnvelope->m_vPoints[k].m_Time <= pEnvelope->m_vPoints[k - 1].m_Time)
+						pEnvelope->m_vPoints[k].m_Time = pEnvelope->m_vPoints[k - 1].m_Time + 1;
+				}
+				for(auto [SelectedIndex, _] : m_vSelectedEnvelopePoints)
+				{
+					if(SelectedIndex == 0 && pEnvelope->m_vPoints[SelectedIndex].m_Time != 0)
+					{
+						float Offset = pEnvelope->m_vPoints[0].m_Time;
+						RemoveTimeOffsetEnvelope(pEnvelope);
+						s_MidpointX -= Offset;
+						for(auto &Value : s_vInitialPositionsX)
+							Value -= Offset;
+						break;
+					}
+				}
+			}
+			else
+			{
+				s_ScaleFactorY -= UI()->MouseDeltaY() / Graphics()->ScreenHeight() * (Input()->ModifierIsPressed() ? 0.5f : 10.0f);
+				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+				{
+					auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints[k];
+					if(Input()->AltIsPressed())
+						pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] = std::round((s_vInitialPositionsY[k] - s_MidpointY) * s_ScaleFactorY + s_MidpointY);
+					else
+						pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] = std::round(s_vInitialPositionsY[k] * s_ScaleFactorY);
+
+					if(pEnvelope->GetChannels() == 1 || pEnvelope->GetChannels() == 4)
+						pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] = clamp(pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel], 0, 1024);
+				}
+			}
+
+			if(UI()->MouseButton(0))
+			{
+				s_Operation = EEnvelopeEditorOp::OP_NONE;
+				m_EnvOpTracker.Stop(false);
+			}
+			else if(UI()->MouseButton(1) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			{
+				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+				{
+					int SelectedIndex = m_vSelectedEnvelopePoints[k].first;
+					pEnvelope->m_vPoints[SelectedIndex].m_Time = std::round(s_vInitialPositionsX[k]);
+				}
+				for(size_t k = 0; k < m_vSelectedEnvelopePoints.size(); k++)
+				{
+					auto [SelectedIndex, SelectedChannel] = m_vSelectedEnvelopePoints[k];
+					pEnvelope->m_vPoints[SelectedIndex].m_aValues[SelectedChannel] = std::round(s_vInitialPositionsY[k]);
+				}
+				RemoveTimeOffsetEnvelope(pEnvelope);
+				s_Operation = EEnvelopeEditorOp::OP_NONE;
+			}
+		}
+
+		// handle box selection
+		if(s_Operation == EEnvelopeEditorOp::OP_BOX_SELECT)
+		{
+			IGraphics::CLineItem aLines[4] = {
+				{s_MouseXStart, s_MouseYStart, UI()->MouseX(), s_MouseYStart},
+				{s_MouseXStart, s_MouseYStart, s_MouseXStart, UI()->MouseY()},
+				{s_MouseXStart, UI()->MouseY(), UI()->MouseX(), UI()->MouseY()},
+				{UI()->MouseX(), s_MouseYStart, UI()->MouseX(), UI()->MouseY()}};
+			UI()->ClipEnable(&View);
+			Graphics()->LinesBegin();
+			Graphics()->LinesDraw(aLines, std::size(aLines));
+			Graphics()->LinesEnd();
+			UI()->ClipDisable();
+
+			if(!UI()->MouseButton(0))
+			{
+				s_Operation = EEnvelopeEditorOp::OP_NONE;
+				UI()->SetActiveItem(nullptr);
+
+				float TimeStart = ScreenToEnvelopeX(View, s_MouseXStart);
+				float TimeEnd = ScreenToEnvelopeX(View, UI()->MouseX());
+				float ValueStart = ScreenToEnvelopeY(View, s_MouseYStart);
+				float ValueEnd = ScreenToEnvelopeY(View, UI()->MouseY());
+
+				float TimeMin = minimum(TimeStart, TimeEnd);
+				float TimeMax = maximum(TimeStart, TimeEnd);
+				float ValueMin = minimum(ValueStart, ValueEnd);
+				float ValueMax = maximum(ValueStart, ValueEnd);
+
+				if(!Input()->ShiftIsPressed())
+					DeselectEnvPoints();
+
+				for(int i = 0; i < (int)pEnvelope->m_vPoints.size(); i++)
+				{
+					for(int c = 0; c < CEnvPoint::MAX_CHANNELS; c++)
+					{
+						if(!(s_ActiveChannels & (1 << c)))
+							continue;
+
+						float Time = fxt2f(pEnvelope->m_vPoints[i].m_Time);
+						float Value = fx2f(pEnvelope->m_vPoints[i].m_aValues[c]);
+
+						if(in_range(Time, TimeMin, TimeMax) && in_range(Value, ValueMin, ValueMax))
+							ToggleEnvPoint(i, c);
+					}
+				}
+			}
+		}
+	}
+}
+
+void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast)
+{
+	// TODO: improve validation (https://github.com/ddnet/ddnet/issues/1406)
+	// Returns true if the argument is a valid server setting
+	const auto &&ValidateServerSetting = [](const char *pStr) {
+		return str_find(pStr, " ") != nullptr;
+	};
+
+	static int s_CommandSelectedIndex = -1;
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(m_Dialog == DIALOG_NONE && !UI()->IsPopupOpen());
+
+	bool GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
+	const bool CurrentInputValid = ValidateServerSetting(m_SettingsCommandInput.GetString());
+
+	CUIRect ToolBar, Button, Label, List, DragBar;
+	View.HSplitTop(22.0f, &DragBar, nullptr);
+	DragBar.y -= 2.0f;
+	DragBar.w += 2.0f;
+	DragBar.h += 4.0f;
+	RenderExtraEditorDragBar(View, DragBar);
+	View.HSplitTop(20.0f, &ToolBar, &View);
+	View.HSplitTop(2.0f, nullptr, &List);
+	ToolBar.HMargin(2.0f, &ToolBar);
+
+	// delete button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	static int s_DeleteButton = 0;
+	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, GotSelection ? 0 : -1, &Button, 0, "[Delete] Delete the selected command from the command list.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+
+		m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
+		if(s_CommandSelectedIndex >= (int)m_Map.m_vSettings.size())
+			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
+		if(s_CommandSelectedIndex >= 0)
+			m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// move down button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	const bool CanMoveDown = GotSelection && s_CommandSelectedIndex < (int)m_Map.m_vSettings.size() - 1;
+	static int s_DownButton = 0;
+	if(DoButton_FontIcon(&s_DownButton, FONT_ICON_SORT_DOWN, CanMoveDown ? 0 : -1, &Button, 0, "[Alt+Down] Move the selected command down.", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_DOWN)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_DOWN, &s_CommandSelectedIndex, s_CommandSelectedIndex));
+
+		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex + 1]);
+		s_CommandSelectedIndex++;
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// move up button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	const bool CanMoveUp = GotSelection && s_CommandSelectedIndex > 0;
+	static int s_UpButton = 0;
+	if(DoButton_FontIcon(&s_UpButton, FONT_ICON_SORT_UP, CanMoveUp ? 0 : -1, &Button, 0, "[Alt+Up] Move the selected command up.", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_UP)))
+	{
+		m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::MOVE_UP, &s_CommandSelectedIndex, s_CommandSelectedIndex));
+
+		std::swap(m_Map.m_vSettings[s_CommandSelectedIndex], m_Map.m_vSettings[s_CommandSelectedIndex - 1]);
+		s_CommandSelectedIndex--;
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+	}
+
+	// redo button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	static int s_RedoButton = 0;
+	if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_ServerSettingsHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo command edit", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_DOWN)))
+	{
+		m_ServerSettingsHistory.Redo();
+	}
+
+	// undo button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	static int s_UndoButton = 0;
+	if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_ServerSettingsHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo command edit", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && UI()->ConsumeHotkey(CUI::HOTKEY_UP)))
+	{
+		m_ServerSettingsHistory.Undo();
+	}
+
+	GotSelection = s_ListBox.Active() && s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex < m_Map.m_vSettings.size();
+
+	// update button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	const bool CanUpdate = GotSelection && CurrentInputValid && str_comp(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, m_SettingsCommandInput.GetString()) != 0;
+	static int s_UpdateButton = 0;
+	if(DoButton_FontIcon(&s_UpdateButton, FONT_ICON_PENCIL, CanUpdate ? 0 : -1, &Button, 0, "[Alt+Enter] Update the selected command based on the entered value.", IGraphics::CORNER_R, 9.0f) == 1 || (CanUpdate && Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		bool Found = false;
+		int i;
+		for(i = 0; i < (int)m_Map.m_vSettings.size(); ++i)
+		{
+			if(i != s_CommandSelectedIndex && !str_comp(m_Map.m_vSettings[i].m_aCommand, m_SettingsCommandInput.GetString()))
+			{
+				Found = true;
+				break;
+			}
+		}
+		if(Found)
+		{
+			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::DELETE, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+			m_Map.m_vSettings.erase(m_Map.m_vSettings.begin() + s_CommandSelectedIndex);
+			s_CommandSelectedIndex = i > s_CommandSelectedIndex ? i - 1 : i;
+		}
+		else
+		{
+			const char *pStr = m_SettingsCommandInput.GetString();
+			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::EDIT, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr));
+			str_copy(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand, pStr);
+		}
+		m_Map.OnModify();
+		s_ListBox.ScrollToSelected();
+		UI()->SetActiveItem(&m_SettingsCommandInput);
+	}
+
+	// add button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(100.0f, &ToolBar, nullptr);
+	const bool CanAdd = s_ListBox.Active() && CurrentInputValid;
+	static int s_AddButton = 0;
+	if(DoButton_FontIcon(&s_AddButton, FONT_ICON_PLUS, CanAdd ? 0 : -1, &Button, 0, "[Enter] Add a command to the command list.", IGraphics::CORNER_L) == 1 || (CanAdd && !Input()->AltIsPressed() && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		bool Found = false;
+		for(size_t i = 0; i < m_Map.m_vSettings.size(); ++i)
+		{
+			if(!str_comp(m_Map.m_vSettings[i].m_aCommand, m_SettingsCommandInput.GetString()))
+			{
+				s_CommandSelectedIndex = i;
+				Found = true;
+				break;
+			}
+		}
+
+		if(!Found)
+		{
+			m_Map.m_vSettings.emplace_back(m_SettingsCommandInput.GetString());
+			s_CommandSelectedIndex = m_Map.m_vSettings.size() - 1;
+			m_ServerSettingsHistory.RecordAction(std::make_shared<CEditorCommandAction>(this, CEditorCommandAction::EType::ADD, &s_CommandSelectedIndex, s_CommandSelectedIndex, m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand));
+			m_Map.OnModify();
+		}
+		s_ListBox.ScrollToSelected();
+		UI()->SetActiveItem(&m_SettingsCommandInput);
+	}
+
+	// command input (use remaining toolbar width)
+	if(!ShowServerSettingsEditorLast) // Just activated
+		UI()->SetActiveItem(&m_SettingsCommandInput);
+	m_SettingsCommandInput.SetEmptyText("Command");
+	DoClearableEditBox(&m_SettingsCommandInput, &ToolBar, 12.0f, IGraphics::CORNER_ALL, "Enter a server setting.");
+
+	// command list
+	s_ListBox.DoStart(15.0f, m_Map.m_vSettings.size(), 1, 3, s_CommandSelectedIndex, &List);
+
+	for(size_t i = 0; i < m_Map.m_vSettings.size(); i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&m_Map.m_vSettings[i], s_CommandSelectedIndex >= 0 && (size_t)s_CommandSelectedIndex == i);
+		if(!Item.m_Visible)
+			continue;
+
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		UI()->DoLabel(&Label, m_Map.m_vSettings[i].m_aCommand, 10.0f, TEXTALIGN_ML, Props);
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(s_CommandSelectedIndex != NewSelected)
+	{
+		s_CommandSelectedIndex = NewSelected;
+		m_SettingsCommandInput.Set(m_Map.m_vSettings[s_CommandSelectedIndex].m_aCommand);
+	}
+}
+
+void CEditor::RenderEditorHistory(CUIRect View)
+{
+	enum EHistoryType
+	{
+		EDITOR_HISTORY,
+		ENVELOPE_HISTORY,
+		SERVER_SETTINGS_HISTORY
+	};
+
+	static EHistoryType s_HistoryType = EDITOR_HISTORY;
+	static int s_ActionSelectedIndex = 0;
+	static CListBox s_ListBox;
+	s_ListBox.SetActive(m_Dialog == DIALOG_NONE && !UI()->IsPopupOpen());
+
+	const bool GotSelection = s_ListBox.Active() && s_ActionSelectedIndex >= 0 && (size_t)s_ActionSelectedIndex < m_Map.m_vSettings.size();
+
+	CUIRect ToolBar, Button, Label, List, DragBar;
+	View.HSplitTop(22.0f, &DragBar, nullptr);
+	DragBar.y -= 2.0f;
+	DragBar.w += 2.0f;
+	DragBar.h += 4.0f;
+	RenderExtraEditorDragBar(View, DragBar);
+	View.HSplitTop(20.0f, &ToolBar, &View);
+	View.HSplitTop(2.0f, nullptr, &List);
+	ToolBar.HMargin(2.0f, &ToolBar);
+
+	CUIRect TypeButtons, HistoryTypeButton;
+	const int HistoryTypeBtnSize = 70.0f;
+	ToolBar.VSplitLeft(3 * HistoryTypeBtnSize, &TypeButtons, &Label);
+
+	// history type buttons
+	{
+		TypeButtons.VSplitLeft(HistoryTypeBtnSize, &HistoryTypeButton, &TypeButtons);
+		static int s_EditorHistoryButton = 0;
+		if(DoButton_Ex(&s_EditorHistoryButton, "Editor", s_HistoryType == EDITOR_HISTORY, &HistoryTypeButton, 0, "Show map editor history.", IGraphics::CORNER_L))
+		{
+			s_HistoryType = EDITOR_HISTORY;
+		}
+
+		TypeButtons.VSplitLeft(HistoryTypeBtnSize, &HistoryTypeButton, &TypeButtons);
+		static int s_EnvelopeEditorHistoryButton = 0;
+		if(DoButton_Ex(&s_EnvelopeEditorHistoryButton, "Envelope", s_HistoryType == ENVELOPE_HISTORY, &HistoryTypeButton, 0, "Show envelope editor history.", IGraphics::CORNER_NONE))
+		{
+			s_HistoryType = ENVELOPE_HISTORY;
+		}
+
+		TypeButtons.VSplitLeft(HistoryTypeBtnSize, &HistoryTypeButton, &TypeButtons);
+		static int s_ServerSettingsHistoryButton = 0;
+		if(DoButton_Ex(&s_ServerSettingsHistoryButton, "Settings", s_HistoryType == SERVER_SETTINGS_HISTORY, &HistoryTypeButton, 0, "Show server settings editor history.", IGraphics::CORNER_R))
+		{
+			s_HistoryType = SERVER_SETTINGS_HISTORY;
+		}
+	}
+
+	SLabelProperties InfoProps;
+	InfoProps.m_MaxWidth = ToolBar.w - 60.f;
+	InfoProps.m_EllipsisAtEnd = true;
+	Label.VSplitLeft(8.0f, nullptr, &Label);
+	UI()->DoLabel(&Label, "Editor history. Click on an action to undo all actions above.", 10.0f, TEXTALIGN_ML, InfoProps);
+
+	CEditorHistory *pCurrentHistory;
+	if(s_HistoryType == EDITOR_HISTORY)
+		pCurrentHistory = &m_EditorHistory;
+	else if(s_HistoryType == ENVELOPE_HISTORY)
+		pCurrentHistory = &m_EnvelopeEditorHistory;
+	else if(s_HistoryType == SERVER_SETTINGS_HISTORY)
+		pCurrentHistory = &m_ServerSettingsHistory;
+	else
+		return;
+
+	// delete button
+	ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
+	ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
+	static int s_DeleteButton = 0;
+	if(DoButton_FontIcon(&s_DeleteButton, FONT_ICON_TRASH, (!pCurrentHistory->m_vpUndoActions.empty() || !pCurrentHistory->m_vpRedoActions.empty()) ? 0 : -1, &Button, 0, "Clear the history.", IGraphics::CORNER_ALL, 9.0f) == 1 || (GotSelection && CLineInput::GetActiveInput() == nullptr && m_Dialog == DIALOG_NONE && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
+	{
+		pCurrentHistory->Clear();
+		s_ActionSelectedIndex = 0;
+	}
+
+	// actions list
+	int RedoSize = (int)pCurrentHistory->m_vpRedoActions.size();
+	int UndoSize = (int)pCurrentHistory->m_vpUndoActions.size();
+	s_ActionSelectedIndex = RedoSize;
+	s_ListBox.DoStart(15.0f, RedoSize + UndoSize, 1, 3, s_ActionSelectedIndex, &List);
+
+	for(int i = 0; i < RedoSize; i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&pCurrentHistory->m_vpRedoActions[i], s_ActionSelectedIndex >= 0 && s_ActionSelectedIndex == i);
+		if(!Item.m_Visible)
+			continue;
+
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		TextRender()->TextColor({.5f, .5f, .5f});
+		TextRender()->TextOutlineColor(TextRender()->DefaultTextOutlineColor());
+		UI()->DoLabel(&Label, pCurrentHistory->m_vpRedoActions[i]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
+		TextRender()->TextColor(TextRender()->DefaultTextColor());
+	}
+
+	for(int i = 0; i < UndoSize; i++)
+	{
+		const CListboxItem Item = s_ListBox.DoNextItem(&pCurrentHistory->m_vpUndoActions[UndoSize - i - 1], s_ActionSelectedIndex >= RedoSize && s_ActionSelectedIndex == (i + RedoSize));
+		if(!Item.m_Visible)
+			continue;
+
+		Item.m_Rect.VMargin(5.0f, &Label);
+
+		SLabelProperties Props;
+		Props.m_MaxWidth = Label.w;
+		Props.m_EllipsisAtEnd = true;
+		UI()->DoLabel(&Label, pCurrentHistory->m_vpUndoActions[UndoSize - i - 1]->DisplayText(), 10.0f, TEXTALIGN_ML, Props);
+	}
+
+	{ // Base action "Loaded map" that cannot be undone
+		static int s_BaseAction;
+		const CListboxItem Item = s_ListBox.DoNextItem(&s_BaseAction, s_ActionSelectedIndex == RedoSize + UndoSize);
+		if(Item.m_Visible)
+		{
+			Item.m_Rect.VMargin(5.0f, &Label);
+
+			UI()->DoLabel(&Label, "Loaded map", 10.0f, TEXTALIGN_ML);
+		}
+	}
+
+	const int NewSelected = s_ListBox.DoEnd();
+	if(s_ActionSelectedIndex != NewSelected)
+	{
+		// Figure out if we should undo or redo some actions
+		// Undo everything until the selected index
+		if(NewSelected > s_ActionSelectedIndex)
+		{
+			for(int i = 0; i < (NewSelected - s_ActionSelectedIndex); i++)
+			{
+				pCurrentHistory->Undo();
+			}
+		}
+		else
+		{
+			for(int i = 0; i < (s_ActionSelectedIndex - NewSelected); i++)
+			{
+				pCurrentHistory->Redo();
+			}
+		}
+		s_ActionSelectedIndex = NewSelected;
+	}
+}
+
+void CEditor::RenderExtraEditorDragBar(CUIRect View, CUIRect DragBar)
+{
+	enum EDragOperation
+	{
+		OP_NONE,
+		OP_DRAGGING,
+		OP_CLICKED
+	};
+	static EDragOperation s_Operation = OP_NONE;
+	static float s_InitialMouseY = 0.0f;
+	static float s_InitialMouseOffsetY = 0.0f;
+
+	bool Clicked;
+	bool Abrupted;
+	if(int Result = DoButton_DraggableEx(&s_Operation, "", 8, &DragBar, &Clicked, &Abrupted, 0, "Change the size of the editor by dragging."))
+	{
+		if(s_Operation == OP_NONE && Result == 1)
+		{
+			s_InitialMouseY = UI()->MouseY();
+			s_InitialMouseOffsetY = UI()->MouseY() - DragBar.y;
+			s_Operation = OP_CLICKED;
+		}
+
+		if(Clicked || Abrupted)
+			s_Operation = OP_NONE;
+
+		if(s_Operation == OP_CLICKED && absolute(UI()->MouseY() - s_InitialMouseY) > 5.0f)
+			s_Operation = OP_DRAGGING;
+
+		if(s_Operation == OP_DRAGGING)
+			m_aExtraEditorSplits[(int)m_ActiveExtraEditor] = clamp(s_InitialMouseOffsetY + View.y + View.h - UI()->MouseY(), 100.0f, 400.0f);
+	}
+}
+
+void CEditor::RenderMenubar(CUIRect MenuBar)
+{
+	SPopupMenuProperties PopupProperties;
+	PopupProperties.m_Corners = IGraphics::CORNER_R | IGraphics::CORNER_B;
+
+	CUIRect FileButton;
+	static int s_FileButton = 0;
+	MenuBar.VSplitLeft(60.0f, &FileButton, &MenuBar);
+	if(DoButton_Menu(&s_FileButton, "File", 0, &FileButton, 0, nullptr))
+	{
+		static SPopupMenuId s_PopupMenuFileId;
+		UI()->DoPopupMenu(&s_PopupMenuFileId, FileButton.x, FileButton.y + FileButton.h - 1.0f, 120.0f, 174.0f, this, PopupMenuFile, PopupProperties);
+	}
+
+	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
+
+	CUIRect ToolsButton;
+	static int s_ToolsButton = 0;
+	MenuBar.VSplitLeft(60.0f, &ToolsButton, &MenuBar);
+	if(DoButton_Menu(&s_ToolsButton, "Tools", 0, &ToolsButton, 0, nullptr))
+	{
+		static SPopupMenuId s_PopupMenuToolsId;
+		UI()->DoPopupMenu(&s_PopupMenuToolsId, ToolsButton.x, ToolsButton.y + ToolsButton.h - 1.0f, 200.0f, 64.0f, this, PopupMenuTools, PopupProperties);
+	}
+
+	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
+
+	CUIRect SettingsButton;
+	static int s_SettingsButton = 0;
+	MenuBar.VSplitLeft(60.0f, &SettingsButton, &MenuBar);
+	if(DoButton_Menu(&s_SettingsButton, "Settings", 0, &SettingsButton, 0, nullptr))
+	{
+		static SPopupMenuId s_PopupMenuEntitiesId;
+		UI()->DoPopupMenu(&s_PopupMenuEntitiesId, SettingsButton.x, SettingsButton.y + SettingsButton.h - 1.0f, 200.0f, 92.0f, this, PopupMenuSettings, PopupProperties);
+	}
+
+	CUIRect ChangedIndicator, Info, Close;
+	MenuBar.VSplitLeft(5.0f, nullptr, &MenuBar);
+	MenuBar.VSplitLeft(MenuBar.h, &ChangedIndicator, &MenuBar);
+	MenuBar.VSplitRight(20.0f, &MenuBar, &Close);
+	Close.VSplitLeft(5.0f, nullptr, &Close);
+	MenuBar.VSplitLeft(MenuBar.w * 0.6f, &MenuBar, &Info);
+	MenuBar.VSplitRight(5.0f, &MenuBar, nullptr);
+
+	if(m_Map.m_Modified)
+	{
+		TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
+		TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
+		UI()->DoLabel(&ChangedIndicator, FONT_ICON_CIRCLE, 8.0f, TEXTALIGN_MC);
+		TextRender()->SetRenderFlags(0);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		static int s_ChangedIndicator;
+		DoButton_Editor_Common(&s_ChangedIndicator, "", 0, &ChangedIndicator, 0, "This map has unsaved changes"); // just for the tooltip, result unused
+	}
+
+	char aBuf[IO_MAX_PATH_LENGTH + 32];
+	str_format(aBuf, sizeof(aBuf), "File: %s", m_aFileName);
+	SLabelProperties Props;
+	Props.m_MaxWidth = MenuBar.w;
+	Props.m_EllipsisAtEnd = true;
+	UI()->DoLabel(&MenuBar, aBuf, 10.0f, TEXTALIGN_ML, Props);
+
+	char aTimeStr[6];
+	str_timestamp_format(aTimeStr, sizeof(aTimeStr), "%H:%M");
+
+	str_format(aBuf, sizeof(aBuf), "X: %.1f, Y: %.1f, Z: %.1f, A: %.1f, G: %i  %s", UI()->MouseWorldX() / 32.0f, UI()->MouseWorldY() / 32.0f, MapView()->Zoom()->GetValue(), m_AnimateSpeed, MapView()->MapGrid()->Factor(), aTimeStr);
+	UI()->DoLabel(&Info, aBuf, 10.0f, TEXTALIGN_MR);
+
+	static int s_CloseButton = 0;
+	if(DoButton_Editor(&s_CloseButton, "×", 0, &Close, 0, "Exits from the editor"))
+	{
+		OnClose();
+		g_Config.m_ClEditor = 0;
+	}
+}
+
+void CEditor::Render()
+{
+	// basic start
+	Graphics()->Clear(0.0f, 0.0f, 0.0f);
+	CUIRect View = *UI()->Screen();
+	UI()->MapScreen();
+
+	float Width = View.w;
+	float Height = View.h;
+
+	// reset tip
+	str_copy(m_aTooltip, "");
+
+	// render checker
+	RenderBackground(View, m_CheckerTexture, 32.0f, 1.0f);
+
+	CUIRect MenuBar, ModeBar, ToolBar, StatusBar, ExtraEditor, ToolBox;
+	m_ShowPicker = Input()->KeyIsPressed(KEY_SPACE) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && m_vSelectedLayers.size() == 1;
+
+	if(m_GuiActive)
+	{
+		View.HSplitTop(16.0f, &MenuBar, &View);
+		View.HSplitTop(53.0f, &ToolBar, &View);
+		View.VSplitLeft(100.0f, &ToolBox, &View);
+		View.HSplitBottom(16.0f, &View, &StatusBar);
+		if(!m_ShowPicker && m_ActiveExtraEditor != EXTRAEDITOR_NONE)
+			View.HSplitBottom(m_aExtraEditorSplits[(int)m_ActiveExtraEditor], &View, &ExtraEditor);
+	}
+	else
+	{
+		// hack to get keyboard inputs from toolbar even when GUI is not active
+		ToolBar.x = -100;
+		ToolBar.y = -100;
+		ToolBar.w = 50;
+		ToolBar.h = 50;
+	}
+
+	//	a little hack for now
+	if(m_Mode == MODE_LAYERS)
+		DoMapEditor(View);
+
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+	{
+		// handle undo/redo hotkeys
+		if(Input()->KeyPress(KEY_Z) && Input()->ModifierIsPressed())
+			UndoLastAction();
+		if(Input()->KeyPress(KEY_Y) && Input()->ModifierIsPressed())
+			RedoLastAction();
+
+		// handle brush save/load hotkeys
+		for(int i = KEY_1; i <= KEY_0; i++)
+		{
+			if(Input()->KeyPress(i))
+			{
+				int Slot = i - KEY_1;
+				if(Input()->ModifierIsPressed() && !m_pBrush->IsEmpty())
+				{
+					dbg_msg("editor", "saving current brush to %d", Slot);
+					m_apSavedBrushes[Slot] = std::make_shared<CLayerGroup>(*m_pBrush);
+				}
+				else if(m_apSavedBrushes[Slot])
+				{
+					dbg_msg("editor", "loading brush from slot %d", Slot);
+					m_pBrush = std::make_shared<CLayerGroup>(*m_apSavedBrushes[Slot]);
+				}
+			}
+		}
+	}
+
+	float Brightness = 0.25f;
+
+	if(m_GuiActive)
+	{
+		RenderBackground(MenuBar, m_BackgroundTexture, 128.0f, Brightness * 0);
+		MenuBar.Margin(2.0f, &MenuBar);
+
+		RenderBackground(ToolBox, m_BackgroundTexture, 128.0f, Brightness);
+		ToolBox.Margin(2.0f, &ToolBox);
+
+		RenderBackground(ToolBar, m_BackgroundTexture, 128.0f, Brightness);
+		ToolBar.Margin(2.0f, &ToolBar);
+		ToolBar.VSplitLeft(100.0f, &ModeBar, &ToolBar);
+
+		RenderBackground(StatusBar, m_BackgroundTexture, 128.0f, Brightness);
+		StatusBar.Margin(2.0f, &StatusBar);
+	}
+
+	// do the toolbar
+	if(m_Mode == MODE_LAYERS)
+		DoToolbarLayers(ToolBar);
+	else if(m_Mode == MODE_SOUNDS)
+		DoToolbarSounds(ToolBar);
+
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr)
+	{
+		const bool ModPressed = Input()->ModifierIsPressed();
+		const bool ShiftPressed = Input()->ShiftIsPressed();
+		const bool AltPressed = Input()->AltIsPressed();
+		// ctrl+n to create new map
+		if(Input()->KeyPress(KEY_N) && ModPressed)
+		{
+			if(HasUnsavedData())
+			{
+				if(!m_PopupEventWasActivated)
+				{
+					m_PopupEventType = POPEVENT_NEW;
+					m_PopupEventActivated = true;
+				}
+			}
+			else
+			{
+				Reset();
+				m_aFileName[0] = 0;
+			}
+		}
+		// ctrl+a to append map
+		if(Input()->KeyPress(KEY_A) && ModPressed)
+		{
+			InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CallbackAppendMap, this);
+		}
+		// ctrl+o or ctrl+l to open
+		if((Input()->KeyPress(KEY_O) || Input()->KeyPress(KEY_L)) && ModPressed)
+		{
+			if(ShiftPressed)
+			{
+				if(HasUnsavedData())
+				{
+					if(!m_PopupEventWasActivated)
+					{
+						m_PopupEventType = POPEVENT_LOADCURRENT;
+						m_PopupEventActivated = true;
+					}
+				}
+				else
+				{
+					LoadCurrentMap();
+				}
+			}
+			else
+			{
+				if(HasUnsavedData())
+				{
+					if(!m_PopupEventWasActivated)
+					{
+						m_PopupEventType = POPEVENT_LOAD;
+						m_PopupEventActivated = true;
+					}
+				}
+				else
+				{
+					InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", false, CallbackOpenMap, this);
+				}
+			}
+		}
+
+		// ctrl+shift+alt+s to save copy
+		if(Input()->KeyPress(KEY_S) && ModPressed && ShiftPressed && AltPressed)
+			InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CallbackSaveCopyMap, this);
+		// ctrl+shift+s to save as
+		else if(Input()->KeyPress(KEY_S) && ModPressed && ShiftPressed)
+			InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CallbackSaveMap, this);
+		// ctrl+s to save
+		else if(Input()->KeyPress(KEY_S) && ModPressed)
+		{
+			if(m_aFileName[0] && m_ValidSaveFilename)
+			{
+				if(!m_PopupEventWasActivated)
+				{
+					str_copy(m_aFileSaveName, m_aFileName);
+					CallbackSaveMap(m_aFileSaveName, IStorage::TYPE_SAVE, this);
+				}
+			}
+			else
+				InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", false, CallbackSaveMap, this);
+		}
+	}
+
+	if(m_GuiActive)
+	{
+		if(m_Mode == MODE_LAYERS)
+			RenderLayers(ToolBox);
+		else if(m_Mode == MODE_IMAGES)
+		{
+			RenderImagesList(ToolBox);
+			RenderSelectedImage(View);
+		}
+		else if(m_Mode == MODE_SOUNDS)
+			RenderSounds(ToolBox);
+	}
+
+	UI()->MapScreen();
+
+	CUIRect TooltipRect;
+	if(m_GuiActive)
+	{
+		RenderMenubar(MenuBar);
+		RenderModebar(ModeBar);
+		if(!m_ShowPicker)
+		{
+			if(m_ActiveExtraEditor != EXTRAEDITOR_NONE)
+			{
+				RenderBackground(ExtraEditor, m_BackgroundTexture, 128.0f, Brightness);
+				ExtraEditor.HMargin(2.0f, &ExtraEditor);
+				ExtraEditor.VSplitRight(2.0f, &ExtraEditor, nullptr);
+			}
+
+			static bool s_ShowServerSettingsEditorLast = false;
+			if(m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES)
+			{
+				RenderEnvelopeEditor(ExtraEditor);
+			}
+			else if(m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS)
+			{
+				RenderServerSettingsEditor(ExtraEditor, s_ShowServerSettingsEditorLast);
+			}
+			else if(m_ActiveExtraEditor == EXTRAEDITOR_HISTORY)
+			{
+				RenderEditorHistory(ExtraEditor);
+			}
+			s_ShowServerSettingsEditorLast = m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS;
+		}
+		RenderStatusbar(StatusBar, &TooltipRect);
+	}
+
+	RenderPressedKeys(View);
+	RenderSavingIndicator(View);
+
+	if(m_Dialog == DIALOG_FILE)
+	{
+		static int s_NullUiTarget = 0;
+		UI()->SetHotItem(&s_NullUiTarget);
+		RenderFileDialog();
+	}
+
+	if(m_PopupEventActivated)
+	{
+		static SPopupMenuId s_PopupEventId;
+		constexpr float PopupWidth = 400.0f;
+		constexpr float PopupHeight = 150.0f;
+		UI()->DoPopupMenu(&s_PopupEventId, Width / 2.0f - PopupWidth / 2.0f, Height / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, this, PopupEvent);
+		m_PopupEventActivated = false;
+		m_PopupEventWasActivated = true;
+	}
+
+	if(m_Dialog == DIALOG_NONE && !UI()->IsPopupHovered() && (!m_GuiActive || UI()->MouseInside(&View)))
+	{
+		// handle zoom hotkeys
+		if(Input()->KeyPress(KEY_KP_MINUS))
+			MapView()->Zoom()->ChangeValue(50.0f);
+		if(Input()->KeyPress(KEY_KP_PLUS))
+			MapView()->Zoom()->ChangeValue(-50.0f);
+		if(Input()->KeyPress(KEY_KP_MULTIPLY))
+			MapView()->ResetZoom();
+		if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
+			MapView()->Zoom()->ChangeValue(20.0f);
+		if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
+			MapView()->Zoom()->ChangeValue(-20.0f);
+	}
+
+	MapView()->UpdateZoom();
+
+	UI()->RenderPopupMenus();
+	FreeDynamicPopupMenus();
+
+	if(m_Dialog == DIALOG_NONE && !m_PopupEventActivated && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+	{
+		OnClose();
+		g_Config.m_ClEditor = 0;
+	}
+
+	// The tooltip can be set in popup menus so we have to render the tooltip after the popup menus.
+	if(m_GuiActive)
+		RenderTooltip(TooltipRect);
+
+	RenderMousePointer();
+}
+
+void CEditor::RenderPressedKeys(CUIRect View)
+{
+	if(!g_Config.m_EdShowkeys)
+		return;
+
+	UI()->MapScreen();
+	CTextCursor Cursor;
+	TextRender()->SetCursor(&Cursor, View.x + 10, View.y + View.h - 24 - 10, 24.0f, TEXTFLAG_RENDER);
+
+	int NKeys = 0;
+	for(int i = 0; i < KEY_LAST; i++)
+	{
+		if(Input()->KeyIsPressed(i))
+		{
+			if(NKeys)
+				TextRender()->TextEx(&Cursor, " + ", -1);
+			TextRender()->TextEx(&Cursor, Input()->KeyName(i), -1);
+			NKeys++;
+		}
+	}
+}
+
+void CEditor::RenderSavingIndicator(CUIRect View)
+{
+	if(m_WriterFinishJobs.empty())
+		return;
+
+	const char *pText = "Saving…";
+	const float FontSize = 24.0f;
+
+	UI()->MapScreen();
+	CUIRect Label, Spinner;
+	View.Margin(20.0f, &View);
+	View.HSplitBottom(FontSize, nullptr, &View);
+	View.VSplitRight(TextRender()->TextWidth(FontSize, pText) + 2.0f, &Spinner, &Label);
+	Spinner.VSplitRight(Spinner.h, nullptr, &Spinner);
+	UI()->DoLabel(&Label, pText, FontSize, TEXTALIGN_MR);
+	UI()->RenderProgressSpinner(Spinner.Center(), 8.0f);
+}
+
+void CEditor::FreeDynamicPopupMenus()
+{
+	auto Iterator = m_PopupMessageContexts.begin();
+	while(Iterator != m_PopupMessageContexts.end())
+	{
+		if(!UI()->IsPopupOpen(Iterator->second))
+		{
+			CUI::SMessagePopupContext *pContext = Iterator->second;
+			Iterator = m_PopupMessageContexts.erase(Iterator);
+			delete pContext;
+		}
+		else
+			++Iterator;
+	}
+}
+
+void CEditor::RenderMousePointer()
+{
+	if(!m_ShowMousePointer)
+		return;
+
+	Graphics()->WrapClamp();
+	Graphics()->TextureSet(m_CursorTexture);
+	Graphics()->QuadsBegin();
+	if(ms_pUiGotContext == UI()->HotItem())
+		Graphics()->SetColor(1, 0, 0, 1);
+	IGraphics::CQuadItem QuadItem(UI()->MouseX(), UI()->MouseY(), 16.0f, 16.0f);
+	Graphics()->QuadsDrawTL(&QuadItem, 1);
+	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
+}
+
+void CEditor::Reset(bool CreateDefault)
+{
+	UI()->ClosePopupMenus();
+	m_Map.Clean();
+
+	m_MapView.OnReset();
+	// create default layers
+	if(CreateDefault)
+	{
+		m_EditorWasUsedBefore = true;
+		m_Map.CreateDefault(GetEntitiesTexture());
+	}
+
+	SelectGameLayer();
+	DeselectQuads();
+	DeselectQuadPoints();
+	m_SelectedEnvelope = 0;
+	m_SelectedImage = 0;
+	m_SelectedSound = 0;
+	m_SelectedSource = -1;
+
+	m_MouseDeltaX = 0;
+	m_MouseDeltaY = 0;
+	m_MouseDeltaWx = 0;
+	m_MouseDeltaWy = 0;
+
+	m_Map.m_Modified = false;
+	m_Map.m_ModifiedAuto = false;
+	m_Map.m_LastModifiedTime = -1.0f;
+	m_Map.m_LastSaveTime = Client()->GlobalTime();
+	m_Map.m_LastAutosaveUpdateTime = -1.0f;
+
+	m_ShowEnvelopePreview = SHOWENV_NONE;
+	m_ShiftBy = 1;
+
+	m_ResetZoomEnvelope = true;
+	m_SettingsCommandInput.Clear();
+
+	m_EditorHistory.Clear();
+	m_EnvelopeEditorHistory.Clear();
+	m_ServerSettingsHistory.Clear();
+
+	m_QuadTracker.m_pEditor = this;
+
+	m_EnvOpTracker.m_pEditor = this;
+	m_EnvOpTracker.Reset();
+}
+
+int CEditor::GetTextureUsageFlag()
+{
+	return Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+}
+
+IGraphics::CTextureHandle CEditor::GetFrontTexture()
+{
+	if(!m_FrontTexture.IsValid())
+		m_FrontTexture = Graphics()->LoadTexture("editor/front.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_FrontTexture;
+}
+
+IGraphics::CTextureHandle CEditor::GetTeleTexture()
+{
+	if(!m_TeleTexture.IsValid())
+		m_TeleTexture = Graphics()->LoadTexture("editor/tele.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_TeleTexture;
+}
+
+IGraphics::CTextureHandle CEditor::GetSpeedupTexture()
+{
+	if(!m_SpeedupTexture.IsValid())
+		m_SpeedupTexture = Graphics()->LoadTexture("editor/speedup.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_SpeedupTexture;
+}
+
+IGraphics::CTextureHandle CEditor::GetSwitchTexture()
+{
+	if(!m_SwitchTexture.IsValid())
+		m_SwitchTexture = Graphics()->LoadTexture("editor/switch.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_SwitchTexture;
+}
+
+IGraphics::CTextureHandle CEditor::GetTuneTexture()
+{
+	if(!m_TuneTexture.IsValid())
+		m_TuneTexture = Graphics()->LoadTexture("editor/tune.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_TuneTexture;
+}
+
+IGraphics::CTextureHandle CEditor::GetEntitiesTexture()
+{
+	if(!m_EntitiesTexture.IsValid())
+		m_EntitiesTexture = Graphics()->LoadTexture("editor/entities/DDNet.png", IStorage::TYPE_ALL, GetTextureUsageFlag());
+	return m_EntitiesTexture;
+}
+
+void CEditor::Init()
+{
+	m_pInput = Kernel()->RequestInterface<IInput>();
+	m_pClient = Kernel()->RequestInterface<IClient>();
+	m_pConfig = Kernel()->RequestInterface<IConfigManager>()->Values();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pGraphics = Kernel()->RequestInterface<IGraphics>();
+	m_pTextRender = Kernel()->RequestInterface<ITextRender>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pSound = Kernel()->RequestInterface<ISound>();
+	m_UI.Init(Kernel());
+	m_UI.SetPopupMenuClosedCallback([this]() {
+		m_PopupEventWasActivated = false;
+	});
+	m_RenderTools.Init(m_pGraphics, m_pTextRender);
+	m_ZoomEnvelopeX.Init(this);
+	m_ZoomEnvelopeY.Init(this);
+	m_Map.m_pEditor = this;
+
+	m_vComponents.emplace_back(m_MapView);
+	for(CEditorComponent &Component : m_vComponents)
+		Component.Init(this);
+
+	m_CheckerTexture = Graphics()->LoadTexture("editor/checker.png", IStorage::TYPE_ALL);
+	m_BackgroundTexture = Graphics()->LoadTexture("editor/background.png", IStorage::TYPE_ALL);
+	m_CursorTexture = Graphics()->LoadTexture("editor/cursor.png", IStorage::TYPE_ALL);
+
+	m_pTilesetPicker = std::make_shared<CLayerTiles>(this, 16, 16);
+	m_pTilesetPicker->MakePalette();
+	m_pTilesetPicker->m_Readonly = true;
+
+	m_pQuadsetPicker = std::make_shared<CLayerQuads>(this);
+	m_pQuadsetPicker->NewQuad(0, 0, 64, 64);
+	m_pQuadsetPicker->m_Readonly = true;
+
+	m_pBrush = std::make_shared<CLayerGroup>();
+	m_pBrush->m_pMap = &m_Map;
+
+	Reset(false);
+}
+
+void CEditor::PlaceBorderTiles()
+{
+	std::shared_ptr<CLayerTiles> pT = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
+
+	for(int i = 0; i < pT->m_Width * pT->m_Height; ++i)
+	{
+		if(i % pT->m_Width < 2 || i % pT->m_Width > pT->m_Width - 3 || i < pT->m_Width * 2 || i > pT->m_Width * (pT->m_Height - 2))
+		{
+			int x = i % pT->m_Width;
+			int y = i / pT->m_Width;
+
+			CTile Current = pT->m_pTiles[i];
+			Current.m_Index = 1;
+			pT->SetTile(x, y, Current);
+		}
+	}
+
+	int GameGroupIndex = std::find(m_Map.m_vpGroups.begin(), m_Map.m_vpGroups.end(), m_Map.m_pGameGroup) - m_Map.m_vpGroups.begin();
+	m_EditorHistory.RecordAction(std::make_shared<CEditorBrushDrawAction>(this, GameGroupIndex), "Tool 'Make borders'");
+
+	m_Map.OnModify();
+}
+
+void CEditor::HandleCursorMovement()
+{
+	static float s_MouseX = 0.0f;
+	static float s_MouseY = 0.0f;
+
+	float MouseRelX = 0.0f, MouseRelY = 0.0f;
+	IInput::ECursorType CursorType = Input()->CursorRelative(&MouseRelX, &MouseRelY);
+	if(CursorType != IInput::CURSOR_NONE)
+		UI()->ConvertMouseMove(&MouseRelX, &MouseRelY, CursorType);
+
+	m_MouseDeltaX += MouseRelX;
+	m_MouseDeltaY += MouseRelY;
+
+	if(!UI()->CheckMouseLock())
+	{
+		s_MouseX = clamp<float>(s_MouseX + MouseRelX, 0.0f, Graphics()->WindowWidth());
+		s_MouseY = clamp<float>(s_MouseY + MouseRelY, 0.0f, Graphics()->WindowHeight());
+	}
+
+	// update positions for ui, but only update ui when rendering
+	m_MouseX = UI()->Screen()->w * ((float)s_MouseX / Graphics()->WindowWidth());
+	m_MouseY = UI()->Screen()->h * ((float)s_MouseY / Graphics()->WindowHeight());
+
+	// fix correct world x and y
+	std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
+	if(pGroup)
+	{
+		float aPoints[4];
+		pGroup->Mapping(aPoints);
+
+		float WorldWidth = aPoints[2] - aPoints[0];
+		float WorldHeight = aPoints[3] - aPoints[1];
+
+		m_MouseWScale = WorldWidth / Graphics()->WindowWidth();
+
+		m_MouseWorldX = aPoints[0] + WorldWidth * (s_MouseX / Graphics()->WindowWidth());
+		m_MouseWorldY = aPoints[1] + WorldHeight * (s_MouseY / Graphics()->WindowHeight());
+		m_MouseDeltaWx = m_MouseDeltaX * (WorldWidth / Graphics()->WindowWidth());
+		m_MouseDeltaWy = m_MouseDeltaY * (WorldHeight / Graphics()->WindowHeight());
+	}
+	else
+	{
+		m_MouseWorldX = 0.0f;
+		m_MouseWorldY = 0.0f;
+	}
+
+	for(const std::shared_ptr<CLayerGroup> &pGameGroup : m_Map.m_vpGroups)
+	{
+		if(!pGameGroup->m_GameGroup)
+			continue;
+
+		float aPoints[4];
+		pGameGroup->Mapping(aPoints);
+
+		float WorldWidth = aPoints[2] - aPoints[0];
+		float WorldHeight = aPoints[3] - aPoints[1];
+
+		m_MouseWorldNoParaX = aPoints[0] + WorldWidth * (s_MouseX / Graphics()->WindowWidth());
+		m_MouseWorldNoParaY = aPoints[1] + WorldHeight * (s_MouseY / Graphics()->WindowHeight());
+	}
+}
+
+void CEditor::DispatchInputEvents()
+{
+	for(size_t i = 0; i < Input()->NumEvents(); i++)
+	{
+		const IInput::CEvent &Event = Input()->GetEvent(i);
+		if(!Input()->IsEventValid(Event))
+			continue;
+		UI()->OnInput(Event);
+	}
+}
+
+void CEditor::HandleAutosave()
+{
+	const float Time = Client()->GlobalTime();
+	const float LastAutosaveUpdateTime = m_Map.m_LastAutosaveUpdateTime;
+	m_Map.m_LastAutosaveUpdateTime = Time;
+
+	if(g_Config.m_EdAutosaveInterval == 0)
+		return; // autosave disabled
+	if(!m_Map.m_ModifiedAuto || m_Map.m_LastModifiedTime < 0.0f)
+		return; // no unsaved changes
+
+	// Add time to autosave timer if the editor was disabled for more than 10 seconds,
+	// to prevent autosave from immediately activating when the editor is activated
+	// after being deactivated for some time.
+	if(LastAutosaveUpdateTime >= 0.0f && Time - LastAutosaveUpdateTime > 10.0f)
+	{
+		m_Map.m_LastSaveTime += Time - LastAutosaveUpdateTime;
+	}
+
+	// Check if autosave timer has expired.
+	if(m_Map.m_LastSaveTime >= Time || Time - m_Map.m_LastSaveTime < 60 * g_Config.m_EdAutosaveInterval)
+		return;
+
+	// Wait for 5 seconds of no modification before saving, to prevent autosave
+	// from immediately activating when a map is first modified or while user is
+	// modifying the map, but don't delay the autosave for more than 1 minute.
+	if(Time - m_Map.m_LastModifiedTime < 5.0f && Time - m_Map.m_LastSaveTime < 60 * (g_Config.m_EdAutosaveInterval + 1))
+		return;
+
+	PerformAutosave();
+}
+
+bool CEditor::PerformAutosave()
+{
+	char aDate[20];
+	char aAutosavePath[IO_MAX_PATH_LENGTH];
+	str_timestamp(aDate, sizeof(aDate));
+	char aFileNameNoExt[IO_MAX_PATH_LENGTH];
+	if(m_aFileName[0] == '\0')
+	{
+		str_copy(aFileNameNoExt, "unnamed");
+	}
+	else
+	{
+		const char *pFileName = fs_filename(m_aFileName);
+		str_truncate(aFileNameNoExt, sizeof(aFileNameNoExt), pFileName, str_length(pFileName) - str_length(".map"));
+	}
+	str_format(aAutosavePath, sizeof(aAutosavePath), "maps/auto/%s_%s.map", aFileNameNoExt, aDate);
+
+	m_Map.m_LastSaveTime = Client()->GlobalTime();
+	if(Save(aAutosavePath))
+	{
+		m_Map.m_ModifiedAuto = false;
+		// Clean up autosaves
+		if(g_Config.m_EdAutosaveMax)
+		{
+			CFileCollection AutosavedMaps;
+			AutosavedMaps.Init(Storage(), "maps/auto", aFileNameNoExt, ".map", g_Config.m_EdAutosaveMax);
+		}
+		return true;
+	}
+	else
+	{
+		ShowFileDialogError("Failed to automatically save map to file '%s'.", aAutosavePath);
+		return false;
+	}
+}
+
+void CEditor::HandleWriterFinishJobs()
+{
+	if(m_WriterFinishJobs.empty())
+		return;
+
+	std::shared_ptr<CDataFileWriterFinishJob> pJob = m_WriterFinishJobs.front();
+	if(pJob->Status() != IJob::STATE_DONE)
+		return;
+	m_WriterFinishJobs.pop_front();
+
+	char aBuf[2 * IO_MAX_PATH_LENGTH + 128];
+	if(Storage()->FileExists(pJob->GetRealFileName(), IStorage::TYPE_SAVE) && !Storage()->RemoveFile(pJob->GetRealFileName(), IStorage::TYPE_SAVE))
+	{
+		str_format(aBuf, sizeof(aBuf), "Saving failed: Could not remove old map file '%s'.", pJob->GetRealFileName());
+		ShowFileDialogError("%s", aBuf);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor/save", aBuf);
+		return;
+	}
+
+	if(!Storage()->RenameFile(pJob->GetTempFileName(), pJob->GetRealFileName(), IStorage::TYPE_SAVE))
+	{
+		str_format(aBuf, sizeof(aBuf), "Saving failed: Could not move temporary map file '%s' to '%s'.", pJob->GetTempFileName(), pJob->GetRealFileName());
+		ShowFileDialogError("%s", aBuf);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor/save", aBuf);
+		return;
+	}
+
+	str_format(aBuf, sizeof(aBuf), "saving '%s' done", pJob->GetRealFileName());
+	Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor/save", aBuf);
+
+	// send rcon.. if we can
+	if(Client()->RconAuthed())
+	{
+		CServerInfo CurrentServerInfo;
+		Client()->GetServerInfo(&CurrentServerInfo);
+		NETADDR ServerAddr = Client()->ServerAddress();
+		const unsigned char aIpv4Localhost[16] = {127, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+		const unsigned char aIpv6Localhost[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+
+		// and if we're on localhost
+		if(!mem_comp(ServerAddr.ip, aIpv4Localhost, sizeof(aIpv4Localhost)) || !mem_comp(ServerAddr.ip, aIpv6Localhost, sizeof(aIpv6Localhost)))
+		{
+			char aMapName[128];
+			IStorage::StripPathAndExtension(pJob->GetRealFileName(), aMapName, sizeof(aMapName));
+			if(!str_comp(aMapName, CurrentServerInfo.m_aMap))
+				Client()->Rcon("reload");
+		}
+	}
+}
+
+void CEditor::OnUpdate()
+{
+	CUIElementBase::Init(UI()); // update static pointer because game and editor use separate UI
+
+	if(!m_EditorWasUsedBefore)
+	{
+		m_EditorWasUsedBefore = true;
+		Reset();
+	}
+
+	// handle key presses
+	for(size_t i = 0; i < Input()->NumEvents(); i++)
+	{
+		const IInput::CEvent &Event = Input()->GetEvent(i);
+		if(!Input()->IsEventValid(Event))
+			continue;
+
+		for(CEditorComponent &Component : m_vComponents)
+		{
+			if(Component.OnInput(Event))
+				break;
+		}
+	}
+
+	HandleCursorMovement();
+	DispatchInputEvents();
+	HandleAutosave();
+	HandleWriterFinishJobs();
+}
+
+void CEditor::OnRender()
+{
+	UI()->ResetMouseSlow();
+
+	// toggle gui
+	if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_TAB))
+		m_GuiActive = !m_GuiActive;
+
+	if(Input()->KeyPress(KEY_F10))
+		m_ShowMousePointer = false;
+
+	if(m_Animate)
+		m_AnimateTime = (time_get() - m_AnimateStart) / (float)time_freq();
+	else
+		m_AnimateTime = 0;
+
+	ms_pUiGotContext = nullptr;
+	UI()->StartCheck();
+
+	UI()->Update(m_MouseX, m_MouseY, m_MouseDeltaX, m_MouseDeltaY, m_MouseWorldX, m_MouseWorldY);
+
+	Render();
+
+	m_MouseDeltaX = 0.0f;
+	m_MouseDeltaY = 0.0f;
+	m_MouseDeltaWx = 0.0f;
+	m_MouseDeltaWy = 0.0f;
+
+	if(Input()->KeyPress(KEY_F10))
+	{
+		Graphics()->TakeScreenshot(nullptr);
+		m_ShowMousePointer = true;
+	}
+
+	UI()->FinishCheck();
+	UI()->ClearHotkeys();
+	Input()->Clear();
+
+	CLineInput::RenderCandidates();
+}
+
+void CEditor::OnActivate()
+{
+	ResetMentions();
+	ResetIngameMoved();
+}
+
+void CEditor::OnWindowResize()
+{
+	UI()->OnWindowResize();
+}
+
+void CEditor::OnClose()
+{
+	if(m_ToolbarPreviewSound && Sound()->IsPlaying(m_ToolbarPreviewSound))
+		Sound()->Pause(m_ToolbarPreviewSound);
+	if(m_FilePreviewSound && Sound()->IsPlaying(m_FilePreviewSound))
+		Sound()->Pause(m_FilePreviewSound);
+}
+
+void CEditor::OnDialogClose()
+{
+	if(m_FilePreviewSound)
+	{
+		Sound()->UnloadSample(m_FilePreviewSound);
+		m_FilePreviewSound = -1;
+	}
+}
+
+void CEditor::LoadCurrentMap()
+{
+	if(Load(m_pClient->GetCurrentMapPath(), IStorage::TYPE_SAVE))
+	{
+		m_ValidSaveFilename = true;
+	}
+	else
+	{
+		Load(m_pClient->GetCurrentMapPath(), IStorage::TYPE_ALL);
+		m_ValidSaveFilename = false;
+	}
+
+	CGameClient *pGameClient = (CGameClient *)Kernel()->RequestInterface<IGameClient>();
+	vec2 Center = pGameClient->m_Camera.m_Center;
+
+	MapView()->SetWorldOffset(Center);
+}
+
+bool CEditor::Save(const char *pFilename)
+{
+	// Check if file with this name is already being saved at the moment
+	if(std::any_of(std::begin(m_WriterFinishJobs), std::end(m_WriterFinishJobs), [pFilename](const std::shared_ptr<CDataFileWriterFinishJob> &Job) { return str_comp(pFilename, Job->GetRealFileName()) == 0; }))
+		return false;
+
+	return m_Map.Save(pFilename);
+}
+
+bool CEditor::HandleMapDrop(const char *pFileName, int StorageType)
+{
+	if(HasUnsavedData())
+	{
+		str_copy(m_aFileNamePending, pFileName);
+		m_PopupEventType = CEditor::POPEVENT_LOADDROP;
+		m_PopupEventActivated = true;
+		return true;
+	}
+	else
+	{
+		return Load(pFileName, IStorage::TYPE_ALL_OR_ABSOLUTE);
+	}
+}
+
+bool CEditor::Load(const char *pFileName, int StorageType)
+{
+	const auto &&ErrorHandler = [this](const char *pErrorMessage) {
+		ShowFileDialogError("%s", pErrorMessage);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor/load", pErrorMessage);
+	};
+
+	Reset();
+	bool Result = m_Map.Load(pFileName, StorageType, std::move(ErrorHandler));
+	if(Result)
+	{
+		str_copy(m_aFileName, pFileName);
+		SortImages();
+		SelectGameLayer();
+		MapView()->OnMapLoad();
+	}
+	else
+	{
+		m_aFileName[0] = 0;
+	}
+	return Result;
+}
+
+bool CEditor::Append(const char *pFileName, int StorageType, bool IgnoreHistory)
+{
+	CEditorMap NewMap;
+	NewMap.m_pEditor = this;
+
+	const auto &&ErrorHandler = [this](const char *pErrorMessage) {
+		ShowFileDialogError("%s", pErrorMessage);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor/append", pErrorMessage);
+	};
+	if(!NewMap.Load(pFileName, StorageType, std::move(ErrorHandler)))
+		return false;
+
+	CEditorActionAppendMap::SPrevInfo Info{
+		(int)m_Map.m_vpGroups.size(),
+		(int)m_Map.m_vpImages.size(),
+		(int)m_Map.m_vpSounds.size(),
+		(int)m_Map.m_vpEnvelopes.size()};
+
+	static const auto &&s_ReplaceIndex = [](int ToReplace, int ReplaceWith) {
+		return [ToReplace, ReplaceWith](int *pIndex) {
+			if(*pIndex == ToReplace)
+				*pIndex = ReplaceWith;
+		};
+	};
+
+	//Transfer non-duplicate images
+	for(auto NewMapIt = NewMap.m_vpImages.begin(); NewMapIt != NewMap.m_vpImages.end(); ++NewMapIt)
+	{
+		auto pNewImage = *NewMapIt;
+		auto NameIsTaken = [pNewImage](const std::shared_ptr<CEditorImage> &OtherImage) { return str_comp(pNewImage->m_aName, OtherImage->m_aName) == 0; };
+		auto MatchInCurrentMap = std::find_if(begin(m_Map.m_vpImages), end(m_Map.m_vpImages), NameIsTaken);
+
+		const bool IsDuplicate = MatchInCurrentMap != std::end(m_Map.m_vpImages);
+		const int IndexToReplace = NewMapIt - NewMap.m_vpImages.begin();
+
+		if(IsDuplicate)
+		{
+			const int IndexToReplaceWith = MatchInCurrentMap - m_Map.m_vpImages.begin();
+
+			dbg_msg("editor", "map contains image %s already, removing duplicate", pNewImage->m_aName);
+
+			//In the new map, replace the index of the duplicate image to the index of the same in the current map.
+			NewMap.ModifyImageIndex(s_ReplaceIndex(IndexToReplace, IndexToReplaceWith));
+		}
+		else
+		{
+			NewMap.ModifyImageIndex(s_ReplaceIndex(IndexToReplace, m_Map.m_vpImages.size()));
+			m_Map.m_vpImages.push_back(pNewImage);
+		}
+	}
+	NewMap.m_vpImages.clear();
+
+	// modify indices
+	static const auto &&s_ModifyAddIndex = [](int AddAmount) {
+		return [AddAmount](int *pIndex) {
+			if(*pIndex >= 0)
+				*pIndex += AddAmount;
+		};
+	};
+
+	NewMap.ModifySoundIndex(s_ModifyAddIndex(m_Map.m_vpSounds.size()));
+	NewMap.ModifyEnvelopeIndex(s_ModifyAddIndex(m_Map.m_vpEnvelopes.size()));
+
+	// transfer sounds
+	for(const auto &pSound : NewMap.m_vpSounds)
+		m_Map.m_vpSounds.push_back(pSound);
+	NewMap.m_vpSounds.clear();
+
+	// transfer envelopes
+	for(const auto &pEnvelope : NewMap.m_vpEnvelopes)
+		m_Map.m_vpEnvelopes.push_back(pEnvelope);
+	NewMap.m_vpEnvelopes.clear();
+
+	// transfer groups
+	for(const auto &pGroup : NewMap.m_vpGroups)
+	{
+		if(pGroup != NewMap.m_pGameGroup)
+		{
+			pGroup->m_pMap = &m_Map;
+			m_Map.m_vpGroups.push_back(pGroup);
+		}
+	}
+	NewMap.m_vpGroups.clear();
+
+	auto IndexMap = SortImages();
+
+	if(!IgnoreHistory)
+		m_EditorHistory.RecordAction(std::make_shared<CEditorActionAppendMap>(this, pFileName, Info, IndexMap));
+
+	// all done \o/
+	return true;
+}
+
+IEditor *CreateEditor() { return new CEditor; }
+
+void CEditor::UndoLastAction()
+{
+	if(m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS)
+		m_ServerSettingsHistory.Undo();
+	else if(m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES)
+		m_EnvelopeEditorHistory.Undo();
+	else
+		m_EditorHistory.Undo();
+}
+
+void CEditor::RedoLastAction()
+{
+	if(m_ActiveExtraEditor == EXTRAEDITOR_SERVER_SETTINGS)
+		m_ServerSettingsHistory.Redo();
+	else if(m_ActiveExtraEditor == EXTRAEDITOR_ENVELOPES)
+		m_EnvelopeEditorHistory.Redo();
+	else
+		m_EditorHistory.Redo();
+}
diff --git a/src_bkp/game/editor/editor.h b/src_bkp/game/editor/editor.h
new file mode 100644
index 0000000000..7977cb0904
--- /dev/null
+++ b/src_bkp/game/editor/editor.h
@@ -0,0 +1,1084 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_EDITOR_EDITOR_H
+#define GAME_EDITOR_EDITOR_H
+
+#include <base/bezier.h>
+#include <base/system.h>
+
+#include <game/client/render.h>
+#include <game/client/ui.h>
+#include <game/mapitems.h>
+
+#include <game/editor/mapitems/envelope.h>
+#include <game/editor/mapitems/layer.h>
+#include <game/editor/mapitems/layer_front.h>
+#include <game/editor/mapitems/layer_game.h>
+#include <game/editor/mapitems/layer_group.h>
+#include <game/editor/mapitems/layer_quads.h>
+#include <game/editor/mapitems/layer_sounds.h>
+#include <game/editor/mapitems/layer_speedup.h>
+#include <game/editor/mapitems/layer_switch.h>
+#include <game/editor/mapitems/layer_tele.h>
+#include <game/editor/mapitems/layer_tiles.h>
+#include <game/editor/mapitems/layer_tune.h>
+
+#include <engine/editor.h>
+#include <engine/engine.h>
+#include <engine/graphics.h>
+#include <engine/shared/datafile.h>
+#include <engine/shared/jobs.h>
+
+#include "auto_map.h"
+#include "editor_history.h"
+#include "editor_trackers.h"
+#include "map_view.h"
+#include "smooth_value.h"
+
+#include <deque>
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+typedef std::function<void(int *pIndex)> FIndexModifyFunction;
+
+// CEditor SPECIFIC
+enum
+{
+	MODE_LAYERS = 0,
+	MODE_IMAGES,
+	MODE_SOUNDS,
+	NUM_MODES,
+
+	DIALOG_NONE = 0,
+	DIALOG_FILE,
+};
+
+class CEditorImage;
+class CEditorSound;
+
+class CEditorMap
+{
+	void MakeGameGroup(std::shared_ptr<CLayerGroup> pGroup);
+	void MakeGameLayer(const std::shared_ptr<CLayer> &pLayer);
+
+public:
+	CEditor *m_pEditor;
+
+	CEditorMap()
+	{
+		Clean();
+	}
+
+	~CEditorMap()
+	{
+		Clean();
+	}
+
+	bool m_Modified; // unsaved changes in manual save
+	bool m_ModifiedAuto; // unsaved changes in autosave
+	float m_LastModifiedTime;
+	float m_LastSaveTime;
+	float m_LastAutosaveUpdateTime;
+	void OnModify();
+
+	std::vector<std::shared_ptr<CLayerGroup>> m_vpGroups;
+	std::vector<std::shared_ptr<CEditorImage>> m_vpImages;
+	std::vector<std::shared_ptr<CEnvelope>> m_vpEnvelopes;
+	std::vector<std::shared_ptr<CEditorSound>> m_vpSounds;
+
+	class CMapInfo
+	{
+	public:
+		char m_aAuthor[32];
+		char m_aVersion[16];
+		char m_aCredits[128];
+		char m_aLicense[32];
+
+		void Reset()
+		{
+			m_aAuthor[0] = '\0';
+			m_aVersion[0] = '\0';
+			m_aCredits[0] = '\0';
+			m_aLicense[0] = '\0';
+		}
+
+		void Copy(const CMapInfo &Source)
+		{
+			str_copy(m_aAuthor, Source.m_aAuthor);
+			str_copy(m_aVersion, Source.m_aVersion);
+			str_copy(m_aCredits, Source.m_aCredits);
+			str_copy(m_aLicense, Source.m_aLicense);
+		}
+	};
+	CMapInfo m_MapInfo;
+	CMapInfo m_MapInfoTmp;
+
+	struct CSetting
+	{
+		char m_aCommand[256];
+
+		CSetting(const char *pCommand)
+		{
+			str_copy(m_aCommand, pCommand);
+		}
+	};
+	std::vector<CSetting> m_vSettings;
+
+	std::shared_ptr<class CLayerGame> m_pGameLayer;
+	std::shared_ptr<CLayerGroup> m_pGameGroup;
+
+	std::shared_ptr<CEnvelope> NewEnvelope(CEnvelope::EType Type)
+	{
+		OnModify();
+		std::shared_ptr<CEnvelope> pEnv = std::make_shared<CEnvelope>(Type);
+		m_vpEnvelopes.push_back(pEnv);
+		return pEnv;
+	}
+
+	void DeleteEnvelope(int Index);
+	void SwapEnvelopes(int Index0, int Index1);
+	template<typename F>
+	void VisitEnvelopeReferences(F &&Visitor);
+
+	std::shared_ptr<CLayerGroup> NewGroup()
+	{
+		OnModify();
+		std::shared_ptr<CLayerGroup> pGroup = std::make_shared<CLayerGroup>();
+		pGroup->m_pMap = this;
+		m_vpGroups.push_back(pGroup);
+		return pGroup;
+	}
+
+	int SwapGroups(int Index0, int Index1)
+	{
+		if(Index0 < 0 || Index0 >= (int)m_vpGroups.size())
+			return Index0;
+		if(Index1 < 0 || Index1 >= (int)m_vpGroups.size())
+			return Index0;
+		if(Index0 == Index1)
+			return Index0;
+		OnModify();
+		std::swap(m_vpGroups[Index0], m_vpGroups[Index1]);
+		return Index1;
+	}
+
+	void DeleteGroup(int Index)
+	{
+		if(Index < 0 || Index >= (int)m_vpGroups.size())
+			return;
+		OnModify();
+		m_vpGroups.erase(m_vpGroups.begin() + Index);
+	}
+
+	void ModifyImageIndex(FIndexModifyFunction pfnFunc)
+	{
+		OnModify();
+		for(auto &pGroup : m_vpGroups)
+			pGroup->ModifyImageIndex(pfnFunc);
+	}
+
+	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc)
+	{
+		OnModify();
+		for(auto &pGroup : m_vpGroups)
+			pGroup->ModifyEnvelopeIndex(pfnFunc);
+	}
+
+	void ModifySoundIndex(FIndexModifyFunction pfnFunc)
+	{
+		OnModify();
+		for(auto &pGroup : m_vpGroups)
+			pGroup->ModifySoundIndex(pfnFunc);
+	}
+
+	void Clean();
+	void CreateDefault(IGraphics::CTextureHandle EntitiesTexture);
+
+	// io
+	bool Save(const char *pFilename);
+	bool Load(const char *pFilename, int StorageType, const std::function<void(const char *pErrorMessage)> &ErrorHandler);
+	void PerformSanityChecks(const std::function<void(const char *pErrorMessage)> &ErrorHandler);
+
+	// DDRace
+
+	std::shared_ptr<class CLayerTele> m_pTeleLayer;
+	std::shared_ptr<class CLayerSpeedup> m_pSpeedupLayer;
+	std::shared_ptr<class CLayerFront> m_pFrontLayer;
+	std::shared_ptr<class CLayerSwitch> m_pSwitchLayer;
+	std::shared_ptr<class CLayerTune> m_pTuneLayer;
+	void MakeTeleLayer(const std::shared_ptr<CLayer> &pLayer);
+	void MakeSpeedupLayer(const std::shared_ptr<CLayer> &pLayer);
+	void MakeFrontLayer(const std::shared_ptr<CLayer> &pLayer);
+	void MakeSwitchLayer(const std::shared_ptr<CLayer> &pLayer);
+	void MakeTuneLayer(const std::shared_ptr<CLayer> &pLayer);
+};
+
+struct CProperty
+{
+	const char *m_pName;
+	int m_Value;
+	int m_Type;
+	int m_Min;
+	int m_Max;
+};
+
+enum
+{
+	PROPTYPE_NULL = 0,
+	PROPTYPE_BOOL,
+	PROPTYPE_INT_STEP,
+	PROPTYPE_INT_SCROLL,
+	PROPTYPE_ANGLE_SCROLL,
+	PROPTYPE_COLOR,
+	PROPTYPE_IMAGE,
+	PROPTYPE_ENVELOPE,
+	PROPTYPE_SHIFT,
+	PROPTYPE_SOUND,
+	PROPTYPE_AUTOMAPPER,
+};
+
+class CDataFileWriterFinishJob : public IJob
+{
+	char m_aRealFileName[IO_MAX_PATH_LENGTH];
+	char m_aTempFileName[IO_MAX_PATH_LENGTH];
+	CDataFileWriter m_Writer;
+
+	void Run() override
+	{
+		m_Writer.Finish();
+	}
+
+public:
+	CDataFileWriterFinishJob(const char *pRealFileName, const char *pTempFileName, CDataFileWriter &&Writer) :
+		m_Writer(std::move(Writer))
+	{
+		str_copy(m_aRealFileName, pRealFileName);
+		str_copy(m_aTempFileName, pTempFileName);
+	}
+
+	const char *GetRealFileName() const { return m_aRealFileName; }
+	const char *GetTempFileName() const { return m_aTempFileName; }
+};
+
+class CEditor : public IEditor
+{
+	class IInput *m_pInput = nullptr;
+	class IClient *m_pClient = nullptr;
+	class CConfig *m_pConfig = nullptr;
+	class IConsole *m_pConsole = nullptr;
+	class IEngine *m_pEngine = nullptr;
+	class IGraphics *m_pGraphics = nullptr;
+	class ITextRender *m_pTextRender = nullptr;
+	class ISound *m_pSound = nullptr;
+	class IStorage *m_pStorage = nullptr;
+	CRenderTools m_RenderTools;
+	CUI m_UI;
+
+	std::vector<std::reference_wrapper<CEditorComponent>> m_vComponents;
+	CMapView m_MapView;
+
+	bool m_EditorWasUsedBefore = false;
+
+	IGraphics::CTextureHandle m_EntitiesTexture;
+
+	IGraphics::CTextureHandle m_FrontTexture;
+	IGraphics::CTextureHandle m_TeleTexture;
+	IGraphics::CTextureHandle m_SpeedupTexture;
+	IGraphics::CTextureHandle m_SwitchTexture;
+	IGraphics::CTextureHandle m_TuneTexture;
+
+	int GetTextureUsageFlag();
+
+	enum EPreviewState
+	{
+		PREVIEW_UNLOADED,
+		PREVIEW_LOADED,
+		PREVIEW_ERROR,
+	};
+
+	std::shared_ptr<CLayerGroup> m_apSavedBrushes[10];
+
+public:
+	class IInput *Input() { return m_pInput; }
+	class IClient *Client() { return m_pClient; }
+	class CConfig *Config() { return m_pConfig; }
+	class IConsole *Console() { return m_pConsole; }
+	class IEngine *Engine() { return m_pEngine; }
+	class IGraphics *Graphics() { return m_pGraphics; }
+	class ISound *Sound() { return m_pSound; }
+	class ITextRender *TextRender() { return m_pTextRender; }
+	class IStorage *Storage() { return m_pStorage; }
+	CUI *UI() { return &m_UI; }
+	CRenderTools *RenderTools() { return &m_RenderTools; }
+
+	CMapView *MapView() { return &m_MapView; }
+	const CMapView *MapView() const { return &m_MapView; }
+
+	CEditor() :
+		m_ZoomEnvelopeX(1.0f, 0.1f, 600.0f),
+		m_ZoomEnvelopeY(640.0f, 0.1f, 32000.0f)
+	{
+		m_EntitiesTexture.Invalidate();
+		m_FrontTexture.Invalidate();
+		m_TeleTexture.Invalidate();
+		m_SpeedupTexture.Invalidate();
+		m_SwitchTexture.Invalidate();
+		m_TuneTexture.Invalidate();
+
+		m_Mode = MODE_LAYERS;
+		m_Dialog = 0;
+
+		m_BrushColorEnabled = true;
+
+		m_aFileName[0] = '\0';
+		m_aFileNamePending[0] = '\0';
+		m_aFileSaveName[0] = '\0';
+		m_ValidSaveFilename = false;
+
+		m_PopupEventActivated = false;
+		m_PopupEventWasActivated = false;
+
+		m_FileDialogStorageType = 0;
+		m_FileDialogLastPopulatedStorageType = 0;
+		m_pFileDialogTitle = nullptr;
+		m_pFileDialogButtonText = nullptr;
+		m_pFileDialogUser = nullptr;
+		m_aFileDialogCurrentFolder[0] = '\0';
+		m_aFileDialogCurrentLink[0] = '\0';
+		m_aFilesSelectedName[0] = '\0';
+		m_pFileDialogPath = m_aFileDialogCurrentFolder;
+		m_FileDialogOpening = false;
+		m_FilesSelectedIndex = -1;
+
+		m_FilePreviewImage.Invalidate();
+		m_FilePreviewSound = -1;
+		m_FilePreviewState = PREVIEW_UNLOADED;
+
+		m_ToolbarPreviewSound = -1;
+
+		m_SelectEntitiesImage = "DDNet";
+
+		m_ResetZoomEnvelope = true;
+		m_OffsetEnvelopeX = 0.1f;
+		m_OffsetEnvelopeY = 0.5f;
+
+		m_ShowMousePointer = true;
+		m_MouseDeltaX = 0;
+		m_MouseDeltaY = 0;
+		m_MouseDeltaWx = 0;
+		m_MouseDeltaWy = 0;
+
+		m_GuiActive = true;
+		m_PreviewZoom = false;
+
+		m_ShowTileInfo = SHOW_TILE_OFF;
+		m_ShowDetail = true;
+		m_Animate = false;
+		m_AnimateStart = 0;
+		m_AnimateTime = 0;
+		m_AnimateSpeed = 1;
+
+		m_ShowEnvelopePreview = SHOWENV_NONE;
+		m_SelectedQuadEnvelope = -1;
+
+		m_vSelectedEnvelopePoints = {};
+		m_UpdateEnvPointInfo = false;
+		m_SelectedTangentInPoint = std::pair(-1, -1);
+		m_SelectedTangentOutPoint = std::pair(-1, -1);
+		m_CurrentQuadIndex = -1;
+
+		m_QuadKnifeActive = false;
+		m_QuadKnifeCount = 0;
+		mem_zero(m_aQuadKnifePoints, sizeof(m_aQuadKnifePoints));
+
+		m_CheckerTexture.Invalidate();
+		m_BackgroundTexture.Invalidate();
+		m_CursorTexture.Invalidate();
+
+		ms_pUiGotContext = nullptr;
+
+		// DDRace
+
+		m_TeleNumber = 1;
+		m_SwitchNum = 1;
+		m_TuningNum = 1;
+		m_SwitchDelay = 0;
+		m_SpeedupForce = 50;
+		m_SpeedupMaxSpeed = 0;
+		m_SpeedupAngle = 0;
+		m_LargeLayerWasWarned = false;
+		m_PreventUnusedTilesWasWarned = false;
+		m_AllowPlaceUnusedTiles = 0;
+		m_BrushDrawDestructive = true;
+	}
+
+	void Init() override;
+	void OnUpdate() override;
+	void OnRender() override;
+	void OnActivate() override;
+	void OnWindowResize() override;
+	void OnClose() override;
+	void OnDialogClose() override;
+	bool HasUnsavedData() const override { return m_Map.m_Modified; }
+	void UpdateMentions() override { m_Mentions++; }
+	void ResetMentions() override { m_Mentions = 0; }
+	void OnIngameMoved() override { m_IngameMoved = true; }
+	void ResetIngameMoved() override { m_IngameMoved = false; }
+
+	void HandleCursorMovement();
+	void DispatchInputEvents();
+	void HandleAutosave();
+	bool PerformAutosave();
+	void HandleWriterFinishJobs();
+
+	void RefreshFilteredFileList();
+	void FilelistPopulate(int StorageType, bool KeepSelection = false);
+	void InvokeFileDialog(int StorageType, int FileType, const char *pTitle, const char *pButtonText,
+		const char *pBasepath, bool FilenameAsDefault,
+		bool (*pfnFunc)(const char *pFilename, int StorageType, void *pUser), void *pUser);
+	struct SStringKeyComparator
+	{
+		bool operator()(const char *pLhs, const char *pRhs) const
+		{
+			return str_comp(pLhs, pRhs) < 0;
+		}
+	};
+	std::map<const char *, CUI::SMessagePopupContext *, SStringKeyComparator> m_PopupMessageContexts;
+	void ShowFileDialogError(const char *pFormat, ...)
+		GNUC_ATTRIBUTE((format(printf, 2, 3)));
+
+	void Reset(bool CreateDefault = true);
+	bool Save(const char *pFilename) override;
+	bool Load(const char *pFilename, int StorageType) override;
+	bool HandleMapDrop(const char *pFilename, int StorageType) override;
+	bool Append(const char *pFilename, int StorageType, bool IgnoreHistory = false);
+	void LoadCurrentMap();
+	void Render();
+
+	void RenderPressedKeys(CUIRect View);
+	void RenderSavingIndicator(CUIRect View);
+	void FreeDynamicPopupMenus();
+	void RenderMousePointer();
+
+	std::vector<CQuad *> GetSelectedQuads();
+	std::shared_ptr<CLayer> GetSelectedLayerType(int Index, int Type) const;
+	std::shared_ptr<CLayer> GetSelectedLayer(int Index) const;
+	std::shared_ptr<CLayerGroup> GetSelectedGroup() const;
+	CSoundSource *GetSelectedSource() const;
+	void SelectLayer(int LayerIndex, int GroupIndex = -1);
+	void AddSelectedLayer(int LayerIndex);
+	void SelectQuad(int Index);
+	void ToggleSelectQuad(int Index);
+	void DeselectQuads();
+	void DeselectQuadPoints();
+	void SelectQuadPoint(int QuadIndex, int Index);
+	void ToggleSelectQuadPoint(int QuadIndex, int Index);
+	void DeleteSelectedQuads();
+	bool IsQuadSelected(int Index) const;
+	bool IsQuadCornerSelected(int Index) const;
+	bool IsQuadPointSelected(int QuadIndex, int Index) const;
+	int FindSelectedQuadIndex(int Index) const;
+
+	int FindEnvPointIndex(int Index, int Channel) const;
+	void SelectEnvPoint(int Index);
+	void SelectEnvPoint(int Index, int Channel);
+	void ToggleEnvPoint(int Index, int Channel);
+	bool IsEnvPointSelected(int Index, int Channel) const;
+	bool IsEnvPointSelected(int Index) const;
+	void DeselectEnvPoints();
+	void SelectTangentOutPoint(int Index, int Channel);
+	bool IsTangentOutPointSelected(int Index, int Channel) const;
+	void SelectTangentInPoint(int Index, int Channel);
+	bool IsTangentInPointSelected(int Index, int Channel) const;
+	bool IsTangentInSelected() const;
+	bool IsTangentOutSelected() const;
+	bool IsTangentSelected() const;
+	std::pair<int, int> EnvGetSelectedTimeAndValue() const;
+
+	template<typename E>
+	SEditResult<E> DoPropertiesWithState(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f));
+	int DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f));
+
+	CUI::SColorPickerPopupContext m_ColorPickerPopupContext;
+	const void *m_pColorPickerPopupActiveID = nullptr;
+	void DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor);
+
+	int m_Mode;
+	int m_Dialog;
+	char m_aTooltip[256] = "";
+
+	bool m_BrushColorEnabled;
+
+	char m_aFileName[IO_MAX_PATH_LENGTH];
+	char m_aFileNamePending[IO_MAX_PATH_LENGTH];
+	char m_aFileSaveName[IO_MAX_PATH_LENGTH];
+	bool m_ValidSaveFilename;
+
+	enum
+	{
+		POPEVENT_EXIT = 0,
+		POPEVENT_LOAD,
+		POPEVENT_LOADCURRENT,
+		POPEVENT_LOADDROP,
+		POPEVENT_NEW,
+		POPEVENT_SAVE,
+		POPEVENT_SAVE_COPY,
+		POPEVENT_SAVE_IMG,
+		POPEVENT_SAVE_SOUND,
+		POPEVENT_LARGELAYER,
+		POPEVENT_PREVENTUNUSEDTILES,
+		POPEVENT_IMAGEDIV16,
+		POPEVENT_IMAGE_MAX,
+		POPEVENT_SOUND_MAX,
+		POPEVENT_PLACE_BORDER_TILES,
+		POPEVENT_PIXELART_BIG_IMAGE,
+		POPEVENT_PIXELART_MANY_COLORS,
+		POPEVENT_PIXELART_TOO_MANY_COLORS
+	};
+
+	int m_PopupEventType;
+	int m_PopupEventActivated;
+	int m_PopupEventWasActivated;
+	bool m_LargeLayerWasWarned;
+	bool m_PreventUnusedTilesWasWarned;
+	int m_AllowPlaceUnusedTiles;
+	bool m_BrushDrawDestructive;
+
+	int m_Mentions = 0;
+	bool m_IngameMoved = false;
+
+	enum
+	{
+		FILETYPE_MAP,
+		FILETYPE_IMG,
+		FILETYPE_SOUND,
+		NUM_FILETYPES
+	};
+
+	int m_FileDialogStorageType;
+	int m_FileDialogLastPopulatedStorageType;
+	const char *m_pFileDialogTitle;
+	const char *m_pFileDialogButtonText;
+	bool (*m_pfnFileDialogFunc)(const char *pFileName, int StorageType, void *pUser);
+	void *m_pFileDialogUser;
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_FileDialogFileNameInput;
+	char m_aFileDialogCurrentFolder[IO_MAX_PATH_LENGTH];
+	char m_aFileDialogCurrentLink[IO_MAX_PATH_LENGTH];
+	char m_aFilesSelectedName[IO_MAX_PATH_LENGTH];
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_FileDialogFilterInput;
+	char *m_pFileDialogPath;
+	int m_FileDialogFileType;
+	bool m_FileDialogMultipleStorages = false;
+	bool m_FileDialogShowingRoot = false;
+	int m_FilesSelectedIndex;
+	CLineInputBuffered<IO_MAX_PATH_LENGTH> m_FileDialogNewFolderNameInput;
+
+	IGraphics::CTextureHandle m_FilePreviewImage;
+	int m_FilePreviewSound;
+	EPreviewState m_FilePreviewState;
+	CImageInfo m_FilePreviewImageInfo;
+	bool m_FileDialogOpening;
+
+	int m_ToolbarPreviewSound;
+
+	struct CFilelistItem
+	{
+		char m_aFilename[IO_MAX_PATH_LENGTH];
+		char m_aName[IO_MAX_PATH_LENGTH];
+		bool m_IsDir;
+		bool m_IsLink;
+		int m_StorageType;
+		time_t m_TimeModified;
+	};
+	std::vector<CFilelistItem> m_vCompleteFileList;
+	std::vector<const CFilelistItem *> m_vpFilteredFileList;
+
+	static bool CompareFilenameAscending(const CFilelistItem *pLhs, const CFilelistItem *pRhs)
+	{
+		if(str_comp(pLhs->m_aFilename, "..") == 0)
+			return true;
+		if(str_comp(pRhs->m_aFilename, "..") == 0)
+			return false;
+		if(pLhs->m_IsLink != pRhs->m_IsLink)
+			return pLhs->m_IsLink;
+		if(pLhs->m_IsDir != pRhs->m_IsDir)
+			return pLhs->m_IsDir;
+		return str_comp_filenames(pLhs->m_aName, pRhs->m_aName) < 0;
+	}
+
+	static bool CompareFilenameDescending(const CFilelistItem *pLhs, const CFilelistItem *pRhs)
+	{
+		if(str_comp(pLhs->m_aFilename, "..") == 0)
+			return true;
+		if(str_comp(pRhs->m_aFilename, "..") == 0)
+			return false;
+		if(pLhs->m_IsLink != pRhs->m_IsLink)
+			return pLhs->m_IsLink;
+		if(pLhs->m_IsDir != pRhs->m_IsDir)
+			return pLhs->m_IsDir;
+		return str_comp_filenames(pLhs->m_aName, pRhs->m_aName) > 0;
+	}
+
+	static bool CompareTimeModifiedAscending(const CFilelistItem *pLhs, const CFilelistItem *pRhs)
+	{
+		if(str_comp(pLhs->m_aFilename, "..") == 0)
+			return true;
+		if(str_comp(pRhs->m_aFilename, "..") == 0)
+			return false;
+		if(pLhs->m_IsLink || pRhs->m_IsLink)
+			return pLhs->m_IsLink;
+		if(pLhs->m_IsDir != pRhs->m_IsDir)
+			return pLhs->m_IsDir;
+		return pLhs->m_TimeModified < pRhs->m_TimeModified;
+	}
+
+	static bool CompareTimeModifiedDescending(const CFilelistItem *pLhs, const CFilelistItem *pRhs)
+	{
+		if(str_comp(pLhs->m_aFilename, "..") == 0)
+			return true;
+		if(str_comp(pRhs->m_aFilename, "..") == 0)
+			return false;
+		if(pLhs->m_IsLink || pRhs->m_IsLink)
+			return pLhs->m_IsLink;
+		if(pLhs->m_IsDir != pRhs->m_IsDir)
+			return pLhs->m_IsDir;
+		return pLhs->m_TimeModified > pRhs->m_TimeModified;
+	}
+
+	void SortFilteredFileList();
+	int m_SortByFilename = 1;
+	int m_SortByTimeModified = 0;
+
+	std::vector<std::string> m_vSelectEntitiesFiles;
+	std::string m_SelectEntitiesImage;
+
+	// Zooming
+	CSmoothValue m_ZoomEnvelopeX;
+	CSmoothValue m_ZoomEnvelopeY;
+
+	bool m_ResetZoomEnvelope;
+
+	float m_OffsetEnvelopeX;
+	float m_OffsetEnvelopeY;
+
+	bool m_ShowMousePointer;
+	bool m_GuiActive;
+
+	char m_aMenuBackgroundTooltip[256];
+	bool m_PreviewZoom;
+	float m_MouseWScale = 1.0f; // Mouse (i.e. UI) scale relative to the World (selected Group)
+	float m_MouseX = 0.0f;
+	float m_MouseY = 0.0f;
+	float m_MouseWorldX = 0.0f;
+	float m_MouseWorldY = 0.0f;
+	float m_MouseWorldNoParaX = 0.0f;
+	float m_MouseWorldNoParaY = 0.0f;
+	float m_MouseDeltaX;
+	float m_MouseDeltaY;
+	float m_MouseDeltaWx;
+	float m_MouseDeltaWy;
+
+	enum EShowTile
+	{
+		SHOW_TILE_OFF,
+		SHOW_TILE_DECIMAL,
+		SHOW_TILE_HEXADECIMAL
+	};
+	EShowTile m_ShowTileInfo;
+	bool m_ShowDetail;
+	bool m_Animate;
+	int64_t m_AnimateStart;
+	float m_AnimateTime;
+	float m_AnimateSpeed;
+
+	enum EExtraEditor
+	{
+		EXTRAEDITOR_NONE = -1,
+		EXTRAEDITOR_ENVELOPES,
+		EXTRAEDITOR_SERVER_SETTINGS,
+		EXTRAEDITOR_HISTORY,
+		NUM_EXTRAEDITORS,
+	};
+	EExtraEditor m_ActiveExtraEditor = EXTRAEDITOR_NONE;
+	float m_aExtraEditorSplits[NUM_EXTRAEDITORS] = {250.0f, 250.0f, 250.0f};
+
+	enum EShowEnvelope
+	{
+		SHOWENV_NONE = 0,
+		SHOWENV_SELECTED,
+		SHOWENV_ALL
+	};
+	EShowEnvelope m_ShowEnvelopePreview;
+	bool m_ShowPicker;
+
+	std::vector<int> m_vSelectedLayers;
+	std::vector<int> m_vSelectedQuads;
+	int m_SelectedQuadPoint;
+	int m_SelectedQuadIndex;
+	int m_SelectedGroup;
+	int m_SelectedQuadPoints;
+	int m_SelectedEnvelope;
+	std::vector<std::pair<int, int>> m_vSelectedEnvelopePoints;
+	int m_SelectedQuadEnvelope;
+	int m_CurrentQuadIndex;
+	int m_SelectedImage;
+	int m_SelectedSound;
+	int m_SelectedSource;
+	std::pair<int, int> m_SelectedTangentInPoint;
+	std::pair<int, int> m_SelectedTangentOutPoint;
+	bool m_UpdateEnvPointInfo;
+
+	bool m_QuadKnifeActive;
+	int m_QuadKnifeCount;
+	vec2 m_aQuadKnifePoints[4];
+
+	IGraphics::CTextureHandle m_CheckerTexture;
+	IGraphics::CTextureHandle m_BackgroundTexture;
+	IGraphics::CTextureHandle m_CursorTexture;
+
+	IGraphics::CTextureHandle GetEntitiesTexture();
+
+	std::shared_ptr<CLayerGroup> m_pBrush;
+	std::shared_ptr<CLayerTiles> m_pTilesetPicker;
+	std::shared_ptr<CLayerQuads> m_pQuadsetPicker;
+
+	static const void *ms_pUiGotContext;
+
+	CEditorMap m_Map;
+	std::deque<std::shared_ptr<CDataFileWriterFinishJob>> m_WriterFinishJobs;
+
+	int m_ShiftBy;
+
+	static void EnvelopeEval(int TimeOffsetMillis, int Env, ColorRGBA &Channels, void *pUser);
+
+	CLineInputBuffered<256> m_SettingsCommandInput;
+
+	CImageInfo m_TileartImageInfo;
+	char m_aTileartFilename[IO_MAX_PATH_LENGTH];
+	void AddTileart(bool IgnoreHistory = false);
+	void TileartCheckColors();
+
+	void PlaceBorderTiles();
+
+	void UpdateTooltip(const void *pID, const CUIRect *pRect, const char *pToolTip);
+	int DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA Color, int Corners);
+
+	int DoButton_Ex(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = 10.0f);
+	int DoButton_FontIcon(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip, int Corners, float FontSize = 10.0f);
+	int DoButton_ButtonDec(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_ButtonInc(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+
+	int DoButton_File(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+
+	int DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
+	int DoButton_MenuItem(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags = 0, const char *pToolTip = nullptr);
+
+	int DoButton_DraggableEx(const void *pID, const char *pText, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted, int Flags, const char *pToolTip = nullptr, int Corners = IGraphics::CORNER_ALL, float FontSize = 10.0f);
+
+	bool DoEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr);
+	bool DoClearableEditBox(CLineInput *pLineInput, const CUIRect *pRect, float FontSize, int Corners = IGraphics::CORNER_ALL, const char *pToolTip = nullptr);
+
+	void RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness);
+
+	SEditResult<int> UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int corners = IGraphics::CORNER_ALL, ColorRGBA *pColor = nullptr, bool ShowValue = true);
+
+	static CUI::EPopupMenuFunctionResult PopupMenuFile(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupMenuTools(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupMenuSettings(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupGroup(void *pContext, CUIRect View, bool Active);
+	struct SLayerPopupContext : public SPopupMenuId
+	{
+		CEditor *m_pEditor;
+		std::vector<std::shared_ptr<CLayerTiles>> m_vpLayers;
+		std::vector<int> m_vLayerIndices;
+		CLayerTiles::SCommonPropState m_CommonPropState;
+	};
+	static CUI::EPopupMenuFunctionResult PopupLayer(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupQuad(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSource(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupPoint(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupEnvPoint(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupEnvPointMulti(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupImage(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSound(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupNewFolder(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupMapInfo(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupEvent(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSelectImage(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSelectSound(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSelectGametileOp(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupTele(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSpeedup(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupSwitch(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupTune(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupGoto(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupEntities(void *pContext, CUIRect View, bool Active);
+	static CUI::EPopupMenuFunctionResult PopupProofMode(void *pContext, CUIRect View, bool Active);
+
+	static bool CallbackOpenMap(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackAppendMap(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackSaveMap(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackSaveCopyMap(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackAddTileart(const char *pFilepath, int StorageType, void *pUser);
+	static bool CallbackSaveImage(const char *pFileName, int StorageType, void *pUser);
+	static bool CallbackSaveSound(const char *pFileName, int StorageType, void *pUser);
+
+	void PopupSelectImageInvoke(int Current, float x, float y);
+	int PopupSelectImageResult();
+
+	void PopupSelectGametileOpInvoke(float x, float y);
+	int PopupSelectGameTileOpResult();
+
+	void PopupSelectConfigAutoMapInvoke(int Current, float x, float y);
+	int PopupSelectConfigAutoMapResult();
+
+	void PopupSelectSoundInvoke(int Current, float x, float y);
+	int PopupSelectSoundResult();
+
+	void DoQuadEnvelopes(const std::vector<CQuad> &vQuads, IGraphics::CTextureHandle Texture = IGraphics::CTextureHandle());
+	void DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int pIndex);
+	void DoQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int v);
+	void SetHotQuadPoint(const std::shared_ptr<CLayerQuads> &pLayer);
+
+	float TriangleArea(vec2 A, vec2 B, vec2 C);
+	bool IsInTriangle(vec2 Point, vec2 A, vec2 B, vec2 C);
+	void DoQuadKnife(int QuadIndex);
+
+	void DoSoundSource(CSoundSource *pSource, int Index);
+
+	enum class EAxis
+	{
+		AXIS_NONE = 0,
+		AXIS_X,
+		AXIS_Y
+	};
+	struct SAxisAlignedBoundingBox
+	{
+		enum
+		{
+			POINT_TL = 0,
+			POINT_TR,
+			POINT_BL,
+			POINT_BR,
+			POINT_CENTER,
+			NUM_POINTS
+		};
+		CPoint m_aPoints[NUM_POINTS];
+	};
+	void DoMapEditor(CUIRect View);
+	void DoToolbarLayers(CUIRect Toolbar);
+	void DoToolbarSounds(CUIRect Toolbar);
+	void DoQuad(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int Index);
+	void PreparePointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex);
+	void DoPointDrag(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY);
+	EAxis GetDragAxis(int OffsetX, int OffsetY);
+	void DrawAxis(EAxis Axis, CPoint &OriginalPoint, CPoint &Point);
+	void DrawAABB(const SAxisAlignedBoundingBox &AABB, int OffsetX = 0, int OffsetY = 0);
+	ColorRGBA GetButtonColor(const void *pID, int Checked);
+
+	// Alignment methods
+	// These methods take `OffsetX` and `OffsetY` because the calculations are made with the original positions
+	// of the quad(s), before we started dragging. This allows us to edit `OffsetX` and `OffsetY` based on the previously
+	// calculated alignments.
+	struct SAlignmentInfo
+	{
+		CPoint m_AlignedPoint; // The "aligned" point, which we want to align/snap to
+		union
+		{
+			// The current changing value when aligned to this point. When aligning to a point on the X axis, then the X value is changing because
+			// we aligned the Y values (X axis aligned => Y values are the same, Y axis aligned => X values are the same).
+			int m_X;
+			int m_Y;
+		};
+		EAxis m_Axis; // The axis we are aligning on
+		int m_PointIndex; // The point index we are aligning
+		int m_Diff; // Store the difference
+	};
+	void ComputePointAlignments(const std::shared_ptr<CLayerQuads> &pLayer, CQuad *pQuad, int QuadIndex, int PointIndex, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments, bool Append = false) const;
+	void ComputePointsAlignments(const std::shared_ptr<CLayerQuads> &pLayer, bool Pivot, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const;
+	void ComputeAABBAlignments(const std::shared_ptr<CLayerQuads> &pLayer, const SAxisAlignedBoundingBox &AABB, int OffsetX, int OffsetY, std::vector<SAlignmentInfo> &vAlignments) const;
+	void DrawPointAlignments(const std::vector<SAlignmentInfo> &vAlignments, int OffsetX, int OffsetY);
+	void QuadSelectionAABB(const std::shared_ptr<CLayerQuads> &pLayer, SAxisAlignedBoundingBox &OutAABB);
+	void ApplyAlignments(const std::vector<SAlignmentInfo> &vAlignments, int &OffsetX, int &OffsetY);
+	void ApplyAxisAlignment(int &OffsetX, int &OffsetY);
+
+	bool ReplaceImage(const char *pFilename, int StorageType, bool CheckDuplicate);
+	static bool ReplaceImageCallback(const char *pFilename, int StorageType, void *pUser);
+	bool ReplaceSound(const char *pFileName, int StorageType, bool CheckDuplicate);
+	static bool ReplaceSoundCallback(const char *pFileName, int StorageType, void *pUser);
+	static bool AddImage(const char *pFilename, int StorageType, void *pUser);
+	static bool AddSound(const char *pFileName, int StorageType, void *pUser);
+
+	bool IsEnvelopeUsed(int EnvelopeIndex) const;
+	void RemoveUnusedEnvelopes();
+
+	static bool IsVanillaImage(const char *pImage);
+
+	void RenderLayers(CUIRect LayersBox);
+	void RenderImagesList(CUIRect Toolbox);
+	void RenderSelectedImage(CUIRect View);
+	void RenderSounds(CUIRect Toolbox);
+	void RenderModebar(CUIRect View);
+	void RenderStatusbar(CUIRect View, CUIRect *pTooltipRect);
+	void RenderTooltip(CUIRect TooltipRect);
+
+	void RenderEnvelopeEditor(CUIRect View);
+	void RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast);
+	void RenderEditorHistory(CUIRect View);
+
+	void RenderExtraEditorDragBar(CUIRect View, CUIRect DragBar);
+
+	void SetHotEnvelopePoint(const CUIRect &View, const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels);
+
+	void RenderMenubar(CUIRect Menubar);
+	void RenderFileDialog();
+
+	void SelectGameLayer();
+	std::vector<int> SortImages();
+	bool SelectLayerByTile();
+
+	void DoAudioPreview(CUIRect View, const void *pPlayPauseButtonID, const void *pStopButtonID, const void *pSeekBarID, const int SampleID);
+
+	// Tile Numbers For Explanations - TODO: Add/Improve tiles and explanations
+	enum
+	{
+		TILE_PUB_AIR,
+		TILE_PUB_HOOKABLE,
+		TILE_PUB_DEATH,
+		TILE_PUB_UNHOOKABLE,
+
+		TILE_PUB_CREDITS1 = 140,
+		TILE_PUB_CREDITS2,
+		TILE_PUB_CREDITS3,
+		TILE_PUB_CREDITS4,
+		TILE_PUB_CREDITS5 = 156,
+		TILE_PUB_CREDITS6,
+		TILE_PUB_CREDITS7,
+		TILE_PUB_CREDITS8,
+
+		TILE_PUB_ENTITIES_OFF1 = 190,
+		TILE_PUB_ENTITIES_OFF2,
+	};
+
+	enum
+	{
+		TILE_FNG_SPIKE_GOLD = 7,
+		TILE_FNG_SPIKE_NORMAL,
+		TILE_FNG_SPIKE_RED,
+		TILE_FNG_SPIKE_BLUE,
+		TILE_FNG_SCORE_RED,
+		TILE_FNG_SCORE_BLUE,
+
+		TILE_FNG_SPIKE_GREEN = 14,
+		TILE_FNG_SPIKE_PURPLE,
+
+		TILE_FNG_SPAWN = 192,
+		TILE_FNG_SPAWN_RED,
+		TILE_FNG_SPAWN_BLUE,
+		TILE_FNG_FLAG_RED,
+		TILE_FNG_FLAG_BLUE,
+		TILE_FNG_SHIELD,
+		TILE_FNG_HEART,
+		TILE_FNG_SHOTGUN,
+		TILE_FNG_GRENADE,
+		TILE_FNG_NINJA,
+		TILE_FNG_LASER,
+
+		TILE_FNG_SPIKE_OLD1 = 208,
+		TILE_FNG_SPIKE_OLD2,
+		TILE_FNG_SPIKE_OLD3
+	};
+
+	enum
+	{
+		TILE_VANILLA_SPAWN = 192,
+		TILE_VANILLA_SPAWN_RED,
+		TILE_VANILLA_SPAWN_BLUE,
+		TILE_VANILLA_FLAG_RED,
+		TILE_VANILLA_FLAG_BLUE,
+		TILE_VANILLA_SHIELD,
+		TILE_VANILLA_HEART,
+		TILE_VANILLA_SHOTGUN,
+		TILE_VANILLA_GRENADE,
+		TILE_VANILLA_NINJA,
+		TILE_VANILLA_LASER,
+	};
+
+	// Explanations
+	enum class EExplanation
+	{
+		NONE,
+		DDNET,
+		FNG,
+		RACE,
+		VANILLA,
+		BLOCKWORLDS
+	};
+	static const char *ExplainDDNet(int Tile, int Layer);
+	static const char *ExplainFNG(int Tile, int Layer);
+	static const char *ExplainVanilla(int Tile, int Layer);
+	static const char *Explain(EExplanation Explanation, int Tile, int Layer);
+
+	// Zooming
+	void ZoomAdaptOffsetX(float ZoomFactor, const CUIRect &View);
+	void UpdateZoomEnvelopeX(const CUIRect &View);
+
+	void ZoomAdaptOffsetY(float ZoomFactor, const CUIRect &View);
+	void UpdateZoomEnvelopeY(const CUIRect &View);
+
+	void ResetZoomEnvelope(const std::shared_ptr<CEnvelope> &pEnvelope, int ActiveChannels);
+	void RemoveTimeOffsetEnvelope(const std::shared_ptr<CEnvelope> &pEnvelope);
+	float ScreenToEnvelopeX(const CUIRect &View, float x) const;
+	float EnvelopeToScreenX(const CUIRect &View, float x) const;
+	float ScreenToEnvelopeY(const CUIRect &View, float y) const;
+	float EnvelopeToScreenY(const CUIRect &View, float y) const;
+	float ScreenToEnvelopeDX(const CUIRect &View, float dx);
+	float ScreenToEnvelopeDY(const CUIRect &View, float dy);
+
+	// DDRace
+
+	IGraphics::CTextureHandle GetFrontTexture();
+	IGraphics::CTextureHandle GetTeleTexture();
+	IGraphics::CTextureHandle GetSpeedupTexture();
+	IGraphics::CTextureHandle GetSwitchTexture();
+	IGraphics::CTextureHandle GetTuneTexture();
+
+	unsigned char m_TeleNumber;
+
+	unsigned char m_TuningNum;
+
+	unsigned char m_SpeedupForce;
+	unsigned char m_SpeedupMaxSpeed;
+	short m_SpeedupAngle;
+
+	unsigned char m_SwitchNum;
+	unsigned char m_SwitchDelay;
+
+public:
+	// Undo/Redo
+	CEditorHistory m_EditorHistory;
+	CEditorHistory m_ServerSettingsHistory;
+	CEditorHistory m_EnvelopeEditorHistory;
+	CQuadEditTracker m_QuadTracker;
+	CEnvelopeEditorOperationTracker m_EnvOpTracker;
+
+private:
+	void UndoLastAction();
+	void RedoLastAction();
+
+private:
+	std::map<int, CPoint[5]> m_QuadDragOriginalPoints;
+};
+
+// make sure to inline this function
+inline class IGraphics *CLayer::Graphics() { return m_pEditor->Graphics(); }
+inline class ITextRender *CLayer::TextRender() { return m_pEditor->TextRender(); }
+
+#endif
diff --git a/src_bkp/game/editor/editor_action.h b/src_bkp/game/editor/editor_action.h
new file mode 100644
index 0000000000..d4fb124df4
--- /dev/null
+++ b/src_bkp/game/editor/editor_action.h
@@ -0,0 +1,30 @@
+#ifndef GAME_EDITOR_EDITOR_ACTION_H
+#define GAME_EDITOR_EDITOR_ACTION_H
+
+#include <string>
+
+class CEditor;
+
+class IEditorAction
+{
+public:
+	IEditorAction(CEditor *pEditor) :
+		m_pEditor(pEditor) {}
+
+	IEditorAction() = default;
+
+	virtual ~IEditorAction() = default;
+
+	virtual void Undo() = 0;
+	virtual void Redo() = 0;
+
+	virtual bool IsEmpty() { return false; }
+
+	const char *DisplayText() const { return m_aDisplayText; }
+
+protected:
+	CEditor *m_pEditor;
+	char m_aDisplayText[256];
+};
+
+#endif
diff --git a/src_bkp/game/editor/editor_actions.cpp b/src_bkp/game/editor/editor_actions.cpp
new file mode 100644
index 0000000000..88ce5d5590
--- /dev/null
+++ b/src_bkp/game/editor/editor_actions.cpp
@@ -0,0 +1,2067 @@
+#include "editor_actions.h"
+#include <game/editor/mapitems/image.h>
+
+CEditorBrushDrawAction::CEditorBrushDrawAction(CEditor *pEditor, int Group) :
+	IEditorAction(pEditor), m_Group(Group)
+{
+	auto &Map = pEditor->m_Map;
+	for(size_t k = 0; k < Map.m_vpGroups[Group]->m_vpLayers.size(); k++)
+	{
+		auto pLayer = Map.m_vpGroups[Group]->m_vpLayers[k];
+
+		if(pLayer->m_Type == LAYERTYPE_TILES)
+		{
+			auto pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+
+			if(pLayer == Map.m_pTeleLayer)
+			{
+				if(!Map.m_pTeleLayer->m_History.empty())
+				{
+					m_TeleTileChanges = std::map(Map.m_pTeleLayer->m_History);
+					Map.m_pTeleLayer->ClearHistory();
+				}
+			}
+			else if(pLayer == Map.m_pTuneLayer)
+			{
+				if(!Map.m_pTuneLayer->m_History.empty())
+				{
+					m_TuneTileChanges = std::map(Map.m_pTuneLayer->m_History);
+					Map.m_pTuneLayer->ClearHistory();
+				}
+			}
+			else if(pLayer == Map.m_pSwitchLayer)
+			{
+				if(!Map.m_pSwitchLayer->m_History.empty())
+				{
+					m_SwitchTileChanges = std::map(Map.m_pSwitchLayer->m_History);
+					Map.m_pSwitchLayer->ClearHistory();
+				}
+			}
+			else if(pLayer == Map.m_pSpeedupLayer)
+			{
+				if(!Map.m_pSpeedupLayer->m_History.empty())
+				{
+					m_SpeedupTileChanges = std::map(Map.m_pSpeedupLayer->m_History);
+					Map.m_pSpeedupLayer->ClearHistory();
+				}
+			}
+
+			if(!pLayerTiles->m_TilesHistory.empty())
+			{
+				m_vTileChanges.emplace_back(k, std::map(pLayerTiles->m_TilesHistory));
+				pLayerTiles->ClearHistory();
+			}
+		}
+	}
+
+	SetInfos();
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Brush draw (x%d) on %d layers", m_TotalTilesDrawn, m_TotalLayers);
+}
+
+void CEditorBrushDrawAction::SetInfos()
+{
+	m_TotalTilesDrawn = 0;
+	m_TotalLayers = 0;
+
+	// Process normal tiles
+	for(auto const &Pair : m_vTileChanges)
+	{
+		int Layer = Pair.first;
+		std::shared_ptr<CLayer> pLayer = m_pEditor->m_Map.m_vpGroups[m_Group]->m_vpLayers[Layer];
+		m_TotalLayers++;
+
+		if(pLayer->m_Type == LAYERTYPE_TILES)
+		{
+			std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+			auto Changes = Pair.second;
+			for(auto &Change : Changes)
+			{
+				m_TotalTilesDrawn += Change.second.size();
+			}
+		}
+	}
+
+	// Process speedup tiles
+	for(auto const &SpeedupChange : m_SpeedupTileChanges)
+	{
+		m_TotalTilesDrawn += SpeedupChange.second.size();
+	}
+
+	// Process tele tiles
+	for(auto const &TeleChange : m_TeleTileChanges)
+	{
+		m_TotalTilesDrawn += TeleChange.second.size();
+	}
+
+	// Process switch tiles
+	for(auto const &SwitchChange : m_SwitchTileChanges)
+	{
+		m_TotalTilesDrawn += SwitchChange.second.size();
+	}
+
+	// Process tune tiles
+	for(auto const &TuneChange : m_TuneTileChanges)
+	{
+		m_TotalTilesDrawn += TuneChange.second.size();
+	}
+
+	m_TotalLayers += !m_SpeedupTileChanges.empty();
+	m_TotalLayers += !m_SwitchTileChanges.empty();
+	m_TotalLayers += !m_TeleTileChanges.empty();
+	m_TotalLayers += !m_TuneTileChanges.empty();
+}
+
+bool CEditorBrushDrawAction::IsEmpty()
+{
+	return m_vTileChanges.empty() && m_SpeedupTileChanges.empty() && m_SwitchTileChanges.empty() && m_TeleTileChanges.empty() && m_TuneTileChanges.empty();
+}
+
+void CEditorBrushDrawAction::Undo()
+{
+	Apply(true);
+}
+
+void CEditorBrushDrawAction::Redo()
+{
+	Apply(false);
+}
+
+void CEditorBrushDrawAction::Apply(bool Undo)
+{
+	auto &Map = m_pEditor->m_Map;
+
+	// Process normal tiles
+	for(auto const &Pair : m_vTileChanges)
+	{
+		int Layer = Pair.first;
+		std::shared_ptr<CLayer> pLayer = Map.m_vpGroups[m_Group]->m_vpLayers[Layer];
+
+		if(pLayer->m_Type == LAYERTYPE_TILES)
+		{
+			std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+			auto Changes = Pair.second;
+			for(auto &Change : Changes)
+			{
+				int y = Change.first;
+				auto Line = Change.second;
+				for(auto &Tile : Line)
+				{
+					int x = Tile.first;
+					STileStateChange State = Tile.second;
+					pLayerTiles->SetTileIgnoreHistory(x, y, Undo ? State.m_Previous : State.m_Current);
+				}
+			}
+		}
+	}
+
+	// Process speedup tiles
+	for(auto const &SpeedupChange : m_SpeedupTileChanges)
+	{
+		int y = SpeedupChange.first;
+		auto Line = SpeedupChange.second;
+		for(auto &Tile : Line)
+		{
+			int x = Tile.first;
+			int Index = y * Map.m_pSpeedupLayer->m_Width + x;
+			SSpeedupTileStateChange State = Tile.second;
+			SSpeedupTileStateChange::SData Data = Undo ? State.m_Previous : State.m_Current;
+
+			Map.m_pSpeedupLayer->m_pSpeedupTile[Index].m_Force = Data.m_Force;
+			Map.m_pSpeedupLayer->m_pSpeedupTile[Index].m_MaxSpeed = Data.m_MaxSpeed;
+			Map.m_pSpeedupLayer->m_pSpeedupTile[Index].m_Angle = Data.m_Angle;
+			Map.m_pSpeedupLayer->m_pSpeedupTile[Index].m_Type = Data.m_Type;
+			Map.m_pSpeedupLayer->m_pTiles[Index].m_Index = Data.m_Index;
+		}
+	}
+
+	// Process tele tiles
+	for(auto const &TeleChange : m_TeleTileChanges)
+	{
+		int y = TeleChange.first;
+		auto Line = TeleChange.second;
+		for(auto &Tile : Line)
+		{
+			int x = Tile.first;
+			int Index = y * Map.m_pTeleLayer->m_Width + x;
+			STeleTileStateChange State = Tile.second;
+			STeleTileStateChange::SData Data = Undo ? State.m_Previous : State.m_Current;
+
+			Map.m_pTeleLayer->m_pTeleTile[Index].m_Number = Data.m_Number;
+			Map.m_pTeleLayer->m_pTeleTile[Index].m_Type = Data.m_Type;
+			Map.m_pTeleLayer->m_pTiles[Index].m_Index = Data.m_Index;
+		}
+	}
+
+	// Process switch tiles
+	for(auto const &SwitchChange : m_SwitchTileChanges)
+	{
+		int y = SwitchChange.first;
+		auto Line = SwitchChange.second;
+		for(auto &Tile : Line)
+		{
+			int x = Tile.first;
+			int Index = y * Map.m_pSwitchLayer->m_Width + x;
+			SSwitchTileStateChange State = Tile.second;
+			SSwitchTileStateChange::SData Data = Undo ? State.m_Previous : State.m_Current;
+
+			Map.m_pSwitchLayer->m_pSwitchTile[Index].m_Number = Data.m_Number;
+			Map.m_pSwitchLayer->m_pSwitchTile[Index].m_Type = Data.m_Type;
+			Map.m_pSwitchLayer->m_pSwitchTile[Index].m_Flags = Data.m_Flags;
+			Map.m_pSwitchLayer->m_pSwitchTile[Index].m_Delay = Data.m_Delay;
+			Map.m_pSwitchLayer->m_pTiles[Index].m_Index = Data.m_Index;
+		}
+	}
+
+	// Process tune tiles
+	for(auto const &TuneChange : m_TuneTileChanges)
+	{
+		int y = TuneChange.first;
+		auto Line = TuneChange.second;
+		for(auto &Tile : Line)
+		{
+			int x = Tile.first;
+			int Index = y * Map.m_pTuneLayer->m_Width + x;
+			STuneTileStateChange State = Tile.second;
+			STuneTileStateChange::SData Data = Undo ? State.m_Previous : State.m_Current;
+
+			Map.m_pTuneLayer->m_pTuneTile[Index].m_Number = Data.m_Number;
+			Map.m_pTuneLayer->m_pTuneTile[Index].m_Type = Data.m_Type;
+			Map.m_pTuneLayer->m_pTiles[Index].m_Index = Data.m_Index;
+		}
+	}
+}
+
+// -------------------------------------------
+
+CEditorActionQuadPlace::CEditorActionQuadPlace(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<CQuad> &vBrush) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_vBrush(vBrush)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Quad place (x%d)", (int)m_vBrush.size());
+}
+
+void CEditorActionQuadPlace::Undo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	for(size_t k = 0; k < m_vBrush.size(); k++)
+		pLayerQuads->m_vQuads.pop_back();
+
+	m_pEditor->m_Map.OnModify();
+}
+void CEditorActionQuadPlace::Redo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	for(auto &Brush : m_vBrush)
+		pLayerQuads->m_vQuads.push_back(Brush);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionSoundPlace::CEditorActionSoundPlace(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<CSoundSource> &vBrush) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_vBrush(vBrush)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Sound place (x%d)", (int)m_vBrush.size());
+}
+
+void CEditorActionSoundPlace::Undo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	for(size_t k = 0; k < m_vBrush.size(); k++)
+		pLayerSounds->m_vSources.pop_back();
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionSoundPlace::Redo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	for(auto &Brush : m_vBrush)
+		pLayerSounds->m_vSources.push_back(Brush);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// ---------------------------------------------------------------------------------------
+
+CEditorActionDeleteQuad::CEditorActionDeleteQuad(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<int> const &vQuadsIndices, std::vector<CQuad> const &vDeletedQuads) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_vQuadsIndices(vQuadsIndices), m_vDeletedQuads(vDeletedQuads)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete quad (x%d)", (int)m_vDeletedQuads.size());
+}
+
+void CEditorActionDeleteQuad::Undo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	for(size_t k = 0; k < m_vQuadsIndices.size(); k++)
+	{
+		pLayerQuads->m_vQuads.insert(pLayerQuads->m_vQuads.begin() + m_vQuadsIndices[k], m_vDeletedQuads[k]);
+	}
+}
+
+void CEditorActionDeleteQuad::Redo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	std::vector<int> vQuads(m_vQuadsIndices);
+
+	for(int i = 0; i < (int)vQuads.size(); ++i)
+	{
+		pLayerQuads->m_vQuads.erase(pLayerQuads->m_vQuads.begin() + vQuads[i]);
+		for(int j = i + 1; j < (int)vQuads.size(); ++j)
+			if(vQuads[j] > vQuads[i])
+				vQuads[j]--;
+
+		vQuads.erase(vQuads.begin() + i);
+
+		i--;
+	}
+}
+
+// ---------------------------------------------------------------------------------------
+
+CEditorActionEditQuadPoint::CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_vPreviousPoints(vPreviousPoints), m_vCurrentPoints(vCurrentPoints)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points");
+}
+
+void CEditorActionEditQuadPoint::Undo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	CQuad &Quad = pLayerQuads->m_vQuads[m_QuadIndex];
+	for(int k = 0; k < 5; k++)
+		Quad.m_aPoints[k] = m_vPreviousPoints[k];
+}
+
+void CEditorActionEditQuadPoint::Redo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	CQuad &Quad = pLayerQuads->m_vQuads[m_QuadIndex];
+	for(int k = 0; k < 5; k++)
+		Quad.m_aPoints[k] = m_vCurrentPoints[k];
+}
+
+CEditorActionEditQuadProp::CEditorActionEditQuadProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, EQuadProp Prop, int Previous, int Current) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_Prop(Prop), m_Previous(Previous), m_Current(Current)
+{
+	static const char *s_apNames[] = {
+		"order",
+		"pos X",
+		"pos Y",
+		"pos env",
+		"pos env offset",
+		"color env",
+		"color env offset"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad %s property in layer %d of group %d", s_apNames[(int)m_Prop], m_LayerIndex, m_GroupIndex);
+}
+
+void CEditorActionEditQuadProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditQuadProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditQuadProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	CQuad &Quad = pLayerQuads->m_vQuads[m_QuadIndex];
+	if(m_Prop == EQuadProp::PROP_POS_ENV)
+		Quad.m_PosEnv = Value;
+	else if(m_Prop == EQuadProp::PROP_POS_ENV_OFFSET)
+		Quad.m_PosEnvOffset = Value;
+	else if(m_Prop == EQuadProp::PROP_COLOR_ENV)
+		Quad.m_ColorEnv = Value;
+	else if(m_Prop == EQuadProp::PROP_COLOR_ENV_OFFSET)
+		Quad.m_ColorEnvOffset = Value;
+}
+
+CEditorActionEditQuadPointProp::CEditorActionEditQuadPointProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, int PointIndex, EQuadPointProp Prop, int Previous, int Current) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_PointIndex(PointIndex), m_Prop(Prop), m_Previous(Previous), m_Current(Current)
+{
+	static const char *s_apNames[] = {
+		"pos X",
+		"pos Y",
+		"color",
+		"tex U",
+		"tex V"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad point %s property in layer %d of group %d", s_apNames[(int)m_Prop], m_LayerIndex, m_GroupIndex);
+}
+
+void CEditorActionEditQuadPointProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditQuadPointProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditQuadPointProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	CQuad &Quad = pLayerQuads->m_vQuads[m_QuadIndex];
+
+	if(m_Prop == EQuadPointProp::PROP_COLOR)
+	{
+		const ColorRGBA ColorPick = ColorRGBA::UnpackAlphaLast<ColorRGBA>(Value);
+
+		Quad.m_aColors[m_PointIndex].r = ColorPick.r * 255.0f;
+		Quad.m_aColors[m_PointIndex].g = ColorPick.g * 255.0f;
+		Quad.m_aColors[m_PointIndex].b = ColorPick.b * 255.0f;
+		Quad.m_aColors[m_PointIndex].a = ColorPick.a * 255.0f;
+
+		m_pEditor->m_ColorPickerPopupContext.m_RgbaColor = ColorPick;
+		m_pEditor->m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(ColorPick);
+		m_pEditor->m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_pEditor->m_ColorPickerPopupContext.m_HslaColor);
+	}
+	else if(m_Prop == EQuadPointProp::PROP_TEX_U)
+	{
+		Quad.m_aTexcoords[m_PointIndex].x = Value;
+	}
+	else if(m_Prop == EQuadPointProp::PROP_TEX_V)
+	{
+		Quad.m_aTexcoords[m_PointIndex].y = Value;
+	}
+}
+
+// ---------------------------------------------------------------------------------------
+
+CEditorActionBulk::CEditorActionBulk(CEditor *pEditor, const std::vector<std::shared_ptr<IEditorAction>> &vpActions, const char *pDisplay, bool Reverse) :
+	IEditorAction(pEditor), m_vpActions(vpActions), m_Reverse(Reverse)
+{
+	// Assuming we only use bulk for actions of same type, if no display was provided
+	if(!pDisplay)
+	{
+		const char *pBaseDisplay = m_vpActions[0]->DisplayText();
+		if(m_vpActions.size() == 1)
+			str_copy(m_aDisplayText, pBaseDisplay);
+		else
+			str_format(m_aDisplayText, sizeof(m_aDisplayText), "%s (x%d)", pBaseDisplay, (int)m_vpActions.size());
+	}
+	else
+	{
+		str_copy(m_aDisplayText, pDisplay);
+	}
+}
+
+void CEditorActionBulk::Undo()
+{
+	if(m_Reverse)
+	{
+		for(auto pIt = m_vpActions.rbegin(); pIt != m_vpActions.rend(); pIt++)
+		{
+			auto &pAction = *pIt;
+			pAction->Undo();
+		}
+	}
+	else
+	{
+		for(auto &pAction : m_vpActions)
+		{
+			pAction->Undo();
+		}
+	}
+}
+
+void CEditorActionBulk::Redo()
+{
+	for(auto &pAction : m_vpActions)
+	{
+		pAction->Redo();
+	}
+}
+
+// ---------
+
+CEditorActionAutoMap::CEditorActionAutoMap(CEditor *pEditor, int GroupIndex, int LayerIndex, const EditorTileStateChangeHistory<STileStateChange> &Changes) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_Changes(Changes)
+{
+	ComputeInfos();
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Auto map (x%d)", m_TotalChanges);
+}
+
+void CEditorActionAutoMap::Undo()
+{
+	Apply(true);
+}
+
+void CEditorActionAutoMap::Redo()
+{
+	Apply(false);
+}
+
+void CEditorActionAutoMap::Apply(bool Undo)
+{
+	auto &Map = m_pEditor->m_Map;
+	std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+	for(auto &Change : m_Changes)
+	{
+		int y = Change.first;
+		auto Line = Change.second;
+		for(auto &Tile : Line)
+		{
+			int x = Tile.first;
+			STileStateChange State = Tile.second;
+			pLayerTiles->SetTileIgnoreHistory(x, y, Undo ? State.m_Previous : State.m_Current);
+		}
+	}
+
+	Map.OnModify();
+}
+
+void CEditorActionAutoMap::ComputeInfos()
+{
+	m_TotalChanges = 0;
+	for(auto &Line : m_Changes)
+		m_TotalChanges += Line.second.size();
+}
+
+// ---------
+
+CEditorActionLayerBase::CEditorActionLayerBase(CEditor *pEditor, int GroupIndex, int LayerIndex) :
+	IEditorAction(pEditor), m_GroupIndex(GroupIndex), m_LayerIndex(LayerIndex)
+{
+	m_pLayer = pEditor->m_Map.m_vpGroups[GroupIndex]->m_vpLayers[LayerIndex];
+}
+
+// ----------
+
+CEditorActionAddLayer::CEditorActionAddLayer(CEditor *pEditor, int GroupIndex, int LayerIndex, bool Duplicate) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_Duplicate(Duplicate)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "%s %s layer in group %d", m_Duplicate ? "Duplicate" : "New", m_pLayer->TypeName(), m_GroupIndex);
+}
+
+void CEditorActionAddLayer::Undo()
+{
+	// Undo: remove layer from vector but keep it in case we want to add it back
+	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+	vLayers.erase(vLayers.begin() + m_LayerIndex);
+
+	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
+	if(m_LayerIndex >= (int)vLayers.size())
+		m_pEditor->SelectLayer(vLayers.size() - 1, m_GroupIndex);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionAddLayer::Redo()
+{
+	// Redo: add back the removed layer contained in this class
+	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+	vLayers.insert(vLayers.begin() + m_LayerIndex, m_pLayer);
+
+	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
+	m_pEditor->SelectLayer(m_LayerIndex, m_GroupIndex);
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionDeleteLayer::CEditorActionDeleteLayer(CEditor *pEditor, int GroupIndex, int LayerIndex) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete %s layer of group %d", m_pLayer->TypeName(), m_GroupIndex);
+}
+
+void CEditorActionDeleteLayer::Redo()
+{
+	// Redo: remove layer from vector but keep it in case we want to add it back
+	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+
+	if(m_pLayer->m_Type == LAYERTYPE_TILES)
+	{
+		std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+		if(pLayerTiles->m_Front)
+			m_pEditor->m_Map.m_pFrontLayer = nullptr;
+		else if(pLayerTiles->m_Tele)
+			m_pEditor->m_Map.m_pTeleLayer = nullptr;
+		else if(pLayerTiles->m_Speedup)
+			m_pEditor->m_Map.m_pSpeedupLayer = nullptr;
+		else if(pLayerTiles->m_Switch)
+			m_pEditor->m_Map.m_pSwitchLayer = nullptr;
+		else if(pLayerTiles->m_Tune)
+			m_pEditor->m_Map.m_pTuneLayer = nullptr;
+	}
+
+	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->DeleteLayer(m_LayerIndex);
+
+	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
+	if(m_LayerIndex >= (int)vLayers.size())
+		m_pEditor->SelectLayer(vLayers.size() - 1, m_GroupIndex);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionDeleteLayer::Undo()
+{
+	// Undo: add back the removed layer contained in this class
+	auto &vLayers = m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_vpLayers;
+
+	if(m_pLayer->m_Type == LAYERTYPE_TILES)
+	{
+		std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+		if(pLayerTiles->m_Front)
+			m_pEditor->m_Map.m_pFrontLayer = std::static_pointer_cast<CLayerFront>(m_pLayer);
+		else if(pLayerTiles->m_Tele)
+			m_pEditor->m_Map.m_pTeleLayer = std::static_pointer_cast<CLayerTele>(m_pLayer);
+		else if(pLayerTiles->m_Speedup)
+			m_pEditor->m_Map.m_pSpeedupLayer = std::static_pointer_cast<CLayerSpeedup>(m_pLayer);
+		else if(pLayerTiles->m_Switch)
+			m_pEditor->m_Map.m_pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(m_pLayer);
+		else if(pLayerTiles->m_Tune)
+			m_pEditor->m_Map.m_pTuneLayer = std::static_pointer_cast<CLayerTune>(m_pLayer);
+	}
+
+	vLayers.insert(vLayers.begin() + m_LayerIndex, m_pLayer);
+
+	m_pEditor->m_Map.m_vpGroups[m_GroupIndex]->m_Collapse = false;
+	m_pEditor->SelectLayer(m_LayerIndex, m_GroupIndex);
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionGroup::CEditorActionGroup(CEditor *pEditor, int GroupIndex, bool Delete) :
+	IEditorAction(pEditor), m_GroupIndex(GroupIndex), m_Delete(Delete)
+{
+	m_pGroup = pEditor->m_Map.m_vpGroups[GroupIndex];
+	if(m_Delete)
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete group %d", m_GroupIndex);
+	else
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group");
+}
+
+void CEditorActionGroup::Undo()
+{
+	if(m_Delete)
+	{
+		// Undo: add back the group
+		m_pEditor->m_Map.m_vpGroups.insert(m_pEditor->m_Map.m_vpGroups.begin() + m_GroupIndex, m_pGroup);
+		m_pEditor->m_SelectedGroup = m_GroupIndex;
+		m_pEditor->m_Map.OnModify();
+	}
+	else
+	{
+		// Undo: delete the group
+		m_pEditor->m_Map.DeleteGroup(m_GroupIndex);
+		m_pEditor->m_SelectedGroup = maximum(0, m_GroupIndex - 1);
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionGroup::Redo()
+{
+	if(!m_Delete)
+	{
+		// Redo: add back the group
+		m_pEditor->m_Map.m_vpGroups.insert(m_pEditor->m_Map.m_vpGroups.begin() + m_GroupIndex, m_pGroup);
+		m_pEditor->m_SelectedGroup = m_GroupIndex;
+	}
+	else
+	{
+		// Redo: delete the group
+		m_pEditor->m_Map.DeleteGroup(m_GroupIndex);
+		m_pEditor->m_SelectedGroup = maximum(0, m_GroupIndex - 1);
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionEditGroupProp::CEditorActionEditGroupProp(CEditor *pEditor, int GroupIndex, EGroupProp Prop, int Previous, int Current) :
+	IEditorAction(pEditor), m_GroupIndex(GroupIndex), m_Prop(Prop), m_Previous(Previous), m_Current(Current)
+{
+	static const char *s_apNames[] = {
+		"order",
+		"pos X",
+		"pos Y",
+		"para X",
+		"para Y",
+		"use clipping",
+		"clip X",
+		"clip Y",
+		"clip W",
+		"clip H"};
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit group %d %s property", m_GroupIndex, s_apNames[(int)Prop]);
+}
+
+void CEditorActionEditGroupProp::Undo()
+{
+	auto pGroup = m_pEditor->m_Map.m_vpGroups[m_GroupIndex];
+
+	if(m_Prop == EGroupProp::PROP_ORDER)
+	{
+		int CurrentOrder = m_Current;
+		bool Dir = m_Current > m_Previous;
+		while(CurrentOrder != m_Previous)
+		{
+			CurrentOrder = m_pEditor->m_Map.SwapGroups(CurrentOrder, Dir ? CurrentOrder - 1 : CurrentOrder + 1);
+		}
+		m_pEditor->m_SelectedGroup = m_Previous;
+	}
+	else
+		Apply(m_Previous);
+}
+
+void CEditorActionEditGroupProp::Redo()
+{
+	auto pGroup = m_pEditor->m_Map.m_vpGroups[m_GroupIndex];
+
+	if(m_Prop == EGroupProp::PROP_ORDER)
+	{
+		int CurrentOrder = m_Previous;
+		bool Dir = m_Previous > m_Current;
+		while(CurrentOrder != m_Current)
+		{
+			CurrentOrder = m_pEditor->m_Map.SwapGroups(CurrentOrder, Dir ? CurrentOrder - 1 : CurrentOrder + 1);
+		}
+		m_pEditor->m_SelectedGroup = m_Current;
+	}
+	else
+		Apply(m_Current);
+}
+
+void CEditorActionEditGroupProp::Apply(int Value)
+{
+	auto pGroup = m_pEditor->m_Map.m_vpGroups[m_GroupIndex];
+
+	if(m_Prop == EGroupProp::PROP_POS_X)
+		pGroup->m_OffsetX = Value;
+	if(m_Prop == EGroupProp::PROP_POS_Y)
+		pGroup->m_OffsetY = Value;
+	if(m_Prop == EGroupProp::PROP_PARA_X)
+		pGroup->m_ParallaxX = Value;
+	if(m_Prop == EGroupProp::PROP_PARA_Y)
+		pGroup->m_ParallaxY = Value;
+	if(m_Prop == EGroupProp::PROP_USE_CLIPPING)
+		pGroup->m_UseClipping = Value;
+	if(m_Prop == EGroupProp::PROP_CLIP_X)
+		pGroup->m_ClipX = Value;
+	if(m_Prop == EGroupProp::PROP_CLIP_Y)
+		pGroup->m_ClipY = Value;
+	if(m_Prop == EGroupProp::PROP_CLIP_W)
+		pGroup->m_ClipW = Value;
+	if(m_Prop == EGroupProp::PROP_CLIP_H)
+		pGroup->m_ClipH = Value;
+
+	m_pEditor->m_Map.OnModify();
+}
+
+template<typename E>
+CEditorActionEditLayerPropBase<E>::CEditorActionEditLayerPropBase(CEditor *pEditor, int GroupIndex, int LayerIndex, E Prop, int Previous, int Current) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_Prop(Prop), m_Previous(Previous), m_Current(Current)
+{
+}
+
+CEditorActionEditLayerProp::CEditorActionEditLayerProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current)
+{
+	static const char *s_apNames[] = {
+		"group",
+		"order",
+		"HQ"};
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit layer %d in group %d %s property", m_LayerIndex, m_GroupIndex, s_apNames[(int)m_Prop]);
+}
+
+void CEditorActionEditLayerProp::Undo()
+{
+	auto pCurrentGroup = m_pEditor->m_Map.m_vpGroups[m_GroupIndex];
+
+	if(m_Prop == ELayerProp::PROP_ORDER)
+	{
+		m_pEditor->SelectLayer(pCurrentGroup->SwapLayers(m_Current, m_Previous));
+	}
+	else
+		Apply(m_Previous);
+}
+
+void CEditorActionEditLayerProp::Redo()
+{
+	auto pCurrentGroup = m_pEditor->m_Map.m_vpGroups[m_GroupIndex];
+
+	if(m_Prop == ELayerProp::PROP_ORDER)
+	{
+		m_pEditor->SelectLayer(pCurrentGroup->SwapLayers(m_Previous, m_Current));
+	}
+	else
+		Apply(m_Current);
+}
+
+void CEditorActionEditLayerProp::Apply(int Value)
+{
+	if(m_Prop == ELayerProp::PROP_GROUP)
+	{
+		auto pCurrentGroup = m_pEditor->m_Map.m_vpGroups[Value == m_Previous ? m_Current : m_Previous];
+		auto Position = std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), m_pLayer);
+		if(Position != pCurrentGroup->m_vpLayers.end())
+			pCurrentGroup->m_vpLayers.erase(Position);
+		m_pEditor->m_Map.m_vpGroups[Value]->m_vpLayers.push_back(m_pLayer);
+		m_pEditor->m_SelectedGroup = Value;
+		m_pEditor->SelectLayer(m_pEditor->m_Map.m_vpGroups[Value]->m_vpLayers.size() - 1);
+	}
+	else if(m_Prop == ELayerProp::PROP_HQ)
+	{
+		m_pLayer->m_Flags = Value;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionEditLayerTilesProp::CEditorActionEditLayerTilesProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ETilesProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current)
+{
+	static const char *s_apNames[] = {
+		"width",
+		"height",
+		"shift",
+		"shift by",
+		"image",
+		"color",
+		"color env",
+		"color env offset",
+		"automapper",
+		"seed"};
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit tiles layer %d in group %d %s property", m_LayerIndex, m_GroupIndex, s_apNames[(int)Prop]);
+}
+
+void CEditorActionEditLayerTilesProp::SetSavedLayers(const std::map<int, std::shared_ptr<CLayer>> &SavedLayers)
+{
+	m_SavedLayers = std::map(SavedLayers);
+}
+
+void CEditorActionEditLayerTilesProp::Undo()
+{
+	std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+	std::shared_ptr<CLayerTiles> pSavedLayerTiles = nullptr;
+
+	if(m_Prop == ETilesProp::PROP_WIDTH || m_Prop == ETilesProp::PROP_HEIGHT)
+	{
+		if(m_Prop == ETilesProp::PROP_HEIGHT)
+			pLayerTiles->Resize(pLayerTiles->m_Width, m_Previous);
+		else if(m_Prop == ETilesProp::PROP_WIDTH)
+			pLayerTiles->Resize(m_Previous, pLayerTiles->m_Height);
+
+		RestoreLayer(LAYERTYPE_TILES, pLayerTiles);
+		if(pLayerTiles->m_Game || pLayerTiles->m_Front || pLayerTiles->m_Switch || pLayerTiles->m_Speedup || pLayerTiles->m_Tune)
+		{
+			if(m_pEditor->m_Map.m_pFrontLayer && !pLayerTiles->m_Front)
+				RestoreLayer(LAYERTYPE_FRONT, m_pEditor->m_Map.m_pFrontLayer);
+			if(m_pEditor->m_Map.m_pTeleLayer && !pLayerTiles->m_Tele)
+				RestoreLayer(LAYERTYPE_TELE, m_pEditor->m_Map.m_pTeleLayer);
+			if(m_pEditor->m_Map.m_pSwitchLayer && !pLayerTiles->m_Switch)
+				RestoreLayer(LAYERTYPE_SWITCH, m_pEditor->m_Map.m_pSwitchLayer);
+			if(m_pEditor->m_Map.m_pSpeedupLayer && !pLayerTiles->m_Speedup)
+				RestoreLayer(LAYERTYPE_SPEEDUP, m_pEditor->m_Map.m_pSpeedupLayer);
+			if(m_pEditor->m_Map.m_pTuneLayer && !pLayerTiles->m_Tune)
+				RestoreLayer(LAYERTYPE_TUNE, m_pEditor->m_Map.m_pTuneLayer);
+			if(!pLayerTiles->m_Game)
+				RestoreLayer(LAYERTYPE_GAME, m_pEditor->m_Map.m_pGameLayer);
+		}
+	}
+	else if(m_Prop == ETilesProp::PROP_SHIFT)
+	{
+		RestoreLayer(LAYERTYPE_TILES, pLayerTiles);
+	}
+	else if(m_Prop == ETilesProp::PROP_SHIFT_BY)
+	{
+		m_pEditor->m_ShiftBy = m_Previous;
+	}
+	else if(m_Prop == ETilesProp::PROP_IMAGE)
+	{
+		if(m_Previous == -1)
+		{
+			pLayerTiles->m_Image = -1;
+		}
+		else
+		{
+			pLayerTiles->m_Image = m_Previous % m_pEditor->m_Map.m_vpImages.size();
+			pLayerTiles->m_AutoMapperConfig = -1;
+		}
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR)
+	{
+		const ColorRGBA ColorPick = ColorRGBA::UnpackAlphaLast<ColorRGBA>(m_Previous);
+
+		pLayerTiles->m_Color.r = ColorPick.r * 255.0f;
+		pLayerTiles->m_Color.g = ColorPick.g * 255.0f;
+		pLayerTiles->m_Color.b = ColorPick.b * 255.0f;
+		pLayerTiles->m_Color.a = ColorPick.a * 255.0f;
+
+		m_pEditor->m_ColorPickerPopupContext.m_RgbaColor = ColorPick;
+		m_pEditor->m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(ColorPick);
+		m_pEditor->m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_pEditor->m_ColorPickerPopupContext.m_HslaColor);
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR_ENV)
+	{
+		pLayerTiles->m_ColorEnv = m_Previous;
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR_ENV_OFFSET)
+	{
+		pLayerTiles->m_ColorEnvOffset = m_Previous;
+	}
+	else if(m_Prop == ETilesProp::PROP_AUTOMAPPER)
+	{
+		pLayerTiles->m_AutoMapperConfig = m_Previous;
+	}
+	else if(m_Prop == ETilesProp::PROP_SEED)
+	{
+		pLayerTiles->m_Seed = m_Previous;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionEditLayerTilesProp::Redo()
+{
+	std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(m_pLayer);
+
+	if(m_Prop == ETilesProp::PROP_WIDTH || m_Prop == ETilesProp::PROP_HEIGHT)
+	{
+		if(m_Prop == ETilesProp::PROP_HEIGHT)
+			pLayerTiles->Resize(pLayerTiles->m_Width, m_Current);
+		else if(m_Prop == ETilesProp::PROP_WIDTH)
+			pLayerTiles->Resize(m_Current, pLayerTiles->m_Height);
+
+		if(pLayerTiles->m_Game || pLayerTiles->m_Front || pLayerTiles->m_Switch || pLayerTiles->m_Speedup || pLayerTiles->m_Tune)
+		{
+			if(m_pEditor->m_Map.m_pFrontLayer && !pLayerTiles->m_Front)
+				m_pEditor->m_Map.m_pFrontLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+			if(m_pEditor->m_Map.m_pTeleLayer && !pLayerTiles->m_Tele)
+				m_pEditor->m_Map.m_pTeleLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+			if(m_pEditor->m_Map.m_pSwitchLayer && !pLayerTiles->m_Switch)
+				m_pEditor->m_Map.m_pSwitchLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+			if(m_pEditor->m_Map.m_pSpeedupLayer && !pLayerTiles->m_Speedup)
+				m_pEditor->m_Map.m_pSpeedupLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+			if(m_pEditor->m_Map.m_pTuneLayer && !pLayerTiles->m_Tune)
+				m_pEditor->m_Map.m_pTuneLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+			if(!pLayerTiles->m_Game)
+				m_pEditor->m_Map.m_pGameLayer->Resize(pLayerTiles->m_Width, pLayerTiles->m_Height);
+		}
+	}
+	else if(m_Prop == ETilesProp::PROP_SHIFT)
+	{
+		pLayerTiles->Shift(m_Current);
+	}
+	else if(m_Prop == ETilesProp::PROP_SHIFT_BY)
+	{
+		m_pEditor->m_ShiftBy = m_Current;
+	}
+	else if(m_Prop == ETilesProp::PROP_IMAGE)
+	{
+		if(m_Current == -1)
+		{
+			pLayerTiles->m_Image = -1;
+		}
+		else
+		{
+			pLayerTiles->m_Image = m_Current % m_pEditor->m_Map.m_vpImages.size();
+			pLayerTiles->m_AutoMapperConfig = -1;
+		}
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR)
+	{
+		const ColorRGBA ColorPick = ColorRGBA::UnpackAlphaLast<ColorRGBA>(m_Current);
+
+		pLayerTiles->m_Color.r = ColorPick.r * 255.0f;
+		pLayerTiles->m_Color.g = ColorPick.g * 255.0f;
+		pLayerTiles->m_Color.b = ColorPick.b * 255.0f;
+		pLayerTiles->m_Color.a = ColorPick.a * 255.0f;
+
+		m_pEditor->m_ColorPickerPopupContext.m_RgbaColor = ColorPick;
+		m_pEditor->m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(ColorPick);
+		m_pEditor->m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_pEditor->m_ColorPickerPopupContext.m_HslaColor);
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR_ENV)
+	{
+		pLayerTiles->m_ColorEnv = m_Current;
+	}
+	else if(m_Prop == ETilesProp::PROP_COLOR_ENV_OFFSET)
+	{
+		pLayerTiles->m_ColorEnvOffset = m_Current;
+	}
+	else if(m_Prop == ETilesProp::PROP_AUTOMAPPER)
+	{
+		pLayerTiles->m_AutoMapperConfig = m_Current;
+	}
+	else if(m_Prop == ETilesProp::PROP_SEED)
+	{
+		pLayerTiles->m_Seed = m_Current;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionEditLayerTilesProp::RestoreLayer(int Layer, const std::shared_ptr<CLayerTiles> &pLayerTiles)
+{
+	if(m_SavedLayers[Layer] != nullptr)
+	{
+		std::shared_ptr<CLayerTiles> pSavedLayerTiles = std::static_pointer_cast<CLayerTiles>(m_SavedLayers[Layer]);
+		mem_copy(pLayerTiles->m_pTiles, pSavedLayerTiles->m_pTiles, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile));
+
+		if(pLayerTiles->m_Tele)
+		{
+			std::shared_ptr<CLayerTele> pLayerTele = std::static_pointer_cast<CLayerTele>(pLayerTiles);
+			std::shared_ptr<CLayerTele> pSavedLayerTele = std::static_pointer_cast<CLayerTele>(pSavedLayerTiles);
+			mem_copy(pLayerTele->m_pTeleTile, pSavedLayerTele->m_pTeleTile, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTeleTile));
+		}
+		else if(pLayerTiles->m_Speedup)
+		{
+			std::shared_ptr<CLayerSpeedup> pLayerSpeedup = std::static_pointer_cast<CLayerSpeedup>(pLayerTiles);
+			std::shared_ptr<CLayerSpeedup> pSavedLayerSpeedup = std::static_pointer_cast<CLayerSpeedup>(pSavedLayerTiles);
+			mem_copy(pLayerSpeedup->m_pSpeedupTile, pSavedLayerSpeedup->m_pSpeedupTile, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CSpeedupTile));
+		}
+		else if(pLayerTiles->m_Switch)
+		{
+			std::shared_ptr<CLayerSwitch> pLayerSwitch = std::static_pointer_cast<CLayerSwitch>(pLayerTiles);
+			std::shared_ptr<CLayerSwitch> pSavedLayerSwitch = std::static_pointer_cast<CLayerSwitch>(pSavedLayerTiles);
+			mem_copy(pLayerSwitch->m_pSwitchTile, pSavedLayerSwitch->m_pSwitchTile, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CSwitchTile));
+		}
+		else if(pLayerTiles->m_Tune)
+		{
+			std::shared_ptr<CLayerTune> pLayerTune = std::static_pointer_cast<CLayerTune>(pLayerTiles);
+			std::shared_ptr<CLayerTune> pSavedLayerTune = std::static_pointer_cast<CLayerTune>(pSavedLayerTiles);
+			mem_copy(pLayerTune->m_pTuneTile, pSavedLayerTune->m_pTuneTile, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTuneTile));
+		}
+	}
+}
+
+CEditorActionEditLayerQuadsProp::CEditorActionEditLayerQuadsProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerQuadsProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current)
+{
+	static const char *s_apNames[] = {
+		"image"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quads layer %d in group %d %s property", m_LayerIndex, m_GroupIndex, s_apNames[(int)m_Prop]);
+}
+
+void CEditorActionEditLayerQuadsProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditLayerQuadsProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditLayerQuadsProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	if(m_Prop == ELayerQuadsProp::PROP_IMAGE)
+	{
+		if(Value >= 0)
+			pLayerQuads->m_Image = Value % m_pEditor->m_Map.m_vpImages.size();
+		else
+			pLayerQuads->m_Image = -1;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// --------------------------------------------------------------
+
+CEditorActionEditLayersGroupAndOrder::CEditorActionEditLayersGroupAndOrder(CEditor *pEditor, int GroupIndex, const std::vector<int> &LayerIndices, int NewGroupIndex, const std::vector<int> &NewLayerIndices) :
+	IEditorAction(pEditor), m_GroupIndex(GroupIndex), m_LayerIndices(LayerIndices), m_NewGroupIndex(NewGroupIndex), m_NewLayerIndices(NewLayerIndices)
+{
+	std::sort(m_LayerIndices.begin(), m_LayerIndices.end());
+	std::sort(m_NewLayerIndices.begin(), m_NewLayerIndices.end());
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit layers group and order (x%d)", (int)m_LayerIndices.size());
+}
+
+void CEditorActionEditLayersGroupAndOrder::Undo()
+{
+	// Undo : restore group and order
+	auto &Map = m_pEditor->m_Map;
+	auto &pCurrentGroup = Map.m_vpGroups[m_NewGroupIndex];
+	auto &pPreviousGroup = Map.m_vpGroups[m_GroupIndex];
+	std::vector<std::shared_ptr<CLayer>> vpLayers;
+	vpLayers.reserve(m_NewLayerIndices.size());
+	for(auto &LayerIndex : m_NewLayerIndices)
+		vpLayers.push_back(pCurrentGroup->m_vpLayers[LayerIndex]);
+
+	int k = 0;
+	for(auto &pLayer : vpLayers)
+	{
+		pCurrentGroup->m_vpLayers.erase(std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), pLayer));
+		pPreviousGroup->m_vpLayers.insert(pPreviousGroup->m_vpLayers.begin() + m_LayerIndices[k++], pLayer);
+	}
+
+	m_pEditor->m_vSelectedLayers = m_LayerIndices;
+	m_pEditor->m_SelectedGroup = m_GroupIndex;
+}
+
+void CEditorActionEditLayersGroupAndOrder::Redo()
+{
+	// Redo : move layers
+	auto &Map = m_pEditor->m_Map;
+	auto &pCurrentGroup = Map.m_vpGroups[m_GroupIndex];
+	auto &pPreviousGroup = Map.m_vpGroups[m_NewGroupIndex];
+	std::vector<std::shared_ptr<CLayer>> vpLayers;
+	vpLayers.reserve(m_LayerIndices.size());
+	for(auto &LayerIndex : m_LayerIndices)
+		vpLayers.push_back(pCurrentGroup->m_vpLayers[LayerIndex]);
+
+	int k = 0;
+	for(auto &pLayer : vpLayers)
+	{
+		pCurrentGroup->m_vpLayers.erase(std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), pLayer));
+		pPreviousGroup->m_vpLayers.insert(pPreviousGroup->m_vpLayers.begin() + m_NewLayerIndices[k++], pLayer);
+	}
+
+	m_pEditor->m_vSelectedLayers = m_NewLayerIndices;
+	m_pEditor->m_SelectedGroup = m_NewGroupIndex;
+}
+
+// -----------------------------------
+
+CEditorActionAppendMap::CEditorActionAppendMap(CEditor *pEditor, const char *pMapName, const SPrevInfo &PrevInfo, std::vector<int> &vImageIndexMap) :
+	IEditorAction(pEditor), m_PrevInfo(PrevInfo), m_vImageIndexMap(vImageIndexMap)
+{
+	str_copy(m_aMapName, pMapName);
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Append %s", m_aMapName);
+}
+
+void CEditorActionAppendMap::Undo()
+{
+	auto &Map = m_pEditor->m_Map;
+	// Undo append:
+	// - delete added groups
+	// - delete added envelopes
+	// - delete added images
+	// - delete added sounds
+
+	// Delete added groups
+	while((int)Map.m_vpGroups.size() != m_PrevInfo.m_Groups)
+	{
+		Map.m_vpGroups.pop_back();
+	}
+
+	// Delete added envelopes
+	while((int)Map.m_vpEnvelopes.size() != m_PrevInfo.m_Envelopes)
+	{
+		Map.m_vpEnvelopes.pop_back();
+	}
+
+	// Delete added sounds
+	while((int)Map.m_vpSounds.size() != m_PrevInfo.m_Sounds)
+	{
+		Map.m_vpSounds.pop_back();
+	}
+
+	// Delete added images
+	// Images are sorted when appending, so we need to revert sorting before deleting the images
+	if(!m_vImageIndexMap.empty())
+	{
+		std::vector<int> vReverseIndexMap;
+		vReverseIndexMap.resize(m_vImageIndexMap.size());
+
+		for(int k = 0; k < (int)m_vImageIndexMap.size(); k++)
+			vReverseIndexMap[m_vImageIndexMap[k]] = k;
+
+		std::vector<std::shared_ptr<CEditorImage>> vpRevertedImages;
+		vpRevertedImages.resize(Map.m_vpImages.size());
+
+		for(int k = 0; k < (int)vReverseIndexMap.size(); k++)
+		{
+			vpRevertedImages[vReverseIndexMap[k]] = Map.m_vpImages[k];
+		}
+		Map.m_vpImages = vpRevertedImages;
+
+		Map.ModifyImageIndex([vReverseIndexMap](int *pIndex) {
+			if(*pIndex >= 0)
+			{
+				*pIndex = vReverseIndexMap[*pIndex];
+			}
+		});
+	}
+
+	while((int)Map.m_vpImages.size() != m_PrevInfo.m_Images)
+	{
+		Map.m_vpImages.pop_back();
+	}
+}
+
+void CEditorActionAppendMap::Redo()
+{
+	// Redo is just re-appending the same map
+	m_pEditor->Append(m_aMapName, IStorage::TYPE_ALL, true);
+}
+
+// ---------------------------
+
+CEditorActionTileArt::CEditorActionTileArt(CEditor *pEditor, int PreviousImageCount, const char *pTileArtFile, std::vector<int> &vImageIndexMap) :
+	IEditorAction(pEditor), m_PreviousImageCount(PreviousImageCount), m_vImageIndexMap(vImageIndexMap)
+{
+	str_copy(m_aTileArtFile, pTileArtFile);
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art");
+}
+
+void CEditorActionTileArt::Undo()
+{
+	auto &Map = m_pEditor->m_Map;
+
+	// Delete added group
+	Map.m_vpGroups.pop_back();
+
+	// Delete added images
+	// Images are sorted when appending, so we need to revert sorting before deleting the images
+	if(!m_vImageIndexMap.empty())
+	{
+		std::vector<int> vReverseIndexMap;
+		vReverseIndexMap.resize(m_vImageIndexMap.size());
+
+		for(int k = 0; k < (int)m_vImageIndexMap.size(); k++)
+			vReverseIndexMap[m_vImageIndexMap[k]] = k;
+
+		std::vector<std::shared_ptr<CEditorImage>> vpRevertedImages;
+		vpRevertedImages.resize(Map.m_vpImages.size());
+
+		for(int k = 0; k < (int)vReverseIndexMap.size(); k++)
+		{
+			vpRevertedImages[vReverseIndexMap[k]] = Map.m_vpImages[k];
+		}
+		Map.m_vpImages = vpRevertedImages;
+
+		Map.ModifyImageIndex([vReverseIndexMap](int *pIndex) {
+			if(*pIndex >= 0)
+			{
+				*pIndex = vReverseIndexMap[*pIndex];
+			}
+		});
+	}
+
+	while((int)Map.m_vpImages.size() != m_PreviousImageCount)
+	{
+		Map.m_vpImages.pop_back();
+	}
+}
+
+void CEditorActionTileArt::Redo()
+{
+	if(!m_pEditor->Graphics()->LoadPNG(&m_pEditor->m_TileartImageInfo, m_aTileArtFile, IStorage::TYPE_ALL))
+	{
+		m_pEditor->ShowFileDialogError("Failed to load image from file '%s'.", m_aTileArtFile);
+		return;
+	}
+
+	IStorage::StripPathAndExtension(m_aTileArtFile, m_pEditor->m_aTileartFilename, sizeof(m_pEditor->m_aTileartFilename));
+	m_pEditor->AddTileart(true);
+}
+
+// ---------------------------------
+
+CEditorCommandAction::CEditorCommandAction(CEditor *pEditor, EType Type, int *pSelectedCommandIndex, int CommandIndex, const char *pPreviousCommand, const char *pCurrentCommand) :
+	IEditorAction(pEditor), m_Type(Type), m_pSelectedCommandIndex(pSelectedCommandIndex), m_CommandIndex(CommandIndex)
+{
+	if(pPreviousCommand != nullptr)
+		m_PreviousCommand = std::string(pPreviousCommand);
+	if(pCurrentCommand != nullptr)
+		m_CurrentCommand = std::string(pCurrentCommand);
+
+	switch(m_Type)
+	{
+	case EType::ADD:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command");
+		break;
+	case EType::EDIT:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);
+		break;
+	case EType::DELETE:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete command %d", m_CommandIndex);
+		break;
+	case EType::MOVE_UP:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Move command %d up", m_CommandIndex);
+		break;
+	case EType::MOVE_DOWN:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Move command %d down", m_CommandIndex);
+		break;
+	default:
+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);
+		break;
+	}
+}
+
+void CEditorCommandAction::Undo()
+{
+	auto &Map = m_pEditor->m_Map;
+	switch(m_Type)
+	{
+	case EType::DELETE:
+	{
+		Map.m_vSettings.insert(Map.m_vSettings.begin() + m_CommandIndex, m_PreviousCommand.c_str());
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::ADD:
+	{
+		Map.m_vSettings.erase(Map.m_vSettings.begin() + m_CommandIndex);
+		*m_pSelectedCommandIndex = Map.m_vSettings.size() - 1;
+		break;
+	}
+	case EType::EDIT:
+	{
+		str_copy(Map.m_vSettings[m_CommandIndex].m_aCommand, m_PreviousCommand.c_str());
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::MOVE_DOWN:
+	{
+		std::swap(Map.m_vSettings[m_CommandIndex], Map.m_vSettings[m_CommandIndex + 1]);
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::MOVE_UP:
+	{
+		std::swap(Map.m_vSettings[m_CommandIndex], Map.m_vSettings[m_CommandIndex - 1]);
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	}
+}
+
+void CEditorCommandAction::Redo()
+{
+	auto &Map = m_pEditor->m_Map;
+	switch(m_Type)
+	{
+	case EType::DELETE:
+	{
+		Map.m_vSettings.erase(Map.m_vSettings.begin() + m_CommandIndex);
+		*m_pSelectedCommandIndex = Map.m_vSettings.size() - 1;
+		break;
+	}
+	case EType::ADD:
+	{
+		Map.m_vSettings.insert(Map.m_vSettings.begin() + m_CommandIndex, m_PreviousCommand.c_str());
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::EDIT:
+	{
+		str_copy(Map.m_vSettings[m_CommandIndex].m_aCommand, m_CurrentCommand.c_str());
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::MOVE_DOWN:
+	{
+		std::swap(Map.m_vSettings[m_CommandIndex], Map.m_vSettings[m_CommandIndex + 1]);
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	case EType::MOVE_UP:
+	{
+		std::swap(Map.m_vSettings[m_CommandIndex], Map.m_vSettings[m_CommandIndex - 1]);
+		*m_pSelectedCommandIndex = m_CommandIndex;
+		break;
+	}
+	}
+}
+
+// ------------------------------------------------
+
+CEditorActionEnvelopeAdd::CEditorActionEnvelopeAdd(CEditor *pEditor, const std::shared_ptr<CEnvelope> &pEnv) :
+	IEditorAction(pEditor), m_pEnv(pEnv)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add new %s envelope", pEnv->Type() == CEnvelope::EType::COLOR ? "color" : (pEnv->Type() == CEnvelope::EType::POSITION ? "position" : "sound"));
+}
+
+void CEditorActionEnvelopeAdd::Undo()
+{
+	// Undo is removing the envelope, which was added at the back of the list
+	m_pEditor->m_Map.m_vpEnvelopes.pop_back();
+	m_pEditor->m_SelectedEnvelope = m_pEditor->m_Map.m_vpEnvelopes.size() - 1;
+}
+
+void CEditorActionEnvelopeAdd::Redo()
+{
+	// Redo is adding back at the back the saved envelope
+	m_pEditor->m_Map.m_vpEnvelopes.push_back(m_pEnv);
+	m_pEditor->m_SelectedEnvelope = m_pEditor->m_Map.m_vpEnvelopes.size() - 1;
+}
+
+CEditorActionEveloppeDelete::CEditorActionEveloppeDelete(CEditor *pEditor, int EnvelopeIndex) :
+	IEditorAction(pEditor), m_EnvelopeIndex(EnvelopeIndex), m_pEnv(pEditor->m_Map.m_vpEnvelopes[EnvelopeIndex])
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete envelope %d", m_EnvelopeIndex);
+}
+
+void CEditorActionEveloppeDelete::Undo()
+{
+	// Undo is adding back the envelope
+	m_pEditor->m_Map.m_vpEnvelopes.insert(m_pEditor->m_Map.m_vpEnvelopes.begin() + m_EnvelopeIndex, m_pEnv);
+	m_pEditor->m_SelectedEnvelope = m_EnvelopeIndex;
+}
+
+void CEditorActionEveloppeDelete::Redo()
+{
+	// Redo is erasing the same envelope index
+	m_pEditor->m_Map.m_vpEnvelopes.erase(m_pEditor->m_Map.m_vpEnvelopes.begin() + m_EnvelopeIndex);
+	if(m_pEditor->m_SelectedEnvelope >= (int)m_pEditor->m_Map.m_vpEnvelopes.size())
+		m_pEditor->m_SelectedEnvelope = m_pEditor->m_Map.m_vpEnvelopes.size() - 1;
+}
+
+CEditorActionEnvelopeEdit::CEditorActionEnvelopeEdit(CEditor *pEditor, int EnvelopeIndex, EEditType EditType, int Previous, int Current) :
+	IEditorAction(pEditor), m_EnvelopeIndex(EnvelopeIndex), m_EditType(EditType), m_Previous(Previous), m_Current(Current), m_pEnv(pEditor->m_Map.m_vpEnvelopes[EnvelopeIndex])
+{
+	static const char *s_apNames[] = {
+		"sync",
+		"order"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit envelope %d %s", m_EnvelopeIndex, s_apNames[(int)m_EditType]);
+}
+
+void CEditorActionEnvelopeEdit::Undo()
+{
+	switch(m_EditType)
+	{
+	case EEditType::ORDER:
+	{
+		m_pEditor->m_Map.SwapEnvelopes(m_Current, m_Previous);
+		break;
+	}
+	case EEditType::SYNC:
+	{
+		m_pEnv->m_Synchronized = m_Previous;
+		break;
+	}
+	}
+	m_pEditor->m_Map.OnModify();
+	m_pEditor->m_SelectedEnvelope = m_EnvelopeIndex;
+}
+
+void CEditorActionEnvelopeEdit::Redo()
+{
+	switch(m_EditType)
+	{
+	case EEditType::ORDER:
+	{
+		m_pEditor->m_Map.SwapEnvelopes(m_Previous, m_Current);
+		break;
+	}
+	case EEditType::SYNC:
+	{
+		m_pEnv->m_Synchronized = m_Current;
+		break;
+	}
+	}
+	m_pEditor->m_Map.OnModify();
+	m_pEditor->m_SelectedEnvelope = m_EnvelopeIndex;
+}
+
+CEditorActionEnvelopeEditPoint::CEditorActionEnvelopeEditPoint(CEditor *pEditor, int EnvelopeIndex, int PointIndex, int Channel, EEditType EditType, int Previous, int Current) :
+	IEditorAction(pEditor), m_EnvelopeIndex(EnvelopeIndex), m_PointIndex(PointIndex), m_Channel(Channel), m_EditType(EditType), m_Previous(Previous), m_Current(Current), m_pEnv(pEditor->m_Map.m_vpEnvelopes[EnvelopeIndex])
+{
+	static const char *s_apNames[] = {
+		"time",
+		"value",
+		"curve type"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit %s of point %d (channel %d) of env %d", s_apNames[(int)m_EditType], m_PointIndex, m_Channel, m_EnvelopeIndex);
+}
+
+void CEditorActionEnvelopeEditPoint::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEnvelopeEditPoint::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEnvelopeEditPoint::Apply(int Value)
+{
+	if(m_EditType == EEditType::TIME)
+	{
+		m_pEnv->m_vPoints[m_PointIndex].m_Time = Value;
+	}
+	else if(m_EditType == EEditType::VALUE)
+	{
+		m_pEnv->m_vPoints[m_PointIndex].m_aValues[m_Channel] = Value;
+
+		if(m_pEnv->GetChannels() == 4)
+		{
+			auto *pValues = m_pEnv->m_vPoints[m_PointIndex].m_aValues;
+			const ColorRGBA Color = ColorRGBA(fx2f(pValues[0]), fx2f(pValues[1]), fx2f(pValues[2]), fx2f(pValues[3]));
+
+			m_pEditor->m_ColorPickerPopupContext.m_RgbaColor = Color;
+			m_pEditor->m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(Color);
+			m_pEditor->m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_pEditor->m_ColorPickerPopupContext.m_HslaColor);
+		}
+	}
+	else if(m_EditType == EEditType::CURVE_TYPE)
+	{
+		m_pEnv->m_vPoints[m_PointIndex].m_Curvetype = Value;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// ----
+
+CEditorActionEditEnvelopePointValue::CEditorActionEditEnvelopePointValue(CEditor *pEditor, int EnvIndex, int PointIndex, int Channel, EType Type, int OldTime, int OldValue, int NewTime, int NewValue) :
+	IEditorAction(pEditor), m_EnvIndex(EnvIndex), m_PtIndex(PointIndex), m_Channel(Channel), m_Type(Type), m_OldTime(OldTime), m_OldValue(OldValue), m_NewTime(NewTime), m_NewValue(NewValue)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit point %d%s value (envelope %d, channel %d)", PointIndex, m_Type == EType::TANGENT_IN ? "tangent in" : (m_Type == EType::TANGENT_OUT ? "tangent out" : ""), m_EnvIndex, m_Channel);
+}
+
+void CEditorActionEditEnvelopePointValue::Undo()
+{
+	Apply(true);
+}
+
+void CEditorActionEditEnvelopePointValue::Redo()
+{
+	Apply(false);
+}
+
+void CEditorActionEditEnvelopePointValue::Apply(bool Undo)
+{
+	float CurrentValue = fx2f(Undo ? m_OldValue : m_NewValue);
+	float CurrentTime = (Undo ? m_OldTime : m_NewTime) / 1000.0f;
+
+	std::shared_ptr<CEnvelope> pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	if(m_Type == EType::TANGENT_IN)
+	{
+		pEnvelope->m_vPoints[m_PtIndex].m_Bezier.m_aInTangentDeltaX[m_Channel] = minimum<int>(CurrentTime * 1000.0f - pEnvelope->m_vPoints[m_PtIndex].m_Time, 0);
+		pEnvelope->m_vPoints[m_PtIndex].m_Bezier.m_aInTangentDeltaY[m_Channel] = f2fx(CurrentValue) - pEnvelope->m_vPoints[m_PtIndex].m_aValues[m_Channel];
+	}
+	else if(m_Type == EType::TANGENT_OUT)
+	{
+		pEnvelope->m_vPoints[m_PtIndex].m_Bezier.m_aOutTangentDeltaX[m_Channel] = maximum<int>(CurrentTime * 1000.0f - pEnvelope->m_vPoints[m_PtIndex].m_Time, 0);
+		pEnvelope->m_vPoints[m_PtIndex].m_Bezier.m_aOutTangentDeltaY[m_Channel] = f2fx(CurrentValue) - pEnvelope->m_vPoints[m_PtIndex].m_aValues[m_Channel];
+	}
+	else
+	{
+		if(pEnvelope->GetChannels() == 1 || pEnvelope->GetChannels() == 4)
+			CurrentValue = clamp(CurrentValue, 0.0f, 1.0f);
+		pEnvelope->m_vPoints[m_PtIndex].m_aValues[m_Channel] = f2fx(CurrentValue);
+
+		if(m_PtIndex != 0)
+		{
+			pEnvelope->m_vPoints[m_PtIndex].m_Time = CurrentTime * 1000.0f;
+
+			if(pEnvelope->m_vPoints[m_PtIndex].m_Time < pEnvelope->m_vPoints[m_PtIndex - 1].m_Time)
+				pEnvelope->m_vPoints[m_PtIndex].m_Time = pEnvelope->m_vPoints[m_PtIndex - 1].m_Time + 1;
+			if(static_cast<size_t>(m_PtIndex) + 1 != pEnvelope->m_vPoints.size() && pEnvelope->m_vPoints[m_PtIndex].m_Time > pEnvelope->m_vPoints[m_PtIndex + 1].m_Time)
+				pEnvelope->m_vPoints[m_PtIndex].m_Time = pEnvelope->m_vPoints[m_PtIndex + 1].m_Time - 1;
+		}
+		else
+		{
+			pEnvelope->m_vPoints[m_PtIndex].m_Time = 0.0f;
+		}
+	}
+
+	m_pEditor->m_Map.OnModify();
+	m_pEditor->m_UpdateEnvPointInfo = true;
+}
+
+// ---------------------
+
+CEditorActionResetEnvelopePointTangent::CEditorActionResetEnvelopePointTangent(CEditor *pEditor, int EnvIndex, int PointIndex, int Channel, bool In) :
+	IEditorAction(pEditor), m_EnvIndex(EnvIndex), m_PointIndex(PointIndex), m_Channel(Channel), m_In(In)
+{
+	std::shared_ptr<CEnvelope> pEnvelope = pEditor->m_Map.m_vpEnvelopes[EnvIndex];
+	if(In)
+	{
+		m_Previous[0] = pEnvelope->m_vPoints[PointIndex].m_Bezier.m_aInTangentDeltaX[Channel];
+		m_Previous[1] = pEnvelope->m_vPoints[PointIndex].m_Bezier.m_aInTangentDeltaY[Channel];
+	}
+	else
+	{
+		m_Previous[0] = pEnvelope->m_vPoints[PointIndex].m_Bezier.m_aOutTangentDeltaX[Channel];
+		m_Previous[1] = pEnvelope->m_vPoints[PointIndex].m_Bezier.m_aOutTangentDeltaY[Channel];
+	}
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Reset point %d of env %d tangent %s", m_PointIndex, m_EnvIndex, m_In ? "in" : "out");
+}
+
+void CEditorActionResetEnvelopePointTangent::Undo()
+{
+	std::shared_ptr<CEnvelope> pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	if(m_In)
+	{
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aInTangentDeltaX[m_Channel] = m_Previous[0];
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aInTangentDeltaY[m_Channel] = m_Previous[1];
+	}
+	else
+	{
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aOutTangentDeltaX[m_Channel] = m_Previous[0];
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aOutTangentDeltaY[m_Channel] = m_Previous[1];
+	}
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionResetEnvelopePointTangent::Redo()
+{
+	std::shared_ptr<CEnvelope> pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	if(m_In)
+	{
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aInTangentDeltaX[m_Channel] = 0.0f;
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aInTangentDeltaY[m_Channel] = 0.0f;
+	}
+	else
+	{
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aOutTangentDeltaX[m_Channel] = 0.0f;
+		pEnvelope->m_vPoints[m_PointIndex].m_Bezier.m_aOutTangentDeltaY[m_Channel] = 0.0f;
+	}
+	m_pEditor->m_Map.OnModify();
+}
+
+// ------------------
+
+CEditorActionAddEnvelopePoint::CEditorActionAddEnvelopePoint(CEditor *pEditor, int EnvIndex, int Time, ColorRGBA Channels) :
+	IEditorAction(pEditor), m_EnvIndex(EnvIndex), m_Time(Time), m_Channels(Channels)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add new point in envelope %d at time %f", m_EnvIndex, Time / 1000.0);
+}
+
+void CEditorActionAddEnvelopePoint::Undo()
+{
+	// Delete added point
+	auto pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	auto pIt = std::find_if(pEnvelope->m_vPoints.begin(), pEnvelope->m_vPoints.end(), [this](const CEnvPoint_runtime &Point) {
+		return Point.m_Time == m_Time;
+	});
+	if(pIt != pEnvelope->m_vPoints.end())
+	{
+		pEnvelope->m_vPoints.erase(pIt);
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionAddEnvelopePoint::Redo()
+{
+	auto pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	pEnvelope->AddPoint(m_Time,
+		f2fx(m_Channels.r), f2fx(m_Channels.g),
+		f2fx(m_Channels.b), f2fx(m_Channels.a));
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionDeleteEnvelopePoint::CEditorActionDeleteEnvelopePoint(CEditor *pEditor, int EnvIndex, int PointIndex) :
+	IEditorAction(pEditor), m_EnvIndex(EnvIndex), m_PointIndex(PointIndex), m_Point(pEditor->m_Map.m_vpEnvelopes[EnvIndex]->m_vPoints[PointIndex])
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete point %d of envelope %d", m_PointIndex, m_EnvIndex);
+}
+
+void CEditorActionDeleteEnvelopePoint::Undo()
+{
+	std::shared_ptr<CEnvelope> pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	pEnvelope->m_vPoints.insert(pEnvelope->m_vPoints.begin() + m_PointIndex, m_Point);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionDeleteEnvelopePoint::Redo()
+{
+	std::shared_ptr<CEnvelope> pEnvelope = m_pEditor->m_Map.m_vpEnvelopes[m_EnvIndex];
+	pEnvelope->m_vPoints.erase(pEnvelope->m_vPoints.begin() + m_PointIndex);
+
+	auto pSelectedPointIt = std::find_if(m_pEditor->m_vSelectedEnvelopePoints.begin(), m_pEditor->m_vSelectedEnvelopePoints.end(), [this](const std::pair<int, int> Pair) {
+		return Pair.first == m_PointIndex;
+	});
+
+	if(pSelectedPointIt != m_pEditor->m_vSelectedEnvelopePoints.end())
+		m_pEditor->m_vSelectedEnvelopePoints.erase(pSelectedPointIt);
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// -------------------------------
+
+CEditorActionEditLayerSoundsProp::CEditorActionEditLayerSoundsProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerSoundsProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current)
+{
+	static const char *s_apNames[] = {
+		"sound"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit sounds layer %d in group %d %s property", m_LayerIndex, m_GroupIndex, s_apNames[(int)m_Prop]);
+}
+
+void CEditorActionEditLayerSoundsProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditLayerSoundsProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditLayerSoundsProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	if(m_Prop == ELayerSoundsProp::PROP_SOUND)
+	{
+		if(Value >= 0)
+			pLayerSounds->m_Sound = Value % m_pEditor->m_Map.m_vpSounds.size();
+		else
+			pLayerSounds->m_Sound = -1;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// ---
+
+CEditorActionDeleteSoundSource::CEditorActionDeleteSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_SourceIndex(SourceIndex)
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	m_Source = pLayerSounds->m_vSources[SourceIndex];
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete sound source %d in layer %d of group %d", SourceIndex, LayerIndex, GroupIndex);
+}
+
+void CEditorActionDeleteSoundSource::Undo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	pLayerSounds->m_vSources.insert(pLayerSounds->m_vSources.begin() + m_SourceIndex, m_Source);
+	m_pEditor->m_SelectedSource = m_SourceIndex;
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionDeleteSoundSource::Redo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	pLayerSounds->m_vSources.erase(pLayerSounds->m_vSources.begin() + m_SourceIndex);
+	m_pEditor->m_SelectedSource--;
+	m_pEditor->m_Map.OnModify();
+}
+
+// ---------------
+
+CEditorActionEditSoundSource::CEditorActionEditSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, EEditType Type, int Value) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_SourceIndex(SourceIndex), m_EditType(Type), m_CurrentValue(Value), m_pSavedObject(nullptr)
+{
+	Save();
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit sound source %d in layer %d of group %d", SourceIndex, LayerIndex, GroupIndex);
+}
+
+void CEditorActionEditSoundSource::Undo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_EditType == EEditType::SHAPE)
+	{
+		CSoundShape *pSavedShape = (CSoundShape *)m_pSavedObject;
+		pSource->m_Shape.m_Type = pSavedShape->m_Type;
+
+		// set default values
+		switch(pSource->m_Shape.m_Type)
+		{
+		case CSoundShape::SHAPE_CIRCLE:
+		{
+			pSource->m_Shape.m_Circle.m_Radius = pSavedShape->m_Circle.m_Radius;
+			break;
+		}
+		case CSoundShape::SHAPE_RECTANGLE:
+		{
+			pSource->m_Shape.m_Rectangle.m_Width = pSavedShape->m_Rectangle.m_Width;
+			pSource->m_Shape.m_Rectangle.m_Height = pSavedShape->m_Rectangle.m_Height;
+			break;
+		}
+		}
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionEditSoundSource::Redo()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_EditType == EEditType::SHAPE)
+	{
+		pSource->m_Shape.m_Type = m_CurrentValue;
+
+		// set default values
+		switch(pSource->m_Shape.m_Type)
+		{
+		case CSoundShape::SHAPE_CIRCLE:
+		{
+			pSource->m_Shape.m_Circle.m_Radius = 1000.0f;
+			break;
+		}
+		case CSoundShape::SHAPE_RECTANGLE:
+		{
+			pSource->m_Shape.m_Rectangle.m_Width = f2fx(1000.0f);
+			pSource->m_Shape.m_Rectangle.m_Height = f2fx(800.0f);
+			break;
+		}
+		}
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionEditSoundSource::Save()
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_EditType == EEditType::SHAPE)
+	{
+		CSoundShape *pShapeInfo = new CSoundShape;
+		pShapeInfo->m_Type = pSource->m_Shape.m_Type;
+
+		switch(pSource->m_Shape.m_Type)
+		{
+		case CSoundShape::SHAPE_CIRCLE:
+		{
+			pShapeInfo->m_Circle.m_Radius = pSource->m_Shape.m_Circle.m_Radius;
+			break;
+		}
+		case CSoundShape::SHAPE_RECTANGLE:
+		{
+			pShapeInfo->m_Rectangle.m_Width = pSource->m_Shape.m_Rectangle.m_Width;
+			pShapeInfo->m_Rectangle.m_Height = pSource->m_Shape.m_Rectangle.m_Height;
+			break;
+		}
+		}
+
+		m_pSavedObject = pShapeInfo;
+	}
+}
+
+CEditorActionEditSoundSource::~CEditorActionEditSoundSource()
+{
+	if(m_EditType == EEditType::SHAPE)
+	{
+		CSoundShape *pSavedShape = (CSoundShape *)m_pSavedObject;
+		delete pSavedShape;
+	}
+}
+
+// -----
+
+CEditorActionEditSoundSourceProp::CEditorActionEditSoundSourceProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ESoundProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current), m_SourceIndex(SourceIndex)
+{
+	static const char *s_apNames[] = {
+		"pos X",
+		"pos Y",
+		"loop",
+		"pan",
+		"time delay",
+		"falloff",
+		"pos env",
+		"pos env offset",
+		"sound env",
+		"sound env offset"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit sound source %d in layer %d of group %d %s property", SourceIndex, LayerIndex, GroupIndex, s_apNames[(int)Prop]);
+}
+
+void CEditorActionEditSoundSourceProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditSoundSourceProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditSoundSourceProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_Prop == ESoundProp::PROP_POS_X)
+	{
+		pSource->m_Position.x = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_POS_Y)
+	{
+		pSource->m_Position.y = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_LOOP)
+	{
+		pSource->m_Loop = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_PAN)
+	{
+		pSource->m_Pan = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_TIME_DELAY)
+	{
+		pSource->m_TimeDelay = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_FALLOFF)
+	{
+		pSource->m_Falloff = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_POS_ENV)
+	{
+		pSource->m_PosEnv = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_POS_ENV_OFFSET)
+	{
+		pSource->m_PosEnvOffset = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_SOUND_ENV)
+	{
+		pSource->m_SoundEnv = Value;
+	}
+	else if(m_Prop == ESoundProp::PROP_SOUND_ENV_OFFSET)
+	{
+		pSource->m_SoundEnvOffset = Value;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionEditRectSoundSourceShapeProp::CEditorActionEditRectSoundSourceShapeProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ERectangleShapeProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current), m_SourceIndex(SourceIndex)
+{
+	static const char *s_apNames[] = {
+		"width",
+		"height"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit sound source %d in layer %d of group %d sound shape %s property", m_SourceIndex, m_LayerIndex, m_GroupIndex, s_apNames[(int)Prop]);
+}
+
+void CEditorActionEditRectSoundSourceShapeProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditRectSoundSourceShapeProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditRectSoundSourceShapeProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_Prop == ERectangleShapeProp::PROP_RECTANGLE_WIDTH)
+	{
+		pSource->m_Shape.m_Rectangle.m_Width = Value;
+	}
+	else if(m_Prop == ERectangleShapeProp::PROP_RECTANGLE_HEIGHT)
+	{
+		pSource->m_Shape.m_Rectangle.m_Height = Value;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+CEditorActionEditCircleSoundSourceShapeProp::CEditorActionEditCircleSoundSourceShapeProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ECircleShapeProp Prop, int Previous, int Current) :
+	CEditorActionEditLayerPropBase(pEditor, GroupIndex, LayerIndex, Prop, Previous, Current), m_SourceIndex(SourceIndex)
+{
+	static const char *s_apNames[] = {
+		"radius"};
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit sound source %d in layer %d of group %d sound shape %s property", m_SourceIndex, m_LayerIndex, m_GroupIndex, s_apNames[(int)Prop]);
+}
+
+void CEditorActionEditCircleSoundSourceShapeProp::Undo()
+{
+	Apply(m_Previous);
+}
+
+void CEditorActionEditCircleSoundSourceShapeProp::Redo()
+{
+	Apply(m_Current);
+}
+
+void CEditorActionEditCircleSoundSourceShapeProp::Apply(int Value)
+{
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	CSoundSource *pSource = &pLayerSounds->m_vSources[m_SourceIndex];
+
+	if(m_Prop == ECircleShapeProp::PROP_CIRCLE_RADIUS)
+	{
+		pSource->m_Shape.m_Circle.m_Radius = Value;
+	}
+
+	m_pEditor->m_Map.OnModify();
+}
+
+// --------------------------
+
+CEditorActionNewEmptySound::CEditorActionNewEmptySound(CEditor *pEditor, int GroupIndex, int LayerIndex, int x, int y) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_X(x), m_Y(y)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "New sound in layer %d of group %d", LayerIndex, GroupIndex);
+}
+
+void CEditorActionNewEmptySound::Undo()
+{
+	// Undo is simply deleting the added source
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	pLayerSounds->m_vSources.pop_back();
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionNewEmptySound::Redo()
+{
+	auto &Map = m_pEditor->m_Map;
+	std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(m_pLayer);
+	pLayerSounds->NewSource(m_X, m_Y);
+
+	Map.OnModify();
+}
+
+CEditorActionNewEmptyQuad::CEditorActionNewEmptyQuad(CEditor *pEditor, int GroupIndex, int LayerIndex, int x, int y) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_X(x), m_Y(y)
+{
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "New quad in layer %d of group %d", LayerIndex, GroupIndex);
+}
+
+void CEditorActionNewEmptyQuad::Undo()
+{
+	// Undo is simply deleting the added quad
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	pLayerQuads->m_vQuads.pop_back();
+
+	m_pEditor->m_Map.OnModify();
+}
+
+void CEditorActionNewEmptyQuad::Redo()
+{
+	auto &Map = m_pEditor->m_Map;
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+
+	int Width = 64;
+	int Height = 64;
+	if(pLayerQuads->m_Image >= 0)
+	{
+		Width = Map.m_vpImages[pLayerQuads->m_Image]->m_Width;
+		Height = Map.m_vpImages[pLayerQuads->m_Image]->m_Height;
+	}
+
+	pLayerQuads->NewQuad(m_X, m_Y, Width, Height);
+
+	Map.OnModify();
+}
+
+// -------------
+
+CEditorActionNewQuad::CEditorActionNewQuad(CEditor *pEditor, int GroupIndex, int LayerIndex) :
+	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex)
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	m_Quad = pLayerQuads->m_vQuads[pLayerQuads->m_vQuads.size() - 1];
+
+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "New quad in layer %d of group %d", LayerIndex, GroupIndex);
+}
+
+void CEditorActionNewQuad::Undo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	pLayerQuads->m_vQuads.pop_back();
+}
+
+void CEditorActionNewQuad::Redo()
+{
+	std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(m_pLayer);
+	pLayerQuads->m_vQuads.emplace_back(m_Quad);
+}
diff --git a/src_bkp/game/editor/editor_actions.h b/src_bkp/game/editor/editor_actions.h
new file mode 100644
index 0000000000..198e02a6f3
--- /dev/null
+++ b/src_bkp/game/editor/editor_actions.h
@@ -0,0 +1,648 @@
+#ifndef GAME_EDITOR_EDITOR_ACTIONS_H
+#define GAME_EDITOR_EDITOR_ACTIONS_H
+
+#include "editor.h"
+#include "editor_action.h"
+
+class CEditorActionLayerBase : public IEditorAction
+{
+public:
+	CEditorActionLayerBase(CEditor *pEditor, int GroupIndex, int LayerIndex);
+
+	virtual void Undo() override {}
+	virtual void Redo() override {}
+
+protected:
+	int m_GroupIndex;
+	int m_LayerIndex;
+	std::shared_ptr<CLayer> m_pLayer;
+};
+
+class CEditorBrushDrawAction : public IEditorAction
+{
+public:
+	CEditorBrushDrawAction(CEditor *pEditor, int Group);
+
+	void Undo() override;
+	void Redo() override;
+	bool IsEmpty() override;
+
+private:
+	int m_Group;
+	// m_vTileChanges is a list of changes for each layer that was modified.
+	// The std::pair is used to pair one layer (index) with its history (2D map).
+	// EditorTileStateChangeHistory<T> is a 2D map, storing a change item at a specific y,x position.
+	std::vector<std::pair<int, EditorTileStateChangeHistory<STileStateChange>>> m_vTileChanges;
+	EditorTileStateChangeHistory<STeleTileStateChange> m_TeleTileChanges;
+	EditorTileStateChangeHistory<SSpeedupTileStateChange> m_SpeedupTileChanges;
+	EditorTileStateChangeHistory<SSwitchTileStateChange> m_SwitchTileChanges;
+	EditorTileStateChangeHistory<STuneTileStateChange> m_TuneTileChanges;
+
+	int m_TotalTilesDrawn;
+	int m_TotalLayers;
+
+	void Apply(bool Undo);
+	void SetInfos();
+};
+
+// ---------------------------------------------------------
+
+class CEditorActionQuadPlace : public CEditorActionLayerBase
+{
+public:
+	CEditorActionQuadPlace(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<CQuad> &vBrush);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	std::vector<CQuad> m_vBrush;
+};
+
+class CEditorActionSoundPlace : public CEditorActionLayerBase
+{
+public:
+	CEditorActionSoundPlace(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<CSoundSource> &vBrush);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	std::vector<CSoundSource> m_vBrush;
+};
+
+// -------------------------------------------------------------
+
+class CEditorActionDeleteQuad : public CEditorActionLayerBase
+{
+public:
+	CEditorActionDeleteQuad(CEditor *pEditor, int GroupIndex, int LayerIndex, std::vector<int> const &vQuadsIndices, std::vector<CQuad> const &vDeletedQuads);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	std::vector<int> m_vQuadsIndices;
+	std::vector<CQuad> m_vDeletedQuads;
+};
+
+// -------------------------------------------------------------
+
+class CEditorActionEditQuadPoint : public CEditorActionLayerBase
+{
+public:
+	CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_QuadIndex;
+	std::vector<CPoint> m_vPreviousPoints;
+	std::vector<CPoint> m_vCurrentPoints;
+};
+
+class CEditorActionEditQuadProp : public CEditorActionLayerBase
+{
+public:
+	CEditorActionEditQuadProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, EQuadProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_QuadIndex;
+	EQuadProp m_Prop;
+	int m_Previous;
+	int m_Current;
+
+	void Apply(int Value);
+};
+
+class CEditorActionEditQuadPointProp : public CEditorActionLayerBase
+{
+public:
+	CEditorActionEditQuadPointProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, int PointIndex, EQuadPointProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_QuadIndex;
+	int m_PointIndex;
+	EQuadPointProp m_Prop;
+	int m_Previous;
+	int m_Current;
+
+	void Apply(int Value);
+};
+
+// -------------------------------------------------------------
+
+class CEditorActionBulk : public IEditorAction
+{
+public:
+	CEditorActionBulk(CEditor *pEditor, const std::vector<std::shared_ptr<IEditorAction>> &vpActions, const char *pDisplay = nullptr, bool Reverse = false);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	std::vector<std::shared_ptr<IEditorAction>> m_vpActions;
+	std::string m_Display;
+	bool m_Reverse;
+};
+
+//
+
+class CEditorActionAutoMap : public CEditorActionLayerBase
+{
+public:
+	CEditorActionAutoMap(CEditor *pEditor, int GroupIndex, int LayerIndex, const EditorTileStateChangeHistory<STileStateChange> &Changes);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	EditorTileStateChangeHistory<STileStateChange> m_Changes;
+	int m_TotalChanges;
+
+	void ComputeInfos();
+	void Apply(bool Undo);
+};
+
+// -------------------------------------------------------------
+
+class CEditorActionAddLayer : public CEditorActionLayerBase
+{
+public:
+	CEditorActionAddLayer(CEditor *pEditor, int GroupIndex, int LayerIndex, bool Duplicate = false);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	bool m_Duplicate;
+};
+
+class CEditorActionDeleteLayer : public CEditorActionLayerBase
+{
+public:
+	CEditorActionDeleteLayer(CEditor *pEditor, int GroupIndex, int LayerIndex);
+
+	void Undo() override;
+	void Redo() override;
+};
+
+class CEditorActionGroup : public IEditorAction
+{
+public:
+	CEditorActionGroup(CEditor *pEditor, int GroupIndex, bool Delete);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_GroupIndex;
+	bool m_Delete;
+	std::shared_ptr<CLayerGroup> m_pGroup;
+};
+
+class CEditorActionEditGroupProp : public IEditorAction
+{
+public:
+	CEditorActionEditGroupProp(CEditor *pEditor, int GroupIndex, EGroupProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_GroupIndex;
+	EGroupProp m_Prop;
+	int m_Previous;
+	int m_Current;
+
+	void Apply(int Value);
+};
+
+template<typename E>
+class CEditorActionEditLayerPropBase : public CEditorActionLayerBase
+{
+public:
+	CEditorActionEditLayerPropBase(CEditor *pEditor, int GroupIndex, int LayerIndex, E Prop, int Previous, int Current);
+
+	virtual void Undo() override {}
+	virtual void Redo() override {}
+
+protected:
+	E m_Prop;
+	int m_Previous;
+	int m_Current;
+};
+
+class CEditorActionEditLayerProp : public CEditorActionEditLayerPropBase<ELayerProp>
+{
+public:
+	CEditorActionEditLayerProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionEditLayerTilesProp : public CEditorActionEditLayerPropBase<ETilesProp>
+{
+public:
+	CEditorActionEditLayerTilesProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ETilesProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+	void SetSavedLayers(const std::map<int, std::shared_ptr<CLayer>> &SavedLayers);
+
+private:
+	std::map<int, std::shared_ptr<CLayer>> m_SavedLayers;
+
+	void RestoreLayer(int Layer, const std::shared_ptr<CLayerTiles> &pLayerTiles);
+};
+
+class CEditorActionEditLayerQuadsProp : public CEditorActionEditLayerPropBase<ELayerQuadsProp>
+{
+public:
+	CEditorActionEditLayerQuadsProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerQuadsProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionEditLayersGroupAndOrder : public IEditorAction
+{
+public:
+	CEditorActionEditLayersGroupAndOrder(CEditor *pEditor, int GroupIndex, const std::vector<int> &LayerIndices, int NewGroupIndex, const std::vector<int> &NewLayerIndices);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_GroupIndex;
+	std::vector<int> m_LayerIndices;
+	int m_NewGroupIndex;
+	std::vector<int> m_NewLayerIndices;
+};
+
+// --------------
+
+class CEditorActionAppendMap : public IEditorAction
+{
+public:
+	struct SPrevInfo
+	{
+		int m_Groups;
+		int m_Images;
+		int m_Sounds;
+		int m_Envelopes;
+	};
+
+public:
+	CEditorActionAppendMap(CEditor *pEditor, const char *pMapName, const SPrevInfo &PrevInfo, std::vector<int> &vImageIndexMap);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	char m_aMapName[IO_MAX_PATH_LENGTH];
+	SPrevInfo m_PrevInfo;
+	std::vector<int> m_vImageIndexMap;
+};
+
+// --------------
+
+class CEditorActionTileArt : public IEditorAction
+{
+public:
+	CEditorActionTileArt(CEditor *pEditor, int PreviousImageCount, const char *pTileArtFile, std::vector<int> &vImageIndexMap);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_PreviousImageCount;
+	char m_aTileArtFile[IO_MAX_PATH_LENGTH];
+	std::vector<int> m_vImageIndexMap;
+};
+
+// ----------------------
+
+class CEditorCommandAction : public IEditorAction
+{
+public:
+	enum class EType
+	{
+		DELETE,
+		ADD,
+		EDIT,
+		MOVE_UP,
+		MOVE_DOWN
+	};
+
+	CEditorCommandAction(CEditor *pEditor, EType Type, int *pSelectedCommandIndex, int CommandIndex, const char *pPreviousCommand = nullptr, const char *pCurrentCommand = nullptr);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	EType m_Type;
+	int *m_pSelectedCommandIndex;
+	int m_CommandIndex;
+	std::string m_PreviousCommand;
+	std::string m_CurrentCommand;
+};
+
+// ------------------------------
+
+class CEditorActionEnvelopeAdd : public IEditorAction
+{
+public:
+	CEditorActionEnvelopeAdd(CEditor *pEditor, const std::shared_ptr<CEnvelope> &pEnv);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	std::shared_ptr<CEnvelope> m_pEnv;
+};
+
+class CEditorActionEveloppeDelete : public IEditorAction
+{
+public:
+	CEditorActionEveloppeDelete(CEditor *pEditor, int EnvelopeIndex);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvelopeIndex;
+	std::shared_ptr<CEnvelope> m_pEnv;
+};
+
+class CEditorActionEnvelopeEdit : public IEditorAction
+{
+public:
+	enum class EEditType
+	{
+		SYNC,
+		ORDER
+	};
+
+	CEditorActionEnvelopeEdit(CEditor *pEditor, int EnvelopeIndex, EEditType EditType, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvelopeIndex;
+	EEditType m_EditType;
+	int m_Previous;
+	int m_Current;
+	std::shared_ptr<CEnvelope> m_pEnv;
+};
+
+class CEditorActionEnvelopeEditPoint : public IEditorAction
+{
+public:
+	enum class EEditType
+	{
+		TIME,
+		VALUE,
+		CURVE_TYPE,
+		HANDLE
+	};
+
+	CEditorActionEnvelopeEditPoint(CEditor *pEditor, int EnvelopeIndex, int PointIndex, int Channel, EEditType EditType, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvelopeIndex;
+	int m_PointIndex;
+	int m_Channel;
+	EEditType m_EditType;
+	int m_Previous;
+	int m_Current;
+	std::shared_ptr<CEnvelope> m_pEnv;
+
+	void Apply(int Value);
+};
+
+class CEditorActionAddEnvelopePoint : public IEditorAction
+{
+public:
+	CEditorActionAddEnvelopePoint(CEditor *pEditor, int EnvIndex, int Time, ColorRGBA Channels);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvIndex;
+	int m_Time;
+	ColorRGBA m_Channels;
+};
+
+class CEditorActionDeleteEnvelopePoint : public IEditorAction
+{
+public:
+	CEditorActionDeleteEnvelopePoint(CEditor *pEditor, int EnvIndex, int PointIndex);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvIndex;
+	int m_PointIndex;
+	CEnvPoint_runtime m_Point;
+};
+
+class CEditorActionEditEnvelopePointValue : public IEditorAction
+{
+public:
+	enum class EType
+	{
+		TANGENT_IN,
+		TANGENT_OUT,
+		POINT
+	};
+
+	CEditorActionEditEnvelopePointValue(CEditor *pEditor, int EnvIndex, int PointIndex, int Channel, EType Type, int OldTime, int OldValue, int NewTime, int NewValue);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvIndex;
+	int m_PtIndex;
+	int m_Channel;
+	EType m_Type;
+	int m_OldTime;
+	int m_OldValue;
+	int m_NewTime;
+	int m_NewValue;
+
+	void Apply(bool Undo);
+};
+
+class CEditorActionResetEnvelopePointTangent : public IEditorAction
+{
+public:
+	CEditorActionResetEnvelopePointTangent(CEditor *pEditor, int EnvIndex, int PointIndex, int Channel, bool In);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_EnvIndex;
+	int m_PointIndex;
+	int m_Channel;
+	bool m_In;
+	int m_Previous[2];
+};
+
+class CEditorActionEditLayerSoundsProp : public CEditorActionEditLayerPropBase<ELayerSoundsProp>
+{
+public:
+	CEditorActionEditLayerSoundsProp(CEditor *pEditor, int GroupIndex, int LayerIndex, ELayerSoundsProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionDeleteSoundSource : public CEditorActionLayerBase
+{
+public:
+	CEditorActionDeleteSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+	CSoundSource m_Source;
+};
+
+class CEditorActionEditSoundSource : public CEditorActionLayerBase
+{
+public:
+	enum class EEditType
+	{
+		SHAPE
+	};
+
+	CEditorActionEditSoundSource(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, EEditType Type, int Value);
+	~CEditorActionEditSoundSource() override;
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+	EEditType m_EditType;
+	int m_CurrentValue;
+
+	std::vector<int> m_vOriginalValues;
+	void *m_pSavedObject;
+
+	void Save();
+};
+
+class CEditorActionEditSoundSourceProp : public CEditorActionEditLayerPropBase<ESoundProp>
+{
+public:
+	CEditorActionEditSoundSourceProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ESoundProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionEditRectSoundSourceShapeProp : public CEditorActionEditLayerPropBase<ERectangleShapeProp>
+{
+public:
+	CEditorActionEditRectSoundSourceShapeProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ERectangleShapeProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionEditCircleSoundSourceShapeProp : public CEditorActionEditLayerPropBase<ECircleShapeProp>
+{
+public:
+	CEditorActionEditCircleSoundSourceShapeProp(CEditor *pEditor, int GroupIndex, int LayerIndex, int SourceIndex, ECircleShapeProp Prop, int Previous, int Current);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_SourceIndex;
+
+private:
+	void Apply(int Value);
+};
+
+class CEditorActionNewEmptySound : public CEditorActionLayerBase
+{
+public:
+	CEditorActionNewEmptySound(CEditor *pEditor, int GroupIndex, int LayerIndex, int x, int y);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_X;
+	int m_Y;
+};
+
+class CEditorActionNewEmptyQuad : public CEditorActionLayerBase
+{
+public:
+	CEditorActionNewEmptyQuad(CEditor *pEditor, int GroupIndex, int LayerIndex, int x, int y);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	int m_X;
+	int m_Y;
+};
+
+class CEditorActionNewQuad : public CEditorActionLayerBase
+{
+public:
+	CEditorActionNewQuad(CEditor *pEditor, int GroupIndex, int LayerIndex);
+
+	void Undo() override;
+	void Redo() override;
+
+private:
+	CQuad m_Quad;
+};
+
+#endif
diff --git a/src_bkp/game/editor/editor_history.cpp b/src_bkp/game/editor/editor_history.cpp
new file mode 100644
index 0000000000..46110de2d5
--- /dev/null
+++ b/src_bkp/game/editor/editor_history.cpp
@@ -0,0 +1,65 @@
+#include <engine/shared/config.h>
+
+#include "editor.h"
+#include "editor_actions.h"
+#include "editor_history.h"
+
+void CEditorHistory::RecordAction(const std::shared_ptr<IEditorAction> &pAction)
+{
+	RecordAction(pAction, nullptr);
+}
+
+void CEditorHistory::Execute(const std::shared_ptr<IEditorAction> &pAction, const char *pDisplay)
+{
+	pAction->Redo();
+	RecordAction(pAction, pDisplay);
+}
+
+void CEditorHistory::RecordAction(const std::shared_ptr<IEditorAction> &pAction, const char *pDisplay)
+{
+	m_vpRedoActions.clear();
+
+	if((int)m_vpUndoActions.size() >= g_Config.m_ClEditorMaxHistory)
+	{
+		m_vpUndoActions.pop_front();
+	}
+
+	if(pDisplay == nullptr)
+		m_vpUndoActions.emplace_back(pAction);
+	else
+		m_vpUndoActions.emplace_back(std::make_shared<CEditorActionBulk>(m_pEditor, std::vector<std::shared_ptr<IEditorAction>>{pAction}, pDisplay));
+}
+
+bool CEditorHistory::Undo()
+{
+	if(m_vpUndoActions.empty())
+		return false;
+
+	auto pLastAction = m_vpUndoActions.back();
+	m_vpUndoActions.pop_back();
+
+	pLastAction->Undo();
+
+	m_vpRedoActions.emplace_back(pLastAction);
+	return true;
+}
+
+bool CEditorHistory::Redo()
+{
+	if(m_vpRedoActions.empty())
+		return false;
+
+	auto pLastAction = m_vpRedoActions.back();
+	m_vpRedoActions.pop_back();
+
+	pLastAction->Redo();
+
+	m_vpUndoActions.emplace_back(pLastAction);
+	return true;
+}
+
+void CEditorHistory::Clear()
+{
+	m_vpUndoActions.clear();
+	m_vpRedoActions.clear();
+}
diff --git a/src_bkp/game/editor/editor_history.h b/src_bkp/game/editor/editor_history.h
new file mode 100644
index 0000000000..144147140f
--- /dev/null
+++ b/src_bkp/game/editor/editor_history.h
@@ -0,0 +1,37 @@
+#ifndef GAME_EDITOR_EDITOR_HISTORY_H
+#define GAME_EDITOR_EDITOR_HISTORY_H
+
+#include "editor_action.h"
+
+#include <queue>
+
+class CEditorHistory
+{
+public:
+	CEditorHistory()
+	{
+		m_pEditor = nullptr;
+	}
+
+	~CEditorHistory()
+	{
+		Clear();
+	}
+
+	void RecordAction(const std::shared_ptr<IEditorAction> &pAction);
+	void RecordAction(const std::shared_ptr<IEditorAction> &pAction, const char *pDisplay);
+	void Execute(const std::shared_ptr<IEditorAction> &pAction, const char *pDisplay = nullptr);
+
+	bool Undo();
+	bool Redo();
+
+	void Clear();
+	bool CanUndo() const { return !m_vpUndoActions.empty(); }
+	bool CanRedo() const { return !m_vpRedoActions.empty(); }
+
+	CEditor *m_pEditor;
+	std::deque<std::shared_ptr<IEditorAction>> m_vpUndoActions;
+	std::deque<std::shared_ptr<IEditorAction>> m_vpRedoActions;
+};
+
+#endif
diff --git a/src_bkp/game/editor/editor_object.cpp b/src_bkp/game/editor/editor_object.cpp
new file mode 100644
index 0000000000..2154c3d10a
--- /dev/null
+++ b/src_bkp/game/editor/editor_object.cpp
@@ -0,0 +1,79 @@
+#include "editor_object.h"
+
+#include "editor.h"
+
+void CEditorObject::Init(CEditor *pEditor)
+{
+	m_pEditor = pEditor;
+	OnReset();
+}
+
+void CEditorObject::OnUpdate(CUIRect View)
+{
+	OnRender(View);
+	if(IsActive())
+		OnActive();
+	else if(IsHot())
+		OnHot();
+}
+
+bool CEditorObject::OnInput(const IInput::CEvent &Event)
+{
+	return false;
+}
+
+void CEditorObject::OnRender(CUIRect View) {}
+
+void CEditorObject::OnReset() {}
+void CEditorObject::OnMapLoad() {}
+
+bool CEditorObject::IsHot()
+{
+	return UI()->HotItem() == this;
+}
+
+void CEditorObject::SetHot()
+{
+	UI()->SetHotItem(this);
+}
+
+void CEditorObject::UnsetHot()
+{
+	if(IsHot())
+		UI()->SetHotItem(nullptr);
+}
+
+void CEditorObject::OnHot() {}
+
+bool CEditorObject::IsActive()
+{
+	return UI()->CheckActiveItem(this);
+}
+
+void CEditorObject::SetActive()
+{
+	SetHot();
+	UI()->SetActiveItem(this);
+}
+
+void CEditorObject::SetInactive()
+{
+	if(IsActive())
+		UI()->SetActiveItem(nullptr);
+}
+
+void CEditorObject::OnActive() {}
+
+CEditor *CEditorObject::Editor() { return m_pEditor; }
+const CEditor *CEditorObject::Editor() const { return m_pEditor; }
+IInput *CEditorObject::Input() { return m_pEditor->Input(); }
+IClient *CEditorObject::Client() { return m_pEditor->Client(); }
+CConfig *CEditorObject::Config() { return m_pEditor->Config(); }
+IConsole *CEditorObject::Console() { return m_pEditor->Console(); }
+IEngine *CEditorObject::Engine() { return m_pEditor->Engine(); }
+IGraphics *CEditorObject::Graphics() { return m_pEditor->Graphics(); }
+ISound *CEditorObject::Sound() { return m_pEditor->Sound(); }
+ITextRender *CEditorObject::TextRender() { return m_pEditor->TextRender(); }
+IStorage *CEditorObject::Storage() { return m_pEditor->Storage(); }
+CUI *CEditorObject::UI() { return m_pEditor->UI(); }
+CRenderTools *CEditorObject::RenderTools() { return m_pEditor->RenderTools(); }
diff --git a/src_bkp/game/editor/editor_object.h b/src_bkp/game/editor/editor_object.h
new file mode 100644
index 0000000000..87ec1df4e7
--- /dev/null
+++ b/src_bkp/game/editor/editor_object.h
@@ -0,0 +1,86 @@
+#ifndef GAME_EDITOR_EDITOR_OBJECT_H
+#define GAME_EDITOR_EDITOR_OBJECT_H
+
+#include <functional>
+
+#include <engine/input.h>
+#include <game/client/ui_rect.h>
+
+class CUI;
+class CEditor;
+class IClient;
+class CConfig;
+class IConsole;
+class IEngine;
+class IGraphics;
+class ISound;
+class ITextRender;
+class IStorage;
+class CRenderTools;
+
+class CEditorObject
+{
+public:
+	virtual ~CEditorObject() = default;
+
+	/**
+	 * Initialise the component and interface pointers.
+	 * Needs to be the first function that is called.
+     * The default implentation also resets the component.
+	 */
+	virtual void Init(CEditor *pEditor);
+
+	/**
+	 * Calls `OnRender` and then maybe `OnHot` or `OnActive`.
+	 */
+	void OnUpdate(CUIRect View);
+
+	/**
+	 * Gets called before `OnRender`. Should return true
+	 * if the event was consumed.
+	 */
+	virtual bool OnInput(const IInput::CEvent &Event);
+
+	virtual void OnRender(CUIRect View);
+
+	/**
+	 * Gets called after `OnRender` when the component is hot but not active.
+	 * I
+	 */
+	virtual void OnHot();
+
+	/**
+	 * Gets called after `OnRender` when the component is active.
+	 */
+	virtual void OnActive();
+
+	virtual void OnReset();
+	virtual void OnMapLoad();
+
+	bool IsHot();
+	void SetHot();
+	void UnsetHot();
+
+	bool IsActive();
+	void SetActive();
+	void SetInactive();
+
+	CEditor *Editor();
+	const CEditor *Editor() const;
+	IInput *Input();
+	IClient *Client();
+	CConfig *Config();
+	IConsole *Console();
+	IEngine *Engine();
+	IGraphics *Graphics();
+	ISound *Sound();
+	ITextRender *TextRender();
+	IStorage *Storage();
+	CUI *UI();
+	CRenderTools *RenderTools();
+
+private:
+	CEditor *m_pEditor;
+};
+
+#endif
diff --git a/src_bkp/game/editor/editor_props.cpp b/src_bkp/game/editor/editor_props.cpp
new file mode 100644
index 0000000000..7d57b9c8f2
--- /dev/null
+++ b/src_bkp/game/editor/editor_props.cpp
@@ -0,0 +1,282 @@
+#include "editor.h"
+
+#include <game/editor/mapitems/image.h>
+#include <game/editor/mapitems/sound.h>
+
+int CEditor::DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color)
+{
+	auto Res = DoPropertiesWithState<int>(pToolbox, pProps, pIDs, pNewVal, Color);
+	return Res.m_Value;
+}
+
+template<typename E>
+SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color)
+{
+	int Change = -1;
+	EEditState State = EEditState::EDITING;
+
+	for(int i = 0; pProps[i].m_pName; i++)
+	{
+		CUIRect Slot;
+		pToolBox->HSplitTop(13.0f, &Slot, pToolBox);
+		CUIRect Label, Shifter;
+		Slot.VSplitMid(&Label, &Shifter);
+		Shifter.HMargin(1.0f, &Shifter);
+		UI()->DoLabel(&Label, pProps[i].m_pName, 10.0f, TEXTALIGN_ML);
+
+		if(pProps[i].m_Type == PROPTYPE_INT_STEP)
+		{
+			CUIRect Inc, Dec;
+			char aBuf[64];
+
+			Shifter.VSplitRight(10.0f, &Shifter, &Inc);
+			Shifter.VSplitLeft(10.0f, &Dec, &Shifter);
+			str_from_int(pProps[i].m_Value, aBuf);
+			auto NewValueRes = UiDoValueSelector((char *)&pIDs[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0, &Color);
+			int NewValue = NewValueRes.m_Value;
+			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
+			{
+				*pNewVal = NewValue;
+				Change = i;
+				State = NewValueRes.m_State;
+			}
+			if(DoButton_ButtonDec((char *)&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Decrease"))
+			{
+				*pNewVal = pProps[i].m_Value - 1;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, nullptr, 0, &Inc, 0, "Increase"))
+			{
+				*pNewVal = pProps[i].m_Value + 1;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_BOOL)
+		{
+			CUIRect No, Yes;
+			Shifter.VSplitMid(&No, &Yes);
+			if(DoButton_ButtonDec(&pIDs[i], "No", !pProps[i].m_Value, &No, 0, ""))
+			{
+				*pNewVal = 0;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 1, "Yes", pProps[i].m_Value, &Yes, 0, ""))
+			{
+				*pNewVal = 1;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_INT_SCROLL)
+		{
+			auto NewValueRes = UiDoValueSelector(&pIDs[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.");
+			int NewValue = NewValueRes.m_Value;
+			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
+			{
+				*pNewVal = NewValue;
+				Change = i;
+				State = NewValueRes.m_State;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_ANGLE_SCROLL)
+		{
+			CUIRect Inc, Dec;
+			Shifter.VSplitRight(10.0f, &Shifter, &Inc);
+			Shifter.VSplitLeft(10.0f, &Dec, &Shifter);
+			const bool Shift = Input()->ShiftIsPressed();
+			int Step = Shift ? 1 : 45;
+			int Value = pProps[i].m_Value;
+
+			auto NewValueRes = UiDoValueSelector(&pIDs[i], &Shifter, "", Value, pProps[i].m_Min, pProps[i].m_Max, Shift ? 1 : 45, Shift ? 1.0f : 10.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0);
+			int NewValue = NewValueRes.m_Value;
+			if(DoButton_ButtonDec(&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Decrease"))
+			{
+				NewValue = (std::ceil((pProps[i].m_Value / (float)Step)) - 1) * Step;
+				if(NewValue < 0)
+					NewValue += 360;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(&pIDs[i] + 2, nullptr, 0, &Inc, 0, "Increase"))
+			{
+				NewValue = (pProps[i].m_Value + Step) / Step * Step;
+				State = EEditState::ONE_GO;
+			}
+
+			if(NewValue != pProps[i].m_Value || NewValueRes.m_State != EEditState::EDITING)
+			{
+				*pNewVal = NewValue % 360;
+				Change = i;
+				State = NewValueRes.m_State;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_COLOR)
+		{
+			const auto &&SetColor = [&](ColorRGBA NewColor) {
+				const int NewValue = NewColor.PackAlphaLast();
+				if(NewValue != pProps[i].m_Value || m_ColorPickerPopupContext.m_State != EEditState::EDITING)
+				{
+					*pNewVal = NewValue;
+					Change = i;
+					State = m_ColorPickerPopupContext.m_State;
+				}
+			};
+			DoColorPickerButton(&pIDs[i], &Shifter, ColorRGBA::UnpackAlphaLast<ColorRGBA>(pProps[i].m_Value), SetColor);
+		}
+		else if(pProps[i].m_Type == PROPTYPE_IMAGE)
+		{
+			const char *pName;
+			if(pProps[i].m_Value < 0)
+				pName = "None";
+			else
+				pName = m_Map.m_vpImages[pProps[i].m_Value]->m_aName;
+
+			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectImageInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+
+			int r = PopupSelectImageResult();
+			if(r >= -1)
+			{
+				*pNewVal = r;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_SHIFT)
+		{
+			CUIRect Left, Right, Up, Down;
+			Shifter.VSplitMid(&Left, &Up, 2.0f);
+			Left.VSplitLeft(10.0f, &Left, &Shifter);
+			Shifter.VSplitRight(10.0f, &Shifter, &Right);
+			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), 0, 0.0f);
+			UI()->DoLabel(&Shifter, "X", 10.0f, TEXTALIGN_MC);
+			Up.VSplitLeft(10.0f, &Up, &Shifter);
+			Shifter.VSplitRight(10.0f, &Shifter, &Down);
+			Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), 0, 0.0f);
+			UI()->DoLabel(&Shifter, "Y", 10.0f, TEXTALIGN_MC);
+			if(DoButton_ButtonDec(&pIDs[i], "-", 0, &Left, 0, "Left"))
+			{
+				*pNewVal = DIRECTION_LEFT;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 3, "+", 0, &Right, 0, "Right"))
+			{
+				*pNewVal = DIRECTION_RIGHT;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonDec(((char *)&pIDs[i]) + 1, "-", 0, &Up, 0, "Up"))
+			{
+				*pNewVal = DIRECTION_UP;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, "+", 0, &Down, 0, "Down"))
+			{
+				*pNewVal = DIRECTION_DOWN;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_SOUND)
+		{
+			const char *pName;
+			if(pProps[i].m_Value < 0)
+				pName = "None";
+			else
+				pName = m_Map.m_vpSounds[pProps[i].m_Value]->m_aName;
+
+			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectSoundInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+
+			int r = PopupSelectSoundResult();
+			if(r >= -1)
+			{
+				*pNewVal = r;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_AUTOMAPPER)
+		{
+			const char *pName;
+			if(pProps[i].m_Value < 0 || pProps[i].m_Min < 0 || pProps[i].m_Min >= (int)m_Map.m_vpImages.size())
+				pName = "None";
+			else
+				pName = m_Map.m_vpImages[pProps[i].m_Min]->m_AutoMapper.GetConfigName(pProps[i].m_Value);
+
+			if(DoButton_Ex(&pIDs[i], pName, 0, &Shifter, 0, nullptr, IGraphics::CORNER_ALL))
+				PopupSelectConfigAutoMapInvoke(pProps[i].m_Value, UI()->MouseX(), UI()->MouseY());
+
+			int r = PopupSelectConfigAutoMapResult();
+			if(r >= -1)
+			{
+				*pNewVal = r;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+		else if(pProps[i].m_Type == PROPTYPE_ENVELOPE)
+		{
+			CUIRect Inc, Dec;
+			char aBuf[8];
+			int CurValue = pProps[i].m_Value;
+
+			Shifter.VSplitRight(10.0f, &Shifter, &Inc);
+			Shifter.VSplitLeft(10.0f, &Dec, &Shifter);
+
+			if(CurValue <= 0)
+				str_copy(aBuf, "None:");
+			else if(m_Map.m_vpEnvelopes[CurValue - 1]->m_aName[0])
+			{
+				str_format(aBuf, sizeof(aBuf), "%s:", m_Map.m_vpEnvelopes[CurValue - 1]->m_aName);
+				if(!str_endswith(aBuf, ":"))
+				{
+					aBuf[sizeof(aBuf) - 2] = ':';
+					aBuf[sizeof(aBuf) - 1] = '\0';
+				}
+			}
+			else
+				aBuf[0] = '\0';
+
+			auto NewValueRes = UiDoValueSelector((char *)&pIDs[i], &Shifter, aBuf, CurValue, 0, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Set Envelope", false, false, IGraphics::CORNER_NONE);
+			int NewVal = NewValueRes.m_Value;
+			if(NewVal != CurValue || NewValueRes.m_State != EEditState::EDITING)
+			{
+				*pNewVal = NewVal;
+				Change = i;
+				State = NewValueRes.m_State;
+			}
+
+			if(DoButton_ButtonDec((char *)&pIDs[i] + 1, nullptr, 0, &Dec, 0, "Previous Envelope"))
+			{
+				*pNewVal = pProps[i].m_Value - 1;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+			if(DoButton_ButtonInc(((char *)&pIDs[i]) + 2, nullptr, 0, &Inc, 0, "Next Envelope"))
+			{
+				*pNewVal = pProps[i].m_Value + 1;
+				Change = i;
+				State = EEditState::ONE_GO;
+			}
+		}
+	}
+
+	return SEditResult<E>{State, static_cast<E>(Change)};
+}
+
+template SEditResult<ECircleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ERectangleShapeProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<EGroupProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ELayerProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ELayerQuadsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ETilesProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ETilesCommonProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ELayerSoundsProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<EQuadProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<EQuadPointProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
+template SEditResult<ESoundProp> CEditor::DoPropertiesWithState(CUIRect *, CProperty *, int *, int *, ColorRGBA);
diff --git a/src_bkp/game/editor/editor_trackers.cpp b/src_bkp/game/editor/editor_trackers.cpp
new file mode 100644
index 0000000000..8f3660422f
--- /dev/null
+++ b/src_bkp/game/editor/editor_trackers.cpp
@@ -0,0 +1,632 @@
+#include "editor_trackers.h"
+
+#include <game/editor/mapitems/layer_group.h>
+#include <game/editor/mapitems/layer_tiles.h>
+
+#include "editor.h"
+#include "editor_actions.h"
+
+CQuadEditTracker::CQuadEditTracker() :
+	m_pEditor(nullptr), m_TrackedProp(EQuadProp::PROP_NONE) {}
+
+CQuadEditTracker::~CQuadEditTracker()
+{
+	m_InitalPoints.clear();
+	m_vSelectedQuads.clear();
+}
+
+void CQuadEditTracker::BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads)
+{
+	if(m_Tracking)
+		return;
+	m_Tracking = true;
+	m_vSelectedQuads.clear();
+	m_pLayer = pLayer;
+	// Init all points
+	for(auto QuadIndex : vSelectedQuads)
+	{
+		auto &pQuad = pLayer->m_vQuads[QuadIndex];
+		m_InitalPoints[QuadIndex] = std::vector<CPoint>(pQuad.m_aPoints, pQuad.m_aPoints + 5);
+		m_vSelectedQuads.push_back(QuadIndex);
+	}
+}
+
+void CQuadEditTracker::EndQuadTrack()
+{
+	if(!m_Tracking)
+		return;
+	m_Tracking = false;
+
+	int GroupIndex = m_pEditor->m_SelectedGroup;
+	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
+
+	// Record all moved stuff
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+	for(auto QuadIndex : m_vSelectedQuads)
+	{
+		auto &pQuad = m_pLayer->m_vQuads[QuadIndex];
+		auto vCurrentPoints = std::vector<CPoint>(pQuad.m_aPoints, pQuad.m_aPoints + 5);
+		vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+	}
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
+}
+
+void CQuadEditTracker::BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop)
+{
+	if(m_TrackedProp != EQuadProp::PROP_NONE)
+		return;
+	m_TrackedProp = Prop;
+	m_pLayer = pLayer;
+	m_vSelectedQuads = vSelectedQuads;
+	m_PreviousValues.clear();
+
+	for(auto QuadIndex : vSelectedQuads)
+	{
+		auto &Quad = pLayer->m_vQuads[QuadIndex];
+		if(Prop == EQuadProp::PROP_POS_X || Prop == EQuadProp::PROP_POS_Y)
+			m_InitalPoints[QuadIndex] = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
+		else if(Prop == EQuadProp::PROP_POS_ENV)
+			m_PreviousValues[QuadIndex] = Quad.m_PosEnv;
+		else if(Prop == EQuadProp::PROP_POS_ENV_OFFSET)
+			m_PreviousValues[QuadIndex] = Quad.m_PosEnvOffset;
+		else if(Prop == EQuadProp::PROP_COLOR_ENV)
+			m_PreviousValues[QuadIndex] = Quad.m_ColorEnv;
+		else if(Prop == EQuadProp::PROP_COLOR_ENV_OFFSET)
+			m_PreviousValues[QuadIndex] = Quad.m_ColorEnvOffset;
+	}
+}
+void CQuadEditTracker::EndQuadPropTrack(EQuadProp Prop)
+{
+	if(m_TrackedProp != Prop)
+		return;
+	m_TrackedProp = EQuadProp::PROP_NONE;
+
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+
+	int GroupIndex = m_pEditor->m_SelectedGroup;
+	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
+
+	for(auto QuadIndex : m_vSelectedQuads)
+	{
+		auto &Quad = m_pLayer->m_vQuads[QuadIndex];
+		if(Prop == EQuadProp::PROP_POS_X || Prop == EQuadProp::PROP_POS_Y)
+		{
+			auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
+			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+		}
+		else
+		{
+			int Value = 0;
+			if(Prop == EQuadProp::PROP_POS_ENV)
+				Value = Quad.m_PosEnv;
+			else if(Prop == EQuadProp::PROP_POS_ENV_OFFSET)
+				Value = Quad.m_PosEnvOffset;
+			else if(Prop == EQuadProp::PROP_COLOR_ENV)
+				Value = Quad.m_ColorEnv;
+			else if(Prop == EQuadProp::PROP_COLOR_ENV_OFFSET)
+				Value = Quad.m_ColorEnvOffset;
+
+			if(Value != m_PreviousValues[QuadIndex])
+				vpActions.push_back(std::make_shared<CEditorActionEditQuadProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, Prop, m_PreviousValues[QuadIndex], Value));
+		}
+	}
+
+	if(!vpActions.empty())
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
+}
+
+void CQuadEditTracker::BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints)
+{
+	if(!m_vTrackedProps.empty())
+		return;
+
+	m_pLayer = pLayer;
+	m_SelectedQuadPoints = SelectedQuadPoints;
+	m_vSelectedQuads = vSelectedQuads;
+	m_PreviousValuesPoint.clear();
+
+	for(auto QuadIndex : vSelectedQuads)
+	{
+		m_PreviousValuesPoint[QuadIndex] = std::vector<std::map<EQuadPointProp, int>>(4);
+	}
+}
+
+void CQuadEditTracker::AddQuadPointPropTrack(EQuadPointProp Prop)
+{
+	if(std::find(m_vTrackedProps.begin(), m_vTrackedProps.end(), Prop) != m_vTrackedProps.end())
+		return;
+
+	m_vTrackedProps.push_back(Prop);
+
+	for(auto QuadIndex : m_vSelectedQuads)
+	{
+		auto &Quad = m_pLayer->m_vQuads[QuadIndex];
+		if(Prop == EQuadPointProp::PROP_POS_X || Prop == EQuadPointProp::PROP_POS_Y)
+			m_InitalPoints[QuadIndex] = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
+		else if(Prop == EQuadPointProp::PROP_COLOR)
+		{
+			for(int v = 0; v < 4; v++)
+			{
+				if(m_SelectedQuadPoints & (1 << v))
+				{
+					int Color = PackColor(Quad.m_aColors[v]);
+					m_PreviousValuesPoint[QuadIndex][v][Prop] = Color;
+				}
+			}
+		}
+		else if(Prop == EQuadPointProp::PROP_TEX_U)
+		{
+			for(int v = 0; v < 4; v++)
+			{
+				if(m_SelectedQuadPoints & (1 << v))
+				{
+					m_PreviousValuesPoint[QuadIndex][v][Prop] = Quad.m_aTexcoords[v].x;
+				}
+			}
+		}
+		else if(Prop == EQuadPointProp::PROP_TEX_V)
+		{
+			for(int v = 0; v < 4; v++)
+			{
+				if(m_SelectedQuadPoints & (1 << v))
+				{
+					m_PreviousValuesPoint[QuadIndex][v][Prop] = Quad.m_aTexcoords[v].y;
+				}
+			}
+		}
+	}
+}
+
+void CQuadEditTracker::EndQuadPointPropTrack(EQuadPointProp Prop)
+{
+	auto It = std::find(m_vTrackedProps.begin(), m_vTrackedProps.end(), Prop);
+	if(It == m_vTrackedProps.end())
+		return;
+
+	m_vTrackedProps.erase(It);
+
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+
+	int GroupIndex = m_pEditor->m_SelectedGroup;
+	int LayerIndex = m_pEditor->m_vSelectedLayers[0];
+
+	for(auto QuadIndex : m_vSelectedQuads)
+	{
+		auto &Quad = m_pLayer->m_vQuads[QuadIndex];
+		if(Prop == EQuadPointProp::PROP_POS_X || Prop == EQuadPointProp::PROP_POS_Y)
+		{
+			auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
+			vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+		}
+		else
+		{
+			int Value = 0;
+			for(int v = 0; v < 4; v++)
+			{
+				if(m_SelectedQuadPoints & (1 << v))
+				{
+					if(Prop == EQuadPointProp::PROP_COLOR)
+					{
+						Value = PackColor(Quad.m_aColors[v]);
+					}
+					else if(Prop == EQuadPointProp::PROP_TEX_U)
+					{
+						Value = Quad.m_aTexcoords[v].x;
+					}
+					else if(Prop == EQuadPointProp::PROP_TEX_V)
+					{
+						Value = Quad.m_aTexcoords[v].y;
+					}
+
+					if(Value != m_PreviousValuesPoint[QuadIndex][v][Prop])
+						vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
+				}
+			}
+		}
+	}
+
+	if(!vpActions.empty())
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
+}
+
+void CQuadEditTracker::EndQuadPointPropTrackAll()
+{
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+	for(auto &Prop : m_vTrackedProps)
+	{
+		int GroupIndex = m_pEditor->m_SelectedGroup;
+		int LayerIndex = m_pEditor->m_vSelectedLayers[0];
+
+		for(auto QuadIndex : m_vSelectedQuads)
+		{
+			auto &Quad = m_pLayer->m_vQuads[QuadIndex];
+			if(Prop == EQuadPointProp::PROP_POS_X || Prop == EQuadPointProp::PROP_POS_Y)
+			{
+				auto vCurrentPoints = std::vector<CPoint>(Quad.m_aPoints, Quad.m_aPoints + 5);
+				vpActions.push_back(std::make_shared<CEditorActionEditQuadPoint>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, m_InitalPoints[QuadIndex], vCurrentPoints));
+			}
+			else
+			{
+				int Value = 0;
+				for(int v = 0; v < 4; v++)
+				{
+					if(m_SelectedQuadPoints & (1 << v))
+					{
+						if(Prop == EQuadPointProp::PROP_COLOR)
+						{
+							Value = PackColor(Quad.m_aColors[v]);
+						}
+						else if(Prop == EQuadPointProp::PROP_TEX_U)
+						{
+							Value = Quad.m_aTexcoords[v].x;
+						}
+						else if(Prop == EQuadPointProp::PROP_TEX_V)
+						{
+							Value = Quad.m_aTexcoords[v].y;
+						}
+
+						if(Value != m_PreviousValuesPoint[QuadIndex][v][Prop])
+							vpActions.push_back(std::make_shared<CEditorActionEditQuadPointProp>(m_pEditor, GroupIndex, LayerIndex, QuadIndex, v, Prop, m_PreviousValuesPoint[QuadIndex][v][Prop], Value));
+					}
+				}
+			}
+		}
+	}
+
+	if(!vpActions.empty())
+		m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions));
+
+	m_vTrackedProps.clear();
+}
+
+void CEditorPropTracker::BeginPropTrack(int Prop, int Value)
+{
+	if(m_TrackedProp != -1 || m_TrackedProp == Prop)
+		return;
+	m_TrackedProp = Prop;
+	m_PreviousValue = Value;
+}
+
+void CEditorPropTracker::StopPropTrack(int Prop, int Value)
+{
+	if(Prop != m_TrackedProp)
+		return;
+	m_TrackedProp = -1;
+	m_CurrentValue = Value;
+}
+
+// -----------------------------
+
+void CEnvelopeEditorOperationTracker::Begin(EEnvelopeEditorOp Operation)
+{
+	if(m_TrackedOp == Operation)
+		return;
+
+	if(m_TrackedOp != EEnvelopeEditorOp::OP_NONE)
+	{
+		Stop(true);
+	}
+
+	m_TrackedOp = Operation;
+
+	if(Operation == EEnvelopeEditorOp::OP_DRAG_POINT || Operation == EEnvelopeEditorOp::OP_DRAG_POINT_X || Operation == EEnvelopeEditorOp::OP_DRAG_POINT_Y || Operation == EEnvelopeEditorOp::OP_SCALE)
+	{
+		HandlePointDragStart();
+	}
+}
+
+void CEnvelopeEditorOperationTracker::Stop(bool Switch)
+{
+	if(m_TrackedOp == EEnvelopeEditorOp::OP_NONE)
+		return;
+
+	if(m_TrackedOp == EEnvelopeEditorOp::OP_DRAG_POINT || m_TrackedOp == EEnvelopeEditorOp::OP_DRAG_POINT_X || m_TrackedOp == EEnvelopeEditorOp::OP_DRAG_POINT_Y || m_TrackedOp == EEnvelopeEditorOp::OP_SCALE)
+	{
+		HandlePointDragEnd(Switch);
+	}
+
+	m_TrackedOp = EEnvelopeEditorOp::OP_NONE;
+}
+
+void CEnvelopeEditorOperationTracker::HandlePointDragStart()
+{
+	// Figure out which points are selected and which channels
+	// Save their X and Y position (time and value)
+	auto pEnv = m_pEditor->m_Map.m_vpEnvelopes[m_pEditor->m_SelectedEnvelope];
+
+	for(auto [PointIndex, Channel] : m_pEditor->m_vSelectedEnvelopePoints)
+	{
+		auto &Point = pEnv->m_vPoints[PointIndex];
+		auto &Data = m_SavedValues[PointIndex];
+		Data.m_Values[Channel] = Point.m_aValues[Channel];
+		if(Data.m_Used)
+			continue;
+		Data.m_Time = Point.m_Time;
+		Data.m_Used = true;
+	}
+}
+
+void CEnvelopeEditorOperationTracker::HandlePointDragEnd(bool Switch)
+{
+	if(Switch && m_TrackedOp != EEnvelopeEditorOp::OP_SCALE)
+		return;
+
+	int EnvIndex = m_pEditor->m_SelectedEnvelope;
+	auto pEnv = m_pEditor->m_Map.m_vpEnvelopes[EnvIndex];
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+
+	for(auto const &Entry : m_SavedValues)
+	{
+		int PointIndex = Entry.first;
+		auto &Point = pEnv->m_vPoints[PointIndex];
+		const auto &Data = Entry.second;
+
+		if(Data.m_Time != Point.m_Time)
+		{ // Save time
+			vpActions.push_back(std::make_shared<CEditorActionEnvelopeEditPoint>(m_pEditor, EnvIndex, PointIndex, 0, CEditorActionEnvelopeEditPoint::EEditType::TIME, Data.m_Time, Point.m_Time));
+		}
+
+		for(auto Value : Data.m_Values)
+		{
+			// Value.second is the saved value, Value.first is the channel
+			int Channel = Value.first;
+			if(Value.second != Point.m_aValues[Channel])
+			{ // Save value
+				vpActions.push_back(std::make_shared<CEditorActionEnvelopeEditPoint>(m_pEditor, EnvIndex, PointIndex, Channel, CEditorActionEnvelopeEditPoint::EEditType::VALUE, Value.second, Point.m_aValues[Channel]));
+			}
+		}
+	}
+
+	if(!vpActions.empty())
+	{
+		m_pEditor->m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, "Envelope point drag"));
+	}
+
+	m_SavedValues.clear();
+}
+
+// -----------------------------------------------------------------------
+
+void CLayerPropTracker::OnEnd(ELayerProp Prop, int Value)
+{
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditLayerProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value));
+}
+
+int CLayerPropTracker::PropToValue(ELayerProp Prop)
+{
+	switch(Prop)
+	{
+	case ELayerProp::PROP_GROUP: return m_pEditor->m_SelectedGroup;
+	case ELayerProp::PROP_HQ: return m_pObject->m_Flags;
+	case ELayerProp::PROP_ORDER: return m_pEditor->m_vSelectedLayers[0];
+	default: return 0;
+	}
+}
+
+// -----------------------------------------------------------------------
+
+bool CLayerTilesPropTracker::EndChecker(ETilesProp Prop, EEditState State, int Value)
+{
+	return (State == EEditState::END || State == EEditState::ONE_GO) && (Value != m_OriginalValue || Prop == ETilesProp::PROP_SHIFT);
+}
+
+void CLayerTilesPropTracker::OnStart(ETilesProp Prop)
+{
+	if(Prop == ETilesProp::PROP_WIDTH || Prop == ETilesProp::PROP_HEIGHT)
+	{
+		m_SavedLayers[LAYERTYPE_TILES] = m_pObject->Duplicate();
+		if(m_pObject->m_Game || m_pObject->m_Front || m_pObject->m_Switch || m_pObject->m_Speedup || m_pObject->m_Tune || m_pObject->m_Tele)
+		{ // Need to save all entities layers when any entity layer
+			if(m_pEditor->m_Map.m_pFrontLayer && !m_pObject->m_Front)
+				m_SavedLayers[LAYERTYPE_FRONT] = m_pEditor->m_Map.m_pFrontLayer->Duplicate();
+			if(m_pEditor->m_Map.m_pTeleLayer && !m_pObject->m_Tele)
+				m_SavedLayers[LAYERTYPE_TELE] = m_pEditor->m_Map.m_pTeleLayer->Duplicate();
+			if(m_pEditor->m_Map.m_pSwitchLayer && !m_pObject->m_Switch)
+				m_SavedLayers[LAYERTYPE_SWITCH] = m_pEditor->m_Map.m_pSwitchLayer->Duplicate();
+			if(m_pEditor->m_Map.m_pSpeedupLayer && !m_pObject->m_Speedup)
+				m_SavedLayers[LAYERTYPE_SPEEDUP] = m_pEditor->m_Map.m_pSpeedupLayer->Duplicate();
+			if(m_pEditor->m_Map.m_pTuneLayer && !m_pObject->m_Tune)
+				m_SavedLayers[LAYERTYPE_TUNE] = m_pEditor->m_Map.m_pTuneLayer->Duplicate();
+			if(!m_pObject->m_Game)
+				m_SavedLayers[LAYERTYPE_GAME] = m_pEditor->m_Map.m_pGameLayer->Duplicate();
+		}
+	}
+	else if(Prop == ETilesProp::PROP_SHIFT)
+	{
+		m_SavedLayers[LAYERTYPE_TILES] = m_pObject->Duplicate();
+	}
+}
+
+void CLayerTilesPropTracker::OnEnd(ETilesProp Prop, int Value)
+{
+	auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+
+	pAction->SetSavedLayers(m_SavedLayers);
+	m_SavedLayers.clear();
+
+	m_pEditor->m_EditorHistory.RecordAction(pAction);
+}
+
+int CLayerTilesPropTracker::PropToValue(ETilesProp Prop)
+{
+	switch(Prop)
+	{
+	case ETilesProp::PROP_AUTOMAPPER: return m_pObject->m_AutoMapperConfig;
+	case ETilesProp::PROP_COLOR: return PackColor(m_pObject->m_Color);
+	case ETilesProp::PROP_COLOR_ENV: return m_pObject->m_ColorEnv;
+	case ETilesProp::PROP_COLOR_ENV_OFFSET: return m_pObject->m_ColorEnvOffset;
+	case ETilesProp::PROP_HEIGHT: return m_pObject->m_Height;
+	case ETilesProp::PROP_WIDTH: return m_pObject->m_Width;
+	case ETilesProp::PROP_IMAGE: return m_pObject->m_Image;
+	case ETilesProp::PROP_SEED: return m_pObject->m_Seed;
+	case ETilesProp::PROP_SHIFT_BY: return m_pEditor->m_ShiftBy;
+	default: return 0;
+	}
+}
+
+// ------------------------------
+
+void CLayerTilesCommonPropTracker::OnStart(ETilesCommonProp Prop)
+{
+	for(auto &pLayer : m_vpLayers)
+	{
+		if(Prop == ETilesCommonProp::PROP_SHIFT)
+		{
+			m_SavedLayers[pLayer][LAYERTYPE_TILES] = pLayer->Duplicate();
+		}
+	}
+}
+
+void CLayerTilesCommonPropTracker::OnEnd(ETilesCommonProp Prop, int Value)
+{
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+
+	static std::map<ETilesCommonProp, ETilesProp> s_PropMap{
+		{ETilesCommonProp::PROP_COLOR, ETilesProp::PROP_COLOR},
+		{ETilesCommonProp::PROP_SHIFT, ETilesProp::PROP_SHIFT},
+		{ETilesCommonProp::PROP_SHIFT_BY, ETilesProp::PROP_SHIFT_BY}};
+
+	int j = 0;
+	for(auto &pLayer : m_vpLayers)
+	{
+		int LayerIndex = m_vLayerIndices[j++];
+		auto pAction = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, LayerIndex, s_PropMap[Prop], m_OriginalValue, Value);
+		pAction->SetSavedLayers(m_SavedLayers[pLayer]);
+		vpActions.push_back(pAction);
+	}
+
+	char aDisplay[256];
+	static const char *s_apNames[] = {
+		"width",
+		"height",
+		"shift",
+		"shift by",
+		"color",
+	};
+
+	str_format(aDisplay, sizeof(aDisplay), "Edit %d layers common property: %s", (int)m_vpLayers.size(), s_apNames[(int)Prop]);
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay));
+}
+
+bool CLayerTilesCommonPropTracker::EndChecker(ETilesCommonProp Prop, EEditState State, int Value)
+{
+	return (State == EEditState::END || State == EEditState::ONE_GO) && (Value != m_OriginalValue || Prop == ETilesCommonProp::PROP_SHIFT);
+}
+
+int CLayerTilesCommonPropTracker::PropToValue(ETilesCommonProp Prop)
+{
+	if(Prop == ETilesCommonProp::PROP_SHIFT_BY)
+		return m_pEditor->m_ShiftBy;
+	return 0;
+}
+
+// ------------------------------
+
+void CLayerGroupPropTracker::OnEnd(EGroupProp Prop, int Value)
+{
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditGroupProp>(m_pEditor, m_pEditor->m_SelectedGroup, Prop, m_OriginalValue, Value));
+}
+
+int CLayerGroupPropTracker::PropToValue(EGroupProp Prop)
+{
+	switch(Prop)
+	{
+	case EGroupProp::PROP_ORDER: return m_pEditor->m_SelectedGroup;
+	case EGroupProp::PROP_POS_X: return m_pObject->m_OffsetX;
+	case EGroupProp::PROP_POS_Y: return m_pObject->m_OffsetY;
+	case EGroupProp::PROP_PARA_X: return m_pObject->m_ParallaxX;
+	case EGroupProp::PROP_PARA_Y: return m_pObject->m_ParallaxY;
+	case EGroupProp::PROP_USE_CLIPPING: return m_pObject->m_UseClipping;
+	case EGroupProp::PROP_CLIP_X: return m_pObject->m_ClipX;
+	case EGroupProp::PROP_CLIP_Y: return m_pObject->m_ClipY;
+	case EGroupProp::PROP_CLIP_W: return m_pObject->m_ClipW;
+	case EGroupProp::PROP_CLIP_H: return m_pObject->m_ClipH;
+	default: return 0;
+	}
+}
+
+// ------------------------------------------------------------------
+
+void CLayerQuadsPropTracker::OnEnd(ELayerQuadsProp Prop, int Value)
+{
+	auto pAction = std::make_shared<CEditorActionEditLayerQuadsProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+	m_pEditor->m_EditorHistory.RecordAction(pAction);
+}
+
+int CLayerQuadsPropTracker::PropToValue(ELayerQuadsProp Prop)
+{
+	if(Prop == ELayerQuadsProp::PROP_IMAGE)
+		return m_pObject->m_Image;
+	return 0;
+}
+
+// -------------------------------------------------------------------
+
+void CLayerSoundsPropTracker::OnEnd(ELayerSoundsProp Prop, int Value)
+{
+	auto pAction = std::make_shared<CEditorActionEditLayerSoundsProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], Prop, m_OriginalValue, Value);
+	m_pEditor->m_EditorHistory.RecordAction(pAction);
+}
+
+int CLayerSoundsPropTracker::PropToValue(ELayerSoundsProp Prop)
+{
+	if(Prop == ELayerSoundsProp::PROP_SOUND)
+		return m_pObject->m_Sound;
+	return 0;
+}
+
+// ----
+
+void CSoundSourcePropTracker::OnEnd(ESoundProp Prop, int Value)
+{
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditSoundSourceProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+}
+
+int CSoundSourcePropTracker::PropToValue(ESoundProp Prop)
+{
+	switch(Prop)
+	{
+	case ESoundProp::PROP_POS_X: return m_pObject->m_Position.x;
+	case ESoundProp::PROP_POS_Y: return m_pObject->m_Position.y;
+	case ESoundProp::PROP_LOOP: return m_pObject->m_Loop;
+	case ESoundProp::PROP_PAN: return m_pObject->m_Pan;
+	case ESoundProp::PROP_TIME_DELAY: return m_pObject->m_TimeDelay;
+	case ESoundProp::PROP_FALLOFF: return m_pObject->m_Falloff;
+	case ESoundProp::PROP_POS_ENV: return m_pObject->m_PosEnv;
+	case ESoundProp::PROP_POS_ENV_OFFSET: return m_pObject->m_PosEnvOffset;
+	case ESoundProp::PROP_SOUND_ENV: return m_pObject->m_SoundEnv;
+	case ESoundProp::PROP_SOUND_ENV_OFFSET: return m_pObject->m_SoundEnvOffset;
+	default: return 0;
+	}
+}
+
+// ----
+
+void CSoundSourceRectShapePropTracker::OnEnd(ERectangleShapeProp Prop, int Value)
+{
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditRectSoundSourceShapeProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+}
+
+int CSoundSourceRectShapePropTracker::PropToValue(ERectangleShapeProp Prop)
+{
+	switch(Prop)
+	{
+	case ERectangleShapeProp::PROP_RECTANGLE_WIDTH: return m_pObject->m_Shape.m_Rectangle.m_Width;
+	case ERectangleShapeProp::PROP_RECTANGLE_HEIGHT: return m_pObject->m_Shape.m_Rectangle.m_Height;
+	default: return 0;
+	}
+}
+
+void CSoundSourceCircleShapePropTracker::OnEnd(ECircleShapeProp Prop, int Value)
+{
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionEditCircleSoundSourceShapeProp>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_pEditor->m_SelectedSource, Prop, m_OriginalValue, Value));
+}
+
+int CSoundSourceCircleShapePropTracker::PropToValue(ECircleShapeProp Prop)
+{
+	switch(Prop)
+	{
+	case ECircleShapeProp::PROP_CIRCLE_RADIUS: return m_pObject->m_Shape.m_Circle.m_Radius;
+	default: return 0;
+	}
+}
diff --git a/src_bkp/game/editor/editor_trackers.h b/src_bkp/game/editor/editor_trackers.h
new file mode 100644
index 0000000000..156096b6af
--- /dev/null
+++ b/src_bkp/game/editor/editor_trackers.h
@@ -0,0 +1,271 @@
+#ifndef GAME_EDITOR_EDITOR_TRACKERS_H
+#define GAME_EDITOR_EDITOR_TRACKERS_H
+
+#include <game/editor/mapitems.h>
+#include <game/editor/mapitems/layer_quads.h>
+#include <game/mapitems.h>
+
+#include <map>
+#include <memory>
+#include <vector>
+
+class CEditor;
+class CLayerTiles;
+class CLayerGroup;
+class CLayerSounds;
+struct CSoundSource;
+
+class CQuadEditTracker
+{
+public:
+	CQuadEditTracker();
+	~CQuadEditTracker();
+
+	void BeginQuadTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads);
+	void EndQuadTrack();
+
+	void BeginQuadPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, EQuadProp Prop);
+	void EndQuadPropTrack(EQuadProp Prop);
+
+	void BeginQuadPointPropTrack(const std::shared_ptr<CLayerQuads> &pLayer, const std::vector<int> &vSelectedQuads, int SelectedQuadPoints);
+	void AddQuadPointPropTrack(EQuadPointProp Prop);
+	void EndQuadPointPropTrack(EQuadPointProp Prop);
+	void EndQuadPointPropTrackAll();
+
+	CEditor *m_pEditor;
+
+private:
+	std::vector<int> m_vSelectedQuads;
+	int m_SelectedQuadPoints;
+	std::map<int, std::vector<CPoint>> m_InitalPoints;
+
+	bool m_Tracking = false;
+	std::shared_ptr<CLayerQuads> m_pLayer;
+
+	EQuadProp m_TrackedProp;
+	std::vector<EQuadPointProp> m_vTrackedProps;
+	std::map<int, int> m_PreviousValues;
+	std::map<int, std::vector<std::map<EQuadPointProp, int>>> m_PreviousValuesPoint;
+};
+
+class CEditorPropTracker
+{
+public:
+	CEditorPropTracker() = default;
+
+	void BeginPropTrack(int Prop, int Value);
+	void StopPropTrack(int Prop, int Value);
+	inline void Reset() { m_TrackedProp = -1; }
+
+	CEditor *m_pEditor;
+	int m_PreviousValue;
+	int m_CurrentValue;
+
+private:
+	int m_TrackedProp = -1;
+};
+
+enum class EEnvelopeEditorOp
+{
+	OP_NONE = 0,
+	OP_SELECT,
+	OP_DRAG_POINT,
+	OP_DRAG_POINT_X,
+	OP_DRAG_POINT_Y,
+	OP_CONTEXT_MENU,
+	OP_BOX_SELECT,
+	OP_SCALE
+};
+
+class CEnvelopeEditorOperationTracker
+{
+public:
+	CEnvelopeEditorOperationTracker() = default;
+
+	void Begin(EEnvelopeEditorOp Operation);
+	void Stop(bool Switch = true);
+	inline void Reset() { m_TrackedOp = EEnvelopeEditorOp::OP_NONE; }
+
+	CEditor *m_pEditor;
+
+private:
+	EEnvelopeEditorOp m_TrackedOp = EEnvelopeEditorOp::OP_NONE;
+
+	struct SPointData
+	{
+		bool m_Used;
+		int m_Time;
+		std::map<int, int> m_Values;
+	};
+
+	std::map<int, SPointData> m_SavedValues;
+
+	void HandlePointDragStart();
+	void HandlePointDragEnd(bool Switch);
+};
+
+template<typename T, typename E>
+class CPropTracker
+{
+public:
+	CPropTracker(CEditor *pEditor) :
+		m_pEditor(pEditor), m_OriginalValue(0) {}
+	CEditor *m_pEditor;
+
+	void Begin(T *pObject, E Prop, EEditState State)
+	{
+		if(Prop == static_cast<E>(-1))
+			return;
+		m_pObject = pObject;
+		int Value = PropToValue(Prop);
+		if(StartChecker(Prop, State, Value))
+		{
+			m_OriginalValue = Value;
+			OnStart(Prop);
+		}
+	}
+
+	void End(E Prop, EEditState State)
+	{
+		if(Prop == static_cast<E>(-1))
+			return;
+		int Value = PropToValue(Prop);
+		if(EndChecker(Prop, State, Value))
+		{
+			OnEnd(Prop, Value);
+		}
+	}
+
+protected:
+	virtual void OnStart(E Prop) {}
+	virtual void OnEnd(E Prop, int Value) {}
+	virtual int PropToValue(E Prop) { return 0; }
+	virtual bool StartChecker(E Prop, EEditState State, int Value)
+	{
+		return State == EEditState::START || State == EEditState::ONE_GO;
+	}
+	virtual bool EndChecker(E Prop, EEditState State, int Value)
+	{
+		return (State == EEditState::END || State == EEditState::ONE_GO) && (Value != m_OriginalValue);
+	}
+
+	int m_OriginalValue;
+	T *m_pObject;
+};
+
+class CLayerPropTracker : public CPropTracker<CLayer, ELayerProp>
+{
+public:
+	CLayerPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayer, ELayerProp>(pEditor){};
+
+protected:
+	void OnEnd(ELayerProp Prop, int Value) override;
+	int PropToValue(ELayerProp Prop) override;
+};
+
+class CLayerTilesPropTracker : public CPropTracker<CLayerTiles, ETilesProp>
+{
+public:
+	CLayerTilesPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayerTiles, ETilesProp>(pEditor){};
+
+protected:
+	void OnStart(ETilesProp Prop) override;
+	void OnEnd(ETilesProp Prop, int Value) override;
+	bool EndChecker(ETilesProp Prop, EEditState State, int Value) override;
+
+	int PropToValue(ETilesProp Prop) override;
+
+private:
+	std::map<int, std::shared_ptr<CLayer>> m_SavedLayers;
+};
+
+class CLayerTilesCommonPropTracker : public CPropTracker<CLayerTiles, ETilesCommonProp>
+{
+public:
+	CLayerTilesCommonPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayerTiles, ETilesCommonProp>(pEditor){};
+
+protected:
+	void OnStart(ETilesCommonProp Prop) override;
+	void OnEnd(ETilesCommonProp Prop, int Value) override;
+	bool EndChecker(ETilesCommonProp Prop, EEditState State, int Value) override;
+
+	int PropToValue(ETilesCommonProp Prop) override;
+
+private:
+	std::map<std::shared_ptr<CLayerTiles>, std::map<int, std::shared_ptr<CLayer>>> m_SavedLayers;
+
+public:
+	std::vector<std::shared_ptr<CLayerTiles>> m_vpLayers;
+	std::vector<int> m_vLayerIndices;
+};
+
+class CLayerGroupPropTracker : public CPropTracker<CLayerGroup, EGroupProp>
+{
+public:
+	CLayerGroupPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayerGroup, EGroupProp>(pEditor){};
+
+protected:
+	void OnEnd(EGroupProp Prop, int Value) override;
+	int PropToValue(EGroupProp Prop) override;
+};
+
+class CLayerQuadsPropTracker : public CPropTracker<CLayerQuads, ELayerQuadsProp>
+{
+public:
+	CLayerQuadsPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayerQuads, ELayerQuadsProp>(pEditor){};
+
+protected:
+	void OnEnd(ELayerQuadsProp Prop, int Value) override;
+	int PropToValue(ELayerQuadsProp Prop) override;
+};
+
+class CLayerSoundsPropTracker : public CPropTracker<CLayerSounds, ELayerSoundsProp>
+{
+public:
+	CLayerSoundsPropTracker(CEditor *pEditor) :
+		CPropTracker<CLayerSounds, ELayerSoundsProp>(pEditor){};
+
+protected:
+	void OnEnd(ELayerSoundsProp Prop, int Value) override;
+	int PropToValue(ELayerSoundsProp Prop) override;
+};
+
+class CSoundSourcePropTracker : public CPropTracker<CSoundSource, ESoundProp>
+{
+public:
+	CSoundSourcePropTracker(CEditor *pEditor) :
+		CPropTracker<CSoundSource, ESoundProp>(pEditor) {}
+
+protected:
+	void OnEnd(ESoundProp Prop, int Value) override;
+	int PropToValue(ESoundProp Prop) override;
+};
+
+class CSoundSourceRectShapePropTracker : public CPropTracker<CSoundSource, ERectangleShapeProp>
+{
+public:
+	CSoundSourceRectShapePropTracker(CEditor *pEditor) :
+		CPropTracker<CSoundSource, ERectangleShapeProp>(pEditor) {}
+
+protected:
+	void OnEnd(ERectangleShapeProp Prop, int Value) override;
+	int PropToValue(ERectangleShapeProp Prop) override;
+};
+
+class CSoundSourceCircleShapePropTracker : public CPropTracker<CSoundSource, ECircleShapeProp>
+{
+public:
+	CSoundSourceCircleShapePropTracker(CEditor *pEditor) :
+		CPropTracker<CSoundSource, ECircleShapeProp>(pEditor) {}
+
+protected:
+	void OnEnd(ECircleShapeProp Prop, int Value) override;
+	int PropToValue(ECircleShapeProp Prop) override;
+};
+
+#endif
diff --git a/src_bkp/game/editor/explanations.cpp b/src_bkp/game/editor/explanations.cpp
new file mode 100644
index 0000000000..a25404ab0e
--- /dev/null
+++ b/src_bkp/game/editor/explanations.cpp
@@ -0,0 +1,688 @@
+#include "editor.h"
+
+// DDNet entity explanations by Lady Saavik
+// TODO: Add other entities' tiles' explanations and improve new ones
+
+const char *CEditor::ExplainDDNet(int Tile, int Layer)
+{
+	switch(Tile)
+	{
+	case TILE_AIR:
+		return "EMPTY: Can be used as an eraser.";
+	case TILE_SOLID:
+		if(Layer == LAYER_GAME)
+			return "HOOKABLE: It's possible to hook and collide with it.";
+		break;
+	case TILE_DEATH:
+		if(Layer == LAYER_GAME)
+			return "KILL: Kills the tee.";
+		break;
+	case TILE_NOHOOK:
+		if(Layer == LAYER_GAME)
+			return "UNHOOKABLE: It's not possible to hook it, but can collide with it.";
+		break;
+	case TILE_NOLASER:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "LASER BLOCKER: Doesn't let DRAGGING & SPINNING LASER and PLASMA TURRET reach tees through it.";
+		break;
+	case TILE_THROUGH_CUT:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOKTHROUGH: Shortcut for new hookthrough.";
+		break;
+	case TILE_THROUGH_ALL:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOKTHROUGH: Combined with a collision tile is new hookthrough, otherwise stops hooks, from all directions.";
+		break;
+	case TILE_THROUGH_DIR:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOKTHROUGH: Combined with a collision tile is new hookthrough, otherwise stops hook, from one direction.";
+		break;
+	case TILE_THROUGH:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOKTHROUGH: Combined with (UN)HOOKABLE tiles, allows to hook through the walls.";
+		break;
+	case TILE_JUMP:
+		if(Layer == LAYER_SWITCH)
+			return "JUMP: Sets defined amount of jumps (default is 2).";
+		break;
+	case TILE_FREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "FREEZE: Freezes tees for 3 seconds.";
+		if(Layer == LAYER_SWITCH)
+			return "FREEZE: Freezes tees for defined amount of seconds.";
+		break;
+	case TILE_UNFREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "UNFREEZE: Unfreezes tees immediately.";
+		break;
+	case TILE_TELEINEVIL:
+		if(Layer == LAYER_TELE)
+			return "RED TELEPORT: After falling into this tile, tees appear on TO with the same number. Speed and hooks are reset.";
+		break;
+	case TILE_DFREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DEEP FREEZE: Permanent freeze. Only UNDEEP tile can cancel this effect.";
+		break;
+	case TILE_DUNFREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "UNDEEP: Removes DEEP FREEZE effect.";
+		break;
+	case TILE_LFREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LIVE FREEZE: Live frozen tees cannot move or jump, while hook and weapons can still be used.";
+		break;
+	case TILE_LUNFREEZE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LIVE UNFREEZE: Removes LIVE FREEZE effect.";
+		break;
+	case TILE_TELEINWEAPON:
+		if(Layer == LAYER_TELE)
+			return "WEAPON TELEPORT: Teleports bullets shot into it to TELEPORT TO, where it comes out. Direction, angle and length are kept.";
+		break;
+	case TILE_TELEINHOOK:
+		if(Layer == LAYER_TELE)
+			return "HOOK TELEPORT: Teleports hooks entering into it to TELEPORT TO, where it comes out. Direction, angle and length are kept.";
+		break;
+	case TILE_WALLJUMP:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "WALLJUMP: Placed next to a wall. Enables climbing up the wall.";
+		break;
+	case TILE_EHOOK_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "ENDLESS HOOK: Activates endless hook.";
+		break;
+	case TILE_EHOOK_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "ENDLESS HOOK OFF: Deactivates endless hook.";
+		break;
+	case TILE_HIT_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HIT OTHERS: You can hit others.";
+		if(Layer == LAYER_SWITCH)
+			return "HIT OTHERS: You can activate hitting others for single weapons, using delay number to select which.";
+		break;
+	case TILE_HIT_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HIT OTHERS: You can't hit others.";
+		if(Layer == LAYER_SWITCH)
+			return "HIT OTHERS: You can deactivate hitting others for single weapons, using delay number to select which.";
+		break;
+	case TILE_SOLO_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SOLO: You are now in a solo part.";
+		break;
+	case TILE_SOLO_DISABLE: // also TILE_SWITCHTIMEDOPEN
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SOLO: You are now out of the solo part.";
+		if(Layer == LAYER_SWITCH)
+			return "TIME SWITCH: Activates switch (e.g. closes door) with the same number for a set amount of seconds.";
+		break;
+	case TILE_SWITCHTIMEDCLOSE:
+		if(Layer == LAYER_SWITCH)
+			return "TIME SWITCH: Deactivates switch (e.g. opens door) with the same number for a set amount of seconds.";
+		break;
+	case TILE_SWITCHOPEN:
+		if(Layer == LAYER_SWITCH)
+			return "SWITCH: Activates switch (e.g. closes door) with the same number.";
+		break;
+	case TILE_SWITCHCLOSE:
+		if(Layer == LAYER_SWITCH)
+			return "SWITCH: Deactivates switch (e.g. opens door) with the same number.";
+		break;
+	case TILE_TELEIN:
+		if(Layer == LAYER_TELE)
+			return "BLUE TELEPORT: After falling into this tile, tees appear on TO with the same number. Speed and hook are kept.";
+		break;
+	case TILE_TELEOUT:
+		if(Layer == LAYER_TELE)
+			return "TELEPORT TO: Destination tile for FROMs, WEAPON & HOOK TELEPORTs with the same numbers.";
+		break;
+	case TILE_BOOST:
+		if(Layer == LAYER_SPEEDUP)
+			return "SPEEDUP: Gives tee defined speed. Arrow shows direction and angle.";
+		break;
+	case TILE_TELECHECK:
+		if(Layer == LAYER_TELE)
+			return "CHECKPOINT TELEPORT: After having touched this tile, any CFRM will teleport you to CTO with the same number.";
+		break;
+	case TILE_TELECHECKOUT:
+		if(Layer == LAYER_TELE)
+			return "CHECKPOINT TELEPORT TO: Tees will appear here after touching TELEPORT CHECKPOINT with the same number and falling into CFROM TELEPORT.";
+		break;
+	case TILE_TELECHECKIN:
+		if(Layer == LAYER_TELE)
+			return "BLUE CHECKPOINT TELEPORT: Sends tees to CTO with the same number as the last touched TELEPORT CHECKPOINT. Speed and hook are kept.";
+		break;
+	case TILE_REFILL_JUMPS:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "REFILL JUMPS: Restores all jumps.";
+		break;
+	case TILE_START:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "START: Starts counting your race time.";
+		break;
+	case TILE_FINISH:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "FINISH: End of race.";
+		break;
+	case TILE_STOP:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "STOPPER: You can hook and shoot through it. You can't go through it against the arrow.";
+		break;
+	case TILE_STOPS:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "STOPPER: You can hook and shoot through it. You can't go through it against the arrows.";
+		break;
+	case TILE_STOPA:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "STOPPER: You can hook and shoot through it. You can't go through it.";
+		break;
+	case TILE_TELECHECKINEVIL:
+		if(Layer == LAYER_TELE)
+			return "RED CHECKPOINT TELEPORT: Send tees to CTO with the same number as the last touched TELEPORT CHECKPOINT. Speed and hook are reset.";
+		break;
+	case TILE_CP:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SPEEDER: Causes weapons, SHIELD, HEART and SPINNING LASER to move slowly.";
+		break;
+	case TILE_CP_F:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SPEEDER: Causes weapons, SHIELD, HEART and SPINNING LASER to move quickly.";
+		break;
+	case TILE_TUNE:
+		if(Layer == LAYER_TUNE)
+			return "TUNE ZONE: Area where defined tunes work.";
+		break;
+	case TILE_OLDLASER:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "GLOBAL OLD SHOTGUN: Shotgun drags others always towards the shooter, even after having bounced. Shooter can't hit themselves. Place only one tile somewhere on the map.";
+		break;
+	case TILE_NPC:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "GLOBAL COLLISION OFF: Nobody can collide with others. Place only one tile somewhere on the map.";
+		break;
+	case TILE_EHOOK:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "GLOBAL ENDLESS HOOK ON: Everyone has endless hook. Place only one tile somewhere on the map.";
+		break;
+	case TILE_NOHIT:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "GLOBAL HIT OTHERS OFF: Nobody can hit others. Place only one tile somewhere on the map.";
+		break;
+	case TILE_NPH:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "GLOBAL HOOK OTHERS OFF: Nobody can hook others. Place only one tile somewhere on the map.";
+		break;
+	case TILE_UNLOCK_TEAM:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "UNLOCK TEAM: Forces team to be unlocked so that team doesn't get killed when one dies.";
+		break;
+	case TILE_ADD_TIME:
+		if(Layer == LAYER_SWITCH)
+			return "PENALTY: Adds time to your current race time. Opposite of BONUS.";
+		break;
+	case TILE_NPC_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "COLLISION OFF: You can't collide with others.";
+		break;
+	case TILE_UNLIMITED_JUMPS_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SUPER JUMP OFF: You don't have unlimited air jumps.";
+		break;
+	case TILE_JETPACK_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "JETPACK OFF: You lose your jetpack gun.";
+		break;
+	case TILE_NPH_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOK OTHERS OFF: You can't hook others.";
+		break;
+	case TILE_SUBTRACT_TIME:
+		if(Layer == LAYER_SWITCH)
+			return "BONUS: Subtracts time from your current race time. Opposite of PENALTY.";
+		break;
+	case TILE_NPC_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "COLLISION: You can collide with others.";
+		break;
+	case TILE_UNLIMITED_JUMPS_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SUPER JUMP: You have unlimited air jumps.";
+		break;
+	case TILE_JETPACK_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "JETPACK: You have a jetpack gun.";
+		break;
+	case TILE_NPH_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "HOOK OTHERS: You can hook others.";
+		break;
+	case TILE_CREDITS_1:
+	case TILE_CREDITS_2:
+	case TILE_CREDITS_3:
+	case TILE_CREDITS_4:
+	case TILE_CREDITS_5:
+	case TILE_CREDITS_6:
+	case TILE_CREDITS_7:
+	case TILE_CREDITS_8:
+		return "CREDITS: Who designed the entities.";
+	case TILE_ENTITIES_OFF_1:
+	case TILE_ENTITIES_OFF_2:
+		return "ENTITIES OFF SIGN: Informs people playing with entities about important marks, tips, information or text on the map.";
+	// Entities
+	case ENTITY_OFFSET + ENTITY_SPAWN:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SPAWN: Here tees will appear after joining the game or dying somewhere on the map.";
+		break;
+	case ENTITY_OFFSET + ENTITY_SPAWN_RED:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SPAWN: Red team members spawn here, same as normal spawn in DDRace.";
+		break;
+	case ENTITY_OFFSET + ENTITY_SPAWN_BLUE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "SPAWN: Blue team members spawn here, same as normal spawn in DDRace.";
+		break;
+	case ENTITY_OFFSET + ENTITY_FLAGSTAND_RED:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "FLAG: Not used in DDRace. Place where red team flag is.";
+		break;
+	case ENTITY_OFFSET + ENTITY_FLAGSTAND_BLUE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "FLAG: Not used in DDRace. Place where blue team flag is.";
+		break;
+	case ENTITY_OFFSET + ENTITY_ARMOR_1:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SHIELD: Takes all weapons (except hammer and pistol) away.";
+		break;
+	case ENTITY_OFFSET + ENTITY_HEALTH_1:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "HEART: Works like a FREEZE tile. Freezes tees for 3 seconds by default.";
+		break;
+	case ENTITY_OFFSET + ENTITY_WEAPON_SHOTGUN:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SHOTGUN: Drags the tees towards it. Bounces off the walls.";
+		break;
+	case ENTITY_OFFSET + ENTITY_WEAPON_GRENADE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "GRENADE LAUNCHER: Throws exploding bullets. Also known as rocket.";
+		break;
+	case ENTITY_OFFSET + ENTITY_POWERUP_NINJA:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "NINJA: Makes you invisible in the darkest nights.";
+		break;
+	case ENTITY_OFFSET + ENTITY_WEAPON_LASER:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER: Unfreezes hit tee. Bounces off the walls. Also known as laser.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_FAST_CCW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Counter-Clockwise, fast.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_NORMAL_CCW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Counter-Clockwise, medium speed.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_SLOW_CCW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Counter-Clockwise, slow.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_STOP:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "NON-SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_SLOW_CW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Clockwise, slow.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_NORMAL_CW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Clockwise, medium speed.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_FAST_CW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SPINNING LASER: Tile where freezing laser (made with LASER LENGTH) begins. Clockwise, fast.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_SHORT:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH: Put next to DOOR or SPINNING LASER, makes it 3 tiles long.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_MEDIUM:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH: Put next to DOOR or SPINNING LASER, makes it 6 tiles long.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_LONG:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH: Put next to DOOR or SPINNING LASER, makes it 9 tiles long.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_C_SLOW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Lengthen, slow.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_C_NORMAL:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Lengthen, medium speed.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_C_FAST:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Lengthen, fast.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_O_SLOW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Shorten, slow.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_O_NORMAL:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Shorten, medium speed.";
+		break;
+	case ENTITY_OFFSET + ENTITY_LASER_O_FAST:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER LENGTH CHANGE: Put next to LASER LENGTH, causes it to length and shorten constantly. Works only on (NON-)SPINNING LASER, not on DOOR. Shorten, fast.";
+		break;
+	case ENTITY_OFFSET + ENTITY_PLASMAE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "PLASMA TURRET: Shoots plasma bullets at the closest tee. They explode on an obstactle they hit (wall or tee).";
+		break;
+	case ENTITY_OFFSET + ENTITY_PLASMAF:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "PLASMA TURRET: Shoots plasma bullets that work like FREEZE at the closest tee.";
+		break;
+	case ENTITY_OFFSET + ENTITY_PLASMA:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "PLASMA TURRET: Shoots plasma bullets that work like FREEZE at the closest tee. They also explode on an obstactly they hit (wall or tee).";
+		break;
+	case ENTITY_OFFSET + ENTITY_PLASMAU:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "PLASMA TURRET: Shoots plasma bullets that work like UNFREEZE at the closest tee.";
+		break;
+	case ENTITY_OFFSET + ENTITY_CRAZY_SHOTGUN_EX:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "EXPLODING BULLET: Bounces off the walls with explosion. Touching the bullet works like FREEZE tile (freezes for 3 seconds by default).";
+		break;
+	case ENTITY_OFFSET + ENTITY_CRAZY_SHOTGUN:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "BULLET: Bounces off the walls without explosion. Touching the bullet works like FREEZE tile (freezes for 3 seconds by default).";
+		break;
+	case ENTITY_OFFSET + ENTITY_ARMOR_SHOTGUN:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "SHOTGUN SHIELD: Takes shotgun away.";
+		break;
+	case ENTITY_OFFSET + ENTITY_ARMOR_GRENADE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "GRENADE SHIELD: Takes grenade away.";
+		break;
+	case ENTITY_OFFSET + ENTITY_ARMOR_NINJA:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "NINJA SHIELD: Takes ninja away.";
+		break;
+	case ENTITY_OFFSET + ENTITY_ARMOR_LASER:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "LASER SHIELD: Takes laser away.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_WEAK:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can't reach tees through walls and LASER BLOCKER. Weak.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_NORMAL:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can't reach tees through walls and LASER BLOCKER. Medium strength.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_STRONG:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can't reach tees through walls and LASER BLOCKER. Strong.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_WEAK_NW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can reach tees through walls but not through LASER BLOCKER. Weak.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_NORMAL_NW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can reach tees through walls but not through LASER BLOCKER. Medium strength.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DRAGGER_STRONG_NW:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DRAGGING LASER: Grabs and attracts the closest tee to it. Can reach tees through walls but not through LASER BLOCKER. Strong.";
+		break;
+	case ENTITY_OFFSET + ENTITY_DOOR:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT || Layer == LAYER_SWITCH)
+			return "DOOR: Combined with LASER LENGTH creates doors. Doesn't allow to go through it (only with NINJA).";
+		break;
+	case TILE_TELE_GUN_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELEGUN: Turn gun on as telegun weapon.";
+		break;
+	case TILE_TELE_GUN_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELEGUN OFF: Turn gun off as telegun weapon.";
+		break;
+	case TILE_ALLOW_TELE_GUN:
+		if(Layer == LAYER_FRONT)
+			return "TELEGUN: Place on top of a collision tile, activates a spot to teleport to, cancels movement.";
+		if(Layer == LAYER_SWITCH)
+			return "TELEGUN: Place on top of a collision tile, activates a spot to teleport to, cancels movement, for single weapons, using delay number to select which.";
+		break;
+	case TILE_ALLOW_BLUE_TELE_GUN:
+		if(Layer == LAYER_FRONT)
+			return "TELEGUN: Place on top of a collision tile, activates a spot to teleport to, preserves movement.";
+		if(Layer == LAYER_SWITCH)
+			return "TELEGUN: Place on top of a collision tile, activates a spot to teleport to, preserves movement, for single weapons, using delay number to select which.";
+		break;
+	case TILE_TELE_GRENADE_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELEGRENADE: Turn grenade on as telegun weapon.";
+		break;
+	case TILE_TELE_GRENADE_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELEGRENADE OFF: Turn grenade off as telegun weapon.";
+		break;
+	case TILE_TELE_LASER_ENABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELELASER: Turn laser on as telegun weapon.";
+		break;
+	case TILE_TELE_LASER_DISABLE:
+		if(Layer == LAYER_GAME || Layer == LAYER_FRONT)
+			return "TELELASER OFF: Turn laser off as telegun weapon.";
+		break;
+	}
+	if(Tile >= TILE_TIME_CHECKPOINT_FIRST && Tile <= TILE_TIME_CHECKPOINT_LAST && (Layer == LAYER_GAME || Layer == LAYER_FRONT))
+		return "TIME CHECKPOINT: Compares your current race time with your record to show you whether you are running faster or slower.";
+	return nullptr;
+}
+
+const char *CEditor::ExplainFNG(int Tile, int Layer)
+{
+	switch(Tile)
+	{
+	case TILE_PUB_AIR:
+		return "EMPTY: Can be used as an eraser.";
+	case TILE_PUB_HOOKABLE:
+		if(Layer == LAYER_GAME)
+			return "HOOKABLE: It's possible to hook and collide with it.";
+		break;
+	case TILE_PUB_DEATH:
+		if(Layer == LAYER_GAME)
+			return "DEATH: Kills the tee.";
+		break;
+	case TILE_PUB_UNHOOKABLE:
+		if(Layer == LAYER_GAME)
+			return "UNHOOKABLE: It's not possible to hook it, but can collide with it.";
+		break;
+	case TILE_FNG_SPIKE_GOLD:
+		if(Layer == LAYER_GAME)
+			return "GOLDEN SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SPIKE_NORMAL:
+		if(Layer == LAYER_GAME)
+			return "NORMAL SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SPIKE_RED:
+		if(Layer == LAYER_GAME)
+			return "RED SPIKE: Red team spikes. Gives negative points when killer is in blue team (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SPIKE_BLUE:
+		if(Layer == LAYER_GAME)
+			return "BLUE SPIKE: Blue team spikes. Gives negative points when killer is in red team (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SCORE_RED:
+		if(Layer == LAYER_GAME)
+			return "SCORE: Old tile used for showing red team score using laser text. No longer usable in FNG2";
+		break;
+	case TILE_FNG_SCORE_BLUE:
+		if(Layer == LAYER_GAME)
+			return "SCORE: Old tile used for showing blue team score using laser text. No longer usable in FNG2";
+		break;
+	case TILE_FNG_SPIKE_GREEN:
+		if(Layer == LAYER_GAME)
+			return "GREEN SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SPIKE_PURPLE:
+		if(Layer == LAYER_GAME)
+			return "PURPLE SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
+		break;
+	case TILE_FNG_SPAWN:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Here tees will appear after joining the game or dying.";
+		break;
+	case TILE_FNG_SPAWN_RED:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Red team members spawn here.";
+		break;
+	case TILE_FNG_SPAWN_BLUE:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Blue team members spawn here.";
+		break;
+	case TILE_FNG_FLAG_RED:
+		if(Layer == LAYER_GAME)
+			return "FLAG: Not used in FNG. Place where red team flag is.";
+		break;
+	case TILE_FNG_FLAG_BLUE:
+		if(Layer == LAYER_GAME)
+			return "FLAG: Not used in FNG. Place where blue team flag is.";
+		break;
+	case TILE_FNG_SHIELD:
+		if(Layer == LAYER_GAME)
+			return "SHIELD: Does nothing in FNG.";
+		break;
+	case TILE_FNG_HEART:
+		if(Layer == LAYER_GAME)
+			return "HEART: Does nothing in FNG.";
+		break;
+	case TILE_FNG_SHOTGUN:
+		if(Layer == LAYER_GAME)
+			return "SHOTGUN: Not used in FNG. Gives you shotgun with 10 charges.";
+		break;
+	case TILE_FNG_GRENADE:
+		if(Layer == LAYER_GAME)
+			return "GRENADE: Gives you grenade weapon with 10 charges. Not really useful in FNG.";
+		break;
+	case TILE_FNG_NINJA:
+		if(Layer == LAYER_GAME)
+			return "NINJA: Does nothing in FNG.";
+		break;
+	case TILE_FNG_LASER:
+		if(Layer == LAYER_GAME)
+			return "LASER: Gives you laser weapon with 10 charges. Not really useful in FNG.";
+		break;
+	case TILE_FNG_SPIKE_OLD1:
+	case TILE_FNG_SPIKE_OLD2:
+	case TILE_FNG_SPIKE_OLD3:
+		if(Layer == LAYER_GAME)
+			return "SPIKE: Old FNG spikes. Deprecated.";
+		break;
+	}
+	if((Tile >= TILE_PUB_CREDITS1 && Tile <= TILE_PUB_CREDITS8) && Layer == LAYER_GAME)
+		return "CREDITS: Who designed the entities.";
+	else if((Tile == TILE_PUB_ENTITIES_OFF1 || Tile == TILE_PUB_ENTITIES_OFF2) && Layer == LAYER_GAME)
+		return "ENTITIES OFF SIGN: Informs people playing with entities about important marks, tips, information or text on the map.";
+	return nullptr;
+}
+
+const char *CEditor::ExplainVanilla(int Tile, int Layer)
+{
+	switch(Tile)
+	{
+	case TILE_PUB_AIR:
+		return "EMPTY: Can be used as an eraser.";
+	case TILE_PUB_HOOKABLE:
+		if(Layer == LAYER_GAME)
+			return "HOOKABLE: It's possible to hook and collide with it.";
+		break;
+	case TILE_PUB_DEATH:
+		if(Layer == LAYER_GAME)
+			return "DEATH: Kills the tee.";
+		break;
+	case TILE_PUB_UNHOOKABLE:
+		if(Layer == LAYER_GAME)
+			return "UNHOOKABLE: It's not possible to hook it, but can collide with it.";
+		break;
+	case TILE_VANILLA_SPAWN:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Here tees will appear after joining the game or dying.";
+		break;
+	case TILE_VANILLA_SPAWN_RED:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Red team members spawn here.";
+		break;
+	case TILE_VANILLA_SPAWN_BLUE:
+		if(Layer == LAYER_GAME)
+			return "SPAWN: Blue team members spawn here.";
+		break;
+	case TILE_VANILLA_FLAG_RED:
+		if(Layer == LAYER_GAME)
+			return "FLAG: Place where red team flag is.";
+		break;
+	case TILE_VANILLA_FLAG_BLUE:
+		if(Layer == LAYER_GAME)
+			return "FLAG: Place where blue team flag is.";
+		break;
+	case TILE_VANILLA_SHIELD:
+		if(Layer == LAYER_GAME)
+			return "SHIELD: Gives player +1 shield.";
+		break;
+	case TILE_VANILLA_HEART:
+		if(Layer == LAYER_GAME)
+			return "HEART: Gives player +1 health";
+		break;
+	case TILE_VANILLA_SHOTGUN:
+		if(Layer == LAYER_GAME)
+			return "SHOTGUN: Gives you shotgun weapon with 10 charges.";
+		break;
+	case TILE_VANILLA_GRENADE:
+		if(Layer == LAYER_GAME)
+			return "GRENADE: Gives you grenade weapon with 10 charges.";
+		break;
+	case TILE_VANILLA_NINJA:
+		if(Layer == LAYER_GAME)
+			return "NINJA: Gives you ninja for a period of time.";
+		break;
+	case TILE_VANILLA_LASER:
+		if(Layer == LAYER_GAME)
+			return "LASER: Gives you laser weapon with 10 charges.";
+		break;
+	}
+	if((Tile >= TILE_PUB_CREDITS1 && Tile <= TILE_PUB_CREDITS8) && Layer == LAYER_GAME)
+		return "CREDITS: Who designed the entities.";
+	else if((Tile == TILE_PUB_ENTITIES_OFF1 || Tile == TILE_PUB_ENTITIES_OFF2) && Layer == LAYER_GAME)
+		return "ENTITIES OFF SIGN: Informs people playing with entities about important marks, tips, information or text on the map.";
+	return nullptr;
+}
+
+const char *CEditor::Explain(EExplanation Explanation, int Tile, int Layer)
+{
+	switch(Explanation)
+	{
+	case EExplanation::NONE:
+		return nullptr;
+	case EExplanation::DDNET:
+		return ExplainDDNet(Tile, Layer);
+	case EExplanation::FNG:
+		return ExplainFNG(Tile, Layer);
+	case EExplanation::RACE:
+		return nullptr; // TODO: Explanations for Race
+	case EExplanation::VANILLA:
+		return ExplainVanilla(Tile, Layer);
+	case EExplanation::BLOCKWORLDS:
+		return nullptr; // TODO: Explanations for Blockworlds
+	}
+	dbg_assert(false, "logic error");
+	return nullptr;
+}
diff --git a/src_bkp/game/editor/map_grid.cpp b/src_bkp/game/editor/map_grid.cpp
new file mode 100644
index 0000000000..e241642aa6
--- /dev/null
+++ b/src_bkp/game/editor/map_grid.cpp
@@ -0,0 +1,114 @@
+#include "map_grid.h"
+
+#include <engine/keys.h>
+
+#include "editor.h"
+
+void CMapGrid::OnReset()
+{
+	m_GridActive = false;
+	m_GridFactor = 1;
+}
+
+void CMapGrid::OnRender(CUIRect View)
+{
+	if(!m_GridActive)
+		return;
+
+	std::shared_ptr<CLayerGroup> pGroup = Editor()->GetSelectedGroup();
+	if(pGroup)
+	{
+		pGroup->MapScreen();
+
+		float aGroupPoints[4];
+		pGroup->Mapping(aGroupPoints);
+
+		const CUIRect *pScreen = UI()->Screen();
+
+		int LineDistance = GridLineDistance();
+
+		int XOffset = aGroupPoints[0] / LineDistance;
+		int YOffset = aGroupPoints[1] / LineDistance;
+		int XGridOffset = XOffset % m_GridFactor;
+		int YGridOffset = YOffset % m_GridFactor;
+
+		Graphics()->TextureClear();
+		Graphics()->LinesBegin();
+
+		for(int i = 0; i < (int)pScreen->w; i++)
+		{
+			if((i + YGridOffset) % m_GridFactor == 0)
+				Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
+			else
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
+
+			IGraphics::CLineItem Line = IGraphics::CLineItem(LineDistance * XOffset, LineDistance * i + LineDistance * YOffset, pScreen->w + aGroupPoints[2], LineDistance * i + LineDistance * YOffset);
+			Graphics()->LinesDraw(&Line, 1);
+
+			if((i + XGridOffset) % m_GridFactor == 0)
+				Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
+			else
+				Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
+
+			Line = IGraphics::CLineItem(LineDistance * i + LineDistance * XOffset, LineDistance * YOffset, LineDistance * i + LineDistance * XOffset, pScreen->h + aGroupPoints[3]);
+			Graphics()->LinesDraw(&Line, 1);
+		}
+		Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+		Graphics()->LinesEnd();
+	}
+}
+
+int CMapGrid::GridLineDistance() const
+{
+	if(Editor()->MapView()->Zoom()->GetValue() <= 100.0f)
+		return 16;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 250.0f)
+		return 32;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 450.0f)
+		return 64;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 850.0f)
+		return 128;
+	else if(Editor()->MapView()->Zoom()->GetValue() <= 1550.0f)
+		return 256;
+	else
+		return 512;
+}
+
+void CMapGrid::SnapToGrid(float &x, float &y) const
+{
+	const int GridDistance = GridLineDistance() * m_GridFactor;
+	x = (int)((x + (x >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
+	y = (int)((y + (y >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
+}
+
+bool CMapGrid::IsEnabled() const
+{
+	return m_GridActive;
+}
+
+void CMapGrid::Toggle()
+{
+	m_GridActive = !m_GridActive;
+}
+
+int CMapGrid::Factor() const
+{
+	return m_GridFactor;
+}
+
+void CMapGrid::ResetFactor()
+{
+	m_GridFactor = 1;
+}
+
+void CMapGrid::IncreaseFactor()
+{
+	if(m_GridFactor < 15)
+		m_GridFactor++;
+}
+
+void CMapGrid::DecreaseFactor()
+{
+	if(m_GridFactor > 1)
+		m_GridFactor--;
+}
diff --git a/src_bkp/game/editor/map_grid.h b/src_bkp/game/editor/map_grid.h
new file mode 100644
index 0000000000..3a6e26a3be
--- /dev/null
+++ b/src_bkp/game/editor/map_grid.h
@@ -0,0 +1,32 @@
+#ifndef GAME_EDITOR_MAP_GRID_H
+#define GAME_EDITOR_MAP_GRID_H
+
+#include "component.h"
+
+class CMapGrid : public CEditorComponent
+{
+public:
+	void OnReset() override;
+	void OnRender(CUIRect View) override;
+
+	void SnapToGrid(float &x, float &y) const;
+	int GridLineDistance() const;
+
+	/**
+	 * Returns whether the grid is rendered.
+	 */
+	bool IsEnabled() const;
+
+	void Toggle();
+
+	int Factor() const;
+	void ResetFactor();
+	void IncreaseFactor();
+	void DecreaseFactor();
+
+private:
+	bool m_GridActive;
+	int m_GridFactor;
+};
+
+#endif
diff --git a/src_bkp/game/editor/map_view.cpp b/src_bkp/game/editor/map_view.cpp
new file mode 100644
index 0000000000..99337b8f76
--- /dev/null
+++ b/src_bkp/game/editor/map_view.cpp
@@ -0,0 +1,236 @@
+#include "map_view.h"
+
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+
+#include <game/client/render.h>
+#include <game/client/ui.h>
+
+#include "editor.h"
+
+void CMapView::Init(CEditor *pEditor)
+{
+	CEditorComponent::Init(pEditor);
+	RegisterSubComponent(m_MapGrid);
+	RegisterSubComponent(m_ProofMode);
+	InitSubComponents();
+}
+
+void CMapView::OnReset()
+{
+	m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
+	m_Zoom.Init(Editor());
+	m_WorldZoom = 1.0f;
+
+	SetWorldOffset({0, 0});
+	SetEditorOffset({0, 0});
+
+	m_ProofMode.OnReset();
+	m_MapGrid.OnReset();
+	m_ShowPicker = false;
+}
+
+void CMapView::OnMapLoad()
+{
+	m_ProofMode.OnMapLoad();
+}
+
+bool CMapView::IsFocused()
+{
+	if(m_ProofMode.m_ProofBorders == CProofMode::PROOF_BORDER_MENU)
+		return GetWorldOffset() == m_ProofMode.m_vMenuBackgroundPositions[m_ProofMode.m_CurrentMenuProofIndex];
+	else
+		return GetWorldOffset() == vec2(0, 0);
+}
+
+void CMapView::Focus()
+{
+	if(m_ProofMode.m_ProofBorders == CProofMode::PROOF_BORDER_MENU)
+		SetWorldOffset(m_ProofMode.m_vMenuBackgroundPositions[m_ProofMode.m_CurrentMenuProofIndex]);
+	else
+		SetWorldOffset({0, 0});
+}
+
+void CMapView::RenderGroupBorder()
+{
+	std::shared_ptr<CLayerGroup> pGroup = Editor()->GetSelectedGroup();
+	if(pGroup)
+	{
+		pGroup->MapScreen();
+
+		for(size_t i = 0; i < Editor()->m_vSelectedLayers.size(); i++)
+		{
+			std::shared_ptr<CLayer> pLayer = Editor()->GetSelectedLayerType(i, LAYERTYPE_TILES);
+			if(pLayer)
+			{
+				float w, h;
+				pLayer->GetSize(&w, &h);
+
+				IGraphics::CLineItem aArray[4] = {
+					IGraphics::CLineItem(0, 0, w, 0),
+					IGraphics::CLineItem(w, 0, w, h),
+					IGraphics::CLineItem(w, h, 0, h),
+					IGraphics::CLineItem(0, h, 0, 0)};
+				Graphics()->TextureClear();
+				Graphics()->LinesBegin();
+				Graphics()->LinesDraw(aArray, std::size(aArray));
+				Graphics()->LinesEnd();
+			}
+		}
+	}
+}
+
+void CMapView::RenderMap()
+{
+	if(Editor()->m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && Input()->KeyPress(KEY_G))
+	{
+		const bool AnyHidden =
+			!Editor()->m_Map.m_pGameLayer->m_Visible ||
+			(Editor()->m_Map.m_pFrontLayer && !Editor()->m_Map.m_pFrontLayer->m_Visible) ||
+			(Editor()->m_Map.m_pTeleLayer && !Editor()->m_Map.m_pTeleLayer->m_Visible) ||
+			(Editor()->m_Map.m_pSpeedupLayer && !Editor()->m_Map.m_pSpeedupLayer->m_Visible) ||
+			(Editor()->m_Map.m_pTuneLayer && !Editor()->m_Map.m_pTuneLayer->m_Visible) ||
+			(Editor()->m_Map.m_pSwitchLayer && !Editor()->m_Map.m_pSwitchLayer->m_Visible);
+		Editor()->m_Map.m_pGameLayer->m_Visible = AnyHidden;
+		if(Editor()->m_Map.m_pFrontLayer)
+			Editor()->m_Map.m_pFrontLayer->m_Visible = AnyHidden;
+		if(Editor()->m_Map.m_pTeleLayer)
+			Editor()->m_Map.m_pTeleLayer->m_Visible = AnyHidden;
+		if(Editor()->m_Map.m_pSpeedupLayer)
+			Editor()->m_Map.m_pSpeedupLayer->m_Visible = AnyHidden;
+		if(Editor()->m_Map.m_pTuneLayer)
+			Editor()->m_Map.m_pTuneLayer->m_Visible = AnyHidden;
+		if(Editor()->m_Map.m_pSwitchLayer)
+			Editor()->m_Map.m_pSwitchLayer->m_Visible = AnyHidden;
+	}
+
+	for(auto &pGroup : Editor()->m_Map.m_vpGroups)
+	{
+		if(pGroup->m_Visible)
+			pGroup->Render();
+	}
+
+	// render the game, tele, speedup, front, tune and switch above everything else
+	if(Editor()->m_Map.m_pGameGroup->m_Visible)
+	{
+		Editor()->m_Map.m_pGameGroup->MapScreen();
+		for(auto &pLayer : Editor()->m_Map.m_pGameGroup->m_vpLayers)
+		{
+			if(pLayer->m_Visible && pLayer->IsEntitiesLayer())
+				pLayer->Render();
+		}
+	}
+
+	std::shared_ptr<CLayerTiles> pSelectedTilesLayer = std::static_pointer_cast<CLayerTiles>(Editor()->GetSelectedLayerType(0, LAYERTYPE_TILES));
+	if(Editor()->m_ShowTileInfo != CEditor::SHOW_TILE_OFF && pSelectedTilesLayer && pSelectedTilesLayer->m_Visible && m_Zoom.GetValue() <= 300.0f)
+	{
+		Editor()->GetSelectedGroup()->MapScreen();
+		pSelectedTilesLayer->ShowInfo();
+	}
+}
+
+void CMapView::ResetZoom()
+{
+	SetEditorOffset({0, 0});
+	m_Zoom.SetValue(100.0f);
+}
+
+float CMapView::ScaleLength(float Value) const
+{
+	return m_WorldZoom * Value;
+}
+
+void CMapView::ZoomMouseTarget(float ZoomFactor)
+{
+	// zoom to the current mouse position
+	// get absolute mouse position
+	float aPoints[4];
+	RenderTools()->MapScreenToWorld(
+		GetWorldOffset().x, GetWorldOffset().y,
+		100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Graphics()->ScreenAspect(), m_WorldZoom, aPoints);
+
+	float WorldWidth = aPoints[2] - aPoints[0];
+	float WorldHeight = aPoints[3] - aPoints[1];
+
+	float Mwx = aPoints[0] + WorldWidth * (UI()->MouseX() / UI()->Screen()->w);
+	float Mwy = aPoints[1] + WorldHeight * (UI()->MouseY() / UI()->Screen()->h);
+
+	// adjust camera
+	OffsetWorld((vec2(Mwx, Mwy) - GetWorldOffset()) * (1.0f - ZoomFactor));
+}
+
+void CMapView::UpdateZoom()
+{
+	float OldLevel = m_Zoom.GetValue();
+	bool UpdatedZoom = m_Zoom.UpdateValue();
+	m_Zoom.SetValueRange(10.0f, g_Config.m_EdLimitMaxZoomLevel ? 2000.0f : std::numeric_limits<float>::max());
+	float NewLevel = m_Zoom.GetValue();
+	if(UpdatedZoom && g_Config.m_EdZoomTarget)
+		ZoomMouseTarget(NewLevel / OldLevel);
+	m_WorldZoom = NewLevel / 100.0f;
+}
+
+CSmoothValue *CMapView::Zoom()
+{
+	return &m_Zoom;
+}
+
+const CSmoothValue *CMapView::Zoom() const
+{
+	return &m_Zoom;
+}
+
+CProofMode *CMapView::ProofMode()
+{
+	return &m_ProofMode;
+}
+
+const CProofMode *CMapView::ProofMode() const
+{
+	return &m_ProofMode;
+}
+
+CMapGrid *CMapView::MapGrid()
+{
+	return &m_MapGrid;
+}
+
+const CMapGrid *CMapView::MapGrid() const
+{
+	return &m_MapGrid;
+}
+
+void CMapView::OffsetWorld(vec2 Offset)
+{
+	m_WorldOffset += Offset;
+}
+
+void CMapView::OffsetEditor(vec2 Offset)
+{
+	m_EditorOffset += Offset;
+}
+
+void CMapView::SetWorldOffset(vec2 WorldOffset)
+{
+	m_WorldOffset = WorldOffset;
+}
+
+void CMapView::SetEditorOffset(vec2 EditorOffset)
+{
+	m_EditorOffset = EditorOffset;
+}
+
+vec2 CMapView::GetWorldOffset() const
+{
+	return m_WorldOffset;
+}
+
+vec2 CMapView::GetEditorOffset() const
+{
+	return m_EditorOffset;
+}
+
+float CMapView::GetWorldZoom() const
+{
+	return m_WorldZoom;
+}
diff --git a/src_bkp/game/editor/map_view.h b/src_bkp/game/editor/map_view.h
new file mode 100644
index 0000000000..5aa86254d6
--- /dev/null
+++ b/src_bkp/game/editor/map_view.h
@@ -0,0 +1,68 @@
+#ifndef GAME_EDITOR_MAP_VIEW_H
+#define GAME_EDITOR_MAP_VIEW_H
+
+#include <base/vmath.h>
+
+#include "component.h"
+#include "map_grid.h"
+#include "proof_mode.h"
+#include "smooth_value.h"
+
+class CLayerGroup;
+
+class CMapView : public CEditorComponent
+{
+public:
+	void Init(CEditor *pEditor) override;
+	void OnReset() override;
+	void OnMapLoad() override;
+
+	void ZoomMouseTarget(float ZoomFactor);
+	void UpdateZoom();
+
+	void RenderGroupBorder();
+	void RenderMap();
+
+	bool IsFocused();
+	void Focus();
+
+	/**
+	 * Reset zoom and editor offset.
+	 */
+	void ResetZoom();
+
+	/**
+	 * Scale length according to zoom value.
+	 */
+	float ScaleLength(float Value) const;
+
+	bool m_ShowPicker; // TODO: make private
+
+	float GetWorldZoom() const;
+
+	void OffsetWorld(vec2 Offset);
+	void OffsetEditor(vec2 Offset);
+	void SetWorldOffset(vec2 WorldOffset);
+	void SetEditorOffset(vec2 EditorOffset);
+	vec2 GetWorldOffset() const;
+	vec2 GetEditorOffset() const;
+
+	CSmoothValue *Zoom();
+	const CSmoothValue *Zoom() const;
+	CProofMode *ProofMode();
+	const CProofMode *ProofMode() const;
+	CMapGrid *MapGrid();
+	const CMapGrid *MapGrid() const;
+
+private:
+	CSmoothValue m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
+	float m_WorldZoom;
+
+	CProofMode m_ProofMode;
+	CMapGrid m_MapGrid;
+
+	vec2 m_WorldOffset;
+	vec2 m_EditorOffset;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems.h b/src_bkp/game/editor/mapitems.h
new file mode 100644
index 0000000000..7873ee7e73
--- /dev/null
+++ b/src_bkp/game/editor/mapitems.h
@@ -0,0 +1,125 @@
+#ifndef GAME_EDITOR_MAPITEMS_H
+#define GAME_EDITOR_MAPITEMS_H
+
+enum class EQuadProp
+{
+	PROP_NONE = -1,
+	PROP_ORDER,
+	PROP_POS_X,
+	PROP_POS_Y,
+	PROP_POS_ENV,
+	PROP_POS_ENV_OFFSET,
+	PROP_COLOR_ENV,
+	PROP_COLOR_ENV_OFFSET,
+	NUM_PROPS,
+};
+
+enum class EQuadPointProp
+{
+	PROP_NONE = -1,
+	PROP_POS_X,
+	PROP_POS_Y,
+	PROP_COLOR,
+	PROP_TEX_U,
+	PROP_TEX_V,
+	NUM_PROPS,
+};
+
+enum class ESoundProp
+{
+	PROP_NONE = -1,
+	PROP_POS_X,
+	PROP_POS_Y,
+	PROP_LOOP,
+	PROP_PAN,
+	PROP_TIME_DELAY,
+	PROP_FALLOFF,
+	PROP_POS_ENV,
+	PROP_POS_ENV_OFFSET,
+	PROP_SOUND_ENV,
+	PROP_SOUND_ENV_OFFSET,
+	NUM_PROPS,
+};
+
+enum class ERectangleShapeProp
+{
+	PROP_NONE = -1,
+	PROP_RECTANGLE_WIDTH,
+	PROP_RECTANGLE_HEIGHT,
+	NUM_RECTANGLE_PROPS,
+};
+
+enum class ECircleShapeProp
+{
+	PROP_NONE = -1,
+	PROP_CIRCLE_RADIUS,
+	NUM_CIRCLE_PROPS,
+};
+
+enum class ELayerProp
+{
+	PROP_NONE = -1,
+	PROP_GROUP,
+	PROP_ORDER,
+	PROP_HQ,
+	NUM_PROPS,
+};
+
+enum class ETilesProp
+{
+	PROP_NONE = -1,
+	PROP_WIDTH,
+	PROP_HEIGHT,
+	PROP_SHIFT,
+	PROP_SHIFT_BY,
+	PROP_IMAGE,
+	PROP_COLOR,
+	PROP_COLOR_ENV,
+	PROP_COLOR_ENV_OFFSET,
+	PROP_AUTOMAPPER,
+	PROP_SEED,
+	NUM_PROPS
+};
+
+enum class ETilesCommonProp
+{
+	PROP_NONE = -1,
+	PROP_WIDTH,
+	PROP_HEIGHT,
+	PROP_SHIFT,
+	PROP_SHIFT_BY,
+	PROP_COLOR,
+	NUM_PROPS,
+};
+
+enum class EGroupProp
+{
+	PROP_NONE = -1,
+	PROP_ORDER,
+	PROP_POS_X,
+	PROP_POS_Y,
+	PROP_PARA_X,
+	PROP_PARA_Y,
+	PROP_USE_CLIPPING,
+	PROP_CLIP_X,
+	PROP_CLIP_Y,
+	PROP_CLIP_W,
+	PROP_CLIP_H,
+	NUM_PROPS,
+};
+
+enum class ELayerQuadsProp
+{
+	PROP_NONE = -1,
+	PROP_IMAGE,
+	NUM_PROPS,
+};
+
+enum class ELayerSoundsProp
+{
+	PROP_NONE = -1,
+	PROP_SOUND,
+	NUM_PROPS,
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/envelope.cpp b/src_bkp/game/editor/mapitems/envelope.cpp
new file mode 100644
index 0000000000..5f0524eb2a
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/envelope.cpp
@@ -0,0 +1,148 @@
+#include "envelope.h"
+
+#include <algorithm>
+#include <chrono>
+#include <limits>
+
+using namespace std::chrono_literals;
+
+CEnvelope::CEnvelopePointAccess::CEnvelopePointAccess(std::vector<CEnvPoint_runtime> *pvPoints)
+{
+	m_pvPoints = pvPoints;
+}
+
+int CEnvelope::CEnvelopePointAccess::NumPoints() const
+{
+	return m_pvPoints->size();
+}
+
+const CEnvPoint *CEnvelope::CEnvelopePointAccess::GetPoint(int Index) const
+{
+	if(Index < 0 || (size_t)Index >= m_pvPoints->size())
+		return nullptr;
+	return &m_pvPoints->at(Index);
+}
+
+const CEnvPointBezier *CEnvelope::CEnvelopePointAccess::GetBezier(int Index) const
+{
+	if(Index < 0 || (size_t)Index >= m_pvPoints->size())
+		return nullptr;
+	return &m_pvPoints->at(Index).m_Bezier;
+}
+
+CEnvelope::CEnvelope(EType Type) :
+	m_Type(Type), m_PointsAccess(&m_vPoints) {}
+
+CEnvelope::CEnvelope(int NumChannels) :
+	m_PointsAccess(&m_vPoints)
+{
+	switch(NumChannels)
+	{
+	case 1:
+		m_Type = EType::SOUND;
+		break;
+	case 3:
+		m_Type = EType::POSITION;
+		break;
+	case 4:
+		m_Type = EType::COLOR;
+		break;
+	default:
+		dbg_assert(false, "invalid number of channels for envelope");
+	}
+}
+
+void CEnvelope::Resort()
+{
+	std::sort(m_vPoints.begin(), m_vPoints.end());
+}
+
+std::pair<float, float> CEnvelope::GetValueRange(int ChannelMask)
+{
+	float Top = -std::numeric_limits<float>::infinity();
+	float Bottom = std::numeric_limits<float>::infinity();
+	CEnvPoint_runtime *pPrevPoint = nullptr;
+	for(auto &Point : m_vPoints)
+	{
+		for(int c = 0; c < GetChannels(); c++)
+		{
+			if(ChannelMask & (1 << c))
+			{
+				{
+					// value handle
+					const float v = fx2f(Point.m_aValues[c]);
+					Top = maximum(Top, v);
+					Bottom = minimum(Bottom, v);
+				}
+
+				if(Point.m_Curvetype == CURVETYPE_BEZIER)
+				{
+					// out-tangent handle
+					const float v = fx2f(Point.m_aValues[c] + Point.m_Bezier.m_aOutTangentDeltaY[c]);
+					Top = maximum(Top, v);
+					Bottom = minimum(Bottom, v);
+				}
+
+				if(pPrevPoint != nullptr && pPrevPoint->m_Curvetype == CURVETYPE_BEZIER)
+				{
+					// in-tangent handle
+					const float v = fx2f(Point.m_aValues[c] + Point.m_Bezier.m_aInTangentDeltaY[c]);
+					Top = maximum(Top, v);
+					Bottom = minimum(Bottom, v);
+				}
+			}
+		}
+		pPrevPoint = &Point;
+	}
+
+	return {Bottom, Top};
+}
+
+int CEnvelope::Eval(float Time, ColorRGBA &Color)
+{
+	CRenderTools::RenderEvalEnvelope(&m_PointsAccess, GetChannels(), std::chrono::nanoseconds((int64_t)((double)Time * (double)std::chrono::nanoseconds(1s).count())), Color);
+	return GetChannels();
+}
+
+void CEnvelope::AddPoint(int Time, int v0, int v1, int v2, int v3)
+{
+	CEnvPoint_runtime p;
+	p.m_Time = Time;
+	p.m_aValues[0] = v0;
+	p.m_aValues[1] = v1;
+	p.m_aValues[2] = v2;
+	p.m_aValues[3] = v3;
+	p.m_Curvetype = CURVETYPE_LINEAR;
+	for(int c = 0; c < CEnvPoint::MAX_CHANNELS; c++)
+	{
+		p.m_Bezier.m_aInTangentDeltaX[c] = 0;
+		p.m_Bezier.m_aInTangentDeltaY[c] = 0;
+		p.m_Bezier.m_aOutTangentDeltaX[c] = 0;
+		p.m_Bezier.m_aOutTangentDeltaY[c] = 0;
+	}
+	m_vPoints.push_back(p);
+	Resort();
+}
+
+float CEnvelope::EndTime() const
+{
+	if(m_vPoints.empty())
+		return 0.0f;
+	return m_vPoints.back().m_Time / 1000.0f;
+}
+
+int CEnvelope::GetChannels() const
+{
+	switch(m_Type)
+	{
+	case EType::POSITION:
+		return 3;
+	case EType::COLOR:
+		return 4;
+	case EType::SOUND:
+		return 1;
+	default:
+		dbg_assert(false, "unknown envelope type");
+		dbg_break();
+	}
+}
diff --git a/src_bkp/game/editor/mapitems/envelope.h b/src_bkp/game/editor/mapitems/envelope.h
new file mode 100644
index 0000000000..2b25c9f362
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/envelope.h
@@ -0,0 +1,49 @@
+#ifndef GAME_EDITOR_MAPITEMS_ENVELOPE_H
+#define GAME_EDITOR_MAPITEMS_ENVELOPE_H
+
+#include <game/client/render.h>
+#include <game/mapitems.h>
+
+class CEnvelope
+{
+public:
+	std::vector<CEnvPoint_runtime> m_vPoints;
+	char m_aName[32] = "";
+	bool m_Synchronized = false;
+
+	enum class EType
+	{
+		POSITION,
+		COLOR,
+		SOUND
+	};
+	explicit CEnvelope(EType Type);
+	explicit CEnvelope(int NumChannels);
+
+	std::pair<float, float> GetValueRange(int ChannelMask);
+	int Eval(float Time, ColorRGBA &Color);
+	void AddPoint(int Time, int v0, int v1 = 0, int v2 = 0, int v3 = 0);
+	float EndTime() const;
+	int GetChannels() const;
+	EType Type() const { return m_Type; }
+
+private:
+	void Resort();
+
+	EType m_Type;
+
+	class CEnvelopePointAccess : public IEnvelopePointAccess
+	{
+		std::vector<CEnvPoint_runtime> *m_pvPoints;
+
+	public:
+		CEnvelopePointAccess(std::vector<CEnvPoint_runtime> *pvPoints);
+
+		int NumPoints() const override;
+		const CEnvPoint *GetPoint(int Index) const override;
+		const CEnvPointBezier *GetBezier(int Index) const override;
+	};
+	CEnvelopePointAccess m_PointsAccess;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/image.cpp b/src_bkp/game/editor/mapitems/image.cpp
new file mode 100644
index 0000000000..514a1cadf7
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/image.cpp
@@ -0,0 +1,56 @@
+#include "image.h"
+
+#include <game/mapitems.h>
+
+CEditorImage::CEditorImage(CEditor *pEditor) :
+	m_AutoMapper(pEditor)
+{
+	Init(pEditor);
+	m_Texture.Invalidate();
+}
+
+CEditorImage::~CEditorImage()
+{
+	Graphics()->UnloadTexture(&m_Texture);
+	free(m_pData);
+	m_pData = nullptr;
+}
+
+void CEditorImage::Init(CEditor *pEditor)
+{
+	CEditorComponent::Init(pEditor);
+	RegisterSubComponent(m_AutoMapper);
+	InitSubComponents();
+}
+
+void CEditorImage::AnalyseTileFlags()
+{
+	mem_zero(m_aTileFlags, sizeof(m_aTileFlags));
+
+	int tw = m_Width / 16; // tilesizes
+	int th = m_Height / 16;
+	if(tw == th && m_Format == CImageInfo::FORMAT_RGBA)
+	{
+		unsigned char *pPixelData = (unsigned char *)m_pData;
+
+		int TileID = 0;
+		for(int ty = 0; ty < 16; ty++)
+			for(int tx = 0; tx < 16; tx++, TileID++)
+			{
+				bool Opaque = true;
+				for(int x = 0; x < tw; x++)
+					for(int y = 0; y < th; y++)
+					{
+						int p = (ty * tw + y) * m_Width + tx * tw + x;
+						if(pPixelData[p * 4 + 3] < 250)
+						{
+							Opaque = false;
+							break;
+						}
+					}
+
+				if(Opaque)
+					m_aTileFlags[TileID] |= TILEFLAG_OPAQUE;
+			}
+	}
+}
diff --git a/src_bkp/game/editor/mapitems/image.h b/src_bkp/game/editor/mapitems/image.h
new file mode 100644
index 0000000000..cffbd6c7e7
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/image.h
@@ -0,0 +1,25 @@
+#ifndef GAME_EDITOR_MAPITEMS_IMAGE_H
+#define GAME_EDITOR_MAPITEMS_IMAGE_H
+
+#include <engine/graphics.h>
+
+#include <game/editor/auto_map.h>
+#include <game/editor/component.h>
+
+class CEditorImage : public CImageInfo, public CEditorComponent
+{
+public:
+	explicit CEditorImage(CEditor *pEditor);
+	~CEditorImage();
+
+	void Init(CEditor *pEditor) override;
+	void AnalyseTileFlags();
+
+	IGraphics::CTextureHandle m_Texture;
+	int m_External = 0;
+	char m_aName[IO_MAX_PATH_LENGTH] = "";
+	unsigned char m_aTileFlags[256];
+	CAutoMapper m_AutoMapper;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer.h b/src_bkp/game/editor/mapitems/layer.h
new file mode 100644
index 0000000000..238c9e4ccd
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer.h
@@ -0,0 +1,81 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_H
+#define GAME_EDITOR_MAPITEMS_LAYER_H
+
+#include <base/system.h>
+#include <game/client/ui.h>
+#include <game/client/ui_rect.h>
+#include <game/mapitems.h>
+
+#include <memory>
+
+using FIndexModifyFunction = std::function<void(int *pIndex)>;
+
+class CLayerGroup;
+
+class CLayer
+{
+public:
+	class CEditor *m_pEditor;
+	class IGraphics *Graphics();
+	class ITextRender *TextRender();
+
+	explicit CLayer(CEditor *pEditor)
+	{
+		m_Type = LAYERTYPE_INVALID;
+		str_copy(m_aName, "(invalid)");
+		m_Visible = true;
+		m_Readonly = false;
+		m_Flags = 0;
+		m_pEditor = pEditor;
+	}
+
+	CLayer(const CLayer &Other)
+	{
+		str_copy(m_aName, Other.m_aName);
+		m_Flags = Other.m_Flags;
+		m_pEditor = Other.m_pEditor;
+		m_Type = Other.m_Type;
+		m_Visible = true;
+		m_Readonly = false;
+	}
+
+	virtual ~CLayer()
+	{
+	}
+
+	virtual void BrushSelecting(CUIRect Rect) {}
+	virtual int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) { return 0; }
+	virtual void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) {}
+	virtual void BrushDraw(std::shared_ptr<CLayer> pBrush, float x, float y) {}
+	virtual void BrushPlace(std::shared_ptr<CLayer> pBrush, float x, float y) {}
+	virtual void BrushFlipX() {}
+	virtual void BrushFlipY() {}
+	virtual void BrushRotate(float Amount) {}
+
+	virtual bool IsEntitiesLayer() const { return false; }
+
+	virtual void Render(bool Tileset = false) {}
+	virtual CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) { return CUI::POPUP_KEEP_OPEN; }
+
+	virtual void ModifyImageIndex(FIndexModifyFunction pfnFunc) {}
+	virtual void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) {}
+	virtual void ModifySoundIndex(FIndexModifyFunction pfnFunc) {}
+
+	virtual std::shared_ptr<CLayer> Duplicate() const = 0;
+	virtual const char *TypeName() const = 0;
+
+	virtual void GetSize(float *pWidth, float *pHeight)
+	{
+		*pWidth = 0;
+		*pHeight = 0;
+	}
+
+	char m_aName[12];
+	int m_Type;
+	int m_Flags;
+
+	bool m_Readonly;
+	bool m_Visible;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_front.cpp b/src_bkp/game/editor/mapitems/layer_front.cpp
new file mode 100644
index 0000000000..f046299c4b
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_front.cpp
@@ -0,0 +1,52 @@
+#include <game/editor/editor.h>
+
+CLayerFront::CLayerFront(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Front");
+	m_Front = 1;
+}
+
+void CLayerFront::SetTile(int x, int y, CTile Tile)
+{
+	if(Tile.m_Index == TILE_THROUGH_CUT)
+	{
+		CTile nohook = {TILE_NOHOOK};
+		m_pEditor->m_Map.m_pGameLayer->CLayerTiles::SetTile(x, y, nohook); // NOLINT(bugprone-parent-virtual-call)
+	}
+	else if(Tile.m_Index == TILE_AIR && CLayerTiles::GetTile(x, y).m_Index == TILE_THROUGH_CUT)
+	{
+		CTile air = {TILE_AIR};
+		m_pEditor->m_Map.m_pGameLayer->CLayerTiles::SetTile(x, y, air); // NOLINT(bugprone-parent-virtual-call)
+	}
+	if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidFrontTile(Tile.m_Index))
+	{
+		CLayerTiles::SetTile(x, y, Tile);
+	}
+	else
+	{
+		CTile air = {TILE_AIR};
+		CLayerTiles::SetTile(x, y, air);
+		if(!m_pEditor->m_PreventUnusedTilesWasWarned)
+		{
+			m_pEditor->m_PopupEventType = CEditor::POPEVENT_PREVENTUNUSEDTILES;
+			m_pEditor->m_PopupEventActivated = true;
+			m_pEditor->m_PreventUnusedTilesWasWarned = true;
+		}
+	}
+}
+
+void CLayerFront::Resize(int NewW, int NewH)
+{
+	// resize tile data
+	CLayerTiles::Resize(NewW, NewH);
+
+	// resize gamelayer too
+	if(m_pEditor->m_Map.m_pGameLayer->m_Width != NewW || m_pEditor->m_Map.m_pGameLayer->m_Height != NewH)
+		m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
+}
+
+const char *CLayerFront::TypeName() const
+{
+	return "front";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_front.h b/src_bkp/game/editor/mapitems/layer_front.h
new file mode 100644
index 0000000000..fbddfac1fa
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_front.h
@@ -0,0 +1,16 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_FRONT_H
+#define GAME_EDITOR_MAPITEMS_LAYER_FRONT_H
+
+#include "layer_tiles.h"
+
+class CLayerFront : public CLayerTiles
+{
+public:
+	CLayerFront(CEditor *pEditor, int w, int h);
+
+	void Resize(int NewW, int NewH) override;
+	void SetTile(int x, int y, CTile Tile) override;
+	const char *TypeName() const override;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_game.cpp b/src_bkp/game/editor/mapitems/layer_game.cpp
new file mode 100644
index 0000000000..eb0ee541fc
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_game.cpp
@@ -0,0 +1,79 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "layer_game.h"
+
+#include <game/editor/editor.h>
+
+CLayerGame::CLayerGame(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Game");
+	m_Game = 1;
+}
+
+CLayerGame::~CLayerGame() = default;
+
+CTile CLayerGame::GetTile(int x, int y)
+{
+	if(m_pEditor->m_Map.m_pFrontLayer && m_pEditor->m_Map.m_pFrontLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
+	{
+		CTile through_cut = {TILE_THROUGH_CUT};
+		return through_cut;
+	}
+	else
+	{
+		return CLayerTiles::GetTile(x, y);
+	}
+}
+
+void CLayerGame::SetTile(int x, int y, CTile Tile)
+{
+	if(Tile.m_Index == TILE_THROUGH_CUT && m_pEditor->m_SelectEntitiesImage == "DDNet")
+	{
+		if(!m_pEditor->m_Map.m_pFrontLayer)
+		{
+			std::shared_ptr<CLayer> pLayerFront = std::make_shared<CLayerFront>(m_pEditor, m_Width, m_Height);
+			m_pEditor->m_Map.MakeFrontLayer(pLayerFront);
+			m_pEditor->m_Map.m_pGameGroup->AddLayer(pLayerFront);
+		}
+		CTile nohook = {TILE_NOHOOK};
+		CLayerTiles::SetTile(x, y, nohook);
+		CTile through_cut = {TILE_THROUGH_CUT};
+		m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, through_cut); // NOLINT(bugprone-parent-virtual-call)
+	}
+	else
+	{
+		if(m_pEditor->m_SelectEntitiesImage == "DDNet" && m_pEditor->m_Map.m_pFrontLayer && m_pEditor->m_Map.m_pFrontLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
+		{
+			CTile air = {TILE_AIR};
+			m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, air); // NOLINT(bugprone-parent-virtual-call)
+		}
+		if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidGameTile(Tile.m_Index))
+		{
+			CLayerTiles::SetTile(x, y, Tile);
+		}
+		else
+		{
+			CTile air = {TILE_AIR};
+			CLayerTiles::SetTile(x, y, air);
+			if(!m_pEditor->m_PreventUnusedTilesWasWarned)
+			{
+				m_pEditor->m_PopupEventType = CEditor::POPEVENT_PREVENTUNUSEDTILES;
+				m_pEditor->m_PopupEventActivated = true;
+				m_pEditor->m_PreventUnusedTilesWasWarned = true;
+			}
+		}
+	}
+}
+
+CUI::EPopupMenuFunctionResult CLayerGame::RenderProperties(CUIRect *pToolbox)
+{
+	const CUI::EPopupMenuFunctionResult Result = CLayerTiles::RenderProperties(pToolbox);
+	m_Image = -1;
+	return Result;
+}
+
+const char *CLayerGame::TypeName() const
+{
+	return "game";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_game.h b/src_bkp/game/editor/mapitems/layer_game.h
new file mode 100644
index 0000000000..ec6f1d78fa
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_game.h
@@ -0,0 +1,19 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_GAME_H
+#define GAME_EDITOR_MAPITEMS_LAYER_GAME_H
+
+#include "layer_tiles.h"
+
+class CLayerGame : public CLayerTiles
+{
+public:
+	CLayerGame(CEditor *pEditor, int w, int h);
+	~CLayerGame();
+
+	CTile GetTile(int x, int y) override;
+	void SetTile(int x, int y, CTile Tile) override;
+	const char *TypeName() const override;
+
+	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_group.cpp b/src_bkp/game/editor/mapitems/layer_group.cpp
new file mode 100644
index 0000000000..2607fc9a3f
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_group.cpp
@@ -0,0 +1,157 @@
+#include "layer_group.h"
+
+#include <base/math.h>
+#include <game/editor/editor.h>
+
+CLayerGroup::CLayerGroup()
+{
+	m_vpLayers.clear();
+	m_aName[0] = 0;
+	m_Visible = true;
+	m_Collapse = false;
+	m_GameGroup = false;
+	m_OffsetX = 0;
+	m_OffsetY = 0;
+	m_ParallaxX = 100;
+	m_ParallaxY = 100;
+
+	m_UseClipping = 0;
+	m_ClipX = 0;
+	m_ClipY = 0;
+	m_ClipW = 0;
+	m_ClipH = 0;
+}
+
+CLayerGroup::~CLayerGroup()
+{
+	m_vpLayers.clear();
+}
+
+void CLayerGroup::Convert(CUIRect *pRect) const
+{
+	pRect->x += m_OffsetX;
+	pRect->y += m_OffsetY;
+}
+
+void CLayerGroup::Mapping(float *pPoints) const
+{
+	float NormalParallaxZoom = clamp((double)(maximum(m_ParallaxX, m_ParallaxY)), 0., 100.);
+	float ParallaxZoom = m_pMap->m_pEditor->m_PreviewZoom ? NormalParallaxZoom : 100.0f;
+
+	m_pMap->m_pEditor->RenderTools()->MapScreenToWorld(
+		m_pMap->m_pEditor->MapView()->GetWorldOffset().x, m_pMap->m_pEditor->MapView()->GetWorldOffset().y,
+		m_ParallaxX, m_ParallaxY, ParallaxZoom, m_OffsetX, m_OffsetY,
+		m_pMap->m_pEditor->Graphics()->ScreenAspect(), m_pMap->m_pEditor->MapView()->GetWorldZoom(), pPoints);
+
+	pPoints[0] += m_pMap->m_pEditor->MapView()->GetEditorOffset().x;
+	pPoints[1] += m_pMap->m_pEditor->MapView()->GetEditorOffset().y;
+	pPoints[2] += m_pMap->m_pEditor->MapView()->GetEditorOffset().x;
+	pPoints[3] += m_pMap->m_pEditor->MapView()->GetEditorOffset().y;
+}
+
+void CLayerGroup::MapScreen() const
+{
+	float aPoints[4];
+	Mapping(aPoints);
+	m_pMap->m_pEditor->Graphics()->MapScreen(aPoints[0], aPoints[1], aPoints[2], aPoints[3]);
+}
+
+void CLayerGroup::Render()
+{
+	MapScreen();
+	IGraphics *pGraphics = m_pMap->m_pEditor->Graphics();
+
+	if(m_UseClipping)
+	{
+		float aPoints[4];
+		m_pMap->m_pGameGroup->Mapping(aPoints);
+		float x0 = (m_ClipX - aPoints[0]) / (aPoints[2] - aPoints[0]);
+		float y0 = (m_ClipY - aPoints[1]) / (aPoints[3] - aPoints[1]);
+		float x1 = ((m_ClipX + m_ClipW) - aPoints[0]) / (aPoints[2] - aPoints[0]);
+		float y1 = ((m_ClipY + m_ClipH) - aPoints[1]) / (aPoints[3] - aPoints[1]);
+
+		pGraphics->ClipEnable((int)(x0 * pGraphics->ScreenWidth()), (int)(y0 * pGraphics->ScreenHeight()),
+			(int)((x1 - x0) * pGraphics->ScreenWidth()), (int)((y1 - y0) * pGraphics->ScreenHeight()));
+	}
+
+	for(auto &pLayer : m_vpLayers)
+	{
+		if(pLayer->m_Visible)
+		{
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+				if(pTiles->m_Game || pTiles->m_Front || pTiles->m_Tele || pTiles->m_Speedup || pTiles->m_Tune || pTiles->m_Switch)
+					continue;
+			}
+			if(m_pMap->m_pEditor->m_ShowDetail || !(pLayer->m_Flags & LAYERFLAG_DETAIL))
+				pLayer->Render();
+		}
+	}
+
+	for(auto &pLayer : m_vpLayers)
+	{
+		if(pLayer->m_Visible && pLayer->m_Type == LAYERTYPE_TILES && pLayer != m_pMap->m_pGameLayer && pLayer != m_pMap->m_pFrontLayer && pLayer != m_pMap->m_pTeleLayer && pLayer != m_pMap->m_pSpeedupLayer && pLayer != m_pMap->m_pSwitchLayer && pLayer != m_pMap->m_pTuneLayer)
+		{
+			std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+			if(pTiles->m_Game || pTiles->m_Front || pTiles->m_Tele || pTiles->m_Speedup || pTiles->m_Tune || pTiles->m_Switch)
+			{
+				pLayer->Render();
+			}
+		}
+	}
+
+	if(m_UseClipping)
+		pGraphics->ClipDisable();
+}
+
+void CLayerGroup::AddLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pMap->OnModify();
+	m_vpLayers.push_back(pLayer);
+}
+
+void CLayerGroup::DeleteLayer(int Index)
+{
+	if(Index < 0 || Index >= (int)m_vpLayers.size())
+		return;
+	m_vpLayers.erase(m_vpLayers.begin() + Index);
+	m_pMap->OnModify();
+}
+
+void CLayerGroup::DuplicateLayer(int Index)
+{
+	if(Index < 0 || Index >= (int)m_vpLayers.size())
+		return;
+
+	std::shared_ptr<CLayer> pDup = m_vpLayers[Index]->Duplicate();
+	m_vpLayers.insert(m_vpLayers.begin() + Index + 1, pDup);
+
+	m_pMap->OnModify();
+}
+
+void CLayerGroup::GetSize(float *pWidth, float *pHeight) const
+{
+	*pWidth = 0;
+	*pHeight = 0;
+	for(const auto &pLayer : m_vpLayers)
+	{
+		float lw, lh;
+		pLayer->GetSize(&lw, &lh);
+		*pWidth = maximum(*pWidth, lw);
+		*pHeight = maximum(*pHeight, lh);
+	}
+}
+
+int CLayerGroup::SwapLayers(int Index0, int Index1)
+{
+	if(Index0 < 0 || Index0 >= (int)m_vpLayers.size())
+		return Index0;
+	if(Index1 < 0 || Index1 >= (int)m_vpLayers.size())
+		return Index0;
+	if(Index0 == Index1)
+		return Index0;
+	m_pMap->OnModify();
+	std::swap(m_vpLayers[Index0], m_vpLayers[Index1]);
+	return Index1;
+}
diff --git a/src_bkp/game/editor/mapitems/layer_group.h b/src_bkp/game/editor/mapitems/layer_group.h
new file mode 100644
index 0000000000..78e1488e0b
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_group.h
@@ -0,0 +1,78 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_GROUP_H
+#define GAME_EDITOR_MAPITEMS_LAYER_GROUP_H
+
+#include "layer.h"
+
+#include <memory>
+#include <vector>
+
+class CLayerGroup
+{
+public:
+	class CEditorMap *m_pMap;
+
+	std::vector<std::shared_ptr<CLayer>> m_vpLayers;
+
+	int m_OffsetX;
+	int m_OffsetY;
+
+	int m_ParallaxX;
+	int m_ParallaxY;
+
+	int m_UseClipping;
+	int m_ClipX;
+	int m_ClipY;
+	int m_ClipW;
+	int m_ClipH;
+
+	char m_aName[12];
+	bool m_GameGroup;
+	bool m_Visible;
+	bool m_Collapse;
+
+	CLayerGroup();
+	~CLayerGroup();
+
+	void Convert(CUIRect *pRect) const;
+	void Render();
+	void MapScreen() const;
+	void Mapping(float *pPoints) const;
+
+	void GetSize(float *pWidth, float *pHeight) const;
+
+	void DeleteLayer(int Index);
+	void DuplicateLayer(int Index);
+	int SwapLayers(int Index0, int Index1);
+
+	bool IsEmpty() const
+	{
+		return m_vpLayers.empty();
+	}
+
+	void Clear()
+	{
+		m_vpLayers.clear();
+	}
+
+	void AddLayer(const std::shared_ptr<CLayer> &pLayer);
+
+	void ModifyImageIndex(FIndexModifyFunction Func)
+	{
+		for(auto &pLayer : m_vpLayers)
+			pLayer->ModifyImageIndex(Func);
+	}
+
+	void ModifyEnvelopeIndex(FIndexModifyFunction Func)
+	{
+		for(auto &pLayer : m_vpLayers)
+			pLayer->ModifyEnvelopeIndex(Func);
+	}
+
+	void ModifySoundIndex(FIndexModifyFunction Func)
+	{
+		for(auto &pLayer : m_vpLayers)
+			pLayer->ModifySoundIndex(Func);
+	}
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_quads.cpp b/src_bkp/game/editor/mapitems/layer_quads.cpp
new file mode 100644
index 0000000000..3f69708fd5
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_quads.cpp
@@ -0,0 +1,290 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "layer_quads.h"
+
+#include <game/editor/editor.h>
+#include <game/editor/editor_actions.h>
+
+#include "image.h"
+
+CLayerQuads::CLayerQuads(CEditor *pEditor) :
+	CLayer(pEditor)
+{
+	m_Type = LAYERTYPE_QUADS;
+	m_aName[0] = '\0';
+	m_Image = -1;
+}
+
+CLayerQuads::CLayerQuads(const CLayerQuads &Other) :
+	CLayer(Other)
+{
+	m_Image = Other.m_Image;
+	m_vQuads = Other.m_vQuads;
+}
+
+CLayerQuads::~CLayerQuads() = default;
+
+void CLayerQuads::Render(bool QuadPicker)
+{
+	Graphics()->TextureClear();
+	if(m_Image >= 0 && (size_t)m_Image < m_pEditor->m_Map.m_vpImages.size())
+		Graphics()->TextureSet(m_pEditor->m_Map.m_vpImages[m_Image]->m_Texture);
+
+	Graphics()->BlendNone();
+	m_pEditor->RenderTools()->ForceRenderQuads(m_vQuads.data(), m_vQuads.size(), LAYERRENDERFLAG_OPAQUE, CEditor::EnvelopeEval, m_pEditor);
+	Graphics()->BlendNormal();
+	m_pEditor->RenderTools()->ForceRenderQuads(m_vQuads.data(), m_vQuads.size(), LAYERRENDERFLAG_TRANSPARENT, CEditor::EnvelopeEval, m_pEditor);
+}
+
+CQuad *CLayerQuads::NewQuad(int x, int y, int Width, int Height)
+{
+	m_pEditor->m_Map.OnModify();
+
+	m_vQuads.emplace_back();
+	CQuad *pQuad = &m_vQuads[m_vQuads.size() - 1];
+
+	pQuad->m_PosEnv = -1;
+	pQuad->m_ColorEnv = -1;
+	pQuad->m_PosEnvOffset = 0;
+	pQuad->m_ColorEnvOffset = 0;
+
+	Width /= 2;
+	Height /= 2;
+	pQuad->m_aPoints[0].x = i2fx(x - Width);
+	pQuad->m_aPoints[0].y = i2fx(y - Height);
+	pQuad->m_aPoints[1].x = i2fx(x + Width);
+	pQuad->m_aPoints[1].y = i2fx(y - Height);
+	pQuad->m_aPoints[2].x = i2fx(x - Width);
+	pQuad->m_aPoints[2].y = i2fx(y + Height);
+	pQuad->m_aPoints[3].x = i2fx(x + Width);
+	pQuad->m_aPoints[3].y = i2fx(y + Height);
+
+	pQuad->m_aPoints[4].x = i2fx(x); // pivot
+	pQuad->m_aPoints[4].y = i2fx(y);
+
+	pQuad->m_aTexcoords[0].x = i2fx(0);
+	pQuad->m_aTexcoords[0].y = i2fx(0);
+
+	pQuad->m_aTexcoords[1].x = i2fx(1);
+	pQuad->m_aTexcoords[1].y = i2fx(0);
+
+	pQuad->m_aTexcoords[2].x = i2fx(0);
+	pQuad->m_aTexcoords[2].y = i2fx(1);
+
+	pQuad->m_aTexcoords[3].x = i2fx(1);
+	pQuad->m_aTexcoords[3].y = i2fx(1);
+
+	pQuad->m_aColors[0].r = 255;
+	pQuad->m_aColors[0].g = 255;
+	pQuad->m_aColors[0].b = 255;
+	pQuad->m_aColors[0].a = 255;
+	pQuad->m_aColors[1].r = 255;
+	pQuad->m_aColors[1].g = 255;
+	pQuad->m_aColors[1].b = 255;
+	pQuad->m_aColors[1].a = 255;
+	pQuad->m_aColors[2].r = 255;
+	pQuad->m_aColors[2].g = 255;
+	pQuad->m_aColors[2].b = 255;
+	pQuad->m_aColors[2].a = 255;
+	pQuad->m_aColors[3].r = 255;
+	pQuad->m_aColors[3].g = 255;
+	pQuad->m_aColors[3].b = 255;
+	pQuad->m_aColors[3].a = 255;
+
+	return pQuad;
+}
+
+void CLayerQuads::BrushSelecting(CUIRect Rect)
+{
+	// draw selection rectangle
+	IGraphics::CLineItem Array[4] = {
+		IGraphics::CLineItem(Rect.x, Rect.y, Rect.x + Rect.w, Rect.y),
+		IGraphics::CLineItem(Rect.x + Rect.w, Rect.y, Rect.x + Rect.w, Rect.y + Rect.h),
+		IGraphics::CLineItem(Rect.x + Rect.w, Rect.y + Rect.h, Rect.x, Rect.y + Rect.h),
+		IGraphics::CLineItem(Rect.x, Rect.y + Rect.h, Rect.x, Rect.y)};
+	Graphics()->TextureClear();
+	Graphics()->LinesBegin();
+	Graphics()->LinesDraw(Array, 4);
+	Graphics()->LinesEnd();
+}
+
+int CLayerQuads::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
+{
+	// create new layers
+	std::shared_ptr<CLayerQuads> pGrabbed = std::make_shared<CLayerQuads>(m_pEditor);
+	pGrabbed->m_Image = m_Image;
+	pBrush->AddLayer(pGrabbed);
+
+	//dbg_msg("", "%f %f %f %f", rect.x, rect.y, rect.w, rect.h);
+	for(const auto &Quad : m_vQuads)
+	{
+		float px = fx2f(Quad.m_aPoints[4].x);
+		float py = fx2f(Quad.m_aPoints[4].y);
+
+		if(px > Rect.x && px < Rect.x + Rect.w && py > Rect.y && py < Rect.y + Rect.h)
+		{
+			CQuad n = Quad;
+
+			for(auto &Point : n.m_aPoints)
+			{
+				Point.x -= f2fx(Rect.x);
+				Point.y -= f2fx(Rect.y);
+			}
+
+			pGrabbed->m_vQuads.push_back(n);
+		}
+	}
+
+	return pGrabbed->m_vQuads.empty() ? 0 : 1;
+}
+
+void CLayerQuads::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	std::shared_ptr<CLayerQuads> pQuadLayer = std::static_pointer_cast<CLayerQuads>(pBrush);
+	std::vector<CQuad> vAddedQuads;
+	for(const auto &Quad : pQuadLayer->m_vQuads)
+	{
+		CQuad n = Quad;
+
+		for(auto &Point : n.m_aPoints)
+		{
+			Point.x += f2fx(wx);
+			Point.y += f2fx(wy);
+		}
+
+		m_vQuads.push_back(n);
+		vAddedQuads.push_back(n);
+	}
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionQuadPlace>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], vAddedQuads));
+	m_pEditor->m_Map.OnModify();
+}
+
+void CLayerQuads::BrushFlipX()
+{
+	for(auto &Quad : m_vQuads)
+	{
+		std::swap(Quad.m_aPoints[0], Quad.m_aPoints[1]);
+		std::swap(Quad.m_aPoints[2], Quad.m_aPoints[3]);
+	}
+	m_pEditor->m_Map.OnModify();
+}
+
+void CLayerQuads::BrushFlipY()
+{
+	for(auto &Quad : m_vQuads)
+	{
+		std::swap(Quad.m_aPoints[0], Quad.m_aPoints[2]);
+		std::swap(Quad.m_aPoints[1], Quad.m_aPoints[3]);
+	}
+	m_pEditor->m_Map.OnModify();
+}
+
+void Rotate(vec2 *pCenter, vec2 *pPoint, float Rotation)
+{
+	float x = pPoint->x - pCenter->x;
+	float y = pPoint->y - pCenter->y;
+	pPoint->x = x * std::cos(Rotation) - y * std::sin(Rotation) + pCenter->x;
+	pPoint->y = x * std::sin(Rotation) + y * std::cos(Rotation) + pCenter->y;
+}
+
+void CLayerQuads::BrushRotate(float Amount)
+{
+	vec2 Center;
+	GetSize(&Center.x, &Center.y);
+	Center.x /= 2;
+	Center.y /= 2;
+
+	for(auto &Quad : m_vQuads)
+	{
+		for(auto &Point : Quad.m_aPoints)
+		{
+			vec2 Pos(fx2f(Point.x), fx2f(Point.y));
+			Rotate(&Center, &Pos, Amount);
+			Point.x = f2fx(Pos.x);
+			Point.y = f2fx(Pos.y);
+		}
+	}
+}
+
+void CLayerQuads::GetSize(float *pWidth, float *pHeight)
+{
+	*pWidth = 0;
+	*pHeight = 0;
+
+	for(const auto &Quad : m_vQuads)
+	{
+		for(const auto &Point : Quad.m_aPoints)
+		{
+			*pWidth = maximum(*pWidth, fx2f(Point.x));
+			*pHeight = maximum(*pHeight, fx2f(Point.y));
+		}
+	}
+}
+
+CUI::EPopupMenuFunctionResult CLayerQuads::RenderProperties(CUIRect *pToolBox)
+{
+	CProperty aProps[] = {
+		{"Image", m_Image, PROPTYPE_IMAGE, -1, 0},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)ELayerQuadsProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = m_pEditor->DoPropertiesWithState<ELayerQuadsProp>(pToolBox, aProps, s_aIds, &NewVal);
+	if(Prop != ELayerQuadsProp::PROP_NONE)
+	{
+		m_pEditor->m_Map.OnModify();
+	}
+
+	static CLayerQuadsPropTracker s_Tracker(m_pEditor);
+	s_Tracker.Begin(this, Prop, State);
+
+	if(Prop == ELayerQuadsProp::PROP_IMAGE)
+	{
+		if(NewVal >= 0)
+			m_Image = NewVal % m_pEditor->m_Map.m_vpImages.size();
+		else
+			m_Image = -1;
+	}
+
+	s_Tracker.End(Prop, State);
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CLayerQuads::ModifyImageIndex(FIndexModifyFunction Func)
+{
+	Func(&m_Image);
+}
+
+void CLayerQuads::ModifyEnvelopeIndex(FIndexModifyFunction Func)
+{
+	for(auto &Quad : m_vQuads)
+	{
+		Func(&Quad.m_PosEnv);
+		Func(&Quad.m_ColorEnv);
+	}
+}
+
+std::shared_ptr<CLayer> CLayerQuads::Duplicate() const
+{
+	return std::make_shared<CLayerQuads>(*this);
+}
+
+int CLayerQuads::SwapQuads(int Index0, int Index1)
+{
+	if(Index0 < 0 || Index0 >= (int)m_vQuads.size())
+		return Index0;
+	if(Index1 < 0 || Index1 >= (int)m_vQuads.size())
+		return Index0;
+	if(Index0 == Index1)
+		return Index0;
+	m_pEditor->m_Map.OnModify();
+	std::swap(m_vQuads[Index0], m_vQuads[Index1]);
+	return Index1;
+}
+
+const char *CLayerQuads::TypeName() const
+{
+	return "quads";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_quads.h b/src_bkp/game/editor/mapitems/layer_quads.h
new file mode 100644
index 0000000000..dd826b385e
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_quads.h
@@ -0,0 +1,37 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_QUADS_H
+#define GAME_EDITOR_MAPITEMS_LAYER_QUADS_H
+
+#include "layer.h"
+
+class CLayerQuads : public CLayer
+{
+public:
+	explicit CLayerQuads(CEditor *pEditor);
+	CLayerQuads(const CLayerQuads &Other);
+	~CLayerQuads();
+
+	void Render(bool QuadPicker = false) override;
+	CQuad *NewQuad(int x, int y, int Width, int Height);
+	int SwapQuads(int Index0, int Index1);
+
+	void BrushSelecting(CUIRect Rect) override;
+	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
+	void BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+
+	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+
+	void ModifyImageIndex(FIndexModifyFunction pfnFunc) override;
+	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
+
+	void GetSize(float *pWidth, float *pHeight) override;
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+	int m_Image;
+	std::vector<CQuad> m_vQuads;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_sounds.cpp b/src_bkp/game/editor/mapitems/layer_sounds.cpp
new file mode 100644
index 0000000000..ff8250617a
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_sounds.cpp
@@ -0,0 +1,242 @@
+#include "layer_sounds.h"
+
+#include <game/editor/editor.h>
+#include <game/editor/editor_actions.h>
+#include <game/generated/client_data.h>
+
+static const float s_SourceVisualSize = 32.0f;
+
+CLayerSounds::CLayerSounds(CEditor *pEditor) :
+	CLayer(pEditor)
+{
+	m_Type = LAYERTYPE_SOUNDS;
+	m_aName[0] = '\0';
+	m_Sound = -1;
+}
+
+CLayerSounds::CLayerSounds(const CLayerSounds &Other) :
+	CLayer(Other)
+{
+	m_Sound = Other.m_Sound;
+	m_vSources = Other.m_vSources;
+}
+
+CLayerSounds::~CLayerSounds() = default;
+
+void CLayerSounds::Render(bool Tileset)
+{
+	// TODO: nice texture
+	Graphics()->TextureClear();
+	Graphics()->BlendNormal();
+	Graphics()->QuadsBegin();
+
+	// draw falloff distance
+	Graphics()->SetColor(0.6f, 0.8f, 1.0f, 0.4f);
+	for(const auto &Source : m_vSources)
+	{
+		float OffsetX = 0;
+		float OffsetY = 0;
+
+		if(Source.m_PosEnv >= 0)
+		{
+			ColorRGBA Channels;
+			CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Channels, m_pEditor);
+			OffsetX = Channels.r;
+			OffsetY = Channels.g;
+		}
+
+		switch(Source.m_Shape.m_Type)
+		{
+		case CSoundShape::SHAPE_CIRCLE:
+		{
+			m_pEditor->Graphics()->DrawCircle(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY,
+				Source.m_Shape.m_Circle.m_Radius, 32);
+
+			float Falloff = ((float)Source.m_Falloff / 255.0f);
+			if(Falloff > 0.0f)
+				m_pEditor->Graphics()->DrawCircle(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY,
+					Source.m_Shape.m_Circle.m_Radius * Falloff, 32);
+			break;
+		}
+		case CSoundShape::SHAPE_RECTANGLE:
+		{
+			float Width = fx2f(Source.m_Shape.m_Rectangle.m_Width);
+			float Height = fx2f(Source.m_Shape.m_Rectangle.m_Height);
+			m_pEditor->Graphics()->DrawRectExt(fx2f(Source.m_Position.x) + OffsetX - Width / 2, fx2f(Source.m_Position.y) + OffsetY - Height / 2,
+				Width, Height, 0.0f, IGraphics::CORNER_NONE);
+
+			float Falloff = ((float)Source.m_Falloff / 255.0f);
+			if(Falloff > 0.0f)
+				m_pEditor->Graphics()->DrawRectExt(fx2f(Source.m_Position.x) + OffsetX - Falloff * Width / 2, fx2f(Source.m_Position.y) + OffsetY - Falloff * Height / 2,
+					Width * Falloff, Height * Falloff, 0.0f, IGraphics::CORNER_NONE);
+			break;
+		}
+		}
+	}
+
+	Graphics()->QuadsEnd();
+
+	// draw handles
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_AUDIO_SOURCE].m_Id);
+	Graphics()->QuadsBegin();
+
+	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
+	m_pEditor->RenderTools()->SelectSprite(SPRITE_AUDIO_SOURCE);
+	for(const auto &Source : m_vSources)
+	{
+		float OffsetX = 0;
+		float OffsetY = 0;
+
+		if(Source.m_PosEnv >= 0)
+		{
+			ColorRGBA Channels;
+			CEditor::EnvelopeEval(Source.m_PosEnvOffset, Source.m_PosEnv, Channels, m_pEditor);
+			OffsetX = Channels.r;
+			OffsetY = Channels.g;
+		}
+
+		m_pEditor->RenderTools()->DrawSprite(fx2f(Source.m_Position.x) + OffsetX, fx2f(Source.m_Position.y) + OffsetY, m_pEditor->MapView()->ScaleLength(s_SourceVisualSize));
+	}
+
+	Graphics()->QuadsEnd();
+}
+
+CSoundSource *CLayerSounds::NewSource(int x, int y)
+{
+	m_pEditor->m_Map.OnModify();
+
+	m_vSources.emplace_back();
+	CSoundSource *pSource = &m_vSources[m_vSources.size() - 1];
+
+	pSource->m_Position.x = f2fx(x);
+	pSource->m_Position.y = f2fx(y);
+
+	pSource->m_Loop = 1;
+	pSource->m_Pan = 1;
+	pSource->m_TimeDelay = 0;
+
+	pSource->m_PosEnv = -1;
+	pSource->m_PosEnvOffset = 0;
+	pSource->m_SoundEnv = -1;
+	pSource->m_SoundEnvOffset = 0;
+
+	pSource->m_Falloff = 80;
+
+	pSource->m_Shape.m_Type = CSoundShape::SHAPE_CIRCLE;
+	pSource->m_Shape.m_Circle.m_Radius = 1500;
+
+	return pSource;
+}
+
+void CLayerSounds::BrushSelecting(CUIRect Rect)
+{
+	// draw selection rectangle
+	IGraphics::CLineItem Array[4] = {
+		IGraphics::CLineItem(Rect.x, Rect.y, Rect.x + Rect.w, Rect.y),
+		IGraphics::CLineItem(Rect.x + Rect.w, Rect.y, Rect.x + Rect.w, Rect.y + Rect.h),
+		IGraphics::CLineItem(Rect.x + Rect.w, Rect.y + Rect.h, Rect.x, Rect.y + Rect.h),
+		IGraphics::CLineItem(Rect.x, Rect.y + Rect.h, Rect.x, Rect.y)};
+	Graphics()->TextureClear();
+	Graphics()->LinesBegin();
+	Graphics()->LinesDraw(Array, 4);
+	Graphics()->LinesEnd();
+}
+
+int CLayerSounds::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
+{
+	// create new layer
+	std::shared_ptr<CLayerSounds> pGrabbed = std::make_shared<CLayerSounds>(m_pEditor);
+	pGrabbed->m_Sound = m_Sound;
+	pBrush->AddLayer(pGrabbed);
+
+	for(const auto &Source : m_vSources)
+	{
+		float px = fx2f(Source.m_Position.x);
+		float py = fx2f(Source.m_Position.y);
+
+		if(px > Rect.x && px < Rect.x + Rect.w && py > Rect.y && py < Rect.y + Rect.h)
+		{
+			CSoundSource n = Source;
+
+			n.m_Position.x -= f2fx(Rect.x);
+			n.m_Position.y -= f2fx(Rect.y);
+
+			pGrabbed->m_vSources.push_back(n);
+		}
+	}
+
+	return pGrabbed->m_vSources.empty() ? 0 : 1;
+}
+
+void CLayerSounds::BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	std::shared_ptr<CLayerSounds> pSoundLayer = std::static_pointer_cast<CLayerSounds>(pBrush);
+	std::vector<CSoundSource> vAddedSources;
+	for(const auto &Source : pSoundLayer->m_vSources)
+	{
+		CSoundSource n = Source;
+
+		n.m_Position.x += f2fx(wx);
+		n.m_Position.y += f2fx(wy);
+
+		m_vSources.push_back(n);
+		vAddedSources.push_back(n);
+	}
+	m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionSoundPlace>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], vAddedSources));
+	m_pEditor->m_Map.OnModify();
+}
+
+CUI::EPopupMenuFunctionResult CLayerSounds::RenderProperties(CUIRect *pToolBox)
+{
+	CProperty aProps[] = {
+		{"Sound", m_Sound, PROPTYPE_SOUND, -1, 0},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)ELayerSoundsProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = m_pEditor->DoPropertiesWithState<ELayerSoundsProp>(pToolBox, aProps, s_aIds, &NewVal);
+	if(Prop != ELayerSoundsProp::PROP_NONE)
+	{
+		m_pEditor->m_Map.OnModify();
+	}
+
+	static CLayerSoundsPropTracker s_Tracker(m_pEditor);
+	s_Tracker.Begin(this, Prop, State);
+
+	if(Prop == ELayerSoundsProp::PROP_SOUND)
+	{
+		if(NewVal >= 0)
+			m_Sound = NewVal % m_pEditor->m_Map.m_vpSounds.size();
+		else
+			m_Sound = -1;
+	}
+
+	s_Tracker.End(Prop, State);
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CLayerSounds::ModifySoundIndex(FIndexModifyFunction Func)
+{
+	Func(&m_Sound);
+}
+
+void CLayerSounds::ModifyEnvelopeIndex(FIndexModifyFunction Func)
+{
+	for(auto &Source : m_vSources)
+	{
+		Func(&Source.m_SoundEnv);
+		Func(&Source.m_PosEnv);
+	}
+}
+
+std::shared_ptr<CLayer> CLayerSounds::Duplicate() const
+{
+	return std::make_shared<CLayerSounds>(*this);
+}
+
+const char *CLayerSounds::TypeName() const
+{
+	return "sounds";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_sounds.h b/src_bkp/game/editor/mapitems/layer_sounds.h
new file mode 100644
index 0000000000..bc71b13642
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_sounds.h
@@ -0,0 +1,32 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_SOUNDS_H
+#define GAME_EDITOR_MAPITEMS_LAYER_SOUNDS_H
+
+#include "layer.h"
+
+class CLayerSounds : public CLayer
+{
+public:
+	explicit CLayerSounds(CEditor *pEditor);
+	CLayerSounds(const CLayerSounds &Other);
+	~CLayerSounds();
+
+	void Render(bool Tileset = false) override;
+	CSoundSource *NewSource(int x, int y);
+
+	void BrushSelecting(CUIRect Rect) override;
+	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
+	void BrushPlace(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+
+	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+
+	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
+	void ModifySoundIndex(FIndexModifyFunction pfnFunc) override;
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+	int m_Sound;
+	std::vector<CSoundSource> m_vSources;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_speedup.cpp b/src_bkp/game/editor/mapitems/layer_speedup.cpp
new file mode 100644
index 0000000000..02795a4316
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_speedup.cpp
@@ -0,0 +1,307 @@
+#include "layer_speedup.h"
+
+#include <game/editor/editor.h>
+
+CLayerSpeedup::CLayerSpeedup(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Speedup");
+	m_Speedup = 1;
+
+	m_pSpeedupTile = new CSpeedupTile[w * h];
+	mem_zero(m_pSpeedupTile, (size_t)w * h * sizeof(CSpeedupTile));
+}
+
+CLayerSpeedup::CLayerSpeedup(const CLayerSpeedup &Other) :
+	CLayerTiles(Other)
+{
+	str_copy(m_aName, "Speedup copy");
+	m_Speedup = 1;
+
+	m_pSpeedupTile = new CSpeedupTile[m_Width * m_Height];
+	mem_copy(m_pSpeedupTile, Other.m_pSpeedupTile, (size_t)m_Width * m_Height * sizeof(CSpeedupTile));
+}
+
+CLayerSpeedup::~CLayerSpeedup()
+{
+	delete[] m_pSpeedupTile;
+}
+
+void CLayerSpeedup::Resize(int NewW, int NewH)
+{
+	// resize speedup data
+	CSpeedupTile *pNewSpeedupData = new CSpeedupTile[NewW * NewH];
+	mem_zero(pNewSpeedupData, (size_t)NewW * NewH * sizeof(CSpeedupTile));
+
+	// copy old data
+	for(int y = 0; y < minimum(NewH, m_Height); y++)
+		mem_copy(&pNewSpeedupData[y * NewW], &m_pSpeedupTile[y * m_Width], minimum(m_Width, NewW) * sizeof(CSpeedupTile));
+
+	// replace old
+	delete[] m_pSpeedupTile;
+	m_pSpeedupTile = pNewSpeedupData;
+
+	// resize tile data
+	CLayerTiles::Resize(NewW, NewH);
+
+	// resize gamelayer too
+	if(m_pEditor->m_Map.m_pGameLayer->m_Width != NewW || m_pEditor->m_Map.m_pGameLayer->m_Height != NewH)
+		m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
+}
+
+void CLayerSpeedup::Shift(int Direction)
+{
+	CLayerTiles::Shift(Direction);
+	ShiftImpl(m_pSpeedupTile, Direction, m_pEditor->m_ShiftBy);
+}
+
+bool CLayerSpeedup::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
+{
+	for(int y = 0; y < pLayer->m_Height; y++)
+		for(int x = 0; x < pLayer->m_Width; x++)
+			if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidSpeedupTile(pLayer->GetTile(x, y).m_Index))
+				return false;
+
+	return true;
+}
+
+void CLayerSpeedup::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	if(m_Readonly)
+		return;
+
+	std::shared_ptr<CLayerSpeedup> pSpeedupLayer = std::static_pointer_cast<CLayerSpeedup>(pBrush);
+	int sx = ConvertX(wx);
+	int sy = ConvertY(wy);
+	if(str_comp(pSpeedupLayer->m_aFileName, m_pEditor->m_aFileName))
+	{
+		m_pEditor->m_SpeedupAngle = pSpeedupLayer->m_SpeedupAngle;
+		m_pEditor->m_SpeedupForce = pSpeedupLayer->m_SpeedupForce;
+		m_pEditor->m_SpeedupMaxSpeed = pSpeedupLayer->m_SpeedupMaxSpeed;
+	}
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pSpeedupLayer);
+
+	for(int y = 0; y < pSpeedupLayer->m_Height; y++)
+		for(int x = 0; x < pSpeedupLayer->m_Width; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			int Index = fy * m_Width + fx;
+			SSpeedupTileStateChange::SData Previous{
+				m_pSpeedupTile[Index].m_Force,
+				m_pSpeedupTile[Index].m_Angle,
+				m_pSpeedupTile[Index].m_MaxSpeed,
+				m_pSpeedupTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			if((m_pEditor->m_AllowPlaceUnusedTiles || IsValidSpeedupTile(pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index)) && pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index != TILE_AIR)
+			{
+				if(m_pEditor->m_SpeedupAngle != pSpeedupLayer->m_SpeedupAngle || m_pEditor->m_SpeedupForce != pSpeedupLayer->m_SpeedupForce || m_pEditor->m_SpeedupMaxSpeed != pSpeedupLayer->m_SpeedupMaxSpeed)
+				{
+					m_pSpeedupTile[Index].m_Force = m_pEditor->m_SpeedupForce;
+					m_pSpeedupTile[Index].m_MaxSpeed = m_pEditor->m_SpeedupMaxSpeed;
+					m_pSpeedupTile[Index].m_Angle = m_pEditor->m_SpeedupAngle;
+					m_pSpeedupTile[Index].m_Type = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+					m_pTiles[Index].m_Index = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+				}
+				else if(pSpeedupLayer->m_pSpeedupTile[y * pSpeedupLayer->m_Width + x].m_Force)
+				{
+					m_pSpeedupTile[Index].m_Force = pSpeedupLayer->m_pSpeedupTile[y * pSpeedupLayer->m_Width + x].m_Force;
+					m_pSpeedupTile[Index].m_Angle = pSpeedupLayer->m_pSpeedupTile[y * pSpeedupLayer->m_Width + x].m_Angle;
+					m_pSpeedupTile[Index].m_MaxSpeed = pSpeedupLayer->m_pSpeedupTile[y * pSpeedupLayer->m_Width + x].m_MaxSpeed;
+					m_pSpeedupTile[Index].m_Type = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+					m_pTiles[Index].m_Index = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+				}
+				else if(m_pEditor->m_SpeedupForce)
+				{
+					m_pSpeedupTile[Index].m_Force = m_pEditor->m_SpeedupForce;
+					m_pSpeedupTile[Index].m_MaxSpeed = m_pEditor->m_SpeedupMaxSpeed;
+					m_pSpeedupTile[Index].m_Angle = m_pEditor->m_SpeedupAngle;
+					m_pSpeedupTile[Index].m_Type = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+					m_pTiles[Index].m_Index = pSpeedupLayer->m_pTiles[y * pSpeedupLayer->m_Width + x].m_Index;
+				}
+				else
+				{
+					m_pSpeedupTile[Index].m_Force = 0;
+					m_pSpeedupTile[Index].m_MaxSpeed = 0;
+					m_pSpeedupTile[Index].m_Angle = 0;
+					m_pSpeedupTile[Index].m_Type = 0;
+					m_pTiles[Index].m_Index = 0;
+				}
+			}
+			else
+			{
+				m_pSpeedupTile[Index].m_Force = 0;
+				m_pSpeedupTile[Index].m_MaxSpeed = 0;
+				m_pSpeedupTile[Index].m_Angle = 0;
+				m_pSpeedupTile[Index].m_Type = 0;
+				m_pTiles[Index].m_Index = 0;
+			}
+
+			SSpeedupTileStateChange::SData Current{
+				m_pSpeedupTile[Index].m_Force,
+				m_pSpeedupTile[Index].m_Angle,
+				m_pSpeedupTile[Index].m_MaxSpeed,
+				m_pSpeedupTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	FlagModified(sx, sy, pSpeedupLayer->m_Width, pSpeedupLayer->m_Height);
+}
+
+void CLayerSpeedup::RecordStateChange(int x, int y, SSpeedupTileStateChange::SData Previous, SSpeedupTileStateChange::SData Current)
+{
+	if(!m_History[y][x].m_Changed)
+		m_History[y][x] = SSpeedupTileStateChange{true, Previous, Current};
+	else
+		m_History[y][x].m_Current = Current;
+}
+
+void CLayerSpeedup::BrushFlipX()
+{
+	CLayerTiles::BrushFlipX();
+	BrushFlipXImpl(m_pSpeedupTile);
+}
+
+void CLayerSpeedup::BrushFlipY()
+{
+	CLayerTiles::BrushFlipY();
+	BrushFlipYImpl(m_pSpeedupTile);
+}
+
+void CLayerSpeedup::BrushRotate(float Amount)
+{
+	int Rotation = (round_to_int(360.0f * Amount / (pi * 2)) / 90) % 4; // 0=0°, 1=90°, 2=180°, 3=270°
+	if(Rotation < 0)
+		Rotation += 4;
+
+	if(Rotation == 1 || Rotation == 3)
+	{
+		// 90° rotation
+		CSpeedupTile *pTempData1 = new CSpeedupTile[m_Width * m_Height];
+		CTile *pTempData2 = new CTile[m_Width * m_Height];
+		mem_copy(pTempData1, m_pSpeedupTile, (size_t)m_Width * m_Height * sizeof(CSpeedupTile));
+		mem_copy(pTempData2, m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+		CSpeedupTile *pDst1 = m_pSpeedupTile;
+		CTile *pDst2 = m_pTiles;
+		for(int x = 0; x < m_Width; ++x)
+			for(int y = m_Height - 1; y >= 0; --y, ++pDst1, ++pDst2)
+			{
+				*pDst1 = pTempData1[y * m_Width + x];
+				*pDst2 = pTempData2[y * m_Width + x];
+			}
+
+		std::swap(m_Width, m_Height);
+		delete[] pTempData1;
+		delete[] pTempData2;
+	}
+
+	if(Rotation == 2 || Rotation == 3)
+	{
+		BrushFlipX();
+		BrushFlipY();
+	}
+}
+
+void CLayerSpeedup::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect)
+{
+	if(m_Readonly || (!Empty && pBrush->m_Type != LAYERTYPE_TILES))
+		return;
+
+	Snap(&Rect); // corrects Rect; no need of <=
+
+	Snap(&Rect);
+
+	int sx = ConvertX(Rect.x);
+	int sy = ConvertY(Rect.y);
+	int w = ConvertX(Rect.w);
+	int h = ConvertY(Rect.h);
+
+	std::shared_ptr<CLayerSpeedup> pLt = std::static_pointer_cast<CLayerSpeedup>(pBrush);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || Empty || IsEmpty(pLt);
+
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			const int SrcIndex = Empty ? 0 : (y * pLt->m_Width + x % pLt->m_Width) % (pLt->m_Width * pLt->m_Height);
+			const int TgtIndex = fy * m_Width + fx;
+
+			SSpeedupTileStateChange::SData Previous{
+				m_pSpeedupTile[TgtIndex].m_Force,
+				m_pSpeedupTile[TgtIndex].m_Angle,
+				m_pSpeedupTile[TgtIndex].m_MaxSpeed,
+				m_pSpeedupTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			if(Empty || (!m_pEditor->m_AllowPlaceUnusedTiles && !IsValidSpeedupTile((pLt->m_pTiles[SrcIndex]).m_Index))) // no speed up tile chosen: reset
+			{
+				m_pTiles[TgtIndex].m_Index = 0;
+				m_pSpeedupTile[TgtIndex].m_Force = 0;
+				m_pSpeedupTile[TgtIndex].m_Angle = 0;
+			}
+			else
+			{
+				m_pTiles[TgtIndex] = pLt->m_pTiles[SrcIndex];
+				if(pLt->m_Speedup && m_pTiles[TgtIndex].m_Index > 0)
+				{
+					m_pSpeedupTile[TgtIndex].m_Type = m_pTiles[TgtIndex].m_Index;
+
+					if((pLt->m_pSpeedupTile[SrcIndex].m_Force == 0 && m_pEditor->m_SpeedupForce) || m_pEditor->m_SpeedupForce != pLt->m_SpeedupForce)
+						m_pSpeedupTile[TgtIndex].m_Force = m_pEditor->m_SpeedupForce;
+					else
+						m_pSpeedupTile[TgtIndex].m_Force = pLt->m_pSpeedupTile[SrcIndex].m_Force;
+
+					if((pLt->m_pSpeedupTile[SrcIndex].m_Angle == 0 && m_pEditor->m_SpeedupAngle) || m_pEditor->m_SpeedupAngle != pLt->m_SpeedupAngle)
+						m_pSpeedupTile[TgtIndex].m_Angle = m_pEditor->m_SpeedupAngle;
+					else
+						m_pSpeedupTile[TgtIndex].m_Angle = pLt->m_pSpeedupTile[SrcIndex].m_Angle;
+
+					if((pLt->m_pSpeedupTile[SrcIndex].m_MaxSpeed == 0 && m_pEditor->m_SpeedupMaxSpeed) || m_pEditor->m_SpeedupMaxSpeed != pLt->m_SpeedupMaxSpeed)
+						m_pSpeedupTile[TgtIndex].m_MaxSpeed = m_pEditor->m_SpeedupMaxSpeed;
+					else
+						m_pSpeedupTile[TgtIndex].m_MaxSpeed = pLt->m_pSpeedupTile[SrcIndex].m_MaxSpeed;
+				}
+			}
+
+			SSpeedupTileStateChange::SData Current{
+				m_pSpeedupTile[TgtIndex].m_Force,
+				m_pSpeedupTile[TgtIndex].m_Angle,
+				m_pSpeedupTile[TgtIndex].m_MaxSpeed,
+				m_pSpeedupTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	}
+	FlagModified(sx, sy, w, h);
+}
+
+std::shared_ptr<CLayer> CLayerSpeedup::Duplicate() const
+{
+	return std::make_shared<CLayerSpeedup>(*this);
+}
+
+const char *CLayerSpeedup::TypeName() const
+{
+	return "speedup";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_speedup.h b/src_bkp/game/editor/mapitems/layer_speedup.h
new file mode 100644
index 0000000000..990f488e7d
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_speedup.h
@@ -0,0 +1,54 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_SPEEDUP_H
+#define GAME_EDITOR_MAPITEMS_LAYER_SPEEDUP_H
+
+#include "layer_tiles.h"
+
+struct SSpeedupTileStateChange
+{
+	bool m_Changed;
+	struct SData
+	{
+		int m_Force;
+		int m_Angle;
+		int m_MaxSpeed;
+		int m_Type;
+		int m_Index;
+	} m_Previous, m_Current;
+};
+
+class CLayerSpeedup : public CLayerTiles
+{
+public:
+	CLayerSpeedup(CEditor *pEditor, int w, int h);
+	CLayerSpeedup(const CLayerSpeedup &Other);
+	~CLayerSpeedup();
+
+	CSpeedupTile *m_pSpeedupTile;
+	int m_SpeedupForce;
+	int m_SpeedupMaxSpeed;
+	int m_SpeedupAngle;
+
+	void Resize(int NewW, int NewH) override;
+	void Shift(int Direction) override;
+	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
+
+	EditorTileStateChangeHistory<SSpeedupTileStateChange> m_History;
+	void ClearHistory() override
+	{
+		CLayerTiles::ClearHistory();
+		m_History.clear();
+	}
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+private:
+	void RecordStateChange(int x, int y, SSpeedupTileStateChange::SData Previous, SSpeedupTileStateChange::SData Current);
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_switch.cpp b/src_bkp/game/editor/mapitems/layer_switch.cpp
new file mode 100644
index 0000000000..6d59903b6a
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_switch.cpp
@@ -0,0 +1,333 @@
+#include "layer_switch.h"
+
+#include <game/editor/editor.h>
+
+CLayerSwitch::CLayerSwitch(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Switch");
+	m_Switch = 1;
+
+	m_pSwitchTile = new CSwitchTile[w * h];
+	mem_zero(m_pSwitchTile, (size_t)w * h * sizeof(CSwitchTile));
+}
+
+CLayerSwitch::CLayerSwitch(const CLayerSwitch &Other) :
+	CLayerTiles(Other)
+{
+	str_copy(m_aName, "Switch copy");
+	m_Switch = 1;
+
+	m_pSwitchTile = new CSwitchTile[m_Width * m_Height];
+	mem_copy(m_pSwitchTile, Other.m_pSwitchTile, (size_t)m_Width * m_Height * sizeof(CSwitchTile));
+}
+
+CLayerSwitch::~CLayerSwitch()
+{
+	delete[] m_pSwitchTile;
+}
+
+void CLayerSwitch::Resize(int NewW, int NewH)
+{
+	// resize switch data
+	CSwitchTile *pNewSwitchData = new CSwitchTile[NewW * NewH];
+	mem_zero(pNewSwitchData, (size_t)NewW * NewH * sizeof(CSwitchTile));
+
+	// copy old data
+	for(int y = 0; y < minimum(NewH, m_Height); y++)
+		mem_copy(&pNewSwitchData[y * NewW], &m_pSwitchTile[y * m_Width], minimum(m_Width, NewW) * sizeof(CSwitchTile));
+
+	// replace old
+	delete[] m_pSwitchTile;
+	m_pSwitchTile = pNewSwitchData;
+
+	// resize tile data
+	CLayerTiles::Resize(NewW, NewH);
+
+	// resize gamelayer too
+	if(m_pEditor->m_Map.m_pGameLayer->m_Width != NewW || m_pEditor->m_Map.m_pGameLayer->m_Height != NewH)
+		m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
+}
+
+void CLayerSwitch::Shift(int Direction)
+{
+	CLayerTiles::Shift(Direction);
+	ShiftImpl(m_pSwitchTile, Direction, m_pEditor->m_ShiftBy);
+}
+
+bool CLayerSwitch::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
+{
+	for(int y = 0; y < pLayer->m_Height; y++)
+		for(int x = 0; x < pLayer->m_Width; x++)
+			if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidSwitchTile(pLayer->GetTile(x, y).m_Index))
+				return false;
+
+	return true;
+}
+
+void CLayerSwitch::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	if(m_Readonly)
+		return;
+
+	std::shared_ptr<CLayerSwitch> pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(pBrush);
+	int sx = ConvertX(wx);
+	int sy = ConvertY(wy);
+	if(str_comp(pSwitchLayer->m_aFileName, m_pEditor->m_aFileName))
+	{
+		m_pEditor->m_SwitchNum = pSwitchLayer->m_SwitchNumber;
+		m_pEditor->m_SwitchDelay = pSwitchLayer->m_SwitchDelay;
+	}
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pSwitchLayer);
+
+	for(int y = 0; y < pSwitchLayer->m_Height; y++)
+		for(int x = 0; x < pSwitchLayer->m_Width; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			int Index = fy * m_Width + fx;
+			SSwitchTileStateChange::SData Previous{
+				m_pSwitchTile[Index].m_Number,
+				m_pSwitchTile[Index].m_Type,
+				m_pSwitchTile[Index].m_Flags,
+				m_pSwitchTile[Index].m_Delay,
+				m_pTiles[Index].m_Index};
+
+			if((m_pEditor->m_AllowPlaceUnusedTiles || IsValidSwitchTile(pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index)) && pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index != TILE_AIR)
+			{
+				if(m_pEditor->m_SwitchNum != pSwitchLayer->m_SwitchNumber || m_pEditor->m_SwitchDelay != pSwitchLayer->m_SwitchDelay)
+				{
+					m_pSwitchTile[Index].m_Number = m_pEditor->m_SwitchNum;
+					m_pSwitchTile[Index].m_Delay = m_pEditor->m_SwitchDelay;
+				}
+				else if(pSwitchLayer->m_pSwitchTile[y * pSwitchLayer->m_Width + x].m_Number)
+				{
+					m_pSwitchTile[Index].m_Number = pSwitchLayer->m_pSwitchTile[y * pSwitchLayer->m_Width + x].m_Number;
+					m_pSwitchTile[Index].m_Delay = pSwitchLayer->m_pSwitchTile[y * pSwitchLayer->m_Width + x].m_Delay;
+				}
+				else
+				{
+					m_pSwitchTile[Index].m_Number = m_pEditor->m_SwitchNum;
+					m_pSwitchTile[Index].m_Delay = m_pEditor->m_SwitchDelay;
+				}
+
+				m_pSwitchTile[Index].m_Type = pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index;
+				m_pSwitchTile[Index].m_Flags = pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Flags;
+				m_pTiles[Index].m_Index = pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index;
+				m_pTiles[Index].m_Flags = pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Flags;
+
+				if(!IsSwitchTileFlagsUsed(pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index))
+				{
+					m_pSwitchTile[Index].m_Flags = 0;
+				}
+				if(!IsSwitchTileNumberUsed(pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index))
+				{
+					m_pSwitchTile[Index].m_Number = 0;
+				}
+				if(!IsSwitchTileDelayUsed(pSwitchLayer->m_pTiles[y * pSwitchLayer->m_Width + x].m_Index))
+				{
+					m_pSwitchTile[Index].m_Delay = 0;
+				}
+			}
+			else
+			{
+				m_pSwitchTile[Index].m_Number = 0;
+				m_pSwitchTile[Index].m_Type = 0;
+				m_pSwitchTile[Index].m_Flags = 0;
+				m_pSwitchTile[Index].m_Delay = 0;
+				m_pTiles[Index].m_Index = 0;
+			}
+
+			SSwitchTileStateChange::SData Current{
+				m_pSwitchTile[Index].m_Number,
+				m_pSwitchTile[Index].m_Type,
+				m_pSwitchTile[Index].m_Flags,
+				m_pSwitchTile[Index].m_Delay,
+				m_pTiles[Index].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	FlagModified(sx, sy, pSwitchLayer->m_Width, pSwitchLayer->m_Height);
+}
+
+void CLayerSwitch::RecordStateChange(int x, int y, SSwitchTileStateChange::SData Previous, SSwitchTileStateChange::SData Current)
+{
+	if(!m_History[y][x].m_Changed)
+		m_History[y][x] = SSwitchTileStateChange{true, Previous, Current};
+	else
+		m_History[y][x].m_Current = Current;
+}
+
+void CLayerSwitch::BrushFlipX()
+{
+	CLayerTiles::BrushFlipX();
+	BrushFlipXImpl(m_pSwitchTile);
+}
+
+void CLayerSwitch::BrushFlipY()
+{
+	CLayerTiles::BrushFlipY();
+	BrushFlipYImpl(m_pSwitchTile);
+}
+
+void CLayerSwitch::BrushRotate(float Amount)
+{
+	int Rotation = (round_to_int(360.0f * Amount / (pi * 2)) / 90) % 4; // 0=0°, 1=90°, 2=180°, 3=270°
+	if(Rotation < 0)
+		Rotation += 4;
+
+	if(Rotation == 1 || Rotation == 3)
+	{
+		// 90° rotation
+		CSwitchTile *pTempData1 = new CSwitchTile[m_Width * m_Height];
+		CTile *pTempData2 = new CTile[m_Width * m_Height];
+		mem_copy(pTempData1, m_pSwitchTile, (size_t)m_Width * m_Height * sizeof(CSwitchTile));
+		mem_copy(pTempData2, m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+		CSwitchTile *pDst1 = m_pSwitchTile;
+		CTile *pDst2 = m_pTiles;
+		for(int x = 0; x < m_Width; ++x)
+			for(int y = m_Height - 1; y >= 0; --y, ++pDst1, ++pDst2)
+			{
+				*pDst1 = pTempData1[y * m_Width + x];
+				*pDst2 = pTempData2[y * m_Width + x];
+				if(IsRotatableTile(pDst2->m_Index))
+				{
+					if(pDst2->m_Flags & TILEFLAG_ROTATE)
+						pDst2->m_Flags ^= (TILEFLAG_YFLIP | TILEFLAG_XFLIP);
+					pDst2->m_Flags ^= TILEFLAG_ROTATE;
+				}
+			}
+
+		std::swap(m_Width, m_Height);
+		delete[] pTempData1;
+		delete[] pTempData2;
+	}
+
+	if(Rotation == 2 || Rotation == 3)
+	{
+		BrushFlipX();
+		BrushFlipY();
+	}
+}
+
+void CLayerSwitch::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect)
+{
+	if(m_Readonly || (!Empty && pBrush->m_Type != LAYERTYPE_TILES))
+		return;
+
+	Snap(&Rect); // corrects Rect; no need of <=
+
+	Snap(&Rect);
+
+	int sx = ConvertX(Rect.x);
+	int sy = ConvertY(Rect.y);
+	int w = ConvertX(Rect.w);
+	int h = ConvertY(Rect.h);
+
+	std::shared_ptr<CLayerSwitch> pLt = std::static_pointer_cast<CLayerSwitch>(pBrush);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || Empty || IsEmpty(pLt);
+
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			const int SrcIndex = Empty ? 0 : (y * pLt->m_Width + x % pLt->m_Width) % (pLt->m_Width * pLt->m_Height);
+			const int TgtIndex = fy * m_Width + fx;
+
+			SSwitchTileStateChange::SData Previous{
+				m_pSwitchTile[TgtIndex].m_Number,
+				m_pSwitchTile[TgtIndex].m_Type,
+				m_pSwitchTile[TgtIndex].m_Flags,
+				m_pSwitchTile[TgtIndex].m_Delay,
+				m_pTiles[TgtIndex].m_Index};
+
+			if(Empty || (!m_pEditor->m_AllowPlaceUnusedTiles && !IsValidSwitchTile((pLt->m_pTiles[SrcIndex]).m_Index)))
+			{
+				m_pTiles[TgtIndex].m_Index = 0;
+				m_pSwitchTile[TgtIndex].m_Type = 0;
+				m_pSwitchTile[TgtIndex].m_Number = 0;
+				m_pSwitchTile[TgtIndex].m_Delay = 0;
+			}
+			else
+			{
+				m_pTiles[TgtIndex] = pLt->m_pTiles[SrcIndex];
+				m_pSwitchTile[TgtIndex].m_Type = m_pTiles[TgtIndex].m_Index;
+				if(pLt->m_Switch && m_pTiles[TgtIndex].m_Index > 0)
+				{
+					if(!IsSwitchTileNumberUsed(m_pSwitchTile[TgtIndex].m_Type))
+						m_pSwitchTile[TgtIndex].m_Number = 0;
+					else if(pLt->m_pSwitchTile[SrcIndex].m_Number == 0 || m_pEditor->m_SwitchNum != pLt->m_SwitchNumber)
+						m_pSwitchTile[TgtIndex].m_Number = m_pEditor->m_SwitchNum;
+					else
+						m_pSwitchTile[TgtIndex].m_Number = pLt->m_pSwitchTile[SrcIndex].m_Number;
+
+					if(!IsSwitchTileDelayUsed(m_pSwitchTile[TgtIndex].m_Type))
+						m_pSwitchTile[TgtIndex].m_Delay = 0;
+					else if(pLt->m_pSwitchTile[SrcIndex].m_Delay == 0 || m_pEditor->m_SwitchDelay != pLt->m_SwitchDelay)
+						m_pSwitchTile[TgtIndex].m_Delay = m_pEditor->m_SwitchDelay;
+					else
+						m_pSwitchTile[TgtIndex].m_Delay = pLt->m_pSwitchTile[SrcIndex].m_Delay;
+
+					if(!IsSwitchTileFlagsUsed(m_pSwitchTile[TgtIndex].m_Type))
+						m_pSwitchTile[TgtIndex].m_Flags = 0;
+					else
+						m_pSwitchTile[TgtIndex].m_Flags = pLt->m_pSwitchTile[SrcIndex].m_Flags;
+				}
+			}
+
+			SSwitchTileStateChange::SData Current{
+				m_pSwitchTile[TgtIndex].m_Number,
+				m_pSwitchTile[TgtIndex].m_Type,
+				m_pSwitchTile[TgtIndex].m_Flags,
+				m_pSwitchTile[TgtIndex].m_Delay,
+				m_pTiles[TgtIndex].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	}
+	FlagModified(sx, sy, w, h);
+}
+
+bool CLayerSwitch::ContainsElementWithId(int Id)
+{
+	for(int y = 0; y < m_Height; ++y)
+	{
+		for(int x = 0; x < m_Width; ++x)
+		{
+			if(IsSwitchTileNumberUsed(m_pSwitchTile[y * m_Width + x].m_Type) && m_pSwitchTile[y * m_Width + x].m_Number == Id)
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+std::shared_ptr<CLayer> CLayerSwitch::Duplicate() const
+{
+	return std::make_shared<CLayerSwitch>(*this);
+}
+
+const char *CLayerSwitch::TypeName() const
+{
+	return "switch";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_switch.h b/src_bkp/game/editor/mapitems/layer_switch.h
new file mode 100644
index 0000000000..7a8aae79b2
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_switch.h
@@ -0,0 +1,54 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_SWITCH_H
+#define GAME_EDITOR_MAPITEMS_LAYER_SWITCH_H
+
+#include "layer_tiles.h"
+
+struct SSwitchTileStateChange
+{
+	bool m_Changed;
+	struct SData
+	{
+		int m_Number;
+		int m_Type;
+		int m_Flags;
+		int m_Delay;
+		int m_Index;
+	} m_Previous, m_Current;
+};
+
+class CLayerSwitch : public CLayerTiles
+{
+public:
+	CLayerSwitch(CEditor *pEditor, int w, int h);
+	CLayerSwitch(const CLayerSwitch &Other);
+	~CLayerSwitch();
+
+	CSwitchTile *m_pSwitchTile;
+	unsigned char m_SwitchNumber;
+	unsigned char m_SwitchDelay;
+
+	void Resize(int NewW, int NewH) override;
+	void Shift(int Direction) override;
+	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
+	virtual bool ContainsElementWithId(int Id);
+
+	EditorTileStateChangeHistory<SSwitchTileStateChange> m_History;
+	inline void ClearHistory() override
+	{
+		CLayerTiles::ClearHistory();
+		m_History.clear();
+	}
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+private:
+	void RecordStateChange(int x, int y, SSwitchTileStateChange::SData Previous, SSwitchTileStateChange::SData Current);
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_tele.cpp b/src_bkp/game/editor/mapitems/layer_tele.cpp
new file mode 100644
index 0000000000..0006a74c90
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tele.cpp
@@ -0,0 +1,313 @@
+#include "layer_tele.h"
+
+#include <game/editor/editor.h>
+
+CLayerTele::CLayerTele(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Tele");
+	m_Tele = 1;
+
+	m_pTeleTile = new CTeleTile[w * h];
+	mem_zero(m_pTeleTile, (size_t)w * h * sizeof(CTeleTile));
+}
+
+CLayerTele::CLayerTele(const CLayerTele &Other) :
+	CLayerTiles(Other)
+{
+	str_copy(m_aName, "Tele copy");
+	m_Tele = 1;
+
+	m_pTeleTile = new CTeleTile[m_Width * m_Height];
+	mem_copy(m_pTeleTile, Other.m_pTeleTile, (size_t)m_Width * m_Height * sizeof(CTeleTile));
+}
+
+CLayerTele::~CLayerTele()
+{
+	delete[] m_pTeleTile;
+}
+
+void CLayerTele::Resize(int NewW, int NewH)
+{
+	// resize tele data
+	CTeleTile *pNewTeleData = new CTeleTile[NewW * NewH];
+	mem_zero(pNewTeleData, (size_t)NewW * NewH * sizeof(CTeleTile));
+
+	// copy old data
+	for(int y = 0; y < minimum(NewH, m_Height); y++)
+		mem_copy(&pNewTeleData[y * NewW], &m_pTeleTile[y * m_Width], minimum(m_Width, NewW) * sizeof(CTeleTile));
+
+	// replace old
+	delete[] m_pTeleTile;
+	m_pTeleTile = pNewTeleData;
+
+	// resize tile data
+	CLayerTiles::Resize(NewW, NewH);
+
+	// resize gamelayer too
+	if(m_pEditor->m_Map.m_pGameLayer->m_Width != NewW || m_pEditor->m_Map.m_pGameLayer->m_Height != NewH)
+		m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
+}
+
+void CLayerTele::Shift(int Direction)
+{
+	CLayerTiles::Shift(Direction);
+	ShiftImpl(m_pTeleTile, Direction, m_pEditor->m_ShiftBy);
+}
+
+bool CLayerTele::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
+{
+	for(int y = 0; y < pLayer->m_Height; y++)
+		for(int x = 0; x < pLayer->m_Width; x++)
+			if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidTeleTile(pLayer->GetTile(x, y).m_Index))
+				return false;
+
+	return true;
+}
+
+void CLayerTele::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	if(m_Readonly)
+		return;
+
+	std::shared_ptr<CLayerTele> pTeleLayer = std::static_pointer_cast<CLayerTele>(pBrush);
+	int sx = ConvertX(wx);
+	int sy = ConvertY(wy);
+	if(str_comp(pTeleLayer->m_aFileName, m_pEditor->m_aFileName))
+		m_pEditor->m_TeleNumber = pTeleLayer->m_TeleNum;
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pTeleLayer);
+
+	for(int y = 0; y < pTeleLayer->m_Height; y++)
+		for(int x = 0; x < pTeleLayer->m_Width; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			int Index = fy * m_Width + fx;
+			STeleTileStateChange::SData Previous{
+				m_pTeleTile[Index].m_Number,
+				m_pTeleTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			if((m_pEditor->m_AllowPlaceUnusedTiles || IsValidTeleTile(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index)) && pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index != TILE_AIR)
+			{
+				if(!IsTeleTileNumberUsed(pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index))
+				{
+					// Tele tile number is unused. Set a known value which is not 0,
+					// as tiles with number 0 would be ignored by previous versions.
+					m_pTeleTile[Index].m_Number = 255;
+				}
+				else if(m_pEditor->m_TeleNumber != pTeleLayer->m_TeleNum)
+				{
+					m_pTeleTile[Index].m_Number = m_pEditor->m_TeleNumber;
+				}
+				else if(pTeleLayer->m_pTeleTile[y * pTeleLayer->m_Width + x].m_Number)
+				{
+					m_pTeleTile[Index].m_Number = pTeleLayer->m_pTeleTile[y * pTeleLayer->m_Width + x].m_Number;
+				}
+				else
+				{
+					if(!m_pEditor->m_TeleNumber)
+					{
+						m_pTeleTile[Index].m_Number = 0;
+						m_pTeleTile[Index].m_Type = 0;
+						m_pTiles[Index].m_Index = 0;
+
+						STeleTileStateChange::SData Current{
+							m_pTeleTile[Index].m_Number,
+							m_pTeleTile[Index].m_Type,
+							m_pTiles[Index].m_Index};
+
+						RecordStateChange(fx, fy, Previous, Current);
+						continue;
+					}
+					else
+					{
+						m_pTeleTile[Index].m_Number = m_pEditor->m_TeleNumber;
+					}
+				}
+
+				m_pTeleTile[Index].m_Type = pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index;
+				m_pTiles[Index].m_Index = pTeleLayer->m_pTiles[y * pTeleLayer->m_Width + x].m_Index;
+			}
+			else
+			{
+				m_pTeleTile[Index].m_Number = 0;
+				m_pTeleTile[Index].m_Type = 0;
+				m_pTiles[Index].m_Index = 0;
+			}
+
+			STeleTileStateChange::SData Current{
+				m_pTeleTile[Index].m_Number,
+				m_pTeleTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	FlagModified(sx, sy, pTeleLayer->m_Width, pTeleLayer->m_Height);
+}
+
+void CLayerTele::RecordStateChange(int x, int y, STeleTileStateChange::SData Previous, STeleTileStateChange::SData Current)
+{
+	if(!m_History[y][x].m_Changed)
+		m_History[y][x] = STeleTileStateChange{true, Previous, Current};
+	else
+	{
+		m_History[y][x].m_Current = Current;
+	}
+}
+
+void CLayerTele::BrushFlipX()
+{
+	CLayerTiles::BrushFlipX();
+	BrushFlipXImpl(m_pTeleTile);
+}
+
+void CLayerTele::BrushFlipY()
+{
+	CLayerTiles::BrushFlipY();
+	BrushFlipYImpl(m_pTeleTile);
+}
+
+void CLayerTele::BrushRotate(float Amount)
+{
+	int Rotation = (round_to_int(360.0f * Amount / (pi * 2)) / 90) % 4; // 0=0°, 1=90°, 2=180°, 3=270°
+	if(Rotation < 0)
+		Rotation += 4;
+
+	if(Rotation == 1 || Rotation == 3)
+	{
+		// 90° rotation
+		CTeleTile *pTempData1 = new CTeleTile[m_Width * m_Height];
+		CTile *pTempData2 = new CTile[m_Width * m_Height];
+		mem_copy(pTempData1, m_pTeleTile, (size_t)m_Width * m_Height * sizeof(CTeleTile));
+		mem_copy(pTempData2, m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+		CTeleTile *pDst1 = m_pTeleTile;
+		CTile *pDst2 = m_pTiles;
+		for(int x = 0; x < m_Width; ++x)
+			for(int y = m_Height - 1; y >= 0; --y, ++pDst1, ++pDst2)
+			{
+				*pDst1 = pTempData1[y * m_Width + x];
+				*pDst2 = pTempData2[y * m_Width + x];
+			}
+
+		std::swap(m_Width, m_Height);
+		delete[] pTempData1;
+		delete[] pTempData2;
+	}
+
+	if(Rotation == 2 || Rotation == 3)
+	{
+		BrushFlipX();
+		BrushFlipY();
+	}
+}
+
+void CLayerTele::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect)
+{
+	if(m_Readonly || (!Empty && pBrush->m_Type != LAYERTYPE_TILES))
+		return;
+
+	Snap(&Rect); // corrects Rect; no need of <=
+
+	Snap(&Rect);
+
+	int sx = ConvertX(Rect.x);
+	int sy = ConvertY(Rect.y);
+	int w = ConvertX(Rect.w);
+	int h = ConvertY(Rect.h);
+
+	std::shared_ptr<CLayerTele> pLt = std::static_pointer_cast<CLayerTele>(pBrush);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || Empty || IsEmpty(pLt);
+
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			const int SrcIndex = Empty ? 0 : (y * pLt->m_Width + x % pLt->m_Width) % (pLt->m_Width * pLt->m_Height);
+			const int TgtIndex = fy * m_Width + fx;
+
+			STeleTileStateChange::SData Previous{
+				m_pTeleTile[TgtIndex].m_Number,
+				m_pTeleTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			if(Empty || (!m_pEditor->m_AllowPlaceUnusedTiles && !IsValidTeleTile((pLt->m_pTiles[SrcIndex]).m_Index)))
+			{
+				m_pTiles[TgtIndex].m_Index = 0;
+				m_pTeleTile[TgtIndex].m_Type = 0;
+				m_pTeleTile[TgtIndex].m_Number = 0;
+			}
+			else
+			{
+				m_pTiles[TgtIndex] = pLt->m_pTiles[SrcIndex];
+				if(pLt->m_Tele && m_pTiles[TgtIndex].m_Index > 0)
+				{
+					m_pTeleTile[TgtIndex].m_Type = m_pTiles[TgtIndex].m_Index;
+
+					if(!IsTeleTileNumberUsed(m_pTeleTile[TgtIndex].m_Type))
+					{
+						// Tele tile number is unused. Set a known value which is not 0,
+						// as tiles with number 0 would be ignored by previous versions.
+						m_pTeleTile[TgtIndex].m_Number = 255;
+					}
+					else if((pLt->m_pTeleTile[SrcIndex].m_Number == 0 && m_pEditor->m_TeleNumber) || m_pEditor->m_TeleNumber != pLt->m_TeleNum)
+						m_pTeleTile[TgtIndex].m_Number = m_pEditor->m_TeleNumber;
+					else
+						m_pTeleTile[TgtIndex].m_Number = pLt->m_pTeleTile[SrcIndex].m_Number;
+				}
+			}
+
+			STeleTileStateChange::SData Current{
+				m_pTeleTile[TgtIndex].m_Number,
+				m_pTeleTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	}
+	FlagModified(sx, sy, w, h);
+}
+
+bool CLayerTele::ContainsElementWithId(int Id)
+{
+	for(int y = 0; y < m_Height; ++y)
+	{
+		for(int x = 0; x < m_Width; ++x)
+		{
+			if(IsTeleTileNumberUsed(m_pTeleTile[y * m_Width + x].m_Type) && m_pTeleTile[y * m_Width + x].m_Number == Id)
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+std::shared_ptr<CLayer> CLayerTele::Duplicate() const
+{
+	return std::make_shared<CLayerTele>(*this);
+}
+
+const char *CLayerTele::TypeName() const
+{
+	return "tele";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_tele.h b/src_bkp/game/editor/mapitems/layer_tele.h
new file mode 100644
index 0000000000..569dd305e4
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tele.h
@@ -0,0 +1,53 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_TELE_H
+#define GAME_EDITOR_MAPITEMS_LAYER_TELE_H
+
+#include "layer_tiles.h"
+
+struct STeleTileStateChange
+{
+	bool m_Changed;
+	struct SData
+	{
+		int m_Number;
+		int m_Type;
+		int m_Index;
+	} m_Previous, m_Current;
+};
+
+class CLayerTele : public CLayerTiles
+{
+public:
+	CLayerTele(CEditor *pEditor, int w, int h);
+	CLayerTele(const CLayerTele &Other);
+	~CLayerTele();
+
+	CTeleTile *m_pTeleTile;
+	unsigned char m_TeleNum;
+
+	void Resize(int NewW, int NewH) override;
+	void Shift(int Direction) override;
+	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
+	virtual bool ContainsElementWithId(int Id);
+
+	EditorTileStateChangeHistory<STeleTileStateChange> m_History;
+	inline void ClearHistory() override
+	{
+		CLayerTiles::ClearHistory();
+		m_History.clear();
+	}
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+private:
+	void RecordStateChange(int x, int y, STeleTileStateChange::SData Previous, STeleTileStateChange::SData Current);
+
+	friend class CLayerTiles;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_tiles.cpp b/src_bkp/game/editor/mapitems/layer_tiles.cpp
new file mode 100644
index 0000000000..a3ed05c33a
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tiles.cpp
@@ -0,0 +1,1261 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "layer_tiles.h"
+
+#include <engine/keys.h>
+#include <engine/shared/map.h>
+#include <game/editor/editor.h>
+#include <game/editor/editor_actions.h>
+
+#include <iterator>
+#include <numeric>
+
+#include "image.h"
+
+CLayerTiles::CLayerTiles(CEditor *pEditor, int w, int h) :
+	CLayer(pEditor)
+{
+	m_Type = LAYERTYPE_TILES;
+	m_aName[0] = '\0';
+	m_Width = w;
+	m_Height = h;
+	m_Image = -1;
+	m_Game = 0;
+	m_Color.r = 255;
+	m_Color.g = 255;
+	m_Color.b = 255;
+	m_Color.a = 255;
+	m_ColorEnv = -1;
+	m_ColorEnvOffset = 0;
+
+	m_Tele = 0;
+	m_Speedup = 0;
+	m_Front = 0;
+	m_Switch = 0;
+	m_Tune = 0;
+	m_AutoMapperConfig = -1;
+	m_Seed = 0;
+	m_AutoAutoMap = false;
+
+	m_pTiles = new CTile[m_Width * m_Height];
+	mem_zero(m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+}
+
+CLayerTiles::CLayerTiles(const CLayerTiles &Other) :
+	CLayer(Other)
+{
+	m_Width = Other.m_Width;
+	m_Height = Other.m_Height;
+	m_pTiles = new CTile[m_Width * m_Height];
+	mem_copy(m_pTiles, Other.m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+
+	m_Image = Other.m_Image;
+	m_Game = Other.m_Game;
+	m_Color = Other.m_Color;
+	m_ColorEnv = Other.m_ColorEnv;
+	m_ColorEnvOffset = Other.m_ColorEnvOffset;
+
+	m_AutoMapperConfig = Other.m_AutoMapperConfig;
+	m_Seed = Other.m_Seed;
+	m_AutoAutoMap = Other.m_AutoAutoMap;
+	m_Tele = Other.m_Tele;
+	m_Speedup = Other.m_Speedup;
+	m_Front = Other.m_Front;
+	m_Switch = Other.m_Switch;
+	m_Tune = Other.m_Tune;
+
+	mem_copy(m_aFileName, Other.m_aFileName, IO_MAX_PATH_LENGTH);
+}
+
+CLayerTiles::~CLayerTiles()
+{
+	delete[] m_pTiles;
+}
+
+CTile CLayerTiles::GetTile(int x, int y)
+{
+	return m_pTiles[y * m_Width + x];
+}
+
+void CLayerTiles::SetTile(int x, int y, CTile Tile)
+{
+	auto CurrentTile = m_pTiles[y * m_Width + x];
+	SetTileIgnoreHistory(x, y, Tile);
+	RecordStateChange(x, y, CurrentTile, Tile);
+}
+
+void CLayerTiles::SetTileIgnoreHistory(int x, int y, CTile Tile) const
+{
+	m_pTiles[y * m_Width + x] = Tile;
+}
+
+void CLayerTiles::RecordStateChange(int x, int y, CTile Previous, CTile Tile)
+{
+	if(!m_TilesHistory[y][x].m_Changed)
+		m_TilesHistory[y][x] = STileStateChange{true, Previous, Tile};
+	else
+		m_TilesHistory[y][x].m_Current = Tile;
+}
+
+void CLayerTiles::PrepareForSave()
+{
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			m_pTiles[y * m_Width + x].m_Flags &= TILEFLAG_XFLIP | TILEFLAG_YFLIP | TILEFLAG_ROTATE;
+
+	if(m_Image != -1 && m_Color.a == 255)
+	{
+		for(int y = 0; y < m_Height; y++)
+			for(int x = 0; x < m_Width; x++)
+				m_pTiles[y * m_Width + x].m_Flags |= m_pEditor->m_Map.m_vpImages[m_Image]->m_aTileFlags[m_pTiles[y * m_Width + x].m_Index];
+	}
+}
+
+void CLayerTiles::ExtractTiles(int TilemapItemVersion, const CTile *pSavedTiles, size_t SavedTilesSize) const
+{
+	const size_t DestSize = (size_t)m_Width * m_Height;
+	if(TilemapItemVersion >= CMapItemLayerTilemap::TILE_SKIP_MIN_VERSION)
+		CMap::ExtractTiles(m_pTiles, DestSize, pSavedTiles, SavedTilesSize);
+	else if(SavedTilesSize >= DestSize)
+		mem_copy(m_pTiles, pSavedTiles, DestSize * sizeof(CTile));
+}
+
+void CLayerTiles::MakePalette() const
+{
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			m_pTiles[y * m_Width + x].m_Index = y * 16 + x;
+}
+
+void CLayerTiles::Render(bool Tileset)
+{
+	IGraphics::CTextureHandle Texture;
+	if(m_Image >= 0 && (size_t)m_Image < m_pEditor->m_Map.m_vpImages.size())
+		Texture = m_pEditor->m_Map.m_vpImages[m_Image]->m_Texture;
+	else if(m_Game)
+		Texture = m_pEditor->GetEntitiesTexture();
+	else if(m_Front)
+		Texture = m_pEditor->GetFrontTexture();
+	else if(m_Tele)
+		Texture = m_pEditor->GetTeleTexture();
+	else if(m_Speedup)
+		Texture = m_pEditor->GetSpeedupTexture();
+	else if(m_Switch)
+		Texture = m_pEditor->GetSwitchTexture();
+	else if(m_Tune)
+		Texture = m_pEditor->GetTuneTexture();
+	Graphics()->TextureSet(Texture);
+
+	ColorRGBA Color = ColorRGBA(m_Color.r / 255.0f, m_Color.g / 255.0f, m_Color.b / 255.0f, m_Color.a / 255.0f);
+	Graphics()->BlendNone();
+	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_OPAQUE,
+		CEditor::EnvelopeEval, m_pEditor, m_ColorEnv, m_ColorEnvOffset);
+	Graphics()->BlendNormal();
+	m_pEditor->RenderTools()->RenderTilemap(m_pTiles, m_Width, m_Height, 32.0f, Color, LAYERRENDERFLAG_TRANSPARENT,
+		CEditor::EnvelopeEval, m_pEditor, m_ColorEnv, m_ColorEnvOffset);
+
+	// Render DDRace Layers
+	if(!Tileset)
+	{
+		if(m_Tele)
+			m_pEditor->RenderTools()->RenderTeleOverlay(static_cast<CLayerTele *>(this)->m_pTeleTile, m_Width, m_Height, 32.0f);
+		if(m_Speedup)
+			m_pEditor->RenderTools()->RenderSpeedupOverlay(static_cast<CLayerSpeedup *>(this)->m_pSpeedupTile, m_Width, m_Height, 32.0f);
+		if(m_Switch)
+			m_pEditor->RenderTools()->RenderSwitchOverlay(static_cast<CLayerSwitch *>(this)->m_pSwitchTile, m_Width, m_Height, 32.0f);
+		if(m_Tune)
+			m_pEditor->RenderTools()->RenderTuneOverlay(static_cast<CLayerTune *>(this)->m_pTuneTile, m_Width, m_Height, 32.0f);
+	}
+}
+
+int CLayerTiles::ConvertX(float x) const { return (int)(x / 32.0f); }
+int CLayerTiles::ConvertY(float y) const { return (int)(y / 32.0f); }
+
+void CLayerTiles::Convert(CUIRect Rect, RECTi *pOut) const
+{
+	pOut->x = ConvertX(Rect.x);
+	pOut->y = ConvertY(Rect.y);
+	pOut->w = ConvertX(Rect.x + Rect.w + 31) - pOut->x;
+	pOut->h = ConvertY(Rect.y + Rect.h + 31) - pOut->y;
+}
+
+void CLayerTiles::Snap(CUIRect *pRect) const
+{
+	RECTi Out;
+	Convert(*pRect, &Out);
+	pRect->x = Out.x * 32.0f;
+	pRect->y = Out.y * 32.0f;
+	pRect->w = Out.w * 32.0f;
+	pRect->h = Out.h * 32.0f;
+}
+
+void CLayerTiles::Clamp(RECTi *pRect) const
+{
+	if(pRect->x < 0)
+	{
+		pRect->w += pRect->x;
+		pRect->x = 0;
+	}
+
+	if(pRect->y < 0)
+	{
+		pRect->h += pRect->y;
+		pRect->y = 0;
+	}
+
+	if(pRect->x + pRect->w > m_Width)
+		pRect->w = m_Width - pRect->x;
+
+	if(pRect->y + pRect->h > m_Height)
+		pRect->h = m_Height - pRect->y;
+
+	if(pRect->h < 0)
+		pRect->h = 0;
+	if(pRect->w < 0)
+		pRect->w = 0;
+}
+
+bool CLayerTiles::IsEntitiesLayer() const
+{
+	return m_pEditor->m_Map.m_pGameLayer.get() == this || m_pEditor->m_Map.m_pTeleLayer.get() == this || m_pEditor->m_Map.m_pSpeedupLayer.get() == this || m_pEditor->m_Map.m_pFrontLayer.get() == this || m_pEditor->m_Map.m_pSwitchLayer.get() == this || m_pEditor->m_Map.m_pTuneLayer.get() == this;
+}
+
+bool CLayerTiles::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
+{
+	for(int y = 0; y < pLayer->m_Height; y++)
+	{
+		for(int x = 0; x < pLayer->m_Width; x++)
+		{
+			int Index = pLayer->GetTile(x, y).m_Index;
+			if(Index)
+			{
+				if(pLayer->m_Game)
+				{
+					if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidGameTile(Index))
+						return false;
+				}
+				else if(pLayer->m_Front)
+				{
+					if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidFrontTile(Index))
+						return false;
+				}
+				else
+					return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+void CLayerTiles::BrushSelecting(CUIRect Rect)
+{
+	Graphics()->TextureClear();
+	m_pEditor->Graphics()->QuadsBegin();
+	m_pEditor->Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.4f);
+	Snap(&Rect);
+	IGraphics::CQuadItem QuadItem(Rect.x, Rect.y, Rect.w, Rect.h);
+	m_pEditor->Graphics()->QuadsDrawTL(&QuadItem, 1);
+	m_pEditor->Graphics()->QuadsEnd();
+	char aBuf[16];
+	str_format(aBuf, sizeof(aBuf), "%d⨯%d", ConvertX(Rect.w), ConvertY(Rect.h));
+	TextRender()->Text(Rect.x + 3.0f, Rect.y + 3.0f, m_pEditor->m_ShowPicker ? 15.0f : m_pEditor->MapView()->ScaleLength(15.0f), aBuf, -1.0f);
+}
+
+template<typename T>
+static void InitGrabbedLayer(std::shared_ptr<T> pLayer, CLayerTiles *pThisLayer)
+{
+	pLayer->m_pEditor = pThisLayer->m_pEditor;
+	pLayer->m_Image = pThisLayer->m_Image;
+	pLayer->m_Game = pThisLayer->m_Game;
+	pLayer->m_Front = pThisLayer->m_Front;
+	pLayer->m_Tele = pThisLayer->m_Tele;
+	pLayer->m_Speedup = pThisLayer->m_Speedup;
+	pLayer->m_Switch = pThisLayer->m_Switch;
+	pLayer->m_Tune = pThisLayer->m_Tune;
+	if(pThisLayer->m_pEditor->m_BrushColorEnabled)
+	{
+		pLayer->m_Color = pThisLayer->m_Color;
+		pLayer->m_Color.a = 255;
+	}
+};
+
+int CLayerTiles::BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect)
+{
+	RECTi r;
+	Convert(Rect, &r);
+	Clamp(&r);
+
+	if(!r.w || !r.h)
+		return 0;
+
+	// create new layers
+	if(this->m_Tele)
+	{
+		std::shared_ptr<CLayerTele> pGrabbed = std::make_shared<CLayerTele>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+
+		// copy the tele data
+		if(!m_pEditor->Input()->KeyIsPressed(KEY_SPACE))
+			for(int y = 0; y < r.h; y++)
+				for(int x = 0; x < r.w; x++)
+				{
+					pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x] = static_cast<CLayerTele *>(this)->m_pTeleTile[(r.y + y) * m_Width + (r.x + x)];
+					if(IsValidTeleTile(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type) && IsTeleTileNumberUsed(pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Type))
+					{
+						m_pEditor->m_TeleNumber = pGrabbed->m_pTeleTile[y * pGrabbed->m_Width + x].m_Number;
+					}
+				}
+		pGrabbed->m_TeleNum = m_pEditor->m_TeleNumber;
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+	else if(this->m_Speedup)
+	{
+		std::shared_ptr<CLayerSpeedup> pGrabbed = std::make_shared<CLayerSpeedup>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+
+		// copy the speedup data
+		if(!m_pEditor->Input()->KeyIsPressed(KEY_SPACE))
+			for(int y = 0; y < r.h; y++)
+				for(int x = 0; x < r.w; x++)
+				{
+					pGrabbed->m_pSpeedupTile[y * pGrabbed->m_Width + x] = static_cast<CLayerSpeedup *>(this)->m_pSpeedupTile[(r.y + y) * m_Width + (r.x + x)];
+					if(IsValidSpeedupTile(pGrabbed->m_pSpeedupTile[y * pGrabbed->m_Width + x].m_Type))
+					{
+						m_pEditor->m_SpeedupAngle = pGrabbed->m_pSpeedupTile[y * pGrabbed->m_Width + x].m_Angle;
+						m_pEditor->m_SpeedupForce = pGrabbed->m_pSpeedupTile[y * pGrabbed->m_Width + x].m_Force;
+						m_pEditor->m_SpeedupMaxSpeed = pGrabbed->m_pSpeedupTile[y * pGrabbed->m_Width + x].m_MaxSpeed;
+					}
+				}
+		pGrabbed->m_SpeedupForce = m_pEditor->m_SpeedupForce;
+		pGrabbed->m_SpeedupMaxSpeed = m_pEditor->m_SpeedupMaxSpeed;
+		pGrabbed->m_SpeedupAngle = m_pEditor->m_SpeedupAngle;
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+	else if(this->m_Switch)
+	{
+		std::shared_ptr<CLayerSwitch> pGrabbed = std::make_shared<CLayerSwitch>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+
+		// copy the switch data
+		if(!m_pEditor->Input()->KeyIsPressed(KEY_SPACE))
+			for(int y = 0; y < r.h; y++)
+				for(int x = 0; x < r.w; x++)
+				{
+					pGrabbed->m_pSwitchTile[y * pGrabbed->m_Width + x] = static_cast<CLayerSwitch *>(this)->m_pSwitchTile[(r.y + y) * m_Width + (r.x + x)];
+					if(IsValidSwitchTile(pGrabbed->m_pSwitchTile[y * pGrabbed->m_Width + x].m_Type))
+					{
+						m_pEditor->m_SwitchNum = pGrabbed->m_pSwitchTile[y * pGrabbed->m_Width + x].m_Number;
+						m_pEditor->m_SwitchDelay = pGrabbed->m_pSwitchTile[y * pGrabbed->m_Width + x].m_Delay;
+					}
+				}
+		pGrabbed->m_SwitchNumber = m_pEditor->m_SwitchNum;
+		pGrabbed->m_SwitchDelay = m_pEditor->m_SwitchDelay;
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+
+	else if(this->m_Tune)
+	{
+		std::shared_ptr<CLayerTune> pGrabbed = std::make_shared<CLayerTune>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+
+		// copy the tiles
+		if(!m_pEditor->Input()->KeyIsPressed(KEY_SPACE))
+			for(int y = 0; y < r.h; y++)
+				for(int x = 0; x < r.w; x++)
+				{
+					pGrabbed->m_pTuneTile[y * pGrabbed->m_Width + x] = static_cast<CLayerTune *>(this)->m_pTuneTile[(r.y + y) * m_Width + (r.x + x)];
+					if(IsValidTuneTile(pGrabbed->m_pTuneTile[y * pGrabbed->m_Width + x].m_Type))
+					{
+						m_pEditor->m_TuningNum = pGrabbed->m_pTuneTile[y * pGrabbed->m_Width + x].m_Number;
+					}
+				}
+		pGrabbed->m_TuningNumber = m_pEditor->m_TuningNum;
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+	else if(this->m_Front)
+	{
+		std::shared_ptr<CLayerFront> pGrabbed = std::make_shared<CLayerFront>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+	else
+	{
+		std::shared_ptr<CLayerTiles> pGrabbed = std::make_shared<CLayerFront>(m_pEditor, r.w, r.h);
+		InitGrabbedLayer(pGrabbed, this);
+
+		pBrush->AddLayer(pGrabbed);
+
+		// copy the tiles
+		for(int y = 0; y < r.h; y++)
+			for(int x = 0; x < r.w; x++)
+				pGrabbed->m_pTiles[y * pGrabbed->m_Width + x] = GetTile(r.x + x, r.y + y);
+		str_copy(pGrabbed->m_aFileName, m_pEditor->m_aFileName);
+	}
+
+	return 1;
+}
+
+void CLayerTiles::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect)
+{
+	if(m_Readonly || (!Empty && pBrush->m_Type != LAYERTYPE_TILES))
+		return;
+
+	Snap(&Rect);
+
+	int sx = ConvertX(Rect.x);
+	int sy = ConvertY(Rect.y);
+	int w = ConvertX(Rect.w);
+	int h = ConvertY(Rect.h);
+
+	std::shared_ptr<CLayerTiles> pLt = std::static_pointer_cast<CLayerTiles>(pBrush);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || Empty || IsEmpty(pLt);
+
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			bool HasTile = GetTile(fx, fy).m_Index;
+			if(!Empty && pLt->GetTile(x % pLt->m_Width, y % pLt->m_Height).m_Index == TILE_THROUGH_CUT)
+			{
+				if(m_Game && m_pEditor->m_Map.m_pFrontLayer)
+				{
+					HasTile = HasTile || m_pEditor->m_Map.m_pFrontLayer->GetTile(fx, fy).m_Index;
+				}
+				else if(m_Front)
+				{
+					HasTile = HasTile || m_pEditor->m_Map.m_pGameLayer->GetTile(fx, fy).m_Index;
+				}
+			}
+
+			if(!Destructive && HasTile)
+				continue;
+
+			SetTile(fx, fy, Empty ? CTile{TILE_AIR} : pLt->m_pTiles[(y * pLt->m_Width + x % pLt->m_Width) % (pLt->m_Width * pLt->m_Height)]);
+		}
+	}
+	FlagModified(sx, sy, w, h);
+}
+
+void CLayerTiles::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	if(m_Readonly)
+		return;
+
+	//
+	std::shared_ptr<CLayerTiles> pTileLayer = std::static_pointer_cast<CLayerTiles>(pBrush);
+	int sx = ConvertX(wx);
+	int sy = ConvertY(wy);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pTileLayer);
+
+	for(int y = 0; y < pTileLayer->m_Height; y++)
+		for(int x = 0; x < pTileLayer->m_Width; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			bool HasTile = GetTile(fx, fy).m_Index;
+			if(pTileLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
+			{
+				if(m_Game && m_pEditor->m_Map.m_pFrontLayer)
+				{
+					HasTile = HasTile || m_pEditor->m_Map.m_pFrontLayer->GetTile(fx, fy).m_Index;
+				}
+				else if(m_Front)
+				{
+					HasTile = HasTile || m_pEditor->m_Map.m_pGameLayer->GetTile(fx, fy).m_Index;
+				}
+			}
+
+			if(!Destructive && HasTile)
+				continue;
+
+			SetTile(fx, fy, pTileLayer->GetTile(x, y));
+		}
+
+	FlagModified(sx, sy, pTileLayer->m_Width, pTileLayer->m_Height);
+}
+
+void CLayerTiles::BrushFlipX()
+{
+	BrushFlipXImpl(m_pTiles);
+
+	if(m_Tele || m_Speedup || m_Tune)
+		return;
+
+	bool Rotate = !(m_Game || m_Front || m_Switch) || m_pEditor->m_AllowPlaceUnusedTiles;
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			if(!Rotate && !IsRotatableTile(m_pTiles[y * m_Width + x].m_Index))
+				m_pTiles[y * m_Width + x].m_Flags = 0;
+			else
+				m_pTiles[y * m_Width + x].m_Flags ^= (m_pTiles[y * m_Width + x].m_Flags & TILEFLAG_ROTATE) ? TILEFLAG_YFLIP : TILEFLAG_XFLIP;
+}
+
+void CLayerTiles::BrushFlipY()
+{
+	BrushFlipYImpl(m_pTiles);
+
+	if(m_Tele || m_Speedup || m_Tune)
+		return;
+
+	bool Rotate = !(m_Game || m_Front || m_Switch) || m_pEditor->m_AllowPlaceUnusedTiles;
+	for(int y = 0; y < m_Height; y++)
+		for(int x = 0; x < m_Width; x++)
+			if(!Rotate && !IsRotatableTile(m_pTiles[y * m_Width + x].m_Index))
+				m_pTiles[y * m_Width + x].m_Flags = 0;
+			else
+				m_pTiles[y * m_Width + x].m_Flags ^= (m_pTiles[y * m_Width + x].m_Flags & TILEFLAG_ROTATE) ? TILEFLAG_XFLIP : TILEFLAG_YFLIP;
+}
+
+void CLayerTiles::BrushRotate(float Amount)
+{
+	int Rotation = (round_to_int(360.0f * Amount / (pi * 2)) / 90) % 4; // 0=0°, 1=90°, 2=180°, 3=270°
+	if(Rotation < 0)
+		Rotation += 4;
+
+	if(Rotation == 1 || Rotation == 3)
+	{
+		// 90° rotation
+		CTile *pTempData = new CTile[m_Width * m_Height];
+		mem_copy(pTempData, m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+		CTile *pDst = m_pTiles;
+		bool Rotate = !(m_Game || m_Front) || m_pEditor->m_AllowPlaceUnusedTiles;
+		for(int x = 0; x < m_Width; ++x)
+			for(int y = m_Height - 1; y >= 0; --y, ++pDst)
+			{
+				*pDst = pTempData[y * m_Width + x];
+				if(!Rotate && !IsRotatableTile(pDst->m_Index))
+					pDst->m_Flags = 0;
+				else
+				{
+					if(pDst->m_Flags & TILEFLAG_ROTATE)
+						pDst->m_Flags ^= (TILEFLAG_YFLIP | TILEFLAG_XFLIP);
+					pDst->m_Flags ^= TILEFLAG_ROTATE;
+				}
+			}
+
+		std::swap(m_Width, m_Height);
+		delete[] pTempData;
+	}
+
+	if(Rotation == 2 || Rotation == 3)
+	{
+		BrushFlipX();
+		BrushFlipY();
+	}
+}
+
+std::shared_ptr<CLayer> CLayerTiles::Duplicate() const
+{
+	return std::make_shared<CLayerTiles>(*this);
+}
+
+const char *CLayerTiles::TypeName() const
+{
+	return "tiles";
+}
+
+void CLayerTiles::Resize(int NewW, int NewH)
+{
+	CTile *pNewData = new CTile[NewW * NewH];
+	mem_zero(pNewData, (size_t)NewW * NewH * sizeof(CTile));
+
+	// copy old data
+	for(int y = 0; y < minimum(NewH, m_Height); y++)
+		mem_copy(&pNewData[y * NewW], &m_pTiles[y * m_Width], minimum(m_Width, NewW) * sizeof(CTile));
+
+	// replace old
+	delete[] m_pTiles;
+	m_pTiles = pNewData;
+	m_Width = NewW;
+	m_Height = NewH;
+
+	// resize tele layer if available
+	if(m_Game && m_pEditor->m_Map.m_pTeleLayer && (m_pEditor->m_Map.m_pTeleLayer->m_Width != NewW || m_pEditor->m_Map.m_pTeleLayer->m_Height != NewH))
+		m_pEditor->m_Map.m_pTeleLayer->Resize(NewW, NewH);
+
+	// resize speedup layer if available
+	if(m_Game && m_pEditor->m_Map.m_pSpeedupLayer && (m_pEditor->m_Map.m_pSpeedupLayer->m_Width != NewW || m_pEditor->m_Map.m_pSpeedupLayer->m_Height != NewH))
+		m_pEditor->m_Map.m_pSpeedupLayer->Resize(NewW, NewH);
+
+	// resize front layer
+	if(m_Game && m_pEditor->m_Map.m_pFrontLayer && (m_pEditor->m_Map.m_pFrontLayer->m_Width != NewW || m_pEditor->m_Map.m_pFrontLayer->m_Height != NewH))
+		m_pEditor->m_Map.m_pFrontLayer->Resize(NewW, NewH);
+
+	// resize switch layer if available
+	if(m_Game && m_pEditor->m_Map.m_pSwitchLayer && (m_pEditor->m_Map.m_pSwitchLayer->m_Width != NewW || m_pEditor->m_Map.m_pSwitchLayer->m_Height != NewH))
+		m_pEditor->m_Map.m_pSwitchLayer->Resize(NewW, NewH);
+
+	// resize tune layer if available
+	if(m_Game && m_pEditor->m_Map.m_pTuneLayer && (m_pEditor->m_Map.m_pTuneLayer->m_Width != NewW || m_pEditor->m_Map.m_pTuneLayer->m_Height != NewH))
+		m_pEditor->m_Map.m_pTuneLayer->Resize(NewW, NewH);
+}
+
+void CLayerTiles::Shift(int Direction)
+{
+	ShiftImpl(m_pTiles, Direction, m_pEditor->m_ShiftBy);
+}
+
+void CLayerTiles::ShowInfo()
+{
+	float ScreenX0, ScreenY0, ScreenX1, ScreenY1;
+	Graphics()->GetScreen(&ScreenX0, &ScreenY0, &ScreenX1, &ScreenY1);
+	Graphics()->TextureSet(m_pEditor->Client()->GetDebugFont());
+	Graphics()->QuadsBegin();
+
+	int StartY = maximum(0, (int)(ScreenY0 / 32.0f) - 1);
+	int StartX = maximum(0, (int)(ScreenX0 / 32.0f) - 1);
+	int EndY = minimum((int)(ScreenY1 / 32.0f) + 1, m_Height);
+	int EndX = minimum((int)(ScreenX1 / 32.0f) + 1, m_Width);
+
+	for(int y = StartY; y < EndY; y++)
+		for(int x = StartX; x < EndX; x++)
+		{
+			int c = x + y * m_Width;
+			if(m_pTiles[c].m_Index)
+			{
+				char aBuf[4];
+				if(m_pEditor->m_ShowTileInfo == CEditor::SHOW_TILE_HEXADECIMAL)
+				{
+					str_hex(aBuf, sizeof(aBuf), &m_pTiles[c].m_Index, 1);
+					aBuf[2] = '\0'; // would otherwise be a space
+				}
+				else
+				{
+					str_from_int(m_pTiles[c].m_Index, aBuf);
+				}
+				m_pEditor->Graphics()->QuadsText(x * 32, y * 32, 16.0f, aBuf);
+
+				char aFlags[4] = {m_pTiles[c].m_Flags & TILEFLAG_XFLIP ? 'X' : ' ',
+					m_pTiles[c].m_Flags & TILEFLAG_YFLIP ? 'Y' : ' ',
+					m_pTiles[c].m_Flags & TILEFLAG_ROTATE ? 'R' : ' ',
+					0};
+				m_pEditor->Graphics()->QuadsText(x * 32, y * 32 + 16, 16.0f, aFlags);
+			}
+			x += m_pTiles[c].m_Skip;
+		}
+
+	Graphics()->QuadsEnd();
+	Graphics()->MapScreen(ScreenX0, ScreenY0, ScreenX1, ScreenY1);
+}
+
+CUI::EPopupMenuFunctionResult CLayerTiles::RenderProperties(CUIRect *pToolBox)
+{
+	CUIRect Button;
+
+	const bool EntitiesLayer = IsEntitiesLayer();
+
+	std::shared_ptr<CLayerGroup> pGroup = m_pEditor->m_Map.m_vpGroups[m_pEditor->m_SelectedGroup];
+
+	// Game tiles can only be constructed if the layer is relative to the game layer
+	if(!EntitiesLayer && !(pGroup->m_OffsetX % 32) && !(pGroup->m_OffsetY % 32) && pGroup->m_ParallaxX == 100 && pGroup->m_ParallaxY == 100)
+	{
+		pToolBox->HSplitBottom(12.0f, pToolBox, &Button);
+		static int s_GameTilesButton = 0;
+		if(m_pEditor->DoButton_Editor(&s_GameTilesButton, "Game tiles", 0, &Button, 0, "Constructs game tiles from this layer"))
+			m_pEditor->PopupSelectGametileOpInvoke(m_pEditor->UI()->MouseX(), m_pEditor->UI()->MouseY());
+		int Result = m_pEditor->PopupSelectGameTileOpResult();
+		switch(Result)
+		{
+		case 4:
+			Result = TILE_THROUGH_CUT;
+			break;
+		case 5:
+			Result = TILE_FREEZE;
+			break;
+		case 6:
+			Result = TILE_UNFREEZE;
+			break;
+		case 7:
+			Result = TILE_DFREEZE;
+			break;
+		case 8:
+			Result = TILE_DUNFREEZE;
+			break;
+		case 9:
+			Result = TILE_TELECHECKIN;
+			break;
+		case 10:
+			Result = TILE_TELECHECKINEVIL;
+			break;
+		case 11:
+			Result = TILE_LFREEZE;
+			break;
+		case 12:
+			Result = TILE_LUNFREEZE;
+			break;
+		default:
+			break;
+		}
+		if(Result > -1)
+		{
+			const int OffsetX = -pGroup->m_OffsetX / 32;
+			const int OffsetY = -pGroup->m_OffsetY / 32;
+
+			static const char *s_apGametileOpNames[] = {
+				"Air",
+				"Hookable",
+				"Death",
+				"Unhookable",
+				"Hookthrough",
+				"Freeze",
+				"Unfreeze",
+				"Deep Freeze",
+				"Deep Unfreeze",
+				"Blue Check-Tele",
+				"Red Check-Tele",
+				"Live Freeze",
+				"Live Unfreeze",
+			};
+
+			std::vector<std::shared_ptr<IEditorAction>> vpActions;
+			std::shared_ptr<CLayerTiles> pGLayer = m_pEditor->m_Map.m_pGameLayer;
+			int GameLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pGLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
+
+			if(Result != TILE_TELECHECKIN && Result != TILE_TELECHECKINEVIL)
+			{
+				if(pGLayer->m_Width < m_Width + OffsetX || pGLayer->m_Height < m_Height + OffsetY)
+				{
+					std::map<int, std::shared_ptr<CLayer>> savedLayers;
+					savedLayers[LAYERTYPE_TILES] = pGLayer->Duplicate();
+					savedLayers[LAYERTYPE_GAME] = savedLayers[LAYERTYPE_TILES];
+
+					int PrevW = pGLayer->m_Width;
+					int PrevH = pGLayer->m_Height;
+					const int NewW = pGLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pGLayer->m_Width;
+					const int NewH = pGLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pGLayer->m_Height;
+					pGLayer->Resize(NewW, NewH);
+					vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
+					const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action1 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+					vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+					const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action2 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+
+					Action1->SetSavedLayers(savedLayers);
+					Action2->SetSavedLayers(savedLayers);
+				}
+
+				int Changes = 0;
+				for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
+				{
+					for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
+					{
+						if(GetTile(x, y).m_Index)
+						{
+							const CTile ResultTile = {(unsigned char)Result};
+							pGLayer->SetTile(x + OffsetX, y + OffsetY, ResultTile);
+							Changes++;
+						}
+					}
+				}
+
+				vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
+				char aDisplay[256];
+				str_format(aDisplay, sizeof(aDisplay), "Construct '%s' game tiles (x%d)", s_apGametileOpNames[Result], Changes);
+				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
+			}
+			else
+			{
+				if(!m_pEditor->m_Map.m_pTeleLayer)
+				{
+					std::shared_ptr<CLayerTele> pLayer = std::make_shared<CLayerTele>(m_pEditor, m_Width, m_Height);
+					m_pEditor->m_Map.MakeTeleLayer(pLayer);
+					m_pEditor->m_Map.m_pGameGroup->AddLayer(pLayer);
+
+					vpActions.push_back(std::make_shared<CEditorActionAddLayer>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_Map.m_pGameGroup->m_vpLayers.size() - 1));
+
+					if(m_Width != pGLayer->m_Width || m_Height > pGLayer->m_Height)
+					{
+						std::map<int, std::shared_ptr<CLayer>> savedLayers;
+						savedLayers[LAYERTYPE_TILES] = pGLayer->Duplicate();
+						savedLayers[LAYERTYPE_GAME] = savedLayers[LAYERTYPE_TILES];
+
+						int NewW = pGLayer->m_Width;
+						int NewH = pGLayer->m_Height;
+						if(m_Width > pGLayer->m_Width)
+						{
+							NewW = m_Width;
+						}
+						if(m_Height > pGLayer->m_Height)
+						{
+							NewH = m_Height;
+						}
+
+						int PrevW = pGLayer->m_Width;
+						int PrevH = pGLayer->m_Height;
+						pLayer->Resize(NewW, NewH);
+						vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
+						const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action1 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+						vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, GameLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+						const std::shared_ptr<CEditorActionEditLayerTilesProp> &Action2 = std::static_pointer_cast<CEditorActionEditLayerTilesProp>(vpActions[vpActions.size() - 1]);
+
+						Action1->SetSavedLayers(savedLayers);
+						Action2->SetSavedLayers(savedLayers);
+					}
+				}
+
+				std::shared_ptr<CLayerTele> pTLayer = m_pEditor->m_Map.m_pTeleLayer;
+				int TeleLayerIndex = std::find(m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin(), m_pEditor->m_Map.m_pGameGroup->m_vpLayers.end(), pTLayer) - m_pEditor->m_Map.m_pGameGroup->m_vpLayers.begin();
+
+				if(pTLayer->m_Width < m_Width + OffsetX || pTLayer->m_Height < m_Height + OffsetY)
+				{
+					std::map<int, std::shared_ptr<CLayer>> savedLayers;
+					savedLayers[LAYERTYPE_TILES] = pTLayer->Duplicate();
+					savedLayers[LAYERTYPE_TELE] = savedLayers[LAYERTYPE_TILES];
+
+					int PrevW = pTLayer->m_Width;
+					int PrevH = pTLayer->m_Height;
+					int NewW = pTLayer->m_Width < m_Width + OffsetX ? m_Width + OffsetX : pTLayer->m_Width;
+					int NewH = pTLayer->m_Height < m_Height + OffsetY ? m_Height + OffsetY : pTLayer->m_Height;
+					pTLayer->Resize(NewW, NewH);
+					std::shared_ptr<CEditorActionEditLayerTilesProp> Action1, Action2;
+					vpActions.push_back(Action1 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_WIDTH, PrevW, NewW));
+					vpActions.push_back(Action2 = std::make_shared<CEditorActionEditLayerTilesProp>(m_pEditor, m_pEditor->m_SelectedGroup, TeleLayerIndex, ETilesProp::PROP_HEIGHT, PrevH, NewH));
+
+					Action1->SetSavedLayers(savedLayers);
+					Action2->SetSavedLayers(savedLayers);
+				}
+
+				int Changes = 0;
+				for(int y = OffsetY < 0 ? -OffsetY : 0; y < m_Height; y++)
+				{
+					for(int x = OffsetX < 0 ? -OffsetX : 0; x < m_Width; x++)
+					{
+						if(GetTile(x, y).m_Index)
+						{
+							auto TileIndex = (y + OffsetY) * pTLayer->m_Width + x + OffsetX;
+							Changes++;
+
+							STeleTileStateChange::SData Previous{
+								pTLayer->m_pTeleTile[TileIndex].m_Number,
+								pTLayer->m_pTeleTile[TileIndex].m_Type,
+								pTLayer->m_pTiles[TileIndex].m_Index};
+
+							pTLayer->m_pTiles[TileIndex].m_Index = TILE_AIR + Result;
+							pTLayer->m_pTeleTile[TileIndex].m_Number = 1;
+							pTLayer->m_pTeleTile[TileIndex].m_Type = TILE_AIR + Result;
+
+							STeleTileStateChange::SData Current{
+								pTLayer->m_pTeleTile[TileIndex].m_Number,
+								pTLayer->m_pTeleTile[TileIndex].m_Type,
+								pTLayer->m_pTiles[TileIndex].m_Index};
+
+							pTLayer->RecordStateChange(x, y, Previous, Current);
+						}
+					}
+				}
+
+				vpActions.push_back(std::make_shared<CEditorBrushDrawAction>(m_pEditor, m_pEditor->m_SelectedGroup));
+				char aDisplay[256];
+				str_format(aDisplay, sizeof(aDisplay), "Construct 'tele' game tiles (x%d)", Changes);
+				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(m_pEditor, vpActions, aDisplay, true));
+			}
+		}
+	}
+
+	if(m_pEditor->m_Map.m_pGameLayer.get() != this)
+	{
+		if(m_Image >= 0 && (size_t)m_Image < m_pEditor->m_Map.m_vpImages.size() && m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.IsLoaded() && m_AutoMapperConfig != -1)
+		{
+			pToolBox->HSplitBottom(2.0f, pToolBox, nullptr);
+			pToolBox->HSplitBottom(12.0f, pToolBox, &Button);
+			if(m_Seed != 0)
+			{
+				CUIRect ButtonAuto;
+				Button.VSplitRight(16.0f, &Button, &ButtonAuto);
+				Button.VSplitRight(2.0f, &Button, nullptr);
+				static int s_AutoMapperButtonAuto = 0;
+				if(m_pEditor->DoButton_Editor(&s_AutoMapperButtonAuto, "A", m_AutoAutoMap, &ButtonAuto, 0, "Automatically run automap after modifications."))
+				{
+					m_AutoAutoMap = !m_AutoAutoMap;
+					FlagModified(0, 0, m_Width, m_Height);
+					if(!m_TilesHistory.empty()) // Sometimes pressing that button causes the automap to run so we should be able to undo that
+					{
+						// record undo
+						m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAutoMap>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_TilesHistory));
+						ClearHistory();
+					}
+				}
+			}
+
+			static int s_AutoMapperButton = 0;
+			if(m_pEditor->DoButton_Editor(&s_AutoMapperButton, "Automap", 0, &Button, 0, "Run the automapper"))
+			{
+				m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.Proceed(this, m_AutoMapperConfig, m_Seed);
+				// record undo
+				m_pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAutoMap>(m_pEditor, m_pEditor->m_SelectedGroup, m_pEditor->m_vSelectedLayers[0], m_TilesHistory));
+				ClearHistory();
+				return CUI::POPUP_CLOSE_CURRENT;
+			}
+		}
+	}
+
+	int Color = PackColor(m_Color);
+
+	CProperty aProps[] = {
+		{"Width", m_Width, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Height", m_Height, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Shift", 0, PROPTYPE_SHIFT, 0, 0},
+		{"Shift by", m_pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Image", m_Image, PROPTYPE_IMAGE, 0, 0},
+		{"Color", Color, PROPTYPE_COLOR, 0, 0},
+		{"Color Env", m_ColorEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
+		{"Color TO", m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Auto Rule", m_AutoMapperConfig, PROPTYPE_AUTOMAPPER, m_Image, 0},
+		{"Seed", m_Seed, PROPTYPE_INT_SCROLL, 0, 1000000000},
+		{nullptr},
+	};
+
+	if(EntitiesLayer) // remove the image and color properties if this is a game layer
+	{
+		aProps[(int)ETilesProp::PROP_IMAGE].m_pName = nullptr;
+		aProps[(int)ETilesProp::PROP_COLOR].m_pName = nullptr;
+		aProps[(int)ETilesProp::PROP_AUTOMAPPER].m_pName = nullptr;
+	}
+	if(m_Image == -1)
+	{
+		aProps[(int)ETilesProp::PROP_AUTOMAPPER].m_pName = nullptr;
+		aProps[(int)ETilesProp::PROP_SEED].m_pName = nullptr;
+	}
+
+	static int s_aIds[(int)ETilesProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = m_pEditor->DoPropertiesWithState<ETilesProp>(pToolBox, aProps, s_aIds, &NewVal);
+
+	static CLayerTilesPropTracker s_Tracker(m_pEditor);
+	s_Tracker.Begin(this, Prop, State);
+
+	if(Prop == ETilesProp::PROP_WIDTH && NewVal > 1)
+	{
+		if(NewVal > 1000 && !m_pEditor->m_LargeLayerWasWarned)
+		{
+			m_pEditor->m_PopupEventType = CEditor::POPEVENT_LARGELAYER;
+			m_pEditor->m_PopupEventActivated = true;
+			m_pEditor->m_LargeLayerWasWarned = true;
+		}
+		Resize(NewVal, m_Height);
+	}
+	else if(Prop == ETilesProp::PROP_HEIGHT && NewVal > 1)
+	{
+		if(NewVal > 1000 && !m_pEditor->m_LargeLayerWasWarned)
+		{
+			m_pEditor->m_PopupEventType = CEditor::POPEVENT_LARGELAYER;
+			m_pEditor->m_PopupEventActivated = true;
+			m_pEditor->m_LargeLayerWasWarned = true;
+		}
+		Resize(m_Width, NewVal);
+	}
+	else if(Prop == ETilesProp::PROP_SHIFT)
+	{
+		Shift(NewVal);
+	}
+	else if(Prop == ETilesProp::PROP_SHIFT_BY)
+	{
+		m_pEditor->m_ShiftBy = NewVal;
+	}
+	else if(Prop == ETilesProp::PROP_IMAGE)
+	{
+		m_Image = NewVal;
+		if(NewVal == -1)
+		{
+			m_Image = -1;
+		}
+		else
+		{
+			m_Image = NewVal % m_pEditor->m_Map.m_vpImages.size();
+			m_AutoMapperConfig = -1;
+
+			if(m_pEditor->m_Map.m_vpImages[m_Image]->m_Width % 16 != 0 || m_pEditor->m_Map.m_vpImages[m_Image]->m_Height % 16 != 0)
+			{
+				m_pEditor->m_PopupEventType = CEditor::POPEVENT_IMAGEDIV16;
+				m_pEditor->m_PopupEventActivated = true;
+				m_Image = -1;
+			}
+		}
+	}
+	else if(Prop == ETilesProp::PROP_COLOR)
+	{
+		m_Color.r = (NewVal >> 24) & 0xff;
+		m_Color.g = (NewVal >> 16) & 0xff;
+		m_Color.b = (NewVal >> 8) & 0xff;
+		m_Color.a = NewVal & 0xff;
+	}
+	else if(Prop == ETilesProp::PROP_COLOR_ENV)
+	{
+		int Index = clamp(NewVal - 1, -1, (int)m_pEditor->m_Map.m_vpEnvelopes.size() - 1);
+		const int Step = (Index - m_ColorEnv) % 2;
+		if(Step != 0)
+		{
+			for(; Index >= -1 && Index < (int)m_pEditor->m_Map.m_vpEnvelopes.size(); Index += Step)
+			{
+				if(Index == -1 || m_pEditor->m_Map.m_vpEnvelopes[Index]->GetChannels() == 4)
+				{
+					m_ColorEnv = Index;
+					break;
+				}
+			}
+		}
+	}
+	else if(Prop == ETilesProp::PROP_COLOR_ENV_OFFSET)
+	{
+		m_ColorEnvOffset = NewVal;
+	}
+	else if(Prop == ETilesProp::PROP_SEED)
+	{
+		m_Seed = NewVal;
+	}
+	else if(Prop == ETilesProp::PROP_AUTOMAPPER)
+	{
+		if(m_Image >= 0 && m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.ConfigNamesNum() > 0 && NewVal >= 0)
+			m_AutoMapperConfig = NewVal % m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.ConfigNamesNum();
+		else
+			m_AutoMapperConfig = -1;
+	}
+
+	if(Prop != ETilesProp::PROP_NONE && Prop != ETilesProp::PROP_SHIFT_BY)
+	{
+		FlagModified(0, 0, m_Width, m_Height);
+	}
+
+	s_Tracker.End(Prop, State);
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CLayerTiles::RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices)
+{
+	if(State.m_Modified)
+	{
+		CUIRect Commit;
+		pToolbox->HSplitBottom(20.0f, pToolbox, &Commit);
+		static int s_CommitButton = 0;
+		if(pEditor->DoButton_Editor(&s_CommitButton, "Commit", 0, &Commit, 0, "Applies the changes"))
+		{
+			bool HasModifiedSize = (State.m_Modified & SCommonPropState::MODIFIED_SIZE) != 0;
+			bool HasModifiedColor = (State.m_Modified & SCommonPropState::MODIFIED_COLOR) != 0;
+
+			std::vector<std::shared_ptr<IEditorAction>> vpActions;
+			int j = 0;
+			int GroupIndex = pEditor->m_SelectedGroup;
+			for(auto &pLayer : vpLayers)
+			{
+				int LayerIndex = vLayerIndices[j++];
+				if(HasModifiedSize)
+				{
+					std::map<int, std::shared_ptr<CLayer>> SavedLayers;
+					SavedLayers[LAYERTYPE_TILES] = pLayer->Duplicate();
+					if(pLayer->m_Game || pLayer->m_Front || pLayer->m_Switch || pLayer->m_Speedup || pLayer->m_Tune || pLayer->m_Tele)
+					{ // Need to save all entities layers when any entity layer
+						if(pEditor->m_Map.m_pFrontLayer && !pLayer->m_Front)
+							SavedLayers[LAYERTYPE_FRONT] = pEditor->m_Map.m_pFrontLayer->Duplicate();
+						if(pEditor->m_Map.m_pTeleLayer && !pLayer->m_Tele)
+							SavedLayers[LAYERTYPE_TELE] = pEditor->m_Map.m_pTeleLayer->Duplicate();
+						if(pEditor->m_Map.m_pSwitchLayer && !pLayer->m_Switch)
+							SavedLayers[LAYERTYPE_SWITCH] = pEditor->m_Map.m_pSwitchLayer->Duplicate();
+						if(pEditor->m_Map.m_pSpeedupLayer && !pLayer->m_Speedup)
+							SavedLayers[LAYERTYPE_SPEEDUP] = pEditor->m_Map.m_pSpeedupLayer->Duplicate();
+						if(pEditor->m_Map.m_pTuneLayer && !pLayer->m_Tune)
+							SavedLayers[LAYERTYPE_TUNE] = pEditor->m_Map.m_pTuneLayer->Duplicate();
+						if(!pLayer->m_Game)
+							SavedLayers[LAYERTYPE_GAME] = pEditor->m_Map.m_pGameLayer->Duplicate();
+					}
+
+					int PrevW = pLayer->m_Width;
+					int PrevH = pLayer->m_Height;
+					pLayer->Resize(State.m_Width, State.m_Height);
+
+					if(PrevW != State.m_Width)
+					{
+						std::shared_ptr<CEditorActionEditLayerTilesProp> pAction;
+						vpActions.push_back(pAction = std::make_shared<CEditorActionEditLayerTilesProp>(pEditor, GroupIndex, LayerIndex, ETilesProp::PROP_WIDTH, PrevW, State.m_Width));
+						pAction->SetSavedLayers(SavedLayers);
+					}
+
+					if(PrevH != State.m_Height)
+					{
+						std::shared_ptr<CEditorActionEditLayerTilesProp> pAction;
+						vpActions.push_back(pAction = std::make_shared<CEditorActionEditLayerTilesProp>(pEditor, GroupIndex, LayerIndex, ETilesProp::PROP_HEIGHT, PrevH, State.m_Height));
+						pAction->SetSavedLayers(SavedLayers);
+					}
+				}
+
+				if(HasModifiedColor && !pLayer->IsEntitiesLayer())
+				{
+					int Color = 0;
+					Color |= pLayer->m_Color.r << 24;
+					Color |= pLayer->m_Color.g << 16;
+					Color |= pLayer->m_Color.b << 8;
+					Color |= pLayer->m_Color.a;
+
+					pLayer->m_Color.r = (State.m_Color >> 24) & 0xff;
+					pLayer->m_Color.g = (State.m_Color >> 16) & 0xff;
+					pLayer->m_Color.b = (State.m_Color >> 8) & 0xff;
+					pLayer->m_Color.a = State.m_Color & 0xff;
+
+					vpActions.push_back(std::make_shared<CEditorActionEditLayerTilesProp>(pEditor, GroupIndex, LayerIndex, ETilesProp::PROP_COLOR, Color, State.m_Color));
+				}
+
+				pLayer->FlagModified(0, 0, pLayer->m_Width, pLayer->m_Height);
+			}
+			State.m_Modified = 0;
+
+			char aDisplay[256];
+			str_format(aDisplay, sizeof(aDisplay), "Edit %d layers common properties: %s", (int)vpLayers.size(), HasModifiedColor && HasModifiedSize ? "color, size" : (HasModifiedColor ? "color" : "size"));
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(pEditor, vpActions, aDisplay));
+		}
+	}
+	else
+	{
+		for(auto &pLayer : vpLayers)
+		{
+			if(pLayer->m_Width > State.m_Width)
+				State.m_Width = pLayer->m_Width;
+			if(pLayer->m_Height > State.m_Height)
+				State.m_Height = pLayer->m_Height;
+		}
+	}
+
+	{
+		CUIRect Warning;
+		pToolbox->HSplitTop(13.0f, &Warning, pToolbox);
+		Warning.HMargin(0.5f, &Warning);
+
+		pEditor->TextRender()->TextColor(ColorRGBA(1.0f, 0.0f, 0.0f, 1.0f));
+		SLabelProperties Props;
+		Props.m_MaxWidth = Warning.w;
+		pEditor->UI()->DoLabel(&Warning, "Editing multiple layers", 9.0f, TEXTALIGN_ML, Props);
+		pEditor->TextRender()->TextColor(ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f));
+		pToolbox->HSplitTop(2.0f, nullptr, pToolbox);
+	}
+
+	CProperty aProps[] = {
+		{"Width", State.m_Width, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Height", State.m_Height, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Shift", 0, PROPTYPE_SHIFT, 0, 0},
+		{"Shift by", pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
+		{"Color", State.m_Color, PROPTYPE_COLOR, 0, 0},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)ETilesCommonProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [PropState, Prop] = pEditor->DoPropertiesWithState<ETilesCommonProp>(pToolbox, aProps, s_aIds, &NewVal);
+
+	static CLayerTilesCommonPropTracker s_Tracker(pEditor);
+	s_Tracker.m_vpLayers = vpLayers;
+	s_Tracker.m_vLayerIndices = vLayerIndices;
+
+	s_Tracker.Begin(nullptr, Prop, PropState);
+
+	if(Prop == ETilesCommonProp::PROP_WIDTH && NewVal > 1)
+	{
+		if(NewVal > 1000 && !pEditor->m_LargeLayerWasWarned)
+		{
+			pEditor->m_PopupEventType = CEditor::POPEVENT_LARGELAYER;
+			pEditor->m_PopupEventActivated = true;
+			pEditor->m_LargeLayerWasWarned = true;
+		}
+		State.m_Width = NewVal;
+	}
+	else if(Prop == ETilesCommonProp::PROP_HEIGHT && NewVal > 1)
+	{
+		if(NewVal > 1000 && !pEditor->m_LargeLayerWasWarned)
+		{
+			pEditor->m_PopupEventType = CEditor::POPEVENT_LARGELAYER;
+			pEditor->m_PopupEventActivated = true;
+			pEditor->m_LargeLayerWasWarned = true;
+		}
+		State.m_Height = NewVal;
+	}
+	else if(Prop == ETilesCommonProp::PROP_SHIFT)
+	{
+		for(auto &pLayer : vpLayers)
+			pLayer->Shift(NewVal);
+	}
+	else if(Prop == ETilesCommonProp::PROP_SHIFT_BY)
+	{
+		pEditor->m_ShiftBy = NewVal;
+	}
+	else if(Prop == ETilesCommonProp::PROP_COLOR)
+	{
+		State.m_Color = NewVal;
+	}
+
+	s_Tracker.End(Prop, PropState);
+
+	if(Prop == ETilesCommonProp::PROP_WIDTH || Prop == ETilesCommonProp::PROP_HEIGHT)
+	{
+		State.m_Modified |= SCommonPropState::MODIFIED_SIZE;
+	}
+	else if(Prop == ETilesCommonProp::PROP_COLOR)
+	{
+		State.m_Modified |= SCommonPropState::MODIFIED_COLOR;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CLayerTiles::FlagModified(int x, int y, int w, int h)
+{
+	m_pEditor->m_Map.OnModify();
+	if(m_Seed != 0 && m_AutoMapperConfig != -1 && m_AutoAutoMap && m_Image >= 0)
+	{
+		m_pEditor->m_Map.m_vpImages[m_Image]->m_AutoMapper.ProceedLocalized(this, m_AutoMapperConfig, m_Seed, x, y, w, h);
+	}
+}
+
+void CLayerTiles::ModifyImageIndex(FIndexModifyFunction Func)
+{
+	Func(&m_Image);
+}
+
+void CLayerTiles::ModifyEnvelopeIndex(FIndexModifyFunction Func)
+{
+	Func(&m_ColorEnv);
+}
diff --git a/src_bkp/game/editor/mapitems/layer_tiles.h b/src_bkp/game/editor/mapitems/layer_tiles.h
new file mode 100644
index 0000000000..ca8e84e889
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tiles.h
@@ -0,0 +1,194 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_TILES_H
+#define GAME_EDITOR_MAPITEMS_LAYER_TILES_H
+
+#include <game/editor/editor_trackers.h>
+#include <map>
+
+#include "layer.h"
+
+struct STileStateChange
+{
+	bool m_Changed;
+	CTile m_Previous;
+	CTile m_Current;
+};
+
+template<typename T>
+using EditorTileStateChangeHistory = std::map<int, std::map<int, T>>;
+
+enum
+{
+	DIRECTION_LEFT = 0,
+	DIRECTION_RIGHT,
+	DIRECTION_UP,
+	DIRECTION_DOWN,
+};
+
+struct RECTi
+{
+	int x, y;
+	int w, h;
+};
+
+class CLayerTiles : public CLayer
+{
+protected:
+	template<typename T>
+	void ShiftImpl(T *pTiles, int Direction, int ShiftBy)
+	{
+		switch(Direction)
+		{
+		case DIRECTION_LEFT:
+			ShiftBy = minimum(ShiftBy, m_Width);
+			for(int y = 0; y < m_Height; ++y)
+			{
+				if(ShiftBy < m_Width)
+					mem_move(&pTiles[y * m_Width], &pTiles[y * m_Width + ShiftBy], (m_Width - ShiftBy) * sizeof(T));
+				mem_zero(&pTiles[y * m_Width + (m_Width - ShiftBy)], ShiftBy * sizeof(T));
+			}
+			break;
+		case DIRECTION_RIGHT:
+			ShiftBy = minimum(ShiftBy, m_Width);
+			for(int y = 0; y < m_Height; ++y)
+			{
+				if(ShiftBy < m_Width)
+					mem_move(&pTiles[y * m_Width + ShiftBy], &pTiles[y * m_Width], (m_Width - ShiftBy) * sizeof(T));
+				mem_zero(&pTiles[y * m_Width], ShiftBy * sizeof(T));
+			}
+			break;
+		case DIRECTION_UP:
+			ShiftBy = minimum(ShiftBy, m_Height);
+			for(int y = ShiftBy; y < m_Height; ++y)
+			{
+				mem_copy(&pTiles[(y - ShiftBy) * m_Width], &pTiles[y * m_Width], m_Width * sizeof(T));
+			}
+			for(int y = m_Height - ShiftBy; y < m_Height; ++y)
+			{
+				mem_zero(&pTiles[y * m_Width], m_Width * sizeof(T));
+			}
+			break;
+		case DIRECTION_DOWN:
+			ShiftBy = minimum(ShiftBy, m_Height);
+			for(int y = m_Height - ShiftBy - 1; y >= 0; --y)
+			{
+				mem_copy(&pTiles[(y + ShiftBy) * m_Width], &pTiles[y * m_Width], m_Width * sizeof(T));
+			}
+			for(int y = 0; y < ShiftBy; ++y)
+			{
+				mem_zero(&pTiles[y * m_Width], m_Width * sizeof(T));
+			}
+			break;
+		}
+	}
+	template<typename T>
+	void BrushFlipXImpl(T *pTiles)
+	{
+		for(int y = 0; y < m_Height; y++)
+			for(int x = 0; x < m_Width / 2; x++)
+				std::swap(pTiles[y * m_Width + x], pTiles[(y + 1) * m_Width - 1 - x]);
+	}
+	template<typename T>
+	void BrushFlipYImpl(T *pTiles)
+	{
+		for(int y = 0; y < m_Height / 2; y++)
+			for(int x = 0; x < m_Width; x++)
+				std::swap(pTiles[y * m_Width + x], pTiles[(m_Height - 1 - y) * m_Width + x]);
+	}
+
+public:
+	CLayerTiles(CEditor *pEditor, int w, int h);
+	CLayerTiles(const CLayerTiles &Other);
+	~CLayerTiles();
+
+	virtual CTile GetTile(int x, int y);
+	virtual void SetTile(int x, int y, CTile Tile);
+	void SetTileIgnoreHistory(int x, int y, CTile Tile) const;
+
+	virtual void Resize(int NewW, int NewH);
+	virtual void Shift(int Direction);
+
+	void MakePalette() const;
+	void Render(bool Tileset = false) override;
+
+	int ConvertX(float x) const;
+	int ConvertY(float y) const;
+	void Convert(CUIRect Rect, RECTi *pOut) const;
+	void Snap(CUIRect *pRect) const;
+	void Clamp(RECTi *pRect) const;
+
+	virtual bool IsEntitiesLayer() const override;
+
+	virtual bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer);
+	void BrushSelecting(CUIRect Rect) override;
+	int BrushGrab(std::shared_ptr<CLayerGroup> pBrush, CUIRect Rect) override;
+	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+	virtual void ShowInfo();
+	CUI::EPopupMenuFunctionResult RenderProperties(CUIRect *pToolbox) override;
+
+	struct SCommonPropState
+	{
+		enum
+		{
+			MODIFIED_SIZE = 1 << 0,
+			MODIFIED_COLOR = 1 << 1,
+		};
+		int m_Modified = 0;
+		int m_Width = -1;
+		int m_Height = -1;
+		int m_Color = 0;
+	};
+	static CUI::EPopupMenuFunctionResult RenderCommonProperties(SCommonPropState &State, CEditor *pEditor, CUIRect *pToolbox, std::vector<std::shared_ptr<CLayerTiles>> &vpLayers, std::vector<int> &vLayerIndices);
+
+	void ModifyImageIndex(FIndexModifyFunction pfnFunc) override;
+	void ModifyEnvelopeIndex(FIndexModifyFunction pfnFunc) override;
+
+	void PrepareForSave();
+	void ExtractTiles(int TilemapItemVersion, const CTile *pSavedTiles, size_t SavedTilesSize) const;
+
+	void GetSize(float *pWidth, float *pHeight) override
+	{
+		*pWidth = m_Width * 32.0f;
+		*pHeight = m_Height * 32.0f;
+	}
+
+	void FlagModified(int x, int y, int w, int h);
+
+	int m_Game;
+	int m_Image;
+	int m_Width;
+	int m_Height;
+	CColor m_Color;
+	int m_ColorEnv;
+	int m_ColorEnvOffset;
+	CTile *m_pTiles;
+
+	// DDRace
+
+	int m_AutoMapperConfig;
+	int m_Seed;
+	bool m_AutoAutoMap;
+	int m_Tele;
+	int m_Speedup;
+	int m_Front;
+	int m_Switch;
+	int m_Tune;
+	char m_aFileName[IO_MAX_PATH_LENGTH];
+
+	EditorTileStateChangeHistory<STileStateChange> m_TilesHistory;
+	inline virtual void ClearHistory() { m_TilesHistory.clear(); }
+
+protected:
+	void RecordStateChange(int x, int y, CTile Previous, CTile Tile);
+
+	friend class CAutoMapper;
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/layer_tune.cpp b/src_bkp/game/editor/mapitems/layer_tune.cpp
new file mode 100644
index 0000000000..0a41fcc7b2
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tune.cpp
@@ -0,0 +1,273 @@
+#include "layer_tune.h"
+
+#include <game/editor/editor.h>
+
+CLayerTune::CLayerTune(CEditor *pEditor, int w, int h) :
+	CLayerTiles(pEditor, w, h)
+{
+	str_copy(m_aName, "Tune");
+	m_Tune = 1;
+
+	m_pTuneTile = new CTuneTile[w * h];
+	mem_zero(m_pTuneTile, (size_t)w * h * sizeof(CTuneTile));
+}
+
+CLayerTune::CLayerTune(const CLayerTune &Other) :
+	CLayerTiles(Other)
+{
+	str_copy(m_aName, "Tune copy");
+	m_Tune = 1;
+
+	m_pTuneTile = new CTuneTile[m_Width * m_Height];
+	mem_copy(m_pTuneTile, Other.m_pTuneTile, (size_t)m_Width * m_Height * sizeof(CTuneTile));
+}
+
+CLayerTune::~CLayerTune()
+{
+	delete[] m_pTuneTile;
+}
+
+void CLayerTune::Resize(int NewW, int NewH)
+{
+	// resize Tune data
+	CTuneTile *pNewTuneData = new CTuneTile[NewW * NewH];
+	mem_zero(pNewTuneData, (size_t)NewW * NewH * sizeof(CTuneTile));
+
+	// copy old data
+	for(int y = 0; y < minimum(NewH, m_Height); y++)
+		mem_copy(&pNewTuneData[y * NewW], &m_pTuneTile[y * m_Width], minimum(m_Width, NewW) * sizeof(CTuneTile));
+
+	// replace old
+	delete[] m_pTuneTile;
+	m_pTuneTile = pNewTuneData;
+
+	// resize tile data
+	CLayerTiles::Resize(NewW, NewH);
+
+	// resize gamelayer too
+	if(m_pEditor->m_Map.m_pGameLayer->m_Width != NewW || m_pEditor->m_Map.m_pGameLayer->m_Height != NewH)
+		m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
+}
+
+void CLayerTune::Shift(int Direction)
+{
+	CLayerTiles::Shift(Direction);
+	ShiftImpl(m_pTuneTile, Direction, m_pEditor->m_ShiftBy);
+}
+
+bool CLayerTune::IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer)
+{
+	for(int y = 0; y < pLayer->m_Height; y++)
+		for(int x = 0; x < pLayer->m_Width; x++)
+			if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidTuneTile(pLayer->GetTile(x, y).m_Index))
+				return false;
+
+	return true;
+}
+
+void CLayerTune::BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy)
+{
+	if(m_Readonly)
+		return;
+
+	std::shared_ptr<CLayerTune> pTuneLayer = std::static_pointer_cast<CLayerTune>(pBrush);
+	int sx = ConvertX(wx);
+	int sy = ConvertY(wy);
+	if(str_comp(pTuneLayer->m_aFileName, m_pEditor->m_aFileName))
+	{
+		m_pEditor->m_TuningNum = pTuneLayer->m_TuningNumber;
+	}
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || IsEmpty(pTuneLayer);
+
+	for(int y = 0; y < pTuneLayer->m_Height; y++)
+		for(int x = 0; x < pTuneLayer->m_Width; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			int Index = fy * m_Width + fx;
+			STuneTileStateChange::SData Previous{
+				m_pTuneTile[Index].m_Number,
+				m_pTuneTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			if((m_pEditor->m_AllowPlaceUnusedTiles || IsValidTuneTile(pTuneLayer->m_pTiles[y * pTuneLayer->m_Width + x].m_Index)) && pTuneLayer->m_pTiles[y * pTuneLayer->m_Width + x].m_Index != TILE_AIR)
+			{
+				if(m_pEditor->m_TuningNum != pTuneLayer->m_TuningNumber)
+				{
+					m_pTuneTile[Index].m_Number = m_pEditor->m_TuningNum;
+				}
+				else if(pTuneLayer->m_pTuneTile[y * pTuneLayer->m_Width + x].m_Number)
+					m_pTuneTile[Index].m_Number = pTuneLayer->m_pTuneTile[y * pTuneLayer->m_Width + x].m_Number;
+				else
+				{
+					if(!m_pEditor->m_TuningNum)
+					{
+						m_pTuneTile[Index].m_Number = 0;
+						m_pTuneTile[Index].m_Type = 0;
+						m_pTiles[Index].m_Index = 0;
+						continue;
+					}
+					else
+						m_pTuneTile[Index].m_Number = m_pEditor->m_TuningNum;
+				}
+
+				m_pTuneTile[Index].m_Type = pTuneLayer->m_pTiles[y * pTuneLayer->m_Width + x].m_Index;
+				m_pTiles[Index].m_Index = pTuneLayer->m_pTiles[y * pTuneLayer->m_Width + x].m_Index;
+			}
+			else
+			{
+				m_pTuneTile[Index].m_Number = 0;
+				m_pTuneTile[Index].m_Type = 0;
+				m_pTiles[Index].m_Index = 0;
+			}
+
+			STuneTileStateChange::SData Current{
+				m_pTuneTile[Index].m_Number,
+				m_pTuneTile[Index].m_Type,
+				m_pTiles[Index].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	FlagModified(sx, sy, pTuneLayer->m_Width, pTuneLayer->m_Height);
+}
+
+void CLayerTune::RecordStateChange(int x, int y, STuneTileStateChange::SData Previous, STuneTileStateChange::SData Current)
+{
+	if(!m_History[y][x].m_Changed)
+		m_History[y][x] = STuneTileStateChange{true, Previous, Current};
+	else
+		m_History[y][x].m_Current = Current;
+}
+
+void CLayerTune::BrushFlipX()
+{
+	CLayerTiles::BrushFlipX();
+	BrushFlipXImpl(m_pTuneTile);
+}
+
+void CLayerTune::BrushFlipY()
+{
+	CLayerTiles::BrushFlipY();
+	BrushFlipYImpl(m_pTuneTile);
+}
+
+void CLayerTune::BrushRotate(float Amount)
+{
+	int Rotation = (round_to_int(360.0f * Amount / (pi * 2)) / 90) % 4; // 0=0°, 1=90°, 2=180°, 3=270°
+	if(Rotation < 0)
+		Rotation += 4;
+
+	if(Rotation == 1 || Rotation == 3)
+	{
+		// 90° rotation
+		CTuneTile *pTempData1 = new CTuneTile[m_Width * m_Height];
+		CTile *pTempData2 = new CTile[m_Width * m_Height];
+		mem_copy(pTempData1, m_pTuneTile, (size_t)m_Width * m_Height * sizeof(CTuneTile));
+		mem_copy(pTempData2, m_pTiles, (size_t)m_Width * m_Height * sizeof(CTile));
+		CTuneTile *pDst1 = m_pTuneTile;
+		CTile *pDst2 = m_pTiles;
+		for(int x = 0; x < m_Width; ++x)
+			for(int y = m_Height - 1; y >= 0; --y, ++pDst1, ++pDst2)
+			{
+				*pDst1 = pTempData1[y * m_Width + x];
+				*pDst2 = pTempData2[y * m_Width + x];
+			}
+
+		std::swap(m_Width, m_Height);
+		delete[] pTempData1;
+		delete[] pTempData2;
+	}
+
+	if(Rotation == 2 || Rotation == 3)
+	{
+		BrushFlipX();
+		BrushFlipY();
+	}
+}
+
+void CLayerTune::FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect)
+{
+	if(m_Readonly || (!Empty && pBrush->m_Type != LAYERTYPE_TILES))
+		return;
+
+	Snap(&Rect); // corrects Rect; no need of <=
+
+	int sx = ConvertX(Rect.x);
+	int sy = ConvertY(Rect.y);
+	int w = ConvertX(Rect.w);
+	int h = ConvertY(Rect.h);
+
+	std::shared_ptr<CLayerTune> pLt = std::static_pointer_cast<CLayerTune>(pBrush);
+
+	bool Destructive = m_pEditor->m_BrushDrawDestructive || Empty || IsEmpty(pLt);
+
+	for(int y = 0; y < h; y++)
+	{
+		for(int x = 0; x < w; x++)
+		{
+			int fx = x + sx;
+			int fy = y + sy;
+
+			if(fx < 0 || fx >= m_Width || fy < 0 || fy >= m_Height)
+				continue;
+
+			if(!Destructive && GetTile(fx, fy).m_Index)
+				continue;
+
+			const int SrcIndex = Empty ? 0 : (y * pLt->m_Width + x % pLt->m_Width) % (pLt->m_Width * pLt->m_Height);
+			const int TgtIndex = fy * m_Width + fx;
+
+			STuneTileStateChange::SData Previous{
+				m_pTuneTile[TgtIndex].m_Number,
+				m_pTuneTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			if(Empty || (!m_pEditor->m_AllowPlaceUnusedTiles && !IsValidTuneTile((pLt->m_pTiles[SrcIndex]).m_Index)))
+			{
+				m_pTiles[TgtIndex].m_Index = 0;
+				m_pTuneTile[TgtIndex].m_Type = 0;
+				m_pTuneTile[TgtIndex].m_Number = 0;
+			}
+			else
+			{
+				m_pTiles[TgtIndex] = pLt->m_pTiles[SrcIndex];
+				if(pLt->m_Tune && m_pTiles[TgtIndex].m_Index > 0)
+				{
+					m_pTuneTile[TgtIndex].m_Type = m_pTiles[fy * m_Width + fx].m_Index;
+
+					if((pLt->m_pTuneTile[SrcIndex].m_Number == 0 && m_pEditor->m_TuningNum) || m_pEditor->m_TuningNum != pLt->m_TuningNumber)
+						m_pTuneTile[TgtIndex].m_Number = m_pEditor->m_TuningNum;
+					else
+						m_pTuneTile[TgtIndex].m_Number = pLt->m_pTuneTile[SrcIndex].m_Number;
+				}
+			}
+
+			STuneTileStateChange::SData Current{
+				m_pTuneTile[TgtIndex].m_Number,
+				m_pTuneTile[TgtIndex].m_Type,
+				m_pTiles[TgtIndex].m_Index};
+
+			RecordStateChange(fx, fy, Previous, Current);
+		}
+	}
+
+	FlagModified(sx, sy, w, h);
+}
+
+std::shared_ptr<CLayer> CLayerTune::Duplicate() const
+{
+	return std::make_shared<CLayerTune>(*this);
+}
+
+const char *CLayerTune::TypeName() const
+{
+	return "tune";
+}
diff --git a/src_bkp/game/editor/mapitems/layer_tune.h b/src_bkp/game/editor/mapitems/layer_tune.h
new file mode 100644
index 0000000000..cf35b95693
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/layer_tune.h
@@ -0,0 +1,50 @@
+#ifndef GAME_EDITOR_MAPITEMS_LAYER_TUNE_H
+#define GAME_EDITOR_MAPITEMS_LAYER_TUNE_H
+
+#include "layer_tiles.h"
+
+struct STuneTileStateChange
+{
+	bool m_Changed;
+	struct SData
+	{
+		int m_Number;
+		int m_Type;
+		int m_Index;
+	} m_Previous, m_Current;
+};
+
+class CLayerTune : public CLayerTiles
+{
+public:
+	CLayerTune(CEditor *pEditor, int w, int h);
+	CLayerTune(const CLayerTune &Other);
+	~CLayerTune();
+
+	CTuneTile *m_pTuneTile;
+	unsigned char m_TuningNumber;
+
+	void Resize(int NewW, int NewH) override;
+	void Shift(int Direction) override;
+	bool IsEmpty(const std::shared_ptr<CLayerTiles> &pLayer) override;
+	void BrushDraw(std::shared_ptr<CLayer> pBrush, float wx, float wy) override;
+	void BrushFlipX() override;
+	void BrushFlipY() override;
+	void BrushRotate(float Amount) override;
+	void FillSelection(bool Empty, std::shared_ptr<CLayer> pBrush, CUIRect Rect) override;
+
+	EditorTileStateChangeHistory<STuneTileStateChange> m_History;
+	inline void ClearHistory() override
+	{
+		CLayerTiles::ClearHistory();
+		m_History.clear();
+	}
+
+	std::shared_ptr<CLayer> Duplicate() const override;
+	const char *TypeName() const override;
+
+private:
+	void RecordStateChange(int x, int y, STuneTileStateChange::SData Previous, STuneTileStateChange::SData Current);
+};
+
+#endif
diff --git a/src_bkp/game/editor/mapitems/map.cpp b/src_bkp/game/editor/mapitems/map.cpp
new file mode 100644
index 0000000000..8f8ae1fbb0
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/map.cpp
@@ -0,0 +1,178 @@
+#include <game/editor/editor.h>
+
+#include "image.h"
+
+void CEditorMap::OnModify()
+{
+	m_Modified = true;
+	m_ModifiedAuto = true;
+	m_LastModifiedTime = m_pEditor->Client()->GlobalTime();
+}
+
+void CEditorMap::DeleteEnvelope(int Index)
+{
+	if(Index < 0 || Index >= (int)m_vpEnvelopes.size())
+		return;
+
+	OnModify();
+
+	VisitEnvelopeReferences([Index](int &ElementIndex) {
+		if(ElementIndex == Index)
+			ElementIndex = -1;
+		else if(ElementIndex > Index)
+			ElementIndex--;
+	});
+
+	m_vpEnvelopes.erase(m_vpEnvelopes.begin() + Index);
+}
+
+void CEditorMap::SwapEnvelopes(int Index0, int Index1)
+{
+	if(Index0 < 0 || Index0 >= (int)m_vpEnvelopes.size())
+		return;
+	if(Index1 < 0 || Index1 >= (int)m_vpEnvelopes.size())
+		return;
+	if(Index0 == Index1)
+		return;
+
+	OnModify();
+
+	VisitEnvelopeReferences([Index0, Index1](int &ElementIndex) {
+		if(ElementIndex == Index0)
+			ElementIndex = Index1;
+		else if(ElementIndex == Index1)
+			ElementIndex = Index0;
+	});
+
+	std::swap(m_vpEnvelopes[Index0], m_vpEnvelopes[Index1]);
+}
+
+template<typename F>
+void CEditorMap::VisitEnvelopeReferences(F &&Visitor)
+{
+	for(auto &pGroup : m_vpGroups)
+	{
+		for(auto &pLayer : pGroup->m_vpLayers)
+		{
+			if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(pLayer);
+				for(auto &Quad : pLayerQuads->m_vQuads)
+				{
+					Visitor(Quad.m_PosEnv);
+					Visitor(Quad.m_ColorEnv);
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+				Visitor(pLayerTiles->m_ColorEnv);
+			}
+			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(pLayer);
+				for(auto &Source : pLayerSounds->m_vSources)
+				{
+					Visitor(Source.m_PosEnv);
+					Visitor(Source.m_SoundEnv);
+				}
+			}
+		}
+	}
+}
+
+void CEditorMap::MakeGameLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pGameLayer = std::static_pointer_cast<CLayerGame>(pLayer);
+	m_pGameLayer->m_pEditor = m_pEditor;
+}
+
+void CEditorMap::MakeGameGroup(std::shared_ptr<CLayerGroup> pGroup)
+{
+	m_pGameGroup = std::move(pGroup);
+	m_pGameGroup->m_GameGroup = true;
+	str_copy(m_pGameGroup->m_aName, "Game");
+}
+
+void CEditorMap::Clean()
+{
+	m_vpGroups.clear();
+	m_vpEnvelopes.clear();
+	m_vpImages.clear();
+	m_vpSounds.clear();
+
+	m_MapInfo.Reset();
+	m_MapInfoTmp.Reset();
+
+	m_vSettings.clear();
+
+	m_pGameLayer = nullptr;
+	m_pGameGroup = nullptr;
+
+	m_Modified = false;
+	m_ModifiedAuto = false;
+
+	m_pTeleLayer = nullptr;
+	m_pSpeedupLayer = nullptr;
+	m_pFrontLayer = nullptr;
+	m_pSwitchLayer = nullptr;
+	m_pTuneLayer = nullptr;
+}
+
+void CEditorMap::CreateDefault(IGraphics::CTextureHandle EntitiesTexture)
+{
+	// add background
+	std::shared_ptr<CLayerGroup> pGroup = NewGroup();
+	pGroup->m_ParallaxX = 0;
+	pGroup->m_ParallaxY = 0;
+	std::shared_ptr<CLayerQuads> pLayer = std::make_shared<CLayerQuads>(m_pEditor);
+	CQuad *pQuad = pLayer->NewQuad(0, 0, 1600, 1200);
+	pQuad->m_aColors[0].r = pQuad->m_aColors[1].r = 94;
+	pQuad->m_aColors[0].g = pQuad->m_aColors[1].g = 132;
+	pQuad->m_aColors[0].b = pQuad->m_aColors[1].b = 174;
+	pQuad->m_aColors[2].r = pQuad->m_aColors[3].r = 204;
+	pQuad->m_aColors[2].g = pQuad->m_aColors[3].g = 232;
+	pQuad->m_aColors[2].b = pQuad->m_aColors[3].b = 255;
+	pGroup->AddLayer(pLayer);
+
+	// add game layer and reset front, tele, speedup, tune and switch layer pointers
+	MakeGameGroup(NewGroup());
+	MakeGameLayer(std::make_shared<CLayerGame>(m_pEditor, 50, 50));
+	m_pGameGroup->AddLayer(m_pGameLayer);
+
+	m_pFrontLayer = nullptr;
+	m_pTeleLayer = nullptr;
+	m_pSpeedupLayer = nullptr;
+	m_pSwitchLayer = nullptr;
+	m_pTuneLayer = nullptr;
+}
+
+void CEditorMap::MakeTeleLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pTeleLayer = std::static_pointer_cast<CLayerTele>(pLayer);
+	m_pTeleLayer->m_pEditor = m_pEditor;
+}
+
+void CEditorMap::MakeSpeedupLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pSpeedupLayer = std::static_pointer_cast<CLayerSpeedup>(pLayer);
+	m_pSpeedupLayer->m_pEditor = m_pEditor;
+}
+
+void CEditorMap::MakeFrontLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pFrontLayer = std::static_pointer_cast<CLayerFront>(pLayer);
+	m_pFrontLayer->m_pEditor = m_pEditor;
+}
+
+void CEditorMap::MakeSwitchLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pSwitchLayer = std::static_pointer_cast<CLayerSwitch>(pLayer);
+	m_pSwitchLayer->m_pEditor = m_pEditor;
+}
+
+void CEditorMap::MakeTuneLayer(const std::shared_ptr<CLayer> &pLayer)
+{
+	m_pTuneLayer = std::static_pointer_cast<CLayerTune>(pLayer);
+	m_pTuneLayer->m_pEditor = m_pEditor;
+}
diff --git a/src_bkp/game/editor/mapitems/map_io.cpp b/src_bkp/game/editor/mapitems/map_io.cpp
new file mode 100644
index 0000000000..30a88ee40e
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/map_io.cpp
@@ -0,0 +1,1010 @@
+#include <game/editor/editor.h>
+
+#include <engine/client.h>
+#include <engine/console.h>
+#include <engine/graphics.h>
+#include <engine/serverbrowser.h>
+#include <engine/shared/datafile.h>
+#include <engine/sound.h>
+#include <engine/storage.h>
+
+#include <game/gamecore.h>
+#include <game/mapitems_ex.h>
+
+#include "image.h"
+#include "sound.h"
+
+template<typename T>
+static int MakeVersion(int i, const T &v)
+{
+	return (i << 16) + sizeof(T);
+}
+
+// compatibility with old sound layers
+struct CSoundSource_DEPRECATED
+{
+	CPoint m_Position;
+	int m_Loop;
+	int m_TimeDelay; // in s
+	int m_FalloffDistance;
+	int m_PosEnv;
+	int m_PosEnvOffset;
+	int m_SoundEnv;
+	int m_SoundEnvOffset;
+};
+
+bool CEditorMap::Save(const char *pFileName)
+{
+	char aFileNameTmp[IO_MAX_PATH_LENGTH];
+	str_format(aFileNameTmp, sizeof(aFileNameTmp), "%s.%d.tmp", pFileName, pid());
+	char aBuf[IO_MAX_PATH_LENGTH + 64];
+	str_format(aBuf, sizeof(aBuf), "saving to '%s'...", aFileNameTmp);
+	m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
+	CDataFileWriter Writer;
+	if(!Writer.Open(m_pEditor->Storage(), aFileNameTmp))
+	{
+		str_format(aBuf, sizeof(aBuf), "failed to open file '%s'...", aFileNameTmp);
+		m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "editor", aBuf);
+		return false;
+	}
+
+	// save version
+	{
+		CMapItemVersion Item;
+		Item.m_Version = CMapItemVersion::CURRENT_VERSION;
+		Writer.AddItem(MAPITEMTYPE_VERSION, 0, sizeof(Item), &Item);
+	}
+
+	// save map info
+	{
+		CMapItemInfoSettings Item;
+		Item.m_Version = 1;
+		Item.m_Author = Writer.AddDataString(m_MapInfo.m_aAuthor);
+		Item.m_MapVersion = Writer.AddDataString(m_MapInfo.m_aVersion);
+		Item.m_Credits = Writer.AddDataString(m_MapInfo.m_aCredits);
+		Item.m_License = Writer.AddDataString(m_MapInfo.m_aLicense);
+
+		Item.m_Settings = -1;
+		if(!m_vSettings.empty())
+		{
+			int Size = 0;
+			for(const auto &Setting : m_vSettings)
+			{
+				Size += str_length(Setting.m_aCommand) + 1;
+			}
+
+			char *pSettings = (char *)malloc(maximum(Size, 1));
+			char *pNext = pSettings;
+			for(const auto &Setting : m_vSettings)
+			{
+				int Length = str_length(Setting.m_aCommand) + 1;
+				mem_copy(pNext, Setting.m_aCommand, Length);
+				pNext += Length;
+			}
+			Item.m_Settings = Writer.AddData(Size, pSettings);
+			free(pSettings);
+		}
+
+		Writer.AddItem(MAPITEMTYPE_INFO, 0, sizeof(Item), &Item);
+	}
+
+	// save images
+	for(size_t i = 0; i < m_vpImages.size(); i++)
+	{
+		std::shared_ptr<CEditorImage> pImg = m_vpImages[i];
+
+		// analyse the image for when saving (should be done when we load the image)
+		// TODO!
+		pImg->AnalyseTileFlags();
+
+		CMapItemImage Item;
+		Item.m_Version = CMapItemImage::CURRENT_VERSION;
+
+		Item.m_Width = pImg->m_Width;
+		Item.m_Height = pImg->m_Height;
+		Item.m_External = pImg->m_External;
+		Item.m_ImageName = Writer.AddDataString(pImg->m_aName);
+		if(pImg->m_External)
+		{
+			Item.m_ImageData = -1;
+		}
+		else
+		{
+			const size_t PixelSize = CImageInfo::PixelSize(CImageInfo::FORMAT_RGBA);
+			const size_t DataSize = (size_t)Item.m_Width * Item.m_Height * PixelSize;
+			if(pImg->m_Format == CImageInfo::FORMAT_RGB)
+			{
+				// Convert to RGBA
+				unsigned char *pDataRGBA = (unsigned char *)malloc(DataSize);
+				unsigned char *pDataRGB = (unsigned char *)pImg->m_pData;
+				for(int j = 0; j < Item.m_Width * Item.m_Height; j++)
+				{
+					pDataRGBA[j * PixelSize] = pDataRGB[j * 3];
+					pDataRGBA[j * PixelSize + 1] = pDataRGB[j * 3 + 1];
+					pDataRGBA[j * PixelSize + 2] = pDataRGB[j * 3 + 2];
+					pDataRGBA[j * PixelSize + 3] = 255;
+				}
+				Item.m_ImageData = Writer.AddData(DataSize, pDataRGBA);
+				free(pDataRGBA);
+			}
+			else
+			{
+				Item.m_ImageData = Writer.AddData(DataSize, pImg->m_pData);
+			}
+		}
+		Writer.AddItem(MAPITEMTYPE_IMAGE, i, sizeof(Item), &Item);
+	}
+
+	// save sounds
+	for(size_t i = 0; i < m_vpSounds.size(); i++)
+	{
+		std::shared_ptr<CEditorSound> pSound = m_vpSounds[i];
+
+		CMapItemSound Item;
+		Item.m_Version = 1;
+
+		Item.m_External = 0;
+		Item.m_SoundName = Writer.AddDataString(pSound->m_aName);
+		Item.m_SoundData = Writer.AddData(pSound->m_DataSize, pSound->m_pData);
+		Item.m_SoundDataSize = pSound->m_DataSize;
+
+		Writer.AddItem(MAPITEMTYPE_SOUND, i, sizeof(Item), &Item);
+	}
+
+	// save layers
+	int LayerCount = 0, GroupCount = 0;
+	int AutomapperCount = 0;
+	for(const auto &pGroup : m_vpGroups)
+	{
+		CMapItemGroup GItem;
+		GItem.m_Version = CMapItemGroup::CURRENT_VERSION;
+
+		GItem.m_ParallaxX = pGroup->m_ParallaxX;
+		GItem.m_ParallaxY = pGroup->m_ParallaxY;
+		GItem.m_OffsetX = pGroup->m_OffsetX;
+		GItem.m_OffsetY = pGroup->m_OffsetY;
+		GItem.m_UseClipping = pGroup->m_UseClipping;
+		GItem.m_ClipX = pGroup->m_ClipX;
+		GItem.m_ClipY = pGroup->m_ClipY;
+		GItem.m_ClipW = pGroup->m_ClipW;
+		GItem.m_ClipH = pGroup->m_ClipH;
+		GItem.m_StartLayer = LayerCount;
+		GItem.m_NumLayers = 0;
+
+		// save group name
+		StrToInts(GItem.m_aName, sizeof(GItem.m_aName) / sizeof(int), pGroup->m_aName);
+
+		for(const std::shared_ptr<CLayer> &pLayer : pGroup->m_vpLayers)
+		{
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving tiles layer");
+				std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+				pLayerTiles->PrepareForSave();
+
+				CMapItemLayerTilemap Item;
+				Item.m_Version = CMapItemLayerTilemap::CURRENT_VERSION;
+
+				Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
+				Item.m_Layer.m_Flags = pLayerTiles->m_Flags;
+				Item.m_Layer.m_Type = pLayerTiles->m_Type;
+
+				Item.m_Color = pLayerTiles->m_Color;
+				Item.m_ColorEnv = pLayerTiles->m_ColorEnv;
+				Item.m_ColorEnvOffset = pLayerTiles->m_ColorEnvOffset;
+
+				Item.m_Width = pLayerTiles->m_Width;
+				Item.m_Height = pLayerTiles->m_Height;
+				// Item.m_Flags = pLayerTiles->m_Game ? TILESLAYERFLAG_GAME : 0;
+
+				if(pLayerTiles->m_Tele)
+					Item.m_Flags = TILESLAYERFLAG_TELE;
+				else if(pLayerTiles->m_Speedup)
+					Item.m_Flags = TILESLAYERFLAG_SPEEDUP;
+				else if(pLayerTiles->m_Front)
+					Item.m_Flags = TILESLAYERFLAG_FRONT;
+				else if(pLayerTiles->m_Switch)
+					Item.m_Flags = TILESLAYERFLAG_SWITCH;
+				else if(pLayerTiles->m_Tune)
+					Item.m_Flags = TILESLAYERFLAG_TUNE;
+				else
+					Item.m_Flags = pLayerTiles->m_Game ? TILESLAYERFLAG_GAME : 0;
+
+				Item.m_Image = pLayerTiles->m_Image;
+
+				// the following values were previously uninitialized, do not rely on them being -1 when unused
+				Item.m_Tele = -1;
+				Item.m_Speedup = -1;
+				Item.m_Front = -1;
+				Item.m_Switch = -1;
+				Item.m_Tune = -1;
+
+				if(Item.m_Flags && !(pLayerTiles->m_Game))
+				{
+					CTile *pEmptyTiles = (CTile *)calloc((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height, sizeof(CTile));
+					mem_zero(pEmptyTiles, (size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile));
+					Item.m_Data = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile), pEmptyTiles);
+					free(pEmptyTiles);
+
+					if(pLayerTiles->m_Tele)
+						Item.m_Tele = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTeleTile), std::static_pointer_cast<CLayerTele>(pLayerTiles)->m_pTeleTile);
+					else if(pLayerTiles->m_Speedup)
+						Item.m_Speedup = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CSpeedupTile), std::static_pointer_cast<CLayerSpeedup>(pLayerTiles)->m_pSpeedupTile);
+					else if(pLayerTiles->m_Front)
+						Item.m_Front = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile), pLayerTiles->m_pTiles);
+					else if(pLayerTiles->m_Switch)
+						Item.m_Switch = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CSwitchTile), std::static_pointer_cast<CLayerSwitch>(pLayerTiles)->m_pSwitchTile);
+					else if(pLayerTiles->m_Tune)
+						Item.m_Tune = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTuneTile), std::static_pointer_cast<CLayerTune>(pLayerTiles)->m_pTuneTile);
+				}
+				else
+					Item.m_Data = Writer.AddData((size_t)pLayerTiles->m_Width * pLayerTiles->m_Height * sizeof(CTile), pLayerTiles->m_pTiles);
+
+				// save layer name
+				StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerTiles->m_aName);
+
+				Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
+
+				// save auto mapper of each tile layer (not physics layer)
+				if(!Item.m_Flags)
+				{
+					CMapItemAutoMapperConfig ItemAutomapper;
+					ItemAutomapper.m_Version = CMapItemAutoMapperConfig::CURRENT_VERSION;
+					ItemAutomapper.m_GroupId = GroupCount;
+					ItemAutomapper.m_LayerId = GItem.m_NumLayers;
+					ItemAutomapper.m_AutomapperConfig = pLayerTiles->m_AutoMapperConfig;
+					ItemAutomapper.m_AutomapperSeed = pLayerTiles->m_Seed;
+					ItemAutomapper.m_Flags = 0;
+					if(pLayerTiles->m_AutoAutoMap)
+						ItemAutomapper.m_Flags |= CMapItemAutoMapperConfig::FLAG_AUTOMATIC;
+
+					Writer.AddItem(MAPITEMTYPE_AUTOMAPPER_CONFIG, AutomapperCount, sizeof(ItemAutomapper), &ItemAutomapper);
+					AutomapperCount++;
+				}
+
+				GItem.m_NumLayers++;
+				LayerCount++;
+			}
+			else if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving quads layer");
+				std::shared_ptr<CLayerQuads> pLayerQuads = std::static_pointer_cast<CLayerQuads>(pLayer);
+				if(!pLayerQuads->m_vQuads.empty())
+				{
+					CMapItemLayerQuads Item;
+					Item.m_Version = 2;
+					Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
+					Item.m_Layer.m_Flags = pLayerQuads->m_Flags;
+					Item.m_Layer.m_Type = pLayerQuads->m_Type;
+					Item.m_Image = pLayerQuads->m_Image;
+
+					// add the data
+					Item.m_NumQuads = pLayerQuads->m_vQuads.size();
+					Item.m_Data = Writer.AddDataSwapped(pLayerQuads->m_vQuads.size() * sizeof(CQuad), pLayerQuads->m_vQuads.data());
+
+					// save layer name
+					StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerQuads->m_aName);
+
+					Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
+
+					GItem.m_NumLayers++;
+					LayerCount++;
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
+			{
+				m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving sounds layer");
+				std::shared_ptr<CLayerSounds> pLayerSounds = std::static_pointer_cast<CLayerSounds>(pLayer);
+				if(!pLayerSounds->m_vSources.empty())
+				{
+					CMapItemLayerSounds Item;
+					Item.m_Version = CMapItemLayerSounds::CURRENT_VERSION;
+					Item.m_Layer.m_Version = 0; // was previously uninitialized, do not rely on it being 0
+					Item.m_Layer.m_Flags = pLayerSounds->m_Flags;
+					Item.m_Layer.m_Type = pLayerSounds->m_Type;
+					Item.m_Sound = pLayerSounds->m_Sound;
+
+					// add the data
+					Item.m_NumSources = pLayerSounds->m_vSources.size();
+					Item.m_Data = Writer.AddDataSwapped(pLayerSounds->m_vSources.size() * sizeof(CSoundSource), pLayerSounds->m_vSources.data());
+
+					// save layer name
+					StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), pLayerSounds->m_aName);
+
+					Writer.AddItem(MAPITEMTYPE_LAYER, LayerCount, sizeof(Item), &Item);
+					GItem.m_NumLayers++;
+					LayerCount++;
+				}
+			}
+		}
+
+		Writer.AddItem(MAPITEMTYPE_GROUP, GroupCount, sizeof(GItem), &GItem);
+		GroupCount++;
+	}
+
+	// save envelopes
+	m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving envelopes");
+	int PointCount = 0;
+	for(size_t e = 0; e < m_vpEnvelopes.size(); e++)
+	{
+		CMapItemEnvelope Item;
+		Item.m_Version = CMapItemEnvelope::CURRENT_VERSION;
+		Item.m_Channels = m_vpEnvelopes[e]->GetChannels();
+		Item.m_StartPoint = PointCount;
+		Item.m_NumPoints = m_vpEnvelopes[e]->m_vPoints.size();
+		Item.m_Synchronized = m_vpEnvelopes[e]->m_Synchronized;
+		StrToInts(Item.m_aName, sizeof(Item.m_aName) / sizeof(int), m_vpEnvelopes[e]->m_aName);
+
+		Writer.AddItem(MAPITEMTYPE_ENVELOPE, e, sizeof(Item), &Item);
+		PointCount += Item.m_NumPoints;
+	}
+
+	// save points
+	m_pEditor->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "editor", "saving envelope points");
+	bool BezierUsed = false;
+	for(const auto &pEnvelope : m_vpEnvelopes)
+	{
+		for(const auto &Point : pEnvelope->m_vPoints)
+		{
+			if(Point.m_Curvetype == CURVETYPE_BEZIER)
+			{
+				BezierUsed = true;
+				break;
+			}
+		}
+		if(BezierUsed)
+			break;
+	}
+
+	CEnvPoint *pPoints = (CEnvPoint *)calloc(maximum(PointCount, 1), sizeof(CEnvPoint));
+	CEnvPointBezier *pPointsBezier = nullptr;
+	if(BezierUsed)
+		pPointsBezier = (CEnvPointBezier *)calloc(maximum(PointCount, 1), sizeof(CEnvPointBezier));
+	PointCount = 0;
+
+	for(const auto &pEnvelope : m_vpEnvelopes)
+	{
+		const CEnvPoint_runtime *pPrevPoint = nullptr;
+		for(const auto &Point : pEnvelope->m_vPoints)
+		{
+			mem_copy(&pPoints[PointCount], &Point, sizeof(CEnvPoint));
+			if(pPointsBezier != nullptr)
+			{
+				if(Point.m_Curvetype == CURVETYPE_BEZIER)
+				{
+					mem_copy(&pPointsBezier[PointCount].m_aOutTangentDeltaX, &Point.m_Bezier.m_aOutTangentDeltaX, sizeof(Point.m_Bezier.m_aOutTangentDeltaX));
+					mem_copy(&pPointsBezier[PointCount].m_aOutTangentDeltaY, &Point.m_Bezier.m_aOutTangentDeltaY, sizeof(Point.m_Bezier.m_aOutTangentDeltaY));
+				}
+				if(pPrevPoint != nullptr && pPrevPoint->m_Curvetype == CURVETYPE_BEZIER)
+				{
+					mem_copy(&pPointsBezier[PointCount].m_aInTangentDeltaX, &Point.m_Bezier.m_aInTangentDeltaX, sizeof(Point.m_Bezier.m_aInTangentDeltaX));
+					mem_copy(&pPointsBezier[PointCount].m_aInTangentDeltaY, &Point.m_Bezier.m_aInTangentDeltaY, sizeof(Point.m_Bezier.m_aInTangentDeltaY));
+				}
+			}
+			PointCount++;
+			pPrevPoint = &Point;
+		}
+	}
+
+	Writer.AddItem(MAPITEMTYPE_ENVPOINTS, 0, sizeof(CEnvPoint) * PointCount, pPoints);
+	free(pPoints);
+
+	if(pPointsBezier != nullptr)
+	{
+		Writer.AddItem(MAPITEMTYPE_ENVPOINTS_BEZIER, 0, sizeof(CEnvPointBezier) * PointCount, pPointsBezier);
+		free(pPointsBezier);
+	}
+
+	// finish the data file
+	std::shared_ptr<CDataFileWriterFinishJob> pWriterFinishJob = std::make_shared<CDataFileWriterFinishJob>(pFileName, aFileNameTmp, std::move(Writer));
+	m_pEditor->Engine()->AddJob(pWriterFinishJob);
+	m_pEditor->m_WriterFinishJobs.push_back(pWriterFinishJob);
+
+	return true;
+}
+
+bool CEditorMap::Load(const char *pFileName, int StorageType, const std::function<void(const char *pErrorMessage)> &ErrorHandler)
+{
+	CDataFileReader DataFile;
+	if(!DataFile.Open(m_pEditor->Storage(), pFileName, StorageType))
+		return false;
+
+	// check version
+	const CMapItemVersion *pItemVersion = static_cast<CMapItemVersion *>(DataFile.FindItem(MAPITEMTYPE_VERSION, 0));
+	if(pItemVersion == nullptr || pItemVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
+	{
+		ErrorHandler("Error: The map has an unsupported version.");
+		return false;
+	}
+
+	Clean();
+
+	// load map info
+	{
+		int Start, Num;
+		DataFile.GetType(MAPITEMTYPE_INFO, &Start, &Num);
+		for(int i = Start; i < Start + Num; i++)
+		{
+			int ItemSize = DataFile.GetItemSize(Start);
+			int ItemID;
+			CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)DataFile.GetItem(i, nullptr, &ItemID);
+			if(!pItem || ItemID != 0)
+				continue;
+
+			const auto &&ReadStringInfo = [&](int Index, char *pBuffer, size_t BufferSize, const char *pErrorContext) {
+				const char *pStr = DataFile.GetDataString(Index);
+				if(pStr == nullptr)
+				{
+					char aBuf[128];
+					str_format(aBuf, sizeof(aBuf), "Error: Failed to read %s from map info.", pErrorContext);
+					ErrorHandler(aBuf);
+					pBuffer[0] = '\0';
+				}
+				else
+				{
+					str_copy(pBuffer, pStr, BufferSize);
+				}
+			};
+
+			ReadStringInfo(pItem->m_Author, m_MapInfo.m_aAuthor, sizeof(m_MapInfo.m_aAuthor), "author");
+			ReadStringInfo(pItem->m_MapVersion, m_MapInfo.m_aVersion, sizeof(m_MapInfo.m_aVersion), "version");
+			ReadStringInfo(pItem->m_Credits, m_MapInfo.m_aCredits, sizeof(m_MapInfo.m_aCredits), "credits");
+			ReadStringInfo(pItem->m_License, m_MapInfo.m_aLicense, sizeof(m_MapInfo.m_aLicense), "license");
+
+			if(pItem->m_Version != 1 || ItemSize < (int)sizeof(CMapItemInfoSettings))
+				break;
+
+			if(!(pItem->m_Settings > -1))
+				break;
+
+			const unsigned Size = DataFile.GetDataSize(pItem->m_Settings);
+			char *pSettings = (char *)DataFile.GetData(pItem->m_Settings);
+			char *pNext = pSettings;
+			while(pNext < pSettings + Size)
+			{
+				int StrSize = str_length(pNext) + 1;
+				m_vSettings.emplace_back(pNext);
+				pNext += StrSize;
+			}
+		}
+	}
+
+	// load images
+	{
+		int Start, Num;
+		DataFile.GetType(MAPITEMTYPE_IMAGE, &Start, &Num);
+		for(int i = 0; i < Num; i++)
+		{
+			CMapItemImage_v2 *pItem = (CMapItemImage_v2 *)DataFile.GetItem(Start + i);
+
+			// copy base info
+			std::shared_ptr<CEditorImage> pImg = std::make_shared<CEditorImage>(m_pEditor);
+			pImg->m_External = pItem->m_External;
+
+			const char *pName = DataFile.GetDataString(pItem->m_ImageName);
+			if(pName == nullptr || pName[0] == '\0')
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "Error: Failed to read name of image %d.", i);
+				ErrorHandler(aBuf);
+			}
+			else
+				str_copy(pImg->m_aName, pName);
+
+			const CImageInfo::EImageFormat Format = pItem->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : CImageInfo::ImageFormatFromInt(pItem->m_Format);
+			if(pImg->m_External || (Format != CImageInfo::FORMAT_RGB && Format != CImageInfo::FORMAT_RGBA))
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "mapres/%s.png", pImg->m_aName);
+
+				// load external
+				CImageInfo ImgInfo;
+				if(m_pEditor->Graphics()->LoadPNG(&ImgInfo, aBuf, IStorage::TYPE_ALL))
+				{
+					pImg->m_Width = ImgInfo.m_Width;
+					pImg->m_Height = ImgInfo.m_Height;
+					pImg->m_Format = ImgInfo.m_Format;
+					pImg->m_pData = ImgInfo.m_pData;
+					int TextureLoadFlag = m_pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+					if(ImgInfo.m_Width % 16 != 0 || ImgInfo.m_Height % 16 != 0)
+						TextureLoadFlag = 0;
+					pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, TextureLoadFlag, aBuf);
+					ImgInfo.m_pData = nullptr;
+					pImg->m_External = 1;
+				}
+			}
+			else
+			{
+				pImg->m_Width = pItem->m_Width;
+				pImg->m_Height = pItem->m_Height;
+				pImg->m_Format = Format;
+
+				// copy image data
+				void *pData = DataFile.GetData(pItem->m_ImageData);
+				const size_t DataSize = (size_t)pImg->m_Width * pImg->m_Height * CImageInfo::PixelSize(Format);
+				pImg->m_pData = malloc(DataSize);
+				mem_copy(pImg->m_pData, pData, DataSize);
+				int TextureLoadFlag = m_pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+				if(pImg->m_Width % 16 != 0 || pImg->m_Height % 16 != 0)
+					TextureLoadFlag = 0;
+				pImg->m_Texture = m_pEditor->Graphics()->LoadTextureRaw(pImg->m_Width, pImg->m_Height, pImg->m_Format, pImg->m_pData, TextureLoadFlag);
+			}
+
+			// load auto mapper file
+			pImg->m_AutoMapper.Load(pImg->m_aName);
+
+			m_vpImages.push_back(pImg);
+
+			// unload image
+			DataFile.UnloadData(pItem->m_ImageData);
+			DataFile.UnloadData(pItem->m_ImageName);
+		}
+	}
+
+	// load sounds
+	{
+		int Start, Num;
+		DataFile.GetType(MAPITEMTYPE_SOUND, &Start, &Num);
+		for(int i = 0; i < Num; i++)
+		{
+			CMapItemSound *pItem = (CMapItemSound *)DataFile.GetItem(Start + i);
+
+			// copy base info
+			std::shared_ptr<CEditorSound> pSound = std::make_shared<CEditorSound>(m_pEditor);
+
+			const char *pName = DataFile.GetDataString(pItem->m_SoundName);
+			if(pName == nullptr || pName[0] == '\0')
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "Error: Failed to read name of sound %d.", i);
+				ErrorHandler(aBuf);
+			}
+			else
+				str_copy(pSound->m_aName, pName);
+
+			if(pItem->m_External)
+			{
+				char aBuf[IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "mapres/%s.opus", pSound->m_aName);
+
+				// load external
+				if(m_pEditor->Storage()->ReadFile(aBuf, IStorage::TYPE_ALL, &pSound->m_pData, &pSound->m_DataSize))
+				{
+					pSound->m_SoundID = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
+				}
+			}
+			else
+			{
+				pSound->m_DataSize = pItem->m_SoundDataSize;
+
+				// copy sample data
+				void *pData = DataFile.GetData(pItem->m_SoundData);
+				pSound->m_pData = malloc(pSound->m_DataSize);
+				mem_copy(pSound->m_pData, pData, pSound->m_DataSize);
+				pSound->m_SoundID = m_pEditor->Sound()->LoadOpusFromMem(pSound->m_pData, pSound->m_DataSize, true);
+			}
+
+			m_vpSounds.push_back(pSound);
+
+			// unload sound
+			DataFile.UnloadData(pItem->m_SoundData);
+			DataFile.UnloadData(pItem->m_SoundName);
+		}
+	}
+
+	// load groups
+	{
+		int LayersStart, LayersNum;
+		DataFile.GetType(MAPITEMTYPE_LAYER, &LayersStart, &LayersNum);
+
+		int Start, Num;
+		DataFile.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
+
+		for(int g = 0; g < Num; g++)
+		{
+			CMapItemGroup *pGItem = (CMapItemGroup *)DataFile.GetItem(Start + g);
+
+			if(pGItem->m_Version < 1 || pGItem->m_Version > CMapItemGroup::CURRENT_VERSION)
+				continue;
+
+			std::shared_ptr<CLayerGroup> pGroup = NewGroup();
+			pGroup->m_ParallaxX = pGItem->m_ParallaxX;
+			pGroup->m_ParallaxY = pGItem->m_ParallaxY;
+			pGroup->m_OffsetX = pGItem->m_OffsetX;
+			pGroup->m_OffsetY = pGItem->m_OffsetY;
+
+			if(pGItem->m_Version >= 2)
+			{
+				pGroup->m_UseClipping = pGItem->m_UseClipping;
+				pGroup->m_ClipX = pGItem->m_ClipX;
+				pGroup->m_ClipY = pGItem->m_ClipY;
+				pGroup->m_ClipW = pGItem->m_ClipW;
+				pGroup->m_ClipH = pGItem->m_ClipH;
+			}
+
+			// load group name
+			if(pGItem->m_Version >= 3)
+				IntsToStr(pGItem->m_aName, sizeof(pGroup->m_aName) / sizeof(int), pGroup->m_aName);
+
+			for(int l = 0; l < pGItem->m_NumLayers; l++)
+			{
+				CMapItemLayer *pLayerItem = (CMapItemLayer *)DataFile.GetItem(LayersStart + pGItem->m_StartLayer + l);
+				if(!pLayerItem)
+					continue;
+
+				if(pLayerItem->m_Type == LAYERTYPE_TILES)
+				{
+					CMapItemLayerTilemap *pTilemapItem = (CMapItemLayerTilemap *)pLayerItem;
+
+					std::shared_ptr<CLayerTiles> pTiles;
+					if(pTilemapItem->m_Flags & TILESLAYERFLAG_GAME)
+					{
+						pTiles = std::make_shared<CLayerGame>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeGameLayer(pTiles);
+						MakeGameGroup(pGroup);
+					}
+					else if(pTilemapItem->m_Flags & TILESLAYERFLAG_TELE)
+					{
+						if(pTilemapItem->m_Version <= 2)
+							pTilemapItem->m_Tele = *((const int *)(pTilemapItem) + 15);
+
+						pTiles = std::make_shared<CLayerTele>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeTeleLayer(pTiles);
+					}
+					else if(pTilemapItem->m_Flags & TILESLAYERFLAG_SPEEDUP)
+					{
+						if(pTilemapItem->m_Version <= 2)
+							pTilemapItem->m_Speedup = *((const int *)(pTilemapItem) + 16);
+
+						pTiles = std::make_shared<CLayerSpeedup>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeSpeedupLayer(pTiles);
+					}
+					else if(pTilemapItem->m_Flags & TILESLAYERFLAG_FRONT)
+					{
+						if(pTilemapItem->m_Version <= 2)
+							pTilemapItem->m_Front = *((const int *)(pTilemapItem) + 17);
+
+						pTiles = std::make_shared<CLayerFront>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeFrontLayer(pTiles);
+					}
+					else if(pTilemapItem->m_Flags & TILESLAYERFLAG_SWITCH)
+					{
+						if(pTilemapItem->m_Version <= 2)
+							pTilemapItem->m_Switch = *((const int *)(pTilemapItem) + 18);
+
+						pTiles = std::make_shared<CLayerSwitch>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeSwitchLayer(pTiles);
+					}
+					else if(pTilemapItem->m_Flags & TILESLAYERFLAG_TUNE)
+					{
+						if(pTilemapItem->m_Version <= 2)
+							pTilemapItem->m_Tune = *((const int *)(pTilemapItem) + 19);
+
+						pTiles = std::make_shared<CLayerTune>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						MakeTuneLayer(pTiles);
+					}
+					else
+					{
+						pTiles = std::make_shared<CLayerTiles>(m_pEditor, pTilemapItem->m_Width, pTilemapItem->m_Height);
+						pTiles->m_pEditor = m_pEditor;
+						pTiles->m_Color = pTilemapItem->m_Color;
+						pTiles->m_ColorEnv = pTilemapItem->m_ColorEnv;
+						pTiles->m_ColorEnvOffset = pTilemapItem->m_ColorEnvOffset;
+					}
+
+					pTiles->m_Flags = pLayerItem->m_Flags;
+
+					pGroup->AddLayer(pTiles);
+					pTiles->m_Image = pTilemapItem->m_Image;
+					pTiles->m_Game = pTilemapItem->m_Flags & TILESLAYERFLAG_GAME;
+
+					// load layer name
+					if(pTilemapItem->m_Version >= 3)
+						IntsToStr(pTilemapItem->m_aName, sizeof(pTiles->m_aName) / sizeof(int), pTiles->m_aName);
+
+					if(pTiles->m_Tele)
+					{
+						void *pTeleData = DataFile.GetData(pTilemapItem->m_Tele);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Tele);
+						if(Size >= (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CTeleTile))
+						{
+							CTeleTile *pLayerTeleTiles = std::static_pointer_cast<CLayerTele>(pTiles)->m_pTeleTile;
+							mem_copy(pLayerTeleTiles, pTeleData, (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CTeleTile));
+
+							for(int i = 0; i < pTiles->m_Width * pTiles->m_Height; i++)
+							{
+								if(IsValidTeleTile(pLayerTeleTiles[i].m_Type))
+									pTiles->m_pTiles[i].m_Index = pLayerTeleTiles[i].m_Type;
+								else
+									pTiles->m_pTiles[i].m_Index = 0;
+							}
+						}
+						DataFile.UnloadData(pTilemapItem->m_Tele);
+					}
+					else if(pTiles->m_Speedup)
+					{
+						void *pSpeedupData = DataFile.GetData(pTilemapItem->m_Speedup);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Speedup);
+
+						if(Size >= (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CSpeedupTile))
+						{
+							CSpeedupTile *pLayerSpeedupTiles = std::static_pointer_cast<CLayerSpeedup>(pTiles)->m_pSpeedupTile;
+							mem_copy(pLayerSpeedupTiles, pSpeedupData, (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CSpeedupTile));
+
+							for(int i = 0; i < pTiles->m_Width * pTiles->m_Height; i++)
+							{
+								if(IsValidSpeedupTile(pLayerSpeedupTiles[i].m_Type) && pLayerSpeedupTiles[i].m_Force > 0)
+									pTiles->m_pTiles[i].m_Index = pLayerSpeedupTiles[i].m_Type;
+								else
+									pTiles->m_pTiles[i].m_Index = 0;
+							}
+						}
+
+						DataFile.UnloadData(pTilemapItem->m_Speedup);
+					}
+					else if(pTiles->m_Front)
+					{
+						void *pFrontData = DataFile.GetData(pTilemapItem->m_Front);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Front);
+						pTiles->ExtractTiles(pTilemapItem->m_Version, (CTile *)pFrontData, Size);
+						DataFile.UnloadData(pTilemapItem->m_Front);
+					}
+					else if(pTiles->m_Switch)
+					{
+						void *pSwitchData = DataFile.GetData(pTilemapItem->m_Switch);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Switch);
+						if(Size >= (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CSwitchTile))
+						{
+							CSwitchTile *pLayerSwitchTiles = std::static_pointer_cast<CLayerSwitch>(pTiles)->m_pSwitchTile;
+							mem_copy(pLayerSwitchTiles, pSwitchData, (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CSwitchTile));
+
+							for(int i = 0; i < pTiles->m_Width * pTiles->m_Height; i++)
+							{
+								if(((pLayerSwitchTiles[i].m_Type > (ENTITY_CRAZY_SHOTGUN + ENTITY_OFFSET) && pLayerSwitchTiles[i].m_Type < (ENTITY_DRAGGER_WEAK + ENTITY_OFFSET)) || pLayerSwitchTiles[i].m_Type == (ENTITY_LASER_O_FAST + 1 + ENTITY_OFFSET)))
+									continue;
+								else if(pLayerSwitchTiles[i].m_Type >= (ENTITY_ARMOR_1 + ENTITY_OFFSET) && pLayerSwitchTiles[i].m_Type <= (ENTITY_DOOR + ENTITY_OFFSET))
+								{
+									pTiles->m_pTiles[i].m_Index = pLayerSwitchTiles[i].m_Type;
+									pTiles->m_pTiles[i].m_Flags = pLayerSwitchTiles[i].m_Flags;
+									continue;
+								}
+
+								if(IsValidSwitchTile(pLayerSwitchTiles[i].m_Type))
+								{
+									pTiles->m_pTiles[i].m_Index = pLayerSwitchTiles[i].m_Type;
+									pTiles->m_pTiles[i].m_Flags = pLayerSwitchTiles[i].m_Flags;
+								}
+							}
+						}
+						DataFile.UnloadData(pTilemapItem->m_Switch);
+					}
+					else if(pTiles->m_Tune)
+					{
+						void *pTuneData = DataFile.GetData(pTilemapItem->m_Tune);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Tune);
+						if(Size >= (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CTuneTile))
+						{
+							CTuneTile *pLayerTuneTiles = std::static_pointer_cast<CLayerTune>(pTiles)->m_pTuneTile;
+							mem_copy(pLayerTuneTiles, pTuneData, (size_t)pTiles->m_Width * pTiles->m_Height * sizeof(CTuneTile));
+
+							for(int i = 0; i < pTiles->m_Width * pTiles->m_Height; i++)
+							{
+								if(IsValidTuneTile(pLayerTuneTiles[i].m_Type))
+									pTiles->m_pTiles[i].m_Index = pLayerTuneTiles[i].m_Type;
+								else
+									pTiles->m_pTiles[i].m_Index = 0;
+							}
+						}
+						DataFile.UnloadData(pTilemapItem->m_Tune);
+					}
+					else // regular tile layer or game layer
+					{
+						void *pData = DataFile.GetData(pTilemapItem->m_Data);
+						unsigned int Size = DataFile.GetDataSize(pTilemapItem->m_Data);
+						pTiles->ExtractTiles(pTilemapItem->m_Version, (CTile *)pData, Size);
+
+						if(pTiles->m_Game && pTilemapItem->m_Version == MakeVersion(1, *pTilemapItem))
+						{
+							for(int i = 0; i < pTiles->m_Width * pTiles->m_Height; i++)
+							{
+								if(pTiles->m_pTiles[i].m_Index)
+									pTiles->m_pTiles[i].m_Index += ENTITY_OFFSET;
+							}
+						}
+						DataFile.UnloadData(pTilemapItem->m_Data);
+					}
+				}
+				else if(pLayerItem->m_Type == LAYERTYPE_QUADS)
+				{
+					const CMapItemLayerQuads *pQuadsItem = (CMapItemLayerQuads *)pLayerItem;
+
+					std::shared_ptr<CLayerQuads> pQuads = std::make_shared<CLayerQuads>(m_pEditor);
+					pQuads->m_Flags = pLayerItem->m_Flags;
+					pQuads->m_Image = pQuadsItem->m_Image;
+					if(pQuads->m_Image < -1 || pQuads->m_Image >= (int)m_vpImages.size())
+						pQuads->m_Image = -1;
+
+					// load layer name
+					if(pQuadsItem->m_Version >= 2)
+						IntsToStr(pQuadsItem->m_aName, sizeof(pQuads->m_aName) / sizeof(int), pQuads->m_aName);
+
+					void *pData = DataFile.GetDataSwapped(pQuadsItem->m_Data);
+					pGroup->AddLayer(pQuads);
+					pQuads->m_vQuads.resize(pQuadsItem->m_NumQuads);
+					mem_copy(pQuads->m_vQuads.data(), pData, sizeof(CQuad) * pQuadsItem->m_NumQuads);
+					DataFile.UnloadData(pQuadsItem->m_Data);
+				}
+				else if(pLayerItem->m_Type == LAYERTYPE_SOUNDS)
+				{
+					const CMapItemLayerSounds *pSoundsItem = (CMapItemLayerSounds *)pLayerItem;
+					if(pSoundsItem->m_Version < 1 || pSoundsItem->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
+						continue;
+
+					std::shared_ptr<CLayerSounds> pSounds = std::make_shared<CLayerSounds>(m_pEditor);
+					pSounds->m_Flags = pLayerItem->m_Flags;
+					pSounds->m_Sound = pSoundsItem->m_Sound;
+
+					// validate m_Sound
+					if(pSounds->m_Sound < -1 || pSounds->m_Sound >= (int)m_vpSounds.size())
+						pSounds->m_Sound = -1;
+
+					// load layer name
+					IntsToStr(pSoundsItem->m_aName, sizeof(pSounds->m_aName) / sizeof(int), pSounds->m_aName);
+
+					// load data
+					void *pData = DataFile.GetDataSwapped(pSoundsItem->m_Data);
+					pGroup->AddLayer(pSounds);
+					pSounds->m_vSources.resize(pSoundsItem->m_NumSources);
+					mem_copy(pSounds->m_vSources.data(), pData, sizeof(CSoundSource) * pSoundsItem->m_NumSources);
+					DataFile.UnloadData(pSoundsItem->m_Data);
+				}
+				else if(pLayerItem->m_Type == LAYERTYPE_SOUNDS_DEPRECATED)
+				{
+					// compatibility with old sound layers
+					const CMapItemLayerSounds *pSoundsItem = (CMapItemLayerSounds *)pLayerItem;
+					if(pSoundsItem->m_Version < 1 || pSoundsItem->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
+						continue;
+
+					std::shared_ptr<CLayerSounds> pSounds = std::make_shared<CLayerSounds>(m_pEditor);
+					pSounds->m_Flags = pLayerItem->m_Flags;
+					pSounds->m_Sound = pSoundsItem->m_Sound;
+
+					// validate m_Sound
+					if(pSounds->m_Sound < -1 || pSounds->m_Sound >= (int)m_vpSounds.size())
+						pSounds->m_Sound = -1;
+
+					// load layer name
+					IntsToStr(pSoundsItem->m_aName, sizeof(pSounds->m_aName) / sizeof(int), pSounds->m_aName);
+
+					// load data
+					CSoundSource_DEPRECATED *pData = (CSoundSource_DEPRECATED *)DataFile.GetDataSwapped(pSoundsItem->m_Data);
+					pGroup->AddLayer(pSounds);
+					pSounds->m_vSources.resize(pSoundsItem->m_NumSources);
+
+					for(int i = 0; i < pSoundsItem->m_NumSources; i++)
+					{
+						CSoundSource_DEPRECATED *pOldSource = &pData[i];
+
+						CSoundSource &Source = pSounds->m_vSources[i];
+						Source.m_Position = pOldSource->m_Position;
+						Source.m_Loop = pOldSource->m_Loop;
+						Source.m_Pan = true;
+						Source.m_TimeDelay = pOldSource->m_TimeDelay;
+						Source.m_Falloff = 0;
+
+						Source.m_PosEnv = pOldSource->m_PosEnv;
+						Source.m_PosEnvOffset = pOldSource->m_PosEnvOffset;
+						Source.m_SoundEnv = pOldSource->m_SoundEnv;
+						Source.m_SoundEnvOffset = pOldSource->m_SoundEnvOffset;
+
+						Source.m_Shape.m_Type = CSoundShape::SHAPE_CIRCLE;
+						Source.m_Shape.m_Circle.m_Radius = pOldSource->m_FalloffDistance;
+					}
+
+					DataFile.UnloadData(pSoundsItem->m_Data);
+				}
+			}
+		}
+	}
+
+	// load envelopes
+	{
+		const CMapBasedEnvelopePointAccess EnvelopePoints(&DataFile);
+
+		int EnvStart, EnvNum;
+		DataFile.GetType(MAPITEMTYPE_ENVELOPE, &EnvStart, &EnvNum);
+		for(int e = 0; e < EnvNum; e++)
+		{
+			CMapItemEnvelope *pItem = (CMapItemEnvelope *)DataFile.GetItem(EnvStart + e);
+			std::shared_ptr<CEnvelope> pEnv = std::make_shared<CEnvelope>(pItem->m_Channels);
+			pEnv->m_vPoints.resize(pItem->m_NumPoints);
+			for(int p = 0; p < pItem->m_NumPoints; p++)
+			{
+				const CEnvPoint *pPoint = EnvelopePoints.GetPoint(pItem->m_StartPoint + p);
+				if(pPoint != nullptr)
+					mem_copy(&pEnv->m_vPoints[p], pPoint, sizeof(CEnvPoint));
+				const CEnvPointBezier *pPointBezier = EnvelopePoints.GetBezier(pItem->m_StartPoint + p);
+				if(pPointBezier != nullptr)
+					mem_copy(&pEnv->m_vPoints[p].m_Bezier, pPointBezier, sizeof(CEnvPointBezier));
+			}
+			if(pItem->m_aName[0] != -1) // compatibility with old maps
+				IntsToStr(pItem->m_aName, sizeof(pItem->m_aName) / sizeof(int), pEnv->m_aName);
+			m_vpEnvelopes.push_back(pEnv);
+			if(pItem->m_Version >= CMapItemEnvelope_v2::CURRENT_VERSION)
+				pEnv->m_Synchronized = pItem->m_Synchronized;
+		}
+	}
+
+	// load automapper configurations
+	{
+		int AutomapperConfigStart, AutomapperConfigNum;
+		DataFile.GetType(MAPITEMTYPE_AUTOMAPPER_CONFIG, &AutomapperConfigStart, &AutomapperConfigNum);
+		for(int i = 0; i < AutomapperConfigNum; i++)
+		{
+			CMapItemAutoMapperConfig *pItem = (CMapItemAutoMapperConfig *)DataFile.GetItem(AutomapperConfigStart + i);
+			if(pItem->m_Version == CMapItemAutoMapperConfig::CURRENT_VERSION)
+			{
+				if(pItem->m_GroupId >= 0 && (size_t)pItem->m_GroupId < m_vpGroups.size() &&
+					pItem->m_LayerId >= 0 && (size_t)pItem->m_LayerId < m_vpGroups[pItem->m_GroupId]->m_vpLayers.size())
+				{
+					std::shared_ptr<CLayer> pLayer = m_vpGroups[pItem->m_GroupId]->m_vpLayers[pItem->m_LayerId];
+					if(pLayer->m_Type == LAYERTYPE_TILES)
+					{
+						std::shared_ptr<CLayerTiles> pTiles = std::static_pointer_cast<CLayerTiles>(m_vpGroups[pItem->m_GroupId]->m_vpLayers[pItem->m_LayerId]);
+						// only load auto mappers for tile layers (not physics layers)
+						if(!(pTiles->m_Game || pTiles->m_Tele || pTiles->m_Speedup ||
+							   pTiles->m_Front || pTiles->m_Switch || pTiles->m_Tune))
+						{
+							pTiles->m_AutoMapperConfig = pItem->m_AutomapperConfig;
+							pTiles->m_Seed = pItem->m_AutomapperSeed;
+							pTiles->m_AutoAutoMap = !!(pItem->m_Flags & CMapItemAutoMapperConfig::FLAG_AUTOMATIC);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	PerformSanityChecks(ErrorHandler);
+
+	m_Modified = false;
+	m_ModifiedAuto = false;
+	m_LastModifiedTime = -1.0f;
+	m_LastSaveTime = m_pEditor->Client()->GlobalTime();
+	return true;
+}
+
+void CEditorMap::PerformSanityChecks(const std::function<void(const char *pErrorMessage)> &ErrorHandler)
+{
+	// Check if there are any images with a width or height that is not divisible by 16 which are
+	// used in tile layers. Reset the image for these layers, to prevent crashes with some drivers.
+	size_t ImageIndex = 0;
+	for(const std::shared_ptr<CEditorImage> &pImage : m_vpImages)
+	{
+		if(pImage->m_Width % 16 != 0 || pImage->m_Height % 16 != 0)
+		{
+			size_t GroupIndex = 0;
+			for(const std::shared_ptr<CLayerGroup> &pGroup : m_vpGroups)
+			{
+				size_t LayerIndex = 0;
+				for(const std::shared_ptr<CLayer> &pLayer : pGroup->m_vpLayers)
+				{
+					if(pLayer->m_Type == LAYERTYPE_TILES)
+					{
+						std::shared_ptr<CLayerTiles> pLayerTiles = std::static_pointer_cast<CLayerTiles>(pLayer);
+						if(pLayerTiles->m_Image >= 0 && (size_t)pLayerTiles->m_Image == ImageIndex)
+						{
+							pLayerTiles->m_Image = -1;
+							char aBuf[IO_MAX_PATH_LENGTH + 128];
+							str_format(aBuf, sizeof(aBuf), "Error: The image '%s' (size %dx%d) has a width or height that is not divisible by 16 and therefore cannot be used for tile layers. The image of layer #%" PRIzu " '%s' in group #%" PRIzu " '%s' has been unset.", pImage->m_aName, pImage->m_Width, pImage->m_Height, LayerIndex, pLayer->m_aName, GroupIndex, pGroup->m_aName);
+							ErrorHandler(aBuf);
+						}
+					}
+					++LayerIndex;
+				}
+				++GroupIndex;
+			}
+		}
+		++ImageIndex;
+	}
+}
diff --git a/src_bkp/game/editor/mapitems/sound.cpp b/src_bkp/game/editor/mapitems/sound.cpp
new file mode 100644
index 0000000000..6465f915b4
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/sound.cpp
@@ -0,0 +1,15 @@
+#include "sound.h"
+
+#include <engine/sound.h>
+
+CEditorSound::CEditorSound(CEditor *pEditor)
+{
+	Init(pEditor);
+}
+
+CEditorSound::~CEditorSound()
+{
+	Sound()->UnloadSample(m_SoundID);
+	free(m_pData);
+	m_pData = nullptr;
+}
diff --git a/src_bkp/game/editor/mapitems/sound.h b/src_bkp/game/editor/mapitems/sound.h
new file mode 100644
index 0000000000..28b222972c
--- /dev/null
+++ b/src_bkp/game/editor/mapitems/sound.h
@@ -0,0 +1,20 @@
+#ifndef GAME_EDITOR_MAPITEMS_SOUND_H
+#define GAME_EDITOR_MAPITEMS_SOUND_H
+
+#include <base/types.h>
+#include <game/editor/component.h>
+
+class CEditorSound : public CEditorComponent
+{
+public:
+	explicit CEditorSound(CEditor *pEditor);
+	~CEditorSound();
+
+	int m_SoundID = 0;
+	char m_aName[IO_MAX_PATH_LENGTH] = "";
+
+	void *m_pData = nullptr;
+	unsigned m_DataSize = 0;
+};
+
+#endif
diff --git a/src_bkp/game/editor/popups.cpp b/src_bkp/game/editor/popups.cpp
new file mode 100644
index 0000000000..e9bcb721c4
--- /dev/null
+++ b/src_bkp/game/editor/popups.cpp
@@ -0,0 +1,2733 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/color.h>
+
+#include <engine/console.h>
+#include <engine/graphics.h>
+#include <engine/input.h>
+#include <engine/keys.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <limits>
+
+#include <game/client/ui_scrollregion.h>
+#include <game/editor/mapitems/image.h>
+#include <game/editor/mapitems/sound.h>
+
+#include "editor.h"
+#include "editor_actions.h"
+
+CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	static int s_NewMapButton = 0;
+	static int s_SaveButton = 0;
+	static int s_SaveAsButton = 0;
+	static int s_SaveCopyButton = 0;
+	static int s_OpenButton = 0;
+	static int s_OpenCurrentMapButton = 0;
+	static int s_AppendButton = 0;
+	static int s_MapInfoButton = 0;
+	static int s_ExitButton = 0;
+
+	CUIRect Slot;
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_NewMapButton, "New", 0, &Slot, 0, "Creates a new map (ctrl+n)"))
+	{
+		if(pEditor->HasUnsavedData())
+		{
+			pEditor->m_PopupEventType = POPEVENT_NEW;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+		{
+			pEditor->Reset();
+			pEditor->m_aFileName[0] = 0;
+		}
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(10.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_OpenButton, "Load", 0, &Slot, 0, "Opens a map for editing (ctrl+l)"))
+	{
+		if(pEditor->HasUnsavedData())
+		{
+			pEditor->m_PopupEventType = POPEVENT_LOAD;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+			pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", false, CEditor::CallbackOpenMap, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_OpenCurrentMapButton, "Load Current Map", 0, &Slot, 0, "Opens the current in game map for editing (ctrl+alt+l)"))
+	{
+		if(pEditor->HasUnsavedData())
+		{
+			pEditor->m_PopupEventType = POPEVENT_LOADCURRENT;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+		{
+			pEditor->LoadCurrentMap();
+		}
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(10.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_AppendButton, "Append", 0, &Slot, 0, "Opens a map and adds everything from that map to the current one (ctrl+a)"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CEditor::CallbackAppendMap, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(10.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_SaveButton, "Save", 0, &Slot, 0, "Saves the current map (ctrl+s)"))
+	{
+		if(pEditor->m_aFileName[0] && pEditor->m_ValidSaveFilename)
+		{
+			str_copy(pEditor->m_aFileSaveName, pEditor->m_aFileName);
+			pEditor->m_PopupEventType = POPEVENT_SAVE;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+			pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", false, CEditor::CallbackSaveMap, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_SaveAsButton, "Save As", 0, &Slot, 0, "Saves the current map under a new name (ctrl+shift+s)"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CEditor::CallbackSaveMap, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_SaveCopyButton, "Save Copy", 0, &Slot, 0, "Saves a copy of the current map under a new name (ctrl+shift+alt+s)"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", true, CEditor::CallbackSaveCopyMap, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(10.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_MapInfoButton, "Map details", 0, &Slot, 0, "Adjust the map details of the current map"))
+	{
+		const CUIRect *pScreen = pEditor->UI()->Screen();
+		pEditor->m_Map.m_MapInfoTmp.Copy(pEditor->m_Map.m_MapInfo);
+		static SPopupMenuId s_PopupMapInfoId;
+		constexpr float PopupWidth = 400.0f;
+		constexpr float PopupHeight = 170.0f;
+		pEditor->UI()->DoPopupMenu(&s_PopupMapInfoId, pScreen->w / 2.0f - PopupWidth / 2.0f, pScreen->h / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, pEditor, PopupMapInfo);
+		pEditor->UI()->SetActiveItem(nullptr);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(10.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_ExitButton, "Exit", 0, &Slot, 0, "Exits from the editor"))
+	{
+		if(pEditor->HasUnsavedData())
+		{
+			pEditor->m_PopupEventType = POPEVENT_EXIT;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+		{
+			pEditor->OnClose();
+			g_Config.m_ClEditor = 0;
+		}
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect Slot;
+	View.HSplitTop(12.0f, &Slot, &View);
+	static int s_RemoveUnusedEnvelopesButton = 0;
+	static CUI::SConfirmPopupContext s_ConfirmPopupContext;
+	if(pEditor->DoButton_MenuItem(&s_RemoveUnusedEnvelopesButton, "Remove unused envelopes", 0, &Slot, 0, "Removes all unused envelopes from the map"))
+	{
+		s_ConfirmPopupContext.Reset();
+		s_ConfirmPopupContext.YesNoButtons();
+		str_copy(s_ConfirmPopupContext.m_aMessage, "Are you sure that you want to remove all unused envelopes from this map?");
+		pEditor->UI()->ShowPopupConfirm(Slot.x + Slot.w, Slot.y, &s_ConfirmPopupContext);
+	}
+	if(s_ConfirmPopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
+		pEditor->RemoveUnusedEnvelopes();
+	if(s_ConfirmPopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
+	{
+		s_ConfirmPopupContext.Reset();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	static int s_BorderButton = 0;
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_BorderButton, "Place Border", 0, &Slot, 0, "Place tiles in a 2-tile wide border at the edges of the layer"))
+	{
+		std::shared_ptr<CLayerTiles> pT = std::static_pointer_cast<CLayerTiles>(pEditor->GetSelectedLayerType(0, LAYERTYPE_TILES));
+		if(pT && !pT->m_Tele && !pT->m_Speedup && !pT->m_Switch && !pT->m_Front && !pT->m_Tune)
+		{
+			pEditor->m_PopupEventType = POPEVENT_PLACE_BORDER_TILES;
+			pEditor->m_PopupEventActivated = true;
+		}
+		else
+		{
+			static CUI::SMessagePopupContext s_MessagePopupContext;
+			s_MessagePopupContext.DefaultColor(pEditor->m_pTextRender);
+			str_copy(s_MessagePopupContext.m_aMessage, "No tile layer selected");
+			pEditor->UI()->ShowPopupMessage(Slot.x, Slot.y + Slot.h, &s_MessagePopupContext);
+		}
+	}
+
+	static int s_GotoButton = 0;
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_GotoButton, "Goto XY", 0, &Slot, 0, "Go to a specified coordinate point on the map"))
+	{
+		static SPopupMenuId s_PopupGotoId;
+		pEditor->UI()->DoPopupMenu(&s_PopupGotoId, Slot.x, Slot.y + Slot.h, 120, 52, pEditor, PopupGoto);
+	}
+
+	static int s_TileartButton = 0;
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_TileartButton, "Add tileart", 0, &Slot, 0, "Generate tileart from image"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Add tileart", "Open", "mapres", false, CallbackAddTileart, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+static int EntitiesListdirCallback(const char *pName, int IsDir, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+	if(!IsDir && str_endswith(pName, ".png"))
+	{
+		std::string Name = pName;
+		pEditor->m_vSelectEntitiesFiles.push_back(Name.substr(0, Name.length() - 4));
+	}
+
+	return 0;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect Slot;
+	View.HSplitTop(12.0f, &Slot, &View);
+	static int s_EntitiesButtonID = 0;
+	char aButtonText[64];
+	str_format(aButtonText, sizeof(aButtonText), "Entities: %s", pEditor->m_SelectEntitiesImage.c_str());
+	if(pEditor->DoButton_MenuItem(&s_EntitiesButtonID, aButtonText, 0, &Slot, 0, "Choose game layer entities image for different gametypes"))
+	{
+		pEditor->m_vSelectEntitiesFiles.clear();
+		pEditor->Storage()->ListDirectory(IStorage::TYPE_ALL, "editor/entities", EntitiesListdirCallback, pEditor);
+		std::sort(pEditor->m_vSelectEntitiesFiles.begin(), pEditor->m_vSelectEntitiesFiles.end());
+
+		static SPopupMenuId s_PopupEntitiesId;
+		pEditor->UI()->DoPopupMenu(&s_PopupEntitiesId, Slot.x, Slot.y + Slot.h, 250, pEditor->m_vSelectEntitiesFiles.size() * 14.0f + 10.0f, pEditor, PopupEntities);
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->UI()->DoLabel(&Label, "Brush coloring", 10.0f, TEXTALIGN_ML);
+		static int s_ButtonNo = 0;
+		static int s_ButtonYes = 0;
+		if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_BrushColorEnabled, &No, 0, "Disable brush coloring"))
+		{
+			pEditor->m_BrushColorEnabled = false;
+		}
+		if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_BrushColorEnabled, &Yes, 0, "Enable brush coloring"))
+		{
+			pEditor->m_BrushColorEnabled = true;
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->UI()->DoLabel(&Label, "Allow unused", 10.0f, TEXTALIGN_ML);
+		if(pEditor->m_AllowPlaceUnusedTiles != -1)
+		{
+			static int s_ButtonNo = 0;
+			static int s_ButtonYes = 0;
+			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles"))
+			{
+				pEditor->m_AllowPlaceUnusedTiles = false;
+			}
+			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles"))
+			{
+				pEditor->m_AllowPlaceUnusedTiles = true;
+			}
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect Off, Dec, Hex;
+		Selector.VSplitLeft(Selector.w / 3.0f, &Off, &Selector);
+		Selector.VSplitMid(&Dec, &Hex);
+
+		pEditor->UI()->DoLabel(&Label, "Show Info", 10.0f, TEXTALIGN_ML);
+		static int s_ButtonOff = 0;
+		static int s_ButtonDec = 0;
+		static int s_ButtonHex = 0;
+		if(pEditor->DoButton_ButtonDec(&s_ButtonOff, "Off", pEditor->m_ShowTileInfo == SHOW_TILE_OFF, &Off, 0, "Do not show tile information"))
+		{
+			pEditor->m_ShowTileInfo = SHOW_TILE_OFF;
+			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+		}
+		if(pEditor->DoButton_Ex(&s_ButtonDec, "Dec", pEditor->m_ShowTileInfo == SHOW_TILE_DECIMAL, &Dec, 0, "[ctrl+i] Show tile information", IGraphics::CORNER_NONE))
+		{
+			pEditor->m_ShowTileInfo = SHOW_TILE_DECIMAL;
+			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+		}
+		if(pEditor->DoButton_ButtonInc(&s_ButtonHex, "Hex", pEditor->m_ShowTileInfo == SHOW_TILE_HEXADECIMAL, &Hex, 0, "[ctrl+shift+i] Show tile information in hexadecimal"))
+		{
+			pEditor->m_ShowTileInfo = SHOW_TILE_HEXADECIMAL;
+			pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->UI()->DoLabel(&Label, "Align quads", 10.0f, TEXTALIGN_ML);
+		if(pEditor->m_AllowPlaceUnusedTiles != -1)
+		{
+			static int s_ButtonNo = 0;
+			static int s_ButtonYes = 0;
+			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !g_Config.m_EdAlignQuads, &No, 0, "Do not perform quad alignment to other quads/points when moving quads"))
+			{
+				g_Config.m_EdAlignQuads = false;
+			}
+			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", g_Config.m_EdAlignQuads, &Yes, 0, "Allow quad alignment to other quads/points when moving quads"))
+			{
+				g_Config.m_EdAlignQuads = true;
+			}
+		}
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Slot, &View);
+	{
+		Slot.VMargin(5.0f, &Slot);
+
+		CUIRect Label, Selector;
+		Slot.VSplitMid(&Label, &Selector);
+		CUIRect No, Yes;
+		Selector.VSplitMid(&No, &Yes);
+
+		pEditor->UI()->DoLabel(&Label, "Show quads bounds", 10.0f, TEXTALIGN_ML);
+		if(pEditor->m_AllowPlaceUnusedTiles != -1)
+		{
+			static int s_ButtonNo = 0;
+			static int s_ButtonYes = 0;
+			if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !g_Config.m_EdShowQuadsRect, &No, 0, "Do not show quad bounds when moving quads"))
+			{
+				g_Config.m_EdShowQuadsRect = false;
+			}
+			if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", g_Config.m_EdShowQuadsRect, &Yes, 0, "Show quad bounds when moving quads"))
+			{
+				g_Config.m_EdShowQuadsRect = true;
+			}
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	// remove group button
+	CUIRect Button;
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_DeleteButton = 0;
+
+	// don't allow deletion of game group
+	if(pEditor->m_Map.m_pGameGroup != pEditor->GetSelectedGroup())
+	{
+		if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete group", 0, &Button, 0, "Delete group"))
+		{
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionGroup>(pEditor, pEditor->m_SelectedGroup, true));
+			pEditor->m_Map.DeleteGroup(pEditor->m_SelectedGroup);
+			pEditor->m_SelectedGroup = maximum(0, pEditor->m_SelectedGroup - 1);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+	else
+	{
+		if(pEditor->DoButton_Editor(&s_DeleteButton, "Clean up game tiles", 0, &Button, 0, "Removes game tiles that aren't based on a layer"))
+		{
+			// gather all tile layers
+			std::vector<std::shared_ptr<CLayerTiles>> vpLayers;
+			for(auto &pLayer : pEditor->m_Map.m_pGameGroup->m_vpLayers)
+			{
+				if(pLayer != pEditor->m_Map.m_pGameLayer && pLayer->m_Type == LAYERTYPE_TILES)
+					vpLayers.push_back(std::static_pointer_cast<CLayerTiles>(pLayer));
+			}
+
+			// search for unneeded game tiles
+			std::shared_ptr<CLayerTiles> pGameLayer = pEditor->m_Map.m_pGameLayer;
+			for(int y = 0; y < pGameLayer->m_Height; ++y)
+			{
+				for(int x = 0; x < pGameLayer->m_Width; ++x)
+				{
+					if(pGameLayer->m_pTiles[y * pGameLayer->m_Width + x].m_Index > static_cast<unsigned char>(TILE_NOHOOK))
+						continue;
+
+					bool Found = false;
+					for(const auto &pLayer : vpLayers)
+					{
+						if(x < pLayer->m_Width && y < pLayer->m_Height && pLayer->m_pTiles[y * pLayer->m_Width + x].m_Index)
+						{
+							Found = true;
+							break;
+						}
+					}
+
+					if(!Found)
+					{
+						pGameLayer->m_pTiles[y * pGameLayer->m_Width + x].m_Index = TILE_AIR;
+						pEditor->m_Map.OnModify();
+					}
+				}
+			}
+
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pTeleLayer)
+	{
+		// new tele layer
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		static int s_NewTeleLayerButton = 0;
+		if(pEditor->DoButton_Editor(&s_NewTeleLayerButton, "Add tele layer", 0, &Button, 0, "Creates a new tele layer"))
+		{
+			std::shared_ptr<CLayer> pTeleLayer = std::make_shared<CLayerTele>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+			pEditor->m_Map.MakeTeleLayer(pTeleLayer);
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTeleLayer);
+			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+			pEditor->SelectLayer(LayerIndex);
+			pEditor->m_pBrush->Clear();
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pSpeedupLayer)
+	{
+		// new speedup layer
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		static int s_NewSpeedupLayerButton = 0;
+		if(pEditor->DoButton_Editor(&s_NewSpeedupLayerButton, "Add speedup layer", 0, &Button, 0, "Creates a new speedup layer"))
+		{
+			std::shared_ptr<CLayer> pSpeedupLayer = std::make_shared<CLayerSpeedup>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+			pEditor->m_Map.MakeSpeedupLayer(pSpeedupLayer);
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSpeedupLayer);
+			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+			pEditor->SelectLayer(LayerIndex);
+			pEditor->m_pBrush->Clear();
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pTuneLayer)
+	{
+		// new tune layer
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		static int s_NewTuneLayerButton = 0;
+		if(pEditor->DoButton_Editor(&s_NewTuneLayerButton, "Add tune layer", 0, &Button, 0, "Creates a new tuning layer"))
+		{
+			std::shared_ptr<CLayer> pTuneLayer = std::make_shared<CLayerTune>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+			pEditor->m_Map.MakeTuneLayer(pTuneLayer);
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTuneLayer);
+			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+			pEditor->SelectLayer(LayerIndex);
+			pEditor->m_pBrush->Clear();
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pFrontLayer)
+	{
+		// new front layer
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		static int s_NewFrontLayerButton = 0;
+		if(pEditor->DoButton_Editor(&s_NewFrontLayerButton, "Add front layer", 0, &Button, 0, "Creates a new item layer"))
+		{
+			std::shared_ptr<CLayer> pFrontLayer = std::make_shared<CLayerFront>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+			pEditor->m_Map.MakeFrontLayer(pFrontLayer);
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pFrontLayer);
+			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+			pEditor->SelectLayer(LayerIndex);
+			pEditor->m_pBrush->Clear();
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pSwitchLayer)
+	{
+		// new Switch layer
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		static int s_NewSwitchLayerButton = 0;
+		if(pEditor->DoButton_Editor(&s_NewSwitchLayerButton, "Add switch layer", 0, &Button, 0, "Creates a new switch layer"))
+		{
+			std::shared_ptr<CLayer> pSwitchLayer = std::make_shared<CLayerSwitch>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+			pEditor->m_Map.MakeSwitchLayer(pSwitchLayer);
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSwitchLayer);
+			int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+			pEditor->SelectLayer(LayerIndex);
+			pEditor->m_pBrush->Clear();
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	// new quad layer
+	View.HSplitBottom(5.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_NewQuadLayerButton = 0;
+	if(pEditor->DoButton_Editor(&s_NewQuadLayerButton, "Add quads layer", 0, &Button, 0, "Creates a new quad layer"))
+	{
+		std::shared_ptr<CLayer> pQuadLayer = std::make_shared<CLayerQuads>(pEditor);
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pQuadLayer);
+		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+		pEditor->SelectLayer(LayerIndex);
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
+		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// new tile layer
+	View.HSplitBottom(5.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_NewTileLayerButton = 0;
+	if(pEditor->DoButton_Editor(&s_NewTileLayerButton, "Add tile layer", 0, &Button, 0, "Creates a new tile layer"))
+	{
+		std::shared_ptr<CLayer> pTileLayer = std::make_shared<CLayerTiles>(pEditor, pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
+		pTileLayer->m_pEditor = pEditor;
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTileLayer);
+		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+		pEditor->SelectLayer(LayerIndex);
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
+		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// new sound layer
+	View.HSplitBottom(5.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_NewSoundLayerButton = 0;
+	if(pEditor->DoButton_Editor(&s_NewSoundLayerButton, "Add sound layer", 0, &Button, 0, "Creates a new sound layer"))
+	{
+		std::shared_ptr<CLayer> pSoundLayer = std::make_shared<CLayerSounds>(pEditor);
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSoundLayer);
+		int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
+		pEditor->SelectLayer(LayerIndex);
+		pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
+		pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// group name
+	if(!pEditor->GetSelectedGroup()->m_GameGroup)
+	{
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Button);
+		pEditor->UI()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_ML);
+		Button.VSplitLeft(40.0f, nullptr, &Button);
+		static CLineInput s_NameInput;
+		s_NameInput.SetBuffer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName, sizeof(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName));
+		if(pEditor->DoEditBox(&s_NameInput, &Button, 10.0f))
+			pEditor->m_Map.OnModify();
+	}
+
+	CProperty aProps[] = {
+		{"Order", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
+		{"Pos X", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos Y", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Para X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Para Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Use Clipping", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_UseClipping, PROPTYPE_BOOL, 0, 1},
+		{"Clip X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Clip Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Clip W", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW, PROPTYPE_INT_SCROLL, 0, 1000000},
+		{"Clip H", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH, PROPTYPE_INT_SCROLL, 0, 1000000},
+		{nullptr},
+	};
+
+	// cut the properties that aren't needed
+	if(pEditor->GetSelectedGroup()->m_GameGroup)
+		aProps[(int)EGroupProp::PROP_POS_X].m_pName = nullptr;
+
+	static int s_aIds[(int)EGroupProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = pEditor->DoPropertiesWithState<EGroupProp>(&View, aProps, s_aIds, &NewVal);
+	if(Prop != EGroupProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+	}
+
+	static CLayerGroupPropTracker s_Tracker(pEditor);
+	s_Tracker.Begin(pEditor->GetSelectedGroup().get(), Prop, State);
+
+	if(Prop == EGroupProp::PROP_ORDER)
+	{
+		pEditor->m_SelectedGroup = pEditor->m_Map.SwapGroups(pEditor->m_SelectedGroup, NewVal);
+	}
+
+	// these can not be changed on the game group
+	if(!pEditor->GetSelectedGroup()->m_GameGroup)
+	{
+		if(Prop == EGroupProp::PROP_PARA_X)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_PARA_Y)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_POS_X)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_POS_Y)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_USE_CLIPPING)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_UseClipping = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_CLIP_X)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_CLIP_Y)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_CLIP_W)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW = NewVal;
+		}
+		else if(Prop == EGroupProp::PROP_CLIP_H)
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH = NewVal;
+		}
+	}
+
+	s_Tracker.End(Prop, State);
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View, bool Active)
+{
+	SLayerPopupContext *pPopup = (SLayerPopupContext *)pContext;
+	CEditor *pEditor = pPopup->m_pEditor;
+
+	std::shared_ptr<CLayerGroup> pCurrentGroup = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup];
+	std::shared_ptr<CLayer> pCurrentLayer = pEditor->GetSelectedLayer(0);
+
+	if(pPopup->m_vpLayers.size() > 1)
+	{
+		return CLayerTiles::RenderCommonProperties(pPopup->m_CommonPropState, pEditor, &View, pPopup->m_vpLayers, pPopup->m_vLayerIndices);
+	}
+
+	const bool EntitiesLayer = pCurrentLayer->IsEntitiesLayer();
+
+	// delete button
+	if(pEditor->m_Map.m_pGameLayer != pCurrentLayer) // entities layers except the game layer can be deleted
+	{
+		CUIRect DeleteButton;
+		View.HSplitBottom(12.0f, &View, &DeleteButton);
+		static int s_DeleteButton = 0;
+		if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete layer", 0, &DeleteButton, 0, "Deletes the layer"))
+		{
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionDeleteLayer>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0]));
+
+			if(pCurrentLayer == pEditor->m_Map.m_pFrontLayer)
+				pEditor->m_Map.m_pFrontLayer = nullptr;
+			if(pCurrentLayer == pEditor->m_Map.m_pTeleLayer)
+				pEditor->m_Map.m_pTeleLayer = nullptr;
+			if(pCurrentLayer == pEditor->m_Map.m_pSpeedupLayer)
+				pEditor->m_Map.m_pSpeedupLayer = nullptr;
+			if(pCurrentLayer == pEditor->m_Map.m_pSwitchLayer)
+				pEditor->m_Map.m_pSwitchLayer = nullptr;
+			if(pCurrentLayer == pEditor->m_Map.m_pTuneLayer)
+				pEditor->m_Map.m_pTuneLayer = nullptr;
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DeleteLayer(pEditor->m_vSelectedLayers[0]);
+
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	// duplicate button
+	if(!EntitiesLayer) // entities layers cannot be duplicated
+	{
+		CUIRect DuplicateButton;
+		View.HSplitBottom(4.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &DuplicateButton);
+		static int s_DuplicationButton = 0;
+		if(pEditor->DoButton_Editor(&s_DuplicationButton, "Duplicate layer", 0, &DuplicateButton, 0, "Duplicates the layer"))
+		{
+			pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DuplicateLayer(pEditor->m_vSelectedLayers[0]);
+			pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0] + 1, true));
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	// layer name
+	if(!EntitiesLayer) // name cannot be changed for entities layers
+	{
+		CUIRect Label, EditBox;
+		View.HSplitBottom(5.0f, &View, nullptr);
+		View.HSplitBottom(12.0f, &View, &Label);
+		Label.VSplitLeft(40.0f, &Label, &EditBox);
+		pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
+		static CLineInput s_NameInput;
+		s_NameInput.SetBuffer(pCurrentLayer->m_aName, sizeof(pCurrentLayer->m_aName));
+		if(pEditor->DoEditBox(&s_NameInput, &EditBox, 10.0f))
+			pEditor->m_Map.OnModify();
+	}
+
+	// spacing if any button was rendered
+	if(!EntitiesLayer || pEditor->m_Map.m_pGameLayer != pCurrentLayer)
+		View.HSplitBottom(10.0f, &View, nullptr);
+
+	CProperty aProps[] = {
+		{"Group", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
+		{"Order", pEditor->m_vSelectedLayers[0], PROPTYPE_INT_STEP, 0, (int)pCurrentGroup->m_vpLayers.size() - 1},
+		{"Detail", pCurrentLayer->m_Flags & LAYERFLAG_DETAIL, PROPTYPE_BOOL, 0, 1},
+		{nullptr},
+	};
+
+	// don't use Group and Detail from the selection if this is an entities layer
+	if(EntitiesLayer)
+	{
+		aProps[0].m_Type = PROPTYPE_NULL;
+		aProps[2].m_Type = PROPTYPE_NULL;
+	}
+
+	// don't use Detail from the selection if this is a sound layer
+	if(pCurrentLayer->m_Type == LAYERTYPE_SOUNDS)
+	{
+		aProps[2].m_Type = PROPTYPE_NULL;
+	}
+
+	static int s_aIds[(int)ELayerProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = pEditor->DoPropertiesWithState<ELayerProp>(&View, aProps, s_aIds, &NewVal);
+	if(Prop != ELayerProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+	}
+
+	static CLayerPropTracker s_Tracker(pEditor);
+	s_Tracker.Begin(pCurrentLayer.get(), Prop, State);
+
+	if(Prop == ELayerProp::PROP_ORDER)
+	{
+		int NewIndex = pCurrentGroup->SwapLayers(pEditor->m_vSelectedLayers[0], NewVal);
+		pEditor->SelectLayer(NewIndex);
+	}
+	else if(Prop == ELayerProp::PROP_GROUP)
+	{
+		if(NewVal >= 0 && (size_t)NewVal < pEditor->m_Map.m_vpGroups.size())
+		{
+			auto Position = std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), pCurrentLayer);
+			if(Position != pCurrentGroup->m_vpLayers.end())
+				pCurrentGroup->m_vpLayers.erase(Position);
+			pEditor->m_Map.m_vpGroups[NewVal]->m_vpLayers.push_back(pCurrentLayer);
+			pEditor->m_SelectedGroup = NewVal;
+			pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[NewVal]->m_vpLayers.size() - 1);
+		}
+	}
+	else if(Prop == ELayerProp::PROP_HQ)
+	{
+		pCurrentLayer->m_Flags &= ~LAYERFLAG_DETAIL;
+		if(NewVal)
+			pCurrentLayer->m_Flags |= LAYERFLAG_DETAIL;
+	}
+
+	s_Tracker.End(Prop, State);
+
+	return pCurrentLayer->RenderProperties(&View);
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
+	CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
+	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(pEditor->GetSelectedLayerType(0, LAYERTYPE_QUADS));
+
+	CUIRect Button;
+
+	// delete button
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_DeleteButton = 0;
+	if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, "Deletes the current quad"))
+	{
+		if(pLayer)
+		{
+			pEditor->m_Map.OnModify();
+			pEditor->DeleteSelectedQuads();
+		}
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// aspect ratio button
+	View.HSplitBottom(10.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	if(pLayer && pLayer->m_Image >= 0 && (size_t)pLayer->m_Image < pEditor->m_Map.m_vpImages.size())
+	{
+		static int s_AspectRatioButton = 0;
+		if(pEditor->DoButton_Editor(&s_AspectRatioButton, "Aspect ratio", 0, &Button, 0, "Resizes the current Quad based on the aspect ratio of the image"))
+		{
+			pEditor->m_QuadTracker.BeginQuadTrack(pLayer, pEditor->m_vSelectedQuads);
+			for(auto &pQuad : vpQuads)
+			{
+				int Top = pQuad->m_aPoints[0].y;
+				int Left = pQuad->m_aPoints[0].x;
+				int Right = pQuad->m_aPoints[0].x;
+
+				for(int k = 1; k < 4; k++)
+				{
+					if(pQuad->m_aPoints[k].y < Top)
+						Top = pQuad->m_aPoints[k].y;
+					if(pQuad->m_aPoints[k].x < Left)
+						Left = pQuad->m_aPoints[k].x;
+					if(pQuad->m_aPoints[k].x > Right)
+						Right = pQuad->m_aPoints[k].x;
+				}
+
+				const int Height = (Right - Left) * pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_Height / pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_Width;
+
+				pQuad->m_aPoints[0].x = Left;
+				pQuad->m_aPoints[0].y = Top;
+				pQuad->m_aPoints[1].x = Right;
+				pQuad->m_aPoints[1].y = Top;
+				pQuad->m_aPoints[2].x = Left;
+				pQuad->m_aPoints[2].y = Top + Height;
+				pQuad->m_aPoints[3].x = Right;
+				pQuad->m_aPoints[3].y = Top + Height;
+				pEditor->m_Map.OnModify();
+			}
+			pEditor->m_QuadTracker.EndQuadTrack();
+
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	// align button
+	View.HSplitBottom(6.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_AlignButton = 0;
+	if(pEditor->DoButton_Editor(&s_AlignButton, "Align", 0, &Button, 0, "Aligns coordinates of the quad points"))
+	{
+		pEditor->m_QuadTracker.BeginQuadTrack(pLayer, pEditor->m_vSelectedQuads);
+		for(auto &pQuad : vpQuads)
+		{
+			for(int k = 1; k < 4; k++)
+			{
+				pQuad->m_aPoints[k].x = 1000.0f * (pQuad->m_aPoints[k].x / 1000);
+				pQuad->m_aPoints[k].y = 1000.0f * (pQuad->m_aPoints[k].y / 1000);
+			}
+			pEditor->m_Map.OnModify();
+		}
+		pEditor->m_QuadTracker.EndQuadTrack();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// square button
+	View.HSplitBottom(6.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_Button = 0;
+	if(pEditor->DoButton_Editor(&s_Button, "Square", 0, &Button, 0, "Squares the current quad"))
+	{
+		pEditor->m_QuadTracker.BeginQuadTrack(pLayer, pEditor->m_vSelectedQuads);
+		for(auto &pQuad : vpQuads)
+		{
+			int Top = pQuad->m_aPoints[0].y;
+			int Left = pQuad->m_aPoints[0].x;
+			int Bottom = pQuad->m_aPoints[0].y;
+			int Right = pQuad->m_aPoints[0].x;
+
+			for(int k = 1; k < 4; k++)
+			{
+				if(pQuad->m_aPoints[k].y < Top)
+					Top = pQuad->m_aPoints[k].y;
+				if(pQuad->m_aPoints[k].x < Left)
+					Left = pQuad->m_aPoints[k].x;
+				if(pQuad->m_aPoints[k].y > Bottom)
+					Bottom = pQuad->m_aPoints[k].y;
+				if(pQuad->m_aPoints[k].x > Right)
+					Right = pQuad->m_aPoints[k].x;
+			}
+
+			pQuad->m_aPoints[0].x = Left;
+			pQuad->m_aPoints[0].y = Top;
+			pQuad->m_aPoints[1].x = Right;
+			pQuad->m_aPoints[1].y = Top;
+			pQuad->m_aPoints[2].x = Left;
+			pQuad->m_aPoints[2].y = Bottom;
+			pQuad->m_aPoints[3].x = Right;
+			pQuad->m_aPoints[3].y = Bottom;
+			pEditor->m_Map.OnModify();
+		}
+		pEditor->m_QuadTracker.EndQuadTrack();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// slice button
+	View.HSplitBottom(6.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_SliceButton = 0;
+	if(pEditor->DoButton_Editor(&s_SliceButton, "Slice", 0, &Button, 0, "Enables quad knife mode"))
+	{
+		pEditor->m_QuadKnifeCount = 0;
+		pEditor->m_QuadKnifeActive = true;
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	const int NumQuads = pLayer ? (int)pLayer->m_vQuads.size() : 0;
+	CProperty aProps[] = {
+		{"Order", pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], PROPTYPE_INT_STEP, 0, NumQuads},
+		{"Pos X", fx2i(pCurrentQuad->m_aPoints[4].x), PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos Y", fx2i(pCurrentQuad->m_aPoints[4].y), PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos. Env", pCurrentQuad->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
+		{"Pos. TO", pCurrentQuad->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Color Env", pCurrentQuad->m_ColorEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
+		{"Color TO", pCurrentQuad->m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)EQuadProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto PropRes = pEditor->DoPropertiesWithState<EQuadProp>(&View, aProps, s_aIds, &NewVal);
+	EQuadProp Prop = PropRes.m_Value;
+	if(Prop != EQuadProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+		if(PropRes.m_State == EEditState::START || PropRes.m_State == EEditState::ONE_GO)
+		{
+			pEditor->m_QuadTracker.BeginQuadPropTrack(pLayer, pEditor->m_vSelectedQuads, Prop);
+		}
+	}
+
+	const float OffsetX = i2fx(NewVal) - pCurrentQuad->m_aPoints[4].x;
+	const float OffsetY = i2fx(NewVal) - pCurrentQuad->m_aPoints[4].y;
+
+	if(Prop == EQuadProp::PROP_ORDER && pLayer)
+	{
+		const int QuadIndex = pLayer->SwapQuads(pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], NewVal);
+		pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex] = QuadIndex;
+	}
+
+	for(auto &pQuad : vpQuads)
+	{
+		if(Prop == EQuadProp::PROP_POS_X)
+		{
+			for(auto &Point : pQuad->m_aPoints)
+				Point.x += OffsetX;
+		}
+		else if(Prop == EQuadProp::PROP_POS_Y)
+		{
+			for(auto &Point : pQuad->m_aPoints)
+				Point.y += OffsetY;
+		}
+		else if(Prop == EQuadProp::PROP_POS_ENV)
+		{
+			int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
+			int StepDirection = Index < pQuad->m_PosEnv ? -1 : 1;
+			if(StepDirection != 0)
+			{
+				for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
+				{
+					if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->GetChannels() == 3)
+					{
+						pQuad->m_PosEnv = Index;
+						break;
+					}
+				}
+			}
+		}
+		else if(Prop == EQuadProp::PROP_POS_ENV_OFFSET)
+		{
+			pQuad->m_PosEnvOffset = NewVal;
+		}
+		else if(Prop == EQuadProp::PROP_COLOR_ENV)
+		{
+			int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
+			int StepDirection = Index < pQuad->m_ColorEnv ? -1 : 1;
+			if(StepDirection != 0)
+			{
+				for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
+				{
+					if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->GetChannels() == 4)
+					{
+						pQuad->m_ColorEnv = Index;
+						break;
+					}
+				}
+			}
+		}
+		else if(Prop == EQuadProp::PROP_COLOR_ENV_OFFSET)
+		{
+			pQuad->m_ColorEnvOffset = NewVal;
+		}
+	}
+
+	if(Prop != EQuadProp::PROP_NONE)
+	{
+		if(PropRes.m_State == EEditState::END || PropRes.m_State == EEditState::ONE_GO)
+		{
+			pEditor->m_QuadTracker.EndQuadPropTrack(Prop);
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	CSoundSource *pSource = pEditor->GetSelectedSource();
+	if(!pSource)
+		return CUI::POPUP_CLOSE_CURRENT;
+
+	CUIRect Button;
+
+	// delete button
+	View.HSplitBottom(12.0f, &View, &Button);
+	static int s_DeleteButton = 0;
+	if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, "Deletes the current source"))
+	{
+		std::shared_ptr<CLayerSounds> pLayer = std::static_pointer_cast<CLayerSounds>(pEditor->GetSelectedLayerType(0, LAYERTYPE_SOUNDS));
+		if(pLayer)
+		{
+			pEditor->m_EditorHistory.Execute(std::make_shared<CEditorActionDeleteSoundSource>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0], pEditor->m_SelectedSource));
+		}
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	// Sound shape button
+	CUIRect ShapeButton;
+	View.HSplitBottom(3.0f, &View, nullptr);
+	View.HSplitBottom(12.0f, &View, &ShapeButton);
+
+	static const char *s_apShapeNames[CSoundShape::NUM_SHAPES] = {
+		"Rectangle",
+		"Circle"};
+
+	pSource->m_Shape.m_Type = pSource->m_Shape.m_Type % CSoundShape::NUM_SHAPES; // prevent out of array errors
+
+	static int s_ShapeTypeButton = 0;
+	if(pEditor->DoButton_Editor(&s_ShapeTypeButton, s_apShapeNames[pSource->m_Shape.m_Type], 0, &ShapeButton, 0, "Change shape"))
+	{
+		pEditor->m_EditorHistory.Execute(std::make_shared<CEditorActionEditSoundSource>(pEditor, pEditor->m_SelectedGroup, pEditor->m_vSelectedLayers[0], pEditor->m_SelectedSource, CEditorActionEditSoundSource::EEditType::SHAPE, (pSource->m_Shape.m_Type + 1) % CSoundShape::NUM_SHAPES));
+	}
+
+	CProperty aProps[] = {
+		{"Pos X", pSource->m_Position.x / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos Y", pSource->m_Position.y / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Loop", pSource->m_Loop, PROPTYPE_BOOL, 0, 1},
+		{"Pan", pSource->m_Pan, PROPTYPE_BOOL, 0, 1},
+		{"Delay", pSource->m_TimeDelay, PROPTYPE_INT_SCROLL, 0, 1000000},
+		{"Falloff", pSource->m_Falloff, PROPTYPE_INT_SCROLL, 0, 255},
+		{"Pos. Env", pSource->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
+		{"Pos. TO", pSource->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Sound Env", pSource->m_SoundEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
+		{"Sound. TO", pSource->m_SoundEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)ESoundProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto [State, Prop] = pEditor->DoPropertiesWithState<ESoundProp>(&View, aProps, s_aIds, &NewVal);
+	if(Prop != ESoundProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+	}
+
+	static CSoundSourcePropTracker s_Tracker(pEditor);
+	s_Tracker.Begin(pSource, Prop, State);
+
+	if(Prop == ESoundProp::PROP_POS_X)
+	{
+		pSource->m_Position.x = NewVal * 1000;
+	}
+	else if(Prop == ESoundProp::PROP_POS_Y)
+	{
+		pSource->m_Position.y = NewVal * 1000;
+	}
+	else if(Prop == ESoundProp::PROP_LOOP)
+	{
+		pSource->m_Loop = NewVal;
+	}
+	else if(Prop == ESoundProp::PROP_PAN)
+	{
+		pSource->m_Pan = NewVal;
+	}
+	else if(Prop == ESoundProp::PROP_TIME_DELAY)
+	{
+		pSource->m_TimeDelay = NewVal;
+	}
+	else if(Prop == ESoundProp::PROP_FALLOFF)
+	{
+		pSource->m_Falloff = NewVal;
+	}
+	else if(Prop == ESoundProp::PROP_POS_ENV)
+	{
+		int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
+		const int StepDirection = Index < pSource->m_PosEnv ? -1 : 1;
+		for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
+		{
+			if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->GetChannels() == 3)
+			{
+				pSource->m_PosEnv = Index;
+				break;
+			}
+		}
+	}
+	else if(Prop == ESoundProp::PROP_POS_ENV_OFFSET)
+	{
+		pSource->m_PosEnvOffset = NewVal;
+	}
+	else if(Prop == ESoundProp::PROP_SOUND_ENV)
+	{
+		int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
+		const int StepDirection = Index < pSource->m_SoundEnv ? -1 : 1;
+		for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
+		{
+			if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->GetChannels() == 1)
+			{
+				pSource->m_SoundEnv = Index;
+				break;
+			}
+		}
+	}
+	else if(Prop == ESoundProp::PROP_SOUND_ENV_OFFSET)
+	{
+		pSource->m_SoundEnvOffset = NewVal;
+	}
+
+	s_Tracker.End(Prop, State);
+
+	// source shape properties
+	switch(pSource->m_Shape.m_Type)
+	{
+	case CSoundShape::SHAPE_CIRCLE:
+	{
+		CProperty aCircleProps[] = {
+			{"Radius", pSource->m_Shape.m_Circle.m_Radius, PROPTYPE_INT_SCROLL, 0, 1000000},
+			{nullptr},
+		};
+
+		static int s_aCircleIds[(int)ECircleShapeProp::NUM_CIRCLE_PROPS] = {0};
+		NewVal = 0;
+		auto [LocalState, LocalProp] = pEditor->DoPropertiesWithState<ECircleShapeProp>(&View, aCircleProps, s_aCircleIds, &NewVal);
+		if(LocalProp != ECircleShapeProp::PROP_NONE)
+		{
+			pEditor->m_Map.OnModify();
+		}
+
+		static CSoundSourceCircleShapePropTracker s_ShapeTracker(pEditor);
+		s_ShapeTracker.Begin(pSource, LocalProp, LocalState);
+
+		if(LocalProp == ECircleShapeProp::PROP_CIRCLE_RADIUS)
+		{
+			pSource->m_Shape.m_Circle.m_Radius = NewVal;
+		}
+
+		s_ShapeTracker.End(LocalProp, LocalState);
+		break;
+	}
+
+	case CSoundShape::SHAPE_RECTANGLE:
+	{
+		CProperty aRectangleProps[] = {
+			{"Width", pSource->m_Shape.m_Rectangle.m_Width / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
+			{"Height", pSource->m_Shape.m_Rectangle.m_Height / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
+			{nullptr},
+		};
+
+		static int s_aRectangleIds[(int)ERectangleShapeProp::NUM_RECTANGLE_PROPS] = {0};
+		NewVal = 0;
+		auto [LocalState, LocalProp] = pEditor->DoPropertiesWithState<ERectangleShapeProp>(&View, aRectangleProps, s_aRectangleIds, &NewVal);
+		if(LocalProp != ERectangleShapeProp::PROP_NONE)
+		{
+			pEditor->m_Map.OnModify();
+		}
+
+		static CSoundSourceRectShapePropTracker s_ShapeTracker(pEditor);
+		s_ShapeTracker.Begin(pSource, LocalProp, LocalState);
+
+		if(LocalProp == ERectangleShapeProp::PROP_RECTANGLE_WIDTH)
+		{
+			pSource->m_Shape.m_Rectangle.m_Width = NewVal * 1024;
+		}
+		else if(LocalProp == ERectangleShapeProp::PROP_RECTANGLE_HEIGHT)
+		{
+			pSource->m_Shape.m_Rectangle.m_Height = NewVal * 1024;
+		}
+
+		s_ShapeTracker.End(LocalProp, LocalState);
+		break;
+	}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
+	if(!in_range<int>(pEditor->m_SelectedQuadIndex, 0, vpQuads.size() - 1))
+		return CUI::POPUP_CLOSE_CURRENT;
+	CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
+	std::shared_ptr<CLayerQuads> pLayer = std::static_pointer_cast<CLayerQuads>(pEditor->GetSelectedLayerType(0, LAYERTYPE_QUADS));
+
+	int Color = PackColor(pCurrentQuad->m_aColors[pEditor->m_SelectedQuadPoint]);
+
+	const int X = fx2i(pCurrentQuad->m_aPoints[pEditor->m_SelectedQuadPoint].x);
+	const int Y = fx2i(pCurrentQuad->m_aPoints[pEditor->m_SelectedQuadPoint].y);
+	const int TextureU = fx2f(pCurrentQuad->m_aTexcoords[pEditor->m_SelectedQuadPoint].x) * 1024;
+	const int TextureV = fx2f(pCurrentQuad->m_aTexcoords[pEditor->m_SelectedQuadPoint].y) * 1024;
+
+	CProperty aProps[] = {
+		{"Pos X", X, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Pos Y", Y, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Color", Color, PROPTYPE_COLOR, 0, 0},
+		{"Tex U", TextureU, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{"Tex V", TextureV, PROPTYPE_INT_SCROLL, -1000000, 1000000},
+		{nullptr},
+	};
+
+	static int s_aIds[(int)EQuadPointProp::NUM_PROPS] = {0};
+	int NewVal = 0;
+	auto PropRes = pEditor->DoPropertiesWithState<EQuadPointProp>(&View, aProps, s_aIds, &NewVal);
+	EQuadPointProp Prop = PropRes.m_Value;
+	if(Prop != EQuadPointProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+		if(PropRes.m_State == EEditState::START || PropRes.m_State == EEditState::ONE_GO)
+		{
+			pEditor->m_QuadTracker.BeginQuadPointPropTrack(pLayer, pEditor->m_vSelectedQuads, pEditor->m_SelectedQuadPoints);
+			pEditor->m_QuadTracker.AddQuadPointPropTrack(Prop);
+		}
+	}
+
+	for(CQuad *pQuad : vpQuads)
+	{
+		if(Prop == EQuadPointProp::PROP_POS_X)
+		{
+			for(int v = 0; v < 4; v++)
+				if(pEditor->IsQuadCornerSelected(v))
+					pQuad->m_aPoints[v].x = i2fx(fx2i(pQuad->m_aPoints[v].x) + NewVal - X);
+		}
+		else if(Prop == EQuadPointProp::PROP_POS_Y)
+		{
+			for(int v = 0; v < 4; v++)
+				if(pEditor->IsQuadCornerSelected(v))
+					pQuad->m_aPoints[v].y = i2fx(fx2i(pQuad->m_aPoints[v].y) + NewVal - Y);
+		}
+		else if(Prop == EQuadPointProp::PROP_COLOR)
+		{
+			for(int v = 0; v < 4; v++)
+			{
+				if(pEditor->IsQuadCornerSelected(v))
+				{
+					pQuad->m_aColors[v].r = (NewVal >> 24) & 0xff;
+					pQuad->m_aColors[v].g = (NewVal >> 16) & 0xff;
+					pQuad->m_aColors[v].b = (NewVal >> 8) & 0xff;
+					pQuad->m_aColors[v].a = NewVal & 0xff;
+				}
+			}
+		}
+		else if(Prop == EQuadPointProp::PROP_TEX_U)
+		{
+			for(int v = 0; v < 4; v++)
+				if(pEditor->IsQuadCornerSelected(v))
+					pQuad->m_aTexcoords[v].x = f2fx(fx2f(pQuad->m_aTexcoords[v].x) + (NewVal - TextureU) / 1024.0f);
+		}
+		else if(Prop == EQuadPointProp::PROP_TEX_V)
+		{
+			for(int v = 0; v < 4; v++)
+				if(pEditor->IsQuadCornerSelected(v))
+					pQuad->m_aTexcoords[v].y = f2fx(fx2f(pQuad->m_aTexcoords[v].y) + (NewVal - TextureV) / 1024.0f);
+		}
+	}
+
+	if(Prop != EQuadPointProp::PROP_NONE)
+	{
+		pEditor->m_Map.OnModify();
+		if(PropRes.m_State == EEditState::END || PropRes.m_State == EEditState::ONE_GO)
+		{
+			pEditor->m_QuadTracker.EndQuadPointPropTrack(Prop);
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupEnvPoint(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	if(pEditor->m_SelectedEnvelope < 0 || pEditor->m_SelectedEnvelope >= (int)pEditor->m_Map.m_vpEnvelopes.size())
+		return CUI::POPUP_CLOSE_CURRENT;
+
+	const float RowHeight = 12.0f;
+	CUIRect Row, Label, EditBox;
+
+	pEditor->m_ShowEnvelopePreview = SHOWENV_SELECTED;
+
+	std::shared_ptr<CEnvelope> pEnvelope = pEditor->m_Map.m_vpEnvelopes[pEditor->m_SelectedEnvelope];
+
+	if(pEnvelope->GetChannels() == 4)
+	{
+		View.HSplitTop(RowHeight, &Row, &View);
+		View.HSplitTop(4.0f, nullptr, &View);
+		Row.VSplitLeft(60.0f, &Label, &Row);
+		Row.VSplitLeft(10.0f, nullptr, &EditBox);
+		pEditor->UI()->DoLabel(&Label, "Color:", RowHeight - 2.0f, TEXTALIGN_ML);
+
+		const auto SelectedPoint = pEditor->m_vSelectedEnvelopePoints.front();
+		const int SelectedIndex = SelectedPoint.first;
+		auto *pValues = pEnvelope->m_vPoints[SelectedIndex].m_aValues;
+		const ColorRGBA Color = ColorRGBA(fx2f(pValues[0]), fx2f(pValues[1]), fx2f(pValues[2]), fx2f(pValues[3]));
+		const auto &&SetColor = [&](ColorRGBA NewColor) {
+			if(Color == NewColor && pEditor->m_ColorPickerPopupContext.m_State == EEditState::EDITING)
+				return;
+
+			static int s_Values[4];
+
+			if(pEditor->m_ColorPickerPopupContext.m_State == EEditState::START || pEditor->m_ColorPickerPopupContext.m_State == EEditState::ONE_GO)
+			{
+				for(int Channel = 0; Channel < 4; ++Channel)
+					s_Values[Channel] = pValues[Channel];
+			}
+
+			for(int Channel = 0; Channel < 4; ++Channel)
+			{
+				pValues[Channel] = f2fx(NewColor[Channel]);
+			}
+
+			if(pEditor->m_ColorPickerPopupContext.m_State == EEditState::END || pEditor->m_ColorPickerPopupContext.m_State == EEditState::ONE_GO)
+			{
+				std::vector<std::shared_ptr<IEditorAction>> vpActions(4);
+
+				for(int Channel = 0; Channel < 4; ++Channel)
+				{
+					vpActions[Channel] = std::make_shared<CEditorActionEnvelopeEditPoint>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, Channel, CEditorActionEnvelopeEditPoint::EEditType::VALUE, s_Values[Channel], f2fx(NewColor[Channel]));
+				}
+
+				char aDisplay[256];
+				str_format(aDisplay, sizeof(aDisplay), "Edit color of point %d of envelope %d", SelectedIndex, pEditor->m_SelectedEnvelope);
+				pEditor->m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(pEditor, vpActions, aDisplay));
+			}
+
+			pEditor->m_UpdateEnvPointInfo = true;
+			pEditor->m_Map.OnModify();
+		};
+		static char s_ColorPickerButton;
+		pEditor->DoColorPickerButton(&s_ColorPickerButton, &EditBox, Color, SetColor);
+	}
+
+	static CLineInputNumber s_CurValueInput;
+	static CLineInputNumber s_CurTimeInput;
+
+	static float s_CurrentTime = 0;
+	static float s_CurrentValue = 0;
+
+	if(pEditor->m_UpdateEnvPointInfo)
+	{
+		pEditor->m_UpdateEnvPointInfo = false;
+
+		auto TimeAndValue = pEditor->EnvGetSelectedTimeAndValue();
+		int CurrentTime = TimeAndValue.first;
+		int CurrentValue = TimeAndValue.second;
+
+		// update displayed text
+		s_CurValueInput.SetFloat(fx2f(CurrentValue));
+		s_CurTimeInput.SetFloat(CurrentTime / 1000.0f);
+
+		s_CurrentTime = s_CurTimeInput.GetFloat();
+		s_CurrentValue = s_CurValueInput.GetFloat();
+	}
+
+	View.HSplitTop(RowHeight, &Row, &View);
+	Row.VSplitLeft(60.0f, &Label, &Row);
+	Row.VSplitLeft(10.0f, nullptr, &EditBox);
+	pEditor->UI()->DoLabel(&Label, "Value:", RowHeight - 2.0f, TEXTALIGN_ML);
+	pEditor->DoEditBox(&s_CurValueInput, &EditBox, RowHeight - 2.0f, IGraphics::CORNER_ALL, "The value of the selected envelope point");
+
+	View.HSplitTop(4.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Row, &View);
+	Row.VSplitLeft(60.0f, &Label, &Row);
+	Row.VSplitLeft(10.0f, nullptr, &EditBox);
+	pEditor->UI()->DoLabel(&Label, "Time (in s):", RowHeight - 2.0f, TEXTALIGN_ML);
+	pEditor->DoEditBox(&s_CurTimeInput, &EditBox, RowHeight - 2.0f, IGraphics::CORNER_ALL, "The time of the selected envelope point");
+
+	if(pEditor->Input()->KeyIsPressed(KEY_RETURN) || pEditor->Input()->KeyIsPressed(KEY_KP_ENTER))
+	{
+		float CurrentTime = s_CurTimeInput.GetFloat();
+		float CurrentValue = s_CurValueInput.GetFloat();
+		if(!(absolute(CurrentTime - s_CurrentTime) < 0.0001f && absolute(CurrentValue - s_CurrentValue) < 0.0001f))
+		{
+			auto [OldTime, OldValue] = pEditor->EnvGetSelectedTimeAndValue();
+
+			if(pEditor->IsTangentInSelected())
+			{
+				auto [SelectedIndex, SelectedChannel] = pEditor->m_SelectedTangentInPoint;
+
+				pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionEditEnvelopePointValue>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, CEditorActionEditEnvelopePointValue::EType::TANGENT_IN, static_cast<int>(OldTime * 1000.0f), f2fx(OldValue), static_cast<int>(CurrentTime * 1000.0f), f2fx(CurrentValue)));
+				CurrentTime = (pEnvelope->m_vPoints[SelectedIndex].m_Time + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aInTangentDeltaX[SelectedChannel]) / 1000.0f;
+			}
+			else if(pEditor->IsTangentOutSelected())
+			{
+				auto [SelectedIndex, SelectedChannel] = pEditor->m_SelectedTangentOutPoint;
+
+				pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionEditEnvelopePointValue>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, CEditorActionEditEnvelopePointValue::EType::TANGENT_OUT, static_cast<int>(OldTime * 1000.0f), f2fx(OldValue), static_cast<int>(CurrentTime * 1000.0f), f2fx(CurrentValue)));
+				CurrentTime = (pEnvelope->m_vPoints[SelectedIndex].m_Time + pEnvelope->m_vPoints[SelectedIndex].m_Bezier.m_aOutTangentDeltaX[SelectedChannel]) / 1000.0f;
+			}
+			else
+			{
+				auto [SelectedIndex, SelectedChannel] = pEditor->m_vSelectedEnvelopePoints.front();
+				pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionEditEnvelopePointValue>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, CEditorActionEditEnvelopePointValue::EType::POINT, static_cast<int>(OldTime * 1000.0f), f2fx(OldValue), static_cast<int>(CurrentTime * 1000.0f), f2fx(CurrentValue)));
+
+				if(SelectedIndex != 0)
+				{
+					CurrentTime = pEnvelope->m_vPoints[SelectedIndex].m_Time / 1000.0f;
+				}
+				else
+				{
+					CurrentTime = 0.0f;
+					pEnvelope->m_vPoints[SelectedIndex].m_Time = 0.0f;
+				}
+			}
+
+			s_CurTimeInput.SetFloat(static_cast<int>(CurrentTime * 1000.0f) / 1000.0f);
+			s_CurValueInput.SetFloat(fx2f(f2fx(CurrentValue)));
+
+			s_CurrentTime = s_CurTimeInput.GetFloat();
+			s_CurrentValue = s_CurValueInput.GetFloat();
+		}
+	}
+
+	View.HSplitTop(6.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Row, &View);
+	static int s_DeleteButtonID = 0;
+	const char *pButtonText = pEditor->IsTangentSelected() ? "Reset" : "Delete";
+	const char *pTooltip = pEditor->IsTangentSelected() ? "Reset tangent point to default value." : "Delete current envelope point in all channels.";
+	if(pEditor->DoButton_Editor(&s_DeleteButtonID, pButtonText, 0, &Row, 0, pTooltip))
+	{
+		if(pEditor->IsTangentInSelected())
+		{
+			auto [SelectedIndex, SelectedChannel] = pEditor->m_SelectedTangentInPoint;
+			pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionResetEnvelopePointTangent>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, true));
+		}
+		else if(pEditor->IsTangentOutSelected())
+		{
+			auto [SelectedIndex, SelectedChannel] = pEditor->m_SelectedTangentOutPoint;
+			pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionResetEnvelopePointTangent>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, false));
+		}
+		else
+		{
+			auto [SelectedIndex, SelectedChannel] = pEditor->m_vSelectedEnvelopePoints.front();
+			pEditor->m_EnvelopeEditorHistory.Execute(std::make_shared<CEditorActionDeleteEnvelopePoint>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex));
+		}
+
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointMulti(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	const float RowHeight = 12.0f;
+
+	static int s_CurveButtonID = 0;
+	CUIRect CurveButton;
+	View.HSplitTop(RowHeight, &CurveButton, &View);
+	if(pEditor->DoButton_Editor(&s_CurveButtonID, "Project onto", 0, &CurveButton, 0, "Project all selected envelopes onto the curve between the first and last selected envelope."))
+	{
+		static SPopupMenuId s_PopupCurveTypeId;
+		pEditor->UI()->DoPopupMenu(&s_PopupCurveTypeId, pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), 80, 80, pEditor, PopupEnvPointCurveType);
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupEnvPointCurveType(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	const float RowHeight = 14.0f;
+
+	int CurveType = -1;
+
+	static int s_ButtonLinearID;
+	CUIRect ButtonLinear;
+	View.HSplitTop(RowHeight, &ButtonLinear, &View);
+	if(pEditor->DoButton_MenuItem(&s_ButtonLinearID, "Linear", 0, &ButtonLinear))
+		CurveType = CURVETYPE_LINEAR;
+
+	static int s_ButtonSlowID;
+	CUIRect ButtonSlow;
+	View.HSplitTop(RowHeight, &ButtonSlow, &View);
+	if(pEditor->DoButton_MenuItem(&s_ButtonSlowID, "Slow", 0, &ButtonSlow))
+		CurveType = CURVETYPE_SLOW;
+
+	static int s_ButtonFastID;
+	CUIRect ButtonFast;
+	View.HSplitTop(RowHeight, &ButtonFast, &View);
+	if(pEditor->DoButton_MenuItem(&s_ButtonFastID, "Fast", 0, &ButtonFast))
+		CurveType = CURVETYPE_FAST;
+
+	static int s_ButtonStepID;
+	CUIRect ButtonStep;
+	View.HSplitTop(RowHeight, &ButtonStep, &View);
+	if(pEditor->DoButton_MenuItem(&s_ButtonStepID, "Step", 0, &ButtonStep))
+		CurveType = CURVETYPE_STEP;
+
+	static int s_ButtonSmoothID;
+	CUIRect ButtonSmooth;
+	View.HSplitTop(RowHeight, &ButtonSmooth, &View);
+	if(pEditor->DoButton_MenuItem(&s_ButtonSmoothID, "Smooth", 0, &ButtonSmooth))
+		CurveType = CURVETYPE_SMOOTH;
+
+	std::vector<std::shared_ptr<IEditorAction>> vpActions;
+
+	if(CurveType >= 0)
+	{
+		std::shared_ptr<CEnvelope> pEnvelope = pEditor->m_Map.m_vpEnvelopes.at(pEditor->m_SelectedEnvelope);
+
+		for(int c = 0; c < pEnvelope->GetChannels(); c++)
+		{
+			int FirstSelectedIndex = pEnvelope->m_vPoints.size();
+			int LastSelectedIndex = -1;
+			for(auto [SelectedIndex, SelectedChannel] : pEditor->m_vSelectedEnvelopePoints)
+			{
+				if(SelectedChannel == c)
+				{
+					FirstSelectedIndex = minimum(FirstSelectedIndex, SelectedIndex);
+					LastSelectedIndex = maximum(LastSelectedIndex, SelectedIndex);
+				}
+			}
+
+			if(FirstSelectedIndex < (int)pEnvelope->m_vPoints.size() && LastSelectedIndex >= 0 && FirstSelectedIndex != LastSelectedIndex)
+			{
+				CEnvPoint FirstPoint = pEnvelope->m_vPoints[FirstSelectedIndex];
+				CEnvPoint LastPoint = pEnvelope->m_vPoints[LastSelectedIndex];
+
+				CEnvelope HelperEnvelope(1);
+				HelperEnvelope.AddPoint(FirstPoint.m_Time, FirstPoint.m_aValues[c]);
+				HelperEnvelope.AddPoint(LastPoint.m_Time, LastPoint.m_aValues[c]);
+				HelperEnvelope.m_vPoints[0].m_Curvetype = CurveType;
+
+				for(auto [SelectedIndex, SelectedChannel] : pEditor->m_vSelectedEnvelopePoints)
+				{
+					if(SelectedChannel == c)
+					{
+						if(SelectedIndex != FirstSelectedIndex && SelectedIndex != LastSelectedIndex)
+						{
+							CEnvPoint &CurrentPoint = pEnvelope->m_vPoints[SelectedIndex];
+							ColorRGBA Channels;
+							HelperEnvelope.Eval(CurrentPoint.m_Time / 1000.0f, Channels);
+							int PrevValue = CurrentPoint.m_aValues[c];
+							CurrentPoint.m_aValues[c] = f2fx(Channels.r);
+							vpActions.push_back(std::make_shared<CEditorActionEnvelopeEditPoint>(pEditor, pEditor->m_SelectedEnvelope, SelectedIndex, SelectedChannel, CEditorActionEnvelopeEditPoint::EEditType::VALUE, PrevValue, CurrentPoint.m_aValues[c]));
+						}
+					}
+				}
+			}
+		}
+
+		if(!vpActions.empty())
+		{
+			pEditor->m_EnvelopeEditorHistory.RecordAction(std::make_shared<CEditorActionBulk>(pEditor, vpActions, "Project points"));
+		}
+
+		pEditor->m_Map.OnModify();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+static const auto &&gs_ModifyIndexDeleted = [](int DeletedIndex) {
+	return [DeletedIndex](int *pIndex) {
+		if(*pIndex == DeletedIndex)
+			*pIndex = -1;
+		else if(*pIndex > DeletedIndex)
+			*pIndex = *pIndex - 1;
+	};
+};
+
+CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	static int s_ExternalButton = 0;
+	static int s_ReaddButton = 0;
+	static int s_ReplaceButton = 0;
+	static int s_RemoveButton = 0;
+	static int s_ExportButton = 0;
+
+	const float RowHeight = 12.0f;
+
+	CUIRect Slot;
+	View.HSplitTop(RowHeight, &Slot, &View);
+	std::shared_ptr<CEditorImage> pImg = pEditor->m_Map.m_vpImages[pEditor->m_SelectedImage];
+
+	if(!pImg->m_External)
+	{
+		CUIRect Label, EditBox;
+
+		static CLineInput s_RenameInput;
+
+		Slot.VMargin(5.0f, &Slot);
+		Slot.VSplitLeft(35.0f, &Label, &Slot);
+		Slot.VSplitLeft(RowHeight - 2.0f, nullptr, &EditBox);
+		pEditor->UI()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
+
+		s_RenameInput.SetBuffer(pImg->m_aName, sizeof(pImg->m_aName));
+		if(pEditor->DoEditBox(&s_RenameInput, &EditBox, RowHeight - 2.0f))
+			pEditor->m_Map.OnModify();
+
+		View.HSplitTop(5.0f, nullptr, &View);
+		View.HSplitTop(RowHeight, &Slot, &View);
+	}
+
+	if(pImg->m_External)
+	{
+		if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Embed", 0, &Slot, 0, "Embeds the image into the map file."))
+		{
+			pImg->m_External = 0;
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		View.HSplitTop(5.0f, nullptr, &View);
+		View.HSplitTop(RowHeight, &Slot, &View);
+	}
+	else if(CEditor::IsVanillaImage(pImg->m_aName))
+	{
+		if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Make external", 0, &Slot, 0, "Removes the image from the map file."))
+		{
+			pImg->m_External = 1;
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		View.HSplitTop(5.0f, nullptr, &View);
+		View.HSplitTop(RowHeight, &Slot, &View);
+	}
+
+	static CUI::SSelectionPopupContext s_SelectionPopupContext;
+	static CScrollRegion s_SelectionPopupScrollRegion;
+	s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
+	if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the image from the mapres folder"))
+	{
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "%s.png", pImg->m_aName);
+		s_SelectionPopupContext.Reset();
+		std::set<std::string> EntriesSet;
+		pEditor->Storage()->FindFiles(aFilename, "mapres", IStorage::TYPE_ALL, &EntriesSet);
+		for(const auto &Entry : EntriesSet)
+			s_SelectionPopupContext.m_vEntries.push_back(Entry);
+		if(s_SelectionPopupContext.m_vEntries.empty())
+		{
+			pEditor->ShowFileDialogError("Error: could not find image '%s' in the mapres folder.", aFilename);
+		}
+		else if(s_SelectionPopupContext.m_vEntries.size() == 1)
+		{
+			s_SelectionPopupContext.m_pSelection = &s_SelectionPopupContext.m_vEntries.front();
+		}
+		else
+		{
+			str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted image:");
+			pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
+		}
+	}
+	if(s_SelectionPopupContext.m_pSelection != nullptr)
+	{
+		const bool WasExternal = pImg->m_External;
+		const bool Result = pEditor->ReplaceImage(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
+		pImg->m_External = WasExternal;
+		s_SelectionPopupContext.Reset();
+		return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+	}
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the image with a new one"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Replace Image", "Replace", "mapres", false, ReplaceImageCallback, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the image from the map"))
+	{
+		pEditor->m_Map.m_vpImages.erase(pEditor->m_Map.m_vpImages.begin() + pEditor->m_SelectedImage);
+		pEditor->m_Map.ModifyImageIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedImage));
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	if(!pImg->m_External)
+	{
+		View.HSplitTop(5.0f, nullptr, &View);
+		View.HSplitTop(RowHeight, &Slot, &View);
+		if(pEditor->DoButton_MenuItem(&s_ExportButton, "Export", 0, &Slot, 0, "Export the image"))
+		{
+			pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_IMG, "Save image", "Save", "mapres", false, CallbackSaveImage, pEditor);
+			pEditor->m_FileDialogFileNameInput.Set(pImg->m_aName);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	static int s_ReaddButton = 0;
+	static int s_ReplaceButton = 0;
+	static int s_RemoveButton = 0;
+	static int s_ExportButton = 0;
+
+	const float RowHeight = 12.0f;
+
+	CUIRect Slot;
+	View.HSplitTop(RowHeight, &Slot, &View);
+	std::shared_ptr<CEditorSound> pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
+
+	static CUI::SSelectionPopupContext s_SelectionPopupContext;
+	static CScrollRegion s_SelectionPopupScrollRegion;
+	s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
+
+	CUIRect Label, EditBox;
+
+	static CLineInput s_RenameInput;
+
+	Slot.VMargin(5.0f, &Slot);
+	Slot.VSplitLeft(35.0f, &Label, &Slot);
+	Slot.VSplitLeft(RowHeight - 2.0f, nullptr, &EditBox);
+	pEditor->UI()->DoLabel(&Label, "Name:", RowHeight - 2.0f, TEXTALIGN_ML);
+
+	s_RenameInput.SetBuffer(pSound->m_aName, sizeof(pSound->m_aName));
+	if(pEditor->DoEditBox(&s_RenameInput, &EditBox, RowHeight - 2.0f))
+		pEditor->m_Map.OnModify();
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+
+	if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the sound from the mapres folder"))
+	{
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "%s.opus", pSound->m_aName);
+		s_SelectionPopupContext.Reset();
+		std::set<std::string> EntriesSet;
+		pEditor->Storage()->FindFiles(aFilename, "mapres", IStorage::TYPE_ALL, &EntriesSet);
+		for(const auto &Entry : EntriesSet)
+			s_SelectionPopupContext.m_vEntries.push_back(Entry);
+		if(s_SelectionPopupContext.m_vEntries.empty())
+		{
+			pEditor->ShowFileDialogError("Error: could not find sound '%s' in the mapres folder.", aFilename);
+		}
+		else if(s_SelectionPopupContext.m_vEntries.size() == 1)
+		{
+			s_SelectionPopupContext.m_pSelection = &s_SelectionPopupContext.m_vEntries.front();
+		}
+		else
+		{
+			str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted sound:");
+			pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
+		}
+	}
+	if(s_SelectionPopupContext.m_pSelection != nullptr)
+	{
+		const bool Result = pEditor->ReplaceSound(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
+		s_SelectionPopupContext.Reset();
+		return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
+	}
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the sound with a new one"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Replace sound", "Replace", "mapres", false, ReplaceSoundCallback, pEditor);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the sound from the map"))
+	{
+		pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);
+		pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(5.0f, nullptr, &View);
+	View.HSplitTop(RowHeight, &Slot, &View);
+	if(pEditor->DoButton_MenuItem(&s_ExportButton, "Export", 0, &Slot, 0, "Export sound"))
+	{
+		pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_SOUND, "Save sound", "Save", "mapres", false, CallbackSaveSound, pEditor);
+		pEditor->m_FileDialogFileNameInput.Set(pSound->m_aName);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect Label, ButtonBar, Button;
+
+	View.Margin(10.0f, &View);
+	View.HSplitBottom(20.0f, &View, &ButtonBar);
+
+	// title
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Create new folder", 20.0f, TEXTALIGN_MC);
+	View.HSplitTop(10.0f, nullptr, &View);
+
+	// folder name
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
+	Label.VSplitLeft(50.0f, nullptr, &Button);
+	Button.HMargin(2.0f, &Button);
+	pEditor->DoEditBox(&pEditor->m_FileDialogNewFolderNameInput, &Button, 12.0f);
+
+	// button bar
+	ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
+	static int s_CancelButton = 0;
+	if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr))
+		return CUI::POPUP_CLOSE_CURRENT;
+
+	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
+	static int s_CreateButton = 0;
+	if(pEditor->DoButton_Editor(&s_CreateButton, "Create", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		// create the folder
+		if(!pEditor->m_FileDialogNewFolderNameInput.IsEmpty())
+		{
+			char aBuf[IO_MAX_PATH_LENGTH];
+			str_format(aBuf, sizeof(aBuf), "%s/%s", pEditor->m_pFileDialogPath, pEditor->m_FileDialogNewFolderNameInput.GetString());
+			if(pEditor->Storage()->CreateFolder(aBuf, IStorage::TYPE_SAVE))
+			{
+				pEditor->FilelistPopulate(IStorage::TYPE_SAVE);
+				return CUI::POPUP_CLOSE_CURRENT;
+			}
+			else
+			{
+				pEditor->ShowFileDialogError("Failed to create the folder '%s'.", aBuf);
+			}
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect Label, ButtonBar, Button;
+
+	View.Margin(10.0f, &View);
+	View.HSplitBottom(20.0f, &View, &ButtonBar);
+
+	// title
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Map details", 20.0f, TEXTALIGN_MC);
+	View.HSplitTop(10.0f, nullptr, &View);
+
+	// author box
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Author:", 10.0f, TEXTALIGN_ML);
+	Label.VSplitLeft(60.0f, nullptr, &Button);
+	Button.HMargin(3.0f, &Button);
+	static CLineInput s_AuthorInput;
+	s_AuthorInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aAuthor, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aAuthor));
+	pEditor->DoEditBox(&s_AuthorInput, &Button, 10.0f);
+
+	// version box
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Version:", 10.0f, TEXTALIGN_ML);
+	Label.VSplitLeft(60.0f, nullptr, &Button);
+	Button.HMargin(3.0f, &Button);
+	static CLineInput s_VersionInput;
+	s_VersionInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aVersion, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aVersion));
+	pEditor->DoEditBox(&s_VersionInput, &Button, 10.0f);
+
+	// credits box
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "Credits:", 10.0f, TEXTALIGN_ML);
+	Label.VSplitLeft(60.0f, nullptr, &Button);
+	Button.HMargin(3.0f, &Button);
+	static CLineInput s_CreditsInput;
+	s_CreditsInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aCredits, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aCredits));
+	pEditor->DoEditBox(&s_CreditsInput, &Button, 10.0f);
+
+	// license box
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, "License:", 10.0f, TEXTALIGN_ML);
+	Label.VSplitLeft(60.0f, nullptr, &Button);
+	Button.HMargin(3.0f, &Button);
+	static CLineInput s_LicenseInput;
+	s_LicenseInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aLicense, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aLicense));
+	pEditor->DoEditBox(&s_LicenseInput, &Button, 10.0f);
+
+	// button bar
+	ButtonBar.VSplitLeft(110.0f, &Label, &ButtonBar);
+	static int s_CancelButton = 0;
+	if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Label, 0, nullptr))
+		return CUI::POPUP_CLOSE_CURRENT;
+
+	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Label);
+	static int s_ConfirmButton = 0;
+	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Label, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		bool AuthorDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aAuthor, pEditor->m_Map.m_MapInfo.m_aAuthor) != 0;
+		bool VersionDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aVersion, pEditor->m_Map.m_MapInfo.m_aVersion) != 0;
+		bool CreditsDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aCredits, pEditor->m_Map.m_MapInfo.m_aCredits) != 0;
+		bool LicenseDifferent = str_comp(pEditor->m_Map.m_MapInfoTmp.m_aLicense, pEditor->m_Map.m_MapInfo.m_aLicense) != 0;
+
+		if(AuthorDifferent || VersionDifferent || CreditsDifferent || LicenseDifferent)
+			pEditor->m_Map.OnModify();
+
+		pEditor->m_Map.m_MapInfo.Copy(pEditor->m_Map.m_MapInfoTmp);
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	const char *pTitle;
+	const char *pMessage;
+	char aMessageBuf[128];
+	if(pEditor->m_PopupEventType == POPEVENT_EXIT)
+	{
+		pTitle = "Exit the editor";
+		pMessage = "The map contains unsaved data, you might want to save it before you exit the editor.\n\nContinue anyway?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_LOAD || pEditor->m_PopupEventType == POPEVENT_LOADCURRENT || pEditor->m_PopupEventType == POPEVENT_LOADDROP)
+	{
+		pTitle = "Load map";
+		pMessage = "The map contains unsaved data, you might want to save it before you load a new map.\n\nContinue anyway?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_NEW)
+	{
+		pTitle = "New map";
+		pMessage = "The map contains unsaved data, you might want to save it before you create a new map.\n\nContinue anyway?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_SAVE || pEditor->m_PopupEventType == POPEVENT_SAVE_COPY)
+	{
+		pTitle = "Save map";
+		pMessage = "The file already exists.\n\nDo you want to overwrite the map?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_SAVE_IMG)
+	{
+		pTitle = "Save image";
+		pMessage = "The file already exists.\n\nDo you want to overwrite the image?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_SAVE_SOUND)
+	{
+		pTitle = "Save sound";
+		pMessage = "The file already exists.\n\nDo you want to overwrite the sound?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_LARGELAYER)
+	{
+		pTitle = "Large layer";
+		pMessage = "You are trying to set the height or width of a layer to more than 1000 tiles. This is actually possible, but only rarely necessary. It may cause the editor to work slower and will result in a larger file size as well as higher memory usage for client and server.";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_PREVENTUNUSEDTILES)
+	{
+		pTitle = "Unused tiles disabled";
+		pMessage = "Unused tiles can't be placed by default because they could get a use later and then destroy your map.\n\nActivate the 'Allow Unused' setting to be able to place every tile.";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_IMAGEDIV16)
+	{
+		pTitle = "Image width/height";
+		pMessage = "The width or height of this image is not divisible by 16. This is required for images used in tile layers.";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX)
+	{
+		pTitle = "Max images";
+		str_format(aMessageBuf, sizeof(aMessageBuf), "The client only allows a maximum of %" PRIzu " images.", MAX_MAPIMAGES);
+		pMessage = aMessageBuf;
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_SOUND_MAX)
+	{
+		pTitle = "Max sounds";
+		str_format(aMessageBuf, sizeof(aMessageBuf), "The client only allows a maximum of %" PRIzu " sounds.", MAX_MAPSOUNDS);
+		pMessage = aMessageBuf;
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
+	{
+		pTitle = "Place border tiles";
+		pMessage = "This is going to overwrite any existing tiles around the edges of the layer.\n\nContinue?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_PIXELART_BIG_IMAGE)
+	{
+		pTitle = "Big image";
+		pMessage = "The selected image is big. Converting it to tileart may take some time.\n\nContinue anyway?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_PIXELART_MANY_COLORS)
+	{
+		pTitle = "Many colors";
+		pMessage = "The selected image contains many colors, which will lead to a big mapfile. You may want to consider reducing the number of colors.\n\nContinue anyway?";
+	}
+	else if(pEditor->m_PopupEventType == POPEVENT_PIXELART_TOO_MANY_COLORS)
+	{
+		pTitle = "Too many colors";
+		pMessage = "The client only supports 64 images but more would be needed to add the selected image as tileart.";
+	}
+	else
+	{
+		dbg_assert(false, "m_PopupEventType invalid");
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	CUIRect Label, ButtonBar, Button;
+
+	View.Margin(10.0f, &View);
+	View.HSplitBottom(20.0f, &View, &ButtonBar);
+
+	// title
+	View.HSplitTop(20.0f, &Label, &View);
+	pEditor->UI()->DoLabel(&Label, pTitle, 20.0f, TEXTALIGN_MC);
+
+	// message
+	SLabelProperties Props;
+	Props.m_MaxWidth = View.w;
+	pEditor->UI()->DoLabel(&View, pMessage, 10.0f, TEXTALIGN_ML, Props);
+
+	// button bar
+	ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
+	if(pEditor->m_PopupEventType != POPEVENT_LARGELAYER &&
+		pEditor->m_PopupEventType != POPEVENT_PREVENTUNUSEDTILES &&
+		pEditor->m_PopupEventType != POPEVENT_IMAGEDIV16 &&
+		pEditor->m_PopupEventType != POPEVENT_IMAGE_MAX &&
+		pEditor->m_PopupEventType != POPEVENT_SOUND_MAX &&
+		pEditor->m_PopupEventType != POPEVENT_PIXELART_TOO_MANY_COLORS)
+	{
+		static int s_CancelButton = 0;
+		if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr))
+		{
+			if(pEditor->m_PopupEventType == POPEVENT_LOADDROP)
+				pEditor->m_aFileNamePending[0] = 0;
+			pEditor->m_PopupEventWasActivated = false;
+
+			if(pEditor->m_PopupEventType == POPEVENT_PIXELART_BIG_IMAGE || pEditor->m_PopupEventType == POPEVENT_PIXELART_MANY_COLORS)
+			{
+				free(pEditor->m_TileartImageInfo.m_pData);
+				pEditor->m_TileartImageInfo.m_pData = nullptr;
+			}
+
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+	}
+
+	ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
+	static int s_ConfirmButton = 0;
+	if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
+	{
+		if(pEditor->m_PopupEventType == POPEVENT_EXIT)
+		{
+			pEditor->OnClose();
+			g_Config.m_ClEditor = 0;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_LOAD)
+		{
+			pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", false, CEditor::CallbackOpenMap, pEditor);
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_LOADCURRENT)
+		{
+			pEditor->LoadCurrentMap();
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_LOADDROP)
+		{
+			int Result = pEditor->Load(pEditor->m_aFileNamePending, IStorage::TYPE_ALL_OR_ABSOLUTE);
+			if(!Result)
+				dbg_msg("editor", "editing passed map file '%s' failed", pEditor->m_aFileNamePending);
+			pEditor->m_aFileNamePending[0] = 0;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_NEW)
+		{
+			pEditor->Reset();
+			pEditor->m_aFileName[0] = 0;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_SAVE)
+		{
+			CallbackSaveMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_COPY)
+		{
+			CallbackSaveCopyMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_IMG)
+		{
+			CallbackSaveImage(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_SAVE_SOUND)
+		{
+			CallbackSaveSound(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
+			return CUI::POPUP_CLOSE_CURRENT;
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
+		{
+			pEditor->PlaceBorderTiles();
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_PIXELART_BIG_IMAGE)
+		{
+			pEditor->TileartCheckColors();
+		}
+		else if(pEditor->m_PopupEventType == POPEVENT_PIXELART_MANY_COLORS)
+		{
+			pEditor->AddTileart();
+		}
+		pEditor->m_PopupEventWasActivated = false;
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+static int g_SelectImageSelected = -100;
+static int g_SelectImageCurrent = -100;
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect ButtonBar, ImageView;
+	View.VSplitLeft(150.0f, &ButtonBar, &View);
+	View.Margin(10.0f, &ImageView);
+
+	int ShowImage = g_SelectImageCurrent;
+
+	const float ButtonHeight = 12.0f;
+	const float ButtonMargin = 2.0f;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
+	s_ScrollRegion.Begin(&ButtonBar, &ScrollOffset, &ScrollParams);
+	ButtonBar.y += ScrollOffset.y;
+
+	for(int i = -1; i < (int)pEditor->m_Map.m_vpImages.size(); i++)
+	{
+		CUIRect Button;
+		ButtonBar.HSplitTop(ButtonMargin, nullptr, &ButtonBar);
+		ButtonBar.HSplitTop(ButtonHeight, &Button, &ButtonBar);
+		if(s_ScrollRegion.AddRect(Button))
+		{
+			if(pEditor->UI()->MouseInside(&Button))
+				ShowImage = i;
+
+			static int s_NoneButton = 0;
+			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpImages[i], i == -1 ? "None" : pEditor->m_Map.m_vpImages[i]->m_aName, i == g_SelectImageCurrent, &Button))
+				g_SelectImageSelected = i;
+		}
+	}
+
+	s_ScrollRegion.End();
+
+	if(ShowImage >= 0 && (size_t)ShowImage < pEditor->m_Map.m_vpImages.size())
+	{
+		if(ImageView.h < ImageView.w)
+			ImageView.w = ImageView.h;
+		else
+			ImageView.h = ImageView.w;
+		float Max = (float)(maximum(pEditor->m_Map.m_vpImages[ShowImage]->m_Width, pEditor->m_Map.m_vpImages[ShowImage]->m_Height));
+		ImageView.w *= pEditor->m_Map.m_vpImages[ShowImage]->m_Width / Max;
+		ImageView.h *= pEditor->m_Map.m_vpImages[ShowImage]->m_Height / Max;
+		pEditor->Graphics()->TextureSet(pEditor->m_Map.m_vpImages[ShowImage]->m_Texture);
+		pEditor->Graphics()->BlendNormal();
+		pEditor->Graphics()->WrapClamp();
+		pEditor->Graphics()->QuadsBegin();
+		IGraphics::CQuadItem QuadItem(ImageView.x, ImageView.y, ImageView.w, ImageView.h);
+		pEditor->Graphics()->QuadsDrawTL(&QuadItem, 1);
+		pEditor->Graphics()->QuadsEnd();
+		pEditor->Graphics()->WrapNormal();
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CEditor::PopupSelectImageInvoke(int Current, float x, float y)
+{
+	static SPopupMenuId s_PopupSelectImageId;
+	g_SelectImageSelected = -100;
+	g_SelectImageCurrent = Current;
+	UI()->DoPopupMenu(&s_PopupSelectImageId, x, y, 450, 300, this, PopupSelectImage);
+}
+
+int CEditor::PopupSelectImageResult()
+{
+	if(g_SelectImageSelected == -100)
+		return -100;
+
+	g_SelectImageCurrent = g_SelectImageSelected;
+	g_SelectImageSelected = -100;
+	return g_SelectImageCurrent;
+}
+
+static int g_SelectSoundSelected = -100;
+static int g_SelectSoundCurrent = -100;
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSelectSound(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	const float ButtonHeight = 12.0f;
+	const float ButtonMargin = 2.0f;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
+	s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
+	View.y += ScrollOffset.y;
+
+	for(int i = -1; i < (int)pEditor->m_Map.m_vpSounds.size(); i++)
+	{
+		CUIRect Button;
+		View.HSplitTop(ButtonMargin, nullptr, &View);
+		View.HSplitTop(ButtonHeight, &Button, &View);
+		if(s_ScrollRegion.AddRect(Button))
+		{
+			static int s_NoneButton = 0;
+			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpSounds[i], i == -1 ? "None" : pEditor->m_Map.m_vpSounds[i]->m_aName, i == g_SelectSoundCurrent, &Button))
+				g_SelectSoundSelected = i;
+		}
+	}
+
+	s_ScrollRegion.End();
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CEditor::PopupSelectSoundInvoke(int Current, float x, float y)
+{
+	static SPopupMenuId s_PopupSelectSoundId;
+	g_SelectSoundSelected = -100;
+	g_SelectSoundCurrent = Current;
+	UI()->DoPopupMenu(&s_PopupSelectSoundId, x, y, 150, 300, this, PopupSelectSound);
+}
+
+int CEditor::PopupSelectSoundResult()
+{
+	if(g_SelectSoundSelected == -100)
+		return -100;
+
+	g_SelectSoundCurrent = g_SelectSoundSelected;
+	g_SelectSoundSelected = -100;
+	return g_SelectSoundCurrent;
+}
+
+static int s_GametileOpSelected = -1;
+
+static const char *s_apGametileOpButtonNames[] = {
+	"Air",
+	"Hookable",
+	"Death",
+	"Unhookable",
+	"Hookthrough",
+	"Freeze",
+	"Unfreeze",
+	"Deep Freeze",
+	"Deep Unfreeze",
+	"Blue Check-Tele",
+	"Red Check-Tele",
+	"Live Freeze",
+	"Live Unfreeze",
+};
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSelectGametileOp(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	const int PreviousSelected = s_GametileOpSelected;
+
+	CUIRect Button;
+	for(size_t i = 0; i < std::size(s_apGametileOpButtonNames); ++i)
+	{
+		View.HSplitTop(2.0f, nullptr, &View);
+		View.HSplitTop(12.0f, &Button, &View);
+		if(pEditor->DoButton_Editor(&s_apGametileOpButtonNames[i], s_apGametileOpButtonNames[i], 0, &Button, 0, nullptr))
+			s_GametileOpSelected = i;
+	}
+
+	return s_GametileOpSelected == PreviousSelected ? CUI::POPUP_KEEP_OPEN : CUI::POPUP_CLOSE_CURRENT;
+}
+
+void CEditor::PopupSelectGametileOpInvoke(float x, float y)
+{
+	static SPopupMenuId s_PopupSelectGametileOpId;
+	s_GametileOpSelected = -1;
+	UI()->DoPopupMenu(&s_PopupSelectGametileOpId, x, y, 120.0f, std::size(s_apGametileOpButtonNames) * 14.0f + 10.0f, this, PopupSelectGametileOp);
+}
+
+int CEditor::PopupSelectGameTileOpResult()
+{
+	if(s_GametileOpSelected < 0)
+		return -1;
+
+	int Result = s_GametileOpSelected;
+	s_GametileOpSelected = -1;
+	return Result;
+}
+
+static int s_AutoMapConfigSelected = -100;
+static int s_AutoMapConfigCurrent = -100;
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+	std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(pEditor->GetSelectedLayer(0));
+	CAutoMapper *pAutoMapper = &pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_AutoMapper;
+
+	const float ButtonHeight = 12.0f;
+	const float ButtonMargin = 2.0f;
+
+	static CScrollRegion s_ScrollRegion;
+	vec2 ScrollOffset(0.0f, 0.0f);
+	CScrollRegionParams ScrollParams;
+	ScrollParams.m_ScrollbarWidth = 10.0f;
+	ScrollParams.m_ScrollbarMargin = 3.0f;
+	ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
+	s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
+	View.y += ScrollOffset.y;
+
+	for(int i = -1; i < pAutoMapper->ConfigNamesNum(); i++)
+	{
+		CUIRect Button;
+		View.HSplitTop(ButtonMargin, nullptr, &View);
+		View.HSplitTop(ButtonHeight, &Button, &View);
+		if(s_ScrollRegion.AddRect(Button))
+		{
+			static int s_NoneButton = 0;
+			if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : pAutoMapper->GetConfigName(i), i == -1 ? "None" : pAutoMapper->GetConfigName(i), i == s_AutoMapConfigCurrent, &Button))
+				s_AutoMapConfigSelected = i;
+		}
+	}
+
+	s_ScrollRegion.End();
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+void CEditor::PopupSelectConfigAutoMapInvoke(int Current, float x, float y)
+{
+	static SPopupMenuId s_PopupSelectConfigAutoMapId;
+	s_AutoMapConfigSelected = -100;
+	s_AutoMapConfigCurrent = Current;
+	std::shared_ptr<CLayerTiles> pLayer = std::static_pointer_cast<CLayerTiles>(GetSelectedLayer(0));
+	const int ItemCount = minimum(m_Map.m_vpImages[pLayer->m_Image]->m_AutoMapper.ConfigNamesNum(), 10);
+	// Width for buttons is 120, 15 is the scrollbar width, 2 is the margin between both.
+	UI()->DoPopupMenu(&s_PopupSelectConfigAutoMapId, x, y, 120.0f + 15.0f + 2.0f, 26.0f + 14.0f * ItemCount, this, PopupSelectConfigAutoMap);
+}
+
+int CEditor::PopupSelectConfigAutoMapResult()
+{
+	if(s_AutoMapConfigSelected == -100)
+		return -100;
+
+	s_AutoMapConfigCurrent = s_AutoMapConfigSelected;
+	s_AutoMapConfigSelected = -100;
+	return s_AutoMapConfigCurrent;
+}
+
+// DDRace
+
+CUI::EPopupMenuFunctionResult CEditor::PopupTele(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	static int s_PreviousNumber = -1;
+
+	CUIRect NumberPicker;
+	CUIRect FindEmptySlot;
+
+	View.VSplitRight(15.f, &NumberPicker, &FindEmptySlot);
+	NumberPicker.VSplitRight(2.f, &NumberPicker, nullptr);
+	FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
+	FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
+
+	// find empty number button
+	{
+		static int s_EmptySlotPid = 0;
+		if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
+		{
+			int number = -1;
+			for(int i = 1; i <= 255; i++)
+			{
+				if(!pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(i))
+				{
+					number = i;
+					break;
+				}
+			}
+
+			if(number != -1)
+			{
+				pEditor->m_TeleNumber = number;
+			}
+		}
+	}
+
+	// number picker
+	{
+		static ColorRGBA s_Color = ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+
+		enum
+		{
+			PROP_TELE = 0,
+			NUM_PROPS,
+		};
+		CProperty aProps[] = {
+			{"Number", pEditor->m_TeleNumber, PROPTYPE_INT_STEP, 1, 255},
+			{nullptr},
+		};
+
+		static int s_aIds[NUM_PROPS] = {0};
+
+		static int NewVal = 0;
+		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
+		if(Prop == PROP_TELE)
+		{
+			pEditor->m_TeleNumber = (NewVal - 1 + 255) % 255 + 1;
+		}
+
+		if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_TeleNumber)
+		{
+			s_Color = pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(pEditor->m_TeleNumber) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+		}
+	}
+
+	s_PreviousNumber = pEditor->m_TeleNumber;
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	enum
+	{
+		PROP_FORCE = 0,
+		PROP_MAXSPEED,
+		PROP_ANGLE,
+		NUM_PROPS
+	};
+
+	CProperty aProps[] = {
+		{"Force", pEditor->m_SpeedupForce, PROPTYPE_INT_STEP, 1, 255},
+		{"Max Speed", pEditor->m_SpeedupMaxSpeed, PROPTYPE_INT_STEP, 0, 255},
+		{"Angle", pEditor->m_SpeedupAngle, PROPTYPE_ANGLE_SCROLL, 0, 359},
+		{nullptr},
+	};
+
+	static int s_aIds[NUM_PROPS] = {0};
+	int NewVal = 0;
+	int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
+
+	if(Prop == PROP_FORCE)
+	{
+		pEditor->m_SpeedupForce = clamp(NewVal, 1, 255);
+	}
+	else if(Prop == PROP_MAXSPEED)
+	{
+		pEditor->m_SpeedupMaxSpeed = clamp(NewVal, 0, 255);
+	}
+	else if(Prop == PROP_ANGLE)
+	{
+		pEditor->m_SpeedupAngle = clamp(NewVal, 0, 359);
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupSwitch(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect NumberPicker, FindEmptySlot;
+
+	View.VSplitRight(15.0f, &NumberPicker, &FindEmptySlot);
+	NumberPicker.VSplitRight(2.0f, &NumberPicker, nullptr);
+	FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
+	FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
+
+	// find empty number button
+	{
+		static int s_EmptySlotPid = 0;
+		if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
+		{
+			int Number = -1;
+			for(int i = 1; i <= 255; i++)
+			{
+				if(!pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(i))
+				{
+					Number = i;
+					break;
+				}
+			}
+
+			if(Number != -1)
+			{
+				pEditor->m_SwitchNum = Number;
+			}
+		}
+	}
+
+	// number picker
+	static int s_PreviousNumber = -1;
+	{
+		static ColorRGBA s_Color = ColorRGBA(1, 1, 1, 0.5f);
+
+		enum
+		{
+			PROP_SWITCH_NUMBER = 0,
+			PROP_SWITCH_DELAY,
+			NUM_PROPS,
+		};
+
+		CProperty aProps[] = {
+			{"Number", pEditor->m_SwitchNum, PROPTYPE_INT_STEP, 0, 255},
+			{"Delay", pEditor->m_SwitchDelay, PROPTYPE_INT_STEP, 0, 255},
+			{nullptr},
+		};
+
+		static int s_aIds[NUM_PROPS] = {0};
+		int NewVal = 0;
+		int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
+
+		if(Prop == PROP_SWITCH_NUMBER)
+		{
+			pEditor->m_SwitchNum = (NewVal + 256) % 256;
+		}
+		else if(Prop == PROP_SWITCH_DELAY)
+		{
+			pEditor->m_SwitchDelay = (NewVal + 256) % 256;
+		}
+
+		if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_SwitchNum)
+		{
+			s_Color = pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(pEditor->m_SwitchNum) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
+		}
+	}
+
+	s_PreviousNumber = pEditor->m_SwitchNum;
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	enum
+	{
+		PROP_TUNE = 0,
+		NUM_PROPS,
+	};
+
+	CProperty aProps[] = {
+		{"Zone", pEditor->m_TuningNum, PROPTYPE_INT_STEP, 1, 255},
+		{nullptr},
+	};
+
+	static int s_aIds[NUM_PROPS] = {0};
+	int NewVal = 0;
+	int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
+
+	if(Prop == PROP_TUNE)
+	{
+		pEditor->m_TuningNum = (NewVal - 1 + 255) % 255 + 1;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	enum
+	{
+		PROP_COORD_X = 0,
+		PROP_COORD_Y,
+		NUM_PROPS,
+	};
+
+	static ivec2 s_GotoPos(0, 0);
+
+	CProperty aProps[] = {
+		{"X", s_GotoPos.x, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
+		{"Y", s_GotoPos.y, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
+		{nullptr},
+	};
+
+	static int s_aIds[NUM_PROPS] = {0};
+	int NewVal = 0;
+	int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal, ColorRGBA(1, 1, 1, 0.5f));
+
+	if(Prop == PROP_COORD_X)
+	{
+		s_GotoPos.x = NewVal;
+	}
+	else if(Prop == PROP_COORD_Y)
+	{
+		s_GotoPos.y = NewVal;
+	}
+
+	CUIRect Button;
+	View.HSplitBottom(12.0f, &View, &Button);
+
+	static int s_Button;
+	if(pEditor->DoButton_Editor(&s_Button, "Go", 0, &Button, 0, nullptr))
+	{
+		pEditor->MapView()->SetWorldOffset({32.0f * s_GotoPos.x + 0.5f, 32.0f * s_GotoPos.y + 0.5f});
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupEntities(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	for(size_t i = 0; i < pEditor->m_vSelectEntitiesFiles.size(); i++)
+	{
+		CUIRect Button;
+		View.HSplitTop(14.0f, &Button, &View);
+
+		const char *pName = pEditor->m_vSelectEntitiesFiles[i].c_str();
+		if(pEditor->DoButton_MenuItem(pName, pName, pEditor->m_vSelectEntitiesFiles[i] == pEditor->m_SelectEntitiesImage, &Button))
+		{
+			if(pEditor->m_vSelectEntitiesFiles[i] != pEditor->m_SelectEntitiesImage)
+			{
+				pEditor->m_SelectEntitiesImage = pEditor->m_vSelectEntitiesFiles[i];
+				pEditor->m_AllowPlaceUnusedTiles = pEditor->m_SelectEntitiesImage == "DDNet" ? 0 : -1;
+				pEditor->m_PreventUnusedTilesWasWarned = false;
+
+				if(pEditor->m_EntitiesTexture.IsValid())
+					pEditor->Graphics()->UnloadTexture(&pEditor->m_EntitiesTexture);
+
+				char aBuf[IO_MAX_PATH_LENGTH];
+				str_format(aBuf, sizeof(aBuf), "editor/entities/%s.png", pName);
+				pEditor->m_EntitiesTexture = pEditor->Graphics()->LoadTexture(aBuf, IStorage::TYPE_ALL, pEditor->GetTextureUsageFlag());
+				return CUI::POPUP_CLOSE_CURRENT;
+			}
+		}
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
+
+CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect View, bool Active)
+{
+	CEditor *pEditor = static_cast<CEditor *>(pContext);
+
+	CUIRect Button;
+	View.HSplitTop(12.0f, &Button, &View);
+	static int s_ButtonIngame;
+	if(pEditor->DoButton_MenuItem(&s_ButtonIngame, "Ingame", pEditor->MapView()->ProofMode()->IsModeIngame(), &Button, 0, "These borders represent what a player maximum can see."))
+	{
+		pEditor->MapView()->ProofMode()->SetModeIngame();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	View.HSplitTop(2.0f, nullptr, &View);
+	View.HSplitTop(12.0f, &Button, &View);
+	static int s_ButtonMenu;
+	if(pEditor->DoButton_MenuItem(&s_ButtonMenu, "Menu", pEditor->MapView()->ProofMode()->IsModeMenu(), &Button, 0, "These borders represent what will be shown in the menu."))
+	{
+		pEditor->MapView()->ProofMode()->SetModeMenu();
+		return CUI::POPUP_CLOSE_CURRENT;
+	}
+
+	return CUI::POPUP_KEEP_OPEN;
+}
diff --git a/src_bkp/game/editor/proof_mode.cpp b/src_bkp/game/editor/proof_mode.cpp
new file mode 100644
index 0000000000..773e356d12
--- /dev/null
+++ b/src_bkp/game/editor/proof_mode.cpp
@@ -0,0 +1,245 @@
+#include "proof_mode.h"
+
+#include <game/client/components/menu_background.h>
+
+#include "editor.h"
+
+void CProofMode::Init(CEditor *pEditor)
+{
+	CEditorComponent::Init(pEditor);
+	SetMenuBackgroundPositionNames();
+	OnReset();
+	OnMapLoad();
+}
+
+void CProofMode::OnReset()
+{
+	m_ProofBorders = PROOF_BORDER_OFF;
+	m_CurrentMenuProofIndex = 0;
+}
+
+void CProofMode::OnMapLoad()
+{
+	m_vMenuBackgroundCollisions = {};
+	ResetMenuBackgroundPositions();
+}
+
+void CProofMode::SetMenuBackgroundPositionNames()
+{
+	m_vpMenuBackgroundPositionNames.resize(CMenuBackground::NUM_POS);
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_START] = "start";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_INTERNET] = "browser(internet)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_LAN] = "browser(lan)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_DEMOS] = "demos";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_NEWS] = "news";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_FAVORITES] = "favorites";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_LANGUAGE] = "settings(language)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GENERAL] = "settings(general)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_PLAYER] = "settings(player)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_TEE] = "settings(tee)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_APPEARANCE] = "settings(appearance)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_CONTROLS] = "settings(controls)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GRAPHICS] = "settings(graphics)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_SOUND] = "settings(sound)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_DDNET] = "settings(ddnet)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_ASSETS] = "settings(assets)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM0] = "custom(1)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM1] = "custom(2)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM2] = "custom(3)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM3] = "custom(4)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED0] = "reserved settings(1)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED1] = "reserved settings(2)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED0] = "reserved(1)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED1] = "reserved(2)";
+	m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED2] = "reserved(3)";
+}
+
+void CProofMode::ResetMenuBackgroundPositions()
+{
+	std::array<vec2, CMenuBackground::NUM_POS> aBackgroundPositions = GenerateMenuBackgroundPositions();
+	m_vMenuBackgroundPositions.assign(aBackgroundPositions.begin(), aBackgroundPositions.end());
+
+	if(Editor()->m_Map.m_pGameLayer)
+	{
+		for(int y = 0; y < Editor()->m_Map.m_pGameLayer->m_Height; ++y)
+		{
+			for(int x = 0; x < Editor()->m_Map.m_pGameLayer->m_Width; ++x)
+			{
+				CTile Tile = Editor()->m_Map.m_pGameLayer->GetTile(x, y);
+				if(Tile.m_Index >= TILE_TIME_CHECKPOINT_FIRST && Tile.m_Index <= TILE_TIME_CHECKPOINT_LAST)
+				{
+					int ArrayIndex = clamp<int>((Tile.m_Index - TILE_TIME_CHECKPOINT_FIRST), 0, CMenuBackground::NUM_POS);
+					m_vMenuBackgroundPositions[ArrayIndex] = vec2(x * 32.0f + 16.0f, y * 32.0f + 16.0f);
+				}
+
+				x += Tile.m_Skip;
+			}
+		}
+	}
+
+	m_vMenuBackgroundCollisions.clear();
+	m_vMenuBackgroundCollisions.resize(m_vMenuBackgroundPositions.size());
+	for(size_t i = 0; i < m_vMenuBackgroundPositions.size(); i++)
+	{
+		for(size_t j = i + 1; j < m_vMenuBackgroundPositions.size(); j++)
+		{
+			if(i != j && distance(m_vMenuBackgroundPositions[i], m_vMenuBackgroundPositions[j]) < 0.001f)
+				m_vMenuBackgroundCollisions.at(i).push_back(j);
+		}
+	}
+}
+
+void CProofMode::RenderScreenSizes()
+{
+	const vec2 WorldOffset = Editor()->MapView()->GetWorldOffset();
+
+	// render screen sizes
+	if(m_ProofBorders != PROOF_BORDER_OFF && !Editor()->MapView()->m_ShowPicker)
+	{
+		std::shared_ptr<CLayerGroup> pGameGroup = Editor()->m_Map.m_pGameGroup;
+		pGameGroup->MapScreen();
+
+		Graphics()->TextureClear();
+		Graphics()->LinesBegin();
+
+		// possible screen sizes (white border)
+		float aLastPoints[4];
+		float Start = 1.0f; // 9.0f/16.0f;
+		float End = 16.0f / 9.0f;
+		const int NumSteps = 20;
+		for(int i = 0; i <= NumSteps; i++)
+		{
+			float aPoints[4];
+			float Aspect = Start + (End - Start) * (i / (float)NumSteps);
+
+			float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
+			RenderTools()->MapScreenToWorld(
+				WorldOffset.x, WorldOffset.y,
+				100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
+
+			if(i == 0)
+			{
+				IGraphics::CLineItem aArray[2] = {
+					IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[2], aPoints[1]),
+					IGraphics::CLineItem(aPoints[0], aPoints[3], aPoints[2], aPoints[3])};
+				Graphics()->LinesDraw(aArray, std::size(aArray));
+			}
+
+			if(i != 0)
+			{
+				IGraphics::CLineItem aArray[4] = {
+					IGraphics::CLineItem(aPoints[0], aPoints[1], aLastPoints[0], aLastPoints[1]),
+					IGraphics::CLineItem(aPoints[2], aPoints[1], aLastPoints[2], aLastPoints[1]),
+					IGraphics::CLineItem(aPoints[0], aPoints[3], aLastPoints[0], aLastPoints[3]),
+					IGraphics::CLineItem(aPoints[2], aPoints[3], aLastPoints[2], aLastPoints[3])};
+				Graphics()->LinesDraw(aArray, std::size(aArray));
+			}
+
+			if(i == NumSteps)
+			{
+				IGraphics::CLineItem aArray[2] = {
+					IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[0], aPoints[3]),
+					IGraphics::CLineItem(aPoints[2], aPoints[1], aPoints[2], aPoints[3])};
+				Graphics()->LinesDraw(aArray, std::size(aArray));
+			}
+
+			mem_copy(aLastPoints, aPoints, sizeof(aPoints));
+		}
+
+		// two screen sizes (green and red border)
+		{
+			Graphics()->SetColor(1, 0, 0, 1);
+			for(int i = 0; i < 2; i++)
+			{
+				float aPoints[4];
+				const float aAspects[] = {4.0f / 3.0f, 16.0f / 10.0f, 5.0f / 4.0f, 16.0f / 9.0f};
+				float Aspect = aAspects[i];
+
+				float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
+				RenderTools()->MapScreenToWorld(
+					WorldOffset.x, WorldOffset.y,
+					100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
+
+				CUIRect r;
+				r.x = aPoints[0];
+				r.y = aPoints[1];
+				r.w = aPoints[2] - aPoints[0];
+				r.h = aPoints[3] - aPoints[1];
+
+				IGraphics::CLineItem aArray[4] = {
+					IGraphics::CLineItem(r.x, r.y, r.x + r.w, r.y),
+					IGraphics::CLineItem(r.x + r.w, r.y, r.x + r.w, r.y + r.h),
+					IGraphics::CLineItem(r.x + r.w, r.y + r.h, r.x, r.y + r.h),
+					IGraphics::CLineItem(r.x, r.y + r.h, r.x, r.y)};
+				Graphics()->LinesDraw(aArray, std::size(aArray));
+				Graphics()->SetColor(0, 1, 0, 1);
+			}
+		}
+		Graphics()->LinesEnd();
+
+		// tee position (blue circle) and other screen positions
+		{
+			Graphics()->TextureClear();
+			Graphics()->QuadsBegin();
+			Graphics()->SetColor(0, 0, 1, 0.3f);
+			Graphics()->DrawCircle(WorldOffset.x, WorldOffset.y - 3.0f, 20.0f, 32);
+
+			if(m_ProofBorders == PROOF_BORDER_MENU)
+			{
+				Graphics()->SetColor(0, 1, 0, 0.3f);
+
+				std::set<int> Indices;
+				for(int i = 0; i < (int)m_vMenuBackgroundPositions.size(); i++)
+					Indices.insert(i);
+
+				while(!Indices.empty())
+				{
+					int i = *Indices.begin();
+					Indices.erase(i);
+					for(int k : m_vMenuBackgroundCollisions.at(i))
+						Indices.erase(k);
+
+					vec2 Pos = m_vMenuBackgroundPositions[i];
+					Pos += WorldOffset - m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
+
+					if(Pos == WorldOffset)
+						continue;
+
+					Graphics()->DrawCircle(Pos.x, Pos.y - 3.0f, 20.0f, 32);
+				}
+			}
+
+			Graphics()->QuadsEnd();
+		}
+	}
+}
+
+bool CProofMode::IsEnabled() const
+{
+	return m_ProofBorders != PROOF_BORDER_OFF;
+}
+
+bool CProofMode::IsModeMenu() const
+{
+	return m_ProofBorders == PROOF_BORDER_MENU;
+}
+
+bool CProofMode::IsModeIngame() const
+{
+	return m_ProofBorders == PROOF_BORDER_INGAME;
+}
+
+void CProofMode::Toggle()
+{
+	m_ProofBorders = m_ProofBorders == PROOF_BORDER_OFF ? PROOF_BORDER_INGAME : PROOF_BORDER_OFF;
+}
+
+void CProofMode::SetModeIngame()
+{
+	m_ProofBorders = PROOF_BORDER_INGAME;
+}
+
+void CProofMode::SetModeMenu()
+{
+	m_ProofBorders = PROOF_BORDER_MENU;
+}
diff --git a/src_bkp/game/editor/proof_mode.h b/src_bkp/game/editor/proof_mode.h
new file mode 100644
index 0000000000..81b77f8eac
--- /dev/null
+++ b/src_bkp/game/editor/proof_mode.h
@@ -0,0 +1,38 @@
+#ifndef GAME_EDITOR_PROOF_MODE_H
+#define GAME_EDITOR_PROOF_MODE_H
+
+#include "component.h"
+
+class CProofMode : public CEditorComponent
+{
+public:
+	void Init(CEditor *pEditor) override;
+	void OnReset() override;
+	void OnMapLoad() override;
+	void RenderScreenSizes();
+
+	bool IsEnabled() const;
+	bool IsModeMenu() const;
+	bool IsModeIngame() const;
+	void Toggle();
+	void SetModeMenu();
+	void SetModeIngame();
+
+	enum EProofBorder
+	{
+		PROOF_BORDER_OFF,
+		PROOF_BORDER_INGAME,
+		PROOF_BORDER_MENU
+	};
+	EProofBorder m_ProofBorders;
+
+	int m_CurrentMenuProofIndex;
+	std::vector<vec2> m_vMenuBackgroundPositions;
+	std::vector<const char *> m_vpMenuBackgroundPositionNames;
+	std::vector<std::vector<int>> m_vMenuBackgroundCollisions;
+
+	void SetMenuBackgroundPositionNames();
+	void ResetMenuBackgroundPositions();
+};
+
+#endif
diff --git a/src_bkp/game/editor/smooth_value.cpp b/src_bkp/game/editor/smooth_value.cpp
new file mode 100644
index 0000000000..5f99ad5f7c
--- /dev/null
+++ b/src_bkp/game/editor/smooth_value.cpp
@@ -0,0 +1,95 @@
+#include "smooth_value.h"
+
+#include <engine/client.h>
+#include <engine/shared/config.h>
+
+CSmoothValue::CSmoothValue(float InitialValue, float MinValue, float MaxValue) :
+	m_Smoothing(false), m_Value(InitialValue), m_MinValue(MinValue), m_MaxValue(MaxValue) {}
+
+void CSmoothValue::SetValue(float Target)
+{
+	Target = clamp(Target, m_MinValue, m_MaxValue);
+
+	const float Now = Client()->GlobalTime();
+	float Current = m_Value;
+	float Derivative = 0.0f;
+	if(m_Smoothing)
+	{
+		const float Progress = ZoomProgress(Now);
+		Current = m_ValueSmoothing.Evaluate(Progress);
+		Derivative = m_ValueSmoothing.Derivative(Progress);
+	}
+
+	m_ValueSmoothingTarget = Target;
+	m_ValueSmoothing = CCubicBezier::With(Current, Derivative, 0.0f, m_ValueSmoothingTarget);
+	m_ValueSmoothingStart = Now;
+	m_ValueSmoothingEnd = Now + g_Config.m_EdSmoothZoomTime / 1000.0f;
+
+	m_Smoothing = true;
+}
+
+void CSmoothValue::ChangeValue(float Amount)
+{
+	const float CurrentTarget = m_Smoothing ? m_ValueSmoothingTarget : m_Value;
+	SetValue(CurrentTarget + Amount);
+}
+
+bool CSmoothValue::UpdateValue()
+{
+	if(m_Smoothing)
+	{
+		const float Time = Client()->GlobalTime();
+		const float OldLevel = m_Value;
+		if(Time >= m_ValueSmoothingEnd)
+		{
+			m_Value = m_ValueSmoothingTarget;
+			m_Smoothing = false;
+		}
+		else
+		{
+			m_Value = m_ValueSmoothing.Evaluate(ZoomProgress(Time));
+			if((OldLevel < m_ValueSmoothingTarget && m_Value > m_ValueSmoothingTarget) || (OldLevel > m_ValueSmoothingTarget && m_Value < m_ValueSmoothingTarget))
+			{
+				m_Value = m_ValueSmoothingTarget;
+				m_Smoothing = false;
+			}
+		}
+		m_Value = clamp(m_Value, m_MinValue, m_MaxValue);
+
+		return true;
+	}
+
+	return false;
+}
+
+float CSmoothValue::ZoomProgress(float CurrentTime) const
+{
+	return (CurrentTime - m_ValueSmoothingStart) / (m_ValueSmoothingEnd - m_ValueSmoothingStart);
+}
+
+float CSmoothValue::GetValue() const
+{
+	return m_Value;
+}
+
+void CSmoothValue::SetValueInstant(float Target)
+{
+	m_Smoothing = false;
+	m_Value = Target;
+}
+
+void CSmoothValue::SetValueRange(float MinValue, float MaxValue)
+{
+	m_MinValue = MinValue;
+	m_MaxValue = MaxValue;
+}
+
+float CSmoothValue::GetMinValue() const
+{
+	return m_MinValue;
+}
+
+float CSmoothValue::GetMaxValue() const
+{
+	return m_MaxValue;
+}
diff --git a/src_bkp/game/editor/smooth_value.h b/src_bkp/game/editor/smooth_value.h
new file mode 100644
index 0000000000..2b6ffc43a5
--- /dev/null
+++ b/src_bkp/game/editor/smooth_value.h
@@ -0,0 +1,53 @@
+#ifndef GAME_EDITOR_SMOOTH_VALUE_H
+#define GAME_EDITOR_SMOOTH_VALUE_H
+
+#include <base/bezier.h>
+
+#include "component.h"
+
+/**
+ * A value that is changed smoothly over time.
+ */
+class CSmoothValue : public CEditorComponent
+{
+public:
+	CSmoothValue(float InitialValue, float MinValue, float MaxValue);
+
+	/**
+	 * Set a new target which the value should change to.
+	 */
+	void SetValue(float Target);
+
+	/**
+	 * Change the value by the given amount.
+	 */
+	void ChangeValue(float Amount);
+
+	/**
+	 * Set the value to the target instantly. If the value was changing the
+	 * target will be discarded.
+	 */
+	void SetValueInstant(float Target);
+
+	bool UpdateValue();
+
+	float GetValue() const;
+	void SetValueRange(float MinValue, float MaxValue);
+	float GetMinValue() const;
+	float GetMaxValue() const;
+
+private:
+	float ZoomProgress(float CurrentTime) const;
+
+	bool m_Smoothing;
+	float m_Value;
+	CCubicBezier m_ValueSmoothing;
+	float m_ValueSmoothingTarget;
+	float m_ValueSmoothingStart;
+	float m_ValueSmoothingEnd;
+
+	float m_MinValue;
+	float m_MaxValue;
+};
+
+#endif
diff --git a/src_bkp/game/editor/tileart.cpp b/src_bkp/game/editor/tileart.cpp
new file mode 100644
index 0000000000..5524dce026
--- /dev/null
+++ b/src_bkp/game/editor/tileart.cpp
@@ -0,0 +1,263 @@
+#include "editor.h"
+#include "editor_actions.h"
+
+#include <game/editor/mapitems/image.h>
+
+#include <array>
+
+bool operator<(const ColorRGBA &Left, const ColorRGBA &Right)
+{
+	if(Left.r != Right.r)
+		return Left.r < Right.r;
+	else if(Left.g != Right.g)
+		return Left.g < Right.g;
+	else if(Left.b != Right.b)
+		return Left.b < Right.b;
+	else
+		return Left.a < Right.a;
+}
+
+static ColorRGBA GetPixelColor(const CImageInfo &Image, size_t x, size_t y)
+{
+	uint8_t *pData = static_cast<uint8_t *>(Image.m_pData);
+	const size_t PixelSize = Image.PixelSize();
+	const size_t PixelStartIndex = x * PixelSize + (Image.m_Width * PixelSize * y);
+
+	ColorRGBA Color = {255, 255, 255, 255};
+	if(PixelSize == 1)
+	{
+		Color.a = pData[PixelStartIndex];
+	}
+	else
+	{
+		Color.r = pData[PixelStartIndex + 0];
+		Color.g = pData[PixelStartIndex + 1];
+		Color.b = pData[PixelStartIndex + 2];
+
+		if(PixelSize == 4)
+			Color.a = pData[PixelStartIndex + 3];
+	}
+
+	return Color;
+}
+
+static void SetPixelColor(CImageInfo *pImage, size_t x, size_t y, ColorRGBA Color)
+{
+	uint8_t *pData = static_cast<uint8_t *>(pImage->m_pData);
+	const size_t PixelSize = pImage->PixelSize();
+	const size_t PixelStartIndex = x * PixelSize + (pImage->m_Width * PixelSize * y);
+
+	if(PixelSize == 1)
+	{
+		pData[PixelStartIndex] = Color.a;
+	}
+	else
+	{
+		pData[PixelStartIndex + 0] = Color.r;
+		pData[PixelStartIndex + 1] = Color.g;
+		pData[PixelStartIndex + 2] = Color.b;
+
+		if(PixelSize == 4)
+			pData[PixelStartIndex + 3] = Color.a;
+	}
+}
+
+static std::vector<ColorRGBA> GetUniqueColors(const CImageInfo &Image)
+{
+	std::set<ColorRGBA> ColorSet;
+	std::vector<ColorRGBA> vUniqueColors;
+	for(int x = 0; x < Image.m_Width; x++)
+	{
+		for(int y = 0; y < Image.m_Height; y++)
+		{
+			ColorRGBA Color = GetPixelColor(Image, x, y);
+			if(Color.a > 0 && ColorSet.insert(Color).second)
+				vUniqueColors.push_back(Color);
+		}
+	}
+	std::sort(vUniqueColors.begin(), vUniqueColors.end());
+
+	return vUniqueColors;
+}
+
+constexpr int NumTilesRow = 16;
+constexpr int NumTilesColumn = 16;
+constexpr int NumTiles = NumTilesRow * NumTilesColumn;
+constexpr int TileSize = 64;
+
+static int GetColorIndex(const std::array<ColorRGBA, NumTiles> &ColorGroup, ColorRGBA Color)
+{
+	std::array<ColorRGBA, NumTiles>::const_iterator Iterator = std::find(ColorGroup.begin(), ColorGroup.end(), Color);
+	if(Iterator == ColorGroup.end())
+		return 0;
+	return Iterator - ColorGroup.begin();
+}
+
+static std::vector<std::array<ColorRGBA, NumTiles>> GroupColors(const std::vector<ColorRGBA> &vColors)
+{
+	std::vector<std::array<ColorRGBA, NumTiles>> vaColorGroups;
+
+	for(size_t i = 0; i < vColors.size(); i += NumTiles - 1)
+	{
+		auto &Group = vaColorGroups.emplace_back();
+		std::copy_n(vColors.begin() + i, std::min<size_t>(NumTiles - 1, vColors.size() - i), Group.begin() + 1);
+	}
+
+	return vaColorGroups;
+}
+
+static void SetColorTile(CImageInfo *pImage, int x, int y, ColorRGBA Color)
+{
+	for(int i = 0; i < TileSize; i++)
+	{
+		for(int j = 0; j < TileSize; j++)
+			SetPixelColor(pImage, x * TileSize + i, y * TileSize + j, Color);
+	}
+}
+
+static CImageInfo ColorGroupToImage(const std::array<ColorRGBA, NumTiles> &aColorGroup)
+{
+	CImageInfo Image;
+	Image.m_Width = NumTilesRow * TileSize;
+	Image.m_Height = NumTilesColumn * TileSize;
+	Image.m_Format = CImageInfo::FORMAT_RGBA;
+
+	uint8_t *pData = static_cast<uint8_t *>(malloc(static_cast<size_t>(Image.m_Width) * Image.m_Height * 4 * sizeof(uint8_t)));
+	Image.m_pData = pData;
+
+	for(int y = 0; y < NumTilesColumn; y++)
+	{
+		for(int x = 0; x < NumTilesRow; x++)
+		{
+			int ColorIndex = x + NumTilesRow * y;
+			SetColorTile(&Image, x, y, aColorGroup[ColorIndex]);
+		}
+	}
+
+	return Image;
+}
+
+static std::vector<CImageInfo> ColorGroupsToImages(const std::vector<std::array<ColorRGBA, NumTiles>> &vaColorGroups)
+{
+	std::vector<CImageInfo> vImages;
+	vImages.reserve(vaColorGroups.size());
+	for(const auto &ColorGroup : vaColorGroups)
+		vImages.push_back(ColorGroupToImage(ColorGroup));
+
+	return vImages;
+}
+
+static std::shared_ptr<CEditorImage> ImageInfoToEditorImage(CEditor *pEditor, const CImageInfo &Image, const char *pName)
+{
+	std::shared_ptr<CEditorImage> pEditorImage = std::make_shared<CEditorImage>(pEditor);
+	pEditorImage->m_Width = Image.m_Width;
+	pEditorImage->m_Height = Image.m_Height;
+	pEditorImage->m_Format = Image.m_Format;
+	pEditorImage->m_pData = Image.m_pData;
+
+	int TextureLoadFlag = pEditor->Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
+	pEditorImage->m_Texture = pEditor->Graphics()->LoadTextureRaw(Image.m_Width, Image.m_Height, Image.m_Format, Image.m_pData, TextureLoadFlag, pName);
+	pEditorImage->m_External = 0;
+	str_copy(pEditorImage->m_aName, pName);
+
+	return pEditorImage;
+}
+
+static std::shared_ptr<CLayerTiles> AddLayerWithImage(CEditor *pEditor, const std::shared_ptr<CLayerGroup> &pGroup, int Width, int Height, const CImageInfo &Image, const char *pName)
+{
+	std::shared_ptr<CEditorImage> pEditorImage = ImageInfoToEditorImage(pEditor, Image, pName);
+	pEditor->m_Map.m_vpImages.push_back(pEditorImage);
+
+	std::shared_ptr<CLayerTiles> pLayer = std::make_shared<CLayerTiles>(pEditor, Width, Height);
+	str_copy(pLayer->m_aName, pName);
+	pLayer->m_Image = pEditor->m_Map.m_vpImages.size() - 1;
+	pGroup->AddLayer(pLayer);
+
+	return pLayer;
+}
+
+static void SetTilelayerIndices(const std::shared_ptr<CLayerTiles> &pLayer, const std::array<ColorRGBA, NumTiles> &aColorGroup, const CImageInfo &Image)
+{
+	for(int x = 0; x < pLayer->m_Width; x++)
+	{
+		for(int y = 0; y < pLayer->m_Height; y++)
+			pLayer->m_pTiles[x + y * pLayer->m_Width].m_Index = GetColorIndex(aColorGroup, GetPixelColor(Image, x, y));
+	}
+}
+
+void CEditor::AddTileart(bool IgnoreHistory)
+{
+	char aTileArtFileName[IO_MAX_PATH_LENGTH];
+	IStorage::StripPathAndExtension(m_aTileartFilename, aTileArtFileName, sizeof(aTileArtFileName));
+
+	std::shared_ptr<CLayerGroup> pGroup = m_Map.NewGroup();
+	str_copy(pGroup->m_aName, aTileArtFileName);
+
+	int ImageCount = m_Map.m_vpImages.size();
+
+	auto vUniqueColors = GetUniqueColors(m_TileartImageInfo);
+	auto vaColorGroups = GroupColors(vUniqueColors);
+	auto vColorImages = ColorGroupsToImages(vaColorGroups);
+	char aImageName[IO_MAX_PATH_LENGTH];
+	for(size_t i = 0; i < vColorImages.size(); i++)
+	{
+		str_format(aImageName, sizeof(aImageName), "%s %" PRIzu, aTileArtFileName, i + 1);
+		std::shared_ptr<CLayerTiles> pLayer = AddLayerWithImage(this, pGroup, m_TileartImageInfo.m_Width, m_TileartImageInfo.m_Height, vColorImages[i], aImageName);
+		SetTilelayerIndices(pLayer, vaColorGroups[i], m_TileartImageInfo);
+	}
+	auto IndexMap = SortImages();
+
+	if(!IgnoreHistory)
+	{
+		m_EditorHistory.RecordAction(std::make_shared<CEditorActionTileArt>(this, ImageCount, m_aTileartFilename, IndexMap));
+	}
+
+	free(m_TileartImageInfo.m_pData);
+	m_TileartImageInfo.m_pData = nullptr;
+	m_Map.OnModify();
+	m_Dialog = DIALOG_NONE;
+}
+
+void CEditor::TileartCheckColors()
+{
+	auto vUniqueColors = GetUniqueColors(m_TileartImageInfo);
+	int NumColorGroups = std::ceil(vUniqueColors.size() / 255.0f);
+	if(m_Map.m_vpImages.size() + NumColorGroups >= 64)
+	{
+		m_PopupEventType = CEditor::POPEVENT_PIXELART_TOO_MANY_COLORS;
+		m_PopupEventActivated = true;
+		free(m_TileartImageInfo.m_pData);
+		m_TileartImageInfo.m_pData = nullptr;
+	}
+	else if(NumColorGroups > 1)
+	{
+		m_PopupEventType = CEditor::POPEVENT_PIXELART_MANY_COLORS;
+		m_PopupEventActivated = true;
+	}
+	else
+		AddTileart();
+}
+
+bool CEditor::CallbackAddTileart(const char *pFilepath, int StorageType, void *pUser)
+{
+	CEditor *pEditor = (CEditor *)pUser;
+
+	if(!pEditor->Graphics()->LoadPNG(&pEditor->m_TileartImageInfo, pFilepath, StorageType))
+	{
+		pEditor->ShowFileDialogError("Failed to load image from file '%s'.", pFilepath);
+		return false;
+	}
+
+	str_copy(pEditor->m_aTileartFilename, pFilepath);
+	if(pEditor->m_TileartImageInfo.m_Width * pEditor->m_TileartImageInfo.m_Height > 10'000)
+	{
+		pEditor->m_PopupEventType = CEditor::POPEVENT_PIXELART_BIG_IMAGE;
+		pEditor->m_PopupEventActivated = true;
+		return false;
+	}
+	else
+	{
+		pEditor->TileartCheckColors();
+		return false;
+	}
+}
diff --git a/src_bkp/game/gamecore.cpp b/src_bkp/game/gamecore.cpp
new file mode 100644
index 0000000000..3e0f921c66
--- /dev/null
+++ b/src_bkp/game/gamecore.cpp
@@ -0,0 +1,712 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "gamecore.h"
+
+#include "collision.h"
+#include "mapitems.h"
+#include "teamscore.h"
+
+#include <base/system.h>
+#include <engine/shared/config.h>
+
+const char *CTuningParams::ms_apNames[] =
+	{
+#define MACRO_TUNING_PARAM(Name, ScriptName, Value, Description) #ScriptName,
+#include "tuning.h"
+#undef MACRO_TUNING_PARAM
+};
+
+bool CTuningParams::Set(int Index, float Value)
+{
+	if(Index < 0 || Index >= Num())
+		return false;
+	((CTuneParam *)this)[Index] = Value;
+	return true;
+}
+
+bool CTuningParams::Get(int Index, float *pValue) const
+{
+	if(Index < 0 || Index >= Num())
+		return false;
+	*pValue = (float)((CTuneParam *)this)[Index];
+	return true;
+}
+
+bool CTuningParams::Set(const char *pName, float Value)
+{
+	for(int i = 0; i < Num(); i++)
+		if(str_comp_nocase(pName, Name(i)) == 0)
+			return Set(i, Value);
+	return false;
+}
+
+bool CTuningParams::Get(const char *pName, float *pValue) const
+{
+	for(int i = 0; i < Num(); i++)
+		if(str_comp_nocase(pName, Name(i)) == 0)
+			return Get(i, pValue);
+
+	return false;
+}
+
+float CTuningParams::GetWeaponFireDelay(int Weapon) const
+{
+	switch(Weapon)
+	{
+	case WEAPON_HAMMER: return (float)m_HammerHitFireDelay / 1000.0f;
+	case WEAPON_GUN: return (float)m_GunFireDelay / 1000.0f;
+	case WEAPON_SHOTGUN: return (float)m_ShotgunFireDelay / 1000.0f;
+	case WEAPON_GRENADE: return (float)m_GrenadeFireDelay / 1000.0f;
+	case WEAPON_LASER: return (float)m_LaserFireDelay / 1000.0f;
+	case WEAPON_NINJA: return (float)m_NinjaFireDelay / 1000.0f;
+	default: dbg_assert(false, "invalid weapon"); return 0.0f; // this value should not be reached
+	}
+}
+
+float VelocityRamp(float Value, float Start, float Range, float Curvature)
+{
+	if(Value < Start)
+		return 1.0f;
+	return 1.0f / std::pow(Curvature, (Value - Start) / Range);
+}
+
+void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams, std::map<int, std::vector<vec2>> *pTeleOuts)
+{
+	m_pWorld = pWorld;
+	m_pCollision = pCollision;
+	m_pTeleOuts = pTeleOuts;
+
+	m_pTeams = pTeams;
+	m_Id = -1;
+
+	// fail safe, if core's tuning didn't get updated at all, just fallback to world tuning.
+	m_Tuning = m_pWorld->m_aTuning[g_Config.m_ClDummy];
+}
+
+void CCharacterCore::SetCoreWorld(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams)
+{
+	m_pWorld = pWorld;
+	m_pCollision = pCollision;
+	m_pTeams = pTeams;
+}
+
+void CCharacterCore::Reset()
+{
+	m_Pos = vec2(0, 0);
+	m_Vel = vec2(0, 0);
+	m_NewHook = false;
+	m_HookPos = vec2(0, 0);
+	m_HookDir = vec2(0, 0);
+	m_HookTeleBase = vec2(0, 0);
+	m_HookTick = 0;
+	m_HookState = HOOK_IDLE;
+	SetHookedPlayer(-1);
+	m_AttachedPlayers.clear();
+	m_Jumped = 0;
+	m_JumpedTotal = 0;
+	m_Jumps = 2;
+	m_TriggeredEvents = 0;
+
+	// DDNet Character
+	m_Solo = false;
+	m_Jetpack = false;
+	m_CollisionDisabled = false;
+	m_EndlessHook = false;
+	m_EndlessJump = false;
+	m_HammerHitDisabled = false;
+	m_GrenadeHitDisabled = false;
+	m_LaserHitDisabled = false;
+	m_ShotgunHitDisabled = false;
+	m_HookHitDisabled = false;
+	m_Super = false;
+	m_HasTelegunGun = false;
+	m_HasTelegunGrenade = false;
+	m_HasTelegunLaser = false;
+	m_FreezeStart = 0;
+	m_FreezeEnd = 0;
+	m_IsInFreeze = false;
+	m_DeepFrozen = false;
+	m_LiveFrozen = false;
+
+	// never initialize both to 0
+	m_Input.m_TargetX = 0;
+	m_Input.m_TargetY = -1;
+}
+
+void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
+{
+	m_MoveRestrictions = m_pCollision->GetMoveRestrictions(UseInput ? IsSwitchActiveCb : 0, this, m_Pos);
+	m_TriggeredEvents = 0;
+
+	// get ground state
+	const bool Grounded = m_pCollision->CheckPoint(m_Pos.x + PhysicalSize() / 2, m_Pos.y + PhysicalSize() / 2 + 5) || m_pCollision->CheckPoint(m_Pos.x - PhysicalSize() / 2, m_Pos.y + PhysicalSize() / 2 + 5);
+	vec2 TargetDirection = normalize(vec2(m_Input.m_TargetX, m_Input.m_TargetY));
+
+	m_Vel.y += m_Tuning.m_Gravity;
+
+	float MaxSpeed = Grounded ? m_Tuning.m_GroundControlSpeed : m_Tuning.m_AirControlSpeed;
+	float Accel = Grounded ? m_Tuning.m_GroundControlAccel : m_Tuning.m_AirControlAccel;
+	float Friction = Grounded ? m_Tuning.m_GroundFriction : m_Tuning.m_AirFriction;
+
+	// handle input
+	if(UseInput)
+	{
+		m_Direction = m_Input.m_Direction;
+
+		// setup angle
+		float TmpAngle = std::atan2(m_Input.m_TargetY, m_Input.m_TargetX);
+		if(TmpAngle < -(pi / 2.0f))
+		{
+			m_Angle = (int)((TmpAngle + (2.0f * pi)) * 256.0f);
+		}
+		else
+		{
+			m_Angle = (int)(TmpAngle * 256.0f);
+		}
+
+		// Special jump cases:
+		// m_Jumps == -1: A tee may only make one ground jump. Second jumped bit is always set
+		// m_Jumps == 0: A tee may not make a jump. Second jumped bit is always set
+		// m_Jumps == 1: A tee may do either a ground jump or an air jump. Second jumped bit is set after the first jump
+		// The second jumped bit can be overridden by special tiles so that the tee can nevertheless jump.
+
+		// handle jump
+		if(m_Input.m_Jump)
+		{
+			if(!(m_Jumped & 1))
+			{
+				if(Grounded && (!(m_Jumped & 2) || m_Jumps != 0))
+				{
+					m_TriggeredEvents |= COREEVENT_GROUND_JUMP;
+					m_Vel.y = -m_Tuning.m_GroundJumpImpulse;
+					if(m_Jumps > 1)
+					{
+						m_Jumped |= 1;
+					}
+					else
+					{
+						m_Jumped |= 3;
+					}
+					m_JumpedTotal = 0;
+				}
+				else if(!(m_Jumped & 2))
+				{
+					m_TriggeredEvents |= COREEVENT_AIR_JUMP;
+					m_Vel.y = -m_Tuning.m_AirJumpImpulse;
+					m_Jumped |= 3;
+					m_JumpedTotal++;
+				}
+			}
+		}
+		else
+		{
+			m_Jumped &= ~1;
+		}
+
+		// handle hook
+		if(m_Input.m_Hook)
+		{
+			if(m_HookState == HOOK_IDLE)
+			{
+				m_HookState = HOOK_FLYING;
+				m_HookPos = m_Pos + TargetDirection * PhysicalSize() * 1.5f;
+				m_HookDir = TargetDirection;
+				SetHookedPlayer(-1);
+				m_HookTick = (float)SERVER_TICK_SPEED * (1.25f - m_Tuning.m_HookDuration);
+				m_TriggeredEvents |= COREEVENT_HOOK_LAUNCH;
+			}
+		}
+		else
+		{
+			SetHookedPlayer(-1);
+			m_HookState = HOOK_IDLE;
+			m_HookPos = m_Pos;
+		}
+	}
+
+	// handle jumping
+	// 1 bit = to keep track if a jump has been made on this input (player is holding space bar)
+	// 2 bit = to track if all air-jumps have been used up (tee gets dark feet)
+	if(Grounded)
+	{
+		m_Jumped &= ~2;
+		m_JumpedTotal = 0;
+	}
+
+	// add the speed modification according to players wanted direction
+	if(m_Direction < 0)
+		m_Vel.x = SaturatedAdd(-MaxSpeed, MaxSpeed, m_Vel.x, -Accel);
+	if(m_Direction > 0)
+		m_Vel.x = SaturatedAdd(-MaxSpeed, MaxSpeed, m_Vel.x, Accel);
+	if(m_Direction == 0)
+		m_Vel.x *= Friction;
+
+	// do hook
+	if(m_HookState == HOOK_IDLE)
+	{
+		SetHookedPlayer(-1);
+		m_HookPos = m_Pos;
+	}
+	else if(m_HookState >= HOOK_RETRACT_START && m_HookState < HOOK_RETRACT_END)
+	{
+		m_HookState++;
+	}
+	else if(m_HookState == HOOK_RETRACT_END)
+	{
+		m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+		m_HookState = HOOK_RETRACTED;
+	}
+	else if(m_HookState == HOOK_FLYING)
+	{
+		vec2 NewPos = m_HookPos + m_HookDir * m_Tuning.m_HookFireSpeed;
+		if((!m_NewHook && distance(m_Pos, NewPos) > m_Tuning.m_HookLength) || (m_NewHook && distance(m_HookTeleBase, NewPos) > m_Tuning.m_HookLength))
+		{
+			m_HookState = HOOK_RETRACT_START;
+			NewPos = m_Pos + normalize(NewPos - m_Pos) * m_Tuning.m_HookLength;
+			m_Reset = true;
+		}
+
+		// make sure that the hook doesn't go though the ground
+		bool GoingToHitGround = false;
+		bool GoingToRetract = false;
+		bool GoingThroughTele = false;
+		int teleNr = 0;
+		int Hit = m_pCollision->IntersectLineTeleHook(m_HookPos, NewPos, &NewPos, 0, &teleNr);
+
+		// m_NewHook = false;
+
+		if(Hit)
+		{
+			if(Hit == TILE_NOHOOK)
+				GoingToRetract = true;
+			else if(Hit == TILE_TELEINHOOK)
+				GoingThroughTele = true;
+			else
+				GoingToHitGround = true;
+			m_Reset = true;
+		}
+
+		// Check against other players first
+		if(!this->m_HookHitDisabled && m_pWorld && m_Tuning.m_PlayerHooking)
+		{
+			float Distance = 0.0f;
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				CCharacterCore *pCharCore = m_pWorld->m_apCharacters[i];
+				if(!pCharCore || pCharCore == this || (!(m_Super || pCharCore->m_Super) && ((m_Id != -1 && !m_pTeams->CanCollide(i, m_Id)) || pCharCore->m_Solo || m_Solo)))
+					continue;
+
+				vec2 ClosestPoint;
+				if(closest_point_on_line(m_HookPos, NewPos, pCharCore->m_Pos, ClosestPoint))
+				{
+					if(distance(pCharCore->m_Pos, ClosestPoint) < PhysicalSize() + 2.0f)
+					{
+						if(m_HookedPlayer == -1 || distance(m_HookPos, pCharCore->m_Pos) < Distance)
+						{
+							m_TriggeredEvents |= COREEVENT_HOOK_ATTACH_PLAYER;
+							m_HookState = HOOK_GRABBED;
+							SetHookedPlayer(i);
+							Distance = distance(m_HookPos, pCharCore->m_Pos);
+						}
+					}
+				}
+			}
+		}
+
+		if(m_HookState == HOOK_FLYING)
+		{
+			// check against ground
+			if(GoingToHitGround)
+			{
+				m_TriggeredEvents |= COREEVENT_HOOK_ATTACH_GROUND;
+				m_HookState = HOOK_GRABBED;
+			}
+			else if(GoingToRetract)
+			{
+				m_TriggeredEvents |= COREEVENT_HOOK_HIT_NOHOOK;
+				m_HookState = HOOK_RETRACT_START;
+			}
+
+			if(GoingThroughTele && m_pWorld && m_pTeleOuts && !m_pTeleOuts->empty() && !(*m_pTeleOuts)[teleNr - 1].empty())
+			{
+				m_TriggeredEvents = 0;
+				SetHookedPlayer(-1);
+
+				m_NewHook = true;
+				int RandomOut = m_pWorld->RandomOr0((*m_pTeleOuts)[teleNr - 1].size());
+				m_HookPos = (*m_pTeleOuts)[teleNr - 1][RandomOut] + TargetDirection * PhysicalSize() * 1.5f;
+				m_HookDir = TargetDirection;
+				m_HookTeleBase = m_HookPos;
+			}
+			else
+			{
+				m_HookPos = NewPos;
+			}
+		}
+	}
+
+	if(m_HookState == HOOK_GRABBED)
+	{
+		if(m_HookedPlayer != -1 && m_pWorld)
+		{
+			CCharacterCore *pCharCore = m_pWorld->m_apCharacters[m_HookedPlayer];
+			if(pCharCore && m_Id != -1 && m_pTeams->CanKeepHook(m_Id, pCharCore->m_Id))
+				m_HookPos = pCharCore->m_Pos;
+			else
+			{
+				// release hook
+				SetHookedPlayer(-1);
+				m_HookState = HOOK_RETRACTED;
+				m_HookPos = m_Pos;
+			}
+
+			// keep players hooked for a max of 1.5sec
+			// if(Server()->Tick() > hook_tick+(Server()->TickSpeed()*3)/2)
+			// release_hooked();
+		}
+
+		// don't do this hook rutine when we are hook to a player
+		if(m_HookedPlayer == -1 && distance(m_HookPos, m_Pos) > 46.0f)
+		{
+			vec2 HookVel = normalize(m_HookPos - m_Pos) * m_Tuning.m_HookDragAccel;
+			// the hook as more power to drag you up then down.
+			// this makes it easier to get on top of an platform
+			if(HookVel.y > 0)
+				HookVel.y *= 0.3f;
+
+			// the hook will boost it's power if the player wants to move
+			// in that direction. otherwise it will dampen everything abit
+			if((HookVel.x < 0 && m_Direction < 0) || (HookVel.x > 0 && m_Direction > 0))
+				HookVel.x *= 0.95f;
+			else
+				HookVel.x *= 0.75f;
+
+			vec2 NewVel = m_Vel + HookVel;
+
+			// check if we are under the legal limit for the hook
+			if(length(NewVel) < m_Tuning.m_HookDragSpeed || length(NewVel) < length(m_Vel))
+				m_Vel = NewVel; // no problem. apply
+		}
+
+		// release hook (max default hook time is 1.25 s)
+		m_HookTick++;
+		if(m_HookedPlayer != -1 && (m_HookTick > SERVER_TICK_SPEED + SERVER_TICK_SPEED / 5 || (m_pWorld && !m_pWorld->m_apCharacters[m_HookedPlayer])))
+		{
+			SetHookedPlayer(-1);
+			m_HookState = HOOK_RETRACTED;
+			m_HookPos = m_Pos;
+		}
+	}
+
+	if(DoDeferredTick)
+		TickDeferred();
+}
+
+void CCharacterCore::TickDeferred()
+{
+	if(m_pWorld)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			CCharacterCore *pCharCore = m_pWorld->m_apCharacters[i];
+			if(!pCharCore)
+				continue;
+
+			// player *p = (player*)ent;
+			// if(pCharCore == this) // || !(p->flags&FLAG_ALIVE)
+
+			if(pCharCore == this || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, i)))
+				continue; // make sure that we don't nudge our self
+
+			if(!(m_Super || pCharCore->m_Super) && (m_Solo || pCharCore->m_Solo))
+				continue;
+
+			// handle player <-> player collision
+			float Distance = distance(m_Pos, pCharCore->m_Pos);
+			if(Distance > 0)
+			{
+				vec2 Dir = normalize(m_Pos - pCharCore->m_Pos);
+
+				bool CanCollide = (m_Super || pCharCore->m_Super) || (!m_CollisionDisabled && !pCharCore->m_CollisionDisabled && m_Tuning.m_PlayerCollision);
+
+				if(CanCollide && Distance < PhysicalSize() * 1.25f && Distance > 0.0f)
+				{
+					float a = (PhysicalSize() * 1.45f - Distance);
+					float Velocity = 0.5f;
+
+					// make sure that we don't add excess force by checking the
+					// direction against the current velocity. if not zero.
+					if(length(m_Vel) > 0.0001f)
+						Velocity = 1 - (dot(normalize(m_Vel), Dir) + 1) / 2; // Wdouble-promotion don't fix this as this might change game physics
+
+					m_Vel += Dir * a * (Velocity * 0.75f);
+					m_Vel *= 0.85f;
+				}
+
+				// handle hook influence
+				if(!m_HookHitDisabled && m_HookedPlayer == i && m_Tuning.m_PlayerHooking)
+				{
+					if(Distance > PhysicalSize() * 1.50f) // TODO: fix tweakable variable
+					{
+						float HookAccel = m_Tuning.m_HookDragAccel * (Distance / m_Tuning.m_HookLength);
+						float DragSpeed = m_Tuning.m_HookDragSpeed;
+
+						vec2 Temp;
+						// add force to the hooked player
+						Temp.x = SaturatedAdd(-DragSpeed, DragSpeed, pCharCore->m_Vel.x, HookAccel * Dir.x * 1.5f);
+						Temp.y = SaturatedAdd(-DragSpeed, DragSpeed, pCharCore->m_Vel.y, HookAccel * Dir.y * 1.5f);
+						pCharCore->m_Vel = ClampVel(pCharCore->m_MoveRestrictions, Temp);
+						// add a little bit force to the guy who has the grip
+						Temp.x = SaturatedAdd(-DragSpeed, DragSpeed, m_Vel.x, -HookAccel * Dir.x * 0.25f);
+						Temp.y = SaturatedAdd(-DragSpeed, DragSpeed, m_Vel.y, -HookAccel * Dir.y * 0.25f);
+						m_Vel = ClampVel(m_MoveRestrictions, Temp);
+					}
+				}
+			}
+		}
+
+		if(m_HookState != HOOK_FLYING)
+		{
+			m_NewHook = false;
+		}
+	}
+
+	// clamp the velocity to something sane
+	if(length(m_Vel) > 6000)
+		m_Vel = normalize(m_Vel) * 6000;
+}
+
+void CCharacterCore::Move()
+{
+	float RampValue = VelocityRamp(length(m_Vel) * 50, m_Tuning.m_VelrampStart, m_Tuning.m_VelrampRange, m_Tuning.m_VelrampCurvature);
+
+	m_Vel.x = m_Vel.x * RampValue;
+
+	vec2 NewPos = m_Pos;
+
+	vec2 OldVel = m_Vel;
+	bool Grounded = false;
+	m_pCollision->MoveBox(&NewPos, &m_Vel, PhysicalSizeVec2(),
+		vec2(m_Tuning.m_GroundElasticityX,
+			m_Tuning.m_GroundElasticityY),
+		&Grounded);
+
+	if(Grounded)
+	{
+		m_Jumped &= ~2;
+		m_JumpedTotal = 0;
+	}
+
+	m_Colliding = 0;
+	if(m_Vel.x < 0.001f && m_Vel.x > -0.001f)
+	{
+		if(OldVel.x > 0)
+			m_Colliding = 1;
+		else if(OldVel.x < 0)
+			m_Colliding = 2;
+	}
+	else
+		m_LeftWall = true;
+
+	m_Vel.x = m_Vel.x * (1.0f / RampValue);
+
+	if(m_pWorld && (m_Super || (m_Tuning.m_PlayerCollision && !m_CollisionDisabled && !m_Solo)))
+	{
+		// check player collision
+		float Distance = distance(m_Pos, NewPos);
+		if(Distance > 0)
+		{
+			int End = Distance + 1;
+			vec2 LastPos = m_Pos;
+			for(int i = 0; i < End; i++)
+			{
+				float a = i / Distance;
+				vec2 Pos = mix(m_Pos, NewPos, a);
+				for(int p = 0; p < MAX_CLIENTS; p++)
+				{
+					CCharacterCore *pCharCore = m_pWorld->m_apCharacters[p];
+					if(!pCharCore || pCharCore == this)
+						continue;
+					if((!(pCharCore->m_Super || m_Super) && (m_Solo || pCharCore->m_Solo || pCharCore->m_CollisionDisabled || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, p)))))
+						continue;
+					float D = distance(Pos, pCharCore->m_Pos);
+					if(D < PhysicalSize() && D >= 0.0f)
+					{
+						if(a > 0.0f)
+							m_Pos = LastPos;
+						else if(distance(NewPos, pCharCore->m_Pos) > D)
+							m_Pos = NewPos;
+						return;
+					}
+				}
+				LastPos = Pos;
+			}
+		}
+	}
+
+	m_Pos = NewPos;
+}
+
+void CCharacterCore::Write(CNetObj_CharacterCore *pObjCore) const
+{
+	pObjCore->m_X = round_to_int(m_Pos.x);
+	pObjCore->m_Y = round_to_int(m_Pos.y);
+
+	pObjCore->m_VelX = round_to_int(m_Vel.x * 256.0f);
+	pObjCore->m_VelY = round_to_int(m_Vel.y * 256.0f);
+	pObjCore->m_HookState = m_HookState;
+	pObjCore->m_HookTick = m_HookTick;
+	pObjCore->m_HookX = round_to_int(m_HookPos.x);
+	pObjCore->m_HookY = round_to_int(m_HookPos.y);
+	pObjCore->m_HookDx = round_to_int(m_HookDir.x * 256.0f);
+	pObjCore->m_HookDy = round_to_int(m_HookDir.y * 256.0f);
+	pObjCore->m_HookedPlayer = m_HookedPlayer;
+	pObjCore->m_Jumped = m_Jumped;
+	pObjCore->m_Direction = m_Direction;
+	pObjCore->m_Angle = m_Angle;
+}
+
+void CCharacterCore::Read(const CNetObj_CharacterCore *pObjCore)
+{
+	m_Pos.x = pObjCore->m_X;
+	m_Pos.y = pObjCore->m_Y;
+	m_Vel.x = pObjCore->m_VelX / 256.0f;
+	m_Vel.y = pObjCore->m_VelY / 256.0f;
+	m_HookState = pObjCore->m_HookState;
+	m_HookTick = pObjCore->m_HookTick;
+	m_HookPos.x = pObjCore->m_HookX;
+	m_HookPos.y = pObjCore->m_HookY;
+	m_HookDir.x = pObjCore->m_HookDx / 256.0f;
+	m_HookDir.y = pObjCore->m_HookDy / 256.0f;
+	SetHookedPlayer(pObjCore->m_HookedPlayer);
+	m_Jumped = pObjCore->m_Jumped;
+	m_Direction = pObjCore->m_Direction;
+	m_Angle = pObjCore->m_Angle;
+}
+
+void CCharacterCore::ReadDDNet(const CNetObj_DDNetCharacter *pObjDDNet)
+{
+	// Collision
+	m_Solo = pObjDDNet->m_Flags & CHARACTERFLAG_SOLO;
+	m_Jetpack = pObjDDNet->m_Flags & CHARACTERFLAG_JETPACK;
+	m_CollisionDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_COLLISION_DISABLED;
+	m_HammerHitDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_HAMMER_HIT_DISABLED;
+	m_ShotgunHitDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_SHOTGUN_HIT_DISABLED;
+	m_GrenadeHitDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_GRENADE_HIT_DISABLED;
+	m_LaserHitDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_LASER_HIT_DISABLED;
+	m_HookHitDisabled = pObjDDNet->m_Flags & CHARACTERFLAG_HOOK_HIT_DISABLED;
+	m_Super = pObjDDNet->m_Flags & CHARACTERFLAG_SUPER;
+
+	// Endless
+	m_EndlessHook = pObjDDNet->m_Flags & CHARACTERFLAG_ENDLESS_HOOK;
+	m_EndlessJump = pObjDDNet->m_Flags & CHARACTERFLAG_ENDLESS_JUMP;
+
+	// Freeze
+	m_FreezeEnd = pObjDDNet->m_FreezeEnd;
+	m_DeepFrozen = pObjDDNet->m_FreezeEnd == -1;
+	m_LiveFrozen = (pObjDDNet->m_Flags & CHARACTERFLAG_MOVEMENTS_DISABLED) != 0;
+
+	// Telegun
+	m_HasTelegunGrenade = pObjDDNet->m_Flags & CHARACTERFLAG_TELEGUN_GRENADE;
+	m_HasTelegunGun = pObjDDNet->m_Flags & CHARACTERFLAG_TELEGUN_GUN;
+	m_HasTelegunLaser = pObjDDNet->m_Flags & CHARACTERFLAG_TELEGUN_LASER;
+
+	// Weapons
+	m_aWeapons[WEAPON_HAMMER].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_HAMMER) != 0;
+	m_aWeapons[WEAPON_GUN].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_GUN) != 0;
+	m_aWeapons[WEAPON_SHOTGUN].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_SHOTGUN) != 0;
+	m_aWeapons[WEAPON_GRENADE].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_GRENADE) != 0;
+	m_aWeapons[WEAPON_LASER].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_LASER) != 0;
+	m_aWeapons[WEAPON_NINJA].m_Got = (pObjDDNet->m_Flags & CHARACTERFLAG_WEAPON_NINJA) != 0;
+
+	// Available jumps
+	m_Jumps = pObjDDNet->m_Jumps;
+
+	// Display Information
+	// We only accept the display information when it is received, which means it is not -1 in each case.
+	if(pObjDDNet->m_JumpedTotal != -1)
+	{
+		m_JumpedTotal = pObjDDNet->m_JumpedTotal;
+	}
+	if(pObjDDNet->m_NinjaActivationTick != -1)
+	{
+		m_Ninja.m_ActivationTick = pObjDDNet->m_NinjaActivationTick;
+	}
+	if(pObjDDNet->m_FreezeStart != -1)
+	{
+		m_FreezeStart = pObjDDNet->m_FreezeStart;
+		m_IsInFreeze = pObjDDNet->m_Flags & CHARACTERFLAG_IN_FREEZE;
+	}
+}
+
+void CCharacterCore::Quantize()
+{
+	CNetObj_CharacterCore Core;
+	Write(&Core);
+	Read(&Core);
+}
+
+void CCharacterCore::SetHookedPlayer(int HookedPlayer)
+{
+	if(HookedPlayer != m_HookedPlayer)
+	{
+		if(m_HookedPlayer != -1 && m_Id != -1 && m_pWorld)
+		{
+			CCharacterCore *pCharCore = m_pWorld->m_apCharacters[m_HookedPlayer];
+			if(pCharCore)
+			{
+				pCharCore->m_AttachedPlayers.erase(m_Id);
+			}
+		}
+		if(HookedPlayer != -1 && m_Id != -1 && m_pWorld)
+		{
+			CCharacterCore *pCharCore = m_pWorld->m_apCharacters[HookedPlayer];
+			if(pCharCore)
+			{
+				pCharCore->m_AttachedPlayers.insert(m_Id);
+			}
+		}
+		m_HookedPlayer = HookedPlayer;
+	}
+}
+
+// DDRace
+
+void CCharacterCore::SetTeamsCore(CTeamsCore *pTeams)
+{
+	m_pTeams = pTeams;
+}
+
+void CCharacterCore::SetTeleOuts(std::map<int, std::vector<vec2>> *pTeleOuts)
+{
+	m_pTeleOuts = pTeleOuts;
+}
+
+bool CCharacterCore::IsSwitchActiveCb(int Number, void *pUser)
+{
+	CCharacterCore *pThis = (CCharacterCore *)pUser;
+	if(pThis->m_pWorld && !pThis->m_pWorld->m_vSwitchers.empty())
+		if(pThis->m_Id != -1 && pThis->m_pTeams->Team(pThis->m_Id) != (pThis->m_pTeams->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER))
+			return pThis->m_pWorld->m_vSwitchers[Number].m_aStatus[pThis->m_pTeams->Team(pThis->m_Id)];
+	return false;
+}
+
+void CWorldCore::InitSwitchers(int HighestSwitchNumber)
+{
+	if(HighestSwitchNumber > 0)
+		m_vSwitchers.resize(HighestSwitchNumber + 1);
+	else
+		m_vSwitchers.clear();
+
+	for(auto &Switcher : m_vSwitchers)
+	{
+		Switcher.m_Initial = true;
+		for(int j = 0; j < MAX_CLIENTS; j++)
+		{
+			Switcher.m_aStatus[j] = true;
+			Switcher.m_aEndTick[j] = 0;
+			Switcher.m_aType[j] = 0;
+			Switcher.m_aLastUpdateTick[j] = 0;
+		}
+	}
+}
diff --git a/src_bkp/game/gamecore.h b/src_bkp/game/gamecore.h
new file mode 100644
index 0000000000..8b16cfcaae
--- /dev/null
+++ b/src_bkp/game/gamecore.h
@@ -0,0 +1,349 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_GAMECORE_H
+#define GAME_GAMECORE_H
+
+#include <base/vmath.h>
+
+#include <map>
+#include <set>
+#include <vector>
+
+#include <engine/shared/protocol.h>
+#include <game/generated/protocol.h>
+
+#include "prng.h"
+
+class CCollision;
+class CTeamsCore;
+
+class CTuneParam
+{
+	int m_Value;
+
+public:
+	void Set(int v) { m_Value = v; }
+	int Get() const { return m_Value; }
+	CTuneParam &operator=(int v)
+	{
+		m_Value = (int)(v * 100.0f);
+		return *this;
+	}
+	CTuneParam &operator=(float v)
+	{
+		m_Value = (int)(v * 100.0f);
+		return *this;
+	}
+	operator float() const { return m_Value / 100.0f; }
+};
+
+class CTuningParams
+{
+	static const char *ms_apNames[];
+
+public:
+	CTuningParams()
+	{
+#define MACRO_TUNING_PARAM(Name, ScriptName, Value, Description) m_##Name.Set((int)((Value)*100.0f));
+#include "tuning.h"
+#undef MACRO_TUNING_PARAM
+	}
+
+#define MACRO_TUNING_PARAM(Name, ScriptName, Value, Description) CTuneParam m_##Name;
+#include "tuning.h"
+#undef MACRO_TUNING_PARAM
+
+	static int Num()
+	{
+		return sizeof(CTuningParams) / sizeof(int);
+	}
+	bool Set(int Index, float Value);
+	bool Set(const char *pName, float Value);
+	bool Get(int Index, float *pValue) const;
+	bool Get(const char *pName, float *pValue) const;
+	static const char *Name(int Index) { return ms_apNames[Index]; }
+	float GetWeaponFireDelay(int Weapon) const;
+};
+
+inline void StrToInts(int *pInts, int Num, const char *pStr)
+{
+	int Index = 0;
+	while(Num)
+	{
+		char aBuf[4] = {0, 0, 0, 0};
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds" // false positive
+#endif
+		for(int c = 0; c < 4 && pStr[Index]; c++, Index++)
+			aBuf[c] = pStr[Index];
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+		*pInts = ((aBuf[0] + 128) << 24) | ((aBuf[1] + 128) << 16) | ((aBuf[2] + 128) << 8) | (aBuf[3] + 128);
+		pInts++;
+		Num--;
+	}
+
+	// null terminate
+	pInts[-1] &= 0xffffff00;
+}
+
+inline void IntsToStr(const int *pInts, int Num, char *pStr)
+{
+	while(Num)
+	{
+		pStr[0] = (((*pInts) >> 24) & 0xff) - 128;
+		pStr[1] = (((*pInts) >> 16) & 0xff) - 128;
+		pStr[2] = (((*pInts) >> 8) & 0xff) - 128;
+		pStr[3] = ((*pInts) & 0xff) - 128;
+		pStr += 4;
+		pInts++;
+		Num--;
+	}
+
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow" // false positive
+#endif
+	// null terminate
+	pStr[-1] = 0;
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
+}
+
+inline vec2 CalcPos(vec2 Pos, vec2 Velocity, float Curvature, float Speed, float Time)
+{
+	vec2 n;
+	Time *= Speed;
+	n.x = Pos.x + Velocity.x * Time;
+	n.y = Pos.y + Velocity.y * Time + Curvature / 10000 * (Time * Time);
+	return n;
+}
+
+template<typename T>
+inline T SaturatedAdd(T Min, T Max, T Current, T Modifier)
+{
+	if(Modifier < 0)
+	{
+		if(Current < Min)
+			return Current;
+		Current += Modifier;
+		if(Current < Min)
+			Current = Min;
+		return Current;
+	}
+	else
+	{
+		if(Current > Max)
+			return Current;
+		Current += Modifier;
+		if(Current > Max)
+			Current = Max;
+		return Current;
+	}
+}
+
+float VelocityRamp(float Value, float Start, float Range, float Curvature);
+
+// hooking stuff
+enum
+{
+	HOOK_RETRACTED = -1,
+	HOOK_IDLE = 0,
+	HOOK_RETRACT_START = 1,
+	HOOK_RETRACT_END = 3,
+	HOOK_FLYING,
+	HOOK_GRABBED,
+
+	COREEVENT_GROUND_JUMP = 0x01,
+	COREEVENT_AIR_JUMP = 0x02,
+	COREEVENT_HOOK_LAUNCH = 0x04,
+	COREEVENT_HOOK_ATTACH_PLAYER = 0x08,
+	COREEVENT_HOOK_ATTACH_GROUND = 0x10,
+	COREEVENT_HOOK_HIT_NOHOOK = 0x20,
+	COREEVENT_HOOK_RETRACT = 0x40,
+	// COREEVENT_HOOK_TELE=0x80,
+};
+
+// show others values - do not change them
+enum
+{
+	SHOW_OTHERS_NOT_SET = -1, // show others value before it is set
+	SHOW_OTHERS_OFF = 0, // show no other players in solo or other teams
+	SHOW_OTHERS_ON = 1, // show all other players in solo and other teams
+	SHOW_OTHERS_ONLY_TEAM = 2 // show players that are in solo and are in the same team
+};
+
+struct SSwitchers
+{
+	bool m_aStatus[MAX_CLIENTS];
+	bool m_Initial;
+	int m_aEndTick[MAX_CLIENTS];
+	int m_aType[MAX_CLIENTS];
+	int m_aLastUpdateTick[MAX_CLIENTS];
+};
+
+class CWorldCore
+{
+public:
+	CWorldCore()
+	{
+		for(auto &pCharacter : m_apCharacters)
+		{
+			pCharacter = nullptr;
+		}
+		m_pPrng = nullptr;
+	}
+
+	int RandomOr0(int BelowThis)
+	{
+		if(BelowThis <= 1 || !m_pPrng)
+		{
+			return 0;
+		}
+		// This makes the random number slightly biased if `BelowThis`
+		// is not a power of two, but we have decided that this is not
+		// significant for DDNet and favored the simple implementation.
+		return m_pPrng->RandomBits() % BelowThis;
+	}
+
+	CTuningParams m_aTuning[2];
+	class CCharacterCore *m_apCharacters[MAX_CLIENTS];
+	CPrng *m_pPrng;
+
+	void InitSwitchers(int HighestSwitchNumber);
+	std::vector<SSwitchers> m_vSwitchers;
+};
+
+class CCharacterCore
+{
+	CWorldCore *m_pWorld = nullptr;
+	CCollision *m_pCollision;
+	std::map<int, std::vector<vec2>> *m_pTeleOuts;
+
+public:
+	static constexpr float PhysicalSize() { return 28.0f; };
+	static constexpr vec2 PhysicalSizeVec2() { return vec2(28.0f, 28.0f); };
+	vec2 m_Pos;
+	vec2 m_Vel;
+
+	vec2 m_HookPos;
+	vec2 m_HookDir;
+	vec2 m_HookTeleBase;
+	int m_HookTick;
+	int m_HookState;
+	std::set<int> m_AttachedPlayers;
+	int HookedPlayer() const { return m_HookedPlayer; }
+	void SetHookedPlayer(int HookedPlayer);
+
+	int m_ActiveWeapon;
+	struct WeaponStat
+	{
+		int m_AmmoRegenStart;
+		int m_Ammo;
+		int m_Ammocost;
+		bool m_Got;
+	} m_aWeapons[NUM_WEAPONS];
+
+	// ninja
+	struct
+	{
+		vec2 m_ActivationDir;
+		int m_ActivationTick;
+		int m_CurrentMoveTime;
+		int m_OldVelAmount;
+	} m_Ninja;
+
+	bool m_NewHook;
+
+	int m_Jumped;
+	// m_JumpedTotal counts the jumps performed in the air
+	int m_JumpedTotal;
+	int m_Jumps;
+
+	int m_Direction;
+	int m_Angle;
+	CNetObj_PlayerInput m_Input;
+
+	int m_TriggeredEvents;
+
+	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams = nullptr, std::map<int, std::vector<vec2>> *pTeleOuts = nullptr);
+	void SetCoreWorld(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams);
+	void Reset();
+	void TickDeferred();
+	void Tick(bool UseInput, bool DoDeferredTick = true);
+	void Move();
+
+	void Read(const CNetObj_CharacterCore *pObjCore);
+	void Write(CNetObj_CharacterCore *pObjCore) const;
+	void Quantize();
+
+	// DDRace
+	int m_Id;
+	bool m_Reset;
+	CCollision *Collision() { return m_pCollision; }
+
+	int m_Colliding;
+	bool m_LeftWall;
+
+	// DDNet Character
+	void SetTeamsCore(CTeamsCore *pTeams);
+	void SetTeleOuts(std::map<int, std::vector<vec2>> *pTeleOuts);
+	void ReadDDNet(const CNetObj_DDNetCharacter *pObjDDNet);
+	bool m_Solo;
+	bool m_Jetpack;
+	bool m_CollisionDisabled;
+	bool m_EndlessHook;
+	bool m_EndlessJump;
+	bool m_HammerHitDisabled;
+	bool m_GrenadeHitDisabled;
+	bool m_LaserHitDisabled;
+	bool m_ShotgunHitDisabled;
+	bool m_HookHitDisabled;
+	bool m_Super;
+	bool m_HasTelegunGun;
+	bool m_HasTelegunGrenade;
+	bool m_HasTelegunLaser;
+	int m_FreezeStart;
+	int m_FreezeEnd;
+	bool m_IsInFreeze;
+	bool m_DeepFrozen;
+	bool m_LiveFrozen;
+	CTuningParams m_Tuning;
+
+private:
+	CTeamsCore *m_pTeams;
+	int m_MoveRestrictions;
+	int m_HookedPlayer;
+	static bool IsSwitchActiveCb(int Number, void *pUser);
+};
+
+// input count
+struct CInputCount
+{
+	int m_Presses;
+	int m_Releases;
+};
+
+inline CInputCount CountInput(int Prev, int Cur)
+{
+	CInputCount c = {0, 0};
+	Prev &= INPUT_STATE_MASK;
+	Cur &= INPUT_STATE_MASK;
+	int i = Prev;
+
+	while(i != Cur)
+	{
+		i = (i + 1) & INPUT_STATE_MASK;
+		if(i & 1)
+			c.m_Presses++;
+		else
+			c.m_Releases++;
+	}
+
+	return c;
+}
+
+#endif
diff --git a/src_bkp/game/layers.cpp b/src_bkp/game/layers.cpp
new file mode 100644
index 0000000000..b00d0038c3
--- /dev/null
+++ b/src_bkp/game/layers.cpp
@@ -0,0 +1,224 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "layers.h"
+
+#include "mapitems.h"
+
+#include <engine/map.h>
+
+CLayers::CLayers()
+{
+	m_GroupsNum = 0;
+	m_GroupsStart = 0;
+	m_LayersNum = 0;
+	m_LayersStart = 0;
+	m_pGameGroup = 0;
+	m_pGameLayer = 0;
+	m_pMap = 0;
+
+	m_pTeleLayer = 0;
+	m_pSpeedupLayer = 0;
+	m_pFrontLayer = 0;
+	m_pSwitchLayer = 0;
+	m_pTuneLayer = 0;
+}
+
+void CLayers::Init(class IKernel *pKernel)
+{
+	m_pMap = pKernel->RequestInterface<IMap>();
+	m_pMap->GetType(MAPITEMTYPE_GROUP, &m_GroupsStart, &m_GroupsNum);
+	m_pMap->GetType(MAPITEMTYPE_LAYER, &m_LayersStart, &m_LayersNum);
+
+	m_pTeleLayer = 0;
+	m_pSpeedupLayer = 0;
+	m_pFrontLayer = 0;
+	m_pSwitchLayer = 0;
+	m_pTuneLayer = 0;
+
+	for(int g = 0; g < NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = GetGroup(g);
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = GetLayer(pGroup->m_StartLayer + l);
+
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTilemap = reinterpret_cast<CMapItemLayerTilemap *>(pLayer);
+				bool IsEntities = false;
+
+				if(pTilemap->m_Flags & TILESLAYERFLAG_GAME)
+				{
+					m_pGameLayer = pTilemap;
+					m_pGameGroup = pGroup;
+
+					// make sure the game group has standard settings
+					m_pGameGroup->m_OffsetX = 0;
+					m_pGameGroup->m_OffsetY = 0;
+					m_pGameGroup->m_ParallaxX = 100;
+					m_pGameGroup->m_ParallaxY = 100;
+
+					if(m_pGameGroup->m_Version >= 2)
+					{
+						m_pGameGroup->m_UseClipping = 0;
+						m_pGameGroup->m_ClipX = 0;
+						m_pGameGroup->m_ClipY = 0;
+						m_pGameGroup->m_ClipW = 0;
+						m_pGameGroup->m_ClipH = 0;
+					}
+
+					IsEntities = true;
+					//break;
+				}
+				if(pTilemap->m_Flags & TILESLAYERFLAG_TELE)
+				{
+					if(pTilemap->m_Version <= 2)
+					{
+						pTilemap->m_Tele = *((int *)(pTilemap) + 15);
+					}
+					m_pTeleLayer = pTilemap;
+					IsEntities = true;
+				}
+				if(pTilemap->m_Flags & TILESLAYERFLAG_SPEEDUP)
+				{
+					if(pTilemap->m_Version <= 2)
+					{
+						pTilemap->m_Speedup = *((int *)(pTilemap) + 16);
+					}
+					m_pSpeedupLayer = pTilemap;
+					IsEntities = true;
+				}
+				if(pTilemap->m_Flags & TILESLAYERFLAG_FRONT)
+				{
+					if(pTilemap->m_Version <= 2)
+					{
+						pTilemap->m_Front = *((int *)(pTilemap) + 17);
+					}
+					m_pFrontLayer = pTilemap;
+					IsEntities = true;
+				}
+				if(pTilemap->m_Flags & TILESLAYERFLAG_SWITCH)
+				{
+					if(pTilemap->m_Version <= 2)
+					{
+						pTilemap->m_Switch = *((int *)(pTilemap) + 18);
+					}
+					m_pSwitchLayer = pTilemap;
+					IsEntities = true;
+				}
+				if(pTilemap->m_Flags & TILESLAYERFLAG_TUNE)
+				{
+					if(pTilemap->m_Version <= 2)
+					{
+						pTilemap->m_Tune = *((int *)(pTilemap) + 19);
+					}
+					m_pTuneLayer = pTilemap;
+					IsEntities = true;
+				}
+
+				if(IsEntities)
+				{ // Ensure default color for entities layers
+					pTilemap->m_Color = CColor(255, 255, 255, 255);
+				}
+			}
+		}
+	}
+
+	InitTilemapSkip();
+}
+
+void CLayers::InitBackground(class IMap *pMap)
+{
+	m_pMap = pMap;
+	m_pMap->GetType(MAPITEMTYPE_GROUP, &m_GroupsStart, &m_GroupsNum);
+	m_pMap->GetType(MAPITEMTYPE_LAYER, &m_LayersStart, &m_LayersNum);
+
+	//following is here to prevent crash using standard map as background
+	m_pTeleLayer = 0;
+	m_pSpeedupLayer = 0;
+	m_pFrontLayer = 0;
+	m_pSwitchLayer = 0;
+	m_pTuneLayer = 0;
+
+	for(int g = 0; g < NumGroups(); g++)
+	{
+		CMapItemGroup *pGroup = GetGroup(g);
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			CMapItemLayer *pLayer = GetLayer(pGroup->m_StartLayer + l);
+
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTilemap = reinterpret_cast<CMapItemLayerTilemap *>(pLayer);
+
+				if(pTilemap->m_Flags & TILESLAYERFLAG_GAME)
+				{
+					m_pGameLayer = pTilemap;
+					m_pGameGroup = pGroup;
+
+					// make sure the game group has standard settings
+					m_pGameGroup->m_OffsetX = 0;
+					m_pGameGroup->m_OffsetY = 0;
+					m_pGameGroup->m_ParallaxX = 100;
+					m_pGameGroup->m_ParallaxY = 100;
+
+					if(m_pGameGroup->m_Version >= 2)
+					{
+						m_pGameGroup->m_UseClipping = 0;
+						m_pGameGroup->m_ClipX = 0;
+						m_pGameGroup->m_ClipY = 0;
+						m_pGameGroup->m_ClipW = 0;
+						m_pGameGroup->m_ClipH = 0;
+					}
+					//We don't care about tile layers.
+				}
+			}
+		}
+	}
+
+	InitTilemapSkip();
+}
+
+void CLayers::InitTilemapSkip()
+{
+	for(int g = 0; g < NumGroups(); g++)
+	{
+		const CMapItemGroup *pGroup = GetGroup(g);
+
+		for(int l = 0; l < pGroup->m_NumLayers; l++)
+		{
+			const CMapItemLayer *pLayer = GetLayer(pGroup->m_StartLayer + l);
+
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				const CMapItemLayerTilemap *pTilemap = (CMapItemLayerTilemap *)pLayer;
+				CTile *pTiles = (CTile *)m_pMap->GetData(pTilemap->m_Data);
+				for(int y = 0; y < pTilemap->m_Height; y++)
+				{
+					for(int x = 1; x < pTilemap->m_Width;)
+					{
+						int SkippedX;
+						for(SkippedX = 1; x + SkippedX < pTilemap->m_Width && SkippedX < 255; SkippedX++)
+						{
+							if(pTiles[y * pTilemap->m_Width + x + SkippedX].m_Index)
+								break;
+						}
+
+						pTiles[y * pTilemap->m_Width + x].m_Skip = SkippedX - 1;
+						x += SkippedX;
+					}
+				}
+			}
+		}
+	}
+}
+
+CMapItemGroup *CLayers::GetGroup(int Index) const
+{
+	return static_cast<CMapItemGroup *>(m_pMap->GetItem(m_GroupsStart + Index));
+}
+
+CMapItemLayer *CLayers::GetLayer(int Index) const
+{
+	return static_cast<CMapItemLayer *>(m_pMap->GetItem(m_LayersStart + Index));
+}
diff --git a/src_bkp/game/layers.h b/src_bkp/game/layers.h
new file mode 100644
index 0000000000..1823dea9b4
--- /dev/null
+++ b/src_bkp/game/layers.h
@@ -0,0 +1,53 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_LAYERS_H
+#define GAME_LAYERS_H
+
+class IKernel;
+class IMap;
+
+struct CMapItemGroup;
+struct CMapItemLayer;
+struct CMapItemLayerTilemap;
+
+class CLayers
+{
+	int m_GroupsNum;
+	int m_GroupsStart;
+	int m_LayersNum;
+	int m_LayersStart;
+	CMapItemGroup *m_pGameGroup;
+	CMapItemLayerTilemap *m_pGameLayer;
+	IMap *m_pMap;
+
+	void InitTilemapSkip();
+
+public:
+	CLayers();
+	void Init(IKernel *pKernel);
+	void InitBackground(IMap *pMap);
+	int NumGroups() const { return m_GroupsNum; }
+	int NumLayers() const { return m_LayersNum; }
+	IMap *Map() const { return m_pMap; }
+	CMapItemGroup *GameGroup() const { return m_pGameGroup; }
+	CMapItemLayerTilemap *GameLayer() const { return m_pGameLayer; }
+	CMapItemGroup *GetGroup(int Index) const;
+	CMapItemLayer *GetLayer(int Index) const;
+
+	// DDRace
+
+	CMapItemLayerTilemap *TeleLayer() const { return m_pTeleLayer; }
+	CMapItemLayerTilemap *SpeedupLayer() const { return m_pSpeedupLayer; }
+	CMapItemLayerTilemap *FrontLayer() const { return m_pFrontLayer; }
+	CMapItemLayerTilemap *SwitchLayer() const { return m_pSwitchLayer; }
+	CMapItemLayerTilemap *TuneLayer() const { return m_pTuneLayer; }
+
+private:
+	CMapItemLayerTilemap *m_pTeleLayer;
+	CMapItemLayerTilemap *m_pSpeedupLayer;
+	CMapItemLayerTilemap *m_pFrontLayer;
+	CMapItemLayerTilemap *m_pSwitchLayer;
+	CMapItemLayerTilemap *m_pTuneLayer;
+};
+
+#endif
diff --git a/src_bkp/game/localization.cpp b/src_bkp/game/localization.cpp
new file mode 100644
index 0000000000..1b3feb33b7
--- /dev/null
+++ b/src_bkp/game/localization.cpp
@@ -0,0 +1,292 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "localization.h"
+
+#include <engine/console.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+
+const char *Localize(const char *pStr, const char *pContext)
+{
+	const char *pNewStr = g_Localization.FindString(str_quickhash(pStr), str_quickhash(pContext));
+	return pNewStr ? pNewStr : pStr;
+}
+
+void CLocalizationDatabase::LoadIndexfile(IStorage *pStorage, IConsole *pConsole)
+{
+	m_vLanguages.clear();
+
+	const std::vector<std::string> vEnglishLanguageCodes = {"en"};
+	m_vLanguages.emplace_back("English", "", 826, vEnglishLanguageCodes);
+
+	const char *pFilename = "languages/index.txt";
+	IOHANDLE File = pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!File)
+	{
+		char aBuf[64 + IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "Couldn't open index file '%s'", pFilename);
+		pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+		return;
+	}
+
+	CLineReader LineReader;
+	LineReader.Init(File);
+
+	const char *pLine;
+	while((pLine = LineReader.Get()))
+	{
+		if(!str_length(pLine) || pLine[0] == '#') // skip empty lines and comments
+			continue;
+
+		char aEnglishName[128];
+		str_copy(aEnglishName, pLine);
+
+		pLine = LineReader.Get();
+		if(!pLine)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			break;
+		}
+		if(!str_startswith(pLine, "== "))
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Missing native name for language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			(void)LineReader.Get();
+			(void)LineReader.Get();
+			continue;
+		}
+		char aNativeName[128];
+		str_copy(aNativeName, pLine + 3);
+
+		pLine = LineReader.Get();
+		if(!pLine)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			break;
+		}
+		if(!str_startswith(pLine, "== "))
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Missing country code for language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			(void)LineReader.Get();
+			continue;
+		}
+		char aCountryCode[128];
+		str_copy(aCountryCode, pLine + 3);
+
+		pLine = LineReader.Get();
+		if(!pLine)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Unexpected end of index file after language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			break;
+		}
+		if(!str_startswith(pLine, "== "))
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Missing language codes for language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			continue;
+		}
+		const char *pLanguageCodes = pLine + 3;
+		char aLanguageCode[256];
+		std::vector<std::string> vLanguageCodes;
+		while((pLanguageCodes = str_next_token(pLanguageCodes, ";", aLanguageCode, sizeof(aLanguageCode))))
+		{
+			if(aLanguageCode[0])
+			{
+				vLanguageCodes.emplace_back(aLanguageCode);
+			}
+		}
+		if(vLanguageCodes.empty())
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "At least one language code required for language '%s'", aEnglishName);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			continue;
+		}
+
+		char aFileName[IO_MAX_PATH_LENGTH];
+		str_format(aFileName, sizeof(aFileName), "languages/%s.txt", aEnglishName);
+		m_vLanguages.emplace_back(aNativeName, aFileName, str_toint(aCountryCode), vLanguageCodes);
+	}
+
+	io_close(File);
+
+	std::sort(m_vLanguages.begin(), m_vLanguages.end());
+}
+
+void CLocalizationDatabase::SelectDefaultLanguage(IConsole *pConsole, char *pFilename, size_t Length) const
+{
+	if(Languages().empty())
+		return;
+	if(Languages().size() == 1)
+	{
+		str_copy(pFilename, Languages()[0].m_FileName.c_str(), Length);
+		return;
+	}
+
+	char aLocaleStr[128];
+	os_locale_str(aLocaleStr, sizeof(aLocaleStr));
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "Choosing default language based on user locale '%s'", aLocaleStr);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+
+	while(true)
+	{
+		const CLanguage *pPrefixMatch = nullptr;
+		for(const auto &Language : Languages())
+		{
+			for(const auto &LanguageCode : Language.m_vLanguageCodes)
+			{
+				if(LanguageCode == aLocaleStr)
+				{
+					// Exact match found, use it immediately
+					str_copy(pFilename, Language.m_FileName.c_str(), Length);
+					return;
+				}
+				else if(LanguageCode.rfind(aLocaleStr, 0) == 0)
+				{
+					// Locale is prefix of language code, e.g. locale is "en" and current language is "en-US"
+					pPrefixMatch = &Language;
+				}
+			}
+		}
+		// Use prefix match if no exact match was found
+		if(pPrefixMatch)
+		{
+			str_copy(pFilename, pPrefixMatch->m_FileName.c_str(), Length);
+			return;
+		}
+
+		// Remove last segment of locale string and try again with more generic locale, e.g. "en-US" -> "en"
+		int i = str_length(aLocaleStr) - 1;
+		for(; i >= 0; --i)
+		{
+			if(aLocaleStr[i] == '-')
+			{
+				aLocaleStr[i] = '\0';
+				break;
+			}
+		}
+
+		// Stop if no more locale segments are left
+		if(i <= 0)
+			break;
+	}
+}
+
+bool CLocalizationDatabase::Load(const char *pFilename, IStorage *pStorage, IConsole *pConsole)
+{
+	// empty string means unload
+	if(pFilename[0] == 0)
+	{
+		m_vStrings.clear();
+		m_StringsHeap.Reset();
+		return true;
+	}
+
+	IOHANDLE IoHandle = pStorage->OpenFile(pFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!IoHandle)
+		return false;
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "loaded '%s'", pFilename);
+	pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+	m_vStrings.clear();
+	m_StringsHeap.Reset();
+
+	char aContext[512];
+	char aOrigin[512];
+	CLineReader LineReader;
+	LineReader.Init(IoHandle);
+	char *pLine;
+	int Line = 0;
+	while((pLine = LineReader.Get()))
+	{
+		Line++;
+		if(!str_length(pLine))
+			continue;
+
+		if(pLine[0] == '#') // skip comments
+			continue;
+
+		if(pLine[0] == '[') // context
+		{
+			size_t Len = str_length(pLine);
+			if(Len < 1 || pLine[Len - 1] != ']')
+			{
+				str_format(aBuf, sizeof(aBuf), "malformed context line (%d): %s", Line, pLine);
+				pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+				continue;
+			}
+			str_copy(aContext, pLine + 1, Len - 1);
+			pLine = LineReader.Get();
+		}
+		else
+		{
+			aContext[0] = '\0';
+		}
+
+		str_copy(aOrigin, pLine, sizeof(aOrigin));
+		char *pReplacement = LineReader.Get();
+		Line++;
+		if(!pReplacement)
+		{
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", "unexpected end of file");
+			break;
+		}
+
+		if(pReplacement[0] != '=' || pReplacement[1] != '=' || pReplacement[2] != ' ')
+		{
+			str_format(aBuf, sizeof(aBuf), "malformed replacement line (%d) for '%s'", Line, aOrigin);
+			pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "localization", aBuf);
+			continue;
+		}
+
+		pReplacement += 3;
+		AddString(aOrigin, pReplacement, aContext);
+	}
+	io_close(IoHandle);
+	std::sort(m_vStrings.begin(), m_vStrings.end());
+	return true;
+}
+
+void CLocalizationDatabase::AddString(const char *pOrgStr, const char *pNewStr, const char *pContext)
+{
+	m_vStrings.emplace_back(str_quickhash(pOrgStr), str_quickhash(pContext), m_StringsHeap.StoreString(*pNewStr ? pNewStr : pOrgStr));
+}
+
+const char *CLocalizationDatabase::FindString(unsigned Hash, unsigned ContextHash) const
+{
+	CString String;
+	String.m_Hash = Hash;
+	String.m_ContextHash = ContextHash;
+	String.m_pReplacement = 0x0;
+	auto Range1 = std::equal_range(m_vStrings.begin(), m_vStrings.end(), String);
+	if(std::distance(Range1.first, Range1.second) == 1)
+		return Range1.first->m_pReplacement;
+
+	const unsigned DefaultHash = str_quickhash("");
+	if(ContextHash != DefaultHash)
+	{
+		// Do another lookup with the default context hash
+		String.m_ContextHash = DefaultHash;
+		auto Range2 = std::equal_range(m_vStrings.begin(), m_vStrings.end(), String);
+		if(std::distance(Range2.first, Range2.second) == 1)
+			return Range2.first->m_pReplacement;
+	}
+
+	return nullptr;
+}
+
+CLocalizationDatabase g_Localization;
diff --git a/src_bkp/game/localization.h b/src_bkp/game/localization.h
new file mode 100644
index 0000000000..6bd02bf955
--- /dev/null
+++ b/src_bkp/game/localization.h
@@ -0,0 +1,67 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_LOCALIZATION_H
+#define GAME_LOCALIZATION_H
+
+#include <base/system.h> // GNUC_ATTRIBUTE
+
+#include <engine/shared/memheap.h>
+
+#include <string>
+#include <vector>
+
+class CLanguage
+{
+public:
+	CLanguage() = default;
+	CLanguage(const char *pName, const char *pFileName, int Code, const std::vector<std::string> &vLanguageCodes) :
+		m_Name(pName), m_FileName(pFileName), m_CountryCode(Code), m_vLanguageCodes(vLanguageCodes) {}
+
+	std::string m_Name;
+	std::string m_FileName;
+	int m_CountryCode;
+	std::vector<std::string> m_vLanguageCodes;
+
+	bool operator<(const CLanguage &Other) const { return m_Name < Other.m_Name; }
+};
+
+class CLocalizationDatabase
+{
+	class CString
+	{
+	public:
+		unsigned m_Hash;
+		unsigned m_ContextHash;
+		const char *m_pReplacement;
+
+		CString() {}
+		CString(unsigned Hash, unsigned ContextHash, const char *pReplacement) :
+			m_Hash(Hash), m_ContextHash(ContextHash), m_pReplacement(pReplacement)
+		{
+		}
+
+		bool operator<(const CString &Other) const { return m_Hash < Other.m_Hash || (m_Hash == Other.m_Hash && m_ContextHash < Other.m_ContextHash); }
+		bool operator<=(const CString &Other) const { return m_Hash < Other.m_Hash || (m_Hash == Other.m_Hash && m_ContextHash <= Other.m_ContextHash); }
+		bool operator==(const CString &Other) const { return m_Hash == Other.m_Hash && m_ContextHash == Other.m_ContextHash; }
+	};
+
+	std::vector<CLanguage> m_vLanguages;
+	std::vector<CString> m_vStrings;
+	CHeap m_StringsHeap;
+
+public:
+	void LoadIndexfile(class IStorage *pStorage, class IConsole *pConsole);
+	const std::vector<CLanguage> &Languages() const { return m_vLanguages; }
+	void SelectDefaultLanguage(class IConsole *pConsole, char *pFilename, size_t Length) const;
+
+	bool Load(const char *pFilename, class IStorage *pStorage, class IConsole *pConsole);
+
+	void AddString(const char *pOrgStr, const char *pNewStr, const char *pContext);
+	const char *FindString(unsigned Hash, unsigned ContextHash) const;
+};
+
+extern CLocalizationDatabase g_Localization;
+
+extern const char *Localize(const char *pStr, const char *pContext = "")
+	GNUC_ATTRIBUTE((format_arg(1)));
+#endif
diff --git a/src_bkp/game/mapbugs.cpp b/src_bkp/game/mapbugs.cpp
new file mode 100644
index 0000000000..a15c931b56
--- /dev/null
+++ b/src_bkp/game/mapbugs.cpp
@@ -0,0 +1,128 @@
+#include "mapbugs.h"
+
+#include <base/system.h>
+
+struct CMapDescription
+{
+	const char *m_pName;
+	int m_Size;
+	SHA256_DIGEST m_Sha256;
+
+	bool operator==(const CMapDescription &Other) const
+	{
+		return str_comp(m_pName, Other.m_pName) == 0 &&
+		       m_Size == Other.m_Size;
+	}
+};
+
+struct CMapBugsInternal
+{
+	CMapDescription m_Map;
+	unsigned int m_BugFlags;
+};
+
+static unsigned int BugToFlag(int Bug)
+{
+	unsigned int Result;
+	dbg_assert((unsigned)Bug < 8 * sizeof(Result), "invalid shift");
+	Result = (1 << Bug);
+	return Result;
+}
+
+static unsigned int IsBugFlagSet(int Bug, unsigned int BugFlags)
+{
+	return (BugFlags & BugToFlag(Bug)) != 0;
+}
+
+static SHA256_DIGEST s(const char *pSha256)
+{
+	SHA256_DIGEST Result;
+	dbg_assert(sha256_from_str(&Result, pSha256) == 0, "invalid sha256 in mapbugs");
+	return Result;
+}
+
+static CMapBugsInternal MAP_BUGS[] =
+	{
+		{{"Binary", 2022597, s("65b410e197fd2298ec270e89a84b762f6739d1d18089529f8ef6cf2104d3d600")}, BugToFlag(BUG_GRENADE_DOUBLEEXPLOSION)}};
+
+CMapBugs GetMapBugs(const char *pName, int Size, SHA256_DIGEST Sha256)
+{
+	CMapDescription Map = {pName, Size, Sha256};
+	CMapBugs Result;
+	Result.m_Extra = 0;
+	for(auto &MapBug : MAP_BUGS)
+	{
+		if(Map == MapBug.m_Map)
+		{
+			Result.m_pData = &MapBug;
+			return Result;
+		}
+	}
+	Result.m_pData = 0;
+	return Result;
+}
+
+bool CMapBugs::Contains(int Bug) const
+{
+	CMapBugsInternal *pInternal = (CMapBugsInternal *)m_pData;
+	if(!pInternal)
+	{
+		return IsBugFlagSet(Bug, m_Extra);
+	}
+	return IsBugFlagSet(Bug, pInternal->m_BugFlags);
+}
+
+int CMapBugs::Update(const char *pBug)
+{
+	CMapBugsInternal *pInternal = (CMapBugsInternal *)m_pData;
+	int Bug = -1;
+	if(false) {}
+#define MAPBUG(constname, string) \
+	else if(str_comp(pBug, string) == 0) { Bug = (constname); }
+#include "mapbugs_list.h"
+#undef MAPBUG
+	if(Bug == -1)
+	{
+		return MAPBUGUPDATE_NOTFOUND;
+	}
+	if(pInternal)
+	{
+		return MAPBUGUPDATE_OVERRIDDEN;
+	}
+	m_Extra |= BugToFlag(Bug);
+	return MAPBUGUPDATE_OK;
+}
+
+void CMapBugs::Dump() const
+{
+	CMapBugsInternal *pInternal = (CMapBugsInternal *)m_pData;
+	unsigned int Flags;
+	if(pInternal)
+	{
+		Flags = pInternal->m_BugFlags;
+	}
+	else if(m_Extra)
+	{
+		Flags = m_Extra;
+	}
+	else
+	{
+		return;
+	}
+	char aBugs[NUM_BUGS + 1] = {0};
+	for(int i = 0; i < NUM_BUGS; i++)
+	{
+		aBugs[i] = IsBugFlagSet(i, Flags) ? 'X' : 'O';
+	}
+
+	dbg_msg("mapbugs", "enabling map compatibility mode %s", aBugs);
+	if(pInternal)
+	{
+		char aSha256[SHA256_MAXSTRSIZE];
+		sha256_str(pInternal->m_Map.m_Sha256, aSha256, sizeof(aSha256));
+		dbg_msg("mapbugs", "map='%s' map_size=%d map_sha256=%s",
+			pInternal->m_Map.m_pName,
+			pInternal->m_Map.m_Size,
+			aSha256);
+	}
+}
diff --git a/src_bkp/game/mapbugs.h b/src_bkp/game/mapbugs.h
new file mode 100644
index 0000000000..6dce259460
--- /dev/null
+++ b/src_bkp/game/mapbugs.h
@@ -0,0 +1,34 @@
+#ifndef GAME_MAPBUGS_H
+#define GAME_MAPBUGS_H
+
+#include <base/hash.h>
+
+enum
+{
+#define MAPBUG(constname, string) constname,
+#include "mapbugs_list.h"
+#undef MAPBUG
+	NUM_BUGS,
+};
+
+enum
+{
+	MAPBUGUPDATE_OK,
+	MAPBUGUPDATE_NOTFOUND,
+	MAPBUGUPDATE_OVERRIDDEN,
+};
+
+class CMapBugs
+{
+	friend CMapBugs GetMapBugs(const char *pName, int Size, SHA256_DIGEST Sha256);
+	void *m_pData;
+	unsigned int m_Extra;
+
+public:
+	bool Contains(int Bug) const;
+	int Update(const char *pBug);
+	void Dump() const;
+};
+
+CMapBugs GetMapBugs(const char *pName, int Size, SHA256_DIGEST Sha256);
+#endif // GAME_MAPBUGS_H
diff --git a/src_bkp/game/mapbugs_list.h b/src_bkp/game/mapbugs_list.h
new file mode 100644
index 0000000000..4c724803c1
--- /dev/null
+++ b/src_bkp/game/mapbugs_list.h
@@ -0,0 +1,3 @@
+// This file can be included several times.
+
+MAPBUG(BUG_GRENADE_DOUBLEEXPLOSION, "grenade-doubleexplosion@ddnet.tw")
diff --git a/src_bkp/game/mapitems.cpp b/src_bkp/game/mapitems.cpp
new file mode 100644
index 0000000000..2ccab30670
--- /dev/null
+++ b/src_bkp/game/mapitems.cpp
@@ -0,0 +1,162 @@
+#include <game/mapitems.h>
+
+bool IsValidGameTile(int Index)
+{
+	return (
+		Index == TILE_AIR ||
+		(Index >= TILE_SOLID && Index <= TILE_THROUGH) ||
+		Index == TILE_FREEZE ||
+		(Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) ||
+		(Index >= TILE_LFREEZE && Index <= TILE_LUNFREEZE) ||
+		(Index >= TILE_WALLJUMP && Index <= TILE_SOLO_DISABLE) ||
+		(Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) ||
+		(Index >= TILE_CP && Index <= TILE_THROUGH_DIR) ||
+		(Index >= TILE_OLDLASER && Index <= TILE_UNLOCK_TEAM) ||
+		(Index >= TILE_NPC_DISABLE && Index <= TILE_NPH_DISABLE) ||
+		(Index >= TILE_TELE_GUN_ENABLE && Index <= TILE_TELE_GUN_DISABLE) ||
+		(Index >= TILE_TELE_GRENADE_ENABLE && Index <= TILE_TELE_GRENADE_DISABLE) ||
+		(Index >= TILE_TELE_LASER_ENABLE && Index <= TILE_TELE_LASER_DISABLE) ||
+		(Index >= TILE_NPC_ENABLE && Index <= TILE_NPH_ENABLE) ||
+		(Index >= TILE_ENTITIES_OFF_1 && Index <= TILE_ENTITIES_OFF_2) ||
+		IsValidEntity(Index));
+}
+
+bool IsValidFrontTile(int Index)
+{
+	return (
+		Index == TILE_AIR ||
+		Index == TILE_DEATH ||
+		(Index >= TILE_NOLASER && Index <= TILE_THROUGH) ||
+		Index == TILE_FREEZE ||
+		(Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) ||
+		(Index >= TILE_LFREEZE && Index <= TILE_LUNFREEZE) ||
+		(Index >= TILE_WALLJUMP && Index <= TILE_SOLO_DISABLE) ||
+		(Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) ||
+		(Index >= TILE_CP && Index <= TILE_THROUGH_DIR) ||
+		(Index >= TILE_OLDLASER && Index <= TILE_UNLOCK_TEAM) ||
+		(Index >= TILE_NPC_DISABLE && Index <= TILE_NPH_DISABLE) ||
+		(Index >= TILE_TELE_GUN_ENABLE && Index <= TILE_ALLOW_BLUE_TELE_GUN) ||
+		(Index >= TILE_TELE_GRENADE_ENABLE && Index <= TILE_TELE_GRENADE_DISABLE) ||
+		(Index >= TILE_TELE_LASER_ENABLE && Index <= TILE_TELE_LASER_DISABLE) ||
+		(Index >= TILE_NPC_ENABLE && Index <= TILE_NPH_ENABLE) ||
+		(Index >= TILE_ENTITIES_OFF_1 && Index <= TILE_ENTITIES_OFF_2) ||
+		IsValidEntity(Index));
+}
+
+bool IsValidTeleTile(int Index)
+{
+	return (
+		Index == TILE_TELEINEVIL ||
+		Index == TILE_TELEINWEAPON ||
+		Index == TILE_TELEINHOOK ||
+		Index == TILE_TELEIN ||
+		Index == TILE_TELEOUT ||
+		Index == TILE_TELECHECK ||
+		Index == TILE_TELECHECKOUT ||
+		Index == TILE_TELECHECKIN ||
+		Index == TILE_TELECHECKINEVIL);
+}
+
+bool IsTeleTileNumberUsed(int Index)
+{
+	return Index != TILE_TELECHECKIN &&
+	       Index != TILE_TELECHECKINEVIL;
+}
+
+bool IsValidSpeedupTile(int Index)
+{
+	return Index == TILE_BOOST;
+}
+
+bool IsValidSwitchTile(int Index)
+{
+	return (
+		Index == TILE_JUMP ||
+		Index == TILE_FREEZE ||
+		Index == TILE_DFREEZE ||
+		Index == TILE_DUNFREEZE ||
+		Index == TILE_LFREEZE ||
+		Index == TILE_LUNFREEZE ||
+		Index == TILE_HIT_ENABLE ||
+		Index == TILE_HIT_DISABLE ||
+		(Index >= TILE_SWITCHTIMEDOPEN && Index <= TILE_SWITCHCLOSE) ||
+		Index == TILE_ADD_TIME ||
+		Index == TILE_SUBTRACT_TIME ||
+		Index == TILE_ALLOW_TELE_GUN ||
+		Index == TILE_ALLOW_BLUE_TELE_GUN ||
+		(IsValidEntity(Index) && Index >= ENTITY_OFFSET + ENTITY_ARMOR_1));
+}
+
+bool IsSwitchTileFlagsUsed(int Index)
+{
+	return Index != TILE_FREEZE &&
+	       Index != TILE_DFREEZE &&
+	       Index != TILE_DUNFREEZE;
+}
+
+bool IsSwitchTileNumberUsed(int Index)
+{
+	return Index != TILE_JUMP &&
+	       Index != TILE_HIT_ENABLE &&
+	       Index != TILE_HIT_DISABLE &&
+	       Index != TILE_ALLOW_TELE_GUN &&
+	       Index != TILE_ALLOW_BLUE_TELE_GUN;
+}
+
+bool IsSwitchTileDelayUsed(int Index)
+{
+	return Index != TILE_DFREEZE &&
+	       Index != TILE_DUNFREEZE;
+}
+
+bool IsValidTuneTile(int Index)
+{
+	return Index == TILE_TUNE;
+}
+
+bool IsValidEntity(int Index)
+{
+	Index -= ENTITY_OFFSET;
+	return (
+		(Index >= ENTITY_SPAWN && Index <= ENTITY_LASER_O_FAST) ||
+		(Index >= ENTITY_PLASMAE && Index <= ENTITY_ARMOR_LASER) ||
+		(Index >= ENTITY_DRAGGER_WEAK && Index <= ENTITY_DRAGGER_STRONG_NW) ||
+		Index == ENTITY_DOOR);
+}
+
+bool IsRotatableTile(int Index)
+{
+	return (
+		Index == TILE_STOP ||
+		Index == TILE_STOPS ||
+		Index == TILE_CP ||
+		Index == TILE_CP_F ||
+		Index == TILE_THROUGH_DIR ||
+		Index == TILE_ENTITIES_OFF_1 ||
+		Index == TILE_ENTITIES_OFF_2 ||
+		Index - ENTITY_OFFSET == ENTITY_CRAZY_SHOTGUN_EX ||
+		Index - ENTITY_OFFSET == ENTITY_CRAZY_SHOTGUN);
+}
+
+bool IsCreditsTile(int TileIndex)
+{
+	return (
+		(TILE_CREDITS_1 == TileIndex) ||
+		(TILE_CREDITS_2 == TileIndex) ||
+		(TILE_CREDITS_3 == TileIndex) ||
+		(TILE_CREDITS_4 == TileIndex) ||
+		(TILE_CREDITS_5 == TileIndex) ||
+		(TILE_CREDITS_6 == TileIndex) ||
+		(TILE_CREDITS_7 == TileIndex) ||
+		(TILE_CREDITS_8 == TileIndex));
+}
+
+int PackColor(CColor Color)
+{
+	int Res = 0;
+	Res |= Color.r << 24;
+	Res |= Color.g << 16;
+	Res |= Color.b << 8;
+	Res |= Color.a;
+	return Res;
+}
diff --git a/src_bkp/game/mapitems.h b/src_bkp/game/mapitems.h
new file mode 100644
index 0000000000..d89cde0cc2
--- /dev/null
+++ b/src_bkp/game/mapitems.h
@@ -0,0 +1,583 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_MAPITEMS_H
+#define GAME_MAPITEMS_H
+
+#include <base/vmath.h>
+
+// layer types
+enum
+{
+	LAYERTYPE_INVALID = 0,
+	LAYERTYPE_GAME, // unused
+	LAYERTYPE_TILES,
+	LAYERTYPE_QUADS,
+	LAYERTYPE_FRONT,
+	LAYERTYPE_TELE,
+	LAYERTYPE_SPEEDUP,
+	LAYERTYPE_SWITCH,
+	LAYERTYPE_TUNE,
+	LAYERTYPE_SOUNDS_DEPRECATED, // deprecated! do not use this, this is just for compatibility reasons
+	LAYERTYPE_SOUNDS,
+
+	MAPITEMTYPE_VERSION = 0,
+	MAPITEMTYPE_INFO,
+	MAPITEMTYPE_IMAGE,
+	MAPITEMTYPE_ENVELOPE,
+	MAPITEMTYPE_GROUP,
+	MAPITEMTYPE_LAYER,
+	MAPITEMTYPE_ENVPOINTS,
+	MAPITEMTYPE_SOUND,
+	// High map item type numbers suggest that they use the alternate
+	// format with UUIDs. See src/engine/shared/datafile.cpp for some of
+	// the implementation.
+
+	CURVETYPE_STEP = 0,
+	CURVETYPE_LINEAR,
+	CURVETYPE_SLOW,
+	CURVETYPE_FAST,
+	CURVETYPE_SMOOTH,
+	CURVETYPE_BEZIER,
+	NUM_CURVETYPES,
+
+	// game layer tiles
+	// TODO define which Layer uses which tiles (needed for mapeditor)
+	ENTITY_NULL = 0,
+	ENTITY_SPAWN,
+	ENTITY_SPAWN_RED,
+	ENTITY_SPAWN_BLUE,
+	ENTITY_FLAGSTAND_RED,
+	ENTITY_FLAGSTAND_BLUE,
+	ENTITY_ARMOR_1,
+	ENTITY_HEALTH_1,
+	ENTITY_WEAPON_SHOTGUN,
+	ENTITY_WEAPON_GRENADE,
+	ENTITY_POWERUP_NINJA,
+	ENTITY_WEAPON_LASER,
+	//DDRace - Main Lasers
+	ENTITY_LASER_FAST_CCW,
+	ENTITY_LASER_NORMAL_CCW,
+	ENTITY_LASER_SLOW_CCW,
+	ENTITY_LASER_STOP,
+	ENTITY_LASER_SLOW_CW,
+	ENTITY_LASER_NORMAL_CW,
+	ENTITY_LASER_FAST_CW,
+	//DDRace - Laser Modifiers
+	ENTITY_LASER_SHORT,
+	ENTITY_LASER_MEDIUM,
+	ENTITY_LASER_LONG,
+	ENTITY_LASER_C_SLOW,
+	ENTITY_LASER_C_NORMAL,
+	ENTITY_LASER_C_FAST,
+	ENTITY_LASER_O_SLOW,
+	ENTITY_LASER_O_NORMAL,
+	ENTITY_LASER_O_FAST,
+	//DDRace - Plasma
+	ENTITY_PLASMAE = 29,
+	ENTITY_PLASMAF,
+	ENTITY_PLASMA,
+	ENTITY_PLASMAU,
+	//DDRace - Shotgun
+	ENTITY_CRAZY_SHOTGUN_EX,
+	ENTITY_CRAZY_SHOTGUN,
+	//DDNet - Removing specific weapon
+	ENTITY_ARMOR_SHOTGUN,
+	ENTITY_ARMOR_GRENADE,
+	ENTITY_ARMOR_NINJA,
+	ENTITY_ARMOR_LASER,
+	//DDRace - Draggers
+	ENTITY_DRAGGER_WEAK = 42,
+	ENTITY_DRAGGER_NORMAL,
+	ENTITY_DRAGGER_STRONG,
+	//Draggers Behind Walls
+	ENTITY_DRAGGER_WEAK_NW,
+	ENTITY_DRAGGER_NORMAL_NW,
+	ENTITY_DRAGGER_STRONG_NW,
+	//Doors
+	ENTITY_DOOR = 49,
+	//End Of Lower Tiles
+	NUM_ENTITIES,
+	//Start From Top Left
+	//Tile Controllers
+	TILE_AIR = 0,
+	TILE_SOLID,
+	TILE_DEATH,
+	TILE_NOHOOK,
+	TILE_NOLASER,
+	TILE_THROUGH_CUT,
+	TILE_THROUGH,
+	TILE_JUMP,
+	TILE_FREEZE = 9,
+	TILE_TELEINEVIL,
+	TILE_UNFREEZE,
+	TILE_DFREEZE,
+	TILE_DUNFREEZE,
+	TILE_TELEINWEAPON,
+	TILE_TELEINHOOK,
+	TILE_WALLJUMP = 16,
+	TILE_EHOOK_ENABLE,
+	TILE_EHOOK_DISABLE,
+	TILE_HIT_ENABLE,
+	TILE_HIT_DISABLE,
+	TILE_SOLO_ENABLE,
+	TILE_SOLO_DISABLE,
+	//Switches
+	TILE_SWITCHTIMEDOPEN = 22,
+	TILE_SWITCHTIMEDCLOSE,
+	TILE_SWITCHOPEN,
+	TILE_SWITCHCLOSE,
+	TILE_TELEIN,
+	TILE_TELEOUT,
+	TILE_BOOST,
+	TILE_TELECHECK,
+	TILE_TELECHECKOUT,
+	TILE_TELECHECKIN,
+	TILE_REFILL_JUMPS = 32,
+	TILE_START,
+	TILE_FINISH,
+	TILE_TIME_CHECKPOINT_FIRST = 35,
+	TILE_TIME_CHECKPOINT_LAST = 59,
+	TILE_STOP = 60,
+	TILE_STOPS,
+	TILE_STOPA,
+	TILE_TELECHECKINEVIL,
+	TILE_CP,
+	TILE_CP_F,
+	TILE_THROUGH_ALL,
+	TILE_THROUGH_DIR,
+	TILE_TUNE,
+	TILE_OLDLASER = 71,
+	TILE_NPC,
+	TILE_EHOOK,
+	TILE_NOHIT,
+	TILE_NPH,
+	TILE_UNLOCK_TEAM,
+	TILE_ADD_TIME = 79,
+	TILE_NPC_DISABLE = 88,
+	TILE_UNLIMITED_JUMPS_DISABLE,
+	TILE_JETPACK_DISABLE,
+	TILE_NPH_DISABLE,
+	TILE_SUBTRACT_TIME = 95,
+	TILE_TELE_GUN_ENABLE = 96,
+	TILE_TELE_GUN_DISABLE = 97,
+	TILE_ALLOW_TELE_GUN = 98,
+	TILE_ALLOW_BLUE_TELE_GUN = 99,
+	TILE_NPC_ENABLE = 104,
+	TILE_UNLIMITED_JUMPS_ENABLE,
+	TILE_JETPACK_ENABLE,
+	TILE_NPH_ENABLE,
+	TILE_TELE_GRENADE_ENABLE = 112,
+	TILE_TELE_GRENADE_DISABLE = 113,
+	TILE_TELE_LASER_ENABLE = 128,
+	TILE_TELE_LASER_DISABLE = 129,
+	TILE_CREDITS_1 = 140,
+	TILE_CREDITS_2 = 141,
+	TILE_CREDITS_3 = 142,
+	TILE_CREDITS_4 = 143,
+	TILE_LFREEZE = 144,
+	TILE_LUNFREEZE = 145,
+	TILE_CREDITS_5 = 156,
+	TILE_CREDITS_6 = 157,
+	TILE_CREDITS_7 = 158,
+	TILE_CREDITS_8 = 159,
+	TILE_ENTITIES_OFF_1 = 190,
+	TILE_ENTITIES_OFF_2,
+	//End of higher tiles
+	//Layers
+	LAYER_GAME = 0,
+	LAYER_FRONT,
+	LAYER_TELE,
+	LAYER_SPEEDUP,
+	LAYER_SWITCH,
+	LAYER_TUNE,
+	NUM_LAYERS,
+	//Flags
+	TILEFLAG_XFLIP = 1,
+	TILEFLAG_YFLIP = 2,
+	TILEFLAG_OPAQUE = 4,
+	TILEFLAG_ROTATE = 8,
+	//Rotation
+	ROTATION_0 = 0,
+	ROTATION_90 = TILEFLAG_ROTATE,
+	ROTATION_180 = (TILEFLAG_XFLIP | TILEFLAG_YFLIP),
+	ROTATION_270 = (TILEFLAG_XFLIP | TILEFLAG_YFLIP | TILEFLAG_ROTATE),
+
+	LAYERFLAG_DETAIL = 1,
+	TILESLAYERFLAG_GAME = 1,
+	TILESLAYERFLAG_TELE = 2,
+	TILESLAYERFLAG_SPEEDUP = 4,
+	TILESLAYERFLAG_FRONT = 8,
+	TILESLAYERFLAG_SWITCH = 16,
+	TILESLAYERFLAG_TUNE = 32,
+
+	ENTITY_OFFSET = 255 - 16 * 4,
+};
+
+static constexpr size_t MAX_MAPIMAGES = 64;
+static constexpr size_t MAX_MAPSOUNDS = 64;
+
+typedef ivec2 CPoint; // 22.10 fixed point
+typedef ivec4 CColor;
+
+struct CQuad
+{
+	CPoint m_aPoints[5];
+	CColor m_aColors[4];
+	CPoint m_aTexcoords[4];
+
+	int m_PosEnv;
+	int m_PosEnvOffset;
+
+	int m_ColorEnv;
+	int m_ColorEnvOffset;
+};
+
+class CTile
+{
+public:
+	unsigned char m_Index;
+	unsigned char m_Flags;
+	unsigned char m_Skip;
+	unsigned char m_Reserved;
+};
+
+struct CMapItemInfo
+{
+	int m_Version;
+	int m_Author;
+	int m_MapVersion;
+	int m_Credits;
+	int m_License;
+};
+
+struct CMapItemInfoSettings : CMapItemInfo
+{
+	int m_Settings;
+};
+
+struct CMapItemImage_v1
+{
+	enum
+	{
+		CURRENT_VERSION = 1,
+	};
+
+	int m_Version;
+	int m_Width;
+	int m_Height;
+	int m_External;
+	int m_ImageName;
+	int m_ImageData;
+};
+
+struct CMapItemImage_v2 : public CMapItemImage_v1
+{
+	enum
+	{
+		CURRENT_VERSION = 2,
+	};
+
+	int m_Format; // Default before this version is CImageInfo::FORMAT_RGBA
+};
+
+typedef CMapItemImage_v1 CMapItemImage;
+
+struct CMapItemGroup_v1
+{
+	int m_Version;
+	int m_OffsetX;
+	int m_OffsetY;
+	int m_ParallaxX;
+	int m_ParallaxY;
+
+	int m_StartLayer;
+	int m_NumLayers;
+};
+
+struct CMapItemGroup : public CMapItemGroup_v1
+{
+	enum
+	{
+		CURRENT_VERSION = 3
+	};
+
+	int m_UseClipping;
+	int m_ClipX;
+	int m_ClipY;
+	int m_ClipW;
+	int m_ClipH;
+
+	int m_aName[3];
+};
+
+struct CMapItemLayer
+{
+	int m_Version;
+	int m_Type;
+	int m_Flags;
+};
+
+struct CMapItemLayerTilemap
+{
+	enum
+	{
+		CURRENT_VERSION = 3,
+		TILE_SKIP_MIN_VERSION = 4, // supported for loading but not saving
+	};
+
+	CMapItemLayer m_Layer;
+	int m_Version;
+
+	int m_Width;
+	int m_Height;
+	int m_Flags;
+
+	CColor m_Color;
+	int m_ColorEnv;
+	int m_ColorEnvOffset;
+
+	int m_Image;
+	int m_Data;
+
+	int m_aName[3];
+
+	// DDRace
+
+	int m_Tele;
+	int m_Speedup;
+	int m_Front;
+	int m_Switch;
+	int m_Tune;
+};
+
+struct CMapItemLayerQuads
+{
+	CMapItemLayer m_Layer;
+	int m_Version;
+
+	int m_NumQuads;
+	int m_Data;
+	int m_Image;
+
+	int m_aName[3];
+};
+
+struct CMapItemVersion
+{
+	enum
+	{
+		CURRENT_VERSION = 1
+	};
+
+	int m_Version;
+};
+
+// Represents basic information about envelope points.
+// In upstream Teeworlds, this is only used if all CMapItemEnvelope are version 1 or 2.
+struct CEnvPoint
+{
+	enum
+	{
+		MAX_CHANNELS = 4,
+	};
+
+	int m_Time; // in ms
+	int m_Curvetype; // CURVETYPE_* constants, any unknown value behaves like CURVETYPE_LINEAR
+	int m_aValues[MAX_CHANNELS]; // 1-4 depending on envelope (22.10 fixed point)
+
+	bool operator<(const CEnvPoint &Other) const { return m_Time < Other.m_Time; }
+};
+
+// Represents additional envelope point information for CURVETYPE_BEZIER.
+// In DDNet, these are stored separately in an UUID-based map item.
+// In upstream Teeworlds, CEnvPointBezier_upstream is used instead.
+struct CEnvPointBezier
+{
+	// DeltaX in ms and DeltaY as 22.10 fxp
+	int m_aInTangentDeltaX[CEnvPoint::MAX_CHANNELS];
+	int m_aInTangentDeltaY[CEnvPoint::MAX_CHANNELS];
+	int m_aOutTangentDeltaX[CEnvPoint::MAX_CHANNELS];
+	int m_aOutTangentDeltaY[CEnvPoint::MAX_CHANNELS];
+};
+
+// Written to maps on upstream Teeworlds for envelope points including bezier information instead of the basic
+// CEnvPoint items, if at least one CMapItemEnvelope with version 3 or higher exists in the map.
+struct CEnvPointBezier_upstream : public CEnvPoint
+{
+	CEnvPointBezier m_Bezier;
+};
+
+// Used to represent all envelope point information at runtime in editor.
+// (Can eventually be different than CEnvPointBezier_upstream)
+struct CEnvPoint_runtime : public CEnvPoint
+{
+	CEnvPointBezier m_Bezier;
+};
+
+struct CMapItemEnvelope_v1
+{
+	enum
+	{
+		CURRENT_VERSION = 1,
+	};
+
+	int m_Version;
+	int m_Channels;
+	int m_StartPoint;
+	int m_NumPoints;
+	int m_aName[8];
+};
+
+struct CMapItemEnvelope_v2 : public CMapItemEnvelope_v1
+{
+	enum
+	{
+		CURRENT_VERSION = 2,
+	};
+
+	int m_Synchronized;
+};
+
+// Only written to maps in upstream Teeworlds.
+// If at least one of these exists in a map, the envelope points
+// are represented by CEnvPointBezier_upstream instead of CEnvPoint.
+struct CMapItemEnvelope_v3 : public CMapItemEnvelope_v2
+{
+	enum
+	{
+		CURRENT_VERSION = 3,
+	};
+};
+
+typedef CMapItemEnvelope_v2 CMapItemEnvelope;
+
+struct CSoundShape
+{
+	enum
+	{
+		SHAPE_RECTANGLE = 0,
+		SHAPE_CIRCLE,
+		NUM_SHAPES,
+	};
+
+	struct CRectangle
+	{
+		int m_Width, m_Height; // fxp 22.10
+	};
+
+	struct CCircle
+	{
+		int m_Radius;
+	};
+
+	int m_Type;
+
+	union
+	{
+		CRectangle m_Rectangle;
+		CCircle m_Circle;
+	};
+};
+
+struct CSoundSource
+{
+	CPoint m_Position;
+	int m_Loop;
+	int m_Pan; // 0 - no panning, 1 - panning
+	int m_TimeDelay; // in s
+	int m_Falloff; // [0,255] // 0 - No falloff, 255 - full
+
+	int m_PosEnv;
+	int m_PosEnvOffset;
+	int m_SoundEnv;
+	int m_SoundEnvOffset;
+
+	CSoundShape m_Shape;
+};
+
+struct CMapItemLayerSounds
+{
+	enum
+	{
+		CURRENT_VERSION = 2
+	};
+
+	CMapItemLayer m_Layer;
+	int m_Version;
+
+	int m_NumSources;
+	int m_Data;
+	int m_Sound;
+
+	int m_aName[3];
+};
+
+struct CMapItemSound
+{
+	int m_Version;
+
+	int m_External;
+
+	int m_SoundName;
+	int m_SoundData;
+	int m_SoundDataSize;
+};
+
+// DDRace
+
+class CTeleTile
+{
+public:
+	unsigned char m_Number;
+	unsigned char m_Type;
+};
+
+class CSpeedupTile
+{
+public:
+	unsigned char m_Force;
+	unsigned char m_MaxSpeed;
+	unsigned char m_Type;
+	short m_Angle;
+};
+
+class CSwitchTile
+{
+public:
+	unsigned char m_Number;
+	unsigned char m_Type;
+	unsigned char m_Flags;
+	unsigned char m_Delay;
+};
+
+class CDoorTile
+{
+public:
+	unsigned char m_Index;
+	unsigned char m_Flags;
+	int m_Number;
+};
+
+class CTuneTile
+{
+public:
+	unsigned char m_Number;
+	unsigned char m_Type;
+};
+
+bool IsValidGameTile(int Index);
+bool IsValidFrontTile(int Index);
+bool IsValidTeleTile(int Index);
+bool IsTeleTileNumberUsed(int Index); // Assumes that Index is a valid tele tile index
+bool IsValidSpeedupTile(int Index);
+bool IsValidSwitchTile(int Index);
+bool IsSwitchTileFlagsUsed(int Index); // Assumes that Index is a valid switch tile index
+bool IsSwitchTileNumberUsed(int Index); // Assumes that Index is a valid switch tile index
+bool IsSwitchTileDelayUsed(int Index); // Assumes that Index is a valid switch tile index
+bool IsValidTuneTile(int Index);
+bool IsValidEntity(int Index);
+bool IsRotatableTile(int Index);
+bool IsCreditsTile(int TileIndex);
+int PackColor(CColor Color);
+
+#endif
diff --git a/src_bkp/game/mapitems_ex.cpp b/src_bkp/game/mapitems_ex.cpp
new file mode 100644
index 0000000000..68c29a3e27
--- /dev/null
+++ b/src_bkp/game/mapitems_ex.cpp
@@ -0,0 +1,10 @@
+#include "mapitems_ex.h"
+
+#include <engine/shared/uuid_manager.h>
+
+void RegisterMapItemTypeUuids(CUuidManager *pManager)
+{
+#define UUID(id, name) pManager->RegisterName(id, name);
+#include "mapitems_ex_types.h"
+#undef UUID
+}
diff --git a/src_bkp/game/mapitems_ex.h b/src_bkp/game/mapitems_ex.h
new file mode 100644
index 0000000000..c67b362189
--- /dev/null
+++ b/src_bkp/game/mapitems_ex.h
@@ -0,0 +1,47 @@
+#ifndef GAME_MAPITEMS_EX_H
+#define GAME_MAPITEMS_EX_H
+#include <game/generated/protocol.h>
+
+enum
+{
+	__MAPITEMTYPE_UUID_HELPER = OFFSET_MAPITEMTYPE_UUID - 1,
+#define UUID(id, name) id,
+#include "mapitems_ex_types.h"
+#undef UUID
+	END_MAPITEMTYPES_UUID,
+};
+
+struct CMapItemTest
+{
+	enum
+	{
+		CURRENT_VERSION = 1
+	};
+
+	int m_Version;
+	int m_aFields[2];
+	int m_Field3;
+	int m_Field4;
+};
+
+struct CMapItemAutoMapperConfig
+{
+	enum
+	{
+		CURRENT_VERSION = 1
+	};
+	enum
+	{
+		FLAG_AUTOMATIC = 1
+	};
+
+	int m_Version;
+	int m_GroupId;
+	int m_LayerId;
+	int m_AutomapperConfig;
+	int m_AutomapperSeed;
+	int m_Flags;
+};
+
+void RegisterMapItemTypeUuids(class CUuidManager *pManager);
+#endif // GAME_MAPITEMS_EX_H
diff --git a/src_bkp/game/mapitems_ex_types.h b/src_bkp/game/mapitems_ex_types.h
new file mode 100644
index 0000000000..38613c9e94
--- /dev/null
+++ b/src_bkp/game/mapitems_ex_types.h
@@ -0,0 +1,5 @@
+// This file can be included several times.
+
+UUID(MAPITEMTYPE_TEST, "mapitemtype-test@ddnet.tw")
+UUID(MAPITEMTYPE_AUTOMAPPER_CONFIG, "mapitemtype-automapper-config@ddnet.tw")
+UUID(MAPITEMTYPE_ENVPOINTS_BEZIER, "mapitemtype-envpoints-bezier@ddnet.tw")
diff --git a/src_bkp/game/prng.cpp b/src_bkp/game/prng.cpp
new file mode 100644
index 0000000000..46505af26e
--- /dev/null
+++ b/src_bkp/game/prng.cpp
@@ -0,0 +1,54 @@
+#include "prng.h"
+
+#include <base/system.h>
+
+// From https://en.wikipedia.org/w/index.php?title=Permuted_congruential_generator&oldid=901497400#Example_code.
+//
+// > The generator recommended for most users is PCG-XSH-RR with 64-bit state
+// > and 32-bit output.
+
+#define NAME "pcg-xsh-rr"
+
+CPrng::CPrng() :
+	m_Seeded(false)
+{
+}
+
+const char *CPrng::Description() const
+{
+	if(!m_Seeded)
+	{
+		return NAME ":unseeded";
+	}
+	return m_aDescription;
+}
+
+static unsigned int RotateRight32(unsigned int x, int Shift)
+{
+	return (x >> Shift) | (x << (-Shift & 31));
+}
+
+void CPrng::Seed(uint64_t aSeed[2])
+{
+	m_Seeded = true;
+	str_format(m_aDescription, sizeof(m_aDescription), "%s:%08x%08x:%08x%08x", NAME,
+		(unsigned)(aSeed[0] >> 32), (unsigned)aSeed[0],
+		(unsigned)(aSeed[1] >> 32), (unsigned)aSeed[1]);
+
+	m_Increment = (aSeed[1] << 1) | 1;
+	m_State = aSeed[0] + m_Increment;
+	RandomBits();
+}
+
+unsigned int CPrng::RandomBits()
+{
+	dbg_assert(m_Seeded, "prng needs to be seeded before it can generate random numbers");
+
+	uint64_t x = m_State;
+	unsigned int Count = x >> 59;
+
+	static const uint64_t s_Multiplier = 6364136223846793005u;
+	m_State = x * s_Multiplier + m_Increment;
+	x ^= x >> 18;
+	return RotateRight32(x >> 27, Count);
+}
diff --git a/src_bkp/game/prng.h b/src_bkp/game/prng.h
new file mode 100644
index 0000000000..9cb1dc4c1a
--- /dev/null
+++ b/src_bkp/game/prng.h
@@ -0,0 +1,32 @@
+#ifndef GAME_PRNG_H
+#define GAME_PRNG_H
+
+#include <cstdint>
+
+class CPrng
+{
+public:
+	// Creates an unseeded instance.
+	CPrng();
+
+	// The name of the random number generator including the current seed.
+	const char *Description() const;
+
+	// Seeds the random number generator with the given integer. The random
+	// sequence obtained by calling `RandomBits()` repeatedly is guaranteed
+	// to be the same for the same seed.
+	void Seed(uint64_t aSeed[2]);
+
+	// Generates 32 random bits. `Seed()` must be called before calling
+	// this function.
+	unsigned int RandomBits();
+
+private:
+	char m_aDescription[64];
+
+	bool m_Seeded;
+	uint64_t m_State;
+	uint64_t m_Increment;
+};
+
+#endif // GAME_PRNG_H
diff --git a/src_bkp/game/server/ddracechat.cpp b/src_bkp/game/server/ddracechat.cpp
new file mode 100644
index 0000000000..f422657ddb
--- /dev/null
+++ b/src_bkp/game/server/ddracechat.cpp
@@ -0,0 +1,1796 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "gamecontext.h"
+#include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
+#include <game/server/gamemodes/DDRace.h>
+#include <game/server/teams.h>
+#include <game/version.h>
+
+#include "entities/character.h"
+#include "player.h"
+#include "score.h"
+
+bool CheckClientID(int ClientID);
+
+void CGameContext::ConCredits(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"DDNet is run by the DDNet staff (DDNet.org/staff)");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Great maps and many ideas from the great community");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Help and code by eeeee, HMH, east, CookieMichal, Learath2,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Savander, laxa, Tobii, BeaR, Wohoo, nuborn, timakro, Shiki,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"trml, Soreu, hi_leute_gll, Lady Saavik, Chairn, heinrich5991,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"swick, oy, necropotame, Ryozuki, Redix, d3fault, marcelherd,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"BannZay, ACTom, SiuFuWong, PathosEthosLogos, TsFreddie,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Jupeyy, noby, ChillerDragon, ZombieToad, weez15, z6zzz,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Piepow, QingGo, RafaelFF, sctt, jao, daverck, fokkonaut,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Bojidar, FallenKN, ardadem, archimede67, sirius1242, Aerll,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"trafilaw, Zwelf, Patiga, Konsti, ElXreno, MikiGamer,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Fireball, Banana090, axblk, yangfl, Kaffeine,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Zodiac, c0d3d3v, GiuCcc, Ravie, Robyt3, simpygirl,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"sjrc6, Cellegen, srdante, Nouaa, Voxel, luk51,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Vy0x2, Avolicious, louis, Marmare314, hus3h,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"ArijanJ, tarunsamanta2k20, Possseidon, M0REKZ,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Teero, furo, dobrykafe, Moiman, JSaurusRex,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Steinchen & others");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Based on DDRace by the DDRace developers,");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"which is a mod of Teeworlds by the Teeworlds developers.");
+}
+
+void CGameContext::ConInfo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"DDraceNetwork Mod. Version: " GAME_VERSION);
+	if(GIT_SHORTREV_HASH)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "Git revision hash: %s", GIT_SHORTREV_HASH);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+	}
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Official site: DDNet.org");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"For more info: /cmdlist");
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+		"Or visit DDNet.org");
+}
+
+void CGameContext::ConList(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int ClientID = pResult->m_ClientID;
+	if(!CheckClientID(ClientID))
+		return;
+
+	char zerochar = 0;
+	if(pResult->NumArguments() > 0)
+		pSelf->List(ClientID, pResult->GetString(0));
+	else
+		pSelf->List(ClientID, &zerochar);
+}
+
+void CGameContext::ConHelp(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"/cmdlist will show a list of all chat commands");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"/help + any command will show you the help for this command");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Example /help settings will display the help about /settings");
+	}
+	else
+	{
+		const char *pArg = pResult->GetString(0);
+		const IConsole::CCommandInfo *pCmdInfo =
+			pSelf->Console()->GetCommandInfo(pArg, CFGFLAG_SERVER, false);
+		if(pCmdInfo)
+		{
+			if(pCmdInfo->m_pParams)
+			{
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf), "Usage: %s %s", pCmdInfo->m_pName, pCmdInfo->m_pParams);
+				pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+			}
+
+			if(pCmdInfo->m_pHelp)
+				pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", pCmdInfo->m_pHelp);
+		}
+		else
+			pSelf->Console()->Print(
+				IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp",
+				"Command is either unknown or you have given a blank command without any parameters.");
+	}
+}
+
+void CGameContext::ConSettings(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"to check a server setting say /settings and setting's name, setting names are:");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"teams, cheats, collision, hooking, endlesshooking, me, ");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"hitting, oldlaser, timeout, votes, pause and scores");
+	}
+	else
+	{
+		const char *pArg = pResult->GetString(0);
+		char aBuf[256];
+		float ColTemp;
+		float HookTemp;
+		pSelf->m_Tuning.Get("player_collision", &ColTemp);
+		pSelf->m_Tuning.Get("player_hooking", &HookTemp);
+		if(str_comp(pArg, "teams") == 0)
+		{
+			str_format(aBuf, sizeof(aBuf), "%s %s",
+				g_Config.m_SvTeam == SV_TEAM_ALLOWED ?
+					"Teams are available on this server" :
+					(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO) ?
+					"Teams are not available on this server" :
+					"You have to be in a team to play on this server", /*g_Config.m_SvTeamStrict ? "and if you die in a team all of you die" : */
+				"and all of your team will die if the team is locked");
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+		}
+		else if(str_comp(pArg, "cheats") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvTestingCommands ?
+					"Cheats are enabled on this server" :
+					"Cheats are disabled on this server");
+		}
+		else if(str_comp(pArg, "collision") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				ColTemp ?
+					"Players can collide on this server" :
+					"Players can't collide on this server");
+		}
+		else if(str_comp(pArg, "hooking") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				HookTemp ?
+					"Players can hook each other on this server" :
+					"Players can't hook each other on this server");
+		}
+		else if(str_comp(pArg, "endlesshooking") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvEndlessDrag ?
+					"Players hook time is unlimited" :
+					"Players hook time is limited");
+		}
+		else if(str_comp(pArg, "hitting") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvHit ?
+					"Players weapons affect others" :
+					"Players weapons has no affect on others");
+		}
+		else if(str_comp(pArg, "oldlaser") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvOldLaser ?
+					"Lasers can hit you if you shot them and they pull you towards the bounce origin (Like DDRace Beta)" :
+					"Lasers can't hit you if you shot them, and they pull others towards the shooter");
+		}
+		else if(str_comp(pArg, "me") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvSlashMe ?
+					"Players can use /me commands the famous IRC Command" :
+					"Players can't use the /me command");
+		}
+		else if(str_comp(pArg, "timeout") == 0)
+		{
+			str_format(aBuf, sizeof(aBuf), "The Server Timeout is currently set to %d seconds", g_Config.m_ConnTimeout);
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+		}
+		else if(str_comp(pArg, "votes") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvVoteKick ?
+					"Players can use Callvote menu tab to kick offenders" :
+					"Players can't use the Callvote menu tab to kick offenders");
+			if(g_Config.m_SvVoteKick)
+			{
+				str_format(aBuf, sizeof(aBuf),
+					"Players are banned for %d minute(s) if they get voted off", g_Config.m_SvVoteKickBantime);
+
+				pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+					g_Config.m_SvVoteKickBantime ?
+						aBuf :
+						"Players are just kicked and not banned if they get voted off");
+			}
+		}
+		else if(str_comp(pArg, "pause") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvPauseable ?
+					"/spec will pause you and your tee will vanish" :
+					"/spec will pause you but your tee will not vanish");
+		}
+		else if(str_comp(pArg, "scores") == 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvHideScore ?
+					"Scores are private on this server" :
+					"Scores are public on this server");
+		}
+		else
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				"no matching settings found, type /settings to view them");
+		}
+	}
+}
+
+void CGameContext::ConRules(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	bool Printed = false;
+	if(g_Config.m_SvDDRaceRules)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Be nice.");
+		Printed = true;
+	}
+	char *apRuleLines[] = {
+		g_Config.m_SvRulesLine1,
+		g_Config.m_SvRulesLine2,
+		g_Config.m_SvRulesLine3,
+		g_Config.m_SvRulesLine4,
+		g_Config.m_SvRulesLine5,
+		g_Config.m_SvRulesLine6,
+		g_Config.m_SvRulesLine7,
+		g_Config.m_SvRulesLine8,
+		g_Config.m_SvRulesLine9,
+		g_Config.m_SvRulesLine10,
+	};
+	for(auto &pRuleLine : apRuleLines)
+	{
+		if(pRuleLine[0])
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp", pRuleLine);
+			Printed = true;
+		}
+	}
+	if(!Printed)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"No Rules Defined, Kill em all!!");
+	}
+}
+
+void ToggleSpecPause(IConsole::IResult *pResult, void *pUserData, int PauseType)
+{
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	IServer *pServ = pSelf->Server();
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	int PauseState = pPlayer->IsPaused();
+	if(PauseState > 0)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "You are force-paused for %d seconds.", (PauseState - pServ->Tick()) / pServ->TickSpeed());
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+	}
+	else if(pResult->NumArguments() > 0)
+	{
+		if(-PauseState == PauseType && pPlayer->m_SpectatorID != pResult->m_ClientID && pServ->ClientIngame(pPlayer->m_SpectatorID) && !str_comp(pServ->ClientName(pPlayer->m_SpectatorID), pResult->GetString(0)))
+		{
+			pPlayer->Pause(CPlayer::PAUSE_NONE, false);
+		}
+		else
+		{
+			pPlayer->Pause(PauseType, false);
+			pPlayer->SpectatePlayerName(pResult->GetString(0));
+		}
+	}
+	else if(-PauseState != CPlayer::PAUSE_NONE && PauseType != CPlayer::PAUSE_NONE)
+	{
+		pPlayer->Pause(CPlayer::PAUSE_NONE, false);
+	}
+	else if(-PauseState != PauseType)
+	{
+		pPlayer->Pause(PauseType, false);
+	}
+}
+
+void ToggleSpecPauseVoted(IConsole::IResult *pResult, void *pUserData, int PauseType)
+{
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	int PauseState = pPlayer->IsPaused();
+	if(PauseState > 0)
+	{
+		IServer *pServ = pSelf->Server();
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "You are force-paused for %d seconds.", (PauseState - pServ->Tick()) / pServ->TickSpeed());
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+		return;
+	}
+
+	bool IsPlayerBeingVoted = pSelf->m_VoteCloseTime &&
+				  (pSelf->IsKickVote() || pSelf->IsSpecVote()) &&
+				  pResult->m_ClientID != pSelf->m_VoteVictim;
+	if((!IsPlayerBeingVoted && -PauseState == PauseType) ||
+		(IsPlayerBeingVoted && PauseState && pPlayer->m_SpectatorID == pSelf->m_VoteVictim))
+	{
+		pPlayer->Pause(CPlayer::PAUSE_NONE, false);
+	}
+	else
+	{
+		pPlayer->Pause(PauseType, false);
+		if(IsPlayerBeingVoted)
+			pPlayer->m_SpectatorID = pSelf->m_VoteVictim;
+	}
+}
+
+void CGameContext::ConToggleSpec(IConsole::IResult *pResult, void *pUserData)
+{
+	ToggleSpecPause(pResult, pUserData, g_Config.m_SvPauseable ? CPlayer::PAUSE_SPEC : CPlayer::PAUSE_PAUSED);
+}
+
+void CGameContext::ConToggleSpecVoted(IConsole::IResult *pResult, void *pUserData)
+{
+	ToggleSpecPauseVoted(pResult, pUserData, g_Config.m_SvPauseable ? CPlayer::PAUSE_SPEC : CPlayer::PAUSE_PAUSED);
+}
+
+void CGameContext::ConTogglePause(IConsole::IResult *pResult, void *pUserData)
+{
+	ToggleSpecPause(pResult, pUserData, CPlayer::PAUSE_PAUSED);
+}
+
+void CGameContext::ConTogglePauseVoted(IConsole::IResult *pResult, void *pUserData)
+{
+	ToggleSpecPauseVoted(pResult, pUserData, CPlayer::PAUSE_PAUSED);
+}
+
+void CGameContext::ConTeamTop5(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvHideScore)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Showing the team top 5 is not allowed on this server.");
+		return;
+	}
+
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Score()->ShowTeamTop5(pResult->m_ClientID, 1);
+	}
+	else if(pResult->NumArguments() == 1)
+	{
+		if(pResult->GetInteger(0) != 0)
+		{
+			pSelf->Score()->ShowTeamTop5(pResult->m_ClientID, pResult->GetInteger(0));
+		}
+		else
+		{
+			const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
+							     pSelf->Server()->ClientName(pResult->m_ClientID) :
+							     pResult->GetString(0);
+			pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientID, pRequestedName, 0);
+		}
+	}
+	else if(pResult->NumArguments() == 2 && pResult->GetInteger(1) != 0)
+	{
+		const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
+						     pSelf->Server()->ClientName(pResult->m_ClientID) :
+						     pResult->GetString(0);
+		pSelf->Score()->ShowPlayerTeamTop5(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+	}
+	else
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "/top5team needs 0, 1 or 2 parameter. 1. = name, 2. = start number");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Example: /top5team, /top5team me, /top5team Hans, /top5team \"Papa Smurf\" 5");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Bad: /top5team Papa Smurf 5 # Good: /top5team \"Papa Smurf\" 5 ");
+	}
+}
+
+void CGameContext::ConTop(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvHideScore)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Showing the top is not allowed on this server.");
+		return;
+	}
+
+	if(pResult->NumArguments() > 0)
+		pSelf->Score()->ShowTop(pResult->m_ClientID, pResult->GetInteger(0));
+	else
+		pSelf->Score()->ShowTop(pResult->m_ClientID);
+}
+
+void CGameContext::ConTimes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Score()->ShowTimes(pResult->m_ClientID, 1);
+	}
+	else if(pResult->NumArguments() == 1)
+	{
+		if(pResult->GetInteger(0) != 0)
+		{
+			pSelf->Score()->ShowTimes(pResult->m_ClientID, pResult->GetInteger(0));
+		}
+		else
+		{
+			const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
+							     pSelf->Server()->ClientName(pResult->m_ClientID) :
+							     pResult->GetString(0);
+			pSelf->Score()->ShowTimes(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+		}
+	}
+	else if(pResult->NumArguments() == 2 && pResult->GetInteger(1) != 0)
+	{
+		const char *pRequestedName = (str_comp(pResult->GetString(0), "me") == 0) ?
+						     pSelf->Server()->ClientName(pResult->m_ClientID) :
+						     pResult->GetString(0);
+		pSelf->Score()->ShowTimes(pResult->m_ClientID, pRequestedName, pResult->GetInteger(1));
+	}
+	else
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "/times needs 0, 1 or 2 parameter. 1. = name, 2. = start number");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Example: /times, /times me, /times Hans, /times \"Papa Smurf\" 5");
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Bad: /times Papa Smurf 5 # Good: /times \"Papa Smurf\" 5 ");
+	}
+}
+
+void CGameContext::ConDND(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pPlayer->m_DND)
+	{
+		pPlayer->m_DND = false;
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You will receive global chat and server messages");
+	}
+	else
+	{
+		pPlayer->m_DND = true;
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You will not receive any further global chat and server messages");
+	}
+}
+
+void CGameContext::ConMap(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvMapVote == 0)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"/map is disabled");
+		return;
+	}
+
+	if(pResult->NumArguments() <= 0)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Example: /map adr3 to call vote for Adrenaline 3. This means that the map name must start with 'a' and contain the characters 'd', 'r' and '3' in that order");
+		return;
+	}
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pSelf->RateLimitPlayerVote(pResult->m_ClientID) || pSelf->RateLimitPlayerMapVote(pResult->m_ClientID))
+		return;
+
+	pSelf->Score()->MapVote(pResult->m_ClientID, pResult->GetString(0));
+}
+
+void CGameContext::ConMapInfo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pResult->NumArguments() > 0)
+		pSelf->Score()->MapInfo(pResult->m_ClientID, pResult->GetString(0));
+	else
+		pSelf->Score()->MapInfo(pResult->m_ClientID, g_Config.m_SvMap);
+}
+
+void CGameContext::ConTimeout(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	const char *pTimeout = pResult->NumArguments() > 0 ? pResult->GetString(0) : pPlayer->m_aTimeoutCode;
+
+	if(!pSelf->Server()->IsSixup(pResult->m_ClientID))
+	{
+		for(int i = 0; i < pSelf->Server()->MaxClients(); i++)
+		{
+			if(i == pResult->m_ClientID)
+				continue;
+			if(!pSelf->m_apPlayers[i])
+				continue;
+			if(str_comp(pSelf->m_apPlayers[i]->m_aTimeoutCode, pTimeout))
+				continue;
+			if(pSelf->Server()->SetTimedOut(i, pResult->m_ClientID))
+			{
+				if(pSelf->m_apPlayers[i]->GetCharacter())
+					pSelf->SendTuningParams(i, pSelf->m_apPlayers[i]->GetCharacter()->m_TuneZone);
+				return;
+			}
+		}
+	}
+	else
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Your timeout code has been set. 0.7 clients can not reclaim their tees on timeout; however, a 0.6 client can claim your tee ");
+	}
+
+	pSelf->Server()->SetTimeoutProtected(pResult->m_ClientID);
+	str_copy(pPlayer->m_aTimeoutCode, pResult->GetString(0), sizeof(pPlayer->m_aTimeoutCode));
+}
+
+void CGameContext::ConPractice(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+		return;
+
+	if(!g_Config.m_SvPractice)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Practice mode is disabled");
+		return;
+	}
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+
+	int Team = Teams.m_Core.Team(pResult->m_ClientID);
+
+	if(Team < TEAM_FLOCK || (Team == TEAM_FLOCK && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || Team >= TEAM_SUPER)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Join a team to enable practice mode, which means you can use /r, but can't earn a rank.");
+		return;
+	}
+
+	if(Teams.IsPractice(Team))
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Team is already in practice mode");
+		return;
+	}
+
+	bool VotedForPractice = pResult->NumArguments() == 0 || pResult->GetInteger(0);
+
+	if(VotedForPractice == pPlayer->m_VotedForPractice)
+		return;
+
+	pPlayer->m_VotedForPractice = VotedForPractice;
+
+	int NumCurrentVotes = 0;
+	int TeamSize = 0;
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(Teams.m_Core.Team(i) == Team)
+		{
+			CPlayer *pPlayer2 = pSelf->m_apPlayers[i];
+			if(pPlayer2 && pPlayer2->m_VotedForPractice)
+				NumCurrentVotes++;
+			TeamSize++;
+		}
+	}
+
+	int NumRequiredVotes = TeamSize / 2 + 1;
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "'%s' voted to %s /practice mode for your team, which means you can use /r, but you can't earn a rank. Type /practice to vote (%d/%d required votes)", pSelf->Server()->ClientName(pResult->m_ClientID), VotedForPractice ? "enable" : "disable", NumCurrentVotes, NumRequiredVotes);
+	pSelf->SendChatTeam(Team, aBuf);
+
+	if(NumCurrentVotes >= NumRequiredVotes)
+	{
+		Teams.SetPractice(Team, true);
+		pSelf->SendChatTeam(Team, "Practice mode enabled for your team, happy practicing!");
+	}
+}
+
+void CGameContext::ConSwap(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pName = pResult->GetString(0);
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(!g_Config.m_SvSwap)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Swap is disabled on this server.");
+		return;
+	}
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+
+	int Team = Teams.m_Core.Team(pResult->m_ClientID);
+
+	if(Team < TEAM_FLOCK || Team >= TEAM_SUPER)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Join a team to use swap feature, which means you can swap positions with each other.");
+		return;
+	}
+
+	int TargetClientId = -1;
+	if(pResult->NumArguments() == 1)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(pSelf->m_apPlayers[i] && !str_comp(pName, pSelf->Server()->ClientName(i)))
+			{
+				TargetClientId = i;
+				break;
+			}
+		}
+	}
+	else
+	{
+		int TeamSize = 1;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(pSelf->m_apPlayers[i] && Teams.m_Core.Team(i) == Team && i != pResult->m_ClientID)
+			{
+				TargetClientId = i;
+				TeamSize++;
+			}
+		}
+		if(TeamSize != 2)
+			TargetClientId = -1;
+	}
+
+	if(TargetClientId < 0)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Player not found");
+		return;
+	}
+
+	if(TargetClientId == pResult->m_ClientID)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't swap with yourself");
+		return;
+	}
+
+	int TargetTeam = Teams.m_Core.Team(TargetClientId);
+	if(TargetTeam != Team)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Player is on a different team");
+		return;
+	}
+
+	CPlayer *pSwapPlayer = pSelf->m_apPlayers[TargetClientId];
+	if(Team == TEAM_FLOCK && g_Config.m_SvTeam != 3)
+	{
+		CCharacter *pChr = pPlayer->GetCharacter();
+		CCharacter *pSwapChr = pSwapPlayer->GetCharacter();
+		if(!pChr || !pSwapChr || pChr->m_DDRaceState != DDRACE_STARTED || pSwapChr->m_DDRaceState != DDRACE_STARTED)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You and other player need to have started the map");
+			return;
+		}
+	}
+	else if(!Teams.IsStarted(Team))
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Need to have started the map to swap with a player.");
+		return;
+	}
+	if(pSelf->m_World.m_Core.m_apCharacters[pResult->m_ClientID] == nullptr || pSelf->m_World.m_Core.m_apCharacters[TargetClientId] == nullptr)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "You and the other player must not be paused.");
+		return;
+	}
+
+	bool SwapPending = pSwapPlayer->m_SwapTargetsClientID != pResult->m_ClientID;
+	if(SwapPending)
+	{
+		if(pSelf->ProcessSpamProtection(pResult->m_ClientID))
+			return;
+
+		Teams.RequestTeamSwap(pPlayer, pSwapPlayer, Team);
+		return;
+	}
+
+	Teams.SwapTeamCharacters(pPlayer, pSwapPlayer, Team);
+}
+
+void CGameContext::ConSave(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(!g_Config.m_SvSaveGames)
+	{
+		pSelf->SendChatTarget(pResult->m_ClientID, "Save-function is disabled on this server");
+		return;
+	}
+
+	const char *pCode = "";
+	if(pResult->NumArguments() > 0)
+		pCode = pResult->GetString(0);
+
+	pSelf->Score()->SaveTeam(pResult->m_ClientID, pCode, g_Config.m_SvSqlServerName);
+}
+
+void CGameContext::ConLoad(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(!g_Config.m_SvSaveGames)
+	{
+		pSelf->SendChatTarget(pResult->m_ClientID, "Save-function is disabled on this server");
+		return;
+	}
+
+	if(pResult->NumArguments() > 0)
+		pSelf->Score()->LoadTeam(pResult->GetString(0), pResult->m_ClientID);
+	else
+		pSelf->Score()->GetSaves(pResult->m_ClientID);
+}
+
+void CGameContext::ConTeamRank(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(pResult->NumArguments() > 0)
+	{
+		if(!g_Config.m_SvHideScore)
+			pSelf->Score()->ShowTeamRank(pResult->m_ClientID, pResult->GetString(0));
+		else
+			pSelf->Console()->Print(
+				IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp",
+				"Showing the team rank of other players is not allowed on this server.");
+	}
+	else
+		pSelf->Score()->ShowTeamRank(pResult->m_ClientID,
+			pSelf->Server()->ClientName(pResult->m_ClientID));
+}
+
+void CGameContext::ConRank(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(pResult->NumArguments() > 0)
+	{
+		if(!g_Config.m_SvHideScore)
+			pSelf->Score()->ShowRank(pResult->m_ClientID, pResult->GetString(0));
+		else
+			pSelf->Console()->Print(
+				IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp",
+				"Showing the rank of other players is not allowed on this server.");
+	}
+	else
+		pSelf->Score()->ShowRank(pResult->m_ClientID,
+			pSelf->Server()->ClientName(pResult->m_ClientID));
+}
+
+void CGameContext::ConLock(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Teams are disabled");
+		return;
+	}
+
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+
+	bool Lock = pSelf->m_pController->Teams().TeamLocked(Team);
+
+	if(pResult->NumArguments() > 0)
+		Lock = !pResult->GetInteger(0);
+
+	if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"This team can't be locked");
+		return;
+	}
+
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+		return;
+
+	char aBuf[512];
+	if(Lock)
+	{
+		pSelf->UnlockTeam(pResult->m_ClientID, Team);
+	}
+	else
+	{
+		pSelf->m_pController->Teams().SetTeamLock(Team, true);
+
+		str_format(aBuf, sizeof(aBuf), "'%s' locked your team. After the race starts, killing will kill everyone in your team.", pSelf->Server()->ClientName(pResult->m_ClientID));
+		pSelf->SendChatTeam(Team, aBuf);
+	}
+}
+
+void CGameContext::ConUnlock(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Teams are disabled");
+		return;
+	}
+
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+
+	if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
+		return;
+
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+		return;
+
+	pSelf->UnlockTeam(pResult->m_ClientID, Team);
+}
+
+void CGameContext::UnlockTeam(int ClientID, int Team) const
+{
+	m_pController->Teams().SetTeamLock(Team, false);
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf), "'%s' unlocked your team.", Server()->ClientName(ClientID));
+	SendChatTeam(Team, aBuf);
+}
+
+void CGameContext::AttemptJoinTeam(int ClientID, int Team)
+{
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if(!pPlayer)
+		return;
+
+	if(m_VoteCloseTime && m_VoteCreator == ClientID && (IsKickVote() || IsSpecVote()))
+	{
+		Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"You are running a vote please try again after the vote is done!");
+	}
+	else if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Teams are disabled");
+	}
+	else if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && Team == 0 && pPlayer->GetCharacter() && pPlayer->GetCharacter()->m_LastStartWarning < Server()->Tick() - 3 * Server()->TickSpeed())
+	{
+		Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"You must join a team and play with somebody or else you can\'t play");
+		pPlayer->GetCharacter()->m_LastStartWarning = Server()->Tick();
+	}
+
+	if(pPlayer->GetCharacter() == 0)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"You can't change teams while you are dead/a spectator.");
+	}
+	else
+	{
+		if(Team < 0 || Team >= MAX_CLIENTS)
+			Team = m_pController->Teams().GetFirstEmptyTeam();
+
+		if(pPlayer->m_Last_Team + (int64_t)Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay > Server()->Tick())
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				"You can\'t change teams that fast!");
+		}
+		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().TeamLocked(Team) && !m_pController->Teams().IsInvited(Team, ClientID))
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+				g_Config.m_SvInvite ?
+					"This team is locked using /lock. Only members of the team can unlock it using /lock." :
+					"This team is locked using /lock. Only members of the team can invite you or unlock it using /lock.");
+		}
+		else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize)
+		{
+			char aBuf[512];
+			str_format(aBuf, sizeof(aBuf), "This team already has the maximum allowed size of %d players", g_Config.m_SvMaxTeamSize);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+		}
+		else if(const char *pError = m_pController->Teams().SetCharacterTeam(pPlayer->GetCID(), Team))
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", pError);
+		}
+		else
+		{
+			char aBuf[512];
+			str_format(aBuf, sizeof(aBuf), "'%s' joined team %d",
+				Server()->ClientName(pPlayer->GetCID()),
+				Team);
+			SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+			pPlayer->m_Last_Team = Server()->Tick();
+
+			if(m_pController->Teams().IsPractice(Team))
+				SendChatTarget(pPlayer->GetCID(), "Practice mode enabled for your team, happy practicing!");
+		}
+	}
+}
+
+void CGameContext::ConInvite(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pController = pSelf->m_pController;
+	const char *pName = pResult->GetString(0);
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Teams are disabled");
+		return;
+	}
+
+	if(!g_Config.m_SvInvite)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Invites are disabled");
+		return;
+	}
+
+	int Team = pController->Teams().m_Core.Team(pResult->m_ClientID);
+	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
+	{
+		int Target = -1;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(!str_comp(pName, pSelf->Server()->ClientName(i)))
+			{
+				Target = i;
+				break;
+			}
+		}
+
+		if(Target < 0)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Player not found");
+			return;
+		}
+
+		if(pController->Teams().IsInvited(Team, Target))
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Player already invited");
+			return;
+		}
+
+		if(pSelf->m_apPlayers[pResult->m_ClientID] && pSelf->m_apPlayers[pResult->m_ClientID]->m_LastInvited + g_Config.m_SvInviteFrequency * pSelf->Server()->TickSpeed() > pSelf->Server()->Tick())
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't invite this quickly");
+			return;
+		}
+
+		pController->Teams().SetClientInvited(Team, Target, true);
+		pSelf->m_apPlayers[pResult->m_ClientID]->m_LastInvited = pSelf->Server()->Tick();
+
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "'%s' invited you to team %d. Use /team %d to join.", pSelf->Server()->ClientName(pResult->m_ClientID), Team, Team);
+		pSelf->SendChatTarget(Target, aBuf);
+
+		str_format(aBuf, sizeof(aBuf), "'%s' invited '%s' to your team.", pSelf->Server()->ClientName(pResult->m_ClientID), pSelf->Server()->ClientName(Target));
+		pSelf->SendChatTeam(Team, aBuf);
+	}
+	else
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Can't invite players to this team");
+}
+
+void CGameContext::ConTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pResult->NumArguments() > 0)
+	{
+		pSelf->AttemptJoinTeam(pResult->m_ClientID, pResult->GetInteger(0));
+	}
+	else
+	{
+		char aBuf[512];
+		if(!pPlayer->IsPlaying())
+		{
+			pSelf->Console()->Print(
+				IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp",
+				"You can't check your team while you are dead/a spectator.");
+		}
+		else
+		{
+			str_format(
+				aBuf,
+				sizeof(aBuf),
+				"You are in team %d",
+				pSelf->GetDDRaceTeam(pResult->m_ClientID));
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+		}
+	}
+}
+
+void CGameContext::ConJoin(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	int Target = -1;
+	const char *pName = pResult->GetString(0);
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(!str_comp(pName, pSelf->Server()->ClientName(i)))
+		{
+			Target = i;
+			break;
+		}
+	}
+
+	if(Target == -1)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Player not found");
+		return;
+	}
+
+	int Team = pSelf->GetDDRaceTeam(Target);
+	if(pSelf->ProcessSpamProtection(pResult->m_ClientID, false))
+		return;
+
+	pSelf->AttemptJoinTeam(pResult->m_ClientID, Team);
+}
+
+void CGameContext::ConMe(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	char aBuf[256 + 24];
+
+	str_format(aBuf, 256 + 24, "'%s' %s",
+		pSelf->Server()->ClientName(pResult->m_ClientID),
+		pResult->GetString(0));
+	if(g_Config.m_SvSlashMe)
+		pSelf->SendChat(-2, CGameContext::CHAT_ALL, aBuf, pResult->m_ClientID);
+	else
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"/me is disabled on this server");
+}
+
+void CGameContext::ConConverse(IConsole::IResult *pResult, void *pUserData)
+{
+	// This will never be called
+}
+
+void CGameContext::ConWhisper(IConsole::IResult *pResult, void *pUserData)
+{
+	// This will never be called
+}
+
+void CGameContext::ConSetEyeEmote(IConsole::IResult *pResult,
+	void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			(pPlayer->m_EyeEmoteEnabled) ?
+				"You can now use the preset eye emotes." :
+				"You don't have any eye emotes, remember to bind some. (until you die)");
+		return;
+	}
+	else if(str_comp_nocase(pResult->GetString(0), "on") == 0)
+		pPlayer->m_EyeEmoteEnabled = true;
+	else if(str_comp_nocase(pResult->GetString(0), "off") == 0)
+		pPlayer->m_EyeEmoteEnabled = false;
+	else if(str_comp_nocase(pResult->GetString(0), "toggle") == 0)
+		pPlayer->m_EyeEmoteEnabled = !pPlayer->m_EyeEmoteEnabled;
+	pSelf->Console()->Print(
+		IConsole::OUTPUT_LEVEL_STANDARD,
+		"chatresp",
+		(pPlayer->m_EyeEmoteEnabled) ?
+			"You can now use the preset eye emotes." :
+			"You don't have any eye emotes, remember to bind some. (until you die)");
+}
+
+void CGameContext::ConEyeEmote(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(g_Config.m_SvEmotionalTees == -1)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Emotes are disabled.");
+		return;
+	}
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pResult->NumArguments() == 0)
+	{
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Emote commands are: /emote surprise /emote blink /emote close /emote angry /emote happy /emote pain /emote normal");
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Example: /emote surprise 10 for 10 seconds or /emote surprise (default 1 second)");
+	}
+	else
+	{
+		if(!pPlayer->CanOverrideDefaultEmote())
+			return;
+
+		int EmoteType = 0;
+		if(!str_comp(pResult->GetString(0), "angry"))
+			EmoteType = EMOTE_ANGRY;
+		else if(!str_comp(pResult->GetString(0), "blink"))
+			EmoteType = EMOTE_BLINK;
+		else if(!str_comp(pResult->GetString(0), "close"))
+			EmoteType = EMOTE_BLINK;
+		else if(!str_comp(pResult->GetString(0), "happy"))
+			EmoteType = EMOTE_HAPPY;
+		else if(!str_comp(pResult->GetString(0), "pain"))
+			EmoteType = EMOTE_PAIN;
+		else if(!str_comp(pResult->GetString(0), "surprise"))
+			EmoteType = EMOTE_SURPRISE;
+		else if(!str_comp(pResult->GetString(0), "normal"))
+			EmoteType = EMOTE_NORMAL;
+		else
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp", "Unknown emote... Say /emote");
+			return;
+		}
+
+		int Duration = 1;
+		if(pResult->NumArguments() > 1)
+			Duration = clamp(pResult->GetInteger(1), 1, 86400);
+
+		pPlayer->OverrideDefaultEmote(EmoteType, pSelf->Server()->Tick() + Duration * pSelf->Server()->TickSpeed());
+	}
+}
+
+void CGameContext::ConNinjaJetpack(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	if(pResult->NumArguments())
+		pPlayer->m_NinjaJetpack = pResult->GetInteger(0);
+	else
+		pPlayer->m_NinjaJetpack = !pPlayer->m_NinjaJetpack;
+}
+
+void CGameContext::ConShowOthers(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	if(g_Config.m_SvShowOthers)
+	{
+		if(pResult->NumArguments())
+			pPlayer->m_ShowOthers = pResult->GetInteger(0);
+		else
+			pPlayer->m_ShowOthers = !pPlayer->m_ShowOthers;
+	}
+	else
+		pSelf->Console()->Print(
+			IConsole::OUTPUT_LEVEL_STANDARD,
+			"chatresp",
+			"Showing players from other teams is disabled");
+}
+
+void CGameContext::ConShowAll(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pResult->NumArguments())
+	{
+		if(pPlayer->m_ShowAll == (bool)pResult->GetInteger(0))
+			return;
+
+		pPlayer->m_ShowAll = pResult->GetInteger(0);
+	}
+	else
+	{
+		pPlayer->m_ShowAll = !pPlayer->m_ShowAll;
+	}
+
+	if(pPlayer->m_ShowAll)
+		pSelf->SendChatTarget(pResult->m_ClientID, "You will now see all tees on this server, no matter the distance");
+	else
+		pSelf->SendChatTarget(pResult->m_ClientID, "You will no longer see all tees on this server");
+}
+
+void CGameContext::ConSpecTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	if(pResult->NumArguments())
+		pPlayer->m_SpecTeam = pResult->GetInteger(0);
+	else
+		pPlayer->m_SpecTeam = !pPlayer->m_SpecTeam;
+}
+
+bool CheckClientID(int ClientID)
+{
+	return ClientID >= 0 && ClientID < MAX_CLIENTS;
+}
+
+void CGameContext::ConSayTime(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	int ClientID;
+	char aBufName[MAX_NAME_LENGTH];
+
+	if(pResult->NumArguments() > 0)
+	{
+		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+				break;
+
+		if(ClientID == MAX_CLIENTS)
+			return;
+
+		str_format(aBufName, sizeof(aBufName), "%s's", pSelf->Server()->ClientName(ClientID));
+	}
+	else
+	{
+		str_copy(aBufName, "Your", sizeof(aBufName));
+		ClientID = pResult->m_ClientID;
+	}
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+	if(pChr->m_DDRaceState != DDRACE_STARTED)
+		return;
+
+	char aBufTime[32];
+	char aBuf[64];
+	int64_t Time = (int64_t)100 * (float)(pSelf->Server()->Tick() - pChr->m_StartTime) / ((float)pSelf->Server()->TickSpeed());
+	str_time(Time, TIME_HOURS, aBufTime, sizeof(aBufTime));
+	str_format(aBuf, sizeof(aBuf), "%s current race time is %s", aBufName, aBufTime);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+}
+
+void CGameContext::ConSayTimeAll(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+	if(pChr->m_DDRaceState != DDRACE_STARTED)
+		return;
+
+	char aBufTime[32];
+	char aBuf[64];
+	int64_t Time = (int64_t)100 * (float)(pSelf->Server()->Tick() - pChr->m_StartTime) / ((float)pSelf->Server()->TickSpeed());
+	const char *pName = pSelf->Server()->ClientName(pResult->m_ClientID);
+	str_time(Time, TIME_HOURS, aBufTime, sizeof(aBufTime));
+	str_format(aBuf, sizeof(aBuf), "%s\'s current race time is %s", pName, aBufTime);
+	pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf, pResult->m_ClientID);
+}
+
+void CGameContext::ConTime(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	char aBufTime[32];
+	char aBuf[64];
+	int64_t Time = (int64_t)100 * (float)(pSelf->Server()->Tick() - pChr->m_StartTime) / ((float)pSelf->Server()->TickSpeed());
+	str_time(Time, TIME_HOURS, aBufTime, sizeof(aBufTime));
+	str_format(aBuf, sizeof(aBuf), "Your time is %s", aBufTime);
+	pSelf->SendBroadcast(aBuf, pResult->m_ClientID);
+}
+
+static const char s_aaMsg[4][128] = {"game/round timer.", "broadcast.", "both game/round timer and broadcast.", "racetime."};
+
+void CGameContext::ConSetTimerType(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	char aBuf[128];
+
+	if(pResult->NumArguments() > 0)
+	{
+		int OldType = pPlayer->m_TimerType;
+		bool Result = false;
+
+		if(str_comp_nocase(pResult->GetString(0), "default") == 0)
+			Result = pPlayer->SetTimerType(CPlayer::TIMERTYPE_DEFAULT);
+		else if(str_comp_nocase(pResult->GetString(0), "gametimer") == 0)
+			Result = pPlayer->SetTimerType(CPlayer::TIMERTYPE_GAMETIMER);
+		else if(str_comp_nocase(pResult->GetString(0), "broadcast") == 0)
+			Result = pPlayer->SetTimerType(CPlayer::TIMERTYPE_BROADCAST);
+		else if(str_comp_nocase(pResult->GetString(0), "both") == 0)
+			Result = pPlayer->SetTimerType(CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST);
+		else if(str_comp_nocase(pResult->GetString(0), "none") == 0)
+			Result = pPlayer->SetTimerType(CPlayer::TIMERTYPE_NONE);
+		else
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Unknown parameter. Accepted values: default, gametimer, broadcast, both, none");
+			return;
+		}
+
+		if(!Result)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", "Selected timertype is not supported by your client");
+			return;
+		}
+
+		if((OldType == CPlayer::TIMERTYPE_BROADCAST || OldType == CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST) && (pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER || pPlayer->m_TimerType == CPlayer::TIMERTYPE_NONE))
+			pSelf->SendBroadcast("", pResult->m_ClientID);
+	}
+
+	if(pPlayer->m_TimerType <= CPlayer::TIMERTYPE_SIXUP && pPlayer->m_TimerType >= CPlayer::TIMERTYPE_GAMETIMER)
+		str_format(aBuf, sizeof(aBuf), "Timer is displayed in %s", s_aaMsg[pPlayer->m_TimerType]);
+	else if(pPlayer->m_TimerType == CPlayer::TIMERTYPE_NONE)
+		str_copy(aBuf, "Timer isn't displayed.");
+
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp", aBuf);
+}
+
+void CGameContext::ConRescue(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!g_Config.m_SvRescue && !Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "Rescue is not enabled on this server and you're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	pChr->Rescue();
+	pChr->UnFreeze();
+}
+
+void CGameContext::ConTele(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	vec2 Pos = pPlayer->m_ViewPos;
+	if(pResult->NumArguments() > 0)
+	{
+		int ClientID;
+		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+		{
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+				break;
+		}
+		if(ClientID == MAX_CLIENTS)
+		{
+			pSelf->SendChatTarget(pPlayer->GetCID(), "No player with this name found.");
+			return;
+		}
+		CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientID];
+		if(!pPlayerTo)
+			return;
+		CCharacter *pChrTo = pPlayerTo->GetCharacter();
+		if(!pChrTo)
+			return;
+		Pos = pChrTo->m_Pos;
+	}
+	pSelf->Teleport(pChr, Pos);
+	pChr->UnFreeze();
+	pChr->Core()->m_Vel = vec2(0, 0);
+	pPlayer->m_LastTeleTee.Save(pChr);
+}
+
+void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	vec2 Pos = pPlayer->m_ViewPos;
+	if(pResult->NumArguments() == 0 && !pPlayer->IsPaused())
+	{
+		Pos += vec2(pChr->Core()->m_Input.m_TargetX, pChr->Core()->m_Input.m_TargetY);
+	}
+	else if(pResult->NumArguments() > 0)
+	{
+		int ClientID;
+		for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
+		{
+			if(str_comp(pResult->GetString(0), pSelf->Server()->ClientName(ClientID)) == 0)
+				break;
+		}
+		if(ClientID == MAX_CLIENTS)
+		{
+			pSelf->SendChatTarget(pPlayer->GetCID(), "No player with this name found.");
+			return;
+		}
+		CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientID];
+		if(!pPlayerTo)
+			return;
+		CCharacter *pChrTo = pPlayerTo->GetCharacter();
+		if(!pChrTo)
+			return;
+		Pos = pChrTo->m_Pos;
+	}
+	pSelf->Teleport(pChr, Pos);
+	pChr->UnFreeze();
+	pChr->Core()->m_Vel = vec2(0, 0);
+	pPlayer->m_LastTeleTee.Save(pChr);
+}
+
+void CGameContext::ConLastTele(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+	if(!pPlayer->m_LastTeleTee.GetPos().x)
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You haven't previously teleported. Use /tp before using this command.");
+		return;
+	}
+	pPlayer->m_LastTeleTee.Load(pChr, pChr->Team(), true);
+	pPlayer->Pause(CPlayer::PAUSE_NONE, true);
+}
+
+void CGameContext::ConPracticeUnSolo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "Command is not available on solo servers");
+		return;
+	}
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	pChr->SetSolo(false);
+}
+
+void CGameContext::ConPracticeUnDeep(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	CGameTeams &Teams = pSelf->m_pController->Teams();
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	if(!Teams.IsPractice(Team))
+	{
+		pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
+		return;
+	}
+
+	pChr->SetDeepFrozen(false);
+	pChr->UnFreeze();
+}
+
+void CGameContext::ConProtectedKill(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	int CurrTime = (pSelf->Server()->Tick() - pChr->m_StartTime) / pSelf->Server()->TickSpeed();
+	if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
+	{
+		pPlayer->KillCharacter(WEAPON_SELF);
+	}
+}
+
+void CGameContext::ConPoints(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(pResult->NumArguments() > 0)
+	{
+		if(!g_Config.m_SvHideScore)
+			pSelf->Score()->ShowPoints(pResult->m_ClientID, pResult->GetString(0));
+		else
+			pSelf->Console()->Print(
+				IConsole::OUTPUT_LEVEL_STANDARD,
+				"chatresp",
+				"Showing the global points of other players is not allowed on this server.");
+	}
+	else
+		pSelf->Score()->ShowPoints(pResult->m_ClientID,
+			pSelf->Server()->ClientName(pResult->m_ClientID));
+}
+
+void CGameContext::ConTopPoints(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvHideScore)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Showing the global top points is not allowed on this server.");
+		return;
+	}
+
+	if(pResult->NumArguments() > 0)
+		pSelf->Score()->ShowTopPoints(pResult->m_ClientID, pResult->GetInteger(0));
+	else
+		pSelf->Score()->ShowTopPoints(pResult->m_ClientID);
+}
+
+void CGameContext::ConTimeCP(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	if(g_Config.m_SvHideScore)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "chatresp",
+			"Showing the checkpoint times is not allowed on this server.");
+		return;
+	}
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	if(!pPlayer)
+		return;
+
+	const char *pName = pResult->GetString(0);
+	pSelf->Score()->LoadPlayerData(pResult->m_ClientID, pName);
+}
diff --git a/src_bkp/game/server/ddracecommands.cpp b/src_bkp/game/server/ddracecommands.cpp
new file mode 100644
index 0000000000..27eacf94e5
--- /dev/null
+++ b/src_bkp/game/server/ddracecommands.cpp
@@ -0,0 +1,938 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "gamecontext.h"
+
+#include <engine/antibot.h>
+
+#include <engine/shared/config.h>
+#include <game/server/entities/character.h>
+#include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
+#include <game/server/save.h>
+#include <game/server/teams.h>
+
+bool CheckClientID(int ClientID);
+
+void CGameContext::ConGoLeft(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, -1 * Tiles, 0);
+}
+
+void CGameContext::ConGoRight(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, Tiles, 0);
+}
+
+void CGameContext::ConGoDown(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, 0, Tiles);
+}
+
+void CGameContext::ConGoUp(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Tiles = pResult->NumArguments() == 1 ? pResult->GetInteger(0) : 1;
+
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, 0, -1 * Tiles);
+}
+
+void CGameContext::ConMove(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, pResult->GetInteger(0),
+		pResult->GetInteger(1));
+}
+
+void CGameContext::ConMoveRaw(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	pSelf->MoveCharacter(pResult->m_ClientID, pResult->GetInteger(0),
+		pResult->GetInteger(1), true);
+}
+
+void CGameContext::MoveCharacter(int ClientID, int X, int Y, bool Raw)
+{
+	CCharacter *pChr = GetPlayerChar(ClientID);
+
+	if(!pChr)
+		return;
+
+	pChr->Core()->m_Pos.x += ((Raw) ? 1 : 32) * X;
+	pChr->Core()->m_Pos.y += ((Raw) ? 1 : 32) * Y;
+	pChr->m_DDRaceState = DDRACE_CHEAT;
+}
+
+void CGameContext::ConKillPlayer(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	int Victim = pResult->GetVictim();
+
+	if(pSelf->m_apPlayers[Victim])
+	{
+		pSelf->m_apPlayers[Victim]->KillCharacter(WEAPON_GAME);
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "%s was killed by %s",
+			pSelf->Server()->ClientName(Victim),
+			pSelf->Server()->ClientName(pResult->m_ClientID));
+		pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+	}
+}
+
+void CGameContext::ConNinja(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_NINJA, false);
+}
+
+void CGameContext::ConUnNinja(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_NINJA, true);
+}
+
+void CGameContext::ConEndlessHook(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+	{
+		pChr->SetEndlessHook(true);
+	}
+}
+
+void CGameContext::ConUnEndlessHook(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+	{
+		pChr->SetEndlessHook(false);
+	}
+}
+
+void CGameContext::ConSuper(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr && !pChr->IsSuper())
+	{
+		pChr->SetSuper(true);
+		pChr->UnFreeze();
+	}
+}
+
+void CGameContext::ConUnSuper(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr && pChr->IsSuper())
+	{
+		pChr->SetSuper(false);
+	}
+}
+
+void CGameContext::ConSolo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetSolo(true);
+}
+
+void CGameContext::ConUnSolo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetSolo(false);
+}
+
+void CGameContext::ConFreeze(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->Freeze();
+}
+
+void CGameContext::ConUnFreeze(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->UnFreeze();
+}
+
+void CGameContext::ConDeep(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetDeepFrozen(true);
+}
+
+void CGameContext::ConUnDeep(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetDeepFrozen(false);
+}
+
+void CGameContext::ConLiveFreeze(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetLiveFrozen(true);
+}
+
+void CGameContext::ConUnLiveFreeze(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetLiveFrozen(false);
+}
+
+void CGameContext::ConShotgun(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_SHOTGUN, false);
+}
+
+void CGameContext::ConGrenade(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_GRENADE, false);
+}
+
+void CGameContext::ConLaser(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_LASER, false);
+}
+
+void CGameContext::ConJetpack(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetJetpack(true);
+}
+
+void CGameContext::ConWeapons(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, -1, false);
+}
+
+void CGameContext::ConUnShotgun(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_SHOTGUN, true);
+}
+
+void CGameContext::ConUnGrenade(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_GRENADE, true);
+}
+
+void CGameContext::ConUnLaser(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, WEAPON_LASER, true);
+}
+
+void CGameContext::ConUnJetpack(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+	if(pChr)
+		pChr->SetJetpack(false);
+}
+
+void CGameContext::ConUnWeapons(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, -1, true);
+}
+
+void CGameContext::ConAddWeapon(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, pResult->GetInteger(0), false);
+}
+
+void CGameContext::ConRemoveWeapon(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->ModifyWeapons(pResult, pUserData, pResult->GetInteger(0), true);
+}
+
+void CGameContext::ModifyWeapons(IConsole::IResult *pResult, void *pUserData,
+	int Weapon, bool Remove)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CCharacter *pChr = GetPlayerChar(pResult->m_ClientID);
+	if(!pChr)
+		return;
+
+	if(clamp(Weapon, -1, NUM_WEAPONS - 1) != Weapon)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "info",
+			"invalid weapon id");
+		return;
+	}
+
+	if(Weapon == -1)
+	{
+		pChr->GiveWeapon(WEAPON_SHOTGUN, Remove);
+		pChr->GiveWeapon(WEAPON_GRENADE, Remove);
+		pChr->GiveWeapon(WEAPON_LASER, Remove);
+	}
+	else
+	{
+		pChr->GiveWeapon(Weapon, Remove);
+	}
+
+	pChr->m_DDRaceState = DDRACE_CHEAT;
+}
+
+void CGameContext::Teleport(CCharacter *pChr, vec2 Pos)
+{
+	pChr->Core()->m_Pos = Pos;
+	pChr->m_Pos = Pos;
+	pChr->m_PrevPos = Pos;
+	pChr->m_DDRaceState = DDRACE_CHEAT;
+}
+
+void CGameContext::ConToTeleporter(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	unsigned int TeleTo = pResult->GetInteger(0);
+
+	if(!pSelf->m_pController->m_TeleOuts[TeleTo - 1].empty())
+	{
+		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+		if(pChr)
+		{
+			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->m_pController->m_TeleOuts[TeleTo - 1].size());
+			pSelf->Teleport(pChr, pSelf->m_pController->m_TeleOuts[TeleTo - 1][TeleOut]);
+		}
+	}
+}
+
+void CGameContext::ConToCheckTeleporter(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	unsigned int TeleTo = pResult->GetInteger(0);
+
+	if(!pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1].empty())
+	{
+		CCharacter *pChr = pSelf->GetPlayerChar(pResult->m_ClientID);
+		if(pChr)
+		{
+			int TeleOut = pSelf->m_World.m_Core.RandomOr0(pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1].size());
+			pSelf->Teleport(pChr, pSelf->m_pController->m_TeleCheckOuts[TeleTo - 1][TeleOut]);
+			pChr->m_TeleCheckpoint = TeleTo;
+		}
+	}
+}
+
+void CGameContext::ConTeleport(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Tele = pResult->NumArguments() == 2 ? pResult->GetInteger(0) : pResult->m_ClientID;
+	int TeleTo = pResult->NumArguments() ? pResult->GetInteger(pResult->NumArguments() - 1) : pResult->m_ClientID;
+	int AuthLevel = pSelf->Server()->GetAuthedState(pResult->m_ClientID);
+
+	if(Tele != pResult->m_ClientID && AuthLevel < g_Config.m_SvTeleOthersAuthLevel)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tele", "you aren't allowed to tele others");
+		return;
+	}
+
+	CCharacter *pChr = pSelf->GetPlayerChar(Tele);
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+
+	if(pChr && pPlayer && pSelf->GetPlayerChar(TeleTo))
+	{
+		vec2 Pos = pSelf->m_apPlayers[TeleTo]->m_ViewPos;
+		if(!pPlayer->IsPaused() && !pResult->NumArguments())
+		{
+			Pos += vec2(pChr->Core()->m_Input.m_TargetX, pChr->Core()->m_Input.m_TargetY);
+		}
+		pSelf->Teleport(pChr, Pos);
+		pChr->UnFreeze();
+		pChr->Core()->m_Vel = vec2(0, 0);
+	}
+}
+
+void CGameContext::ConKill(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+
+	if(!pPlayer || (pPlayer->m_LastKill && pPlayer->m_LastKill + pSelf->Server()->TickSpeed() * g_Config.m_SvKillDelay > pSelf->Server()->Tick()))
+		return;
+
+	pPlayer->m_LastKill = pSelf->Server()->Tick();
+	pPlayer->KillCharacter(WEAPON_SELF);
+}
+
+void CGameContext::ConForcePause(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+	int Seconds = 0;
+	if(pResult->NumArguments() > 1)
+		Seconds = clamp(pResult->GetInteger(1), 0, 360);
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[Victim];
+	if(!pPlayer)
+		return;
+
+	pPlayer->ForcePause(Seconds);
+}
+
+bool CGameContext::TryVoteMute(const NETADDR *pAddr, int Secs, const char *pReason)
+{
+	// find a matching vote mute for this ip, update expiration time if found
+	for(int i = 0; i < m_NumVoteMutes; i++)
+	{
+		if(net_addr_comp_noport(&m_aVoteMutes[i].m_Addr, pAddr) == 0)
+		{
+			m_aVoteMutes[i].m_Expire = Server()->Tick() + Secs * Server()->TickSpeed();
+			str_copy(m_aVoteMutes[i].m_aReason, pReason, sizeof(m_aVoteMutes[i].m_aReason));
+			return true;
+		}
+	}
+
+	// nothing to update create new one
+	if(m_NumVoteMutes < MAX_VOTE_MUTES)
+	{
+		m_aVoteMutes[m_NumVoteMutes].m_Addr = *pAddr;
+		m_aVoteMutes[m_NumVoteMutes].m_Expire = Server()->Tick() + Secs * Server()->TickSpeed();
+		str_copy(m_aVoteMutes[m_NumVoteMutes].m_aReason, pReason, sizeof(m_aVoteMutes[m_NumVoteMutes].m_aReason));
+		m_NumVoteMutes++;
+		return true;
+	}
+	// no free slot found
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemute", "vote mute array is full");
+	return false;
+}
+
+void CGameContext::VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedID)
+{
+	if(!TryVoteMute(pAddr, Secs, pReason))
+		return;
+	if(!pDisplayName)
+		return;
+
+	char aBuf[128];
+	if(pReason[0])
+		str_format(aBuf, sizeof(aBuf), "'%s' banned '%s' for %d seconds from voting (%s)",
+			Server()->ClientName(AuthedID), pDisplayName, Secs, pReason);
+	else
+		str_format(aBuf, sizeof(aBuf), "'%s' banned '%s' for %d seconds from voting",
+			Server()->ClientName(AuthedID), pDisplayName, Secs);
+	SendChat(-1, CHAT_ALL, aBuf);
+}
+
+bool CGameContext::VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedID)
+{
+	for(int i = 0; i < m_NumVoteMutes; i++)
+	{
+		if(net_addr_comp_noport(&m_aVoteMutes[i].m_Addr, pAddr) == 0)
+		{
+			m_NumVoteMutes--;
+			m_aVoteMutes[i] = m_aVoteMutes[m_NumVoteMutes];
+			if(pDisplayName)
+			{
+				char aBuf[128];
+				str_format(aBuf, sizeof(aBuf), "'%s' unbanned '%s' from voting.",
+					Server()->ClientName(AuthedID), pDisplayName);
+				Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "voteunmute", aBuf);
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CGameContext::TryMute(const NETADDR *pAddr, int Secs, const char *pReason, bool InitialChatDelay)
+{
+	// find a matching mute for this ip, update expiration time if found
+	for(int i = 0; i < m_NumMutes; i++)
+	{
+		if(net_addr_comp_noport(&m_aMutes[i].m_Addr, pAddr) == 0)
+		{
+			const int NewExpire = Server()->Tick() + Secs * Server()->TickSpeed();
+			if(NewExpire > m_aMutes[i].m_Expire)
+			{
+				m_aMutes[i].m_Expire = NewExpire;
+				str_copy(m_aMutes[i].m_aReason, pReason, sizeof(m_aMutes[i].m_aReason));
+				m_aMutes[i].m_InitialChatDelay = InitialChatDelay;
+			}
+			return true;
+		}
+	}
+
+	// nothing to update create new one
+	if(m_NumMutes < MAX_MUTES)
+	{
+		m_aMutes[m_NumMutes].m_Addr = *pAddr;
+		m_aMutes[m_NumMutes].m_Expire = Server()->Tick() + Secs * Server()->TickSpeed();
+		str_copy(m_aMutes[m_NumMutes].m_aReason, pReason, sizeof(m_aMutes[m_NumMutes].m_aReason));
+		m_aMutes[m_NumMutes].m_InitialChatDelay = InitialChatDelay;
+		m_NumMutes++;
+		return true;
+	}
+	// no free slot found
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes", "mute array is full");
+	return false;
+}
+
+void CGameContext::Mute(const NETADDR *pAddr, int Secs, const char *pDisplayName, const char *pReason, bool InitialChatDelay)
+{
+	if(Secs <= 0)
+		return;
+	if(!TryMute(pAddr, Secs, pReason, InitialChatDelay))
+		return;
+	if(InitialChatDelay)
+		return;
+	if(!pDisplayName)
+		return;
+
+	char aBuf[128];
+	if(pReason[0])
+		str_format(aBuf, sizeof(aBuf), "'%s' has been muted for %d seconds (%s)", pDisplayName, Secs, pReason);
+	else
+		str_format(aBuf, sizeof(aBuf), "'%s' has been muted for %d seconds", pDisplayName, Secs);
+	SendChat(-1, CHAT_ALL, aBuf);
+}
+
+void CGameContext::ConVoteMute(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	if(Victim < 0 || Victim > MAX_CLIENTS || !pSelf->m_apPlayers[Victim])
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemute", "Client ID not found");
+		return;
+	}
+
+	NETADDR Addr;
+	pSelf->Server()->GetClientAddr(Victim, &Addr);
+
+	int Seconds = clamp(pResult->GetInteger(1), 1, 86400);
+	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "";
+	pSelf->VoteMute(&Addr, Seconds, pReason, pSelf->Server()->ClientName(Victim), pResult->m_ClientID);
+}
+
+void CGameContext::ConVoteUnmute(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	if(Victim < 0 || Victim > MAX_CLIENTS || !pSelf->m_apPlayers[Victim])
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "voteunmute", "Client ID not found");
+		return;
+	}
+
+	NETADDR Addr;
+	pSelf->Server()->GetClientAddr(Victim, &Addr);
+
+	bool Found = pSelf->VoteUnmute(&Addr, pSelf->Server()->ClientName(Victim), pResult->m_ClientID);
+	if(Found)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "'%s' unbanned '%s' from voting.",
+			pSelf->Server()->ClientName(pResult->m_ClientID), pSelf->Server()->ClientName(Victim));
+		pSelf->SendChat(-1, 0, aBuf);
+	}
+}
+
+void CGameContext::ConVoteMutes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(pSelf->m_NumVoteMutes <= 0)
+	{
+		// Just to make sure.
+		pSelf->m_NumVoteMutes = 0;
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemutes",
+			"There are no active vote mutes.");
+		return;
+	}
+
+	char aIpBuf[64];
+	char aBuf[128];
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemutes",
+		"Active vote mutes:");
+	for(int i = 0; i < pSelf->m_NumVoteMutes; i++)
+	{
+		net_addr_str(&pSelf->m_aVoteMutes[i].m_Addr, aIpBuf, sizeof(aIpBuf), false);
+		str_format(aBuf, sizeof(aBuf), "%d: \"%s\", %d seconds left (%s)", i,
+			aIpBuf, (pSelf->m_aVoteMutes[i].m_Expire - pSelf->Server()->Tick()) / pSelf->Server()->TickSpeed(), pSelf->m_aVoteMutes[i].m_aReason);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemutes", aBuf);
+	}
+}
+
+void CGameContext::ConMute(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->Console()->Print(
+		IConsole::OUTPUT_LEVEL_STANDARD,
+		"mutes",
+		"Use either 'muteid <client_id> <seconds> <reason>' or 'muteip <ip> <seconds> <reason>'");
+}
+
+// mute through client id
+void CGameContext::ConMuteID(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	if(Victim < 0 || Victim > MAX_CLIENTS || !pSelf->m_apPlayers[Victim])
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "muteid", "Client id not found.");
+		return;
+	}
+
+	NETADDR Addr;
+	pSelf->Server()->GetClientAddr(Victim, &Addr);
+
+	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "";
+
+	pSelf->Mute(&Addr, clamp(pResult->GetInteger(1), 1, 86400),
+		pSelf->Server()->ClientName(Victim), pReason);
+}
+
+// mute through ip, arguments reversed to workaround parsing
+void CGameContext::ConMuteIP(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	NETADDR Addr;
+	if(net_addr_from_str(&Addr, pResult->GetString(0)))
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes",
+			"Invalid network address to mute");
+	}
+	const char *pReason = pResult->NumArguments() > 2 ? pResult->GetString(2) : "";
+	pSelf->Mute(&Addr, clamp(pResult->GetInteger(1), 1, 86400), NULL, pReason);
+}
+
+// unmute by mute list index
+void CGameContext::ConUnmute(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Index = pResult->GetInteger(0);
+
+	if(Index < 0 || Index >= pSelf->m_NumMutes)
+		return;
+
+	char aIpBuf[64];
+	char aBuf[64];
+	net_addr_str(&pSelf->m_aMutes[Index].m_Addr, aIpBuf, sizeof(aIpBuf), false);
+	str_format(aBuf, sizeof(aBuf), "Unmuted %s", aIpBuf);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes", aBuf);
+
+	pSelf->m_NumMutes--;
+	pSelf->m_aMutes[Index] = pSelf->m_aMutes[pSelf->m_NumMutes];
+}
+
+// unmute by player id
+void CGameContext::ConUnmuteID(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	if(Victim < 0 || Victim > MAX_CLIENTS || !pSelf->m_apPlayers[Victim])
+		return;
+
+	NETADDR Addr;
+	pSelf->Server()->GetClientAddr(Victim, &Addr);
+
+	for(int i = 0; i < pSelf->m_NumMutes; i++)
+	{
+		if(net_addr_comp_noport(&pSelf->m_aMutes[i].m_Addr, &Addr) == 0)
+		{
+			char aIpBuf[64];
+			char aBuf[64];
+			net_addr_str(&pSelf->m_aMutes[i].m_Addr, aIpBuf, sizeof(aIpBuf), false);
+			str_format(aBuf, sizeof(aBuf), "Unmuted %s", aIpBuf);
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes", aBuf);
+			pSelf->m_NumMutes--;
+			pSelf->m_aMutes[i] = pSelf->m_aMutes[pSelf->m_NumMutes];
+			return;
+		}
+	}
+}
+
+// list mutes
+void CGameContext::ConMutes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(pSelf->m_NumMutes <= 0)
+	{
+		// Just to make sure.
+		pSelf->m_NumMutes = 0;
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes",
+			"There are no active mutes.");
+		return;
+	}
+
+	char aIpBuf[64];
+	char aBuf[128];
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes",
+		"Active mutes:");
+	for(int i = 0; i < pSelf->m_NumMutes; i++)
+	{
+		net_addr_str(&pSelf->m_aMutes[i].m_Addr, aIpBuf, sizeof(aIpBuf), false);
+		str_format(aBuf, sizeof(aBuf), "%d: \"%s\", %d seconds left (%s)", i, aIpBuf,
+			(pSelf->m_aMutes[i].m_Expire - pSelf->Server()->Tick()) / pSelf->Server()->TickSpeed(), pSelf->m_aMutes[i].m_aReason);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mutes", aBuf);
+	}
+}
+
+void CGameContext::ConModerate(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(!CheckClientID(pResult->m_ClientID))
+		return;
+
+	bool HadModerator = pSelf->PlayerModerating();
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+	pPlayer->m_Moderating = !pPlayer->m_Moderating;
+
+	if(!HadModerator && pPlayer->m_Moderating)
+		pSelf->SendChat(-1, CHAT_ALL, "Server kick/spec votes will now be actively moderated.", 0);
+
+	if(!pSelf->PlayerModerating())
+		pSelf->SendChat(-1, CHAT_ALL, "Server kick/spec votes are no longer actively moderated.", 0);
+
+	if(pPlayer->m_Moderating)
+		pSelf->SendChatTarget(pResult->m_ClientID, "Active moderator mode enabled for you.");
+	else
+		pSelf->SendChatTarget(pResult->m_ClientID, "Active moderator mode disabled for you.");
+}
+
+void CGameContext::ConSetDDRTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pController = pSelf->m_pController;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORBIDDEN || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "join",
+			"Teams are disabled");
+		return;
+	}
+
+	int Target = pResult->GetVictim();
+	int Team = pResult->GetInteger(1);
+
+	if(Team < TEAM_FLOCK || Team >= TEAM_SUPER)
+		return;
+
+	CCharacter *pChr = pSelf->GetPlayerChar(Target);
+
+	if((pSelf->GetDDRaceTeam(Target) && pController->Teams().GetDDRaceState(pSelf->m_apPlayers[Target]) == DDRACE_STARTED) || (pChr && pController->Teams().IsPractice(pChr->Team())))
+		pSelf->m_apPlayers[Target]->KillCharacter(WEAPON_GAME);
+
+	pController->Teams().SetForceCharacterTeam(Target, Team);
+}
+
+void CGameContext::ConUninvite(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	auto *pController = pSelf->m_pController;
+
+	pController->Teams().SetClientInvited(pResult->GetInteger(1), pResult->GetVictim(), false);
+}
+
+void CGameContext::ConFreezeHammer(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	CCharacter *pChr = pSelf->GetPlayerChar(Victim);
+
+	if(!pChr)
+		return;
+
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "'%s' got freeze hammer!",
+		pSelf->Server()->ClientName(Victim));
+	pSelf->SendChat(-1, CHAT_ALL, aBuf);
+
+	pChr->m_FreezeHammer = true;
+}
+
+void CGameContext::ConUnFreezeHammer(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Victim = pResult->GetVictim();
+
+	CCharacter *pChr = pSelf->GetPlayerChar(Victim);
+
+	if(!pChr)
+		return;
+
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "'%s' lost freeze hammer!",
+		pSelf->Server()->ClientName(Victim));
+	pSelf->SendChat(-1, CHAT_ALL, aBuf);
+
+	pChr->m_FreezeHammer = false;
+}
+void CGameContext::ConVoteNo(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	pSelf->ForceVote(pResult->m_ClientID, false);
+}
+
+void CGameContext::ConDrySave(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
+
+	if(!pPlayer || pSelf->Server()->GetAuthedState(pResult->m_ClientID) != AUTHED_ADMIN)
+		return;
+
+	CSaveTeam SavedTeam;
+	int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
+	int Result = SavedTeam.Save(pSelf, Team, true);
+	if(CSaveTeam::HandleSaveError(Result, pResult->m_ClientID, pSelf))
+		return;
+
+	char aTimestamp[32];
+	str_timestamp(aTimestamp, sizeof(aTimestamp));
+	char aBuf[64];
+	str_format(aBuf, sizeof(aBuf), "%s_%s_%s.save", pSelf->Server()->GetMapName(), aTimestamp, pSelf->Server()->GetAuthName(pResult->m_ClientID));
+	IOHANDLE File = pSelf->Storage()->OpenFile(aBuf, IOFLAG_WRITE, IStorage::TYPE_ALL);
+	if(!File)
+		return;
+
+	int Len = str_length(SavedTeam.GetString());
+	io_write(File, SavedTeam.GetString(), Len);
+	io_close(File);
+}
+
+void CGameContext::ConDumpAntibot(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->Antibot()->ConsoleCommand("dump");
+}
+
+void CGameContext::ConAntibot(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->Antibot()->ConsoleCommand(pResult->GetString(0));
+}
+
+void CGameContext::ConDumpLog(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int LimitSecs = MAX_LOG_SECONDS;
+	if(pResult->NumArguments() > 0)
+		LimitSecs = pResult->GetInteger(0);
+
+	if(LimitSecs < 0)
+		return;
+
+	int Iterator = pSelf->m_LatestLog;
+	for(int i = 0; i < MAX_LOGS; i++)
+	{
+		CLog *pEntry = &pSelf->m_aLogs[Iterator];
+		Iterator = (Iterator + 1) % MAX_LOGS;
+
+		if(!pEntry->m_Timestamp)
+			continue;
+
+		int Seconds = (time_get() - pEntry->m_Timestamp) / time_freq();
+		if(Seconds > LimitSecs)
+			continue;
+
+		char aBuf[256];
+		if(pEntry->m_FromServer)
+			str_format(aBuf, sizeof(aBuf), "%s, %d seconds ago", pEntry->m_aDescription, Seconds);
+		else
+			str_format(aBuf, sizeof(aBuf), "%s, %d seconds ago < addr=<{%s}> name='%s' client=%d",
+				pEntry->m_aDescription, Seconds, pEntry->m_aClientAddrStr, pEntry->m_aClientName, pEntry->m_ClientVersion);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "log", aBuf);
+	}
+}
+
+void CGameContext::LogEvent(const char *Description, int ClientID)
+{
+	CLog *pNewEntry = &m_aLogs[m_LatestLog];
+	m_LatestLog = (m_LatestLog + 1) % MAX_LOGS;
+
+	pNewEntry->m_Timestamp = time_get();
+	str_copy(pNewEntry->m_aDescription, Description);
+	pNewEntry->m_FromServer = ClientID < 0;
+	if(!pNewEntry->m_FromServer)
+	{
+		pNewEntry->m_ClientVersion = Server()->GetClientVersion(ClientID);
+		Server()->GetClientAddr(ClientID, pNewEntry->m_aClientAddrStr, sizeof(pNewEntry->m_aClientAddrStr));
+		str_copy(pNewEntry->m_aClientName, Server()->ClientName(ClientID));
+	}
+}
diff --git a/src_bkp/game/server/entities/character.cpp b/src_bkp/game/server/entities/character.cpp
new file mode 100644
index 0000000000..1c0c5a1ae4
--- /dev/null
+++ b/src_bkp/game/server/entities/character.cpp
@@ -0,0 +1,2360 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "character.h"
+#include "laser.h"
+#include "pickup.h"
+#include "projectile.h"
+
+#include <antibot/antibot_data.h>
+
+#include <engine/antibot.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/generated/server_data.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/gamecontroller.h>
+#include <game/server/player.h>
+#include <game/server/score.h>
+#include <game/server/teams.h>
+
+MACRO_ALLOC_POOL_ID_IMPL(CCharacter, MAX_CLIENTS)
+
+// Character, "physical" player's part
+CCharacter::CCharacter(CGameWorld *pWorld, CNetObj_PlayerInput LastInput) :
+	CEntity(pWorld, CGameWorld::ENTTYPE_CHARACTER, vec2(0, 0), CCharacterCore::PhysicalSize())
+{
+	m_Health = 0;
+	m_Armor = 0;
+	m_StrongWeakID = 0;
+
+	m_Input = LastInput;
+	// never initialize both to zero
+	m_Input.m_TargetX = 0;
+	m_Input.m_TargetY = -1;
+
+	m_LatestPrevPrevInput = m_LatestPrevInput = m_LatestInput = m_PrevInput = m_SavedInput = m_Input;
+
+	m_LastTimeCp = -1;
+	m_LastTimeCpBroadcasted = -1;
+	for(float &CurrentTimeCp : m_aCurrentTimeCp)
+	{
+		CurrentTimeCp = 0.0f;
+	}
+}
+
+void CCharacter::Reset()
+{
+	Destroy();
+}
+
+bool CCharacter::Spawn(CPlayer *pPlayer, vec2 Pos)
+{
+	m_EmoteStop = -1;
+	m_LastAction = -1;
+	m_LastNoAmmoSound = -1;
+	m_LastWeapon = WEAPON_HAMMER;
+	m_QueuedWeapon = -1;
+	m_LastRefillJumps = false;
+	m_LastPenalty = false;
+	m_LastBonus = false;
+
+	m_TeleGunTeleport = false;
+	m_IsBlueTeleGunTeleport = false;
+
+	m_pPlayer = pPlayer;
+	m_Pos = Pos;
+
+	mem_zero(&m_LatestPrevPrevInput, sizeof(m_LatestPrevPrevInput));
+	m_LatestPrevPrevInput.m_TargetY = -1;
+	m_NumInputs = 0;
+	m_SpawnTick = Server()->Tick();
+	m_WeaponChangeTick = Server()->Tick();
+	Antibot()->OnSpawn(m_pPlayer->GetCID());
+
+	m_Core.Reset();
+	m_Core.Init(&GameServer()->m_World.m_Core, Collision());
+	m_Core.m_ActiveWeapon = WEAPON_GUN;
+	m_Core.m_Pos = m_Pos;
+	m_Core.m_Id = m_pPlayer->GetCID();
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = &m_Core;
+
+	m_ReckoningTick = 0;
+	m_SendCore = CCharacterCore();
+	m_ReckoningCore = CCharacterCore();
+
+	GameServer()->m_World.InsertEntity(this);
+	m_Alive = true;
+
+	GameServer()->m_pController->OnCharacterSpawn(this);
+
+	DDRaceInit();
+
+	m_TuneZone = Collision()->IsTune(Collision()->GetMapIndex(Pos));
+	m_TuneZoneOld = -1; // no zone leave msg on spawn
+	m_NeededFaketuning = 0; // reset fake tunings on respawn and send the client
+	SendZoneMsgs(); // we want a entermessage also on spawn
+	GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone);
+
+	Server()->StartRecord(m_pPlayer->GetCID());
+
+	return true;
+}
+
+void CCharacter::Destroy()
+{
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
+	m_Alive = false;
+	SetSolo(false);
+}
+
+void CCharacter::SetWeapon(int W)
+{
+	if(W == m_Core.m_ActiveWeapon)
+		return;
+
+	m_LastWeapon = m_Core.m_ActiveWeapon;
+	m_QueuedWeapon = -1;
+	m_Core.m_ActiveWeapon = W;
+	GameServer()->CreateSound(m_Pos, SOUND_WEAPON_SWITCH, TeamMask());
+
+	if(m_Core.m_ActiveWeapon < 0 || m_Core.m_ActiveWeapon >= NUM_WEAPONS)
+		m_Core.m_ActiveWeapon = 0;
+}
+
+void CCharacter::SetJetpack(bool Active)
+{
+	m_Core.m_Jetpack = Active;
+}
+
+void CCharacter::SetSolo(bool Solo)
+{
+	m_Core.m_Solo = Solo;
+	Teams()->m_Core.SetSolo(m_pPlayer->GetCID(), Solo);
+}
+
+void CCharacter::SetSuper(bool Super)
+{
+	m_Core.m_Super = Super;
+	if(Super)
+	{
+		m_TeamBeforeSuper = Team();
+		Teams()->SetCharacterTeam(GetPlayer()->GetCID(), TEAM_SUPER);
+		m_DDRaceState = DDRACE_CHEAT;
+	}
+	else
+	{
+		Teams()->SetForceCharacterTeam(GetPlayer()->GetCID(), m_TeamBeforeSuper);
+	}
+}
+
+void CCharacter::SetLiveFrozen(bool Active)
+{
+	m_Core.m_LiveFrozen = Active;
+}
+
+void CCharacter::SetDeepFrozen(bool Active)
+{
+	m_Core.m_DeepFrozen = Active;
+}
+
+bool CCharacter::IsGrounded()
+{
+	if(Collision()->CheckPoint(m_Pos.x + GetProximityRadius() / 2, m_Pos.y + GetProximityRadius() / 2 + 5))
+		return true;
+	if(Collision()->CheckPoint(m_Pos.x - GetProximityRadius() / 2, m_Pos.y + GetProximityRadius() / 2 + 5))
+		return true;
+
+	int MoveRestrictionsBelow = Collision()->GetMoveRestrictions(m_Pos + vec2(0, GetProximityRadius() / 2 + 4), 0.0f);
+	return (MoveRestrictionsBelow & CANTMOVE_DOWN) != 0;
+}
+
+void CCharacter::HandleJetpack()
+{
+	vec2 Direction = normalize(vec2(m_LatestInput.m_TargetX, m_LatestInput.m_TargetY));
+
+	bool FullAuto = false;
+	if(m_Core.m_ActiveWeapon == WEAPON_GRENADE || m_Core.m_ActiveWeapon == WEAPON_SHOTGUN || m_Core.m_ActiveWeapon == WEAPON_LASER)
+		FullAuto = true;
+	if(m_Core.m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
+		FullAuto = true;
+
+	// check if we gonna fire
+	bool WillFire = false;
+	if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
+		WillFire = true;
+
+	if(FullAuto && (m_LatestInput.m_Fire & 1) && m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
+		WillFire = true;
+
+	if(!WillFire)
+		return;
+
+	// check for ammo
+	if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo || m_FreezeTime)
+	{
+		return;
+	}
+
+	switch(m_Core.m_ActiveWeapon)
+	{
+	case WEAPON_GUN:
+	{
+		if(m_Core.m_Jetpack)
+		{
+			float Strength;
+			if(!m_TuneZone)
+				Strength = Tuning()->m_JetpackStrength;
+			else
+				Strength = TuningList()[m_TuneZone].m_JetpackStrength;
+			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
+		}
+	}
+	}
+}
+
+void CCharacter::HandleNinja()
+{
+	if(m_Core.m_ActiveWeapon != WEAPON_NINJA)
+		return;
+
+	if((Server()->Tick() - m_Core.m_Ninja.m_ActivationTick) > (g_pData->m_Weapons.m_Ninja.m_Duration * Server()->TickSpeed() / 1000))
+	{
+		// time's up, return
+		RemoveNinja();
+		return;
+	}
+
+	int NinjaTime = m_Core.m_Ninja.m_ActivationTick + (g_pData->m_Weapons.m_Ninja.m_Duration * Server()->TickSpeed() / 1000) - Server()->Tick();
+
+	if(NinjaTime % Server()->TickSpeed() == 0 && NinjaTime / Server()->TickSpeed() <= 5)
+	{
+		GameServer()->CreateDamageInd(m_Pos, 0, NinjaTime / Server()->TickSpeed(), TeamMask() & GameServer()->ClientsMaskExcludeClientVersionAndHigher(VERSION_DDNET_NEW_HUD));
+	}
+
+	m_Armor = clamp(10 - (NinjaTime / 15), 0, 10);
+
+	// force ninja Weapon
+	SetWeapon(WEAPON_NINJA);
+
+	m_Core.m_Ninja.m_CurrentMoveTime--;
+
+	if(m_Core.m_Ninja.m_CurrentMoveTime == 0)
+	{
+		// reset velocity
+		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * m_Core.m_Ninja.m_OldVelAmount;
+	}
+
+	if(m_Core.m_Ninja.m_CurrentMoveTime > 0)
+	{
+		// Set velocity
+		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * g_pData->m_Weapons.m_Ninja.m_Velocity;
+		vec2 OldPos = m_Pos;
+		vec2 GroundElasticity;
+
+		if(!m_TuneZone)
+			GroundElasticity = vec2(Tuning()->m_GroundElasticityX, Tuning()->m_GroundElasticityY);
+		else
+			GroundElasticity = vec2(TuningList()[m_TuneZone].m_GroundElasticityX, TuningList()[m_TuneZone].m_GroundElasticityY);
+
+		Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(GetProximityRadius(), GetProximityRadius()), GroundElasticity);
+
+		// reset velocity so the client doesn't predict stuff
+		m_Core.m_Vel = vec2(0.f, 0.f);
+
+		// check if we Hit anything along the way
+		{
+			CEntity *apEnts[MAX_CLIENTS];
+			float Radius = GetProximityRadius() * 2.0f;
+			int Num = GameServer()->m_World.FindEntities(OldPos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+			// check that we're not in solo part
+			if(Teams()->m_Core.GetSolo(m_pPlayer->GetCID()))
+				return;
+
+			for(int i = 0; i < Num; ++i)
+			{
+				auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+				if(pChr == this)
+					continue;
+
+				// Don't hit players in other teams
+				if(Team() != pChr->Team())
+					continue;
+
+				// Don't hit players in solo parts
+				if(Teams()->m_Core.GetSolo(pChr->m_pPlayer->GetCID()))
+					return;
+
+				// make sure we haven't Hit this object before
+				bool bAlreadyHit = false;
+				for(int j = 0; j < m_NumObjectsHit; j++)
+				{
+					if(m_apHitObjects[j] == pChr)
+						bAlreadyHit = true;
+				}
+				if(bAlreadyHit)
+					continue;
+
+				// check so we are sufficiently close
+				if(distance(pChr->m_Pos, m_Pos) > (GetProximityRadius() * 2.0f))
+					continue;
+
+				// Hit a player, give them damage and stuffs...
+				GameServer()->CreateSound(pChr->m_Pos, SOUND_NINJA_HIT, TeamMask());
+				// set his velocity to fast upward (for now)
+				if(m_NumObjectsHit < 10)
+					m_apHitObjects[m_NumObjectsHit++] = pChr;
+
+				pChr->TakeDamage(vec2(0, -10.0f), g_pData->m_Weapons.m_Ninja.m_pBase->m_Damage, m_pPlayer->GetCID(), WEAPON_NINJA);
+			}
+		}
+
+		return;
+	}
+}
+
+void CCharacter::DoWeaponSwitch()
+{
+	// make sure we can switch
+	if(m_ReloadTimer != 0 || m_QueuedWeapon == -1 || m_Core.m_aWeapons[WEAPON_NINJA].m_Got || !m_Core.m_aWeapons[m_QueuedWeapon].m_Got)
+		return;
+
+	// switch Weapon
+	SetWeapon(m_QueuedWeapon);
+}
+
+void CCharacter::HandleWeaponSwitch()
+{
+	int WantedWeapon = m_Core.m_ActiveWeapon;
+	if(m_QueuedWeapon != -1)
+		WantedWeapon = m_QueuedWeapon;
+
+	bool Anything = false;
+	for(int i = 0; i < NUM_WEAPONS - 1; ++i)
+		if(m_Core.m_aWeapons[i].m_Got)
+			Anything = true;
+	if(!Anything)
+		return;
+	// select Weapon
+	int Next = CountInput(m_LatestPrevInput.m_NextWeapon, m_LatestInput.m_NextWeapon).m_Presses;
+	int Prev = CountInput(m_LatestPrevInput.m_PrevWeapon, m_LatestInput.m_PrevWeapon).m_Presses;
+
+	if(Next < 128) // make sure we only try sane stuff
+	{
+		while(Next) // Next Weapon selection
+		{
+			WantedWeapon = (WantedWeapon + 1) % NUM_WEAPONS;
+			if(m_Core.m_aWeapons[WantedWeapon].m_Got)
+				Next--;
+		}
+	}
+
+	if(Prev < 128) // make sure we only try sane stuff
+	{
+		while(Prev) // Prev Weapon selection
+		{
+			WantedWeapon = (WantedWeapon - 1) < 0 ? NUM_WEAPONS - 1 : WantedWeapon - 1;
+			if(m_Core.m_aWeapons[WantedWeapon].m_Got)
+				Prev--;
+		}
+	}
+
+	// Direct Weapon selection
+	if(m_LatestInput.m_WantedWeapon)
+		WantedWeapon = m_Input.m_WantedWeapon - 1;
+
+	// check for insane values
+	if(WantedWeapon >= 0 && WantedWeapon < NUM_WEAPONS && WantedWeapon != m_Core.m_ActiveWeapon && m_Core.m_aWeapons[WantedWeapon].m_Got)
+		m_QueuedWeapon = WantedWeapon;
+
+	DoWeaponSwitch();
+}
+
+void CCharacter::FireWeapon()
+{
+	if(m_ReloadTimer != 0)
+	{
+		if(m_LatestInput.m_Fire & 1)
+		{
+			Antibot()->OnHammerFireReloading(m_pPlayer->GetCID());
+		}
+		return;
+	}
+
+	DoWeaponSwitch();
+	vec2 MouseTarget = vec2(m_LatestInput.m_TargetX, m_LatestInput.m_TargetY);
+	vec2 Direction = normalize(MouseTarget);
+
+	bool FullAuto = false;
+	if(m_Core.m_ActiveWeapon == WEAPON_GRENADE || m_Core.m_ActiveWeapon == WEAPON_SHOTGUN || m_Core.m_ActiveWeapon == WEAPON_LASER)
+		FullAuto = true;
+	if(m_Core.m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN)
+		FullAuto = true;
+	// allow firing directly after coming out of freeze or being unfrozen
+	// by something
+	if(m_FrozenLastTick)
+		FullAuto = true;
+
+	// don't fire hammer when player is deep and sv_deepfly is disabled
+	if(!g_Config.m_SvDeepfly && m_Core.m_ActiveWeapon == WEAPON_HAMMER && m_Core.m_DeepFrozen)
+		return;
+
+	// check if we gonna fire
+	bool WillFire = false;
+	if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
+		WillFire = true;
+
+	if(FullAuto && (m_LatestInput.m_Fire & 1) && m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
+		WillFire = true;
+
+	if(!WillFire)
+		return;
+
+	if(m_FreezeTime)
+	{
+		// Timer stuff to avoid shrieking orchestra caused by unfreeze-plasma
+		if(m_PainSoundTimer <= 0 && !(m_LatestPrevInput.m_Fire & 1))
+		{
+			m_PainSoundTimer = 1 * Server()->TickSpeed();
+			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_LONG, TeamMask());
+		}
+		return;
+	}
+
+	// check for ammo
+	if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo)
+		return;
+
+	vec2 ProjStartPos = m_Pos + Direction * GetProximityRadius() * 0.75f;
+
+	switch(m_Core.m_ActiveWeapon)
+	{
+	case WEAPON_HAMMER:
+	{
+		// reset objects Hit
+		m_NumObjectsHit = 0;
+		GameServer()->CreateSound(m_Pos, SOUND_HAMMER_FIRE, TeamMask());
+
+		Antibot()->OnHammerFire(m_pPlayer->GetCID());
+
+		if(m_Core.m_HammerHitDisabled)
+			break;
+
+		CEntity *apEnts[MAX_CLIENTS];
+		int Hits = 0;
+		int Num = GameServer()->m_World.FindEntities(ProjStartPos, GetProximityRadius() * 0.5f, apEnts,
+			MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+		for(int i = 0; i < Num; ++i)
+		{
+			auto *pTarget = static_cast<CCharacter *>(apEnts[i]);
+
+			//if ((pTarget == this) || Collision()->IntersectLine(ProjStartPos, pTarget->m_Pos, NULL, NULL))
+			if((pTarget == this || (pTarget->IsAlive() && !CanCollide(pTarget->GetPlayer()->GetCID()))))
+				continue;
+
+			// set his velocity to fast upward (for now)
+			if(length(pTarget->m_Pos - ProjStartPos) > 0.0f)
+				GameServer()->CreateHammerHit(pTarget->m_Pos - normalize(pTarget->m_Pos - ProjStartPos) * GetProximityRadius() * 0.5f, TeamMask());
+			else
+				GameServer()->CreateHammerHit(ProjStartPos, TeamMask());
+
+			vec2 Dir;
+			if(length(pTarget->m_Pos - m_Pos) > 0.0f)
+				Dir = normalize(pTarget->m_Pos - m_Pos);
+			else
+				Dir = vec2(0.f, -1.f);
+
+			float Strength;
+			if(!m_TuneZone)
+				Strength = Tuning()->m_HammerStrength;
+			else
+				Strength = TuningList()[m_TuneZone].m_HammerStrength;
+
+			vec2 Temp = pTarget->m_Core.m_Vel + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;
+			Temp = ClampVel(pTarget->m_MoveRestrictions, Temp);
+			Temp -= pTarget->m_Core.m_Vel;
+			pTarget->TakeDamage((vec2(0.f, -1.0f) + Temp) * Strength, g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage,
+				m_pPlayer->GetCID(), m_Core.m_ActiveWeapon);
+			pTarget->UnFreeze();
+
+			if(m_FreezeHammer)
+				pTarget->Freeze();
+
+			Antibot()->OnHammerHit(m_pPlayer->GetCID(), pTarget->GetPlayer()->GetCID());
+
+			Hits++;
+		}
+
+		// if we Hit anything, we have to wait for the reload
+		if(Hits)
+		{
+			float FireDelay;
+			if(!m_TuneZone)
+				FireDelay = Tuning()->m_HammerHitFireDelay;
+			else
+				FireDelay = TuningList()[m_TuneZone].m_HammerHitFireDelay;
+			m_ReloadTimer = FireDelay * Server()->TickSpeed() / 1000;
+		}
+	}
+	break;
+
+	case WEAPON_GUN:
+	{
+		if(!m_Core.m_Jetpack || !m_pPlayer->m_NinjaJetpack || m_Core.m_HasTelegunGun)
+		{
+			int Lifetime;
+			if(!m_TuneZone)
+				Lifetime = (int)(Server()->TickSpeed() * Tuning()->m_GunLifetime);
+			else
+				Lifetime = (int)(Server()->TickSpeed() * TuningList()[m_TuneZone].m_GunLifetime);
+
+			new CProjectile(
+				GameWorld(),
+				WEAPON_GUN, //Type
+				m_pPlayer->GetCID(), //Owner
+				ProjStartPos, //Pos
+				Direction, //Dir
+				Lifetime, //Span
+				false, //Freeze
+				false, //Explosive
+				-1, //SoundImpact
+				MouseTarget //InitDir
+			);
+
+			GameServer()->CreateSound(m_Pos, SOUND_GUN_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
+		}
+	}
+	break;
+
+	case WEAPON_SHOTGUN:
+	{
+		float LaserReach;
+		if(!m_TuneZone)
+			LaserReach = Tuning()->m_LaserReach;
+		else
+			LaserReach = TuningList()[m_TuneZone].m_LaserReach;
+
+		new CLaser(&GameServer()->m_World, m_Pos, Direction, LaserReach, m_pPlayer->GetCID(), WEAPON_SHOTGUN);
+		GameServer()->CreateSound(m_Pos, SOUND_SHOTGUN_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
+	}
+	break;
+
+	case WEAPON_GRENADE:
+	{
+		int Lifetime;
+		if(!m_TuneZone)
+			Lifetime = (int)(Server()->TickSpeed() * Tuning()->m_GrenadeLifetime);
+		else
+			Lifetime = (int)(Server()->TickSpeed() * TuningList()[m_TuneZone].m_GrenadeLifetime);
+
+		new CProjectile(
+			GameWorld(),
+			WEAPON_GRENADE, //Type
+			m_pPlayer->GetCID(), //Owner
+			ProjStartPos, //Pos
+			Direction, //Dir
+			Lifetime, //Span
+			false, //Freeze
+			true, //Explosive
+			SOUND_GRENADE_EXPLODE, //SoundImpact
+			MouseTarget // MouseTarget
+		);
+
+		GameServer()->CreateSound(m_Pos, SOUND_GRENADE_FIRE, TeamMask());
+	}
+	break;
+
+	case WEAPON_LASER:
+	{
+		float LaserReach;
+		if(!m_TuneZone)
+			LaserReach = Tuning()->m_LaserReach;
+		else
+			LaserReach = TuningList()[m_TuneZone].m_LaserReach;
+
+		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, m_pPlayer->GetCID(), WEAPON_LASER);
+		GameServer()->CreateSound(m_Pos, SOUND_LASER_FIRE, TeamMask()); // NOLINT(clang-analyzer-unix.Malloc)
+	}
+	break;
+
+	case WEAPON_NINJA:
+	{
+		// reset Hit objects
+		m_NumObjectsHit = 0;
+
+		m_Core.m_Ninja.m_ActivationDir = Direction;
+		m_Core.m_Ninja.m_CurrentMoveTime = g_pData->m_Weapons.m_Ninja.m_Movetime * Server()->TickSpeed() / 1000;
+		m_Core.m_Ninja.m_OldVelAmount = length(m_Core.m_Vel);
+
+		GameServer()->CreateSound(m_Pos, SOUND_NINJA_FIRE, TeamMask());
+	}
+	break;
+	}
+
+	m_AttackTick = Server()->Tick();
+
+	if(!m_ReloadTimer)
+	{
+		float FireDelay;
+		if(!m_TuneZone)
+			Tuning()->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+		else
+			TuningList()[m_TuneZone].Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+		m_ReloadTimer = FireDelay * Server()->TickSpeed() / 1000;
+	}
+}
+
+void CCharacter::HandleWeapons()
+{
+	//ninja
+	HandleNinja();
+	HandleJetpack();
+
+	if(m_PainSoundTimer > 0)
+		m_PainSoundTimer--;
+
+	// check reload timer
+	if(m_ReloadTimer)
+	{
+		m_ReloadTimer--;
+		return;
+	}
+
+	// fire Weapon, if wanted
+	FireWeapon();
+}
+
+void CCharacter::GiveNinja()
+{
+	m_Core.m_Ninja.m_ActivationTick = Server()->Tick();
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Got = true;
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Ammo = -1;
+	if(m_Core.m_ActiveWeapon != WEAPON_NINJA)
+		m_LastWeapon = m_Core.m_ActiveWeapon;
+	m_Core.m_ActiveWeapon = WEAPON_NINJA;
+
+	if(!m_Core.m_aWeapons[WEAPON_NINJA].m_Got)
+		GameServer()->CreateSound(m_Pos, SOUND_PICKUP_NINJA, TeamMask());
+}
+
+void CCharacter::RemoveNinja()
+{
+	m_Core.m_Ninja.m_ActivationDir = vec2(0, 0);
+	m_Core.m_Ninja.m_ActivationTick = 0;
+	m_Core.m_Ninja.m_CurrentMoveTime = 0;
+	m_Core.m_Ninja.m_OldVelAmount = 0;
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Got = false;
+	m_Core.m_aWeapons[WEAPON_NINJA].m_Ammo = 0;
+	m_Core.m_ActiveWeapon = m_LastWeapon;
+
+	SetWeapon(m_Core.m_ActiveWeapon);
+}
+
+void CCharacter::SetEmote(int Emote, int Tick)
+{
+	m_EmoteType = Emote;
+	m_EmoteStop = Tick;
+}
+
+void CCharacter::OnPredictedInput(CNetObj_PlayerInput *pNewInput)
+{
+	// check for changes
+	if(mem_comp(&m_SavedInput, pNewInput, sizeof(CNetObj_PlayerInput)) != 0)
+		m_LastAction = Server()->Tick();
+
+	// copy new input
+	mem_copy(&m_Input, pNewInput, sizeof(m_Input));
+
+	// it is not allowed to aim in the center
+	if(m_Input.m_TargetX == 0 && m_Input.m_TargetY == 0)
+		m_Input.m_TargetY = -1;
+
+	mem_copy(&m_SavedInput, &m_Input, sizeof(m_SavedInput));
+}
+
+void CCharacter::OnDirectInput(CNetObj_PlayerInput *pNewInput)
+{
+	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
+	mem_copy(&m_LatestInput, pNewInput, sizeof(m_LatestInput));
+	m_NumInputs++;
+
+	// it is not allowed to aim in the center
+	if(m_LatestInput.m_TargetX == 0 && m_LatestInput.m_TargetY == 0)
+		m_LatestInput.m_TargetY = -1;
+
+	Antibot()->OnDirectInput(m_pPlayer->GetCID());
+
+	if(m_NumInputs > 1 && m_pPlayer->GetTeam() != TEAM_SPECTATORS)
+	{
+		HandleWeaponSwitch();
+		FireWeapon();
+	}
+
+	mem_copy(&m_LatestPrevPrevInput, &m_LatestPrevInput, sizeof(m_LatestInput));
+	mem_copy(&m_LatestPrevInput, &m_LatestInput, sizeof(m_LatestInput));
+}
+
+void CCharacter::ResetHook()
+{
+	m_Core.SetHookedPlayer(-1);
+	m_Core.m_HookState = HOOK_RETRACTED;
+	m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+	m_Core.m_HookPos = m_Core.m_Pos;
+}
+
+void CCharacter::ResetInput()
+{
+	m_Input.m_Direction = 0;
+	// simulate releasing the fire button
+	if((m_Input.m_Fire & 1) != 0)
+		m_Input.m_Fire++;
+	m_Input.m_Fire &= INPUT_STATE_MASK;
+	m_Input.m_Jump = 0;
+	m_LatestPrevInput = m_LatestInput = m_Input;
+}
+
+void CCharacter::PreTick()
+{
+	if(m_StartTime > Server()->Tick())
+	{
+		// Prevent the player from getting a negative time
+		// The main reason why this can happen is because of time penalty tiles
+		// However, other reasons are hereby also excluded
+		GameServer()->SendChatTarget(m_pPlayer->GetCID(), "You died of old age");
+		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+	}
+
+	if(m_Paused)
+		return;
+
+	// set emote
+	if(m_EmoteStop < Server()->Tick())
+	{
+		SetEmote(m_pPlayer->GetDefaultEmote(), -1);
+	}
+
+	DDRaceTick();
+
+	Antibot()->OnCharacterTick(m_pPlayer->GetCID());
+
+	m_Core.m_Input = m_Input;
+	m_Core.Tick(true, !g_Config.m_SvNoWeakHook);
+}
+
+void CCharacter::Tick()
+{
+	if(g_Config.m_SvNoWeakHook)
+	{
+		if(m_Paused)
+			return;
+
+		m_Core.TickDeferred();
+	}
+	else
+	{
+		PreTick();
+	}
+
+	if(!m_PrevInput.m_Hook && m_Input.m_Hook && !(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER))
+	{
+		Antibot()->OnHookAttach(m_pPlayer->GetCID(), false);
+	}
+
+	// handle Weapons
+	HandleWeapons();
+
+	DDRacePostCoreTick();
+
+	if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER)
+	{
+		const int HookedPlayer = m_Core.HookedPlayer();
+		if(HookedPlayer != -1 && GameServer()->m_apPlayers[HookedPlayer]->GetTeam() != TEAM_SPECTATORS)
+		{
+			Antibot()->OnHookAttach(m_pPlayer->GetCID(), true);
+		}
+	}
+
+	// Previnput
+	m_PrevInput = m_Input;
+
+	m_PrevPos = m_Core.m_Pos;
+}
+
+void CCharacter::TickDeferred()
+{
+	// advance the dummy
+	{
+		CWorldCore TempWorld;
+		m_ReckoningCore.Init(&TempWorld, Collision(), &Teams()->m_Core, m_pTeleOuts);
+		m_ReckoningCore.m_Id = m_pPlayer->GetCID();
+		m_ReckoningCore.Tick(false);
+		m_ReckoningCore.Move();
+		m_ReckoningCore.Quantize();
+	}
+
+	//lastsentcore
+	vec2 StartPos = m_Core.m_Pos;
+	vec2 StartVel = m_Core.m_Vel;
+	bool StuckBefore = Collision()->TestBox(m_Core.m_Pos, CCharacterCore::PhysicalSizeVec2());
+
+	m_Core.m_Id = m_pPlayer->GetCID();
+	m_Core.Move();
+	bool StuckAfterMove = Collision()->TestBox(m_Core.m_Pos, CCharacterCore::PhysicalSizeVec2());
+	m_Core.Quantize();
+	bool StuckAfterQuant = Collision()->TestBox(m_Core.m_Pos, CCharacterCore::PhysicalSizeVec2());
+	m_Pos = m_Core.m_Pos;
+
+	if(!StuckBefore && (StuckAfterMove || StuckAfterQuant))
+	{
+		// Hackish solution to get rid of strict-aliasing warning
+		union
+		{
+			float f;
+			unsigned u;
+		} StartPosX, StartPosY, StartVelX, StartVelY;
+
+		StartPosX.f = StartPos.x;
+		StartPosY.f = StartPos.y;
+		StartVelX.f = StartVel.x;
+		StartVelY.f = StartVel.y;
+
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "STUCK!!! %d %d %d %f %f %f %f %x %x %x %x",
+			StuckBefore,
+			StuckAfterMove,
+			StuckAfterQuant,
+			StartPos.x, StartPos.y,
+			StartVel.x, StartVel.y,
+			StartPosX.u, StartPosY.u,
+			StartVelX.u, StartVelY.u);
+		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
+	}
+
+	{
+		int Events = m_Core.m_TriggeredEvents;
+		int CID = m_pPlayer->GetCID();
+
+		CClientMask TeamMask = Teams()->TeamMask(Team(), -1, CID);
+		// Some sounds are triggered client-side for the acting player
+		// so we need to avoid duplicating them
+		CClientMask TeamMaskExceptSelf = Teams()->TeamMask(Team(), CID, CID);
+		// Some are triggered client-side but only on Sixup
+		CClientMask TeamMaskExceptSelfIfSixup = Server()->IsSixup(CID) ? TeamMaskExceptSelf : TeamMask;
+
+		if(Events & COREEVENT_GROUND_JUMP)
+			GameServer()->CreateSound(m_Pos, SOUND_PLAYER_JUMP, TeamMaskExceptSelf);
+
+		if(Events & COREEVENT_HOOK_ATTACH_PLAYER)
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_PLAYER, TeamMaskExceptSelfIfSixup);
+
+		if(Events & COREEVENT_HOOK_ATTACH_GROUND)
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_ATTACH_GROUND, TeamMaskExceptSelf);
+
+		if(Events & COREEVENT_HOOK_HIT_NOHOOK)
+			GameServer()->CreateSound(m_Pos, SOUND_HOOK_NOATTACH, TeamMaskExceptSelf);
+	}
+
+	if(m_pPlayer->GetTeam() == TEAM_SPECTATORS)
+	{
+		m_Pos.x = m_Input.m_TargetX;
+		m_Pos.y = m_Input.m_TargetY;
+	}
+
+	// update the m_SendCore if needed
+	{
+		CNetObj_Character Predicted;
+		CNetObj_Character Current;
+		mem_zero(&Predicted, sizeof(Predicted));
+		mem_zero(&Current, sizeof(Current));
+		m_ReckoningCore.Write(&Predicted);
+		m_Core.Write(&Current);
+
+		// only allow dead reackoning for a top of 3 seconds
+		if(m_Core.m_Reset || m_ReckoningTick + Server()->TickSpeed() * 3 < Server()->Tick() || mem_comp(&Predicted, &Current, sizeof(CNetObj_Character)) != 0)
+		{
+			m_ReckoningTick = Server()->Tick();
+			m_SendCore = m_Core;
+			m_ReckoningCore = m_Core;
+			m_Core.m_Reset = false;
+		}
+	}
+}
+
+void CCharacter::TickPaused()
+{
+	++m_AttackTick;
+	++m_DamageTakenTick;
+	++m_Core.m_Ninja.m_ActivationTick;
+	++m_ReckoningTick;
+	if(m_LastAction != -1)
+		++m_LastAction;
+	if(m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_AmmoRegenStart > -1)
+		++m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_AmmoRegenStart;
+	if(m_EmoteStop > -1)
+		++m_EmoteStop;
+}
+
+bool CCharacter::IncreaseHealth(int Amount)
+{
+	if(m_Health >= 10)
+		return false;
+	m_Health = clamp(m_Health + Amount, 0, 10);
+	return true;
+}
+
+bool CCharacter::IncreaseArmor(int Amount)
+{
+	if(m_Armor >= 10)
+		return false;
+	m_Armor = clamp(m_Armor + Amount, 0, 10);
+	return true;
+}
+
+void CCharacter::Die(int Killer, int Weapon, bool SendKillMsg)
+{
+	if(Server()->IsRecording(m_pPlayer->GetCID()))
+	{
+		CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
+
+		if(pData->m_RecordStopTick - Server()->Tick() <= Server()->TickSpeed() && pData->m_RecordStopTick != -1)
+			Server()->SaveDemo(m_pPlayer->GetCID(), pData->m_RecordFinishTime);
+		else
+			Server()->StopRecord(m_pPlayer->GetCID());
+
+		pData->m_RecordStopTick = -1;
+	}
+
+	int ModeSpecial = GameServer()->m_pController->OnCharacterDeath(this, GameServer()->m_apPlayers[Killer], Weapon);
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "kill killer='%d:%s' victim='%d:%s' weapon=%d special=%d",
+		Killer, Server()->ClientName(Killer),
+		m_pPlayer->GetCID(), Server()->ClientName(m_pPlayer->GetCID()), Weapon, ModeSpecial);
+	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
+
+	// send the kill message
+	if(SendKillMsg && (Team() == TEAM_FLOCK || Teams()->Count(Team()) == 1 || Teams()->GetTeamState(Team()) == CGameTeams::TEAMSTATE_OPEN || Teams()->TeamLocked(Team()) == false))
+	{
+		CNetMsg_Sv_KillMsg Msg;
+		Msg.m_Killer = Killer;
+		Msg.m_Victim = m_pPlayer->GetCID();
+		Msg.m_Weapon = Weapon;
+		Msg.m_ModeSpecial = ModeSpecial;
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, -1);
+	}
+
+	// a nice sound
+	GameServer()->CreateSound(m_Pos, SOUND_PLAYER_DIE, TeamMask());
+
+	// this is to rate limit respawning to 3 secs
+	m_pPlayer->m_PreviousDieTick = m_pPlayer->m_DieTick;
+	m_pPlayer->m_DieTick = Server()->Tick();
+
+	m_Alive = false;
+	SetSolo(false);
+
+	GameServer()->m_World.RemoveEntity(this);
+	GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
+	GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), TeamMask());
+	Teams()->OnCharacterDeath(GetPlayer()->GetCID(), Weapon);
+}
+
+bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
+{
+	if(Dmg)
+	{
+		SetEmote(EMOTE_PAIN, Server()->Tick() + 500 * Server()->TickSpeed() / 1000);
+	}
+
+	vec2 Temp = m_Core.m_Vel + Force;
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, Temp);
+
+	return true;
+}
+
+//TODO: Move the emote stuff to a function
+void CCharacter::SnapCharacter(int SnappingClient, int ID)
+{
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	CCharacterCore *pCore;
+	int Tick, Emote = m_EmoteType, Weapon = m_Core.m_ActiveWeapon, AmmoCount = 0,
+		  Health = 0, Armor = 0;
+	if(!m_ReckoningTick || GameServer()->m_World.m_Paused)
+	{
+		Tick = 0;
+		pCore = &m_Core;
+	}
+	else
+	{
+		Tick = m_ReckoningTick;
+		pCore = &m_SendCore;
+	}
+
+	// change eyes and use ninja graphic if player is frozen
+	if(m_Core.m_DeepFrozen || m_FreezeTime > 0 || m_Core.m_LiveFrozen)
+	{
+		if(Emote == EMOTE_NORMAL)
+			Emote = (m_Core.m_DeepFrozen || m_Core.m_LiveFrozen) ? EMOTE_PAIN : EMOTE_BLINK;
+
+		if((m_Core.m_DeepFrozen || m_FreezeTime > 0) && SnappingClientVersion < VERSION_DDNET_NEW_HUD)
+			Weapon = WEAPON_NINJA;
+	}
+
+	// solo, collision, jetpack and ninjajetpack prediction
+	if(m_pPlayer->GetCID() == SnappingClient)
+	{
+		int Faketuning = 0;
+		if(m_pPlayer->GetClientVersion() < VERSION_DDNET_NEW_HUD)
+		{
+			if(m_Core.m_Jetpack && Weapon != WEAPON_NINJA)
+				Faketuning |= FAKETUNE_JETPACK;
+			if(m_Core.m_Solo)
+				Faketuning |= FAKETUNE_SOLO;
+			if(m_Core.m_HammerHitDisabled)
+				Faketuning |= FAKETUNE_NOHAMMER;
+			if(m_Core.m_CollisionDisabled)
+				Faketuning |= FAKETUNE_NOCOLL;
+			if(m_Core.m_HookHitDisabled)
+				Faketuning |= FAKETUNE_NOHOOK;
+			if(!m_Core.m_EndlessJump && m_Core.m_Jumps == 0)
+				Faketuning |= FAKETUNE_NOJUMP;
+		}
+		if(Faketuning != m_NeededFaketuning)
+		{
+			m_NeededFaketuning = Faketuning;
+			GameServer()->SendTuningParams(m_pPlayer->GetCID(), m_TuneZone); // update tunings
+		}
+	}
+
+	// change eyes, use ninja graphic and set ammo count if player has ninjajetpack
+	if(m_pPlayer->m_NinjaJetpack && m_Core.m_Jetpack && m_Core.m_ActiveWeapon == WEAPON_GUN && !m_Core.m_DeepFrozen && m_FreezeTime == 0 && !m_Core.m_HasTelegunGun)
+	{
+		if(Emote == EMOTE_NORMAL)
+			Emote = EMOTE_HAPPY;
+		Weapon = WEAPON_NINJA;
+		AmmoCount = 10;
+	}
+
+	if(m_pPlayer->GetCID() == SnappingClient || SnappingClient == SERVER_DEMO_CLIENT ||
+		(!g_Config.m_SvStrictSpectateMode && m_pPlayer->GetCID() == GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID))
+	{
+		Health = m_Health;
+		Armor = m_Armor;
+		if(m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo > 0)
+			AmmoCount = (m_FreezeTime == 0) ? m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Ammo : 0;
+	}
+
+	if(GetPlayer()->IsAfk() || GetPlayer()->IsPaused())
+	{
+		if(m_FreezeTime > 0 || m_Core.m_DeepFrozen || m_Core.m_LiveFrozen)
+			Emote = EMOTE_NORMAL;
+		else
+			Emote = EMOTE_BLINK;
+	}
+
+	if(Emote == EMOTE_NORMAL)
+	{
+		if(5 * Server()->TickSpeed() - ((Server()->Tick() - m_LastAction) % (5 * Server()->TickSpeed())) < 5)
+			Emote = EMOTE_BLINK;
+	}
+
+	if(!Server()->IsSixup(SnappingClient))
+	{
+		CNetObj_Character *pCharacter = Server()->SnapNewItem<CNetObj_Character>(ID);
+		if(!pCharacter)
+			return;
+
+		pCore->Write(pCharacter);
+
+		pCharacter->m_Tick = Tick;
+		pCharacter->m_Emote = Emote;
+
+		if(pCharacter->m_HookedPlayer != -1)
+		{
+			if(!Server()->Translate(pCharacter->m_HookedPlayer, SnappingClient))
+				pCharacter->m_HookedPlayer = -1;
+		}
+
+		pCharacter->m_AttackTick = m_AttackTick;
+		pCharacter->m_Direction = m_Input.m_Direction;
+		pCharacter->m_Weapon = Weapon;
+		pCharacter->m_AmmoCount = AmmoCount;
+		pCharacter->m_Health = Health;
+		pCharacter->m_Armor = Armor;
+		pCharacter->m_PlayerFlags = GetPlayer()->m_PlayerFlags;
+	}
+	else
+	{
+		protocol7::CNetObj_Character *pCharacter = Server()->SnapNewItem<protocol7::CNetObj_Character>(ID);
+		if(!pCharacter)
+			return;
+
+		pCore->Write(reinterpret_cast<CNetObj_CharacterCore *>(static_cast<protocol7::CNetObj_CharacterCore *>(pCharacter)));
+		if(pCharacter->m_Angle > (int)(pi * 256.0f))
+		{
+			pCharacter->m_Angle -= (int)(2.0f * pi * 256.0f);
+		}
+
+		pCharacter->m_Tick = Tick;
+		pCharacter->m_Emote = Emote;
+		pCharacter->m_AttackTick = m_AttackTick;
+		pCharacter->m_Direction = m_Input.m_Direction;
+		pCharacter->m_Weapon = Weapon;
+		pCharacter->m_AmmoCount = AmmoCount;
+
+		if(m_FreezeTime > 0 || m_Core.m_DeepFrozen)
+			pCharacter->m_AmmoCount = m_Core.m_FreezeStart + g_Config.m_SvFreezeDelay * Server()->TickSpeed();
+		else if(Weapon == WEAPON_NINJA)
+			pCharacter->m_AmmoCount = m_Core.m_Ninja.m_ActivationTick + g_pData->m_Weapons.m_Ninja.m_Duration * Server()->TickSpeed() / 1000;
+
+		pCharacter->m_Health = Health;
+		pCharacter->m_Armor = Armor;
+		int TriggeredEvents7 = 0;
+		if(m_Core.m_TriggeredEvents & COREEVENT_GROUND_JUMP)
+			TriggeredEvents7 |= protocol7::COREEVENTFLAG_GROUND_JUMP;
+		if(m_Core.m_TriggeredEvents & COREEVENT_AIR_JUMP)
+			TriggeredEvents7 |= protocol7::COREEVENTFLAG_AIR_JUMP;
+		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER)
+			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER;
+		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_GROUND)
+			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND;
+		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_HIT_NOHOOK)
+			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK;
+		pCharacter->m_TriggeredEvents = TriggeredEvents7;
+	}
+}
+
+bool CCharacter::CanSnapCharacter(int SnappingClient)
+{
+	if(SnappingClient == SERVER_DEMO_CLIENT)
+		return true;
+
+	CCharacter *pSnapChar = GameServer()->GetPlayerChar(SnappingClient);
+	CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+
+	if(pSnapPlayer->GetTeam() == TEAM_SPECTATORS || pSnapPlayer->IsPaused())
+	{
+		if(pSnapPlayer->m_SpectatorID != SPEC_FREEVIEW && !CanCollide(pSnapPlayer->m_SpectatorID) && (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_OFF || (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM && !SameTeam(pSnapPlayer->m_SpectatorID))))
+			return false;
+		else if(pSnapPlayer->m_SpectatorID == SPEC_FREEVIEW && !CanCollide(SnappingClient) && pSnapPlayer->m_SpecTeam && !SameTeam(SnappingClient))
+			return false;
+	}
+	else if(pSnapChar && !pSnapChar->m_Core.m_Super && !CanCollide(SnappingClient) && (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_OFF || (pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM && !SameTeam(SnappingClient))))
+		return false;
+
+	return true;
+}
+
+bool CCharacter::IsSnappingCharacterInView(int SnappingClientID)
+{
+	int ID = m_pPlayer->GetCID();
+
+	// A player may not be clipped away if his hook or a hook attached to him is in the field of view
+	bool PlayerAndHookNotInView = NetworkClippedLine(SnappingClientID, m_Pos, m_Core.m_HookPos);
+	bool AttachedHookInView = false;
+	if(PlayerAndHookNotInView)
+	{
+		for(const auto &AttachedPlayerID : m_Core.m_AttachedPlayers)
+		{
+			const CCharacter *pOtherPlayer = GameServer()->GetPlayerChar(AttachedPlayerID);
+			if(pOtherPlayer && pOtherPlayer->m_Core.HookedPlayer() == ID)
+			{
+				if(!NetworkClippedLine(SnappingClientID, m_Pos, pOtherPlayer->m_Pos))
+				{
+					AttachedHookInView = true;
+					break;
+				}
+			}
+		}
+	}
+	if(PlayerAndHookNotInView && !AttachedHookInView)
+	{
+		return false;
+	}
+	return true;
+}
+
+void CCharacter::Snap(int SnappingClient)
+{
+	int ID = m_pPlayer->GetCID();
+
+	if(!Server()->Translate(ID, SnappingClient))
+		return;
+
+	if(!CanSnapCharacter(SnappingClient))
+	{
+		return;
+	}
+
+	if(!IsSnappingCharacterInView(SnappingClient))
+		return;
+
+	SnapCharacter(SnappingClient, ID);
+
+	CNetObj_DDNetCharacter *pDDNetCharacter = Server()->SnapNewItem<CNetObj_DDNetCharacter>(ID);
+	if(!pDDNetCharacter)
+		return;
+
+	pDDNetCharacter->m_Flags = 0;
+	if(m_Core.m_Solo)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_SOLO;
+	if(m_Core.m_Super)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_SUPER;
+	if(m_Core.m_EndlessHook)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_HOOK;
+	if(m_Core.m_CollisionDisabled || !Tuning()->m_PlayerCollision)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_COLLISION_DISABLED;
+	if(m_Core.m_HookHitDisabled || !Tuning()->m_PlayerHooking)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_HOOK_HIT_DISABLED;
+	if(m_Core.m_EndlessJump)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_JUMP;
+	if(m_Core.m_Jetpack)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_JETPACK;
+	if(m_Core.m_HammerHitDisabled)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_HAMMER_HIT_DISABLED;
+	if(m_Core.m_ShotgunHitDisabled)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_SHOTGUN_HIT_DISABLED;
+	if(m_Core.m_GrenadeHitDisabled)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_GRENADE_HIT_DISABLED;
+	if(m_Core.m_LaserHitDisabled)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_LASER_HIT_DISABLED;
+	if(m_Core.m_HasTelegunGun)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_GUN;
+	if(m_Core.m_HasTelegunGrenade)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_GRENADE;
+	if(m_Core.m_HasTelegunLaser)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_LASER;
+	if(m_Core.m_aWeapons[WEAPON_HAMMER].m_Got)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_HAMMER;
+	if(m_Core.m_aWeapons[WEAPON_GUN].m_Got)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_GUN;
+	if(m_Core.m_aWeapons[WEAPON_SHOTGUN].m_Got)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_SHOTGUN;
+	if(m_Core.m_aWeapons[WEAPON_GRENADE].m_Got)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_GRENADE;
+	if(m_Core.m_aWeapons[WEAPON_LASER].m_Got)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_LASER;
+	if(m_Core.m_ActiveWeapon == WEAPON_NINJA)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_WEAPON_NINJA;
+	if(m_Core.m_LiveFrozen)
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_MOVEMENTS_DISABLED;
+
+	pDDNetCharacter->m_FreezeEnd = m_Core.m_DeepFrozen ? -1 : m_FreezeTime == 0 ? 0 : Server()->Tick() + m_FreezeTime;
+	pDDNetCharacter->m_Jumps = m_Core.m_Jumps;
+	pDDNetCharacter->m_TeleCheckpoint = m_TeleCheckpoint;
+	pDDNetCharacter->m_StrongWeakID = m_StrongWeakID;
+
+	// Display Information
+	pDDNetCharacter->m_JumpedTotal = m_Core.m_JumpedTotal;
+	pDDNetCharacter->m_NinjaActivationTick = m_Core.m_Ninja.m_ActivationTick;
+	pDDNetCharacter->m_FreezeStart = m_Core.m_FreezeStart;
+	if(m_Core.m_IsInFreeze)
+	{
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_IN_FREEZE;
+	}
+	if(Teams()->IsPractice(Team()))
+	{
+		pDDNetCharacter->m_Flags |= CHARACTERFLAG_PRACTICE_MODE;
+	}
+	pDDNetCharacter->m_TargetX = m_Core.m_Input.m_TargetX;
+	pDDNetCharacter->m_TargetY = m_Core.m_Input.m_TargetY;
+}
+
+// DDRace
+
+bool CCharacter::CanCollide(int ClientID)
+{
+	return Teams()->m_Core.CanCollide(GetPlayer()->GetCID(), ClientID);
+}
+bool CCharacter::SameTeam(int ClientID)
+{
+	return Teams()->m_Core.SameTeam(GetPlayer()->GetCID(), ClientID);
+}
+
+int CCharacter::Team()
+{
+	return Teams()->m_Core.Team(m_pPlayer->GetCID());
+}
+
+void CCharacter::SetTeleports(std::map<int, std::vector<vec2>> *pTeleOuts, std::map<int, std::vector<vec2>> *pTeleCheckOuts)
+{
+	m_pTeleOuts = pTeleOuts;
+	m_pTeleCheckOuts = pTeleCheckOuts;
+	m_Core.SetTeleOuts(pTeleOuts);
+}
+
+void CCharacter::FillAntibot(CAntibotCharacterData *pData)
+{
+	pData->m_Pos = m_Pos;
+	pData->m_Vel = m_Core.m_Vel;
+	pData->m_Angle = m_Core.m_Angle;
+	pData->m_HookedPlayer = m_Core.HookedPlayer();
+	pData->m_SpawnTick = m_SpawnTick;
+	pData->m_WeaponChangeTick = m_WeaponChangeTick;
+	pData->m_aLatestInputs[0].m_TargetX = m_LatestInput.m_TargetX;
+	pData->m_aLatestInputs[0].m_TargetY = m_LatestInput.m_TargetY;
+	pData->m_aLatestInputs[1].m_TargetX = m_LatestPrevInput.m_TargetX;
+	pData->m_aLatestInputs[1].m_TargetY = m_LatestPrevInput.m_TargetY;
+	pData->m_aLatestInputs[2].m_TargetX = m_LatestPrevPrevInput.m_TargetX;
+	pData->m_aLatestInputs[2].m_TargetY = m_LatestPrevPrevInput.m_TargetY;
+}
+
+void CCharacter::HandleBroadcast()
+{
+	CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
+
+	if(m_DDRaceState == DDRACE_STARTED && m_pPlayer->GetClientVersion() == VERSION_VANILLA &&
+		m_LastTimeCpBroadcasted != m_LastTimeCp && m_LastTimeCp > -1 &&
+		m_TimeCpBroadcastEndTick > Server()->Tick() && pData->m_BestTime && pData->m_aBestTimeCp[m_LastTimeCp] != 0)
+	{
+		char aBroadcast[128];
+		float Diff = m_aCurrentTimeCp[m_LastTimeCp] - pData->m_aBestTimeCp[m_LastTimeCp];
+		str_format(aBroadcast, sizeof(aBroadcast), "Checkpoint | Diff : %+5.2f", Diff);
+		GameServer()->SendBroadcast(aBroadcast, m_pPlayer->GetCID());
+		m_LastTimeCpBroadcasted = m_LastTimeCp;
+		m_LastBroadcast = Server()->Tick();
+	}
+	else if((m_pPlayer->m_TimerType == CPlayer::TIMERTYPE_BROADCAST || m_pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST) && m_DDRaceState == DDRACE_STARTED && m_LastBroadcast + Server()->TickSpeed() * g_Config.m_SvTimeInBroadcastInterval <= Server()->Tick())
+	{
+		char aBuf[32];
+		int Time = (int64_t)100 * ((float)(Server()->Tick() - m_StartTime) / ((float)Server()->TickSpeed()));
+		str_time(Time, TIME_HOURS, aBuf, sizeof(aBuf));
+		GameServer()->SendBroadcast(aBuf, m_pPlayer->GetCID(), false);
+		m_LastTimeCpBroadcasted = m_LastTimeCp;
+		m_LastBroadcast = Server()->Tick();
+	}
+}
+
+void CCharacter::HandleSkippableTiles(int Index)
+{
+	// handle death-tiles and leaving gamelayer
+	if((Collision()->GetCollisionAt(m_Pos.x + GetProximityRadius() / 3.f, m_Pos.y - GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetCollisionAt(m_Pos.x + GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y - GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetFCollisionAt(m_Pos.x + GetProximityRadius() / 3.f, m_Pos.y - GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetFCollisionAt(m_Pos.x + GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetFCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y - GetProximityRadius() / 3.f) == TILE_DEATH ||
+		   Collision()->GetFCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH) &&
+		!m_Core.m_Super && !(Team() && Teams()->TeeFinished(m_pPlayer->GetCID())))
+	{
+		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+		return;
+	}
+
+	if(GameLayerClipped(m_Pos))
+	{
+		Die(m_pPlayer->GetCID(), WEAPON_WORLD);
+		return;
+	}
+
+	if(Index < 0)
+		return;
+
+	// handle speedup tiles
+	if(Collision()->IsSpeedup(Index))
+	{
+		vec2 Direction, TempVel = m_Core.m_Vel;
+		int Force, MaxSpeed = 0;
+		float TeeAngle, SpeederAngle, DiffAngle, SpeedLeft, TeeSpeed;
+		Collision()->GetSpeedup(Index, &Direction, &Force, &MaxSpeed);
+		if(Force == 255 && MaxSpeed)
+		{
+			m_Core.m_Vel = Direction * (MaxSpeed / 5);
+		}
+		else
+		{
+			if(MaxSpeed > 0 && MaxSpeed < 5)
+				MaxSpeed = 5;
+			if(MaxSpeed > 0)
+			{
+				if(Direction.x > 0.0000001f)
+					SpeederAngle = -std::atan(Direction.y / Direction.x);
+				else if(Direction.x < 0.0000001f)
+					SpeederAngle = std::atan(Direction.y / Direction.x) + 2.0f * std::asin(1.0f);
+				else if(Direction.y > 0.0000001f)
+					SpeederAngle = std::asin(1.0f);
+				else
+					SpeederAngle = std::asin(-1.0f);
+
+				if(SpeederAngle < 0)
+					SpeederAngle = 4.0f * std::asin(1.0f) + SpeederAngle;
+
+				if(TempVel.x > 0.0000001f)
+					TeeAngle = -std::atan(TempVel.y / TempVel.x);
+				else if(TempVel.x < 0.0000001f)
+					TeeAngle = std::atan(TempVel.y / TempVel.x) + 2.0f * std::asin(1.0f);
+				else if(TempVel.y > 0.0000001f)
+					TeeAngle = std::asin(1.0f);
+				else
+					TeeAngle = std::asin(-1.0f);
+
+				if(TeeAngle < 0)
+					TeeAngle = 4.0f * std::asin(1.0f) + TeeAngle;
+
+				TeeSpeed = std::sqrt(std::pow(TempVel.x, 2) + std::pow(TempVel.y, 2));
+
+				DiffAngle = SpeederAngle - TeeAngle;
+				SpeedLeft = MaxSpeed / 5.0f - std::cos(DiffAngle) * TeeSpeed;
+				if(absolute((int)SpeedLeft) > Force && SpeedLeft > 0.0000001f)
+					TempVel += Direction * Force;
+				else if(absolute((int)SpeedLeft) > Force)
+					TempVel += Direction * -Force;
+				else
+					TempVel += Direction * SpeedLeft;
+			}
+			else
+				TempVel += Direction * Force;
+
+			m_Core.m_Vel = ClampVel(m_MoveRestrictions, TempVel);
+		}
+	}
+}
+
+bool CCharacter::IsSwitchActiveCb(int Number, void *pUser)
+{
+	CCharacter *pThis = (CCharacter *)pUser;
+	auto &aSwitchers = pThis->Switchers();
+	return !aSwitchers.empty() && pThis->Team() != TEAM_SUPER && aSwitchers[Number].m_aStatus[pThis->Team()];
+}
+
+void CCharacter::SetTimeCheckpoint(int TimeCheckpoint)
+{
+	if(TimeCheckpoint > -1 && m_DDRaceState == DDRACE_STARTED && m_aCurrentTimeCp[TimeCheckpoint] == 0.0f && m_Time != 0.0f)
+	{
+		m_LastTimeCp = TimeCheckpoint;
+		m_aCurrentTimeCp[m_LastTimeCp] = m_Time;
+		m_TimeCpBroadcastEndTick = Server()->Tick() + Server()->TickSpeed() * 2;
+		if(m_pPlayer->GetClientVersion() >= VERSION_DDRACE)
+		{
+			CPlayerData *pData = GameServer()->Score()->PlayerData(m_pPlayer->GetCID());
+			if(pData->m_BestTime && pData->m_aBestTimeCp[m_LastTimeCp] != 0.0f)
+			{
+				CNetMsg_Sv_DDRaceTime Msg;
+				Msg.m_Time = (int)(m_Time * 100.0f);
+				Msg.m_Finish = 0;
+				float Diff = (m_aCurrentTimeCp[m_LastTimeCp] - pData->m_aBestTimeCp[m_LastTimeCp]) * 100;
+				Msg.m_Check = (int)Diff;
+				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, m_pPlayer->GetCID());
+			}
+		}
+	}
+}
+
+void CCharacter::HandleTiles(int Index)
+{
+	int MapIndex = Index;
+	//int PureMapIndex = Collision()->GetPureMapIndex(m_Pos);
+	m_TileIndex = Collision()->GetTileIndex(MapIndex);
+	m_TileFIndex = Collision()->GetFTileIndex(MapIndex);
+	m_MoveRestrictions = Collision()->GetMoveRestrictions(IsSwitchActiveCb, this, m_Pos, 18.0f, MapIndex);
+	if(Index < 0)
+	{
+		m_LastRefillJumps = false;
+		m_LastPenalty = false;
+		m_LastBonus = false;
+		return;
+	}
+	SetTimeCheckpoint(Collision()->IsTimeCheckpoint(MapIndex));
+	SetTimeCheckpoint(Collision()->IsFTimeCheckpoint(MapIndex));
+	int TeleCheckpoint = Collision()->IsTeleCheckpoint(MapIndex);
+	if(TeleCheckpoint)
+		m_TeleCheckpoint = TeleCheckpoint;
+
+	GameServer()->m_pController->HandleCharacterTiles(this, Index);
+
+	// freeze
+	if(((m_TileIndex == TILE_FREEZE) || (m_TileFIndex == TILE_FREEZE)) && !m_Core.m_Super && !m_Core.m_DeepFrozen)
+	{
+		Freeze();
+	}
+	else if(((m_TileIndex == TILE_UNFREEZE) || (m_TileFIndex == TILE_UNFREEZE)) && !m_Core.m_DeepFrozen)
+		UnFreeze();
+
+	// deep freeze
+	if(((m_TileIndex == TILE_DFREEZE) || (m_TileFIndex == TILE_DFREEZE)) && !m_Core.m_Super && !m_Core.m_DeepFrozen)
+		m_Core.m_DeepFrozen = true;
+	else if(((m_TileIndex == TILE_DUNFREEZE) || (m_TileFIndex == TILE_DUNFREEZE)) && !m_Core.m_Super && m_Core.m_DeepFrozen)
+		m_Core.m_DeepFrozen = false;
+
+	// live freeze
+	if(((m_TileIndex == TILE_LFREEZE) || (m_TileFIndex == TILE_LFREEZE)) && !m_Core.m_Super)
+	{
+		m_Core.m_LiveFrozen = true;
+	}
+	else if(((m_TileIndex == TILE_LUNFREEZE) || (m_TileFIndex == TILE_LUNFREEZE)) && !m_Core.m_Super)
+	{
+		m_Core.m_LiveFrozen = false;
+	}
+
+	// endless hook
+	if(((m_TileIndex == TILE_EHOOK_ENABLE) || (m_TileFIndex == TILE_EHOOK_ENABLE)))
+	{
+		SetEndlessHook(true);
+	}
+	else if(((m_TileIndex == TILE_EHOOK_DISABLE) || (m_TileFIndex == TILE_EHOOK_DISABLE)))
+	{
+		SetEndlessHook(false);
+	}
+
+	// hit others
+	if(((m_TileIndex == TILE_HIT_DISABLE) || (m_TileFIndex == TILE_HIT_DISABLE)) && (!m_Core.m_HammerHitDisabled || !m_Core.m_ShotgunHitDisabled || !m_Core.m_GrenadeHitDisabled || !m_Core.m_LaserHitDisabled))
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hit others");
+		m_Core.m_HammerHitDisabled = true;
+		m_Core.m_ShotgunHitDisabled = true;
+		m_Core.m_GrenadeHitDisabled = true;
+		m_Core.m_LaserHitDisabled = true;
+	}
+	else if(((m_TileIndex == TILE_HIT_ENABLE) || (m_TileFIndex == TILE_HIT_ENABLE)) && (m_Core.m_HammerHitDisabled || m_Core.m_ShotgunHitDisabled || m_Core.m_GrenadeHitDisabled || m_Core.m_LaserHitDisabled))
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hit others");
+		m_Core.m_ShotgunHitDisabled = false;
+		m_Core.m_GrenadeHitDisabled = false;
+		m_Core.m_HammerHitDisabled = false;
+		m_Core.m_LaserHitDisabled = false;
+	}
+
+	// collide with others
+	if(((m_TileIndex == TILE_NPC_DISABLE) || (m_TileFIndex == TILE_NPC_DISABLE)) && !m_Core.m_CollisionDisabled)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't collide with others");
+		m_Core.m_CollisionDisabled = true;
+	}
+	else if(((m_TileIndex == TILE_NPC_ENABLE) || (m_TileFIndex == TILE_NPC_ENABLE)) && m_Core.m_CollisionDisabled)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can collide with others");
+		m_Core.m_CollisionDisabled = false;
+	}
+
+	// hook others
+	if(((m_TileIndex == TILE_NPH_DISABLE) || (m_TileFIndex == TILE_NPH_DISABLE)) && !m_Core.m_HookHitDisabled)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hook others");
+		m_Core.m_HookHitDisabled = true;
+	}
+	else if(((m_TileIndex == TILE_NPH_ENABLE) || (m_TileFIndex == TILE_NPH_ENABLE)) && m_Core.m_HookHitDisabled)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hook others");
+		m_Core.m_HookHitDisabled = false;
+	}
+
+	// unlimited air jumps
+	if(((m_TileIndex == TILE_UNLIMITED_JUMPS_ENABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_ENABLE)) && !m_Core.m_EndlessJump)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You have unlimited air jumps");
+		m_Core.m_EndlessJump = true;
+	}
+	else if(((m_TileIndex == TILE_UNLIMITED_JUMPS_DISABLE) || (m_TileFIndex == TILE_UNLIMITED_JUMPS_DISABLE)) && m_Core.m_EndlessJump)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You don't have unlimited air jumps");
+		m_Core.m_EndlessJump = false;
+	}
+
+	// walljump
+	if((m_TileIndex == TILE_WALLJUMP) || (m_TileFIndex == TILE_WALLJUMP))
+	{
+		if(m_Core.m_Vel.y > 0 && m_Core.m_Colliding && m_Core.m_LeftWall)
+		{
+			m_Core.m_LeftWall = false;
+			m_Core.m_JumpedTotal = m_Core.m_Jumps >= 2 ? m_Core.m_Jumps - 2 : 0;
+			m_Core.m_Jumped = 1;
+		}
+	}
+
+	// jetpack gun
+	if(((m_TileIndex == TILE_JETPACK_ENABLE) || (m_TileFIndex == TILE_JETPACK_ENABLE)) && !m_Core.m_Jetpack)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You have a jetpack gun");
+		m_Core.m_Jetpack = true;
+	}
+	else if(((m_TileIndex == TILE_JETPACK_DISABLE) || (m_TileFIndex == TILE_JETPACK_DISABLE)) && m_Core.m_Jetpack)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You lost your jetpack gun");
+		m_Core.m_Jetpack = false;
+	}
+
+	// refill jumps
+	if(((m_TileIndex == TILE_REFILL_JUMPS) || (m_TileFIndex == TILE_REFILL_JUMPS)) && !m_LastRefillJumps)
+	{
+		m_Core.m_JumpedTotal = 0;
+		m_Core.m_Jumped = 0;
+		m_LastRefillJumps = true;
+	}
+	if((m_TileIndex != TILE_REFILL_JUMPS) && (m_TileFIndex != TILE_REFILL_JUMPS))
+	{
+		m_LastRefillJumps = false;
+	}
+
+	// Teleport gun
+	if(((m_TileIndex == TILE_TELE_GUN_ENABLE) || (m_TileFIndex == TILE_TELE_GUN_ENABLE)) && !m_Core.m_HasTelegunGun)
+	{
+		m_Core.m_HasTelegunGun = true;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport gun enabled");
+	}
+	else if(((m_TileIndex == TILE_TELE_GUN_DISABLE) || (m_TileFIndex == TILE_TELE_GUN_DISABLE)) && m_Core.m_HasTelegunGun)
+	{
+		m_Core.m_HasTelegunGun = false;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport gun disabled");
+	}
+
+	if(((m_TileIndex == TILE_TELE_GRENADE_ENABLE) || (m_TileFIndex == TILE_TELE_GRENADE_ENABLE)) && !m_Core.m_HasTelegunGrenade)
+	{
+		m_Core.m_HasTelegunGrenade = true;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport grenade enabled");
+	}
+	else if(((m_TileIndex == TILE_TELE_GRENADE_DISABLE) || (m_TileFIndex == TILE_TELE_GRENADE_DISABLE)) && m_Core.m_HasTelegunGrenade)
+	{
+		m_Core.m_HasTelegunGrenade = false;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport grenade disabled");
+	}
+
+	if(((m_TileIndex == TILE_TELE_LASER_ENABLE) || (m_TileFIndex == TILE_TELE_LASER_ENABLE)) && !m_Core.m_HasTelegunLaser)
+	{
+		m_Core.m_HasTelegunLaser = true;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport laser enabled");
+	}
+	else if(((m_TileIndex == TILE_TELE_LASER_DISABLE) || (m_TileFIndex == TILE_TELE_LASER_DISABLE)) && m_Core.m_HasTelegunLaser)
+	{
+		m_Core.m_HasTelegunLaser = false;
+
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "Teleport laser disabled");
+	}
+
+	// stopper
+	if(m_Core.m_Vel.y > 0 && (m_MoveRestrictions & CANTMOVE_DOWN))
+	{
+		m_Core.m_Jumped = 0;
+		m_Core.m_JumpedTotal = 0;
+	}
+	m_Core.m_Vel = ClampVel(m_MoveRestrictions, m_Core.m_Vel);
+
+	// handle switch tiles
+	if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHOPEN && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = true;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = 0;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHOPEN;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = Server()->Tick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHTIMEDOPEN && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = true;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = Server()->Tick() + 1 + Collision()->GetSwitchDelay(MapIndex) * Server()->TickSpeed();
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHTIMEDOPEN;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = Server()->Tick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHTIMEDCLOSE && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = false;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = Server()->Tick() + 1 + Collision()->GetSwitchDelay(MapIndex) * Server()->TickSpeed();
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHTIMEDCLOSE;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = Server()->Tick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SWITCHCLOSE && Team() != TEAM_SUPER && Collision()->GetSwitchNumber(MapIndex) > 0)
+	{
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()] = false;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aEndTick[Team()] = 0;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aType[Team()] = TILE_SWITCHCLOSE;
+		Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aLastUpdateTick[Team()] = Server()->Tick();
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_FREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			Freeze(Collision()->GetSwitchDelay(MapIndex));
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_DFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+			m_Core.m_DeepFrozen = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_DUNFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+			m_Core.m_DeepFrozen = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_LFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			m_Core.m_LiveFrozen = true;
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_LUNFREEZE && Team() != TEAM_SUPER)
+	{
+		if(Collision()->GetSwitchNumber(MapIndex) == 0 || Switchers()[Collision()->GetSwitchNumber(MapIndex)].m_aStatus[Team()])
+		{
+			m_Core.m_LiveFrozen = false;
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_HammerHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can hammer hit others");
+		m_Core.m_HammerHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_HammerHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_HAMMER)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't hammer hit others");
+		m_Core.m_HammerHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_ShotgunHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with shotgun");
+		m_Core.m_ShotgunHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_ShotgunHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_SHOTGUN)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with shotgun");
+		m_Core.m_ShotgunHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_GrenadeHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with grenade");
+		m_Core.m_GrenadeHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_GrenadeHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_GRENADE)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with grenade");
+		m_Core.m_GrenadeHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_ENABLE && m_Core.m_LaserHitDisabled && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can shoot others with laser");
+		m_Core.m_LaserHitDisabled = false;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_HIT_DISABLE && !(m_Core.m_LaserHitDisabled) && Collision()->GetSwitchDelay(MapIndex) == WEAPON_LASER)
+	{
+		GameServer()->SendChatTarget(GetPlayer()->GetCID(), "You can't shoot others with laser");
+		m_Core.m_LaserHitDisabled = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_JUMP)
+	{
+		int NewJumps = Collision()->GetSwitchDelay(MapIndex);
+		if(NewJumps == 255)
+		{
+			NewJumps = -1;
+		}
+
+		if(NewJumps != m_Core.m_Jumps)
+		{
+			char aBuf[256];
+			if(NewJumps == -1)
+				str_copy(aBuf, "You only have your ground jump now");
+			else if(NewJumps == 1)
+				str_format(aBuf, sizeof(aBuf), "You can jump %d time", NewJumps);
+			else
+				str_format(aBuf, sizeof(aBuf), "You can jump %d times", NewJumps);
+			GameServer()->SendChatTarget(GetPlayer()->GetCID(), aBuf);
+			m_Core.m_Jumps = NewJumps;
+		}
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_ADD_TIME && !m_LastPenalty)
+	{
+		int min = Collision()->GetSwitchDelay(MapIndex);
+		int sec = Collision()->GetSwitchNumber(MapIndex);
+		int Team = Teams()->m_Core.Team(m_Core.m_Id);
+
+		m_StartTime -= (min * 60 + sec) * Server()->TickSpeed();
+
+		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team != TEAM_FLOCK) && Team != TEAM_SUPER)
+		{
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				if(Teams()->m_Core.Team(i) == Team && i != m_Core.m_Id && GameServer()->m_apPlayers[i])
+				{
+					CCharacter *pChar = GameServer()->m_apPlayers[i]->GetCharacter();
+
+					if(pChar)
+						pChar->m_StartTime = m_StartTime;
+				}
+			}
+		}
+
+		m_LastPenalty = true;
+	}
+	else if(Collision()->GetSwitchType(MapIndex) == TILE_SUBTRACT_TIME && !m_LastBonus)
+	{
+		int min = Collision()->GetSwitchDelay(MapIndex);
+		int sec = Collision()->GetSwitchNumber(MapIndex);
+		int Team = Teams()->m_Core.Team(m_Core.m_Id);
+
+		m_StartTime += (min * 60 + sec) * Server()->TickSpeed();
+		if(m_StartTime > Server()->Tick())
+			m_StartTime = Server()->Tick();
+
+		if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team != TEAM_FLOCK) && Team != TEAM_SUPER)
+		{
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				if(Teams()->m_Core.Team(i) == Team && i != m_Core.m_Id && GameServer()->m_apPlayers[i])
+				{
+					CCharacter *pChar = GameServer()->m_apPlayers[i]->GetCharacter();
+
+					if(pChar)
+						pChar->m_StartTime = m_StartTime;
+				}
+			}
+		}
+
+		m_LastBonus = true;
+	}
+
+	if(Collision()->GetSwitchType(MapIndex) != TILE_ADD_TIME)
+	{
+		m_LastPenalty = false;
+	}
+
+	if(Collision()->GetSwitchType(MapIndex) != TILE_SUBTRACT_TIME)
+	{
+		m_LastBonus = false;
+	}
+
+	int z = Collision()->IsTeleport(MapIndex);
+	if(!g_Config.m_SvOldTeleportHook && !g_Config.m_SvOldTeleportWeapons && z && !(*m_pTeleOuts)[z - 1].empty())
+	{
+		if(m_Core.m_Super)
+			return;
+		int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleOuts)[z - 1].size());
+		m_Core.m_Pos = (*m_pTeleOuts)[z - 1][TeleOut];
+		if(!g_Config.m_SvTeleportHoldHook)
+		{
+			ResetHook();
+		}
+		if(g_Config.m_SvTeleportLoseWeapons)
+			ResetPickups();
+		return;
+	}
+	int evilz = Collision()->IsEvilTeleport(MapIndex);
+	if(evilz && !(*m_pTeleOuts)[evilz - 1].empty())
+	{
+		if(m_Core.m_Super)
+			return;
+		int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleOuts)[evilz - 1].size());
+		m_Core.m_Pos = (*m_pTeleOuts)[evilz - 1][TeleOut];
+		if(!g_Config.m_SvOldTeleportHook && !g_Config.m_SvOldTeleportWeapons)
+		{
+			m_Core.m_Vel = vec2(0, 0);
+
+			if(!g_Config.m_SvTeleportHoldHook)
+			{
+				ResetHook();
+				GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+			}
+			if(g_Config.m_SvTeleportLoseWeapons)
+			{
+				ResetPickups();
+			}
+		}
+		return;
+	}
+	if(Collision()->IsCheckEvilTeleport(MapIndex))
+	{
+		if(m_Core.m_Super)
+			return;
+		// first check if there is a TeleCheckOut for the current recorded checkpoint, if not check previous checkpoints
+		for(int k = m_TeleCheckpoint - 1; k >= 0; k--)
+		{
+			if(!(*m_pTeleCheckOuts)[k].empty())
+			{
+				int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleCheckOuts)[k].size());
+				m_Core.m_Pos = (*m_pTeleCheckOuts)[k][TeleOut];
+				m_Core.m_Vel = vec2(0, 0);
+
+				if(!g_Config.m_SvTeleportHoldHook)
+				{
+					ResetHook();
+					GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+				}
+
+				return;
+			}
+		}
+		// if no checkpointout have been found (or if there no recorded checkpoint), teleport to start
+		vec2 SpawnPos;
+		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCID())))
+		{
+			m_Core.m_Pos = SpawnPos;
+			m_Core.m_Vel = vec2(0, 0);
+
+			if(!g_Config.m_SvTeleportHoldHook)
+			{
+				ResetHook();
+				GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+			}
+		}
+		return;
+	}
+	if(Collision()->IsCheckTeleport(MapIndex))
+	{
+		if(m_Core.m_Super)
+			return;
+		// first check if there is a TeleCheckOut for the current recorded checkpoint, if not check previous checkpoints
+		for(int k = m_TeleCheckpoint - 1; k >= 0; k--)
+		{
+			if(!(*m_pTeleCheckOuts)[k].empty())
+			{
+				int TeleOut = GameWorld()->m_Core.RandomOr0((*m_pTeleCheckOuts)[k].size());
+				m_Core.m_Pos = (*m_pTeleCheckOuts)[k][TeleOut];
+
+				if(!g_Config.m_SvTeleportHoldHook)
+				{
+					ResetHook();
+				}
+
+				return;
+			}
+		}
+		// if no checkpointout have been found (or if there no recorded checkpoint), teleport to start
+		vec2 SpawnPos;
+		if(GameServer()->m_pController->CanSpawn(m_pPlayer->GetTeam(), &SpawnPos, GameServer()->GetDDRaceTeam(GetPlayer()->GetCID())))
+		{
+			m_Core.m_Pos = SpawnPos;
+
+			if(!g_Config.m_SvTeleportHoldHook)
+			{
+				ResetHook();
+			}
+		}
+		return;
+	}
+}
+
+void CCharacter::HandleTuneLayer()
+{
+	m_TuneZoneOld = m_TuneZone;
+	int CurrentIndex = Collision()->GetMapIndex(m_Pos);
+	m_TuneZone = Collision()->IsTune(CurrentIndex);
+
+	if(m_TuneZone)
+		m_Core.m_Tuning = TuningList()[m_TuneZone]; // throw tunings from specific zone into gamecore
+	else
+		m_Core.m_Tuning = *Tuning();
+
+	if(m_TuneZone != m_TuneZoneOld) // don't send tunigs all the time
+	{
+		// send zone msgs
+		SendZoneMsgs();
+	}
+}
+
+void CCharacter::SendZoneMsgs()
+{
+	// send zone leave msg
+	// (m_TuneZoneOld >= 0: avoid zone leave msgs on spawn)
+	if(m_TuneZoneOld >= 0 && GameServer()->m_aaZoneLeaveMsg[m_TuneZoneOld][0])
+	{
+		const char *pCur = GameServer()->m_aaZoneLeaveMsg[m_TuneZoneOld];
+		const char *pPos;
+		while((pPos = str_find(pCur, "\\n")))
+		{
+			char aBuf[256];
+			str_copy(aBuf, pCur, pPos - pCur + 1);
+			aBuf[pPos - pCur + 1] = '\0';
+			pCur = pPos + 2;
+			GameServer()->SendChatTarget(m_pPlayer->GetCID(), aBuf);
+		}
+		GameServer()->SendChatTarget(m_pPlayer->GetCID(), pCur);
+	}
+	// send zone enter msg
+	if(GameServer()->m_aaZoneEnterMsg[m_TuneZone][0])
+	{
+		const char *pCur = GameServer()->m_aaZoneEnterMsg[m_TuneZone];
+		const char *pPos;
+		while((pPos = str_find(pCur, "\\n")))
+		{
+			char aBuf[256];
+			str_copy(aBuf, pCur, pPos - pCur + 1);
+			aBuf[pPos - pCur + 1] = '\0';
+			pCur = pPos + 2;
+			GameServer()->SendChatTarget(m_pPlayer->GetCID(), aBuf);
+		}
+		GameServer()->SendChatTarget(m_pPlayer->GetCID(), pCur);
+	}
+}
+
+IAntibot *CCharacter::Antibot()
+{
+	return GameServer()->Antibot();
+}
+
+void CCharacter::SetTeams(CGameTeams *pTeams)
+{
+	m_pTeams = pTeams;
+	m_Core.SetTeamsCore(&m_pTeams->m_Core);
+}
+
+void CCharacter::SetRescue()
+{
+	m_RescueTee.Save(this);
+	m_SetSavePos = true;
+}
+
+void CCharacter::DDRaceTick()
+{
+	mem_copy(&m_Input, &m_SavedInput, sizeof(m_Input));
+	m_Armor = clamp(10 - (m_FreezeTime / 15), 0, 10);
+	if(m_Input.m_Direction != 0 || m_Input.m_Jump != 0)
+		m_LastMove = Server()->Tick();
+
+	if(m_Core.m_LiveFrozen && !m_Core.m_Super)
+	{
+		m_Input.m_Direction = 0;
+		m_Input.m_Jump = 0;
+		// Hook is possible in live freeze
+	}
+	if(m_FreezeTime > 0)
+	{
+		if(m_FreezeTime % Server()->TickSpeed() == Server()->TickSpeed() - 1)
+		{
+			GameServer()->CreateDamageInd(m_Pos, 0, (m_FreezeTime + 1) / Server()->TickSpeed(), TeamMask() & GameServer()->ClientsMaskExcludeClientVersionAndHigher(VERSION_DDNET_NEW_HUD));
+		}
+		m_FreezeTime--;
+		m_Input.m_Direction = 0;
+		m_Input.m_Jump = 0;
+		m_Input.m_Hook = 0;
+		if(m_FreezeTime == 1)
+			UnFreeze();
+	}
+
+	HandleTuneLayer(); // need this before coretick
+
+	// check if the tee is in any type of freeze
+	int Index = Collision()->GetPureMapIndex(m_Pos);
+	const int aTiles[] = {
+		Collision()->GetTileIndex(Index),
+		Collision()->GetFTileIndex(Index),
+		Collision()->GetSwitchType(Index)};
+	m_Core.m_IsInFreeze = false;
+	for(const int Tile : aTiles)
+	{
+		if(Tile == TILE_FREEZE || Tile == TILE_DFREEZE || Tile == TILE_LFREEZE)
+		{
+			m_Core.m_IsInFreeze = true;
+			break;
+		}
+	}
+
+	// check for nearby health pickups (also freeze)
+	bool InHealthPickup = false;
+	if(!m_Core.m_IsInFreeze)
+	{
+		CEntity *apEnts[9];
+		int Num = GameWorld()->FindEntities(m_Pos, GetProximityRadius() + CPickup::ms_CollisionExtraSize, apEnts, std::size(apEnts), CGameWorld::ENTTYPE_PICKUP);
+		for(int i = 0; i < Num; ++i)
+		{
+			CPickup *pPickup = static_cast<CPickup *>(apEnts[i]);
+			if(pPickup->Type() == POWERUP_HEALTH)
+			{
+				// This uses a separate variable InHealthPickup instead of setting m_Core.m_IsInFreeze
+				// as the latter causes freezebars to flicker when standing in the freeze range of a
+				// health pickup. When the same code for client prediction is added, the freezebars
+				// still flicker, but only when standing at the edge of the health pickup's freeze range.
+				InHealthPickup = true;
+				break;
+			}
+		}
+	}
+
+	// look for save position for rescue feature
+	if(g_Config.m_SvRescue || ((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || Team() > TEAM_FLOCK) && Team() >= TEAM_FLOCK && Team() < TEAM_SUPER))
+	{
+		if(!m_Core.m_IsInFreeze && IsGrounded() && !m_Core.m_DeepFrozen && !InHealthPickup)
+		{
+			SetRescue();
+		}
+	}
+
+	m_Core.m_Id = GetPlayer()->GetCID();
+}
+
+void CCharacter::DDRacePostCoreTick()
+{
+	m_Time = (float)(Server()->Tick() - m_StartTime) / ((float)Server()->TickSpeed());
+
+	if(m_Core.m_EndlessHook || (m_Core.m_Super && g_Config.m_SvEndlessSuperHook))
+		m_Core.m_HookTick = 0;
+
+	m_FrozenLastTick = false;
+
+	if(m_Core.m_DeepFrozen && !m_Core.m_Super)
+		Freeze();
+
+	// following jump rules can be overridden by tiles, like Refill Jumps, Stopper and Wall Jump
+	if(m_Core.m_Jumps == -1)
+	{
+		// The player has only one ground jump, so his feet are always dark
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_Jumps == 0)
+	{
+		// The player has no jumps at all, so his feet are always dark
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_Jumps == 1 && m_Core.m_Jumped > 0)
+	{
+		// If the player has only one jump, each jump is the last one
+		m_Core.m_Jumped |= 2;
+	}
+	else if(m_Core.m_JumpedTotal < m_Core.m_Jumps - 1 && m_Core.m_Jumped > 1)
+	{
+		// The player has not yet used up all his jumps, so his feet remain light
+		m_Core.m_Jumped = 1;
+	}
+
+	if((m_Core.m_Super || m_Core.m_EndlessJump) && m_Core.m_Jumped > 1)
+	{
+		// Super players and players with infinite jumps always have light feet
+		m_Core.m_Jumped = 1;
+	}
+
+	int CurrentIndex = Collision()->GetMapIndex(m_Pos);
+	HandleSkippableTiles(CurrentIndex);
+	if(!m_Alive)
+		return;
+
+	// handle Anti-Skip tiles
+	std::vector<int> vIndices = Collision()->GetMapIndices(m_PrevPos, m_Pos);
+	if(!vIndices.empty())
+	{
+		for(int &Index : vIndices)
+		{
+			HandleTiles(Index);
+			if(!m_Alive)
+				return;
+		}
+	}
+	else
+	{
+		HandleTiles(CurrentIndex);
+		if(!m_Alive)
+			return;
+	}
+
+	// teleport gun
+	if(m_TeleGunTeleport)
+	{
+		GameServer()->CreateDeath(m_Pos, m_pPlayer->GetCID(), TeamMask());
+		m_Core.m_Pos = m_TeleGunPos;
+		if(!m_IsBlueTeleGunTeleport)
+			m_Core.m_Vel = vec2(0, 0);
+		GameServer()->CreateDeath(m_TeleGunPos, m_pPlayer->GetCID(), TeamMask());
+		GameServer()->CreateSound(m_TeleGunPos, SOUND_WEAPON_SPAWN, TeamMask());
+		m_TeleGunTeleport = false;
+		m_IsBlueTeleGunTeleport = false;
+	}
+
+	HandleBroadcast();
+}
+
+bool CCharacter::Freeze(int Seconds)
+{
+	if(Seconds <= 0 || m_Core.m_Super || m_FreezeTime > Seconds * Server()->TickSpeed())
+		return false;
+	if(m_Core.m_FreezeStart < Server()->Tick() - Server()->TickSpeed())
+	{
+		m_Armor = 0;
+		m_FreezeTime = Seconds * Server()->TickSpeed();
+		m_Core.m_FreezeStart = Server()->Tick();
+		return true;
+	}
+	return false;
+}
+
+bool CCharacter::Freeze()
+{
+	return Freeze(g_Config.m_SvFreezeDelay);
+}
+
+bool CCharacter::UnFreeze()
+{
+	if(m_FreezeTime > 0)
+	{
+		m_Armor = 10;
+		if(!m_Core.m_aWeapons[m_Core.m_ActiveWeapon].m_Got)
+			m_Core.m_ActiveWeapon = WEAPON_GUN;
+		m_FreezeTime = 0;
+		m_Core.m_FreezeStart = 0;
+		m_FrozenLastTick = true;
+		return true;
+	}
+	return false;
+}
+
+void CCharacter::GiveWeapon(int Weapon, bool Remove)
+{
+	if(Weapon == WEAPON_NINJA)
+	{
+		if(Remove)
+			RemoveNinja();
+		else
+			GiveNinja();
+		return;
+	}
+
+	if(Remove)
+	{
+		if(GetActiveWeapon() == Weapon)
+			SetActiveWeapon(WEAPON_GUN);
+	}
+	else
+	{
+		m_Core.m_aWeapons[Weapon].m_Ammo = -1;
+	}
+
+	m_Core.m_aWeapons[Weapon].m_Got = !Remove;
+}
+
+void CCharacter::GiveAllWeapons()
+{
+	for(int i = WEAPON_GUN; i < NUM_WEAPONS - 1; i++)
+	{
+		GiveWeapon(i);
+	}
+}
+
+void CCharacter::ResetPickups()
+{
+	for(int i = WEAPON_SHOTGUN; i < NUM_WEAPONS - 1; i++)
+	{
+		m_Core.m_aWeapons[i].m_Got = false;
+		if(m_Core.m_ActiveWeapon == i)
+			m_Core.m_ActiveWeapon = WEAPON_GUN;
+	}
+}
+
+void CCharacter::SetEndlessHook(bool Enable)
+{
+	if(m_Core.m_EndlessHook == Enable)
+	{
+		return;
+	}
+	GameServer()->SendChatTarget(GetPlayer()->GetCID(), Enable ? "Endless hook has been activated" : "Endless hook has been deactivated");
+
+	m_Core.m_EndlessHook = Enable;
+}
+
+void CCharacter::Pause(bool Pause)
+{
+	m_Paused = Pause;
+	if(Pause)
+	{
+		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = 0;
+		GameServer()->m_World.RemoveEntity(this);
+
+		if(m_Core.HookedPlayer() != -1) // Keeping hook would allow cheats
+		{
+			ResetHook();
+			GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
+		}
+	}
+	else
+	{
+		m_Core.m_Vel = vec2(0, 0);
+		GameServer()->m_World.m_Core.m_apCharacters[m_pPlayer->GetCID()] = &m_Core;
+		GameServer()->m_World.InsertEntity(this);
+	}
+}
+
+void CCharacter::DDRaceInit()
+{
+	m_Paused = false;
+	m_DDRaceState = DDRACE_NONE;
+	m_PrevPos = m_Pos;
+	m_SetSavePos = false;
+	m_LastBroadcast = 0;
+	m_TeamBeforeSuper = 0;
+	m_Core.m_Id = GetPlayer()->GetCID();
+	m_TeleCheckpoint = 0;
+	m_Core.m_EndlessHook = g_Config.m_SvEndlessDrag;
+	if(g_Config.m_SvHit)
+	{
+		m_Core.m_HammerHitDisabled = false;
+		m_Core.m_ShotgunHitDisabled = false;
+		m_Core.m_GrenadeHitDisabled = false;
+		m_Core.m_LaserHitDisabled = false;
+	}
+	else
+	{
+		m_Core.m_HammerHitDisabled = true;
+		m_Core.m_ShotgunHitDisabled = true;
+		m_Core.m_GrenadeHitDisabled = true;
+		m_Core.m_LaserHitDisabled = true;
+	}
+	m_Core.m_Jumps = 2;
+	m_FreezeHammer = false;
+
+	int Team = Teams()->m_Core.Team(m_Core.m_Id);
+
+	if(Teams()->TeamLocked(Team))
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(Teams()->m_Core.Team(i) == Team && i != m_Core.m_Id && GameServer()->m_apPlayers[i])
+			{
+				CCharacter *pChar = GameServer()->m_apPlayers[i]->GetCharacter();
+
+				if(pChar)
+				{
+					m_DDRaceState = pChar->m_DDRaceState;
+					m_StartTime = pChar->m_StartTime;
+				}
+			}
+		}
+	}
+
+	if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && Team == TEAM_FLOCK)
+	{
+		GameServer()->SendStartWarning(GetPlayer()->GetCID(), "Please join a team before you start");
+	}
+}
+
+void CCharacter::Rescue()
+{
+	if(m_SetSavePos && !m_Core.m_Super)
+	{
+		if(m_LastRescue + (int64_t)g_Config.m_SvRescueDelay * Server()->TickSpeed() > Server()->Tick())
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "You have to wait %d seconds until you can rescue yourself", (int)((m_LastRescue + (int64_t)g_Config.m_SvRescueDelay * Server()->TickSpeed() - Server()->Tick()) / Server()->TickSpeed()));
+			GameServer()->SendChatTarget(GetPlayer()->GetCID(), aBuf);
+			return;
+		}
+
+		float StartTime = m_StartTime;
+		m_RescueTee.Load(this, Team());
+		// Don't load these from saved tee:
+		m_Core.m_Vel = vec2(0, 0);
+		m_Core.m_HookState = HOOK_IDLE;
+		m_StartTime = StartTime;
+		m_SavedInput.m_Direction = 0;
+		m_SavedInput.m_Jump = 0;
+		// simulate releasing the fire button
+		if((m_SavedInput.m_Fire & 1) != 0)
+			m_SavedInput.m_Fire++;
+		m_SavedInput.m_Fire &= INPUT_STATE_MASK;
+		m_SavedInput.m_Hook = 0;
+		m_pPlayer->Pause(CPlayer::PAUSE_NONE, true);
+	}
+}
+
+CClientMask CCharacter::TeamMask()
+{
+	return Teams()->TeamMask(Team(), -1, GetPlayer()->GetCID());
+}
+
+void CCharacter::SwapClients(int Client1, int Client2)
+{
+	const int HookedPlayer = m_Core.HookedPlayer();
+	m_Core.SetHookedPlayer(HookedPlayer == Client1 ? Client2 : HookedPlayer == Client2 ? Client1 : HookedPlayer);
+}
diff --git a/src_bkp/game/server/entities/character.h b/src_bkp/game/server/entities/character.h
new file mode 100644
index 0000000000..8f984b7701
--- /dev/null
+++ b/src_bkp/game/server/entities/character.h
@@ -0,0 +1,262 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_ENTITIES_CHARACTER_H
+#define GAME_SERVER_ENTITIES_CHARACTER_H
+
+#include <game/server/entity.h>
+#include <game/server/save.h>
+
+class CGameTeams;
+class CGameWorld;
+class IAntibot;
+struct CAntibotCharacterData;
+
+enum
+{
+	FAKETUNE_FREEZE = 1,
+	FAKETUNE_SOLO = 2,
+	FAKETUNE_NOJUMP = 4,
+	FAKETUNE_NOCOLL = 8,
+	FAKETUNE_NOHOOK = 16,
+	FAKETUNE_JETPACK = 32,
+	FAKETUNE_NOHAMMER = 64,
+};
+
+class CCharacter : public CEntity
+{
+	MACRO_ALLOC_POOL_ID()
+
+	friend class CSaveTee; // need to use core
+
+public:
+	CCharacter(CGameWorld *pWorld, CNetObj_PlayerInput LastInput);
+
+	void Reset() override;
+	void Destroy() override;
+	void PreTick();
+	void Tick() override;
+	void TickDeferred() override;
+	void TickPaused() override;
+	void Snap(int SnappingClient) override;
+	void SwapClients(int Client1, int Client2) override;
+
+	bool CanSnapCharacter(int SnappingClient);
+	bool IsSnappingCharacterInView(int SnappingClientID);
+
+	bool IsGrounded();
+
+	void SetWeapon(int W);
+	void SetJetpack(bool Active);
+	void SetSolo(bool Solo);
+	void SetSuper(bool Super);
+	void SetLiveFrozen(bool Active);
+	void SetDeepFrozen(bool Active);
+	void HandleWeaponSwitch();
+	void DoWeaponSwitch();
+
+	void HandleWeapons();
+	void HandleNinja();
+	void HandleJetpack();
+
+	void OnPredictedInput(CNetObj_PlayerInput *pNewInput);
+	void OnDirectInput(CNetObj_PlayerInput *pNewInput);
+	void ResetHook();
+	void ResetInput();
+	void FireWeapon();
+
+	void Die(int Killer, int Weapon, bool SendKillMsg = true);
+	bool TakeDamage(vec2 Force, int Dmg, int From, int Weapon);
+
+	bool Spawn(class CPlayer *pPlayer, vec2 Pos);
+	bool Remove();
+
+	bool IncreaseHealth(int Amount);
+	bool IncreaseArmor(int Amount);
+
+	void GiveWeapon(int Weapon, bool Remove = false);
+	void GiveNinja();
+	void RemoveNinja();
+	void SetEndlessHook(bool Enable);
+
+	void SetEmote(int Emote, int Tick);
+
+	void Rescue();
+
+	int NeededFaketuning() { return m_NeededFaketuning; }
+	bool IsAlive() const { return m_Alive; }
+	bool IsPaused() const { return m_Paused; }
+	class CPlayer *GetPlayer() { return m_pPlayer; }
+	CClientMask TeamMask();
+
+private:
+	// player controlling this character
+	class CPlayer *m_pPlayer;
+
+	bool m_Alive;
+	bool m_Paused;
+	int m_NeededFaketuning;
+
+	// weapon info
+	CEntity *m_apHitObjects[10];
+	int m_NumObjectsHit;
+
+	int m_LastWeapon;
+	int m_QueuedWeapon;
+
+	int m_ReloadTimer;
+	int m_AttackTick;
+
+	int m_DamageTaken;
+
+	int m_EmoteType;
+	int m_EmoteStop;
+
+	// last tick that the player took any action ie some input
+	int m_LastAction;
+	int m_LastNoAmmoSound;
+
+	// these are non-heldback inputs
+	CNetObj_PlayerInput m_LatestPrevPrevInput;
+	CNetObj_PlayerInput m_LatestPrevInput;
+	CNetObj_PlayerInput m_LatestInput;
+
+	// input
+	CNetObj_PlayerInput m_PrevInput;
+	CNetObj_PlayerInput m_Input;
+	CNetObj_PlayerInput m_SavedInput;
+	int m_NumInputs;
+
+	int m_DamageTakenTick;
+
+	int m_Health;
+	int m_Armor;
+
+	// the player core for the physics
+	CCharacterCore m_Core;
+	CGameTeams *m_pTeams = nullptr;
+
+	std::map<int, std::vector<vec2>> *m_pTeleOuts = nullptr;
+	std::map<int, std::vector<vec2>> *m_pTeleCheckOuts = nullptr;
+
+	// info for dead reckoning
+	int m_ReckoningTick; // tick that we are performing dead reckoning From
+	CCharacterCore m_SendCore; // core that we should send
+	CCharacterCore m_ReckoningCore; // the dead reckoning core
+
+	// DDRace
+
+	void SnapCharacter(int SnappingClient, int ID);
+	static bool IsSwitchActiveCb(int Number, void *pUser);
+	void SetTimeCheckpoint(int TimeCheckpoint);
+	void HandleTiles(int Index);
+	float m_Time;
+	int m_LastBroadcast;
+	void DDRaceInit();
+	void HandleSkippableTiles(int Index);
+	void SetRescue();
+	void DDRaceTick();
+	void DDRacePostCoreTick();
+	void HandleBroadcast();
+	void HandleTuneLayer();
+	void SendZoneMsgs();
+	IAntibot *Antibot();
+
+	bool m_SetSavePos;
+	CSaveTee m_RescueTee;
+
+public:
+	CGameTeams *Teams() { return m_pTeams; }
+	void SetTeams(CGameTeams *pTeams);
+	void SetTeleports(std::map<int, std::vector<vec2>> *pTeleOuts, std::map<int, std::vector<vec2>> *pTeleCheckOuts);
+
+	void FillAntibot(CAntibotCharacterData *pData);
+	void Pause(bool Pause);
+	bool Freeze(int Seconds);
+	bool Freeze();
+	bool UnFreeze();
+	void GiveAllWeapons();
+	void ResetPickups();
+	int m_DDRaceState;
+	int Team();
+	bool CanCollide(int ClientID);
+	bool SameTeam(int ClientID);
+	bool m_NinjaJetpack;
+	int m_TeamBeforeSuper;
+	int m_FreezeTime;
+	bool m_FrozenLastTick;
+	bool m_FreezeHammer;
+	int m_TuneZone;
+	int m_TuneZoneOld;
+	int m_PainSoundTimer;
+	int m_LastMove;
+	int m_StartTime;
+	vec2 m_PrevPos;
+	int m_TeleCheckpoint;
+
+	int m_TimeCpBroadcastEndTick;
+	int m_LastTimeCp;
+	int m_LastTimeCpBroadcasted;
+	float m_aCurrentTimeCp[MAX_CHECKPOINTS];
+
+	int m_TileIndex;
+	int m_TileFIndex;
+
+	int m_MoveRestrictions;
+
+	int64_t m_LastStartWarning;
+	int64_t m_LastRescue;
+	bool m_LastRefillJumps;
+	bool m_LastPenalty;
+	bool m_LastBonus;
+	vec2 m_TeleGunPos;
+	bool m_TeleGunTeleport;
+	bool m_IsBlueTeleGunTeleport;
+	int m_StrongWeakID;
+
+	int m_SpawnTick;
+	int m_WeaponChangeTick;
+
+	// Setters/Getters because i don't want to modify vanilla vars access modifiers
+	int GetLastWeapon() { return m_LastWeapon; }
+	void SetLastWeapon(int LastWeap) { m_LastWeapon = LastWeap; }
+	int GetActiveWeapon() { return m_Core.m_ActiveWeapon; }
+	void SetActiveWeapon(int ActiveWeap) { m_Core.m_ActiveWeapon = ActiveWeap; }
+	void SetLastAction(int LastAction) { m_LastAction = LastAction; }
+	int GetArmor() { return m_Armor; }
+	void SetArmor(int Armor) { m_Armor = Armor; }
+	CCharacterCore GetCore() { return m_Core; }
+	void SetCore(CCharacterCore Core) { m_Core = Core; }
+	CCharacterCore *Core() { return &m_Core; }
+	bool GetWeaponGot(int Type) { return m_Core.m_aWeapons[Type].m_Got; }
+	void SetWeaponGot(int Type, bool Value) { m_Core.m_aWeapons[Type].m_Got = Value; }
+	int GetWeaponAmmo(int Type) { return m_Core.m_aWeapons[Type].m_Ammo; }
+	void SetWeaponAmmo(int Type, int Value) { m_Core.m_aWeapons[Type].m_Ammo = Value; }
+	void SetNinjaActivationDir(vec2 ActivationDir) { m_Core.m_Ninja.m_ActivationDir = ActivationDir; }
+	void SetNinjaActivationTick(int ActivationTick) { m_Core.m_Ninja.m_ActivationTick = ActivationTick; }
+	void SetNinjaCurrentMoveTime(int CurrentMoveTime) { m_Core.m_Ninja.m_CurrentMoveTime = CurrentMoveTime; }
+
+	int GetLastAction() const { return m_LastAction; }
+
+	bool HasTelegunGun() { return m_Core.m_HasTelegunGun; }
+	bool HasTelegunGrenade() { return m_Core.m_HasTelegunGrenade; }
+	bool HasTelegunLaser() { return m_Core.m_HasTelegunLaser; }
+
+	bool HammerHitDisabled() { return m_Core.m_HammerHitDisabled; }
+	bool ShotgunHitDisabled() { return m_Core.m_ShotgunHitDisabled; }
+	bool LaserHitDisabled() { return m_Core.m_LaserHitDisabled; }
+	bool GrenadeHitDisabled() { return m_Core.m_GrenadeHitDisabled; }
+
+	bool IsSuper() { return m_Core.m_Super; }
+
+	CSaveTee &GetRescueTeeRef() { return m_RescueTee; }
+};
+
+enum
+{
+	DDRACE_NONE = 0,
+	DDRACE_STARTED,
+	DDRACE_CHEAT, // no time and won't start again unless ordered by a mod or death
+	DDRACE_FINISHED
+};
+
+#endif
diff --git a/src_bkp/game/server/entities/door.cpp b/src_bkp/game/server/entities/door.cpp
new file mode 100644
index 0000000000..14e8670b73
--- /dev/null
+++ b/src_bkp/game/server/entities/door.cpp
@@ -0,0 +1,83 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "door.h"
+#include "character.h"
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+#include <game/teamscore.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+
+CDoor::CDoor(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length,
+	int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Number = Number;
+	m_Pos = Pos;
+	m_Length = Length;
+	m_Direction = vec2(std::sin(Rotation), std::cos(Rotation));
+	vec2 To = Pos + normalize(m_Direction) * m_Length;
+
+	GameServer()->Collision()->IntersectNoLaser(Pos, To, &this->m_To, 0);
+	ResetCollision();
+	GameWorld()->InsertEntity(this);
+}
+
+void CDoor::ResetCollision()
+{
+	for(int i = 0; i < m_Length - 1; i++)
+	{
+		vec2 CurrentPos(m_Pos.x + (m_Direction.x * i),
+			m_Pos.y + (m_Direction.y * i));
+		if(GameServer()->Collision()->CheckPoint(CurrentPos) || GameServer()->Collision()->GetTile(m_Pos.x, m_Pos.y) || GameServer()->Collision()->GetFTile(m_Pos.x, m_Pos.y))
+			break;
+		else
+			GameServer()->Collision()->SetDCollisionAt(
+				m_Pos.x + (m_Direction.x * i),
+				m_Pos.y + (m_Direction.y * i), TILE_STOPA, 0 /*Flags*/,
+				m_Number);
+	}
+}
+
+void CDoor::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CDoor::Snap(int SnappingClient)
+{
+	if(NetworkClipped(SnappingClient, m_Pos) && NetworkClipped(SnappingClient, m_To))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+
+	vec2 From;
+	int StartTick;
+
+	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		From = m_To;
+		StartTick = -1;
+	}
+	else
+	{
+		CCharacter *pChr = GameServer()->GetPlayerChar(SnappingClient);
+
+		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
+			pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+
+		if(pChr && pChr->Team() != TEAM_SUPER && pChr->IsAlive() && !Switchers().empty() && Switchers()[m_Number].m_aStatus[pChr->Team()])
+		{
+			From = m_To;
+		}
+		else
+		{
+			From = m_Pos;
+		}
+		StartTick = Server()->Tick();
+	}
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, From, StartTick, -1, LASERTYPE_DOOR, 0, m_Number);
+}
diff --git a/src_bkp/game/server/entities/door.h b/src_bkp/game/server/entities/door.h
new file mode 100644
index 0000000000..0db74f5641
--- /dev/null
+++ b/src_bkp/game/server/entities/door.h
@@ -0,0 +1,24 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_ENTITIES_DOOR_H
+#define GAME_SERVER_ENTITIES_DOOR_H
+
+#include <game/server/entity.h>
+
+class CGameWorld;
+
+class CDoor : public CEntity
+{
+	vec2 m_To;
+	void ResetCollision();
+	int m_Length;
+	vec2 m_Direction;
+
+public:
+	CDoor(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length,
+		int Number);
+
+	void Reset() override;
+	void Snap(int SnappingClient) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_DOOR_H
diff --git a/src_bkp/game/server/entities/dragger.cpp b/src_bkp/game/server/entities/dragger.cpp
new file mode 100644
index 0000000000..e22800187c
--- /dev/null
+++ b/src_bkp/game/server/entities/dragger.cpp
@@ -0,0 +1,251 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "dragger.h"
+#include "character.h"
+#include "dragger_beam.h"
+
+#include <engine/server.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+#include <game/server/teams.h>
+
+CDragger::CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool IgnoreWalls, int Layer, int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Core = vec2(0.0f, 0.0f);
+	m_Pos = Pos;
+	m_Strength = Strength;
+	m_IgnoreWalls = IgnoreWalls;
+	m_Layer = Layer;
+	m_Number = Number;
+	m_EvalTick = Server()->Tick();
+
+	for(auto &TargetId : m_aTargetIdInTeam)
+	{
+		TargetId = -1;
+	}
+	mem_zero(m_apDraggerBeam, sizeof(m_apDraggerBeam));
+	GameWorld()->InsertEntity(this);
+}
+
+void CDragger::Tick()
+{
+	if(Server()->Tick() % (int)(Server()->TickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		m_EvalTick = Server()->Tick();
+		int index = GameServer()->Collision()->IsMover(m_Pos.x, m_Pos.y, &Flags);
+		if(index)
+		{
+			m_Core = GameServer()->Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+
+		// Adopt the new position for all outgoing laser beams
+		for(auto &DraggerBeam : m_apDraggerBeam)
+		{
+			if(DraggerBeam != nullptr)
+			{
+				DraggerBeam->SetPos(m_Pos);
+			}
+		}
+
+		LookForPlayersToDrag();
+	}
+}
+
+void CDragger::LookForPlayersToDrag()
+{
+	// Create a list of players who are in the range of the dragger
+	CEntity *apPlayersInRange[MAX_CLIENTS];
+	mem_zero(apPlayersInRange, sizeof(apPlayersInRange));
+
+	int NumPlayersInRange = GameServer()->m_World.FindEntities(m_Pos,
+		g_Config.m_SvDraggerRange - CCharacterCore::PhysicalSize(),
+		apPlayersInRange, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+	// The closest player (within range) in a team is selected as the target
+	int aClosestTargetIdInTeam[MAX_CLIENTS];
+	bool aCanStillBeTeamTarget[MAX_CLIENTS];
+	bool aIsTarget[MAX_CLIENTS];
+	int aMinDistInTeam[MAX_CLIENTS];
+	mem_zero(aCanStillBeTeamTarget, sizeof(aCanStillBeTeamTarget));
+	mem_zero(aMinDistInTeam, sizeof(aMinDistInTeam));
+	mem_zero(aIsTarget, sizeof(aIsTarget));
+	for(int &TargetId : aClosestTargetIdInTeam)
+	{
+		TargetId = -1;
+	}
+
+	for(int i = 0; i < NumPlayersInRange; i++)
+	{
+		CCharacter *pTarget = static_cast<CCharacter *>(apPlayersInRange[i]);
+		const int &TargetTeam = pTarget->Team();
+
+		// Do not create a dragger beam for super player
+		if(TargetTeam == TEAM_SUPER)
+		{
+			continue;
+		}
+		// If the dragger is disabled for the target's team, no dragger beam will be generated
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[TargetTeam])
+		{
+			continue;
+		}
+
+		// Dragger beams can be created only for reachable, alive players
+		int IsReachable =
+			m_IgnoreWalls ?
+				!GameServer()->Collision()->IntersectNoLaserNW(m_Pos, pTarget->m_Pos, 0, 0) :
+				!GameServer()->Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
+		if(IsReachable && pTarget->IsAlive())
+		{
+			const int &TargetClientId = pTarget->GetPlayer()->GetCID();
+			// Solo players are dragged independently from the rest of the team
+			if(pTarget->Teams()->m_Core.GetSolo(TargetClientId))
+			{
+				aIsTarget[TargetClientId] = true;
+			}
+			else
+			{
+				int Distance = distance(pTarget->m_Pos, m_Pos);
+				if(aMinDistInTeam[TargetTeam] == 0 || aMinDistInTeam[TargetTeam] > Distance)
+				{
+					aMinDistInTeam[TargetTeam] = Distance;
+					aClosestTargetIdInTeam[TargetTeam] = TargetClientId;
+				}
+				aCanStillBeTeamTarget[TargetClientId] = true;
+			}
+		}
+	}
+
+	// Set the closest player for each team as a target if the team does not have a target player yet
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if((m_aTargetIdInTeam[i] != -1 && !aCanStillBeTeamTarget[m_aTargetIdInTeam[i]]) || m_aTargetIdInTeam[i] == -1)
+		{
+			m_aTargetIdInTeam[i] = aClosestTargetIdInTeam[i];
+		}
+		if(m_aTargetIdInTeam[i] != -1)
+		{
+			aIsTarget[m_aTargetIdInTeam[i]] = true;
+		}
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		// Create Dragger Beams which have not been created yet
+		if(aIsTarget[i] && m_apDraggerBeam[i] == nullptr)
+		{
+			m_apDraggerBeam[i] = new CDraggerBeam(&GameServer()->m_World, this, m_Pos, m_Strength, m_IgnoreWalls, i, m_Layer, m_Number);
+			// The generated dragger beam is placed in the first position in the tick sequence and would therefore
+			// no longer be executed automatically in this tick. To execute the dragger beam nevertheless already
+			// this tick we call it manually (we do this to keep the old game logic)
+			m_apDraggerBeam[i]->Tick();
+		}
+		// Remove dragger beams that have not yet been deleted
+		else if(!aIsTarget[i] && m_apDraggerBeam[i] != nullptr)
+		{
+			m_apDraggerBeam[i]->Reset();
+		}
+	}
+}
+
+void CDragger::RemoveDraggerBeam(int ClientID)
+{
+	m_apDraggerBeam[ClientID] = nullptr;
+}
+
+bool CDragger::WillDraggerBeamUseDraggerID(int TargetClientID, int SnappingClientID)
+{
+	// For each snapping client, this must return true for at most one target (i.e. only one of the dragger beams),
+	// in which case the dragger itself must not be snapped
+	CCharacter *pTargetChar = GameServer()->GetPlayerChar(TargetClientID);
+	CCharacter *pSnapChar = GameServer()->GetPlayerChar(SnappingClientID);
+	if(pTargetChar && pSnapChar && m_apDraggerBeam[TargetClientID] != nullptr)
+	{
+		const int SnapTeam = pSnapChar->Team();
+		const int TargetTeam = pTargetChar->Team();
+		if(SnapTeam == TargetTeam && SnapTeam < MAX_CLIENTS)
+		{
+			if(pSnapChar->Teams()->m_Core.GetSolo(SnappingClientID) || m_aTargetIdInTeam[SnapTeam] < 0)
+			{
+				return SnappingClientID == TargetClientID;
+			}
+			else
+			{
+				return m_aTargetIdInTeam[SnapTeam] == TargetClientID;
+			}
+		}
+	}
+	return false;
+}
+
+void CDragger::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CDragger::Snap(int SnappingClient)
+{
+	// Only players with the dragger in their field of view or who want to see everything will receive the snap
+	if(NetworkClipped(SnappingClient))
+		return;
+
+	// Send the dragger in its resting position if the player would not otherwise see a dragger beam within its own team
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(WillDraggerBeamUseDraggerID(i, SnappingClient))
+		{
+			return;
+		}
+	}
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+
+	int Subtype = (m_IgnoreWalls ? 1 : 0) | (clamp(round_to_int(m_Strength - 1.f), 0, 2) << 1);
+
+	int StartTick;
+	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		StartTick = -1;
+	}
+	else
+	{
+		// Emulate turned off blinking dragger for old clients
+		CCharacter *pChar = GameServer()->GetPlayerChar(SnappingClient);
+		if(SnappingClient != SERVER_DEMO_CLIENT &&
+			(GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS ||
+				GameServer()->m_apPlayers[SnappingClient]->IsPaused()) &&
+			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+
+		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
+		if(pChar && m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[pChar->Team()] && !Tick)
+			return;
+
+		StartTick = m_EvalTick;
+		if(StartTick < Server()->Tick() - 4)
+			StartTick = Server()->Tick() - 4;
+		else if(StartTick > Server()->Tick())
+			StartTick = Server()->Tick();
+	}
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, m_Pos, StartTick, -1, LASERTYPE_DRAGGER, Subtype, m_Number);
+}
+
+void CDragger::SwapClients(int Client1, int Client2)
+{
+	std::swap(m_apDraggerBeam[Client1], m_apDraggerBeam[Client2]);
+	for(int &TargetId : m_aTargetIdInTeam)
+	{
+		TargetId = TargetId == Client1 ? Client2 : TargetId == Client2 ? Client1 : TargetId;
+	}
+}
diff --git a/src_bkp/game/server/entities/dragger.h b/src_bkp/game/server/entities/dragger.h
new file mode 100644
index 0000000000..de8abe5a35
--- /dev/null
+++ b/src_bkp/game/server/entities/dragger.h
@@ -0,0 +1,47 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_ENTITIES_DRAGGER_H
+#define GAME_SERVER_ENTITIES_DRAGGER_H
+
+#include <game/server/entity.h>
+class CDraggerBeam;
+
+/**
+ * Draggers generate dragger beams which pull players towards their center similar to a tractor beam
+ *
+ * A dragger will only generate one dragger beam per team for the closest player for whom the following criteria are met:
+ * - The player is within the dragger range (sv_dragger_range).
+ * - The player is not a super player
+ * - The dragger is activated
+ * - The dragger beam to be generated is not blocked by laser stoppers (or solid blocks if IgnoreWalls is set to false)
+ * With the exception of solo players, for whom a dragger beam is always generated, regardless of the rest of the team,
+ * if the above criteria are met. Solo players have no influence on the generation of the dragger beam for the rest
+ * of the team.
+ * A created dragger beam remains for the selected player until one of the criteria is no longer fulfilled. Only then
+ * can a new dragger beam be created for that team, which may drag another team partner.
+ */
+class CDragger : public CEntity
+{
+	// m_Core is the direction vector by which a dragger is shifted at each movement tick (every 150ms)
+	vec2 m_Core;
+	float m_Strength;
+	bool m_IgnoreWalls;
+	int m_EvalTick;
+
+	int m_aTargetIdInTeam[MAX_CLIENTS];
+	CDraggerBeam *m_apDraggerBeam[MAX_CLIENTS];
+
+	void LookForPlayersToDrag();
+
+public:
+	CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool IgnoreWalls, int Layer = 0, int Number = 0);
+
+	void RemoveDraggerBeam(int ClientID);
+	bool WillDraggerBeamUseDraggerID(int TargetClientID, int SnappingClientID);
+
+	void Reset() override;
+	void Tick() override;
+	void Snap(int SnappingClient) override;
+	void SwapClients(int Client1, int Client2) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_DRAGGER_H
diff --git a/src_bkp/game/server/entities/dragger_beam.cpp b/src_bkp/game/server/entities/dragger_beam.cpp
new file mode 100644
index 0000000000..26f03dab73
--- /dev/null
+++ b/src_bkp/game/server/entities/dragger_beam.cpp
@@ -0,0 +1,143 @@
+/* See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "dragger_beam.h"
+#include "character.h"
+#include "dragger.h"
+
+#include <engine/server.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+
+CDraggerBeam::CDraggerBeam(CGameWorld *pGameWorld, CDragger *pDragger, vec2 Pos, float Strength, bool IgnoreWalls,
+	int ForClientID, int Layer, int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_pDragger = pDragger;
+	m_Pos = Pos;
+	m_Strength = Strength;
+	m_IgnoreWalls = IgnoreWalls;
+	m_ForClientID = ForClientID;
+	m_Active = true;
+	m_Layer = Layer;
+	m_Number = Number;
+	m_EvalTick = Server()->Tick();
+
+	GameWorld()->InsertEntity(this);
+}
+
+void CDraggerBeam::Tick()
+{
+	if(!m_Active)
+	{
+		return;
+	}
+
+	// Drag only if the player is reachable and alive
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	if(!pTarget)
+	{
+		Reset();
+		return;
+	}
+
+	// The following checks are necessary, because the checks in CDragger::LookForPlayersToDrag only take place
+	// after CDraggerBeam::Tick and only every 150ms
+	// When the dragger is disabled for the target player's team, the dragger beam dissolves. The check if a dragger
+	// is disabled is only executed every 150ms, so the beam can stay activated up to 6 extra ticks
+	if(Server()->Tick() % (int)(Server()->TickSpeed() * 0.15f) == 0)
+	{
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[pTarget->Team()])
+		{
+			Reset();
+			return;
+		}
+	}
+
+	// When the dragger can no longer reach the target player, the dragger beam dissolves
+	int IsReachable =
+		m_IgnoreWalls ?
+			!GameServer()->Collision()->IntersectNoLaserNW(m_Pos, pTarget->m_Pos, 0, 0) :
+			!GameServer()->Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
+	if(!IsReachable ||
+		distance(pTarget->m_Pos, m_Pos) >= g_Config.m_SvDraggerRange || !pTarget->IsAlive())
+	{
+		Reset();
+		return;
+	}
+	// In the center of the dragger a tee does not experience speed-up
+	else if(distance(pTarget->m_Pos, m_Pos) > 28)
+	{
+		vec2 Temp = pTarget->Core()->m_Vel + (normalize(m_Pos - pTarget->m_Pos) * m_Strength);
+		pTarget->Core()->m_Vel = ClampVel(pTarget->m_MoveRestrictions, Temp);
+	}
+}
+
+void CDraggerBeam::SetPos(vec2 Pos)
+{
+	m_Pos = Pos;
+}
+
+void CDraggerBeam::Reset()
+{
+	m_MarkedForDestroy = true;
+	m_Active = false;
+
+	m_pDragger->RemoveDraggerBeam(m_ForClientID);
+}
+
+void CDraggerBeam::Snap(int SnappingClient)
+{
+	if(!m_Active)
+	{
+		return;
+	}
+
+	// Only players who can see the player attached to the dragger can see the dragger beam
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	if(!pTarget || !pTarget->CanSnapCharacter(SnappingClient))
+	{
+		return;
+	}
+	// Only players with the dragger beam in their field of view or who want to see everything will receive the snap
+	vec2 TargetPos = vec2(pTarget->m_Pos.x, pTarget->m_Pos.y);
+	if(distance(pTarget->m_Pos, m_Pos) >= g_Config.m_SvDraggerRange || NetworkClippedLine(SnappingClient, m_Pos, TargetPos))
+	{
+		return;
+	}
+
+	int Subtype = (m_IgnoreWalls ? 1 : 0) | (clamp(round_to_int(m_Strength - 1.f), 0, 2) << 1);
+
+	int StartTick = m_EvalTick;
+	if(StartTick < Server()->Tick() - 4)
+	{
+		StartTick = Server()->Tick() - 4;
+	}
+	else if(StartTick > Server()->Tick())
+	{
+		StartTick = Server()->Tick();
+	}
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		StartTick = -1;
+	}
+
+	int SnapObjID = GetID();
+	if(m_pDragger->WillDraggerBeamUseDraggerID(m_ForClientID, SnappingClient))
+	{
+		SnapObjID = m_pDragger->GetID();
+	}
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), SnapObjID,
+		TargetPos, m_Pos, StartTick, m_ForClientID, LASERTYPE_DRAGGER, Subtype, m_Number);
+}
+
+void CDraggerBeam::SwapClients(int Client1, int Client2)
+{
+	m_ForClientID = m_ForClientID == Client1 ? Client2 : m_ForClientID == Client2 ? Client1 : m_ForClientID;
+}
diff --git a/src_bkp/game/server/entities/dragger_beam.h b/src_bkp/game/server/entities/dragger_beam.h
new file mode 100644
index 0000000000..ce3f65d983
--- /dev/null
+++ b/src_bkp/game/server/entities/dragger_beam.h
@@ -0,0 +1,44 @@
+/* See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_ENTITIES_DRAGGER_BEAM_H
+#define GAME_SERVER_ENTITIES_DRAGGER_BEAM_H
+
+#include <game/server/entity.h>
+
+class CDragger;
+class CGameWorld;
+
+/**
+ * Dragger beams pull a selected player towards their center
+ * 
+ * Dragger beams are generated by a particular dragger for the player closest to it and for whom certain criteria are
+ * met. Dragger beams exist until these criteria are no longer met. Dragger beams dissolve and automatically
+ * de-register from their dragger source as soon as the player for whom they were created:
+ * - is no longer alive
+ * - is no longer in range (sv_dragger_range)
+ * - can no longer be dragged because the beam is intercepted by a laser stopper (or if !IgnoreWalls by solid blocks)
+ * 
+ * Dragger beams accelerate the selected player every tick towards their center. The length of the speed vector, which
+ * is added to that of the player, depends only on the strength of the dragger and is between 1 and 3 units long. If
+ * the player is in the center of the dragger, it will not accelerate.
+ */
+class CDraggerBeam : public CEntity
+{
+	CDragger *m_pDragger;
+	float m_Strength;
+	bool m_IgnoreWalls;
+	int m_ForClientID;
+	int m_EvalTick;
+	bool m_Active;
+
+public:
+	CDraggerBeam(CGameWorld *pGameWorld, CDragger *pDragger, vec2 Pos, float Strength, bool IgnoreWalls, int ForClientID, int Layer, int Number);
+
+	void SetPos(vec2 Pos);
+
+	void Reset() override;
+	void Tick() override;
+	void Snap(int SnappingClient) override;
+	void SwapClients(int Client1, int Client2) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_DRAGGER_BEAM_H
diff --git a/src_bkp/game/server/entities/gun.cpp b/src_bkp/game/server/entities/gun.cpp
new file mode 100644
index 0000000000..5c03604d63
--- /dev/null
+++ b/src_bkp/game/server/entities/gun.cpp
@@ -0,0 +1,181 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include "gun.h"
+#include "character.h"
+#include "plasma.h"
+
+#include <engine/server.h>
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+#include <game/server/teams.h>
+
+CGun::CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive, int Layer, int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Core = vec2(0.0f, 0.0f);
+	m_Pos = Pos;
+	m_Freeze = Freeze;
+	m_Explosive = Explosive;
+	m_Layer = Layer;
+	m_Number = Number;
+	m_EvalTick = Server()->Tick();
+
+	mem_zero(m_aLastFireTeam, sizeof(m_aLastFireTeam));
+	mem_zero(m_aLastFireSolo, sizeof(m_aLastFireSolo));
+	GameWorld()->InsertEntity(this);
+}
+
+void CGun::Tick()
+{
+	if(Server()->Tick() % (int)(Server()->TickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		m_EvalTick = Server()->Tick();
+		int index = GameServer()->Collision()->IsMover(m_Pos.x, m_Pos.y, &Flags);
+		if(index)
+		{
+			m_Core = GameServer()->Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+	}
+	if(g_Config.m_SvPlasmaPerSec > 0)
+	{
+		Fire();
+	}
+}
+
+void CGun::Fire()
+{
+	// Create a list of players who are in the range of the turret
+	CEntity *apPlayersInRange[MAX_CLIENTS];
+	mem_zero(apPlayersInRange, sizeof(apPlayersInRange));
+
+	int NumPlayersInRange = GameServer()->m_World.FindEntities(m_Pos, g_Config.m_SvPlasmaRange,
+		apPlayersInRange, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+
+	// The closest player (within range) in a team is selected as the target
+	int aTargetIdInTeam[MAX_CLIENTS];
+	bool aIsTarget[MAX_CLIENTS];
+	int aMinDistInTeam[MAX_CLIENTS];
+	mem_zero(aMinDistInTeam, sizeof(aMinDistInTeam));
+	mem_zero(aIsTarget, sizeof(aIsTarget));
+	for(int &TargetId : aTargetIdInTeam)
+	{
+		TargetId = -1;
+	}
+
+	for(int i = 0; i < NumPlayersInRange; i++)
+	{
+		CCharacter *pTarget = static_cast<CCharacter *>(apPlayersInRange[i]);
+		const int &TargetTeam = pTarget->Team();
+		// Do not fire at super players
+		if(TargetTeam == TEAM_SUPER)
+		{
+			continue;
+		}
+		// If the turret is disabled for the target's team, the turret will not fire
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[TargetTeam])
+		{
+			continue;
+		}
+
+		// Turrets can only shoot at a speed of sv_plasma_per_sec
+		const int &TargetClientId = pTarget->GetPlayer()->GetCID();
+		const bool &TargetIsSolo = pTarget->Teams()->m_Core.GetSolo(TargetClientId);
+		if((TargetIsSolo &&
+			   m_aLastFireSolo[TargetClientId] + Server()->TickSpeed() / g_Config.m_SvPlasmaPerSec > Server()->Tick()) ||
+			(!TargetIsSolo &&
+				m_aLastFireTeam[TargetTeam] + Server()->TickSpeed() / g_Config.m_SvPlasmaPerSec > Server()->Tick()))
+		{
+			continue;
+		}
+
+		// Turrets can shoot only at reachable, alive players
+		int IsReachable = !GameServer()->Collision()->IntersectLine(m_Pos, pTarget->m_Pos, 0, 0);
+		if(IsReachable && pTarget->IsAlive())
+		{
+			// Turrets fire on solo players regardless of the rest of the team
+			if(TargetIsSolo)
+			{
+				aIsTarget[TargetClientId] = true;
+				m_aLastFireSolo[TargetClientId] = Server()->Tick();
+			}
+			else
+			{
+				int Distance = distance(pTarget->m_Pos, m_Pos);
+				if(aMinDistInTeam[TargetTeam] == 0 || aMinDistInTeam[TargetTeam] > Distance)
+				{
+					aMinDistInTeam[TargetTeam] = Distance;
+					aTargetIdInTeam[TargetTeam] = TargetClientId;
+				}
+			}
+		}
+	}
+
+	// Set the closest player for each team as a target
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(aTargetIdInTeam[i] != -1)
+		{
+			aIsTarget[aTargetIdInTeam[i]] = true;
+			m_aLastFireTeam[i] = Server()->Tick();
+		}
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		// Fire at each target
+		if(aIsTarget[i])
+		{
+			CCharacter *pTarget = GameServer()->GetPlayerChar(i);
+			new CPlasma(&GameServer()->m_World, m_Pos, normalize(pTarget->m_Pos - m_Pos), m_Freeze, m_Explosive, i);
+		}
+	}
+}
+
+void CGun::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CGun::Snap(int SnappingClient)
+{
+	if(NetworkClipped(SnappingClient))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+
+	int Subtype = (m_Explosive ? 1 : 0) | (m_Freeze ? 2 : 0);
+
+	int StartTick;
+	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		StartTick = -1;
+	}
+	else
+	{
+		// Emulate turned off blinking turret for old clients
+		CCharacter *pChar = GameServer()->GetPlayerChar(SnappingClient);
+
+		if(SnappingClient != SERVER_DEMO_CLIENT &&
+			(GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS ||
+				GameServer()->m_apPlayers[SnappingClient]->IsPaused()) &&
+			GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+
+		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
+		if(pChar && m_Layer == LAYER_SWITCH && m_Number > 0 &&
+			!Switchers()[m_Number].m_aStatus[pChar->Team()] && (!Tick))
+			return;
+
+		StartTick = m_EvalTick;
+	}
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, m_Pos, StartTick, -1, LASERTYPE_GUN, Subtype, m_Number);
+}
diff --git a/src_bkp/game/server/entities/gun.h b/src_bkp/game/server/entities/gun.h
new file mode 100644
index 0000000000..f22f89f537
--- /dev/null
+++ b/src_bkp/game/server/entities/gun.h
@@ -0,0 +1,41 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+#ifndef GAME_SERVER_ENTITIES_GUN_H
+#define GAME_SERVER_ENTITIES_GUN_H
+
+#include <game/server/entity.h>
+
+/**
+ * Turrets (also referred to as Gun) fire plasma bullets at the nearest player
+ *
+ * A turret fires plasma bullets with a certain firing rate (sv_plasma_per_sec) at the closest player of a team for whom
+ * the following criteria are met:
+ * - The player is within the turret range (sv_plasma_range)
+ * - The player is not a super player
+ * - The turret is activated
+ * - The initial trajectory of the plasma bullet to be generated would not be stopped by any solid block
+ * With the exception of solo players, for whom plasma bullets will always be fired, regardless of the rest of the team,
+ * if the above criteria are met. Solo players do not affect the generation of plasma bullets for the rest of the team.
+ * The shooting rate of sv_plasma_per_sec is independent for each team and solo player and starts with the first tick
+ * when a target player is selected.
+ */
+class CGun : public CEntity
+{
+	vec2 m_Core;
+	bool m_Freeze;
+	bool m_Explosive;
+	int m_EvalTick;
+	int m_aLastFireTeam[MAX_CLIENTS];
+	int m_aLastFireSolo[MAX_CLIENTS];
+
+	void Fire();
+
+public:
+	CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive, int Layer = 0, int Number = 0);
+
+	void Reset() override;
+	void Tick() override;
+	void Snap(int SnappingClient) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_GUN_H
diff --git a/src_bkp/game/server/entities/laser.cpp b/src_bkp/game/server/entities/laser.cpp
new file mode 100644
index 0000000000..2907d5b958
--- /dev/null
+++ b/src_bkp/game/server/entities/laser.cpp
@@ -0,0 +1,327 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "laser.h"
+#include "character.h"
+
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/gamemodes/DDRace.h>
+
+CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner, int Type) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Pos = Pos;
+	m_Owner = Owner;
+	m_Energy = StartEnergy;
+	m_Dir = Direction;
+	m_Bounces = 0;
+	m_EvalTick = 0;
+	m_TelePos = vec2(0, 0);
+	m_WasTele = false;
+	m_Type = Type;
+	m_TeleportCancelled = false;
+	m_IsBlueTeleport = false;
+	m_ZeroEnergyBounceInLastTick = false;
+	m_TuneZone = GameServer()->Collision()->IsTune(GameServer()->Collision()->GetMapIndex(m_Pos));
+	CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	m_TeamMask = pOwnerChar ? pOwnerChar->TeamMask() : CClientMask();
+	m_BelongsToPracticeTeam = pOwnerChar && pOwnerChar->Teams()->IsPractice(pOwnerChar->Team());
+
+	GameWorld()->InsertEntity(this);
+	DoBounce();
+}
+
+bool CLaser::HitCharacter(vec2 From, vec2 To)
+{
+	static const vec2 StackedLaserShotgunBugSpeed = vec2(-2147483648.0f, -2147483648.0f);
+	vec2 At;
+	CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	CCharacter *pHit;
+	bool pDontHitSelf = g_Config.m_SvOldLaser || (m_Bounces == 0 && !m_WasTele);
+
+	if(pOwnerChar ? (!pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (!pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : g_Config.m_SvHit)
+		pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner);
+	else
+		pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner, pOwnerChar);
+
+	if(!pHit || (pHit == pOwnerChar && g_Config.m_SvOldLaser) || (pHit != pOwnerChar && pOwnerChar ? (pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) || (pOwnerChar->ShotgunHitDisabled() && m_Type == WEAPON_SHOTGUN) : !g_Config.m_SvHit))
+		return false;
+	m_From = From;
+	m_Pos = At;
+	m_Energy = -1;
+	if(m_Type == WEAPON_SHOTGUN)
+	{
+		vec2 Temp;
+
+		float Strength;
+		if(!m_TuneZone)
+			Strength = Tuning()->m_ShotgunStrength;
+		else
+			Strength = TuningList()[m_TuneZone].m_ShotgunStrength;
+
+		vec2 &HitPos = pHit->Core()->m_Pos;
+		if(!g_Config.m_SvOldLaser)
+		{
+			if(m_PrevPos != HitPos)
+			{
+				Temp = pHit->Core()->m_Vel + normalize(m_PrevPos - HitPos) * Strength;
+				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+			}
+			else
+			{
+				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+			}
+		}
+		else if(g_Config.m_SvOldLaser && pOwnerChar)
+		{
+			if(pOwnerChar->Core()->m_Pos != HitPos)
+			{
+				Temp = pHit->Core()->m_Vel + normalize(pOwnerChar->Core()->m_Pos - HitPos) * Strength;
+				pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, Temp);
+			}
+			else
+			{
+				pHit->Core()->m_Vel = StackedLaserShotgunBugSpeed;
+			}
+		}
+		else
+		{
+			pHit->Core()->m_Vel = ClampVel(pHit->m_MoveRestrictions, pHit->Core()->m_Vel);
+		}
+	}
+	else if(m_Type == WEAPON_LASER)
+	{
+		pHit->UnFreeze();
+	}
+	return true;
+}
+
+void CLaser::DoBounce()
+{
+	m_EvalTick = Server()->Tick();
+
+	if(m_Energy < 0)
+	{
+		m_MarkedForDestroy = true;
+		return;
+	}
+	m_PrevPos = m_Pos;
+	vec2 Coltile;
+
+	int Res;
+	int z;
+
+	if(m_WasTele)
+	{
+		m_PrevPos = m_TelePos;
+		m_Pos = m_TelePos;
+		m_TelePos = vec2(0, 0);
+	}
+
+	vec2 To = m_Pos + m_Dir * m_Energy;
+
+	Res = GameServer()->Collision()->IntersectLineTeleWeapon(m_Pos, To, &Coltile, &To, &z);
+
+	if(Res)
+	{
+		if(!HitCharacter(m_Pos, To))
+		{
+			// intersected
+			m_From = m_Pos;
+			m_Pos = To;
+
+			vec2 TempPos = m_Pos;
+			vec2 TempDir = m_Dir * 4.0f;
+
+			int f = 0;
+			if(Res == -1)
+			{
+				f = GameServer()->Collision()->GetTile(round_to_int(Coltile.x), round_to_int(Coltile.y));
+				GameServer()->Collision()->SetCollisionAt(round_to_int(Coltile.x), round_to_int(Coltile.y), TILE_SOLID);
+			}
+			GameServer()->Collision()->MovePoint(&TempPos, &TempDir, 1.0f, 0);
+			if(Res == -1)
+			{
+				GameServer()->Collision()->SetCollisionAt(round_to_int(Coltile.x), round_to_int(Coltile.y), f);
+			}
+			m_Pos = TempPos;
+			m_Dir = normalize(TempDir);
+
+			const float Distance = distance(m_From, m_Pos);
+			// Prevent infinite bounces
+			if(Distance == 0.0f && m_ZeroEnergyBounceInLastTick)
+			{
+				m_Energy = -1;
+			}
+			else if(!m_TuneZone)
+			{
+				m_Energy -= Distance + Tuning()->m_LaserBounceCost;
+			}
+			else
+			{
+				m_Energy -= distance(m_From, m_Pos) + GameServer()->TuningList()[m_TuneZone].m_LaserBounceCost;
+			}
+			m_ZeroEnergyBounceInLastTick = Distance == 0.0f;
+
+			if(Res == TILE_TELEINWEAPON && !GameServer()->m_pController->m_TeleOuts[z - 1].empty())
+			{
+				int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->m_pController->m_TeleOuts[z - 1].size());
+				m_TelePos = GameServer()->m_pController->m_TeleOuts[z - 1][TeleOut];
+				m_WasTele = true;
+			}
+			else
+			{
+				m_Bounces++;
+				m_WasTele = false;
+			}
+
+			int BounceNum = Tuning()->m_LaserBounceNum;
+			if(m_TuneZone)
+				BounceNum = TuningList()[m_TuneZone].m_LaserBounceNum;
+
+			if(m_Bounces > BounceNum)
+				m_Energy = -1;
+
+			GameServer()->CreateSound(m_Pos, SOUND_LASER_BOUNCE, m_TeamMask);
+		}
+	}
+	else
+	{
+		if(!HitCharacter(m_Pos, To))
+		{
+			m_From = m_Pos;
+			m_Pos = To;
+			m_Energy = -1;
+		}
+	}
+
+	CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	if(m_Owner >= 0 && m_Energy <= 0 && !m_TeleportCancelled && pOwnerChar &&
+		pOwnerChar->IsAlive() && pOwnerChar->HasTelegunLaser() && m_Type == WEAPON_LASER)
+	{
+		vec2 PossiblePos;
+		bool Found = false;
+
+		// Check if the laser hits a player.
+		bool pDontHitSelf = g_Config.m_SvOldLaser || (m_Bounces == 0 && !m_WasTele);
+		vec2 At;
+		CCharacter *pHit;
+		if(pOwnerChar ? (!pOwnerChar->LaserHitDisabled() && m_Type == WEAPON_LASER) : g_Config.m_SvHit)
+			pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner);
+		else
+			pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pDontHitSelf ? pOwnerChar : 0, m_Owner, pOwnerChar);
+
+		if(pHit)
+			Found = GetNearestAirPosPlayer(pHit->m_Pos, &PossiblePos);
+		else
+			Found = GetNearestAirPos(m_Pos, m_From, &PossiblePos);
+
+		if(Found)
+		{
+			pOwnerChar->m_TeleGunPos = PossiblePos;
+			pOwnerChar->m_TeleGunTeleport = true;
+			pOwnerChar->m_IsBlueTeleGunTeleport = m_IsBlueTeleport;
+		}
+	}
+	else if(m_Owner >= 0)
+	{
+		int MapIndex = GameServer()->Collision()->GetPureMapIndex(Coltile);
+		int TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
+		bool IsSwitchTeleGun = GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_ALLOW_TELE_GUN;
+		bool IsBlueSwitchTeleGun = GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_ALLOW_BLUE_TELE_GUN;
+		int IsTeleInWeapon = GameServer()->Collision()->IsTeleportWeapon(MapIndex);
+
+		if(!IsTeleInWeapon)
+		{
+			if(IsSwitchTeleGun || IsBlueSwitchTeleGun)
+			{
+				// Delay specifies which weapon the tile should work for.
+				// Delay = 0 means all.
+				int delay = GameServer()->Collision()->GetSwitchDelay(MapIndex);
+
+				if((delay != 3 && delay != 0) && m_Type == WEAPON_LASER)
+				{
+					IsSwitchTeleGun = IsBlueSwitchTeleGun = false;
+				}
+			}
+
+			m_IsBlueTeleport = TileFIndex == TILE_ALLOW_BLUE_TELE_GUN || IsBlueSwitchTeleGun;
+
+			// Teleport is canceled if the last bounce tile is not a TILE_ALLOW_TELE_GUN.
+			// Teleport also works if laser didn't bounce.
+			m_TeleportCancelled =
+				m_Type == WEAPON_LASER && (TileFIndex != TILE_ALLOW_TELE_GUN && TileFIndex != TILE_ALLOW_BLUE_TELE_GUN && !IsSwitchTeleGun && !IsBlueSwitchTeleGun);
+		}
+	}
+
+	//m_Owner = -1;
+}
+
+void CLaser::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CLaser::Tick()
+{
+	if((g_Config.m_SvDestroyLasersOnDeath || m_BelongsToPracticeTeam) && m_Owner >= 0)
+	{
+		CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+		if(!(pOwnerChar && pOwnerChar->IsAlive()))
+		{
+			Reset();
+		}
+	}
+
+	float Delay;
+	if(m_TuneZone)
+		Delay = TuningList()[m_TuneZone].m_LaserBounceDelay;
+	else
+		Delay = Tuning()->m_LaserBounceDelay;
+
+	if((Server()->Tick() - m_EvalTick) > (Server()->TickSpeed() * Delay / 1000.0f))
+		DoBounce();
+}
+
+void CLaser::TickPaused()
+{
+	++m_EvalTick;
+}
+
+void CLaser::Snap(int SnappingClient)
+{
+	if(NetworkClipped(SnappingClient) && NetworkClipped(SnappingClient, m_From))
+		return;
+	CCharacter *pOwnerChar = 0;
+	if(m_Owner >= 0)
+		pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	if(!pOwnerChar)
+		return;
+
+	pOwnerChar = nullptr;
+	CClientMask TeamMask = CClientMask().set();
+
+	if(m_Owner >= 0)
+		pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+
+	if(pOwnerChar && pOwnerChar->IsAlive())
+		TeamMask = pOwnerChar->TeamMask();
+
+	if(SnappingClient != SERVER_DEMO_CLIENT && !TeamMask.test(SnappingClient))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	int LaserType = m_Type == WEAPON_LASER ? LASERTYPE_RIFLE : m_Type == WEAPON_SHOTGUN ? LASERTYPE_SHOTGUN : -1;
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, m_From, m_EvalTick, m_Owner, LaserType, 0, m_Number);
+}
+
+void CLaser::SwapClients(int Client1, int Client2)
+{
+	m_Owner = m_Owner == Client1 ? Client2 : m_Owner == Client2 ? Client1 : m_Owner;
+}
diff --git a/src_bkp/game/server/entities/laser.h b/src_bkp/game/server/entities/laser.h
new file mode 100644
index 0000000000..00654c0ade
--- /dev/null
+++ b/src_bkp/game/server/entities/laser.h
@@ -0,0 +1,47 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_ENTITIES_LASER_H
+#define GAME_SERVER_ENTITIES_LASER_H
+
+#include <game/server/entity.h>
+
+class CLaser : public CEntity
+{
+public:
+	CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner, int Type);
+
+	virtual void Reset() override;
+	virtual void Tick() override;
+	virtual void TickPaused() override;
+	virtual void Snap(int SnappingClient) override;
+	virtual void SwapClients(int Client1, int Client2) override;
+
+	virtual int GetOwnerID() const override { return m_Owner; }
+
+protected:
+	bool HitCharacter(vec2 From, vec2 To);
+	void DoBounce();
+
+private:
+	vec2 m_From;
+	vec2 m_Dir;
+	vec2 m_TelePos;
+	bool m_WasTele;
+	float m_Energy;
+	int m_Bounces;
+	int m_EvalTick;
+	int m_Owner;
+	CClientMask m_TeamMask;
+	bool m_ZeroEnergyBounceInLastTick;
+
+	// DDRace
+
+	vec2 m_PrevPos;
+	int m_Type;
+	int m_TuneZone;
+	bool m_TeleportCancelled;
+	bool m_IsBlueTeleport;
+	bool m_BelongsToPracticeTeam;
+};
+
+#endif
diff --git a/src_bkp/game/server/entities/light.cpp b/src_bkp/game/server/entities/light.cpp
new file mode 100644
index 0000000000..42aea3f952
--- /dev/null
+++ b/src_bkp/game/server/entities/light.cpp
@@ -0,0 +1,147 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "light.h"
+#include "character.h"
+
+#include <engine/server.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+#include <game/teamscore.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+
+CLight::CLight(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length,
+	int Layer, int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_To = vec2(0.0f, 0.0f);
+	m_Core = vec2(0.0f, 0.0f);
+	m_Layer = Layer;
+	m_Number = Number;
+	m_Tick = (Server()->TickSpeed() * 0.15f);
+	m_Pos = Pos;
+	m_Rotation = Rotation;
+	m_Length = Length;
+	m_EvalTick = Server()->Tick();
+	GameWorld()->InsertEntity(this);
+	Step();
+}
+
+bool CLight::HitCharacter()
+{
+	std::vector<CCharacter *> vpHitCharacters = GameServer()->m_World.IntersectedCharacters(m_Pos, m_To, 0.0f, 0);
+	if(vpHitCharacters.empty())
+		return false;
+	for(auto *pChar : vpHitCharacters)
+	{
+		if(m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pChar->Team()])
+			continue;
+		pChar->Freeze();
+	}
+	return true;
+}
+
+void CLight::Move()
+{
+	if(m_Speed != 0)
+	{
+		if((m_CurveLength >= m_Length && m_Speed > 0) || (m_CurveLength <= 0 && m_Speed < 0))
+			m_Speed = -m_Speed;
+		m_CurveLength += m_Speed * m_Tick + m_LengthL;
+		m_LengthL = 0;
+		if(m_CurveLength > m_Length)
+		{
+			m_LengthL = m_CurveLength - m_Length;
+			m_CurveLength = m_Length;
+		}
+		else if(m_CurveLength < 0)
+		{
+			m_LengthL = 0 + m_CurveLength;
+			m_CurveLength = 0;
+		}
+	}
+
+	m_Rotation += m_AngularSpeed * m_Tick;
+	if(m_Rotation > pi * 2)
+		m_Rotation -= pi * 2;
+	else if(m_Rotation < 0)
+		m_Rotation += pi * 2;
+}
+
+void CLight::Step()
+{
+	Move();
+	vec2 dir(std::sin(m_Rotation), std::cos(m_Rotation));
+	vec2 to2 = m_Pos + normalize(dir) * m_CurveLength;
+	GameServer()->Collision()->IntersectNoLaser(m_Pos, to2, &m_To, 0);
+}
+
+void CLight::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CLight::Tick()
+{
+	if(Server()->Tick() % (int)(Server()->TickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		m_EvalTick = Server()->Tick();
+		int index = GameServer()->Collision()->IsMover(m_Pos.x, m_Pos.y,
+			&Flags);
+		if(index)
+		{
+			m_Core = GameServer()->Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+		Step();
+	}
+
+	HitCharacter();
+}
+
+void CLight::Snap(int SnappingClient)
+{
+	if(NetworkClipped(SnappingClient, m_Pos) && NetworkClipped(SnappingClient, m_To))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+
+	CCharacter *pChr = GameServer()->GetPlayerChar(SnappingClient);
+
+	if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
+		pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+
+	vec2 From = m_Pos;
+	int StartTick = -1;
+
+	if(pChr && pChr->Team() == TEAM_SUPER)
+	{
+		From = m_Pos;
+	}
+	else if(pChr && m_Layer == LAYER_SWITCH && Switchers()[m_Number].m_aStatus[pChr->Team()])
+	{
+		From = m_To;
+	}
+	else if(m_Layer != LAYER_SWITCH)
+	{
+		From = m_To;
+	}
+
+	if(SnappingClientVersion < VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 6;
+		if(pChr && pChr->IsAlive() && m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pChr->Team()] && Tick)
+			return;
+
+		StartTick = m_EvalTick;
+		if(StartTick < Server()->Tick() - 4)
+			StartTick = Server()->Tick() - 4;
+		else if(StartTick > Server()->Tick())
+			StartTick = Server()->Tick();
+	}
+
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, From, StartTick, -1, LASERTYPE_FREEZE, 0, m_Number);
+}
diff --git a/src_bkp/game/server/entities/light.h b/src_bkp/game/server/entities/light.h
new file mode 100644
index 0000000000..1c76ff6606
--- /dev/null
+++ b/src_bkp/game/server/entities/light.h
@@ -0,0 +1,36 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_ENTITIES_LIGHT_H
+#define GAME_SERVER_ENTITIES_LIGHT_H
+
+#include <game/server/entity.h>
+
+class CLight : public CEntity
+{
+	float m_Rotation;
+	vec2 m_To;
+	vec2 m_Core;
+
+	int m_EvalTick;
+
+	int m_Tick;
+
+	bool HitCharacter();
+	void Move();
+	void Step();
+
+public:
+	int m_CurveLength;
+	int m_LengthL;
+	float m_AngularSpeed;
+	int m_Speed;
+	int m_Length;
+
+	CLight(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length,
+		int Layer = 0, int Number = 0);
+
+	void Reset() override;
+	void Tick() override;
+	void Snap(int SnappingClient) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_LIGHT_H
diff --git a/src_bkp/game/server/entities/pickup.cpp b/src_bkp/game/server/entities/pickup.cpp
new file mode 100644
index 0000000000..6b599a08e5
--- /dev/null
+++ b/src_bkp/game/server/entities/pickup.cpp
@@ -0,0 +1,201 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "pickup.h"
+#include "character.h"
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+#include <game/teamscore.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+
+static constexpr int gs_PickupPhysSize = 14;
+
+CPickup::CPickup(CGameWorld *pGameWorld, int Type, int SubType, int Layer, int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_PICKUP, vec2(0, 0), gs_PickupPhysSize)
+{
+	m_Core = vec2(0.0f, 0.0f);
+	m_Type = Type;
+	m_Subtype = SubType;
+
+	m_Layer = Layer;
+	m_Number = Number;
+
+	GameWorld()->InsertEntity(this);
+}
+
+void CPickup::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CPickup::Tick()
+{
+	Move();
+
+	// Check if a player intersected us
+	CEntity *apEnts[MAX_CLIENTS];
+	int Num = GameWorld()->FindEntities(m_Pos, GetProximityRadius() + ms_CollisionExtraSize, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+	for(int i = 0; i < Num; ++i)
+	{
+		auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+
+		if(pChr && pChr->IsAlive())
+		{
+			if(m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pChr->Team()])
+				continue;
+			bool Sound = false;
+			// player picked us up, is someone was hooking us, let them go
+			switch(m_Type)
+			{
+			case POWERUP_HEALTH:
+				if(pChr->Freeze())
+					GameServer()->CreateSound(m_Pos, SOUND_PICKUP_HEALTH, pChr->TeamMask());
+				break;
+
+			case POWERUP_ARMOR:
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				for(int j = WEAPON_SHOTGUN; j < NUM_WEAPONS; j++)
+				{
+					if(pChr->GetWeaponGot(j))
+					{
+						pChr->SetWeaponGot(j, false);
+						pChr->SetWeaponAmmo(j, 0);
+						Sound = true;
+					}
+				}
+				pChr->SetNinjaActivationDir(vec2(0, 0));
+				pChr->SetNinjaActivationTick(-500);
+				pChr->SetNinjaCurrentMoveTime(0);
+				if(Sound)
+				{
+					pChr->SetLastWeapon(WEAPON_GUN);
+					GameServer()->CreateSound(m_Pos, SOUND_PICKUP_ARMOR, pChr->TeamMask());
+				}
+				if(pChr->GetActiveWeapon() >= WEAPON_SHOTGUN)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_SHOTGUN:
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_SHOTGUN))
+				{
+					pChr->SetWeaponGot(WEAPON_SHOTGUN, false);
+					pChr->SetWeaponAmmo(WEAPON_SHOTGUN, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+					GameServer()->CreateSound(m_Pos, SOUND_PICKUP_ARMOR, pChr->TeamMask());
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_SHOTGUN)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_GRENADE:
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_GRENADE))
+				{
+					pChr->SetWeaponGot(WEAPON_GRENADE, false);
+					pChr->SetWeaponAmmo(WEAPON_GRENADE, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+					GameServer()->CreateSound(m_Pos, SOUND_PICKUP_ARMOR, pChr->TeamMask());
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_GRENADE)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_ARMOR_NINJA:
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				pChr->SetNinjaActivationDir(vec2(0, 0));
+				pChr->SetNinjaActivationTick(-500);
+				pChr->SetNinjaCurrentMoveTime(0);
+				break;
+
+			case POWERUP_ARMOR_LASER:
+				if(pChr->Team() == TEAM_SUPER)
+					continue;
+				if(pChr->GetWeaponGot(WEAPON_LASER))
+				{
+					pChr->SetWeaponGot(WEAPON_LASER, false);
+					pChr->SetWeaponAmmo(WEAPON_LASER, 0);
+					pChr->SetLastWeapon(WEAPON_GUN);
+					GameServer()->CreateSound(m_Pos, SOUND_PICKUP_ARMOR, pChr->TeamMask());
+				}
+				if(pChr->GetActiveWeapon() == WEAPON_LASER)
+					pChr->SetActiveWeapon(WEAPON_HAMMER);
+				break;
+
+			case POWERUP_WEAPON:
+
+				if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS && (!pChr->GetWeaponGot(m_Subtype) || pChr->GetWeaponAmmo(m_Subtype) != -1))
+				{
+					pChr->GiveWeapon(m_Subtype);
+
+					if(m_Subtype == WEAPON_GRENADE)
+						GameServer()->CreateSound(m_Pos, SOUND_PICKUP_GRENADE, pChr->TeamMask());
+					else if(m_Subtype == WEAPON_SHOTGUN)
+						GameServer()->CreateSound(m_Pos, SOUND_PICKUP_SHOTGUN, pChr->TeamMask());
+					else if(m_Subtype == WEAPON_LASER)
+						GameServer()->CreateSound(m_Pos, SOUND_PICKUP_SHOTGUN, pChr->TeamMask());
+
+					if(pChr->GetPlayer())
+						GameServer()->SendWeaponPickup(pChr->GetPlayer()->GetCID(), m_Subtype);
+				}
+				break;
+
+			case POWERUP_NINJA:
+			{
+				// activate ninja on target player
+				pChr->GiveNinja();
+				break;
+			}
+			default:
+				break;
+			};
+		}
+	}
+}
+
+void CPickup::TickPaused()
+{
+}
+
+void CPickup::Snap(int SnappingClient)
+{
+	if(NetworkClipped(SnappingClient))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	bool Sixup = Server()->IsSixup(SnappingClient);
+
+	if(SnappingClientVersion < VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		CCharacter *pChar = GameServer()->GetPlayerChar(SnappingClient);
+
+		if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
+			pChar = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
+
+		int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
+		if(pChar && pChar->IsAlive() && m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pChar->Team()] && !Tick)
+			return;
+	}
+
+	GameServer()->SnapPickup(CSnapContext(SnappingClientVersion, Sixup), GetID(), m_Pos, m_Type, m_Subtype, m_Number);
+}
+
+void CPickup::Move()
+{
+	if(Server()->Tick() % (int)(Server()->TickSpeed() * 0.15f) == 0)
+	{
+		int Flags;
+		int index = GameServer()->Collision()->IsMover(m_Pos.x, m_Pos.y, &Flags);
+		if(index)
+		{
+			m_Core = GameServer()->Collision()->CpSpeed(index, Flags);
+		}
+		m_Pos += m_Core;
+	}
+}
diff --git a/src_bkp/game/server/entities/pickup.h b/src_bkp/game/server/entities/pickup.h
new file mode 100644
index 0000000000..7c3f8a1df1
--- /dev/null
+++ b/src_bkp/game/server/entities/pickup.h
@@ -0,0 +1,33 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_ENTITIES_PICKUP_H
+#define GAME_SERVER_ENTITIES_PICKUP_H
+
+#include <game/server/entity.h>
+
+class CPickup : public CEntity
+{
+public:
+	static const int ms_CollisionExtraSize = 6;
+
+	CPickup(CGameWorld *pGameWorld, int Type, int SubType = 0, int Layer = 0, int Number = 0);
+
+	void Reset() override;
+	void Tick() override;
+	void TickPaused() override;
+	void Snap(int SnappingClient) override;
+
+	int Type() const { return m_Type; }
+	int Subtype() const { return m_Subtype; }
+
+private:
+	int m_Type;
+	int m_Subtype;
+
+	// DDRace
+
+	void Move();
+	vec2 m_Core;
+};
+
+#endif
diff --git a/src_bkp/game/server/entities/plasma.cpp b/src_bkp/game/server/entities/plasma.cpp
new file mode 100644
index 0000000000..f89d5ea38a
--- /dev/null
+++ b/src_bkp/game/server/entities/plasma.cpp
@@ -0,0 +1,131 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "plasma.h"
+#include "character.h"
+
+#include <engine/server.h>
+
+#include <game/generated/protocol.h>
+#include <game/teamscore.h>
+
+#include <game/server/gamecontext.h>
+
+const float PLASMA_ACCEL = 1.1f;
+
+CPlasma::CPlasma(CGameWorld *pGameWorld, vec2 Pos, vec2 Dir, bool Freeze,
+	bool Explosive, int ForClientID) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
+{
+	m_Pos = Pos;
+	m_Core = Dir;
+	m_Freeze = Freeze;
+	m_Explosive = Explosive;
+	m_ForClientID = ForClientID;
+	m_EvalTick = Server()->Tick();
+	m_LifeTime = Server()->TickSpeed() * 1.5f;
+
+	GameWorld()->InsertEntity(this);
+}
+
+void CPlasma::Tick()
+{
+	// A plasma bullet has only a limited lifetime
+	if(m_LifeTime == 0)
+	{
+		Reset();
+		return;
+	}
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	// Without a target, a plasma bullet has no reason to live
+	if(!pTarget)
+	{
+		Reset();
+		return;
+	}
+	m_LifeTime--;
+	Move();
+	HitCharacter(pTarget);
+	// Plasma bullets may explode twice if they would hit both a player and an obstacle in the next move step
+	HitObstacle(pTarget);
+}
+
+void CPlasma::Move()
+{
+	m_Pos += m_Core;
+	m_Core *= PLASMA_ACCEL;
+}
+
+bool CPlasma::HitCharacter(CCharacter *pTarget)
+{
+	vec2 IntersectPos;
+	CCharacter *pHitPlayer = GameServer()->m_World.IntersectCharacter(
+		m_Pos, m_Pos + m_Core, 0.0f, IntersectPos, 0, m_ForClientID);
+	if(!pHitPlayer)
+	{
+		return false;
+	}
+
+	// Super player should not be able to stop the plasma bullets
+	if(pHitPlayer->Team() == TEAM_SUPER)
+	{
+		return false;
+	}
+
+	m_Freeze ? pHitPlayer->Freeze() : pHitPlayer->UnFreeze();
+	if(m_Explosive)
+	{
+		// Plasma Turrets are very precise weapons only one tee gets speed from it,
+		// other tees near the explosion remain unaffected
+		GameServer()->CreateExplosion(
+			m_Pos, m_ForClientID, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
+	}
+	Reset();
+	return true;
+}
+
+bool CPlasma::HitObstacle(CCharacter *pTarget)
+{
+	// Check if the plasma bullet is stopped by a solid block or a laser stopper
+	int HasIntersection = GameServer()->Collision()->IntersectNoLaser(m_Pos, m_Pos + m_Core, 0, 0);
+	if(HasIntersection)
+	{
+		if(m_Explosive)
+		{
+			// Even in the case of an explosion due to a collision with obstacles, only one player is affected
+			GameServer()->CreateExplosion(
+				m_Pos, m_ForClientID, WEAPON_GRENADE, true, pTarget->Team(), pTarget->TeamMask());
+		}
+		Reset();
+		return true;
+	}
+	return false;
+}
+
+void CPlasma::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+void CPlasma::Snap(int SnappingClient)
+{
+	// Only players who can see the targeted player can see the plasma bullet
+	CCharacter *pTarget = GameServer()->GetPlayerChar(m_ForClientID);
+	if(!pTarget || !pTarget->CanSnapCharacter(SnappingClient))
+	{
+		return;
+	}
+
+	// Only players with the plasma bullet in their field of view or who want to see everything will receive the snap
+	if(NetworkClipped(SnappingClient))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+
+	int Subtype = (m_Explosive ? 1 : 0) | (m_Freeze ? 2 : 0);
+	GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), GetID(),
+		m_Pos, m_Pos, m_EvalTick, -1, LASERTYPE_PLASMA, Subtype, m_Number);
+}
+
+void CPlasma::SwapClients(int Client1, int Client2)
+{
+	m_ForClientID = m_ForClientID == Client1 ? Client2 : m_ForClientID == Client2 ? Client1 : m_ForClientID;
+}
diff --git a/src_bkp/game/server/entities/plasma.h b/src_bkp/game/server/entities/plasma.h
new file mode 100644
index 0000000000..b961b961ed
--- /dev/null
+++ b/src_bkp/game/server/entities/plasma.h
@@ -0,0 +1,46 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_ENTITIES_PLASMA_H
+#define GAME_SERVER_ENTITIES_PLASMA_H
+
+#include <game/server/entity.h>
+
+/**
+ * Plasma Bullets are projectiles fired from turrets at a specific target
+ * 
+ * When hitting a tee, plasma bullets can either freeze or unfreeze the player
+ * Also, plasma projectiles can explode on impact. However, the player affected by the explosion is not necessarily the
+ * one the plasma collided with, but if the affected player is not a solo player, then the team-mate with the lowest
+ * ClientId within the explosion range. Furthermore, the affected player does not feel the explosion at the point of
+ * impact but at the last position of the plasma bullet. The same applies if a plasma bullet explodes due to a collision
+ * with a laser stopper or a solid block
+ * Plasma bullets move every tick in the assigned direction and then accelerate by the factor PLASMA_ACCEL
+ * Plasma bullets can explode twice if they would hit both a player and an obstacle in the next movement step
+ * Plasma bullets will stop existing as soon as:
+ * - The player they were created for do no longer exist
+ * - They have had a collision with a player, a solid block or a laser stopper
+ * - Their life time of 1.5 seconds has expired
+ */
+class CPlasma : public CEntity
+{
+	vec2 m_Core;
+	int m_Freeze;
+	bool m_Explosive;
+	int m_ForClientID;
+	int m_EvalTick;
+	int m_LifeTime;
+
+	void Move();
+	bool HitCharacter(CCharacter *pTarget);
+	bool HitObstacle(CCharacter *pTarget);
+
+public:
+	CPlasma(CGameWorld *pGameWorld, vec2 Pos, vec2 Dir, bool Freeze,
+		bool Explosive, int ForClientId);
+
+	void Reset() override;
+	void Tick() override;
+	void Snap(int SnappingClient) override;
+	void SwapClients(int Client1, int Client2) override;
+};
+
+#endif // GAME_SERVER_ENTITIES_PLASMA_H
diff --git a/src_bkp/game/server/entities/projectile.cpp b/src_bkp/game/server/entities/projectile.cpp
new file mode 100644
index 0000000000..c829f6be34
--- /dev/null
+++ b/src_bkp/game/server/entities/projectile.cpp
@@ -0,0 +1,447 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "projectile.h"
+#include "character.h"
+
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+
+#include <game/server/gamecontext.h>
+#include <game/server/gamemodes/DDRace.h>
+
+CProjectile::CProjectile(
+	CGameWorld *pGameWorld,
+	int Type,
+	int Owner,
+	vec2 Pos,
+	vec2 Dir,
+	int Span,
+	bool Freeze,
+	bool Explosive,
+	int SoundImpact,
+	vec2 InitDir,
+	int Layer,
+	int Number) :
+	CEntity(pGameWorld, CGameWorld::ENTTYPE_PROJECTILE)
+{
+	m_Type = Type;
+	m_Pos = Pos;
+	m_Direction = Dir;
+	m_LifeSpan = Span;
+	m_Owner = Owner;
+	//m_Damage = Damage;
+	m_SoundImpact = SoundImpact;
+	m_StartTick = Server()->Tick();
+	m_Explosive = Explosive;
+
+	m_Layer = Layer;
+	m_Number = Number;
+	m_Freeze = Freeze;
+
+	m_InitDir = InitDir;
+	m_TuneZone = GameServer()->Collision()->IsTune(GameServer()->Collision()->GetMapIndex(m_Pos));
+
+	CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	m_BelongsToPracticeTeam = pOwnerChar && pOwnerChar->Teams()->IsPractice(pOwnerChar->Team());
+
+	GameWorld()->InsertEntity(this);
+}
+
+void CProjectile::Reset()
+{
+	m_MarkedForDestroy = true;
+}
+
+vec2 CProjectile::GetPos(float Time)
+{
+	float Curvature = 0;
+	float Speed = 0;
+
+	switch(m_Type)
+	{
+	case WEAPON_GRENADE:
+		if(!m_TuneZone)
+		{
+			Curvature = Tuning()->m_GrenadeCurvature;
+			Speed = Tuning()->m_GrenadeSpeed;
+		}
+		else
+		{
+			Curvature = TuningList()[m_TuneZone].m_GrenadeCurvature;
+			Speed = TuningList()[m_TuneZone].m_GrenadeSpeed;
+		}
+
+		break;
+
+	case WEAPON_SHOTGUN:
+		if(!m_TuneZone)
+		{
+			Curvature = Tuning()->m_ShotgunCurvature;
+			Speed = Tuning()->m_ShotgunSpeed;
+		}
+		else
+		{
+			Curvature = TuningList()[m_TuneZone].m_ShotgunCurvature;
+			Speed = TuningList()[m_TuneZone].m_ShotgunSpeed;
+		}
+
+		break;
+
+	case WEAPON_GUN:
+		if(!m_TuneZone)
+		{
+			Curvature = Tuning()->m_GunCurvature;
+			Speed = Tuning()->m_GunSpeed;
+		}
+		else
+		{
+			Curvature = TuningList()[m_TuneZone].m_GunCurvature;
+			Speed = TuningList()[m_TuneZone].m_GunSpeed;
+		}
+		break;
+	}
+
+	return CalcPos(m_Pos, m_Direction, Curvature, Speed, Time);
+}
+
+void CProjectile::Tick()
+{
+	float Pt = (Server()->Tick() - m_StartTick - 1) / (float)Server()->TickSpeed();
+	float Ct = (Server()->Tick() - m_StartTick) / (float)Server()->TickSpeed();
+	vec2 PrevPos = GetPos(Pt);
+	vec2 CurPos = GetPos(Ct);
+	vec2 ColPos;
+	vec2 NewPos;
+	int Collide = GameServer()->Collision()->IntersectLine(PrevPos, CurPos, &ColPos, &NewPos);
+	CCharacter *pOwnerChar = 0;
+
+	if(m_Owner >= 0)
+		pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+
+	CCharacter *pTargetChr = 0;
+
+	if(pOwnerChar ? !pOwnerChar->GrenadeHitDisabled() : g_Config.m_SvHit)
+		pTargetChr = GameServer()->m_World.IntersectCharacter(PrevPos, ColPos, m_Freeze ? 1.0f : 6.0f, ColPos, pOwnerChar, m_Owner);
+
+	if(m_LifeSpan > -1)
+		m_LifeSpan--;
+
+	CClientMask TeamMask = CClientMask().set();
+	bool IsWeaponCollide = false;
+	if(
+		pOwnerChar &&
+		pTargetChr &&
+		pOwnerChar->IsAlive() &&
+		pTargetChr->IsAlive() &&
+		!pTargetChr->CanCollide(m_Owner))
+	{
+		IsWeaponCollide = true;
+	}
+	if(pOwnerChar && pOwnerChar->IsAlive())
+	{
+		TeamMask = pOwnerChar->TeamMask();
+	}
+	else if(m_Owner >= 0 && (m_Type != WEAPON_GRENADE || g_Config.m_SvDestroyBulletsOnDeath || m_BelongsToPracticeTeam))
+	{
+		m_MarkedForDestroy = true;
+		return;
+	}
+
+	if(((pTargetChr && (pOwnerChar ? !pOwnerChar->GrenadeHitDisabled() : g_Config.m_SvHit || m_Owner == -1 || pTargetChr == pOwnerChar)) || Collide || GameLayerClipped(CurPos)) && !IsWeaponCollide)
+	{
+		if(m_Explosive /*??*/ && (!pTargetChr || (pTargetChr && (!m_Freeze || (m_Type == WEAPON_SHOTGUN && Collide)))))
+		{
+			int Number = 1;
+			if(GameServer()->EmulateBug(BUG_GRENADE_DOUBLEEXPLOSION) && m_LifeSpan == -1)
+			{
+				Number = 2;
+			}
+			for(int i = 0; i < Number; i++)
+			{
+				GameServer()->CreateExplosion(ColPos, m_Owner, m_Type, m_Owner == -1, (!pTargetChr ? -1 : pTargetChr->Team()),
+					(m_Owner != -1) ? TeamMask : CClientMask().set());
+				GameServer()->CreateSound(ColPos, m_SoundImpact,
+					(m_Owner != -1) ? TeamMask : CClientMask().set());
+			}
+		}
+		else if(m_Freeze)
+		{
+			CEntity *apEnts[MAX_CLIENTS];
+			int Num = GameWorld()->FindEntities(CurPos, 1.0f, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+			for(int i = 0; i < Num; ++i)
+			{
+				auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+				if(pChr && (m_Layer != LAYER_SWITCH || (m_Layer == LAYER_SWITCH && m_Number > 0 && Switchers()[m_Number].m_aStatus[pChr->Team()])))
+					pChr->Freeze();
+			}
+		}
+
+		if(pOwnerChar && !GameLayerClipped(ColPos) &&
+			((m_Type == WEAPON_GRENADE && pOwnerChar->HasTelegunGrenade()) || (m_Type == WEAPON_GUN && pOwnerChar->HasTelegunGun())))
+		{
+			int MapIndex = GameServer()->Collision()->GetPureMapIndex(pTargetChr ? pTargetChr->m_Pos : ColPos);
+			int TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
+			bool IsSwitchTeleGun = GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_ALLOW_TELE_GUN;
+			bool IsBlueSwitchTeleGun = GameServer()->Collision()->GetSwitchType(MapIndex) == TILE_ALLOW_BLUE_TELE_GUN;
+
+			if(IsSwitchTeleGun || IsBlueSwitchTeleGun)
+			{
+				// Delay specifies which weapon the tile should work for.
+				// Delay = 0 means all.
+				int delay = GameServer()->Collision()->GetSwitchDelay(MapIndex);
+
+				if(delay == 1 && m_Type != WEAPON_GUN)
+					IsSwitchTeleGun = IsBlueSwitchTeleGun = false;
+				if(delay == 2 && m_Type != WEAPON_GRENADE)
+					IsSwitchTeleGun = IsBlueSwitchTeleGun = false;
+				if(delay == 3 && m_Type != WEAPON_LASER)
+					IsSwitchTeleGun = IsBlueSwitchTeleGun = false;
+			}
+
+			if(TileFIndex == TILE_ALLOW_TELE_GUN || TileFIndex == TILE_ALLOW_BLUE_TELE_GUN || IsSwitchTeleGun || IsBlueSwitchTeleGun || pTargetChr)
+			{
+				bool Found;
+				vec2 PossiblePos;
+
+				if(!Collide)
+					Found = GetNearestAirPosPlayer(pTargetChr ? pTargetChr->m_Pos : ColPos, &PossiblePos);
+				else
+					Found = GetNearestAirPos(NewPos, CurPos, &PossiblePos);
+
+				if(Found)
+				{
+					pOwnerChar->m_TeleGunPos = PossiblePos;
+					pOwnerChar->m_TeleGunTeleport = true;
+					pOwnerChar->m_IsBlueTeleGunTeleport = TileFIndex == TILE_ALLOW_BLUE_TELE_GUN || IsBlueSwitchTeleGun;
+				}
+			}
+		}
+
+		if(Collide && m_Bouncing != 0)
+		{
+			m_StartTick = Server()->Tick();
+			m_Pos = NewPos + (-(m_Direction * 4));
+			if(m_Bouncing == 1)
+				m_Direction.x = -m_Direction.x;
+			else if(m_Bouncing == 2)
+				m_Direction.y = -m_Direction.y;
+			if(absolute(m_Direction.x) < 1e-6f)
+				m_Direction.x = 0;
+			if(absolute(m_Direction.y) < 1e-6f)
+				m_Direction.y = 0;
+			m_Pos += m_Direction;
+		}
+		else if(m_Type == WEAPON_GUN)
+		{
+			GameServer()->CreateDamageInd(CurPos, -std::atan2(m_Direction.x, m_Direction.y), 10, (m_Owner != -1) ? TeamMask : CClientMask().set());
+			m_MarkedForDestroy = true;
+			return;
+		}
+		else
+		{
+			if(!m_Freeze)
+			{
+				m_MarkedForDestroy = true;
+				return;
+			}
+		}
+	}
+	if(m_LifeSpan == -1)
+	{
+		if(m_Explosive)
+		{
+			if(m_Owner >= 0)
+				pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+
+			TeamMask = CClientMask().set();
+			if(pOwnerChar && pOwnerChar->IsAlive())
+			{
+				TeamMask = pOwnerChar->TeamMask();
+			}
+
+			GameServer()->CreateExplosion(ColPos, m_Owner, m_Type, m_Owner == -1, (!pOwnerChar ? -1 : pOwnerChar->Team()),
+				(m_Owner != -1) ? TeamMask : CClientMask().set());
+			GameServer()->CreateSound(ColPos, m_SoundImpact,
+				(m_Owner != -1) ? TeamMask : CClientMask().set());
+		}
+		m_MarkedForDestroy = true;
+		return;
+	}
+
+	int x = GameServer()->Collision()->GetIndex(PrevPos, CurPos);
+	int z;
+	if(g_Config.m_SvOldTeleportWeapons)
+		z = GameServer()->Collision()->IsTeleport(x);
+	else
+		z = GameServer()->Collision()->IsTeleportWeapon(x);
+	if(z && !GameServer()->m_pController->m_TeleOuts[z - 1].empty())
+	{
+		int TeleOut = GameServer()->m_World.m_Core.RandomOr0(GameServer()->m_pController->m_TeleOuts[z - 1].size());
+		m_Pos = GameServer()->m_pController->m_TeleOuts[z - 1][TeleOut];
+		m_StartTick = Server()->Tick();
+	}
+}
+
+void CProjectile::TickPaused()
+{
+	++m_StartTick;
+}
+
+void CProjectile::FillInfo(CNetObj_Projectile *pProj)
+{
+	pProj->m_X = (int)m_Pos.x;
+	pProj->m_Y = (int)m_Pos.y;
+	pProj->m_VelX = (int)(m_Direction.x * 100.0f);
+	pProj->m_VelY = (int)(m_Direction.y * 100.0f);
+	pProj->m_StartTick = m_StartTick;
+	pProj->m_Type = m_Type;
+}
+
+void CProjectile::Snap(int SnappingClient)
+{
+	float Ct = (Server()->Tick() - m_StartTick) / (float)Server()->TickSpeed();
+
+	if(NetworkClipped(SnappingClient, GetPos(Ct)))
+		return;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	if(SnappingClientVersion < VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		CCharacter *pSnapChar = GameServer()->GetPlayerChar(SnappingClient);
+		int Tick = (Server()->Tick() % Server()->TickSpeed()) % ((m_Explosive) ? 6 : 20);
+		if(pSnapChar && pSnapChar->IsAlive() && (m_Layer == LAYER_SWITCH && m_Number > 0 && !Switchers()[m_Number].m_aStatus[pSnapChar->Team()] && (!Tick)))
+			return;
+	}
+
+	CCharacter *pOwnerChar = 0;
+	CClientMask TeamMask = CClientMask().set();
+
+	if(m_Owner >= 0)
+		pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+
+	if(pOwnerChar && pOwnerChar->IsAlive())
+		TeamMask = pOwnerChar->TeamMask();
+
+	if(SnappingClient != SERVER_DEMO_CLIENT && m_Owner != -1 && !TeamMask.test(SnappingClient))
+		return;
+
+	CNetObj_DDRaceProjectile DDRaceProjectile;
+
+	if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		CNetObj_DDNetProjectile *pDDNetProjectile = static_cast<CNetObj_DDNetProjectile *>(Server()->SnapNewItem(NETOBJTYPE_DDNETPROJECTILE, GetID(), sizeof(CNetObj_DDNetProjectile)));
+		if(!pDDNetProjectile)
+		{
+			return;
+		}
+		FillExtraInfo(pDDNetProjectile);
+	}
+	else if(SnappingClientVersion >= VERSION_DDNET_ANTIPING_PROJECTILE && FillExtraInfoLegacy(&DDRaceProjectile))
+	{
+		int Type = SnappingClientVersion < VERSION_DDNET_MSG_LEGACY ? (int)NETOBJTYPE_PROJECTILE : NETOBJTYPE_DDRACEPROJECTILE;
+		void *pProj = Server()->SnapNewItem(Type, GetID(), sizeof(DDRaceProjectile));
+		if(!pProj)
+		{
+			return;
+		}
+		mem_copy(pProj, &DDRaceProjectile, sizeof(DDRaceProjectile));
+	}
+	else
+	{
+		CNetObj_Projectile *pProj = Server()->SnapNewItem<CNetObj_Projectile>(GetID());
+		if(!pProj)
+		{
+			return;
+		}
+		FillInfo(pProj);
+	}
+}
+
+void CProjectile::SwapClients(int Client1, int Client2)
+{
+	m_Owner = m_Owner == Client1 ? Client2 : m_Owner == Client2 ? Client1 : m_Owner;
+}
+
+// DDRace
+
+void CProjectile::SetBouncing(int Value)
+{
+	m_Bouncing = Value;
+}
+
+bool CProjectile::FillExtraInfoLegacy(CNetObj_DDRaceProjectile *pProj)
+{
+	const int MaxPos = 0x7fffffff / 100;
+	if(absolute((int)m_Pos.y) + 1 >= MaxPos || absolute((int)m_Pos.x) + 1 >= MaxPos)
+	{
+		//If the modified data would be too large to fit in an integer, send normal data instead
+		return false;
+	}
+	//Send additional/modified info, by modifying the fields of the netobj
+	float Angle = -std::atan2(m_Direction.x, m_Direction.y);
+
+	int Data = 0;
+	Data |= (absolute(m_Owner) & 255) << 0;
+	if(m_Owner < 0)
+		Data |= LEGACYPROJECTILEFLAG_NO_OWNER;
+	//This bit tells the client to use the extra info
+	Data |= LEGACYPROJECTILEFLAG_IS_DDNET;
+	// LEGACYPROJECTILEFLAG_BOUNCE_HORIZONTAL, LEGACYPROJECTILEFLAG_BOUNCE_VERTICAL
+	Data |= (m_Bouncing & 3) << 10;
+	if(m_Explosive)
+		Data |= LEGACYPROJECTILEFLAG_EXPLOSIVE;
+	if(m_Freeze)
+		Data |= LEGACYPROJECTILEFLAG_FREEZE;
+
+	pProj->m_X = (int)(m_Pos.x * 100.0f);
+	pProj->m_Y = (int)(m_Pos.y * 100.0f);
+	pProj->m_Angle = (int)(Angle * 1000000.0f);
+	pProj->m_Data = Data;
+	pProj->m_StartTick = m_StartTick;
+	pProj->m_Type = m_Type;
+	return true;
+}
+
+void CProjectile::FillExtraInfo(CNetObj_DDNetProjectile *pProj)
+{
+	int Flags = 0;
+	if(m_Bouncing & 1)
+	{
+		Flags |= PROJECTILEFLAG_BOUNCE_HORIZONTAL;
+	}
+	if(m_Bouncing & 2)
+	{
+		Flags |= PROJECTILEFLAG_BOUNCE_VERTICAL;
+	}
+	if(m_Explosive)
+	{
+		Flags |= PROJECTILEFLAG_EXPLOSIVE;
+	}
+	if(m_Freeze)
+	{
+		Flags |= PROJECTILEFLAG_FREEZE;
+	}
+
+	if(m_Owner < 0)
+	{
+		pProj->m_VelX = round_to_int(m_Direction.x * 1e6f);
+		pProj->m_VelY = round_to_int(m_Direction.y * 1e6f);
+	}
+	else
+	{
+		pProj->m_VelX = round_to_int(m_InitDir.x);
+		pProj->m_VelY = round_to_int(m_InitDir.y);
+		Flags |= PROJECTILEFLAG_NORMALIZE_VEL;
+	}
+
+	pProj->m_X = round_to_int(m_Pos.x * 100.0f);
+	pProj->m_Y = round_to_int(m_Pos.y * 100.0f);
+	pProj->m_Type = m_Type;
+	pProj->m_StartTick = m_StartTick;
+	pProj->m_Owner = m_Owner;
+	pProj->m_Flags = Flags;
+	pProj->m_SwitchNumber = m_Number;
+	pProj->m_TuneZone = m_TuneZone;
+}
diff --git a/src_bkp/game/server/entities/projectile.h b/src_bkp/game/server/entities/projectile.h
new file mode 100644
index 0000000000..85fae7f18d
--- /dev/null
+++ b/src_bkp/game/server/entities/projectile.h
@@ -0,0 +1,60 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_ENTITIES_PROJECTILE_H
+#define GAME_SERVER_ENTITIES_PROJECTILE_H
+
+#include <game/server/entity.h>
+
+class CProjectile : public CEntity
+{
+public:
+	CProjectile(
+		CGameWorld *pGameWorld,
+		int Type,
+		int Owner,
+		vec2 Pos,
+		vec2 Dir,
+		int Span,
+		bool Freeze,
+		bool Explosive,
+		int SoundImpact,
+		vec2 InitDir,
+		int Layer = 0,
+		int Number = 0);
+
+	vec2 GetPos(float Time);
+	void FillInfo(CNetObj_Projectile *pProj);
+
+	virtual void Reset() override;
+	virtual void Tick() override;
+	virtual void TickPaused() override;
+	virtual void Snap(int SnappingClient) override;
+	virtual void SwapClients(int Client1, int Client2) override;
+
+private:
+	vec2 m_Direction;
+	int m_LifeSpan;
+	int m_Owner;
+	int m_Type;
+	//int m_Damage;
+	int m_SoundImpact;
+	int m_StartTick;
+	bool m_Explosive;
+
+	// DDRace
+
+	int m_Bouncing;
+	bool m_Freeze;
+	int m_TuneZone;
+	bool m_BelongsToPracticeTeam;
+	vec2 m_InitDir;
+
+public:
+	void SetBouncing(int Value);
+	bool FillExtraInfoLegacy(CNetObj_DDRaceProjectile *pProj);
+	void FillExtraInfo(CNetObj_DDNetProjectile *pProj);
+
+	virtual int GetOwnerID() const override { return m_Owner; }
+};
+
+#endif
diff --git a/src_bkp/game/server/entity.cpp b/src_bkp/game/server/entity.cpp
new file mode 100644
index 0000000000..658302ea94
--- /dev/null
+++ b/src_bkp/game/server/entity.cpp
@@ -0,0 +1,123 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "entity.h"
+#include "gamecontext.h"
+#include "player.h"
+
+//////////////////////////////////////////////////
+// Entity
+//////////////////////////////////////////////////
+CEntity::CEntity(CGameWorld *pGameWorld, int ObjType, vec2 Pos, int ProximityRadius)
+{
+	m_pGameWorld = pGameWorld;
+	m_pCCollision = GameServer()->Collision();
+
+	m_ObjType = ObjType;
+	m_Pos = Pos;
+	m_ProximityRadius = ProximityRadius;
+
+	m_MarkedForDestroy = false;
+	m_ID = Server()->SnapNewID();
+
+	m_pPrevTypeEntity = 0;
+	m_pNextTypeEntity = 0;
+}
+
+CEntity::~CEntity()
+{
+	GameWorld()->RemoveEntity(this);
+	Server()->SnapFreeID(m_ID);
+}
+
+bool CEntity::NetworkClipped(int SnappingClient) const
+{
+	return ::NetworkClipped(m_pGameWorld->GameServer(), SnappingClient, m_Pos);
+}
+
+bool CEntity::NetworkClipped(int SnappingClient, vec2 CheckPos) const
+{
+	return ::NetworkClipped(m_pGameWorld->GameServer(), SnappingClient, CheckPos);
+}
+
+bool CEntity::NetworkClippedLine(int SnappingClient, vec2 StartPos, vec2 EndPos) const
+{
+	return ::NetworkClippedLine(m_pGameWorld->GameServer(), SnappingClient, StartPos, EndPos);
+}
+
+bool CEntity::GameLayerClipped(vec2 CheckPos)
+{
+	return round_to_int(CheckPos.x) / 32 < -200 || round_to_int(CheckPos.x) / 32 > GameServer()->Collision()->GetWidth() + 200 ||
+	       round_to_int(CheckPos.y) / 32 < -200 || round_to_int(CheckPos.y) / 32 > GameServer()->Collision()->GetHeight() + 200;
+}
+
+bool CEntity::GetNearestAirPos(vec2 Pos, vec2 PrevPos, vec2 *pOutPos)
+{
+	for(int k = 0; k < 16 && GameServer()->Collision()->CheckPoint(Pos); k++)
+	{
+		Pos -= normalize(PrevPos - Pos);
+	}
+
+	vec2 PosInBlock = vec2(round_to_int(Pos.x) % 32, round_to_int(Pos.y) % 32);
+	vec2 BlockCenter = vec2(round_to_int(Pos.x), round_to_int(Pos.y)) - PosInBlock + vec2(16.0f, 16.0f);
+
+	*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -2.0f : 1.0f), Pos.y);
+	if(!GameServer()->Collision()->TestBox(*pOutPos, CCharacterCore::PhysicalSizeVec2()))
+		return true;
+
+	*pOutPos = vec2(Pos.x, BlockCenter.y + (PosInBlock.y < 16 ? -2.0f : 1.0f));
+	if(!GameServer()->Collision()->TestBox(*pOutPos, CCharacterCore::PhysicalSizeVec2()))
+		return true;
+
+	*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -2.0f : 1.0f),
+		BlockCenter.y + (PosInBlock.y < 16 ? -2.0f : 1.0f));
+	return !GameServer()->Collision()->TestBox(*pOutPos, CCharacterCore::PhysicalSizeVec2());
+}
+
+bool CEntity::GetNearestAirPosPlayer(vec2 PlayerPos, vec2 *pOutPos)
+{
+	for(int dist = 5; dist >= -1; dist--)
+	{
+		*pOutPos = vec2(PlayerPos.x, PlayerPos.y - dist);
+		if(!GameServer()->Collision()->TestBox(*pOutPos, CCharacterCore::PhysicalSizeVec2()))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool NetworkClipped(const CGameContext *pGameServer, int SnappingClient, vec2 CheckPos)
+{
+	if(SnappingClient == SERVER_DEMO_CLIENT || pGameServer->m_apPlayers[SnappingClient]->m_ShowAll)
+		return false;
+
+	float dx = pGameServer->m_apPlayers[SnappingClient]->m_ViewPos.x - CheckPos.x;
+	if(absolute(dx) > pGameServer->m_apPlayers[SnappingClient]->m_ShowDistance.x)
+		return true;
+
+	float dy = pGameServer->m_apPlayers[SnappingClient]->m_ViewPos.y - CheckPos.y;
+	return absolute(dy) > pGameServer->m_apPlayers[SnappingClient]->m_ShowDistance.y;
+}
+
+bool NetworkClippedLine(const CGameContext *pGameServer, int SnappingClient, vec2 StartPos, vec2 EndPos)
+{
+	if(SnappingClient == SERVER_DEMO_CLIENT || pGameServer->m_apPlayers[SnappingClient]->m_ShowAll)
+		return false;
+
+	vec2 &ViewPos = pGameServer->m_apPlayers[SnappingClient]->m_ViewPos;
+	vec2 &ShowDistance = pGameServer->m_apPlayers[SnappingClient]->m_ShowDistance;
+
+	vec2 DistanceToLine, ClosestPoint;
+	if(closest_point_on_line(StartPos, EndPos, ViewPos, ClosestPoint))
+	{
+		DistanceToLine = ViewPos - ClosestPoint;
+	}
+	else
+	{
+		// No line section was passed but two equal points
+		DistanceToLine = ViewPos - StartPos;
+	}
+	float ClippDistance = maximum(ShowDistance.x, ShowDistance.y);
+	return (absolute(DistanceToLine.x) > ClippDistance || absolute(DistanceToLine.y) > ClippDistance);
+}
diff --git a/src_bkp/game/server/entity.h b/src_bkp/game/server/entity.h
new file mode 100644
index 0000000000..69e9a43856
--- /dev/null
+++ b/src_bkp/game/server/entity.h
@@ -0,0 +1,177 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_ENTITY_H
+#define GAME_SERVER_ENTITY_H
+
+#include <base/vmath.h>
+
+#include <game/alloc.h>
+
+#include "gameworld.h"
+
+class CCollision;
+class CGameContext;
+
+/*
+	Class: Entity
+		Basic entity class.
+*/
+class CEntity
+{
+	MACRO_ALLOC_HEAP()
+
+private:
+	friend CGameWorld; // entity list handling
+	CEntity *m_pPrevTypeEntity;
+	CEntity *m_pNextTypeEntity;
+
+	/* Identity */
+	CGameWorld *m_pGameWorld;
+	CCollision *m_pCCollision;
+
+	int m_ID;
+	int m_ObjType;
+
+	/*
+		Variable: m_ProximityRadius
+			Contains the physical size of the entity.
+	*/
+	float m_ProximityRadius;
+
+protected:
+	/* State */
+	bool m_MarkedForDestroy;
+
+public: // TODO: Maybe make protected
+	/*
+		Variable: m_Pos
+			Contains the current posititon of the entity.
+	*/
+	vec2 m_Pos;
+
+	/* Getters */
+	int GetID() const { return m_ID; }
+
+	/* Constructor */
+	CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0);
+
+	/* Destructor */
+	virtual ~CEntity();
+
+	/* Objects */
+	std::vector<SSwitchers> &Switchers() { return m_pGameWorld->m_Core.m_vSwitchers; }
+	CGameWorld *GameWorld() { return m_pGameWorld; }
+	CTuningParams *Tuning() { return GameWorld()->Tuning(); }
+	CTuningParams *TuningList() { return GameWorld()->TuningList(); }
+	CTuningParams *GetTuning(int i) { return GameWorld()->GetTuning(i); }
+	class CConfig *Config() { return m_pGameWorld->Config(); }
+	class CGameContext *GameServer() { return m_pGameWorld->GameServer(); }
+	class IServer *Server() { return m_pGameWorld->Server(); }
+	CCollision *Collision() { return m_pCCollision; }
+
+	/* Getters */
+	CEntity *TypeNext() { return m_pNextTypeEntity; }
+	CEntity *TypePrev() { return m_pPrevTypeEntity; }
+	const vec2 &GetPos() const { return m_Pos; }
+	float GetProximityRadius() const { return m_ProximityRadius; }
+
+	/* Other functions */
+
+	/*
+		Function: Destroy
+			Destroys the entity.
+	*/
+	virtual void Destroy() { delete this; }
+
+	/*
+		Function: Reset
+			Called when the game resets the map. Puts the entity
+			back to its starting state or perhaps destroys it.
+	*/
+	virtual void Reset() {}
+
+	/*
+		Function: Tick
+			Called to progress the entity to the next tick. Updates
+			and moves the entity to its new state and position.
+	*/
+	virtual void Tick() {}
+
+	/*
+		Function: TickDeferred
+			Called after all entities Tick() function has been called.
+	*/
+	virtual void TickDeferred() {}
+
+	/*
+		Function: TickPaused
+			Called when the game is paused, to freeze the state and position of the entity.
+	*/
+	virtual void TickPaused() {}
+
+	/*
+		Function: Snap
+			Called when a new snapshot is being generated for a specific
+			client.
+
+		Arguments:
+			SnappingClient - ID of the client which snapshot is
+				being generated. Could be -1 to create a complete
+				snapshot of everything in the game for demo
+				recording.
+	*/
+	virtual void Snap(int SnappingClient) {}
+
+	/*
+		Function: SwapClients
+			Called when two players have swapped their client ids.
+
+		Arguments:
+			Client1 - First client ID
+			Client2 - Second client ID
+	*/
+	virtual void SwapClients(int Client1, int Client2) {}
+
+	/*
+		Function GetOwnerID
+		Returns:
+			ClientID of the initiator from this entity. -1 created by map.
+			This is used by save/load to remove related entities to the tee.
+			CCharacter should not return the PlayerId, because they get
+			handled separately in save/load code.
+	*/
+	virtual int GetOwnerID() const { return -1; }
+
+	/*
+		Function: NetworkClipped
+			Performs a series of test to see if a client can see the
+			entity.
+
+		Arguments:
+			SnappingClient - ID of the client which snapshot is
+				being generated. Could be -1 to create a complete
+				snapshot of everything in the game for demo
+				recording.
+
+		Returns:
+			True if the entity doesn't have to be in the snapshot.
+	*/
+	bool NetworkClipped(int SnappingClient) const;
+	bool NetworkClipped(int SnappingClient, vec2 CheckPos) const;
+	bool NetworkClippedLine(int SnappingClient, vec2 StartPos, vec2 EndPos) const;
+
+	bool GameLayerClipped(vec2 CheckPos);
+
+	// DDRace
+
+	bool GetNearestAirPos(vec2 Pos, vec2 PrevPos, vec2 *pOutPos);
+	bool GetNearestAirPosPlayer(vec2 PlayerPos, vec2 *pOutPos);
+
+	int m_Number;
+	int m_Layer;
+};
+
+bool NetworkClipped(const CGameContext *pGameServer, int SnappingClient, vec2 CheckPos);
+bool NetworkClippedLine(const CGameContext *pGameServer, int SnappingClient, vec2 StartPos, vec2 EndPos);
+
+#endif
diff --git a/src_bkp/game/server/eventhandler.cpp b/src_bkp/game/server/eventhandler.cpp
new file mode 100644
index 0000000000..bff14e5a85
--- /dev/null
+++ b/src_bkp/game/server/eventhandler.cpp
@@ -0,0 +1,105 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "eventhandler.h"
+
+#include "entity.h"
+#include "gamecontext.h"
+
+#include <base/system.h>
+#include <base/vmath.h>
+
+//////////////////////////////////////////////////
+// Event handler
+//////////////////////////////////////////////////
+CEventHandler::CEventHandler()
+{
+	m_pGameServer = 0;
+	Clear();
+}
+
+void CEventHandler::SetGameServer(CGameContext *pGameServer)
+{
+	m_pGameServer = pGameServer;
+}
+
+void *CEventHandler::Create(int Type, int Size, CClientMask Mask)
+{
+	if(m_NumEvents == MAX_EVENTS)
+		return 0;
+	if(m_CurrentOffset + Size >= MAX_DATASIZE)
+		return 0;
+
+	void *p = &m_aData[m_CurrentOffset];
+	m_aOffsets[m_NumEvents] = m_CurrentOffset;
+	m_aTypes[m_NumEvents] = Type;
+	m_aSizes[m_NumEvents] = Size;
+	m_aClientMasks[m_NumEvents] = Mask;
+	m_CurrentOffset += Size;
+	m_NumEvents++;
+	return p;
+}
+
+void CEventHandler::Clear()
+{
+	m_NumEvents = 0;
+	m_CurrentOffset = 0;
+}
+
+void CEventHandler::Snap(int SnappingClient)
+{
+	for(int i = 0; i < m_NumEvents; i++)
+	{
+		if(SnappingClient == SERVER_DEMO_CLIENT || m_aClientMasks[i].test(SnappingClient))
+		{
+			CNetEvent_Common *pEvent = (CNetEvent_Common *)&m_aData[m_aOffsets[i]];
+			if(!NetworkClipped(GameServer(), SnappingClient, vec2(pEvent->m_X, pEvent->m_Y)))
+			{
+				int Type = m_aTypes[i];
+				int Size = m_aSizes[i];
+				const char *pData = &m_aData[m_aOffsets[i]];
+				if(GameServer()->Server()->IsSixup(SnappingClient))
+					EventToSixup(&Type, &Size, &pData);
+
+				void *pItem = GameServer()->Server()->SnapNewItem(Type, i, Size);
+				if(pItem)
+					mem_copy(pItem, pData, Size);
+			}
+		}
+	}
+}
+
+void CEventHandler::EventToSixup(int *pType, int *pSize, const char **ppData)
+{
+	static char s_aEventStore[128];
+	if(*pType == NETEVENTTYPE_DAMAGEIND)
+	{
+		const CNetEvent_DamageInd *pEvent = (const CNetEvent_DamageInd *)(*ppData);
+		protocol7::CNetEvent_Damage *pEvent7 = (protocol7::CNetEvent_Damage *)s_aEventStore;
+		*pType = -protocol7::NETEVENTTYPE_DAMAGE;
+		*pSize = sizeof(*pEvent7);
+
+		pEvent7->m_X = pEvent->m_X;
+		pEvent7->m_Y = pEvent->m_Y;
+
+		// This will need some work, perhaps an event wrapper for damageind,
+		// a scan of the event array to merge multiple damageinds
+		// or a separate array of "damage ind" events that's added in while snapping
+		pEvent7->m_HealthAmount = 1;
+
+		*ppData = s_aEventStore;
+	}
+	else if(*pType == NETEVENTTYPE_SOUNDGLOBAL) // No more global sounds for the server
+	{
+		const CNetEvent_SoundGlobal *pEvent = (const CNetEvent_SoundGlobal *)(*ppData);
+		protocol7::CNetEvent_SoundWorld *pEvent7 = (protocol7::CNetEvent_SoundWorld *)s_aEventStore;
+
+		*pType = -protocol7::NETEVENTTYPE_SOUNDWORLD;
+		*pSize = sizeof(*pEvent7);
+
+		pEvent7->m_SoundID = pEvent->m_SoundID;
+		pEvent7->m_X = pEvent->m_X;
+		pEvent7->m_Y = pEvent->m_Y;
+
+		*ppData = s_aEventStore;
+	}
+}
diff --git a/src_bkp/game/server/eventhandler.h b/src_bkp/game/server/eventhandler.h
new file mode 100644
index 0000000000..4390109b2f
--- /dev/null
+++ b/src_bkp/game/server/eventhandler.h
@@ -0,0 +1,48 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_EVENTHANDLER_H
+#define GAME_SERVER_EVENTHANDLER_H
+
+#include <cstdint>
+
+#include <engine/shared/protocol.h>
+
+class CEventHandler
+{
+	enum
+	{
+		MAX_EVENTS = 128,
+		MAX_DATASIZE = 128 * 64,
+	};
+
+	int m_aTypes[MAX_EVENTS]; // TODO: remove some of these arrays
+	int m_aOffsets[MAX_EVENTS];
+	int m_aSizes[MAX_EVENTS];
+	CClientMask m_aClientMasks[MAX_EVENTS];
+	char m_aData[MAX_DATASIZE];
+
+	class CGameContext *m_pGameServer;
+
+	int m_CurrentOffset;
+	int m_NumEvents;
+
+public:
+	CGameContext *GameServer() const { return m_pGameServer; }
+	void SetGameServer(CGameContext *pGameServer);
+
+	CEventHandler();
+	void *Create(int Type, int Size, CClientMask Mask = CClientMask().set());
+
+	template<typename T>
+	T *Create(CClientMask Mask = CClientMask().set())
+	{
+		return static_cast<T *>(Create(T::ms_MsgID, sizeof(T), Mask));
+	}
+
+	void Clear();
+	void Snap(int SnappingClient);
+
+	void EventToSixup(int *pType, int *pSize, const char **ppData);
+};
+
+#endif
diff --git a/src_bkp/game/server/gamecontext.cpp b/src_bkp/game/server/gamecontext.cpp
new file mode 100644
index 0000000000..e55cfd4db9
--- /dev/null
+++ b/src_bkp/game/server/gamecontext.cpp
@@ -0,0 +1,4723 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "gamecontext.h"
+
+#include <vector>
+
+#include "teeinfo.h"
+#include <antibot/antibot_data.h>
+#include <base/logger.h>
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/map.h>
+#include <engine/server/server.h>
+#include <engine/shared/config.h>
+#include <engine/shared/datafile.h>
+#include <engine/shared/json.h>
+#include <engine/shared/linereader.h>
+#include <engine/shared/memheap.h>
+#include <engine/storage.h>
+
+#include <game/collision.h>
+#include <game/gamecore.h>
+#include <game/mapitems.h>
+#include <game/version.h>
+
+#include <game/generated/protocol7.h>
+#include <game/generated/protocolglue.h>
+
+#include "entities/character.h"
+#include "gamemodes/DDRace.h"
+#include "gamemodes/mod.h"
+#include "player.h"
+#include "score.h"
+
+// Not thread-safe!
+class CClientChatLogger : public ILogger
+{
+	CGameContext *m_pGameServer;
+	int m_ClientID;
+	ILogger *m_pOuterLogger;
+
+public:
+	CClientChatLogger(CGameContext *pGameServer, int ClientID, ILogger *pOuterLogger) :
+		m_pGameServer(pGameServer),
+		m_ClientID(ClientID),
+		m_pOuterLogger(pOuterLogger)
+	{
+	}
+	void Log(const CLogMessage *pMessage) override;
+};
+
+void CClientChatLogger::Log(const CLogMessage *pMessage)
+{
+	if(str_comp(pMessage->m_aSystem, "chatresp") == 0)
+	{
+		if(m_Filter.Filters(pMessage))
+		{
+			return;
+		}
+		m_pGameServer->SendChatTarget(m_ClientID, pMessage->Message());
+	}
+	else
+	{
+		m_pOuterLogger->Log(pMessage);
+	}
+}
+
+enum
+{
+	RESET,
+	NO_RESET
+};
+
+void CGameContext::Construct(int Resetting)
+{
+	m_Resetting = false;
+	m_pServer = 0;
+
+	for(auto &pPlayer : m_apPlayers)
+		pPlayer = 0;
+
+	mem_zero(&m_aLastPlayerInput, sizeof(m_aLastPlayerInput));
+	mem_zero(&m_aPlayerHasInput, sizeof(m_aPlayerHasInput));
+
+	m_pController = 0;
+	m_aVoteCommand[0] = 0;
+	m_VoteType = VOTE_TYPE_UNKNOWN;
+	m_VoteCloseTime = 0;
+	m_pVoteOptionFirst = 0;
+	m_pVoteOptionLast = 0;
+	m_NumVoteOptions = 0;
+	m_LastMapVote = 0;
+
+	m_SqlRandomMapResult = nullptr;
+
+	m_pScore = nullptr;
+	m_NumMutes = 0;
+	m_NumVoteMutes = 0;
+
+	m_LatestLog = 0;
+	mem_zero(&m_aLogs, sizeof(m_aLogs));
+
+	if(Resetting == NO_RESET)
+	{
+		m_NonEmptySince = 0;
+		m_pVoteOptionHeap = new CHeap();
+	}
+
+	m_aDeleteTempfile[0] = 0;
+	m_TeeHistorianActive = false;
+}
+
+void CGameContext::Destruct(int Resetting)
+{
+	for(auto &pPlayer : m_apPlayers)
+		delete pPlayer;
+
+	if(Resetting == NO_RESET)
+		delete m_pVoteOptionHeap;
+
+	if(m_pScore)
+	{
+		delete m_pScore;
+		m_pScore = nullptr;
+	}
+}
+
+CGameContext::CGameContext()
+{
+	Construct(NO_RESET);
+}
+
+CGameContext::CGameContext(int Reset)
+{
+	Construct(Reset);
+}
+
+CGameContext::~CGameContext()
+{
+	Destruct(m_Resetting ? RESET : NO_RESET);
+}
+
+void CGameContext::Clear()
+{
+	CHeap *pVoteOptionHeap = m_pVoteOptionHeap;
+	CVoteOptionServer *pVoteOptionFirst = m_pVoteOptionFirst;
+	CVoteOptionServer *pVoteOptionLast = m_pVoteOptionLast;
+	int NumVoteOptions = m_NumVoteOptions;
+	CTuningParams Tuning = m_Tuning;
+
+	m_Resetting = true;
+	this->~CGameContext();
+	new(this) CGameContext(RESET);
+
+	m_pVoteOptionHeap = pVoteOptionHeap;
+	m_pVoteOptionFirst = pVoteOptionFirst;
+	m_pVoteOptionLast = pVoteOptionLast;
+	m_NumVoteOptions = NumVoteOptions;
+	m_Tuning = Tuning;
+}
+
+void CGameContext::TeeHistorianWrite(const void *pData, int DataSize, void *pUser)
+{
+	CGameContext *pSelf = (CGameContext *)pUser;
+	aio_write(pSelf->m_pTeeHistorianFile, pData, DataSize);
+}
+
+void CGameContext::CommandCallback(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser)
+{
+	CGameContext *pSelf = (CGameContext *)pUser;
+	if(pSelf->m_TeeHistorianActive)
+	{
+		pSelf->m_TeeHistorian.RecordConsoleCommand(ClientID, FlagMask, pCmd, pResult);
+	}
+}
+
+CNetObj_PlayerInput CGameContext::GetLastPlayerInput(int ClientID) const
+{
+	dbg_assert(0 <= ClientID && ClientID < MAX_CLIENTS, "invalid ClientID");
+	return m_aLastPlayerInput[ClientID];
+}
+
+class CCharacter *CGameContext::GetPlayerChar(int ClientID)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS || !m_apPlayers[ClientID])
+		return 0;
+	return m_apPlayers[ClientID]->GetCharacter();
+}
+
+bool CGameContext::EmulateBug(int Bug)
+{
+	return m_MapBugs.Contains(Bug);
+}
+
+void CGameContext::FillAntibot(CAntibotRoundData *pData)
+{
+	if(!pData->m_Map.m_pTiles)
+	{
+		Collision()->FillAntibot(&pData->m_Map);
+	}
+	pData->m_Tick = Server()->Tick();
+	mem_zero(pData->m_aCharacters, sizeof(pData->m_aCharacters));
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		CAntibotCharacterData *pChar = &pData->m_aCharacters[i];
+		for(auto &LatestInput : pChar->m_aLatestInputs)
+		{
+			LatestInput.m_TargetX = -1;
+			LatestInput.m_TargetY = -1;
+		}
+		pChar->m_Alive = false;
+		pChar->m_Pause = false;
+		pChar->m_Team = -1;
+
+		pChar->m_Pos = vec2(-1, -1);
+		pChar->m_Vel = vec2(0, 0);
+		pChar->m_Angle = -1;
+		pChar->m_HookedPlayer = -1;
+		pChar->m_SpawnTick = -1;
+		pChar->m_WeaponChangeTick = -1;
+
+		if(m_apPlayers[i])
+		{
+			str_copy(pChar->m_aName, Server()->ClientName(i), sizeof(pChar->m_aName));
+			CCharacter *pGameChar = m_apPlayers[i]->GetCharacter();
+			pChar->m_Alive = (bool)pGameChar;
+			pChar->m_Pause = m_apPlayers[i]->IsPaused();
+			pChar->m_Team = m_apPlayers[i]->GetTeam();
+			if(pGameChar)
+			{
+				pGameChar->FillAntibot(pChar);
+			}
+		}
+	}
+}
+
+void CGameContext::CreateDamageInd(vec2 Pos, float Angle, int Amount, CClientMask Mask)
+{
+	float a = 3 * pi / 2 + Angle;
+	//float a = get_angle(dir);
+	float s = a - pi / 3;
+	float e = a + pi / 3;
+	for(int i = 0; i < Amount; i++)
+	{
+		float f = mix(s, e, (i + 1) / (float)(Amount + 2));
+		CNetEvent_DamageInd *pEvent = m_Events.Create<CNetEvent_DamageInd>(Mask);
+		if(pEvent)
+		{
+			pEvent->m_X = (int)Pos.x;
+			pEvent->m_Y = (int)Pos.y;
+			pEvent->m_Angle = (int)(f * 256.0f);
+		}
+	}
+}
+
+void CGameContext::CreateHammerHit(vec2 Pos, CClientMask Mask)
+{
+	// create the event
+	CNetEvent_HammerHit *pEvent = m_Events.Create<CNetEvent_HammerHit>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+	}
+}
+
+void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask)
+{
+	// create the event
+	CNetEvent_Explosion *pEvent = m_Events.Create<CNetEvent_Explosion>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+	}
+
+	// deal damage
+	CEntity *apEnts[MAX_CLIENTS];
+	float Radius = 135.0f;
+	float InnerRadius = 48.0f;
+	int Num = m_World.FindEntities(Pos, Radius, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+	CClientMask TeamMask = CClientMask().set();
+	for(int i = 0; i < Num; i++)
+	{
+		auto *pChr = static_cast<CCharacter *>(apEnts[i]);
+		vec2 Diff = pChr->m_Pos - Pos;
+		vec2 ForceDir(0, 1);
+		float l = length(Diff);
+		if(l)
+			ForceDir = normalize(Diff);
+		l = 1 - clamp((l - InnerRadius) / (Radius - InnerRadius), 0.0f, 1.0f);
+		float Strength;
+		if(Owner == -1 || !m_apPlayers[Owner] || !m_apPlayers[Owner]->m_TuneZone)
+			Strength = Tuning()->m_ExplosionStrength;
+		else
+			Strength = TuningList()[m_apPlayers[Owner]->m_TuneZone].m_ExplosionStrength;
+
+		float Dmg = Strength * l;
+		if(!(int)Dmg)
+			continue;
+
+		if((GetPlayerChar(Owner) ? !GetPlayerChar(Owner)->GrenadeHitDisabled() : g_Config.m_SvHit) || NoDamage || Owner == pChr->GetPlayer()->GetCID())
+		{
+			if(Owner != -1 && pChr->IsAlive() && !pChr->CanCollide(Owner))
+				continue;
+			if(Owner == -1 && ActivatedTeam != -1 && pChr->IsAlive() && pChr->Team() != ActivatedTeam)
+				continue;
+
+			// Explode at most once per team
+			int PlayerTeam = pChr->Team();
+			if((GetPlayerChar(Owner) ? GetPlayerChar(Owner)->GrenadeHitDisabled() : !g_Config.m_SvHit) || NoDamage)
+			{
+				if(PlayerTeam == TEAM_SUPER)
+					continue;
+				if(!TeamMask.test(PlayerTeam))
+					continue;
+				TeamMask.reset(PlayerTeam);
+			}
+
+			pChr->TakeDamage(ForceDir * Dmg * 2, (int)Dmg, Owner, Weapon);
+		}
+	}
+}
+
+void CGameContext::CreatePlayerSpawn(vec2 Pos, CClientMask Mask)
+{
+	// create the event
+	CNetEvent_Spawn *pEvent = m_Events.Create<CNetEvent_Spawn>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+	}
+}
+
+void CGameContext::CreateDeath(vec2 Pos, int ClientID, CClientMask Mask)
+{
+	// create the event
+	CNetEvent_Death *pEvent = m_Events.Create<CNetEvent_Death>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+		pEvent->m_ClientID = ClientID;
+	}
+}
+
+void CGameContext::CreateSound(vec2 Pos, int Sound, CClientMask Mask)
+{
+	if(Sound < 0)
+		return;
+
+	// create a sound
+	CNetEvent_SoundWorld *pEvent = m_Events.Create<CNetEvent_SoundWorld>(Mask);
+	if(pEvent)
+	{
+		pEvent->m_X = (int)Pos.x;
+		pEvent->m_Y = (int)Pos.y;
+		pEvent->m_SoundID = Sound;
+	}
+}
+
+void CGameContext::CreateSoundGlobal(int Sound, int Target) const
+{
+	if(Sound < 0)
+		return;
+
+	CNetMsg_Sv_SoundGlobal Msg;
+	Msg.m_SoundID = Sound;
+	if(Target == -2)
+		Server()->SendPackMsg(&Msg, MSGFLAG_NOSEND, -1);
+	else
+	{
+		int Flag = MSGFLAG_VITAL;
+		if(Target != -1)
+			Flag |= MSGFLAG_NORECORD;
+		Server()->SendPackMsg(&Msg, Flag, Target);
+	}
+}
+
+void CGameContext::SnapSwitchers(int SnappingClient)
+{
+	if(Switchers().empty())
+		return;
+
+	CPlayer *pPlayer = SnappingClient != SERVER_DEMO_CLIENT ? m_apPlayers[SnappingClient] : 0;
+	int Team = pPlayer && pPlayer->GetCharacter() ? pPlayer->GetCharacter()->Team() : 0;
+
+	if(pPlayer && (pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorID != SPEC_FREEVIEW && m_apPlayers[pPlayer->m_SpectatorID] && m_apPlayers[pPlayer->m_SpectatorID]->GetCharacter())
+		Team = m_apPlayers[pPlayer->m_SpectatorID]->GetCharacter()->Team();
+
+	if(Team == TEAM_SUPER)
+		return;
+
+	int SentTeam = Team;
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+		SentTeam = 0;
+
+	CNetObj_SwitchState *pSwitchState = Server()->SnapNewItem<CNetObj_SwitchState>(SentTeam);
+	if(!pSwitchState)
+		return;
+
+	pSwitchState->m_HighestSwitchNumber = clamp((int)Switchers().size() - 1, 0, 255);
+	mem_zero(pSwitchState->m_aStatus, sizeof(pSwitchState->m_aStatus));
+
+	std::vector<std::pair<int, int>> vEndTicks; // <EndTick, SwitchNumber>
+
+	for(int i = 0; i <= pSwitchState->m_HighestSwitchNumber; i++)
+	{
+		int Status = (int)Switchers()[i].m_aStatus[Team];
+		pSwitchState->m_aStatus[i / 32] |= (Status << (i % 32));
+
+		int EndTick = Switchers()[i].m_aEndTick[Team];
+		if(EndTick > 0 && EndTick < Server()->Tick() + 3 * Server()->TickSpeed() && Switchers()[i].m_aLastUpdateTick[Team] < Server()->Tick())
+		{
+			// only keep track of EndTicks that have less than three second left and are not currently being updated by a player being present on a switch tile, to limit how often these are sent
+			vEndTicks.emplace_back(Switchers()[i].m_aEndTick[Team], i);
+		}
+	}
+
+	// send the endtick of switchers that are about to toggle back (up to four, prioritizing those with the earliest endticks)
+	mem_zero(pSwitchState->m_aSwitchNumbers, sizeof(pSwitchState->m_aSwitchNumbers));
+	mem_zero(pSwitchState->m_aEndTicks, sizeof(pSwitchState->m_aEndTicks));
+
+	std::sort(vEndTicks.begin(), vEndTicks.end());
+	const int NumTimedSwitchers = minimum((int)vEndTicks.size(), (int)std::size(pSwitchState->m_aEndTicks));
+
+	for(int i = 0; i < NumTimedSwitchers; i++)
+	{
+		pSwitchState->m_aSwitchNumbers[i] = vEndTicks[i].second;
+		pSwitchState->m_aEndTicks[i] = vEndTicks[i].first;
+	}
+}
+
+bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapID, const vec2 &To, const vec2 &From, int StartTick, int Owner, int LaserType, int Subtype, int SwitchNumber) const
+{
+	if(Context.GetClientVersion() >= VERSION_DDNET_MULTI_LASER)
+	{
+		CNetObj_DDNetLaser *pObj = Server()->SnapNewItem<CNetObj_DDNetLaser>(SnapID);
+		if(!pObj)
+			return false;
+
+		pObj->m_ToX = (int)To.x;
+		pObj->m_ToY = (int)To.y;
+		pObj->m_FromX = (int)From.x;
+		pObj->m_FromY = (int)From.y;
+		pObj->m_StartTick = StartTick;
+		pObj->m_Owner = Owner;
+		pObj->m_Type = LaserType;
+		pObj->m_Subtype = Subtype;
+		pObj->m_SwitchNumber = SwitchNumber;
+		pObj->m_Flags = 0;
+	}
+	else
+	{
+		CNetObj_Laser *pObj = Server()->SnapNewItem<CNetObj_Laser>(SnapID);
+		if(!pObj)
+			return false;
+
+		pObj->m_X = (int)To.x;
+		pObj->m_Y = (int)To.y;
+		pObj->m_FromX = (int)From.x;
+		pObj->m_FromY = (int)From.y;
+		pObj->m_StartTick = StartTick;
+	}
+
+	return true;
+}
+
+bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapID, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const
+{
+	if(Context.IsSixup())
+	{
+		protocol7::CNetObj_Pickup *pPickup = Server()->SnapNewItem<protocol7::CNetObj_Pickup>(SnapID);
+		if(!pPickup)
+			return false;
+
+		pPickup->m_X = (int)Pos.x;
+		pPickup->m_Y = (int)Pos.y;
+
+		if(Type == POWERUP_WEAPON)
+			pPickup->m_Type = SubType == WEAPON_SHOTGUN ? protocol7::PICKUP_SHOTGUN : SubType == WEAPON_GRENADE ? protocol7::PICKUP_GRENADE : protocol7::PICKUP_LASER;
+		else if(Type == POWERUP_NINJA)
+			pPickup->m_Type = protocol7::PICKUP_NINJA;
+	}
+	else if(Context.GetClientVersion() >= VERSION_DDNET_ENTITY_NETOBJS)
+	{
+		CNetObj_DDNetPickup *pPickup = Server()->SnapNewItem<CNetObj_DDNetPickup>(SnapID);
+		if(!pPickup)
+			return false;
+
+		pPickup->m_X = (int)Pos.x;
+		pPickup->m_Y = (int)Pos.y;
+		pPickup->m_Type = Type;
+		pPickup->m_Subtype = SubType;
+		pPickup->m_SwitchNumber = SwitchNumber;
+	}
+	else
+	{
+		CNetObj_Pickup *pPickup = Server()->SnapNewItem<CNetObj_Pickup>(SnapID);
+		if(!pPickup)
+			return false;
+
+		pPickup->m_X = (int)Pos.x;
+		pPickup->m_Y = (int)Pos.y;
+
+		pPickup->m_Type = Type;
+		if(Context.GetClientVersion() < VERSION_DDNET_WEAPON_SHIELDS)
+		{
+			if(Type >= POWERUP_ARMOR_SHOTGUN && Type <= POWERUP_ARMOR_LASER)
+			{
+				pPickup->m_Type = POWERUP_ARMOR;
+			}
+		}
+		pPickup->m_Subtype = SubType;
+	}
+
+	return true;
+}
+
+void CGameContext::CallVote(int ClientID, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc)
+{
+	// check if a vote is already running
+	if(m_VoteCloseTime)
+		return;
+
+	int64_t Now = Server()->Tick();
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	if(!pPlayer)
+		return;
+
+	SendChat(-1, CGameContext::CHAT_ALL, pChatmsg, -1, CHAT_SIX);
+	if(!pSixupDesc)
+		pSixupDesc = pDesc;
+
+	m_VoteCreator = ClientID;
+	StartVote(pDesc, pCmd, pReason, pSixupDesc);
+	pPlayer->m_Vote = 1;
+	pPlayer->m_VotePos = m_VotePos = 1;
+	pPlayer->m_LastVoteCall = Now;
+}
+
+void CGameContext::SendChatTarget(int To, const char *pText, int Flags) const
+{
+	CNetMsg_Sv_Chat Msg;
+	Msg.m_Team = 0;
+	Msg.m_ClientID = -1;
+	Msg.m_pMessage = pText;
+
+	if(g_Config.m_SvDemoChat)
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NOSEND, SERVER_DEMO_CLIENT);
+
+	if(To == -1)
+	{
+		for(int i = 0; i < Server()->MaxClients(); i++)
+		{
+			if(!((Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
+				   (!Server()->IsSixup(i) && (Flags & CHAT_SIX))))
+				continue;
+
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+		}
+	}
+	else
+	{
+		if(!((Server()->IsSixup(To) && (Flags & CHAT_SIXUP)) ||
+			   (!Server()->IsSixup(To) && (Flags & CHAT_SIX))))
+			return;
+
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, To);
+	}
+}
+
+void CGameContext::SendChatTeam(int Team, const char *pText) const
+{
+	for(int i = 0; i < MAX_CLIENTS; i++)
+		if(m_apPlayers[i] != nullptr && GetDDRaceTeam(i) == Team)
+			SendChatTarget(i, pText);
+}
+
+void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, int SpamProtectionClientID, int Flags)
+{
+	if(SpamProtectionClientID >= 0 && SpamProtectionClientID < MAX_CLIENTS)
+		if(ProcessSpamProtection(SpamProtectionClientID))
+			return;
+
+	char aBuf[256], aText[256];
+	str_copy(aText, pText, sizeof(aText));
+	if(ChatterClientID >= 0 && ChatterClientID < MAX_CLIENTS)
+		str_format(aBuf, sizeof(aBuf), "%d:%d:%s: %s", ChatterClientID, Team, Server()->ClientName(ChatterClientID), aText);
+	else if(ChatterClientID == -2)
+	{
+		str_format(aBuf, sizeof(aBuf), "### %s", aText);
+		str_copy(aText, aBuf, sizeof(aText));
+		ChatterClientID = -1;
+	}
+	else
+		str_format(aBuf, sizeof(aBuf), "*** %s", aText);
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, Team != CHAT_ALL ? "teamchat" : "chat", aBuf);
+
+	if(Team == CHAT_ALL)
+	{
+		CNetMsg_Sv_Chat Msg;
+		Msg.m_Team = 0;
+		Msg.m_ClientID = ChatterClientID;
+		Msg.m_pMessage = aText;
+
+		// pack one for the recording only
+		if(g_Config.m_SvDemoChat)
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NOSEND, SERVER_DEMO_CLIENT);
+
+		// send to the clients
+		for(int i = 0; i < Server()->MaxClients(); i++)
+		{
+			if(!m_apPlayers[i])
+				continue;
+			bool Send = (Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
+				    (!Server()->IsSixup(i) && (Flags & CHAT_SIX));
+
+			if(!m_apPlayers[i]->m_DND && Send)
+				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+		}
+
+		str_format(aBuf, sizeof(aBuf), "Chat: %s", aText);
+		LogEvent(aBuf, ChatterClientID);
+	}
+	else
+	{
+		CTeamsCore *pTeams = &m_pController->Teams().m_Core;
+		CNetMsg_Sv_Chat Msg;
+		Msg.m_Team = 1;
+		Msg.m_ClientID = ChatterClientID;
+		Msg.m_pMessage = aText;
+
+		// pack one for the recording only
+		if(g_Config.m_SvDemoChat)
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NOSEND, SERVER_DEMO_CLIENT);
+
+		// send to the clients
+		for(int i = 0; i < Server()->MaxClients(); i++)
+		{
+			if(m_apPlayers[i] != 0)
+			{
+				if(Team == CHAT_SPEC)
+				{
+					if(m_apPlayers[i]->GetTeam() == CHAT_SPEC)
+					{
+						Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+					}
+				}
+				else
+				{
+					if(pTeams->Team(i) == Team && m_apPlayers[i]->GetTeam() != CHAT_SPEC)
+					{
+						Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+					}
+				}
+			}
+		}
+	}
+}
+
+void CGameContext::SendStartWarning(int ClientID, const char *pMessage)
+{
+	CCharacter *pChr = GetPlayerChar(ClientID);
+	if(pChr && pChr->m_LastStartWarning < Server()->Tick() - 3 * Server()->TickSpeed())
+	{
+		SendChatTarget(ClientID, pMessage);
+		pChr->m_LastStartWarning = Server()->Tick();
+	}
+}
+
+void CGameContext::SendEmoticon(int ClientID, int Emoticon, int TargetClientID) const
+{
+	CNetMsg_Sv_Emoticon Msg;
+	Msg.m_ClientID = ClientID;
+	Msg.m_Emoticon = Emoticon;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, TargetClientID);
+}
+
+void CGameContext::SendWeaponPickup(int ClientID, int Weapon) const
+{
+	CNetMsg_Sv_WeaponPickup Msg;
+	Msg.m_Weapon = Weapon;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CGameContext::SendMotd(int ClientID) const
+{
+	CNetMsg_Sv_Motd Msg;
+	Msg.m_pMessage = g_Config.m_SvMotd;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CGameContext::SendSettings(int ClientID) const
+{
+	protocol7::CNetMsg_Sv_ServerSettings Msg;
+	Msg.m_KickVote = g_Config.m_SvVoteKick;
+	Msg.m_KickMin = g_Config.m_SvVoteKickMin;
+	Msg.m_SpecVote = g_Config.m_SvVoteSpectate;
+	Msg.m_TeamLock = 0;
+	Msg.m_TeamBalance = 0;
+	Msg.m_PlayerSlots = g_Config.m_SvMaxClients - g_Config.m_SvSpectatorSlots;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+}
+
+void CGameContext::SendBroadcast(const char *pText, int ClientID, bool IsImportant)
+{
+	CNetMsg_Sv_Broadcast Msg;
+	Msg.m_pMessage = pText;
+
+	if(ClientID == -1)
+	{
+		dbg_assert(IsImportant, "broadcast messages to all players must be important");
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+
+		for(auto &pPlayer : m_apPlayers)
+		{
+			if(pPlayer)
+			{
+				pPlayer->m_LastBroadcastImportance = true;
+				pPlayer->m_LastBroadcast = Server()->Tick();
+			}
+		}
+		return;
+	}
+
+	if(!m_apPlayers[ClientID])
+		return;
+
+	if(!IsImportant && m_apPlayers[ClientID]->m_LastBroadcastImportance && m_apPlayers[ClientID]->m_LastBroadcast > Server()->Tick() - Server()->TickSpeed() * 10)
+		return;
+
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	m_apPlayers[ClientID]->m_LastBroadcast = Server()->Tick();
+	m_apPlayers[ClientID]->m_LastBroadcastImportance = IsImportant;
+}
+
+void CGameContext::StartVote(const char *pDesc, const char *pCommand, const char *pReason, const char *pSixupDesc)
+{
+	// reset votes
+	m_VoteEnforce = VOTE_ENFORCE_UNKNOWN;
+	m_VoteEnforcer = -1;
+	for(auto &pPlayer : m_apPlayers)
+	{
+		if(pPlayer)
+		{
+			pPlayer->m_Vote = 0;
+			pPlayer->m_VotePos = 0;
+		}
+	}
+
+	// start vote
+	m_VoteCloseTime = time_get() + time_freq() * g_Config.m_SvVoteTime;
+	str_copy(m_aVoteDescription, pDesc, sizeof(m_aVoteDescription));
+	str_copy(m_aSixupVoteDescription, pSixupDesc, sizeof(m_aSixupVoteDescription));
+	str_copy(m_aVoteCommand, pCommand, sizeof(m_aVoteCommand));
+	str_copy(m_aVoteReason, pReason, sizeof(m_aVoteReason));
+	SendVoteSet(-1);
+	m_VoteUpdate = true;
+}
+
+void CGameContext::EndVote()
+{
+	m_VoteCloseTime = 0;
+	SendVoteSet(-1);
+}
+
+void CGameContext::SendVoteSet(int ClientID)
+{
+	::CNetMsg_Sv_VoteSet Msg6;
+	protocol7::CNetMsg_Sv_VoteSet Msg7;
+
+	Msg7.m_ClientID = m_VoteCreator;
+	if(m_VoteCloseTime)
+	{
+		Msg6.m_Timeout = Msg7.m_Timeout = (m_VoteCloseTime - time_get()) / time_freq();
+		Msg6.m_pDescription = m_aVoteDescription;
+		Msg7.m_pDescription = m_aSixupVoteDescription;
+		Msg6.m_pReason = Msg7.m_pReason = m_aVoteReason;
+
+		int &Type = (Msg7.m_Type = protocol7::VOTE_UNKNOWN);
+		if(IsKickVote())
+			Type = protocol7::VOTE_START_KICK;
+		else if(IsSpecVote())
+			Type = protocol7::VOTE_START_SPEC;
+		else if(IsOptionVote())
+			Type = protocol7::VOTE_START_OP;
+	}
+	else
+	{
+		Msg6.m_Timeout = Msg7.m_Timeout = 0;
+		Msg6.m_pDescription = Msg7.m_pDescription = "";
+		Msg6.m_pReason = Msg7.m_pReason = "";
+
+		int &Type = (Msg7.m_Type = protocol7::VOTE_UNKNOWN);
+		if(m_VoteEnforce == VOTE_ENFORCE_NO || m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN)
+			Type = protocol7::VOTE_END_FAIL;
+		else if(m_VoteEnforce == VOTE_ENFORCE_YES || m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
+			Type = protocol7::VOTE_END_PASS;
+		else if(m_VoteEnforce == VOTE_ENFORCE_ABORT)
+			Type = protocol7::VOTE_END_ABORT;
+
+		if(m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN || m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
+			Msg7.m_ClientID = -1;
+	}
+
+	if(ClientID == -1)
+	{
+		for(int i = 0; i < Server()->MaxClients(); i++)
+		{
+			if(!m_apPlayers[i])
+				continue;
+			if(!Server()->IsSixup(i))
+				Server()->SendPackMsg(&Msg6, MSGFLAG_VITAL, i);
+			else
+				Server()->SendPackMsg(&Msg7, MSGFLAG_VITAL, i);
+		}
+	}
+	else
+	{
+		if(!Server()->IsSixup(ClientID))
+			Server()->SendPackMsg(&Msg6, MSGFLAG_VITAL, ClientID);
+		else
+			Server()->SendPackMsg(&Msg7, MSGFLAG_VITAL, ClientID);
+	}
+}
+
+void CGameContext::SendVoteStatus(int ClientID, int Total, int Yes, int No)
+{
+	if(ClientID == -1)
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+			if(Server()->ClientIngame(i))
+				SendVoteStatus(i, Total, Yes, No);
+		return;
+	}
+
+	if(Total > VANILLA_MAX_CLIENTS && m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetClientVersion() <= VERSION_DDRACE)
+	{
+		Yes = (Yes * VANILLA_MAX_CLIENTS) / (float)Total;
+		No = (No * VANILLA_MAX_CLIENTS) / (float)Total;
+		Total = VANILLA_MAX_CLIENTS;
+	}
+
+	CNetMsg_Sv_VoteStatus Msg = {0};
+	Msg.m_Total = Total;
+	Msg.m_Yes = Yes;
+	Msg.m_No = No;
+	Msg.m_Pass = Total - (Yes + No);
+
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CGameContext::AbortVoteKickOnDisconnect(int ClientID)
+{
+	if(m_VoteCloseTime && ((str_startswith(m_aVoteCommand, "kick ") && str_toint(&m_aVoteCommand[5]) == ClientID) ||
+				      (str_startswith(m_aVoteCommand, "set_team ") && str_toint(&m_aVoteCommand[9]) == ClientID)))
+		m_VoteEnforce = VOTE_ENFORCE_ABORT;
+}
+
+void CGameContext::CheckPureTuning()
+{
+	// might not be created yet during start up
+	if(!m_pController)
+		return;
+
+	if(str_comp(m_pController->m_pGameType, "DM") == 0 ||
+		str_comp(m_pController->m_pGameType, "TDM") == 0 ||
+		str_comp(m_pController->m_pGameType, "CTF") == 0)
+	{
+		CTuningParams p;
+		if(mem_comp(&p, &m_Tuning, sizeof(p)) != 0)
+		{
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "resetting tuning due to pure server");
+			m_Tuning = p;
+		}
+	}
+}
+
+void CGameContext::SendTuningParams(int ClientID, int Zone)
+{
+	if(ClientID == -1)
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(m_apPlayers[i])
+			{
+				if(m_apPlayers[i]->GetCharacter())
+				{
+					if(m_apPlayers[i]->GetCharacter()->m_TuneZone == Zone)
+						SendTuningParams(i, Zone);
+				}
+				else if(m_apPlayers[i]->m_TuneZone == Zone)
+				{
+					SendTuningParams(i, Zone);
+				}
+			}
+		}
+		return;
+	}
+
+	CheckPureTuning();
+
+	CMsgPacker Msg(NETMSGTYPE_SV_TUNEPARAMS);
+	int *pParams = 0;
+	if(Zone == 0)
+		pParams = (int *)&m_Tuning;
+	else
+		pParams = (int *)&(m_aTuningList[Zone]);
+
+	for(unsigned i = 0; i < sizeof(m_Tuning) / sizeof(int); i++)
+	{
+		if(m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetCharacter())
+		{
+			if((i == 30) // laser_damage is removed from 0.7
+				&& (Server()->IsSixup(ClientID)))
+			{
+				continue;
+			}
+			else if((i == 31) // collision
+				&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOCOLL))
+			{
+				Msg.AddInt(0);
+			}
+			else if((i == 32) // hooking
+				&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHOOK))
+			{
+				Msg.AddInt(0);
+			}
+			else if((i == 3) // ground jump impulse
+				&& m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOJUMP)
+			{
+				Msg.AddInt(0);
+			}
+			else if((i == 33) // jetpack
+				&& !(m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_JETPACK))
+			{
+				Msg.AddInt(0);
+			}
+			else if((i == 36) // hammer hit
+				&& m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOHAMMER)
+			{
+				Msg.AddInt(0);
+			}
+			else
+			{
+				Msg.AddInt(pParams[i]);
+			}
+		}
+		else
+			Msg.AddInt(pParams[i]); // if everything is normal just send true tunings
+	}
+	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CGameContext::OnPreTickTeehistorian()
+{
+	if(!m_TeeHistorianActive)
+		return;
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_apPlayers[i] != nullptr)
+			m_TeeHistorian.RecordPlayerTeam(i, GetDDRaceTeam(i));
+		else
+			m_TeeHistorian.RecordPlayerTeam(i, 0);
+	}
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		m_TeeHistorian.RecordTeamPractice(i, m_pController->Teams().IsPractice(i));
+	}
+}
+
+void CGameContext::OnTick()
+{
+	// check tuning
+	CheckPureTuning();
+
+	if(m_TeeHistorianActive)
+	{
+		int Error = aio_error(m_pTeeHistorianFile);
+		if(Error)
+		{
+			dbg_msg("teehistorian", "error writing to file, err=%d", Error);
+			Server()->SetErrorShutdown("teehistorian io error");
+		}
+
+		if(!m_TeeHistorian.Starting())
+		{
+			m_TeeHistorian.EndInputs();
+			m_TeeHistorian.EndTick();
+		}
+		m_TeeHistorian.BeginTick(Server()->Tick());
+		m_TeeHistorian.BeginPlayers();
+	}
+
+	// copy tuning
+	m_World.m_Core.m_aTuning[0] = m_Tuning;
+	m_World.Tick();
+
+	UpdatePlayerMaps();
+
+	//if(world.paused) // make sure that the game object always updates
+	m_pController->Tick();
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_apPlayers[i])
+		{
+			// send vote options
+			ProgressVoteOptions(i);
+
+			m_apPlayers[i]->Tick();
+			m_apPlayers[i]->PostTick();
+		}
+	}
+
+	for(auto &pPlayer : m_apPlayers)
+	{
+		if(pPlayer)
+			pPlayer->PostPostTick();
+	}
+
+	// update voting
+	if(m_VoteCloseTime)
+	{
+		// abort the kick-vote on player-leave
+		if(m_VoteEnforce == VOTE_ENFORCE_ABORT)
+		{
+			SendChat(-1, CGameContext::CHAT_ALL, "Vote aborted");
+			EndVote();
+		}
+		else
+		{
+			int Total = 0, Yes = 0, No = 0;
+			bool Veto = false, VetoStop = false;
+			if(m_VoteUpdate)
+			{
+				// count votes
+				char aaBuf[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}}, *pIP = NULL;
+				bool SinglePlayer = true;
+				for(int i = 0; i < MAX_CLIENTS; i++)
+				{
+					if(m_apPlayers[i])
+					{
+						Server()->GetClientAddr(i, aaBuf[i], NETADDR_MAXSTRSIZE);
+						if(!pIP)
+							pIP = aaBuf[i];
+						else if(SinglePlayer && str_comp(pIP, aaBuf[i]))
+							SinglePlayer = false;
+					}
+				}
+
+				// remember checked players, only the first player with a specific ip will be handled
+				bool aVoteChecked[MAX_CLIENTS] = {false};
+				int64_t Now = Server()->Tick();
+				for(int i = 0; i < MAX_CLIENTS; i++)
+				{
+					if(!m_apPlayers[i] || aVoteChecked[i])
+						continue;
+
+					if((IsKickVote() || IsSpecVote()) && (m_apPlayers[i]->GetTeam() == TEAM_SPECTATORS ||
+										     (GetPlayerChar(m_VoteCreator) && GetPlayerChar(i) &&
+											     GetPlayerChar(m_VoteCreator)->Team() != GetPlayerChar(i)->Team())))
+						continue;
+
+					if(m_apPlayers[i]->IsAfk() && i != m_VoteCreator)
+						continue;
+
+					// can't vote in kick and spec votes in the beginning after joining
+					if((IsKickVote() || IsSpecVote()) && Now < m_apPlayers[i]->m_FirstVoteTick)
+						continue;
+
+					// connecting clients with spoofed ips can clog slots without being ingame
+					if(!Server()->ClientIngame(i))
+						continue;
+
+					// don't count votes by blacklisted clients
+					if(g_Config.m_SvDnsblVote && !m_pServer->DnsblWhite(i) && !SinglePlayer)
+						continue;
+
+					int CurVote = m_apPlayers[i]->m_Vote;
+					int CurVotePos = m_apPlayers[i]->m_VotePos;
+
+					// only allow IPs to vote once, but keep veto ability
+					// check for more players with the same ip (only use the vote of the one who voted first)
+					for(int j = i + 1; j < MAX_CLIENTS; j++)
+					{
+						if(!m_apPlayers[j] || aVoteChecked[j] || str_comp(aaBuf[j], aaBuf[i]) != 0)
+							continue;
+
+						// count the latest vote by this ip
+						if(CurVotePos < m_apPlayers[j]->m_VotePos)
+						{
+							CurVote = m_apPlayers[j]->m_Vote;
+							CurVotePos = m_apPlayers[j]->m_VotePos;
+						}
+
+						aVoteChecked[j] = true;
+					}
+
+					Total++;
+					if(CurVote > 0)
+						Yes++;
+					else if(CurVote < 0)
+						No++;
+
+					// veto right for players who have been active on server for long and who're not afk
+					if(!IsKickVote() && !IsSpecVote() && g_Config.m_SvVoteVetoTime)
+					{
+						// look through all players with same IP again, including the current player
+						for(int j = i; j < MAX_CLIENTS; j++)
+						{
+							// no need to check ip address of current player
+							if(i != j && (!m_apPlayers[j] || str_comp(aaBuf[j], aaBuf[i]) != 0))
+								continue;
+
+							if(m_apPlayers[j] && !m_apPlayers[j]->IsAfk() && m_apPlayers[j]->GetTeam() != TEAM_SPECTATORS &&
+								((Server()->Tick() - m_apPlayers[j]->m_JoinTick) / (Server()->TickSpeed() * 60) > g_Config.m_SvVoteVetoTime ||
+									(m_apPlayers[j]->GetCharacter() && m_apPlayers[j]->GetCharacter()->m_DDRaceState == DDRACE_STARTED &&
+										(Server()->Tick() - m_apPlayers[j]->GetCharacter()->m_StartTime) / (Server()->TickSpeed() * 60) > g_Config.m_SvVoteVetoTime)))
+							{
+								if(CurVote == 0)
+									Veto = true;
+								else if(CurVote < 0)
+									VetoStop = true;
+								break;
+							}
+						}
+					}
+				}
+
+				if(g_Config.m_SvVoteMaxTotal && Total > g_Config.m_SvVoteMaxTotal &&
+					(IsKickVote() || IsSpecVote()))
+					Total = g_Config.m_SvVoteMaxTotal;
+
+				if((Yes > Total / (100.0f / g_Config.m_SvVoteYesPercentage)) && !Veto)
+					m_VoteEnforce = VOTE_ENFORCE_YES;
+				else if(No >= Total - Total / (100.0f / g_Config.m_SvVoteYesPercentage))
+					m_VoteEnforce = VOTE_ENFORCE_NO;
+
+				if(VetoStop)
+					m_VoteEnforce = VOTE_ENFORCE_NO;
+
+				m_VoteWillPass = Yes > (Yes + No) / (100.0f / g_Config.m_SvVoteYesPercentage);
+			}
+
+			if(time_get() > m_VoteCloseTime && !g_Config.m_SvVoteMajority)
+				m_VoteEnforce = (m_VoteWillPass && !Veto) ? VOTE_ENFORCE_YES : VOTE_ENFORCE_NO;
+
+			// / Ensure minimum time for vote to end when moderating.
+			if(m_VoteEnforce == VOTE_ENFORCE_YES && !(PlayerModerating() &&
+									(IsKickVote() || IsSpecVote()) && time_get() < m_VoteCloseTime))
+			{
+				Server()->SetRconCID(IServer::RCON_CID_VOTE);
+				Console()->ExecuteLine(m_aVoteCommand);
+				Server()->SetRconCID(IServer::RCON_CID_SERV);
+				EndVote();
+				SendChat(-1, CGameContext::CHAT_ALL, "Vote passed", -1, CHAT_SIX);
+
+				if(m_apPlayers[m_VoteCreator] && !IsKickVote() && !IsSpecVote())
+					m_apPlayers[m_VoteCreator]->m_LastVoteCall = 0;
+			}
+			else if(m_VoteEnforce == VOTE_ENFORCE_YES_ADMIN)
+			{
+				Console()->ExecuteLine(m_aVoteCommand, m_VoteEnforcer);
+				SendChat(-1, CGameContext::CHAT_ALL, "Vote passed enforced by authorized player", -1, CHAT_SIX);
+				EndVote();
+			}
+			else if(m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN)
+			{
+				EndVote();
+				SendChat(-1, CGameContext::CHAT_ALL, "Vote failed enforced by authorized player", -1, CHAT_SIX);
+			}
+			//else if(m_VoteEnforce == VOTE_ENFORCE_NO || time_get() > m_VoteCloseTime)
+			else if(m_VoteEnforce == VOTE_ENFORCE_NO || (time_get() > m_VoteCloseTime && g_Config.m_SvVoteMajority))
+			{
+				EndVote();
+				if(VetoStop || (m_VoteWillPass && Veto))
+					SendChat(-1, CGameContext::CHAT_ALL, "Vote failed because of veto. Find an empty server instead", -1, CHAT_SIX);
+				else
+					SendChat(-1, CGameContext::CHAT_ALL, "Vote failed", -1, CHAT_SIX);
+			}
+			else if(m_VoteUpdate)
+			{
+				m_VoteUpdate = false;
+				SendVoteStatus(-1, Total, Yes, No);
+			}
+		}
+	}
+	for(int i = 0; i < m_NumMutes; i++)
+	{
+		if(m_aMutes[i].m_Expire <= Server()->Tick())
+		{
+			m_NumMutes--;
+			m_aMutes[i] = m_aMutes[m_NumMutes];
+		}
+	}
+	for(int i = 0; i < m_NumVoteMutes; i++)
+	{
+		if(m_aVoteMutes[i].m_Expire <= Server()->Tick())
+		{
+			m_NumVoteMutes--;
+			m_aVoteMutes[i] = m_aVoteMutes[m_NumVoteMutes];
+		}
+	}
+
+	if(Server()->Tick() % (g_Config.m_SvAnnouncementInterval * Server()->TickSpeed() * 60) == 0)
+	{
+		const char *pLine = Server()->GetAnnouncementLine(g_Config.m_SvAnnouncementFileName);
+		if(pLine)
+			SendChat(-1, CGameContext::CHAT_ALL, pLine);
+	}
+
+	for(auto &Switcher : Switchers())
+	{
+		for(int j = 0; j < MAX_CLIENTS; ++j)
+		{
+			if(Switcher.m_aEndTick[j] <= Server()->Tick() && Switcher.m_aType[j] == TILE_SWITCHTIMEDOPEN)
+			{
+				Switcher.m_aStatus[j] = false;
+				Switcher.m_aEndTick[j] = 0;
+				Switcher.m_aType[j] = TILE_SWITCHCLOSE;
+			}
+			else if(Switcher.m_aEndTick[j] <= Server()->Tick() && Switcher.m_aType[j] == TILE_SWITCHTIMEDCLOSE)
+			{
+				Switcher.m_aStatus[j] = true;
+				Switcher.m_aEndTick[j] = 0;
+				Switcher.m_aType[j] = TILE_SWITCHOPEN;
+			}
+		}
+	}
+
+	if(m_SqlRandomMapResult != nullptr && m_SqlRandomMapResult->m_Completed)
+	{
+		if(m_SqlRandomMapResult->m_Success)
+		{
+			if(PlayerExists(m_SqlRandomMapResult->m_ClientID) && m_SqlRandomMapResult->m_aMessage[0] != '\0')
+				SendChatTarget(m_SqlRandomMapResult->m_ClientID, m_SqlRandomMapResult->m_aMessage);
+			if(m_SqlRandomMapResult->m_aMap[0] != '\0')
+				Server()->ChangeMap(m_SqlRandomMapResult->m_aMap);
+			else
+				m_LastMapVote = 0;
+		}
+		m_SqlRandomMapResult = nullptr;
+	}
+
+	// Record player position at the end of the tick
+	if(m_TeeHistorianActive)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_apPlayers[i] && m_apPlayers[i]->GetCharacter())
+			{
+				CNetObj_CharacterCore Char;
+				m_apPlayers[i]->GetCharacter()->GetCore().Write(&Char);
+				m_TeeHistorian.RecordPlayer(i, &Char);
+			}
+			else
+			{
+				m_TeeHistorian.RecordDeadPlayer(i);
+			}
+		}
+		m_TeeHistorian.EndPlayers();
+		m_TeeHistorian.BeginInputs();
+	}
+	// Warning: do not put code in this function directly above or below this comment
+}
+
+static int PlayerFlags_SevenToSix(int Flags)
+{
+	int Six = 0;
+	if(Flags & protocol7::PLAYERFLAG_CHATTING)
+		Six |= PLAYERFLAG_CHATTING;
+	if(Flags & protocol7::PLAYERFLAG_SCOREBOARD)
+		Six |= PLAYERFLAG_SCOREBOARD;
+	if(Flags & protocol7::PLAYERFLAG_AIM)
+		Six |= PLAYERFLAG_AIM;
+	return Six;
+}
+
+// Server hooks
+void CGameContext::OnClientPrepareInput(int ClientID, void *pInput)
+{
+	auto *pPlayerInput = (CNetObj_PlayerInput *)pInput;
+	if(Server()->IsSixup(ClientID))
+		pPlayerInput->m_PlayerFlags = PlayerFlags_SevenToSix(pPlayerInput->m_PlayerFlags);
+}
+
+void CGameContext::OnClientDirectInput(int ClientID, void *pInput)
+{
+	if(!m_World.m_Paused)
+		m_apPlayers[ClientID]->OnDirectInput((CNetObj_PlayerInput *)pInput);
+
+	int Flags = ((CNetObj_PlayerInput *)pInput)->m_PlayerFlags;
+	if((Flags & 256) || (Flags & 512))
+	{
+		Server()->Kick(ClientID, "please update your client or use DDNet client");
+	}
+}
+
+void CGameContext::OnClientPredictedInput(int ClientID, void *pInput)
+{
+	// early return if no input at all has been sent by a player
+	if(pInput == nullptr && !m_aPlayerHasInput[ClientID])
+		return;
+
+	// set to last sent input when no new input has been sent
+	CNetObj_PlayerInput *pApplyInput = (CNetObj_PlayerInput *)pInput;
+	if(pApplyInput == nullptr)
+	{
+		pApplyInput = &m_aLastPlayerInput[ClientID];
+	}
+
+	if(!m_World.m_Paused)
+		m_apPlayers[ClientID]->OnPredictedInput(pApplyInput);
+}
+
+void CGameContext::OnClientPredictedEarlyInput(int ClientID, void *pInput)
+{
+	// early return if no input at all has been sent by a player
+	if(pInput == nullptr && !m_aPlayerHasInput[ClientID])
+		return;
+
+	// set to last sent input when no new input has been sent
+	CNetObj_PlayerInput *pApplyInput = (CNetObj_PlayerInput *)pInput;
+	if(pApplyInput == nullptr)
+	{
+		pApplyInput = &m_aLastPlayerInput[ClientID];
+	}
+	else
+	{
+		// Store input in this function and not in `OnClientPredictedInput`,
+		// because this function is called on all inputs, while
+		// `OnClientPredictedInput` is only called on the first input of each
+		// tick.
+		mem_copy(&m_aLastPlayerInput[ClientID], pApplyInput, sizeof(m_aLastPlayerInput[ClientID]));
+		m_aPlayerHasInput[ClientID] = true;
+	}
+
+	if(!m_World.m_Paused)
+		m_apPlayers[ClientID]->OnPredictedEarlyInput(pApplyInput);
+
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerInput(ClientID, m_apPlayers[ClientID]->GetUniqueCID(), pApplyInput);
+	}
+}
+
+const CVoteOptionServer *CGameContext::GetVoteOption(int Index) const
+{
+	const CVoteOptionServer *pCurrent;
+	for(pCurrent = m_pVoteOptionFirst;
+		Index > 0 && pCurrent;
+		Index--, pCurrent = pCurrent->m_pNext)
+		;
+
+	if(Index > 0)
+		return 0;
+	return pCurrent;
+}
+
+void CGameContext::ProgressVoteOptions(int ClientID)
+{
+	CPlayer *pPl = m_apPlayers[ClientID];
+
+	if(pPl->m_SendVoteIndex == -1)
+		return; // we didn't start sending options yet
+
+	if(pPl->m_SendVoteIndex > m_NumVoteOptions)
+		return; // shouldn't happen / fail silently
+
+	int VotesLeft = m_NumVoteOptions - pPl->m_SendVoteIndex;
+	int NumVotesToSend = minimum(g_Config.m_SvSendVotesPerTick, VotesLeft);
+
+	if(!VotesLeft)
+	{
+		// player has up to date vote option list
+		return;
+	}
+
+	// build vote option list msg
+	int CurIndex = 0;
+
+	CNetMsg_Sv_VoteOptionListAdd OptionMsg;
+	OptionMsg.m_pDescription0 = "";
+	OptionMsg.m_pDescription1 = "";
+	OptionMsg.m_pDescription2 = "";
+	OptionMsg.m_pDescription3 = "";
+	OptionMsg.m_pDescription4 = "";
+	OptionMsg.m_pDescription5 = "";
+	OptionMsg.m_pDescription6 = "";
+	OptionMsg.m_pDescription7 = "";
+	OptionMsg.m_pDescription8 = "";
+	OptionMsg.m_pDescription9 = "";
+	OptionMsg.m_pDescription10 = "";
+	OptionMsg.m_pDescription11 = "";
+	OptionMsg.m_pDescription12 = "";
+	OptionMsg.m_pDescription13 = "";
+	OptionMsg.m_pDescription14 = "";
+
+	// get current vote option by index
+	const CVoteOptionServer *pCurrent = GetVoteOption(pPl->m_SendVoteIndex);
+
+	while(CurIndex < NumVotesToSend && pCurrent != NULL)
+	{
+		switch(CurIndex)
+		{
+		case 0: OptionMsg.m_pDescription0 = pCurrent->m_aDescription; break;
+		case 1: OptionMsg.m_pDescription1 = pCurrent->m_aDescription; break;
+		case 2: OptionMsg.m_pDescription2 = pCurrent->m_aDescription; break;
+		case 3: OptionMsg.m_pDescription3 = pCurrent->m_aDescription; break;
+		case 4: OptionMsg.m_pDescription4 = pCurrent->m_aDescription; break;
+		case 5: OptionMsg.m_pDescription5 = pCurrent->m_aDescription; break;
+		case 6: OptionMsg.m_pDescription6 = pCurrent->m_aDescription; break;
+		case 7: OptionMsg.m_pDescription7 = pCurrent->m_aDescription; break;
+		case 8: OptionMsg.m_pDescription8 = pCurrent->m_aDescription; break;
+		case 9: OptionMsg.m_pDescription9 = pCurrent->m_aDescription; break;
+		case 10: OptionMsg.m_pDescription10 = pCurrent->m_aDescription; break;
+		case 11: OptionMsg.m_pDescription11 = pCurrent->m_aDescription; break;
+		case 12: OptionMsg.m_pDescription12 = pCurrent->m_aDescription; break;
+		case 13: OptionMsg.m_pDescription13 = pCurrent->m_aDescription; break;
+		case 14: OptionMsg.m_pDescription14 = pCurrent->m_aDescription; break;
+		}
+
+		CurIndex++;
+		pCurrent = pCurrent->m_pNext;
+	}
+
+	// send msg
+	OptionMsg.m_NumOptions = NumVotesToSend;
+	Server()->SendPackMsg(&OptionMsg, MSGFLAG_VITAL, ClientID);
+
+	pPl->m_SendVoteIndex += NumVotesToSend;
+}
+
+void CGameContext::OnClientEnter(int ClientID)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerReady(ClientID);
+	}
+	m_pController->OnPlayerConnect(m_apPlayers[ClientID]);
+
+	if(Server()->IsSixup(ClientID))
+	{
+		{
+			protocol7::CNetMsg_Sv_GameInfo Msg;
+			Msg.m_GameFlags = protocol7::GAMEFLAG_RACE;
+			Msg.m_MatchCurrent = 1;
+			Msg.m_MatchNum = 0;
+			Msg.m_ScoreLimit = 0;
+			Msg.m_TimeLimit = 0;
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		}
+
+		// /team is essential
+		{
+			protocol7::CNetMsg_Sv_CommandInfoRemove Msg;
+			Msg.m_pName = "team";
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		}
+	}
+
+	for(const IConsole::CCommandInfo *pCmd = Console()->FirstCommandInfo(IConsole::ACCESS_LEVEL_USER, CFGFLAG_CHAT);
+		pCmd; pCmd = pCmd->NextCommandInfo(IConsole::ACCESS_LEVEL_USER, CFGFLAG_CHAT))
+	{
+		const char *pName = pCmd->m_pName;
+
+		if(Server()->IsSixup(ClientID))
+		{
+			if(!str_comp_nocase(pName, "w") || !str_comp_nocase(pName, "whisper"))
+				continue;
+
+			if(!str_comp_nocase(pName, "r"))
+				pName = "rescue";
+
+			protocol7::CNetMsg_Sv_CommandInfo Msg;
+			Msg.m_pName = pName;
+			Msg.m_pArgsFormat = pCmd->m_pParams;
+			Msg.m_pHelpText = pCmd->m_pHelp;
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		}
+		else
+		{
+			CNetMsg_Sv_CommandInfo Msg;
+			Msg.m_pName = pName;
+			Msg.m_pArgsFormat = pCmd->m_pParams;
+			Msg.m_pHelpText = pCmd->m_pHelp;
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		}
+	}
+
+	{
+		int Empty = -1;
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(!Server()->ClientIngame(i))
+			{
+				Empty = i;
+				break;
+			}
+		}
+		CNetMsg_Sv_Chat Msg;
+		Msg.m_Team = 0;
+		Msg.m_ClientID = Empty;
+		Msg.m_pMessage = "Do you know someone who uses a bot? Please report them to the moderators.";
+		m_apPlayers[ClientID]->m_EligibleForFinishCheck = time_get();
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+	}
+
+	IServer::CClientInfo Info;
+	if(Server()->GetClientInfo(ClientID, &Info) && Info.m_GotDDNetVersion)
+	{
+		if(OnClientDDNetVersionKnown(ClientID))
+			return; // kicked
+	}
+
+	if(!Server()->ClientPrevIngame(ClientID))
+	{
+		if(g_Config.m_SvWelcome[0] != 0)
+			SendChatTarget(ClientID, g_Config.m_SvWelcome);
+
+		if(g_Config.m_SvShowOthersDefault > SHOW_OTHERS_OFF)
+		{
+			if(g_Config.m_SvShowOthers)
+				SendChatTarget(ClientID, "You can see other players. To disable this use DDNet client and type /showothers");
+
+			m_apPlayers[ClientID]->m_ShowOthers = g_Config.m_SvShowOthersDefault;
+		}
+	}
+	m_VoteUpdate = true;
+
+	// send active vote
+	if(m_VoteCloseTime)
+		SendVoteSet(ClientID);
+
+	Server()->ExpireServerInfo();
+
+	CPlayer *pNewPlayer = m_apPlayers[ClientID];
+	mem_zero(&m_aLastPlayerInput[ClientID], sizeof(m_aLastPlayerInput[ClientID]));
+	m_aPlayerHasInput[ClientID] = false;
+
+	// new info for others
+	protocol7::CNetMsg_Sv_ClientInfo NewClientInfoMsg;
+	NewClientInfoMsg.m_ClientID = ClientID;
+	NewClientInfoMsg.m_Local = 0;
+	NewClientInfoMsg.m_Team = pNewPlayer->GetTeam();
+	NewClientInfoMsg.m_pName = Server()->ClientName(ClientID);
+	NewClientInfoMsg.m_pClan = Server()->ClientClan(ClientID);
+	NewClientInfoMsg.m_Country = Server()->ClientCountry(ClientID);
+	NewClientInfoMsg.m_Silent = false;
+
+	for(int p = 0; p < 6; p++)
+	{
+		NewClientInfoMsg.m_apSkinPartNames[p] = pNewPlayer->m_TeeInfos.m_apSkinPartNames[p];
+		NewClientInfoMsg.m_aUseCustomColors[p] = pNewPlayer->m_TeeInfos.m_aUseCustomColors[p];
+		NewClientInfoMsg.m_aSkinPartColors[p] = pNewPlayer->m_TeeInfos.m_aSkinPartColors[p];
+	}
+
+	// update client infos (others before local)
+	for(int i = 0; i < Server()->MaxClients(); ++i)
+	{
+		if(i == ClientID || !m_apPlayers[i] || !Server()->ClientIngame(i))
+			continue;
+
+		CPlayer *pPlayer = m_apPlayers[i];
+
+		if(Server()->IsSixup(i))
+			Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+
+		if(Server()->IsSixup(ClientID))
+		{
+			// existing infos for new player
+			protocol7::CNetMsg_Sv_ClientInfo ClientInfoMsg;
+			ClientInfoMsg.m_ClientID = i;
+			ClientInfoMsg.m_Local = 0;
+			ClientInfoMsg.m_Team = pPlayer->GetTeam();
+			ClientInfoMsg.m_pName = Server()->ClientName(i);
+			ClientInfoMsg.m_pClan = Server()->ClientClan(i);
+			ClientInfoMsg.m_Country = Server()->ClientCountry(i);
+			ClientInfoMsg.m_Silent = 0;
+
+			for(int p = 0; p < 6; p++)
+			{
+				ClientInfoMsg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
+				ClientInfoMsg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
+				ClientInfoMsg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
+			}
+
+			Server()->SendPackMsg(&ClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+		}
+	}
+
+	// local info
+	if(Server()->IsSixup(ClientID))
+	{
+		NewClientInfoMsg.m_Local = 1;
+		Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+	}
+
+	// initial chat delay
+	if(g_Config.m_SvChatInitialDelay != 0 && m_apPlayers[ClientID]->m_JoinTick > m_NonEmptySince + 10 * Server()->TickSpeed())
+	{
+		char aBuf[128];
+		NETADDR Addr;
+		Server()->GetClientAddr(ClientID, &Addr);
+		str_format(aBuf, sizeof(aBuf), "This server has an initial chat delay, you will need to wait %d seconds before talking.", g_Config.m_SvChatInitialDelay);
+		SendChatTarget(ClientID, aBuf);
+		Mute(&Addr, g_Config.m_SvChatInitialDelay, Server()->ClientName(ClientID), "Initial chat delay", true);
+	}
+
+	LogEvent("Connect", ClientID);
+}
+
+bool CGameContext::OnClientDataPersist(int ClientID, void *pData)
+{
+	CPersistentClientData *pPersistent = (CPersistentClientData *)pData;
+	if(!m_apPlayers[ClientID])
+	{
+		return false;
+	}
+	pPersistent->m_IsSpectator = m_apPlayers[ClientID]->GetTeam() == TEAM_SPECTATORS;
+	pPersistent->m_IsAfk = m_apPlayers[ClientID]->IsAfk();
+	return true;
+}
+
+void CGameContext::OnClientConnected(int ClientID, void *pData)
+{
+	CPersistentClientData *pPersistentData = (CPersistentClientData *)pData;
+	bool Spec = false;
+	bool Afk = true;
+	if(pPersistentData)
+	{
+		Spec = pPersistentData->m_IsSpectator;
+		Afk = pPersistentData->m_IsAfk;
+	}
+
+	{
+		bool Empty = true;
+		for(auto &pPlayer : m_apPlayers)
+		{
+			// connecting clients with spoofed ips can clog slots without being ingame
+			if(pPlayer && Server()->ClientIngame(pPlayer->GetCID()))
+			{
+				Empty = false;
+				break;
+			}
+		}
+		if(Empty)
+		{
+			m_NonEmptySince = Server()->Tick();
+		}
+	}
+
+	// Check which team the player should be on
+	const int StartTeam = (Spec || g_Config.m_SvTournamentMode) ? TEAM_SPECTATORS : m_pController->GetAutoTeam(ClientID);
+
+	if(m_apPlayers[ClientID])
+		delete m_apPlayers[ClientID];
+	m_apPlayers[ClientID] = new(ClientID) CPlayer(this, NextUniqueClientID, ClientID, StartTeam);
+	m_apPlayers[ClientID]->SetInitialAfk(Afk);
+	NextUniqueClientID += 1;
+
+	SendMotd(ClientID);
+	SendSettings(ClientID);
+
+	Server()->ExpireServerInfo();
+}
+
+void CGameContext::OnClientDrop(int ClientID, const char *pReason)
+{
+	LogEvent("Disconnect", ClientID);
+
+	AbortVoteKickOnDisconnect(ClientID);
+	m_pController->OnPlayerDisconnect(m_apPlayers[ClientID], pReason);
+	delete m_apPlayers[ClientID];
+	m_apPlayers[ClientID] = 0;
+
+	m_VoteUpdate = true;
+
+	// update spectator modes
+	for(auto &pPlayer : m_apPlayers)
+	{
+		if(pPlayer && pPlayer->m_SpectatorID == ClientID)
+			pPlayer->m_SpectatorID = SPEC_FREEVIEW;
+	}
+
+	// update conversation targets
+	for(auto &pPlayer : m_apPlayers)
+	{
+		if(pPlayer && pPlayer->m_LastWhisperTo == ClientID)
+			pPlayer->m_LastWhisperTo = -1;
+	}
+
+	protocol7::CNetMsg_Sv_ClientDrop Msg;
+	Msg.m_ClientID = ClientID;
+	Msg.m_pReason = pReason;
+	Msg.m_Silent = false;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+
+	Server()->ExpireServerInfo();
+}
+
+void CGameContext::TeehistorianRecordAntibot(const void *pData, int DataSize)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordAntibot(pData, DataSize);
+	}
+}
+
+void CGameContext::TeehistorianRecordPlayerJoin(int ClientID, bool Sixup)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerJoin(ClientID, !Sixup ? CTeeHistorian::PROTOCOL_6 : CTeeHistorian::PROTOCOL_7);
+	}
+}
+
+void CGameContext::TeehistorianRecordPlayerDrop(int ClientID, const char *pReason)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerDrop(ClientID, pReason);
+	}
+}
+
+void CGameContext::TeehistorianRecordPlayerRejoin(int ClientID)
+{
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.RecordPlayerRejoin(ClientID);
+	}
+}
+
+bool CGameContext::OnClientDDNetVersionKnown(int ClientID)
+{
+	IServer::CClientInfo Info;
+	dbg_assert(Server()->GetClientInfo(ClientID, &Info), "failed to get client info");
+	int ClientVersion = Info.m_DDNetVersion;
+	dbg_msg("ddnet", "cid=%d version=%d", ClientID, ClientVersion);
+
+	if(m_TeeHistorianActive)
+	{
+		if(Info.m_pConnectionID && Info.m_pDDNetVersionStr)
+		{
+			m_TeeHistorian.RecordDDNetVersion(ClientID, *Info.m_pConnectionID, ClientVersion, Info.m_pDDNetVersionStr);
+		}
+		else
+		{
+			m_TeeHistorian.RecordDDNetVersionOld(ClientID, ClientVersion);
+		}
+	}
+
+	// Autoban known bot versions.
+	if(g_Config.m_SvBannedVersions[0] != '\0' && IsVersionBanned(ClientVersion))
+	{
+		Server()->Kick(ClientID, "unsupported client");
+		return true;
+	}
+
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if(ClientVersion >= VERSION_DDNET_GAMETICK)
+		pPlayer->m_TimerType = g_Config.m_SvDefaultTimerType;
+
+	// First update the teams state.
+	m_pController->Teams().SendTeamsState(ClientID);
+
+	// Then send records.
+	SendRecord(ClientID);
+
+	// And report correct tunings.
+	if(ClientVersion < VERSION_DDNET_EARLY_VERSION)
+		SendTuningParams(ClientID, pPlayer->m_TuneZone);
+
+	// Tell old clients to update.
+	if(ClientVersion < VERSION_DDNET_UPDATER_FIXED && g_Config.m_SvClientSuggestionOld[0] != '\0')
+		SendBroadcast(g_Config.m_SvClientSuggestionOld, ClientID);
+	// Tell known bot clients that they're botting and we know it.
+	if(((ClientVersion >= 15 && ClientVersion < 100) || ClientVersion == 502) && g_Config.m_SvClientSuggestionBot[0] != '\0')
+		SendBroadcast(g_Config.m_SvClientSuggestionBot, ClientID);
+
+	return false;
+}
+
+void *CGameContext::PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientID)
+{
+	if(Server()->IsSixup(ClientID) && *pMsgID < OFFSET_UUID)
+	{
+		void *pRawMsg = m_NetObjHandler7.SecureUnpackMsg(*pMsgID, pUnpacker);
+		if(!pRawMsg)
+			return 0;
+
+		CPlayer *pPlayer = m_apPlayers[ClientID];
+		static char s_aRawMsg[1024];
+
+		if(*pMsgID == protocol7::NETMSGTYPE_CL_SAY)
+		{
+			protocol7::CNetMsg_Cl_Say *pMsg7 = (protocol7::CNetMsg_Cl_Say *)pRawMsg;
+			// Should probably use a placement new to start the lifetime of the object to avoid future weirdness
+			::CNetMsg_Cl_Say *pMsg = (::CNetMsg_Cl_Say *)s_aRawMsg;
+
+			if(pMsg7->m_Target >= 0)
+			{
+				if(ProcessSpamProtection(ClientID))
+					return 0;
+
+				// Should we maybe recraft the message so that it can go through the usual path?
+				WhisperID(ClientID, pMsg7->m_Target, pMsg7->m_pMessage);
+				return 0;
+			}
+
+			pMsg->m_Team = pMsg7->m_Mode == protocol7::CHAT_TEAM;
+			pMsg->m_pMessage = pMsg7->m_pMessage;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_STARTINFO)
+		{
+			protocol7::CNetMsg_Cl_StartInfo *pMsg7 = (protocol7::CNetMsg_Cl_StartInfo *)pRawMsg;
+			::CNetMsg_Cl_StartInfo *pMsg = (::CNetMsg_Cl_StartInfo *)s_aRawMsg;
+
+			pMsg->m_pName = pMsg7->m_pName;
+			pMsg->m_pClan = pMsg7->m_pClan;
+			pMsg->m_Country = pMsg7->m_Country;
+
+			CTeeInfo Info(pMsg7->m_apSkinPartNames, pMsg7->m_aUseCustomColors, pMsg7->m_aSkinPartColors);
+			Info.FromSixup();
+			pPlayer->m_TeeInfos = Info;
+
+			str_copy(s_aRawMsg + sizeof(*pMsg), Info.m_aSkinName, sizeof(s_aRawMsg) - sizeof(*pMsg));
+
+			pMsg->m_pSkin = s_aRawMsg + sizeof(*pMsg);
+			pMsg->m_UseCustomColor = pPlayer->m_TeeInfos.m_UseCustomColor;
+			pMsg->m_ColorBody = pPlayer->m_TeeInfos.m_ColorBody;
+			pMsg->m_ColorFeet = pPlayer->m_TeeInfos.m_ColorFeet;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SKINCHANGE)
+		{
+			protocol7::CNetMsg_Cl_SkinChange *pMsg = (protocol7::CNetMsg_Cl_SkinChange *)pRawMsg;
+			if(g_Config.m_SvSpamprotection && pPlayer->m_LastChangeInfo &&
+				pPlayer->m_LastChangeInfo + Server()->TickSpeed() * g_Config.m_SvInfoChangeDelay > Server()->Tick())
+				return 0;
+
+			pPlayer->m_LastChangeInfo = Server()->Tick();
+
+			CTeeInfo Info(pMsg->m_apSkinPartNames, pMsg->m_aUseCustomColors, pMsg->m_aSkinPartColors);
+			Info.FromSixup();
+			pPlayer->m_TeeInfos = Info;
+
+			protocol7::CNetMsg_Sv_SkinChange Msg;
+			Msg.m_ClientID = ClientID;
+			for(int p = 0; p < 6; p++)
+			{
+				Msg.m_apSkinPartNames[p] = pMsg->m_apSkinPartNames[p];
+				Msg.m_aSkinPartColors[p] = pMsg->m_aSkinPartColors[p];
+				Msg.m_aUseCustomColors[p] = pMsg->m_aUseCustomColors[p];
+			}
+
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+
+			return 0;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SETSPECTATORMODE)
+		{
+			protocol7::CNetMsg_Cl_SetSpectatorMode *pMsg7 = (protocol7::CNetMsg_Cl_SetSpectatorMode *)pRawMsg;
+			::CNetMsg_Cl_SetSpectatorMode *pMsg = (::CNetMsg_Cl_SetSpectatorMode *)s_aRawMsg;
+
+			if(pMsg7->m_SpecMode == protocol7::SPEC_FREEVIEW)
+				pMsg->m_SpectatorID = SPEC_FREEVIEW;
+			else if(pMsg7->m_SpecMode == protocol7::SPEC_PLAYER)
+				pMsg->m_SpectatorID = pMsg7->m_SpectatorID;
+			else
+				pMsg->m_SpectatorID = SPEC_FREEVIEW; // Probably not needed
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_SETTEAM)
+		{
+			protocol7::CNetMsg_Cl_SetTeam *pMsg7 = (protocol7::CNetMsg_Cl_SetTeam *)pRawMsg;
+			::CNetMsg_Cl_SetTeam *pMsg = (::CNetMsg_Cl_SetTeam *)s_aRawMsg;
+
+			pMsg->m_Team = pMsg7->m_Team;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_COMMAND)
+		{
+			protocol7::CNetMsg_Cl_Command *pMsg7 = (protocol7::CNetMsg_Cl_Command *)pRawMsg;
+			::CNetMsg_Cl_Say *pMsg = (::CNetMsg_Cl_Say *)s_aRawMsg;
+
+			str_format(s_aRawMsg + sizeof(*pMsg), sizeof(s_aRawMsg) - sizeof(*pMsg), "/%s %s", pMsg7->m_pName, pMsg7->m_pArguments);
+			pMsg->m_pMessage = s_aRawMsg + sizeof(*pMsg);
+			dbg_msg("debug", "line='%s'", s_aRawMsg + sizeof(*pMsg));
+			pMsg->m_Team = 0;
+
+			*pMsgID = NETMSGTYPE_CL_SAY;
+			return s_aRawMsg;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_CALLVOTE)
+		{
+			protocol7::CNetMsg_Cl_CallVote *pMsg7 = (protocol7::CNetMsg_Cl_CallVote *)pRawMsg;
+			::CNetMsg_Cl_CallVote *pMsg = (::CNetMsg_Cl_CallVote *)s_aRawMsg;
+
+			int Authed = Server()->GetAuthedState(ClientID);
+			if(pMsg7->m_Force)
+			{
+				str_format(s_aRawMsg, sizeof(s_aRawMsg), "force_vote \"%s\" \"%s\" \"%s\"", pMsg7->m_pType, pMsg7->m_pValue, pMsg7->m_pReason);
+				Console()->SetAccessLevel(Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER);
+				Console()->ExecuteLine(s_aRawMsg, ClientID, false);
+				Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
+				return 0;
+			}
+
+			pMsg->m_pValue = pMsg7->m_pValue;
+			pMsg->m_pReason = pMsg7->m_pReason;
+			pMsg->m_pType = pMsg7->m_pType;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_EMOTICON)
+		{
+			protocol7::CNetMsg_Cl_Emoticon *pMsg7 = (protocol7::CNetMsg_Cl_Emoticon *)pRawMsg;
+			::CNetMsg_Cl_Emoticon *pMsg = (::CNetMsg_Cl_Emoticon *)s_aRawMsg;
+
+			pMsg->m_Emoticon = pMsg7->m_Emoticon;
+		}
+		else if(*pMsgID == protocol7::NETMSGTYPE_CL_VOTE)
+		{
+			protocol7::CNetMsg_Cl_Vote *pMsg7 = (protocol7::CNetMsg_Cl_Vote *)pRawMsg;
+			::CNetMsg_Cl_Vote *pMsg = (::CNetMsg_Cl_Vote *)s_aRawMsg;
+
+			pMsg->m_Vote = pMsg7->m_Vote;
+		}
+
+		*pMsgID = Msg_SevenToSix(*pMsgID);
+
+		return s_aRawMsg;
+	}
+	else
+		return m_NetObjHandler.SecureUnpackMsg(*pMsgID, pUnpacker);
+}
+
+void CGameContext::CensorMessage(char *pCensoredMessage, const char *pMessage, int Size)
+{
+	str_copy(pCensoredMessage, pMessage, Size);
+
+	for(auto &Item : m_vCensorlist)
+	{
+		char *pCurLoc = pCensoredMessage;
+		do
+		{
+			pCurLoc = (char *)str_utf8_find_nocase(pCurLoc, Item.c_str());
+			if(pCurLoc)
+			{
+				for(int i = 0; i < (int)Item.length(); i++)
+				{
+					pCurLoc[i] = '*';
+				}
+				pCurLoc++;
+			}
+		} while(pCurLoc);
+	}
+}
+
+void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
+{
+	if(m_TeeHistorianActive)
+	{
+		if(m_NetObjHandler.TeeHistorianRecordMsg(MsgID))
+		{
+			m_TeeHistorian.RecordPlayerMessage(ClientID, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
+		}
+	}
+
+	void *pRawMsg = PreProcessMsg(&MsgID, pUnpacker, ClientID);
+
+	if(!pRawMsg)
+		return;
+
+	if(Server()->ClientIngame(ClientID))
+	{
+		switch(MsgID)
+		{
+		case NETMSGTYPE_CL_SAY:
+			OnSayNetMessage(static_cast<CNetMsg_Cl_Say *>(pRawMsg), ClientID, pUnpacker);
+			break;
+		case NETMSGTYPE_CL_CALLVOTE:
+			OnCallVoteNetMessage(static_cast<CNetMsg_Cl_CallVote *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_VOTE:
+			OnVoteNetMessage(static_cast<CNetMsg_Cl_Vote *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_SETTEAM:
+			OnSetTeamNetMessage(static_cast<CNetMsg_Cl_SetTeam *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_ISDDNETLEGACY:
+			OnIsDDNetLegacyNetMessage(static_cast<CNetMsg_Cl_IsDDNetLegacy *>(pRawMsg), ClientID, pUnpacker);
+			break;
+		case NETMSGTYPE_CL_SHOWOTHERSLEGACY:
+			OnShowOthersLegacyNetMessage(static_cast<CNetMsg_Cl_ShowOthersLegacy *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_SHOWOTHERS:
+			OnShowOthersNetMessage(static_cast<CNetMsg_Cl_ShowOthers *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_SHOWDISTANCE:
+			OnShowDistanceNetMessage(static_cast<CNetMsg_Cl_ShowDistance *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_SETSPECTATORMODE:
+			OnSetSpectatorModeNetMessage(static_cast<CNetMsg_Cl_SetSpectatorMode *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_CHANGEINFO:
+			OnChangeInfoNetMessage(static_cast<CNetMsg_Cl_ChangeInfo *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_EMOTICON:
+			OnEmoticonNetMessage(static_cast<CNetMsg_Cl_Emoticon *>(pRawMsg), ClientID);
+			break;
+		case NETMSGTYPE_CL_KILL:
+			OnKillNetMessage(static_cast<CNetMsg_Cl_Kill *>(pRawMsg), ClientID);
+			break;
+		default:
+			break;
+		}
+	}
+	if(MsgID == NETMSGTYPE_CL_STARTINFO)
+	{
+		OnStartInfoNetMessage(static_cast<CNetMsg_Cl_StartInfo *>(pRawMsg), ClientID);
+	}
+}
+
+void CGameContext::OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, const CUnpacker *pUnpacker)
+{
+	if(!str_utf8_check(pMsg->m_pMessage))
+	{
+		return;
+	}
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	bool Check = !pPlayer->m_NotEligibleForFinish && pPlayer->m_EligibleForFinishCheck + 10 * time_freq() >= time_get();
+	if(Check && str_comp(pMsg->m_pMessage, "xd sure chillerbot.png is lyfe") == 0 && pMsg->m_Team == 0)
+	{
+		if(m_TeeHistorianActive)
+		{
+			m_TeeHistorian.RecordPlayerMessage(ClientID, pUnpacker->CompleteData(), pUnpacker->CompleteSize());
+		}
+
+		pPlayer->m_NotEligibleForFinish = true;
+		dbg_msg("hack", "bot detected, cid=%d", ClientID);
+		return;
+	}
+	int Team = pMsg->m_Team;
+
+	// trim right and set maximum length to 256 utf8-characters
+	int Length = 0;
+	const char *p = pMsg->m_pMessage;
+	const char *pEnd = 0;
+	while(*p)
+	{
+		const char *pStrOld = p;
+		int Code = str_utf8_decode(&p);
+
+		// check if unicode is not empty
+		if(!str_utf8_isspace(Code))
+		{
+			pEnd = 0;
+		}
+		else if(pEnd == 0)
+			pEnd = pStrOld;
+
+		if(++Length >= 256)
+		{
+			*(const_cast<char *>(p)) = 0;
+			break;
+		}
+	}
+	if(pEnd != 0)
+		*(const_cast<char *>(pEnd)) = 0;
+
+	// drop empty and autocreated spam messages (more than 32 characters per second)
+	if(Length == 0 || (pMsg->m_pMessage[0] != '/' && (g_Config.m_SvSpamprotection && pPlayer->m_LastChat && pPlayer->m_LastChat + Server()->TickSpeed() * ((31 + Length) / 32) > Server()->Tick())))
+		return;
+
+	int GameTeam = GetDDRaceTeam(pPlayer->GetCID());
+	if(Team)
+		Team = ((pPlayer->GetTeam() == TEAM_SPECTATORS) ? CHAT_SPEC : GameTeam);
+	else
+		Team = CHAT_ALL;
+
+	if(pMsg->m_pMessage[0] == '/')
+	{
+		if(str_startswith_nocase(pMsg->m_pMessage + 1, "w "))
+		{
+			char aWhisperMsg[256];
+			str_copy(aWhisperMsg, pMsg->m_pMessage + 3, 256);
+			Whisper(pPlayer->GetCID(), aWhisperMsg);
+		}
+		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "whisper "))
+		{
+			char aWhisperMsg[256];
+			str_copy(aWhisperMsg, pMsg->m_pMessage + 9, 256);
+			Whisper(pPlayer->GetCID(), aWhisperMsg);
+		}
+		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "c "))
+		{
+			char aWhisperMsg[256];
+			str_copy(aWhisperMsg, pMsg->m_pMessage + 3, 256);
+			Converse(pPlayer->GetCID(), aWhisperMsg);
+		}
+		else if(str_startswith_nocase(pMsg->m_pMessage + 1, "converse "))
+		{
+			char aWhisperMsg[256];
+			str_copy(aWhisperMsg, pMsg->m_pMessage + 10, 256);
+			Converse(pPlayer->GetCID(), aWhisperMsg);
+		}
+		else
+		{
+			if(g_Config.m_SvSpamprotection && !str_startswith(pMsg->m_pMessage + 1, "timeout ") && pPlayer->m_aLastCommands[0] && pPlayer->m_aLastCommands[0] + Server()->TickSpeed() > Server()->Tick() && pPlayer->m_aLastCommands[1] && pPlayer->m_aLastCommands[1] + Server()->TickSpeed() > Server()->Tick() && pPlayer->m_aLastCommands[2] && pPlayer->m_aLastCommands[2] + Server()->TickSpeed() > Server()->Tick() && pPlayer->m_aLastCommands[3] && pPlayer->m_aLastCommands[3] + Server()->TickSpeed() > Server()->Tick())
+				return;
+
+			int64_t Now = Server()->Tick();
+			pPlayer->m_aLastCommands[pPlayer->m_LastCommandPos] = Now;
+			pPlayer->m_LastCommandPos = (pPlayer->m_LastCommandPos + 1) % 4;
+
+			Console()->SetFlagMask(CFGFLAG_CHAT);
+			int Authed = Server()->GetAuthedState(ClientID);
+			if(Authed)
+				Console()->SetAccessLevel(Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER);
+			else
+				Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_USER);
+
+			{
+				CClientChatLogger Logger(this, ClientID, log_get_scope_logger());
+				CLogScope Scope(&Logger);
+				Console()->ExecuteLine(pMsg->m_pMessage + 1, ClientID, false);
+			}
+			// m_apPlayers[ClientID] can be NULL, if the player used a
+			// timeout code and replaced another client.
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "%d used %s", ClientID, pMsg->m_pMessage);
+			Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "chat-command", aBuf);
+
+			Console()->SetAccessLevel(IConsole::ACCESS_LEVEL_ADMIN);
+			Console()->SetFlagMask(CFGFLAG_SERVER);
+		}
+	}
+	else
+	{
+		pPlayer->UpdatePlaytime();
+		char aCensoredMessage[256];
+		CensorMessage(aCensoredMessage, pMsg->m_pMessage, sizeof(aCensoredMessage));
+		SendChat(ClientID, Team, aCensoredMessage, ClientID);
+	}
+}
+
+void CGameContext::OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientID)
+{
+	if(RateLimitPlayerVote(ClientID) || m_VoteCloseTime)
+		return;
+
+	m_apPlayers[ClientID]->UpdatePlaytime();
+
+	m_VoteType = VOTE_TYPE_UNKNOWN;
+	char aChatmsg[512] = {0};
+	char aDesc[VOTE_DESC_LENGTH] = {0};
+	char aSixupDesc[VOTE_DESC_LENGTH] = {0};
+	char aCmd[VOTE_CMD_LENGTH] = {0};
+	char aReason[VOTE_REASON_LENGTH] = "No reason given";
+	if(!str_utf8_check(pMsg->m_pType) || !str_utf8_check(pMsg->m_pReason) || !str_utf8_check(pMsg->m_pValue))
+	{
+		return;
+	}
+	if(pMsg->m_pReason[0])
+	{
+		str_copy(aReason, pMsg->m_pReason, sizeof(aReason));
+	}
+
+	if(str_comp_nocase(pMsg->m_pType, "option") == 0)
+	{
+		int Authed = Server()->GetAuthedState(ClientID);
+		CVoteOptionServer *pOption = m_pVoteOptionFirst;
+		while(pOption)
+		{
+			if(str_comp_nocase(pMsg->m_pValue, pOption->m_aDescription) == 0)
+			{
+				if(!Console()->LineIsValid(pOption->m_aCommand))
+				{
+					SendChatTarget(ClientID, "Invalid option");
+					return;
+				}
+				if((str_find(pOption->m_aCommand, "sv_map ") != 0 || str_find(pOption->m_aCommand, "change_map ") != 0 || str_find(pOption->m_aCommand, "random_map") != 0 || str_find(pOption->m_aCommand, "random_unfinished_map") != 0) && RateLimitPlayerMapVote(ClientID))
+				{
+					return;
+				}
+
+				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)", Server()->ClientName(ClientID),
+					pOption->m_aDescription, aReason);
+				str_copy(aDesc, pOption->m_aDescription);
+
+				if((str_endswith(pOption->m_aCommand, "random_map") || str_endswith(pOption->m_aCommand, "random_unfinished_map")) && str_length(aReason) == 1 && aReason[0] >= '0' && aReason[0] <= '5')
+				{
+					int Stars = aReason[0] - '0';
+					str_format(aCmd, sizeof(aCmd), "%s %d", pOption->m_aCommand, Stars);
+				}
+				else
+				{
+					str_copy(aCmd, pOption->m_aCommand);
+				}
+
+				m_LastMapVote = time_get();
+				break;
+			}
+
+			pOption = pOption->m_pNext;
+		}
+
+		if(!pOption)
+		{
+			if(Authed != AUTHED_ADMIN) // allow admins to call any vote they want
+			{
+				str_format(aChatmsg, sizeof(aChatmsg), "'%s' isn't an option on this server", pMsg->m_pValue);
+				SendChatTarget(ClientID, aChatmsg);
+				return;
+			}
+			else
+			{
+				str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s'", Server()->ClientName(ClientID), pMsg->m_pValue);
+				str_copy(aDesc, pMsg->m_pValue);
+				str_copy(aCmd, pMsg->m_pValue);
+			}
+		}
+
+		m_VoteType = VOTE_TYPE_OPTION;
+	}
+	else if(str_comp_nocase(pMsg->m_pType, "kick") == 0)
+	{
+		int Authed = Server()->GetAuthedState(ClientID);
+
+		if(!g_Config.m_SvVoteKick && !Authed) // allow admins to call kick votes even if they are forbidden
+		{
+			SendChatTarget(ClientID, "Server does not allow voting to kick players");
+			return;
+		}
+		if(!Authed && time_get() < m_apPlayers[ClientID]->m_Last_KickVote + (time_freq() * g_Config.m_SvVoteKickDelay))
+		{
+			str_format(aChatmsg, sizeof(aChatmsg), "There's a %d second wait time between kick votes for each player please wait %d second(s)",
+				g_Config.m_SvVoteKickDelay,
+				(int)((m_apPlayers[ClientID]->m_Last_KickVote + g_Config.m_SvVoteKickDelay * time_freq() - time_get()) / time_freq()));
+			SendChatTarget(ClientID, aChatmsg);
+			return;
+		}
+
+		if(g_Config.m_SvVoteKickMin && !GetDDRaceTeam(ClientID))
+		{
+			char aaAddresses[MAX_CLIENTS][NETADDR_MAXSTRSIZE] = {{0}};
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				if(m_apPlayers[i])
+				{
+					Server()->GetClientAddr(i, aaAddresses[i], NETADDR_MAXSTRSIZE);
+				}
+			}
+			int NumPlayers = 0;
+			for(int i = 0; i < MAX_CLIENTS; ++i)
+			{
+				if(m_apPlayers[i] && m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && !GetDDRaceTeam(i))
+				{
+					NumPlayers++;
+					for(int j = 0; j < i; j++)
+					{
+						if(m_apPlayers[j] && m_apPlayers[j]->GetTeam() != TEAM_SPECTATORS && !GetDDRaceTeam(j))
+						{
+							if(str_comp(aaAddresses[i], aaAddresses[j]) == 0)
+							{
+								NumPlayers--;
+								break;
+							}
+						}
+					}
+				}
+			}
+
+			if(NumPlayers < g_Config.m_SvVoteKickMin)
+			{
+				str_format(aChatmsg, sizeof(aChatmsg), "Kick voting requires %d players", g_Config.m_SvVoteKickMin);
+				SendChatTarget(ClientID, aChatmsg);
+				return;
+			}
+		}
+
+		int KickID = str_toint(pMsg->m_pValue);
+
+		if(KickID < 0 || KickID >= MAX_CLIENTS || !m_apPlayers[KickID])
+		{
+			SendChatTarget(ClientID, "Invalid client id to kick");
+			return;
+		}
+		if(KickID == ClientID)
+		{
+			SendChatTarget(ClientID, "You can't kick yourself");
+			return;
+		}
+		if(!Server()->ReverseTranslate(KickID, ClientID))
+		{
+			return;
+		}
+		int KickedAuthed = Server()->GetAuthedState(KickID);
+		if(KickedAuthed > Authed)
+		{
+			SendChatTarget(ClientID, "You can't kick authorized players");
+			char aBufKick[128];
+			str_format(aBufKick, sizeof(aBufKick), "'%s' called for vote to kick you", Server()->ClientName(ClientID));
+			SendChatTarget(KickID, aBufKick);
+			return;
+		}
+
+		// Don't allow kicking if a player has no character
+		if(!GetPlayerChar(ClientID) || !GetPlayerChar(KickID) || GetDDRaceTeam(ClientID) != GetDDRaceTeam(KickID))
+		{
+			SendChatTarget(ClientID, "You can kick only your team member");
+			return;
+		}
+
+		str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to kick '%s' (%s)", Server()->ClientName(ClientID), Server()->ClientName(KickID), aReason);
+		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", KickID, Server()->ClientName(KickID));
+		if(!GetDDRaceTeam(ClientID))
+		{
+			if(!g_Config.m_SvVoteKickBantime)
+			{
+				str_format(aCmd, sizeof(aCmd), "kick %d Kicked by vote", KickID);
+				str_format(aDesc, sizeof(aDesc), "Kick '%s'", Server()->ClientName(KickID));
+			}
+			else
+			{
+				char aAddrStr[NETADDR_MAXSTRSIZE] = {0};
+				Server()->GetClientAddr(KickID, aAddrStr, sizeof(aAddrStr));
+				str_format(aCmd, sizeof(aCmd), "ban %s %d Banned by vote", aAddrStr, g_Config.m_SvVoteKickBantime);
+				str_format(aDesc, sizeof(aDesc), "Ban '%s'", Server()->ClientName(KickID));
+			}
+		}
+		else
+		{
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team_ddr %d 0", KickID, GetDDRaceTeam(KickID), KickID);
+			str_format(aDesc, sizeof(aDesc), "Move '%s' to team 0", Server()->ClientName(KickID));
+		}
+		m_apPlayers[ClientID]->m_Last_KickVote = time_get();
+		m_VoteType = VOTE_TYPE_KICK;
+		m_VoteVictim = KickID;
+	}
+	else if(str_comp_nocase(pMsg->m_pType, "spectate") == 0)
+	{
+		if(!g_Config.m_SvVoteSpectate)
+		{
+			SendChatTarget(ClientID, "Server does not allow voting to move players to spectators");
+			return;
+		}
+
+		int SpectateID = str_toint(pMsg->m_pValue);
+
+		if(SpectateID < 0 || SpectateID >= MAX_CLIENTS || !m_apPlayers[SpectateID] || m_apPlayers[SpectateID]->GetTeam() == TEAM_SPECTATORS)
+		{
+			SendChatTarget(ClientID, "Invalid client id to move");
+			return;
+		}
+		if(SpectateID == ClientID)
+		{
+			SendChatTarget(ClientID, "You can't move yourself");
+			return;
+		}
+		if(!Server()->ReverseTranslate(SpectateID, ClientID))
+		{
+			return;
+		}
+
+		if(!GetPlayerChar(ClientID) || !GetPlayerChar(SpectateID) || GetDDRaceTeam(ClientID) != GetDDRaceTeam(SpectateID))
+		{
+			SendChatTarget(ClientID, "You can only move your team member to spectators");
+			return;
+		}
+
+		str_format(aSixupDesc, sizeof(aSixupDesc), "%2d: %s", SpectateID, Server()->ClientName(SpectateID));
+		if(g_Config.m_SvPauseable && g_Config.m_SvVotePause)
+		{
+			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to pause '%s' for %d seconds (%s)", Server()->ClientName(ClientID), Server()->ClientName(SpectateID), g_Config.m_SvVotePauseTime, aReason);
+			str_format(aDesc, sizeof(aDesc), "Pause '%s' (%ds)", Server()->ClientName(SpectateID), g_Config.m_SvVotePauseTime);
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; force_pause %d %d", SpectateID, GetDDRaceTeam(SpectateID), SpectateID, g_Config.m_SvVotePauseTime);
+		}
+		else
+		{
+			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called for vote to move '%s' to spectators (%s)", Server()->ClientName(ClientID), Server()->ClientName(SpectateID), aReason);
+			str_format(aDesc, sizeof(aDesc), "Move '%s' to spectators", Server()->ClientName(SpectateID));
+			str_format(aCmd, sizeof(aCmd), "uninvite %d %d; set_team %d -1 %d", SpectateID, GetDDRaceTeam(SpectateID), SpectateID, g_Config.m_SvVoteSpectateRejoindelay);
+		}
+		m_VoteType = VOTE_TYPE_SPECTATE;
+		m_VoteVictim = SpectateID;
+	}
+
+	if(aCmd[0] && str_comp_nocase(aCmd, "info") != 0)
+		CallVote(ClientID, aDesc, aCmd, aReason, aChatmsg, aSixupDesc[0] ? aSixupDesc : 0);
+}
+
+void CGameContext::OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientID)
+{
+	if(!m_VoteCloseTime)
+		return;
+
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	if(g_Config.m_SvSpamprotection && pPlayer->m_LastVoteTry && pPlayer->m_LastVoteTry + Server()->TickSpeed() * 3 > Server()->Tick())
+		return;
+
+	int64_t Now = Server()->Tick();
+
+	pPlayer->m_LastVoteTry = Now;
+	pPlayer->UpdatePlaytime();
+
+	if(!pMsg->m_Vote)
+		return;
+
+	pPlayer->m_Vote = pMsg->m_Vote;
+	pPlayer->m_VotePos = ++m_VotePos;
+	m_VoteUpdate = true;
+
+	CNetMsg_Sv_YourVote Msg = {pMsg->m_Vote};
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+}
+
+void CGameContext::OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientID)
+{
+	if(m_World.m_Paused)
+		return;
+
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	if(pPlayer->GetTeam() == pMsg->m_Team || (g_Config.m_SvSpamprotection && pPlayer->m_LastSetTeam && pPlayer->m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay > Server()->Tick()))
+		return;
+
+	// Kill Protection
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(pChr)
+	{
+		int CurrTime = (Server()->Tick() - pChr->m_StartTime) / Server()->TickSpeed();
+		if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
+		{
+			SendChatTarget(ClientID, "Kill Protection enabled. If you really want to join the spectators, first type /kill");
+			return;
+		}
+	}
+
+	if(pPlayer->m_TeamChangeTick > Server()->Tick())
+	{
+		pPlayer->m_LastSetTeam = Server()->Tick();
+		int TimeLeft = (pPlayer->m_TeamChangeTick - Server()->Tick()) / Server()->TickSpeed();
+		char aTime[32];
+		str_time((int64_t)TimeLeft * 100, TIME_HOURS, aTime, sizeof(aTime));
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "Time to wait before changing team: %s", aTime);
+		SendBroadcast(aBuf, ClientID);
+		return;
+	}
+
+	// Switch team on given client and kill/respawn them
+	char aTeamJoinError[512];
+	if(m_pController->CanJoinTeam(pMsg->m_Team, ClientID, aTeamJoinError, sizeof(aTeamJoinError)))
+	{
+		if(pPlayer->GetTeam() == TEAM_SPECTATORS || pMsg->m_Team == TEAM_SPECTATORS)
+			m_VoteUpdate = true;
+		m_pController->DoTeamChange(pPlayer, pMsg->m_Team);
+		pPlayer->m_TeamChangeTick = Server()->Tick();
+	}
+	else
+		SendBroadcast(aTeamJoinError, ClientID);
+}
+
+void CGameContext::OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker)
+{
+	IServer::CClientInfo Info;
+	if(Server()->GetClientInfo(ClientID, &Info) && Info.m_GotDDNetVersion)
+	{
+		return;
+	}
+	int DDNetVersion = pUnpacker->GetInt();
+	if(pUnpacker->Error() || DDNetVersion < 0)
+	{
+		DDNetVersion = VERSION_DDRACE;
+	}
+	Server()->SetClientDDNetVersion(ClientID, DDNetVersion);
+	OnClientDDNetVersionKnown(ClientID);
+}
+
+void CGameContext::OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientID)
+{
+	if(g_Config.m_SvShowOthers && !g_Config.m_SvShowOthersDefault)
+	{
+		CPlayer *pPlayer = m_apPlayers[ClientID];
+		pPlayer->m_ShowOthers = pMsg->m_Show;
+	}
+}
+
+void CGameContext::OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientID)
+{
+	if(g_Config.m_SvShowOthers && !g_Config.m_SvShowOthersDefault)
+	{
+		CPlayer *pPlayer = m_apPlayers[ClientID];
+		pPlayer->m_ShowOthers = pMsg->m_Show;
+	}
+}
+
+void CGameContext::OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientID)
+{
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	pPlayer->m_ShowDistance = vec2(pMsg->m_X, pMsg->m_Y);
+}
+
+void CGameContext::OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientID)
+{
+	if(m_World.m_Paused)
+		return;
+
+	int SpectatorID = clamp(pMsg->m_SpectatorID, (int)SPEC_FOLLOW, MAX_CLIENTS - 1);
+	if(SpectatorID >= 0)
+		if(!Server()->ReverseTranslate(SpectatorID, ClientID))
+			return;
+
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if((g_Config.m_SvSpamprotection && pPlayer->m_LastSetSpectatorMode && pPlayer->m_LastSetSpectatorMode + Server()->TickSpeed() / 4 > Server()->Tick()))
+		return;
+
+	pPlayer->m_LastSetSpectatorMode = Server()->Tick();
+	pPlayer->UpdatePlaytime();
+	if(SpectatorID >= 0 && (!m_apPlayers[SpectatorID] || m_apPlayers[SpectatorID]->GetTeam() == TEAM_SPECTATORS))
+		SendChatTarget(ClientID, "Invalid spectator id used");
+	else
+		pPlayer->m_SpectatorID = SpectatorID;
+}
+
+void CGameContext::OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientID)
+{
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if(g_Config.m_SvSpamprotection && pPlayer->m_LastChangeInfo && pPlayer->m_LastChangeInfo + Server()->TickSpeed() * g_Config.m_SvInfoChangeDelay > Server()->Tick())
+		return;
+
+	bool SixupNeedsUpdate = false;
+
+	if(!str_utf8_check(pMsg->m_pName) || !str_utf8_check(pMsg->m_pClan) || !str_utf8_check(pMsg->m_pSkin))
+	{
+		return;
+	}
+	pPlayer->m_LastChangeInfo = Server()->Tick();
+	pPlayer->UpdatePlaytime();
+
+	// set infos
+	if(Server()->WouldClientNameChange(ClientID, pMsg->m_pName) && !ProcessSpamProtection(ClientID))
+	{
+		char aOldName[MAX_NAME_LENGTH];
+		str_copy(aOldName, Server()->ClientName(ClientID), sizeof(aOldName));
+
+		Server()->SetClientName(ClientID, pMsg->m_pName);
+
+		char aChatText[256];
+		str_format(aChatText, sizeof(aChatText), "'%s' changed name to '%s'", aOldName, Server()->ClientName(ClientID));
+		SendChat(-1, CGameContext::CHAT_ALL, aChatText);
+
+		// reload scores
+		Score()->PlayerData(ClientID)->Reset();
+		m_apPlayers[ClientID]->m_Score.reset();
+		Score()->LoadPlayerData(ClientID);
+
+		SixupNeedsUpdate = true;
+
+		LogEvent("Name change", ClientID);
+	}
+
+	if(Server()->WouldClientClanChange(ClientID, pMsg->m_pClan))
+	{
+		SixupNeedsUpdate = true;
+		Server()->SetClientClan(ClientID, pMsg->m_pClan);
+	}
+
+	if(Server()->ClientCountry(ClientID) != pMsg->m_Country)
+		SixupNeedsUpdate = true;
+	Server()->SetClientCountry(ClientID, pMsg->m_Country);
+
+	str_copy(pPlayer->m_TeeInfos.m_aSkinName, pMsg->m_pSkin, sizeof(pPlayer->m_TeeInfos.m_aSkinName));
+	pPlayer->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
+	pPlayer->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;
+	pPlayer->m_TeeInfos.m_ColorFeet = pMsg->m_ColorFeet;
+	if(!Server()->IsSixup(ClientID))
+		pPlayer->m_TeeInfos.ToSixup();
+
+	if(SixupNeedsUpdate)
+	{
+		protocol7::CNetMsg_Sv_ClientDrop Drop;
+		Drop.m_ClientID = ClientID;
+		Drop.m_pReason = "";
+		Drop.m_Silent = true;
+
+		protocol7::CNetMsg_Sv_ClientInfo Info;
+		Info.m_ClientID = ClientID;
+		Info.m_pName = Server()->ClientName(ClientID);
+		Info.m_Country = pMsg->m_Country;
+		Info.m_pClan = pMsg->m_pClan;
+		Info.m_Local = 0;
+		Info.m_Silent = true;
+		Info.m_Team = pPlayer->GetTeam();
+
+		for(int p = 0; p < 6; p++)
+		{
+			Info.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
+			Info.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
+			Info.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
+		}
+
+		for(int i = 0; i < Server()->MaxClients(); i++)
+		{
+			if(i != ClientID)
+			{
+				Server()->SendPackMsg(&Drop, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+				Server()->SendPackMsg(&Info, MSGFLAG_VITAL | MSGFLAG_NORECORD, i);
+			}
+		}
+	}
+	else
+	{
+		protocol7::CNetMsg_Sv_SkinChange Msg;
+		Msg.m_ClientID = ClientID;
+		for(int p = 0; p < 6; p++)
+		{
+			Msg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
+			Msg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
+			Msg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
+		}
+
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+	}
+
+	Server()->ExpireServerInfo();
+}
+
+void CGameContext::OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientID)
+{
+	if(m_World.m_Paused)
+		return;
+
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	auto &&CheckPreventEmote = [&](int64_t LastEmote, int64_t DelayInMs) {
+		return (LastEmote * (int64_t)1000) + (int64_t)Server()->TickSpeed() * DelayInMs > ((int64_t)Server()->Tick() * (int64_t)1000);
+	};
+
+	if(g_Config.m_SvSpamprotection && CheckPreventEmote((int64_t)pPlayer->m_LastEmote, (int64_t)g_Config.m_SvEmoticonMsDelay))
+		return;
+
+	CCharacter *pChr = pPlayer->GetCharacter();
+
+	// player needs a character to send emotes
+	if(!pChr)
+		return;
+
+	pPlayer->m_LastEmote = Server()->Tick();
+	pPlayer->UpdatePlaytime();
+
+	// check if the global emoticon is prevented and emotes are only send to nearby players
+	if(g_Config.m_SvSpamprotection && CheckPreventEmote((int64_t)pPlayer->m_LastEmoteGlobal, (int64_t)g_Config.m_SvGlobalEmoticonMsDelay))
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(m_apPlayers[i] && pChr->CanSnapCharacter(i) && pChr->IsSnappingCharacterInView(i))
+			{
+				SendEmoticon(ClientID, pMsg->m_Emoticon, i);
+			}
+		}
+	}
+	else
+	{
+		// else send emoticons to all players
+		pPlayer->m_LastEmoteGlobal = Server()->Tick();
+		SendEmoticon(ClientID, pMsg->m_Emoticon, -1);
+	}
+
+	if(g_Config.m_SvEmotionalTees && pPlayer->m_EyeEmoteEnabled)
+	{
+		int EmoteType = EMOTE_NORMAL;
+		switch(pMsg->m_Emoticon)
+		{
+		case EMOTICON_EXCLAMATION:
+		case EMOTICON_GHOST:
+		case EMOTICON_QUESTION:
+		case EMOTICON_WTF:
+			EmoteType = EMOTE_SURPRISE;
+			break;
+		case EMOTICON_DOTDOT:
+		case EMOTICON_DROP:
+		case EMOTICON_ZZZ:
+			EmoteType = EMOTE_BLINK;
+			break;
+		case EMOTICON_EYES:
+		case EMOTICON_HEARTS:
+		case EMOTICON_MUSIC:
+			EmoteType = EMOTE_HAPPY;
+			break;
+		case EMOTICON_OOP:
+		case EMOTICON_SORRY:
+		case EMOTICON_SUSHI:
+			EmoteType = EMOTE_PAIN;
+			break;
+		case EMOTICON_DEVILTEE:
+		case EMOTICON_SPLATTEE:
+		case EMOTICON_ZOMG:
+			EmoteType = EMOTE_ANGRY;
+			break;
+		default:
+			break;
+		}
+		pChr->SetEmote(EmoteType, Server()->Tick() + 2 * Server()->TickSpeed());
+	}
+}
+
+void CGameContext::OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID)
+{
+	if(m_World.m_Paused)
+		return;
+
+	if(m_VoteCloseTime && m_VoteCreator == ClientID && GetDDRaceTeam(ClientID) && (IsKickVote() || IsSpecVote()))
+	{
+		SendChatTarget(ClientID, "You are running a vote please try again after the vote is done!");
+		return;
+	}
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if(pPlayer->m_LastKill && pPlayer->m_LastKill + Server()->TickSpeed() * g_Config.m_SvKillDelay > Server()->Tick())
+		return;
+	if(pPlayer->IsPaused())
+		return;
+
+	CCharacter *pChr = pPlayer->GetCharacter();
+	if(!pChr)
+		return;
+
+	// Kill Protection
+	int CurrTime = (Server()->Tick() - pChr->m_StartTime) / Server()->TickSpeed();
+	if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
+	{
+		SendChatTarget(ClientID, "Kill Protection enabled. If you really want to kill, type /kill");
+		return;
+	}
+
+	pPlayer->m_LastKill = Server()->Tick();
+	pPlayer->KillCharacter(WEAPON_SELF);
+	pPlayer->Respawn();
+}
+
+void CGameContext::OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientID)
+{
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	if(pPlayer->m_IsReady)
+		return;
+
+	if(!str_utf8_check(pMsg->m_pName))
+	{
+		Server()->Kick(ClientID, "name is not valid utf8");
+		return;
+	}
+	if(!str_utf8_check(pMsg->m_pClan))
+	{
+		Server()->Kick(ClientID, "clan is not valid utf8");
+		return;
+	}
+	if(!str_utf8_check(pMsg->m_pSkin))
+	{
+		Server()->Kick(ClientID, "skin is not valid utf8");
+		return;
+	}
+
+	pPlayer->m_LastChangeInfo = Server()->Tick();
+
+	// set start infos
+	Server()->SetClientName(ClientID, pMsg->m_pName);
+	// trying to set client name can delete the player object, check if it still exists
+	if(!m_apPlayers[ClientID])
+	{
+		return;
+	}
+	Server()->SetClientClan(ClientID, pMsg->m_pClan);
+	// trying to set client clan can delete the player object, check if it still exists
+	if(!m_apPlayers[ClientID])
+	{
+		return;
+	}
+	Server()->SetClientCountry(ClientID, pMsg->m_Country);
+	str_copy(pPlayer->m_TeeInfos.m_aSkinName, pMsg->m_pSkin, sizeof(pPlayer->m_TeeInfos.m_aSkinName));
+	pPlayer->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
+	pPlayer->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;
+	pPlayer->m_TeeInfos.m_ColorFeet = pMsg->m_ColorFeet;
+	if(!Server()->IsSixup(ClientID))
+		pPlayer->m_TeeInfos.ToSixup();
+
+	// send clear vote options
+	CNetMsg_Sv_VoteClearOptions ClearMsg;
+	Server()->SendPackMsg(&ClearMsg, MSGFLAG_VITAL, ClientID);
+
+	// begin sending vote options
+	pPlayer->m_SendVoteIndex = 0;
+
+	// send tuning parameters to client
+	SendTuningParams(ClientID, pPlayer->m_TuneZone);
+
+	// client is ready to enter
+	pPlayer->m_IsReady = true;
+	CNetMsg_Sv_ReadyToEnter m;
+	Server()->SendPackMsg(&m, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
+
+	Server()->ExpireServerInfo();
+}
+
+void CGameContext::ConTuneParam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pParamName = pResult->GetString(0);
+
+	char aBuf[256];
+	if(pResult->NumArguments() == 2)
+	{
+		float NewValue = pResult->GetFloat(1);
+		if(pSelf->Tuning()->Set(pParamName, NewValue) && pSelf->Tuning()->Get(pParamName, &NewValue))
+		{
+			str_format(aBuf, sizeof(aBuf), "%s changed to %.2f", pParamName, NewValue);
+			pSelf->SendTuningParams(-1);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "No such tuning parameter: %s", pParamName);
+		}
+	}
+	else
+	{
+		float Value;
+		if(pSelf->Tuning()->Get(pParamName, &Value))
+		{
+			str_format(aBuf, sizeof(aBuf), "%s %.2f", pParamName, Value);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "No such tuning parameter: %s", pParamName);
+		}
+	}
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+}
+
+void CGameContext::ConToggleTuneParam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pParamName = pResult->GetString(0);
+	float OldValue;
+
+	char aBuf[256];
+	if(!pSelf->Tuning()->Get(pParamName, &OldValue))
+	{
+		str_format(aBuf, sizeof(aBuf), "No such tuning parameter: %s", pParamName);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+		return;
+	}
+
+	float NewValue = absolute(OldValue - pResult->GetFloat(1)) < 0.0001f ? pResult->GetFloat(2) : pResult->GetFloat(1);
+
+	pSelf->Tuning()->Set(pParamName, NewValue);
+	pSelf->Tuning()->Get(pParamName, &NewValue);
+
+	str_format(aBuf, sizeof(aBuf), "%s changed to %.2f", pParamName, NewValue);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+	pSelf->SendTuningParams(-1);
+}
+
+void CGameContext::ConTuneReset(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pResult->NumArguments())
+	{
+		const char *pParamName = pResult->GetString(0);
+		float DefaultValue = 0.0f;
+		char aBuf[256];
+		CTuningParams TuningParams;
+		if(TuningParams.Get(pParamName, &DefaultValue) && pSelf->Tuning()->Set(pParamName, DefaultValue) && pSelf->Tuning()->Get(pParamName, &DefaultValue))
+		{
+			str_format(aBuf, sizeof(aBuf), "%s reset to %.2f", pParamName, DefaultValue);
+			pSelf->SendTuningParams(-1);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "No such tuning parameter: %s", pParamName);
+		}
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+	}
+	else
+	{
+		pSelf->ResetTuning();
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", "Tuning reset");
+	}
+}
+
+void CGameContext::ConTunes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	char aBuf[256];
+	for(int i = 0; i < CTuningParams::Num(); i++)
+	{
+		float Value;
+		pSelf->Tuning()->Get(i, &Value);
+		str_format(aBuf, sizeof(aBuf), "%s %.2f", CTuningParams::Name(i), Value);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+	}
+}
+
+void CGameContext::ConTuneZone(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int List = pResult->GetInteger(0);
+	const char *pParamName = pResult->GetString(1);
+	float NewValue = pResult->GetFloat(2);
+
+	if(List >= 0 && List < NUM_TUNEZONES)
+	{
+		char aBuf[256];
+		if(pSelf->TuningList()[List].Set(pParamName, NewValue) && pSelf->TuningList()[List].Get(pParamName, &NewValue))
+		{
+			str_format(aBuf, sizeof(aBuf), "%s in zone %d changed to %.2f", pParamName, List, NewValue);
+			pSelf->SendTuningParams(-1, List);
+		}
+		else
+		{
+			str_format(aBuf, sizeof(aBuf), "No such tuning parameter: %s", pParamName);
+		}
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+	}
+}
+
+void CGameContext::ConTuneDumpZone(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int List = pResult->GetInteger(0);
+	char aBuf[256];
+	if(List >= 0 && List < NUM_TUNEZONES)
+	{
+		for(int i = 0; i < CTuningParams::Num(); i++)
+		{
+			float Value;
+			pSelf->TuningList()[List].Get(i, &Value);
+			str_format(aBuf, sizeof(aBuf), "zone %d: %s %.2f", List, CTuningParams::Name(i), Value);
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+		}
+	}
+}
+
+void CGameContext::ConTuneResetZone(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	CTuningParams TuningParams;
+	if(pResult->NumArguments())
+	{
+		int List = pResult->GetInteger(0);
+		if(List >= 0 && List < NUM_TUNEZONES)
+		{
+			pSelf->TuningList()[List] = TuningParams;
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "Tunezone %d reset", List);
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
+			pSelf->SendTuningParams(-1, List);
+		}
+	}
+	else
+	{
+		for(int i = 0; i < NUM_TUNEZONES; i++)
+		{
+			*(pSelf->TuningList() + i) = TuningParams;
+			pSelf->SendTuningParams(-1, i);
+		}
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", "All Tunezones reset");
+	}
+}
+
+void CGameContext::ConTuneSetZoneMsgEnter(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pResult->NumArguments())
+	{
+		int List = pResult->GetInteger(0);
+		if(List >= 0 && List < NUM_TUNEZONES)
+		{
+			str_copy(pSelf->m_aaZoneEnterMsg[List], pResult->GetString(1), sizeof(pSelf->m_aaZoneEnterMsg[List]));
+		}
+	}
+}
+
+void CGameContext::ConTuneSetZoneMsgLeave(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pResult->NumArguments())
+	{
+		int List = pResult->GetInteger(0);
+		if(List >= 0 && List < NUM_TUNEZONES)
+		{
+			str_copy(pSelf->m_aaZoneLeaveMsg[List], pResult->GetString(1), sizeof(pSelf->m_aaZoneLeaveMsg[List]));
+		}
+	}
+}
+
+void CGameContext::ConMapbug(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pMapBugName = pResult->GetString(0);
+
+	if(pSelf->m_pController)
+	{
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mapbugs", "can't add map bugs after the game started");
+		return;
+	}
+
+	switch(pSelf->m_MapBugs.Update(pMapBugName))
+	{
+	case MAPBUGUPDATE_OK:
+		break;
+	case MAPBUGUPDATE_OVERRIDDEN:
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mapbugs", "map-internal setting overridden by database");
+		break;
+	case MAPBUGUPDATE_NOTFOUND:
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "unknown map bug '%s', ignoring", pMapBugName);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "mapbugs", aBuf);
+	}
+	break;
+	default:
+		dbg_assert(0, "unreachable");
+	}
+}
+
+void CGameContext::ConSwitchOpen(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Switch = pResult->GetInteger(0);
+
+	if(in_range(Switch, (int)pSelf->Switchers().size() - 1))
+	{
+		pSelf->Switchers()[Switch].m_Initial = false;
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "switch %d opened by default", Switch);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+	}
+}
+
+void CGameContext::ConPause(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	pSelf->m_World.m_Paused ^= 1;
+}
+
+void CGameContext::ConChangeMap(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->m_pController->ChangeMap(pResult->NumArguments() ? pResult->GetString(0) : "");
+}
+
+void CGameContext::ConRandomMap(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	int Stars = pResult->NumArguments() ? pResult->GetInteger(0) : -1;
+
+	pSelf->m_pScore->RandomMap(pSelf->m_VoteCreator, Stars);
+}
+
+void CGameContext::ConRandomUnfinishedMap(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	int Stars = pResult->NumArguments() ? pResult->GetInteger(0) : -1;
+
+	pSelf->m_pScore->RandomUnfinishedMap(pSelf->m_VoteCreator, Stars);
+}
+
+void CGameContext::ConRestart(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	if(pResult->NumArguments())
+		pSelf->m_pController->DoWarmup(pResult->GetInteger(0));
+	else
+		pSelf->m_pController->StartRound();
+}
+
+void CGameContext::ConBroadcast(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	char aBuf[1024];
+	str_copy(aBuf, pResult->GetString(0), sizeof(aBuf));
+
+	int i, j;
+	for(i = 0, j = 0; aBuf[i]; i++, j++)
+	{
+		if(aBuf[i] == '\\' && aBuf[i + 1] == 'n')
+		{
+			aBuf[j] = '\n';
+			i++;
+		}
+		else if(i != j)
+		{
+			aBuf[j] = aBuf[i];
+		}
+	}
+	aBuf[j] = '\0';
+
+	pSelf->SendBroadcast(aBuf, -1);
+}
+
+void CGameContext::ConSay(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	pSelf->SendChat(-1, CGameContext::CHAT_ALL, pResult->GetString(0));
+}
+
+void CGameContext::ConSetTeam(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int ClientID = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS - 1);
+	int Team = clamp(pResult->GetInteger(1), -1, 1);
+	int Delay = pResult->NumArguments() > 2 ? pResult->GetInteger(2) : 0;
+	if(!pSelf->m_apPlayers[ClientID])
+		return;
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "moved client %d to team %d", ClientID, Team);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+
+	pSelf->m_apPlayers[ClientID]->Pause(CPlayer::PAUSE_NONE, false); // reset /spec and /pause to allow rejoin
+	pSelf->m_apPlayers[ClientID]->m_TeamChangeTick = pSelf->Server()->Tick() + pSelf->Server()->TickSpeed() * Delay * 60;
+	pSelf->m_pController->DoTeamChange(pSelf->m_apPlayers[ClientID], Team);
+	if(Team == TEAM_SPECTATORS)
+		pSelf->m_apPlayers[ClientID]->Pause(CPlayer::PAUSE_NONE, true);
+}
+
+void CGameContext::ConSetTeamAll(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	int Team = clamp(pResult->GetInteger(0), -1, 1);
+
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "All players were moved to the %s", pSelf->m_pController->GetTeamName(Team));
+	pSelf->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+
+	for(auto &pPlayer : pSelf->m_apPlayers)
+		if(pPlayer)
+			pSelf->m_pController->DoTeamChange(pPlayer, Team, false);
+}
+
+void CGameContext::ConAddVote(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pDescription = pResult->GetString(0);
+	const char *pCommand = pResult->GetString(1);
+
+	pSelf->AddVote(pDescription, pCommand);
+}
+
+void CGameContext::AddVote(const char *pDescription, const char *pCommand)
+{
+	if(m_NumVoteOptions == MAX_VOTE_OPTIONS)
+	{
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "maximum number of vote options reached");
+		return;
+	}
+
+	// check for valid option
+	if(!Console()->LineIsValid(pCommand) || str_length(pCommand) >= VOTE_CMD_LENGTH)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "skipped invalid command '%s'", pCommand);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+		return;
+	}
+	while(*pDescription == ' ')
+		pDescription++;
+	if(str_length(pDescription) >= VOTE_DESC_LENGTH || *pDescription == 0)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "skipped invalid option '%s'", pDescription);
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+		return;
+	}
+
+	// check for duplicate entry
+	CVoteOptionServer *pOption = m_pVoteOptionFirst;
+	while(pOption)
+	{
+		if(str_comp_nocase(pDescription, pOption->m_aDescription) == 0)
+		{
+			char aBuf[256];
+			str_format(aBuf, sizeof(aBuf), "option '%s' already exists", pDescription);
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+			return;
+		}
+		pOption = pOption->m_pNext;
+	}
+
+	// add the option
+	++m_NumVoteOptions;
+	int Len = str_length(pCommand);
+
+	pOption = (CVoteOptionServer *)m_pVoteOptionHeap->Allocate(sizeof(CVoteOptionServer) + Len, alignof(CVoteOptionServer));
+	pOption->m_pNext = 0;
+	pOption->m_pPrev = m_pVoteOptionLast;
+	if(pOption->m_pPrev)
+		pOption->m_pPrev->m_pNext = pOption;
+	m_pVoteOptionLast = pOption;
+	if(!m_pVoteOptionFirst)
+		m_pVoteOptionFirst = pOption;
+
+	str_copy(pOption->m_aDescription, pDescription, sizeof(pOption->m_aDescription));
+	mem_copy(pOption->m_aCommand, pCommand, Len + 1);
+}
+
+void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pDescription = pResult->GetString(0);
+
+	// check for valid option
+	CVoteOptionServer *pOption = pSelf->m_pVoteOptionFirst;
+	while(pOption)
+	{
+		if(str_comp_nocase(pDescription, pOption->m_aDescription) == 0)
+			break;
+		pOption = pOption->m_pNext;
+	}
+	if(!pOption)
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "option '%s' does not exist", pDescription);
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+		return;
+	}
+
+	// start reloading vote option list
+	// clear vote options
+	CNetMsg_Sv_VoteClearOptions VoteClearOptionsMsg;
+	pSelf->Server()->SendPackMsg(&VoteClearOptionsMsg, MSGFLAG_VITAL, -1);
+
+	// reset sending of vote options
+	for(auto &pPlayer : pSelf->m_apPlayers)
+	{
+		if(pPlayer)
+			pPlayer->m_SendVoteIndex = 0;
+	}
+
+	// TODO: improve this
+	// remove the option
+	--pSelf->m_NumVoteOptions;
+
+	CHeap *pVoteOptionHeap = new CHeap();
+	CVoteOptionServer *pVoteOptionFirst = 0;
+	CVoteOptionServer *pVoteOptionLast = 0;
+	int NumVoteOptions = pSelf->m_NumVoteOptions;
+	for(CVoteOptionServer *pSrc = pSelf->m_pVoteOptionFirst; pSrc; pSrc = pSrc->m_pNext)
+	{
+		if(pSrc == pOption)
+			continue;
+
+		// copy option
+		int Len = str_length(pSrc->m_aCommand);
+		CVoteOptionServer *pDst = (CVoteOptionServer *)pVoteOptionHeap->Allocate(sizeof(CVoteOptionServer) + Len);
+		pDst->m_pNext = 0;
+		pDst->m_pPrev = pVoteOptionLast;
+		if(pDst->m_pPrev)
+			pDst->m_pPrev->m_pNext = pDst;
+		pVoteOptionLast = pDst;
+		if(!pVoteOptionFirst)
+			pVoteOptionFirst = pDst;
+
+		str_copy(pDst->m_aDescription, pSrc->m_aDescription, sizeof(pDst->m_aDescription));
+		mem_copy(pDst->m_aCommand, pSrc->m_aCommand, Len + 1);
+	}
+
+	// clean up
+	delete pSelf->m_pVoteOptionHeap;
+	pSelf->m_pVoteOptionHeap = pVoteOptionHeap;
+	pSelf->m_pVoteOptionFirst = pVoteOptionFirst;
+	pSelf->m_pVoteOptionLast = pVoteOptionLast;
+	pSelf->m_NumVoteOptions = NumVoteOptions;
+}
+
+void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+	const char *pType = pResult->GetString(0);
+	const char *pValue = pResult->GetString(1);
+	const char *pReason = pResult->NumArguments() > 2 && pResult->GetString(2)[0] ? pResult->GetString(2) : "No reason given";
+	char aBuf[128] = {0};
+
+	if(str_comp_nocase(pType, "option") == 0)
+	{
+		CVoteOptionServer *pOption = pSelf->m_pVoteOptionFirst;
+		while(pOption)
+		{
+			if(str_comp_nocase(pValue, pOption->m_aDescription) == 0)
+			{
+				str_format(aBuf, sizeof(aBuf), "authorized player forced server option '%s' (%s)", pValue, pReason);
+				pSelf->SendChatTarget(-1, aBuf, CHAT_SIX);
+				pSelf->Console()->ExecuteLine(pOption->m_aCommand);
+				break;
+			}
+
+			pOption = pOption->m_pNext;
+		}
+
+		if(!pOption)
+		{
+			str_format(aBuf, sizeof(aBuf), "'%s' isn't an option on this server", pValue);
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+			return;
+		}
+	}
+	else if(str_comp_nocase(pType, "kick") == 0)
+	{
+		int KickID = str_toint(pValue);
+		if(KickID < 0 || KickID >= MAX_CLIENTS || !pSelf->m_apPlayers[KickID])
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "Invalid client id to kick");
+			return;
+		}
+
+		if(!g_Config.m_SvVoteKickBantime)
+		{
+			str_format(aBuf, sizeof(aBuf), "kick %d %s", KickID, pReason);
+			pSelf->Console()->ExecuteLine(aBuf);
+		}
+		else
+		{
+			char aAddrStr[NETADDR_MAXSTRSIZE] = {0};
+			pSelf->Server()->GetClientAddr(KickID, aAddrStr, sizeof(aAddrStr));
+			str_format(aBuf, sizeof(aBuf), "ban %s %d %s", aAddrStr, g_Config.m_SvVoteKickBantime, pReason);
+			pSelf->Console()->ExecuteLine(aBuf);
+		}
+	}
+	else if(str_comp_nocase(pType, "spectate") == 0)
+	{
+		int SpectateID = str_toint(pValue);
+		if(SpectateID < 0 || SpectateID >= MAX_CLIENTS || !pSelf->m_apPlayers[SpectateID] || pSelf->m_apPlayers[SpectateID]->GetTeam() == TEAM_SPECTATORS)
+		{
+			pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "Invalid client id to move");
+			return;
+		}
+
+		str_format(aBuf, sizeof(aBuf), "'%s' was moved to spectator (%s)", pSelf->Server()->ClientName(SpectateID), pReason);
+		pSelf->SendChatTarget(-1, aBuf);
+		str_format(aBuf, sizeof(aBuf), "set_team %d -1 %d", SpectateID, g_Config.m_SvVoteSpectateRejoindelay);
+		pSelf->Console()->ExecuteLine(aBuf);
+	}
+}
+
+void CGameContext::ConClearVotes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	CNetMsg_Sv_VoteClearOptions VoteClearOptionsMsg;
+	pSelf->Server()->SendPackMsg(&VoteClearOptionsMsg, MSGFLAG_VITAL, -1);
+	pSelf->m_pVoteOptionHeap->Reset();
+	pSelf->m_pVoteOptionFirst = 0;
+	pSelf->m_pVoteOptionLast = 0;
+	pSelf->m_NumVoteOptions = 0;
+
+	// reset sending of vote options
+	for(auto &pPlayer : pSelf->m_apPlayers)
+	{
+		if(pPlayer)
+			pPlayer->m_SendVoteIndex = 0;
+	}
+}
+
+struct CMapNameItem
+{
+	char m_aName[IO_MAX_PATH_LENGTH - 4];
+
+	bool operator<(const CMapNameItem &Other) const { return str_comp_nocase(m_aName, Other.m_aName) < 0; }
+};
+
+void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	std::vector<CMapNameItem> vMapList;
+	pSelf->Storage()->ListDirectory(IStorage::TYPE_ALL, "maps", MapScan, &vMapList);
+	std::sort(vMapList.begin(), vMapList.end());
+
+	for(auto &Item : vMapList)
+	{
+		char aDescription[64];
+		str_format(aDescription, sizeof(aDescription), "Map: %s", Item.m_aName);
+
+		char aCommand[IO_MAX_PATH_LENGTH * 2 + 10];
+		char aMapEscaped[IO_MAX_PATH_LENGTH * 2];
+		char *pDst = aMapEscaped;
+		str_escape(&pDst, Item.m_aName, aMapEscaped + sizeof(aMapEscaped));
+		str_format(aCommand, sizeof(aCommand), "change_map \"%s\"", aMapEscaped);
+
+		pSelf->AddVote(aDescription, aCommand);
+	}
+
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "added maps to votes");
+}
+
+int CGameContext::MapScan(const char *pName, int IsDir, int DirType, void *pUserData)
+{
+	if(IsDir || !str_endswith(pName, ".map"))
+		return 0;
+
+	CMapNameItem Item;
+	str_truncate(Item.m_aName, sizeof(Item.m_aName), pName, str_length(pName) - str_length(".map"));
+	static_cast<std::vector<CMapNameItem> *>(pUserData)->push_back(Item);
+
+	return 0;
+}
+
+void CGameContext::ConVote(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	if(str_comp_nocase(pResult->GetString(0), "yes") == 0)
+		pSelf->ForceVote(pResult->m_ClientID, true);
+	else if(str_comp_nocase(pResult->GetString(0), "no") == 0)
+		pSelf->ForceVote(pResult->m_ClientID, false);
+}
+
+void CGameContext::ConVotes(IConsole::IResult *pResult, void *pUserData)
+{
+	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	int Page = pResult->NumArguments() > 0 ? pResult->GetInteger(0) : 0;
+	static const int s_EntriesPerPage = 20;
+	const int Start = Page * s_EntriesPerPage;
+	const int End = (Page + 1) * s_EntriesPerPage;
+
+	char aBuf[512];
+	int Count = 0;
+	for(CVoteOptionServer *pOption = pSelf->m_pVoteOptionFirst; pOption; pOption = pOption->m_pNext, Count++)
+	{
+		if(Count < Start || Count >= End)
+		{
+			continue;
+		}
+
+		str_copy(aBuf, "add_vote \"");
+		char *pDst = aBuf + str_length(aBuf);
+		str_escape(&pDst, pOption->m_aDescription, aBuf + sizeof(aBuf));
+		str_append(aBuf, "\" \"");
+		pDst = aBuf + str_length(aBuf);
+		str_escape(&pDst, pOption->m_aCommand, aBuf + sizeof(aBuf));
+		str_append(aBuf, "\"");
+
+		pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votes", aBuf);
+	}
+	str_format(aBuf, sizeof(aBuf), "%d %s, showing entries %d - %d", Count, Count == 1 ? "vote" : "votes", Start, End - 1);
+	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votes", aBuf);
+}
+
+void CGameContext::ConchainSpecialMotdupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		CGameContext *pSelf = (CGameContext *)pUserData;
+		pSelf->SendMotd(-1);
+	}
+}
+
+void CGameContext::ConchainSettingUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
+{
+	pfnCallback(pResult, pCallbackUserData);
+	if(pResult->NumArguments())
+	{
+		CGameContext *pSelf = (CGameContext *)pUserData;
+		pSelf->SendSettings(-1);
+	}
+}
+
+void CGameContext::OnConsoleInit()
+{
+	m_pServer = Kernel()->RequestInterface<IServer>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pConfig = m_pConfigManager->Values();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+
+	Console()->Register("tune", "s[tuning] ?i[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneParam, this, "Tune variable to value or show current value");
+	Console()->Register("toggle_tune", "s[tuning] i[value 1] i[value 2]", CFGFLAG_SERVER | CFGFLAG_GAME, ConToggleTuneParam, this, "Toggle tune variable");
+	Console()->Register("tune_reset", "?s[tuning]", CFGFLAG_SERVER, ConTuneReset, this, "Reset all or one tuning variable to default");
+	Console()->Register("tunes", "", CFGFLAG_SERVER, ConTunes, this, "List all tuning variables and their values");
+	Console()->Register("tune_zone", "i[zone] s[tuning] i[value]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneZone, this, "Tune in zone a variable to value");
+	Console()->Register("tune_zone_dump", "i[zone]", CFGFLAG_SERVER, ConTuneDumpZone, this, "Dump zone tuning in zone x");
+	Console()->Register("tune_zone_reset", "?i[zone]", CFGFLAG_SERVER, ConTuneResetZone, this, "reset zone tuning in zone x or in all zones");
+	Console()->Register("tune_zone_enter", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgEnter, this, "which message to display on zone enter; use 0 for normal area");
+	Console()->Register("tune_zone_leave", "i[zone] r[message]", CFGFLAG_SERVER | CFGFLAG_GAME, ConTuneSetZoneMsgLeave, this, "which message to display on zone leave; use 0 for normal area");
+	Console()->Register("mapbug", "s[mapbug]", CFGFLAG_SERVER | CFGFLAG_GAME, ConMapbug, this, "Enable map compatibility mode using the specified bug (example: grenade-doubleexplosion@ddnet.tw)");
+	Console()->Register("switch_open", "i[switch]", CFGFLAG_SERVER | CFGFLAG_GAME, ConSwitchOpen, this, "Whether a switch is deactivated by default (otherwise activated)");
+	Console()->Register("pause_game", "", CFGFLAG_SERVER, ConPause, this, "Pause/unpause game");
+	Console()->Register("change_map", "?r[map]", CFGFLAG_SERVER | CFGFLAG_STORE, ConChangeMap, this, "Change map");
+	Console()->Register("random_map", "?i[stars]", CFGFLAG_SERVER, ConRandomMap, this, "Random map");
+	Console()->Register("random_unfinished_map", "?i[stars]", CFGFLAG_SERVER, ConRandomUnfinishedMap, this, "Random unfinished map");
+	Console()->Register("restart", "?i[seconds]", CFGFLAG_SERVER | CFGFLAG_STORE, ConRestart, this, "Restart in x seconds (0 = abort)");
+	Console()->Register("broadcast", "r[message]", CFGFLAG_SERVER, ConBroadcast, this, "Broadcast message");
+	Console()->Register("say", "r[message]", CFGFLAG_SERVER, ConSay, this, "Say in chat");
+	Console()->Register("set_team", "i[id] i[team-id] ?i[delay in minutes]", CFGFLAG_SERVER, ConSetTeam, this, "Set team of player to team");
+	Console()->Register("set_team_all", "i[team-id]", CFGFLAG_SERVER, ConSetTeamAll, this, "Set team of all players to team");
+
+	Console()->Register("add_vote", "s[name] r[command]", CFGFLAG_SERVER, ConAddVote, this, "Add a voting option");
+	Console()->Register("remove_vote", "r[name]", CFGFLAG_SERVER, ConRemoveVote, this, "remove a voting option");
+	Console()->Register("force_vote", "s[name] s[command] ?r[reason]", CFGFLAG_SERVER, ConForceVote, this, "Force a voting option");
+	Console()->Register("clear_votes", "", CFGFLAG_SERVER, ConClearVotes, this, "Clears the voting options");
+	Console()->Register("add_map_votes", "", CFGFLAG_SERVER, ConAddMapVotes, this, "Automatically adds voting options for all maps");
+	Console()->Register("vote", "r['yes'|'no']", CFGFLAG_SERVER, ConVote, this, "Force a vote to yes/no");
+	Console()->Register("votes", "?i[page]", CFGFLAG_SERVER, ConVotes, this, "Show all votes (page 0 by default, 20 entries per page)");
+	Console()->Register("dump_antibot", "", CFGFLAG_SERVER, ConDumpAntibot, this, "Dumps the antibot status");
+	Console()->Register("antibot", "r[command]", CFGFLAG_SERVER, ConAntibot, this, "Sends a command to the antibot");
+
+	Console()->Chain("sv_motd", ConchainSpecialMotdupdate, this);
+
+	Console()->Chain("sv_vote_kick", ConchainSettingUpdate, this);
+	Console()->Chain("sv_vote_kick_min", ConchainSettingUpdate, this);
+	Console()->Chain("sv_vote_spectate", ConchainSettingUpdate, this);
+	Console()->Chain("sv_spectator_slots", ConchainSettingUpdate, this);
+	Console()->Chain("sv_max_clients", ConchainSettingUpdate, this);
+
+#define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help);
+#include <game/ddracecommands.h>
+#define CHAT_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help);
+#include <game/ddracechat.h>
+}
+
+void CGameContext::OnInit(const void *pPersistentData)
+{
+	const CPersistentData *pPersistent = (const CPersistentData *)pPersistentData;
+
+	m_pServer = Kernel()->RequestInterface<IServer>();
+	m_pConfigManager = Kernel()->RequestInterface<IConfigManager>();
+	m_pConfig = m_pConfigManager->Values();
+	m_pConsole = Kernel()->RequestInterface<IConsole>();
+	m_pEngine = Kernel()->RequestInterface<IEngine>();
+	m_pStorage = Kernel()->RequestInterface<IStorage>();
+	m_pAntibot = Kernel()->RequestInterface<IAntibot>();
+	m_World.SetGameServer(this);
+	m_Events.SetGameServer(this);
+
+	m_GameUuid = RandomUuid();
+	Console()->SetTeeHistorianCommandCallback(CommandCallback, this);
+
+	uint64_t aSeed[2];
+	secure_random_fill(aSeed, sizeof(aSeed));
+	m_Prng.Seed(aSeed);
+	m_World.m_Core.m_pPrng = &m_Prng;
+
+	DeleteTempfile();
+
+	for(int i = 0; i < NUM_NETOBJTYPES; i++)
+		Server()->SnapSetStaticsize(i, m_NetObjHandler.GetObjSize(i));
+
+	m_Layers.Init(Kernel());
+	m_Collision.Init(&m_Layers);
+	m_World.m_pTuningList = m_aTuningList;
+	m_World.m_Core.InitSwitchers(m_Collision.m_HighestSwitchNumber);
+
+	char aMapName[IO_MAX_PATH_LENGTH];
+	int MapSize;
+	SHA256_DIGEST MapSha256;
+	int MapCrc;
+	Server()->GetMapInfo(aMapName, sizeof(aMapName), &MapSize, &MapSha256, &MapCrc);
+	m_MapBugs = GetMapBugs(aMapName, MapSize, MapSha256);
+
+	// Reset Tunezones
+	CTuningParams TuningParams;
+	for(int i = 0; i < NUM_TUNEZONES; i++)
+	{
+		TuningList()[i] = TuningParams;
+		TuningList()[i].Set("gun_curvature", 0);
+		TuningList()[i].Set("gun_speed", 1400);
+		TuningList()[i].Set("shotgun_curvature", 0);
+		TuningList()[i].Set("shotgun_speed", 500);
+		TuningList()[i].Set("shotgun_speeddiff", 0);
+	}
+
+	for(int i = 0; i < NUM_TUNEZONES; i++)
+	{
+		// Send no text by default when changing tune zones.
+		m_aaZoneEnterMsg[i][0] = 0;
+		m_aaZoneLeaveMsg[i][0] = 0;
+	}
+	// Reset Tuning
+	if(g_Config.m_SvTuneReset)
+	{
+		ResetTuning();
+	}
+	else
+	{
+		Tuning()->Set("gun_speed", 1400);
+		Tuning()->Set("gun_curvature", 0);
+		Tuning()->Set("shotgun_speed", 500);
+		Tuning()->Set("shotgun_speeddiff", 0);
+		Tuning()->Set("shotgun_curvature", 0);
+	}
+
+	if(g_Config.m_SvDDRaceTuneReset)
+	{
+		g_Config.m_SvHit = 1;
+		g_Config.m_SvEndlessDrag = 0;
+		g_Config.m_SvOldLaser = 0;
+		g_Config.m_SvOldTeleportHook = 0;
+		g_Config.m_SvOldTeleportWeapons = 0;
+		g_Config.m_SvTeleportHoldHook = 0;
+		g_Config.m_SvTeam = SV_TEAM_ALLOWED;
+		g_Config.m_SvShowOthersDefault = SHOW_OTHERS_OFF;
+
+		for(auto &Switcher : Switchers())
+			Switcher.m_Initial = true;
+	}
+
+	Console()->ExecuteFile(g_Config.m_SvResetFile, -1);
+
+	LoadMapSettings();
+
+	m_MapBugs.Dump();
+
+	if(g_Config.m_SvSoloServer)
+	{
+		g_Config.m_SvTeam = SV_TEAM_FORCED_SOLO;
+		g_Config.m_SvShowOthersDefault = SHOW_OTHERS_ON;
+
+		Tuning()->Set("player_collision", 0);
+		Tuning()->Set("player_hooking", 0);
+
+		for(int i = 0; i < NUM_TUNEZONES; i++)
+		{
+			TuningList()[i].Set("player_collision", 0);
+			TuningList()[i].Set("player_hooking", 0);
+		}
+	}
+
+	if(!str_comp(Config()->m_SvGametype, "mod"))
+		m_pController = new CGameControllerMod(this);
+	else
+		m_pController = new CGameControllerDDRace(this);
+
+	const char *pCensorFilename = "censorlist.txt";
+	IOHANDLE File = Storage()->OpenFile(pCensorFilename, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!File)
+	{
+		dbg_msg("censorlist", "failed to open '%s'", pCensorFilename);
+	}
+	else
+	{
+		CLineReader LineReader;
+		LineReader.Init(File);
+		char *pLine;
+		while((pLine = LineReader.Get()))
+		{
+			m_vCensorlist.emplace_back(pLine);
+		}
+		io_close(File);
+	}
+
+	m_TeeHistorianActive = g_Config.m_SvTeeHistorian;
+	if(m_TeeHistorianActive)
+	{
+		char aGameUuid[UUID_MAXSTRSIZE];
+		FormatUuid(m_GameUuid, aGameUuid, sizeof(aGameUuid));
+
+		char aFilename[IO_MAX_PATH_LENGTH];
+		str_format(aFilename, sizeof(aFilename), "teehistorian/%s.teehistorian", aGameUuid);
+
+		IOHANDLE THFile = Storage()->OpenFile(aFilename, IOFLAG_WRITE, IStorage::TYPE_SAVE);
+		if(!THFile)
+		{
+			dbg_msg("teehistorian", "failed to open '%s'", aFilename);
+			Server()->SetErrorShutdown("teehistorian open error");
+			return;
+		}
+		else
+		{
+			dbg_msg("teehistorian", "recording to '%s'", aFilename);
+		}
+		m_pTeeHistorianFile = aio_new(THFile);
+
+		char aVersion[128];
+		if(GIT_SHORTREV_HASH)
+		{
+			str_format(aVersion, sizeof(aVersion), "%s (%s)", GAME_VERSION, GIT_SHORTREV_HASH);
+		}
+		else
+		{
+			str_copy(aVersion, GAME_VERSION);
+		}
+		CTeeHistorian::CGameInfo GameInfo;
+		GameInfo.m_GameUuid = m_GameUuid;
+		GameInfo.m_pServerVersion = aVersion;
+		GameInfo.m_StartTime = time(0);
+		GameInfo.m_pPrngDescription = m_Prng.Description();
+
+		GameInfo.m_pServerName = g_Config.m_SvName;
+		GameInfo.m_ServerPort = Server()->Port();
+		GameInfo.m_pGameType = m_pController->m_pGameType;
+
+		GameInfo.m_pConfig = &g_Config;
+		GameInfo.m_pTuning = Tuning();
+		GameInfo.m_pUuids = &g_UuidManager;
+
+		GameInfo.m_pMapName = aMapName;
+		GameInfo.m_MapSize = MapSize;
+		GameInfo.m_MapSha256 = MapSha256;
+		GameInfo.m_MapCrc = MapCrc;
+
+		if(pPersistent)
+		{
+			GameInfo.m_HavePrevGameUuid = true;
+			GameInfo.m_PrevGameUuid = pPersistent->m_PrevGameUuid;
+		}
+		else
+		{
+			GameInfo.m_HavePrevGameUuid = false;
+			mem_zero(&GameInfo.m_PrevGameUuid, sizeof(GameInfo.m_PrevGameUuid));
+		}
+
+		m_TeeHistorian.Reset(&GameInfo, TeeHistorianWrite, this);
+
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			int Level = Server()->GetAuthedState(i);
+			if(Level)
+			{
+				m_TeeHistorian.RecordAuthInitial(i, Level, Server()->GetAuthName(i));
+			}
+		}
+	}
+
+	if(!m_pScore)
+	{
+		m_pScore = new CScore(this, ((CServer *)Server())->DbPool());
+	}
+
+	// create all entities from the game layer
+	CreateAllEntities(true);
+
+	if(GIT_SHORTREV_HASH)
+		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "git-revision", GIT_SHORTREV_HASH);
+
+	m_pAntibot->RoundStart(this);
+}
+
+void CGameContext::CreateAllEntities(bool Initial)
+{
+	const CMapItemLayerTilemap *pTileMap = m_Layers.GameLayer();
+	const CTile *pTiles = static_cast<CTile *>(Kernel()->RequestInterface<IMap>()->GetData(pTileMap->m_Data));
+
+	const CTile *pFront = nullptr;
+	if(m_Layers.FrontLayer())
+		pFront = static_cast<CTile *>(Kernel()->RequestInterface<IMap>()->GetData(m_Layers.FrontLayer()->m_Front));
+
+	const CSwitchTile *pSwitch = nullptr;
+	if(m_Layers.SwitchLayer())
+		pSwitch = static_cast<CSwitchTile *>(Kernel()->RequestInterface<IMap>()->GetData(m_Layers.SwitchLayer()->m_Switch));
+
+	for(int y = 0; y < pTileMap->m_Height; y++)
+	{
+		for(int x = 0; x < pTileMap->m_Width; x++)
+		{
+			const int Index = y * pTileMap->m_Width + x;
+
+			// Game layer
+			{
+				const int GameIndex = pTiles[Index].m_Index;
+				if(GameIndex == TILE_OLDLASER)
+				{
+					g_Config.m_SvOldLaser = 1;
+					dbg_msg("game_layer", "found old laser tile");
+				}
+				else if(GameIndex == TILE_NPC)
+				{
+					m_Tuning.Set("player_collision", 0);
+					dbg_msg("game_layer", "found no collision tile");
+				}
+				else if(GameIndex == TILE_EHOOK)
+				{
+					g_Config.m_SvEndlessDrag = 1;
+					dbg_msg("game_layer", "found unlimited hook time tile");
+				}
+				else if(GameIndex == TILE_NOHIT)
+				{
+					g_Config.m_SvHit = 0;
+					dbg_msg("game_layer", "found no weapons hitting others tile");
+				}
+				else if(GameIndex == TILE_NPH)
+				{
+					m_Tuning.Set("player_hooking", 0);
+					dbg_msg("game_layer", "found no player hooking tile");
+				}
+				else if(GameIndex >= ENTITY_OFFSET)
+				{
+					m_pController->OnEntity(GameIndex - ENTITY_OFFSET, x, y, LAYER_GAME, pTiles[Index].m_Flags, Initial);
+				}
+			}
+
+			if(pFront)
+			{
+				const int FrontIndex = pFront[Index].m_Index;
+				if(FrontIndex == TILE_OLDLASER)
+				{
+					g_Config.m_SvOldLaser = 1;
+					dbg_msg("front_layer", "found old laser tile");
+				}
+				else if(FrontIndex == TILE_NPC)
+				{
+					m_Tuning.Set("player_collision", 0);
+					dbg_msg("front_layer", "found no collision tile");
+				}
+				else if(FrontIndex == TILE_EHOOK)
+				{
+					g_Config.m_SvEndlessDrag = 1;
+					dbg_msg("front_layer", "found unlimited hook time tile");
+				}
+				else if(FrontIndex == TILE_NOHIT)
+				{
+					g_Config.m_SvHit = 0;
+					dbg_msg("front_layer", "found no weapons hitting others tile");
+				}
+				else if(FrontIndex == TILE_NPH)
+				{
+					m_Tuning.Set("player_hooking", 0);
+					dbg_msg("front_layer", "found no player hooking tile");
+				}
+				else if(FrontIndex >= ENTITY_OFFSET)
+				{
+					m_pController->OnEntity(FrontIndex - ENTITY_OFFSET, x, y, LAYER_FRONT, pFront[Index].m_Flags, Initial);
+				}
+			}
+
+			if(pSwitch)
+			{
+				const int SwitchType = pSwitch[Index].m_Type;
+				// TODO: Add off by default door here
+				// if(SwitchType == TILE_DOOR_OFF)
+				if(SwitchType >= ENTITY_OFFSET)
+				{
+					m_pController->OnEntity(SwitchType - ENTITY_OFFSET, x, y, LAYER_SWITCH, pSwitch[Index].m_Flags, Initial, pSwitch[Index].m_Number);
+				}
+			}
+		}
+	}
+}
+
+void CGameContext::DeleteTempfile()
+{
+	if(m_aDeleteTempfile[0] != 0)
+	{
+		Storage()->RemoveFile(m_aDeleteTempfile, IStorage::TYPE_SAVE);
+		m_aDeleteTempfile[0] = 0;
+	}
+}
+
+void CGameContext::OnMapChange(char *pNewMapName, int MapNameSize)
+{
+	char aConfig[IO_MAX_PATH_LENGTH];
+	str_format(aConfig, sizeof(aConfig), "maps/%s.cfg", g_Config.m_SvMap);
+
+	IOHANDLE File = Storage()->OpenFile(aConfig, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(!File)
+	{
+		// No map-specific config, just return.
+		return;
+	}
+	CLineReader LineReader;
+	LineReader.Init(File);
+
+	std::vector<char *> vLines;
+	char *pLine;
+	int TotalLength = 0;
+	while((pLine = LineReader.Get()))
+	{
+		int Length = str_length(pLine) + 1;
+		char *pCopy = (char *)malloc(Length);
+		mem_copy(pCopy, pLine, Length);
+		vLines.push_back(pCopy);
+		TotalLength += Length;
+	}
+	io_close(File);
+
+	char *pSettings = (char *)malloc(maximum(1, TotalLength));
+	int Offset = 0;
+	for(auto &Line : vLines)
+	{
+		int Length = str_length(Line) + 1;
+		mem_copy(pSettings + Offset, Line, Length);
+		Offset += Length;
+		free(Line);
+	}
+
+	CDataFileReader Reader;
+	Reader.Open(Storage(), pNewMapName, IStorage::TYPE_ALL);
+
+	CDataFileWriter Writer;
+
+	int SettingsIndex = Reader.NumData();
+	bool FoundInfo = false;
+	for(int i = 0; i < Reader.NumItems(); i++)
+	{
+		int TypeID;
+		int ItemID;
+		void *pData = Reader.GetItem(i, &TypeID, &ItemID);
+		int Size = Reader.GetItemSize(i);
+		CMapItemInfoSettings MapInfo;
+		if(TypeID == MAPITEMTYPE_INFO && ItemID == 0)
+		{
+			FoundInfo = true;
+			if(Size >= (int)sizeof(CMapItemInfoSettings))
+			{
+				CMapItemInfoSettings *pInfo = (CMapItemInfoSettings *)pData;
+				if(pInfo->m_Settings > -1)
+				{
+					SettingsIndex = pInfo->m_Settings;
+					char *pMapSettings = (char *)Reader.GetData(SettingsIndex);
+					int DataSize = Reader.GetDataSize(SettingsIndex);
+					if(DataSize == TotalLength && mem_comp(pSettings, pMapSettings, DataSize) == 0)
+					{
+						// Configs coincide, no need to update map.
+						free(pSettings);
+						return;
+					}
+					Reader.UnloadData(pInfo->m_Settings);
+				}
+				else
+				{
+					MapInfo = *pInfo;
+					MapInfo.m_Settings = SettingsIndex;
+					pData = &MapInfo;
+					Size = sizeof(MapInfo);
+				}
+			}
+			else
+			{
+				*(CMapItemInfo *)&MapInfo = *(CMapItemInfo *)pData;
+				MapInfo.m_Settings = SettingsIndex;
+				pData = &MapInfo;
+				Size = sizeof(MapInfo);
+			}
+		}
+		Writer.AddItem(TypeID, ItemID, Size, pData);
+	}
+
+	if(!FoundInfo)
+	{
+		CMapItemInfoSettings Info;
+		Info.m_Version = 1;
+		Info.m_Author = -1;
+		Info.m_MapVersion = -1;
+		Info.m_Credits = -1;
+		Info.m_License = -1;
+		Info.m_Settings = SettingsIndex;
+		Writer.AddItem(MAPITEMTYPE_INFO, 0, sizeof(Info), &Info);
+	}
+
+	for(int i = 0; i < Reader.NumData() || i == SettingsIndex; i++)
+	{
+		if(i == SettingsIndex)
+		{
+			Writer.AddData(TotalLength, pSettings);
+			continue;
+		}
+		const void *pData = Reader.GetData(i);
+		int Size = Reader.GetDataSize(i);
+		Writer.AddData(Size, pData);
+		Reader.UnloadData(i);
+	}
+
+	dbg_msg("mapchange", "imported settings");
+	free(pSettings);
+	Reader.Close();
+	char aTemp[IO_MAX_PATH_LENGTH];
+	Writer.Open(Storage(), IStorage::FormatTmpPath(aTemp, sizeof(aTemp), pNewMapName));
+	Writer.Finish();
+
+	str_copy(pNewMapName, aTemp, MapNameSize);
+	str_copy(m_aDeleteTempfile, aTemp, sizeof(m_aDeleteTempfile));
+}
+
+void CGameContext::OnShutdown(void *pPersistentData)
+{
+	CPersistentData *pPersistent = (CPersistentData *)pPersistentData;
+
+	if(pPersistent)
+	{
+		pPersistent->m_PrevGameUuid = m_GameUuid;
+	}
+
+	Antibot()->RoundEnd();
+
+	if(m_TeeHistorianActive)
+	{
+		m_TeeHistorian.Finish();
+		aio_close(m_pTeeHistorianFile);
+		aio_wait(m_pTeeHistorianFile);
+		int Error = aio_error(m_pTeeHistorianFile);
+		if(Error)
+		{
+			dbg_msg("teehistorian", "error closing file, err=%d", Error);
+			Server()->SetErrorShutdown("teehistorian close error");
+		}
+		aio_free(m_pTeeHistorianFile);
+	}
+
+	// Stop any demos being recorded.
+	Server()->StopDemos();
+
+	DeleteTempfile();
+	ConfigManager()->ResetGameSettings();
+	Collision()->Dest();
+	delete m_pController;
+	m_pController = 0;
+	Clear();
+}
+
+void CGameContext::LoadMapSettings()
+{
+	IMap *pMap = Kernel()->RequestInterface<IMap>();
+	int Start, Num;
+	pMap->GetType(MAPITEMTYPE_INFO, &Start, &Num);
+	for(int i = Start; i < Start + Num; i++)
+	{
+		int ItemID;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)pMap->GetItem(i, nullptr, &ItemID);
+		int ItemSize = pMap->GetItemSize(i);
+		if(!pItem || ItemID != 0)
+			continue;
+
+		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
+			break;
+		if(!(pItem->m_Settings > -1))
+			break;
+
+		int Size = pMap->GetDataSize(pItem->m_Settings);
+		char *pSettings = (char *)pMap->GetData(pItem->m_Settings);
+		char *pNext = pSettings;
+		while(pNext < pSettings + Size)
+		{
+			int StrSize = str_length(pNext) + 1;
+			Console()->ExecuteLine(pNext, IConsole::CLIENT_ID_GAME);
+			pNext += StrSize;
+		}
+		pMap->UnloadData(pItem->m_Settings);
+		break;
+	}
+
+	char aBuf[IO_MAX_PATH_LENGTH];
+	str_format(aBuf, sizeof(aBuf), "maps/%s.map.cfg", g_Config.m_SvMap);
+	Console()->ExecuteFile(aBuf, IConsole::CLIENT_ID_NO_GAME);
+}
+
+void CGameContext::OnSnap(int ClientID)
+{
+	// add tuning to demo
+	CTuningParams StandardTuning;
+	if(Server()->IsRecording(ClientID > -1 ? ClientID : MAX_CLIENTS) && mem_comp(&StandardTuning, &m_Tuning, sizeof(CTuningParams)) != 0)
+	{
+		CMsgPacker Msg(NETMSGTYPE_SV_TUNEPARAMS);
+		int *pParams = (int *)&m_Tuning;
+		for(unsigned i = 0; i < sizeof(m_Tuning) / sizeof(int); i++)
+			Msg.AddInt(pParams[i]);
+		Server()->SendMsg(&Msg, MSGFLAG_RECORD | MSGFLAG_NOSEND, ClientID);
+	}
+
+	m_pController->Snap(ClientID);
+
+	for(auto &pPlayer : m_apPlayers)
+	{
+		if(pPlayer)
+			pPlayer->Snap(ClientID);
+	}
+
+	if(ClientID > -1)
+		m_apPlayers[ClientID]->FakeSnap();
+
+	m_World.Snap(ClientID);
+	m_Events.Snap(ClientID);
+}
+void CGameContext::OnPreSnap() {}
+void CGameContext::OnPostSnap()
+{
+	m_Events.Clear();
+}
+
+void CGameContext::UpdatePlayerMaps()
+{
+	const auto DistCompare = [](std::pair<float, int> a, std::pair<float, int> b) -> bool {
+		return (a.first < b.first);
+	};
+
+	if(Server()->Tick() % g_Config.m_SvMapUpdateRate != 0)
+		return;
+
+	std::pair<float, int> Dist[MAX_CLIENTS];
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(!Server()->ClientIngame(i))
+			continue;
+		if(Server()->GetClientVersion(i) >= VERSION_DDNET_OLD)
+			continue;
+		int *pMap = Server()->GetIdMap(i);
+
+		// compute distances
+		for(int j = 0; j < MAX_CLIENTS; j++)
+		{
+			Dist[j].second = j;
+			if(j == i)
+				continue;
+			if(!Server()->ClientIngame(j) || !m_apPlayers[j])
+			{
+				Dist[j].first = 1e10;
+				continue;
+			}
+			CCharacter *pChr = m_apPlayers[j]->GetCharacter();
+			if(!pChr)
+			{
+				Dist[j].first = 1e9;
+				continue;
+			}
+			if(!pChr->CanSnapCharacter(i))
+				Dist[j].first = 1e8;
+			else
+				Dist[j].first = length_squared(m_apPlayers[i]->m_ViewPos - pChr->GetPos());
+		}
+
+		// always send the player themselves, even if all in same position
+		Dist[i].first = -1;
+
+		std::nth_element(&Dist[0], &Dist[VANILLA_MAX_CLIENTS - 1], &Dist[MAX_CLIENTS], DistCompare);
+
+		int Index = 1; // exclude self client id
+		for(int j = 0; j < VANILLA_MAX_CLIENTS - 1; j++)
+		{
+			pMap[j + 1] = -1; // also fill player with empty name to say chat msgs
+			if(Dist[j].second == i || Dist[j].first > 5e9f)
+				continue;
+			pMap[Index++] = Dist[j].second;
+		}
+
+		// sort by real client ids, guarantee order on distance changes, O(Nlog(N)) worst case
+		// sort just clients in game always except first (self client id) and last (fake client id) indexes
+		std::sort(&pMap[1], &pMap[minimum(Index, VANILLA_MAX_CLIENTS - 1)]);
+	}
+}
+
+bool CGameContext::IsClientReady(int ClientID) const
+{
+	return m_apPlayers[ClientID] && m_apPlayers[ClientID]->m_IsReady;
+}
+
+bool CGameContext::IsClientPlayer(int ClientID) const
+{
+	return m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetTeam() != TEAM_SPECTATORS;
+}
+
+CUuid CGameContext::GameUuid() const { return m_GameUuid; }
+const char *CGameContext::GameType() const { return m_pController && m_pController->m_pGameType ? m_pController->m_pGameType : ""; }
+const char *CGameContext::Version() const { return GAME_VERSION; }
+const char *CGameContext::NetVersion() const { return GAME_NETVERSION; }
+
+IGameServer *CreateGameServer() { return new CGameContext; }
+
+void CGameContext::OnSetAuthed(int ClientID, int Level)
+{
+	if(m_apPlayers[ClientID])
+	{
+		char aBuf[512], aIP[NETADDR_MAXSTRSIZE];
+		Server()->GetClientAddr(ClientID, aIP, sizeof(aIP));
+		str_format(aBuf, sizeof(aBuf), "ban %s %d Banned by vote", aIP, g_Config.m_SvVoteKickBantime);
+		if(!str_comp_nocase(m_aVoteCommand, aBuf) && Level > Server()->GetAuthedState(m_VoteCreator))
+		{
+			m_VoteEnforce = CGameContext::VOTE_ENFORCE_NO_ADMIN;
+			Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "CGameContext", "Vote aborted by authorized login.");
+		}
+	}
+	if(m_TeeHistorianActive)
+	{
+		if(Level)
+		{
+			m_TeeHistorian.RecordAuthLogin(ClientID, Level, Server()->GetAuthName(ClientID));
+		}
+		else
+		{
+			m_TeeHistorian.RecordAuthLogout(ClientID);
+		}
+	}
+}
+
+void CGameContext::SendRecord(int ClientID)
+{
+	CNetMsg_Sv_Record Msg;
+	CNetMsg_Sv_RecordLegacy MsgLegacy;
+	MsgLegacy.m_PlayerTimeBest = Msg.m_PlayerTimeBest = Score()->PlayerData(ClientID)->m_BestTime * 100.0f;
+	MsgLegacy.m_ServerTimeBest = Msg.m_ServerTimeBest = m_pController->m_CurrentRecord * 100.0f; //TODO: finish this
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	if(!Server()->IsSixup(ClientID) && GetClientVersion(ClientID) < VERSION_DDNET_MSG_LEGACY)
+	{
+		Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+	}
+}
+
+bool CGameContext::ProcessSpamProtection(int ClientID, bool RespectChatInitialDelay)
+{
+	if(!m_apPlayers[ClientID])
+		return false;
+	if(g_Config.m_SvSpamprotection && m_apPlayers[ClientID]->m_LastChat && m_apPlayers[ClientID]->m_LastChat + Server()->TickSpeed() * g_Config.m_SvChatDelay > Server()->Tick())
+		return true;
+	else if(g_Config.m_SvDnsblChat && Server()->DnsblBlack(ClientID))
+	{
+		SendChatTarget(ClientID, "Players are not allowed to chat from VPNs at this time");
+		return true;
+	}
+	else
+		m_apPlayers[ClientID]->m_LastChat = Server()->Tick();
+
+	NETADDR Addr;
+	Server()->GetClientAddr(ClientID, &Addr);
+
+	CMute Muted;
+	int Expires = 0;
+	for(int i = 0; i < m_NumMutes && Expires <= 0; i++)
+	{
+		if(!net_addr_comp_noport(&Addr, &m_aMutes[i].m_Addr))
+		{
+			if(RespectChatInitialDelay || m_aMutes[i].m_InitialChatDelay)
+			{
+				Muted = m_aMutes[i];
+				Expires = (m_aMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
+			}
+		}
+	}
+
+	if(Expires > 0)
+	{
+		char aBuf[128];
+		if(Muted.m_InitialChatDelay)
+			str_format(aBuf, sizeof(aBuf), "This server has an initial chat delay, you will be able to talk in %d seconds.", Expires);
+		else
+			str_format(aBuf, sizeof(aBuf), "You are not permitted to talk for the next %d seconds.", Expires);
+		SendChatTarget(ClientID, aBuf);
+		return true;
+	}
+
+	if(g_Config.m_SvSpamMuteDuration && (m_apPlayers[ClientID]->m_ChatScore += g_Config.m_SvChatPenalty) > g_Config.m_SvChatThreshold)
+	{
+		Mute(&Addr, g_Config.m_SvSpamMuteDuration, Server()->ClientName(ClientID));
+		m_apPlayers[ClientID]->m_ChatScore = 0;
+		return true;
+	}
+
+	return false;
+}
+
+int CGameContext::GetDDRaceTeam(int ClientID) const
+{
+	return m_pController->Teams().m_Core.Team(ClientID);
+}
+
+void CGameContext::ResetTuning()
+{
+	CTuningParams TuningParams;
+	m_Tuning = TuningParams;
+	Tuning()->Set("gun_speed", 1400);
+	Tuning()->Set("gun_curvature", 0);
+	Tuning()->Set("shotgun_speed", 500);
+	Tuning()->Set("shotgun_speeddiff", 0);
+	Tuning()->Set("shotgun_curvature", 0);
+	SendTuningParams(-1);
+}
+
+bool CheckClientID2(int ClientID)
+{
+	return ClientID >= 0 && ClientID < MAX_CLIENTS;
+}
+
+void CGameContext::Whisper(int ClientID, char *pStr)
+{
+	if(ProcessSpamProtection(ClientID))
+		return;
+
+	pStr = str_skip_whitespaces(pStr);
+
+	char *pName;
+	int Victim;
+	bool Error = false;
+
+	// add token
+	if(*pStr == '"')
+	{
+		pStr++;
+
+		pName = pStr;
+		char *pDst = pStr; // we might have to process escape data
+		while(true)
+		{
+			if(pStr[0] == '"')
+			{
+				break;
+			}
+			else if(pStr[0] == '\\')
+			{
+				if(pStr[1] == '\\')
+					pStr++; // skip due to escape
+				else if(pStr[1] == '"')
+					pStr++; // skip due to escape
+			}
+			else if(pStr[0] == 0)
+			{
+				Error = true;
+				break;
+			}
+
+			*pDst = *pStr;
+			pDst++;
+			pStr++;
+		}
+
+		if(!Error)
+		{
+			// write null termination
+			*pDst = 0;
+
+			pStr++;
+
+			for(Victim = 0; Victim < MAX_CLIENTS; Victim++)
+				if(str_comp(pName, Server()->ClientName(Victim)) == 0)
+					break;
+		}
+	}
+	else
+	{
+		pName = pStr;
+		while(true)
+		{
+			if(pStr[0] == 0)
+			{
+				Error = true;
+				break;
+			}
+			if(pStr[0] == ' ')
+			{
+				pStr[0] = 0;
+				for(Victim = 0; Victim < MAX_CLIENTS; Victim++)
+					if(str_comp(pName, Server()->ClientName(Victim)) == 0)
+						break;
+
+				pStr[0] = ' ';
+
+				if(Victim < MAX_CLIENTS)
+					break;
+			}
+			pStr++;
+		}
+	}
+
+	if(pStr[0] != ' ')
+	{
+		Error = true;
+	}
+
+	*pStr = 0;
+	pStr++;
+
+	if(Error)
+	{
+		SendChatTarget(ClientID, "Invalid whisper");
+		return;
+	}
+
+	if(Victim >= MAX_CLIENTS || !CheckClientID2(Victim))
+	{
+		char aBuf[256];
+		str_format(aBuf, sizeof(aBuf), "No player with name \"%s\" found", pName);
+		SendChatTarget(ClientID, aBuf);
+		return;
+	}
+
+	WhisperID(ClientID, Victim, pStr);
+}
+
+void CGameContext::WhisperID(int ClientID, int VictimID, const char *pMessage)
+{
+	if(!CheckClientID2(ClientID))
+		return;
+
+	if(!CheckClientID2(VictimID))
+		return;
+
+	if(m_apPlayers[ClientID])
+		m_apPlayers[ClientID]->m_LastWhisperTo = VictimID;
+
+	char aCensoredMessage[256];
+	CensorMessage(aCensoredMessage, pMessage, sizeof(aCensoredMessage));
+
+	char aBuf[256];
+
+	if(Server()->IsSixup(ClientID))
+	{
+		protocol7::CNetMsg_Sv_Chat Msg;
+		Msg.m_ClientID = ClientID;
+		Msg.m_Mode = protocol7::CHAT_WHISPER;
+		Msg.m_pMessage = aCensoredMessage;
+		Msg.m_TargetID = VictimID;
+
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+	}
+	else if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER)
+	{
+		CNetMsg_Sv_Chat Msg;
+		Msg.m_Team = CHAT_WHISPER_SEND;
+		Msg.m_ClientID = VictimID;
+		Msg.m_pMessage = aCensoredMessage;
+		if(g_Config.m_SvDemoChat)
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+		else
+			Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, ClientID);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf), "[→ %s] %s", Server()->ClientName(VictimID), aCensoredMessage);
+		SendChatTarget(ClientID, aBuf);
+	}
+
+	if(Server()->IsSixup(VictimID))
+	{
+		protocol7::CNetMsg_Sv_Chat Msg;
+		Msg.m_ClientID = ClientID;
+		Msg.m_Mode = protocol7::CHAT_WHISPER;
+		Msg.m_pMessage = aCensoredMessage;
+		Msg.m_TargetID = VictimID;
+
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimID);
+	}
+	else if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER)
+	{
+		CNetMsg_Sv_Chat Msg2;
+		Msg2.m_Team = CHAT_WHISPER_RECV;
+		Msg2.m_ClientID = ClientID;
+		Msg2.m_pMessage = aCensoredMessage;
+		if(g_Config.m_SvDemoChat)
+			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL, VictimID);
+		else
+			Server()->SendPackMsg(&Msg2, MSGFLAG_VITAL | MSGFLAG_NORECORD, VictimID);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf), "[← %s] %s", Server()->ClientName(ClientID), aCensoredMessage);
+		SendChatTarget(VictimID, aBuf);
+	}
+}
+
+void CGameContext::Converse(int ClientID, char *pStr)
+{
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+	if(!pPlayer)
+		return;
+
+	if(ProcessSpamProtection(ClientID))
+		return;
+
+	if(pPlayer->m_LastWhisperTo < 0)
+		SendChatTarget(ClientID, "You do not have an ongoing conversation. Whisper to someone to start one");
+	else
+	{
+		WhisperID(ClientID, pPlayer->m_LastWhisperTo, pStr);
+	}
+}
+
+bool CGameContext::IsVersionBanned(int Version)
+{
+	char aVersion[16];
+	str_from_int(Version, aVersion);
+
+	return str_in_list(g_Config.m_SvBannedVersions, ",", aVersion);
+}
+
+void CGameContext::List(int ClientID, const char *pFilter)
+{
+	int Total = 0;
+	char aBuf[256];
+	int Bufcnt = 0;
+	if(pFilter[0])
+		str_format(aBuf, sizeof(aBuf), "Listing players with \"%s\" in name:", pFilter);
+	else
+		str_copy(aBuf, "Listing all players:");
+	SendChatTarget(ClientID, aBuf);
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_apPlayers[i])
+		{
+			Total++;
+			const char *pName = Server()->ClientName(i);
+			if(str_utf8_find_nocase(pName, pFilter) == NULL)
+				continue;
+			if(Bufcnt + str_length(pName) + 4 > 256)
+			{
+				SendChatTarget(ClientID, aBuf);
+				Bufcnt = 0;
+			}
+			if(Bufcnt != 0)
+			{
+				str_format(&aBuf[Bufcnt], sizeof(aBuf) - Bufcnt, ", %s", pName);
+				Bufcnt += 2 + str_length(pName);
+			}
+			else
+			{
+				str_copy(&aBuf[Bufcnt], pName, sizeof(aBuf) - Bufcnt);
+				Bufcnt += str_length(pName);
+			}
+		}
+	}
+	if(Bufcnt != 0)
+		SendChatTarget(ClientID, aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d players online", Total);
+	SendChatTarget(ClientID, aBuf);
+}
+
+int CGameContext::GetClientVersion(int ClientID) const
+{
+	return Server()->GetClientVersion(ClientID);
+}
+
+CClientMask CGameContext::ClientsMaskExcludeClientVersionAndHigher(int Version) const
+{
+	CClientMask Mask;
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(GetClientVersion(i) >= Version)
+			continue;
+		Mask.set(i);
+	}
+	return Mask;
+}
+
+bool CGameContext::PlayerModerating() const
+{
+	return std::any_of(std::begin(m_apPlayers), std::end(m_apPlayers), [](const CPlayer *pPlayer) { return pPlayer && pPlayer->m_Moderating; });
+}
+
+void CGameContext::ForceVote(int EnforcerID, bool Success)
+{
+	// check if there is a vote running
+	if(!m_VoteCloseTime)
+		return;
+
+	m_VoteEnforce = Success ? CGameContext::VOTE_ENFORCE_YES_ADMIN : CGameContext::VOTE_ENFORCE_NO_ADMIN;
+	m_VoteEnforcer = EnforcerID;
+
+	char aBuf[256];
+	const char *pOption = Success ? "yes" : "no";
+	str_format(aBuf, sizeof(aBuf), "authorized player forced vote %s", pOption);
+	SendChatTarget(-1, aBuf);
+	str_format(aBuf, sizeof(aBuf), "forcing vote %s", pOption);
+	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
+}
+
+bool CGameContext::RateLimitPlayerVote(int ClientID)
+{
+	int64_t Now = Server()->Tick();
+	int64_t TickSpeed = Server()->TickSpeed();
+	CPlayer *pPlayer = m_apPlayers[ClientID];
+
+	if(g_Config.m_SvRconVote && !Server()->GetAuthedState(ClientID))
+	{
+		SendChatTarget(ClientID, "You can only vote after logging in.");
+		return true;
+	}
+
+	if(g_Config.m_SvDnsblVote && Server()->DistinctClientCount() > 1)
+	{
+		if(m_pServer->DnsblPending(ClientID))
+		{
+			SendChatTarget(ClientID, "You are not allowed to vote because we're currently checking for VPNs. Try again in ~30 seconds.");
+			return true;
+		}
+		else if(m_pServer->DnsblBlack(ClientID))
+		{
+			SendChatTarget(ClientID, "You are not allowed to vote because you appear to be using a VPN. Try connecting without a VPN or contacting an admin if you think this is a mistake.");
+			return true;
+		}
+	}
+
+	if(g_Config.m_SvSpamprotection && pPlayer->m_LastVoteTry && pPlayer->m_LastVoteTry + TickSpeed * 3 > Now)
+		return true;
+
+	pPlayer->m_LastVoteTry = Now;
+	if(m_VoteCloseTime)
+	{
+		SendChatTarget(ClientID, "Wait for current vote to end before calling a new one.");
+		return true;
+	}
+
+	if(Now < pPlayer->m_FirstVoteTick)
+	{
+		char aBuf[64];
+		str_format(aBuf, sizeof(aBuf), "You must wait %d seconds before making your first vote.", (int)((pPlayer->m_FirstVoteTick - Now) / TickSpeed) + 1);
+		SendChatTarget(ClientID, aBuf);
+		return true;
+	}
+
+	int TimeLeft = pPlayer->m_LastVoteCall + TickSpeed * g_Config.m_SvVoteDelay - Now;
+	if(pPlayer->m_LastVoteCall && TimeLeft > 0)
+	{
+		char aChatmsg[64];
+		str_format(aChatmsg, sizeof(aChatmsg), "You must wait %d seconds before making another vote.", (int)(TimeLeft / TickSpeed) + 1);
+		SendChatTarget(ClientID, aChatmsg);
+		return true;
+	}
+
+	NETADDR Addr;
+	Server()->GetClientAddr(ClientID, &Addr);
+	int VoteMuted = 0;
+	for(int i = 0; i < m_NumVoteMutes && !VoteMuted; i++)
+		if(!net_addr_comp_noport(&Addr, &m_aVoteMutes[i].m_Addr))
+			VoteMuted = (m_aVoteMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
+	for(int i = 0; i < m_NumMutes && VoteMuted == 0; i++)
+	{
+		if(!net_addr_comp_noport(&Addr, &m_aMutes[i].m_Addr))
+			VoteMuted = (m_aMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
+	}
+	if(VoteMuted > 0)
+	{
+		char aChatmsg[64];
+		str_format(aChatmsg, sizeof(aChatmsg), "You are not permitted to vote for the next %d seconds.", VoteMuted);
+		SendChatTarget(ClientID, aChatmsg);
+		return true;
+	}
+	return false;
+}
+
+bool CGameContext::RateLimitPlayerMapVote(int ClientID) const
+{
+	if(!Server()->GetAuthedState(ClientID) && time_get() < m_LastMapVote + (time_freq() * g_Config.m_SvVoteMapTimeDelay))
+	{
+		char aChatmsg[512] = {0};
+		str_format(aChatmsg, sizeof(aChatmsg), "There's a %d second delay between map-votes, please wait %d seconds.",
+			g_Config.m_SvVoteMapTimeDelay, (int)((m_LastMapVote + g_Config.m_SvVoteMapTimeDelay * time_freq() - time_get()) / time_freq()));
+		SendChatTarget(ClientID, aChatmsg);
+		return true;
+	}
+	return false;
+}
+
+void CGameContext::OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID)
+{
+	if(BufSize <= 0)
+		return;
+
+	aBuf[0] = '\0';
+
+	if(!m_apPlayers[ID])
+		return;
+
+	char aCSkinName[64];
+
+	CTeeInfo &TeeInfo = m_apPlayers[ID]->m_TeeInfos;
+
+	char aJsonSkin[400];
+	aJsonSkin[0] = '\0';
+
+	if(!Server()->IsSixup(ID))
+	{
+		// 0.6
+		if(TeeInfo.m_UseCustomColor)
+		{
+			str_format(aJsonSkin, sizeof(aJsonSkin),
+				"\"name\":\"%s\","
+				"\"color_body\":%d,"
+				"\"color_feet\":%d",
+				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_aSkinName),
+				TeeInfo.m_ColorBody,
+				TeeInfo.m_ColorFeet);
+		}
+		else
+		{
+			str_format(aJsonSkin, sizeof(aJsonSkin),
+				"\"name\":\"%s\"",
+				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_aSkinName));
+		}
+	}
+	else
+	{
+		const char *apPartNames[protocol7::NUM_SKINPARTS] = {"body", "marking", "decoration", "hands", "feet", "eyes"};
+		char aPartBuf[64];
+
+		for(int i = 0; i < protocol7::NUM_SKINPARTS; ++i)
+		{
+			str_format(aPartBuf, sizeof(aPartBuf),
+				"%s\"%s\":{"
+				"\"name\":\"%s\"",
+				i == 0 ? "" : ",",
+				apPartNames[i],
+				EscapeJson(aCSkinName, sizeof(aCSkinName), TeeInfo.m_apSkinPartNames[i]));
+
+			str_append(aJsonSkin, aPartBuf);
+
+			if(TeeInfo.m_aUseCustomColors[i])
+			{
+				str_format(aPartBuf, sizeof(aPartBuf),
+					",\"color\":%d",
+					TeeInfo.m_aSkinPartColors[i]);
+				str_append(aJsonSkin, aPartBuf);
+			}
+			str_append(aJsonSkin, "}");
+		}
+	}
+
+	str_format(aBuf, BufSize,
+		",\"skin\":{"
+		"%s"
+		"},"
+		"\"afk\":%s,"
+		"\"team\":%d",
+		aJsonSkin,
+		JsonBool(m_apPlayers[ID]->IsAfk()),
+		m_apPlayers[ID]->GetTeam());
+}
diff --git a/src_bkp/game/server/gamecontext.h b/src_bkp/game/server/gamecontext.h
new file mode 100644
index 0000000000..67a2a37597
--- /dev/null
+++ b/src_bkp/game/server/gamecontext.h
@@ -0,0 +1,559 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_GAMECONTEXT_H
+#define GAME_SERVER_GAMECONTEXT_H
+
+#include <engine/console.h>
+#include <engine/server.h>
+
+#include <game/collision.h>
+#include <game/generated/protocol.h>
+#include <game/layers.h>
+#include <game/mapbugs.h>
+#include <game/voting.h>
+
+#include "eventhandler.h"
+#include "gameworld.h"
+#include "teehistorian.h"
+
+#include <memory>
+#include <string>
+
+/*
+	Tick
+		Game Context (CGameContext::tick)
+			Game World (GAMEWORLD::tick)
+				Reset world if requested (GAMEWORLD::reset)
+				All entities in the world (ENTITY::tick)
+				All entities in the world (ENTITY::tick_defered)
+				Remove entities marked for deletion (GAMEWORLD::remove_entities)
+			Game Controller (GAMECONTROLLER::tick)
+			All players (CPlayer::tick)
+
+
+	Snap
+		Game Context (CGameContext::snap)
+			Game World (GAMEWORLD::snap)
+				All entities in the world (ENTITY::snap)
+			Game Controller (GAMECONTROLLER::snap)
+			Events handler (EVENT_HANDLER::snap)
+			All players (CPlayer::snap)
+
+*/
+
+enum
+{
+	NUM_TUNEZONES = 256
+};
+
+class CCharacter;
+class IConfigManager;
+class CConfig;
+class CHeap;
+class CPlayer;
+class CScore;
+class CUnpacker;
+class IAntibot;
+class IGameController;
+class IEngine;
+class IStorage;
+struct CAntibotRoundData;
+struct CScoreRandomMapResult;
+
+struct CSnapContext
+{
+	CSnapContext(int Version, bool Sixup = false) :
+		m_ClientVersion(Version), m_Sixup(Sixup)
+	{
+	}
+
+	int GetClientVersion() const { return m_ClientVersion; }
+	bool IsSixup() const { return m_Sixup; }
+
+private:
+	int m_ClientVersion;
+	bool m_Sixup;
+};
+
+class CGameContext : public IGameServer
+{
+	IServer *m_pServer;
+	IConfigManager *m_pConfigManager;
+	CConfig *m_pConfig;
+	IConsole *m_pConsole;
+	IEngine *m_pEngine;
+	IStorage *m_pStorage;
+	IAntibot *m_pAntibot;
+	CLayers m_Layers;
+	CCollision m_Collision;
+	protocol7::CNetObjHandler m_NetObjHandler7;
+	CNetObjHandler m_NetObjHandler;
+	CTuningParams m_Tuning;
+	CTuningParams m_aTuningList[NUM_TUNEZONES];
+	std::vector<std::string> m_vCensorlist;
+
+	bool m_TeeHistorianActive;
+	CTeeHistorian m_TeeHistorian;
+	ASYNCIO *m_pTeeHistorianFile;
+	CUuid m_GameUuid;
+	CMapBugs m_MapBugs;
+	CPrng m_Prng;
+
+	bool m_Resetting;
+
+	static void CommandCallback(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult, void *pUser);
+	static void TeeHistorianWrite(const void *pData, int DataSize, void *pUser);
+
+	static void ConTuneParam(IConsole::IResult *pResult, void *pUserData);
+	static void ConToggleTuneParam(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneReset(IConsole::IResult *pResult, void *pUserData);
+	static void ConTunes(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneZone(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneDumpZone(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneResetZone(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneSetZoneMsgEnter(IConsole::IResult *pResult, void *pUserData);
+	static void ConTuneSetZoneMsgLeave(IConsole::IResult *pResult, void *pUserData);
+	static void ConMapbug(IConsole::IResult *pResult, void *pUserData);
+	static void ConSwitchOpen(IConsole::IResult *pResult, void *pUserData);
+	static void ConPause(IConsole::IResult *pResult, void *pUserData);
+	static void ConChangeMap(IConsole::IResult *pResult, void *pUserData);
+	static void ConRandomMap(IConsole::IResult *pResult, void *pUserData);
+	static void ConRandomUnfinishedMap(IConsole::IResult *pResult, void *pUserData);
+	static void ConRestart(IConsole::IResult *pResult, void *pUserData);
+	static void ConBroadcast(IConsole::IResult *pResult, void *pUserData);
+	static void ConSay(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetTeamAll(IConsole::IResult *pResult, void *pUserData);
+	static void ConAddVote(IConsole::IResult *pResult, void *pUserData);
+	static void ConRemoveVote(IConsole::IResult *pResult, void *pUserData);
+	static void ConForceVote(IConsole::IResult *pResult, void *pUserData);
+	static void ConClearVotes(IConsole::IResult *pResult, void *pUserData);
+	static void ConAddMapVotes(IConsole::IResult *pResult, void *pUserData);
+	static void ConVote(IConsole::IResult *pResult, void *pUserData);
+	static void ConVotes(IConsole::IResult *pResult, void *pUserData);
+	static void ConVoteNo(IConsole::IResult *pResult, void *pUserData);
+	static void ConDrySave(IConsole::IResult *pResult, void *pUserData);
+	static void ConDumpAntibot(IConsole::IResult *pResult, void *pUserData);
+	static void ConAntibot(IConsole::IResult *pResult, void *pUserData);
+	static void ConchainSpecialMotdupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConchainSettingUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void ConDumpLog(IConsole::IResult *pResult, void *pUserData);
+
+	void Construct(int Resetting);
+	void Destruct(int Resetting);
+	void AddVote(const char *pDescription, const char *pCommand);
+	static int MapScan(const char *pName, int IsDir, int DirType, void *pUserData);
+
+	struct CPersistentData
+	{
+		CUuid m_PrevGameUuid;
+	};
+
+	struct CPersistentClientData
+	{
+		bool m_IsSpectator;
+		bool m_IsAfk;
+	};
+
+public:
+	IServer *Server() const { return m_pServer; }
+	IConfigManager *ConfigManager() const { return m_pConfigManager; }
+	CConfig *Config() { return m_pConfig; }
+	IConsole *Console() { return m_pConsole; }
+	IEngine *Engine() { return m_pEngine; }
+	IStorage *Storage() { return m_pStorage; }
+	CCollision *Collision() { return &m_Collision; }
+	CTuningParams *Tuning() { return &m_Tuning; }
+	CTuningParams *TuningList() { return &m_aTuningList[0]; }
+	IAntibot *Antibot() { return m_pAntibot; }
+	CTeeHistorian *TeeHistorian() { return &m_TeeHistorian; }
+	bool TeeHistorianActive() const { return m_TeeHistorianActive; }
+
+	CGameContext();
+	CGameContext(int Reset);
+	~CGameContext();
+
+	void Clear();
+
+	CEventHandler m_Events;
+	CPlayer *m_apPlayers[MAX_CLIENTS];
+	// keep last input to always apply when none is sent
+	CNetObj_PlayerInput m_aLastPlayerInput[MAX_CLIENTS];
+	bool m_aPlayerHasInput[MAX_CLIENTS];
+
+	// returns last input if available otherwise nulled PlayerInput object
+	// ClientID has to be valid
+	CNetObj_PlayerInput GetLastPlayerInput(int ClientID) const;
+
+	IGameController *m_pController;
+	CGameWorld m_World;
+
+	// helper functions
+	class CCharacter *GetPlayerChar(int ClientID);
+	bool EmulateBug(int Bug);
+	std::vector<SSwitchers> &Switchers() { return m_World.m_Core.m_vSwitchers; }
+
+	// voting
+	void StartVote(const char *pDesc, const char *pCommand, const char *pReason, const char *pSixupDesc);
+	void EndVote();
+	void SendVoteSet(int ClientID);
+	void SendVoteStatus(int ClientID, int Total, int Yes, int No);
+	void AbortVoteKickOnDisconnect(int ClientID);
+
+	int m_VoteCreator;
+	int m_VoteType;
+	int64_t m_VoteCloseTime;
+	bool m_VoteUpdate;
+	int m_VotePos;
+	char m_aVoteDescription[VOTE_DESC_LENGTH];
+	char m_aSixupVoteDescription[VOTE_DESC_LENGTH];
+	char m_aVoteCommand[VOTE_CMD_LENGTH];
+	char m_aVoteReason[VOTE_REASON_LENGTH];
+	int m_NumVoteOptions;
+	int m_VoteEnforce;
+	char m_aaZoneEnterMsg[NUM_TUNEZONES][256]; // 0 is used for switching from or to area without tunings
+	char m_aaZoneLeaveMsg[NUM_TUNEZONES][256];
+
+	void CreateAllEntities(bool Initial);
+
+	char m_aDeleteTempfile[128];
+	void DeleteTempfile();
+
+	enum
+	{
+		VOTE_ENFORCE_UNKNOWN = 0,
+		VOTE_ENFORCE_NO,
+		VOTE_ENFORCE_YES,
+		VOTE_ENFORCE_ABORT,
+	};
+	CHeap *m_pVoteOptionHeap;
+	CVoteOptionServer *m_pVoteOptionFirst;
+	CVoteOptionServer *m_pVoteOptionLast;
+
+	// helper functions
+	void CreateDamageInd(vec2 Pos, float AngleMod, int Amount, CClientMask Mask = CClientMask().set());
+	void CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, CClientMask Mask = CClientMask().set());
+	void CreateHammerHit(vec2 Pos, CClientMask Mask = CClientMask().set());
+	void CreatePlayerSpawn(vec2 Pos, CClientMask Mask = CClientMask().set());
+	void CreateDeath(vec2 Pos, int ClientID, CClientMask Mask = CClientMask().set());
+	void CreateSound(vec2 Pos, int Sound, CClientMask Mask = CClientMask().set());
+	void CreateSoundGlobal(int Sound, int Target = -1) const;
+
+	void SnapSwitchers(int SnappingClient);
+	bool SnapLaserObject(const CSnapContext &Context, int SnapID, const vec2 &To, const vec2 &From, int StartTick, int Owner = -1, int LaserType = -1, int Subtype = -1, int SwitchNumber = -1) const;
+	bool SnapPickup(const CSnapContext &Context, int SnapID, const vec2 &Pos, int Type, int SubType, int SwitchNumber) const;
+
+	enum
+	{
+		CHAT_ALL = -2,
+		CHAT_SPEC = -1,
+		CHAT_RED = 0,
+		CHAT_BLUE = 1,
+		CHAT_WHISPER_SEND = 2,
+		CHAT_WHISPER_RECV = 3,
+
+		CHAT_SIX = 1 << 0,
+		CHAT_SIXUP = 1 << 1,
+	};
+
+	// network
+	void CallVote(int ClientID, const char *pDesc, const char *pCmd, const char *pReason, const char *pChatmsg, const char *pSixupDesc = 0);
+	void SendChatTarget(int To, const char *pText, int Flags = CHAT_SIX | CHAT_SIXUP) const;
+	void SendChatTeam(int Team, const char *pText) const;
+	void SendChat(int ClientID, int Team, const char *pText, int SpamProtectionClientID = -1, int Flags = CHAT_SIX | CHAT_SIXUP);
+	void SendStartWarning(int ClientID, const char *pMessage);
+	void SendEmoticon(int ClientID, int Emoticon, int TargetClientID) const;
+	void SendWeaponPickup(int ClientID, int Weapon) const;
+	void SendMotd(int ClientID) const;
+	void SendSettings(int ClientID) const;
+	void SendBroadcast(const char *pText, int ClientID, bool IsImportant = true);
+
+	void List(int ClientID, const char *pFilter);
+
+	//
+	void CheckPureTuning();
+	void SendTuningParams(int ClientID, int Zone = 0);
+
+	const CVoteOptionServer *GetVoteOption(int Index) const;
+	void ProgressVoteOptions(int ClientID);
+
+	//
+	void LoadMapSettings();
+
+	// engine events
+	void OnInit(const void *pPersistentData) override;
+	void OnConsoleInit() override;
+	void OnMapChange(char *pNewMapName, int MapNameSize) override;
+	void OnShutdown(void *pPersistentData) override;
+
+	void OnTick() override;
+	void OnPreSnap() override;
+	void OnSnap(int ClientID) override;
+	void OnPostSnap() override;
+
+	void UpdatePlayerMaps();
+
+	void *PreProcessMsg(int *pMsgID, CUnpacker *pUnpacker, int ClientID);
+	void CensorMessage(char *pCensoredMessage, const char *pMessage, int Size);
+	void OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) override;
+	void OnSayNetMessage(const CNetMsg_Cl_Say *pMsg, int ClientID, const CUnpacker *pUnpacker);
+	void OnCallVoteNetMessage(const CNetMsg_Cl_CallVote *pMsg, int ClientID);
+	void OnVoteNetMessage(const CNetMsg_Cl_Vote *pMsg, int ClientID);
+	void OnSetTeamNetMessage(const CNetMsg_Cl_SetTeam *pMsg, int ClientID);
+	void OnIsDDNetLegacyNetMessage(const CNetMsg_Cl_IsDDNetLegacy *pMsg, int ClientID, CUnpacker *pUnpacker);
+	void OnShowOthersLegacyNetMessage(const CNetMsg_Cl_ShowOthersLegacy *pMsg, int ClientID);
+	void OnShowOthersNetMessage(const CNetMsg_Cl_ShowOthers *pMsg, int ClientID);
+	void OnShowDistanceNetMessage(const CNetMsg_Cl_ShowDistance *pMsg, int ClientID);
+	void OnSetSpectatorModeNetMessage(const CNetMsg_Cl_SetSpectatorMode *pMsg, int ClientID);
+	void OnChangeInfoNetMessage(const CNetMsg_Cl_ChangeInfo *pMsg, int ClientID);
+	void OnEmoticonNetMessage(const CNetMsg_Cl_Emoticon *pMsg, int ClientID);
+	void OnKillNetMessage(const CNetMsg_Cl_Kill *pMsg, int ClientID);
+	void OnStartInfoNetMessage(const CNetMsg_Cl_StartInfo *pMsg, int ClientID);
+
+	bool OnClientDataPersist(int ClientID, void *pData) override;
+	void OnClientConnected(int ClientID, void *pData) override;
+	void OnClientEnter(int ClientID) override;
+	void OnClientDrop(int ClientID, const char *pReason) override;
+	void OnClientPrepareInput(int ClientID, void *pInput) override;
+	void OnClientDirectInput(int ClientID, void *pInput) override;
+	void OnClientPredictedInput(int ClientID, void *pInput) override;
+	void OnClientPredictedEarlyInput(int ClientID, void *pInput) override;
+
+	void TeehistorianRecordAntibot(const void *pData, int DataSize) override;
+	void TeehistorianRecordPlayerJoin(int ClientID, bool Sixup) override;
+	void TeehistorianRecordPlayerDrop(int ClientID, const char *pReason) override;
+	void TeehistorianRecordPlayerRejoin(int ClientID) override;
+
+	bool IsClientReady(int ClientID) const override;
+	bool IsClientPlayer(int ClientID) const override;
+	int PersistentDataSize() const override { return sizeof(CPersistentData); }
+	int PersistentClientDataSize() const override { return sizeof(CPersistentClientData); }
+
+	CUuid GameUuid() const override;
+	const char *GameType() const override;
+	const char *Version() const override;
+	const char *NetVersion() const override;
+
+	// DDRace
+	void OnPreTickTeehistorian() override;
+	bool OnClientDDNetVersionKnown(int ClientID);
+	void FillAntibot(CAntibotRoundData *pData) override;
+	bool ProcessSpamProtection(int ClientID, bool RespectChatInitialDelay = true);
+	int GetDDRaceTeam(int ClientID) const;
+	// Describes the time when the first player joined the server.
+	int64_t m_NonEmptySince;
+	int64_t m_LastMapVote;
+	int GetClientVersion(int ClientID) const;
+	CClientMask ClientsMaskExcludeClientVersionAndHigher(int Version) const;
+	bool PlayerExists(int ClientID) const override { return m_apPlayers[ClientID]; }
+	// Returns true if someone is actively moderating.
+	bool PlayerModerating() const;
+	void ForceVote(int EnforcerID, bool Success);
+
+	// Checks if player can vote and notify them about the reason
+	bool RateLimitPlayerVote(int ClientID);
+	bool RateLimitPlayerMapVote(int ClientID) const;
+
+	void OnUpdatePlayerServerInfo(char *aBuf, int BufSize, int ID) override;
+
+	std::shared_ptr<CScoreRandomMapResult> m_SqlRandomMapResult;
+
+private:
+	// starting 1 to make 0 the special value "no client id"
+	uint32_t NextUniqueClientID = 1;
+	bool m_VoteWillPass;
+	CScore *m_pScore;
+
+	// DDRace Console Commands
+
+	static void ConKillPlayer(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConNinja(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnNinja(IConsole::IResult *pResult, void *pUserData);
+	static void ConEndlessHook(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnEndlessHook(IConsole::IResult *pResult, void *pUserData);
+	static void ConSolo(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnSolo(IConsole::IResult *pResult, void *pUserData);
+	static void ConFreeze(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnFreeze(IConsole::IResult *pResult, void *pUserData);
+	static void ConDeep(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnDeep(IConsole::IResult *pResult, void *pUserData);
+	static void ConLiveFreeze(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnLiveFreeze(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnSuper(IConsole::IResult *pResult, void *pUserData);
+	static void ConSuper(IConsole::IResult *pResult, void *pUserData);
+	static void ConShotgun(IConsole::IResult *pResult, void *pUserData);
+	static void ConGrenade(IConsole::IResult *pResult, void *pUserData);
+	static void ConLaser(IConsole::IResult *pResult, void *pUserData);
+	static void ConJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConWeapons(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnShotgun(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnGrenade(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnLaser(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnWeapons(IConsole::IResult *pResult, void *pUserData);
+	static void ConAddWeapon(IConsole::IResult *pResult, void *pUserData);
+	static void ConRemoveWeapon(IConsole::IResult *pResult, void *pUserData);
+
+	void ModifyWeapons(IConsole::IResult *pResult, void *pUserData, int Weapon, bool Remove);
+	void MoveCharacter(int ClientID, int X, int Y, bool Raw = false);
+	static void ConGoLeft(IConsole::IResult *pResult, void *pUserData);
+	static void ConGoRight(IConsole::IResult *pResult, void *pUserData);
+	static void ConGoUp(IConsole::IResult *pResult, void *pUserData);
+	static void ConGoDown(IConsole::IResult *pResult, void *pUserData);
+	static void ConMove(IConsole::IResult *pResult, void *pUserData);
+	static void ConMoveRaw(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConToTeleporter(IConsole::IResult *pResult, void *pUserData);
+	static void ConToCheckTeleporter(IConsole::IResult *pResult, void *pUserData);
+	void Teleport(CCharacter *pChr, vec2 Pos);
+	static void ConTeleport(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConCredits(IConsole::IResult *pResult, void *pUserData);
+	static void ConInfo(IConsole::IResult *pResult, void *pUserData);
+	static void ConHelp(IConsole::IResult *pResult, void *pUserData);
+	static void ConSettings(IConsole::IResult *pResult, void *pUserData);
+	static void ConRules(IConsole::IResult *pResult, void *pUserData);
+	static void ConKill(IConsole::IResult *pResult, void *pUserData);
+	static void ConTogglePause(IConsole::IResult *pResult, void *pUserData);
+	static void ConTogglePauseVoted(IConsole::IResult *pResult, void *pUserData);
+	static void ConToggleSpec(IConsole::IResult *pResult, void *pUserData);
+	static void ConToggleSpecVoted(IConsole::IResult *pResult, void *pUserData);
+	static void ConForcePause(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeamTop5(IConsole::IResult *pResult, void *pUserData);
+	static void ConTop(IConsole::IResult *pResult, void *pUserData);
+	static void ConTimes(IConsole::IResult *pResult, void *pUserData);
+	static void ConPoints(IConsole::IResult *pResult, void *pUserData);
+	static void ConTopPoints(IConsole::IResult *pResult, void *pUserData);
+	static void ConTimeCP(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConDND(IConsole::IResult *pResult, void *pUserData);
+	static void ConMapInfo(IConsole::IResult *pResult, void *pUserData);
+	static void ConTimeout(IConsole::IResult *pResult, void *pUserData);
+	static void ConPractice(IConsole::IResult *pResult, void *pUserData);
+	static void ConSwap(IConsole::IResult *pResult, void *pUserData);
+	static void ConSave(IConsole::IResult *pResult, void *pUserData);
+	static void ConLoad(IConsole::IResult *pResult, void *pUserData);
+	static void ConMap(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeamRank(IConsole::IResult *pResult, void *pUserData);
+	static void ConRank(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConLock(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnlock(IConsole::IResult *pResult, void *pUserData);
+	static void ConInvite(IConsole::IResult *pResult, void *pUserData);
+	static void ConJoin(IConsole::IResult *pResult, void *pUserData);
+	static void ConAccept(IConsole::IResult *pResult, void *pUserData);
+	static void ConMe(IConsole::IResult *pResult, void *pUserData);
+	static void ConWhisper(IConsole::IResult *pResult, void *pUserData);
+	static void ConConverse(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetEyeEmote(IConsole::IResult *pResult, void *pUserData);
+	static void ConEyeEmote(IConsole::IResult *pResult, void *pUserData);
+	static void ConShowOthers(IConsole::IResult *pResult, void *pUserData);
+	static void ConShowAll(IConsole::IResult *pResult, void *pUserData);
+	static void ConSpecTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConNinjaJetpack(IConsole::IResult *pResult, void *pUserData);
+	static void ConSayTime(IConsole::IResult *pResult, void *pUserData);
+	static void ConSayTimeAll(IConsole::IResult *pResult, void *pUserData);
+	static void ConTime(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetTimerType(IConsole::IResult *pResult, void *pUserData);
+	static void ConRescue(IConsole::IResult *pResult, void *pUserData);
+	static void ConTele(IConsole::IResult *pResult, void *pUserData);
+	static void ConTeleCursor(IConsole::IResult *pResult, void *pUserData);
+	static void ConLastTele(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnSolo(IConsole::IResult *pResult, void *pUserData);
+	static void ConPracticeUnDeep(IConsole::IResult *pResult, void *pUserData);
+	static void ConProtectedKill(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConVoteMute(IConsole::IResult *pResult, void *pUserData);
+	static void ConVoteUnmute(IConsole::IResult *pResult, void *pUserData);
+	static void ConVoteMutes(IConsole::IResult *pResult, void *pUserData);
+	static void ConMute(IConsole::IResult *pResult, void *pUserData);
+	static void ConMuteID(IConsole::IResult *pResult, void *pUserData);
+	static void ConMuteIP(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnmute(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnmuteID(IConsole::IResult *pResult, void *pUserData);
+	static void ConMutes(IConsole::IResult *pResult, void *pUserData);
+	static void ConModerate(IConsole::IResult *pResult, void *pUserData);
+
+	static void ConList(IConsole::IResult *pResult, void *pUserData);
+	static void ConSetDDRTeam(IConsole::IResult *pResult, void *pUserData);
+	static void ConUninvite(IConsole::IResult *pResult, void *pUserData);
+	static void ConFreezeHammer(IConsole::IResult *pResult, void *pUserData);
+	static void ConUnFreezeHammer(IConsole::IResult *pResult, void *pUserData);
+
+	enum
+	{
+		MAX_MUTES = 128,
+		MAX_VOTE_MUTES = 128,
+	};
+	struct CMute
+	{
+		NETADDR m_Addr;
+		int m_Expire;
+		char m_aReason[128];
+		bool m_InitialChatDelay;
+	};
+
+	CMute m_aMutes[MAX_MUTES];
+	int m_NumMutes;
+	CMute m_aVoteMutes[MAX_VOTE_MUTES];
+	int m_NumVoteMutes;
+	bool TryMute(const NETADDR *pAddr, int Secs, const char *pReason, bool InitialChatDelay);
+	void Mute(const NETADDR *pAddr, int Secs, const char *pDisplayName, const char *pReason = "", bool InitialChatDelay = false);
+	bool TryVoteMute(const NETADDR *pAddr, int Secs, const char *pReason);
+	void VoteMute(const NETADDR *pAddr, int Secs, const char *pReason, const char *pDisplayName, int AuthedID);
+	bool VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedID);
+	void Whisper(int ClientID, char *pStr);
+	void WhisperID(int ClientID, int VictimID, const char *pMessage);
+	void Converse(int ClientID, char *pStr);
+	bool IsVersionBanned(int Version);
+	void UnlockTeam(int ClientID, int Team) const;
+	void AttemptJoinTeam(int ClientID, int Team);
+
+	enum
+	{
+		MAX_LOG_SECONDS = 600,
+		MAX_LOGS = 512,
+	};
+	struct CLog
+	{
+		int64_t m_Timestamp;
+		bool m_FromServer;
+		char m_aDescription[128];
+		int m_ClientVersion;
+		char m_aClientName[MAX_NAME_LENGTH];
+		char m_aClientAddrStr[NETADDR_MAXSTRSIZE];
+	};
+	CLog m_aLogs[MAX_LOGS];
+	int m_LatestLog;
+
+	void LogEvent(const char *Description, int ClientID);
+
+public:
+	CLayers *Layers() { return &m_Layers; }
+	CScore *Score() { return m_pScore; }
+
+	enum
+	{
+		VOTE_ENFORCE_NO_ADMIN = VOTE_ENFORCE_YES + 1,
+		VOTE_ENFORCE_YES_ADMIN,
+
+		VOTE_TYPE_UNKNOWN = 0,
+		VOTE_TYPE_OPTION,
+		VOTE_TYPE_KICK,
+		VOTE_TYPE_SPECTATE,
+	};
+	int m_VoteVictim;
+	int m_VoteEnforcer;
+
+	inline bool IsOptionVote() const { return m_VoteType == VOTE_TYPE_OPTION; }
+	inline bool IsKickVote() const { return m_VoteType == VOTE_TYPE_KICK; }
+	inline bool IsSpecVote() const { return m_VoteType == VOTE_TYPE_SPECTATE; }
+
+	void SendRecord(int ClientID);
+	void OnSetAuthed(int ClientID, int Level) override;
+
+	void ResetTuning();
+};
+
+#endif
diff --git a/src_bkp/game/server/gamecontroller.cpp b/src_bkp/game/server/gamecontroller.cpp
new file mode 100644
index 0000000000..89f4f59122
--- /dev/null
+++ b/src_bkp/game/server/gamecontroller.cpp
@@ -0,0 +1,761 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <engine/shared/config.h>
+
+#include <game/generated/protocol.h>
+#include <game/mapitems.h>
+#include <game/server/score.h>
+#include <game/teamscore.h>
+
+#include "gamecontext.h"
+#include "gamecontroller.h"
+#include "player.h"
+
+#include "entities/character.h"
+#include "entities/door.h"
+#include "entities/dragger.h"
+#include "entities/gun.h"
+#include "entities/light.h"
+#include "entities/pickup.h"
+#include "entities/projectile.h"
+
+IGameController::IGameController(class CGameContext *pGameServer) :
+	m_Teams(pGameServer), m_pLoadBestTimeResult(nullptr)
+{
+	m_pGameServer = pGameServer;
+	m_pConfig = m_pGameServer->Config();
+	m_pServer = m_pGameServer->Server();
+	m_pGameType = "unknown";
+
+	//
+	DoWarmup(g_Config.m_SvWarmup);
+	m_GameOverTick = -1;
+	m_SuddenDeath = 0;
+	m_RoundStartTick = Server()->Tick();
+	m_RoundCount = 0;
+	m_GameFlags = 0;
+	m_aMapWish[0] = 0;
+
+	m_UnbalancedTick = -1;
+	m_ForceBalanced = false;
+
+	m_CurrentRecord = 0;
+
+	InitTeleporter();
+}
+
+IGameController::~IGameController() = default;
+
+void IGameController::DoActivityCheck()
+{
+	if(g_Config.m_SvInactiveKickTime == 0)
+		return;
+
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS && Server()->GetAuthedState(i) == AUTHED_NO)
+		{
+			if(Server()->Tick() > GameServer()->m_apPlayers[i]->m_LastActionTick + g_Config.m_SvInactiveKickTime * Server()->TickSpeed() * 60)
+			{
+				switch(g_Config.m_SvInactiveKick)
+				{
+				case 0:
+				{
+					// move player to spectator
+					DoTeamChange(GameServer()->m_apPlayers[i], TEAM_SPECTATORS);
+				}
+				break;
+				case 1:
+				{
+					// move player to spectator if the reserved slots aren't filled yet, kick him otherwise
+					int Spectators = 0;
+					for(auto &pPlayer : GameServer()->m_apPlayers)
+						if(pPlayer && pPlayer->GetTeam() == TEAM_SPECTATORS)
+							++Spectators;
+					if(Spectators >= g_Config.m_SvSpectatorSlots)
+						Server()->Kick(i, "Kicked for inactivity");
+					else
+						DoTeamChange(GameServer()->m_apPlayers[i], TEAM_SPECTATORS);
+				}
+				break;
+				case 2:
+				{
+					// kick the player
+					Server()->Kick(i, "Kicked for inactivity");
+				}
+				}
+			}
+		}
+	}
+}
+
+float IGameController::EvaluateSpawnPos(CSpawnEval *pEval, vec2 Pos, int DDTeam)
+{
+	float Score = 0.0f;
+	CCharacter *pC = static_cast<CCharacter *>(GameServer()->m_World.FindFirst(CGameWorld::ENTTYPE_CHARACTER));
+	for(; pC; pC = (CCharacter *)pC->TypeNext())
+	{
+		// ignore players in other teams
+		if(GameServer()->GetDDRaceTeam(pC->GetPlayer()->GetCID()) != DDTeam)
+			continue;
+
+		float d = distance(Pos, pC->m_Pos);
+		Score += d == 0 ? 1000000000.0f : 1.0f / d;
+	}
+
+	return Score;
+}
+
+void IGameController::EvaluateSpawnType(CSpawnEval *pEval, int Type, int DDTeam)
+{
+	// j == 0: Find an empty slot, j == 1: Take any slot if no empty one found
+	for(int j = 0; j < 2 && !pEval->m_Got; j++)
+	{
+		// get spawn point
+		for(const vec2 &SpawnPoint : m_avSpawnPoints[Type])
+		{
+			vec2 P = SpawnPoint;
+			if(j == 0)
+			{
+				// check if the position is occupado
+				CEntity *apEnts[MAX_CLIENTS];
+				int Num = GameServer()->m_World.FindEntities(SpawnPoint, 64, apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
+				vec2 aPositions[5] = {vec2(0.0f, 0.0f), vec2(-32.0f, 0.0f), vec2(0.0f, -32.0f), vec2(32.0f, 0.0f), vec2(0.0f, 32.0f)}; // start, left, up, right, down
+				int Result = -1;
+				for(int Index = 0; Index < 5 && Result == -1; ++Index)
+				{
+					Result = Index;
+					if(!GameServer()->m_World.m_Core.m_aTuning[0].m_PlayerCollision)
+						break;
+					for(int c = 0; c < Num; ++c)
+					{
+						CCharacter *pChr = static_cast<CCharacter *>(apEnts[c]);
+						if(GameServer()->Collision()->CheckPoint(SpawnPoint + aPositions[Index]) ||
+							distance(pChr->m_Pos, SpawnPoint + aPositions[Index]) <= pChr->GetProximityRadius())
+						{
+							Result = -1;
+							break;
+						}
+					}
+				}
+				if(Result == -1)
+					continue; // try next spawn point
+
+				P += aPositions[Result];
+			}
+
+			float S = EvaluateSpawnPos(pEval, P, DDTeam);
+			if(!pEval->m_Got || (j == 0 && pEval->m_Score > S))
+			{
+				pEval->m_Got = true;
+				pEval->m_Score = S;
+				pEval->m_Pos = P;
+			}
+		}
+	}
+}
+
+bool IGameController::CanSpawn(int Team, vec2 *pOutPos, int DDTeam)
+{
+	// spectators can't spawn
+	if(Team == TEAM_SPECTATORS)
+		return false;
+
+	CSpawnEval Eval;
+	EvaluateSpawnType(&Eval, 0, DDTeam);
+	EvaluateSpawnType(&Eval, 1, DDTeam);
+	EvaluateSpawnType(&Eval, 2, DDTeam);
+
+	*pOutPos = Eval.m_Pos;
+	return Eval.m_Got;
+}
+
+bool IGameController::OnEntity(int Index, int x, int y, int Layer, int Flags, bool Initial, int Number)
+{
+	dbg_assert(Index >= 0, "Invalid entity index");
+
+	const vec2 Pos(x * 32.0f + 16.0f, y * 32.0f + 16.0f);
+
+	int aSides[8];
+	aSides[0] = GameServer()->Collision()->Entity(x, y + 1, Layer);
+	aSides[1] = GameServer()->Collision()->Entity(x + 1, y + 1, Layer);
+	aSides[2] = GameServer()->Collision()->Entity(x + 1, y, Layer);
+	aSides[3] = GameServer()->Collision()->Entity(x + 1, y - 1, Layer);
+	aSides[4] = GameServer()->Collision()->Entity(x, y - 1, Layer);
+	aSides[5] = GameServer()->Collision()->Entity(x - 1, y - 1, Layer);
+	aSides[6] = GameServer()->Collision()->Entity(x - 1, y, Layer);
+	aSides[7] = GameServer()->Collision()->Entity(x - 1, y + 1, Layer);
+
+	if(Index >= ENTITY_SPAWN && Index <= ENTITY_SPAWN_BLUE && Initial)
+	{
+		const int Type = Index - ENTITY_SPAWN;
+		m_avSpawnPoints[Type].push_back(Pos);
+	}
+	else if(Index == ENTITY_DOOR)
+	{
+		for(int i = 0; i < 8; i++)
+		{
+			if(aSides[i] >= ENTITY_LASER_SHORT && aSides[i] <= ENTITY_LASER_LONG)
+			{
+				new CDoor(
+					&GameServer()->m_World, //GameWorld
+					Pos, //Pos
+					pi / 4 * i, //Rotation
+					32 * 3 + 32 * (aSides[i] - ENTITY_LASER_SHORT) * 3, //Length
+					Number //Number
+				);
+			}
+		}
+	}
+	else if(Index == ENTITY_CRAZY_SHOTGUN_EX)
+	{
+		int Dir;
+		if(!Flags)
+			Dir = 0;
+		else if(Flags == ROTATION_90)
+			Dir = 1;
+		else if(Flags == ROTATION_180)
+			Dir = 2;
+		else
+			Dir = 3;
+		float Deg = Dir * (pi / 2);
+		CProjectile *pBullet = new CProjectile(
+			&GameServer()->m_World,
+			WEAPON_SHOTGUN, //Type
+			-1, //Owner
+			Pos, //Pos
+			vec2(std::sin(Deg), std::cos(Deg)), //Dir
+			-2, //Span
+			true, //Freeze
+			true, //Explosive
+			(g_Config.m_SvShotgunBulletSound) ? SOUND_GRENADE_EXPLODE : -1, //SoundImpact
+			vec2(std::sin(Deg), std::cos(Deg)), // InitDir
+			Layer,
+			Number);
+		pBullet->SetBouncing(2 - (Dir % 2));
+	}
+	else if(Index == ENTITY_CRAZY_SHOTGUN)
+	{
+		int Dir;
+		if(!Flags)
+			Dir = 0;
+		else if(Flags == (TILEFLAG_ROTATE))
+			Dir = 1;
+		else if(Flags == (TILEFLAG_XFLIP | TILEFLAG_YFLIP))
+			Dir = 2;
+		else
+			Dir = 3;
+		float Deg = Dir * (pi / 2);
+		CProjectile *pBullet = new CProjectile(
+			&GameServer()->m_World,
+			WEAPON_SHOTGUN, //Type
+			-1, //Owner
+			Pos, //Pos
+			vec2(std::sin(Deg), std::cos(Deg)), //Dir
+			-2, //Span
+			true, //Freeze
+			false, //Explosive
+			SOUND_GRENADE_EXPLODE,
+			vec2(std::sin(Deg), std::cos(Deg)), // InitDir
+			Layer,
+			Number);
+		pBullet->SetBouncing(2 - (Dir % 2));
+	}
+
+	int Type = -1;
+	int SubType = 0;
+
+	if(Index == ENTITY_ARMOR_1)
+		Type = POWERUP_ARMOR;
+	else if(Index == ENTITY_ARMOR_SHOTGUN)
+		Type = POWERUP_ARMOR_SHOTGUN;
+	else if(Index == ENTITY_ARMOR_GRENADE)
+		Type = POWERUP_ARMOR_GRENADE;
+	else if(Index == ENTITY_ARMOR_NINJA)
+		Type = POWERUP_ARMOR_NINJA;
+	else if(Index == ENTITY_ARMOR_LASER)
+		Type = POWERUP_ARMOR_LASER;
+	else if(Index == ENTITY_HEALTH_1)
+		Type = POWERUP_HEALTH;
+	else if(Index == ENTITY_WEAPON_SHOTGUN)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_SHOTGUN;
+	}
+	else if(Index == ENTITY_WEAPON_GRENADE)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_GRENADE;
+	}
+	else if(Index == ENTITY_WEAPON_LASER)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_LASER;
+	}
+	else if(Index == ENTITY_POWERUP_NINJA)
+	{
+		Type = POWERUP_NINJA;
+		SubType = WEAPON_NINJA;
+	}
+	else if(Index >= ENTITY_LASER_FAST_CCW && Index <= ENTITY_LASER_FAST_CW)
+	{
+		int aSides2[8];
+		aSides2[0] = GameServer()->Collision()->Entity(x, y + 2, Layer);
+		aSides2[1] = GameServer()->Collision()->Entity(x + 2, y + 2, Layer);
+		aSides2[2] = GameServer()->Collision()->Entity(x + 2, y, Layer);
+		aSides2[3] = GameServer()->Collision()->Entity(x + 2, y - 2, Layer);
+		aSides2[4] = GameServer()->Collision()->Entity(x, y - 2, Layer);
+		aSides2[5] = GameServer()->Collision()->Entity(x - 2, y - 2, Layer);
+		aSides2[6] = GameServer()->Collision()->Entity(x - 2, y, Layer);
+		aSides2[7] = GameServer()->Collision()->Entity(x - 2, y + 2, Layer);
+
+		int Ind = Index - ENTITY_LASER_STOP;
+		int M;
+		if(Ind < 0)
+		{
+			Ind = -Ind;
+			M = 1;
+		}
+		else if(Ind == 0)
+			M = 0;
+		else
+			M = -1;
+
+		float AngularSpeed = 0.0f;
+		if(Ind == 0)
+			AngularSpeed = 0.0f;
+		else if(Ind == 1)
+			AngularSpeed = pi / 360;
+		else if(Ind == 2)
+			AngularSpeed = pi / 180;
+		else if(Ind == 3)
+			AngularSpeed = pi / 90;
+		AngularSpeed *= M;
+
+		for(int i = 0; i < 8; i++)
+		{
+			if(aSides[i] >= ENTITY_LASER_SHORT && aSides[i] <= ENTITY_LASER_LONG)
+			{
+				CLight *pLight = new CLight(&GameServer()->m_World, Pos, pi / 4 * i, 32 * 3 + 32 * (aSides[i] - ENTITY_LASER_SHORT) * 3, Layer, Number);
+				pLight->m_AngularSpeed = AngularSpeed;
+				if(aSides2[i] >= ENTITY_LASER_C_SLOW && aSides2[i] <= ENTITY_LASER_C_FAST)
+				{
+					pLight->m_Speed = 1 + (aSides2[i] - ENTITY_LASER_C_SLOW) * 2;
+					pLight->m_CurveLength = pLight->m_Length;
+				}
+				else if(aSides2[i] >= ENTITY_LASER_O_SLOW && aSides2[i] <= ENTITY_LASER_O_FAST)
+				{
+					pLight->m_Speed = 1 + (aSides2[i] - ENTITY_LASER_O_SLOW) * 2;
+					pLight->m_CurveLength = 0;
+				}
+				else
+					pLight->m_CurveLength = pLight->m_Length;
+			}
+		}
+	}
+	else if(Index >= ENTITY_DRAGGER_WEAK && Index <= ENTITY_DRAGGER_STRONG)
+	{
+		new CDragger(&GameServer()->m_World, Pos, Index - ENTITY_DRAGGER_WEAK + 1, false, Layer, Number);
+	}
+	else if(Index >= ENTITY_DRAGGER_WEAK_NW && Index <= ENTITY_DRAGGER_STRONG_NW)
+	{
+		new CDragger(&GameServer()->m_World, Pos, Index - ENTITY_DRAGGER_WEAK_NW + 1, true, Layer, Number);
+	}
+	else if(Index == ENTITY_PLASMAE)
+	{
+		new CGun(&GameServer()->m_World, Pos, false, true, Layer, Number);
+	}
+	else if(Index == ENTITY_PLASMAF)
+	{
+		new CGun(&GameServer()->m_World, Pos, true, false, Layer, Number);
+	}
+	else if(Index == ENTITY_PLASMA)
+	{
+		new CGun(&GameServer()->m_World, Pos, true, true, Layer, Number);
+	}
+	else if(Index == ENTITY_PLASMAU)
+	{
+		new CGun(&GameServer()->m_World, Pos, false, false, Layer, Number);
+	}
+
+	if(Type != -1) // NOLINT(clang-analyzer-unix.Malloc)
+	{
+		CPickup *pPickup = new CPickup(&GameServer()->m_World, Type, SubType, Layer, Number);
+		pPickup->m_Pos = Pos;
+		return true; // NOLINT(clang-analyzer-unix.Malloc)
+	}
+
+	return false;
+}
+
+void IGameController::OnPlayerConnect(CPlayer *pPlayer)
+{
+	int ClientID = pPlayer->GetCID();
+	pPlayer->Respawn();
+
+	if(!Server()->ClientPrevIngame(ClientID))
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' team=%d", ClientID, Server()->ClientName(ClientID), pPlayer->GetTeam());
+		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
+	}
+}
+
+void IGameController::OnPlayerDisconnect(class CPlayer *pPlayer, const char *pReason)
+{
+	pPlayer->OnDisconnect();
+	int ClientID = pPlayer->GetCID();
+	if(Server()->ClientIngame(ClientID))
+	{
+		char aBuf[512];
+		if(pReason && *pReason)
+			str_format(aBuf, sizeof(aBuf), "'%s' has left the game (%s)", Server()->ClientName(ClientID), pReason);
+		else
+			str_format(aBuf, sizeof(aBuf), "'%s' has left the game", Server()->ClientName(ClientID));
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+
+		str_format(aBuf, sizeof(aBuf), "leave player='%d:%s'", ClientID, Server()->ClientName(ClientID));
+		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "game", aBuf);
+	}
+}
+
+void IGameController::EndRound()
+{
+	if(m_Warmup) // game can't end when we are running warmup
+		return;
+
+	GameServer()->m_World.m_Paused = true;
+	m_GameOverTick = Server()->Tick();
+	m_SuddenDeath = 0;
+}
+
+void IGameController::ResetGame()
+{
+	GameServer()->m_World.m_ResetRequested = true;
+}
+
+const char *IGameController::GetTeamName(int Team)
+{
+	if(Team == 0)
+		return "game";
+	return "spectators";
+}
+
+void IGameController::StartRound()
+{
+	ResetGame();
+
+	m_RoundStartTick = Server()->Tick();
+	m_SuddenDeath = 0;
+	m_GameOverTick = -1;
+	GameServer()->m_World.m_Paused = false;
+	m_ForceBalanced = false;
+	Server()->DemoRecorder_HandleAutoStart();
+	char aBuf[256];
+	str_format(aBuf, sizeof(aBuf), "start round type='%s' teamplay='%d'", m_pGameType, m_GameFlags & GAMEFLAG_TEAMS);
+	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
+}
+
+void IGameController::ChangeMap(const char *pToMap)
+{
+	Server()->ChangeMap(pToMap);
+}
+
+void IGameController::OnReset()
+{
+	for(auto &pPlayer : GameServer()->m_apPlayers)
+		if(pPlayer)
+			pPlayer->Respawn();
+}
+
+int IGameController::OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon)
+{
+	return 0;
+}
+
+void IGameController::OnCharacterSpawn(class CCharacter *pChr)
+{
+	pChr->SetTeams(&Teams());
+	Teams().OnCharacterSpawn(pChr->GetPlayer()->GetCID());
+
+	// default health
+	pChr->IncreaseHealth(10);
+
+	// give default weapons
+	pChr->GiveWeapon(WEAPON_HAMMER);
+	pChr->GiveWeapon(WEAPON_GUN);
+
+	pChr->SetTeleports(&m_TeleOuts, &m_TeleCheckOuts);
+}
+
+void IGameController::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
+{
+	// Do nothing by default
+}
+
+void IGameController::DoWarmup(int Seconds)
+{
+	if(Seconds < 0)
+		m_Warmup = 0;
+	else
+		m_Warmup = Seconds * Server()->TickSpeed();
+}
+
+bool IGameController::IsForceBalanced()
+{
+	return false;
+}
+
+bool IGameController::CanBeMovedOnBalance(int ClientID)
+{
+	return true;
+}
+
+void IGameController::Tick()
+{
+	// do warmup
+	if(m_Warmup)
+	{
+		m_Warmup--;
+		if(!m_Warmup)
+			StartRound();
+	}
+
+	if(m_GameOverTick != -1)
+	{
+		// game over.. wait for restart
+		if(Server()->Tick() > m_GameOverTick + Server()->TickSpeed() * 10)
+		{
+			StartRound();
+			m_RoundCount++;
+		}
+	}
+
+	if(m_pLoadBestTimeResult != nullptr && m_pLoadBestTimeResult->m_Completed)
+	{
+		if(m_pLoadBestTimeResult->m_Success)
+		{
+			m_CurrentRecord = m_pLoadBestTimeResult->m_CurrentRecord;
+
+			for(int i = 0; i < MAX_CLIENTS; i++)
+			{
+				if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetClientVersion() >= VERSION_DDRACE)
+				{
+					GameServer()->SendRecord(i);
+				}
+			}
+		}
+		m_pLoadBestTimeResult = nullptr;
+	}
+
+	DoActivityCheck();
+}
+
+void IGameController::Snap(int SnappingClient)
+{
+	CNetObj_GameInfo *pGameInfoObj = Server()->SnapNewItem<CNetObj_GameInfo>(0);
+	if(!pGameInfoObj)
+		return;
+
+	pGameInfoObj->m_GameFlags = m_GameFlags;
+	pGameInfoObj->m_GameStateFlags = 0;
+	if(m_GameOverTick != -1)
+		pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_GAMEOVER;
+	if(m_SuddenDeath)
+		pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_SUDDENDEATH;
+	if(GameServer()->m_World.m_Paused)
+		pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_PAUSED;
+	pGameInfoObj->m_RoundStartTick = m_RoundStartTick;
+	pGameInfoObj->m_WarmupTimer = m_Warmup;
+
+	pGameInfoObj->m_RoundNum = 0;
+	pGameInfoObj->m_RoundCurrent = m_RoundCount + 1;
+
+	CCharacter *pChr;
+	CPlayer *pPlayer = SnappingClient != SERVER_DEMO_CLIENT ? GameServer()->m_apPlayers[SnappingClient] : 0;
+	CPlayer *pPlayer2;
+
+	if(pPlayer && (pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER || pPlayer->m_TimerType == CPlayer::TIMERTYPE_GAMETIMER_AND_BROADCAST) && pPlayer->GetClientVersion() >= VERSION_DDNET_GAMETICK)
+	{
+		if((pPlayer->GetTeam() == TEAM_SPECTATORS || pPlayer->IsPaused()) && pPlayer->m_SpectatorID != SPEC_FREEVIEW && (pPlayer2 = GameServer()->m_apPlayers[pPlayer->m_SpectatorID]))
+		{
+			if((pChr = pPlayer2->GetCharacter()) && pChr->m_DDRaceState == DDRACE_STARTED)
+			{
+				pGameInfoObj->m_WarmupTimer = -pChr->m_StartTime;
+				pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_RACETIME;
+			}
+		}
+		else if((pChr = pPlayer->GetCharacter()) && pChr->m_DDRaceState == DDRACE_STARTED)
+		{
+			pGameInfoObj->m_WarmupTimer = -pChr->m_StartTime;
+			pGameInfoObj->m_GameStateFlags |= GAMESTATEFLAG_RACETIME;
+		}
+	}
+
+	CNetObj_GameInfoEx *pGameInfoEx = Server()->SnapNewItem<CNetObj_GameInfoEx>(0);
+	if(!pGameInfoEx)
+		return;
+
+	pGameInfoEx->m_Flags =
+		GAMEINFOFLAG_TIMESCORE |
+		GAMEINFOFLAG_GAMETYPE_RACE |
+		GAMEINFOFLAG_GAMETYPE_DDRACE |
+		GAMEINFOFLAG_GAMETYPE_DDNET |
+		GAMEINFOFLAG_UNLIMITED_AMMO |
+		GAMEINFOFLAG_RACE_RECORD_MESSAGE |
+		GAMEINFOFLAG_ALLOW_EYE_WHEEL |
+		GAMEINFOFLAG_ALLOW_HOOK_COLL |
+		GAMEINFOFLAG_ALLOW_ZOOM |
+		GAMEINFOFLAG_BUG_DDRACE_GHOST |
+		GAMEINFOFLAG_BUG_DDRACE_INPUT |
+		GAMEINFOFLAG_PREDICT_DDRACE |
+		GAMEINFOFLAG_PREDICT_DDRACE_TILES |
+		GAMEINFOFLAG_ENTITIES_DDNET |
+		GAMEINFOFLAG_ENTITIES_DDRACE |
+		GAMEINFOFLAG_ENTITIES_RACE |
+		GAMEINFOFLAG_RACE;
+	pGameInfoEx->m_Flags2 = GAMEINFOFLAG2_HUD_DDRACE;
+	if(g_Config.m_SvNoWeakHook)
+		pGameInfoEx->m_Flags2 |= GAMEINFOFLAG2_NO_WEAK_HOOK;
+	pGameInfoEx->m_Version = GAMEINFO_CURVERSION;
+
+	if(Server()->IsSixup(SnappingClient))
+	{
+		protocol7::CNetObj_GameData *pGameData = Server()->SnapNewItem<protocol7::CNetObj_GameData>(0);
+		if(!pGameData)
+			return;
+
+		pGameData->m_GameStartTick = m_RoundStartTick;
+		pGameData->m_GameStateFlags = 0;
+		if(m_GameOverTick != -1)
+			pGameData->m_GameStateFlags |= protocol7::GAMESTATEFLAG_GAMEOVER;
+		if(m_SuddenDeath)
+			pGameData->m_GameStateFlags |= protocol7::GAMESTATEFLAG_SUDDENDEATH;
+		if(GameServer()->m_World.m_Paused)
+			pGameData->m_GameStateFlags |= protocol7::GAMESTATEFLAG_PAUSED;
+
+		pGameData->m_GameStateEndTick = 0;
+
+		protocol7::CNetObj_GameDataRace *pRaceData = Server()->SnapNewItem<protocol7::CNetObj_GameDataRace>(0);
+		if(!pRaceData)
+			return;
+
+		pRaceData->m_BestTime = round_to_int(m_CurrentRecord * 1000);
+		pRaceData->m_Precision = 2;
+		pRaceData->m_RaceFlags = protocol7::RACEFLAG_HIDE_KILLMSG | protocol7::RACEFLAG_KEEP_WANTED_WEAPON;
+	}
+
+	GameServer()->SnapSwitchers(SnappingClient);
+}
+
+int IGameController::GetAutoTeam(int NotThisID)
+{
+	int aNumplayers[2] = {0, 0};
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(GameServer()->m_apPlayers[i] && i != NotThisID)
+		{
+			if(GameServer()->m_apPlayers[i]->GetTeam() >= TEAM_RED && GameServer()->m_apPlayers[i]->GetTeam() <= TEAM_BLUE)
+				aNumplayers[GameServer()->m_apPlayers[i]->GetTeam()]++;
+		}
+	}
+
+	int Team = 0;
+
+	if(CanJoinTeam(Team, NotThisID, nullptr, 0))
+		return Team;
+	return -1;
+}
+
+bool IGameController::CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize)
+{
+	const CPlayer *pPlayer = GameServer()->m_apPlayers[NotThisID];
+	if(pPlayer && pPlayer->IsPaused())
+	{
+		if(pErrorReason)
+			str_copy(pErrorReason, "Use /pause first then you can kill", ErrorReasonSize);
+		return false;
+	}
+	if(Team == TEAM_SPECTATORS || (pPlayer && pPlayer->GetTeam() != TEAM_SPECTATORS))
+		return true;
+
+	int aNumplayers[2] = {0, 0};
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(GameServer()->m_apPlayers[i] && i != NotThisID)
+		{
+			if(GameServer()->m_apPlayers[i]->GetTeam() >= TEAM_RED && GameServer()->m_apPlayers[i]->GetTeam() <= TEAM_BLUE)
+				aNumplayers[GameServer()->m_apPlayers[i]->GetTeam()]++;
+		}
+	}
+
+	if((aNumplayers[0] + aNumplayers[1]) < Server()->MaxClients() - g_Config.m_SvSpectatorSlots)
+		return true;
+
+	if(pErrorReason)
+		str_format(pErrorReason, ErrorReasonSize, "Only %d active players are allowed", Server()->MaxClients() - g_Config.m_SvSpectatorSlots);
+	return false;
+}
+
+int IGameController::ClampTeam(int Team)
+{
+	if(Team < 0)
+		return TEAM_SPECTATORS;
+	return 0;
+}
+
+CClientMask IGameController::GetMaskForPlayerWorldEvent(int Asker, int ExceptID)
+{
+	if(Asker == -1)
+		return CClientMask().set().reset(ExceptID);
+
+	return Teams().TeamMask(GameServer()->GetDDRaceTeam(Asker), ExceptID, Asker);
+}
+
+void IGameController::InitTeleporter()
+{
+	if(!GameServer()->Collision()->Layers()->TeleLayer())
+		return;
+	int Width = GameServer()->Collision()->Layers()->TeleLayer()->m_Width;
+	int Height = GameServer()->Collision()->Layers()->TeleLayer()->m_Height;
+
+	for(int i = 0; i < Width * Height; i++)
+	{
+		int Number = GameServer()->Collision()->TeleLayer()[i].m_Number;
+		int Type = GameServer()->Collision()->TeleLayer()[i].m_Type;
+		if(Number > 0)
+		{
+			if(Type == TILE_TELEOUT)
+			{
+				m_TeleOuts[Number - 1].emplace_back(i % Width * 32.0f + 16.0f, i / Width * 32.0f + 16.0f);
+			}
+			else if(Type == TILE_TELECHECKOUT)
+			{
+				m_TeleCheckOuts[Number - 1].emplace_back(i % Width * 32.0f + 16.0f, i / Width * 32.0f + 16.0f);
+			}
+		}
+	}
+}
+
+void IGameController::DoTeamChange(CPlayer *pPlayer, int Team, bool DoChatMsg)
+{
+	Team = ClampTeam(Team);
+	if(Team == pPlayer->GetTeam())
+		return;
+
+	pPlayer->SetTeam(Team);
+	int ClientID = pPlayer->GetCID();
+
+	char aBuf[128];
+	DoChatMsg = false;
+	if(DoChatMsg)
+	{
+		str_format(aBuf, sizeof(aBuf), "'%s' joined the %s", Server()->ClientName(ClientID), GameServer()->m_pController->GetTeamName(Team));
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+	}
+
+	str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", ClientID, Server()->ClientName(ClientID), Team);
+	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
+
+	// OnPlayerInfoChange(pPlayer);
+}
diff --git a/src_bkp/game/server/gamecontroller.h b/src_bkp/game/server/gamecontroller.h
new file mode 100644
index 0000000000..a3044d151a
--- /dev/null
+++ b/src_bkp/game/server/gamecontroller.h
@@ -0,0 +1,163 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_GAMECONTROLLER_H
+#define GAME_SERVER_GAMECONTROLLER_H
+
+#include <base/vmath.h>
+#include <engine/map.h>
+#include <engine/shared/protocol.h>
+#include <game/server/teams.h>
+
+#include <map>
+#include <vector>
+
+struct CScoreLoadBestTimeResult;
+
+/*
+	Class: Game Controller
+		Controls the main game logic. Keeping track of team and player score,
+		winning conditions and specific game logic.
+*/
+class IGameController
+{
+	friend class CSaveTeam; // need access to GameServer() and Server()
+
+	std::vector<vec2> m_avSpawnPoints[3];
+
+	class CGameContext *m_pGameServer;
+	class CConfig *m_pConfig;
+	class IServer *m_pServer;
+
+	CGameTeams m_Teams;
+
+protected:
+	CGameContext *GameServer() const { return m_pGameServer; }
+	CConfig *Config() { return m_pConfig; }
+	IServer *Server() const { return m_pServer; }
+
+	void DoActivityCheck();
+
+	struct CSpawnEval
+	{
+		CSpawnEval()
+		{
+			m_Got = false;
+			m_FriendlyTeam = -1;
+			m_Pos = vec2(100, 100);
+		}
+
+		vec2 m_Pos;
+		bool m_Got;
+		int m_FriendlyTeam;
+		float m_Score;
+	};
+
+	float EvaluateSpawnPos(CSpawnEval *pEval, vec2 Pos, int DDTeam);
+	void EvaluateSpawnType(CSpawnEval *pEval, int Type, int DDTeam);
+
+	void ResetGame();
+
+	char m_aMapWish[MAX_MAP_LENGTH];
+
+	int m_RoundStartTick;
+	int m_GameOverTick;
+	int m_SuddenDeath;
+
+	int m_Warmup;
+	int m_RoundCount;
+
+	int m_GameFlags;
+	int m_UnbalancedTick;
+	bool m_ForceBalanced;
+
+public:
+	const char *m_pGameType;
+
+	IGameController(class CGameContext *pGameServer);
+	virtual ~IGameController();
+
+	// event
+	/*
+		Function: OnCharacterDeath
+			Called when a CCharacter in the world dies.
+
+		Arguments:
+			victim - The CCharacter that died.
+			killer - The player that killed it.
+			weapon - What weapon that killed it. Can be -1 for undefined
+				weapon when switching team or player suicides.
+	*/
+	virtual int OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon);
+	/*
+		Function: OnCharacterSpawn
+			Called when a CCharacter spawns into the game world.
+
+		Arguments:
+			chr - The CCharacter that was spawned.
+	*/
+	virtual void OnCharacterSpawn(class CCharacter *pChr);
+
+	virtual void HandleCharacterTiles(class CCharacter *pChr, int MapIndex);
+
+	/*
+		Function: OnEntity
+			Called when the map is loaded to process an entity
+			in the map.
+
+		Arguments:
+			index - Entity index.
+			pos - Where the entity is located in the world.
+
+		Returns:
+			bool?
+	*/
+	virtual bool OnEntity(int Index, int x, int y, int Layer, int Flags, bool Initial, int Number = 0);
+
+	virtual void OnPlayerConnect(class CPlayer *pPlayer);
+	virtual void OnPlayerDisconnect(class CPlayer *pPlayer, const char *pReason);
+
+	virtual void OnReset();
+
+	// game
+	void DoWarmup(int Seconds);
+
+	void StartRound();
+	void EndRound();
+	void ChangeMap(const char *pToMap);
+
+	bool IsForceBalanced();
+
+	/*
+
+	*/
+	virtual bool CanBeMovedOnBalance(int ClientID);
+
+	virtual void Tick();
+
+	virtual void Snap(int SnappingClient);
+
+	//spawn
+	virtual bool CanSpawn(int Team, vec2 *pOutPos, int DDTeam);
+
+	virtual void DoTeamChange(class CPlayer *pPlayer, int Team, bool DoChatMsg = true);
+	/*
+
+	*/
+	virtual const char *GetTeamName(int Team);
+	virtual int GetAutoTeam(int NotThisID);
+	virtual bool CanJoinTeam(int Team, int NotThisID, char *pErrorReason, int ErrorReasonSize);
+	int ClampTeam(int Team);
+
+	CClientMask GetMaskForPlayerWorldEvent(int Asker, int ExceptID = -1);
+	virtual void InitTeleporter();
+
+	// DDRace
+
+	float m_CurrentRecord;
+	std::map<int, std::vector<vec2>> m_TeleOuts;
+	std::map<int, std::vector<vec2>> m_TeleCheckOuts;
+	CGameTeams &Teams() { return m_Teams; }
+	std::shared_ptr<CScoreLoadBestTimeResult> m_pLoadBestTimeResult;
+};
+
+#endif
diff --git a/src_bkp/game/server/gamemodes/DDRace.cpp b/src_bkp/game/server/gamemodes/DDRace.cpp
new file mode 100644
index 0000000000..48a6d71bd8
--- /dev/null
+++ b/src_bkp/game/server/gamemodes/DDRace.cpp
@@ -0,0 +1,185 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+/* Based on Race mod stuff and tweaked by GreYFoX@GTi and others to fit our DDRace needs. */
+#include "DDRace.h"
+
+#include <engine/server.h>
+#include <engine/shared/config.h>
+#include <game/mapitems.h>
+#include <game/server/entities/character.h>
+#include <game/server/gamecontext.h>
+#include <game/server/player.h>
+#include <game/server/score.h>
+#include <game/version.h>
+
+#define GAME_TYPE_NAME "DDraceNetwork"
+#define TEST_TYPE_NAME "TestDDraceNetwork"
+
+CGameControllerDDRace::CGameControllerDDRace(class CGameContext *pGameServer) :
+	IGameController(pGameServer)
+{
+	m_pGameType = g_Config.m_SvTestingCommands ? TEST_TYPE_NAME : GAME_TYPE_NAME;
+}
+
+CGameControllerDDRace::~CGameControllerDDRace() = default;
+
+CScore *CGameControllerDDRace::Score()
+{
+	return GameServer()->Score();
+}
+
+void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
+{
+	CPlayer *pPlayer = pChr->GetPlayer();
+	const int ClientID = pPlayer->GetCID();
+
+	int m_TileIndex = GameServer()->Collision()->GetTileIndex(MapIndex);
+	int m_TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
+
+	//Sensitivity
+	int S1 = GameServer()->Collision()->GetPureMapIndex(vec2(pChr->GetPos().x + pChr->GetProximityRadius() / 3.f, pChr->GetPos().y - pChr->GetProximityRadius() / 3.f));
+	int S2 = GameServer()->Collision()->GetPureMapIndex(vec2(pChr->GetPos().x + pChr->GetProximityRadius() / 3.f, pChr->GetPos().y + pChr->GetProximityRadius() / 3.f));
+	int S3 = GameServer()->Collision()->GetPureMapIndex(vec2(pChr->GetPos().x - pChr->GetProximityRadius() / 3.f, pChr->GetPos().y - pChr->GetProximityRadius() / 3.f));
+	int S4 = GameServer()->Collision()->GetPureMapIndex(vec2(pChr->GetPos().x - pChr->GetProximityRadius() / 3.f, pChr->GetPos().y + pChr->GetProximityRadius() / 3.f));
+	int Tile1 = GameServer()->Collision()->GetTileIndex(S1);
+	int Tile2 = GameServer()->Collision()->GetTileIndex(S2);
+	int Tile3 = GameServer()->Collision()->GetTileIndex(S3);
+	int Tile4 = GameServer()->Collision()->GetTileIndex(S4);
+	int FTile1 = GameServer()->Collision()->GetFTileIndex(S1);
+	int FTile2 = GameServer()->Collision()->GetFTileIndex(S2);
+	int FTile3 = GameServer()->Collision()->GetFTileIndex(S3);
+	int FTile4 = GameServer()->Collision()->GetFTileIndex(S4);
+
+	const int PlayerDDRaceState = pChr->m_DDRaceState;
+	bool IsOnStartTile = (m_TileIndex == TILE_START) || (m_TileFIndex == TILE_START) || FTile1 == TILE_START || FTile2 == TILE_START || FTile3 == TILE_START || FTile4 == TILE_START || Tile1 == TILE_START || Tile2 == TILE_START || Tile3 == TILE_START || Tile4 == TILE_START;
+	// start
+	if(IsOnStartTile && PlayerDDRaceState != DDRACE_CHEAT)
+	{
+		const int Team = GameServer()->GetDDRaceTeam(ClientID);
+		if(Teams().GetSaving(Team))
+		{
+			GameServer()->SendStartWarning(ClientID, "You can't start while loading/saving of team is in progress");
+			pChr->Die(ClientID, WEAPON_WORLD);
+			return;
+		}
+		if(g_Config.m_SvTeam == SV_TEAM_MANDATORY && (Team == TEAM_FLOCK || Teams().Count(Team) <= 1))
+		{
+			GameServer()->SendStartWarning(ClientID, "You have to be in a team with other tees to start");
+			pChr->Die(ClientID, WEAPON_WORLD);
+			return;
+		}
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team > TEAM_FLOCK && Team < TEAM_SUPER && Teams().Count(Team) < g_Config.m_SvMinTeamSize)
+		{
+			char aBuf[128];
+			str_format(aBuf, sizeof(aBuf), "Your team has fewer than %d players, so your team rank won't count", g_Config.m_SvMinTeamSize);
+			GameServer()->SendStartWarning(ClientID, aBuf);
+		}
+		if(g_Config.m_SvResetPickups)
+		{
+			pChr->ResetPickups();
+		}
+
+		Teams().OnCharacterStart(ClientID);
+		pChr->m_LastTimeCp = -1;
+		pChr->m_LastTimeCpBroadcasted = -1;
+		for(float &CurrentTimeCp : pChr->m_aCurrentTimeCp)
+		{
+			CurrentTimeCp = 0.0f;
+		}
+	}
+
+	// finish
+	if(((m_TileIndex == TILE_FINISH) || (m_TileFIndex == TILE_FINISH) || FTile1 == TILE_FINISH || FTile2 == TILE_FINISH || FTile3 == TILE_FINISH || FTile4 == TILE_FINISH || Tile1 == TILE_FINISH || Tile2 == TILE_FINISH || Tile3 == TILE_FINISH || Tile4 == TILE_FINISH) && PlayerDDRaceState == DDRACE_STARTED)
+		Teams().OnCharacterFinish(ClientID);
+
+	// unlock team
+	else if(((m_TileIndex == TILE_UNLOCK_TEAM) || (m_TileFIndex == TILE_UNLOCK_TEAM)) && Teams().TeamLocked(GameServer()->GetDDRaceTeam(ClientID)))
+	{
+		Teams().SetTeamLock(GameServer()->GetDDRaceTeam(ClientID), false);
+		GameServer()->SendChatTeam(GameServer()->GetDDRaceTeam(ClientID), "Your team was unlocked by an unlock team tile");
+	}
+
+	// solo part
+	if(((m_TileIndex == TILE_SOLO_ENABLE) || (m_TileFIndex == TILE_SOLO_ENABLE)) && !Teams().m_Core.GetSolo(ClientID))
+	{
+		GameServer()->SendChatTarget(ClientID, "You are now in a solo part");
+		pChr->SetSolo(true);
+	}
+	else if(((m_TileIndex == TILE_SOLO_DISABLE) || (m_TileFIndex == TILE_SOLO_DISABLE)) && Teams().m_Core.GetSolo(ClientID))
+	{
+		GameServer()->SendChatTarget(ClientID, "You are now out of the solo part");
+		pChr->SetSolo(false);
+	}
+}
+
+void CGameControllerDDRace::OnPlayerConnect(CPlayer *pPlayer)
+{
+	IGameController::OnPlayerConnect(pPlayer);
+	int ClientID = pPlayer->GetCID();
+
+	// init the player
+	Score()->PlayerData(ClientID)->Reset();
+
+	// Can't set score here as LoadScore() is threaded, run it in
+	// LoadScoreThreaded() instead
+	Score()->LoadPlayerData(ClientID);
+
+	if(!Server()->ClientPrevIngame(ClientID))
+	{
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "'%s' entered and joined the %s", Server()->ClientName(ClientID), GetTeamName(pPlayer->GetTeam()));
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+
+		GameServer()->SendChatTarget(ClientID, "DDraceNetwork Mod. Version: " GAME_VERSION);
+		GameServer()->SendChatTarget(ClientID, "please visit DDNet.org or say /info and make sure to read our /rules");
+	}
+}
+
+void CGameControllerDDRace::OnPlayerDisconnect(CPlayer *pPlayer, const char *pReason)
+{
+	int ClientID = pPlayer->GetCID();
+	bool WasModerator = pPlayer->m_Moderating && Server()->ClientIngame(ClientID);
+
+	IGameController::OnPlayerDisconnect(pPlayer, pReason);
+
+	if(!GameServer()->PlayerModerating() && WasModerator)
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Server kick/spec votes are no longer actively moderated.");
+
+	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO)
+		Teams().SetForceCharacterTeam(ClientID, TEAM_FLOCK);
+}
+
+void CGameControllerDDRace::OnReset()
+{
+	IGameController::OnReset();
+	Teams().Reset();
+}
+
+void CGameControllerDDRace::Tick()
+{
+	IGameController::Tick();
+	Teams().ProcessSaveTeam();
+	Teams().Tick();
+}
+
+void CGameControllerDDRace::DoTeamChange(class CPlayer *pPlayer, int Team, bool DoChatMsg)
+{
+	Team = ClampTeam(Team);
+	if(Team == pPlayer->GetTeam())
+		return;
+
+	CCharacter *pCharacter = pPlayer->GetCharacter();
+
+	if(Team == TEAM_SPECTATORS)
+	{
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && pCharacter)
+		{
+			// Joining spectators should not kill a locked team, but should still
+			// check if the team finished by you leaving it.
+			int DDRTeam = pCharacter->Team();
+			Teams().SetForceCharacterTeam(pPlayer->GetCID(), TEAM_FLOCK);
+			Teams().CheckTeamFinished(DDRTeam);
+		}
+	}
+
+	IGameController::DoTeamChange(pPlayer, Team, DoChatMsg);
+}
diff --git a/src_bkp/game/server/gamemodes/DDRace.h b/src_bkp/game/server/gamemodes/DDRace.h
new file mode 100644
index 0000000000..17626f26a3
--- /dev/null
+++ b/src_bkp/game/server/gamemodes/DDRace.h
@@ -0,0 +1,26 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_GAMEMODES_DDRACE_H
+#define GAME_SERVER_GAMEMODES_DDRACE_H
+
+#include <game/server/gamecontroller.h>
+
+class CGameControllerDDRace : public IGameController
+{
+public:
+	CGameControllerDDRace(class CGameContext *pGameServer);
+	~CGameControllerDDRace();
+
+	CScore *Score();
+
+	void HandleCharacterTiles(class CCharacter *pChr, int MapIndex) override;
+
+	void OnPlayerConnect(class CPlayer *pPlayer) override;
+	void OnPlayerDisconnect(class CPlayer *pPlayer, const char *pReason) override;
+
+	void OnReset() override;
+
+	void Tick() override;
+
+	void DoTeamChange(class CPlayer *pPlayer, int Team, bool DoChatMsg = true) override;
+};
+#endif // GAME_SERVER_GAMEMODES_DDRACE_H
diff --git a/src_bkp/game/server/gamemodes/mod.cpp b/src_bkp/game/server/gamemodes/mod.cpp
new file mode 100644
index 0000000000..1c6fc97f76
--- /dev/null
+++ b/src_bkp/game/server/gamemodes/mod.cpp
@@ -0,0 +1,24 @@
+#include "mod.h"
+
+// Exchange this to a string that identifies your game mode.
+// DM, TDM and CTF are reserved for teeworlds original modes.
+// DDraceNetwork and TestDDraceNetwork are used by DDNet.
+#define GAME_TYPE_NAME "Mod"
+#define TEST_TYPE_NAME "TestMod"
+
+CGameControllerMod::CGameControllerMod(class CGameContext *pGameServer) :
+	IGameController(pGameServer)
+{
+	m_pGameType = g_Config.m_SvTestingCommands ? TEST_TYPE_NAME : GAME_TYPE_NAME;
+
+	//m_GameFlags = GAMEFLAG_TEAMS; // GAMEFLAG_TEAMS makes it a two-team gamemode
+}
+
+CGameControllerMod::~CGameControllerMod() = default;
+
+void CGameControllerMod::Tick()
+{
+	// this is the main part of the gamemode, this function is run every tick
+
+	IGameController::Tick();
+}
diff --git a/src_bkp/game/server/gamemodes/mod.h b/src_bkp/game/server/gamemodes/mod.h
new file mode 100644
index 0000000000..f74d5306a8
--- /dev/null
+++ b/src_bkp/game/server/gamemodes/mod.h
@@ -0,0 +1,14 @@
+#ifndef GAME_SERVER_GAMEMODES_MOD_H
+#define GAME_SERVER_GAMEMODES_MOD_H
+
+#include <game/server/gamecontroller.h>
+
+class CGameControllerMod : public IGameController
+{
+public:
+	CGameControllerMod(class CGameContext *pGameServer);
+	~CGameControllerMod();
+
+	void Tick() override;
+};
+#endif // GAME_SERVER_GAMEMODES_MOD_H
diff --git a/src_bkp/game/server/gameworld.cpp b/src_bkp/game/server/gameworld.cpp
new file mode 100644
index 0000000000..9247cca883
--- /dev/null
+++ b/src_bkp/game/server/gameworld.cpp
@@ -0,0 +1,377 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include "gameworld.h"
+#include "entities/character.h"
+#include "entity.h"
+#include "gamecontext.h"
+#include "gamecontroller.h"
+
+#include <engine/shared/config.h>
+
+#include <algorithm>
+#include <utility>
+
+//////////////////////////////////////////////////
+// game world
+//////////////////////////////////////////////////
+CGameWorld::CGameWorld()
+{
+	m_pGameServer = 0x0;
+	m_pConfig = 0x0;
+	m_pServer = 0x0;
+
+	m_Paused = false;
+	m_ResetRequested = false;
+	for(auto &pFirstEntityType : m_apFirstEntityTypes)
+		pFirstEntityType = 0;
+}
+
+CGameWorld::~CGameWorld()
+{
+	// delete all entities
+	for(auto &pFirstEntityType : m_apFirstEntityTypes)
+		while(pFirstEntityType)
+			delete pFirstEntityType; // NOLINT(clang-analyzer-cplusplus.NewDelete)
+}
+
+void CGameWorld::SetGameServer(CGameContext *pGameServer)
+{
+	m_pGameServer = pGameServer;
+	m_pConfig = m_pGameServer->Config();
+	m_pServer = m_pGameServer->Server();
+}
+
+CEntity *CGameWorld::FindFirst(int Type)
+{
+	return Type < 0 || Type >= NUM_ENTTYPES ? 0 : m_apFirstEntityTypes[Type];
+}
+
+int CGameWorld::FindEntities(vec2 Pos, float Radius, CEntity **ppEnts, int Max, int Type)
+{
+	if(Type < 0 || Type >= NUM_ENTTYPES)
+		return 0;
+
+	int Num = 0;
+	for(CEntity *pEnt = m_apFirstEntityTypes[Type]; pEnt; pEnt = pEnt->m_pNextTypeEntity)
+	{
+		if(distance(pEnt->m_Pos, Pos) < Radius + pEnt->m_ProximityRadius)
+		{
+			if(ppEnts)
+				ppEnts[Num] = pEnt;
+			Num++;
+			if(Num == Max)
+				break;
+		}
+	}
+
+	return Num;
+}
+
+void CGameWorld::InsertEntity(CEntity *pEnt)
+{
+#ifdef CONF_DEBUG
+	for(CEntity *pCur = m_apFirstEntityTypes[pEnt->m_ObjType]; pCur; pCur = pCur->m_pNextTypeEntity)
+		dbg_assert(pCur != pEnt, "err");
+#endif
+
+	// insert it
+	if(m_apFirstEntityTypes[pEnt->m_ObjType])
+		m_apFirstEntityTypes[pEnt->m_ObjType]->m_pPrevTypeEntity = pEnt;
+	pEnt->m_pNextTypeEntity = m_apFirstEntityTypes[pEnt->m_ObjType];
+	pEnt->m_pPrevTypeEntity = 0x0;
+	m_apFirstEntityTypes[pEnt->m_ObjType] = pEnt;
+}
+
+void CGameWorld::RemoveEntity(CEntity *pEnt)
+{
+	// not in the list
+	if(!pEnt->m_pNextTypeEntity && !pEnt->m_pPrevTypeEntity && m_apFirstEntityTypes[pEnt->m_ObjType] != pEnt)
+		return;
+
+	// remove
+	if(pEnt->m_pPrevTypeEntity)
+		pEnt->m_pPrevTypeEntity->m_pNextTypeEntity = pEnt->m_pNextTypeEntity;
+	else
+		m_apFirstEntityTypes[pEnt->m_ObjType] = pEnt->m_pNextTypeEntity;
+	if(pEnt->m_pNextTypeEntity)
+		pEnt->m_pNextTypeEntity->m_pPrevTypeEntity = pEnt->m_pPrevTypeEntity;
+
+	// keep list traversing valid
+	if(m_pNextTraverseEntity == pEnt)
+		m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+
+	pEnt->m_pNextTypeEntity = 0;
+	pEnt->m_pPrevTypeEntity = 0;
+}
+
+//
+void CGameWorld::Snap(int SnappingClient)
+{
+	for(CEntity *pEnt = m_apFirstEntityTypes[ENTTYPE_CHARACTER]; pEnt;)
+	{
+		m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+		pEnt->Snap(SnappingClient);
+		pEnt = m_pNextTraverseEntity;
+	}
+
+	for(int i = 0; i < NUM_ENTTYPES; i++)
+	{
+		if(i == ENTTYPE_CHARACTER)
+			continue;
+
+		for(CEntity *pEnt = m_apFirstEntityTypes[i]; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->Snap(SnappingClient);
+			pEnt = m_pNextTraverseEntity;
+		}
+	}
+}
+
+void CGameWorld::Reset()
+{
+	// reset all entities
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->Reset();
+			pEnt = m_pNextTraverseEntity;
+		}
+	RemoveEntities();
+
+	GameServer()->m_pController->OnReset();
+	RemoveEntities();
+
+	m_ResetRequested = false;
+
+	GameServer()->CreateAllEntities(false);
+}
+
+void CGameWorld::RemoveEntitiesFromPlayer(int PlayerId)
+{
+	RemoveEntitiesFromPlayers(&PlayerId, 1);
+}
+
+void CGameWorld::RemoveEntitiesFromPlayers(int PlayerIds[], int NumPlayers)
+{
+	for(auto *pEnt : m_apFirstEntityTypes)
+	{
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			for(int i = 0; i < NumPlayers; i++)
+			{
+				if(pEnt->GetOwnerID() == PlayerIds[i])
+				{
+					RemoveEntity(pEnt);
+					pEnt->Destroy();
+					break;
+				}
+			}
+			pEnt = m_pNextTraverseEntity;
+		}
+	}
+}
+
+void CGameWorld::RemoveEntities()
+{
+	// destroy objects marked for destruction
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			if(pEnt->m_MarkedForDestroy)
+			{
+				RemoveEntity(pEnt);
+				pEnt->Destroy();
+			}
+			pEnt = m_pNextTraverseEntity;
+		}
+}
+
+void CGameWorld::Tick()
+{
+	if(m_ResetRequested)
+		Reset();
+
+	if(!m_Paused)
+	{
+		if(GameServer()->m_pController->IsForceBalanced())
+			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Teams have been balanced");
+
+		// update all objects
+		for(int i = 0; i < NUM_ENTTYPES; i++)
+		{
+			// It's important to call PreTick() and Tick() after each other.
+			// If we call PreTick() before, and Tick() after other entities have been processed, it causes physics changes such as a stronger shotgun or grenade.
+			if(g_Config.m_SvNoWeakHook && i == ENTTYPE_CHARACTER)
+			{
+				auto *pEnt = m_apFirstEntityTypes[i];
+				for(; pEnt;)
+				{
+					m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+					((CCharacter *)pEnt)->PreTick();
+					pEnt = m_pNextTraverseEntity;
+				}
+			}
+
+			auto *pEnt = m_apFirstEntityTypes[i];
+			for(; pEnt;)
+			{
+				m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+				pEnt->Tick();
+				pEnt = m_pNextTraverseEntity;
+			}
+		}
+
+		for(auto *pEnt : m_apFirstEntityTypes)
+			for(; pEnt;)
+			{
+				m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+				pEnt->TickDeferred();
+				pEnt = m_pNextTraverseEntity;
+			}
+	}
+	else
+	{
+		// update all objects
+		for(auto *pEnt : m_apFirstEntityTypes)
+			for(; pEnt;)
+			{
+				m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+				pEnt->TickPaused();
+				pEnt = m_pNextTraverseEntity;
+			}
+	}
+
+	RemoveEntities();
+
+	// find the characters' strong/weak id
+	int StrongWeakID = 0;
+	for(CCharacter *pChar = (CCharacter *)FindFirst(ENTTYPE_CHARACTER); pChar; pChar = (CCharacter *)pChar->TypeNext())
+	{
+		pChar->m_StrongWeakID = StrongWeakID;
+		StrongWeakID++;
+	}
+}
+
+void CGameWorld::SwapClients(int Client1, int Client2)
+{
+	// update all objects
+	for(auto *pEnt : m_apFirstEntityTypes)
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->SwapClients(Client1, Client2);
+			pEnt = m_pNextTraverseEntity;
+		}
+}
+
+// TODO: should be more general
+CCharacter *CGameWorld::IntersectCharacter(vec2 Pos0, vec2 Pos1, float Radius, vec2 &NewPos, const CCharacter *pNotThis, int CollideWith, const CCharacter *pThisOnly)
+{
+	// Find other players
+	float ClosestLen = distance(Pos0, Pos1) * 100.0f;
+	CCharacter *pClosest = 0;
+
+	CCharacter *p = (CCharacter *)FindFirst(ENTTYPE_CHARACTER);
+	for(; p; p = (CCharacter *)p->TypeNext())
+	{
+		if(p == pNotThis)
+			continue;
+
+		if(pThisOnly && p != pThisOnly)
+			continue;
+
+		if(CollideWith != -1 && !p->CanCollide(CollideWith))
+			continue;
+
+		vec2 IntersectPos;
+		if(closest_point_on_line(Pos0, Pos1, p->m_Pos, IntersectPos))
+		{
+			float Len = distance(p->m_Pos, IntersectPos);
+			if(Len < p->m_ProximityRadius + Radius)
+			{
+				Len = distance(Pos0, IntersectPos);
+				if(Len < ClosestLen)
+				{
+					NewPos = IntersectPos;
+					ClosestLen = Len;
+					pClosest = p;
+				}
+			}
+		}
+	}
+
+	return pClosest;
+}
+
+CCharacter *CGameWorld::ClosestCharacter(vec2 Pos, float Radius, const CEntity *pNotThis)
+{
+	// Find other players
+	float ClosestRange = Radius * 2;
+	CCharacter *pClosest = 0;
+
+	CCharacter *p = (CCharacter *)GameServer()->m_World.FindFirst(ENTTYPE_CHARACTER);
+	for(; p; p = (CCharacter *)p->TypeNext())
+	{
+		if(p == pNotThis)
+			continue;
+
+		float Len = distance(Pos, p->m_Pos);
+		if(Len < p->m_ProximityRadius + Radius)
+		{
+			if(Len < ClosestRange)
+			{
+				ClosestRange = Len;
+				pClosest = p;
+			}
+		}
+	}
+
+	return pClosest;
+}
+
+std::vector<CCharacter *> CGameWorld::IntersectedCharacters(vec2 Pos0, vec2 Pos1, float Radius, const CEntity *pNotThis)
+{
+	std::vector<CCharacter *> vpCharacters;
+	CCharacter *pChr = (CCharacter *)FindFirst(CGameWorld::ENTTYPE_CHARACTER);
+	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
+	{
+		if(pChr == pNotThis)
+			continue;
+
+		vec2 IntersectPos;
+		if(closest_point_on_line(Pos0, Pos1, pChr->m_Pos, IntersectPos))
+		{
+			float Len = distance(pChr->m_Pos, IntersectPos);
+			if(Len < pChr->m_ProximityRadius + Radius)
+			{
+				vpCharacters.push_back(pChr);
+			}
+		}
+	}
+	return vpCharacters;
+}
+
+void CGameWorld::ReleaseHooked(int ClientID)
+{
+	CCharacter *pChr = (CCharacter *)CGameWorld::FindFirst(CGameWorld::ENTTYPE_CHARACTER);
+	for(; pChr; pChr = (CCharacter *)pChr->TypeNext())
+	{
+		CCharacterCore *pCore = pChr->Core();
+		if(pCore->HookedPlayer() == ClientID && !pChr->IsSuper())
+		{
+			pCore->SetHookedPlayer(-1);
+			pCore->m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
+			pCore->m_HookState = HOOK_RETRACTED;
+		}
+	}
+}
+
+CTuningParams *CGameWorld::Tuning()
+{
+	return &m_Core.m_aTuning[0];
+}
diff --git a/src_bkp/game/server/gameworld.h b/src_bkp/game/server/gameworld.h
new file mode 100644
index 0000000000..c86af59fd1
--- /dev/null
+++ b/src_bkp/game/server/gameworld.h
@@ -0,0 +1,175 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_GAMEWORLD_H
+#define GAME_SERVER_GAMEWORLD_H
+
+#include <game/gamecore.h>
+
+#include <vector>
+
+class CEntity;
+class CCharacter;
+
+/*
+	Class: Game World
+		Tracks all entities in the game. Propagates tick and
+		snap calls to all entities.
+*/
+class CGameWorld
+{
+public:
+	enum
+	{
+		ENTTYPE_PROJECTILE = 0,
+		ENTTYPE_LASER,
+		ENTTYPE_PICKUP,
+		ENTTYPE_FLAG,
+		ENTTYPE_CHARACTER,
+		NUM_ENTTYPES
+	};
+
+private:
+	void Reset();
+	void RemoveEntities();
+
+	CEntity *m_pNextTraverseEntity = nullptr;
+	CEntity *m_apFirstEntityTypes[NUM_ENTTYPES];
+
+	class CGameContext *m_pGameServer;
+	class CConfig *m_pConfig;
+	class IServer *m_pServer;
+
+public:
+	class CGameContext *GameServer() { return m_pGameServer; }
+	class CConfig *Config() { return m_pConfig; }
+	class IServer *Server() { return m_pServer; }
+
+	bool m_ResetRequested;
+	bool m_Paused;
+	CWorldCore m_Core;
+
+	CGameWorld();
+	~CGameWorld();
+
+	void SetGameServer(CGameContext *pGameServer);
+
+	CEntity *FindFirst(int Type);
+
+	/*
+		Function: FindEntities
+			Finds entities close to a position and returns them in a list.
+
+		Arguments:
+			Pos - Position.
+			Radius - How close the entities have to be.
+			ppEnts - Pointer to a list that should be filled with the pointers
+				to the entities.
+			Max - Number of entities that fits into the ents array.
+			Type - Type of the entities to find.
+
+		Returns:
+			Number of entities found and added to the ents array.
+	*/
+	int FindEntities(vec2 Pos, float Radius, CEntity **ppEnts, int Max, int Type);
+
+	/*
+		Function: InterserctCharacters
+			Finds the CCharacters that intersects the line. // made for types lasers=1 and doors=0
+
+		Arguments:
+			Pos0 - Start position
+			Pos1 - End position
+			Radius - How for from the line the CCharacter is allowed to be.
+			NewPos - Intersection position
+			pNotThis - Entity to ignore intersecting with
+
+		Returns:
+			Returns a pointer to the closest hit or NULL of there is no intersection.
+	*/
+	CCharacter *IntersectCharacter(vec2 Pos0, vec2 Pos1, float Radius, vec2 &NewPos, const CCharacter *pNotThis = nullptr, int CollideWith = -1, const CCharacter *pThisOnly = nullptr);
+	/*
+		Function: ClosestCharacter
+			Finds the closest CCharacter to a specific point.
+
+		Arguments:
+			Pos - The center position.
+			Radius - How far off the CCharacter is allowed to be
+			pNotThis - Entity to ignore
+
+		Returns:
+			Returns a pointer to the closest CCharacter or NULL if no CCharacter is close enough.
+	*/
+	CCharacter *ClosestCharacter(vec2 Pos, float Radius, const CEntity *pNotThis);
+
+	/*
+		Function: InsertEntity
+			Adds an entity to the world.
+
+		Arguments:
+			pEntity - Entity to add
+	*/
+	void InsertEntity(CEntity *pEntity);
+
+	/*
+		Function: RemoveEntity
+			Removes an entity from the world.
+
+		Arguments:
+			pEntity - Entity to remove
+	*/
+	void RemoveEntity(CEntity *pEntity);
+
+	void RemoveEntitiesFromPlayer(int PlayerId);
+	void RemoveEntitiesFromPlayers(int PlayerIds[], int NumPlayers);
+
+	/*
+		Function: Snap
+			Calls Snap on all the entities in the world to create
+			the snapshot.
+
+		Arguments:
+			SnappingClient - ID of the client which snapshot
+			is being created.
+	*/
+	void Snap(int SnappingClient);
+
+	/*
+		Function: Tick
+			Calls Tick on all the entities in the world to progress
+			the world to the next tick.
+	*/
+	void Tick();
+
+	/*
+		Function: SwapClients
+			Calls SwapClients on all the entities in the world to ensure that /swap
+			command is handled safely.
+	*/
+	void SwapClients(int Client1, int Client2);
+
+	// DDRace
+	void ReleaseHooked(int ClientID);
+
+	/*
+		Function: IntersectedCharacters
+			Finds all CCharacters that intersect the line.
+
+		Arguments:
+			Pos0 - Start position
+			Pos1 - End position
+			Radius - How for from the line the CCharacter is allowed to be.
+			pNotThis - Entity to ignore intersecting with
+
+		Returns:
+			Returns list with all Characters on line.
+	*/
+	std::vector<CCharacter *> IntersectedCharacters(vec2 Pos0, vec2 Pos1, float Radius, const CEntity *pNotThis = nullptr);
+
+	CTuningParams *Tuning();
+
+	CTuningParams *m_pTuningList;
+	CTuningParams *TuningList() { return m_pTuningList; }
+	CTuningParams *GetTuning(int i) { return &TuningList()[i]; }
+};
+
+#endif
diff --git a/src_bkp/game/server/player.cpp b/src_bkp/game/server/player.cpp
new file mode 100644
index 0000000000..77630471f5
--- /dev/null
+++ b/src_bkp/game/server/player.cpp
@@ -0,0 +1,934 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "player.h"
+#include "entities/character.h"
+#include "gamecontext.h"
+#include "gamecontroller.h"
+#include "score.h"
+
+#include <base/system.h>
+
+#include <engine/antibot.h>
+#include <engine/server.h>
+#include <engine/shared/config.h>
+
+#include <game/gamecore.h>
+#include <game/teamscore.h>
+
+MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS)
+
+IServer *CPlayer::Server() const { return m_pGameServer->Server(); }
+
+CPlayer::CPlayer(CGameContext *pGameServer, uint32_t UniqueClientID, int ClientID, int Team) :
+	m_UniqueClientID(UniqueClientID)
+{
+	m_pGameServer = pGameServer;
+	m_ClientID = ClientID;
+	m_Team = GameServer()->m_pController->ClampTeam(Team);
+	m_NumInputs = 0;
+	Reset();
+	GameServer()->Antibot()->OnPlayerInit(m_ClientID);
+}
+
+CPlayer::~CPlayer()
+{
+	GameServer()->Antibot()->OnPlayerDestroy(m_ClientID);
+	delete m_pLastTarget;
+	delete m_pCharacter;
+	m_pCharacter = 0;
+}
+
+void CPlayer::Reset()
+{
+	m_DieTick = Server()->Tick();
+	m_PreviousDieTick = m_DieTick;
+	m_JoinTick = Server()->Tick();
+	delete m_pCharacter;
+	m_pCharacter = 0;
+	m_SpectatorID = SPEC_FREEVIEW;
+	m_LastActionTick = Server()->Tick();
+	m_TeamChangeTick = Server()->Tick();
+	m_LastInvited = 0;
+	m_WeakHookSpawn = false;
+
+	int *pIdMap = Server()->GetIdMap(m_ClientID);
+	for(int i = 1; i < VANILLA_MAX_CLIENTS; i++)
+	{
+		pIdMap[i] = -1;
+	}
+	pIdMap[0] = m_ClientID;
+
+	// DDRace
+
+	m_LastCommandPos = 0;
+	m_LastPlaytime = 0;
+	m_ChatScore = 0;
+	m_Moderating = false;
+	m_EyeEmoteEnabled = true;
+	if(Server()->IsSixup(m_ClientID))
+		m_TimerType = TIMERTYPE_SIXUP;
+	else
+		m_TimerType = (g_Config.m_SvDefaultTimerType == TIMERTYPE_GAMETIMER || g_Config.m_SvDefaultTimerType == TIMERTYPE_GAMETIMER_AND_BROADCAST) ? TIMERTYPE_BROADCAST : g_Config.m_SvDefaultTimerType;
+
+	m_DefEmote = EMOTE_NORMAL;
+	m_Afk = true;
+	m_LastWhisperTo = -1;
+	m_LastSetSpectatorMode = 0;
+	m_aTimeoutCode[0] = '\0';
+	delete m_pLastTarget;
+	m_pLastTarget = new CNetObj_PlayerInput({0});
+	m_LastTargetInit = false;
+	m_TuneZone = 0;
+	m_TuneZoneOld = m_TuneZone;
+	m_Halloween = false;
+	m_FirstPacket = true;
+
+	m_SendVoteIndex = -1;
+
+	if(g_Config.m_Events)
+	{
+		const ETimeSeason Season = time_season();
+		if(Season == SEASON_NEWYEAR)
+		{
+			m_DefEmote = EMOTE_HAPPY;
+		}
+		else if(Season == SEASON_HALLOWEEN)
+		{
+			m_DefEmote = EMOTE_ANGRY;
+			m_Halloween = true;
+		}
+		else
+		{
+			m_DefEmote = EMOTE_NORMAL;
+		}
+	}
+	m_OverrideEmoteReset = -1;
+
+	GameServer()->Score()->PlayerData(m_ClientID)->Reset();
+
+	m_Last_KickVote = 0;
+	m_Last_Team = 0;
+	m_ShowOthers = g_Config.m_SvShowOthersDefault;
+	m_ShowAll = g_Config.m_SvShowAllDefault;
+	m_ShowDistance = vec2(1200, 800);
+	m_SpecTeam = false;
+	m_NinjaJetpack = false;
+
+	m_Paused = PAUSE_NONE;
+	m_DND = false;
+
+	m_LastPause = 0;
+	m_Score.reset();
+
+	// Variable initialized:
+	m_Last_Team = 0;
+	m_LastSQLQuery = 0;
+	m_ScoreQueryResult = nullptr;
+	m_ScoreFinishResult = nullptr;
+
+	int64_t Now = Server()->Tick();
+	int64_t TickSpeed = Server()->TickSpeed();
+	// If the player joins within ten seconds of the server becoming
+	// non-empty, allow them to vote immediately. This allows players to
+	// vote after map changes or when they join an empty server.
+	//
+	// Otherwise, block voting in the beginning after joining.
+	if(Now > GameServer()->m_NonEmptySince + 10 * TickSpeed)
+		m_FirstVoteTick = Now + g_Config.m_SvJoinVoteDelay * TickSpeed;
+	else
+		m_FirstVoteTick = Now;
+
+	m_NotEligibleForFinish = false;
+	m_EligibleForFinishCheck = 0;
+	m_VotedForPractice = false;
+	m_SwapTargetsClientID = -1;
+	m_BirthdayAnnounced = false;
+}
+
+static int PlayerFlags_SixToSeven(int Flags)
+{
+	int Seven = 0;
+	if(Flags & PLAYERFLAG_CHATTING)
+		Seven |= protocol7::PLAYERFLAG_CHATTING;
+	if(Flags & PLAYERFLAG_SCOREBOARD)
+		Seven |= protocol7::PLAYERFLAG_SCOREBOARD;
+
+	return Seven;
+}
+
+void CPlayer::Tick()
+{
+	if(m_ScoreQueryResult != nullptr && m_ScoreQueryResult->m_Completed)
+	{
+		ProcessScoreResult(*m_ScoreQueryResult);
+		m_ScoreQueryResult = nullptr;
+	}
+	if(m_ScoreFinishResult != nullptr && m_ScoreFinishResult->m_Completed)
+	{
+		ProcessScoreResult(*m_ScoreFinishResult);
+		m_ScoreFinishResult = nullptr;
+	}
+
+	if(!Server()->ClientIngame(m_ClientID))
+		return;
+
+	if(m_ChatScore > 0)
+		m_ChatScore--;
+
+	Server()->SetClientScore(m_ClientID, m_Score);
+
+	if(m_Moderating && m_Afk)
+	{
+		m_Moderating = false;
+		GameServer()->SendChatTarget(m_ClientID, "Active moderator mode disabled because you are afk.");
+
+		if(!GameServer()->PlayerModerating())
+			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Server kick/spec votes are no longer actively moderated.");
+	}
+
+	// do latency stuff
+	{
+		IServer::CClientInfo Info;
+		if(Server()->GetClientInfo(m_ClientID, &Info))
+		{
+			m_Latency.m_Accum += Info.m_Latency;
+			m_Latency.m_AccumMax = maximum(m_Latency.m_AccumMax, Info.m_Latency);
+			m_Latency.m_AccumMin = minimum(m_Latency.m_AccumMin, Info.m_Latency);
+		}
+		// each second
+		if(Server()->Tick() % Server()->TickSpeed() == 0)
+		{
+			m_Latency.m_Avg = m_Latency.m_Accum / Server()->TickSpeed();
+			m_Latency.m_Max = m_Latency.m_AccumMax;
+			m_Latency.m_Min = m_Latency.m_AccumMin;
+			m_Latency.m_Accum = 0;
+			m_Latency.m_AccumMin = 1000;
+			m_Latency.m_AccumMax = 0;
+		}
+	}
+
+	if(Server()->GetNetErrorString(m_ClientID)[0])
+	{
+		SetAfk(true);
+
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf), "'%s' would have timed out, but can use timeout protection now", Server()->ClientName(m_ClientID));
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+		Server()->ResetNetErrorString(m_ClientID);
+	}
+
+	if(!GameServer()->m_World.m_Paused)
+	{
+		int EarliestRespawnTick = m_PreviousDieTick + Server()->TickSpeed() * 3;
+		int RespawnTick = maximum(m_DieTick, EarliestRespawnTick) + 2;
+		if(!m_pCharacter && RespawnTick <= Server()->Tick())
+			m_Spawning = true;
+
+		if(m_pCharacter)
+		{
+			if(m_pCharacter->IsAlive())
+			{
+				ProcessPause();
+				if(!m_Paused)
+					m_ViewPos = m_pCharacter->m_Pos;
+			}
+			else if(!m_pCharacter->IsPaused())
+			{
+				delete m_pCharacter;
+				m_pCharacter = 0;
+			}
+		}
+		else if(m_Spawning && !m_WeakHookSpawn)
+			TryRespawn();
+	}
+	else
+	{
+		++m_DieTick;
+		++m_PreviousDieTick;
+		++m_JoinTick;
+		++m_LastActionTick;
+		++m_TeamChangeTick;
+	}
+
+	m_TuneZoneOld = m_TuneZone; // determine needed tunings with viewpos
+	int CurrentIndex = GameServer()->Collision()->GetMapIndex(m_ViewPos);
+	m_TuneZone = GameServer()->Collision()->IsTune(CurrentIndex);
+
+	if(m_TuneZone != m_TuneZoneOld) // don't send tunings all the time
+	{
+		GameServer()->SendTuningParams(m_ClientID, m_TuneZone);
+	}
+
+	if(m_OverrideEmoteReset >= 0 && m_OverrideEmoteReset <= Server()->Tick())
+	{
+		m_OverrideEmoteReset = -1;
+	}
+
+	if(m_Halloween && m_pCharacter && !m_pCharacter->IsPaused())
+	{
+		if(1200 - ((Server()->Tick() - m_pCharacter->GetLastAction()) % (1200)) < 5)
+		{
+			GameServer()->SendEmoticon(GetCID(), EMOTICON_GHOST, -1);
+		}
+	}
+}
+
+void CPlayer::PostTick()
+{
+	// update latency value
+	if(m_PlayerFlags & PLAYERFLAG_IN_MENU)
+		m_aCurLatency[m_ClientID] = GameServer()->m_apPlayers[m_ClientID]->m_Latency.m_Min;
+
+	if(m_PlayerFlags & PLAYERFLAG_SCOREBOARD)
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
+				m_aCurLatency[i] = GameServer()->m_apPlayers[i]->m_Latency.m_Min;
+		}
+	}
+
+	// update view pos for spectators
+	if((m_Team == TEAM_SPECTATORS || m_Paused) && m_SpectatorID != SPEC_FREEVIEW && GameServer()->m_apPlayers[m_SpectatorID] && GameServer()->m_apPlayers[m_SpectatorID]->GetCharacter())
+		m_ViewPos = GameServer()->m_apPlayers[m_SpectatorID]->GetCharacter()->m_Pos;
+}
+
+void CPlayer::PostPostTick()
+{
+	if(!Server()->ClientIngame(m_ClientID))
+		return;
+
+	if(!GameServer()->m_World.m_Paused && !m_pCharacter && m_Spawning && m_WeakHookSpawn)
+		TryRespawn();
+}
+
+void CPlayer::Snap(int SnappingClient)
+{
+	if(!Server()->ClientIngame(m_ClientID))
+		return;
+
+	int id = m_ClientID;
+	if(!Server()->Translate(id, SnappingClient))
+		return;
+
+	CNetObj_ClientInfo *pClientInfo = Server()->SnapNewItem<CNetObj_ClientInfo>(id);
+	if(!pClientInfo)
+		return;
+
+	StrToInts(&pClientInfo->m_Name0, 4, Server()->ClientName(m_ClientID));
+	StrToInts(&pClientInfo->m_Clan0, 3, Server()->ClientClan(m_ClientID));
+	pClientInfo->m_Country = Server()->ClientCountry(m_ClientID);
+	StrToInts(&pClientInfo->m_Skin0, 6, m_TeeInfos.m_aSkinName);
+	pClientInfo->m_UseCustomColor = m_TeeInfos.m_UseCustomColor;
+	pClientInfo->m_ColorBody = m_TeeInfos.m_ColorBody;
+	pClientInfo->m_ColorFeet = m_TeeInfos.m_ColorFeet;
+
+	int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
+	int Latency = SnappingClient == SERVER_DEMO_CLIENT ? m_Latency.m_Min : GameServer()->m_apPlayers[SnappingClient]->m_aCurLatency[m_ClientID];
+
+	int Score;
+	// This is the time sent to the player while ingame (do not confuse to the one reported to the master server).
+	// Due to clients expecting this as a negative value, we have to make sure it's negative.
+	// Special numbers:
+	// -9999: means no time and isn't displayed in the scoreboard.
+	if(m_Score.has_value())
+	{
+		// shift the time by a second if the player actually took 9999
+		// seconds to finish the map.
+		if(m_Score.value() == 9999)
+			Score = -10000;
+		else
+			Score = -m_Score.value();
+	}
+	else
+	{
+		Score = -9999;
+	}
+
+	// send 0 if times of others are not shown
+	if(SnappingClient != m_ClientID && g_Config.m_SvHideScore)
+		Score = -9999;
+
+	if(!Server()->IsSixup(SnappingClient))
+	{
+		CNetObj_PlayerInfo *pPlayerInfo = Server()->SnapNewItem<CNetObj_PlayerInfo>(id);
+		if(!pPlayerInfo)
+			return;
+
+		pPlayerInfo->m_Latency = Latency;
+		pPlayerInfo->m_Score = Score;
+		pPlayerInfo->m_Local = (int)(m_ClientID == SnappingClient && (m_Paused != PAUSE_PAUSED || SnappingClientVersion >= VERSION_DDNET_OLD));
+		pPlayerInfo->m_ClientID = id;
+		pPlayerInfo->m_Team = m_Team;
+		if(SnappingClientVersion < VERSION_DDNET_INDEPENDENT_SPECTATORS_TEAM)
+		{
+			// In older versions the SPECTATORS TEAM was also used if the own player is in PAUSE_PAUSED or if any player is in PAUSE_SPEC.
+			pPlayerInfo->m_Team = (m_Paused != PAUSE_PAUSED || m_ClientID != SnappingClient) && m_Paused < PAUSE_SPEC ? m_Team : TEAM_SPECTATORS;
+		}
+	}
+	else
+	{
+		protocol7::CNetObj_PlayerInfo *pPlayerInfo = Server()->SnapNewItem<protocol7::CNetObj_PlayerInfo>(id);
+		if(!pPlayerInfo)
+			return;
+
+		pPlayerInfo->m_PlayerFlags = PlayerFlags_SixToSeven(m_PlayerFlags);
+		if(SnappingClientVersion >= VERSION_DDRACE && (m_PlayerFlags & PLAYERFLAG_AIM))
+			pPlayerInfo->m_PlayerFlags |= protocol7::PLAYERFLAG_AIM;
+		if(Server()->ClientAuthed(m_ClientID))
+			pPlayerInfo->m_PlayerFlags |= protocol7::PLAYERFLAG_ADMIN;
+
+		// Times are in milliseconds for 0.7
+		pPlayerInfo->m_Score = m_Score.has_value() ? GameServer()->Score()->PlayerData(m_ClientID)->m_BestTime * 1000 : -1;
+		pPlayerInfo->m_Latency = Latency;
+	}
+
+	if(m_ClientID == SnappingClient && (m_Team == TEAM_SPECTATORS || m_Paused))
+	{
+		if(!Server()->IsSixup(SnappingClient))
+		{
+			CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(m_ClientID);
+			if(!pSpectatorInfo)
+				return;
+
+			pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+			pSpectatorInfo->m_X = m_ViewPos.x;
+			pSpectatorInfo->m_Y = m_ViewPos.y;
+		}
+		else
+		{
+			protocol7::CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<protocol7::CNetObj_SpectatorInfo>(m_ClientID);
+			if(!pSpectatorInfo)
+				return;
+
+			pSpectatorInfo->m_SpecMode = m_SpectatorID == SPEC_FREEVIEW ? protocol7::SPEC_FREEVIEW : protocol7::SPEC_PLAYER;
+			pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+			pSpectatorInfo->m_X = m_ViewPos.x;
+			pSpectatorInfo->m_Y = m_ViewPos.y;
+		}
+	}
+
+	CNetObj_DDNetPlayer *pDDNetPlayer = Server()->SnapNewItem<CNetObj_DDNetPlayer>(id);
+	if(!pDDNetPlayer)
+		return;
+
+	pDDNetPlayer->m_AuthLevel = Server()->GetAuthedState(m_ClientID);
+	pDDNetPlayer->m_Flags = 0;
+	if(m_Afk)
+		pDDNetPlayer->m_Flags |= EXPLAYERFLAG_AFK;
+	if(m_Paused == PAUSE_SPEC)
+		pDDNetPlayer->m_Flags |= EXPLAYERFLAG_SPEC;
+	if(m_Paused == PAUSE_PAUSED)
+		pDDNetPlayer->m_Flags |= EXPLAYERFLAG_PAUSED;
+
+	if(Server()->IsSixup(SnappingClient) && m_pCharacter && m_pCharacter->m_DDRaceState == DDRACE_STARTED &&
+		GameServer()->m_apPlayers[SnappingClient]->m_TimerType == TIMERTYPE_SIXUP)
+	{
+		protocol7::CNetObj_PlayerInfoRace *pRaceInfo = Server()->SnapNewItem<protocol7::CNetObj_PlayerInfoRace>(id);
+		if(!pRaceInfo)
+			return;
+		pRaceInfo->m_RaceStartTick = m_pCharacter->m_StartTime;
+	}
+
+	bool ShowSpec = m_pCharacter && m_pCharacter->IsPaused() && m_pCharacter->CanSnapCharacter(SnappingClient);
+
+	if(SnappingClient != SERVER_DEMO_CLIENT)
+	{
+		CPlayer *pSnapPlayer = GameServer()->m_apPlayers[SnappingClient];
+		ShowSpec = ShowSpec && (GameServer()->GetDDRaceTeam(m_ClientID) == GameServer()->GetDDRaceTeam(SnappingClient) || pSnapPlayer->m_ShowOthers == SHOW_OTHERS_ON || (pSnapPlayer->GetTeam() == TEAM_SPECTATORS || pSnapPlayer->IsPaused()));
+	}
+
+	if(ShowSpec)
+	{
+		CNetObj_SpecChar *pSpecChar = Server()->SnapNewItem<CNetObj_SpecChar>(id);
+		if(!pSpecChar)
+			return;
+
+		pSpecChar->m_X = m_pCharacter->Core()->m_Pos.x;
+		pSpecChar->m_Y = m_pCharacter->Core()->m_Pos.y;
+	}
+}
+
+void CPlayer::FakeSnap()
+{
+	if(GetClientVersion() >= VERSION_DDNET_OLD)
+		return;
+
+	if(Server()->IsSixup(m_ClientID))
+		return;
+
+	int FakeID = VANILLA_MAX_CLIENTS - 1;
+
+	CNetObj_ClientInfo *pClientInfo = Server()->SnapNewItem<CNetObj_ClientInfo>(FakeID);
+
+	if(!pClientInfo)
+		return;
+
+	StrToInts(&pClientInfo->m_Name0, 4, " ");
+	StrToInts(&pClientInfo->m_Clan0, 3, "");
+	StrToInts(&pClientInfo->m_Skin0, 6, "default");
+
+	if(m_Paused != PAUSE_PAUSED)
+		return;
+
+	CNetObj_PlayerInfo *pPlayerInfo = Server()->SnapNewItem<CNetObj_PlayerInfo>(FakeID);
+	if(!pPlayerInfo)
+		return;
+
+	pPlayerInfo->m_Latency = m_Latency.m_Min;
+	pPlayerInfo->m_Local = 1;
+	pPlayerInfo->m_ClientID = FakeID;
+	pPlayerInfo->m_Score = -9999;
+	pPlayerInfo->m_Team = TEAM_SPECTATORS;
+
+	CNetObj_SpectatorInfo *pSpectatorInfo = Server()->SnapNewItem<CNetObj_SpectatorInfo>(FakeID);
+	if(!pSpectatorInfo)
+		return;
+
+	pSpectatorInfo->m_SpectatorID = m_SpectatorID;
+	pSpectatorInfo->m_X = m_ViewPos.x;
+	pSpectatorInfo->m_Y = m_ViewPos.y;
+}
+
+void CPlayer::OnDisconnect()
+{
+	KillCharacter();
+
+	m_Moderating = false;
+}
+
+void CPlayer::OnPredictedInput(CNetObj_PlayerInput *pNewInput)
+{
+	// skip the input if chat is active
+	if((m_PlayerFlags & PLAYERFLAG_CHATTING) && (pNewInput->m_PlayerFlags & PLAYERFLAG_CHATTING))
+		return;
+
+	AfkTimer();
+
+	m_NumInputs++;
+
+	if(m_pCharacter && !m_Paused)
+		m_pCharacter->OnPredictedInput(pNewInput);
+
+	// Magic number when we can hope that client has successfully identified itself
+	if(m_NumInputs == 20 && g_Config.m_SvClientSuggestion[0] != '\0' && GetClientVersion() <= VERSION_DDNET_OLD)
+		GameServer()->SendBroadcast(g_Config.m_SvClientSuggestion, m_ClientID);
+	else if(m_NumInputs == 200 && Server()->IsSixup(m_ClientID))
+		GameServer()->SendBroadcast("This server uses an experimental translation from Teeworlds 0.7 to 0.6. Please report bugs on ddnet.org/discord", m_ClientID);
+}
+
+void CPlayer::OnDirectInput(CNetObj_PlayerInput *pNewInput)
+{
+	Server()->SetClientFlags(m_ClientID, pNewInput->m_PlayerFlags);
+
+	AfkTimer();
+
+	if(((!m_pCharacter && m_Team == TEAM_SPECTATORS) || m_Paused) && m_SpectatorID == SPEC_FREEVIEW)
+		m_ViewPos = vec2(pNewInput->m_TargetX, pNewInput->m_TargetY);
+
+	// check for activity
+	if(mem_comp(pNewInput, m_pLastTarget, sizeof(CNetObj_PlayerInput)))
+	{
+		mem_copy(m_pLastTarget, pNewInput, sizeof(CNetObj_PlayerInput));
+		// Ignore the first direct input and keep the player afk as it is sent automatically
+		if(m_LastTargetInit)
+			UpdatePlaytime();
+		m_LastActionTick = Server()->Tick();
+		m_LastTargetInit = true;
+	}
+}
+
+void CPlayer::OnPredictedEarlyInput(CNetObj_PlayerInput *pNewInput)
+{
+	m_PlayerFlags = pNewInput->m_PlayerFlags;
+
+	if(!m_pCharacter && m_Team != TEAM_SPECTATORS && (pNewInput->m_Fire & 1))
+		m_Spawning = true;
+
+	// skip the input if chat is active
+	if(m_PlayerFlags & PLAYERFLAG_CHATTING)
+		return;
+
+	if(m_pCharacter && !m_Paused)
+		m_pCharacter->OnDirectInput(pNewInput);
+}
+
+int CPlayer::GetClientVersion() const
+{
+	return m_pGameServer->GetClientVersion(m_ClientID);
+}
+
+CCharacter *CPlayer::GetCharacter()
+{
+	if(m_pCharacter && m_pCharacter->IsAlive())
+		return m_pCharacter;
+	return 0;
+}
+
+const CCharacter *CPlayer::GetCharacter() const
+{
+	if(m_pCharacter && m_pCharacter->IsAlive())
+		return m_pCharacter;
+	return 0;
+}
+
+void CPlayer::KillCharacter(int Weapon, bool SendKillMsg)
+{
+	if(m_pCharacter)
+	{
+		m_pCharacter->Die(m_ClientID, Weapon, SendKillMsg);
+
+		delete m_pCharacter;
+		m_pCharacter = 0;
+	}
+}
+
+void CPlayer::Respawn(bool WeakHook)
+{
+	if(m_Team != TEAM_SPECTATORS)
+	{
+		m_WeakHookSpawn = WeakHook;
+		m_Spawning = true;
+	}
+}
+
+CCharacter *CPlayer::ForceSpawn(vec2 Pos)
+{
+	m_Spawning = false;
+	m_pCharacter = new(m_ClientID) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientID));
+	m_pCharacter->Spawn(this, Pos);
+	m_Team = 0;
+	return m_pCharacter;
+}
+
+void CPlayer::SetTeam(int Team, bool DoChatMsg)
+{
+	KillCharacter();
+
+	m_Team = Team;
+	m_LastSetTeam = Server()->Tick();
+	m_LastActionTick = Server()->Tick();
+	m_SpectatorID = SPEC_FREEVIEW;
+
+	protocol7::CNetMsg_Sv_Team Msg;
+	Msg.m_ClientID = m_ClientID;
+	Msg.m_Team = m_Team;
+	Msg.m_Silent = !DoChatMsg;
+	Msg.m_CooldownTick = m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+
+	if(Team == TEAM_SPECTATORS)
+	{
+		// update spectator modes
+		for(auto &pPlayer : GameServer()->m_apPlayers)
+		{
+			if(pPlayer && pPlayer->m_SpectatorID == m_ClientID)
+				pPlayer->m_SpectatorID = SPEC_FREEVIEW;
+		}
+	}
+}
+
+bool CPlayer::SetTimerType(int TimerType)
+{
+	if(TimerType == TIMERTYPE_DEFAULT)
+	{
+		if(Server()->IsSixup(m_ClientID))
+			m_TimerType = TIMERTYPE_SIXUP;
+		else
+			SetTimerType(g_Config.m_SvDefaultTimerType);
+
+		return true;
+	}
+
+	if(Server()->IsSixup(m_ClientID))
+	{
+		if(TimerType == TIMERTYPE_SIXUP || TimerType == TIMERTYPE_NONE)
+		{
+			m_TimerType = TimerType;
+			return true;
+		}
+		else
+			return false;
+	}
+
+	if(TimerType == TIMERTYPE_GAMETIMER)
+	{
+		if(GetClientVersion() >= VERSION_DDNET_GAMETICK)
+			m_TimerType = TimerType;
+		else
+			return false;
+	}
+	else if(TimerType == TIMERTYPE_GAMETIMER_AND_BROADCAST)
+	{
+		if(GetClientVersion() >= VERSION_DDNET_GAMETICK)
+			m_TimerType = TimerType;
+		else
+		{
+			m_TimerType = TIMERTYPE_BROADCAST;
+			return false;
+		}
+	}
+	else
+		m_TimerType = TimerType;
+
+	return true;
+}
+
+void CPlayer::TryRespawn()
+{
+	vec2 SpawnPos;
+
+	if(!GameServer()->m_pController->CanSpawn(m_Team, &SpawnPos, GameServer()->GetDDRaceTeam(m_ClientID)))
+		return;
+
+	m_WeakHookSpawn = false;
+	m_Spawning = false;
+	m_pCharacter = new(m_ClientID) CCharacter(&GameServer()->m_World, GameServer()->GetLastPlayerInput(m_ClientID));
+	m_ViewPos = SpawnPos;
+	m_pCharacter->Spawn(this, SpawnPos);
+	GameServer()->CreatePlayerSpawn(SpawnPos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+		m_pCharacter->SetSolo(true);
+}
+
+void CPlayer::UpdatePlaytime()
+{
+	m_LastPlaytime = time_get();
+}
+
+void CPlayer::AfkTimer()
+{
+	SetAfk(g_Config.m_SvMaxAfkTime != 0 && m_LastPlaytime < time_get() - time_freq() * g_Config.m_SvMaxAfkTime);
+}
+
+void CPlayer::SetAfk(bool Afk)
+{
+	if(m_Afk != Afk)
+	{
+		Server()->ExpireServerInfo();
+		m_Afk = Afk;
+	}
+}
+
+void CPlayer::SetInitialAfk(bool Afk)
+{
+	if(g_Config.m_SvMaxAfkTime == 0)
+	{
+		SetAfk(false);
+		return;
+	}
+
+	SetAfk(Afk);
+
+	// Ensure that the AFK state is not reset again automatically
+	if(Afk)
+		m_LastPlaytime = time_get() - time_freq() * g_Config.m_SvMaxAfkTime - 1;
+	else
+		m_LastPlaytime = time_get();
+}
+
+int CPlayer::GetDefaultEmote() const
+{
+	if(m_OverrideEmoteReset >= 0)
+		return m_OverrideEmote;
+
+	return m_DefEmote;
+}
+
+void CPlayer::OverrideDefaultEmote(int Emote, int Tick)
+{
+	m_OverrideEmote = Emote;
+	m_OverrideEmoteReset = Tick;
+	m_LastEyeEmote = Server()->Tick();
+}
+
+bool CPlayer::CanOverrideDefaultEmote() const
+{
+	return m_LastEyeEmote == 0 || m_LastEyeEmote + (int64_t)g_Config.m_SvEyeEmoteChangeDelay * Server()->TickSpeed() < Server()->Tick();
+}
+
+void CPlayer::ProcessPause()
+{
+	if(m_ForcePauseTime && m_ForcePauseTime < Server()->Tick())
+	{
+		m_ForcePauseTime = 0;
+		Pause(PAUSE_NONE, true);
+	}
+
+	if(m_Paused == PAUSE_SPEC && !m_pCharacter->IsPaused() && m_pCharacter->IsGrounded() && m_pCharacter->m_Pos == m_pCharacter->m_PrevPos)
+	{
+		m_pCharacter->Pause(true);
+		GameServer()->CreateDeath(m_pCharacter->m_Pos, m_ClientID, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+		GameServer()->CreateSound(m_pCharacter->m_Pos, SOUND_PLAYER_DIE, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+	}
+}
+
+int CPlayer::Pause(int State, bool Force)
+{
+	if(State < PAUSE_NONE || State > PAUSE_SPEC) // Invalid pause state passed
+		return 0;
+
+	if(!m_pCharacter)
+		return 0;
+
+	char aBuf[128];
+	if(State != m_Paused)
+	{
+		// Get to wanted state
+		switch(State)
+		{
+		case PAUSE_PAUSED:
+		case PAUSE_NONE:
+			if(m_pCharacter->IsPaused()) // First condition might be unnecessary
+			{
+				if(!Force && m_LastPause && m_LastPause + (int64_t)g_Config.m_SvSpecFrequency * Server()->TickSpeed() > Server()->Tick())
+				{
+					GameServer()->SendChatTarget(m_ClientID, "Can't /spec that quickly.");
+					return m_Paused; // Do not update state. Do not collect $200
+				}
+				m_pCharacter->Pause(false);
+				m_ViewPos = m_pCharacter->m_Pos;
+				GameServer()->CreatePlayerSpawn(m_pCharacter->m_Pos, GameServer()->m_pController->GetMaskForPlayerWorldEvent(m_ClientID));
+			}
+			[[fallthrough]];
+		case PAUSE_SPEC:
+			if(g_Config.m_SvPauseMessages)
+			{
+				str_format(aBuf, sizeof(aBuf), (State > PAUSE_NONE) ? "'%s' speced" : "'%s' resumed", Server()->ClientName(m_ClientID));
+				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+			}
+			break;
+		}
+
+		// Update state
+		m_Paused = State;
+		m_LastPause = Server()->Tick();
+
+		// Sixup needs a teamchange
+		protocol7::CNetMsg_Sv_Team Msg;
+		Msg.m_ClientID = m_ClientID;
+		Msg.m_CooldownTick = Server()->Tick();
+		Msg.m_Silent = true;
+		Msg.m_Team = m_Paused ? protocol7::TEAM_SPECTATORS : m_Team;
+
+		GameServer()->Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, m_ClientID);
+	}
+
+	return m_Paused;
+}
+
+int CPlayer::ForcePause(int Time)
+{
+	m_ForcePauseTime = Server()->Tick() + Server()->TickSpeed() * Time;
+
+	if(g_Config.m_SvPauseMessages)
+	{
+		char aBuf[128];
+		str_format(aBuf, sizeof(aBuf), "'%s' was force-paused for %ds", Server()->ClientName(m_ClientID), Time);
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+	}
+
+	return Pause(PAUSE_SPEC, true);
+}
+
+int CPlayer::IsPaused() const
+{
+	return m_ForcePauseTime ? m_ForcePauseTime : -1 * m_Paused;
+}
+
+bool CPlayer::IsPlaying() const
+{
+	return m_pCharacter && m_pCharacter->IsAlive();
+}
+
+void CPlayer::SpectatePlayerName(const char *pName)
+{
+	if(!pName)
+		return;
+
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(i != m_ClientID && Server()->ClientIngame(i) && !str_comp(pName, Server()->ClientName(i)))
+		{
+			m_SpectatorID = i;
+			return;
+		}
+	}
+}
+
+void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
+{
+	if(Result.m_Success) // SQL request was successful
+	{
+		switch(Result.m_MessageKind)
+		{
+		case CScorePlayerResult::DIRECT:
+			for(auto &aMessage : Result.m_Data.m_aaMessages)
+			{
+				if(aMessage[0] == 0)
+					break;
+				GameServer()->SendChatTarget(m_ClientID, aMessage);
+			}
+			break;
+		case CScorePlayerResult::ALL:
+		{
+			bool PrimaryMessage = true;
+			for(auto &aMessage : Result.m_Data.m_aaMessages)
+			{
+				if(aMessage[0] == 0)
+					break;
+
+				if(GameServer()->ProcessSpamProtection(m_ClientID) && PrimaryMessage)
+					break;
+
+				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aMessage, -1);
+				PrimaryMessage = false;
+			}
+			break;
+		}
+		case CScorePlayerResult::BROADCAST:
+			if(Result.m_Data.m_aBroadcast[0] != 0)
+				GameServer()->SendBroadcast(Result.m_Data.m_aBroadcast, -1);
+			break;
+		case CScorePlayerResult::MAP_VOTE:
+			GameServer()->m_VoteType = CGameContext::VOTE_TYPE_OPTION;
+			GameServer()->m_LastMapVote = time_get();
+
+			char aCmd[256];
+			str_format(aCmd, sizeof(aCmd),
+				"sv_reset_file types/%s/flexreset.cfg; change_map \"%s\"",
+				Result.m_Data.m_MapVote.m_aServer, Result.m_Data.m_MapVote.m_aMap);
+
+			char aChatmsg[512];
+			str_format(aChatmsg, sizeof(aChatmsg), "'%s' called vote to change server option '%s' (%s)",
+				Server()->ClientName(m_ClientID), Result.m_Data.m_MapVote.m_aMap, "/map");
+
+			GameServer()->CallVote(m_ClientID, Result.m_Data.m_MapVote.m_aMap, aCmd, "/map", aChatmsg);
+			break;
+		case CScorePlayerResult::PLAYER_INFO:
+			if(Result.m_Data.m_Info.m_Time.has_value())
+			{
+				GameServer()->Score()->PlayerData(m_ClientID)->Set(Result.m_Data.m_Info.m_Time.value(), Result.m_Data.m_Info.m_aTimeCp);
+				m_Score = Result.m_Data.m_Info.m_Time;
+			}
+			Server()->ExpireServerInfo();
+			int Birthday = Result.m_Data.m_Info.m_Birthday;
+			if(Birthday != 0 && !m_BirthdayAnnounced)
+			{
+				char aBuf[512];
+				str_format(aBuf, sizeof(aBuf),
+					"Happy DDNet birthday to %s for finishing their first map %d year%s ago!",
+					Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : "");
+				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, m_ClientID);
+				str_format(aBuf, sizeof(aBuf),
+					"Happy DDNet birthday, %s!\nYou have finished your first map exactly %d year%s ago!",
+					Server()->ClientName(m_ClientID), Birthday, Birthday > 1 ? "s" : "");
+				GameServer()->SendBroadcast(aBuf, m_ClientID);
+				m_BirthdayAnnounced = true;
+			}
+			GameServer()->SendRecord(m_ClientID);
+			break;
+		}
+	}
+}
diff --git a/src_bkp/game/server/player.h b/src_bkp/game/server/player.h
new file mode 100644
index 0000000000..8afed78165
--- /dev/null
+++ b/src_bkp/game/server/player.h
@@ -0,0 +1,229 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_SERVER_PLAYER_H
+#define GAME_SERVER_PLAYER_H
+
+#include <base/vmath.h>
+
+#include <engine/shared/protocol.h>
+
+#include <game/alloc.h>
+#include <game/server/save.h>
+
+#include "teeinfo.h"
+
+#include <memory>
+#include <optional>
+
+class CCharacter;
+class CGameContext;
+class IServer;
+struct CNetObj_PlayerInput;
+struct CScorePlayerResult;
+
+enum
+{
+	WEAPON_GAME = -3, // team switching etc
+	WEAPON_SELF = -2, // console kill command
+	WEAPON_WORLD = -1, // death tiles etc
+};
+
+// player object
+class CPlayer
+{
+	MACRO_ALLOC_POOL_ID()
+
+public:
+	CPlayer(CGameContext *pGameServer, uint32_t UniqueClientID, int ClientID, int Team);
+	~CPlayer();
+
+	void Reset();
+
+	void TryRespawn();
+	void Respawn(bool WeakHook = false); // with WeakHook == true the character will be spawned after all calls of Tick from other Players
+	CCharacter *ForceSpawn(vec2 Pos); // required for loading savegames
+	void SetTeam(int Team, bool DoChatMsg = true);
+	int GetTeam() const { return m_Team; }
+	int GetCID() const { return m_ClientID; }
+	uint32_t GetUniqueCID() const { return m_UniqueClientID; }
+	int GetClientVersion() const;
+	bool SetTimerType(int TimerType);
+
+	void Tick();
+	void PostTick();
+
+	// will be called after all Tick and PostTick calls from other players
+	void PostPostTick();
+	void Snap(int SnappingClient);
+	void FakeSnap();
+
+	void OnDirectInput(CNetObj_PlayerInput *pNewInput);
+	void OnPredictedInput(CNetObj_PlayerInput *pNewInput);
+	void OnPredictedEarlyInput(CNetObj_PlayerInput *pNewInput);
+	void OnDisconnect();
+
+	void KillCharacter(int Weapon = WEAPON_GAME, bool SendKillMsg = true);
+	CCharacter *GetCharacter();
+	const CCharacter *GetCharacter() const;
+
+	void SpectatePlayerName(const char *pName);
+
+	//---------------------------------------------------------
+	// this is used for snapping so we know how we can clip the view for the player
+	vec2 m_ViewPos;
+	int m_TuneZone;
+	int m_TuneZoneOld;
+
+	// states if the client is chatting, accessing a menu etc.
+	int m_PlayerFlags;
+
+	// used for snapping to just update latency if the scoreboard is active
+	int m_aCurLatency[MAX_CLIENTS];
+
+	// used for spectator mode
+	int m_SpectatorID;
+
+	bool m_IsReady;
+
+	//
+	int m_Vote;
+	int m_VotePos;
+	//
+	int m_LastVoteCall;
+	int m_LastVoteTry;
+	int m_LastChat;
+	int m_LastSetTeam;
+	int m_LastSetSpectatorMode;
+	int m_LastChangeInfo;
+	int m_LastEmote;
+	int m_LastEmoteGlobal;
+	int m_LastKill;
+	int m_aLastCommands[4];
+	int m_LastCommandPos;
+	int m_LastWhisperTo;
+	int m_LastInvited;
+
+	int m_SendVoteIndex;
+
+	CTeeInfo m_TeeInfos;
+
+	int m_DieTick;
+	int m_PreviousDieTick;
+	std::optional<int> m_Score;
+	int m_JoinTick;
+	bool m_ForceBalanced;
+	int m_LastActionTick;
+	int m_TeamChangeTick;
+
+	// network latency calculations
+	struct
+	{
+		int m_Accum;
+		int m_AccumMin;
+		int m_AccumMax;
+		int m_Avg;
+		int m_Min;
+		int m_Max;
+	} m_Latency;
+
+private:
+	const uint32_t m_UniqueClientID;
+	CCharacter *m_pCharacter;
+	int m_NumInputs;
+	CGameContext *m_pGameServer;
+
+	CGameContext *GameServer() const { return m_pGameServer; }
+	IServer *Server() const;
+
+	//
+	bool m_Spawning;
+	bool m_WeakHookSpawn;
+	int m_ClientID;
+	int m_Team;
+
+	int m_Paused;
+	int64_t m_ForcePauseTime;
+	int64_t m_LastPause;
+	bool m_Afk;
+
+	int m_DefEmote;
+	int m_OverrideEmote;
+	int m_OverrideEmoteReset;
+	bool m_Halloween;
+
+public:
+	enum
+	{
+		PAUSE_NONE = 0,
+		PAUSE_PAUSED,
+		PAUSE_SPEC
+	};
+
+	enum
+	{
+		TIMERTYPE_DEFAULT = -1,
+		TIMERTYPE_GAMETIMER = 0,
+		TIMERTYPE_BROADCAST,
+		TIMERTYPE_GAMETIMER_AND_BROADCAST,
+		TIMERTYPE_SIXUP,
+		TIMERTYPE_NONE,
+	};
+
+	bool m_DND;
+	int64_t m_FirstVoteTick;
+	char m_aTimeoutCode[64];
+
+	void ProcessPause();
+	int Pause(int State, bool Force);
+	int ForcePause(int Time);
+	int IsPaused() const;
+
+	bool IsPlaying() const;
+	int64_t m_Last_KickVote;
+	int64_t m_Last_Team;
+	int m_ShowOthers;
+	bool m_ShowAll;
+	vec2 m_ShowDistance;
+	bool m_SpecTeam;
+	bool m_NinjaJetpack;
+
+	int m_ChatScore;
+
+	bool m_Moderating;
+
+	void UpdatePlaytime();
+	void AfkTimer();
+	void SetAfk(bool Afk);
+	void SetInitialAfk(bool Afk);
+	bool IsAfk() const { return m_Afk; }
+
+	int64_t m_LastPlaytime;
+	int64_t m_LastEyeEmote;
+	int64_t m_LastBroadcast;
+	bool m_LastBroadcastImportance;
+
+	CNetObj_PlayerInput *m_pLastTarget;
+	bool m_LastTargetInit;
+
+	bool m_EyeEmoteEnabled;
+	int m_TimerType;
+
+	int GetDefaultEmote() const;
+	void OverrideDefaultEmote(int Emote, int Tick);
+	bool CanOverrideDefaultEmote() const;
+
+	bool m_FirstPacket;
+	int64_t m_LastSQLQuery;
+	void ProcessScoreResult(CScorePlayerResult &Result);
+	std::shared_ptr<CScorePlayerResult> m_ScoreQueryResult;
+	std::shared_ptr<CScorePlayerResult> m_ScoreFinishResult;
+	bool m_NotEligibleForFinish;
+	int64_t m_EligibleForFinishCheck;
+	bool m_VotedForPractice;
+	int m_SwapTargetsClientID; //Client ID of the swap target for the given player
+	bool m_BirthdayAnnounced;
+
+	CSaveTee m_LastTeleTee;
+};
+
+#endif
diff --git a/src_bkp/game/server/save.cpp b/src_bkp/game/server/save.cpp
new file mode 100644
index 0000000000..c5b1841d4d
--- /dev/null
+++ b/src_bkp/game/server/save.cpp
@@ -0,0 +1,835 @@
+#include "save.h"
+
+#include <cstdio> // sscanf
+
+#include "entities/character.h"
+#include "gamemodes/DDRace.h"
+#include "player.h"
+#include "teams.h"
+#include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
+
+CSaveTee::CSaveTee() = default;
+
+void CSaveTee::Save(CCharacter *pChr)
+{
+	m_ClientID = pChr->m_pPlayer->GetCID();
+	str_copy(m_aName, pChr->Server()->ClientName(m_ClientID), sizeof(m_aName));
+
+	m_Alive = pChr->m_Alive;
+	m_Paused = absolute(pChr->m_pPlayer->IsPaused());
+	m_NeededFaketuning = pChr->m_NeededFaketuning;
+
+	m_TeeStarted = pChr->Teams()->TeeStarted(m_ClientID);
+	m_TeeFinished = pChr->Teams()->TeeFinished(m_ClientID);
+	m_IsSolo = pChr->m_Core.m_Solo;
+
+	for(int i = 0; i < NUM_WEAPONS; i++)
+	{
+		m_aWeapons[i].m_AmmoRegenStart = pChr->m_Core.m_aWeapons[i].m_AmmoRegenStart;
+		m_aWeapons[i].m_Ammo = pChr->m_Core.m_aWeapons[i].m_Ammo;
+		m_aWeapons[i].m_Ammocost = pChr->m_Core.m_aWeapons[i].m_Ammocost;
+		m_aWeapons[i].m_Got = pChr->m_Core.m_aWeapons[i].m_Got;
+	}
+
+	m_Ninja.m_ActivationDir = pChr->m_Core.m_Ninja.m_ActivationDir;
+	if(pChr->m_Core.m_Ninja.m_ActivationTick)
+		m_Ninja.m_ActivationTick = pChr->Server()->Tick() - pChr->m_Core.m_Ninja.m_ActivationTick;
+	else
+		m_Ninja.m_ActivationTick = 0;
+	m_Ninja.m_CurrentMoveTime = pChr->m_Core.m_Ninja.m_CurrentMoveTime;
+	m_Ninja.m_OldVelAmount = pChr->m_Core.m_Ninja.m_OldVelAmount;
+
+	m_LastWeapon = pChr->m_LastWeapon;
+	m_QueuedWeapon = pChr->m_QueuedWeapon;
+
+	m_EndlessJump = pChr->m_Core.m_EndlessJump;
+	m_Jetpack = pChr->m_Core.m_Jetpack;
+	m_NinjaJetpack = pChr->m_NinjaJetpack;
+	m_FreezeTime = pChr->m_FreezeTime;
+	m_FreezeStart = pChr->Server()->Tick() - pChr->m_Core.m_FreezeStart;
+
+	m_DeepFrozen = pChr->m_Core.m_DeepFrozen;
+	m_LiveFrozen = pChr->m_Core.m_LiveFrozen;
+	m_EndlessHook = pChr->m_Core.m_EndlessHook;
+	m_DDRaceState = pChr->m_DDRaceState;
+
+	m_HitDisabledFlags = 0;
+	if(pChr->m_Core.m_HammerHitDisabled)
+		m_HitDisabledFlags |= CSaveTee::HAMMER_HIT_DISABLED;
+	if(pChr->m_Core.m_ShotgunHitDisabled)
+		m_HitDisabledFlags |= CSaveTee::SHOTGUN_HIT_DISABLED;
+	if(pChr->m_Core.m_GrenadeHitDisabled)
+		m_HitDisabledFlags |= CSaveTee::GRENADE_HIT_DISABLED;
+	if(pChr->m_Core.m_LaserHitDisabled)
+		m_HitDisabledFlags |= CSaveTee::LASER_HIT_DISABLED;
+
+	m_TuneZone = pChr->m_TuneZone;
+	m_TuneZoneOld = pChr->m_TuneZoneOld;
+
+	if(pChr->m_StartTime)
+		m_Time = pChr->Server()->Tick() - pChr->m_StartTime + g_Config.m_SvSaveSwapGamesPenalty * pChr->Server()->TickSpeed();
+	else
+		m_Time = 0;
+
+	m_Pos = pChr->m_Pos;
+	m_PrevPos = pChr->m_PrevPos;
+	m_TeleCheckpoint = pChr->m_TeleCheckpoint;
+	m_LastPenalty = pChr->m_LastPenalty;
+
+	if(pChr->m_TimeCpBroadcastEndTick)
+		m_TimeCpBroadcastEndTime = pChr->Server()->Tick() - pChr->m_TimeCpBroadcastEndTick;
+
+	m_LastTimeCp = pChr->m_LastTimeCp;
+	m_LastTimeCpBroadcasted = pChr->m_LastTimeCpBroadcasted;
+
+	for(int i = 0; i < MAX_CHECKPOINTS; i++)
+		m_aCurrentTimeCp[i] = pChr->m_aCurrentTimeCp[i];
+
+	m_NotEligibleForFinish = pChr->m_pPlayer->m_NotEligibleForFinish;
+
+	m_HasTelegunGun = pChr->m_Core.m_HasTelegunGun;
+	m_HasTelegunGrenade = pChr->m_Core.m_HasTelegunGrenade;
+	m_HasTelegunLaser = pChr->m_Core.m_HasTelegunLaser;
+
+	// Core
+	m_CorePos = pChr->m_Core.m_Pos;
+	m_Vel = pChr->m_Core.m_Vel;
+	m_HookHitEnabled = !pChr->m_Core.m_HookHitDisabled;
+	m_CollisionEnabled = !pChr->m_Core.m_CollisionDisabled;
+	m_ActiveWeapon = pChr->m_Core.m_ActiveWeapon;
+	m_Jumped = pChr->m_Core.m_Jumped;
+	m_JumpedTotal = pChr->m_Core.m_JumpedTotal;
+	m_Jumps = pChr->m_Core.m_Jumps;
+	m_HookPos = pChr->m_Core.m_HookPos;
+	m_HookDir = pChr->m_Core.m_HookDir;
+	m_HookTeleBase = pChr->m_Core.m_HookTeleBase;
+
+	m_HookTick = pChr->m_Core.m_HookTick;
+
+	m_HookState = pChr->m_Core.m_HookState;
+	m_HookedPlayer = pChr->m_Core.HookedPlayer();
+	m_NewHook = pChr->m_Core.m_NewHook != 0;
+
+	m_InputDirection = pChr->m_SavedInput.m_Direction;
+	m_InputJump = pChr->m_SavedInput.m_Jump;
+	m_InputFire = pChr->m_SavedInput.m_Fire;
+	m_InputHook = pChr->m_SavedInput.m_Hook;
+
+	m_ReloadTimer = pChr->m_ReloadTimer;
+
+	FormatUuid(pChr->GameServer()->GameUuid(), m_aGameUuid, sizeof(m_aGameUuid));
+}
+
+void CSaveTee::Load(CCharacter *pChr, int Team, bool IsSwap)
+{
+	pChr->m_pPlayer->Pause(m_Paused, true);
+
+	pChr->m_Alive = m_Alive;
+	pChr->m_NeededFaketuning = m_NeededFaketuning;
+
+	if(!IsSwap)
+	{
+		pChr->Teams()->SetForceCharacterTeam(pChr->m_pPlayer->GetCID(), Team);
+		pChr->Teams()->SetStarted(pChr->m_pPlayer->GetCID(), m_TeeStarted);
+		pChr->Teams()->SetFinished(pChr->m_pPlayer->GetCID(), m_TeeFinished);
+	}
+
+	for(int i = 0; i < NUM_WEAPONS; i++)
+	{
+		pChr->m_Core.m_aWeapons[i].m_AmmoRegenStart = m_aWeapons[i].m_AmmoRegenStart;
+		// m_Ammo not used anymore for tracking freeze following https://github.com/ddnet/ddnet/pull/2086
+		pChr->m_Core.m_aWeapons[i].m_Ammo = -1;
+		pChr->m_Core.m_aWeapons[i].m_Ammocost = m_aWeapons[i].m_Ammocost;
+		pChr->m_Core.m_aWeapons[i].m_Got = m_aWeapons[i].m_Got;
+	}
+
+	pChr->m_Core.m_Ninja.m_ActivationDir = m_Ninja.m_ActivationDir;
+	if(m_Ninja.m_ActivationTick)
+		pChr->m_Core.m_Ninja.m_ActivationTick = pChr->Server()->Tick() - m_Ninja.m_ActivationTick;
+	else
+		pChr->m_Core.m_Ninja.m_ActivationTick = 0;
+	pChr->m_Core.m_Ninja.m_CurrentMoveTime = m_Ninja.m_CurrentMoveTime;
+	pChr->m_Core.m_Ninja.m_OldVelAmount = m_Ninja.m_OldVelAmount;
+
+	pChr->m_LastWeapon = m_LastWeapon;
+	pChr->m_QueuedWeapon = m_QueuedWeapon;
+
+	pChr->m_Core.m_EndlessJump = m_EndlessJump;
+	pChr->m_Core.m_Jetpack = m_Jetpack;
+	pChr->m_NinjaJetpack = m_NinjaJetpack;
+	pChr->m_FreezeTime = m_FreezeTime;
+	pChr->m_Core.m_FreezeStart = pChr->Server()->Tick() - m_FreezeStart;
+
+	pChr->m_Core.m_DeepFrozen = m_DeepFrozen;
+	pChr->m_Core.m_LiveFrozen = m_LiveFrozen;
+	pChr->m_Core.m_EndlessHook = m_EndlessHook;
+	pChr->m_DDRaceState = m_DDRaceState;
+
+	pChr->m_Core.m_HammerHitDisabled = m_HitDisabledFlags & CSaveTee::HAMMER_HIT_DISABLED;
+	pChr->m_Core.m_ShotgunHitDisabled = m_HitDisabledFlags & CSaveTee::SHOTGUN_HIT_DISABLED;
+	pChr->m_Core.m_GrenadeHitDisabled = m_HitDisabledFlags & CSaveTee::GRENADE_HIT_DISABLED;
+	pChr->m_Core.m_LaserHitDisabled = m_HitDisabledFlags & CSaveTee::LASER_HIT_DISABLED;
+
+	pChr->m_TuneZone = m_TuneZone;
+	pChr->m_TuneZoneOld = m_TuneZoneOld;
+
+	if(m_Time)
+		pChr->m_StartTime = pChr->Server()->Tick() - m_Time;
+
+	pChr->m_Pos = m_Pos;
+	pChr->m_PrevPos = m_PrevPos;
+	pChr->m_TeleCheckpoint = m_TeleCheckpoint;
+	pChr->m_LastPenalty = m_LastPenalty;
+
+	if(m_TimeCpBroadcastEndTime)
+		pChr->m_TimeCpBroadcastEndTick = pChr->Server()->Tick() - m_TimeCpBroadcastEndTime;
+
+	pChr->m_LastTimeCp = m_LastTimeCp;
+	pChr->m_LastTimeCpBroadcasted = m_LastTimeCpBroadcasted;
+
+	for(int i = 0; i < MAX_CHECKPOINTS; i++)
+		pChr->m_aCurrentTimeCp[i] = m_aCurrentTimeCp[i];
+
+	pChr->m_pPlayer->m_NotEligibleForFinish = pChr->m_pPlayer->m_NotEligibleForFinish || m_NotEligibleForFinish;
+
+	pChr->m_Core.m_HasTelegunGun = m_HasTelegunGun;
+	pChr->m_Core.m_HasTelegunLaser = m_HasTelegunLaser;
+	pChr->m_Core.m_HasTelegunGrenade = m_HasTelegunGrenade;
+
+	// Core
+	pChr->m_Core.m_Pos = m_CorePos;
+	pChr->m_Core.m_Vel = m_Vel;
+	pChr->m_Core.m_HookHitDisabled = !m_HookHitEnabled;
+	pChr->m_Core.m_CollisionDisabled = !m_CollisionEnabled;
+	pChr->m_Core.m_ActiveWeapon = m_ActiveWeapon;
+	pChr->m_Core.m_Jumped = m_Jumped;
+	pChr->m_Core.m_JumpedTotal = m_JumpedTotal;
+	pChr->m_Core.m_Jumps = m_Jumps;
+	pChr->m_Core.m_HookPos = m_HookPos;
+	pChr->m_Core.m_HookDir = m_HookDir;
+	pChr->m_Core.m_HookTeleBase = m_HookTeleBase;
+
+	pChr->m_Core.m_HookTick = m_HookTick;
+
+	pChr->m_Core.m_HookState = m_HookState;
+	if(m_HookedPlayer != -1 && pChr->Teams()->m_Core.Team(m_HookedPlayer) != Team)
+	{
+		pChr->m_Core.SetHookedPlayer(-1);
+		pChr->m_Core.m_HookState = HOOK_FLYING;
+	}
+	else
+	{
+		pChr->m_Core.SetHookedPlayer(m_HookedPlayer);
+	}
+	pChr->m_Core.m_NewHook = m_NewHook;
+	pChr->m_SavedInput.m_Direction = m_InputDirection;
+	pChr->m_SavedInput.m_Jump = m_InputJump;
+	pChr->m_SavedInput.m_Fire = m_InputFire;
+	pChr->m_SavedInput.m_Hook = m_InputHook;
+
+	pChr->m_ReloadTimer = m_ReloadTimer;
+
+	pChr->SetSolo(m_IsSolo);
+
+	if(!IsSwap)
+	{
+		// Always create a rescue tee at the exact location we loaded from so that
+		// the old one gets overwritten.
+		pChr->SetRescue();
+	}
+}
+
+char *CSaveTee::GetString(const CSaveTeam *pTeam)
+{
+	int HookedPlayer = -1;
+	if(m_HookedPlayer != -1)
+	{
+		for(int n = 0; n < pTeam->GetMembersCount(); n++)
+		{
+			if(m_HookedPlayer == pTeam->m_pSavedTees[n].GetClientID())
+			{
+				HookedPlayer = n;
+				break;
+			}
+		}
+	}
+
+	str_format(m_aString, sizeof(m_aString),
+		"%s\t%d\t%d\t%d\t%d\t%d\t"
+		// weapons
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t"
+		// tee stats
+		"%d\t%d\t%d\t%d\t%d\t%d\t%d\t" // m_EndlessJump
+		"%d\t%d\t%d\t%d\t%d\t%d\t%d\t" // m_DDRaceState
+		"%d\t%d\t%d\t%d\t" // m_Pos.x
+		"%d\t%d\t" // m_TeleCheckpoint
+		"%d\t%d\t%f\t%f\t" // m_CorePos.x
+		"%d\t%d\t%d\t%d\t" // m_ActiveWeapon
+		"%d\t%d\t%f\t%f\t" // m_HookPos.x
+		"%d\t%d\t%d\t%d\t" // m_HookTeleBase.x
+		// time checkpoints
+		"%d\t%d\t%d\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%d\t" // m_NotEligibleForFinish
+		"%d\t%d\t%d\t" // tele weapons
+		"%s\t" // m_aGameUuid
+		"%d\t%d\t" // m_HookedPlayer, m_NewHook
+		"%d\t%d\t%d\t%d\t" // input stuff
+		"%d\t" // m_ReloadTimer
+		"%d\t" // m_TeeStarted
+		"%d\t" //m_LiveFreeze
+		"%f\t%f\t%d\t%d\t%d", // m_Ninja
+		m_aName, m_Alive, m_Paused, m_NeededFaketuning, m_TeeFinished, m_IsSolo,
+		// weapons
+		m_aWeapons[0].m_AmmoRegenStart, m_aWeapons[0].m_Ammo, m_aWeapons[0].m_Ammocost, m_aWeapons[0].m_Got,
+		m_aWeapons[1].m_AmmoRegenStart, m_aWeapons[1].m_Ammo, m_aWeapons[1].m_Ammocost, m_aWeapons[1].m_Got,
+		m_aWeapons[2].m_AmmoRegenStart, m_aWeapons[2].m_Ammo, m_aWeapons[2].m_Ammocost, m_aWeapons[2].m_Got,
+		m_aWeapons[3].m_AmmoRegenStart, m_aWeapons[3].m_Ammo, m_aWeapons[3].m_Ammocost, m_aWeapons[3].m_Got,
+		m_aWeapons[4].m_AmmoRegenStart, m_aWeapons[4].m_Ammo, m_aWeapons[4].m_Ammocost, m_aWeapons[4].m_Got,
+		m_aWeapons[5].m_AmmoRegenStart, m_aWeapons[5].m_Ammo, m_aWeapons[5].m_Ammocost, m_aWeapons[5].m_Got,
+		m_LastWeapon, m_QueuedWeapon,
+		// tee states
+		m_EndlessJump, m_Jetpack, m_NinjaJetpack, m_FreezeTime, m_FreezeStart, m_DeepFrozen, m_EndlessHook,
+		m_DDRaceState, m_HitDisabledFlags, m_CollisionEnabled, m_TuneZone, m_TuneZoneOld, m_HookHitEnabled, m_Time,
+		(int)m_Pos.x, (int)m_Pos.y, (int)m_PrevPos.x, (int)m_PrevPos.y,
+		m_TeleCheckpoint, m_LastPenalty,
+		(int)m_CorePos.x, (int)m_CorePos.y, m_Vel.x, m_Vel.y,
+		m_ActiveWeapon, m_Jumped, m_JumpedTotal, m_Jumps,
+		(int)m_HookPos.x, (int)m_HookPos.y, m_HookDir.x, m_HookDir.y,
+		(int)m_HookTeleBase.x, (int)m_HookTeleBase.y, m_HookTick, m_HookState,
+		// time checkpoints
+		m_TimeCpBroadcastEndTime, m_LastTimeCp, m_LastTimeCpBroadcasted,
+		m_aCurrentTimeCp[0], m_aCurrentTimeCp[1], m_aCurrentTimeCp[2], m_aCurrentTimeCp[3], m_aCurrentTimeCp[4],
+		m_aCurrentTimeCp[5], m_aCurrentTimeCp[6], m_aCurrentTimeCp[7], m_aCurrentTimeCp[8], m_aCurrentTimeCp[9],
+		m_aCurrentTimeCp[10], m_aCurrentTimeCp[11], m_aCurrentTimeCp[12], m_aCurrentTimeCp[13], m_aCurrentTimeCp[14],
+		m_aCurrentTimeCp[15], m_aCurrentTimeCp[16], m_aCurrentTimeCp[17], m_aCurrentTimeCp[18], m_aCurrentTimeCp[19],
+		m_aCurrentTimeCp[20], m_aCurrentTimeCp[21], m_aCurrentTimeCp[22], m_aCurrentTimeCp[23], m_aCurrentTimeCp[24],
+		m_NotEligibleForFinish,
+		m_HasTelegunGun, m_HasTelegunLaser, m_HasTelegunGrenade,
+		m_aGameUuid,
+		HookedPlayer, m_NewHook,
+		m_InputDirection, m_InputJump, m_InputFire, m_InputHook,
+		m_ReloadTimer,
+		m_TeeStarted,
+		m_LiveFrozen,
+		m_Ninja.m_ActivationDir.x, m_Ninja.m_ActivationDir.y, m_Ninja.m_ActivationTick, m_Ninja.m_CurrentMoveTime, m_Ninja.m_OldVelAmount);
+	return m_aString;
+}
+
+int CSaveTee::FromString(const char *pString)
+{
+	int Num;
+	Num = sscanf(pString,
+		"%[^\t]\t%d\t%d\t%d\t%d\t%d\t"
+		// weapons
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t%d\t%d\t"
+		"%d\t%d\t"
+		// tee states
+		"%d\t%d\t%d\t%d\t%d\t%d\t%d\t" // m_EndlessJump
+		"%d\t%d\t%d\t%d\t%d\t%d\t%d\t" // m_DDRaceState
+		"%f\t%f\t%f\t%f\t" // m_Pos.x
+		"%d\t%d\t" // m_TeleCheckpoint
+		"%f\t%f\t%f\t%f\t" // m_CorePos.x
+		"%d\t%d\t%d\t%d\t" // m_ActiveWeapon
+		"%f\t%f\t%f\t%f\t" // m_HookPos.x
+		"%f\t%f\t%d\t%d\t" // m_HookTeleBase.x
+		// time checkpoints
+		"%d\t%d\t%d\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%f\t%f\t%f\t%f\t%f\t"
+		"%d\t" // m_NotEligibleForFinish
+		"%d\t%d\t%d\t" // tele weapons
+		"%36s\t" // m_aGameUuid
+		"%d\t%d\t" // m_HookedPlayer, m_NewHook
+		"%d\t%d\t%d\t%d\t" // input stuff
+		"%d\t" // m_ReloadTimer
+		"%d\t" // m_TeeStarted
+		"%d\t" // m_LiveFreeze
+		"%f\t%f\t%d\t%d\t%d", // m_Ninja
+		m_aName, &m_Alive, &m_Paused, &m_NeededFaketuning, &m_TeeFinished, &m_IsSolo,
+		// weapons
+		&m_aWeapons[0].m_AmmoRegenStart, &m_aWeapons[0].m_Ammo, &m_aWeapons[0].m_Ammocost, &m_aWeapons[0].m_Got,
+		&m_aWeapons[1].m_AmmoRegenStart, &m_aWeapons[1].m_Ammo, &m_aWeapons[1].m_Ammocost, &m_aWeapons[1].m_Got,
+		&m_aWeapons[2].m_AmmoRegenStart, &m_aWeapons[2].m_Ammo, &m_aWeapons[2].m_Ammocost, &m_aWeapons[2].m_Got,
+		&m_aWeapons[3].m_AmmoRegenStart, &m_aWeapons[3].m_Ammo, &m_aWeapons[3].m_Ammocost, &m_aWeapons[3].m_Got,
+		&m_aWeapons[4].m_AmmoRegenStart, &m_aWeapons[4].m_Ammo, &m_aWeapons[4].m_Ammocost, &m_aWeapons[4].m_Got,
+		&m_aWeapons[5].m_AmmoRegenStart, &m_aWeapons[5].m_Ammo, &m_aWeapons[5].m_Ammocost, &m_aWeapons[5].m_Got,
+		&m_LastWeapon, &m_QueuedWeapon,
+		// tee states
+		&m_EndlessJump, &m_Jetpack, &m_NinjaJetpack, &m_FreezeTime, &m_FreezeStart, &m_DeepFrozen, &m_EndlessHook,
+		&m_DDRaceState, &m_HitDisabledFlags, &m_CollisionEnabled, &m_TuneZone, &m_TuneZoneOld, &m_HookHitEnabled, &m_Time,
+		&m_Pos.x, &m_Pos.y, &m_PrevPos.x, &m_PrevPos.y,
+		&m_TeleCheckpoint, &m_LastPenalty,
+		&m_CorePos.x, &m_CorePos.y, &m_Vel.x, &m_Vel.y,
+		&m_ActiveWeapon, &m_Jumped, &m_JumpedTotal, &m_Jumps,
+		&m_HookPos.x, &m_HookPos.y, &m_HookDir.x, &m_HookDir.y,
+		&m_HookTeleBase.x, &m_HookTeleBase.y, &m_HookTick, &m_HookState,
+		// time checkpoints
+		&m_TimeCpBroadcastEndTime, &m_LastTimeCp, &m_LastTimeCpBroadcasted,
+		&m_aCurrentTimeCp[0], &m_aCurrentTimeCp[1], &m_aCurrentTimeCp[2], &m_aCurrentTimeCp[3], &m_aCurrentTimeCp[4],
+		&m_aCurrentTimeCp[5], &m_aCurrentTimeCp[6], &m_aCurrentTimeCp[7], &m_aCurrentTimeCp[8], &m_aCurrentTimeCp[9],
+		&m_aCurrentTimeCp[10], &m_aCurrentTimeCp[11], &m_aCurrentTimeCp[12], &m_aCurrentTimeCp[13], &m_aCurrentTimeCp[14],
+		&m_aCurrentTimeCp[15], &m_aCurrentTimeCp[16], &m_aCurrentTimeCp[17], &m_aCurrentTimeCp[18], &m_aCurrentTimeCp[19],
+		&m_aCurrentTimeCp[20], &m_aCurrentTimeCp[21], &m_aCurrentTimeCp[22], &m_aCurrentTimeCp[23], &m_aCurrentTimeCp[24],
+		&m_NotEligibleForFinish,
+		&m_HasTelegunGun, &m_HasTelegunLaser, &m_HasTelegunGrenade,
+		m_aGameUuid,
+		&m_HookedPlayer, &m_NewHook,
+		&m_InputDirection, &m_InputJump, &m_InputFire, &m_InputHook,
+		&m_ReloadTimer,
+		&m_TeeStarted,
+		&m_LiveFrozen,
+		&m_Ninja.m_ActivationDir.x, &m_Ninja.m_ActivationDir.y, &m_Ninja.m_ActivationTick, &m_Ninja.m_CurrentMoveTime, &m_Ninja.m_OldVelAmount);
+	switch(Num) // Don't forget to update this when you save / load more / less.
+	{
+	case 96:
+		m_NotEligibleForFinish = false;
+		[[fallthrough]];
+	case 97:
+		m_HasTelegunGrenade = 0;
+		m_HasTelegunLaser = 0;
+		m_HasTelegunGun = 0;
+		FormatUuid(CalculateUuid("game-uuid-nonexistent@ddnet.tw"), m_aGameUuid, sizeof(m_aGameUuid));
+		[[fallthrough]];
+	case 101:
+		m_HookedPlayer = -1;
+		m_NewHook = false;
+		if(m_HookState == HOOK_GRABBED)
+			m_HookState = HOOK_FLYING;
+		m_InputDirection = 0;
+		m_InputJump = 0;
+		m_InputFire = 0;
+		m_InputHook = 0;
+		m_ReloadTimer = 0;
+		[[fallthrough]];
+	case 108:
+		m_TeeStarted = true;
+		[[fallthrough]];
+	case 109:
+		m_LiveFrozen = false;
+		[[fallthrough]];
+	case 110:
+		if(m_aWeapons[WEAPON_NINJA].m_Got)
+		{
+			// remove ninja
+			m_aWeapons[WEAPON_NINJA].m_Got = false;
+			m_aWeapons[WEAPON_NINJA].m_Ammo = 0;
+			m_ActiveWeapon = m_LastWeapon;
+		}
+		m_Ninja.m_ActivationDir.x = 0.0;
+		m_Ninja.m_ActivationDir.y = 0.0;
+		m_Ninja.m_ActivationTick = 0;
+		m_Ninja.m_CurrentMoveTime = 0;
+		m_Ninja.m_OldVelAmount = 0;
+		[[fallthrough]];
+	case 115:
+		return 0;
+	default:
+		dbg_msg("load", "failed to load tee-string");
+		dbg_msg("load", "loaded %d vars", Num);
+		return Num + 1; // never 0 here
+	}
+}
+
+void CSaveTee::LoadHookedPlayer(const CSaveTeam *pTeam)
+{
+	if(m_HookedPlayer == -1)
+		return;
+	m_HookedPlayer = pTeam->m_pSavedTees[m_HookedPlayer].GetClientID();
+}
+
+bool CSaveTee::IsHooking() const
+{
+	return m_HookState == HOOK_GRABBED || m_HookState == HOOK_FLYING;
+}
+
+CSaveTeam::CSaveTeam()
+{
+	m_aString[0] = '\0';
+}
+
+CSaveTeam::~CSaveTeam()
+{
+	delete[] m_pSwitchers;
+	delete[] m_pSavedTees;
+}
+
+int CSaveTeam::Save(CGameContext *pGameServer, int Team, bool Dry)
+{
+	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (Team <= 0 || MAX_CLIENTS <= Team))
+		return 1;
+
+	IGameController *pController = pGameServer->m_pController;
+	CGameTeams *pTeams = &pController->Teams();
+
+	m_MembersCount = pTeams->Count(Team);
+	if(m_MembersCount <= 0)
+	{
+		return 2;
+	}
+
+	m_TeamState = pTeams->GetTeamState(Team);
+
+	if(m_TeamState != CGameTeams::TEAMSTATE_STARTED)
+	{
+		return 4;
+	}
+
+	m_HighestSwitchNumber = pGameServer->Collision()->m_HighestSwitchNumber;
+	m_TeamLocked = pTeams->TeamLocked(Team);
+	m_Practice = pTeams->IsPractice(Team);
+
+	m_pSavedTees = new CSaveTee[m_MembersCount];
+	int aPlayerCIDs[MAX_CLIENTS];
+	int j = 0;
+	CCharacter *p = (CCharacter *)pGameServer->m_World.FindFirst(CGameWorld::ENTTYPE_CHARACTER);
+	for(; p; p = (CCharacter *)p->TypeNext())
+	{
+		if(pTeams->m_Core.Team(p->GetPlayer()->GetCID()) != Team)
+			continue;
+		if(m_MembersCount == j)
+			return 3;
+		m_pSavedTees[j].Save(p);
+		aPlayerCIDs[j] = p->GetPlayer()->GetCID();
+		j++;
+	}
+	if(m_MembersCount != j)
+		return 3;
+
+	if(pGameServer->Collision()->m_HighestSwitchNumber)
+	{
+		m_pSwitchers = new SSimpleSwitchers[pGameServer->Collision()->m_HighestSwitchNumber + 1];
+
+		for(int i = 1; i < pGameServer->Collision()->m_HighestSwitchNumber + 1; i++)
+		{
+			m_pSwitchers[i].m_Status = pGameServer->Switchers()[i].m_aStatus[Team];
+			if(pGameServer->Switchers()[i].m_aEndTick[Team])
+				m_pSwitchers[i].m_EndTime = pController->Server()->Tick() - pGameServer->Switchers()[i].m_aEndTick[Team];
+			else
+				m_pSwitchers[i].m_EndTime = 0;
+			m_pSwitchers[i].m_Type = pGameServer->Switchers()[i].m_aType[Team];
+		}
+	}
+	if(!Dry)
+	{
+		pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCIDs, m_MembersCount);
+	}
+	return 0;
+}
+
+bool CSaveTeam::HandleSaveError(int Result, int ClientID, CGameContext *pGameContext)
+{
+	switch(Result)
+	{
+	case 0:
+		return false;
+	case 1:
+		pGameContext->SendChatTarget(ClientID, "You have to be in a team (from 1-63)");
+		break;
+	case 2:
+		pGameContext->SendChatTarget(ClientID, "Could not find your Team");
+		break;
+	case 3:
+		pGameContext->SendChatTarget(ClientID, "To save all players in your team have to be alive and not in '/spec'");
+		break;
+	case 4:
+		pGameContext->SendChatTarget(ClientID, "Your team has not started yet");
+		break;
+	default: // this state should never be reached
+		pGameContext->SendChatTarget(ClientID, "Unknown error while saving");
+		break;
+	}
+	return true;
+}
+
+void CSaveTeam::Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong)
+{
+	IGameController *pController = pGameServer->m_pController;
+	CGameTeams *pTeams = &pController->Teams();
+
+	pTeams->ChangeTeamState(Team, m_TeamState);
+	pTeams->SetTeamLock(Team, m_TeamLocked);
+	pTeams->SetPractice(Team, m_Practice);
+
+	int aPlayerCIDs[MAX_CLIENTS];
+	for(int i = m_MembersCount; i-- > 0;)
+	{
+		int ClientID = m_pSavedTees[i].GetClientID();
+		aPlayerCIDs[i] = ClientID;
+		if(pGameServer->m_apPlayers[ClientID] && pTeams->m_Core.Team(ClientID) == Team)
+		{
+			CCharacter *pChr = MatchCharacter(pGameServer, m_pSavedTees[i].GetClientID(), i, KeepCurrentWeakStrong);
+			m_pSavedTees[i].Load(pChr, Team);
+		}
+	}
+
+	if(pGameServer->Collision()->m_HighestSwitchNumber)
+	{
+		for(int i = 1; i < minimum(m_HighestSwitchNumber, pGameServer->Collision()->m_HighestSwitchNumber) + 1; i++)
+		{
+			pGameServer->Switchers()[i].m_aStatus[Team] = m_pSwitchers[i].m_Status;
+			if(m_pSwitchers[i].m_EndTime)
+				pGameServer->Switchers()[i].m_aEndTick[Team] = pController->Server()->Tick() - m_pSwitchers[i].m_EndTime;
+			pGameServer->Switchers()[i].m_aType[Team] = m_pSwitchers[i].m_Type;
+		}
+	}
+	// remove projectiles and laser
+	pGameServer->m_World.RemoveEntitiesFromPlayers(aPlayerCIDs, m_MembersCount);
+}
+
+CCharacter *CSaveTeam::MatchCharacter(CGameContext *pGameServer, int ClientID, int SaveID, bool KeepCurrentCharacter) const
+{
+	if(KeepCurrentCharacter && pGameServer->m_apPlayers[ClientID]->GetCharacter())
+	{
+		// keep old character to retain current weak/strong order
+		return pGameServer->m_apPlayers[ClientID]->GetCharacter();
+	}
+	pGameServer->m_apPlayers[ClientID]->KillCharacter(WEAPON_GAME);
+	return pGameServer->m_apPlayers[ClientID]->ForceSpawn(m_pSavedTees[SaveID].GetPos());
+}
+
+char *CSaveTeam::GetString()
+{
+	str_format(m_aString, sizeof(m_aString), "%d\t%d\t%d\t%d\t%d", m_TeamState, m_MembersCount, m_HighestSwitchNumber, m_TeamLocked, m_Practice);
+
+	for(int i = 0; i < m_MembersCount; i++)
+	{
+		char aBuf[1024];
+		str_format(aBuf, sizeof(aBuf), "\n%s", m_pSavedTees[i].GetString(this));
+		str_append(m_aString, aBuf);
+	}
+
+	if(m_pSwitchers && m_HighestSwitchNumber)
+	{
+		for(int i = 1; i < m_HighestSwitchNumber + 1; i++)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "\n%d\t%d\t%d", m_pSwitchers[i].m_Status, m_pSwitchers[i].m_EndTime, m_pSwitchers[i].m_Type);
+			str_append(m_aString, aBuf);
+		}
+	}
+
+	return m_aString;
+}
+
+int CSaveTeam::FromString(const char *pString)
+{
+	char aTeamStats[MAX_CLIENTS];
+	char aSwitcher[64];
+	char aSaveTee[1024];
+
+	char *pCopyPos;
+	unsigned int Pos = 0;
+	unsigned int LastPos = 0;
+	unsigned int StrSize;
+
+	str_copy(m_aString, pString, sizeof(m_aString));
+
+	while(m_aString[Pos] != '\n' && Pos < sizeof(m_aString) && m_aString[Pos]) // find next \n or \0
+		Pos++;
+
+	pCopyPos = m_aString + LastPos;
+	StrSize = Pos - LastPos + 1;
+	if(m_aString[Pos] == '\n')
+	{
+		Pos++; // skip \n
+		LastPos = Pos;
+	}
+
+	if(StrSize <= 0)
+	{
+		dbg_msg("load", "savegame: wrong format (couldn't load teamstats)");
+		return 1;
+	}
+
+	if(StrSize < sizeof(aTeamStats))
+	{
+		str_copy(aTeamStats, pCopyPos, StrSize);
+		int Num = sscanf(aTeamStats, "%d\t%d\t%d\t%d\t%d", &m_TeamState, &m_MembersCount, &m_HighestSwitchNumber, &m_TeamLocked, &m_Practice);
+		switch(Num) // Don't forget to update this when you save / load more / less.
+		{
+		case 4:
+			m_Practice = false;
+			[[fallthrough]];
+		case 5:
+			break;
+		default:
+			dbg_msg("load", "failed to load teamstats");
+			dbg_msg("load", "loaded %d vars", Num);
+			return Num + 1; // never 0 here
+		}
+	}
+	else
+	{
+		dbg_msg("load", "savegame: wrong format (couldn't load teamstats, too big)");
+		return 1;
+	}
+
+	if(m_pSavedTees)
+	{
+		delete[] m_pSavedTees;
+		m_pSavedTees = 0;
+	}
+
+	if(m_MembersCount > 64)
+	{
+		dbg_msg("load", "savegame: team has too many players");
+		return 1;
+	}
+	else if(m_MembersCount)
+	{
+		m_pSavedTees = new CSaveTee[m_MembersCount];
+	}
+
+	for(int n = 0; n < m_MembersCount; n++)
+	{
+		while(m_aString[Pos] != '\n' && Pos < sizeof(m_aString) && m_aString[Pos]) // find next \n or \0
+			Pos++;
+
+		pCopyPos = m_aString + LastPos;
+		StrSize = Pos - LastPos + 1;
+		if(m_aString[Pos] == '\n')
+		{
+			Pos++; // skip \n
+			LastPos = Pos;
+		}
+
+		if(StrSize <= 0)
+		{
+			dbg_msg("load", "savegame: wrong format (couldn't load tee)");
+			return 1;
+		}
+
+		if(StrSize < sizeof(aSaveTee))
+		{
+			str_copy(aSaveTee, pCopyPos, StrSize);
+			int Num = m_pSavedTees[n].FromString(aSaveTee);
+			if(Num)
+			{
+				dbg_msg("load", "failed to load tee");
+				dbg_msg("load", "loaded %d vars", Num - 1);
+				return 1;
+			}
+		}
+		else
+		{
+			dbg_msg("load", "savegame: wrong format (couldn't load tee, too big)");
+			return 1;
+		}
+	}
+
+	if(m_pSwitchers)
+	{
+		delete[] m_pSwitchers;
+		m_pSwitchers = 0;
+	}
+
+	if(m_HighestSwitchNumber)
+		m_pSwitchers = new SSimpleSwitchers[m_HighestSwitchNumber + 1];
+
+	for(int n = 1; n < m_HighestSwitchNumber + 1; n++)
+	{
+		while(m_aString[Pos] != '\n' && Pos < sizeof(m_aString) && m_aString[Pos]) // find next \n or \0
+			Pos++;
+
+		pCopyPos = m_aString + LastPos;
+		StrSize = Pos - LastPos + 1;
+		if(m_aString[Pos] == '\n')
+		{
+			Pos++; // skip \n
+			LastPos = Pos;
+		}
+
+		if(StrSize <= 0)
+		{
+			dbg_msg("load", "savegame: wrong format (couldn't load switcher)");
+			return 1;
+		}
+
+		if(StrSize < sizeof(aSwitcher))
+		{
+			str_copy(aSwitcher, pCopyPos, StrSize);
+			int Num = sscanf(aSwitcher, "%d\t%d\t%d", &(m_pSwitchers[n].m_Status), &(m_pSwitchers[n].m_EndTime), &(m_pSwitchers[n].m_Type));
+			if(Num != 3)
+			{
+				dbg_msg("load", "failed to load switcher");
+				dbg_msg("load", "loaded %d vars", Num - 1);
+			}
+		}
+		else
+		{
+			dbg_msg("load", "savegame: wrong format (couldn't load switcher, too big)");
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const
+{
+	if(NumPlayer > m_MembersCount)
+	{
+		str_format(pMessage, MessageLen, "Too many players in this team, should be %d", m_MembersCount);
+		return false;
+	}
+	// check for wrong players
+	for(int i = 0; i < NumPlayer; i++)
+	{
+		int Found = false;
+		for(int j = 0; j < m_MembersCount; j++)
+		{
+			if(str_comp(paNames[i], m_pSavedTees[j].GetName()) == 0)
+			{
+				Found = true;
+			}
+		}
+		if(!Found)
+		{
+			str_format(pMessage, MessageLen, "'%s' doesn't belong to this team", paNames[i]);
+			return false;
+		}
+	}
+	// check for missing players
+	for(int i = 0; i < m_MembersCount; i++)
+	{
+		int Found = false;
+		for(int j = 0; j < NumPlayer; j++)
+		{
+			if(str_comp(m_pSavedTees[i].GetName(), paNames[j]) == 0)
+			{
+				m_pSavedTees[i].SetClientID(pClientID[j]);
+				Found = true;
+				break;
+			}
+		}
+		if(!Found)
+		{
+			str_format(pMessage, MessageLen, "'%s' has to be in this team", m_pSavedTees[i].GetName());
+			return false;
+		}
+	}
+	// match hook to correct ClientID
+	for(int n = 0; n < m_MembersCount; n++)
+		m_pSavedTees[n].LoadHookedPlayer(this);
+	return true;
+}
diff --git a/src_bkp/game/server/save.h b/src_bkp/game/server/save.h
new file mode 100644
index 0000000000..14abd7f373
--- /dev/null
+++ b/src_bkp/game/server/save.h
@@ -0,0 +1,172 @@
+#ifndef GAME_SERVER_SAVE_H
+#define GAME_SERVER_SAVE_H
+
+#include <base/vmath.h>
+
+#include <engine/shared/protocol.h>
+#include <game/generated/protocol.h>
+
+class IGameController;
+class CGameContext;
+class CGameWorld;
+class CCharacter;
+class CSaveTeam;
+
+class CSaveTee
+{
+public:
+	CSaveTee();
+	~CSaveTee() = default;
+	void Save(CCharacter *pchr);
+	void Load(CCharacter *pchr, int Team, bool IsSwap = false);
+	char *GetString(const CSaveTeam *pTeam);
+	int FromString(const char *pString);
+	void LoadHookedPlayer(const CSaveTeam *pTeam);
+	bool IsHooking() const;
+	vec2 GetPos() const { return m_Pos; }
+	const char *GetName() const { return m_aName; }
+	int GetClientID() const { return m_ClientID; }
+	void SetClientID(int ClientID) { m_ClientID = ClientID; }
+
+	enum
+	{
+		HIT_ALL = 0,
+		HAMMER_HIT_DISABLED = 1,
+		SHOTGUN_HIT_DISABLED = 2,
+		GRENADE_HIT_DISABLED = 4,
+		LASER_HIT_DISABLED = 8
+	};
+
+private:
+	int m_ClientID;
+
+	char m_aString[2048];
+	char m_aName[16];
+
+	int m_Alive;
+	int m_Paused;
+	int m_NeededFaketuning;
+
+	// Teamstuff
+	int m_TeeStarted;
+	int m_TeeFinished;
+	int m_IsSolo;
+
+	struct WeaponStat
+	{
+		int m_AmmoRegenStart;
+		int m_Ammo;
+		int m_Ammocost;
+		int m_Got;
+	} m_aWeapons[NUM_WEAPONS];
+
+	// ninja
+	struct
+	{
+		vec2 m_ActivationDir;
+		int m_ActivationTick;
+		int m_CurrentMoveTime;
+		int m_OldVelAmount;
+	} m_Ninja;
+
+	int m_LastWeapon;
+	int m_QueuedWeapon;
+
+	int m_EndlessJump;
+	int m_Jetpack;
+	int m_NinjaJetpack;
+	int m_FreezeTime;
+	int m_FreezeStart;
+	int m_DeepFrozen;
+	int m_LiveFrozen;
+	int m_EndlessHook;
+	int m_DDRaceState;
+
+	int m_HitDisabledFlags;
+	int m_CollisionEnabled;
+	int m_TuneZone;
+	int m_TuneZoneOld;
+	int m_HookHitEnabled;
+	int m_Time;
+	vec2 m_Pos;
+	vec2 m_PrevPos;
+	int m_TeleCheckpoint;
+	int m_LastPenalty;
+
+	int m_TimeCpBroadcastEndTime;
+	int m_LastTimeCp;
+	int m_LastTimeCpBroadcasted;
+	float m_aCurrentTimeCp[MAX_CHECKPOINTS];
+
+	int m_NotEligibleForFinish;
+
+	int m_HasTelegunGun;
+	int m_HasTelegunGrenade;
+	int m_HasTelegunLaser;
+
+	// Core
+	vec2 m_CorePos;
+	vec2 m_Vel;
+	int m_ActiveWeapon;
+	int m_Jumped;
+	int m_JumpedTotal;
+	int m_Jumps;
+	vec2 m_HookPos;
+	vec2 m_HookDir;
+	vec2 m_HookTeleBase;
+	int m_HookTick;
+	int m_HookState;
+	int m_HookedPlayer;
+	int m_NewHook;
+
+	// player input
+	int m_InputDirection;
+	int m_InputJump;
+	int m_InputFire;
+	int m_InputHook;
+
+	int m_ReloadTimer;
+
+	char m_aGameUuid[UUID_MAXSTRSIZE];
+};
+
+class CSaveTeam
+{
+public:
+	CSaveTeam();
+	~CSaveTeam();
+	char *GetString();
+	int GetMembersCount() const { return m_MembersCount; }
+	// MatchPlayers has to be called afterwards
+	int FromString(const char *pString);
+	// returns true if a team can load, otherwise writes a nice error Message in pMessage
+	bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const;
+	int Save(CGameContext *pGameServer, int Team, bool Dry = false);
+	void Load(CGameContext *pGameServer, int Team, bool KeepCurrentWeakStrong);
+
+	CSaveTee *m_pSavedTees = nullptr;
+
+	// returns true if an error occurred
+	static bool HandleSaveError(int Result, int ClientID, CGameContext *pGameContext);
+
+private:
+	CCharacter *MatchCharacter(CGameContext *pGameServer, int ClientID, int SaveID, bool KeepCurrentCharacter) const;
+
+	char m_aString[65536];
+
+	struct SSimpleSwitchers
+	{
+		int m_Status;
+		int m_EndTime;
+		int m_Type;
+	};
+	SSimpleSwitchers *m_pSwitchers = nullptr;
+
+	int m_TeamState = 0;
+	int m_MembersCount = 0;
+	int m_HighestSwitchNumber = 0;
+	int m_TeamLocked = 0;
+	int m_Practice = 0;
+};
+
+#endif // GAME_SERVER_SAVE_H
diff --git a/src_bkp/game/server/score.cpp b/src_bkp/game/server/score.cpp
new file mode 100644
index 0000000000..610ebd1531
--- /dev/null
+++ b/src_bkp/game/server/score.cpp
@@ -0,0 +1,370 @@
+#include "score.h"
+#include "gamemodes/DDRace.h"
+#include "player.h"
+#include "save.h"
+#include "scoreworker.h"
+
+#include <base/system.h>
+#include <engine/server/databases/connection_pool.h>
+#include <engine/shared/config.h>
+#include <engine/shared/console.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+#include <game/generated/wordlist.h>
+
+#include <memory>
+
+class IDbConnection;
+
+std::shared_ptr<CScorePlayerResult> CScore::NewSqlPlayerResult(int ClientID)
+{
+	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientID];
+	if(pCurPlayer->m_ScoreQueryResult != nullptr) // TODO: send player a message: "too many requests"
+		return nullptr;
+	pCurPlayer->m_ScoreQueryResult = std::make_shared<CScorePlayerResult>();
+	return pCurPlayer->m_ScoreQueryResult;
+}
+
+void CScore::ExecPlayerThread(
+	bool (*pFuncPtr)(IDbConnection *, const ISqlData *, char *pError, int ErrorSize),
+	const char *pThreadName,
+	int ClientID,
+	const char *pName,
+	int Offset)
+{
+	auto pResult = NewSqlPlayerResult(ClientID);
+	if(pResult == nullptr)
+		return;
+	auto Tmp = std::make_unique<CSqlPlayerRequest>(pResult);
+	str_copy(Tmp->m_aName, pName, sizeof(Tmp->m_aName));
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aServer, g_Config.m_SvSqlServerName, sizeof(Tmp->m_aServer));
+	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	Tmp->m_Offset = Offset;
+
+	m_pPool->Execute(pFuncPtr, std::move(Tmp), pThreadName);
+}
+
+bool CScore::RateLimitPlayer(int ClientID)
+{
+	CPlayer *pPlayer = GameServer()->m_apPlayers[ClientID];
+	if(pPlayer == 0)
+		return true;
+	if(pPlayer->m_LastSQLQuery + (int64_t)g_Config.m_SvSqlQueriesDelay * Server()->TickSpeed() >= Server()->Tick())
+		return true;
+	pPlayer->m_LastSQLQuery = Server()->Tick();
+	return false;
+}
+
+void CScore::GeneratePassphrase(char *pBuf, int BufSize)
+{
+	for(int i = 0; i < 3; i++)
+	{
+		if(i != 0)
+			str_append(pBuf, " ", BufSize);
+		// TODO: decide if the slight bias towards lower numbers is ok
+		int Rand = m_Prng.RandomBits() % m_vWordlist.size();
+		str_append(pBuf, m_vWordlist[Rand].c_str(), BufSize);
+	}
+}
+
+CScore::CScore(CGameContext *pGameServer, CDbConnectionPool *pPool) :
+	m_pPool(pPool),
+	m_pGameServer(pGameServer),
+	m_pServer(pGameServer->Server())
+{
+	LoadBestTime();
+
+	uint64_t aSeed[2];
+	secure_random_fill(aSeed, sizeof(aSeed));
+	m_Prng.Seed(aSeed);
+
+	IOHANDLE File = GameServer()->Storage()->OpenFile("wordlist.txt", IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ALL);
+	if(File)
+	{
+		CLineReader LineReader;
+		LineReader.Init(File);
+		char *pLine;
+		while((pLine = LineReader.Get()))
+		{
+			char aWord[32] = {0};
+			sscanf(pLine, "%*s %31s", aWord);
+			aWord[31] = 0;
+			m_vWordlist.emplace_back(aWord);
+		}
+		io_close(File);
+	}
+	else
+	{
+		dbg_msg("sql", "failed to open wordlist, using fallback");
+		m_vWordlist.assign(std::begin(g_aFallbackWordlist), std::end(g_aFallbackWordlist));
+	}
+
+	if(m_vWordlist.size() < 1000)
+	{
+		dbg_msg("sql", "too few words in wordlist");
+		Server()->SetErrorShutdown("sql too few words in wordlist");
+		return;
+	}
+}
+
+void CScore::LoadBestTime()
+{
+	if(m_pGameServer->m_pController->m_pLoadBestTimeResult)
+		return; // already in progress
+
+	auto LoadBestTimeResult = std::make_shared<CScoreLoadBestTimeResult>();
+	m_pGameServer->m_pController->m_pLoadBestTimeResult = LoadBestTimeResult;
+
+	auto Tmp = std::make_unique<CSqlLoadBestTimeData>(LoadBestTimeResult);
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	m_pPool->Execute(CScoreWorker::LoadBestTime, std::move(Tmp), "load best time");
+}
+
+void CScore::LoadPlayerData(int ClientID, const char *pName)
+{
+	ExecPlayerThread(CScoreWorker::LoadPlayerData, "load player data", ClientID, pName, 0);
+}
+
+void CScore::MapVote(int ClientID, const char *pMapName)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::MapVote, "map vote", ClientID, pMapName, 0);
+}
+
+void CScore::MapInfo(int ClientID, const char *pMapName)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::MapInfo, "map info", ClientID, pMapName, 0);
+}
+
+void CScore::SaveScore(int ClientID, float Time, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible)
+{
+	CConsole *pCon = (CConsole *)GameServer()->Console();
+	if(pCon->Cheated() || NotEligible)
+		return;
+
+	CPlayer *pCurPlayer = GameServer()->m_apPlayers[ClientID];
+	if(pCurPlayer->m_ScoreFinishResult != nullptr)
+		dbg_msg("sql", "WARNING: previous save score result didn't complete, overwriting it now");
+	pCurPlayer->m_ScoreFinishResult = std::make_shared<CScorePlayerResult>();
+	auto Tmp = std::make_unique<CSqlScoreData>(pCurPlayer->m_ScoreFinishResult);
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid));
+	Tmp->m_ClientID = ClientID;
+	str_copy(Tmp->m_aName, Server()->ClientName(ClientID), sizeof(Tmp->m_aName));
+	Tmp->m_Time = Time;
+	str_copy(Tmp->m_aTimestamp, pTimestamp, sizeof(Tmp->m_aTimestamp));
+	for(int i = 0; i < NUM_CHECKPOINTS; i++)
+		Tmp->m_aCurrentTimeCp[i] = aTimeCp[i];
+
+	m_pPool->ExecuteWrite(CScoreWorker::SaveScore, std::move(Tmp), "save score");
+}
+
+void CScore::SaveTeamScore(int *pClientIDs, unsigned int Size, float Time, const char *pTimestamp)
+{
+	CConsole *pCon = (CConsole *)GameServer()->Console();
+	if(pCon->Cheated())
+		return;
+	for(unsigned int i = 0; i < Size; i++)
+	{
+		if(GameServer()->m_apPlayers[pClientIDs[i]]->m_NotEligibleForFinish)
+			return;
+	}
+	auto Tmp = std::make_unique<CSqlTeamScoreData>();
+	for(unsigned int i = 0; i < Size; i++)
+		str_copy(Tmp->m_aaNames[i], Server()->ClientName(pClientIDs[i]), sizeof(Tmp->m_aaNames[i]));
+	Tmp->m_Size = Size;
+	Tmp->m_Time = Time;
+	str_copy(Tmp->m_aTimestamp, pTimestamp, sizeof(Tmp->m_aTimestamp));
+	FormatUuid(GameServer()->GameUuid(), Tmp->m_aGameUuid, sizeof(Tmp->m_aGameUuid));
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	Tmp->m_TeamrankUuid = RandomUuid();
+
+	m_pPool->ExecuteWrite(CScoreWorker::SaveTeamScore, std::move(Tmp), "save team score");
+}
+
+void CScore::ShowRank(int ClientID, const char *pName)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowRank, "show rank", ClientID, pName, 0);
+}
+
+void CScore::ShowTeamRank(int ClientID, const char *pName)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTeamRank, "show team rank", ClientID, pName, 0);
+}
+
+void CScore::ShowTop(int ClientID, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTop, "show top5", ClientID, "", Offset);
+}
+
+void CScore::ShowTeamTop5(int ClientID, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTeamTop5, "show team top5", ClientID, "", Offset);
+}
+
+void CScore::ShowPlayerTeamTop5(int ClientID, const char *pName, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowPlayerTeamTop5, "show team top5 player", ClientID, pName, Offset);
+}
+
+void CScore::ShowTimes(int ClientID, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientID, "", Offset);
+}
+
+void CScore::ShowTimes(int ClientID, const char *pName, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTimes, "show times", ClientID, pName, Offset);
+}
+
+void CScore::ShowPoints(int ClientID, const char *pName)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowPoints, "show points", ClientID, pName, 0);
+}
+
+void CScore::ShowTopPoints(int ClientID, int Offset)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::ShowTopPoints, "show top points", ClientID, "", Offset);
+}
+
+void CScore::RandomMap(int ClientID, int Stars)
+{
+	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientID);
+	GameServer()->m_SqlRandomMapResult = pResult;
+
+	auto Tmp = std::make_unique<CSqlRandomMapRequest>(pResult);
+	Tmp->m_Stars = Stars;
+	str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap));
+	str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType));
+	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+
+	m_pPool->Execute(CScoreWorker::RandomMap, std::move(Tmp), "random map");
+}
+
+void CScore::RandomUnfinishedMap(int ClientID, int Stars)
+{
+	auto pResult = std::make_shared<CScoreRandomMapResult>(ClientID);
+	GameServer()->m_SqlRandomMapResult = pResult;
+
+	auto Tmp = std::make_unique<CSqlRandomMapRequest>(pResult);
+	Tmp->m_Stars = Stars;
+	str_copy(Tmp->m_aCurrentMap, g_Config.m_SvMap, sizeof(Tmp->m_aCurrentMap));
+	str_copy(Tmp->m_aServerType, g_Config.m_SvServerType, sizeof(Tmp->m_aServerType));
+	str_copy(Tmp->m_aRequestingPlayer, GameServer()->Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+
+	m_pPool->Execute(CScoreWorker::RandomUnfinishedMap, std::move(Tmp), "random unfinished map");
+}
+
+void CScore::SaveTeam(int ClientID, const char *pCode, const char *pServer)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	auto *pController = GameServer()->m_pController;
+	int Team = pController->Teams().m_Core.Team(ClientID);
+	if(pController->Teams().GetSaving(Team))
+		return;
+
+	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientID);
+	SaveResult->m_SaveID = RandomUuid();
+	int Result = SaveResult->m_SavedTeam.Save(GameServer(), Team);
+	if(CSaveTeam::HandleSaveError(Result, ClientID, GameServer()))
+		return;
+	pController->Teams().SetSaving(Team, SaveResult);
+
+	auto Tmp = std::make_unique<CSqlTeamSave>(SaveResult);
+	str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode));
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	str_copy(Tmp->m_aServer, pServer, sizeof(Tmp->m_aServer));
+	str_copy(Tmp->m_aClientName, this->Server()->ClientName(ClientID), sizeof(Tmp->m_aClientName));
+	Tmp->m_aGeneratedCode[0] = '\0';
+	GeneratePassphrase(Tmp->m_aGeneratedCode, sizeof(Tmp->m_aGeneratedCode));
+
+	char aBuf[512];
+	if(Tmp->m_aCode[0] == '\0')
+	{
+		str_format(aBuf,
+			sizeof(aBuf),
+			"Team save in progress. You'll be able to load with '/load %s'",
+			Tmp->m_aGeneratedCode);
+	}
+	else
+	{
+		str_format(aBuf,
+			sizeof(aBuf),
+			"Team save in progress. You'll be able to load with '/load %s' if save is successful or with '/load %s' if it fails",
+			Tmp->m_aCode,
+			Tmp->m_aGeneratedCode);
+	}
+	pController->Teams().KillSavedTeam(ClientID, Team);
+	GameServer()->SendChatTeam(Team, aBuf);
+	m_pPool->ExecuteWrite(CScoreWorker::SaveTeam, std::move(Tmp), "save team");
+}
+
+void CScore::LoadTeam(const char *pCode, int ClientID)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	auto *pController = GameServer()->m_pController;
+	int Team = pController->Teams().m_Core.Team(ClientID);
+	if(pController->Teams().GetSaving(Team))
+		return;
+	if(Team < TEAM_FLOCK || Team >= MAX_CLIENTS || (g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team == TEAM_FLOCK))
+	{
+		GameServer()->SendChatTarget(ClientID, "You have to be in a team (from 1-63)");
+		return;
+	}
+	if(pController->Teams().GetTeamState(Team) != CGameTeams::TEAMSTATE_OPEN)
+	{
+		GameServer()->SendChatTarget(ClientID, "Team can't be loaded while racing");
+		return;
+	}
+	auto SaveResult = std::make_shared<CScoreSaveResult>(ClientID);
+	SaveResult->m_Status = CScoreSaveResult::LOAD_FAILED;
+	pController->Teams().SetSaving(Team, SaveResult);
+	auto Tmp = std::make_unique<CSqlTeamLoad>(SaveResult);
+	str_copy(Tmp->m_aCode, pCode, sizeof(Tmp->m_aCode));
+	str_copy(Tmp->m_aMap, g_Config.m_SvMap, sizeof(Tmp->m_aMap));
+	Tmp->m_ClientID = ClientID;
+	str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer));
+	Tmp->m_NumPlayer = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(pController->Teams().m_Core.Team(i) == Team)
+		{
+			// put all names at the beginning of the array
+			str_copy(Tmp->m_aClientNames[Tmp->m_NumPlayer], Server()->ClientName(i), sizeof(Tmp->m_aClientNames[Tmp->m_NumPlayer]));
+			Tmp->m_aClientID[Tmp->m_NumPlayer] = i;
+			Tmp->m_NumPlayer++;
+		}
+	}
+	m_pPool->ExecuteWrite(CScoreWorker::LoadTeam, std::move(Tmp), "load team");
+}
+
+void CScore::GetSaves(int ClientID)
+{
+	if(RateLimitPlayer(ClientID))
+		return;
+	ExecPlayerThread(CScoreWorker::GetSaves, "get saves", ClientID, "", 0);
+}
diff --git a/src_bkp/game/server/score.h b/src_bkp/game/server/score.h
new file mode 100644
index 0000000000..84380068bf
--- /dev/null
+++ b/src_bkp/game/server/score.h
@@ -0,0 +1,76 @@
+#ifndef GAME_SERVER_SCORE_H
+#define GAME_SERVER_SCORE_H
+
+#include <game/prng.h>
+
+#include "scoreworker.h"
+
+class CDbConnectionPool;
+class CGameContext;
+class IDbConnection;
+class IServer;
+struct ISqlData;
+
+class CScore
+{
+	CPlayerData m_aPlayerData[MAX_CLIENTS];
+	CDbConnectionPool *m_pPool;
+
+	CGameContext *GameServer() const { return m_pGameServer; }
+	IServer *Server() const { return m_pServer; }
+	CGameContext *m_pGameServer;
+	IServer *m_pServer;
+
+	std::vector<std::string> m_vWordlist;
+	CPrng m_Prng;
+	void GeneratePassphrase(char *pBuf, int BufSize);
+
+	// returns new SqlResult bound to the player, if no current Thread is active for this player
+	std::shared_ptr<CScorePlayerResult> NewSqlPlayerResult(int ClientID);
+	// Creates for player database requests
+	void ExecPlayerThread(
+		bool (*pFuncPtr)(IDbConnection *, const ISqlData *, char *pError, int ErrorSize),
+		const char *pThreadName,
+		int ClientID,
+		const char *pName,
+		int Offset);
+
+	// returns true if the player should be rate limited
+	bool RateLimitPlayer(int ClientID);
+
+public:
+	CScore(CGameContext *pGameServer, CDbConnectionPool *pPool);
+	~CScore() {}
+
+	CPlayerData *PlayerData(int ID) { return &m_aPlayerData[ID]; }
+
+	void LoadBestTime();
+	void MapInfo(int ClientID, const char *pMapName);
+	void MapVote(int ClientID, const char *pMapName);
+	void LoadPlayerData(int ClientID, const char *pName = "");
+	void SaveScore(int ClientID, float Time, const char *pTimestamp, const float aTimeCp[NUM_CHECKPOINTS], bool NotEligible);
+
+	void SaveTeamScore(int *pClientIDs, unsigned int Size, float Time, const char *pTimestamp);
+
+	void ShowTop(int ClientID, int Offset = 1);
+	void ShowRank(int ClientID, const char *pName);
+
+	void ShowTeamTop5(int ClientID, int Offset = 1);
+	void ShowPlayerTeamTop5(int ClientID, const char *pName, int Offset = 1);
+	void ShowTeamRank(int ClientID, const char *pName);
+
+	void ShowTopPoints(int ClientID, int Offset = 1);
+	void ShowPoints(int ClientID, const char *pName);
+
+	void ShowTimes(int ClientID, const char *pName, int Offset = 1);
+	void ShowTimes(int ClientID, int Offset = 1);
+
+	void RandomMap(int ClientID, int Stars);
+	void RandomUnfinishedMap(int ClientID, int Stars);
+
+	void SaveTeam(int ClientID, const char *pCode, const char *pServer);
+	void LoadTeam(const char *pCode, int ClientID);
+	void GetSaves(int ClientID);
+};
+
+#endif // GAME_SERVER_SCORE_H
diff --git a/src_bkp/game/server/scoreworker.cpp b/src_bkp/game/server/scoreworker.cpp
new file mode 100644
index 0000000000..393f1ca8e6
--- /dev/null
+++ b/src_bkp/game/server/scoreworker.cpp
@@ -0,0 +1,1842 @@
+#include "scoreworker.h"
+
+#include <base/log.h>
+#include <base/system.h>
+#include <engine/server/databases/connection.h>
+#include <engine/server/databases/connection_pool.h>
+#include <engine/server/sql_string_helpers.h>
+#include <engine/shared/config.h>
+
+#include <cmath>
+
+// "6b407e81-8b77-3e04-a207-8da17f37d000"
+// "save-no-save-id@ddnet.tw"
+static const CUuid UUID_NO_SAVE_ID =
+	{{0x6b, 0x40, 0x7e, 0x81, 0x8b, 0x77, 0x3e, 0x04,
+		0xa2, 0x07, 0x8d, 0xa1, 0x7f, 0x37, 0xd0, 0x00}};
+
+CScorePlayerResult::CScorePlayerResult()
+{
+	SetVariant(Variant::DIRECT);
+}
+
+void CScorePlayerResult::SetVariant(Variant v)
+{
+	m_MessageKind = v;
+	switch(v)
+	{
+	case DIRECT:
+	case ALL:
+		for(auto &aMessage : m_Data.m_aaMessages)
+			aMessage[0] = 0;
+		break;
+	case BROADCAST:
+		m_Data.m_aBroadcast[0] = 0;
+		break;
+	case MAP_VOTE:
+		m_Data.m_MapVote.m_aMap[0] = '\0';
+		m_Data.m_MapVote.m_aReason[0] = '\0';
+		m_Data.m_MapVote.m_aServer[0] = '\0';
+		break;
+	case PLAYER_INFO:
+		m_Data.m_Info.m_Birthday = 0;
+		m_Data.m_Info.m_Time.reset();
+		for(float &TimeCp : m_Data.m_Info.m_aTimeCp)
+			TimeCp = 0;
+	}
+}
+
+CTeamrank::CTeamrank() :
+	m_NumNames(0)
+{
+	for(auto &aName : m_aaNames)
+		aName[0] = '\0';
+	mem_zero(&m_TeamID.m_aData, sizeof(m_TeamID));
+}
+
+bool CTeamrank::NextSqlResult(IDbConnection *pSqlServer, bool *pEnd, char *pError, int ErrorSize)
+{
+	pSqlServer->GetBlob(1, m_TeamID.m_aData, sizeof(m_TeamID.m_aData));
+	pSqlServer->GetString(2, m_aaNames[0], sizeof(m_aaNames[0]));
+	m_NumNames = 1;
+	bool End = false;
+	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
+	{
+		CUuid TeamID;
+		pSqlServer->GetBlob(1, TeamID.m_aData, sizeof(TeamID.m_aData));
+		if(m_TeamID != TeamID)
+		{
+			*pEnd = false;
+			return false;
+		}
+		pSqlServer->GetString(2, m_aaNames[m_NumNames], sizeof(m_aaNames[m_NumNames]));
+		m_NumNames++;
+	}
+	if(!End)
+	{
+		return true;
+	}
+	*pEnd = true;
+	return false;
+}
+
+bool CTeamrank::SamePlayers(const std::vector<std::string> *pvSortedNames)
+{
+	if(pvSortedNames->size() != m_NumNames)
+		return false;
+	for(unsigned int i = 0; i < m_NumNames; i++)
+	{
+		if(str_comp(pvSortedNames->at(i).c_str(), m_aaNames[i]) != 0)
+			return false;
+	}
+	return true;
+}
+
+bool CScoreWorker::LoadBestTime(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlLoadBestTimeData *>(pGameData);
+	auto *pResult = dynamic_cast<CScoreLoadBestTimeResult *>(pGameData->m_pResult.get());
+
+	char aBuf[512];
+	// get the best time
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Time FROM %s_race WHERE Map=? ORDER BY `Time` ASC LIMIT 1",
+		pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		pResult->m_CurrentRecord = pSqlServer->GetFloat(1);
+	}
+
+	return false;
+}
+
+// update stuff
+bool CScoreWorker::LoadPlayerData(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	pResult->SetVariant(CScorePlayerResult::PLAYER_INFO);
+
+	char aBuf[1024];
+	// get best race time
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT"
+		"  (SELECT Time FROM %s_race WHERE Map = ? AND Name = ? ORDER BY Time ASC LIMIT 1) AS minTime, "
+		"  cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, cp14, "
+		"  cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25, "
+		"  (cp1 + cp2 + cp3 + cp4 + cp5 + cp6 + cp7 + cp8 + cp9 + cp10 + cp11 + cp12 + cp13 + cp14 + "
+		"  cp15 + cp16 + cp17 + cp18 + cp19 + cp20 + cp21 + cp22 + cp23 + cp24 + cp25 > 0) AS hasCP, Time "
+		"FROM %s_race "
+		"WHERE Map = ? AND Name = ? "
+		"ORDER BY hasCP DESC, Time ASC "
+		"LIMIT 1",
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+
+	const char *pPlayer = pData->m_aName[0] != '\0' ? pData->m_aName : pData->m_aRequestingPlayer;
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pData->m_aRequestingPlayer);
+	pSqlServer->BindString(3, pData->m_aMap);
+	pSqlServer->BindString(4, pPlayer);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		if(!pSqlServer->IsNull(1))
+		{
+			// get the best time
+			float Time = pSqlServer->GetFloat(1);
+			pResult->m_Data.m_Info.m_Time = Time;
+		}
+
+		for(int i = 0; i < NUM_CHECKPOINTS; i++)
+		{
+			pResult->m_Data.m_Info.m_aTimeCp[i] = pSqlServer->GetFloat(i + 2);
+		}
+	}
+
+	// birthday check
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT CURRENT_TIMESTAMP AS Current, MIN(Timestamp) AS Stamp "
+		"FROM %s_race "
+		"WHERE Name = ?",
+		pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aRequestingPlayer);
+
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End && !pSqlServer->IsNull(2))
+	{
+		char aCurrent[TIMESTAMP_STR_LENGTH];
+		pSqlServer->GetString(1, aCurrent, sizeof(aCurrent));
+		char aStamp[TIMESTAMP_STR_LENGTH];
+		pSqlServer->GetString(2, aStamp, sizeof(aStamp));
+		int CurrentYear, CurrentMonth, CurrentDay;
+		int StampYear, StampMonth, StampDay;
+		if(sscanf(aCurrent, "%d-%d-%d", &CurrentYear, &CurrentMonth, &CurrentDay) == 3 && sscanf(aStamp, "%d-%d-%d", &StampYear, &StampMonth, &StampDay) == 3 && CurrentMonth == StampMonth && CurrentDay == StampDay)
+			pResult->m_Data.m_Info.m_Birthday = CurrentYear - StampYear;
+	}
+	return false;
+}
+
+bool CScoreWorker::MapVote(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	char aFuzzyMap[128];
+	str_copy(aFuzzyMap, pData->m_aName, sizeof(aFuzzyMap));
+	sqlstr::FuzzyString(aFuzzyMap, sizeof(aFuzzyMap));
+
+	char aMapPrefix[128];
+	str_copy(aMapPrefix, pData->m_aName, sizeof(aMapPrefix));
+	str_append(aMapPrefix, "%");
+
+	char aBuf[768];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Map, Server "
+		"FROM %s_maps "
+		"WHERE Map LIKE %s "
+		"ORDER BY "
+		"  CASE WHEN Map = ? THEN 0 ELSE 1 END, "
+		"  CASE WHEN Map LIKE ? THEN 0 ELSE 1 END, "
+		"  LENGTH(Map), Map "
+		"LIMIT 1",
+		pSqlServer->GetPrefix(), pSqlServer->CollateNocase());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, aFuzzyMap);
+	pSqlServer->BindString(2, pData->m_aName);
+	pSqlServer->BindString(3, aMapPrefix);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		pResult->SetVariant(CScorePlayerResult::MAP_VOTE);
+		auto *pMapVote = &pResult->m_Data.m_MapVote;
+		pSqlServer->GetString(1, pMapVote->m_aMap, sizeof(pMapVote->m_aMap));
+		pSqlServer->GetString(2, pMapVote->m_aServer, sizeof(pMapVote->m_aServer));
+		str_copy(pMapVote->m_aReason, "/map", sizeof(pMapVote->m_aReason));
+
+		for(char *p = pMapVote->m_aServer; *p; p++) // lower case server
+			*p = tolower(*p);
+	}
+	else
+	{
+		pResult->SetVariant(CScorePlayerResult::DIRECT);
+		str_format(paMessages[0], sizeof(paMessages[0]),
+			"No map like \"%s\" found. "
+			"Try adding a '%%' at the start if you don't know the first character. "
+			"Example: /map %%castle for \"Out of Castle\"",
+			pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::MapInfo(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+
+	char aFuzzyMap[128];
+	str_copy(aFuzzyMap, pData->m_aName, sizeof(aFuzzyMap));
+	sqlstr::FuzzyString(aFuzzyMap, sizeof(aFuzzyMap));
+
+	char aMapPrefix[128];
+	str_copy(aMapPrefix, pData->m_aName, sizeof(aMapPrefix));
+	str_append(aMapPrefix, "%");
+
+	char aCurrentTimestamp[512];
+	pSqlServer->ToUnixTimestamp("CURRENT_TIMESTAMP", aCurrentTimestamp, sizeof(aCurrentTimestamp));
+	char aTimestamp[512];
+	pSqlServer->ToUnixTimestamp("l.Timestamp", aTimestamp, sizeof(aTimestamp));
+
+	char aMedianMapTime[2048];
+	char aBuf[4096];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT l.Map, l.Server, Mapper, Points, Stars, "
+		"  (SELECT COUNT(Name) FROM %s_race WHERE Map = l.Map) AS Finishes, "
+		"  (SELECT COUNT(DISTINCT Name) FROM %s_race WHERE Map = l.Map) AS Finishers, "
+		"  (%s) AS Median, "
+		"  %s AS Stamp, "
+		"  %s-%s AS Ago, "
+		"  (SELECT MIN(Time) FROM %s_race WHERE Map = l.Map AND Name = ?) AS OwnTime "
+		"FROM ("
+		"  SELECT * FROM %s_maps "
+		"  WHERE Map LIKE %s "
+		"  ORDER BY "
+		"    CASE WHEN Map = ? THEN 0 ELSE 1 END, "
+		"    CASE WHEN Map LIKE ? THEN 0 ELSE 1 END, "
+		"    LENGTH(Map), "
+		"    Map "
+		"  LIMIT 1"
+		") as l",
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(),
+		pSqlServer->MedianMapTime(aMedianMapTime, sizeof(aMedianMapTime)),
+		aTimestamp, aCurrentTimestamp, aTimestamp,
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(),
+		pSqlServer->CollateNocase());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aRequestingPlayer);
+	pSqlServer->BindString(2, aFuzzyMap);
+	pSqlServer->BindString(3, pData->m_aName);
+	pSqlServer->BindString(4, aMapPrefix);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		char aMap[MAX_MAP_LENGTH];
+		pSqlServer->GetString(1, aMap, sizeof(aMap));
+		char aServer[32];
+		pSqlServer->GetString(2, aServer, sizeof(aServer));
+		char aMapper[128];
+		pSqlServer->GetString(3, aMapper, sizeof(aMapper));
+		int Points = pSqlServer->GetInt(4);
+		int Stars = pSqlServer->GetInt(5);
+		int Finishes = pSqlServer->GetInt(6);
+		int Finishers = pSqlServer->GetInt(7);
+		float Median = !pSqlServer->IsNull(8) ? pSqlServer->GetInt(8) : -1.0f;
+		int Stamp = pSqlServer->GetInt(9);
+		int Ago = pSqlServer->GetInt(10);
+		float OwnTime = !pSqlServer->IsNull(11) ? pSqlServer->GetFloat(11) : -1.0f;
+
+		char aAgoString[40] = "\0";
+		char aReleasedString[60] = "\0";
+		if(Stamp != 0)
+		{
+			sqlstr::AgoTimeToString(Ago, aAgoString, sizeof(aAgoString));
+			str_format(aReleasedString, sizeof(aReleasedString), ", released %s ago", aAgoString);
+		}
+
+		char aMedianString[60] = "\0";
+		if(Median > 0)
+		{
+			str_time((int64_t)Median * 100, TIME_HOURS, aBuf, sizeof(aBuf));
+			str_format(aMedianString, sizeof(aMedianString), " in %s median", aBuf);
+		}
+
+		char aStars[20];
+		switch(Stars)
+		{
+		case 0: str_copy(aStars, "✰✰✰✰✰", sizeof(aStars)); break;
+		case 1: str_copy(aStars, "★✰✰✰✰", sizeof(aStars)); break;
+		case 2: str_copy(aStars, "★★✰✰✰", sizeof(aStars)); break;
+		case 3: str_copy(aStars, "★★★✰✰", sizeof(aStars)); break;
+		case 4: str_copy(aStars, "★★★★✰", sizeof(aStars)); break;
+		case 5: str_copy(aStars, "★★★★★", sizeof(aStars)); break;
+		default: aStars[0] = '\0';
+		}
+
+		char aOwnFinishesString[40] = "\0";
+		if(OwnTime > 0)
+		{
+			str_time_float(OwnTime, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+			str_format(aOwnFinishesString, sizeof(aOwnFinishesString),
+				", your time: %s", aBuf);
+		}
+
+		str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+			"\"%s\" by %s on %s, %s, %d %s%s, %d %s by %d %s%s%s",
+			aMap, aMapper, aServer, aStars,
+			Points, Points == 1 ? "point" : "points",
+			aReleasedString,
+			Finishes, Finishes == 1 ? "finish" : "finishes",
+			Finishers, Finishers == 1 ? "tee" : "tees",
+			aMedianString, aOwnFinishesString);
+	}
+	else
+	{
+		str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+			"No map like \"%s\" found.", pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::SaveScore(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlScoreData *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	char aBuf[1024];
+
+	if(w == Write::NORMAL_SUCCEEDED)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_race_backup WHERE GameId=? AND Name=? AND Timestamp=%s",
+			pSqlServer->GetPrefix(), pSqlServer->InsertTimestampAsUtc());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGameUuid);
+		pSqlServer->BindString(2, pData->m_aName);
+		pSqlServer->BindString(3, pData->m_aTimestamp);
+		pSqlServer->Print();
+		int NumDeleted;
+		if(pSqlServer->ExecuteUpdate(&NumDeleted, pError, ErrorSize))
+		{
+			return true;
+		}
+		if(NumDeleted == 0)
+		{
+			log_warn("sql", "Rank got moved out of backup database, will show up as duplicate rank in MySQL");
+		}
+		return false;
+	}
+	if(w == Write::NORMAL_FAILED)
+	{
+		int NumUpdated;
+		// move to non-tmp table succeeded. delete from backup again
+		str_format(aBuf, sizeof(aBuf),
+			"INSERT INTO %s_race SELECT * FROM %s_race_backup WHERE GameId=? AND Name=? AND Timestamp=%s",
+			pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->InsertTimestampAsUtc());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGameUuid);
+		pSqlServer->BindString(2, pData->m_aName);
+		pSqlServer->BindString(3, pData->m_aTimestamp);
+		pSqlServer->Print();
+		if(pSqlServer->ExecuteUpdate(&NumUpdated, pError, ErrorSize))
+		{
+			return true;
+		}
+
+		// move to non-tmp table succeeded. delete from backup again
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_race_backup WHERE GameId=? AND Name=? AND Timestamp=%s",
+			pSqlServer->GetPrefix(), pSqlServer->InsertTimestampAsUtc());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGameUuid);
+		pSqlServer->BindString(2, pData->m_aName);
+		pSqlServer->BindString(3, pData->m_aTimestamp);
+		pSqlServer->Print();
+		if(pSqlServer->ExecuteUpdate(&NumUpdated, pError, ErrorSize))
+		{
+			return true;
+		}
+		if(NumUpdated == 0)
+		{
+			log_warn("sql", "Rank got moved out of backup database, will show up as duplicate rank in MySQL");
+		}
+		return false;
+	}
+
+	if(w == Write::NORMAL)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT COUNT(*) AS NumFinished FROM %s_race WHERE Map=? AND Name=? ORDER BY time ASC LIMIT 1",
+			pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aMap);
+		pSqlServer->BindString(2, pData->m_aName);
+
+		bool End;
+		if(pSqlServer->Step(&End, pError, ErrorSize))
+		{
+			return true;
+		}
+		int NumFinished = pSqlServer->GetInt(1);
+		if(NumFinished == 0)
+		{
+			str_format(aBuf, sizeof(aBuf), "SELECT Points FROM %s_maps WHERE Map=?", pSqlServer->GetPrefix());
+			if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+			{
+				return true;
+			}
+			pSqlServer->BindString(1, pData->m_aMap);
+
+			bool End2;
+			if(pSqlServer->Step(&End2, pError, ErrorSize))
+			{
+				return true;
+			}
+			if(!End2)
+			{
+				int Points = pSqlServer->GetInt(1);
+				if(pSqlServer->AddPoints(pData->m_aName, Points, pError, ErrorSize))
+				{
+					return true;
+				}
+				str_format(paMessages[0], sizeof(paMessages[0]),
+					"You earned %d point%s for finishing this map!",
+					Points, Points == 1 ? "" : "s");
+			}
+		}
+	}
+
+	// save score. Can't fail, because no UNIQUE/PRIMARY KEY constrain is defined.
+	str_format(aBuf, sizeof(aBuf),
+		"%s INTO %s_race%s("
+		"	Map, Name, Timestamp, Time, Server, "
+		"	cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, "
+		"	cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25, "
+		"	GameID, DDNet7) "
+		"VALUES (?, ?, %s, %.2f, ?, "
+		"	%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, "
+		"	%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, "
+		"	%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, "
+		"	?, %s)",
+		pSqlServer->InsertIgnore(), pSqlServer->GetPrefix(),
+		w == Write::NORMAL ? "" : "_backup",
+		pSqlServer->InsertTimestampAsUtc(), pData->m_Time,
+		pData->m_aCurrentTimeCp[0], pData->m_aCurrentTimeCp[1], pData->m_aCurrentTimeCp[2],
+		pData->m_aCurrentTimeCp[3], pData->m_aCurrentTimeCp[4], pData->m_aCurrentTimeCp[5],
+		pData->m_aCurrentTimeCp[6], pData->m_aCurrentTimeCp[7], pData->m_aCurrentTimeCp[8],
+		pData->m_aCurrentTimeCp[9], pData->m_aCurrentTimeCp[10], pData->m_aCurrentTimeCp[11],
+		pData->m_aCurrentTimeCp[12], pData->m_aCurrentTimeCp[13], pData->m_aCurrentTimeCp[14],
+		pData->m_aCurrentTimeCp[15], pData->m_aCurrentTimeCp[16], pData->m_aCurrentTimeCp[17],
+		pData->m_aCurrentTimeCp[18], pData->m_aCurrentTimeCp[19], pData->m_aCurrentTimeCp[20],
+		pData->m_aCurrentTimeCp[21], pData->m_aCurrentTimeCp[22], pData->m_aCurrentTimeCp[23],
+		pData->m_aCurrentTimeCp[24], pSqlServer->False());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pData->m_aName);
+	pSqlServer->BindString(3, pData->m_aTimestamp);
+	pSqlServer->BindString(4, g_Config.m_SvSqlServerName);
+	pSqlServer->BindString(5, pData->m_aGameUuid);
+	pSqlServer->Print();
+	int NumInserted;
+	return pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize);
+}
+
+bool CScoreWorker::SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlTeamScoreData *>(pGameData);
+
+	char aBuf[512];
+
+	if(w == Write::NORMAL_SUCCEEDED)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_teamrace_backup WHERE ID=?",
+			pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+
+		// copy uuid, because mysql BindBlob doesn't support const buffers
+		CUuid TeamrankId = pData->m_TeamrankUuid;
+		pSqlServer->BindBlob(1, TeamrankId.m_aData, sizeof(TeamrankId.m_aData));
+		pSqlServer->Print();
+		int NumDeleted;
+		if(pSqlServer->ExecuteUpdate(&NumDeleted, pError, ErrorSize))
+		{
+			return true;
+		}
+		if(NumDeleted == 0)
+		{
+			log_warn("sql", "Teamrank got moved out of backup database, will show up as duplicate teamrank in MySQL");
+		}
+		return false;
+	}
+	if(w == Write::NORMAL_FAILED)
+	{
+		int NumInserted;
+		CUuid TeamrankId = pData->m_TeamrankUuid;
+
+		str_format(aBuf, sizeof(aBuf),
+			"INSERT INTO %s_teamrace SELECT * FROM %s_teamrace_backup WHERE ID=?",
+			pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindBlob(1, TeamrankId.m_aData, sizeof(TeamrankId.m_aData));
+		pSqlServer->Print();
+		if(pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize))
+		{
+			return true;
+		}
+
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_teamrace_backup WHERE ID=?",
+			pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindBlob(1, TeamrankId.m_aData, sizeof(TeamrankId.m_aData));
+		pSqlServer->Print();
+		return pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize);
+	}
+
+	if(w == Write::NORMAL)
+	{
+		// get the names sorted in a tab separated string
+		std::vector<std::string> vNames;
+		for(unsigned int i = 0; i < pData->m_Size; i++)
+			vNames.emplace_back(pData->m_aaNames[i]);
+
+		std::sort(vNames.begin(), vNames.end());
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT l.ID, Name, Time "
+			"FROM (" // preselect teams with first name in team
+			"  SELECT ID "
+			"  FROM %s_teamrace "
+			"  WHERE Map = ? AND Name = ? AND DDNet7 = %s"
+			") as l INNER JOIN %s_teamrace AS r ON l.ID = r.ID "
+			"ORDER BY l.ID, Name COLLATE %s",
+			pSqlServer->GetPrefix(), pSqlServer->False(), pSqlServer->GetPrefix(), pSqlServer->BinaryCollate());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aMap);
+		pSqlServer->BindString(2, pData->m_aaNames[0]);
+
+		bool FoundTeam = false;
+		float Time;
+		CTeamrank Teamrank;
+		bool End;
+		if(pSqlServer->Step(&End, pError, ErrorSize))
+		{
+			return true;
+		}
+		if(!End)
+		{
+			bool SearchTeamEnd = false;
+			while(!SearchTeamEnd)
+			{
+				Time = pSqlServer->GetFloat(3);
+				if(Teamrank.NextSqlResult(pSqlServer, &SearchTeamEnd, pError, ErrorSize))
+				{
+					return true;
+				}
+				if(Teamrank.SamePlayers(&vNames))
+				{
+					FoundTeam = true;
+					break;
+				}
+			}
+		}
+		if(FoundTeam)
+		{
+			dbg_msg("sql", "found team rank from same team (old time: %f, new time: %f)", Time, pData->m_Time);
+			if(pData->m_Time < Time)
+			{
+				str_format(aBuf, sizeof(aBuf),
+					"UPDATE %s_teamrace SET Time=%.2f, Timestamp=%s, DDNet7=%s, GameID=? WHERE ID = ?",
+					pSqlServer->GetPrefix(), pData->m_Time, pSqlServer->InsertTimestampAsUtc(), pSqlServer->False());
+				if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+				{
+					return true;
+				}
+				pSqlServer->BindString(1, pData->m_aTimestamp);
+				pSqlServer->BindString(2, pData->m_aGameUuid);
+				pSqlServer->BindBlob(3, Teamrank.m_TeamID.m_aData, sizeof(Teamrank.m_TeamID.m_aData));
+				pSqlServer->Print();
+				int NumUpdated;
+				if(pSqlServer->ExecuteUpdate(&NumUpdated, pError, ErrorSize))
+				{
+					return true;
+				}
+				// return error if we didn't update any rows
+				return NumUpdated == 0;
+			}
+			return false;
+		}
+	}
+
+	for(unsigned int i = 0; i < pData->m_Size; i++)
+	{
+		// if no entry found... create a new one
+		str_format(aBuf, sizeof(aBuf),
+			"%s INTO %s_teamrace%s(Map, Name, Timestamp, Time, ID, GameID, DDNet7) "
+			"VALUES (?, ?, %s, %.2f, ?, ?, %s)",
+			pSqlServer->InsertIgnore(), pSqlServer->GetPrefix(),
+			w == Write::NORMAL ? "" : "_backup",
+			pSqlServer->InsertTimestampAsUtc(), pData->m_Time, pSqlServer->False());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aMap);
+		pSqlServer->BindString(2, pData->m_aaNames[i]);
+		pSqlServer->BindString(3, pData->m_aTimestamp);
+		// copy uuid, because mysql BindBlob doesn't support const buffers
+		CUuid TeamrankId = pData->m_TeamrankUuid;
+		pSqlServer->BindBlob(4, TeamrankId.m_aData, sizeof(TeamrankId.m_aData));
+		pSqlServer->BindString(5, pData->m_aGameUuid);
+		pSqlServer->Print();
+		int NumInserted;
+		if(pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CScoreWorker::ShowRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+
+	char aServerLike[16];
+	str_format(aServerLike, sizeof(aServerLike), "%%%s%%", pData->m_aServer);
+
+	// check sort method
+	char aBuf[600];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Ranking, Time, PercentRank "
+		"FROM ("
+		"  SELECT RANK() OVER w AS Ranking, PERCENT_RANK() OVER w as PercentRank, MIN(Time) AS Time, Name "
+		"  FROM %s_race "
+		"  WHERE Map = ? "
+		"  AND Server LIKE ? "
+		"  GROUP BY Name "
+		"  WINDOW w AS (ORDER BY MIN(Time))"
+		") as a "
+		"WHERE Name = ?",
+		pSqlServer->GetPrefix());
+
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, aServerLike);
+	pSqlServer->BindString(3, pData->m_aName);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+
+	char aRegionalRank[16];
+	if(End)
+	{
+		str_copy(aRegionalRank, "unranked", sizeof(aRegionalRank));
+	}
+	else
+	{
+		str_format(aRegionalRank, sizeof(aRegionalRank), "rank %d", pSqlServer->GetInt(1));
+	}
+
+	const char *pAny = "%";
+
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pAny);
+	pSqlServer->BindString(3, pData->m_aName);
+
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+
+	if(!End)
+	{
+		int Rank = pSqlServer->GetInt(1);
+		float Time = pSqlServer->GetFloat(2);
+		// CEIL and FLOOR are not supported in SQLite
+		int BetterThanPercent = std::floor(100.0f - 100.0f * pSqlServer->GetFloat(3));
+		str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+		if(g_Config.m_SvHideScore)
+		{
+			str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+				"Your time: %s, better than %d%%", aBuf, BetterThanPercent);
+		}
+		else
+		{
+			pResult->m_MessageKind = CScorePlayerResult::ALL;
+
+			if(str_comp_nocase(pData->m_aRequestingPlayer, pData->m_aName) == 0)
+			{
+				str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+					"%s - %s - better than %d%%",
+					pData->m_aName, aBuf, BetterThanPercent);
+			}
+			else
+			{
+				str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+					"%s - %s - better than %d%% - requested by %s",
+					pData->m_aName, aBuf, BetterThanPercent, pData->m_aRequestingPlayer);
+			}
+
+			if(g_Config.m_SvRegionalRankings)
+			{
+				str_format(pResult->m_Data.m_aaMessages[1], sizeof(pResult->m_Data.m_aaMessages[1]),
+					"Global rank %d - %s %s",
+					Rank, pData->m_aServer, aRegionalRank);
+			}
+			else
+			{
+				str_format(pResult->m_Data.m_aaMessages[1], sizeof(pResult->m_Data.m_aaMessages[1]),
+					"Global rank %d", Rank);
+			}
+		}
+	}
+	else
+	{
+		str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+			"%s is not ranked", pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::ShowTeamRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+
+	// check sort method
+	char aBuf[2400];
+
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT l.ID, Name, Time, Ranking, PercentRank "
+		"FROM (" // teamrank score board
+		"  SELECT RANK() OVER w AS Ranking, PERCENT_RANK() OVER w AS PercentRank, ID "
+		"  FROM %s_teamrace "
+		"  WHERE Map = ? "
+		"  GROUP BY ID "
+		"  WINDOW w AS (ORDER BY Min(Time))"
+		") AS TeamRank INNER JOIN (" // select rank with Name in team
+		"  SELECT ID "
+		"  FROM %s_teamrace "
+		"  WHERE Map = ? AND Name = ? "
+		"  ORDER BY Time "
+		"  LIMIT 1"
+		") AS l ON TeamRank.ID = l.ID "
+		"INNER JOIN %s_teamrace AS r ON l.ID = r.ID ",
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pData->m_aMap);
+	pSqlServer->BindString(3, pData->m_aName);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		float Time = pSqlServer->GetFloat(3);
+		str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+		int Rank = pSqlServer->GetInt(4);
+		// CEIL and FLOOR are not supported in SQLite
+		int BetterThanPercent = std::floor(100.0f - 100.0f * pSqlServer->GetFloat(5));
+		CTeamrank Teamrank;
+		if(Teamrank.NextSqlResult(pSqlServer, &End, pError, ErrorSize))
+		{
+			return true;
+		}
+
+		char aFormattedNames[512] = "";
+		for(unsigned int Name = 0; Name < Teamrank.m_NumNames; Name++)
+		{
+			str_append(aFormattedNames, Teamrank.m_aaNames[Name]);
+
+			if(Name < Teamrank.m_NumNames - 2)
+				str_append(aFormattedNames, ", ");
+			else if(Name < Teamrank.m_NumNames - 1)
+				str_append(aFormattedNames, " & ");
+		}
+
+		if(g_Config.m_SvHideScore)
+		{
+			str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+				"Your team time: %s, better than %d%%", aBuf, BetterThanPercent);
+		}
+		else
+		{
+			pResult->m_MessageKind = CScorePlayerResult::ALL;
+			str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+				"%d. %s Team time: %s, better than %d%%, requested by %s",
+				Rank, aFormattedNames, aBuf, BetterThanPercent, pData->m_aRequestingPlayer);
+		}
+	}
+	else
+	{
+		str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
+			"%s has no team ranks", pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+
+	int LimitStart = maximum(absolute(pData->m_Offset) - 1, 0);
+	const char *pOrder = pData->m_Offset >= 0 ? "ASC" : "DESC";
+	const char *pAny = "%";
+
+	// check sort method
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Name, Time, Ranking "
+		"FROM ("
+		"  SELECT RANK() OVER w AS Ranking, MIN(Time) AS Time, Name "
+		"  FROM %s_race "
+		"  WHERE Map = ? "
+		"  AND Server LIKE ? "
+		"  GROUP BY Name "
+		"  WINDOW w AS (ORDER BY MIN(Time))"
+		") as a "
+		"ORDER BY Ranking %s "
+		"LIMIT %d, ?",
+		pSqlServer->GetPrefix(),
+		pOrder,
+		LimitStart);
+
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pAny);
+	pSqlServer->BindInt(3, 5);
+
+	// show top
+	int Line = 0;
+	str_copy(pResult->m_Data.m_aaMessages[Line], "------------ Global Top ------------", sizeof(pResult->m_Data.m_aaMessages[Line]));
+	Line++;
+
+	char aTime[32];
+	bool End = false;
+
+	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
+	{
+		char aName[MAX_NAME_LENGTH];
+		pSqlServer->GetString(1, aName, sizeof(aName));
+		float Time = pSqlServer->GetFloat(2);
+		str_time_float(Time, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+		int Rank = pSqlServer->GetInt(3);
+		str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
+			"%d. %s Time: %s", Rank, aName, aTime);
+
+		Line++;
+	}
+
+	if(!g_Config.m_SvRegionalRankings)
+	{
+		str_copy(pResult->m_Data.m_aaMessages[Line], "----------------------------------------", sizeof(pResult->m_Data.m_aaMessages[Line]));
+		return !End;
+	}
+
+	char aServerLike[16];
+	str_format(aServerLike, sizeof(aServerLike), "%%%s%%", pData->m_aServer);
+
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, aServerLike);
+	pSqlServer->BindInt(3, 3);
+
+	str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
+		"------------ %s Top ------------", pData->m_aServer);
+	Line++;
+
+	// show top
+	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
+	{
+		char aName[MAX_NAME_LENGTH];
+		pSqlServer->GetString(1, aName, sizeof(aName));
+		float Time = pSqlServer->GetFloat(2);
+		str_time_float(Time, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+		int Rank = pSqlServer->GetInt(3);
+		str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
+			"%d. %s Time: %s", Rank, aName, aTime);
+		Line++;
+	}
+
+	return !End;
+}
+
+bool CScoreWorker::ShowTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	int LimitStart = maximum(absolute(pData->m_Offset) - 1, 0);
+	const char *pOrder = pData->m_Offset >= 0 ? "ASC" : "DESC";
+
+	// check sort method
+	char aBuf[1024];
+
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Name, Time, Ranking, TeamSize "
+		"FROM (" // limit to 5
+		"  SELECT TeamSize, Ranking, ID "
+		"  FROM (" // teamrank score board
+		"    SELECT RANK() OVER w AS Ranking, COUNT(*) AS Teamsize, ID "
+		"    FROM %s_teamrace "
+		"    WHERE Map = ? "
+		"    GROUP BY ID "
+		"    WINDOW w AS (ORDER BY Min(Time))"
+		"  ) as l1 "
+		"  ORDER BY Ranking %s "
+		"  LIMIT %d, 5"
+		") as l2 "
+		"INNER JOIN %s_teamrace as r ON l2.ID = r.ID "
+		"ORDER BY Ranking %s, r.ID, Name ASC",
+		pSqlServer->GetPrefix(), pOrder, LimitStart, pSqlServer->GetPrefix(), pOrder);
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+
+	// show teamtop5
+	int Line = 0;
+	str_copy(paMessages[Line++], "------- Team Top 5 -------", sizeof(paMessages[Line]));
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		for(Line = 1; Line < 6; Line++) // print
+		{
+			bool Last = false;
+			float Time = pSqlServer->GetFloat(2);
+			str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+			int Rank = pSqlServer->GetInt(3);
+			int TeamSize = pSqlServer->GetInt(4);
+
+			char aNames[2300] = {0};
+			for(int i = 0; i < TeamSize; i++)
+			{
+				char aName[MAX_NAME_LENGTH];
+				pSqlServer->GetString(1, aName, sizeof(aName));
+				str_append(aNames, aName);
+				if(i < TeamSize - 2)
+					str_append(aNames, ", ");
+				else if(i == TeamSize - 2)
+					str_append(aNames, " & ");
+				if(pSqlServer->Step(&Last, pError, ErrorSize))
+				{
+					return true;
+				}
+				if(Last)
+				{
+					break;
+				}
+			}
+			str_format(paMessages[Line], sizeof(paMessages[Line]), "%d. %s Team Time: %s",
+				Rank, aNames, aBuf);
+			if(Last)
+			{
+				Line++;
+				break;
+			}
+		}
+	}
+
+	str_copy(paMessages[Line], "-------------------------------", sizeof(paMessages[Line]));
+	return false;
+}
+
+bool CScoreWorker::ShowPlayerTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	int LimitStart = maximum(absolute(pData->m_Offset) - 1, 0);
+	const char *pOrder = pData->m_Offset >= 0 ? "ASC" : "DESC";
+
+	// check sort method
+	char aBuf[2400];
+
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT l.ID, Name, Time, Ranking "
+		"FROM (" // teamrank score board
+		"  SELECT RANK() OVER w AS Ranking, ID "
+		"  FROM %s_teamrace "
+		"  WHERE Map = ? "
+		"  GROUP BY ID "
+		"  WINDOW w AS (ORDER BY Min(Time))"
+		") AS TeamRank INNER JOIN (" // select rank with Name in team
+		"  SELECT ID "
+		"  FROM %s_teamrace "
+		"  WHERE Map = ? AND Name = ? "
+		"  ORDER BY Time %s "
+		"  LIMIT %d, 5 "
+		") AS l ON TeamRank.ID = l.ID "
+		"INNER JOIN %s_teamrace AS r ON l.ID = r.ID "
+		"ORDER BY Time %s, l.ID, Name ASC",
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pOrder, LimitStart, pSqlServer->GetPrefix(), pOrder);
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, pData->m_aMap);
+	pSqlServer->BindString(3, pData->m_aName);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		// show teamtop5
+		int Line = 0;
+		str_copy(paMessages[Line++], "------- Team Top 5 -------", sizeof(paMessages[Line]));
+
+		for(Line = 1; Line < 6; Line++) // print
+		{
+			float Time = pSqlServer->GetFloat(3);
+			str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+			int Rank = pSqlServer->GetInt(4);
+			CTeamrank Teamrank;
+			bool Last;
+			if(Teamrank.NextSqlResult(pSqlServer, &Last, pError, ErrorSize))
+			{
+				return true;
+			}
+
+			char aFormattedNames[512] = "";
+			for(unsigned int Name = 0; Name < Teamrank.m_NumNames; Name++)
+			{
+				str_append(aFormattedNames, Teamrank.m_aaNames[Name]);
+
+				if(Name < Teamrank.m_NumNames - 2)
+					str_append(aFormattedNames, ", ");
+				else if(Name < Teamrank.m_NumNames - 1)
+					str_append(aFormattedNames, " & ");
+			}
+
+			str_format(paMessages[Line], sizeof(paMessages[Line]), "%d. %s Team Time: %s",
+				Rank, aFormattedNames, aBuf);
+			if(Last)
+			{
+				Line++;
+				break;
+			}
+		}
+		str_copy(paMessages[Line], "-------------------------------", sizeof(paMessages[Line]));
+	}
+	else
+	{
+		if(pData->m_Offset == 0)
+			str_format(paMessages[0], sizeof(paMessages[0]), "%s has no team ranks", pData->m_aName);
+		else
+			str_format(paMessages[0], sizeof(paMessages[0]), "%s has no team ranks in the specified range", pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::ShowTimes(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	int LimitStart = maximum(absolute(pData->m_Offset) - 1, 0);
+	const char *pOrder = pData->m_Offset >= 0 ? "DESC" : "ASC";
+
+	char aCurrentTimestamp[512];
+	pSqlServer->ToUnixTimestamp("CURRENT_TIMESTAMP", aCurrentTimestamp, sizeof(aCurrentTimestamp));
+	char aTimestamp[512];
+	pSqlServer->ToUnixTimestamp("Timestamp", aTimestamp, sizeof(aTimestamp));
+	char aBuf[512];
+	if(pData->m_aName[0] != '\0') // last 5 times of a player
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Time, (%s-%s) as Ago, %s as Stamp, Server "
+			"FROM %s_race "
+			"WHERE Map = ? AND Name = ? "
+			"ORDER BY Timestamp %s "
+			"LIMIT ?, 5",
+			aCurrentTimestamp, aTimestamp, aTimestamp,
+			pSqlServer->GetPrefix(), pOrder);
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aMap);
+		pSqlServer->BindString(2, pData->m_aName);
+		pSqlServer->BindInt(3, LimitStart);
+	}
+	else // last 5 times of server
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Time, (%s-%s) as Ago, %s as Stamp, Server, Name "
+			"FROM %s_race "
+			"WHERE Map = ? "
+			"ORDER BY Timestamp %s "
+			"LIMIT ?, 5",
+			aCurrentTimestamp, aTimestamp, aTimestamp,
+			pSqlServer->GetPrefix(), pOrder);
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aMap);
+		pSqlServer->BindInt(2, LimitStart);
+	}
+
+	// show top5
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(End)
+	{
+		str_copy(paMessages[0], "There are no times in the specified range", sizeof(paMessages[0]));
+		return false;
+	}
+
+	str_copy(paMessages[0], "------------- Last Times -------------", sizeof(paMessages[0]));
+	int Line = 1;
+
+	do
+	{
+		float Time = pSqlServer->GetFloat(1);
+		str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
+		int Ago = pSqlServer->GetInt(2);
+		int Stamp = pSqlServer->GetInt(3);
+		char aServer[5];
+		pSqlServer->GetString(4, aServer, sizeof(aServer));
+		char aServerFormatted[8] = "\0";
+		if(str_comp(aServer, "UNK") != 0)
+			str_format(aServerFormatted, sizeof(aServerFormatted), "[%s] ", aServer);
+
+		char aAgoString[40] = "\0";
+		sqlstr::AgoTimeToString(Ago, aAgoString, sizeof(aAgoString));
+
+		if(pData->m_aName[0] != '\0') // last 5 times of a player
+		{
+			if(Stamp == 0) // stamp is 00:00:00 cause it's an old entry from old times where there where no stamps yet
+				str_format(paMessages[Line], sizeof(paMessages[Line]),
+					"%s%s, don't know how long ago", aServerFormatted, aBuf);
+			else
+				str_format(paMessages[Line], sizeof(paMessages[Line]),
+					"%s%s ago, %s", aServerFormatted, aAgoString, aBuf);
+		}
+		else // last 5 times of the server
+		{
+			char aName[MAX_NAME_LENGTH];
+			pSqlServer->GetString(5, aName, sizeof(aName));
+			if(Stamp == 0) // stamp is 00:00:00 cause it's an old entry from old times where there where no stamps yet
+			{
+				str_format(paMessages[Line], sizeof(paMessages[Line]),
+					"%s%s, %s, don't know when", aServerFormatted, aName, aBuf);
+			}
+			else
+			{
+				str_format(paMessages[Line], sizeof(paMessages[Line]),
+					"%s%s, %s ago, %s", aServerFormatted, aName, aAgoString, aBuf);
+			}
+		}
+		Line++;
+	} while(!pSqlServer->Step(&End, pError, ErrorSize) && !End);
+	if(!End)
+	{
+		return true;
+	}
+	str_copy(paMessages[Line], "----------------------------------------------------", sizeof(paMessages[Line]));
+
+	return false;
+}
+
+bool CScoreWorker::ShowPoints(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT ("
+		"  SELECT COUNT(Name) + 1 FROM %s_points WHERE Points > ("
+		"    SELECT Points FROM %s_points WHERE Name = ?"
+		")) as Ranking, Points, Name "
+		"FROM %s_points WHERE Name = ?",
+		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aName);
+	pSqlServer->BindString(2, pData->m_aName);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		int Rank = pSqlServer->GetInt(1);
+		int Count = pSqlServer->GetInt(2);
+		char aName[MAX_NAME_LENGTH];
+		pSqlServer->GetString(3, aName, sizeof(aName));
+		pResult->m_MessageKind = CScorePlayerResult::ALL;
+		str_format(paMessages[0], sizeof(paMessages[0]),
+			"%d. %s Points: %d, requested by %s",
+			Rank, aName, Count, pData->m_aRequestingPlayer);
+	}
+	else
+	{
+		str_format(paMessages[0], sizeof(paMessages[0]),
+			"%s has not collected any points so far", pData->m_aName);
+	}
+	return false;
+}
+
+bool CScoreWorker::ShowTopPoints(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	int LimitStart = maximum(pData->m_Offset - 1, 0);
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT RANK() OVER (ORDER BY a.Points DESC) as Ranking, Points, Name "
+		"FROM ("
+		"  SELECT Points, Name "
+		"  FROM %s_points "
+		"  ORDER BY Points DESC LIMIT ?"
+		") as a "
+		"ORDER BY Ranking ASC, Name ASC LIMIT ?, 5",
+		pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindInt(1, LimitStart + 5);
+	pSqlServer->BindInt(2, LimitStart);
+
+	// show top points
+	str_copy(paMessages[0], "-------- Top Points --------", sizeof(paMessages[0]));
+
+	bool End = false;
+	int Line = 1;
+	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
+	{
+		int Rank = pSqlServer->GetInt(1);
+		int Points = pSqlServer->GetInt(2);
+		char aName[MAX_NAME_LENGTH];
+		pSqlServer->GetString(3, aName, sizeof(aName));
+		str_format(paMessages[Line], sizeof(paMessages[Line]),
+			"%d. %s Points: %d", Rank, aName, Points);
+		Line++;
+	}
+	if(!End)
+	{
+		return true;
+	}
+	str_copy(paMessages[Line], "-------------------------------", sizeof(paMessages[Line]));
+
+	return false;
+}
+
+bool CScoreWorker::RandomMap(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlRandomMapRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScoreRandomMapResult *>(pGameData->m_pResult.get());
+
+	char aBuf[512];
+	if(0 <= pData->m_Stars && pData->m_Stars <= 5)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Map FROM %s_maps "
+			"WHERE Server = ? AND Map != ? AND Stars = ? "
+			"ORDER BY %s LIMIT 1",
+			pSqlServer->GetPrefix(), pSqlServer->Random());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindInt(3, pData->m_Stars);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Map FROM %s_maps "
+			"WHERE Server = ? AND Map != ? "
+			"ORDER BY %s LIMIT 1",
+			pSqlServer->GetPrefix(), pSqlServer->Random());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+	}
+	pSqlServer->BindString(1, pData->m_aServerType);
+	pSqlServer->BindString(2, pData->m_aCurrentMap);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		pSqlServer->GetString(1, pResult->m_aMap, sizeof(pResult->m_aMap));
+	}
+	else
+	{
+		str_copy(pResult->m_aMessage, "No maps found on this server!", sizeof(pResult->m_aMessage));
+	}
+	return false;
+}
+
+bool CScoreWorker::RandomUnfinishedMap(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlRandomMapRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScoreRandomMapResult *>(pGameData->m_pResult.get());
+
+	char aBuf[512];
+	if(pData->m_Stars >= 0)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Map "
+			"FROM %s_maps "
+			"WHERE Server = ? AND Map != ? AND Stars = ? AND Map NOT IN ("
+			"  SELECT Map "
+			"  FROM %s_race "
+			"  WHERE Name = ?"
+			") ORDER BY %s "
+			"LIMIT 1",
+			pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->Random());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aServerType);
+		pSqlServer->BindString(2, pData->m_aCurrentMap);
+		pSqlServer->BindInt(3, pData->m_Stars);
+		pSqlServer->BindString(4, pData->m_aRequestingPlayer);
+	}
+	else
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"SELECT Map "
+			"FROM %s_maps AS maps "
+			"WHERE Server = ? AND Map != ? AND Map NOT IN ("
+			"  SELECT Map "
+			"  FROM %s_race as race "
+			"  WHERE Name = ?"
+			") ORDER BY %s "
+			"LIMIT 1",
+			pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->Random());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aServerType);
+		pSqlServer->BindString(2, pData->m_aCurrentMap);
+		pSqlServer->BindString(3, pData->m_aRequestingPlayer);
+	}
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		pSqlServer->GetString(1, pResult->m_aMap, sizeof(pResult->m_aMap));
+	}
+	else
+	{
+		str_copy(pResult->m_aMessage, "You have no more unfinished maps on this server!", sizeof(pResult->m_aMessage));
+	}
+	return false;
+}
+
+bool CScoreWorker::SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlTeamSave *>(pGameData);
+	auto *pResult = dynamic_cast<CScoreSaveResult *>(pGameData->m_pResult.get());
+
+	if(w == Write::NORMAL_SUCCEEDED)
+	{
+		// write succeeded on mysql server. delete from sqlite again
+		char aBuf[128] = {0};
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_saves_backup WHERE Code = ?",
+			pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGeneratedCode);
+		bool End;
+		return pSqlServer->Step(&End, pError, ErrorSize);
+	}
+	if(w == Write::NORMAL_FAILED)
+	{
+		char aBuf[256] = {0};
+		bool End;
+		// move to non-tmp table succeeded. delete from backup again
+		str_format(aBuf, sizeof(aBuf),
+			"INSERT INTO %s_saves SELECT * FROM %s_saves_backup WHERE Code = ?",
+			pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGeneratedCode);
+		if(pSqlServer->Step(&End, pError, ErrorSize))
+		{
+			return true;
+		}
+
+		// move to non-tmp table succeeded. delete from backup again
+		str_format(aBuf, sizeof(aBuf),
+			"DELETE FROM %s_saves_backup WHERE Code = ?",
+			pSqlServer->GetPrefix());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pData->m_aGeneratedCode);
+		return pSqlServer->Step(&End, pError, ErrorSize);
+	}
+
+	char aSaveID[UUID_MAXSTRSIZE];
+	FormatUuid(pResult->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
+
+	char *pSaveState = pResult->m_SavedTeam.GetString();
+	char aBuf[65536];
+
+	dbg_msg("score/dbg", "code=%s failure=%d", pData->m_aCode, (int)w);
+	bool UseGeneratedCode = pData->m_aCode[0] == '\0' || w != Write::NORMAL;
+
+	bool Retry = false;
+	// two tries, first use the user provided code, then the autogenerated
+	do
+	{
+		Retry = false;
+		char aCode[128] = {0};
+		if(UseGeneratedCode)
+			str_copy(aCode, pData->m_aGeneratedCode, sizeof(aCode));
+		else
+			str_copy(aCode, pData->m_aCode, sizeof(aCode));
+
+		str_format(aBuf, sizeof(aBuf),
+			"%s INTO %s_saves%s(Savegame, Map, Code, Timestamp, Server, SaveID, DDNet7) "
+			"VALUES (?, ?, ?, CURRENT_TIMESTAMP, ?, ?, %s)",
+			pSqlServer->InsertIgnore(), pSqlServer->GetPrefix(),
+			w == Write::NORMAL ? "" : "_backup", pSqlServer->False());
+		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+		{
+			return true;
+		}
+		pSqlServer->BindString(1, pSaveState);
+		pSqlServer->BindString(2, pData->m_aMap);
+		pSqlServer->BindString(3, aCode);
+		pSqlServer->BindString(4, pData->m_aServer);
+		pSqlServer->BindString(5, aSaveID);
+		pSqlServer->Print();
+		int NumInserted;
+		if(pSqlServer->ExecuteUpdate(&NumInserted, pError, ErrorSize))
+		{
+			return true;
+		}
+		if(NumInserted == 1)
+		{
+			if(w == Write::NORMAL)
+			{
+				pResult->m_aBroadcast[0] = '\0';
+				if(str_comp(pData->m_aServer, g_Config.m_SvSqlServerName) == 0)
+				{
+					str_format(pResult->m_aMessage, sizeof(pResult->m_aMessage),
+						"Team successfully saved by %s. Use '/load %s' to continue",
+						pData->m_aClientName, aCode);
+				}
+				else
+				{
+					str_format(pResult->m_aMessage, sizeof(pResult->m_aMessage),
+						"Team successfully saved by %s. Use '/load %s' on %s to continue",
+						pData->m_aClientName, aCode, pData->m_aServer);
+				}
+			}
+			else
+			{
+				str_copy(pResult->m_aBroadcast,
+					"Database connection failed, teamsave written to a file instead. Admins will add it manually in a few days.",
+					sizeof(pResult->m_aBroadcast));
+				if(str_comp(pData->m_aServer, g_Config.m_SvSqlServerName) == 0)
+				{
+					str_format(pResult->m_aMessage, sizeof(pResult->m_aMessage),
+						"Team successfully saved by %s. The database connection failed, using generated save code instead to avoid collisions. Use '/load %s' to continue",
+						pData->m_aClientName, aCode);
+				}
+				else
+				{
+					str_format(pResult->m_aMessage, sizeof(pResult->m_aMessage),
+						"Team successfully saved by %s. The database connection failed, using generated save code instead to avoid collisions. Use '/load %s' on %s to continue",
+						pData->m_aClientName, aCode, pData->m_aServer);
+				}
+			}
+
+			pResult->m_Status = CScoreSaveResult::SAVE_SUCCESS;
+		}
+		else if(!UseGeneratedCode)
+		{
+			UseGeneratedCode = true;
+			Retry = true;
+		}
+	} while(Retry);
+
+	if(pResult->m_Status != CScoreSaveResult::SAVE_SUCCESS)
+	{
+		dbg_msg("sql", "ERROR: This save-code already exists");
+		pResult->m_Status = CScoreSaveResult::SAVE_FAILED;
+		str_copy(pResult->m_aMessage, "This save-code already exists", sizeof(pResult->m_aMessage));
+	}
+	return false;
+}
+
+bool CScoreWorker::LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize)
+{
+	if(w == Write::NORMAL_SUCCEEDED || w == Write::BACKUP_FIRST)
+		return false;
+	const auto *pData = dynamic_cast<const CSqlTeamLoad *>(pGameData);
+	auto *pResult = dynamic_cast<CScoreSaveResult *>(pGameData->m_pResult.get());
+	pResult->m_Status = CScoreSaveResult::LOAD_FAILED;
+
+	char aCurrentTimestamp[512];
+	pSqlServer->ToUnixTimestamp("CURRENT_TIMESTAMP", aCurrentTimestamp, sizeof(aCurrentTimestamp));
+	char aTimestamp[512];
+	pSqlServer->ToUnixTimestamp("Timestamp", aTimestamp, sizeof(aTimestamp));
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT Savegame, %s-%s AS Ago, SaveID "
+		"FROM %s_saves "
+		"where Code = ? AND Map = ? AND DDNet7 = %s",
+		aCurrentTimestamp, aTimestamp,
+		pSqlServer->GetPrefix(), pSqlServer->False());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aCode);
+	pSqlServer->BindString(2, pData->m_aMap);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(End)
+	{
+		str_copy(pResult->m_aMessage, "No such savegame for this map", sizeof(pResult->m_aMessage));
+		return false;
+	}
+
+	pResult->m_SaveID = UUID_NO_SAVE_ID;
+	if(!pSqlServer->IsNull(3))
+	{
+		char aSaveID[UUID_MAXSTRSIZE];
+		pSqlServer->GetString(3, aSaveID, sizeof(aSaveID));
+		if(ParseUuid(&pResult->m_SaveID, aSaveID) || pResult->m_SaveID == UUID_NO_SAVE_ID)
+		{
+			str_copy(pResult->m_aMessage, "Unable to load savegame: SaveID corrupted", sizeof(pResult->m_aMessage));
+			return false;
+		}
+	}
+
+	char aSaveString[65536];
+	pSqlServer->GetString(1, aSaveString, sizeof(aSaveString));
+	int Num = pResult->m_SavedTeam.FromString(aSaveString);
+
+	if(Num != 0)
+	{
+		str_copy(pResult->m_aMessage, "Unable to load savegame: data corrupted", sizeof(pResult->m_aMessage));
+		return false;
+	}
+
+	bool Found = false;
+	for(int i = 0; i < pResult->m_SavedTeam.GetMembersCount(); i++)
+	{
+		if(str_comp(pResult->m_SavedTeam.m_pSavedTees[i].GetName(), pData->m_aRequestingPlayer) == 0)
+		{
+			Found = true;
+			break;
+		}
+	}
+	if(!Found)
+	{
+		str_copy(pResult->m_aMessage, "This save exists, but you are not part of it. "
+					      "Make sure you use the same name as you had when saving. "
+					      "If you saved with an already used code, you get a new random save code, "
+					      "check ddnet-saves.txt in config_directory.",
+			sizeof(pResult->m_aMessage));
+		return false;
+	}
+
+	int Since = pSqlServer->GetInt(2);
+	if(Since < g_Config.m_SvSaveSwapGamesDelay)
+	{
+		str_format(pResult->m_aMessage, sizeof(pResult->m_aMessage),
+			"You have to wait %d seconds until you can load this savegame",
+			g_Config.m_SvSaveSwapGamesDelay - Since);
+		return false;
+	}
+
+	bool CanLoad = pResult->m_SavedTeam.MatchPlayers(
+		pData->m_aClientNames, pData->m_aClientID, pData->m_NumPlayer,
+		pResult->m_aMessage, sizeof(pResult->m_aMessage));
+
+	if(!CanLoad)
+		return false;
+
+	str_format(aBuf, sizeof(aBuf),
+		"DELETE FROM %s_saves "
+		"WHERE Code = ? AND Map = ? AND SaveID %s",
+		pSqlServer->GetPrefix(),
+		pResult->m_SaveID != UUID_NO_SAVE_ID ? "= ?" : "IS NULL");
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aCode);
+	pSqlServer->BindString(2, pData->m_aMap);
+	char aUuid[UUID_MAXSTRSIZE];
+	if(pResult->m_SaveID != UUID_NO_SAVE_ID)
+	{
+		FormatUuid(pResult->m_SaveID, aUuid, sizeof(aUuid));
+		pSqlServer->BindString(3, aUuid);
+	}
+	pSqlServer->Print();
+	int NumDeleted;
+	if(pSqlServer->ExecuteUpdate(&NumDeleted, pError, ErrorSize))
+	{
+		return true;
+	}
+
+	if(NumDeleted != 1)
+	{
+		str_copy(pResult->m_aMessage, "Unable to load savegame: loaded on a different server", sizeof(pResult->m_aMessage));
+		return false;
+	}
+
+	pResult->m_Status = CScoreSaveResult::LOAD_SUCCESS;
+	str_copy(pResult->m_aMessage, "Loading successfully done", sizeof(pResult->m_aMessage));
+	return false;
+}
+
+bool CScoreWorker::GetSaves(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize)
+{
+	const auto *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
+	auto *pResult = dynamic_cast<CScorePlayerResult *>(pGameData->m_pResult.get());
+	auto *paMessages = pResult->m_Data.m_aaMessages;
+
+	char aSaveLike[128] = "";
+	str_append(aSaveLike, "%\n");
+	sqlstr::EscapeLike(aSaveLike + str_length(aSaveLike),
+		pData->m_aRequestingPlayer,
+		sizeof(aSaveLike) - str_length(aSaveLike));
+	str_append(aSaveLike, "\t%");
+
+	char aCurrentTimestamp[512];
+	pSqlServer->ToUnixTimestamp("CURRENT_TIMESTAMP", aCurrentTimestamp, sizeof(aCurrentTimestamp));
+	char aMaxTimestamp[512];
+	pSqlServer->ToUnixTimestamp("MAX(Timestamp)", aMaxTimestamp, sizeof(aMaxTimestamp));
+
+	char aBuf[512];
+	str_format(aBuf, sizeof(aBuf),
+		"SELECT COUNT(*) AS NumSaves, %s-%s AS Ago "
+		"FROM %s_saves "
+		"WHERE Map = ? AND Savegame LIKE ?",
+		aCurrentTimestamp, aMaxTimestamp,
+		pSqlServer->GetPrefix());
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
+	{
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, aSaveLike);
+
+	bool End;
+	if(pSqlServer->Step(&End, pError, ErrorSize))
+	{
+		return true;
+	}
+	if(!End)
+	{
+		int NumSaves = pSqlServer->GetInt(1);
+		char aLastSavedString[60] = "\0";
+		if(!pSqlServer->IsNull(2))
+		{
+			int Ago = pSqlServer->GetInt(2);
+			char aAgoString[40] = "\0";
+			sqlstr::AgoTimeToString(Ago, aAgoString, sizeof(aAgoString));
+			str_format(aLastSavedString, sizeof(aLastSavedString), ", last saved %s ago", aAgoString);
+		}
+
+		str_format(paMessages[0], sizeof(paMessages[0]),
+			"%s has %d save%s on %s%s",
+			pData->m_aRequestingPlayer,
+			NumSaves, NumSaves == 1 ? "" : "s",
+			pData->m_aMap, aLastSavedString);
+	}
+	return false;
+}
diff --git a/src_bkp/game/server/scoreworker.h b/src_bkp/game/server/scoreworker.h
new file mode 100644
index 0000000000..411c25044c
--- /dev/null
+++ b/src_bkp/game/server/scoreworker.h
@@ -0,0 +1,305 @@
+#ifndef GAME_SERVER_SCOREWORKER_H
+#define GAME_SERVER_SCOREWORKER_H
+
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <engine/map.h>
+#include <engine/server/databases/connection_pool.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/uuid_manager.h>
+#include <game/server/save.h>
+#include <game/voting.h>
+
+class IDbConnection;
+class IGameController;
+
+enum
+{
+	NUM_CHECKPOINTS = MAX_CHECKPOINTS,
+	TIMESTAMP_STR_LENGTH = 20, // 2019-04-02 19:38:36
+};
+
+struct CScorePlayerResult : ISqlResult
+{
+	CScorePlayerResult();
+
+	enum
+	{
+		MAX_MESSAGES = 10,
+	};
+
+	enum Variant
+	{
+		DIRECT,
+		ALL,
+		BROADCAST,
+		MAP_VOTE,
+		PLAYER_INFO,
+	} m_MessageKind;
+	union
+	{
+		char m_aaMessages[MAX_MESSAGES][512];
+		char m_aBroadcast[1024];
+		struct
+		{
+			std::optional<float> m_Time;
+			float m_aTimeCp[NUM_CHECKPOINTS];
+			int m_Birthday; // 0 indicates no birthday
+		} m_Info = {};
+		struct
+		{
+			char m_aReason[VOTE_REASON_LENGTH];
+			char m_aServer[32 + 1];
+			char m_aMap[MAX_MAP_LENGTH + 1];
+		} m_MapVote;
+	} m_Data = {}; // PLAYER_INFO
+
+	void SetVariant(Variant v);
+};
+
+struct CScoreLoadBestTimeResult : ISqlResult
+{
+	CScoreLoadBestTimeResult() :
+		m_CurrentRecord(0)
+	{
+	}
+	float m_CurrentRecord;
+};
+
+struct CSqlLoadBestTimeData : ISqlData
+{
+	CSqlLoadBestTimeData(std::shared_ptr<CScoreLoadBestTimeResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+
+	// current map
+	char m_aMap[MAX_MAP_LENGTH];
+};
+
+struct CSqlPlayerRequest : ISqlData
+{
+	CSqlPlayerRequest(std::shared_ptr<CScorePlayerResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+
+	// object being requested, either map (128 bytes) or player (16 bytes)
+	char m_aName[MAX_MAP_LENGTH];
+	// current map
+	char m_aMap[MAX_MAP_LENGTH];
+	char m_aRequestingPlayer[MAX_NAME_LENGTH];
+	// relevant for /top5 kind of requests
+	int m_Offset;
+	char m_aServer[5];
+};
+
+struct CScoreRandomMapResult : ISqlResult
+{
+	CScoreRandomMapResult(int ClientID) :
+		m_ClientID(ClientID)
+	{
+		m_aMap[0] = '\0';
+		m_aMessage[0] = '\0';
+	}
+	int m_ClientID;
+	char m_aMap[MAX_MAP_LENGTH];
+	char m_aMessage[512];
+};
+
+struct CSqlRandomMapRequest : ISqlData
+{
+	CSqlRandomMapRequest(std::shared_ptr<CScoreRandomMapResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+
+	char m_aServerType[32];
+	char m_aCurrentMap[MAX_MAP_LENGTH];
+	char m_aRequestingPlayer[MAX_NAME_LENGTH];
+	int m_Stars;
+};
+
+struct CSqlScoreData : ISqlData
+{
+	CSqlScoreData(std::shared_ptr<CScorePlayerResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+
+	virtual ~CSqlScoreData(){};
+
+	char m_aMap[MAX_MAP_LENGTH];
+	char m_aGameUuid[UUID_MAXSTRSIZE];
+	char m_aName[MAX_MAP_LENGTH];
+
+	int m_ClientID;
+	float m_Time;
+	char m_aTimestamp[TIMESTAMP_STR_LENGTH];
+	float m_aCurrentTimeCp[NUM_CHECKPOINTS];
+	int m_Num;
+	bool m_Search;
+	char m_aRequestingPlayer[MAX_NAME_LENGTH];
+};
+
+struct CScoreSaveResult : ISqlResult
+{
+	CScoreSaveResult(int PlayerID) :
+		m_Status(SAVE_FAILED),
+		m_RequestingPlayer(PlayerID)
+	{
+		m_aMessage[0] = '\0';
+		m_aBroadcast[0] = '\0';
+	}
+	enum
+	{
+		SAVE_SUCCESS,
+		// load team in the following two cases
+		SAVE_FAILED,
+		LOAD_SUCCESS,
+		LOAD_FAILED,
+	} m_Status;
+	char m_aMessage[512];
+	char m_aBroadcast[512];
+	CSaveTeam m_SavedTeam;
+	int m_RequestingPlayer;
+	CUuid m_SaveID;
+};
+
+struct CSqlTeamScoreData : ISqlData
+{
+	CSqlTeamScoreData() :
+		ISqlData(nullptr)
+	{
+	}
+
+	char m_aGameUuid[UUID_MAXSTRSIZE];
+	char m_aMap[MAX_MAP_LENGTH];
+	float m_Time;
+	char m_aTimestamp[TIMESTAMP_STR_LENGTH];
+	unsigned int m_Size;
+	char m_aaNames[MAX_CLIENTS][MAX_NAME_LENGTH];
+	CUuid m_TeamrankUuid;
+};
+
+struct CSqlTeamSave : ISqlData
+{
+	CSqlTeamSave(std::shared_ptr<CScoreSaveResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+	virtual ~CSqlTeamSave(){};
+
+	char m_aClientName[MAX_NAME_LENGTH];
+	char m_aMap[MAX_MAP_LENGTH];
+	char m_aCode[128];
+	char m_aGeneratedCode[128];
+	char m_aServer[5];
+};
+
+struct CSqlTeamLoad : ISqlData
+{
+	CSqlTeamLoad(std::shared_ptr<CScoreSaveResult> pResult) :
+		ISqlData(std::move(pResult))
+	{
+	}
+	virtual ~CSqlTeamLoad(){};
+
+	char m_aCode[128];
+	char m_aMap[MAX_MAP_LENGTH];
+	char m_aRequestingPlayer[MAX_NAME_LENGTH];
+	int m_ClientID;
+	// struct holding all player names in the team or an empty string
+	char m_aClientNames[MAX_CLIENTS][MAX_NAME_LENGTH];
+	int m_aClientID[MAX_CLIENTS];
+	int m_NumPlayer;
+};
+
+class CPlayerData
+{
+public:
+	CPlayerData()
+	{
+		Reset();
+	}
+	~CPlayerData() {}
+
+	void Reset()
+	{
+		m_BestTime = 0;
+		for(float &BestTimeCp : m_aBestTimeCp)
+			BestTimeCp = 0;
+
+		m_RecordStopTick = -1;
+	}
+
+	void Set(float Time, const float aTimeCp[NUM_CHECKPOINTS])
+	{
+		m_BestTime = Time;
+		for(int i = 0; i < NUM_CHECKPOINTS; i++)
+			m_aBestTimeCp[i] = aTimeCp[i];
+	}
+
+	float m_BestTime;
+	float m_aBestTimeCp[NUM_CHECKPOINTS];
+
+	int m_RecordStopTick;
+	float m_RecordFinishTime;
+};
+
+struct CTeamrank
+{
+	CUuid m_TeamID;
+	char m_aaNames[MAX_CLIENTS][MAX_NAME_LENGTH];
+	unsigned int m_NumNames;
+	CTeamrank();
+
+	// Assumes that a database query equivalent to
+	//
+	//     SELECT TeamID, Name [, ...] -- the order is important
+	//     FROM record_teamrace
+	//     ORDER BY TeamID, Name
+	//
+	// was executed and that the result line of the first team member is already selected.
+	// Afterwards the team member of the next team is selected.
+	//
+	// Returns true on SQL failure
+	//
+	// if another team can be extracted
+	bool NextSqlResult(IDbConnection *pSqlServer, bool *pEnd, char *pError, int ErrorSize);
+
+	bool SamePlayers(const std::vector<std::string> *pvSortedNames);
+};
+
+struct CScoreWorker
+{
+	static bool LoadBestTime(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+
+	static bool RandomMap(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool RandomUnfinishedMap(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool MapVote(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+
+	static bool LoadPlayerData(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool MapInfo(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowTeamRank(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowPlayerTeamTop5(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowTimes(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowPoints(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool ShowTopPoints(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+	static bool GetSaves(IDbConnection *pSqlServer, const ISqlData *pGameData, char *pError, int ErrorSize);
+
+	static bool SaveTeam(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize);
+	static bool LoadTeam(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize);
+
+	static bool SaveScore(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize);
+	static bool SaveTeamScore(IDbConnection *pSqlServer, const ISqlData *pGameData, Write w, char *pError, int ErrorSize);
+};
+
+#endif // GAME_SERVER_SCOREWORKER_H
diff --git a/src_bkp/game/server/teams.cpp b/src_bkp/game/server/teams.cpp
new file mode 100644
index 0000000000..aa0cd418ac
--- /dev/null
+++ b/src_bkp/game/server/teams.cpp
@@ -0,0 +1,1190 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "teams.h"
+#include "entities/character.h"
+#include "gamecontroller.h"
+#include "player.h"
+#include "score.h"
+#include "teehistorian.h"
+#include <base/system.h>
+
+#include <engine/shared/config.h>
+
+#include <game/mapitems.h>
+
+CGameTeams::CGameTeams(CGameContext *pGameContext) :
+	m_pGameContext(pGameContext)
+{
+	Reset();
+}
+
+void CGameTeams::Reset()
+{
+	m_Core.Reset();
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		m_aTeeStarted[i] = false;
+		m_aTeeFinished[i] = false;
+		m_aLastChat[i] = 0;
+		SendTeamsState(i);
+	}
+
+	for(int i = 0; i < NUM_TEAMS; ++i)
+	{
+		m_aTeamState[i] = TEAMSTATE_EMPTY;
+		m_aTeamLocked[i] = false;
+		m_apSaveTeamResult[i] = nullptr;
+		m_aTeamSentStartWarning[i] = false;
+		ResetRoundState(i);
+	}
+}
+
+void CGameTeams::ResetRoundState(int Team)
+{
+	ResetInvited(Team);
+	if(Team != TEAM_SUPER)
+		ResetSwitchers(Team);
+
+	m_aPractice[Team] = false;
+	m_aTeamUnfinishableKillTick[Team] = -1;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
+		{
+			GameServer()->m_apPlayers[i]->m_VotedForPractice = false;
+			GameServer()->m_apPlayers[i]->m_SwapTargetsClientID = -1;
+			m_aLastSwap[i] = 0;
+		}
+	}
+}
+
+void CGameTeams::ResetSwitchers(int Team)
+{
+	for(auto &Switcher : GameServer()->Switchers())
+	{
+		Switcher.m_aStatus[Team] = Switcher.m_Initial;
+		Switcher.m_aEndTick[Team] = 0;
+		Switcher.m_aType[Team] = TILE_SWITCHOPEN;
+	}
+}
+
+void CGameTeams::OnCharacterStart(int ClientID)
+{
+	int Tick = Server()->Tick();
+	CCharacter *pStartingChar = Character(ClientID);
+	if(!pStartingChar)
+		return;
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && pStartingChar->m_DDRaceState == DDRACE_STARTED)
+		return;
+	if((g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO || m_Core.Team(ClientID) != TEAM_FLOCK) && pStartingChar->m_DDRaceState == DDRACE_FINISHED)
+		return;
+	if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO &&
+		(m_Core.Team(ClientID) == TEAM_FLOCK || m_Core.Team(ClientID) == TEAM_SUPER))
+	{
+		m_aTeeStarted[ClientID] = true;
+		pStartingChar->m_DDRaceState = DDRACE_STARTED;
+		pStartingChar->m_StartTime = Tick;
+		return;
+	}
+	bool Waiting = false;
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(m_Core.Team(ClientID) != m_Core.Team(i))
+			continue;
+		CPlayer *pPlayer = GetPlayer(i);
+		if(!pPlayer || !pPlayer->IsPlaying())
+			continue;
+		if(GetDDRaceState(pPlayer) != DDRACE_FINISHED)
+			continue;
+
+		Waiting = true;
+		pStartingChar->m_DDRaceState = DDRACE_NONE;
+
+		if(m_aLastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
+		{
+			char aBuf[128];
+			str_format(
+				aBuf,
+				sizeof(aBuf),
+				"%s has finished and didn't go through start yet, wait for him or join another team.",
+				Server()->ClientName(i));
+			GameServer()->SendChatTarget(ClientID, aBuf);
+			m_aLastChat[ClientID] = Tick;
+		}
+		if(m_aLastChat[i] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
+		{
+			char aBuf[128];
+			str_format(
+				aBuf,
+				sizeof(aBuf),
+				"%s wants to start a new round, kill or walk to start.",
+				Server()->ClientName(ClientID));
+			GameServer()->SendChatTarget(i, aBuf);
+			m_aLastChat[i] = Tick;
+		}
+	}
+
+	if(!Waiting)
+	{
+		m_aTeeStarted[ClientID] = true;
+	}
+
+	if(m_aTeamState[m_Core.Team(ClientID)] < TEAMSTATE_STARTED && !Waiting)
+	{
+		ChangeTeamState(m_Core.Team(ClientID), TEAMSTATE_STARTED);
+		m_aTeamSentStartWarning[m_Core.Team(ClientID)] = false;
+		m_aTeamUnfinishableKillTick[m_Core.Team(ClientID)] = -1;
+
+		int NumPlayers = Count(m_Core.Team(ClientID));
+
+		char aBuf[512];
+		str_format(
+			aBuf,
+			sizeof(aBuf),
+			"Team %d started with %d player%s: ",
+			m_Core.Team(ClientID),
+			NumPlayers,
+			NumPlayers == 1 ? "" : "s");
+
+		bool First = true;
+
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(m_Core.Team(ClientID) == m_Core.Team(i))
+			{
+				CPlayer *pPlayer = GetPlayer(i);
+				// TODO: THE PROBLEM IS THAT THERE IS NO CHARACTER SO START TIME CAN'T BE SET!
+				if(pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientID))))
+				{
+					SetDDRaceState(pPlayer, DDRACE_STARTED);
+					SetStartTime(pPlayer, Tick);
+
+					if(First)
+						First = false;
+					else
+						str_append(aBuf, ", ");
+
+					str_append(aBuf, GameServer()->Server()->ClientName(i));
+				}
+			}
+		}
+
+		if(g_Config.m_SvTeam < SV_TEAM_FORCED_SOLO && g_Config.m_SvMaxTeamSize != 2 && g_Config.m_SvPauseable)
+		{
+			for(int i = 0; i < MAX_CLIENTS; ++i)
+			{
+				CPlayer *pPlayer = GetPlayer(i);
+				if(m_Core.Team(ClientID) == m_Core.Team(i) && pPlayer && (pPlayer->IsPlaying() || TeamLocked(m_Core.Team(ClientID))))
+				{
+					GameServer()->SendChatTarget(i, aBuf);
+				}
+			}
+		}
+	}
+}
+
+void CGameTeams::OnCharacterFinish(int ClientID)
+{
+	if((m_Core.Team(ClientID) == TEAM_FLOCK && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO) || m_Core.Team(ClientID) == TEAM_SUPER)
+	{
+		CPlayer *pPlayer = GetPlayer(ClientID);
+		if(pPlayer && pPlayer->IsPlaying())
+		{
+			float Time = (float)(Server()->Tick() - GetStartTime(pPlayer)) / ((float)Server()->TickSpeed());
+			if(Time < 0.000001f)
+				return;
+			char aTimestamp[TIMESTAMP_STR_LENGTH];
+			str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE); // 2019-04-02 19:41:58
+
+			OnFinish(pPlayer, Time, aTimestamp);
+		}
+	}
+	else
+	{
+		if(m_aTeeStarted[ClientID])
+		{
+			m_aTeeFinished[ClientID] = true;
+		}
+		CheckTeamFinished(m_Core.Team(ClientID));
+	}
+}
+
+void CGameTeams::Tick()
+{
+	int Now = Server()->Tick();
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		CPlayerData *pData = GameServer()->Score()->PlayerData(i);
+		if(!Server()->IsRecording(i))
+			continue;
+
+		if(Now >= pData->m_RecordStopTick && pData->m_RecordStopTick != -1)
+		{
+			Server()->SaveDemo(i, pData->m_RecordFinishTime);
+			pData->m_RecordStopTick = -1;
+		}
+	}
+
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_aTeamUnfinishableKillTick[i] == -1 || m_aTeamState[i] != TEAMSTATE_STARTED_UNFINISHABLE)
+		{
+			continue;
+		}
+		if(Now >= m_aTeamUnfinishableKillTick[i])
+		{
+			if(m_aPractice[i])
+			{
+				m_aTeamUnfinishableKillTick[i] = -1;
+				continue;
+			}
+			GameServer()->SendChatTeam(i, "Your team was killed because it couldn't finish anymore and hasn't entered /practice mode");
+			KillTeam(i, -1);
+		}
+	}
+
+	int Frequency = Server()->TickSpeed() * 60;
+	int Remainder = Server()->TickSpeed() * 30;
+	uint64_t TeamHasWantedStartTime = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		CCharacter *pChar = GameServer()->m_apPlayers[i] ? GameServer()->m_apPlayers[i]->GetCharacter() : nullptr;
+		int Team = m_Core.Team(i);
+		if(!pChar || m_aTeamState[Team] != TEAMSTATE_STARTED || m_aTeeStarted[i] || m_aPractice[m_Core.Team(i)])
+		{
+			continue;
+		}
+		if((Now - pChar->m_StartTime) % Frequency == Remainder)
+		{
+			TeamHasWantedStartTime |= ((uint64_t)1) << m_Core.Team(i);
+		}
+	}
+	TeamHasWantedStartTime &= ~(uint64_t)1;
+	if(!TeamHasWantedStartTime)
+	{
+		return;
+	}
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(((TeamHasWantedStartTime >> i) & 1) == 0)
+		{
+			continue;
+		}
+		if(Count(i) <= 1)
+		{
+			continue;
+		}
+		int NumPlayersNotStarted = 0;
+		char aPlayerNames[256];
+		aPlayerNames[0] = 0;
+		for(int j = 0; j < MAX_CLIENTS; j++)
+		{
+			if(m_Core.Team(j) == i && !m_aTeeStarted[j])
+			{
+				if(aPlayerNames[0])
+				{
+					str_append(aPlayerNames, ", ");
+				}
+				str_append(aPlayerNames, Server()->ClientName(j));
+				NumPlayersNotStarted += 1;
+			}
+		}
+		if(!aPlayerNames[0])
+		{
+			continue;
+		}
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf),
+			"Your team has %d %s not started yet, they need "
+			"to touch the start before this team can finish: %s",
+			NumPlayersNotStarted,
+			NumPlayersNotStarted == 1 ? "player that has" : "players that have",
+			aPlayerNames);
+		GameServer()->SendChatTeam(i, aBuf);
+	}
+}
+
+void CGameTeams::CheckTeamFinished(int Team)
+{
+	if(TeamFinished(Team))
+	{
+		CPlayer *apTeamPlayers[MAX_CLIENTS];
+		unsigned int PlayersCount = 0;
+
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(Team == m_Core.Team(i))
+			{
+				CPlayer *pPlayer = GetPlayer(i);
+				if(pPlayer && pPlayer->IsPlaying())
+				{
+					m_aTeeStarted[i] = false;
+					m_aTeeFinished[i] = false;
+
+					apTeamPlayers[PlayersCount++] = pPlayer;
+				}
+			}
+		}
+
+		if(PlayersCount > 0)
+		{
+			float Time = (float)(Server()->Tick() - GetStartTime(apTeamPlayers[0])) / ((float)Server()->TickSpeed());
+			if(Time < 0.000001f)
+			{
+				return;
+			}
+
+			if(m_aPractice[Team])
+			{
+				ChangeTeamState(Team, TEAMSTATE_FINISHED);
+
+				char aBuf[256];
+				str_format(aBuf, sizeof(aBuf),
+					"Your team would've finished in: %d minute(s) %5.2f second(s). Since you had practice mode enabled your rank doesn't count.",
+					(int)Time / 60, Time - ((int)Time / 60 * 60));
+				GameServer()->SendChatTeam(Team, aBuf);
+
+				for(unsigned int i = 0; i < PlayersCount; ++i)
+				{
+					SetDDRaceState(apTeamPlayers[i], DDRACE_FINISHED);
+				}
+
+				return;
+			}
+
+			char aTimestamp[TIMESTAMP_STR_LENGTH];
+			str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE); // 2019-04-02 19:41:58
+
+			for(unsigned int i = 0; i < PlayersCount; ++i)
+				OnFinish(apTeamPlayers[i], Time, aTimestamp);
+			ChangeTeamState(Team, TEAMSTATE_FINISHED); // TODO: Make it better
+			OnTeamFinish(apTeamPlayers, PlayersCount, Time, aTimestamp);
+		}
+	}
+}
+
+const char *CGameTeams::SetCharacterTeam(int ClientID, int Team)
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+		return "Invalid client ID";
+	if(Team < 0 || Team >= MAX_CLIENTS + 1)
+		return "Invalid team number";
+	if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN)
+		return "This team started already";
+	if(m_Core.Team(ClientID) == Team)
+		return "You are in this team already";
+	if(!Character(ClientID))
+		return "Your character is not valid";
+	if(Team == TEAM_SUPER && !Character(ClientID)->IsSuper())
+		return "You can't join super team if you don't have super rights";
+	if(Team != TEAM_SUPER && Character(ClientID)->m_DDRaceState != DDRACE_NONE)
+		return "You have started racing already";
+	// No cheating through noob filter with practice and then leaving team
+	if(m_aPractice[m_Core.Team(ClientID)])
+		return "You have used practice mode already";
+
+	// you can not join a team which is currently in the process of saving,
+	// because the save-process can fail and then the team is reset into the game
+	if(Team != TEAM_SUPER && GetSaving(Team))
+		return "Your team is currently saving";
+	if(m_Core.Team(ClientID) != TEAM_SUPER && GetSaving(m_Core.Team(ClientID)))
+		return "This team is currently saving";
+
+	SetForceCharacterTeam(ClientID, Team);
+	return nullptr;
+}
+
+void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
+{
+	m_aTeeStarted[ClientID] = false;
+	m_aTeeFinished[ClientID] = false;
+	int OldTeam = m_Core.Team(ClientID);
+
+	if(Team != OldTeam && (OldTeam != TEAM_FLOCK || g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO) && OldTeam != TEAM_SUPER && m_aTeamState[OldTeam] != TEAMSTATE_EMPTY)
+	{
+		bool NoElseInOldTeam = Count(OldTeam) <= 1;
+		if(NoElseInOldTeam)
+		{
+			m_aTeamState[OldTeam] = TEAMSTATE_EMPTY;
+
+			// unlock team when last player leaves
+			SetTeamLock(OldTeam, false);
+			ResetRoundState(OldTeam);
+			// do not reset SaveTeamResult, because it should be logged into teehistorian even if the team leaves
+		}
+	}
+
+	m_Core.Team(ClientID, Team);
+
+	if(OldTeam != Team)
+	{
+		for(int LoopClientID = 0; LoopClientID < MAX_CLIENTS; ++LoopClientID)
+			if(GetPlayer(LoopClientID))
+				SendTeamsState(LoopClientID);
+
+		if(GetPlayer(ClientID))
+		{
+			GetPlayer(ClientID)->m_VotedForPractice = false;
+			GetPlayer(ClientID)->m_SwapTargetsClientID = -1;
+		}
+		m_pGameContext->m_World.RemoveEntitiesFromPlayer(ClientID);
+	}
+
+	if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || m_aTeamLocked[Team]))
+	{
+		if(!m_aTeamLocked[Team])
+			ChangeTeamState(Team, TEAMSTATE_OPEN);
+
+		ResetSwitchers(Team);
+	}
+}
+
+int CGameTeams::Count(int Team) const
+{
+	if(Team == TEAM_SUPER)
+		return -1;
+
+	int Count = 0;
+
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+		if(m_Core.Team(i) == Team)
+			Count++;
+
+	return Count;
+}
+
+void CGameTeams::ChangeTeamState(int Team, int State)
+{
+	m_aTeamState[Team] = State;
+}
+
+void CGameTeams::KillTeam(int Team, int NewStrongID, int ExceptID)
+{
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
+		{
+			GameServer()->m_apPlayers[i]->m_VotedForPractice = false;
+			if(i != ExceptID)
+			{
+				GameServer()->m_apPlayers[i]->KillCharacter(WEAPON_SELF, false);
+				if(NewStrongID != -1 && i != NewStrongID)
+				{
+					GameServer()->m_apPlayers[i]->Respawn(true); // spawn the rest of team with weak hook on the killer
+				}
+			}
+		}
+	}
+
+	// send the team kill message
+	CNetMsg_Sv_KillMsgTeam Msg;
+	Msg.m_Team = Team;
+	Msg.m_First = NewStrongID;
+	Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, -1);
+}
+
+bool CGameTeams::TeamFinished(int Team)
+{
+	if(m_aTeamState[Team] != TEAMSTATE_STARTED)
+	{
+		return false;
+	}
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+		if(m_Core.Team(i) == Team && !m_aTeeFinished[i])
+			return false;
+	return true;
+}
+
+CClientMask CGameTeams::TeamMask(int Team, int ExceptID, int Asker)
+{
+	if(Team == TEAM_SUPER)
+	{
+		if(ExceptID == -1)
+			return CClientMask().set();
+		return CClientMask().set().reset(ExceptID);
+	}
+
+	CClientMask Mask;
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(i == ExceptID)
+			continue; // Explicitly excluded
+		if(!GetPlayer(i))
+			continue; // Player doesn't exist
+
+		if(!(GetPlayer(i)->GetTeam() == TEAM_SPECTATORS || GetPlayer(i)->IsPaused()))
+		{ // Not spectator
+			if(i != Asker)
+			{ // Actions of other players
+				if(!Character(i))
+					continue; // Player is currently dead
+				if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM)
+				{
+					if(m_Core.Team(i) != Team && m_Core.Team(i) != TEAM_SUPER)
+						continue; // In different teams
+				}
+				else if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_OFF)
+				{
+					if(m_Core.GetSolo(Asker))
+						continue; // When in solo part don't show others
+					if(m_Core.GetSolo(i))
+						continue; // When in solo part don't show others
+					if(m_Core.Team(i) != Team && m_Core.Team(i) != TEAM_SUPER)
+						continue; // In different teams
+				}
+			} // See everything of yourself
+		}
+		else if(GetPlayer(i)->m_SpectatorID != SPEC_FREEVIEW)
+		{ // Spectating specific player
+			if(GetPlayer(i)->m_SpectatorID != Asker)
+			{ // Actions of other players
+				if(!Character(GetPlayer(i)->m_SpectatorID))
+					continue; // Player is currently dead
+				if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_ONLY_TEAM)
+				{
+					if(m_Core.Team(GetPlayer(i)->m_SpectatorID) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorID) != TEAM_SUPER)
+						continue; // In different teams
+				}
+				else if(GetPlayer(i)->m_ShowOthers == SHOW_OTHERS_OFF)
+				{
+					if(m_Core.GetSolo(Asker))
+						continue; // When in solo part don't show others
+					if(m_Core.GetSolo(GetPlayer(i)->m_SpectatorID))
+						continue; // When in solo part don't show others
+					if(m_Core.Team(GetPlayer(i)->m_SpectatorID) != Team && m_Core.Team(GetPlayer(i)->m_SpectatorID) != TEAM_SUPER)
+						continue; // In different teams
+				}
+			} // See everything of player you're spectating
+		}
+		else
+		{ // Freeview
+			if(GetPlayer(i)->m_SpecTeam)
+			{ // Show only players in own team when spectating
+				if(m_Core.Team(i) != Team && m_Core.Team(i) != TEAM_SUPER)
+					continue; // in different teams
+			}
+		}
+
+		Mask.set(i);
+	}
+	return Mask;
+}
+
+void CGameTeams::SendTeamsState(int ClientID)
+{
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+		return;
+
+	if(!m_pGameContext->m_apPlayers[ClientID])
+		return;
+
+	CMsgPacker Msg(NETMSGTYPE_SV_TEAMSSTATE);
+	CMsgPacker MsgLegacy(NETMSGTYPE_SV_TEAMSSTATELEGACY);
+
+	for(unsigned i = 0; i < MAX_CLIENTS; i++)
+	{
+		Msg.AddInt(m_Core.Team(i));
+		MsgLegacy.AddInt(m_Core.Team(i));
+	}
+
+	Server()->SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
+	int ClientVersion = m_pGameContext->m_apPlayers[ClientID]->GetClientVersion();
+	if(!Server()->IsSixup(ClientID) && VERSION_DDRACE < ClientVersion && ClientVersion < VERSION_DDNET_MSG_LEGACY)
+	{
+		Server()->SendMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+	}
+}
+
+int CGameTeams::GetDDRaceState(CPlayer *Player)
+{
+	if(!Player)
+		return DDRACE_NONE;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		return pChar->m_DDRaceState;
+	return DDRACE_NONE;
+}
+
+void CGameTeams::SetDDRaceState(CPlayer *Player, int DDRaceState)
+{
+	if(!Player)
+		return;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		pChar->m_DDRaceState = DDRaceState;
+}
+
+int CGameTeams::GetStartTime(CPlayer *Player)
+{
+	if(!Player)
+		return 0;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		return pChar->m_StartTime;
+	return 0;
+}
+
+void CGameTeams::SetStartTime(CPlayer *Player, int StartTime)
+{
+	if(!Player)
+		return;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		pChar->m_StartTime = StartTime;
+}
+
+void CGameTeams::SetLastTimeCp(CPlayer *Player, int LastTimeCp)
+{
+	if(!Player)
+		return;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		pChar->m_LastTimeCp = LastTimeCp;
+}
+
+float *CGameTeams::GetCurrentTimeCp(CPlayer *Player)
+{
+	if(!Player)
+		return NULL;
+
+	CCharacter *pChar = Player->GetCharacter();
+	if(pChar)
+		return pChar->m_aCurrentTimeCp;
+	return NULL;
+}
+
+void CGameTeams::OnTeamFinish(CPlayer **Players, unsigned int Size, float Time, const char *pTimestamp)
+{
+	int aPlayerCIDs[MAX_CLIENTS];
+
+	for(unsigned int i = 0; i < Size; i++)
+	{
+		aPlayerCIDs[i] = Players[i]->GetCID();
+
+		if(g_Config.m_SvRejoinTeam0 && g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && (m_Core.Team(Players[i]->GetCID()) >= TEAM_SUPER || !m_aTeamLocked[m_Core.Team(Players[i]->GetCID())]))
+		{
+			SetForceCharacterTeam(Players[i]->GetCID(), TEAM_FLOCK);
+			char aBuf[512];
+			str_format(aBuf, sizeof(aBuf), "'%s' joined team 0",
+				GameServer()->Server()->ClientName(Players[i]->GetCID()));
+			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf);
+		}
+	}
+
+	if(Size >= (unsigned int)g_Config.m_SvMinTeamSize)
+		GameServer()->Score()->SaveTeamScore(aPlayerCIDs, Size, Time, pTimestamp);
+}
+
+void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
+{
+	if(!Player || !Player->IsPlaying())
+		return;
+	// TODO:DDRace:btd: this ugly
+	const int ClientID = Player->GetCID();
+	CPlayerData *pData = GameServer()->Score()->PlayerData(ClientID);
+
+	char aBuf[128];
+	SetLastTimeCp(Player, -1);
+	// Note that the "finished in" message is parsed by the client
+	str_format(aBuf, sizeof(aBuf),
+		"%s finished in: %d minute(s) %5.2f second(s)",
+		Server()->ClientName(ClientID), (int)Time / 60,
+		Time - ((int)Time / 60 * 60));
+	if(g_Config.m_SvHideScore || !g_Config.m_SvSaveWorseScores)
+		GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX);
+	else
+		GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1., CGameContext::CHAT_SIX);
+
+	float Diff = absolute(Time - pData->m_BestTime);
+
+	if(Time - pData->m_BestTime < 0)
+	{
+		// new record \o/
+		pData->m_RecordStopTick = Server()->Tick() + Server()->TickSpeed();
+		pData->m_RecordFinishTime = Time;
+
+		if(Diff >= 60)
+			str_format(aBuf, sizeof(aBuf), "New record: %d minute(s) %5.2f second(s) better.",
+				(int)Diff / 60, Diff - ((int)Diff / 60 * 60));
+		else
+			str_format(aBuf, sizeof(aBuf), "New record: %5.2f second(s) better.",
+				Diff);
+		if(g_Config.m_SvHideScore || !g_Config.m_SvSaveWorseScores)
+			GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX);
+		else
+			GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CGameContext::CHAT_SIX);
+	}
+	else if(pData->m_BestTime != 0) // tee has already finished?
+	{
+		Server()->StopRecord(ClientID);
+
+		if(Diff <= 0.005f)
+		{
+			GameServer()->SendChatTarget(ClientID,
+				"You finished with your best time.");
+		}
+		else
+		{
+			if(Diff >= 60)
+				str_format(aBuf, sizeof(aBuf), "%d minute(s) %5.2f second(s) worse, better luck next time.",
+					(int)Diff / 60, Diff - ((int)Diff / 60 * 60));
+			else
+				str_format(aBuf, sizeof(aBuf),
+					"%5.2f second(s) worse, better luck next time.",
+					Diff);
+			GameServer()->SendChatTarget(ClientID, aBuf, CGameContext::CHAT_SIX); // this is private, sent only to the tee
+		}
+	}
+	else
+	{
+		pData->m_RecordStopTick = Server()->Tick() + Server()->TickSpeed();
+		pData->m_RecordFinishTime = Time;
+	}
+
+	if(!Server()->IsSixup(ClientID))
+	{
+		CNetMsg_Sv_DDRaceTime Msg;
+		CNetMsg_Sv_DDRaceTimeLegacy MsgLegacy;
+		MsgLegacy.m_Time = Msg.m_Time = (int)(Time * 100.0f);
+		MsgLegacy.m_Check = Msg.m_Check = 0;
+		MsgLegacy.m_Finish = Msg.m_Finish = 1;
+
+		if(pData->m_BestTime)
+		{
+			float Diff100 = (Time - pData->m_BestTime) * 100;
+			MsgLegacy.m_Check = Msg.m_Check = (int)Diff100;
+		}
+		if(VERSION_DDRACE <= Player->GetClientVersion())
+		{
+			if(Player->GetClientVersion() < VERSION_DDNET_MSG_LEGACY)
+			{
+				Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, ClientID);
+			}
+			else
+			{
+				Server()->SendPackMsg(&MsgLegacy, MSGFLAG_VITAL, ClientID);
+			}
+		}
+
+		CNetMsg_Sv_RaceFinish RaceFinishMsg;
+		RaceFinishMsg.m_ClientID = ClientID;
+		RaceFinishMsg.m_Time = Time * 1000;
+		RaceFinishMsg.m_Diff = 0;
+		if(pData->m_BestTime)
+		{
+			RaceFinishMsg.m_Diff = Diff * 1000 * (Time < pData->m_BestTime ? -1 : 1);
+		}
+		RaceFinishMsg.m_RecordPersonal = (Time < pData->m_BestTime || !pData->m_BestTime);
+		RaceFinishMsg.m_RecordServer = Time < GameServer()->m_pController->m_CurrentRecord;
+		Server()->SendPackMsg(&RaceFinishMsg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+	}
+	else
+	{
+		protocol7::CNetMsg_Sv_RaceFinish Msg;
+		Msg.m_ClientID = ClientID;
+		Msg.m_Time = Time * 1000;
+		Msg.m_Diff = 0;
+		if(pData->m_BestTime)
+		{
+			Msg.m_Diff = Diff * 1000 * (Time < pData->m_BestTime ? -1 : 1);
+		}
+		Msg.m_RecordPersonal = (Time < pData->m_BestTime || !pData->m_BestTime);
+		Msg.m_RecordServer = Time < GameServer()->m_pController->m_CurrentRecord;
+		Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_NORECORD, -1);
+	}
+
+	bool CallSaveScore = g_Config.m_SvSaveWorseScores;
+	bool NeedToSendNewPersonalRecord = false;
+	if(!pData->m_BestTime || Time < pData->m_BestTime)
+	{
+		// update the score
+		pData->Set(Time, GetCurrentTimeCp(Player));
+		CallSaveScore = true;
+		NeedToSendNewPersonalRecord = true;
+	}
+
+	if(CallSaveScore)
+		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientID), "nameless tee"))
+			GameServer()->Score()->SaveScore(ClientID, Time, pTimestamp,
+				GetCurrentTimeCp(Player), Player->m_NotEligibleForFinish);
+
+	bool NeedToSendNewServerRecord = false;
+	// update server best time
+	if(GameServer()->m_pController->m_CurrentRecord == 0)
+	{
+		GameServer()->Score()->LoadBestTime();
+	}
+	else if(Time < GameServer()->m_pController->m_CurrentRecord)
+	{
+		// check for nameless
+		if(g_Config.m_SvNamelessScore || !str_startswith(Server()->ClientName(ClientID), "nameless tee"))
+		{
+			GameServer()->m_pController->m_CurrentRecord = Time;
+			NeedToSendNewServerRecord = true;
+		}
+	}
+
+	SetDDRaceState(Player, DDRACE_FINISHED);
+	if(NeedToSendNewServerRecord)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetClientVersion() >= VERSION_DDRACE)
+			{
+				GameServer()->SendRecord(i);
+			}
+		}
+	}
+	if(!NeedToSendNewServerRecord && NeedToSendNewPersonalRecord && Player->GetClientVersion() >= VERSION_DDRACE)
+	{
+		GameServer()->SendRecord(ClientID);
+	}
+
+	int TTime = (int)Time;
+	if(!Player->m_Score.has_value() || TTime < Player->m_Score.value())
+	{
+		Player->m_Score = TTime;
+	}
+}
+
+void CGameTeams::RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team)
+{
+	if(!pPlayer || !pTargetPlayer)
+		return;
+
+	char aBuf[512];
+	if(pPlayer->m_SwapTargetsClientID == pTargetPlayer->GetCID())
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"You have already requested to swap with %s.", Server()->ClientName(pTargetPlayer->GetCID()));
+
+		GameServer()->SendChatTarget(pPlayer->GetCID(), aBuf);
+		return;
+	}
+
+	// Notification for the swap initiator
+	str_format(aBuf, sizeof(aBuf),
+		"You have requested to swap with %s.",
+		Server()->ClientName(pTargetPlayer->GetCID()));
+	GameServer()->SendChatTarget(pPlayer->GetCID(), aBuf);
+
+	// Notification to the target swap player
+	str_format(aBuf, sizeof(aBuf),
+		"%s has requested to swap with you. To complete the swap process please wait %d seconds and then type /swap %s.",
+		Server()->ClientName(pPlayer->GetCID()), g_Config.m_SvSaveSwapGamesDelay, Server()->ClientName(pPlayer->GetCID()));
+	GameServer()->SendChatTarget(pTargetPlayer->GetCID(), aBuf);
+
+	// Notification for the remaining team
+	str_format(aBuf, sizeof(aBuf),
+		"%s has requested to swap with %s.",
+		Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
+	// Do not send the team notification for team 0
+	if(Team != 0)
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_Core.Team(i) == Team && i != pTargetPlayer->GetCID() && i != pPlayer->GetCID())
+			{
+				GameServer()->SendChatTarget(i, aBuf);
+			}
+		}
+	}
+
+	pPlayer->m_SwapTargetsClientID = pTargetPlayer->GetCID();
+	m_aLastSwap[pPlayer->GetCID()] = Server()->Tick();
+}
+
+void CGameTeams::SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPlayer, int Team)
+{
+	if(!pPrimaryPlayer || !pTargetPlayer)
+		return;
+
+	char aBuf[128];
+
+	int Since = (Server()->Tick() - m_aLastSwap[pTargetPlayer->GetCID()]) / Server()->TickSpeed();
+	if(Since < g_Config.m_SvSaveSwapGamesDelay)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"You have to wait %d seconds until you can swap.",
+			g_Config.m_SvSaveSwapGamesDelay - Since);
+
+		GameServer()->SendChatTarget(pPrimaryPlayer->GetCID(), aBuf);
+
+		return;
+	}
+
+	pPrimaryPlayer->m_SwapTargetsClientID = -1;
+	pTargetPlayer->m_SwapTargetsClientID = -1;
+
+	int TimeoutAfterDelay = g_Config.m_SvSaveSwapGamesDelay + g_Config.m_SvSwapTimeout;
+	if(Since >= TimeoutAfterDelay)
+	{
+		str_format(aBuf, sizeof(aBuf),
+			"Your swap request timed out %d seconds ago. Use /swap again to re-initiate it.",
+			Since - g_Config.m_SvSwapTimeout);
+
+		GameServer()->SendChatTarget(pPrimaryPlayer->GetCID(), aBuf);
+
+		return;
+	}
+
+	CSaveTee PrimarySavedTee;
+	PrimarySavedTee.Save(pPrimaryPlayer->GetCharacter());
+
+	CSaveTee SecondarySavedTee;
+	SecondarySavedTee.Save(pTargetPlayer->GetCharacter());
+
+	PrimarySavedTee.Load(pTargetPlayer->GetCharacter(), Team, true);
+	SecondarySavedTee.Load(pPrimaryPlayer->GetCharacter(), Team, true);
+
+	if(Team >= 1)
+	{
+		for(const auto &pPlayer : GameServer()->m_apPlayers)
+		{
+			CCharacter *pChar = pPlayer ? pPlayer->GetCharacter() : nullptr;
+			if(pChar && pChar->Team() == Team && pChar != pPrimaryPlayer->GetCharacter() && pChar != pTargetPlayer->GetCharacter())
+				pChar->m_StartTime = pPrimaryPlayer->GetCharacter()->m_StartTime;
+		}
+	}
+	std::swap(m_aTeeStarted[pPrimaryPlayer->GetCID()], m_aTeeStarted[pTargetPlayer->GetCID()]);
+	std::swap(m_aTeeFinished[pPrimaryPlayer->GetCID()], m_aTeeFinished[pTargetPlayer->GetCID()]);
+	std::swap(pPrimaryPlayer->GetCharacter()->GetRescueTeeRef(), pTargetPlayer->GetCharacter()->GetRescueTeeRef());
+
+	GameServer()->m_World.SwapClients(pPrimaryPlayer->GetCID(), pTargetPlayer->GetCID());
+
+	if(GameServer()->TeeHistorianActive())
+	{
+		GameServer()->TeeHistorian()->RecordPlayerSwap(pPrimaryPlayer->GetCID(), pTargetPlayer->GetCID());
+	}
+
+	str_format(aBuf, sizeof(aBuf),
+		"%s has swapped with %s.",
+		Server()->ClientName(pPrimaryPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
+
+	GameServer()->SendChatTeam(Team, aBuf);
+}
+
+void CGameTeams::ProcessSaveTeam()
+{
+	for(int Team = 0; Team < NUM_TEAMS; Team++)
+	{
+		if(m_apSaveTeamResult[Team] == nullptr || !m_apSaveTeamResult[Team]->m_Completed)
+			continue;
+		if(m_apSaveTeamResult[Team]->m_aBroadcast[0] != '\0')
+			GameServer()->SendBroadcast(m_apSaveTeamResult[Team]->m_aBroadcast, -1);
+		if(m_apSaveTeamResult[Team]->m_aMessage[0] != '\0' && m_apSaveTeamResult[Team]->m_Status != CScoreSaveResult::LOAD_FAILED)
+			GameServer()->SendChatTeam(Team, m_apSaveTeamResult[Team]->m_aMessage);
+		switch(m_apSaveTeamResult[Team]->m_Status)
+		{
+		case CScoreSaveResult::SAVE_SUCCESS:
+		{
+			if(GameServer()->TeeHistorianActive())
+			{
+				GameServer()->TeeHistorian()->RecordTeamSaveSuccess(
+					Team,
+					m_apSaveTeamResult[Team]->m_SaveID,
+					m_apSaveTeamResult[Team]->m_SavedTeam.GetString());
+			}
+			for(int i = 0; i < m_apSaveTeamResult[Team]->m_SavedTeam.GetMembersCount(); i++)
+			{
+				if(m_apSaveTeamResult[Team]->m_SavedTeam.m_pSavedTees->IsHooking())
+				{
+					int ClientID = m_apSaveTeamResult[Team]->m_SavedTeam.m_pSavedTees->GetClientID();
+					if(GameServer()->m_apPlayers[ClientID] != nullptr)
+						GameServer()->SendChatTarget(ClientID, "Start holding the hook before loading the savegame to keep the hook");
+				}
+			}
+			ResetSavedTeam(m_apSaveTeamResult[Team]->m_RequestingPlayer, Team);
+			char aSaveID[UUID_MAXSTRSIZE];
+			FormatUuid(m_apSaveTeamResult[Team]->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
+			dbg_msg("save", "Save successful: %s", aSaveID);
+			break;
+		}
+		case CScoreSaveResult::SAVE_FAILED:
+			if(GameServer()->TeeHistorianActive())
+				GameServer()->TeeHistorian()->RecordTeamSaveFailure(Team);
+			if(Count(Team) > 0)
+			{
+				// load weak/strong order to prevent switching weak/strong while saving
+				m_apSaveTeamResult[Team]->m_SavedTeam.Load(GameServer(), Team, false);
+			}
+			break;
+		case CScoreSaveResult::LOAD_SUCCESS:
+		{
+			if(GameServer()->TeeHistorianActive())
+			{
+				GameServer()->TeeHistorian()->RecordTeamLoadSuccess(
+					Team,
+					m_apSaveTeamResult[Team]->m_SaveID,
+					m_apSaveTeamResult[Team]->m_SavedTeam.GetString());
+			}
+			if(Count(Team) > 0)
+			{
+				// keep current weak/strong order as on some maps there is no other way of switching
+				m_apSaveTeamResult[Team]->m_SavedTeam.Load(GameServer(), Team, true);
+			}
+			char aSaveID[UUID_MAXSTRSIZE];
+			FormatUuid(m_apSaveTeamResult[Team]->m_SaveID, aSaveID, UUID_MAXSTRSIZE);
+			dbg_msg("save", "Load successful: %s", aSaveID);
+			break;
+		}
+		case CScoreSaveResult::LOAD_FAILED:
+			if(GameServer()->TeeHistorianActive())
+				GameServer()->TeeHistorian()->RecordTeamLoadFailure(Team);
+			if(m_apSaveTeamResult[Team]->m_aMessage[0] != '\0')
+				GameServer()->SendChatTarget(m_apSaveTeamResult[Team]->m_RequestingPlayer, m_apSaveTeamResult[Team]->m_aMessage);
+			break;
+		}
+		m_apSaveTeamResult[Team] = nullptr;
+	}
+}
+
+void CGameTeams::OnCharacterSpawn(int ClientID)
+{
+	m_Core.SetSolo(ClientID, false);
+	int Team = m_Core.Team(ClientID);
+
+	if(GetSaving(Team))
+		return;
+
+	if(m_Core.Team(ClientID) >= TEAM_SUPER || !m_aTeamLocked[Team])
+	{
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO)
+			SetForceCharacterTeam(ClientID, TEAM_FLOCK);
+		else
+			SetForceCharacterTeam(ClientID, ClientID); // initialize team
+		CheckTeamFinished(Team);
+	}
+}
+
+void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
+{
+	m_Core.SetSolo(ClientID, false);
+
+	int Team = m_Core.Team(ClientID);
+	if(GetSaving(Team))
+		return;
+	bool Locked = TeamLocked(Team) && Weapon != WEAPON_GAME;
+
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && Team != TEAM_SUPER)
+	{
+		ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
+		if(m_aPractice[Team])
+		{
+			if(Weapon == WEAPON_SELF)
+			{
+				ResetRoundState(Team);
+			}
+			else
+			{
+				GameServer()->SendChatTeam(Team, "You died, but will stay in practice until you use kill.");
+			}
+		}
+		else
+		{
+			ResetRoundState(Team);
+		}
+	}
+	else if(Locked)
+	{
+		SetForceCharacterTeam(ClientID, Team);
+
+		if(GetTeamState(Team) != TEAMSTATE_OPEN)
+		{
+			ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
+
+			m_aPractice[Team] = false;
+
+			if(Count(Team) > 1)
+			{
+				KillTeam(Team, Weapon == WEAPON_SELF ? ClientID : -1, ClientID);
+
+				char aBuf[512];
+				str_format(aBuf, sizeof(aBuf), "Everyone in your locked team was killed because '%s' %s.", Server()->ClientName(ClientID), Weapon == WEAPON_SELF ? "killed" : "died");
+
+				GameServer()->SendChatTeam(Team, aBuf);
+			}
+		}
+	}
+	else
+	{
+		if(m_aTeamState[m_Core.Team(ClientID)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientID])
+		{
+			char aBuf[128];
+			str_format(aBuf, sizeof(aBuf), "This team cannot finish anymore because '%s' left the team before hitting the start", Server()->ClientName(ClientID));
+			GameServer()->SendChatTeam(Team, aBuf);
+			GameServer()->SendChatTeam(Team, "Enter /practice mode or restart to avoid the entire team being killed in 60 seconds");
+
+			m_aTeamUnfinishableKillTick[Team] = Server()->Tick() + 60 * Server()->TickSpeed();
+			ChangeTeamState(Team, CGameTeams::TEAMSTATE_STARTED_UNFINISHABLE);
+		}
+		SetForceCharacterTeam(ClientID, TEAM_FLOCK);
+		CheckTeamFinished(Team);
+	}
+}
+
+void CGameTeams::SetTeamLock(int Team, bool Lock)
+{
+	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
+		m_aTeamLocked[Team] = Lock;
+}
+
+void CGameTeams::ResetInvited(int Team)
+{
+	m_aInvited[Team].reset();
+}
+
+void CGameTeams::SetClientInvited(int Team, int ClientID, bool Invited)
+{
+	if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
+	{
+		if(Invited)
+			m_aInvited[Team].set(ClientID);
+		else
+			m_aInvited[Team].reset(ClientID);
+	}
+}
+
+void CGameTeams::KillSavedTeam(int ClientID, int Team)
+{
+	if(g_Config.m_SvSoloServer || !g_Config.m_SvTeam)
+	{
+		GameServer()->m_apPlayers[ClientID]->KillCharacter(WEAPON_SELF, true);
+	}
+	else
+	{
+		KillTeam(Team, -1);
+	}
+}
+
+void CGameTeams::ResetSavedTeam(int ClientID, int Team)
+{
+	if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+	{
+		ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
+		ResetRoundState(Team);
+	}
+	else
+	{
+		for(int i = 0; i < MAX_CLIENTS; i++)
+		{
+			if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
+			{
+				SetForceCharacterTeam(i, TEAM_FLOCK);
+			}
+		}
+	}
+}
+
+int CGameTeams::GetFirstEmptyTeam() const
+{
+	for(int i = 1; i < MAX_CLIENTS; i++)
+		if(m_aTeamState[i] == TEAMSTATE_EMPTY)
+			return i;
+	return -1;
+}
diff --git a/src_bkp/game/server/teams.h b/src_bkp/game/server/teams.h
new file mode 100644
index 0000000000..25a758fed2
--- /dev/null
+++ b/src_bkp/game/server/teams.h
@@ -0,0 +1,208 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_SERVER_TEAMS_H
+#define GAME_SERVER_TEAMS_H
+
+#include <engine/shared/config.h>
+#include <game/server/gamecontext.h>
+#include <game/teamscore.h>
+
+class CCharacter;
+class CPlayer;
+struct CScoreSaveResult;
+
+class CGameTeams
+{
+	// `m_TeeStarted` is used to keep track whether a given tee has hit the
+	// start of the map yet. If a tee that leaves hasn't hit the start line
+	// yet, the team will be marked as "not allowed to finish"
+	// (`TEAMSTATE_STARTED_UNFINISHABLE`). If this were not the case, tees
+	// could go around the startline on a map, leave one tee behind at
+	// start, go to the finish line, let the tee start and kill, allowing
+	// the team to finish instantly.
+	bool m_aTeeStarted[MAX_CLIENTS];
+	bool m_aTeeFinished[MAX_CLIENTS];
+	int m_aLastChat[MAX_CLIENTS];
+
+	int m_aTeamState[NUM_TEAMS];
+	bool m_aTeamLocked[NUM_TEAMS];
+	CClientMask m_aInvited[NUM_TEAMS];
+	bool m_aPractice[NUM_TEAMS];
+	std::shared_ptr<CScoreSaveResult> m_apSaveTeamResult[NUM_TEAMS];
+	uint64_t m_aLastSwap[MAX_CLIENTS]; // index is id of player who initiated swap
+	bool m_aTeamSentStartWarning[NUM_TEAMS];
+	// `m_aTeamUnfinishableKillTick` is -1 by default and gets set when a
+	// team becomes unfinishable. If the team hasn't entered practice mode
+	// by that time, it'll get killed to prevent people not understanding
+	// the message from playing for a long time in an unfinishable team.
+	int m_aTeamUnfinishableKillTick[NUM_TEAMS];
+
+	class CGameContext *m_pGameContext;
+
+	/**
+	* Kill the whole team.
+	* @param Team The team id to kill
+	* @param NewStrongID The player with that id will get strong hook on everyone else, -1 will set the normal spawning order
+	* @param ExceptID The player that should not get killed
+	*/
+	void KillTeam(int Team, int NewStrongID, int ExceptID = -1);
+	bool TeamFinished(int Team);
+	void OnTeamFinish(CPlayer **Players, unsigned int Size, float Time, const char *pTimestamp);
+	void OnFinish(CPlayer *Player, float Time, const char *pTimestamp);
+
+public:
+	enum
+	{
+		TEAMSTATE_EMPTY,
+		TEAMSTATE_OPEN,
+		TEAMSTATE_STARTED,
+		// Happens when a tee that hasn't hit the start tiles leaves
+		// the team.
+		TEAMSTATE_STARTED_UNFINISHABLE,
+		TEAMSTATE_FINISHED
+	};
+
+	CTeamsCore m_Core;
+
+	CGameTeams(CGameContext *pGameContext);
+
+	// helper methods
+	CCharacter *Character(int ClientID)
+	{
+		return GameServer()->GetPlayerChar(ClientID);
+	}
+	CPlayer *GetPlayer(int ClientID)
+	{
+		return GameServer()->m_apPlayers[ClientID];
+	}
+
+	class CGameContext *GameServer()
+	{
+		return m_pGameContext;
+	}
+	class IServer *Server()
+	{
+		return m_pGameContext->Server();
+	}
+
+	void OnCharacterStart(int ClientID);
+	void OnCharacterFinish(int ClientID);
+	void OnCharacterSpawn(int ClientID);
+	void OnCharacterDeath(int ClientID, int Weapon);
+	void Tick();
+
+	// returns nullptr if successful, error string if failed
+	const char *SetCharacterTeam(int ClientID, int Team);
+	void CheckTeamFinished(int Team);
+
+	void ChangeTeamState(int Team, int State);
+
+	CClientMask TeamMask(int Team, int ExceptID = -1, int Asker = -1);
+
+	int Count(int Team) const;
+
+	// need to be very careful using this method. SERIOUSLY...
+	void SetForceCharacterTeam(int ClientID, int Team);
+
+	void Reset();
+	void ResetRoundState(int Team);
+	void ResetSwitchers(int Team);
+
+	void SendTeamsState(int ClientID);
+	void SetTeamLock(int Team, bool Lock);
+	void ResetInvited(int Team);
+	void SetClientInvited(int Team, int ClientID, bool Invited);
+
+	int GetDDRaceState(CPlayer *Player);
+	int GetStartTime(CPlayer *Player);
+	float *GetCurrentTimeCp(CPlayer *Player);
+	void SetDDRaceState(CPlayer *Player, int DDRaceState);
+	void SetStartTime(CPlayer *Player, int StartTime);
+	void SetLastTimeCp(CPlayer *Player, int LastTimeCp);
+	void KillSavedTeam(int ClientID, int Team);
+	void ResetSavedTeam(int ClientID, int Team);
+	void RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team);
+	void SwapTeamCharacters(CPlayer *pPrimaryPlayer, CPlayer *pTargetPlayer, int Team);
+	void ProcessSaveTeam();
+
+	int GetFirstEmptyTeam() const;
+
+	bool TeeStarted(int ClientID)
+	{
+		return m_aTeeStarted[ClientID];
+	}
+
+	bool TeeFinished(int ClientID)
+	{
+		return m_aTeeFinished[ClientID];
+	}
+
+	int GetTeamState(int Team)
+	{
+		return m_aTeamState[Team];
+	}
+
+	bool TeamLocked(int Team)
+	{
+		if(Team <= TEAM_FLOCK || Team >= TEAM_SUPER)
+			return false;
+
+		return m_aTeamLocked[Team];
+	}
+
+	bool IsInvited(int Team, int ClientID)
+	{
+		return m_aInvited[Team].test(ClientID);
+	}
+
+	bool IsStarted(int Team)
+	{
+		return m_aTeamState[Team] == CGameTeams::TEAMSTATE_STARTED;
+	}
+
+	void SetStarted(int ClientID, bool Started)
+	{
+		m_aTeeStarted[ClientID] = Started;
+	}
+
+	void SetFinished(int ClientID, bool Finished)
+	{
+		m_aTeeFinished[ClientID] = Finished;
+	}
+
+	void SetSaving(int TeamID, std::shared_ptr<CScoreSaveResult> &SaveResult)
+	{
+		m_apSaveTeamResult[TeamID] = SaveResult;
+	}
+
+	bool GetSaving(int TeamID)
+	{
+		if(TeamID < TEAM_FLOCK || TeamID >= TEAM_SUPER)
+			return false;
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && TeamID == TEAM_FLOCK)
+			return false;
+
+		return m_apSaveTeamResult[TeamID] != nullptr;
+	}
+
+	void SetPractice(int Team, bool Enabled)
+	{
+		if(Team < TEAM_FLOCK || Team >= TEAM_SUPER)
+			return;
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team == TEAM_FLOCK)
+			return;
+
+		m_aPractice[Team] = Enabled;
+	}
+
+	bool IsPractice(int Team)
+	{
+		if(Team < TEAM_FLOCK || Team >= TEAM_SUPER)
+			return false;
+		if(g_Config.m_SvTeam != SV_TEAM_FORCED_SOLO && Team == TEAM_FLOCK)
+			return false;
+
+		return m_aPractice[Team];
+	}
+};
+
+#endif
diff --git a/src_bkp/game/server/teehistorian.cpp b/src_bkp/game/server/teehistorian.cpp
new file mode 100644
index 0000000000..9fc9545c53
--- /dev/null
+++ b/src_bkp/game/server/teehistorian.cpp
@@ -0,0 +1,820 @@
+#include "teehistorian.h"
+
+#include <base/system.h>
+#include <engine/external/json-parser/json.h>
+#include <engine/shared/config.h>
+#include <engine/shared/json.h>
+#include <engine/shared/snapshot.h>
+#include <game/gamecore.h>
+
+static const char TEEHISTORIAN_NAME[] = "teehistorian@ddnet.tw";
+static const CUuid TEEHISTORIAN_UUID = CalculateUuid(TEEHISTORIAN_NAME);
+static const char TEEHISTORIAN_VERSION[] = "2";
+static const char TEEHISTORIAN_VERSION_MINOR[] = "6";
+
+#define UUID(id, name) static const CUuid UUID_##id = CalculateUuid(name);
+#include <engine/shared/teehistorian_ex_chunks.h>
+#undef UUID
+
+enum
+{
+	TEEHISTORIAN_NONE,
+	TEEHISTORIAN_FINISH,
+	TEEHISTORIAN_TICK_SKIP,
+	TEEHISTORIAN_PLAYER_NEW,
+	TEEHISTORIAN_PLAYER_OLD,
+	TEEHISTORIAN_INPUT_DIFF,
+	TEEHISTORIAN_INPUT_NEW,
+	TEEHISTORIAN_MESSAGE,
+	TEEHISTORIAN_JOIN,
+	TEEHISTORIAN_DROP,
+	TEEHISTORIAN_CONSOLE_COMMAND,
+	TEEHISTORIAN_EX,
+};
+
+CTeeHistorian::CTeeHistorian()
+{
+	m_State = STATE_START;
+	m_pfnWriteCallback = 0;
+	m_pWriteCallbackUserdata = 0;
+}
+
+void CTeeHistorian::Reset(const CGameInfo *pGameInfo, WRITE_CALLBACK pfnWriteCallback, void *pUser)
+{
+	dbg_assert(m_State == STATE_START || m_State == STATE_BEFORE_TICK, "invalid teehistorian state");
+
+	m_Debug = 0;
+
+	m_Tick = 0;
+	m_LastWrittenTick = 0;
+	// Tick 0 is implicit at the start, game starts as tick 1.
+	m_TickWritten = true;
+	m_MaxClientID = MAX_CLIENTS;
+
+	// `m_PrevMaxClientID` is initialized in `BeginPlayers`
+	for(auto &PrevPlayer : m_aPrevPlayers)
+	{
+		PrevPlayer.m_Alive = false;
+		// zero means no id
+		PrevPlayer.m_UniqueClientID = 0;
+		PrevPlayer.m_Team = 0;
+	}
+	for(auto &PrevTeam : m_aPrevTeams)
+	{
+		PrevTeam.m_Practice = false;
+	}
+	m_pfnWriteCallback = pfnWriteCallback;
+	m_pWriteCallbackUserdata = pUser;
+
+	WriteHeader(pGameInfo);
+
+	m_State = STATE_START;
+}
+
+void CTeeHistorian::WriteHeader(const CGameInfo *pGameInfo)
+{
+	Write(&TEEHISTORIAN_UUID, sizeof(TEEHISTORIAN_UUID));
+
+	char aGameUuid[UUID_MAXSTRSIZE];
+	char aStartTime[128];
+	char aMapSha256[SHA256_MAXSTRSIZE];
+
+	FormatUuid(pGameInfo->m_GameUuid, aGameUuid, sizeof(aGameUuid));
+	str_timestamp_ex(pGameInfo->m_StartTime, aStartTime, sizeof(aStartTime), "%Y-%m-%dT%H:%M:%S%z");
+	sha256_str(pGameInfo->m_MapSha256, aMapSha256, sizeof(aMapSha256));
+
+	char aPrevGameUuid[UUID_MAXSTRSIZE];
+	char aPrevGameUuidJson[64];
+	if(pGameInfo->m_HavePrevGameUuid)
+	{
+		FormatUuid(pGameInfo->m_PrevGameUuid, aPrevGameUuid, sizeof(aPrevGameUuid));
+		str_format(aPrevGameUuidJson, sizeof(aPrevGameUuidJson), "\"prev_game_uuid\":\"%s\",", aPrevGameUuid);
+	}
+	else
+	{
+		aPrevGameUuidJson[0] = 0;
+	}
+
+	char aCommentBuffer[128];
+	char aServerVersionBuffer[128];
+	char aStartTimeBuffer[128];
+	char aServerNameBuffer[128];
+	char aGameTypeBuffer[128];
+	char aMapNameBuffer[128];
+	char aMapSha256Buffer[256];
+	char aPrngDescription[128];
+
+	char aJson[2048];
+
+#define E(buf, str) EscapeJson(buf, sizeof(buf), str)
+
+	str_format(aJson, sizeof(aJson),
+		"{"
+		"\"comment\":\"%s\","
+		"\"version\":\"%s\","
+		"\"version_minor\":\"%s\","
+		"\"game_uuid\":\"%s\","
+		"%s"
+		"\"server_version\":\"%s\","
+		"\"start_time\":\"%s\","
+		"\"server_name\":\"%s\","
+		"\"server_port\":\"%d\","
+		"\"game_type\":\"%s\","
+		"\"map_name\":\"%s\","
+		"\"map_size\":\"%d\","
+		"\"map_sha256\":\"%s\","
+		"\"map_crc\":\"%08x\","
+		"\"prng_description\":\"%s\","
+		"\"config\":{",
+		E(aCommentBuffer, TEEHISTORIAN_NAME),
+		TEEHISTORIAN_VERSION,
+		TEEHISTORIAN_VERSION_MINOR,
+		aGameUuid,
+		aPrevGameUuidJson,
+		E(aServerVersionBuffer, pGameInfo->m_pServerVersion),
+		E(aStartTimeBuffer, aStartTime),
+		E(aServerNameBuffer, pGameInfo->m_pServerName),
+		pGameInfo->m_ServerPort,
+		E(aGameTypeBuffer, pGameInfo->m_pGameType),
+		E(aMapNameBuffer, pGameInfo->m_pMapName),
+		pGameInfo->m_MapSize,
+		E(aMapSha256Buffer, aMapSha256),
+		pGameInfo->m_MapCrc,
+		E(aPrngDescription, pGameInfo->m_pPrngDescription));
+	Write(aJson, str_length(aJson));
+
+	char aBuffer1[1024];
+	char aBuffer2[1024];
+	bool First = true;
+
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \
+	if((Flags)&CFGFLAG_SERVER && !((Flags)&CFGFLAG_NONTEEHISTORIC) && pGameInfo->m_pConfig->m_##Name != (Def)) \
+	{ \
+		str_format(aJson, sizeof(aJson), "%s\"%s\":\"%d\"", \
+			First ? "" : ",", \
+			E(aBuffer1, #ScriptName), \
+			pGameInfo->m_pConfig->m_##Name); \
+		Write(aJson, str_length(aJson)); \
+		First = false; \
+	}
+
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Flags, Desc) MACRO_CONFIG_INT(Name, ScriptName, Def, 0, 0, Flags, Desc)
+
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Flags, Desc) \
+	if((Flags)&CFGFLAG_SERVER && !((Flags)&CFGFLAG_NONTEEHISTORIC) && str_comp(pGameInfo->m_pConfig->m_##Name, (Def)) != 0) \
+	{ \
+		str_format(aJson, sizeof(aJson), "%s\"%s\":\"%s\"", \
+			First ? "" : ",", \
+			E(aBuffer1, #ScriptName), \
+			E(aBuffer2, pGameInfo->m_pConfig->m_##Name)); \
+		Write(aJson, str_length(aJson)); \
+		First = false; \
+	}
+
+#include <engine/shared/config_variables.h>
+
+#undef MACRO_CONFIG_INT
+#undef MACRO_CONFIG_COL
+#undef MACRO_CONFIG_STR
+
+	str_copy(aJson, "},\"tuning\":{");
+	Write(aJson, str_length(aJson));
+
+	First = true;
+
+#define MACRO_TUNING_PARAM(Name, ScriptName, Value, Description) \
+	if(pGameInfo->m_pTuning->m_##Name.Get() != (int)((Value)*100)) \
+	{ \
+		str_format(aJson, sizeof(aJson), "%s\"%s\":\"%d\"", \
+			First ? "" : ",", \
+			E(aBuffer1, #ScriptName), \
+			pGameInfo->m_pTuning->m_##Name.Get()); \
+		Write(aJson, str_length(aJson)); \
+		First = false; \
+	}
+#include <game/tuning.h>
+#undef MACRO_TUNING_PARAM
+
+	str_copy(aJson, "},\"uuids\":[");
+	Write(aJson, str_length(aJson));
+
+	for(int i = 0; i < pGameInfo->m_pUuids->NumUuids(); i++)
+	{
+		str_format(aJson, sizeof(aJson), "%s\"%s\"",
+			i == 0 ? "" : ",",
+			E(aBuffer1, pGameInfo->m_pUuids->GetName(OFFSET_UUID + i)));
+		Write(aJson, str_length(aJson));
+	}
+
+	str_copy(aJson, "]}");
+	Write(aJson, str_length(aJson));
+	Write("", 1); // Null termination.
+}
+
+void CTeeHistorian::WriteExtra(CUuid Uuid, const void *pData, int DataSize)
+{
+	EnsureTickWritten();
+
+	CPacker Ex;
+	Ex.Reset();
+	Ex.AddInt(-TEEHISTORIAN_EX);
+	Ex.AddRaw(&Uuid, sizeof(Uuid));
+	Ex.AddInt(DataSize);
+	Write(Ex.Data(), Ex.Size());
+	Write(pData, DataSize);
+}
+
+void CTeeHistorian::BeginTick(int Tick)
+{
+	dbg_assert(m_State == STATE_START || m_State == STATE_BEFORE_TICK, "invalid teehistorian state");
+
+	m_Tick = Tick;
+	m_TickWritten = false;
+
+	if(m_Debug > 1)
+	{
+		dbg_msg("teehistorian", "tick %d", Tick);
+	}
+
+	m_State = STATE_BEFORE_PLAYERS;
+}
+
+void CTeeHistorian::BeginPlayers()
+{
+	dbg_assert(m_State == STATE_BEFORE_PLAYERS, "invalid teehistorian state");
+
+	m_PrevMaxClientID = m_MaxClientID;
+	// ensure that PLAYER_{DIFF, NEW, OLD} don't cause an implicit tick after a TICK_SKIP
+	// by not overwriting m_MaxClientID during RecordPlayer
+	m_MaxClientID = -1;
+
+	m_State = STATE_PLAYERS;
+}
+
+void CTeeHistorian::EnsureTickWrittenPlayerData(int ClientID)
+{
+	dbg_assert(ClientID > m_MaxClientID, "invalid player data order");
+	m_MaxClientID = ClientID;
+
+	if(!m_TickWritten && (ClientID > m_PrevMaxClientID || m_LastWrittenTick + 1 != m_Tick))
+	{
+		WriteTick();
+	}
+	else
+	{
+		// Tick is implicit.
+		m_LastWrittenTick = m_Tick;
+		m_TickWritten = true;
+	}
+}
+
+void CTeeHistorian::RecordPlayer(int ClientID, const CNetObj_CharacterCore *pChar)
+{
+	dbg_assert(m_State == STATE_PLAYERS, "invalid teehistorian state");
+
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	if(!pPrev->m_Alive || pPrev->m_X != pChar->m_X || pPrev->m_Y != pChar->m_Y)
+	{
+		EnsureTickWrittenPlayerData(ClientID);
+
+		CPacker Buffer;
+		Buffer.Reset();
+		if(pPrev->m_Alive)
+		{
+			int dx = pChar->m_X - pPrev->m_X;
+			int dy = pChar->m_Y - pPrev->m_Y;
+			Buffer.AddInt(ClientID);
+			Buffer.AddInt(dx);
+			Buffer.AddInt(dy);
+			if(m_Debug)
+			{
+				dbg_msg("teehistorian", "diff cid=%d dx=%d dy=%d", ClientID, dx, dy);
+			}
+		}
+		else
+		{
+			int x = pChar->m_X;
+			int y = pChar->m_Y;
+			Buffer.AddInt(-TEEHISTORIAN_PLAYER_NEW);
+			Buffer.AddInt(ClientID);
+			Buffer.AddInt(x);
+			Buffer.AddInt(y);
+			if(m_Debug)
+			{
+				dbg_msg("teehistorian", "new cid=%d x=%d y=%d", ClientID, x, y);
+			}
+		}
+		Write(Buffer.Data(), Buffer.Size());
+	}
+	pPrev->m_X = pChar->m_X;
+	pPrev->m_Y = pChar->m_Y;
+	pPrev->m_Alive = true;
+}
+
+void CTeeHistorian::RecordDeadPlayer(int ClientID)
+{
+	dbg_assert(m_State == STATE_PLAYERS, "invalid teehistorian state");
+
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	if(pPrev->m_Alive)
+	{
+		EnsureTickWrittenPlayerData(ClientID);
+
+		CPacker Buffer;
+		Buffer.Reset();
+		Buffer.AddInt(-TEEHISTORIAN_PLAYER_OLD);
+		Buffer.AddInt(ClientID);
+		if(m_Debug)
+		{
+			dbg_msg("teehistorian", "old cid=%d", ClientID);
+		}
+		Write(Buffer.Data(), Buffer.Size());
+	}
+	pPrev->m_Alive = false;
+}
+
+void CTeeHistorian::RecordPlayerTeam(int ClientID, int Team)
+{
+	if(m_aPrevPlayers[ClientID].m_Team != Team)
+	{
+		m_aPrevPlayers[ClientID].m_Team = Team;
+
+		EnsureTickWritten();
+
+		CPacker Buffer;
+		Buffer.Reset();
+		Buffer.AddInt(ClientID);
+		Buffer.AddInt(Team);
+
+		if(m_Debug)
+		{
+			dbg_msg("teehistorian", "player_team cid=%d team=%d", ClientID, Team);
+		}
+
+		WriteExtra(UUID_TEEHISTORIAN_PLAYER_TEAM, Buffer.Data(), Buffer.Size());
+	}
+}
+
+void CTeeHistorian::RecordTeamPractice(int Team, bool Practice)
+{
+	if(m_aPrevTeams[Team].m_Practice != Practice)
+	{
+		m_aPrevTeams[Team].m_Practice = Practice;
+
+		EnsureTickWritten();
+
+		CPacker Buffer;
+		Buffer.Reset();
+		Buffer.AddInt(Team);
+		Buffer.AddInt(Practice);
+
+		if(m_Debug)
+		{
+			dbg_msg("teehistorian", "team_practice team=%d practice=%d", Team, Practice);
+		}
+
+		WriteExtra(UUID_TEEHISTORIAN_TEAM_PRACTICE, Buffer.Data(), Buffer.Size());
+	}
+}
+
+void CTeeHistorian::Write(const void *pData, int DataSize)
+{
+	m_pfnWriteCallback(pData, DataSize, m_pWriteCallbackUserdata);
+}
+
+void CTeeHistorian::EnsureTickWritten()
+{
+	if(!m_TickWritten)
+	{
+		WriteTick();
+	}
+}
+
+void CTeeHistorian::WriteTick()
+{
+	CPacker TickPacker;
+	TickPacker.Reset();
+
+	int dt = m_Tick - m_LastWrittenTick - 1;
+	TickPacker.AddInt(-TEEHISTORIAN_TICK_SKIP);
+	TickPacker.AddInt(dt);
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "skip_ticks dt=%d", dt);
+	}
+	Write(TickPacker.Data(), TickPacker.Size());
+
+	m_TickWritten = true;
+	m_LastWrittenTick = m_Tick;
+}
+
+void CTeeHistorian::EndPlayers()
+{
+	dbg_assert(m_State == STATE_PLAYERS, "invalid teehistorian state");
+
+	m_State = STATE_BEFORE_INPUTS;
+}
+
+void CTeeHistorian::BeginInputs()
+{
+	dbg_assert(m_State == STATE_BEFORE_INPUTS, "invalid teehistorian state");
+
+	m_State = STATE_INPUTS;
+}
+
+void CTeeHistorian::RecordPlayerInput(int ClientID, uint32_t UniqueClientID, const CNetObj_PlayerInput *pInput)
+{
+	CPacker Buffer;
+
+	CTeehistorianPlayer *pPrev = &m_aPrevPlayers[ClientID];
+	CNetObj_PlayerInput DiffInput;
+	if(pPrev->m_UniqueClientID == UniqueClientID)
+	{
+		if(mem_comp(&pPrev->m_Input, pInput, sizeof(pPrev->m_Input)) == 0)
+		{
+			return;
+		}
+		EnsureTickWritten();
+		Buffer.Reset();
+
+		Buffer.AddInt(-TEEHISTORIAN_INPUT_DIFF);
+		CSnapshotDelta::DiffItem((int *)&pPrev->m_Input, (int *)pInput, (int *)&DiffInput, sizeof(DiffInput) / sizeof(int32_t));
+		if(m_Debug)
+		{
+			const int *pData = (const int *)&DiffInput;
+			dbg_msg("teehistorian", "diff_input cid=%d %d %d %d %d %d %d %d %d %d %d", ClientID,
+				pData[0], pData[1], pData[2], pData[3], pData[4],
+				pData[5], pData[6], pData[7], pData[8], pData[9]);
+		}
+	}
+	else
+	{
+		EnsureTickWritten();
+		Buffer.Reset();
+		Buffer.AddInt(-TEEHISTORIAN_INPUT_NEW);
+		DiffInput = *pInput;
+		if(m_Debug)
+		{
+			dbg_msg("teehistorian", "new_input cid=%d", ClientID);
+		}
+	}
+	Buffer.AddInt(ClientID);
+	for(size_t i = 0; i < sizeof(DiffInput) / sizeof(int32_t); i++)
+	{
+		Buffer.AddInt(((int *)&DiffInput)[i]);
+	}
+	pPrev->m_UniqueClientID = UniqueClientID;
+	pPrev->m_Input = *pInput;
+
+	Write(Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordPlayerMessage(int ClientID, const void *pMsg, int MsgSize)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(-TEEHISTORIAN_MESSAGE);
+	Buffer.AddInt(ClientID);
+	Buffer.AddInt(MsgSize);
+	Buffer.AddRaw(pMsg, MsgSize);
+
+	if(m_Debug)
+	{
+		CUnpacker Unpacker;
+		Unpacker.Reset(pMsg, MsgSize);
+		int MsgID = Unpacker.GetInt();
+		int Sys = MsgID & 1;
+		MsgID >>= 1;
+		dbg_msg("teehistorian", "msg cid=%d sys=%d msgid=%d", ClientID, Sys, MsgID);
+	}
+
+	Write(Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordPlayerJoin(int ClientID, int Protocol)
+{
+	dbg_assert(Protocol == PROTOCOL_6 || Protocol == PROTOCOL_7, "invalid version");
+	EnsureTickWritten();
+
+	{
+		CPacker Buffer;
+		Buffer.Reset();
+		Buffer.AddInt(ClientID);
+		if(m_Debug)
+		{
+			dbg_msg("teehistorian", "joinver%d cid=%d", Protocol == PROTOCOL_6 ? 6 : 7, ClientID);
+		}
+		CUuid Uuid = Protocol == PROTOCOL_6 ? UUID_TEEHISTORIAN_JOINVER6 : UUID_TEEHISTORIAN_JOINVER7;
+		WriteExtra(Uuid, Buffer.Data(), Buffer.Size());
+	}
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(-TEEHISTORIAN_JOIN);
+	Buffer.AddInt(ClientID);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "join cid=%d", ClientID);
+	}
+
+	Write(Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordPlayerRejoin(int ClientID)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "player_rejoin cid=%d", ClientID);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_PLAYER_REJOIN, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordPlayerReady(int ClientID)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "player_ready cid=%d", ClientID);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_PLAYER_READY, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordPlayerDrop(int ClientID, const char *pReason)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(-TEEHISTORIAN_DROP);
+	Buffer.AddInt(ClientID);
+	Buffer.AddString(pReason, 0);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "drop cid=%d reason='%s'", ClientID, pReason);
+	}
+
+	Write(Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordConsoleCommand(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(-TEEHISTORIAN_CONSOLE_COMMAND);
+	Buffer.AddInt(ClientID);
+	Buffer.AddInt(FlagMask);
+	Buffer.AddString(pCmd, 0);
+	Buffer.AddInt(pResult->NumArguments());
+	for(int i = 0; i < pResult->NumArguments(); i++)
+	{
+		Buffer.AddString(pResult->GetString(i), 0);
+	}
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "ccmd cid=%d cmd='%s'", ClientID, pCmd);
+	}
+
+	Write(Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTestExtra()
+{
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "test");
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_TEST, "", 0);
+}
+
+void CTeeHistorian::RecordPlayerSwap(int ClientID1, int ClientID2)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID1);
+	Buffer.AddInt(ClientID2);
+
+	WriteExtra(UUID_TEEHISTORIAN_PLAYER_SWITCH, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(Team);
+	Buffer.AddRaw(&SaveID, sizeof(SaveID));
+	Buffer.AddString(pTeamSave, 0);
+
+	if(m_Debug)
+	{
+		char aSaveID[UUID_MAXSTRSIZE];
+		FormatUuid(SaveID, aSaveID, sizeof(aSaveID));
+		dbg_msg("teehistorian", "save_success team=%d save_id=%s team_save='%s'", Team, aSaveID, pTeamSave);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_SAVE_SUCCESS, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTeamSaveFailure(int Team)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(Team);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "save_failure team=%d", Team);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_SAVE_FAILURE, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTeamLoadSuccess(int Team, CUuid SaveID, const char *pTeamSave)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(Team);
+	Buffer.AddRaw(&SaveID, sizeof(SaveID));
+	Buffer.AddString(pTeamSave, 0);
+
+	if(m_Debug)
+	{
+		char aSaveID[UUID_MAXSTRSIZE];
+		FormatUuid(SaveID, aSaveID, sizeof(aSaveID));
+		dbg_msg("teehistorian", "load_success team=%d save_id=%s team_save='%s'", Team, aSaveID, pTeamSave);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_LOAD_SUCCESS, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordTeamLoadFailure(int Team)
+{
+	EnsureTickWritten();
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(Team);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "load_failure team=%d", Team);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_LOAD_FAILURE, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::EndInputs()
+{
+	dbg_assert(m_State == STATE_INPUTS, "invalid teehistorian state");
+
+	m_State = STATE_BEFORE_ENDTICK;
+}
+
+void CTeeHistorian::EndTick()
+{
+	dbg_assert(m_State == STATE_BEFORE_ENDTICK, "invalid teehistorian state");
+	m_State = STATE_BEFORE_TICK;
+}
+
+void CTeeHistorian::RecordDDNetVersionOld(int ClientID, int DDNetVersion)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+	Buffer.AddInt(DDNetVersion);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "ddnetver_old cid=%d ddnet_version=%d", ClientID, DDNetVersion);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_DDNETVER_OLD, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordDDNetVersion(int ClientID, CUuid ConnectionID, int DDNetVersion, const char *pDDNetVersionStr)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+	Buffer.AddRaw(&ConnectionID, sizeof(ConnectionID));
+	Buffer.AddInt(DDNetVersion);
+	Buffer.AddString(pDDNetVersionStr, 0);
+
+	if(m_Debug)
+	{
+		char aConnnectionID[UUID_MAXSTRSIZE];
+		FormatUuid(ConnectionID, aConnnectionID, sizeof(aConnnectionID));
+		dbg_msg("teehistorian", "ddnetver cid=%d connection_id=%s ddnet_version=%d ddnet_version_str=%s", ClientID, aConnnectionID, DDNetVersion, pDDNetVersionStr);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_DDNETVER, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordAuthInitial(int ClientID, int Level, const char *pAuthName)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+	Buffer.AddInt(Level);
+	Buffer.AddString(pAuthName, 0);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "auth_init cid=%d level=%d auth_name=%s", ClientID, Level, pAuthName);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_AUTH_INIT, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordAuthLogin(int ClientID, int Level, const char *pAuthName)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+	Buffer.AddInt(Level);
+	Buffer.AddString(pAuthName, 0);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "auth_login cid=%d level=%d auth_name=%s", ClientID, Level, pAuthName);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_AUTH_LOGIN, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordAuthLogout(int ClientID)
+{
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(ClientID);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "auth_logout cid=%d", ClientID);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_AUTH_LOGOUT, Buffer.Data(), Buffer.Size());
+}
+
+void CTeeHistorian::RecordAntibot(const void *pData, int DataSize)
+{
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "antibot data_size=%d", DataSize);
+	}
+
+	WriteExtra(UUID_TEEHISTORIAN_ANTIBOT, pData, DataSize);
+}
+
+void CTeeHistorian::Finish()
+{
+	dbg_assert(m_State == STATE_START || m_State == STATE_INPUTS || m_State == STATE_BEFORE_ENDTICK || m_State == STATE_BEFORE_TICK, "invalid teehistorian state");
+
+	if(m_State == STATE_INPUTS)
+	{
+		EndInputs();
+	}
+	if(m_State == STATE_BEFORE_ENDTICK)
+	{
+		EndTick();
+	}
+
+	CPacker Buffer;
+	Buffer.Reset();
+	Buffer.AddInt(-TEEHISTORIAN_FINISH);
+
+	if(m_Debug)
+	{
+		dbg_msg("teehistorian", "finish");
+	}
+
+	Write(Buffer.Data(), Buffer.Size());
+}
diff --git a/src_bkp/game/server/teehistorian.h b/src_bkp/game/server/teehistorian.h
new file mode 100644
index 0000000000..d4bc8d0275
--- /dev/null
+++ b/src_bkp/game/server/teehistorian.h
@@ -0,0 +1,147 @@
+#ifndef GAME_SERVER_TEEHISTORIAN_H
+#define GAME_SERVER_TEEHISTORIAN_H
+
+#include <base/hash.h>
+#include <engine/console.h>
+#include <engine/shared/protocol.h>
+#include <game/generated/protocol.h>
+
+#include <ctime>
+
+class CConfig;
+class CTuningParams;
+class CUuidManager;
+
+class CTeeHistorian
+{
+public:
+	typedef void (*WRITE_CALLBACK)(const void *pData, int DataSize, void *pUser);
+
+	struct CGameInfo
+	{
+		CUuid m_GameUuid;
+		const char *m_pServerVersion;
+		time_t m_StartTime;
+		const char *m_pPrngDescription;
+
+		const char *m_pServerName;
+		int m_ServerPort;
+		const char *m_pGameType;
+
+		const char *m_pMapName;
+		int m_MapSize;
+		SHA256_DIGEST m_MapSha256;
+		int m_MapCrc;
+
+		bool m_HavePrevGameUuid;
+		CUuid m_PrevGameUuid;
+
+		CConfig *m_pConfig;
+		CTuningParams *m_pTuning;
+		CUuidManager *m_pUuids;
+	};
+
+	enum
+	{
+		PROTOCOL_6 = 1,
+		PROTOCOL_7,
+	};
+
+	CTeeHistorian();
+
+	void Reset(const CGameInfo *pGameInfo, WRITE_CALLBACK pfnWriteCallback, void *pUser);
+	void Finish();
+
+	bool Starting() const { return m_State == STATE_START; }
+
+	void BeginTick(int Tick);
+
+	void BeginPlayers();
+	void RecordPlayer(int ClientID, const CNetObj_CharacterCore *pChar);
+	void RecordDeadPlayer(int ClientID);
+	void RecordPlayerTeam(int ClientID, int Team);
+	void RecordTeamPractice(int Team, bool Practice);
+	void EndPlayers();
+
+	void BeginInputs();
+	void RecordPlayerInput(int ClientID, uint32_t UniqueClientID, const CNetObj_PlayerInput *pInput);
+	void RecordPlayerMessage(int ClientID, const void *pMsg, int MsgSize);
+	void RecordPlayerJoin(int ClientID, int Protocol);
+	void RecordPlayerRejoin(int ClientID);
+	void RecordPlayerReady(int ClientID);
+	void RecordPlayerDrop(int ClientID, const char *pReason);
+	void RecordConsoleCommand(int ClientID, int FlagMask, const char *pCmd, IConsole::IResult *pResult);
+	void RecordTestExtra();
+	void RecordPlayerSwap(int ClientID1, int ClientID2);
+	void RecordTeamSaveSuccess(int Team, CUuid SaveID, const char *pTeamSave);
+	void RecordTeamSaveFailure(int Team);
+	void RecordTeamLoadSuccess(int Team, CUuid SaveID, const char *pTeamSave);
+	void RecordTeamLoadFailure(int Team);
+	void EndInputs();
+
+	void EndTick();
+
+	void RecordDDNetVersionOld(int ClientID, int DDNetVersion);
+	void RecordDDNetVersion(int ClientID, CUuid ConnectionID, int DDNetVersion, const char *pDDNetVersionStr);
+
+	void RecordAuthInitial(int ClientID, int Level, const char *pAuthName);
+	void RecordAuthLogin(int ClientID, int Level, const char *pAuthName);
+	void RecordAuthLogout(int ClientID);
+
+	void RecordAntibot(const void *pData, int DataSize);
+
+	int m_Debug; // Possible values: 0, 1, 2.
+
+private:
+	void WriteHeader(const CGameInfo *pGameInfo);
+	void WriteExtra(CUuid Uuid, const void *pData, int DataSize);
+	void EnsureTickWrittenPlayerData(int ClientID);
+	void EnsureTickWritten();
+	void WriteTick();
+	void Write(const void *pData, int DataSize);
+
+	enum
+	{
+		STATE_START,
+		STATE_BEFORE_TICK,
+		STATE_BEFORE_PLAYERS,
+		STATE_PLAYERS,
+		STATE_BEFORE_INPUTS,
+		STATE_INPUTS,
+		STATE_BEFORE_ENDTICK,
+		NUM_STATES,
+	};
+
+	struct CTeehistorianPlayer
+	{
+		bool m_Alive;
+		int m_X;
+		int m_Y;
+
+		CNetObj_PlayerInput m_Input;
+		uint32_t m_UniqueClientID;
+
+		// DDNet team
+		int m_Team;
+	};
+
+	struct CTeam
+	{
+		bool m_Practice;
+	};
+
+	WRITE_CALLBACK m_pfnWriteCallback;
+	void *m_pWriteCallbackUserdata;
+
+	int m_State;
+
+	int m_LastWrittenTick;
+	bool m_TickWritten;
+	int m_Tick;
+	int m_PrevMaxClientID;
+	int m_MaxClientID;
+	CTeehistorianPlayer m_aPrevPlayers[MAX_CLIENTS];
+	CTeam m_aPrevTeams[MAX_CLIENTS];
+};
+
+#endif // GAME_SERVER_TEEHISTORIAN_H
diff --git a/src_bkp/game/server/teeinfo.cpp b/src_bkp/game/server/teeinfo.cpp
new file mode 100644
index 0000000000..62e457c08d
--- /dev/null
+++ b/src_bkp/game/server/teeinfo.cpp
@@ -0,0 +1,141 @@
+#include <base/color.h>
+#include <base/system.h>
+
+#include "teeinfo.h"
+
+struct StdSkin
+{
+	char m_aSkinName[64];
+	// body, marking, decoration, hands, feet, eyes
+	char m_apSkinPartNames[6][24];
+	bool m_aUseCustomColors[6];
+	int m_aSkinPartColors[6];
+};
+
+static StdSkin g_aStdSkins[] = {
+	{"default", {"standard", "", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {1798004, 0, 0, 1799582, 1869630, 0}},
+	{"bluekitty", {"kitty", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {8681144, -8229413, 0, 7885547, 7885547, 0}},
+	{"bluestripe", {"standard", "stripes", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {10187898, 0, 0, 750848, 1944919, 0}},
+	{"brownbear", {"bear", "bear", "hair", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {1082745, -15634776, 0, 1082745, 1147174, 0}},
+	{"cammo", {"standard", "cammo2", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {5334342, -11771603, 0, 750848, 1944919, 0}},
+	{"cammostripes", {"standard", "cammostripes", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {5334342, -14840320, 0, 750848, 1944919, 0}},
+	{"coala", {"koala", "twinbelly", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {184, -15397662, 0, 184, 9765959, 0}},
+	{"limekitty", {"kitty", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {4612803, -12229920, 0, 3827951, 3827951, 0}},
+	{"pinky", {"standard", "whisker", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {15911355, -801066, 0, 15043034, 15043034, 0}},
+	{"redbopp", {"standard", "donny", "unibop", "standard", "standard", "standard"}, {true, true, true, true, true, false}, {16177260, -16590390, 16177260, 16177260, 7624169, 0}},
+	{"redstripe", {"standard", "stripe", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {16307835, 0, 0, 184, 9765959, 0}},
+	{"saddo", {"standard", "saddo", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {7171455, -9685436, 0, 3640746, 5792119, 0}},
+	{"toptri", {"standard", "toptri", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {6119331, 0, 0, 3640746, 5792119, 0}},
+	{"twinbop", {"standard", "duodonny", "twinbopp", "standard", "standard", "standard"}, {true, true, true, true, true, false}, {15310519, -1600806, 15310519, 15310519, 37600, 0}},
+	{"twintri", {"standard", "twintri", "", "standard", "standard", "standard"}, {true, true, false, true, true, false}, {3447932, -14098717, 0, 185, 9634888, 0}},
+	{"warpaint", {"standard", "warpaint", "", "standard", "standard", "standard"}, {true, false, false, true, true, false}, {1944919, 0, 0, 750337, 1944919, 0}}};
+
+CTeeInfo::CTeeInfo(const char *pSkinName, int UseCustomColor, int ColorBody, int ColorFeet)
+{
+	str_copy(m_aSkinName, pSkinName, sizeof(m_aSkinName));
+	m_UseCustomColor = UseCustomColor;
+	m_ColorBody = ColorBody;
+	m_ColorFeet = ColorFeet;
+}
+
+CTeeInfo::CTeeInfo(const char *apSkinPartNames[6], const int *pUseCustomColors, const int *pSkinPartColors)
+{
+	for(int i = 0; i < 6; i++)
+	{
+		str_copy(m_apSkinPartNames[i], apSkinPartNames[i], sizeof(m_apSkinPartNames[i]));
+		m_aUseCustomColors[i] = pUseCustomColors[i];
+		m_aSkinPartColors[i] = pSkinPartColors[i];
+	}
+}
+
+void CTeeInfo::ToSixup()
+{
+	// reset to default skin
+	for(int p = 0; p < 6; p++)
+	{
+		str_copy(m_apSkinPartNames[p], g_aStdSkins[0].m_apSkinPartNames[p], 24);
+		m_aUseCustomColors[p] = g_aStdSkins[0].m_aUseCustomColors[p];
+		m_aSkinPartColors[p] = g_aStdSkins[0].m_aSkinPartColors[p];
+	}
+
+	// check for std skin
+	for(auto &StdSkin : g_aStdSkins)
+	{
+		if(!str_comp(m_aSkinName, StdSkin.m_aSkinName))
+		{
+			for(int p = 0; p < 6; p++)
+			{
+				str_copy(m_apSkinPartNames[p], StdSkin.m_apSkinPartNames[p], 24);
+				m_aUseCustomColors[p] = StdSkin.m_aUseCustomColors[p];
+				m_aSkinPartColors[p] = StdSkin.m_aSkinPartColors[p];
+			}
+			break;
+		}
+	}
+
+	if(m_UseCustomColor)
+	{
+		int ColorBody = ColorHSLA(m_ColorBody).UnclampLighting().Pack(ms_DarkestLGT7);
+		int ColorFeet = ColorHSLA(m_ColorFeet).UnclampLighting().Pack(ms_DarkestLGT7);
+		m_aUseCustomColors[0] = true;
+		m_aUseCustomColors[1] = true;
+		m_aUseCustomColors[2] = true;
+		m_aUseCustomColors[3] = true;
+		m_aUseCustomColors[4] = true;
+		m_aSkinPartColors[0] = ColorBody;
+		m_aSkinPartColors[1] = 0x22FFFFFF;
+		m_aSkinPartColors[2] = ColorBody;
+		m_aSkinPartColors[3] = ColorBody;
+		m_aSkinPartColors[4] = ColorFeet;
+	}
+}
+
+void CTeeInfo::FromSixup()
+{
+	// reset to default skin
+	str_copy(m_aSkinName, "default", sizeof(m_aSkinName));
+	m_UseCustomColor = false;
+	m_ColorBody = 0;
+	m_ColorFeet = 0;
+
+	// check for std skin
+	for(auto &StdSkin : g_aStdSkins)
+	{
+		bool match = true;
+		for(int p = 0; p < 6; p++)
+		{
+			if(str_comp(m_apSkinPartNames[p], StdSkin.m_apSkinPartNames[p]) || m_aUseCustomColors[p] != StdSkin.m_aUseCustomColors[p] || (m_aUseCustomColors[p] && m_aSkinPartColors[p] != StdSkin.m_aSkinPartColors[p]))
+			{
+				match = false;
+				break;
+			}
+		}
+		if(match)
+		{
+			str_copy(m_aSkinName, StdSkin.m_aSkinName, sizeof(m_aSkinName));
+			return;
+		}
+	}
+
+	// find closest match
+	int best_skin = 0;
+	int best_matches = -1;
+	for(int s = 0; s < 16; s++)
+	{
+		int matches = 0;
+		for(int p = 0; p < 3; p++)
+			if(str_comp(m_apSkinPartNames[p], g_aStdSkins[s].m_apSkinPartNames[p]) == 0)
+				matches++;
+
+		if(matches > best_matches)
+		{
+			best_matches = matches;
+			best_skin = s;
+		}
+	}
+
+	str_copy(m_aSkinName, g_aStdSkins[best_skin].m_aSkinName, sizeof(m_aSkinName));
+	m_UseCustomColor = true;
+	m_ColorBody = ColorHSLA(m_aUseCustomColors[0] ? m_aSkinPartColors[0] : 255).UnclampLighting(ms_DarkestLGT7).Pack(ColorHSLA::DARKEST_LGT);
+	m_ColorFeet = ColorHSLA(m_aUseCustomColors[4] ? m_aSkinPartColors[4] : 255).UnclampLighting(ms_DarkestLGT7).Pack(ColorHSLA::DARKEST_LGT);
+}
diff --git a/src_bkp/game/server/teeinfo.h b/src_bkp/game/server/teeinfo.h
new file mode 100644
index 0000000000..a2a72a46df
--- /dev/null
+++ b/src_bkp/game/server/teeinfo.h
@@ -0,0 +1,29 @@
+#ifndef GAME_SERVER_TEEINFO_H
+#define GAME_SERVER_TEEINFO_H
+
+class CTeeInfo
+{
+public:
+	constexpr static const float ms_DarkestLGT7 = 61 / 255.0f;
+
+	char m_aSkinName[64] = {'\0'};
+	int m_UseCustomColor = 0;
+	int m_ColorBody = 0;
+	int m_ColorFeet = 0;
+
+	// 0.7
+	char m_apSkinPartNames[6][24] = {"", "", "", "", "", ""};
+	bool m_aUseCustomColors[6] = {false, false, false, false, false, false};
+	int m_aSkinPartColors[6] = {0, 0, 0, 0, 0, 0};
+
+	CTeeInfo() = default;
+
+	CTeeInfo(const char *pSkinName, int UseCustomColor, int ColorBody, int ColorFeet);
+
+	// This constructor will assume all arrays are of length 6
+	CTeeInfo(const char *apSkinPartNames[6], const int *pUseCustomColors, const int *pSkinPartColors);
+
+	void FromSixup();
+	void ToSixup();
+};
+#endif //GAME_SERVER_TEEINFO_H
diff --git a/src_bkp/game/teamscore.cpp b/src_bkp/game/teamscore.cpp
new file mode 100644
index 0000000000..0835a9814b
--- /dev/null
+++ b/src_bkp/game/teamscore.cpp
@@ -0,0 +1,68 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#include "teamscore.h"
+#include <base/system.h>
+#include <engine/shared/config.h>
+
+CTeamsCore::CTeamsCore()
+{
+	Reset();
+}
+
+bool CTeamsCore::SameTeam(int ClientID1, int ClientID2) const
+{
+	return m_aTeam[ClientID1] == TEAM_SUPER || m_aTeam[ClientID2] == TEAM_SUPER || m_aTeam[ClientID1] == m_aTeam[ClientID2];
+}
+
+int CTeamsCore::Team(int ClientID) const
+{
+	return m_aTeam[ClientID];
+}
+
+void CTeamsCore::Team(int ClientID, int Team)
+{
+	dbg_assert(Team >= TEAM_FLOCK && Team <= TEAM_SUPER, "invalid team");
+	m_aTeam[ClientID] = Team;
+}
+
+bool CTeamsCore::CanKeepHook(int ClientID1, int ClientID2) const
+{
+	if(m_aTeam[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientID1 == ClientID2)
+		return true;
+	return m_aTeam[ClientID1] == m_aTeam[ClientID2];
+}
+
+bool CTeamsCore::CanCollide(int ClientID1, int ClientID2) const
+{
+	if(m_aTeam[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_aTeam[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || ClientID1 == ClientID2)
+		return true;
+	if(m_aIsSolo[ClientID1] || m_aIsSolo[ClientID2])
+		return false;
+	return m_aTeam[ClientID1] == m_aTeam[ClientID2];
+}
+
+void CTeamsCore::Reset()
+{
+	m_IsDDRace16 = false;
+
+	for(int i = 0; i < MAX_CLIENTS; ++i)
+	{
+		if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO)
+			m_aTeam[i] = i;
+		else
+			m_aTeam[i] = TEAM_FLOCK;
+		m_aIsSolo[i] = false;
+	}
+}
+
+void CTeamsCore::SetSolo(int ClientID, bool Value)
+{
+	dbg_assert(ClientID >= 0 && ClientID < MAX_CLIENTS, "Invalid client id");
+	m_aIsSolo[ClientID] = Value;
+}
+
+bool CTeamsCore::GetSolo(int ClientID) const
+{
+	if(ClientID < 0 || ClientID >= MAX_CLIENTS)
+		return false;
+	return m_aIsSolo[ClientID];
+}
diff --git a/src_bkp/game/teamscore.h b/src_bkp/game/teamscore.h
new file mode 100644
index 0000000000..a37ded2ca8
--- /dev/null
+++ b/src_bkp/game/teamscore.h
@@ -0,0 +1,47 @@
+/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
+#ifndef GAME_TEAMSCORE_H
+#define GAME_TEAMSCORE_H
+
+#include <engine/shared/protocol.h>
+
+enum
+{
+	TEAM_FLOCK = 0,
+	TEAM_SUPER = MAX_CLIENTS,
+	NUM_TEAMS = TEAM_SUPER + 1,
+	VANILLA_TEAM_SUPER = VANILLA_MAX_CLIENTS
+};
+
+// do not change the values of the following enum
+enum
+{
+	SV_TEAM_FORBIDDEN = 0, // teams are disabled on the map
+	SV_TEAM_ALLOWED = 1, // teams are enabled on the map, but optional
+	SV_TEAM_MANDATORY = 2, // map must be played with a team
+	SV_TEAM_FORCED_SOLO = 3 // map forces a random team for each individual player
+};
+
+class CTeamsCore
+{
+	int m_aTeam[MAX_CLIENTS];
+	bool m_aIsSolo[MAX_CLIENTS];
+
+public:
+	bool m_IsDDRace16;
+
+	CTeamsCore();
+
+	bool SameTeam(int ClientID1, int ClientID2) const;
+
+	bool CanKeepHook(int ClientID1, int ClientID2) const;
+	bool CanCollide(int ClientID1, int ClientID2) const;
+
+	int Team(int ClientID) const;
+	void Team(int ClientID, int Team);
+
+	void Reset();
+	void SetSolo(int ClientID, bool Value);
+	bool GetSolo(int ClientID) const;
+};
+
+#endif
diff --git a/src_bkp/game/tuning.h b/src_bkp/game/tuning.h
new file mode 100644
index 0000000000..ac6340012e
--- /dev/null
+++ b/src_bkp/game/tuning.h
@@ -0,0 +1,64 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+// This file can be included several times.
+
+// physics tuning
+MACRO_TUNING_PARAM(GroundControlSpeed, ground_control_speed, 10.0f, "Max speed the tee can get on ground")
+MACRO_TUNING_PARAM(GroundControlAccel, ground_control_accel, 100.0f / SERVER_TICK_SPEED, "Acceleration speed on the ground")
+MACRO_TUNING_PARAM(GroundFriction, ground_friction, 0.5f, "Friction on the ground")
+MACRO_TUNING_PARAM(GroundJumpImpulse, ground_jump_impulse, 13.2f, "Impulse when jumping on ground")
+MACRO_TUNING_PARAM(AirJumpImpulse, air_jump_impulse, 12.0f, "Impulse when jumping in air")
+MACRO_TUNING_PARAM(AirControlSpeed, air_control_speed, 250.0f / SERVER_TICK_SPEED, "Max speed the tee can get in the air")
+MACRO_TUNING_PARAM(AirControlAccel, air_control_accel, 1.5f, "Acceleration speed in air")
+MACRO_TUNING_PARAM(AirFriction, air_friction, 0.95f, "Friction in the air")
+MACRO_TUNING_PARAM(HookLength, hook_length, 380.0f, "Length of the hook")
+MACRO_TUNING_PARAM(HookFireSpeed, hook_fire_speed, 80.0f, "How fast the hook is fired")
+MACRO_TUNING_PARAM(HookDragAccel, hook_drag_accel, 3.0f, "Acceleration when hook is stuck")
+MACRO_TUNING_PARAM(HookDragSpeed, hook_drag_speed, 15.0f, "Drag speed of the hook")
+MACRO_TUNING_PARAM(Gravity, gravity, 0.5f, "Gravity of the teeworld")
+
+MACRO_TUNING_PARAM(VelrampStart, velramp_start, 550, "Velocity ramp start")
+MACRO_TUNING_PARAM(VelrampRange, velramp_range, 2000, "Velocity ramp range")
+MACRO_TUNING_PARAM(VelrampCurvature, velramp_curvature, 1.4f, "Velocity ramp curvature")
+
+// weapon tuning
+MACRO_TUNING_PARAM(GunCurvature, gun_curvature, 1.25f, "Gun curvature")
+MACRO_TUNING_PARAM(GunSpeed, gun_speed, 2200.0f, "Gun speed")
+MACRO_TUNING_PARAM(GunLifetime, gun_lifetime, 2.0f, "Gun lifetime")
+
+MACRO_TUNING_PARAM(ShotgunCurvature, shotgun_curvature, 1.25f, "Shotgun curvature")
+MACRO_TUNING_PARAM(ShotgunSpeed, shotgun_speed, 2750.0f, "Shotgun speed")
+MACRO_TUNING_PARAM(ShotgunSpeeddiff, shotgun_speeddiff, 0.8f, "(UNUSED) Speed difference between shotgun bullets")
+MACRO_TUNING_PARAM(ShotgunLifetime, shotgun_lifetime, 0.20f, "(UNUSED) Shotgun lifetime")
+
+MACRO_TUNING_PARAM(GrenadeCurvature, grenade_curvature, 7.0f, "Grenade curvature")
+MACRO_TUNING_PARAM(GrenadeSpeed, grenade_speed, 1000.0f, "Grenade speed")
+MACRO_TUNING_PARAM(GrenadeLifetime, grenade_lifetime, 2.0f, "Grenade lifetime")
+
+MACRO_TUNING_PARAM(LaserReach, laser_reach, 800.0f, "How long the laser can reach")
+MACRO_TUNING_PARAM(LaserBounceDelay, laser_bounce_delay, 150, "When bouncing, stop the laser this long")
+MACRO_TUNING_PARAM(LaserBounceNum, laser_bounce_num, 1000, "How many times the laser can bounce")
+MACRO_TUNING_PARAM(LaserBounceCost, laser_bounce_cost, 0, "Remove this much from reach when laser is bouncing")
+MACRO_TUNING_PARAM(LaserDamage, laser_damage, 5, "(UNUSED) Laser damage")
+
+MACRO_TUNING_PARAM(PlayerCollision, player_collision, 1, "Enable player collisions")
+MACRO_TUNING_PARAM(PlayerHooking, player_hooking, 1, "Enable player vs player hooking")
+
+//ddnet tuning
+MACRO_TUNING_PARAM(JetpackStrength, jetpack_strength, 400.0f, "Jetpack pistol strength")
+MACRO_TUNING_PARAM(ShotgunStrength, shotgun_strength, 10.0f, "Shotgun pull strength")
+MACRO_TUNING_PARAM(ExplosionStrength, explosion_strength, 6.0f, "Explosion strength (grenade for example)")
+MACRO_TUNING_PARAM(HammerStrength, hammer_strength, 1.0f, "Hammer strength")
+MACRO_TUNING_PARAM(HookDuration, hook_duration, 1.25f, "Hook duration")
+
+MACRO_TUNING_PARAM(HammerFireDelay, hammer_fire_delay, 125, "Delay of hammering (when hitting nothing)")
+MACRO_TUNING_PARAM(GunFireDelay, gun_fire_delay, 125, "Delay of firing gun")
+MACRO_TUNING_PARAM(ShotgunFireDelay, shotgun_fire_delay, 500, "Delay of firing shotgun")
+MACRO_TUNING_PARAM(GrenadeFireDelay, grenade_fire_delay, 500, "Delay of firing grenade")
+MACRO_TUNING_PARAM(LaserFireDelay, laser_fire_delay, 800, "Delay of firing laser laser")
+MACRO_TUNING_PARAM(NinjaFireDelay, ninja_fire_delay, 800, "Delay of firing ninja")
+MACRO_TUNING_PARAM(HammerHitFireDelay, hammer_hit_fire_delay, 320, "Delay of hammering (when hitting another tee)")
+
+MACRO_TUNING_PARAM(GroundElasticityX, ground_elasticity_x, 0, "Wall elasticity")
+MACRO_TUNING_PARAM(GroundElasticityY, ground_elasticity_y, 0, "Ground/ceiling elasticity")
diff --git a/src_bkp/game/version.h b/src_bkp/game/version.h
new file mode 100644
index 0000000000..195134e14a
--- /dev/null
+++ b/src_bkp/game/version.h
@@ -0,0 +1,16 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_VERSION_H
+#define GAME_VERSION_H
+#ifndef GAME_RELEASE_VERSION
+#define GAME_RELEASE_VERSION "17.4.2"
+#endif
+#define GAME_VERSION "0.6.4, " GAME_RELEASE_VERSION
+#define GAME_NETVERSION "0.6 626fce9a778df4d4"
+#define DDNET_VERSION_NUMBER 17042
+#define GAME_STA_VERSION 001
+#define STA_VERSION "0.0.1"
+extern const char *GIT_SHORTREV_HASH;
+#define GAME_NAME "DDNet"
+#define STA_BUILD_DATE __DATE__ ", " __TIME__
+#endif
diff --git a/src_bkp/game/voting.h b/src_bkp/game/voting.h
new file mode 100644
index 0000000000..60262794bb
--- /dev/null
+++ b/src_bkp/game/voting.h
@@ -0,0 +1,30 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#ifndef GAME_VOTING_H
+#define GAME_VOTING_H
+
+enum
+{
+	VOTE_DESC_LENGTH = 64,
+	VOTE_CMD_LENGTH = 512,
+	VOTE_REASON_LENGTH = 16,
+
+	MAX_VOTE_OPTIONS = 8192,
+};
+
+struct CVoteOptionClient
+{
+	CVoteOptionClient *m_pNext;
+	CVoteOptionClient *m_pPrev;
+	char m_aDescription[VOTE_DESC_LENGTH];
+};
+
+struct CVoteOptionServer
+{
+	CVoteOptionServer *m_pNext;
+	CVoteOptionServer *m_pPrev;
+	char m_aDescription[VOTE_DESC_LENGTH];
+	char m_aCommand[1];
+};
+
+#endif
diff --git a/src_bkp/macos/client.mm b/src_bkp/macos/client.mm
new file mode 100644
index 0000000000..052e83c585
--- /dev/null
+++ b/src_bkp/macos/client.mm
@@ -0,0 +1,22 @@
+#import <Cocoa/Cocoa.h>
+
+extern "C" int TWMain(int argc, const char **argv);
+
+int main(int argc, const char **argv)
+{
+	BOOL FinderLaunch = argc >= 2 && !strncmp(argv[1], "-psn", 4);
+
+	NSString *pResourcePath = [[NSBundle mainBundle] resourcePath];
+	if(!pResourcePath)
+		return -1;
+
+	[[NSFileManager defaultManager] changeCurrentDirectoryPath:pResourcePath];
+
+	if(FinderLaunch)
+	{
+		const char *apArgv[2] = { argv[0], NULL };
+		return TWMain(1, apArgv);
+	}
+	else
+		return TWMain(argc, argv);
+}
diff --git a/src_bkp/macos/notifications.mm b/src_bkp/macos/notifications.mm
new file mode 100644
index 0000000000..2501fe0e6b
--- /dev/null
+++ b/src_bkp/macos/notifications.mm
@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+#import <Foundation/NSUserNotification.h>
+#import <Cocoa/Cocoa.h>
+
+// TODO: NSUserNotification is deprecated. Use the User Notifications framework instead: https://developer.apple.com/documentation/usernotifications?language=objc
+void NotificationsNotifyMacOsInternal(const char *pTitle, const char *pMessage)
+{
+	NSString* pNsTitle = [NSString stringWithCString:pTitle encoding:NSUTF8StringEncoding];
+	NSString* pNsMsg = [NSString stringWithCString:pMessage encoding:NSUTF8StringEncoding];
+
+	NSUserNotification *pNotification = [[NSUserNotification alloc] autorelease];
+	pNotification.title = pNsTitle;
+	pNotification.informativeText = pNsMsg;
+	pNotification.soundName = NSUserNotificationDefaultSoundName;
+
+	[[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:pNotification];
+
+	[NSApp requestUserAttention:NSInformationalRequest]; // use NSCriticalRequest to annoy the user (doesn't stop bouncing)
+}
diff --git a/src_bkp/macos/server.mm b/src_bkp/macos/server.mm
new file mode 100644
index 0000000000..90b1b05311
--- /dev/null
+++ b/src_bkp/macos/server.mm
@@ -0,0 +1,122 @@
+#import <Cocoa/Cocoa.h>
+
+@interface ServerView : NSTextView
+{
+	NSTask *pTask;
+	NSFileHandle *pFile;
+}
+- (void)listenTo: (NSTask *)t;
+@end
+
+@implementation ServerView
+- (void)listenTo: (NSTask *)t
+{
+	NSPipe *pPipe;
+	pTask = t;
+	pPipe = [NSPipe pipe];
+	[pTask setStandardOutput: pPipe];
+	pFile = [pPipe fileHandleForReading];
+
+	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(outputNotification:) name: NSFileHandleReadCompletionNotification object: pFile];
+
+	[pFile readInBackgroundAndNotify];
+}
+
+- (void) outputNotification: (NSNotification *) notification
+{
+	NSData *pData = [[[notification userInfo] objectForKey: NSFileHandleNotificationDataItem] retain];
+	NSString *pString = [[NSString alloc] initWithData: pData encoding: NSASCIIStringEncoding];
+	NSAttributedString *pAttrStr = [[NSAttributedString alloc] initWithString: pString];
+
+	[[self textStorage] appendAttributedString: pAttrStr];
+	int length = [[self textStorage] length];
+	NSRange range = NSMakeRange(length, 0);
+	[self scrollRangeToVisible: range];
+
+	[pAttrStr release];
+	[pString release];
+	[pFile readInBackgroundAndNotify];
+}
+
+-(void)windowWillClose:(NSNotification *)notification
+{
+	[pTask terminate];
+	[NSApp terminate:self];
+}
+@end
+
+void runServer()
+{
+	NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
+	NSApp = [NSApplication sharedApplication];
+	NSBundle *pMainBundle = [NSBundle mainBundle];
+	NSTask *pTask;
+	pTask = [[NSTask alloc] init];
+	[pTask setCurrentDirectoryPath: [pMainBundle resourcePath]]; // NOLINT(clang-analyzer-nullability.NullablePassedToNonnull)
+
+	NSArray *pArguments = [NSArray new];
+
+	NSAlert *pAlert = [[[NSAlert alloc] init] autorelease];
+	[pAlert setMessageText: @"Run DDNet Server"];
+	[pAlert addButtonWithTitle: @"Use default config"];
+	[pAlert addButtonWithTitle: @"Select config"];
+	[pAlert addButtonWithTitle: @"Cancel"];
+	switch([pAlert runModal])
+	{
+		case NSAlertFirstButtonReturn:
+			break;
+		case NSAlertThirdButtonReturn:
+			return;
+		case NSAlertSecondButtonReturn:
+			// get a server config
+			NSOpenPanel *pOpenDlg = [NSOpenPanel openPanel];
+			[pOpenDlg setCanChooseFiles:YES];
+			if([pOpenDlg runModal] != NSModalResponseOK)
+				return;
+			NSString *pFileName = [[pOpenDlg URL] path];
+			pArguments = [NSArray arrayWithObjects: @"-f", pFileName, nil];
+			break;
+	}
+
+	// run server
+	NSWindow *pWindow;
+	ServerView *pView;
+	NSRect GraphicsRect;
+
+	GraphicsRect = NSMakeRect(100.0, 1000.0, 600.0, 400.0);
+
+	pWindow = [[NSWindow alloc]
+		initWithContentRect: GraphicsRect
+		styleMask: NSWindowStyleMaskTitled
+		| NSWindowStyleMaskClosable
+		| NSWindowStyleMaskMiniaturizable
+		backing: NSBackingStoreBuffered
+		defer: NO];
+
+	[pWindow setTitle: @"DDNet Server"];
+
+	pView = [[[ServerView alloc] initWithFrame: GraphicsRect] autorelease];
+	[pView setEditable: NO];
+	[pView setRulerVisible: YES];
+
+	[pWindow setContentView: pView];
+	[pWindow setDelegate: (id<NSWindowDelegate>)pView];
+	[pWindow makeKeyAndOrderFront: nil];
+
+	[pView listenTo: pTask];
+	[pTask setLaunchPath: [pMainBundle pathForAuxiliaryExecutable: @"DDNet-Server"]];
+	[pTask setArguments: pArguments];
+	[pTask launch];
+	[NSApp run];
+	[pTask terminate];
+
+	[NSApp release];
+	[pPool release];
+}
+
+int main(int argc, char **argv)
+{
+	runServer();
+
+	return 0;
+}
diff --git a/src_bkp/masterping/Cargo.lock b/src_bkp/masterping/Cargo.lock
new file mode 100644
index 0000000000..69bc6423c9
--- /dev/null
+++ b/src_bkp/masterping/Cargo.lock
@@ -0,0 +1,516 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "anyhow"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+dependencies = [
+ "backtrace",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+
+[[package]]
+name = "cc"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chunked_transfer"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a"
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "bitflags",
+ "strsim",
+ "term_size",
+ "textwrap",
+ "unicode-width",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.139"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "masterping"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "ureq",
+ "uuid",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "object"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
+[[package]]
+name = "rustls"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+dependencies = [
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "syn"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "term_size",
+ "unicode-width",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "ureq"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
+dependencies = [
+ "base64",
+ "chunked_transfer",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls",
+ "url",
+ "webpki",
+ "webpki-roots",
+]
+
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "uuid"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+
+[[package]]
+name = "web-sys"
+version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src_bkp/masterping/Cargo.toml b/src_bkp/masterping/Cargo.toml
new file mode 100644
index 0000000000..d6bdc5dc21
--- /dev/null
+++ b/src_bkp/masterping/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "masterping"
+version = "0.0.1"
+authors = ["heinrich5991 <heinrich5991@gmail.com>"]
+edition = "2018"
+publish = false
+license = "Zlib"
+
+[workspace]
+
+[dependencies]
+anyhow = { version = "1.0.66", features = ["backtrace"] }
+clap = { version = "2.34.0", default-features = false, features = [
+  "suggestions",
+  "wrap_help",
+] }
+ureq = "2.5.0"
+uuid = { version = "1.2.2", features = ["v4"] }
diff --git a/src_bkp/masterping/src/main.rs b/src_bkp/masterping/src/main.rs
new file mode 100644
index 0000000000..b52c58a5c1
--- /dev/null
+++ b/src_bkp/masterping/src/main.rs
@@ -0,0 +1,142 @@
+use anyhow::bail;
+use anyhow::Context;
+use clap::value_t_or_exit;
+use clap::App;
+use clap::Arg;
+use std::io;
+use std::net::SocketAddr;
+use std::net::ToSocketAddrs;
+use std::net::UdpSocket;
+use std::str::FromStr;
+use std::time::Duration;
+use std::time::Instant;
+use uuid::Uuid;
+
+use self::IpVersion::*;
+
+#[derive(Clone, Copy)]
+enum IpVersion {
+    Ipv4,
+    Ipv6,
+}
+
+struct InvalidIpVersion;
+
+impl FromStr for IpVersion {
+    type Err = InvalidIpVersion;
+    fn from_str(s: &str) -> Result<IpVersion, InvalidIpVersion> {
+        Ok(match s {
+            "ipv4" => Ipv4,
+            "ipv6" => Ipv6,
+            _ => return Err(InvalidIpVersion),
+        })
+    }
+}
+
+struct IpvResolver(IpVersion);
+
+impl ureq::Resolver for IpvResolver {
+    fn resolve(&self, netloc: &str) -> io::Result<Vec<SocketAddr>> {
+        ToSocketAddrs::to_socket_addrs(netloc).map(|iter| {
+            iter.filter(|s| match self.0 {
+                Ipv4 => s.is_ipv4(),
+                Ipv6 => s.is_ipv6(),
+            })
+            .collect()
+        })
+    }
+}
+
+fn main() -> anyhow::Result<()> {
+    let matches = App::new("masterping")
+        .about("Continuously checks if the masterserver is accepting registrations.")
+        .arg(Arg::with_name("ipv")
+            .value_name("IPV")
+            .required(true)
+            .help("IP version (either \"ipv6\" or \"ipv4\").")
+        )
+        .arg(Arg::with_name("masterurl")
+            .value_name("MASTERURL")
+            .required(true)
+            .help("URL of the masterserver registration endpoint (something like \"https://master1.ddnet.org/ddnet/15/register\")")
+        )
+        .get_matches();
+
+    let ipv = value_t_or_exit!(matches.value_of("ipv"), IpVersion);
+    let url = matches.value_of("masterurl").unwrap();
+
+    let bindaddr = match ipv {
+        Ipv4 => "0.0.0.0:0",
+        Ipv6 => "[::]:0",
+    };
+    let udp = UdpSocket::bind(bindaddr).context("UdpSocket::bind")?;
+    let address = format!(
+        "tw-0.6+udp://connecting-address.invalid:{}",
+        udp.local_addr().context("UdpSocket::local_addr")?.port()
+    );
+    let challenge_secret = Uuid::new_v4().to_string();
+
+    let agent = ureq::builder()
+        .user_agent("masterping/0.0.1")
+        .resolver(IpvResolver(ipv))
+        .build();
+    let response = agent
+        .post(url)
+        .set("Address", &address)
+        .set("Secret", &Uuid::new_v4().to_string())
+        .set("Challenge-Secret", &challenge_secret)
+        .set("Info-Serial", "0")
+        .send_bytes(b"")
+        .map_err(|e| {
+            if let ureq::Error::Status(status, response) = e {
+                let status_text = response.status_text().to_owned();
+                if let Ok(response) = response.into_string() {
+                    eprintln!("{}", response);
+                }
+                ureq::Error::Status(
+                    status,
+                    ureq::Response::new(status, &status_text, "").unwrap(),
+                )
+            } else {
+                e
+            }
+        })?
+        .into_string()?;
+
+    if response != "{\"status\":\"need_challenge\"}\n" {
+        bail!("Unexpected response {:?}", response);
+    }
+
+    let expected_msg_prefix = {
+        let mut expected = Vec::new();
+        expected.extend_from_slice(b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xffchal");
+        expected.extend_from_slice(challenge_secret.as_bytes());
+        expected.push(0);
+        expected
+    };
+
+    let mut buf = [0; 65536];
+    let deadline = Instant::now() + Duration::from_secs(3);
+    udp.set_read_timeout(Some(Duration::from_secs(3)))
+        .context("UdpSocket::set_read_timeout")?;
+    loop {
+        let (read, from) = udp
+            .recv_from(&mut buf)
+            .context("couldn't receive ping from mastersrv in time")?;
+        let message = &buf[..read];
+        if message.starts_with(&expected_msg_prefix) {
+            println!("{}", from);
+            break;
+        }
+        let mut duration = deadline
+            .checked_duration_since(Instant::now())
+            .unwrap_or_default();
+        if duration == Duration::ZERO {
+            duration = Duration::from_nanos(1);
+        }
+        udp.set_read_timeout(Some(duration))
+            .context("UdpSocket::set_read_timeout")?;
+    }
+
+    Ok(())
+}
diff --git a/src_bkp/rust-bridge/.clang-tidy b/src_bkp/rust-bridge/.clang-tidy
new file mode 100644
index 0000000000..d550bc98a4
--- /dev/null
+++ b/src_bkp/rust-bridge/.clang-tidy
@@ -0,0 +1,3 @@
+# Need at least one check, otherwise clang-tidy fails, use one that can't
+# happen in our code since we don't use OpenMP API.
+Checks: '-*,openmp-exception-escape'
diff --git a/src_bkp/rust-bridge/cpp/console.cpp b/src_bkp/rust-bridge/cpp/console.cpp
new file mode 100644
index 0000000000..f4eeaac143
--- /dev/null
+++ b/src_bkp/rust-bridge/cpp/console.cpp
@@ -0,0 +1,203 @@
+#include "engine/console.h"
+#include "base/rust.h"
+#include "engine/rust.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <new>
+#include <type_traits>
+#include <utility>
+
+namespace rust {
+inline namespace cxxbridge1 {
+// #include "rust/cxx.h"
+
+#ifndef CXXBRIDGE1_IS_COMPLETE
+#define CXXBRIDGE1_IS_COMPLETE
+namespace detail {
+namespace {
+template<typename T, typename = std::size_t>
+struct is_complete : std::false_type
+{
+};
+template<typename T>
+struct is_complete<T, decltype(sizeof(T))> : std::true_type
+{
+};
+} // namespace
+} // namespace detail
+#endif // CXXBRIDGE1_IS_COMPLETE
+
+#ifndef CXXBRIDGE1_RELOCATABLE
+#define CXXBRIDGE1_RELOCATABLE
+namespace detail {
+template<typename... Ts>
+struct make_void
+{
+	using type = void;
+};
+
+template<typename... Ts>
+using void_t = typename make_void<Ts...>::type;
+
+template<typename Void, template<typename...> class, typename...>
+struct detect : std::false_type
+{
+};
+template<template<typename...> class T, typename... A>
+struct detect<void_t<T<A...>>, T, A...> : std::true_type
+{
+};
+
+template<template<typename...> class T, typename... A>
+using is_detected = detect<void, T, A...>;
+
+template<typename T>
+using detect_IsRelocatable = typename T::IsRelocatable;
+
+template<typename T>
+struct get_IsRelocatable
+	: std::is_same<typename T::IsRelocatable, std::true_type>
+{
+};
+} // namespace detail
+
+template<typename T>
+struct IsRelocatable
+	: std::conditional<
+		  detail::is_detected<detail::detect_IsRelocatable, T>::value,
+		  detail::get_IsRelocatable<T>,
+		  std::integral_constant<
+			  bool, std::is_trivially_move_constructible<T>::value &&
+					std::is_trivially_destructible<T>::value>>::type
+{
+};
+#endif // CXXBRIDGE1_RELOCATABLE
+
+namespace {
+template<bool>
+struct deleter_if
+{
+	template<typename T>
+	void operator()(T *)
+	{
+	}
+};
+
+template<>
+struct deleter_if<true>
+{
+	template<typename T>
+	void operator()(T *ptr)
+	{
+		ptr->~T();
+	}
+};
+} // namespace
+} // namespace cxxbridge1
+} // namespace rust
+
+using IConsole_IResult = ::IConsole_IResult;
+using IConsole = ::IConsole;
+
+static_assert(
+	::rust::IsRelocatable<::ColorRGBA>::value,
+	"type ColorRGBA should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Print` in Rust");
+static_assert(
+	::rust::IsRelocatable<::ColorHSLA>::value,
+	"type ColorHSLA should be trivially move constructible and trivially destructible in C++ to be used as a return value of `GetColor` in Rust");
+static_assert(
+	::rust::IsRelocatable<::StrRef>::value,
+	"type StrRef should be trivially move constructible and trivially destructible in C++ to be used as an argument of `ExecuteLine`, `Print`, `Register` or return value of `GetString` in Rust");
+static_assert(
+	::rust::IsRelocatable<::UserPtr>::value,
+	"type UserPtr should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
+static_assert(
+	::rust::IsRelocatable<::IConsole_FCommandCallback>::value,
+	"type IConsole_FCommandCallback should be trivially move constructible and trivially destructible in C++ to be used as an argument of `Register` in Rust");
+
+extern "C" {
+::std::int32_t cxxbridge1$IConsole_IResult$GetInteger(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept
+{
+	::std::int32_t (::IConsole_IResult::*GetInteger$)(::std::uint32_t) const = &::IConsole_IResult::GetInteger;
+	return (self.*GetInteger$)(Index);
+}
+
+float cxxbridge1$IConsole_IResult$GetFloat(const ::IConsole_IResult &self, ::std::uint32_t Index) noexcept
+{
+	float (::IConsole_IResult::*GetFloat$)(::std::uint32_t) const = &::IConsole_IResult::GetFloat;
+	return (self.*GetFloat$)(Index);
+}
+
+void cxxbridge1$IConsole_IResult$GetString(const ::IConsole_IResult &self, ::std::uint32_t Index, ::StrRef *return$) noexcept
+{
+	::StrRef (::IConsole_IResult::*GetString$)(::std::uint32_t) const = &::IConsole_IResult::GetString;
+	new(return$)::StrRef((self.*GetString$)(Index));
+}
+
+void cxxbridge1$IConsole_IResult$GetColor(const ::IConsole_IResult &self, ::std::uint32_t Index, bool Light, ::ColorHSLA *return$) noexcept
+{
+	::ColorHSLA (::IConsole_IResult::*GetColor$)(::std::uint32_t, bool) const = &::IConsole_IResult::GetColor;
+	new(return$)::ColorHSLA((self.*GetColor$)(Index, Light));
+}
+
+::std::int32_t cxxbridge1$IConsole_IResult$NumArguments(const ::IConsole_IResult &self) noexcept
+{
+	::std::int32_t (::IConsole_IResult::*NumArguments$)() const = &::IConsole_IResult::NumArguments;
+	return (self.*NumArguments$)();
+}
+
+::std::int32_t cxxbridge1$IConsole_IResult$GetVictim(const ::IConsole_IResult &self) noexcept
+{
+	::std::int32_t (::IConsole_IResult::*GetVictim$)() const = &::IConsole_IResult::GetVictim;
+	return (self.*GetVictim$)();
+}
+
+void cxxbridge1$IConsole$ExecuteLine(::IConsole &self, ::StrRef *pStr, ::std::int32_t ClientID, bool InterpretSemicolons) noexcept
+{
+	void (::IConsole::*ExecuteLine$)(::StrRef, ::std::int32_t, bool) = &::IConsole::ExecuteLine;
+	(self.*ExecuteLine$)(::std::move(*pStr), ClientID, InterpretSemicolons);
+}
+
+void cxxbridge1$IConsole$Print(const ::IConsole &self, ::std::int32_t Level, ::StrRef *pFrom, ::StrRef *pStr, ::ColorRGBA *PrintColor) noexcept
+{
+	void (::IConsole::*Print$)(::std::int32_t, ::StrRef, ::StrRef, ::ColorRGBA) const = &::IConsole::Print;
+	(self.*Print$)(Level, ::std::move(*pFrom), ::std::move(*pStr), ::std::move(*PrintColor));
+}
+
+void cxxbridge1$IConsole$Register(::IConsole &self, ::StrRef *pName, ::StrRef *pParams, ::std::int32_t Flags, ::IConsole_FCommandCallback *pfnFunc, ::UserPtr *pUser, ::StrRef *pHelp) noexcept
+{
+	void (::IConsole::*Register$)(::StrRef, ::StrRef, ::std::int32_t, ::IConsole_FCommandCallback, ::UserPtr, ::StrRef) = &::IConsole::Register;
+	(self.*Register$)(::std::move(*pName), ::std::move(*pParams), Flags, ::std::move(*pfnFunc), ::std::move(*pUser), ::std::move(*pHelp));
+}
+
+::IConsole *cxxbridge1$CreateConsole(::std::int32_t FlagMask) noexcept
+{
+	::std::unique_ptr<::IConsole> (*CreateConsole$)(::std::int32_t) = ::CreateConsole;
+	return CreateConsole$(FlagMask).release();
+}
+
+static_assert(::rust::detail::is_complete<::IConsole>::value, "definition of IConsole is required");
+static_assert(sizeof(::std::unique_ptr<::IConsole>) == sizeof(void *), "");
+static_assert(alignof(::std::unique_ptr<::IConsole>) == alignof(void *), "");
+void cxxbridge1$unique_ptr$IConsole$null(::std::unique_ptr<::IConsole> *ptr) noexcept
+{
+	::new(ptr)::std::unique_ptr<::IConsole>();
+}
+void cxxbridge1$unique_ptr$IConsole$raw(::std::unique_ptr<::IConsole> *ptr, ::IConsole *raw) noexcept
+{
+	::new(ptr)::std::unique_ptr<::IConsole>(raw);
+}
+const ::IConsole *cxxbridge1$unique_ptr$IConsole$get(const ::std::unique_ptr<::IConsole> &ptr) noexcept
+{
+	return ptr.get();
+}
+::IConsole *cxxbridge1$unique_ptr$IConsole$release(::std::unique_ptr<::IConsole> &ptr) noexcept
+{
+	return ptr.release();
+}
+void cxxbridge1$unique_ptr$IConsole$drop(::std::unique_ptr<::IConsole> *ptr) noexcept
+{
+	::rust::deleter_if<::rust::detail::is_complete<::IConsole>::value>{}(ptr);
+}
+} // extern "C"
diff --git a/src_bkp/rust-bridge/cpp/console.h b/src_bkp/rust-bridge/cpp/console.h
new file mode 100644
index 0000000000..5d20e4b575
--- /dev/null
+++ b/src_bkp/rust-bridge/cpp/console.h
@@ -0,0 +1,9 @@
+#pragma once
+#include "base/rust.h"
+#include "engine/console.h"
+#include "engine/rust.h"
+#include <cstdint>
+#include <memory>
+
+using IConsole_IResult = ::IConsole_IResult;
+using IConsole = ::IConsole;
diff --git a/src_bkp/rust-bridge/engine/shared/rust_version.cpp b/src_bkp/rust-bridge/engine/shared/rust_version.cpp
new file mode 100644
index 0000000000..dd12f64d48
--- /dev/null
+++ b/src_bkp/rust-bridge/engine/shared/rust_version.cpp
@@ -0,0 +1,18 @@
+#include "base/rust.h"
+#include "engine/console.h"
+
+extern "C" {
+void cxxbridge1$RustVersionPrint(const ::IConsole &console) noexcept;
+
+void cxxbridge1$RustVersionRegister(::IConsole &console) noexcept;
+} // extern "C"
+
+void RustVersionPrint(const ::IConsole &console) noexcept
+{
+	cxxbridge1$RustVersionPrint(console);
+}
+
+void RustVersionRegister(::IConsole &console) noexcept
+{
+	cxxbridge1$RustVersionRegister(console);
+}
diff --git a/src_bkp/rust-bridge/engine/shared/rust_version.h b/src_bkp/rust-bridge/engine/shared/rust_version.h
new file mode 100644
index 0000000000..461987123c
--- /dev/null
+++ b/src_bkp/rust-bridge/engine/shared/rust_version.h
@@ -0,0 +1,7 @@
+#pragma once
+#include "base/rust.h"
+#include "engine/console.h"
+
+void RustVersionPrint(const ::IConsole &console) noexcept;
+
+void RustVersionRegister(::IConsole &console) noexcept;
diff --git a/src_bkp/rust-bridge/test/Cargo.toml b/src_bkp/rust-bridge/test/Cargo.toml
new file mode 100644
index 0000000000..8909e584a5
--- /dev/null
+++ b/src_bkp/rust-bridge/test/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "ddnet-test"
+version = "0.0.1"
+edition = "2018"
+publish = false
+license = "Zlib"
+
+[lib]
+path = "lib.rs"
+
+[features]
+link-test-libraries = []
diff --git a/src_bkp/rust-bridge/test/build.rs b/src_bkp/rust-bridge/test/build.rs
new file mode 100644
index 0000000000..bdb269929e
--- /dev/null
+++ b/src_bkp/rust-bridge/test/build.rs
@@ -0,0 +1,69 @@
+use std::collections::HashSet;
+use std::env;
+use std::ffi::OsStr;
+use std::path::Path;
+use std::process::Command;
+
+fn main() {
+    let rustc = env::var_os("RUSTC").expect("RUSTC");
+    let rustc_output = Command::new(rustc)
+        .arg("--version")
+        .output()
+        .expect("rustc --version");
+    if !rustc_output.status.success() {
+        panic!("rustc --version: exit status {}", rustc_output.status);
+    }
+    let rustc_version = &rustc_output.stdout[..];
+    let supports_whole_archive =
+        !rustc_version.starts_with(b"rustc ") || rustc_version >= &b"rustc 1.61.0"[..];
+
+    println!("cargo:rerun-if-env-changed=DDNET_TEST_LIBRARIES");
+    println!("cargo:rerun-if-env-changed=DDNET_TEST_NO_LINK");
+    println!("cargo:rerun-if-env-changed=RA_RUSTC_WRAPPER");
+    if env::var_os("DDNET_TEST_NO_LINK").is_some() || env::var_os("RA_RUSTC_WRAPPER").is_some() {
+        return;
+    }
+    if env::var_os("CARGO_FEATURE_LINK_TEST_LIBRARIES").is_some() {
+        let libraries = env::var("DDNET_TEST_LIBRARIES")
+            .expect("environment variable DDNET_TEST_LIBRARIES required but not found");
+        let mut seen_library_dirs = HashSet::new();
+        for library in libraries.split(';') {
+            let library = Path::new(library);
+            let extension = library.extension().and_then(OsStr::to_str);
+            let kind = match extension {
+                Some("framework") => "framework=",
+                Some("so") => "dylib=",
+                Some("a") => {
+                    if supports_whole_archive {
+                        "static:-whole-archive="
+                    } else {
+                        ""
+                    }
+                }
+                _ => "",
+            };
+            let dir_kind = match extension {
+                Some("framework") => "framework=",
+                _ => "",
+            };
+            if let Some(parent) = library.parent() {
+                if parent != Path::new("") {
+                    let parent = parent.to_str().expect("should have errored earlier");
+                    if !seen_library_dirs.contains(&(dir_kind, parent)) {
+                        println!("cargo:rustc-link-search={}{}", dir_kind, parent);
+                        seen_library_dirs.insert((dir_kind, parent));
+                    }
+                }
+            }
+            let mut name = library
+                .file_stem()
+                .expect("library name")
+                .to_str()
+                .expect("should have errored earlier");
+            if name.starts_with("lib") {
+                name = &name[3..];
+            }
+            println!("cargo:rustc-link-lib={}{}", kind, name);
+        }
+    }
+}
diff --git a/src_bkp/rust-bridge/test/lib.rs b/src_bkp/rust-bridge/test/lib.rs
new file mode 100644
index 0000000000..4c2d799fa1
--- /dev/null
+++ b/src_bkp/rust-bridge/test/lib.rs
@@ -0,0 +1,10 @@
+//! Helper module to link the C++ code of DDNet for Rust unit tests.
+//!
+//! Use the global `run_rust_tests` target from CMakeLists.txt to actually run
+//! the Rust test; this sets compiles the C++ and sets `DDNET_TEST_LIBRARIES`
+//! appropriately, e.g. using `cmake --build build --target run_rust_tests`.
+//!
+//! To call `cargo doc`, set `DDNET_TEST_NO_LINK=1` so that this crate becomes a
+//! stub.
+
+#![warn(missing_docs)]
diff --git a/src_bkp/steam/steam_api_flat.h b/src_bkp/steam/steam_api_flat.h
new file mode 100644
index 0000000000..80197f3eaa
--- /dev/null
+++ b/src_bkp/steam/steam_api_flat.h
@@ -0,0 +1,67 @@
+#ifndef STEAM_STEAM_API_FLAT_H
+#define STEAM_STEAM_API_FLAT_H
+
+#include <base/dynamic.h>
+
+#include <cstdint>
+
+#ifndef STEAMAPI
+#define STEAMAPI DYNAMIC_IMPORT
+#endif
+
+extern "C" {
+
+typedef uint64_t CSteamID;
+typedef int32_t HSteamPipe;
+typedef int32_t HSteamUser;
+
+struct CallbackMsg_t
+{
+	HSteamUser m_hSteamUser;
+	int m_iCallback;
+	unsigned char *m_pubParam;
+	int m_cubParam;
+};
+
+struct GameRichPresenceJoinRequested_t
+{
+	enum
+	{
+		k_iCallback = 337
+	};
+	CSteamID m_steamIDFriend;
+	char m_aRGCHConnect[256];
+};
+
+struct NewUrlLaunchParameters_t
+{
+	enum
+	{
+		k_iCallback = 1014
+	};
+	unsigned char m_EmptyStructDontUse;
+};
+
+struct ISteamApps;
+struct ISteamFriends;
+
+STEAMAPI bool SteamAPI_Init(); // Returns true on success.
+STEAMAPI HSteamPipe SteamAPI_GetHSteamPipe();
+STEAMAPI void SteamAPI_Shutdown();
+
+STEAMAPI void SteamAPI_ManualDispatch_Init();
+STEAMAPI void SteamAPI_ManualDispatch_FreeLastCallback(HSteamPipe SteamPipe);
+STEAMAPI bool SteamAPI_ManualDispatch_GetNextCallback(HSteamPipe SteamPipe, CallbackMsg_t *pCallbackMsg);
+STEAMAPI void SteamAPI_ManualDispatch_RunFrame(HSteamPipe SteamPipe);
+
+STEAMAPI ISteamApps *SteamAPI_SteamApps_v008();
+STEAMAPI int SteamAPI_ISteamApps_GetLaunchCommandLine(ISteamApps *pSelf, char *pBuffer, int BufferSize);
+STEAMAPI const char *SteamAPI_ISteamApps_GetLaunchQueryParam(ISteamApps *pSelf, const char *pKey);
+
+STEAMAPI ISteamFriends *SteamAPI_SteamFriends_v017();
+STEAMAPI void SteamAPI_ISteamFriends_ClearRichPresence(ISteamFriends *pSelf);
+STEAMAPI const char *SteamAPI_ISteamFriends_GetPersonaName(ISteamFriends *pSelf);
+STEAMAPI bool SteamAPI_ISteamFriends_SetRichPresence(ISteamFriends *pSelf, const char *pKey, const char *pValue);
+}
+
+#endif // STEAM_STEAM_API_FLAT_H
diff --git a/src_bkp/steam/steam_api_stub.cpp b/src_bkp/steam/steam_api_stub.cpp
new file mode 100644
index 0000000000..7d9c845c3b
--- /dev/null
+++ b/src_bkp/steam/steam_api_stub.cpp
@@ -0,0 +1,23 @@
+#define STEAMAPI DYNAMIC_EXPORT
+
+#include <steam/steam_api_flat.h>
+
+#include <cstdlib>
+
+extern "C" {
+
+bool SteamAPI_Init() { return false; }
+HSteamPipe SteamAPI_GetHSteamPipe() { abort(); }
+void SteamAPI_Shutdown() { abort(); }
+void SteamAPI_ManualDispatch_Init() { abort(); }
+void SteamAPI_ManualDispatch_FreeLastCallback(HSteamPipe SteamPipe) { abort(); }
+bool SteamAPI_ManualDispatch_GetNextCallback(HSteamPipe SteamPipe, CallbackMsg_t *pCallbackMsg) { abort(); }
+void SteamAPI_ManualDispatch_RunFrame(HSteamPipe SteamPipe) { abort(); }
+ISteamApps *SteamAPI_SteamApps_v008() { abort(); }
+int SteamAPI_ISteamApps_GetLaunchCommandLine(ISteamApps *pSelf, char *pBuffer, int BufferSize) { abort(); }
+const char *SteamAPI_ISteamApps_GetLaunchQueryParam(ISteamApps *pSelf, const char *pKey) { abort(); }
+ISteamFriends *SteamAPI_SteamFriends_v017() { abort(); }
+const char *SteamAPI_ISteamFriends_GetPersonaName(ISteamFriends *pSelf) { abort(); }
+bool SteamAPI_ISteamFriends_SetRichPresence(ISteamFriends *pSelf, const char *pKey, const char *pValue) { abort(); }
+void SteamAPI_ISteamFriends_ClearRichPresence(ISteamFriends *pSelf) { abort(); }
+}
diff --git a/src_bkp/test/aio.cpp b/src_bkp/test/aio.cpp
new file mode 100644
index 0000000000..680f81ad65
--- /dev/null
+++ b/src_bkp/test/aio.cpp
@@ -0,0 +1,146 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+static const int BUF_SIZE = 64 * 1024;
+
+class Async : public ::testing::Test
+{
+protected:
+	ASYNCIO *m_pAio;
+	CTestInfo m_Info;
+	bool Delete;
+
+	void SetUp() override
+	{
+		IOHANDLE File = io_open(m_Info.m_aFilename, IOFLAG_WRITE);
+		ASSERT_TRUE(File);
+		m_pAio = aio_new(File);
+		Delete = false;
+	}
+
+	~Async()
+	{
+		if(Delete)
+		{
+			fs_remove(m_Info.m_aFilename);
+		}
+	}
+
+	void Write(const char *pText)
+	{
+		aio_write(m_pAio, pText, str_length(pText));
+	}
+
+	void Expect(const char *pOutput)
+	{
+		aio_close(m_pAio);
+		aio_wait(m_pAio);
+		aio_free(m_pAio);
+
+		char aBuf[BUF_SIZE];
+		IOHANDLE File = io_open(m_Info.m_aFilename, IOFLAG_READ);
+		ASSERT_TRUE(File);
+		int Read = io_read(File, aBuf, sizeof(aBuf));
+		io_close(File);
+
+		ASSERT_EQ(str_length(pOutput), Read);
+		ASSERT_TRUE(mem_comp(aBuf, pOutput, Read) == 0);
+		Delete = true;
+	}
+};
+
+TEST_F(Async, Empty)
+{
+	Expect("");
+}
+
+TEST_F(Async, Simple)
+{
+	static const char TEXT[] = "a\n";
+	Write(TEXT);
+	Expect(TEXT);
+}
+
+TEST_F(Async, Long)
+{
+	char aText[BUF_SIZE + 1];
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		aText[i] = 'a';
+	}
+	aText[sizeof(aText) - 1] = 0;
+	Write(aText);
+	Expect(aText);
+}
+
+TEST_F(Async, Pieces)
+{
+	char aText[BUF_SIZE + 1];
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		aText[i] = 'a';
+	}
+	aText[sizeof(aText) - 1] = 0;
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		Write("a");
+	}
+	Expect(aText);
+}
+
+TEST_F(Async, Mixed)
+{
+	char aText[BUF_SIZE + 1];
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		aText[i] = 'a' + i % 26;
+	}
+	aText[sizeof(aText) - 1] = 0;
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		char w = 'a' + i % 26;
+		aio_write(m_pAio, &w, 1);
+	}
+	Expect(aText);
+}
+
+TEST_F(Async, NonDivisor)
+{
+	static const int NUM_LETTERS = 13;
+	static const int SIZE = BUF_SIZE / NUM_LETTERS * NUM_LETTERS;
+	char aText[SIZE + 1];
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		aText[i] = 'a' + i % NUM_LETTERS;
+	}
+	aText[sizeof(aText) - 1] = 0;
+	for(unsigned i = 0; i < (sizeof(aText) - 1) / NUM_LETTERS; i++)
+	{
+		Write("abcdefghijklm");
+	}
+	Expect(aText);
+}
+
+TEST_F(Async, Transaction)
+{
+	static const int NUM_LETTERS = 13;
+	static const int SIZE = BUF_SIZE / NUM_LETTERS * NUM_LETTERS;
+	char aText[SIZE + 1];
+	for(unsigned i = 0; i < sizeof(aText) - 1; i++)
+	{
+		aText[i] = 'a' + i % NUM_LETTERS;
+	}
+	aText[sizeof(aText) - 1] = 0;
+	for(unsigned i = 0; i < (sizeof(aText) - 1) / NUM_LETTERS; i++)
+	{
+		aio_lock(m_pAio);
+		for(char c = 'a'; c < 'a' + NUM_LETTERS; c++)
+		{
+			aio_write_unlocked(m_pAio, &c, 1);
+		}
+		aio_unlock(m_pAio);
+	}
+	Expect(aText);
+}
diff --git a/src_bkp/test/bezier.cpp b/src_bkp/test/bezier.cpp
new file mode 100644
index 0000000000..e0f2d34170
--- /dev/null
+++ b/src_bkp/test/bezier.cpp
@@ -0,0 +1,46 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/bezier.h>
+
+// Due to the implementation, derivatives must be divisible by 3 to be exactly
+// represented.
+
+TEST(Bezier, Constant)
+{
+	CCubicBezier Zero = CCubicBezier::With(0.0f, 0.0f, 0.0f, 0.0f);
+	ASSERT_EQ(Zero.Evaluate(0.0f), 0.0f);
+	ASSERT_EQ(Zero.Evaluate(0.3f), 0.0f);
+	ASSERT_EQ(Zero.Evaluate(1.0f), 0.0f);
+	ASSERT_EQ(Zero.Derivative(0.0f), 0.0f);
+	ASSERT_EQ(Zero.Derivative(0.3f), 0.0f);
+	ASSERT_EQ(Zero.Derivative(1.0f), 0.0f);
+
+	CCubicBezier Five = CCubicBezier::With(5.0f, 0.0f, 0.0f, 5.0f);
+	ASSERT_EQ(Five.Evaluate(0.0f), 5.0f);
+	ASSERT_EQ(Five.Evaluate(0.3f), 5.0f);
+	ASSERT_EQ(Five.Evaluate(1.0f), 5.0f);
+	ASSERT_EQ(Five.Derivative(0.0f), 0.0f);
+	ASSERT_EQ(Five.Derivative(0.3f), 0.0f);
+	ASSERT_EQ(Five.Derivative(1.0f), 0.0f);
+}
+
+TEST(Bezier, Linear)
+{
+	CCubicBezier TripleSlope = CCubicBezier::With(4.0f, 3.0f, 3.0f, 7.0f);
+	ASSERT_EQ(TripleSlope.Evaluate(0.0f), 4.0f);
+	ASSERT_EQ(TripleSlope.Evaluate(0.3f), 4.9f);
+	ASSERT_EQ(TripleSlope.Evaluate(1.0f), 7.0f);
+	ASSERT_EQ(TripleSlope.Derivative(0.0f), 3.0f);
+	ASSERT_EQ(TripleSlope.Derivative(0.3f), 3.0f);
+	ASSERT_EQ(TripleSlope.Derivative(1.0f), 3.0f);
+}
+
+TEST(Bezier, Arbitrary)
+{
+	CCubicBezier Something = CCubicBezier::With(4.9f, 1.5f, -4.5f, 1.0f);
+	ASSERT_EQ(Something.Evaluate(0.0f), 4.9f);
+	ASSERT_EQ(Something.Evaluate(1.0f), 1.0f);
+	ASSERT_EQ(Something.Derivative(0.0f), 1.5f);
+	ASSERT_EQ(Something.Derivative(1.0f), -4.5f);
+}
diff --git a/src_bkp/test/blocklist_driver.cpp b/src_bkp/test/blocklist_driver.cpp
new file mode 100644
index 0000000000..da3199fb52
--- /dev/null
+++ b/src_bkp/test/blocklist_driver.cpp
@@ -0,0 +1,54 @@
+#include <gtest/gtest.h>
+
+#include <base/detect.h>
+
+#include <engine/client/blocklist_driver.h>
+
+TEST(BlocklistDriver, Valid1)
+{
+#ifdef CONF_FAMILY_WINDOWS
+	int Major = -1, Minor = -1, Patch = -1;
+	bool WarningReq = false;
+	EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7810", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
+	EXPECT_EQ(Major, 2);
+	EXPECT_EQ(Minor, 0);
+	EXPECT_EQ(Patch, 0);
+#endif
+}
+
+TEST(BlocklistDriver, Valid2)
+{
+#ifdef CONF_FAMILY_WINDOWS
+	int Major = -1, Minor = -1, Patch = -1;
+	bool WarningReq = false;
+	EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7926", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
+	EXPECT_EQ(Major, 2);
+	EXPECT_EQ(Minor, 0);
+	EXPECT_EQ(Patch, 0);
+#endif
+}
+
+TEST(BlocklistDriver, Valid3)
+{
+#ifdef CONF_FAMILY_WINDOWS
+	int Major = -1, Minor = -1, Patch = -1;
+	bool WarningReq = false;
+	EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7985", Major, Minor, Patch, WarningReq), "This Intel driver version can cause crashes, please update it to a newer version.");
+	EXPECT_EQ(Major, 2);
+	EXPECT_EQ(Minor, 0);
+	EXPECT_EQ(Patch, 0);
+#endif
+}
+
+TEST(BlocklistDriver, Invalid)
+{
+	int Major, Minor, Patch;
+	bool WarningReq = false;
+#ifdef CONF_FAMILY_WINDOWS
+	EXPECT_STREQ(ParseBlocklistDriverVersions("AMD", "Build 25.20.100.7810", Major, Minor, Patch, WarningReq), NULL);
+	EXPECT_STREQ(ParseBlocklistDriverVersions("NVIDIA", "Build 26.20.100.7799", Major, Minor, Patch, WarningReq), NULL);
+#else
+	EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7985", Major, Minor, Patch, WarningReq), NULL);
+	EXPECT_STREQ(ParseBlocklistDriverVersions("Intel", "Build 26.20.100.7799", Major, Minor, Patch, WarningReq), NULL);
+#endif
+}
diff --git a/src_bkp/test/bytes_be.cpp b/src_bkp/test/bytes_be.cpp
new file mode 100644
index 0000000000..5922b6bee6
--- /dev/null
+++ b/src_bkp/test/bytes_be.cpp
@@ -0,0 +1,28 @@
+#include "test.h"
+
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+static const int32_t INT_DATA[] = {0, 1, -1, 32, 64, 256, -512, 12345, -123456, 1234567, 12345678, 123456789, 2147483647, (-2147483647 - 1)};
+static const uint32_t UINT_DATA[] = {0u, 1u, 2u, 32u, 64u, 256u, 512u, 12345u, 123456u, 1234567u, 12345678u, 123456789u, 2147483647u, 2147483648u, 4294967295u};
+
+TEST(BytePacking, RoundtripInt)
+{
+	for(auto i : INT_DATA)
+	{
+		unsigned char aPacked[sizeof(int32_t)];
+		uint_to_bytes_be(aPacked, i);
+		EXPECT_EQ(bytes_be_to_uint(aPacked), i);
+	}
+}
+
+TEST(BytePacking, RoundtripUnsigned)
+{
+	for(auto u : UINT_DATA)
+	{
+		unsigned char aPacked[sizeof(uint32_t)];
+		uint_to_bytes_be(aPacked, u);
+		EXPECT_EQ(bytes_be_to_uint(aPacked), u);
+	}
+}
diff --git a/src_bkp/test/color.cpp b/src_bkp/test/color.cpp
new file mode 100644
index 0000000000..1449065232
--- /dev/null
+++ b/src_bkp/test/color.cpp
@@ -0,0 +1,41 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/color.h>
+
+TEST(Color, HRHConv)
+{
+	for(int i = 0; i < 0xFFFFFF; i += 0xFF)
+	{
+		ColorHSLA hsl = i;
+		ColorRGBA rgb = color_cast<ColorRGBA>(hsl);
+		ColorHSLA hsl2 = color_cast<ColorHSLA>(rgb);
+
+		if(hsl.s == 0.0f || hsl.s == 1.0f)
+			EXPECT_FLOAT_EQ(hsl.l, hsl2.l);
+		else if(hsl.l == 0.0f || hsl.l == 1.0f)
+			EXPECT_FLOAT_EQ(hsl.l, hsl2.l);
+		else
+		{
+			EXPECT_NEAR(std::fmod(hsl.h, 1.0f), std::fmod(hsl2.h, 1.0f), 0.001f);
+			EXPECT_NEAR(hsl.s, hsl2.s, 0.0001f);
+			EXPECT_FLOAT_EQ(hsl.l, hsl2.l);
+		}
+	}
+}
+
+// Any color_cast should keep the same alpha value
+TEST(Color, ConvKeepsAlpha)
+{
+	const int Max = 10;
+	for(int i = 0; i <= Max; i++)
+	{
+		const float Alpha = i / (float)Max;
+		EXPECT_FLOAT_EQ(color_cast<ColorRGBA>(ColorHSLA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+		EXPECT_FLOAT_EQ(color_cast<ColorRGBA>(ColorHSVA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+		EXPECT_FLOAT_EQ(color_cast<ColorHSLA>(ColorRGBA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+		EXPECT_FLOAT_EQ(color_cast<ColorHSLA>(ColorHSVA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+		EXPECT_FLOAT_EQ(color_cast<ColorHSVA>(ColorRGBA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+		EXPECT_FLOAT_EQ(color_cast<ColorHSVA>(ColorHSLA(0.1f, 0.2f, 0.3f, Alpha)).a, Alpha);
+	}
+}
diff --git a/src_bkp/test/compression.cpp b/src_bkp/test/compression.cpp
new file mode 100644
index 0000000000..8c6dd344de
--- /dev/null
+++ b/src_bkp/test/compression.cpp
@@ -0,0 +1,84 @@
+#include <gtest/gtest.h>
+
+#include <engine/shared/compression.h>
+
+static const int DATA[] = {0, 1, -1, 32, 64, 256, -512, 12345, -123456, 1234567, 12345678, 123456789, 2147483647, (-2147483647 - 1)};
+static const int NUM = std::size(DATA);
+static const int SIZES[NUM] = {1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5};
+
+TEST(CVariableInt, RoundtripPackUnpack)
+{
+	for(int i = 0; i < NUM; i++)
+	{
+		unsigned char aPacked[CVariableInt::MAX_BYTES_PACKED];
+		int Result;
+		EXPECT_EQ(CVariableInt::Pack(aPacked, DATA[i], sizeof(aPacked)) - aPacked, (ptrdiff_t)SIZES[i]);
+		EXPECT_EQ(CVariableInt::Unpack(aPacked, &Result, sizeof(aPacked)) - aPacked, (ptrdiff_t)SIZES[i]);
+		EXPECT_EQ(Result, DATA[i]);
+	}
+}
+
+TEST(CVariableInt, UnpackInvalid)
+{
+	unsigned char aPacked[CVariableInt::MAX_BYTES_PACKED];
+	for(auto &Byte : aPacked)
+		Byte = 0xFF;
+
+	int Result;
+	EXPECT_EQ(CVariableInt::Unpack(aPacked, &Result, sizeof(aPacked)) - aPacked, (ptrdiff_t)CVariableInt::MAX_BYTES_PACKED);
+	EXPECT_EQ(Result, (-2147483647 - 1));
+
+	aPacked[0] &= ~0x40; // unset sign bit
+
+	EXPECT_EQ(CVariableInt::Unpack(aPacked, &Result, sizeof(aPacked)) - aPacked, (ptrdiff_t)CVariableInt::MAX_BYTES_PACKED);
+	EXPECT_EQ(Result, 2147483647);
+}
+
+TEST(CVariableInt, PackBufferTooSmall)
+{
+	unsigned char aPacked[CVariableInt::MAX_BYTES_PACKED / 2]; // too small
+	EXPECT_EQ(CVariableInt::Pack(aPacked, 2147483647, sizeof(aPacked)), (const unsigned char *)0x0);
+}
+
+TEST(CVariableInt, UnpackBufferTooSmall)
+{
+	unsigned char aPacked[CVariableInt::MAX_BYTES_PACKED / 2];
+	for(auto &Byte : aPacked)
+		Byte = 0xFF; // extended bits are set, but buffer ends too early
+
+	int UnusedResult;
+	EXPECT_EQ(CVariableInt::Unpack(aPacked, &UnusedResult, sizeof(aPacked)), (const unsigned char *)0x0);
+}
+
+TEST(CVariableInt, RoundtripCompressDecompress)
+{
+	unsigned char aCompressed[NUM * CVariableInt::MAX_BYTES_PACKED];
+	int aDecompressed[NUM];
+	long ExpectedCompressedSize = 0;
+	for(auto Size : SIZES)
+		ExpectedCompressedSize += Size;
+
+	long CompressedSize = CVariableInt::Compress(DATA, sizeof(DATA), aCompressed, sizeof(aCompressed));
+	ASSERT_EQ(CompressedSize, ExpectedCompressedSize);
+	long DecompressedSize = CVariableInt::Decompress(aCompressed, ExpectedCompressedSize, aDecompressed, sizeof(aDecompressed));
+	ASSERT_EQ(DecompressedSize, sizeof(DATA));
+	for(int i = 0; i < NUM; i++)
+	{
+		EXPECT_EQ(aDecompressed[i], DATA[i]);
+	}
+}
+
+TEST(CVariableInt, CompressBufferTooSmall)
+{
+	unsigned char aCompressed[NUM]; // too small
+	long CompressedSize = CVariableInt::Compress(DATA, sizeof(DATA), aCompressed, sizeof(aCompressed));
+	ASSERT_EQ(CompressedSize, -1);
+}
+
+TEST(CVariableInt, DecompressBufferTooSmall)
+{
+	unsigned char aCompressed[] = {0x00, 0x01, 0x40, 0x20, 0x80, 0x01, 0x80, 0x04, 0xFF, 0x07, 0xB9, 0xC0, 0x01};
+	int aUncompressed[4]; // too small
+	long CompressedSize = CVariableInt::Decompress(aCompressed, sizeof(aCompressed), aUncompressed, sizeof(aUncompressed));
+	ASSERT_EQ(CompressedSize, -1);
+}
diff --git a/src_bkp/test/csv.cpp b/src_bkp/test/csv.cpp
new file mode 100644
index 0000000000..2022f98ca2
--- /dev/null
+++ b/src_bkp/test/csv.cpp
@@ -0,0 +1,66 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/csv.h>
+
+static void Expect(int NumColumns, const char *const *ppColumns, const char *pExpected)
+{
+	CTestInfo Info;
+
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	CsvWrite(File, NumColumns, ppColumns);
+	io_close(File);
+
+	char aBuf[1024];
+	File = io_open(Info.m_aFilename, IOFLAG_READ);
+	ASSERT_TRUE(File);
+	int Read = io_read(File, aBuf, sizeof(aBuf));
+	io_close(File);
+	fs_remove(Info.m_aFilename);
+
+	ASSERT_TRUE(Read >= 1);
+	Read -= 1;
+	ASSERT_EQ(aBuf[Read], '\n');
+	aBuf[Read] = 0;
+
+#if defined(CONF_FAMILY_WINDOWS)
+	ASSERT_TRUE(Read >= 1);
+	Read -= 1;
+	ASSERT_EQ(aBuf[Read], '\r');
+	aBuf[Read] = 0;
+#endif
+
+	for(int i = 0; i < Read; i++)
+	{
+		EXPECT_NE(aBuf[i], 0);
+	}
+	EXPECT_STREQ(aBuf, pExpected);
+}
+
+TEST(Csv, Simple)
+{
+	const char *apCols1[] = {"a", "b"};
+	Expect(2, apCols1, "a,b");
+	const char *apCols2[] = {"こんにちは"};
+	Expect(1, apCols2, "こんにちは");
+	const char *apCols3[] = {"я", "", "й"};
+	Expect(3, apCols3, "я,,й");
+	const char *apCols4[] = {""};
+	Expect(1, apCols4, "");
+	const char *apCols5[] = {0};
+	Expect(0, apCols5, "");
+}
+
+TEST(Csv, LetTheQuotingBegin)
+{
+	const char *apCols1[] = {"\""};
+	Expect(1, apCols1, "\"\"\"\"");
+	const char *apCols2[] = {","};
+	Expect(1, apCols2, "\",\"");
+	const char *apCols3[] = {",,", ",\"\"\""};
+	Expect(2, apCols3, "\",,\",\",\"\"\"\"\"\"\"");
+	const char *apCols4[] = {"\",", " "};
+	Expect(2, apCols4, "\"\"\",\", ");
+}
diff --git a/src_bkp/test/datafile.cpp b/src_bkp/test/datafile.cpp
new file mode 100644
index 0000000000..417ba65309
--- /dev/null
+++ b/src_bkp/test/datafile.cpp
@@ -0,0 +1,107 @@
+#include "test.h"
+#include <gtest/gtest.h>
+#include <memory>
+
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems_ex.h>
+
+TEST(Datafile, ExtendedType)
+{
+	auto pStorage = std::unique_ptr<IStorage>(CreateLocalStorage());
+	CTestInfo Info;
+
+	CMapItemTest ItemTest;
+	ItemTest.m_Version = CMapItemTest::CURRENT_VERSION;
+	ItemTest.m_aFields[0] = 1234;
+	ItemTest.m_aFields[1] = 5678;
+	ItemTest.m_Field3 = 9876;
+	ItemTest.m_Field4 = 5432;
+
+	{
+		CDataFileWriter Writer;
+		Writer.Open(pStorage.get(), Info.m_aFilename);
+
+		Writer.AddItem(MAPITEMTYPE_TEST, 0x8000, sizeof(ItemTest), &ItemTest);
+
+		Writer.Finish();
+	}
+
+	{
+		CDataFileReader Reader;
+		Reader.Open(pStorage.get(), Info.m_aFilename, IStorage::TYPE_ALL);
+
+		int Start, Num;
+		Reader.GetType(MAPITEMTYPE_TEST, &Start, &Num);
+		EXPECT_EQ(Num, 1);
+
+		int Index = Reader.FindItemIndex(MAPITEMTYPE_TEST, 0x8000);
+		EXPECT_EQ(Start, Index);
+		ASSERT_GE(Index, 0);
+		ASSERT_EQ(Reader.GetItemSize(Index), (int)sizeof(ItemTest));
+
+		int Type, ID;
+		const CMapItemTest *pTest = (const CMapItemTest *)Reader.GetItem(Index, &Type, &ID);
+		EXPECT_EQ(pTest, Reader.FindItem(MAPITEMTYPE_TEST, 0x8000));
+		EXPECT_EQ(Type, MAPITEMTYPE_TEST);
+		EXPECT_EQ(ID, 0x8000);
+
+		EXPECT_EQ(pTest->m_Version, ItemTest.m_Version);
+		EXPECT_EQ(pTest->m_aFields[0], ItemTest.m_aFields[0]);
+		EXPECT_EQ(pTest->m_aFields[1], ItemTest.m_aFields[1]);
+		EXPECT_EQ(pTest->m_Field3, ItemTest.m_Field3);
+		EXPECT_EQ(pTest->m_Field4, ItemTest.m_Field4);
+
+		Reader.Close();
+	}
+
+	if(!HasFailure())
+	{
+		pStorage->RemoveFile(Info.m_aFilename, IStorage::TYPE_SAVE);
+	}
+}
+
+TEST(Datafile, StringData)
+{
+	auto pStorage = std::unique_ptr<IStorage>(CreateLocalStorage());
+	CTestInfo Info;
+
+	{
+		CDataFileWriter Writer;
+		Writer.Open(pStorage.get(), Info.m_aFilename);
+
+		EXPECT_EQ(Writer.AddDataString(""), -1); // Empty string is not added
+		EXPECT_EQ(Writer.AddDataString("Abc"), 0);
+		EXPECT_EQ(Writer.AddDataString("DDNet最好了"), 1);
+		EXPECT_EQ(Writer.AddDataString("aβい🐘"), 2);
+		EXPECT_EQ(Writer.AddData(3, "Abc"), 3); // Not zero-terminated
+		EXPECT_EQ(Writer.AddData(7, "foo\0bar"), 4); // Early zero-terminator
+		EXPECT_EQ(Writer.AddData(5, "xyz\xff\0"), 5); // Truncated UTF-8
+		EXPECT_EQ(Writer.AddData(4, "XYZ\xff"), 6); // Truncated UTF-8 and not zero-terminated
+
+		Writer.Finish();
+	}
+
+	{
+		CDataFileReader Reader;
+		Reader.Open(pStorage.get(), Info.m_aFilename, IStorage::TYPE_ALL);
+
+		EXPECT_EQ(Reader.GetDataString(-1000), nullptr);
+		EXPECT_STREQ(Reader.GetDataString(-1), "");
+		EXPECT_STREQ(Reader.GetDataString(0), "Abc");
+		EXPECT_STREQ(Reader.GetDataString(1), "DDNet最好了");
+		EXPECT_STREQ(Reader.GetDataString(2), "aβい🐘");
+		EXPECT_EQ(Reader.GetDataString(3), nullptr);
+		EXPECT_EQ(Reader.GetDataString(4), nullptr);
+		EXPECT_EQ(Reader.GetDataString(5), nullptr);
+		EXPECT_EQ(Reader.GetDataString(6), nullptr);
+		EXPECT_EQ(Reader.GetDataString(1000), nullptr);
+
+		Reader.Close();
+	}
+
+	if(!HasFailure())
+	{
+		pStorage->RemoveFile(Info.m_aFilename, IStorage::TYPE_SAVE);
+	}
+}
diff --git a/src_bkp/test/fs.cpp b/src_bkp/test/fs.cpp
new file mode 100644
index 0000000000..806eac2f47
--- /dev/null
+++ b/src_bkp/test/fs.cpp
@@ -0,0 +1,95 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(Filesystem, Filename)
+{
+	EXPECT_STREQ(fs_filename(""), "");
+	EXPECT_STREQ(fs_filename("a"), "a");
+	EXPECT_STREQ(fs_filename("abc"), "abc");
+	EXPECT_STREQ(fs_filename("a/b"), "b");
+	EXPECT_STREQ(fs_filename("a/b/c"), "c");
+	EXPECT_STREQ(fs_filename("aaaaa/bbbb/ccc"), "ccc");
+	EXPECT_STREQ(fs_filename("aaaaa\\bbbb\\ccc"), "ccc");
+	EXPECT_STREQ(fs_filename("aaaaa/bbbb\\ccc"), "ccc");
+	EXPECT_STREQ(fs_filename("aaaaa\\bbbb/ccc"), "ccc");
+}
+
+TEST(Filesystem, SplitFileExtension)
+{
+	char aName[IO_MAX_PATH_LENGTH];
+	char aExt[IO_MAX_PATH_LENGTH];
+
+	fs_split_file_extension("", aName, sizeof(aName), aExt, sizeof(aExt));
+	EXPECT_STREQ(aName, "");
+	EXPECT_STREQ(aExt, "");
+
+	fs_split_file_extension("name.ext", aName, sizeof(aName), aExt, sizeof(aExt));
+	EXPECT_STREQ(aName, "name");
+	EXPECT_STREQ(aExt, "ext");
+
+	fs_split_file_extension("name.ext", aName, sizeof(aName)); // extension parameter is optional
+	EXPECT_STREQ(aName, "name");
+
+	fs_split_file_extension("name.ext", nullptr, 0, aExt, sizeof(aExt)); // name parameter is optional
+	EXPECT_STREQ(aExt, "ext");
+
+	fs_split_file_extension("archive.tar.gz", aName, sizeof(aName), aExt, sizeof(aExt));
+	EXPECT_STREQ(aName, "archive.tar");
+	EXPECT_STREQ(aExt, "gz");
+
+	fs_split_file_extension("no_dot", aName, sizeof(aName), aExt, sizeof(aExt));
+	EXPECT_STREQ(aName, "no_dot");
+	EXPECT_STREQ(aExt, "");
+
+	fs_split_file_extension(".dot_first", aName, sizeof(aName), aExt, sizeof(aExt));
+	EXPECT_STREQ(aName, ".dot_first");
+	EXPECT_STREQ(aExt, "");
+}
+
+TEST(Filesystem, CreateCloseDelete)
+{
+	CTestInfo Info;
+
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_FALSE(io_close(File));
+	EXPECT_FALSE(fs_remove(Info.m_aFilename));
+}
+
+TEST(Filesystem, CreateDeleteDirectory)
+{
+	CTestInfo Info;
+	char aFilename[IO_MAX_PATH_LENGTH];
+	str_format(aFilename, sizeof(aFilename), "%s/test.txt", Info.m_aFilename);
+
+	EXPECT_FALSE(fs_makedir(Info.m_aFilename));
+	IOHANDLE File = io_open(aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_FALSE(io_close(File));
+
+	// Directory removal fails if there are any files left in the directory.
+	EXPECT_TRUE(fs_removedir(Info.m_aFilename));
+
+	EXPECT_FALSE(fs_remove(aFilename));
+	EXPECT_FALSE(fs_removedir(Info.m_aFilename));
+}
+
+TEST(Filesystem, CantDeleteDirectoryWithRemove)
+{
+	CTestInfo Info;
+	EXPECT_FALSE(fs_makedir(Info.m_aFilename));
+	EXPECT_TRUE(fs_remove(Info.m_aFilename)); // Cannot remove directory with file removal function.
+	EXPECT_FALSE(fs_removedir(Info.m_aFilename));
+}
+
+TEST(Filesystem, CantDeleteFileWithRemoveDirectory)
+{
+	CTestInfo Info;
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_FALSE(io_close(File));
+	EXPECT_TRUE(fs_removedir(Info.m_aFilename)); // Cannot remove file with directory removal function.
+	EXPECT_FALSE(fs_remove(Info.m_aFilename));
+}
diff --git a/src_bkp/test/git_revision.cpp b/src_bkp/test/git_revision.cpp
new file mode 100644
index 0000000000..95504bf1b3
--- /dev/null
+++ b/src_bkp/test/git_revision.cpp
@@ -0,0 +1,12 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <game/version.h>
+
+TEST(GitRevision, ExistsOrNull)
+{
+	if(GIT_SHORTREV_HASH)
+	{
+		EXPECT_STRNE(GIT_SHORTREV_HASH, "");
+	}
+}
diff --git a/src_bkp/test/hash.cpp b/src_bkp/test/hash.cpp
new file mode 100644
index 0000000000..07a9f82fd6
--- /dev/null
+++ b/src_bkp/test/hash.cpp
@@ -0,0 +1,189 @@
+#include <gtest/gtest.h>
+
+#include <base/hash_ctxt.h>
+#include <base/system.h>
+
+template<size_t BufferSize = SHA256_MAXSTRSIZE>
+static void ExpectSha256(SHA256_DIGEST Actual, const char *pWanted)
+{
+	char aActual[BufferSize];
+	sha256_str(Actual, aActual, sizeof(aActual));
+	EXPECT_STREQ(aActual, pWanted);
+}
+
+TEST(Hash, Sha256)
+{
+	// https://en.wikipedia.org/w/index.php?title=SHA-2&oldid=840187620#Test_vectors
+	ExpectSha256(sha256("", 0), "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+	SHA256_CTX ctxt;
+
+	sha256_init(&ctxt);
+	ExpectSha256(sha256_finish(&ctxt), "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+
+	// printf 'The quick brown fox jumps over the lazy dog.' | sha256sum
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectSha256(sha256(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
+
+	sha256_init(&ctxt);
+	sha256_update(&ctxt, "The ", 4);
+	sha256_update(&ctxt, "quick ", 6);
+	sha256_update(&ctxt, "brown ", 6);
+	sha256_update(&ctxt, "fox ", 4);
+	sha256_update(&ctxt, "jumps ", 6);
+	sha256_update(&ctxt, "over ", 5);
+	sha256_update(&ctxt, "the ", 4);
+	sha256_update(&ctxt, "lazy ", 5);
+	sha256_update(&ctxt, "dog.", 4);
+	ExpectSha256(sha256_finish(&ctxt), "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
+}
+
+TEST(Hash, Sha256ToStringSmallBuffer)
+{
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectSha256<1>(sha256(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "");
+	ExpectSha256<16 + 1>(sha256(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "ef537f25c895bfa7");
+}
+
+TEST(Hash, Sha256ToStringLargeBuffer)
+{
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectSha256<SHA256_MAXSTRSIZE + 64>(sha256(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
+}
+
+TEST(Hash, Sha256Eq)
+{
+	EXPECT_EQ(sha256_comp(sha256("", 0), sha256("", 0)), 0);
+	EXPECT_TRUE(sha256("", 0) == sha256("", 0));
+	EXPECT_NE(sha256_comp(sha256("a", 1), sha256("b", 1)), 0);
+	EXPECT_TRUE(sha256("a", 1) != sha256("b", 1));
+}
+
+TEST(Hash, Sha256FromStr)
+{
+	SHA256_DIGEST Expected = {{
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+	}};
+	SHA256_DIGEST Sha256;
+	EXPECT_FALSE(sha256_from_str(&Sha256, "0123456789012345678901234567890123456789012345678901234567890123"));
+	EXPECT_EQ(Sha256, Expected);
+	EXPECT_TRUE(sha256_from_str(&Sha256, "012345678901234567890123456789012345678901234567890123456789012"));
+	EXPECT_TRUE(sha256_from_str(&Sha256, "01234567890123456789012345678901234567890123456789012345678901234"));
+	EXPECT_TRUE(sha256_from_str(&Sha256, ""));
+	EXPECT_TRUE(sha256_from_str(&Sha256, "012345678901234567890123456789012345678901234567890123456789012x"));
+	EXPECT_TRUE(sha256_from_str(&Sha256, "x123456789012345678901234567890123456789012345678901234567890123"));
+}
+
+template<size_t BufferSize = MD5_MAXSTRSIZE>
+static void ExpectMd5(MD5_DIGEST Actual, const char *pWanted)
+{
+	char aActual[BufferSize];
+	md5_str(Actual, aActual, sizeof(aActual));
+	EXPECT_STREQ(aActual, pWanted);
+}
+
+TEST(Hash, Md5)
+{
+	// https://en.wikipedia.org/w/index.php?title=MD5&oldid=889664074#MD5_hashes
+	ExpectMd5(md5("", 0), "d41d8cd98f00b204e9800998ecf8427e");
+	MD5_CTX ctxt;
+
+	md5_init(&ctxt);
+	ExpectMd5(md5_finish(&ctxt), "d41d8cd98f00b204e9800998ecf8427e");
+
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectMd5(md5(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "e4d909c290d0fb1ca068ffaddf22cbd0");
+
+	md5_init(&ctxt);
+	md5_update(&ctxt, "The ", 4);
+	md5_update(&ctxt, "quick ", 6);
+	md5_update(&ctxt, "brown ", 6);
+	md5_update(&ctxt, "fox ", 4);
+	md5_update(&ctxt, "jumps ", 6);
+	md5_update(&ctxt, "over ", 5);
+	md5_update(&ctxt, "the ", 4);
+	md5_update(&ctxt, "lazy ", 5);
+	md5_update(&ctxt, "dog.", 4);
+	ExpectMd5(md5_finish(&ctxt), "e4d909c290d0fb1ca068ffaddf22cbd0");
+}
+
+TEST(Hash, Md5ToStringSmallBuffer)
+{
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectMd5<1>(md5(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "");
+	ExpectMd5<16 + 1>(md5(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "e4d909c290d0fb1c");
+}
+
+TEST(Hash, Md5ToStringLargeBuffer)
+{
+	char QUICK_BROWN_FOX[] = "The quick brown fox jumps over the lazy dog.";
+	ExpectMd5<MD5_MAXSTRSIZE + 64>(md5(QUICK_BROWN_FOX, str_length(QUICK_BROWN_FOX)), "e4d909c290d0fb1ca068ffaddf22cbd0");
+}
+
+TEST(Hash, Md5Eq)
+{
+	EXPECT_EQ(md5_comp(md5("", 0), md5("", 0)), 0);
+	EXPECT_TRUE(md5("", 0) == md5("", 0));
+	EXPECT_NE(md5_comp(md5("a", 1), md5("b", 1)), 0);
+	EXPECT_TRUE(md5("a", 1) != md5("b", 1));
+}
+
+TEST(Hash, Md5FromStr)
+{
+	MD5_DIGEST Expected = {{
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+		0x23,
+		0x45,
+		0x67,
+		0x89,
+		0x01,
+	}};
+	MD5_DIGEST Md5;
+	EXPECT_FALSE(md5_from_str(&Md5, "01234567890123456789012345678901"));
+	EXPECT_EQ(Md5, Expected);
+	EXPECT_TRUE(md5_from_str(&Md5, "0123456789012345678901234567890"));
+	EXPECT_TRUE(md5_from_str(&Md5, "012345678901234567890123456789012"));
+	EXPECT_TRUE(md5_from_str(&Md5, ""));
+	EXPECT_TRUE(md5_from_str(&Md5, "0123456789012345678901234567890x"));
+	EXPECT_TRUE(md5_from_str(&Md5, "x1234567890123456789012345678901"));
+}
diff --git a/src_bkp/test/huffman.cpp b/src_bkp/test/huffman.cpp
new file mode 100644
index 0000000000..8d14535fa7
--- /dev/null
+++ b/src_bkp/test/huffman.cpp
@@ -0,0 +1,48 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/huffman.h>
+
+TEST(Huffman, CompressionShouldNotChangeData)
+{
+	CHuffman Huffman;
+	Huffman.Init();
+
+	unsigned char aInput[64];
+	unsigned char aCompressed[2048];
+
+	mem_zero(aInput, sizeof(aInput));
+	mem_zero(aCompressed, sizeof(aCompressed));
+
+	int Size = Huffman.Compress(aInput, sizeof(aInput), aCompressed, sizeof(aCompressed));
+
+	unsigned char aDecompressed[2048];
+	Huffman.Decompress(aCompressed, sizeof(aCompressed), aDecompressed, sizeof(aDecompressed));
+
+	int match = mem_comp(aInput, aDecompressed, Size);
+	EXPECT_EQ(match, 0);
+}
+
+TEST(Huffman, CompressionCompatible)
+{
+	CHuffman Huffman;
+	Huffman.Init();
+
+	unsigned char aInput[64];
+	unsigned char aCompressed[2048];
+
+	mem_zero(aInput, sizeof(aInput));
+	mem_zero(aCompressed, sizeof(aCompressed));
+
+	// compress 1-7 followed by a bunch of nullbytes
+	for(int i = 0; i < 8; i++)
+		aInput[i] = i;
+
+	int Size = Huffman.Compress(aInput, sizeof(aInput), aCompressed, sizeof(aCompressed));
+
+	unsigned char aExpected[] = {0x51, 0x58, 0x78, 0x76, 0x1B, 0xB7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xc5, 0x0D};
+
+	int match = mem_comp(aCompressed, aExpected, Size);
+	EXPECT_EQ(match, 0) << "The compression is not compatible with older/other implementations anymore";
+	EXPECT_EQ(Size, 15);
+}
diff --git a/src_bkp/test/io.cpp b/src_bkp/test/io.cpp
new file mode 100644
index 0000000000..69ae0f673f
--- /dev/null
+++ b/src_bkp/test/io.cpp
@@ -0,0 +1,80 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+void TestFileRead(const char *pWritten, bool SkipBom, const char *pRead)
+{
+	CTestInfo Info;
+	char aBuf[512] = {0};
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_write(File, pWritten, str_length(pWritten)), str_length(pWritten));
+	EXPECT_FALSE(io_close(File));
+	File = io_open(Info.m_aFilename, IOFLAG_READ | (SkipBom ? IOFLAG_SKIP_BOM : 0));
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_read(File, aBuf, sizeof(aBuf)), str_length(pRead));
+	EXPECT_TRUE(mem_comp(aBuf, pRead, str_length(pRead)) == 0);
+	EXPECT_FALSE(io_close(File));
+
+	fs_remove(Info.m_aFilename);
+}
+
+TEST(Io, Read1)
+{
+	TestFileRead("", false, "");
+}
+TEST(Io, Read2)
+{
+	TestFileRead("abc", false, "abc");
+}
+TEST(Io, Read3)
+{
+	TestFileRead("\xef\xbb\xbf", false, "\xef\xbb\xbf");
+}
+TEST(Io, Read4)
+{
+	TestFileRead("\xef\xbb\xbfxyz", false, "\xef\xbb\xbfxyz");
+}
+
+TEST(Io, ReadBom1)
+{
+	TestFileRead("", true, "");
+}
+TEST(Io, ReadBom2)
+{
+	TestFileRead("abc", true, "abc");
+}
+TEST(Io, ReadBom3)
+{
+	TestFileRead("\xef\xbb\xbf", true, "");
+}
+TEST(Io, ReadBom4)
+{
+	TestFileRead("\xef\xbb\xbfxyz", true, "xyz");
+}
+TEST(Io, ReadBom5)
+{
+	TestFileRead("\xef\xbb\xbf\xef\xbb\xbf", true, "\xef\xbb\xbf");
+}
+TEST(Io, ReadBom6)
+{
+	TestFileRead("\xef\xbb\xbfxyz\xef\xbb\xbf", true, "xyz\xef\xbb\xbf");
+}
+TEST(Io, CurrentExe)
+{
+	IOHANDLE CurrentExe = io_current_exe();
+	ASSERT_TRUE(CurrentExe);
+	EXPECT_GE(io_length(CurrentExe), 1024);
+	io_close(CurrentExe);
+}
+TEST(Io, SyncWorks)
+{
+	CTestInfo Info;
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_write(File, "abc\n", 4), 4);
+	EXPECT_FALSE(io_sync(File));
+	EXPECT_FALSE(io_close(File));
+	EXPECT_FALSE(fs_remove(Info.m_aFilename));
+}
diff --git a/src_bkp/test/jobs.cpp b/src_bkp/test/jobs.cpp
new file mode 100644
index 0000000000..9c8b49fd0b
--- /dev/null
+++ b/src_bkp/test/jobs.cpp
@@ -0,0 +1,148 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+#include <engine/shared/host_lookup.h>
+#include <engine/shared/jobs.h>
+
+#include <functional>
+
+static const int TEST_NUM_THREADS = 4;
+
+class Jobs : public ::testing::Test
+{
+protected:
+	CJobPool m_Pool;
+
+	Jobs()
+	{
+		m_Pool.Init(TEST_NUM_THREADS);
+	}
+
+	void Add(std::shared_ptr<IJob> pJob)
+	{
+		m_Pool.Add(std::move(pJob));
+	}
+	void RunBlocking(IJob *pJob)
+	{
+		CJobPool::RunBlocking(pJob);
+	}
+};
+
+class CJob : public IJob
+{
+	std::function<void()> m_JobFunction;
+	void Run() override { m_JobFunction(); }
+
+public:
+	CJob(std::function<void()> &&JobFunction) :
+		m_JobFunction(JobFunction) {}
+};
+
+TEST_F(Jobs, Constructor)
+{
+}
+
+TEST_F(Jobs, Simple)
+{
+	Add(std::make_shared<CJob>([] {}));
+}
+
+TEST_F(Jobs, RunBlocking)
+{
+	int Result = 0;
+	CJob Job([&] { Result = 1; });
+	EXPECT_EQ(Result, 0);
+	RunBlocking(&Job);
+	EXPECT_EQ(Result, 1);
+}
+
+TEST_F(Jobs, Wait)
+{
+	SEMAPHORE sphore;
+	sphore_init(&sphore);
+	Add(std::make_shared<CJob>([&] { sphore_signal(&sphore); }));
+	sphore_wait(&sphore);
+	sphore_destroy(&sphore);
+}
+
+TEST_F(Jobs, LookupHost)
+{
+	static const char *HOST = "example.com";
+	static const int NETTYPE = NETTYPE_ALL;
+	auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
+
+	EXPECT_STREQ(pJob->Hostname(), HOST);
+	EXPECT_EQ(pJob->Nettype(), NETTYPE);
+
+	Add(pJob);
+	while(pJob->Status() != IJob::STATE_DONE)
+	{
+		// yay, busy loop...
+		thread_yield();
+	}
+
+	EXPECT_STREQ(pJob->Hostname(), HOST);
+	EXPECT_EQ(pJob->Nettype(), NETTYPE);
+	if(pJob->Result() == 0)
+	{
+		EXPECT_EQ(pJob->Addr().type & NETTYPE, pJob->Addr().type);
+	}
+}
+
+TEST_F(Jobs, LookupHostWebsocket)
+{
+	static const char *HOST = "ws://example.com";
+	static const int NETTYPE = NETTYPE_ALL;
+	auto pJob = std::make_shared<CHostLookup>(HOST, NETTYPE);
+
+	EXPECT_STREQ(pJob->Hostname(), HOST);
+	EXPECT_EQ(pJob->Nettype(), NETTYPE);
+
+	Add(pJob);
+	while(pJob->Status() != IJob::STATE_DONE)
+	{
+		// yay, busy loop...
+		thread_yield();
+	}
+
+	EXPECT_STREQ(pJob->Hostname(), HOST);
+	EXPECT_EQ(pJob->Nettype(), NETTYPE);
+	if(pJob->Result() == 0)
+	{
+		EXPECT_EQ(pJob->Addr().type & NETTYPE_WEBSOCKET_IPV4, pJob->Addr().type);
+	}
+}
+
+TEST_F(Jobs, Many)
+{
+	std::atomic<int> ThreadsRunning(0);
+	std::vector<std::shared_ptr<IJob>> vpJobs;
+	SEMAPHORE sphore;
+	sphore_init(&sphore);
+	for(int i = 0; i < TEST_NUM_THREADS; i++)
+	{
+		std::shared_ptr<IJob> pJob = std::make_shared<CJob>([&] {
+			int Prev = ThreadsRunning.fetch_add(1);
+			if(Prev == TEST_NUM_THREADS - 1)
+			{
+				sphore_signal(&sphore);
+			}
+		});
+		EXPECT_EQ(pJob->Status(), IJob::STATE_PENDING);
+		vpJobs.push_back(pJob);
+	}
+	for(auto &pJob : vpJobs)
+	{
+		Add(pJob);
+	}
+	sphore_wait(&sphore);
+	sphore_destroy(&sphore);
+	m_Pool.~CJobPool();
+	for(auto &pJob : vpJobs)
+	{
+		EXPECT_EQ(pJob->Status(), IJob::STATE_DONE);
+	}
+	new(&m_Pool) CJobPool();
+}
diff --git a/src_bkp/test/json.cpp b/src_bkp/test/json.cpp
new file mode 100644
index 0000000000..203f2c7fc2
--- /dev/null
+++ b/src_bkp/test/json.cpp
@@ -0,0 +1,22 @@
+#include <gtest/gtest.h>
+
+#include <engine/shared/json.h>
+
+TEST(Json, Escape)
+{
+	char aBuf[128];
+	char aSmall[2];
+	char aSix[6];
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), ""), "");
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "a"), "a");
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "\n"), "\\n");
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "\\"), "\\\\"); // https://www.xkcd.com/1638/
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "\x1b"), "\\u001b"); // escape
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "愛"), "愛");
+	EXPECT_STREQ(EscapeJson(aBuf, sizeof(aBuf), "😂"), "😂");
+
+	// Truncations
+	EXPECT_STREQ(EscapeJson(aSmall, sizeof(aSmall), "\\"), "");
+	EXPECT_STREQ(EscapeJson(aSix, sizeof(aSix), "\x01"), "");
+	EXPECT_STREQ(EscapeJson(aSix, sizeof(aSix), "aaaaaa"), "aaaaa");
+}
diff --git a/src_bkp/test/jsonwriter.cpp b/src_bkp/test/jsonwriter.cpp
new file mode 100644
index 0000000000..c8bcede610
--- /dev/null
+++ b/src_bkp/test/jsonwriter.cpp
@@ -0,0 +1,212 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/jsonwriter.h>
+
+#include <climits>
+
+class JsonFileWriter
+{
+public:
+	CTestInfo m_Info;
+	CJsonFileWriter *m_pJson;
+	char m_aOutputFilename[IO_MAX_PATH_LENGTH];
+
+	JsonFileWriter() :
+		m_pJson(nullptr)
+	{
+		m_Info.Filename(m_aOutputFilename, sizeof(m_aOutputFilename), "-got.json");
+		IOHANDLE File = io_open(m_aOutputFilename, IOFLAG_WRITE);
+		EXPECT_TRUE(File);
+		m_pJson = new CJsonFileWriter(File);
+	}
+
+	void Expect(const char *pExpected)
+	{
+		ASSERT_TRUE(m_pJson);
+		delete m_pJson;
+		m_pJson = nullptr;
+
+		IOHANDLE GotFile = io_open(m_aOutputFilename, IOFLAG_READ);
+		ASSERT_TRUE(GotFile);
+		char *pOutput = io_read_all_str(GotFile);
+		io_close(GotFile);
+		ASSERT_TRUE(pOutput);
+		EXPECT_STREQ(pOutput, pExpected);
+		bool Correct = str_comp(pOutput, pExpected) == 0;
+		free(pOutput);
+
+		if(!Correct)
+		{
+			char aFilename[IO_MAX_PATH_LENGTH];
+			m_Info.Filename(aFilename, sizeof(aFilename), "-expected.json");
+			IOHANDLE ExpectedFile = io_open(aFilename, IOFLAG_WRITE);
+			ASSERT_TRUE(ExpectedFile);
+			io_write(ExpectedFile, pExpected, str_length(pExpected));
+			io_close(ExpectedFile);
+		}
+		else
+		{
+			fs_remove(m_aOutputFilename);
+		}
+	}
+};
+
+class JsonStringWriter
+{
+public:
+	CJsonStringWriter *m_pJson;
+
+	JsonStringWriter() :
+		m_pJson(nullptr)
+	{
+		m_pJson = new CJsonStringWriter();
+	}
+
+	void Expect(const char *pExpected)
+	{
+		ASSERT_TRUE(m_pJson);
+		const std::string OutputString = m_pJson->GetOutputString();
+		EXPECT_STREQ(OutputString.c_str(), pExpected);
+		delete m_pJson;
+		m_pJson = nullptr;
+	}
+};
+
+template<typename T>
+class JsonWriters : public testing::Test
+{
+public:
+	T Impl;
+};
+
+using JsonWriterTestFixures = ::testing::Types<JsonFileWriter, JsonStringWriter>;
+TYPED_TEST_SUITE(JsonWriters, JsonWriterTestFixures);
+
+TYPED_TEST(JsonWriters, Empty)
+{
+	this->Impl.Expect("\n");
+}
+
+TYPED_TEST(JsonWriters, EmptyObject)
+{
+	this->Impl.m_pJson->BeginObject();
+	this->Impl.m_pJson->EndObject();
+	this->Impl.Expect("{\n}\n");
+}
+
+TYPED_TEST(JsonWriters, EmptyArray)
+{
+	this->Impl.m_pJson->BeginArray();
+	this->Impl.m_pJson->EndArray();
+	this->Impl.Expect("[\n]\n");
+}
+
+TYPED_TEST(JsonWriters, SpecialCharacters)
+{
+	this->Impl.m_pJson->BeginObject();
+	this->Impl.m_pJson->WriteAttribute("\x01\"'\r\n\t");
+	this->Impl.m_pJson->BeginArray();
+	this->Impl.m_pJson->WriteStrValue(" \"'abc\x01\n");
+	this->Impl.m_pJson->EndArray();
+	this->Impl.m_pJson->EndObject();
+	this->Impl.Expect(
+		"{\n"
+		"\t\"\\u0001\\\"'\\r\\n\\t\": [\n"
+		"\t\t\" \\\"'abc\\u0001\\n\"\n"
+		"\t]\n"
+		"}\n");
+}
+
+TYPED_TEST(JsonWriters, HelloWorld)
+{
+	this->Impl.m_pJson->WriteStrValue("hello world");
+	this->Impl.Expect("\"hello world\"\n");
+}
+
+TYPED_TEST(JsonWriters, Unicode)
+{
+	this->Impl.m_pJson->WriteStrValue("Heizölrückstoßabdämpfung");
+	this->Impl.Expect("\"Heizölrückstoßabdämpfung\"\n");
+}
+
+TYPED_TEST(JsonWriters, True)
+{
+	this->Impl.m_pJson->WriteBoolValue(true);
+	this->Impl.Expect("true\n");
+}
+
+TYPED_TEST(JsonWriters, False)
+{
+	this->Impl.m_pJson->WriteBoolValue(false);
+	this->Impl.Expect("false\n");
+}
+
+TYPED_TEST(JsonWriters, Null)
+{
+	this->Impl.m_pJson->WriteNullValue();
+	this->Impl.Expect("null\n");
+}
+
+TYPED_TEST(JsonWriters, EmptyString)
+{
+	this->Impl.m_pJson->WriteStrValue("");
+	this->Impl.Expect("\"\"\n");
+}
+
+TYPED_TEST(JsonWriters, EscapeNewline)
+{
+	this->Impl.m_pJson->WriteStrValue("\n");
+	this->Impl.Expect("\"\\n\"\n");
+}
+
+TYPED_TEST(JsonWriters, EscapeBackslash)
+{
+	this->Impl.m_pJson->WriteStrValue("\\");
+	this->Impl.Expect("\"\\\\\"\n"); // https://www.xkcd.com/1638/
+}
+
+TYPED_TEST(JsonWriters, EscapeControl)
+{
+	this->Impl.m_pJson->WriteStrValue("\x1b");
+	this->Impl.Expect("\"\\u001b\"\n");
+}
+
+TYPED_TEST(JsonWriters, EscapeUnicode)
+{
+	this->Impl.m_pJson->WriteStrValue("愛😂");
+	this->Impl.Expect("\"愛😂\"\n");
+}
+
+TYPED_TEST(JsonWriters, Zero)
+{
+	this->Impl.m_pJson->WriteIntValue(0);
+	this->Impl.Expect("0\n");
+}
+
+TYPED_TEST(JsonWriters, One)
+{
+	this->Impl.m_pJson->WriteIntValue(1);
+	this->Impl.Expect("1\n");
+}
+
+TYPED_TEST(JsonWriters, MinusOne)
+{
+	this->Impl.m_pJson->WriteIntValue(-1);
+	this->Impl.Expect("-1\n");
+}
+
+TYPED_TEST(JsonWriters, Large)
+{
+	this->Impl.m_pJson->WriteIntValue(INT_MAX);
+	this->Impl.Expect("2147483647\n");
+}
+
+TYPED_TEST(JsonWriters, Small)
+{
+	this->Impl.m_pJson->WriteIntValue(INT_MIN);
+	this->Impl.Expect("-2147483648\n");
+}
diff --git a/src_bkp/test/linereader.cpp b/src_bkp/test/linereader.cpp
new file mode 100644
index 0000000000..05d93627b7
--- /dev/null
+++ b/src_bkp/test/linereader.cpp
@@ -0,0 +1,38 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/linereader.h>
+
+void TestFileLineReader(const char *pWritten, bool SkipBom, std::initializer_list<const char *> pReads)
+{
+	CTestInfo Info;
+	IOHANDLE File = io_open(Info.m_aFilename, IOFLAG_WRITE);
+	ASSERT_TRUE(File);
+	EXPECT_EQ(io_write(File, pWritten, str_length(pWritten)), str_length(pWritten));
+	EXPECT_FALSE(io_close(File));
+	File = io_open(Info.m_aFilename, IOFLAG_READ | (SkipBom ? IOFLAG_SKIP_BOM : 0));
+	ASSERT_TRUE(File);
+	CLineReader LineReader;
+	LineReader.Init(File);
+	for(const char *pRead : pReads)
+	{
+		const char *pReadLine = LineReader.Get();
+		ASSERT_TRUE(pReadLine);
+		EXPECT_STREQ(pReadLine, pRead);
+	}
+	EXPECT_FALSE(LineReader.Get());
+	EXPECT_FALSE(io_close(File));
+
+	fs_remove(Info.m_aFilename);
+}
+
+TEST(LineReader, NormalNewline)
+{
+	TestFileLineReader("foo\nbar\nbaz\n", false, {"foo", "bar", "baz"});
+}
+
+TEST(LineReader, CRLFNewline)
+{
+	TestFileLineReader("foo\r\nbar\r\nbaz", true, {"foo", "bar", "baz"});
+}
diff --git a/src_bkp/test/mapbugs.cpp b/src_bkp/test/mapbugs.cpp
new file mode 100644
index 0000000000..c1c4c230f3
--- /dev/null
+++ b/src_bkp/test/mapbugs.cpp
@@ -0,0 +1,46 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <game/mapbugs.h>
+
+static const char *BINARY_SHA256 = "65b410e197fd2298ec270e89a84b762f6739d1d18089529f8ef6cf2104d3d600";
+static const char *DM1_SHA256 = "0b0c481d77519c32fbe85624ef16ec0fa9991aec7367ad538bd280f28d8c26cf";
+
+static CMapBugs GetMapBugsImpl(const char *pName, int Size, const char *pSha256)
+{
+	SHA256_DIGEST Sha256 = {{0}};
+	dbg_assert(sha256_from_str(&Sha256, pSha256) == 0, "invalid sha256 in tests");
+	return GetMapBugs(pName, Size, Sha256);
+}
+
+TEST(MapBugs, Contains)
+{
+	EXPECT_TRUE(GetMapBugsImpl("Binary", 2022597, BINARY_SHA256).Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+	EXPECT_FALSE(GetMapBugsImpl("Binarx", 2022597, BINARY_SHA256).Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+	EXPECT_FALSE(GetMapBugsImpl("Binary", 2022598, BINARY_SHA256).Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+	EXPECT_FALSE(GetMapBugsImpl("dm1", 5805, DM1_SHA256).Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+}
+
+TEST(MapBugs, Update)
+{
+	{
+		CMapBugs Binary = GetMapBugsImpl("Binary", 2022597, BINARY_SHA256);
+		EXPECT_EQ(Binary.Update("grenade-doubleexplosion@ddnet.tw"), MAPBUGUPDATE_OVERRIDDEN);
+		EXPECT_EQ(Binary.Update("doesntexist@invalid"), MAPBUGUPDATE_NOTFOUND);
+		EXPECT_TRUE(Binary.Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+	}
+	{
+		CMapBugs Dm1 = GetMapBugsImpl("dm1", 5805, DM1_SHA256);
+		EXPECT_FALSE(Dm1.Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+		EXPECT_EQ(Dm1.Update("doesntexist@invalid"), MAPBUGUPDATE_NOTFOUND);
+		EXPECT_FALSE(Dm1.Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+		EXPECT_EQ(Dm1.Update("grenade-doubleexplosion@ddnet.tw"), MAPBUGUPDATE_OK);
+		EXPECT_TRUE(Dm1.Contains(BUG_GRENADE_DOUBLEEXPLOSION));
+	}
+}
+
+TEST(MapBugs, Dump)
+{
+	GetMapBugsImpl("Binary", 2022597, BINARY_SHA256).Dump();
+	GetMapBugsImpl("dm1", 5805, DM1_SHA256).Dump();
+}
diff --git a/src_bkp/test/math.cpp b/src_bkp/test/math.cpp
new file mode 100644
index 0000000000..66f2ec79a4
--- /dev/null
+++ b/src_bkp/test/math.cpp
@@ -0,0 +1,14 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/math.h>
+
+TEST(Math, FixedPointRoundtrip)
+{
+	for(int i = 0; i < 100000; ++i)
+	{
+		const float Number = i / 1000.0f;
+		EXPECT_NEAR(Number, fx2f(f2fx(Number)), 0.0005f);
+		EXPECT_EQ(i, f2fx(fx2f(i)));
+	}
+}
diff --git a/src_bkp/test/memory.cpp b/src_bkp/test/memory.cpp
new file mode 100644
index 0000000000..58e661c774
--- /dev/null
+++ b/src_bkp/test/memory.cpp
@@ -0,0 +1,187 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+static bool mem_is_null(const void *block, size_t size)
+{
+	const unsigned char *bytes = (const unsigned char *)block;
+	size_t i;
+	for(i = 0; i < size; i++)
+	{
+		if(bytes[i] != 0)
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+TEST(Memory, BaseTypes)
+{
+	void *aVoid[123];
+	secure_random_fill(aVoid, sizeof(aVoid));
+	EXPECT_FALSE(mem_is_null(aVoid, sizeof(aVoid)));
+	mem_zero(&aVoid, sizeof(aVoid));
+	EXPECT_TRUE(mem_is_null(aVoid, sizeof(aVoid)));
+	secure_random_fill(aVoid, sizeof(aVoid));
+	EXPECT_FALSE(mem_is_null(aVoid, sizeof(aVoid)));
+	mem_zero(&aVoid[0], 123 * sizeof(void *));
+	EXPECT_TRUE(mem_is_null(aVoid, sizeof(aVoid)));
+
+	secure_random_fill(aVoid, sizeof(aVoid));
+	EXPECT_FALSE(mem_is_null(aVoid, sizeof(aVoid)));
+	mem_zero(aVoid, sizeof(aVoid));
+	EXPECT_TRUE(mem_is_null(aVoid, sizeof(aVoid)));
+
+	int aInt[512];
+	secure_random_fill(aInt, sizeof(aInt));
+	EXPECT_FALSE(mem_is_null(aInt, sizeof(aInt)));
+	mem_zero(&aInt, sizeof(aInt));
+	EXPECT_TRUE(mem_is_null(aInt, sizeof(aInt)));
+	secure_random_fill(aInt, sizeof(aInt));
+	EXPECT_FALSE(mem_is_null(aInt, sizeof(aInt)));
+	mem_zero(&aInt[0], sizeof(aInt));
+	EXPECT_TRUE(mem_is_null(aInt, sizeof(aInt)));
+
+	secure_random_fill(aInt, sizeof(aInt));
+	EXPECT_FALSE(mem_is_null(aInt, sizeof(aInt)));
+	mem_zero(aInt, sizeof(aInt));
+	EXPECT_TRUE(mem_is_null(aInt, sizeof(aInt)));
+
+	int *apInt[512];
+	secure_random_fill(apInt, sizeof(apInt));
+	EXPECT_FALSE(mem_is_null(apInt, sizeof(apInt)));
+	mem_zero(&apInt, sizeof(apInt));
+	EXPECT_TRUE(mem_is_null(apInt, sizeof(apInt)));
+
+	secure_random_fill(apInt, sizeof(apInt));
+	EXPECT_FALSE(mem_is_null(apInt, sizeof(apInt)));
+	mem_zero(apInt, sizeof(apInt));
+	EXPECT_TRUE(mem_is_null(apInt, sizeof(apInt)));
+
+	int aaInt[10][20];
+	secure_random_fill(aaInt, sizeof(aaInt));
+	EXPECT_FALSE(mem_is_null(aaInt, sizeof(aaInt)));
+	mem_zero(&aaInt, sizeof(aaInt));
+	EXPECT_TRUE(mem_is_null(aaInt, sizeof(aaInt)));
+	secure_random_fill(aaInt, sizeof(aaInt));
+	EXPECT_FALSE(mem_is_null(aaInt, sizeof(aaInt)));
+	mem_zero(&aaInt[0], sizeof(aaInt));
+	EXPECT_TRUE(mem_is_null(aaInt, sizeof(aaInt)));
+	secure_random_fill(aaInt, sizeof(aaInt));
+	EXPECT_FALSE(mem_is_null(aaInt, sizeof(aaInt)));
+	mem_zero(&aaInt[0][0], sizeof(aaInt));
+	EXPECT_TRUE(mem_is_null(aaInt, sizeof(aaInt)));
+
+	secure_random_fill(aaInt, sizeof(aaInt));
+	EXPECT_FALSE(mem_is_null(aaInt, sizeof(aaInt)));
+	mem_zero(aaInt, sizeof(aaInt));
+	EXPECT_TRUE(mem_is_null(aaInt, sizeof(aaInt)));
+	secure_random_fill(aaInt, sizeof(aaInt));
+	EXPECT_FALSE(mem_is_null(aaInt, sizeof(aaInt)));
+	mem_zero(aaInt[0], sizeof(aaInt));
+	EXPECT_TRUE(mem_is_null(aaInt, sizeof(aaInt)));
+
+	int *aapInt[10][20];
+	secure_random_fill(aapInt, sizeof(aapInt));
+	EXPECT_FALSE(mem_is_null(aapInt, sizeof(aapInt)));
+	mem_zero(&aapInt, sizeof(aapInt));
+	EXPECT_TRUE(mem_is_null(aapInt, sizeof(aapInt)));
+	secure_random_fill(aapInt, sizeof(aapInt));
+	EXPECT_FALSE(mem_is_null(aapInt, sizeof(aapInt)));
+	mem_zero(&aapInt[0], sizeof(aapInt));
+	EXPECT_TRUE(mem_is_null(aapInt, sizeof(aapInt)));
+
+	secure_random_fill(aapInt, sizeof(aapInt));
+	EXPECT_FALSE(mem_is_null(aapInt, sizeof(aapInt)));
+	mem_zero(aapInt, sizeof(aapInt));
+	EXPECT_TRUE(mem_is_null(aapInt, sizeof(aapInt)));
+	secure_random_fill(aapInt, sizeof(aapInt));
+	EXPECT_FALSE(mem_is_null(aapInt, sizeof(aapInt)));
+	mem_zero(aapInt[0], sizeof(aapInt));
+	EXPECT_TRUE(mem_is_null(aapInt, sizeof(aapInt)));
+}
+
+TEST(Memory, PodTypes)
+{
+	NETADDR aAddr[123];
+	secure_random_fill(aAddr, sizeof(aAddr));
+	EXPECT_FALSE(mem_is_null(aAddr, sizeof(aAddr)));
+	mem_zero(&aAddr, sizeof(aAddr));
+	EXPECT_TRUE(mem_is_null(aAddr, sizeof(aAddr)));
+	secure_random_fill(aAddr, sizeof(aAddr));
+	EXPECT_FALSE(mem_is_null(aAddr, sizeof(aAddr)));
+	mem_zero(&aAddr[0], sizeof(aAddr));
+	EXPECT_TRUE(mem_is_null(aAddr, sizeof(aAddr)));
+
+	secure_random_fill(aAddr, sizeof(aAddr));
+	EXPECT_FALSE(mem_is_null(aAddr, sizeof(aAddr)));
+	mem_zero(aAddr, sizeof(aAddr));
+	EXPECT_TRUE(mem_is_null(aAddr, sizeof(aAddr)));
+
+	NETADDR *apAddr[123];
+	secure_random_fill(apAddr, sizeof(apAddr));
+	EXPECT_FALSE(mem_is_null(apAddr, sizeof(apAddr)));
+	mem_zero((NETADDR **)apAddr, sizeof(apAddr));
+	EXPECT_TRUE(mem_is_null(apAddr, sizeof(apAddr)));
+	secure_random_fill(apAddr, sizeof(apAddr));
+	EXPECT_FALSE(mem_is_null(apAddr, sizeof(apAddr)));
+	mem_zero(&apAddr, sizeof(apAddr));
+	EXPECT_TRUE(mem_is_null(apAddr, sizeof(apAddr)));
+	secure_random_fill(apAddr, sizeof(apAddr));
+	EXPECT_FALSE(mem_is_null(apAddr, sizeof(apAddr)));
+	mem_zero(&apAddr[0], sizeof(apAddr));
+	EXPECT_TRUE(mem_is_null(apAddr, sizeof(apAddr)));
+	secure_random_fill(apAddr, sizeof(apAddr));
+	EXPECT_FALSE(mem_is_null(apAddr, sizeof(apAddr)));
+	mem_zero(apAddr, sizeof(apAddr));
+	EXPECT_TRUE(mem_is_null(apAddr, sizeof(apAddr)));
+
+	// 2D arrays
+	NETADDR aaAddr[10][20];
+	secure_random_fill(aaAddr, sizeof(aaAddr));
+	EXPECT_FALSE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	mem_zero(&aaAddr, sizeof(aaAddr));
+	EXPECT_TRUE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	secure_random_fill(aaAddr, sizeof(aaAddr));
+	EXPECT_FALSE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	mem_zero(&aaAddr[0], sizeof(aaAddr));
+	EXPECT_TRUE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	secure_random_fill(aaAddr, sizeof(aaAddr));
+	EXPECT_FALSE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	mem_zero(&aaAddr[0][0], sizeof(aaAddr));
+	EXPECT_TRUE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+
+	secure_random_fill(aaAddr, sizeof(aaAddr));
+	EXPECT_FALSE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	mem_zero(aaAddr, sizeof(aaAddr));
+	EXPECT_TRUE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	secure_random_fill(aaAddr, sizeof(aaAddr));
+	EXPECT_FALSE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+	mem_zero(aaAddr[0], sizeof(aaAddr));
+	EXPECT_TRUE(mem_is_null((NETADDR *)aaAddr, sizeof(aaAddr)));
+
+	// 2D pointer arrays
+	NETADDR *aapAddr[10][20];
+	secure_random_fill(aapAddr, sizeof(aapAddr));
+	EXPECT_FALSE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	mem_zero(&aapAddr, sizeof(aapAddr));
+	EXPECT_TRUE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	secure_random_fill(aapAddr, sizeof(aapAddr));
+	EXPECT_FALSE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	mem_zero(&aapAddr[0], sizeof(aapAddr));
+	EXPECT_TRUE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	secure_random_fill(aapAddr, sizeof(aapAddr));
+	EXPECT_FALSE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	mem_zero(&aapAddr[0][0], sizeof(aapAddr));
+	EXPECT_TRUE(mem_is_null(aapAddr, sizeof(aapAddr)));
+
+	secure_random_fill(aapAddr, sizeof(aapAddr));
+	EXPECT_FALSE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	mem_zero(aapAddr, sizeof(aapAddr));
+	EXPECT_TRUE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	secure_random_fill(aapAddr, sizeof(aapAddr));
+	EXPECT_FALSE(mem_is_null(aapAddr, sizeof(aapAddr)));
+	mem_zero(aapAddr[0], sizeof(aapAddr));
+	EXPECT_TRUE(mem_is_null(aapAddr, sizeof(aapAddr)));
+}
diff --git a/src_bkp/test/name_ban.cpp b/src_bkp/test/name_ban.cpp
new file mode 100644
index 0000000000..18bd2a657e
--- /dev/null
+++ b/src_bkp/test/name_ban.cpp
@@ -0,0 +1,80 @@
+#include <gtest/gtest.h>
+
+#include <engine/server/name_ban.h>
+
+TEST(NameBan, Empty)
+{
+	CNameBans Bans;
+	EXPECT_FALSE(Bans.IsBanned(""));
+	EXPECT_FALSE(Bans.IsBanned("abc"));
+}
+
+TEST(NameBan, BanInfo)
+{
+	CNameBans Bans;
+
+	Bans.Ban("abc", "old reason", 1, false);
+	{
+		const CNameBan *pOld = Bans.IsBanned("abc");
+		ASSERT_TRUE(pOld);
+		EXPECT_STREQ(pOld->m_aName, "abc");
+		EXPECT_STREQ(pOld->m_aReason, "old reason");
+		EXPECT_EQ(pOld->m_Distance, 1);
+		EXPECT_EQ(pOld->m_IsSubstring, false);
+	}
+
+	// Update existing name ban
+	Bans.Ban("abc", "new reason", 2, true);
+	{
+		const CNameBan *pNew = Bans.IsBanned("abc");
+		ASSERT_TRUE(pNew);
+		EXPECT_STREQ(pNew->m_aName, "abc");
+		EXPECT_STREQ(pNew->m_aReason, "new reason");
+		EXPECT_EQ(pNew->m_Distance, 2);
+		EXPECT_EQ(pNew->m_IsSubstring, true);
+	}
+}
+
+TEST(NameBan, Equality)
+{
+	CNameBans Bans;
+	Bans.Ban("abc", "", 0, false);
+	EXPECT_TRUE(Bans.IsBanned("abc"));
+	EXPECT_TRUE(Bans.IsBanned("   abc"));
+	EXPECT_TRUE(Bans.IsBanned("abc   "));
+	EXPECT_TRUE(Bans.IsBanned("abc                   foo")); // Maximum name length.
+	EXPECT_TRUE(Bans.IsBanned("äbc")); // Confusables
+	EXPECT_FALSE(Bans.IsBanned("def"));
+	EXPECT_FALSE(Bans.IsBanned("abcdef"));
+}
+
+TEST(NameBan, Substring)
+{
+	CNameBans Bans;
+	Bans.Ban("xyz", "", 0, true);
+	EXPECT_TRUE(Bans.IsBanned("abcxyz"));
+	EXPECT_TRUE(Bans.IsBanned("abcxyzdef"));
+	EXPECT_FALSE(Bans.IsBanned("abcdef"));
+}
+
+TEST(NameBan, Unban)
+{
+	CNameBans Bans;
+	Bans.Ban("abc", "", 0, false);
+	Bans.Ban("xyz", "", 0, false);
+	EXPECT_TRUE(Bans.IsBanned("abc"));
+	EXPECT_TRUE(Bans.IsBanned("xyz"));
+	Bans.Unban("abc");
+	EXPECT_FALSE(Bans.IsBanned("abc"));
+	EXPECT_TRUE(Bans.IsBanned("xyz"));
+	Bans.Unban("xyz");
+	EXPECT_FALSE(Bans.IsBanned("abc"));
+	EXPECT_FALSE(Bans.IsBanned("xyz"));
+}
+
+TEST(NameBan, UnbanNotFound)
+{
+	// Try to remove a name ban that does not exist
+	CNameBans Bans;
+	Bans.Unban("abc");
+}
diff --git a/src_bkp/test/net.cpp b/src_bkp/test/net.cpp
new file mode 100644
index 0000000000..7ffc2efc5f
--- /dev/null
+++ b/src_bkp/test/net.cpp
@@ -0,0 +1,50 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(Net, Ipv4AndIpv6Work)
+{
+	NETADDR Bindaddr = {};
+	NETSOCKET Socket1;
+	NETSOCKET Socket2;
+
+	Bindaddr.type = NETTYPE_IPV4 | NETTYPE_IPV6;
+	Socket2 = net_udp_create(Bindaddr);
+	do
+	{
+		Bindaddr.port = secure_rand() % 64511 + 1024;
+	} while(!(Socket1 = net_udp_create(Bindaddr)));
+
+	NETADDR LocalhostV4;
+	NETADDR LocalhostV6;
+	NETADDR TargetV4;
+	NETADDR TargetV6;
+	ASSERT_FALSE(net_addr_from_str(&LocalhostV4, "127.0.0.1"));
+	ASSERT_FALSE(net_addr_from_str(&LocalhostV6, "[::1]"));
+	TargetV4 = LocalhostV4;
+	TargetV6 = LocalhostV6;
+	TargetV4.port = Bindaddr.port;
+	TargetV6.port = Bindaddr.port;
+
+	NETADDR Addr;
+	unsigned char *pData;
+
+	EXPECT_EQ(net_udp_send(Socket2, &TargetV4, "abc", 3), 3);
+
+	EXPECT_EQ(net_socket_read_wait(Socket1, 10000000), 1);
+	ASSERT_EQ(net_udp_recv(Socket1, &Addr, &pData), 3);
+	Addr.port = 0;
+	EXPECT_EQ(Addr, LocalhostV4);
+	EXPECT_EQ(mem_comp(pData, "abc", 3), 0);
+
+	EXPECT_EQ(net_udp_send(Socket2, &TargetV6, "def", 3), 3);
+
+	EXPECT_EQ(net_socket_read_wait(Socket1, 10000000), 1);
+	ASSERT_EQ(net_udp_recv(Socket1, &Addr, &pData), 3);
+	Addr.port = 0;
+	EXPECT_EQ(Addr, LocalhostV6);
+	EXPECT_EQ(mem_comp(pData, "def", 3), 0);
+
+	net_udp_close(Socket1);
+	net_udp_close(Socket2);
+}
diff --git a/src_bkp/test/netaddr.cpp b/src_bkp/test/netaddr.cpp
new file mode 100644
index 0000000000..ccbf09648d
--- /dev/null
+++ b/src_bkp/test/netaddr.cpp
@@ -0,0 +1,136 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(NetAddr, FromUrlString)
+{
+	NETADDR Addr;
+	char aBuf1[NETADDR_MAXSTRSIZE];
+	char aBuf2[NETADDR_MAXSTRSIZE];
+
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://127.0", nullptr, 0), -1); // invalid ip
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://ddnet.org", nullptr, 0), -1); // invalid ip
+	EXPECT_EQ(net_addr_from_url(&Addr, "127.0.0.1", nullptr, 0), 1); // not a URL
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.9+udp://127.0.0.1", nullptr, 0), 1); // invalid tw protocol
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.7+udp://127.0.0.1", nullptr, 0), 1); // unsupported tw protocol
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+tcp://127.0.0.1", nullptr, 0), 1); // invalid internet protocol
+
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://127.0.0.1", nullptr, 0), 0);
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "127.0.0.1:0");
+	EXPECT_STREQ(aBuf2, "127.0.0.1");
+
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://127.0.0.1", nullptr, 0), 0);
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "127.0.0.1:0");
+	EXPECT_STREQ(aBuf2, "127.0.0.1");
+
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://[0123:4567:89ab:cdef:1:2:3:4]:5678", nullptr, 0), 0);
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "[123:4567:89ab:cdef:1:2:3:4]:5678");
+	EXPECT_STREQ(aBuf2, "[123:4567:89ab:cdef:1:2:3:4]");
+
+	char aHost[128];
+	EXPECT_EQ(net_addr_from_url(&Addr, "tw-0.6+udp://ger10.ddnet.org:5678", aHost, sizeof(aHost)), -1);
+	EXPECT_STREQ(aHost, "ger10.ddnet.org:5678");
+}
+
+TEST(NetAddr, FromStr)
+{
+	NETADDR Addr;
+	char aBuf1[NETADDR_MAXSTRSIZE];
+	char aBuf2[NETADDR_MAXSTRSIZE];
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "127.0.0.1"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "127.0.0.1:0");
+	EXPECT_STREQ(aBuf2, "127.0.0.1");
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "1.2.3.4:5678"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "1.2.3.4:5678");
+	EXPECT_STREQ(aBuf2, "1.2.3.4");
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[::1]"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "[::1]:0");
+	EXPECT_STREQ(aBuf2, "[::1]");
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[0123:4567:89ab:cdef:1:2:3:4]:5678"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "[123:4567:89ab:cdef:1:2:3:4]:5678");
+	EXPECT_STREQ(aBuf2, "[123:4567:89ab:cdef:1:2:3:4]");
+}
+
+TEST(NetAddr, StrV6)
+{
+	NETADDR Addr;
+	char aBuf1[NETADDR_MAXSTRSIZE];
+	char aBuf2[NETADDR_MAXSTRSIZE];
+
+	// Test vectors from RFC 5952 section 4:
+	// https://tools.ietf.org/html/rfc5952#section-4
+	// 4.1 Handling Leading Zeros in a 16-Bit Field
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:0db8::0001]:1"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "[2001:db8::1]:1");
+	EXPECT_STREQ(aBuf2, "[2001:db8::1]");
+
+	// 4.2.1 Shorten as Much as Possible
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:db8:0:0:0:0:2:1]"));
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf1, "[2001:db8::2:1]:0");
+	EXPECT_STREQ(aBuf2, "[2001:db8::2:1]");
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:db8::0:1]"));
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf2, "[2001:db8::1]");
+
+	// 4.2.2 Handling One 16-Bit 0 Field
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:db8::1:1:1:1:1]"));
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf2, "[2001:db8:0:1:1:1:1:1]");
+
+	// 4.2.3 Choice in Placement of "::"
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:0:0:1:0:0:0:1]"));
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf2, "[2001:0:0:1::1]");
+
+	EXPECT_FALSE(net_addr_from_str(&Addr, "[2001:db8:0:0:1:0:0:1]"));
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf2, "[2001:db8::1:0:0:1]");
+}
+
+TEST(NetAddr, FromStrInvalid)
+{
+	NETADDR Addr;
+	EXPECT_TRUE(net_addr_from_str(&Addr, "127.0.0."));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "127.0.0.1a"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "1.1"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "[::1"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "[::"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "127.0.0.1:"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "[::]:"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "127.0.0.1:1a"));
+	EXPECT_TRUE(net_addr_from_str(&Addr, "[::]:c"));
+}
+
+TEST(NetAddr, StrInvalid)
+{
+	NETADDR Addr = {0};
+	char aBuf1[NETADDR_MAXSTRSIZE];
+	char aBuf2[NETADDR_MAXSTRSIZE];
+	net_addr_str(&Addr, aBuf1, sizeof(aBuf1), true);
+	EXPECT_STREQ(aBuf1, "unknown type 0");
+	net_addr_str(&Addr, aBuf2, sizeof(aBuf2), false);
+	EXPECT_STREQ(aBuf2, "unknown type 0");
+}
diff --git a/src_bkp/test/os.cpp b/src_bkp/test/os.cpp
new file mode 100644
index 0000000000..86fa548e62
--- /dev/null
+++ b/src_bkp/test/os.cpp
@@ -0,0 +1,18 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(Os, VersionStr)
+{
+	char aVersion[128];
+	ASSERT_TRUE(os_version_str(aVersion, sizeof(aVersion)));
+	EXPECT_STRNE(aVersion, "");
+}
+
+TEST(Os, LocaleStr)
+{
+	char aLocale[128];
+	os_locale_str(aLocale, sizeof(aLocale));
+	EXPECT_STRNE(aLocale, "");
+}
diff --git a/src_bkp/test/packer.cpp b/src_bkp/test/packer.cpp
new file mode 100644
index 0000000000..6b4e133698
--- /dev/null
+++ b/src_bkp/test/packer.cpp
@@ -0,0 +1,298 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/shared/packer.h>
+
+// pExpected is NULL if an error is expected
+static void ExpectAddString5(const char *pString, int Limit, const char *pExpected)
+{
+	static char ZEROS[CPacker::PACKER_BUFFER_SIZE] = {0};
+	static const int OFFSET = CPacker::PACKER_BUFFER_SIZE - 5;
+	CPacker Packer;
+	Packer.Reset();
+	Packer.AddRaw(ZEROS, OFFSET);
+	Packer.AddString(pString, Limit);
+
+	EXPECT_EQ(pExpected == 0, Packer.Error());
+	if(pExpected)
+	{
+		// Include null termination.
+		int ExpectedLength = str_length(pExpected) + 1;
+		EXPECT_EQ(ExpectedLength, Packer.Size() - OFFSET);
+		if(ExpectedLength == Packer.Size() - OFFSET)
+		{
+			EXPECT_STREQ(pExpected, (const char *)Packer.Data() + OFFSET);
+		}
+	}
+}
+
+static void ExpectAddInt(int Input, int Expected)
+{
+	CPacker Packer;
+	Packer.Reset();
+	Packer.AddInt(Input);
+	EXPECT_EQ(Packer.Error(), false);
+	ASSERT_EQ(Packer.Size(), 1);
+	EXPECT_EQ(Packer.Data()[0], Expected);
+}
+
+static void ExpectAddExtendedInt(int Input, unsigned char *pExpected, int Size)
+{
+	CPacker Packer;
+	Packer.Reset();
+	Packer.AddInt(Input);
+	EXPECT_EQ(Packer.Error(), false);
+	ASSERT_EQ(Packer.Size(), Size);
+	EXPECT_EQ(mem_comp(Packer.Data(), pExpected, Size), 0);
+}
+
+TEST(Packer, AddInt)
+{
+	ExpectAddInt(1, 0b0000'0001);
+	ExpectAddInt(2, 0b0000'0010);
+	//                ^^^     ^
+	//                ||\     /
+	//     Not extended| \   /
+	//                 |  \ /
+	//                 |00'0010 => 2
+	//                 |
+	//                 Positive
+
+	// there is no -0 so 00 0000
+	// plus the negative bit is -1
+	ExpectAddInt(-1, 0b0100'0000);
+	//                 ^^^     ^
+	//                 ||\     /
+	//      Not extended| \   /
+	//                  |  \ /
+	//                  |00'0000 => 0
+	//                  |
+	//                  Negative
+	ExpectAddInt(-2, 0b0100'0001);
+
+	// 0-63 packed ints
+	// are represented the same way
+	// C++ represents ints
+	// All other numbers differ due to packing shinanigans
+	for(int i = 0; i < 63; i++)
+		ExpectAddInt(i, i);
+}
+
+TEST(Packer, AddExtendedInt)
+{
+	unsigned char pExpected64[] = {
+		0b1000'0000, 0b0000'0001};
+	ExpectAddExtendedInt(64, pExpected64, 2);
+	unsigned char pExpected65[] = {
+		0b1000'0001, 0b0000'0001
+		/*^^^      ^   ^^      ^
+		  ||\     /    | \    /
+		  || \   /     |  \  /
+		  ||  \ /    Not   \/
+		  ||   \  Extended /
+		  ||    \         /
+		  ||     \       /
+		  ||      \     /
+		  ||       \   /
+		  ||        \ /
+		  ||         X
+		  ||        / \
+		  ||       /   \
+		  ||      /     \
+		  ||     /       \
+		  ||  000'0001  00'0001 => 1000001 => 65
+		  ||
+		  |0 Not negative
+		  |
+		  1 Extended (one more byte following)
+		*/
+	};
+	ExpectAddExtendedInt(65, pExpected65, 2);
+
+	unsigned char pExpected66[] = {
+		0b1000'0010, 0b0000'0001
+		/*^^^      ^   ^^      ^
+		  ||\     /    | \    /
+		  || \   /     |  \  /
+		  ||  \ /    Not   \/
+		  ||   \  Extended /
+		  ||    \         /
+		  ||     \       /
+		  ||      \     /
+		  ||       \   /
+		  ||        \ /
+		  ||         X
+		  ||        / \
+		  ||       /   \
+		  ||      /     \
+		  ||     /       \
+		  ||  000'0001  00'0010 => 1000010 => 66
+		  ||
+		  |0 Not negative
+		  |
+		  1 Extended (one more byte following)
+		*/
+	};
+	ExpectAddExtendedInt(66, pExpected66, 2);
+
+	// there is no -0 so all negative numbers
+	// are one smaller
+	// So 64 + negative bit is -65
+	unsigned char pExpectedNegative65[] = {
+		0b1100'0000, 0b0000'0001
+		/*^^^      ^   ^^      ^
+		  ||\     /    | \    /
+		  || \   /     |  \  /
+		  ||  \ /    Not   \/
+		  ||   \  Extended /
+		  ||    \         /
+		  ||     \       /
+		  ||      \     /
+		  ||       \   /
+		  ||        \ /
+		  ||         X
+		  ||        / \
+		  ||       /   \
+		  ||      /     \
+		  ||     /       \
+		  ||  000'0001  00'0000 => 1000000 => 64
+		  ||
+		  |1 Negative
+		  |
+		  1 Extended (one more byte following)
+		*/
+	};
+	ExpectAddExtendedInt(-65, pExpectedNegative65, 2);
+
+	unsigned char pExpectedNegative66[] = {
+		0b1100'0001, 0b0000'0001
+		/*^^^      ^   ^^      ^
+		  ||\     /    | \    /
+		  || \   /     |  \  /
+		  ||  \ /    Not   \/
+		  ||   \  Extended /
+		  ||    \         /
+		  ||     \       /
+		  ||      \     /
+		  ||       \   /
+		  ||        \ /
+		  ||         X
+		  ||        / \
+		  ||       /   \
+		  ||      /     \
+		  ||     /       \
+		  ||  000'0001  00'0001 => 1000001 => 65
+		  ||
+		  |1 Negative
+		  |
+		  1 Extended (one more byte following)
+		*/
+	};
+	ExpectAddExtendedInt(-66, pExpectedNegative66, 2);
+
+	unsigned char pExpectedNegative67[] = {
+		0b1100'0010, 0b0000'0001};
+	ExpectAddExtendedInt(-67, pExpectedNegative67, 2);
+	unsigned char pExpectedNegative68[] = {
+		0b1100'0011, 0b0000'0001};
+	ExpectAddExtendedInt(-68, pExpectedNegative68, 2);
+	unsigned char pExpectedNegative69[] = {
+		0b1100'0100, 0b0000'0001};
+	ExpectAddExtendedInt(-69, pExpectedNegative69, 2);
+	unsigned char pExpectedNegative70[] = {
+		0b1100'0101, 0b0000'0001};
+	ExpectAddExtendedInt(-70, pExpectedNegative70, 2);
+}
+
+TEST(Packer, AddString)
+{
+	ExpectAddString5("", 0, "");
+	ExpectAddString5("a", 0, "a");
+	ExpectAddString5("abcd", 0, "abcd");
+	ExpectAddString5("abcde", 0, 0);
+}
+
+TEST(Packer, AddStringLimit)
+{
+	ExpectAddString5("", 1, "");
+	ExpectAddString5("a", 1, "a");
+	ExpectAddString5("aa", 1, "a");
+	ExpectAddString5("ä", 1, "");
+
+	ExpectAddString5("", 10, "");
+	ExpectAddString5("a", 10, "a");
+	ExpectAddString5("abcd", 10, "abcd");
+	ExpectAddString5("abcde", 10, 0);
+
+	ExpectAddString5("äöü", 5, "äö");
+	ExpectAddString5("äöü", 6, 0);
+}
+
+TEST(Packer, AddStringBroken)
+{
+	ExpectAddString5("\x80", 0, "�");
+	ExpectAddString5("\x80\x80", 0, 0);
+	ExpectAddString5("a\x80", 0, "a�");
+	ExpectAddString5("\x80"
+			 "a",
+		0, "�a");
+	ExpectAddString5("\x80", 1, "");
+	ExpectAddString5("\x80\x80", 3, "�");
+	ExpectAddString5("\x80\x80", 5, "�");
+	ExpectAddString5("\x80\x80", 6, 0);
+}
+
+TEST(Packer, Error)
+{
+	char aData[CPacker::PACKER_BUFFER_SIZE];
+	mem_zero(aData, sizeof(aData));
+
+	{
+		CPacker Packer;
+		Packer.Reset();
+		EXPECT_EQ(Packer.Error(), false);
+		Packer.AddRaw(aData, sizeof(aData) - 1);
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData) - 1);
+		Packer.AddInt(1);
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData));
+		Packer.AddInt(2);
+		EXPECT_EQ(Packer.Error(), true);
+		Packer.AddInt(3);
+		EXPECT_EQ(Packer.Error(), true);
+	}
+
+	{
+		CPacker Packer;
+		Packer.Reset();
+		EXPECT_EQ(Packer.Error(), false);
+		Packer.AddRaw(aData, sizeof(aData) - 1);
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData) - 1);
+		Packer.AddRaw(aData, 1);
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData));
+		Packer.AddRaw(aData, 1);
+		EXPECT_EQ(Packer.Error(), true);
+		Packer.AddRaw(aData, 1);
+		EXPECT_EQ(Packer.Error(), true);
+	}
+
+	{
+		CPacker Packer;
+		Packer.Reset();
+		EXPECT_EQ(Packer.Error(), false);
+		Packer.AddRaw(aData, sizeof(aData) - 5);
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData) - 5);
+		Packer.AddString("test");
+		EXPECT_EQ(Packer.Error(), false);
+		EXPECT_EQ(Packer.Size(), sizeof(aData));
+		Packer.AddString("test");
+		EXPECT_EQ(Packer.Error(), true);
+		Packer.AddString("test");
+		EXPECT_EQ(Packer.Error(), true);
+	}
+}
diff --git a/src_bkp/test/prng.cpp b/src_bkp/test/prng.cpp
new file mode 100644
index 0000000000..d023d3809d
--- /dev/null
+++ b/src_bkp/test/prng.cpp
@@ -0,0 +1,80 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <game/prng.h>
+
+// https://www.pcg-random.org/using-pcg-c-basic.html, retrieved 2020-05-25
+// suggests to use `pcg-32-global.demo.c`:
+//
+// ```
+// unix% ./pcg32-demo
+// pcg32_random_r:
+//       -  result:      32-bit unsigned int (uint32_t)
+//       -  period:      2^64   (* 2^63 streams)
+//       -  state type:  pcg32_random_t (16 bytes)
+//       -  output func: XSH-RR
+//
+// Round 1:
+//   32bit: 0xa15c02b7 0x7b47f409 0xba1d3330 0x83d2f293 0xbfa4784b 0xcbed606e
+//   Coins: HHTTTHTHHHTHTTTHHHHHTTTHHHTHTHTHTTHTTTHHHHHHTTTTHHTTTTTHTTTTTTTHT
+//   Rolls: 3 4 1 1 2 2 3 2 4 3 2 4 3 3 5 2 3 1 3 1 5 1 4 1 5 6 4 6 6 2 6 3 3
+//   Cards: Qd Ks 6d 3s 3d 4c 3h Td Kc 5c Jh Kd Jd As 4s 4h Ad Th Ac Jc 7s Qs
+//          2s 7h Kh 2d 6c Ah 4d Qh 9h 6s 5s 2c 9c Ts 8d 9s 3c 8c Js 5d 2h 6h
+//          7d 8s 9d 5h 8h Qc 7c Tc
+// ⋮
+// ⋮
+// Round 5:
+//   32bit: 0xfcef7cd6 0x1b488b5a 0xd0daf7ea 0x1d9a70f7 0x241a37cf 0x9a3857b7
+//   Coins: HHHHTHHTTHTTHHHTTTHHTHTHTTTTHTTHTHTTTHHHTHTHTTHTTHTHHTHTHHHTHTHTT
+//   Rolls: 5 4 1 2 6 1 3 1 5 6 3 6 2 1 4 4 5 2 1 5 6 5 6 4 4 4 5 2 6 4 3 5 6
+//   Cards: 4d 9s Qc 9h As Qs 7s 4c Kd 6h 6s 2c 8c 5d 7h 5h Jc 3s 7c Jh Js Ks
+//          Tc Jd Kc Th 3h Ts Qh Ad Td 3c Ah 2d 3d 5c Ac 8s 5s 9c 2h 6c 6d Kh
+//          Qd 8d 7d 2s 8h 4h 9d 4s
+// ```
+//
+// Numbers can also be seen at
+// https://github.com/imneme/pcg-c/blob/83252d9c23df9c82ecb42210afed61a7b42402d7/test-high/expected/check-pcg32.out.
+//
+// It's also the output of `pcg32-global-demo.c` from
+// https://github.com/imneme/pcg-c-basic/tree/bc39cd76ac3d541e618606bcc6e1e5ba5e5e6aa3.
+//
+// Only the first 6 numbers are taken from the generator directly, after this,
+// something more complicated is done.
+
+static const unsigned int PCG32_GLOBAL_DEMO[] = {
+	0xa15c02b7,
+	0x7b47f409,
+	0xba1d3330,
+	0x83d2f293,
+	0xbfa4784b,
+	0xcbed606e,
+};
+
+TEST(Prng, EqualsPcg32GlobalDemo)
+{
+	uint64_t aSeed[2] = {42, 54};
+
+	CPrng Prng;
+	Prng.Seed(aSeed);
+	for(auto Expected : PCG32_GLOBAL_DEMO)
+	{
+		EXPECT_EQ(Prng.RandomBits(), Expected);
+	}
+}
+
+TEST(Prng, Description)
+{
+	CPrng Prng;
+	EXPECT_STREQ(Prng.Description(), "pcg-xsh-rr:unseeded");
+
+	uint64_t aSeed0[2] = {0xfedbca9876543210, 0x0123456789abcdef};
+	uint64_t aSeed1[2] = {0x0123456789abcdef, 0xfedcba9876543210};
+	uint64_t aSeed2[2] = {0x0000000000000000, 0x0000000000000000};
+
+	Prng.Seed(aSeed0);
+	EXPECT_STREQ(Prng.Description(), "pcg-xsh-rr:fedbca9876543210:0123456789abcdef");
+	Prng.Seed(aSeed1);
+	EXPECT_STREQ(Prng.Description(), "pcg-xsh-rr:0123456789abcdef:fedcba9876543210");
+	Prng.Seed(aSeed2);
+	EXPECT_STREQ(Prng.Description(), "pcg-xsh-rr:0000000000000000:0000000000000000");
+}
diff --git a/src_bkp/test/score.cpp b/src_bkp/test/score.cpp
new file mode 100644
index 0000000000..2a2d0ba2ea
--- /dev/null
+++ b/src_bkp/test/score.cpp
@@ -0,0 +1,626 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <base/detect.h>
+#include <engine/server/databases/connection.h>
+#include <engine/server/databases/connection_pool.h>
+#include <engine/shared/config.h>
+#include <game/server/scoreworker.h>
+
+#include <sqlite3.h>
+
+#if defined(CONF_TEST_MYSQL)
+int DummyMysqlInit = (MysqlInit(), 1);
+#endif
+
+char *CSaveTeam::GetString()
+{
+	// Dummy implementation for testing
+	return nullptr;
+}
+
+int CSaveTeam::FromString(const char *)
+{
+	// Dummy implementation for testing
+	return 1;
+}
+
+bool CSaveTeam::MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen) const
+{
+	// Dummy implementation for testing
+	return false;
+}
+
+TEST(SQLite, Version)
+{
+	ASSERT_GE(sqlite3_libversion_number(), 3025000) << "SQLite >= 3.25.0 required for Window functions";
+}
+
+struct Score : public testing::TestWithParam<IDbConnection *>
+{
+	Score()
+	{
+		Connect();
+		LoadBestTime();
+		InsertMap();
+	}
+
+	~Score()
+	{
+		m_pConn->Disconnect();
+	}
+
+	void Connect()
+	{
+		ASSERT_FALSE(m_pConn->Connect(m_aError, sizeof(m_aError))) << m_aError;
+
+		// Delete all existing entries for persistent databases like MySQL
+		int NumInserted = 0;
+		ASSERT_FALSE(m_pConn->PrepareStatement("DELETE FROM record_race", m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->PrepareStatement("DELETE FROM record_teamrace", m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->PrepareStatement("DELETE FROM record_maps", m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->PrepareStatement("DELETE FROM record_points", m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->PrepareStatement("DELETE FROM record_saves", m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+	}
+
+	void LoadBestTime()
+	{
+		CSqlLoadBestTimeData loadBestTimeData(std::make_shared<CScoreLoadBestTimeResult>());
+		str_copy(loadBestTimeData.m_aMap, "Kobra 3", sizeof(loadBestTimeData.m_aMap));
+		ASSERT_FALSE(CScoreWorker::LoadBestTime(m_pConn, &loadBestTimeData, m_aError, sizeof(m_aError))) << m_aError;
+	}
+
+	void InsertMap()
+	{
+		char aTimestamp[32];
+		str_timestamp_format(aTimestamp, sizeof(aTimestamp), FORMAT_SPACE);
+		char aBuf[512];
+		str_format(aBuf, sizeof(aBuf),
+			"%s into %s_maps(Map, Server, Mapper, Points, Stars, Timestamp) "
+			"VALUES (\"Kobra 3\", \"Novice\", \"Zerodin\", 5, 5, %s)",
+			m_pConn->InsertIgnore(), m_pConn->GetPrefix(), m_pConn->InsertTimestampAsUtc());
+		ASSERT_FALSE(m_pConn->PrepareStatement(aBuf, m_aError, sizeof(m_aError))) << m_aError;
+		m_pConn->BindString(1, aTimestamp);
+		int NumInserted = 0;
+		ASSERT_FALSE(m_pConn->ExecuteUpdate(&NumInserted, m_aError, sizeof(m_aError))) << m_aError;
+		ASSERT_EQ(NumInserted, 1);
+	}
+
+	void InsertRank(float Time = 100.0, bool WithTimeCheckPoints = false)
+	{
+		str_copy(g_Config.m_SvSqlServerName, "USA", sizeof(g_Config.m_SvSqlServerName));
+		CSqlScoreData ScoreData(std::make_shared<CScorePlayerResult>());
+		str_copy(ScoreData.m_aMap, "Kobra 3", sizeof(ScoreData.m_aMap));
+		str_copy(ScoreData.m_aGameUuid, "8d300ecf-5873-4297-bee5-95668fdff320", sizeof(ScoreData.m_aGameUuid));
+		str_copy(ScoreData.m_aName, "nameless tee", sizeof(ScoreData.m_aName));
+		ScoreData.m_ClientID = 0;
+		ScoreData.m_Time = Time;
+		str_copy(ScoreData.m_aTimestamp, "2021-11-24 19:24:08", sizeof(ScoreData.m_aTimestamp));
+		for(int i = 0; i < NUM_CHECKPOINTS; i++)
+			ScoreData.m_aCurrentTimeCp[i] = WithTimeCheckPoints ? i : 0;
+		str_copy(ScoreData.m_aRequestingPlayer, "deen", sizeof(ScoreData.m_aRequestingPlayer));
+		ASSERT_FALSE(CScoreWorker::SaveScore(m_pConn, &ScoreData, Write::NORMAL, m_aError, sizeof(m_aError))) << m_aError;
+	}
+
+	void ExpectLines(const std::shared_ptr<CScorePlayerResult> &pPlayerResult, std::initializer_list<const char *> Lines, bool All = false)
+	{
+		EXPECT_EQ(pPlayerResult->m_MessageKind, All ? CScorePlayerResult::ALL : CScorePlayerResult::DIRECT);
+
+		int i = 0;
+		for(const char *pLine : Lines)
+		{
+			EXPECT_STREQ(pPlayerResult->m_Data.m_aaMessages[i], pLine);
+			i++;
+		}
+
+		for(; i < CScorePlayerResult::MAX_MESSAGES; i++)
+		{
+			EXPECT_STREQ(pPlayerResult->m_Data.m_aaMessages[i], "");
+		}
+	}
+
+	IDbConnection *m_pConn{GetParam()};
+	char m_aError[256] = {};
+	std::shared_ptr<CScorePlayerResult> m_pPlayerResult{std::make_shared<CScorePlayerResult>()};
+	CSqlPlayerRequest m_PlayerRequest{m_pPlayerResult};
+};
+
+struct SingleScore : public Score
+{
+	SingleScore()
+	{
+		InsertRank();
+		str_copy(m_PlayerRequest.m_aMap, "Kobra 3", sizeof(m_PlayerRequest.m_aMap));
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+		m_PlayerRequest.m_Offset = 0;
+		str_copy(m_PlayerRequest.m_aServer, "GER", sizeof(m_PlayerRequest.m_aServer));
+		str_copy(m_PlayerRequest.m_aName, "nameless tee", sizeof(m_PlayerRequest.m_aMap));
+	}
+};
+
+TEST_P(SingleScore, TopRegional)
+{
+	g_Config.m_SvRegionalRankings = true;
+	ASSERT_FALSE(CScoreWorker::ShowTop(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------------ Global Top ------------",
+			"1. nameless tee Time: 01:40.00",
+			"------------ GER Top ------------"});
+}
+
+TEST_P(SingleScore, Top)
+{
+	g_Config.m_SvRegionalRankings = false;
+	ASSERT_FALSE(CScoreWorker::ShowTop(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------------ Global Top ------------",
+			"1. nameless tee Time: 01:40.00",
+			"----------------------------------------"});
+}
+
+TEST_P(SingleScore, RankRegional)
+{
+	g_Config.m_SvRegionalRankings = true;
+	ASSERT_FALSE(CScoreWorker::ShowRank(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"nameless tee - 01:40.00 - better than 100% - requested by brainless tee", "Global rank 1 - GER unranked"}, true);
+}
+
+TEST_P(SingleScore, Rank)
+{
+	g_Config.m_SvRegionalRankings = false;
+	ASSERT_FALSE(CScoreWorker::ShowRank(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"nameless tee - 01:40.00 - better than 100% - requested by brainless tee", "Global rank 1"}, true);
+}
+
+TEST_P(SingleScore, TopServerRegional)
+{
+	g_Config.m_SvRegionalRankings = true;
+	str_copy(m_PlayerRequest.m_aServer, "USA", sizeof(m_PlayerRequest.m_aServer));
+	ASSERT_FALSE(CScoreWorker::ShowTop(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------------ Global Top ------------",
+			"1. nameless tee Time: 01:40.00",
+			"------------ USA Top ------------",
+			"1. nameless tee Time: 01:40.00"});
+}
+
+TEST_P(SingleScore, TopServer)
+{
+	g_Config.m_SvRegionalRankings = false;
+	str_copy(m_PlayerRequest.m_aServer, "USA", sizeof(m_PlayerRequest.m_aServer));
+	ASSERT_FALSE(CScoreWorker::ShowTop(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------------ Global Top ------------",
+			"1. nameless tee Time: 01:40.00",
+			"----------------------------------------"});
+}
+
+TEST_P(SingleScore, RankServerRegional)
+{
+	g_Config.m_SvRegionalRankings = true;
+	str_copy(m_PlayerRequest.m_aServer, "USA", sizeof(m_PlayerRequest.m_aServer));
+	ASSERT_FALSE(CScoreWorker::ShowRank(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"nameless tee - 01:40.00 - better than 100% - requested by brainless tee", "Global rank 1 - USA rank 1"}, true);
+}
+
+TEST_P(SingleScore, RankServer)
+{
+	g_Config.m_SvRegionalRankings = false;
+	str_copy(m_PlayerRequest.m_aServer, "USA", sizeof(m_PlayerRequest.m_aServer));
+	ASSERT_FALSE(CScoreWorker::ShowRank(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"nameless tee - 01:40.00 - better than 100% - requested by brainless tee", "Global rank 1"}, true);
+}
+
+TEST_P(SingleScore, LoadPlayerData)
+{
+	InsertRank(120.0, true);
+	str_copy(m_PlayerRequest.m_aName, "", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	ASSERT_FALSE(CScoreWorker::LoadPlayerData(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::PLAYER_INFO);
+	ASSERT_FALSE(m_pPlayerResult->m_Data.m_Info.m_Time.has_value());
+	for(auto &Time : m_pPlayerResult->m_Data.m_Info.m_aTimeCp)
+	{
+		ASSERT_EQ(Time, 0);
+	}
+
+	str_copy(m_PlayerRequest.m_aRequestingPlayer, "nameless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	str_copy(m_PlayerRequest.m_aName, "", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	ASSERT_FALSE(CScoreWorker::LoadPlayerData(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::PLAYER_INFO);
+	ASSERT_TRUE(m_pPlayerResult->m_Data.m_Info.m_Time.has_value());
+	ASSERT_EQ(*m_pPlayerResult->m_Data.m_Info.m_Time, 100.0);
+	for(int i = 0; i < NUM_CHECKPOINTS; i++)
+	{
+		ASSERT_EQ(m_pPlayerResult->m_Data.m_Info.m_aTimeCp[i], i);
+	}
+
+	str_copy(m_PlayerRequest.m_aRequestingPlayer, "finishless", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	str_copy(m_PlayerRequest.m_aName, "nameless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	ASSERT_FALSE(CScoreWorker::LoadPlayerData(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::PLAYER_INFO);
+	ASSERT_FALSE(m_pPlayerResult->m_Data.m_Info.m_Time.has_value());
+	for(int i = 0; i < NUM_CHECKPOINTS; i++)
+	{
+		ASSERT_EQ(m_pPlayerResult->m_Data.m_Info.m_aTimeCp[i], i);
+	}
+}
+
+TEST_P(SingleScore, TimesExists)
+{
+	ASSERT_FALSE(CScoreWorker::ShowTimes(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::DIRECT);
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[0], "------------- Last Times -------------");
+	char aBuf[128];
+	str_copy(aBuf, m_pPlayerResult->m_Data.m_aaMessages[1], 7);
+	EXPECT_STREQ(aBuf, "[USA] ");
+
+	str_copy(aBuf, m_pPlayerResult->m_Data.m_aaMessages[1] + str_length(m_pPlayerResult->m_Data.m_aaMessages[1]) - 10, 11);
+	EXPECT_STREQ(aBuf, ", 01:40.00");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[2], "----------------------------------------------------");
+	for(int i = 3; i < CScorePlayerResult::MAX_MESSAGES; i++)
+	{
+		EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[i], "");
+	}
+}
+
+TEST_P(SingleScore, TimesDoesntExist)
+{
+	str_copy(m_PlayerRequest.m_aName, "foo", sizeof(m_PlayerRequest.m_aMap));
+	ASSERT_FALSE(CScoreWorker::ShowTimes(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"There are no times in the specified range"});
+}
+
+struct TeamScore : public Score
+{
+	void SetUp() override
+	{
+		CSqlTeamScoreData teamScoreData;
+		str_copy(teamScoreData.m_aMap, "Kobra 3", sizeof(teamScoreData.m_aMap));
+		str_copy(teamScoreData.m_aGameUuid, "8d300ecf-5873-4297-bee5-95668fdff320", sizeof(teamScoreData.m_aGameUuid));
+		teamScoreData.m_Size = 2;
+		str_copy(teamScoreData.m_aaNames[0], "nameless tee", sizeof(teamScoreData.m_aaNames[0]));
+		str_copy(teamScoreData.m_aaNames[1], "brainless tee", sizeof(teamScoreData.m_aaNames[1]));
+		teamScoreData.m_Time = 100.0;
+		str_copy(teamScoreData.m_aTimestamp, "2021-11-24 19:24:08", sizeof(teamScoreData.m_aTimestamp));
+		ASSERT_FALSE(CScoreWorker::SaveTeamScore(m_pConn, &teamScoreData, Write::NORMAL, m_aError, sizeof(m_aError))) << m_aError;
+
+		str_copy(m_PlayerRequest.m_aMap, "Kobra 3", sizeof(m_PlayerRequest.m_aMap));
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+		m_PlayerRequest.m_Offset = 0;
+	}
+
+	void InsertTeamRank(float Time = 100.0)
+	{
+		CSqlTeamScoreData teamScoreData;
+		str_copy(teamScoreData.m_aMap, "Kobra 3", sizeof(teamScoreData.m_aMap));
+		str_copy(teamScoreData.m_aGameUuid, "8d300ecf-5873-4297-bee5-95668fdff320", sizeof(teamScoreData.m_aGameUuid));
+		teamScoreData.m_Size = 2;
+		str_copy(teamScoreData.m_aaNames[0], "nameless tee", sizeof(teamScoreData.m_aaNames[0]));
+		str_copy(teamScoreData.m_aaNames[1], "brainless tee", sizeof(teamScoreData.m_aaNames[1]));
+		teamScoreData.m_Time = Time;
+		str_copy(teamScoreData.m_aTimestamp, "2021-11-24 19:24:08", sizeof(teamScoreData.m_aTimestamp));
+		ASSERT_FALSE(CScoreWorker::SaveTeamScore(m_pConn, &teamScoreData, Write::NORMAL, m_aError, sizeof(m_aError))) << m_aError;
+
+		str_copy(m_PlayerRequest.m_aMap, "Kobra 3", sizeof(m_PlayerRequest.m_aMap));
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+		m_PlayerRequest.m_Offset = 0;
+	}
+};
+
+TEST_P(TeamScore, All)
+{
+	ASSERT_FALSE(CScoreWorker::ShowTeamTop5(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------- Team Top 5 -------",
+			"1. brainless tee & nameless tee Team Time: 01:40.00",
+			"-------------------------------"});
+}
+
+TEST_P(TeamScore, PlayerExists)
+{
+	str_copy(m_PlayerRequest.m_aName, "brainless tee", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::ShowPlayerTeamTop5(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------- Team Top 5 -------",
+			"1. brainless tee & nameless tee Team Time: 01:40.00",
+			"-------------------------------"});
+}
+
+TEST_P(TeamScore, PlayerDoesntExist)
+{
+	str_copy(m_PlayerRequest.m_aName, "foo", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::ShowPlayerTeamTop5(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"foo has no team ranks"});
+}
+
+TEST_P(TeamScore, RankUpdates)
+{
+	InsertTeamRank(98.0);
+	str_copy(m_PlayerRequest.m_aName, "brainless tee", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::ShowPlayerTeamTop5(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"------- Team Top 5 -------",
+			"1. brainless tee & nameless tee Team Time: 01:38.00",
+			"-------------------------------"});
+}
+
+struct MapInfo : public Score
+{
+	MapInfo()
+	{
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	}
+};
+
+TEST_P(MapInfo, ExactNoFinish)
+{
+	str_copy(m_PlayerRequest.m_aName, "Kobra 3", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapInfo(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::DIRECT);
+	EXPECT_THAT(m_pPlayerResult->m_Data.m_aaMessages[0], testing::MatchesRegex("\"Kobra 3\" by Zerodin on Novice, ★★★★★, 5 points, released .* ago, 0 finishes by 0 tees"));
+	for(int i = 1; i < CScorePlayerResult::MAX_MESSAGES; i++)
+	{
+		EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[i], "");
+	}
+}
+
+TEST_P(MapInfo, ExactFinish)
+{
+	InsertRank();
+	str_copy(m_PlayerRequest.m_aName, "Kobra 3", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapInfo(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::DIRECT);
+	EXPECT_THAT(m_pPlayerResult->m_Data.m_aaMessages[0], testing::MatchesRegex("\"Kobra 3\" by Zerodin on Novice, ★★★★★, 5 points, released .* ago, 1 finish by 1 tee in 01:40 median"));
+	for(int i = 1; i < CScorePlayerResult::MAX_MESSAGES; i++)
+	{
+		EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[i], "");
+	}
+}
+
+TEST_P(MapInfo, Fuzzy)
+{
+	InsertRank();
+	str_copy(m_PlayerRequest.m_aName, "k3", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapInfo(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::DIRECT);
+	EXPECT_THAT(m_pPlayerResult->m_Data.m_aaMessages[0], testing::MatchesRegex("\"Kobra 3\" by Zerodin on Novice, ★★★★★, 5 points, released .* ago, 1 finish by 1 tee in 01:40 median"));
+	for(int i = 1; i < CScorePlayerResult::MAX_MESSAGES; i++)
+	{
+		EXPECT_STREQ(m_pPlayerResult->m_Data.m_aaMessages[i], "");
+	}
+}
+
+TEST_P(MapInfo, DoesntExit)
+{
+	str_copy(m_PlayerRequest.m_aName, "f", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapInfo(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"No map like \"f\" found."});
+}
+
+struct MapVote : public Score
+{
+	MapVote()
+	{
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+	}
+};
+
+TEST_P(MapVote, Exact)
+{
+	str_copy(m_PlayerRequest.m_aName, "Kobra 3", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapVote(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::MAP_VOTE);
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aMap, "Kobra 3");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aReason, "/map");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aServer, "novice");
+}
+
+TEST_P(MapVote, Fuzzy)
+{
+	str_copy(m_PlayerRequest.m_aName, "k3", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapVote(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pPlayerResult->m_MessageKind, CScorePlayerResult::MAP_VOTE);
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aMap, "Kobra 3");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aReason, "/map");
+	EXPECT_STREQ(m_pPlayerResult->m_Data.m_MapVote.m_aServer, "novice");
+}
+
+TEST_P(MapVote, DoesntExist)
+{
+	str_copy(m_PlayerRequest.m_aName, "f", sizeof(m_PlayerRequest.m_aName));
+	ASSERT_FALSE(CScoreWorker::MapVote(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"No map like \"f\" found. Try adding a '%' at the start if you don't know the first character. Example: /map %castle for \"Out of Castle\""});
+}
+
+struct Points : public Score
+{
+	Points()
+	{
+		str_copy(m_PlayerRequest.m_aName, "nameless tee", sizeof(m_PlayerRequest.m_aName));
+		str_copy(m_PlayerRequest.m_aRequestingPlayer, "brainless tee", sizeof(m_PlayerRequest.m_aRequestingPlayer));
+		m_PlayerRequest.m_Offset = 0;
+	}
+};
+
+TEST_P(Points, NoPoints)
+{
+	ASSERT_FALSE(CScoreWorker::ShowPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"nameless tee has not collected any points so far"});
+}
+
+TEST_P(Points, NoPointsTop)
+{
+	ASSERT_FALSE(CScoreWorker::ShowTopPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"-------- Top Points --------",
+					     "-------------------------------"});
+}
+
+TEST_P(Points, OnePoints)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"1. nameless tee Points: 2, requested by brainless tee"}, true);
+}
+
+TEST_P(Points, OnePointsTop)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowTopPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"-------- Top Points --------",
+			"1. nameless tee Points: 2",
+			"-------------------------------"});
+}
+
+TEST_P(Points, TwoPoints)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("brainless tee", 3, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"2. nameless tee Points: 2, requested by brainless tee"}, true);
+}
+
+TEST_P(Points, TwoPointsTop)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("brainless tee", 3, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowTopPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"-------- Top Points --------",
+			"1. brainless tee Points: 3",
+			"2. nameless tee Points: 2",
+			"-------------------------------"});
+}
+
+TEST_P(Points, EqualPoints)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("brainless tee", 3, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("nameless tee", 1, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult, {"1. nameless tee Points: 3, requested by brainless tee"}, true);
+}
+
+TEST_P(Points, EqualPointsTop)
+{
+	m_pConn->AddPoints("nameless tee", 2, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("brainless tee", 3, m_aError, sizeof(m_aError));
+	m_pConn->AddPoints("nameless tee", 1, m_aError, sizeof(m_aError));
+	ASSERT_FALSE(CScoreWorker::ShowTopPoints(m_pConn, &m_PlayerRequest, m_aError, sizeof(m_aError))) << m_aError;
+	ExpectLines(m_pPlayerResult,
+		{"-------- Top Points --------",
+			"1. brainless tee Points: 3",
+			"1. nameless tee Points: 3",
+			"-------------------------------"});
+}
+
+struct RandomMap : public Score
+{
+	std::shared_ptr<CScoreRandomMapResult> m_pRandomMapResult{std::make_shared<CScoreRandomMapResult>(0)};
+	CSqlRandomMapRequest m_RandomMapRequest{m_pRandomMapResult};
+
+	RandomMap()
+	{
+		str_copy(m_RandomMapRequest.m_aServerType, "Novice", sizeof(m_RandomMapRequest.m_aServerType));
+		str_copy(m_RandomMapRequest.m_aCurrentMap, "Kobra 4", sizeof(m_RandomMapRequest.m_aCurrentMap));
+		str_copy(m_RandomMapRequest.m_aRequestingPlayer, "nameless tee", sizeof(m_RandomMapRequest.m_aRequestingPlayer));
+	}
+};
+
+TEST_P(RandomMap, NoStars)
+{
+	m_RandomMapRequest.m_Stars = -1;
+	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
+}
+
+TEST_P(RandomMap, StarsExists)
+{
+	m_RandomMapRequest.m_Stars = 5;
+	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
+}
+
+TEST_P(RandomMap, StarsDoesntExist)
+{
+	m_RandomMapRequest.m_Stars = 3;
+	ASSERT_FALSE(CScoreWorker::RandomMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "No maps found on this server!");
+}
+
+TEST_P(RandomMap, UnfinishedExists)
+{
+	m_RandomMapRequest.m_Stars = -1;
+	ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "Kobra 3");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "");
+}
+
+TEST_P(RandomMap, UnfinishedDoesntExist)
+{
+	InsertRank();
+	ASSERT_FALSE(CScoreWorker::RandomUnfinishedMap(m_pConn, &m_RandomMapRequest, m_aError, sizeof(m_aError))) << m_aError;
+	EXPECT_EQ(m_pRandomMapResult->m_ClientID, 0);
+	EXPECT_STREQ(m_pRandomMapResult->m_aMap, "");
+	EXPECT_STREQ(m_pRandomMapResult->m_aMessage, "You have no more unfinished maps on this server!");
+}
+
+auto g_pSqliteConn = CreateSqliteConnection(":memory:", true);
+#if defined(CONF_TEST_MYSQL)
+CMysqlConfig gMysqlConfig{
+	"ddnet", // database
+	"record", // prefix
+	"ddnet", // user
+	"thebestpassword", // password
+	"localhost", // ip
+	"", // bindaddr
+	3306, // port
+	true, // setup
+};
+auto g_pMysqlConn = CreateMysqlConnection(gMysqlConfig);
+#endif
+
+auto g_TestValues
+{
+	testing::Values(
+#if defined(CONF_TEST_MYSQL)
+		g_pMysqlConn.get(),
+#endif
+		g_pSqliteConn.get())
+};
+
+#define INSTANTIATE(SUITE) \
+	INSTANTIATE_TEST_SUITE_P(Sql, SUITE, g_TestValues, \
+		[](const testing::TestParamInfo<Score::ParamType> &Info) { \
+			switch(Info.index) \
+			{ \
+			case 0: return "SQLite"; \
+			case 1: return "MySQL"; \
+			default: return "Unknown"; \
+			} \
+		})
+
+INSTANTIATE(SingleScore);
+INSTANTIATE(TeamScore);
+INSTANTIATE(MapInfo);
+INSTANTIATE(MapVote);
+INSTANTIATE(Points);
+INSTANTIATE(RandomMap);
diff --git a/src_bkp/test/secure_random.cpp b/src_bkp/test/secure_random.cpp
new file mode 100644
index 0000000000..2bbc7bfc79
--- /dev/null
+++ b/src_bkp/test/secure_random.cpp
@@ -0,0 +1,34 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(SecureRandom, Fill)
+{
+	unsigned int Bits = 0;
+	while(~Bits)
+	{
+		unsigned int Random;
+		secure_random_fill(&Random, sizeof(Random));
+		Bits |= Random;
+	}
+}
+
+TEST(SecureRandom, Below1)
+{
+	EXPECT_EQ(secure_rand_below(1), 0);
+}
+
+TEST(SecureRandom, Below)
+{
+	const int BOUNDS[] = {2, 3, 4, 5, 10, 100, 127, 128, 129};
+	for(auto Below : BOUNDS)
+	{
+		for(int j = 0; j < 10; j++)
+		{
+			int Random = secure_rand_below(Below);
+			EXPECT_GE(Random, 0);
+			EXPECT_LT(Random, Below);
+		}
+	}
+}
diff --git a/src_bkp/test/serverbrowser.cpp b/src_bkp/test/serverbrowser.cpp
new file mode 100644
index 0000000000..7c466f3707
--- /dev/null
+++ b/src_bkp/test/serverbrowser.cpp
@@ -0,0 +1,99 @@
+#include <gtest/gtest.h>
+#include <memory>
+
+#include <engine/client/serverbrowser_ping_cache.h>
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/shared/config.h>
+#include <engine/storage.h>
+#include <test/test.h>
+
+TEST(ServerBrowser, PingCache)
+{
+	CTestInfo Info;
+	Info.m_DeleteTestStorageFilesOnSuccess = true;
+
+	auto pConsole = CreateConsole(CFGFLAG_CLIENT);
+	auto pStorage = std::unique_ptr<IStorage>(Info.CreateTestStorage());
+	auto pPingCache = std::unique_ptr<IServerBrowserPingCache>(CreateServerBrowserPingCache(pConsole.get(), pStorage.get()));
+
+	NETADDR Localhost4, Localhost6, OtherLocalhost4, OtherLocalhost6;
+	ASSERT_FALSE(net_addr_from_str(&Localhost4, "127.0.0.1:8303"));
+	ASSERT_FALSE(net_addr_from_str(&Localhost6, "[::1]:8304"));
+	ASSERT_FALSE(net_addr_from_str(&OtherLocalhost4, "127.0.0.1:8305"));
+	ASSERT_FALSE(net_addr_from_str(&OtherLocalhost6, "[::1]:8306"));
+	EXPECT_LT(net_addr_comp(&Localhost4, &Localhost6), 0);
+	NETADDR aLocalhostBoth[2] = {Localhost4, Localhost6};
+
+	EXPECT_EQ(pPingCache->NumEntries(), 0);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), -1);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), -1);
+
+	pPingCache->Load();
+
+	EXPECT_EQ(pPingCache->NumEntries(), 0);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), -1);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), -1);
+
+	// Newer pings overwrite older.
+	pPingCache->CachePing(Localhost4, 123);
+	pPingCache->CachePing(Localhost4, 234);
+	pPingCache->CachePing(Localhost4, 345);
+	pPingCache->CachePing(Localhost4, 456);
+	pPingCache->CachePing(Localhost4, 567);
+	pPingCache->CachePing(Localhost4, 678);
+	pPingCache->CachePing(Localhost4, 789);
+	pPingCache->CachePing(Localhost4, 890);
+	pPingCache->CachePing(Localhost4, 901);
+	pPingCache->CachePing(Localhost4, 135);
+	pPingCache->CachePing(Localhost4, 246);
+	pPingCache->CachePing(Localhost4, 357);
+	pPingCache->CachePing(Localhost4, 468);
+	pPingCache->CachePing(Localhost4, 579);
+	pPingCache->CachePing(Localhost4, 680);
+	pPingCache->CachePing(Localhost4, 791);
+	pPingCache->CachePing(Localhost4, 802);
+	pPingCache->CachePing(Localhost4, 913);
+
+	EXPECT_EQ(pPingCache->NumEntries(), 1);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), 913);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), -1);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), 913);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), 913);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), -1);
+
+	pPingCache->CachePing(Localhost4, 234);
+	pPingCache->CachePing(Localhost6, 345);
+	EXPECT_EQ(pPingCache->NumEntries(), 2);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), 234);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), 345);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), 234);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), 234);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), 345);
+
+	// Port doesn't matter for overwriting.
+	pPingCache->CachePing(Localhost4, 1337);
+	EXPECT_EQ(pPingCache->NumEntries(), 2);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), 1337);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), 345);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), 345);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), 1337);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), 345);
+
+	pPingCache.reset(CreateServerBrowserPingCache(pConsole.get(), pStorage.get()));
+
+	// Persistence.
+	pPingCache->Load();
+	EXPECT_EQ(pPingCache->NumEntries(), 2);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost4, 1), 1337);
+	EXPECT_EQ(pPingCache->GetPing(&Localhost6, 1), 345);
+	EXPECT_EQ(pPingCache->GetPing(aLocalhostBoth, 2), 345);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost4, 1), 1337);
+	EXPECT_EQ(pPingCache->GetPing(&OtherLocalhost6, 1), 345);
+}
diff --git a/src_bkp/test/serverinfo.cpp b/src_bkp/test/serverinfo.cpp
new file mode 100644
index 0000000000..37b850e8f2
--- /dev/null
+++ b/src_bkp/test/serverinfo.cpp
@@ -0,0 +1,55 @@
+#include <gtest/gtest.h>
+
+#include <engine/serverbrowser.h>
+#include <engine/shared/serverinfo.h>
+
+#include <engine/external/json-parser/json.h>
+
+TEST(ServerInfo, ParseLocation)
+{
+	int Result;
+	EXPECT_TRUE(CServerInfo::ParseLocation(&Result, "xx"));
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "an"));
+	EXPECT_EQ(Result, CServerInfo::LOC_UNKNOWN);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "af"));
+	EXPECT_EQ(Result, CServerInfo::LOC_AFRICA);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "eu-n"));
+	EXPECT_EQ(Result, CServerInfo::LOC_EUROPE);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "na"));
+	EXPECT_EQ(Result, CServerInfo::LOC_NORTH_AMERICA);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "sa"));
+	EXPECT_EQ(Result, CServerInfo::LOC_SOUTH_AMERICA);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "as:e"));
+	EXPECT_EQ(Result, CServerInfo::LOC_ASIA);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "as:cn"));
+	EXPECT_EQ(Result, CServerInfo::LOC_CHINA);
+	EXPECT_FALSE(CServerInfo::ParseLocation(&Result, "oc"));
+	EXPECT_EQ(Result, CServerInfo::LOC_AUSTRALIA);
+}
+
+static unsigned int ParseCrcOrDeadbeef(const char *pString)
+{
+	unsigned int Result;
+	if(ParseCrc(&Result, pString))
+	{
+		Result = 0xdeadbeef;
+	}
+	return Result;
+}
+
+TEST(ServerInfo, Crc)
+{
+	EXPECT_EQ(ParseCrcOrDeadbeef("00000000"), 0);
+	EXPECT_EQ(ParseCrcOrDeadbeef("00000001"), 1);
+	EXPECT_EQ(ParseCrcOrDeadbeef("12345678"), 0x12345678);
+	EXPECT_EQ(ParseCrcOrDeadbeef("9abcdef0"), 0x9abcdef0);
+
+	EXPECT_EQ(ParseCrcOrDeadbeef(""), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("a"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("x"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("ç"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("😢"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("0"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("000000000"), 0xdeadbeef);
+	EXPECT_EQ(ParseCrcOrDeadbeef("00000000x"), 0xdeadbeef);
+}
diff --git a/src_bkp/test/str.cpp b/src_bkp/test/str.cpp
new file mode 100644
index 0000000000..a586e81106
--- /dev/null
+++ b/src_bkp/test/str.cpp
@@ -0,0 +1,1117 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+TEST(Str, Dist)
+{
+	EXPECT_EQ(str_utf8_dist("aaa", "aaa"), 0);
+	EXPECT_EQ(str_utf8_dist("123", "123"), 0);
+	EXPECT_EQ(str_utf8_dist("", ""), 0);
+	EXPECT_EQ(str_utf8_dist("a", "b"), 1);
+	EXPECT_EQ(str_utf8_dist("", "aaa"), 3);
+	EXPECT_EQ(str_utf8_dist("123", ""), 3);
+	EXPECT_EQ(str_utf8_dist("ä", ""), 1);
+	EXPECT_EQ(str_utf8_dist("Hëllö", "Hello"), 2);
+	// https://en.wikipedia.org/w/index.php?title=Levenshtein_distance&oldid=828480025#Example
+	EXPECT_EQ(str_utf8_dist("kitten", "sitting"), 3);
+	EXPECT_EQ(str_utf8_dist("flaw", "lawn"), 2);
+	EXPECT_EQ(str_utf8_dist("saturday", "sunday"), 3);
+}
+
+TEST(Str, Utf8Isspace)
+{
+	EXPECT_TRUE(str_utf8_isspace(0x200b)); // Zero-width space
+	EXPECT_TRUE(str_utf8_isspace(' '));
+	EXPECT_FALSE(str_utf8_isspace('a'));
+	// Control characters.
+	for(char c = 0; c < 0x20; c++)
+	{
+		EXPECT_TRUE(str_utf8_isspace(c));
+	}
+}
+
+TEST(Str, Utf8SkipWhitespaces)
+{
+	EXPECT_STREQ(str_utf8_skip_whitespaces("abc"), "abc");
+	EXPECT_STREQ(str_utf8_skip_whitespaces("abc   "), "abc   ");
+	EXPECT_STREQ(str_utf8_skip_whitespaces("    abc"), "abc");
+	EXPECT_STREQ(str_utf8_skip_whitespaces("\xe2\x80\x8b abc"), "abc");
+}
+
+TEST(Str, Utf8TrimRight)
+{
+	char A1[] = "abc";
+	str_utf8_trim_right(A1);
+	EXPECT_STREQ(A1, "abc");
+	char A2[] = "   abc";
+	str_utf8_trim_right(A2);
+	EXPECT_STREQ(A2, "   abc");
+	char A3[] = "abc   ";
+	str_utf8_trim_right(A3);
+	EXPECT_STREQ(A3, "abc");
+	char A4[] = "abc \xe2\x80\x8b";
+	str_utf8_trim_right(A4);
+	EXPECT_STREQ(A4, "abc");
+}
+
+TEST(Str, Utf8CompConfusables)
+{
+	EXPECT_TRUE(str_utf8_comp_confusable("abc", "abc") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("rn", "m") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("m", "rn") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("rna", "ma") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("ma", "rna") == 0);
+	EXPECT_FALSE(str_utf8_comp_confusable("mA", "rna") == 0);
+	EXPECT_FALSE(str_utf8_comp_confusable("ma", "rnA") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("arn", "am") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("am", "arn") == 0);
+	EXPECT_FALSE(str_utf8_comp_confusable("Am", "arn") == 0);
+	EXPECT_FALSE(str_utf8_comp_confusable("am", "Arn") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("l", "ӏ") == 0); // CYRILLIC SMALL LETTER PALOCHKA
+	EXPECT_TRUE(str_utf8_comp_confusable("i", "¡") == 0); // INVERTED EXCLAMATION MARK
+	EXPECT_FALSE(str_utf8_comp_confusable("o", "x") == 0);
+	EXPECT_TRUE(str_utf8_comp_confusable("aceiou", "ąçęįǫų") == 0);
+}
+
+TEST(Str, Utf8ToSkeleton)
+{
+	int aBuf[32];
+	EXPECT_EQ(str_utf8_to_skeleton("abc", aBuf, 0), 0);
+	EXPECT_EQ(str_utf8_to_skeleton("", aBuf, std::size(aBuf)), 0);
+	EXPECT_EQ(str_utf8_to_skeleton("abc", aBuf, std::size(aBuf)), 3);
+	EXPECT_EQ(aBuf[0], 'a');
+	EXPECT_EQ(aBuf[1], 'b');
+	EXPECT_EQ(aBuf[2], 'c');
+	EXPECT_EQ(str_utf8_to_skeleton("m", aBuf, std::size(aBuf)), 2);
+	EXPECT_EQ(aBuf[0], 'r');
+	EXPECT_EQ(aBuf[1], 'n');
+	EXPECT_EQ(str_utf8_to_skeleton("rn", aBuf, std::size(aBuf)), 2);
+	EXPECT_EQ(aBuf[0], 'r');
+	EXPECT_EQ(aBuf[1], 'n');
+	EXPECT_EQ(str_utf8_to_skeleton("ӏ", aBuf, std::size(aBuf)), 1); // CYRILLIC SMALL LETTER PALOCHKA
+	EXPECT_EQ(aBuf[0], 'i');
+	EXPECT_EQ(str_utf8_to_skeleton("¡", aBuf, std::size(aBuf)), 1); // INVERTED EXCLAMATION MARK
+	EXPECT_EQ(aBuf[0], 'i');
+	EXPECT_EQ(str_utf8_to_skeleton("ąçęįǫų", aBuf, std::size(aBuf)), 6);
+	EXPECT_EQ(aBuf[0], 'a');
+	EXPECT_EQ(aBuf[1], 'c');
+	EXPECT_EQ(aBuf[2], 'e');
+	EXPECT_EQ(aBuf[3], 'i');
+	EXPECT_EQ(aBuf[4], 'o');
+	EXPECT_EQ(aBuf[5], 'u');
+}
+
+TEST(Str, Utf8ToLower)
+{
+	EXPECT_TRUE(str_utf8_tolower('A') == 'a');
+	EXPECT_TRUE(str_utf8_tolower('z') == 'z');
+	EXPECT_TRUE(str_utf8_tolower(192) == 224); // À -> à
+	EXPECT_TRUE(str_utf8_tolower(7882) == 7883); // Ị -> ị
+
+	EXPECT_TRUE(str_utf8_comp_nocase("ÖlÜ", "ölü") == 0);
+	EXPECT_TRUE(str_utf8_comp_nocase("ÜlÖ", "ölü") > 0); // ü > ö
+	EXPECT_TRUE(str_utf8_comp_nocase("ÖlÜ", "ölüa") < 0); // NULL < a
+	EXPECT_TRUE(str_utf8_comp_nocase("ölüa", "ÖlÜ") > 0); // a < NULL
+
+#if(CHAR_MIN < 0)
+	const char a[2] = {CHAR_MIN, 0};
+	const char b[2] = {0, 0};
+	EXPECT_TRUE(str_utf8_comp_nocase(a, b) > 0);
+	EXPECT_TRUE(str_utf8_comp_nocase(b, a) < 0);
+#endif
+
+	EXPECT_TRUE(str_utf8_comp_nocase_num("ÖlÜ", "ölüa", 5) == 0);
+	EXPECT_TRUE(str_utf8_comp_nocase_num("ÖlÜ", "ölüa", 6) != 0);
+	EXPECT_TRUE(str_utf8_comp_nocase_num("a", "z", 0) == 0);
+	EXPECT_TRUE(str_utf8_comp_nocase_num("a", "z", 1) != 0);
+}
+
+TEST(Str, Utf8FindNocase)
+{
+	const char *pStr = "abc";
+	const char *pEnd;
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "a", &pEnd), pStr);
+	EXPECT_EQ(pEnd, pStr + str_length("a"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "b", &pEnd), pStr + str_length("a"));
+	EXPECT_EQ(pEnd, pStr + str_length("ab"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "c", &pEnd), pStr + str_length("ab"));
+	EXPECT_EQ(pEnd, pStr + str_length("abc"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "d", &pEnd), nullptr);
+	EXPECT_EQ(pEnd, nullptr);
+
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "A", &pEnd), pStr);
+	EXPECT_EQ(pEnd, pStr + str_length("a"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "B", &pEnd), pStr + str_length("a"));
+	EXPECT_EQ(pEnd, pStr + str_length("ab"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "C", &pEnd), pStr + str_length("ab"));
+	EXPECT_EQ(pEnd, pStr + str_length("abc"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "D", &pEnd), nullptr);
+	EXPECT_EQ(pEnd, nullptr);
+
+	pStr = "ÄÖÜ";
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "ä", &pEnd), pStr);
+	EXPECT_EQ(pEnd, pStr + str_length("Ä"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "ö", &pEnd), pStr + str_length("Ä"));
+	EXPECT_EQ(pEnd, pStr + str_length("ÄÖ"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "ü", &pEnd), pStr + str_length("ÄÖ"));
+	EXPECT_EQ(pEnd, pStr + str_length("ÄÖÜ"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "z", &pEnd), nullptr);
+	EXPECT_EQ(pEnd, nullptr);
+
+	// Both 'I' and 'İ' map to 'i'
+	pStr = "antimatter";
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "I", &pEnd), pStr + str_length("ant"));
+	EXPECT_EQ(pEnd, pStr + str_length("anti"));
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "İ", &pEnd), pStr + str_length("ant"));
+	EXPECT_EQ(pEnd, pStr + str_length("anti"));
+	pStr = "ANTIMATTER";
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "i", &pEnd), pStr + str_length("ANT"));
+	EXPECT_EQ(pEnd, pStr + str_length("ANTI"));
+	pStr = "ANTİMATTER";
+	EXPECT_EQ(str_utf8_find_nocase(pStr, "i", &pEnd), pStr + str_length("ANT"));
+	EXPECT_EQ(pEnd, pStr + str_length("ANTİ"));
+}
+
+TEST(Str, Utf8FixTruncation)
+{
+	char aaBuf[][32] = {
+		"",
+		"\xff",
+		"abc",
+		"abc\xff",
+		"blub\xffxyz",
+		"привет Наташа\xff",
+		"до свидания\xffОлег",
+	};
+	const char *apExpected[] = {
+		"",
+		"",
+		"abc",
+		"abc",
+		"blub\xffxyz",
+		"привет Наташа",
+		"до свидания\xffОлег",
+	};
+	for(unsigned i = 0; i < std::size(aaBuf); i++)
+	{
+		EXPECT_EQ(str_utf8_fix_truncation(aaBuf[i]), str_length(apExpected[i]));
+		EXPECT_STREQ(aaBuf[i], apExpected[i]);
+	}
+}
+
+TEST(Str, Startswith)
+{
+	EXPECT_TRUE(str_startswith("abcdef", "abc"));
+	EXPECT_FALSE(str_startswith("abc", "abcdef"));
+
+	EXPECT_TRUE(str_startswith("xyz", ""));
+	EXPECT_FALSE(str_startswith("", "xyz"));
+
+	EXPECT_FALSE(str_startswith("house", "home"));
+	EXPECT_FALSE(str_startswith("blackboard", "board"));
+
+	EXPECT_TRUE(str_startswith("поплавать", "по"));
+	EXPECT_FALSE(str_startswith("плавать", "по"));
+
+	static const char ABCDEFG[] = "abcdefg";
+	static const char ABC[] = "abc";
+	EXPECT_EQ(str_startswith(ABCDEFG, ABC) - ABCDEFG, str_length(ABC));
+}
+
+TEST(Str, StartswithNocase)
+{
+	EXPECT_TRUE(str_startswith_nocase("Abcdef", "abc"));
+	EXPECT_FALSE(str_startswith_nocase("aBc", "abcdef"));
+
+	EXPECT_TRUE(str_startswith_nocase("xYz", ""));
+	EXPECT_FALSE(str_startswith_nocase("", "xYz"));
+
+	EXPECT_FALSE(str_startswith_nocase("house", "home"));
+	EXPECT_FALSE(str_startswith_nocase("Blackboard", "board"));
+
+	EXPECT_TRUE(str_startswith_nocase("поплавать", "по"));
+	EXPECT_FALSE(str_startswith_nocase("плавать", "по"));
+
+	static const char ABCDEFG[] = "aBcdefg";
+	static const char ABC[] = "abc";
+	EXPECT_EQ(str_startswith_nocase(ABCDEFG, ABC) - ABCDEFG, str_length(ABC));
+}
+
+TEST(Str, Endswith)
+{
+	EXPECT_TRUE(str_endswith("abcdef", "def"));
+	EXPECT_FALSE(str_endswith("def", "abcdef"));
+
+	EXPECT_TRUE(str_endswith("xyz", ""));
+	EXPECT_FALSE(str_endswith("", "xyz"));
+
+	EXPECT_FALSE(str_endswith("rhyme", "mine"));
+	EXPECT_FALSE(str_endswith("blackboard", "black"));
+
+	EXPECT_TRUE(str_endswith("люди", "юди"));
+	EXPECT_FALSE(str_endswith("люди", "любовь"));
+
+	static const char ABCDEFG[] = "abcdefg";
+	static const char DEFG[] = "defg";
+	EXPECT_EQ(str_endswith(ABCDEFG, DEFG) - ABCDEFG,
+		str_length(ABCDEFG) - str_length(DEFG));
+}
+
+TEST(StrFormat, Positional)
+{
+	char aBuf[256];
+
+	// normal
+	str_format(aBuf, sizeof(aBuf), "%s %s", "first", "second");
+	EXPECT_STREQ(aBuf, "first second");
+
+	// normal with positional arguments
+	str_format(aBuf, sizeof(aBuf), "%1$s %2$s", "first", "second");
+	EXPECT_STREQ(aBuf, "first second");
+
+	// reverse
+	str_format(aBuf, sizeof(aBuf), "%2$s %1$s", "first", "second");
+	EXPECT_STREQ(aBuf, "second first");
+
+	// duplicate
+	str_format(aBuf, sizeof(aBuf), "%1$s %1$s %2$d %1$s %2$d", "str", 1);
+	EXPECT_STREQ(aBuf, "str str 1 str 1");
+}
+
+TEST(Str, EndswithNocase)
+{
+	EXPECT_TRUE(str_endswith_nocase("abcdef", "deF"));
+	EXPECT_FALSE(str_endswith_nocase("def", "abcdef"));
+
+	EXPECT_TRUE(str_endswith_nocase("xyz", ""));
+	EXPECT_FALSE(str_endswith_nocase("", "xyz"));
+
+	EXPECT_FALSE(str_endswith_nocase("rhyme", "minE"));
+	EXPECT_FALSE(str_endswith_nocase("blackboard", "black"));
+
+	EXPECT_TRUE(str_endswith_nocase("люди", "юди"));
+	EXPECT_FALSE(str_endswith_nocase("люди", "любовь"));
+
+	static const char ABCDEFG[] = "abcdefG";
+	static const char DEFG[] = "defg";
+	EXPECT_EQ(str_endswith_nocase(ABCDEFG, DEFG) - ABCDEFG,
+		str_length(ABCDEFG) - str_length(DEFG));
+}
+
+TEST(Str, HexEncode)
+{
+	char aOut[64];
+	const char *pData = "ABCD";
+	str_hex(aOut, sizeof(aOut), pData, 0);
+	EXPECT_STREQ(aOut, "");
+	str_hex(aOut, sizeof(aOut), pData, 1);
+	EXPECT_STREQ(aOut, "41 ");
+	str_hex(aOut, sizeof(aOut), pData, 2);
+	EXPECT_STREQ(aOut, "41 42 ");
+	str_hex(aOut, sizeof(aOut), pData, 3);
+	EXPECT_STREQ(aOut, "41 42 43 ");
+	str_hex(aOut, sizeof(aOut), pData, 4);
+	EXPECT_STREQ(aOut, "41 42 43 44 ");
+
+	str_hex(aOut, 1, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex(aOut, 2, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex(aOut, 3, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex(aOut, 4, pData, 4);
+	EXPECT_STREQ(aOut, "41 ");
+	str_hex(aOut, 5, pData, 4);
+	EXPECT_STREQ(aOut, "41 ");
+	str_hex(aOut, 6, pData, 4);
+	EXPECT_STREQ(aOut, "41 ");
+	str_hex(aOut, 7, pData, 4);
+	EXPECT_STREQ(aOut, "41 42 ");
+	str_hex(aOut, 8, pData, 4);
+	EXPECT_STREQ(aOut, "41 42 ");
+}
+
+TEST(Str, HexEncodeCstyle)
+{
+	char aOut[128];
+	const char *pData = "ABCD";
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 0);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 1);
+	EXPECT_STREQ(aOut, "0x41");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 2);
+	EXPECT_STREQ(aOut, "0x41, 0x42");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 3);
+	EXPECT_STREQ(aOut, "0x41, 0x42, 0x43");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4);
+	EXPECT_STREQ(aOut, "0x41, 0x42, 0x43, 0x44");
+
+	str_hex_cstyle(aOut, 1, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 2, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 3, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 4, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 5, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 6, pData, 4);
+	EXPECT_STREQ(aOut, "");
+	str_hex_cstyle(aOut, 7, pData, 4);
+	EXPECT_STREQ(aOut, "0x41");
+	str_hex_cstyle(aOut, 12, pData, 4);
+	EXPECT_STREQ(aOut, "0x41");
+	str_hex_cstyle(aOut, 13, pData, 4);
+	EXPECT_STREQ(aOut, "0x41, 0x42");
+	str_hex_cstyle(aOut, 14, pData, 4);
+	EXPECT_STREQ(aOut, "0x41, 0x42");
+
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4, 1);
+	EXPECT_STREQ(aOut, "0x41,\n0x42,\n0x43,\n0x44");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4, 2);
+	EXPECT_STREQ(aOut, "0x41, 0x42,\n0x43, 0x44");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4, 3);
+	EXPECT_STREQ(aOut, "0x41, 0x42, 0x43,\n0x44");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4, 4);
+	EXPECT_STREQ(aOut, "0x41, 0x42, 0x43, 0x44");
+	str_hex_cstyle(aOut, sizeof(aOut), pData, 4, 500);
+	EXPECT_STREQ(aOut, "0x41, 0x42, 0x43, 0x44");
+}
+
+TEST(Str, HexDecode)
+{
+	char aOut[5] = {'a', 'b', 'c', 'd', 0};
+	EXPECT_EQ(str_hex_decode(aOut, 0, ""), 0);
+	EXPECT_STREQ(aOut, "abcd");
+	EXPECT_EQ(str_hex_decode(aOut, 0, " "), 2);
+	EXPECT_STREQ(aOut, "abcd");
+	EXPECT_EQ(str_hex_decode(aOut, 1, "1"), 2);
+	EXPECT_STREQ(aOut + 1, "bcd");
+	EXPECT_EQ(str_hex_decode(aOut, 1, "41"), 0);
+	EXPECT_STREQ(aOut, "Abcd");
+	EXPECT_EQ(str_hex_decode(aOut, 1, "4x"), 1);
+	EXPECT_STREQ(aOut + 1, "bcd");
+	EXPECT_EQ(str_hex_decode(aOut, 1, "x1"), 1);
+	EXPECT_STREQ(aOut + 1, "bcd");
+	EXPECT_EQ(str_hex_decode(aOut, 1, "411"), 2);
+	EXPECT_STREQ(aOut + 1, "bcd");
+	EXPECT_EQ(str_hex_decode(aOut, 4, "41424344"), 0);
+	EXPECT_STREQ(aOut, "ABCD");
+}
+
+void StrBase64Str(char *pBuffer, int BufferSize, const char *pString)
+{
+	str_base64(pBuffer, BufferSize, pString, str_length(pString));
+}
+
+TEST(Str, Base64)
+{
+	char aBuf[128];
+	str_base64(aBuf, sizeof(aBuf), "\0", 1);
+	EXPECT_STREQ(aBuf, "AA==");
+	str_base64(aBuf, sizeof(aBuf), "\0\0", 2);
+	EXPECT_STREQ(aBuf, "AAA=");
+	str_base64(aBuf, sizeof(aBuf), "\0\0\0", 3);
+	EXPECT_STREQ(aBuf, "AAAA");
+
+	StrBase64Str(aBuf, sizeof(aBuf), "");
+	EXPECT_STREQ(aBuf, "");
+
+	// https://en.wikipedia.org/w/index.php?title=Base64&oldid=1033503483#Output_padding
+	StrBase64Str(aBuf, sizeof(aBuf), "pleasure.");
+	EXPECT_STREQ(aBuf, "cGxlYXN1cmUu");
+	StrBase64Str(aBuf, sizeof(aBuf), "leasure.");
+	EXPECT_STREQ(aBuf, "bGVhc3VyZS4=");
+	StrBase64Str(aBuf, sizeof(aBuf), "easure.");
+	EXPECT_STREQ(aBuf, "ZWFzdXJlLg==");
+	StrBase64Str(aBuf, sizeof(aBuf), "asure.");
+	EXPECT_STREQ(aBuf, "YXN1cmUu");
+	StrBase64Str(aBuf, sizeof(aBuf), "sure.");
+	EXPECT_STREQ(aBuf, "c3VyZS4=");
+}
+
+TEST(Str, Base64Decode)
+{
+	char aOut[17];
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), ""), 0);
+	EXPECT_STREQ(aOut, "XXXXXXXXXXXXXXXX");
+
+	// https://en.wikipedia.org/w/index.php?title=Base64&oldid=1033503483#Output_padding
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "cGxlYXN1cmUu"), 9);
+	EXPECT_STREQ(aOut, "pleasure.XXXXXXX");
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "bGVhc3VyZS4="), 8);
+	EXPECT_STREQ(aOut, "leasure.XXXXXXXX");
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "ZWFzdXJlLg=="), 7);
+	EXPECT_STREQ(aOut, "easure.XXXXXXXXX");
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "YXN1cmUu"), 6);
+	EXPECT_STREQ(aOut, "asure.XXXXXXXXXX");
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "c3VyZS4="), 5);
+	EXPECT_STREQ(aOut, "sure.XXXXXXXXXXX");
+	str_copy(aOut, "XXXXXXXXXXXXXXXX", sizeof(aOut));
+	EXPECT_EQ(str_base64_decode(aOut, sizeof(aOut), "////"), 3);
+	EXPECT_STREQ(aOut, "\xff\xff\xffXXXXXXXXXXXXX");
+}
+
+TEST(Str, Base64DecodeError)
+{
+	char aBuf[128];
+	// Wrong padding.
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "A"), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "AA"), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "AAA"), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "A==="), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "=AAA"), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "===="), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "AAA=AAAA"), 0);
+	// Invalid characters.
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "----"), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "AAAA "), 0);
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "AAA "), 0);
+	// Invalid padding values.
+	EXPECT_LT(str_base64_decode(aBuf, sizeof(aBuf), "//=="), 0);
+}
+
+TEST(Str, Tokenize)
+{
+	char aTest[] = "GER,RUS,ZAF,BRA,CAN";
+	const char *apOut[] = {"GER", "RUS", "ZAF", "BRA", "CAN"};
+	char aBuf[4];
+
+	int n = 0;
+	for(const char *pTok = aTest; (pTok = str_next_token(pTok, ",", aBuf, sizeof(aBuf)));)
+		EXPECT_STREQ(apOut[n++], aBuf);
+
+	char aTest2[] = "";
+	EXPECT_EQ(str_next_token(aTest2, ",", aBuf, sizeof(aBuf)), nullptr);
+
+	char aTest3[] = "+b";
+	str_next_token(aTest3, "+", aBuf, sizeof(aBuf));
+	EXPECT_STREQ(aBuf, "b");
+}
+
+TEST(Str, InList)
+{
+	char aTest[] = "GER,RUS,ZAF,BRA,CAN";
+	EXPECT_TRUE(str_in_list(aTest, ",", "GER"));
+	EXPECT_TRUE(str_in_list(aTest, ",", "RUS"));
+	EXPECT_TRUE(str_in_list(aTest, ",", "ZAF"));
+	EXPECT_TRUE(str_in_list(aTest, ",", "BRA"));
+	EXPECT_TRUE(str_in_list(aTest, ",", "CAN"));
+
+	EXPECT_FALSE(str_in_list(aTest, ",", "CHN"));
+	EXPECT_FALSE(str_in_list(aTest, ",", "R,R"));
+
+	EXPECT_FALSE(str_in_list("abc,xyz", ",", "abcdef"));
+	EXPECT_FALSE(str_in_list("", ",", ""));
+	EXPECT_FALSE(str_in_list("", ",", "xyz"));
+
+	EXPECT_TRUE(str_in_list("FOO,,BAR", ",", ""));
+	EXPECT_TRUE(str_in_list("abc,,def", ",", "def"));
+}
+
+TEST(Str, Format)
+{
+	char aBuf[4];
+	EXPECT_EQ(str_format(aBuf, 4, "%d:", 9), 2);
+	EXPECT_STREQ(aBuf, "9:");
+	EXPECT_EQ(str_format(aBuf, 4, "%d: ", 9), 3);
+	EXPECT_STREQ(aBuf, "9: ");
+	EXPECT_EQ(str_format(aBuf, 4, "%d: ", 99), 3);
+	EXPECT_STREQ(aBuf, "99:");
+}
+
+TEST(Str, FormatTruncate)
+{
+	const char *pStr = "DDNet最好了";
+	char aBuf[64];
+	str_format(aBuf, 7, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_format(aBuf, 8, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_format(aBuf, 9, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_format(aBuf, 10, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_format(aBuf, 11, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_format(aBuf, 12, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_format(aBuf, 13, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_format(aBuf, 14, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_format(aBuf, 15, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+	str_format(aBuf, 16, "%s", pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+}
+
+TEST(Str, TrimWords)
+{
+	const char *pStr1 = "aa bb ccc   dddd    eeeee";
+	EXPECT_STREQ(str_trim_words(pStr1, 0), "aa bb ccc   dddd    eeeee");
+	EXPECT_STREQ(str_trim_words(pStr1, 1), "bb ccc   dddd    eeeee");
+	EXPECT_STREQ(str_trim_words(pStr1, 2), "ccc   dddd    eeeee");
+	EXPECT_STREQ(str_trim_words(pStr1, 3), "dddd    eeeee");
+	EXPECT_STREQ(str_trim_words(pStr1, 4), "eeeee");
+	EXPECT_STREQ(str_trim_words(pStr1, 5), "");
+	EXPECT_STREQ(str_trim_words(pStr1, 100), "");
+	const char *pStr2 = "   aaa  bb   ";
+	EXPECT_STREQ(str_trim_words(pStr2, 0), "aaa  bb   ");
+	EXPECT_STREQ(str_trim_words(pStr2, 1), "bb   ");
+	EXPECT_STREQ(str_trim_words(pStr2, 2), "");
+	EXPECT_STREQ(str_trim_words(pStr2, 100), "");
+	const char *pStr3 = "\n\naa  bb\t\tccc\r\n\r\ndddd";
+	EXPECT_STREQ(str_trim_words(pStr3, 0), "aa  bb\t\tccc\r\n\r\ndddd");
+	EXPECT_STREQ(str_trim_words(pStr3, 1), "bb\t\tccc\r\n\r\ndddd");
+	EXPECT_STREQ(str_trim_words(pStr3, 2), "ccc\r\n\r\ndddd");
+	EXPECT_STREQ(str_trim_words(pStr3, 3), "dddd");
+	EXPECT_STREQ(str_trim_words(pStr3, 4), "");
+	EXPECT_STREQ(str_trim_words(pStr3, 100), "");
+}
+
+TEST(Str, CopyNum)
+{
+	const char *pFoo = "Foobaré";
+	char aBuf[64];
+	str_utf8_truncate(aBuf, 3, pFoo, 1);
+	EXPECT_STREQ(aBuf, "F");
+	str_utf8_truncate(aBuf, 3, pFoo, 2);
+	EXPECT_STREQ(aBuf, "Fo");
+	str_utf8_truncate(aBuf, 3, pFoo, 3);
+	EXPECT_STREQ(aBuf, "Fo");
+	str_utf8_truncate(aBuf, sizeof(aBuf), pFoo, 6);
+	EXPECT_STREQ(aBuf, "Foobar");
+	str_utf8_truncate(aBuf, sizeof(aBuf), pFoo, 7);
+	EXPECT_STREQ(aBuf, "Foobaré");
+	str_utf8_truncate(aBuf, sizeof(aBuf), pFoo, 0);
+	EXPECT_STREQ(aBuf, "");
+
+	char aBuf2[8];
+	str_utf8_truncate(aBuf2, sizeof(aBuf2), pFoo, 7);
+	EXPECT_STREQ(aBuf2, "Foobar");
+	char aBuf3[9];
+	str_utf8_truncate(aBuf3, sizeof(aBuf3), pFoo, 7);
+	EXPECT_STREQ(aBuf3, "Foobaré");
+}
+
+TEST(Str, Copy)
+{
+	const char *pStr = "DDNet最好了";
+	char aBuf[64];
+	str_copy(aBuf, pStr, 7);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_copy(aBuf, pStr, 8);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_copy(aBuf, pStr, 9);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_copy(aBuf, pStr, 10);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_copy(aBuf, pStr, 11);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_copy(aBuf, pStr, 12);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_copy(aBuf, pStr, 13);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_copy(aBuf, pStr, 14);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_copy(aBuf, pStr, 15);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+	str_copy(aBuf, pStr, 16);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+	str_copy(aBuf, pStr);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+}
+
+TEST(Str, Append)
+{
+	char aBuf[64];
+	aBuf[0] = '\0';
+	str_append(aBuf, "DDNet最好了", 7);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_append(aBuf, "最", 8);
+	EXPECT_STREQ(aBuf, "DDNet");
+	str_append(aBuf, "最", 9);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_append(aBuf, "好", 10);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_append(aBuf, "好", 11);
+	EXPECT_STREQ(aBuf, "DDNet最");
+	str_append(aBuf, "好", 12);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_append(aBuf, "了", 13);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_append(aBuf, "了", 14);
+	EXPECT_STREQ(aBuf, "DDNet最好");
+	str_append(aBuf, "了", 15);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+	str_append(aBuf, "了", 16);
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+	aBuf[0] = '\0';
+	str_append(aBuf, "DDNet最好了");
+	EXPECT_STREQ(aBuf, "DDNet最好了");
+}
+
+TEST(Str, Utf8Stats)
+{
+	size_t Size, Count;
+
+	str_utf8_stats("abc", 4, 3, &Size, &Count);
+	EXPECT_EQ(Size, 3);
+	EXPECT_EQ(Count, 3);
+
+	str_utf8_stats("abc", 2, 3, &Size, &Count);
+	EXPECT_EQ(Size, 1);
+	EXPECT_EQ(Count, 1);
+
+	str_utf8_stats("", 1, 0, &Size, &Count);
+	EXPECT_EQ(Size, 0);
+	EXPECT_EQ(Count, 0);
+
+	str_utf8_stats("abcde", 6, 5, &Size, &Count);
+	EXPECT_EQ(Size, 5);
+	EXPECT_EQ(Count, 5);
+
+	str_utf8_stats("любовь", 13, 6, &Size, &Count);
+	EXPECT_EQ(Size, 12);
+	EXPECT_EQ(Count, 6);
+
+	str_utf8_stats("abc愛", 7, 4, &Size, &Count);
+	EXPECT_EQ(Size, 6);
+	EXPECT_EQ(Count, 4);
+
+	str_utf8_stats("abc愛", 6, 4, &Size, &Count);
+	EXPECT_EQ(Size, 3);
+	EXPECT_EQ(Count, 3);
+
+	str_utf8_stats("любовь", 13, 3, &Size, &Count);
+	EXPECT_EQ(Size, 6);
+	EXPECT_EQ(Count, 3);
+}
+
+TEST(Str, Utf8OffsetBytesToChars)
+{
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("", 0), 0);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("", 100), 0);
+
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("abc", 0), 0);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("abc", 1), 1);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("abc", 2), 2);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("abc", 3), 3);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("abc", 100), 3);
+
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 0), 0);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 2), 1);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 4), 2);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 6), 3);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 8), 4);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 10), 5);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 12), 6);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("любовь", 100), 6);
+
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("DDNet最好了", 5), 5);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("DDNet最好了", 8), 6);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("DDNet最好了", 11), 7);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("DDNet最好了", 14), 8);
+	EXPECT_EQ(str_utf8_offset_bytes_to_chars("DDNet最好了", 100), 8);
+}
+
+TEST(Str, Utf8OffsetCharsToBytes)
+{
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("", 0), 0);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("", 100), 0);
+
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("abc", 0), 0);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("abc", 1), 1);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("abc", 2), 2);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("abc", 3), 3);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("abc", 100), 3);
+
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 0), 0);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 1), 2);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 2), 4);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 3), 6);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 4), 8);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 5), 10);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 6), 12);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("любовь", 100), 12);
+
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("DDNet最好了", 5), 5);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("DDNet最好了", 6), 8);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("DDNet最好了", 7), 11);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("DDNet最好了", 8), 14);
+	EXPECT_EQ(str_utf8_offset_chars_to_bytes("DDNet最好了", 100), 14);
+}
+
+TEST(Str, Time)
+{
+	char aBuf[32] = "foobar";
+
+	EXPECT_EQ(str_time(123456, TIME_DAYS, aBuf, 0), -1);
+	EXPECT_STREQ(aBuf, "foobar");
+
+	EXPECT_EQ(str_time(123456, TIME_SECS_CENTISECS + 1, aBuf, sizeof(aBuf)), -1);
+	EXPECT_STREQ(aBuf, "");
+
+	EXPECT_EQ(str_time(-123456, TIME_MINS_CENTISECS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "00.00");
+
+	EXPECT_EQ(str_time(INT64_MAX, TIME_DAYS, aBuf, sizeof(aBuf)), 23);
+	EXPECT_STREQ(aBuf, "1067519911673d 00:09:18");
+
+	EXPECT_EQ(str_time(123456, TIME_DAYS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "20:34");
+	EXPECT_EQ(str_time(1234567, TIME_DAYS, aBuf, sizeof(aBuf)), 8);
+	EXPECT_STREQ(aBuf, "03:25:45");
+	EXPECT_EQ(str_time(12345678, TIME_DAYS, aBuf, sizeof(aBuf)), 11);
+	EXPECT_STREQ(aBuf, "1d 10:17:36");
+
+	EXPECT_EQ(str_time(123456, TIME_HOURS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "20:34");
+	EXPECT_EQ(str_time(1234567, TIME_HOURS, aBuf, sizeof(aBuf)), 8);
+	EXPECT_STREQ(aBuf, "03:25:45");
+	EXPECT_EQ(str_time(12345678, TIME_HOURS, aBuf, sizeof(aBuf)), 8);
+	EXPECT_STREQ(aBuf, "34:17:36");
+
+	EXPECT_EQ(str_time(123456, TIME_MINS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "20:34");
+	EXPECT_EQ(str_time(1234567, TIME_MINS, aBuf, sizeof(aBuf)), 6);
+	EXPECT_STREQ(aBuf, "205:45");
+	EXPECT_EQ(str_time(12345678, TIME_MINS, aBuf, sizeof(aBuf)), 7);
+	EXPECT_STREQ(aBuf, "2057:36");
+
+	EXPECT_EQ(str_time(123456, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)), 8);
+	EXPECT_STREQ(aBuf, "20:34.56");
+	EXPECT_EQ(str_time(1234567, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)), 11);
+	EXPECT_STREQ(aBuf, "03:25:45.67");
+	EXPECT_EQ(str_time(12345678, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)), 11);
+	EXPECT_STREQ(aBuf, "34:17:36.78");
+
+	EXPECT_EQ(str_time(123456, TIME_MINS_CENTISECS, aBuf, sizeof(aBuf)), 8);
+	EXPECT_STREQ(aBuf, "20:34.56");
+	EXPECT_EQ(str_time(1234567, TIME_MINS_CENTISECS, aBuf, sizeof(aBuf)), 9);
+	EXPECT_STREQ(aBuf, "205:45.67");
+	EXPECT_EQ(str_time(12345678, TIME_MINS_CENTISECS, aBuf, sizeof(aBuf)), 10);
+	EXPECT_STREQ(aBuf, "2057:36.78");
+
+	EXPECT_EQ(str_time(123456, TIME_SECS_CENTISECS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "34.56");
+	EXPECT_EQ(str_time(1234567, TIME_SECS_CENTISECS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "45.67");
+	EXPECT_EQ(str_time(12345678, TIME_SECS_CENTISECS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "36.78");
+}
+
+TEST(Str, TimeFloat)
+{
+	char aBuf[64];
+	EXPECT_EQ(str_time_float(123456.78, TIME_DAYS, aBuf, sizeof(aBuf)), 11);
+	EXPECT_STREQ(aBuf, "1d 10:17:36");
+
+	EXPECT_EQ(str_time_float(12.16, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "12.16");
+
+	EXPECT_EQ(str_time_float(22.995, TIME_MINS, aBuf, sizeof(aBuf)), 5);
+	EXPECT_STREQ(aBuf, "00:22");
+}
+
+TEST(Str, HasCc)
+{
+	EXPECT_FALSE(str_has_cc(""));
+	EXPECT_FALSE(str_has_cc("a"));
+	EXPECT_FALSE(str_has_cc("Merhaba dünya!"));
+
+	EXPECT_TRUE(str_has_cc("\n"));
+	EXPECT_TRUE(str_has_cc("\r"));
+	EXPECT_TRUE(str_has_cc("\t"));
+	EXPECT_TRUE(str_has_cc("a\n"));
+	EXPECT_TRUE(str_has_cc("a\rb"));
+	EXPECT_TRUE(str_has_cc("\tb"));
+	EXPECT_TRUE(str_has_cc("\n\n"));
+	EXPECT_TRUE(str_has_cc("\x1C"));
+	EXPECT_TRUE(str_has_cc("\x1D"));
+	EXPECT_TRUE(str_has_cc("\x1E"));
+	EXPECT_TRUE(str_has_cc("\x1F"));
+}
+
+TEST(Str, SanitizeCc)
+{
+	char aBuf[64];
+	str_copy(aBuf, "");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "");
+	str_copy(aBuf, "a");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "a");
+	str_copy(aBuf, "Merhaba dünya!");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "Merhaba dünya!");
+
+	str_copy(aBuf, "\n");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\r");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\t");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "a\n");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "a ");
+	str_copy(aBuf, "a\rb");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "a b");
+	str_copy(aBuf, "\tb");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " b");
+	str_copy(aBuf, "\n\n");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, "  ");
+	str_copy(aBuf, "\x1C");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1D");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1E");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1F");
+	str_sanitize_cc(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+}
+
+TEST(Str, Sanitize)
+{
+	char aBuf[64];
+	str_copy(aBuf, "");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "");
+	str_copy(aBuf, "a");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "a");
+	str_copy(aBuf, "Merhaba dünya!");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "Merhaba dünya!");
+	str_copy(aBuf, "\n");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "\n");
+	str_copy(aBuf, "\r");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "\r");
+	str_copy(aBuf, "\t");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "\t");
+	str_copy(aBuf, "a\n");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "a\n");
+	str_copy(aBuf, "a\rb");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "a\rb");
+	str_copy(aBuf, "\tb");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "\tb");
+	str_copy(aBuf, "\n\n");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, "\n\n");
+
+	str_copy(aBuf, "\x1C");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1D");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1E");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+	str_copy(aBuf, "\x1F");
+	str_sanitize(aBuf);
+	EXPECT_STREQ(aBuf, " ");
+}
+
+TEST(Str, CleanWhitespaces)
+{
+	char aBuf[64];
+	str_copy(aBuf, "aa bb ccc dddd eeeee");
+	str_clean_whitespaces(aBuf);
+	EXPECT_STREQ(aBuf, "aa bb ccc dddd eeeee");
+	str_copy(aBuf, "     ");
+	str_clean_whitespaces(aBuf);
+	EXPECT_STREQ(aBuf, "");
+	str_copy(aBuf, "     aa");
+	str_clean_whitespaces(aBuf);
+	EXPECT_STREQ(aBuf, "aa");
+	str_copy(aBuf, "aa     ");
+	str_clean_whitespaces(aBuf);
+	EXPECT_STREQ(aBuf, "aa");
+	str_copy(aBuf, "  aa   bb    ccc     dddd       eeeee    ");
+	str_clean_whitespaces(aBuf);
+	EXPECT_STREQ(aBuf, "aa bb ccc dddd eeeee");
+}
+
+TEST(Str, SkipToWhitespace)
+{
+	char aBuf[64];
+	str_copy(aBuf, "");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf);
+	str_copy(aBuf, "    a");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf);
+	str_copy(aBuf, "aaaa  b");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf + 4);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf + 4);
+	str_copy(aBuf, "aaaa\n\nb");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf + 4);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf + 4);
+	str_copy(aBuf, "aaaa\r\rb");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf + 4);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf + 4);
+	str_copy(aBuf, "aaaa\t\tb");
+	EXPECT_EQ(str_skip_to_whitespace(aBuf), aBuf + 4);
+	EXPECT_EQ(str_skip_to_whitespace_const(aBuf), aBuf + 4);
+}
+
+TEST(Str, SkipWhitespaces)
+{
+	char aBuf[64];
+	str_copy(aBuf, "");
+	EXPECT_EQ(str_skip_whitespaces(aBuf), aBuf);
+	EXPECT_EQ(str_skip_whitespaces_const(aBuf), aBuf);
+	str_copy(aBuf, "aaaa");
+	EXPECT_EQ(str_skip_whitespaces(aBuf), aBuf);
+	EXPECT_EQ(str_skip_whitespaces_const(aBuf), aBuf);
+	str_copy(aBuf, " \n\r\taaaa");
+	EXPECT_EQ(str_skip_whitespaces(aBuf), aBuf + 4);
+	EXPECT_EQ(str_skip_whitespaces_const(aBuf), aBuf + 4);
+}
+
+TEST(Str, CompFilename)
+{
+	EXPECT_EQ(str_comp_filenames("a", "a"), 0);
+	EXPECT_LT(str_comp_filenames("a", "b"), 0);
+	EXPECT_GT(str_comp_filenames("b", "a"), 0);
+	EXPECT_EQ(str_comp_filenames("A", "a"), 0);
+	EXPECT_LT(str_comp_filenames("A", "b"), 0);
+	EXPECT_GT(str_comp_filenames("b", "A"), 0);
+	EXPECT_LT(str_comp_filenames("a", "B"), 0);
+	EXPECT_GT(str_comp_filenames("B", "a"), 0);
+	EXPECT_EQ(str_comp_filenames("1A", "1a"), 0);
+	EXPECT_LT(str_comp_filenames("1a", "1B"), 0);
+	EXPECT_GT(str_comp_filenames("1B", "1a"), 0);
+	EXPECT_LT(str_comp_filenames("1a", "1b"), 0);
+	EXPECT_GT(str_comp_filenames("1b", "1a"), 0);
+	EXPECT_GT(str_comp_filenames("12a", "1B"), 0);
+	EXPECT_LT(str_comp_filenames("1B", "12a"), 0);
+	EXPECT_GT(str_comp_filenames("10a", "1B"), 0);
+	EXPECT_LT(str_comp_filenames("1B", "10a"), 0);
+	EXPECT_GT(str_comp_filenames("10a", "00B"), 0);
+	EXPECT_LT(str_comp_filenames("00B", "10a"), 0);
+	EXPECT_GT(str_comp_filenames("10a", "09B"), 0);
+	EXPECT_LT(str_comp_filenames("09B", "10a"), 0);
+	EXPECT_LT(str_comp_filenames("abc", "abcd"), 0);
+	EXPECT_GT(str_comp_filenames("abcd", "abc"), 0);
+	EXPECT_LT(str_comp_filenames("abc2", "abcd1"), 0);
+	EXPECT_GT(str_comp_filenames("abcd1", "abc2"), 0);
+	EXPECT_LT(str_comp_filenames("abc50", "abcd"), 0);
+	EXPECT_GT(str_comp_filenames("abcd", "abc50"), 0);
+	EXPECT_EQ(str_comp_filenames("file0", "file0"), 0);
+	EXPECT_LT(str_comp_filenames("file0", "file1"), 0);
+	EXPECT_GT(str_comp_filenames("file1", "file0"), 0);
+	EXPECT_LT(str_comp_filenames("file1", "file09"), 0);
+	EXPECT_GT(str_comp_filenames("file09", "file1"), 0);
+	EXPECT_LT(str_comp_filenames("file1", "file009"), 0);
+	EXPECT_GT(str_comp_filenames("file009", "file1"), 0);
+	EXPECT_GT(str_comp_filenames("file10", "file00"), 0);
+	EXPECT_LT(str_comp_filenames("file00", "file10"), 0);
+	EXPECT_GT(str_comp_filenames("file10", "file09"), 0);
+	EXPECT_LT(str_comp_filenames("file09", "file10"), 0);
+	EXPECT_LT(str_comp_filenames("file13", "file37"), 0);
+	EXPECT_GT(str_comp_filenames("file37", "file13"), 0);
+	EXPECT_LT(str_comp_filenames("file1.ext", "file09.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file09.ext", "file1.ext"), 0);
+	EXPECT_LT(str_comp_filenames("file1.ext", "file009.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file009.ext", "file1.ext"), 0);
+	EXPECT_EQ(str_comp_filenames("file0.ext", "file0.ext"), 0);
+	EXPECT_LT(str_comp_filenames("file13.ext", "file37.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file37.ext", "file13.ext"), 0);
+	EXPECT_LT(str_comp_filenames("FILE13.EXT", "file37.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file37.ext", "FILE13.EXT"), 0);
+	EXPECT_GT(str_comp_filenames("file10.ext", "file00.ext"), 0);
+	EXPECT_LT(str_comp_filenames("file00.ext", "file10.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file10.ext", "file09.ext"), 0);
+	EXPECT_LT(str_comp_filenames("file09.ext", "file10.ext"), 0);
+	EXPECT_LT(str_comp_filenames("file42", "file1337"), 0);
+	EXPECT_GT(str_comp_filenames("file1337", "file42"), 0);
+	EXPECT_LT(str_comp_filenames("file42.ext", "file1337.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file1337.ext", "file42.ext"), 0);
+	EXPECT_GT(str_comp_filenames("file4414520", "file2055"), 0);
+	EXPECT_LT(str_comp_filenames("file4414520", "file205523151812419"), 0);
+}
+
+TEST(Str, RightChar)
+{
+	const char *pStr = "a bb ccc dddd       eeeee";
+	EXPECT_EQ(str_rchr(pStr, 'a'), pStr);
+	EXPECT_EQ(str_rchr(pStr, 'b'), pStr + 3);
+	EXPECT_EQ(str_rchr(pStr, 'c'), pStr + 7);
+	EXPECT_EQ(str_rchr(pStr, 'd'), pStr + 12);
+	EXPECT_EQ(str_rchr(pStr, ' '), pStr + 19);
+	EXPECT_EQ(str_rchr(pStr, 'e'), pStr + 24);
+	EXPECT_EQ(str_rchr(pStr, '\0'), pStr + str_length(pStr));
+	EXPECT_EQ(str_rchr(pStr, 'y'), nullptr);
+}
+
+TEST(Str, CountChar)
+{
+	const char *pStr = "a bb ccc dddd       eeeee";
+	EXPECT_EQ(str_countchr(pStr, 'a'), 1);
+	EXPECT_EQ(str_countchr(pStr, 'b'), 2);
+	EXPECT_EQ(str_countchr(pStr, 'c'), 3);
+	EXPECT_EQ(str_countchr(pStr, 'd'), 4);
+	EXPECT_EQ(str_countchr(pStr, 'e'), 5);
+	EXPECT_EQ(str_countchr(pStr, ' '), 10);
+	EXPECT_EQ(str_countchr(pStr, '\0'), 0);
+	EXPECT_EQ(str_countchr(pStr, 'y'), 0);
+}
+
+#if defined(CONF_FAMILY_WINDOWS)
+TEST(Str, WindowsUtf8WideConversion)
+{
+	const char *apUtf8Strings[] = {
+		"",
+		"abc",
+		"a bb ccc dddd       eeeee",
+		"öüä",
+		"привет Наташа",
+		"ąçęįǫų",
+		"DDNet最好了",
+		"aβい🐘"};
+	const wchar_t *apWideStrings[] = {
+		L"",
+		L"abc",
+		L"a bb ccc dddd       eeeee",
+		L"öüä",
+		L"привет Наташа",
+		L"ąçęįǫų",
+		L"DDNet最好了",
+		L"aβい🐘"};
+	static_assert(std::size(apUtf8Strings) == std::size(apWideStrings));
+	for(size_t i = 0; i < std::size(apUtf8Strings); i++)
+	{
+		const std::optional<std::string> ConvertedUtf8 = windows_wide_to_utf8(apWideStrings[i]);
+		const std::wstring ConvertedWide = windows_utf8_to_wide(apUtf8Strings[i]);
+		ASSERT_TRUE(ConvertedUtf8.has_value());
+		EXPECT_STREQ(ConvertedUtf8.value().c_str(), apUtf8Strings[i]);
+		EXPECT_STREQ(ConvertedWide.c_str(), apWideStrings[i]);
+	}
+}
+#endif
diff --git a/src_bkp/test/strip_path_and_extension.cpp b/src_bkp/test/strip_path_and_extension.cpp
new file mode 100644
index 0000000000..d4309fc476
--- /dev/null
+++ b/src_bkp/test/strip_path_and_extension.cpp
@@ -0,0 +1,40 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+#include <engine/storage.h>
+
+class StripPathAndExtension : public ::testing::Test
+{
+protected:
+	void Test(const char *pInput, const char *pOutput)
+	{
+		char aBuf[32];
+		IStorage::StripPathAndExtension(pInput, aBuf, sizeof(aBuf));
+		EXPECT_STREQ(aBuf, pOutput);
+	}
+};
+
+TEST_F(StripPathAndExtension, WorksOnBareFilename)
+{
+	Test("abc", "abc");
+}
+
+TEST_F(StripPathAndExtension, NormalPath)
+{
+	Test("/usr/share/teeworlds/data/mapres/grass_main.png", "grass_main");
+}
+
+TEST_F(StripPathAndExtension, NormalFile)
+{
+	Test("winter_main.png", "winter_main");
+}
+
+TEST_F(StripPathAndExtension, DotInFolder)
+{
+	Test("C:\\a.b\\c", "c");
+}
+
+TEST_F(StripPathAndExtension, DoubleDot)
+{
+	Test("file.name.png", "file.name");
+}
diff --git a/src_bkp/test/swap_endian.cpp b/src_bkp/test/swap_endian.cpp
new file mode 100644
index 0000000000..4a65f52c03
--- /dev/null
+++ b/src_bkp/test/swap_endian.cpp
@@ -0,0 +1,45 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+#include <array>
+
+TEST(SwapEndian, Generic)
+{
+	const std::array<char, 12> aOriginalData = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+	const std::array<char, 12> aExpectedDataInt16 = {2, 1, 4, 3, 6, 5, 8, 7, 10, 9, 12, 11};
+	const std::array<char, 12> aExpectedDataInt32 = {4, 3, 2, 1, 8, 7, 6, 5, 12, 11, 10, 9};
+
+	std::array<char, 12> aData = aOriginalData;
+	swap_endian(aData.data(), sizeof(char), aData.size() / sizeof(char));
+	EXPECT_EQ(aData, aOriginalData);
+
+	aData = aOriginalData;
+	swap_endian(aData.data(), sizeof(int16_t), aData.size() / sizeof(int16_t));
+	EXPECT_EQ(aData, aExpectedDataInt16);
+
+	aData = aOriginalData;
+	swap_endian(aData.data(), sizeof(int32_t), aData.size() / sizeof(int32_t));
+	EXPECT_EQ(aData, aExpectedDataInt32);
+}
+
+static int SwapEndianInt(int Number)
+{
+	swap_endian(&Number, sizeof(Number), 1);
+	return Number;
+}
+
+TEST(SwapEndian, Int)
+{
+	EXPECT_EQ(SwapEndianInt(0x00000000), 0x00000000);
+	EXPECT_EQ(SwapEndianInt(0xFFFFFFFF), 0xFFFFFFFF);
+	EXPECT_EQ(SwapEndianInt(0x7FFFFFFF), 0xFFFFFF7F);
+	EXPECT_EQ(SwapEndianInt(0xFFFFFF7F), 0x7FFFFFFF);
+	EXPECT_EQ(SwapEndianInt(0x80000000), 0x00000080);
+	EXPECT_EQ(SwapEndianInt(0x00000080), 0x80000000);
+	EXPECT_EQ(SwapEndianInt(0x12345678), 0x78563412);
+	EXPECT_EQ(SwapEndianInt(0x78563412), 0x12345678);
+	EXPECT_EQ(SwapEndianInt(0x87654321), 0x21436587);
+	EXPECT_EQ(SwapEndianInt(0x21436587), 0x87654321);
+}
diff --git a/src_bkp/test/teehistorian.cpp b/src_bkp/test/teehistorian.cpp
new file mode 100644
index 0000000000..9e88e7e0f6
--- /dev/null
+++ b/src_bkp/test/teehistorian.cpp
@@ -0,0 +1,859 @@
+#include <gtest/gtest.h>
+
+#include <base/detect.h>
+#include <engine/external/json-parser/json.h>
+#include <engine/server.h>
+#include <engine/shared/config.h>
+#include <game/gamecore.h>
+#include <game/server/teehistorian.h>
+
+#include <vector>
+
+void RegisterGameUuids(CUuidManager *pManager);
+
+class TeeHistorian : public ::testing::Test
+{
+protected:
+	CTeeHistorian m_TH;
+	CConfig m_Config;
+	CTuningParams m_Tuning;
+	CUuidManager m_UuidManager;
+	CTeeHistorian::CGameInfo m_GameInfo;
+
+	std::vector<unsigned char> m_vBuffer;
+
+	enum
+	{
+		STATE_NONE,
+		STATE_PLAYERS,
+		STATE_INPUTS,
+	};
+
+	int m_State;
+
+	TeeHistorian()
+	{
+		mem_zero(&m_Config, sizeof(m_Config));
+#define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Save, Desc) \
+	m_Config.m_##Name = (Def);
+#define MACRO_CONFIG_COL(Name, ScriptName, Def, Save, Desc) MACRO_CONFIG_INT(Name, ScriptName, Def, 0, 0, Save, Desc)
+#define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Save, Desc) \
+	str_copy(m_Config.m_##Name, (Def), sizeof(m_Config.m_##Name));
+#include <engine/shared/config_variables.h>
+#undef MACRO_CONFIG_STR
+#undef MACRO_CONFIG_COL
+#undef MACRO_CONFIG_INT
+
+		RegisterUuids(&m_UuidManager);
+		RegisterTeehistorianUuids(&m_UuidManager);
+		RegisterGameUuids(&m_UuidManager);
+
+		SHA256_DIGEST Sha256 = {{0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, 0x67, 0x89,
+			0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, 0x67, 0x89,
+			0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, 0x67, 0x89,
+			0x01, 0x23}};
+
+		mem_zero(&m_GameInfo, sizeof(m_GameInfo));
+
+		m_GameInfo.m_GameUuid = CalculateUuid("test@ddnet.tw");
+		m_GameInfo.m_pServerVersion = "DDNet test";
+		m_GameInfo.m_StartTime = time(0);
+		m_GameInfo.m_pPrngDescription = "test-prng:02468ace";
+
+		m_GameInfo.m_pServerName = "server name";
+		m_GameInfo.m_ServerPort = 8303;
+		m_GameInfo.m_pGameType = "game type";
+
+		m_GameInfo.m_pMapName = "Kobra 3 Solo";
+		m_GameInfo.m_MapSize = 903514;
+		m_GameInfo.m_MapSha256 = Sha256;
+		m_GameInfo.m_MapCrc = 0xeceaf25c;
+
+		m_GameInfo.m_HavePrevGameUuid = false;
+		mem_zero(&m_GameInfo.m_PrevGameUuid, sizeof(m_GameInfo.m_PrevGameUuid));
+
+		m_GameInfo.m_pConfig = &m_Config;
+		m_GameInfo.m_pTuning = &m_Tuning;
+		m_GameInfo.m_pUuids = &m_UuidManager;
+
+		Reset(&m_GameInfo);
+	}
+
+	static void WriteBuffer(std::vector<unsigned char> &vBuffer, const void *pData, size_t DataSize)
+	{
+		if(DataSize <= 0)
+			return;
+
+		const size_t OldSize = vBuffer.size();
+		vBuffer.resize(OldSize + DataSize);
+		mem_copy(&vBuffer[OldSize], pData, DataSize);
+	}
+
+	static void Write(const void *pData, int DataSize, void *pUser)
+	{
+		TeeHistorian *pThis = (TeeHistorian *)pUser;
+		WriteBuffer(pThis->m_vBuffer, pData, DataSize);
+	}
+
+	void Reset(const CTeeHistorian::CGameInfo *pGameInfo)
+	{
+		m_vBuffer.clear();
+		m_TH.Reset(pGameInfo, Write, this);
+		m_State = STATE_NONE;
+	}
+
+	void Expect(const unsigned char *pOutput, size_t OutputSize)
+	{
+		static CUuid TEEHISTORIAN_UUID = CalculateUuid("teehistorian@ddnet.tw");
+		static const char PREFIX1[] = "{\"comment\":\"teehistorian@ddnet.tw\",\"version\":\"2\",\"version_minor\":\"6\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
+		static const char PREFIX2[] = "\",\"server_name\":\"server name\",\"server_port\":\"8303\",\"game_type\":\"game type\",\"map_name\":\"Kobra 3 Solo\",\"map_size\":\"903514\",\"map_sha256\":\"0123456789012345678901234567890123456789012345678901234567890123\",\"map_crc\":\"eceaf25c\",\"prng_description\":\"test-prng:02468ace\",\"config\":{},\"tuning\":{},\"uuids\":[";
+		static const char PREFIX3[] = "]}";
+
+		char aTimeBuf[64];
+		str_timestamp_ex(m_GameInfo.m_StartTime, aTimeBuf, sizeof(aTimeBuf), "%Y-%m-%dT%H:%M:%S%z");
+
+		std::vector<unsigned char> vBuffer;
+		WriteBuffer(vBuffer, &TEEHISTORIAN_UUID, sizeof(TEEHISTORIAN_UUID));
+		WriteBuffer(vBuffer, PREFIX1, str_length(PREFIX1));
+		WriteBuffer(vBuffer, aTimeBuf, str_length(aTimeBuf));
+		WriteBuffer(vBuffer, PREFIX2, str_length(PREFIX2));
+		for(int i = 0; i < m_UuidManager.NumUuids(); i++)
+		{
+			char aBuf[64];
+			str_format(aBuf, sizeof(aBuf), "%s\"%s\"",
+				i == 0 ? "" : ",",
+				m_UuidManager.GetName(OFFSET_UUID + i));
+			WriteBuffer(vBuffer, aBuf, str_length(aBuf));
+		}
+		WriteBuffer(vBuffer, PREFIX3, str_length(PREFIX3));
+		WriteBuffer(vBuffer, "", 1);
+		WriteBuffer(vBuffer, pOutput, OutputSize);
+
+		ExpectFull(vBuffer.data(), vBuffer.size());
+	}
+
+	void ExpectFull(const unsigned char *pOutput, size_t OutputSize)
+	{
+		const ::testing::TestInfo *pTestInfo =
+			::testing::UnitTest::GetInstance()->current_test_info();
+		const char *pTestName = pTestInfo->name();
+
+		if(m_vBuffer.size() != OutputSize || mem_comp(m_vBuffer.data(), pOutput, OutputSize) != 0)
+		{
+			char aFilename[IO_MAX_PATH_LENGTH];
+			IOHANDLE File;
+
+			str_format(aFilename, sizeof(aFilename), "%sGot.teehistorian", pTestName);
+			File = io_open(aFilename, IOFLAG_WRITE);
+			ASSERT_TRUE(File);
+			io_write(File, m_vBuffer.data(), m_vBuffer.size());
+			io_close(File);
+
+			str_format(aFilename, sizeof(aFilename), "%sExpected.teehistorian", pTestName);
+			File = io_open(aFilename, IOFLAG_WRITE);
+			ASSERT_TRUE(File);
+			io_write(File, pOutput, OutputSize);
+			io_close(File);
+		}
+
+		printf("pOutput = {");
+		size_t Start = 0; // skip over header;
+		for(size_t i = 0; i < m_vBuffer.size(); i++)
+		{
+			if(Start == 0)
+			{
+				if(m_vBuffer[i] == 0)
+					Start = i + 1;
+				continue;
+			}
+			if((i - Start) % 10 == 0)
+				printf("\n\t");
+			else
+				printf(", ");
+			printf("0x%.2x", m_vBuffer[i]);
+		}
+		printf("\n}\n");
+		ASSERT_EQ(m_vBuffer.size(), OutputSize);
+		ASSERT_TRUE(mem_comp(m_vBuffer.data(), pOutput, OutputSize) == 0);
+	}
+
+	void Tick(int Tick)
+	{
+		if(m_State == STATE_PLAYERS)
+		{
+			Inputs();
+		}
+		if(m_State == STATE_INPUTS)
+		{
+			m_TH.EndInputs();
+			m_TH.EndTick();
+		}
+		m_TH.BeginTick(Tick);
+		m_TH.BeginPlayers();
+		m_State = STATE_PLAYERS;
+	}
+	void Inputs()
+	{
+		m_TH.EndPlayers();
+		m_TH.BeginInputs();
+		m_State = STATE_INPUTS;
+	}
+	void Finish()
+	{
+		if(m_State == STATE_PLAYERS)
+		{
+			Inputs();
+		}
+		if(m_State == STATE_INPUTS)
+		{
+			m_TH.EndInputs();
+			m_TH.EndTick();
+		}
+		m_TH.Finish();
+	}
+	void DeadPlayer(int ClientID)
+	{
+		m_TH.RecordDeadPlayer(ClientID);
+	}
+	void Player(int ClientID, int x, int y)
+	{
+		CNetObj_CharacterCore Char;
+		mem_zero(&Char, sizeof(Char));
+		Char.m_X = x;
+		Char.m_Y = y;
+		m_TH.RecordPlayer(ClientID, &Char);
+	}
+};
+
+TEST_F(TeeHistorian, Empty)
+{
+	Expect((const unsigned char *)"", 0);
+}
+
+TEST_F(TeeHistorian, Finished)
+{
+	const unsigned char EXPECTED[] = {0x40}; // FINISH
+	m_TH.Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickImplicitOneTick)
+{
+	const unsigned char EXPECTED[] = {
+		0x42, 0x00, 0x01, 0x02, // PLAYERNEW cid=0 x=1 y=2
+		0x40, // FINISH
+	};
+	Tick(1);
+	Player(0, 1, 2);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickImplicitTwoTicks)
+{
+	const unsigned char EXPECTED[] = {
+		0x42, 0x00, 0x01, 0x02, // PLAYER_NEW cid=0 x=1 y=2
+		0x00, 0x01, 0x40, // PLAYER cid=0 dx=1 dy=-1
+		0x40, // FINISH
+	};
+	Tick(1);
+	Player(0, 1, 2);
+	Tick(2);
+	Player(0, 2, 1);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickImplicitDescendingClientID)
+{
+	const unsigned char EXPECTED[] = {
+		0x42, 0x01, 0x02, 0x03, // PLAYER_NEW cid=1 x=2 y=3
+		0x42, 0x00, 0x04, 0x05, // PLAYER_NEW cid=0 x=4 y=5
+		0x40, // FINISH
+	};
+	Tick(1);
+	DeadPlayer(0);
+	Player(1, 2, 3);
+	Tick(2);
+	Player(0, 4, 5);
+	Player(1, 2, 3);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickExplicitAscendingClientID)
+{
+	const unsigned char EXPECTED[] = {
+		0x42, 0x00, 0x04, 0x05, // PLAYER_NEW cid=0 x=4 y=5
+		0x41, 0x00, // TICK_SKIP dt=0
+		0x42, 0x01, 0x02, 0x03, // PLAYER_NEW cid=1 x=2 y=3
+		0x40, // FINISH
+	};
+	Tick(1);
+	Player(0, 4, 5);
+	DeadPlayer(1);
+	Tick(2);
+	Player(0, 4, 5);
+	Player(1, 2, 3);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickImplicitEmpty)
+{
+	const unsigned char EXPECTED[] = {
+		0x40, // FINISH
+	};
+	for(int i = 1; i < 500; i++)
+	{
+		Tick(i);
+	}
+	for(int i = 1000; i < 100000; i += 1000)
+	{
+		Tick(i);
+	}
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickExplicitStart)
+{
+	const unsigned char EXPECTED[] = {
+		0x41, 0xb3, 0x07, // TICK_SKIP dt=499
+		0x42, 0x00, 0x40, 0x40, // PLAYER_NEW cid=0 x=-1 y=-1
+		0x40, // FINISH
+	};
+	Tick(500);
+	Player(0, -1, -1);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TickExplicitPlayerMessage)
+{
+	const unsigned char EXPECTED[] = {
+		0x41, 0x00, // TICK_SKIP dt=0
+		0x46, 0x3f, 0x01, 0x00, // MESSAGE cid=63 msg="\0"
+		0x40, // FINISH
+	};
+	Tick(1);
+	Inputs();
+	m_TH.RecordPlayerMessage(63, "", 1);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, ExtraMessage)
+{
+	const unsigned char EXPECTED[] = {
+		0x41, 0x00, // TICK_SKIP dt=0
+		// EX uuid=6bb8ba88-0f0b-382e-8dae-dbf4052b8b7d data_len=0
+		0x4a,
+		0x6b, 0xb8, 0xba, 0x88, 0x0f, 0x0b, 0x38, 0x2e,
+		0x8d, 0xae, 0xdb, 0xf4, 0x05, 0x2b, 0x8b, 0x7d,
+		0x00,
+		0x40, // FINISH
+	};
+	Tick(1);
+	Inputs();
+	m_TH.RecordTestExtra();
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, DDNetVersion)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=60daba5c-52c4-3aeb-b8ba-b2953fb55a17 data_len=50
+		0x4a,
+		0x13, 0x97, 0xb6, 0x3e, 0xee, 0x4e, 0x39, 0x19,
+		0xb8, 0x6a, 0xb0, 0x58, 0x88, 0x7f, 0xca, 0xf5,
+		0x32,
+		// (DDNETVER) cid=0 connection_id=fb13a576-d35f-4893-b815-eedc6d98015b
+		// ddnet_version=13010 ddnet_version_str=DDNet 13.1 (3623f5e4cd184556)
+		0x00,
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b,
+		0x92, 0xcb, 0x01, 'D', 'D', 'N', 'e', 't',
+		' ', '1', '3', '.', '1', ' ', '(', '3',
+		'6', '2', '3', 'f', '5', 'e', '4', 'c',
+		'd', '1', '8', '4', '5', '5', '6', ')',
+		0x00,
+		// EX uuid=41b49541-f26f-325d-8715-9baf4b544ef9 data_len=4
+		0x4a,
+		0x41, 0xb4, 0x95, 0x41, 0xf2, 0x6f, 0x32, 0x5d,
+		0x87, 0x15, 0x9b, 0xaf, 0x4b, 0x54, 0x4e, 0xf9,
+		0x04,
+		// (DDNETVER_OLD) cid=1 ddnet_version=13010
+		0x01, 0x92, 0xcb, 0x01,
+		0x40, // FINISH
+	};
+	CUuid ConnectionID = {
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
+	m_TH.RecordDDNetVersion(0, ConnectionID, 13010, "DDNet 13.1 (3623f5e4cd184556)");
+	m_TH.RecordDDNetVersionOld(1, 13010);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, Auth)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=60daba5c-52c4-3aeb-b8ba-b2953fb55a17 data_len=16
+		0x4a,
+		0x60, 0xda, 0xba, 0x5c, 0x52, 0xc4, 0x3a, 0xeb,
+		0xb8, 0xba, 0xb2, 0x95, 0x3f, 0xb5, 0x5a, 0x17,
+		0x10,
+		// (AUTH_INIT) cid=0 level=3 auth_name="default_admin"
+		0x00, 0x03, 'd', 'e', 'f', 'a', 'u', 'l',
+		't', '_', 'a', 'd', 'm', 'i', 'n', 0x00,
+		// EX uuid=37ecd3b8-9218-3bb9-a71b-a935b86f6a81 data_len=9
+		0x4a,
+		0x37, 0xec, 0xd3, 0xb8, 0x92, 0x18, 0x3b, 0xb9,
+		0xa7, 0x1b, 0xa9, 0x35, 0xb8, 0x6f, 0x6a, 0x81,
+		0x09,
+		// (AUTH_LOGIN) cid=1 level=2 auth_name="foobar"
+		0x01, 0x02, 'f', 'o', 'o', 'b', 'a', 'r',
+		0x00,
+		// EX uuid=37ecd3b8-9218-3bb9-a71b-a935b86f6a81 data_len=7
+		0x4a,
+		0x37, 0xec, 0xd3, 0xb8, 0x92, 0x18, 0x3b, 0xb9,
+		0xa7, 0x1b, 0xa9, 0x35, 0xb8, 0x6f, 0x6a, 0x81,
+		0x07,
+		// (AUTH_LOGIN) cid=1 level=2 auth_name="foobar"
+		0x02, 0x01, 'h', 'e', 'l', 'p', 0x00,
+		// EX uuid=d4f5abe8-edd2-3fb9-abd8-1c8bb84f4a63 data_len=7
+		0x4a,
+		0xd4, 0xf5, 0xab, 0xe8, 0xed, 0xd2, 0x3f, 0xb9,
+		0xab, 0xd8, 0x1c, 0x8b, 0xb8, 0x4f, 0x4a, 0x63,
+		0x01,
+		// (AUTH_LOGOUT) cid=1
+		0x01,
+		0x40, // FINISH
+	};
+	m_TH.RecordAuthInitial(0, AUTHED_ADMIN, "default_admin");
+	m_TH.RecordAuthLogin(1, AUTHED_MOD, "foobar");
+	m_TH.RecordAuthLogin(2, AUTHED_HELPER, "help");
+	m_TH.RecordAuthLogout(1);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, JoinLeave)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=1899a382-71e3-36da-937d-c9de6bb95b1d data_len=1
+		0x4a,
+		0x18, 0x99, 0xa3, 0x82, 0x71, 0xe3, 0x36, 0xda,
+		0x93, 0x7d, 0xc9, 0xde, 0x6b, 0xb9, 0x5b, 0x1d,
+		0x01,
+		// (JOINVER6) cid=6
+		0x06,
+		// JOIN cid=7
+		0x47, 0x06,
+		// EX uuid=59239b05-0540-318d-bea4-9aa1e80e7d2b data_len=1
+		0x4a,
+		0x59, 0x23, 0x9b, 0x05, 0x05, 0x40, 0x31, 0x8d,
+		0xbe, 0xa4, 0x9a, 0xa1, 0xe8, 0x0e, 0x7d, 0x2b,
+		0x01,
+		// (JOINVER7) cid=7
+		0x07,
+		// JOIN cid=7
+		0x47, 0x07,
+		// LEAVE cid=6 reason="too many pancakes"
+		0x48, 0x06, 't', 'o', 'o', ' ', 'm', 'a',
+		'n', 'y', ' ', 'p', 'a', 'n', 'c', 'a',
+		'k', 'e', 's', 0x00,
+		0x40, // FINISH
+	};
+	m_TH.RecordPlayerJoin(6, CTeeHistorian::PROTOCOL_6);
+	m_TH.RecordPlayerJoin(7, CTeeHistorian::PROTOCOL_7);
+	m_TH.RecordPlayerDrop(6, "too many pancakes");
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, Input)
+{
+	CNetObj_PlayerInput Input = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+	const unsigned char EXPECTED[] = {
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// new player -> InputNew
+		0x45,
+		0x00, // ClientID 0
+		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+		// same unique id, same input -> nothing
+		// same unique id, different input -> InputDiff
+		0x44,
+		0x00, // ClientID 0
+		0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		// different unique id, same input -> InputNew
+		0x45,
+		0x00, // ClientID 0
+		0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+		// FINISH
+		0x40};
+
+	Tick(1);
+
+	// new player -> InputNew
+	m_TH.RecordPlayerInput(0, 1, &Input);
+	// same unique id, same input -> nothing
+	m_TH.RecordPlayerInput(0, 1, &Input);
+
+	Input.m_Direction = 0;
+
+	// same unique id, different input -> InputDiff
+	m_TH.RecordPlayerInput(0, 1, &Input);
+
+	// different unique id, same input -> InputNew
+	m_TH.RecordPlayerInput(0, 2, &Input);
+
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, SaveSuccess)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=4560c756-da29-3036-81d4-90a50f0182cd datalen=42
+		0x4a,
+		0x45, 0x60, 0xc7, 0x56, 0xda, 0x29, 0x30, 0x36,
+		0x81, 0xd4, 0x90, 0xa5, 0x0f, 0x01, 0x82, 0xcd,
+		0x1a,
+		// team=21
+		0x15,
+		// save_id
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b,
+		// team_save
+		'2', '\t', 'H', '.', '\n', 'l', 'l', '0', 0x00,
+		// FINISH
+		0x40};
+
+	CUuid SaveID = {
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
+	const char *pTeamSave = "2\tH.\nll0";
+	m_TH.RecordTeamSaveSuccess(21, SaveID, pTeamSave);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, SaveFailed)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=b29901d5-1244-3bd0-bbde-23d04b1f7ba9 datalen=42
+		0x4a,
+		0xb2, 0x99, 0x01, 0xd5, 0x12, 0x44, 0x3b, 0xd0,
+		0xbb, 0xde, 0x23, 0xd0, 0x4b, 0x1f, 0x7b, 0xa9,
+		0x01,
+		// team=12
+		0x0c,
+		0x40};
+
+	m_TH.RecordTeamSaveFailure(12);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, LoadSuccess)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=e05408d3-a313-33df-9eb3-ddb990ab954a datalen=42
+		0x4a,
+		0xe0, 0x54, 0x08, 0xd3, 0xa3, 0x13, 0x33, 0xdf,
+		0x9e, 0xb3, 0xdd, 0xb9, 0x90, 0xab, 0x95, 0x4a,
+		0x1a,
+		// team=21
+		0x15,
+		// save_id
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b,
+		// team_save
+		'2', '\t', 'H', '.', '\n', 'l', 'l', '0', 0x00,
+		// FINISH
+		0x40};
+
+	CUuid SaveID = {
+		0xfb, 0x13, 0xa5, 0x76, 0xd3, 0x5f, 0x48, 0x93,
+		0xb8, 0x15, 0xee, 0xdc, 0x6d, 0x98, 0x01, 0x5b};
+	const char *pTeamSave = "2\tH.\nll0";
+	m_TH.RecordTeamLoadSuccess(21, SaveID, pTeamSave);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, LoadFailed)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=ef8905a2-c695-3591-a1cd-53d2015992dd datalen=42
+		0x4a,
+		0xef, 0x89, 0x05, 0xa2, 0xc6, 0x95, 0x35, 0x91,
+		0xa1, 0xcd, 0x53, 0xd2, 0x01, 0x59, 0x92, 0xdd,
+		0x01,
+		// team=12
+		0x0c,
+		0x40};
+
+	m_TH.RecordTeamLoadFailure(12);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerSwap)
+{
+	const unsigned char EXPECTED[] = {
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=5de9b633-49cf-3e99-9a25-d4a78e9717d7 datalen=2
+		0x4a,
+		0x5d, 0xe9, 0xb6, 0x33, 0x49, 0xcf, 0x3e, 0x99,
+		0x9a, 0x25, 0xd4, 0xa7, 0x8e, 0x97, 0x17, 0xd7,
+		0x02,
+		// playerId1=11
+		0x0b,
+		// playerId2=21
+		0x15,
+		// FINISH
+		0x40};
+	Tick(1);
+	m_TH.RecordPlayerSwap(11, 21);
+	Finish();
+
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerTeam)
+{
+	const unsigned char EXPECTED[] = {
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=a111c04e-1ea8-38e0-90b1-d7f993ca0da9 datalen=2
+		0x4a,
+		0xa1, 0x11, 0xc0, 0x4e, 0x1e, 0xa8, 0x38, 0xe0,
+		0x90, 0xb1, 0xd7, 0xf9, 0x93, 0xca, 0x0d, 0xa9,
+		0x02,
+		// (PLAYER_TEAM) cid=33 team=54
+		0x21, 0x36,
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=a111c04e-1ea8-38e0-90b1-d7f993ca0da9 datalen=2
+		0x4a,
+		0xa1, 0x11, 0xc0, 0x4e, 0x1e, 0xa8, 0x38, 0xe0,
+		0x90, 0xb1, 0xd7, 0xf9, 0x93, 0xca, 0x0d, 0xa9,
+		0x02,
+		// (PLAYER_TEAM) cid=3 team=12
+		0x03, 0x0c,
+		// EX uuid=a111c04e-1ea8-38e0-90b1-d7f993ca0da9 datalen=2
+		0x4a,
+		0xa1, 0x11, 0xc0, 0x4e, 0x1e, 0xa8, 0x38, 0xe0,
+		0x90, 0xb1, 0xd7, 0xf9, 0x93, 0xca, 0x0d, 0xa9,
+		0x02,
+		// (PLAYER_TEAM) cid=33 team=0
+		0x21, 0x00,
+		// FINISH
+		0x40};
+
+	Tick(1);
+	m_TH.RecordPlayerTeam(3, 0);
+	m_TH.RecordPlayerTeam(33, 54);
+	m_TH.RecordPlayerTeam(45, 0);
+	Tick(2);
+	m_TH.RecordPlayerTeam(3, 12);
+	m_TH.RecordPlayerTeam(33, 0);
+	m_TH.RecordPlayerTeam(45, 0);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, TeamPractice)
+{
+	const unsigned char EXPECTED[] = {
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=5792834e-81d1-34c9-a29b-b5ff25dac3bc datalen=2
+		0x4a,
+		0x57, 0x92, 0x83, 0x4e, 0x81, 0xd1, 0x34, 0xc9,
+		0xa2, 0x9b, 0xb5, 0xff, 0x25, 0xda, 0xc3, 0xbc,
+		0x02,
+		// (TEAM_PRACTICE) team=23 practice=1
+		0x17, 0x01,
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=5792834e-81d1-34c9-a29b-b5ff25dac3bc datalen=2
+		0x4a,
+		0x57, 0x92, 0x83, 0x4e, 0x81, 0xd1, 0x34, 0xc9,
+		0xa2, 0x9b, 0xb5, 0xff, 0x25, 0xda, 0xc3, 0xbc,
+		0x02,
+		// (TEAM_PRACTICE) team=1 practice=1
+		0x01, 0x01,
+		// EX uuid=5792834e-81d1-34c9-a29b-b5ff25dac3bc datalen=2
+		0x4a,
+		0x57, 0x92, 0x83, 0x4e, 0x81, 0xd1, 0x34, 0xc9,
+		0xa2, 0x9b, 0xb5, 0xff, 0x25, 0xda, 0xc3, 0xbc,
+		0x02,
+		// (TEAM_PRACTICE) team=23 practice=0
+		0x17, 0x00,
+		// FINISH
+		0x40};
+
+	Tick(1);
+	m_TH.RecordTeamPractice(1, false);
+	m_TH.RecordTeamPractice(16, false);
+	m_TH.RecordTeamPractice(23, true);
+	Tick(2);
+	m_TH.RecordTeamPractice(1, true);
+	m_TH.RecordTeamPractice(16, false);
+	m_TH.RecordTeamPractice(23, false);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerRejoinVer6)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=c1e921d5-96f5-37bb-8a45-7a06f163d27e datalen=1
+		0x4a,
+		0xc1, 0xe9, 0x21, 0xd5, 0x96, 0xf5, 0x37, 0xbb,
+		0x8a, 0x45, 0x7a, 0x06, 0xf1, 0x63, 0xd2, 0x7e,
+		0x01,
+		// (PLAYER_REJOIN) cid=2
+		0x02,
+		// FINISH
+		0x40};
+
+	m_TH.RecordPlayerRejoin(2);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerReady)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=638587c9-3f75-3887-918e-a3c2614ffaa0 datalen=1
+		0x4a,
+		0x63, 0x85, 0x87, 0xc9, 0x3f, 0x75, 0x38, 0x87,
+		0x91, 0x8e, 0xa3, 0xc2, 0x61, 0x4f, 0xfa, 0xa0,
+		0x01,
+		// (PLAYER_READY) cid=63
+		0x3f,
+		// FINISH
+		0x40};
+
+	m_TH.RecordPlayerReady(63);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PlayerReadyMultiple)
+{
+	const unsigned char EXPECTED[] = {
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=638587c9-3f75-3887-918e-a3c2614ffaa0 datalen=1
+		0x4a,
+		0x63, 0x85, 0x87, 0xc9, 0x3f, 0x75, 0x38, 0x87,
+		0x91, 0x8e, 0xa3, 0xc2, 0x61, 0x4f, 0xfa, 0xa0,
+		0x01,
+		// (PLAYER_READY) cid=0
+		0x00,
+		// EX uuid=638587c9-3f75-3887-918e-a3c2614ffaa0 datalen=1
+		0x4a,
+		0x63, 0x85, 0x87, 0xc9, 0x3f, 0x75, 0x38, 0x87,
+		0x91, 0x8e, 0xa3, 0xc2, 0x61, 0x4f, 0xfa, 0xa0,
+		0x01,
+		// (PLAYER_READY) cid=11
+		0x0b,
+		// TICK_SKIP dt=0
+		0x41, 0x00,
+		// EX uuid=638587c9-3f75-3887-918e-a3c2614ffaa0 datalen=1
+		0x4a,
+		0x63, 0x85, 0x87, 0xc9, 0x3f, 0x75, 0x38, 0x87,
+		0x91, 0x8e, 0xa3, 0xc2, 0x61, 0x4f, 0xfa, 0xa0,
+		0x01,
+		// (PLAYER_READY) cid=63
+		0x3f,
+		0x40};
+
+	Tick(1);
+	m_TH.RecordPlayerReady(0);
+	m_TH.RecordPlayerReady(11);
+	Tick(2);
+	m_TH.RecordPlayerReady(63);
+	Finish();
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, AntibotEmpty)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=866bfdac-fb49-3c0b-a887-5fe1f3ea00b8 datalen=0
+		0x4a,
+		0x86, 0x6b, 0xfd, 0xac, 0xfb, 0x49, 0x3c, 0x0b,
+		0xa8, 0x87, 0x5f, 0xe1, 0xf3, 0xea, 0x00, 0xb8,
+		0x00,
+		// (ANTIBOT) antibot_data
+	};
+
+	m_TH.RecordAntibot("", 0);
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, AntibotEmptyNulBytes)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=866bfdac-fb49-3c0b-a887-5fe1f3ea00b8 datalen=4
+		0x4a,
+		0x86, 0x6b, 0xfd, 0xac, 0xfb, 0x49, 0x3c, 0x0b,
+		0xa8, 0x87, 0x5f, 0xe1, 0xf3, 0xea, 0x00, 0xb8,
+		0x04,
+		// (ANTIBOT) antibot_data
+		0x00,
+		0x00,
+		0x00,
+		0x00};
+
+	m_TH.RecordAntibot("\0\0\0\0", 4);
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, AntibotEmptyMessage)
+{
+	const unsigned char EXPECTED[] = {
+		// EX uuid=866bfdac-fb49-3c0b-a887-5fe1f3ea00b8 datalen=4
+		0x4a,
+		0x86, 0x6b, 0xfd, 0xac, 0xfb, 0x49, 0x3c, 0x0b,
+		0xa8, 0x87, 0x5f, 0xe1, 0xf3, 0xea, 0x00, 0xb8,
+		0x04,
+		// (ANTIBOT) antibot_data
+		0xf0,
+		0x9f,
+		0xa4,
+		0x96};
+
+	m_TH.RecordAntibot("🤖", 4);
+	Expect(EXPECTED, sizeof(EXPECTED));
+}
+
+TEST_F(TeeHistorian, PrevGameUuid)
+{
+	m_GameInfo.m_HavePrevGameUuid = true;
+	CUuid PrevGameUuid = {{
+		// fe19c218-f555-4002-a273-126c59ccc17a
+		0xfe, 0x19, 0xc2, 0x18, 0xf5, 0x55, 0x40, 0x02,
+		0xa2, 0x73, 0x12, 0x6c, 0x59, 0xcc, 0xc1, 0x7a,
+		//
+	}};
+	m_GameInfo.m_PrevGameUuid = PrevGameUuid;
+	Reset(&m_GameInfo);
+	Finish();
+	json_value *pJson = json_parse((const char *)m_vBuffer.data() + 16, -1);
+	ASSERT_TRUE(pJson);
+	const json_value &JsonPrevGameUuid = (*pJson)["prev_game_uuid"];
+	ASSERT_EQ(JsonPrevGameUuid.type, json_string);
+	EXPECT_STREQ(JsonPrevGameUuid, "fe19c218-f555-4002-a273-126c59ccc17a");
+	json_value_free(pJson);
+}
diff --git a/src_bkp/test/test.cpp b/src_bkp/test/test.cpp
new file mode 100644
index 0000000000..f9e43d369c
--- /dev/null
+++ b/src_bkp/test/test.cpp
@@ -0,0 +1,149 @@
+#include "test.h"
+#include <gtest/gtest.h>
+
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/storage.h>
+
+#include <algorithm>
+
+CTestInfo::CTestInfo()
+{
+	const ::testing::TestInfo *pTestInfo =
+		::testing::UnitTest::GetInstance()->current_test_info();
+
+	// Typed tests have test names like "TestName/0" and "TestName/1", which would result in invalid filenames.
+	// Replace the string after the first slash with the name of the typed test and use hyphen instead of slash.
+	char aTestCaseName[128];
+	str_copy(aTestCaseName, pTestInfo->test_case_name());
+	for(int i = 0; i < str_length(aTestCaseName); i++)
+	{
+		if(aTestCaseName[i] == '/')
+		{
+			aTestCaseName[i] = '-';
+			aTestCaseName[i + 1] = '\0';
+			str_append(aTestCaseName, pTestInfo->type_param());
+			break;
+		}
+	}
+	str_format(m_aFilenamePrefix, sizeof(m_aFilenamePrefix), "%s.%s-%d",
+		aTestCaseName, pTestInfo->name(), pid());
+	Filename(m_aFilename, sizeof(m_aFilename), ".tmp");
+}
+
+void CTestInfo::Filename(char *pBuffer, size_t BufferLength, const char *pSuffix)
+{
+	str_format(pBuffer, BufferLength, "%s%s", m_aFilenamePrefix, pSuffix);
+}
+
+IStorage *CTestInfo::CreateTestStorage()
+{
+	bool Error = fs_makedir(m_aFilename);
+	EXPECT_FALSE(Error);
+	if(Error)
+	{
+		return nullptr;
+	}
+	return CreateTempStorage(m_aFilename);
+}
+
+class CTestInfoPath
+{
+public:
+	bool m_IsDirectory;
+	char m_aData[IO_MAX_PATH_LENGTH];
+
+	bool operator<(const CTestInfoPath &Other) const
+	{
+		if(m_IsDirectory != Other.m_IsDirectory)
+		{
+			return m_IsDirectory < Other.m_IsDirectory;
+		}
+		return str_comp(m_aData, Other.m_aData) < 0;
+	}
+};
+
+class CTestCollectData
+{
+public:
+	char m_aCurrentDir[IO_MAX_PATH_LENGTH];
+	std::vector<CTestInfoPath> *m_pvEntries;
+};
+
+int TestCollect(const char *pName, int IsDir, int Unused, void *pUser)
+{
+	CTestCollectData *pData = (CTestCollectData *)pUser;
+
+	if(str_comp(pName, ".") == 0 || str_comp(pName, "..") == 0)
+	{
+		return 0;
+	}
+
+	CTestInfoPath Path;
+	Path.m_IsDirectory = IsDir;
+	str_format(Path.m_aData, sizeof(Path.m_aData), "%s/%s", pData->m_aCurrentDir, pName);
+	pData->m_pvEntries->push_back(Path);
+	if(Path.m_IsDirectory)
+	{
+		CTestCollectData DataRecursive;
+		str_copy(DataRecursive.m_aCurrentDir, Path.m_aData, sizeof(DataRecursive.m_aCurrentDir));
+		DataRecursive.m_pvEntries = pData->m_pvEntries;
+		fs_listdir(DataRecursive.m_aCurrentDir, TestCollect, 0, &DataRecursive);
+	}
+	return 0;
+}
+
+void TestDeleteTestStorageFiles(const char *pPath)
+{
+	std::vector<CTestInfoPath> vEntries;
+	CTestCollectData Data;
+	str_copy(Data.m_aCurrentDir, pPath, sizeof(Data.m_aCurrentDir));
+	Data.m_pvEntries = &vEntries;
+	fs_listdir(Data.m_aCurrentDir, TestCollect, 0, &Data);
+
+	CTestInfoPath Path;
+	Path.m_IsDirectory = true;
+	str_copy(Path.m_aData, Data.m_aCurrentDir, sizeof(Path.m_aData));
+	vEntries.push_back(Path);
+
+	// Sorts directories after files.
+	std::sort(vEntries.begin(), vEntries.end());
+
+	// Don't delete too many files.
+	ASSERT_LE(vEntries.size(), 10);
+	for(auto &Entry : vEntries)
+	{
+		if(Entry.m_IsDirectory)
+		{
+			ASSERT_FALSE(fs_removedir(Entry.m_aData));
+		}
+		else
+		{
+			ASSERT_FALSE(fs_remove(Entry.m_aData));
+		}
+	}
+}
+
+CTestInfo::~CTestInfo()
+{
+	if(!::testing::Test::HasFailure() && m_DeleteTestStorageFilesOnSuccess)
+	{
+		TestDeleteTestStorageFiles(m_aFilename);
+	}
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	::testing::InitGoogleTest(&argc, const_cast<char **>(argv));
+	net_init();
+	if(secure_random_init())
+	{
+		fprintf(stderr, "random init failed\n");
+		return 1;
+	}
+	int Result = RUN_ALL_TESTS();
+	secure_random_uninit();
+	return Result;
+}
diff --git a/src_bkp/test/test.h b/src_bkp/test/test.h
new file mode 100644
index 0000000000..9c7554e4bd
--- /dev/null
+++ b/src_bkp/test/test.h
@@ -0,0 +1,19 @@
+#ifndef TEST_TEST_H
+#define TEST_TEST_H
+
+#include <cstddef>
+
+class IStorage;
+
+class CTestInfo
+{
+public:
+	CTestInfo();
+	~CTestInfo();
+	IStorage *CreateTestStorage();
+	bool m_DeleteTestStorageFilesOnSuccess = false;
+	void Filename(char *pBuffer, size_t BufferLength, const char *pSuffix);
+	char m_aFilenamePrefix[128];
+	char m_aFilename[128];
+};
+#endif // TEST_TEST_H
diff --git a/src_bkp/test/thread.cpp b/src_bkp/test/thread.cpp
new file mode 100644
index 0000000000..76c8422ba0
--- /dev/null
+++ b/src_bkp/test/thread.cpp
@@ -0,0 +1,98 @@
+#include <gtest/gtest.h>
+
+#include <base/lock.h>
+#include <base/system.h>
+#include <base/tl/threading.h>
+
+static void Nothing(void *pUser)
+{
+	(void)pUser;
+}
+
+TEST(Thread, Detach)
+{
+	void *pThread = thread_init(Nothing, 0, "detach");
+	thread_detach(pThread);
+}
+
+static void SetToOne(void *pUser)
+{
+	*(int *)pUser = 1;
+}
+
+TEST(Thread, Wait)
+{
+	int Integer = 0;
+	void *pThread = thread_init(SetToOne, &Integer, "wait");
+	thread_wait(pThread);
+	EXPECT_EQ(Integer, 1);
+}
+
+TEST(Thread, Yield)
+{
+	thread_yield();
+}
+
+TEST(Thread, Semaphore)
+{
+	SEMAPHORE Semaphore;
+	sphore_init(&Semaphore);
+	sphore_destroy(&Semaphore);
+}
+
+TEST(Thread, SemaphoreSingleThreaded)
+{
+	SEMAPHORE Semaphore;
+	sphore_init(&Semaphore);
+	sphore_signal(&Semaphore);
+	sphore_signal(&Semaphore);
+	sphore_wait(&Semaphore);
+	sphore_wait(&Semaphore);
+	sphore_destroy(&Semaphore);
+}
+
+TEST(Thread, SemaphoreWrapperSingleThreaded)
+{
+	CSemaphore Semaphore;
+	EXPECT_EQ(Semaphore.GetApproximateValue(), 0);
+	Semaphore.Signal();
+	EXPECT_EQ(Semaphore.GetApproximateValue(), 1);
+	Semaphore.Signal();
+	EXPECT_EQ(Semaphore.GetApproximateValue(), 2);
+	Semaphore.Wait();
+	EXPECT_EQ(Semaphore.GetApproximateValue(), 1);
+	Semaphore.Wait();
+	EXPECT_EQ(Semaphore.GetApproximateValue(), 0);
+}
+
+static void SemaphoreThread(void *pUser)
+{
+	SEMAPHORE *pSemaphore = (SEMAPHORE *)pUser;
+	sphore_wait(pSemaphore);
+}
+
+TEST(Thread, SemaphoreMultiThreaded)
+{
+	SEMAPHORE Semaphore;
+	sphore_init(&Semaphore);
+	sphore_signal(&Semaphore);
+	void *pThread = thread_init(SemaphoreThread, &Semaphore, "semaphore");
+	thread_wait(pThread);
+	sphore_destroy(&Semaphore);
+}
+
+static void LockThread(void *pUser)
+{
+	CLock *pLock = (CLock *)pUser;
+	pLock->lock();
+	pLock->unlock();
+}
+
+TEST(Thread, Lock)
+{
+	CLock Lock;
+	Lock.lock();
+	void *pThread = thread_init(LockThread, &Lock, "lock");
+	Lock.unlock();
+	thread_wait(pThread);
+}
diff --git a/src_bkp/test/unix.cpp b/src_bkp/test/unix.cpp
new file mode 100644
index 0000000000..1a6876b3f5
--- /dev/null
+++ b/src_bkp/test/unix.cpp
@@ -0,0 +1,12 @@
+#include <gtest/gtest.h>
+
+#include <base/system.h>
+
+#if defined(CONF_FAMILY_UNIX)
+TEST(Unix, Create)
+{
+	UNIXSOCKET Socket = net_unix_create_unnamed();
+	ASSERT_GE(Socket, 0);
+	net_unix_close(Socket);
+}
+#endif
diff --git a/src_bkp/test/uuid.cpp b/src_bkp/test/uuid.cpp
new file mode 100644
index 0000000000..9bcab76b50
--- /dev/null
+++ b/src_bkp/test/uuid.cpp
@@ -0,0 +1,37 @@
+#include <gtest/gtest.h>
+
+#include <engine/shared/uuid_manager.h>
+
+TEST(Uuid, FromToString)
+{
+	char aUuid[UUID_MAXSTRSIZE];
+	CUuid Uuid;
+	EXPECT_FALSE(ParseUuid(&Uuid, "8d300ecf-5873-4297-bee5-95668fdff320"));
+	FormatUuid(Uuid, aUuid, sizeof(aUuid));
+	EXPECT_STREQ(aUuid, "8d300ecf-5873-4297-bee5-95668fdff320");
+	EXPECT_FALSE(ParseUuid(&Uuid, "00000000-0000-0000-0000-000000000000"));
+	FormatUuid(Uuid, aUuid, sizeof(aUuid));
+	EXPECT_STREQ(aUuid, "00000000-0000-0000-0000-000000000000");
+	EXPECT_FALSE(ParseUuid(&Uuid, "ffffffff-ffff-ffff-ffff-ffffffffffff"));
+	FormatUuid(Uuid, aUuid, sizeof(aUuid));
+	EXPECT_STREQ(aUuid, "ffffffff-ffff-ffff-ffff-ffffffffffff");
+	EXPECT_FALSE(ParseUuid(&Uuid, "01234567-89aB-cDeF-0123-456789AbCdEf"));
+	FormatUuid(Uuid, aUuid, sizeof(aUuid));
+	EXPECT_STREQ(aUuid, "01234567-89ab-cdef-0123-456789abcdef");
+}
+
+TEST(Uuid, ParseFailures)
+{
+	CUuid Uuid;
+	EXPECT_TRUE(ParseUuid(&Uuid, ""));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef-0123-456789abcdeg"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "0-0-0-0-0"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef-0123-456789abcde"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef-0123-456789abcdef0"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567+89ab-cdef-0123-456789abcdef"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab+cdef-0123-456789abcdef"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef+0123-456789abcdef"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef-0123+456789abcdef"));
+	EXPECT_TRUE(ParseUuid(&Uuid, "01234567-89ab-cdef-0123-456789abcdef "));
+	EXPECT_TRUE(ParseUuid(&Uuid, "0x01234567-89ab-cdef-0123-456789abcdef"));
+}
diff --git a/src_bkp/tools/config_common.h b/src_bkp/tools/config_common.h
new file mode 100644
index 0000000000..500e214d66
--- /dev/null
+++ b/src_bkp/tools/config_common.h
@@ -0,0 +1,74 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/storage.h>
+
+struct SListDirectoryContext
+{
+	const char *m_pPath;
+	IStorage *m_pStorage;
+};
+
+inline void ProcessItem(const char *pItemName, IStorage *pStorage)
+{
+	char aConfig[2048];
+
+	size_t Len = (size_t)str_length(pItemName) + 1; // including '\0'
+	if(Len > sizeof(aConfig))
+	{
+		dbg_msg("config_common", "can't process overlong filename '%s'", pItemName);
+		return;
+	}
+
+	if(!str_endswith(pItemName, ".map"))
+	{
+		dbg_msg("config_common", "can't process non-map file '%s'", pItemName);
+		return;
+	}
+
+	str_copy(aConfig, pItemName, sizeof(aConfig));
+	aConfig[Len - sizeof(".map")] = 0;
+	str_append(aConfig, ".cfg");
+	dbg_msg("config_common", "processing '%s'", pItemName);
+	Process(pStorage, pItemName, aConfig);
+}
+
+static int ListdirCallback(const char *pItemName, int IsDir, int StorageType, void *pUser)
+{
+	if(!IsDir)
+	{
+		SListDirectoryContext Context = *((SListDirectoryContext *)pUser);
+		char aName[2048];
+		str_format(aName, sizeof(aName), "%s/%s", Context.m_pPath, pItemName);
+		ProcessItem(aName, Context.m_pStorage);
+	}
+
+	return 0;
+}
+
+int main(int argc, const char **argv) // NOLINT(misc-definitions-in-headers)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	IStorage *pStorage = CreateLocalStorage();
+	if(!pStorage)
+		return -1;
+
+	if(argc == 1)
+	{
+		dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
+		dbg_msg("usage", "%s DIRECTORY", argv[0]);
+		return -1;
+	}
+	else if(argc == 2 && fs_is_dir(argv[1]))
+	{
+		SListDirectoryContext Context = {argv[1], pStorage};
+		pStorage->ListDirectory(IStorage::TYPE_ALL, argv[1], ListdirCallback, &Context);
+	}
+
+	for(int i = 1; i < argc; i++)
+	{
+		ProcessItem(argv[i], pStorage);
+	}
+	return 0;
+}
diff --git a/src_bkp/tools/config_retrieve.cpp b/src_bkp/tools/config_retrieve.cpp
new file mode 100644
index 0000000000..cb98053893
--- /dev/null
+++ b/src_bkp/tools/config_retrieve.cpp
@@ -0,0 +1,59 @@
+#include <base/system.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+
+void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
+{
+	CDataFileReader Reader;
+	if(!Reader.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("config_retrieve", "error opening map '%s'", pMapName);
+		return;
+	}
+	bool ConfigFound = false;
+	int Start, Num;
+	Reader.GetType(MAPITEMTYPE_INFO, &Start, &Num);
+	for(int i = Start; i < Start + Num; i++)
+	{
+		int ID;
+		CMapItemInfoSettings *pItem = (CMapItemInfoSettings *)Reader.GetItem(i, nullptr, &ID);
+		int ItemSize = Reader.GetItemSize(i);
+		if(!pItem || ID != 0)
+			continue;
+
+		if(ItemSize < (int)sizeof(CMapItemInfoSettings))
+			break;
+		if(!(pItem->m_Settings > -1))
+			break;
+
+		ConfigFound = true;
+		IOHANDLE Config = pStorage->OpenFile(pConfigName, IOFLAG_WRITE, IStorage::TYPE_ABSOLUTE);
+		if(!Config)
+		{
+			dbg_msg("config_retrieve", "error opening config for writing '%s'", pConfigName);
+			Reader.Close();
+			return;
+		}
+
+		int Size = Reader.GetDataSize(pItem->m_Settings);
+		char *pSettings = (char *)Reader.GetData(pItem->m_Settings);
+		char *pNext = pSettings;
+		while(pNext < pSettings + Size)
+		{
+			int StrSize = str_length(pNext) + 1;
+			io_write(Config, pNext, StrSize - 1);
+			io_write_newline(Config);
+			pNext += StrSize;
+		}
+		Reader.UnloadData(pItem->m_Settings);
+		io_close(Config);
+		break;
+	}
+	Reader.Close();
+	if(!ConfigFound)
+	{
+		fs_remove(pConfigName);
+	}
+}
+#include "config_common.h"
diff --git a/src_bkp/tools/config_store.cpp b/src_bkp/tools/config_store.cpp
new file mode 100644
index 0000000000..0c06d05893
--- /dev/null
+++ b/src_bkp/tools/config_store.cpp
@@ -0,0 +1,133 @@
+#include <base/math.h>
+#include <base/system.h>
+#include <engine/shared/datafile.h>
+#include <engine/shared/linereader.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+#include <vector>
+
+void Process(IStorage *pStorage, const char *pMapName, const char *pConfigName)
+{
+	IOHANDLE File = pStorage->OpenFile(pConfigName, IOFLAG_READ | IOFLAG_SKIP_BOM, IStorage::TYPE_ABSOLUTE);
+	if(!File)
+	{
+		dbg_msg("config_store", "config '%s' not found", pConfigName);
+		return;
+	}
+
+	CLineReader LineReader;
+	LineReader.Init(File);
+
+	char *pLine;
+	int TotalLength = 0;
+	std::vector<char *> vLines;
+	while((pLine = LineReader.Get()))
+	{
+		int Length = str_length(pLine) + 1;
+		char *pCopy = (char *)malloc(Length);
+		mem_copy(pCopy, pLine, Length);
+		vLines.push_back(pCopy);
+		TotalLength += Length;
+	}
+	io_close(File);
+
+	char *pSettings = (char *)malloc(maximum(1, TotalLength));
+	int Offset = 0;
+	for(auto &Line : vLines)
+	{
+		int Length = str_length(Line) + 1;
+		mem_copy(pSettings + Offset, Line, Length);
+		Offset += Length;
+		free(Line);
+	}
+
+	CDataFileReader Reader;
+	Reader.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE);
+
+	CDataFileWriter Writer;
+
+	int SettingsIndex = Reader.NumData();
+	bool FoundInfo = false;
+	for(int i = 0; i < Reader.NumItems(); i++)
+	{
+		int Type, ID;
+		int *pItem = (int *)Reader.GetItem(i, &Type, &ID);
+		int Size = Reader.GetItemSize(i);
+		CMapItemInfoSettings MapInfo;
+		if(Type == MAPITEMTYPE_INFO && ID == 0)
+		{
+			FoundInfo = true;
+			CMapItemInfoSettings *pInfo = (CMapItemInfoSettings *)pItem;
+			if(Size >= (int)sizeof(CMapItemInfoSettings))
+			{
+				MapInfo = *pInfo;
+				pItem = (int *)&MapInfo;
+				Size = sizeof(MapInfo);
+				if(pInfo->m_Settings > -1)
+				{
+					SettingsIndex = pInfo->m_Settings;
+					char *pMapSettings = (char *)Reader.GetData(SettingsIndex);
+					int DataSize = Reader.GetDataSize(SettingsIndex);
+					if(DataSize == TotalLength && mem_comp(pSettings, pMapSettings, DataSize) == 0)
+					{
+						dbg_msg("config_store", "configs coincide, not updating map");
+						free(pSettings);
+						return;
+					}
+					Reader.UnloadData(pInfo->m_Settings);
+				}
+				else
+				{
+					MapInfo = *pInfo;
+					MapInfo.m_Settings = SettingsIndex;
+					pItem = (int *)&MapInfo;
+					Size = sizeof(MapInfo);
+				}
+			}
+			else
+			{
+				*(CMapItemInfo *)&MapInfo = *(CMapItemInfo *)pInfo;
+				MapInfo.m_Settings = SettingsIndex;
+				pItem = (int *)&MapInfo;
+				Size = sizeof(MapInfo);
+			}
+		}
+		Writer.AddItem(Type, ID, Size, pItem);
+	}
+
+	if(!FoundInfo)
+	{
+		CMapItemInfoSettings Info;
+		Info.m_Version = 1;
+		Info.m_Author = -1;
+		Info.m_MapVersion = -1;
+		Info.m_Credits = -1;
+		Info.m_License = -1;
+		Info.m_Settings = SettingsIndex;
+		Writer.AddItem(MAPITEMTYPE_INFO, 0, sizeof(Info), &Info);
+	}
+
+	for(int i = 0; i < Reader.NumData() || i == SettingsIndex; i++)
+	{
+		if(i == SettingsIndex)
+		{
+			Writer.AddData(TotalLength, pSettings);
+			continue;
+		}
+		unsigned char *pData = (unsigned char *)Reader.GetData(i);
+		int Size = Reader.GetDataSize(i);
+		Writer.AddData(Size, pData);
+		Reader.UnloadData(i);
+	}
+
+	free(pSettings);
+	Reader.Close();
+	if(!Writer.Open(pStorage, pMapName))
+	{
+		dbg_msg("config_store", "couldn't open map file '%s' for writing", pMapName);
+		return;
+	}
+	Writer.Finish();
+	dbg_msg("config_store", "imported settings");
+}
+#include "config_common.h"
diff --git a/src_bkp/tools/crapnet.cpp b/src_bkp/tools/crapnet.cpp
new file mode 100644
index 0000000000..f7b6b1fc8d
--- /dev/null
+++ b/src_bkp/tools/crapnet.cpp
@@ -0,0 +1,207 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <cstdlib>
+#include <iterator> // std::size
+
+#include <thread>
+
+struct SPacket
+{
+	SPacket *m_pPrev;
+	SPacket *m_pNext;
+
+	NETADDR m_SendTo;
+	int64_t m_Timestamp;
+	int m_ID;
+	int m_DataSize;
+	char m_aData[1];
+};
+
+static SPacket *g_pFirst = (SPacket *)0;
+static SPacket *g_pLast = (SPacket *)0;
+static int g_CurrentLatency = 0;
+
+struct SPingConfig
+{
+	int m_Base;
+	int m_Flux;
+	int m_Spike;
+	int m_Loss;
+	int m_Delay;
+	int m_DelayFreq;
+};
+
+static SPingConfig g_aConfigPings[] = {
+	// base flux spike loss delay delayfreq
+	{0, 0, 0, 0, 0, 0},
+	{40, 20, 100, 0, 0, 0},
+	{140, 40, 200, 0, 0, 0},
+};
+
+static int g_ConfigNumpingconfs = std::size(g_aConfigPings);
+static int g_ConfigInterval = 10; // seconds between different pingconfigs
+static int g_ConfigLog = 0;
+static int g_ConfigReorder = 0;
+
+void Run(unsigned short Port, NETADDR Dest)
+{
+	NETADDR Src = {NETTYPE_IPV4, {0, 0, 0, 0}, Port};
+	NETSOCKET Socket = net_udp_create(Src);
+
+	int ID = 0;
+	int Delaycounter = 0;
+
+	while(true)
+	{
+		static int s_Lastcfg = 0;
+		int n = ((time_get() / time_freq()) / g_ConfigInterval) % g_ConfigNumpingconfs;
+		SPingConfig Ping = g_aConfigPings[n];
+
+		if(n != s_Lastcfg)
+			dbg_msg("crapnet", "cfg = %d", n);
+		s_Lastcfg = n;
+
+		// handle incoming packets
+		while(true)
+		{
+			// fetch data
+			int DataTrash = 0;
+			NETADDR From;
+			unsigned char *pData;
+			int Bytes = net_udp_recv(Socket, &From, &pData);
+			if(Bytes <= 0)
+				break;
+
+			if((rand() % 100) < Ping.m_Loss) // drop the packet
+			{
+				if(g_ConfigLog)
+					dbg_msg("crapnet", "dropped packet");
+				continue;
+			}
+
+			// create new packet
+			SPacket *p = (SPacket *)malloc(sizeof(SPacket) + Bytes);
+
+			if(net_addr_comp(&From, &Dest) == 0)
+				p->m_SendTo = Src; // from the server
+			else
+			{
+				Src = From; // from the client
+				p->m_SendTo = Dest;
+			}
+
+			// queue packet
+			p->m_pPrev = g_pLast;
+			p->m_pNext = 0;
+			if(g_pLast)
+				g_pLast->m_pNext = p;
+			else
+			{
+				g_pFirst = p;
+				g_pLast = p;
+			}
+			g_pLast = p;
+
+			// set data in packet
+			p->m_Timestamp = time_get();
+			p->m_DataSize = Bytes;
+			p->m_ID = ID++;
+			mem_copy(p->m_aData, pData, Bytes);
+
+			if(ID > 20 && Bytes > 6 && DataTrash)
+			{
+				p->m_aData[6 + (rand() % (Bytes - 6))] = rand() & 255; // modify a byte
+				if((rand() % 10) == 0)
+				{
+					p->m_DataSize -= rand() % 32;
+					if(p->m_DataSize < 6)
+						p->m_DataSize = 6;
+				}
+			}
+
+			if(Delaycounter <= 0)
+			{
+				if(Ping.m_Delay)
+					p->m_Timestamp += (time_freq() * 1000) / Ping.m_Delay;
+				Delaycounter = Ping.m_DelayFreq;
+			}
+			Delaycounter--;
+
+			if(g_ConfigLog)
+			{
+				char aAddrStr[NETADDR_MAXSTRSIZE];
+				net_addr_str(&From, aAddrStr, sizeof(aAddrStr), true);
+				dbg_msg("crapnet", "<< %08d %s (%d)", p->m_ID, aAddrStr, p->m_DataSize);
+			}
+		}
+
+		SPacket *pNext = g_pFirst;
+		while(true)
+		{
+			SPacket *p = pNext;
+			if(!p)
+				break;
+			pNext = p->m_pNext;
+
+			if((time_get() - p->m_Timestamp) > g_CurrentLatency)
+			{
+				char aFlags[] = "  ";
+
+				if(g_ConfigReorder && (rand() % 2) == 0 && p->m_pNext)
+				{
+					aFlags[0] = 'R';
+					p = g_pFirst->m_pNext;
+				}
+
+				if(p->m_pNext)
+					p->m_pNext->m_pPrev = p->m_pPrev;
+				else
+					g_pLast = p->m_pPrev;
+
+				if(p->m_pPrev)
+					p->m_pPrev->m_pNext = p->m_pNext;
+				else
+					g_pFirst = p->m_pNext;
+
+				// send and remove packet
+				net_udp_send(Socket, &p->m_SendTo, p->m_aData, p->m_DataSize);
+
+				// update lag
+				double Flux = rand() / (double)RAND_MAX;
+				int MsSpike = Ping.m_Spike;
+				int MsFlux = Ping.m_Flux;
+				int MsPing = Ping.m_Base;
+				g_CurrentLatency = ((time_freq() * MsPing) / 1000) + (int64_t)(((time_freq() * MsFlux) / 1000) * Flux); // 50ms
+
+				if(MsSpike && (p->m_ID % 100) == 0)
+				{
+					g_CurrentLatency += (time_freq() * MsSpike) / 1000;
+					aFlags[1] = 'S';
+				}
+
+				if(g_ConfigLog)
+				{
+					char aAddrStr[NETADDR_MAXSTRSIZE];
+					net_addr_str(&p->m_SendTo, aAddrStr, sizeof(aAddrStr), true);
+					dbg_msg("crapnet", ">> %08d %s (%d) %s", p->m_ID, aAddrStr, p->m_DataSize, aFlags);
+				}
+
+				free(p);
+			}
+		}
+
+		std::this_thread::sleep_for(std::chrono::microseconds(1000));
+	}
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	NETADDR Addr = {NETTYPE_IPV4, {127, 0, 0, 1}, 8303};
+	Run(8302, Addr);
+	return 0;
+}
diff --git a/src_bkp/tools/demo_extract_chat.cpp b/src_bkp/tools/demo_extract_chat.cpp
new file mode 100644
index 0000000000..82f1879e3d
--- /dev/null
+++ b/src_bkp/tools/demo_extract_chat.cpp
@@ -0,0 +1,253 @@
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/client.h>
+#include <engine/shared/demo.h>
+#include <engine/shared/network.h>
+#include <engine/shared/snapshot.h>
+#include <engine/storage.h>
+
+#include <game/gamecore.h>
+
+static const char *TOOL_NAME = "demo_extract_chat";
+
+class CClientSnapshotHandler
+{
+public:
+	struct CClientData
+	{
+		char m_aName[MAX_NAME_LENGTH];
+	};
+	CClientData m_aClients[MAX_CLIENTS];
+
+	CSnapshotStorage::CHolder m_aDemoSnapshotHolders[IClient::NUM_SNAPSHOT_TYPES];
+	char m_aaaDemoSnapshotData[IClient::NUM_SNAPSHOT_TYPES][2][CSnapshot::MAX_SIZE];
+	CSnapshotStorage::CHolder *m_apSnapshots[IClient::NUM_SNAPSHOT_TYPES];
+
+	CClientSnapshotHandler() :
+		m_aClients(), m_aDemoSnapshotHolders()
+	{
+		mem_zero(m_aaaDemoSnapshotData, sizeof(m_aaaDemoSnapshotData));
+
+		for(int SnapshotType = 0; SnapshotType < IClient::NUM_SNAPSHOT_TYPES; SnapshotType++)
+		{
+			m_apSnapshots[SnapshotType] = &m_aDemoSnapshotHolders[SnapshotType];
+			m_apSnapshots[SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][0];
+			m_apSnapshots[SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][1];
+			m_apSnapshots[SnapshotType]->m_SnapSize = 0;
+			m_apSnapshots[SnapshotType]->m_AltSnapSize = 0;
+			m_apSnapshots[SnapshotType]->m_Tick = -1;
+		}
+	}
+
+	int UnpackAndValidateSnapshot(CSnapshot *pFrom, CSnapshot *pTo)
+	{
+		CUnpacker Unpacker;
+		CSnapshotBuilder Builder;
+		Builder.Init();
+		CNetObjHandler NetObjHandler;
+
+		int Num = pFrom->NumItems();
+		for(int Index = 0; Index < Num; Index++)
+		{
+			const CSnapshotItem *pFromItem = pFrom->GetItem(Index);
+			const int FromItemSize = pFrom->GetItemSize(Index);
+			const int ItemType = pFrom->GetItemType(Index);
+			const void *pData = pFromItem->Data();
+			Unpacker.Reset(pData, FromItemSize);
+
+			void *pRawObj = NetObjHandler.SecureUnpackObj(ItemType, &Unpacker);
+			if(!pRawObj)
+				continue;
+
+			const int ItemSize = NetObjHandler.GetUnpackedObjSize(ItemType);
+			void *pObj = Builder.NewItem(pFromItem->Type(), pFromItem->ID(), ItemSize);
+			if(!pObj)
+				return -4;
+
+			mem_copy(pObj, pRawObj, ItemSize);
+		}
+
+		return Builder.Finish(pTo);
+	}
+
+	int SnapNumItems(int SnapID)
+	{
+		dbg_assert(SnapID >= 0 && SnapID < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapID");
+		if(!m_apSnapshots[SnapID])
+			return 0;
+		return m_apSnapshots[SnapID]->m_pAltSnap->NumItems();
+	}
+
+	void *SnapGetItem(int SnapID, int Index, IClient::CSnapItem *pItem)
+	{
+		dbg_assert(SnapID >= 0 && SnapID < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapID");
+		const CSnapshotItem *pSnapshotItem = m_apSnapshots[SnapID]->m_pAltSnap->GetItem(Index);
+		pItem->m_DataSize = m_apSnapshots[SnapID]->m_pAltSnap->GetItemSize(Index);
+		pItem->m_Type = m_apSnapshots[SnapID]->m_pAltSnap->GetItemType(Index);
+		pItem->m_ID = pSnapshotItem->ID();
+		return (void *)pSnapshotItem->Data();
+	}
+
+	void OnNewSnapshot()
+	{
+		int Num = SnapNumItems(IClient::SNAP_CURRENT);
+		for(int i = 0; i < Num; i++)
+		{
+			IClient::CSnapItem Item;
+			const void *pData = SnapGetItem(IClient::SNAP_CURRENT, i, &Item);
+
+			if(Item.m_Type == NETOBJTYPE_CLIENTINFO)
+			{
+				const CNetObj_ClientInfo *pInfo = (const CNetObj_ClientInfo *)pData;
+				int ClientID = Item.m_ID;
+				if(ClientID < MAX_CLIENTS)
+				{
+					CClientData *pClient = &m_aClients[ClientID];
+					IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName);
+				}
+			}
+		}
+	}
+
+	void OnDemoPlayerSnapshot(void *pData, int Size)
+	{
+		unsigned char aAltSnapBuffer[CSnapshot::MAX_SIZE];
+		CSnapshot *pAltSnapBuffer = (CSnapshot *)aAltSnapBuffer;
+		const int AltSnapSize = UnpackAndValidateSnapshot((CSnapshot *)pData, pAltSnapBuffer);
+		if(AltSnapSize < 0)
+			return;
+
+		std::swap(m_apSnapshots[IClient::SNAP_PREV], m_apSnapshots[IClient::SNAP_CURRENT]);
+		mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pSnap, pData, Size);
+		mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
+
+		OnNewSnapshot();
+	}
+};
+
+class CDemoPlayerMessageListener : public CDemoPlayer::IListener
+{
+public:
+	CDemoPlayer *m_pDemoPlayer;
+	CClientSnapshotHandler *m_pClientSnapshotHandler;
+
+	void OnDemoPlayerSnapshot(void *pData, int Size) override
+	{
+		m_pClientSnapshotHandler->OnDemoPlayerSnapshot(pData, Size);
+	}
+
+	void OnDemoPlayerMessage(void *pData, int Size) override
+	{
+		CUnpacker Unpacker;
+		Unpacker.Reset(pData, Size);
+		CMsgPacker Packer(NETMSG_EX, true);
+
+		int Msg;
+		bool Sys;
+		CUuid Uuid;
+
+		int Result = UnpackMessageID(&Msg, &Sys, &Uuid, &Unpacker, &Packer);
+		if(Result == UNPACKMESSAGE_ERROR)
+			return;
+
+		if(!Sys)
+		{
+			CNetObjHandler NetObjHandler;
+			void *pRawMsg = NetObjHandler.SecureUnpackMsg(Msg, &Unpacker);
+			if(!pRawMsg)
+				return;
+
+			if(Msg == NETMSGTYPE_SV_CHAT)
+			{
+				CNetMsg_Sv_Chat *pMsg = (CNetMsg_Sv_Chat *)pRawMsg;
+
+				if(pMsg->m_ClientID > -1 && m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName[0] == '\0')
+					return;
+
+				const char *Prefix = pMsg->m_Team > 1 ? "whisper" : (pMsg->m_Team ? "teamchat" : "chat");
+
+				if(pMsg->m_ClientID < 0)
+				{
+					printf("%s: *** %s\n", Prefix, pMsg->m_pMessage);
+					return;
+				}
+
+				if(pMsg->m_Team == 2) // WHISPER SEND
+					printf("%s: -> %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
+				else if(pMsg->m_Team == 3) // WHISPER RECEIVE
+					printf("%s: <- %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
+				else
+					printf("%s: %s: %s\n", Prefix, m_pClientSnapshotHandler->m_aClients[pMsg->m_ClientID].m_aName, pMsg->m_pMessage);
+			}
+			else if(Msg == NETMSGTYPE_SV_BROADCAST)
+			{
+				CNetMsg_Sv_Broadcast *pMsg = (CNetMsg_Sv_Broadcast *)pRawMsg;
+				char aBroadcast[1024];
+				while((pMsg->m_pMessage = str_next_token(pMsg->m_pMessage, "\n", aBroadcast, sizeof(aBroadcast))))
+				{
+					if(aBroadcast[0] != '\0')
+					{
+						printf("broadcast: %s\n", aBroadcast);
+					}
+				}
+			}
+		}
+	}
+};
+
+static int ExtractDemoChat(const char *pDemoFilePath, IStorage *pStorage)
+{
+	CSnapshotDelta DemoSnapshotDelta;
+	CDemoPlayer DemoPlayer(&DemoSnapshotDelta, false);
+
+	if(DemoPlayer.Load(pStorage, nullptr, pDemoFilePath, IStorage::TYPE_ALL_OR_ABSOLUTE) == -1)
+	{
+		log_error(TOOL_NAME, "Demo file '%s' failed to load: %s", pDemoFilePath, DemoPlayer.ErrorMessage());
+		return -1;
+	}
+
+	CClientSnapshotHandler Handler;
+	CDemoPlayerMessageListener Listener;
+	Listener.m_pDemoPlayer = &DemoPlayer;
+	Listener.m_pClientSnapshotHandler = &Handler;
+	DemoPlayer.SetListener(&Listener);
+
+	const CDemoPlayer::CPlaybackInfo *pInfo = DemoPlayer.Info();
+	CNetBase::Init();
+	DemoPlayer.Play();
+
+	while(DemoPlayer.IsPlaying())
+	{
+		DemoPlayer.Update(false);
+		if(pInfo->m_Info.m_Paused)
+			break;
+	}
+
+	DemoPlayer.Stop();
+
+	return 0;
+}
+
+int main(int argc, const char *argv[])
+{
+	// Create storage before setting logger to avoid log messages from storage creation
+	IStorage *pStorage = CreateLocalStorage();
+
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(!pStorage)
+	{
+		log_error(TOOL_NAME, "Error creating local storage");
+		return -1;
+	}
+
+	if(argc != 2)
+	{
+		log_error(TOOL_NAME, "Usage: %s <demo_filename>", TOOL_NAME);
+		return -1;
+	}
+
+	return ExtractDemoChat(argv[1], pStorage);
+}
diff --git a/src_bkp/tools/dilate.cpp b/src_bkp/tools/dilate.cpp
new file mode 100644
index 0000000000..73d3308746
--- /dev/null
+++ b/src_bkp/tools/dilate.cpp
@@ -0,0 +1,91 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/graphics.h>
+
+int DilateFile(const char *pFilename)
+{
+	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
+	if(File)
+	{
+		io_seek(File, 0, IOSEEK_END);
+		unsigned int FileSize = io_tell(File);
+		io_seek(File, 0, IOSEEK_START);
+		TImageByteBuffer ByteBuffer;
+		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+		ByteBuffer.resize(FileSize);
+		io_read(File, &ByteBuffer.front(), FileSize);
+
+		io_close(File);
+
+		CImageInfo Img;
+
+		uint8_t *pImgBuffer = NULL;
+		EImageFormat ImageFormat;
+		int PngliteIncompatible;
+		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, Img.m_Width, Img.m_Height, pImgBuffer, ImageFormat))
+		{
+			if(ImageFormat != IMAGE_FORMAT_RGBA)
+			{
+				free(pImgBuffer);
+				dbg_msg("dilate", "%s: not an RGBA image", pFilename);
+				return -1;
+			}
+
+			Img.m_pData = pImgBuffer;
+
+			unsigned char *pBuffer = (unsigned char *)Img.m_pData;
+
+			int w = Img.m_Width;
+			int h = Img.m_Height;
+
+			DilateImage(pBuffer, w, h);
+
+			// save here
+			IOHANDLE SaveFile = io_open(pFilename, IOFLAG_WRITE);
+			if(SaveFile)
+			{
+				TImageByteBuffer ByteBuffer2;
+				SImageByteBuffer ImageByteBuffer2(&ByteBuffer2);
+
+				if(SavePNG(IMAGE_FORMAT_RGBA, (const uint8_t *)pBuffer, ImageByteBuffer2, w, h))
+					io_write(SaveFile, &ByteBuffer2.front(), ByteBuffer2.size());
+				io_close(SaveFile);
+
+				free(pBuffer);
+			}
+		}
+		else
+		{
+			dbg_msg("dilate", "failed unknown image format: %s", pFilename);
+			return -1;
+		}
+	}
+	else
+	{
+		dbg_msg("dilate", "failed to open image file. filename='%s'", pFilename);
+		return -1;
+	}
+
+	return 0;
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	if(argc == 1)
+	{
+		dbg_msg("usage", "%s FILE1 [ FILE2... ]", argv[0]);
+		return -1;
+	}
+
+	for(int i = 1; i < argc; i++)
+		DilateFile(argv[i]);
+
+	return 0;
+}
diff --git a/src_bkp/tools/dummy_map.cpp b/src_bkp/tools/dummy_map.cpp
new file mode 100644
index 0000000000..db2f76f538
--- /dev/null
+++ b/src_bkp/tools/dummy_map.cpp
@@ -0,0 +1,117 @@
+#include <base/hash.h>
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+
+#include <game/mapitems.h>
+
+void CreateEmptyMap(IStorage *pStorage)
+{
+	const char *pMapName = "maps/dummy3.map";
+
+	CDataFileWriter Writer;
+	if(!Writer.Open(pStorage, pMapName))
+	{
+		dbg_msg("dummy_map", "couldn't open map file '%s' for writing", pMapName);
+		return;
+	}
+	CMapItemGroup_v1 Group;
+	Group.m_Version = 1;
+	Group.m_OffsetX = 0;
+	Group.m_OffsetY = 0;
+	Group.m_ParallaxX = 0;
+	Group.m_ParallaxY = 0;
+	Group.m_StartLayer = 0;
+	Group.m_NumLayers = 2;
+	Writer.AddItem(MAPITEMTYPE_GROUP, 0, sizeof(Group), &Group);
+
+	constexpr int LayerWidth = 2;
+	constexpr int LayerHeight = 2;
+	CTile aTiles[LayerWidth * LayerHeight];
+	for(auto &Tile : aTiles)
+	{
+		Tile.m_Index = 1;
+		Tile.m_Flags = 0;
+		Tile.m_Skip = 0;
+		Tile.m_Reserved = 0;
+	}
+	const int TilesData = Writer.AddData(sizeof(aTiles), &aTiles);
+
+	CMapItemLayerTilemap GameLayer;
+	GameLayer.m_Layer.m_Version = 0; // Not set by the official client.
+	GameLayer.m_Layer.m_Type = LAYERTYPE_TILES;
+	GameLayer.m_Layer.m_Flags = 0;
+	GameLayer.m_Version = 2;
+	GameLayer.m_Width = LayerWidth;
+	GameLayer.m_Height = LayerHeight;
+	GameLayer.m_Flags = TILESLAYERFLAG_GAME;
+	GameLayer.m_Color.r = 0;
+	GameLayer.m_Color.g = 0;
+	GameLayer.m_Color.b = 0;
+	GameLayer.m_Color.a = 0;
+	GameLayer.m_ColorEnv = -1;
+	GameLayer.m_ColorEnvOffset = 0;
+	GameLayer.m_Image = -1;
+	GameLayer.m_Data = TilesData;
+	Writer.AddItem(MAPITEMTYPE_LAYER, 0, sizeof(GameLayer) - sizeof(GameLayer.m_aName) - sizeof(GameLayer.m_Tele) - sizeof(GameLayer.m_Speedup) - sizeof(GameLayer.m_Front) - sizeof(GameLayer.m_Switch) - sizeof(GameLayer.m_Tune), &GameLayer);
+
+	CMapItemLayerTilemap Layer;
+	Layer.m_Layer.m_Version = 0;
+	Layer.m_Layer.m_Type = LAYERTYPE_TILES;
+	Layer.m_Layer.m_Flags = 0;
+	Layer.m_Version = 2;
+	Layer.m_Width = LayerWidth;
+	Layer.m_Height = LayerHeight;
+	Layer.m_Flags = 0;
+	Layer.m_Color.r = 0;
+	Layer.m_Color.g = 0;
+	Layer.m_Color.b = 0;
+	Layer.m_Color.a = 255;
+	Layer.m_ColorEnv = -1;
+	Layer.m_ColorEnvOffset = 0;
+	Layer.m_Image = -1;
+	Layer.m_Data = TilesData;
+	Writer.AddItem(MAPITEMTYPE_LAYER, 1, sizeof(Layer) - sizeof(Layer.m_aName) - sizeof(Layer.m_Tele) - sizeof(Layer.m_Speedup) - sizeof(Layer.m_Front) - sizeof(Layer.m_Switch) - sizeof(Layer.m_Tune), &Layer);
+
+	Writer.Finish();
+
+	dbg_msg("dummy_map", "dummy map written to '%s'", pMapName);
+
+	CDataFileReader Reader;
+	void *pData;
+	unsigned DataSize;
+	if(!pStorage->ReadFile(pMapName, IStorage::TYPE_ALL, &pData, &DataSize))
+	{
+		dbg_msg("dummy_map", "couldn't open map file '%s' for reading", pMapName);
+		return;
+	}
+	unsigned char *pDataChar = static_cast<unsigned char *>(pData);
+
+	unsigned Crc = crc32(0, pDataChar, DataSize);
+	SHA256_DIGEST Sha256 = sha256(&pDataChar, DataSize);
+
+	char aMapSha[SHA256_MAXSTRSIZE];
+	sha256_str(Sha256, aMapSha, sizeof(aMapSha));
+	dbg_msg("dummy_map", "crc32 %08X, sha256 %s", Crc, aMapSha);
+
+	const unsigned HexSize = 6 * DataSize + 1;
+	char *pHex = static_cast<char *>(malloc(HexSize));
+	str_hex_cstyle(pHex, HexSize, pDataChar, DataSize);
+	dbg_msg("dummy_map", "data %s", pHex);
+	free(pHex);
+
+	free(pDataChar);
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_SERVER, argc, argv);
+	if(!pStorage)
+		return -1;
+	CreateEmptyMap(pStorage);
+	return 0;
+}
diff --git a/src_bkp/tools/map_convert_07.cpp b/src_bkp/tools/map_convert_07.cpp
new file mode 100644
index 0000000000..ebd6f56787
--- /dev/null
+++ b/src_bkp/tools/map_convert_07.cpp
@@ -0,0 +1,260 @@
+/* (c) DDNet developers. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.  */
+
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/graphics.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/gamecore.h>
+#include <game/mapitems.h>
+/*
+	Usage: map_convert_07 <source map filepath> <dest map filepath>
+*/
+
+CDataFileReader g_DataReader;
+CDataFileWriter g_DataWriter;
+
+// global new image data (set by ReplaceImageItem)
+int g_aNewDataSize[MAX_MAPIMAGES];
+void *g_apNewData[MAX_MAPIMAGES];
+
+int g_Index = 0;
+int g_NextDataItemID = -1;
+
+int g_aImageIDs[MAX_MAPIMAGES];
+
+int LoadPNG(CImageInfo *pImg, const char *pFilename)
+{
+	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
+	if(File)
+	{
+		io_seek(File, 0, IOSEEK_END);
+		unsigned int FileSize = io_tell(File);
+		io_seek(File, 0, IOSEEK_START);
+		TImageByteBuffer ByteBuffer;
+		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+		ByteBuffer.resize(FileSize);
+		io_read(File, &ByteBuffer.front(), FileSize);
+
+		io_close(File);
+
+		uint8_t *pImgBuffer = NULL;
+		EImageFormat ImageFormat;
+		int PngliteIncompatible;
+		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
+		{
+			pImg->m_pData = pImgBuffer;
+
+			if(ImageFormat == IMAGE_FORMAT_RGBA && pImg->m_Width <= (2 << 13) && pImg->m_Height <= (2 << 13))
+			{
+				pImg->m_Format = CImageInfo::FORMAT_RGBA;
+			}
+			else
+			{
+				dbg_msg("map_convert_07", "invalid image format. filename='%s'", pFilename);
+				return 0;
+			}
+		}
+		else
+			return 0;
+	}
+	else
+		return 0;
+	return 1;
+}
+
+bool CheckImageDimensions(void *pLayerItem, int LayerType, const char *pFilename)
+{
+	if(LayerType != MAPITEMTYPE_LAYER)
+		return true;
+
+	CMapItemLayer *pImgLayer = (CMapItemLayer *)pLayerItem;
+	if(pImgLayer->m_Type != LAYERTYPE_TILES)
+		return true;
+
+	CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pImgLayer;
+	if(pTMap->m_Image == -1)
+		return true;
+
+	int Type;
+	void *pItem = g_DataReader.GetItem(g_aImageIDs[pTMap->m_Image], &Type);
+	if(Type != MAPITEMTYPE_IMAGE)
+		return true;
+
+	CMapItemImage *pImgItem = (CMapItemImage *)pItem;
+
+	if(pImgItem->m_Width % 16 == 0 && pImgItem->m_Height % 16 == 0 && pImgItem->m_Width > 0 && pImgItem->m_Height > 0)
+		return true;
+
+	char aTileLayerName[12];
+	IntsToStr(pTMap->m_aName, sizeof(pTMap->m_aName) / sizeof(int), aTileLayerName);
+
+	const char *pName = g_DataReader.GetDataString(pImgItem->m_ImageName);
+	dbg_msg("map_convert_07", "%s: Tile layer \"%s\" uses image \"%s\" with width %d, height %d, which is not divisible by 16. This is not supported in Teeworlds 0.7. Please scale the image and replace it manually.", pFilename, aTileLayerName, pName == nullptr ? "(error)" : pName, pImgItem->m_Width, pImgItem->m_Height);
+	return false;
+}
+
+void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, CMapItemImage *pNewImgItem)
+{
+	if(!pImgItem->m_External)
+		return pImgItem;
+
+	const char *pName = g_DataReader.GetDataString(pImgItem->m_ImageName);
+	if(pName == nullptr || pName[0] == '\0')
+	{
+		dbg_msg("map_convert_07", "failed to load name of image %d", Index);
+		return pImgItem;
+	}
+
+	dbg_msg("map_convert_07", "embedding image '%s'", pName);
+
+	CImageInfo ImgInfo;
+	char aStr[IO_MAX_PATH_LENGTH];
+	str_format(aStr, sizeof(aStr), "data/mapres/%s.png", pName);
+	if(!LoadPNG(&ImgInfo, aStr))
+		return pImgItem; // keep as external if we don't have a mapres to replace
+
+	if(ImgInfo.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		dbg_msg("map_convert_07", "image '%s' is not in RGBA format", aStr);
+		return pImgItem;
+	}
+
+	*pNewImgItem = *pImgItem;
+
+	pNewImgItem->m_Width = ImgInfo.m_Width;
+	pNewImgItem->m_Height = ImgInfo.m_Height;
+	pNewImgItem->m_External = false;
+	pNewImgItem->m_ImageData = g_NextDataItemID++;
+
+	g_apNewData[g_Index] = ImgInfo.m_pData;
+	g_aNewDataSize[g_Index] = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * ImgInfo.PixelSize();
+	g_Index++;
+
+	return (void *)pNewImgItem;
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc < 2 || argc > 3)
+	{
+		dbg_msg("map_convert_07", "Invalid arguments");
+		dbg_msg("map_convert_07", "Usage: map_convert_07 <source map filepath> [<dest map filepath>]");
+		return -1;
+	}
+
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_BASIC, argc, argv);
+	if(!pStorage)
+	{
+		dbg_msg("map_convert_07", "error loading storage");
+		return -1;
+	}
+
+	const char *pSourceFileName = argv[1];
+	char aDestFileName[IO_MAX_PATH_LENGTH];
+
+	if(argc == 3)
+	{
+		str_copy(aDestFileName, argv[2], sizeof(aDestFileName));
+	}
+	else
+	{
+		char aBuf[IO_MAX_PATH_LENGTH];
+		IStorage::StripPathAndExtension(pSourceFileName, aBuf, sizeof(aBuf));
+		str_format(aDestFileName, sizeof(aDestFileName), "data/maps7/%s.map", aBuf);
+		if(fs_makedir("data") != 0)
+		{
+			dbg_msg("map_convert_07", "failed to create data directory");
+			return -1;
+		}
+
+		if(fs_makedir("data/maps7") != 0)
+		{
+			dbg_msg("map_convert_07", "failed to create data/maps7 directory");
+			return -1;
+		}
+	}
+
+	if(!g_DataReader.Open(pStorage, pSourceFileName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_convert_07", "failed to open source map. filename='%s'", pSourceFileName);
+		return -1;
+	}
+
+	if(!g_DataWriter.Open(pStorage, aDestFileName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_convert_07", "failed to open destination map. filename='%s'", aDestFileName);
+		return -1;
+	}
+
+	g_NextDataItemID = g_DataReader.NumData();
+
+	size_t i = 0;
+	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
+	{
+		int Type;
+		g_DataReader.GetItem(Index, &Type);
+		if(Type == MAPITEMTYPE_IMAGE)
+		{
+			if(i >= MAX_MAPIMAGES)
+			{
+				dbg_msg("map_convert_07", "map uses more images than the client maximum of %" PRIzu ". filename='%s'", MAX_MAPIMAGES, pSourceFileName);
+				break;
+			}
+			g_aImageIDs[i] = Index;
+			i++;
+		}
+	}
+
+	bool Success = true;
+
+	// add all items
+	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
+	{
+		int Type, ID;
+		void *pItem = g_DataReader.GetItem(Index, &Type, &ID);
+		int Size = g_DataReader.GetItemSize(Index);
+
+		// filter ITEMTYPE_EX items, they will be automatically added again
+		if(Type == ITEMTYPE_EX)
+		{
+			continue;
+		}
+
+		Success &= CheckImageDimensions(pItem, Type, pSourceFileName);
+
+		CMapItemImage NewImageItem;
+		if(Type == MAPITEMTYPE_IMAGE)
+		{
+			pItem = ReplaceImageItem(Index, (CMapItemImage *)pItem, &NewImageItem);
+			if(!pItem)
+				return -1;
+			Size = sizeof(CMapItemImage);
+			NewImageItem.m_Version = CMapItemImage::CURRENT_VERSION;
+		}
+		g_DataWriter.AddItem(Type, ID, Size, pItem);
+	}
+
+	// add all data
+	for(int Index = 0; Index < g_DataReader.NumData(); Index++)
+	{
+		void *pData = g_DataReader.GetData(Index);
+		int Size = g_DataReader.GetDataSize(Index);
+		g_DataWriter.AddData(Size, pData);
+	}
+
+	for(int Index = 0; Index < g_Index; Index++)
+	{
+		g_DataWriter.AddData(g_aNewDataSize[Index], g_apNewData[Index]);
+	}
+
+	g_DataReader.Close();
+	g_DataWriter.Finish();
+	return Success ? 0 : -1;
+}
diff --git a/src_bkp/tools/map_create_pixelart.cpp b/src_bkp/tools/map_create_pixelart.cpp
new file mode 100644
index 0000000000..52d54d471e
--- /dev/null
+++ b/src_bkp/tools/map_create_pixelart.cpp
@@ -0,0 +1,398 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/graphics.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+
+bool CreatePixelArt(const char[3][64], const int[2], const int[2], int[2], const bool[2]);
+void InsertCurrentQuads(CDataFileReader &, CMapItemLayerQuads *, CQuad *);
+int InsertPixelArtQuads(CQuad *, int &, const CImageInfo &, const int[2], const int[2], const bool[2]);
+
+bool LoadPNG(CImageInfo *, const char *);
+bool OpenMaps(const char[2][64], CDataFileReader &, CDataFileWriter &);
+void SaveOutputMap(CDataFileReader &, CDataFileWriter &, CMapItemLayerQuads *, int, CQuad *, int);
+
+CMapItemLayerQuads *GetQuadLayer(CDataFileReader &, const int[2], int *);
+CQuad CreateNewQuad(float, float, int, int, const uint8_t[4], const int[2]);
+
+bool GetPixelClamped(const CImageInfo &, int, int, uint8_t[4]);
+bool ComparePixel(const uint8_t[4], const uint8_t[4]);
+bool IsPixelOptimizable(const CImageInfo &, int, int, const uint8_t[4], const bool[]);
+void SetVisitedPixels(const CImageInfo &, int, int, int, int, bool[]);
+
+int GetImagePixelSize(const CImageInfo &);
+int FindSuperPixelSize(const CImageInfo &, const uint8_t[4], int, int, int, bool[]);
+void GetOptimizedQuadSize(const CImageInfo &, int, const uint8_t[4], int, int, int &, int &, bool[]);
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc < 9 || argc > 12)
+	{
+		dbg_msg("map_create_pixelart", "Invalid arguments");
+		dbg_msg("map_create_pixelart", "Usage: %s <image.png> <img_pixelsize> <input_map> <layergroup_id> <layer_id> <pos_x> <pos_y> <quad_pixelsize> <output_map> [optimize=0|1] [centralize=0|1]", argv[0]);
+		dbg_msg("map_create_pixelart", "Note: use destination layer tiles as a reference for positions and pixels for sizes.");
+		dbg_msg("map_create_pixelart", "Note: set img_pixelsize to 0 to consider the largest possible size.");
+		dbg_msg("map_create_pixelart", "Note: set quad_pixelsize to 0 to consider the same value of img_pixelsize.");
+		dbg_msg("map_create_pixelart", "Note: if image.png has not a perfect pixelart grid, result might be unexpected, manually fix img_pixelsize to get it better.");
+		dbg_msg("map_create_pixelart", "Options: optimize tries to reduce the total number of quads (default: 1).");
+		dbg_msg("map_create_pixelart", "Options: centralize places all pivots at the same position (default: 0).");
+
+		return -1;
+	}
+
+	char aFilenames[3][64];
+	str_copy(aFilenames[0], argv[3]); //input_map
+	str_copy(aFilenames[1], argv[9]); //output_map
+	str_copy(aFilenames[2], argv[1]); //image_file
+
+	int aLayerID[2] = {str_toint(argv[4]), str_toint(argv[5])}; //layergroup_id, layer_id
+	int aStartingPos[2] = {str_toint(argv[6]) * 32, str_toint(argv[7]) * 32}; //pos_x, pos_y
+	int aPixelSizes[2] = {str_toint(argv[2]), str_toint(argv[8])}; //quad_pixelsize, img_pixelsize
+
+	bool aArtOptions[3];
+	aArtOptions[0] = argc >= 10 ? str_toint(argv[10]) : true; //optimize
+	aArtOptions[1] = argc >= 11 ? str_toint(argv[11]) : false; //centralize
+
+	dbg_msg("map_create_pixelart", "image_file='%s'; image_pixelsize='%dpx'; input_map='%s'; layergroup_id='#%d'; layer_id='#%d'; pos_x='#%dpx'; pos_y='%dpx'; quad_pixelsize='%dpx'; output_map='%s'; optimize='%d'; centralize='%d'",
+		aFilenames[2], aPixelSizes[0], aFilenames[1], aLayerID[0], aLayerID[1], aStartingPos[0], aStartingPos[1], aPixelSizes[1], aFilenames[2], aArtOptions[0], aArtOptions[1]);
+
+	return !CreatePixelArt(aFilenames, aLayerID, aStartingPos, aPixelSizes, aArtOptions);
+}
+
+bool CreatePixelArt(const char aFilenames[3][64], const int aLayerID[2], const int aStartingPos[2], int aPixelSizes[2], const bool aArtOptions[2])
+{
+	CImageInfo Img;
+	if(!LoadPNG(&Img, aFilenames[2]))
+		return false;
+
+	aPixelSizes[0] = aPixelSizes[0] ? aPixelSizes[0] : GetImagePixelSize(Img);
+	aPixelSizes[1] = aPixelSizes[1] ? aPixelSizes[1] : aPixelSizes[0];
+
+	CDataFileReader InputMap;
+	CDataFileWriter OutputMap;
+	if(!OpenMaps(aFilenames, InputMap, OutputMap))
+		return false;
+
+	int ItemNumber = 0;
+	CMapItemLayerQuads *pQuadLayer = GetQuadLayer(InputMap, aLayerID, &ItemNumber);
+	if(!pQuadLayer)
+		return false;
+
+	int MaxNewQuads = std::ceil((Img.m_Width * Img.m_Height) / aPixelSizes[0]);
+	CQuad *pQuads = new CQuad[pQuadLayer->m_NumQuads + MaxNewQuads];
+
+	InsertCurrentQuads(InputMap, pQuadLayer, pQuads);
+	int QuadsCounter = InsertPixelArtQuads(pQuads, pQuadLayer->m_NumQuads, Img, aStartingPos, aPixelSizes, aArtOptions);
+	SaveOutputMap(InputMap, OutputMap, pQuadLayer, ItemNumber, pQuads, ((int)sizeof(CQuad)) * (pQuadLayer->m_NumQuads + 1));
+	delete[] pQuads;
+
+	dbg_msg("map_create_pixelart", "INFO: successfully added %d new pixelart quads.", QuadsCounter);
+	return true;
+}
+
+void InsertCurrentQuads(CDataFileReader &InputMap, CMapItemLayerQuads *pQuadLayer, CQuad *pNewQuads)
+{
+	CQuad *pCurrentQuads = (CQuad *)InputMap.GetDataSwapped(pQuadLayer->m_Data);
+	for(int i = 0; i < pQuadLayer->m_NumQuads; i++)
+		pNewQuads[i] = pCurrentQuads[i];
+}
+
+int InsertPixelArtQuads(CQuad *pQuads, int &NumQuads, const CImageInfo &Img, const int aStartingPos[2], const int aPixelSizes[2], const bool aArtOptions[2])
+{
+	int ImgPixelSize = aPixelSizes[0], QuadPixelSize = aPixelSizes[1], OriginalNumQuads = NumQuads;
+	int aForcedPivot[2] = {std::numeric_limits<int>::max(), std::numeric_limits<int>::max()};
+	bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width];
+	mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width);
+
+	for(int y = 0; y < Img.m_Height; y += ImgPixelSize)
+		for(int x = 0; x < Img.m_Width; x += ImgPixelSize)
+		{
+			uint8_t aPixel[4];
+			if(aVisitedPixels[x + y * Img.m_Width] || !GetPixelClamped(Img, x, y, aPixel))
+				continue;
+
+			int Width = 1, Height = 1;
+			if(aArtOptions[0])
+				GetOptimizedQuadSize(Img, ImgPixelSize, aPixel, x, y, Width, Height, aVisitedPixels);
+
+			float Posx = aStartingPos[0] + ((x / (float)ImgPixelSize) + (Width / 2.f)) * QuadPixelSize;
+			float Posy = aStartingPos[1] + ((y / (float)ImgPixelSize) + (Height / 2.f)) * QuadPixelSize;
+			if(aArtOptions[1] && aForcedPivot[0] == std::numeric_limits<int>::max())
+			{
+				aForcedPivot[0] = Posx;
+				aForcedPivot[1] = Posy;
+			}
+
+			pQuads[NumQuads] = CreateNewQuad(Posx, Posy, QuadPixelSize * Width, QuadPixelSize * Height, aPixel, aArtOptions[1] ? aForcedPivot : 0x0);
+			NumQuads++;
+		}
+	delete[] aVisitedPixels;
+
+	return NumQuads - OriginalNumQuads;
+}
+
+void GetOptimizedQuadSize(const CImageInfo &Img, const int ImgPixelSize, const uint8_t aPixel[4], const int PosX, const int PosY, int &Width, int &Height, bool aVisitedPixels[])
+{
+	int w = 0, h = 0, OptimizedWidth = 0, OptimizedHeight = 0;
+
+	while(IsPixelOptimizable(Img, PosX + w, PosY + h, aPixel, aVisitedPixels))
+	{
+		while(IsPixelOptimizable(Img, PosX + w, PosY + h, aPixel, aVisitedPixels) && (!OptimizedHeight || h < OptimizedHeight))
+			h += ImgPixelSize;
+
+		if(!OptimizedHeight || h < OptimizedHeight)
+			OptimizedHeight = h;
+
+		h = 0;
+		w += ImgPixelSize;
+		OptimizedWidth = w;
+	}
+
+	SetVisitedPixels(Img, PosX, PosY, OptimizedWidth, OptimizedHeight, aVisitedPixels);
+	Width = OptimizedWidth / ImgPixelSize;
+	Height = OptimizedHeight / ImgPixelSize;
+}
+
+int GetImagePixelSize(const CImageInfo &Img)
+{
+	int ImgPixelSize = std::numeric_limits<int>::max();
+	bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width];
+	mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width);
+
+	for(int y = 0; y < Img.m_Height && ImgPixelSize > 1; y++)
+		for(int x = 0; x < Img.m_Width && ImgPixelSize > 1; x++)
+		{
+			uint8_t aPixel[4];
+			if(aVisitedPixels[x + y * Img.m_Width])
+				continue;
+
+			GetPixelClamped(Img, x, y, aPixel);
+			int SuperPixelSize = FindSuperPixelSize(Img, aPixel, x, y, 1, aVisitedPixels);
+			if(SuperPixelSize < ImgPixelSize)
+				ImgPixelSize = SuperPixelSize;
+		}
+	delete[] aVisitedPixels;
+
+	dbg_msg("map_create_pixelart", "INFO: automatically detected img_pixelsize of %dpx", ImgPixelSize);
+	return ImgPixelSize;
+}
+
+int FindSuperPixelSize(const CImageInfo &Img, const uint8_t aPixel[4], const int PosX, const int PosY, const int CurrentSize, bool aVisitedPixels[])
+{
+	if(PosX + CurrentSize >= Img.m_Width || PosY + CurrentSize >= Img.m_Height)
+	{
+		SetVisitedPixels(Img, PosX, PosY, CurrentSize, CurrentSize, aVisitedPixels);
+		return CurrentSize;
+	}
+
+	for(int i = 0; i < 2; i++)
+	{
+		for(int j = 0; j < CurrentSize + 1; j++)
+		{
+			uint8_t aCheckPixel[4];
+			int x = PosX, y = PosY;
+			x += i == 0 ? j : CurrentSize;
+			y += i == 0 ? CurrentSize : j;
+
+			GetPixelClamped(Img, x, y, aCheckPixel);
+			if(x >= Img.m_Width || y >= Img.m_Height || !ComparePixel(aPixel, aCheckPixel))
+			{
+				SetVisitedPixels(Img, PosX, PosY, CurrentSize, CurrentSize, aVisitedPixels);
+				return CurrentSize;
+			}
+		}
+	}
+
+	return FindSuperPixelSize(Img, aPixel, PosX, PosY, CurrentSize + 1, aVisitedPixels);
+}
+
+bool GetPixelClamped(const CImageInfo &Img, int x, int y, uint8_t aPixel[4])
+{
+	x = clamp<int>(x, 0, (int)Img.m_Width - 1);
+	y = clamp<int>(y, 0, (int)Img.m_Height - 1);
+	aPixel[0] = 255;
+	aPixel[1] = 255;
+	aPixel[2] = 255;
+	aPixel[3] = 255;
+
+	const size_t PixelSize = Img.PixelSize();
+	for(size_t i = 0; i < PixelSize; i++)
+		aPixel[i] = ((uint8_t *)Img.m_pData)[x * PixelSize + (Img.m_Width * PixelSize * y) + i];
+
+	return aPixel[3] > 0;
+}
+
+bool ComparePixel(const uint8_t aPixel1[4], const uint8_t aPixel2[4])
+{
+	for(int i = 0; i < 4; i++)
+		if(aPixel1[i] != aPixel2[i])
+			return false;
+	return true;
+}
+
+bool IsPixelOptimizable(const CImageInfo &Img, const int PosX, const int PosY, const uint8_t aPixel[4], const bool aVisitedPixels[])
+{
+	uint8_t aCheckPixel[4];
+	return PosX < Img.m_Width && PosY < Img.m_Height && !aVisitedPixels[PosX + PosY * Img.m_Width] && GetPixelClamped(Img, PosX, PosY, aCheckPixel) && ComparePixel(aPixel, aCheckPixel);
+}
+
+void SetVisitedPixels(const CImageInfo &Img, int PosX, int PosY, int Width, int Height, bool aVisitedPixels[])
+{
+	for(int y = PosY; y < PosY + Height; y++)
+		for(int x = PosX; x < PosX + Width; x++)
+			aVisitedPixels[x + y * Img.m_Width] = true;
+}
+
+CMapItemLayerQuads *GetQuadLayer(CDataFileReader &InputMap, const int aLayerID[2], int *pItemNumber)
+{
+	int Start, Num;
+	InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
+
+	CMapItemGroup *pGroupItem = aLayerID[0] >= Num ? 0x0 : (CMapItemGroup *)InputMap.GetItem(Start + aLayerID[0]);
+
+	if(!pGroupItem)
+	{
+		dbg_msg("map_create_pixelart", "ERROR: unable to find layergroup '#%d'", aLayerID[0]);
+		return 0x0;
+	}
+
+	InputMap.GetType(MAPITEMTYPE_LAYER, &Start, &Num);
+	*pItemNumber = Start + pGroupItem->m_StartLayer + aLayerID[1];
+
+	CMapItemLayer *pLayerItem = aLayerID[1] >= pGroupItem->m_NumLayers ? 0x0 : (CMapItemLayer *)InputMap.GetItem(*pItemNumber);
+	if(!pLayerItem)
+	{
+		dbg_msg("map_create_pixelart", "ERROR: unable to find layer '#%d' in group '#%d'", aLayerID[1], aLayerID[0]);
+		return 0x0;
+	}
+
+	if(pLayerItem->m_Type != LAYERTYPE_QUADS)
+	{
+		dbg_msg("map_create_pixelart", "ERROR: layer '#%d' in group '#%d' is not a quad layer", aLayerID[1], aLayerID[0]);
+		return 0x0;
+	}
+
+	return (CMapItemLayerQuads *)pLayerItem;
+}
+
+CQuad CreateNewQuad(const float PosX, const float PosY, const int Width, const int Height, const uint8_t aColor[4], const int aForcedPivot[2] = 0x0)
+{
+	CQuad Quad;
+	Quad.m_PosEnv = Quad.m_ColorEnv = -1;
+	Quad.m_PosEnvOffset = Quad.m_ColorEnvOffset = 0;
+	float x = f2fx(PosX), y = f2fx(PosY), w = f2fx(Width / 2.f), h = f2fx(Height / 2.f);
+
+	for(int i = 0; i < 2; i++)
+	{
+		Quad.m_aPoints[i].y = y - h;
+		Quad.m_aPoints[i + 2].y = y + h;
+		Quad.m_aPoints[i * 2].x = x - w;
+		Quad.m_aPoints[i * 2 + 1].x = x + w;
+	}
+
+	for(auto &QuadColor : Quad.m_aColors)
+	{
+		QuadColor.r = aColor[0];
+		QuadColor.g = aColor[1];
+		QuadColor.b = aColor[2];
+		QuadColor.a = aColor[3];
+	}
+
+	Quad.m_aPoints[4].x = aForcedPivot ? f2fx(aForcedPivot[0]) : x;
+	Quad.m_aPoints[4].y = aForcedPivot ? f2fx(aForcedPivot[1]) : y;
+
+	return Quad;
+}
+
+bool LoadPNG(CImageInfo *pImg, const char *pFilename)
+{
+	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
+	if(!File)
+	{
+		dbg_msg("map_create_pixelart", "ERROR: Unable to open file %s", pFilename);
+		return false;
+	}
+
+	io_seek(File, 0, IOSEEK_END);
+	unsigned int FileSize = io_tell(File);
+	io_seek(File, 0, IOSEEK_START);
+	TImageByteBuffer ByteBuffer;
+	SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+	ByteBuffer.resize(FileSize);
+	io_read(File, &ByteBuffer.front(), FileSize);
+	io_close(File);
+
+	uint8_t *pImgBuffer = NULL;
+	EImageFormat ImageFormat;
+	int PngliteIncompatible;
+
+	if(!LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
+	{
+		dbg_msg("map_create_pixelart", "ERROR: Unable to load a valid PNG from file %s", pFilename);
+		return false;
+	}
+
+	if(ImageFormat != IMAGE_FORMAT_RGBA && ImageFormat != IMAGE_FORMAT_RGB)
+	{
+		dbg_msg("map_create_pixelart", "ERROR: only RGB and RGBA PNG images are supported");
+		free(pImgBuffer);
+		return false;
+	}
+
+	pImg->m_pData = pImgBuffer;
+	pImg->m_Format = ImageFormat == IMAGE_FORMAT_RGB ? CImageInfo::FORMAT_RGB : CImageInfo::FORMAT_RGBA;
+
+	return true;
+}
+
+bool OpenMaps(const char pMapNames[2][64], CDataFileReader &InputMap, CDataFileWriter &OutputMap)
+{
+	IStorage *pStorage = CreateLocalStorage();
+
+	if(!InputMap.Open(pStorage, pMapNames[0], IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_create_pixelart", "ERROR: unable to open map '%s'", pMapNames[0]);
+		return false;
+	}
+
+	if(!OutputMap.Open(pStorage, pMapNames[1], IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_create_pixelart", "ERROR: unable to open map '%s'", pMapNames[1]);
+		return false;
+	}
+
+	return true;
+}
+
+void SaveOutputMap(CDataFileReader &InputMap, CDataFileWriter &OutputMap, CMapItemLayerQuads *pNewItem, const int NewItemNumber, CQuad *pNewData, const int NewDataSize)
+{
+	for(int i = 0; i < InputMap.NumItems(); i++)
+	{
+		int ID, Type;
+		void *pItem = InputMap.GetItem(i, &Type, &ID);
+
+		if(Type == ITEMTYPE_EX)
+			continue;
+		if(i == NewItemNumber)
+			pItem = pNewItem;
+
+		int Size = InputMap.GetItemSize(i);
+		OutputMap.AddItem(Type, ID, Size, pItem);
+	}
+
+	for(int i = 0; i < InputMap.NumData(); i++)
+	{
+		if(i == pNewItem->m_Data)
+			OutputMap.AddData(NewDataSize, pNewData);
+		else
+			OutputMap.AddData(InputMap.GetDataSize(i), InputMap.GetData(i));
+	}
+
+	OutputMap.Finish();
+}
diff --git a/src_bkp/tools/map_diff.cpp b/src_bkp/tools/map_diff.cpp
new file mode 100644
index 0000000000..34155649eb
--- /dev/null
+++ b/src_bkp/tools/map_diff.cpp
@@ -0,0 +1,121 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/gamecore.h>
+#include <game/mapitems.h>
+
+bool Process(IStorage *pStorage, const char **pMapNames)
+{
+	CDataFileReader aMaps[2];
+
+	for(int i = 0; i < 2; ++i)
+	{
+		if(!aMaps[i].Open(pStorage, pMapNames[i], IStorage::TYPE_ABSOLUTE))
+		{
+			dbg_msg("map_compare", "error opening map '%s'", pMapNames[i]);
+			return false;
+		}
+
+		const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(aMaps[i].FindItem(MAPITEMTYPE_VERSION, 0));
+		if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
+		{
+			dbg_msg("map_compare", "unsupported map version '%s'", pMapNames[i]);
+			return false;
+		}
+	}
+
+	int aStart[2], aNum[2];
+	for(int i = 0; i < 2; ++i)
+		aMaps[i].GetType(MAPITEMTYPE_LAYER, &aStart[i], &aNum[i]);
+
+	// ensure basic layout
+	if(aNum[0] != aNum[1])
+	{
+		dbg_msg("map_compare", "different layer numbers:");
+		for(int i = 0; i < 2; ++i)
+			dbg_msg("map_compare", "  \"%s\": %d layers", pMapNames[i], aNum[i]);
+		return false;
+	}
+
+	// preload data
+	for(int j = 0; j < aNum[0]; ++j)
+	{
+		for(int i = 0; i < 2; ++i)
+		{
+			CMapItemLayer *pItem = (CMapItemLayer *)aMaps[i].GetItem(aStart[i] + j);
+			if(pItem->m_Type == LAYERTYPE_TILES)
+				(void)aMaps[i].GetData(((CMapItemLayerTilemap *)pItem)->m_Data);
+		}
+	}
+
+	// compare
+	for(int j = 0; j < aNum[0]; ++j)
+	{
+		CMapItemLayer *apItem[2];
+		for(int i = 0; i < 2; ++i)
+			apItem[i] = (CMapItemLayer *)aMaps[i].GetItem(aStart[i] + j);
+
+		if(apItem[0]->m_Type != LAYERTYPE_TILES || apItem[1]->m_Type != LAYERTYPE_TILES)
+			continue;
+
+		CMapItemLayerTilemap *apTilemap[2];
+		char aaName[2][16];
+
+		for(int i = 0; i < 2; ++i)
+		{
+			apTilemap[i] = (CMapItemLayerTilemap *)apItem[i];
+			IntsToStr(apTilemap[i]->m_aName, sizeof(apTilemap[i]->m_aName) / sizeof(int), aaName[i]);
+		}
+
+		if(str_comp(aaName[0], aaName[1]) != 0 || apTilemap[0]->m_Width != apTilemap[1]->m_Width || apTilemap[0]->m_Height != apTilemap[1]->m_Height)
+		{
+			dbg_msg("map_compare", "different tile layers:");
+			for(int i = 0; i < 2; ++i)
+				dbg_msg("map_compare", "  \"%s\" (%dx%d)", aaName[i], apTilemap[i]->m_Width, apTilemap[i]->m_Height);
+			return false;
+		}
+		CTile *apTile[2];
+		for(int i = 0; i < 2; ++i)
+			apTile[i] = (CTile *)aMaps[i].GetData(apTilemap[i]->m_Data);
+
+		for(int y = 0; y < apTilemap[0]->m_Height; y++)
+		{
+			for(int x = 0; x < apTilemap[0]->m_Width; x++)
+			{
+				int Pos = y * apTilemap[0]->m_Width + x;
+				if(apTile[0][Pos].m_Index != apTile[1][Pos].m_Index || apTile[0][Pos].m_Flags != apTile[1][Pos].m_Flags)
+				{
+					dbg_msg("map_compare", "[%d:%s] %dx%d: (index: %d, flags: %d) != (index: %d, flags: %d)", aNum[0], aaName[0], x, y, apTile[0][Pos].m_Index, apTile[0][Pos].m_Flags, apTile[1][Pos].m_Index, apTile[0][Pos].m_Flags);
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+int main(int argc, const char *argv[])
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	std::vector<std::shared_ptr<ILogger>> vpLoggers;
+	vpLoggers.push_back(std::shared_ptr<ILogger>(log_logger_stdout()));
+	IOHANDLE LogFile = io_open("map_diff.txt", IOFLAG_WRITE);
+	if(LogFile)
+	{
+		vpLoggers.push_back(std::shared_ptr<ILogger>(log_logger_file(LogFile)));
+	}
+	log_set_global_logger(log_logger_collection(std::move(vpLoggers)).release());
+
+	if(argc != 3)
+	{
+		dbg_msg("usage", "%s map1 map2", argv[0]);
+		return -1;
+	}
+
+	IStorage *pStorage = CreateLocalStorage();
+	if(!pStorage)
+		return -1;
+
+	return Process(pStorage, &argv[1]) ? 0 : 1;
+}
diff --git a/src_bkp/tools/map_extract.cpp b/src_bkp/tools/map_extract.cpp
new file mode 100644
index 0000000000..d66bbf25ea
--- /dev/null
+++ b/src_bkp/tools/map_extract.cpp
@@ -0,0 +1,149 @@
+// Adapted from TWMapImagesRecovery by Tardo: https://github.com/Tardo/TWMapImagesRecovery
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/graphics.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+
+bool Process(IStorage *pStorage, const char *pMapName, const char *pPathSave)
+{
+	CDataFileReader Reader;
+	if(!Reader.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_extract", "error opening map '%s'", pMapName);
+		return false;
+	}
+
+	const CMapItemVersion *pVersion = static_cast<CMapItemVersion *>(Reader.FindItem(MAPITEMTYPE_VERSION, 0));
+	if(pVersion == nullptr || pVersion->m_Version != CMapItemVersion::CURRENT_VERSION)
+	{
+		dbg_msg("map_extract", "unsupported map version '%s'", pMapName);
+		return false;
+	}
+
+	dbg_msg("map_extract", "Make sure you have the permission to use these images and sounds in your own maps");
+
+	CMapItemInfo *pInfo = (CMapItemInfo *)Reader.FindItem(MAPITEMTYPE_INFO, 0);
+
+	if(pInfo)
+	{
+		const char *pAuthor = Reader.GetDataString(pInfo->m_Author);
+		dbg_msg("map_extract", "author:  %s", pAuthor == nullptr ? "(error)" : pAuthor);
+		const char *pMapVersion = Reader.GetDataString(pInfo->m_MapVersion);
+		dbg_msg("map_extract", "version: %s", pMapVersion == nullptr ? "(error)" : pMapVersion);
+		const char *pCredits = Reader.GetDataString(pInfo->m_Credits);
+		dbg_msg("map_extract", "credits: %s", pCredits == nullptr ? "(error)" : pCredits);
+		const char *pLicense = Reader.GetDataString(pInfo->m_License);
+		dbg_msg("map_extract", "license: %s", pLicense == nullptr ? "(error)" : pLicense);
+	}
+
+	int Start, Num;
+
+	// load images
+	Reader.GetType(MAPITEMTYPE_IMAGE, &Start, &Num);
+
+	for(int i = 0; i < Num; i++)
+	{
+		CMapItemImage_v2 *pItem = (CMapItemImage_v2 *)Reader.GetItem(Start + i);
+		if(pItem->m_External)
+			continue;
+
+		const char *pName = Reader.GetDataString(pItem->m_ImageName);
+		if(pName == nullptr || pName[0] == '\0')
+		{
+			dbg_msg("map_extract", "failed to load name of image %d", i);
+			continue;
+		}
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "%s/%s.png", pPathSave, pName);
+		dbg_msg("map_extract", "writing image: %s (%dx%d)", aBuf, pItem->m_Width, pItem->m_Height);
+
+		const int Format = pItem->m_Version < CMapItemImage_v2::CURRENT_VERSION ? CImageInfo::FORMAT_RGBA : pItem->m_Format;
+		EImageFormat OutputFormat;
+		if(Format == CImageInfo::FORMAT_RGBA)
+			OutputFormat = IMAGE_FORMAT_RGBA;
+		else if(Format == CImageInfo::FORMAT_RGB)
+			OutputFormat = IMAGE_FORMAT_RGB;
+		else
+		{
+			dbg_msg("map_extract", "ignoring image '%s' with unknown format %d", aBuf, Format);
+			continue;
+		}
+
+		// copy image data
+		IOHANDLE File = io_open(aBuf, IOFLAG_WRITE);
+		if(File)
+		{
+			TImageByteBuffer ByteBuffer;
+			SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+			if(SavePNG(OutputFormat, (const uint8_t *)Reader.GetData(pItem->m_ImageData), ImageByteBuffer, pItem->m_Width, pItem->m_Height))
+				io_write(File, &ByteBuffer.front(), ByteBuffer.size());
+			io_close(File);
+		}
+	}
+
+	// load sounds
+	Reader.GetType(MAPITEMTYPE_SOUND, &Start, &Num);
+
+	for(int i = 0; i < Num; i++)
+	{
+		CMapItemSound *pItem = (CMapItemSound *)Reader.GetItem(Start + i);
+		if(pItem->m_External)
+			continue;
+
+		const char *pName = Reader.GetDataString(pItem->m_SoundName);
+		if(pName == nullptr || pName[0] == '\0')
+		{
+			dbg_msg("map_extract", "failed to load name of sound %d", i);
+			continue;
+		}
+
+		char aBuf[IO_MAX_PATH_LENGTH];
+		str_format(aBuf, sizeof(aBuf), "%s/%s.opus", pPathSave, pName);
+		dbg_msg("map_extract", "writing sound: %s (%d B)", aBuf, pItem->m_SoundDataSize);
+
+		IOHANDLE Opus = io_open(aBuf, IOFLAG_WRITE);
+		io_write(Opus, (unsigned char *)Reader.GetData(pItem->m_SoundData), pItem->m_SoundDataSize);
+		io_close(Opus);
+	}
+
+	return Reader.Close();
+}
+
+int main(int argc, const char *argv[])
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	IStorage *pStorage = CreateLocalStorage();
+	if(!pStorage)
+		return -1;
+
+	const char *pDir;
+	if(argc == 2)
+	{
+		pDir = ".";
+	}
+	else if(argc == 3)
+	{
+		pDir = argv[2];
+	}
+	else
+	{
+		dbg_msg("usage", "%s map [directory]", argv[0]);
+		return -1;
+	}
+
+	if(!fs_is_dir(pDir))
+	{
+		dbg_msg("usage", "directory '%s' does not exist", pDir);
+		return -1;
+	}
+
+	int Result = Process(pStorage, argv[1], pDir) ? 0 : 1;
+	return Result;
+}
diff --git a/src_bkp/tools/map_find_env.cpp b/src_bkp/tools/map_find_env.cpp
new file mode 100644
index 0000000000..db5ed7c951
--- /dev/null
+++ b/src_bkp/tools/map_find_env.cpp
@@ -0,0 +1,138 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/gamecore.h>
+#include <game/mapitems.h>
+
+struct EnvelopedQuad
+{
+	int m_GroupID;
+	int m_LayerID;
+	int m_TilePosX;
+	int m_TilePosY;
+};
+
+bool OpenMap(const char pMapName[64], CDataFileReader &InputMap)
+{
+	IStorage *pStorage = CreateLocalStorage();
+
+	if(!InputMap.Open(pStorage, pMapName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_find_env", "ERROR: unable to open map '%s'", pMapName);
+		return false;
+	}
+	return true;
+}
+
+bool GetLayerGroupIDs(CDataFileReader &InputMap, const int LayerNumber, int &GroupID, int &LayerRelativeID)
+{
+	int Start, Num;
+	InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
+
+	for(int i = 0; i < Num; i++)
+	{
+		CMapItemGroup *pItem = (CMapItemGroup *)InputMap.GetItem(Start + i);
+		if(LayerNumber >= pItem->m_StartLayer && LayerNumber <= pItem->m_StartLayer + pItem->m_NumLayers)
+		{
+			GroupID = i;
+			LayerRelativeID = LayerNumber - pItem->m_StartLayer - 1;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+int FxToTilePos(const int FxPos)
+{
+	return std::floor(fx2f(FxPos) / 32);
+}
+
+bool GetEnvelopedQuads(const CQuad *pQuads, const int NumQuads, const int EnvID, const int GroupID, const int LayerID, int &QuadsCounter, EnvelopedQuad pEnvQuads[1024])
+{
+	bool bFound = false;
+	for(int i = 0; i < NumQuads; i++)
+	{
+		if(pQuads[i].m_PosEnv != EnvID && pQuads[i].m_ColorEnv != EnvID)
+			continue;
+
+		pEnvQuads[QuadsCounter].m_GroupID = GroupID;
+		pEnvQuads[QuadsCounter].m_LayerID = LayerID;
+		pEnvQuads[QuadsCounter].m_TilePosX = FxToTilePos(pQuads[i].m_aPoints[4].x);
+		pEnvQuads[QuadsCounter].m_TilePosY = FxToTilePos(pQuads[i].m_aPoints[4].y);
+
+		QuadsCounter++;
+		bFound = true;
+	}
+
+	return bFound;
+}
+
+void PrintEnvelopedQuads(const EnvelopedQuad pEnvQuads[1024], const int EnvID, const int QuadsCounter)
+{
+	if(!QuadsCounter)
+	{
+		dbg_msg("map_find_env", "No quads found with env number #%d", EnvID + 1);
+		return;
+	}
+
+	dbg_msg("map_find_env", "Found %d quads with env number #%d:", QuadsCounter, EnvID + 1);
+	for(int i = 0; i < QuadsCounter; i++)
+		dbg_msg("map_find_env", "%*d. Group: #%d - Layer: #%d - Pos: %d,%d", (int)(std::log10(absolute(QuadsCounter))) + 1, i + 1, pEnvQuads[i].m_GroupID, pEnvQuads[i].m_LayerID, pEnvQuads[i].m_TilePosX, pEnvQuads[i].m_TilePosY);
+}
+
+bool FindEnv(const char aFilename[64], const int EnvID)
+{
+	CDataFileReader InputMap;
+	if(!OpenMap(aFilename, InputMap))
+		return false;
+
+	int LayersStart, LayersCount, QuadsCounter = 0;
+	InputMap.GetType(MAPITEMTYPE_LAYER, &LayersStart, &LayersCount);
+	EnvelopedQuad pEnvQuads[1024];
+
+	for(int i = 0; i < LayersCount; i++)
+	{
+		CMapItemLayer *pItem;
+		pItem = (CMapItemLayer *)InputMap.GetItem(LayersStart + i);
+
+		if(pItem->m_Type != LAYERTYPE_QUADS)
+			continue;
+
+		CMapItemLayerQuads *pQuadLayer = (CMapItemLayerQuads *)pItem;
+		CQuad *pQuads = (CQuad *)InputMap.GetDataSwapped(pQuadLayer->m_Data);
+
+		int GroupID = 0, LayerRelativeID = 0;
+		if(!GetLayerGroupIDs(InputMap, i + 1, GroupID, LayerRelativeID))
+			return false;
+
+		GetEnvelopedQuads(pQuads, pQuadLayer->m_NumQuads, EnvID, GroupID, LayerRelativeID, QuadsCounter, pEnvQuads);
+	}
+
+	PrintEnvelopedQuads(pEnvQuads, EnvID, QuadsCounter);
+
+	return true;
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc < 3)
+	{
+		dbg_msg("map_find_env", "Invalid arguments");
+		dbg_msg("map_find_env", "Usage: %s <input_map> <env_number>", argv[0]);
+		dbg_msg("map_find_env", "Note: returned quads positions are relative to their layers");
+
+		return -1;
+	}
+
+	char aFilename[64];
+	str_copy(aFilename, argv[1]);
+	int EnvID = str_toint(argv[2]) - 1;
+	dbg_msg("map_find_env", "input_map='%s'; env_number='#%d';", aFilename, EnvID + 1);
+
+	return FindEnv(aFilename, EnvID);
+}
diff --git a/src_bkp/tools/map_optimize.cpp b/src_bkp/tools/map_optimize.cpp
new file mode 100644
index 0000000000..2da28b1c09
--- /dev/null
+++ b/src_bkp/tools/map_optimize.cpp
@@ -0,0 +1,319 @@
+#include <algorithm>
+#include <base/logger.h>
+#include <base/system.h>
+#include <cstdint>
+#include <engine/gfx/image_manipulation.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+#include <vector>
+
+void ClearTransparentPixels(uint8_t *pImg, int Width, int Height)
+{
+	for(int y = 0; y < Height; ++y)
+	{
+		for(int x = 0; x < Width; ++x)
+		{
+			int Index = y * Width * 4 + x * 4;
+			if(pImg[Index + 3] == 0)
+			{
+				pImg[Index + 0] = 0;
+				pImg[Index + 1] = 0;
+				pImg[Index + 2] = 0;
+			}
+		}
+	}
+}
+
+void CopyOpaquePixels(uint8_t *pDestImg, uint8_t *pSrcImg, int Width, int Height)
+{
+	for(int y = 0; y < Height; ++y)
+	{
+		for(int x = 0; x < Width; ++x)
+		{
+			int Index = y * Width * 4 + x * 4;
+			if(pSrcImg[Index + 3] > 0)
+				mem_copy(&pDestImg[Index], &pSrcImg[Index], sizeof(uint8_t) * 4);
+			else
+				mem_zero(&pDestImg[Index], sizeof(uint8_t) * 4);
+		}
+	}
+}
+
+void ClearPixelsTile(uint8_t *pImg, int Width, int Height, int TileIndex)
+{
+	int WTile = Width / 16;
+	int HTile = Height / 16;
+	int xi = (TileIndex % 16) * WTile;
+	int yi = (TileIndex / 16) * HTile;
+
+	for(int y = yi; y < yi + HTile; ++y)
+	{
+		for(int x = xi; x < xi + WTile; ++x)
+		{
+			int Index = y * Width * 4 + x * 4;
+			pImg[Index + 0] = 0;
+			pImg[Index + 1] = 0;
+			pImg[Index + 2] = 0;
+			pImg[Index + 3] = 0;
+		}
+	}
+}
+
+void GetImageSHA256(uint8_t *pImgBuff, int ImgSize, int Width, int Height, char *pSHA256Str, size_t SHA256StrSize)
+{
+	uint8_t *pNewImgBuff = (uint8_t *)malloc(ImgSize);
+
+	// Clear fully transparent pixels, so the SHA is easier to identify with the original image
+	CopyOpaquePixels(pNewImgBuff, pImgBuff, Width, Height);
+	SHA256_DIGEST SHAStr = sha256(pNewImgBuff, (size_t)ImgSize);
+
+	sha256_str(SHAStr, pSHA256Str, SHA256StrSize);
+
+	free(pNewImgBuff);
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_BASIC, argc, argv);
+	if(!pStorage || argc <= 1 || argc > 3)
+	{
+		dbg_msg("map_optimize", "Invalid parameters or other unknown error.");
+		dbg_msg("map_optimize", "Usage: map_optimize <source map filepath> [<dest map filepath>]");
+		return -1;
+	}
+
+	char aFileName[IO_MAX_PATH_LENGTH];
+	if(argc == 3)
+	{
+		str_format(aFileName, sizeof(aFileName), "out/%s", argv[2]);
+
+		fs_makedir_rec_for(aFileName);
+	}
+	else
+	{
+		fs_makedir("out");
+		char aBuff[IO_MAX_PATH_LENGTH];
+		IStorage::StripPathAndExtension(argv[1], aBuff, sizeof(aBuff));
+		str_format(aFileName, sizeof(aFileName), "out/%s.map", aBuff);
+	}
+
+	CDataFileReader Reader;
+	if(!Reader.Open(pStorage, argv[1], IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_optimize", "Failed to open source file.");
+		return -1;
+	}
+
+	CDataFileWriter Writer;
+	if(!Writer.Open(pStorage, aFileName, IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_optimize", "Failed to open target file.");
+		return -1;
+	}
+
+	int aImageFlags[MAX_MAPIMAGES] = {
+		0,
+	};
+
+	bool aaImageTiles[MAX_MAPIMAGES][256]{
+		{
+			false,
+		},
+	};
+
+	struct SMapOptimizeItem
+	{
+		CMapItemImage *m_pImage;
+		int m_Index;
+		int m_Data;
+		int m_Text;
+	};
+
+	std::vector<SMapOptimizeItem> vDataFindHelper;
+
+	// add all items
+	for(int Index = 0, i = 0; Index < Reader.NumItems(); Index++)
+	{
+		int Type, ID;
+		void *pPtr = Reader.GetItem(Index, &Type, &ID);
+		int Size = Reader.GetItemSize(Index);
+
+		// filter ITEMTYPE_EX items, they will be automatically added again
+		if(Type == ITEMTYPE_EX)
+		{
+			continue;
+		}
+		// for all layers, check if it uses a image and set the corresponding flag
+		if(Type == MAPITEMTYPE_LAYER)
+		{
+			CMapItemLayer *pLayer = (CMapItemLayer *)pPtr;
+			if(pLayer->m_Type == LAYERTYPE_TILES)
+			{
+				CMapItemLayerTilemap *pTLayer = (CMapItemLayerTilemap *)pLayer;
+				if(pTLayer->m_Image >= 0 && pTLayer->m_Image < (int)MAX_MAPIMAGES && pTLayer->m_Flags == 0)
+				{
+					aImageFlags[pTLayer->m_Image] |= 1;
+					// check tiles that are used in this image
+					unsigned int DataSize = Reader.GetDataSize(pTLayer->m_Data);
+					void *pTiles = Reader.GetData(pTLayer->m_Data);
+
+					if(DataSize >= (size_t)pTLayer->m_Width * pTLayer->m_Height * sizeof(CTile))
+					{
+						for(int y = 0; y < pTLayer->m_Height; ++y)
+						{
+							for(int x = 0; x < pTLayer->m_Width; ++x)
+							{
+								int TileIndex = ((CTile *)pTiles)[y * pTLayer->m_Width + x].m_Index;
+								if(TileIndex > 0)
+								{
+									aaImageTiles[pTLayer->m_Image][TileIndex] = true;
+								}
+							}
+						}
+					}
+				}
+			}
+			else if(pLayer->m_Type == LAYERTYPE_QUADS)
+			{
+				CMapItemLayerQuads *pQLayer = (CMapItemLayerQuads *)pLayer;
+				if(pQLayer->m_Image >= 0 && pQLayer->m_Image < (int)MAX_MAPIMAGES)
+				{
+					aImageFlags[pQLayer->m_Image] |= 2;
+				}
+			}
+		}
+		else if(Type == MAPITEMTYPE_IMAGE)
+		{
+			CMapItemImage_v2 *pImg = (CMapItemImage_v2 *)pPtr;
+			if(!pImg->m_External && pImg->m_Version < CMapItemImage_v2::CURRENT_VERSION)
+			{
+				SMapOptimizeItem Item;
+				Item.m_pImage = pImg;
+				Item.m_Index = i;
+				Item.m_Data = pImg->m_ImageData;
+				Item.m_Text = pImg->m_ImageName;
+				vDataFindHelper.push_back(Item);
+			}
+
+			// found an image
+			++i;
+		}
+
+		Writer.AddItem(Type, ID, Size, pPtr);
+	}
+
+	// add all data
+	for(int Index = 0; Index < Reader.NumData(); Index++)
+	{
+		bool DeletePtr = false;
+		void *pPtr = Reader.GetData(Index);
+		int Size = Reader.GetDataSize(Index);
+		auto it = std::find_if(vDataFindHelper.begin(), vDataFindHelper.end(), [Index](const SMapOptimizeItem &Other) -> bool { return Other.m_Data == Index || Other.m_Text == Index; });
+		if(it != vDataFindHelper.end())
+		{
+			int Width = it->m_pImage->m_Width;
+			int Height = it->m_pImage->m_Height;
+
+			int ImageIndex = it->m_Index;
+			if(it->m_Data == Index)
+			{
+				DeletePtr = true;
+				// optimize embedded images
+				// use a new pointer, to be safe, when using the original image data
+				void *pNewPtr = malloc(Size);
+				mem_copy(pNewPtr, pPtr, Size);
+				pPtr = pNewPtr;
+				uint8_t *pImgBuff = (uint8_t *)pPtr;
+
+				bool DoClearTransparentPixels = false;
+				bool DilateAs2DArray = false;
+				bool DoDilate = false;
+
+				// all tiles that aren't used are cleared(if image was only used by tilemap)
+				if(aImageFlags[ImageIndex] == 1)
+				{
+					for(int i = 0; i < 256; ++i)
+					{
+						if(!aaImageTiles[ImageIndex][i])
+						{
+							ClearPixelsTile(pImgBuff, Width, Height, i);
+						}
+					}
+
+					DoClearTransparentPixels = true;
+					DilateAs2DArray = true;
+					DoDilate = true;
+				}
+				else if(aImageFlags[ImageIndex] == 0)
+				{
+					mem_zero(pImgBuff, (size_t)Width * Height * 4);
+				}
+				else
+				{
+					DoClearTransparentPixels = true;
+					DoDilate = true;
+				}
+
+				if(DoClearTransparentPixels)
+				{
+					// clear unused pixels and make a clean dilate for the compressor
+					ClearTransparentPixels(pImgBuff, Width, Height);
+				}
+
+				if(DoDilate)
+				{
+					if(DilateAs2DArray)
+					{
+						for(int i = 0; i < 256; ++i)
+						{
+							int ImgTileW = Width / 16;
+							int ImgTileH = Height / 16;
+							int x = (i % 16) * ImgTileW;
+							int y = (i / 16) * ImgTileH;
+							DilateImageSub(pImgBuff, Width, Height, x, y, ImgTileW, ImgTileH);
+						}
+					}
+					else
+					{
+						DilateImage(pImgBuff, Width, Height);
+					}
+				}
+			}
+			else if(it->m_Text == Index)
+			{
+				char *pImgName = (char *)pPtr;
+				uint8_t *pImgBuff = (uint8_t *)Reader.GetData(it->m_Data);
+				int ImgSize = Reader.GetDataSize(it->m_Data);
+
+				char aSHA256Str[SHA256_MAXSTRSIZE];
+				// This is the important function, that calculates the SHA256 in a special way
+				// Please read the comments inside the functions to understand it
+				GetImageSHA256(pImgBuff, ImgSize, Width, Height, aSHA256Str, sizeof(aSHA256Str));
+
+				char aNewName[IO_MAX_PATH_LENGTH];
+				int StrLen = str_format(aNewName, std::size(aNewName), "%s_cut_%s", pImgName, aSHA256Str);
+
+				DeletePtr = true;
+				// make the new name ready
+				char *pNewPtr = (char *)malloc(StrLen + 1);
+				str_copy(pNewPtr, aNewName, StrLen + 1);
+				pPtr = pNewPtr;
+				Size = StrLen + 1;
+			}
+		}
+
+		Writer.AddData(Size, pPtr, Z_BEST_COMPRESSION);
+
+		if(DeletePtr)
+			free(pPtr);
+	}
+
+	Reader.Close();
+	Writer.Finish();
+
+	return 0;
+}
diff --git a/src_bkp/tools/map_replace_area.cpp b/src_bkp/tools/map_replace_area.cpp
new file mode 100644
index 0000000000..f0d4aed3ae
--- /dev/null
+++ b/src_bkp/tools/map_replace_area.cpp
@@ -0,0 +1,666 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/gamecore.h>
+#include <game/mapitems.h>
+
+// global new layers data (set by ReplaceAreaTiles and ReplaceAreaQuads)
+void *g_apNewData[1024];
+void *g_apNewItem[1024];
+int g_aNewDataSize[1024];
+
+struct MapObject // quad pivot or tile layer
+{
+	static constexpr float ms_aStandardScreen[2] = {1430 / 2.f, 1050 / 2.f};
+
+	float m_aLayerOffset[2];
+	bool m_UseClipping;
+	float m_aaClipArea[2][2];
+	float m_aSpeed[2];
+	float m_aaScreenOffset[2][2];
+	float m_aaBaseArea[2][2]; // adapted to offset
+	float m_aaExtendedArea[2][2]; // extended with parallax
+};
+
+bool ReplaceArea(IStorage *, const char[3][64], const float[][2][2]);
+bool OpenMaps(IStorage *, const char[3][64], CDataFileReader[2], CDataFileWriter &);
+void SaveOutputMap(CDataFileReader &, CDataFileWriter &);
+bool CompareLayers(const char[3][64], CDataFileReader[2]);
+void CompareGroups(const char[3][64], CDataFileReader[2]);
+const CMapItemGroup *GetLayerGroup(CDataFileReader &, int);
+
+void ReplaceAreaTiles(CDataFileReader[2], const float[][2][2], const CMapItemGroup *[2], CMapItemLayer *[2]);
+void RemoveDestinationTiles(CMapItemLayerTilemap *, CTile *, float[2][2]);
+void ReplaceDestinationTiles(CMapItemLayerTilemap *[2], CTile *[2], float[2][2][2]);
+bool AdaptVisibleAreas(const float[2][2][2], const MapObject[2], float[2][2][2]);
+bool AdaptReplaceableAreas(const float[2][2][2], const float[2][2][2], const MapObject[2], float[2][2][2]);
+
+void ReplaceAreaQuads(CDataFileReader[2], const float[][2][2], const CMapItemGroup *[2], CMapItemLayer *[2], int);
+bool RemoveDestinationQuads(const float[2][2], const CQuad *, int, const CMapItemGroup *, CQuad *, int &);
+bool InsertDestinationQuads(const float[2][2][2], const CQuad *, int, const CMapItemGroup *[2], CQuad *, int &);
+bool AdaptVisiblePoint(const float[2][2][2], const float[2][2], const MapObject[2], float[2]);
+
+MapObject CreateMapObject(const CMapItemGroup *, int, int, int, int);
+void SetExtendedArea(MapObject &);
+bool GetVisibleArea(const float[2][2], const MapObject &, float[2][2] = 0x0);
+bool GetReplaceableArea(const float[2][2], const MapObject &, float[2][2]);
+
+void GetGameAreaDistance(const float[2][2][2], const MapObject[2], const float[2][2][2], float[2]);
+void GetGameAreaDistance(const float[2][2][2], const MapObject[2], const float[2][2], float[2]);
+void GetSignificantScreenPos(const MapObject &, const float[2][2], const float[2][2], float[2]);
+void ConvertToTiles(const float[2][2], int[2][2]);
+
+bool GetLineIntersection(const float[2], const float[2], float[2] = 0x0);
+bool GetLineIntersection(const float[2], float);
+void SetInexistent(float *, int);
+bool IsInexistent(const float *, int);
+bool IsInexistent(float);
+
+int main(int argc, const char *argv[])
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc != 10)
+	{
+		dbg_msg("map_replace_area", "Invalid arguments");
+		dbg_msg("map_replace_area", "Usage: %s <from_map> <from_x> <from_y> <to_map> <to_x> <to_y> <width> <height> <output_map>", argv[0]);
+		dbg_msg("map_replace_area", "Note: use game layer tiles as a reference for both coordinates and sizes");
+
+		return -1;
+	}
+
+	char aaMapNames[3][64];
+	str_copy(aaMapNames[0], argv[1]); //from_map
+	str_copy(aaMapNames[1], argv[4]); //to_map
+	str_copy(aaMapNames[2], argv[9]); //output_map
+
+	float aaaGameAreas[2][2][2];
+
+	for(int i = 0; i < 2; i++)
+	{
+		aaaGameAreas[i][0][0] = str_tofloat(argv[2 + i * 3]) * 32; //x
+		aaaGameAreas[i][1][0] = str_tofloat(argv[3 + i * 3]) * 32; //y
+		aaaGameAreas[i][0][1] = aaaGameAreas[i][0][0] + str_tofloat(argv[7]) * 32; //x + width
+		aaaGameAreas[i][1][1] = aaaGameAreas[i][1][0] + str_tofloat(argv[8]) * 32; //y + height
+	}
+
+	cmdline_free(argc, argv);
+
+	dbg_msg("map_replace_area", "from_map='%s'; to_map='%s'; from_area='%fx,%fy'; to_area='%fx,%fy'; area_width='%fpx'; area_heigth='%fpx'; output_map='%s'",
+		aaMapNames[0], aaMapNames[1], aaaGameAreas[0][0][0], aaaGameAreas[0][1][0], aaaGameAreas[1][0][0], aaaGameAreas[1][1][0],
+		aaaGameAreas[0][0][1] - aaaGameAreas[0][0][0], aaaGameAreas[0][1][1] - aaaGameAreas[0][1][0], aaMapNames[2]);
+
+	IStorage *pStorage = CreateLocalStorage();
+	for(int i = 0; i < 1024; i++)
+	{
+		g_apNewData[i] = g_apNewItem[i] = 0;
+		g_aNewDataSize[i] = 0;
+	}
+
+	return ReplaceArea(pStorage, aaMapNames, aaaGameAreas) ? 0 : 1;
+}
+
+bool ReplaceArea(IStorage *pStorage, const char aaMapNames[3][64], const float aaaGameAreas[][2][2])
+{
+	CDataFileReader aInputMaps[2];
+	CDataFileWriter OutputMap;
+
+	if(!OpenMaps(pStorage, aaMapNames, aInputMaps, OutputMap))
+		return false;
+	if(!CompareLayers(aaMapNames, aInputMaps))
+		return false;
+	CompareGroups(aaMapNames, aInputMaps);
+
+	int aLayersStart[2], LayersCount;
+	for(int i = 0; i < 2; i++)
+		aInputMaps[i].GetType(MAPITEMTYPE_LAYER, &aLayersStart[i], &LayersCount);
+
+	for(int i = 0; i < LayersCount; i++)
+	{
+		const CMapItemGroup *apLayerGroups[2];
+		CMapItemLayer *apItem[2];
+		for(int j = 0; j < 2; j++)
+		{
+			apLayerGroups[j] = GetLayerGroup(aInputMaps[j], i + 1);
+			apItem[j] = (CMapItemLayer *)aInputMaps[j].GetItem(aLayersStart[j] + i);
+		}
+
+		if(!apLayerGroups[0] || !apLayerGroups[1])
+			continue;
+
+		if(apItem[0]->m_Type == LAYERTYPE_TILES)
+			ReplaceAreaTiles(aInputMaps, aaaGameAreas, apLayerGroups, apItem);
+		else if(apItem[0]->m_Type == LAYERTYPE_QUADS)
+			ReplaceAreaQuads(aInputMaps, aaaGameAreas, apLayerGroups, apItem, aLayersStart[1] + i);
+	}
+
+	SaveOutputMap(aInputMaps[1], OutputMap);
+
+	return true;
+}
+
+bool OpenMaps(IStorage *pStorage, const char aaMapNames[3][64], CDataFileReader aInputMaps[2], CDataFileWriter &OutputMap)
+{
+	for(int i = 0; i < 2; i++)
+	{
+		if(!aInputMaps[i].Open(pStorage, aaMapNames[i], IStorage::TYPE_ABSOLUTE))
+		{
+			dbg_msg("map_replace_area", "ERROR: unable to open map '%s'", aaMapNames[i]);
+			return false;
+		}
+	}
+
+	if(!OutputMap.Open(pStorage, aaMapNames[2], IStorage::TYPE_ABSOLUTE))
+	{
+		dbg_msg("map_replace_area", "ERROR: unable to open map '%s'", aaMapNames[2]);
+		return false;
+	}
+
+	return true;
+}
+
+void SaveOutputMap(CDataFileReader &InputMap, CDataFileWriter &OutputMap)
+{
+	for(int i = 0; i < InputMap.NumItems(); i++)
+	{
+		int ID, Type;
+		void *pItem = InputMap.GetItem(i, &Type, &ID);
+
+		if(Type == ITEMTYPE_EX)
+			continue;
+		if(g_apNewItem[i])
+			pItem = g_apNewItem[i];
+
+		int Size = InputMap.GetItemSize(i);
+		OutputMap.AddItem(Type, ID, Size, pItem);
+	}
+
+	for(int i = 0; i < InputMap.NumData(); i++)
+	{
+		void *pData = g_apNewData[i] ? g_apNewData[i] : InputMap.GetData(i);
+		int Size = g_aNewDataSize[i] ? g_aNewDataSize[i] : InputMap.GetDataSize(i);
+		OutputMap.AddData(Size, pData);
+	}
+
+	OutputMap.Finish();
+}
+
+bool CompareLayers(const char aaMapNames[3][64], CDataFileReader aInputMaps[2])
+{
+	int aStart[2], aNum[2];
+	for(int i = 0; i < 2; i++)
+		aInputMaps[i].GetType(MAPITEMTYPE_LAYER, &aStart[i], &aNum[i]);
+
+	if(aNum[0] != aNum[1])
+	{
+		dbg_msg("map_replace_area", "ERROR: different layers quantity");
+		for(int i = 0; i < 2; i++)
+			dbg_msg("map_replace_area", " \"%s\": %d layers", aaMapNames[i], aNum[i]);
+		return false;
+	}
+
+	for(int i = 0; i < aNum[0]; i++)
+	{
+		CMapItemLayer *apItem[2];
+		for(int j = 0; j < 2; j++)
+			apItem[j] = (CMapItemLayer *)aInputMaps[j].GetItem(aStart[j] + i);
+
+		if(apItem[0]->m_Type != apItem[1]->m_Type)
+		{
+			dbg_msg("map_replace_area", "ERROR: different types on layer #%d", i);
+			for(int j = 0; j < 2; j++)
+				dbg_msg("map_replace_area", " \"%s\": %s", aaMapNames[j], apItem[j]->m_Type == LAYERTYPE_TILES ? "tiles layer" : "quad layer");
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void CompareGroups(const char aaMapNames[3][64], CDataFileReader aInputMaps[2])
+{
+	int aStart[2], aNum[2];
+	for(int i = 0; i < 2; i++)
+		aInputMaps[i].GetType(MAPITEMTYPE_GROUP, &aStart[i], &aNum[i]);
+
+	for(int i = 0; i < std::max(aNum[0], aNum[1]); i++)
+	{
+		CMapItemGroup *apItem[2];
+		for(int j = 0; j < 2; j++)
+			apItem[j] = (CMapItemGroup *)aInputMaps[j].GetItem(aStart[j] + i);
+
+		bool bSameConfig = apItem[0]->m_ParallaxX == apItem[1]->m_ParallaxX && apItem[0]->m_ParallaxY == apItem[1]->m_ParallaxY && apItem[0]->m_OffsetX == apItem[1]->m_OffsetX && apItem[0]->m_OffsetY == apItem[1]->m_OffsetY && apItem[0]->m_UseClipping == apItem[1]->m_UseClipping && apItem[0]->m_ClipX == apItem[1]->m_ClipX && apItem[0]->m_ClipY == apItem[1]->m_ClipY && apItem[0]->m_ClipW == apItem[1]->m_ClipW && apItem[0]->m_ClipH == apItem[1]->m_ClipH;
+
+		if(!bSameConfig)
+			dbg_msg("map_replace_area", "WARNING: different configuration on layergroup #%d, this might lead to unexpected results", i);
+	}
+}
+
+const CMapItemGroup *GetLayerGroup(CDataFileReader &InputMap, const int LayerNumber)
+{
+	int Start, Num;
+	InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
+
+	for(int i = 0; i < Num; i++)
+	{
+		CMapItemGroup *pItem = (CMapItemGroup *)InputMap.GetItem(Start + i);
+		if(LayerNumber >= pItem->m_StartLayer && LayerNumber <= pItem->m_StartLayer + pItem->m_NumLayers)
+			return pItem;
+	}
+
+	return 0x0;
+}
+
+void ReplaceAreaTiles(CDataFileReader aInputMaps[2], const float aaaGameAreas[][2][2], const CMapItemGroup *apLayerGroups[2], CMapItemLayer *apItem[2])
+{
+	CMapItemLayerTilemap *apTilemap[2];
+	CTile *apTile[2];
+	float aaaVisibleAreas[2][2][2], aaaReplaceableAreas[2][2][2];
+	MapObject aObs[2];
+
+	for(int i = 0; i < 2; i++)
+	{
+		apTilemap[i] = (CMapItemLayerTilemap *)apItem[i];
+		apTile[i] = (CTile *)aInputMaps[i].GetData(apTilemap[i]->m_Data);
+		aObs[i] = CreateMapObject(apLayerGroups[i], 0, 0, apTilemap[i]->m_Width * 32, apTilemap[i]->m_Height * 32);
+	}
+
+	if(!GetVisibleArea(aaaGameAreas[1], aObs[1], aaaVisibleAreas[1]))
+		return;
+
+	GetReplaceableArea(aaaVisibleAreas[1], aObs[1], aaaReplaceableAreas[1]);
+	RemoveDestinationTiles(apTilemap[1], apTile[1], aaaReplaceableAreas[1]);
+
+	if(GetVisibleArea(aaaGameAreas[0], aObs[0], aaaVisibleAreas[0]) && AdaptVisibleAreas(aaaGameAreas, aObs, aaaVisibleAreas))
+	{
+		for(int i = 0; i < 2; i++)
+			GetReplaceableArea(aaaVisibleAreas[i], aObs[i], aaaReplaceableAreas[i]);
+
+		if(AdaptReplaceableAreas(aaaGameAreas, aaaVisibleAreas, aObs, aaaReplaceableAreas))
+			ReplaceDestinationTiles(apTilemap, apTile, aaaReplaceableAreas);
+	}
+
+	g_apNewData[apTilemap[1]->m_Data] = apTile[1];
+}
+
+void RemoveDestinationTiles(CMapItemLayerTilemap *pTilemap, CTile *pTile, float aaReplaceableArea[2][2])
+{
+	int aaRange[2][2];
+	ConvertToTiles(aaReplaceableArea, aaRange);
+
+	CTile EmptyTile;
+	EmptyTile.m_Index = EmptyTile.m_Flags = EmptyTile.m_Skip = EmptyTile.m_Reserved = 0;
+
+	for(int y = aaRange[1][0]; y < aaRange[1][1]; y++)
+		for(int x = aaRange[0][0]; x < aaRange[0][1]; x++)
+			pTile[x + (y * pTilemap->m_Width)] = EmptyTile;
+}
+
+void ReplaceDestinationTiles(CMapItemLayerTilemap *apTilemap[2], CTile *apTile[2], float aaaReplaceableAreas[2][2][2])
+{
+	int aaaRanges[2][2][2];
+	for(int i = 0; i < 2; i++)
+		ConvertToTiles(aaaReplaceableAreas[i], aaaRanges[i]);
+
+	for(int y0 = aaaRanges[0][1][0], y1 = aaaRanges[1][1][0]; y0 < aaaRanges[0][1][1] && y1 < aaaRanges[1][1][1]; y0++, y1++)
+		for(int x0 = aaaRanges[0][0][0], x1 = aaaRanges[1][0][0]; x0 < aaaRanges[0][0][1] && x1 < aaaRanges[1][0][1]; x0++, x1++)
+			apTile[1][x1 + (y1 * apTilemap[1]->m_Width)] = apTile[0][x0 + (y0 * apTilemap[0]->m_Width)];
+}
+
+bool AdaptVisibleAreas(const float aaaGameAreas[2][2][2], const MapObject aObs[2], float aaaVisibleAreas[2][2][2])
+{
+	float aDistance[2];
+	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
+
+	for(int i = 0; i < 2; i++)
+	{
+		if(aObs[0].m_aSpeed[i] == 1 || aObs[1].m_aSpeed[i] == 1)
+			continue;
+
+		for(int j = 0; j < 2; j++)
+			aaaVisibleAreas[1][i][j] -= aDistance[i];
+
+		if(!GetLineIntersection(aaaVisibleAreas[0][i], aaaVisibleAreas[1][i], aaaVisibleAreas[0][i]))
+			return false;
+
+		for(int j = 0; j < 2; j++)
+			aaaVisibleAreas[1][i][j] = aaaVisibleAreas[0][i][j] + aDistance[i];
+	}
+
+	return true;
+}
+
+bool AdaptReplaceableAreas(const float aaaGameAreas[2][2][2], const float aaaVisibleAreas[2][2][2], const MapObject aObs[2], float aaaReplaceableAreas[2][2][2])
+{
+	float aDistance[2], aScreenPos[2];
+	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
+	GetSignificantScreenPos(aObs[0], aaaVisibleAreas[0], aaaReplaceableAreas[0], aScreenPos);
+
+	for(int i = 0; i < 2; i++)
+	{
+		float aDestLine[2], aSourceLine[2], aVisibleLine[2];
+
+		aDestLine[0] = aObs[1].m_aaBaseArea[i][0] + (aScreenPos[i] + aDistance[i]) * aObs[1].m_aSpeed[i];
+		aDestLine[1] = aDestLine[0] + (aObs[1].m_aaBaseArea[i][1] - aObs[1].m_aaBaseArea[i][0]);
+
+		if(!GetLineIntersection(aDestLine, aaaVisibleAreas[1][i], aVisibleLine))
+			return false;
+
+		aSourceLine[0] = aaaVisibleAreas[0][i][0] + aDistance[i] - aaaReplaceableAreas[0][i][0];
+		aSourceLine[1] = aaaVisibleAreas[0][i][1] + aDistance[i] + aaaReplaceableAreas[0][i][1] - aaaReplaceableAreas[0][i][0];
+
+		if(!GetLineIntersection(aSourceLine, aVisibleLine, aVisibleLine))
+			return false;
+
+		aaaReplaceableAreas[0][i][0] = aVisibleLine[0] - aSourceLine[0];
+		aaaReplaceableAreas[1][i][0] = aVisibleLine[0] - aDestLine[0];
+	}
+
+	return true;
+}
+
+void ReplaceAreaQuads(CDataFileReader aInputMaps[2], const float aaaGameAreas[][2][2], const CMapItemGroup *apLayerGroups[2], CMapItemLayer *apItem[2], const int ItemNumber)
+{
+	CMapItemLayerQuads *apQuadLayer[2];
+	for(int i = 0; i < 2; i++)
+		apQuadLayer[i] = (CMapItemLayerQuads *)apItem[i];
+
+	CQuad *apQuads[3];
+	for(int i = 0; i < 2; i++)
+		apQuads[i] = (CQuad *)aInputMaps[i].GetDataSwapped(apQuadLayer[i]->m_Data);
+
+	apQuads[2] = new CQuad[apQuadLayer[0]->m_NumQuads + apQuadLayer[1]->m_NumQuads];
+	int QuadsCounter = 0;
+
+	bool bDataChanged = RemoveDestinationQuads(aaaGameAreas[1], apQuads[1], apQuadLayer[1]->m_NumQuads, apLayerGroups[1], apQuads[2], QuadsCounter);
+	bDataChanged |= InsertDestinationQuads(aaaGameAreas, apQuads[0], apQuadLayer[0]->m_NumQuads, apLayerGroups, apQuads[2], QuadsCounter);
+
+	if(bDataChanged)
+	{
+		g_apNewData[apQuadLayer[1]->m_Data] = apQuads[2];
+		g_aNewDataSize[apQuadLayer[1]->m_Data] = ((int)sizeof(CQuad)) * QuadsCounter;
+		apQuadLayer[1]->m_NumQuads = QuadsCounter;
+		g_apNewItem[ItemNumber] = apItem[1];
+	}
+	else
+		delete[] apQuads[2];
+}
+
+bool RemoveDestinationQuads(const float aaGameArea[2][2], const CQuad *pQuads, const int NumQuads, const CMapItemGroup *pLayerGroup, CQuad *pDestQuads, int &QuadsCounter)
+{
+	bool bDataChanged = false;
+
+	for(int i = 0; i < NumQuads; i++)
+	{
+		MapObject Ob = CreateMapObject(pLayerGroup, fx2f(pQuads[i].m_aPoints[4].x), fx2f(pQuads[i].m_aPoints[4].y), 0, 0);
+
+		if(GetVisibleArea(aaGameArea, Ob))
+		{
+			bDataChanged = true;
+			continue;
+		}
+
+		pDestQuads[QuadsCounter] = pQuads[i];
+		QuadsCounter++;
+	}
+
+	return bDataChanged;
+}
+
+bool InsertDestinationQuads(const float aaaGameAreas[2][2][2], const CQuad *pQuads, const int NumQuads, const CMapItemGroup *apLayerGroups[2], CQuad *pDestQuads, int &QuadsCounter)
+{
+	bool bDataChanged = false;
+
+	for(int i = 0; i < NumQuads; i++)
+	{
+		MapObject aObs[2];
+		aObs[0] = CreateMapObject(apLayerGroups[0], fx2f(pQuads[i].m_aPoints[4].x), fx2f(pQuads[i].m_aPoints[4].y), 0, 0);
+		float aaVisibleArea[2][2];
+
+		if(GetVisibleArea(aaaGameAreas[0], aObs[0], aaVisibleArea))
+		{
+			float aQuadPos[2];
+			aObs[1] = CreateMapObject(apLayerGroups[1], 0, 0, 0, 0);
+
+			if(!AdaptVisiblePoint(aaaGameAreas, aaVisibleArea, aObs, aQuadPos))
+				continue;
+
+			pDestQuads[QuadsCounter] = pQuads[i];
+			for(auto &Point : pDestQuads[QuadsCounter].m_aPoints)
+			{
+				Point.x += f2fx(aQuadPos[0]) - pDestQuads[QuadsCounter].m_aPoints[4].x;
+				Point.y += f2fx(aQuadPos[1]) - pDestQuads[QuadsCounter].m_aPoints[4].y;
+			}
+
+			QuadsCounter++;
+			bDataChanged = true;
+		}
+	}
+
+	return bDataChanged;
+}
+
+bool AdaptVisiblePoint(const float aaaGameAreas[2][2][2], const float aaVisibleArea[2][2], const MapObject aObs[2], float aPos[2])
+{
+	float aDistance[2], aScreenPos[2];
+	GetGameAreaDistance(aaaGameAreas, aObs, aaVisibleArea, aDistance);
+	GetSignificantScreenPos(aObs[0], aaVisibleArea, 0x0, aScreenPos);
+
+	for(int i = 0; i < 2; i++)
+		aPos[i] = aaVisibleArea[i][0] + aDistance[i] + aObs[1].m_aLayerOffset[i] - (aScreenPos[i] + aDistance[i]) * aObs[1].m_aSpeed[i];
+
+	MapObject FinalOb = aObs[1];
+	for(int i = 0; i < 2; i++)
+		FinalOb.m_aaBaseArea[i][0] = FinalOb.m_aaBaseArea[i][1] += aPos[i];
+	SetExtendedArea(FinalOb);
+
+	return GetVisibleArea(aaaGameAreas[1], FinalOb);
+}
+
+MapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, const int PosY, const int Width, const int Height)
+{
+	MapObject Ob;
+
+	Ob.m_aaBaseArea[0][0] = PosX - pLayerGroup->m_OffsetX;
+	Ob.m_aaBaseArea[1][0] = PosY - pLayerGroup->m_OffsetY;
+	Ob.m_aaBaseArea[0][1] = Ob.m_aaBaseArea[0][0] + Width;
+	Ob.m_aaBaseArea[1][1] = Ob.m_aaBaseArea[1][0] + Height;
+	Ob.m_aLayerOffset[0] = pLayerGroup->m_OffsetX;
+	Ob.m_aLayerOffset[1] = pLayerGroup->m_OffsetY;
+	Ob.m_UseClipping = pLayerGroup->m_UseClipping;
+	Ob.m_aaClipArea[0][0] = pLayerGroup->m_ClipX;
+	Ob.m_aaClipArea[1][0] = pLayerGroup->m_ClipY;
+	Ob.m_aaClipArea[0][1] = pLayerGroup->m_ClipX + pLayerGroup->m_ClipW;
+	Ob.m_aaClipArea[1][1] = pLayerGroup->m_ClipY + pLayerGroup->m_ClipH;
+	Ob.m_aSpeed[0] = 1 - (pLayerGroup->m_ParallaxX / 100.0f);
+	Ob.m_aSpeed[1] = 1 - (pLayerGroup->m_ParallaxY / 100.0f);
+
+	for(int i = 0; i < 2; i++)
+	{
+		Ob.m_aaScreenOffset[i][0] = -MapObject::ms_aStandardScreen[i];
+		Ob.m_aaScreenOffset[i][1] = MapObject::ms_aStandardScreen[i];
+		if(Ob.m_aSpeed[i] < 0)
+			std::swap(Ob.m_aaScreenOffset[i][0], Ob.m_aaScreenOffset[i][1]);
+	}
+
+	SetExtendedArea(Ob);
+	return Ob;
+}
+
+void SetExtendedArea(MapObject &Ob)
+{
+	SetInexistent((float *)Ob.m_aaExtendedArea, 4);
+
+	for(int i = 0; i < 2; i++)
+	{
+		if(Ob.m_aSpeed[i] == 1)
+		{
+			float aInspectedArea[2];
+			if(GetLineIntersection(Ob.m_aaBaseArea[i], Ob.m_aaScreenOffset[i], aInspectedArea))
+				mem_copy(Ob.m_aaExtendedArea[i], aInspectedArea, sizeof(float[2]));
+			continue;
+		}
+
+		for(int j = 0; j < 2; j++)
+			Ob.m_aaExtendedArea[i][j] = (Ob.m_aaBaseArea[i][j] + Ob.m_aaScreenOffset[i][j] * Ob.m_aSpeed[i]) / (1 - Ob.m_aSpeed[i]);
+
+		if(Ob.m_aaExtendedArea[i][0] > Ob.m_aaExtendedArea[i][1])
+			std::swap(Ob.m_aaExtendedArea[i][0], Ob.m_aaExtendedArea[i][1]);
+	}
+}
+
+bool GetVisibleArea(const float aaGameArea[2][2], const MapObject &Ob, float aaVisibleArea[2][2])
+{
+	if(IsInexistent((float *)Ob.m_aaExtendedArea, 4))
+		return false;
+
+	if(aaVisibleArea)
+		SetInexistent((float *)aaVisibleArea, 4);
+
+	float aaInspectedArea[2][2];
+	mem_copy(aaInspectedArea, aaGameArea, sizeof(float[2][2]));
+
+	for(int i = 0; i < 2; i++)
+	{
+		if(Ob.m_aSpeed[i] == 1)
+		{
+			mem_copy(aaInspectedArea[i], Ob.m_aaExtendedArea[i], sizeof(float[2]));
+			continue;
+		}
+
+		if(Ob.m_UseClipping && !GetLineIntersection(aaInspectedArea[i], Ob.m_aaClipArea[i], aaInspectedArea[i]))
+			return false;
+
+		if(!GetLineIntersection(aaInspectedArea[i], Ob.m_aaExtendedArea[i], aaInspectedArea[i]))
+			return false;
+	}
+
+	if(aaVisibleArea)
+		mem_copy(aaVisibleArea, aaInspectedArea, sizeof(float[2][2]));
+
+	return true;
+}
+
+bool GetReplaceableArea(const float aaVisibleArea[2][2], const MapObject &Ob, float aaReplaceableArea[2][2])
+{
+	SetInexistent((float *)aaReplaceableArea, 4);
+	if(IsInexistent((float *)aaVisibleArea, 4))
+		return false;
+
+	for(int i = 0; i < 2; i++)
+	{
+		if(Ob.m_aSpeed[i] == 1)
+		{
+			aaReplaceableArea[i][0] = aaVisibleArea[i][0] - Ob.m_aaBaseArea[i][0];
+			aaReplaceableArea[i][1] = aaVisibleArea[i][1] - Ob.m_aaBaseArea[i][0];
+			continue;
+		}
+
+		for(int j = 0; j < 2; j++)
+		{
+			float aVisibleLine[2], aReplaceableLine[2];
+			int k = Ob.m_aSpeed[i] > 1 ? !j : j;
+
+			aVisibleLine[0] = Ob.m_aaBaseArea[i][0] + (aaVisibleArea[i][j] - Ob.m_aaScreenOffset[i][k]) * Ob.m_aSpeed[i];
+			aVisibleLine[1] = aVisibleLine[0] + Ob.m_aaBaseArea[i][1] - Ob.m_aaBaseArea[i][0];
+
+			if(GetLineIntersection(aaVisibleArea[i], aVisibleLine, aReplaceableLine))
+				aaReplaceableArea[i][k] = aReplaceableLine[j] - aVisibleLine[0];
+			else
+				aaReplaceableArea[i][k] = k * (Ob.m_aaBaseArea[i][1] - Ob.m_aaBaseArea[i][0]);
+		}
+	}
+
+	return true;
+}
+
+void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs[2], const float aaaVisibleAreas[2][2][2], float aDistance[2])
+{
+	for(int i = 0; i < 2; i++)
+	{
+		if(aObs[0].m_aSpeed[i] == 1 && aObs[1].m_aSpeed[i] == 1)
+			aDistance[i] = 0;
+		else if(aObs[0].m_aSpeed[i] == 1 && aObs[1].m_aSpeed[i] != 1)
+			aDistance[i] = aaaGameAreas[1][i][0] - aaaVisibleAreas[0][i][0];
+		else if(aObs[0].m_aSpeed[i] != 1 && aObs[1].m_aSpeed[i] == 1)
+			aDistance[i] = aaaVisibleAreas[1][i][0] - aaaGameAreas[0][i][0];
+		else
+			aDistance[i] = aaaGameAreas[1][i][0] - aaaGameAreas[0][i][0];
+	}
+}
+
+void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs[2], const float aaVisibleArea[2][2], float aDistance[2])
+{
+	float aaaVisibleAreas[2][2][2];
+	mem_copy(aaaVisibleAreas[0], aaVisibleArea[0], sizeof(float[2][2]));
+	mem_copy(aaaVisibleAreas[1], aaVisibleArea[0], sizeof(float[2][2]));
+	GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
+}
+
+void GetSignificantScreenPos(const MapObject &Ob, const float aaVisibleArea[2][2], const float aaReplaceableArea[2][2], float aScreen[2])
+{
+	for(int i = 0; i < 2; i++)
+	{
+		if(!Ob.m_aSpeed[i])
+		{
+			aScreen[i] = aaVisibleArea[i][0] + Ob.m_aaScreenOffset[i][1];
+			continue;
+		}
+
+		float BaseOffset = aaReplaceableArea ? aaReplaceableArea[i][0] : 0;
+		aScreen[i] = (aaVisibleArea[i][0] - Ob.m_aaBaseArea[i][0] - BaseOffset) / Ob.m_aSpeed[i];
+	}
+}
+
+void ConvertToTiles(const float aaArea[2][2], int aaTiles[2][2])
+{
+	for(int i = 0; i < 2; i++)
+	{
+		aaTiles[i][0] = std::floor((std::floor(aaArea[i][0] * 100.0f) / 100.0f) / 32.0f);
+		aaTiles[i][1] = std::ceil((std::floor(aaArea[i][1] * 100.0f) / 100.0f) / 32.0f);
+	}
+}
+
+bool GetLineIntersection(const float aLine1[2], const float aLine2[2], float aIntersection[2])
+{
+	float aBorders[2] = {
+		std::max(aLine1[0], aLine2[0]),
+		std::min(aLine1[1], aLine2[1])};
+
+	if(aIntersection)
+		SetInexistent((float *)aIntersection, 2);
+
+	if(aBorders[0] - aBorders[1] > 0.01f)
+		return false;
+
+	if(aIntersection)
+		mem_copy(aIntersection, aBorders, sizeof(float[2]));
+
+	return true;
+}
+
+bool GetLineIntersection(const float aLine[2], const float Point)
+{
+	return aLine[0] - Point <= 0.01f && aLine[1] - Point >= 0.01f;
+}
+
+void SetInexistent(float *pArray, const int Count)
+{
+	for(int i = 0; i < Count; i++)
+		pArray[i] = std::numeric_limits<float>::max();
+}
+
+bool IsInexistent(const float *pArray, const int Count)
+{
+	for(int i = 0; i < Count; i++)
+		if(pArray[i] == std::numeric_limits<float>::max())
+			return true;
+	return false;
+}
+
+bool IsInexistent(const float Value)
+{
+	return Value == std::numeric_limits<float>::max();
+}
diff --git a/src_bkp/tools/map_replace_image.cpp b/src_bkp/tools/map_replace_image.cpp
new file mode 100644
index 0000000000..b67ce18aed
--- /dev/null
+++ b/src_bkp/tools/map_replace_image.cpp
@@ -0,0 +1,207 @@
+/* (c) DDNet developers. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.  */
+
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/gfx/image_loader.h>
+#include <engine/graphics.h>
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+#include <game/mapitems.h>
+/*
+	Usage: map_replace_image <source map filepath> <dest map filepath> <current image name> <new image filepath>
+	Notes: map filepath must be relative to user default teeworlds folder
+		new image filepath must be absolute or relative to the current position
+*/
+
+CDataFileReader g_DataReader;
+
+// global new image data (set by ReplaceImageItem)
+int g_NewNameID = -1;
+char g_aNewName[128];
+int g_NewDataID = -1;
+int g_NewDataSize = 0;
+void *g_pNewData = nullptr;
+
+bool LoadPNG(CImageInfo *pImg, const char *pFilename)
+{
+	IOHANDLE File = io_open(pFilename, IOFLAG_READ);
+	if(File)
+	{
+		io_seek(File, 0, IOSEEK_END);
+		unsigned int FileSize = io_tell(File);
+		io_seek(File, 0, IOSEEK_START);
+		TImageByteBuffer ByteBuffer;
+		SImageByteBuffer ImageByteBuffer(&ByteBuffer);
+
+		ByteBuffer.resize(FileSize);
+		io_read(File, &ByteBuffer.front(), FileSize);
+
+		io_close(File);
+
+		uint8_t *pImgBuffer = NULL;
+		EImageFormat ImageFormat;
+		int PngliteIncompatible;
+		if(LoadPNG(ImageByteBuffer, pFilename, PngliteIncompatible, pImg->m_Width, pImg->m_Height, pImgBuffer, ImageFormat))
+		{
+			if((ImageFormat == IMAGE_FORMAT_RGBA || ImageFormat == IMAGE_FORMAT_RGB) && pImg->m_Width <= (2 << 13) && pImg->m_Height <= (2 << 13))
+			{
+				pImg->m_pData = pImgBuffer;
+
+				if(ImageFormat == IMAGE_FORMAT_RGB)
+					pImg->m_Format = CImageInfo::FORMAT_RGB;
+				else if(ImageFormat == IMAGE_FORMAT_RGBA)
+					pImg->m_Format = CImageInfo::FORMAT_RGBA;
+				else
+				{
+					free(pImgBuffer);
+					return false;
+				}
+			}
+		}
+		else
+			return false;
+	}
+	else
+		return false;
+	return true;
+}
+
+void *ReplaceImageItem(int Index, CMapItemImage *pImgItem, const char *pImgName, const char *pImgFile, CMapItemImage *pNewImgItem)
+{
+	const char *pName = g_DataReader.GetDataString(pImgItem->m_ImageName);
+	if(pName == nullptr || pName[0] == '\0')
+	{
+		dbg_msg("map_replace_image", "failed to load name of image %d", Index);
+		return pImgItem;
+	}
+
+	if(str_comp(pImgName, pName) != 0)
+		return pImgItem;
+
+	dbg_msg("map_replace_image", "found image '%s'", pImgName);
+
+	CImageInfo ImgInfo;
+	if(!LoadPNG(&ImgInfo, pImgFile))
+		return 0;
+
+	if(ImgInfo.m_Format != CImageInfo::FORMAT_RGBA)
+	{
+		dbg_msg("map_replace_image", "image '%s' is not in RGBA format", pImgName);
+		return 0;
+	}
+
+	*pNewImgItem = *pImgItem;
+
+	pNewImgItem->m_Width = ImgInfo.m_Width;
+	pNewImgItem->m_Height = ImgInfo.m_Height;
+
+	g_NewNameID = pImgItem->m_ImageName;
+	IStorage::StripPathAndExtension(pImgFile, g_aNewName, sizeof(g_aNewName));
+	g_NewDataID = pImgItem->m_ImageData;
+	g_pNewData = ImgInfo.m_pData;
+	g_NewDataSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * ImgInfo.PixelSize();
+
+	return (void *)pNewImgItem;
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc != 5)
+	{
+		dbg_msg("map_replace_image", "Invalid arguments");
+		dbg_msg("map_replace_image", "Usage: map_replace_image <source map filepath> <dest map filepath> <current image name> <new image filepath>");
+		dbg_msg("map_replace_image", "Notes: map filepath must be relative to user default teeworlds folder");
+		dbg_msg("map_replace_image", "       new image filepath must be absolute or relative to the current position");
+		return -1;
+	}
+
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_BASIC, argc, argv);
+	if(!pStorage)
+	{
+		dbg_msg("map_replace_image", "error loading storage");
+		return -1;
+	}
+
+	const char *pSourceFileName = argv[1];
+	const char *pDestFileName = argv[2];
+	const char *pImageName = argv[3];
+	const char *pImageFile = argv[4];
+
+	if(!g_DataReader.Open(pStorage, pSourceFileName, IStorage::TYPE_ALL))
+	{
+		dbg_msg("map_replace_image", "failed to open source map. filename='%s'", pSourceFileName);
+		return -1;
+	}
+
+	CDataFileWriter Writer;
+	if(!Writer.Open(pStorage, pDestFileName))
+	{
+		dbg_msg("map_replace_image", "failed to open destination map. filename='%s'", pDestFileName);
+		return -1;
+	}
+
+	// add all items
+	for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
+	{
+		int Type, ID;
+		void *pItem = g_DataReader.GetItem(Index, &Type, &ID);
+
+		// filter ITEMTYPE_EX items, they will be automatically added again
+		if(Type == ITEMTYPE_EX)
+			continue;
+
+		int Size = g_DataReader.GetItemSize(Index);
+
+		CMapItemImage NewImageItem;
+		if(Type == MAPITEMTYPE_IMAGE)
+		{
+			pItem = ReplaceImageItem(Index, (CMapItemImage *)pItem, pImageName, pImageFile, &NewImageItem);
+			if(!pItem)
+				return -1;
+			Size = sizeof(CMapItemImage);
+			NewImageItem.m_Version = CMapItemImage::CURRENT_VERSION;
+		}
+
+		Writer.AddItem(Type, ID, Size, pItem);
+	}
+
+	if(g_NewDataID == -1)
+	{
+		dbg_msg("map_replace_image", "image '%s' not found on source map '%s'.", pImageName, pSourceFileName);
+		return -1;
+	}
+
+	// add all data
+	for(int Index = 0; Index < g_DataReader.NumData(); Index++)
+	{
+		void *pData;
+		int Size;
+		if(Index == g_NewDataID)
+		{
+			pData = g_pNewData;
+			Size = g_NewDataSize;
+		}
+		else if(Index == g_NewNameID)
+		{
+			pData = (void *)g_aNewName;
+			Size = str_length(g_aNewName) + 1;
+		}
+		else
+		{
+			pData = g_DataReader.GetData(Index);
+			Size = g_DataReader.GetDataSize(Index);
+		}
+
+		Writer.AddData(Size, pData);
+	}
+
+	g_DataReader.Close();
+	Writer.Finish();
+
+	dbg_msg("map_replace_image", "image '%s' replaced", pImageName);
+	return 0;
+}
diff --git a/src_bkp/tools/map_resave.cpp b/src_bkp/tools/map_resave.cpp
new file mode 100644
index 0000000000..5ff2090504
--- /dev/null
+++ b/src_bkp/tools/map_resave.cpp
@@ -0,0 +1,76 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/shared/datafile.h>
+#include <engine/storage.h>
+
+static const char *TOOL_NAME = "map_resave";
+
+static int ResaveMap(const char *pSourceMap, const char *pDestinationMap, IStorage *pStorage)
+{
+	CDataFileReader Reader;
+	if(!Reader.Open(pStorage, pSourceMap, IStorage::TYPE_ABSOLUTE))
+	{
+		log_error(TOOL_NAME, "Failed to open source map '%s' for reading", pSourceMap);
+		return -1;
+	}
+
+	CDataFileWriter Writer;
+	if(!Writer.Open(pStorage, pDestinationMap))
+	{
+		log_error(TOOL_NAME, "Failed to open destination map '%s' for writing", pDestinationMap);
+		Reader.Close();
+		return -1;
+	}
+
+	// add all items
+	for(int Index = 0; Index < Reader.NumItems(); Index++)
+	{
+		int Type, ID;
+		const void *pPtr = Reader.GetItem(Index, &Type, &ID);
+
+		// filter ITEMTYPE_EX items, they will be automatically added again
+		if(Type == ITEMTYPE_EX)
+			continue;
+
+		int Size = Reader.GetItemSize(Index);
+		Writer.AddItem(Type, ID, Size, pPtr);
+	}
+
+	// add all data
+	for(int Index = 0; Index < Reader.NumData(); Index++)
+	{
+		const void *pPtr = Reader.GetData(Index);
+		int Size = Reader.GetDataSize(Index);
+		Writer.AddData(Size, pPtr);
+	}
+
+	Reader.Close();
+	Writer.Finish();
+	log_info(TOOL_NAME, "Resaved '%s' to '%s'", pSourceMap, pDestinationMap);
+	return 0;
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+
+	if(argc != 3)
+	{
+		log_error(TOOL_NAME, "Usage: %s <source map> <destination map>", TOOL_NAME);
+		return -1;
+	}
+
+	IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_BASIC, argc, argv);
+	if(!pStorage)
+	{
+		log_error(TOOL_NAME, "Error creating basic storage");
+		return -1;
+	}
+
+	return ResaveMap(argv[1], argv[2], pStorage);
+}
diff --git a/src_bkp/tools/packetgen.cpp b/src_bkp/tools/packetgen.cpp
new file mode 100644
index 0000000000..98c4df234f
--- /dev/null
+++ b/src_bkp/tools/packetgen.cpp
@@ -0,0 +1,40 @@
+/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+/* If you are missing that file, acquire a complete release at teeworlds.com.                */
+#include <base/system.h>
+
+enum
+{
+	NUM_SOCKETS = 64
+};
+
+void Run(NETADDR Dest)
+{
+	NETSOCKET aSockets[NUM_SOCKETS];
+
+	for(auto &Socket : aSockets)
+	{
+		NETADDR BindAddr = {NETTYPE_IPV4, {0}, 0};
+		Socket = net_udp_create(BindAddr);
+	}
+
+	while(true)
+	{
+		unsigned char aData[1024];
+		int Size = 0;
+		int SocketToUse = 0;
+		io_read(io_stdin(), &Size, 2);
+		io_read(io_stdin(), &SocketToUse, 1);
+		Size %= 256;
+		SocketToUse %= NUM_SOCKETS;
+		io_read(io_stdin(), aData, Size);
+		net_udp_send(aSockets[SocketToUse], &Dest, aData, Size);
+	}
+}
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	NETADDR Dest = {NETTYPE_IPV4, {127, 0, 0, 1}, 8303};
+	Run(Dest);
+	return 0;
+}
diff --git a/src_bkp/tools/stun.cpp b/src_bkp/tools/stun.cpp
new file mode 100644
index 0000000000..c735dec836
--- /dev/null
+++ b/src_bkp/tools/stun.cpp
@@ -0,0 +1,92 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/shared/stun.h>
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+
+	secure_random_init();
+	log_set_global_logger_default();
+
+	if(argc < 2)
+	{
+		log_info("stun", "usage: %s <STUN ADDRESS>", argc > 0 ? argv[0] : "stun");
+		return 1;
+	}
+	NETADDR Addr;
+	if(net_addr_from_str(&Addr, argv[1]))
+	{
+		log_error("stun", "couldn't parse address");
+		return 2;
+	}
+
+	net_init();
+	NETADDR BindAddr;
+	mem_zero(&BindAddr, sizeof(BindAddr));
+	BindAddr.type = NETTYPE_ALL;
+	NETSOCKET Socket = net_udp_create(BindAddr);
+	if(net_socket_type(Socket) == NETTYPE_INVALID)
+	{
+		log_error("stun", "couldn't open udp socket");
+		return 2;
+	}
+
+	CStunData Stun;
+	unsigned char aRequest[32];
+	int RequestSize = StunMessagePrepare(aRequest, sizeof(aRequest), &Stun);
+	if(net_udp_send(Socket, &Addr, aRequest, RequestSize) == -1)
+	{
+		log_error("stun", "failed sending stun request");
+		return 2;
+	}
+
+	NETADDR ResponseAddr;
+	unsigned char *pResponse;
+	while(true)
+	{
+		if(!net_socket_read_wait(Socket, 1000000))
+		{
+			log_error("stun", "no udp message received from server until timeout");
+			return 3;
+		}
+		int ResponseSize = net_udp_recv(Socket, &ResponseAddr, &pResponse);
+		if(ResponseSize == -1)
+		{
+			log_error("stun", "failed receiving udp message");
+			return 2;
+		}
+		else if(ResponseSize == 0)
+		{
+			continue;
+		}
+		if(net_addr_comp(&Addr, &ResponseAddr) != 0)
+		{
+			char aResponseAddr[NETADDR_MAXSTRSIZE];
+			char aAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&ResponseAddr, aResponseAddr, sizeof(aResponseAddr), true);
+			net_addr_str(&Addr, aAddr, sizeof(aAddr), true);
+			log_debug("stun", "got message from %s while expecting one from %s", aResponseAddr, aAddr);
+			continue;
+		}
+		bool Success;
+		NETADDR StunAddr;
+		if(StunMessageParse(pResponse, ResponseSize, &Stun, &Success, &StunAddr))
+		{
+			log_debug("stun", "received message from stun server that was not understood");
+			continue;
+		}
+		if(Success)
+		{
+			char aStunAddr[NETADDR_MAXSTRSIZE];
+			net_addr_str(&StunAddr, aStunAddr, sizeof(aStunAddr), 1);
+			log_info("stun", "public ip address: %s", aStunAddr);
+			break;
+		}
+		else
+		{
+			log_info("stun", "error response from stun server");
+			break;
+		}
+	}
+}
diff --git a/src_bkp/tools/twping.cpp b/src_bkp/tools/twping.cpp
new file mode 100644
index 0000000000..4456696df6
--- /dev/null
+++ b/src_bkp/tools/twping.cpp
@@ -0,0 +1,82 @@
+#include <base/logger.h>
+#include <base/system.h>
+
+#include <engine/shared/masterserver.h>
+#include <engine/shared/network.h>
+#include <engine/shared/packer.h>
+
+#include <chrono>
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+
+	secure_random_init();
+	log_set_global_logger_default();
+
+	net_init();
+	NETADDR BindAddr;
+	mem_zero(&BindAddr, sizeof(BindAddr));
+	BindAddr.type = NETTYPE_ALL;
+
+	CNetClient NetClient;
+	NetClient.Open(BindAddr);
+
+	if(argc != 2)
+	{
+		log_error("twping", "usage: %s server[:port] (default port: 8303)", argv[0]);
+		return -1;
+	}
+
+	NETADDR Addr;
+	if(net_host_lookup(argv[1], &Addr, NETTYPE_ALL))
+	{
+		log_error("twping", "host lookup failed");
+		return -1;
+	}
+
+	if(Addr.port == 0)
+		Addr.port = 8303;
+
+	const int CurToken = rand() % 256;
+	unsigned char aBuffer[sizeof(SERVERBROWSE_GETINFO) + 1];
+	mem_copy(aBuffer, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO));
+	aBuffer[sizeof(SERVERBROWSE_GETINFO)] = CurToken;
+
+	CNetChunk Packet;
+	Packet.m_ClientID = -1;
+	Packet.m_Address = Addr;
+	Packet.m_Flags = NETSENDFLAG_CONNLESS;
+	Packet.m_DataSize = sizeof(aBuffer);
+	Packet.m_pData = aBuffer;
+
+	NetClient.Send(&Packet);
+
+	const int64_t StartTime = time_get();
+
+	using namespace std::chrono_literals;
+	const std::chrono::nanoseconds Timeout = std::chrono::nanoseconds(1s);
+	net_socket_read_wait(NetClient.m_Socket, Timeout);
+
+	NetClient.Update();
+
+	while(NetClient.Recv(&Packet))
+	{
+		if(Packet.m_DataSize >= (int)sizeof(SERVERBROWSE_INFO) && mem_comp(Packet.m_pData, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO)) == 0)
+		{
+			// we got ze info
+			CUnpacker Unpacker;
+			Unpacker.Reset((unsigned char *)Packet.m_pData + sizeof(SERVERBROWSE_INFO), Packet.m_DataSize - sizeof(SERVERBROWSE_INFO));
+			int Token = str_toint(Unpacker.GetString());
+			if(Token != CurToken)
+				continue;
+
+			const int64_t EndTime = time_get();
+			log_info("twping", "%g ms", (double)(EndTime - StartTime) / time_freq() * 1000);
+			return 0;
+		}
+	}
+
+	log_info("twping", "timeout (%" PRId64 " ms)", std::chrono::duration_cast<std::chrono::milliseconds>(Timeout).count());
+	return 1;
+}
diff --git a/src_bkp/tools/unicode_confusables.cpp b/src_bkp/tools/unicode_confusables.cpp
new file mode 100644
index 0000000000..7f0dfaca14
--- /dev/null
+++ b/src_bkp/tools/unicode_confusables.cpp
@@ -0,0 +1,15 @@
+#include <base/logger.h>
+#include <base/system.h>
+
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	if(argc < 1 + 2)
+	{
+		dbg_msg("usage", "%s STR1 STR2", argv[0] ? argv[0] : "unicode_confusables");
+		return -1;
+	}
+	dbg_msg("conf", "not_confusable=%d", str_utf8_comp_confusable(argv[1], argv[2]));
+	return 0;
+}
diff --git a/src_bkp/tools/uuid.cpp b/src_bkp/tools/uuid.cpp
new file mode 100644
index 0000000000..6a6a011c21
--- /dev/null
+++ b/src_bkp/tools/uuid.cpp
@@ -0,0 +1,18 @@
+#include <base/logger.h>
+#include <base/system.h>
+#include <engine/shared/uuid_manager.h>
+int main(int argc, const char **argv)
+{
+	CCmdlineFix CmdlineFix(&argc, &argv);
+	log_set_global_logger_default();
+	if(argc != 2)
+	{
+		dbg_msg("usage", "uuid <NAME>");
+		return -1;
+	}
+	CUuid Uuid = CalculateUuid(argv[1]);
+	char aBuf[UUID_MAXSTRSIZE];
+	FormatUuid(Uuid, aBuf, sizeof(aBuf));
+	dbg_msg("uuid", "%s", aBuf);
+	return 0;
+}